This commit was manufactured by cvs2svn to create tag 'v201103081300'.
diff --git a/docs/org.eclipse.jst.j2ee.doc.user/.cvsignore b/docs/org.eclipse.jst.j2ee.doc.user/.cvsignore
deleted file mode 100644
index 6e60185..0000000
--- a/docs/org.eclipse.jst.j2ee.doc.user/.cvsignore
+++ /dev/null
@@ -1,4 +0,0 @@
-build.xml
-org.eclipse.jst.j2ee.doc.user_1.0.0.jar
-temp
-DitaLink.cat
\ No newline at end of file
diff --git a/docs/org.eclipse.jst.j2ee.doc.user/.project b/docs/org.eclipse.jst.j2ee.doc.user/.project
deleted file mode 100644
index 86d9408..0000000
--- a/docs/org.eclipse.jst.j2ee.doc.user/.project
+++ /dev/null
@@ -1,22 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<projectDescription>
- <name>Copy of org.eclipse.jst.j2ee.doc.user</name>
- <comment></comment>
- <projects>
- </projects>
- <buildSpec>
- <buildCommand>
- <name>org.eclipse.pde.ManifestBuilder</name>
- <arguments>
- </arguments>
- </buildCommand>
- <buildCommand>
- <name>org.eclipse.pde.SchemaBuilder</name>
- <arguments>
- </arguments>
- </buildCommand>
- </buildSpec>
- <natures>
- <nature>org.eclipse.pde.PluginNature</nature>
- </natures>
-</projectDescription>
diff --git a/docs/org.eclipse.jst.j2ee.doc.user/DocBuild.xml b/docs/org.eclipse.jst.j2ee.doc.user/DocBuild.xml
deleted file mode 100644
index f88d63e..0000000
--- a/docs/org.eclipse.jst.j2ee.doc.user/DocBuild.xml
+++ /dev/null
@@ -1,66 +0,0 @@
-<?xml version="1.0" encoding="UTF-8" ?>
-<!--
-
- This script build the Help plug-in by transforming the DITA source files into HTML.
-
- To use this script, you must install DITA-OT on your machine in the directory
- defined by the dita.ot.dir property.
-
- Run the default target after you edit the DITA source files to regenerate the HTML.
-
- To customize this script for other Help plug-ins, modify the value of the args.input property
- to be the DITA map file for the plug-in.
-
- NOTE: This script assumes that links to sibling Help plug-ins have scope="peer", otherwise the
- output directory structure will be shifted incorrectly.
-
- NOTE: This script assumes that you hand code your plugin.xml file in myplugin.xml. This file
- will be copied over the generated plugin.xml which is currently not being generated correctly
- by DITA-OT.
-
- ChangeLog:
- 2006-04-05 Arthur Ryman <ryman@ca.ibm.com>
- - Created.
- 2008-01-09 Kate Price <katep@ca.ibm.com>
- - modified for new DITA-OT version
- 2008-05-05 Kate Price <katep@ca.ibm.com>
- - modified to add generation of pre-built help index.
- - Must delete /index folder before running build
--->
-<project name="eclipsehelp" default="all">
-
- <property name="dita.ot.dir" location="C:/DITA-OT1.2.2" />
-
- <path id="dost.class.path">
- <pathelement location="${dita.ot.dir}${file.separator}lib${file.separator}dost.jar" />
- </path>
-
- <taskdef name="integrate" classname="org.dita.dost.platform.IntegratorTask">
- <classpath refid="dost.class.path" />
- </taskdef>
- <target name="all" depends="integrate, eclipsehelp">
- </target>
- <target name="integrate">
- <integrate ditadir="${dita.ot.dir}" />
- </target>
-
- <!-- revise below here -->
- <target name="eclipsehelp">
- <ant antfile="${dita.ot.dir}${file.separator}conductor.xml" target="init" dir="${dita.ot.dir}">
- <property name="args.copycss" value="no" />
- <property name="args.csspath" value="../org.eclipse.wst.doc.user" />
- <property name="args.eclipse.provider" value="Eclipse.org" />
- <property name="args.eclipse.version" value="3.6.0" />
- <property name="args.input" location="jst_j2ee_relsmap.ditamap" />
- <property name="clean.temp" value="true" />
- <property name="dita.extname" value=".dita" />
- <property name="dita.temp.dir" location="temp" />
- <property name="output.dir" location="" />
- <property name="transtype" value="eclipsehelp" />
- </ant>
- <copy file="myplugin.xml" tofile="plugin.xml" overwrite="yes" />
- </target>
- <target name="build.index" description="Builds search index for the plug-in" if="eclipse.running">
- <help.buildHelpIndex manifest="plugin.xml" destination="."/>
- </target>
-</project>
diff --git a/docs/org.eclipse.jst.j2ee.doc.user/META-INF/MANIFEST.MF b/docs/org.eclipse.jst.j2ee.doc.user/META-INF/MANIFEST.MF
deleted file mode 100644
index b8e0c05..0000000
--- a/docs/org.eclipse.jst.j2ee.doc.user/META-INF/MANIFEST.MF
+++ /dev/null
@@ -1,7 +0,0 @@
-Manifest-Version: 1.0
-Bundle-ManifestVersion: 2
-Bundle-Name: %pluginName
-Bundle-SymbolicName: org.eclipse.jst.j2ee.doc.user; singleton:=true
-Bundle-Version: 1.1.400.qualifier
-Bundle-Vendor: %pluginProvider
-Bundle-Localization: plugin
diff --git a/docs/org.eclipse.jst.j2ee.doc.user/about.html b/docs/org.eclipse.jst.j2ee.doc.user/about.html
deleted file mode 100644
index 2199df3..0000000
--- a/docs/org.eclipse.jst.j2ee.doc.user/about.html
+++ /dev/null
@@ -1,34 +0,0 @@
-<!DOCTYPE HTML PUBLIC "-//W3C//DTD HTML 4.0//EN">
-<HTML>
-
-<head>
-<title>About</title>
-<meta http-equiv=Content-Type content="text/html; charset=ISO-8859-1">
-</head>
-
-<BODY lang="EN-US">
-
-<H3>About This Content</H3>
-
-<P>June, 2008</P>
-
-<H3>License</H3>
-
-<P>The Eclipse Foundation makes available all content in this plug-in
-("Content"). Unless otherwise indicated below, the Content is provided to you
-under the terms and conditions of the Eclipse Public License Version 1.0
-("EPL"). A copy of the EPL is available at
-<A href="http://www.eclipse.org/org/documents/epl-v10.php">http://www.eclipse.org/org/documents/epl-v10.php</A>.
-For purposes of the EPL, "Program" will mean the Content.</P>
-
-<P>If you did not receive this Content directly from the Eclipse Foundation, the
-Content is being redistributed by another party ("Redistributor") and different
-terms and conditions may apply to your use of any object code in the Content.
-Check the Redistributors license that was provided with the Content. If no such
-license exists, contact the Redistributor. Unless otherwise indicated below, the
-terms and conditions of the EPL still apply to any source code in the Content
-and such source code may be obtained at
-<A href="http://www.eclipse.org/">http://www.eclipse.org/</A>.</P>
-
-</BODY>
-</HTML>
diff --git a/docs/org.eclipse.jst.j2ee.doc.user/build.properties b/docs/org.eclipse.jst.j2ee.doc.user/build.properties
deleted file mode 100644
index bf93518..0000000
--- a/docs/org.eclipse.jst.j2ee.doc.user/build.properties
+++ /dev/null
@@ -1,15 +0,0 @@
-bin.includes = images/,\
- jst_j2ee_toc.xml,\
- jst_j2ee_relsmap.xml,\
- topics/*.htm*,\
- plugin.xml,\
- plugin.properties,\
- index/,\
- META-INF/,\
- about.html,\
- org.eclipse.jst.j2ee.doc.userindex.xml
-src.includes = *.maplist,\
- *.ditamap,\
- topics/*.dita
-bin.excludes = DocBuild.xml,\
- myPlugin*.xml
diff --git a/docs/org.eclipse.jst.j2ee.doc.user/images/AddRelationship.gif b/docs/org.eclipse.jst.j2ee.doc.user/images/AddRelationship.gif
deleted file mode 100644
index a56a758..0000000
--- a/docs/org.eclipse.jst.j2ee.doc.user/images/AddRelationship.gif
+++ /dev/null
Binary files differ
diff --git a/docs/org.eclipse.jst.j2ee.doc.user/images/ProjectExplorer.gif b/docs/org.eclipse.jst.j2ee.doc.user/images/ProjectExplorer.gif
deleted file mode 100644
index d5c7290..0000000
--- a/docs/org.eclipse.jst.j2ee.doc.user/images/ProjectExplorer.gif
+++ /dev/null
Binary files differ
diff --git a/docs/org.eclipse.jst.j2ee.doc.user/images/Relationships.gif b/docs/org.eclipse.jst.j2ee.doc.user/images/Relationships.gif
deleted file mode 100644
index a9f52eb..0000000
--- a/docs/org.eclipse.jst.j2ee.doc.user/images/Relationships.gif
+++ /dev/null
Binary files differ
diff --git a/docs/org.eclipse.jst.j2ee.doc.user/images/n5rpdcst.gif b/docs/org.eclipse.jst.j2ee.doc.user/images/n5rpdcst.gif
deleted file mode 100644
index 68be18c..0000000
--- a/docs/org.eclipse.jst.j2ee.doc.user/images/n5rpdcst.gif
+++ /dev/null
Binary files differ
diff --git a/docs/org.eclipse.jst.j2ee.doc.user/images/validatefilters.jpg b/docs/org.eclipse.jst.j2ee.doc.user/images/validatefilters.jpg
deleted file mode 100644
index 6481091..0000000
--- a/docs/org.eclipse.jst.j2ee.doc.user/images/validatefilters.jpg
+++ /dev/null
Binary files differ
diff --git a/docs/org.eclipse.jst.j2ee.doc.user/images/webfrag.jpg b/docs/org.eclipse.jst.j2ee.doc.user/images/webfrag.jpg
deleted file mode 100644
index f01bd79..0000000
--- a/docs/org.eclipse.jst.j2ee.doc.user/images/webfrag.jpg
+++ /dev/null
Binary files differ
diff --git a/docs/org.eclipse.jst.j2ee.doc.user/images/ycwin.gif b/docs/org.eclipse.jst.j2ee.doc.user/images/ycwin.gif
deleted file mode 100644
index 895f9ca..0000000
--- a/docs/org.eclipse.jst.j2ee.doc.user/images/ycwin.gif
+++ /dev/null
Binary files differ
diff --git a/docs/org.eclipse.jst.j2ee.doc.user/index/_18.cfs b/docs/org.eclipse.jst.j2ee.doc.user/index/_18.cfs
deleted file mode 100644
index 3402414..0000000
--- a/docs/org.eclipse.jst.j2ee.doc.user/index/_18.cfs
+++ /dev/null
Binary files differ
diff --git a/docs/org.eclipse.jst.j2ee.doc.user/index/deletable b/docs/org.eclipse.jst.j2ee.doc.user/index/deletable
deleted file mode 100644
index 593f470..0000000
--- a/docs/org.eclipse.jst.j2ee.doc.user/index/deletable
+++ /dev/null
Binary files differ
diff --git a/docs/org.eclipse.jst.j2ee.doc.user/index/indexed_contributions b/docs/org.eclipse.jst.j2ee.doc.user/index/indexed_contributions
deleted file mode 100644
index 4b6436b..0000000
--- a/docs/org.eclipse.jst.j2ee.doc.user/index/indexed_contributions
+++ /dev/null
@@ -1,3 +0,0 @@
-#This is a generated file; do not edit.
-#Tue May 27 10:47:44 EDT 2008
-org.eclipse.jst.j2ee.doc.user=org.eclipse.jst.j2ee.doc.user\n1.1.0.qualifier
diff --git a/docs/org.eclipse.jst.j2ee.doc.user/index/indexed_dependencies b/docs/org.eclipse.jst.j2ee.doc.user/index/indexed_dependencies
deleted file mode 100644
index 943e5fe..0000000
--- a/docs/org.eclipse.jst.j2ee.doc.user/index/indexed_dependencies
+++ /dev/null
@@ -1,4 +0,0 @@
-#This is a generated file; do not edit.
-#Tue May 27 10:47:44 EDT 2008
-lucene=1.9.1.v200706111724
-analyzer=org.eclipse.help.base\#3.3.1.v20070813_33x?locale\=en
diff --git a/docs/org.eclipse.jst.j2ee.doc.user/index/indexed_docs b/docs/org.eclipse.jst.j2ee.doc.user/index/indexed_docs
deleted file mode 100644
index 8289a25..0000000
--- a/docs/org.eclipse.jst.j2ee.doc.user/index/indexed_docs
+++ /dev/null
@@ -1,42 +0,0 @@
-#This is a generated file; do not edit.
-#Tue May 27 10:47:44 EDT 2008
-/org.eclipse.jst.j2ee.doc.user/topics/cjcircle.html=0
-/org.eclipse.jst.j2ee.doc.user/topics/tjvalselect.html=0
-/org.eclipse.jst.j2ee.doc.user/topics/taddingfacet.html=0
-/org.eclipse.jst.j2ee.doc.user/topics/tjimpapp.html=0
-/org.eclipse.jst.j2ee.doc.user/topics/cfacets.html=0
-/org.eclipse.jst.j2ee.doc.user/topics/tchangefacet.html=0
-/org.eclipse.jst.j2ee.doc.user/topics/ph-j2eeapp.html=0
-/org.eclipse.jst.j2ee.doc.user/topics/tjappproj.html=0
-/org.eclipse.jst.j2ee.doc.user/topics/ph-projects.html=0
-/org.eclipse.jst.j2ee.doc.user/topics/ctypesofanno.html=0
-/org.eclipse.jst.j2ee.doc.user/topics/rjlimitcurrent.html=0
-/org.eclipse.jst.j2ee.doc.user/topics/cjee5overview.html=0
-/org.eclipse.jst.j2ee.doc.user/topics/cjview.html=0
-/org.eclipse.jst.j2ee.doc.user/topics/cjarch.html=0
-/org.eclipse.jst.j2ee.doc.user/topics/ph-importexport.html=0
-/org.eclipse.jst.j2ee.doc.user/topics/tjimprar.html=0
-/org.eclipse.jst.j2ee.doc.user/topics/tjear.html=0
-/org.eclipse.jst.j2ee.doc.user/topics/tjimpear.html=0
-/org.eclipse.jst.j2ee.doc.user/topics/ph-ref.html=0
-/org.eclipse.jst.j2ee.doc.user/topics/tjcircleb.html=0
-/org.eclipse.jst.j2ee.doc.user/topics/tjrar.html=0
-/org.eclipse.jst.j2ee.doc.user/topics/cjpers.html=0
-/org.eclipse.jst.j2ee.doc.user/topics/cjappcliproj.html=0
-/org.eclipse.jst.j2ee.doc.user/topics/rvalerr.html=0
-/org.eclipse.jst.j2ee.doc.user/topics/tdefiningannotations.html=0
-/org.eclipse.jst.j2ee.doc.user/topics/tchangejavalevel.html=0
-/org.eclipse.jst.j2ee.doc.user/topics/tjvalmanual.html=0
-/org.eclipse.jst.j2ee.doc.user/topics/rvalidators.html=0
-/org.eclipse.jst.j2ee.doc.user/topics/tjexpapp.html=0
-/org.eclipse.jst.j2ee.doc.user/topics/tjval.html=0
-/org.eclipse.jst.j2ee.doc.user/topics/cannotations.html=0
-/org.eclipse.jst.j2ee.doc.user/topics/cjearproj.html=0
-/org.eclipse.jst.j2ee.doc.user/topics/tjviewfilters.html=0
-/org.eclipse.jst.j2ee.doc.user/topics/tjexpear.html=0
-/org.eclipse.jst.j2ee.doc.user/topics/tjexprar.html=0
-/org.eclipse.jst.j2ee.doc.user/topics/cjavaee5.html=0
-/org.eclipse.jst.j2ee.doc.user/topics/tjtargetserver.html=0
-/org.eclipse.jst.j2ee.doc.user/topics/tjvaldisable.html=0
-/org.eclipse.jst.j2ee.doc.user/topics/rtunevalidat.html=0
-/org.eclipse.jst.j2ee.doc.user/topics/tjvalglobalpref.html=0
diff --git a/docs/org.eclipse.jst.j2ee.doc.user/index/segments b/docs/org.eclipse.jst.j2ee.doc.user/index/segments
deleted file mode 100644
index cbc649a..0000000
--- a/docs/org.eclipse.jst.j2ee.doc.user/index/segments
+++ /dev/null
Binary files differ
diff --git a/docs/org.eclipse.jst.j2ee.doc.user/jst_j2ee_relsmap.ditamap b/docs/org.eclipse.jst.j2ee.doc.user/jst_j2ee_relsmap.ditamap
deleted file mode 100644
index 62fc0d7..0000000
--- a/docs/org.eclipse.jst.j2ee.doc.user/jst_j2ee_relsmap.ditamap
+++ /dev/null
@@ -1,172 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!--Arbortext, Inc., 1988-2009, v.4002-->
-<!DOCTYPE map PUBLIC "-//OASIS//DTD DITA Map//EN"
- "map.dtd">
-<map title="J2EE WTP relational table" xml:lang="en-us">
-<reltable>
-<relheader>
-<relcolspec type="concept"></relcolspec>
-<relcolspec type="task"></relcolspec>
-<relcolspec type="reference"></relcolspec>
-</relheader>
-<relrow>
-<relcell linking="targetonly">
-<topicref href="topics/cjarch.dita" navtitle="J2EE architecture">
-</topicref>
-</relcell>
-<relcell collection-type="family">
-<topicref href="topics/tjtargetserver.dita"
-navtitle="Specifying target servers for J2EE projects"></topicref>
-</relcell>
-<relcell></relcell>
-<relcell>
-<topicref format="html"
-href="../org.eclipse.wst.server.ui.doc.user/topics/twinstprf.html"
-linking="targetonly" locktitle="yes"
-navtitle="Defining the installed server runtime environments"
-scope="peer"></topicref>
-</relcell>
-</relrow>
-<relrow>
-<relcell></relcell>
-<relcell>
-<topicref href="topics/tjval.dita"
-navtitle="Validating code in enterprise applications"></topicref>
-</relcell>
-<relcell collection-type="family">
-<topicref href="topics/rvalerr.dita"
-navtitle="Common validation errors and solutions"></topicref>
-<topicref href="topics/rvalidators.dita" navtitle="J2EE Validators">
-</topicref>
-</relcell>
-</relrow>
-<relrow>
-<relcell></relcell>
-<relcell collection-type="family">
-<topicref href="topics/tjvaldisable.dita" navtitle="Disabling validation">
-</topicref>
-<topicref href="topics/tjvalglobalpref.dita"
-navtitle="Overriding global validation preferences"></topicref>
-<topicref href="topics/tjvalmanual.dita"
-navtitle="Manually validating code"></topicref>
-<topicref href="topics/tjvalselect.dita"
-navtitle="Selecting code validators"></topicref>
-</relcell>
-<relcell>
-<topicref href="topics/rtunevalidat.dita" navtitle="Tuning validators">
-</topicref>
-</relcell>
-</relrow>
-<relrow>
-<relcell collection-type="family">
-<topicref href="topics/cjarch.dita" navtitle="J2EE architecture">
-</topicref>
-<topicref href="topics/cjearproj.dita"
-navtitle="Enterprise application projects"></topicref>
-</relcell>
-<relcell collection-type="family">
-<topicref href="topics/tjear.dita"
-navtitle="Creating an enterprise application project"></topicref>
-<topicref href="topics/tjimpear.dita"
-navtitle="Importing an enterprise application EAR file"></topicref>
-<topicref href="topics/tjexpear.dita"
-navtitle="Exporting an enterprise application into an EAR file">
-</topicref>
-</relcell>
-<relcell></relcell>
-</relrow>
-<relrow>
-<relcell collection-type="family">
-<topicref href="topics/cjarch.dita" navtitle="J2EE architecture">
-</topicref>
-<topicref href="topics/cjappcliproj.dita"
-navtitle="Application client projects"></topicref>
-</relcell>
-<relcell collection-type="family">
-<topicref href="topics/tjappproj.dita"
-navtitle="Creating an application client project"></topicref>
-<topicref href="topics/tjexpapp.dita"
-navtitle="Exporting an application client project"></topicref>
-<topicref href="topics/tjimpapp.dita"
-navtitle="Importing an application client JAR file"></topicref>
-</relcell>
-<relcell></relcell>
-</relrow>
-<relrow>
-<relcell>
-<topicref href="topics/cjcircle.dita"
-navtitle="Cyclical dependencies between J2EE modules"></topicref>
-</relcell>
-<relcell collection-type="family">
-<topicref href="topics/tjimpear.dita"
-navtitle="Importing an enterprise application EAR file"></topicref>
-<topicref href="topics/tjcircleb.dita"
-navtitle="Correcting cyclical dependencies after an EAR is imported">
-</topicref>
-</relcell>
-<relcell></relcell>
-</relrow>
-<relrow>
-<relcell collection-type="family">
-<topicref href="topics/cjview.dita"
-navtitle="Project Explorer view in the J2EE perspective"></topicref>
-</relcell>
-<relcell>
-<topicref href="topics/tjviewfilters.dita"
-navtitle="Filtering in the Project Explorer view"></topicref>
-</relcell>
-<relcell></relcell>
-</relrow>
-<relrow>
-<relcell>
-<topicref href="topics/cjearproj.dita"
-navtitle="Enterprise application projects"></topicref>
-</relcell>
-<relcell>
-<topicref href="topics/tjear.dita"
-navtitle="Creating an enterprise application project"></topicref>
-<topicref href="topics/tjappproj.dita"
-navtitle="Creating an application client project"></topicref>
-<topicref href="topics/tjrar.dita"
-navtitle="Creating a connector project"></topicref>
-</relcell>
-<relcell></relcell>
-<relcell>
-<topicref href="topics/cfacets.dita" navtitle="Project facets">
-</topicref>
-</relcell>
-</relrow>
-<relrow>
-<relcell>
-<topicref href="topics/cjpers.dita" navtitle="J2EE perspective">
-</topicref>
-<topicref href="topics/cjview.dita"
-navtitle="Project Explorer view in the J2EE perspective"></topicref>
-</relcell>
-<relcell></relcell>
-<relcell></relcell>
-<relcell>
-<topicref format="html"
-href="../org.eclipse.platform.doc.user/concepts/cworkset.htm"
-locktitle="yes" navtitle="Working sets" scope="peer"></topicref>
-</relcell>
-</relrow>
-<relrow>
-<relcell>
-<topicref href="topics/cfacets.dita" navtitle="Project facets">
-</topicref>
-</relcell>
-<relcell collection-type="family">
-<topicref href="topics/taddingfacet.dita"
-navtitle="Adding a facet to a J2EE project"></topicref>
-<topicref href="topics/tchangejavalevel.dita"
-navtitle="Changing the Java compiler version for a J2EE
-project"></topicref>
-<topicref href="topics/tchangefacet.dita"
-navtitle="Changing the version of a facet"></topicref>
-</relcell>
-<relcell></relcell>
-<relcell></relcell>
-</relrow>
-</reltable>
-</map>
diff --git a/docs/org.eclipse.jst.j2ee.doc.user/jst_j2ee_relsmap.xml b/docs/org.eclipse.jst.j2ee.doc.user/jst_j2ee_relsmap.xml
deleted file mode 100644
index a0c990b..0000000
--- a/docs/org.eclipse.jst.j2ee.doc.user/jst_j2ee_relsmap.xml
+++ /dev/null
@@ -1,5 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-
-<?NLS TYPE="org.eclipse.help.toc"?>
-
-<toc label="J2EE WTP relational table"/>
diff --git a/docs/org.eclipse.jst.j2ee.doc.user/jst_j2ee_toc.ditamap b/docs/org.eclipse.jst.j2ee.doc.user/jst_j2ee_toc.ditamap
deleted file mode 100644
index 8369a58..0000000
--- a/docs/org.eclipse.jst.j2ee.doc.user/jst_j2ee_toc.ditamap
+++ /dev/null
@@ -1,147 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!--Arbortext, Inc., 1988-2009, v.4002-->
-<!DOCTYPE map PUBLIC "-//OASIS//DTD DITA Map//EN"
- "map.dtd">
-<?Pub Sty _display FontColor="red"?>
-<map id="jstj2eetoc" title="J2EE applications - WTP" xml:lang="en-us">
-<anchor id="map_top"/>
-<topicref href="topics/ph-j2eeapp.dita" navtitle="Java EE applications">
-<anchor id="before_intro_topics"/>
-<topicref href="topics/cjavaee5.dita"
-navtitle="Developing Java EE 5 Applications">
-<topicref href="topics/cjee5overview.dita" navtitle="Java EE 5: Overview">
-</topicref>
-<topicref href="topics/cannotations.dita"
-navtitle="Java EE 5 support for annotations">
-<topicref href="topics/tdefiningannotations.dita"
-navtitle="Defining and using Annotations">
-<topicref href="topics/ctypesofanno.dita" navtitle="Types of annotations">
-</topicref>
-</topicref>
-</topicref>
-</topicref>
-<topicref href="topics/cjarch.dita" navtitle="J2EE architecture">
-</topicref>
-<topicref href="topics/cjpers.dita" navtitle="Java EE perspective">
-</topicref>
-<topicref href="topics/cjview.dita"
-navtitle="Project Explorer view in the Java EE perspective"></topicref>
-<anchor id="after_intro_topics"/>
-<anchor id="before_filters"/>
-<topicref href="topics/tjviewfilters.dita"
-navtitle="Filtering in the Project Explorer view"></topicref>
-<anchor id="after_filters"/>
-<anchor id="before_projects"/>
-<topicref href="topics/ph-projects.dita" navtitle="Working with projects">
-<topicref href="topics/cjearproj.dita"
-navtitle="Enterprise application projects"></topicref>
-<topicref href="topics/cjappcliproj.dita"
-navtitle="Application client projects"></topicref>
-<anchor id="project_types"/>
-<topicref href="topics/tjear.dita"
-navtitle="Creating an enterprise application project"></topicref>
-<topicref href="topics/tjappproj.dita"
-navtitle="Creating an application client project"></topicref>
-<topicref href="topics/tjrar.dita"
-navtitle="Creating a connector project"></topicref>
-<topicref href="topics/tcreatingawebproject.dita"
-navtitle="Creating Web projects"></topicref>
-<topicref href="topics/twebfragproj.dita"
-navtitle="Creating Web fragment projects"></topicref><?Pub Caret -2?>
-<anchor id="creating_projects"/>
-<topicref href="topics/tjtargetserver.dita"
-navtitle="Specifying target servers for J2EE projects"></topicref>
-<anchor id="target_servers"/>
-<topicref href="topics/cfacets.dita" navtitle="Project facets">
-<topicref href="topics/taddingfacet.dita"
-navtitle="Adding a facet to a Java EE project"></topicref>
-<topicref href="topics/tchangefacet.dita"
-navtitle="Changing the version of a facet"></topicref>
-<topicref href="topics/tchangejavalevel.dita"
-navtitle="Changing the Java compiler version for a Java EE project">
-</topicref>
-<anchor id="childof_J2EEProjectFacets"/></topicref>
-<anchor id="J2EEProjectFacets"/>
-<anchor id="before_importexport"/>
-<topicref href="topics/ph-importexport.dita"
-navtitle="Importing and exporting projects and files">
-<anchor id="importexport_top"/>
-<topicref href="topics/tjexpapp.dita"
-navtitle="Exporting an application client project"></topicref>
-<topicref href="topics/tjexpear.dita"
-navtitle="Exporting an enterprise application into an EAR file">
-</topicref>
-<topicref href="topics/tjexprar.dita"
-navtitle="Exporting connector projects to RAR files"></topicref>
-<anchor id="export_types"/>
-<topicref href="topics/tjimpear.dita"
-navtitle="Importing an enterprise application EAR file"></topicref>
-<topicref href="topics/tjimpapp.dita"
-navtitle="Importing an application client JAR file"></topicref>
-<topicref href="topics/tjimprar.dita"
-navtitle="Importing a connector project RAR file"></topicref>
-<topicref format="html"
-href="../org.eclipse.wst.webtools.doc.user/topics/twimpwar.html"
-linking="targetonly" locktitle="yes"
-navtitle="Importing Web archive (WAR) files" scope="peer" toc="no">
-</topicref>
-<topicref format="html"
-href="../org.eclipse.wst.webtools.doc.user/topics/twcrewar.html"
-linking="targetonly" locktitle="yes"
-navtitle="Exporting Web Archive (WAR) files" scope="peer" toc="no">
-</topicref>
-<topicref format="html"
-href="../org.eclipse.jst.ejb.doc.user/topics/teimp.html"
-linking="targetonly" locktitle="yes" navtitle="Importing EJB JAR files"
-scope="peer" toc="no"></topicref>
-<topicref format="html"
-href="../org.eclipse.jst.ejb.doc.user/topics/teexp.html"
-linking="targetonly" locktitle="yes"
-navtitle="Exporting EJB projects to EJB JAR files" scope="peer" toc="no">
-</topicref>
-<anchor id="import_types"/>
-<anchor id="before_dependencies"/>
-<topicref href="topics/cjcircle.dita"
-navtitle="Cyclical dependencies between Java EE modules"></topicref>
-<topicref href="topics/tjcircleb.dita"
-navtitle="Correcting cyclical dependencies after an EAR
-is imported"></topicref>
-<anchor id="after_dependencies"/>
-<anchor id="importexport_bottom"/></topicref>
-<anchor id="after_importexport"/></topicref>
-<anchor id="after_projects"/>
-<anchor id="before_validation"/>
-<topicref href="topics/tjval.dita"
-navtitle="Validating code in enterprise applications">
-<anchor id="validation_top"/>
-<topicref href="topics/rtunevalidat.dita" navtitle="Tuning validators">
-</topicref>
-<topicref href="topics/rvalerr.dita"
-navtitle="Common validation errors and solutions"></topicref>
-<topicref href="topics/rvalidators.dita" navtitle="J2EE Validators">
-<anchor id="childof_validators"/></topicref>
-<topicref href="topics/tjvaldisable.dita" navtitle="Disabling validation">
-</topicref>
-<topicref href="topics/tjvalselect.dita"
-navtitle="Selecting code validators"></topicref>
-<topicref href="topics/tjvalglobalpref.dita"
-navtitle="Overriding global validation preferences"></topicref>
-<topicref href="topics/tjvalmanual.dita"
-navtitle="Manually validating code"></topicref>
-<anchor id="validation_bottom"/></topicref>
-<anchor id="after_validation"/>
-<anchor id="before_reference"/>
-<topicref href="topics/ph-ref.dita" navtitle="Reference">
-<anchor id="reference_top"/>
-<topicref href="topics/rvalidators.dita" navtitle="J2EE Validators">
-</topicref>
-<topicref href="topics/rvalerr.dita"
-navtitle="Common validation errors and solutions">
-<anchor id="validation_errors"/></topicref>
-<topicref href="topics/rjlimitcurrent.dita"
-navtitle="Limitations of J2EE development tools">
-<anchor id="limitations"/></topicref>
-<anchor id="reference_bottom"/></topicref>
-<anchor id="after_reference"/></topicref>
-<anchor id="map_bottom"/></map>
-<?Pub *0000006359?>
diff --git a/docs/org.eclipse.jst.j2ee.doc.user/jst_j2ee_toc.xml b/docs/org.eclipse.jst.j2ee.doc.user/jst_j2ee_toc.xml
deleted file mode 100644
index 2221a1f..0000000
--- a/docs/org.eclipse.jst.j2ee.doc.user/jst_j2ee_toc.xml
+++ /dev/null
@@ -1,94 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-
-<?NLS TYPE="org.eclipse.help.toc"?>
-
-<toc label="J2EE applications - WTP" topic="topics/ph-j2eeapp.html">
-<anchor id="map_top"/>
-<topic label="Java EE applications" href="topics/ph-j2eeapp.html">
-<anchor id="before_intro_topics"/>
-<topic label="Developing Java EE Applications" href="topics/cjavaee5.html">
-<topic label="Java EE 5: Overview" href="topics/cjee5overview.html"/>
-<topic label="Java EE 5 and Java EE 6 support for annotations" href="topics/cannotations.html">
-<topic label="Defining and using annotations" href="topics/tdefiningannotations.html">
-<topic label="Types of annotations" href="topics/ctypesofanno.html"/>
-</topic>
-</topic>
-</topic>
-<topic label="J2EE architecture" href="topics/cjarch.html"/>
-<topic label="Java EE perspective" href="topics/cjpers.html"/>
-<topic label="Project Explorer view in the Java EE perspective" href="topics/cjview.html"/>
-<anchor id="after_intro_topics"/>
-<anchor id="before_filters"/>
-<topic label="Filtering in the Project Explorer view" href="topics/tjviewfilters.html"/>
-<anchor id="after_filters"/>
-<anchor id="before_projects"/>
-<topic label="Working with projects" href="topics/ph-projects.html">
-<topic label="Enterprise application projects" href="topics/cjearproj.html"/>
-<topic label="Application client projects" href="topics/cjappcliproj.html"/>
-<anchor id="project_types"/>
-<topic label="Creating an enterprise application project" href="topics/tjear.html"/>
-<topic label="Creating an application client project" href="topics/tjappproj.html"/>
-<topic label="Creating a connector project" href="topics/tjrar.html"/>
-<topic label="Creating Web projects" href="topics/tcreatingawebproject.html"/>
-<topic label="Creating Web fragment projects" href="topics/twebfragproj.html"/>
-<anchor id="creating_projects"/>
-<topic label="Specifying target servers for J2EE projects" href="topics/tjtargetserver.html"/>
-<anchor id="target_servers"/>
-<topic label="Project facets" href="topics/cfacets.html">
-<topic label="Adding a facet to a Java EE project" href="topics/taddingfacet.html"/>
-<topic label="Changing the version of a facet" href="topics/tchangefacet.html"/>
-<topic label="Changing the Java compiler version for a Java EE project" href="topics/tchangejavalevel.html"/>
-<anchor id="childof_J2EEProjectFacets"/>
-</topic>
-<anchor id="J2EEProjectFacets"/>
-<anchor id="before_importexport"/>
-<topic label="Importing and exporting projects and files" href="topics/ph-importexport.html">
-<anchor id="importexport_top"/>
-<topic label="Exporting an application client project" href="topics/tjexpapp.html"/>
-<topic label="Exporting an enterprise application into an EAR file" href="topics/tjexpear.html"/>
-<topic label="Exporting connector projects to RAR files" href="topics/tjexprar.html"/>
-<anchor id="export_types"/>
-<topic label="Importing an enterprise application EAR file" href="topics/tjimpear.html"/>
-<topic label="Importing an application client JAR file" href="topics/tjimpapp.html"/>
-<topic label="Importing a connector project RAR file" href="topics/tjimprar.html"/>
-<anchor id="import_types"/>
-<anchor id="before_dependencies"/>
-<topic label="Cyclical dependencies between Java EE modules" href="topics/cjcircle.html"/>
-<topic label="Correcting cyclical dependencies after an EAR is imported" href="topics/tjcircleb.html"/>
-<anchor id="after_dependencies"/>
-<anchor id="importexport_bottom"/>
-</topic>
-<anchor id="after_importexport"/>
-</topic>
-<anchor id="after_projects"/>
-<anchor id="before_validation"/>
-<topic label="Validating code in enterprise applications" href="topics/tjval.html">
-<anchor id="validation_top"/>
-<topic label="Tuning validators" href="topics/rtunevalidat.html"/>
-<topic label="Common validation errors and solutions" href="topics/rvalerr.html"/>
-<topic label="J2EE Validators" href="topics/rvalidators.html">
-<anchor id="childof_validators"/>
-</topic>
-<topic label="Disabling validation" href="topics/tjvaldisable.html"/>
-<topic label="Selecting code validators" href="topics/tjvalselect.html"/>
-<topic label="Overriding global validation preferences" href="topics/tjvalglobalpref.html"/>
-<topic label="Manually validating code" href="topics/tjvalmanual.html"/>
-<anchor id="validation_bottom"/>
-</topic>
-<anchor id="after_validation"/>
-<anchor id="before_reference"/>
-<topic label="Reference" href="topics/ph-ref.html">
-<anchor id="reference_top"/>
-<topic label="J2EE Validators" href="topics/rvalidators.html"/>
-<topic label="Common validation errors and solutions" href="topics/rvalerr.html">
-<anchor id="validation_errors"/>
-</topic>
-<topic label="Limitations of J2EE development tools" href="topics/rjlimitcurrent.html">
-<anchor id="limitations"/>
-</topic>
-<anchor id="reference_bottom"/>
-</topic>
-<anchor id="after_reference"/>
-</topic>
-<anchor id="map_bottom"/>
-</toc>
diff --git a/docs/org.eclipse.jst.j2ee.doc.user/myplugin.xml b/docs/org.eclipse.jst.j2ee.doc.user/myplugin.xml
deleted file mode 100644
index 3010c83..0000000
--- a/docs/org.eclipse.jst.j2ee.doc.user/myplugin.xml
+++ /dev/null
@@ -1,23 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<?eclipse version="3.6"?>
-<?NLS TYPE="org.eclipse.help.toc"?>
-<!-- /*******************************************************************************
- * Copyright (c) 2000, 2010 IBM Corporation and others.
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
- *
- * Contributors:
- * IBM Corporation - initial API and implementation
- *******************************************************************************/ -->
-<plugin>
-
- <extension point="org.eclipse.help.toc">
- <toc file="jst_j2ee_toc.xml" />
- <index path="index/"/>
- </extension>
- <extension point="org.eclipse.help.index">
- <index file="org.eclipse.jst.j2ee.doc.userindex.xml"/>
- </extension>
-</plugin>
\ No newline at end of file
diff --git a/docs/org.eclipse.jst.j2ee.doc.user/org.eclipse.jst.j2ee.doc.user.maplist b/docs/org.eclipse.jst.j2ee.doc.user/org.eclipse.jst.j2ee.doc.user.maplist
deleted file mode 100644
index ab8c2ad..0000000
--- a/docs/org.eclipse.jst.j2ee.doc.user/org.eclipse.jst.j2ee.doc.user.maplist
+++ /dev/null
@@ -1,9 +0,0 @@
-<maplist version="3.6.2">
- <nav>
- <map file="jst_j2ee_toc.ditamap"/>
- </nav>
- <link>
- <map file="jst_j2ee_toc.ditamap"/>
- <map file="jst_j2ee_relsmap.ditamap"/>
- </link>
-</maplist>
diff --git a/docs/org.eclipse.jst.j2ee.doc.user/org.eclipse.jst.j2ee.doc.userindex.xml b/docs/org.eclipse.jst.j2ee.doc.user/org.eclipse.jst.j2ee.doc.userindex.xml
deleted file mode 100644
index 3755b16..0000000
--- a/docs/org.eclipse.jst.j2ee.doc.user/org.eclipse.jst.j2ee.doc.userindex.xml
+++ /dev/null
@@ -1,252 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<index>
- <entry keyword="Java Enterprise Edition 5">
- <entry keyword="Overview">
- <topic href="topics/cjavaee5.html#cjavaee5" title="Developing Java EE 5 Applications"/>
- </entry>
- </entry>
- <entry keyword="Java EE 5">
- <topic href="topics/cjee5overview.html#cjavaee5" title="Java EE 5: Overview"/>
- <entry keyword="annotations">
- <topic href="topics/cannotations.html#cjavaee5" title="Java EE 5 support for annotations"/>
- <topic href="topics/tdefiningannotations.html#tjimpear" title="Defining and using annotations"/>
- <entry keyword="types">
- <topic href="topics/ctypesofanno.html#cjavaee5" title="Types of annotations"/>
- </entry>
- </entry>
- <entry keyword="defining">
- <topic href="topics/tdefiningannotations.html#tjimpear" title="Defining and using annotations"/>
- </entry>
- </entry>
- <entry keyword="Oerview">
- <topic href="topics/cjee5overview.html#cjavaee5" title="Java EE 5: Overview"/>
- </entry>
- <entry keyword="J2EE">
- <entry keyword="architecture">
- <topic href="topics/cjarch.html#cjarch" title="J2EE architecture"/>
- </entry>
- <entry keyword="enterprise application projects">
- <entry keyword="overview">
- <topic href="topics/cjearproj.html#cjearproj" title="Enterprise application projects"/>
- </entry>
- <entry keyword="creating">
- <topic href="topics/tjear.html#tjear" title="Creating an enterprise application project"/>
- </entry>
- </entry>
- <entry keyword="target servers">
- <topic href="topics/tjtargetserver.html#tjtargetserver" title="Specifying target servers for J2EE projects"/>
- </entry>
- <entry keyword="tool limitations">
- <topic href="topics/rjlimitcurrent.html#rjlimitcurrent" title="Limitations of J2EE development tools"/>
- </entry>
- </entry>
- <entry keyword="Java EE">
- <topic href="topics/cjarch.html#cjarch" title="J2EE architecture"/>
- <entry keyword="workbench perspectives">
- <topic href="topics/cjpers.html#cjpers" title="Java EE perspective"/>
- </entry>
- <entry keyword="application client projects">
- <topic href="topics/cjappcliproj.html#cjappcliproj" title="Application client projects"/>
- </entry>
- <entry keyword="project facets">
- <topic href="topics/cfacets.html#cfacets" title="Project facets"/>
- </entry>
- <entry keyword="adding project facets">
- <topic href="topics/taddingfacet.html#taddingfacet" title="Adding a facet to a Java EE project"/>
- </entry>
- <entry keyword="changing facet versions">
- <topic href="topics/tchangefacet.html#tchangefacet" title="Changing the version of a facet"/>
- </entry>
- <entry keyword="project compiler level">
- <topic href="topics/tchangejavalevel.html#tchangejavalevel" title="Changing the Java compiler version for a Java EE project"/>
- </entry>
- <entry keyword="cyclical dependencies between modules">
- <topic href="topics/cjcircle.html#cjcircle" title="Cyclical dependencies between Java EE modules"/>
- </entry>
- </entry>
- <entry keyword="enterprise applications">
- <entry keyword="Java EE perspective">
- <topic href="topics/cjpers.html#cjpers" title="Java EE perspective"/>
- </entry>
- <entry keyword="projects">
- <entry keyword="artifacts">
- <topic href="topics/cjearproj.html#cjearproj" title="Enterprise application projects"/>
- </entry>
- <entry keyword="creating">
- <topic href="topics/tjear.html#tjear" title="Creating an enterprise application project"/>
- </entry>
- <entry keyword="exporting">
- <topic href="topics/tjexpear.html#tjexpear" title="Exporting an enterprise application into an EAR file"/>
- </entry>
- <entry keyword="importing">
- <topic href="topics/tjimpear.html#tjimpear" title="Importing an enterprise application EAR file"/>
- </entry>
- </entry>
- </entry>
- <entry keyword="views">
- <entry keyword="Project Explorer">
- <topic href="topics/cjview.html#cjview" title="Project Explorer view in the Java EE perspective"/>
- </entry>
- <entry keyword="Project Explorer filters">
- <topic href="topics/tjviewfilters.html#cjviewfiltersCait" title="Filtering in the Project Explorer view"/>
- </entry>
- </entry>
- <entry keyword="filters">
- <entry keyword="Project Explorer view">
- <topic href="topics/tjviewfilters.html#cjviewfiltersCait" title="Filtering in the Project Explorer view"/>
- </entry>
- </entry>
- <entry keyword="projects">
- <entry keyword="filtering">
- <topic href="topics/tjviewfilters.html#cjviewfiltersCait" title="Filtering in the Project Explorer view"/>
- </entry>
- <entry keyword="enterprise applications">
- <topic href="topics/cjearproj.html#cjearproj" title="Enterprise application projects"/>
- </entry>
- <entry keyword="target servers">
- <topic href="topics/tjtargetserver.html#tjtargetserver" title="Specifying target servers for J2EE projects"/>
- </entry>
- <entry keyword="facets">
- <entry keyword="overview">
- <topic href="topics/cfacets.html#cfacets" title="Project facets"/>
- </entry>
- <entry keyword="adding">
- <topic href="topics/taddingfacet.html#taddingfacet" title="Adding a facet to a Java EE project"/>
- </entry>
- </entry>
- <entry keyword="changing facet versions">
- <topic href="topics/tchangefacet.html#tchangefacet" title="Changing the version of a facet"/>
- </entry>
- <entry keyword="Java compiler level">
- <topic href="topics/tchangejavalevel.html#tchangejavalevel" title="Changing the Java compiler version for a Java EE project"/>
- </entry>
- <entry keyword="cyclical dependencies">
- <topic href="topics/cjcircle.html#cjcircle" title="Cyclical dependencies between Java EE modules"/>
- </entry>
- <entry keyword="correcting cyclical dependencies">
- <topic href="topics/tjcircleb.html#tjcircleb" title="Correcting cyclical dependencies after an EAR is imported"/>
- </entry>
- </entry>
- <entry keyword="application client projects">
- <entry keyword="overview">
- <topic href="topics/cjappcliproj.html#cjappcliproj" title="Application client projects"/>
- </entry>
- <entry keyword="creating">
- <topic href="topics/tjappproj.html#tjappproj" title="Creating an application client project"/>
- </entry>
- <entry keyword="exporting">
- <topic href="topics/tjexpapp.html#tjexpapp" title="Exporting an application client project"/>
- </entry>
- <entry keyword="importing">
- <topic href="topics/tjimpapp.html#tjimpapp" title="Importing an application client JAR file"/>
- </entry>
- </entry>
- <entry keyword="connector projects">
- <entry keyword="creating">
- <topic href="topics/tjrar.html#tjrar" title="Creating a connector project"/>
- </entry>
- <entry keyword="exporting">
- <topic href="topics/tjexprar.html#tjexprar" title="Exporting connector projects to RAR files"/>
- </entry>
- <entry keyword="importing">
- <topic href="topics/tjimprar.html#tjimprar" title="Importing a connector project RAR file"/>
- </entry>
- </entry>
- <entry keyword="target servers">
- <entry keyword="J2EE applications">
- <topic href="topics/tjtargetserver.html#tjtargetserver" title="Specifying target servers for J2EE projects"/>
- </entry>
- </entry>
- <entry keyword="JavaServer Faces (JSF)">
- <entry keyword="project facets">
- <topic href="topics/cfacets.html#cfacets" title="Project facets"/>
- </entry>
- </entry>
- <entry keyword="facets">
- <entry keyword="changing versions">
- <topic href="topics/tchangefacet.html#tchangefacet" title="Changing the version of a facet"/>
- </entry>
- </entry>
- <entry keyword="EAR">
- <entry keyword="files">
- <entry keyword="exporting">
- <topic href="topics/tjexpear.html#tjexpear" title="Exporting an enterprise application into an EAR file"/>
- </entry>
- <entry keyword="importing">
- <topic href="topics/tjimpear.html#tjimpear" title="Importing an enterprise application EAR file"/>
- </entry>
- </entry>
- </entry>
- <entry keyword="RAR files">
- <entry keyword="exporting">
- <topic href="topics/tjexprar.html#tjexprar" title="Exporting connector projects to RAR files"/>
- </entry>
- <entry keyword="importing">
- <topic href="topics/tjimprar.html#tjimprar" title="Importing a connector project RAR file"/>
- </entry>
- </entry>
- <entry keyword="dependencies">
- <entry keyword="cycles between modules">
- <topic href="topics/cjcircle.html#cjcircle" title="Cyclical dependencies between Java EE modules"/>
- </entry>
- <entry keyword="correcting cyclical">
- <topic href="topics/tjcircleb.html#tjcircleb" title="Correcting cyclical dependencies after an EAR is imported"/>
- </entry>
- </entry>
- <entry keyword="EAR files">
- <entry keyword="correcting cyclical dependencies">
- <topic href="topics/tjcircleb.html#tjcircleb" title="Correcting cyclical dependencies after an EAR is imported"/>
- </entry>
- </entry>
- <entry keyword="build validation">
- <entry keyword="enabling">
- <topic href="topics/tjval.html#tjval" title="Validating code in enterprise applications"/>
- </entry>
- </entry>
- <entry keyword="code validation">
- <entry keyword="overview">
- <topic href="topics/tjval.html#tjval" title="Validating code in enterprise applications"/>
- </entry>
- <entry keyword="error solutions">
- <topic href="topics/rvalerr.html#rvalerr" title="Common validation errors and solutions"/>
- </entry>
- <entry keyword="J2EE validators">
- <topic href="topics/rvalidators.html#rvalidators" title="J2EE Validators"/>
- </entry>
- <entry keyword="disabling">
- <topic href="topics/tjvaldisable.html#tjvaldisable" title="Disabling validation"/>
- </entry>
- <entry keyword="selecting validators">
- <topic href="topics/tjvalselect.html#tjvalselect" title="Selecting code validators"/>
- </entry>
- <entry keyword="overriding global preferences">
- <topic href="topics/tjvalglobalpref.html#tjvalglobalpref" title="Overriding global validation preferences"/>
- </entry>
- <entry keyword="manual">
- <topic href="topics/tjvalmanual.html#tjvalmanual" title="Manually validating code"/>
- </entry>
- </entry>
- <entry keyword="validation">
- <entry keyword="overview">
- <topic href="topics/tjval.html#tjval" title="Validating code in enterprise applications"/>
- </entry>
- <entry keyword="error solutions">
- <topic href="topics/rvalerr.html#rvalerr" title="Common validation errors and solutions"/>
- </entry>
- <entry keyword="J2EE validators">
- <topic href="topics/rvalidators.html#rvalidators" title="J2EE Validators"/>
- </entry>
- <entry keyword="disabling">
- <topic href="topics/tjvaldisable.html#tjvaldisable" title="Disabling validation"/>
- </entry>
- <entry keyword="selecting validators">
- <topic href="topics/tjvalselect.html#tjvalselect" title="Selecting code validators"/>
- </entry>
- <entry keyword="overriding global preferences">
- <topic href="topics/tjvalglobalpref.html#tjvalglobalpref" title="Overriding global validation preferences"/>
- </entry>
- <entry keyword="manual">
- <topic href="topics/tjvalmanual.html#tjvalmanual" title="Manually validating code"/>
- </entry>
- </entry>
-</index>
\ No newline at end of file
diff --git a/docs/org.eclipse.jst.j2ee.doc.user/plugin.properties b/docs/org.eclipse.jst.j2ee.doc.user/plugin.properties
deleted file mode 100644
index 15a4950..0000000
--- a/docs/org.eclipse.jst.j2ee.doc.user/plugin.properties
+++ /dev/null
@@ -1,14 +0,0 @@
-###############################################################################
-# Copyright (c) 2001, 2008 IBM Corporation and others.
-# All rights reserved. This program and the accompanying materials
-# are made available under the terms of the Eclipse Public License v1.0
-# which accompanies this distribution, and is available at
-# http://www.eclipse.org/legal/epl-v10.html
-#
-# Contributors:
-# IBM Corporation - initial API and implementation
-###############################################################################
-# NLS_MESSAGEFORMAT_VAR
-# NLS_ENCODING=UTF-8
-pluginName = J2EE tools documentation
-pluginProvider = Eclipse.org
diff --git a/docs/org.eclipse.jst.j2ee.doc.user/plugin.xml b/docs/org.eclipse.jst.j2ee.doc.user/plugin.xml
deleted file mode 100644
index 3010c83..0000000
--- a/docs/org.eclipse.jst.j2ee.doc.user/plugin.xml
+++ /dev/null
@@ -1,23 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<?eclipse version="3.6"?>
-<?NLS TYPE="org.eclipse.help.toc"?>
-<!-- /*******************************************************************************
- * Copyright (c) 2000, 2010 IBM Corporation and others.
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
- *
- * Contributors:
- * IBM Corporation - initial API and implementation
- *******************************************************************************/ -->
-<plugin>
-
- <extension point="org.eclipse.help.toc">
- <toc file="jst_j2ee_toc.xml" />
- <index path="index/"/>
- </extension>
- <extension point="org.eclipse.help.index">
- <index file="org.eclipse.jst.j2ee.doc.userindex.xml"/>
- </extension>
-</plugin>
\ No newline at end of file
diff --git a/docs/org.eclipse.jst.j2ee.doc.user/topics/cannotations.dita b/docs/org.eclipse.jst.j2ee.doc.user/topics/cannotations.dita
deleted file mode 100644
index b93f875..0000000
--- a/docs/org.eclipse.jst.j2ee.doc.user/topics/cannotations.dita
+++ /dev/null
@@ -1,76 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!--Arbortext, Inc., 1988-2009, v.4002-->
-<!DOCTYPE concept PUBLIC "-//OASIS//DTD DITA Concept//EN"
- "concept.dtd">
-<?Pub Sty _display FontColor="red"?>
-<concept id="cjavaee5" xml:lang="en-us">
-<title outputclass="id_title"><tm tmclass="special"
-tmowner="Sun Microsystems, Inc." tmtype="tm" trademark="Java">Java</tm> EE
-5 and <tm tmclass="special" tmowner="Sun Microsystems, Inc." tmtype="tm"
-trademark="Java">Java</tm> EE 6 support for annotations</title>
-<shortdesc outputclass="id_shortdesc">The goal of <tm tmclass="special"
-tmowner="Sun Microsystems, Inc." tmtype="tm" trademark="Java">Java</tm> EE
-5 and <tm tmclass="special" tmowner="Sun Microsystems, Inc." tmtype="tm"
-trademark="Java">Java</tm> EE 6 platform development is to minimize
-the number of artifacts that you have to create and maintain, thereby
-simplifying the development process. <tm tmclass="special"
-tmowner="Sun Microsystems, Inc." tmtype="tm" trademark="Java">Java</tm> EE
-5 and <tm tmclass="special" tmowner="Sun Microsystems, Inc." tmtype="tm"
-trademark="Java">Java</tm> EE 6 support the injection of annotations
-into your source code, so that you can embed resources, dependencies,
-services, and life-cycle notifications in your source code, without
-having to maintain these artifacts elsewhere.</shortdesc>
-<prolog><metadata>
-<keywords><indexterm>Java EE 5<indexterm>annotations</indexterm></indexterm>
-</keywords>
-</metadata></prolog>
-<conbody>
-<p>An annotation is a modifier or Metadata tag that provides additional
-data to <tm tmclass="special" tmowner="Sun Microsystems, Inc."
-tmtype="tm" trademark="Java">Java</tm> classes, interfaces, constructors,
-methods, fields, parameters, and local variables. Annotations replace
-boilerplate code, common code that is required by certain applications.
-For example, an annotation can replace the paired interface and implementation
-required for a Web service. Annotations can also replace additional
-files that programs require, which are maintained separately. By using
-an annotation, this separate file is no longer required. For example,
-annotations can replace the need for a separately maintained deployment
-descriptor for <tm tmclass="special" tmowner="Sun Microsystems, Inc."
-tmtype="tm" trademark="JavaBeans">JavaBeans</tm>. </p>
-<p>Annotations<ul>
-<li>Replace descriptors for most purposes</li>
-<li>Remove the need for marker interfaces (like java.rmi.Remote)</li>
-<li>Allow application settings to be visible in the component they
-affect</li>
-</ul></p>
-<p>Java EE 5 provides annotations for the following tasks, among others:<ul>
-<li>Developing Enterprise JavaBean applications</li>
-<li>Defining and using Web services</li>
-<li>Mapping Java technology classes to XML</li>
-<li>Mapping Java technology classes to databases</li>
-<li>Mapping methods to operations</li>
-<li>Specifying external dependencies</li>
-<li>Specirying deployment information, including security attributes</li>
-</ul></p>
-<p><tm tmclass="special" tmowner="Sun Microsystems, Inc." tmtype="tm"
-trademark="Java">Java</tm> EE 5 defines a number of annotations that
-can be injected into your source code. To declare an annotation, you
-simply precede the keyword with an "at" sign (@). <codeblock>
-package com.ibm.counter;
-
-import javax.ejb.Stateless;
-
-@Stateless
-
-public class CounterBean {
-
-}</codeblock></p>
-<p>For more information about the categories of annotations that <tm
-tmclass="special" tmowner="Sun Microsystems, Inc." tmtype="tm"
-trademark="Java">Java</tm> EE 5 and <tm tmclass="special"
-tmowner="Sun Microsystems, Inc." tmtype="tm" trademark="Java">Java</tm> EE
-6 support, see <xref href="ctypesofanno.dita">Types of annotations</xref>.</p><?Pub
-Caret 85?>
-</conbody>
-</concept>
-<?Pub *0000003751?>
diff --git a/docs/org.eclipse.jst.j2ee.doc.user/topics/cannotations.html b/docs/org.eclipse.jst.j2ee.doc.user/topics/cannotations.html
deleted file mode 100644
index 3d9fea2..0000000
--- a/docs/org.eclipse.jst.j2ee.doc.user/topics/cannotations.html
+++ /dev/null
@@ -1,113 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?><!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.0 Transitional//EN" "http://www.w3.org/TR/xhtml1/DTD/xhtml1-transitional.dtd">
-<html lang="en-us" xml:lang="en-us">
-<head>
-<meta content="text/html; charset=utf-8" http-equiv="Content-Type" />
-<meta name="copyright" content="Copyright (c) 2000, 2009 IBM Corporation and others. All rights reserved. This program and the accompanying materials are made available under the terms of the Eclipse Public License v1.0 which accompanies this distribution, and is available at http://www.eclipse.org/legal/epl-v10.html. Contributors: IBM Corporation - initial API and implementation" />
-<meta name="DC.rights.owner" content="(C) Copyright 2000, 2009" />
-<meta content="public" name="security" />
-<meta content="index,follow" name="Robots" />
-<meta http-equiv="PICS-Label" content='(PICS-1.1 "http://www.icra.org/ratingsv02.html" l gen true r (cz 1 lz 1 nz 1 oz 1 vz 1) "http://www.rsac.org/ratingsv01.html" l gen true r (n 0 s 0 v 0 l 0) "http://www.classify.org/safesurf/" l gen true r (SS~~000 1))' />
-<meta content="concept" name="DC.Type" />
-<meta name="DC.Title" content="Java EE 5 and Java EE 6 support for annotations" />
-<meta name="abstract" content="The goal of Java EE 5 and Java EE 6 platform development is to minimize the number of artifacts that you have to create and maintain, thereby simplifying the development process. Java EE 5 and Java EE 6 support the injection of annotations into your source code, so that you can embed resources, dependencies, services, and life-cycle notifications in your source code, without having to maintain these artifacts elsewhere." />
-<meta name="description" content="The goal of Java EE 5 and Java EE 6 platform development is to minimize the number of artifacts that you have to create and maintain, thereby simplifying the development process. Java EE 5 and Java EE 6 support the injection of annotations into your source code, so that you can embed resources, dependencies, services, and life-cycle notifications in your source code, without having to maintain these artifacts elsewhere." />
-<meta content="Java EE 5, annotations" name="DC.subject" />
-<meta content="Java EE 5, annotations" name="keywords" />
-<meta scheme="URI" name="DC.Relation" content="../topics/cjavaee5.html" />
-<meta scheme="URI" name="DC.Relation" content="../topics/tdefiningannotations.html" />
-<meta content="XHTML" name="DC.Format" />
-<meta content="cjavaee5" name="DC.Identifier" />
-<meta content="en-us" name="DC.Language" />
-<link href="../../org.eclipse.wst.doc.user/common.css" type="text/css" rel="stylesheet" />
-<title>Java EE
-5 and Java EE 6 support for annotations</title>
-</head>
-<body id="cjavaee5"><a name="cjavaee5"><!-- --></a>
-
-
-<h1 class="id_title">Java EE
-5 and Java EE 6 support for annotations</h1>
-
-
-
-<div><p class="id_shortdesc">The goal of Java™ EE
-5 and Java EE 6 platform development is to minimize
-the number of artifacts that you have to create and maintain, thereby
-simplifying the development process. Java EE
-5 and Java EE 6 support the injection of annotations
-into your source code, so that you can embed resources, dependencies,
-services, and life-cycle notifications in your source code, without
-having to maintain these artifacts elsewhere.</p>
-
-<p>An annotation is a modifier or Metadata tag that provides additional
-data to Java classes, interfaces, constructors,
-methods, fields, parameters, and local variables. Annotations replace
-boilerplate code, common code that is required by certain applications.
-For example, an annotation can replace the paired interface and implementation
-required for a Web service. Annotations can also replace additional
-files that programs require, which are maintained separately. By using
-an annotation, this separate file is no longer required. For example,
-annotations can replace the need for a separately maintained deployment
-descriptor for JavaBeans™. </p>
-
-<div class="p">Annotations<ul>
-<li>Replace descriptors for most purposes</li>
-
-<li>Remove the need for marker interfaces (like java.rmi.Remote)</li>
-
-<li>Allow application settings to be visible in the component they
-affect</li>
-
-</ul>
-</div>
-
-<div class="p">Java EE 5 provides annotations for the following tasks, among others:<ul>
-<li>Developing Enterprise JavaBean applications</li>
-
-<li>Defining and using Web services</li>
-
-<li>Mapping Java technology classes to XML</li>
-
-<li>Mapping Java technology classes to databases</li>
-
-<li>Mapping methods to operations</li>
-
-<li>Specifying external dependencies</li>
-
-<li>Specirying deployment information, including security attributes</li>
-
-</ul>
-</div>
-
-<div class="p">Java EE 5 defines a number of annotations that
-can be injected into your source code. To declare an annotation, you
-simply precede the keyword with an "at" sign (@). <pre>
-package com.ibm.counter;
-
-import javax.ejb.Stateless;
-
-@Stateless
-
-public class CounterBean {
-
-}</pre>
-</div>
-
-<p>For more information about the categories of annotations that Java EE 5 and Java EE
-6 support, see <a href="ctypesofanno.html">Types of annotations</a>.</p>
-
-</div>
-
-<div>
-<ul class="ullinks">
-<li class="ulchildlink"><strong><a href="../topics/tdefiningannotations.html">Defining and using annotations</a></strong><br />
-You can use the @Interface annotation to define your own annotation definition.</li>
-</ul>
-
-<div class="familylinks">
-<div class="parentlink"><strong>Parent topic:</strong> <a href="../topics/cjavaee5.html" title="The Java EE 5 programming model simplifies the process of creating Java applications.">Developing Java EE Applications</a></div>
-</div>
-</div>
-
-</body>
-</html>
\ No newline at end of file
diff --git a/docs/org.eclipse.jst.j2ee.doc.user/topics/cfacets.dita b/docs/org.eclipse.jst.j2ee.doc.user/topics/cfacets.dita
deleted file mode 100644
index 11b0578..0000000
--- a/docs/org.eclipse.jst.j2ee.doc.user/topics/cfacets.dita
+++ /dev/null
@@ -1,40 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<!--Arbortext, Inc., 1988-2006, v.4002-->
-<!DOCTYPE concept PUBLIC "-//OASIS//DTD DITA Concept//EN"
- "concept.dtd">
-<concept id="cfacets" xml:lang="en-us">
-<title outputclass="id_title">Project facets</title>
-<shortdesc outputclass="id_shortdesc">Facets define characteristics and requirements
-for Java EE projects and are used as part of the runtime configuration. </shortdesc>
-<prolog><metadata>
-<keywords><indexterm>Java EE<indexterm>project facets</indexterm></indexterm>
-<indexterm>JavaServer Faces (JSF)<indexterm>project facets</indexterm></indexterm>
-<indexterm>projects<indexterm>facets<indexterm>overview</indexterm></indexterm></indexterm>
-</keywords>
-</metadata></prolog>
-<conbody outputclass="id_conbody">
-<p outputclass="anchor_topictop"></p>
-<p id="aboutfacet">When you add a facet to a project, that project is configured
-to perform a certain task, fulfill certain requirements, or have certain characteristics.
-For example, the EAR facet sets up a project to function as an enterprise
-application by adding a deployment descriptor and setting up the project's
-classpath.</p>
-<p>You can add facets only to Java EE projects and other types of projects
-that are based on J2EE projects, such as enterprise application projects,
-dynamic Web projects, and EJB projects. You cannot add facets to a <tm tmclass="special"
-tmowner="Sun Microsystems, Inc." tmtype="tm" trademark="Java">Java</tm> project
-or plug-in project, for example. Typically, a facet-enabled project has at
-least one facet when it is created, allowing you to add more facets if necessary.
-For example, a new EJB project has the EJB Module facet. You can then add
-other facets to this project like the EJBDoclet (XDoclet) facet. To add a
-facet to a project, see <xref href="taddingfacet.dita"></xref>.</p>
-<p>Some facets require other facets as prerequisites. Other facets cannot
-be in the same project together. For example, you cannot add the Dynamic Web
-Module facet to an EJB project because the EJB project already has the EJB
-Module facet. Some facets can be removed from a project and others cannot.</p>
-<p>Facets also have version numbers. You can change the version numbers of
-facets as long as you stay within the requirements for the facets. To change
-the version number of a facet, see <xref href="tchangefacet.dita"></xref>.</p>
-<p outputclass="anchor_topicbottom"></p>
-</conbody>
-</concept>
diff --git a/docs/org.eclipse.jst.j2ee.doc.user/topics/cfacets.html b/docs/org.eclipse.jst.j2ee.doc.user/topics/cfacets.html
deleted file mode 100644
index 81e6b1b..0000000
--- a/docs/org.eclipse.jst.j2ee.doc.user/topics/cfacets.html
+++ /dev/null
@@ -1,83 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?><!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.0 Transitional//EN" "http://www.w3.org/TR/xhtml1/DTD/xhtml1-transitional.dtd">
-<html lang="en-us" xml:lang="en-us">
-<head>
-<meta content="text/html; charset=utf-8" http-equiv="Content-Type" />
-<meta name="copyright" content="Copyright (c) 2000, 2009 IBM Corporation and others. All rights reserved. This program and the accompanying materials are made available under the terms of the Eclipse Public License v1.0 which accompanies this distribution, and is available at http://www.eclipse.org/legal/epl-v10.html. Contributors: IBM Corporation - initial API and implementation" />
-<meta name="DC.rights.owner" content="(C) Copyright 2000, 2009" />
-<meta content="public" name="security" />
-<meta content="index,follow" name="Robots" />
-<meta http-equiv="PICS-Label" content='(PICS-1.1 "http://www.icra.org/ratingsv02.html" l gen true r (cz 1 lz 1 nz 1 oz 1 vz 1) "http://www.rsac.org/ratingsv01.html" l gen true r (n 0 s 0 v 0 l 0) "http://www.classify.org/safesurf/" l gen true r (SS~~000 1))' />
-<meta content="concept" name="DC.Type" />
-<meta name="DC.Title" content="Project facets" />
-<meta name="abstract" content="Facets define characteristics and requirements for Java EE projects and are used as part of the runtime configuration." />
-<meta name="description" content="Facets define characteristics and requirements for Java EE projects and are used as part of the runtime configuration." />
-<meta content="Java EE, project facets, JavaServer Faces (JSF), projects, facets, overview" name="DC.subject" />
-<meta content="Java EE, project facets, JavaServer Faces (JSF), projects, facets, overview" name="keywords" />
-<meta scheme="URI" name="DC.Relation" content="../topics/cjearproj.html" />
-<meta scheme="URI" name="DC.Relation" content="../topics/tjear.html" />
-<meta scheme="URI" name="DC.Relation" content="../topics/tjappproj.html" />
-<meta scheme="URI" name="DC.Relation" content="../topics/tjrar.html" />
-<meta scheme="URI" name="DC.Relation" content="../topics/taddingfacet.html" />
-<meta scheme="URI" name="DC.Relation" content="../topics/tchangejavalevel.html" />
-<meta scheme="URI" name="DC.Relation" content="../topics/tchangefacet.html" />
-<meta content="XHTML" name="DC.Format" />
-<meta content="cfacets" name="DC.Identifier" />
-<meta content="en-us" name="DC.Language" />
-<link href="../../org.eclipse.wst.doc.user/common.css" type="text/css" rel="stylesheet" />
-<title>Project facets</title>
-</head>
-<body id="cfacets"><a name="cfacets"><!-- --></a>
-
-
-<h1 class="id_title">Project facets</h1>
-
-
-
-<div class="id_conbody"><p class="id_shortdesc">Facets define characteristics and requirements
-for Java EE projects and are used as part of the runtime configuration. </p>
-
-<p class="anchor_topictop" />
-
-<p id="cfacets__aboutfacet"><a name="cfacets__aboutfacet"><!-- --></a>When you add a facet to a project, that project is configured
-to perform a certain task, fulfill certain requirements, or have certain characteristics.
-For example, the EAR facet sets up a project to function as an enterprise
-application by adding a deployment descriptor and setting up the project's
-classpath.</p>
-
-<p>You can add facets only to Java EE projects and other types of projects
-that are based on J2EE projects, such as enterprise application projects,
-dynamic Web projects, and EJB projects. You cannot add facets to a Java™ project
-or plug-in project, for example. Typically, a facet-enabled project has at
-least one facet when it is created, allowing you to add more facets if necessary.
-For example, a new EJB project has the EJB Module facet. You can then add
-other facets to this project like the EJBDoclet (XDoclet) facet. To add a
-facet to a project, see <a href="taddingfacet.html" title="This topic explains how to add a facet to an existing project in your workspace.">Adding a facet to a Java EE project</a>.</p>
-
-<p>Some facets require other facets as prerequisites. Other facets cannot
-be in the same project together. For example, you cannot add the Dynamic Web
-Module facet to an EJB project because the EJB project already has the EJB
-Module facet. Some facets can be removed from a project and others cannot.</p>
-
-<p>Facets also have version numbers. You can change the version numbers of
-facets as long as you stay within the requirements for the facets. To change
-the version number of a facet, see <a href="tchangefacet.html" title="You can change the version of a facet in a Java EE project by editing the facets for the project.">Changing the version of a facet</a>.</p>
-
-<p class="anchor_topicbottom" />
-
-</div>
-
-<div><div class="relconcepts"><strong>Related concepts</strong><br />
-<div><a href="../topics/cjearproj.html" title="An enterprise application project ties together the resources that are required to deploy a J2EE enterprise application.">Enterprise application projects</a></div>
-</div>
-<div class="reltasks"><strong>Related tasks</strong><br />
-<div><a href="../topics/tjear.html" title="Using the wizard to create an enterprise application project allows you to package many web applications and modules in a project and deploy these modules as a J2EE enterprise application.">Creating an enterprise application project</a></div>
-<div><a href="../topics/tjappproj.html" title="You can use a wizard to create a new application client project and add it to a new or existing enterprise application project.">Creating an application client project</a></div>
-<div><a href="../topics/tjrar.html" title="A connector is a J2EE standard extension mechanism for containers to provide connectivity to enterprise information systems (EISs).">Creating a connector project</a></div>
-<div><a href="../topics/taddingfacet.html" title="This topic explains how to add a facet to an existing project in your workspace.">Adding a facet to a Java EE project</a></div>
-<div><a href="../topics/tchangejavalevel.html" title="You can change the version of Java used in a Java EE project by changing the value of the Java facet.">Changing the Java compiler version for a Java EE project</a></div>
-<div><a href="../topics/tchangefacet.html" title="You can change the version of a facet in a Java EE project by editing the facets for the project.">Changing the version of a facet</a></div>
-</div>
-</div>
-
-</body>
-</html>
\ No newline at end of file
diff --git a/docs/org.eclipse.jst.j2ee.doc.user/topics/cjappcliproj.dita b/docs/org.eclipse.jst.j2ee.doc.user/topics/cjappcliproj.dita
deleted file mode 100644
index 92d44a0..0000000
--- a/docs/org.eclipse.jst.j2ee.doc.user/topics/cjappcliproj.dita
+++ /dev/null
@@ -1,81 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<!--Arbortext, Inc., 1988-2006, v.4002-->
-<!DOCTYPE concept PUBLIC "-//OASIS//DTD DITA Concept//EN"
- "concept.dtd">
-<concept id="cjappcliproj" xml:lang="en-us">
-<title outputclass="id_title">Application client projects</title>
-<shortdesc outputclass="id_shortdesc">Application client projects contain
-programs that run on networked client systems so the project can benefit from
-a server's tools.</shortdesc>
-<prolog><metadata>
-<keywords><indexterm>application client projects<indexterm>overview</indexterm></indexterm>
-<indexterm>Java EE<indexterm>application client projects</indexterm></indexterm>
-</keywords>
-</metadata></prolog>
-<conbody outputclass="id_conbody">
-<p outputclass="anchor_topictop"></p>
-<p> Application client projects contain the resources needed for application
-client modules. An application client module is used to contain a full-function
-client <tm tmclass="special" tmowner="Sun Microsystems, Inc." tmtype="tm"
-trademark="Java">Java</tm> application (non Web-based) that connects to and
-uses the Java EE resources defined in your server. When you place the client
-code in an application client module instead of a simple JAR file, the application
-client benefits from the server's resources (it does not need to re-specify
-the class path to Java EE and server JAR files) as well as from easier JNDI
-lookup (the client container fills in the initial context and other parameters).
-The application client project allows you to work as if you are creating a
-standalone <tm tmclass="special" tmowner="Sun Microsystems, Inc." tmtype="tm"
-trademark="Java">Java</tm> application in a <tm tmclass="special" tmowner="Sun Microsystems, Inc."
-tmtype="tm" trademark="Java">Java</tm> project.</p>
-<p>An application client project enables you to do the following things:</p>
-<ul>
-<li>Develop the <tm tmclass="special" tmowner="Sun Microsystems, Inc." tmtype="tm"
-trademark="Java">Java</tm> classes that implement the client module</li>
-<li>Set the application client deployment descriptor</li>
-<li>Test the application client</li>
-</ul>
-<p>Like <tm tmclass="special" tmowner="Sun Microsystems, Inc." tmtype="tm"
-trademark="Java">Java</tm> projects, application client projects contain the
-resources needed for application clients, including <tm tmclass="special"
-tmowner="Sun Microsystems, Inc." tmtype="tm" trademark="Java">Java</tm> class
-files. When you create a new application client project, the environment is
-set up for <tm tmclass="special" tmowner="Sun Microsystems, Inc." tmtype="tm"
-trademark="Java">Java</tm> development. A <tm tmclass="special" tmowner="Sun Microsystems, Inc."
-tmtype="tm" trademark="Java">Java</tm> builder is associated with the project
-so the <tm tmclass="special" tmowner="Sun Microsystems, Inc." tmtype="tm"
-trademark="Java">Java</tm> source can be incrementally compiled as it is updated.
-The application client project contains information about the type hierarchy
-and <tm tmclass="special" tmowner="Sun Microsystems, Inc." tmtype="tm" trademark="Java">Java</tm> elements.
-This information is kept current as changes are made, and the <tm tmclass="special"
-tmowner="Sun Microsystems, Inc." tmtype="tm" trademark="Java">Java</tm> builder
-will incrementally compile the resources within these projects as the resources
-are updated.</p>
-<p>In the workbench, application client projects are always referenced by
-enterprise application (EAR) projects. When you create an application client
-project, you specify the enterprise application project to which the application
-client project belongs. A module element is automatically added to the <codeph>application.xml</codeph> deployment
-descriptor for the EAR project.</p>
-<p>An application client project is deployed as a JAR file. This application
-client JAR file contains the necessary resources for the application, including <tm
-tmclass="special" tmowner="Sun Microsystems, Inc." tmtype="tm" trademark="Java">Java</tm> class
-files, and deployment descriptor information and any meta-data extensions
-and bindings files.</p>
-<p>Application client projects are typically run on networked client systems
-connected to Java EE (EJB) servers. The point of entry for the application
-client is a <tm tmclass="special" tmowner="Sun Microsystems, Inc." tmtype="tm"
-trademark="Java">Java</tm> main-class, which is simply a <tm tmclass="special"
-tmowner="Sun Microsystems, Inc." tmtype="tm" trademark="Java">Java</tm> class
-that contains a static main method. The class is declared in the manifest
-file of the client module. </p>
-<p>A Java EE application client container provides access to the Java EE service
-(JNDI naming services, deployment services, transaction services, and security
-services) and communications APIs (internet protocols, Remote Method Invocation
-protocols, Object Management Group protocols, Messaging protocols, and data
-formats).</p>
-<p>By default, application client projects contain one folder named <uicontrol>appClientModule</uicontrol>,
-which contains both <tm tmclass="special" tmowner="Sun Microsystems, Inc."
-tmtype="tm" trademark="Java">Java</tm> source code and compiled <codeph>.class</codeph> files,
-along with all the meta-data files in the <uicontrol>META-INF</uicontrol> subfolder.</p>
-<p outputclass="anchor_topicbottom"></p>
-</conbody>
-</concept>
diff --git a/docs/org.eclipse.jst.j2ee.doc.user/topics/cjappcliproj.html b/docs/org.eclipse.jst.j2ee.doc.user/topics/cjappcliproj.html
deleted file mode 100644
index 3977b0a..0000000
--- a/docs/org.eclipse.jst.j2ee.doc.user/topics/cjappcliproj.html
+++ /dev/null
@@ -1,114 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?><!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.0 Transitional//EN" "http://www.w3.org/TR/xhtml1/DTD/xhtml1-transitional.dtd">
-<html lang="en-us" xml:lang="en-us">
-<head>
-<meta content="text/html; charset=utf-8" http-equiv="Content-Type" />
-<meta name="copyright" content="Copyright (c) 2000, 2009 IBM Corporation and others. All rights reserved. This program and the accompanying materials are made available under the terms of the Eclipse Public License v1.0 which accompanies this distribution, and is available at http://www.eclipse.org/legal/epl-v10.html. Contributors: IBM Corporation - initial API and implementation" />
-<meta name="DC.rights.owner" content="(C) Copyright 2000, 2009" />
-<meta content="public" name="security" />
-<meta content="index,follow" name="Robots" />
-<meta http-equiv="PICS-Label" content='(PICS-1.1 "http://www.icra.org/ratingsv02.html" l gen true r (cz 1 lz 1 nz 1 oz 1 vz 1) "http://www.rsac.org/ratingsv01.html" l gen true r (n 0 s 0 v 0 l 0) "http://www.classify.org/safesurf/" l gen true r (SS~~000 1))' />
-<meta content="concept" name="DC.Type" />
-<meta name="DC.Title" content="Application client projects" />
-<meta name="abstract" content="Application client projects contain programs that run on networked client systems so the project can benefit from a server's tools." />
-<meta name="description" content="Application client projects contain programs that run on networked client systems so the project can benefit from a server's tools." />
-<meta content="application client projects, overview, Java EE" name="DC.subject" />
-<meta content="application client projects, overview, Java EE" name="keywords" />
-<meta scheme="URI" name="DC.Relation" content="../topics/cjarch.html" />
-<meta scheme="URI" name="DC.Relation" content="../topics/tjappproj.html" />
-<meta scheme="URI" name="DC.Relation" content="../topics/tjexpapp.html" />
-<meta scheme="URI" name="DC.Relation" content="../topics/tjimpapp.html" />
-<meta content="XHTML" name="DC.Format" />
-<meta content="cjappcliproj" name="DC.Identifier" />
-<meta content="en-us" name="DC.Language" />
-<link href="../../org.eclipse.wst.doc.user/common.css" type="text/css" rel="stylesheet" />
-<title>Application client projects</title>
-</head>
-<body id="cjappcliproj"><a name="cjappcliproj"><!-- --></a>
-
-
-<h1 class="id_title">Application client projects</h1>
-
-
-
-<div class="id_conbody"><p class="id_shortdesc">Application client projects contain
-programs that run on networked client systems so the project can benefit from
-a server's tools.</p>
-
-<p class="anchor_topictop" />
-
-<p> Application client projects contain the resources needed for application
-client modules. An application client module is used to contain a full-function
-client Java™ application (non Web-based) that connects to and
-uses the Java EE resources defined in your server. When you place the client
-code in an application client module instead of a simple JAR file, the application
-client benefits from the server's resources (it does not need to re-specify
-the class path to Java EE and server JAR files) as well as from easier JNDI
-lookup (the client container fills in the initial context and other parameters).
-The application client project allows you to work as if you are creating a
-standalone Java application in a Java project.</p>
-
-<p>An application client project enables you to do the following things:</p>
-
-<ul>
-<li>Develop the Java classes that implement the client module</li>
-
-<li>Set the application client deployment descriptor</li>
-
-<li>Test the application client</li>
-
-</ul>
-
-<p>Like Java projects, application client projects contain the
-resources needed for application clients, including Java class
-files. When you create a new application client project, the environment is
-set up for Java development. A Java builder is associated with the project
-so the Java source can be incrementally compiled as it is updated.
-The application client project contains information about the type hierarchy
-and Java elements.
-This information is kept current as changes are made, and the Java builder
-will incrementally compile the resources within these projects as the resources
-are updated.</p>
-
-<p>In the workbench, application client projects are always referenced by
-enterprise application (EAR) projects. When you create an application client
-project, you specify the enterprise application project to which the application
-client project belongs. A module element is automatically added to the <samp class="codeph">application.xml</samp> deployment
-descriptor for the EAR project.</p>
-
-<p>An application client project is deployed as a JAR file. This application
-client JAR file contains the necessary resources for the application, including Java class
-files, and deployment descriptor information and any meta-data extensions
-and bindings files.</p>
-
-<p>Application client projects are typically run on networked client systems
-connected to Java EE (EJB) servers. The point of entry for the application
-client is a Java main-class, which is simply a Java class
-that contains a static main method. The class is declared in the manifest
-file of the client module. </p>
-
-<p>A Java EE application client container provides access to the Java EE service
-(JNDI naming services, deployment services, transaction services, and security
-services) and communications APIs (internet protocols, Remote Method Invocation
-protocols, Object Management Group protocols, Messaging protocols, and data
-formats).</p>
-
-<p>By default, application client projects contain one folder named <span class="uicontrol">appClientModule</span>,
-which contains both Java source code and compiled <samp class="codeph">.class</samp> files,
-along with all the meta-data files in the <span class="uicontrol">META-INF</span> subfolder.</p>
-
-<p class="anchor_topicbottom" />
-
-</div>
-
-<div><div class="relconcepts"><strong>Related concepts</strong><br />
-<div><a href="../topics/cjarch.html" title="The Java 2 Platform, Enterprise Edition (J2EE) provides a standard for developing multitier, enterprise applications.">J2EE architecture</a></div>
-</div>
-<div class="reltasks"><strong>Related tasks</strong><br />
-<div><a href="../topics/tjappproj.html" title="You can use a wizard to create a new application client project and add it to a new or existing enterprise application project.">Creating an application client project</a></div>
-<div><a href="../topics/tjexpapp.html" title="You can export an application client project as a JAR file.">Exporting an application client project</a></div>
-<div><a href="../topics/tjimpapp.html" title="Application client projects are deployed as JAR files. You can import an application client project that has been deployed into a JAR file by using the Import wizard.">Importing an application client JAR file</a></div>
-</div>
-</div>
-
-</body>
-</html>
\ No newline at end of file
diff --git a/docs/org.eclipse.jst.j2ee.doc.user/topics/cjarch.dita b/docs/org.eclipse.jst.j2ee.doc.user/topics/cjarch.dita
deleted file mode 100644
index f715cd4..0000000
--- a/docs/org.eclipse.jst.j2ee.doc.user/topics/cjarch.dita
+++ /dev/null
@@ -1,51 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<!--Arbortext, Inc., 1988-2006, v.4002-->
-<!DOCTYPE concept PUBLIC "-//OASIS//DTD DITA Concept//EN"
- "concept.dtd">
-<concept id="cjarch" xml:lang="en-us">
-<title outputclass="id_title">J2EE architecture</title>
-<shortdesc outputclass="id_shortdesc">The <tm tmclass="special" tmowner="Sun Microsystems, Inc."
-tmtype="tm" trademark="Java">Java</tm> 2 Platform, Enterprise Edition (J2EE)
-provides a standard for developing multitier, enterprise applications.</shortdesc>
-<prolog><metadata>
-<keywords><indexterm>J2EE<indexterm>architecture</indexterm></indexterm><indexterm>Java
-EE</indexterm></keywords>
-</metadata></prolog>
-<conbody outputclass="id_conbody">
-<p outputclass="anchor_topictop"></p>
-<p>The economy and technology of today have intensified the need for faster,
-more efficient, and larger-scale information management solutions. The J2EE
-specification satisfies these challenges by providing a programming model
-that improves development productivity, standardizes the platform for hosting
-enterprise applications, and ensures portability of developed applications
-with an extensive test suite.</p>
-<p>J2EE architecture supports component-based development of multi-tier enterprise
-applications. A J2EE application system typically includes the following tiers:</p>
-<dl><dlentry outputclass="id_projectfiles_top">
-<dt>Client tier</dt>
-<dd>In the client tier, Web components, such as Servlets and JavaServer Pages
-(JSPs), or standalone <tm tmclass="special" tmowner="Sun Microsystems, Inc."
-tmtype="tm" trademark="Java">Java</tm> applications provide a dynamic interface
-to the middle tier.</dd>
-</dlentry><dlentry>
-<dt>Middle tier</dt>
-<dd>In the server tier, or middle tier, enterprise beans and Web Services
-encapsulate reusable, distributable business logic for the application. These
-server-tier components are contained on a J2EE Application Server, which provides
-the platform for these components to perform actions and store data.</dd>
-</dlentry><dlentry>
-<dt>Enterprise data tier</dt>
-<dd>In the data tier, the enterprise's data is stored and persisted, typically
-in a relational database.</dd>
-</dlentry></dl>
-<p>J2EE applications are comprised of components, containers, and services.
-Components are application-level components. Web components, such as Servlets
-and JSPs, provide dynamic responses to requests from a Web page. EJB components
-contain server-side business logic for enterprise applications. Web and EJB
-component containers host services that support Web and EJB modules.</p>
-<p>For more information on J2EE architecture and its implicit technologies,
-download and read the <xref format="html" href="http://java.sun.com/j2ee/download.html#platformspec"
-scope="external">J2EE 1.4 Specification<desc></desc></xref>.</p>
-<p outputclass="anchor_topicbottom"></p>
-</conbody>
-</concept>
diff --git a/docs/org.eclipse.jst.j2ee.doc.user/topics/cjarch.html b/docs/org.eclipse.jst.j2ee.doc.user/topics/cjarch.html
deleted file mode 100644
index 172f4fe..0000000
--- a/docs/org.eclipse.jst.j2ee.doc.user/topics/cjarch.html
+++ /dev/null
@@ -1,103 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?><!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.0 Transitional//EN" "http://www.w3.org/TR/xhtml1/DTD/xhtml1-transitional.dtd">
-<html lang="en-us" xml:lang="en-us">
-<head>
-<meta content="text/html; charset=utf-8" http-equiv="Content-Type" />
-<meta name="copyright" content="Copyright (c) 2000, 2009 IBM Corporation and others. All rights reserved. This program and the accompanying materials are made available under the terms of the Eclipse Public License v1.0 which accompanies this distribution, and is available at http://www.eclipse.org/legal/epl-v10.html. Contributors: IBM Corporation - initial API and implementation" />
-<meta name="DC.rights.owner" content="(C) Copyright 2000, 2009" />
-<meta content="public" name="security" />
-<meta content="index,follow" name="Robots" />
-<meta http-equiv="PICS-Label" content='(PICS-1.1 "http://www.icra.org/ratingsv02.html" l gen true r (cz 1 lz 1 nz 1 oz 1 vz 1) "http://www.rsac.org/ratingsv01.html" l gen true r (n 0 s 0 v 0 l 0) "http://www.classify.org/safesurf/" l gen true r (SS~~000 1))' />
-<meta content="concept" name="DC.Type" />
-<meta name="DC.Title" content="J2EE architecture" />
-<meta name="abstract" content="The Java 2 Platform, Enterprise Edition (J2EE) provides a standard for developing multitier, enterprise applications." />
-<meta name="description" content="The Java 2 Platform, Enterprise Edition (J2EE) provides a standard for developing multitier, enterprise applications." />
-<meta content="J2EE, architecture, Java EE" name="DC.subject" />
-<meta content="J2EE, architecture, Java EE" name="keywords" />
-<meta scheme="URI" name="DC.Relation" content="../topics/cjearproj.html" />
-<meta scheme="URI" name="DC.Relation" content="../topics/tjear.html" />
-<meta scheme="URI" name="DC.Relation" content="../topics/tjimpear.html" />
-<meta scheme="URI" name="DC.Relation" content="../topics/tjexpear.html" />
-<meta scheme="URI" name="DC.Relation" content="../topics/cjappcliproj.html" />
-<meta scheme="URI" name="DC.Relation" content="../topics/tjappproj.html" />
-<meta scheme="URI" name="DC.Relation" content="../topics/tjexpapp.html" />
-<meta scheme="URI" name="DC.Relation" content="../topics/tjimpapp.html" />
-<meta content="XHTML" name="DC.Format" />
-<meta content="cjarch" name="DC.Identifier" />
-<meta content="en-us" name="DC.Language" />
-<link href="../../org.eclipse.wst.doc.user/common.css" type="text/css" rel="stylesheet" />
-<title>J2EE architecture</title>
-</head>
-<body id="cjarch"><a name="cjarch"><!-- --></a>
-
-
-<h1 class="id_title">J2EE architecture</h1>
-
-
-
-<div class="id_conbody"><p class="id_shortdesc">The Java™ 2 Platform, Enterprise Edition (J2EE)
-provides a standard for developing multitier, enterprise applications.</p>
-
-<p class="anchor_topictop" />
-
-<p>The economy and technology of today have intensified the need for faster,
-more efficient, and larger-scale information management solutions. The J2EE
-specification satisfies these challenges by providing a programming model
-that improves development productivity, standardizes the platform for hosting
-enterprise applications, and ensures portability of developed applications
-with an extensive test suite.</p>
-
-<p>J2EE architecture supports component-based development of multi-tier enterprise
-applications. A J2EE application system typically includes the following tiers:</p>
-
-<dl>
-<dt class="dlterm">Client tier</dt>
-
-<dd>In the client tier, Web components, such as Servlets and JavaServer Pages
-(JSPs), or standalone Java applications provide a dynamic interface
-to the middle tier.</dd>
-
-
-<dt class="dlterm">Middle tier</dt>
-
-<dd>In the server tier, or middle tier, enterprise beans and Web Services
-encapsulate reusable, distributable business logic for the application. These
-server-tier components are contained on a J2EE Application Server, which provides
-the platform for these components to perform actions and store data.</dd>
-
-
-<dt class="dlterm">Enterprise data tier</dt>
-
-<dd>In the data tier, the enterprise's data is stored and persisted, typically
-in a relational database.</dd>
-
-</dl>
-
-<p>J2EE applications are comprised of components, containers, and services.
-Components are application-level components. Web components, such as Servlets
-and JSPs, provide dynamic responses to requests from a Web page. EJB components
-contain server-side business logic for enterprise applications. Web and EJB
-component containers host services that support Web and EJB modules.</p>
-
-<p>For more information on J2EE architecture and its implicit technologies,
-download and read the <a href="http://java.sun.com/j2ee/download.html#platformspec" target="_blank" title="">J2EE 1.4 Specification</a>.</p>
-
-<p class="anchor_topicbottom" />
-
-</div>
-
-<div><div class="relconcepts"><strong>Related concepts</strong><br />
-<div><a href="../topics/cjearproj.html" title="An enterprise application project ties together the resources that are required to deploy a J2EE enterprise application.">Enterprise application projects</a></div>
-<div><a href="../topics/cjappcliproj.html" title="Application client projects contain programs that run on networked client systems so the project can benefit from a server's tools.">Application client projects</a></div>
-</div>
-<div class="reltasks"><strong>Related tasks</strong><br />
-<div><a href="../topics/tjear.html" title="Using the wizard to create an enterprise application project allows you to package many web applications and modules in a project and deploy these modules as a J2EE enterprise application.">Creating an enterprise application project</a></div>
-<div><a href="../topics/tjimpear.html" title="Enterprise application projects are deployed into EAR files. You can import an enterprise application project by importing it from a deployed EAR file.">Importing an enterprise application EAR file</a></div>
-<div><a href="../topics/tjexpear.html" title="Enterprise applications are deployed in the form of an EAR file. Use the Export wizard to export an enterprise application project into an EAR file for deployment.">Exporting an enterprise application into an EAR file</a></div>
-<div><a href="../topics/tjappproj.html" title="You can use a wizard to create a new application client project and add it to a new or existing enterprise application project.">Creating an application client project</a></div>
-<div><a href="../topics/tjexpapp.html" title="You can export an application client project as a JAR file.">Exporting an application client project</a></div>
-<div><a href="../topics/tjimpapp.html" title="Application client projects are deployed as JAR files. You can import an application client project that has been deployed into a JAR file by using the Import wizard.">Importing an application client JAR file</a></div>
-</div>
-</div>
-
-</body>
-</html>
\ No newline at end of file
diff --git a/docs/org.eclipse.jst.j2ee.doc.user/topics/cjavaee5.dita b/docs/org.eclipse.jst.j2ee.doc.user/topics/cjavaee5.dita
deleted file mode 100644
index 909dbac..0000000
--- a/docs/org.eclipse.jst.j2ee.doc.user/topics/cjavaee5.dita
+++ /dev/null
@@ -1,51 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!--Arbortext, Inc., 1988-2009, v.4002-->
-<!DOCTYPE concept PUBLIC "-//OASIS//DTD DITA Concept//EN"
- "concept.dtd">
-<?Pub Sty _display FontColor="red"?>
-<concept id="cjavaee5" xml:lang="en-us">
-<title outputclass="id_title">Developing <tm tmclass="special"
-tmowner="Sun Microsystems, Inc." tmtype="tm" trademark="Java">Java</tm> EE
-Applications</title>
-<shortdesc outputclass="id_shortdesc">The <tm tmclass="special"
-tmowner="Sun Microsystems, Inc." tmtype="tm" trademark="Java">Java</tm> EE
-5 programming model simplifies the process of creating <tm
-tmclass="special" tmowner="Sun Microsystems, Inc." tmtype="tm"
-trademark="Java">Java</tm> applications.</shortdesc>
-<prolog><metadata>
-<keywords><indexterm>Java Enterprise Edition 5<indexterm>Overview</indexterm></indexterm>
-</keywords>
-</metadata></prolog>
-<conbody outputclass="id_conbody">
-<p outputclass="anchor_topictop"></p>
-<p id="aboutfacet">In the Java EE specifications, programming requirements
-have been streamlined, and XML deployment descriptors are optional.
-Instead, you can specify many details of assembly and deployment with
-Java annotations. Java EE will provide default values in many situations
-so explicitly specification of these values are not required.</p>
-<p>Code validation, content assistance, Quick Fixes, and refactoring
-simplify working with your code. Code validators check your projects
-for errors. When an error is found, you can double-click on it in
-the Problems view in the product workbench to go to the error location.
-For some error types, you can use a Quick Fix to correct the error
-automatically. For both <tm tmclass="special"
-tmowner="Sun Microsystems, Inc." tmtype="tm" trademark="Java">Java</tm> source
-and <tm tmclass="special" tmowner="Sun Microsystems, Inc." tmtype="tm"
-trademark="Java">Java</tm> annotations, you can rely on content assistance
-to simplify your programming task. When you refactor source code,
-the tools automatically update the associated metadata.</p>
-<p>For additional information about <tm tmtype="tm" trademark="Java">Java</tm> EE,
-see the official specification: <ul>
-<li><b><tm tmtype="tm" trademark="Java">Java</tm> EE 5</b>: <xref
-href="http://jcp.org/en/jsr/detail?id=244" scope="external">JSR 244: <tm
-tmtype="tm" trademark="Java">Java</tm> Platform, Enterprise Edition
-5 (<tm tmtype="tm" trademark="Java">Java</tm> EE 5) Specification</xref></li>
-<li><b><tm tmtype="tm" trademark="Java">Java</tm> EE 6</b>: <xref
-href="http://jcp.org/en/jsr/detail?id=316" scope="external">JSR 316:
-JavaTM Platform, Enterprise Edition 6 (<tm tmtype="tm" trademark="Java">Java</tm> EE
-6) Specification</xref></li>
-</ul></p>
-<p outputclass="anchor_topicbottom"></p><?Pub Caret -2?>
-</conbody>
-</concept>
-<?Pub *0000002776?>
diff --git a/docs/org.eclipse.jst.j2ee.doc.user/topics/cjavaee5.html b/docs/org.eclipse.jst.j2ee.doc.user/topics/cjavaee5.html
deleted file mode 100644
index feecee8..0000000
--- a/docs/org.eclipse.jst.j2ee.doc.user/topics/cjavaee5.html
+++ /dev/null
@@ -1,82 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?><!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.0 Transitional//EN" "http://www.w3.org/TR/xhtml1/DTD/xhtml1-transitional.dtd">
-<html lang="en-us" xml:lang="en-us">
-<head>
-<meta content="text/html; charset=utf-8" http-equiv="Content-Type" />
-<meta name="copyright" content="Copyright (c) 2000, 2009 IBM Corporation and others. All rights reserved. This program and the accompanying materials are made available under the terms of the Eclipse Public License v1.0 which accompanies this distribution, and is available at http://www.eclipse.org/legal/epl-v10.html. Contributors: IBM Corporation - initial API and implementation" />
-<meta name="DC.rights.owner" content="(C) Copyright 2000, 2009" />
-<meta content="public" name="security" />
-<meta content="index,follow" name="Robots" />
-<meta http-equiv="PICS-Label" content='(PICS-1.1 "http://www.icra.org/ratingsv02.html" l gen true r (cz 1 lz 1 nz 1 oz 1 vz 1) "http://www.rsac.org/ratingsv01.html" l gen true r (n 0 s 0 v 0 l 0) "http://www.classify.org/safesurf/" l gen true r (SS~~000 1))' />
-<meta content="concept" name="DC.Type" />
-<meta name="DC.Title" content="Developing Java EE Applications" />
-<meta name="abstract" content="The Java EE 5 programming model simplifies the process of creating Java applications." />
-<meta name="description" content="The Java EE 5 programming model simplifies the process of creating Java applications." />
-<meta content="Java Enterprise Edition 5, Overview" name="DC.subject" />
-<meta content="Java Enterprise Edition 5, Overview" name="keywords" />
-<meta scheme="URI" name="DC.Relation" content="../topics/ph-j2eeapp.html" />
-<meta scheme="URI" name="DC.Relation" content="../topics/cjee5overview.html" />
-<meta scheme="URI" name="DC.Relation" content="../topics/cannotations.html" />
-<meta content="XHTML" name="DC.Format" />
-<meta content="cjavaee5" name="DC.Identifier" />
-<meta content="en-us" name="DC.Language" />
-<link href="../../org.eclipse.wst.doc.user/common.css" type="text/css" rel="stylesheet" />
-<title>Developing Java EE
-Applications</title>
-</head>
-<body id="cjavaee5"><a name="cjavaee5"><!-- --></a>
-
-
-<h1 class="id_title">Developing Java EE
-Applications</h1>
-
-
-
-<div class="id_conbody"><p class="id_shortdesc">The Java™ EE
-5 programming model simplifies the process of creating Java applications.</p>
-
-<p class="anchor_topictop" />
-
-<p id="cjavaee5__aboutfacet"><a name="cjavaee5__aboutfacet"><!-- --></a>In the Java EE specifications, programming requirements
-have been streamlined, and XML deployment descriptors are optional.
-Instead, you can specify many details of assembly and deployment with
-Java annotations. Java EE will provide default values in many situations
-so explicitly specification of these values are not required.</p>
-
-<p>Code validation, content assistance, Quick Fixes, and refactoring
-simplify working with your code. Code validators check your projects
-for errors. When an error is found, you can double-click on it in
-the Problems view in the product workbench to go to the error location.
-For some error types, you can use a Quick Fix to correct the error
-automatically. For both Java source
-and Java annotations, you can rely on content assistance
-to simplify your programming task. When you refactor source code,
-the tools automatically update the associated metadata.</p>
-
-<div class="p">For additional information about Java EE,
-see the official specification: <ul>
-<li><strong>Java EE 5</strong>: <a href="http://jcp.org/en/jsr/detail?id=244" target="_blank">JSR 244: Java Platform, Enterprise Edition 5 (Java EE 5) Specification</a></li>
-
-<li><strong>Java EE 6</strong>: <a href="http://jcp.org/en/jsr/detail?id=316" target="_blank">JSR 316: JavaTM Platform, Enterprise Edition 6 (Java EE 6) Specification</a></li>
-
-</ul>
-</div>
-
-<p class="anchor_topicbottom" />
-
-</div>
-
-<div>
-<ul class="ullinks">
-<li class="ulchildlink"><strong><a href="../topics/cjee5overview.html">Java EE 5: Overview</a></strong><br />
-Using the Java Platform, Enterprise Edition (Java EE) architecture, you can build distributed Web and enterprise applications. This architecture helps you focus on presentation and application issues, rather than on systems issues.</li>
-<li class="ulchildlink"><strong><a href="../topics/cannotations.html">Java EE 5 and Java EE 6 support for annotations</a></strong><br />
-The goal of Java EE 5 and Java EE 6 platform development is to minimize the number of artifacts that you have to create and maintain, thereby simplifying the development process. Java EE 5 and Java EE 6 support the injection of annotations into your source code, so that you can embed resources, dependencies, services, and life-cycle notifications in your source code, without having to maintain these artifacts elsewhere.</li>
-</ul>
-
-<div class="familylinks">
-<div class="parentlink"><strong>Parent topic:</strong> <a href="../topics/ph-j2eeapp.html" title="These topics deal with the Java Enterprise Edition (Java EE).">Java EE applications</a></div>
-</div>
-</div>
-
-</body>
-</html>
\ No newline at end of file
diff --git a/docs/org.eclipse.jst.j2ee.doc.user/topics/cjcircle.dita b/docs/org.eclipse.jst.j2ee.doc.user/topics/cjcircle.dita
deleted file mode 100644
index 3f4ab56..0000000
--- a/docs/org.eclipse.jst.j2ee.doc.user/topics/cjcircle.dita
+++ /dev/null
@@ -1,28 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<!--Arbortext, Inc., 1988-2006, v.4002-->
-<!DOCTYPE concept PUBLIC "-//OASIS//DTD DITA Concept//EN"
- "concept.dtd">
-<concept id="cjcircle" xml:lang="en-us">
-<title outputclass="id_title">Cyclical dependencies between Java EE modules</title>
-<shortdesc outputclass="id_shortdesc">A cyclical dependency between two or
-more modules in an enterprise application most commonly occurs when projects
-are imported from outside the Workbench.</shortdesc>
-<prolog><metadata>
-<keywords><indexterm>dependencies<indexterm>cycles between modules</indexterm></indexterm>
-<indexterm>Java EE<indexterm>cyclical dependencies between modules</indexterm></indexterm>
-<indexterm>projects<indexterm>cyclical dependencies</indexterm></indexterm>
-</keywords>
-</metadata></prolog>
-<conbody outputclass="id_conbody">
-<p outputclass="anchor_topictop"></p>
-<p>When a cycle exists between two or more modules in an enterprise application,
-the <tm tmclass="special" tmowner="Sun Microsystems, Inc." tmtype="tm" trademark="Java">Java</tm> builder
-cannot accurately compute the build order of the projects. Full builds fail
-under these conditions, or require several invocations.</p>
-<p>Therefore, the best practice is to componentize your projects or modules.
-This allows you to have your module dependencies function as a tree instead
-of a cycle diagram. This practice has the added benefit of producing a better
-factored and layered application.</p>
-<p outputclass="anchor_topicbottom"></p>
-</conbody>
-</concept>
diff --git a/docs/org.eclipse.jst.j2ee.doc.user/topics/cjcircle.html b/docs/org.eclipse.jst.j2ee.doc.user/topics/cjcircle.html
deleted file mode 100644
index 4b215fd..0000000
--- a/docs/org.eclipse.jst.j2ee.doc.user/topics/cjcircle.html
+++ /dev/null
@@ -1,58 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?><!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.0 Transitional//EN" "http://www.w3.org/TR/xhtml1/DTD/xhtml1-transitional.dtd">
-<html lang="en-us" xml:lang="en-us">
-<head>
-<meta content="text/html; charset=utf-8" http-equiv="Content-Type" />
-<meta name="copyright" content="Copyright (c) 2000, 2009 IBM Corporation and others. All rights reserved. This program and the accompanying materials are made available under the terms of the Eclipse Public License v1.0 which accompanies this distribution, and is available at http://www.eclipse.org/legal/epl-v10.html. Contributors: IBM Corporation - initial API and implementation" />
-<meta name="DC.rights.owner" content="(C) Copyright 2000, 2009" />
-<meta content="public" name="security" />
-<meta content="index,follow" name="Robots" />
-<meta http-equiv="PICS-Label" content='(PICS-1.1 "http://www.icra.org/ratingsv02.html" l gen true r (cz 1 lz 1 nz 1 oz 1 vz 1) "http://www.rsac.org/ratingsv01.html" l gen true r (n 0 s 0 v 0 l 0) "http://www.classify.org/safesurf/" l gen true r (SS~~000 1))' />
-<meta content="concept" name="DC.Type" />
-<meta name="DC.Title" content="Cyclical dependencies between Java EE modules" />
-<meta name="abstract" content="A cyclical dependency between two or more modules in an enterprise application most commonly occurs when projects are imported from outside the Workbench." />
-<meta name="description" content="A cyclical dependency between two or more modules in an enterprise application most commonly occurs when projects are imported from outside the Workbench." />
-<meta content="dependencies, cycles between modules, Java EE, cyclical dependencies between modules, projects, cyclical dependencies" name="DC.subject" />
-<meta content="dependencies, cycles between modules, Java EE, cyclical dependencies between modules, projects, cyclical dependencies" name="keywords" />
-<meta scheme="URI" name="DC.Relation" content="../topics/tjimpear.html" />
-<meta scheme="URI" name="DC.Relation" content="../topics/tjcircleb.html" />
-<meta content="XHTML" name="DC.Format" />
-<meta content="cjcircle" name="DC.Identifier" />
-<meta content="en-us" name="DC.Language" />
-<link href="../../org.eclipse.wst.doc.user/common.css" type="text/css" rel="stylesheet" />
-<title>Cyclical dependencies between Java EE modules</title>
-</head>
-<body id="cjcircle"><a name="cjcircle"><!-- --></a>
-
-
-<h1 class="id_title">Cyclical dependencies between Java EE modules</h1>
-
-
-
-<div class="id_conbody"><p class="id_shortdesc">A cyclical dependency between two or
-more modules in an enterprise application most commonly occurs when projects
-are imported from outside the Workbench.</p>
-
-<p class="anchor_topictop" />
-
-<p>When a cycle exists between two or more modules in an enterprise application,
-the Java™ builder
-cannot accurately compute the build order of the projects. Full builds fail
-under these conditions, or require several invocations.</p>
-
-<p>Therefore, the best practice is to componentize your projects or modules.
-This allows you to have your module dependencies function as a tree instead
-of a cycle diagram. This practice has the added benefit of producing a better
-factored and layered application.</p>
-
-<p class="anchor_topicbottom" />
-
-</div>
-
-<div><div class="reltasks"><strong>Related tasks</strong><br />
-<div><a href="../topics/tjimpear.html" title="Enterprise application projects are deployed into EAR files. You can import an enterprise application project by importing it from a deployed EAR file.">Importing an enterprise application EAR file</a></div>
-<div><a href="../topics/tjcircleb.html" title="You can resolve cyclical dependencies after an EAR is imported.">Correcting cyclical dependencies after an EAR is imported</a></div>
-</div>
-</div>
-
-</body>
-</html>
\ No newline at end of file
diff --git a/docs/org.eclipse.jst.j2ee.doc.user/topics/cjearproj.dita b/docs/org.eclipse.jst.j2ee.doc.user/topics/cjearproj.dita
deleted file mode 100644
index aca0056..0000000
--- a/docs/org.eclipse.jst.j2ee.doc.user/topics/cjearproj.dita
+++ /dev/null
@@ -1,71 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<!--Arbortext, Inc., 1988-2006, v.4002-->
-<!DOCTYPE concept PUBLIC "-//OASIS//DTD DITA Concept//EN"
- "concept.dtd">
-<concept id="cjearproj" xml:lang="en-us">
-<title outputclass="id_title">Enterprise application projects</title>
-<shortdesc outputclass="id_shortdesc">An enterprise application project ties
-together the resources that are required to deploy a J2EE enterprise application.</shortdesc>
-<prolog><metadata>
-<keywords><indexterm>enterprise applications<indexterm>projects<indexterm>artifacts</indexterm></indexterm></indexterm>
-<indexterm>J2EE<indexterm>enterprise application projects<indexterm>overview</indexterm></indexterm></indexterm>
-<indexterm>projects<indexterm>enterprise applications</indexterm></indexterm>
-</keywords>
-</metadata></prolog>
-<conbody outputclass="id_conbody">
-<p outputclass="anchor_topictop"></p>
-<p>An enterprise application project contains a set of references to other
-J2EE modules and <tm tmclass="special" tmowner="Sun Microsystems, Inc." tmtype="tm"
-trademark="Java">Java</tm> projects that are combined to compose an EAR file.
-These projects can be Web modules, EJB modules, application client modules,
-connector modules, general utility <tm tmclass="special" tmowner="Sun Microsystems, Inc."
-tmtype="tm" trademark="Java">Java</tm> JAR files, and EJB client JAR files.
-Enterprise application projects created in the workbench include a deployment
-descriptor, as well as files that are common to all J2EE modules that are
-defined in the deployment descriptor.</p>
-<p>When a J2EE module project is created, it can be associated with an enterprise
-application project. The project wizards aid this by allowing you to specify
-a new or existing enterprise application project. Enterprise application projects
-are exported as EAR (enterprise archive) files that include all files defined
-in the Enterprise Application project as well as the appropriate archive file
-for each J2EE module or utility JAR project defined in the deployment descriptor,
-such as Web archive (WAR) files and EJB JAR files.</p>
-<p>An enterprise application can contain utility JAR files that are to be
-used by the contained modules. This allows sharing of code at the application
-level by multiple Web, EJB, or application client modules. These JAR files
-are commonly referred to as utility JAR files. The utility JAR files defined
-for an enterprise application project can be actual JAR files in the project,
-or you can include utility <tm tmclass="special" tmowner="Sun Microsystems, Inc."
-tmtype="tm" trademark="Java">Java</tm> projects that are designated to become
-the utility JAR files during assembly and deployment.</p>
-<p>To start developing J2EE applications, you typically first create an enterprise
-application project to tie together your Web, EJB, and application client
-modules. The enterprise application project is used to compose an entire application
-from the various modules. Since no source code is built directly into an enterprise
-application, these projects are not <tm tmclass="special" tmowner="Sun Microsystems, Inc."
-tmtype="tm" trademark="Java">Java</tm> projects, and they are not compiled
-by the <tm tmclass="special" tmowner="Sun Microsystems, Inc." tmtype="tm"
-trademark="Java">Java</tm> builder.</p>
-<p>When you create an enterprise application project using the workbench,
-the following key files are automatically created:<dl><dlentry outputclass="id_projectfiles_top">
-<dt>META-INF/application.xml</dt>
-<dd>This file is the deployment descriptor for the enterprise application,
-as defined in the J2EE specification, that is responsible for associating
-J2EE modules to a specific EAR file. This file is created in the <uicontrol>META-INF</uicontrol> folder.</dd>
-</dlentry><dlentry>
-<dt>.settings/.component</dt>
-<dd>This file matches the location of each module's source code to the location
-of the module at deployment. For each module included for deployment with
-the EAR file, the .component file lists its source path and deployment path.
-This file is created in the <uicontrol>.settings</uicontrol> folder.</dd>
-</dlentry><dlentry>
-<dt>.settings/org.eclipse.wst.common.project.facet.core.xml</dt>
-<dd>This file lists the facets of the enterprise application project. See <xref
-href="cfacets.dita"></xref>. This file is created in the <uicontrol>.settings</uicontrol> folder.</dd>
-</dlentry><dlentry outputclass="id_projectfiles_bottom">
-<dt>.project</dt>
-<dd>This is a workbench artifact, the standard project description file.</dd>
-</dlentry></dl></p>
-<p outputclass="anchor_topicbottom"></p>
-</conbody>
-</concept>
diff --git a/docs/org.eclipse.jst.j2ee.doc.user/topics/cjearproj.html b/docs/org.eclipse.jst.j2ee.doc.user/topics/cjearproj.html
deleted file mode 100644
index 4e915f4..0000000
--- a/docs/org.eclipse.jst.j2ee.doc.user/topics/cjearproj.html
+++ /dev/null
@@ -1,120 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?><!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.0 Transitional//EN" "http://www.w3.org/TR/xhtml1/DTD/xhtml1-transitional.dtd">
-<html lang="en-us" xml:lang="en-us">
-<head>
-<meta content="text/html; charset=utf-8" http-equiv="Content-Type" />
-<meta name="copyright" content="Copyright (c) 2000, 2009 IBM Corporation and others. All rights reserved. This program and the accompanying materials are made available under the terms of the Eclipse Public License v1.0 which accompanies this distribution, and is available at http://www.eclipse.org/legal/epl-v10.html. Contributors: IBM Corporation - initial API and implementation" />
-<meta name="DC.rights.owner" content="(C) Copyright 2000, 2009" />
-<meta content="public" name="security" />
-<meta content="index,follow" name="Robots" />
-<meta http-equiv="PICS-Label" content='(PICS-1.1 "http://www.icra.org/ratingsv02.html" l gen true r (cz 1 lz 1 nz 1 oz 1 vz 1) "http://www.rsac.org/ratingsv01.html" l gen true r (n 0 s 0 v 0 l 0) "http://www.classify.org/safesurf/" l gen true r (SS~~000 1))' />
-<meta content="concept" name="DC.Type" />
-<meta name="DC.Title" content="Enterprise application projects" />
-<meta name="abstract" content="An enterprise application project ties together the resources that are required to deploy a J2EE enterprise application." />
-<meta name="description" content="An enterprise application project ties together the resources that are required to deploy a J2EE enterprise application." />
-<meta content="enterprise applications, projects, artifacts, J2EE, enterprise application projects, overview" name="DC.subject" />
-<meta content="enterprise applications, projects, artifacts, J2EE, enterprise application projects, overview" name="keywords" />
-<meta scheme="URI" name="DC.Relation" content="../topics/cjarch.html" />
-<meta scheme="URI" name="DC.Relation" content="../topics/tjear.html" />
-<meta scheme="URI" name="DC.Relation" content="../topics/tjimpear.html" />
-<meta scheme="URI" name="DC.Relation" content="../topics/tjexpear.html" />
-<meta scheme="URI" name="DC.Relation" content="../topics/tjear.html" />
-<meta scheme="URI" name="DC.Relation" content="../topics/tjappproj.html" />
-<meta scheme="URI" name="DC.Relation" content="../topics/tjrar.html" />
-<meta scheme="URI" name="DC.Relation" content="../topics/cfacets.html" />
-<meta content="XHTML" name="DC.Format" />
-<meta content="cjearproj" name="DC.Identifier" />
-<meta content="en-us" name="DC.Language" />
-<link href="../../org.eclipse.wst.doc.user/common.css" type="text/css" rel="stylesheet" />
-<title>Enterprise application projects</title>
-</head>
-<body id="cjearproj"><a name="cjearproj"><!-- --></a>
-
-
-<h1 class="id_title">Enterprise application projects</h1>
-
-
-
-<div class="id_conbody"><p class="id_shortdesc">An enterprise application project ties
-together the resources that are required to deploy a J2EE enterprise application.</p>
-
-<p class="anchor_topictop" />
-
-<p>An enterprise application project contains a set of references to other
-J2EE modules and Java™ projects that are combined to compose an EAR file.
-These projects can be Web modules, EJB modules, application client modules,
-connector modules, general utility Java JAR files, and EJB client JAR files.
-Enterprise application projects created in the workbench include a deployment
-descriptor, as well as files that are common to all J2EE modules that are
-defined in the deployment descriptor.</p>
-
-<p>When a J2EE module project is created, it can be associated with an enterprise
-application project. The project wizards aid this by allowing you to specify
-a new or existing enterprise application project. Enterprise application projects
-are exported as EAR (enterprise archive) files that include all files defined
-in the Enterprise Application project as well as the appropriate archive file
-for each J2EE module or utility JAR project defined in the deployment descriptor,
-such as Web archive (WAR) files and EJB JAR files.</p>
-
-<p>An enterprise application can contain utility JAR files that are to be
-used by the contained modules. This allows sharing of code at the application
-level by multiple Web, EJB, or application client modules. These JAR files
-are commonly referred to as utility JAR files. The utility JAR files defined
-for an enterprise application project can be actual JAR files in the project,
-or you can include utility Java projects that are designated to become
-the utility JAR files during assembly and deployment.</p>
-
-<p>To start developing J2EE applications, you typically first create an enterprise
-application project to tie together your Web, EJB, and application client
-modules. The enterprise application project is used to compose an entire application
-from the various modules. Since no source code is built directly into an enterprise
-application, these projects are not Java projects, and they are not compiled
-by the Java builder.</p>
-
-<div class="p">When you create an enterprise application project using the workbench,
-the following key files are automatically created:<dl>
-<dt class="dlterm">META-INF/application.xml</dt>
-
-<dd>This file is the deployment descriptor for the enterprise application,
-as defined in the J2EE specification, that is responsible for associating
-J2EE modules to a specific EAR file. This file is created in the <span class="uicontrol">META-INF</span> folder.</dd>
-
-
-<dt class="dlterm">.settings/.component</dt>
-
-<dd>This file matches the location of each module's source code to the location
-of the module at deployment. For each module included for deployment with
-the EAR file, the .component file lists its source path and deployment path.
-This file is created in the <span class="uicontrol">.settings</span> folder.</dd>
-
-
-<dt class="dlterm">.settings/org.eclipse.wst.common.project.facet.core.xml</dt>
-
-<dd>This file lists the facets of the enterprise application project. See <a href="cfacets.html" title="Facets define characteristics and requirements for Java EE projects and are used as part of the runtime configuration. ">Project facets</a>. This file is created in the <span class="uicontrol">.settings</span> folder.</dd>
-
-
-<dt class="dlterm">.project</dt>
-
-<dd>This is a workbench artifact, the standard project description file.</dd>
-
-</dl>
-</div>
-
-<p class="anchor_topicbottom" />
-
-</div>
-
-<div><div class="relconcepts"><strong>Related concepts</strong><br />
-<div><a href="../topics/cjarch.html" title="The Java 2 Platform, Enterprise Edition (J2EE) provides a standard for developing multitier, enterprise applications.">J2EE architecture</a></div>
-<div><a href="../topics/cfacets.html" title="Facets define characteristics and requirements for Java EE projects and are used as part of the runtime configuration.">Project facets</a></div>
-</div>
-<div class="reltasks"><strong>Related tasks</strong><br />
-<div><a href="../topics/tjear.html" title="Using the wizard to create an enterprise application project allows you to package many web applications and modules in a project and deploy these modules as a J2EE enterprise application.">Creating an enterprise application project</a></div>
-<div><a href="../topics/tjimpear.html" title="Enterprise application projects are deployed into EAR files. You can import an enterprise application project by importing it from a deployed EAR file.">Importing an enterprise application EAR file</a></div>
-<div><a href="../topics/tjexpear.html" title="Enterprise applications are deployed in the form of an EAR file. Use the Export wizard to export an enterprise application project into an EAR file for deployment.">Exporting an enterprise application into an EAR file</a></div>
-<div><a href="../topics/tjappproj.html" title="You can use a wizard to create a new application client project and add it to a new or existing enterprise application project.">Creating an application client project</a></div>
-<div><a href="../topics/tjrar.html" title="A connector is a J2EE standard extension mechanism for containers to provide connectivity to enterprise information systems (EISs).">Creating a connector project</a></div>
-</div>
-</div>
-
-</body>
-</html>
\ No newline at end of file
diff --git a/docs/org.eclipse.jst.j2ee.doc.user/topics/cjee5overview.dita b/docs/org.eclipse.jst.j2ee.doc.user/topics/cjee5overview.dita
deleted file mode 100644
index 0d62b19..0000000
--- a/docs/org.eclipse.jst.j2ee.doc.user/topics/cjee5overview.dita
+++ /dev/null
@@ -1,84 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<!--Arbortext, Inc., 1988-2006, v.4002-->
-<!DOCTYPE concept PUBLIC "-//OASIS//DTD DITA Concept//EN"
- "concept.dtd">
-<concept id="cjavaee5" xml:lang="en-us">
-<title outputclass="id_title"><tm tmclass="special" tmowner="Sun Microsystems, Inc."
-tmtype="tm" trademark="Java">Java</tm> EE 5: Overview</title>
-<shortdesc outputclass="id_shortdesc">Using the <tm tmclass="special" tmowner="Sun Microsystems, Inc."
-tmtype="tm" trademark="Java">Java</tm> Platform, Enterprise Edition (<tm tmclass="special"
-tmowner="Sun Microsystems, Inc." tmtype="tm" trademark="Java">Java</tm> EE)
-architecture, you can build distributed Web and enterprise applications. This
-architecture helps you focus on presentation and application issues, rather
-than on systems issues.</shortdesc>
-<prolog><metadata>
-<keywords><indexterm>Java EE 5</indexterm><indexterm>Oerview</indexterm></keywords>
-</metadata></prolog>
-<conbody>
-<p>You can use the <tm tmclass="special" tmowner="Sun Microsystems, Inc."
-tmtype="tm" trademark="Java">Java</tm> EE 5 tools and features to create applications
-that are structured around modules with different purposes, such as Web sites
-and Enterprise <tm tmclass="special" tmowner="Sun Microsystems, Inc." tmtype="tm"
-trademark="JavaBeans">JavaBeans</tm> (EJB) applications. When you use EJB
-3.0 components, you can create a distributed, secure application with transactional
-support. When you develop applications that access persistent data, you can
-use the new <tm tmclass="special" tmowner="Sun Microsystems, Inc." tmtype="tm"
-trademark="Java">Java</tm> Persistence API (JPA). This standard simplifies
-the creation and use of persistent entities, as well as adding new features.
-For developing presentation logic, you can use technologies such as JavaServer
-Pages (JSP) or JavaServer Faces (JSF).</p>
-<p>Using the <tm tmclass="special" tmowner="Sun Microsystems, Inc." tmtype="tm"
-trademark="Java">Java</tm> EE 5 Platform Enterprise Edition (Java EE) , you
-can develop applications more quickly and conveniently than in previous versions.
-The <tm tmclass="special" tmowner="Sun Microsystems, Inc." tmtype="tm" trademark="Java">Java</tm> EE
-5 platform replaces <tm tmclass="special" tmowner="Sun Microsystems, Inc."
-tmtype="tm" trademark="Java">Java</tm> 2 Enterprise Edition (J2EE), version
-1.4. The product tools support for both versions. Java EE 5 significantly
-enhances ease of use providing<ul>
-<li>Reduced development time</li>
-<li>Reduced application complexity</li>
-<li>Improved application performance</li>
-</ul></p>
-<p>Java EE 5 provides a simplified programming model, including the following
-tools:<ul>
-<li>Inline configuration with annotations, making deployment descriptors now
-optional</li>
-<li>Dependency injection, hiding resource creation and lookup from application
-code</li>
-<li>Java persistence API (JPA) allows data management without explicit SQL
-or JDBC</li>
-<li>Use of plain old Java objects (POJOs) for Enterprise JavaBeans and Web
-services</li>
-</ul></p>
-<p>Java EE 5 provides simplified packaging rules for enterprise applications:<ul>
-<li>Web applications us .WAR files</li>
-<li>Resource adapters use .RAR files</li>
-<li>Enterprise applications use .EAR files</li>
-<li>The <codeph>lib</codeph> directory contains shared .JAR files</li>
-<li>A .JAR file with <codeph>Main-Class</codeph> implies an application client</li>
-<li>A .JAR file with @Stateless annotation implies an EJB application</li>
-<li>Many simple applications no longer require deployment descriptors, including<ul>
-<li>EJB applications (.JAR files)</li>
-<li>Web applications that use JSP technology only</li>
-<li>Application clients</li>
-<li>Enterprise applications (.EAR files)</li>
-</ul></li>
-</ul></p>
-<p>Java EE 5 provides simplified resource access using dependency injection:<ul>
-<li>In the Dependency Injection pattern, an external entity automatically
-supplies an object's dependencies.<ul>
-<li>The object need not request these resources explicitly</li>
-</ul></li>
-<li>In Java EE 5, dependency injection can be applied to all resources that
-a component needs<ul>
-<li>Creation and lookup of resources are hidden from application code</li>
-</ul></li>
-<li>Dependency injection can be applied throughout Java EE 5 technology:<ul>
-<li>EJB containers</li>
-<li>Web containers</li>
-<li>Clients</li>
-<li>Web services</li>
-</ul></li>
-</ul></p>
-</conbody>
-</concept>
diff --git a/docs/org.eclipse.jst.j2ee.doc.user/topics/cjee5overview.html b/docs/org.eclipse.jst.j2ee.doc.user/topics/cjee5overview.html
deleted file mode 100644
index 09d8d64..0000000
--- a/docs/org.eclipse.jst.j2ee.doc.user/topics/cjee5overview.html
+++ /dev/null
@@ -1,144 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?><!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.0 Transitional//EN" "http://www.w3.org/TR/xhtml1/DTD/xhtml1-transitional.dtd">
-<html lang="en-us" xml:lang="en-us">
-<head>
-<meta content="text/html; charset=utf-8" http-equiv="Content-Type" />
-<meta name="copyright" content="Copyright (c) 2000, 2009 IBM Corporation and others. All rights reserved. This program and the accompanying materials are made available under the terms of the Eclipse Public License v1.0 which accompanies this distribution, and is available at http://www.eclipse.org/legal/epl-v10.html. Contributors: IBM Corporation - initial API and implementation" />
-<meta name="DC.rights.owner" content="(C) Copyright 2000, 2009" />
-<meta content="public" name="security" />
-<meta content="index,follow" name="Robots" />
-<meta http-equiv="PICS-Label" content='(PICS-1.1 "http://www.icra.org/ratingsv02.html" l gen true r (cz 1 lz 1 nz 1 oz 1 vz 1) "http://www.rsac.org/ratingsv01.html" l gen true r (n 0 s 0 v 0 l 0) "http://www.classify.org/safesurf/" l gen true r (SS~~000 1))' />
-<meta content="concept" name="DC.Type" />
-<meta name="DC.Title" content="Java EE 5: Overview" />
-<meta name="abstract" content="Using the Java Platform, Enterprise Edition (Java EE) architecture, you can build distributed Web and enterprise applications. This architecture helps you focus on presentation and application issues, rather than on systems issues." />
-<meta name="description" content="Using the Java Platform, Enterprise Edition (Java EE) architecture, you can build distributed Web and enterprise applications. This architecture helps you focus on presentation and application issues, rather than on systems issues." />
-<meta content="Java EE 5, Oerview" name="DC.subject" />
-<meta content="Java EE 5, Oerview" name="keywords" />
-<meta scheme="URI" name="DC.Relation" content="../topics/cjavaee5.html" />
-<meta content="XHTML" name="DC.Format" />
-<meta content="cjavaee5" name="DC.Identifier" />
-<meta content="en-us" name="DC.Language" />
-<link href="../../org.eclipse.wst.doc.user/common.css" type="text/css" rel="stylesheet" />
-<title>Java EE 5: Overview</title>
-</head>
-<body id="cjavaee5"><a name="cjavaee5"><!-- --></a>
-
-
-<h1 class="id_title">Java EE 5: Overview</h1>
-
-
-
-<div><p class="id_shortdesc">Using the Java™ Platform, Enterprise Edition (Java EE)
-architecture, you can build distributed Web and enterprise applications. This
-architecture helps you focus on presentation and application issues, rather
-than on systems issues.</p>
-
-<p>You can use the Java EE 5 tools and features to create applications
-that are structured around modules with different purposes, such as Web sites
-and Enterprise JavaBeans™ (EJB) applications. When you use EJB
-3.0 components, you can create a distributed, secure application with transactional
-support. When you develop applications that access persistent data, you can
-use the new Java Persistence API (JPA). This standard simplifies
-the creation and use of persistent entities, as well as adding new features.
-For developing presentation logic, you can use technologies such as JavaServer
-Pages (JSP) or JavaServer Faces (JSF).</p>
-
-<div class="p">Using the Java EE 5 Platform Enterprise Edition (Java EE) , you
-can develop applications more quickly and conveniently than in previous versions.
-The Java EE
-5 platform replaces Java 2 Enterprise Edition (J2EE), version
-1.4. The product tools support for both versions. Java EE 5 significantly
-enhances ease of use providing<ul>
-<li>Reduced development time</li>
-
-<li>Reduced application complexity</li>
-
-<li>Improved application performance</li>
-
-</ul>
-</div>
-
-<div class="p">Java EE 5 provides a simplified programming model, including the following
-tools:<ul>
-<li>Inline configuration with annotations, making deployment descriptors now
-optional</li>
-
-<li>Dependency injection, hiding resource creation and lookup from application
-code</li>
-
-<li>Java persistence API (JPA) allows data management without explicit SQL
-or JDBC</li>
-
-<li>Use of plain old Java objects (POJOs) for Enterprise JavaBeans and Web
-services</li>
-
-</ul>
-</div>
-
-<div class="p">Java EE 5 provides simplified packaging rules for enterprise applications:<ul>
-<li>Web applications us .WAR files</li>
-
-<li>Resource adapters use .RAR files</li>
-
-<li>Enterprise applications use .EAR files</li>
-
-<li>The <samp class="codeph">lib</samp> directory contains shared .JAR files</li>
-
-<li>A .JAR file with <samp class="codeph">Main-Class</samp> implies an application client</li>
-
-<li>A .JAR file with @Stateless annotation implies an EJB application</li>
-
-<li>Many simple applications no longer require deployment descriptors, including<ul>
-<li>EJB applications (.JAR files)</li>
-
-<li>Web applications that use JSP technology only</li>
-
-<li>Application clients</li>
-
-<li>Enterprise applications (.EAR files)</li>
-
-</ul>
-</li>
-
-</ul>
-</div>
-
-<div class="p">Java EE 5 provides simplified resource access using dependency injection:<ul>
-<li>In the Dependency Injection pattern, an external entity automatically
-supplies an object's dependencies.<ul>
-<li>The object need not request these resources explicitly</li>
-
-</ul>
-</li>
-
-<li>In Java EE 5, dependency injection can be applied to all resources that
-a component needs<ul>
-<li>Creation and lookup of resources are hidden from application code</li>
-
-</ul>
-</li>
-
-<li>Dependency injection can be applied throughout Java EE 5 technology:<ul>
-<li>EJB containers</li>
-
-<li>Web containers</li>
-
-<li>Clients</li>
-
-<li>Web services</li>
-
-</ul>
-</li>
-
-</ul>
-</div>
-
-</div>
-
-<div>
-<div class="familylinks">
-<div class="parentlink"><strong>Parent topic:</strong> <a href="../topics/cjavaee5.html" title="The Java EE 5 programming model simplifies the process of creating Java applications.">Developing Java EE Applications</a></div>
-</div>
-</div>
-
-</body>
-</html>
\ No newline at end of file
diff --git a/docs/org.eclipse.jst.j2ee.doc.user/topics/cjpers.dita b/docs/org.eclipse.jst.j2ee.doc.user/topics/cjpers.dita
deleted file mode 100644
index 408bd00..0000000
--- a/docs/org.eclipse.jst.j2ee.doc.user/topics/cjpers.dita
+++ /dev/null
@@ -1,92 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<!--Arbortext, Inc., 1988-2006, v.4002-->
-<!DOCTYPE concept PUBLIC "-//OASIS//DTD DITA Concept//EN"
- "concept.dtd">
-<concept id="cjpers" xml:lang="en-us">
-<title outputclass="id_title"><tm tmclass="special" tmowner="Sun Microsystems, Inc."
-tmtype="tm" trademark="Java">Java</tm> EE perspective</title>
-<shortdesc outputclass="id_shortdesc">The <tm tmclass="special" tmowner="Sun Microsystems, Inc."
-tmtype="tm" trademark="Java">Java</tm> EE perspective includes workbench views
-that you can use when developing resources for enterprise applications, EJB
-modules, Web modules, application client modules, and connector projects or
-modules.</shortdesc>
-<prolog><metadata>
-<keywords><indexterm>Java EE<indexterm>workbench perspectives</indexterm></indexterm>
-<indexterm>enterprise applications<indexterm>Java EE perspective</indexterm></indexterm>
-</keywords>
-</metadata></prolog>
-<conbody outputclass="id_conbody">
-<p outputclass="anchor_topictop"></p>
-<p>You can rearrange the location, tiling, and size of the views within the
-perspective. You can also add other views to the <tm tmclass="special" tmowner="Sun Microsystems, Inc."
-tmtype="tm" trademark="Java">Java</tm> EE perspective by clicking <menucascade>
-<uicontrol>Window</uicontrol><uicontrol>Show View</uicontrol></menucascade> and
-selecting the view.</p>
-<p>The workbench provides synchronization between different views and editors.
-This is also true in the J2EE perspective.</p>
-<p>By default, the <tm tmclass="special" tmowner="Sun Microsystems, Inc."
-tmtype="tm" trademark="Java">Java</tm> EE perspective includes the following
-workbench views:</p>
-<dl><dlentry outputclass="id_perspectiveviews_top">
-<dt><uicontrol>Project Explorer</uicontrol></dt>
-<dd>The Project Explorer view provides an integrated view of your projects
-and their artifacts related to J2EE development. You can show or hide your
-projects based on working sets. This view displays navigable models of J2EE
-deployment descriptors, <tm tmclass="special" tmowner="Sun Microsystems, Inc."
-tmtype="tm" trademark="Java">Java</tm> artifacts (source folders, packages,
-and classes), navigable models of the available Web services, and specialized
-views of Web modules to simplify the development of dynamic Web applications.
-In addition, EJB database mapping and the configuration of projects for a
-J2EE application server are made readily available.</dd>
-</dlentry><dlentry>
-<dt><uicontrol> Outline</uicontrol></dt>
-<dd>The Outline view in the <tm tmclass="special" tmowner="Sun Microsystems, Inc."
-tmtype="tm" trademark="Java">Java</tm> EE perspective shows the outline of
-the file that you are editing. For example, if you are using a tabbed deployment
-descriptor editor, the Outline view shows the outline for the selected page's
-elements, and if you are editing on the Source tab, the outline for the XML
-source is displayed. If you are editing an enterprise bean in the <tm tmclass="special"
-tmowner="Sun Microsystems, Inc." tmtype="tm" trademark="Java">Java</tm> editor,
-the Outline view shows the outline for the <tm tmclass="special" tmowner="Sun Microsystems, Inc."
-tmtype="tm" trademark="Java">Java</tm> class.</dd>
-</dlentry><dlentry>
-<dt><uicontrol>Tasks</uicontrol></dt>
-<dd>The Tasks view lists the to-do items that you have entered.</dd>
-</dlentry><dlentry>
-<dt><uicontrol>Problems</uicontrol></dt>
-<dd>The Problems view displays problems, warnings, or errors associated with
-the selected project. You can double-click on an item to address the specific
-problem in the appropriate resource.</dd>
-</dlentry><dlentry>
-<dt><uicontrol>Properties</uicontrol></dt>
-<dd>The Properties view provides a tabular view of the properties and associated
-values of objects in files you have open in an editor.</dd>
-</dlentry><dlentry>
-<dt><uicontrol>Servers</uicontrol></dt>
-<dd>The Servers view shows all the created server instances. You can start
-and stop each server from this view, and you can launch the test client.</dd>
-</dlentry><dlentry outputclass="id_perspectiveviews_bottom">
-<dt><uicontrol>Snippets</uicontrol></dt>
-<dd>The Snippets view provides categorized pieces of code that you can insert
-into appropriate places in your source code.</dd>
-</dlentry><dlentry>
-<dt><uicontrol>Data Source Explorer</uicontrol></dt>
-<dd>The Data Source Explorer provides a list of configured connection profiles.
-If categories are enabled, you can see the list grouped into categories. Use
-the Data Source Explorer to connect to, navigate, and interact with resources
-associated with the selected connection profile. It also provides import and
-export capabilities to share connection profile definitions with other Eclipse
-Workbenches. </dd>
-</dlentry><dlentry>
-<dt><uicontrol>Status bar</uicontrol></dt>
-<dd>The Status bar provides a description of the location of selected objects
-in the Project Explorer views in the left side. When file and deployment descriptors
-are open, the status bar shows the read-only state of the files and the line
-and column numbers when applicable. Sometimes when long operations run, a
-status monitor will appear in the status bar, along with a button with a stop
-sign icon. Clicking the stop sign stops the operation when the operation can
-be cancelled.</dd>
-</dlentry></dl>
-<p outputclass="anchor_topicbottom"></p>
-</conbody>
-</concept>
diff --git a/docs/org.eclipse.jst.j2ee.doc.user/topics/cjpers.html b/docs/org.eclipse.jst.j2ee.doc.user/topics/cjpers.html
deleted file mode 100644
index 54ea3ff..0000000
--- a/docs/org.eclipse.jst.j2ee.doc.user/topics/cjpers.html
+++ /dev/null
@@ -1,133 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?><!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.0 Transitional//EN" "http://www.w3.org/TR/xhtml1/DTD/xhtml1-transitional.dtd">
-<html lang="en-us" xml:lang="en-us">
-<head>
-<meta content="text/html; charset=utf-8" http-equiv="Content-Type" />
-<meta name="copyright" content="Copyright (c) 2000, 2009 IBM Corporation and others. All rights reserved. This program and the accompanying materials are made available under the terms of the Eclipse Public License v1.0 which accompanies this distribution, and is available at http://www.eclipse.org/legal/epl-v10.html. Contributors: IBM Corporation - initial API and implementation" />
-<meta name="DC.rights.owner" content="(C) Copyright 2000, 2009" />
-<meta content="public" name="security" />
-<meta content="index,follow" name="Robots" />
-<meta http-equiv="PICS-Label" content='(PICS-1.1 "http://www.icra.org/ratingsv02.html" l gen true r (cz 1 lz 1 nz 1 oz 1 vz 1) "http://www.rsac.org/ratingsv01.html" l gen true r (n 0 s 0 v 0 l 0) "http://www.classify.org/safesurf/" l gen true r (SS~~000 1))' />
-<meta content="concept" name="DC.Type" />
-<meta name="DC.Title" content="Java EE perspective" />
-<meta name="abstract" content="The Java EE perspective includes workbench views that you can use when developing resources for enterprise applications, EJB modules, Web modules, application client modules, and connector projects or modules." />
-<meta name="description" content="The Java EE perspective includes workbench views that you can use when developing resources for enterprise applications, EJB modules, Web modules, application client modules, and connector projects or modules." />
-<meta content="Java EE, workbench perspectives, enterprise applications, Java EE perspective" name="DC.subject" />
-<meta content="Java EE, workbench perspectives, enterprise applications, Java EE perspective" name="keywords" />
-<meta scheme="URI" name="DC.Relation" content="../../org.eclipse.platform.doc.user/concepts/cworkset.htm" />
-<meta content="XHTML" name="DC.Format" />
-<meta content="cjpers" name="DC.Identifier" />
-<meta content="en-us" name="DC.Language" />
-<link href="../../org.eclipse.wst.doc.user/common.css" type="text/css" rel="stylesheet" />
-<title>Java EE perspective</title>
-</head>
-<body id="cjpers"><a name="cjpers"><!-- --></a>
-
-
-<h1 class="id_title">Java EE perspective</h1>
-
-
-
-<div class="id_conbody"><p class="id_shortdesc">The Java™ EE perspective includes workbench views
-that you can use when developing resources for enterprise applications, EJB
-modules, Web modules, application client modules, and connector projects or
-modules.</p>
-
-<p class="anchor_topictop" />
-
-<p>You can rearrange the location, tiling, and size of the views within the
-perspective. You can also add other views to the Java EE perspective by clicking <span class="menucascade">
-<span class="uicontrol">Window</span> > <span class="uicontrol">Show View</span></span> and
-selecting the view.</p>
-
-<p>The workbench provides synchronization between different views and editors.
-This is also true in the J2EE perspective.</p>
-
-<p>By default, the Java EE perspective includes the following
-workbench views:</p>
-
-<dl>
-<dt class="dlterm"><span class="uicontrol">Project Explorer</span></dt>
-
-<dd>The Project Explorer view provides an integrated view of your projects
-and their artifacts related to J2EE development. You can show or hide your
-projects based on working sets. This view displays navigable models of J2EE
-deployment descriptors, Java artifacts (source folders, packages,
-and classes), navigable models of the available Web services, and specialized
-views of Web modules to simplify the development of dynamic Web applications.
-In addition, EJB database mapping and the configuration of projects for a
-J2EE application server are made readily available.</dd>
-
-
-<dt class="dlterm"><span class="uicontrol"> Outline</span></dt>
-
-<dd>The Outline view in the Java EE perspective shows the outline of
-the file that you are editing. For example, if you are using a tabbed deployment
-descriptor editor, the Outline view shows the outline for the selected page's
-elements, and if you are editing on the Source tab, the outline for the XML
-source is displayed. If you are editing an enterprise bean in the Java editor,
-the Outline view shows the outline for the Java class.</dd>
-
-
-<dt class="dlterm"><span class="uicontrol">Tasks</span></dt>
-
-<dd>The Tasks view lists the to-do items that you have entered.</dd>
-
-
-<dt class="dlterm"><span class="uicontrol">Problems</span></dt>
-
-<dd>The Problems view displays problems, warnings, or errors associated with
-the selected project. You can double-click on an item to address the specific
-problem in the appropriate resource.</dd>
-
-
-<dt class="dlterm"><span class="uicontrol">Properties</span></dt>
-
-<dd>The Properties view provides a tabular view of the properties and associated
-values of objects in files you have open in an editor.</dd>
-
-
-<dt class="dlterm"><span class="uicontrol">Servers</span></dt>
-
-<dd>The Servers view shows all the created server instances. You can start
-and stop each server from this view, and you can launch the test client.</dd>
-
-
-<dt class="dlterm"><span class="uicontrol">Snippets</span></dt>
-
-<dd>The Snippets view provides categorized pieces of code that you can insert
-into appropriate places in your source code.</dd>
-
-
-<dt class="dlterm"><span class="uicontrol">Data Source Explorer</span></dt>
-
-<dd>The Data Source Explorer provides a list of configured connection profiles.
-If categories are enabled, you can see the list grouped into categories. Use
-the Data Source Explorer to connect to, navigate, and interact with resources
-associated with the selected connection profile. It also provides import and
-export capabilities to share connection profile definitions with other Eclipse
-Workbenches. </dd>
-
-
-<dt class="dlterm"><span class="uicontrol">Status bar</span></dt>
-
-<dd>The Status bar provides a description of the location of selected objects
-in the Project Explorer views in the left side. When file and deployment descriptors
-are open, the status bar shows the read-only state of the files and the line
-and column numbers when applicable. Sometimes when long operations run, a
-status monitor will appear in the status bar, along with a button with a stop
-sign icon. Clicking the stop sign stops the operation when the operation can
-be cancelled.</dd>
-
-</dl>
-
-<p class="anchor_topicbottom" />
-
-</div>
-
-<div><div class="relinfo"><strong>Related information</strong><br />
-<div><a href="../../org.eclipse.platform.doc.user/concepts/cworkset.htm">Working sets</a></div>
-</div>
-</div>
-
-</body>
-</html>
\ No newline at end of file
diff --git a/docs/org.eclipse.jst.j2ee.doc.user/topics/cjview.dita b/docs/org.eclipse.jst.j2ee.doc.user/topics/cjview.dita
deleted file mode 100644
index 8ca49e1..0000000
--- a/docs/org.eclipse.jst.j2ee.doc.user/topics/cjview.dita
+++ /dev/null
@@ -1,37 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<!--Arbortext, Inc., 1988-2006, v.4002-->
-<!DOCTYPE concept PUBLIC "-//OASIS//DTD DITA Concept//EN"
- "concept.dtd">
-<concept id="cjview" xml:lang="en-us">
-<title outputclass="id_title">Project Explorer view in the <tm tmclass="special"
-tmowner="Sun Microsystems, Inc." tmtype="tm" trademark="Java">Java</tm> EE
-perspective</title>
-<shortdesc outputclass="id_shortdesc">While developing J2EE applications in
-the <tm tmclass="special" tmowner="Sun Microsystems, Inc." tmtype="tm" trademark="Java">Java</tm> EE
-perspective, the Project Explorer view is your main view of your J2EE projects
-and resources.</shortdesc>
-<prolog><metadata>
-<keywords><indexterm>views<indexterm>Project Explorer</indexterm></indexterm>
-</keywords>
-</metadata></prolog>
-<conbody outputclass="id_conbody">
-<p outputclass="anchor_topictop"></p>
-<p>The Project Explorer view provides an integrated view of all project resources,
-including models of J2EE deployment descriptors, <tm tmclass="special" tmowner="Sun Microsystems, Inc."
-tmtype="tm" trademark="Java">Java</tm> artifacts, resources, Web services,
-databases, and dynamic Web project artifacts.</p>
-<p>You should use this view to work with your J2EE deployment descriptors
-and their content. You can view an enterprise application project and see
-all of the modules associated with it. </p>
-<p>You can also filter what you see in the Project Explorer view to hide projects,
-folders, or files that you don't want to see. To enable or disable filters,
-select <uicontrol>Customize View...</uicontrol> from the drop-down menu at
-the top right corner of the view. For more information, see <xref href="cjviewfilters.dita">Filters
-in the Project Explorer view</xref>.</p>
-<p>Alternately, you can filter what you see by showing or hiding working sets,
-groups of related resources or projects. For more information, see <xref format="html"
-href="../../org.eclipse.platform.doc.user/concepts/cworkset.htm" scope="peer">Working
-Sets<desc></desc></xref>.</p>
-<p outputclass="anchor_topicbottom"></p>
-</conbody>
-</concept>
diff --git a/docs/org.eclipse.jst.j2ee.doc.user/topics/cjview.html b/docs/org.eclipse.jst.j2ee.doc.user/topics/cjview.html
deleted file mode 100644
index d9ba4d2..0000000
--- a/docs/org.eclipse.jst.j2ee.doc.user/topics/cjview.html
+++ /dev/null
@@ -1,69 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?><!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.0 Transitional//EN" "http://www.w3.org/TR/xhtml1/DTD/xhtml1-transitional.dtd">
-<html lang="en-us" xml:lang="en-us">
-<head>
-<meta content="text/html; charset=utf-8" http-equiv="Content-Type" />
-<meta name="copyright" content="Copyright (c) 2000, 2009 IBM Corporation and others. All rights reserved. This program and the accompanying materials are made available under the terms of the Eclipse Public License v1.0 which accompanies this distribution, and is available at http://www.eclipse.org/legal/epl-v10.html. Contributors: IBM Corporation - initial API and implementation" />
-<meta name="DC.rights.owner" content="(C) Copyright 2000, 2009" />
-<meta content="public" name="security" />
-<meta content="index,follow" name="Robots" />
-<meta http-equiv="PICS-Label" content='(PICS-1.1 "http://www.icra.org/ratingsv02.html" l gen true r (cz 1 lz 1 nz 1 oz 1 vz 1) "http://www.rsac.org/ratingsv01.html" l gen true r (n 0 s 0 v 0 l 0) "http://www.classify.org/safesurf/" l gen true r (SS~~000 1))' />
-<meta content="concept" name="DC.Type" />
-<meta name="DC.Title" content="Project Explorer view in the Java EE perspective" />
-<meta name="abstract" content="While developing J2EE applications in the Java EE perspective, the Project Explorer view is your main view of your J2EE projects and resources." />
-<meta name="description" content="While developing J2EE applications in the Java EE perspective, the Project Explorer view is your main view of your J2EE projects and resources." />
-<meta content="views, Project Explorer" name="DC.subject" />
-<meta content="views, Project Explorer" name="keywords" />
-<meta scheme="URI" name="DC.Relation" content="../topics/tjviewfilters.html" />
-<meta scheme="URI" name="DC.Relation" content="../../org.eclipse.platform.doc.user/concepts/cworkset.htm" />
-<meta content="XHTML" name="DC.Format" />
-<meta content="cjview" name="DC.Identifier" />
-<meta content="en-us" name="DC.Language" />
-<link href="../../org.eclipse.wst.doc.user/common.css" type="text/css" rel="stylesheet" />
-<title>Project Explorer view in the Java EE
-perspective</title>
-</head>
-<body id="cjview"><a name="cjview"><!-- --></a>
-
-
-<h1 class="id_title">Project Explorer view in the Java EE
-perspective</h1>
-
-
-
-<div class="id_conbody"><p class="id_shortdesc">While developing J2EE applications in
-the Java™ EE
-perspective, the Project Explorer view is your main view of your J2EE projects
-and resources.</p>
-
-<p class="anchor_topictop" />
-
-<p>The Project Explorer view provides an integrated view of all project resources,
-including models of J2EE deployment descriptors, Java artifacts, resources, Web services,
-databases, and dynamic Web project artifacts.</p>
-
-<p>You should use this view to work with your J2EE deployment descriptors
-and their content. You can view an enterprise application project and see
-all of the modules associated with it. </p>
-
-<p>You can also filter what you see in the Project Explorer view to hide projects,
-folders, or files that you don't want to see. To enable or disable filters,
-select <span class="uicontrol">Customize View...</span> from the drop-down menu at
-the top right corner of the view. For more information, see <a href="cjviewfilters.html">Filters in the Project Explorer view</a>.</p>
-
-<p>Alternately, you can filter what you see by showing or hiding working sets,
-groups of related resources or projects. For more information, see <a href="../../org.eclipse.platform.doc.user/concepts/cworkset.htm" title="">Working Sets</a>.</p>
-
-<p class="anchor_topicbottom" />
-
-</div>
-
-<div><div class="reltasks"><strong>Related tasks</strong><br />
-<div><a href="../topics/tjviewfilters.html" title="You can filter the Project Explorer view to hide projects, folders, or files that you do not want to see.">Filtering in the Project Explorer view</a></div>
-</div>
-<div class="relinfo"><strong>Related information</strong><br />
-<div><a href="../../org.eclipse.platform.doc.user/concepts/cworkset.htm">Working sets</a></div>
-</div>
-</div>
-
-</body>
-</html>
\ No newline at end of file
diff --git a/docs/org.eclipse.jst.j2ee.doc.user/topics/cjviewfilters.dita b/docs/org.eclipse.jst.j2ee.doc.user/topics/cjviewfilters.dita
deleted file mode 100644
index be377a1..0000000
--- a/docs/org.eclipse.jst.j2ee.doc.user/topics/cjviewfilters.dita
+++ /dev/null
@@ -1,33 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<!--Arbortext, Inc., 1988-2006, v.4002-->
-<!DOCTYPE concept PUBLIC "-//OASIS//DTD DITA Concept//EN"
- "concept.dtd">
-<concept id="cjviewfilters" xml:lang="en-us">
-<title outputclass="id_title">Filters in the Project Explorer view</title>
-<shortdesc outputclass="id_shortdesc">You can filter the Project Explorer
-view to hide projects, folders, or files that you do not want to see.</shortdesc>
-<prolog><metadata>
-<keywords><indexterm>filters<indexterm>Project Explorer view</indexterm></indexterm>
-<indexterm>views<indexterm>Project Explorer filters</indexterm></indexterm>
-</keywords>
-</metadata></prolog>
-<conbody outputclass="id_conbody">
-<p outputclass="anchor_topictop"></p>
-<p>To enable or disable filters, complete the following steps:<ol>
-<li>Open the Select Common Navigator Filters window by selecting <uicontrol>Customize
-View...</uicontrol> from the drop-down menu at the top right corner of the
-view.</li>
-<li>On the <uicontrol>Filters</uicontrol> tab, select the check boxes next
-to the filters you want to enable. For example, when the <uicontrol>Closed
- projects</uicontrol> filter is enabled, closed projects are not shown in
-the Project Explorer view. Other filters can hide empty packages, non-java
-files, and files with names ending in ".class".</li>
-<li>On the Available Extensions and Filters tab, the filters work in the opposite
-way: the selected check boxes describe the projects, folders, and files that
-are shown in the Project Explorer view. For example, if you clear the checkbox
-next to <uicontrol>J2EE Deployment Descriptors</uicontrol>, the deployment
-descriptors are hidden from each project in the view.</li>
-</ol></p>
-<p outputclass="anchor_topicbottom"></p>
-</conbody>
-</concept>
diff --git a/docs/org.eclipse.jst.j2ee.doc.user/topics/cjviewfilters.html b/docs/org.eclipse.jst.j2ee.doc.user/topics/cjviewfilters.html
deleted file mode 100644
index bdd0929..0000000
--- a/docs/org.eclipse.jst.j2ee.doc.user/topics/cjviewfilters.html
+++ /dev/null
@@ -1,60 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?><!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.0 Transitional//EN" "http://www.w3.org/TR/xhtml1/DTD/xhtml1-transitional.dtd">
-<html lang="en-us" xml:lang="en-us">
-<head>
-<meta content="text/html; charset=utf-8" http-equiv="Content-Type" />
-<meta name="copyright" content="Copyright (c) 2000, 2009 IBM Corporation and others. All rights reserved. This program and the accompanying materials are made available under the terms of the Eclipse Public License v1.0 which accompanies this distribution, and is available at http://www.eclipse.org/legal/epl-v10.html. Contributors: IBM Corporation - initial API and implementation" />
-<meta name="DC.rights.owner" content="(C) Copyright 2000, 2009" />
-<meta content="public" name="security" />
-<meta content="index,follow" name="Robots" />
-<meta http-equiv="PICS-Label" content='(PICS-1.1 "http://www.icra.org/ratingsv02.html" l gen true r (cz 1 lz 1 nz 1 oz 1 vz 1) "http://www.rsac.org/ratingsv01.html" l gen true r (n 0 s 0 v 0 l 0) "http://www.classify.org/safesurf/" l gen true r (SS~~000 1))' />
-<meta content="concept" name="DC.Type" />
-<meta name="DC.Title" content="Filters in the Project Explorer view" />
-<meta name="abstract" content="You can filter the Project Explorer view to hide projects, folders, or files that you do not want to see." />
-<meta name="description" content="You can filter the Project Explorer view to hide projects, folders, or files that you do not want to see." />
-<meta content="filters, Project Explorer view, views, Project Explorer filters" name="DC.subject" />
-<meta content="filters, Project Explorer view, views, Project Explorer filters" name="keywords" />
-<meta content="XHTML" name="DC.Format" />
-<meta content="cjviewfilters" name="DC.Identifier" />
-<meta content="en-us" name="DC.Language" />
-<link href="../../org.eclipse.wst.doc.user/common.css" type="text/css" rel="stylesheet" />
-<title>Filters in the Project Explorer view</title>
-</head>
-<body id="cjviewfilters"><a name="cjviewfilters"><!-- --></a>
-
-
-<h1 class="id_title">Filters in the Project Explorer view</h1>
-
-
-
-<div class="id_conbody"><p class="id_shortdesc">You can filter the Project Explorer
-view to hide projects, folders, or files that you do not want to see.</p>
-
-<p class="anchor_topictop" />
-
-<div class="p">To enable or disable filters, complete the following steps:<ol>
-<li>Open the Select Common Navigator Filters window by selecting <span class="uicontrol">Customize
-View...</span> from the drop-down menu at the top right corner of the
-view.</li>
-
-<li>On the <span class="uicontrol">Filters</span> tab, select the check boxes next
-to the filters you want to enable. For example, when the <span class="uicontrol">Closed
- projects</span> filter is enabled, closed projects are not shown in
-the Project Explorer view. Other filters can hide empty packages, non-java
-files, and files with names ending in ".class".</li>
-
-<li>On the Available Extensions and Filters tab, the filters work in the opposite
-way: the selected check boxes describe the projects, folders, and files that
-are shown in the Project Explorer view. For example, if you clear the checkbox
-next to <span class="uicontrol">J2EE Deployment Descriptors</span>, the deployment
-descriptors are hidden from each project in the view.</li>
-
-</ol>
-</div>
-
-<p class="anchor_topicbottom" />
-
-</div>
-
-
-</body>
-</html>
\ No newline at end of file
diff --git a/docs/org.eclipse.jst.j2ee.doc.user/topics/ctypesofanno.dita b/docs/org.eclipse.jst.j2ee.doc.user/topics/ctypesofanno.dita
deleted file mode 100644
index 05e2c23..0000000
--- a/docs/org.eclipse.jst.j2ee.doc.user/topics/ctypesofanno.dita
+++ /dev/null
@@ -1,46 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!--Arbortext, Inc., 1988-2009, v.4002-->
-<!DOCTYPE concept PUBLIC "-//OASIS//DTD DITA Concept//EN"
- "concept.dtd">
-<?Pub Sty _display FontColor="red"?>
-<concept id="cjavaee5" xml:lang="en-us">
-<title outputclass="id_title">Types of annotations</title>
-<shortdesc outputclass="id_shortdesc"><tm tmclass="special"
-tmowner="Sun Microsystems, Inc." tmtype="tm" trademark="Java">Java</tm> EE
-6 and Java EE 5 define a number of types or groups of annotations,
-defined in a number of <tm tmclass="special"
-tmowner="Sun Microsystems, Inc." tmtype="tm" trademark="Java">Java</tm> Specification
-Requests (JSRs).</shortdesc><?Pub Caret 32?>
-<prolog><metadata>
-<keywords><indexterm>Java EE 5<indexterm>annotations<indexterm>types</indexterm></indexterm></indexterm>
-</keywords>
-</metadata></prolog>
-<conbody outputclass="id_conbody">
-<p outputclass="anchor_topictop"></p>
-<p>For additional information on <tm tmclass="special"
-tmowner="Sun Microsystems, Inc." tmtype="tm" trademark="Java">Java</tm> EE
-6.0, see the official specification: <xref
-href="http://jcp.org/en/jsr/detail?id=316" scope="external">JSR 316:
-JavaTM Platform, Enterprise Edition 6 (Java EE 6) Specification</xref></p>
-<p><tm tmclass="special" tmowner="Sun Microsystems, Inc." tmtype="tm"
-trademark="Java">Java</tm> EE 5 defines the following types of annotations:</p>
-<ul>
-<li>JSR 250: Common annotations<b></b></li>
-<li>JSR-220: EJB 3.0 annotations</li>
-<li>JSR-181: Web Services annotations</li>
-<li>JSR-220: Java Persistence API annotations</li>
-<li>JSR-222: JaxB annotations</li>
-<li>JSR-224: WS2 annotations</li>
-</ul>
-<p>For additional information on <tm tmclass="special"
-tmowner="Sun Microsystems, Inc." tmtype="tm" trademark="Java">Java</tm> EE
-5.0, see the official specification: <xref
-href="http://jcp.org/en/jsr/detail?id=244" scope="external">JSR 244: <tm
-tmclass="special" tmowner="Sun Microsystems, Inc." tmtype="tm"
-trademark="Java">Java</tm> Platform, Enterprise Edition 5 (<tm
-tmclass="special" tmowner="Sun Microsystems, Inc." tmtype="tm"
-trademark="Java">Java</tm> EE 5) Specification</xref></p>
-<p outputclass="anchor_topicbottom"></p>
-</conbody>
-</concept>
-<?Pub *0000002199?>
diff --git a/docs/org.eclipse.jst.j2ee.doc.user/topics/ctypesofanno.html b/docs/org.eclipse.jst.j2ee.doc.user/topics/ctypesofanno.html
deleted file mode 100644
index 78b94d7..0000000
--- a/docs/org.eclipse.jst.j2ee.doc.user/topics/ctypesofanno.html
+++ /dev/null
@@ -1,71 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?><!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.0 Transitional//EN" "http://www.w3.org/TR/xhtml1/DTD/xhtml1-transitional.dtd">
-<html lang="en-us" xml:lang="en-us">
-<head>
-<meta content="text/html; charset=utf-8" http-equiv="Content-Type" />
-<meta name="copyright" content="Copyright (c) 2000, 2009 IBM Corporation and others. All rights reserved. This program and the accompanying materials are made available under the terms of the Eclipse Public License v1.0 which accompanies this distribution, and is available at http://www.eclipse.org/legal/epl-v10.html. Contributors: IBM Corporation - initial API and implementation" />
-<meta name="DC.rights.owner" content="(C) Copyright 2000, 2009" />
-<meta content="public" name="security" />
-<meta content="index,follow" name="Robots" />
-<meta http-equiv="PICS-Label" content='(PICS-1.1 "http://www.icra.org/ratingsv02.html" l gen true r (cz 1 lz 1 nz 1 oz 1 vz 1) "http://www.rsac.org/ratingsv01.html" l gen true r (n 0 s 0 v 0 l 0) "http://www.classify.org/safesurf/" l gen true r (SS~~000 1))' />
-<meta content="concept" name="DC.Type" />
-<meta name="DC.Title" content="Types of annotations" />
-<meta name="abstract" content="Java EE 6 and Java EE 5 define a number of types or groups of annotations, defined in a number of Java Specification Requests (JSRs)." />
-<meta name="description" content="Java EE 6 and Java EE 5 define a number of types or groups of annotations, defined in a number of Java Specification Requests (JSRs)." />
-<meta content="Java EE 5, annotations, types" name="DC.subject" />
-<meta content="Java EE 5, annotations, types" name="keywords" />
-<meta scheme="URI" name="DC.Relation" content="../topics/tdefiningannotations.html" />
-<meta content="XHTML" name="DC.Format" />
-<meta content="cjavaee5" name="DC.Identifier" />
-<meta content="en-us" name="DC.Language" />
-<link href="../../org.eclipse.wst.doc.user/common.css" type="text/css" rel="stylesheet" />
-<title>Types of annotations</title>
-</head>
-<body id="cjavaee5"><a name="cjavaee5"><!-- --></a>
-
-
-<h1 class="id_title">Types of annotations</h1>
-
-
-
-<div class="id_conbody"><p class="id_shortdesc">Java™ EE
-6 and Java EE 5 define a number of types or groups of annotations,
-defined in a number of Java Specification
-Requests (JSRs).</p>
-
-<p class="anchor_topictop" />
-
-<p>For additional information on Java EE
-6.0, see the official specification: <a href="http://jcp.org/en/jsr/detail?id=316" target="_blank">JSR 316: JavaTM Platform, Enterprise Edition 6 (Java EE 6) Specification</a></p>
-
-<p>Java EE 5 defines the following types of annotations:</p>
-
-<ul>
-<li>JSR 250: Common annotations<strong /></li>
-
-<li>JSR-220: EJB 3.0 annotations</li>
-
-<li>JSR-181: Web Services annotations</li>
-
-<li>JSR-220: Java Persistence API annotations</li>
-
-<li>JSR-222: JaxB annotations</li>
-
-<li>JSR-224: WS2 annotations</li>
-
-</ul>
-
-<p>For additional information on Java EE
-5.0, see the official specification: <a href="http://jcp.org/en/jsr/detail?id=244" target="_blank">JSR 244: Java Platform, Enterprise Edition 5 (Java EE 5) Specification</a></p>
-
-<p class="anchor_topicbottom" />
-
-</div>
-
-<div>
-<div class="familylinks">
-<div class="parentlink"><strong>Parent topic:</strong> <a href="../topics/tdefiningannotations.html" title="You can use the @Interface annotation to define your own annotation definition.">Defining and using annotations</a></div>
-</div>
-</div>
-
-</body>
-</html>
\ No newline at end of file
diff --git a/docs/org.eclipse.jst.j2ee.doc.user/topics/ph-importexport.dita b/docs/org.eclipse.jst.j2ee.doc.user/topics/ph-importexport.dita
deleted file mode 100644
index 833c39f..0000000
--- a/docs/org.eclipse.jst.j2ee.doc.user/topics/ph-importexport.dita
+++ /dev/null
@@ -1,15 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<!DOCTYPE topic PUBLIC "-//OASIS//DTD DITA Topic//EN"
- "topic.dtd">
-<topic id="ph-importexport" xml:lang="en-us">
-<title outputclass="id_title">Importing and exporting projects and files</title>
-<shortdesc outputclass="id_shortdesc">These topics cover how to import files
-and projects into the workbench and export files and projects to disk.</shortdesc>
-<prolog><metadata>
-<keywords></keywords>
-</metadata></prolog>
-<body outputclass="id_body">
-<p outputclass="anchor_topictop"></p>
-<p outputclass="anchor_topicbottom"></p>
-</body>
-</topic>
diff --git a/docs/org.eclipse.jst.j2ee.doc.user/topics/ph-importexport.html b/docs/org.eclipse.jst.j2ee.doc.user/topics/ph-importexport.html
deleted file mode 100644
index 836ce48..0000000
--- a/docs/org.eclipse.jst.j2ee.doc.user/topics/ph-importexport.html
+++ /dev/null
@@ -1,83 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?><!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.0 Transitional//EN" "http://www.w3.org/TR/xhtml1/DTD/xhtml1-transitional.dtd">
-<html lang="en-us" xml:lang="en-us">
-<head>
-<meta content="text/html; charset=utf-8" http-equiv="Content-Type" />
-<meta name="copyright" content="Copyright (c) 2000, 2009 IBM Corporation and others. All rights reserved. This program and the accompanying materials are made available under the terms of the Eclipse Public License v1.0 which accompanies this distribution, and is available at http://www.eclipse.org/legal/epl-v10.html. Contributors: IBM Corporation - initial API and implementation" />
-<meta name="DC.rights.owner" content="(C) Copyright 2000, 2009" />
-<meta content="public" name="security" />
-<meta content="index,follow" name="Robots" />
-<meta http-equiv="PICS-Label" content='(PICS-1.1 "http://www.icra.org/ratingsv02.html" l gen true r (cz 1 lz 1 nz 1 oz 1 vz 1) "http://www.rsac.org/ratingsv01.html" l gen true r (n 0 s 0 v 0 l 0) "http://www.classify.org/safesurf/" l gen true r (SS~~000 1))' />
-<meta content="topic" name="DC.Type" />
-<meta name="DC.Title" content="Importing and exporting projects and files" />
-<meta name="abstract" content="These topics cover how to import files and projects into the workbench and export files and projects to disk." />
-<meta name="description" content="These topics cover how to import files and projects into the workbench and export files and projects to disk." />
-<meta scheme="URI" name="DC.Relation" content="../topics/ph-projects.html" />
-<meta scheme="URI" name="DC.Relation" content="../topics/tjexpapp.html" />
-<meta scheme="URI" name="DC.Relation" content="../topics/tjexpear.html" />
-<meta scheme="URI" name="DC.Relation" content="../topics/tjexprar.html" />
-<meta scheme="URI" name="DC.Relation" content="../topics/tjimpear.html" />
-<meta scheme="URI" name="DC.Relation" content="../topics/tjimpapp.html" />
-<meta scheme="URI" name="DC.Relation" content="../topics/tjimprar.html" />
-<meta scheme="URI" name="DC.Relation" content="../../org.eclipse.wst.webtools.doc.user/topics/twimpwar.html" />
-<meta scheme="URI" name="DC.Relation" content="../../org.eclipse.wst.webtools.doc.user/topics/twcrewar.html" />
-<meta scheme="URI" name="DC.Relation" content="../../org.eclipse.jst.ejb.doc.user/topics/teimp.html" />
-<meta scheme="URI" name="DC.Relation" content="../../org.eclipse.jst.ejb.doc.user/topics/teexp.html" />
-<meta scheme="URI" name="DC.Relation" content="../topics/cjcircle.html" />
-<meta scheme="URI" name="DC.Relation" content="../topics/tjcircleb.html" />
-<meta content="XHTML" name="DC.Format" />
-<meta content="ph-importexport" name="DC.Identifier" />
-<meta content="en-us" name="DC.Language" />
-<link href="../../org.eclipse.wst.doc.user/common.css" type="text/css" rel="stylesheet" />
-<title>Importing and exporting projects and files</title>
-</head>
-<body id="ph-importexport"><a name="ph-importexport"><!-- --></a>
-
-
-<h1 class="id_title">Importing and exporting projects and files</h1>
-
-
-
-<div class="id_body"><p class="id_shortdesc">These topics cover how to import files
-and projects into the workbench and export files and projects to disk.</p>
-
-<p class="anchor_topictop" />
-
-<p class="anchor_topicbottom" />
-
-</div>
-
-<div>
-<ul class="ullinks">
-<li class="ulchildlink"><strong><a href="../topics/tjexpapp.html">Exporting an application client project</a></strong><br />
-You can export an application client project as a JAR file.</li>
-<li class="ulchildlink"><strong><a href="../topics/tjexpear.html">Exporting an enterprise application into an EAR file</a></strong><br />
-Enterprise applications are deployed in the form of an EAR file. Use the Export wizard to export an enterprise application project into an EAR file for deployment.</li>
-<li class="ulchildlink"><strong><a href="../topics/tjexprar.html">Exporting connector projects to RAR files</a></strong><br />
-You can export a connector project to a RAR file in preparation for deploying it to a server.</li>
-<li class="ulchildlink"><strong><a href="../topics/tjimpear.html">Importing an enterprise application EAR file</a></strong><br />
-Enterprise application projects are deployed into EAR files. You can import an enterprise application project by importing it from a deployed EAR file.</li>
-<li class="ulchildlink"><strong><a href="../topics/tjimpapp.html">Importing an application client JAR file</a></strong><br />
-Application client projects are deployed as JAR files. You can import an application client project that has been deployed into a JAR file by using the Import wizard.</li>
-<li class="ulchildlink"><strong><a href="../topics/tjimprar.html">Importing a connector project RAR file</a></strong><br />
-Connector projects are deployed into RAR files. You can import a connector project by importing a deployed RAR file.</li>
-<li class="ulchildlink"><strong><a href="../../org.eclipse.wst.webtools.doc.user/topics/twimpwar.html">Importing Web archive (WAR) files</a></strong><br />
-</li>
-<li class="ulchildlink"><strong><a href="../../org.eclipse.wst.webtools.doc.user/topics/twcrewar.html">Exporting Web Archive (WAR) files</a></strong><br />
-</li>
-<li class="ulchildlink"><strong><a href="../../org.eclipse.jst.ejb.doc.user/topics/teimp.html">Importing EJB JAR files</a></strong><br />
-</li>
-<li class="ulchildlink"><strong><a href="../../org.eclipse.jst.ejb.doc.user/topics/teexp.html">Exporting EJB projects to EJB JAR files</a></strong><br />
-</li>
-<li class="ulchildlink"><strong><a href="../topics/cjcircle.html">Cyclical dependencies between Java EE modules</a></strong><br />
-A cyclical dependency between two or more modules in an enterprise application most commonly occurs when projects are imported from outside the Workbench.</li>
-<li class="ulchildlink"><strong><a href="../topics/tjcircleb.html">Correcting cyclical dependencies after an EAR is imported</a></strong><br />
-You can resolve cyclical dependencies after an EAR is imported.</li>
-</ul>
-
-<div class="familylinks">
-<div class="parentlink"><strong>Parent topic:</strong> <a href="../topics/ph-projects.html" title="The workbench can work with many different types of projects. The following topics cover creating and managing some of the types of projects related to J2EE development.">Working with projects</a></div>
-</div>
-</div>
-
-</body>
-</html>
\ No newline at end of file
diff --git a/docs/org.eclipse.jst.j2ee.doc.user/topics/ph-j2eeapp.dita b/docs/org.eclipse.jst.j2ee.doc.user/topics/ph-j2eeapp.dita
deleted file mode 100644
index 5f6b4eb..0000000
--- a/docs/org.eclipse.jst.j2ee.doc.user/topics/ph-j2eeapp.dita
+++ /dev/null
@@ -1,17 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<!--Arbortext, Inc., 1988-2006, v.4002-->
-<!DOCTYPE topic PUBLIC "-//OASIS//DTD DITA Topic//EN"
- "topic.dtd">
-<topic id="ph-j2eeapp" xml:lang="en-us">
-<title outputclass="id_title">Java EE applications</title>
-<shortdesc outputclass="id_shortdesc">These topics deal with the <tm tmclass="special"
-tmowner="Sun Microsystems, Inc." tmtype="tm" trademark="Java">Java</tm> Enterprise
-Edition (Java EE).</shortdesc>
-<prolog><metadata>
-<keywords></keywords>
-</metadata></prolog>
-<body outputclass="id_body">
-<p outputclass="anchor_topictop"></p>
-<p outputclass="anchor_topicbottom"></p>
-</body>
-</topic>
diff --git a/docs/org.eclipse.jst.j2ee.doc.user/topics/ph-j2eeapp.html b/docs/org.eclipse.jst.j2ee.doc.user/topics/ph-j2eeapp.html
deleted file mode 100644
index 4c1f4ab..0000000
--- a/docs/org.eclipse.jst.j2ee.doc.user/topics/ph-j2eeapp.html
+++ /dev/null
@@ -1,66 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?><!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.0 Transitional//EN" "http://www.w3.org/TR/xhtml1/DTD/xhtml1-transitional.dtd">
-<html lang="en-us" xml:lang="en-us">
-<head>
-<meta content="text/html; charset=utf-8" http-equiv="Content-Type" />
-<meta name="copyright" content="Copyright (c) 2000, 2009 IBM Corporation and others. All rights reserved. This program and the accompanying materials are made available under the terms of the Eclipse Public License v1.0 which accompanies this distribution, and is available at http://www.eclipse.org/legal/epl-v10.html. Contributors: IBM Corporation - initial API and implementation" />
-<meta name="DC.rights.owner" content="(C) Copyright 2000, 2009" />
-<meta content="public" name="security" />
-<meta content="index,follow" name="Robots" />
-<meta http-equiv="PICS-Label" content='(PICS-1.1 "http://www.icra.org/ratingsv02.html" l gen true r (cz 1 lz 1 nz 1 oz 1 vz 1) "http://www.rsac.org/ratingsv01.html" l gen true r (n 0 s 0 v 0 l 0) "http://www.classify.org/safesurf/" l gen true r (SS~~000 1))' />
-<meta content="topic" name="DC.Type" />
-<meta name="DC.Title" content="Java EE applications" />
-<meta name="abstract" content="These topics deal with the Java Enterprise Edition (Java EE)." />
-<meta name="description" content="These topics deal with the Java Enterprise Edition (Java EE)." />
-<meta scheme="URI" name="DC.Relation" content="../topics/cjavaee5.html" />
-<meta scheme="URI" name="DC.Relation" content="../topics/cjarch.html" />
-<meta scheme="URI" name="DC.Relation" content="../topics/cjpers.html" />
-<meta scheme="URI" name="DC.Relation" content="../topics/cjview.html" />
-<meta scheme="URI" name="DC.Relation" content="../topics/tjviewfilters.html" />
-<meta scheme="URI" name="DC.Relation" content="../topics/ph-projects.html" />
-<meta scheme="URI" name="DC.Relation" content="../topics/tjval.html" />
-<meta scheme="URI" name="DC.Relation" content="../topics/ph-ref.html" />
-<meta content="XHTML" name="DC.Format" />
-<meta content="ph-j2eeapp" name="DC.Identifier" />
-<meta content="en-us" name="DC.Language" />
-<link href="../../org.eclipse.wst.doc.user/common.css" type="text/css" rel="stylesheet" />
-<title>Java EE applications</title>
-</head>
-<body id="ph-j2eeapp"><a name="ph-j2eeapp"><!-- --></a>
-
-
-<h1 class="id_title">Java EE applications</h1>
-
-
-
-<div class="id_body"><p class="id_shortdesc">These topics deal with the Java™ Enterprise
-Edition (Java EE).</p>
-
-<p class="anchor_topictop" />
-
-<p class="anchor_topicbottom" />
-
-</div>
-
-<div>
-<ul class="ullinks">
-<li class="ulchildlink"><strong><a href="../topics/cjavaee5.html">Developing Java EE Applications</a></strong><br />
-The Java EE 5 programming model simplifies the process of creating Java applications.</li>
-<li class="ulchildlink"><strong><a href="../topics/cjarch.html">J2EE architecture</a></strong><br />
-The Java 2 Platform, Enterprise Edition (J2EE) provides a standard for developing multitier, enterprise applications.</li>
-<li class="ulchildlink"><strong><a href="../topics/cjpers.html">Java EE perspective</a></strong><br />
-The Java EE perspective includes workbench views that you can use when developing resources for enterprise applications, EJB modules, Web modules, application client modules, and connector projects or modules.</li>
-<li class="ulchildlink"><strong><a href="../topics/cjview.html">Project Explorer view in the Java EE perspective</a></strong><br />
-While developing J2EE applications in the Java EE perspective, the Project Explorer view is your main view of your J2EE projects and resources.</li>
-<li class="ulchildlink"><strong><a href="../topics/tjviewfilters.html">Filtering in the Project Explorer view</a></strong><br />
-You can filter the Project Explorer view to hide projects, folders, or files that you do not want to see.</li>
-<li class="ulchildlink"><strong><a href="../topics/ph-projects.html">Working with projects</a></strong><br />
-The workbench can work with many different types of projects. The following topics cover creating and managing some of the types of projects related to J2EE development.</li>
-<li class="ulchildlink"><strong><a href="../topics/tjval.html">Validating code in enterprise applications</a></strong><br />
-The workbench includes validators that check certain files in your enterprise application module projects for errors.</li>
-<li class="ulchildlink"><strong><a href="../topics/ph-ref.html">Reference</a></strong><br />
-The following reference material on J2EE is available:</li>
-</ul>
-</div>
-
-</body>
-</html>
\ No newline at end of file
diff --git a/docs/org.eclipse.jst.j2ee.doc.user/topics/ph-projects.dita b/docs/org.eclipse.jst.j2ee.doc.user/topics/ph-projects.dita
deleted file mode 100644
index 57572fa..0000000
--- a/docs/org.eclipse.jst.j2ee.doc.user/topics/ph-projects.dita
+++ /dev/null
@@ -1,16 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<!DOCTYPE topic PUBLIC "-//OASIS//DTD DITA Topic//EN"
- "topic.dtd">
-<topic id="phprojects" xml:lang="en-us">
-<title outputclass="id_title">Working with projects</title>
-<shortdesc outputclass="id_shortdesc">The workbench can work with many different
-types of projects. The following topics cover creating and managing some of
-the types of projects related to J2EE development.</shortdesc>
-<prolog><metadata>
-<keywords></keywords>
-</metadata></prolog>
-<body outputclass="id_body">
-<p outputclass="anchor_topictop"></p>
-<p outputclass="anchor_topicbottom"></p>
-</body>
-</topic>
diff --git a/docs/org.eclipse.jst.j2ee.doc.user/topics/ph-projects.html b/docs/org.eclipse.jst.j2ee.doc.user/topics/ph-projects.html
deleted file mode 100644
index da17023..0000000
--- a/docs/org.eclipse.jst.j2ee.doc.user/topics/ph-projects.html
+++ /dev/null
@@ -1,78 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?><!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.0 Transitional//EN" "http://www.w3.org/TR/xhtml1/DTD/xhtml1-transitional.dtd">
-<html lang="en-us" xml:lang="en-us">
-<head>
-<meta content="text/html; charset=utf-8" http-equiv="Content-Type" />
-<meta name="copyright" content="Copyright (c) 2000, 2009 IBM Corporation and others. All rights reserved. This program and the accompanying materials are made available under the terms of the Eclipse Public License v1.0 which accompanies this distribution, and is available at http://www.eclipse.org/legal/epl-v10.html. Contributors: IBM Corporation - initial API and implementation" />
-<meta name="DC.rights.owner" content="(C) Copyright 2000, 2009" />
-<meta content="public" name="security" />
-<meta content="index,follow" name="Robots" />
-<meta http-equiv="PICS-Label" content='(PICS-1.1 "http://www.icra.org/ratingsv02.html" l gen true r (cz 1 lz 1 nz 1 oz 1 vz 1) "http://www.rsac.org/ratingsv01.html" l gen true r (n 0 s 0 v 0 l 0) "http://www.classify.org/safesurf/" l gen true r (SS~~000 1))' />
-<meta content="topic" name="DC.Type" />
-<meta name="DC.Title" content="Working with projects" />
-<meta name="abstract" content="The workbench can work with many different types of projects. The following topics cover creating and managing some of the types of projects related to J2EE development." />
-<meta name="description" content="The workbench can work with many different types of projects. The following topics cover creating and managing some of the types of projects related to J2EE development." />
-<meta scheme="URI" name="DC.Relation" content="../topics/ph-j2eeapp.html" />
-<meta scheme="URI" name="DC.Relation" content="../topics/cjearproj.html" />
-<meta scheme="URI" name="DC.Relation" content="../topics/cjappcliproj.html" />
-<meta scheme="URI" name="DC.Relation" content="../topics/tjear.html" />
-<meta scheme="URI" name="DC.Relation" content="../topics/tjappproj.html" />
-<meta scheme="URI" name="DC.Relation" content="../topics/tjrar.html" />
-<meta scheme="URI" name="DC.Relation" content="../topics/tcreatingawebproject.html" />
-<meta scheme="URI" name="DC.Relation" content="../topics/twebfragproj.html" />
-<meta scheme="URI" name="DC.Relation" content="../topics/tjtargetserver.html" />
-<meta scheme="URI" name="DC.Relation" content="../topics/cfacets.html" />
-<meta scheme="URI" name="DC.Relation" content="../topics/ph-importexport.html" />
-<meta content="XHTML" name="DC.Format" />
-<meta content="phprojects" name="DC.Identifier" />
-<meta content="en-us" name="DC.Language" />
-<link href="../../org.eclipse.wst.doc.user/common.css" type="text/css" rel="stylesheet" />
-<title>Working with projects</title>
-</head>
-<body id="phprojects"><a name="phprojects"><!-- --></a>
-
-
-<h1 class="id_title">Working with projects</h1>
-
-
-
-<div class="id_body"><p class="id_shortdesc">The workbench can work with many different
-types of projects. The following topics cover creating and managing some of
-the types of projects related to J2EE development.</p>
-
-<p class="anchor_topictop" />
-
-<p class="anchor_topicbottom" />
-
-</div>
-
-<div>
-<ul class="ullinks">
-<li class="ulchildlink"><strong><a href="../topics/cjearproj.html">Enterprise application projects</a></strong><br />
-An enterprise application project ties together the resources that are required to deploy a J2EE enterprise application.</li>
-<li class="ulchildlink"><strong><a href="../topics/cjappcliproj.html">Application client projects</a></strong><br />
-Application client projects contain programs that run on networked client systems so the project can benefit from a server's tools.</li>
-<li class="ulchildlink"><strong><a href="../topics/tjear.html">Creating an enterprise application project</a></strong><br />
-Using the wizard to create an enterprise application project allows you to package many web applications and modules in a project and deploy these modules as a J2EE enterprise application.</li>
-<li class="ulchildlink"><strong><a href="../topics/tjappproj.html">Creating an application client project</a></strong><br />
-You can use a wizard to create a new application client project and add it to a new or existing enterprise application project.</li>
-<li class="ulchildlink"><strong><a href="../topics/tjrar.html">Creating a connector project</a></strong><br />
-A connector is a J2EE standard extension mechanism for containers to provide connectivity to enterprise information systems (EISs).</li>
-<li class="ulchildlink"><strong><a href="../topics/tcreatingawebproject.html">Creating Web projects</a></strong><br />
-You can use wizards to create Web modules in your Java EE project.</li>
-<li class="ulchildlink"><strong><a href="../topics/twebfragproj.html">Creating Web fragment projects</a></strong><br />
-You can use the Web fragment project wizard to create Web fragment projects in your workspace.</li>
-<li class="ulchildlink"><strong><a href="../topics/tjtargetserver.html">Specifying target servers for J2EE projects</a></strong><br />
-When you develop J2EE applications, you can specify the server runtime environments for your J2EE projects. The target server is specified during project creation and import, and it can be changed in the project properties. The target server setting is the default mechanism for setting the class path for J2EE projects.</li>
-<li class="ulchildlink"><strong><a href="../topics/cfacets.html">Project facets</a></strong><br />
-Facets define characteristics and requirements for Java EE projects and are used as part of the runtime configuration.</li>
-<li class="ulchildlink"><strong><a href="../topics/ph-importexport.html">Importing and exporting projects and files</a></strong><br />
-These topics cover how to import files and projects into the workbench and export files and projects to disk.</li>
-</ul>
-
-<div class="familylinks">
-<div class="parentlink"><strong>Parent topic:</strong> <a href="../topics/ph-j2eeapp.html" title="These topics deal with the Java Enterprise Edition (Java EE).">Java EE applications</a></div>
-</div>
-</div>
-
-</body>
-</html>
\ No newline at end of file
diff --git a/docs/org.eclipse.jst.j2ee.doc.user/topics/ph-ref.dita b/docs/org.eclipse.jst.j2ee.doc.user/topics/ph-ref.dita
deleted file mode 100644
index 71f8c8c..0000000
--- a/docs/org.eclipse.jst.j2ee.doc.user/topics/ph-ref.dita
+++ /dev/null
@@ -1,15 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<!DOCTYPE topic PUBLIC "-//OASIS//DTD DITA Topic//EN"
- "topic.dtd">
-<topic id="ph-ref" xml:lang="en-us">
-<title outputclass="id_title">Reference</title>
-<shortdesc outputclass="id_shortdesc">The following reference material on
-J2EE is available:</shortdesc>
-<prolog><metadata>
-<keywords></keywords>
-</metadata></prolog>
-<body outputclass="id_body">
-<p outputclass="anchor_topictop"></p>
-<p outputclass="anchor_topicbottom"></p>
-</body>
-</topic>
diff --git a/docs/org.eclipse.jst.j2ee.doc.user/topics/ph-ref.html b/docs/org.eclipse.jst.j2ee.doc.user/topics/ph-ref.html
deleted file mode 100644
index f7ba46e..0000000
--- a/docs/org.eclipse.jst.j2ee.doc.user/topics/ph-ref.html
+++ /dev/null
@@ -1,56 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?><!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.0 Transitional//EN" "http://www.w3.org/TR/xhtml1/DTD/xhtml1-transitional.dtd">
-<html lang="en-us" xml:lang="en-us">
-<head>
-<meta content="text/html; charset=utf-8" http-equiv="Content-Type" />
-<meta name="copyright" content="Copyright (c) 2000, 2009 IBM Corporation and others. All rights reserved. This program and the accompanying materials are made available under the terms of the Eclipse Public License v1.0 which accompanies this distribution, and is available at http://www.eclipse.org/legal/epl-v10.html. Contributors: IBM Corporation - initial API and implementation" />
-<meta name="DC.rights.owner" content="(C) Copyright 2000, 2009" />
-<meta content="public" name="security" />
-<meta content="index,follow" name="Robots" />
-<meta http-equiv="PICS-Label" content='(PICS-1.1 "http://www.icra.org/ratingsv02.html" l gen true r (cz 1 lz 1 nz 1 oz 1 vz 1) "http://www.rsac.org/ratingsv01.html" l gen true r (n 0 s 0 v 0 l 0) "http://www.classify.org/safesurf/" l gen true r (SS~~000 1))' />
-<meta content="topic" name="DC.Type" />
-<meta name="DC.Title" content="Reference" />
-<meta name="abstract" content="The following reference material on J2EE is available:" />
-<meta name="description" content="The following reference material on J2EE is available:" />
-<meta scheme="URI" name="DC.Relation" content="../topics/ph-j2eeapp.html" />
-<meta scheme="URI" name="DC.Relation" content="../topics/rvalidators.html" />
-<meta scheme="URI" name="DC.Relation" content="../topics/rvalerr.html" />
-<meta scheme="URI" name="DC.Relation" content="../topics/rjlimitcurrent.html" />
-<meta content="XHTML" name="DC.Format" />
-<meta content="ph-ref" name="DC.Identifier" />
-<meta content="en-us" name="DC.Language" />
-<link href="../../org.eclipse.wst.doc.user/common.css" type="text/css" rel="stylesheet" />
-<title>Reference</title>
-</head>
-<body id="ph-ref"><a name="ph-ref"><!-- --></a>
-
-
-<h1 class="id_title">Reference</h1>
-
-
-
-<div class="id_body"><p class="id_shortdesc">The following reference material on
-J2EE is available:</p>
-
-<p class="anchor_topictop" />
-
-<p class="anchor_topicbottom" />
-
-</div>
-
-<div>
-<ul class="ullinks">
-<li class="ulchildlink"><strong><a href="../topics/rvalidators.html">J2EE Validators</a></strong><br />
-This table lists the validators that are available for the different project types and gives a brief description of each validator.</li>
-<li class="ulchildlink"><strong><a href="../topics/rvalerr.html">Common validation errors and solutions</a></strong><br />
-This table lists the common error messages you may encounter when you validate your projects.</li>
-<li class="ulchildlink"><strong><a href="../topics/rjlimitcurrent.html">Limitations of J2EE development tools</a></strong><br />
-This topic outlines current known limitations and restrictions for J2EE tooling.</li>
-</ul>
-
-<div class="familylinks">
-<div class="parentlink"><strong>Parent topic:</strong> <a href="../topics/ph-j2eeapp.html" title="These topics deal with the Java Enterprise Edition (Java EE).">Java EE applications</a></div>
-</div>
-</div>
-
-</body>
-</html>
\ No newline at end of file
diff --git a/docs/org.eclipse.jst.j2ee.doc.user/topics/rjlimitcurrent.dita b/docs/org.eclipse.jst.j2ee.doc.user/topics/rjlimitcurrent.dita
deleted file mode 100644
index 9cbad09..0000000
--- a/docs/org.eclipse.jst.j2ee.doc.user/topics/rjlimitcurrent.dita
+++ /dev/null
@@ -1,71 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<!--Arbortext, Inc., 1988-2006, v.4002-->
-<!DOCTYPE reference PUBLIC "-//OASIS//DTD DITA Reference//EN"
- "reference.dtd">
-<reference id="rjlimitcurrent" xml:lang="en-us">
-<title outputclass="id_title">Limitations of J2EE development tools</title>
-<shortdesc outputclass="id_shortdesc">This topic outlines current known limitations
-and restrictions for J2EE tooling.</shortdesc>
-<prolog><metadata>
-<keywords><indexterm>J2EE<indexterm>tool limitations</indexterm></indexterm>
-</keywords>
-</metadata></prolog>
-<refbody outputclass="id_refbody">
-<section outputclass="id_spacesLimitation"><p outputclass="anchor_topictop"></p><title>Spaces
-not supported in JAR URIs within an enterprise application</title>Spaces are
-not supported in the URI for modules or utility JAR files in an enterprise
-application. The "Class-Path:" attribute of a MANIFEST.MF file in a JAR file
-or module is a space-delimited list of relative paths within an enterprise
-application. A JAR file would not be able to reference another JAR file in
-the EAR if the URI of the referenced JAR file contained spaces.</section>
-<section outputclass="id_EARDBCSLimitation"><title>Enterprise application
-project names should not contain DBCS characters</title><p id="limitation_ear_dbcs">When
-you create an enterprise application project, it is recommended that you do
-not give it a name that contains double-byte character set (DBCS) characters.</p></section>
-<section outputclass="id_utilityJARLimitation"><title><tm tmclass="special"
-tmowner="Sun Microsystems, Inc." tmtype="tm" trademark="Java">Java</tm> build
-path updates when removing the dependency on a Utility JAR file</title>When
-removing the dependency on a Utility JAR, the corresponding <tm tmclass="special"
-tmowner="Sun Microsystems, Inc." tmtype="tm" trademark="Java">Java</tm> project
-will be removed from the <tm tmclass="special" tmowner="Sun Microsystems, Inc."
-tmtype="tm" trademark="Java">Java</tm> build path only if the dependent JAR
-is still referenced by the EAR project. For example, suppose you create a
-J2EE 1.3 Web project and EAR along with the JUnit <tm tmclass="special" tmowner="Sun Microsystems, Inc."
-tmtype="tm" trademark="Java">Java</tm> Example project. Next, add the JUnit
-project as a Utility JAR in the EAR, then add JUnit as a <tm tmclass="special"
-tmowner="Sun Microsystems, Inc." tmtype="tm" trademark="Java">Java</tm> JAR
-Dependency of the Web project. If you then wanted to remove the dependency
-between JUnit and the Web project, remove the <tm tmclass="special" tmowner="Sun Microsystems, Inc."
-tmtype="tm" trademark="Java">Java</tm> JAR Dependency from the Web project
-first, then remove the Utility JAR from the EAR. Follow this order to ensure
-that this works correctly.</section>
-<section outputclass="id_JARdepLimitation"><title><tm tmclass="special" tmowner="Sun Microsystems, Inc."
-tmtype="tm" trademark="Java">Java</tm> JAR Dependencies page fails to update <tm
-tmclass="special" tmowner="Sun Microsystems, Inc." tmtype="tm" trademark="Java">Java</tm> build
-path</title>The <tm tmclass="special" tmowner="Sun Microsystems, Inc." tmtype="tm"
-trademark="Java">Java</tm> JAR Dependencies page is not synchronized with
-the <tm tmclass="special" tmowner="Sun Microsystems, Inc." tmtype="tm" trademark="Java">Java</tm> build
-path page in the project properties dialog. Therefore, a change applied in
-one may not be reflected in the other within the same dialog session. There
-are also some instances where flipping back and forth between the pages will
-cause the update from one to cancel out the update from another when the <uicontrol>OK</uicontrol> button
-is clicked or if the <uicontrol>Apply</uicontrol> button is clicked prior
-to the <uicontrol>OK</uicontrol> button. Typically this will appear as if
-a JAR dependency was added, but the project did not get added to the <tm tmclass="special"
-tmowner="Sun Microsystems, Inc." tmtype="tm" trademark="Java">Java</tm> build
-path. The workaround is to reopen the properties dialogs, switch to the JAR
-dependency page, clear and re-select the dependent JAR files, then click <uicontrol>OK</uicontrol>.</section>
-<section outputclass="id_locationLimitation"><title>'Invalid project description'
-error when using a non-default project location for a new J2EE project</title>When
-you create a new J2EE project (including <tm tmclass="special" tmowner="Sun Microsystems, Inc."
-tmtype="tm" trademark="Java">Java</tm>, enterprise application, Dynamic Web,
-EJB, application client, and connector projects), you cannot use a project
-location that is already used by another project in the workbench. If you
-choose a project location that is used by another project, the wizard displays
-an "Invalid project description" error dialog or message. If after you receive
-this message you then select a valid project location by clicking the Browse
-button, the project creation will still not finish. The workaround is to click
-Cancel and reopen the project creation wizard.</section>
-<example outputclass="anchor_topicbottom"></example>
-</refbody>
-</reference>
diff --git a/docs/org.eclipse.jst.j2ee.doc.user/topics/rjlimitcurrent.html b/docs/org.eclipse.jst.j2ee.doc.user/topics/rjlimitcurrent.html
deleted file mode 100644
index c055e44..0000000
--- a/docs/org.eclipse.jst.j2ee.doc.user/topics/rjlimitcurrent.html
+++ /dev/null
@@ -1,89 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?><!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.0 Transitional//EN" "http://www.w3.org/TR/xhtml1/DTD/xhtml1-transitional.dtd">
-<html lang="en-us" xml:lang="en-us">
-<head>
-<meta content="text/html; charset=utf-8" http-equiv="Content-Type" />
-<meta name="copyright" content="Copyright (c) 2000, 2009 IBM Corporation and others. All rights reserved. This program and the accompanying materials are made available under the terms of the Eclipse Public License v1.0 which accompanies this distribution, and is available at http://www.eclipse.org/legal/epl-v10.html. Contributors: IBM Corporation - initial API and implementation" />
-<meta name="DC.rights.owner" content="(C) Copyright 2000, 2009" />
-<meta content="public" name="security" />
-<meta content="index,follow" name="Robots" />
-<meta http-equiv="PICS-Label" content='(PICS-1.1 "http://www.icra.org/ratingsv02.html" l gen true r (cz 1 lz 1 nz 1 oz 1 vz 1) "http://www.rsac.org/ratingsv01.html" l gen true r (n 0 s 0 v 0 l 0) "http://www.classify.org/safesurf/" l gen true r (SS~~000 1))' />
-<meta content="reference" name="DC.Type" />
-<meta name="DC.Title" content="Limitations of J2EE development tools" />
-<meta name="abstract" content="This topic outlines current known limitations and restrictions for J2EE tooling." />
-<meta name="description" content="This topic outlines current known limitations and restrictions for J2EE tooling." />
-<meta content="J2EE, tool limitations" name="DC.subject" />
-<meta content="J2EE, tool limitations" name="keywords" />
-<meta content="XHTML" name="DC.Format" />
-<meta content="rjlimitcurrent" name="DC.Identifier" />
-<meta content="en-us" name="DC.Language" />
-<link href="../../org.eclipse.wst.doc.user/common.css" type="text/css" rel="stylesheet" />
-<title>Limitations of J2EE development tools</title>
-</head>
-<body id="rjlimitcurrent"><a name="rjlimitcurrent"><!-- --></a>
-
-
-<h1 class="id_title">Limitations of J2EE development tools</h1>
-
-
-
-<div class="id_refbody"><p class="id_shortdesc">This topic outlines current known limitations
-and restrictions for J2EE tooling.</p>
-
-<div class="id_spacesLimitation"><h4 class="sectiontitle">Spaces
-not supported in JAR URIs within an enterprise application</h4><p class="anchor_topictop" />
-Spaces are
-not supported in the URI for modules or utility JAR files in an enterprise
-application. The "Class-Path:" attribute of a MANIFEST.MF file in a JAR file
-or module is a space-delimited list of relative paths within an enterprise
-application. A JAR file would not be able to reference another JAR file in
-the EAR if the URI of the referenced JAR file contained spaces.</div>
-
-<div class="id_EARDBCSLimitation"><h4 class="sectiontitle">Enterprise application
-project names should not contain DBCS characters</h4><p id="rjlimitcurrent__limitation_ear_dbcs"><a name="rjlimitcurrent__limitation_ear_dbcs"><!-- --></a>When
-you create an enterprise application project, it is recommended that you do
-not give it a name that contains double-byte character set (DBCS) characters.</p>
-</div>
-
-<div class="id_utilityJARLimitation"><h4 class="sectiontitle">Java™ build
-path updates when removing the dependency on a Utility JAR file</h4>When
-removing the dependency on a Utility JAR, the corresponding Java project
-will be removed from the Java build path only if the dependent JAR
-is still referenced by the EAR project. For example, suppose you create a
-J2EE 1.3 Web project and EAR along with the JUnit Java Example project. Next, add the JUnit
-project as a Utility JAR in the EAR, then add JUnit as a Java JAR
-Dependency of the Web project. If you then wanted to remove the dependency
-between JUnit and the Web project, remove the Java JAR Dependency from the Web project
-first, then remove the Utility JAR from the EAR. Follow this order to ensure
-that this works correctly.</div>
-
-<div class="id_JARdepLimitation"><h4 class="sectiontitle">Java JAR Dependencies page fails to update Java build
-path</h4>The Java JAR Dependencies page is not synchronized with
-the Java build
-path page in the project properties dialog. Therefore, a change applied in
-one may not be reflected in the other within the same dialog session. There
-are also some instances where flipping back and forth between the pages will
-cause the update from one to cancel out the update from another when the <span class="uicontrol">OK</span> button
-is clicked or if the <span class="uicontrol">Apply</span> button is clicked prior
-to the <span class="uicontrol">OK</span> button. Typically this will appear as if
-a JAR dependency was added, but the project did not get added to the Java build
-path. The workaround is to reopen the properties dialogs, switch to the JAR
-dependency page, clear and re-select the dependent JAR files, then click <span class="uicontrol">OK</span>.</div>
-
-<div class="id_locationLimitation"><h4 class="sectiontitle">'Invalid project description'
-error when using a non-default project location for a new J2EE project</h4>When
-you create a new J2EE project (including Java, enterprise application, Dynamic Web,
-EJB, application client, and connector projects), you cannot use a project
-location that is already used by another project in the workbench. If you
-choose a project location that is used by another project, the wizard displays
-an "Invalid project description" error dialog or message. If after you receive
-this message you then select a valid project location by clicking the Browse
-button, the project creation will still not finish. The workaround is to click
-Cancel and reopen the project creation wizard.</div>
-
-<div class="anchor_topicbottom" />
-
-</div>
-
-
-</body>
-</html>
\ No newline at end of file
diff --git a/docs/org.eclipse.jst.j2ee.doc.user/topics/rtunevalidat.dita b/docs/org.eclipse.jst.j2ee.doc.user/topics/rtunevalidat.dita
deleted file mode 100644
index fd4f2de..0000000
--- a/docs/org.eclipse.jst.j2ee.doc.user/topics/rtunevalidat.dita
+++ /dev/null
@@ -1,54 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<!--Arbortext, Inc., 1988-2006, v.4002-->
-<!DOCTYPE reference PUBLIC "-//OASIS//DTD DITA Reference//EN"
- "reference.dtd">
-<reference id="rtunevalidat" xml:lang="en-us">
-<title>Tuning validators</title>
-<shortdesc>Whether or not a validator validates a particular resource depends
-on the filters that are in place for that validator.</shortdesc>
-<prolog><metadata>
-<keywords><indexterm>code validation<indexterm>tuning</indexterm></indexterm>
-<indexterm>validation<indexterm>tuning</indexterm></indexterm></keywords>
-</metadata></prolog>
-<refbody>
-<section><p>When a validator is first developed, the implementer of the validator
-defines a default set of filters. These filters may be based on:<ul>
-<li>file extensions</li>
-<li>folder of file names</li>
-<li>project natures</li>
-<li>project facets</li>
-<li>content types</li>
-</ul>Through the Validation Filters dialog, you are able to further tune these
-settings.Normally you would simply keep the defaults, however two reasons
-why you may want to tune validation are:<ul>
-<li>Performance: if you have a very large workspace, you could reduce the
-amount of validation.</li>
-<li>Non standard conventions: if you use a non standard naming convention
-(for example stores XML in files with an .acme-xml extension), you could still
-enable the appropriate validators to run against those files.</li>
-</ul>You can access this dialog by clicking <menucascade><uicontrol>Window</uicontrol>
-<uicontrol>Preferences</uicontrol><uicontrol>Validation</uicontrol></menucascade> and
-then clicking <uicontrol>Settings</uicontrol> beside each validator.</p><p>Filters
-are stored in groups. There are two types of groups: Include groups and Exclude
-groups. You can have as many Include groups as you like. Filters inside of
-an Include group cause resources to be validated. If any rule matches then
-the entire group matches. Inside of a group the filter rules are OR’d together.
-However individual Include groups are AND’ed together. You can have one Exclude
-group. If any of its filter rules match, then the resource is excluded. Exclusion
-takes precedence over inclusion.</p></section>
-<example><p>These rules are illustrated with this hypothetical example:<image
-href="../images/validatefilters.jpg" placement="break"><alt>screen capture
-of the validation filters panel showing include and exclude groups</alt></image><ul>
-<li>If the resource is in the disabled folder, it will be excluded because
-exclusion takes precedence over everything else.</li>
-<li>If the resource does not have the JSP source content type, and it does
-not have the JSP fragment source content type, and it does not have a file
-extension of .jsp or .jspf then it will be excluded because none of the rules
-in the first group matched.</li>
-<li>If the project does not have the module core nature then it will be excluded
-because the single rule in the second group did not match.</li>
-<li>Otherwise the resource will be validated by this particular validator.</li>
-</ul>To add a rule to a group, select the group on the left, and click <uicontrol>Add
-Rule</uicontrol>.</p></example>
-</refbody>
-</reference>
diff --git a/docs/org.eclipse.jst.j2ee.doc.user/topics/rtunevalidat.html b/docs/org.eclipse.jst.j2ee.doc.user/topics/rtunevalidat.html
deleted file mode 100644
index 635049f..0000000
--- a/docs/org.eclipse.jst.j2ee.doc.user/topics/rtunevalidat.html
+++ /dev/null
@@ -1,103 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?><!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.0 Transitional//EN" "http://www.w3.org/TR/xhtml1/DTD/xhtml1-transitional.dtd">
-<html lang="en-us" xml:lang="en-us">
-<head>
-<meta content="text/html; charset=utf-8" http-equiv="Content-Type" />
-<meta name="copyright" content="Copyright (c) 2000, 2009 IBM Corporation and others. All rights reserved. This program and the accompanying materials are made available under the terms of the Eclipse Public License v1.0 which accompanies this distribution, and is available at http://www.eclipse.org/legal/epl-v10.html. Contributors: IBM Corporation - initial API and implementation" />
-<meta name="DC.rights.owner" content="(C) Copyright 2000, 2009" />
-<meta content="public" name="security" />
-<meta content="index,follow" name="Robots" />
-<meta http-equiv="PICS-Label" content='(PICS-1.1 "http://www.icra.org/ratingsv02.html" l gen true r (cz 1 lz 1 nz 1 oz 1 vz 1) "http://www.rsac.org/ratingsv01.html" l gen true r (n 0 s 0 v 0 l 0) "http://www.classify.org/safesurf/" l gen true r (SS~~000 1))' />
-<meta content="reference" name="DC.Type" />
-<meta name="DC.Title" content="Tuning validators" />
-<meta name="abstract" content="Whether or not a validator validates a particular resource depends on the filters that are in place for that validator." />
-<meta name="description" content="Whether or not a validator validates a particular resource depends on the filters that are in place for that validator." />
-<meta content="code validation, tuning, validation" name="DC.subject" />
-<meta content="code validation, tuning, validation" name="keywords" />
-<meta scheme="URI" name="DC.Relation" content="../topics/tjvaldisable.html" />
-<meta scheme="URI" name="DC.Relation" content="../topics/tjvalglobalpref.html" />
-<meta scheme="URI" name="DC.Relation" content="../topics/tjvalmanual.html" />
-<meta scheme="URI" name="DC.Relation" content="../topics/tjvalselect.html" />
-<meta content="XHTML" name="DC.Format" />
-<meta content="rtunevalidat" name="DC.Identifier" />
-<meta content="en-us" name="DC.Language" />
-<link href="../../org.eclipse.wst.doc.user/common.css" type="text/css" rel="stylesheet" />
-<title>Tuning validators</title>
-</head>
-<body id="rtunevalidat"><a name="rtunevalidat"><!-- --></a>
-
-
-<h1 class="topictitle1">Tuning validators</h1>
-
-
-
-<div><p>Whether or not a validator validates a particular resource depends
-on the filters that are in place for that validator.</p>
-
-<div class="section"><div class="p">When a validator is first developed, the implementer of the validator
-defines a default set of filters. These filters may be based on:<ul>
-<li>file extensions</li>
-
-<li>folder of file names</li>
-
-<li>project natures</li>
-
-<li>project facets</li>
-
-<li>content types</li>
-
-</ul>
-Through the Validation Filters dialog, you are able to further tune these
-settings.Normally you would simply keep the defaults, however two reasons
-why you may want to tune validation are:<ul>
-<li>Performance: if you have a very large workspace, you could reduce the
-amount of validation.</li>
-
-<li>Non standard conventions: if you use a non standard naming convention
-(for example stores XML in files with an .acme-xml extension), you could still
-enable the appropriate validators to run against those files.</li>
-
-</ul>
-You can access this dialog by clicking <span class="menucascade"><span class="uicontrol">Window</span>
- > <span class="uicontrol">Preferences</span> > <span class="uicontrol">Validation</span></span> and
-then clicking <span class="uicontrol">Settings</span> beside each validator.</div>
-<p>Filters
-are stored in groups. There are two types of groups: Include groups and Exclude
-groups. You can have as many Include groups as you like. Filters inside of
-an Include group cause resources to be validated. If any rule matches then
-the entire group matches. Inside of a group the filter rules are OR’d together.
-However individual Include groups are AND’ed together. You can have one Exclude
-group. If any of its filter rules match, then the resource is excluded. Exclusion
-takes precedence over inclusion.</p>
-</div>
-
-<div class="example"><div class="p">These rules are illustrated with this hypothetical example:<br /><img src="../images/validatefilters.jpg" alt="screen capture of the validation filters panel showing include and exclude groups" /><br /><ul>
-<li>If the resource is in the disabled folder, it will be excluded because
-exclusion takes precedence over everything else.</li>
-
-<li>If the resource does not have the JSP source content type, and it does
-not have the JSP fragment source content type, and it does not have a file
-extension of .jsp or .jspf then it will be excluded because none of the rules
-in the first group matched.</li>
-
-<li>If the project does not have the module core nature then it will be excluded
-because the single rule in the second group did not match.</li>
-
-<li>Otherwise the resource will be validated by this particular validator.</li>
-
-</ul>
-To add a rule to a group, select the group on the left, and click <span class="uicontrol">Add
-Rule</span>.</div>
-</div>
-
-</div>
-
-<div><div class="reltasks"><strong>Related tasks</strong><br />
-<div><a href="../topics/tjvaldisable.html" title="You can disable one or more validators individually or disable validation entirely. Also, you can set validation settings for your entire workspace and for individual projects.">Disabling validation</a></div>
-<div><a href="../topics/tjvalglobalpref.html" title="For a given project, you can override the global validation preferences.">Overriding global validation preferences</a></div>
-<div><a href="../topics/tjvalmanual.html" title="When you run a manual validation, all resources in the selected project are validated according to the validation settings.">Manually validating code</a></div>
-<div><a href="../topics/tjvalselect.html" title="You can select specific validators to run during manual and build code validation. You can set each validator to run on manual validation, build validation, both, or neither.">Selecting code validators</a></div>
-</div>
-</div>
-
-</body>
-</html>
\ No newline at end of file
diff --git a/docs/org.eclipse.jst.j2ee.doc.user/topics/rvalerr.dita b/docs/org.eclipse.jst.j2ee.doc.user/topics/rvalerr.dita
deleted file mode 100644
index b4c14df..0000000
--- a/docs/org.eclipse.jst.j2ee.doc.user/topics/rvalerr.dita
+++ /dev/null
@@ -1,191 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<!--Arbortext, Inc., 1988-2006, v.4002-->
-<!DOCTYPE reference PUBLIC "-//OASIS//DTD DITA Reference//EN"
- "reference.dtd">
-<reference id="rvalerr" xml:lang="en-us">
-<title outputclass="id_title">Common validation errors and solutions</title>
-<shortdesc outputclass="id_shortdesc">This table lists the common error messages<?Pub Caret?>
-you may encounter when you validate your projects.</shortdesc>
-<prolog><metadata>
-<keywords><indexterm>code validation<indexterm>error solutions</indexterm></indexterm>
-<indexterm>validation<indexterm>error solutions</indexterm></indexterm></keywords>
-</metadata></prolog>
-<refbody outputclass="id_refbody">
-<example outputclass="anchor_topictop"></example>
-<table frame="all">
-<tgroup cols="3" colsep="1" rowsep="1"><colspec colname="col1" colwidth="60*"/>
-<colspec colname="col2" colwidth="72*"/><colspec colname="col3" colwidth="164*"/>
-<thead>
-<row outputclass="id_tableHeadRow">
-<entry>Message prefix</entry>
-<entry>Message</entry>
-<entry>Explanation</entry>
-</row>
-</thead>
-<tbody>
-<row outputclass="id_appclientValidator">
-<entry nameend="col3" namest="col1"><uicontrol>Application Client validator</uicontrol></entry>
-</row>
-<row outputclass="id_CHKJ1000">
-<entry colname="col1">CHKJ1000</entry>
-<entry colname="col2">Validation failed because the application client file
-is not valid. Ensure that the deployment descriptor is valid.</entry>
-<entry colname="col3">The application-client.xml file cannot be loaded. The
-project metadata cannot be initialized from the application-client.xml file.
- <ol>
-<li>Ensure the following: <ul>
-<li>that the META-INF folder exists in the application client project</li>
-<li>that META-INF contains the application-client.xml file</li>
-<li>that META-INF is in the project's classpath.</li>
-</ul> </li>
-<li>Validate the syntax of the application-client.xml file: in the Navigator
-view, highlight the application-client.xml file, right-click, and select <uicontrol>Validate
-XML file</uicontrol>.</li>
-<li>If both 1) and 2) are okay, close the project, reopen the project, and
-rebuild the project. The project metadata will refresh.</li>
-</ol> </entry>
-</row>
-<row outputclass="id_EARValidator">
-<entry nameend="col3" namest="col1"><uicontrol>EAR validator</uicontrol></entry>
-</row>
-<row outputclass="id_CHKJ1001">
-<entry colname="col1">CHKJ1001</entry>
-<entry colname="col2">The EAR project {0} is invalid.</entry>
-<entry colname="col3">The application.xml file cannot be loaded. The project
-metadata cannot be initialized from the application.xml file. <ol>
-<li>Ensure the following: <ul>
-<li>that the META-INF folder exists in the EAR project</li>
-<li>that META-INF contains <codeph>application.xml</codeph></li>
-<li>that META-INF is in the project's classpath.</li>
-</ul> </li>
-<li>Validate the syntax of the application.xml file: in the Navigator view,
-highlight the application.xml file, right-click, and select <uicontrol>Validate
-XML file</uicontrol>.</li>
-<li>If both 1) and 2) are okay, close the project, reopen the project, and
-rebuild the project. The project metadata will refresh.</li>
-</ol></entry>
-</row>
-<row outputclass="id_EJBValidator">
-<entry nameend="col3" namest="col1"><uicontrol>EJB validator</uicontrol></entry>
-</row>
-<row outputclass="id_CHKJ2019">
-<entry>CHKJ2019</entry>
-<entry>The {0} key class must be serializable at runtime. </entry>
-<entry morerows="2">The EJB is compliant with the EJB specification. This
-message is a warning that problems may occur. The warning appears when a type
-needs to be serializable at runtime and when serializability cannot be verified
-at compile-time. A type is serializable if, at runtime, it is a primitive
-type, a primitive array, a remote object, or if it implements java.io.Serializable.
-This message flags java.lang.Object and it cannot be disabled. You can either
-make the object serializable at compile-time or ignore the warning. </entry>
-</row>
-<row outputclass="id_CHKJ2412">
-<entry>CHKJ2412</entry>
-<entry>The return type must be serializable at runtime. </entry>
-</row>
-<row outputclass="id_CHKJ2413">
-<entry>CHKJ2413</entry>
-<entry>Argument {1} of {0} must be serializable at runtime.</entry>
-</row>
-<row outputclass="id_CHKJ2102">
-<entry>CHKJ2102</entry>
-<entry>Either a finder descriptor, or a matching custom finder method on the
-{0} class, must be defined.</entry>
-<entry>A finder descriptor must exist for every finder method. </entry>
-</row>
-<row outputclass="id_CHKJ2873">
-<entry>CHKJ2873</entry>
-<entry>Migrate this bean's datasource binding to a CMP Connection Factory
-binding.</entry>
-<entry></entry>
-</row>
-<row outputclass="id_CHKJ2874">
-<entry>CHKJ2874</entry>
-<entry>Migrate this EJB module's default datasource binding to a default CMP
-Connection Factory binding.</entry>
-<entry></entry>
-</row>
-<row outputclass="id_CHKJ2875E">
-<entry colname="col1">CHKJ2875E </entry>
-<entry colname="col2"><ejb-client-jar> {0} must exist in every EAR file
-that contains this EJB module.</entry>
-<entry colname="col3">If <codeph><ejb-client-jar></codeph> is specified
-in <filepath>ejb-jar.xml</filepath>, a corresponding EJB client project must
-contain the home and remote interfaces and any other types that a client will
-need. If these types are all contained in a single EJB project, delete the <codeph><ejb-client-jar></codeph> line
-in the deployment descriptor. Otherwise, ensure that the EJB client project
-exists, is open, and is a project utility JAR in every EAR that uses this
-EJB project as a module.</entry>
-</row>
-<row outputclass="id_CHKJ2905">
-<entry>CHKJ2905</entry>
-<entry>The EJB validator did not run because ejb-jar.xml could not be loaded.
-Run the XML validator for more information.</entry>
-<entry>CHKJ2905 means that the project's metadata could not be initialized
-from ejb-jar.xml. <ol>
-<li>Ensure the following: <ul>
-<li>that the META-INF folder exists in the EJB project</li>
-<li>that META-INF contains ejb-jar.xml</li>
-<li>that META-INF is in the project's classpath.</li>
-</ul> </li>
-<li>Validate the syntax of the ejb-jar.xml file: in the Navigator view, highlight
-the ejb-jar.xml file, right-click, and select <uicontrol>Validate XML file</uicontrol>.</li>
-<li>If both 1) and 2) are okay, close the project, reopen the project, and
-rebuild the project. The project metadata will refresh.</li>
-</ol></entry>
-</row>
-<row outputclass="id_JSPValidator">
-<entry nameend="col3" namest="col1"><uicontrol>JSP validator</uicontrol></entry>
-</row>
-<row outputclass="id_IWAW0482">
-<entry colname="col1">IWAW0482</entry>
-<entry colname="col2">No valid JspTranslator</entry>
-<entry colname="col3">There is a path problem with the project; the JSP Validator
-needs access to the WAS runtime code. If IWAW0482E appears on all web projects,
-check the Variable or JRE path: <ol>
-<li>Check the global preferences (<uicontrol>Window > Preferences > Java >Installed
-JREs</uicontrol>) and make sure that the location for the JRE is pointing
-to a valid JRE directory. </li>
-<li>Ensure that the classpath variables (<uicontrol>Window > Preferences >
-Java > Classpath Variables</uicontrol>) are set correctly.</li>
-</ol> </entry>
-</row>
-<row outputclass="id_WARValidator">
-<entry nameend="col3" namest="col1"><uicontrol>WAR validator</uicontrol></entry>
-</row>
-<row outputclass="id_CHKJ3008">
-<entry colname="col1">CHKJ3008</entry>
-<entry colname="col2">Missing or invalid WAR file.</entry>
-<entry colname="col3">The web.xml file cannot be loaded. The project metadata
-cannot be initialized from the web.xml file. <ol>
-<li>Ensure the following: <ul>
-<li>that the WEB-INF folder exists in the web project</li>
-<li>that WEB-INF contains the web.xml file</li>
-<li>that WEB-INF is in the project's classpath.</li>
-</ul> </li>
-<li>Validate the syntax of the web.xml file: in the Navigator view, highlight
-the web.xml file, right-click, and select <uicontrol>Validate XML file</uicontrol>.</li>
-<li>If both 1) and 2) are okay, close the project, reopen the project, and
-rebuild the project. The project metadata will refresh.</li>
-</ol></entry>
-</row>
-<row outputclass="id_XMLValidator">
-<entry nameend="col3" namest="col1"><uicontrol>XML validator</uicontrol></entry>
-</row>
-<row>
-<entry> </entry>
-<entry>The content of element type "ejb-jar" is incomplete, it must match
-"(description?,display-name?,small-icon?,large-icon?,enterprise-beans,assembly-descriptor?,ejb-client-jar?)".</entry>
-<entry>The EJB 1.1 and 2.0 specifications mandate that at least one enterprise
-bean must exist in an EJB .jar file. This error message is normal during development
-of EJB .jar files and can be ignored until you perform a production action,
-such as exporting or deploying code. Define at least one enterprise bean in
-the project.</entry>
-</row>
-</tbody>
-</tgroup>
-</table>
-<example outputclass="anchor_topicbottom"></example>
-</refbody>
-</reference>
-<?Pub *0000008883?>
diff --git a/docs/org.eclipse.jst.j2ee.doc.user/topics/rvalerr.html b/docs/org.eclipse.jst.j2ee.doc.user/topics/rvalerr.html
deleted file mode 100644
index 179e734..0000000
--- a/docs/org.eclipse.jst.j2ee.doc.user/topics/rvalerr.html
+++ /dev/null
@@ -1,326 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?><!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.0 Transitional//EN" "http://www.w3.org/TR/xhtml1/DTD/xhtml1-transitional.dtd">
-<html lang="en-us" xml:lang="en-us">
-<head>
-<meta content="text/html; charset=utf-8" http-equiv="Content-Type" />
-<meta name="copyright" content="Copyright (c) 2000, 2009 IBM Corporation and others. All rights reserved. This program and the accompanying materials are made available under the terms of the Eclipse Public License v1.0 which accompanies this distribution, and is available at http://www.eclipse.org/legal/epl-v10.html. Contributors: IBM Corporation - initial API and implementation" />
-<meta name="DC.rights.owner" content="(C) Copyright 2000, 2009" />
-<meta content="public" name="security" />
-<meta content="index,follow" name="Robots" />
-<meta http-equiv="PICS-Label" content='(PICS-1.1 "http://www.icra.org/ratingsv02.html" l gen true r (cz 1 lz 1 nz 1 oz 1 vz 1) "http://www.rsac.org/ratingsv01.html" l gen true r (n 0 s 0 v 0 l 0) "http://www.classify.org/safesurf/" l gen true r (SS~~000 1))' />
-<meta content="reference" name="DC.Type" />
-<meta name="DC.Title" content="Common validation errors and solutions" />
-<meta name="abstract" content="This table lists the common error messages you may encounter when you validate your projects." />
-<meta name="description" content="This table lists the common error messages you may encounter when you validate your projects." />
-<meta content="code validation, error solutions, validation" name="DC.subject" />
-<meta content="code validation, error solutions, validation" name="keywords" />
-<meta scheme="URI" name="DC.Relation" content="../topics/rvalidators.html" />
-<meta scheme="URI" name="DC.Relation" content="../topics/tjval.html" />
-<meta content="XHTML" name="DC.Format" />
-<meta content="rvalerr" name="DC.Identifier" />
-<meta content="en-us" name="DC.Language" />
-<link href="../../org.eclipse.wst.doc.user/common.css" type="text/css" rel="stylesheet" />
-<title>Common validation errors and solutions</title>
-</head>
-<body id="rvalerr"><a name="rvalerr"><!-- --></a>
-
-
-<h1 class="id_title">Common validation errors and solutions</h1>
-
-
-
-<div class="id_refbody"><p class="id_shortdesc">This table lists the common error messages
-you may encounter when you validate your projects.</p>
-
-<div class="anchor_topictop" />
-
-
-<div class="tablenoborder"><table summary="" cellspacing="0" cellpadding="4" frame="border" border="1" rules="all">
-
-<thead align="left">
-<tr class="id_tableHeadRow">
-<th valign="top" width="20.27027027027027%" id="N10078">Message prefix</th>
-
-<th valign="top" width="24.324324324324326%" id="N1007F">Message</th>
-
-<th valign="top" width="55.4054054054054%" id="N10086">Explanation</th>
-
-</tr>
-
-</thead>
-
-<tbody>
-<tr class="id_appclientValidator">
-<td colspan="3" valign="top" headers="N10078 N1007F N10086 "><span class="uicontrol">Application Client validator</span></td>
-
-</tr>
-
-<tr class="id_CHKJ1000">
-<td valign="top" width="20.27027027027027%" headers="N10078 ">CHKJ1000</td>
-
-<td valign="top" width="24.324324324324326%" headers="N1007F ">Validation failed because the application client file
-is not valid. Ensure that the deployment descriptor is valid.</td>
-
-<td valign="top" width="55.4054054054054%" headers="N10086 ">The application-client.xml file cannot be loaded. The
-project metadata cannot be initialized from the application-client.xml file.
- <ol>
-<li>Ensure the following: <ul>
-<li>that the META-INF folder exists in the application client project</li>
-
-<li>that META-INF contains the application-client.xml file</li>
-
-<li>that META-INF is in the project's classpath.</li>
-
-</ul>
- </li>
-
-<li>Validate the syntax of the application-client.xml file: in the Navigator
-view, highlight the application-client.xml file, right-click, and select <span class="uicontrol">Validate
-XML file</span>.</li>
-
-<li>If both 1) and 2) are okay, close the project, reopen the project, and
-rebuild the project. The project metadata will refresh.</li>
-
-</ol>
- </td>
-
-</tr>
-
-<tr class="id_EARValidator">
-<td colspan="3" valign="top" headers="N10078 N1007F N10086 "><span class="uicontrol">EAR validator</span></td>
-
-</tr>
-
-<tr class="id_CHKJ1001">
-<td valign="top" width="20.27027027027027%" headers="N10078 ">CHKJ1001</td>
-
-<td valign="top" width="24.324324324324326%" headers="N1007F ">The EAR project {0} is invalid.</td>
-
-<td valign="top" width="55.4054054054054%" headers="N10086 ">The application.xml file cannot be loaded. The project
-metadata cannot be initialized from the application.xml file. <ol>
-<li>Ensure the following: <ul>
-<li>that the META-INF folder exists in the EAR project</li>
-
-<li>that META-INF contains <samp class="codeph">application.xml</samp></li>
-
-<li>that META-INF is in the project's classpath.</li>
-
-</ul>
- </li>
-
-<li>Validate the syntax of the application.xml file: in the Navigator view,
-highlight the application.xml file, right-click, and select <span class="uicontrol">Validate
-XML file</span>.</li>
-
-<li>If both 1) and 2) are okay, close the project, reopen the project, and
-rebuild the project. The project metadata will refresh.</li>
-
-</ol>
-</td>
-
-</tr>
-
-<tr class="id_EJBValidator">
-<td colspan="3" valign="top" headers="N10078 N1007F N10086 "><span class="uicontrol">EJB validator</span></td>
-
-</tr>
-
-<tr class="id_CHKJ2019">
-<td valign="top" width="20.27027027027027%" headers="N10078 ">CHKJ2019</td>
-
-<td valign="top" width="24.324324324324326%" headers="N1007F ">The {0} key class must be serializable at runtime. </td>
-
-<td rowspan="3" valign="top" width="55.4054054054054%" headers="N10086 ">The EJB is compliant with the EJB specification. This
-message is a warning that problems may occur. The warning appears when a type
-needs to be serializable at runtime and when serializability cannot be verified
-at compile-time. A type is serializable if, at runtime, it is a primitive
-type, a primitive array, a remote object, or if it implements java.io.Serializable.
-This message flags java.lang.Object and it cannot be disabled. You can either
-make the object serializable at compile-time or ignore the warning. </td>
-
-</tr>
-
-<tr class="id_CHKJ2412">
-<td valign="top" width="20.27027027027027%" headers="N10078 ">CHKJ2412</td>
-
-<td valign="top" width="24.324324324324326%" headers="N1007F ">The return type must be serializable at runtime. </td>
-
-</tr>
-
-<tr class="id_CHKJ2413">
-<td valign="top" width="20.27027027027027%" headers="N10078 ">CHKJ2413</td>
-
-<td valign="top" width="24.324324324324326%" headers="N1007F ">Argument {1} of {0} must be serializable at runtime.</td>
-
-</tr>
-
-<tr class="id_CHKJ2102">
-<td valign="top" width="20.27027027027027%" headers="N10078 ">CHKJ2102</td>
-
-<td valign="top" width="24.324324324324326%" headers="N1007F ">Either a finder descriptor, or a matching custom finder method on the
-{0} class, must be defined.</td>
-
-<td valign="top" width="55.4054054054054%" headers="N10086 ">A finder descriptor must exist for every finder method. </td>
-
-</tr>
-
-<tr class="id_CHKJ2873">
-<td valign="top" width="20.27027027027027%" headers="N10078 ">CHKJ2873</td>
-
-<td valign="top" width="24.324324324324326%" headers="N1007F ">Migrate this bean's datasource binding to a CMP Connection Factory
-binding.</td>
-
-<td valign="top" width="55.4054054054054%" headers="N10086 "> </td>
-
-</tr>
-
-<tr class="id_CHKJ2874">
-<td valign="top" width="20.27027027027027%" headers="N10078 ">CHKJ2874</td>
-
-<td valign="top" width="24.324324324324326%" headers="N1007F ">Migrate this EJB module's default datasource binding to a default CMP
-Connection Factory binding.</td>
-
-<td valign="top" width="55.4054054054054%" headers="N10086 "> </td>
-
-</tr>
-
-<tr class="id_CHKJ2875E">
-<td valign="top" width="20.27027027027027%" headers="N10078 ">CHKJ2875E </td>
-
-<td valign="top" width="24.324324324324326%" headers="N1007F "><ejb-client-jar> {0} must exist in every EAR file
-that contains this EJB module.</td>
-
-<td valign="top" width="55.4054054054054%" headers="N10086 ">If <samp class="codeph"><ejb-client-jar></samp> is specified
-in <span class="filepath">ejb-jar.xml</span>, a corresponding EJB client project must
-contain the home and remote interfaces and any other types that a client will
-need. If these types are all contained in a single EJB project, delete the <samp class="codeph"><ejb-client-jar></samp> line
-in the deployment descriptor. Otherwise, ensure that the EJB client project
-exists, is open, and is a project utility JAR in every EAR that uses this
-EJB project as a module.</td>
-
-</tr>
-
-<tr class="id_CHKJ2905">
-<td valign="top" width="20.27027027027027%" headers="N10078 ">CHKJ2905</td>
-
-<td valign="top" width="24.324324324324326%" headers="N1007F ">The EJB validator did not run because ejb-jar.xml could not be loaded.
-Run the XML validator for more information.</td>
-
-<td valign="top" width="55.4054054054054%" headers="N10086 ">CHKJ2905 means that the project's metadata could not be initialized
-from ejb-jar.xml. <ol>
-<li>Ensure the following: <ul>
-<li>that the META-INF folder exists in the EJB project</li>
-
-<li>that META-INF contains ejb-jar.xml</li>
-
-<li>that META-INF is in the project's classpath.</li>
-
-</ul>
- </li>
-
-<li>Validate the syntax of the ejb-jar.xml file: in the Navigator view, highlight
-the ejb-jar.xml file, right-click, and select <span class="uicontrol">Validate XML file</span>.</li>
-
-<li>If both 1) and 2) are okay, close the project, reopen the project, and
-rebuild the project. The project metadata will refresh.</li>
-
-</ol>
-</td>
-
-</tr>
-
-<tr class="id_JSPValidator">
-<td colspan="3" valign="top" headers="N10078 N1007F N10086 "><span class="uicontrol">JSP validator</span></td>
-
-</tr>
-
-<tr class="id_IWAW0482">
-<td valign="top" width="20.27027027027027%" headers="N10078 ">IWAW0482</td>
-
-<td valign="top" width="24.324324324324326%" headers="N1007F ">No valid JspTranslator</td>
-
-<td valign="top" width="55.4054054054054%" headers="N10086 ">There is a path problem with the project; the JSP Validator
-needs access to the WAS runtime code. If IWAW0482E appears on all web projects,
-check the Variable or JRE path: <ol>
-<li>Check the global preferences (<span class="uicontrol">Window > Preferences > Java >Installed
-JREs</span>) and make sure that the location for the JRE is pointing
-to a valid JRE directory. </li>
-
-<li>Ensure that the classpath variables (<span class="uicontrol">Window > Preferences >
-Java > Classpath Variables</span>) are set correctly.</li>
-
-</ol>
- </td>
-
-</tr>
-
-<tr class="id_WARValidator">
-<td colspan="3" valign="top" headers="N10078 N1007F N10086 "><span class="uicontrol">WAR validator</span></td>
-
-</tr>
-
-<tr class="id_CHKJ3008">
-<td valign="top" width="20.27027027027027%" headers="N10078 ">CHKJ3008</td>
-
-<td valign="top" width="24.324324324324326%" headers="N1007F ">Missing or invalid WAR file.</td>
-
-<td valign="top" width="55.4054054054054%" headers="N10086 ">The web.xml file cannot be loaded. The project metadata
-cannot be initialized from the web.xml file. <ol>
-<li>Ensure the following: <ul>
-<li>that the WEB-INF folder exists in the web project</li>
-
-<li>that WEB-INF contains the web.xml file</li>
-
-<li>that WEB-INF is in the project's classpath.</li>
-
-</ul>
- </li>
-
-<li>Validate the syntax of the web.xml file: in the Navigator view, highlight
-the web.xml file, right-click, and select <span class="uicontrol">Validate XML file</span>.</li>
-
-<li>If both 1) and 2) are okay, close the project, reopen the project, and
-rebuild the project. The project metadata will refresh.</li>
-
-</ol>
-</td>
-
-</tr>
-
-<tr class="id_XMLValidator">
-<td colspan="3" valign="top" headers="N10078 N1007F N10086 "><span class="uicontrol">XML validator</span></td>
-
-</tr>
-
-<tr>
-<td valign="top" width="20.27027027027027%" headers="N10078 "> </td>
-
-<td valign="top" width="24.324324324324326%" headers="N1007F ">The content of element type "ejb-jar" is incomplete, it must match
-"(description?,display-name?,small-icon?,large-icon?,enterprise-beans,assembly-descriptor?,ejb-client-jar?)".</td>
-
-<td valign="top" width="55.4054054054054%" headers="N10086 ">The EJB 1.1 and 2.0 specifications mandate that at least one enterprise
-bean must exist in an EJB .jar file. This error message is normal during development
-of EJB .jar files and can be ignored until you perform a production action,
-such as exporting or deploying code. Define at least one enterprise bean in
-the project.</td>
-
-</tr>
-
-</tbody>
-
-</table>
-</div>
-
-<div class="anchor_topicbottom" />
-
-</div>
-
-<div><div class="reltasks"><strong>Related tasks</strong><br />
-<div><a href="../topics/tjval.html" title="The workbench includes validators that check certain files in your enterprise application module projects for errors.">Validating code in enterprise applications</a></div>
-</div>
-<div class="relref"><strong>Related reference</strong><br />
-<div><a href="../topics/rvalidators.html" title="This table lists the validators that are available for the different project types and gives a brief description of each validator.">J2EE Validators</a></div>
-</div>
-</div>
-
-</body>
-</html>
\ No newline at end of file
diff --git a/docs/org.eclipse.jst.j2ee.doc.user/topics/rvalidators.dita b/docs/org.eclipse.jst.j2ee.doc.user/topics/rvalidators.dita
deleted file mode 100644
index 51bdd7f..0000000
--- a/docs/org.eclipse.jst.j2ee.doc.user/topics/rvalidators.dita
+++ /dev/null
@@ -1,150 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<!--Arbortext, Inc., 1988-2006, v.4002-->
-<!DOCTYPE reference PUBLIC "-//OASIS//DTD DITA Reference//EN"
- "reference.dtd">
-<reference id="rvalidators" xml:lang="en-us">
-<title outputclass="id_title">J2EE Validators</title>
-<shortdesc outputclass="id_shortdesc">This table lists the validators that
-are available for the different project types and gives a brief description
-of each validator.</shortdesc>
-<prolog><metadata>
-<keywords><indexterm>validation<indexterm>J2EE validators</indexterm></indexterm>
-<indexterm>code validation<indexterm>J2EE validators</indexterm></indexterm>
-</keywords>
-</metadata></prolog>
-<refbody outputclass="id_refbody">
-<example outputclass="anchor_topictop"></example>
-<table frame="all">
-<tgroup cols="2" colsep="1" rowsep="1"><colspec colname="col1" colwidth="50*"/>
-<colspec colname="col2" colwidth="50*"/>
-<thead>
-<row outputclass="id_toprow">
-<entry>Validator name</entry>
-<entry>Description</entry>
-</row>
-</thead>
-<tbody>
-<row outputclass="id_appclientValidator">
-<entry align="left" valign="top">Application Client Validator</entry>
-<entry align="left" valign="top">The Application Client Validator validates
-the following Application Client project resources: <ul>
-<li>Deployment descriptor (application-client.xml)</li>
-<li>EJB references</li>
-<li>Resource references</li>
-</ul></entry>
-</row>
-<row outputclass="id_connectorValidator">
-<entry colname="col1">Connector Validator</entry>
-<entry colname="col2">The Connector validator checks for invalid J2EE specification
-levels in connector projects.</entry>
-</row>
-<row outputclass="id_DTDValidator">
-<entry align="left" valign="top">DTD Validator</entry>
-<entry align="left" valign="top">The DTD validator determines whether the
-current state of a DTD is semantically valid. XML files are validated according
-to the XML specification <xref format="html" href="http://www.w3.org/TR/2000/REC-xml-20001006"
-scope="external"> Extensible Markup Language (XML) 1.0<desc></desc></xref> from
-the W3C Web site. As well, the DTD validator checks for errors such as references
-to entities and elements that do not exist.</entry>
-</row>
-<row outputclass="id_EARValidator">
-<entry align="left" valign="top">EAR Validator</entry>
-<entry align="left" valign="top">The EAR Validator validates the following:
- <ul>
-<li>EAR deployment descriptor (application.xml)</li>
-<li>EJB references of all module projects in the enterprise application project</li>
-<li>Security roles</li>
-<li>Resource references</li>
-<li>Manifest files for all contained or referenced modules and utility JAR
-files</li>
-<li>Target server consistency between the enterprise application project and
-any utility and module projects</li>
-<li>Existence of projects for each module defined in enterprise application</li>
-</ul> <p>Note that the EAR Validator only ensures the validity and dependency
-of the module projects with respect to the enterprise application project.</p></entry>
-</row>
-<row outputclass="id_EJBValidator">
-<entry align="left" valign="top">EJB Validator</entry>
-<entry align="left" valign="top">The EJB Validator verifies that enterprise
-beans contained in an EJB project comply with the Sun Enterprise <tm tmclass="special"
-tmowner="Sun Microsystems, Inc." tmtype="tm" trademark="JavaBeans">JavaBeans</tm> Specifications
-(1.1, 2.0, and 2.1), depending on the level of the bean. Code validation for
-the EJB 1.0 specification is not supported. Specifically, the EJB Validator
-validates the following resources: <ul>
-<li><tm tmclass="special" tmowner="Sun Microsystems, Inc." tmtype="tm" trademark="Java">Java</tm> .class
-files that are members of an enterprise bean (home interface, remote interface,
-enterprise bean class, and, if the bean is an entity bean, the key class)</li>
-<li>ejb-jar.xml</li>
-</ul></entry>
-</row>
-<row outputclass="id_ELValidator">
-<entry colname="col1">EL Syntax Validator</entry>
-<entry colname="col2"></entry>
-</row>
-<row outputclass="id_HTMLValidator">
-<entry align="left" valign="top">HTML Syntax Validator</entry>
-<entry align="left" valign="top">The HTML Syntax Validator validates HTML
-basic syntax and HTML DTD compliance in the following Web project resources:
- <ul>
-<li>HTML files</li>
-<li>JSP files</li>
-</ul></entry>
-</row>
-<row outputclass="id_JSPValidator">
-<entry align="left" valign="top">JSP Syntax Validator</entry>
-<entry align="left" valign="top">The JSP Syntax Validator validates JSP files
-in a project by translating them into the corresponding <tm tmclass="special"
-tmowner="Sun Microsystems, Inc." tmtype="tm" trademark="Java">Java</tm> code
-and then checking the <tm tmclass="special" tmowner="Sun Microsystems, Inc."
-tmtype="tm" trademark="Java">Java</tm> code for compile errors.</entry>
-</row>
-<row outputclass="id_WARValidator">
-<entry align="left" valign="top">War Validator</entry>
-<entry align="left" valign="top">The War Validator validates the following
-web project resources: <ul>
-<li>Deployment descriptor (web.xml)</li>
-<li>Servlets</li>
-<li>Security roles</li>
-<li>Servlet & servlet mappings</li>
-<li>EJB references</li>
-</ul></entry>
-</row>
-<row outputclass="id_WSDLValidator">
-<entry colname="col1">WSDL Validator</entry>
-<entry colname="col2">The WSDL validator checks the following in WSDL files: <ul>
-<li>XML syntax</li>
-<li>XML Schema types in the <types> section</li>
-<li>Referential integrity of the various constructs in WSDL </li>
-</ul>The validator also includes an extension point to allow other validators
-to be plugged into the WSDL validation to provide additional verification
-of the WSDL file. Through this mechanism, interoperability is checked by validating
-a WSDL file against WS-I Profiles. </entry>
-</row>
-<row outputclass="id_WSIValidator">
-<entry colname="col1">WS-I Message Validator</entry>
-<entry colname="col2">WS-I Message validator checks SOAP messages against
-WS-I Profiles. A user can capture and verify SOAP messages using the TCP/IP
-Monitor. The validator checks a message log that is saved as a project resource
-(.wsimsg). The log conforms to a format as specified by WS-I.</entry>
-</row>
-<row outputclass="id_XMLSchemaValidator">
-<entry align="left" valign="top">XML Schema Validator</entry>
-<entry align="left" valign="top">The XML schema validator determines whether
-the current state of an XML schema file is semantically valid. XML schemas
-are validated according to the XML Schema specification <xref format="html"
-href="http://www.w3.org/TR/xmlschema-1/" scope="local"> XML Schema Part 1:
-Structures<desc></desc></xref> from the W3C Web site.</entry>
-</row>
-<row outputclass="id_XMLValidator">
-<entry align="left" valign="top">XML Validator</entry>
-<entry align="left" valign="top">The XML validator ensures that an XML file
-is well-formed. It also verifies if an XML file is valid - that is, it follows
-the constraints established in the DTD or XML schema the XML file is associated
-with.</entry>
-</row>
-</tbody>
-</tgroup>
-</table>
-<example outputclass="anchor_topicbottom"></example>
-</refbody>
-</reference>
diff --git a/docs/org.eclipse.jst.j2ee.doc.user/topics/rvalidators.html b/docs/org.eclipse.jst.j2ee.doc.user/topics/rvalidators.html
deleted file mode 100644
index 67c41ef..0000000
--- a/docs/org.eclipse.jst.j2ee.doc.user/topics/rvalidators.html
+++ /dev/null
@@ -1,249 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?><!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.0 Transitional//EN" "http://www.w3.org/TR/xhtml1/DTD/xhtml1-transitional.dtd">
-<html lang="en-us" xml:lang="en-us">
-<head>
-<meta content="text/html; charset=utf-8" http-equiv="Content-Type" />
-<meta name="copyright" content="Copyright (c) 2000, 2009 IBM Corporation and others. All rights reserved. This program and the accompanying materials are made available under the terms of the Eclipse Public License v1.0 which accompanies this distribution, and is available at http://www.eclipse.org/legal/epl-v10.html. Contributors: IBM Corporation - initial API and implementation" />
-<meta name="DC.rights.owner" content="(C) Copyright 2000, 2009" />
-<meta content="public" name="security" />
-<meta content="index,follow" name="Robots" />
-<meta http-equiv="PICS-Label" content='(PICS-1.1 "http://www.icra.org/ratingsv02.html" l gen true r (cz 1 lz 1 nz 1 oz 1 vz 1) "http://www.rsac.org/ratingsv01.html" l gen true r (n 0 s 0 v 0 l 0) "http://www.classify.org/safesurf/" l gen true r (SS~~000 1))' />
-<meta content="reference" name="DC.Type" />
-<meta name="DC.Title" content="J2EE Validators" />
-<meta name="abstract" content="This table lists the validators that are available for the different project types and gives a brief description of each validator." />
-<meta name="description" content="This table lists the validators that are available for the different project types and gives a brief description of each validator." />
-<meta content="validation, J2EE validators, code validation" name="DC.subject" />
-<meta content="validation, J2EE validators, code validation" name="keywords" />
-<meta scheme="URI" name="DC.Relation" content="../topics/rvalerr.html" />
-<meta scheme="URI" name="DC.Relation" content="../topics/tjval.html" />
-<meta content="XHTML" name="DC.Format" />
-<meta content="rvalidators" name="DC.Identifier" />
-<meta content="en-us" name="DC.Language" />
-<link href="../../org.eclipse.wst.doc.user/common.css" type="text/css" rel="stylesheet" />
-<title>J2EE Validators</title>
-</head>
-<body id="rvalidators"><a name="rvalidators"><!-- --></a>
-
-
-<h1 class="id_title">J2EE Validators</h1>
-
-
-
-<div class="id_refbody"><p class="id_shortdesc">This table lists the validators that
-are available for the different project types and gives a brief description
-of each validator.</p>
-
-<div class="anchor_topictop" />
-
-
-<div class="tablenoborder"><table summary="" cellspacing="0" cellpadding="4" frame="border" border="1" rules="all">
-
-<thead align="left">
-<tr class="id_toprow">
-<th valign="top" width="50%" id="N10073">Validator name</th>
-
-<th valign="top" width="50%" id="N1007A">Description</th>
-
-</tr>
-
-</thead>
-
-<tbody>
-<tr class="id_appclientValidator">
-<td align="left" valign="top" width="50%" headers="N10073 ">Application Client Validator</td>
-
-<td align="left" valign="top" width="50%" headers="N1007A ">The Application Client Validator validates
-the following Application Client project resources: <ul>
-<li>Deployment descriptor (application-client.xml)</li>
-
-<li>EJB references</li>
-
-<li>Resource references</li>
-
-</ul>
-</td>
-
-</tr>
-
-<tr class="id_connectorValidator">
-<td valign="top" width="50%" headers="N10073 ">Connector Validator</td>
-
-<td valign="top" width="50%" headers="N1007A ">The Connector validator checks for invalid J2EE specification
-levels in connector projects.</td>
-
-</tr>
-
-<tr class="id_DTDValidator">
-<td align="left" valign="top" width="50%" headers="N10073 ">DTD Validator</td>
-
-<td align="left" valign="top" width="50%" headers="N1007A ">The DTD validator determines whether the
-current state of a DTD is semantically valid. XML files are validated according
-to the XML specification <a href="http://www.w3.org/TR/2000/REC-xml-20001006" target="_blank" title="">Extensible Markup Language (XML) 1.0</a> from
-the W3C Web site. As well, the DTD validator checks for errors such as references
-to entities and elements that do not exist.</td>
-
-</tr>
-
-<tr class="id_EARValidator">
-<td align="left" valign="top" width="50%" headers="N10073 ">EAR Validator</td>
-
-<td align="left" valign="top" width="50%" headers="N1007A ">The EAR Validator validates the following:
- <ul>
-<li>EAR deployment descriptor (application.xml)</li>
-
-<li>EJB references of all module projects in the enterprise application project</li>
-
-<li>Security roles</li>
-
-<li>Resource references</li>
-
-<li>Manifest files for all contained or referenced modules and utility JAR
-files</li>
-
-<li>Target server consistency between the enterprise application project and
-any utility and module projects</li>
-
-<li>Existence of projects for each module defined in enterprise application</li>
-
-</ul>
- <p>Note that the EAR Validator only ensures the validity and dependency
-of the module projects with respect to the enterprise application project.</p>
-</td>
-
-</tr>
-
-<tr class="id_EJBValidator">
-<td align="left" valign="top" width="50%" headers="N10073 ">EJB Validator</td>
-
-<td align="left" valign="top" width="50%" headers="N1007A ">The EJB Validator verifies that enterprise
-beans contained in an EJB project comply with the Sun Enterprise JavaBeans™ Specifications
-(1.1, 2.0, and 2.1), depending on the level of the bean. Code validation for
-the EJB 1.0 specification is not supported. Specifically, the EJB Validator
-validates the following resources: <ul>
-<li>Java™ .class
-files that are members of an enterprise bean (home interface, remote interface,
-enterprise bean class, and, if the bean is an entity bean, the key class)</li>
-
-<li>ejb-jar.xml</li>
-
-</ul>
-</td>
-
-</tr>
-
-<tr class="id_ELValidator">
-<td valign="top" width="50%" headers="N10073 ">EL Syntax Validator</td>
-
-<td valign="top" width="50%" headers="N1007A "> </td>
-
-</tr>
-
-<tr class="id_HTMLValidator">
-<td align="left" valign="top" width="50%" headers="N10073 ">HTML Syntax Validator</td>
-
-<td align="left" valign="top" width="50%" headers="N1007A ">The HTML Syntax Validator validates HTML
-basic syntax and HTML DTD compliance in the following Web project resources:
- <ul>
-<li>HTML files</li>
-
-<li>JSP files</li>
-
-</ul>
-</td>
-
-</tr>
-
-<tr class="id_JSPValidator">
-<td align="left" valign="top" width="50%" headers="N10073 ">JSP Syntax Validator</td>
-
-<td align="left" valign="top" width="50%" headers="N1007A ">The JSP Syntax Validator validates JSP files
-in a project by translating them into the corresponding Java code
-and then checking the Java code for compile errors.</td>
-
-</tr>
-
-<tr class="id_WARValidator">
-<td align="left" valign="top" width="50%" headers="N10073 ">War Validator</td>
-
-<td align="left" valign="top" width="50%" headers="N1007A ">The War Validator validates the following
-web project resources: <ul>
-<li>Deployment descriptor (web.xml)</li>
-
-<li>Servlets</li>
-
-<li>Security roles</li>
-
-<li>Servlet & servlet mappings</li>
-
-<li>EJB references</li>
-
-</ul>
-</td>
-
-</tr>
-
-<tr class="id_WSDLValidator">
-<td valign="top" width="50%" headers="N10073 ">WSDL Validator</td>
-
-<td valign="top" width="50%" headers="N1007A ">The WSDL validator checks the following in WSDL files: <ul>
-<li>XML syntax</li>
-
-<li>XML Schema types in the <types> section</li>
-
-<li>Referential integrity of the various constructs in WSDL </li>
-
-</ul>
-The validator also includes an extension point to allow other validators
-to be plugged into the WSDL validation to provide additional verification
-of the WSDL file. Through this mechanism, interoperability is checked by validating
-a WSDL file against WS-I Profiles. </td>
-
-</tr>
-
-<tr class="id_WSIValidator">
-<td valign="top" width="50%" headers="N10073 ">WS-I Message Validator</td>
-
-<td valign="top" width="50%" headers="N1007A ">WS-I Message validator checks SOAP messages against
-WS-I Profiles. A user can capture and verify SOAP messages using the TCP/IP
-Monitor. The validator checks a message log that is saved as a project resource
-(.wsimsg). The log conforms to a format as specified by WS-I.</td>
-
-</tr>
-
-<tr class="id_XMLSchemaValidator">
-<td align="left" valign="top" width="50%" headers="N10073 ">XML Schema Validator</td>
-
-<td align="left" valign="top" width="50%" headers="N1007A ">The XML schema validator determines whether
-the current state of an XML schema file is semantically valid. XML schemas
-are validated according to the XML Schema specification <a href="http://www.w3.org/TR/xmlschema-1/" title="">XML Schema Part 1: Structures</a> from the W3C Web site.</td>
-
-</tr>
-
-<tr class="id_XMLValidator">
-<td align="left" valign="top" width="50%" headers="N10073 ">XML Validator</td>
-
-<td align="left" valign="top" width="50%" headers="N1007A ">The XML validator ensures that an XML file
-is well-formed. It also verifies if an XML file is valid - that is, it follows
-the constraints established in the DTD or XML schema the XML file is associated
-with.</td>
-
-</tr>
-
-</tbody>
-
-</table>
-</div>
-
-<div class="anchor_topicbottom" />
-
-</div>
-
-<div><div class="reltasks"><strong>Related tasks</strong><br />
-<div><a href="../topics/tjval.html" title="The workbench includes validators that check certain files in your enterprise application module projects for errors.">Validating code in enterprise applications</a></div>
-</div>
-<div class="relref"><strong>Related reference</strong><br />
-<div><a href="../topics/rvalerr.html" title="This table lists the common error messages you may encounter when you validate your projects.">Common validation errors and solutions</a></div>
-</div>
-</div>
-
-</body>
-</html>
\ No newline at end of file
diff --git a/docs/org.eclipse.jst.j2ee.doc.user/topics/taddingfacet.dita b/docs/org.eclipse.jst.j2ee.doc.user/topics/taddingfacet.dita
deleted file mode 100644
index 41da49a..0000000
--- a/docs/org.eclipse.jst.j2ee.doc.user/topics/taddingfacet.dita
+++ /dev/null
@@ -1,55 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<!--Arbortext, Inc., 1988-2006, v.4002-->
-<!DOCTYPE task PUBLIC "-//OASIS//DTD DITA Task//EN"
- "task.dtd">
-<task id="taddingfacet" xml:lang="en-us">
-<title outputclass="id_title">Adding a facet to a Java EE project</title>
-<shortdesc outputclass="id_shortdesc">This topic explains how to add a facet
-to an existing project in your workspace.</shortdesc>
-<prolog><metadata>
-<keywords><indexterm>projects<indexterm>facets<indexterm>adding</indexterm></indexterm></indexterm>
-<indexterm>Java EE<indexterm>adding project facets</indexterm></indexterm>
-</keywords>
-</metadata></prolog>
-<taskbody outputclass="id_taskbody">
-<context outputclass="id_context"><p outputclass="anchor_topictop"></p><p
-conref="cfacets.dita#cfacets/aboutfacet"></p> <p>New projects generally have
-facets added to them when they are created. To add another facet to a project
-that already exists, complete the following steps:</p></context>
-<steps outputclass="id_steps">
-<step><cmd>In the Project Explorer view of the <tm tmclass="special" tmowner="Sun Microsystems, Inc."
-tmtype="tm" trademark="Java">Java</tm> EE perspective, right-click the project
-and then select <uicontrol>Properties</uicontrol>.</cmd></step>
-<step><cmd>Select the <uicontrol>Project Facets</uicontrol> page in the in
-the Properties window.</cmd><info>This page lists the facets in the project
-and their versions.</info></step>
-<step><cmd>Click <uicontrol>Modify Project</uicontrol> and select the check
-boxes next to the facets you want the project to have.</cmd><info><p>Only
-the facets that are valid for the project are listed:<ul>
-<li>The list of runtimes selected for the project limits the facets shown
-in the list. Only the facets compatible with all selected target runtimes
-are shown.</li>
-<li>The currently selected facets and their version numbers limit the other
-facets shown in the list. For example, if the project contains the Dynamic
-Web Module facet, the EJB Module facet is not listed because these two facets
-cannot be in the same project.</li>
-</ul>You can find out more about the requirements and limitations for each
-facet by right-clicking the facet name and then clicking <uicontrol>Show Constraints</uicontrol>.</p><p>You
-can also choose a preset combination of facets from the <uicontrol>Presets</uicontrol> list.</p></info>
-</step>
-<step><cmd>Choose a version number for the facet by clicking the current version
-number and selecting the version number you want from the drop-down list.</cmd>
-</step>
-<step importance="optional"><cmd>To remove a facet, clear its check box.</cmd>
-<info>Not all facets can be removed.</info></step>
-<step importance="optional"><cmd>If you want to limit the project so it will
-be compatible with one or more runtimes, click on the Runtimes tab and select
-the runtimes that you want the project to be compatible with.</cmd><info>For
-more information on runtimes, see <xref href="tjtargetserver.dita"></xref>.</info>
-</step>
-<step><cmd>Click <uicontrol>Finish</uicontrol> to exit the Modify Faceted
-Project dialog and then click <uicontrol>OK</uicontrol>.</cmd></step>
-</steps>
-<postreq outputclass="id_postreq"><p outputclass="anchor_topicbottom"></p></postreq>
-</taskbody>
-</task>
diff --git a/docs/org.eclipse.jst.j2ee.doc.user/topics/taddingfacet.html b/docs/org.eclipse.jst.j2ee.doc.user/topics/taddingfacet.html
deleted file mode 100644
index ce600b6..0000000
--- a/docs/org.eclipse.jst.j2ee.doc.user/topics/taddingfacet.html
+++ /dev/null
@@ -1,107 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?><!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.0 Transitional//EN" "http://www.w3.org/TR/xhtml1/DTD/xhtml1-transitional.dtd">
-<html lang="en-us" xml:lang="en-us">
-<head>
-<meta content="text/html; charset=utf-8" http-equiv="Content-Type" />
-<meta name="copyright" content="Copyright (c) 2000, 2009 IBM Corporation and others. All rights reserved. This program and the accompanying materials are made available under the terms of the Eclipse Public License v1.0 which accompanies this distribution, and is available at http://www.eclipse.org/legal/epl-v10.html. Contributors: IBM Corporation - initial API and implementation" />
-<meta name="DC.rights.owner" content="(C) Copyright 2000, 2009" />
-<meta content="public" name="security" />
-<meta content="index,follow" name="Robots" />
-<meta http-equiv="PICS-Label" content='(PICS-1.1 "http://www.icra.org/ratingsv02.html" l gen true r (cz 1 lz 1 nz 1 oz 1 vz 1) "http://www.rsac.org/ratingsv01.html" l gen true r (n 0 s 0 v 0 l 0) "http://www.classify.org/safesurf/" l gen true r (SS~~000 1))' />
-<meta content="task" name="DC.Type" />
-<meta name="DC.Title" content="Adding a facet to a Java EE project" />
-<meta name="abstract" content="This topic explains how to add a facet to an existing project in your workspace." />
-<meta name="description" content="This topic explains how to add a facet to an existing project in your workspace." />
-<meta content="projects, facets, adding, Java EE, adding project facets" name="DC.subject" />
-<meta content="projects, facets, adding, Java EE, adding project facets" name="keywords" />
-<meta scheme="URI" name="DC.Relation" content="../topics/tchangejavalevel.html" />
-<meta scheme="URI" name="DC.Relation" content="../topics/tchangefacet.html" />
-<meta scheme="URI" name="DC.Relation" content="../topics/cfacets.html" />
-<meta content="XHTML" name="DC.Format" />
-<meta content="taddingfacet" name="DC.Identifier" />
-<meta content="en-us" name="DC.Language" />
-<link href="../../org.eclipse.wst.doc.user/common.css" type="text/css" rel="stylesheet" />
-<title>Adding a facet to a Java EE project</title>
-</head>
-<body id="taddingfacet"><a name="taddingfacet"><!-- --></a>
-
-
-<h1 class="id_title">Adding a facet to a Java EE project</h1>
-
-
-
-<div class="id_taskbody"><p class="id_shortdesc">This topic explains how to add a facet
-to an existing project in your workspace.</p>
-
-<div class="id_context"><p class="anchor_topictop" />
-<p>When you add a facet to a project, that project is configured
-to perform a certain task, fulfill certain requirements, or have certain characteristics.
-For example, the EAR facet sets up a project to function as an enterprise
-application by adding a deployment descriptor and setting up the project's
-classpath.</p>
- <p>New projects generally have
-facets added to them when they are created. To add another facet to a project
-that already exists, complete the following steps:</p>
-</div>
-
-<ol class="id_steps">
-<li class="stepexpand"><span>In the Project Explorer view of the Java™ EE perspective, right-click the project
-and then select <span class="uicontrol">Properties</span>.</span></li>
-
-<li class="stepexpand"><span>Select the <span class="uicontrol">Project Facets</span> page in the in
-the Properties window.</span> This page lists the facets in the project
-and their versions.</li>
-
-<li class="stepexpand"><span>Click <span class="uicontrol">Modify Project</span> and select the check
-boxes next to the facets you want the project to have.</span> <div class="p">Only
-the facets that are valid for the project are listed:<ul>
-<li>The list of runtimes selected for the project limits the facets shown
-in the list. Only the facets compatible with all selected target runtimes
-are shown.</li>
-
-<li>The currently selected facets and their version numbers limit the other
-facets shown in the list. For example, if the project contains the Dynamic
-Web Module facet, the EJB Module facet is not listed because these two facets
-cannot be in the same project.</li>
-
-</ul>
-You can find out more about the requirements and limitations for each
-facet by right-clicking the facet name and then clicking <span class="uicontrol">Show Constraints</span>.</div>
-<p>You
-can also choose a preset combination of facets from the <span class="uicontrol">Presets</span> list.</p>
-
-</li>
-
-<li class="stepexpand"><span>Choose a version number for the facet by clicking the current version
-number and selecting the version number you want from the drop-down list.</span>
-</li>
-
-<li class="stepexpand"><strong>Optional: </strong><span>To remove a facet, clear its check box.</span>
- Not all facets can be removed.</li>
-
-<li class="stepexpand"><strong>Optional: </strong><span>If you want to limit the project so it will
-be compatible with one or more runtimes, click on the Runtimes tab and select
-the runtimes that you want the project to be compatible with.</span> For
-more information on runtimes, see <a href="tjtargetserver.html" title="When you develop J2EE applications, you can specify the server runtime environments for your J2EE projects. The target server is specified during project creation and import, and it can be changed in the project properties. The target server setting is the default mechanism for setting the class path for J2EE projects.">Specifying target servers for J2EE projects</a>.
-</li>
-
-<li class="stepexpand"><span>Click <span class="uicontrol">Finish</span> to exit the Modify Faceted
-Project dialog and then click <span class="uicontrol">OK</span>.</span></li>
-
-</ol>
-
-<div class="id_postreq"><p class="anchor_topicbottom" />
-</div>
-
-</div>
-
-<div><div class="relconcepts"><strong>Related concepts</strong><br />
-<div><a href="../topics/cfacets.html" title="Facets define characteristics and requirements for Java EE projects and are used as part of the runtime configuration.">Project facets</a></div>
-</div>
-<div class="reltasks"><strong>Related tasks</strong><br />
-<div><a href="../topics/tchangejavalevel.html" title="You can change the version of Java used in a Java EE project by changing the value of the Java facet.">Changing the Java compiler version for a Java EE project</a></div>
-<div><a href="../topics/tchangefacet.html" title="You can change the version of a facet in a Java EE project by editing the facets for the project.">Changing the version of a facet</a></div>
-</div>
-</div>
-
-</body>
-</html>
\ No newline at end of file
diff --git a/docs/org.eclipse.jst.j2ee.doc.user/topics/tchangefacet.dita b/docs/org.eclipse.jst.j2ee.doc.user/topics/tchangefacet.dita
deleted file mode 100644
index 212244d..0000000
--- a/docs/org.eclipse.jst.j2ee.doc.user/topics/tchangefacet.dita
+++ /dev/null
@@ -1,37 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<!--Arbortext, Inc., 1988-2006, v.4002-->
-<!DOCTYPE task PUBLIC "-//OASIS//DTD DITA Task//EN"
- "task.dtd">
-<task id="tchangefacet" xml:lang="en-us">
-<title outputclass="id_title">Changing the version of a facet</title>
-<shortdesc outputclass="id_shortdesc">You can change the version of a facet
-in a Java EE project by editing the facets for the project.</shortdesc>
-<prolog><metadata>
-<keywords><indexterm>facets<indexterm>changing versions</indexterm></indexterm>
-<indexterm>Java EE<indexterm>changing facet versions</indexterm></indexterm>
-<indexterm>projects<indexterm>changing facet versions</indexterm></indexterm>
-</keywords>
-</metadata></prolog>
-<taskbody outputclass="id_taskbody">
-<context outputclass="id_context"><p outputclass="anchor_topictop"></p> <p>Changing
-the <tm tmclass="special" tmowner="Sun Microsystems, Inc." tmtype="tm" trademark="Java">Java</tm> compiler
-version of a Java EE project involves changing the version of the <uicontrol>Java</uicontrol> facet.
-For more information, see <xref href="tchangejavalevel.dita"></xref>.</p><p>To
-change the version of a facet in your project, complete the following steps:</p></context>
-<steps outputclass="id_steps">
-<step><cmd>In the Project Explorer view of the <tm tmclass="special" tmowner="Sun Microsystems, Inc."
-tmtype="tm" trademark="Java">Java</tm> EE perspective, right-click the project
-and then select <uicontrol>Properties</uicontrol>.</cmd></step>
-<step><cmd>Select the <uicontrol>Project Facets</uicontrol> page in the in
-the Properties window.</cmd><info> This page lists the facets in the project
-and their versions.</info></step>
-<step><cmd>Click <uicontrol>Modify Project</uicontrol> and click the facet
-you want to change.</cmd></step>
-<step><cmd>Select the version of the facet from the drop-down box next to
-the facet's name.</cmd></step>
-<step><cmd>Click <uicontrol>Finish</uicontrol> to close the Modify Faceted
-Project window and then click <uicontrol>OK</uicontrol>.</cmd></step>
-</steps>
-<postreq outputclass="id_postreq"><p outputclass="anchor_topicbottom"></p></postreq>
-</taskbody>
-</task>
diff --git a/docs/org.eclipse.jst.j2ee.doc.user/topics/tchangefacet.html b/docs/org.eclipse.jst.j2ee.doc.user/topics/tchangefacet.html
deleted file mode 100644
index f3d5210..0000000
--- a/docs/org.eclipse.jst.j2ee.doc.user/topics/tchangefacet.html
+++ /dev/null
@@ -1,78 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?><!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.0 Transitional//EN" "http://www.w3.org/TR/xhtml1/DTD/xhtml1-transitional.dtd">
-<html lang="en-us" xml:lang="en-us">
-<head>
-<meta content="text/html; charset=utf-8" http-equiv="Content-Type" />
-<meta name="copyright" content="Copyright (c) 2000, 2009 IBM Corporation and others. All rights reserved. This program and the accompanying materials are made available under the terms of the Eclipse Public License v1.0 which accompanies this distribution, and is available at http://www.eclipse.org/legal/epl-v10.html. Contributors: IBM Corporation - initial API and implementation" />
-<meta name="DC.rights.owner" content="(C) Copyright 2000, 2009" />
-<meta content="public" name="security" />
-<meta content="index,follow" name="Robots" />
-<meta http-equiv="PICS-Label" content='(PICS-1.1 "http://www.icra.org/ratingsv02.html" l gen true r (cz 1 lz 1 nz 1 oz 1 vz 1) "http://www.rsac.org/ratingsv01.html" l gen true r (n 0 s 0 v 0 l 0) "http://www.classify.org/safesurf/" l gen true r (SS~~000 1))' />
-<meta content="task" name="DC.Type" />
-<meta name="DC.Title" content="Changing the version of a facet" />
-<meta name="abstract" content="You can change the version of a facet in a Java EE project by editing the facets for the project." />
-<meta name="description" content="You can change the version of a facet in a Java EE project by editing the facets for the project." />
-<meta content="facets, changing versions, Java EE, changing facet versions, projects" name="DC.subject" />
-<meta content="facets, changing versions, Java EE, changing facet versions, projects" name="keywords" />
-<meta scheme="URI" name="DC.Relation" content="../topics/taddingfacet.html" />
-<meta scheme="URI" name="DC.Relation" content="../topics/tchangejavalevel.html" />
-<meta scheme="URI" name="DC.Relation" content="../topics/cfacets.html" />
-<meta content="XHTML" name="DC.Format" />
-<meta content="tchangefacet" name="DC.Identifier" />
-<meta content="en-us" name="DC.Language" />
-<link href="../../org.eclipse.wst.doc.user/common.css" type="text/css" rel="stylesheet" />
-<title>Changing the version of a facet</title>
-</head>
-<body id="tchangefacet"><a name="tchangefacet"><!-- --></a>
-
-
-<h1 class="id_title">Changing the version of a facet</h1>
-
-
-
-<div class="id_taskbody"><p class="id_shortdesc">You can change the version of a facet
-in a Java EE project by editing the facets for the project.</p>
-
-<div class="id_context"><p class="anchor_topictop" />
- <p>Changing
-the Java™ compiler
-version of a Java EE project involves changing the version of the <span class="uicontrol">Java</span> facet.
-For more information, see <a href="tchangejavalevel.html" title="You can change the version of Java used in a Java EE project by changing the value of the Java facet.">Changing the Java compiler version for a Java EE project</a>.</p>
-<p>To
-change the version of a facet in your project, complete the following steps:</p>
-</div>
-
-<ol class="id_steps">
-<li class="stepexpand"><span>In the Project Explorer view of the Java EE perspective, right-click the project
-and then select <span class="uicontrol">Properties</span>.</span></li>
-
-<li class="stepexpand"><span>Select the <span class="uicontrol">Project Facets</span> page in the in
-the Properties window.</span> This page lists the facets in the project
-and their versions.</li>
-
-<li class="stepexpand"><span>Click <span class="uicontrol">Modify Project</span> and click the facet
-you want to change.</span></li>
-
-<li class="stepexpand"><span>Select the version of the facet from the drop-down box next to
-the facet's name.</span></li>
-
-<li class="stepexpand"><span>Click <span class="uicontrol">Finish</span> to close the Modify Faceted
-Project window and then click <span class="uicontrol">OK</span>.</span></li>
-
-</ol>
-
-<div class="id_postreq"><p class="anchor_topicbottom" />
-</div>
-
-</div>
-
-<div><div class="relconcepts"><strong>Related concepts</strong><br />
-<div><a href="../topics/cfacets.html" title="Facets define characteristics and requirements for Java EE projects and are used as part of the runtime configuration.">Project facets</a></div>
-</div>
-<div class="reltasks"><strong>Related tasks</strong><br />
-<div><a href="../topics/taddingfacet.html" title="This topic explains how to add a facet to an existing project in your workspace.">Adding a facet to a Java EE project</a></div>
-<div><a href="../topics/tchangejavalevel.html" title="You can change the version of Java used in a Java EE project by changing the value of the Java facet.">Changing the Java compiler version for a Java EE project</a></div>
-</div>
-</div>
-
-</body>
-</html>
\ No newline at end of file
diff --git a/docs/org.eclipse.jst.j2ee.doc.user/topics/tchangejavalevel.dita b/docs/org.eclipse.jst.j2ee.doc.user/topics/tchangejavalevel.dita
deleted file mode 100644
index f85e99e..0000000
--- a/docs/org.eclipse.jst.j2ee.doc.user/topics/tchangejavalevel.dita
+++ /dev/null
@@ -1,41 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<!--Arbortext, Inc., 1988-2006, v.4002-->
-<!DOCTYPE task PUBLIC "-//OASIS//DTD DITA Task//EN"
- "task.dtd">
-<task id="tchangejavalevel" xml:lang="en-us">
-<title outputclass="id_title">Changing the <tm tmclass="special" tmowner="Sun Microsystems, Inc."
-tmtype="tm" trademark="Java">Java</tm> compiler version for a Java EE project</title>
-<shortdesc outputclass="id_shortdesc">You can change the version of <tm tmclass="special"
-tmowner="Sun Microsystems, Inc." tmtype="tm" trademark="Java">Java</tm> used
-in a Java EE project by changing the value of the <uicontrol>Java</uicontrol> facet.</shortdesc>
-<prolog><metadata>
-<keywords><indexterm>Java EE<indexterm>project compiler level</indexterm></indexterm>
-<indexterm>projects<indexterm>Java compiler level</indexterm></indexterm>
-</keywords>
-</metadata></prolog>
-<taskbody outputclass="id_taskbody">
-<context outputclass="id_context"><p outputclass="anchor_topictop"></p> <p>The <uicontrol>Java</uicontrol> facet
-applies only to J2EE projects. To set the <tm tmclass="special" tmowner="Sun Microsystems, Inc."
-tmtype="tm" trademark="Java">Java</tm> compiler level of a non-Java EE project,
-such as a <tm tmclass="special" tmowner="Sun Microsystems, Inc." tmtype="tm"
-trademark="Java">Java</tm> project, see <xref format="html" href="../../org.eclipse.jdt.doc.user/reference/ref-properties-compiler.htm"
-scope="peer">Java Compiler</xref>.</p><p>To change the <tm tmclass="special"
-tmowner="Sun Microsystems, Inc." tmtype="tm" trademark="Java">Java</tm> compiler
-version, complete the following steps:</p></context>
-<steps outputclass="id_steps">
-<step><cmd>In the Project Explorer view of the <tm tmclass="special" tmowner="Sun Microsystems, Inc."
-tmtype="tm" trademark="Java">Java</tm> EE perspective, right-click the project
-and then select <uicontrol>Properties</uicontrol>.</cmd></step>
-<step><cmd>Select the <uicontrol>Project Facets</uicontrol> page in the in
-the Properties window.</cmd><info> This page lists the facets in the project
-and their versions.</info></step>
-<step><cmd>Click <uicontrol>Modify Project</uicontrol>.</cmd></step>
-<step><cmd>Double click the version number next to the<uicontrol>Java</uicontrol> facet
-to select a different level of <tm tmclass="special" tmowner="Sun Microsystems, Inc."
-tmtype="tm" trademark="Java">Java</tm> compiler.</cmd></step>
-<step><cmd>Click <uicontrol>Finish</uicontrol> to close the Modify Faceted
-Project window and then click <uicontrol>OK</uicontrol>.</cmd></step>
-</steps>
-<postreq outputclass="id_postreq"><p outputclass="anchor_topicbottom"></p></postreq>
-</taskbody>
-</task>
diff --git a/docs/org.eclipse.jst.j2ee.doc.user/topics/tchangejavalevel.html b/docs/org.eclipse.jst.j2ee.doc.user/topics/tchangejavalevel.html
deleted file mode 100644
index e82fa29..0000000
--- a/docs/org.eclipse.jst.j2ee.doc.user/topics/tchangejavalevel.html
+++ /dev/null
@@ -1,76 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?><!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.0 Transitional//EN" "http://www.w3.org/TR/xhtml1/DTD/xhtml1-transitional.dtd">
-<html lang="en-us" xml:lang="en-us">
-<head>
-<meta content="text/html; charset=utf-8" http-equiv="Content-Type" />
-<meta name="copyright" content="Copyright (c) 2000, 2009 IBM Corporation and others. All rights reserved. This program and the accompanying materials are made available under the terms of the Eclipse Public License v1.0 which accompanies this distribution, and is available at http://www.eclipse.org/legal/epl-v10.html. Contributors: IBM Corporation - initial API and implementation" />
-<meta name="DC.rights.owner" content="(C) Copyright 2000, 2009" />
-<meta content="public" name="security" />
-<meta content="index,follow" name="Robots" />
-<meta http-equiv="PICS-Label" content='(PICS-1.1 "http://www.icra.org/ratingsv02.html" l gen true r (cz 1 lz 1 nz 1 oz 1 vz 1) "http://www.rsac.org/ratingsv01.html" l gen true r (n 0 s 0 v 0 l 0) "http://www.classify.org/safesurf/" l gen true r (SS~~000 1))' />
-<meta content="task" name="DC.Type" />
-<meta name="DC.Title" content="Changing the Java compiler version for a Java EE project" />
-<meta name="abstract" content="You can change the version of Java used in a Java EE project by changing the value of the Java facet." />
-<meta name="description" content="You can change the version of Java used in a Java EE project by changing the value of the Java facet." />
-<meta content="Java EE, project compiler level, projects, Java compiler level" name="DC.subject" />
-<meta content="Java EE, project compiler level, projects, Java compiler level" name="keywords" />
-<meta scheme="URI" name="DC.Relation" content="../topics/taddingfacet.html" />
-<meta scheme="URI" name="DC.Relation" content="../topics/tchangefacet.html" />
-<meta scheme="URI" name="DC.Relation" content="../topics/cfacets.html" />
-<meta content="XHTML" name="DC.Format" />
-<meta content="tchangejavalevel" name="DC.Identifier" />
-<meta content="en-us" name="DC.Language" />
-<link href="../../org.eclipse.wst.doc.user/common.css" type="text/css" rel="stylesheet" />
-<title>Changing the Java compiler version for a Java EE project</title>
-</head>
-<body id="tchangejavalevel"><a name="tchangejavalevel"><!-- --></a>
-
-
-<h1 class="id_title">Changing the Java compiler version for a Java EE project</h1>
-
-
-
-<div class="id_taskbody"><p class="id_shortdesc">You can change the version of Java™ used
-in a Java EE project by changing the value of the <span class="uicontrol">Java</span> facet.</p>
-
-<div class="id_context"><p class="anchor_topictop" />
- <p>The <span class="uicontrol">Java</span> facet
-applies only to J2EE projects. To set the Java compiler level of a non-Java EE project,
-such as a Java project, see <a href="../../org.eclipse.jdt.doc.user/reference/ref-properties-compiler.htm">Java Compiler</a>.</p>
-<p>To change the Java compiler
-version, complete the following steps:</p>
-</div>
-
-<ol class="id_steps">
-<li class="stepexpand"><span>In the Project Explorer view of the Java EE perspective, right-click the project
-and then select <span class="uicontrol">Properties</span>.</span></li>
-
-<li class="stepexpand"><span>Select the <span class="uicontrol">Project Facets</span> page in the in
-the Properties window.</span> This page lists the facets in the project
-and their versions.</li>
-
-<li class="stepexpand"><span>Click <span class="uicontrol">Modify Project</span>.</span></li>
-
-<li class="stepexpand"><span>Double click the version number next to the<span class="uicontrol">Java</span> facet
-to select a different level of Java compiler.</span></li>
-
-<li class="stepexpand"><span>Click <span class="uicontrol">Finish</span> to close the Modify Faceted
-Project window and then click <span class="uicontrol">OK</span>.</span></li>
-
-</ol>
-
-<div class="id_postreq"><p class="anchor_topicbottom" />
-</div>
-
-</div>
-
-<div><div class="relconcepts"><strong>Related concepts</strong><br />
-<div><a href="../topics/cfacets.html" title="Facets define characteristics and requirements for Java EE projects and are used as part of the runtime configuration.">Project facets</a></div>
-</div>
-<div class="reltasks"><strong>Related tasks</strong><br />
-<div><a href="../topics/taddingfacet.html" title="This topic explains how to add a facet to an existing project in your workspace.">Adding a facet to a Java EE project</a></div>
-<div><a href="../topics/tchangefacet.html" title="You can change the version of a facet in a Java EE project by editing the facets for the project.">Changing the version of a facet</a></div>
-</div>
-</div>
-
-</body>
-</html>
\ No newline at end of file
diff --git a/docs/org.eclipse.jst.j2ee.doc.user/topics/tcreatingawebproject.dita b/docs/org.eclipse.jst.j2ee.doc.user/topics/tcreatingawebproject.dita
deleted file mode 100644
index 434fa96..0000000
--- a/docs/org.eclipse.jst.j2ee.doc.user/topics/tcreatingawebproject.dita
+++ /dev/null
@@ -1,65 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<!--Arbortext, Inc., 1988-2006, v.4002-->
-<!DOCTYPE task PUBLIC "-//OASIS//DTD DITA Task//EN"
- "task.dtd">
-<task id="creatingawebproject" xml:lang="en-us">
-<title>Creating Web projects</title>
-<shortdesc>You can use wizards to create Web modules in your <tm
-tmtype="tm" trademark="Java">Java</tm> EE project.</shortdesc>
-<prolog><metadata>
-<keywords><indexterm keyref="tcreatwebmodule|1|JavaEEWebmodulecreating"
-status="new">Java EE<indexterm>Web module<indexterm>creating</indexterm></indexterm></indexterm>
-</keywords>
-</metadata></prolog>
-<taskbody>
-<steps>
-<step><cmd>In the <tm tmtype="tm" trademark="Java">Java</tm> EE perspective,
-right-click your enterprise application project and select <menucascade>
-<uicontrol>New</uicontrol><uicontrol>Dynamic Web project</uicontrol>
-</menucascade>. The Dynamic Web project wizard opens.</cmd></step>
-<step><cmd>In the <uicontrol>Name</uicontrol> field, type a name for
-the Web project. To change the default <uicontrol>Project location</uicontrol>,
-click the <uicontrol>Browse</uicontrol> button to select a new location.</cmd>
-<info><p>If you specify a non-default project location that is already
-being used by another project, the project creation fails.</p></info>
-</step>
-<step><cmd>The <uicontrol>Target runtime</uicontrol> field is pre-populated
-with the selection from the enterprise project.</cmd></step>
-<step><cmd>In the <uicontrol>Dynamic Web Module version</uicontrol> field,
-accept the default value of <uicontrol>2.5</uicontrol>.</cmd></step>
-<step importance="optional"><cmd>Select a pre-defined project configuration
-from the <uicontrol>Configurations</uicontrol> drop-down list.</cmd>
-</step>
-<step importance="optional"><cmd>If you want to modify the configuration
-details, click <uicontrol>modify</uicontrol>:</cmd><info></info></step><?Pub
-Caret 67?>
-<step importance="optional"><cmd>Select one or more project facets
-from the <uicontrol>Project Facets</uicontrol> list. To specify server
-runtime environments, click <uicontrol>Show Runtimes</uicontrol> and
-select one or more runtimes. After making your selections, you can
-save your custom configuration by clicking <uicontrol>Save</uicontrol>.</cmd>
-</step>
-<step importance="optional"><cmd>Select the <uicontrol>Add project
-to an EAR module</uicontrol> check box to add the new module to an
-enterprise module (EAR) project.</cmd><info>Type a new project name
-or select an existing enterprise module project from the drop-down
-list in the <uicontrol>EAR Project Name</uicontrol> combination box.
-Or, click <uicontrol>New</uicontrol> to launch the New EAR module
-Project wizard.</info></step>
-<step><cmd>Click <uicontrol>Next</uicontrol>.</cmd></step>
-<step><cmd>On the Dynamic Web Project page, in the <uicontrol>Context
-Root:</uicontrol> field, specify a folder for your source files or
-accept the default value.</cmd></step>
-<step><cmd>In the <uicontrol>Content Directory:</uicontrol> field,
-specify a folder for your source files or accept the default value
-(WebContent).</cmd></step>
-<step><cmd>In the <uicontrol>Java Source Directory</uicontrol> field,
-specify a folder for your source files or accept the default value
-(src).</cmd></step>
-<step><cmd>In the <uicontrol>Output Folder:</uicontrol> field, specify
-a folder for your output files or accept the default value (WebContent/WEB-INF/classes).</cmd>
-<info></info></step>
-<step><cmd>Click <uicontrol>Finish</uicontrol>.</cmd></step>
-</steps>
-</taskbody>
-</task>
diff --git a/docs/org.eclipse.jst.j2ee.doc.user/topics/tcreatingawebproject.html b/docs/org.eclipse.jst.j2ee.doc.user/topics/tcreatingawebproject.html
deleted file mode 100644
index 7428696..0000000
--- a/docs/org.eclipse.jst.j2ee.doc.user/topics/tcreatingawebproject.html
+++ /dev/null
@@ -1,105 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?><!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.0 Transitional//EN" "http://www.w3.org/TR/xhtml1/DTD/xhtml1-transitional.dtd">
-<html lang="en-us" xml:lang="en-us">
-<head>
-<meta content="text/html; charset=utf-8" http-equiv="Content-Type" />
-<meta name="copyright" content="Copyright (c) 2000, 2009 IBM Corporation and others. All rights reserved. This program and the accompanying materials are made available under the terms of the Eclipse Public License v1.0 which accompanies this distribution, and is available at http://www.eclipse.org/legal/epl-v10.html. Contributors: IBM Corporation - initial API and implementation" />
-<meta name="DC.rights.owner" content="(C) Copyright 2000, 2009" />
-<meta content="public" name="security" />
-<meta content="index,follow" name="Robots" />
-<meta http-equiv="PICS-Label" content='(PICS-1.1 "http://www.icra.org/ratingsv02.html" l gen true r (cz 1 lz 1 nz 1 oz 1 vz 1) "http://www.rsac.org/ratingsv01.html" l gen true r (n 0 s 0 v 0 l 0) "http://www.classify.org/safesurf/" l gen true r (SS~~000 1))' />
-<meta content="task" name="DC.Type" />
-<meta name="DC.Title" content="Creating Web projects" />
-<meta name="abstract" content="You can use wizards to create Web modules in your Java EE project." />
-<meta name="description" content="You can use wizards to create Web modules in your Java EE project." />
-<meta content="Java EE, Web module, creating" name="DC.subject" />
-<meta content="Java EE, Web module, creating" name="keywords" />
-<meta scheme="URI" name="DC.Relation" content="../topics/ph-projects.html" />
-<meta content="XHTML" name="DC.Format" />
-<meta content="creatingawebproject" name="DC.Identifier" />
-<meta content="en-us" name="DC.Language" />
-<link href="../../org.eclipse.wst.doc.user/common.css" type="text/css" rel="stylesheet" />
-<title>Creating Web projects</title>
-</head>
-<body id="creatingawebproject"><a name="creatingawebproject"><!-- --></a>
-
-
-<h1 class="topictitle1">Creating Web projects</h1>
-
-
-
-<div><p>You can use wizards to create Web modules in your Java EE project.</p>
-
-<ol>
-<li class="stepexpand"><span>In the Java EE perspective,
-right-click your enterprise application project and select <span class="menucascade">
-<span class="uicontrol">New</span> > <span class="uicontrol">Dynamic Web project</span>
-</span>. The Dynamic Web project wizard opens.</span></li>
-
-<li class="stepexpand"><span>In the <span class="uicontrol">Name</span> field, type a name for
-the Web project. To change the default <span class="uicontrol">Project location</span>,
-click the <span class="uicontrol">Browse</span> button to select a new location.</span>
- <p>If you specify a non-default project location that is already
-being used by another project, the project creation fails.</p>
-
-</li>
-
-<li class="stepexpand"><span>The <span class="uicontrol">Target runtime</span> field is pre-populated
-with the selection from the enterprise project.</span></li>
-
-<li class="stepexpand"><span>In the <span class="uicontrol">Dynamic Web Module version</span> field,
-accept the default value of <span class="uicontrol">2.5</span>.</span></li>
-
-<li class="stepexpand"><strong>Optional: </strong><span>Select a pre-defined project configuration
-from the <span class="uicontrol">Configurations</span> drop-down list.</span>
-</li>
-
-<li class="stepexpand"><strong>Optional: </strong><span>If you want to modify the configuration
-details, click <span class="uicontrol">modify</span>:</span> </li>
-
-<li class="stepexpand"><strong>Optional: </strong><span>Select one or more project facets
-from the <span class="uicontrol">Project Facets</span> list. To specify server
-runtime environments, click <span class="uicontrol">Show Runtimes</span> and
-select one or more runtimes. After making your selections, you can
-save your custom configuration by clicking <span class="uicontrol">Save</span>.</span>
-</li>
-
-<li class="stepexpand"><strong>Optional: </strong><span>Select the <span class="uicontrol">Add project
-to an EAR module</span> check box to add the new module to an
-enterprise module (EAR) project.</span> Type a new project name
-or select an existing enterprise module project from the drop-down
-list in the <span class="uicontrol">EAR Project Name</span> combination box.
-Or, click <span class="uicontrol">New</span> to launch the New EAR module
-Project wizard.</li>
-
-<li class="stepexpand"><span>Click <span class="uicontrol">Next</span>.</span></li>
-
-<li class="stepexpand"><span>On the Dynamic Web Project page, in the <span class="uicontrol">Context
-Root:</span> field, specify a folder for your source files or
-accept the default value.</span></li>
-
-<li class="stepexpand"><span>In the <span class="uicontrol">Content Directory:</span> field,
-specify a folder for your source files or accept the default value
-(WebContent).</span></li>
-
-<li class="stepexpand"><span>In the <span class="uicontrol">Java Source Directory</span> field,
-specify a folder for your source files or accept the default value
-(src).</span></li>
-
-<li class="stepexpand"><span>In the <span class="uicontrol">Output Folder:</span> field, specify
-a folder for your output files or accept the default value (WebContent/WEB-INF/classes).</span>
- </li>
-
-<li class="stepexpand"><span>Click <span class="uicontrol">Finish</span>.</span></li>
-
-</ol>
-
-</div>
-
-<div>
-<div class="familylinks">
-<div class="parentlink"><strong>Parent topic:</strong> <a href="../topics/ph-projects.html" title="The workbench can work with many different types of projects. The following topics cover creating and managing some of the types of projects related to J2EE development.">Working with projects</a></div>
-</div>
-</div>
-
-</body>
-</html>
\ No newline at end of file
diff --git a/docs/org.eclipse.jst.j2ee.doc.user/topics/tdefiningannotations.dita b/docs/org.eclipse.jst.j2ee.doc.user/topics/tdefiningannotations.dita
deleted file mode 100644
index fb4f6b8..0000000
--- a/docs/org.eclipse.jst.j2ee.doc.user/topics/tdefiningannotations.dita
+++ /dev/null
@@ -1,79 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<!--Arbortext, Inc., 1988-2006, v.4002-->
-<!DOCTYPE task PUBLIC "-//OASIS//DTD DITA Task//EN"
- "task.dtd">
-<task id="tjimpear" xml:lang="en-us">
-<title outputclass="id_title">Defining and using annotations</title>
-<shortdesc outputclass="id_shortdesc">You can use the @Interface annotation
-to define your own annotation definition.</shortdesc>
-<prolog><metadata>
-<keywords><indexterm>Java EE 5<indexterm>annotations</indexterm><indexterm>defining</indexterm></indexterm>
-</keywords>
-</metadata></prolog>
-<taskbody outputclass="id_taskbody">
-<context outputclass="id_context"> <p outputclass="anchor_topictop"></p><p><b>Defining
-your own annotations</b></p></context>
-<steps>
-<step><cmd>Use the @Interface annotation to define your own annotation definition:</cmd>
-<info><p><ul>
-<li>Annotation definitions resemble interface definitions</li>
-<li>Annotation method declarations have neither parameters nor <codeph>throws</codeph> clauses,
-and return one of the following elements:<ul>
-<li>primitives</li>
-<li>String</li>
-<li>Class</li>
-<li>enum</li>
-<li>array of the above types</li>
-</ul></li>
-<li>Methods may have default values</li>
-</ul></p><p><codeblock>public @interface CreatedBy{
- String name();
- String date();
- boolean contractor() default false;
-} </codeblock><codeblock>@CreatedBy(name = "Mary Smith",date="02/02/2008");
-public class MyClass{....} </codeblock></p></info></step>
-</steps>
-<postreq outputclass="id_postreq"><p><b>Meta-annotations</b>: Meta-annotations
-(annotations of annotations) provide additional information on how an annotation
-should be used:<ul>
-<li>@Target<ul>
-<li>Restricts the use of an annotation</li>
-<li>Single argument must be from Enum ElementType <ul>
-<li>{TYPE, FIELD,METHOD, PARAMETER, CONSTRUCTOR, LOCAL_VARIABLE, ANNOTATION_TYPE}</li>
-</ul></li>
-</ul></li>
-<li>@Retention<ul>
-<li>Indicates where the annotation information will be retained</li>
-<li>Single argument must be from Enum RetentionPolicy<ul>
-<li>{SOURCE, CLASS, RUNTIME}</li>
-</ul></li>
-</ul></li>
-<li>@Documented<ul>
-<li>Marker for annotations that should be included in Javadoc</li>
-</ul></li>
-<li>@Inherited<ul>
-<li>marker for Type annotations that are to be inherited by subtypes</li>
-</ul></li>
-</ul><b>Other built-in annotations</b>: <ul>
-<li>@Overrides<ul>
-<li>Applied to a method</li>
-<li>Indicates that the compiler should generate an error if the method does
-not actually override a superclass method.</li>
-</ul></li>
-<li>@Deprecated<ul>
-<li>Applied to a method</li>
-<li>Indicates that the compiler should generate a warning when the method
-is used externally</li>
-</ul></li>
-<li>@SuppressWarnings<ul>
-<li>Applies to a type or a method</li>
-<li>Indicates that the compiler should supress warnings for that element and
-all subelements<p><codeblock>@Deprecated
-public void oldMethod() {...}
-
-@ SupressWarnings
-public void yesIknowIuseDeprecatedMethods() {...}</codeblock></p></li>
-</ul></li>
-</ul></p><p outputclass="anchor_topicbottom"></p></postreq>
-</taskbody>
-</task>
diff --git a/docs/org.eclipse.jst.j2ee.doc.user/topics/tdefiningannotations.html b/docs/org.eclipse.jst.j2ee.doc.user/topics/tdefiningannotations.html
deleted file mode 100644
index 8410135..0000000
--- a/docs/org.eclipse.jst.j2ee.doc.user/topics/tdefiningannotations.html
+++ /dev/null
@@ -1,167 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?><!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.0 Transitional//EN" "http://www.w3.org/TR/xhtml1/DTD/xhtml1-transitional.dtd">
-<html lang="en-us" xml:lang="en-us">
-<head>
-<meta content="text/html; charset=utf-8" http-equiv="Content-Type" />
-<meta name="copyright" content="Copyright (c) 2000, 2009 IBM Corporation and others. All rights reserved. This program and the accompanying materials are made available under the terms of the Eclipse Public License v1.0 which accompanies this distribution, and is available at http://www.eclipse.org/legal/epl-v10.html. Contributors: IBM Corporation - initial API and implementation" />
-<meta name="DC.rights.owner" content="(C) Copyright 2000, 2009" />
-<meta content="public" name="security" />
-<meta content="index,follow" name="Robots" />
-<meta http-equiv="PICS-Label" content='(PICS-1.1 "http://www.icra.org/ratingsv02.html" l gen true r (cz 1 lz 1 nz 1 oz 1 vz 1) "http://www.rsac.org/ratingsv01.html" l gen true r (n 0 s 0 v 0 l 0) "http://www.classify.org/safesurf/" l gen true r (SS~~000 1))' />
-<meta content="task" name="DC.Type" />
-<meta name="DC.Title" content="Defining and using annotations" />
-<meta name="abstract" content="You can use the @Interface annotation to define your own annotation definition." />
-<meta name="description" content="You can use the @Interface annotation to define your own annotation definition." />
-<meta content="Java EE 5, annotations, defining" name="DC.subject" />
-<meta content="Java EE 5, annotations, defining" name="keywords" />
-<meta scheme="URI" name="DC.Relation" content="../topics/cannotations.html" />
-<meta scheme="URI" name="DC.Relation" content="../topics/ctypesofanno.html" />
-<meta content="XHTML" name="DC.Format" />
-<meta content="tjimpear" name="DC.Identifier" />
-<meta content="en-us" name="DC.Language" />
-<link href="../../org.eclipse.wst.doc.user/common.css" type="text/css" rel="stylesheet" />
-<title>Defining and using annotations</title>
-</head>
-<body id="tjimpear"><a name="tjimpear"><!-- --></a>
-
-
-<h1 class="id_title">Defining and using annotations</h1>
-
-
-
-<div class="id_taskbody"><p class="id_shortdesc">You can use the @Interface annotation
-to define your own annotation definition.</p>
-
-<div class="id_context"> <p class="anchor_topictop" />
-<p><strong>Defining
-your own annotations</strong></p>
-</div>
-
-
-<div class="p"><span>Use the @Interface annotation to define your own annotation definition:</span>
- <div class="p"><ul>
-<li>Annotation definitions resemble interface definitions</li>
-
-<li>Annotation method declarations have neither parameters nor <samp class="codeph">throws</samp> clauses,
-and return one of the following elements:<ul>
-<li>primitives</li>
-
-<li>String</li>
-
-<li>Class</li>
-
-<li>enum</li>
-
-<li>array of the above types</li>
-
-</ul>
-</li>
-
-<li>Methods may have default values</li>
-
-</ul>
-</div>
-<div class="p"><pre>public @interface CreatedBy{
- String name();
- String date();
- boolean contractor() default false;
-} </pre>
-<pre>@CreatedBy(name = "Mary Smith",date="02/02/2008");
-public class MyClass{....} </pre>
-</div>
-</div>
-
-
-<div class="id_postreq"><div class="p"><strong>Meta-annotations</strong>: Meta-annotations
-(annotations of annotations) provide additional information on how an annotation
-should be used:<ul>
-<li>@Target<ul>
-<li>Restricts the use of an annotation</li>
-
-<li>Single argument must be from Enum ElementType <ul>
-<li>{TYPE, FIELD,METHOD, PARAMETER, CONSTRUCTOR, LOCAL_VARIABLE, ANNOTATION_TYPE}</li>
-
-</ul>
-</li>
-
-</ul>
-</li>
-
-<li>@Retention<ul>
-<li>Indicates where the annotation information will be retained</li>
-
-<li>Single argument must be from Enum RetentionPolicy<ul>
-<li>{SOURCE, CLASS, RUNTIME}</li>
-
-</ul>
-</li>
-
-</ul>
-</li>
-
-<li>@Documented<ul>
-<li>Marker for annotations that should be included in Javadoc</li>
-
-</ul>
-</li>
-
-<li>@Inherited<ul>
-<li>marker for Type annotations that are to be inherited by subtypes</li>
-
-</ul>
-</li>
-
-</ul>
-<strong>Other built-in annotations</strong>: <ul>
-<li>@Overrides<ul>
-<li>Applied to a method</li>
-
-<li>Indicates that the compiler should generate an error if the method does
-not actually override a superclass method.</li>
-
-</ul>
-</li>
-
-<li>@Deprecated<ul>
-<li>Applied to a method</li>
-
-<li>Indicates that the compiler should generate a warning when the method
-is used externally</li>
-
-</ul>
-</li>
-
-<li>@SuppressWarnings<ul>
-<li>Applies to a type or a method</li>
-
-<li>Indicates that the compiler should supress warnings for that element and
-all subelements<div class="p"><pre>@Deprecated
-public void oldMethod() {...}
-
-@ SupressWarnings
-public void yesIknowIuseDeprecatedMethods() {...}</pre>
-</div>
-</li>
-
-</ul>
-</li>
-
-</ul>
-</div>
-<p class="anchor_topicbottom" />
-</div>
-
-</div>
-
-<div>
-<ul class="ullinks">
-<li class="ulchildlink"><strong><a href="../topics/ctypesofanno.html">Types of annotations</a></strong><br />
-Java EE 6 and Java EE 5 define a number of types or groups of annotations, defined in a number of Java Specification Requests (JSRs).</li>
-</ul>
-
-<div class="familylinks">
-<div class="parentlink"><strong>Parent topic:</strong> <a href="../topics/cannotations.html" title="The goal of Java EE 5 and Java EE 6 platform development is to minimize the number of artifacts that you have to create and maintain, thereby simplifying the development process. Java EE 5 and Java EE 6 support the injection of annotations into your source code, so that you can embed resources, dependencies, services, and life-cycle notifications in your source code, without having to maintain these artifacts elsewhere.">Java EE 5 and Java EE 6 support for annotations</a></div>
-</div>
-</div>
-
-</body>
-</html>
\ No newline at end of file
diff --git a/docs/org.eclipse.jst.j2ee.doc.user/topics/tjappproj.dita b/docs/org.eclipse.jst.j2ee.doc.user/topics/tjappproj.dita
deleted file mode 100644
index 9639608..0000000
--- a/docs/org.eclipse.jst.j2ee.doc.user/topics/tjappproj.dita
+++ /dev/null
@@ -1,73 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<!--Arbortext, Inc., 1988-2006, v.4002-->
-<!DOCTYPE task PUBLIC "-//OASIS//DTD DITA Task//EN"
- "task.dtd">
-<task id="tjappproj" xml:lang="en-us">
-<title outputclass="id_title">Creating an application client project</title>
-<shortdesc outputclass="id_shortdesc">You can use a wizard to create a new
-application client project and add it to a new or existing enterprise application
-project.</shortdesc>
-<prolog><metadata>
-<keywords><indexterm>application client projects<indexterm>creating</indexterm></indexterm>
-</keywords>
-</metadata></prolog>
-<taskbody outputclass="id_taskbody">
-<context outputclass="id_context"> <p outputclass="anchor_topictop"></p> <p>Application
-client projects contain the resources needed for application client modules
-and programs that run on networked client systems. An application client project
-is deployed as a JAR file.</p><p>Like the other types of projects, application
-client projects can contain one or more project facets, which represent units
-of functionality in the project. A new application client project should have
-the Application Client module facet. Depending on what you want to use the
-project for, you may want to enable other facets for the project.</p><p>To
-create a J2EE application client project, complete the following steps:</p></context>
-<steps outputclass="id_steps">
-<step><cmd>In the <tm tmclass="special" tmowner="Sun Microsystems, Inc." tmtype="tm"
-trademark="Java">Java</tm> EE perspective, click <menucascade><uicontrol>File</uicontrol>
-<uicontrol>New</uicontrol><uicontrol>Project</uicontrol></menucascade>.</cmd>
-</step>
-<step><cmd>In the New Project Wizard, select <menucascade><uicontrol>Java
-EE</uicontrol><uicontrol>Application Client Project</uicontrol></menucascade> and
-click <uicontrol>Next</uicontrol>.</cmd></step>
-<step><cmd>In the <uicontrol>Project Name</uicontrol> field, type a name for
-the application client project. </cmd></step>
-<step importance="optional"><cmd>To change the default project location, clear
-the <uicontrol>Use default</uicontrol> check box under <uicontrol>Project
-contents</uicontrol> and select a new location with the <uicontrol>Browse</uicontrol> button.</cmd>
-<info>If you specify a non-default project location that is already being
-used by another project, the project creation will fail.<note>If you type
-a new EAR project name, the EAR project will be created in the default location
-with the lowest compatible Java EE version based on the version of the project
-being created. If you want to specify a different version or a different location
-for the enterprise application, you must use the New Enterprise Application
-Project wizard.</note></info></step>
-<step importance="optional"><cmd>To add the new project to an enterprise application
-project, select the <uicontrol>Add project to an EAR</uicontrol> check box
-and select a project in the <uicontrol>EAR Project Name</uicontrol> list.</cmd>
-<info>If you choose to add the project to an existing EAR project, the <uicontrol>Target
-runtime</uicontrol> field becomes disabled because the target runtime for
-the new project will be the same as that of the EAR project.</info></step>
-<step><cmd>In the <uicontrol>Target runtime</uicontrol> field, select the
-target runtime for the project.</cmd></step>
-<step importance="optional"><cmd>To use a predefined configuration for your
-project, select a configuration in the <uicontrol>Configurations</uicontrol> list.
-You can click the <uicontrol>Modify</uicontrol> button to do the following:</cmd>
-<info><ul>
-<li>Customize project facets. Select the check boxes next to the facets you
-want the project to have and select a version number for each facet. Select
-a facet name to see more information about that facet in the <uicontrol>Details</uicontrol> tab.
-You can also choose a preset combination of facets from the <uicontrol>Configurations</uicontrol> list.</li>
-<li>Limit your project to be compatible with one or more runtimes. Click the <uicontrol>Show
-Runtimes</uicontrol> tab and select the runtimes that you want the project
-to be compatible with. </li>
-</ul>Click <uicontrol>Next</uicontrol>.</info></step>
-<step><cmd>In the <uicontrol>Source Folder</uicontrol> field, enter the name
-of the folder to use for source code. </cmd></step>
-<step importance="optional"><cmd>To create a default class for the module,
-select the <uicontrol>Create a default Main class</uicontrol> check box.</cmd>
-</step>
-<step><cmd>Click <uicontrol>Finish</uicontrol>.</cmd></step>
-</steps>
-<postreq outputclass="id_postreq"><p outputclass="anchor_topicbottom"></p></postreq>
-</taskbody>
-</task>
diff --git a/docs/org.eclipse.jst.j2ee.doc.user/topics/tjappproj.html b/docs/org.eclipse.jst.j2ee.doc.user/topics/tjappproj.html
deleted file mode 100644
index ab95ff8..0000000
--- a/docs/org.eclipse.jst.j2ee.doc.user/topics/tjappproj.html
+++ /dev/null
@@ -1,132 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?><!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.0 Transitional//EN" "http://www.w3.org/TR/xhtml1/DTD/xhtml1-transitional.dtd">
-<html lang="en-us" xml:lang="en-us">
-<head>
-<meta content="text/html; charset=utf-8" http-equiv="Content-Type" />
-<meta name="copyright" content="Copyright (c) 2000, 2009 IBM Corporation and others. All rights reserved. This program and the accompanying materials are made available under the terms of the Eclipse Public License v1.0 which accompanies this distribution, and is available at http://www.eclipse.org/legal/epl-v10.html. Contributors: IBM Corporation - initial API and implementation" />
-<meta name="DC.rights.owner" content="(C) Copyright 2000, 2009" />
-<meta content="public" name="security" />
-<meta content="index,follow" name="Robots" />
-<meta http-equiv="PICS-Label" content='(PICS-1.1 "http://www.icra.org/ratingsv02.html" l gen true r (cz 1 lz 1 nz 1 oz 1 vz 1) "http://www.rsac.org/ratingsv01.html" l gen true r (n 0 s 0 v 0 l 0) "http://www.classify.org/safesurf/" l gen true r (SS~~000 1))' />
-<meta content="task" name="DC.Type" />
-<meta name="DC.Title" content="Creating an application client project" />
-<meta name="abstract" content="You can use a wizard to create a new application client project and add it to a new or existing enterprise application project." />
-<meta name="description" content="You can use a wizard to create a new application client project and add it to a new or existing enterprise application project." />
-<meta content="application client projects, creating" name="DC.subject" />
-<meta content="application client projects, creating" name="keywords" />
-<meta scheme="URI" name="DC.Relation" content="../topics/tjexpapp.html" />
-<meta scheme="URI" name="DC.Relation" content="../topics/tjimpapp.html" />
-<meta scheme="URI" name="DC.Relation" content="../topics/cjarch.html" />
-<meta scheme="URI" name="DC.Relation" content="../topics/cjappcliproj.html" />
-<meta scheme="URI" name="DC.Relation" content="../topics/cjearproj.html" />
-<meta scheme="URI" name="DC.Relation" content="../topics/cfacets.html" />
-<meta content="XHTML" name="DC.Format" />
-<meta content="tjappproj" name="DC.Identifier" />
-<meta content="en-us" name="DC.Language" />
-<link href="../../org.eclipse.wst.doc.user/common.css" type="text/css" rel="stylesheet" />
-<title>Creating an application client project</title>
-</head>
-<body id="tjappproj"><a name="tjappproj"><!-- --></a>
-
-
-<h1 class="id_title">Creating an application client project</h1>
-
-
-
-<div class="id_taskbody"><p class="id_shortdesc">You can use a wizard to create a new
-application client project and add it to a new or existing enterprise application
-project.</p>
-
-<div class="id_context"> <p class="anchor_topictop" />
- <p>Application
-client projects contain the resources needed for application client modules
-and programs that run on networked client systems. An application client project
-is deployed as a JAR file.</p>
-<p>Like the other types of projects, application
-client projects can contain one or more project facets, which represent units
-of functionality in the project. A new application client project should have
-the Application Client module facet. Depending on what you want to use the
-project for, you may want to enable other facets for the project.</p>
-<p>To
-create a J2EE application client project, complete the following steps:</p>
-</div>
-
-<ol class="id_steps">
-<li class="stepexpand"><span>In the Java™ EE perspective, click <span class="menucascade"><span class="uicontrol">File</span>
- > <span class="uicontrol">New</span> > <span class="uicontrol">Project</span></span>.</span>
-</li>
-
-<li class="stepexpand"><span>In the New Project Wizard, select <span class="menucascade"><span class="uicontrol">Java
-EE</span> > <span class="uicontrol">Application Client Project</span></span> and
-click <span class="uicontrol">Next</span>.</span></li>
-
-<li class="stepexpand"><span>In the <span class="uicontrol">Project Name</span> field, type a name for
-the application client project. </span></li>
-
-<li class="stepexpand"><strong>Optional: </strong><span>To change the default project location, clear
-the <span class="uicontrol">Use default</span> check box under <span class="uicontrol">Project
-contents</span> and select a new location with the <span class="uicontrol">Browse</span> button.</span>
- If you specify a non-default project location that is already being
-used by another project, the project creation will fail.<div class="note"><span class="notetitle">Note:</span> If you type
-a new EAR project name, the EAR project will be created in the default location
-with the lowest compatible Java EE version based on the version of the project
-being created. If you want to specify a different version or a different location
-for the enterprise application, you must use the New Enterprise Application
-Project wizard.</div>
-</li>
-
-<li class="stepexpand"><strong>Optional: </strong><span>To add the new project to an enterprise application
-project, select the <span class="uicontrol">Add project to an EAR</span> check box
-and select a project in the <span class="uicontrol">EAR Project Name</span> list.</span>
- If you choose to add the project to an existing EAR project, the <span class="uicontrol">Target
-runtime</span> field becomes disabled because the target runtime for
-the new project will be the same as that of the EAR project.</li>
-
-<li class="stepexpand"><span>In the <span class="uicontrol">Target runtime</span> field, select the
-target runtime for the project.</span></li>
-
-<li class="stepexpand"><strong>Optional: </strong><span>To use a predefined configuration for your
-project, select a configuration in the <span class="uicontrol">Configurations</span> list.
-You can click the <span class="uicontrol">Modify</span> button to do the following:</span>
- <ul>
-<li>Customize project facets. Select the check boxes next to the facets you
-want the project to have and select a version number for each facet. Select
-a facet name to see more information about that facet in the <span class="uicontrol">Details</span> tab.
-You can also choose a preset combination of facets from the <span class="uicontrol">Configurations</span> list.</li>
-
-<li>Limit your project to be compatible with one or more runtimes. Click the <span class="uicontrol">Show
-Runtimes</span> tab and select the runtimes that you want the project
-to be compatible with. </li>
-
-</ul>
-Click <span class="uicontrol">Next</span>.</li>
-
-<li class="stepexpand"><span>In the <span class="uicontrol">Source Folder</span> field, enter the name
-of the folder to use for source code. </span></li>
-
-<li class="stepexpand"><strong>Optional: </strong><span>To create a default class for the module,
-select the <span class="uicontrol">Create a default Main class</span> check box.</span>
-</li>
-
-<li class="stepexpand"><span>Click <span class="uicontrol">Finish</span>.</span></li>
-
-</ol>
-
-<div class="id_postreq"><p class="anchor_topicbottom" />
-</div>
-
-</div>
-
-<div><div class="relconcepts"><strong>Related concepts</strong><br />
-<div><a href="../topics/cjarch.html" title="The Java 2 Platform, Enterprise Edition (J2EE) provides a standard for developing multitier, enterprise applications.">J2EE architecture</a></div>
-<div><a href="../topics/cjappcliproj.html" title="Application client projects contain programs that run on networked client systems so the project can benefit from a server's tools.">Application client projects</a></div>
-<div><a href="../topics/cjearproj.html" title="An enterprise application project ties together the resources that are required to deploy a J2EE enterprise application.">Enterprise application projects</a></div>
-<div><a href="../topics/cfacets.html" title="Facets define characteristics and requirements for Java EE projects and are used as part of the runtime configuration.">Project facets</a></div>
-</div>
-<div class="reltasks"><strong>Related tasks</strong><br />
-<div><a href="../topics/tjexpapp.html" title="You can export an application client project as a JAR file.">Exporting an application client project</a></div>
-<div><a href="../topics/tjimpapp.html" title="Application client projects are deployed as JAR files. You can import an application client project that has been deployed into a JAR file by using the Import wizard.">Importing an application client JAR file</a></div>
-</div>
-</div>
-
-</body>
-</html>
\ No newline at end of file
diff --git a/docs/org.eclipse.jst.j2ee.doc.user/topics/tjcircleb.dita b/docs/org.eclipse.jst.j2ee.doc.user/topics/tjcircleb.dita
deleted file mode 100644
index de2003e..0000000
--- a/docs/org.eclipse.jst.j2ee.doc.user/topics/tjcircleb.dita
+++ /dev/null
@@ -1,41 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<!--Arbortext, Inc., 1988-2006, v.4002-->
-<!DOCTYPE task PUBLIC "-//OASIS//DTD DITA Task//EN"
- "task.dtd">
-<task id="tjcircleb" xml:lang="en-us">
-<title outputclass="id_title">Correcting cyclical dependencies after an EAR
-is imported</title>
-<shortdesc outputclass="id_shortdesc">You can resolve cyclical dependencies
-after an EAR is imported.</shortdesc>
-<prolog><metadata>
-<keywords><indexterm>dependencies<indexterm>correcting cyclical</indexterm></indexterm>
-<indexterm>EAR files<indexterm>correcting cyclical dependencies</indexterm></indexterm>
-<indexterm>projects<indexterm>correcting cyclical dependencies</indexterm></indexterm>
-</keywords>
-</metadata></prolog>
-<taskbody outputclass="id_taskbody">
-<context outputclass="id_context"><p outputclass="anchor_topictop"></p> <p>A
-cyclical dependency between two or more modules in an enterprise application
-most commonly occurs when projects are imported from outside the workbench.
-When a cycle exists between two or more modules in an enterprise application,
-the <tm tmclass="special" tmowner="Sun Microsystems, Inc." tmtype="tm" trademark="Java">Java</tm> builder
-cannot accurately compute the build order of the projects. Full builds fail
-under these conditions, or require several invocations.</p><p>Therefore, the
-best practice is to organize your projects or modules into components. This
-allows your module dependencies to function as a tree instead of a cycle diagram.
-This practice has the added benefit of producing a better factored and layered
-application.</p><p>To reorganize your project to correct cyclical dependencies,
-complete the following steps:</p></context>
-<steps outputclass="id_steps">
-<step><cmd>Identify all the classes within the JAR files that have cyclical
-dependencies and move those classes into a common <tm tmclass="special" tmowner="Sun Microsystems, Inc."
-tmtype="tm" trademark="Java">Java</tm> project or JAR file.</cmd></step>
-<step><cmd>Use the enterprise application editor to map utility JAR files
-to the common projects.</cmd></step>
-<step><cmd>For each module of the JAR in the application, use the JAR dependency
-editor or properties page to set dependencies only to the JAR files that are
-truly required.</cmd></step>
-</steps>
-<postreq outputclass="id_postreq"><p outputclass="anchor_topicbottom"></p></postreq>
-</taskbody>
-</task>
diff --git a/docs/org.eclipse.jst.j2ee.doc.user/topics/tjcircleb.html b/docs/org.eclipse.jst.j2ee.doc.user/topics/tjcircleb.html
deleted file mode 100644
index 66113d3..0000000
--- a/docs/org.eclipse.jst.j2ee.doc.user/topics/tjcircleb.html
+++ /dev/null
@@ -1,80 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?><!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.0 Transitional//EN" "http://www.w3.org/TR/xhtml1/DTD/xhtml1-transitional.dtd">
-<html lang="en-us" xml:lang="en-us">
-<head>
-<meta content="text/html; charset=utf-8" http-equiv="Content-Type" />
-<meta name="copyright" content="Copyright (c) 2000, 2009 IBM Corporation and others. All rights reserved. This program and the accompanying materials are made available under the terms of the Eclipse Public License v1.0 which accompanies this distribution, and is available at http://www.eclipse.org/legal/epl-v10.html. Contributors: IBM Corporation - initial API and implementation" />
-<meta name="DC.rights.owner" content="(C) Copyright 2000, 2009" />
-<meta content="public" name="security" />
-<meta content="index,follow" name="Robots" />
-<meta http-equiv="PICS-Label" content='(PICS-1.1 "http://www.icra.org/ratingsv02.html" l gen true r (cz 1 lz 1 nz 1 oz 1 vz 1) "http://www.rsac.org/ratingsv01.html" l gen true r (n 0 s 0 v 0 l 0) "http://www.classify.org/safesurf/" l gen true r (SS~~000 1))' />
-<meta content="task" name="DC.Type" />
-<meta name="DC.Title" content="Correcting cyclical dependencies after an EAR is imported" />
-<meta name="abstract" content="You can resolve cyclical dependencies after an EAR is imported." />
-<meta name="description" content="You can resolve cyclical dependencies after an EAR is imported." />
-<meta content="dependencies, correcting cyclical, EAR files, correcting cyclical dependencies, projects" name="DC.subject" />
-<meta content="dependencies, correcting cyclical, EAR files, correcting cyclical dependencies, projects" name="keywords" />
-<meta scheme="URI" name="DC.Relation" content="../topics/tjimpear.html" />
-<meta scheme="URI" name="DC.Relation" content="../topics/cjcircle.html" />
-<meta content="XHTML" name="DC.Format" />
-<meta content="tjcircleb" name="DC.Identifier" />
-<meta content="en-us" name="DC.Language" />
-<link href="../../org.eclipse.wst.doc.user/common.css" type="text/css" rel="stylesheet" />
-<title>Correcting cyclical dependencies after an EAR
-is imported</title>
-</head>
-<body id="tjcircleb"><a name="tjcircleb"><!-- --></a>
-
-
-<h1 class="id_title">Correcting cyclical dependencies after an EAR
-is imported</h1>
-
-
-
-<div class="id_taskbody"><p class="id_shortdesc">You can resolve cyclical dependencies
-after an EAR is imported.</p>
-
-<div class="id_context"><p class="anchor_topictop" />
- <p>A
-cyclical dependency between two or more modules in an enterprise application
-most commonly occurs when projects are imported from outside the workbench.
-When a cycle exists between two or more modules in an enterprise application,
-the Java™ builder
-cannot accurately compute the build order of the projects. Full builds fail
-under these conditions, or require several invocations.</p>
-<p>Therefore, the
-best practice is to organize your projects or modules into components. This
-allows your module dependencies to function as a tree instead of a cycle diagram.
-This practice has the added benefit of producing a better factored and layered
-application.</p>
-<p>To reorganize your project to correct cyclical dependencies,
-complete the following steps:</p>
-</div>
-
-<ol class="id_steps">
-<li><span>Identify all the classes within the JAR files that have cyclical
-dependencies and move those classes into a common Java project or JAR file.</span></li>
-
-<li><span>Use the enterprise application editor to map utility JAR files
-to the common projects.</span></li>
-
-<li><span>For each module of the JAR in the application, use the JAR dependency
-editor or properties page to set dependencies only to the JAR files that are
-truly required.</span></li>
-
-</ol>
-
-<div class="id_postreq"><p class="anchor_topicbottom" />
-</div>
-
-</div>
-
-<div><div class="relconcepts"><strong>Related concepts</strong><br />
-<div><a href="../topics/cjcircle.html" title="A cyclical dependency between two or more modules in an enterprise application most commonly occurs when projects are imported from outside the Workbench.">Cyclical dependencies between Java EE modules</a></div>
-</div>
-<div class="reltasks"><strong>Related tasks</strong><br />
-<div><a href="../topics/tjimpear.html" title="Enterprise application projects are deployed into EAR files. You can import an enterprise application project by importing it from a deployed EAR file.">Importing an enterprise application EAR file</a></div>
-</div>
-</div>
-
-</body>
-</html>
\ No newline at end of file
diff --git a/docs/org.eclipse.jst.j2ee.doc.user/topics/tjear.dita b/docs/org.eclipse.jst.j2ee.doc.user/topics/tjear.dita
deleted file mode 100644
index c89f633..0000000
--- a/docs/org.eclipse.jst.j2ee.doc.user/topics/tjear.dita
+++ /dev/null
@@ -1,82 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<!--Arbortext, Inc., 1988-2006, v.4002-->
-<!DOCTYPE task PUBLIC "-//OASIS//DTD DITA Task//EN"
- "task.dtd">
-<task id="tjear" xml:lang="en-us">
-<title outputclass="id_title">Creating an enterprise application project</title>
-<shortdesc outputclass="id_shortdesc">Using the wizard to create an enterprise
-application project allows you to package many web applications and modules
-in a project and deploy these modules as a J2EE enterprise application.</shortdesc>
-<prolog><metadata>
-<keywords><indexterm>enterprise applications<indexterm>projects<indexterm>creating</indexterm></indexterm></indexterm>
-<indexterm>J2EE<indexterm>enterprise application projects<indexterm>creating</indexterm></indexterm></indexterm>
-</keywords>
-</metadata></prolog>
-<taskbody outputclass="id_taskbody">
-<context outputclass="id_context"><p outputclass="anchor_topictop"></p> <p>Enterprise
-application projects contain references to the resources needed for enterprise
-applications and can contain a combination of Web modules, JAR files, connector
-modules, EJB modules, and application client modules. An enterprise application
-project is deployed in the form of an EAR file, and is therefore sometimes
-referred to as an EAR project. The modules in an enterprise application project
-are mapped to other J2EE projects. The mapping information is stored in metadata
-files within the enterprise application project. The metadata files are used
-for exporting the project to an EAR file and for running the project on the
-server.</p><p>Like the other types of projects, enterprise application projects
-can contain one or more project facets, which represent units of functionality
-in the project. To be deployed as an EAR file, the new project must have the
-EAR facet. Depending on what you want to use the project for, you may want
-to enable other facets for the project.</p><p conref="rjlimitcurrent.dita#rjlimitcurrent/limitation_ear_dbcs"></p><p>To
-create a J2EE enterprise application project, complete the following steps:</p></context>
-<steps outputclass="id_steps">
-<step><cmd>In the <tm tmclass="special" tmowner="Sun Microsystems, Inc." tmtype="tm"
-trademark="Java">Java</tm> EE perspective, click <menucascade><uicontrol>File</uicontrol>
-<uicontrol>New</uicontrol><uicontrol>Project</uicontrol></menucascade>.</cmd>
-</step>
-<step><cmd>In the New Project Wizard, select <menucascade><uicontrol>J2EE</uicontrol>
-<uicontrol>Enterprise Application Project</uicontrol></menucascade> and click <uicontrol>Next</uicontrol>.</cmd>
-</step>
-<step><cmd>In the <uicontrol>Project Name</uicontrol> field, type a name for
-the new project. </cmd></step>
-<step importance="optional"><cmd>To change the default project location, clear
-the <uicontrol>Use default</uicontrol> check box under <uicontrol>Project
-contents</uicontrol> and select a new location with the <uicontrol>Browse</uicontrol> button.</cmd>
-</step>
-<step><cmd>In the <uicontrol>Target runtime</uicontrol> field, select the
-target runtime for the project.</cmd><info>You can click the <uicontrol>New</uicontrol> button
-to create a new runtime for the project to use.</info></step>
-<step importance="optional"><cmd>To use a predefined configuration for your
-project, select a configuration in the <uicontrol>Configuration</uicontrol> list.
-You can click the <uicontrol>Modify</uicontrol> button to do the following:</cmd>
-<info><ul>
-<li>Customize project facets. Select the check boxes next to the facets you
-want the project to have and select a version number for each facet. Select
-a facet name to see more information about that facet in the <uicontrol>Details</uicontrol> tab.
-You can also choose a preset combination of facets from the <uicontrol>Configurations</uicontrol> list.</li>
-<li>Limit your project to be compatible with one or more runtimes. Click the <uicontrol>Show
-Runtimes</uicontrol> tab and select the runtimes that you want the project
-to be compatible with. </li>
-</ul>Click <uicontrol>Next</uicontrol>.</info></step>
-<step><cmd>On the J2EE Modules to Add to the EAR page of the wizard, select
-the existing modules that you want to add to the new enterprise application
-project.</cmd></step>
-<step importance="optional"><cmd>To create new modules to add to the project,
-click the <uicontrol>New Module</uicontrol> button to do one of the following:</cmd>
-<choicetable keycol="0">
-<chrow><choption>Creating one module</choption><chdesc>Clear the <uicontrol>Create
-default modules</uicontrol> check box, select the type of module you want
-to create, click <uicontrol>Next</uicontrol> and follow the New Project wizard
-for that type of project.</chdesc></chrow>
-<chrow><choption>Creating two or more modules</choption><chdesc>Select the <uicontrol>Create
-default modules</uicontrol> check box, select the check boxes for each type
-of project you want to create, and click <uicontrol>Finish</uicontrol>.</chdesc>
-</chrow>
-</choicetable>
-<info>You can enter a name for each module. Each of these modules will have
-the default settings for that type of project and they will have the same
-server target as the new enterprise application.</info></step>
-<step><cmd>Click <uicontrol>Finish</uicontrol>.</cmd></step>
-</steps>
-<postreq outputclass="id_postreq"><p outputclass="anchor_topicbottom"></p></postreq>
-</taskbody>
-</task>
diff --git a/docs/org.eclipse.jst.j2ee.doc.user/topics/tjear.html b/docs/org.eclipse.jst.j2ee.doc.user/topics/tjear.html
deleted file mode 100644
index 301dbe6..0000000
--- a/docs/org.eclipse.jst.j2ee.doc.user/topics/tjear.html
+++ /dev/null
@@ -1,151 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?><!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.0 Transitional//EN" "http://www.w3.org/TR/xhtml1/DTD/xhtml1-transitional.dtd">
-<html lang="en-us" xml:lang="en-us">
-<head>
-<meta content="text/html; charset=utf-8" http-equiv="Content-Type" />
-<meta name="copyright" content="Copyright (c) 2000, 2009 IBM Corporation and others. All rights reserved. This program and the accompanying materials are made available under the terms of the Eclipse Public License v1.0 which accompanies this distribution, and is available at http://www.eclipse.org/legal/epl-v10.html. Contributors: IBM Corporation - initial API and implementation" />
-<meta name="DC.rights.owner" content="(C) Copyright 2000, 2009" />
-<meta content="public" name="security" />
-<meta content="index,follow" name="Robots" />
-<meta http-equiv="PICS-Label" content='(PICS-1.1 "http://www.icra.org/ratingsv02.html" l gen true r (cz 1 lz 1 nz 1 oz 1 vz 1) "http://www.rsac.org/ratingsv01.html" l gen true r (n 0 s 0 v 0 l 0) "http://www.classify.org/safesurf/" l gen true r (SS~~000 1))' />
-<meta content="task" name="DC.Type" />
-<meta name="DC.Title" content="Creating an enterprise application project" />
-<meta name="abstract" content="Using the wizard to create an enterprise application project allows you to package many web applications and modules in a project and deploy these modules as a J2EE enterprise application." />
-<meta name="description" content="Using the wizard to create an enterprise application project allows you to package many web applications and modules in a project and deploy these modules as a J2EE enterprise application." />
-<meta content="enterprise applications, projects, creating, J2EE, enterprise application projects" name="DC.subject" />
-<meta content="enterprise applications, projects, creating, J2EE, enterprise application projects" name="keywords" />
-<meta scheme="URI" name="DC.Relation" content="../topics/tjimpear.html" />
-<meta scheme="URI" name="DC.Relation" content="../topics/tjexpear.html" />
-<meta scheme="URI" name="DC.Relation" content="../topics/cjarch.html" />
-<meta scheme="URI" name="DC.Relation" content="../topics/cjearproj.html" />
-<meta scheme="URI" name="DC.Relation" content="../topics/cjearproj.html" />
-<meta scheme="URI" name="DC.Relation" content="../topics/cfacets.html" />
-<meta content="XHTML" name="DC.Format" />
-<meta content="tjear" name="DC.Identifier" />
-<meta content="en-us" name="DC.Language" />
-<link href="../../org.eclipse.wst.doc.user/common.css" type="text/css" rel="stylesheet" />
-<title>Creating an enterprise application project</title>
-</head>
-<body id="tjear"><a name="tjear"><!-- --></a>
-
-
-<h1 class="id_title">Creating an enterprise application project</h1>
-
-
-
-<div class="id_taskbody"><p class="id_shortdesc">Using the wizard to create an enterprise
-application project allows you to package many web applications and modules
-in a project and deploy these modules as a J2EE enterprise application.</p>
-
-<div class="id_context"><p class="anchor_topictop" />
- <p>Enterprise
-application projects contain references to the resources needed for enterprise
-applications and can contain a combination of Web modules, JAR files, connector
-modules, EJB modules, and application client modules. An enterprise application
-project is deployed in the form of an EAR file, and is therefore sometimes
-referred to as an EAR project. The modules in an enterprise application project
-are mapped to other J2EE projects. The mapping information is stored in metadata
-files within the enterprise application project. The metadata files are used
-for exporting the project to an EAR file and for running the project on the
-server.</p>
-<p>Like the other types of projects, enterprise application projects
-can contain one or more project facets, which represent units of functionality
-in the project. To be deployed as an EAR file, the new project must have the
-EAR facet. Depending on what you want to use the project for, you may want
-to enable other facets for the project.</p>
-<p>When
-you create an enterprise application project, it is recommended that you do
-not give it a name that contains double-byte character set (DBCS) characters.</p>
-<p>To
-create a J2EE enterprise application project, complete the following steps:</p>
-</div>
-
-<ol class="id_steps">
-<li class="stepexpand"><span>In the Java™ EE perspective, click <span class="menucascade"><span class="uicontrol">File</span>
- > <span class="uicontrol">New</span> > <span class="uicontrol">Project</span></span>.</span>
-</li>
-
-<li class="stepexpand"><span>In the New Project Wizard, select <span class="menucascade"><span class="uicontrol">J2EE</span>
- > <span class="uicontrol">Enterprise Application Project</span></span> and click <span class="uicontrol">Next</span>.</span>
-</li>
-
-<li class="stepexpand"><span>In the <span class="uicontrol">Project Name</span> field, type a name for
-the new project. </span></li>
-
-<li class="stepexpand"><strong>Optional: </strong><span>To change the default project location, clear
-the <span class="uicontrol">Use default</span> check box under <span class="uicontrol">Project
-contents</span> and select a new location with the <span class="uicontrol">Browse</span> button.</span>
-</li>
-
-<li class="stepexpand"><span>In the <span class="uicontrol">Target runtime</span> field, select the
-target runtime for the project.</span> You can click the <span class="uicontrol">New</span> button
-to create a new runtime for the project to use.</li>
-
-<li class="stepexpand"><strong>Optional: </strong><span>To use a predefined configuration for your
-project, select a configuration in the <span class="uicontrol">Configuration</span> list.
-You can click the <span class="uicontrol">Modify</span> button to do the following:</span>
- <ul>
-<li>Customize project facets. Select the check boxes next to the facets you
-want the project to have and select a version number for each facet. Select
-a facet name to see more information about that facet in the <span class="uicontrol">Details</span> tab.
-You can also choose a preset combination of facets from the <span class="uicontrol">Configurations</span> list.</li>
-
-<li>Limit your project to be compatible with one or more runtimes. Click the <span class="uicontrol">Show
-Runtimes</span> tab and select the runtimes that you want the project
-to be compatible with. </li>
-
-</ul>
-Click <span class="uicontrol">Next</span>.</li>
-
-<li class="stepexpand"><span>On the J2EE Modules to Add to the EAR page of the wizard, select
-the existing modules that you want to add to the new enterprise application
-project.</span></li>
-
-<li class="stepexpand"><strong>Optional: </strong><span>To create new modules to add to the project,
-click the <span class="uicontrol">New Module</span> button to do one of the following:</span>
-
-<table class="choicetableborder" summary="" cellspacing="0" cellpadding="4" rules="rows" frame="hsides" border="1">
-<thead><tr><th valign="bottom" id="N1016C-option" align="left">Option</th>
-<th valign="bottom" id="N1016C-desc" align="left">Description</th></tr></thead>
-<tbody>
-<tr><td valign="top" headers="N1016C-option" id="N10176">Creating one module</td>
-<td valign="top" headers="N1016C-desc N10176">Clear the <span class="uicontrol">Create
-default modules</span> check box, select the type of module you want
-to create, click <span class="uicontrol">Next</span> and follow the New Project wizard
-for that type of project.</td>
-</tr>
-
-<tr><td valign="top" headers="N1016C-option" id="N10191">Creating two or more modules</td>
-<td valign="top" headers="N1016C-desc N10191">Select the <span class="uicontrol">Create
-default modules</span> check box, select the check boxes for each type
-of project you want to create, and click <span class="uicontrol">Finish</span>.</td>
-
-</tr>
-
-</tbody></table>
-
- You can enter a name for each module. Each of these modules will have
-the default settings for that type of project and they will have the same
-server target as the new enterprise application.</li>
-
-<li class="stepexpand"><span>Click <span class="uicontrol">Finish</span>.</span></li>
-
-</ol>
-
-<div class="id_postreq"><p class="anchor_topicbottom" />
-</div>
-
-</div>
-
-<div><div class="relconcepts"><strong>Related concepts</strong><br />
-<div><a href="../topics/cjarch.html" title="The Java 2 Platform, Enterprise Edition (J2EE) provides a standard for developing multitier, enterprise applications.">J2EE architecture</a></div>
-<div><a href="../topics/cjearproj.html" title="An enterprise application project ties together the resources that are required to deploy a J2EE enterprise application.">Enterprise application projects</a></div>
-<div><a href="../topics/cfacets.html" title="Facets define characteristics and requirements for Java EE projects and are used as part of the runtime configuration.">Project facets</a></div>
-</div>
-<div class="reltasks"><strong>Related tasks</strong><br />
-<div><a href="../topics/tjimpear.html" title="Enterprise application projects are deployed into EAR files. You can import an enterprise application project by importing it from a deployed EAR file.">Importing an enterprise application EAR file</a></div>
-<div><a href="../topics/tjexpear.html" title="Enterprise applications are deployed in the form of an EAR file. Use the Export wizard to export an enterprise application project into an EAR file for deployment.">Exporting an enterprise application into an EAR file</a></div>
-</div>
-</div>
-
-</body>
-</html>
\ No newline at end of file
diff --git a/docs/org.eclipse.jst.j2ee.doc.user/topics/tjexpapp.dita b/docs/org.eclipse.jst.j2ee.doc.user/topics/tjexpapp.dita
deleted file mode 100644
index d99519b..0000000
--- a/docs/org.eclipse.jst.j2ee.doc.user/topics/tjexpapp.dita
+++ /dev/null
@@ -1,38 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<!--Arbortext, Inc., 1988-2006, v.4002-->
-<!DOCTYPE task PUBLIC "-//OASIS//DTD DITA Task//EN"
- "task.dtd">
-<task id="tjexpapp" xml:lang="en-us">
-<title outputclass="id_title">Exporting an application client project</title>
-<shortdesc outputclass="id_shortdesc">You can export an application client
-project as a JAR file.</shortdesc>
-<prolog><metadata>
-<keywords><indexterm>application client projects<indexterm>exporting</indexterm></indexterm>
-</keywords>
-</metadata></prolog>
-<taskbody outputclass="id_taskbody">
-<context outputclass="id_context"><p outputclass="anchor_topictop"></p> <p>To
-export an application client project from the workbench, complete the following
-steps:</p></context>
-<steps outputclass="id_steps">
-<step><cmd>In the <tm tmclass="special" tmowner="Sun Microsystems, Inc." tmtype="tm"
-trademark="Java">Java</tm> EE perspective, click <menucascade><uicontrol>File</uicontrol>
-<uicontrol>Export</uicontrol></menucascade>.</cmd></step>
-<step><cmd>Under <uicontrol>Select an export destination</uicontrol>, click <menucascade>
-<uicontrol>J2EE</uicontrol><uicontrol>App Client JAR file</uicontrol></menucascade>,
-and then click <uicontrol>Next</uicontrol>.</cmd></step>
-<step><cmd>In the <uicontrol>Application Client project</uicontrol> list,
-select the application client project you want to export.</cmd></step>
-<step><cmd>In the <uicontrol>Destination</uicontrol> field, enter the full
-path and JAR file name where you want to export the application client project.</cmd>
-</step>
-<step importance="optional"><cmd>To export source files, select the <uicontrol>Export
-source files</uicontrol> check box.</cmd></step>
-<step importance="optional"><cmd>If you are exporting to an existing JAR file
-and you do not want to be warned about overwriting it, select the <uicontrol>Overwrite
-existing file</uicontrol> check box.</cmd></step>
-<step><cmd>Click <uicontrol>Finish</uicontrol>.</cmd></step>
-</steps>
-<postreq outputclass="id_postreq"><p outputclass="anchor_topicbottom"></p></postreq>
-</taskbody>
-</task>
diff --git a/docs/org.eclipse.jst.j2ee.doc.user/topics/tjexpapp.html b/docs/org.eclipse.jst.j2ee.doc.user/topics/tjexpapp.html
deleted file mode 100644
index 4667465..0000000
--- a/docs/org.eclipse.jst.j2ee.doc.user/topics/tjexpapp.html
+++ /dev/null
@@ -1,84 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?><!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.0 Transitional//EN" "http://www.w3.org/TR/xhtml1/DTD/xhtml1-transitional.dtd">
-<html lang="en-us" xml:lang="en-us">
-<head>
-<meta content="text/html; charset=utf-8" http-equiv="Content-Type" />
-<meta name="copyright" content="Copyright (c) 2000, 2009 IBM Corporation and others. All rights reserved. This program and the accompanying materials are made available under the terms of the Eclipse Public License v1.0 which accompanies this distribution, and is available at http://www.eclipse.org/legal/epl-v10.html. Contributors: IBM Corporation - initial API and implementation" />
-<meta name="DC.rights.owner" content="(C) Copyright 2000, 2009" />
-<meta content="public" name="security" />
-<meta content="index,follow" name="Robots" />
-<meta http-equiv="PICS-Label" content='(PICS-1.1 "http://www.icra.org/ratingsv02.html" l gen true r (cz 1 lz 1 nz 1 oz 1 vz 1) "http://www.rsac.org/ratingsv01.html" l gen true r (n 0 s 0 v 0 l 0) "http://www.classify.org/safesurf/" l gen true r (SS~~000 1))' />
-<meta content="task" name="DC.Type" />
-<meta name="DC.Title" content="Exporting an application client project" />
-<meta name="abstract" content="You can export an application client project as a JAR file." />
-<meta name="description" content="You can export an application client project as a JAR file." />
-<meta content="application client projects, exporting" name="DC.subject" />
-<meta content="application client projects, exporting" name="keywords" />
-<meta scheme="URI" name="DC.Relation" content="../topics/tjappproj.html" />
-<meta scheme="URI" name="DC.Relation" content="../topics/tjimpapp.html" />
-<meta scheme="URI" name="DC.Relation" content="../topics/cjarch.html" />
-<meta scheme="URI" name="DC.Relation" content="../topics/cjappcliproj.html" />
-<meta content="XHTML" name="DC.Format" />
-<meta content="tjexpapp" name="DC.Identifier" />
-<meta content="en-us" name="DC.Language" />
-<link href="../../org.eclipse.wst.doc.user/common.css" type="text/css" rel="stylesheet" />
-<title>Exporting an application client project</title>
-</head>
-<body id="tjexpapp"><a name="tjexpapp"><!-- --></a>
-
-
-<h1 class="id_title">Exporting an application client project</h1>
-
-
-
-<div class="id_taskbody"><p class="id_shortdesc">You can export an application client
-project as a JAR file.</p>
-
-<div class="id_context"><p class="anchor_topictop" />
- <p>To
-export an application client project from the workbench, complete the following
-steps:</p>
-</div>
-
-<ol class="id_steps">
-<li><span>In the Java™ EE perspective, click <span class="menucascade"><span class="uicontrol">File</span>
- > <span class="uicontrol">Export</span></span>.</span></li>
-
-<li><span>Under <span class="uicontrol">Select an export destination</span>, click <span class="menucascade">
-<span class="uicontrol">J2EE</span> > <span class="uicontrol">App Client JAR file</span></span>,
-and then click <span class="uicontrol">Next</span>.</span></li>
-
-<li><span>In the <span class="uicontrol">Application Client project</span> list,
-select the application client project you want to export.</span></li>
-
-<li><span>In the <span class="uicontrol">Destination</span> field, enter the full
-path and JAR file name where you want to export the application client project.</span>
-</li>
-
-<li><strong>Optional: </strong><span>To export source files, select the <span class="uicontrol">Export
-source files</span> check box.</span></li>
-
-<li><strong>Optional: </strong><span>If you are exporting to an existing JAR file
-and you do not want to be warned about overwriting it, select the <span class="uicontrol">Overwrite
-existing file</span> check box.</span></li>
-
-<li><span>Click <span class="uicontrol">Finish</span>.</span></li>
-
-</ol>
-
-<div class="id_postreq"><p class="anchor_topicbottom" />
-</div>
-
-</div>
-
-<div><div class="relconcepts"><strong>Related concepts</strong><br />
-<div><a href="../topics/cjarch.html" title="The Java 2 Platform, Enterprise Edition (J2EE) provides a standard for developing multitier, enterprise applications.">J2EE architecture</a></div>
-<div><a href="../topics/cjappcliproj.html" title="Application client projects contain programs that run on networked client systems so the project can benefit from a server's tools.">Application client projects</a></div>
-</div>
-<div class="reltasks"><strong>Related tasks</strong><br />
-<div><a href="../topics/tjappproj.html" title="You can use a wizard to create a new application client project and add it to a new or existing enterprise application project.">Creating an application client project</a></div>
-<div><a href="../topics/tjimpapp.html" title="Application client projects are deployed as JAR files. You can import an application client project that has been deployed into a JAR file by using the Import wizard.">Importing an application client JAR file</a></div>
-</div>
-</div>
-
-</body>
-</html>
\ No newline at end of file
diff --git a/docs/org.eclipse.jst.j2ee.doc.user/topics/tjexpear.dita b/docs/org.eclipse.jst.j2ee.doc.user/topics/tjexpear.dita
deleted file mode 100644
index c51e5b2..0000000
--- a/docs/org.eclipse.jst.j2ee.doc.user/topics/tjexpear.dita
+++ /dev/null
@@ -1,48 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<!--Arbortext, Inc., 1988-2006, v.4002-->
-<!DOCTYPE task PUBLIC "-//OASIS//DTD DITA Task//EN"
- "task.dtd">
-<task id="tjexpear" xml:lang="en-us">
-<title outputclass="id_title">Exporting an enterprise application into an
-EAR file</title>
-<shortdesc outputclass="id_shortdesc">Enterprise applications are deployed
-in the form of an EAR file. Use the Export wizard to export an enterprise
-application project into an EAR file for deployment.</shortdesc>
-<prolog><metadata>
-<keywords><indexterm>EAR<indexterm>files<indexterm>exporting</indexterm></indexterm></indexterm>
-<indexterm>enterprise applications<indexterm>projects<indexterm>exporting</indexterm></indexterm></indexterm>
-</keywords>
-</metadata></prolog>
-<taskbody outputclass="id_taskbody">
-<context outputclass="id_context"> <p outputclass="anchor_topictop"></p> <p>To
-export an enterprise application project into an EAR file, complete the following
-steps:</p></context>
-<steps outputclass="id_steps">
-<step><cmd>In the <tm tmclass="special" tmowner="Sun Microsystems, Inc." tmtype="tm"
-trademark="Java">Java</tm> EE perspective, click <menucascade><uicontrol>File</uicontrol>
-<uicontrol>Export</uicontrol></menucascade>.</cmd></step>
-<step><cmd>Under <uicontrol>Select an export destination</uicontrol>, click <menucascade>
-<uicontrol>J2EE</uicontrol><uicontrol>EAR file</uicontrol></menucascade>,
-and then click <uicontrol>Next</uicontrol>.</cmd></step>
-<step><cmd>In the <uicontrol>EAR project</uicontrol> list, select the enterprise
-application project you want to export.</cmd></step>
-<step><cmd>In the <uicontrol>Destination</uicontrol> field, enter the full
-path and EAR file name where you want to export the enterprise application
-project that is selected in the <uicontrol>EAR application</uicontrol> field.</cmd>
-</step>
-<step importance="optional"><cmd>To export source files, select the <uicontrol>Export
-source files</uicontrol> check box.</cmd></step>
-<step importance="optional"><cmd>If you are exporting to an existing EAR file
-and you do not want to be warned about overwriting it, select the <uicontrol>Overwrite
-existing file</uicontrol> check box.</cmd></step>
-<step><cmd>Click <uicontrol>Finish</uicontrol>.</cmd></step>
-</steps>
-<result outputclass="id_result">The wizard exports the contents of the EAR
-project to the specified EAR file. Additionally, for each project that corresponds
-to a module or utility JAR in the application, the project contents are exported
-into a nested module or JAR file in the EAR file. If any unsaved changes exist
-on any of the files in any of the referenced projects, you are prompted to
-save these files prior to export.</result>
-<postreq outputclass="id_postreq"><p outputclass="anchor_topicbottom"></p></postreq>
-</taskbody>
-</task>
diff --git a/docs/org.eclipse.jst.j2ee.doc.user/topics/tjexpear.html b/docs/org.eclipse.jst.j2ee.doc.user/topics/tjexpear.html
deleted file mode 100644
index d072601..0000000
--- a/docs/org.eclipse.jst.j2ee.doc.user/topics/tjexpear.html
+++ /dev/null
@@ -1,95 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?><!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.0 Transitional//EN" "http://www.w3.org/TR/xhtml1/DTD/xhtml1-transitional.dtd">
-<html lang="en-us" xml:lang="en-us">
-<head>
-<meta content="text/html; charset=utf-8" http-equiv="Content-Type" />
-<meta name="copyright" content="Copyright (c) 2000, 2009 IBM Corporation and others. All rights reserved. This program and the accompanying materials are made available under the terms of the Eclipse Public License v1.0 which accompanies this distribution, and is available at http://www.eclipse.org/legal/epl-v10.html. Contributors: IBM Corporation - initial API and implementation" />
-<meta name="DC.rights.owner" content="(C) Copyright 2000, 2009" />
-<meta content="public" name="security" />
-<meta content="index,follow" name="Robots" />
-<meta http-equiv="PICS-Label" content='(PICS-1.1 "http://www.icra.org/ratingsv02.html" l gen true r (cz 1 lz 1 nz 1 oz 1 vz 1) "http://www.rsac.org/ratingsv01.html" l gen true r (n 0 s 0 v 0 l 0) "http://www.classify.org/safesurf/" l gen true r (SS~~000 1))' />
-<meta content="task" name="DC.Type" />
-<meta name="DC.Title" content="Exporting an enterprise application into an EAR file" />
-<meta name="abstract" content="Enterprise applications are deployed in the form of an EAR file. Use the Export wizard to export an enterprise application project into an EAR file for deployment." />
-<meta name="description" content="Enterprise applications are deployed in the form of an EAR file. Use the Export wizard to export an enterprise application project into an EAR file for deployment." />
-<meta content="EAR, files, exporting, enterprise applications, projects" name="DC.subject" />
-<meta content="EAR, files, exporting, enterprise applications, projects" name="keywords" />
-<meta scheme="URI" name="DC.Relation" content="../topics/tjear.html" />
-<meta scheme="URI" name="DC.Relation" content="../topics/tjimpear.html" />
-<meta scheme="URI" name="DC.Relation" content="../topics/cjarch.html" />
-<meta scheme="URI" name="DC.Relation" content="../topics/cjearproj.html" />
-<meta content="XHTML" name="DC.Format" />
-<meta content="tjexpear" name="DC.Identifier" />
-<meta content="en-us" name="DC.Language" />
-<link href="../../org.eclipse.wst.doc.user/common.css" type="text/css" rel="stylesheet" />
-<title>Exporting an enterprise application into an
-EAR file</title>
-</head>
-<body id="tjexpear"><a name="tjexpear"><!-- --></a>
-
-
-<h1 class="id_title">Exporting an enterprise application into an
-EAR file</h1>
-
-
-
-<div class="id_taskbody"><p class="id_shortdesc">Enterprise applications are deployed
-in the form of an EAR file. Use the Export wizard to export an enterprise
-application project into an EAR file for deployment.</p>
-
-<div class="id_context"> <p class="anchor_topictop" />
- <p>To
-export an enterprise application project into an EAR file, complete the following
-steps:</p>
-</div>
-
-<ol class="id_steps">
-<li><span>In the Java™ EE perspective, click <span class="menucascade"><span class="uicontrol">File</span>
- > <span class="uicontrol">Export</span></span>.</span></li>
-
-<li><span>Under <span class="uicontrol">Select an export destination</span>, click <span class="menucascade">
-<span class="uicontrol">J2EE</span> > <span class="uicontrol">EAR file</span></span>,
-and then click <span class="uicontrol">Next</span>.</span></li>
-
-<li><span>In the <span class="uicontrol">EAR project</span> list, select the enterprise
-application project you want to export.</span></li>
-
-<li><span>In the <span class="uicontrol">Destination</span> field, enter the full
-path and EAR file name where you want to export the enterprise application
-project that is selected in the <span class="uicontrol">EAR application</span> field.</span>
-</li>
-
-<li><strong>Optional: </strong><span>To export source files, select the <span class="uicontrol">Export
-source files</span> check box.</span></li>
-
-<li><strong>Optional: </strong><span>If you are exporting to an existing EAR file
-and you do not want to be warned about overwriting it, select the <span class="uicontrol">Overwrite
-existing file</span> check box.</span></li>
-
-<li><span>Click <span class="uicontrol">Finish</span>.</span></li>
-
-</ol>
-
-<div class="id_result">The wizard exports the contents of the EAR
-project to the specified EAR file. Additionally, for each project that corresponds
-to a module or utility JAR in the application, the project contents are exported
-into a nested module or JAR file in the EAR file. If any unsaved changes exist
-on any of the files in any of the referenced projects, you are prompted to
-save these files prior to export.</div>
-
-<div class="id_postreq"><p class="anchor_topicbottom" />
-</div>
-
-</div>
-
-<div><div class="relconcepts"><strong>Related concepts</strong><br />
-<div><a href="../topics/cjarch.html" title="The Java 2 Platform, Enterprise Edition (J2EE) provides a standard for developing multitier, enterprise applications.">J2EE architecture</a></div>
-<div><a href="../topics/cjearproj.html" title="An enterprise application project ties together the resources that are required to deploy a J2EE enterprise application.">Enterprise application projects</a></div>
-</div>
-<div class="reltasks"><strong>Related tasks</strong><br />
-<div><a href="../topics/tjear.html" title="Using the wizard to create an enterprise application project allows you to package many web applications and modules in a project and deploy these modules as a J2EE enterprise application.">Creating an enterprise application project</a></div>
-<div><a href="../topics/tjimpear.html" title="Enterprise application projects are deployed into EAR files. You can import an enterprise application project by importing it from a deployed EAR file.">Importing an enterprise application EAR file</a></div>
-</div>
-</div>
-
-</body>
-</html>
\ No newline at end of file
diff --git a/docs/org.eclipse.jst.j2ee.doc.user/topics/tjexprar.dita b/docs/org.eclipse.jst.j2ee.doc.user/topics/tjexprar.dita
deleted file mode 100644
index aa2405b..0000000
--- a/docs/org.eclipse.jst.j2ee.doc.user/topics/tjexprar.dita
+++ /dev/null
@@ -1,40 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<!--Arbortext, Inc., 1988-2006, v.4002-->
-<!DOCTYPE task PUBLIC "-//OASIS//DTD DITA Task//EN"
- "task.dtd">
-<task id="tjexprar" xml:lang="en-us">
-<title outputclass="id_title">Exporting connector projects to RAR files</title>
-<shortdesc outputclass="id_shortdesc">You can export a connector project to
-a RAR file in preparation for deploying it to a server.</shortdesc>
-<prolog><metadata>
-<keywords><indexterm>connector projects<indexterm>exporting</indexterm></indexterm>
-<indexterm>RAR files<indexterm>exporting</indexterm></indexterm></keywords>
-</metadata></prolog>
-<taskbody outputclass="id_taskbody">
-<context outputclass="id_context"> <p outputclass="anchor_topictop"></p> <p>To
-export the contents of a connector project to a RAR file, complete the following
-steps:</p></context>
-<steps outputclass="id_steps">
-<step><cmd>In the <tm tmclass="special" tmowner="Sun Microsystems, Inc." tmtype="tm"
-trademark="Java">Java</tm> EE perspective, click <menucascade><uicontrol>File</uicontrol>
-<uicontrol>Export</uicontrol></menucascade>.</cmd></step>
-<step><cmd>Under <uicontrol>Select an export destination</uicontrol>, click <menucascade>
-<uicontrol>J2EE</uicontrol><uicontrol>RAR file</uicontrol></menucascade>,
-and then click <uicontrol>Next</uicontrol>.</cmd></step>
-<step><cmd>In the <uicontrol>Connector project</uicontrol> list, select the
-connector project to export.</cmd></step>
-<step><cmd>In the <uicontrol>Destination</uicontrol> field, enter the full
-path and RAR file name where you want to export the connector project.</cmd>
-</step>
-<step importance="optional"><cmd>To export source files, select the <uicontrol>Export
-source files</uicontrol> check box.</cmd></step>
-<step importance="optional"><cmd>If you are exporting to an existing RAR file
-and you do not want to be warned about overwriting it, select the <uicontrol>Overwrite
-existing file</uicontrol> check box.</cmd></step>
-<step><cmd>Click <uicontrol>Finish</uicontrol>.</cmd><stepresult outputclass="id_result">The
-wizard exports the contents of the RAR project to the specified RAR file.</stepresult>
-</step>
-</steps>
-<postreq outputclass="id_postreq"><p outputclass="anchor_topicbottom"></p></postreq>
-</taskbody>
-</task>
diff --git a/docs/org.eclipse.jst.j2ee.doc.user/topics/tjexprar.html b/docs/org.eclipse.jst.j2ee.doc.user/topics/tjexprar.html
deleted file mode 100644
index bd537fb..0000000
--- a/docs/org.eclipse.jst.j2ee.doc.user/topics/tjexprar.html
+++ /dev/null
@@ -1,79 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?><!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.0 Transitional//EN" "http://www.w3.org/TR/xhtml1/DTD/xhtml1-transitional.dtd">
-<html lang="en-us" xml:lang="en-us">
-<head>
-<meta content="text/html; charset=utf-8" http-equiv="Content-Type" />
-<meta name="copyright" content="Copyright (c) 2000, 2009 IBM Corporation and others. All rights reserved. This program and the accompanying materials are made available under the terms of the Eclipse Public License v1.0 which accompanies this distribution, and is available at http://www.eclipse.org/legal/epl-v10.html. Contributors: IBM Corporation - initial API and implementation" />
-<meta name="DC.rights.owner" content="(C) Copyright 2000, 2009" />
-<meta content="public" name="security" />
-<meta content="index,follow" name="Robots" />
-<meta http-equiv="PICS-Label" content='(PICS-1.1 "http://www.icra.org/ratingsv02.html" l gen true r (cz 1 lz 1 nz 1 oz 1 vz 1) "http://www.rsac.org/ratingsv01.html" l gen true r (n 0 s 0 v 0 l 0) "http://www.classify.org/safesurf/" l gen true r (SS~~000 1))' />
-<meta content="task" name="DC.Type" />
-<meta name="DC.Title" content="Exporting connector projects to RAR files" />
-<meta name="abstract" content="You can export a connector project to a RAR file in preparation for deploying it to a server." />
-<meta name="description" content="You can export a connector project to a RAR file in preparation for deploying it to a server." />
-<meta content="connector projects, exporting, RAR files" name="DC.subject" />
-<meta content="connector projects, exporting, RAR files" name="keywords" />
-<meta scheme="URI" name="DC.Relation" content="../topics/ph-importexport.html" />
-<meta content="XHTML" name="DC.Format" />
-<meta content="tjexprar" name="DC.Identifier" />
-<meta content="en-us" name="DC.Language" />
-<link href="../../org.eclipse.wst.doc.user/common.css" type="text/css" rel="stylesheet" />
-<title>Exporting connector projects to RAR files</title>
-</head>
-<body id="tjexprar"><a name="tjexprar"><!-- --></a>
-
-
-<h1 class="id_title">Exporting connector projects to RAR files</h1>
-
-
-
-<div class="id_taskbody"><p class="id_shortdesc">You can export a connector project to
-a RAR file in preparation for deploying it to a server.</p>
-
-<div class="id_context"> <p class="anchor_topictop" />
- <p>To
-export the contents of a connector project to a RAR file, complete the following
-steps:</p>
-</div>
-
-<ol class="id_steps">
-<li class="stepexpand"><span>In the Java™ EE perspective, click <span class="menucascade"><span class="uicontrol">File</span>
- > <span class="uicontrol">Export</span></span>.</span></li>
-
-<li class="stepexpand"><span>Under <span class="uicontrol">Select an export destination</span>, click <span class="menucascade">
-<span class="uicontrol">J2EE</span> > <span class="uicontrol">RAR file</span></span>,
-and then click <span class="uicontrol">Next</span>.</span></li>
-
-<li class="stepexpand"><span>In the <span class="uicontrol">Connector project</span> list, select the
-connector project to export.</span></li>
-
-<li class="stepexpand"><span>In the <span class="uicontrol">Destination</span> field, enter the full
-path and RAR file name where you want to export the connector project.</span>
-</li>
-
-<li class="stepexpand"><strong>Optional: </strong><span>To export source files, select the <span class="uicontrol">Export
-source files</span> check box.</span></li>
-
-<li class="stepexpand"><strong>Optional: </strong><span>If you are exporting to an existing RAR file
-and you do not want to be warned about overwriting it, select the <span class="uicontrol">Overwrite
-existing file</span> check box.</span></li>
-
-<li class="stepexpand"><span>Click <span class="uicontrol">Finish</span>.</span> The
-wizard exports the contents of the RAR project to the specified RAR file.
-</li>
-
-</ol>
-
-<div class="id_postreq"><p class="anchor_topicbottom" />
-</div>
-
-</div>
-
-<div>
-<div class="familylinks">
-<div class="parentlink"><strong>Parent topic:</strong> <a href="../topics/ph-importexport.html" title="These topics cover how to import files and projects into the workbench and export files and projects to disk.">Importing and exporting projects and files</a></div>
-</div>
-</div>
-
-</body>
-</html>
\ No newline at end of file
diff --git a/docs/org.eclipse.jst.j2ee.doc.user/topics/tjimpapp.dita b/docs/org.eclipse.jst.j2ee.doc.user/topics/tjimpapp.dita
deleted file mode 100644
index 78a47c1..0000000
--- a/docs/org.eclipse.jst.j2ee.doc.user/topics/tjimpapp.dita
+++ /dev/null
@@ -1,51 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<!--Arbortext, Inc., 1988-2006, v.4002-->
-<!DOCTYPE task PUBLIC "-//OASIS//DTD DITA Task//EN"
- "task.dtd">
-<task id="tjimpapp" xml:lang="en-us">
-<title outputclass="id_title">Importing an application client JAR file</title>
-<shortdesc outputclass="id_shortdesc">Application client projects are deployed
-as JAR files. You can import an application client project that has been deployed
-into a JAR file by using the Import wizard.</shortdesc>
-<prolog><metadata>
-<keywords><indexterm>application client projects<indexterm>importing</indexterm></indexterm>
-</keywords>
-</metadata></prolog>
-<taskbody outputclass="id_taskbody">
-<context outputclass="id_context"> <p outputclass="anchor_topictop"></p> <p>To
-import an application client JAR file using the wizard, complete the following
-steps:</p></context>
-<steps outputclass="id_steps">
-<step><cmd>In the <tm tmclass="special" tmowner="Sun Microsystems, Inc." tmtype="tm"
-trademark="Java">Java</tm> EE perspective, click <menucascade><uicontrol>File</uicontrol>
-<uicontrol>Import</uicontrol></menucascade>.</cmd></step>
-<step><cmd>Under <uicontrol>Select an import source</uicontrol>, click <menucascade>
-<uicontrol>J2EE</uicontrol><uicontrol>App Client JAR file</uicontrol></menucascade>.</cmd>
-</step>
-<step><cmd>In the <uicontrol>Application Client file</uicontrol> field, enter
-the location and name of the application client JAR file that you want to
-import.</cmd></step>
-<step><cmd>In the <uicontrol>Application Client project</uicontrol> field,
-type a new project name or accept the default project name. </cmd><info>The
-application client project will be created based on the version of the application
-client JAR file, and it will use the default location.</info></step>
-<step><cmd>In the <uicontrol>Target runtime</uicontrol> drop-down list, select
-the application server that you want to target for your development. This
-selection affects the run time settings by modifying the class path entries
-for the project.</cmd></step>
-<step importance="optional"><cmd>To add the new module to an enterprise application
-project, select the <uicontrol>Add project to an EAR</uicontrol> check box
-and then select an existing enterprise application project from the list or
-create a new one by clicking <uicontrol>New</uicontrol>.</cmd><info><note>If
-you type a new enterprise application project name, the enterprise application
-project will be created in the default location with the lowest compatible
-J2EE version based on the version of the project being created. If you want
-to specify a different version or a different location for the enterprise
-application, you must use the New Enterprise Application Project wizard.</note></info>
-</step>
-<step><cmd>Click <uicontrol>Finish</uicontrol> to import the application client
-JAR file.</cmd></step>
-</steps>
-<postreq outputclass="id_postreq"><p outputclass="anchor_topicbottom"></p></postreq>
-</taskbody>
-</task>
diff --git a/docs/org.eclipse.jst.j2ee.doc.user/topics/tjimpapp.html b/docs/org.eclipse.jst.j2ee.doc.user/topics/tjimpapp.html
deleted file mode 100644
index d008ac8..0000000
--- a/docs/org.eclipse.jst.j2ee.doc.user/topics/tjimpapp.html
+++ /dev/null
@@ -1,98 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?><!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.0 Transitional//EN" "http://www.w3.org/TR/xhtml1/DTD/xhtml1-transitional.dtd">
-<html lang="en-us" xml:lang="en-us">
-<head>
-<meta content="text/html; charset=utf-8" http-equiv="Content-Type" />
-<meta name="copyright" content="Copyright (c) 2000, 2009 IBM Corporation and others. All rights reserved. This program and the accompanying materials are made available under the terms of the Eclipse Public License v1.0 which accompanies this distribution, and is available at http://www.eclipse.org/legal/epl-v10.html. Contributors: IBM Corporation - initial API and implementation" />
-<meta name="DC.rights.owner" content="(C) Copyright 2000, 2009" />
-<meta content="public" name="security" />
-<meta content="index,follow" name="Robots" />
-<meta http-equiv="PICS-Label" content='(PICS-1.1 "http://www.icra.org/ratingsv02.html" l gen true r (cz 1 lz 1 nz 1 oz 1 vz 1) "http://www.rsac.org/ratingsv01.html" l gen true r (n 0 s 0 v 0 l 0) "http://www.classify.org/safesurf/" l gen true r (SS~~000 1))' />
-<meta content="task" name="DC.Type" />
-<meta name="DC.Title" content="Importing an application client JAR file" />
-<meta name="abstract" content="Application client projects are deployed as JAR files. You can import an application client project that has been deployed into a JAR file by using the Import wizard." />
-<meta name="description" content="Application client projects are deployed as JAR files. You can import an application client project that has been deployed into a JAR file by using the Import wizard." />
-<meta content="application client projects, importing" name="DC.subject" />
-<meta content="application client projects, importing" name="keywords" />
-<meta scheme="URI" name="DC.Relation" content="../topics/tjappproj.html" />
-<meta scheme="URI" name="DC.Relation" content="../topics/tjexpapp.html" />
-<meta scheme="URI" name="DC.Relation" content="../topics/cjarch.html" />
-<meta scheme="URI" name="DC.Relation" content="../topics/cjappcliproj.html" />
-<meta content="XHTML" name="DC.Format" />
-<meta content="tjimpapp" name="DC.Identifier" />
-<meta content="en-us" name="DC.Language" />
-<link href="../../org.eclipse.wst.doc.user/common.css" type="text/css" rel="stylesheet" />
-<title>Importing an application client JAR file</title>
-</head>
-<body id="tjimpapp"><a name="tjimpapp"><!-- --></a>
-
-
-<h1 class="id_title">Importing an application client JAR file</h1>
-
-
-
-<div class="id_taskbody"><p class="id_shortdesc">Application client projects are deployed
-as JAR files. You can import an application client project that has been deployed
-into a JAR file by using the Import wizard.</p>
-
-<div class="id_context"> <p class="anchor_topictop" />
- <p>To
-import an application client JAR file using the wizard, complete the following
-steps:</p>
-</div>
-
-<ol class="id_steps">
-<li class="stepexpand"><span>In the Java™ EE perspective, click <span class="menucascade"><span class="uicontrol">File</span>
- > <span class="uicontrol">Import</span></span>.</span></li>
-
-<li class="stepexpand"><span>Under <span class="uicontrol">Select an import source</span>, click <span class="menucascade">
-<span class="uicontrol">J2EE</span> > <span class="uicontrol">App Client JAR file</span></span>.</span>
-</li>
-
-<li class="stepexpand"><span>In the <span class="uicontrol">Application Client file</span> field, enter
-the location and name of the application client JAR file that you want to
-import.</span></li>
-
-<li class="stepexpand"><span>In the <span class="uicontrol">Application Client project</span> field,
-type a new project name or accept the default project name. </span> The
-application client project will be created based on the version of the application
-client JAR file, and it will use the default location.</li>
-
-<li class="stepexpand"><span>In the <span class="uicontrol">Target runtime</span> drop-down list, select
-the application server that you want to target for your development. This
-selection affects the run time settings by modifying the class path entries
-for the project.</span></li>
-
-<li class="stepexpand"><strong>Optional: </strong><span>To add the new module to an enterprise application
-project, select the <span class="uicontrol">Add project to an EAR</span> check box
-and then select an existing enterprise application project from the list or
-create a new one by clicking <span class="uicontrol">New</span>.</span> <div class="note"><span class="notetitle">Note:</span> If
-you type a new enterprise application project name, the enterprise application
-project will be created in the default location with the lowest compatible
-J2EE version based on the version of the project being created. If you want
-to specify a different version or a different location for the enterprise
-application, you must use the New Enterprise Application Project wizard.</div>
-
-</li>
-
-<li class="stepexpand"><span>Click <span class="uicontrol">Finish</span> to import the application client
-JAR file.</span></li>
-
-</ol>
-
-<div class="id_postreq"><p class="anchor_topicbottom" />
-</div>
-
-</div>
-
-<div><div class="relconcepts"><strong>Related concepts</strong><br />
-<div><a href="../topics/cjarch.html" title="The Java 2 Platform, Enterprise Edition (J2EE) provides a standard for developing multitier, enterprise applications.">J2EE architecture</a></div>
-<div><a href="../topics/cjappcliproj.html" title="Application client projects contain programs that run on networked client systems so the project can benefit from a server's tools.">Application client projects</a></div>
-</div>
-<div class="reltasks"><strong>Related tasks</strong><br />
-<div><a href="../topics/tjappproj.html" title="You can use a wizard to create a new application client project and add it to a new or existing enterprise application project.">Creating an application client project</a></div>
-<div><a href="../topics/tjexpapp.html" title="You can export an application client project as a JAR file.">Exporting an application client project</a></div>
-</div>
-</div>
-
-</body>
-</html>
\ No newline at end of file
diff --git a/docs/org.eclipse.jst.j2ee.doc.user/topics/tjimpear.dita b/docs/org.eclipse.jst.j2ee.doc.user/topics/tjimpear.dita
deleted file mode 100644
index cd6c4ae..0000000
--- a/docs/org.eclipse.jst.j2ee.doc.user/topics/tjimpear.dita
+++ /dev/null
@@ -1,51 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<!--Arbortext, Inc., 1988-2006, v.4002-->
-<!DOCTYPE task PUBLIC "-//OASIS//DTD DITA Task//EN"
- "task.dtd">
-<task id="tjimpear" xml:lang="en-us">
-<title outputclass="id_title">Importing an enterprise application EAR file</title>
-<shortdesc outputclass="id_shortdesc">Enterprise application projects are
-deployed into EAR files. You can import an enterprise application project
-by importing it from a deployed EAR file.</shortdesc>
-<prolog><metadata>
-<keywords><indexterm>EAR<indexterm>files<indexterm>importing</indexterm></indexterm></indexterm>
-<indexterm>enterprise applications<indexterm>projects<indexterm>importing</indexterm></indexterm></indexterm>
-</keywords>
-</metadata></prolog>
-<taskbody outputclass="id_taskbody">
-<context outputclass="id_context"> <p outputclass="anchor_topictop"></p> <p>You
-can also choose to import utility JAR files as utility <tm tmclass="special"
-tmowner="Sun Microsystems, Inc." tmtype="tm" trademark="Java">Java</tm> projects.
-You can also use the wizard to change the new project names for the EAR file
-and modules that will be imported.</p><p>To import an EAR file using the wizard,
-complete the following steps:</p></context>
-<steps outputclass="id_steps">
-<step><cmd>In the <tm tmclass="special" tmowner="Sun Microsystems, Inc." tmtype="tm"
-trademark="Java">Java</tm> EE perspective, click <menucascade><uicontrol>File</uicontrol>
-<uicontrol>Import</uicontrol></menucascade>.</cmd></step>
-<step><cmd>Under <uicontrol>Select an import source</uicontrol>, click <menucascade>
-<uicontrol>J2EE</uicontrol><uicontrol>EAR file</uicontrol></menucascade> and
-click <uicontrol>Next</uicontrol>.</cmd></step>
-<step><cmd>In the <uicontrol>EAR file</uicontrol> field, enter the location
-and name of the application client JAR file that you want to import. </cmd>
-</step>
-<step><cmd>In the <uicontrol>EAR project</uicontrol> field, accept the default
-project name or type a new project name. </cmd></step>
-<step><cmd>In the <uicontrol>Target runtime</uicontrol> drop-down list, select
-the application server that you want to target for your development.</cmd>
-<info>This selection affects the run time settings by modifying the class
-path entries for the project. Click <uicontrol>Next</uicontrol>.</info></step>
-<step><cmd>Select any utility JAR files from the project that you want to
-import as utility projects.</cmd></step>
-<step><cmd>In the <uicontrol>Module Root Location</uicontrol> field, specify
-the root directory for all of the projects that will be imported or created
-during import, and click <uicontrol>Next</uicontrol>.</cmd></step>
-<step><cmd>On the EAR Module and Utility JAR Projects page, select the projects
-that you want to import with the EAR file. You can edit the new project name
-for each module and utility project to be imported.</cmd><info></info></step>
-<step><cmd>Click <uicontrol>Finish</uicontrol> to import the contents of the
-EAR file.</cmd></step>
-</steps>
-<postreq outputclass="id_postreq"><p outputclass="anchor_topicbottom"></p></postreq>
-</taskbody>
-</task>
diff --git a/docs/org.eclipse.jst.j2ee.doc.user/topics/tjimpear.html b/docs/org.eclipse.jst.j2ee.doc.user/topics/tjimpear.html
deleted file mode 100644
index 7780a5a..0000000
--- a/docs/org.eclipse.jst.j2ee.doc.user/topics/tjimpear.html
+++ /dev/null
@@ -1,102 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?><!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.0 Transitional//EN" "http://www.w3.org/TR/xhtml1/DTD/xhtml1-transitional.dtd">
-<html lang="en-us" xml:lang="en-us">
-<head>
-<meta content="text/html; charset=utf-8" http-equiv="Content-Type" />
-<meta name="copyright" content="Copyright (c) 2000, 2009 IBM Corporation and others. All rights reserved. This program and the accompanying materials are made available under the terms of the Eclipse Public License v1.0 which accompanies this distribution, and is available at http://www.eclipse.org/legal/epl-v10.html. Contributors: IBM Corporation - initial API and implementation" />
-<meta name="DC.rights.owner" content="(C) Copyright 2000, 2009" />
-<meta content="public" name="security" />
-<meta content="index,follow" name="Robots" />
-<meta http-equiv="PICS-Label" content='(PICS-1.1 "http://www.icra.org/ratingsv02.html" l gen true r (cz 1 lz 1 nz 1 oz 1 vz 1) "http://www.rsac.org/ratingsv01.html" l gen true r (n 0 s 0 v 0 l 0) "http://www.classify.org/safesurf/" l gen true r (SS~~000 1))' />
-<meta content="task" name="DC.Type" />
-<meta name="DC.Title" content="Importing an enterprise application EAR file" />
-<meta name="abstract" content="Enterprise application projects are deployed into EAR files. You can import an enterprise application project by importing it from a deployed EAR file." />
-<meta name="description" content="Enterprise application projects are deployed into EAR files. You can import an enterprise application project by importing it from a deployed EAR file." />
-<meta content="EAR, files, importing, enterprise applications, projects" name="DC.subject" />
-<meta content="EAR, files, importing, enterprise applications, projects" name="keywords" />
-<meta scheme="URI" name="DC.Relation" content="../topics/tjear.html" />
-<meta scheme="URI" name="DC.Relation" content="../topics/tjexpear.html" />
-<meta scheme="URI" name="DC.Relation" content="../topics/cjarch.html" />
-<meta scheme="URI" name="DC.Relation" content="../topics/cjearproj.html" />
-<meta scheme="URI" name="DC.Relation" content="../topics/tjcircleb.html" />
-<meta scheme="URI" name="DC.Relation" content="../topics/cjcircle.html" />
-<meta content="XHTML" name="DC.Format" />
-<meta content="tjimpear" name="DC.Identifier" />
-<meta content="en-us" name="DC.Language" />
-<link href="../../org.eclipse.wst.doc.user/common.css" type="text/css" rel="stylesheet" />
-<title>Importing an enterprise application EAR file</title>
-</head>
-<body id="tjimpear"><a name="tjimpear"><!-- --></a>
-
-
-<h1 class="id_title">Importing an enterprise application EAR file</h1>
-
-
-
-<div class="id_taskbody"><p class="id_shortdesc">Enterprise application projects are
-deployed into EAR files. You can import an enterprise application project
-by importing it from a deployed EAR file.</p>
-
-<div class="id_context"> <p class="anchor_topictop" />
- <p>You
-can also choose to import utility JAR files as utility Java™ projects.
-You can also use the wizard to change the new project names for the EAR file
-and modules that will be imported.</p>
-<p>To import an EAR file using the wizard,
-complete the following steps:</p>
-</div>
-
-<ol class="id_steps">
-<li class="stepexpand"><span>In the Java EE perspective, click <span class="menucascade"><span class="uicontrol">File</span>
- > <span class="uicontrol">Import</span></span>.</span></li>
-
-<li class="stepexpand"><span>Under <span class="uicontrol">Select an import source</span>, click <span class="menucascade">
-<span class="uicontrol">J2EE</span> > <span class="uicontrol">EAR file</span></span> and
-click <span class="uicontrol">Next</span>.</span></li>
-
-<li class="stepexpand"><span>In the <span class="uicontrol">EAR file</span> field, enter the location
-and name of the application client JAR file that you want to import. </span>
-</li>
-
-<li class="stepexpand"><span>In the <span class="uicontrol">EAR project</span> field, accept the default
-project name or type a new project name. </span></li>
-
-<li class="stepexpand"><span>In the <span class="uicontrol">Target runtime</span> drop-down list, select
-the application server that you want to target for your development.</span>
- This selection affects the run time settings by modifying the class
-path entries for the project. Click <span class="uicontrol">Next</span>.</li>
-
-<li class="stepexpand"><span>Select any utility JAR files from the project that you want to
-import as utility projects.</span></li>
-
-<li class="stepexpand"><span>In the <span class="uicontrol">Module Root Location</span> field, specify
-the root directory for all of the projects that will be imported or created
-during import, and click <span class="uicontrol">Next</span>.</span></li>
-
-<li class="stepexpand"><span>On the EAR Module and Utility JAR Projects page, select the projects
-that you want to import with the EAR file. You can edit the new project name
-for each module and utility project to be imported.</span> </li>
-
-<li class="stepexpand"><span>Click <span class="uicontrol">Finish</span> to import the contents of the
-EAR file.</span></li>
-
-</ol>
-
-<div class="id_postreq"><p class="anchor_topicbottom" />
-</div>
-
-</div>
-
-<div><div class="relconcepts"><strong>Related concepts</strong><br />
-<div><a href="../topics/cjarch.html" title="The Java 2 Platform, Enterprise Edition (J2EE) provides a standard for developing multitier, enterprise applications.">J2EE architecture</a></div>
-<div><a href="../topics/cjearproj.html" title="An enterprise application project ties together the resources that are required to deploy a J2EE enterprise application.">Enterprise application projects</a></div>
-<div><a href="../topics/cjcircle.html" title="A cyclical dependency between two or more modules in an enterprise application most commonly occurs when projects are imported from outside the Workbench.">Cyclical dependencies between Java EE modules</a></div>
-</div>
-<div class="reltasks"><strong>Related tasks</strong><br />
-<div><a href="../topics/tjear.html" title="Using the wizard to create an enterprise application project allows you to package many web applications and modules in a project and deploy these modules as a J2EE enterprise application.">Creating an enterprise application project</a></div>
-<div><a href="../topics/tjexpear.html" title="Enterprise applications are deployed in the form of an EAR file. Use the Export wizard to export an enterprise application project into an EAR file for deployment.">Exporting an enterprise application into an EAR file</a></div>
-<div><a href="../topics/tjcircleb.html" title="You can resolve cyclical dependencies after an EAR is imported.">Correcting cyclical dependencies after an EAR is imported</a></div>
-</div>
-</div>
-
-</body>
-</html>
\ No newline at end of file
diff --git a/docs/org.eclipse.jst.j2ee.doc.user/topics/tjimprar.dita b/docs/org.eclipse.jst.j2ee.doc.user/topics/tjimprar.dita
deleted file mode 100644
index 5d9a294..0000000
--- a/docs/org.eclipse.jst.j2ee.doc.user/topics/tjimprar.dita
+++ /dev/null
@@ -1,55 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<!--Arbortext, Inc., 1988-2006, v.4002-->
-<!DOCTYPE task PUBLIC "-//OASIS//DTD DITA Task//EN"
- "task.dtd">
-<task id="tjimprar" xml:lang="en-us">
-<title outputclass="id_title">Importing a connector project RAR file</title>
-<shortdesc outputclass="id_shortdesc">Connector projects are deployed into
-RAR files. You can import a connector project by importing a deployed RAR
-file.</shortdesc>
-<prolog><metadata>
-<keywords><indexterm>connector projects<indexterm>importing</indexterm></indexterm>
-<indexterm>RAR files<indexterm>importing</indexterm></indexterm></keywords>
-</metadata></prolog>
-<taskbody outputclass="id_taskbody">
-<context outputclass="id_context"><p outputclass="anchor_topictop"></p> <p>To
-import a connector project RAR file using the wizard, complete the following
-steps:</p></context>
-<steps outputclass="id_steps">
-<step><cmd>In the <tm tmclass="special" tmowner="Sun Microsystems, Inc." tmtype="tm"
-trademark="Java">Java</tm> EE perspective, click <menucascade><uicontrol>File</uicontrol>
-<uicontrol>Import</uicontrol></menucascade>.</cmd></step>
-<step><cmd>Under <uicontrol>Select an import source</uicontrol>, click <menucascade>
-<uicontrol>J2EE</uicontrol><uicontrol>RAR file</uicontrol></menucascade>.</cmd>
-</step>
-<step><cmd>In the <uicontrol>Connector file</uicontrol> field, enter the full
-path and name of the connector RAR file that you want to import. </cmd></step>
-<step><cmd>In the <uicontrol>Connector module</uicontrol> combination box,
-type a new project name or select a connector project from the drop-down list. </cmd>
-<info>If you type a new project name in this field, the connector project
-will be created based on the version of the connector RAR file, and it will
-use the default location.</info></step>
-<step><cmd>In the <uicontrol>Target runtime</uicontrol> drop-down list, select
-the application server that you want to target for your development. </cmd>
-<info>This selection affects the run-time settings by modifying the class
-path entries for the project.</info></step>
-<step importance="optional"><cmd>To add the new module to an enterprise application
-project, select the <uicontrol>Add project to an EAR</uicontrol> check box
-and then select an existing enterprise application project from the list
-or create a new one by clicking <uicontrol>New</uicontrol>.</cmd></step>
-<step><cmd>In the <uicontrol>EAR application</uicontrol> combination box,
-type a new project name or select an existing enterprise application project
-from the drop-down list. Or, click the <uicontrol>New</uicontrol> button to
-launch the New Enterprise Application Project wizard.</cmd><info><note>If
-you type a new enterprise application project name, the enterprise application
- project will be created in the default location with the lowest compatible
-J2EE version based on the version of the project being created. If you want
-to specify a different version or a different location for the enterprise
-application, you must use the New Enterprise Application Project wizard.</note></info>
-</step>
-<step><cmd>Click <uicontrol>Finish</uicontrol> to import the connector RAR
-file.</cmd></step>
-</steps>
-<postreq outputclass="id_postreq"><p outputclass="anchor_topicbottom"></p></postreq>
-</taskbody>
-</task>
diff --git a/docs/org.eclipse.jst.j2ee.doc.user/topics/tjimprar.html b/docs/org.eclipse.jst.j2ee.doc.user/topics/tjimprar.html
deleted file mode 100644
index 4ee6346..0000000
--- a/docs/org.eclipse.jst.j2ee.doc.user/topics/tjimprar.html
+++ /dev/null
@@ -1,96 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?><!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.0 Transitional//EN" "http://www.w3.org/TR/xhtml1/DTD/xhtml1-transitional.dtd">
-<html lang="en-us" xml:lang="en-us">
-<head>
-<meta content="text/html; charset=utf-8" http-equiv="Content-Type" />
-<meta name="copyright" content="Copyright (c) 2000, 2009 IBM Corporation and others. All rights reserved. This program and the accompanying materials are made available under the terms of the Eclipse Public License v1.0 which accompanies this distribution, and is available at http://www.eclipse.org/legal/epl-v10.html. Contributors: IBM Corporation - initial API and implementation" />
-<meta name="DC.rights.owner" content="(C) Copyright 2000, 2009" />
-<meta content="public" name="security" />
-<meta content="index,follow" name="Robots" />
-<meta http-equiv="PICS-Label" content='(PICS-1.1 "http://www.icra.org/ratingsv02.html" l gen true r (cz 1 lz 1 nz 1 oz 1 vz 1) "http://www.rsac.org/ratingsv01.html" l gen true r (n 0 s 0 v 0 l 0) "http://www.classify.org/safesurf/" l gen true r (SS~~000 1))' />
-<meta content="task" name="DC.Type" />
-<meta name="DC.Title" content="Importing a connector project RAR file" />
-<meta name="abstract" content="Connector projects are deployed into RAR files. You can import a connector project by importing a deployed RAR file." />
-<meta name="description" content="Connector projects are deployed into RAR files. You can import a connector project by importing a deployed RAR file." />
-<meta content="connector projects, importing, RAR files" name="DC.subject" />
-<meta content="connector projects, importing, RAR files" name="keywords" />
-<meta scheme="URI" name="DC.Relation" content="../topics/ph-importexport.html" />
-<meta content="XHTML" name="DC.Format" />
-<meta content="tjimprar" name="DC.Identifier" />
-<meta content="en-us" name="DC.Language" />
-<link href="../../org.eclipse.wst.doc.user/common.css" type="text/css" rel="stylesheet" />
-<title>Importing a connector project RAR file</title>
-</head>
-<body id="tjimprar"><a name="tjimprar"><!-- --></a>
-
-
-<h1 class="id_title">Importing a connector project RAR file</h1>
-
-
-
-<div class="id_taskbody"><p class="id_shortdesc">Connector projects are deployed into
-RAR files. You can import a connector project by importing a deployed RAR
-file.</p>
-
-<div class="id_context"><p class="anchor_topictop" />
- <p>To
-import a connector project RAR file using the wizard, complete the following
-steps:</p>
-</div>
-
-<ol class="id_steps">
-<li class="stepexpand"><span>In the Java™ EE perspective, click <span class="menucascade"><span class="uicontrol">File</span>
- > <span class="uicontrol">Import</span></span>.</span></li>
-
-<li class="stepexpand"><span>Under <span class="uicontrol">Select an import source</span>, click <span class="menucascade">
-<span class="uicontrol">J2EE</span> > <span class="uicontrol">RAR file</span></span>.</span>
-</li>
-
-<li class="stepexpand"><span>In the <span class="uicontrol">Connector file</span> field, enter the full
-path and name of the connector RAR file that you want to import. </span></li>
-
-<li class="stepexpand"><span>In the <span class="uicontrol">Connector module</span> combination box,
-type a new project name or select a connector project from the drop-down list. </span>
- If you type a new project name in this field, the connector project
-will be created based on the version of the connector RAR file, and it will
-use the default location.</li>
-
-<li class="stepexpand"><span>In the <span class="uicontrol">Target runtime</span> drop-down list, select
-the application server that you want to target for your development. </span>
- This selection affects the run-time settings by modifying the class
-path entries for the project.</li>
-
-<li class="stepexpand"><strong>Optional: </strong><span>To add the new module to an enterprise application
-project, select the <span class="uicontrol">Add project to an EAR</span> check box
-and then select an existing enterprise application project from the list
-or create a new one by clicking <span class="uicontrol">New</span>.</span></li>
-
-<li class="stepexpand"><span>In the <span class="uicontrol">EAR application</span> combination box,
-type a new project name or select an existing enterprise application project
-from the drop-down list. Or, click the <span class="uicontrol">New</span> button to
-launch the New Enterprise Application Project wizard.</span> <div class="note"><span class="notetitle">Note:</span> If
-you type a new enterprise application project name, the enterprise application
- project will be created in the default location with the lowest compatible
-J2EE version based on the version of the project being created. If you want
-to specify a different version or a different location for the enterprise
-application, you must use the New Enterprise Application Project wizard.</div>
-
-</li>
-
-<li class="stepexpand"><span>Click <span class="uicontrol">Finish</span> to import the connector RAR
-file.</span></li>
-
-</ol>
-
-<div class="id_postreq"><p class="anchor_topicbottom" />
-</div>
-
-</div>
-
-<div>
-<div class="familylinks">
-<div class="parentlink"><strong>Parent topic:</strong> <a href="../topics/ph-importexport.html" title="These topics cover how to import files and projects into the workbench and export files and projects to disk.">Importing and exporting projects and files</a></div>
-</div>
-</div>
-
-</body>
-</html>
\ No newline at end of file
diff --git a/docs/org.eclipse.jst.j2ee.doc.user/topics/tjrar.dita b/docs/org.eclipse.jst.j2ee.doc.user/topics/tjrar.dita
deleted file mode 100644
index 861366d..0000000
--- a/docs/org.eclipse.jst.j2ee.doc.user/topics/tjrar.dita
+++ /dev/null
@@ -1,73 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<!--Arbortext, Inc., 1988-2006, v.4002-->
-<!DOCTYPE task PUBLIC "-//OASIS//DTD DITA Task//EN"
- "task.dtd">
-<task id="tjrar" xml:lang="en-us">
-<title outputclass="id_title">Creating a connector project</title>
-<shortdesc outputclass="id_shortdesc">A connector is a J2EE standard extension
-mechanism for containers to provide connectivity to enterprise information
-systems (EISs).</shortdesc>
-<prolog><metadata>
-<keywords><indexterm>connector projects<indexterm>creating</indexterm></indexterm>
-</keywords>
-</metadata></prolog>
-<taskbody outputclass="id_taskbody">
-<context outputclass="id_context"> <p outputclass="anchor_topictop"></p> <p>A
-connector is specific to an EIS and consists of a resource adapter and application
-development tools. A resource adapter is a system-level software driver that
-is used by an EJB container or an application client to connect to an EIS.
-Connectors comply with the J2EE Connector architecture (JCA).</p><p>Like the
-other types of projects, connector projects can contain one or more project
-facets, which represent units of functionality in the project. A new connector
-project should have the J2C Module facet. Depending on what you want to use
-the project for, you may want to enable other facets for the project.</p><note
-type="restriction">J2EE 1.2 specification level does not include connector
-capability.</note><p>To create a new connector project, complete the following
-steps:</p></context>
-<steps outputclass="id_steps">
-<step><cmd>In the <tm tmclass="special" tmowner="Sun Microsystems, Inc." tmtype="tm"
-trademark="Java">Java</tm> EE perspective, click <menucascade><uicontrol>File</uicontrol>
-<uicontrol>New</uicontrol><uicontrol>Project</uicontrol></menucascade>.</cmd>
-</step>
-<step><cmd>In the New Project Wizard, select <menucascade><uicontrol>J2EE</uicontrol>
-<uicontrol>Connector Project</uicontrol></menucascade> and click <uicontrol>Next</uicontrol>.</cmd>
-</step>
-<step><cmd>In the <uicontrol>Project Name</uicontrol> field, type a name for
-the connector project. </cmd></step>
-<step importance="optional"><cmd>To change the default project location, clear
-the <uicontrol>Use default</uicontrol> check box under <uicontrol>Project
-contents</uicontrol> and select a new location with the <uicontrol>Browse</uicontrol> button.</cmd>
-<info>If you specify a non-default project location that is already being
-used by another project, the project creation will fail.<note>If you type
-a new EAR project name, the EAR project will be created in the default location
-with the lowest compatible J2EE version based on the version of the project
-being created. If you want to specify a different version or a different location
-for the enterprise application, you must use the New Enterprise Application
-Project wizard.</note></info></step>
-<step importance="optional"><cmd>If you want to add the new project to an
-enterprise application project, select the <uicontrol>Add project to an EAR</uicontrol> check
-box and select a project in the <uicontrol>EAR Project Name</uicontrol> list.</cmd>
-<info>If you choose to add the project to an existing EAR project, the <uicontrol>Target
-runtime</uicontrol> field becomes disabled because the target runtime for
-the new project will be the same as that of the EAR project.</info></step>
-<step><cmd>In the <uicontrol>Target runtime</uicontrol> field, select the
-target runtime for the project.</cmd></step>
-<step importance="optional"><cmd>To use a predefined configuration for your
-project, select a configuration in the <uicontrol>Configuration</uicontrol> list.
-You can click the <uicontrol>Modify</uicontrol> button to do the following:</cmd>
-<info><ul>
-<li>Customize project facets. Select the check boxes next to the facets you
-want the project to have and select a version number for each facet. Select
-a facet name to see more information about that facet in the <uicontrol>Details</uicontrol> tab.
-You can also choose a preset combination of facets from the <uicontrol>Configurations</uicontrol> list.</li>
-<li>Limit your project to be compatible with one or more runtimes. Click the <uicontrol>Show
-Runtimes</uicontrol> tab and select the runtimes that you want the project
-to be compatible with. </li>
-</ul>Click <uicontrol>Next</uicontrol>.</info></step>
-<step><cmd>In the <uicontrol>Source Folder</uicontrol> field, enter the name
-of the folder to use for source code.</cmd></step>
-<step><cmd>Click <uicontrol>Finish</uicontrol>.</cmd></step>
-</steps>
-<postreq outputclass="id_postreq"><p outputclass="anchor_topicbottom"></p></postreq>
-</taskbody>
-</task>
diff --git a/docs/org.eclipse.jst.j2ee.doc.user/topics/tjrar.html b/docs/org.eclipse.jst.j2ee.doc.user/topics/tjrar.html
deleted file mode 100644
index 3578349..0000000
--- a/docs/org.eclipse.jst.j2ee.doc.user/topics/tjrar.html
+++ /dev/null
@@ -1,121 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?><!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.0 Transitional//EN" "http://www.w3.org/TR/xhtml1/DTD/xhtml1-transitional.dtd">
-<html lang="en-us" xml:lang="en-us">
-<head>
-<meta content="text/html; charset=utf-8" http-equiv="Content-Type" />
-<meta name="copyright" content="Copyright (c) 2000, 2009 IBM Corporation and others. All rights reserved. This program and the accompanying materials are made available under the terms of the Eclipse Public License v1.0 which accompanies this distribution, and is available at http://www.eclipse.org/legal/epl-v10.html. Contributors: IBM Corporation - initial API and implementation" />
-<meta name="DC.rights.owner" content="(C) Copyright 2000, 2009" />
-<meta content="public" name="security" />
-<meta content="index,follow" name="Robots" />
-<meta http-equiv="PICS-Label" content='(PICS-1.1 "http://www.icra.org/ratingsv02.html" l gen true r (cz 1 lz 1 nz 1 oz 1 vz 1) "http://www.rsac.org/ratingsv01.html" l gen true r (n 0 s 0 v 0 l 0) "http://www.classify.org/safesurf/" l gen true r (SS~~000 1))' />
-<meta content="task" name="DC.Type" />
-<meta name="DC.Title" content="Creating a connector project" />
-<meta name="abstract" content="A connector is a J2EE standard extension mechanism for containers to provide connectivity to enterprise information systems (EISs)." />
-<meta name="description" content="A connector is a J2EE standard extension mechanism for containers to provide connectivity to enterprise information systems (EISs)." />
-<meta content="connector projects, creating" name="DC.subject" />
-<meta content="connector projects, creating" name="keywords" />
-<meta scheme="URI" name="DC.Relation" content="../topics/cjearproj.html" />
-<meta scheme="URI" name="DC.Relation" content="../topics/cfacets.html" />
-<meta content="XHTML" name="DC.Format" />
-<meta content="tjrar" name="DC.Identifier" />
-<meta content="en-us" name="DC.Language" />
-<link href="../../org.eclipse.wst.doc.user/common.css" type="text/css" rel="stylesheet" />
-<title>Creating a connector project</title>
-</head>
-<body id="tjrar"><a name="tjrar"><!-- --></a>
-
-
-<h1 class="id_title">Creating a connector project</h1>
-
-
-
-<div class="id_taskbody"><p class="id_shortdesc">A connector is a J2EE standard extension
-mechanism for containers to provide connectivity to enterprise information
-systems (EISs).</p>
-
-<div class="id_context"> <p class="anchor_topictop" />
- <p>A
-connector is specific to an EIS and consists of a resource adapter and application
-development tools. A resource adapter is a system-level software driver that
-is used by an EJB container or an application client to connect to an EIS.
-Connectors comply with the J2EE Connector architecture (JCA).</p>
-<p>Like the
-other types of projects, connector projects can contain one or more project
-facets, which represent units of functionality in the project. A new connector
-project should have the J2C Module facet. Depending on what you want to use
-the project for, you may want to enable other facets for the project.</p>
-<div class="restriction"><span class="restrictiontitle">Restriction:</span> J2EE 1.2 specification level does not include connector
-capability.</div>
-<p>To create a new connector project, complete the following
-steps:</p>
-</div>
-
-<ol class="id_steps">
-<li class="stepexpand"><span>In the Java™ EE perspective, click <span class="menucascade"><span class="uicontrol">File</span>
- > <span class="uicontrol">New</span> > <span class="uicontrol">Project</span></span>.</span>
-</li>
-
-<li class="stepexpand"><span>In the New Project Wizard, select <span class="menucascade"><span class="uicontrol">J2EE</span>
- > <span class="uicontrol">Connector Project</span></span> and click <span class="uicontrol">Next</span>.</span>
-</li>
-
-<li class="stepexpand"><span>In the <span class="uicontrol">Project Name</span> field, type a name for
-the connector project. </span></li>
-
-<li class="stepexpand"><strong>Optional: </strong><span>To change the default project location, clear
-the <span class="uicontrol">Use default</span> check box under <span class="uicontrol">Project
-contents</span> and select a new location with the <span class="uicontrol">Browse</span> button.</span>
- If you specify a non-default project location that is already being
-used by another project, the project creation will fail.<div class="note"><span class="notetitle">Note:</span> If you type
-a new EAR project name, the EAR project will be created in the default location
-with the lowest compatible J2EE version based on the version of the project
-being created. If you want to specify a different version or a different location
-for the enterprise application, you must use the New Enterprise Application
-Project wizard.</div>
-</li>
-
-<li class="stepexpand"><strong>Optional: </strong><span>If you want to add the new project to an
-enterprise application project, select the <span class="uicontrol">Add project to an EAR</span> check
-box and select a project in the <span class="uicontrol">EAR Project Name</span> list.</span>
- If you choose to add the project to an existing EAR project, the <span class="uicontrol">Target
-runtime</span> field becomes disabled because the target runtime for
-the new project will be the same as that of the EAR project.</li>
-
-<li class="stepexpand"><span>In the <span class="uicontrol">Target runtime</span> field, select the
-target runtime for the project.</span></li>
-
-<li class="stepexpand"><strong>Optional: </strong><span>To use a predefined configuration for your
-project, select a configuration in the <span class="uicontrol">Configuration</span> list.
-You can click the <span class="uicontrol">Modify</span> button to do the following:</span>
- <ul>
-<li>Customize project facets. Select the check boxes next to the facets you
-want the project to have and select a version number for each facet. Select
-a facet name to see more information about that facet in the <span class="uicontrol">Details</span> tab.
-You can also choose a preset combination of facets from the <span class="uicontrol">Configurations</span> list.</li>
-
-<li>Limit your project to be compatible with one or more runtimes. Click the <span class="uicontrol">Show
-Runtimes</span> tab and select the runtimes that you want the project
-to be compatible with. </li>
-
-</ul>
-Click <span class="uicontrol">Next</span>.</li>
-
-<li class="stepexpand"><span>In the <span class="uicontrol">Source Folder</span> field, enter the name
-of the folder to use for source code.</span></li>
-
-<li class="stepexpand"><span>Click <span class="uicontrol">Finish</span>.</span></li>
-
-</ol>
-
-<div class="id_postreq"><p class="anchor_topicbottom" />
-</div>
-
-</div>
-
-<div><div class="relconcepts"><strong>Related concepts</strong><br />
-<div><a href="../topics/cjearproj.html" title="An enterprise application project ties together the resources that are required to deploy a J2EE enterprise application.">Enterprise application projects</a></div>
-<div><a href="../topics/cfacets.html" title="Facets define characteristics and requirements for Java EE projects and are used as part of the runtime configuration.">Project facets</a></div>
-</div>
-</div>
-
-</body>
-</html>
\ No newline at end of file
diff --git a/docs/org.eclipse.jst.j2ee.doc.user/topics/tjtargetserver.dita b/docs/org.eclipse.jst.j2ee.doc.user/topics/tjtargetserver.dita
deleted file mode 100644
index 1d02691..0000000
--- a/docs/org.eclipse.jst.j2ee.doc.user/topics/tjtargetserver.dita
+++ /dev/null
@@ -1,94 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!--Arbortext, Inc., 1988-2009, v.4002-->
-<!DOCTYPE task PUBLIC "-//OASIS//DTD DITA Task//EN"
- "task.dtd">
-<task id="tjtargetserver" xml:lang="en-us">
-<title outputclass="id_title">Specifying target servers for J2EE projects</title>
-<shortdesc outputclass="id_shortdesc">When you develop J2EE applications,
-you can specify the server runtime environments for your J2EE projects.
-The target server is specified during project creation and import,
-and it can be changed in the project properties. The target server
-setting is the default mechanism for setting the class path for J2EE
-projects.</shortdesc>
-<prolog><metadata>
-<keywords><indexterm>J2EE<indexterm>target servers</indexterm></indexterm>
-<indexterm>projects<indexterm>target servers</indexterm></indexterm>
-<indexterm>target servers<indexterm>J2EE applications</indexterm></indexterm>
-</keywords>
-</metadata></prolog>
-<taskbody outputclass="id_taskbody">
-<context outputclass="id_context"><p outputclass="anchor_topictop"></p> <p>In
-order to support different application servers that use different
-JDK levels for their <tm tmclass="special"
-tmowner="Sun Microsystems, Inc." tmtype="tm" trademark="Java">Java</tm> Runtime
-Environment (JRE), the workbench prompts you for a target server setting
-for each J2EE project. For example, if you want to take advantage
-of the features of JDK 1.4.2, your applications require different
-class path entries than those that were used in previous versions
-of the workbench. By prompting you to specify a target server, the
-workbench enforces that proper entries are added for running on the
-server you choose.</p><p>You can also add more than one target server
-for your project. In this case, the workbench prevents you from adding
-any facets not supported by all of the target servers. If you add
-more than one target server, choose a server that will contribute
-to the project's class path as the primary server.</p><p>When the
-project is created, the class path of the project is updated with
-two class path containers. One container is the JDK container and
-the other is the server container. The JDK container points to the
-directory that contains the JAR files that are necessary to support
-the JDK version. The server container points to the directory that
-contains the multiple public JAR files available in the selected server.
-The project then compiles based on the required JAR files located
-in these folders, and you do not need to worry about adding additional
-JAR files from the server during development. When the project is
-compiled, the JAR files are included in the class path. You can still
-add your own JAR files to the class path.</p><p>The target runtime
-environment is specified in the org.eclipse.wst.common.project.facet.core.xml
-file in the project's .settings folder. You should not edit this file
-manually; instead, use the properties window as described in this
-topic.</p><p>All J2EE project creation and import wizards prompt you
-to specify the target server for the resulting projects. The list
-of target servers that you can choose from is filtered based on installed
-runtimes, the J2EE level of the application, and the J2EE module type.
-For example, for EJB projects only application servers that support
-Enterprise <tm tmclass="special" tmowner="Sun Microsystems, Inc."
-tmtype="tm" trademark="JavaBeans">JavaBeans</tm> are displayed. All
-projects inside a single EAR file must be targeted to the same server.
-If you create a new project and add it to an existing EAR project
-during creation, the project inherits the target server setting of
-the EAR project.</p><note>Utility <tm tmclass="special"
-tmowner="Sun Microsystems, Inc." tmtype="tm" trademark="Java">Java</tm> projects
-that are added to an application are targeted to the same target server
-as the application. Web library projects that are added to a Web project
-are targeted to the same target server as the Web project.</note><p>To
-modify the target runtime and default server for an existing project,
-complete the following steps:</p></context>
-<steps outputclass="id_steps">
-<step><cmd>In the Project Explorer view of the <tm tmclass="special"
-tmowner="Sun Microsystems, Inc." tmtype="tm" trademark="Java">Java</tm> EE
-perspective, right-click the enterprise application or module project,
-and select <uicontrol>Properties</uicontrol>.</cmd></step>
-<step><cmd>Select the <uicontrol>Targeted Runtimes</uicontrol> page
-in the Properties dialog.</cmd></step>
-<step><cmd>In the <uicontrol>Targeted Runtimes</uicontrol> list, select
-the check boxes next to each of the runtimes that you want to develop
-the project for. If you don't see the runtime that you want to use,
-you need to add it to the runtimes in the workbench. For more information,
-see <xref
-href="../../org.eclipse.wst.server.ui.doc.user/topics/twinstprf.dita"
-scope="peer">Defining the installed server runtime environments</xref>.</cmd>
-<info><note>Only the runtimes compatible with the project's facets
-are shown. You can select the <uicontrol>Show all runtimes</uicontrol> check
-box to display the runtimes not compatible with the project's current
-facet configuration. These runtimes are grayed out.</note></info></step>
-<step><cmd>To select the primary runtime, click on a runtime and then
-click the <uicontrol>Make Primary</uicontrol> button.</cmd><info>If
-you select any runtimes for the project, you must make one of those
-runtimes the primary runtime for the project. If you select only one
-runtime from the list, that runtime is automatically made the primary
-runtime. The primary runtime is shown in bold text.</info></step>
-<step><cmd>Click <uicontrol>OK</uicontrol>.</cmd></step>
-</steps>
-<postreq outputclass="id_postreq"><p outputclass="anchor_topicbottom"></p></postreq>
-</taskbody>
-</task>
diff --git a/docs/org.eclipse.jst.j2ee.doc.user/topics/tjtargetserver.html b/docs/org.eclipse.jst.j2ee.doc.user/topics/tjtargetserver.html
deleted file mode 100644
index dd91bf6..0000000
--- a/docs/org.eclipse.jst.j2ee.doc.user/topics/tjtargetserver.html
+++ /dev/null
@@ -1,127 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?><!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.0 Transitional//EN" "http://www.w3.org/TR/xhtml1/DTD/xhtml1-transitional.dtd">
-<html lang="en-us" xml:lang="en-us">
-<head>
-<meta content="text/html; charset=utf-8" http-equiv="Content-Type" />
-<meta name="copyright" content="Copyright (c) 2000, 2009 IBM Corporation and others. All rights reserved. This program and the accompanying materials are made available under the terms of the Eclipse Public License v1.0 which accompanies this distribution, and is available at http://www.eclipse.org/legal/epl-v10.html. Contributors: IBM Corporation - initial API and implementation" />
-<meta name="DC.rights.owner" content="(C) Copyright 2000, 2009" />
-<meta content="public" name="security" />
-<meta content="index,follow" name="Robots" />
-<meta http-equiv="PICS-Label" content='(PICS-1.1 "http://www.icra.org/ratingsv02.html" l gen true r (cz 1 lz 1 nz 1 oz 1 vz 1) "http://www.rsac.org/ratingsv01.html" l gen true r (n 0 s 0 v 0 l 0) "http://www.classify.org/safesurf/" l gen true r (SS~~000 1))' />
-<meta content="task" name="DC.Type" />
-<meta name="DC.Title" content="Specifying target servers for J2EE projects" />
-<meta name="abstract" content="When you develop J2EE applications, you can specify the server runtime environments for your J2EE projects. The target server is specified during project creation and import, and it can be changed in the project properties. The target server setting is the default mechanism for setting the class path for J2EE projects." />
-<meta name="description" content="When you develop J2EE applications, you can specify the server runtime environments for your J2EE projects. The target server is specified during project creation and import, and it can be changed in the project properties. The target server setting is the default mechanism for setting the class path for J2EE projects." />
-<meta content="J2EE, target servers, projects, target servers, J2EE applications" name="DC.subject" />
-<meta content="J2EE, target servers, projects, target servers, J2EE applications" name="keywords" />
-<meta scheme="URI" name="DC.Relation" content="../topics/cjarch.html" />
-<meta scheme="URI" name="DC.Relation" content="../../org.eclipse.wst.server.ui.doc.user/topics/twinstprf.html" />
-<meta content="XHTML" name="DC.Format" />
-<meta content="tjtargetserver" name="DC.Identifier" />
-<meta content="en-us" name="DC.Language" />
-<link href="../../org.eclipse.wst.doc.user/common.css" type="text/css" rel="stylesheet" />
-<title>Specifying target servers for J2EE projects</title>
-</head>
-<body id="tjtargetserver"><a name="tjtargetserver"><!-- --></a>
-
-
-<h1 class="id_title">Specifying target servers for J2EE projects</h1>
-
-
-
-<div class="id_taskbody"><p class="id_shortdesc">When you develop J2EE applications,
-you can specify the server runtime environments for your J2EE projects. The
-target server is specified during project creation and import, and it can
-be changed in the project properties. The target server setting is the default
-mechanism for setting the class path for J2EE projects.</p>
-
-<div class="id_context"><p class="anchor_topictop" />
- <p>In
-order to support different application servers that use different JDK levels
-for their Java™ Runtime Environment (JRE), the workbench prompts
-you for a target server setting for each J2EE project. For example, if you
-want to take advantage of the features of JDK 1.4.2, your applications require
-different class path entries than those that were used in previous versions
-of the workbench. By prompting you to specify a target server, the workbench
-enforces that proper entries are added for running on the server you choose.</p>
-<p>You
-can also add more than one target server for your project. In this case, the
-workbench prevents you from adding any facets not supported by all of the
-target servers. If you add more than one target server, choose a server that
-will contribute to the project's class path as the primary server.</p>
-<p>When
-the project is created, the class path of the project is updated with two
-class path containers. One container is the JDK container and the other is
-the server container. The JDK container points to the directory that contains
-the JAR files that are necessary to support the JDK version. The server container
-points to the directory that contains the multiple public JAR files available
-in the selected server. The project then compiles based on the required JAR
-files located in these folders, and you do not need to worry about adding
-additional JAR files from the server during development. When the project
-is compiled, the JAR files are included in the class path. You can still add
-your own JAR files to the class path.</p>
-<p>The target runtime environment
-is specified in the org.eclipse.wst.common.project.facet.core.xml file in
-the project's .settings folder. You should not edit this file manually; instead,
-use the properties window as described in this topic.</p>
-<p>All J2EE project
-creation and import wizards prompt you to specify the target server for the
-resulting projects. The list of target servers that you can choose from is
-filtered based on installed runtimes, the J2EE level of the application, and
-the J2EE module type. For example, for EJB projects only application servers
-that support Enterprise JavaBeans™ are displayed. All projects
-inside a single EAR file must be targeted to the same server. If you create
-a new project and add it to an existing EAR project during creation, the project
-inherits the target server setting of the EAR project.</p>
-<div class="note"><span class="notetitle">Note:</span> Utility Java projects
-that are added to an application are targeted to the same target server as
-the application. Web library projects that are added to a Web project are
-targeted to the same target server as the Web project.</div>
-<p>To modify
-the target runtime and default server for an existing project, complete the
-following steps:</p>
-</div>
-
-<ol class="id_steps">
-<li class="stepexpand"><span>In the Project Explorer view of the Java EE perspective, right-click the enterprise
-application or module project, and select <span class="uicontrol">Properties</span>.</span>
-</li>
-
-<li class="stepexpand"><span>Select the <span class="uicontrol">Targeted Runtimes</span> page in the
-Properties dialog.</span></li>
-
-<li class="stepexpand"><span>In the <span class="uicontrol">Targeted Runtimes</span> list, select the
-check boxes next to each of the runtimes that you want to develop the project
-for. If you don't see the runtime that you want to use, you need to add it
-to the runtimes in the workbench. For more information, see <a href="../../org.eclipse.wst.server.ui.doc.user/topics/twinstprf.html">Defining the installed server runtime environments</a>.</span> <div class="note"><span class="notetitle">Note:</span> Only the
-runtimes compatible with the project's facets are shown. You can select the <span class="uicontrol">Show
-all runtimes</span> check box to display the runtimes not compatible
-with the project's current facet configuration. These runtimes are grayed
-out.</div>
-</li>
-
-<li class="stepexpand"><span>To select the primary runtime, click on a runtime and then click
-the <span class="uicontrol">Make Primary</span> button.</span> If you select any
-runtimes for the project, you must make one of those runtimes the primary
-runtime for the project. If you select only one runtime from the list, that
-runtime is automatically made the primary runtime. The primary runtime is
-shown in bold text.</li>
-
-<li class="stepexpand"><span>Click <span class="uicontrol">OK</span>.</span></li>
-
-</ol>
-
-<div class="id_postreq"><p class="anchor_topicbottom" />
-</div>
-
-</div>
-
-<div><div class="relconcepts"><strong>Related concepts</strong><br />
-<div><a href="../topics/cjarch.html" title="The Java 2 Platform, Enterprise Edition (J2EE) provides a standard for developing multitier, enterprise applications.">J2EE architecture</a></div>
-</div>
-<div class="relinfo"><strong>Related information</strong><br />
-<div><a href="../../org.eclipse.wst.server.ui.doc.user/topics/twinstprf.html">Defining the installed server runtime environments</a></div>
-</div>
-</div>
-
-</body>
-</html>
\ No newline at end of file
diff --git a/docs/org.eclipse.jst.j2ee.doc.user/topics/tjval.dita b/docs/org.eclipse.jst.j2ee.doc.user/topics/tjval.dita
deleted file mode 100644
index d17be81..0000000
--- a/docs/org.eclipse.jst.j2ee.doc.user/topics/tjval.dita
+++ /dev/null
@@ -1,70 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<!--Arbortext, Inc., 1988-2006, v.4002-->
-<!DOCTYPE task PUBLIC "-//OASIS//DTD DITA Task//EN"
- "task.dtd">
-<task id="tjval" xml:lang="en-us">
-<title outputclass="id_title">Validating code in enterprise applications</title>
-<shortdesc outputclass="id_shortdesc">The workbench includes validators that
-check certain files in your enterprise application module projects for errors.</shortdesc>
-<prolog><metadata>
-<keywords><indexterm>build validation<indexterm>enabling</indexterm></indexterm>
-<indexterm>code validation<indexterm>overview</indexterm></indexterm><indexterm>validation<indexterm>overview</indexterm></indexterm>
-</keywords>
-</metadata></prolog>
-<taskbody outputclass="id_taskbody">
-<context outputclass="id_context"> <p outputclass="anchor_topictop"></p> <p>By
-default, the workbench validates your files automatically after any build,
-including automatic builds. You can also begin the validation process manually
-without building.</p><p>On the workbench Preferences window, you can enable
-or disable validators to be used on your projects. Also, you can enable or
-disable validators for each enterprise application module project individually
-on the Properties page for that project.</p><p>Each validator can apply to
-certain types of files, certain project natures, and certain project facets.
-When a validator applies to a project facet or nature, the workbench uses
-that validator only on projects that have that facet or nature. Likewise,
-most validators apply only to certain types of files, so the workbench uses
-those validators only on those types of files.</p><p>To validate your files,
-complete the following steps:</p></context>
-<steps outputclass="id_steps">
-<step><cmd>Click <menucascade><uicontrol>Window</uicontrol><uicontrol>Preferences</uicontrol>
-</menucascade> and select <uicontrol>Validation</uicontrol> in the left pane.</cmd>
-<stepresult>The Validation page of the Preferences window lists the validators
-available in your project and their settings.</stepresult></step>
-<step importance="optional"><cmd>Review the check box options available near
-the top of the window to customize your validation settings:</cmd>
-<choicetable>
-<chhead><choptionhd>Option</choptionhd><chdeschd>Description</chdeschd></chhead>
-<chrow><choption>Allow projects to override these preference settings</choption>
-<chdesc>Select to set individual validation settings for one or more of your
-projects.</chdesc></chrow>
-<chrow><choption>Suspend all validators</choption><chdesc>Select to prevent
-validation at the global level.</chdesc></chrow>
-<chrow><choption>Save all modified resources automatically prior to validating</choption>
-<chdesc>Select to save resources you have modified before the validation begins.</chdesc>
-</chrow><chrow><choption>Show a confirmation dialog when performing manual validation</choption>
-<chdesc>Select to show an informational dialog after a manual validation request has completed.</chdesc>
-</chrow>
-</choicetable>
-</step>
-<step><cmd>In the list of validators, select the check boxes next to each
-validator you want to use at the global level.</cmd><info>Each validator has
-a check box to specify whether it is used on manual validation and/or on build
-validation.</info></step>
-<step><cmd>Tune a validator by clicking
-the button in the <uicontrol>Settings</uicontrol> column.</cmd>
-<info>Not all validators have additional settings.</info></step>
-<step><cmd>Begin the validation process by one of the following methods:</cmd>
-<choices>
-<choice>Right-click a project and click <uicontrol>Validate</uicontrol>.</choice>
-<choice>Start a build.</choice>
-</choices>
-</step>
-</steps>
-<result outputclass="id_result">Any err<?Pub Caret?>ors found by the validators
-are listed in the Problems view.<p>If you want to set individual validation
-settings for one or more of your projects, see <xref href="tjvalglobalpref.dita"></xref> for
-more information.</p></result>
-<postreq outputclass="id_postreq"><p outputclass="anchor_topicbottom"></p></postreq>
-</taskbody>
-</task>
-<?Pub *0000003949?>
diff --git a/docs/org.eclipse.jst.j2ee.doc.user/topics/tjval.html b/docs/org.eclipse.jst.j2ee.doc.user/topics/tjval.html
deleted file mode 100644
index 178face..0000000
--- a/docs/org.eclipse.jst.j2ee.doc.user/topics/tjval.html
+++ /dev/null
@@ -1,132 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?><!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.0 Transitional//EN" "http://www.w3.org/TR/xhtml1/DTD/xhtml1-transitional.dtd">
-<html lang="en-us" xml:lang="en-us">
-<head>
-<meta content="text/html; charset=utf-8" http-equiv="Content-Type" />
-<meta name="copyright" content="Copyright (c) 2000, 2009 IBM Corporation and others. All rights reserved. This program and the accompanying materials are made available under the terms of the Eclipse Public License v1.0 which accompanies this distribution, and is available at http://www.eclipse.org/legal/epl-v10.html. Contributors: IBM Corporation - initial API and implementation" />
-<meta name="DC.rights.owner" content="(C) Copyright 2000, 2009" />
-<meta content="public" name="security" />
-<meta content="index,follow" name="Robots" />
-<meta http-equiv="PICS-Label" content='(PICS-1.1 "http://www.icra.org/ratingsv02.html" l gen true r (cz 1 lz 1 nz 1 oz 1 vz 1) "http://www.rsac.org/ratingsv01.html" l gen true r (n 0 s 0 v 0 l 0) "http://www.classify.org/safesurf/" l gen true r (SS~~000 1))' />
-<meta content="task" name="DC.Type" />
-<meta name="DC.Title" content="Validating code in enterprise applications" />
-<meta name="abstract" content="The workbench includes validators that check certain files in your enterprise application module projects for errors." />
-<meta name="description" content="The workbench includes validators that check certain files in your enterprise application module projects for errors." />
-<meta content="build validation, enabling, code validation, overview, validation" name="DC.subject" />
-<meta content="build validation, enabling, code validation, overview, validation" name="keywords" />
-<meta scheme="URI" name="DC.Relation" content="../topics/rvalerr.html" />
-<meta scheme="URI" name="DC.Relation" content="../topics/rvalidators.html" />
-<meta content="XHTML" name="DC.Format" />
-<meta content="tjval" name="DC.Identifier" />
-<meta content="en-us" name="DC.Language" />
-<link href="../../org.eclipse.wst.doc.user/common.css" type="text/css" rel="stylesheet" />
-<title>Validating code in enterprise applications</title>
-</head>
-<body id="tjval"><a name="tjval"><!-- --></a>
-
-
-<h1 class="id_title">Validating code in enterprise applications</h1>
-
-
-
-<div class="id_taskbody"><p class="id_shortdesc">The workbench includes validators that
-check certain files in your enterprise application module projects for errors.</p>
-
-<div class="id_context"> <p class="anchor_topictop" />
- <p>By
-default, the workbench validates your files automatically after any build,
-including automatic builds. You can also begin the validation process manually
-without building.</p>
-<p>On the workbench Preferences window, you can enable
-or disable validators to be used on your projects. Also, you can enable or
-disable validators for each enterprise application module project individually
-on the Properties page for that project.</p>
-<p>Each validator can apply to
-certain types of files, certain project natures, and certain project facets.
-When a validator applies to a project facet or nature, the workbench uses
-that validator only on projects that have that facet or nature. Likewise,
-most validators apply only to certain types of files, so the workbench uses
-those validators only on those types of files.</p>
-<p>To validate your files,
-complete the following steps:</p>
-</div>
-
-<ol class="id_steps">
-<li class="stepexpand"><span>Click <span class="menucascade"><span class="uicontrol">Window</span> > <span class="uicontrol">Preferences</span>
-</span> and select <span class="uicontrol">Validation</span> in the left pane.</span>
- The Validation page of the Preferences window lists the validators
-available in your project and their settings.</li>
-
-<li class="stepexpand"><strong>Optional: </strong><span>Review the check box options available near
-the top of the window to customize your validation settings:</span>
-
-<table class="choicetableborder" summary="" cellspacing="0" cellpadding="4" rules="rows" frame="hsides" border="1">
-<thead><tr><th valign="bottom" id="N100A9-option">Option</th>
-<th valign="bottom" id="N100A9-desc">Description</th></tr></thead>
-<tbody>
-
-<tr><td valign="top" headers="N100A9-option" id="N100C2"><strong>Allow projects to override these preference settings</strong></td>
-
-<td valign="top" headers="N100A9-desc N100C2">Select to set individual validation settings for one or more of your
-projects.</td>
-</tr>
-
-<tr><td valign="top" headers="N100A9-option" id="N100D2"><strong>Suspend all validators</strong></td>
-<td valign="top" headers="N100A9-desc N100D2">Select to prevent
-validation at the global level.</td>
-</tr>
-
-<tr><td valign="top" headers="N100A9-option" id="N100E1"><strong>Save all modified resources automatically prior to validating</strong></td>
-
-<td valign="top" headers="N100A9-desc N100E1">Select to save resources you have modified before the validation begins.</td>
-
-</tr>
-<tr><td valign="top" headers="N100A9-option" id="N100F1"><strong>Show a confirmation dialog when performing manual validation</strong></td>
-
-<td valign="top" headers="N100A9-desc N100F1">Select to show an informational dialog after a manual validation request has completed.</td>
-
-</tr>
-
-</tbody></table>
-
-</li>
-
-<li class="stepexpand"><span>In the list of validators, select the check boxes next to each
-validator you want to use at the global level.</span> Each validator has
-a check box to specify whether it is used on manual validation and/or on build
-validation.</li>
-
-<li class="stepexpand"><span>Tune a validator by clicking
-the button in the <span class="uicontrol">Settings</span> column.</span>
- Not all validators have additional settings.</li>
-
-<li class="stepexpand"><span>Begin the validation process by one of the following methods:</span>
-<ul>
-<li>Right-click a project and click <span class="uicontrol">Validate</span>.</li>
-
-<li>Start a build.</li>
-
-</ul>
-
-</li>
-
-</ol>
-
-<div class="id_result">Any errors found by the validators
-are listed in the Problems view.<p>If you want to set individual validation
-settings for one or more of your projects, see <a href="tjvalglobalpref.html" title="For a given project, you can override the global validation preferences.">Overriding global validation preferences</a> for
-more information.</p>
-</div>
-
-<div class="id_postreq"><p class="anchor_topicbottom" />
-</div>
-
-</div>
-
-<div><div class="relref"><strong>Related reference</strong><br />
-<div><a href="../topics/rvalerr.html" title="This table lists the common error messages you may encounter when you validate your projects.">Common validation errors and solutions</a></div>
-<div><a href="../topics/rvalidators.html" title="This table lists the validators that are available for the different project types and gives a brief description of each validator.">J2EE Validators</a></div>
-</div>
-</div>
-
-</body>
-</html>
\ No newline at end of file
diff --git a/docs/org.eclipse.jst.j2ee.doc.user/topics/tjvaldisable.dita b/docs/org.eclipse.jst.j2ee.doc.user/topics/tjvaldisable.dita
deleted file mode 100644
index afe3aa1..0000000
--- a/docs/org.eclipse.jst.j2ee.doc.user/topics/tjvaldisable.dita
+++ /dev/null
@@ -1,45 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<!--Arbortext, Inc., 1988-2006, v.4002-->
-<!DOCTYPE task PUBLIC "-//OASIS//DTD DITA Task//EN"
- "task.dtd">
-<task id="tjvaldisable" xml:lang="en-us">
-<title outputclass="id_title">Disabling validation</title>
-<shortdesc outputclass="id_shortdesc">You can disable one or more validators
-individually or disable validation entirely. Also, you can set validation
-settings for your entire workspace and for individual projects.</shortdesc>
-<prolog><metadata>
-<keywords><indexterm>validation<indexterm>disabling</indexterm></indexterm>
-<indexterm>code validation<indexterm>disabling</indexterm></indexterm></keywords>
-</metadata></prolog>
-<taskbody outputclass="id_taskbody">
-<context outputclass="id_context"><p outputclass="anchor_topictop"></p><p>To
-disable validators in your project or workspace, complete the following steps:</p></context>
-<steps outputclass="id_steps">
-<step><cmd>Click <menucascade><uicontrol>Window</uicontrol><uicontrol>Preferences</uicontrol>
-</menucascade> and select <uicontrol>Validation</uicontrol> in the left pane.</cmd>
-<stepresult>The Validation page of the Preferences window lists the validators
-available in your project and their settings.</stepresult></step>
-<step><cmd>To disable individual validators, clear the check boxes next to
-each validator that you want to disable.</cmd><info>Each validator has a check
-box to specify whether it is enabled for manual validation or on a build.</info>
-</step>
-<step importance="optional"><cmd><?Pub Caret1?>You can also change the following
-check box options on this page:</cmd>
-<choicetable>
-<chhead><choptionhd>Option</choptionhd><chdeschd>Description</chdeschd></chhead>
-<chrow><choption>Allow projects to override these preference settings</choption>
-<chdesc>Select to set individual validation settings for one or more of your
-projects.</chdesc></chrow>
-<chrow><choption>Suspend all validators</choption><chdesc>Select to prevent
-validation at the global level. If you select this check box, you can still
-enable validation at the project level.</chdesc></chrow>
-</choicetable>
-</step>
-<step><cmd>Click <uicontrol>OK</uicontrol>.</cmd></step>
-</steps>
-<result>If you want to set individual validation settings for one or more
-of your projects, see <xref href="tjvalglobalpref.dita"></xref></result>
-<postreq outputclass="id_postreq"><p outputclass="anchor_topicbottom"></p></postreq>
-</taskbody>
-</task>
-<?Pub *0000002445?>
diff --git a/docs/org.eclipse.jst.j2ee.doc.user/topics/tjvaldisable.html b/docs/org.eclipse.jst.j2ee.doc.user/topics/tjvaldisable.html
deleted file mode 100644
index b918db4..0000000
--- a/docs/org.eclipse.jst.j2ee.doc.user/topics/tjvaldisable.html
+++ /dev/null
@@ -1,100 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?><!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.0 Transitional//EN" "http://www.w3.org/TR/xhtml1/DTD/xhtml1-transitional.dtd">
-<html lang="en-us" xml:lang="en-us">
-<head>
-<meta content="text/html; charset=utf-8" http-equiv="Content-Type" />
-<meta name="copyright" content="Copyright (c) 2000, 2009 IBM Corporation and others. All rights reserved. This program and the accompanying materials are made available under the terms of the Eclipse Public License v1.0 which accompanies this distribution, and is available at http://www.eclipse.org/legal/epl-v10.html. Contributors: IBM Corporation - initial API and implementation" />
-<meta name="DC.rights.owner" content="(C) Copyright 2000, 2009" />
-<meta content="public" name="security" />
-<meta content="index,follow" name="Robots" />
-<meta http-equiv="PICS-Label" content='(PICS-1.1 "http://www.icra.org/ratingsv02.html" l gen true r (cz 1 lz 1 nz 1 oz 1 vz 1) "http://www.rsac.org/ratingsv01.html" l gen true r (n 0 s 0 v 0 l 0) "http://www.classify.org/safesurf/" l gen true r (SS~~000 1))' />
-<meta content="task" name="DC.Type" />
-<meta name="DC.Title" content="Disabling validation" />
-<meta name="abstract" content="You can disable one or more validators individually or disable validation entirely. Also, you can set validation settings for your entire workspace and for individual projects." />
-<meta name="description" content="You can disable one or more validators individually or disable validation entirely. Also, you can set validation settings for your entire workspace and for individual projects." />
-<meta content="validation, disabling, code validation" name="DC.subject" />
-<meta content="validation, disabling, code validation" name="keywords" />
-<meta scheme="URI" name="DC.Relation" content="../topics/tjvalglobalpref.html" />
-<meta scheme="URI" name="DC.Relation" content="../topics/tjvalmanual.html" />
-<meta scheme="URI" name="DC.Relation" content="../topics/tjvalselect.html" />
-<meta scheme="URI" name="DC.Relation" content="../topics/rtunevalidat.html" />
-<meta content="XHTML" name="DC.Format" />
-<meta content="tjvaldisable" name="DC.Identifier" />
-<meta content="en-us" name="DC.Language" />
-<link href="../../org.eclipse.wst.doc.user/common.css" type="text/css" rel="stylesheet" />
-<title>Disabling validation</title>
-</head>
-<body id="tjvaldisable"><a name="tjvaldisable"><!-- --></a>
-
-
-<h1 class="id_title">Disabling validation</h1>
-
-
-
-<div class="id_taskbody"><p class="id_shortdesc">You can disable one or more validators
-individually or disable validation entirely. Also, you can set validation
-settings for your entire workspace and for individual projects.</p>
-
-<div class="id_context"><p class="anchor_topictop" />
-<p>To
-disable validators in your project or workspace, complete the following steps:</p>
-</div>
-
-<ol class="id_steps">
-<li class="stepexpand"><span>Click <span class="menucascade"><span class="uicontrol">Window</span> > <span class="uicontrol">Preferences</span>
-</span> and select <span class="uicontrol">Validation</span> in the left pane.</span>
- The Validation page of the Preferences window lists the validators
-available in your project and their settings.</li>
-
-<li class="stepexpand"><span>To disable individual validators, clear the check boxes next to
-each validator that you want to disable.</span> Each validator has a check
-box to specify whether it is enabled for manual validation or on a build.
-</li>
-
-<li class="stepexpand"><strong>Optional: </strong><span>You can also change the following
-check box options on this page:</span>
-
-<table class="choicetableborder" summary="" cellspacing="0" cellpadding="4" rules="rows" frame="hsides" border="1">
-<thead><tr><th valign="bottom" id="N1009D-option">Option</th>
-<th valign="bottom" id="N1009D-desc">Description</th></tr></thead>
-<tbody>
-
-<tr><td valign="top" headers="N1009D-option" id="N100B6"><strong>Allow projects to override these preference settings</strong></td>
-
-<td valign="top" headers="N1009D-desc N100B6">Select to set individual validation settings for one or more of your
-projects.</td>
-</tr>
-
-<tr><td valign="top" headers="N1009D-option" id="N100C6"><strong>Suspend all validators</strong></td>
-<td valign="top" headers="N1009D-desc N100C6">Select to prevent
-validation at the global level. If you select this check box, you can still
-enable validation at the project level.</td>
-</tr>
-
-</tbody></table>
-
-</li>
-
-<li class="stepexpand"><span>Click <span class="uicontrol">OK</span>.</span></li>
-
-</ol>
-
-<div class="section">If you want to set individual validation settings for one or more
-of your projects, see <a href="tjvalglobalpref.html" title="For a given project, you can override the global validation preferences.">Overriding global validation preferences</a></div>
-
-<div class="id_postreq"><p class="anchor_topicbottom" />
-</div>
-
-</div>
-
-<div><div class="reltasks"><strong>Related tasks</strong><br />
-<div><a href="../topics/tjvalglobalpref.html" title="For a given project, you can override the global validation preferences.">Overriding global validation preferences</a></div>
-<div><a href="../topics/tjvalmanual.html" title="When you run a manual validation, all resources in the selected project are validated according to the validation settings.">Manually validating code</a></div>
-<div><a href="../topics/tjvalselect.html" title="You can select specific validators to run during manual and build code validation. You can set each validator to run on manual validation, build validation, both, or neither.">Selecting code validators</a></div>
-</div>
-<div class="relref"><strong>Related reference</strong><br />
-<div><a href="../topics/rtunevalidat.html" title="Whether or not a validator validates a particular resource depends on the filters that are in place for that validator.">Tuning validators</a></div>
-</div>
-</div>
-
-</body>
-</html>
\ No newline at end of file
diff --git a/docs/org.eclipse.jst.j2ee.doc.user/topics/tjvalglobalpref.dita b/docs/org.eclipse.jst.j2ee.doc.user/topics/tjvalglobalpref.dita
deleted file mode 100644
index 50487df..0000000
--- a/docs/org.eclipse.jst.j2ee.doc.user/topics/tjvalglobalpref.dita
+++ /dev/null
@@ -1,48 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<!--Arbortext, Inc., 1988-2006, v.4002-->
-<!DOCTYPE task PUBLIC "-//OASIS//DTD DITA Task//EN"
- "task.dtd">
-<task id="tjvalglobalpref" xml:lang="en-us">
-<title outputclass="id_title">Overriding global validation preferences</title>
-<shortdesc outputclass="id_shortdesc">For a given project, you can override
-the global validation preferences.</shortdesc>
-<prolog><metadata>
-<keywords><indexterm>validation<indexterm>overriding global preferences</indexterm></indexterm>
-<indexterm>code validation<indexterm>overriding global preferences</indexterm></indexterm>
-</keywords>
-</metadata></prolog>
-<taskbody outputclass="id_taskbody">
-<context outputclass="id_context"> <p outputclass="anchor_topictop"></p> <p>The
-default validation preferences are specified globally on the Validation page
-of the Preferences dialog. To allow projects to override these default validation
-preferences, complete the following steps:</p></context>
-<steps outputclass="id_steps">
-<step><cmd>Click <menucascade><uicontrol>Window</uicontrol><uicontrol>Preferences</uicontrol>
-</menucascade> and select <uicontrol>Validation</uicontrol> in the left pane.</cmd>
-<stepresult>The Validation page of the Preferences window lists the validators
-available in your project and their settings.</stepresult></step>
-<step><cmd>Select the <uicontrol>Allow projects to override these preference
-settings</uicontrol> check box and click <uicontrol>OK</uicontrol>.</cmd>
-<stepresult>Now individual projects can override the global preferences.</stepresult>
-</step>
-<step><cmd>Right-click a project and then click <uicontrol>Properties</uicontrol>.</cmd><?Pub Caret?>
-</step>
-<step><cmd>In the left pane of the Properties window, click <uicontrol>Validation</uicontrol>.</cmd>
-</step>
-<step><cmd>Select the <uicontrol>Override validation preferences</uicontrol> check
-box.</cmd><info>This check box is available only if you checked the <uicontrol>Allow
-projects to override these preference settings</uicontrol> check box on the
-workbench validation preferences page.</info></step>
-<step><cmd>To prevent validation for this project, select the <uicontrol>Suspend
-all validators</uicontrol> check box.</cmd></step>
-<step><cmd>In the list of validators, select the check boxes next to each
-validator you want to use.</cmd><info>Each validator has a check box to specify
-whether it is used on manual validation or on a build.</info></step>
-<step><cmd>Choose an alternate implementation for a validator by clicking
-the button in the <uicontrol>Settings</uicontrol> column, then click <uicontrol>OK</uicontrol>.</cmd>
-<info>Not all validators have alternate implementations.</info></step>
-</steps>
-<postreq outputclass="id_postreq"><p outputclass="anchor_topicbottom"></p></postreq>
-</taskbody>
-</task>
-<?Pub *0000002816?>
diff --git a/docs/org.eclipse.jst.j2ee.doc.user/topics/tjvalglobalpref.html b/docs/org.eclipse.jst.j2ee.doc.user/topics/tjvalglobalpref.html
deleted file mode 100644
index 09e6424..0000000
--- a/docs/org.eclipse.jst.j2ee.doc.user/topics/tjvalglobalpref.html
+++ /dev/null
@@ -1,94 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?><!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.0 Transitional//EN" "http://www.w3.org/TR/xhtml1/DTD/xhtml1-transitional.dtd">
-<html lang="en-us" xml:lang="en-us">
-<head>
-<meta content="text/html; charset=utf-8" http-equiv="Content-Type" />
-<meta name="copyright" content="Copyright (c) 2000, 2009 IBM Corporation and others. All rights reserved. This program and the accompanying materials are made available under the terms of the Eclipse Public License v1.0 which accompanies this distribution, and is available at http://www.eclipse.org/legal/epl-v10.html. Contributors: IBM Corporation - initial API and implementation" />
-<meta name="DC.rights.owner" content="(C) Copyright 2000, 2009" />
-<meta content="public" name="security" />
-<meta content="index,follow" name="Robots" />
-<meta http-equiv="PICS-Label" content='(PICS-1.1 "http://www.icra.org/ratingsv02.html" l gen true r (cz 1 lz 1 nz 1 oz 1 vz 1) "http://www.rsac.org/ratingsv01.html" l gen true r (n 0 s 0 v 0 l 0) "http://www.classify.org/safesurf/" l gen true r (SS~~000 1))' />
-<meta content="task" name="DC.Type" />
-<meta name="DC.Title" content="Overriding global validation preferences" />
-<meta name="abstract" content="For a given project, you can override the global validation preferences." />
-<meta name="description" content="For a given project, you can override the global validation preferences." />
-<meta content="validation, overriding global preferences, code validation" name="DC.subject" />
-<meta content="validation, overriding global preferences, code validation" name="keywords" />
-<meta scheme="URI" name="DC.Relation" content="../topics/tjvaldisable.html" />
-<meta scheme="URI" name="DC.Relation" content="../topics/tjvalmanual.html" />
-<meta scheme="URI" name="DC.Relation" content="../topics/tjvalselect.html" />
-<meta scheme="URI" name="DC.Relation" content="../topics/rtunevalidat.html" />
-<meta content="XHTML" name="DC.Format" />
-<meta content="tjvalglobalpref" name="DC.Identifier" />
-<meta content="en-us" name="DC.Language" />
-<link href="../../org.eclipse.wst.doc.user/common.css" type="text/css" rel="stylesheet" />
-<title>Overriding global validation preferences</title>
-</head>
-<body id="tjvalglobalpref"><a name="tjvalglobalpref"><!-- --></a>
-
-
-<h1 class="id_title">Overriding global validation preferences</h1>
-
-
-
-<div class="id_taskbody"><p class="id_shortdesc">For a given project, you can override
-the global validation preferences.</p>
-
-<div class="id_context"> <p class="anchor_topictop" />
- <p>The
-default validation preferences are specified globally on the Validation page
-of the Preferences dialog. To allow projects to override these default validation
-preferences, complete the following steps:</p>
-</div>
-
-<ol class="id_steps">
-<li class="stepexpand"><span>Click <span class="menucascade"><span class="uicontrol">Window</span> > <span class="uicontrol">Preferences</span>
-</span> and select <span class="uicontrol">Validation</span> in the left pane.</span>
- The Validation page of the Preferences window lists the validators
-available in your project and their settings.</li>
-
-<li class="stepexpand"><span>Select the <span class="uicontrol">Allow projects to override these preference
-settings</span> check box and click <span class="uicontrol">OK</span>.</span>
- Now individual projects can override the global preferences.
-</li>
-
-<li class="stepexpand"><span>Right-click a project and then click <span class="uicontrol">Properties</span>.</span>
-</li>
-
-<li class="stepexpand"><span>In the left pane of the Properties window, click <span class="uicontrol">Validation</span>.</span>
-</li>
-
-<li class="stepexpand"><span>Select the <span class="uicontrol">Override validation preferences</span> check
-box.</span> This check box is available only if you checked the <span class="uicontrol">Allow
-projects to override these preference settings</span> check box on the
-workbench validation preferences page.</li>
-
-<li class="stepexpand"><span>To prevent validation for this project, select the <span class="uicontrol">Suspend
-all validators</span> check box.</span></li>
-
-<li class="stepexpand"><span>In the list of validators, select the check boxes next to each
-validator you want to use.</span> Each validator has a check box to specify
-whether it is used on manual validation or on a build.</li>
-
-<li class="stepexpand"><span>Choose an alternate implementation for a validator by clicking
-the button in the <span class="uicontrol">Settings</span> column, then click <span class="uicontrol">OK</span>.</span>
- Not all validators have alternate implementations.</li>
-
-</ol>
-
-<div class="id_postreq"><p class="anchor_topicbottom" />
-</div>
-
-</div>
-
-<div><div class="reltasks"><strong>Related tasks</strong><br />
-<div><a href="../topics/tjvaldisable.html" title="You can disable one or more validators individually or disable validation entirely. Also, you can set validation settings for your entire workspace and for individual projects.">Disabling validation</a></div>
-<div><a href="../topics/tjvalmanual.html" title="When you run a manual validation, all resources in the selected project are validated according to the validation settings.">Manually validating code</a></div>
-<div><a href="../topics/tjvalselect.html" title="You can select specific validators to run during manual and build code validation. You can set each validator to run on manual validation, build validation, both, or neither.">Selecting code validators</a></div>
-</div>
-<div class="relref"><strong>Related reference</strong><br />
-<div><a href="../topics/rtunevalidat.html" title="Whether or not a validator validates a particular resource depends on the filters that are in place for that validator.">Tuning validators</a></div>
-</div>
-</div>
-
-</body>
-</html>
\ No newline at end of file
diff --git a/docs/org.eclipse.jst.j2ee.doc.user/topics/tjvalmanual.dita b/docs/org.eclipse.jst.j2ee.doc.user/topics/tjvalmanual.dita
deleted file mode 100644
index 03b800f..0000000
--- a/docs/org.eclipse.jst.j2ee.doc.user/topics/tjvalmanual.dita
+++ /dev/null
@@ -1,41 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<!--Arbortext, Inc., 1988-2006, v.4002-->
-<!DOCTYPE task PUBLIC "-//OASIS//DTD DITA Task//EN"
- "task.dtd">
-<task id="tjvalmanual" xml:lang="en-us">
-<title outputclass="id_title">Manually validating code</title>
-<shortdesc outputclass="id_shortdesc">When you run a manual validation, all
-resources in the selected project are validated according to the validation
-settings.</shortdesc>
-<prolog><metadata>
-<keywords><indexterm>validation<indexterm>manual</indexterm></indexterm><indexterm>code
-validation<indexterm>manual</indexterm></indexterm></keywords>
-</metadata></prolog>
-<taskbody outputclass="id_taskbody">
-<context outputclass="id_context"><p outputclass="anchor_topictop"></p> <p>The
-validators used depend on the global and project validation settings. When
-you validate a project manually, the global settings are used unless both
-of the following are true:<ul>
-<li>The <uicontrol>Allow projects to override these preference settings</uicontrol> check
-box is selected on the global validation preferences page.</li>
-<li>The <uicontrol>Override validation preferences</uicontrol> check box is
-selected on the project's validation preferences page.</li>
-</ul></p><p>Whether the workbench uses the global or project validation preferences,
-only the validators selected to run on manual validation are used when you
-run a manual validation.</p><p>To manually invoke an immediate code validation,
-complete the following steps<?Pub Caret?>:</p></context>
-<steps outputclass="id_steps">
-<step><cmd>Select the project that you want to validate.</cmd></step>
-<step><cmd>Right-click the project and then click <uicontrol>Validate</uicontrol>.</cmd>
-<info>If this option is not available, validation is disabled or there are
-no validators enabled for the project. To enable validation at the global
-level, see <xref href="tjval.dita"></xref>. To enable validators for this
-project, see <xref href="tjvalglobalpref.dita"></xref>.</info></step>
-</steps>
-<result outputclass="id_result">The workbench validates the project using
-the enabled validators. Any errors found by the validators are listed in the
-Problems view.</result>
-<postreq outputclass="id_postreq"><p outputclass="anchor_topicbottom"></p></postreq>
-</taskbody>
-</task>
-<?Pub *0000002296?>
diff --git a/docs/org.eclipse.jst.j2ee.doc.user/topics/tjvalmanual.html b/docs/org.eclipse.jst.j2ee.doc.user/topics/tjvalmanual.html
deleted file mode 100644
index d571468..0000000
--- a/docs/org.eclipse.jst.j2ee.doc.user/topics/tjvalmanual.html
+++ /dev/null
@@ -1,88 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?><!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.0 Transitional//EN" "http://www.w3.org/TR/xhtml1/DTD/xhtml1-transitional.dtd">
-<html lang="en-us" xml:lang="en-us">
-<head>
-<meta content="text/html; charset=utf-8" http-equiv="Content-Type" />
-<meta name="copyright" content="Copyright (c) 2000, 2009 IBM Corporation and others. All rights reserved. This program and the accompanying materials are made available under the terms of the Eclipse Public License v1.0 which accompanies this distribution, and is available at http://www.eclipse.org/legal/epl-v10.html. Contributors: IBM Corporation - initial API and implementation" />
-<meta name="DC.rights.owner" content="(C) Copyright 2000, 2009" />
-<meta content="public" name="security" />
-<meta content="index,follow" name="Robots" />
-<meta http-equiv="PICS-Label" content='(PICS-1.1 "http://www.icra.org/ratingsv02.html" l gen true r (cz 1 lz 1 nz 1 oz 1 vz 1) "http://www.rsac.org/ratingsv01.html" l gen true r (n 0 s 0 v 0 l 0) "http://www.classify.org/safesurf/" l gen true r (SS~~000 1))' />
-<meta content="task" name="DC.Type" />
-<meta name="DC.Title" content="Manually validating code" />
-<meta name="abstract" content="When you run a manual validation, all resources in the selected project are validated according to the validation settings." />
-<meta name="description" content="When you run a manual validation, all resources in the selected project are validated according to the validation settings." />
-<meta content="validation, manual, code validation" name="DC.subject" />
-<meta content="validation, manual, code validation" name="keywords" />
-<meta scheme="URI" name="DC.Relation" content="../topics/tjvaldisable.html" />
-<meta scheme="URI" name="DC.Relation" content="../topics/tjvalglobalpref.html" />
-<meta scheme="URI" name="DC.Relation" content="../topics/tjvalselect.html" />
-<meta scheme="URI" name="DC.Relation" content="../topics/rtunevalidat.html" />
-<meta content="XHTML" name="DC.Format" />
-<meta content="tjvalmanual" name="DC.Identifier" />
-<meta content="en-us" name="DC.Language" />
-<link href="../../org.eclipse.wst.doc.user/common.css" type="text/css" rel="stylesheet" />
-<title>Manually validating code</title>
-</head>
-<body id="tjvalmanual"><a name="tjvalmanual"><!-- --></a>
-
-
-<h1 class="id_title">Manually validating code</h1>
-
-
-
-<div class="id_taskbody"><p class="id_shortdesc">When you run a manual validation, all
-resources in the selected project are validated according to the validation
-settings.</p>
-
-<div class="id_context"><p class="anchor_topictop" />
- <div class="p">The
-validators used depend on the global and project validation settings. When
-you validate a project manually, the global settings are used unless both
-of the following are true:<ul>
-<li>The <span class="uicontrol">Allow projects to override these preference settings</span> check
-box is selected on the global validation preferences page.</li>
-
-<li>The <span class="uicontrol">Override validation preferences</span> check box is
-selected on the project's validation preferences page.</li>
-
-</ul>
-</div>
-<p>Whether the workbench uses the global or project validation preferences,
-only the validators selected to run on manual validation are used when you
-run a manual validation.</p>
-<p>To manually invoke an immediate code validation,
-complete the following steps:</p>
-</div>
-
-<ol class="id_steps">
-<li class="stepexpand"><span>Select the project that you want to validate.</span></li>
-
-<li class="stepexpand"><span>Right-click the project and then click <span class="uicontrol">Validate</span>.</span>
- If this option is not available, validation is disabled or there are
-no validators enabled for the project. To enable validation at the global
-level, see <a href="tjval.html" title="The workbench includes validators that check certain files in your enterprise application module projects for errors.">Validating code in enterprise applications</a>. To enable validators for this
-project, see <a href="tjvalglobalpref.html" title="For a given project, you can override the global validation preferences.">Overriding global validation preferences</a>.</li>
-
-</ol>
-
-<div class="id_result">The workbench validates the project using
-the enabled validators. Any errors found by the validators are listed in the
-Problems view.</div>
-
-<div class="id_postreq"><p class="anchor_topicbottom" />
-</div>
-
-</div>
-
-<div><div class="reltasks"><strong>Related tasks</strong><br />
-<div><a href="../topics/tjvaldisable.html" title="You can disable one or more validators individually or disable validation entirely. Also, you can set validation settings for your entire workspace and for individual projects.">Disabling validation</a></div>
-<div><a href="../topics/tjvalglobalpref.html" title="For a given project, you can override the global validation preferences.">Overriding global validation preferences</a></div>
-<div><a href="../topics/tjvalselect.html" title="You can select specific validators to run during manual and build code validation. You can set each validator to run on manual validation, build validation, both, or neither.">Selecting code validators</a></div>
-</div>
-<div class="relref"><strong>Related reference</strong><br />
-<div><a href="../topics/rtunevalidat.html" title="Whether or not a validator validates a particular resource depends on the filters that are in place for that validator.">Tuning validators</a></div>
-</div>
-</div>
-
-</body>
-</html>
\ No newline at end of file
diff --git a/docs/org.eclipse.jst.j2ee.doc.user/topics/tjvalselect.dita b/docs/org.eclipse.jst.j2ee.doc.user/topics/tjvalselect.dita
deleted file mode 100644
index 5e5e5cf..0000000
--- a/docs/org.eclipse.jst.j2ee.doc.user/topics/tjvalselect.dita
+++ /dev/null
@@ -1,48 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<!--Arbortext, Inc., 1988-2006, v.4002-->
-<!DOCTYPE task PUBLIC "-//OASIS//DTD DITA Task//EN"
- "task.dtd">
-<task id="tjvalselect" xml:lang="en-us">
-<title outputclass="id_title">Selecting code validators</title>
-<shortdesc outputclass="id_shortdesc">You can select specific validators to
-run during manual and build code validation. You can set each validator to
-run on manual validation, build validation, both, or neither. </shortdesc>
-<prolog><metadata>
-<keywords><indexterm>validation<indexterm>selecting validators</indexterm></indexterm>
-<indexterm>code validation<indexterm>selecting validators</indexterm></indexterm>
-</keywords>
-</metadata></prolog>
-<taskbody outputclass="id_taskbody">
-<context outputclass="id_context"><p outputclass="anchor_topictop"></p><p>To
-choose the validators that you want to use for a project, complete the following
-steps:</p></context>
-<steps outputclass="id_steps">
-<step><cmd>Click <menucascade><uicontrol>Window</uicontrol><uicontrol>Preferences</uicontrol>
-</menucascade> and select <uicontrol>Validation</uicontrol> in the left pane.</cmd>
-<stepresult>The Validation page of the Preferences window lists the validators
-available in your project and their settings.</stepresult></step>
-<step><cmd>Clear the <uicontrol>Suspend all validators</uicontrol> check box.</cmd>
-</step>
-<step importance="optional"><cmd><?Pub Caret1?>If you want to set individual
-validation settings for one or more of your projects, select the <uicontrol>Allow
-projects to override these preference settings</uicontrol> check box.</cmd>
-</step>
-<step><cmd>In the list of validators, select the check boxes next to each
-validator you want to use at the global level.</cmd><info>Each validator has
-a check box to specify whether it is used on manual validation or on a build.<note>If
-you deselect any validator that is currently selected, any messages associated
-with the deselected validator will be removed from the task list,
-the next time you perform a full build.</note></info>
-</step>
-<step><cmd>Tune a validator by clicking
-the button in the <uicontrol>Settings</uicontrol> column.</cmd>
-<info>Not all validators have additional settings.</info></step>
-</steps>
-<result>If you want to set individual validation settings for one or more
-of your projects, see <xref href="tjvalglobalpref.dita"></xref>. Like the
-global validation preferences, you can set validators at the project level
-to run on manual validation, build validation, both, or neither.</result>
-<postreq outputclass="id_postreq"><p outputclass="anchor_topicbottom"></p></postreq>
-</taskbody>
-</task>
-<?Pub *0000002685?>
diff --git a/docs/org.eclipse.jst.j2ee.doc.user/topics/tjvalselect.html b/docs/org.eclipse.jst.j2ee.doc.user/topics/tjvalselect.html
deleted file mode 100644
index b2799aa..0000000
--- a/docs/org.eclipse.jst.j2ee.doc.user/topics/tjvalselect.html
+++ /dev/null
@@ -1,93 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?><!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.0 Transitional//EN" "http://www.w3.org/TR/xhtml1/DTD/xhtml1-transitional.dtd">
-<html lang="en-us" xml:lang="en-us">
-<head>
-<meta content="text/html; charset=utf-8" http-equiv="Content-Type" />
-<meta name="copyright" content="Copyright (c) 2000, 2009 IBM Corporation and others. All rights reserved. This program and the accompanying materials are made available under the terms of the Eclipse Public License v1.0 which accompanies this distribution, and is available at http://www.eclipse.org/legal/epl-v10.html. Contributors: IBM Corporation - initial API and implementation" />
-<meta name="DC.rights.owner" content="(C) Copyright 2000, 2009" />
-<meta content="public" name="security" />
-<meta content="index,follow" name="Robots" />
-<meta http-equiv="PICS-Label" content='(PICS-1.1 "http://www.icra.org/ratingsv02.html" l gen true r (cz 1 lz 1 nz 1 oz 1 vz 1) "http://www.rsac.org/ratingsv01.html" l gen true r (n 0 s 0 v 0 l 0) "http://www.classify.org/safesurf/" l gen true r (SS~~000 1))' />
-<meta content="task" name="DC.Type" />
-<meta name="DC.Title" content="Selecting code validators" />
-<meta name="abstract" content="You can select specific validators to run during manual and build code validation. You can set each validator to run on manual validation, build validation, both, or neither." />
-<meta name="description" content="You can select specific validators to run during manual and build code validation. You can set each validator to run on manual validation, build validation, both, or neither." />
-<meta content="validation, selecting validators, code validation" name="DC.subject" />
-<meta content="validation, selecting validators, code validation" name="keywords" />
-<meta scheme="URI" name="DC.Relation" content="../topics/tjvaldisable.html" />
-<meta scheme="URI" name="DC.Relation" content="../topics/tjvalglobalpref.html" />
-<meta scheme="URI" name="DC.Relation" content="../topics/tjvalmanual.html" />
-<meta scheme="URI" name="DC.Relation" content="../topics/rtunevalidat.html" />
-<meta content="XHTML" name="DC.Format" />
-<meta content="tjvalselect" name="DC.Identifier" />
-<meta content="en-us" name="DC.Language" />
-<link href="../../org.eclipse.wst.doc.user/common.css" type="text/css" rel="stylesheet" />
-<title>Selecting code validators</title>
-</head>
-<body id="tjvalselect"><a name="tjvalselect"><!-- --></a>
-
-
-<h1 class="id_title">Selecting code validators</h1>
-
-
-
-<div class="id_taskbody"><p class="id_shortdesc">You can select specific validators to
-run during manual and build code validation. You can set each validator to
-run on manual validation, build validation, both, or neither. </p>
-
-<div class="id_context"><p class="anchor_topictop" />
-<p>To
-choose the validators that you want to use for a project, complete the following
-steps:</p>
-</div>
-
-<ol class="id_steps">
-<li class="stepexpand"><span>Click <span class="menucascade"><span class="uicontrol">Window</span> > <span class="uicontrol">Preferences</span>
-</span> and select <span class="uicontrol">Validation</span> in the left pane.</span>
- The Validation page of the Preferences window lists the validators
-available in your project and their settings.</li>
-
-<li class="stepexpand"><span>Clear the <span class="uicontrol">Suspend all validators</span> check box.</span>
-</li>
-
-<li class="stepexpand"><strong>Optional: </strong><span>If you want to set individual
-validation settings for one or more of your projects, select the <span class="uicontrol">Allow
-projects to override these preference settings</span> check box.</span>
-</li>
-
-<li class="stepexpand"><span>In the list of validators, select the check boxes next to each
-validator you want to use at the global level.</span> Each validator has
-a check box to specify whether it is used on manual validation or on a build.<div class="note"><span class="notetitle">Note:</span> If
-you deselect any validator that is currently selected, any messages associated
-with the deselected validator will be removed from the task list,
-the next time you perform a full build.</div>
-
-</li>
-
-<li class="stepexpand"><span>Tune a validator by clicking
-the button in the <span class="uicontrol">Settings</span> column.</span>
- Not all validators have additional settings.</li>
-
-</ol>
-
-<div class="section">If you want to set individual validation settings for one or more
-of your projects, see <a href="tjvalglobalpref.html" title="For a given project, you can override the global validation preferences.">Overriding global validation preferences</a>. Like the
-global validation preferences, you can set validators at the project level
-to run on manual validation, build validation, both, or neither.</div>
-
-<div class="id_postreq"><p class="anchor_topicbottom" />
-</div>
-
-</div>
-
-<div><div class="reltasks"><strong>Related tasks</strong><br />
-<div><a href="../topics/tjvaldisable.html" title="You can disable one or more validators individually or disable validation entirely. Also, you can set validation settings for your entire workspace and for individual projects.">Disabling validation</a></div>
-<div><a href="../topics/tjvalglobalpref.html" title="For a given project, you can override the global validation preferences.">Overriding global validation preferences</a></div>
-<div><a href="../topics/tjvalmanual.html" title="When you run a manual validation, all resources in the selected project are validated according to the validation settings.">Manually validating code</a></div>
-</div>
-<div class="relref"><strong>Related reference</strong><br />
-<div><a href="../topics/rtunevalidat.html" title="Whether or not a validator validates a particular resource depends on the filters that are in place for that validator.">Tuning validators</a></div>
-</div>
-</div>
-
-</body>
-</html>
\ No newline at end of file
diff --git a/docs/org.eclipse.jst.j2ee.doc.user/topics/tjviewfilters.dita b/docs/org.eclipse.jst.j2ee.doc.user/topics/tjviewfilters.dita
deleted file mode 100644
index c6bcc6b..0000000
--- a/docs/org.eclipse.jst.j2ee.doc.user/topics/tjviewfilters.dita
+++ /dev/null
@@ -1,36 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<!--Arbortext, Inc., 1988-2006, v.4002-->
-<!DOCTYPE task PUBLIC "-//OASIS//DTD DITA Task//EN"
- "task.dtd">
-<task id="cjviewfiltersCait" xml:lang="en-us">
-<title id="id_title">Filtering in the Project Explorer view</title>
-<shortdesc outputclass="id_shortdesc">You can filter the Project Explorer
-view to hide projects, folders, or files that you do not want to see.</shortdesc>
-<prolog><metadata>
-<keywords><indexterm>filters<indexterm>Project Explorer view</indexterm></indexterm>
-<indexterm>views<indexterm>Project Explorer filters</indexterm></indexterm>
-<indexterm>projects<indexterm>filtering</indexterm></indexterm></keywords>
-</metadata></prolog>
-<taskbody outputclass="id_taskbody">
-<context outputclass="id_context"><p outputclass="anchor_topictop"></p><p>To
-enable or disable filters, complete the following steps</p></context>
-<steps>
-<step><cmd>Open the Select Common Navigator Filters window by selecting <uicontrol>Customize
-View...</uicontrol> from the drop-down menu at the top right corner of the
-view. </cmd></step>
-<step><cmd>On the <uicontrol>Filters</uicontrol> tab, select the check boxes
-next to the filters you want to enable.</cmd><info> For example, when the <uicontrol>Closed
-projects</uicontrol> filter is enabled, closed projects are not shown in the
-Project Explorer view. Other filters can hide empty packages, non-java files,
-and files with names ending in ".class".</info></step>
-<step><cmd>On the <uicontrol>Content</uicontrol> tab, the filters work in
-the opposite way: the selected check boxes describe the projects, folders,
-and files that are shown in the Project Explorer view. Select the check boxes
-next to the filters you want to hide.</cmd><info>For example, if you clear
-the check box next to <uicontrol>J2EE EJB Deployment Descriptors</uicontrol>,
-the deployment descriptors are hidden from each project in the view.</info>
-</step>
-</steps>
-<postreq outputclass="id_postreq"><p outputclass="anchor_topicbottom"></p></postreq>
-</taskbody>
-</task>
diff --git a/docs/org.eclipse.jst.j2ee.doc.user/topics/tjviewfilters.html b/docs/org.eclipse.jst.j2ee.doc.user/topics/tjviewfilters.html
deleted file mode 100644
index c4a6e5b..0000000
--- a/docs/org.eclipse.jst.j2ee.doc.user/topics/tjviewfilters.html
+++ /dev/null
@@ -1,70 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?><!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.0 Transitional//EN" "http://www.w3.org/TR/xhtml1/DTD/xhtml1-transitional.dtd">
-<html lang="en-us" xml:lang="en-us">
-<head>
-<meta content="text/html; charset=utf-8" http-equiv="Content-Type" />
-<meta name="copyright" content="Copyright (c) 2000, 2009 IBM Corporation and others. All rights reserved. This program and the accompanying materials are made available under the terms of the Eclipse Public License v1.0 which accompanies this distribution, and is available at http://www.eclipse.org/legal/epl-v10.html. Contributors: IBM Corporation - initial API and implementation" />
-<meta name="DC.rights.owner" content="(C) Copyright 2000, 2009" />
-<meta content="public" name="security" />
-<meta content="index,follow" name="Robots" />
-<meta http-equiv="PICS-Label" content='(PICS-1.1 "http://www.icra.org/ratingsv02.html" l gen true r (cz 1 lz 1 nz 1 oz 1 vz 1) "http://www.rsac.org/ratingsv01.html" l gen true r (n 0 s 0 v 0 l 0) "http://www.classify.org/safesurf/" l gen true r (SS~~000 1))' />
-<meta content="task" name="DC.Type" />
-<meta name="DC.Title" content="Filtering in the Project Explorer view" />
-<meta name="abstract" content="You can filter the Project Explorer view to hide projects, folders, or files that you do not want to see." />
-<meta name="description" content="You can filter the Project Explorer view to hide projects, folders, or files that you do not want to see." />
-<meta content="filters, Project Explorer view, views, Project Explorer filters, projects, filtering" name="DC.subject" />
-<meta content="filters, Project Explorer view, views, Project Explorer filters, projects, filtering" name="keywords" />
-<meta scheme="URI" name="DC.Relation" content="../topics/cjview.html" />
-<meta content="XHTML" name="DC.Format" />
-<meta content="cjviewfiltersCait" name="DC.Identifier" />
-<meta content="en-us" name="DC.Language" />
-<link href="../../org.eclipse.wst.doc.user/common.css" type="text/css" rel="stylesheet" />
-<title>Filtering in the Project Explorer view</title>
-</head>
-<body id="cjviewfiltersCait"><a name="cjviewfiltersCait"><!-- --></a>
-
-
-<h1 class="topictitle1">Filtering in the Project Explorer view</h1>
-
-
-
-<div class="id_taskbody"><p class="id_shortdesc">You can filter the Project Explorer
-view to hide projects, folders, or files that you do not want to see.</p>
-
-<div class="id_context"><p class="anchor_topictop" />
-<p>To
-enable or disable filters, complete the following steps</p>
-</div>
-
-<ol>
-<li class="stepexpand"><span>Open the Select Common Navigator Filters window by selecting <span class="uicontrol">Customize
-View...</span> from the drop-down menu at the top right corner of the
-view. </span></li>
-
-<li class="stepexpand"><span>On the <span class="uicontrol">Filters</span> tab, select the check boxes
-next to the filters you want to enable.</span> For example, when the <span class="uicontrol">Closed
-projects</span> filter is enabled, closed projects are not shown in the
-Project Explorer view. Other filters can hide empty packages, non-java files,
-and files with names ending in ".class".</li>
-
-<li class="stepexpand"><span>On the <span class="uicontrol">Content</span> tab, the filters work in
-the opposite way: the selected check boxes describe the projects, folders,
-and files that are shown in the Project Explorer view. Select the check boxes
-next to the filters you want to hide.</span> For example, if you clear
-the check box next to <span class="uicontrol">J2EE EJB Deployment Descriptors</span>,
-the deployment descriptors are hidden from each project in the view.
-</li>
-
-</ol>
-
-<div class="id_postreq"><p class="anchor_topicbottom" />
-</div>
-
-</div>
-
-<div><div class="relconcepts"><strong>Related concepts</strong><br />
-<div><a href="../topics/cjview.html" title="While developing J2EE applications in the Java EE perspective, the Project Explorer view is your main view of your J2EE projects and resources.">Project Explorer view in the Java EE perspective</a></div>
-</div>
-</div>
-
-</body>
-</html>
\ No newline at end of file
diff --git a/docs/org.eclipse.jst.j2ee.doc.user/topics/twebfragproj.dita b/docs/org.eclipse.jst.j2ee.doc.user/topics/twebfragproj.dita
deleted file mode 100644
index 90a48e2..0000000
--- a/docs/org.eclipse.jst.j2ee.doc.user/topics/twebfragproj.dita
+++ /dev/null
@@ -1,86 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<!--Arbortext, Inc., 1988-2006, v.4002-->
-<!DOCTYPE task PUBLIC "-//OASIS//DTD DITA Task//EN"
- "task.dtd">
-<task id="webfragmentproj" xml:lang="en-us">
-<title>Creating Web fragment projects</title>
-<shortdesc>You can use the Web fragment project wizard to create Web
-fragment projects in your workspace.</shortdesc>
-<prolog><metadata>
-<keywords><indexterm keyref="tcreatwebmodule|1|JavaEEWebmodulecreating"
-status="new">Java EE<indexterm>Web fragment projects<indexterm>creating</indexterm></indexterm></indexterm>
-</keywords>
-</metadata></prolog>
-<taskbody>
-<prereq><p>A web fragment is a logical partitioning of the web application
-in such a way that the frameworks being used within the web application
-can define all the artifacts without requiring you to edit or add
-information in the web.xml. It can include almost all the same elements
-that the web.xml descriptor uses, with these requirements:</p><ul>
-<li>The top level element for the descriptor must be web-fragment</li>
-<li>The corresponding descriptor file must be called web-fragment.xml</li>
-</ul><p>If a framework is packaged as a jar file and has metadata
-information in the form of deployment descriptor, then the web-fragment.xml
-descriptor must be in the META-INF/ directory of the jar file.</p><p>A
-web fragment is a mechanism for either defining or extending the deployment
-descriptor of a web application by means of pluggable library jars
-that contain both the incremental deployment information (in the web-fragment.xml)
-and potentially any related or relevant classes. The web fragment
-is also packaged as a library (jar), with the web-fragment.xml in
-the META-INF directory. Consequently, the web fragment project is
-essentially a Utility project, with the addition of a web fragment
-facet to it. The web fragment facet enables you to add relevant context-sensitive
-functionality to the fragment project.</p></prereq>
-<steps>
-<step><cmd>In the <tm tmtype="tm" trademark="Java">Java</tm> EE perspective,
-select <menucascade><uicontrol>File</uicontrol><uicontrol>New</uicontrol>
-<uicontrol>Web Fragment Project</uicontrol></menucascade>. Alternatively,
-right-click the Enterprise Explorer context menu, and select <menucascade>
-<uicontrol>New</uicontrol><uicontrol>Web Fragment Project</uicontrol>
-</menucascade>. The Web fragment wizard opens.</cmd></step>
-<step><cmd>In the <uicontrol>Name</uicontrol> field, type a name for
-the Web fragment project. To change the default <uicontrol>Project
-contents</uicontrol>, click the <uicontrol>Browse</uicontrol> button
-to select a new location.</cmd><info><p>If you specify a non-default
-project location that is already being used by another project, the
-project creation fails.</p></info></step>
-<step><cmd>The <uicontrol>Target runtime</uicontrol> field is pre-populated
-with the selection from the enterprise project.</cmd></step>
-<step importance="optional"><cmd>Select a pre-defined project configuration
-from the <uicontrol>Configurations</uicontrol> drop-down list.</cmd>
-</step>
-<step importance="optional"><cmd>If you want to modify the configuration
-details, click <uicontrol>modify</uicontrol>:</cmd></step>
-<step importance="optional"><cmd>Select one or more project facets
-from the <uicontrol>Project Facets</uicontrol> list. To specify server
-runtime environments, click <uicontrol>Show Runtimes</uicontrol> and
-select one or more runtimes. After making your selections, you can
-save your custom configuration by clicking <uicontrol>Save</uicontrol>.</cmd>
-</step>
-<step importance="optional"><cmd>Select the <uicontrol>Add project
-to Dynamic Web project</uicontrol> check box to add the new module
-to an enterprise module (WAR) project.</cmd><info>Type a new project
-name or select an existing enterprise module project from the drop-down
-list in the <uicontrol>Dynamic Web project name</uicontrol> combination
-box. Or, click <uicontrol>New</uicontrol> to launch the New EAR module
-Project wizard.</info></step>
-<step><cmd>Select <uicontrol>Add project to working sets</uicontrol> to
-add the Web fragment project to an existing working set, or click <uicontrol>Select</uicontrol> to
-locate a working set, and click <uicontrol>Next</uicontrol>.</cmd>
-</step>
-<step><cmd>On the Configure project for building a <tm tmtype="tm"
-trademark="Java">Java</tm> application page, on the <uicontrol>Source
-folders on build path</uicontrol> field, click <uicontrol>Add Folder...</uicontrol> to
-add folders for your source on the build path, or accept the default
-value (src).</cmd></step>
-<step><cmd>In the <uicontrol>Default output Folder:</uicontrol> field,
-specify a folder for your output files or accept the default value
-(bin), and click <uicontrol>Finish</uicontrol>.</cmd></step>
-<step><cmd>In Package Explorer view, you see the resulting Web Fragment
-project folders:</cmd><info><image href="../images/webfrag.jpg"
-placement="break"><alt>Web fragment folders</alt></image><?Pub Caret 21?></info>
-</step>
-</steps>
-</taskbody>
-</task>
-<?Pub *0000005097?>
diff --git a/docs/org.eclipse.jst.j2ee.doc.user/topics/twebfragproj.html b/docs/org.eclipse.jst.j2ee.doc.user/topics/twebfragproj.html
deleted file mode 100644
index e3a42e5..0000000
--- a/docs/org.eclipse.jst.j2ee.doc.user/topics/twebfragproj.html
+++ /dev/null
@@ -1,130 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?><!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.0 Transitional//EN" "http://www.w3.org/TR/xhtml1/DTD/xhtml1-transitional.dtd">
-<html lang="en-us" xml:lang="en-us">
-<head>
-<meta content="text/html; charset=utf-8" http-equiv="Content-Type" />
-<meta name="copyright" content="Copyright (c) 2000, 2009 IBM Corporation and others. All rights reserved. This program and the accompanying materials are made available under the terms of the Eclipse Public License v1.0 which accompanies this distribution, and is available at http://www.eclipse.org/legal/epl-v10.html. Contributors: IBM Corporation - initial API and implementation" />
-<meta name="DC.rights.owner" content="(C) Copyright 2000, 2009" />
-<meta content="public" name="security" />
-<meta content="index,follow" name="Robots" />
-<meta http-equiv="PICS-Label" content='(PICS-1.1 "http://www.icra.org/ratingsv02.html" l gen true r (cz 1 lz 1 nz 1 oz 1 vz 1) "http://www.rsac.org/ratingsv01.html" l gen true r (n 0 s 0 v 0 l 0) "http://www.classify.org/safesurf/" l gen true r (SS~~000 1))' />
-<meta content="task" name="DC.Type" />
-<meta name="DC.Title" content="Creating Web fragment projects" />
-<meta name="abstract" content="You can use the Web fragment project wizard to create Web fragment projects in your workspace." />
-<meta name="description" content="You can use the Web fragment project wizard to create Web fragment projects in your workspace." />
-<meta content="Java EE, Web fragment projects, creating" name="DC.subject" />
-<meta content="Java EE, Web fragment projects, creating" name="keywords" />
-<meta scheme="URI" name="DC.Relation" content="../topics/ph-projects.html" />
-<meta content="XHTML" name="DC.Format" />
-<meta content="webfragmentproj" name="DC.Identifier" />
-<meta content="en-us" name="DC.Language" />
-<link href="../../org.eclipse.wst.doc.user/common.css" type="text/css" rel="stylesheet" />
-<title>Creating Web fragment projects</title>
-</head>
-<body id="webfragmentproj"><a name="webfragmentproj"><!-- --></a>
-
-
-<h1 class="topictitle1">Creating Web fragment projects</h1>
-
-
-
-<div><p>You can use the Web fragment project wizard to create Web
-fragment projects in your workspace.</p>
-
-<div class="p"><p>A web fragment is a logical partitioning of the web application
-in such a way that the frameworks being used within the web application
-can define all the artifacts without requiring you to edit or add
-information in the web.xml. It can include almost all the same elements
-that the web.xml descriptor uses, with these requirements:</p>
-<ul>
-<li>The top level element for the descriptor must be web-fragment</li>
-
-<li>The corresponding descriptor file must be called web-fragment.xml</li>
-
-</ul>
-<p>If a framework is packaged as a jar file and has metadata
-information in the form of deployment descriptor, then the web-fragment.xml
-descriptor must be in the META-INF/ directory of the jar file.</p>
-<p>A
-web fragment is a mechanism for either defining or extending the deployment
-descriptor of a web application by means of pluggable library jars
-that contain both the incremental deployment information (in the web-fragment.xml)
-and potentially any related or relevant classes. The web fragment
-is also packaged as a library (jar), with the web-fragment.xml in
-the META-INF directory. Consequently, the web fragment project is
-essentially a Utility project, with the addition of a web fragment
-facet to it. The web fragment facet enables you to add relevant context-sensitive
-functionality to the fragment project.</p>
-</div>
-
-
-<ol>
-<li class="stepexpand"><span>In the Java EE perspective,
-select <span class="menucascade"><span class="uicontrol">File</span> > <span class="uicontrol">New</span>
- > <span class="uicontrol">Web Fragment Project</span></span>. Alternatively,
-right-click the Enterprise Explorer context menu, and select <span class="menucascade">
-<span class="uicontrol">New</span> > <span class="uicontrol">Web Fragment Project</span>
-</span>. The Web fragment wizard opens.</span></li>
-
-<li class="stepexpand"><span>In the <span class="uicontrol">Name</span> field, type a name for
-the Web fragment project. To change the default <span class="uicontrol">Project
-contents</span>, click the <span class="uicontrol">Browse</span> button
-to select a new location.</span> <p>If you specify a non-default
-project location that is already being used by another project, the
-project creation fails.</p>
-</li>
-
-<li class="stepexpand"><span>The <span class="uicontrol">Target runtime</span> field is pre-populated
-with the selection from the enterprise project.</span></li>
-
-<li class="stepexpand"><strong>Optional: </strong><span>Select a pre-defined project configuration
-from the <span class="uicontrol">Configurations</span> drop-down list.</span>
-</li>
-
-<li class="stepexpand"><strong>Optional: </strong><span>If you want to modify the configuration
-details, click <span class="uicontrol">modify</span>:</span></li>
-
-<li class="stepexpand"><strong>Optional: </strong><span>Select one or more project facets
-from the <span class="uicontrol">Project Facets</span> list. To specify server
-runtime environments, click <span class="uicontrol">Show Runtimes</span> and
-select one or more runtimes. After making your selections, you can
-save your custom configuration by clicking <span class="uicontrol">Save</span>.</span>
-</li>
-
-<li class="stepexpand"><strong>Optional: </strong><span>Select the <span class="uicontrol">Add project
-to Dynamic Web project</span> check box to add the new module
-to an enterprise module (WAR) project.</span> Type a new project
-name or select an existing enterprise module project from the drop-down
-list in the <span class="uicontrol">Dynamic Web project name</span> combination
-box. Or, click <span class="uicontrol">New</span> to launch the New EAR module
-Project wizard.</li>
-
-<li class="stepexpand"><span>Select <span class="uicontrol">Add project to working sets</span> to
-add the Web fragment project to an existing working set, or click <span class="uicontrol">Select</span> to
-locate a working set, and click <span class="uicontrol">Next</span>.</span>
-</li>
-
-<li class="stepexpand"><span>On the Configure project for building a Java application page, on the <span class="uicontrol">Source
-folders on build path</span> field, click <span class="uicontrol">Add Folder...</span> to
-add folders for your source on the build path, or accept the default
-value (src).</span></li>
-
-<li class="stepexpand"><span>In the <span class="uicontrol">Default output Folder:</span> field,
-specify a folder for your output files or accept the default value
-(bin), and click <span class="uicontrol">Finish</span>.</span></li>
-
-<li class="stepexpand"><span>In Package Explorer view, you see the resulting Web Fragment
-project folders:</span> <br /><img src="../images/webfrag.jpg" alt="Web fragment folders" /><br />
-</li>
-
-</ol>
-
-</div>
-
-<div>
-<div class="familylinks">
-<div class="parentlink"><strong>Parent topic:</strong> <a href="../topics/ph-projects.html" title="The workbench can work with many different types of projects. The following topics cover creating and managing some of the types of projects related to J2EE development.">Working with projects</a></div>
-</div>
-</div>
-
-</body>
-</html>
\ No newline at end of file
diff --git a/docs/org.eclipse.jst.j2ee.infopop/.cvsignore b/docs/org.eclipse.jst.j2ee.infopop/.cvsignore
deleted file mode 100644
index c14487c..0000000
--- a/docs/org.eclipse.jst.j2ee.infopop/.cvsignore
+++ /dev/null
@@ -1 +0,0 @@
-build.xml
diff --git a/docs/org.eclipse.jst.j2ee.infopop/.project b/docs/org.eclipse.jst.j2ee.infopop/.project
deleted file mode 100644
index 63eb8c9..0000000
--- a/docs/org.eclipse.jst.j2ee.infopop/.project
+++ /dev/null
@@ -1,22 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<projectDescription>
- <name>org.eclipse.jst.j2ee.infopop</name>
- <comment></comment>
- <projects>
- </projects>
- <buildSpec>
- <buildCommand>
- <name>org.eclipse.pde.ManifestBuilder</name>
- <arguments>
- </arguments>
- </buildCommand>
- <buildCommand>
- <name>org.eclipse.pde.SchemaBuilder</name>
- <arguments>
- </arguments>
- </buildCommand>
- </buildSpec>
- <natures>
- <nature>org.eclipse.pde.PluginNature</nature>
- </natures>
-</projectDescription>
diff --git a/docs/org.eclipse.jst.j2ee.infopop/EJBCreateWizard_HelpContexts.xml b/docs/org.eclipse.jst.j2ee.infopop/EJBCreateWizard_HelpContexts.xml
deleted file mode 100644
index 3734588..0000000
--- a/docs/org.eclipse.jst.j2ee.infopop/EJBCreateWizard_HelpContexts.xml
+++ /dev/null
@@ -1,92 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<?NLS type="org.eclipse.help.contexts"?>
-<!-- /*******************************************************************************
- * Copyright (c) 2000, 2005 IBM Corporation and others.
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
- *
- * Contributors:
- * IBM Corporation - initial API and implementation
- *******************************************************************************/ -->
-<contexts>
-
-<!-- Page 1, Create an Enterprise Bean -->
-<context id="antejb0000" title="Create an Enterprise Bean">
-<description>Use this page to select the enterprise bean type: session bean, message-driven bean, or container managed entity bean.
-
-You must install and enable XDoclet before creating an entity bean. Complete the following steps:
-1 - Download and install XDoclet from http://xdoclet.sourceforge.net/xdoclet/install.html
-2 - Click the <b>preferences</b> link in the wizard to configure the XDoclet Runtime Preferences. Another way to get to the XDoclet Runtime Preferences page is from <b>Window > Preferences > XDoclet</b>.
-3 - Check the <b>Enable XDoclet Builder</b> check box.
-4 - Select the version of XDoclet that you have installed.
-5 - Use the Browse button to locate the installation directory for XDoclet (<b>XDoclet Home</b>).
-6 - Click <b>OK</b> to save the preferences.
-
-After installing and configuring XDoclet, select the bean type you want to create and click <b>Next</b>.
-</description>
-<topic label="Creating enterprise beans" href="../org.eclipse.jst.ejb.doc.user/topics/tecrte.html"/>
-<topic label="Creating session beans" href="../org.eclipse.jst.ejb.doc.user/topics/tesessb.html"/>
-<topic label="Creating container-managed entity beans" href="../org.eclipse.jst.ejb.doc.user/topics/teentityb.html"/>
-<topic label="Creating message-driven beans" href="../org.eclipse.jst.ejb.doc.user/topics/temessb.html"/>
-<topic label="Configuring XDoclet annotation support" href="../org.eclipse.jst.ejb.doc.user/topics/txdocletconf.html"/>
-<topic label="EJB architecture" href="../org.eclipse.jst.ejb.doc.user/topics/cearch.html"/>
-<!-- link to org.eclipse.jst.annotation.user.doc annotation tagging -->
-</context>
-
-<!-- Page 2, Enterprise Bean class file definition -->
-<context id="antejb1100">
-<description>Enter the <b>Project</b>, <b>Module Name</b>, and workspace <b>Folder</b> for the new enterprise bean.
-
-Enter the <b>Java package</b> and <b>Class name</b> for the new enterprise bean.
-Change the <b>Superclass</b> if your class will override a class other than java.lang.Object.
-
-<!-- Select the <b>Generate an annotated bean class</b> check box to add J2EE annotations to the source file. -->
-</description>
-<topic label="Creating enterprise beans" href="../org.eclipse.jst.ejb.doc.user/topics/tecrte.html"/>
-<topic label="Creating an EJB project" href="../org.eclipse.jst.ejb.doc.user/topics/tecrtpro.html"/>
-<topic label="Creating session beans" href="../org.eclipse.jst.ejb.doc.user/topics/tesessb.html"/>
-<topic label="Creating container-managed entity beans" href="../org.eclipse.jst.ejb.doc.user/topics/teentityb.html"/>
-<topic label="Creating message-driven beans" href="../org.eclipse.jst.ejb.doc.user/topics/temessb.html"/>
-<!-- link to org.eclipse.jst.annotation.user.doc annotation tagging -->
-</context>
-
-<!-- Page 3, Enterprise Bean details -->
-<context id="antejb1000">
-<description>Specify the EJB, JNDI and Display names for the enterprise bean.
-The <b>EJB name</b> is the name of the enterprise bean class.
-The <b>JNDI name</b> is a logical name used by the server to locate an enterprise bean at runtime.
-The <b>Display name</b> is a short name for the enterprise bean that is used by tools.
-
-Optionally, provide a text <b>Description</b> of the enterprise bean class.
-
-Select the <b>State Type</b> (stateless or stateful) if you are creating a session bean.
-A stateful session bean maintains client-specific session information, or conversational state, across multiple method calls and transactions.
-A stateless session bean does not maintain conversational state.
-
-Select the <b>Transaction Type</b> (container or bean) for the enterprise bean. This specifies whether the container or the bean will handle transaction demarcation.
-</description>
-<topic label="Creating enterprise beans" href="../org.eclipse.jst.ejb.doc.user/topics/tecrte.html"/>
-<topic label="Creating an EJB project" href="../org.eclipse.jst.ejb.doc.user/topics/tecrtpro.html"/>
-<topic label="Creating session beans" href="../org.eclipse.jst.ejb.doc.user/topics/tesessb.html"/>
-<topic label="Creating container-managed entity beans" href="../org.eclipse.jst.ejb.doc.user/topics/teentityb.html"/>
-<topic label="Creating message-driven beans" href="../org.eclipse.jst.ejb.doc.user/topics/temessb.html"/>
-</context>
-
-<!-- Page 4, Enterprise Bean modifiers, interfaces and method stubs -->
-<context id="antejb1200">
-<description>Select the type of <b>Modifiers</b> for the bean class.
-
-Select the <b>Interfaces</b> that your bean class will implement. Use the <b>Add</b> and <b>Remove</b> buttons to create the list of interfaces.
-
-Select which method stubs you want created in the bean class.
-</description>
-<topic label="Creating enterprise beans" href="../org.eclipse.jst.ejb.doc.user/topics/tecrte.html"/>
-<topic label="Creating an EJB project" href="../org.eclipse.jst.ejb.doc.user/topics/tecrtpro.html"/>
-</context>
-
-
-
-
-</contexts>
\ No newline at end of file
diff --git a/docs/org.eclipse.jst.j2ee.infopop/ExportWizard_HelpContexts.xml b/docs/org.eclipse.jst.j2ee.infopop/ExportWizard_HelpContexts.xml
deleted file mode 100644
index 5eb2558..0000000
--- a/docs/org.eclipse.jst.j2ee.infopop/ExportWizard_HelpContexts.xml
+++ /dev/null
@@ -1,54 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<?NLS type="org.eclipse.help.contexts"?>
-<!-- /*******************************************************************************
- * Copyright (c) 2000, 2005 IBM Corporation and others.
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
- *
- * Contributors:
- * IBM Corporation - initial API and implementation
- *******************************************************************************/ -->
-<contexts>
-<context id="APPCLIENT_EXPORT_APPCLIENT_WIZARD_PAGE1">
-<description>Use this wizard to export an application client project into a JAR file. Select the application project to export, and provide a directory and filename for the exported JAR file.
-
-Select <b>Export source files</b> to include source files in the JAR file.
-
-Select <b>Overwrite existing file</b> to replace an existing file.
-</description>
-<!--topic label="Exporting an application client project" href="../com.ibm.etools.j2eeapp.doc/topics/tjexpapp.html"/-->
-<!--topic label="Creating an application client project" href="../com.ibm.etools.j2eeapp.doc/topics/tjappproj.html"/-->
-</context>
-<context id="EAR_EXPORT_PAGE1">
-<description>Use this wizard to export an enterprise application project into an EAR file. Select the enterprise application project to export, and provide a directory and filename for the exported EAR file.
-
-Select <b>Export source files</b> to include source files in the EAR file.
-
-Select <b>Overwrite existing file</b> to replace an existing file.
-</description>
-<!--topic label="Exporting an enterprise application into an EAR file" href="../com.ibm.etools.j2eeapp.doc/topics/tjexpear.html"/-->
-<!--topic label="Creating an enterprise application project" href="../com.ibm.etools.j2eeapp.doc/topics/tjear.html"/-->
-</context>
-<context id="EJB_EXPORT_PAGE1">
-<description>Use this wizard to export an EJB module into a JAR file. Select the EJB module to export, and provide a directory and filename for the exported JAR file.
-
-Select <b>Export source files</b> to include source files in the JAR file.
-
-Select <b>Overwrite existing file</b> to replace an existing file. </description>
-<!--topic label="Exporting an EJB JAR file" href="../com.ibm.etools.ejb.assembly.doc/topics/teexp.html"/-->
-<!--topic label="Importing an EJB JAR file" href="../com.ibm.etools.ejb.assembly.doc/topics/teimp.html"/-->
-</context>
-
-<context id="EXPORT_RAR_WIZARD_PAGE">
-<description>Use this wizard to export a connector project into a RAR file. Select the connector project to export, and provide a directory and filename for the exported RAR file.
-
-Select <b>Export source files</b> to include source files in the RAR file.
-
-Select <b>Overwrite existing file</b> to replace an existing file.
-</description>
-<!--topic label="Exporting a connector project to a RAR file" href="../com.ibm.etools.j2ee.doc/topics/tjexprar.html"/-->
-<!--topic label="Creating a connector project" href="../com.ibm.etools.j2ee.doc/topics/tjrar.html"/-->
-</context>
-</contexts>
\ No newline at end of file
diff --git a/docs/org.eclipse.jst.j2ee.infopop/ImportWizard_HelpContexts.xml b/docs/org.eclipse.jst.j2ee.infopop/ImportWizard_HelpContexts.xml
deleted file mode 100644
index f013fc4..0000000
--- a/docs/org.eclipse.jst.j2ee.infopop/ImportWizard_HelpContexts.xml
+++ /dev/null
@@ -1,57 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<?NLS type="org.eclipse.help.contexts"?>
-<!-- /*******************************************************************************
- * Copyright (c) 2000, 2005 IBM Corporation and others.
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
- *
- * Contributors:
- * IBM Corporation - initial API and implementation
- *******************************************************************************/ -->
-<contexts>
-<context id="APPCLIENT_IMPORT_APPCLIENT_WIZARD_PAGE1">
-<description>Use this wizard to import an application client JAR file. Locate the application client JAR file on your file system using the <b>Browse</b> button. Optionally, modify the project name provided.
-
-Use the <b>Target runtimes</b> field to specify the application server that the imported project will be developed for.
-
-You can also specify whether or not to add the imported application client module to an enterprise application project. Choose an existing project or use the <b>New</b> button to create a new project.
-</description>
-<!--topic label="Importing an application client project" href="../com.ibm.etools.j2eeapp.doc/topics/tjimpapp.html"/-->
-<!--topic label="Creating an application client project" href="../com.ibm.etools.j2eeapp.doc/topics/tjappproj.html"/-->
-</context>
-
-<context id="EAR_IMPORT_EAR_WIZARD_PAGE1">
- <!-- wizard broken at time of this writing -->
-<description>Use this wizard to import an enterprise application EAR file. Locate the enterprise application EAR file on your file system using the <b>Browse</b> button. Optionally, modify the project name provided.
-
-Use the <b>Target runtimes</b> field to specify the application server that the resulting projects will be developed for.
-</description>
-<!--topic label="Importing an enterprise application EAR file" href="../com.ibm.etools.j2eeapp.doc/topics/tjimpear.html"/-->
-<!--topic label="Creating an enterprise application project" href="../com.ibm.etools.j2eeapp.doc/topics/tjear.html"/-->
-</context>
-
-
-<context id="EJB_IMPORT_EJB_WIZARD_PAGE1">
-<description>Use this wizard to import an EJB JAR file. Locate the EJB JAR file on your file system using the <b>Browse</b> button. Optionally, modify the module name provided.
-
-Use the <b>Target runtimes</b> field to specify the application server that the imported project will be developed for.
-
-You can also specify whether or not to add the imported EJB module to an enterprise application project. Choose an existing project or use the <b>New</b> button to create a new project.
-</description>
-<!--topic label="Importing an EJB JAR file" href="../com.ibm.etools.ejb.assembly.doc/topics/teimp.html"/-->
-<!--topic label="Creating an EJB project" href="../com.ibm.etools.ejb.assembly.doc/topics/tecrtpro.html"/-->
-</context>
-
-<context id="IMPORT_RAR_WIZARD_PAGE">
-<description>Use this wizard to import a JCA Connector RAR file. Locate the Connector RAR file on your file system using the <b>Browse</b> button. Optionally, modify the module name provided.
-
-Use the <b>Target runtimes</b> field to specify the application server that the imported project will be developed for.
-
-You can also specify whether or not to add the imported connector module to an enterprise application project. Choose an existing project or use the <b>New</b> button to create a new project.
-</description>
-<!--topic label="Importing a connector project RAR file" href="../com.ibm.etools.j2ee.doc/topics/tjimprar.html"/-->
-<!--topic label="Creating a connector project" href="../com.ibm.etools.j2ee.doc/hmtl/tjrar.html"/-->
-</context>
-</contexts>
diff --git a/docs/org.eclipse.jst.j2ee.infopop/J2EEGeneral_HelpContexts.xml b/docs/org.eclipse.jst.j2ee.infopop/J2EEGeneral_HelpContexts.xml
deleted file mode 100644
index 14bd532..0000000
--- a/docs/org.eclipse.jst.j2ee.infopop/J2EEGeneral_HelpContexts.xml
+++ /dev/null
@@ -1,24 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<?NLS type="org.eclipse.help.contexts"?>
-<!-- /*******************************************************************************
- * Copyright (c) 2000, 2005 IBM Corporation and others.
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
- *
- * Contributors:
- * IBM Corporation - initial API and implementation
- *******************************************************************************/ -->
-<contexts>
-<context id="com.ibm.wtp.ui.ProjectNavigator">
-<description>The J2EE Project Explorer view provides a hierarchical view of the content models for resources in the workbench. From this view, you can open the various project files in the appropriate editor.
-
-By right-clicking on modules, you can access the pop-up context menu for additional development options.
-</description>
-<!--topic label="J2EE Hierarchy and Project Navigator views" href="../com.ibm.etools.j2eeapp.doc/topics/cjview.html"/-->
-<!--topic label="J2EE perspective" href="../com.ibm.etools.j2eeapp.doc/topics/cjpers.html"/-->
-</context>
-
-
-</contexts>
\ No newline at end of file
diff --git a/docs/org.eclipse.jst.j2ee.infopop/META-INF/MANIFEST.MF b/docs/org.eclipse.jst.j2ee.infopop/META-INF/MANIFEST.MF
deleted file mode 100644
index 4bb5c92..0000000
--- a/docs/org.eclipse.jst.j2ee.infopop/META-INF/MANIFEST.MF
+++ /dev/null
@@ -1,7 +0,0 @@
-Manifest-Version: 1.0
-Bundle-ManifestVersion: 2
-Bundle-Name: %pluginName
-Bundle-SymbolicName: org.eclipse.jst.j2ee.infopop; singleton:=true
-Bundle-Version: 1.0.300.qualifier
-Bundle-Vendor: %pluginProvider
-Bundle-Localization: plugin
diff --git a/docs/org.eclipse.jst.j2ee.infopop/Preferences_HelpContexts.xml b/docs/org.eclipse.jst.j2ee.infopop/Preferences_HelpContexts.xml
deleted file mode 100644
index e7b6e42..0000000
--- a/docs/org.eclipse.jst.j2ee.infopop/Preferences_HelpContexts.xml
+++ /dev/null
@@ -1,75 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<?NLS type="org.eclipse.help.contexts"?>
-<!-- /*******************************************************************************
- * Copyright (c) 2000, 2005 IBM Corporation and others.
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
- *
- * Contributors:
- * IBM Corporation - initial API and implementation
- *******************************************************************************/ -->
-<contexts>
-<!--Eclipse preferences -->
-
-<context id="FlexibleProject">
- <!-- Flexible Java Project preferences-->
-<description>Select <b>Allow Multiple modules per project</b> to allow an enterprise application (EAR) project to contain more than one module
-of a particular type. For instance, more than one Application Client module.
-</description>
-<!-- links to Flexible java project stuff-->
-<!--topic label="" href=""/-->
-<!--topic label="" href=""/-->
-</context>
-
-<context id="J2EEAnnotations_PAGE1">
- <!-- J2EE Annotations preferences main-->
-<description>Select the J2EE Annotation Provider to use.
-
-J2EE Annotations allow programmers to add specialized Javadoc tags to their source code, which can be used to generate code artifacts from templates.
-</description>
-<!-- links to annotation stuff (XDoclet and ejbdoclet, and generic info) -->
-<!-- http://xdoclet.sourceforge.net/xdoclet/index.html -->
-<!--topic label="" href=""/-->
-<!--topic label="" href=""/-->
-</context>
-
-<context id="J2EEAnnotations_PAGE2">
- <!-- J2EE Annotations preferences XDoclet-->
-<description>Use this page to set the XDoclet runtime preferences. XDoclet must be installed on the local system to use this function.
-
-Select <b>Enable XDoclet Builder</b> to turn on annotation-based artifact creation.
-
-Select the <b>Version</b> of XDoclet. Supported versions include 1.2.1, 1.2.2, 1.2.3; XDoclet version 1.1.2 is no longer supported.
-
-Provide the installation directory (<b>XDoclet Home</b>) for XDoclet on the local system.
-</description>
-<!-- links to annotation stuff (XDoclet and ejbdoclet, and generic info) -->
-<!-- http://xdoclet.sourceforge.net/xdoclet/index.html -->
-<!--topic label="" href=""/-->
-<!--topic label="" href=""/-->
-</context>
-
-<context id="J2EEAnnotations_PAGE3">
- <!-- J2EE Annotations preferences ejbdoclet-->
-<description>Ejbdoclet is a subset of the XDoclet specification that specifies details on EJB deployment descriptors.
-The syntax of deployment descriptors differs, depending on the vendor of the Application Server being used.
-
-Use this page to define which Application Server vendors to support. You can select one or more Application Server
-vendors, including JBoss, JOnAS, WebLogic, and WebSphere. Also select the version of the Application Server to support.
-</description>
-<!-- links to annotation stuff (XDoclet and ejbdoclet, and generic info) -->
-<!--http://xdoclet.sourceforge.net/xdoclet/ant/xdoclet/modules/ejb/EjbDocletTask.html -->
-<!-- http://www.jboss.org-->
-<!-- http://jonas.objectweb.org/-->
-<!-- http:/www.bea.com-->
-<!-- http://www.ibm.com/software/websphere/-->
-<!--topic label="" href=""/-->
-<!--topic label="" href=""/-->
-</context>
-
-
-
-</contexts>
-
diff --git a/docs/org.eclipse.jst.j2ee.infopop/ProjectCreateWizard_HelpContexts.xml b/docs/org.eclipse.jst.j2ee.infopop/ProjectCreateWizard_HelpContexts.xml
deleted file mode 100644
index a9b9ce1..0000000
--- a/docs/org.eclipse.jst.j2ee.infopop/ProjectCreateWizard_HelpContexts.xml
+++ /dev/null
@@ -1,100 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<?NLS type="org.eclipse.help.contexts"?>
-
-<contexts>
-<context id="csh_outer_container" title="Project creation wizards">
-<description/>
-</context>
-<context id="APPCLIENT_NEW_APPCLIENT_WIZARD_PAGE1" title="New application client">
-<description>Use this wizard to create an application client project.
-
-On this page, name the application client project and select the workspace location to store the project files. You can also select a target runtime for the project and add the project to an enterprise application project.
-
-Click the <b>Modify</b> button under Configuration to edit the facets and runtimes that will be added to or supported by the project.
-
-</description>
-<topic filter="plugin=org.eclipse.jst.j2ee.doc.user" href="../org.eclipse.jst.j2ee.doc.user/topics/cjarch.html" label="J2EE architecture"/>
-<topic filter="plugin=org.eclipse.jst.j2ee.doc.user" href="../org.eclipse.jst.j2ee.doc.user/topics/cjappcliproj.html" label="Application client projects"/>
-<topic filter="plugin=org.eclipse.jst.j2ee.doc.user" href="../org.eclipse.jst.j2ee.doc.user/topics/tjappproj.html" label="Creating an application client project"/>
-</context>
-<context id="APPCLIENT_NEW_APPCLIENT_WIZARD_PAGE3" title="New application client">
-<description>In the <b>Source Folder</b> field, enter the name of the folder to use for source code. If you want to create a default class for the module, select the <b>Create a default Main class</b> check box.
-</description>
-<topic filter="plugin=org.eclipse.jst.j2ee.doc.user" href="../org.eclipse.jst.j2ee.doc.user/topics/cjarch.html" label="J2EE architecture"/>
-<topic filter="plugin=org.eclipse.jst.j2ee.doc.user" href="../org.eclipse.jst.j2ee.doc.user/topics/cjappcliproj.html" label="Application client projects"/>
-<topic filter="plugin=org.eclipse.jst.j2ee.doc.user" href="../org.eclipse.jst.j2ee.doc.user/topics/tjappproj.html" label="Creating an application client project"/>
-</context>
-<context id="EAR_NEW_EAR_WIZARD_PAGE1" title="New EAR">
-<description>Use this wizard to create an enterprise application (EAR) project. An enterprise application project ties together one or more J2EE modules, including application client modules, EJB modules, Connector modules, or Web modules.
-
-On this page, name the EAR application project and select the workspace location to store the project files. You can also select a target runtime and a common configuration for the project.
-
-Click the <b>Modify</b> button under Configuration to edit the facets and runtimes that will be added to or supported by the project.
-
-</description>
-<topic filter="plugin=org.eclipse.jst.j2ee.doc.user" href="../org.eclipse.jst.j2ee.doc.user/topics/cjarch.html" label="J2EE architecture"/>
-<topic filter="plugin=org.eclipse.jst.j2ee.doc.user" href="../org.eclipse.jst.j2ee.doc.user/topics/cjearproj.html" label="Enterprise application projects"/>
-<topic filter="plugin=org.eclipse.jst.j2ee.doc.user" href="../org.eclipse.jst.j2ee.doc.user/topics/tjear.html" label="Creating an enterprise application project"/>
-</context>
-<context id="NEW_EAR_COMP_PAGE">
-<!-- This page is no longer used -->
-<description>Use this page to select the facets the project will have and the runtimes the project will support.
-
-Select the check boxes under <b>Project Facet</b> to select the facets that the project will have. You can also change the default version level of each facet.
-
-To see the runtimes that your new project will support, click <b>Show Runtimes</b>. The <b>Runtimes</b> field lists the available runtimes. Select the check boxes next to the runtimes that you want the new project to support. The <b>Project Facets</b> list shows only the facets supported by the selected runtimes, preventing you from selecting a facet that does not work on a selected runtime. You can also choose a preferred runtime by selecting a runtime and then clicking the <b>Make Preferred</b> button. The preferred runtime provides the classpath for the project.
-
-You can save the settings for this project so you can create other projects with the same settings later. To save the settings for a project, set up the project on the Select Project Facets page, click the <b>Save</b> button, and type a name for the new preset. When you create a project later, you can select that preset from the <b>Presets</b> list.
-
-</description>
-<topic filter="plugin=org.eclipse.jst.j2ee.doc.user" href="../org.eclipse.jst.j2ee.doc.user/topics/cjarch.html" label="J2EE architecture"/>
-<topic filter="plugin=org.eclipse.jst.j2ee.doc.user" href="../org.eclipse.jst.j2ee.doc.user/topics/cfacets.html" label="Project facets"/>
-</context>
-<context id="NEW_EAR_ADD_MODULES_PAGE" title="New EAR">
-<description>Select the check boxes next to each J2EE module you want to add to the new enterprise application project. Click the <b>New Module</b> button to create new modules.</description>
-<topic filter="plugin=org.eclipse.jst.j2ee.doc.user" href="../org.eclipse.jst.j2ee.doc.user/topics/cjarch.html" label="J2EE architecture"/>
-<topic filter="plugin=org.eclipse.jst.j2ee.doc.user" href="../org.eclipse.jst.j2ee.doc.user/topics/tjear.html" label="Creating an enterprise application project"/>
-</context>
-<context id="EAR_NEW_MODULE_PROJECTS_PAGE">
-<description>Use this page to create new J2EE modules to add to the new enterprise application. The wizard can generate a set of default J2EE modules or individual customized J2EE modules.</description>
-<topic filter="plugin=org.eclipse.jst.j2ee.doc.user" href="../org.eclipse.jst.j2ee.doc.user/topics/tjear.html" label="Creating an enterprise application project"/>
-<topic filter="plugin=org.eclipse.jst.j2ee.doc.user" href="../org.eclipse.jst.j2ee.doc.user/topics/cjarch.html" label="J2EE architecture"/>
-</context>
-<context id="EJB_NEW_EJB_WIZARD_PAGE1">
-<description>Use this wizard to create an EJB project.
-
-On this page, name the project and select the workspace location to store the project files. You can also select a target runtime for the project and add the project to an enterprise application project.
-
-Click the <b>Modify</b> button under Configuration to edit the facets and runtimes that will be added to or supported by the project.
-
-</description>
-<topic filter="plugin=org.eclipse.jst.ejb.doc.user" href="../org.eclipse.jst.ejb.doc.user/topics/tecrtpro.html" label="Creating EJB projects"/>
-<topic filter="plugin=org.eclipse.jst.ejb.doc.user" href="../org.eclipse.jst.ejb.doc.user/topics/cearch.html" label="EJB architecture"/>
-<topic filter="plugin=org.eclipse.jst.ejb.doc.user" href="../org.eclipse.jst.ejb.doc.user/topics/ceclientjars.html" label="EJB client JAR projects"/>
-</context>
-<context id="EJB_NEW_EJB_WIZARD_PAGE2">
-<description>
-
-In the Source Folder field, enter the name of the folder to use for source code. You can also specify the name of the EJB client JAR module, as well as the name of the JAR file (<b>Client JAR URI</b>).
-
-</description>
-<topic filter="plugin=org.eclipse.jst.ejb.doc.user" href="../org.eclipse.jst.ejb.doc.user/topics/tecrtpro.html" label="Creating EJB projects"/>
-<topic filter="plugin=org.eclipse.jst.ejb.doc.user" href="../org.eclipse.jst.ejb.doc.user/topics/ceclientjars.html" label="EJB client JAR projects"/>
-</context>
-<context id="JCA_NEWIZARD_PAGE1" title="New connector wizard">
-<description>Use this wizard to create a Connector project. The J2EE Connector Architecture (JCA) specifies how a J2EE application component accesses a connection-based resource.
-
-On this page, name the Connector project and select the workspace location to store the project files. You can also select a target runtime for the project and add the project to an enterprise application project.
-
-Click the <b>Modify</b> button under Configuration to edit the facets and runtimes that will be added to or supported by the project.
-
-</description>
-<topic filter="plugin=org.eclipse.jst.j2ee.doc.user" href="../org.eclipse.jst.j2ee.doc.user/topics/cjarch.html" label="J2EE architecture"/>
-<topic filter="plugin=org.eclipse.jst.j2ee.doc.user" href="../org.eclipse.jst.j2ee.doc.user/topics/tjrar.html" label="Creating a connector project"/>
-</context>
-<context id="JCA_NEWIZARD_PAGE3" title="New connector wizard">
-<description>In the <b>Source Folder</b> field, enter the name of the folder to use for source code.</description>
-<topic filter="plugin=org.eclipse.jst.j2ee.doc.user" href="../org.eclipse.jst.j2ee.doc.user/topics/cjarch.html" label="J2EE architecture"/>
-<topic filter="plugin=org.eclipse.jst.j2ee.doc.user" href="../org.eclipse.jst.j2ee.doc.user/topics/tjrar.html" label="Creating a connector project"/>
-</context>
-</contexts>
diff --git a/docs/org.eclipse.jst.j2ee.infopop/ProjectPrefs_HelpContexts.xml b/docs/org.eclipse.jst.j2ee.infopop/ProjectPrefs_HelpContexts.xml
deleted file mode 100644
index 8bd3a03..0000000
--- a/docs/org.eclipse.jst.j2ee.infopop/ProjectPrefs_HelpContexts.xml
+++ /dev/null
@@ -1,40 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<?NLS type="org.eclipse.help.contexts"?>
-<!-- /*******************************************************************************
- * Copyright (c) 2000, 2005 IBM Corporation and others.
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
- *
- * Contributors:
- * IBM Corporation - initial API and implementation
- *******************************************************************************/ -->
-<contexts>
-<!-- project preferences -->
-
-<context id="JARdep">
- <!-- JAR dependencies preferences-->
-<description>Use this page to specify dependent JAR files for modules within the associated project.
-
-Select <b>Use EJB JARs</b>, <b>Use EJB client JARs</b>, or <b>Allow both</b> to control which JAR files are listed. Then, select the JAR files from the list. This will update the run-time class path and Java project build path with the appropriate JAR files.
-
-The <b>Manifest Class-Path</b> field displays the manifest class-path changes based on the JAR files selected. This field is display only and shows you the class path for your module file.
-</description>
-<!-- need links to EJB base info, EJB Client info, project class paths-->
-<!--topic label="" href=""/-->
-<!--topic label="" href=""/-->
-</context>
-
-<context id="EARmod">
- <!-- EAR modules preferences-->
-<description><!-- page is blank at the time of this writing -->
-</description>
-<!--topic label="" href=""/-->
-<!--topic label="" href=""/-->
-</context>
-
-
-
-</contexts>
-
diff --git a/docs/org.eclipse.jst.j2ee.infopop/about.html b/docs/org.eclipse.jst.j2ee.infopop/about.html
deleted file mode 100644
index 2199df3..0000000
--- a/docs/org.eclipse.jst.j2ee.infopop/about.html
+++ /dev/null
@@ -1,34 +0,0 @@
-<!DOCTYPE HTML PUBLIC "-//W3C//DTD HTML 4.0//EN">
-<HTML>
-
-<head>
-<title>About</title>
-<meta http-equiv=Content-Type content="text/html; charset=ISO-8859-1">
-</head>
-
-<BODY lang="EN-US">
-
-<H3>About This Content</H3>
-
-<P>June, 2008</P>
-
-<H3>License</H3>
-
-<P>The Eclipse Foundation makes available all content in this plug-in
-("Content"). Unless otherwise indicated below, the Content is provided to you
-under the terms and conditions of the Eclipse Public License Version 1.0
-("EPL"). A copy of the EPL is available at
-<A href="http://www.eclipse.org/org/documents/epl-v10.php">http://www.eclipse.org/org/documents/epl-v10.php</A>.
-For purposes of the EPL, "Program" will mean the Content.</P>
-
-<P>If you did not receive this Content directly from the Eclipse Foundation, the
-Content is being redistributed by another party ("Redistributor") and different
-terms and conditions may apply to your use of any object code in the Content.
-Check the Redistributors license that was provided with the Content. If no such
-license exists, contact the Redistributor. Unless otherwise indicated below, the
-terms and conditions of the EPL still apply to any source code in the Content
-and such source code may be obtained at
-<A href="http://www.eclipse.org/">http://www.eclipse.org/</A>.</P>
-
-</BODY>
-</HTML>
diff --git a/docs/org.eclipse.jst.j2ee.infopop/build.properties b/docs/org.eclipse.jst.j2ee.infopop/build.properties
deleted file mode 100644
index 4c7e21a..0000000
--- a/docs/org.eclipse.jst.j2ee.infopop/build.properties
+++ /dev/null
@@ -1,12 +0,0 @@
-bin.includes = EJBCreateWizard_HelpContexts.xml,\
- ExportWizard_HelpContexts.xml,\
- ImportWizard_HelpContexts.xml,\
- J2EEGeneral_HelpContexts.xml,\
- Preferences_HelpContexts.xml,\
- ProjectCreateWizard_HelpContexts.xml,\
- ProjectPrefs_HelpContexts.xml,\
- about.html,\
- plugin.properties,\
- plugin.xml,\
- META-INF/
-generateSourceBundle=false
diff --git a/docs/org.eclipse.jst.j2ee.infopop/plugin.properties b/docs/org.eclipse.jst.j2ee.infopop/plugin.properties
deleted file mode 100644
index b56d2b5..0000000
--- a/docs/org.eclipse.jst.j2ee.infopop/plugin.properties
+++ /dev/null
@@ -1,15 +0,0 @@
-###############################################################################
-# Copyright (c) 2001, 2005 IBM Corporation and others.
-# All rights reserved. This program and the accompanying materials
-# are made available under the terms of the Eclipse Public License v1.0
-# which accompanies this distribution, and is available at
-# http://www.eclipse.org/legal/epl-v10.html
-#
-# Contributors:
-# IBM Corporation - initial API and implementation
-###############################################################################
-# NLS_MESSAGEFORMAT_VAR
-# NLS_ENCODING=UTF-8
-
-pluginName = J2EE tools infopops
-pluginProvider = Eclipse.org
diff --git a/docs/org.eclipse.jst.j2ee.infopop/plugin.xml b/docs/org.eclipse.jst.j2ee.infopop/plugin.xml
deleted file mode 100644
index d8dff6f..0000000
--- a/docs/org.eclipse.jst.j2ee.infopop/plugin.xml
+++ /dev/null
@@ -1,25 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<?NLS TYPE="org.eclipse.help.contexts"?>
-<!-- /*******************************************************************************
- * Copyright (c) 2000, 2006 IBM Corporation and others.
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
- *
- * Contributors:
- * IBM Corporation - initial API and implementation
- *******************************************************************************/ -->
-<plugin>
-
- <extension point="org.eclipse.help.contexts">
- <contexts file="ExportWizard_HelpContexts.xml" plugin="org.eclipse.jst.j2ee.ui" />
- <contexts file="ImportWizard_HelpContexts.xml" plugin="org.eclipse.jst.j2ee.ui" />
- <contexts file="J2EEGeneral_HelpContexts.xml" plugin="org.eclipse.jst.j2ee.ui" />
- <contexts file="ProjectCreateWizard_HelpContexts.xml" plugin="org.eclipse.jst.j2ee.ui" />
- <contexts file="EJBCreateWizard_HelpContexts.xml" />
- <contexts file="ProjectPrefs_HelpContexts.xml" plugin="org.eclipse.jst.j2ee.ui" />
- <contexts file="Preferences_HelpContexts.xml" plugin="org.eclipse.jst.j2ee.ui" />
- </extension>
-
-</plugin>
diff --git a/docs/org.eclipse.jst.servlet.ui.infopop/.cvsignore b/docs/org.eclipse.jst.servlet.ui.infopop/.cvsignore
deleted file mode 100644
index c14487c..0000000
--- a/docs/org.eclipse.jst.servlet.ui.infopop/.cvsignore
+++ /dev/null
@@ -1 +0,0 @@
-build.xml
diff --git a/docs/org.eclipse.jst.servlet.ui.infopop/.project b/docs/org.eclipse.jst.servlet.ui.infopop/.project
deleted file mode 100644
index 26eedc4..0000000
--- a/docs/org.eclipse.jst.servlet.ui.infopop/.project
+++ /dev/null
@@ -1,11 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<projectDescription>
- <name>org.eclipse.jst.servlet.ui.infopop</name>
- <comment></comment>
- <projects>
- </projects>
- <buildSpec>
- </buildSpec>
- <natures>
- </natures>
-</projectDescription>
diff --git a/docs/org.eclipse.jst.servlet.ui.infopop/DynWebWizContexts.xml b/docs/org.eclipse.jst.servlet.ui.infopop/DynWebWizContexts.xml
deleted file mode 100644
index e8bea47..0000000
--- a/docs/org.eclipse.jst.servlet.ui.infopop/DynWebWizContexts.xml
+++ /dev/null
@@ -1,34 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<?NLS type="org.eclipse.help.contexts"?>
-<!-- /*******************************************************************************
- * Copyright (c) 2000, 2006 IBM Corporation and others.
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
- *
- * Contributors:
- * IBM Corporation - initial API and implementation
- *******************************************************************************/ -->
-<contexts>
-<context id="webw1000">
-<description>Use this page to name your Web project and specify the file system location (the place where the resources you create are stored.) When the Use default check box is selected, the project will be created in the file system location where your workspace resides. To change the default file system location, clear the checkbox and locate the path using the <b>Browse</b> button. To configure additional options, select the <b>Next</b> button.
-In the Target Runtime field, select the server where you want to deploy the Web project. if a server is not already defined, click <b>New</b> to select a server runtime environment.
-Click <b>Add project to EAR</b> to add the project to an enterprise application project. The default EAR project name is the name of the Web project appended with EAR.</description>
-<topic label="Creating a dynamic Web project" href="../org.eclipse.wst.webtools.doc.user/topics/twcreprj.html"/>
-</context>
-
-<context id="webw1100">
-<description>Presets are used to define a default set of facet versions that will configure a project for a particular type of development. Select one or more facets for the dynamic Web project. To change the version of the facet, click the facet version and select a version from the drop-down list.
-Click Show Runtimes to view the available runtimes and runtime compositions.</description>
-<topic label="Creating a dynamic Web project" href="../org.eclipse.wst.webtools.doc.user/topics/twcreprj.html"/>
-</context>
-
-<context id="webw1200">
-<description>The context root is the top-level directory of your application when it is deployed to a Web server.
-The Content directory folder is the mandatory location of all Web resources, for example Web pages, style sheets or graphics. If the files are not placed in this directory (or in a subdirectory structure under this directory), the files will not be available when the application is executed on a server.
-The Java source directory contains the project's Java source code for classes, beans, and servlets. When these resources are added to a Web project, they are automatically compiled and the generated files are added to the WEB-INF/classes directory.
-</description>
-<topic label="Creating a dynamic Web project" href="../org.eclipse.wst.webtools.doc.user/topics/twcreprj.html"/>
-</context>
-</contexts>
diff --git a/docs/org.eclipse.jst.servlet.ui.infopop/FilterWizContexts.xml b/docs/org.eclipse.jst.servlet.ui.infopop/FilterWizContexts.xml
deleted file mode 100644
index 25bf23c..0000000
--- a/docs/org.eclipse.jst.servlet.ui.infopop/FilterWizContexts.xml
+++ /dev/null
@@ -1,54 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<?NLS type="org.eclipse.help.contexts"?>
-
-
-<contexts>
-<context id="fltw1050">
-<description>
-A filter is used to give you access to the HttpServletRequest and the HttpServletResponse objects before they are passed into a servlet.
-
-Specify the <b>Project</b> and <b>Folder</b> where the filter class will be placed. The filter class should be stored in the Java source directory, which you specified when you created the Dynamic Web Project (for example src).
-
-Specify the <b>Java package</b> that the class will belong to. If you do not specify one, the class will be added into a default package.
-
-Specify the <b>Class name</b> of the filter (for example MyFilter).
-
-In the field <b>Superclass</b> specify the superclass for the filter,only if it is derived from one. Click <b>Browse</b> to choose from the available, already existing or created, superclasses. (This field is optional).
-
-Check <b>Use existing Filter class</b> and you could get an already existing class and it will be registered automatically in your web.xml.
-
-Note: If you have selected the XDoclet facet when creating the Dynamic Web Project, you can now select <b>Generate a XDoclet annotated class</b>. This will create a XDoclet annotated filter class. The annotations will generate the metadata in the web.xml deployment descriptor.
-</description>
-<topic label="Creating Filters" href="../org.eclipse.wst.webtools.doc.user/topics/twfltwiz.html"/>
-</context>
-
-<context id="fltw1100">
-<description>
-Note that the Class Name value provided in the first page of the wizard is automatically mapped to the <b>Name</b> field on this page.
-
-Specify the <b>Initialization Parameters</b> of the filter as name/value pairs (for example passwords).
-
-In the <b>Filter Mappings</b> field, specify the Servlet, to which the filter will be mapped. Do this by clicking the <b>Add</b> button. In the <b>Add filter mapping</b> dialog that appears after you click the <b>Add</b> button, if you select the <b>Servlet</b> radio button you can choose an existing servlet class, but if you select the <b>URL Pattern</b> radio button you have to enter the URL pattern to which you want to map the filter. In the same dialog, but from <b>Select Dispatchers</b> group, you can choose which dispatchers to be invoked in the deployment descriptor. The dispatcher has four legal values: FORWARD, REQUEST, INCLUDE, and ERROR.
- <b>-</b> A value of <b>FORWARD</b> means the Filter will be applied under <b>RequestDispatcher.forward()</b> calls.
- <b>-</b> A value of <b>REQUEST</b> means the Filter will be applied under ordinary client calls to the <b>path</b> or <b>servlet</b>.
- <b>-</b> A value of <b>INCLUDE</b> means the Filter will be applied under <b>RequestDispatcher.include()</b> calls.
- <b>-</b> A value of <b>ERROR</b> means the Filter will be applied under the error page mechanism.
- <b>-</b> If no despatcher is selected, it indicates that filters will be applied only under ordinary client calls to the <b>path</b> or <b>servlet</b>.
-</description>
-<topic label="Creating Filters" href="../org.eclipse.wst.webtools.doc.user/topics/twfltwiz.html"/>
-</context>
-
-<context id="fltw1200">
-<description>
-Note that the Sun Microsystems Java Servlet Specification states that a Servlet class must be <b>public</b> and not <b>abstract</b>. Therefore, you cannot change these modifiers. The only one available for change is the <b>final</b> modifier.
-
-A filter class must implement the Filter interface, that's why the <b>javax.servlet.Filter</b> is provided as the default Interface. You can also add additional interfaces to implement. Click <b>Add</b> to open the <b>Interface Selection</b> dialog. In this dialog, as you type the name of the interface that you are interested to add, there will be displayed only the interfaces that match the pattern.
-
-Note: Because the methods init, doFilter and destroy are provided from javax.servlet.Filter interface and this interface is obligatory for each Filter class, the option <b>Inherited abstract methods</b> is always checked and can't be changed.
-
-Using the option <b>Constructors from superclass</b> you can choose whether to override the constructor of the class, which you specified as superclass in the first page of the wizard. Note: If you did not specify any class as superclass, you can not check this option.
-</description>
-<topic label="Creating Filters" href="../org.eclipse.wst.webtools.doc.user/topics/twfltwiz.html"/>
-</context>
-
-</contexts>
diff --git a/docs/org.eclipse.jst.servlet.ui.infopop/ListenerWizContexts.xml b/docs/org.eclipse.jst.servlet.ui.infopop/ListenerWizContexts.xml
deleted file mode 100644
index 6d609d1..0000000
--- a/docs/org.eclipse.jst.servlet.ui.infopop/ListenerWizContexts.xml
+++ /dev/null
@@ -1,50 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<?NLS type="org.eclipse.help.contexts"?>
-
-<contexts>
-<context id="lstw1050">
-<description>
-Specify the <b>Project</b> and <b>Folder</b> where the listener class will be placed. The listener class should be stored in the Java source directory, which you specified when you created the Dynamic Web Project (for example src).
-
-Specify the <b>Java package</b> that the class will belong to. If you do not specify one, the class will be added into a default package. Specify the <b>Class name</b> of the listener (for example MyListener).
-
-In the field <b>Superclass</b> specify the superclass for the listener class,only if your listener class is derived from one. Click <b>Browse</b> to choose from the available, already existing or created, superclasses. (This field is optional).
-
-Note: If you have selected the XDoclet facet when creating the Dynamic Web Project, you can now select <b>Generate a XDoclet annotated class</b>. This will create a XDoclet annotated listener class. The annotations will generate the metadata in the web.xml deployment descriptor.
-</description>
-<topic label="Creating Listeners" href="../org.eclipse.wst.webtools.doc.user/topics/twlstwiz.html"/>
-</context>
-
-<context id="lstw1100">
-<description>
-From the <b>Servlet Context Events</b> group, you can select any appropriate group of method stubs to be created in the listener file. These are the methods of the two basic listener interfaces, that are provided from the <b>javax.servlet</b> package:
- <b>-</b> The <b>ServletContextListener</b> interface is used to listen to the ServletContext life cycle events.
- <b>-</b> The <b>ServletContextAttributeListener</b> interface is used to be notified when any attribute is added to the ServletContext or if any of the ServletContext's attributes are changed or removed.
-
-From the <b>HTTP Session Events</b> group, you can select any appropriate group of method stubs to be created in the listener class. These are the methods of the listener interfaces provided from the <b>javax.servlet.http</b> package:
- <b>-</b> The <b>HttpSessionListener</b> and <b>HttpSessionActivationListener</b> interfaces are used to listen to creation, invalidation, activation, passivation and timeout of an HttpEvent object.
- <b>-</b> The <b>HttpSessionAttributeListener</b> and <b>HttpSessionBindingListener</b> interfaces are used to be notified when any attribute is added to, removed from, or replaced in the HttpSession object.
-
-From the <b>Servlet Request Events</b> group, you can select any appropriate group of method stubs to be created in the listener class. These are the methods of the additional listener interfaces provided from the <b>javax.servlet</b> package:
- <b>-</b> The <b>ServletRequestListener</b> interface is used to be notified when a servlet request has started being processed by web components.
- <b>-</b> The <b>ServletRequestAttributeListener</b> interface is used to be notified when any attribute is added to, removed from or replaced in the ServletRequest object.
-
-You can click the <b>Select All</b> button to select all available groups of method stubs or click the <b>Clear</b> button to clear all already selected method stubs.
-</description>
-<topic label="Creating Listeners" href="../org.eclipse.wst.webtools.doc.user/topics/twlstwiz.html"/>
-</context>
-
-<context id="lstw1200">
-<description>
-Note that the Sun Microsystems Java Servlet Specification states that a Servlet class must be <b>public</b> and not <b>abstract</b>. Therefore, you cannot change these modifiers. The only one available for change is the <b>final</b> modifier.
-
-Note that the listener interface of the selected method stubs provided in the previous page of the wizard, is automatically mapped to the Interfaces field on this page. You can click the <b>Add</b> button to add additional interfaces to implement.
-
-If the <b>Inherited abstract methods</b> option is checked, it means that you want to override the methods provided by the interface, which is defined in the <b>Interfaces</b> filed.
-
-Using the option <b>Constructors from superclass</b> you can choose whether to override the constructor of the class, which you specified as superclass in the first page of the wizard. Note: If you did not specify any class as superclass, you can not check this option.
-</description>
-<topic label="Creating Listeners" href="../org.eclipse.wst.webtools.doc.user/topics/twlstwiz.html"/>
-</context>
-
-</contexts>
diff --git a/docs/org.eclipse.jst.servlet.ui.infopop/META-INF/MANIFEST.MF b/docs/org.eclipse.jst.servlet.ui.infopop/META-INF/MANIFEST.MF
deleted file mode 100644
index ae1bc00..0000000
--- a/docs/org.eclipse.jst.servlet.ui.infopop/META-INF/MANIFEST.MF
+++ /dev/null
@@ -1,8 +0,0 @@
-Manifest-Version: 1.0
-Bundle-ManifestVersion: 2
-Bundle-Name: %pluginName
-Bundle-SymbolicName: org.eclipse.jst.servlet.ui.infopop; singleton:=true
-Bundle-Version: 1.0.300.qualifier
-Bundle-Vendor: %pluginProvider
-Bundle-Localization: plugin
-Eclipse-AutoStart: true
diff --git a/docs/org.eclipse.jst.servlet.ui.infopop/ServletWizContexts.xml b/docs/org.eclipse.jst.servlet.ui.infopop/ServletWizContexts.xml
deleted file mode 100644
index 8942b51..0000000
--- a/docs/org.eclipse.jst.servlet.ui.infopop/ServletWizContexts.xml
+++ /dev/null
@@ -1,61 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<?NLS type="org.eclipse.help.contexts"?>
-<!-- /*******************************************************************************
- * Copyright (c) 2000, 2006 IBM Corporation and others.
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
- *
- * Contributors:
- * IBM Corporation - initial API and implementation
- *******************************************************************************/ -->
-<contexts>
-<context id="srvw1050">
-<description>
-Specify the <b>Project</b> and <b>Folder</b> where the servlet class will be placed. The servlet class should be stored in the Java source directory that you specified when you created the Dynamic Web Project (for example src).
-
-Specify the <b>Java package</b> that the class will belong to (it is added into a default package if you do not specify one).
-
-Specify the <b>Class name</b> of the servlet (for example HelloServlet).
-
-In the field <b>Superclass</b> specify a superclass for the servlet class. A servlet created by this wizard can have HttpServlet, or any class that has HttpServlet in its hierarchy as its superclass. Click <b>Browse</b> to choose from the available superclasses.
-
-Check <b>Use existing Servlet class</b> and you could get an already existing class and it will be registered automatically in your web.xml.
-
-Note: If you have selected the XDoclet facet when creating the Dynamic Web Project, you can now select <b>Generate a XDoclet annotated class</b>. This will create a XDoclet annotated servlet class. The annotations will generate the metadata in the web.xml deployment descriptor.
-</description>
-<topic label="Creating Servlets" href="../org.eclipse.wst.webtools.doc.user/topics/twsrvwiz.html"/>
-</context>
-
-<context id="srvw1100">
-<description>
-Note that the Class Name value provided in the first page of the wizard is automatically mapped to the <b>Name</b> field on this page.
-
-Specify the <b>Initialization Parameters</b> of the servlet as name/value pairs, for example passwords.
-
-In the <b>URL Mappings</b> field, specify the URL pattern to be mapped with the servlet.
-</description>
-<topic label="Creating Servlets" href="../org.eclipse.wst.webtools.doc.user/topics/twsrvwiz.html"/>
-</context>
-
-<context id="srvw1200">
-<description>
-Note that the Sun Microsystems Java Servlet Specification states that a Servlet class must be <b>public</b> and not <b>abstract</b>. Therefore, you cannot change these modifiers. The only one available for change is the <b>final</b> modifier.
-
-If one of the HttpServlet or GenericServlet classes is not specified as a superclass of the Servlet class, the <b>javax.servlet.Servlet</b> is provided as the default interface and defines life cycle methods. You can use the wizard to add additional interfaces to implement.Click <b>Add</b> to open the
-<b>Interface Selection</b> dialog. In this dialog, as you type the name of the interface that you are interested in adding in the <b>Choose interfaces</b> field, the list of available interfaces listed in the <b>Matching items</b> list box updates dynamically to display only the interfaces that match the pattern.
-
-When the <b>Inherited abstract methods</b> option is checked you can select which methods, provided by HttpServlet class, to be overridden. The available methods are:
- - <b>init, service and destroy</b> which carries of the servlet's life cycle;
- - <b>getServletConfig and getServletInfo</b>, which returns respectively servlet's ServletConfig object containing initialization and startup parameters and information about the current servlet;
- - the six <b>doXXX</b> that get called when a related HTTP request method is used.
-
-Note: If you did not specify HttpServlet class as superclass in the first page of the wizard, the option <b>Inherited abstract methods</b> is always checked and can not be changed, because each servlet must implement the methods of the javax.servlet.Servlet interface: init, service, destroy, getServletConfig and getServletInfo.
-
-Using the option <b>Constructors from superclass</b> you can choose whether to override the constructor of the class, which you specified as superclass in the first page of the wizard. Note: If you did not specify any class as superclass, you can not check this option.
-</description>
-<topic label="Creating Servlets" href="../org.eclipse.wst.webtools.doc.user/topics/twsrvwiz.html"/>
-</context>
-
-</contexts>
diff --git a/docs/org.eclipse.jst.servlet.ui.infopop/about.html b/docs/org.eclipse.jst.servlet.ui.infopop/about.html
deleted file mode 100644
index 2199df3..0000000
--- a/docs/org.eclipse.jst.servlet.ui.infopop/about.html
+++ /dev/null
@@ -1,34 +0,0 @@
-<!DOCTYPE HTML PUBLIC "-//W3C//DTD HTML 4.0//EN">
-<HTML>
-
-<head>
-<title>About</title>
-<meta http-equiv=Content-Type content="text/html; charset=ISO-8859-1">
-</head>
-
-<BODY lang="EN-US">
-
-<H3>About This Content</H3>
-
-<P>June, 2008</P>
-
-<H3>License</H3>
-
-<P>The Eclipse Foundation makes available all content in this plug-in
-("Content"). Unless otherwise indicated below, the Content is provided to you
-under the terms and conditions of the Eclipse Public License Version 1.0
-("EPL"). A copy of the EPL is available at
-<A href="http://www.eclipse.org/org/documents/epl-v10.php">http://www.eclipse.org/org/documents/epl-v10.php</A>.
-For purposes of the EPL, "Program" will mean the Content.</P>
-
-<P>If you did not receive this Content directly from the Eclipse Foundation, the
-Content is being redistributed by another party ("Redistributor") and different
-terms and conditions may apply to your use of any object code in the Content.
-Check the Redistributors license that was provided with the Content. If no such
-license exists, contact the Redistributor. Unless otherwise indicated below, the
-terms and conditions of the EPL still apply to any source code in the Content
-and such source code may be obtained at
-<A href="http://www.eclipse.org/">http://www.eclipse.org/</A>.</P>
-
-</BODY>
-</HTML>
diff --git a/docs/org.eclipse.jst.servlet.ui.infopop/build.properties b/docs/org.eclipse.jst.servlet.ui.infopop/build.properties
deleted file mode 100644
index 0768acc..0000000
--- a/docs/org.eclipse.jst.servlet.ui.infopop/build.properties
+++ /dev/null
@@ -1,10 +0,0 @@
-bin.includes = ServletWizContexts.xml,\
- FilterWizContexts.xml,\
- ListenerWizContexts.xml,\
- about.html,\
- plugin.xml,\
- plugin.properties,\
- META-INF/,\
- DynWebWizContexts.xml
-src.includes = build.properties
-generateSourceBundle=false
\ No newline at end of file
diff --git a/docs/org.eclipse.jst.servlet.ui.infopop/plugin.properties b/docs/org.eclipse.jst.servlet.ui.infopop/plugin.properties
deleted file mode 100644
index 21abadf..0000000
--- a/docs/org.eclipse.jst.servlet.ui.infopop/plugin.properties
+++ /dev/null
@@ -1,13 +0,0 @@
-###############################################################################
-# Copyright (c) 2001, 2006 IBM Corporation and others.
-# All rights reserved. This program and the accompanying materials
-# are made available under the terms of the Eclipse Public License v1.0
-# which accompanies this distribution, and is available at
-# http://www.eclipse.org/legal/epl-v10.html
-#
-# Contributors:
-# IBM Corporation - initial API and implementation
-###############################################################################
-
-pluginName = Servlet infopop
-pluginProvider = Eclipse.org
\ No newline at end of file
diff --git a/docs/org.eclipse.jst.servlet.ui.infopop/plugin.xml b/docs/org.eclipse.jst.servlet.ui.infopop/plugin.xml
deleted file mode 100644
index aff6d1f..0000000
--- a/docs/org.eclipse.jst.servlet.ui.infopop/plugin.xml
+++ /dev/null
@@ -1,34 +0,0 @@
-<?xml version="1.0" encoding="UTF-8" ?>
-
-<!-- ================================================= -->
-<!-- This is the plugin for declaring the help -->
-<!-- contributions for using the tool. -->
-<!-- ================================================= -->
-<!-- /*******************************************************************************
- * Copyright (c) 2000, 2006 IBM Corporation and others.
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
- *
- * Contributors:
- * IBM Corporation - initial API and implementation
- *******************************************************************************/ -->
-<plugin>
-
-<extension point="org.eclipse.help.contexts">
- <contexts file="ServletWizContexts.xml" plugin ="org.eclipse.jst.servlet.ui"/>
- <contexts file="DynWebWizContexts.xml" plugin ="org.eclipse.jst.servlet.ui"/>
- <contexts
- file="ListenerWizContexts.xml"
- plugin="org.eclipse.jst.servlet.ui">
- </contexts>
- <contexts
- file="FilterWizContexts.xml"
- plugin="org.eclipse.jst.servlet.ui">
- </contexts>
-
-</extension>
-
-
-</plugin>
diff --git a/docs/org.eclipse.wst.web.ui.infopop/.cvsignore b/docs/org.eclipse.wst.web.ui.infopop/.cvsignore
deleted file mode 100644
index c14487c..0000000
--- a/docs/org.eclipse.wst.web.ui.infopop/.cvsignore
+++ /dev/null
@@ -1 +0,0 @@
-build.xml
diff --git a/docs/org.eclipse.wst.web.ui.infopop/.project b/docs/org.eclipse.wst.web.ui.infopop/.project
deleted file mode 100644
index 10c4a6e..0000000
--- a/docs/org.eclipse.wst.web.ui.infopop/.project
+++ /dev/null
@@ -1,11 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<projectDescription>
- <name>org.eclipse.wst.web.ui.infopop</name>
- <comment></comment>
- <projects>
- </projects>
- <buildSpec>
- </buildSpec>
- <natures>
- </natures>
-</projectDescription>
diff --git a/docs/org.eclipse.wst.web.ui.infopop/META-INF/MANIFEST.MF b/docs/org.eclipse.wst.web.ui.infopop/META-INF/MANIFEST.MF
deleted file mode 100644
index 8a60c52..0000000
--- a/docs/org.eclipse.wst.web.ui.infopop/META-INF/MANIFEST.MF
+++ /dev/null
@@ -1,8 +0,0 @@
-Manifest-Version: 1.0
-Bundle-ManifestVersion: 2
-Bundle-Name: Static Web infopop
-Bundle-SymbolicName: org.eclipse.wst.web.ui.infopop; singleton:=true
-Bundle-Version: 1.0.300.qualifier
-Bundle-Vendor: %pluginProvider
-Bundle-Localization: plugin
-Eclipse-AutoStart: true
diff --git a/docs/org.eclipse.wst.web.ui.infopop/StaticWebWizContexts.xml b/docs/org.eclipse.wst.web.ui.infopop/StaticWebWizContexts.xml
deleted file mode 100644
index bf0f403..0000000
--- a/docs/org.eclipse.wst.web.ui.infopop/StaticWebWizContexts.xml
+++ /dev/null
@@ -1,33 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<?NLS type="org.eclipse.help.contexts"?>
-<!-- /*******************************************************************************
- * Copyright (c) 2000, 2006 IBM Corporation and others.
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
- *
- * Contributors:
- * IBM Corporation - initial API and implementation
- *******************************************************************************/ -->
-<contexts>
-<context id="webw2000">
-<description> Use this page to name your Web project and specify the file system location (the place where the resources you create are stored.) When the Use default check box is selected, the project will be created in the file system location where your workspace resides. To change the default file system location, clear the checkbox and locate the path using the <b>Browse</b> button. To configure additional options, select the <b>Next</b> button.
-In the Target Runtime field, select the server where you want to publish the Web project. if a server is not already defined, click <b>New</b> to select a server runtime environment. </description>
-<topic label="Creating a static Web project" href="../org.eclipse.wst.webtools.doc.user/topics/twcresta.html"/>
-</context>
-
-<context id="webw2100">
-<description>Presets are used to define a default set of facet versions that will configure a project for a particular type of development. The Static Web Module facet enables the project to be deployed as a static
-Web module. Click Show Runtimes to view the available runtimes and runtime compositions.</description>
-<topic label="Creating a static Web project" href="../org.eclipse.wst.webtools.doc.user/topics/twcresta.html"/>
-</context>
-
-<context id="webw2200">
-<description>The Web content folder is where the elements of your Web site such as Web pages, graphics and style sheets are stored. This directory structure is necessary to ensure that the content of your Web site will be included in the WAR file at deployment and that link validation will work correctly.
-</description>
-<topic label="Creating a static Web project" href="../org.eclipse.wst.webtools.doc.user/topics/twcresta.html"/>
-</context>
-
-
-</contexts>
diff --git a/docs/org.eclipse.wst.web.ui.infopop/about.html b/docs/org.eclipse.wst.web.ui.infopop/about.html
deleted file mode 100644
index 2199df3..0000000
--- a/docs/org.eclipse.wst.web.ui.infopop/about.html
+++ /dev/null
@@ -1,34 +0,0 @@
-<!DOCTYPE HTML PUBLIC "-//W3C//DTD HTML 4.0//EN">
-<HTML>
-
-<head>
-<title>About</title>
-<meta http-equiv=Content-Type content="text/html; charset=ISO-8859-1">
-</head>
-
-<BODY lang="EN-US">
-
-<H3>About This Content</H3>
-
-<P>June, 2008</P>
-
-<H3>License</H3>
-
-<P>The Eclipse Foundation makes available all content in this plug-in
-("Content"). Unless otherwise indicated below, the Content is provided to you
-under the terms and conditions of the Eclipse Public License Version 1.0
-("EPL"). A copy of the EPL is available at
-<A href="http://www.eclipse.org/org/documents/epl-v10.php">http://www.eclipse.org/org/documents/epl-v10.php</A>.
-For purposes of the EPL, "Program" will mean the Content.</P>
-
-<P>If you did not receive this Content directly from the Eclipse Foundation, the
-Content is being redistributed by another party ("Redistributor") and different
-terms and conditions may apply to your use of any object code in the Content.
-Check the Redistributors license that was provided with the Content. If no such
-license exists, contact the Redistributor. Unless otherwise indicated below, the
-terms and conditions of the EPL still apply to any source code in the Content
-and such source code may be obtained at
-<A href="http://www.eclipse.org/">http://www.eclipse.org/</A>.</P>
-
-</BODY>
-</HTML>
diff --git a/docs/org.eclipse.wst.web.ui.infopop/build.properties b/docs/org.eclipse.wst.web.ui.infopop/build.properties
deleted file mode 100644
index 0c7c1a9..0000000
--- a/docs/org.eclipse.wst.web.ui.infopop/build.properties
+++ /dev/null
@@ -1,7 +0,0 @@
-bin.includes = StaticWebWizContexts.xml,\
- about.html,\
- plugin.xml,\
- plugin.properties,\
- META-INF/
-src.includes = build.properties
-generateSourceBundle=false
\ No newline at end of file
diff --git a/docs/org.eclipse.wst.web.ui.infopop/plugin.properties b/docs/org.eclipse.wst.web.ui.infopop/plugin.properties
deleted file mode 100644
index b61d2de..0000000
--- a/docs/org.eclipse.wst.web.ui.infopop/plugin.properties
+++ /dev/null
@@ -1,13 +0,0 @@
-###############################################################################
-# Copyright (c) 2006 IBM Corporation and others.
-# All rights reserved. This program and the accompanying materials
-# are made available under the terms of the Eclipse Public License v1.0
-# which accompanies this distribution, and is available at
-# http://www.eclipse.org/legal/epl-v10.html
-#
-# Contributors:
-# IBM Corporation - initial API and implementation
-###############################################################################
-
-pluginName = Static Web infopop
-pluginProvider = Eclipse.org
\ No newline at end of file
diff --git a/docs/org.eclipse.wst.web.ui.infopop/plugin.xml b/docs/org.eclipse.wst.web.ui.infopop/plugin.xml
deleted file mode 100644
index 20ac018..0000000
--- a/docs/org.eclipse.wst.web.ui.infopop/plugin.xml
+++ /dev/null
@@ -1,24 +0,0 @@
-<?xml version="1.0" encoding="UTF-8" ?>
-
-<!-- ================================================= -->
-<!-- This is the plugin for declaring the help -->
-<!-- contributions for using the tool. -->
-<!-- ================================================= -->
-<!-- /*******************************************************************************
- * Copyright (c) 2000, 2006 IBM Corporation and others.
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
- *
- * Contributors:
- * IBM Corporation - initial API and implementation
- *******************************************************************************/ -->
-<plugin>
-
-<extension point="org.eclipse.help.contexts">
- <contexts file="StaticWebWizContexts.xml" plugin ="org.eclipse.wst.web.ui"/>
-</extension>
-
-
-</plugin>
\ No newline at end of file
diff --git a/features/org.eclipse.jst.enterprise_core.feature/.cvsignore b/features/org.eclipse.jst.enterprise_core.feature/.cvsignore
deleted file mode 100644
index c14487c..0000000
--- a/features/org.eclipse.jst.enterprise_core.feature/.cvsignore
+++ /dev/null
@@ -1 +0,0 @@
-build.xml
diff --git a/features/org.eclipse.jst.enterprise_core.feature/.project b/features/org.eclipse.jst.enterprise_core.feature/.project
deleted file mode 100644
index b522b47..0000000
--- a/features/org.eclipse.jst.enterprise_core.feature/.project
+++ /dev/null
@@ -1,17 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<projectDescription>
- <name>org.eclipse.jst.enterprise_core.feature</name>
- <comment></comment>
- <projects>
- </projects>
- <buildSpec>
- <buildCommand>
- <name>org.eclipse.pde.FeatureBuilder</name>
- <arguments>
- </arguments>
- </buildCommand>
- </buildSpec>
- <natures>
- <nature>org.eclipse.pde.FeatureNature</nature>
- </natures>
-</projectDescription>
diff --git a/features/org.eclipse.jst.enterprise_core.feature/build.properties b/features/org.eclipse.jst.enterprise_core.feature/build.properties
deleted file mode 100644
index 7f47694..0000000
--- a/features/org.eclipse.jst.enterprise_core.feature/build.properties
+++ /dev/null
@@ -1,5 +0,0 @@
-bin.includes = feature.xml,\
- eclipse_update_120.jpg,\
- epl-v10.html,\
- license.html,\
- feature.properties
diff --git a/features/org.eclipse.jst.enterprise_core.feature/eclipse_update_120.jpg b/features/org.eclipse.jst.enterprise_core.feature/eclipse_update_120.jpg
deleted file mode 100644
index bfdf708..0000000
--- a/features/org.eclipse.jst.enterprise_core.feature/eclipse_update_120.jpg
+++ /dev/null
Binary files differ
diff --git a/features/org.eclipse.jst.enterprise_core.feature/epl-v10.html b/features/org.eclipse.jst.enterprise_core.feature/epl-v10.html
deleted file mode 100644
index ed4b196..0000000
--- a/features/org.eclipse.jst.enterprise_core.feature/epl-v10.html
+++ /dev/null
@@ -1,328 +0,0 @@
-<html xmlns:o="urn:schemas-microsoft-com:office:office"
-xmlns:w="urn:schemas-microsoft-com:office:word"
-xmlns="http://www.w3.org/TR/REC-html40">
-
-<head>
-<meta http-equiv=Content-Type content="text/html; charset=windows-1252">
-<meta name=ProgId content=Word.Document>
-<meta name=Generator content="Microsoft Word 9">
-<meta name=Originator content="Microsoft Word 9">
-<link rel=File-List
-href="./Eclipse%20EPL%202003_11_10%20Final_files/filelist.xml">
-<title>Eclipse Public License - Version 1.0</title>
-<!--[if gte mso 9]><xml>
- <o:DocumentProperties>
- <o:Revision>2</o:Revision>
- <o:TotalTime>3</o:TotalTime>
- <o:Created>2004-03-05T23:03:00Z</o:Created>
- <o:LastSaved>2004-03-05T23:03:00Z</o:LastSaved>
- <o:Pages>4</o:Pages>
- <o:Words>1626</o:Words>
- <o:Characters>9270</o:Characters>
- <o:Lines>77</o:Lines>
- <o:Paragraphs>18</o:Paragraphs>
- <o:CharactersWithSpaces>11384</o:CharactersWithSpaces>
- <o:Version>9.4402</o:Version>
- </o:DocumentProperties>
-</xml><![endif]--><!--[if gte mso 9]><xml>
- <w:WordDocument>
- <w:TrackRevisions/>
- </w:WordDocument>
-</xml><![endif]-->
-<style>
-<!--
- /* Font Definitions */
-@font-face
- {font-family:Tahoma;
- panose-1:2 11 6 4 3 5 4 4 2 4;
- mso-font-charset:0;
- mso-generic-font-family:swiss;
- mso-font-pitch:variable;
- mso-font-signature:553679495 -2147483648 8 0 66047 0;}
- /* Style Definitions */
-p.MsoNormal, li.MsoNormal, div.MsoNormal
- {mso-style-parent:"";
- margin:0in;
- margin-bottom:.0001pt;
- mso-pagination:widow-orphan;
- font-size:12.0pt;
- font-family:"Times New Roman";
- mso-fareast-font-family:"Times New Roman";}
-p
- {margin-right:0in;
- mso-margin-top-alt:auto;
- mso-margin-bottom-alt:auto;
- margin-left:0in;
- mso-pagination:widow-orphan;
- font-size:12.0pt;
- font-family:"Times New Roman";
- mso-fareast-font-family:"Times New Roman";}
-p.BalloonText, li.BalloonText, div.BalloonText
- {mso-style-name:"Balloon Text";
- margin:0in;
- margin-bottom:.0001pt;
- mso-pagination:widow-orphan;
- font-size:8.0pt;
- font-family:Tahoma;
- mso-fareast-font-family:"Times New Roman";}
-@page Section1
- {size:8.5in 11.0in;
- margin:1.0in 1.25in 1.0in 1.25in;
- mso-header-margin:.5in;
- mso-footer-margin:.5in;
- mso-paper-source:0;}
-div.Section1
- {page:Section1;}
--->
-</style>
-</head>
-
-<body lang=EN-US style='tab-interval:.5in'>
-
-<div class=Section1>
-
-<p align=center style='text-align:center'><b>Eclipse Public License - v 1.0</b>
-</p>
-
-<p><span style='font-size:10.0pt'>THE ACCOMPANYING PROGRAM IS PROVIDED UNDER
-THE TERMS OF THIS ECLIPSE PUBLIC LICENSE ("AGREEMENT"). ANY USE,
-REPRODUCTION OR DISTRIBUTION OF THE PROGRAM CONSTITUTES RECIPIENT'S ACCEPTANCE
-OF THIS AGREEMENT.</span> </p>
-
-<p><b><span style='font-size:10.0pt'>1. DEFINITIONS</span></b> </p>
-
-<p><span style='font-size:10.0pt'>"Contribution" means:</span> </p>
-
-<p class=MsoNormal style='margin-left:.5in'><span style='font-size:10.0pt'>a)
-in the case of the initial Contributor, the initial code and documentation
-distributed under this Agreement, and<br clear=left>
-b) in the case of each subsequent Contributor:</span></p>
-
-<p class=MsoNormal style='margin-left:.5in'><span style='font-size:10.0pt'>i)
-changes to the Program, and</span></p>
-
-<p class=MsoNormal style='margin-left:.5in'><span style='font-size:10.0pt'>ii)
-additions to the Program;</span></p>
-
-<p class=MsoNormal style='margin-left:.5in'><span style='font-size:10.0pt'>where
-such changes and/or additions to the Program originate from and are distributed
-by that particular Contributor. A Contribution 'originates' from a Contributor
-if it was added to the Program by such Contributor itself or anyone acting on
-such Contributor's behalf. Contributions do not include additions to the
-Program which: (i) are separate modules of software distributed in conjunction
-with the Program under their own license agreement, and (ii) are not derivative
-works of the Program. </span></p>
-
-<p><span style='font-size:10.0pt'>"Contributor" means any person or
-entity that distributes the Program.</span> </p>
-
-<p><span style='font-size:10.0pt'>"Licensed Patents " mean patent
-claims licensable by a Contributor which are necessarily infringed by the use
-or sale of its Contribution alone or when combined with the Program. </span></p>
-
-<p><span style='font-size:10.0pt'>"Program" means the Contributions
-distributed in accordance with this Agreement.</span> </p>
-
-<p><span style='font-size:10.0pt'>"Recipient" means anyone who
-receives the Program under this Agreement, including all Contributors.</span> </p>
-
-<p><b><span style='font-size:10.0pt'>2. GRANT OF RIGHTS</span></b> </p>
-
-<p class=MsoNormal style='margin-left:.5in'><span style='font-size:10.0pt'>a)
-Subject to the terms of this Agreement, each Contributor hereby grants Recipient
-a non-exclusive, worldwide, royalty-free copyright license to<span
-style='color:red'> </span>reproduce, prepare derivative works of, publicly
-display, publicly perform, distribute and sublicense the Contribution of such
-Contributor, if any, and such derivative works, in source code and object code
-form.</span></p>
-
-<p class=MsoNormal style='margin-left:.5in'><span style='font-size:10.0pt'>b)
-Subject to the terms of this Agreement, each Contributor hereby grants
-Recipient a non-exclusive, worldwide,<span style='color:green'> </span>royalty-free
-patent license under Licensed Patents to make, use, sell, offer to sell, import
-and otherwise transfer the Contribution of such Contributor, if any, in source
-code and object code form. This patent license shall apply to the combination
-of the Contribution and the Program if, at the time the Contribution is added
-by the Contributor, such addition of the Contribution causes such combination
-to be covered by the Licensed Patents. The patent license shall not apply to
-any other combinations which include the Contribution. No hardware per se is
-licensed hereunder. </span></p>
-
-<p class=MsoNormal style='margin-left:.5in'><span style='font-size:10.0pt'>c)
-Recipient understands that although each Contributor grants the licenses to its
-Contributions set forth herein, no assurances are provided by any Contributor
-that the Program does not infringe the patent or other intellectual property
-rights of any other entity. Each Contributor disclaims any liability to Recipient
-for claims brought by any other entity based on infringement of intellectual
-property rights or otherwise. As a condition to exercising the rights and
-licenses granted hereunder, each Recipient hereby assumes sole responsibility
-to secure any other intellectual property rights needed, if any. For example,
-if a third party patent license is required to allow Recipient to distribute
-the Program, it is Recipient's responsibility to acquire that license before
-distributing the Program.</span></p>
-
-<p class=MsoNormal style='margin-left:.5in'><span style='font-size:10.0pt'>d)
-Each Contributor represents that to its knowledge it has sufficient copyright
-rights in its Contribution, if any, to grant the copyright license set forth in
-this Agreement. </span></p>
-
-<p><b><span style='font-size:10.0pt'>3. REQUIREMENTS</span></b> </p>
-
-<p><span style='font-size:10.0pt'>A Contributor may choose to distribute the
-Program in object code form under its own license agreement, provided that:</span>
-</p>
-
-<p class=MsoNormal style='margin-left:.5in'><span style='font-size:10.0pt'>a)
-it complies with the terms and conditions of this Agreement; and</span></p>
-
-<p class=MsoNormal style='margin-left:.5in'><span style='font-size:10.0pt'>b)
-its license agreement:</span></p>
-
-<p class=MsoNormal style='margin-left:.5in'><span style='font-size:10.0pt'>i)
-effectively disclaims on behalf of all Contributors all warranties and
-conditions, express and implied, including warranties or conditions of title
-and non-infringement, and implied warranties or conditions of merchantability
-and fitness for a particular purpose; </span></p>
-
-<p class=MsoNormal style='margin-left:.5in'><span style='font-size:10.0pt'>ii)
-effectively excludes on behalf of all Contributors all liability for damages,
-including direct, indirect, special, incidental and consequential damages, such
-as lost profits; </span></p>
-
-<p class=MsoNormal style='margin-left:.5in'><span style='font-size:10.0pt'>iii)
-states that any provisions which differ from this Agreement are offered by that
-Contributor alone and not by any other party; and</span></p>
-
-<p class=MsoNormal style='margin-left:.5in'><span style='font-size:10.0pt'>iv)
-states that source code for the Program is available from such Contributor, and
-informs licensees how to obtain it in a reasonable manner on or through a
-medium customarily used for software exchange.<span style='color:blue'> </span></span></p>
-
-<p><span style='font-size:10.0pt'>When the Program is made available in source
-code form:</span> </p>
-
-<p class=MsoNormal style='margin-left:.5in'><span style='font-size:10.0pt'>a)
-it must be made available under this Agreement; and </span></p>
-
-<p class=MsoNormal style='margin-left:.5in'><span style='font-size:10.0pt'>b) a
-copy of this Agreement must be included with each copy of the Program. </span></p>
-
-<p><span style='font-size:10.0pt'>Contributors may not remove or alter any
-copyright notices contained within the Program. </span></p>
-
-<p><span style='font-size:10.0pt'>Each Contributor must identify itself as the
-originator of its Contribution, if any, in a manner that reasonably allows
-subsequent Recipients to identify the originator of the Contribution. </span></p>
-
-<p><b><span style='font-size:10.0pt'>4. COMMERCIAL DISTRIBUTION</span></b> </p>
-
-<p><span style='font-size:10.0pt'>Commercial distributors of software may
-accept certain responsibilities with respect to end users, business partners
-and the like. While this license is intended to facilitate the commercial use
-of the Program, the Contributor who includes the Program in a commercial
-product offering should do so in a manner which does not create potential
-liability for other Contributors. Therefore, if a Contributor includes the
-Program in a commercial product offering, such Contributor ("Commercial
-Contributor") hereby agrees to defend and indemnify every other
-Contributor ("Indemnified Contributor") against any losses, damages and
-costs (collectively "Losses") arising from claims, lawsuits and other
-legal actions brought by a third party against the Indemnified Contributor to
-the extent caused by the acts or omissions of such Commercial Contributor in
-connection with its distribution of the Program in a commercial product
-offering. The obligations in this section do not apply to any claims or Losses
-relating to any actual or alleged intellectual property infringement. In order
-to qualify, an Indemnified Contributor must: a) promptly notify the Commercial
-Contributor in writing of such claim, and b) allow the Commercial Contributor
-to control, and cooperate with the Commercial Contributor in, the defense and
-any related settlement negotiations. The Indemnified Contributor may participate
-in any such claim at its own expense.</span> </p>
-
-<p><span style='font-size:10.0pt'>For example, a Contributor might include the
-Program in a commercial product offering, Product X. That Contributor is then a
-Commercial Contributor. If that Commercial Contributor then makes performance
-claims, or offers warranties related to Product X, those performance claims and
-warranties are such Commercial Contributor's responsibility alone. Under this
-section, the Commercial Contributor would have to defend claims against the
-other Contributors related to those performance claims and warranties, and if a
-court requires any other Contributor to pay any damages as a result, the
-Commercial Contributor must pay those damages.</span> </p>
-
-<p><b><span style='font-size:10.0pt'>5. NO WARRANTY</span></b> </p>
-
-<p><span style='font-size:10.0pt'>EXCEPT AS EXPRESSLY SET FORTH IN THIS
-AGREEMENT, THE PROGRAM IS PROVIDED ON AN "AS IS" BASIS, WITHOUT
-WARRANTIES OR CONDITIONS OF ANY KIND, EITHER EXPRESS OR IMPLIED INCLUDING,
-WITHOUT LIMITATION, ANY WARRANTIES OR CONDITIONS OF TITLE, NON-INFRINGEMENT,
-MERCHANTABILITY OR FITNESS FOR A PARTICULAR PURPOSE. Each Recipient is solely
-responsible for determining the appropriateness of using and distributing the
-Program and assumes all risks associated with its exercise of rights under this
-Agreement , including but not limited to the risks and costs of program errors,
-compliance with applicable laws, damage to or loss of data, programs or
-equipment, and unavailability or interruption of operations. </span></p>
-
-<p><b><span style='font-size:10.0pt'>6. DISCLAIMER OF LIABILITY</span></b> </p>
-
-<p><span style='font-size:10.0pt'>EXCEPT AS EXPRESSLY SET FORTH IN THIS
-AGREEMENT, NEITHER RECIPIENT NOR ANY CONTRIBUTORS SHALL HAVE ANY LIABILITY FOR
-ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES
-(INCLUDING WITHOUT LIMITATION LOST PROFITS), HOWEVER CAUSED AND ON ANY THEORY
-OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING
-NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OR DISTRIBUTION OF
-THE PROGRAM OR THE EXERCISE OF ANY RIGHTS GRANTED HEREUNDER, EVEN IF ADVISED OF
-THE POSSIBILITY OF SUCH DAMAGES.</span> </p>
-
-<p><b><span style='font-size:10.0pt'>7. GENERAL</span></b> </p>
-
-<p><span style='font-size:10.0pt'>If any provision of this Agreement is invalid
-or unenforceable under applicable law, it shall not affect the validity or
-enforceability of the remainder of the terms of this Agreement, and without
-further action by the parties hereto, such provision shall be reformed to the
-minimum extent necessary to make such provision valid and enforceable.</span> </p>
-
-<p><span style='font-size:10.0pt'>If Recipient institutes patent litigation
-against any entity (including a cross-claim or counterclaim in a lawsuit)
-alleging that the Program itself (excluding combinations of the Program with
-other software or hardware) infringes such Recipient's patent(s), then such
-Recipient's rights granted under Section 2(b) shall terminate as of the date
-such litigation is filed. </span></p>
-
-<p><span style='font-size:10.0pt'>All Recipient's rights under this Agreement
-shall terminate if it fails to comply with any of the material terms or
-conditions of this Agreement and does not cure such failure in a reasonable
-period of time after becoming aware of such noncompliance. If all Recipient's
-rights under this Agreement terminate, Recipient agrees to cease use and
-distribution of the Program as soon as reasonably practicable. However,
-Recipient's obligations under this Agreement and any licenses granted by
-Recipient relating to the Program shall continue and survive. </span></p>
-
-<p><span style='font-size:10.0pt'>Everyone is permitted to copy and distribute
-copies of this Agreement, but in order to avoid inconsistency the Agreement is
-copyrighted and may only be modified in the following manner. The Agreement
-Steward reserves the right to publish new versions (including revisions) of
-this Agreement from time to time. No one other than the Agreement Steward has
-the right to modify this Agreement. The Eclipse Foundation is the initial
-Agreement Steward. The Eclipse Foundation may assign the responsibility to
-serve as the Agreement Steward to a suitable separate entity. Each new version
-of the Agreement will be given a distinguishing version number. The Program
-(including Contributions) may always be distributed subject to the version of
-the Agreement under which it was received. In addition, after a new version of
-the Agreement is published, Contributor may elect to distribute the Program
-(including its Contributions) under the new version. Except as expressly stated
-in Sections 2(a) and 2(b) above, Recipient receives no rights or licenses to
-the intellectual property of any Contributor under this Agreement, whether
-expressly, by implication, estoppel or otherwise. All rights in the Program not
-expressly granted under this Agreement are reserved.</span> </p>
-
-<p><span style='font-size:10.0pt'>This Agreement is governed by the laws of the
-State of New York and the intellectual property laws of the United States of
-America. No party to this Agreement will bring a legal action under this
-Agreement more than one year after the cause of action arose. Each party waives
-its rights to a jury trial in any resulting litigation.</span> </p>
-
-<p class=MsoNormal><![if !supportEmptyParas]> <![endif]><o:p></o:p></p>
-
-</div>
-
-</body>
-
-</html>
\ No newline at end of file
diff --git a/features/org.eclipse.jst.enterprise_core.feature/feature.properties b/features/org.eclipse.jst.enterprise_core.feature/feature.properties
deleted file mode 100644
index 1174af3..0000000
--- a/features/org.eclipse.jst.enterprise_core.feature/feature.properties
+++ /dev/null
@@ -1,168 +0,0 @@
-###############################################################################
-# Copyright (c) 2006 IBM Corporation and others.
-# All rights reserved. This program and the accompanying materials
-# are made available under the terms of the Eclipse Public License v1.0
-# which accompanies this distribution, and is available at
-# http://www.eclipse.org/legal/epl-v10.html
-#
-# Contributors:
-# IBM Corporation - initial API and implementation
-###############################################################################
-# feature.properties
-# contains externalized strings for feature.xml
-# "%foo" in feature.xml corresponds to the key "foo" in this file
-# java.io.Properties file (ISO 8859-1 with "\" escapes)
-# This file should be translated.
-
-# "featureName" property - name of the feature
-featureName=JST Enterprise Core
-
-# "providerName" property - name of the company that provides the feature
-providerName=Eclipse Web Tools Platform
-
-
-# "description" property - description of the feature
-description=JST enterprise core functionality
-
-# "copyright" property - text of the "Feature Update Copyright"
-copyright=\
-Copyright (c) 2006 IBM Corporation and others.\n\
-All rights reserved. This program and the accompanying materials\n\
-are made available under the terms of the Eclipse Public License v1.0\n\
-which accompanies this distribution, and is available at\n\
-http://www.eclipse.org/legal/epl-v10.html\n\
-\n\
-Contributors:\n\
- IBM Corporation - initial API and implementation\n
-################ end of copyright property ####################################
-
-# "licenseURL" property - URL of the "Feature License"
-# do not translate value - just change to point to a locale-specific HTML page
-licenseURL=license.html
-
-# "license" property - text of the "Feature Update License"
-# should be plain text version of license agreement pointed to be "licenseURL"
-license=\
-Eclipse Foundation Software User Agreement\n\
-April 14, 2010\n\
-\n\
-Usage Of Content\n\
-\n\
-THE ECLIPSE FOUNDATION MAKES AVAILABLE SOFTWARE, DOCUMENTATION, INFORMATION AND/OR\n\
-OTHER MATERIALS FOR OPEN SOURCE PROJECTS (COLLECTIVELY "CONTENT").\n\
-USE OF THE CONTENT IS GOVERNED BY THE TERMS AND CONDITIONS OF THIS\n\
-AGREEMENT AND/OR THE TERMS AND CONDITIONS OF LICENSE AGREEMENTS OR\n\
-NOTICES INDICATED OR REFERENCED BELOW. BY USING THE CONTENT, YOU\n\
-AGREE THAT YOUR USE OF THE CONTENT IS GOVERNED BY THIS AGREEMENT\n\
-AND/OR THE TERMS AND CONDITIONS OF ANY APPLICABLE LICENSE AGREEMENTS\n\
-OR NOTICES INDICATED OR REFERENCED BELOW. IF YOU DO NOT AGREE TO THE\n\
-TERMS AND CONDITIONS OF THIS AGREEMENT AND THE TERMS AND CONDITIONS\n\
-OF ANY APPLICABLE LICENSE AGREEMENTS OR NOTICES INDICATED OR REFERENCED\n\
-BELOW, THEN YOU MAY NOT USE THE CONTENT.\n\
-\n\
-Applicable Licenses\n\
-\n\
-Unless otherwise indicated, all Content made available by the\n\
-Eclipse Foundation is provided to you under the terms and conditions of\n\
-the Eclipse Public License Version 1.0 ("EPL"). A copy of the EPL is\n\
-provided with this Content and is also available at http://www.eclipse.org/legal/epl-v10.html.\n\
-For purposes of the EPL, "Program" will mean the Content.\n\
-\n\
-Content includes, but is not limited to, source code, object code,\n\
-documentation and other files maintained in the Eclipse Foundation source code\n\
-repository ("Repository") in software modules ("Modules") and made available\n\
-as downloadable archives ("Downloads").\n\
-\n\
- - Content may be structured and packaged into modules to facilitate delivering,\n\
- extending, and upgrading the Content. Typical modules may include plug-ins ("Plug-ins"),\n\
- plug-in fragments ("Fragments"), and features ("Features").\n\
- - Each Plug-in or Fragment may be packaged as a sub-directory or JAR (Java(TM) ARchive)\n\
- in a directory named "plugins".\n\
- - A Feature is a bundle of one or more Plug-ins and/or Fragments and associated material.\n\
- Each Feature may be packaged as a sub-directory in a directory named "features".\n\
- Within a Feature, files named "feature.xml" may contain a list of the names and version\n\
- numbers of the Plug-ins and/or Fragments associated with that Feature.\n\
- - Features may also include other Features ("Included Features"). Within a Feature, files\n\
- named "feature.xml" may contain a list of the names and version numbers of Included Features.\n\
-\n\
-The terms and conditions governing Plug-ins and Fragments should be\n\
-contained in files named "about.html" ("Abouts"). The terms and\n\
-conditions governing Features and Included Features should be contained\n\
-in files named "license.html" ("Feature Licenses"). Abouts and Feature\n\
-Licenses may be located in any directory of a Download or Module\n\
-including, but not limited to the following locations:\n\
-\n\
- - The top-level (root) directory\n\
- - Plug-in and Fragment directories\n\
- - Inside Plug-ins and Fragments packaged as JARs\n\
- - Sub-directories of the directory named "src" of certain Plug-ins\n\
- - Feature directories\n\
-\n\
-Note: if a Feature made available by the Eclipse Foundation is installed using the\n\
-Provisioning Technology (as defined below), you must agree to a license ("Feature \n\
-Update License") during the installation process. If the Feature contains\n\
-Included Features, the Feature Update License should either provide you\n\
-with the terms and conditions governing the Included Features or inform\n\
-you where you can locate them. Feature Update Licenses may be found in\n\
-the "license" property of files named "feature.properties" found within a Feature.\n\
-Such Abouts, Feature Licenses, and Feature Update Licenses contain the\n\
-terms and conditions (or references to such terms and conditions) that\n\
-govern your use of the associated Content in that directory.\n\
-\n\
-THE ABOUTS, FEATURE LICENSES, AND FEATURE UPDATE LICENSES MAY REFER\n\
-TO THE EPL OR OTHER LICENSE AGREEMENTS, NOTICES OR TERMS AND CONDITIONS.\n\
-SOME OF THESE OTHER LICENSE AGREEMENTS MAY INCLUDE (BUT ARE NOT LIMITED TO):\n\
-\n\
- - Common Public License Version 1.0 (available at http://www.eclipse.org/legal/cpl-v10.html)\n\
- - Apache Software License 1.1 (available at http://www.apache.org/licenses/LICENSE)\n\
- - Apache Software License 2.0 (available at http://www.apache.org/licenses/LICENSE-2.0)\n\
- - Metro Link Public License 1.00 (available at http://www.opengroup.org/openmotif/supporters/metrolink/license.html)\n\
- - Mozilla Public License Version 1.1 (available at http://www.mozilla.org/MPL/MPL-1.1.html)\n\
-\n\
-IT IS YOUR OBLIGATION TO READ AND ACCEPT ALL SUCH TERMS AND CONDITIONS PRIOR\n\
-TO USE OF THE CONTENT. If no About, Feature License, or Feature Update License\n\
-is provided, please contact the Eclipse Foundation to determine what terms and conditions\n\
-govern that particular Content.\n\
-\n\
-\n\Use of Provisioning Technology\n\
-\n\
-The Eclipse Foundation makes available provisioning software, examples of which include,\n\
-but are not limited to, p2 and the Eclipse Update Manager ("Provisioning Technology") for\n\
-the purpose of allowing users to install software, documentation, information and/or\n\
-other materials (collectively "Installable Software"). This capability is provided with\n\
-the intent of allowing such users to install, extend and update Eclipse-based products.\n\
-Information about packaging Installable Software is available at\n\
-http://eclipse.org/equinox/p2/repository_packaging.html ("Specification").\n\
-\n\
-You may use Provisioning Technology to allow other parties to install Installable Software.\n\
-You shall be responsible for enabling the applicable license agreements relating to the\n\
-Installable Software to be presented to, and accepted by, the users of the Provisioning Technology\n\
-in accordance with the Specification. By using Provisioning Technology in such a manner and\n\
-making it available in accordance with the Specification, you further acknowledge your\n\
-agreement to, and the acquisition of all necessary rights to permit the following:\n\
-\n\
- 1. A series of actions may occur ("Provisioning Process") in which a user may execute\n\
- the Provisioning Technology on a machine ("Target Machine") with the intent of installing,\n\
- extending or updating the functionality of an Eclipse-based product.\n\
- 2. During the Provisioning Process, the Provisioning Technology may cause third party\n\
- Installable Software or a portion thereof to be accessed and copied to the Target Machine.\n\
- 3. Pursuant to the Specification, you will provide to the user the terms and conditions that\n\
- govern the use of the Installable Software ("Installable Software Agreement") and such\n\
- Installable Software Agreement shall be accessed from the Target Machine in accordance\n\
- with the Specification. Such Installable Software Agreement must inform the user of the\n\
- terms and conditions that govern the Installable Software and must solicit acceptance by\n\
- the end user in the manner prescribed in such Installable Software Agreement. Upon such\n\
- indication of agreement by the user, the provisioning Technology will complete installation\n\
- of the Installable Software.\n\
-\n\
-Cryptography\n\
-\n\
-Content may contain encryption software. The country in which you are\n\
-currently may have restrictions on the import, possession, and use,\n\
-and/or re-export to another country, of encryption software. BEFORE\n\
-using any encryption software, please check the country's laws,\n\
-regulations and policies concerning the import, possession, or use, and\n\
-re-export of encryption software, to see if this is permitted.\n\
-\n\
-Java and all Java-based trademarks are trademarks of Oracle Corporation in the United States, other countries, or both.\n
-########### end of license property ##########################################
diff --git a/features/org.eclipse.jst.enterprise_core.feature/feature.xml b/features/org.eclipse.jst.enterprise_core.feature/feature.xml
deleted file mode 100644
index 047d5fd..0000000
--- a/features/org.eclipse.jst.enterprise_core.feature/feature.xml
+++ /dev/null
@@ -1,48 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<feature
- id="org.eclipse.jst.enterprise_core.feature"
- label="%featureName"
- version="3.2.3.qualifier"
- provider-name="%providerName">
-
- <description>
- %description
- </description>
-
- <copyright>
- %copyright
- </copyright>
-
- <license url="%licenseURL">
- %license
- </license>
-
- <plugin
- id="org.eclipse.jst.j2ee.webservice"
- download-size="0"
- install-size="0"
- version="0.0.0"
- unpack="false"/>
-
- <plugin
- id="org.eclipse.jst.j2ee.ejb"
- download-size="0"
- install-size="0"
- version="0.0.0"
- unpack="false"/>
-
- <plugin
- id="org.eclipse.jst.j2ee.jca"
- download-size="0"
- install-size="0"
- version="0.0.0"
- unpack="false"/>
-
- <plugin
- id="org.eclipse.jst.jee.ejb"
- download-size="0"
- install-size="0"
- version="0.0.0"
- unpack="false"/>
-
-</feature>
diff --git a/features/org.eclipse.jst.enterprise_core.feature/license.html b/features/org.eclipse.jst.enterprise_core.feature/license.html
deleted file mode 100644
index c184ca3..0000000
--- a/features/org.eclipse.jst.enterprise_core.feature/license.html
+++ /dev/null
@@ -1,107 +0,0 @@
-<?xml version="1.0" encoding="ISO-8859-1" ?>
-<!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.0 Strict//EN" "http://www.w3.org/TR/xhtml1/DTD/xhtml1-strict.dtd">
-<html xmlns="http://www.w3.org/1999/xhtml">
-<head>
-<meta http-equiv="Content-Type" content="text/html; charset=ISO-8859-1" />
-<title>Eclipse Foundation Software User Agreement</title>
-</head>
-
-<body lang="EN-US">
-<h2>Eclipse Foundation Software User Agreement</h2>
-<p>April 14, 2010</p>
-
-<h3>Usage Of Content</h3>
-
-<p>THE ECLIPSE FOUNDATION MAKES AVAILABLE SOFTWARE, DOCUMENTATION, INFORMATION AND/OR OTHER MATERIALS FOR OPEN SOURCE PROJECTS
- (COLLECTIVELY "CONTENT"). USE OF THE CONTENT IS GOVERNED BY THE TERMS AND CONDITIONS OF THIS AGREEMENT AND/OR THE TERMS AND
- CONDITIONS OF LICENSE AGREEMENTS OR NOTICES INDICATED OR REFERENCED BELOW. BY USING THE CONTENT, YOU AGREE THAT YOUR USE
- OF THE CONTENT IS GOVERNED BY THIS AGREEMENT AND/OR THE TERMS AND CONDITIONS OF ANY APPLICABLE LICENSE AGREEMENTS OR
- NOTICES INDICATED OR REFERENCED BELOW. IF YOU DO NOT AGREE TO THE TERMS AND CONDITIONS OF THIS AGREEMENT AND THE TERMS AND
- CONDITIONS OF ANY APPLICABLE LICENSE AGREEMENTS OR NOTICES INDICATED OR REFERENCED BELOW, THEN YOU MAY NOT USE THE CONTENT.</p>
-
-<h3>Applicable Licenses</h3>
-
-<p>Unless otherwise indicated, all Content made available by the Eclipse Foundation is provided to you under the terms and conditions of the Eclipse Public License Version 1.0
- ("EPL"). A copy of the EPL is provided with this Content and is also available at <a href="http://www.eclipse.org/legal/epl-v10.html">http://www.eclipse.org/legal/epl-v10.html</a>.
- For purposes of the EPL, "Program" will mean the Content.</p>
-
-<p>Content includes, but is not limited to, source code, object code, documentation and other files maintained in the Eclipse Foundation source code
- repository ("Repository") in software modules ("Modules") and made available as downloadable archives ("Downloads").</p>
-
-<ul>
- <li>Content may be structured and packaged into modules to facilitate delivering, extending, and upgrading the Content. Typical modules may include plug-ins ("Plug-ins"), plug-in fragments ("Fragments"), and features ("Features").</li>
- <li>Each Plug-in or Fragment may be packaged as a sub-directory or JAR (Java™ ARchive) in a directory named "plugins".</li>
- <li>A Feature is a bundle of one or more Plug-ins and/or Fragments and associated material. Each Feature may be packaged as a sub-directory in a directory named "features". Within a Feature, files named "feature.xml" may contain a list of the names and version numbers of the Plug-ins
- and/or Fragments associated with that Feature.</li>
- <li>Features may also include other Features ("Included Features"). Within a Feature, files named "feature.xml" may contain a list of the names and version numbers of Included Features.</li>
-</ul>
-
-<p>The terms and conditions governing Plug-ins and Fragments should be contained in files named "about.html" ("Abouts"). The terms and conditions governing Features and
-Included Features should be contained in files named "license.html" ("Feature Licenses"). Abouts and Feature Licenses may be located in any directory of a Download or Module
-including, but not limited to the following locations:</p>
-
-<ul>
- <li>The top-level (root) directory</li>
- <li>Plug-in and Fragment directories</li>
- <li>Inside Plug-ins and Fragments packaged as JARs</li>
- <li>Sub-directories of the directory named "src" of certain Plug-ins</li>
- <li>Feature directories</li>
-</ul>
-
-<p>Note: if a Feature made available by the Eclipse Foundation is installed using the Provisioning Technology (as defined below), you must agree to a license ("Feature Update License") during the
-installation process. If the Feature contains Included Features, the Feature Update License should either provide you with the terms and conditions governing the Included Features or
-inform you where you can locate them. Feature Update Licenses may be found in the "license" property of files named "feature.properties" found within a Feature.
-Such Abouts, Feature Licenses, and Feature Update Licenses contain the terms and conditions (or references to such terms and conditions) that govern your use of the associated Content in
-that directory.</p>
-
-<p>THE ABOUTS, FEATURE LICENSES, AND FEATURE UPDATE LICENSES MAY REFER TO THE EPL OR OTHER LICENSE AGREEMENTS, NOTICES OR TERMS AND CONDITIONS. SOME OF THESE
-OTHER LICENSE AGREEMENTS MAY INCLUDE (BUT ARE NOT LIMITED TO):</p>
-
-<ul>
- <li>Common Public License Version 1.0 (available at <a href="http://www.eclipse.org/legal/cpl-v10.html">http://www.eclipse.org/legal/cpl-v10.html</a>)</li>
- <li>Apache Software License 1.1 (available at <a href="http://www.apache.org/licenses/LICENSE">http://www.apache.org/licenses/LICENSE</a>)</li>
- <li>Apache Software License 2.0 (available at <a href="http://www.apache.org/licenses/LICENSE-2.0">http://www.apache.org/licenses/LICENSE-2.0</a>)</li>
- <li>Metro Link Public License 1.00 (available at <a href="http://www.opengroup.org/openmotif/supporters/metrolink/license.html">http://www.opengroup.org/openmotif/supporters/metrolink/license.html</a>)</li>
- <li>Mozilla Public License Version 1.1 (available at <a href="http://www.mozilla.org/MPL/MPL-1.1.html">http://www.mozilla.org/MPL/MPL-1.1.html</a>)</li>
-</ul>
-
-<p>IT IS YOUR OBLIGATION TO READ AND ACCEPT ALL SUCH TERMS AND CONDITIONS PRIOR TO USE OF THE CONTENT. If no About, Feature License, or Feature Update License is provided, please
-contact the Eclipse Foundation to determine what terms and conditions govern that particular Content.</p>
-
-
-<h3>Use of Provisioning Technology</h3>
-
-<p>The Eclipse Foundation makes available provisioning software, examples of which include, but are not limited to, p2 and the Eclipse
- Update Manager ("Provisioning Technology") for the purpose of allowing users to install software, documentation, information and/or
- other materials (collectively "Installable Software"). This capability is provided with the intent of allowing such users to
- install, extend and update Eclipse-based products. Information about packaging Installable Software is available at <a
- href="http://eclipse.org/equinox/p2/repository_packaging.html">http://eclipse.org/equinox/p2/repository_packaging.html</a>
- ("Specification").</p>
-
-<p>You may use Provisioning Technology to allow other parties to install Installable Software. You shall be responsible for enabling the
- applicable license agreements relating to the Installable Software to be presented to, and accepted by, the users of the Provisioning Technology
- in accordance with the Specification. By using Provisioning Technology in such a manner and making it available in accordance with the
- Specification, you further acknowledge your agreement to, and the acquisition of all necessary rights to permit the following:</p>
-
-<ol>
- <li>A series of actions may occur ("Provisioning Process") in which a user may execute the Provisioning Technology
- on a machine ("Target Machine") with the intent of installing, extending or updating the functionality of an Eclipse-based
- product.</li>
- <li>During the Provisioning Process, the Provisioning Technology may cause third party Installable Software or a portion thereof to be
- accessed and copied to the Target Machine.</li>
- <li>Pursuant to the Specification, you will provide to the user the terms and conditions that govern the use of the Installable
- Software ("Installable Software Agreement") and such Installable Software Agreement shall be accessed from the Target
- Machine in accordance with the Specification. Such Installable Software Agreement must inform the user of the terms and conditions that govern
- the Installable Software and must solicit acceptance by the end user in the manner prescribed in such Installable Software Agreement. Upon such
- indication of agreement by the user, the provisioning Technology will complete installation of the Installable Software.</li>
-</ol>
-
-<h3>Cryptography</h3>
-
-<p>Content may contain encryption software. The country in which you are currently may have restrictions on the import, possession, and use, and/or re-export to
- another country, of encryption software. BEFORE using any encryption software, please check the country's laws, regulations and policies concerning the import,
- possession, or use, and re-export of encryption software, to see if this is permitted.</p>
-
-<p><small>Java and all Java-based trademarks are trademarks of Oracle Corporation in the United States, other countries, or both.</small></p>
-</body>
-</html>
diff --git a/features/org.eclipse.jst.enterprise_core.feature/sourceTemplateBundle/about.html b/features/org.eclipse.jst.enterprise_core.feature/sourceTemplateBundle/about.html
deleted file mode 100644
index fe81d46..0000000
--- a/features/org.eclipse.jst.enterprise_core.feature/sourceTemplateBundle/about.html
+++ /dev/null
@@ -1,27 +0,0 @@
-<!DOCTYPE HTML PUBLIC "-//W3C//DTD HTML 4.0//EN">
-<html>
-<head>
-<title>About</title>
-<meta http-equiv=Content-Type content="text/html; charset=ISO-8859-1">
-</head>
-<body lang="EN-US">
-<h2>About This Content</h2>
-
-<P>June, 2008</P>
-<h3>License</h3>
-
-<p>The Eclipse Foundation makes available all content in this plug-in ("Content"). Unless otherwise indicated below, the Content is provided to you under the terms and conditions of the
-Eclipse Public License Version 1.0 ("EPL"). A copy of the EPL is available at <a href="http://www.eclipse.org/legal/epl-v10.html">http://www.eclipse.org/legal/epl-v10.html</a>.
-For purposes of the EPL, "Program" will mean the Content.</p>
-
-<p>If you did not receive this Content directly from the Eclipse Foundation, the Content is being redistributed by another party ("Redistributor") and different terms and conditions may
-apply to your use of any object code in the Content. Check the Redistributor's license that was provided with the Content. If no such license exists, contact the Redistributor. Unless otherwise
-indicated below, the terms and conditions of the EPL still apply to any source code in the Content.</p>
-
-<h3>Source Code</h3>
-<p>This plug-in contains source code zip files ("Source Zips") that correspond to binary content in other plug-ins. These Source Zips may be distributed under different license
-agreements and/or notices. Details about these license agreements and notices are contained in "about.html" files ("Abouts") located in sub-directories in the
-src/ directory of this plug-in. Such Abouts govern your use of the Source Zips in that directory, not the EPL.</p>
-
-</body>
-</html>
diff --git a/features/org.eclipse.jst.enterprise_core.feature/sourceTemplateBundle/about.ini b/features/org.eclipse.jst.enterprise_core.feature/sourceTemplateBundle/about.ini
deleted file mode 100644
index fda5a40..0000000
--- a/features/org.eclipse.jst.enterprise_core.feature/sourceTemplateBundle/about.ini
+++ /dev/null
@@ -1,31 +0,0 @@
-# about.ini
-# contains information about a feature
-# java.io.Properties file (ISO 8859-1 with "\" escapes)
-# "%key" are externalized strings defined in about.properties
-# This file does not need to be translated.
-
-# Property "aboutText" contains blurb for "About" dialog (translated)
-aboutText=%blurb
-
-# Property "windowImage" contains path to window icon (16x16)
-# needed for primary features only
-
-# Property "featureImage" contains path to feature image (32x32)
-featureImage=wtp_prod32.png
-
-# Property "aboutImage" contains path to product image (500x330 or 115x164)
-# needed for primary features only
-
-# Property "appName" contains name of the application (not translated)
-# needed for primary features only
-
-# Property "welcomePage" contains path to welcome page (special XML-based format)
-# optional
-
-# Property "welcomePerspective" contains the id of the perspective in which the
-# welcome page is to be opened.
-# optional
-
-
-
-
diff --git a/features/org.eclipse.jst.enterprise_core.feature/sourceTemplateBundle/about.mappings b/features/org.eclipse.jst.enterprise_core.feature/sourceTemplateBundle/about.mappings
deleted file mode 100644
index a28390a..0000000
--- a/features/org.eclipse.jst.enterprise_core.feature/sourceTemplateBundle/about.mappings
+++ /dev/null
@@ -1,6 +0,0 @@
-# about.mappings
-# contains fill-ins for about.properties
-# java.io.Properties file (ISO 8859-1 with "\" escapes)
-# This file does not need to be translated.
-
-0=@build@
diff --git a/features/org.eclipse.jst.enterprise_core.feature/sourceTemplateBundle/about.properties b/features/org.eclipse.jst.enterprise_core.feature/sourceTemplateBundle/about.properties
deleted file mode 100644
index c3f1925..0000000
--- a/features/org.eclipse.jst.enterprise_core.feature/sourceTemplateBundle/about.properties
+++ /dev/null
@@ -1,26 +0,0 @@
-###############################################################################
-# Copyright (c) 2000, 2005 IBM Corporation and others.
-# All rights reserved. This program and the accompanying materials
-# are made available under the terms of the Eclipse Public License v1.0
-# which accompanies this distribution, and is available at
-# http://www.eclipse.org/legal/epl-v10.html
-#
-# Contributors:
-# IBM Corporation - initial API and implementation
-###############################################################################
-# about.properties
-# contains externalized strings for about.ini
-# java.io.Properties file (ISO 8859-1 with "\" escapes)
-# fill-ins are supplied by about.mappings
-# This file should be translated.
-#
-# Do not translate any values surrounded by {}
-
-blurb=J2EE Standard Tools - Enterprise Core\n\
-\n\
-Version: {featureVersion}\n\
-Build id: {0}\n\
-\n\
-(c) Copyright Eclipse contributors and others 2005. All rights reserved.\n\
-Visit http://www.eclipse.org/webtools
-
diff --git a/features/org.eclipse.jst.enterprise_core.feature/sourceTemplateBundle/build.properties b/features/org.eclipse.jst.enterprise_core.feature/sourceTemplateBundle/build.properties
deleted file mode 100644
index ead512d..0000000
--- a/features/org.eclipse.jst.enterprise_core.feature/sourceTemplateBundle/build.properties
+++ /dev/null
@@ -1,2 +0,0 @@
-bin.includes = about.html, about.ini, about.mappings, about.properties, wtp_prod32.png, plugin.properties, plugin.xml, src/**, META-INF/
-sourcePlugin = true
diff --git a/features/org.eclipse.jst.enterprise_core.feature/sourceTemplateBundle/plugin.properties b/features/org.eclipse.jst.enterprise_core.feature/sourceTemplateBundle/plugin.properties
deleted file mode 100644
index 85bf6e4..0000000
--- a/features/org.eclipse.jst.enterprise_core.feature/sourceTemplateBundle/plugin.properties
+++ /dev/null
@@ -1,12 +0,0 @@
-###############################################################################
-# Copyright (c) 2005 IBM Corporation and others.
-# All rights reserved. This program and the accompanying materials
-# are made available under the terms of the Eclipse Public License v1.0
-# which accompanies this distribution, and is available at
-# http://www.eclipse.org/legal/epl-v10.html
-#
-# Contributors:
-# IBM Corporation - initial API and implementation
-###############################################################################
-pluginName=J2EE Standard Tools - Enterprise Core Source
-providerName=Eclipse.org
diff --git a/features/org.eclipse.jst.enterprise_core.feature/sourceTemplateBundle/wtp_prod32.gif b/features/org.eclipse.jst.enterprise_core.feature/sourceTemplateBundle/wtp_prod32.gif
deleted file mode 100644
index eefb44a..0000000
--- a/features/org.eclipse.jst.enterprise_core.feature/sourceTemplateBundle/wtp_prod32.gif
+++ /dev/null
Binary files differ
diff --git a/features/org.eclipse.jst.enterprise_core.feature/sourceTemplateBundle/wtp_prod32.png b/features/org.eclipse.jst.enterprise_core.feature/sourceTemplateBundle/wtp_prod32.png
deleted file mode 100644
index bfceab3..0000000
--- a/features/org.eclipse.jst.enterprise_core.feature/sourceTemplateBundle/wtp_prod32.png
+++ /dev/null
Binary files differ
diff --git a/features/org.eclipse.jst.enterprise_core.feature/sourceTemplateFeature/build.properties b/features/org.eclipse.jst.enterprise_core.feature/sourceTemplateFeature/build.properties
deleted file mode 100644
index f249e9f..0000000
--- a/features/org.eclipse.jst.enterprise_core.feature/sourceTemplateFeature/build.properties
+++ /dev/null
@@ -1,16 +0,0 @@
-###############################################################################
-# Copyright (c) 2000, 2005 IBM Corporation and others.
-# All rights reserved. This program and the accompanying materials
-# are made available under the terms of the Eclipse Public License v1.0
-# which accompanies this distribution, and is available at
-# http://www.eclipse.org/legal/epl-v10.html
-#
-# Contributors:
-# IBM Corporation - initial API and implementation
-###############################################################################
-bin.includes =\
-epl-v10.html,\
-eclipse_update_120.jpg,\
-feature.xml,\
-feature.properties,\
-license.html
diff --git a/features/org.eclipse.jst.enterprise_core.feature/sourceTemplateFeature/eclipse_update_120.jpg b/features/org.eclipse.jst.enterprise_core.feature/sourceTemplateFeature/eclipse_update_120.jpg
deleted file mode 100644
index bfdf708..0000000
--- a/features/org.eclipse.jst.enterprise_core.feature/sourceTemplateFeature/eclipse_update_120.jpg
+++ /dev/null
Binary files differ
diff --git a/features/org.eclipse.jst.enterprise_core.feature/sourceTemplateFeature/epl-v10.html b/features/org.eclipse.jst.enterprise_core.feature/sourceTemplateFeature/epl-v10.html
deleted file mode 100644
index 022ad29..0000000
--- a/features/org.eclipse.jst.enterprise_core.feature/sourceTemplateFeature/epl-v10.html
+++ /dev/null
@@ -1,328 +0,0 @@
-<html xmlns:o="urn:schemas-microsoft-com:office:office"
-xmlns:w="urn:schemas-microsoft-com:office:word"
-xmlns="http://www.w3.org/TR/REC-html40">
-
-<head>
-<meta http-equiv=Content-Type content="text/html; charset=windows-1252">
-<meta name=ProgId content=Word.Document>
-<meta name=Generator content="Microsoft Word 9">
-<meta name=Originator content="Microsoft Word 9">
-<link rel=File-List
-href="./Eclipse%20EPL%202003_11_10%20Final_files/filelist.xml">
-<title>Eclipse Public License - Version 1.0</title>
-<!--[if gte mso 9]><xml>
- <o:DocumentProperties>
- <o:Revision>2</o:Revision>
- <o:TotalTime>3</o:TotalTime>
- <o:Created>2004-03-05T23:03:00Z</o:Created>
- <o:LastSaved>2004-03-05T23:03:00Z</o:LastSaved>
- <o:Pages>4</o:Pages>
- <o:Words>1626</o:Words>
- <o:Characters>9270</o:Characters>
- <o:Lines>77</o:Lines>
- <o:Paragraphs>18</o:Paragraphs>
- <o:CharactersWithSpaces>11384</o:CharactersWithSpaces>
- <o:Version>9.4402</o:Version>
- </o:DocumentProperties>
-</xml><![endif]--><!--[if gte mso 9]><xml>
- <w:WordDocument>
- <w:TrackRevisions/>
- </w:WordDocument>
-</xml><![endif]-->
-<style>
-<!--
- /* Font Definitions */
-@font-face
- {font-family:Tahoma;
- panose-1:2 11 6 4 3 5 4 4 2 4;
- mso-font-charset:0;
- mso-generic-font-family:swiss;
- mso-font-pitch:variable;
- mso-font-signature:553679495 -2147483648 8 0 66047 0;}
- /* Style Definitions */
-p.MsoNormal, li.MsoNormal, div.MsoNormal
- {mso-style-parent:"";
- margin:0in;
- margin-bottom:.0001pt;
- mso-pagination:widow-orphan;
- font-size:12.0pt;
- font-family:"Times New Roman";
- mso-fareast-font-family:"Times New Roman";}
-p
- {margin-right:0in;
- mso-margin-top-alt:auto;
- mso-margin-bottom-alt:auto;
- margin-left:0in;
- mso-pagination:widow-orphan;
- font-size:12.0pt;
- font-family:"Times New Roman";
- mso-fareast-font-family:"Times New Roman";}
-p.BalloonText, li.BalloonText, div.BalloonText
- {mso-style-name:"Balloon Text";
- margin:0in;
- margin-bottom:.0001pt;
- mso-pagination:widow-orphan;
- font-size:8.0pt;
- font-family:Tahoma;
- mso-fareast-font-family:"Times New Roman";}
-@page Section1
- {size:8.5in 11.0in;
- margin:1.0in 1.25in 1.0in 1.25in;
- mso-header-margin:.5in;
- mso-footer-margin:.5in;
- mso-paper-source:0;}
-div.Section1
- {page:Section1;}
--->
-</style>
-</head>
-
-<body lang=EN-US style='tab-interval:.5in'>
-
-<div class=Section1>
-
-<p align=center style='text-align:center'><b>Eclipse Public License - v 1.0</b>
-</p>
-
-<p><span style='font-size:10.0pt'>THE ACCOMPANYING PROGRAM IS PROVIDED UNDER
-THE TERMS OF THIS ECLIPSE PUBLIC LICENSE ("AGREEMENT"). ANY USE,
-REPRODUCTION OR DISTRIBUTION OF THE PROGRAM CONSTITUTES RECIPIENT'S ACCEPTANCE
-OF THIS AGREEMENT.</span> </p>
-
-<p><b><span style='font-size:10.0pt'>1. DEFINITIONS</span></b> </p>
-
-<p><span style='font-size:10.0pt'>"Contribution" means:</span> </p>
-
-<p class=MsoNormal style='margin-left:.5in'><span style='font-size:10.0pt'>a)
-in the case of the initial Contributor, the initial code and documentation
-distributed under this Agreement, and<br clear=left>
-b) in the case of each subsequent Contributor:</span></p>
-
-<p class=MsoNormal style='margin-left:.5in'><span style='font-size:10.0pt'>i)
-changes to the Program, and</span></p>
-
-<p class=MsoNormal style='margin-left:.5in'><span style='font-size:10.0pt'>ii)
-additions to the Program;</span></p>
-
-<p class=MsoNormal style='margin-left:.5in'><span style='font-size:10.0pt'>where
-such changes and/or additions to the Program originate from and are distributed
-by that particular Contributor. A Contribution 'originates' from a Contributor
-if it was added to the Program by such Contributor itself or anyone acting on
-such Contributor's behalf. Contributions do not include additions to the
-Program which: (i) are separate modules of software distributed in conjunction
-with the Program under their own license agreement, and (ii) are not derivative
-works of the Program. </span></p>
-
-<p><span style='font-size:10.0pt'>"Contributor" means any person or
-entity that distributes the Program.</span> </p>
-
-<p><span style='font-size:10.0pt'>"Licensed Patents " mean patent
-claims licensable by a Contributor which are necessarily infringed by the use
-or sale of its Contribution alone or when combined with the Program. </span></p>
-
-<p><span style='font-size:10.0pt'>"Program" means the Contributions
-distributed in accordance with this Agreement.</span> </p>
-
-<p><span style='font-size:10.0pt'>"Recipient" means anyone who
-receives the Program under this Agreement, including all Contributors.</span> </p>
-
-<p><b><span style='font-size:10.0pt'>2. GRANT OF RIGHTS</span></b> </p>
-
-<p class=MsoNormal style='margin-left:.5in'><span style='font-size:10.0pt'>a)
-Subject to the terms of this Agreement, each Contributor hereby grants Recipient
-a non-exclusive, worldwide, royalty-free copyright license to<span
-style='color:red'> </span>reproduce, prepare derivative works of, publicly
-display, publicly perform, distribute and sublicense the Contribution of such
-Contributor, if any, and such derivative works, in source code and object code
-form.</span></p>
-
-<p class=MsoNormal style='margin-left:.5in'><span style='font-size:10.0pt'>b)
-Subject to the terms of this Agreement, each Contributor hereby grants
-Recipient a non-exclusive, worldwide,<span style='color:green'> </span>royalty-free
-patent license under Licensed Patents to make, use, sell, offer to sell, import
-and otherwise transfer the Contribution of such Contributor, if any, in source
-code and object code form. This patent license shall apply to the combination
-of the Contribution and the Program if, at the time the Contribution is added
-by the Contributor, such addition of the Contribution causes such combination
-to be covered by the Licensed Patents. The patent license shall not apply to
-any other combinations which include the Contribution. No hardware per se is
-licensed hereunder. </span></p>
-
-<p class=MsoNormal style='margin-left:.5in'><span style='font-size:10.0pt'>c)
-Recipient understands that although each Contributor grants the licenses to its
-Contributions set forth herein, no assurances are provided by any Contributor
-that the Program does not infringe the patent or other intellectual property
-rights of any other entity. Each Contributor disclaims any liability to Recipient
-for claims brought by any other entity based on infringement of intellectual
-property rights or otherwise. As a condition to exercising the rights and
-licenses granted hereunder, each Recipient hereby assumes sole responsibility
-to secure any other intellectual property rights needed, if any. For example,
-if a third party patent license is required to allow Recipient to distribute
-the Program, it is Recipient's responsibility to acquire that license before
-distributing the Program.</span></p>
-
-<p class=MsoNormal style='margin-left:.5in'><span style='font-size:10.0pt'>d)
-Each Contributor represents that to its knowledge it has sufficient copyright
-rights in its Contribution, if any, to grant the copyright license set forth in
-this Agreement. </span></p>
-
-<p><b><span style='font-size:10.0pt'>3. REQUIREMENTS</span></b> </p>
-
-<p><span style='font-size:10.0pt'>A Contributor may choose to distribute the
-Program in object code form under its own license agreement, provided that:</span>
-</p>
-
-<p class=MsoNormal style='margin-left:.5in'><span style='font-size:10.0pt'>a)
-it complies with the terms and conditions of this Agreement; and</span></p>
-
-<p class=MsoNormal style='margin-left:.5in'><span style='font-size:10.0pt'>b)
-its license agreement:</span></p>
-
-<p class=MsoNormal style='margin-left:.5in'><span style='font-size:10.0pt'>i)
-effectively disclaims on behalf of all Contributors all warranties and
-conditions, express and implied, including warranties or conditions of title
-and non-infringement, and implied warranties or conditions of merchantability
-and fitness for a particular purpose; </span></p>
-
-<p class=MsoNormal style='margin-left:.5in'><span style='font-size:10.0pt'>ii)
-effectively excludes on behalf of all Contributors all liability for damages,
-including direct, indirect, special, incidental and consequential damages, such
-as lost profits; </span></p>
-
-<p class=MsoNormal style='margin-left:.5in'><span style='font-size:10.0pt'>iii)
-states that any provisions which differ from this Agreement are offered by that
-Contributor alone and not by any other party; and</span></p>
-
-<p class=MsoNormal style='margin-left:.5in'><span style='font-size:10.0pt'>iv)
-states that source code for the Program is available from such Contributor, and
-informs licensees how to obtain it in a reasonable manner on or through a
-medium customarily used for software exchange.<span style='color:blue'> </span></span></p>
-
-<p><span style='font-size:10.0pt'>When the Program is made available in source
-code form:</span> </p>
-
-<p class=MsoNormal style='margin-left:.5in'><span style='font-size:10.0pt'>a)
-it must be made available under this Agreement; and </span></p>
-
-<p class=MsoNormal style='margin-left:.5in'><span style='font-size:10.0pt'>b) a
-copy of this Agreement must be included with each copy of the Program. </span></p>
-
-<p><span style='font-size:10.0pt'>Contributors may not remove or alter any
-copyright notices contained within the Program. </span></p>
-
-<p><span style='font-size:10.0pt'>Each Contributor must identify itself as the
-originator of its Contribution, if any, in a manner that reasonably allows
-subsequent Recipients to identify the originator of the Contribution. </span></p>
-
-<p><b><span style='font-size:10.0pt'>4. COMMERCIAL DISTRIBUTION</span></b> </p>
-
-<p><span style='font-size:10.0pt'>Commercial distributors of software may
-accept certain responsibilities with respect to end users, business partners
-and the like. While this license is intended to facilitate the commercial use
-of the Program, the Contributor who includes the Program in a commercial
-product offering should do so in a manner which does not create potential
-liability for other Contributors. Therefore, if a Contributor includes the
-Program in a commercial product offering, such Contributor ("Commercial
-Contributor") hereby agrees to defend and indemnify every other
-Contributor ("Indemnified Contributor") against any losses, damages and
-costs (collectively "Losses") arising from claims, lawsuits and other
-legal actions brought by a third party against the Indemnified Contributor to
-the extent caused by the acts or omissions of such Commercial Contributor in
-connection with its distribution of the Program in a commercial product
-offering. The obligations in this section do not apply to any claims or Losses
-relating to any actual or alleged intellectual property infringement. In order
-to qualify, an Indemnified Contributor must: a) promptly notify the Commercial
-Contributor in writing of such claim, and b) allow the Commercial Contributor
-to control, and cooperate with the Commercial Contributor in, the defense and
-any related settlement negotiations. The Indemnified Contributor may participate
-in any such claim at its own expense.</span> </p>
-
-<p><span style='font-size:10.0pt'>For example, a Contributor might include the
-Program in a commercial product offering, Product X. That Contributor is then a
-Commercial Contributor. If that Commercial Contributor then makes performance
-claims, or offers warranties related to Product X, those performance claims and
-warranties are such Commercial Contributor's responsibility alone. Under this
-section, the Commercial Contributor would have to defend claims against the
-other Contributors related to those performance claims and warranties, and if a
-court requires any other Contributor to pay any damages as a result, the
-Commercial Contributor must pay those damages.</span> </p>
-
-<p><b><span style='font-size:10.0pt'>5. NO WARRANTY</span></b> </p>
-
-<p><span style='font-size:10.0pt'>EXCEPT AS EXPRESSLY SET FORTH IN THIS
-AGREEMENT, THE PROGRAM IS PROVIDED ON AN "AS IS" BASIS, WITHOUT
-WARRANTIES OR CONDITIONS OF ANY KIND, EITHER EXPRESS OR IMPLIED INCLUDING,
-WITHOUT LIMITATION, ANY WARRANTIES OR CONDITIONS OF TITLE, NON-INFRINGEMENT,
-MERCHANTABILITY OR FITNESS FOR A PARTICULAR PURPOSE. Each Recipient is solely
-responsible for determining the appropriateness of using and distributing the
-Program and assumes all risks associated with its exercise of rights under this
-Agreement , including but not limited to the risks and costs of program errors,
-compliance with applicable laws, damage to or loss of data, programs or
-equipment, and unavailability or interruption of operations. </span></p>
-
-<p><b><span style='font-size:10.0pt'>6. DISCLAIMER OF LIABILITY</span></b> </p>
-
-<p><span style='font-size:10.0pt'>EXCEPT AS EXPRESSLY SET FORTH IN THIS
-AGREEMENT, NEITHER RECIPIENT NOR ANY CONTRIBUTORS SHALL HAVE ANY LIABILITY FOR
-ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES
-(INCLUDING WITHOUT LIMITATION LOST PROFITS), HOWEVER CAUSED AND ON ANY THEORY
-OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING
-NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OR DISTRIBUTION OF
-THE PROGRAM OR THE EXERCISE OF ANY RIGHTS GRANTED HEREUNDER, EVEN IF ADVISED OF
-THE POSSIBILITY OF SUCH DAMAGES.</span> </p>
-
-<p><b><span style='font-size:10.0pt'>7. GENERAL</span></b> </p>
-
-<p><span style='font-size:10.0pt'>If any provision of this Agreement is invalid
-or unenforceable under applicable law, it shall not affect the validity or
-enforceability of the remainder of the terms of this Agreement, and without
-further action by the parties hereto, such provision shall be reformed to the
-minimum extent necessary to make such provision valid and enforceable.</span> </p>
-
-<p><span style='font-size:10.0pt'>If Recipient institutes patent litigation
-against any entity (including a cross-claim or counterclaim in a lawsuit)
-alleging that the Program itself (excluding combinations of the Program with
-other software or hardware) infringes such Recipient's patent(s), then such
-Recipient's rights granted under Section 2(b) shall terminate as of the date
-such litigation is filed. </span></p>
-
-<p><span style='font-size:10.0pt'>All Recipient's rights under this Agreement
-shall terminate if it fails to comply with any of the material terms or
-conditions of this Agreement and does not cure such failure in a reasonable
-period of time after becoming aware of such noncompliance. If all Recipient's
-rights under this Agreement terminate, Recipient agrees to cease use and
-distribution of the Program as soon as reasonably practicable. However,
-Recipient's obligations under this Agreement and any licenses granted by
-Recipient relating to the Program shall continue and survive. </span></p>
-
-<p><span style='font-size:10.0pt'>Everyone is permitted to copy and distribute
-copies of this Agreement, but in order to avoid inconsistency the Agreement is
-copyrighted and may only be modified in the following manner. The Agreement
-Steward reserves the right to publish new versions (including revisions) of
-this Agreement from time to time. No one other than the Agreement Steward has
-the right to modify this Agreement. The Eclipse Foundation is the initial
-Agreement Steward. The Eclipse Foundation may assign the responsibility to
-serve as the Agreement Steward to a suitable separate entity. Each new version
-of the Agreement will be given a distinguishing version number. The Program
-(including Contributions) may always be distributed subject to the version of
-the Agreement under which it was received. In addition, after a new version of
-the Agreement is published, Contributor may elect to distribute the Program
-(including its Contributions) under the new version. Except as expressly stated
-in Sections 2(a) and 2(b) above, Recipient receives no rights or licenses to
-the intellectual property of any Contributor under this Agreement, whether
-expressly, by implication, estoppel or otherwise. All rights in the Program not
-expressly granted under this Agreement are reserved.</span> </p>
-
-<p><span style='font-size:10.0pt'>This Agreement is governed by the laws of the
-State of New York and the intellectual property laws of the United States of
-America. No party to this Agreement will bring a legal action under this
-Agreement more than one year after the cause of action arose. Each party waives
-its rights to a jury trial in any resulting litigation.</span> </p>
-
-<p class=MsoNormal><![if !supportEmptyParas]> <![endif]><o:p></o:p></p>
-
-</div>
-
-</body>
-
-</html>
diff --git a/features/org.eclipse.jst.enterprise_core.feature/sourceTemplateFeature/feature.properties b/features/org.eclipse.jst.enterprise_core.feature/sourceTemplateFeature/feature.properties
deleted file mode 100644
index 027c77e..0000000
--- a/features/org.eclipse.jst.enterprise_core.feature/sourceTemplateFeature/feature.properties
+++ /dev/null
@@ -1,168 +0,0 @@
-###############################################################################
-# Copyright (c) 2006 IBM Corporation and others.
-# All rights reserved. This program and the accompanying materials
-# are made available under the terms of the Eclipse Public License v1.0
-# which accompanies this distribution, and is available at
-# http://www.eclipse.org/legal/epl-v10.html
-#
-# Contributors:
-# IBM Corporation - initial API and implementation
-###############################################################################
-# feature.properties
-# contains externalized strings for feature.xml
-# "%foo" in feature.xml corresponds to the key "foo" in this file
-# java.io.Properties file (ISO 8859-1 with "\" escapes)
-# This file should be translated.
-
-# "featureName" property - name of the feature
-featureName=JST Enterprise Core Developer Resources
-
-# "providerName" property - name of the company that provides the feature
-providerName=Eclipse Web Tools Platform
-
-
-# "description" property - description of the feature
-description=Source code zips for JST enterprise core.
-
-# "copyright" property - text of the "Feature Update Copyright"
-copyright=\
-Copyright (c) 2006 IBM Corporation and others.\n\
-All rights reserved. This program and the accompanying materials\n\
-are made available under the terms of the Eclipse Public License v1.0\n\
-which accompanies this distribution, and is available at\n\
-http://www.eclipse.org/legal/epl-v10.html\n\
-\n\
-Contributors:\n\
- IBM Corporation - initial API and implementation\n
-################ end of copyright property ####################################
-
-# "licenseURL" property - URL of the "Feature License"
-# do not translate value - just change to point to a locale-specific HTML page
-licenseURL=license.html
-
-# "license" property - text of the "Feature Update License"
-# should be plain text version of license agreement pointed to be "licenseURL"
-license=\
-Eclipse Foundation Software User Agreement\n\
-April 14, 2010\n\
-\n\
-Usage Of Content\n\
-\n\
-THE ECLIPSE FOUNDATION MAKES AVAILABLE SOFTWARE, DOCUMENTATION, INFORMATION AND/OR\n\
-OTHER MATERIALS FOR OPEN SOURCE PROJECTS (COLLECTIVELY "CONTENT").\n\
-USE OF THE CONTENT IS GOVERNED BY THE TERMS AND CONDITIONS OF THIS\n\
-AGREEMENT AND/OR THE TERMS AND CONDITIONS OF LICENSE AGREEMENTS OR\n\
-NOTICES INDICATED OR REFERENCED BELOW. BY USING THE CONTENT, YOU\n\
-AGREE THAT YOUR USE OF THE CONTENT IS GOVERNED BY THIS AGREEMENT\n\
-AND/OR THE TERMS AND CONDITIONS OF ANY APPLICABLE LICENSE AGREEMENTS\n\
-OR NOTICES INDICATED OR REFERENCED BELOW. IF YOU DO NOT AGREE TO THE\n\
-TERMS AND CONDITIONS OF THIS AGREEMENT AND THE TERMS AND CONDITIONS\n\
-OF ANY APPLICABLE LICENSE AGREEMENTS OR NOTICES INDICATED OR REFERENCED\n\
-BELOW, THEN YOU MAY NOT USE THE CONTENT.\n\
-\n\
-Applicable Licenses\n\
-\n\
-Unless otherwise indicated, all Content made available by the\n\
-Eclipse Foundation is provided to you under the terms and conditions of\n\
-the Eclipse Public License Version 1.0 ("EPL"). A copy of the EPL is\n\
-provided with this Content and is also available at http://www.eclipse.org/legal/epl-v10.html.\n\
-For purposes of the EPL, "Program" will mean the Content.\n\
-\n\
-Content includes, but is not limited to, source code, object code,\n\
-documentation and other files maintained in the Eclipse Foundation source code\n\
-repository ("Repository") in software modules ("Modules") and made available\n\
-as downloadable archives ("Downloads").\n\
-\n\
- - Content may be structured and packaged into modules to facilitate delivering,\n\
- extending, and upgrading the Content. Typical modules may include plug-ins ("Plug-ins"),\n\
- plug-in fragments ("Fragments"), and features ("Features").\n\
- - Each Plug-in or Fragment may be packaged as a sub-directory or JAR (Java(TM) ARchive)\n\
- in a directory named "plugins".\n\
- - A Feature is a bundle of one or more Plug-ins and/or Fragments and associated material.\n\
- Each Feature may be packaged as a sub-directory in a directory named "features".\n\
- Within a Feature, files named "feature.xml" may contain a list of the names and version\n\
- numbers of the Plug-ins and/or Fragments associated with that Feature.\n\
- - Features may also include other Features ("Included Features"). Within a Feature, files\n\
- named "feature.xml" may contain a list of the names and version numbers of Included Features.\n\
-\n\
-The terms and conditions governing Plug-ins and Fragments should be\n\
-contained in files named "about.html" ("Abouts"). The terms and\n\
-conditions governing Features and Included Features should be contained\n\
-in files named "license.html" ("Feature Licenses"). Abouts and Feature\n\
-Licenses may be located in any directory of a Download or Module\n\
-including, but not limited to the following locations:\n\
-\n\
- - The top-level (root) directory\n\
- - Plug-in and Fragment directories\n\
- - Inside Plug-ins and Fragments packaged as JARs\n\
- - Sub-directories of the directory named "src" of certain Plug-ins\n\
- - Feature directories\n\
-\n\
-Note: if a Feature made available by the Eclipse Foundation is installed using the\n\
-Provisioning Technology (as defined below), you must agree to a license ("Feature \n\
-Update License") during the installation process. If the Feature contains\n\
-Included Features, the Feature Update License should either provide you\n\
-with the terms and conditions governing the Included Features or inform\n\
-you where you can locate them. Feature Update Licenses may be found in\n\
-the "license" property of files named "feature.properties" found within a Feature.\n\
-Such Abouts, Feature Licenses, and Feature Update Licenses contain the\n\
-terms and conditions (or references to such terms and conditions) that\n\
-govern your use of the associated Content in that directory.\n\
-\n\
-THE ABOUTS, FEATURE LICENSES, AND FEATURE UPDATE LICENSES MAY REFER\n\
-TO THE EPL OR OTHER LICENSE AGREEMENTS, NOTICES OR TERMS AND CONDITIONS.\n\
-SOME OF THESE OTHER LICENSE AGREEMENTS MAY INCLUDE (BUT ARE NOT LIMITED TO):\n\
-\n\
- - Common Public License Version 1.0 (available at http://www.eclipse.org/legal/cpl-v10.html)\n\
- - Apache Software License 1.1 (available at http://www.apache.org/licenses/LICENSE)\n\
- - Apache Software License 2.0 (available at http://www.apache.org/licenses/LICENSE-2.0)\n\
- - Metro Link Public License 1.00 (available at http://www.opengroup.org/openmotif/supporters/metrolink/license.html)\n\
- - Mozilla Public License Version 1.1 (available at http://www.mozilla.org/MPL/MPL-1.1.html)\n\
-\n\
-IT IS YOUR OBLIGATION TO READ AND ACCEPT ALL SUCH TERMS AND CONDITIONS PRIOR\n\
-TO USE OF THE CONTENT. If no About, Feature License, or Feature Update License\n\
-is provided, please contact the Eclipse Foundation to determine what terms and conditions\n\
-govern that particular Content.\n\
-\n\
-\n\Use of Provisioning Technology\n\
-\n\
-The Eclipse Foundation makes available provisioning software, examples of which include,\n\
-but are not limited to, p2 and the Eclipse Update Manager ("Provisioning Technology") for\n\
-the purpose of allowing users to install software, documentation, information and/or\n\
-other materials (collectively "Installable Software"). This capability is provided with\n\
-the intent of allowing such users to install, extend and update Eclipse-based products.\n\
-Information about packaging Installable Software is available at\n\
-http://eclipse.org/equinox/p2/repository_packaging.html ("Specification").\n\
-\n\
-You may use Provisioning Technology to allow other parties to install Installable Software.\n\
-You shall be responsible for enabling the applicable license agreements relating to the\n\
-Installable Software to be presented to, and accepted by, the users of the Provisioning Technology\n\
-in accordance with the Specification. By using Provisioning Technology in such a manner and\n\
-making it available in accordance with the Specification, you further acknowledge your\n\
-agreement to, and the acquisition of all necessary rights to permit the following:\n\
-\n\
- 1. A series of actions may occur ("Provisioning Process") in which a user may execute\n\
- the Provisioning Technology on a machine ("Target Machine") with the intent of installing,\n\
- extending or updating the functionality of an Eclipse-based product.\n\
- 2. During the Provisioning Process, the Provisioning Technology may cause third party\n\
- Installable Software or a portion thereof to be accessed and copied to the Target Machine.\n\
- 3. Pursuant to the Specification, you will provide to the user the terms and conditions that\n\
- govern the use of the Installable Software ("Installable Software Agreement") and such\n\
- Installable Software Agreement shall be accessed from the Target Machine in accordance\n\
- with the Specification. Such Installable Software Agreement must inform the user of the\n\
- terms and conditions that govern the Installable Software and must solicit acceptance by\n\
- the end user in the manner prescribed in such Installable Software Agreement. Upon such\n\
- indication of agreement by the user, the provisioning Technology will complete installation\n\
- of the Installable Software.\n\
-\n\
-Cryptography\n\
-\n\
-Content may contain encryption software. The country in which you are\n\
-currently may have restrictions on the import, possession, and use,\n\
-and/or re-export to another country, of encryption software. BEFORE\n\
-using any encryption software, please check the country's laws,\n\
-regulations and policies concerning the import, possession, or use, and\n\
-re-export of encryption software, to see if this is permitted.\n\
-\n\
-Java and all Java-based trademarks are trademarks of Oracle Corporation in the United States, other countries, or both.\n
-########### end of license property ##########################################
diff --git a/features/org.eclipse.jst.enterprise_core.feature/sourceTemplateFeature/license.html b/features/org.eclipse.jst.enterprise_core.feature/sourceTemplateFeature/license.html
deleted file mode 100644
index c184ca3..0000000
--- a/features/org.eclipse.jst.enterprise_core.feature/sourceTemplateFeature/license.html
+++ /dev/null
@@ -1,107 +0,0 @@
-<?xml version="1.0" encoding="ISO-8859-1" ?>
-<!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.0 Strict//EN" "http://www.w3.org/TR/xhtml1/DTD/xhtml1-strict.dtd">
-<html xmlns="http://www.w3.org/1999/xhtml">
-<head>
-<meta http-equiv="Content-Type" content="text/html; charset=ISO-8859-1" />
-<title>Eclipse Foundation Software User Agreement</title>
-</head>
-
-<body lang="EN-US">
-<h2>Eclipse Foundation Software User Agreement</h2>
-<p>April 14, 2010</p>
-
-<h3>Usage Of Content</h3>
-
-<p>THE ECLIPSE FOUNDATION MAKES AVAILABLE SOFTWARE, DOCUMENTATION, INFORMATION AND/OR OTHER MATERIALS FOR OPEN SOURCE PROJECTS
- (COLLECTIVELY "CONTENT"). USE OF THE CONTENT IS GOVERNED BY THE TERMS AND CONDITIONS OF THIS AGREEMENT AND/OR THE TERMS AND
- CONDITIONS OF LICENSE AGREEMENTS OR NOTICES INDICATED OR REFERENCED BELOW. BY USING THE CONTENT, YOU AGREE THAT YOUR USE
- OF THE CONTENT IS GOVERNED BY THIS AGREEMENT AND/OR THE TERMS AND CONDITIONS OF ANY APPLICABLE LICENSE AGREEMENTS OR
- NOTICES INDICATED OR REFERENCED BELOW. IF YOU DO NOT AGREE TO THE TERMS AND CONDITIONS OF THIS AGREEMENT AND THE TERMS AND
- CONDITIONS OF ANY APPLICABLE LICENSE AGREEMENTS OR NOTICES INDICATED OR REFERENCED BELOW, THEN YOU MAY NOT USE THE CONTENT.</p>
-
-<h3>Applicable Licenses</h3>
-
-<p>Unless otherwise indicated, all Content made available by the Eclipse Foundation is provided to you under the terms and conditions of the Eclipse Public License Version 1.0
- ("EPL"). A copy of the EPL is provided with this Content and is also available at <a href="http://www.eclipse.org/legal/epl-v10.html">http://www.eclipse.org/legal/epl-v10.html</a>.
- For purposes of the EPL, "Program" will mean the Content.</p>
-
-<p>Content includes, but is not limited to, source code, object code, documentation and other files maintained in the Eclipse Foundation source code
- repository ("Repository") in software modules ("Modules") and made available as downloadable archives ("Downloads").</p>
-
-<ul>
- <li>Content may be structured and packaged into modules to facilitate delivering, extending, and upgrading the Content. Typical modules may include plug-ins ("Plug-ins"), plug-in fragments ("Fragments"), and features ("Features").</li>
- <li>Each Plug-in or Fragment may be packaged as a sub-directory or JAR (Java™ ARchive) in a directory named "plugins".</li>
- <li>A Feature is a bundle of one or more Plug-ins and/or Fragments and associated material. Each Feature may be packaged as a sub-directory in a directory named "features". Within a Feature, files named "feature.xml" may contain a list of the names and version numbers of the Plug-ins
- and/or Fragments associated with that Feature.</li>
- <li>Features may also include other Features ("Included Features"). Within a Feature, files named "feature.xml" may contain a list of the names and version numbers of Included Features.</li>
-</ul>
-
-<p>The terms and conditions governing Plug-ins and Fragments should be contained in files named "about.html" ("Abouts"). The terms and conditions governing Features and
-Included Features should be contained in files named "license.html" ("Feature Licenses"). Abouts and Feature Licenses may be located in any directory of a Download or Module
-including, but not limited to the following locations:</p>
-
-<ul>
- <li>The top-level (root) directory</li>
- <li>Plug-in and Fragment directories</li>
- <li>Inside Plug-ins and Fragments packaged as JARs</li>
- <li>Sub-directories of the directory named "src" of certain Plug-ins</li>
- <li>Feature directories</li>
-</ul>
-
-<p>Note: if a Feature made available by the Eclipse Foundation is installed using the Provisioning Technology (as defined below), you must agree to a license ("Feature Update License") during the
-installation process. If the Feature contains Included Features, the Feature Update License should either provide you with the terms and conditions governing the Included Features or
-inform you where you can locate them. Feature Update Licenses may be found in the "license" property of files named "feature.properties" found within a Feature.
-Such Abouts, Feature Licenses, and Feature Update Licenses contain the terms and conditions (or references to such terms and conditions) that govern your use of the associated Content in
-that directory.</p>
-
-<p>THE ABOUTS, FEATURE LICENSES, AND FEATURE UPDATE LICENSES MAY REFER TO THE EPL OR OTHER LICENSE AGREEMENTS, NOTICES OR TERMS AND CONDITIONS. SOME OF THESE
-OTHER LICENSE AGREEMENTS MAY INCLUDE (BUT ARE NOT LIMITED TO):</p>
-
-<ul>
- <li>Common Public License Version 1.0 (available at <a href="http://www.eclipse.org/legal/cpl-v10.html">http://www.eclipse.org/legal/cpl-v10.html</a>)</li>
- <li>Apache Software License 1.1 (available at <a href="http://www.apache.org/licenses/LICENSE">http://www.apache.org/licenses/LICENSE</a>)</li>
- <li>Apache Software License 2.0 (available at <a href="http://www.apache.org/licenses/LICENSE-2.0">http://www.apache.org/licenses/LICENSE-2.0</a>)</li>
- <li>Metro Link Public License 1.00 (available at <a href="http://www.opengroup.org/openmotif/supporters/metrolink/license.html">http://www.opengroup.org/openmotif/supporters/metrolink/license.html</a>)</li>
- <li>Mozilla Public License Version 1.1 (available at <a href="http://www.mozilla.org/MPL/MPL-1.1.html">http://www.mozilla.org/MPL/MPL-1.1.html</a>)</li>
-</ul>
-
-<p>IT IS YOUR OBLIGATION TO READ AND ACCEPT ALL SUCH TERMS AND CONDITIONS PRIOR TO USE OF THE CONTENT. If no About, Feature License, or Feature Update License is provided, please
-contact the Eclipse Foundation to determine what terms and conditions govern that particular Content.</p>
-
-
-<h3>Use of Provisioning Technology</h3>
-
-<p>The Eclipse Foundation makes available provisioning software, examples of which include, but are not limited to, p2 and the Eclipse
- Update Manager ("Provisioning Technology") for the purpose of allowing users to install software, documentation, information and/or
- other materials (collectively "Installable Software"). This capability is provided with the intent of allowing such users to
- install, extend and update Eclipse-based products. Information about packaging Installable Software is available at <a
- href="http://eclipse.org/equinox/p2/repository_packaging.html">http://eclipse.org/equinox/p2/repository_packaging.html</a>
- ("Specification").</p>
-
-<p>You may use Provisioning Technology to allow other parties to install Installable Software. You shall be responsible for enabling the
- applicable license agreements relating to the Installable Software to be presented to, and accepted by, the users of the Provisioning Technology
- in accordance with the Specification. By using Provisioning Technology in such a manner and making it available in accordance with the
- Specification, you further acknowledge your agreement to, and the acquisition of all necessary rights to permit the following:</p>
-
-<ol>
- <li>A series of actions may occur ("Provisioning Process") in which a user may execute the Provisioning Technology
- on a machine ("Target Machine") with the intent of installing, extending or updating the functionality of an Eclipse-based
- product.</li>
- <li>During the Provisioning Process, the Provisioning Technology may cause third party Installable Software or a portion thereof to be
- accessed and copied to the Target Machine.</li>
- <li>Pursuant to the Specification, you will provide to the user the terms and conditions that govern the use of the Installable
- Software ("Installable Software Agreement") and such Installable Software Agreement shall be accessed from the Target
- Machine in accordance with the Specification. Such Installable Software Agreement must inform the user of the terms and conditions that govern
- the Installable Software and must solicit acceptance by the end user in the manner prescribed in such Installable Software Agreement. Upon such
- indication of agreement by the user, the provisioning Technology will complete installation of the Installable Software.</li>
-</ol>
-
-<h3>Cryptography</h3>
-
-<p>Content may contain encryption software. The country in which you are currently may have restrictions on the import, possession, and use, and/or re-export to
- another country, of encryption software. BEFORE using any encryption software, please check the country's laws, regulations and policies concerning the import,
- possession, or use, and re-export of encryption software, to see if this is permitted.</p>
-
-<p><small>Java and all Java-based trademarks are trademarks of Oracle Corporation in the United States, other countries, or both.</small></p>
-</body>
-</html>
diff --git a/features/org.eclipse.jst.enterprise_core.feature/sourceTemplatePlugin/about.html b/features/org.eclipse.jst.enterprise_core.feature/sourceTemplatePlugin/about.html
deleted file mode 100644
index fe81d46..0000000
--- a/features/org.eclipse.jst.enterprise_core.feature/sourceTemplatePlugin/about.html
+++ /dev/null
@@ -1,27 +0,0 @@
-<!DOCTYPE HTML PUBLIC "-//W3C//DTD HTML 4.0//EN">
-<html>
-<head>
-<title>About</title>
-<meta http-equiv=Content-Type content="text/html; charset=ISO-8859-1">
-</head>
-<body lang="EN-US">
-<h2>About This Content</h2>
-
-<P>June, 2008</P>
-<h3>License</h3>
-
-<p>The Eclipse Foundation makes available all content in this plug-in ("Content"). Unless otherwise indicated below, the Content is provided to you under the terms and conditions of the
-Eclipse Public License Version 1.0 ("EPL"). A copy of the EPL is available at <a href="http://www.eclipse.org/legal/epl-v10.html">http://www.eclipse.org/legal/epl-v10.html</a>.
-For purposes of the EPL, "Program" will mean the Content.</p>
-
-<p>If you did not receive this Content directly from the Eclipse Foundation, the Content is being redistributed by another party ("Redistributor") and different terms and conditions may
-apply to your use of any object code in the Content. Check the Redistributor's license that was provided with the Content. If no such license exists, contact the Redistributor. Unless otherwise
-indicated below, the terms and conditions of the EPL still apply to any source code in the Content.</p>
-
-<h3>Source Code</h3>
-<p>This plug-in contains source code zip files ("Source Zips") that correspond to binary content in other plug-ins. These Source Zips may be distributed under different license
-agreements and/or notices. Details about these license agreements and notices are contained in "about.html" files ("Abouts") located in sub-directories in the
-src/ directory of this plug-in. Such Abouts govern your use of the Source Zips in that directory, not the EPL.</p>
-
-</body>
-</html>
diff --git a/features/org.eclipse.jst.enterprise_core.feature/sourceTemplatePlugin/about.ini b/features/org.eclipse.jst.enterprise_core.feature/sourceTemplatePlugin/about.ini
deleted file mode 100644
index fda5a40..0000000
--- a/features/org.eclipse.jst.enterprise_core.feature/sourceTemplatePlugin/about.ini
+++ /dev/null
@@ -1,31 +0,0 @@
-# about.ini
-# contains information about a feature
-# java.io.Properties file (ISO 8859-1 with "\" escapes)
-# "%key" are externalized strings defined in about.properties
-# This file does not need to be translated.
-
-# Property "aboutText" contains blurb for "About" dialog (translated)
-aboutText=%blurb
-
-# Property "windowImage" contains path to window icon (16x16)
-# needed for primary features only
-
-# Property "featureImage" contains path to feature image (32x32)
-featureImage=wtp_prod32.png
-
-# Property "aboutImage" contains path to product image (500x330 or 115x164)
-# needed for primary features only
-
-# Property "appName" contains name of the application (not translated)
-# needed for primary features only
-
-# Property "welcomePage" contains path to welcome page (special XML-based format)
-# optional
-
-# Property "welcomePerspective" contains the id of the perspective in which the
-# welcome page is to be opened.
-# optional
-
-
-
-
diff --git a/features/org.eclipse.jst.enterprise_core.feature/sourceTemplatePlugin/about.mappings b/features/org.eclipse.jst.enterprise_core.feature/sourceTemplatePlugin/about.mappings
deleted file mode 100644
index 0dfb735..0000000
--- a/features/org.eclipse.jst.enterprise_core.feature/sourceTemplatePlugin/about.mappings
+++ /dev/null
@@ -1,6 +0,0 @@
-# about.mappings
-# contains fill-ins for about.properties
-# java.io.Properties file (ISO 8859-1 with "\" escapes)
-# This file does not need to be translated.
-
-0=@build@
diff --git a/features/org.eclipse.jst.enterprise_core.feature/sourceTemplatePlugin/about.properties b/features/org.eclipse.jst.enterprise_core.feature/sourceTemplatePlugin/about.properties
deleted file mode 100644
index c3f1925..0000000
--- a/features/org.eclipse.jst.enterprise_core.feature/sourceTemplatePlugin/about.properties
+++ /dev/null
@@ -1,26 +0,0 @@
-###############################################################################
-# Copyright (c) 2000, 2005 IBM Corporation and others.
-# All rights reserved. This program and the accompanying materials
-# are made available under the terms of the Eclipse Public License v1.0
-# which accompanies this distribution, and is available at
-# http://www.eclipse.org/legal/epl-v10.html
-#
-# Contributors:
-# IBM Corporation - initial API and implementation
-###############################################################################
-# about.properties
-# contains externalized strings for about.ini
-# java.io.Properties file (ISO 8859-1 with "\" escapes)
-# fill-ins are supplied by about.mappings
-# This file should be translated.
-#
-# Do not translate any values surrounded by {}
-
-blurb=J2EE Standard Tools - Enterprise Core\n\
-\n\
-Version: {featureVersion}\n\
-Build id: {0}\n\
-\n\
-(c) Copyright Eclipse contributors and others 2005. All rights reserved.\n\
-Visit http://www.eclipse.org/webtools
-
diff --git a/features/org.eclipse.jst.enterprise_core.feature/sourceTemplatePlugin/build.properties b/features/org.eclipse.jst.enterprise_core.feature/sourceTemplatePlugin/build.properties
deleted file mode 100644
index ead512d..0000000
--- a/features/org.eclipse.jst.enterprise_core.feature/sourceTemplatePlugin/build.properties
+++ /dev/null
@@ -1,2 +0,0 @@
-bin.includes = about.html, about.ini, about.mappings, about.properties, wtp_prod32.png, plugin.properties, plugin.xml, src/**, META-INF/
-sourcePlugin = true
diff --git a/features/org.eclipse.jst.enterprise_core.feature/sourceTemplatePlugin/plugin.properties b/features/org.eclipse.jst.enterprise_core.feature/sourceTemplatePlugin/plugin.properties
deleted file mode 100644
index 85bf6e4..0000000
--- a/features/org.eclipse.jst.enterprise_core.feature/sourceTemplatePlugin/plugin.properties
+++ /dev/null
@@ -1,12 +0,0 @@
-###############################################################################
-# Copyright (c) 2005 IBM Corporation and others.
-# All rights reserved. This program and the accompanying materials
-# are made available under the terms of the Eclipse Public License v1.0
-# which accompanies this distribution, and is available at
-# http://www.eclipse.org/legal/epl-v10.html
-#
-# Contributors:
-# IBM Corporation - initial API and implementation
-###############################################################################
-pluginName=J2EE Standard Tools - Enterprise Core Source
-providerName=Eclipse.org
diff --git a/features/org.eclipse.jst.enterprise_core.feature/sourceTemplatePlugin/wtp_prod32.gif b/features/org.eclipse.jst.enterprise_core.feature/sourceTemplatePlugin/wtp_prod32.gif
deleted file mode 100644
index eefb44a..0000000
--- a/features/org.eclipse.jst.enterprise_core.feature/sourceTemplatePlugin/wtp_prod32.gif
+++ /dev/null
Binary files differ
diff --git a/features/org.eclipse.jst.enterprise_core.feature/sourceTemplatePlugin/wtp_prod32.png b/features/org.eclipse.jst.enterprise_core.feature/sourceTemplatePlugin/wtp_prod32.png
deleted file mode 100644
index bfceab3..0000000
--- a/features/org.eclipse.jst.enterprise_core.feature/sourceTemplatePlugin/wtp_prod32.png
+++ /dev/null
Binary files differ
diff --git a/features/org.eclipse.jst.enterprise_sdk.feature/.cvsignore b/features/org.eclipse.jst.enterprise_sdk.feature/.cvsignore
deleted file mode 100644
index 95a8d29..0000000
--- a/features/org.eclipse.jst.enterprise_sdk.feature/.cvsignore
+++ /dev/null
@@ -1,4 +0,0 @@
-features
-plugins
-build.xml
-org.eclipse.jst.enterprise_sdk.feature_1.0.0.bin.dist.zip
diff --git a/features/org.eclipse.jst.enterprise_sdk.feature/.project b/features/org.eclipse.jst.enterprise_sdk.feature/.project
deleted file mode 100644
index 44e6982..0000000
--- a/features/org.eclipse.jst.enterprise_sdk.feature/.project
+++ /dev/null
@@ -1,17 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<projectDescription>
- <name>org.eclipse.jst.enterprise_sdk.feature</name>
- <comment></comment>
- <projects>
- </projects>
- <buildSpec>
- <buildCommand>
- <name>org.eclipse.pde.FeatureBuilder</name>
- <arguments>
- </arguments>
- </buildCommand>
- </buildSpec>
- <natures>
- <nature>org.eclipse.pde.FeatureNature</nature>
- </natures>
-</projectDescription>
diff --git a/features/org.eclipse.jst.enterprise_sdk.feature/build.properties b/features/org.eclipse.jst.enterprise_sdk.feature/build.properties
deleted file mode 100644
index 925a040..0000000
--- a/features/org.eclipse.jst.enterprise_sdk.feature/build.properties
+++ /dev/null
@@ -1,8 +0,0 @@
-bin.includes = feature.xml,\
- eclipse_update_120.jpg,\
- epl-v10.html,\
- license.html,\
- feature.properties
-
-generate.feature@org.eclipse.jst.enterprise_ui.feature.source=org.eclipse.jst.enterprise_ui.feature, feature@org.eclipse.jst.enterprise_core.feature.source
-
diff --git a/features/org.eclipse.jst.enterprise_sdk.feature/eclipse_update_120.jpg b/features/org.eclipse.jst.enterprise_sdk.feature/eclipse_update_120.jpg
deleted file mode 100644
index bfdf708..0000000
--- a/features/org.eclipse.jst.enterprise_sdk.feature/eclipse_update_120.jpg
+++ /dev/null
Binary files differ
diff --git a/features/org.eclipse.jst.enterprise_sdk.feature/epl-v10.html b/features/org.eclipse.jst.enterprise_sdk.feature/epl-v10.html
deleted file mode 100644
index ed4b196..0000000
--- a/features/org.eclipse.jst.enterprise_sdk.feature/epl-v10.html
+++ /dev/null
@@ -1,328 +0,0 @@
-<html xmlns:o="urn:schemas-microsoft-com:office:office"
-xmlns:w="urn:schemas-microsoft-com:office:word"
-xmlns="http://www.w3.org/TR/REC-html40">
-
-<head>
-<meta http-equiv=Content-Type content="text/html; charset=windows-1252">
-<meta name=ProgId content=Word.Document>
-<meta name=Generator content="Microsoft Word 9">
-<meta name=Originator content="Microsoft Word 9">
-<link rel=File-List
-href="./Eclipse%20EPL%202003_11_10%20Final_files/filelist.xml">
-<title>Eclipse Public License - Version 1.0</title>
-<!--[if gte mso 9]><xml>
- <o:DocumentProperties>
- <o:Revision>2</o:Revision>
- <o:TotalTime>3</o:TotalTime>
- <o:Created>2004-03-05T23:03:00Z</o:Created>
- <o:LastSaved>2004-03-05T23:03:00Z</o:LastSaved>
- <o:Pages>4</o:Pages>
- <o:Words>1626</o:Words>
- <o:Characters>9270</o:Characters>
- <o:Lines>77</o:Lines>
- <o:Paragraphs>18</o:Paragraphs>
- <o:CharactersWithSpaces>11384</o:CharactersWithSpaces>
- <o:Version>9.4402</o:Version>
- </o:DocumentProperties>
-</xml><![endif]--><!--[if gte mso 9]><xml>
- <w:WordDocument>
- <w:TrackRevisions/>
- </w:WordDocument>
-</xml><![endif]-->
-<style>
-<!--
- /* Font Definitions */
-@font-face
- {font-family:Tahoma;
- panose-1:2 11 6 4 3 5 4 4 2 4;
- mso-font-charset:0;
- mso-generic-font-family:swiss;
- mso-font-pitch:variable;
- mso-font-signature:553679495 -2147483648 8 0 66047 0;}
- /* Style Definitions */
-p.MsoNormal, li.MsoNormal, div.MsoNormal
- {mso-style-parent:"";
- margin:0in;
- margin-bottom:.0001pt;
- mso-pagination:widow-orphan;
- font-size:12.0pt;
- font-family:"Times New Roman";
- mso-fareast-font-family:"Times New Roman";}
-p
- {margin-right:0in;
- mso-margin-top-alt:auto;
- mso-margin-bottom-alt:auto;
- margin-left:0in;
- mso-pagination:widow-orphan;
- font-size:12.0pt;
- font-family:"Times New Roman";
- mso-fareast-font-family:"Times New Roman";}
-p.BalloonText, li.BalloonText, div.BalloonText
- {mso-style-name:"Balloon Text";
- margin:0in;
- margin-bottom:.0001pt;
- mso-pagination:widow-orphan;
- font-size:8.0pt;
- font-family:Tahoma;
- mso-fareast-font-family:"Times New Roman";}
-@page Section1
- {size:8.5in 11.0in;
- margin:1.0in 1.25in 1.0in 1.25in;
- mso-header-margin:.5in;
- mso-footer-margin:.5in;
- mso-paper-source:0;}
-div.Section1
- {page:Section1;}
--->
-</style>
-</head>
-
-<body lang=EN-US style='tab-interval:.5in'>
-
-<div class=Section1>
-
-<p align=center style='text-align:center'><b>Eclipse Public License - v 1.0</b>
-</p>
-
-<p><span style='font-size:10.0pt'>THE ACCOMPANYING PROGRAM IS PROVIDED UNDER
-THE TERMS OF THIS ECLIPSE PUBLIC LICENSE ("AGREEMENT"). ANY USE,
-REPRODUCTION OR DISTRIBUTION OF THE PROGRAM CONSTITUTES RECIPIENT'S ACCEPTANCE
-OF THIS AGREEMENT.</span> </p>
-
-<p><b><span style='font-size:10.0pt'>1. DEFINITIONS</span></b> </p>
-
-<p><span style='font-size:10.0pt'>"Contribution" means:</span> </p>
-
-<p class=MsoNormal style='margin-left:.5in'><span style='font-size:10.0pt'>a)
-in the case of the initial Contributor, the initial code and documentation
-distributed under this Agreement, and<br clear=left>
-b) in the case of each subsequent Contributor:</span></p>
-
-<p class=MsoNormal style='margin-left:.5in'><span style='font-size:10.0pt'>i)
-changes to the Program, and</span></p>
-
-<p class=MsoNormal style='margin-left:.5in'><span style='font-size:10.0pt'>ii)
-additions to the Program;</span></p>
-
-<p class=MsoNormal style='margin-left:.5in'><span style='font-size:10.0pt'>where
-such changes and/or additions to the Program originate from and are distributed
-by that particular Contributor. A Contribution 'originates' from a Contributor
-if it was added to the Program by such Contributor itself or anyone acting on
-such Contributor's behalf. Contributions do not include additions to the
-Program which: (i) are separate modules of software distributed in conjunction
-with the Program under their own license agreement, and (ii) are not derivative
-works of the Program. </span></p>
-
-<p><span style='font-size:10.0pt'>"Contributor" means any person or
-entity that distributes the Program.</span> </p>
-
-<p><span style='font-size:10.0pt'>"Licensed Patents " mean patent
-claims licensable by a Contributor which are necessarily infringed by the use
-or sale of its Contribution alone or when combined with the Program. </span></p>
-
-<p><span style='font-size:10.0pt'>"Program" means the Contributions
-distributed in accordance with this Agreement.</span> </p>
-
-<p><span style='font-size:10.0pt'>"Recipient" means anyone who
-receives the Program under this Agreement, including all Contributors.</span> </p>
-
-<p><b><span style='font-size:10.0pt'>2. GRANT OF RIGHTS</span></b> </p>
-
-<p class=MsoNormal style='margin-left:.5in'><span style='font-size:10.0pt'>a)
-Subject to the terms of this Agreement, each Contributor hereby grants Recipient
-a non-exclusive, worldwide, royalty-free copyright license to<span
-style='color:red'> </span>reproduce, prepare derivative works of, publicly
-display, publicly perform, distribute and sublicense the Contribution of such
-Contributor, if any, and such derivative works, in source code and object code
-form.</span></p>
-
-<p class=MsoNormal style='margin-left:.5in'><span style='font-size:10.0pt'>b)
-Subject to the terms of this Agreement, each Contributor hereby grants
-Recipient a non-exclusive, worldwide,<span style='color:green'> </span>royalty-free
-patent license under Licensed Patents to make, use, sell, offer to sell, import
-and otherwise transfer the Contribution of such Contributor, if any, in source
-code and object code form. This patent license shall apply to the combination
-of the Contribution and the Program if, at the time the Contribution is added
-by the Contributor, such addition of the Contribution causes such combination
-to be covered by the Licensed Patents. The patent license shall not apply to
-any other combinations which include the Contribution. No hardware per se is
-licensed hereunder. </span></p>
-
-<p class=MsoNormal style='margin-left:.5in'><span style='font-size:10.0pt'>c)
-Recipient understands that although each Contributor grants the licenses to its
-Contributions set forth herein, no assurances are provided by any Contributor
-that the Program does not infringe the patent or other intellectual property
-rights of any other entity. Each Contributor disclaims any liability to Recipient
-for claims brought by any other entity based on infringement of intellectual
-property rights or otherwise. As a condition to exercising the rights and
-licenses granted hereunder, each Recipient hereby assumes sole responsibility
-to secure any other intellectual property rights needed, if any. For example,
-if a third party patent license is required to allow Recipient to distribute
-the Program, it is Recipient's responsibility to acquire that license before
-distributing the Program.</span></p>
-
-<p class=MsoNormal style='margin-left:.5in'><span style='font-size:10.0pt'>d)
-Each Contributor represents that to its knowledge it has sufficient copyright
-rights in its Contribution, if any, to grant the copyright license set forth in
-this Agreement. </span></p>
-
-<p><b><span style='font-size:10.0pt'>3. REQUIREMENTS</span></b> </p>
-
-<p><span style='font-size:10.0pt'>A Contributor may choose to distribute the
-Program in object code form under its own license agreement, provided that:</span>
-</p>
-
-<p class=MsoNormal style='margin-left:.5in'><span style='font-size:10.0pt'>a)
-it complies with the terms and conditions of this Agreement; and</span></p>
-
-<p class=MsoNormal style='margin-left:.5in'><span style='font-size:10.0pt'>b)
-its license agreement:</span></p>
-
-<p class=MsoNormal style='margin-left:.5in'><span style='font-size:10.0pt'>i)
-effectively disclaims on behalf of all Contributors all warranties and
-conditions, express and implied, including warranties or conditions of title
-and non-infringement, and implied warranties or conditions of merchantability
-and fitness for a particular purpose; </span></p>
-
-<p class=MsoNormal style='margin-left:.5in'><span style='font-size:10.0pt'>ii)
-effectively excludes on behalf of all Contributors all liability for damages,
-including direct, indirect, special, incidental and consequential damages, such
-as lost profits; </span></p>
-
-<p class=MsoNormal style='margin-left:.5in'><span style='font-size:10.0pt'>iii)
-states that any provisions which differ from this Agreement are offered by that
-Contributor alone and not by any other party; and</span></p>
-
-<p class=MsoNormal style='margin-left:.5in'><span style='font-size:10.0pt'>iv)
-states that source code for the Program is available from such Contributor, and
-informs licensees how to obtain it in a reasonable manner on or through a
-medium customarily used for software exchange.<span style='color:blue'> </span></span></p>
-
-<p><span style='font-size:10.0pt'>When the Program is made available in source
-code form:</span> </p>
-
-<p class=MsoNormal style='margin-left:.5in'><span style='font-size:10.0pt'>a)
-it must be made available under this Agreement; and </span></p>
-
-<p class=MsoNormal style='margin-left:.5in'><span style='font-size:10.0pt'>b) a
-copy of this Agreement must be included with each copy of the Program. </span></p>
-
-<p><span style='font-size:10.0pt'>Contributors may not remove or alter any
-copyright notices contained within the Program. </span></p>
-
-<p><span style='font-size:10.0pt'>Each Contributor must identify itself as the
-originator of its Contribution, if any, in a manner that reasonably allows
-subsequent Recipients to identify the originator of the Contribution. </span></p>
-
-<p><b><span style='font-size:10.0pt'>4. COMMERCIAL DISTRIBUTION</span></b> </p>
-
-<p><span style='font-size:10.0pt'>Commercial distributors of software may
-accept certain responsibilities with respect to end users, business partners
-and the like. While this license is intended to facilitate the commercial use
-of the Program, the Contributor who includes the Program in a commercial
-product offering should do so in a manner which does not create potential
-liability for other Contributors. Therefore, if a Contributor includes the
-Program in a commercial product offering, such Contributor ("Commercial
-Contributor") hereby agrees to defend and indemnify every other
-Contributor ("Indemnified Contributor") against any losses, damages and
-costs (collectively "Losses") arising from claims, lawsuits and other
-legal actions brought by a third party against the Indemnified Contributor to
-the extent caused by the acts or omissions of such Commercial Contributor in
-connection with its distribution of the Program in a commercial product
-offering. The obligations in this section do not apply to any claims or Losses
-relating to any actual or alleged intellectual property infringement. In order
-to qualify, an Indemnified Contributor must: a) promptly notify the Commercial
-Contributor in writing of such claim, and b) allow the Commercial Contributor
-to control, and cooperate with the Commercial Contributor in, the defense and
-any related settlement negotiations. The Indemnified Contributor may participate
-in any such claim at its own expense.</span> </p>
-
-<p><span style='font-size:10.0pt'>For example, a Contributor might include the
-Program in a commercial product offering, Product X. That Contributor is then a
-Commercial Contributor. If that Commercial Contributor then makes performance
-claims, or offers warranties related to Product X, those performance claims and
-warranties are such Commercial Contributor's responsibility alone. Under this
-section, the Commercial Contributor would have to defend claims against the
-other Contributors related to those performance claims and warranties, and if a
-court requires any other Contributor to pay any damages as a result, the
-Commercial Contributor must pay those damages.</span> </p>
-
-<p><b><span style='font-size:10.0pt'>5. NO WARRANTY</span></b> </p>
-
-<p><span style='font-size:10.0pt'>EXCEPT AS EXPRESSLY SET FORTH IN THIS
-AGREEMENT, THE PROGRAM IS PROVIDED ON AN "AS IS" BASIS, WITHOUT
-WARRANTIES OR CONDITIONS OF ANY KIND, EITHER EXPRESS OR IMPLIED INCLUDING,
-WITHOUT LIMITATION, ANY WARRANTIES OR CONDITIONS OF TITLE, NON-INFRINGEMENT,
-MERCHANTABILITY OR FITNESS FOR A PARTICULAR PURPOSE. Each Recipient is solely
-responsible for determining the appropriateness of using and distributing the
-Program and assumes all risks associated with its exercise of rights under this
-Agreement , including but not limited to the risks and costs of program errors,
-compliance with applicable laws, damage to or loss of data, programs or
-equipment, and unavailability or interruption of operations. </span></p>
-
-<p><b><span style='font-size:10.0pt'>6. DISCLAIMER OF LIABILITY</span></b> </p>
-
-<p><span style='font-size:10.0pt'>EXCEPT AS EXPRESSLY SET FORTH IN THIS
-AGREEMENT, NEITHER RECIPIENT NOR ANY CONTRIBUTORS SHALL HAVE ANY LIABILITY FOR
-ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES
-(INCLUDING WITHOUT LIMITATION LOST PROFITS), HOWEVER CAUSED AND ON ANY THEORY
-OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING
-NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OR DISTRIBUTION OF
-THE PROGRAM OR THE EXERCISE OF ANY RIGHTS GRANTED HEREUNDER, EVEN IF ADVISED OF
-THE POSSIBILITY OF SUCH DAMAGES.</span> </p>
-
-<p><b><span style='font-size:10.0pt'>7. GENERAL</span></b> </p>
-
-<p><span style='font-size:10.0pt'>If any provision of this Agreement is invalid
-or unenforceable under applicable law, it shall not affect the validity or
-enforceability of the remainder of the terms of this Agreement, and without
-further action by the parties hereto, such provision shall be reformed to the
-minimum extent necessary to make such provision valid and enforceable.</span> </p>
-
-<p><span style='font-size:10.0pt'>If Recipient institutes patent litigation
-against any entity (including a cross-claim or counterclaim in a lawsuit)
-alleging that the Program itself (excluding combinations of the Program with
-other software or hardware) infringes such Recipient's patent(s), then such
-Recipient's rights granted under Section 2(b) shall terminate as of the date
-such litigation is filed. </span></p>
-
-<p><span style='font-size:10.0pt'>All Recipient's rights under this Agreement
-shall terminate if it fails to comply with any of the material terms or
-conditions of this Agreement and does not cure such failure in a reasonable
-period of time after becoming aware of such noncompliance. If all Recipient's
-rights under this Agreement terminate, Recipient agrees to cease use and
-distribution of the Program as soon as reasonably practicable. However,
-Recipient's obligations under this Agreement and any licenses granted by
-Recipient relating to the Program shall continue and survive. </span></p>
-
-<p><span style='font-size:10.0pt'>Everyone is permitted to copy and distribute
-copies of this Agreement, but in order to avoid inconsistency the Agreement is
-copyrighted and may only be modified in the following manner. The Agreement
-Steward reserves the right to publish new versions (including revisions) of
-this Agreement from time to time. No one other than the Agreement Steward has
-the right to modify this Agreement. The Eclipse Foundation is the initial
-Agreement Steward. The Eclipse Foundation may assign the responsibility to
-serve as the Agreement Steward to a suitable separate entity. Each new version
-of the Agreement will be given a distinguishing version number. The Program
-(including Contributions) may always be distributed subject to the version of
-the Agreement under which it was received. In addition, after a new version of
-the Agreement is published, Contributor may elect to distribute the Program
-(including its Contributions) under the new version. Except as expressly stated
-in Sections 2(a) and 2(b) above, Recipient receives no rights or licenses to
-the intellectual property of any Contributor under this Agreement, whether
-expressly, by implication, estoppel or otherwise. All rights in the Program not
-expressly granted under this Agreement are reserved.</span> </p>
-
-<p><span style='font-size:10.0pt'>This Agreement is governed by the laws of the
-State of New York and the intellectual property laws of the United States of
-America. No party to this Agreement will bring a legal action under this
-Agreement more than one year after the cause of action arose. Each party waives
-its rights to a jury trial in any resulting litigation.</span> </p>
-
-<p class=MsoNormal><![if !supportEmptyParas]> <![endif]><o:p></o:p></p>
-
-</div>
-
-</body>
-
-</html>
\ No newline at end of file
diff --git a/features/org.eclipse.jst.enterprise_sdk.feature/feature.properties b/features/org.eclipse.jst.enterprise_sdk.feature/feature.properties
deleted file mode 100644
index ac7ab72..0000000
--- a/features/org.eclipse.jst.enterprise_sdk.feature/feature.properties
+++ /dev/null
@@ -1,168 +0,0 @@
-###############################################################################
-# Copyright (c) 2006 IBM Corporation and others.
-# All rights reserved. This program and the accompanying materials
-# are made available under the terms of the Eclipse Public License v1.0
-# which accompanies this distribution, and is available at
-# http://www.eclipse.org/legal/epl-v10.html
-#
-# Contributors:
-# IBM Corporation - initial API and implementation
-###############################################################################
-# feature.properties
-# contains externalized strings for feature.xml
-# "%foo" in feature.xml corresponds to the key "foo" in this file
-# java.io.Properties file (ISO 8859-1 with "\" escapes)
-# This file should be translated.
-
-# "featureName" property - name of the feature
-featureName=JST Enterprise Plug-in Developer Resources
-
-# "providerName" property - name of the company that provides the feature
-providerName=Eclipse Web Tools Platform
-
-
-# "description" property - description of the feature
-description=Source code zips for JST enterprise tools
-
-# "copyright" property - text of the "Feature Update Copyright"
-copyright=\
-Copyright (c) 2006 IBM Corporation and others.\n\
-All rights reserved. This program and the accompanying materials\n\
-are made available under the terms of the Eclipse Public License v1.0\n\
-which accompanies this distribution, and is available at\n\
-http://www.eclipse.org/legal/epl-v10.html\n\
-\n\
-Contributors:\n\
- IBM Corporation - initial API and implementation\n
-################ end of copyright property ####################################
-
-# "licenseURL" property - URL of the "Feature License"
-# do not translate value - just change to point to a locale-specific HTML page
-licenseURL=license.html
-
-# "license" property - text of the "Feature Update License"
-# should be plain text version of license agreement pointed to be "licenseURL"
-license=\
-Eclipse Foundation Software User Agreement\n\
-April 14, 2010\n\
-\n\
-Usage Of Content\n\
-\n\
-THE ECLIPSE FOUNDATION MAKES AVAILABLE SOFTWARE, DOCUMENTATION, INFORMATION AND/OR\n\
-OTHER MATERIALS FOR OPEN SOURCE PROJECTS (COLLECTIVELY "CONTENT").\n\
-USE OF THE CONTENT IS GOVERNED BY THE TERMS AND CONDITIONS OF THIS\n\
-AGREEMENT AND/OR THE TERMS AND CONDITIONS OF LICENSE AGREEMENTS OR\n\
-NOTICES INDICATED OR REFERENCED BELOW. BY USING THE CONTENT, YOU\n\
-AGREE THAT YOUR USE OF THE CONTENT IS GOVERNED BY THIS AGREEMENT\n\
-AND/OR THE TERMS AND CONDITIONS OF ANY APPLICABLE LICENSE AGREEMENTS\n\
-OR NOTICES INDICATED OR REFERENCED BELOW. IF YOU DO NOT AGREE TO THE\n\
-TERMS AND CONDITIONS OF THIS AGREEMENT AND THE TERMS AND CONDITIONS\n\
-OF ANY APPLICABLE LICENSE AGREEMENTS OR NOTICES INDICATED OR REFERENCED\n\
-BELOW, THEN YOU MAY NOT USE THE CONTENT.\n\
-\n\
-Applicable Licenses\n\
-\n\
-Unless otherwise indicated, all Content made available by the\n\
-Eclipse Foundation is provided to you under the terms and conditions of\n\
-the Eclipse Public License Version 1.0 ("EPL"). A copy of the EPL is\n\
-provided with this Content and is also available at http://www.eclipse.org/legal/epl-v10.html.\n\
-For purposes of the EPL, "Program" will mean the Content.\n\
-\n\
-Content includes, but is not limited to, source code, object code,\n\
-documentation and other files maintained in the Eclipse Foundation source code\n\
-repository ("Repository") in software modules ("Modules") and made available\n\
-as downloadable archives ("Downloads").\n\
-\n\
- - Content may be structured and packaged into modules to facilitate delivering,\n\
- extending, and upgrading the Content. Typical modules may include plug-ins ("Plug-ins"),\n\
- plug-in fragments ("Fragments"), and features ("Features").\n\
- - Each Plug-in or Fragment may be packaged as a sub-directory or JAR (Java(TM) ARchive)\n\
- in a directory named "plugins".\n\
- - A Feature is a bundle of one or more Plug-ins and/or Fragments and associated material.\n\
- Each Feature may be packaged as a sub-directory in a directory named "features".\n\
- Within a Feature, files named "feature.xml" may contain a list of the names and version\n\
- numbers of the Plug-ins and/or Fragments associated with that Feature.\n\
- - Features may also include other Features ("Included Features"). Within a Feature, files\n\
- named "feature.xml" may contain a list of the names and version numbers of Included Features.\n\
-\n\
-The terms and conditions governing Plug-ins and Fragments should be\n\
-contained in files named "about.html" ("Abouts"). The terms and\n\
-conditions governing Features and Included Features should be contained\n\
-in files named "license.html" ("Feature Licenses"). Abouts and Feature\n\
-Licenses may be located in any directory of a Download or Module\n\
-including, but not limited to the following locations:\n\
-\n\
- - The top-level (root) directory\n\
- - Plug-in and Fragment directories\n\
- - Inside Plug-ins and Fragments packaged as JARs\n\
- - Sub-directories of the directory named "src" of certain Plug-ins\n\
- - Feature directories\n\
-\n\
-Note: if a Feature made available by the Eclipse Foundation is installed using the\n\
-Provisioning Technology (as defined below), you must agree to a license ("Feature \n\
-Update License") during the installation process. If the Feature contains\n\
-Included Features, the Feature Update License should either provide you\n\
-with the terms and conditions governing the Included Features or inform\n\
-you where you can locate them. Feature Update Licenses may be found in\n\
-the "license" property of files named "feature.properties" found within a Feature.\n\
-Such Abouts, Feature Licenses, and Feature Update Licenses contain the\n\
-terms and conditions (or references to such terms and conditions) that\n\
-govern your use of the associated Content in that directory.\n\
-\n\
-THE ABOUTS, FEATURE LICENSES, AND FEATURE UPDATE LICENSES MAY REFER\n\
-TO THE EPL OR OTHER LICENSE AGREEMENTS, NOTICES OR TERMS AND CONDITIONS.\n\
-SOME OF THESE OTHER LICENSE AGREEMENTS MAY INCLUDE (BUT ARE NOT LIMITED TO):\n\
-\n\
- - Common Public License Version 1.0 (available at http://www.eclipse.org/legal/cpl-v10.html)\n\
- - Apache Software License 1.1 (available at http://www.apache.org/licenses/LICENSE)\n\
- - Apache Software License 2.0 (available at http://www.apache.org/licenses/LICENSE-2.0)\n\
- - Metro Link Public License 1.00 (available at http://www.opengroup.org/openmotif/supporters/metrolink/license.html)\n\
- - Mozilla Public License Version 1.1 (available at http://www.mozilla.org/MPL/MPL-1.1.html)\n\
-\n\
-IT IS YOUR OBLIGATION TO READ AND ACCEPT ALL SUCH TERMS AND CONDITIONS PRIOR\n\
-TO USE OF THE CONTENT. If no About, Feature License, or Feature Update License\n\
-is provided, please contact the Eclipse Foundation to determine what terms and conditions\n\
-govern that particular Content.\n\
-\n\
-\n\Use of Provisioning Technology\n\
-\n\
-The Eclipse Foundation makes available provisioning software, examples of which include,\n\
-but are not limited to, p2 and the Eclipse Update Manager ("Provisioning Technology") for\n\
-the purpose of allowing users to install software, documentation, information and/or\n\
-other materials (collectively "Installable Software"). This capability is provided with\n\
-the intent of allowing such users to install, extend and update Eclipse-based products.\n\
-Information about packaging Installable Software is available at\n\
-http://eclipse.org/equinox/p2/repository_packaging.html ("Specification").\n\
-\n\
-You may use Provisioning Technology to allow other parties to install Installable Software.\n\
-You shall be responsible for enabling the applicable license agreements relating to the\n\
-Installable Software to be presented to, and accepted by, the users of the Provisioning Technology\n\
-in accordance with the Specification. By using Provisioning Technology in such a manner and\n\
-making it available in accordance with the Specification, you further acknowledge your\n\
-agreement to, and the acquisition of all necessary rights to permit the following:\n\
-\n\
- 1. A series of actions may occur ("Provisioning Process") in which a user may execute\n\
- the Provisioning Technology on a machine ("Target Machine") with the intent of installing,\n\
- extending or updating the functionality of an Eclipse-based product.\n\
- 2. During the Provisioning Process, the Provisioning Technology may cause third party\n\
- Installable Software or a portion thereof to be accessed and copied to the Target Machine.\n\
- 3. Pursuant to the Specification, you will provide to the user the terms and conditions that\n\
- govern the use of the Installable Software ("Installable Software Agreement") and such\n\
- Installable Software Agreement shall be accessed from the Target Machine in accordance\n\
- with the Specification. Such Installable Software Agreement must inform the user of the\n\
- terms and conditions that govern the Installable Software and must solicit acceptance by\n\
- the end user in the manner prescribed in such Installable Software Agreement. Upon such\n\
- indication of agreement by the user, the provisioning Technology will complete installation\n\
- of the Installable Software.\n\
-\n\
-Cryptography\n\
-\n\
-Content may contain encryption software. The country in which you are\n\
-currently may have restrictions on the import, possession, and use,\n\
-and/or re-export to another country, of encryption software. BEFORE\n\
-using any encryption software, please check the country's laws,\n\
-regulations and policies concerning the import, possession, or use, and\n\
-re-export of encryption software, to see if this is permitted.\n\
-\n\
-Java and all Java-based trademarks are trademarks of Oracle Corporation in the United States, other countries, or both.\n
-########### end of license property ##########################################
diff --git a/features/org.eclipse.jst.enterprise_sdk.feature/feature.xml b/features/org.eclipse.jst.enterprise_sdk.feature/feature.xml
deleted file mode 100644
index 69f564b..0000000
--- a/features/org.eclipse.jst.enterprise_sdk.feature/feature.xml
+++ /dev/null
@@ -1,28 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<feature
- id="org.eclipse.jst.enterprise_sdk.feature"
- label="%featureName"
- version="3.2.3.qualifier"
- provider-name="%providerName">
-
- <description>
- %description
- </description>
-
- <copyright>
- %copyright
- </copyright>
-
- <license url="license.html">
- %license
- </license>
-
- <includes
- id="org.eclipse.jst.enterprise_ui.feature"
- version="0.0.0"/>
-
- <includes
- id="org.eclipse.jst.enterprise_ui.feature.source"
- version="0.0.0"/>
-
-</feature>
diff --git a/features/org.eclipse.jst.enterprise_sdk.feature/license.html b/features/org.eclipse.jst.enterprise_sdk.feature/license.html
deleted file mode 100644
index c184ca3..0000000
--- a/features/org.eclipse.jst.enterprise_sdk.feature/license.html
+++ /dev/null
@@ -1,107 +0,0 @@
-<?xml version="1.0" encoding="ISO-8859-1" ?>
-<!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.0 Strict//EN" "http://www.w3.org/TR/xhtml1/DTD/xhtml1-strict.dtd">
-<html xmlns="http://www.w3.org/1999/xhtml">
-<head>
-<meta http-equiv="Content-Type" content="text/html; charset=ISO-8859-1" />
-<title>Eclipse Foundation Software User Agreement</title>
-</head>
-
-<body lang="EN-US">
-<h2>Eclipse Foundation Software User Agreement</h2>
-<p>April 14, 2010</p>
-
-<h3>Usage Of Content</h3>
-
-<p>THE ECLIPSE FOUNDATION MAKES AVAILABLE SOFTWARE, DOCUMENTATION, INFORMATION AND/OR OTHER MATERIALS FOR OPEN SOURCE PROJECTS
- (COLLECTIVELY "CONTENT"). USE OF THE CONTENT IS GOVERNED BY THE TERMS AND CONDITIONS OF THIS AGREEMENT AND/OR THE TERMS AND
- CONDITIONS OF LICENSE AGREEMENTS OR NOTICES INDICATED OR REFERENCED BELOW. BY USING THE CONTENT, YOU AGREE THAT YOUR USE
- OF THE CONTENT IS GOVERNED BY THIS AGREEMENT AND/OR THE TERMS AND CONDITIONS OF ANY APPLICABLE LICENSE AGREEMENTS OR
- NOTICES INDICATED OR REFERENCED BELOW. IF YOU DO NOT AGREE TO THE TERMS AND CONDITIONS OF THIS AGREEMENT AND THE TERMS AND
- CONDITIONS OF ANY APPLICABLE LICENSE AGREEMENTS OR NOTICES INDICATED OR REFERENCED BELOW, THEN YOU MAY NOT USE THE CONTENT.</p>
-
-<h3>Applicable Licenses</h3>
-
-<p>Unless otherwise indicated, all Content made available by the Eclipse Foundation is provided to you under the terms and conditions of the Eclipse Public License Version 1.0
- ("EPL"). A copy of the EPL is provided with this Content and is also available at <a href="http://www.eclipse.org/legal/epl-v10.html">http://www.eclipse.org/legal/epl-v10.html</a>.
- For purposes of the EPL, "Program" will mean the Content.</p>
-
-<p>Content includes, but is not limited to, source code, object code, documentation and other files maintained in the Eclipse Foundation source code
- repository ("Repository") in software modules ("Modules") and made available as downloadable archives ("Downloads").</p>
-
-<ul>
- <li>Content may be structured and packaged into modules to facilitate delivering, extending, and upgrading the Content. Typical modules may include plug-ins ("Plug-ins"), plug-in fragments ("Fragments"), and features ("Features").</li>
- <li>Each Plug-in or Fragment may be packaged as a sub-directory or JAR (Java™ ARchive) in a directory named "plugins".</li>
- <li>A Feature is a bundle of one or more Plug-ins and/or Fragments and associated material. Each Feature may be packaged as a sub-directory in a directory named "features". Within a Feature, files named "feature.xml" may contain a list of the names and version numbers of the Plug-ins
- and/or Fragments associated with that Feature.</li>
- <li>Features may also include other Features ("Included Features"). Within a Feature, files named "feature.xml" may contain a list of the names and version numbers of Included Features.</li>
-</ul>
-
-<p>The terms and conditions governing Plug-ins and Fragments should be contained in files named "about.html" ("Abouts"). The terms and conditions governing Features and
-Included Features should be contained in files named "license.html" ("Feature Licenses"). Abouts and Feature Licenses may be located in any directory of a Download or Module
-including, but not limited to the following locations:</p>
-
-<ul>
- <li>The top-level (root) directory</li>
- <li>Plug-in and Fragment directories</li>
- <li>Inside Plug-ins and Fragments packaged as JARs</li>
- <li>Sub-directories of the directory named "src" of certain Plug-ins</li>
- <li>Feature directories</li>
-</ul>
-
-<p>Note: if a Feature made available by the Eclipse Foundation is installed using the Provisioning Technology (as defined below), you must agree to a license ("Feature Update License") during the
-installation process. If the Feature contains Included Features, the Feature Update License should either provide you with the terms and conditions governing the Included Features or
-inform you where you can locate them. Feature Update Licenses may be found in the "license" property of files named "feature.properties" found within a Feature.
-Such Abouts, Feature Licenses, and Feature Update Licenses contain the terms and conditions (or references to such terms and conditions) that govern your use of the associated Content in
-that directory.</p>
-
-<p>THE ABOUTS, FEATURE LICENSES, AND FEATURE UPDATE LICENSES MAY REFER TO THE EPL OR OTHER LICENSE AGREEMENTS, NOTICES OR TERMS AND CONDITIONS. SOME OF THESE
-OTHER LICENSE AGREEMENTS MAY INCLUDE (BUT ARE NOT LIMITED TO):</p>
-
-<ul>
- <li>Common Public License Version 1.0 (available at <a href="http://www.eclipse.org/legal/cpl-v10.html">http://www.eclipse.org/legal/cpl-v10.html</a>)</li>
- <li>Apache Software License 1.1 (available at <a href="http://www.apache.org/licenses/LICENSE">http://www.apache.org/licenses/LICENSE</a>)</li>
- <li>Apache Software License 2.0 (available at <a href="http://www.apache.org/licenses/LICENSE-2.0">http://www.apache.org/licenses/LICENSE-2.0</a>)</li>
- <li>Metro Link Public License 1.00 (available at <a href="http://www.opengroup.org/openmotif/supporters/metrolink/license.html">http://www.opengroup.org/openmotif/supporters/metrolink/license.html</a>)</li>
- <li>Mozilla Public License Version 1.1 (available at <a href="http://www.mozilla.org/MPL/MPL-1.1.html">http://www.mozilla.org/MPL/MPL-1.1.html</a>)</li>
-</ul>
-
-<p>IT IS YOUR OBLIGATION TO READ AND ACCEPT ALL SUCH TERMS AND CONDITIONS PRIOR TO USE OF THE CONTENT. If no About, Feature License, or Feature Update License is provided, please
-contact the Eclipse Foundation to determine what terms and conditions govern that particular Content.</p>
-
-
-<h3>Use of Provisioning Technology</h3>
-
-<p>The Eclipse Foundation makes available provisioning software, examples of which include, but are not limited to, p2 and the Eclipse
- Update Manager ("Provisioning Technology") for the purpose of allowing users to install software, documentation, information and/or
- other materials (collectively "Installable Software"). This capability is provided with the intent of allowing such users to
- install, extend and update Eclipse-based products. Information about packaging Installable Software is available at <a
- href="http://eclipse.org/equinox/p2/repository_packaging.html">http://eclipse.org/equinox/p2/repository_packaging.html</a>
- ("Specification").</p>
-
-<p>You may use Provisioning Technology to allow other parties to install Installable Software. You shall be responsible for enabling the
- applicable license agreements relating to the Installable Software to be presented to, and accepted by, the users of the Provisioning Technology
- in accordance with the Specification. By using Provisioning Technology in such a manner and making it available in accordance with the
- Specification, you further acknowledge your agreement to, and the acquisition of all necessary rights to permit the following:</p>
-
-<ol>
- <li>A series of actions may occur ("Provisioning Process") in which a user may execute the Provisioning Technology
- on a machine ("Target Machine") with the intent of installing, extending or updating the functionality of an Eclipse-based
- product.</li>
- <li>During the Provisioning Process, the Provisioning Technology may cause third party Installable Software or a portion thereof to be
- accessed and copied to the Target Machine.</li>
- <li>Pursuant to the Specification, you will provide to the user the terms and conditions that govern the use of the Installable
- Software ("Installable Software Agreement") and such Installable Software Agreement shall be accessed from the Target
- Machine in accordance with the Specification. Such Installable Software Agreement must inform the user of the terms and conditions that govern
- the Installable Software and must solicit acceptance by the end user in the manner prescribed in such Installable Software Agreement. Upon such
- indication of agreement by the user, the provisioning Technology will complete installation of the Installable Software.</li>
-</ol>
-
-<h3>Cryptography</h3>
-
-<p>Content may contain encryption software. The country in which you are currently may have restrictions on the import, possession, and use, and/or re-export to
- another country, of encryption software. BEFORE using any encryption software, please check the country's laws, regulations and policies concerning the import,
- possession, or use, and re-export of encryption software, to see if this is permitted.</p>
-
-<p><small>Java and all Java-based trademarks are trademarks of Oracle Corporation in the United States, other countries, or both.</small></p>
-</body>
-</html>
diff --git a/features/org.eclipse.jst.enterprise_ui.feature/.cvsignore b/features/org.eclipse.jst.enterprise_ui.feature/.cvsignore
deleted file mode 100644
index c14487c..0000000
--- a/features/org.eclipse.jst.enterprise_ui.feature/.cvsignore
+++ /dev/null
@@ -1 +0,0 @@
-build.xml
diff --git a/features/org.eclipse.jst.enterprise_ui.feature/.project b/features/org.eclipse.jst.enterprise_ui.feature/.project
deleted file mode 100644
index 9569563..0000000
--- a/features/org.eclipse.jst.enterprise_ui.feature/.project
+++ /dev/null
@@ -1,17 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<projectDescription>
- <name>org.eclipse.jst.enterprise_ui.feature</name>
- <comment></comment>
- <projects>
- </projects>
- <buildSpec>
- <buildCommand>
- <name>org.eclipse.pde.FeatureBuilder</name>
- <arguments>
- </arguments>
- </buildCommand>
- </buildSpec>
- <natures>
- <nature>org.eclipse.pde.FeatureNature</nature>
- </natures>
-</projectDescription>
diff --git a/features/org.eclipse.jst.enterprise_ui.feature/build.properties b/features/org.eclipse.jst.enterprise_ui.feature/build.properties
deleted file mode 100644
index 7f47694..0000000
--- a/features/org.eclipse.jst.enterprise_ui.feature/build.properties
+++ /dev/null
@@ -1,5 +0,0 @@
-bin.includes = feature.xml,\
- eclipse_update_120.jpg,\
- epl-v10.html,\
- license.html,\
- feature.properties
diff --git a/features/org.eclipse.jst.enterprise_ui.feature/epl-v10.html b/features/org.eclipse.jst.enterprise_ui.feature/epl-v10.html
deleted file mode 100644
index ed4b196..0000000
--- a/features/org.eclipse.jst.enterprise_ui.feature/epl-v10.html
+++ /dev/null
@@ -1,328 +0,0 @@
-<html xmlns:o="urn:schemas-microsoft-com:office:office"
-xmlns:w="urn:schemas-microsoft-com:office:word"
-xmlns="http://www.w3.org/TR/REC-html40">
-
-<head>
-<meta http-equiv=Content-Type content="text/html; charset=windows-1252">
-<meta name=ProgId content=Word.Document>
-<meta name=Generator content="Microsoft Word 9">
-<meta name=Originator content="Microsoft Word 9">
-<link rel=File-List
-href="./Eclipse%20EPL%202003_11_10%20Final_files/filelist.xml">
-<title>Eclipse Public License - Version 1.0</title>
-<!--[if gte mso 9]><xml>
- <o:DocumentProperties>
- <o:Revision>2</o:Revision>
- <o:TotalTime>3</o:TotalTime>
- <o:Created>2004-03-05T23:03:00Z</o:Created>
- <o:LastSaved>2004-03-05T23:03:00Z</o:LastSaved>
- <o:Pages>4</o:Pages>
- <o:Words>1626</o:Words>
- <o:Characters>9270</o:Characters>
- <o:Lines>77</o:Lines>
- <o:Paragraphs>18</o:Paragraphs>
- <o:CharactersWithSpaces>11384</o:CharactersWithSpaces>
- <o:Version>9.4402</o:Version>
- </o:DocumentProperties>
-</xml><![endif]--><!--[if gte mso 9]><xml>
- <w:WordDocument>
- <w:TrackRevisions/>
- </w:WordDocument>
-</xml><![endif]-->
-<style>
-<!--
- /* Font Definitions */
-@font-face
- {font-family:Tahoma;
- panose-1:2 11 6 4 3 5 4 4 2 4;
- mso-font-charset:0;
- mso-generic-font-family:swiss;
- mso-font-pitch:variable;
- mso-font-signature:553679495 -2147483648 8 0 66047 0;}
- /* Style Definitions */
-p.MsoNormal, li.MsoNormal, div.MsoNormal
- {mso-style-parent:"";
- margin:0in;
- margin-bottom:.0001pt;
- mso-pagination:widow-orphan;
- font-size:12.0pt;
- font-family:"Times New Roman";
- mso-fareast-font-family:"Times New Roman";}
-p
- {margin-right:0in;
- mso-margin-top-alt:auto;
- mso-margin-bottom-alt:auto;
- margin-left:0in;
- mso-pagination:widow-orphan;
- font-size:12.0pt;
- font-family:"Times New Roman";
- mso-fareast-font-family:"Times New Roman";}
-p.BalloonText, li.BalloonText, div.BalloonText
- {mso-style-name:"Balloon Text";
- margin:0in;
- margin-bottom:.0001pt;
- mso-pagination:widow-orphan;
- font-size:8.0pt;
- font-family:Tahoma;
- mso-fareast-font-family:"Times New Roman";}
-@page Section1
- {size:8.5in 11.0in;
- margin:1.0in 1.25in 1.0in 1.25in;
- mso-header-margin:.5in;
- mso-footer-margin:.5in;
- mso-paper-source:0;}
-div.Section1
- {page:Section1;}
--->
-</style>
-</head>
-
-<body lang=EN-US style='tab-interval:.5in'>
-
-<div class=Section1>
-
-<p align=center style='text-align:center'><b>Eclipse Public License - v 1.0</b>
-</p>
-
-<p><span style='font-size:10.0pt'>THE ACCOMPANYING PROGRAM IS PROVIDED UNDER
-THE TERMS OF THIS ECLIPSE PUBLIC LICENSE ("AGREEMENT"). ANY USE,
-REPRODUCTION OR DISTRIBUTION OF THE PROGRAM CONSTITUTES RECIPIENT'S ACCEPTANCE
-OF THIS AGREEMENT.</span> </p>
-
-<p><b><span style='font-size:10.0pt'>1. DEFINITIONS</span></b> </p>
-
-<p><span style='font-size:10.0pt'>"Contribution" means:</span> </p>
-
-<p class=MsoNormal style='margin-left:.5in'><span style='font-size:10.0pt'>a)
-in the case of the initial Contributor, the initial code and documentation
-distributed under this Agreement, and<br clear=left>
-b) in the case of each subsequent Contributor:</span></p>
-
-<p class=MsoNormal style='margin-left:.5in'><span style='font-size:10.0pt'>i)
-changes to the Program, and</span></p>
-
-<p class=MsoNormal style='margin-left:.5in'><span style='font-size:10.0pt'>ii)
-additions to the Program;</span></p>
-
-<p class=MsoNormal style='margin-left:.5in'><span style='font-size:10.0pt'>where
-such changes and/or additions to the Program originate from and are distributed
-by that particular Contributor. A Contribution 'originates' from a Contributor
-if it was added to the Program by such Contributor itself or anyone acting on
-such Contributor's behalf. Contributions do not include additions to the
-Program which: (i) are separate modules of software distributed in conjunction
-with the Program under their own license agreement, and (ii) are not derivative
-works of the Program. </span></p>
-
-<p><span style='font-size:10.0pt'>"Contributor" means any person or
-entity that distributes the Program.</span> </p>
-
-<p><span style='font-size:10.0pt'>"Licensed Patents " mean patent
-claims licensable by a Contributor which are necessarily infringed by the use
-or sale of its Contribution alone or when combined with the Program. </span></p>
-
-<p><span style='font-size:10.0pt'>"Program" means the Contributions
-distributed in accordance with this Agreement.</span> </p>
-
-<p><span style='font-size:10.0pt'>"Recipient" means anyone who
-receives the Program under this Agreement, including all Contributors.</span> </p>
-
-<p><b><span style='font-size:10.0pt'>2. GRANT OF RIGHTS</span></b> </p>
-
-<p class=MsoNormal style='margin-left:.5in'><span style='font-size:10.0pt'>a)
-Subject to the terms of this Agreement, each Contributor hereby grants Recipient
-a non-exclusive, worldwide, royalty-free copyright license to<span
-style='color:red'> </span>reproduce, prepare derivative works of, publicly
-display, publicly perform, distribute and sublicense the Contribution of such
-Contributor, if any, and such derivative works, in source code and object code
-form.</span></p>
-
-<p class=MsoNormal style='margin-left:.5in'><span style='font-size:10.0pt'>b)
-Subject to the terms of this Agreement, each Contributor hereby grants
-Recipient a non-exclusive, worldwide,<span style='color:green'> </span>royalty-free
-patent license under Licensed Patents to make, use, sell, offer to sell, import
-and otherwise transfer the Contribution of such Contributor, if any, in source
-code and object code form. This patent license shall apply to the combination
-of the Contribution and the Program if, at the time the Contribution is added
-by the Contributor, such addition of the Contribution causes such combination
-to be covered by the Licensed Patents. The patent license shall not apply to
-any other combinations which include the Contribution. No hardware per se is
-licensed hereunder. </span></p>
-
-<p class=MsoNormal style='margin-left:.5in'><span style='font-size:10.0pt'>c)
-Recipient understands that although each Contributor grants the licenses to its
-Contributions set forth herein, no assurances are provided by any Contributor
-that the Program does not infringe the patent or other intellectual property
-rights of any other entity. Each Contributor disclaims any liability to Recipient
-for claims brought by any other entity based on infringement of intellectual
-property rights or otherwise. As a condition to exercising the rights and
-licenses granted hereunder, each Recipient hereby assumes sole responsibility
-to secure any other intellectual property rights needed, if any. For example,
-if a third party patent license is required to allow Recipient to distribute
-the Program, it is Recipient's responsibility to acquire that license before
-distributing the Program.</span></p>
-
-<p class=MsoNormal style='margin-left:.5in'><span style='font-size:10.0pt'>d)
-Each Contributor represents that to its knowledge it has sufficient copyright
-rights in its Contribution, if any, to grant the copyright license set forth in
-this Agreement. </span></p>
-
-<p><b><span style='font-size:10.0pt'>3. REQUIREMENTS</span></b> </p>
-
-<p><span style='font-size:10.0pt'>A Contributor may choose to distribute the
-Program in object code form under its own license agreement, provided that:</span>
-</p>
-
-<p class=MsoNormal style='margin-left:.5in'><span style='font-size:10.0pt'>a)
-it complies with the terms and conditions of this Agreement; and</span></p>
-
-<p class=MsoNormal style='margin-left:.5in'><span style='font-size:10.0pt'>b)
-its license agreement:</span></p>
-
-<p class=MsoNormal style='margin-left:.5in'><span style='font-size:10.0pt'>i)
-effectively disclaims on behalf of all Contributors all warranties and
-conditions, express and implied, including warranties or conditions of title
-and non-infringement, and implied warranties or conditions of merchantability
-and fitness for a particular purpose; </span></p>
-
-<p class=MsoNormal style='margin-left:.5in'><span style='font-size:10.0pt'>ii)
-effectively excludes on behalf of all Contributors all liability for damages,
-including direct, indirect, special, incidental and consequential damages, such
-as lost profits; </span></p>
-
-<p class=MsoNormal style='margin-left:.5in'><span style='font-size:10.0pt'>iii)
-states that any provisions which differ from this Agreement are offered by that
-Contributor alone and not by any other party; and</span></p>
-
-<p class=MsoNormal style='margin-left:.5in'><span style='font-size:10.0pt'>iv)
-states that source code for the Program is available from such Contributor, and
-informs licensees how to obtain it in a reasonable manner on or through a
-medium customarily used for software exchange.<span style='color:blue'> </span></span></p>
-
-<p><span style='font-size:10.0pt'>When the Program is made available in source
-code form:</span> </p>
-
-<p class=MsoNormal style='margin-left:.5in'><span style='font-size:10.0pt'>a)
-it must be made available under this Agreement; and </span></p>
-
-<p class=MsoNormal style='margin-left:.5in'><span style='font-size:10.0pt'>b) a
-copy of this Agreement must be included with each copy of the Program. </span></p>
-
-<p><span style='font-size:10.0pt'>Contributors may not remove or alter any
-copyright notices contained within the Program. </span></p>
-
-<p><span style='font-size:10.0pt'>Each Contributor must identify itself as the
-originator of its Contribution, if any, in a manner that reasonably allows
-subsequent Recipients to identify the originator of the Contribution. </span></p>
-
-<p><b><span style='font-size:10.0pt'>4. COMMERCIAL DISTRIBUTION</span></b> </p>
-
-<p><span style='font-size:10.0pt'>Commercial distributors of software may
-accept certain responsibilities with respect to end users, business partners
-and the like. While this license is intended to facilitate the commercial use
-of the Program, the Contributor who includes the Program in a commercial
-product offering should do so in a manner which does not create potential
-liability for other Contributors. Therefore, if a Contributor includes the
-Program in a commercial product offering, such Contributor ("Commercial
-Contributor") hereby agrees to defend and indemnify every other
-Contributor ("Indemnified Contributor") against any losses, damages and
-costs (collectively "Losses") arising from claims, lawsuits and other
-legal actions brought by a third party against the Indemnified Contributor to
-the extent caused by the acts or omissions of such Commercial Contributor in
-connection with its distribution of the Program in a commercial product
-offering. The obligations in this section do not apply to any claims or Losses
-relating to any actual or alleged intellectual property infringement. In order
-to qualify, an Indemnified Contributor must: a) promptly notify the Commercial
-Contributor in writing of such claim, and b) allow the Commercial Contributor
-to control, and cooperate with the Commercial Contributor in, the defense and
-any related settlement negotiations. The Indemnified Contributor may participate
-in any such claim at its own expense.</span> </p>
-
-<p><span style='font-size:10.0pt'>For example, a Contributor might include the
-Program in a commercial product offering, Product X. That Contributor is then a
-Commercial Contributor. If that Commercial Contributor then makes performance
-claims, or offers warranties related to Product X, those performance claims and
-warranties are such Commercial Contributor's responsibility alone. Under this
-section, the Commercial Contributor would have to defend claims against the
-other Contributors related to those performance claims and warranties, and if a
-court requires any other Contributor to pay any damages as a result, the
-Commercial Contributor must pay those damages.</span> </p>
-
-<p><b><span style='font-size:10.0pt'>5. NO WARRANTY</span></b> </p>
-
-<p><span style='font-size:10.0pt'>EXCEPT AS EXPRESSLY SET FORTH IN THIS
-AGREEMENT, THE PROGRAM IS PROVIDED ON AN "AS IS" BASIS, WITHOUT
-WARRANTIES OR CONDITIONS OF ANY KIND, EITHER EXPRESS OR IMPLIED INCLUDING,
-WITHOUT LIMITATION, ANY WARRANTIES OR CONDITIONS OF TITLE, NON-INFRINGEMENT,
-MERCHANTABILITY OR FITNESS FOR A PARTICULAR PURPOSE. Each Recipient is solely
-responsible for determining the appropriateness of using and distributing the
-Program and assumes all risks associated with its exercise of rights under this
-Agreement , including but not limited to the risks and costs of program errors,
-compliance with applicable laws, damage to or loss of data, programs or
-equipment, and unavailability or interruption of operations. </span></p>
-
-<p><b><span style='font-size:10.0pt'>6. DISCLAIMER OF LIABILITY</span></b> </p>
-
-<p><span style='font-size:10.0pt'>EXCEPT AS EXPRESSLY SET FORTH IN THIS
-AGREEMENT, NEITHER RECIPIENT NOR ANY CONTRIBUTORS SHALL HAVE ANY LIABILITY FOR
-ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES
-(INCLUDING WITHOUT LIMITATION LOST PROFITS), HOWEVER CAUSED AND ON ANY THEORY
-OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING
-NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OR DISTRIBUTION OF
-THE PROGRAM OR THE EXERCISE OF ANY RIGHTS GRANTED HEREUNDER, EVEN IF ADVISED OF
-THE POSSIBILITY OF SUCH DAMAGES.</span> </p>
-
-<p><b><span style='font-size:10.0pt'>7. GENERAL</span></b> </p>
-
-<p><span style='font-size:10.0pt'>If any provision of this Agreement is invalid
-or unenforceable under applicable law, it shall not affect the validity or
-enforceability of the remainder of the terms of this Agreement, and without
-further action by the parties hereto, such provision shall be reformed to the
-minimum extent necessary to make such provision valid and enforceable.</span> </p>
-
-<p><span style='font-size:10.0pt'>If Recipient institutes patent litigation
-against any entity (including a cross-claim or counterclaim in a lawsuit)
-alleging that the Program itself (excluding combinations of the Program with
-other software or hardware) infringes such Recipient's patent(s), then such
-Recipient's rights granted under Section 2(b) shall terminate as of the date
-such litigation is filed. </span></p>
-
-<p><span style='font-size:10.0pt'>All Recipient's rights under this Agreement
-shall terminate if it fails to comply with any of the material terms or
-conditions of this Agreement and does not cure such failure in a reasonable
-period of time after becoming aware of such noncompliance. If all Recipient's
-rights under this Agreement terminate, Recipient agrees to cease use and
-distribution of the Program as soon as reasonably practicable. However,
-Recipient's obligations under this Agreement and any licenses granted by
-Recipient relating to the Program shall continue and survive. </span></p>
-
-<p><span style='font-size:10.0pt'>Everyone is permitted to copy and distribute
-copies of this Agreement, but in order to avoid inconsistency the Agreement is
-copyrighted and may only be modified in the following manner. The Agreement
-Steward reserves the right to publish new versions (including revisions) of
-this Agreement from time to time. No one other than the Agreement Steward has
-the right to modify this Agreement. The Eclipse Foundation is the initial
-Agreement Steward. The Eclipse Foundation may assign the responsibility to
-serve as the Agreement Steward to a suitable separate entity. Each new version
-of the Agreement will be given a distinguishing version number. The Program
-(including Contributions) may always be distributed subject to the version of
-the Agreement under which it was received. In addition, after a new version of
-the Agreement is published, Contributor may elect to distribute the Program
-(including its Contributions) under the new version. Except as expressly stated
-in Sections 2(a) and 2(b) above, Recipient receives no rights or licenses to
-the intellectual property of any Contributor under this Agreement, whether
-expressly, by implication, estoppel or otherwise. All rights in the Program not
-expressly granted under this Agreement are reserved.</span> </p>
-
-<p><span style='font-size:10.0pt'>This Agreement is governed by the laws of the
-State of New York and the intellectual property laws of the United States of
-America. No party to this Agreement will bring a legal action under this
-Agreement more than one year after the cause of action arose. Each party waives
-its rights to a jury trial in any resulting litigation.</span> </p>
-
-<p class=MsoNormal><![if !supportEmptyParas]> <![endif]><o:p></o:p></p>
-
-</div>
-
-</body>
-
-</html>
\ No newline at end of file
diff --git a/features/org.eclipse.jst.enterprise_ui.feature/feature.properties b/features/org.eclipse.jst.enterprise_ui.feature/feature.properties
deleted file mode 100644
index 8903494..0000000
--- a/features/org.eclipse.jst.enterprise_ui.feature/feature.properties
+++ /dev/null
@@ -1,168 +0,0 @@
-###############################################################################
-# Copyright (c) 2006, 2009 IBM Corporation and others.
-# All rights reserved. This program and the accompanying materials
-# are made available under the terms of the Eclipse Public License v1.0
-# which accompanies this distribution, and is available at
-# http://www.eclipse.org/legal/epl-v10.html
-#
-# Contributors:
-# IBM Corporation - initial API and implementation
-###############################################################################
-# feature.properties
-# contains externalized strings for feature.xml
-# "%foo" in feature.xml corresponds to the key "foo" in this file
-# java.io.Properties file (ISO 8859-1 with "\" escapes)
-# This file should be translated.
-
-# "featureName" property - name of the feature
-featureName=Eclipse Java EE Developer Tools
-
-# "providerName" property - name of the company that provides the feature
-providerName=Eclipse Web Tools Platform
-
-
-# "description" property - description of the feature
-description=Eclipse Java EE Developer Tools
-
-# "copyright" property - text of the "Feature Update Copyright"
-copyright=\
-Copyright (c) 2006, 2009 IBM Corporation and others.\n\
-All rights reserved. This program and the accompanying materials\n\
-are made available under the terms of the Eclipse Public License v1.0\n\
-which accompanies this distribution, and is available at\n\
-http://www.eclipse.org/legal/epl-v10.html\n\
-\n\
-Contributors:\n\
- IBM Corporation - initial API and implementation\n
-################ end of copyright property ####################################
-
-# "licenseURL" property - URL of the "Feature License"
-# do not translate value - just change to point to a locale-specific HTML page
-licenseURL=license.html
-
-# "license" property - text of the "Feature Update License"
-# should be plain text version of license agreement pointed to be "licenseURL"
-license=\
-Eclipse Foundation Software User Agreement\n\
-April 14, 2010\n\
-\n\
-Usage Of Content\n\
-\n\
-THE ECLIPSE FOUNDATION MAKES AVAILABLE SOFTWARE, DOCUMENTATION, INFORMATION AND/OR\n\
-OTHER MATERIALS FOR OPEN SOURCE PROJECTS (COLLECTIVELY "CONTENT").\n\
-USE OF THE CONTENT IS GOVERNED BY THE TERMS AND CONDITIONS OF THIS\n\
-AGREEMENT AND/OR THE TERMS AND CONDITIONS OF LICENSE AGREEMENTS OR\n\
-NOTICES INDICATED OR REFERENCED BELOW. BY USING THE CONTENT, YOU\n\
-AGREE THAT YOUR USE OF THE CONTENT IS GOVERNED BY THIS AGREEMENT\n\
-AND/OR THE TERMS AND CONDITIONS OF ANY APPLICABLE LICENSE AGREEMENTS\n\
-OR NOTICES INDICATED OR REFERENCED BELOW. IF YOU DO NOT AGREE TO THE\n\
-TERMS AND CONDITIONS OF THIS AGREEMENT AND THE TERMS AND CONDITIONS\n\
-OF ANY APPLICABLE LICENSE AGREEMENTS OR NOTICES INDICATED OR REFERENCED\n\
-BELOW, THEN YOU MAY NOT USE THE CONTENT.\n\
-\n\
-Applicable Licenses\n\
-\n\
-Unless otherwise indicated, all Content made available by the\n\
-Eclipse Foundation is provided to you under the terms and conditions of\n\
-the Eclipse Public License Version 1.0 ("EPL"). A copy of the EPL is\n\
-provided with this Content and is also available at http://www.eclipse.org/legal/epl-v10.html.\n\
-For purposes of the EPL, "Program" will mean the Content.\n\
-\n\
-Content includes, but is not limited to, source code, object code,\n\
-documentation and other files maintained in the Eclipse Foundation source code\n\
-repository ("Repository") in software modules ("Modules") and made available\n\
-as downloadable archives ("Downloads").\n\
-\n\
- - Content may be structured and packaged into modules to facilitate delivering,\n\
- extending, and upgrading the Content. Typical modules may include plug-ins ("Plug-ins"),\n\
- plug-in fragments ("Fragments"), and features ("Features").\n\
- - Each Plug-in or Fragment may be packaged as a sub-directory or JAR (Java(TM) ARchive)\n\
- in a directory named "plugins".\n\
- - A Feature is a bundle of one or more Plug-ins and/or Fragments and associated material.\n\
- Each Feature may be packaged as a sub-directory in a directory named "features".\n\
- Within a Feature, files named "feature.xml" may contain a list of the names and version\n\
- numbers of the Plug-ins and/or Fragments associated with that Feature.\n\
- - Features may also include other Features ("Included Features"). Within a Feature, files\n\
- named "feature.xml" may contain a list of the names and version numbers of Included Features.\n\
-\n\
-The terms and conditions governing Plug-ins and Fragments should be\n\
-contained in files named "about.html" ("Abouts"). The terms and\n\
-conditions governing Features and Included Features should be contained\n\
-in files named "license.html" ("Feature Licenses"). Abouts and Feature\n\
-Licenses may be located in any directory of a Download or Module\n\
-including, but not limited to the following locations:\n\
-\n\
- - The top-level (root) directory\n\
- - Plug-in and Fragment directories\n\
- - Inside Plug-ins and Fragments packaged as JARs\n\
- - Sub-directories of the directory named "src" of certain Plug-ins\n\
- - Feature directories\n\
-\n\
-Note: if a Feature made available by the Eclipse Foundation is installed using the\n\
-Provisioning Technology (as defined below), you must agree to a license ("Feature \n\
-Update License") during the installation process. If the Feature contains\n\
-Included Features, the Feature Update License should either provide you\n\
-with the terms and conditions governing the Included Features or inform\n\
-you where you can locate them. Feature Update Licenses may be found in\n\
-the "license" property of files named "feature.properties" found within a Feature.\n\
-Such Abouts, Feature Licenses, and Feature Update Licenses contain the\n\
-terms and conditions (or references to such terms and conditions) that\n\
-govern your use of the associated Content in that directory.\n\
-\n\
-THE ABOUTS, FEATURE LICENSES, AND FEATURE UPDATE LICENSES MAY REFER\n\
-TO THE EPL OR OTHER LICENSE AGREEMENTS, NOTICES OR TERMS AND CONDITIONS.\n\
-SOME OF THESE OTHER LICENSE AGREEMENTS MAY INCLUDE (BUT ARE NOT LIMITED TO):\n\
-\n\
- - Common Public License Version 1.0 (available at http://www.eclipse.org/legal/cpl-v10.html)\n\
- - Apache Software License 1.1 (available at http://www.apache.org/licenses/LICENSE)\n\
- - Apache Software License 2.0 (available at http://www.apache.org/licenses/LICENSE-2.0)\n\
- - Metro Link Public License 1.00 (available at http://www.opengroup.org/openmotif/supporters/metrolink/license.html)\n\
- - Mozilla Public License Version 1.1 (available at http://www.mozilla.org/MPL/MPL-1.1.html)\n\
-\n\
-IT IS YOUR OBLIGATION TO READ AND ACCEPT ALL SUCH TERMS AND CONDITIONS PRIOR\n\
-TO USE OF THE CONTENT. If no About, Feature License, or Feature Update License\n\
-is provided, please contact the Eclipse Foundation to determine what terms and conditions\n\
-govern that particular Content.\n\
-\n\
-\n\Use of Provisioning Technology\n\
-\n\
-The Eclipse Foundation makes available provisioning software, examples of which include,\n\
-but are not limited to, p2 and the Eclipse Update Manager ("Provisioning Technology") for\n\
-the purpose of allowing users to install software, documentation, information and/or\n\
-other materials (collectively "Installable Software"). This capability is provided with\n\
-the intent of allowing such users to install, extend and update Eclipse-based products.\n\
-Information about packaging Installable Software is available at\n\
-http://eclipse.org/equinox/p2/repository_packaging.html ("Specification").\n\
-\n\
-You may use Provisioning Technology to allow other parties to install Installable Software.\n\
-You shall be responsible for enabling the applicable license agreements relating to the\n\
-Installable Software to be presented to, and accepted by, the users of the Provisioning Technology\n\
-in accordance with the Specification. By using Provisioning Technology in such a manner and\n\
-making it available in accordance with the Specification, you further acknowledge your\n\
-agreement to, and the acquisition of all necessary rights to permit the following:\n\
-\n\
- 1. A series of actions may occur ("Provisioning Process") in which a user may execute\n\
- the Provisioning Technology on a machine ("Target Machine") with the intent of installing,\n\
- extending or updating the functionality of an Eclipse-based product.\n\
- 2. During the Provisioning Process, the Provisioning Technology may cause third party\n\
- Installable Software or a portion thereof to be accessed and copied to the Target Machine.\n\
- 3. Pursuant to the Specification, you will provide to the user the terms and conditions that\n\
- govern the use of the Installable Software ("Installable Software Agreement") and such\n\
- Installable Software Agreement shall be accessed from the Target Machine in accordance\n\
- with the Specification. Such Installable Software Agreement must inform the user of the\n\
- terms and conditions that govern the Installable Software and must solicit acceptance by\n\
- the end user in the manner prescribed in such Installable Software Agreement. Upon such\n\
- indication of agreement by the user, the provisioning Technology will complete installation\n\
- of the Installable Software.\n\
-\n\
-Cryptography\n\
-\n\
-Content may contain encryption software. The country in which you are\n\
-currently may have restrictions on the import, possession, and use,\n\
-and/or re-export to another country, of encryption software. BEFORE\n\
-using any encryption software, please check the country's laws,\n\
-regulations and policies concerning the import, possession, or use, and\n\
-re-export of encryption software, to see if this is permitted.\n\
-\n\
-Java and all Java-based trademarks are trademarks of Oracle Corporation in the United States, other countries, or both.\n
-########### end of license property ##########################################
diff --git a/features/org.eclipse.jst.enterprise_ui.feature/feature.xml b/features/org.eclipse.jst.enterprise_ui.feature/feature.xml
deleted file mode 100644
index c906e0d..0000000
--- a/features/org.eclipse.jst.enterprise_ui.feature/feature.xml
+++ /dev/null
@@ -1,246 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<feature
- id="org.eclipse.jst.enterprise_ui.feature"
- label="%featureName"
- version="3.2.3.qualifier"
- provider-name="%providerName"
- plugin="org.eclipse.jst.jee.ui">
-
- <description>
- %description
- </description>
-
- <copyright>
- %copyright
- </copyright>
-
- <license url="%licenseURL">
- %license
- </license>
-
- <includes
- id="org.eclipse.jst.enterprise_userdoc.feature"
- version="0.0.0"/>
-
- <includes
- id="org.eclipse.jst.enterprise_core.feature"
- version="0.0.0"/>
-
- <plugin
- id="org.eclipse.jst.ws"
- download-size="0"
- install-size="0"
- version="0.0.0"
- unpack="false"/>
-
- <plugin
- id="org.eclipse.jst.j2ee.ui"
- download-size="0"
- install-size="0"
- version="0.0.0"
- unpack="false"/>
-
- <plugin
- id="org.eclipse.jst.ws.axis.creation.ui"
- download-size="0"
- install-size="0"
- version="0.0.0"
- unpack="false"/>
-
- <plugin
- id="org.eclipse.jst.ws.axis.consumption.ui"
- download-size="0"
- install-size="0"
- version="0.0.0"
- unpack="false"/>
-
- <plugin
- id="org.eclipse.jst.j2ee.jca.ui"
- download-size="0"
- install-size="0"
- version="0.0.0"
- unpack="false"/>
-
- <plugin
- id="org.eclipse.jst.j2ee.navigator.ui"
- download-size="0"
- install-size="0"
- version="0.0.0"
- unpack="false"/>
-
- <plugin
- id="org.eclipse.jst.j2ee.webservice.ui"
- download-size="0"
- install-size="0"
- version="0.0.0"
- unpack="false"/>
-
- <plugin
- id="org.eclipse.jst.ws.axis.consumption.core"
- download-size="0"
- install-size="0"
- version="0.0.0"
- unpack="false"/>
-
- <plugin
- id="org.eclipse.jst.servlet.ui"
- download-size="0"
- install-size="0"
- version="0.0.0"
- unpack="false"/>
-
- <plugin
- id="org.eclipse.jst.ws.ui"
- download-size="0"
- install-size="0"
- version="0.0.0"
- unpack="false"/>
-
- <plugin
- id="org.eclipse.jst.ws.uddiregistry"
- download-size="0"
- install-size="0"
- version="0.0.0"
- unpack="false"/>
-
- <plugin
- id="org.eclipse.jst.ws.creation.ui"
- download-size="0"
- install-size="0"
- version="0.0.0"
- unpack="false"/>
-
- <plugin
- id="org.eclipse.jst.ws.consumption.ui"
- download-size="0"
- install-size="0"
- version="0.0.0"
- unpack="false"/>
-
- <plugin
- id="org.eclipse.jst.ws.consumption"
- download-size="0"
- install-size="0"
- version="0.0.0"
- unpack="false"/>
-
- <plugin
- id="org.eclipse.jst.j2ee.infopop"
- download-size="0"
- install-size="0"
- version="0.0.0"
- unpack="false"/>
-
- <plugin
- id="org.eclipse.jst.jsp.ui.infopop"
- download-size="0"
- install-size="0"
- version="0.0.0"
- unpack="false"/>
-
- <plugin
- id="org.eclipse.jst.servlet.ui.infopop"
- download-size="0"
- install-size="0"
- version="0.0.0"
- unpack="false"/>
-
- <plugin
- id="org.eclipse.jst.ws.axis.infopop"
- download-size="0"
- install-size="0"
- version="0.0.0"
- unpack="false"/>
-
- <plugin
- id="org.eclipse.jst.ws.consumption.infopop"
- download-size="0"
- install-size="0"
- version="0.0.0"
- unpack="false"/>
-
- <plugin
- id="org.eclipse.jst.ws.infopop"
- download-size="0"
- install-size="0"
- version="0.0.0"
- unpack="false"/>
-
- <plugin
- id="org.eclipse.jst.ws.creation.ejb.ui"
- download-size="0"
- install-size="0"
- version="0.0.0"
- unpack="false"/>
-
- <plugin
- id="org.eclipse.jst.ejb.ui"
- download-size="0"
- install-size="0"
- version="0.0.0"
- unpack="false"/>
-
- <plugin
- id="org.eclipse.jst.j2ee.ejb.annotations.ui"
- download-size="0"
- install-size="0"
- version="0.0.0"
- unpack="false"/>
-
- <plugin
- id="org.eclipse.jst.j2ee.ejb.annotation.model"
- download-size="0"
- install-size="0"
- version="0.0.0"
- unpack="false"/>
-
- <plugin
- id="org.eclipse.jst.j2ee.ejb.annotations.emitter"
- download-size="0"
- install-size="0"
- version="0.0.0"
- unpack="false"/>
-
- <plugin
- id="org.eclipse.jst.j2ee.ejb.annotations.xdoclet"
- download-size="0"
- install-size="0"
- version="0.0.0"
- unpack="false"/>
-
- <plugin
- id="org.eclipse.jst.j2ee.xdoclet.runtime"
- download-size="0"
- install-size="0"
- version="0.0.0"
- unpack="false"/>
-
- <plugin
- id="org.eclipse.jst.jee.ui"
- download-size="0"
- install-size="0"
- version="0.0.0"
- unpack="false"/>
-
- <plugin
- id="org.eclipse.jst.ejb.ui.infopop"
- download-size="0"
- install-size="0"
- version="0.0.0"
- unpack="false"/>
-
- <plugin
- id="org.eclipse.jst.ws.jaxrs.core"
- download-size="0"
- install-size="0"
- version="0.0.0"
- unpack="false"/>
-
- <plugin
- id="org.eclipse.jst.ws.jaxrs.ui"
- download-size="0"
- install-size="0"
- version="0.0.0"
- unpack="false"/>
-
-</feature>
diff --git a/features/org.eclipse.jst.enterprise_ui.feature/license.html b/features/org.eclipse.jst.enterprise_ui.feature/license.html
deleted file mode 100644
index c184ca3..0000000
--- a/features/org.eclipse.jst.enterprise_ui.feature/license.html
+++ /dev/null
@@ -1,107 +0,0 @@
-<?xml version="1.0" encoding="ISO-8859-1" ?>
-<!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.0 Strict//EN" "http://www.w3.org/TR/xhtml1/DTD/xhtml1-strict.dtd">
-<html xmlns="http://www.w3.org/1999/xhtml">
-<head>
-<meta http-equiv="Content-Type" content="text/html; charset=ISO-8859-1" />
-<title>Eclipse Foundation Software User Agreement</title>
-</head>
-
-<body lang="EN-US">
-<h2>Eclipse Foundation Software User Agreement</h2>
-<p>April 14, 2010</p>
-
-<h3>Usage Of Content</h3>
-
-<p>THE ECLIPSE FOUNDATION MAKES AVAILABLE SOFTWARE, DOCUMENTATION, INFORMATION AND/OR OTHER MATERIALS FOR OPEN SOURCE PROJECTS
- (COLLECTIVELY "CONTENT"). USE OF THE CONTENT IS GOVERNED BY THE TERMS AND CONDITIONS OF THIS AGREEMENT AND/OR THE TERMS AND
- CONDITIONS OF LICENSE AGREEMENTS OR NOTICES INDICATED OR REFERENCED BELOW. BY USING THE CONTENT, YOU AGREE THAT YOUR USE
- OF THE CONTENT IS GOVERNED BY THIS AGREEMENT AND/OR THE TERMS AND CONDITIONS OF ANY APPLICABLE LICENSE AGREEMENTS OR
- NOTICES INDICATED OR REFERENCED BELOW. IF YOU DO NOT AGREE TO THE TERMS AND CONDITIONS OF THIS AGREEMENT AND THE TERMS AND
- CONDITIONS OF ANY APPLICABLE LICENSE AGREEMENTS OR NOTICES INDICATED OR REFERENCED BELOW, THEN YOU MAY NOT USE THE CONTENT.</p>
-
-<h3>Applicable Licenses</h3>
-
-<p>Unless otherwise indicated, all Content made available by the Eclipse Foundation is provided to you under the terms and conditions of the Eclipse Public License Version 1.0
- ("EPL"). A copy of the EPL is provided with this Content and is also available at <a href="http://www.eclipse.org/legal/epl-v10.html">http://www.eclipse.org/legal/epl-v10.html</a>.
- For purposes of the EPL, "Program" will mean the Content.</p>
-
-<p>Content includes, but is not limited to, source code, object code, documentation and other files maintained in the Eclipse Foundation source code
- repository ("Repository") in software modules ("Modules") and made available as downloadable archives ("Downloads").</p>
-
-<ul>
- <li>Content may be structured and packaged into modules to facilitate delivering, extending, and upgrading the Content. Typical modules may include plug-ins ("Plug-ins"), plug-in fragments ("Fragments"), and features ("Features").</li>
- <li>Each Plug-in or Fragment may be packaged as a sub-directory or JAR (Java™ ARchive) in a directory named "plugins".</li>
- <li>A Feature is a bundle of one or more Plug-ins and/or Fragments and associated material. Each Feature may be packaged as a sub-directory in a directory named "features". Within a Feature, files named "feature.xml" may contain a list of the names and version numbers of the Plug-ins
- and/or Fragments associated with that Feature.</li>
- <li>Features may also include other Features ("Included Features"). Within a Feature, files named "feature.xml" may contain a list of the names and version numbers of Included Features.</li>
-</ul>
-
-<p>The terms and conditions governing Plug-ins and Fragments should be contained in files named "about.html" ("Abouts"). The terms and conditions governing Features and
-Included Features should be contained in files named "license.html" ("Feature Licenses"). Abouts and Feature Licenses may be located in any directory of a Download or Module
-including, but not limited to the following locations:</p>
-
-<ul>
- <li>The top-level (root) directory</li>
- <li>Plug-in and Fragment directories</li>
- <li>Inside Plug-ins and Fragments packaged as JARs</li>
- <li>Sub-directories of the directory named "src" of certain Plug-ins</li>
- <li>Feature directories</li>
-</ul>
-
-<p>Note: if a Feature made available by the Eclipse Foundation is installed using the Provisioning Technology (as defined below), you must agree to a license ("Feature Update License") during the
-installation process. If the Feature contains Included Features, the Feature Update License should either provide you with the terms and conditions governing the Included Features or
-inform you where you can locate them. Feature Update Licenses may be found in the "license" property of files named "feature.properties" found within a Feature.
-Such Abouts, Feature Licenses, and Feature Update Licenses contain the terms and conditions (or references to such terms and conditions) that govern your use of the associated Content in
-that directory.</p>
-
-<p>THE ABOUTS, FEATURE LICENSES, AND FEATURE UPDATE LICENSES MAY REFER TO THE EPL OR OTHER LICENSE AGREEMENTS, NOTICES OR TERMS AND CONDITIONS. SOME OF THESE
-OTHER LICENSE AGREEMENTS MAY INCLUDE (BUT ARE NOT LIMITED TO):</p>
-
-<ul>
- <li>Common Public License Version 1.0 (available at <a href="http://www.eclipse.org/legal/cpl-v10.html">http://www.eclipse.org/legal/cpl-v10.html</a>)</li>
- <li>Apache Software License 1.1 (available at <a href="http://www.apache.org/licenses/LICENSE">http://www.apache.org/licenses/LICENSE</a>)</li>
- <li>Apache Software License 2.0 (available at <a href="http://www.apache.org/licenses/LICENSE-2.0">http://www.apache.org/licenses/LICENSE-2.0</a>)</li>
- <li>Metro Link Public License 1.00 (available at <a href="http://www.opengroup.org/openmotif/supporters/metrolink/license.html">http://www.opengroup.org/openmotif/supporters/metrolink/license.html</a>)</li>
- <li>Mozilla Public License Version 1.1 (available at <a href="http://www.mozilla.org/MPL/MPL-1.1.html">http://www.mozilla.org/MPL/MPL-1.1.html</a>)</li>
-</ul>
-
-<p>IT IS YOUR OBLIGATION TO READ AND ACCEPT ALL SUCH TERMS AND CONDITIONS PRIOR TO USE OF THE CONTENT. If no About, Feature License, or Feature Update License is provided, please
-contact the Eclipse Foundation to determine what terms and conditions govern that particular Content.</p>
-
-
-<h3>Use of Provisioning Technology</h3>
-
-<p>The Eclipse Foundation makes available provisioning software, examples of which include, but are not limited to, p2 and the Eclipse
- Update Manager ("Provisioning Technology") for the purpose of allowing users to install software, documentation, information and/or
- other materials (collectively "Installable Software"). This capability is provided with the intent of allowing such users to
- install, extend and update Eclipse-based products. Information about packaging Installable Software is available at <a
- href="http://eclipse.org/equinox/p2/repository_packaging.html">http://eclipse.org/equinox/p2/repository_packaging.html</a>
- ("Specification").</p>
-
-<p>You may use Provisioning Technology to allow other parties to install Installable Software. You shall be responsible for enabling the
- applicable license agreements relating to the Installable Software to be presented to, and accepted by, the users of the Provisioning Technology
- in accordance with the Specification. By using Provisioning Technology in such a manner and making it available in accordance with the
- Specification, you further acknowledge your agreement to, and the acquisition of all necessary rights to permit the following:</p>
-
-<ol>
- <li>A series of actions may occur ("Provisioning Process") in which a user may execute the Provisioning Technology
- on a machine ("Target Machine") with the intent of installing, extending or updating the functionality of an Eclipse-based
- product.</li>
- <li>During the Provisioning Process, the Provisioning Technology may cause third party Installable Software or a portion thereof to be
- accessed and copied to the Target Machine.</li>
- <li>Pursuant to the Specification, you will provide to the user the terms and conditions that govern the use of the Installable
- Software ("Installable Software Agreement") and such Installable Software Agreement shall be accessed from the Target
- Machine in accordance with the Specification. Such Installable Software Agreement must inform the user of the terms and conditions that govern
- the Installable Software and must solicit acceptance by the end user in the manner prescribed in such Installable Software Agreement. Upon such
- indication of agreement by the user, the provisioning Technology will complete installation of the Installable Software.</li>
-</ol>
-
-<h3>Cryptography</h3>
-
-<p>Content may contain encryption software. The country in which you are currently may have restrictions on the import, possession, and use, and/or re-export to
- another country, of encryption software. BEFORE using any encryption software, please check the country's laws, regulations and policies concerning the import,
- possession, or use, and re-export of encryption software, to see if this is permitted.</p>
-
-<p><small>Java and all Java-based trademarks are trademarks of Oracle Corporation in the United States, other countries, or both.</small></p>
-</body>
-</html>
diff --git a/features/org.eclipse.jst.enterprise_ui.feature/sourceTemplateBundle/about.html b/features/org.eclipse.jst.enterprise_ui.feature/sourceTemplateBundle/about.html
deleted file mode 100644
index fe81d46..0000000
--- a/features/org.eclipse.jst.enterprise_ui.feature/sourceTemplateBundle/about.html
+++ /dev/null
@@ -1,27 +0,0 @@
-<!DOCTYPE HTML PUBLIC "-//W3C//DTD HTML 4.0//EN">
-<html>
-<head>
-<title>About</title>
-<meta http-equiv=Content-Type content="text/html; charset=ISO-8859-1">
-</head>
-<body lang="EN-US">
-<h2>About This Content</h2>
-
-<P>June, 2008</P>
-<h3>License</h3>
-
-<p>The Eclipse Foundation makes available all content in this plug-in ("Content"). Unless otherwise indicated below, the Content is provided to you under the terms and conditions of the
-Eclipse Public License Version 1.0 ("EPL"). A copy of the EPL is available at <a href="http://www.eclipse.org/legal/epl-v10.html">http://www.eclipse.org/legal/epl-v10.html</a>.
-For purposes of the EPL, "Program" will mean the Content.</p>
-
-<p>If you did not receive this Content directly from the Eclipse Foundation, the Content is being redistributed by another party ("Redistributor") and different terms and conditions may
-apply to your use of any object code in the Content. Check the Redistributor's license that was provided with the Content. If no such license exists, contact the Redistributor. Unless otherwise
-indicated below, the terms and conditions of the EPL still apply to any source code in the Content.</p>
-
-<h3>Source Code</h3>
-<p>This plug-in contains source code zip files ("Source Zips") that correspond to binary content in other plug-ins. These Source Zips may be distributed under different license
-agreements and/or notices. Details about these license agreements and notices are contained in "about.html" files ("Abouts") located in sub-directories in the
-src/ directory of this plug-in. Such Abouts govern your use of the Source Zips in that directory, not the EPL.</p>
-
-</body>
-</html>
diff --git a/features/org.eclipse.jst.enterprise_ui.feature/sourceTemplateBundle/about.ini b/features/org.eclipse.jst.enterprise_ui.feature/sourceTemplateBundle/about.ini
deleted file mode 100644
index fda5a40..0000000
--- a/features/org.eclipse.jst.enterprise_ui.feature/sourceTemplateBundle/about.ini
+++ /dev/null
@@ -1,31 +0,0 @@
-# about.ini
-# contains information about a feature
-# java.io.Properties file (ISO 8859-1 with "\" escapes)
-# "%key" are externalized strings defined in about.properties
-# This file does not need to be translated.
-
-# Property "aboutText" contains blurb for "About" dialog (translated)
-aboutText=%blurb
-
-# Property "windowImage" contains path to window icon (16x16)
-# needed for primary features only
-
-# Property "featureImage" contains path to feature image (32x32)
-featureImage=wtp_prod32.png
-
-# Property "aboutImage" contains path to product image (500x330 or 115x164)
-# needed for primary features only
-
-# Property "appName" contains name of the application (not translated)
-# needed for primary features only
-
-# Property "welcomePage" contains path to welcome page (special XML-based format)
-# optional
-
-# Property "welcomePerspective" contains the id of the perspective in which the
-# welcome page is to be opened.
-# optional
-
-
-
-
diff --git a/features/org.eclipse.jst.enterprise_ui.feature/sourceTemplateBundle/about.mappings b/features/org.eclipse.jst.enterprise_ui.feature/sourceTemplateBundle/about.mappings
deleted file mode 100644
index a28390a..0000000
--- a/features/org.eclipse.jst.enterprise_ui.feature/sourceTemplateBundle/about.mappings
+++ /dev/null
@@ -1,6 +0,0 @@
-# about.mappings
-# contains fill-ins for about.properties
-# java.io.Properties file (ISO 8859-1 with "\" escapes)
-# This file does not need to be translated.
-
-0=@build@
diff --git a/features/org.eclipse.jst.enterprise_ui.feature/sourceTemplateBundle/about.properties b/features/org.eclipse.jst.enterprise_ui.feature/sourceTemplateBundle/about.properties
deleted file mode 100644
index e00fafa..0000000
--- a/features/org.eclipse.jst.enterprise_ui.feature/sourceTemplateBundle/about.properties
+++ /dev/null
@@ -1,26 +0,0 @@
-###############################################################################
-# Copyright (c) 2000, 2005 IBM Corporation and others.
-# All rights reserved. This program and the accompanying materials
-# are made available under the terms of the Eclipse Public License v1.0
-# which accompanies this distribution, and is available at
-# http://www.eclipse.org/legal/epl-v10.html
-#
-# Contributors:
-# IBM Corporation - initial API and implementation
-###############################################################################
-# about.properties
-# contains externalized strings for about.ini
-# java.io.Properties file (ISO 8859-1 with "\" escapes)
-# fill-ins are supplied by about.mappings
-# This file should be translated.
-#
-# Do not translate any values surrounded by {}
-
-blurb=J2EE Standard Tools - Enterprise UI\n\
-\n\
-Version: {featureVersion}\n\
-Build id: {0}\n\
-\n\
-(c) Copyright Eclipse contributors and others 2005. All rights reserved.\n\
-Visit http://www.eclipse.org/webtools
-
diff --git a/features/org.eclipse.jst.enterprise_ui.feature/sourceTemplateBundle/build.properties b/features/org.eclipse.jst.enterprise_ui.feature/sourceTemplateBundle/build.properties
deleted file mode 100644
index 30a575c..0000000
--- a/features/org.eclipse.jst.enterprise_ui.feature/sourceTemplateBundle/build.properties
+++ /dev/null
@@ -1,3 +0,0 @@
-
-bin.includes = about.html, about.ini, about.mappings, about.properties, wtp_prod32.png, plugin.properties, plugin.xml, src/**, META-INF/
-sourcePlugin = true
diff --git a/features/org.eclipse.jst.enterprise_ui.feature/sourceTemplateBundle/plugin.properties b/features/org.eclipse.jst.enterprise_ui.feature/sourceTemplateBundle/plugin.properties
deleted file mode 100644
index d6209ea..0000000
--- a/features/org.eclipse.jst.enterprise_ui.feature/sourceTemplateBundle/plugin.properties
+++ /dev/null
@@ -1,12 +0,0 @@
-###############################################################################
-# Copyright (c) 2005 IBM Corporation and others.
-# All rights reserved. This program and the accompanying materials
-# are made available under the terms of the Eclipse Public License v1.0
-# which accompanies this distribution, and is available at
-# http://www.eclipse.org/legal/epl-v10.html
-#
-# Contributors:
-# IBM Corporation - initial API and implementation
-###############################################################################
-pluginName=J2EE Standard Tools - Enterprise UI Source
-providerName=Eclipse.org
diff --git a/features/org.eclipse.jst.enterprise_ui.feature/sourceTemplateBundle/wtp_prod32.gif b/features/org.eclipse.jst.enterprise_ui.feature/sourceTemplateBundle/wtp_prod32.gif
deleted file mode 100644
index eefb44a..0000000
--- a/features/org.eclipse.jst.enterprise_ui.feature/sourceTemplateBundle/wtp_prod32.gif
+++ /dev/null
Binary files differ
diff --git a/features/org.eclipse.jst.enterprise_ui.feature/sourceTemplateBundle/wtp_prod32.png b/features/org.eclipse.jst.enterprise_ui.feature/sourceTemplateBundle/wtp_prod32.png
deleted file mode 100644
index bfceab3..0000000
--- a/features/org.eclipse.jst.enterprise_ui.feature/sourceTemplateBundle/wtp_prod32.png
+++ /dev/null
Binary files differ
diff --git a/features/org.eclipse.jst.enterprise_ui.feature/sourceTemplateFeature/build.properties b/features/org.eclipse.jst.enterprise_ui.feature/sourceTemplateFeature/build.properties
deleted file mode 100644
index 2ff9234..0000000
--- a/features/org.eclipse.jst.enterprise_ui.feature/sourceTemplateFeature/build.properties
+++ /dev/null
@@ -1,19 +0,0 @@
-###############################################################################
-# Copyright (c) 2000, 2005 IBM Corporation and others.
-# All rights reserved. This program and the accompanying materials
-# are made available under the terms of the Eclipse Public License v1.0
-# which accompanies this distribution, and is available at
-# http://www.eclipse.org/legal/epl-v10.html
-#
-# Contributors:
-# IBM Corporation - initial API and implementation
-###############################################################################
-bin.includes =\
-epl-v10.html,\
-eclipse_update_120.jpg,\
-feature.xml,\
-feature.properties,\
-license.html
-
-generate.feature@org.eclipse.jst.enterprise_core.feature.source = org.eclipse.jst.enterprise_core.feature
-
diff --git a/features/org.eclipse.jst.enterprise_ui.feature/sourceTemplateFeature/eclipse_update_120.jpg b/features/org.eclipse.jst.enterprise_ui.feature/sourceTemplateFeature/eclipse_update_120.jpg
deleted file mode 100644
index bfdf708..0000000
--- a/features/org.eclipse.jst.enterprise_ui.feature/sourceTemplateFeature/eclipse_update_120.jpg
+++ /dev/null
Binary files differ
diff --git a/features/org.eclipse.jst.enterprise_ui.feature/sourceTemplateFeature/epl-v10.html b/features/org.eclipse.jst.enterprise_ui.feature/sourceTemplateFeature/epl-v10.html
deleted file mode 100644
index 022ad29..0000000
--- a/features/org.eclipse.jst.enterprise_ui.feature/sourceTemplateFeature/epl-v10.html
+++ /dev/null
@@ -1,328 +0,0 @@
-<html xmlns:o="urn:schemas-microsoft-com:office:office"
-xmlns:w="urn:schemas-microsoft-com:office:word"
-xmlns="http://www.w3.org/TR/REC-html40">
-
-<head>
-<meta http-equiv=Content-Type content="text/html; charset=windows-1252">
-<meta name=ProgId content=Word.Document>
-<meta name=Generator content="Microsoft Word 9">
-<meta name=Originator content="Microsoft Word 9">
-<link rel=File-List
-href="./Eclipse%20EPL%202003_11_10%20Final_files/filelist.xml">
-<title>Eclipse Public License - Version 1.0</title>
-<!--[if gte mso 9]><xml>
- <o:DocumentProperties>
- <o:Revision>2</o:Revision>
- <o:TotalTime>3</o:TotalTime>
- <o:Created>2004-03-05T23:03:00Z</o:Created>
- <o:LastSaved>2004-03-05T23:03:00Z</o:LastSaved>
- <o:Pages>4</o:Pages>
- <o:Words>1626</o:Words>
- <o:Characters>9270</o:Characters>
- <o:Lines>77</o:Lines>
- <o:Paragraphs>18</o:Paragraphs>
- <o:CharactersWithSpaces>11384</o:CharactersWithSpaces>
- <o:Version>9.4402</o:Version>
- </o:DocumentProperties>
-</xml><![endif]--><!--[if gte mso 9]><xml>
- <w:WordDocument>
- <w:TrackRevisions/>
- </w:WordDocument>
-</xml><![endif]-->
-<style>
-<!--
- /* Font Definitions */
-@font-face
- {font-family:Tahoma;
- panose-1:2 11 6 4 3 5 4 4 2 4;
- mso-font-charset:0;
- mso-generic-font-family:swiss;
- mso-font-pitch:variable;
- mso-font-signature:553679495 -2147483648 8 0 66047 0;}
- /* Style Definitions */
-p.MsoNormal, li.MsoNormal, div.MsoNormal
- {mso-style-parent:"";
- margin:0in;
- margin-bottom:.0001pt;
- mso-pagination:widow-orphan;
- font-size:12.0pt;
- font-family:"Times New Roman";
- mso-fareast-font-family:"Times New Roman";}
-p
- {margin-right:0in;
- mso-margin-top-alt:auto;
- mso-margin-bottom-alt:auto;
- margin-left:0in;
- mso-pagination:widow-orphan;
- font-size:12.0pt;
- font-family:"Times New Roman";
- mso-fareast-font-family:"Times New Roman";}
-p.BalloonText, li.BalloonText, div.BalloonText
- {mso-style-name:"Balloon Text";
- margin:0in;
- margin-bottom:.0001pt;
- mso-pagination:widow-orphan;
- font-size:8.0pt;
- font-family:Tahoma;
- mso-fareast-font-family:"Times New Roman";}
-@page Section1
- {size:8.5in 11.0in;
- margin:1.0in 1.25in 1.0in 1.25in;
- mso-header-margin:.5in;
- mso-footer-margin:.5in;
- mso-paper-source:0;}
-div.Section1
- {page:Section1;}
--->
-</style>
-</head>
-
-<body lang=EN-US style='tab-interval:.5in'>
-
-<div class=Section1>
-
-<p align=center style='text-align:center'><b>Eclipse Public License - v 1.0</b>
-</p>
-
-<p><span style='font-size:10.0pt'>THE ACCOMPANYING PROGRAM IS PROVIDED UNDER
-THE TERMS OF THIS ECLIPSE PUBLIC LICENSE ("AGREEMENT"). ANY USE,
-REPRODUCTION OR DISTRIBUTION OF THE PROGRAM CONSTITUTES RECIPIENT'S ACCEPTANCE
-OF THIS AGREEMENT.</span> </p>
-
-<p><b><span style='font-size:10.0pt'>1. DEFINITIONS</span></b> </p>
-
-<p><span style='font-size:10.0pt'>"Contribution" means:</span> </p>
-
-<p class=MsoNormal style='margin-left:.5in'><span style='font-size:10.0pt'>a)
-in the case of the initial Contributor, the initial code and documentation
-distributed under this Agreement, and<br clear=left>
-b) in the case of each subsequent Contributor:</span></p>
-
-<p class=MsoNormal style='margin-left:.5in'><span style='font-size:10.0pt'>i)
-changes to the Program, and</span></p>
-
-<p class=MsoNormal style='margin-left:.5in'><span style='font-size:10.0pt'>ii)
-additions to the Program;</span></p>
-
-<p class=MsoNormal style='margin-left:.5in'><span style='font-size:10.0pt'>where
-such changes and/or additions to the Program originate from and are distributed
-by that particular Contributor. A Contribution 'originates' from a Contributor
-if it was added to the Program by such Contributor itself or anyone acting on
-such Contributor's behalf. Contributions do not include additions to the
-Program which: (i) are separate modules of software distributed in conjunction
-with the Program under their own license agreement, and (ii) are not derivative
-works of the Program. </span></p>
-
-<p><span style='font-size:10.0pt'>"Contributor" means any person or
-entity that distributes the Program.</span> </p>
-
-<p><span style='font-size:10.0pt'>"Licensed Patents " mean patent
-claims licensable by a Contributor which are necessarily infringed by the use
-or sale of its Contribution alone or when combined with the Program. </span></p>
-
-<p><span style='font-size:10.0pt'>"Program" means the Contributions
-distributed in accordance with this Agreement.</span> </p>
-
-<p><span style='font-size:10.0pt'>"Recipient" means anyone who
-receives the Program under this Agreement, including all Contributors.</span> </p>
-
-<p><b><span style='font-size:10.0pt'>2. GRANT OF RIGHTS</span></b> </p>
-
-<p class=MsoNormal style='margin-left:.5in'><span style='font-size:10.0pt'>a)
-Subject to the terms of this Agreement, each Contributor hereby grants Recipient
-a non-exclusive, worldwide, royalty-free copyright license to<span
-style='color:red'> </span>reproduce, prepare derivative works of, publicly
-display, publicly perform, distribute and sublicense the Contribution of such
-Contributor, if any, and such derivative works, in source code and object code
-form.</span></p>
-
-<p class=MsoNormal style='margin-left:.5in'><span style='font-size:10.0pt'>b)
-Subject to the terms of this Agreement, each Contributor hereby grants
-Recipient a non-exclusive, worldwide,<span style='color:green'> </span>royalty-free
-patent license under Licensed Patents to make, use, sell, offer to sell, import
-and otherwise transfer the Contribution of such Contributor, if any, in source
-code and object code form. This patent license shall apply to the combination
-of the Contribution and the Program if, at the time the Contribution is added
-by the Contributor, such addition of the Contribution causes such combination
-to be covered by the Licensed Patents. The patent license shall not apply to
-any other combinations which include the Contribution. No hardware per se is
-licensed hereunder. </span></p>
-
-<p class=MsoNormal style='margin-left:.5in'><span style='font-size:10.0pt'>c)
-Recipient understands that although each Contributor grants the licenses to its
-Contributions set forth herein, no assurances are provided by any Contributor
-that the Program does not infringe the patent or other intellectual property
-rights of any other entity. Each Contributor disclaims any liability to Recipient
-for claims brought by any other entity based on infringement of intellectual
-property rights or otherwise. As a condition to exercising the rights and
-licenses granted hereunder, each Recipient hereby assumes sole responsibility
-to secure any other intellectual property rights needed, if any. For example,
-if a third party patent license is required to allow Recipient to distribute
-the Program, it is Recipient's responsibility to acquire that license before
-distributing the Program.</span></p>
-
-<p class=MsoNormal style='margin-left:.5in'><span style='font-size:10.0pt'>d)
-Each Contributor represents that to its knowledge it has sufficient copyright
-rights in its Contribution, if any, to grant the copyright license set forth in
-this Agreement. </span></p>
-
-<p><b><span style='font-size:10.0pt'>3. REQUIREMENTS</span></b> </p>
-
-<p><span style='font-size:10.0pt'>A Contributor may choose to distribute the
-Program in object code form under its own license agreement, provided that:</span>
-</p>
-
-<p class=MsoNormal style='margin-left:.5in'><span style='font-size:10.0pt'>a)
-it complies with the terms and conditions of this Agreement; and</span></p>
-
-<p class=MsoNormal style='margin-left:.5in'><span style='font-size:10.0pt'>b)
-its license agreement:</span></p>
-
-<p class=MsoNormal style='margin-left:.5in'><span style='font-size:10.0pt'>i)
-effectively disclaims on behalf of all Contributors all warranties and
-conditions, express and implied, including warranties or conditions of title
-and non-infringement, and implied warranties or conditions of merchantability
-and fitness for a particular purpose; </span></p>
-
-<p class=MsoNormal style='margin-left:.5in'><span style='font-size:10.0pt'>ii)
-effectively excludes on behalf of all Contributors all liability for damages,
-including direct, indirect, special, incidental and consequential damages, such
-as lost profits; </span></p>
-
-<p class=MsoNormal style='margin-left:.5in'><span style='font-size:10.0pt'>iii)
-states that any provisions which differ from this Agreement are offered by that
-Contributor alone and not by any other party; and</span></p>
-
-<p class=MsoNormal style='margin-left:.5in'><span style='font-size:10.0pt'>iv)
-states that source code for the Program is available from such Contributor, and
-informs licensees how to obtain it in a reasonable manner on or through a
-medium customarily used for software exchange.<span style='color:blue'> </span></span></p>
-
-<p><span style='font-size:10.0pt'>When the Program is made available in source
-code form:</span> </p>
-
-<p class=MsoNormal style='margin-left:.5in'><span style='font-size:10.0pt'>a)
-it must be made available under this Agreement; and </span></p>
-
-<p class=MsoNormal style='margin-left:.5in'><span style='font-size:10.0pt'>b) a
-copy of this Agreement must be included with each copy of the Program. </span></p>
-
-<p><span style='font-size:10.0pt'>Contributors may not remove or alter any
-copyright notices contained within the Program. </span></p>
-
-<p><span style='font-size:10.0pt'>Each Contributor must identify itself as the
-originator of its Contribution, if any, in a manner that reasonably allows
-subsequent Recipients to identify the originator of the Contribution. </span></p>
-
-<p><b><span style='font-size:10.0pt'>4. COMMERCIAL DISTRIBUTION</span></b> </p>
-
-<p><span style='font-size:10.0pt'>Commercial distributors of software may
-accept certain responsibilities with respect to end users, business partners
-and the like. While this license is intended to facilitate the commercial use
-of the Program, the Contributor who includes the Program in a commercial
-product offering should do so in a manner which does not create potential
-liability for other Contributors. Therefore, if a Contributor includes the
-Program in a commercial product offering, such Contributor ("Commercial
-Contributor") hereby agrees to defend and indemnify every other
-Contributor ("Indemnified Contributor") against any losses, damages and
-costs (collectively "Losses") arising from claims, lawsuits and other
-legal actions brought by a third party against the Indemnified Contributor to
-the extent caused by the acts or omissions of such Commercial Contributor in
-connection with its distribution of the Program in a commercial product
-offering. The obligations in this section do not apply to any claims or Losses
-relating to any actual or alleged intellectual property infringement. In order
-to qualify, an Indemnified Contributor must: a) promptly notify the Commercial
-Contributor in writing of such claim, and b) allow the Commercial Contributor
-to control, and cooperate with the Commercial Contributor in, the defense and
-any related settlement negotiations. The Indemnified Contributor may participate
-in any such claim at its own expense.</span> </p>
-
-<p><span style='font-size:10.0pt'>For example, a Contributor might include the
-Program in a commercial product offering, Product X. That Contributor is then a
-Commercial Contributor. If that Commercial Contributor then makes performance
-claims, or offers warranties related to Product X, those performance claims and
-warranties are such Commercial Contributor's responsibility alone. Under this
-section, the Commercial Contributor would have to defend claims against the
-other Contributors related to those performance claims and warranties, and if a
-court requires any other Contributor to pay any damages as a result, the
-Commercial Contributor must pay those damages.</span> </p>
-
-<p><b><span style='font-size:10.0pt'>5. NO WARRANTY</span></b> </p>
-
-<p><span style='font-size:10.0pt'>EXCEPT AS EXPRESSLY SET FORTH IN THIS
-AGREEMENT, THE PROGRAM IS PROVIDED ON AN "AS IS" BASIS, WITHOUT
-WARRANTIES OR CONDITIONS OF ANY KIND, EITHER EXPRESS OR IMPLIED INCLUDING,
-WITHOUT LIMITATION, ANY WARRANTIES OR CONDITIONS OF TITLE, NON-INFRINGEMENT,
-MERCHANTABILITY OR FITNESS FOR A PARTICULAR PURPOSE. Each Recipient is solely
-responsible for determining the appropriateness of using and distributing the
-Program and assumes all risks associated with its exercise of rights under this
-Agreement , including but not limited to the risks and costs of program errors,
-compliance with applicable laws, damage to or loss of data, programs or
-equipment, and unavailability or interruption of operations. </span></p>
-
-<p><b><span style='font-size:10.0pt'>6. DISCLAIMER OF LIABILITY</span></b> </p>
-
-<p><span style='font-size:10.0pt'>EXCEPT AS EXPRESSLY SET FORTH IN THIS
-AGREEMENT, NEITHER RECIPIENT NOR ANY CONTRIBUTORS SHALL HAVE ANY LIABILITY FOR
-ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES
-(INCLUDING WITHOUT LIMITATION LOST PROFITS), HOWEVER CAUSED AND ON ANY THEORY
-OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING
-NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OR DISTRIBUTION OF
-THE PROGRAM OR THE EXERCISE OF ANY RIGHTS GRANTED HEREUNDER, EVEN IF ADVISED OF
-THE POSSIBILITY OF SUCH DAMAGES.</span> </p>
-
-<p><b><span style='font-size:10.0pt'>7. GENERAL</span></b> </p>
-
-<p><span style='font-size:10.0pt'>If any provision of this Agreement is invalid
-or unenforceable under applicable law, it shall not affect the validity or
-enforceability of the remainder of the terms of this Agreement, and without
-further action by the parties hereto, such provision shall be reformed to the
-minimum extent necessary to make such provision valid and enforceable.</span> </p>
-
-<p><span style='font-size:10.0pt'>If Recipient institutes patent litigation
-against any entity (including a cross-claim or counterclaim in a lawsuit)
-alleging that the Program itself (excluding combinations of the Program with
-other software or hardware) infringes such Recipient's patent(s), then such
-Recipient's rights granted under Section 2(b) shall terminate as of the date
-such litigation is filed. </span></p>
-
-<p><span style='font-size:10.0pt'>All Recipient's rights under this Agreement
-shall terminate if it fails to comply with any of the material terms or
-conditions of this Agreement and does not cure such failure in a reasonable
-period of time after becoming aware of such noncompliance. If all Recipient's
-rights under this Agreement terminate, Recipient agrees to cease use and
-distribution of the Program as soon as reasonably practicable. However,
-Recipient's obligations under this Agreement and any licenses granted by
-Recipient relating to the Program shall continue and survive. </span></p>
-
-<p><span style='font-size:10.0pt'>Everyone is permitted to copy and distribute
-copies of this Agreement, but in order to avoid inconsistency the Agreement is
-copyrighted and may only be modified in the following manner. The Agreement
-Steward reserves the right to publish new versions (including revisions) of
-this Agreement from time to time. No one other than the Agreement Steward has
-the right to modify this Agreement. The Eclipse Foundation is the initial
-Agreement Steward. The Eclipse Foundation may assign the responsibility to
-serve as the Agreement Steward to a suitable separate entity. Each new version
-of the Agreement will be given a distinguishing version number. The Program
-(including Contributions) may always be distributed subject to the version of
-the Agreement under which it was received. In addition, after a new version of
-the Agreement is published, Contributor may elect to distribute the Program
-(including its Contributions) under the new version. Except as expressly stated
-in Sections 2(a) and 2(b) above, Recipient receives no rights or licenses to
-the intellectual property of any Contributor under this Agreement, whether
-expressly, by implication, estoppel or otherwise. All rights in the Program not
-expressly granted under this Agreement are reserved.</span> </p>
-
-<p><span style='font-size:10.0pt'>This Agreement is governed by the laws of the
-State of New York and the intellectual property laws of the United States of
-America. No party to this Agreement will bring a legal action under this
-Agreement more than one year after the cause of action arose. Each party waives
-its rights to a jury trial in any resulting litigation.</span> </p>
-
-<p class=MsoNormal><![if !supportEmptyParas]> <![endif]><o:p></o:p></p>
-
-</div>
-
-</body>
-
-</html>
diff --git a/features/org.eclipse.jst.enterprise_ui.feature/sourceTemplateFeature/feature.properties b/features/org.eclipse.jst.enterprise_ui.feature/sourceTemplateFeature/feature.properties
deleted file mode 100644
index c06addb..0000000
--- a/features/org.eclipse.jst.enterprise_ui.feature/sourceTemplateFeature/feature.properties
+++ /dev/null
@@ -1,168 +0,0 @@
-###############################################################################
-# Copyright (c) 2000, 2005 IBM Corporation and others.
-# All rights reserved. This program and the accompanying materials
-# are made available under the terms of the Eclipse Public License v1.0
-# which accompanies this distribution, and is available at
-# http://www.eclipse.org/legal/epl-v10.html
-#
-# Contributors:
-# IBM Corporation - initial API and implementation
-###############################################################################
-# feature.properties
-# contains externalized strings for feature.xml
-# "%foo" in feature.xml corresponds to the key "foo" in this file
-# java.io.Properties file (ISO 8859-1 with "\" escapes)
-# This file should be translated.
-
-# "featureName" property - name of the feature
-featureName=JST Enterprise UI Developer Resources
-
-# "providerName" property - name of the company that provides the feature
-providerName=Eclipse Web Tools Platform
-
-
-# "description" property - description of the feature
-description=Source code zips for JST enterprise UI.
-
-# "copyright" property - text of the "Feature Update Copyright"
-copyright=\
-Copyright (c) 2006 IBM Corporation and others.\n\
-All rights reserved. This program and the accompanying materials\n\
-are made available under the terms of the Eclipse Public License v1.0\n\
-which accompanies this distribution, and is available at\n\
-http://www.eclipse.org/legal/epl-v10.html\n\
-\n\
-Contributors:\n\
- IBM Corporation - initial API and implementation\n
-################ end of copyright property ####################################
-
-# "licenseURL" property - URL of the "Feature License"
-# do not translate value - just change to point to a locale-specific HTML page
-licenseURL=license.html
-
-# "license" property - text of the "Feature Update License"
-# should be plain text version of license agreement pointed to be "licenseURL"
-license=\
-Eclipse Foundation Software User Agreement\n\
-April 14, 2010\n\
-\n\
-Usage Of Content\n\
-\n\
-THE ECLIPSE FOUNDATION MAKES AVAILABLE SOFTWARE, DOCUMENTATION, INFORMATION AND/OR\n\
-OTHER MATERIALS FOR OPEN SOURCE PROJECTS (COLLECTIVELY "CONTENT").\n\
-USE OF THE CONTENT IS GOVERNED BY THE TERMS AND CONDITIONS OF THIS\n\
-AGREEMENT AND/OR THE TERMS AND CONDITIONS OF LICENSE AGREEMENTS OR\n\
-NOTICES INDICATED OR REFERENCED BELOW. BY USING THE CONTENT, YOU\n\
-AGREE THAT YOUR USE OF THE CONTENT IS GOVERNED BY THIS AGREEMENT\n\
-AND/OR THE TERMS AND CONDITIONS OF ANY APPLICABLE LICENSE AGREEMENTS\n\
-OR NOTICES INDICATED OR REFERENCED BELOW. IF YOU DO NOT AGREE TO THE\n\
-TERMS AND CONDITIONS OF THIS AGREEMENT AND THE TERMS AND CONDITIONS\n\
-OF ANY APPLICABLE LICENSE AGREEMENTS OR NOTICES INDICATED OR REFERENCED\n\
-BELOW, THEN YOU MAY NOT USE THE CONTENT.\n\
-\n\
-Applicable Licenses\n\
-\n\
-Unless otherwise indicated, all Content made available by the\n\
-Eclipse Foundation is provided to you under the terms and conditions of\n\
-the Eclipse Public License Version 1.0 ("EPL"). A copy of the EPL is\n\
-provided with this Content and is also available at http://www.eclipse.org/legal/epl-v10.html.\n\
-For purposes of the EPL, "Program" will mean the Content.\n\
-\n\
-Content includes, but is not limited to, source code, object code,\n\
-documentation and other files maintained in the Eclipse Foundation source code\n\
-repository ("Repository") in software modules ("Modules") and made available\n\
-as downloadable archives ("Downloads").\n\
-\n\
- - Content may be structured and packaged into modules to facilitate delivering,\n\
- extending, and upgrading the Content. Typical modules may include plug-ins ("Plug-ins"),\n\
- plug-in fragments ("Fragments"), and features ("Features").\n\
- - Each Plug-in or Fragment may be packaged as a sub-directory or JAR (Java(TM) ARchive)\n\
- in a directory named "plugins".\n\
- - A Feature is a bundle of one or more Plug-ins and/or Fragments and associated material.\n\
- Each Feature may be packaged as a sub-directory in a directory named "features".\n\
- Within a Feature, files named "feature.xml" may contain a list of the names and version\n\
- numbers of the Plug-ins and/or Fragments associated with that Feature.\n\
- - Features may also include other Features ("Included Features"). Within a Feature, files\n\
- named "feature.xml" may contain a list of the names and version numbers of Included Features.\n\
-\n\
-The terms and conditions governing Plug-ins and Fragments should be\n\
-contained in files named "about.html" ("Abouts"). The terms and\n\
-conditions governing Features and Included Features should be contained\n\
-in files named "license.html" ("Feature Licenses"). Abouts and Feature\n\
-Licenses may be located in any directory of a Download or Module\n\
-including, but not limited to the following locations:\n\
-\n\
- - The top-level (root) directory\n\
- - Plug-in and Fragment directories\n\
- - Inside Plug-ins and Fragments packaged as JARs\n\
- - Sub-directories of the directory named "src" of certain Plug-ins\n\
- - Feature directories\n\
-\n\
-Note: if a Feature made available by the Eclipse Foundation is installed using the\n\
-Provisioning Technology (as defined below), you must agree to a license ("Feature \n\
-Update License") during the installation process. If the Feature contains\n\
-Included Features, the Feature Update License should either provide you\n\
-with the terms and conditions governing the Included Features or inform\n\
-you where you can locate them. Feature Update Licenses may be found in\n\
-the "license" property of files named "feature.properties" found within a Feature.\n\
-Such Abouts, Feature Licenses, and Feature Update Licenses contain the\n\
-terms and conditions (or references to such terms and conditions) that\n\
-govern your use of the associated Content in that directory.\n\
-\n\
-THE ABOUTS, FEATURE LICENSES, AND FEATURE UPDATE LICENSES MAY REFER\n\
-TO THE EPL OR OTHER LICENSE AGREEMENTS, NOTICES OR TERMS AND CONDITIONS.\n\
-SOME OF THESE OTHER LICENSE AGREEMENTS MAY INCLUDE (BUT ARE NOT LIMITED TO):\n\
-\n\
- - Common Public License Version 1.0 (available at http://www.eclipse.org/legal/cpl-v10.html)\n\
- - Apache Software License 1.1 (available at http://www.apache.org/licenses/LICENSE)\n\
- - Apache Software License 2.0 (available at http://www.apache.org/licenses/LICENSE-2.0)\n\
- - Metro Link Public License 1.00 (available at http://www.opengroup.org/openmotif/supporters/metrolink/license.html)\n\
- - Mozilla Public License Version 1.1 (available at http://www.mozilla.org/MPL/MPL-1.1.html)\n\
-\n\
-IT IS YOUR OBLIGATION TO READ AND ACCEPT ALL SUCH TERMS AND CONDITIONS PRIOR\n\
-TO USE OF THE CONTENT. If no About, Feature License, or Feature Update License\n\
-is provided, please contact the Eclipse Foundation to determine what terms and conditions\n\
-govern that particular Content.\n\
-\n\
-\n\Use of Provisioning Technology\n\
-\n\
-The Eclipse Foundation makes available provisioning software, examples of which include,\n\
-but are not limited to, p2 and the Eclipse Update Manager ("Provisioning Technology") for\n\
-the purpose of allowing users to install software, documentation, information and/or\n\
-other materials (collectively "Installable Software"). This capability is provided with\n\
-the intent of allowing such users to install, extend and update Eclipse-based products.\n\
-Information about packaging Installable Software is available at\n\
-http://eclipse.org/equinox/p2/repository_packaging.html ("Specification").\n\
-\n\
-You may use Provisioning Technology to allow other parties to install Installable Software.\n\
-You shall be responsible for enabling the applicable license agreements relating to the\n\
-Installable Software to be presented to, and accepted by, the users of the Provisioning Technology\n\
-in accordance with the Specification. By using Provisioning Technology in such a manner and\n\
-making it available in accordance with the Specification, you further acknowledge your\n\
-agreement to, and the acquisition of all necessary rights to permit the following:\n\
-\n\
- 1. A series of actions may occur ("Provisioning Process") in which a user may execute\n\
- the Provisioning Technology on a machine ("Target Machine") with the intent of installing,\n\
- extending or updating the functionality of an Eclipse-based product.\n\
- 2. During the Provisioning Process, the Provisioning Technology may cause third party\n\
- Installable Software or a portion thereof to be accessed and copied to the Target Machine.\n\
- 3. Pursuant to the Specification, you will provide to the user the terms and conditions that\n\
- govern the use of the Installable Software ("Installable Software Agreement") and such\n\
- Installable Software Agreement shall be accessed from the Target Machine in accordance\n\
- with the Specification. Such Installable Software Agreement must inform the user of the\n\
- terms and conditions that govern the Installable Software and must solicit acceptance by\n\
- the end user in the manner prescribed in such Installable Software Agreement. Upon such\n\
- indication of agreement by the user, the provisioning Technology will complete installation\n\
- of the Installable Software.\n\
-\n\
-Cryptography\n\
-\n\
-Content may contain encryption software. The country in which you are\n\
-currently may have restrictions on the import, possession, and use,\n\
-and/or re-export to another country, of encryption software. BEFORE\n\
-using any encryption software, please check the country's laws,\n\
-regulations and policies concerning the import, possession, or use, and\n\
-re-export of encryption software, to see if this is permitted.\n\
-\n\
-Java and all Java-based trademarks are trademarks of Oracle Corporation in the United States, other countries, or both.\n
-########### end of license property ##########################################
diff --git a/features/org.eclipse.jst.enterprise_ui.feature/sourceTemplateFeature/license.html b/features/org.eclipse.jst.enterprise_ui.feature/sourceTemplateFeature/license.html
deleted file mode 100644
index c184ca3..0000000
--- a/features/org.eclipse.jst.enterprise_ui.feature/sourceTemplateFeature/license.html
+++ /dev/null
@@ -1,107 +0,0 @@
-<?xml version="1.0" encoding="ISO-8859-1" ?>
-<!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.0 Strict//EN" "http://www.w3.org/TR/xhtml1/DTD/xhtml1-strict.dtd">
-<html xmlns="http://www.w3.org/1999/xhtml">
-<head>
-<meta http-equiv="Content-Type" content="text/html; charset=ISO-8859-1" />
-<title>Eclipse Foundation Software User Agreement</title>
-</head>
-
-<body lang="EN-US">
-<h2>Eclipse Foundation Software User Agreement</h2>
-<p>April 14, 2010</p>
-
-<h3>Usage Of Content</h3>
-
-<p>THE ECLIPSE FOUNDATION MAKES AVAILABLE SOFTWARE, DOCUMENTATION, INFORMATION AND/OR OTHER MATERIALS FOR OPEN SOURCE PROJECTS
- (COLLECTIVELY "CONTENT"). USE OF THE CONTENT IS GOVERNED BY THE TERMS AND CONDITIONS OF THIS AGREEMENT AND/OR THE TERMS AND
- CONDITIONS OF LICENSE AGREEMENTS OR NOTICES INDICATED OR REFERENCED BELOW. BY USING THE CONTENT, YOU AGREE THAT YOUR USE
- OF THE CONTENT IS GOVERNED BY THIS AGREEMENT AND/OR THE TERMS AND CONDITIONS OF ANY APPLICABLE LICENSE AGREEMENTS OR
- NOTICES INDICATED OR REFERENCED BELOW. IF YOU DO NOT AGREE TO THE TERMS AND CONDITIONS OF THIS AGREEMENT AND THE TERMS AND
- CONDITIONS OF ANY APPLICABLE LICENSE AGREEMENTS OR NOTICES INDICATED OR REFERENCED BELOW, THEN YOU MAY NOT USE THE CONTENT.</p>
-
-<h3>Applicable Licenses</h3>
-
-<p>Unless otherwise indicated, all Content made available by the Eclipse Foundation is provided to you under the terms and conditions of the Eclipse Public License Version 1.0
- ("EPL"). A copy of the EPL is provided with this Content and is also available at <a href="http://www.eclipse.org/legal/epl-v10.html">http://www.eclipse.org/legal/epl-v10.html</a>.
- For purposes of the EPL, "Program" will mean the Content.</p>
-
-<p>Content includes, but is not limited to, source code, object code, documentation and other files maintained in the Eclipse Foundation source code
- repository ("Repository") in software modules ("Modules") and made available as downloadable archives ("Downloads").</p>
-
-<ul>
- <li>Content may be structured and packaged into modules to facilitate delivering, extending, and upgrading the Content. Typical modules may include plug-ins ("Plug-ins"), plug-in fragments ("Fragments"), and features ("Features").</li>
- <li>Each Plug-in or Fragment may be packaged as a sub-directory or JAR (Java™ ARchive) in a directory named "plugins".</li>
- <li>A Feature is a bundle of one or more Plug-ins and/or Fragments and associated material. Each Feature may be packaged as a sub-directory in a directory named "features". Within a Feature, files named "feature.xml" may contain a list of the names and version numbers of the Plug-ins
- and/or Fragments associated with that Feature.</li>
- <li>Features may also include other Features ("Included Features"). Within a Feature, files named "feature.xml" may contain a list of the names and version numbers of Included Features.</li>
-</ul>
-
-<p>The terms and conditions governing Plug-ins and Fragments should be contained in files named "about.html" ("Abouts"). The terms and conditions governing Features and
-Included Features should be contained in files named "license.html" ("Feature Licenses"). Abouts and Feature Licenses may be located in any directory of a Download or Module
-including, but not limited to the following locations:</p>
-
-<ul>
- <li>The top-level (root) directory</li>
- <li>Plug-in and Fragment directories</li>
- <li>Inside Plug-ins and Fragments packaged as JARs</li>
- <li>Sub-directories of the directory named "src" of certain Plug-ins</li>
- <li>Feature directories</li>
-</ul>
-
-<p>Note: if a Feature made available by the Eclipse Foundation is installed using the Provisioning Technology (as defined below), you must agree to a license ("Feature Update License") during the
-installation process. If the Feature contains Included Features, the Feature Update License should either provide you with the terms and conditions governing the Included Features or
-inform you where you can locate them. Feature Update Licenses may be found in the "license" property of files named "feature.properties" found within a Feature.
-Such Abouts, Feature Licenses, and Feature Update Licenses contain the terms and conditions (or references to such terms and conditions) that govern your use of the associated Content in
-that directory.</p>
-
-<p>THE ABOUTS, FEATURE LICENSES, AND FEATURE UPDATE LICENSES MAY REFER TO THE EPL OR OTHER LICENSE AGREEMENTS, NOTICES OR TERMS AND CONDITIONS. SOME OF THESE
-OTHER LICENSE AGREEMENTS MAY INCLUDE (BUT ARE NOT LIMITED TO):</p>
-
-<ul>
- <li>Common Public License Version 1.0 (available at <a href="http://www.eclipse.org/legal/cpl-v10.html">http://www.eclipse.org/legal/cpl-v10.html</a>)</li>
- <li>Apache Software License 1.1 (available at <a href="http://www.apache.org/licenses/LICENSE">http://www.apache.org/licenses/LICENSE</a>)</li>
- <li>Apache Software License 2.0 (available at <a href="http://www.apache.org/licenses/LICENSE-2.0">http://www.apache.org/licenses/LICENSE-2.0</a>)</li>
- <li>Metro Link Public License 1.00 (available at <a href="http://www.opengroup.org/openmotif/supporters/metrolink/license.html">http://www.opengroup.org/openmotif/supporters/metrolink/license.html</a>)</li>
- <li>Mozilla Public License Version 1.1 (available at <a href="http://www.mozilla.org/MPL/MPL-1.1.html">http://www.mozilla.org/MPL/MPL-1.1.html</a>)</li>
-</ul>
-
-<p>IT IS YOUR OBLIGATION TO READ AND ACCEPT ALL SUCH TERMS AND CONDITIONS PRIOR TO USE OF THE CONTENT. If no About, Feature License, or Feature Update License is provided, please
-contact the Eclipse Foundation to determine what terms and conditions govern that particular Content.</p>
-
-
-<h3>Use of Provisioning Technology</h3>
-
-<p>The Eclipse Foundation makes available provisioning software, examples of which include, but are not limited to, p2 and the Eclipse
- Update Manager ("Provisioning Technology") for the purpose of allowing users to install software, documentation, information and/or
- other materials (collectively "Installable Software"). This capability is provided with the intent of allowing such users to
- install, extend and update Eclipse-based products. Information about packaging Installable Software is available at <a
- href="http://eclipse.org/equinox/p2/repository_packaging.html">http://eclipse.org/equinox/p2/repository_packaging.html</a>
- ("Specification").</p>
-
-<p>You may use Provisioning Technology to allow other parties to install Installable Software. You shall be responsible for enabling the
- applicable license agreements relating to the Installable Software to be presented to, and accepted by, the users of the Provisioning Technology
- in accordance with the Specification. By using Provisioning Technology in such a manner and making it available in accordance with the
- Specification, you further acknowledge your agreement to, and the acquisition of all necessary rights to permit the following:</p>
-
-<ol>
- <li>A series of actions may occur ("Provisioning Process") in which a user may execute the Provisioning Technology
- on a machine ("Target Machine") with the intent of installing, extending or updating the functionality of an Eclipse-based
- product.</li>
- <li>During the Provisioning Process, the Provisioning Technology may cause third party Installable Software or a portion thereof to be
- accessed and copied to the Target Machine.</li>
- <li>Pursuant to the Specification, you will provide to the user the terms and conditions that govern the use of the Installable
- Software ("Installable Software Agreement") and such Installable Software Agreement shall be accessed from the Target
- Machine in accordance with the Specification. Such Installable Software Agreement must inform the user of the terms and conditions that govern
- the Installable Software and must solicit acceptance by the end user in the manner prescribed in such Installable Software Agreement. Upon such
- indication of agreement by the user, the provisioning Technology will complete installation of the Installable Software.</li>
-</ol>
-
-<h3>Cryptography</h3>
-
-<p>Content may contain encryption software. The country in which you are currently may have restrictions on the import, possession, and use, and/or re-export to
- another country, of encryption software. BEFORE using any encryption software, please check the country's laws, regulations and policies concerning the import,
- possession, or use, and re-export of encryption software, to see if this is permitted.</p>
-
-<p><small>Java and all Java-based trademarks are trademarks of Oracle Corporation in the United States, other countries, or both.</small></p>
-</body>
-</html>
diff --git a/features/org.eclipse.jst.enterprise_ui.feature/sourceTemplatePlugin/about.html b/features/org.eclipse.jst.enterprise_ui.feature/sourceTemplatePlugin/about.html
deleted file mode 100644
index fe81d46..0000000
--- a/features/org.eclipse.jst.enterprise_ui.feature/sourceTemplatePlugin/about.html
+++ /dev/null
@@ -1,27 +0,0 @@
-<!DOCTYPE HTML PUBLIC "-//W3C//DTD HTML 4.0//EN">
-<html>
-<head>
-<title>About</title>
-<meta http-equiv=Content-Type content="text/html; charset=ISO-8859-1">
-</head>
-<body lang="EN-US">
-<h2>About This Content</h2>
-
-<P>June, 2008</P>
-<h3>License</h3>
-
-<p>The Eclipse Foundation makes available all content in this plug-in ("Content"). Unless otherwise indicated below, the Content is provided to you under the terms and conditions of the
-Eclipse Public License Version 1.0 ("EPL"). A copy of the EPL is available at <a href="http://www.eclipse.org/legal/epl-v10.html">http://www.eclipse.org/legal/epl-v10.html</a>.
-For purposes of the EPL, "Program" will mean the Content.</p>
-
-<p>If you did not receive this Content directly from the Eclipse Foundation, the Content is being redistributed by another party ("Redistributor") and different terms and conditions may
-apply to your use of any object code in the Content. Check the Redistributor's license that was provided with the Content. If no such license exists, contact the Redistributor. Unless otherwise
-indicated below, the terms and conditions of the EPL still apply to any source code in the Content.</p>
-
-<h3>Source Code</h3>
-<p>This plug-in contains source code zip files ("Source Zips") that correspond to binary content in other plug-ins. These Source Zips may be distributed under different license
-agreements and/or notices. Details about these license agreements and notices are contained in "about.html" files ("Abouts") located in sub-directories in the
-src/ directory of this plug-in. Such Abouts govern your use of the Source Zips in that directory, not the EPL.</p>
-
-</body>
-</html>
diff --git a/features/org.eclipse.jst.enterprise_ui.feature/sourceTemplatePlugin/about.ini b/features/org.eclipse.jst.enterprise_ui.feature/sourceTemplatePlugin/about.ini
deleted file mode 100644
index fda5a40..0000000
--- a/features/org.eclipse.jst.enterprise_ui.feature/sourceTemplatePlugin/about.ini
+++ /dev/null
@@ -1,31 +0,0 @@
-# about.ini
-# contains information about a feature
-# java.io.Properties file (ISO 8859-1 with "\" escapes)
-# "%key" are externalized strings defined in about.properties
-# This file does not need to be translated.
-
-# Property "aboutText" contains blurb for "About" dialog (translated)
-aboutText=%blurb
-
-# Property "windowImage" contains path to window icon (16x16)
-# needed for primary features only
-
-# Property "featureImage" contains path to feature image (32x32)
-featureImage=wtp_prod32.png
-
-# Property "aboutImage" contains path to product image (500x330 or 115x164)
-# needed for primary features only
-
-# Property "appName" contains name of the application (not translated)
-# needed for primary features only
-
-# Property "welcomePage" contains path to welcome page (special XML-based format)
-# optional
-
-# Property "welcomePerspective" contains the id of the perspective in which the
-# welcome page is to be opened.
-# optional
-
-
-
-
diff --git a/features/org.eclipse.jst.enterprise_ui.feature/sourceTemplatePlugin/about.mappings b/features/org.eclipse.jst.enterprise_ui.feature/sourceTemplatePlugin/about.mappings
deleted file mode 100644
index 0dfb735..0000000
--- a/features/org.eclipse.jst.enterprise_ui.feature/sourceTemplatePlugin/about.mappings
+++ /dev/null
@@ -1,6 +0,0 @@
-# about.mappings
-# contains fill-ins for about.properties
-# java.io.Properties file (ISO 8859-1 with "\" escapes)
-# This file does not need to be translated.
-
-0=@build@
diff --git a/features/org.eclipse.jst.enterprise_ui.feature/sourceTemplatePlugin/about.properties b/features/org.eclipse.jst.enterprise_ui.feature/sourceTemplatePlugin/about.properties
deleted file mode 100644
index e00fafa..0000000
--- a/features/org.eclipse.jst.enterprise_ui.feature/sourceTemplatePlugin/about.properties
+++ /dev/null
@@ -1,26 +0,0 @@
-###############################################################################
-# Copyright (c) 2000, 2005 IBM Corporation and others.
-# All rights reserved. This program and the accompanying materials
-# are made available under the terms of the Eclipse Public License v1.0
-# which accompanies this distribution, and is available at
-# http://www.eclipse.org/legal/epl-v10.html
-#
-# Contributors:
-# IBM Corporation - initial API and implementation
-###############################################################################
-# about.properties
-# contains externalized strings for about.ini
-# java.io.Properties file (ISO 8859-1 with "\" escapes)
-# fill-ins are supplied by about.mappings
-# This file should be translated.
-#
-# Do not translate any values surrounded by {}
-
-blurb=J2EE Standard Tools - Enterprise UI\n\
-\n\
-Version: {featureVersion}\n\
-Build id: {0}\n\
-\n\
-(c) Copyright Eclipse contributors and others 2005. All rights reserved.\n\
-Visit http://www.eclipse.org/webtools
-
diff --git a/features/org.eclipse.jst.enterprise_ui.feature/sourceTemplatePlugin/build.properties b/features/org.eclipse.jst.enterprise_ui.feature/sourceTemplatePlugin/build.properties
deleted file mode 100644
index 30a575c..0000000
--- a/features/org.eclipse.jst.enterprise_ui.feature/sourceTemplatePlugin/build.properties
+++ /dev/null
@@ -1,3 +0,0 @@
-
-bin.includes = about.html, about.ini, about.mappings, about.properties, wtp_prod32.png, plugin.properties, plugin.xml, src/**, META-INF/
-sourcePlugin = true
diff --git a/features/org.eclipse.jst.enterprise_ui.feature/sourceTemplatePlugin/plugin.properties b/features/org.eclipse.jst.enterprise_ui.feature/sourceTemplatePlugin/plugin.properties
deleted file mode 100644
index d6209ea..0000000
--- a/features/org.eclipse.jst.enterprise_ui.feature/sourceTemplatePlugin/plugin.properties
+++ /dev/null
@@ -1,12 +0,0 @@
-###############################################################################
-# Copyright (c) 2005 IBM Corporation and others.
-# All rights reserved. This program and the accompanying materials
-# are made available under the terms of the Eclipse Public License v1.0
-# which accompanies this distribution, and is available at
-# http://www.eclipse.org/legal/epl-v10.html
-#
-# Contributors:
-# IBM Corporation - initial API and implementation
-###############################################################################
-pluginName=J2EE Standard Tools - Enterprise UI Source
-providerName=Eclipse.org
diff --git a/features/org.eclipse.jst.enterprise_ui.feature/sourceTemplatePlugin/wtp_prod32.gif b/features/org.eclipse.jst.enterprise_ui.feature/sourceTemplatePlugin/wtp_prod32.gif
deleted file mode 100644
index eefb44a..0000000
--- a/features/org.eclipse.jst.enterprise_ui.feature/sourceTemplatePlugin/wtp_prod32.gif
+++ /dev/null
Binary files differ
diff --git a/features/org.eclipse.jst.enterprise_ui.feature/sourceTemplatePlugin/wtp_prod32.png b/features/org.eclipse.jst.enterprise_ui.feature/sourceTemplatePlugin/wtp_prod32.png
deleted file mode 100644
index bfceab3..0000000
--- a/features/org.eclipse.jst.enterprise_ui.feature/sourceTemplatePlugin/wtp_prod32.png
+++ /dev/null
Binary files differ
diff --git a/features/org.eclipse.jst.enterprise_userdoc.feature/.cvsignore b/features/org.eclipse.jst.enterprise_userdoc.feature/.cvsignore
deleted file mode 100644
index 4b5f609..0000000
--- a/features/org.eclipse.jst.enterprise_userdoc.feature/.cvsignore
+++ /dev/null
@@ -1,2 +0,0 @@
-build.xml
-org.eclipse.jst.enterprise_userdoc.feature_1.0.0.jar
diff --git a/features/org.eclipse.jst.enterprise_userdoc.feature/.project b/features/org.eclipse.jst.enterprise_userdoc.feature/.project
deleted file mode 100644
index ffcfb55..0000000
--- a/features/org.eclipse.jst.enterprise_userdoc.feature/.project
+++ /dev/null
@@ -1,17 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<projectDescription>
- <name>org.eclipse.jst.enterprise_userdoc.feature</name>
- <comment></comment>
- <projects>
- </projects>
- <buildSpec>
- <buildCommand>
- <name>org.eclipse.pde.FeatureBuilder</name>
- <arguments>
- </arguments>
- </buildCommand>
- </buildSpec>
- <natures>
- <nature>org.eclipse.pde.FeatureNature</nature>
- </natures>
-</projectDescription>
diff --git a/features/org.eclipse.jst.enterprise_userdoc.feature/build.properties b/features/org.eclipse.jst.enterprise_userdoc.feature/build.properties
deleted file mode 100644
index 7f47694..0000000
--- a/features/org.eclipse.jst.enterprise_userdoc.feature/build.properties
+++ /dev/null
@@ -1,5 +0,0 @@
-bin.includes = feature.xml,\
- eclipse_update_120.jpg,\
- epl-v10.html,\
- license.html,\
- feature.properties
diff --git a/features/org.eclipse.jst.enterprise_userdoc.feature/eclipse_update_120.jpg b/features/org.eclipse.jst.enterprise_userdoc.feature/eclipse_update_120.jpg
deleted file mode 100644
index bfdf708..0000000
--- a/features/org.eclipse.jst.enterprise_userdoc.feature/eclipse_update_120.jpg
+++ /dev/null
Binary files differ
diff --git a/features/org.eclipse.jst.enterprise_userdoc.feature/epl-v10.html b/features/org.eclipse.jst.enterprise_userdoc.feature/epl-v10.html
deleted file mode 100644
index ed4b196..0000000
--- a/features/org.eclipse.jst.enterprise_userdoc.feature/epl-v10.html
+++ /dev/null
@@ -1,328 +0,0 @@
-<html xmlns:o="urn:schemas-microsoft-com:office:office"
-xmlns:w="urn:schemas-microsoft-com:office:word"
-xmlns="http://www.w3.org/TR/REC-html40">
-
-<head>
-<meta http-equiv=Content-Type content="text/html; charset=windows-1252">
-<meta name=ProgId content=Word.Document>
-<meta name=Generator content="Microsoft Word 9">
-<meta name=Originator content="Microsoft Word 9">
-<link rel=File-List
-href="./Eclipse%20EPL%202003_11_10%20Final_files/filelist.xml">
-<title>Eclipse Public License - Version 1.0</title>
-<!--[if gte mso 9]><xml>
- <o:DocumentProperties>
- <o:Revision>2</o:Revision>
- <o:TotalTime>3</o:TotalTime>
- <o:Created>2004-03-05T23:03:00Z</o:Created>
- <o:LastSaved>2004-03-05T23:03:00Z</o:LastSaved>
- <o:Pages>4</o:Pages>
- <o:Words>1626</o:Words>
- <o:Characters>9270</o:Characters>
- <o:Lines>77</o:Lines>
- <o:Paragraphs>18</o:Paragraphs>
- <o:CharactersWithSpaces>11384</o:CharactersWithSpaces>
- <o:Version>9.4402</o:Version>
- </o:DocumentProperties>
-</xml><![endif]--><!--[if gte mso 9]><xml>
- <w:WordDocument>
- <w:TrackRevisions/>
- </w:WordDocument>
-</xml><![endif]-->
-<style>
-<!--
- /* Font Definitions */
-@font-face
- {font-family:Tahoma;
- panose-1:2 11 6 4 3 5 4 4 2 4;
- mso-font-charset:0;
- mso-generic-font-family:swiss;
- mso-font-pitch:variable;
- mso-font-signature:553679495 -2147483648 8 0 66047 0;}
- /* Style Definitions */
-p.MsoNormal, li.MsoNormal, div.MsoNormal
- {mso-style-parent:"";
- margin:0in;
- margin-bottom:.0001pt;
- mso-pagination:widow-orphan;
- font-size:12.0pt;
- font-family:"Times New Roman";
- mso-fareast-font-family:"Times New Roman";}
-p
- {margin-right:0in;
- mso-margin-top-alt:auto;
- mso-margin-bottom-alt:auto;
- margin-left:0in;
- mso-pagination:widow-orphan;
- font-size:12.0pt;
- font-family:"Times New Roman";
- mso-fareast-font-family:"Times New Roman";}
-p.BalloonText, li.BalloonText, div.BalloonText
- {mso-style-name:"Balloon Text";
- margin:0in;
- margin-bottom:.0001pt;
- mso-pagination:widow-orphan;
- font-size:8.0pt;
- font-family:Tahoma;
- mso-fareast-font-family:"Times New Roman";}
-@page Section1
- {size:8.5in 11.0in;
- margin:1.0in 1.25in 1.0in 1.25in;
- mso-header-margin:.5in;
- mso-footer-margin:.5in;
- mso-paper-source:0;}
-div.Section1
- {page:Section1;}
--->
-</style>
-</head>
-
-<body lang=EN-US style='tab-interval:.5in'>
-
-<div class=Section1>
-
-<p align=center style='text-align:center'><b>Eclipse Public License - v 1.0</b>
-</p>
-
-<p><span style='font-size:10.0pt'>THE ACCOMPANYING PROGRAM IS PROVIDED UNDER
-THE TERMS OF THIS ECLIPSE PUBLIC LICENSE ("AGREEMENT"). ANY USE,
-REPRODUCTION OR DISTRIBUTION OF THE PROGRAM CONSTITUTES RECIPIENT'S ACCEPTANCE
-OF THIS AGREEMENT.</span> </p>
-
-<p><b><span style='font-size:10.0pt'>1. DEFINITIONS</span></b> </p>
-
-<p><span style='font-size:10.0pt'>"Contribution" means:</span> </p>
-
-<p class=MsoNormal style='margin-left:.5in'><span style='font-size:10.0pt'>a)
-in the case of the initial Contributor, the initial code and documentation
-distributed under this Agreement, and<br clear=left>
-b) in the case of each subsequent Contributor:</span></p>
-
-<p class=MsoNormal style='margin-left:.5in'><span style='font-size:10.0pt'>i)
-changes to the Program, and</span></p>
-
-<p class=MsoNormal style='margin-left:.5in'><span style='font-size:10.0pt'>ii)
-additions to the Program;</span></p>
-
-<p class=MsoNormal style='margin-left:.5in'><span style='font-size:10.0pt'>where
-such changes and/or additions to the Program originate from and are distributed
-by that particular Contributor. A Contribution 'originates' from a Contributor
-if it was added to the Program by such Contributor itself or anyone acting on
-such Contributor's behalf. Contributions do not include additions to the
-Program which: (i) are separate modules of software distributed in conjunction
-with the Program under their own license agreement, and (ii) are not derivative
-works of the Program. </span></p>
-
-<p><span style='font-size:10.0pt'>"Contributor" means any person or
-entity that distributes the Program.</span> </p>
-
-<p><span style='font-size:10.0pt'>"Licensed Patents " mean patent
-claims licensable by a Contributor which are necessarily infringed by the use
-or sale of its Contribution alone or when combined with the Program. </span></p>
-
-<p><span style='font-size:10.0pt'>"Program" means the Contributions
-distributed in accordance with this Agreement.</span> </p>
-
-<p><span style='font-size:10.0pt'>"Recipient" means anyone who
-receives the Program under this Agreement, including all Contributors.</span> </p>
-
-<p><b><span style='font-size:10.0pt'>2. GRANT OF RIGHTS</span></b> </p>
-
-<p class=MsoNormal style='margin-left:.5in'><span style='font-size:10.0pt'>a)
-Subject to the terms of this Agreement, each Contributor hereby grants Recipient
-a non-exclusive, worldwide, royalty-free copyright license to<span
-style='color:red'> </span>reproduce, prepare derivative works of, publicly
-display, publicly perform, distribute and sublicense the Contribution of such
-Contributor, if any, and such derivative works, in source code and object code
-form.</span></p>
-
-<p class=MsoNormal style='margin-left:.5in'><span style='font-size:10.0pt'>b)
-Subject to the terms of this Agreement, each Contributor hereby grants
-Recipient a non-exclusive, worldwide,<span style='color:green'> </span>royalty-free
-patent license under Licensed Patents to make, use, sell, offer to sell, import
-and otherwise transfer the Contribution of such Contributor, if any, in source
-code and object code form. This patent license shall apply to the combination
-of the Contribution and the Program if, at the time the Contribution is added
-by the Contributor, such addition of the Contribution causes such combination
-to be covered by the Licensed Patents. The patent license shall not apply to
-any other combinations which include the Contribution. No hardware per se is
-licensed hereunder. </span></p>
-
-<p class=MsoNormal style='margin-left:.5in'><span style='font-size:10.0pt'>c)
-Recipient understands that although each Contributor grants the licenses to its
-Contributions set forth herein, no assurances are provided by any Contributor
-that the Program does not infringe the patent or other intellectual property
-rights of any other entity. Each Contributor disclaims any liability to Recipient
-for claims brought by any other entity based on infringement of intellectual
-property rights or otherwise. As a condition to exercising the rights and
-licenses granted hereunder, each Recipient hereby assumes sole responsibility
-to secure any other intellectual property rights needed, if any. For example,
-if a third party patent license is required to allow Recipient to distribute
-the Program, it is Recipient's responsibility to acquire that license before
-distributing the Program.</span></p>
-
-<p class=MsoNormal style='margin-left:.5in'><span style='font-size:10.0pt'>d)
-Each Contributor represents that to its knowledge it has sufficient copyright
-rights in its Contribution, if any, to grant the copyright license set forth in
-this Agreement. </span></p>
-
-<p><b><span style='font-size:10.0pt'>3. REQUIREMENTS</span></b> </p>
-
-<p><span style='font-size:10.0pt'>A Contributor may choose to distribute the
-Program in object code form under its own license agreement, provided that:</span>
-</p>
-
-<p class=MsoNormal style='margin-left:.5in'><span style='font-size:10.0pt'>a)
-it complies with the terms and conditions of this Agreement; and</span></p>
-
-<p class=MsoNormal style='margin-left:.5in'><span style='font-size:10.0pt'>b)
-its license agreement:</span></p>
-
-<p class=MsoNormal style='margin-left:.5in'><span style='font-size:10.0pt'>i)
-effectively disclaims on behalf of all Contributors all warranties and
-conditions, express and implied, including warranties or conditions of title
-and non-infringement, and implied warranties or conditions of merchantability
-and fitness for a particular purpose; </span></p>
-
-<p class=MsoNormal style='margin-left:.5in'><span style='font-size:10.0pt'>ii)
-effectively excludes on behalf of all Contributors all liability for damages,
-including direct, indirect, special, incidental and consequential damages, such
-as lost profits; </span></p>
-
-<p class=MsoNormal style='margin-left:.5in'><span style='font-size:10.0pt'>iii)
-states that any provisions which differ from this Agreement are offered by that
-Contributor alone and not by any other party; and</span></p>
-
-<p class=MsoNormal style='margin-left:.5in'><span style='font-size:10.0pt'>iv)
-states that source code for the Program is available from such Contributor, and
-informs licensees how to obtain it in a reasonable manner on or through a
-medium customarily used for software exchange.<span style='color:blue'> </span></span></p>
-
-<p><span style='font-size:10.0pt'>When the Program is made available in source
-code form:</span> </p>
-
-<p class=MsoNormal style='margin-left:.5in'><span style='font-size:10.0pt'>a)
-it must be made available under this Agreement; and </span></p>
-
-<p class=MsoNormal style='margin-left:.5in'><span style='font-size:10.0pt'>b) a
-copy of this Agreement must be included with each copy of the Program. </span></p>
-
-<p><span style='font-size:10.0pt'>Contributors may not remove or alter any
-copyright notices contained within the Program. </span></p>
-
-<p><span style='font-size:10.0pt'>Each Contributor must identify itself as the
-originator of its Contribution, if any, in a manner that reasonably allows
-subsequent Recipients to identify the originator of the Contribution. </span></p>
-
-<p><b><span style='font-size:10.0pt'>4. COMMERCIAL DISTRIBUTION</span></b> </p>
-
-<p><span style='font-size:10.0pt'>Commercial distributors of software may
-accept certain responsibilities with respect to end users, business partners
-and the like. While this license is intended to facilitate the commercial use
-of the Program, the Contributor who includes the Program in a commercial
-product offering should do so in a manner which does not create potential
-liability for other Contributors. Therefore, if a Contributor includes the
-Program in a commercial product offering, such Contributor ("Commercial
-Contributor") hereby agrees to defend and indemnify every other
-Contributor ("Indemnified Contributor") against any losses, damages and
-costs (collectively "Losses") arising from claims, lawsuits and other
-legal actions brought by a third party against the Indemnified Contributor to
-the extent caused by the acts or omissions of such Commercial Contributor in
-connection with its distribution of the Program in a commercial product
-offering. The obligations in this section do not apply to any claims or Losses
-relating to any actual or alleged intellectual property infringement. In order
-to qualify, an Indemnified Contributor must: a) promptly notify the Commercial
-Contributor in writing of such claim, and b) allow the Commercial Contributor
-to control, and cooperate with the Commercial Contributor in, the defense and
-any related settlement negotiations. The Indemnified Contributor may participate
-in any such claim at its own expense.</span> </p>
-
-<p><span style='font-size:10.0pt'>For example, a Contributor might include the
-Program in a commercial product offering, Product X. That Contributor is then a
-Commercial Contributor. If that Commercial Contributor then makes performance
-claims, or offers warranties related to Product X, those performance claims and
-warranties are such Commercial Contributor's responsibility alone. Under this
-section, the Commercial Contributor would have to defend claims against the
-other Contributors related to those performance claims and warranties, and if a
-court requires any other Contributor to pay any damages as a result, the
-Commercial Contributor must pay those damages.</span> </p>
-
-<p><b><span style='font-size:10.0pt'>5. NO WARRANTY</span></b> </p>
-
-<p><span style='font-size:10.0pt'>EXCEPT AS EXPRESSLY SET FORTH IN THIS
-AGREEMENT, THE PROGRAM IS PROVIDED ON AN "AS IS" BASIS, WITHOUT
-WARRANTIES OR CONDITIONS OF ANY KIND, EITHER EXPRESS OR IMPLIED INCLUDING,
-WITHOUT LIMITATION, ANY WARRANTIES OR CONDITIONS OF TITLE, NON-INFRINGEMENT,
-MERCHANTABILITY OR FITNESS FOR A PARTICULAR PURPOSE. Each Recipient is solely
-responsible for determining the appropriateness of using and distributing the
-Program and assumes all risks associated with its exercise of rights under this
-Agreement , including but not limited to the risks and costs of program errors,
-compliance with applicable laws, damage to or loss of data, programs or
-equipment, and unavailability or interruption of operations. </span></p>
-
-<p><b><span style='font-size:10.0pt'>6. DISCLAIMER OF LIABILITY</span></b> </p>
-
-<p><span style='font-size:10.0pt'>EXCEPT AS EXPRESSLY SET FORTH IN THIS
-AGREEMENT, NEITHER RECIPIENT NOR ANY CONTRIBUTORS SHALL HAVE ANY LIABILITY FOR
-ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES
-(INCLUDING WITHOUT LIMITATION LOST PROFITS), HOWEVER CAUSED AND ON ANY THEORY
-OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING
-NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OR DISTRIBUTION OF
-THE PROGRAM OR THE EXERCISE OF ANY RIGHTS GRANTED HEREUNDER, EVEN IF ADVISED OF
-THE POSSIBILITY OF SUCH DAMAGES.</span> </p>
-
-<p><b><span style='font-size:10.0pt'>7. GENERAL</span></b> </p>
-
-<p><span style='font-size:10.0pt'>If any provision of this Agreement is invalid
-or unenforceable under applicable law, it shall not affect the validity or
-enforceability of the remainder of the terms of this Agreement, and without
-further action by the parties hereto, such provision shall be reformed to the
-minimum extent necessary to make such provision valid and enforceable.</span> </p>
-
-<p><span style='font-size:10.0pt'>If Recipient institutes patent litigation
-against any entity (including a cross-claim or counterclaim in a lawsuit)
-alleging that the Program itself (excluding combinations of the Program with
-other software or hardware) infringes such Recipient's patent(s), then such
-Recipient's rights granted under Section 2(b) shall terminate as of the date
-such litigation is filed. </span></p>
-
-<p><span style='font-size:10.0pt'>All Recipient's rights under this Agreement
-shall terminate if it fails to comply with any of the material terms or
-conditions of this Agreement and does not cure such failure in a reasonable
-period of time after becoming aware of such noncompliance. If all Recipient's
-rights under this Agreement terminate, Recipient agrees to cease use and
-distribution of the Program as soon as reasonably practicable. However,
-Recipient's obligations under this Agreement and any licenses granted by
-Recipient relating to the Program shall continue and survive. </span></p>
-
-<p><span style='font-size:10.0pt'>Everyone is permitted to copy and distribute
-copies of this Agreement, but in order to avoid inconsistency the Agreement is
-copyrighted and may only be modified in the following manner. The Agreement
-Steward reserves the right to publish new versions (including revisions) of
-this Agreement from time to time. No one other than the Agreement Steward has
-the right to modify this Agreement. The Eclipse Foundation is the initial
-Agreement Steward. The Eclipse Foundation may assign the responsibility to
-serve as the Agreement Steward to a suitable separate entity. Each new version
-of the Agreement will be given a distinguishing version number. The Program
-(including Contributions) may always be distributed subject to the version of
-the Agreement under which it was received. In addition, after a new version of
-the Agreement is published, Contributor may elect to distribute the Program
-(including its Contributions) under the new version. Except as expressly stated
-in Sections 2(a) and 2(b) above, Recipient receives no rights or licenses to
-the intellectual property of any Contributor under this Agreement, whether
-expressly, by implication, estoppel or otherwise. All rights in the Program not
-expressly granted under this Agreement are reserved.</span> </p>
-
-<p><span style='font-size:10.0pt'>This Agreement is governed by the laws of the
-State of New York and the intellectual property laws of the United States of
-America. No party to this Agreement will bring a legal action under this
-Agreement more than one year after the cause of action arose. Each party waives
-its rights to a jury trial in any resulting litigation.</span> </p>
-
-<p class=MsoNormal><![if !supportEmptyParas]> <![endif]><o:p></o:p></p>
-
-</div>
-
-</body>
-
-</html>
\ No newline at end of file
diff --git a/features/org.eclipse.jst.enterprise_userdoc.feature/feature.properties b/features/org.eclipse.jst.enterprise_userdoc.feature/feature.properties
deleted file mode 100644
index 81e5bd1..0000000
--- a/features/org.eclipse.jst.enterprise_userdoc.feature/feature.properties
+++ /dev/null
@@ -1,168 +0,0 @@
-###############################################################################
-# Copyright (c) 2006 IBM Corporation and others.
-# All rights reserved. This program and the accompanying materials
-# are made available under the terms of the Eclipse Public License v1.0
-# which accompanies this distribution, and is available at
-# http://www.eclipse.org/legal/epl-v10.html
-#
-# Contributors:
-# IBM Corporation - initial API and implementation
-###############################################################################
-# feature.properties
-# contains externalized strings for feature.xml
-# "%foo" in feature.xml corresponds to the key "foo" in this file
-# java.io.Properties file (ISO 8859-1 with "\" escapes)
-# This file should be translated.
-
-# "featureName" property - name of the feature
-featureName=JST Enterprise User Documentation
-
-# "providerName" property - name of the company that provides the feature
-providerName=Eclipse Web Tools Platform
-
-
-# "description" property - description of the feature
-description=JST enterprise user documentation
-
-# "copyright" property - text of the "Feature Update Copyright"
-copyright=\
-Copyright (c) 2006 IBM Corporation and others.\n\
-All rights reserved. This program and the accompanying materials\n\
-are made available under the terms of the Eclipse Public License v1.0\n\
-which accompanies this distribution, and is available at\n\
-http://www.eclipse.org/legal/epl-v10.html\n\
-\n\
-Contributors:\n\
- IBM Corporation - initial API and implementation\n
-################ end of copyright property ####################################
-
-# "licenseURL" property - URL of the "Feature License"
-# do not translate value - just change to point to a locale-specific HTML page
-licenseURL=license.html
-
-# "license" property - text of the "Feature Update License"
-# should be plain text version of license agreement pointed to be "licenseURL"
-license=\
-Eclipse Foundation Software User Agreement\n\
-April 14, 2010\n\
-\n\
-Usage Of Content\n\
-\n\
-THE ECLIPSE FOUNDATION MAKES AVAILABLE SOFTWARE, DOCUMENTATION, INFORMATION AND/OR\n\
-OTHER MATERIALS FOR OPEN SOURCE PROJECTS (COLLECTIVELY "CONTENT").\n\
-USE OF THE CONTENT IS GOVERNED BY THE TERMS AND CONDITIONS OF THIS\n\
-AGREEMENT AND/OR THE TERMS AND CONDITIONS OF LICENSE AGREEMENTS OR\n\
-NOTICES INDICATED OR REFERENCED BELOW. BY USING THE CONTENT, YOU\n\
-AGREE THAT YOUR USE OF THE CONTENT IS GOVERNED BY THIS AGREEMENT\n\
-AND/OR THE TERMS AND CONDITIONS OF ANY APPLICABLE LICENSE AGREEMENTS\n\
-OR NOTICES INDICATED OR REFERENCED BELOW. IF YOU DO NOT AGREE TO THE\n\
-TERMS AND CONDITIONS OF THIS AGREEMENT AND THE TERMS AND CONDITIONS\n\
-OF ANY APPLICABLE LICENSE AGREEMENTS OR NOTICES INDICATED OR REFERENCED\n\
-BELOW, THEN YOU MAY NOT USE THE CONTENT.\n\
-\n\
-Applicable Licenses\n\
-\n\
-Unless otherwise indicated, all Content made available by the\n\
-Eclipse Foundation is provided to you under the terms and conditions of\n\
-the Eclipse Public License Version 1.0 ("EPL"). A copy of the EPL is\n\
-provided with this Content and is also available at http://www.eclipse.org/legal/epl-v10.html.\n\
-For purposes of the EPL, "Program" will mean the Content.\n\
-\n\
-Content includes, but is not limited to, source code, object code,\n\
-documentation and other files maintained in the Eclipse Foundation source code\n\
-repository ("Repository") in software modules ("Modules") and made available\n\
-as downloadable archives ("Downloads").\n\
-\n\
- - Content may be structured and packaged into modules to facilitate delivering,\n\
- extending, and upgrading the Content. Typical modules may include plug-ins ("Plug-ins"),\n\
- plug-in fragments ("Fragments"), and features ("Features").\n\
- - Each Plug-in or Fragment may be packaged as a sub-directory or JAR (Java(TM) ARchive)\n\
- in a directory named "plugins".\n\
- - A Feature is a bundle of one or more Plug-ins and/or Fragments and associated material.\n\
- Each Feature may be packaged as a sub-directory in a directory named "features".\n\
- Within a Feature, files named "feature.xml" may contain a list of the names and version\n\
- numbers of the Plug-ins and/or Fragments associated with that Feature.\n\
- - Features may also include other Features ("Included Features"). Within a Feature, files\n\
- named "feature.xml" may contain a list of the names and version numbers of Included Features.\n\
-\n\
-The terms and conditions governing Plug-ins and Fragments should be\n\
-contained in files named "about.html" ("Abouts"). The terms and\n\
-conditions governing Features and Included Features should be contained\n\
-in files named "license.html" ("Feature Licenses"). Abouts and Feature\n\
-Licenses may be located in any directory of a Download or Module\n\
-including, but not limited to the following locations:\n\
-\n\
- - The top-level (root) directory\n\
- - Plug-in and Fragment directories\n\
- - Inside Plug-ins and Fragments packaged as JARs\n\
- - Sub-directories of the directory named "src" of certain Plug-ins\n\
- - Feature directories\n\
-\n\
-Note: if a Feature made available by the Eclipse Foundation is installed using the\n\
-Provisioning Technology (as defined below), you must agree to a license ("Feature \n\
-Update License") during the installation process. If the Feature contains\n\
-Included Features, the Feature Update License should either provide you\n\
-with the terms and conditions governing the Included Features or inform\n\
-you where you can locate them. Feature Update Licenses may be found in\n\
-the "license" property of files named "feature.properties" found within a Feature.\n\
-Such Abouts, Feature Licenses, and Feature Update Licenses contain the\n\
-terms and conditions (or references to such terms and conditions) that\n\
-govern your use of the associated Content in that directory.\n\
-\n\
-THE ABOUTS, FEATURE LICENSES, AND FEATURE UPDATE LICENSES MAY REFER\n\
-TO THE EPL OR OTHER LICENSE AGREEMENTS, NOTICES OR TERMS AND CONDITIONS.\n\
-SOME OF THESE OTHER LICENSE AGREEMENTS MAY INCLUDE (BUT ARE NOT LIMITED TO):\n\
-\n\
- - Common Public License Version 1.0 (available at http://www.eclipse.org/legal/cpl-v10.html)\n\
- - Apache Software License 1.1 (available at http://www.apache.org/licenses/LICENSE)\n\
- - Apache Software License 2.0 (available at http://www.apache.org/licenses/LICENSE-2.0)\n\
- - Metro Link Public License 1.00 (available at http://www.opengroup.org/openmotif/supporters/metrolink/license.html)\n\
- - Mozilla Public License Version 1.1 (available at http://www.mozilla.org/MPL/MPL-1.1.html)\n\
-\n\
-IT IS YOUR OBLIGATION TO READ AND ACCEPT ALL SUCH TERMS AND CONDITIONS PRIOR\n\
-TO USE OF THE CONTENT. If no About, Feature License, or Feature Update License\n\
-is provided, please contact the Eclipse Foundation to determine what terms and conditions\n\
-govern that particular Content.\n\
-\n\
-\n\Use of Provisioning Technology\n\
-\n\
-The Eclipse Foundation makes available provisioning software, examples of which include,\n\
-but are not limited to, p2 and the Eclipse Update Manager ("Provisioning Technology") for\n\
-the purpose of allowing users to install software, documentation, information and/or\n\
-other materials (collectively "Installable Software"). This capability is provided with\n\
-the intent of allowing such users to install, extend and update Eclipse-based products.\n\
-Information about packaging Installable Software is available at\n\
-http://eclipse.org/equinox/p2/repository_packaging.html ("Specification").\n\
-\n\
-You may use Provisioning Technology to allow other parties to install Installable Software.\n\
-You shall be responsible for enabling the applicable license agreements relating to the\n\
-Installable Software to be presented to, and accepted by, the users of the Provisioning Technology\n\
-in accordance with the Specification. By using Provisioning Technology in such a manner and\n\
-making it available in accordance with the Specification, you further acknowledge your\n\
-agreement to, and the acquisition of all necessary rights to permit the following:\n\
-\n\
- 1. A series of actions may occur ("Provisioning Process") in which a user may execute\n\
- the Provisioning Technology on a machine ("Target Machine") with the intent of installing,\n\
- extending or updating the functionality of an Eclipse-based product.\n\
- 2. During the Provisioning Process, the Provisioning Technology may cause third party\n\
- Installable Software or a portion thereof to be accessed and copied to the Target Machine.\n\
- 3. Pursuant to the Specification, you will provide to the user the terms and conditions that\n\
- govern the use of the Installable Software ("Installable Software Agreement") and such\n\
- Installable Software Agreement shall be accessed from the Target Machine in accordance\n\
- with the Specification. Such Installable Software Agreement must inform the user of the\n\
- terms and conditions that govern the Installable Software and must solicit acceptance by\n\
- the end user in the manner prescribed in such Installable Software Agreement. Upon such\n\
- indication of agreement by the user, the provisioning Technology will complete installation\n\
- of the Installable Software.\n\
-\n\
-Cryptography\n\
-\n\
-Content may contain encryption software. The country in which you are\n\
-currently may have restrictions on the import, possession, and use,\n\
-and/or re-export to another country, of encryption software. BEFORE\n\
-using any encryption software, please check the country's laws,\n\
-regulations and policies concerning the import, possession, or use, and\n\
-re-export of encryption software, to see if this is permitted.\n\
-\n\
-Java and all Java-based trademarks are trademarks of Oracle Corporation in the United States, other countries, or both.\n
-########### end of license property ##########################################
diff --git a/features/org.eclipse.jst.enterprise_userdoc.feature/feature.xml b/features/org.eclipse.jst.enterprise_userdoc.feature/feature.xml
deleted file mode 100644
index 40feac9..0000000
--- a/features/org.eclipse.jst.enterprise_userdoc.feature/feature.xml
+++ /dev/null
@@ -1,56 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<feature
- id="org.eclipse.jst.enterprise_userdoc.feature"
- label="%featureName"
- version="3.2.100.qualifier"
- provider-name="%providerName">
-
- <description>
- %description
- </description>
-
- <copyright>
- %copyright
- </copyright>
-
- <license url="license.html">
- %license
- </license>
-
-
- <plugin
- id="org.eclipse.jst.ejb.doc.user"
- download-size="0"
- install-size="0"
- version="0.0.0"
- unpack="false"/>
-
- <plugin
- id="org.eclipse.jst.j2ee.doc.user"
- download-size="0"
- install-size="0"
- version="0.0.0"
- unpack="false"/>
-
- <plugin
- id="org.eclipse.jst.ws.axis.ui.doc.user"
- download-size="0"
- install-size="0"
- version="0.0.0"
- unpack="false"/>
-
- <plugin
- id="org.eclipse.jst.ws.consumption.ui.doc.user"
- download-size="0"
- install-size="0"
- version="0.0.0"
- unpack="false"/>
-
- <plugin
- id="org.eclipse.jst.ws.doc.user"
- download-size="0"
- install-size="0"
- version="0.0.0"
- unpack="false"/>
-
-</feature>
diff --git a/features/org.eclipse.jst.enterprise_userdoc.feature/license.html b/features/org.eclipse.jst.enterprise_userdoc.feature/license.html
deleted file mode 100644
index c184ca3..0000000
--- a/features/org.eclipse.jst.enterprise_userdoc.feature/license.html
+++ /dev/null
@@ -1,107 +0,0 @@
-<?xml version="1.0" encoding="ISO-8859-1" ?>
-<!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.0 Strict//EN" "http://www.w3.org/TR/xhtml1/DTD/xhtml1-strict.dtd">
-<html xmlns="http://www.w3.org/1999/xhtml">
-<head>
-<meta http-equiv="Content-Type" content="text/html; charset=ISO-8859-1" />
-<title>Eclipse Foundation Software User Agreement</title>
-</head>
-
-<body lang="EN-US">
-<h2>Eclipse Foundation Software User Agreement</h2>
-<p>April 14, 2010</p>
-
-<h3>Usage Of Content</h3>
-
-<p>THE ECLIPSE FOUNDATION MAKES AVAILABLE SOFTWARE, DOCUMENTATION, INFORMATION AND/OR OTHER MATERIALS FOR OPEN SOURCE PROJECTS
- (COLLECTIVELY "CONTENT"). USE OF THE CONTENT IS GOVERNED BY THE TERMS AND CONDITIONS OF THIS AGREEMENT AND/OR THE TERMS AND
- CONDITIONS OF LICENSE AGREEMENTS OR NOTICES INDICATED OR REFERENCED BELOW. BY USING THE CONTENT, YOU AGREE THAT YOUR USE
- OF THE CONTENT IS GOVERNED BY THIS AGREEMENT AND/OR THE TERMS AND CONDITIONS OF ANY APPLICABLE LICENSE AGREEMENTS OR
- NOTICES INDICATED OR REFERENCED BELOW. IF YOU DO NOT AGREE TO THE TERMS AND CONDITIONS OF THIS AGREEMENT AND THE TERMS AND
- CONDITIONS OF ANY APPLICABLE LICENSE AGREEMENTS OR NOTICES INDICATED OR REFERENCED BELOW, THEN YOU MAY NOT USE THE CONTENT.</p>
-
-<h3>Applicable Licenses</h3>
-
-<p>Unless otherwise indicated, all Content made available by the Eclipse Foundation is provided to you under the terms and conditions of the Eclipse Public License Version 1.0
- ("EPL"). A copy of the EPL is provided with this Content and is also available at <a href="http://www.eclipse.org/legal/epl-v10.html">http://www.eclipse.org/legal/epl-v10.html</a>.
- For purposes of the EPL, "Program" will mean the Content.</p>
-
-<p>Content includes, but is not limited to, source code, object code, documentation and other files maintained in the Eclipse Foundation source code
- repository ("Repository") in software modules ("Modules") and made available as downloadable archives ("Downloads").</p>
-
-<ul>
- <li>Content may be structured and packaged into modules to facilitate delivering, extending, and upgrading the Content. Typical modules may include plug-ins ("Plug-ins"), plug-in fragments ("Fragments"), and features ("Features").</li>
- <li>Each Plug-in or Fragment may be packaged as a sub-directory or JAR (Java™ ARchive) in a directory named "plugins".</li>
- <li>A Feature is a bundle of one or more Plug-ins and/or Fragments and associated material. Each Feature may be packaged as a sub-directory in a directory named "features". Within a Feature, files named "feature.xml" may contain a list of the names and version numbers of the Plug-ins
- and/or Fragments associated with that Feature.</li>
- <li>Features may also include other Features ("Included Features"). Within a Feature, files named "feature.xml" may contain a list of the names and version numbers of Included Features.</li>
-</ul>
-
-<p>The terms and conditions governing Plug-ins and Fragments should be contained in files named "about.html" ("Abouts"). The terms and conditions governing Features and
-Included Features should be contained in files named "license.html" ("Feature Licenses"). Abouts and Feature Licenses may be located in any directory of a Download or Module
-including, but not limited to the following locations:</p>
-
-<ul>
- <li>The top-level (root) directory</li>
- <li>Plug-in and Fragment directories</li>
- <li>Inside Plug-ins and Fragments packaged as JARs</li>
- <li>Sub-directories of the directory named "src" of certain Plug-ins</li>
- <li>Feature directories</li>
-</ul>
-
-<p>Note: if a Feature made available by the Eclipse Foundation is installed using the Provisioning Technology (as defined below), you must agree to a license ("Feature Update License") during the
-installation process. If the Feature contains Included Features, the Feature Update License should either provide you with the terms and conditions governing the Included Features or
-inform you where you can locate them. Feature Update Licenses may be found in the "license" property of files named "feature.properties" found within a Feature.
-Such Abouts, Feature Licenses, and Feature Update Licenses contain the terms and conditions (or references to such terms and conditions) that govern your use of the associated Content in
-that directory.</p>
-
-<p>THE ABOUTS, FEATURE LICENSES, AND FEATURE UPDATE LICENSES MAY REFER TO THE EPL OR OTHER LICENSE AGREEMENTS, NOTICES OR TERMS AND CONDITIONS. SOME OF THESE
-OTHER LICENSE AGREEMENTS MAY INCLUDE (BUT ARE NOT LIMITED TO):</p>
-
-<ul>
- <li>Common Public License Version 1.0 (available at <a href="http://www.eclipse.org/legal/cpl-v10.html">http://www.eclipse.org/legal/cpl-v10.html</a>)</li>
- <li>Apache Software License 1.1 (available at <a href="http://www.apache.org/licenses/LICENSE">http://www.apache.org/licenses/LICENSE</a>)</li>
- <li>Apache Software License 2.0 (available at <a href="http://www.apache.org/licenses/LICENSE-2.0">http://www.apache.org/licenses/LICENSE-2.0</a>)</li>
- <li>Metro Link Public License 1.00 (available at <a href="http://www.opengroup.org/openmotif/supporters/metrolink/license.html">http://www.opengroup.org/openmotif/supporters/metrolink/license.html</a>)</li>
- <li>Mozilla Public License Version 1.1 (available at <a href="http://www.mozilla.org/MPL/MPL-1.1.html">http://www.mozilla.org/MPL/MPL-1.1.html</a>)</li>
-</ul>
-
-<p>IT IS YOUR OBLIGATION TO READ AND ACCEPT ALL SUCH TERMS AND CONDITIONS PRIOR TO USE OF THE CONTENT. If no About, Feature License, or Feature Update License is provided, please
-contact the Eclipse Foundation to determine what terms and conditions govern that particular Content.</p>
-
-
-<h3>Use of Provisioning Technology</h3>
-
-<p>The Eclipse Foundation makes available provisioning software, examples of which include, but are not limited to, p2 and the Eclipse
- Update Manager ("Provisioning Technology") for the purpose of allowing users to install software, documentation, information and/or
- other materials (collectively "Installable Software"). This capability is provided with the intent of allowing such users to
- install, extend and update Eclipse-based products. Information about packaging Installable Software is available at <a
- href="http://eclipse.org/equinox/p2/repository_packaging.html">http://eclipse.org/equinox/p2/repository_packaging.html</a>
- ("Specification").</p>
-
-<p>You may use Provisioning Technology to allow other parties to install Installable Software. You shall be responsible for enabling the
- applicable license agreements relating to the Installable Software to be presented to, and accepted by, the users of the Provisioning Technology
- in accordance with the Specification. By using Provisioning Technology in such a manner and making it available in accordance with the
- Specification, you further acknowledge your agreement to, and the acquisition of all necessary rights to permit the following:</p>
-
-<ol>
- <li>A series of actions may occur ("Provisioning Process") in which a user may execute the Provisioning Technology
- on a machine ("Target Machine") with the intent of installing, extending or updating the functionality of an Eclipse-based
- product.</li>
- <li>During the Provisioning Process, the Provisioning Technology may cause third party Installable Software or a portion thereof to be
- accessed and copied to the Target Machine.</li>
- <li>Pursuant to the Specification, you will provide to the user the terms and conditions that govern the use of the Installable
- Software ("Installable Software Agreement") and such Installable Software Agreement shall be accessed from the Target
- Machine in accordance with the Specification. Such Installable Software Agreement must inform the user of the terms and conditions that govern
- the Installable Software and must solicit acceptance by the end user in the manner prescribed in such Installable Software Agreement. Upon such
- indication of agreement by the user, the provisioning Technology will complete installation of the Installable Software.</li>
-</ol>
-
-<h3>Cryptography</h3>
-
-<p>Content may contain encryption software. The country in which you are currently may have restrictions on the import, possession, and use, and/or re-export to
- another country, of encryption software. BEFORE using any encryption software, please check the country's laws, regulations and policies concerning the import,
- possession, or use, and re-export of encryption software, to see if this is permitted.</p>
-
-<p><small>Java and all Java-based trademarks are trademarks of Oracle Corporation in the United States, other countries, or both.</small></p>
-</body>
-</html>
diff --git a/features/org.eclipse.jst.web_core.feature/.cvsignore b/features/org.eclipse.jst.web_core.feature/.cvsignore
deleted file mode 100644
index c14487c..0000000
--- a/features/org.eclipse.jst.web_core.feature/.cvsignore
+++ /dev/null
@@ -1 +0,0 @@
-build.xml
diff --git a/features/org.eclipse.jst.web_core.feature/.project b/features/org.eclipse.jst.web_core.feature/.project
deleted file mode 100644
index 5eac7ba..0000000
--- a/features/org.eclipse.jst.web_core.feature/.project
+++ /dev/null
@@ -1,17 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<projectDescription>
- <name>org.eclipse.jst.web_core.feature</name>
- <comment></comment>
- <projects>
- </projects>
- <buildSpec>
- <buildCommand>
- <name>org.eclipse.pde.FeatureBuilder</name>
- <arguments>
- </arguments>
- </buildCommand>
- </buildSpec>
- <natures>
- <nature>org.eclipse.pde.FeatureNature</nature>
- </natures>
-</projectDescription>
diff --git a/features/org.eclipse.jst.web_core.feature/build.properties b/features/org.eclipse.jst.web_core.feature/build.properties
deleted file mode 100644
index 7f47694..0000000
--- a/features/org.eclipse.jst.web_core.feature/build.properties
+++ /dev/null
@@ -1,5 +0,0 @@
-bin.includes = feature.xml,\
- eclipse_update_120.jpg,\
- epl-v10.html,\
- license.html,\
- feature.properties
diff --git a/features/org.eclipse.jst.web_core.feature/eclipse_update_120.jpg b/features/org.eclipse.jst.web_core.feature/eclipse_update_120.jpg
deleted file mode 100644
index bfdf708..0000000
--- a/features/org.eclipse.jst.web_core.feature/eclipse_update_120.jpg
+++ /dev/null
Binary files differ
diff --git a/features/org.eclipse.jst.web_core.feature/epl-v10.html b/features/org.eclipse.jst.web_core.feature/epl-v10.html
deleted file mode 100644
index ed4b196..0000000
--- a/features/org.eclipse.jst.web_core.feature/epl-v10.html
+++ /dev/null
@@ -1,328 +0,0 @@
-<html xmlns:o="urn:schemas-microsoft-com:office:office"
-xmlns:w="urn:schemas-microsoft-com:office:word"
-xmlns="http://www.w3.org/TR/REC-html40">
-
-<head>
-<meta http-equiv=Content-Type content="text/html; charset=windows-1252">
-<meta name=ProgId content=Word.Document>
-<meta name=Generator content="Microsoft Word 9">
-<meta name=Originator content="Microsoft Word 9">
-<link rel=File-List
-href="./Eclipse%20EPL%202003_11_10%20Final_files/filelist.xml">
-<title>Eclipse Public License - Version 1.0</title>
-<!--[if gte mso 9]><xml>
- <o:DocumentProperties>
- <o:Revision>2</o:Revision>
- <o:TotalTime>3</o:TotalTime>
- <o:Created>2004-03-05T23:03:00Z</o:Created>
- <o:LastSaved>2004-03-05T23:03:00Z</o:LastSaved>
- <o:Pages>4</o:Pages>
- <o:Words>1626</o:Words>
- <o:Characters>9270</o:Characters>
- <o:Lines>77</o:Lines>
- <o:Paragraphs>18</o:Paragraphs>
- <o:CharactersWithSpaces>11384</o:CharactersWithSpaces>
- <o:Version>9.4402</o:Version>
- </o:DocumentProperties>
-</xml><![endif]--><!--[if gte mso 9]><xml>
- <w:WordDocument>
- <w:TrackRevisions/>
- </w:WordDocument>
-</xml><![endif]-->
-<style>
-<!--
- /* Font Definitions */
-@font-face
- {font-family:Tahoma;
- panose-1:2 11 6 4 3 5 4 4 2 4;
- mso-font-charset:0;
- mso-generic-font-family:swiss;
- mso-font-pitch:variable;
- mso-font-signature:553679495 -2147483648 8 0 66047 0;}
- /* Style Definitions */
-p.MsoNormal, li.MsoNormal, div.MsoNormal
- {mso-style-parent:"";
- margin:0in;
- margin-bottom:.0001pt;
- mso-pagination:widow-orphan;
- font-size:12.0pt;
- font-family:"Times New Roman";
- mso-fareast-font-family:"Times New Roman";}
-p
- {margin-right:0in;
- mso-margin-top-alt:auto;
- mso-margin-bottom-alt:auto;
- margin-left:0in;
- mso-pagination:widow-orphan;
- font-size:12.0pt;
- font-family:"Times New Roman";
- mso-fareast-font-family:"Times New Roman";}
-p.BalloonText, li.BalloonText, div.BalloonText
- {mso-style-name:"Balloon Text";
- margin:0in;
- margin-bottom:.0001pt;
- mso-pagination:widow-orphan;
- font-size:8.0pt;
- font-family:Tahoma;
- mso-fareast-font-family:"Times New Roman";}
-@page Section1
- {size:8.5in 11.0in;
- margin:1.0in 1.25in 1.0in 1.25in;
- mso-header-margin:.5in;
- mso-footer-margin:.5in;
- mso-paper-source:0;}
-div.Section1
- {page:Section1;}
--->
-</style>
-</head>
-
-<body lang=EN-US style='tab-interval:.5in'>
-
-<div class=Section1>
-
-<p align=center style='text-align:center'><b>Eclipse Public License - v 1.0</b>
-</p>
-
-<p><span style='font-size:10.0pt'>THE ACCOMPANYING PROGRAM IS PROVIDED UNDER
-THE TERMS OF THIS ECLIPSE PUBLIC LICENSE ("AGREEMENT"). ANY USE,
-REPRODUCTION OR DISTRIBUTION OF THE PROGRAM CONSTITUTES RECIPIENT'S ACCEPTANCE
-OF THIS AGREEMENT.</span> </p>
-
-<p><b><span style='font-size:10.0pt'>1. DEFINITIONS</span></b> </p>
-
-<p><span style='font-size:10.0pt'>"Contribution" means:</span> </p>
-
-<p class=MsoNormal style='margin-left:.5in'><span style='font-size:10.0pt'>a)
-in the case of the initial Contributor, the initial code and documentation
-distributed under this Agreement, and<br clear=left>
-b) in the case of each subsequent Contributor:</span></p>
-
-<p class=MsoNormal style='margin-left:.5in'><span style='font-size:10.0pt'>i)
-changes to the Program, and</span></p>
-
-<p class=MsoNormal style='margin-left:.5in'><span style='font-size:10.0pt'>ii)
-additions to the Program;</span></p>
-
-<p class=MsoNormal style='margin-left:.5in'><span style='font-size:10.0pt'>where
-such changes and/or additions to the Program originate from and are distributed
-by that particular Contributor. A Contribution 'originates' from a Contributor
-if it was added to the Program by such Contributor itself or anyone acting on
-such Contributor's behalf. Contributions do not include additions to the
-Program which: (i) are separate modules of software distributed in conjunction
-with the Program under their own license agreement, and (ii) are not derivative
-works of the Program. </span></p>
-
-<p><span style='font-size:10.0pt'>"Contributor" means any person or
-entity that distributes the Program.</span> </p>
-
-<p><span style='font-size:10.0pt'>"Licensed Patents " mean patent
-claims licensable by a Contributor which are necessarily infringed by the use
-or sale of its Contribution alone or when combined with the Program. </span></p>
-
-<p><span style='font-size:10.0pt'>"Program" means the Contributions
-distributed in accordance with this Agreement.</span> </p>
-
-<p><span style='font-size:10.0pt'>"Recipient" means anyone who
-receives the Program under this Agreement, including all Contributors.</span> </p>
-
-<p><b><span style='font-size:10.0pt'>2. GRANT OF RIGHTS</span></b> </p>
-
-<p class=MsoNormal style='margin-left:.5in'><span style='font-size:10.0pt'>a)
-Subject to the terms of this Agreement, each Contributor hereby grants Recipient
-a non-exclusive, worldwide, royalty-free copyright license to<span
-style='color:red'> </span>reproduce, prepare derivative works of, publicly
-display, publicly perform, distribute and sublicense the Contribution of such
-Contributor, if any, and such derivative works, in source code and object code
-form.</span></p>
-
-<p class=MsoNormal style='margin-left:.5in'><span style='font-size:10.0pt'>b)
-Subject to the terms of this Agreement, each Contributor hereby grants
-Recipient a non-exclusive, worldwide,<span style='color:green'> </span>royalty-free
-patent license under Licensed Patents to make, use, sell, offer to sell, import
-and otherwise transfer the Contribution of such Contributor, if any, in source
-code and object code form. This patent license shall apply to the combination
-of the Contribution and the Program if, at the time the Contribution is added
-by the Contributor, such addition of the Contribution causes such combination
-to be covered by the Licensed Patents. The patent license shall not apply to
-any other combinations which include the Contribution. No hardware per se is
-licensed hereunder. </span></p>
-
-<p class=MsoNormal style='margin-left:.5in'><span style='font-size:10.0pt'>c)
-Recipient understands that although each Contributor grants the licenses to its
-Contributions set forth herein, no assurances are provided by any Contributor
-that the Program does not infringe the patent or other intellectual property
-rights of any other entity. Each Contributor disclaims any liability to Recipient
-for claims brought by any other entity based on infringement of intellectual
-property rights or otherwise. As a condition to exercising the rights and
-licenses granted hereunder, each Recipient hereby assumes sole responsibility
-to secure any other intellectual property rights needed, if any. For example,
-if a third party patent license is required to allow Recipient to distribute
-the Program, it is Recipient's responsibility to acquire that license before
-distributing the Program.</span></p>
-
-<p class=MsoNormal style='margin-left:.5in'><span style='font-size:10.0pt'>d)
-Each Contributor represents that to its knowledge it has sufficient copyright
-rights in its Contribution, if any, to grant the copyright license set forth in
-this Agreement. </span></p>
-
-<p><b><span style='font-size:10.0pt'>3. REQUIREMENTS</span></b> </p>
-
-<p><span style='font-size:10.0pt'>A Contributor may choose to distribute the
-Program in object code form under its own license agreement, provided that:</span>
-</p>
-
-<p class=MsoNormal style='margin-left:.5in'><span style='font-size:10.0pt'>a)
-it complies with the terms and conditions of this Agreement; and</span></p>
-
-<p class=MsoNormal style='margin-left:.5in'><span style='font-size:10.0pt'>b)
-its license agreement:</span></p>
-
-<p class=MsoNormal style='margin-left:.5in'><span style='font-size:10.0pt'>i)
-effectively disclaims on behalf of all Contributors all warranties and
-conditions, express and implied, including warranties or conditions of title
-and non-infringement, and implied warranties or conditions of merchantability
-and fitness for a particular purpose; </span></p>
-
-<p class=MsoNormal style='margin-left:.5in'><span style='font-size:10.0pt'>ii)
-effectively excludes on behalf of all Contributors all liability for damages,
-including direct, indirect, special, incidental and consequential damages, such
-as lost profits; </span></p>
-
-<p class=MsoNormal style='margin-left:.5in'><span style='font-size:10.0pt'>iii)
-states that any provisions which differ from this Agreement are offered by that
-Contributor alone and not by any other party; and</span></p>
-
-<p class=MsoNormal style='margin-left:.5in'><span style='font-size:10.0pt'>iv)
-states that source code for the Program is available from such Contributor, and
-informs licensees how to obtain it in a reasonable manner on or through a
-medium customarily used for software exchange.<span style='color:blue'> </span></span></p>
-
-<p><span style='font-size:10.0pt'>When the Program is made available in source
-code form:</span> </p>
-
-<p class=MsoNormal style='margin-left:.5in'><span style='font-size:10.0pt'>a)
-it must be made available under this Agreement; and </span></p>
-
-<p class=MsoNormal style='margin-left:.5in'><span style='font-size:10.0pt'>b) a
-copy of this Agreement must be included with each copy of the Program. </span></p>
-
-<p><span style='font-size:10.0pt'>Contributors may not remove or alter any
-copyright notices contained within the Program. </span></p>
-
-<p><span style='font-size:10.0pt'>Each Contributor must identify itself as the
-originator of its Contribution, if any, in a manner that reasonably allows
-subsequent Recipients to identify the originator of the Contribution. </span></p>
-
-<p><b><span style='font-size:10.0pt'>4. COMMERCIAL DISTRIBUTION</span></b> </p>
-
-<p><span style='font-size:10.0pt'>Commercial distributors of software may
-accept certain responsibilities with respect to end users, business partners
-and the like. While this license is intended to facilitate the commercial use
-of the Program, the Contributor who includes the Program in a commercial
-product offering should do so in a manner which does not create potential
-liability for other Contributors. Therefore, if a Contributor includes the
-Program in a commercial product offering, such Contributor ("Commercial
-Contributor") hereby agrees to defend and indemnify every other
-Contributor ("Indemnified Contributor") against any losses, damages and
-costs (collectively "Losses") arising from claims, lawsuits and other
-legal actions brought by a third party against the Indemnified Contributor to
-the extent caused by the acts or omissions of such Commercial Contributor in
-connection with its distribution of the Program in a commercial product
-offering. The obligations in this section do not apply to any claims or Losses
-relating to any actual or alleged intellectual property infringement. In order
-to qualify, an Indemnified Contributor must: a) promptly notify the Commercial
-Contributor in writing of such claim, and b) allow the Commercial Contributor
-to control, and cooperate with the Commercial Contributor in, the defense and
-any related settlement negotiations. The Indemnified Contributor may participate
-in any such claim at its own expense.</span> </p>
-
-<p><span style='font-size:10.0pt'>For example, a Contributor might include the
-Program in a commercial product offering, Product X. That Contributor is then a
-Commercial Contributor. If that Commercial Contributor then makes performance
-claims, or offers warranties related to Product X, those performance claims and
-warranties are such Commercial Contributor's responsibility alone. Under this
-section, the Commercial Contributor would have to defend claims against the
-other Contributors related to those performance claims and warranties, and if a
-court requires any other Contributor to pay any damages as a result, the
-Commercial Contributor must pay those damages.</span> </p>
-
-<p><b><span style='font-size:10.0pt'>5. NO WARRANTY</span></b> </p>
-
-<p><span style='font-size:10.0pt'>EXCEPT AS EXPRESSLY SET FORTH IN THIS
-AGREEMENT, THE PROGRAM IS PROVIDED ON AN "AS IS" BASIS, WITHOUT
-WARRANTIES OR CONDITIONS OF ANY KIND, EITHER EXPRESS OR IMPLIED INCLUDING,
-WITHOUT LIMITATION, ANY WARRANTIES OR CONDITIONS OF TITLE, NON-INFRINGEMENT,
-MERCHANTABILITY OR FITNESS FOR A PARTICULAR PURPOSE. Each Recipient is solely
-responsible for determining the appropriateness of using and distributing the
-Program and assumes all risks associated with its exercise of rights under this
-Agreement , including but not limited to the risks and costs of program errors,
-compliance with applicable laws, damage to or loss of data, programs or
-equipment, and unavailability or interruption of operations. </span></p>
-
-<p><b><span style='font-size:10.0pt'>6. DISCLAIMER OF LIABILITY</span></b> </p>
-
-<p><span style='font-size:10.0pt'>EXCEPT AS EXPRESSLY SET FORTH IN THIS
-AGREEMENT, NEITHER RECIPIENT NOR ANY CONTRIBUTORS SHALL HAVE ANY LIABILITY FOR
-ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES
-(INCLUDING WITHOUT LIMITATION LOST PROFITS), HOWEVER CAUSED AND ON ANY THEORY
-OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING
-NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OR DISTRIBUTION OF
-THE PROGRAM OR THE EXERCISE OF ANY RIGHTS GRANTED HEREUNDER, EVEN IF ADVISED OF
-THE POSSIBILITY OF SUCH DAMAGES.</span> </p>
-
-<p><b><span style='font-size:10.0pt'>7. GENERAL</span></b> </p>
-
-<p><span style='font-size:10.0pt'>If any provision of this Agreement is invalid
-or unenforceable under applicable law, it shall not affect the validity or
-enforceability of the remainder of the terms of this Agreement, and without
-further action by the parties hereto, such provision shall be reformed to the
-minimum extent necessary to make such provision valid and enforceable.</span> </p>
-
-<p><span style='font-size:10.0pt'>If Recipient institutes patent litigation
-against any entity (including a cross-claim or counterclaim in a lawsuit)
-alleging that the Program itself (excluding combinations of the Program with
-other software or hardware) infringes such Recipient's patent(s), then such
-Recipient's rights granted under Section 2(b) shall terminate as of the date
-such litigation is filed. </span></p>
-
-<p><span style='font-size:10.0pt'>All Recipient's rights under this Agreement
-shall terminate if it fails to comply with any of the material terms or
-conditions of this Agreement and does not cure such failure in a reasonable
-period of time after becoming aware of such noncompliance. If all Recipient's
-rights under this Agreement terminate, Recipient agrees to cease use and
-distribution of the Program as soon as reasonably practicable. However,
-Recipient's obligations under this Agreement and any licenses granted by
-Recipient relating to the Program shall continue and survive. </span></p>
-
-<p><span style='font-size:10.0pt'>Everyone is permitted to copy and distribute
-copies of this Agreement, but in order to avoid inconsistency the Agreement is
-copyrighted and may only be modified in the following manner. The Agreement
-Steward reserves the right to publish new versions (including revisions) of
-this Agreement from time to time. No one other than the Agreement Steward has
-the right to modify this Agreement. The Eclipse Foundation is the initial
-Agreement Steward. The Eclipse Foundation may assign the responsibility to
-serve as the Agreement Steward to a suitable separate entity. Each new version
-of the Agreement will be given a distinguishing version number. The Program
-(including Contributions) may always be distributed subject to the version of
-the Agreement under which it was received. In addition, after a new version of
-the Agreement is published, Contributor may elect to distribute the Program
-(including its Contributions) under the new version. Except as expressly stated
-in Sections 2(a) and 2(b) above, Recipient receives no rights or licenses to
-the intellectual property of any Contributor under this Agreement, whether
-expressly, by implication, estoppel or otherwise. All rights in the Program not
-expressly granted under this Agreement are reserved.</span> </p>
-
-<p><span style='font-size:10.0pt'>This Agreement is governed by the laws of the
-State of New York and the intellectual property laws of the United States of
-America. No party to this Agreement will bring a legal action under this
-Agreement more than one year after the cause of action arose. Each party waives
-its rights to a jury trial in any resulting litigation.</span> </p>
-
-<p class=MsoNormal><![if !supportEmptyParas]> <![endif]><o:p></o:p></p>
-
-</div>
-
-</body>
-
-</html>
\ No newline at end of file
diff --git a/features/org.eclipse.jst.web_core.feature/feature.properties b/features/org.eclipse.jst.web_core.feature/feature.properties
deleted file mode 100644
index c4ed750..0000000
--- a/features/org.eclipse.jst.web_core.feature/feature.properties
+++ /dev/null
@@ -1,168 +0,0 @@
-###############################################################################
-# Copyright (c) 2006 IBM Corporation and others.
-# All rights reserved. This program and the accompanying materials
-# are made available under the terms of the Eclipse Public License v1.0
-# which accompanies this distribution, and is available at
-# http://www.eclipse.org/legal/epl-v10.html
-#
-# Contributors:
-# IBM Corporation - initial API and implementation
-###############################################################################
-# feature.properties
-# contains externalized strings for feature.xml
-# "%foo" in feature.xml corresponds to the key "foo" in this file
-# java.io.Properties file (ISO 8859-1 with "\" escapes)
-# This file should be translated.
-
-# "featureName" property - name of the feature
-featureName=JST Web Core
-
-# "providerName" property - name of the company that provides the feature
-providerName=Eclipse Web Tools Platform
-
-
-# "description" property - description of the feature
-description=JST Web core functionality.
-
-# "copyright" property - text of the "Feature Update Copyright"
-copyright=\
-Copyright (c) 2006 IBM Corporation and others.\n\
-All rights reserved. This program and the accompanying materials\n\
-are made available under the terms of the Eclipse Public License v1.0\n\
-which accompanies this distribution, and is available at\n\
-http://www.eclipse.org/legal/epl-v10.html\n\
-\n\
-Contributors:\n\
- IBM Corporation - initial API and implementation\n
-################ end of copyright property ####################################
-
-# "licenseURL" property - URL of the "Feature License"
-# do not translate value - just change to point to a locale-specific HTML page
-licenseURL=license.html
-
-# "license" property - text of the "Feature Update License"
-# should be plain text version of license agreement pointed to be "licenseURL"
-license=\
-Eclipse Foundation Software User Agreement\n\
-April 14, 2010\n\
-\n\
-Usage Of Content\n\
-\n\
-THE ECLIPSE FOUNDATION MAKES AVAILABLE SOFTWARE, DOCUMENTATION, INFORMATION AND/OR\n\
-OTHER MATERIALS FOR OPEN SOURCE PROJECTS (COLLECTIVELY "CONTENT").\n\
-USE OF THE CONTENT IS GOVERNED BY THE TERMS AND CONDITIONS OF THIS\n\
-AGREEMENT AND/OR THE TERMS AND CONDITIONS OF LICENSE AGREEMENTS OR\n\
-NOTICES INDICATED OR REFERENCED BELOW. BY USING THE CONTENT, YOU\n\
-AGREE THAT YOUR USE OF THE CONTENT IS GOVERNED BY THIS AGREEMENT\n\
-AND/OR THE TERMS AND CONDITIONS OF ANY APPLICABLE LICENSE AGREEMENTS\n\
-OR NOTICES INDICATED OR REFERENCED BELOW. IF YOU DO NOT AGREE TO THE\n\
-TERMS AND CONDITIONS OF THIS AGREEMENT AND THE TERMS AND CONDITIONS\n\
-OF ANY APPLICABLE LICENSE AGREEMENTS OR NOTICES INDICATED OR REFERENCED\n\
-BELOW, THEN YOU MAY NOT USE THE CONTENT.\n\
-\n\
-Applicable Licenses\n\
-\n\
-Unless otherwise indicated, all Content made available by the\n\
-Eclipse Foundation is provided to you under the terms and conditions of\n\
-the Eclipse Public License Version 1.0 ("EPL"). A copy of the EPL is\n\
-provided with this Content and is also available at http://www.eclipse.org/legal/epl-v10.html.\n\
-For purposes of the EPL, "Program" will mean the Content.\n\
-\n\
-Content includes, but is not limited to, source code, object code,\n\
-documentation and other files maintained in the Eclipse Foundation source code\n\
-repository ("Repository") in software modules ("Modules") and made available\n\
-as downloadable archives ("Downloads").\n\
-\n\
- - Content may be structured and packaged into modules to facilitate delivering,\n\
- extending, and upgrading the Content. Typical modules may include plug-ins ("Plug-ins"),\n\
- plug-in fragments ("Fragments"), and features ("Features").\n\
- - Each Plug-in or Fragment may be packaged as a sub-directory or JAR (Java(TM) ARchive)\n\
- in a directory named "plugins".\n\
- - A Feature is a bundle of one or more Plug-ins and/or Fragments and associated material.\n\
- Each Feature may be packaged as a sub-directory in a directory named "features".\n\
- Within a Feature, files named "feature.xml" may contain a list of the names and version\n\
- numbers of the Plug-ins and/or Fragments associated with that Feature.\n\
- - Features may also include other Features ("Included Features"). Within a Feature, files\n\
- named "feature.xml" may contain a list of the names and version numbers of Included Features.\n\
-\n\
-The terms and conditions governing Plug-ins and Fragments should be\n\
-contained in files named "about.html" ("Abouts"). The terms and\n\
-conditions governing Features and Included Features should be contained\n\
-in files named "license.html" ("Feature Licenses"). Abouts and Feature\n\
-Licenses may be located in any directory of a Download or Module\n\
-including, but not limited to the following locations:\n\
-\n\
- - The top-level (root) directory\n\
- - Plug-in and Fragment directories\n\
- - Inside Plug-ins and Fragments packaged as JARs\n\
- - Sub-directories of the directory named "src" of certain Plug-ins\n\
- - Feature directories\n\
-\n\
-Note: if a Feature made available by the Eclipse Foundation is installed using the\n\
-Provisioning Technology (as defined below), you must agree to a license ("Feature \n\
-Update License") during the installation process. If the Feature contains\n\
-Included Features, the Feature Update License should either provide you\n\
-with the terms and conditions governing the Included Features or inform\n\
-you where you can locate them. Feature Update Licenses may be found in\n\
-the "license" property of files named "feature.properties" found within a Feature.\n\
-Such Abouts, Feature Licenses, and Feature Update Licenses contain the\n\
-terms and conditions (or references to such terms and conditions) that\n\
-govern your use of the associated Content in that directory.\n\
-\n\
-THE ABOUTS, FEATURE LICENSES, AND FEATURE UPDATE LICENSES MAY REFER\n\
-TO THE EPL OR OTHER LICENSE AGREEMENTS, NOTICES OR TERMS AND CONDITIONS.\n\
-SOME OF THESE OTHER LICENSE AGREEMENTS MAY INCLUDE (BUT ARE NOT LIMITED TO):\n\
-\n\
- - Common Public License Version 1.0 (available at http://www.eclipse.org/legal/cpl-v10.html)\n\
- - Apache Software License 1.1 (available at http://www.apache.org/licenses/LICENSE)\n\
- - Apache Software License 2.0 (available at http://www.apache.org/licenses/LICENSE-2.0)\n\
- - Metro Link Public License 1.00 (available at http://www.opengroup.org/openmotif/supporters/metrolink/license.html)\n\
- - Mozilla Public License Version 1.1 (available at http://www.mozilla.org/MPL/MPL-1.1.html)\n\
-\n\
-IT IS YOUR OBLIGATION TO READ AND ACCEPT ALL SUCH TERMS AND CONDITIONS PRIOR\n\
-TO USE OF THE CONTENT. If no About, Feature License, or Feature Update License\n\
-is provided, please contact the Eclipse Foundation to determine what terms and conditions\n\
-govern that particular Content.\n\
-\n\
-\n\Use of Provisioning Technology\n\
-\n\
-The Eclipse Foundation makes available provisioning software, examples of which include,\n\
-but are not limited to, p2 and the Eclipse Update Manager ("Provisioning Technology") for\n\
-the purpose of allowing users to install software, documentation, information and/or\n\
-other materials (collectively "Installable Software"). This capability is provided with\n\
-the intent of allowing such users to install, extend and update Eclipse-based products.\n\
-Information about packaging Installable Software is available at\n\
-http://eclipse.org/equinox/p2/repository_packaging.html ("Specification").\n\
-\n\
-You may use Provisioning Technology to allow other parties to install Installable Software.\n\
-You shall be responsible for enabling the applicable license agreements relating to the\n\
-Installable Software to be presented to, and accepted by, the users of the Provisioning Technology\n\
-in accordance with the Specification. By using Provisioning Technology in such a manner and\n\
-making it available in accordance with the Specification, you further acknowledge your\n\
-agreement to, and the acquisition of all necessary rights to permit the following:\n\
-\n\
- 1. A series of actions may occur ("Provisioning Process") in which a user may execute\n\
- the Provisioning Technology on a machine ("Target Machine") with the intent of installing,\n\
- extending or updating the functionality of an Eclipse-based product.\n\
- 2. During the Provisioning Process, the Provisioning Technology may cause third party\n\
- Installable Software or a portion thereof to be accessed and copied to the Target Machine.\n\
- 3. Pursuant to the Specification, you will provide to the user the terms and conditions that\n\
- govern the use of the Installable Software ("Installable Software Agreement") and such\n\
- Installable Software Agreement shall be accessed from the Target Machine in accordance\n\
- with the Specification. Such Installable Software Agreement must inform the user of the\n\
- terms and conditions that govern the Installable Software and must solicit acceptance by\n\
- the end user in the manner prescribed in such Installable Software Agreement. Upon such\n\
- indication of agreement by the user, the provisioning Technology will complete installation\n\
- of the Installable Software.\n\
-\n\
-Cryptography\n\
-\n\
-Content may contain encryption software. The country in which you are\n\
-currently may have restrictions on the import, possession, and use,\n\
-and/or re-export to another country, of encryption software. BEFORE\n\
-using any encryption software, please check the country's laws,\n\
-regulations and policies concerning the import, possession, or use, and\n\
-re-export of encryption software, to see if this is permitted.\n\
-\n\
-Java and all Java-based trademarks are trademarks of Oracle Corporation in the United States, other countries, or both.\n
-########### end of license property ##########################################
diff --git a/features/org.eclipse.jst.web_core.feature/feature.xml b/features/org.eclipse.jst.web_core.feature/feature.xml
deleted file mode 100644
index 049cfe1..0000000
--- a/features/org.eclipse.jst.web_core.feature/feature.xml
+++ /dev/null
@@ -1,136 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<feature
- id="org.eclipse.jst.web_core.feature"
- label="%featureName"
- version="3.2.3.qualifier"
- provider-name="%providerName">
-
- <description>
- %description
- </description>
-
- <copyright>
- %copyright
- </copyright>
-
- <license url="%licenseURL">
- %license
- </license>
-
- <includes
- id="org.eclipse.wst.ws_core.feature"
- version="0.0.0"/>
-
- <plugin
- id="org.eclipse.jem"
- download-size="0"
- install-size="0"
- version="0.0.0"
- unpack="false"/>
-
- <plugin
- id="org.eclipse.jem.beaninfo.vm.common"
- download-size="0"
- install-size="0"
- version="0.0.0"
- unpack="false"/>
-
- <plugin
- id="org.eclipse.jem.beaninfo.vm"
- download-size="0"
- install-size="0"
- version="0.0.0"
- unpack="false"/>
-
- <plugin
- id="org.eclipse.jem.beaninfo"
- download-size="0"
- install-size="0"
- version="0.0.0"
- unpack="false"/>
-
- <plugin
- id="org.eclipse.jem.proxy"
- download-size="0"
- install-size="0"
- version="0.0.0"
- unpack="false"/>
-
- <plugin
- id="org.eclipse.jem.workbench"
- download-size="0"
- install-size="0"
- version="0.0.0"
- unpack="false"/>
-
- <plugin
- id="org.eclipse.jst.common.annotations.core"
- download-size="0"
- install-size="0"
- version="0.0.0"
- unpack="false"/>
-
- <plugin
- id="org.eclipse.jst.common.annotations.controller"
- download-size="0"
- install-size="0"
- version="0.0.0"
- unpack="false"/>
-
- <plugin
- id="org.eclipse.jst.common.frameworks"
- download-size="0"
- install-size="0"
- version="0.0.0"
- unpack="false"/>
-
- <plugin
- id="org.eclipse.jst.j2ee.web"
- download-size="0"
- install-size="0"
- version="0.0.0"
- unpack="false"/>
-
- <plugin
- id="org.eclipse.jst.jsp.core"
- download-size="0"
- install-size="0"
- version="0.0.0"
- unpack="false"/>
-
- <plugin
- id="org.eclipse.jst.j2ee.core"
- download-size="0"
- install-size="0"
- version="0.0.0"
- unpack="false"/>
-
- <plugin
- id="org.eclipse.jst.j2ee"
- download-size="0"
- install-size="0"
- version="0.0.0"
- unpack="false"/>
-
- <plugin
- id="org.eclipse.jst.jee"
- download-size="0"
- install-size="0"
- version="0.0.0"
- unpack="false"/>
-
- <plugin
- id="org.eclipse.jst.jee.web"
- download-size="0"
- install-size="0"
- version="0.0.0"
- unpack="false"/>
-
- <plugin
- id="org.eclipse.jst.standard.schemas"
- download-size="224"
- install-size="224"
- version="0.0.0"
- unpack="false"/>
-
-</feature>
diff --git a/features/org.eclipse.jst.web_core.feature/license.html b/features/org.eclipse.jst.web_core.feature/license.html
deleted file mode 100644
index c184ca3..0000000
--- a/features/org.eclipse.jst.web_core.feature/license.html
+++ /dev/null
@@ -1,107 +0,0 @@
-<?xml version="1.0" encoding="ISO-8859-1" ?>
-<!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.0 Strict//EN" "http://www.w3.org/TR/xhtml1/DTD/xhtml1-strict.dtd">
-<html xmlns="http://www.w3.org/1999/xhtml">
-<head>
-<meta http-equiv="Content-Type" content="text/html; charset=ISO-8859-1" />
-<title>Eclipse Foundation Software User Agreement</title>
-</head>
-
-<body lang="EN-US">
-<h2>Eclipse Foundation Software User Agreement</h2>
-<p>April 14, 2010</p>
-
-<h3>Usage Of Content</h3>
-
-<p>THE ECLIPSE FOUNDATION MAKES AVAILABLE SOFTWARE, DOCUMENTATION, INFORMATION AND/OR OTHER MATERIALS FOR OPEN SOURCE PROJECTS
- (COLLECTIVELY "CONTENT"). USE OF THE CONTENT IS GOVERNED BY THE TERMS AND CONDITIONS OF THIS AGREEMENT AND/OR THE TERMS AND
- CONDITIONS OF LICENSE AGREEMENTS OR NOTICES INDICATED OR REFERENCED BELOW. BY USING THE CONTENT, YOU AGREE THAT YOUR USE
- OF THE CONTENT IS GOVERNED BY THIS AGREEMENT AND/OR THE TERMS AND CONDITIONS OF ANY APPLICABLE LICENSE AGREEMENTS OR
- NOTICES INDICATED OR REFERENCED BELOW. IF YOU DO NOT AGREE TO THE TERMS AND CONDITIONS OF THIS AGREEMENT AND THE TERMS AND
- CONDITIONS OF ANY APPLICABLE LICENSE AGREEMENTS OR NOTICES INDICATED OR REFERENCED BELOW, THEN YOU MAY NOT USE THE CONTENT.</p>
-
-<h3>Applicable Licenses</h3>
-
-<p>Unless otherwise indicated, all Content made available by the Eclipse Foundation is provided to you under the terms and conditions of the Eclipse Public License Version 1.0
- ("EPL"). A copy of the EPL is provided with this Content and is also available at <a href="http://www.eclipse.org/legal/epl-v10.html">http://www.eclipse.org/legal/epl-v10.html</a>.
- For purposes of the EPL, "Program" will mean the Content.</p>
-
-<p>Content includes, but is not limited to, source code, object code, documentation and other files maintained in the Eclipse Foundation source code
- repository ("Repository") in software modules ("Modules") and made available as downloadable archives ("Downloads").</p>
-
-<ul>
- <li>Content may be structured and packaged into modules to facilitate delivering, extending, and upgrading the Content. Typical modules may include plug-ins ("Plug-ins"), plug-in fragments ("Fragments"), and features ("Features").</li>
- <li>Each Plug-in or Fragment may be packaged as a sub-directory or JAR (Java™ ARchive) in a directory named "plugins".</li>
- <li>A Feature is a bundle of one or more Plug-ins and/or Fragments and associated material. Each Feature may be packaged as a sub-directory in a directory named "features". Within a Feature, files named "feature.xml" may contain a list of the names and version numbers of the Plug-ins
- and/or Fragments associated with that Feature.</li>
- <li>Features may also include other Features ("Included Features"). Within a Feature, files named "feature.xml" may contain a list of the names and version numbers of Included Features.</li>
-</ul>
-
-<p>The terms and conditions governing Plug-ins and Fragments should be contained in files named "about.html" ("Abouts"). The terms and conditions governing Features and
-Included Features should be contained in files named "license.html" ("Feature Licenses"). Abouts and Feature Licenses may be located in any directory of a Download or Module
-including, but not limited to the following locations:</p>
-
-<ul>
- <li>The top-level (root) directory</li>
- <li>Plug-in and Fragment directories</li>
- <li>Inside Plug-ins and Fragments packaged as JARs</li>
- <li>Sub-directories of the directory named "src" of certain Plug-ins</li>
- <li>Feature directories</li>
-</ul>
-
-<p>Note: if a Feature made available by the Eclipse Foundation is installed using the Provisioning Technology (as defined below), you must agree to a license ("Feature Update License") during the
-installation process. If the Feature contains Included Features, the Feature Update License should either provide you with the terms and conditions governing the Included Features or
-inform you where you can locate them. Feature Update Licenses may be found in the "license" property of files named "feature.properties" found within a Feature.
-Such Abouts, Feature Licenses, and Feature Update Licenses contain the terms and conditions (or references to such terms and conditions) that govern your use of the associated Content in
-that directory.</p>
-
-<p>THE ABOUTS, FEATURE LICENSES, AND FEATURE UPDATE LICENSES MAY REFER TO THE EPL OR OTHER LICENSE AGREEMENTS, NOTICES OR TERMS AND CONDITIONS. SOME OF THESE
-OTHER LICENSE AGREEMENTS MAY INCLUDE (BUT ARE NOT LIMITED TO):</p>
-
-<ul>
- <li>Common Public License Version 1.0 (available at <a href="http://www.eclipse.org/legal/cpl-v10.html">http://www.eclipse.org/legal/cpl-v10.html</a>)</li>
- <li>Apache Software License 1.1 (available at <a href="http://www.apache.org/licenses/LICENSE">http://www.apache.org/licenses/LICENSE</a>)</li>
- <li>Apache Software License 2.0 (available at <a href="http://www.apache.org/licenses/LICENSE-2.0">http://www.apache.org/licenses/LICENSE-2.0</a>)</li>
- <li>Metro Link Public License 1.00 (available at <a href="http://www.opengroup.org/openmotif/supporters/metrolink/license.html">http://www.opengroup.org/openmotif/supporters/metrolink/license.html</a>)</li>
- <li>Mozilla Public License Version 1.1 (available at <a href="http://www.mozilla.org/MPL/MPL-1.1.html">http://www.mozilla.org/MPL/MPL-1.1.html</a>)</li>
-</ul>
-
-<p>IT IS YOUR OBLIGATION TO READ AND ACCEPT ALL SUCH TERMS AND CONDITIONS PRIOR TO USE OF THE CONTENT. If no About, Feature License, or Feature Update License is provided, please
-contact the Eclipse Foundation to determine what terms and conditions govern that particular Content.</p>
-
-
-<h3>Use of Provisioning Technology</h3>
-
-<p>The Eclipse Foundation makes available provisioning software, examples of which include, but are not limited to, p2 and the Eclipse
- Update Manager ("Provisioning Technology") for the purpose of allowing users to install software, documentation, information and/or
- other materials (collectively "Installable Software"). This capability is provided with the intent of allowing such users to
- install, extend and update Eclipse-based products. Information about packaging Installable Software is available at <a
- href="http://eclipse.org/equinox/p2/repository_packaging.html">http://eclipse.org/equinox/p2/repository_packaging.html</a>
- ("Specification").</p>
-
-<p>You may use Provisioning Technology to allow other parties to install Installable Software. You shall be responsible for enabling the
- applicable license agreements relating to the Installable Software to be presented to, and accepted by, the users of the Provisioning Technology
- in accordance with the Specification. By using Provisioning Technology in such a manner and making it available in accordance with the
- Specification, you further acknowledge your agreement to, and the acquisition of all necessary rights to permit the following:</p>
-
-<ol>
- <li>A series of actions may occur ("Provisioning Process") in which a user may execute the Provisioning Technology
- on a machine ("Target Machine") with the intent of installing, extending or updating the functionality of an Eclipse-based
- product.</li>
- <li>During the Provisioning Process, the Provisioning Technology may cause third party Installable Software or a portion thereof to be
- accessed and copied to the Target Machine.</li>
- <li>Pursuant to the Specification, you will provide to the user the terms and conditions that govern the use of the Installable
- Software ("Installable Software Agreement") and such Installable Software Agreement shall be accessed from the Target
- Machine in accordance with the Specification. Such Installable Software Agreement must inform the user of the terms and conditions that govern
- the Installable Software and must solicit acceptance by the end user in the manner prescribed in such Installable Software Agreement. Upon such
- indication of agreement by the user, the provisioning Technology will complete installation of the Installable Software.</li>
-</ol>
-
-<h3>Cryptography</h3>
-
-<p>Content may contain encryption software. The country in which you are currently may have restrictions on the import, possession, and use, and/or re-export to
- another country, of encryption software. BEFORE using any encryption software, please check the country's laws, regulations and policies concerning the import,
- possession, or use, and re-export of encryption software, to see if this is permitted.</p>
-
-<p><small>Java and all Java-based trademarks are trademarks of Oracle Corporation in the United States, other countries, or both.</small></p>
-</body>
-</html>
diff --git a/features/org.eclipse.jst.web_core.feature/sourceTemplateBundle/about.html b/features/org.eclipse.jst.web_core.feature/sourceTemplateBundle/about.html
deleted file mode 100644
index fe81d46..0000000
--- a/features/org.eclipse.jst.web_core.feature/sourceTemplateBundle/about.html
+++ /dev/null
@@ -1,27 +0,0 @@
-<!DOCTYPE HTML PUBLIC "-//W3C//DTD HTML 4.0//EN">
-<html>
-<head>
-<title>About</title>
-<meta http-equiv=Content-Type content="text/html; charset=ISO-8859-1">
-</head>
-<body lang="EN-US">
-<h2>About This Content</h2>
-
-<P>June, 2008</P>
-<h3>License</h3>
-
-<p>The Eclipse Foundation makes available all content in this plug-in ("Content"). Unless otherwise indicated below, the Content is provided to you under the terms and conditions of the
-Eclipse Public License Version 1.0 ("EPL"). A copy of the EPL is available at <a href="http://www.eclipse.org/legal/epl-v10.html">http://www.eclipse.org/legal/epl-v10.html</a>.
-For purposes of the EPL, "Program" will mean the Content.</p>
-
-<p>If you did not receive this Content directly from the Eclipse Foundation, the Content is being redistributed by another party ("Redistributor") and different terms and conditions may
-apply to your use of any object code in the Content. Check the Redistributor's license that was provided with the Content. If no such license exists, contact the Redistributor. Unless otherwise
-indicated below, the terms and conditions of the EPL still apply to any source code in the Content.</p>
-
-<h3>Source Code</h3>
-<p>This plug-in contains source code zip files ("Source Zips") that correspond to binary content in other plug-ins. These Source Zips may be distributed under different license
-agreements and/or notices. Details about these license agreements and notices are contained in "about.html" files ("Abouts") located in sub-directories in the
-src/ directory of this plug-in. Such Abouts govern your use of the Source Zips in that directory, not the EPL.</p>
-
-</body>
-</html>
diff --git a/features/org.eclipse.jst.web_core.feature/sourceTemplateBundle/about.ini b/features/org.eclipse.jst.web_core.feature/sourceTemplateBundle/about.ini
deleted file mode 100644
index fda5a40..0000000
--- a/features/org.eclipse.jst.web_core.feature/sourceTemplateBundle/about.ini
+++ /dev/null
@@ -1,31 +0,0 @@
-# about.ini
-# contains information about a feature
-# java.io.Properties file (ISO 8859-1 with "\" escapes)
-# "%key" are externalized strings defined in about.properties
-# This file does not need to be translated.
-
-# Property "aboutText" contains blurb for "About" dialog (translated)
-aboutText=%blurb
-
-# Property "windowImage" contains path to window icon (16x16)
-# needed for primary features only
-
-# Property "featureImage" contains path to feature image (32x32)
-featureImage=wtp_prod32.png
-
-# Property "aboutImage" contains path to product image (500x330 or 115x164)
-# needed for primary features only
-
-# Property "appName" contains name of the application (not translated)
-# needed for primary features only
-
-# Property "welcomePage" contains path to welcome page (special XML-based format)
-# optional
-
-# Property "welcomePerspective" contains the id of the perspective in which the
-# welcome page is to be opened.
-# optional
-
-
-
-
diff --git a/features/org.eclipse.jst.web_core.feature/sourceTemplateBundle/about.mappings b/features/org.eclipse.jst.web_core.feature/sourceTemplateBundle/about.mappings
deleted file mode 100644
index a28390a..0000000
--- a/features/org.eclipse.jst.web_core.feature/sourceTemplateBundle/about.mappings
+++ /dev/null
@@ -1,6 +0,0 @@
-# about.mappings
-# contains fill-ins for about.properties
-# java.io.Properties file (ISO 8859-1 with "\" escapes)
-# This file does not need to be translated.
-
-0=@build@
diff --git a/features/org.eclipse.jst.web_core.feature/sourceTemplateBundle/about.properties b/features/org.eclipse.jst.web_core.feature/sourceTemplateBundle/about.properties
deleted file mode 100644
index cedcbea..0000000
--- a/features/org.eclipse.jst.web_core.feature/sourceTemplateBundle/about.properties
+++ /dev/null
@@ -1,26 +0,0 @@
-###############################################################################
-# Copyright (c) 2000, 2005 IBM Corporation and others.
-# All rights reserved. This program and the accompanying materials
-# are made available under the terms of the Eclipse Public License v1.0
-# which accompanies this distribution, and is available at
-# http://www.eclipse.org/legal/epl-v10.html
-#
-# Contributors:
-# IBM Corporation - initial API and implementation
-###############################################################################
-# about.properties
-# contains externalized strings for about.ini
-# java.io.Properties file (ISO 8859-1 with "\" escapes)
-# fill-ins are supplied by about.mappings
-# This file should be translated.
-#
-# Do not translate any values surrounded by {}
-
-blurb=J2EE Standard Tools - Web Core\n\
-\n\
-Version: {featureVersion}\n\
-Build id: {0}\n\
-\n\
-(c) Copyright Eclipse contributors and others 2005. All rights reserved.\n\
-Visit http://www.eclipse.org/webtools
-
diff --git a/features/org.eclipse.jst.web_core.feature/sourceTemplateBundle/build.properties b/features/org.eclipse.jst.web_core.feature/sourceTemplateBundle/build.properties
deleted file mode 100644
index ead512d..0000000
--- a/features/org.eclipse.jst.web_core.feature/sourceTemplateBundle/build.properties
+++ /dev/null
@@ -1,2 +0,0 @@
-bin.includes = about.html, about.ini, about.mappings, about.properties, wtp_prod32.png, plugin.properties, plugin.xml, src/**, META-INF/
-sourcePlugin = true
diff --git a/features/org.eclipse.jst.web_core.feature/sourceTemplateBundle/plugin.properties b/features/org.eclipse.jst.web_core.feature/sourceTemplateBundle/plugin.properties
deleted file mode 100644
index f188816..0000000
--- a/features/org.eclipse.jst.web_core.feature/sourceTemplateBundle/plugin.properties
+++ /dev/null
@@ -1,12 +0,0 @@
-###############################################################################
-# Copyright (c) 2005 IBM Corporation and others.
-# All rights reserved. This program and the accompanying materials
-# are made available under the terms of the Eclipse Public License v1.0
-# which accompanies this distribution, and is available at
-# http://www.eclipse.org/legal/epl-v10.html
-#
-# Contributors:
-# IBM Corporation - initial API and implementation
-###############################################################################
-pluginName=J2EE Standard Tools - Web Core Source
-providerName=Eclipse.org
diff --git a/features/org.eclipse.jst.web_core.feature/sourceTemplateBundle/wtp_prod32.gif b/features/org.eclipse.jst.web_core.feature/sourceTemplateBundle/wtp_prod32.gif
deleted file mode 100644
index eefb44a..0000000
--- a/features/org.eclipse.jst.web_core.feature/sourceTemplateBundle/wtp_prod32.gif
+++ /dev/null
Binary files differ
diff --git a/features/org.eclipse.jst.web_core.feature/sourceTemplateBundle/wtp_prod32.png b/features/org.eclipse.jst.web_core.feature/sourceTemplateBundle/wtp_prod32.png
deleted file mode 100644
index bfceab3..0000000
--- a/features/org.eclipse.jst.web_core.feature/sourceTemplateBundle/wtp_prod32.png
+++ /dev/null
Binary files differ
diff --git a/features/org.eclipse.jst.web_core.feature/sourceTemplateFeature/build.properties b/features/org.eclipse.jst.web_core.feature/sourceTemplateFeature/build.properties
deleted file mode 100644
index f249e9f..0000000
--- a/features/org.eclipse.jst.web_core.feature/sourceTemplateFeature/build.properties
+++ /dev/null
@@ -1,16 +0,0 @@
-###############################################################################
-# Copyright (c) 2000, 2005 IBM Corporation and others.
-# All rights reserved. This program and the accompanying materials
-# are made available under the terms of the Eclipse Public License v1.0
-# which accompanies this distribution, and is available at
-# http://www.eclipse.org/legal/epl-v10.html
-#
-# Contributors:
-# IBM Corporation - initial API and implementation
-###############################################################################
-bin.includes =\
-epl-v10.html,\
-eclipse_update_120.jpg,\
-feature.xml,\
-feature.properties,\
-license.html
diff --git a/features/org.eclipse.jst.web_core.feature/sourceTemplateFeature/eclipse_update_120.jpg b/features/org.eclipse.jst.web_core.feature/sourceTemplateFeature/eclipse_update_120.jpg
deleted file mode 100644
index bfdf708..0000000
--- a/features/org.eclipse.jst.web_core.feature/sourceTemplateFeature/eclipse_update_120.jpg
+++ /dev/null
Binary files differ
diff --git a/features/org.eclipse.jst.web_core.feature/sourceTemplateFeature/epl-v10.html b/features/org.eclipse.jst.web_core.feature/sourceTemplateFeature/epl-v10.html
deleted file mode 100644
index 022ad29..0000000
--- a/features/org.eclipse.jst.web_core.feature/sourceTemplateFeature/epl-v10.html
+++ /dev/null
@@ -1,328 +0,0 @@
-<html xmlns:o="urn:schemas-microsoft-com:office:office"
-xmlns:w="urn:schemas-microsoft-com:office:word"
-xmlns="http://www.w3.org/TR/REC-html40">
-
-<head>
-<meta http-equiv=Content-Type content="text/html; charset=windows-1252">
-<meta name=ProgId content=Word.Document>
-<meta name=Generator content="Microsoft Word 9">
-<meta name=Originator content="Microsoft Word 9">
-<link rel=File-List
-href="./Eclipse%20EPL%202003_11_10%20Final_files/filelist.xml">
-<title>Eclipse Public License - Version 1.0</title>
-<!--[if gte mso 9]><xml>
- <o:DocumentProperties>
- <o:Revision>2</o:Revision>
- <o:TotalTime>3</o:TotalTime>
- <o:Created>2004-03-05T23:03:00Z</o:Created>
- <o:LastSaved>2004-03-05T23:03:00Z</o:LastSaved>
- <o:Pages>4</o:Pages>
- <o:Words>1626</o:Words>
- <o:Characters>9270</o:Characters>
- <o:Lines>77</o:Lines>
- <o:Paragraphs>18</o:Paragraphs>
- <o:CharactersWithSpaces>11384</o:CharactersWithSpaces>
- <o:Version>9.4402</o:Version>
- </o:DocumentProperties>
-</xml><![endif]--><!--[if gte mso 9]><xml>
- <w:WordDocument>
- <w:TrackRevisions/>
- </w:WordDocument>
-</xml><![endif]-->
-<style>
-<!--
- /* Font Definitions */
-@font-face
- {font-family:Tahoma;
- panose-1:2 11 6 4 3 5 4 4 2 4;
- mso-font-charset:0;
- mso-generic-font-family:swiss;
- mso-font-pitch:variable;
- mso-font-signature:553679495 -2147483648 8 0 66047 0;}
- /* Style Definitions */
-p.MsoNormal, li.MsoNormal, div.MsoNormal
- {mso-style-parent:"";
- margin:0in;
- margin-bottom:.0001pt;
- mso-pagination:widow-orphan;
- font-size:12.0pt;
- font-family:"Times New Roman";
- mso-fareast-font-family:"Times New Roman";}
-p
- {margin-right:0in;
- mso-margin-top-alt:auto;
- mso-margin-bottom-alt:auto;
- margin-left:0in;
- mso-pagination:widow-orphan;
- font-size:12.0pt;
- font-family:"Times New Roman";
- mso-fareast-font-family:"Times New Roman";}
-p.BalloonText, li.BalloonText, div.BalloonText
- {mso-style-name:"Balloon Text";
- margin:0in;
- margin-bottom:.0001pt;
- mso-pagination:widow-orphan;
- font-size:8.0pt;
- font-family:Tahoma;
- mso-fareast-font-family:"Times New Roman";}
-@page Section1
- {size:8.5in 11.0in;
- margin:1.0in 1.25in 1.0in 1.25in;
- mso-header-margin:.5in;
- mso-footer-margin:.5in;
- mso-paper-source:0;}
-div.Section1
- {page:Section1;}
--->
-</style>
-</head>
-
-<body lang=EN-US style='tab-interval:.5in'>
-
-<div class=Section1>
-
-<p align=center style='text-align:center'><b>Eclipse Public License - v 1.0</b>
-</p>
-
-<p><span style='font-size:10.0pt'>THE ACCOMPANYING PROGRAM IS PROVIDED UNDER
-THE TERMS OF THIS ECLIPSE PUBLIC LICENSE ("AGREEMENT"). ANY USE,
-REPRODUCTION OR DISTRIBUTION OF THE PROGRAM CONSTITUTES RECIPIENT'S ACCEPTANCE
-OF THIS AGREEMENT.</span> </p>
-
-<p><b><span style='font-size:10.0pt'>1. DEFINITIONS</span></b> </p>
-
-<p><span style='font-size:10.0pt'>"Contribution" means:</span> </p>
-
-<p class=MsoNormal style='margin-left:.5in'><span style='font-size:10.0pt'>a)
-in the case of the initial Contributor, the initial code and documentation
-distributed under this Agreement, and<br clear=left>
-b) in the case of each subsequent Contributor:</span></p>
-
-<p class=MsoNormal style='margin-left:.5in'><span style='font-size:10.0pt'>i)
-changes to the Program, and</span></p>
-
-<p class=MsoNormal style='margin-left:.5in'><span style='font-size:10.0pt'>ii)
-additions to the Program;</span></p>
-
-<p class=MsoNormal style='margin-left:.5in'><span style='font-size:10.0pt'>where
-such changes and/or additions to the Program originate from and are distributed
-by that particular Contributor. A Contribution 'originates' from a Contributor
-if it was added to the Program by such Contributor itself or anyone acting on
-such Contributor's behalf. Contributions do not include additions to the
-Program which: (i) are separate modules of software distributed in conjunction
-with the Program under their own license agreement, and (ii) are not derivative
-works of the Program. </span></p>
-
-<p><span style='font-size:10.0pt'>"Contributor" means any person or
-entity that distributes the Program.</span> </p>
-
-<p><span style='font-size:10.0pt'>"Licensed Patents " mean patent
-claims licensable by a Contributor which are necessarily infringed by the use
-or sale of its Contribution alone or when combined with the Program. </span></p>
-
-<p><span style='font-size:10.0pt'>"Program" means the Contributions
-distributed in accordance with this Agreement.</span> </p>
-
-<p><span style='font-size:10.0pt'>"Recipient" means anyone who
-receives the Program under this Agreement, including all Contributors.</span> </p>
-
-<p><b><span style='font-size:10.0pt'>2. GRANT OF RIGHTS</span></b> </p>
-
-<p class=MsoNormal style='margin-left:.5in'><span style='font-size:10.0pt'>a)
-Subject to the terms of this Agreement, each Contributor hereby grants Recipient
-a non-exclusive, worldwide, royalty-free copyright license to<span
-style='color:red'> </span>reproduce, prepare derivative works of, publicly
-display, publicly perform, distribute and sublicense the Contribution of such
-Contributor, if any, and such derivative works, in source code and object code
-form.</span></p>
-
-<p class=MsoNormal style='margin-left:.5in'><span style='font-size:10.0pt'>b)
-Subject to the terms of this Agreement, each Contributor hereby grants
-Recipient a non-exclusive, worldwide,<span style='color:green'> </span>royalty-free
-patent license under Licensed Patents to make, use, sell, offer to sell, import
-and otherwise transfer the Contribution of such Contributor, if any, in source
-code and object code form. This patent license shall apply to the combination
-of the Contribution and the Program if, at the time the Contribution is added
-by the Contributor, such addition of the Contribution causes such combination
-to be covered by the Licensed Patents. The patent license shall not apply to
-any other combinations which include the Contribution. No hardware per se is
-licensed hereunder. </span></p>
-
-<p class=MsoNormal style='margin-left:.5in'><span style='font-size:10.0pt'>c)
-Recipient understands that although each Contributor grants the licenses to its
-Contributions set forth herein, no assurances are provided by any Contributor
-that the Program does not infringe the patent or other intellectual property
-rights of any other entity. Each Contributor disclaims any liability to Recipient
-for claims brought by any other entity based on infringement of intellectual
-property rights or otherwise. As a condition to exercising the rights and
-licenses granted hereunder, each Recipient hereby assumes sole responsibility
-to secure any other intellectual property rights needed, if any. For example,
-if a third party patent license is required to allow Recipient to distribute
-the Program, it is Recipient's responsibility to acquire that license before
-distributing the Program.</span></p>
-
-<p class=MsoNormal style='margin-left:.5in'><span style='font-size:10.0pt'>d)
-Each Contributor represents that to its knowledge it has sufficient copyright
-rights in its Contribution, if any, to grant the copyright license set forth in
-this Agreement. </span></p>
-
-<p><b><span style='font-size:10.0pt'>3. REQUIREMENTS</span></b> </p>
-
-<p><span style='font-size:10.0pt'>A Contributor may choose to distribute the
-Program in object code form under its own license agreement, provided that:</span>
-</p>
-
-<p class=MsoNormal style='margin-left:.5in'><span style='font-size:10.0pt'>a)
-it complies with the terms and conditions of this Agreement; and</span></p>
-
-<p class=MsoNormal style='margin-left:.5in'><span style='font-size:10.0pt'>b)
-its license agreement:</span></p>
-
-<p class=MsoNormal style='margin-left:.5in'><span style='font-size:10.0pt'>i)
-effectively disclaims on behalf of all Contributors all warranties and
-conditions, express and implied, including warranties or conditions of title
-and non-infringement, and implied warranties or conditions of merchantability
-and fitness for a particular purpose; </span></p>
-
-<p class=MsoNormal style='margin-left:.5in'><span style='font-size:10.0pt'>ii)
-effectively excludes on behalf of all Contributors all liability for damages,
-including direct, indirect, special, incidental and consequential damages, such
-as lost profits; </span></p>
-
-<p class=MsoNormal style='margin-left:.5in'><span style='font-size:10.0pt'>iii)
-states that any provisions which differ from this Agreement are offered by that
-Contributor alone and not by any other party; and</span></p>
-
-<p class=MsoNormal style='margin-left:.5in'><span style='font-size:10.0pt'>iv)
-states that source code for the Program is available from such Contributor, and
-informs licensees how to obtain it in a reasonable manner on or through a
-medium customarily used for software exchange.<span style='color:blue'> </span></span></p>
-
-<p><span style='font-size:10.0pt'>When the Program is made available in source
-code form:</span> </p>
-
-<p class=MsoNormal style='margin-left:.5in'><span style='font-size:10.0pt'>a)
-it must be made available under this Agreement; and </span></p>
-
-<p class=MsoNormal style='margin-left:.5in'><span style='font-size:10.0pt'>b) a
-copy of this Agreement must be included with each copy of the Program. </span></p>
-
-<p><span style='font-size:10.0pt'>Contributors may not remove or alter any
-copyright notices contained within the Program. </span></p>
-
-<p><span style='font-size:10.0pt'>Each Contributor must identify itself as the
-originator of its Contribution, if any, in a manner that reasonably allows
-subsequent Recipients to identify the originator of the Contribution. </span></p>
-
-<p><b><span style='font-size:10.0pt'>4. COMMERCIAL DISTRIBUTION</span></b> </p>
-
-<p><span style='font-size:10.0pt'>Commercial distributors of software may
-accept certain responsibilities with respect to end users, business partners
-and the like. While this license is intended to facilitate the commercial use
-of the Program, the Contributor who includes the Program in a commercial
-product offering should do so in a manner which does not create potential
-liability for other Contributors. Therefore, if a Contributor includes the
-Program in a commercial product offering, such Contributor ("Commercial
-Contributor") hereby agrees to defend and indemnify every other
-Contributor ("Indemnified Contributor") against any losses, damages and
-costs (collectively "Losses") arising from claims, lawsuits and other
-legal actions brought by a third party against the Indemnified Contributor to
-the extent caused by the acts or omissions of such Commercial Contributor in
-connection with its distribution of the Program in a commercial product
-offering. The obligations in this section do not apply to any claims or Losses
-relating to any actual or alleged intellectual property infringement. In order
-to qualify, an Indemnified Contributor must: a) promptly notify the Commercial
-Contributor in writing of such claim, and b) allow the Commercial Contributor
-to control, and cooperate with the Commercial Contributor in, the defense and
-any related settlement negotiations. The Indemnified Contributor may participate
-in any such claim at its own expense.</span> </p>
-
-<p><span style='font-size:10.0pt'>For example, a Contributor might include the
-Program in a commercial product offering, Product X. That Contributor is then a
-Commercial Contributor. If that Commercial Contributor then makes performance
-claims, or offers warranties related to Product X, those performance claims and
-warranties are such Commercial Contributor's responsibility alone. Under this
-section, the Commercial Contributor would have to defend claims against the
-other Contributors related to those performance claims and warranties, and if a
-court requires any other Contributor to pay any damages as a result, the
-Commercial Contributor must pay those damages.</span> </p>
-
-<p><b><span style='font-size:10.0pt'>5. NO WARRANTY</span></b> </p>
-
-<p><span style='font-size:10.0pt'>EXCEPT AS EXPRESSLY SET FORTH IN THIS
-AGREEMENT, THE PROGRAM IS PROVIDED ON AN "AS IS" BASIS, WITHOUT
-WARRANTIES OR CONDITIONS OF ANY KIND, EITHER EXPRESS OR IMPLIED INCLUDING,
-WITHOUT LIMITATION, ANY WARRANTIES OR CONDITIONS OF TITLE, NON-INFRINGEMENT,
-MERCHANTABILITY OR FITNESS FOR A PARTICULAR PURPOSE. Each Recipient is solely
-responsible for determining the appropriateness of using and distributing the
-Program and assumes all risks associated with its exercise of rights under this
-Agreement , including but not limited to the risks and costs of program errors,
-compliance with applicable laws, damage to or loss of data, programs or
-equipment, and unavailability or interruption of operations. </span></p>
-
-<p><b><span style='font-size:10.0pt'>6. DISCLAIMER OF LIABILITY</span></b> </p>
-
-<p><span style='font-size:10.0pt'>EXCEPT AS EXPRESSLY SET FORTH IN THIS
-AGREEMENT, NEITHER RECIPIENT NOR ANY CONTRIBUTORS SHALL HAVE ANY LIABILITY FOR
-ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES
-(INCLUDING WITHOUT LIMITATION LOST PROFITS), HOWEVER CAUSED AND ON ANY THEORY
-OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING
-NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OR DISTRIBUTION OF
-THE PROGRAM OR THE EXERCISE OF ANY RIGHTS GRANTED HEREUNDER, EVEN IF ADVISED OF
-THE POSSIBILITY OF SUCH DAMAGES.</span> </p>
-
-<p><b><span style='font-size:10.0pt'>7. GENERAL</span></b> </p>
-
-<p><span style='font-size:10.0pt'>If any provision of this Agreement is invalid
-or unenforceable under applicable law, it shall not affect the validity or
-enforceability of the remainder of the terms of this Agreement, and without
-further action by the parties hereto, such provision shall be reformed to the
-minimum extent necessary to make such provision valid and enforceable.</span> </p>
-
-<p><span style='font-size:10.0pt'>If Recipient institutes patent litigation
-against any entity (including a cross-claim or counterclaim in a lawsuit)
-alleging that the Program itself (excluding combinations of the Program with
-other software or hardware) infringes such Recipient's patent(s), then such
-Recipient's rights granted under Section 2(b) shall terminate as of the date
-such litigation is filed. </span></p>
-
-<p><span style='font-size:10.0pt'>All Recipient's rights under this Agreement
-shall terminate if it fails to comply with any of the material terms or
-conditions of this Agreement and does not cure such failure in a reasonable
-period of time after becoming aware of such noncompliance. If all Recipient's
-rights under this Agreement terminate, Recipient agrees to cease use and
-distribution of the Program as soon as reasonably practicable. However,
-Recipient's obligations under this Agreement and any licenses granted by
-Recipient relating to the Program shall continue and survive. </span></p>
-
-<p><span style='font-size:10.0pt'>Everyone is permitted to copy and distribute
-copies of this Agreement, but in order to avoid inconsistency the Agreement is
-copyrighted and may only be modified in the following manner. The Agreement
-Steward reserves the right to publish new versions (including revisions) of
-this Agreement from time to time. No one other than the Agreement Steward has
-the right to modify this Agreement. The Eclipse Foundation is the initial
-Agreement Steward. The Eclipse Foundation may assign the responsibility to
-serve as the Agreement Steward to a suitable separate entity. Each new version
-of the Agreement will be given a distinguishing version number. The Program
-(including Contributions) may always be distributed subject to the version of
-the Agreement under which it was received. In addition, after a new version of
-the Agreement is published, Contributor may elect to distribute the Program
-(including its Contributions) under the new version. Except as expressly stated
-in Sections 2(a) and 2(b) above, Recipient receives no rights or licenses to
-the intellectual property of any Contributor under this Agreement, whether
-expressly, by implication, estoppel or otherwise. All rights in the Program not
-expressly granted under this Agreement are reserved.</span> </p>
-
-<p><span style='font-size:10.0pt'>This Agreement is governed by the laws of the
-State of New York and the intellectual property laws of the United States of
-America. No party to this Agreement will bring a legal action under this
-Agreement more than one year after the cause of action arose. Each party waives
-its rights to a jury trial in any resulting litigation.</span> </p>
-
-<p class=MsoNormal><![if !supportEmptyParas]> <![endif]><o:p></o:p></p>
-
-</div>
-
-</body>
-
-</html>
diff --git a/features/org.eclipse.jst.web_core.feature/sourceTemplateFeature/feature.properties b/features/org.eclipse.jst.web_core.feature/sourceTemplateFeature/feature.properties
deleted file mode 100644
index 8d0348a..0000000
--- a/features/org.eclipse.jst.web_core.feature/sourceTemplateFeature/feature.properties
+++ /dev/null
@@ -1,167 +0,0 @@
-###############################################################################
-# Copyright (c) 2006 IBM Corporation and others.
-# All rights reserved. This program and the accompanying materials
-# are made available under the terms of the Eclipse Public License v1.0
-# which accompanies this distribution, and is available at
-# http://www.eclipse.org/legal/epl-v10.html
-#
-# Contributors:
-# IBM Corporation - initial API and implementation
-###############################################################################
-# feature.properties
-# contains externalized strings for feature.xml
-# "%foo" in feature.xml corresponds to the key "foo" in this file
-# java.io.Properties file (ISO 8859-1 with "\" escapes)
-# This file should be translated.
-
-# "featureName" property - name of the feature
-featureName=JST Web Core Developer Resources
-# "providerName" property - name of the company that provides the feature
-providerName=Eclipse Web Tools Platform
-
-
-# "description" property - description of the feature
-description=Source code zips for JST Web core.
-
-# "copyright" property - text of the "Feature Update Copyright"
-copyright=\
-Copyright (c) 2006 IBM Corporation and others.\n\
-All rights reserved. This program and the accompanying materials\n\
-are made available under the terms of the Eclipse Public License v1.0\n\
-which accompanies this distribution, and is available at\n\
-http://www.eclipse.org/legal/epl-v10.html\n\
-\n\
-Contributors:\n\
- IBM Corporation - initial API and implementation\n
-################ end of copyright property ####################################
-
-# "licenseURL" property - URL of the "Feature License"
-# do not translate value - just change to point to a locale-specific HTML page
-licenseURL=license.html
-
-# "license" property - text of the "Feature Update License"
-# should be plain text version of license agreement pointed to be "licenseURL"
-license=\
-Eclipse Foundation Software User Agreement\n\
-April 14, 2010\n\
-\n\
-Usage Of Content\n\
-\n\
-THE ECLIPSE FOUNDATION MAKES AVAILABLE SOFTWARE, DOCUMENTATION, INFORMATION AND/OR\n\
-OTHER MATERIALS FOR OPEN SOURCE PROJECTS (COLLECTIVELY "CONTENT").\n\
-USE OF THE CONTENT IS GOVERNED BY THE TERMS AND CONDITIONS OF THIS\n\
-AGREEMENT AND/OR THE TERMS AND CONDITIONS OF LICENSE AGREEMENTS OR\n\
-NOTICES INDICATED OR REFERENCED BELOW. BY USING THE CONTENT, YOU\n\
-AGREE THAT YOUR USE OF THE CONTENT IS GOVERNED BY THIS AGREEMENT\n\
-AND/OR THE TERMS AND CONDITIONS OF ANY APPLICABLE LICENSE AGREEMENTS\n\
-OR NOTICES INDICATED OR REFERENCED BELOW. IF YOU DO NOT AGREE TO THE\n\
-TERMS AND CONDITIONS OF THIS AGREEMENT AND THE TERMS AND CONDITIONS\n\
-OF ANY APPLICABLE LICENSE AGREEMENTS OR NOTICES INDICATED OR REFERENCED\n\
-BELOW, THEN YOU MAY NOT USE THE CONTENT.\n\
-\n\
-Applicable Licenses\n\
-\n\
-Unless otherwise indicated, all Content made available by the\n\
-Eclipse Foundation is provided to you under the terms and conditions of\n\
-the Eclipse Public License Version 1.0 ("EPL"). A copy of the EPL is\n\
-provided with this Content and is also available at http://www.eclipse.org/legal/epl-v10.html.\n\
-For purposes of the EPL, "Program" will mean the Content.\n\
-\n\
-Content includes, but is not limited to, source code, object code,\n\
-documentation and other files maintained in the Eclipse Foundation source code\n\
-repository ("Repository") in software modules ("Modules") and made available\n\
-as downloadable archives ("Downloads").\n\
-\n\
- - Content may be structured and packaged into modules to facilitate delivering,\n\
- extending, and upgrading the Content. Typical modules may include plug-ins ("Plug-ins"),\n\
- plug-in fragments ("Fragments"), and features ("Features").\n\
- - Each Plug-in or Fragment may be packaged as a sub-directory or JAR (Java(TM) ARchive)\n\
- in a directory named "plugins".\n\
- - A Feature is a bundle of one or more Plug-ins and/or Fragments and associated material.\n\
- Each Feature may be packaged as a sub-directory in a directory named "features".\n\
- Within a Feature, files named "feature.xml" may contain a list of the names and version\n\
- numbers of the Plug-ins and/or Fragments associated with that Feature.\n\
- - Features may also include other Features ("Included Features"). Within a Feature, files\n\
- named "feature.xml" may contain a list of the names and version numbers of Included Features.\n\
-\n\
-The terms and conditions governing Plug-ins and Fragments should be\n\
-contained in files named "about.html" ("Abouts"). The terms and\n\
-conditions governing Features and Included Features should be contained\n\
-in files named "license.html" ("Feature Licenses"). Abouts and Feature\n\
-Licenses may be located in any directory of a Download or Module\n\
-including, but not limited to the following locations:\n\
-\n\
- - The top-level (root) directory\n\
- - Plug-in and Fragment directories\n\
- - Inside Plug-ins and Fragments packaged as JARs\n\
- - Sub-directories of the directory named "src" of certain Plug-ins\n\
- - Feature directories\n\
-\n\
-Note: if a Feature made available by the Eclipse Foundation is installed using the\n\
-Provisioning Technology (as defined below), you must agree to a license ("Feature \n\
-Update License") during the installation process. If the Feature contains\n\
-Included Features, the Feature Update License should either provide you\n\
-with the terms and conditions governing the Included Features or inform\n\
-you where you can locate them. Feature Update Licenses may be found in\n\
-the "license" property of files named "feature.properties" found within a Feature.\n\
-Such Abouts, Feature Licenses, and Feature Update Licenses contain the\n\
-terms and conditions (or references to such terms and conditions) that\n\
-govern your use of the associated Content in that directory.\n\
-\n\
-THE ABOUTS, FEATURE LICENSES, AND FEATURE UPDATE LICENSES MAY REFER\n\
-TO THE EPL OR OTHER LICENSE AGREEMENTS, NOTICES OR TERMS AND CONDITIONS.\n\
-SOME OF THESE OTHER LICENSE AGREEMENTS MAY INCLUDE (BUT ARE NOT LIMITED TO):\n\
-\n\
- - Common Public License Version 1.0 (available at http://www.eclipse.org/legal/cpl-v10.html)\n\
- - Apache Software License 1.1 (available at http://www.apache.org/licenses/LICENSE)\n\
- - Apache Software License 2.0 (available at http://www.apache.org/licenses/LICENSE-2.0)\n\
- - Metro Link Public License 1.00 (available at http://www.opengroup.org/openmotif/supporters/metrolink/license.html)\n\
- - Mozilla Public License Version 1.1 (available at http://www.mozilla.org/MPL/MPL-1.1.html)\n\
-\n\
-IT IS YOUR OBLIGATION TO READ AND ACCEPT ALL SUCH TERMS AND CONDITIONS PRIOR\n\
-TO USE OF THE CONTENT. If no About, Feature License, or Feature Update License\n\
-is provided, please contact the Eclipse Foundation to determine what terms and conditions\n\
-govern that particular Content.\n\
-\n\
-\n\Use of Provisioning Technology\n\
-\n\
-The Eclipse Foundation makes available provisioning software, examples of which include,\n\
-but are not limited to, p2 and the Eclipse Update Manager ("Provisioning Technology") for\n\
-the purpose of allowing users to install software, documentation, information and/or\n\
-other materials (collectively "Installable Software"). This capability is provided with\n\
-the intent of allowing such users to install, extend and update Eclipse-based products.\n\
-Information about packaging Installable Software is available at\n\
-http://eclipse.org/equinox/p2/repository_packaging.html ("Specification").\n\
-\n\
-You may use Provisioning Technology to allow other parties to install Installable Software.\n\
-You shall be responsible for enabling the applicable license agreements relating to the\n\
-Installable Software to be presented to, and accepted by, the users of the Provisioning Technology\n\
-in accordance with the Specification. By using Provisioning Technology in such a manner and\n\
-making it available in accordance with the Specification, you further acknowledge your\n\
-agreement to, and the acquisition of all necessary rights to permit the following:\n\
-\n\
- 1. A series of actions may occur ("Provisioning Process") in which a user may execute\n\
- the Provisioning Technology on a machine ("Target Machine") with the intent of installing,\n\
- extending or updating the functionality of an Eclipse-based product.\n\
- 2. During the Provisioning Process, the Provisioning Technology may cause third party\n\
- Installable Software or a portion thereof to be accessed and copied to the Target Machine.\n\
- 3. Pursuant to the Specification, you will provide to the user the terms and conditions that\n\
- govern the use of the Installable Software ("Installable Software Agreement") and such\n\
- Installable Software Agreement shall be accessed from the Target Machine in accordance\n\
- with the Specification. Such Installable Software Agreement must inform the user of the\n\
- terms and conditions that govern the Installable Software and must solicit acceptance by\n\
- the end user in the manner prescribed in such Installable Software Agreement. Upon such\n\
- indication of agreement by the user, the provisioning Technology will complete installation\n\
- of the Installable Software.\n\
-\n\
-Cryptography\n\
-\n\
-Content may contain encryption software. The country in which you are\n\
-currently may have restrictions on the import, possession, and use,\n\
-and/or re-export to another country, of encryption software. BEFORE\n\
-using any encryption software, please check the country's laws,\n\
-regulations and policies concerning the import, possession, or use, and\n\
-re-export of encryption software, to see if this is permitted.\n\
-\n\
-Java and all Java-based trademarks are trademarks of Oracle Corporation in the United States, other countries, or both.\n
-########### end of license property ##########################################
diff --git a/features/org.eclipse.jst.web_core.feature/sourceTemplateFeature/license.html b/features/org.eclipse.jst.web_core.feature/sourceTemplateFeature/license.html
deleted file mode 100644
index c184ca3..0000000
--- a/features/org.eclipse.jst.web_core.feature/sourceTemplateFeature/license.html
+++ /dev/null
@@ -1,107 +0,0 @@
-<?xml version="1.0" encoding="ISO-8859-1" ?>
-<!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.0 Strict//EN" "http://www.w3.org/TR/xhtml1/DTD/xhtml1-strict.dtd">
-<html xmlns="http://www.w3.org/1999/xhtml">
-<head>
-<meta http-equiv="Content-Type" content="text/html; charset=ISO-8859-1" />
-<title>Eclipse Foundation Software User Agreement</title>
-</head>
-
-<body lang="EN-US">
-<h2>Eclipse Foundation Software User Agreement</h2>
-<p>April 14, 2010</p>
-
-<h3>Usage Of Content</h3>
-
-<p>THE ECLIPSE FOUNDATION MAKES AVAILABLE SOFTWARE, DOCUMENTATION, INFORMATION AND/OR OTHER MATERIALS FOR OPEN SOURCE PROJECTS
- (COLLECTIVELY "CONTENT"). USE OF THE CONTENT IS GOVERNED BY THE TERMS AND CONDITIONS OF THIS AGREEMENT AND/OR THE TERMS AND
- CONDITIONS OF LICENSE AGREEMENTS OR NOTICES INDICATED OR REFERENCED BELOW. BY USING THE CONTENT, YOU AGREE THAT YOUR USE
- OF THE CONTENT IS GOVERNED BY THIS AGREEMENT AND/OR THE TERMS AND CONDITIONS OF ANY APPLICABLE LICENSE AGREEMENTS OR
- NOTICES INDICATED OR REFERENCED BELOW. IF YOU DO NOT AGREE TO THE TERMS AND CONDITIONS OF THIS AGREEMENT AND THE TERMS AND
- CONDITIONS OF ANY APPLICABLE LICENSE AGREEMENTS OR NOTICES INDICATED OR REFERENCED BELOW, THEN YOU MAY NOT USE THE CONTENT.</p>
-
-<h3>Applicable Licenses</h3>
-
-<p>Unless otherwise indicated, all Content made available by the Eclipse Foundation is provided to you under the terms and conditions of the Eclipse Public License Version 1.0
- ("EPL"). A copy of the EPL is provided with this Content and is also available at <a href="http://www.eclipse.org/legal/epl-v10.html">http://www.eclipse.org/legal/epl-v10.html</a>.
- For purposes of the EPL, "Program" will mean the Content.</p>
-
-<p>Content includes, but is not limited to, source code, object code, documentation and other files maintained in the Eclipse Foundation source code
- repository ("Repository") in software modules ("Modules") and made available as downloadable archives ("Downloads").</p>
-
-<ul>
- <li>Content may be structured and packaged into modules to facilitate delivering, extending, and upgrading the Content. Typical modules may include plug-ins ("Plug-ins"), plug-in fragments ("Fragments"), and features ("Features").</li>
- <li>Each Plug-in or Fragment may be packaged as a sub-directory or JAR (Java™ ARchive) in a directory named "plugins".</li>
- <li>A Feature is a bundle of one or more Plug-ins and/or Fragments and associated material. Each Feature may be packaged as a sub-directory in a directory named "features". Within a Feature, files named "feature.xml" may contain a list of the names and version numbers of the Plug-ins
- and/or Fragments associated with that Feature.</li>
- <li>Features may also include other Features ("Included Features"). Within a Feature, files named "feature.xml" may contain a list of the names and version numbers of Included Features.</li>
-</ul>
-
-<p>The terms and conditions governing Plug-ins and Fragments should be contained in files named "about.html" ("Abouts"). The terms and conditions governing Features and
-Included Features should be contained in files named "license.html" ("Feature Licenses"). Abouts and Feature Licenses may be located in any directory of a Download or Module
-including, but not limited to the following locations:</p>
-
-<ul>
- <li>The top-level (root) directory</li>
- <li>Plug-in and Fragment directories</li>
- <li>Inside Plug-ins and Fragments packaged as JARs</li>
- <li>Sub-directories of the directory named "src" of certain Plug-ins</li>
- <li>Feature directories</li>
-</ul>
-
-<p>Note: if a Feature made available by the Eclipse Foundation is installed using the Provisioning Technology (as defined below), you must agree to a license ("Feature Update License") during the
-installation process. If the Feature contains Included Features, the Feature Update License should either provide you with the terms and conditions governing the Included Features or
-inform you where you can locate them. Feature Update Licenses may be found in the "license" property of files named "feature.properties" found within a Feature.
-Such Abouts, Feature Licenses, and Feature Update Licenses contain the terms and conditions (or references to such terms and conditions) that govern your use of the associated Content in
-that directory.</p>
-
-<p>THE ABOUTS, FEATURE LICENSES, AND FEATURE UPDATE LICENSES MAY REFER TO THE EPL OR OTHER LICENSE AGREEMENTS, NOTICES OR TERMS AND CONDITIONS. SOME OF THESE
-OTHER LICENSE AGREEMENTS MAY INCLUDE (BUT ARE NOT LIMITED TO):</p>
-
-<ul>
- <li>Common Public License Version 1.0 (available at <a href="http://www.eclipse.org/legal/cpl-v10.html">http://www.eclipse.org/legal/cpl-v10.html</a>)</li>
- <li>Apache Software License 1.1 (available at <a href="http://www.apache.org/licenses/LICENSE">http://www.apache.org/licenses/LICENSE</a>)</li>
- <li>Apache Software License 2.0 (available at <a href="http://www.apache.org/licenses/LICENSE-2.0">http://www.apache.org/licenses/LICENSE-2.0</a>)</li>
- <li>Metro Link Public License 1.00 (available at <a href="http://www.opengroup.org/openmotif/supporters/metrolink/license.html">http://www.opengroup.org/openmotif/supporters/metrolink/license.html</a>)</li>
- <li>Mozilla Public License Version 1.1 (available at <a href="http://www.mozilla.org/MPL/MPL-1.1.html">http://www.mozilla.org/MPL/MPL-1.1.html</a>)</li>
-</ul>
-
-<p>IT IS YOUR OBLIGATION TO READ AND ACCEPT ALL SUCH TERMS AND CONDITIONS PRIOR TO USE OF THE CONTENT. If no About, Feature License, or Feature Update License is provided, please
-contact the Eclipse Foundation to determine what terms and conditions govern that particular Content.</p>
-
-
-<h3>Use of Provisioning Technology</h3>
-
-<p>The Eclipse Foundation makes available provisioning software, examples of which include, but are not limited to, p2 and the Eclipse
- Update Manager ("Provisioning Technology") for the purpose of allowing users to install software, documentation, information and/or
- other materials (collectively "Installable Software"). This capability is provided with the intent of allowing such users to
- install, extend and update Eclipse-based products. Information about packaging Installable Software is available at <a
- href="http://eclipse.org/equinox/p2/repository_packaging.html">http://eclipse.org/equinox/p2/repository_packaging.html</a>
- ("Specification").</p>
-
-<p>You may use Provisioning Technology to allow other parties to install Installable Software. You shall be responsible for enabling the
- applicable license agreements relating to the Installable Software to be presented to, and accepted by, the users of the Provisioning Technology
- in accordance with the Specification. By using Provisioning Technology in such a manner and making it available in accordance with the
- Specification, you further acknowledge your agreement to, and the acquisition of all necessary rights to permit the following:</p>
-
-<ol>
- <li>A series of actions may occur ("Provisioning Process") in which a user may execute the Provisioning Technology
- on a machine ("Target Machine") with the intent of installing, extending or updating the functionality of an Eclipse-based
- product.</li>
- <li>During the Provisioning Process, the Provisioning Technology may cause third party Installable Software or a portion thereof to be
- accessed and copied to the Target Machine.</li>
- <li>Pursuant to the Specification, you will provide to the user the terms and conditions that govern the use of the Installable
- Software ("Installable Software Agreement") and such Installable Software Agreement shall be accessed from the Target
- Machine in accordance with the Specification. Such Installable Software Agreement must inform the user of the terms and conditions that govern
- the Installable Software and must solicit acceptance by the end user in the manner prescribed in such Installable Software Agreement. Upon such
- indication of agreement by the user, the provisioning Technology will complete installation of the Installable Software.</li>
-</ol>
-
-<h3>Cryptography</h3>
-
-<p>Content may contain encryption software. The country in which you are currently may have restrictions on the import, possession, and use, and/or re-export to
- another country, of encryption software. BEFORE using any encryption software, please check the country's laws, regulations and policies concerning the import,
- possession, or use, and re-export of encryption software, to see if this is permitted.</p>
-
-<p><small>Java and all Java-based trademarks are trademarks of Oracle Corporation in the United States, other countries, or both.</small></p>
-</body>
-</html>
diff --git a/features/org.eclipse.jst.web_core.feature/sourceTemplatePlugin/about.html b/features/org.eclipse.jst.web_core.feature/sourceTemplatePlugin/about.html
deleted file mode 100644
index fe81d46..0000000
--- a/features/org.eclipse.jst.web_core.feature/sourceTemplatePlugin/about.html
+++ /dev/null
@@ -1,27 +0,0 @@
-<!DOCTYPE HTML PUBLIC "-//W3C//DTD HTML 4.0//EN">
-<html>
-<head>
-<title>About</title>
-<meta http-equiv=Content-Type content="text/html; charset=ISO-8859-1">
-</head>
-<body lang="EN-US">
-<h2>About This Content</h2>
-
-<P>June, 2008</P>
-<h3>License</h3>
-
-<p>The Eclipse Foundation makes available all content in this plug-in ("Content"). Unless otherwise indicated below, the Content is provided to you under the terms and conditions of the
-Eclipse Public License Version 1.0 ("EPL"). A copy of the EPL is available at <a href="http://www.eclipse.org/legal/epl-v10.html">http://www.eclipse.org/legal/epl-v10.html</a>.
-For purposes of the EPL, "Program" will mean the Content.</p>
-
-<p>If you did not receive this Content directly from the Eclipse Foundation, the Content is being redistributed by another party ("Redistributor") and different terms and conditions may
-apply to your use of any object code in the Content. Check the Redistributor's license that was provided with the Content. If no such license exists, contact the Redistributor. Unless otherwise
-indicated below, the terms and conditions of the EPL still apply to any source code in the Content.</p>
-
-<h3>Source Code</h3>
-<p>This plug-in contains source code zip files ("Source Zips") that correspond to binary content in other plug-ins. These Source Zips may be distributed under different license
-agreements and/or notices. Details about these license agreements and notices are contained in "about.html" files ("Abouts") located in sub-directories in the
-src/ directory of this plug-in. Such Abouts govern your use of the Source Zips in that directory, not the EPL.</p>
-
-</body>
-</html>
diff --git a/features/org.eclipse.jst.web_core.feature/sourceTemplatePlugin/about.ini b/features/org.eclipse.jst.web_core.feature/sourceTemplatePlugin/about.ini
deleted file mode 100644
index fda5a40..0000000
--- a/features/org.eclipse.jst.web_core.feature/sourceTemplatePlugin/about.ini
+++ /dev/null
@@ -1,31 +0,0 @@
-# about.ini
-# contains information about a feature
-# java.io.Properties file (ISO 8859-1 with "\" escapes)
-# "%key" are externalized strings defined in about.properties
-# This file does not need to be translated.
-
-# Property "aboutText" contains blurb for "About" dialog (translated)
-aboutText=%blurb
-
-# Property "windowImage" contains path to window icon (16x16)
-# needed for primary features only
-
-# Property "featureImage" contains path to feature image (32x32)
-featureImage=wtp_prod32.png
-
-# Property "aboutImage" contains path to product image (500x330 or 115x164)
-# needed for primary features only
-
-# Property "appName" contains name of the application (not translated)
-# needed for primary features only
-
-# Property "welcomePage" contains path to welcome page (special XML-based format)
-# optional
-
-# Property "welcomePerspective" contains the id of the perspective in which the
-# welcome page is to be opened.
-# optional
-
-
-
-
diff --git a/features/org.eclipse.jst.web_core.feature/sourceTemplatePlugin/about.mappings b/features/org.eclipse.jst.web_core.feature/sourceTemplatePlugin/about.mappings
deleted file mode 100644
index 0dfb735..0000000
--- a/features/org.eclipse.jst.web_core.feature/sourceTemplatePlugin/about.mappings
+++ /dev/null
@@ -1,6 +0,0 @@
-# about.mappings
-# contains fill-ins for about.properties
-# java.io.Properties file (ISO 8859-1 with "\" escapes)
-# This file does not need to be translated.
-
-0=@build@
diff --git a/features/org.eclipse.jst.web_core.feature/sourceTemplatePlugin/about.properties b/features/org.eclipse.jst.web_core.feature/sourceTemplatePlugin/about.properties
deleted file mode 100644
index cedcbea..0000000
--- a/features/org.eclipse.jst.web_core.feature/sourceTemplatePlugin/about.properties
+++ /dev/null
@@ -1,26 +0,0 @@
-###############################################################################
-# Copyright (c) 2000, 2005 IBM Corporation and others.
-# All rights reserved. This program and the accompanying materials
-# are made available under the terms of the Eclipse Public License v1.0
-# which accompanies this distribution, and is available at
-# http://www.eclipse.org/legal/epl-v10.html
-#
-# Contributors:
-# IBM Corporation - initial API and implementation
-###############################################################################
-# about.properties
-# contains externalized strings for about.ini
-# java.io.Properties file (ISO 8859-1 with "\" escapes)
-# fill-ins are supplied by about.mappings
-# This file should be translated.
-#
-# Do not translate any values surrounded by {}
-
-blurb=J2EE Standard Tools - Web Core\n\
-\n\
-Version: {featureVersion}\n\
-Build id: {0}\n\
-\n\
-(c) Copyright Eclipse contributors and others 2005. All rights reserved.\n\
-Visit http://www.eclipse.org/webtools
-
diff --git a/features/org.eclipse.jst.web_core.feature/sourceTemplatePlugin/build.properties b/features/org.eclipse.jst.web_core.feature/sourceTemplatePlugin/build.properties
deleted file mode 100644
index ead512d..0000000
--- a/features/org.eclipse.jst.web_core.feature/sourceTemplatePlugin/build.properties
+++ /dev/null
@@ -1,2 +0,0 @@
-bin.includes = about.html, about.ini, about.mappings, about.properties, wtp_prod32.png, plugin.properties, plugin.xml, src/**, META-INF/
-sourcePlugin = true
diff --git a/features/org.eclipse.jst.web_core.feature/sourceTemplatePlugin/plugin.properties b/features/org.eclipse.jst.web_core.feature/sourceTemplatePlugin/plugin.properties
deleted file mode 100644
index f188816..0000000
--- a/features/org.eclipse.jst.web_core.feature/sourceTemplatePlugin/plugin.properties
+++ /dev/null
@@ -1,12 +0,0 @@
-###############################################################################
-# Copyright (c) 2005 IBM Corporation and others.
-# All rights reserved. This program and the accompanying materials
-# are made available under the terms of the Eclipse Public License v1.0
-# which accompanies this distribution, and is available at
-# http://www.eclipse.org/legal/epl-v10.html
-#
-# Contributors:
-# IBM Corporation - initial API and implementation
-###############################################################################
-pluginName=J2EE Standard Tools - Web Core Source
-providerName=Eclipse.org
diff --git a/features/org.eclipse.jst.web_core.feature/sourceTemplatePlugin/wtp_prod32.gif b/features/org.eclipse.jst.web_core.feature/sourceTemplatePlugin/wtp_prod32.gif
deleted file mode 100644
index eefb44a..0000000
--- a/features/org.eclipse.jst.web_core.feature/sourceTemplatePlugin/wtp_prod32.gif
+++ /dev/null
Binary files differ
diff --git a/features/org.eclipse.jst.web_core.feature/sourceTemplatePlugin/wtp_prod32.png b/features/org.eclipse.jst.web_core.feature/sourceTemplatePlugin/wtp_prod32.png
deleted file mode 100644
index bfceab3..0000000
--- a/features/org.eclipse.jst.web_core.feature/sourceTemplatePlugin/wtp_prod32.png
+++ /dev/null
Binary files differ
diff --git a/features/org.eclipse.jst.web_sdk.feature/.cvsignore b/features/org.eclipse.jst.web_sdk.feature/.cvsignore
deleted file mode 100644
index 262183f..0000000
--- a/features/org.eclipse.jst.web_sdk.feature/.cvsignore
+++ /dev/null
@@ -1,5 +0,0 @@
-build.xml
-org.eclipse.jst.web_sdk.feature_1.0.0.bin.dist.zip
-features
-plugins
-dev.properties
diff --git a/features/org.eclipse.jst.web_sdk.feature/.project b/features/org.eclipse.jst.web_sdk.feature/.project
deleted file mode 100644
index 0aa6f52..0000000
--- a/features/org.eclipse.jst.web_sdk.feature/.project
+++ /dev/null
@@ -1,17 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<projectDescription>
- <name>org.eclipse.jst.web_sdk.feature</name>
- <comment></comment>
- <projects>
- </projects>
- <buildSpec>
- <buildCommand>
- <name>org.eclipse.pde.FeatureBuilder</name>
- <arguments>
- </arguments>
- </buildCommand>
- </buildSpec>
- <natures>
- <nature>org.eclipse.pde.FeatureNature</nature>
- </natures>
-</projectDescription>
diff --git a/features/org.eclipse.jst.web_sdk.feature/build.properties b/features/org.eclipse.jst.web_sdk.feature/build.properties
deleted file mode 100644
index f8e0401..0000000
--- a/features/org.eclipse.jst.web_sdk.feature/build.properties
+++ /dev/null
@@ -1,8 +0,0 @@
-bin.includes = feature.xml,\
- eclipse_update_120.jpg,\
- epl-v10.html,\
- license.html,\
- feature.properties
-
-
-generate.feature@org.eclipse.jst.web_ui.feature.source=org.eclipse.jst.web_ui.feature, feature@org.eclipse.jst.web_core.feature.source
diff --git a/features/org.eclipse.jst.web_sdk.feature/eclipse_update_120.jpg b/features/org.eclipse.jst.web_sdk.feature/eclipse_update_120.jpg
deleted file mode 100644
index bfdf708..0000000
--- a/features/org.eclipse.jst.web_sdk.feature/eclipse_update_120.jpg
+++ /dev/null
Binary files differ
diff --git a/features/org.eclipse.jst.web_sdk.feature/epl-v10.html b/features/org.eclipse.jst.web_sdk.feature/epl-v10.html
deleted file mode 100644
index ed4b196..0000000
--- a/features/org.eclipse.jst.web_sdk.feature/epl-v10.html
+++ /dev/null
@@ -1,328 +0,0 @@
-<html xmlns:o="urn:schemas-microsoft-com:office:office"
-xmlns:w="urn:schemas-microsoft-com:office:word"
-xmlns="http://www.w3.org/TR/REC-html40">
-
-<head>
-<meta http-equiv=Content-Type content="text/html; charset=windows-1252">
-<meta name=ProgId content=Word.Document>
-<meta name=Generator content="Microsoft Word 9">
-<meta name=Originator content="Microsoft Word 9">
-<link rel=File-List
-href="./Eclipse%20EPL%202003_11_10%20Final_files/filelist.xml">
-<title>Eclipse Public License - Version 1.0</title>
-<!--[if gte mso 9]><xml>
- <o:DocumentProperties>
- <o:Revision>2</o:Revision>
- <o:TotalTime>3</o:TotalTime>
- <o:Created>2004-03-05T23:03:00Z</o:Created>
- <o:LastSaved>2004-03-05T23:03:00Z</o:LastSaved>
- <o:Pages>4</o:Pages>
- <o:Words>1626</o:Words>
- <o:Characters>9270</o:Characters>
- <o:Lines>77</o:Lines>
- <o:Paragraphs>18</o:Paragraphs>
- <o:CharactersWithSpaces>11384</o:CharactersWithSpaces>
- <o:Version>9.4402</o:Version>
- </o:DocumentProperties>
-</xml><![endif]--><!--[if gte mso 9]><xml>
- <w:WordDocument>
- <w:TrackRevisions/>
- </w:WordDocument>
-</xml><![endif]-->
-<style>
-<!--
- /* Font Definitions */
-@font-face
- {font-family:Tahoma;
- panose-1:2 11 6 4 3 5 4 4 2 4;
- mso-font-charset:0;
- mso-generic-font-family:swiss;
- mso-font-pitch:variable;
- mso-font-signature:553679495 -2147483648 8 0 66047 0;}
- /* Style Definitions */
-p.MsoNormal, li.MsoNormal, div.MsoNormal
- {mso-style-parent:"";
- margin:0in;
- margin-bottom:.0001pt;
- mso-pagination:widow-orphan;
- font-size:12.0pt;
- font-family:"Times New Roman";
- mso-fareast-font-family:"Times New Roman";}
-p
- {margin-right:0in;
- mso-margin-top-alt:auto;
- mso-margin-bottom-alt:auto;
- margin-left:0in;
- mso-pagination:widow-orphan;
- font-size:12.0pt;
- font-family:"Times New Roman";
- mso-fareast-font-family:"Times New Roman";}
-p.BalloonText, li.BalloonText, div.BalloonText
- {mso-style-name:"Balloon Text";
- margin:0in;
- margin-bottom:.0001pt;
- mso-pagination:widow-orphan;
- font-size:8.0pt;
- font-family:Tahoma;
- mso-fareast-font-family:"Times New Roman";}
-@page Section1
- {size:8.5in 11.0in;
- margin:1.0in 1.25in 1.0in 1.25in;
- mso-header-margin:.5in;
- mso-footer-margin:.5in;
- mso-paper-source:0;}
-div.Section1
- {page:Section1;}
--->
-</style>
-</head>
-
-<body lang=EN-US style='tab-interval:.5in'>
-
-<div class=Section1>
-
-<p align=center style='text-align:center'><b>Eclipse Public License - v 1.0</b>
-</p>
-
-<p><span style='font-size:10.0pt'>THE ACCOMPANYING PROGRAM IS PROVIDED UNDER
-THE TERMS OF THIS ECLIPSE PUBLIC LICENSE ("AGREEMENT"). ANY USE,
-REPRODUCTION OR DISTRIBUTION OF THE PROGRAM CONSTITUTES RECIPIENT'S ACCEPTANCE
-OF THIS AGREEMENT.</span> </p>
-
-<p><b><span style='font-size:10.0pt'>1. DEFINITIONS</span></b> </p>
-
-<p><span style='font-size:10.0pt'>"Contribution" means:</span> </p>
-
-<p class=MsoNormal style='margin-left:.5in'><span style='font-size:10.0pt'>a)
-in the case of the initial Contributor, the initial code and documentation
-distributed under this Agreement, and<br clear=left>
-b) in the case of each subsequent Contributor:</span></p>
-
-<p class=MsoNormal style='margin-left:.5in'><span style='font-size:10.0pt'>i)
-changes to the Program, and</span></p>
-
-<p class=MsoNormal style='margin-left:.5in'><span style='font-size:10.0pt'>ii)
-additions to the Program;</span></p>
-
-<p class=MsoNormal style='margin-left:.5in'><span style='font-size:10.0pt'>where
-such changes and/or additions to the Program originate from and are distributed
-by that particular Contributor. A Contribution 'originates' from a Contributor
-if it was added to the Program by such Contributor itself or anyone acting on
-such Contributor's behalf. Contributions do not include additions to the
-Program which: (i) are separate modules of software distributed in conjunction
-with the Program under their own license agreement, and (ii) are not derivative
-works of the Program. </span></p>
-
-<p><span style='font-size:10.0pt'>"Contributor" means any person or
-entity that distributes the Program.</span> </p>
-
-<p><span style='font-size:10.0pt'>"Licensed Patents " mean patent
-claims licensable by a Contributor which are necessarily infringed by the use
-or sale of its Contribution alone or when combined with the Program. </span></p>
-
-<p><span style='font-size:10.0pt'>"Program" means the Contributions
-distributed in accordance with this Agreement.</span> </p>
-
-<p><span style='font-size:10.0pt'>"Recipient" means anyone who
-receives the Program under this Agreement, including all Contributors.</span> </p>
-
-<p><b><span style='font-size:10.0pt'>2. GRANT OF RIGHTS</span></b> </p>
-
-<p class=MsoNormal style='margin-left:.5in'><span style='font-size:10.0pt'>a)
-Subject to the terms of this Agreement, each Contributor hereby grants Recipient
-a non-exclusive, worldwide, royalty-free copyright license to<span
-style='color:red'> </span>reproduce, prepare derivative works of, publicly
-display, publicly perform, distribute and sublicense the Contribution of such
-Contributor, if any, and such derivative works, in source code and object code
-form.</span></p>
-
-<p class=MsoNormal style='margin-left:.5in'><span style='font-size:10.0pt'>b)
-Subject to the terms of this Agreement, each Contributor hereby grants
-Recipient a non-exclusive, worldwide,<span style='color:green'> </span>royalty-free
-patent license under Licensed Patents to make, use, sell, offer to sell, import
-and otherwise transfer the Contribution of such Contributor, if any, in source
-code and object code form. This patent license shall apply to the combination
-of the Contribution and the Program if, at the time the Contribution is added
-by the Contributor, such addition of the Contribution causes such combination
-to be covered by the Licensed Patents. The patent license shall not apply to
-any other combinations which include the Contribution. No hardware per se is
-licensed hereunder. </span></p>
-
-<p class=MsoNormal style='margin-left:.5in'><span style='font-size:10.0pt'>c)
-Recipient understands that although each Contributor grants the licenses to its
-Contributions set forth herein, no assurances are provided by any Contributor
-that the Program does not infringe the patent or other intellectual property
-rights of any other entity. Each Contributor disclaims any liability to Recipient
-for claims brought by any other entity based on infringement of intellectual
-property rights or otherwise. As a condition to exercising the rights and
-licenses granted hereunder, each Recipient hereby assumes sole responsibility
-to secure any other intellectual property rights needed, if any. For example,
-if a third party patent license is required to allow Recipient to distribute
-the Program, it is Recipient's responsibility to acquire that license before
-distributing the Program.</span></p>
-
-<p class=MsoNormal style='margin-left:.5in'><span style='font-size:10.0pt'>d)
-Each Contributor represents that to its knowledge it has sufficient copyright
-rights in its Contribution, if any, to grant the copyright license set forth in
-this Agreement. </span></p>
-
-<p><b><span style='font-size:10.0pt'>3. REQUIREMENTS</span></b> </p>
-
-<p><span style='font-size:10.0pt'>A Contributor may choose to distribute the
-Program in object code form under its own license agreement, provided that:</span>
-</p>
-
-<p class=MsoNormal style='margin-left:.5in'><span style='font-size:10.0pt'>a)
-it complies with the terms and conditions of this Agreement; and</span></p>
-
-<p class=MsoNormal style='margin-left:.5in'><span style='font-size:10.0pt'>b)
-its license agreement:</span></p>
-
-<p class=MsoNormal style='margin-left:.5in'><span style='font-size:10.0pt'>i)
-effectively disclaims on behalf of all Contributors all warranties and
-conditions, express and implied, including warranties or conditions of title
-and non-infringement, and implied warranties or conditions of merchantability
-and fitness for a particular purpose; </span></p>
-
-<p class=MsoNormal style='margin-left:.5in'><span style='font-size:10.0pt'>ii)
-effectively excludes on behalf of all Contributors all liability for damages,
-including direct, indirect, special, incidental and consequential damages, such
-as lost profits; </span></p>
-
-<p class=MsoNormal style='margin-left:.5in'><span style='font-size:10.0pt'>iii)
-states that any provisions which differ from this Agreement are offered by that
-Contributor alone and not by any other party; and</span></p>
-
-<p class=MsoNormal style='margin-left:.5in'><span style='font-size:10.0pt'>iv)
-states that source code for the Program is available from such Contributor, and
-informs licensees how to obtain it in a reasonable manner on or through a
-medium customarily used for software exchange.<span style='color:blue'> </span></span></p>
-
-<p><span style='font-size:10.0pt'>When the Program is made available in source
-code form:</span> </p>
-
-<p class=MsoNormal style='margin-left:.5in'><span style='font-size:10.0pt'>a)
-it must be made available under this Agreement; and </span></p>
-
-<p class=MsoNormal style='margin-left:.5in'><span style='font-size:10.0pt'>b) a
-copy of this Agreement must be included with each copy of the Program. </span></p>
-
-<p><span style='font-size:10.0pt'>Contributors may not remove or alter any
-copyright notices contained within the Program. </span></p>
-
-<p><span style='font-size:10.0pt'>Each Contributor must identify itself as the
-originator of its Contribution, if any, in a manner that reasonably allows
-subsequent Recipients to identify the originator of the Contribution. </span></p>
-
-<p><b><span style='font-size:10.0pt'>4. COMMERCIAL DISTRIBUTION</span></b> </p>
-
-<p><span style='font-size:10.0pt'>Commercial distributors of software may
-accept certain responsibilities with respect to end users, business partners
-and the like. While this license is intended to facilitate the commercial use
-of the Program, the Contributor who includes the Program in a commercial
-product offering should do so in a manner which does not create potential
-liability for other Contributors. Therefore, if a Contributor includes the
-Program in a commercial product offering, such Contributor ("Commercial
-Contributor") hereby agrees to defend and indemnify every other
-Contributor ("Indemnified Contributor") against any losses, damages and
-costs (collectively "Losses") arising from claims, lawsuits and other
-legal actions brought by a third party against the Indemnified Contributor to
-the extent caused by the acts or omissions of such Commercial Contributor in
-connection with its distribution of the Program in a commercial product
-offering. The obligations in this section do not apply to any claims or Losses
-relating to any actual or alleged intellectual property infringement. In order
-to qualify, an Indemnified Contributor must: a) promptly notify the Commercial
-Contributor in writing of such claim, and b) allow the Commercial Contributor
-to control, and cooperate with the Commercial Contributor in, the defense and
-any related settlement negotiations. The Indemnified Contributor may participate
-in any such claim at its own expense.</span> </p>
-
-<p><span style='font-size:10.0pt'>For example, a Contributor might include the
-Program in a commercial product offering, Product X. That Contributor is then a
-Commercial Contributor. If that Commercial Contributor then makes performance
-claims, or offers warranties related to Product X, those performance claims and
-warranties are such Commercial Contributor's responsibility alone. Under this
-section, the Commercial Contributor would have to defend claims against the
-other Contributors related to those performance claims and warranties, and if a
-court requires any other Contributor to pay any damages as a result, the
-Commercial Contributor must pay those damages.</span> </p>
-
-<p><b><span style='font-size:10.0pt'>5. NO WARRANTY</span></b> </p>
-
-<p><span style='font-size:10.0pt'>EXCEPT AS EXPRESSLY SET FORTH IN THIS
-AGREEMENT, THE PROGRAM IS PROVIDED ON AN "AS IS" BASIS, WITHOUT
-WARRANTIES OR CONDITIONS OF ANY KIND, EITHER EXPRESS OR IMPLIED INCLUDING,
-WITHOUT LIMITATION, ANY WARRANTIES OR CONDITIONS OF TITLE, NON-INFRINGEMENT,
-MERCHANTABILITY OR FITNESS FOR A PARTICULAR PURPOSE. Each Recipient is solely
-responsible for determining the appropriateness of using and distributing the
-Program and assumes all risks associated with its exercise of rights under this
-Agreement , including but not limited to the risks and costs of program errors,
-compliance with applicable laws, damage to or loss of data, programs or
-equipment, and unavailability or interruption of operations. </span></p>
-
-<p><b><span style='font-size:10.0pt'>6. DISCLAIMER OF LIABILITY</span></b> </p>
-
-<p><span style='font-size:10.0pt'>EXCEPT AS EXPRESSLY SET FORTH IN THIS
-AGREEMENT, NEITHER RECIPIENT NOR ANY CONTRIBUTORS SHALL HAVE ANY LIABILITY FOR
-ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES
-(INCLUDING WITHOUT LIMITATION LOST PROFITS), HOWEVER CAUSED AND ON ANY THEORY
-OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING
-NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OR DISTRIBUTION OF
-THE PROGRAM OR THE EXERCISE OF ANY RIGHTS GRANTED HEREUNDER, EVEN IF ADVISED OF
-THE POSSIBILITY OF SUCH DAMAGES.</span> </p>
-
-<p><b><span style='font-size:10.0pt'>7. GENERAL</span></b> </p>
-
-<p><span style='font-size:10.0pt'>If any provision of this Agreement is invalid
-or unenforceable under applicable law, it shall not affect the validity or
-enforceability of the remainder of the terms of this Agreement, and without
-further action by the parties hereto, such provision shall be reformed to the
-minimum extent necessary to make such provision valid and enforceable.</span> </p>
-
-<p><span style='font-size:10.0pt'>If Recipient institutes patent litigation
-against any entity (including a cross-claim or counterclaim in a lawsuit)
-alleging that the Program itself (excluding combinations of the Program with
-other software or hardware) infringes such Recipient's patent(s), then such
-Recipient's rights granted under Section 2(b) shall terminate as of the date
-such litigation is filed. </span></p>
-
-<p><span style='font-size:10.0pt'>All Recipient's rights under this Agreement
-shall terminate if it fails to comply with any of the material terms or
-conditions of this Agreement and does not cure such failure in a reasonable
-period of time after becoming aware of such noncompliance. If all Recipient's
-rights under this Agreement terminate, Recipient agrees to cease use and
-distribution of the Program as soon as reasonably practicable. However,
-Recipient's obligations under this Agreement and any licenses granted by
-Recipient relating to the Program shall continue and survive. </span></p>
-
-<p><span style='font-size:10.0pt'>Everyone is permitted to copy and distribute
-copies of this Agreement, but in order to avoid inconsistency the Agreement is
-copyrighted and may only be modified in the following manner. The Agreement
-Steward reserves the right to publish new versions (including revisions) of
-this Agreement from time to time. No one other than the Agreement Steward has
-the right to modify this Agreement. The Eclipse Foundation is the initial
-Agreement Steward. The Eclipse Foundation may assign the responsibility to
-serve as the Agreement Steward to a suitable separate entity. Each new version
-of the Agreement will be given a distinguishing version number. The Program
-(including Contributions) may always be distributed subject to the version of
-the Agreement under which it was received. In addition, after a new version of
-the Agreement is published, Contributor may elect to distribute the Program
-(including its Contributions) under the new version. Except as expressly stated
-in Sections 2(a) and 2(b) above, Recipient receives no rights or licenses to
-the intellectual property of any Contributor under this Agreement, whether
-expressly, by implication, estoppel or otherwise. All rights in the Program not
-expressly granted under this Agreement are reserved.</span> </p>
-
-<p><span style='font-size:10.0pt'>This Agreement is governed by the laws of the
-State of New York and the intellectual property laws of the United States of
-America. No party to this Agreement will bring a legal action under this
-Agreement more than one year after the cause of action arose. Each party waives
-its rights to a jury trial in any resulting litigation.</span> </p>
-
-<p class=MsoNormal><![if !supportEmptyParas]> <![endif]><o:p></o:p></p>
-
-</div>
-
-</body>
-
-</html>
\ No newline at end of file
diff --git a/features/org.eclipse.jst.web_sdk.feature/feature.properties b/features/org.eclipse.jst.web_sdk.feature/feature.properties
deleted file mode 100644
index 8c5fb58..0000000
--- a/features/org.eclipse.jst.web_sdk.feature/feature.properties
+++ /dev/null
@@ -1,168 +0,0 @@
-###############################################################################
-# Copyright (c) 2006 IBM Corporation and others.
-# All rights reserved. This program and the accompanying materials
-# are made available under the terms of the Eclipse Public License v1.0
-# which accompanies this distribution, and is available at
-# http://www.eclipse.org/legal/epl-v10.html
-#
-# Contributors:
-# IBM Corporation - initial API and implementation
-###############################################################################
-# feature.properties
-# contains externalized strings for feature.xml
-# "%foo" in feature.xml corresponds to the key "foo" in this file
-# java.io.Properties file (ISO 8859-1 with "\" escapes)
-# This file should be translated.
-
-# "featureName" property - name of the feature
-featureName=JST Web Plug-in Developer Resources
-
-# "providerName" property - name of the company that provides the feature
-providerName=Eclipse Web Tools Platform
-
-
-# "description" property - description of the feature
-description=Source code zips for JST Web tools
-
-# "copyright" property - text of the "Feature Update Copyright"
-copyright=\
-Copyright (c) 2006 IBM Corporation and others.\n\
-All rights reserved. This program and the accompanying materials\n\
-are made available under the terms of the Eclipse Public License v1.0\n\
-which accompanies this distribution, and is available at\n\
-http://www.eclipse.org/legal/epl-v10.html\n\
-\n\
-Contributors:\n\
- IBM Corporation - initial API and implementation\n
-################ end of copyright property ####################################
-
-# "licenseURL" property - URL of the "Feature License"
-# do not translate value - just change to point to a locale-specific HTML page
-licenseURL=license.html
-
-# "license" property - text of the "Feature Update License"
-# should be plain text version of license agreement pointed to be "licenseURL"
-license=\
-Eclipse Foundation Software User Agreement\n\
-April 14, 2010\n\
-\n\
-Usage Of Content\n\
-\n\
-THE ECLIPSE FOUNDATION MAKES AVAILABLE SOFTWARE, DOCUMENTATION, INFORMATION AND/OR\n\
-OTHER MATERIALS FOR OPEN SOURCE PROJECTS (COLLECTIVELY "CONTENT").\n\
-USE OF THE CONTENT IS GOVERNED BY THE TERMS AND CONDITIONS OF THIS\n\
-AGREEMENT AND/OR THE TERMS AND CONDITIONS OF LICENSE AGREEMENTS OR\n\
-NOTICES INDICATED OR REFERENCED BELOW. BY USING THE CONTENT, YOU\n\
-AGREE THAT YOUR USE OF THE CONTENT IS GOVERNED BY THIS AGREEMENT\n\
-AND/OR THE TERMS AND CONDITIONS OF ANY APPLICABLE LICENSE AGREEMENTS\n\
-OR NOTICES INDICATED OR REFERENCED BELOW. IF YOU DO NOT AGREE TO THE\n\
-TERMS AND CONDITIONS OF THIS AGREEMENT AND THE TERMS AND CONDITIONS\n\
-OF ANY APPLICABLE LICENSE AGREEMENTS OR NOTICES INDICATED OR REFERENCED\n\
-BELOW, THEN YOU MAY NOT USE THE CONTENT.\n\
-\n\
-Applicable Licenses\n\
-\n\
-Unless otherwise indicated, all Content made available by the\n\
-Eclipse Foundation is provided to you under the terms and conditions of\n\
-the Eclipse Public License Version 1.0 ("EPL"). A copy of the EPL is\n\
-provided with this Content and is also available at http://www.eclipse.org/legal/epl-v10.html.\n\
-For purposes of the EPL, "Program" will mean the Content.\n\
-\n\
-Content includes, but is not limited to, source code, object code,\n\
-documentation and other files maintained in the Eclipse Foundation source code\n\
-repository ("Repository") in software modules ("Modules") and made available\n\
-as downloadable archives ("Downloads").\n\
-\n\
- - Content may be structured and packaged into modules to facilitate delivering,\n\
- extending, and upgrading the Content. Typical modules may include plug-ins ("Plug-ins"),\n\
- plug-in fragments ("Fragments"), and features ("Features").\n\
- - Each Plug-in or Fragment may be packaged as a sub-directory or JAR (Java(TM) ARchive)\n\
- in a directory named "plugins".\n\
- - A Feature is a bundle of one or more Plug-ins and/or Fragments and associated material.\n\
- Each Feature may be packaged as a sub-directory in a directory named "features".\n\
- Within a Feature, files named "feature.xml" may contain a list of the names and version\n\
- numbers of the Plug-ins and/or Fragments associated with that Feature.\n\
- - Features may also include other Features ("Included Features"). Within a Feature, files\n\
- named "feature.xml" may contain a list of the names and version numbers of Included Features.\n\
-\n\
-The terms and conditions governing Plug-ins and Fragments should be\n\
-contained in files named "about.html" ("Abouts"). The terms and\n\
-conditions governing Features and Included Features should be contained\n\
-in files named "license.html" ("Feature Licenses"). Abouts and Feature\n\
-Licenses may be located in any directory of a Download or Module\n\
-including, but not limited to the following locations:\n\
-\n\
- - The top-level (root) directory\n\
- - Plug-in and Fragment directories\n\
- - Inside Plug-ins and Fragments packaged as JARs\n\
- - Sub-directories of the directory named "src" of certain Plug-ins\n\
- - Feature directories\n\
-\n\
-Note: if a Feature made available by the Eclipse Foundation is installed using the\n\
-Provisioning Technology (as defined below), you must agree to a license ("Feature \n\
-Update License") during the installation process. If the Feature contains\n\
-Included Features, the Feature Update License should either provide you\n\
-with the terms and conditions governing the Included Features or inform\n\
-you where you can locate them. Feature Update Licenses may be found in\n\
-the "license" property of files named "feature.properties" found within a Feature.\n\
-Such Abouts, Feature Licenses, and Feature Update Licenses contain the\n\
-terms and conditions (or references to such terms and conditions) that\n\
-govern your use of the associated Content in that directory.\n\
-\n\
-THE ABOUTS, FEATURE LICENSES, AND FEATURE UPDATE LICENSES MAY REFER\n\
-TO THE EPL OR OTHER LICENSE AGREEMENTS, NOTICES OR TERMS AND CONDITIONS.\n\
-SOME OF THESE OTHER LICENSE AGREEMENTS MAY INCLUDE (BUT ARE NOT LIMITED TO):\n\
-\n\
- - Common Public License Version 1.0 (available at http://www.eclipse.org/legal/cpl-v10.html)\n\
- - Apache Software License 1.1 (available at http://www.apache.org/licenses/LICENSE)\n\
- - Apache Software License 2.0 (available at http://www.apache.org/licenses/LICENSE-2.0)\n\
- - Metro Link Public License 1.00 (available at http://www.opengroup.org/openmotif/supporters/metrolink/license.html)\n\
- - Mozilla Public License Version 1.1 (available at http://www.mozilla.org/MPL/MPL-1.1.html)\n\
-\n\
-IT IS YOUR OBLIGATION TO READ AND ACCEPT ALL SUCH TERMS AND CONDITIONS PRIOR\n\
-TO USE OF THE CONTENT. If no About, Feature License, or Feature Update License\n\
-is provided, please contact the Eclipse Foundation to determine what terms and conditions\n\
-govern that particular Content.\n\
-\n\
-\n\Use of Provisioning Technology\n\
-\n\
-The Eclipse Foundation makes available provisioning software, examples of which include,\n\
-but are not limited to, p2 and the Eclipse Update Manager ("Provisioning Technology") for\n\
-the purpose of allowing users to install software, documentation, information and/or\n\
-other materials (collectively "Installable Software"). This capability is provided with\n\
-the intent of allowing such users to install, extend and update Eclipse-based products.\n\
-Information about packaging Installable Software is available at\n\
-http://eclipse.org/equinox/p2/repository_packaging.html ("Specification").\n\
-\n\
-You may use Provisioning Technology to allow other parties to install Installable Software.\n\
-You shall be responsible for enabling the applicable license agreements relating to the\n\
-Installable Software to be presented to, and accepted by, the users of the Provisioning Technology\n\
-in accordance with the Specification. By using Provisioning Technology in such a manner and\n\
-making it available in accordance with the Specification, you further acknowledge your\n\
-agreement to, and the acquisition of all necessary rights to permit the following:\n\
-\n\
- 1. A series of actions may occur ("Provisioning Process") in which a user may execute\n\
- the Provisioning Technology on a machine ("Target Machine") with the intent of installing,\n\
- extending or updating the functionality of an Eclipse-based product.\n\
- 2. During the Provisioning Process, the Provisioning Technology may cause third party\n\
- Installable Software or a portion thereof to be accessed and copied to the Target Machine.\n\
- 3. Pursuant to the Specification, you will provide to the user the terms and conditions that\n\
- govern the use of the Installable Software ("Installable Software Agreement") and such\n\
- Installable Software Agreement shall be accessed from the Target Machine in accordance\n\
- with the Specification. Such Installable Software Agreement must inform the user of the\n\
- terms and conditions that govern the Installable Software and must solicit acceptance by\n\
- the end user in the manner prescribed in such Installable Software Agreement. Upon such\n\
- indication of agreement by the user, the provisioning Technology will complete installation\n\
- of the Installable Software.\n\
-\n\
-Cryptography\n\
-\n\
-Content may contain encryption software. The country in which you are\n\
-currently may have restrictions on the import, possession, and use,\n\
-and/or re-export to another country, of encryption software. BEFORE\n\
-using any encryption software, please check the country's laws,\n\
-regulations and policies concerning the import, possession, or use, and\n\
-re-export of encryption software, to see if this is permitted.\n\
-\n\
-Java and all Java-based trademarks are trademarks of Oracle Corporation in the United States, other countries, or both.\n
-########### end of license property ##########################################
diff --git a/features/org.eclipse.jst.web_sdk.feature/feature.xml b/features/org.eclipse.jst.web_sdk.feature/feature.xml
deleted file mode 100644
index 659109b..0000000
--- a/features/org.eclipse.jst.web_sdk.feature/feature.xml
+++ /dev/null
@@ -1,39 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<feature
- id="org.eclipse.jst.web_sdk.feature"
- label="%featureName"
- version="3.2.3.qualifier"
- provider-name="%providerName">
-
- <description>
- %description
- </description>
-
- <copyright>
- %copyright
- </copyright>
-
- <license url="license.html">
- %license
- </license>
-
- <includes
- id="org.eclipse.wst.ws_sdk.feature"
- version="0.0.0"/>
-
- <includes
- id="org.eclipse.jst.web_ui.feature"
- version="0.0.0"/>
-
- <includes
- id="org.eclipse.jst.web_ui.feature.source"
- version="0.0.0"/>
-
- <plugin
- id="org.eclipse.jst.jsf.doc.dev"
- download-size="0"
- install-size="0"
- version="0.0.0"
- unpack="false"/>
-
-</feature>
diff --git a/features/org.eclipse.jst.web_sdk.feature/license.html b/features/org.eclipse.jst.web_sdk.feature/license.html
deleted file mode 100644
index c184ca3..0000000
--- a/features/org.eclipse.jst.web_sdk.feature/license.html
+++ /dev/null
@@ -1,107 +0,0 @@
-<?xml version="1.0" encoding="ISO-8859-1" ?>
-<!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.0 Strict//EN" "http://www.w3.org/TR/xhtml1/DTD/xhtml1-strict.dtd">
-<html xmlns="http://www.w3.org/1999/xhtml">
-<head>
-<meta http-equiv="Content-Type" content="text/html; charset=ISO-8859-1" />
-<title>Eclipse Foundation Software User Agreement</title>
-</head>
-
-<body lang="EN-US">
-<h2>Eclipse Foundation Software User Agreement</h2>
-<p>April 14, 2010</p>
-
-<h3>Usage Of Content</h3>
-
-<p>THE ECLIPSE FOUNDATION MAKES AVAILABLE SOFTWARE, DOCUMENTATION, INFORMATION AND/OR OTHER MATERIALS FOR OPEN SOURCE PROJECTS
- (COLLECTIVELY "CONTENT"). USE OF THE CONTENT IS GOVERNED BY THE TERMS AND CONDITIONS OF THIS AGREEMENT AND/OR THE TERMS AND
- CONDITIONS OF LICENSE AGREEMENTS OR NOTICES INDICATED OR REFERENCED BELOW. BY USING THE CONTENT, YOU AGREE THAT YOUR USE
- OF THE CONTENT IS GOVERNED BY THIS AGREEMENT AND/OR THE TERMS AND CONDITIONS OF ANY APPLICABLE LICENSE AGREEMENTS OR
- NOTICES INDICATED OR REFERENCED BELOW. IF YOU DO NOT AGREE TO THE TERMS AND CONDITIONS OF THIS AGREEMENT AND THE TERMS AND
- CONDITIONS OF ANY APPLICABLE LICENSE AGREEMENTS OR NOTICES INDICATED OR REFERENCED BELOW, THEN YOU MAY NOT USE THE CONTENT.</p>
-
-<h3>Applicable Licenses</h3>
-
-<p>Unless otherwise indicated, all Content made available by the Eclipse Foundation is provided to you under the terms and conditions of the Eclipse Public License Version 1.0
- ("EPL"). A copy of the EPL is provided with this Content and is also available at <a href="http://www.eclipse.org/legal/epl-v10.html">http://www.eclipse.org/legal/epl-v10.html</a>.
- For purposes of the EPL, "Program" will mean the Content.</p>
-
-<p>Content includes, but is not limited to, source code, object code, documentation and other files maintained in the Eclipse Foundation source code
- repository ("Repository") in software modules ("Modules") and made available as downloadable archives ("Downloads").</p>
-
-<ul>
- <li>Content may be structured and packaged into modules to facilitate delivering, extending, and upgrading the Content. Typical modules may include plug-ins ("Plug-ins"), plug-in fragments ("Fragments"), and features ("Features").</li>
- <li>Each Plug-in or Fragment may be packaged as a sub-directory or JAR (Java™ ARchive) in a directory named "plugins".</li>
- <li>A Feature is a bundle of one or more Plug-ins and/or Fragments and associated material. Each Feature may be packaged as a sub-directory in a directory named "features". Within a Feature, files named "feature.xml" may contain a list of the names and version numbers of the Plug-ins
- and/or Fragments associated with that Feature.</li>
- <li>Features may also include other Features ("Included Features"). Within a Feature, files named "feature.xml" may contain a list of the names and version numbers of Included Features.</li>
-</ul>
-
-<p>The terms and conditions governing Plug-ins and Fragments should be contained in files named "about.html" ("Abouts"). The terms and conditions governing Features and
-Included Features should be contained in files named "license.html" ("Feature Licenses"). Abouts and Feature Licenses may be located in any directory of a Download or Module
-including, but not limited to the following locations:</p>
-
-<ul>
- <li>The top-level (root) directory</li>
- <li>Plug-in and Fragment directories</li>
- <li>Inside Plug-ins and Fragments packaged as JARs</li>
- <li>Sub-directories of the directory named "src" of certain Plug-ins</li>
- <li>Feature directories</li>
-</ul>
-
-<p>Note: if a Feature made available by the Eclipse Foundation is installed using the Provisioning Technology (as defined below), you must agree to a license ("Feature Update License") during the
-installation process. If the Feature contains Included Features, the Feature Update License should either provide you with the terms and conditions governing the Included Features or
-inform you where you can locate them. Feature Update Licenses may be found in the "license" property of files named "feature.properties" found within a Feature.
-Such Abouts, Feature Licenses, and Feature Update Licenses contain the terms and conditions (or references to such terms and conditions) that govern your use of the associated Content in
-that directory.</p>
-
-<p>THE ABOUTS, FEATURE LICENSES, AND FEATURE UPDATE LICENSES MAY REFER TO THE EPL OR OTHER LICENSE AGREEMENTS, NOTICES OR TERMS AND CONDITIONS. SOME OF THESE
-OTHER LICENSE AGREEMENTS MAY INCLUDE (BUT ARE NOT LIMITED TO):</p>
-
-<ul>
- <li>Common Public License Version 1.0 (available at <a href="http://www.eclipse.org/legal/cpl-v10.html">http://www.eclipse.org/legal/cpl-v10.html</a>)</li>
- <li>Apache Software License 1.1 (available at <a href="http://www.apache.org/licenses/LICENSE">http://www.apache.org/licenses/LICENSE</a>)</li>
- <li>Apache Software License 2.0 (available at <a href="http://www.apache.org/licenses/LICENSE-2.0">http://www.apache.org/licenses/LICENSE-2.0</a>)</li>
- <li>Metro Link Public License 1.00 (available at <a href="http://www.opengroup.org/openmotif/supporters/metrolink/license.html">http://www.opengroup.org/openmotif/supporters/metrolink/license.html</a>)</li>
- <li>Mozilla Public License Version 1.1 (available at <a href="http://www.mozilla.org/MPL/MPL-1.1.html">http://www.mozilla.org/MPL/MPL-1.1.html</a>)</li>
-</ul>
-
-<p>IT IS YOUR OBLIGATION TO READ AND ACCEPT ALL SUCH TERMS AND CONDITIONS PRIOR TO USE OF THE CONTENT. If no About, Feature License, or Feature Update License is provided, please
-contact the Eclipse Foundation to determine what terms and conditions govern that particular Content.</p>
-
-
-<h3>Use of Provisioning Technology</h3>
-
-<p>The Eclipse Foundation makes available provisioning software, examples of which include, but are not limited to, p2 and the Eclipse
- Update Manager ("Provisioning Technology") for the purpose of allowing users to install software, documentation, information and/or
- other materials (collectively "Installable Software"). This capability is provided with the intent of allowing such users to
- install, extend and update Eclipse-based products. Information about packaging Installable Software is available at <a
- href="http://eclipse.org/equinox/p2/repository_packaging.html">http://eclipse.org/equinox/p2/repository_packaging.html</a>
- ("Specification").</p>
-
-<p>You may use Provisioning Technology to allow other parties to install Installable Software. You shall be responsible for enabling the
- applicable license agreements relating to the Installable Software to be presented to, and accepted by, the users of the Provisioning Technology
- in accordance with the Specification. By using Provisioning Technology in such a manner and making it available in accordance with the
- Specification, you further acknowledge your agreement to, and the acquisition of all necessary rights to permit the following:</p>
-
-<ol>
- <li>A series of actions may occur ("Provisioning Process") in which a user may execute the Provisioning Technology
- on a machine ("Target Machine") with the intent of installing, extending or updating the functionality of an Eclipse-based
- product.</li>
- <li>During the Provisioning Process, the Provisioning Technology may cause third party Installable Software or a portion thereof to be
- accessed and copied to the Target Machine.</li>
- <li>Pursuant to the Specification, you will provide to the user the terms and conditions that govern the use of the Installable
- Software ("Installable Software Agreement") and such Installable Software Agreement shall be accessed from the Target
- Machine in accordance with the Specification. Such Installable Software Agreement must inform the user of the terms and conditions that govern
- the Installable Software and must solicit acceptance by the end user in the manner prescribed in such Installable Software Agreement. Upon such
- indication of agreement by the user, the provisioning Technology will complete installation of the Installable Software.</li>
-</ol>
-
-<h3>Cryptography</h3>
-
-<p>Content may contain encryption software. The country in which you are currently may have restrictions on the import, possession, and use, and/or re-export to
- another country, of encryption software. BEFORE using any encryption software, please check the country's laws, regulations and policies concerning the import,
- possession, or use, and re-export of encryption software, to see if this is permitted.</p>
-
-<p><small>Java and all Java-based trademarks are trademarks of Oracle Corporation in the United States, other countries, or both.</small></p>
-</body>
-</html>
diff --git a/features/org.eclipse.jst.web_ui.feature/.cvsignore b/features/org.eclipse.jst.web_ui.feature/.cvsignore
deleted file mode 100644
index c14487c..0000000
--- a/features/org.eclipse.jst.web_ui.feature/.cvsignore
+++ /dev/null
@@ -1 +0,0 @@
-build.xml
diff --git a/features/org.eclipse.jst.web_ui.feature/.project b/features/org.eclipse.jst.web_ui.feature/.project
deleted file mode 100644
index 75b7697..0000000
--- a/features/org.eclipse.jst.web_ui.feature/.project
+++ /dev/null
@@ -1,17 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<projectDescription>
- <name>org.eclipse.jst.web_ui.feature</name>
- <comment></comment>
- <projects>
- </projects>
- <buildSpec>
- <buildCommand>
- <name>org.eclipse.pde.FeatureBuilder</name>
- <arguments>
- </arguments>
- </buildCommand>
- </buildSpec>
- <natures>
- <nature>org.eclipse.pde.FeatureNature</nature>
- </natures>
-</projectDescription>
diff --git a/features/org.eclipse.jst.web_ui.feature/build.properties b/features/org.eclipse.jst.web_ui.feature/build.properties
deleted file mode 100644
index 7f47694..0000000
--- a/features/org.eclipse.jst.web_ui.feature/build.properties
+++ /dev/null
@@ -1,5 +0,0 @@
-bin.includes = feature.xml,\
- eclipse_update_120.jpg,\
- epl-v10.html,\
- license.html,\
- feature.properties
diff --git a/features/org.eclipse.jst.web_ui.feature/eclipse_update_120.jpg b/features/org.eclipse.jst.web_ui.feature/eclipse_update_120.jpg
deleted file mode 100644
index bfdf708..0000000
--- a/features/org.eclipse.jst.web_ui.feature/eclipse_update_120.jpg
+++ /dev/null
Binary files differ
diff --git a/features/org.eclipse.jst.web_ui.feature/epl-v10.html b/features/org.eclipse.jst.web_ui.feature/epl-v10.html
deleted file mode 100644
index ed4b196..0000000
--- a/features/org.eclipse.jst.web_ui.feature/epl-v10.html
+++ /dev/null
@@ -1,328 +0,0 @@
-<html xmlns:o="urn:schemas-microsoft-com:office:office"
-xmlns:w="urn:schemas-microsoft-com:office:word"
-xmlns="http://www.w3.org/TR/REC-html40">
-
-<head>
-<meta http-equiv=Content-Type content="text/html; charset=windows-1252">
-<meta name=ProgId content=Word.Document>
-<meta name=Generator content="Microsoft Word 9">
-<meta name=Originator content="Microsoft Word 9">
-<link rel=File-List
-href="./Eclipse%20EPL%202003_11_10%20Final_files/filelist.xml">
-<title>Eclipse Public License - Version 1.0</title>
-<!--[if gte mso 9]><xml>
- <o:DocumentProperties>
- <o:Revision>2</o:Revision>
- <o:TotalTime>3</o:TotalTime>
- <o:Created>2004-03-05T23:03:00Z</o:Created>
- <o:LastSaved>2004-03-05T23:03:00Z</o:LastSaved>
- <o:Pages>4</o:Pages>
- <o:Words>1626</o:Words>
- <o:Characters>9270</o:Characters>
- <o:Lines>77</o:Lines>
- <o:Paragraphs>18</o:Paragraphs>
- <o:CharactersWithSpaces>11384</o:CharactersWithSpaces>
- <o:Version>9.4402</o:Version>
- </o:DocumentProperties>
-</xml><![endif]--><!--[if gte mso 9]><xml>
- <w:WordDocument>
- <w:TrackRevisions/>
- </w:WordDocument>
-</xml><![endif]-->
-<style>
-<!--
- /* Font Definitions */
-@font-face
- {font-family:Tahoma;
- panose-1:2 11 6 4 3 5 4 4 2 4;
- mso-font-charset:0;
- mso-generic-font-family:swiss;
- mso-font-pitch:variable;
- mso-font-signature:553679495 -2147483648 8 0 66047 0;}
- /* Style Definitions */
-p.MsoNormal, li.MsoNormal, div.MsoNormal
- {mso-style-parent:"";
- margin:0in;
- margin-bottom:.0001pt;
- mso-pagination:widow-orphan;
- font-size:12.0pt;
- font-family:"Times New Roman";
- mso-fareast-font-family:"Times New Roman";}
-p
- {margin-right:0in;
- mso-margin-top-alt:auto;
- mso-margin-bottom-alt:auto;
- margin-left:0in;
- mso-pagination:widow-orphan;
- font-size:12.0pt;
- font-family:"Times New Roman";
- mso-fareast-font-family:"Times New Roman";}
-p.BalloonText, li.BalloonText, div.BalloonText
- {mso-style-name:"Balloon Text";
- margin:0in;
- margin-bottom:.0001pt;
- mso-pagination:widow-orphan;
- font-size:8.0pt;
- font-family:Tahoma;
- mso-fareast-font-family:"Times New Roman";}
-@page Section1
- {size:8.5in 11.0in;
- margin:1.0in 1.25in 1.0in 1.25in;
- mso-header-margin:.5in;
- mso-footer-margin:.5in;
- mso-paper-source:0;}
-div.Section1
- {page:Section1;}
--->
-</style>
-</head>
-
-<body lang=EN-US style='tab-interval:.5in'>
-
-<div class=Section1>
-
-<p align=center style='text-align:center'><b>Eclipse Public License - v 1.0</b>
-</p>
-
-<p><span style='font-size:10.0pt'>THE ACCOMPANYING PROGRAM IS PROVIDED UNDER
-THE TERMS OF THIS ECLIPSE PUBLIC LICENSE ("AGREEMENT"). ANY USE,
-REPRODUCTION OR DISTRIBUTION OF THE PROGRAM CONSTITUTES RECIPIENT'S ACCEPTANCE
-OF THIS AGREEMENT.</span> </p>
-
-<p><b><span style='font-size:10.0pt'>1. DEFINITIONS</span></b> </p>
-
-<p><span style='font-size:10.0pt'>"Contribution" means:</span> </p>
-
-<p class=MsoNormal style='margin-left:.5in'><span style='font-size:10.0pt'>a)
-in the case of the initial Contributor, the initial code and documentation
-distributed under this Agreement, and<br clear=left>
-b) in the case of each subsequent Contributor:</span></p>
-
-<p class=MsoNormal style='margin-left:.5in'><span style='font-size:10.0pt'>i)
-changes to the Program, and</span></p>
-
-<p class=MsoNormal style='margin-left:.5in'><span style='font-size:10.0pt'>ii)
-additions to the Program;</span></p>
-
-<p class=MsoNormal style='margin-left:.5in'><span style='font-size:10.0pt'>where
-such changes and/or additions to the Program originate from and are distributed
-by that particular Contributor. A Contribution 'originates' from a Contributor
-if it was added to the Program by such Contributor itself or anyone acting on
-such Contributor's behalf. Contributions do not include additions to the
-Program which: (i) are separate modules of software distributed in conjunction
-with the Program under their own license agreement, and (ii) are not derivative
-works of the Program. </span></p>
-
-<p><span style='font-size:10.0pt'>"Contributor" means any person or
-entity that distributes the Program.</span> </p>
-
-<p><span style='font-size:10.0pt'>"Licensed Patents " mean patent
-claims licensable by a Contributor which are necessarily infringed by the use
-or sale of its Contribution alone or when combined with the Program. </span></p>
-
-<p><span style='font-size:10.0pt'>"Program" means the Contributions
-distributed in accordance with this Agreement.</span> </p>
-
-<p><span style='font-size:10.0pt'>"Recipient" means anyone who
-receives the Program under this Agreement, including all Contributors.</span> </p>
-
-<p><b><span style='font-size:10.0pt'>2. GRANT OF RIGHTS</span></b> </p>
-
-<p class=MsoNormal style='margin-left:.5in'><span style='font-size:10.0pt'>a)
-Subject to the terms of this Agreement, each Contributor hereby grants Recipient
-a non-exclusive, worldwide, royalty-free copyright license to<span
-style='color:red'> </span>reproduce, prepare derivative works of, publicly
-display, publicly perform, distribute and sublicense the Contribution of such
-Contributor, if any, and such derivative works, in source code and object code
-form.</span></p>
-
-<p class=MsoNormal style='margin-left:.5in'><span style='font-size:10.0pt'>b)
-Subject to the terms of this Agreement, each Contributor hereby grants
-Recipient a non-exclusive, worldwide,<span style='color:green'> </span>royalty-free
-patent license under Licensed Patents to make, use, sell, offer to sell, import
-and otherwise transfer the Contribution of such Contributor, if any, in source
-code and object code form. This patent license shall apply to the combination
-of the Contribution and the Program if, at the time the Contribution is added
-by the Contributor, such addition of the Contribution causes such combination
-to be covered by the Licensed Patents. The patent license shall not apply to
-any other combinations which include the Contribution. No hardware per se is
-licensed hereunder. </span></p>
-
-<p class=MsoNormal style='margin-left:.5in'><span style='font-size:10.0pt'>c)
-Recipient understands that although each Contributor grants the licenses to its
-Contributions set forth herein, no assurances are provided by any Contributor
-that the Program does not infringe the patent or other intellectual property
-rights of any other entity. Each Contributor disclaims any liability to Recipient
-for claims brought by any other entity based on infringement of intellectual
-property rights or otherwise. As a condition to exercising the rights and
-licenses granted hereunder, each Recipient hereby assumes sole responsibility
-to secure any other intellectual property rights needed, if any. For example,
-if a third party patent license is required to allow Recipient to distribute
-the Program, it is Recipient's responsibility to acquire that license before
-distributing the Program.</span></p>
-
-<p class=MsoNormal style='margin-left:.5in'><span style='font-size:10.0pt'>d)
-Each Contributor represents that to its knowledge it has sufficient copyright
-rights in its Contribution, if any, to grant the copyright license set forth in
-this Agreement. </span></p>
-
-<p><b><span style='font-size:10.0pt'>3. REQUIREMENTS</span></b> </p>
-
-<p><span style='font-size:10.0pt'>A Contributor may choose to distribute the
-Program in object code form under its own license agreement, provided that:</span>
-</p>
-
-<p class=MsoNormal style='margin-left:.5in'><span style='font-size:10.0pt'>a)
-it complies with the terms and conditions of this Agreement; and</span></p>
-
-<p class=MsoNormal style='margin-left:.5in'><span style='font-size:10.0pt'>b)
-its license agreement:</span></p>
-
-<p class=MsoNormal style='margin-left:.5in'><span style='font-size:10.0pt'>i)
-effectively disclaims on behalf of all Contributors all warranties and
-conditions, express and implied, including warranties or conditions of title
-and non-infringement, and implied warranties or conditions of merchantability
-and fitness for a particular purpose; </span></p>
-
-<p class=MsoNormal style='margin-left:.5in'><span style='font-size:10.0pt'>ii)
-effectively excludes on behalf of all Contributors all liability for damages,
-including direct, indirect, special, incidental and consequential damages, such
-as lost profits; </span></p>
-
-<p class=MsoNormal style='margin-left:.5in'><span style='font-size:10.0pt'>iii)
-states that any provisions which differ from this Agreement are offered by that
-Contributor alone and not by any other party; and</span></p>
-
-<p class=MsoNormal style='margin-left:.5in'><span style='font-size:10.0pt'>iv)
-states that source code for the Program is available from such Contributor, and
-informs licensees how to obtain it in a reasonable manner on or through a
-medium customarily used for software exchange.<span style='color:blue'> </span></span></p>
-
-<p><span style='font-size:10.0pt'>When the Program is made available in source
-code form:</span> </p>
-
-<p class=MsoNormal style='margin-left:.5in'><span style='font-size:10.0pt'>a)
-it must be made available under this Agreement; and </span></p>
-
-<p class=MsoNormal style='margin-left:.5in'><span style='font-size:10.0pt'>b) a
-copy of this Agreement must be included with each copy of the Program. </span></p>
-
-<p><span style='font-size:10.0pt'>Contributors may not remove or alter any
-copyright notices contained within the Program. </span></p>
-
-<p><span style='font-size:10.0pt'>Each Contributor must identify itself as the
-originator of its Contribution, if any, in a manner that reasonably allows
-subsequent Recipients to identify the originator of the Contribution. </span></p>
-
-<p><b><span style='font-size:10.0pt'>4. COMMERCIAL DISTRIBUTION</span></b> </p>
-
-<p><span style='font-size:10.0pt'>Commercial distributors of software may
-accept certain responsibilities with respect to end users, business partners
-and the like. While this license is intended to facilitate the commercial use
-of the Program, the Contributor who includes the Program in a commercial
-product offering should do so in a manner which does not create potential
-liability for other Contributors. Therefore, if a Contributor includes the
-Program in a commercial product offering, such Contributor ("Commercial
-Contributor") hereby agrees to defend and indemnify every other
-Contributor ("Indemnified Contributor") against any losses, damages and
-costs (collectively "Losses") arising from claims, lawsuits and other
-legal actions brought by a third party against the Indemnified Contributor to
-the extent caused by the acts or omissions of such Commercial Contributor in
-connection with its distribution of the Program in a commercial product
-offering. The obligations in this section do not apply to any claims or Losses
-relating to any actual or alleged intellectual property infringement. In order
-to qualify, an Indemnified Contributor must: a) promptly notify the Commercial
-Contributor in writing of such claim, and b) allow the Commercial Contributor
-to control, and cooperate with the Commercial Contributor in, the defense and
-any related settlement negotiations. The Indemnified Contributor may participate
-in any such claim at its own expense.</span> </p>
-
-<p><span style='font-size:10.0pt'>For example, a Contributor might include the
-Program in a commercial product offering, Product X. That Contributor is then a
-Commercial Contributor. If that Commercial Contributor then makes performance
-claims, or offers warranties related to Product X, those performance claims and
-warranties are such Commercial Contributor's responsibility alone. Under this
-section, the Commercial Contributor would have to defend claims against the
-other Contributors related to those performance claims and warranties, and if a
-court requires any other Contributor to pay any damages as a result, the
-Commercial Contributor must pay those damages.</span> </p>
-
-<p><b><span style='font-size:10.0pt'>5. NO WARRANTY</span></b> </p>
-
-<p><span style='font-size:10.0pt'>EXCEPT AS EXPRESSLY SET FORTH IN THIS
-AGREEMENT, THE PROGRAM IS PROVIDED ON AN "AS IS" BASIS, WITHOUT
-WARRANTIES OR CONDITIONS OF ANY KIND, EITHER EXPRESS OR IMPLIED INCLUDING,
-WITHOUT LIMITATION, ANY WARRANTIES OR CONDITIONS OF TITLE, NON-INFRINGEMENT,
-MERCHANTABILITY OR FITNESS FOR A PARTICULAR PURPOSE. Each Recipient is solely
-responsible for determining the appropriateness of using and distributing the
-Program and assumes all risks associated with its exercise of rights under this
-Agreement , including but not limited to the risks and costs of program errors,
-compliance with applicable laws, damage to or loss of data, programs or
-equipment, and unavailability or interruption of operations. </span></p>
-
-<p><b><span style='font-size:10.0pt'>6. DISCLAIMER OF LIABILITY</span></b> </p>
-
-<p><span style='font-size:10.0pt'>EXCEPT AS EXPRESSLY SET FORTH IN THIS
-AGREEMENT, NEITHER RECIPIENT NOR ANY CONTRIBUTORS SHALL HAVE ANY LIABILITY FOR
-ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES
-(INCLUDING WITHOUT LIMITATION LOST PROFITS), HOWEVER CAUSED AND ON ANY THEORY
-OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING
-NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OR DISTRIBUTION OF
-THE PROGRAM OR THE EXERCISE OF ANY RIGHTS GRANTED HEREUNDER, EVEN IF ADVISED OF
-THE POSSIBILITY OF SUCH DAMAGES.</span> </p>
-
-<p><b><span style='font-size:10.0pt'>7. GENERAL</span></b> </p>
-
-<p><span style='font-size:10.0pt'>If any provision of this Agreement is invalid
-or unenforceable under applicable law, it shall not affect the validity or
-enforceability of the remainder of the terms of this Agreement, and without
-further action by the parties hereto, such provision shall be reformed to the
-minimum extent necessary to make such provision valid and enforceable.</span> </p>
-
-<p><span style='font-size:10.0pt'>If Recipient institutes patent litigation
-against any entity (including a cross-claim or counterclaim in a lawsuit)
-alleging that the Program itself (excluding combinations of the Program with
-other software or hardware) infringes such Recipient's patent(s), then such
-Recipient's rights granted under Section 2(b) shall terminate as of the date
-such litigation is filed. </span></p>
-
-<p><span style='font-size:10.0pt'>All Recipient's rights under this Agreement
-shall terminate if it fails to comply with any of the material terms or
-conditions of this Agreement and does not cure such failure in a reasonable
-period of time after becoming aware of such noncompliance. If all Recipient's
-rights under this Agreement terminate, Recipient agrees to cease use and
-distribution of the Program as soon as reasonably practicable. However,
-Recipient's obligations under this Agreement and any licenses granted by
-Recipient relating to the Program shall continue and survive. </span></p>
-
-<p><span style='font-size:10.0pt'>Everyone is permitted to copy and distribute
-copies of this Agreement, but in order to avoid inconsistency the Agreement is
-copyrighted and may only be modified in the following manner. The Agreement
-Steward reserves the right to publish new versions (including revisions) of
-this Agreement from time to time. No one other than the Agreement Steward has
-the right to modify this Agreement. The Eclipse Foundation is the initial
-Agreement Steward. The Eclipse Foundation may assign the responsibility to
-serve as the Agreement Steward to a suitable separate entity. Each new version
-of the Agreement will be given a distinguishing version number. The Program
-(including Contributions) may always be distributed subject to the version of
-the Agreement under which it was received. In addition, after a new version of
-the Agreement is published, Contributor may elect to distribute the Program
-(including its Contributions) under the new version. Except as expressly stated
-in Sections 2(a) and 2(b) above, Recipient receives no rights or licenses to
-the intellectual property of any Contributor under this Agreement, whether
-expressly, by implication, estoppel or otherwise. All rights in the Program not
-expressly granted under this Agreement are reserved.</span> </p>
-
-<p><span style='font-size:10.0pt'>This Agreement is governed by the laws of the
-State of New York and the intellectual property laws of the United States of
-America. No party to this Agreement will bring a legal action under this
-Agreement more than one year after the cause of action arose. Each party waives
-its rights to a jury trial in any resulting litigation.</span> </p>
-
-<p class=MsoNormal><![if !supportEmptyParas]> <![endif]><o:p></o:p></p>
-
-</div>
-
-</body>
-
-</html>
\ No newline at end of file
diff --git a/features/org.eclipse.jst.web_ui.feature/feature.properties b/features/org.eclipse.jst.web_ui.feature/feature.properties
deleted file mode 100644
index db09174..0000000
--- a/features/org.eclipse.jst.web_ui.feature/feature.properties
+++ /dev/null
@@ -1,168 +0,0 @@
-###############################################################################
-# Copyright (c) 2006 IBM Corporation and others.
-# All rights reserved. This program and the accompanying materials
-# are made available under the terms of the Eclipse Public License v1.0
-# which accompanies this distribution, and is available at
-# http://www.eclipse.org/legal/epl-v10.html
-#
-# Contributors:
-# IBM Corporation - initial API and implementation
-###############################################################################
-# feature.properties
-# contains externalized strings for feature.xml
-# "%foo" in feature.xml corresponds to the key "foo" in this file
-# java.io.Properties file (ISO 8859-1 with "\" escapes)
-# This file should be translated.
-
-# "featureName" property - name of the feature
-featureName=JST Web UI
-
-# "providerName" property - name of the company that provides the feature
-providerName=Eclipse Web Tools Platform
-
-
-# "description" property - description of the feature
-description=JST Web UI functionality.
-
-# "copyright" property - text of the "Feature Update Copyright"
-copyright=\
-Copyright (c) 2006 IBM Corporation and others.\n\
-All rights reserved. This program and the accompanying materials\n\
-are made available under the terms of the Eclipse Public License v1.0\n\
-which accompanies this distribution, and is available at\n\
-http://www.eclipse.org/legal/epl-v10.html\n\
-\n\
-Contributors:\n\
- IBM Corporation - initial API and implementation\n
-################ end of copyright property ####################################
-
-# "licenseURL" property - URL of the "Feature License"
-# do not translate value - just change to point to a locale-specific HTML page
-licenseURL=license.html
-
-# "license" property - text of the "Feature Update License"
-# should be plain text version of license agreement pointed to be "licenseURL"
-license=\
-Eclipse Foundation Software User Agreement\n\
-April 14, 2010\n\
-\n\
-Usage Of Content\n\
-\n\
-THE ECLIPSE FOUNDATION MAKES AVAILABLE SOFTWARE, DOCUMENTATION, INFORMATION AND/OR\n\
-OTHER MATERIALS FOR OPEN SOURCE PROJECTS (COLLECTIVELY "CONTENT").\n\
-USE OF THE CONTENT IS GOVERNED BY THE TERMS AND CONDITIONS OF THIS\n\
-AGREEMENT AND/OR THE TERMS AND CONDITIONS OF LICENSE AGREEMENTS OR\n\
-NOTICES INDICATED OR REFERENCED BELOW. BY USING THE CONTENT, YOU\n\
-AGREE THAT YOUR USE OF THE CONTENT IS GOVERNED BY THIS AGREEMENT\n\
-AND/OR THE TERMS AND CONDITIONS OF ANY APPLICABLE LICENSE AGREEMENTS\n\
-OR NOTICES INDICATED OR REFERENCED BELOW. IF YOU DO NOT AGREE TO THE\n\
-TERMS AND CONDITIONS OF THIS AGREEMENT AND THE TERMS AND CONDITIONS\n\
-OF ANY APPLICABLE LICENSE AGREEMENTS OR NOTICES INDICATED OR REFERENCED\n\
-BELOW, THEN YOU MAY NOT USE THE CONTENT.\n\
-\n\
-Applicable Licenses\n\
-\n\
-Unless otherwise indicated, all Content made available by the\n\
-Eclipse Foundation is provided to you under the terms and conditions of\n\
-the Eclipse Public License Version 1.0 ("EPL"). A copy of the EPL is\n\
-provided with this Content and is also available at http://www.eclipse.org/legal/epl-v10.html.\n\
-For purposes of the EPL, "Program" will mean the Content.\n\
-\n\
-Content includes, but is not limited to, source code, object code,\n\
-documentation and other files maintained in the Eclipse Foundation source code\n\
-repository ("Repository") in software modules ("Modules") and made available\n\
-as downloadable archives ("Downloads").\n\
-\n\
- - Content may be structured and packaged into modules to facilitate delivering,\n\
- extending, and upgrading the Content. Typical modules may include plug-ins ("Plug-ins"),\n\
- plug-in fragments ("Fragments"), and features ("Features").\n\
- - Each Plug-in or Fragment may be packaged as a sub-directory or JAR (Java(TM) ARchive)\n\
- in a directory named "plugins".\n\
- - A Feature is a bundle of one or more Plug-ins and/or Fragments and associated material.\n\
- Each Feature may be packaged as a sub-directory in a directory named "features".\n\
- Within a Feature, files named "feature.xml" may contain a list of the names and version\n\
- numbers of the Plug-ins and/or Fragments associated with that Feature.\n\
- - Features may also include other Features ("Included Features"). Within a Feature, files\n\
- named "feature.xml" may contain a list of the names and version numbers of Included Features.\n\
-\n\
-The terms and conditions governing Plug-ins and Fragments should be\n\
-contained in files named "about.html" ("Abouts"). The terms and\n\
-conditions governing Features and Included Features should be contained\n\
-in files named "license.html" ("Feature Licenses"). Abouts and Feature\n\
-Licenses may be located in any directory of a Download or Module\n\
-including, but not limited to the following locations:\n\
-\n\
- - The top-level (root) directory\n\
- - Plug-in and Fragment directories\n\
- - Inside Plug-ins and Fragments packaged as JARs\n\
- - Sub-directories of the directory named "src" of certain Plug-ins\n\
- - Feature directories\n\
-\n\
-Note: if a Feature made available by the Eclipse Foundation is installed using the\n\
-Provisioning Technology (as defined below), you must agree to a license ("Feature \n\
-Update License") during the installation process. If the Feature contains\n\
-Included Features, the Feature Update License should either provide you\n\
-with the terms and conditions governing the Included Features or inform\n\
-you where you can locate them. Feature Update Licenses may be found in\n\
-the "license" property of files named "feature.properties" found within a Feature.\n\
-Such Abouts, Feature Licenses, and Feature Update Licenses contain the\n\
-terms and conditions (or references to such terms and conditions) that\n\
-govern your use of the associated Content in that directory.\n\
-\n\
-THE ABOUTS, FEATURE LICENSES, AND FEATURE UPDATE LICENSES MAY REFER\n\
-TO THE EPL OR OTHER LICENSE AGREEMENTS, NOTICES OR TERMS AND CONDITIONS.\n\
-SOME OF THESE OTHER LICENSE AGREEMENTS MAY INCLUDE (BUT ARE NOT LIMITED TO):\n\
-\n\
- - Common Public License Version 1.0 (available at http://www.eclipse.org/legal/cpl-v10.html)\n\
- - Apache Software License 1.1 (available at http://www.apache.org/licenses/LICENSE)\n\
- - Apache Software License 2.0 (available at http://www.apache.org/licenses/LICENSE-2.0)\n\
- - Metro Link Public License 1.00 (available at http://www.opengroup.org/openmotif/supporters/metrolink/license.html)\n\
- - Mozilla Public License Version 1.1 (available at http://www.mozilla.org/MPL/MPL-1.1.html)\n\
-\n\
-IT IS YOUR OBLIGATION TO READ AND ACCEPT ALL SUCH TERMS AND CONDITIONS PRIOR\n\
-TO USE OF THE CONTENT. If no About, Feature License, or Feature Update License\n\
-is provided, please contact the Eclipse Foundation to determine what terms and conditions\n\
-govern that particular Content.\n\
-\n\
-\n\Use of Provisioning Technology\n\
-\n\
-The Eclipse Foundation makes available provisioning software, examples of which include,\n\
-but are not limited to, p2 and the Eclipse Update Manager ("Provisioning Technology") for\n\
-the purpose of allowing users to install software, documentation, information and/or\n\
-other materials (collectively "Installable Software"). This capability is provided with\n\
-the intent of allowing such users to install, extend and update Eclipse-based products.\n\
-Information about packaging Installable Software is available at\n\
-http://eclipse.org/equinox/p2/repository_packaging.html ("Specification").\n\
-\n\
-You may use Provisioning Technology to allow other parties to install Installable Software.\n\
-You shall be responsible for enabling the applicable license agreements relating to the\n\
-Installable Software to be presented to, and accepted by, the users of the Provisioning Technology\n\
-in accordance with the Specification. By using Provisioning Technology in such a manner and\n\
-making it available in accordance with the Specification, you further acknowledge your\n\
-agreement to, and the acquisition of all necessary rights to permit the following:\n\
-\n\
- 1. A series of actions may occur ("Provisioning Process") in which a user may execute\n\
- the Provisioning Technology on a machine ("Target Machine") with the intent of installing,\n\
- extending or updating the functionality of an Eclipse-based product.\n\
- 2. During the Provisioning Process, the Provisioning Technology may cause third party\n\
- Installable Software or a portion thereof to be accessed and copied to the Target Machine.\n\
- 3. Pursuant to the Specification, you will provide to the user the terms and conditions that\n\
- govern the use of the Installable Software ("Installable Software Agreement") and such\n\
- Installable Software Agreement shall be accessed from the Target Machine in accordance\n\
- with the Specification. Such Installable Software Agreement must inform the user of the\n\
- terms and conditions that govern the Installable Software and must solicit acceptance by\n\
- the end user in the manner prescribed in such Installable Software Agreement. Upon such\n\
- indication of agreement by the user, the provisioning Technology will complete installation\n\
- of the Installable Software.\n\
-\n\
-Cryptography\n\
-\n\
-Content may contain encryption software. The country in which you are\n\
-currently may have restrictions on the import, possession, and use,\n\
-and/or re-export to another country, of encryption software. BEFORE\n\
-using any encryption software, please check the country's laws,\n\
-regulations and policies concerning the import, possession, or use, and\n\
-re-export of encryption software, to see if this is permitted.\n\
-\n\
-Java and all Java-based trademarks are trademarks of Oracle Corporation in the United States, other countries, or both.\n
-########### end of license property ##########################################
diff --git a/features/org.eclipse.jst.web_ui.feature/feature.xml b/features/org.eclipse.jst.web_ui.feature/feature.xml
deleted file mode 100644
index 644ad47..0000000
--- a/features/org.eclipse.jst.web_ui.feature/feature.xml
+++ /dev/null
@@ -1,67 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<feature
- id="org.eclipse.jst.web_ui.feature"
- label="%featureName"
- version="3.2.3.qualifier"
- provider-name="%providerName">
-
- <description>
- %description
- </description>
-
- <copyright>
- %copyright
- </copyright>
-
- <license url="%licenseURL">
- %license
- </license>
-
- <includes
- id="org.eclipse.wst.ws_ui.feature"
- version="0.0.0"/>
-
- <includes
- id="org.eclipse.jst.web_userdoc.feature"
- version="0.0.0"/>
-
- <includes
- id="org.eclipse.jst.web_core.feature"
- version="0.0.0"/>
-
- <plugin
- id="org.eclipse.wst.jsdt.web.support.jsp"
- download-size="0"
- install-size="0"
- version="0.0.0"
- unpack="false"/>
-
- <plugin
- id="org.eclipse.jst.common.annotations.ui"
- download-size="0"
- install-size="0"
- version="0.0.0"
- unpack="false"/>
-
- <plugin
- id="org.eclipse.jst.common.ui"
- download-size="0"
- install-size="0"
- version="0.0.0"
- unpack="false"/>
-
- <plugin
- id="org.eclipse.jst.jsp.ui"
- download-size="0"
- install-size="0"
- version="0.0.0"
- unpack="false"/>
-
- <plugin
- id="org.eclipse.jst.jsp.ui.infopop"
- download-size="0"
- install-size="0"
- version="0.0.0"
- unpack="false"/>
-
-</feature>
diff --git a/features/org.eclipse.jst.web_ui.feature/license.html b/features/org.eclipse.jst.web_ui.feature/license.html
deleted file mode 100644
index c184ca3..0000000
--- a/features/org.eclipse.jst.web_ui.feature/license.html
+++ /dev/null
@@ -1,107 +0,0 @@
-<?xml version="1.0" encoding="ISO-8859-1" ?>
-<!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.0 Strict//EN" "http://www.w3.org/TR/xhtml1/DTD/xhtml1-strict.dtd">
-<html xmlns="http://www.w3.org/1999/xhtml">
-<head>
-<meta http-equiv="Content-Type" content="text/html; charset=ISO-8859-1" />
-<title>Eclipse Foundation Software User Agreement</title>
-</head>
-
-<body lang="EN-US">
-<h2>Eclipse Foundation Software User Agreement</h2>
-<p>April 14, 2010</p>
-
-<h3>Usage Of Content</h3>
-
-<p>THE ECLIPSE FOUNDATION MAKES AVAILABLE SOFTWARE, DOCUMENTATION, INFORMATION AND/OR OTHER MATERIALS FOR OPEN SOURCE PROJECTS
- (COLLECTIVELY "CONTENT"). USE OF THE CONTENT IS GOVERNED BY THE TERMS AND CONDITIONS OF THIS AGREEMENT AND/OR THE TERMS AND
- CONDITIONS OF LICENSE AGREEMENTS OR NOTICES INDICATED OR REFERENCED BELOW. BY USING THE CONTENT, YOU AGREE THAT YOUR USE
- OF THE CONTENT IS GOVERNED BY THIS AGREEMENT AND/OR THE TERMS AND CONDITIONS OF ANY APPLICABLE LICENSE AGREEMENTS OR
- NOTICES INDICATED OR REFERENCED BELOW. IF YOU DO NOT AGREE TO THE TERMS AND CONDITIONS OF THIS AGREEMENT AND THE TERMS AND
- CONDITIONS OF ANY APPLICABLE LICENSE AGREEMENTS OR NOTICES INDICATED OR REFERENCED BELOW, THEN YOU MAY NOT USE THE CONTENT.</p>
-
-<h3>Applicable Licenses</h3>
-
-<p>Unless otherwise indicated, all Content made available by the Eclipse Foundation is provided to you under the terms and conditions of the Eclipse Public License Version 1.0
- ("EPL"). A copy of the EPL is provided with this Content and is also available at <a href="http://www.eclipse.org/legal/epl-v10.html">http://www.eclipse.org/legal/epl-v10.html</a>.
- For purposes of the EPL, "Program" will mean the Content.</p>
-
-<p>Content includes, but is not limited to, source code, object code, documentation and other files maintained in the Eclipse Foundation source code
- repository ("Repository") in software modules ("Modules") and made available as downloadable archives ("Downloads").</p>
-
-<ul>
- <li>Content may be structured and packaged into modules to facilitate delivering, extending, and upgrading the Content. Typical modules may include plug-ins ("Plug-ins"), plug-in fragments ("Fragments"), and features ("Features").</li>
- <li>Each Plug-in or Fragment may be packaged as a sub-directory or JAR (Java™ ARchive) in a directory named "plugins".</li>
- <li>A Feature is a bundle of one or more Plug-ins and/or Fragments and associated material. Each Feature may be packaged as a sub-directory in a directory named "features". Within a Feature, files named "feature.xml" may contain a list of the names and version numbers of the Plug-ins
- and/or Fragments associated with that Feature.</li>
- <li>Features may also include other Features ("Included Features"). Within a Feature, files named "feature.xml" may contain a list of the names and version numbers of Included Features.</li>
-</ul>
-
-<p>The terms and conditions governing Plug-ins and Fragments should be contained in files named "about.html" ("Abouts"). The terms and conditions governing Features and
-Included Features should be contained in files named "license.html" ("Feature Licenses"). Abouts and Feature Licenses may be located in any directory of a Download or Module
-including, but not limited to the following locations:</p>
-
-<ul>
- <li>The top-level (root) directory</li>
- <li>Plug-in and Fragment directories</li>
- <li>Inside Plug-ins and Fragments packaged as JARs</li>
- <li>Sub-directories of the directory named "src" of certain Plug-ins</li>
- <li>Feature directories</li>
-</ul>
-
-<p>Note: if a Feature made available by the Eclipse Foundation is installed using the Provisioning Technology (as defined below), you must agree to a license ("Feature Update License") during the
-installation process. If the Feature contains Included Features, the Feature Update License should either provide you with the terms and conditions governing the Included Features or
-inform you where you can locate them. Feature Update Licenses may be found in the "license" property of files named "feature.properties" found within a Feature.
-Such Abouts, Feature Licenses, and Feature Update Licenses contain the terms and conditions (or references to such terms and conditions) that govern your use of the associated Content in
-that directory.</p>
-
-<p>THE ABOUTS, FEATURE LICENSES, AND FEATURE UPDATE LICENSES MAY REFER TO THE EPL OR OTHER LICENSE AGREEMENTS, NOTICES OR TERMS AND CONDITIONS. SOME OF THESE
-OTHER LICENSE AGREEMENTS MAY INCLUDE (BUT ARE NOT LIMITED TO):</p>
-
-<ul>
- <li>Common Public License Version 1.0 (available at <a href="http://www.eclipse.org/legal/cpl-v10.html">http://www.eclipse.org/legal/cpl-v10.html</a>)</li>
- <li>Apache Software License 1.1 (available at <a href="http://www.apache.org/licenses/LICENSE">http://www.apache.org/licenses/LICENSE</a>)</li>
- <li>Apache Software License 2.0 (available at <a href="http://www.apache.org/licenses/LICENSE-2.0">http://www.apache.org/licenses/LICENSE-2.0</a>)</li>
- <li>Metro Link Public License 1.00 (available at <a href="http://www.opengroup.org/openmotif/supporters/metrolink/license.html">http://www.opengroup.org/openmotif/supporters/metrolink/license.html</a>)</li>
- <li>Mozilla Public License Version 1.1 (available at <a href="http://www.mozilla.org/MPL/MPL-1.1.html">http://www.mozilla.org/MPL/MPL-1.1.html</a>)</li>
-</ul>
-
-<p>IT IS YOUR OBLIGATION TO READ AND ACCEPT ALL SUCH TERMS AND CONDITIONS PRIOR TO USE OF THE CONTENT. If no About, Feature License, or Feature Update License is provided, please
-contact the Eclipse Foundation to determine what terms and conditions govern that particular Content.</p>
-
-
-<h3>Use of Provisioning Technology</h3>
-
-<p>The Eclipse Foundation makes available provisioning software, examples of which include, but are not limited to, p2 and the Eclipse
- Update Manager ("Provisioning Technology") for the purpose of allowing users to install software, documentation, information and/or
- other materials (collectively "Installable Software"). This capability is provided with the intent of allowing such users to
- install, extend and update Eclipse-based products. Information about packaging Installable Software is available at <a
- href="http://eclipse.org/equinox/p2/repository_packaging.html">http://eclipse.org/equinox/p2/repository_packaging.html</a>
- ("Specification").</p>
-
-<p>You may use Provisioning Technology to allow other parties to install Installable Software. You shall be responsible for enabling the
- applicable license agreements relating to the Installable Software to be presented to, and accepted by, the users of the Provisioning Technology
- in accordance with the Specification. By using Provisioning Technology in such a manner and making it available in accordance with the
- Specification, you further acknowledge your agreement to, and the acquisition of all necessary rights to permit the following:</p>
-
-<ol>
- <li>A series of actions may occur ("Provisioning Process") in which a user may execute the Provisioning Technology
- on a machine ("Target Machine") with the intent of installing, extending or updating the functionality of an Eclipse-based
- product.</li>
- <li>During the Provisioning Process, the Provisioning Technology may cause third party Installable Software or a portion thereof to be
- accessed and copied to the Target Machine.</li>
- <li>Pursuant to the Specification, you will provide to the user the terms and conditions that govern the use of the Installable
- Software ("Installable Software Agreement") and such Installable Software Agreement shall be accessed from the Target
- Machine in accordance with the Specification. Such Installable Software Agreement must inform the user of the terms and conditions that govern
- the Installable Software and must solicit acceptance by the end user in the manner prescribed in such Installable Software Agreement. Upon such
- indication of agreement by the user, the provisioning Technology will complete installation of the Installable Software.</li>
-</ol>
-
-<h3>Cryptography</h3>
-
-<p>Content may contain encryption software. The country in which you are currently may have restrictions on the import, possession, and use, and/or re-export to
- another country, of encryption software. BEFORE using any encryption software, please check the country's laws, regulations and policies concerning the import,
- possession, or use, and re-export of encryption software, to see if this is permitted.</p>
-
-<p><small>Java and all Java-based trademarks are trademarks of Oracle Corporation in the United States, other countries, or both.</small></p>
-</body>
-</html>
diff --git a/features/org.eclipse.jst.web_ui.feature/sourceTemplateBundle/about.html b/features/org.eclipse.jst.web_ui.feature/sourceTemplateBundle/about.html
deleted file mode 100644
index fe81d46..0000000
--- a/features/org.eclipse.jst.web_ui.feature/sourceTemplateBundle/about.html
+++ /dev/null
@@ -1,27 +0,0 @@
-<!DOCTYPE HTML PUBLIC "-//W3C//DTD HTML 4.0//EN">
-<html>
-<head>
-<title>About</title>
-<meta http-equiv=Content-Type content="text/html; charset=ISO-8859-1">
-</head>
-<body lang="EN-US">
-<h2>About This Content</h2>
-
-<P>June, 2008</P>
-<h3>License</h3>
-
-<p>The Eclipse Foundation makes available all content in this plug-in ("Content"). Unless otherwise indicated below, the Content is provided to you under the terms and conditions of the
-Eclipse Public License Version 1.0 ("EPL"). A copy of the EPL is available at <a href="http://www.eclipse.org/legal/epl-v10.html">http://www.eclipse.org/legal/epl-v10.html</a>.
-For purposes of the EPL, "Program" will mean the Content.</p>
-
-<p>If you did not receive this Content directly from the Eclipse Foundation, the Content is being redistributed by another party ("Redistributor") and different terms and conditions may
-apply to your use of any object code in the Content. Check the Redistributor's license that was provided with the Content. If no such license exists, contact the Redistributor. Unless otherwise
-indicated below, the terms and conditions of the EPL still apply to any source code in the Content.</p>
-
-<h3>Source Code</h3>
-<p>This plug-in contains source code zip files ("Source Zips") that correspond to binary content in other plug-ins. These Source Zips may be distributed under different license
-agreements and/or notices. Details about these license agreements and notices are contained in "about.html" files ("Abouts") located in sub-directories in the
-src/ directory of this plug-in. Such Abouts govern your use of the Source Zips in that directory, not the EPL.</p>
-
-</body>
-</html>
diff --git a/features/org.eclipse.jst.web_ui.feature/sourceTemplateBundle/about.ini b/features/org.eclipse.jst.web_ui.feature/sourceTemplateBundle/about.ini
deleted file mode 100644
index fda5a40..0000000
--- a/features/org.eclipse.jst.web_ui.feature/sourceTemplateBundle/about.ini
+++ /dev/null
@@ -1,31 +0,0 @@
-# about.ini
-# contains information about a feature
-# java.io.Properties file (ISO 8859-1 with "\" escapes)
-# "%key" are externalized strings defined in about.properties
-# This file does not need to be translated.
-
-# Property "aboutText" contains blurb for "About" dialog (translated)
-aboutText=%blurb
-
-# Property "windowImage" contains path to window icon (16x16)
-# needed for primary features only
-
-# Property "featureImage" contains path to feature image (32x32)
-featureImage=wtp_prod32.png
-
-# Property "aboutImage" contains path to product image (500x330 or 115x164)
-# needed for primary features only
-
-# Property "appName" contains name of the application (not translated)
-# needed for primary features only
-
-# Property "welcomePage" contains path to welcome page (special XML-based format)
-# optional
-
-# Property "welcomePerspective" contains the id of the perspective in which the
-# welcome page is to be opened.
-# optional
-
-
-
-
diff --git a/features/org.eclipse.jst.web_ui.feature/sourceTemplateBundle/about.mappings b/features/org.eclipse.jst.web_ui.feature/sourceTemplateBundle/about.mappings
deleted file mode 100644
index a28390a..0000000
--- a/features/org.eclipse.jst.web_ui.feature/sourceTemplateBundle/about.mappings
+++ /dev/null
@@ -1,6 +0,0 @@
-# about.mappings
-# contains fill-ins for about.properties
-# java.io.Properties file (ISO 8859-1 with "\" escapes)
-# This file does not need to be translated.
-
-0=@build@
diff --git a/features/org.eclipse.jst.web_ui.feature/sourceTemplateBundle/about.properties b/features/org.eclipse.jst.web_ui.feature/sourceTemplateBundle/about.properties
deleted file mode 100644
index 307bab9..0000000
--- a/features/org.eclipse.jst.web_ui.feature/sourceTemplateBundle/about.properties
+++ /dev/null
@@ -1,26 +0,0 @@
-###############################################################################
-# Copyright (c) 2000, 2005 IBM Corporation and others.
-# All rights reserved. This program and the accompanying materials
-# are made available under the terms of the Eclipse Public License v1.0
-# which accompanies this distribution, and is available at
-# http://www.eclipse.org/legal/epl-v10.html
-#
-# Contributors:
-# IBM Corporation - initial API and implementation
-###############################################################################
-# about.properties
-# contains externalized strings for about.ini
-# java.io.Properties file (ISO 8859-1 with "\" escapes)
-# fill-ins are supplied by about.mappings
-# This file should be translated.
-#
-# Do not translate any values surrounded by {}
-
-blurb=J2EE Standard Tools - Web UI\n\
-\n\
-Version: {featureVersion}\n\
-Build id: {0}\n\
-\n\
-(c) Copyright Eclipse contributors and others 2005. All rights reserved.\n\
-Visit http://www.eclipse.org/webtools
-
diff --git a/features/org.eclipse.jst.web_ui.feature/sourceTemplateBundle/build.properties b/features/org.eclipse.jst.web_ui.feature/sourceTemplateBundle/build.properties
deleted file mode 100644
index 30a575c..0000000
--- a/features/org.eclipse.jst.web_ui.feature/sourceTemplateBundle/build.properties
+++ /dev/null
@@ -1,3 +0,0 @@
-
-bin.includes = about.html, about.ini, about.mappings, about.properties, wtp_prod32.png, plugin.properties, plugin.xml, src/**, META-INF/
-sourcePlugin = true
diff --git a/features/org.eclipse.jst.web_ui.feature/sourceTemplateBundle/plugin.properties b/features/org.eclipse.jst.web_ui.feature/sourceTemplateBundle/plugin.properties
deleted file mode 100644
index e711acf..0000000
--- a/features/org.eclipse.jst.web_ui.feature/sourceTemplateBundle/plugin.properties
+++ /dev/null
@@ -1,12 +0,0 @@
-###############################################################################
-# Copyright (c) 2005 IBM Corporation and others.
-# All rights reserved. This program and the accompanying materials
-# are made available under the terms of the Eclipse Public License v1.0
-# which accompanies this distribution, and is available at
-# http://www.eclipse.org/legal/epl-v10.html
-#
-# Contributors:
-# IBM Corporation - initial API and implementation
-###############################################################################
-pluginName=J2EE Standard Tools - Web UI Source
-providerName=Eclipse.org
diff --git a/features/org.eclipse.jst.web_ui.feature/sourceTemplateBundle/wtp_prod32.gif b/features/org.eclipse.jst.web_ui.feature/sourceTemplateBundle/wtp_prod32.gif
deleted file mode 100644
index eefb44a..0000000
--- a/features/org.eclipse.jst.web_ui.feature/sourceTemplateBundle/wtp_prod32.gif
+++ /dev/null
Binary files differ
diff --git a/features/org.eclipse.jst.web_ui.feature/sourceTemplateBundle/wtp_prod32.png b/features/org.eclipse.jst.web_ui.feature/sourceTemplateBundle/wtp_prod32.png
deleted file mode 100644
index bfceab3..0000000
--- a/features/org.eclipse.jst.web_ui.feature/sourceTemplateBundle/wtp_prod32.png
+++ /dev/null
Binary files differ
diff --git a/features/org.eclipse.jst.web_ui.feature/sourceTemplateFeature/build.properties b/features/org.eclipse.jst.web_ui.feature/sourceTemplateFeature/build.properties
deleted file mode 100644
index a7c973f..0000000
--- a/features/org.eclipse.jst.web_ui.feature/sourceTemplateFeature/build.properties
+++ /dev/null
@@ -1,19 +0,0 @@
-###############################################################################
-# Copyright (c) 2000, 2005 IBM Corporation and others.
-# All rights reserved. This program and the accompanying materials
-# are made available under the terms of the Eclipse Public License v1.0
-# which accompanies this distribution, and is available at
-# http://www.eclipse.org/legal/epl-v10.html
-#
-# Contributors:
-# IBM Corporation - initial API and implementation
-###############################################################################
-bin.includes =\
-epl-v10.html,\
-eclipse_update_120.jpg,\
-feature.xml,\
-feature.properties,\
-license.html
-
-generate.feature@org.eclipse.jst.web_core.feature.source = org.eclipse.jst.web_core.feature
-
diff --git a/features/org.eclipse.jst.web_ui.feature/sourceTemplateFeature/eclipse_update_120.jpg b/features/org.eclipse.jst.web_ui.feature/sourceTemplateFeature/eclipse_update_120.jpg
deleted file mode 100644
index bfdf708..0000000
--- a/features/org.eclipse.jst.web_ui.feature/sourceTemplateFeature/eclipse_update_120.jpg
+++ /dev/null
Binary files differ
diff --git a/features/org.eclipse.jst.web_ui.feature/sourceTemplateFeature/epl-v10.html b/features/org.eclipse.jst.web_ui.feature/sourceTemplateFeature/epl-v10.html
deleted file mode 100644
index 022ad29..0000000
--- a/features/org.eclipse.jst.web_ui.feature/sourceTemplateFeature/epl-v10.html
+++ /dev/null
@@ -1,328 +0,0 @@
-<html xmlns:o="urn:schemas-microsoft-com:office:office"
-xmlns:w="urn:schemas-microsoft-com:office:word"
-xmlns="http://www.w3.org/TR/REC-html40">
-
-<head>
-<meta http-equiv=Content-Type content="text/html; charset=windows-1252">
-<meta name=ProgId content=Word.Document>
-<meta name=Generator content="Microsoft Word 9">
-<meta name=Originator content="Microsoft Word 9">
-<link rel=File-List
-href="./Eclipse%20EPL%202003_11_10%20Final_files/filelist.xml">
-<title>Eclipse Public License - Version 1.0</title>
-<!--[if gte mso 9]><xml>
- <o:DocumentProperties>
- <o:Revision>2</o:Revision>
- <o:TotalTime>3</o:TotalTime>
- <o:Created>2004-03-05T23:03:00Z</o:Created>
- <o:LastSaved>2004-03-05T23:03:00Z</o:LastSaved>
- <o:Pages>4</o:Pages>
- <o:Words>1626</o:Words>
- <o:Characters>9270</o:Characters>
- <o:Lines>77</o:Lines>
- <o:Paragraphs>18</o:Paragraphs>
- <o:CharactersWithSpaces>11384</o:CharactersWithSpaces>
- <o:Version>9.4402</o:Version>
- </o:DocumentProperties>
-</xml><![endif]--><!--[if gte mso 9]><xml>
- <w:WordDocument>
- <w:TrackRevisions/>
- </w:WordDocument>
-</xml><![endif]-->
-<style>
-<!--
- /* Font Definitions */
-@font-face
- {font-family:Tahoma;
- panose-1:2 11 6 4 3 5 4 4 2 4;
- mso-font-charset:0;
- mso-generic-font-family:swiss;
- mso-font-pitch:variable;
- mso-font-signature:553679495 -2147483648 8 0 66047 0;}
- /* Style Definitions */
-p.MsoNormal, li.MsoNormal, div.MsoNormal
- {mso-style-parent:"";
- margin:0in;
- margin-bottom:.0001pt;
- mso-pagination:widow-orphan;
- font-size:12.0pt;
- font-family:"Times New Roman";
- mso-fareast-font-family:"Times New Roman";}
-p
- {margin-right:0in;
- mso-margin-top-alt:auto;
- mso-margin-bottom-alt:auto;
- margin-left:0in;
- mso-pagination:widow-orphan;
- font-size:12.0pt;
- font-family:"Times New Roman";
- mso-fareast-font-family:"Times New Roman";}
-p.BalloonText, li.BalloonText, div.BalloonText
- {mso-style-name:"Balloon Text";
- margin:0in;
- margin-bottom:.0001pt;
- mso-pagination:widow-orphan;
- font-size:8.0pt;
- font-family:Tahoma;
- mso-fareast-font-family:"Times New Roman";}
-@page Section1
- {size:8.5in 11.0in;
- margin:1.0in 1.25in 1.0in 1.25in;
- mso-header-margin:.5in;
- mso-footer-margin:.5in;
- mso-paper-source:0;}
-div.Section1
- {page:Section1;}
--->
-</style>
-</head>
-
-<body lang=EN-US style='tab-interval:.5in'>
-
-<div class=Section1>
-
-<p align=center style='text-align:center'><b>Eclipse Public License - v 1.0</b>
-</p>
-
-<p><span style='font-size:10.0pt'>THE ACCOMPANYING PROGRAM IS PROVIDED UNDER
-THE TERMS OF THIS ECLIPSE PUBLIC LICENSE ("AGREEMENT"). ANY USE,
-REPRODUCTION OR DISTRIBUTION OF THE PROGRAM CONSTITUTES RECIPIENT'S ACCEPTANCE
-OF THIS AGREEMENT.</span> </p>
-
-<p><b><span style='font-size:10.0pt'>1. DEFINITIONS</span></b> </p>
-
-<p><span style='font-size:10.0pt'>"Contribution" means:</span> </p>
-
-<p class=MsoNormal style='margin-left:.5in'><span style='font-size:10.0pt'>a)
-in the case of the initial Contributor, the initial code and documentation
-distributed under this Agreement, and<br clear=left>
-b) in the case of each subsequent Contributor:</span></p>
-
-<p class=MsoNormal style='margin-left:.5in'><span style='font-size:10.0pt'>i)
-changes to the Program, and</span></p>
-
-<p class=MsoNormal style='margin-left:.5in'><span style='font-size:10.0pt'>ii)
-additions to the Program;</span></p>
-
-<p class=MsoNormal style='margin-left:.5in'><span style='font-size:10.0pt'>where
-such changes and/or additions to the Program originate from and are distributed
-by that particular Contributor. A Contribution 'originates' from a Contributor
-if it was added to the Program by such Contributor itself or anyone acting on
-such Contributor's behalf. Contributions do not include additions to the
-Program which: (i) are separate modules of software distributed in conjunction
-with the Program under their own license agreement, and (ii) are not derivative
-works of the Program. </span></p>
-
-<p><span style='font-size:10.0pt'>"Contributor" means any person or
-entity that distributes the Program.</span> </p>
-
-<p><span style='font-size:10.0pt'>"Licensed Patents " mean patent
-claims licensable by a Contributor which are necessarily infringed by the use
-or sale of its Contribution alone or when combined with the Program. </span></p>
-
-<p><span style='font-size:10.0pt'>"Program" means the Contributions
-distributed in accordance with this Agreement.</span> </p>
-
-<p><span style='font-size:10.0pt'>"Recipient" means anyone who
-receives the Program under this Agreement, including all Contributors.</span> </p>
-
-<p><b><span style='font-size:10.0pt'>2. GRANT OF RIGHTS</span></b> </p>
-
-<p class=MsoNormal style='margin-left:.5in'><span style='font-size:10.0pt'>a)
-Subject to the terms of this Agreement, each Contributor hereby grants Recipient
-a non-exclusive, worldwide, royalty-free copyright license to<span
-style='color:red'> </span>reproduce, prepare derivative works of, publicly
-display, publicly perform, distribute and sublicense the Contribution of such
-Contributor, if any, and such derivative works, in source code and object code
-form.</span></p>
-
-<p class=MsoNormal style='margin-left:.5in'><span style='font-size:10.0pt'>b)
-Subject to the terms of this Agreement, each Contributor hereby grants
-Recipient a non-exclusive, worldwide,<span style='color:green'> </span>royalty-free
-patent license under Licensed Patents to make, use, sell, offer to sell, import
-and otherwise transfer the Contribution of such Contributor, if any, in source
-code and object code form. This patent license shall apply to the combination
-of the Contribution and the Program if, at the time the Contribution is added
-by the Contributor, such addition of the Contribution causes such combination
-to be covered by the Licensed Patents. The patent license shall not apply to
-any other combinations which include the Contribution. No hardware per se is
-licensed hereunder. </span></p>
-
-<p class=MsoNormal style='margin-left:.5in'><span style='font-size:10.0pt'>c)
-Recipient understands that although each Contributor grants the licenses to its
-Contributions set forth herein, no assurances are provided by any Contributor
-that the Program does not infringe the patent or other intellectual property
-rights of any other entity. Each Contributor disclaims any liability to Recipient
-for claims brought by any other entity based on infringement of intellectual
-property rights or otherwise. As a condition to exercising the rights and
-licenses granted hereunder, each Recipient hereby assumes sole responsibility
-to secure any other intellectual property rights needed, if any. For example,
-if a third party patent license is required to allow Recipient to distribute
-the Program, it is Recipient's responsibility to acquire that license before
-distributing the Program.</span></p>
-
-<p class=MsoNormal style='margin-left:.5in'><span style='font-size:10.0pt'>d)
-Each Contributor represents that to its knowledge it has sufficient copyright
-rights in its Contribution, if any, to grant the copyright license set forth in
-this Agreement. </span></p>
-
-<p><b><span style='font-size:10.0pt'>3. REQUIREMENTS</span></b> </p>
-
-<p><span style='font-size:10.0pt'>A Contributor may choose to distribute the
-Program in object code form under its own license agreement, provided that:</span>
-</p>
-
-<p class=MsoNormal style='margin-left:.5in'><span style='font-size:10.0pt'>a)
-it complies with the terms and conditions of this Agreement; and</span></p>
-
-<p class=MsoNormal style='margin-left:.5in'><span style='font-size:10.0pt'>b)
-its license agreement:</span></p>
-
-<p class=MsoNormal style='margin-left:.5in'><span style='font-size:10.0pt'>i)
-effectively disclaims on behalf of all Contributors all warranties and
-conditions, express and implied, including warranties or conditions of title
-and non-infringement, and implied warranties or conditions of merchantability
-and fitness for a particular purpose; </span></p>
-
-<p class=MsoNormal style='margin-left:.5in'><span style='font-size:10.0pt'>ii)
-effectively excludes on behalf of all Contributors all liability for damages,
-including direct, indirect, special, incidental and consequential damages, such
-as lost profits; </span></p>
-
-<p class=MsoNormal style='margin-left:.5in'><span style='font-size:10.0pt'>iii)
-states that any provisions which differ from this Agreement are offered by that
-Contributor alone and not by any other party; and</span></p>
-
-<p class=MsoNormal style='margin-left:.5in'><span style='font-size:10.0pt'>iv)
-states that source code for the Program is available from such Contributor, and
-informs licensees how to obtain it in a reasonable manner on or through a
-medium customarily used for software exchange.<span style='color:blue'> </span></span></p>
-
-<p><span style='font-size:10.0pt'>When the Program is made available in source
-code form:</span> </p>
-
-<p class=MsoNormal style='margin-left:.5in'><span style='font-size:10.0pt'>a)
-it must be made available under this Agreement; and </span></p>
-
-<p class=MsoNormal style='margin-left:.5in'><span style='font-size:10.0pt'>b) a
-copy of this Agreement must be included with each copy of the Program. </span></p>
-
-<p><span style='font-size:10.0pt'>Contributors may not remove or alter any
-copyright notices contained within the Program. </span></p>
-
-<p><span style='font-size:10.0pt'>Each Contributor must identify itself as the
-originator of its Contribution, if any, in a manner that reasonably allows
-subsequent Recipients to identify the originator of the Contribution. </span></p>
-
-<p><b><span style='font-size:10.0pt'>4. COMMERCIAL DISTRIBUTION</span></b> </p>
-
-<p><span style='font-size:10.0pt'>Commercial distributors of software may
-accept certain responsibilities with respect to end users, business partners
-and the like. While this license is intended to facilitate the commercial use
-of the Program, the Contributor who includes the Program in a commercial
-product offering should do so in a manner which does not create potential
-liability for other Contributors. Therefore, if a Contributor includes the
-Program in a commercial product offering, such Contributor ("Commercial
-Contributor") hereby agrees to defend and indemnify every other
-Contributor ("Indemnified Contributor") against any losses, damages and
-costs (collectively "Losses") arising from claims, lawsuits and other
-legal actions brought by a third party against the Indemnified Contributor to
-the extent caused by the acts or omissions of such Commercial Contributor in
-connection with its distribution of the Program in a commercial product
-offering. The obligations in this section do not apply to any claims or Losses
-relating to any actual or alleged intellectual property infringement. In order
-to qualify, an Indemnified Contributor must: a) promptly notify the Commercial
-Contributor in writing of such claim, and b) allow the Commercial Contributor
-to control, and cooperate with the Commercial Contributor in, the defense and
-any related settlement negotiations. The Indemnified Contributor may participate
-in any such claim at its own expense.</span> </p>
-
-<p><span style='font-size:10.0pt'>For example, a Contributor might include the
-Program in a commercial product offering, Product X. That Contributor is then a
-Commercial Contributor. If that Commercial Contributor then makes performance
-claims, or offers warranties related to Product X, those performance claims and
-warranties are such Commercial Contributor's responsibility alone. Under this
-section, the Commercial Contributor would have to defend claims against the
-other Contributors related to those performance claims and warranties, and if a
-court requires any other Contributor to pay any damages as a result, the
-Commercial Contributor must pay those damages.</span> </p>
-
-<p><b><span style='font-size:10.0pt'>5. NO WARRANTY</span></b> </p>
-
-<p><span style='font-size:10.0pt'>EXCEPT AS EXPRESSLY SET FORTH IN THIS
-AGREEMENT, THE PROGRAM IS PROVIDED ON AN "AS IS" BASIS, WITHOUT
-WARRANTIES OR CONDITIONS OF ANY KIND, EITHER EXPRESS OR IMPLIED INCLUDING,
-WITHOUT LIMITATION, ANY WARRANTIES OR CONDITIONS OF TITLE, NON-INFRINGEMENT,
-MERCHANTABILITY OR FITNESS FOR A PARTICULAR PURPOSE. Each Recipient is solely
-responsible for determining the appropriateness of using and distributing the
-Program and assumes all risks associated with its exercise of rights under this
-Agreement , including but not limited to the risks and costs of program errors,
-compliance with applicable laws, damage to or loss of data, programs or
-equipment, and unavailability or interruption of operations. </span></p>
-
-<p><b><span style='font-size:10.0pt'>6. DISCLAIMER OF LIABILITY</span></b> </p>
-
-<p><span style='font-size:10.0pt'>EXCEPT AS EXPRESSLY SET FORTH IN THIS
-AGREEMENT, NEITHER RECIPIENT NOR ANY CONTRIBUTORS SHALL HAVE ANY LIABILITY FOR
-ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES
-(INCLUDING WITHOUT LIMITATION LOST PROFITS), HOWEVER CAUSED AND ON ANY THEORY
-OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING
-NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OR DISTRIBUTION OF
-THE PROGRAM OR THE EXERCISE OF ANY RIGHTS GRANTED HEREUNDER, EVEN IF ADVISED OF
-THE POSSIBILITY OF SUCH DAMAGES.</span> </p>
-
-<p><b><span style='font-size:10.0pt'>7. GENERAL</span></b> </p>
-
-<p><span style='font-size:10.0pt'>If any provision of this Agreement is invalid
-or unenforceable under applicable law, it shall not affect the validity or
-enforceability of the remainder of the terms of this Agreement, and without
-further action by the parties hereto, such provision shall be reformed to the
-minimum extent necessary to make such provision valid and enforceable.</span> </p>
-
-<p><span style='font-size:10.0pt'>If Recipient institutes patent litigation
-against any entity (including a cross-claim or counterclaim in a lawsuit)
-alleging that the Program itself (excluding combinations of the Program with
-other software or hardware) infringes such Recipient's patent(s), then such
-Recipient's rights granted under Section 2(b) shall terminate as of the date
-such litigation is filed. </span></p>
-
-<p><span style='font-size:10.0pt'>All Recipient's rights under this Agreement
-shall terminate if it fails to comply with any of the material terms or
-conditions of this Agreement and does not cure such failure in a reasonable
-period of time after becoming aware of such noncompliance. If all Recipient's
-rights under this Agreement terminate, Recipient agrees to cease use and
-distribution of the Program as soon as reasonably practicable. However,
-Recipient's obligations under this Agreement and any licenses granted by
-Recipient relating to the Program shall continue and survive. </span></p>
-
-<p><span style='font-size:10.0pt'>Everyone is permitted to copy and distribute
-copies of this Agreement, but in order to avoid inconsistency the Agreement is
-copyrighted and may only be modified in the following manner. The Agreement
-Steward reserves the right to publish new versions (including revisions) of
-this Agreement from time to time. No one other than the Agreement Steward has
-the right to modify this Agreement. The Eclipse Foundation is the initial
-Agreement Steward. The Eclipse Foundation may assign the responsibility to
-serve as the Agreement Steward to a suitable separate entity. Each new version
-of the Agreement will be given a distinguishing version number. The Program
-(including Contributions) may always be distributed subject to the version of
-the Agreement under which it was received. In addition, after a new version of
-the Agreement is published, Contributor may elect to distribute the Program
-(including its Contributions) under the new version. Except as expressly stated
-in Sections 2(a) and 2(b) above, Recipient receives no rights or licenses to
-the intellectual property of any Contributor under this Agreement, whether
-expressly, by implication, estoppel or otherwise. All rights in the Program not
-expressly granted under this Agreement are reserved.</span> </p>
-
-<p><span style='font-size:10.0pt'>This Agreement is governed by the laws of the
-State of New York and the intellectual property laws of the United States of
-America. No party to this Agreement will bring a legal action under this
-Agreement more than one year after the cause of action arose. Each party waives
-its rights to a jury trial in any resulting litigation.</span> </p>
-
-<p class=MsoNormal><![if !supportEmptyParas]> <![endif]><o:p></o:p></p>
-
-</div>
-
-</body>
-
-</html>
diff --git a/features/org.eclipse.jst.web_ui.feature/sourceTemplateFeature/feature.properties b/features/org.eclipse.jst.web_ui.feature/sourceTemplateFeature/feature.properties
deleted file mode 100644
index 8fd164f..0000000
--- a/features/org.eclipse.jst.web_ui.feature/sourceTemplateFeature/feature.properties
+++ /dev/null
@@ -1,168 +0,0 @@
-###############################################################################
-# Copyright (c) 2006 IBM Corporation and others.
-# All rights reserved. This program and the accompanying materials
-# are made available under the terms of the Eclipse Public License v1.0
-# which accompanies this distribution, and is available at
-# http://www.eclipse.org/legal/epl-v10.html
-#
-# Contributors:
-# IBM Corporation - initial API and implementation
-###############################################################################
-# feature.properties
-# contains externalized strings for feature.xml
-# "%foo" in feature.xml corresponds to the key "foo" in this file
-# java.io.Properties file (ISO 8859-1 with "\" escapes)
-# This file should be translated.
-
-# "featureName" property - name of the feature
-featureName=JST Web UI Developer Resources
-
-# "providerName" property - name of the company that provides the feature
-providerName=Eclipse Web Tools Platform
-
-
-# "description" property - description of the feature
-description=Source code zips for JST Web UI.
-
-# "copyright" property - text of the "Feature Update Copyright"
-copyright=\
-Copyright (c) 2006 IBM Corporation and others.\n\
-All rights reserved. This program and the accompanying materials\n\
-are made available under the terms of the Eclipse Public License v1.0\n\
-which accompanies this distribution, and is available at\n\
-http://www.eclipse.org/legal/epl-v10.html\n\
-\n\
-Contributors:\n\
- IBM Corporation - initial API and implementation\n
-################ end of copyright property ####################################
-
-# "licenseURL" property - URL of the "Feature License"
-# do not translate value - just change to point to a locale-specific HTML page
-licenseURL=license.html
-
-# "license" property - text of the "Feature Update License"
-# should be plain text version of license agreement pointed to be "licenseURL"
-license=\
-Eclipse Foundation Software User Agreement\n\
-April 14, 2010\n\
-\n\
-Usage Of Content\n\
-\n\
-THE ECLIPSE FOUNDATION MAKES AVAILABLE SOFTWARE, DOCUMENTATION, INFORMATION AND/OR\n\
-OTHER MATERIALS FOR OPEN SOURCE PROJECTS (COLLECTIVELY "CONTENT").\n\
-USE OF THE CONTENT IS GOVERNED BY THE TERMS AND CONDITIONS OF THIS\n\
-AGREEMENT AND/OR THE TERMS AND CONDITIONS OF LICENSE AGREEMENTS OR\n\
-NOTICES INDICATED OR REFERENCED BELOW. BY USING THE CONTENT, YOU\n\
-AGREE THAT YOUR USE OF THE CONTENT IS GOVERNED BY THIS AGREEMENT\n\
-AND/OR THE TERMS AND CONDITIONS OF ANY APPLICABLE LICENSE AGREEMENTS\n\
-OR NOTICES INDICATED OR REFERENCED BELOW. IF YOU DO NOT AGREE TO THE\n\
-TERMS AND CONDITIONS OF THIS AGREEMENT AND THE TERMS AND CONDITIONS\n\
-OF ANY APPLICABLE LICENSE AGREEMENTS OR NOTICES INDICATED OR REFERENCED\n\
-BELOW, THEN YOU MAY NOT USE THE CONTENT.\n\
-\n\
-Applicable Licenses\n\
-\n\
-Unless otherwise indicated, all Content made available by the\n\
-Eclipse Foundation is provided to you under the terms and conditions of\n\
-the Eclipse Public License Version 1.0 ("EPL"). A copy of the EPL is\n\
-provided with this Content and is also available at http://www.eclipse.org/legal/epl-v10.html.\n\
-For purposes of the EPL, "Program" will mean the Content.\n\
-\n\
-Content includes, but is not limited to, source code, object code,\n\
-documentation and other files maintained in the Eclipse Foundation source code\n\
-repository ("Repository") in software modules ("Modules") and made available\n\
-as downloadable archives ("Downloads").\n\
-\n\
- - Content may be structured and packaged into modules to facilitate delivering,\n\
- extending, and upgrading the Content. Typical modules may include plug-ins ("Plug-ins"),\n\
- plug-in fragments ("Fragments"), and features ("Features").\n\
- - Each Plug-in or Fragment may be packaged as a sub-directory or JAR (Java(TM) ARchive)\n\
- in a directory named "plugins".\n\
- - A Feature is a bundle of one or more Plug-ins and/or Fragments and associated material.\n\
- Each Feature may be packaged as a sub-directory in a directory named "features".\n\
- Within a Feature, files named "feature.xml" may contain a list of the names and version\n\
- numbers of the Plug-ins and/or Fragments associated with that Feature.\n\
- - Features may also include other Features ("Included Features"). Within a Feature, files\n\
- named "feature.xml" may contain a list of the names and version numbers of Included Features.\n\
-\n\
-The terms and conditions governing Plug-ins and Fragments should be\n\
-contained in files named "about.html" ("Abouts"). The terms and\n\
-conditions governing Features and Included Features should be contained\n\
-in files named "license.html" ("Feature Licenses"). Abouts and Feature\n\
-Licenses may be located in any directory of a Download or Module\n\
-including, but not limited to the following locations:\n\
-\n\
- - The top-level (root) directory\n\
- - Plug-in and Fragment directories\n\
- - Inside Plug-ins and Fragments packaged as JARs\n\
- - Sub-directories of the directory named "src" of certain Plug-ins\n\
- - Feature directories\n\
-\n\
-Note: if a Feature made available by the Eclipse Foundation is installed using the\n\
-Provisioning Technology (as defined below), you must agree to a license ("Feature \n\
-Update License") during the installation process. If the Feature contains\n\
-Included Features, the Feature Update License should either provide you\n\
-with the terms and conditions governing the Included Features or inform\n\
-you where you can locate them. Feature Update Licenses may be found in\n\
-the "license" property of files named "feature.properties" found within a Feature.\n\
-Such Abouts, Feature Licenses, and Feature Update Licenses contain the\n\
-terms and conditions (or references to such terms and conditions) that\n\
-govern your use of the associated Content in that directory.\n\
-\n\
-THE ABOUTS, FEATURE LICENSES, AND FEATURE UPDATE LICENSES MAY REFER\n\
-TO THE EPL OR OTHER LICENSE AGREEMENTS, NOTICES OR TERMS AND CONDITIONS.\n\
-SOME OF THESE OTHER LICENSE AGREEMENTS MAY INCLUDE (BUT ARE NOT LIMITED TO):\n\
-\n\
- - Common Public License Version 1.0 (available at http://www.eclipse.org/legal/cpl-v10.html)\n\
- - Apache Software License 1.1 (available at http://www.apache.org/licenses/LICENSE)\n\
- - Apache Software License 2.0 (available at http://www.apache.org/licenses/LICENSE-2.0)\n\
- - Metro Link Public License 1.00 (available at http://www.opengroup.org/openmotif/supporters/metrolink/license.html)\n\
- - Mozilla Public License Version 1.1 (available at http://www.mozilla.org/MPL/MPL-1.1.html)\n\
-\n\
-IT IS YOUR OBLIGATION TO READ AND ACCEPT ALL SUCH TERMS AND CONDITIONS PRIOR\n\
-TO USE OF THE CONTENT. If no About, Feature License, or Feature Update License\n\
-is provided, please contact the Eclipse Foundation to determine what terms and conditions\n\
-govern that particular Content.\n\
-\n\
-\n\Use of Provisioning Technology\n\
-\n\
-The Eclipse Foundation makes available provisioning software, examples of which include,\n\
-but are not limited to, p2 and the Eclipse Update Manager ("Provisioning Technology") for\n\
-the purpose of allowing users to install software, documentation, information and/or\n\
-other materials (collectively "Installable Software"). This capability is provided with\n\
-the intent of allowing such users to install, extend and update Eclipse-based products.\n\
-Information about packaging Installable Software is available at\n\
-http://eclipse.org/equinox/p2/repository_packaging.html ("Specification").\n\
-\n\
-You may use Provisioning Technology to allow other parties to install Installable Software.\n\
-You shall be responsible for enabling the applicable license agreements relating to the\n\
-Installable Software to be presented to, and accepted by, the users of the Provisioning Technology\n\
-in accordance with the Specification. By using Provisioning Technology in such a manner and\n\
-making it available in accordance with the Specification, you further acknowledge your\n\
-agreement to, and the acquisition of all necessary rights to permit the following:\n\
-\n\
- 1. A series of actions may occur ("Provisioning Process") in which a user may execute\n\
- the Provisioning Technology on a machine ("Target Machine") with the intent of installing,\n\
- extending or updating the functionality of an Eclipse-based product.\n\
- 2. During the Provisioning Process, the Provisioning Technology may cause third party\n\
- Installable Software or a portion thereof to be accessed and copied to the Target Machine.\n\
- 3. Pursuant to the Specification, you will provide to the user the terms and conditions that\n\
- govern the use of the Installable Software ("Installable Software Agreement") and such\n\
- Installable Software Agreement shall be accessed from the Target Machine in accordance\n\
- with the Specification. Such Installable Software Agreement must inform the user of the\n\
- terms and conditions that govern the Installable Software and must solicit acceptance by\n\
- the end user in the manner prescribed in such Installable Software Agreement. Upon such\n\
- indication of agreement by the user, the provisioning Technology will complete installation\n\
- of the Installable Software.\n\
-\n\
-Cryptography\n\
-\n\
-Content may contain encryption software. The country in which you are\n\
-currently may have restrictions on the import, possession, and use,\n\
-and/or re-export to another country, of encryption software. BEFORE\n\
-using any encryption software, please check the country's laws,\n\
-regulations and policies concerning the import, possession, or use, and\n\
-re-export of encryption software, to see if this is permitted.\n\
-\n\
-Java and all Java-based trademarks are trademarks of Oracle Corporation in the United States, other countries, or both.\n
-########### end of license property ##########################################
diff --git a/features/org.eclipse.jst.web_ui.feature/sourceTemplateFeature/license.html b/features/org.eclipse.jst.web_ui.feature/sourceTemplateFeature/license.html
deleted file mode 100644
index c184ca3..0000000
--- a/features/org.eclipse.jst.web_ui.feature/sourceTemplateFeature/license.html
+++ /dev/null
@@ -1,107 +0,0 @@
-<?xml version="1.0" encoding="ISO-8859-1" ?>
-<!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.0 Strict//EN" "http://www.w3.org/TR/xhtml1/DTD/xhtml1-strict.dtd">
-<html xmlns="http://www.w3.org/1999/xhtml">
-<head>
-<meta http-equiv="Content-Type" content="text/html; charset=ISO-8859-1" />
-<title>Eclipse Foundation Software User Agreement</title>
-</head>
-
-<body lang="EN-US">
-<h2>Eclipse Foundation Software User Agreement</h2>
-<p>April 14, 2010</p>
-
-<h3>Usage Of Content</h3>
-
-<p>THE ECLIPSE FOUNDATION MAKES AVAILABLE SOFTWARE, DOCUMENTATION, INFORMATION AND/OR OTHER MATERIALS FOR OPEN SOURCE PROJECTS
- (COLLECTIVELY "CONTENT"). USE OF THE CONTENT IS GOVERNED BY THE TERMS AND CONDITIONS OF THIS AGREEMENT AND/OR THE TERMS AND
- CONDITIONS OF LICENSE AGREEMENTS OR NOTICES INDICATED OR REFERENCED BELOW. BY USING THE CONTENT, YOU AGREE THAT YOUR USE
- OF THE CONTENT IS GOVERNED BY THIS AGREEMENT AND/OR THE TERMS AND CONDITIONS OF ANY APPLICABLE LICENSE AGREEMENTS OR
- NOTICES INDICATED OR REFERENCED BELOW. IF YOU DO NOT AGREE TO THE TERMS AND CONDITIONS OF THIS AGREEMENT AND THE TERMS AND
- CONDITIONS OF ANY APPLICABLE LICENSE AGREEMENTS OR NOTICES INDICATED OR REFERENCED BELOW, THEN YOU MAY NOT USE THE CONTENT.</p>
-
-<h3>Applicable Licenses</h3>
-
-<p>Unless otherwise indicated, all Content made available by the Eclipse Foundation is provided to you under the terms and conditions of the Eclipse Public License Version 1.0
- ("EPL"). A copy of the EPL is provided with this Content and is also available at <a href="http://www.eclipse.org/legal/epl-v10.html">http://www.eclipse.org/legal/epl-v10.html</a>.
- For purposes of the EPL, "Program" will mean the Content.</p>
-
-<p>Content includes, but is not limited to, source code, object code, documentation and other files maintained in the Eclipse Foundation source code
- repository ("Repository") in software modules ("Modules") and made available as downloadable archives ("Downloads").</p>
-
-<ul>
- <li>Content may be structured and packaged into modules to facilitate delivering, extending, and upgrading the Content. Typical modules may include plug-ins ("Plug-ins"), plug-in fragments ("Fragments"), and features ("Features").</li>
- <li>Each Plug-in or Fragment may be packaged as a sub-directory or JAR (Java™ ARchive) in a directory named "plugins".</li>
- <li>A Feature is a bundle of one or more Plug-ins and/or Fragments and associated material. Each Feature may be packaged as a sub-directory in a directory named "features". Within a Feature, files named "feature.xml" may contain a list of the names and version numbers of the Plug-ins
- and/or Fragments associated with that Feature.</li>
- <li>Features may also include other Features ("Included Features"). Within a Feature, files named "feature.xml" may contain a list of the names and version numbers of Included Features.</li>
-</ul>
-
-<p>The terms and conditions governing Plug-ins and Fragments should be contained in files named "about.html" ("Abouts"). The terms and conditions governing Features and
-Included Features should be contained in files named "license.html" ("Feature Licenses"). Abouts and Feature Licenses may be located in any directory of a Download or Module
-including, but not limited to the following locations:</p>
-
-<ul>
- <li>The top-level (root) directory</li>
- <li>Plug-in and Fragment directories</li>
- <li>Inside Plug-ins and Fragments packaged as JARs</li>
- <li>Sub-directories of the directory named "src" of certain Plug-ins</li>
- <li>Feature directories</li>
-</ul>
-
-<p>Note: if a Feature made available by the Eclipse Foundation is installed using the Provisioning Technology (as defined below), you must agree to a license ("Feature Update License") during the
-installation process. If the Feature contains Included Features, the Feature Update License should either provide you with the terms and conditions governing the Included Features or
-inform you where you can locate them. Feature Update Licenses may be found in the "license" property of files named "feature.properties" found within a Feature.
-Such Abouts, Feature Licenses, and Feature Update Licenses contain the terms and conditions (or references to such terms and conditions) that govern your use of the associated Content in
-that directory.</p>
-
-<p>THE ABOUTS, FEATURE LICENSES, AND FEATURE UPDATE LICENSES MAY REFER TO THE EPL OR OTHER LICENSE AGREEMENTS, NOTICES OR TERMS AND CONDITIONS. SOME OF THESE
-OTHER LICENSE AGREEMENTS MAY INCLUDE (BUT ARE NOT LIMITED TO):</p>
-
-<ul>
- <li>Common Public License Version 1.0 (available at <a href="http://www.eclipse.org/legal/cpl-v10.html">http://www.eclipse.org/legal/cpl-v10.html</a>)</li>
- <li>Apache Software License 1.1 (available at <a href="http://www.apache.org/licenses/LICENSE">http://www.apache.org/licenses/LICENSE</a>)</li>
- <li>Apache Software License 2.0 (available at <a href="http://www.apache.org/licenses/LICENSE-2.0">http://www.apache.org/licenses/LICENSE-2.0</a>)</li>
- <li>Metro Link Public License 1.00 (available at <a href="http://www.opengroup.org/openmotif/supporters/metrolink/license.html">http://www.opengroup.org/openmotif/supporters/metrolink/license.html</a>)</li>
- <li>Mozilla Public License Version 1.1 (available at <a href="http://www.mozilla.org/MPL/MPL-1.1.html">http://www.mozilla.org/MPL/MPL-1.1.html</a>)</li>
-</ul>
-
-<p>IT IS YOUR OBLIGATION TO READ AND ACCEPT ALL SUCH TERMS AND CONDITIONS PRIOR TO USE OF THE CONTENT. If no About, Feature License, or Feature Update License is provided, please
-contact the Eclipse Foundation to determine what terms and conditions govern that particular Content.</p>
-
-
-<h3>Use of Provisioning Technology</h3>
-
-<p>The Eclipse Foundation makes available provisioning software, examples of which include, but are not limited to, p2 and the Eclipse
- Update Manager ("Provisioning Technology") for the purpose of allowing users to install software, documentation, information and/or
- other materials (collectively "Installable Software"). This capability is provided with the intent of allowing such users to
- install, extend and update Eclipse-based products. Information about packaging Installable Software is available at <a
- href="http://eclipse.org/equinox/p2/repository_packaging.html">http://eclipse.org/equinox/p2/repository_packaging.html</a>
- ("Specification").</p>
-
-<p>You may use Provisioning Technology to allow other parties to install Installable Software. You shall be responsible for enabling the
- applicable license agreements relating to the Installable Software to be presented to, and accepted by, the users of the Provisioning Technology
- in accordance with the Specification. By using Provisioning Technology in such a manner and making it available in accordance with the
- Specification, you further acknowledge your agreement to, and the acquisition of all necessary rights to permit the following:</p>
-
-<ol>
- <li>A series of actions may occur ("Provisioning Process") in which a user may execute the Provisioning Technology
- on a machine ("Target Machine") with the intent of installing, extending or updating the functionality of an Eclipse-based
- product.</li>
- <li>During the Provisioning Process, the Provisioning Technology may cause third party Installable Software or a portion thereof to be
- accessed and copied to the Target Machine.</li>
- <li>Pursuant to the Specification, you will provide to the user the terms and conditions that govern the use of the Installable
- Software ("Installable Software Agreement") and such Installable Software Agreement shall be accessed from the Target
- Machine in accordance with the Specification. Such Installable Software Agreement must inform the user of the terms and conditions that govern
- the Installable Software and must solicit acceptance by the end user in the manner prescribed in such Installable Software Agreement. Upon such
- indication of agreement by the user, the provisioning Technology will complete installation of the Installable Software.</li>
-</ol>
-
-<h3>Cryptography</h3>
-
-<p>Content may contain encryption software. The country in which you are currently may have restrictions on the import, possession, and use, and/or re-export to
- another country, of encryption software. BEFORE using any encryption software, please check the country's laws, regulations and policies concerning the import,
- possession, or use, and re-export of encryption software, to see if this is permitted.</p>
-
-<p><small>Java and all Java-based trademarks are trademarks of Oracle Corporation in the United States, other countries, or both.</small></p>
-</body>
-</html>
diff --git a/features/org.eclipse.jst.web_ui.feature/sourceTemplatePlugin/about.html b/features/org.eclipse.jst.web_ui.feature/sourceTemplatePlugin/about.html
deleted file mode 100644
index fe81d46..0000000
--- a/features/org.eclipse.jst.web_ui.feature/sourceTemplatePlugin/about.html
+++ /dev/null
@@ -1,27 +0,0 @@
-<!DOCTYPE HTML PUBLIC "-//W3C//DTD HTML 4.0//EN">
-<html>
-<head>
-<title>About</title>
-<meta http-equiv=Content-Type content="text/html; charset=ISO-8859-1">
-</head>
-<body lang="EN-US">
-<h2>About This Content</h2>
-
-<P>June, 2008</P>
-<h3>License</h3>
-
-<p>The Eclipse Foundation makes available all content in this plug-in ("Content"). Unless otherwise indicated below, the Content is provided to you under the terms and conditions of the
-Eclipse Public License Version 1.0 ("EPL"). A copy of the EPL is available at <a href="http://www.eclipse.org/legal/epl-v10.html">http://www.eclipse.org/legal/epl-v10.html</a>.
-For purposes of the EPL, "Program" will mean the Content.</p>
-
-<p>If you did not receive this Content directly from the Eclipse Foundation, the Content is being redistributed by another party ("Redistributor") and different terms and conditions may
-apply to your use of any object code in the Content. Check the Redistributor's license that was provided with the Content. If no such license exists, contact the Redistributor. Unless otherwise
-indicated below, the terms and conditions of the EPL still apply to any source code in the Content.</p>
-
-<h3>Source Code</h3>
-<p>This plug-in contains source code zip files ("Source Zips") that correspond to binary content in other plug-ins. These Source Zips may be distributed under different license
-agreements and/or notices. Details about these license agreements and notices are contained in "about.html" files ("Abouts") located in sub-directories in the
-src/ directory of this plug-in. Such Abouts govern your use of the Source Zips in that directory, not the EPL.</p>
-
-</body>
-</html>
diff --git a/features/org.eclipse.jst.web_ui.feature/sourceTemplatePlugin/about.ini b/features/org.eclipse.jst.web_ui.feature/sourceTemplatePlugin/about.ini
deleted file mode 100644
index fda5a40..0000000
--- a/features/org.eclipse.jst.web_ui.feature/sourceTemplatePlugin/about.ini
+++ /dev/null
@@ -1,31 +0,0 @@
-# about.ini
-# contains information about a feature
-# java.io.Properties file (ISO 8859-1 with "\" escapes)
-# "%key" are externalized strings defined in about.properties
-# This file does not need to be translated.
-
-# Property "aboutText" contains blurb for "About" dialog (translated)
-aboutText=%blurb
-
-# Property "windowImage" contains path to window icon (16x16)
-# needed for primary features only
-
-# Property "featureImage" contains path to feature image (32x32)
-featureImage=wtp_prod32.png
-
-# Property "aboutImage" contains path to product image (500x330 or 115x164)
-# needed for primary features only
-
-# Property "appName" contains name of the application (not translated)
-# needed for primary features only
-
-# Property "welcomePage" contains path to welcome page (special XML-based format)
-# optional
-
-# Property "welcomePerspective" contains the id of the perspective in which the
-# welcome page is to be opened.
-# optional
-
-
-
-
diff --git a/features/org.eclipse.jst.web_ui.feature/sourceTemplatePlugin/about.mappings b/features/org.eclipse.jst.web_ui.feature/sourceTemplatePlugin/about.mappings
deleted file mode 100644
index 0dfb735..0000000
--- a/features/org.eclipse.jst.web_ui.feature/sourceTemplatePlugin/about.mappings
+++ /dev/null
@@ -1,6 +0,0 @@
-# about.mappings
-# contains fill-ins for about.properties
-# java.io.Properties file (ISO 8859-1 with "\" escapes)
-# This file does not need to be translated.
-
-0=@build@
diff --git a/features/org.eclipse.jst.web_ui.feature/sourceTemplatePlugin/about.properties b/features/org.eclipse.jst.web_ui.feature/sourceTemplatePlugin/about.properties
deleted file mode 100644
index 307bab9..0000000
--- a/features/org.eclipse.jst.web_ui.feature/sourceTemplatePlugin/about.properties
+++ /dev/null
@@ -1,26 +0,0 @@
-###############################################################################
-# Copyright (c) 2000, 2005 IBM Corporation and others.
-# All rights reserved. This program and the accompanying materials
-# are made available under the terms of the Eclipse Public License v1.0
-# which accompanies this distribution, and is available at
-# http://www.eclipse.org/legal/epl-v10.html
-#
-# Contributors:
-# IBM Corporation - initial API and implementation
-###############################################################################
-# about.properties
-# contains externalized strings for about.ini
-# java.io.Properties file (ISO 8859-1 with "\" escapes)
-# fill-ins are supplied by about.mappings
-# This file should be translated.
-#
-# Do not translate any values surrounded by {}
-
-blurb=J2EE Standard Tools - Web UI\n\
-\n\
-Version: {featureVersion}\n\
-Build id: {0}\n\
-\n\
-(c) Copyright Eclipse contributors and others 2005. All rights reserved.\n\
-Visit http://www.eclipse.org/webtools
-
diff --git a/features/org.eclipse.jst.web_ui.feature/sourceTemplatePlugin/build.properties b/features/org.eclipse.jst.web_ui.feature/sourceTemplatePlugin/build.properties
deleted file mode 100644
index 30a575c..0000000
--- a/features/org.eclipse.jst.web_ui.feature/sourceTemplatePlugin/build.properties
+++ /dev/null
@@ -1,3 +0,0 @@
-
-bin.includes = about.html, about.ini, about.mappings, about.properties, wtp_prod32.png, plugin.properties, plugin.xml, src/**, META-INF/
-sourcePlugin = true
diff --git a/features/org.eclipse.jst.web_ui.feature/sourceTemplatePlugin/plugin.properties b/features/org.eclipse.jst.web_ui.feature/sourceTemplatePlugin/plugin.properties
deleted file mode 100644
index e711acf..0000000
--- a/features/org.eclipse.jst.web_ui.feature/sourceTemplatePlugin/plugin.properties
+++ /dev/null
@@ -1,12 +0,0 @@
-###############################################################################
-# Copyright (c) 2005 IBM Corporation and others.
-# All rights reserved. This program and the accompanying materials
-# are made available under the terms of the Eclipse Public License v1.0
-# which accompanies this distribution, and is available at
-# http://www.eclipse.org/legal/epl-v10.html
-#
-# Contributors:
-# IBM Corporation - initial API and implementation
-###############################################################################
-pluginName=J2EE Standard Tools - Web UI Source
-providerName=Eclipse.org
diff --git a/features/org.eclipse.jst.web_ui.feature/sourceTemplatePlugin/wtp_prod32.gif b/features/org.eclipse.jst.web_ui.feature/sourceTemplatePlugin/wtp_prod32.gif
deleted file mode 100644
index eefb44a..0000000
--- a/features/org.eclipse.jst.web_ui.feature/sourceTemplatePlugin/wtp_prod32.gif
+++ /dev/null
Binary files differ
diff --git a/features/org.eclipse.jst.web_ui.feature/sourceTemplatePlugin/wtp_prod32.png b/features/org.eclipse.jst.web_ui.feature/sourceTemplatePlugin/wtp_prod32.png
deleted file mode 100644
index bfceab3..0000000
--- a/features/org.eclipse.jst.web_ui.feature/sourceTemplatePlugin/wtp_prod32.png
+++ /dev/null
Binary files differ
diff --git a/features/org.eclipse.jst.web_userdoc.feature/.cvsignore b/features/org.eclipse.jst.web_userdoc.feature/.cvsignore
deleted file mode 100644
index c14487c..0000000
--- a/features/org.eclipse.jst.web_userdoc.feature/.cvsignore
+++ /dev/null
@@ -1 +0,0 @@
-build.xml
diff --git a/features/org.eclipse.jst.web_userdoc.feature/.project b/features/org.eclipse.jst.web_userdoc.feature/.project
deleted file mode 100644
index 5650104..0000000
--- a/features/org.eclipse.jst.web_userdoc.feature/.project
+++ /dev/null
@@ -1,17 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<projectDescription>
- <name>org.eclipse.jst.web_userdoc.feature</name>
- <comment></comment>
- <projects>
- </projects>
- <buildSpec>
- <buildCommand>
- <name>org.eclipse.pde.FeatureBuilder</name>
- <arguments>
- </arguments>
- </buildCommand>
- </buildSpec>
- <natures>
- <nature>org.eclipse.pde.FeatureNature</nature>
- </natures>
-</projectDescription>
diff --git a/features/org.eclipse.jst.web_userdoc.feature/build.properties b/features/org.eclipse.jst.web_userdoc.feature/build.properties
deleted file mode 100644
index 7f47694..0000000
--- a/features/org.eclipse.jst.web_userdoc.feature/build.properties
+++ /dev/null
@@ -1,5 +0,0 @@
-bin.includes = feature.xml,\
- eclipse_update_120.jpg,\
- epl-v10.html,\
- license.html,\
- feature.properties
diff --git a/features/org.eclipse.jst.web_userdoc.feature/eclipse_update_120.jpg b/features/org.eclipse.jst.web_userdoc.feature/eclipse_update_120.jpg
deleted file mode 100644
index bfdf708..0000000
--- a/features/org.eclipse.jst.web_userdoc.feature/eclipse_update_120.jpg
+++ /dev/null
Binary files differ
diff --git a/features/org.eclipse.jst.web_userdoc.feature/epl-v10.html b/features/org.eclipse.jst.web_userdoc.feature/epl-v10.html
deleted file mode 100644
index ed4b196..0000000
--- a/features/org.eclipse.jst.web_userdoc.feature/epl-v10.html
+++ /dev/null
@@ -1,328 +0,0 @@
-<html xmlns:o="urn:schemas-microsoft-com:office:office"
-xmlns:w="urn:schemas-microsoft-com:office:word"
-xmlns="http://www.w3.org/TR/REC-html40">
-
-<head>
-<meta http-equiv=Content-Type content="text/html; charset=windows-1252">
-<meta name=ProgId content=Word.Document>
-<meta name=Generator content="Microsoft Word 9">
-<meta name=Originator content="Microsoft Word 9">
-<link rel=File-List
-href="./Eclipse%20EPL%202003_11_10%20Final_files/filelist.xml">
-<title>Eclipse Public License - Version 1.0</title>
-<!--[if gte mso 9]><xml>
- <o:DocumentProperties>
- <o:Revision>2</o:Revision>
- <o:TotalTime>3</o:TotalTime>
- <o:Created>2004-03-05T23:03:00Z</o:Created>
- <o:LastSaved>2004-03-05T23:03:00Z</o:LastSaved>
- <o:Pages>4</o:Pages>
- <o:Words>1626</o:Words>
- <o:Characters>9270</o:Characters>
- <o:Lines>77</o:Lines>
- <o:Paragraphs>18</o:Paragraphs>
- <o:CharactersWithSpaces>11384</o:CharactersWithSpaces>
- <o:Version>9.4402</o:Version>
- </o:DocumentProperties>
-</xml><![endif]--><!--[if gte mso 9]><xml>
- <w:WordDocument>
- <w:TrackRevisions/>
- </w:WordDocument>
-</xml><![endif]-->
-<style>
-<!--
- /* Font Definitions */
-@font-face
- {font-family:Tahoma;
- panose-1:2 11 6 4 3 5 4 4 2 4;
- mso-font-charset:0;
- mso-generic-font-family:swiss;
- mso-font-pitch:variable;
- mso-font-signature:553679495 -2147483648 8 0 66047 0;}
- /* Style Definitions */
-p.MsoNormal, li.MsoNormal, div.MsoNormal
- {mso-style-parent:"";
- margin:0in;
- margin-bottom:.0001pt;
- mso-pagination:widow-orphan;
- font-size:12.0pt;
- font-family:"Times New Roman";
- mso-fareast-font-family:"Times New Roman";}
-p
- {margin-right:0in;
- mso-margin-top-alt:auto;
- mso-margin-bottom-alt:auto;
- margin-left:0in;
- mso-pagination:widow-orphan;
- font-size:12.0pt;
- font-family:"Times New Roman";
- mso-fareast-font-family:"Times New Roman";}
-p.BalloonText, li.BalloonText, div.BalloonText
- {mso-style-name:"Balloon Text";
- margin:0in;
- margin-bottom:.0001pt;
- mso-pagination:widow-orphan;
- font-size:8.0pt;
- font-family:Tahoma;
- mso-fareast-font-family:"Times New Roman";}
-@page Section1
- {size:8.5in 11.0in;
- margin:1.0in 1.25in 1.0in 1.25in;
- mso-header-margin:.5in;
- mso-footer-margin:.5in;
- mso-paper-source:0;}
-div.Section1
- {page:Section1;}
--->
-</style>
-</head>
-
-<body lang=EN-US style='tab-interval:.5in'>
-
-<div class=Section1>
-
-<p align=center style='text-align:center'><b>Eclipse Public License - v 1.0</b>
-</p>
-
-<p><span style='font-size:10.0pt'>THE ACCOMPANYING PROGRAM IS PROVIDED UNDER
-THE TERMS OF THIS ECLIPSE PUBLIC LICENSE ("AGREEMENT"). ANY USE,
-REPRODUCTION OR DISTRIBUTION OF THE PROGRAM CONSTITUTES RECIPIENT'S ACCEPTANCE
-OF THIS AGREEMENT.</span> </p>
-
-<p><b><span style='font-size:10.0pt'>1. DEFINITIONS</span></b> </p>
-
-<p><span style='font-size:10.0pt'>"Contribution" means:</span> </p>
-
-<p class=MsoNormal style='margin-left:.5in'><span style='font-size:10.0pt'>a)
-in the case of the initial Contributor, the initial code and documentation
-distributed under this Agreement, and<br clear=left>
-b) in the case of each subsequent Contributor:</span></p>
-
-<p class=MsoNormal style='margin-left:.5in'><span style='font-size:10.0pt'>i)
-changes to the Program, and</span></p>
-
-<p class=MsoNormal style='margin-left:.5in'><span style='font-size:10.0pt'>ii)
-additions to the Program;</span></p>
-
-<p class=MsoNormal style='margin-left:.5in'><span style='font-size:10.0pt'>where
-such changes and/or additions to the Program originate from and are distributed
-by that particular Contributor. A Contribution 'originates' from a Contributor
-if it was added to the Program by such Contributor itself or anyone acting on
-such Contributor's behalf. Contributions do not include additions to the
-Program which: (i) are separate modules of software distributed in conjunction
-with the Program under their own license agreement, and (ii) are not derivative
-works of the Program. </span></p>
-
-<p><span style='font-size:10.0pt'>"Contributor" means any person or
-entity that distributes the Program.</span> </p>
-
-<p><span style='font-size:10.0pt'>"Licensed Patents " mean patent
-claims licensable by a Contributor which are necessarily infringed by the use
-or sale of its Contribution alone or when combined with the Program. </span></p>
-
-<p><span style='font-size:10.0pt'>"Program" means the Contributions
-distributed in accordance with this Agreement.</span> </p>
-
-<p><span style='font-size:10.0pt'>"Recipient" means anyone who
-receives the Program under this Agreement, including all Contributors.</span> </p>
-
-<p><b><span style='font-size:10.0pt'>2. GRANT OF RIGHTS</span></b> </p>
-
-<p class=MsoNormal style='margin-left:.5in'><span style='font-size:10.0pt'>a)
-Subject to the terms of this Agreement, each Contributor hereby grants Recipient
-a non-exclusive, worldwide, royalty-free copyright license to<span
-style='color:red'> </span>reproduce, prepare derivative works of, publicly
-display, publicly perform, distribute and sublicense the Contribution of such
-Contributor, if any, and such derivative works, in source code and object code
-form.</span></p>
-
-<p class=MsoNormal style='margin-left:.5in'><span style='font-size:10.0pt'>b)
-Subject to the terms of this Agreement, each Contributor hereby grants
-Recipient a non-exclusive, worldwide,<span style='color:green'> </span>royalty-free
-patent license under Licensed Patents to make, use, sell, offer to sell, import
-and otherwise transfer the Contribution of such Contributor, if any, in source
-code and object code form. This patent license shall apply to the combination
-of the Contribution and the Program if, at the time the Contribution is added
-by the Contributor, such addition of the Contribution causes such combination
-to be covered by the Licensed Patents. The patent license shall not apply to
-any other combinations which include the Contribution. No hardware per se is
-licensed hereunder. </span></p>
-
-<p class=MsoNormal style='margin-left:.5in'><span style='font-size:10.0pt'>c)
-Recipient understands that although each Contributor grants the licenses to its
-Contributions set forth herein, no assurances are provided by any Contributor
-that the Program does not infringe the patent or other intellectual property
-rights of any other entity. Each Contributor disclaims any liability to Recipient
-for claims brought by any other entity based on infringement of intellectual
-property rights or otherwise. As a condition to exercising the rights and
-licenses granted hereunder, each Recipient hereby assumes sole responsibility
-to secure any other intellectual property rights needed, if any. For example,
-if a third party patent license is required to allow Recipient to distribute
-the Program, it is Recipient's responsibility to acquire that license before
-distributing the Program.</span></p>
-
-<p class=MsoNormal style='margin-left:.5in'><span style='font-size:10.0pt'>d)
-Each Contributor represents that to its knowledge it has sufficient copyright
-rights in its Contribution, if any, to grant the copyright license set forth in
-this Agreement. </span></p>
-
-<p><b><span style='font-size:10.0pt'>3. REQUIREMENTS</span></b> </p>
-
-<p><span style='font-size:10.0pt'>A Contributor may choose to distribute the
-Program in object code form under its own license agreement, provided that:</span>
-</p>
-
-<p class=MsoNormal style='margin-left:.5in'><span style='font-size:10.0pt'>a)
-it complies with the terms and conditions of this Agreement; and</span></p>
-
-<p class=MsoNormal style='margin-left:.5in'><span style='font-size:10.0pt'>b)
-its license agreement:</span></p>
-
-<p class=MsoNormal style='margin-left:.5in'><span style='font-size:10.0pt'>i)
-effectively disclaims on behalf of all Contributors all warranties and
-conditions, express and implied, including warranties or conditions of title
-and non-infringement, and implied warranties or conditions of merchantability
-and fitness for a particular purpose; </span></p>
-
-<p class=MsoNormal style='margin-left:.5in'><span style='font-size:10.0pt'>ii)
-effectively excludes on behalf of all Contributors all liability for damages,
-including direct, indirect, special, incidental and consequential damages, such
-as lost profits; </span></p>
-
-<p class=MsoNormal style='margin-left:.5in'><span style='font-size:10.0pt'>iii)
-states that any provisions which differ from this Agreement are offered by that
-Contributor alone and not by any other party; and</span></p>
-
-<p class=MsoNormal style='margin-left:.5in'><span style='font-size:10.0pt'>iv)
-states that source code for the Program is available from such Contributor, and
-informs licensees how to obtain it in a reasonable manner on or through a
-medium customarily used for software exchange.<span style='color:blue'> </span></span></p>
-
-<p><span style='font-size:10.0pt'>When the Program is made available in source
-code form:</span> </p>
-
-<p class=MsoNormal style='margin-left:.5in'><span style='font-size:10.0pt'>a)
-it must be made available under this Agreement; and </span></p>
-
-<p class=MsoNormal style='margin-left:.5in'><span style='font-size:10.0pt'>b) a
-copy of this Agreement must be included with each copy of the Program. </span></p>
-
-<p><span style='font-size:10.0pt'>Contributors may not remove or alter any
-copyright notices contained within the Program. </span></p>
-
-<p><span style='font-size:10.0pt'>Each Contributor must identify itself as the
-originator of its Contribution, if any, in a manner that reasonably allows
-subsequent Recipients to identify the originator of the Contribution. </span></p>
-
-<p><b><span style='font-size:10.0pt'>4. COMMERCIAL DISTRIBUTION</span></b> </p>
-
-<p><span style='font-size:10.0pt'>Commercial distributors of software may
-accept certain responsibilities with respect to end users, business partners
-and the like. While this license is intended to facilitate the commercial use
-of the Program, the Contributor who includes the Program in a commercial
-product offering should do so in a manner which does not create potential
-liability for other Contributors. Therefore, if a Contributor includes the
-Program in a commercial product offering, such Contributor ("Commercial
-Contributor") hereby agrees to defend and indemnify every other
-Contributor ("Indemnified Contributor") against any losses, damages and
-costs (collectively "Losses") arising from claims, lawsuits and other
-legal actions brought by a third party against the Indemnified Contributor to
-the extent caused by the acts or omissions of such Commercial Contributor in
-connection with its distribution of the Program in a commercial product
-offering. The obligations in this section do not apply to any claims or Losses
-relating to any actual or alleged intellectual property infringement. In order
-to qualify, an Indemnified Contributor must: a) promptly notify the Commercial
-Contributor in writing of such claim, and b) allow the Commercial Contributor
-to control, and cooperate with the Commercial Contributor in, the defense and
-any related settlement negotiations. The Indemnified Contributor may participate
-in any such claim at its own expense.</span> </p>
-
-<p><span style='font-size:10.0pt'>For example, a Contributor might include the
-Program in a commercial product offering, Product X. That Contributor is then a
-Commercial Contributor. If that Commercial Contributor then makes performance
-claims, or offers warranties related to Product X, those performance claims and
-warranties are such Commercial Contributor's responsibility alone. Under this
-section, the Commercial Contributor would have to defend claims against the
-other Contributors related to those performance claims and warranties, and if a
-court requires any other Contributor to pay any damages as a result, the
-Commercial Contributor must pay those damages.</span> </p>
-
-<p><b><span style='font-size:10.0pt'>5. NO WARRANTY</span></b> </p>
-
-<p><span style='font-size:10.0pt'>EXCEPT AS EXPRESSLY SET FORTH IN THIS
-AGREEMENT, THE PROGRAM IS PROVIDED ON AN "AS IS" BASIS, WITHOUT
-WARRANTIES OR CONDITIONS OF ANY KIND, EITHER EXPRESS OR IMPLIED INCLUDING,
-WITHOUT LIMITATION, ANY WARRANTIES OR CONDITIONS OF TITLE, NON-INFRINGEMENT,
-MERCHANTABILITY OR FITNESS FOR A PARTICULAR PURPOSE. Each Recipient is solely
-responsible for determining the appropriateness of using and distributing the
-Program and assumes all risks associated with its exercise of rights under this
-Agreement , including but not limited to the risks and costs of program errors,
-compliance with applicable laws, damage to or loss of data, programs or
-equipment, and unavailability or interruption of operations. </span></p>
-
-<p><b><span style='font-size:10.0pt'>6. DISCLAIMER OF LIABILITY</span></b> </p>
-
-<p><span style='font-size:10.0pt'>EXCEPT AS EXPRESSLY SET FORTH IN THIS
-AGREEMENT, NEITHER RECIPIENT NOR ANY CONTRIBUTORS SHALL HAVE ANY LIABILITY FOR
-ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES
-(INCLUDING WITHOUT LIMITATION LOST PROFITS), HOWEVER CAUSED AND ON ANY THEORY
-OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING
-NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OR DISTRIBUTION OF
-THE PROGRAM OR THE EXERCISE OF ANY RIGHTS GRANTED HEREUNDER, EVEN IF ADVISED OF
-THE POSSIBILITY OF SUCH DAMAGES.</span> </p>
-
-<p><b><span style='font-size:10.0pt'>7. GENERAL</span></b> </p>
-
-<p><span style='font-size:10.0pt'>If any provision of this Agreement is invalid
-or unenforceable under applicable law, it shall not affect the validity or
-enforceability of the remainder of the terms of this Agreement, and without
-further action by the parties hereto, such provision shall be reformed to the
-minimum extent necessary to make such provision valid and enforceable.</span> </p>
-
-<p><span style='font-size:10.0pt'>If Recipient institutes patent litigation
-against any entity (including a cross-claim or counterclaim in a lawsuit)
-alleging that the Program itself (excluding combinations of the Program with
-other software or hardware) infringes such Recipient's patent(s), then such
-Recipient's rights granted under Section 2(b) shall terminate as of the date
-such litigation is filed. </span></p>
-
-<p><span style='font-size:10.0pt'>All Recipient's rights under this Agreement
-shall terminate if it fails to comply with any of the material terms or
-conditions of this Agreement and does not cure such failure in a reasonable
-period of time after becoming aware of such noncompliance. If all Recipient's
-rights under this Agreement terminate, Recipient agrees to cease use and
-distribution of the Program as soon as reasonably practicable. However,
-Recipient's obligations under this Agreement and any licenses granted by
-Recipient relating to the Program shall continue and survive. </span></p>
-
-<p><span style='font-size:10.0pt'>Everyone is permitted to copy and distribute
-copies of this Agreement, but in order to avoid inconsistency the Agreement is
-copyrighted and may only be modified in the following manner. The Agreement
-Steward reserves the right to publish new versions (including revisions) of
-this Agreement from time to time. No one other than the Agreement Steward has
-the right to modify this Agreement. The Eclipse Foundation is the initial
-Agreement Steward. The Eclipse Foundation may assign the responsibility to
-serve as the Agreement Steward to a suitable separate entity. Each new version
-of the Agreement will be given a distinguishing version number. The Program
-(including Contributions) may always be distributed subject to the version of
-the Agreement under which it was received. In addition, after a new version of
-the Agreement is published, Contributor may elect to distribute the Program
-(including its Contributions) under the new version. Except as expressly stated
-in Sections 2(a) and 2(b) above, Recipient receives no rights or licenses to
-the intellectual property of any Contributor under this Agreement, whether
-expressly, by implication, estoppel or otherwise. All rights in the Program not
-expressly granted under this Agreement are reserved.</span> </p>
-
-<p><span style='font-size:10.0pt'>This Agreement is governed by the laws of the
-State of New York and the intellectual property laws of the United States of
-America. No party to this Agreement will bring a legal action under this
-Agreement more than one year after the cause of action arose. Each party waives
-its rights to a jury trial in any resulting litigation.</span> </p>
-
-<p class=MsoNormal><![if !supportEmptyParas]> <![endif]><o:p></o:p></p>
-
-</div>
-
-</body>
-
-</html>
\ No newline at end of file
diff --git a/features/org.eclipse.jst.web_userdoc.feature/feature.properties b/features/org.eclipse.jst.web_userdoc.feature/feature.properties
deleted file mode 100644
index 943c2c6..0000000
--- a/features/org.eclipse.jst.web_userdoc.feature/feature.properties
+++ /dev/null
@@ -1,168 +0,0 @@
-###############################################################################
-# Copyright (c) 2006, 2010 IBM Corporation and others.
-# All rights reserved. This program and the accompanying materials
-# are made available under the terms of the Eclipse Public License v1.0
-# which accompanies this distribution, and is available at
-# http://www.eclipse.org/legal/epl-v10.html
-#
-# Contributors:
-# IBM Corporation - initial API and implementation
-###############################################################################
-# feature.properties
-# contains externalized strings for feature.xml
-# "%foo" in feature.xml corresponds to the key "foo" in this file
-# java.io.Properties file (ISO 8859-1 with "\" escapes)
-# This file should be translated.
-
-# "featureName" property - name of the feature
-featureName=JST Web User Documentation
-
-# "providerName" property - name of the company that provides the feature
-providerName=Eclipse Web Tools Platform
-
-
-# "description" property - description of the feature
-description=JST Web user documentation
-
-# "copyright" property - text of the "Feature Update Copyright"
-copyright=\
-Copyright (c) 2006 IBM Corporation and others.\n\
-All rights reserved. This program and the accompanying materials\n\
-are made available under the terms of the Eclipse Public License v1.0\n\
-which accompanies this distribution, and is available at\n\
-http://www.eclipse.org/legal/epl-v10.html\n\
-\n\
-Contributors:\n\
- IBM Corporation - initial API and implementation\n
-################ end of copyright property ####################################
-
-# "licenseURL" property - URL of the "Feature License"
-# do not translate value - just change to point to a locale-specific HTML page
-licenseURL=license.html
-
-# "license" property - text of the "Feature Update License"
-# should be plain text version of license agreement pointed to be "licenseURL"
-license=\
-Eclipse Foundation Software User Agreement\n\
-April 14, 2010\n\
-\n\
-Usage Of Content\n\
-\n\
-THE ECLIPSE FOUNDATION MAKES AVAILABLE SOFTWARE, DOCUMENTATION, INFORMATION AND/OR\n\
-OTHER MATERIALS FOR OPEN SOURCE PROJECTS (COLLECTIVELY "CONTENT").\n\
-USE OF THE CONTENT IS GOVERNED BY THE TERMS AND CONDITIONS OF THIS\n\
-AGREEMENT AND/OR THE TERMS AND CONDITIONS OF LICENSE AGREEMENTS OR\n\
-NOTICES INDICATED OR REFERENCED BELOW. BY USING THE CONTENT, YOU\n\
-AGREE THAT YOUR USE OF THE CONTENT IS GOVERNED BY THIS AGREEMENT\n\
-AND/OR THE TERMS AND CONDITIONS OF ANY APPLICABLE LICENSE AGREEMENTS\n\
-OR NOTICES INDICATED OR REFERENCED BELOW. IF YOU DO NOT AGREE TO THE\n\
-TERMS AND CONDITIONS OF THIS AGREEMENT AND THE TERMS AND CONDITIONS\n\
-OF ANY APPLICABLE LICENSE AGREEMENTS OR NOTICES INDICATED OR REFERENCED\n\
-BELOW, THEN YOU MAY NOT USE THE CONTENT.\n\
-\n\
-Applicable Licenses\n\
-\n\
-Unless otherwise indicated, all Content made available by the\n\
-Eclipse Foundation is provided to you under the terms and conditions of\n\
-the Eclipse Public License Version 1.0 ("EPL"). A copy of the EPL is\n\
-provided with this Content and is also available at http://www.eclipse.org/legal/epl-v10.html.\n\
-For purposes of the EPL, "Program" will mean the Content.\n\
-\n\
-Content includes, but is not limited to, source code, object code,\n\
-documentation and other files maintained in the Eclipse Foundation source code\n\
-repository ("Repository") in software modules ("Modules") and made available\n\
-as downloadable archives ("Downloads").\n\
-\n\
- - Content may be structured and packaged into modules to facilitate delivering,\n\
- extending, and upgrading the Content. Typical modules may include plug-ins ("Plug-ins"),\n\
- plug-in fragments ("Fragments"), and features ("Features").\n\
- - Each Plug-in or Fragment may be packaged as a sub-directory or JAR (Java(TM) ARchive)\n\
- in a directory named "plugins".\n\
- - A Feature is a bundle of one or more Plug-ins and/or Fragments and associated material.\n\
- Each Feature may be packaged as a sub-directory in a directory named "features".\n\
- Within a Feature, files named "feature.xml" may contain a list of the names and version\n\
- numbers of the Plug-ins and/or Fragments associated with that Feature.\n\
- - Features may also include other Features ("Included Features"). Within a Feature, files\n\
- named "feature.xml" may contain a list of the names and version numbers of Included Features.\n\
-\n\
-The terms and conditions governing Plug-ins and Fragments should be\n\
-contained in files named "about.html" ("Abouts"). The terms and\n\
-conditions governing Features and Included Features should be contained\n\
-in files named "license.html" ("Feature Licenses"). Abouts and Feature\n\
-Licenses may be located in any directory of a Download or Module\n\
-including, but not limited to the following locations:\n\
-\n\
- - The top-level (root) directory\n\
- - Plug-in and Fragment directories\n\
- - Inside Plug-ins and Fragments packaged as JARs\n\
- - Sub-directories of the directory named "src" of certain Plug-ins\n\
- - Feature directories\n\
-\n\
-Note: if a Feature made available by the Eclipse Foundation is installed using the\n\
-Provisioning Technology (as defined below), you must agree to a license ("Feature \n\
-Update License") during the installation process. If the Feature contains\n\
-Included Features, the Feature Update License should either provide you\n\
-with the terms and conditions governing the Included Features or inform\n\
-you where you can locate them. Feature Update Licenses may be found in\n\
-the "license" property of files named "feature.properties" found within a Feature.\n\
-Such Abouts, Feature Licenses, and Feature Update Licenses contain the\n\
-terms and conditions (or references to such terms and conditions) that\n\
-govern your use of the associated Content in that directory.\n\
-\n\
-THE ABOUTS, FEATURE LICENSES, AND FEATURE UPDATE LICENSES MAY REFER\n\
-TO THE EPL OR OTHER LICENSE AGREEMENTS, NOTICES OR TERMS AND CONDITIONS.\n\
-SOME OF THESE OTHER LICENSE AGREEMENTS MAY INCLUDE (BUT ARE NOT LIMITED TO):\n\
-\n\
- - Common Public License Version 1.0 (available at http://www.eclipse.org/legal/cpl-v10.html)\n\
- - Apache Software License 1.1 (available at http://www.apache.org/licenses/LICENSE)\n\
- - Apache Software License 2.0 (available at http://www.apache.org/licenses/LICENSE-2.0)\n\
- - Metro Link Public License 1.00 (available at http://www.opengroup.org/openmotif/supporters/metrolink/license.html)\n\
- - Mozilla Public License Version 1.1 (available at http://www.mozilla.org/MPL/MPL-1.1.html)\n\
-\n\
-IT IS YOUR OBLIGATION TO READ AND ACCEPT ALL SUCH TERMS AND CONDITIONS PRIOR\n\
-TO USE OF THE CONTENT. If no About, Feature License, or Feature Update License\n\
-is provided, please contact the Eclipse Foundation to determine what terms and conditions\n\
-govern that particular Content.\n\
-\n\
-\n\Use of Provisioning Technology\n\
-\n\
-The Eclipse Foundation makes available provisioning software, examples of which include,\n\
-but are not limited to, p2 and the Eclipse Update Manager ("Provisioning Technology") for\n\
-the purpose of allowing users to install software, documentation, information and/or\n\
-other materials (collectively "Installable Software"). This capability is provided with\n\
-the intent of allowing such users to install, extend and update Eclipse-based products.\n\
-Information about packaging Installable Software is available at\n\
-http://eclipse.org/equinox/p2/repository_packaging.html ("Specification").\n\
-\n\
-You may use Provisioning Technology to allow other parties to install Installable Software.\n\
-You shall be responsible for enabling the applicable license agreements relating to the\n\
-Installable Software to be presented to, and accepted by, the users of the Provisioning Technology\n\
-in accordance with the Specification. By using Provisioning Technology in such a manner and\n\
-making it available in accordance with the Specification, you further acknowledge your\n\
-agreement to, and the acquisition of all necessary rights to permit the following:\n\
-\n\
- 1. A series of actions may occur ("Provisioning Process") in which a user may execute\n\
- the Provisioning Technology on a machine ("Target Machine") with the intent of installing,\n\
- extending or updating the functionality of an Eclipse-based product.\n\
- 2. During the Provisioning Process, the Provisioning Technology may cause third party\n\
- Installable Software or a portion thereof to be accessed and copied to the Target Machine.\n\
- 3. Pursuant to the Specification, you will provide to the user the terms and conditions that\n\
- govern the use of the Installable Software ("Installable Software Agreement") and such\n\
- Installable Software Agreement shall be accessed from the Target Machine in accordance\n\
- with the Specification. Such Installable Software Agreement must inform the user of the\n\
- terms and conditions that govern the Installable Software and must solicit acceptance by\n\
- the end user in the manner prescribed in such Installable Software Agreement. Upon such\n\
- indication of agreement by the user, the provisioning Technology will complete installation\n\
- of the Installable Software.\n\
-\n\
-Cryptography\n\
-\n\
-Content may contain encryption software. The country in which you are\n\
-currently may have restrictions on the import, possession, and use,\n\
-and/or re-export to another country, of encryption software. BEFORE\n\
-using any encryption software, please check the country's laws,\n\
-regulations and policies concerning the import, possession, or use, and\n\
-re-export of encryption software, to see if this is permitted.\n\
-\n\
-Java and all Java-based trademarks are trademarks of Oracle Corporation in the United States, other countries, or both.\n
-########### end of license property ##########################################
diff --git a/features/org.eclipse.jst.web_userdoc.feature/feature.xml b/features/org.eclipse.jst.web_userdoc.feature/feature.xml
deleted file mode 100644
index fb49be3..0000000
--- a/features/org.eclipse.jst.web_userdoc.feature/feature.xml
+++ /dev/null
@@ -1,27 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<feature
- id="org.eclipse.jst.web_userdoc.feature"
- label="%featureName"
- version="3.2.2.qualifier"
- provider-name="%providerName">
-
- <description>
- %description
- </description>
-
- <copyright>
- %copyright
- </copyright>
-
- <license url="license.html">
- %license
- </license>
-
- <plugin
- id="org.eclipse.jst.jsf.doc.user"
- download-size="0"
- install-size="0"
- version="0.0.0"
- unpack="false"/>
-
-</feature>
diff --git a/features/org.eclipse.jst.web_userdoc.feature/license.html b/features/org.eclipse.jst.web_userdoc.feature/license.html
deleted file mode 100644
index c184ca3..0000000
--- a/features/org.eclipse.jst.web_userdoc.feature/license.html
+++ /dev/null
@@ -1,107 +0,0 @@
-<?xml version="1.0" encoding="ISO-8859-1" ?>
-<!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.0 Strict//EN" "http://www.w3.org/TR/xhtml1/DTD/xhtml1-strict.dtd">
-<html xmlns="http://www.w3.org/1999/xhtml">
-<head>
-<meta http-equiv="Content-Type" content="text/html; charset=ISO-8859-1" />
-<title>Eclipse Foundation Software User Agreement</title>
-</head>
-
-<body lang="EN-US">
-<h2>Eclipse Foundation Software User Agreement</h2>
-<p>April 14, 2010</p>
-
-<h3>Usage Of Content</h3>
-
-<p>THE ECLIPSE FOUNDATION MAKES AVAILABLE SOFTWARE, DOCUMENTATION, INFORMATION AND/OR OTHER MATERIALS FOR OPEN SOURCE PROJECTS
- (COLLECTIVELY "CONTENT"). USE OF THE CONTENT IS GOVERNED BY THE TERMS AND CONDITIONS OF THIS AGREEMENT AND/OR THE TERMS AND
- CONDITIONS OF LICENSE AGREEMENTS OR NOTICES INDICATED OR REFERENCED BELOW. BY USING THE CONTENT, YOU AGREE THAT YOUR USE
- OF THE CONTENT IS GOVERNED BY THIS AGREEMENT AND/OR THE TERMS AND CONDITIONS OF ANY APPLICABLE LICENSE AGREEMENTS OR
- NOTICES INDICATED OR REFERENCED BELOW. IF YOU DO NOT AGREE TO THE TERMS AND CONDITIONS OF THIS AGREEMENT AND THE TERMS AND
- CONDITIONS OF ANY APPLICABLE LICENSE AGREEMENTS OR NOTICES INDICATED OR REFERENCED BELOW, THEN YOU MAY NOT USE THE CONTENT.</p>
-
-<h3>Applicable Licenses</h3>
-
-<p>Unless otherwise indicated, all Content made available by the Eclipse Foundation is provided to you under the terms and conditions of the Eclipse Public License Version 1.0
- ("EPL"). A copy of the EPL is provided with this Content and is also available at <a href="http://www.eclipse.org/legal/epl-v10.html">http://www.eclipse.org/legal/epl-v10.html</a>.
- For purposes of the EPL, "Program" will mean the Content.</p>
-
-<p>Content includes, but is not limited to, source code, object code, documentation and other files maintained in the Eclipse Foundation source code
- repository ("Repository") in software modules ("Modules") and made available as downloadable archives ("Downloads").</p>
-
-<ul>
- <li>Content may be structured and packaged into modules to facilitate delivering, extending, and upgrading the Content. Typical modules may include plug-ins ("Plug-ins"), plug-in fragments ("Fragments"), and features ("Features").</li>
- <li>Each Plug-in or Fragment may be packaged as a sub-directory or JAR (Java™ ARchive) in a directory named "plugins".</li>
- <li>A Feature is a bundle of one or more Plug-ins and/or Fragments and associated material. Each Feature may be packaged as a sub-directory in a directory named "features". Within a Feature, files named "feature.xml" may contain a list of the names and version numbers of the Plug-ins
- and/or Fragments associated with that Feature.</li>
- <li>Features may also include other Features ("Included Features"). Within a Feature, files named "feature.xml" may contain a list of the names and version numbers of Included Features.</li>
-</ul>
-
-<p>The terms and conditions governing Plug-ins and Fragments should be contained in files named "about.html" ("Abouts"). The terms and conditions governing Features and
-Included Features should be contained in files named "license.html" ("Feature Licenses"). Abouts and Feature Licenses may be located in any directory of a Download or Module
-including, but not limited to the following locations:</p>
-
-<ul>
- <li>The top-level (root) directory</li>
- <li>Plug-in and Fragment directories</li>
- <li>Inside Plug-ins and Fragments packaged as JARs</li>
- <li>Sub-directories of the directory named "src" of certain Plug-ins</li>
- <li>Feature directories</li>
-</ul>
-
-<p>Note: if a Feature made available by the Eclipse Foundation is installed using the Provisioning Technology (as defined below), you must agree to a license ("Feature Update License") during the
-installation process. If the Feature contains Included Features, the Feature Update License should either provide you with the terms and conditions governing the Included Features or
-inform you where you can locate them. Feature Update Licenses may be found in the "license" property of files named "feature.properties" found within a Feature.
-Such Abouts, Feature Licenses, and Feature Update Licenses contain the terms and conditions (or references to such terms and conditions) that govern your use of the associated Content in
-that directory.</p>
-
-<p>THE ABOUTS, FEATURE LICENSES, AND FEATURE UPDATE LICENSES MAY REFER TO THE EPL OR OTHER LICENSE AGREEMENTS, NOTICES OR TERMS AND CONDITIONS. SOME OF THESE
-OTHER LICENSE AGREEMENTS MAY INCLUDE (BUT ARE NOT LIMITED TO):</p>
-
-<ul>
- <li>Common Public License Version 1.0 (available at <a href="http://www.eclipse.org/legal/cpl-v10.html">http://www.eclipse.org/legal/cpl-v10.html</a>)</li>
- <li>Apache Software License 1.1 (available at <a href="http://www.apache.org/licenses/LICENSE">http://www.apache.org/licenses/LICENSE</a>)</li>
- <li>Apache Software License 2.0 (available at <a href="http://www.apache.org/licenses/LICENSE-2.0">http://www.apache.org/licenses/LICENSE-2.0</a>)</li>
- <li>Metro Link Public License 1.00 (available at <a href="http://www.opengroup.org/openmotif/supporters/metrolink/license.html">http://www.opengroup.org/openmotif/supporters/metrolink/license.html</a>)</li>
- <li>Mozilla Public License Version 1.1 (available at <a href="http://www.mozilla.org/MPL/MPL-1.1.html">http://www.mozilla.org/MPL/MPL-1.1.html</a>)</li>
-</ul>
-
-<p>IT IS YOUR OBLIGATION TO READ AND ACCEPT ALL SUCH TERMS AND CONDITIONS PRIOR TO USE OF THE CONTENT. If no About, Feature License, or Feature Update License is provided, please
-contact the Eclipse Foundation to determine what terms and conditions govern that particular Content.</p>
-
-
-<h3>Use of Provisioning Technology</h3>
-
-<p>The Eclipse Foundation makes available provisioning software, examples of which include, but are not limited to, p2 and the Eclipse
- Update Manager ("Provisioning Technology") for the purpose of allowing users to install software, documentation, information and/or
- other materials (collectively "Installable Software"). This capability is provided with the intent of allowing such users to
- install, extend and update Eclipse-based products. Information about packaging Installable Software is available at <a
- href="http://eclipse.org/equinox/p2/repository_packaging.html">http://eclipse.org/equinox/p2/repository_packaging.html</a>
- ("Specification").</p>
-
-<p>You may use Provisioning Technology to allow other parties to install Installable Software. You shall be responsible for enabling the
- applicable license agreements relating to the Installable Software to be presented to, and accepted by, the users of the Provisioning Technology
- in accordance with the Specification. By using Provisioning Technology in such a manner and making it available in accordance with the
- Specification, you further acknowledge your agreement to, and the acquisition of all necessary rights to permit the following:</p>
-
-<ol>
- <li>A series of actions may occur ("Provisioning Process") in which a user may execute the Provisioning Technology
- on a machine ("Target Machine") with the intent of installing, extending or updating the functionality of an Eclipse-based
- product.</li>
- <li>During the Provisioning Process, the Provisioning Technology may cause third party Installable Software or a portion thereof to be
- accessed and copied to the Target Machine.</li>
- <li>Pursuant to the Specification, you will provide to the user the terms and conditions that govern the use of the Installable
- Software ("Installable Software Agreement") and such Installable Software Agreement shall be accessed from the Target
- Machine in accordance with the Specification. Such Installable Software Agreement must inform the user of the terms and conditions that govern
- the Installable Software and must solicit acceptance by the end user in the manner prescribed in such Installable Software Agreement. Upon such
- indication of agreement by the user, the provisioning Technology will complete installation of the Installable Software.</li>
-</ol>
-
-<h3>Cryptography</h3>
-
-<p>Content may contain encryption software. The country in which you are currently may have restrictions on the import, possession, and use, and/or re-export to
- another country, of encryption software. BEFORE using any encryption software, please check the country's laws, regulations and policies concerning the import,
- possession, or use, and re-export of encryption software, to see if this is permitted.</p>
-
-<p><small>Java and all Java-based trademarks are trademarks of Oracle Corporation in the United States, other countries, or both.</small></p>
-</body>
-</html>
diff --git a/plugins/org.eclipse.jem.beaninfo.vm.common/.classpath b/plugins/org.eclipse.jem.beaninfo.vm.common/.classpath
deleted file mode 100644
index 27da7db..0000000
--- a/plugins/org.eclipse.jem.beaninfo.vm.common/.classpath
+++ /dev/null
@@ -1,7 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<classpath>
- <classpathentry kind="src" path="beaninfoCommon"/>
- <classpathentry kind="con" path="org.eclipse.jdt.launching.JRE_CONTAINER/org.eclipse.jdt.internal.debug.ui.launcher.StandardVMType/J2SE-1.4"/>
- <classpathentry kind="con" path="org.eclipse.pde.core.requiredPlugins"/>
- <classpathentry kind="output" path="bin"/>
-</classpath>
diff --git a/plugins/org.eclipse.jem.beaninfo.vm.common/.cvsignore b/plugins/org.eclipse.jem.beaninfo.vm.common/.cvsignore
deleted file mode 100644
index 9b8171d..0000000
--- a/plugins/org.eclipse.jem.beaninfo.vm.common/.cvsignore
+++ /dev/null
@@ -1,4 +0,0 @@
-bin
-build.xml
-bin_beaninfocommon
-bin_vm_beaninfovm
diff --git a/plugins/org.eclipse.jem.beaninfo.vm.common/.project b/plugins/org.eclipse.jem.beaninfo.vm.common/.project
deleted file mode 100644
index e3ce769..0000000
--- a/plugins/org.eclipse.jem.beaninfo.vm.common/.project
+++ /dev/null
@@ -1,38 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<projectDescription>
- <name>org.eclipse.jem.beaninfo.vm.common</name>
- <comment></comment>
- <projects>
- </projects>
- <buildSpec>
- <buildCommand>
- <name>org.eclipse.jdt.core.javabuilder</name>
- <arguments>
- </arguments>
- </buildCommand>
- <buildCommand>
- <name>org.eclipse.pde.ManifestBuilder</name>
- <arguments>
- </arguments>
- </buildCommand>
- <buildCommand>
- <name>org.eclipse.pde.SchemaBuilder</name>
- <arguments>
- </arguments>
- </buildCommand>
- <buildCommand>
- <name>com.ibm.rtp.tools.rose.builder</name>
- <arguments>
- <dictionary>
- <key>rose</key>
- <value></value>
- </dictionary>
- </arguments>
- </buildCommand>
- </buildSpec>
- <natures>
- <nature>org.eclipse.pde.PluginNature</nature>
- <nature>org.eclipse.jdt.core.javanature</nature>
- <nature>com.ibm.rtp.tools.rose.toolnature</nature>
- </natures>
-</projectDescription>
diff --git a/plugins/org.eclipse.jem.beaninfo.vm.common/.settings/org.eclipse.jdt.core.prefs b/plugins/org.eclipse.jem.beaninfo.vm.common/.settings/org.eclipse.jdt.core.prefs
deleted file mode 100644
index 445b263..0000000
--- a/plugins/org.eclipse.jem.beaninfo.vm.common/.settings/org.eclipse.jdt.core.prefs
+++ /dev/null
@@ -1,291 +0,0 @@
-#Wed Nov 26 00:55:05 EST 2008
-org.eclipse.jdt.core.formatter.insert_space_before_comma_in_for_inits=do not insert
-org.eclipse.jdt.core.formatter.brace_position_for_block=end_of_line
-org.eclipse.jdt.core.formatter.insert_space_after_at_in_annotation_type_declaration=do not insert
-org.eclipse.jdt.core.formatter.insert_space_before_comma_in_method_declaration_throws=do not insert
-org.eclipse.jdt.core.formatter.brace_position_for_annotation_type_declaration=end_of_line
-org.eclipse.jdt.core.formatter.insert_space_after_colon_in_conditional=insert
-org.eclipse.jdt.core.compiler.problem.localVariableHiding=ignore
-org.eclipse.jdt.core.formatter.alignment_for_assignment=0
-org.eclipse.jdt.core.formatter.insert_space_before_comma_in_allocation_expression=do not insert
-org.eclipse.jdt.core.compiler.problem.staticAccessReceiver=warning
-org.eclipse.jdt.core.formatter.insert_space_after_opening_paren_in_if=do not insert
-org.eclipse.jdt.core.formatter.insert_space_before_opening_brace_in_block=insert
-org.eclipse.jdt.core.compiler.codegen.targetPlatform=1.2
-org.eclipse.jdt.core.formatter.insert_space_before_closing_angle_bracket_in_type_parameters=do not insert
-org.eclipse.jdt.core.compiler.problem.unusedPrivateMember=error
-org.eclipse.jdt.core.formatter.insert_new_line_before_closing_brace_in_array_initializer=do not insert
-org.eclipse.jdt.core.formatter.indent_statements_compare_to_body=true
-org.eclipse.jdt.core.formatter.insert_space_after_comma_in_superinterfaces=insert
-org.eclipse.jdt.core.compiler.problem.emptyStatement=ignore
-org.eclipse.jdt.core.formatter.insert_new_line_before_catch_in_try_statement=do not insert
-org.eclipse.jdt.core.compiler.problem.indirectStaticAccess=ignore
-org.eclipse.jdt.core.formatter.insert_space_before_closing_paren_in_method_invocation=do not insert
-org.eclipse.jdt.core.formatter.insert_space_before_closing_paren_in_method_declaration=do not insert
-org.eclipse.jdt.core.formatter.insert_space_before_opening_angle_bracket_in_type_parameters=do not insert
-org.eclipse.jdt.core.formatter.insert_space_between_empty_parens_in_enum_constant=do not insert
-org.eclipse.jdt.core.compiler.problem.fieldHiding=ignore
-org.eclipse.jdt.core.formatter.insert_space_after_opening_paren_in_while=do not insert
-org.eclipse.jdt.core.compiler.problem.annotationSuperInterface=warning
-org.eclipse.jdt.core.compiler.problem.nonExternalizedStringLiteral=ignore
-org.eclipse.jdt.core.formatter.insert_space_after_unary_operator=do not insert
-org.eclipse.jdt.core.formatter.blank_lines_after_imports=1
-org.eclipse.jdt.core.formatter.insert_space_after_opening_bracket_in_array_reference=do not insert
-org.eclipse.jdt.core.compiler.problem.finallyBlockNotCompletingNormally=warning
-org.eclipse.jdt.core.compiler.problem.noImplicitStringConversion=warning
-org.eclipse.jdt.core.formatter.comment.format_source_code=true
-org.eclipse.jdt.core.formatter.insert_space_after_comma_in_method_declaration_parameters=insert
-org.eclipse.jdt.core.formatter.indent_body_declarations_compare_to_annotation_declaration_header=true
-org.eclipse.jdt.core.formatter.insert_space_before_closing_bracket_in_array_allocation_expression=do not insert
-org.eclipse.jdt.core.formatter.insert_space_before_closing_paren_in_constructor_declaration=do not insert
-org.eclipse.jdt.core.formatter.blank_lines_before_member_type=1
-org.eclipse.jdt.core.formatter.insert_space_before_opening_paren_in_enum_constant=do not insert
-org.eclipse.jdt.core.compiler.problem.undocumentedEmptyBlock=ignore
-org.eclipse.jdt.core.formatter.keep_then_statement_on_same_line=false
-org.eclipse.jdt.core.compiler.problem.syntheticAccessEmulation=ignore
-org.eclipse.jdt.core.formatter.insert_space_after_comma_in_method_invocation_arguments=insert
-org.eclipse.jdt.core.formatter.insert_space_after_comma_in_multiple_local_declarations=insert
-org.eclipse.jdt.core.formatter.blank_lines_before_new_chunk=1
-org.eclipse.jdt.core.formatter.alignment_for_arguments_in_explicit_constructor_call=16
-org.eclipse.jdt.core.formatter.number_of_empty_lines_to_preserve=1
-org.eclipse.jdt.core.formatter.insert_space_before_opening_brace_in_type_declaration=insert
-org.eclipse.jdt.core.formatter.brace_position_for_switch=end_of_line
-org.eclipse.jdt.core.formatter.comment.format_header=false
-org.eclipse.jdt.core.formatter.insert_space_before_and_in_type_parameter=insert
-org.eclipse.jdt.core.formatter.insert_space_after_comma_in_constructor_declaration_throws=insert
-org.eclipse.jdt.core.formatter.insert_space_before_question_in_wildcard=do not insert
-org.eclipse.jdt.core.formatter.alignment_for_superclass_in_type_declaration=16
-org.eclipse.jdt.core.formatter.insert_space_after_colon_in_case=insert
-org.eclipse.jdt.core.formatter.insert_space_after_opening_paren_in_for=do not insert
-org.eclipse.jdt.core.formatter.insert_space_before_semicolon=do not insert
-org.eclipse.jdt.core.formatter.alignment_for_superinterfaces_in_enum_declaration=16
-org.eclipse.jdt.core.formatter.comment.line_length=150
-org.eclipse.jdt.core.formatter.insert_space_before_comma_in_array_initializer=do not insert
-org.eclipse.jdt.core.formatter.insert_space_before_closing_paren_in_catch=do not insert
-org.eclipse.jdt.core.formatter.indent_switchstatements_compare_to_cases=true
-org.eclipse.jdt.core.formatter.insert_space_after_opening_paren_in_method_invocation=do not insert
-org.eclipse.jdt.core.formatter.insert_space_after_comma_in_for_increments=insert
-org.eclipse.jdt.core.formatter.insert_space_after_binary_operator=insert
-org.eclipse.jdt.core.formatter.insert_new_line_in_empty_block=insert
-org.eclipse.jdt.core.formatter.insert_space_after_prefix_operator=do not insert
-org.eclipse.jdt.core.formatter.brace_position_for_enum_declaration=end_of_line
-org.eclipse.jdt.core.formatter.insert_space_after_comma_in_explicitconstructorcall_arguments=insert
-org.eclipse.jdt.core.compiler.problem.hiddenCatchBlock=warning
-org.eclipse.jdt.core.formatter.insert_space_before_at_in_annotation_type_declaration=insert
-org.eclipse.jdt.core.formatter.insert_space_before_opening_paren_in_parenthesized_expression=do not insert
-org.eclipse.jdt.core.compiler.problem.unusedParameterWhenImplementingAbstract=disabled
-org.eclipse.jdt.core.formatter.insert_space_before_closing_brace_in_array_initializer=do not insert
-org.eclipse.jdt.core.formatter.insert_new_line_in_empty_type_declaration=insert
-org.eclipse.jdt.core.compiler.problem.uncheckedTypeOperation=warning
-org.eclipse.jdt.core.formatter.insert_space_before_colon_in_assert=insert
-org.eclipse.jdt.core.formatter.insert_space_after_comma_in_constructor_declaration_parameters=insert
-org.eclipse.jdt.core.formatter.continuation_indentation=2
-org.eclipse.jdt.core.formatter.comment.insert_new_line_before_root_tags=insert
-org.eclipse.jdt.core.formatter.alignment_for_selector_in_method_invocation=16
-org.eclipse.jdt.core.formatter.insert_space_after_comma_in_parameterized_type_reference=insert
-org.eclipse.jdt.core.compiler.problem.specialParameterHidingField=disabled
-org.eclipse.jdt.core.formatter.insert_space_after_assignment_operator=insert
-org.eclipse.jdt.core.formatter.blank_lines_before_method=1
-org.eclipse.jdt.core.formatter.put_empty_statement_on_new_line=true
-org.eclipse.jdt.core.formatter.alignment_for_parameters_in_constructor_declaration=16
-org.eclipse.jdt.core.formatter.blank_lines_between_type_declarations=1
-org.eclipse.jdt.core.formatter.insert_space_after_comma_in_multiple_field_declarations=insert
-org.eclipse.jdt.core.formatter.insert_space_after_closing_paren_in_cast=insert
-org.eclipse.jdt.core.formatter.brace_position_for_constructor_declaration=end_of_line
-org.eclipse.jdt.core.formatter.insert_new_line_after_opening_brace_in_array_initializer=do not insert
-org.eclipse.jdt.core.formatter.insert_space_before_opening_brace_in_annotation_type_declaration=insert
-org.eclipse.jdt.core.formatter.alignment_for_arguments_in_qualified_allocation_expression=16
-org.eclipse.jdt.core.formatter.indent_body_declarations_compare_to_type_header=true
-org.eclipse.jdt.core.formatter.insert_space_before_closing_angle_bracket_in_parameterized_type_reference=do not insert
-org.eclipse.jdt.core.formatter.blank_lines_before_first_class_body_declaration=1
-org.eclipse.jdt.core.formatter.insert_space_before_question_in_conditional=insert
-org.eclipse.jdt.core.formatter.alignment_for_multiple_fields=16
-org.eclipse.jdt.core.formatter.insert_space_before_comma_in_for_increments=do not insert
-org.eclipse.jdt.core.formatter.insert_space_before_colon_in_case=do not insert
-org.eclipse.jdt.core.formatter.comment.format_html=true
-org.eclipse.jdt.core.formatter.insert_space_before_opening_bracket_in_array_allocation_expression=do not insert
-org.eclipse.jdt.core.formatter.insert_space_before_closing_paren_in_enum_constant=do not insert
-org.eclipse.jdt.core.formatter.insert_space_before_semicolon_in_for=do not insert
-org.eclipse.jdt.core.formatter.insert_space_before_closing_paren_in_while=do not insert
-org.eclipse.jdt.core.formatter.insert_space_between_empty_parens_in_method_declaration=do not insert
-org.eclipse.jdt.core.formatter.alignment_for_parameters_in_method_declaration=16
-org.eclipse.jdt.core.formatter.insert_space_before_opening_angle_bracket_in_parameterized_type_reference=do not insert
-org.eclipse.jdt.core.formatter.insert_space_before_closing_paren_in_synchronized=do not insert
-org.eclipse.jdt.core.compiler.problem.autoboxing=ignore
-org.eclipse.jdt.core.compiler.problem.enumIdentifier=warning
-org.eclipse.jdt.core.formatter.insert_space_after_opening_brace_in_array_initializer=insert
-org.eclipse.jdt.core.compiler.problem.deprecationInDeprecatedCode=disabled
-org.eclipse.jdt.core.formatter.insert_space_after_semicolon_in_for=insert
-org.eclipse.jdt.core.formatter.insert_space_before_assignment_operator=insert
-org.eclipse.jdt.core.compiler.problem.possibleAccidentalBooleanAssignment=ignore
-org.eclipse.jdt.core.formatter.insert_space_after_opening_angle_bracket_in_type_parameters=do not insert
-org.eclipse.jdt.core.formatter.insert_space_before_comma_in_superinterfaces=do not insert
-org.eclipse.jdt.core.formatter.brace_position_for_method_declaration=end_of_line
-org.eclipse.jdt.core.compiler.problem.unusedDeclaredThrownException=ignore
-org.eclipse.jdt.core.formatter.insert_new_line_before_else_in_if_statement=do not insert
-org.eclipse.jdt.core.formatter.insert_space_before_opening_bracket_in_array_reference=do not insert
-org.eclipse.jdt.core.formatter.insert_space_before_comma_in_enum_constant_arguments=do not insert
-org.eclipse.jdt.core.formatter.alignment_for_arguments_in_allocation_expression=16
-org.eclipse.jdt.core.compiler.problem.unnecessaryElse=ignore
-org.eclipse.jdt.core.formatter.insert_new_line_in_empty_annotation_declaration=insert
-org.eclipse.jdt.core.compiler.problem.methodWithConstructorName=warning
-org.eclipse.jdt.core.formatter.insert_space_before_opening_brace_in_method_declaration=insert
-org.eclipse.jdt.core.formatter.insert_space_before_opening_paren_in_if=insert
-org.eclipse.jdt.core.formatter.insert_space_before_opening_bracket_in_array_type_reference=do not insert
-org.eclipse.jdt.core.formatter.insert_space_between_empty_braces_in_array_initializer=do not insert
-org.eclipse.jdt.core.formatter.insert_space_before_comma_in_multiple_local_declarations=do not insert
-org.eclipse.jdt.core.formatter.insert_space_after_opening_paren_in_constructor_declaration=do not insert
-org.eclipse.jdt.core.formatter.indent_body_declarations_compare_to_enum_constant_header=true
-org.eclipse.jdt.core.formatter.comment.insert_new_line_for_parameter=insert
-org.eclipse.jdt.core.formatter.alignment_for_throws_clause_in_method_declaration=16
-org.eclipse.jdt.core.formatter.insert_space_after_comma_in_annotation=insert
-org.eclipse.jdt.core.formatter.insert_space_after_ellipsis=insert
-org.eclipse.jdt.core.formatter.insert_space_before_opening_paren_in_annotation_type_member_declaration=do not insert
-org.eclipse.jdt.core.formatter.insert_new_line_before_finally_in_try_statement=do not insert
-org.eclipse.jdt.core.formatter.insert_space_before_colon_in_labeled_statement=do not insert
-org.eclipse.jdt.core.formatter.insert_space_before_closing_paren_in_if=do not insert
-org.eclipse.jdt.core.formatter.insert_space_after_at_in_annotation=do not insert
-org.eclipse.jdt.core.formatter.insert_space_after_opening_paren_in_switch=do not insert
-org.eclipse.jdt.core.formatter.alignment_for_arguments_in_enum_constant=16
-org.eclipse.jdt.core.formatter.insert_space_before_opening_brace_in_switch=insert
-org.eclipse.jdt.core.formatter.insert_space_before_closing_paren_in_for=do not insert
-org.eclipse.jdt.core.formatter.insert_space_before_opening_brace_in_anonymous_type_declaration=insert
-org.eclipse.jdt.core.formatter.brace_position_for_enum_constant=end_of_line
-org.eclipse.jdt.core.formatter.insert_space_after_colon_in_labeled_statement=insert
-org.eclipse.jdt.core.compiler.problem.incompleteEnumSwitch=ignore
-org.eclipse.jdt.core.formatter.insert_space_after_opening_paren_in_cast=do not insert
-org.eclipse.jdt.core.formatter.insert_space_after_and_in_type_parameter=insert
-org.eclipse.jdt.core.formatter.insert_space_after_comma_in_array_initializer=insert
-org.eclipse.jdt.core.formatter.insert_space_before_comma_in_method_declaration_parameters=do not insert
-org.eclipse.jdt.core.formatter.insert_space_between_empty_parens_in_annotation_type_member_declaration=do not insert
-org.eclipse.jdt.core.formatter.alignment_for_enum_constants=0
-org.eclipse.jdt.core.compiler.problem.unnecessaryTypeCheck=error
-org.eclipse.jdt.core.formatter.tabulation.char=tab
-org.eclipse.jdt.core.formatter.insert_space_after_comma_in_allocation_expression=insert
-org.eclipse.jdt.core.formatter.insert_space_after_question_in_wildcard=do not insert
-org.eclipse.jdt.core.formatter.insert_space_before_comma_in_annotation=do not insert
-org.eclipse.jdt.core.formatter.format_guardian_clause_on_one_line=true
-org.eclipse.jdt.core.formatter.keep_else_statement_on_same_line=false
-org.eclipse.jdt.core.formatter.compact_else_if=true
-org.eclipse.jdt.core.formatter.insert_space_before_parenthesized_expression_in_return=insert
-org.eclipse.jdt.core.formatter.insert_space_between_brackets_in_array_type_reference=do not insert
-org.eclipse.jdt.core.formatter.brace_position_for_anonymous_type_declaration=end_of_line
-org.eclipse.jdt.core.compiler.problem.missingSerialVersion=warning
-org.eclipse.jdt.core.compiler.problem.incompatibleNonInheritedInterfaceMethod=warning
-org.eclipse.jdt.core.formatter.align_type_members_on_columns=false
-org.eclipse.jdt.core.formatter.insert_space_before_comma_in_multiple_field_declarations=do not insert
-org.eclipse.jdt.core.formatter.insert_new_line_before_while_in_do_statement=do not insert
-org.eclipse.jdt.core.formatter.insert_space_before_closing_paren_in_annotation=do not insert
-org.eclipse.jdt.core.compiler.problem.finalParameterBound=warning
-org.eclipse.jdt.core.formatter.insert_space_after_postfix_operator=do not insert
-org.eclipse.jdt.core.formatter.insert_space_before_colon_in_conditional=insert
-org.eclipse.jdt.core.formatter.insert_space_before_comma_in_enum_declarations=do not insert
-org.eclipse.jdt.core.formatter.insert_space_before_opening_paren_in_method_declaration=do not insert
-org.eclipse.jdt.core.formatter.insert_space_after_opening_bracket_in_array_allocation_expression=do not insert
-org.eclipse.jdt.core.formatter.indent_body_declarations_compare_to_enum_declaration_header=true
-org.eclipse.jdt.core.formatter.alignment_for_expressions_in_array_initializer=16
-org.eclipse.jdt.core.formatter.insert_space_before_opening_paren_in_switch=insert
-org.eclipse.jdt.core.formatter.insert_space_before_opening_paren_in_catch=insert
-org.eclipse.jdt.core.formatter.keep_empty_array_initializer_on_one_line=false
-org.eclipse.jdt.core.formatter.insert_space_after_comma_in_enum_declarations=insert
-org.eclipse.jdt.core.formatter.insert_space_after_closing_angle_bracket_in_type_parameters=insert
-org.eclipse.jdt.core.formatter.insert_space_before_opening_angle_bracket_in_type_arguments=do not insert
-org.eclipse.jdt.core.formatter.comment.indent_parameter_description=true
-org.eclipse.jdt.core.formatter.indentation.size=4
-org.eclipse.jdt.core.compiler.problem.unusedDeclaredThrownExceptionWhenOverriding=disabled
-org.eclipse.jdt.core.formatter.insert_space_after_opening_paren_in_enum_constant=do not insert
-org.eclipse.jdt.core.formatter.insert_space_before_colon_in_for=insert
-org.eclipse.jdt.core.formatter.insert_space_before_ellipsis=do not insert
-org.eclipse.jdt.core.formatter.insert_space_after_colon_in_for=insert
-org.eclipse.jdt.core.formatter.alignment_for_throws_clause_in_constructor_declaration=16
-org.eclipse.jdt.core.formatter.insert_space_between_empty_parens_in_constructor_declaration=do not insert
-org.eclipse.jdt.core.formatter.insert_space_before_opening_brace_in_array_initializer=insert
-org.eclipse.jdt.core.compiler.problem.deprecation=warning
-org.eclipse.jdt.core.formatter.comment.indent_root_tags=true
-org.eclipse.jdt.core.compiler.problem.missingDeprecatedAnnotation=ignore
-org.eclipse.jdt.core.formatter.insert_space_before_opening_brace_in_enum_constant=insert
-org.eclipse.jdt.core.formatter.alignment_for_binary_expression=16
-org.eclipse.jdt.core.formatter.brace_position_for_type_declaration=end_of_line
-org.eclipse.jdt.core.formatter.insert_space_after_comma_in_method_declaration_throws=insert
-org.eclipse.jdt.core.formatter.insert_space_before_closing_paren_in_parenthesized_expression=do not insert
-org.eclipse.jdt.core.compiler.problem.unusedParameterWhenOverridingConcrete=disabled
-org.eclipse.jdt.core.formatter.insert_space_before_binary_operator=insert
-org.eclipse.jdt.core.formatter.use_tabs_only_for_leading_indentations=false
-org.eclipse.jdt.core.formatter.indent_breaks_compare_to_cases=true
-org.eclipse.jdt.core.formatter.insert_space_between_empty_brackets_in_array_allocation_expression=do not insert
-org.eclipse.jdt.core.formatter.insert_space_before_prefix_operator=do not insert
-org.eclipse.jdt.core.formatter.blank_lines_before_package=0
-org.eclipse.jdt.core.formatter.insert_space_before_opening_brace_in_enum_declaration=insert
-org.eclipse.jdt.core.formatter.indent_empty_lines=false
-org.eclipse.jdt.core.formatter.insert_space_before_closing_angle_bracket_in_type_arguments=do not insert
-org.eclipse.jdt.core.formatter.alignment_for_arguments_in_method_invocation=16
-org.eclipse.jdt.core.formatter.insert_space_before_opening_paren_in_annotation=do not insert
-org.eclipse.jdt.core.formatter.insert_space_before_comma_in_constructor_declaration_throws=do not insert
-org.eclipse.jdt.core.compiler.problem.noEffectAssignment=warning
-org.eclipse.jdt.core.formatter.insert_space_before_comma_in_method_invocation_arguments=do not insert
-org.eclipse.jdt.core.compiler.problem.missingOverrideAnnotation=ignore
-org.eclipse.jdt.core.formatter.brace_position_for_block_in_case=end_of_line
-org.eclipse.jdt.core.formatter.number_of_blank_lines_at_beginning_of_method_body=0
-org.eclipse.jdt.core.formatter.insert_space_after_colon_in_assert=insert
-org.eclipse.jdt.core.formatter.alignment_for_conditional_expression=80
-org.eclipse.jdt.core.compiler.problem.unusedImport=error
-org.eclipse.jdt.core.formatter.insert_space_after_opening_paren_in_method_declaration=do not insert
-org.eclipse.jdt.core.formatter.keep_imple_if_on_one_line=false
-org.eclipse.jdt.core.formatter.insert_new_line_in_empty_enum_declaration=insert
-org.eclipse.jdt.core.formatter.indent_switchstatements_compare_to_switch=true
-org.eclipse.jdt.core.formatter.insert_space_after_opening_paren_in_synchronized=do not insert
-org.eclipse.jdt.core.formatter.insert_space_after_comma_in_for_inits=insert
-org.eclipse.jdt.core.formatter.insert_space_before_opening_paren_in_synchronized=insert
-org.eclipse.jdt.core.formatter.insert_new_line_in_empty_enum_constant=insert
-org.eclipse.jdt.core.formatter.insert_space_after_comma_in_type_parameters=insert
-org.eclipse.jdt.core.formatter.insert_space_after_comma_in_enum_constant_arguments=insert
-org.eclipse.jdt.core.formatter.insert_space_before_opening_paren_in_for=insert
-org.eclipse.jdt.core.formatter.insert_space_after_opening_angle_bracket_in_type_arguments=do not insert
-org.eclipse.jdt.core.compiler.problem.unqualifiedFieldAccess=ignore
-org.eclipse.jdt.core.formatter.insert_space_before_comma_in_parameterized_type_reference=do not insert
-org.eclipse.jdt.core.formatter.insert_space_after_comma_in_type_arguments=insert
-org.eclipse.jdt.core.formatter.insert_space_before_opening_paren_in_while=insert
-org.eclipse.jdt.core.formatter.insert_space_before_opening_paren_in_method_invocation=do not insert
-org.eclipse.jdt.core.formatter.blank_lines_before_imports=1
-org.eclipse.jdt.core.formatter.insert_space_before_comma_in_type_parameters=do not insert
-org.eclipse.jdt.core.formatter.insert_space_after_opening_paren_in_parenthesized_expression=do not insert
-org.eclipse.jdt.core.formatter.alignment_for_compact_if=16
-org.eclipse.jdt.core.compiler.problem.typeParameterHiding=warning
-org.eclipse.jdt.core.formatter.insert_space_before_closing_paren_in_switch=do not insert
-org.eclipse.jdt.core.formatter.insert_space_after_closing_angle_bracket_in_type_arguments=insert
-org.eclipse.jdt.core.formatter.insert_space_before_unary_operator=do not insert
-org.eclipse.jdt.core.formatter.insert_space_after_closing_brace_in_block=insert
-org.eclipse.jdt.core.formatter.insert_space_before_opening_paren_in_constructor_declaration=do not insert
-org.eclipse.jdt.core.formatter.continuation_indentation_for_array_initializer=2
-org.eclipse.jdt.core.formatter.lineSplit=150
-org.eclipse.jdt.core.compiler.problem.deprecationWhenOverridingDeprecatedMethod=disabled
-org.eclipse.jdt.core.compiler.source=1.3
-org.eclipse.jdt.core.formatter.insert_new_line_in_empty_anonymous_type_declaration=insert
-org.eclipse.jdt.core.formatter.insert_new_line_in_empty_method_body=insert
-org.eclipse.jdt.core.formatter.tabulation.size=4
-org.eclipse.jdt.core.compiler.problem.assertIdentifier=warning
-org.eclipse.jdt.core.formatter.brace_position_for_array_initializer=end_of_line
-org.eclipse.jdt.core.compiler.problem.varargsArgumentNeedCast=warning
-org.eclipse.jdt.core.formatter.insert_space_before_comma_in_explicitconstructorcall_arguments=do not insert
-org.eclipse.jdt.core.formatter.insert_space_before_comma_in_constructor_declaration_parameters=do not insert
-org.eclipse.jdt.core.formatter.insert_space_between_empty_parens_in_method_invocation=do not insert
-org.eclipse.jdt.core.formatter.insert_space_after_question_in_conditional=insert
-org.eclipse.jdt.core.formatter.insert_space_before_postfix_operator=do not insert
-org.eclipse.jdt.core.formatter.insert_space_before_colon_in_default=do not insert
-org.eclipse.jdt.core.compiler.problem.unusedParameter=ignore
-org.eclipse.jdt.core.formatter.insert_space_before_opening_brace_in_constructor_declaration=insert
-org.eclipse.jdt.core.compiler.problem.overridingPackageDefaultMethod=warning
-org.eclipse.jdt.core.compiler.problem.unusedLocal=error
-org.eclipse.jdt.core.formatter.insert_space_after_opening_angle_bracket_in_parameterized_type_reference=do not insert
-org.eclipse.jdt.core.formatter.indent_statements_compare_to_block=true
-org.eclipse.jdt.core.formatter.insert_space_after_opening_paren_in_catch=do not insert
-org.eclipse.jdt.core.formatter.insert_space_before_closing_paren_in_cast=do not insert
-org.eclipse.jdt.core.formatter.insert_space_before_comma_in_type_arguments=do not insert
-org.eclipse.jdt.core.formatter.insert_space_after_opening_paren_in_annotation=do not insert
-eclipse.preferences.version=1
-org.eclipse.jdt.core.formatter.insert_space_before_closing_bracket_in_array_reference=do not insert
-org.eclipse.jdt.core.compiler.compliance=1.4
-org.eclipse.jdt.core.formatter.blank_lines_after_package=1
-org.eclipse.jdt.core.formatter.alignment_for_superinterfaces_in_type_declaration=16
-org.eclipse.jdt.core.formatter.insert_new_line_at_end_of_file_if_missing=do not insert
-org.eclipse.jdt.core.formatter.blank_lines_before_field=1
diff --git a/plugins/org.eclipse.jem.beaninfo.vm.common/.settings/org.eclipse.jdt.ui.prefs b/plugins/org.eclipse.jem.beaninfo.vm.common/.settings/org.eclipse.jdt.ui.prefs
deleted file mode 100644
index 855e136..0000000
--- a/plugins/org.eclipse.jem.beaninfo.vm.common/.settings/org.eclipse.jdt.ui.prefs
+++ /dev/null
@@ -1,8 +0,0 @@
-#Tue Feb 21 10:09:18 EST 2006
-eclipse.preferences.version=1
-formatter_profile=_jve
-formatter_settings_version=10
-org.eclipse.jdt.ui.ignorelowercasenames=true
-org.eclipse.jdt.ui.importorder=java;javax;org;org.eclipse.wtp;org.eclipse.jem;org.eclipse.ve.internal.cdm;org.eclipse.ve.internal.cde;org.eclipse.ve.internal.jcm;org.eclipse.ve.internal.java;org.eclipse.ve;com;
-org.eclipse.jdt.ui.ondemandthreshold=3
-org.eclipse.jdt.ui.text.custom_code_templates=<?xml version\="1.0" encoding\="UTF-8"?><templates/>
diff --git a/plugins/org.eclipse.jem.beaninfo.vm.common/.settings/org.eclipse.pde.core.prefs b/plugins/org.eclipse.jem.beaninfo.vm.common/.settings/org.eclipse.pde.core.prefs
deleted file mode 100644
index 59dc168..0000000
--- a/plugins/org.eclipse.jem.beaninfo.vm.common/.settings/org.eclipse.pde.core.prefs
+++ /dev/null
@@ -1,3 +0,0 @@
-#Thu Jun 16 11:09:08 EDT 2005
-eclipse.preferences.version=1
-selfhosting.binExcludes=/org.eclipse.jem.beaninfo/bin_vm_beaninfovm
diff --git a/plugins/org.eclipse.jem.beaninfo.vm.common/META-INF/MANIFEST.MF b/plugins/org.eclipse.jem.beaninfo.vm.common/META-INF/MANIFEST.MF
deleted file mode 100644
index d0fbdb8..0000000
--- a/plugins/org.eclipse.jem.beaninfo.vm.common/META-INF/MANIFEST.MF
+++ /dev/null
@@ -1,13 +0,0 @@
-Manifest-Version: 1.0
-Bundle-ManifestVersion: 2
-Bundle-Name: %Bundle-Name.0
-Bundle-SymbolicName: org.eclipse.jem.beaninfo.vm.common
-Bundle-Version: 2.0.300.qualifier
-Bundle-RequiredExecutionEnvironment: J2SE-1.4
-Bundle-Localization: plugin
-Export-Package: org.eclipse.jem.beaninfo.common,
- org.eclipse.jem.internal.beaninfo.common;x-internal:=true
-Import-Package: org.eclipse.jem.internal.proxy.common;resolution:=optional,
- org.eclipse.jem.internal.proxy.core;resolution:=optional
-Bundle-Vendor: %Bundle-Vendor.0
-Bundle-Description: %Bundle-Description.0
diff --git a/plugins/org.eclipse.jem.beaninfo.vm.common/about.html b/plugins/org.eclipse.jem.beaninfo.vm.common/about.html
deleted file mode 100644
index afceed0..0000000
--- a/plugins/org.eclipse.jem.beaninfo.vm.common/about.html
+++ /dev/null
@@ -1,25 +0,0 @@
-<!DOCTYPE HTML PUBLIC "-//W3C//DTD HTML 4.0//EN">
-<html><head><title>About</title>
-
-
-
-<meta http-equiv="Content-Type" content="text/html; charset=ISO-8859-1"></head><body lang="EN-US">
-<h2>About This Content</h2>
-
-<p>May 2, 2006</p>
-<h3>License</h3>
-
-<p>The Eclipse Foundation makes available all content in this plug-in ("Content"). Unless otherwise
-indicated below, the Content is provided to you under the terms and conditions of the
-Eclipse Public License Version 1.0 ("EPL"). A copy of the EPL is available
-at <a href="http://www.eclipse.org/legal/epl-v10.html">http://www.eclipse.org/legal/epl-v10.html</a>.
-For purposes of the EPL, "Program" will mean the Content.</p>
-
-<p>If you did not receive this Content directly from the Eclipse Foundation, the Content is
-being redistributed by another party ("Redistributor") and different terms and conditions may
-apply to your use of any object code in the Content. Check the Redistributor's license that was
-provided with the Content. If no such license exists, contact the Redistributor. Unless otherwise
-indicated below, the terms and conditions of the EPL still apply to any source code in the Content
-and such source code may be obtained at <a href="http://www.eclipse.org/">http://www.eclipse.org</a>.</p>
-
-</body></html>
\ No newline at end of file
diff --git a/plugins/org.eclipse.jem.beaninfo.vm.common/beaninfoCommon/org/eclipse/jem/beaninfo/common/IBaseBeanInfoConstants.java b/plugins/org.eclipse.jem.beaninfo.vm.common/beaninfoCommon/org/eclipse/jem/beaninfo/common/IBaseBeanInfoConstants.java
deleted file mode 100644
index 3b63c76..0000000
--- a/plugins/org.eclipse.jem.beaninfo.vm.common/beaninfoCommon/org/eclipse/jem/beaninfo/common/IBaseBeanInfoConstants.java
+++ /dev/null
@@ -1,155 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2005, 2006 IBM Corporation and others.
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
- *
- * Contributors:
- * IBM Corporation - initial API and implementation
- *******************************************************************************/
-/*
-
-
- */
-package org.eclipse.jem.beaninfo.common;
-
-
-
-/**
- * Constants for the BaseBeanInfo for arguments. This class is common between
- * the IDE and the remote vm so that these constants can be used on both sides.
- * <p>
- * These are constants used in FeatureAttributes as keys. The other special
- * constants that are not keys in FeatureAttributes are left in BaseBeanInfo
- * since they are not needed on both sides.
- *
- * @since 1.2.0
- */
-public interface IBaseBeanInfoConstants {
-
- /**
- * Indicator used to describe a factory instantiation pattern.
- * <p>
- * This will be on the attributes of the BeanDescriptor for the factory class. It will be complete, in that if this
- * factory is inherited from another factory, it must copy in the superclass's factory attribute. They won't be
- * automatically merged.
- * <p>
- * The format is an Object[][]. The first dimension at index zero is for toolkit wide information and then indexes one and beyond are one for each creation method name. The second dimension is for one entry
- * of classwide data and the rest are the data for
- * each creation method.
- * <p>
- * The first entry at Object[0] will be <code>{initString, isShared, onFreeform}</code> where:
- * <dl>
- * <dt>initString
- * <dd>The init string that should be used to create an instance of the toolkit if it needs one, or <code>null</code> if it doesn't
- * need one (i.e. all static) or if the default constructor should be used.
- * This is used when a component is dropped from the palette that is for a toolkit component.
- * <dt>isShared
- * <dd><code>false</code> if each call to the creation method should have a new instance of the toolkit. This means that the toolkit manages only
- * one instance. This is more like a controller than a toolkit in this case. <code>true</code> if it should
- * try to reuse the toolkit of the parent if it has one, or any other found toolkit of the same type, (i.e. a subtype will be acceptable).
- * This is used when a component is dropped from the palette that is for a toolkit component.
- * <dt>onFreeform
- * <dd><code>true</code> if the toolkit is created that it should appear on the freeform surface to be selectable. This would be of use
- * if the toolkit had properties that need to be set. If the toolkit had no properties then it doesn't need to be selectable and should
- * not be on the freeform. Use <code>false</code> in that case.
- * </dl>
- * <p>
- * The second and other entries of the array are of the format:
- * <code>{methodName, returnedClassname, isStatic, Object[], ...}</code> where:
- * <dl>
- * <dt>methodName
- * <dd>The name of the creation method this entry is for (String).
- * <dt>returnedClassname
- * <dd>The name of the class that is created and returned from the method (String).
- * <dt>isStatic
- * <dd><code>Boolean.TRUE</code> if the method is a static method, <code>Boolean.FALSE</code> if not.
- * This is used when a component is dropped from the palette that is for a toolkit component.
- * <dt>Object[]
- * <dd>Zero or more arrays. The array contains the name of the properties for each method signature that each
- * respective argument is for, or <code>null</code> if that arg is not a property. There can be more than one array if there
- * is more than one factory method of the same name, and returns the same type, but what is different is only the number of arguments.
- * If there is a
- * factory method that has no properties as arguments or has no arguments, don't include an array for it. For example if there was only one factory method and it had no
- * arguments then there would not be any arrays.
- * Currently cannot handle where more than one method has the same number of arguments but different types for the arguments.
- * </dl>
- * <p>
- * A example is:
- * <pre><code>
- * new Object[][] {
- * {"new a.b.c.Toolkit(\"ABC\")", Boolean.TRUE, Boolean.FALSE},
- * {"createButton", "a.b.c.Button", Boolean.FALSE, new Object[] {"parent", "text"}, new Object[] {"parent"}}
- * }
- * </code>
- * </pre>
- * <p>
- * This example says that this class is toolkit (factory). To construct an instead use <code>"new a.b.c.Toolkit(\"ABC\")"</code> and it is shared
- * with other objects created from this factory instance. Also, the factory method is "createButton", returns an "a.b.c.Button", and it is
- * not a static call (i.e. use a toolkit instance to create it). It has two forms of factory methods. One is two arguments where the first
- * arg is the parent property and the second arg is the text property. The other form has only one argument, the parent property.
- * <p>
- * The way this is used in a palette entry to drop a new object that a toolkit can create is to have an expression of the form
- * <code>{toolkit:classname}.factorymethod(args)</code>. So for the above example it would be <code>{toolkit:a.b.c.Toolkit}.createButton(parent)</code>.
- * The classname <b>must</b> be fully-qualified and if an inner class it must use the "$" instead of "." for the name, i.e. a.b.c.Toolkit.InnerFactory
- * would be a.b.c.Toolkit$InnerFactory.
- * <p>
- * <b>NOTE:</b> This is an EXPERIMENTAL API and can change in the future until committed.
- *
- * @since 1.2.0
- */
- public static final String FACTORY_CREATION = "FACTORY_CREATION";//$NON-NLS-1$
-
- /**
- * Category indicator for apply property arguments. Category is a pre-defined attribute name too. That is where the category is stored in a
- * descriptor.
- *
- * @since 1.1.0
- */
- public static final String CATEGORY = "category"; //$NON-NLS-1$
-
- /**
- * Enumeration values indicator for apply property arguments. Enumeration values is a pre-defined attribute name too. That is where the
- * enumeration values are stored.
- *
- * @since 1.1.0
- */
- public static final String ENUMERATIONVALUES = "enumerationValues";//$NON-NLS-1$
-
- // The keys for icon file names, NOT THE java.awt.icon key.
- public static final String ICONCOLOR16X16URL = "ICON_COLOR_16x16_URL"; //$NON-NLS-1$
- public static final String ICONCOLOR32X32URL = "ICON_COLOR_32x32_URL"; //$NON-NLS-1$ // Not used
- public static final String ICONMONO16X16URL = "ICON_MONO_16x16_URL"; //$NON-NLS-1$ // Not used
- public static final String ICONMONO32X32URL = "ICON_MONO_32x32_URL"; //$NON-NLS-1$ // Not used
-
-
- /**
- * FeatureAttribute key for explicit property changes. The value is a Boolean. <code>true</code>
- * indicates that the Customize Bean customizer supplied by the BeanInfo will indicate which
- * properties it has changed through firing {@link java.beans.PropertyChangeEvent} instead of the
- * Visual Editor automatically trying to determine the set of changed properties.
- * <p>
- * The default if not set is <code>false</code>.
- *
- * @since 1.1.0.1
- */
- public static final String EXPLICIT_PROPERTY_CHANGE = "EXPLICIT_PROPERTY_CHANGE"; //$NON-NLS-1$
-
- /**
- * Used by Visual Editor as feature attribute key/value to indicate that it must create an implicit setting of a property(s).
- * For example {@link javax.swing.JFrame#getContentPane()}. There must be a content pane
- * set in the VE model so that users can drop the components on it. Setting this here
- * means that the default content pane from the JFrame will show up in the editor to use.
- * <p>
- * This should be used with care in that not all properties are required to always show up.
- * They can be queried when needed.
- * <p>
- * The value can be either a {@link String} for one property. Or it can be a {@link String[]} for more
- * than one property.
- *
- * @since 1.2.0
- */
- public static final String REQUIRED_IMPLICIT_PROPERTIES = "requiredImplicitProperties"; //$NON-NLS-1$
-
-}
diff --git a/plugins/org.eclipse.jem.beaninfo.vm.common/beaninfoCommon/org/eclipse/jem/internal/beaninfo/common/BeanRecord.java b/plugins/org.eclipse.jem.beaninfo.vm.common/beaninfoCommon/org/eclipse/jem/internal/beaninfo/common/BeanRecord.java
deleted file mode 100644
index 724b0d8..0000000
--- a/plugins/org.eclipse.jem.beaninfo.vm.common/beaninfoCommon/org/eclipse/jem/internal/beaninfo/common/BeanRecord.java
+++ /dev/null
@@ -1,53 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2005 IBM Corporation and others.
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
- *
- * Contributors:
- * IBM Corporation - initial API and implementation
- *******************************************************************************/
-/*
-
-
- */
-package org.eclipse.jem.internal.beaninfo.common;
-
-
-/**
- * This is the data structure for sending the BeanDescriptor info from
- * the BeanInfo vm to the IDE vm. It is serializable so that it can
- * be serialized for transmission.
- * <p>
- * It contains the properties of the BeanDescriptor.
- * @since 1.1.0
- */
-public class BeanRecord extends FeatureRecord {
-
- private static final long serialVersionUID = 1105979920664L;
-
- public String customizerClassName;
- public boolean mergeInheritedProperties;
- public boolean mergeInheritedOperations;
- public boolean mergeInheritedEvents;
- /**
- * Names of properties that are to not be inherited in getAllProperties(). It is set only
- * if the list is not the full list of inherited properties.
- * If all inherited or mergeInheritedProperties is false, then the field will be <code>null</code>. Save space that way.
- */
- public String[] notInheritedPropertyNames;
- /**
- * Names of operations that are to not be inherited in getEAllOperations(). It is set only
- * if the list is not the full list of inherited operations.
- * If all are inherited or if mergeInheritedOperations is false, then the field will be <code>null</code>. Save space that way.
- */
- public String[] notInheritedOperationNames;
- /**
- * Names of events that are to not be inherited in getAllEvents(). It is set only
- * if the list is not the full list of inherited events.
- * If all are inherited or if mergeInheritedEvents is false, then the field will be <code>null</code>. Save space that way.
- */
- public String[] notInheritedEventNames;
-
-}
diff --git a/plugins/org.eclipse.jem.beaninfo.vm.common/beaninfoCommon/org/eclipse/jem/internal/beaninfo/common/EventSetRecord.java b/plugins/org.eclipse.jem.beaninfo.vm.common/beaninfoCommon/org/eclipse/jem/internal/beaninfo/common/EventSetRecord.java
deleted file mode 100644
index b235382..0000000
--- a/plugins/org.eclipse.jem.beaninfo.vm.common/beaninfoCommon/org/eclipse/jem/internal/beaninfo/common/EventSetRecord.java
+++ /dev/null
@@ -1,37 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2005 IBM Corporation and others.
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
- *
- * Contributors:
- * IBM Corporation - initial API and implementation
- *******************************************************************************/
-/*
-
-
- */
-package org.eclipse.jem.internal.beaninfo.common;
-
-
-/**
- * This is the data structure for sending the EventSetDescriptor info from
- * the BeanInfo vm to the IDE vm. It is serializable so that it can
- * be serialized for transmission.
- * <p>
- * It contains the properties of the EventSetDescriptor.
- * @since 1.1.0
- */
-public class EventSetRecord extends FeatureRecord {
-
- private static final long serialVersionUID = 1105980773420L;
-
- public ReflectMethodRecord addListenerMethod;
- public String eventAdapterClassName;
- public MethodRecord[] listenerMethodDescriptors;
- public String listenerTypeName;
- public ReflectMethodRecord removeListenerMethod;
- public boolean inDefaultEventSet;
- public boolean unicast;
-}
diff --git a/plugins/org.eclipse.jem.beaninfo.vm.common/beaninfoCommon/org/eclipse/jem/internal/beaninfo/common/FeatureAttributeValue.java b/plugins/org.eclipse.jem.beaninfo.vm.common/beaninfoCommon/org/eclipse/jem/internal/beaninfo/common/FeatureAttributeValue.java
deleted file mode 100644
index 960afd9..0000000
--- a/plugins/org.eclipse.jem.beaninfo.vm.common/beaninfoCommon/org/eclipse/jem/internal/beaninfo/common/FeatureAttributeValue.java
+++ /dev/null
@@ -1,772 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2005, 2006 IBM Corporation and others.
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
- *
- * Contributors:
- * IBM Corporation - initial API and implementation
- *******************************************************************************/
-/*
-
-
- */
-package org.eclipse.jem.internal.beaninfo.common;
-
-import java.io.*;
-import java.lang.reflect.*;
-import java.util.Arrays;
-import java.util.logging.Level;
-import java.util.regex.Pattern;
-
-import org.eclipse.jem.internal.proxy.common.MapTypes;
-
-
-
-/**
- * This is the value for a FeatureAttribute. It wrappers the true java object.
- * Use the getObject method to get the java value.
- * <p>
- * We can only represent Strings, primitives, and arrays. (Primitives will converted
- * to their wrapper class (e.g. Long), and byte, short, and int will move up to Long,
- * and float will move up to Double). And any kind of valid array on the java BeanInfo side
- * will be converted to an Object array on the IDE side. We don't have the capability to allow more complex objects
- * because the IDE may not have the necessary classes available to it that
- * the BeanInfo may of had available to it. Invalid objects will be represented
- * by the singleton instance of {@link org.eclipse.jem.internal.beaninfo.common.InvalidObject}.
- * <p>
- * <b>Note:</b>
- * Class objects that are values of Feature attributes on the java BeanInfo side will be
- * converted to simple strings containing the classname when moved to the client (IDE) side.
- * That is because the classes probably will not be available on the IDE side, but can be
- * used to reconstruct the class when used back on the java vm side.
- * @since 1.1.0
- */
-public class FeatureAttributeValue implements Serializable {
-
- private transient Object value;
- private transient Object internalValue;
- private boolean implicitValue;
- private static final long serialVersionUID = 1105717634844L;
-
- /**
- * Create the value with the given init string.
- * <p>
- * This is not meant to be used by clients.
- * @param initString
- *
- * @since 1.1.0
- */
- public FeatureAttributeValue(String initString) {
- // Use the init string to create the value. This is our
- // own short-hand for this.
- if (initString.startsWith(IMPLICIT)) {
- setImplicitValue(true);
- initString = initString.substring(IMPLICIT.length());
- }
- value = parseString(initString);
- }
-
- /**
- * This is used when customer wants to fluff one up.
- *
- *
- * @since 1.1.0
- */
- public FeatureAttributeValue() {
-
- }
-
- /**
- * @return Returns the value.
- *
- * @since 1.1.0
- */
- public Object getValue() {
- return value;
- }
-
- /**
- * Set a value.
- * @param value The value to set.
- * @since 1.1.0
- */
- public void setValue(Object value) {
- this.value = value;
- this.setInternalValue(null);
- }
-
- /**
- * Set the internal value.
- * @param internalValue The internalValue to set.
- *
- * @since 1.1.0
- */
- public void setInternalValue(Object internalValue) {
- this.internalValue = internalValue;
- }
-
- /**
- * This is the internal value. It is the <code>value</code> massaged into an easier to use form
- * in the IDE. It will not be serialized out. It will not be reconstructed from an init string.
- * <p>
- * It does not need to be used. It will be cleared if
- * a new value is set. For example, if the value is a complicated array (because you can't have
- * special classes in the attribute value on the BeanInfo side) the first usage of this value can
- * be translated into an easier form to use, such as a map.
- *
- * @return Returns the internalValue.
- *
- * @since 1.1.0
- */
- public Object getInternalValue() {
- return internalValue;
- }
-
- /* (non-Javadoc)
- * @see java.lang.Object#toString()
- */
- public String toString() {
- if (value == null)
- return super.toString();
- StringBuffer out = new StringBuffer(100);
- if (isImplicitValue())
- out.append(IMPLICIT);
- makeString(value, out);
- return out.toString();
- }
-
-
- /**
- * Helper method to take the object and turn it into the
- * string form that is required for EMF serialization.
- * <p>
- * This is used internally. It can be used for development
- * purposes by clients, but they would not have any real
- * runtime need for this.
- * <p>
- * Output format would be (there won't be any newlines in the actual string)
- * <pre>
- * String: "zxvzxv"
- * Number: number
- * Boolean: true or false
- * Character: 'c'
- * null: null
- *
- * Array: (all arrays will be turned into Object[])
- * [dim]{e1, e2}
- * [dim1][dim2]{[dim1a]{e1, e2}, [dim2a]{e3, e4}}
- * where en are objects that follow the pattern for single output above.
- *
- * Any invalid object (i.e. not one of the ones we handle) will be:
- * INV
- *
- * Arrays of invalid types (not Object, String, Number, Boolean, Character,
- * or primitives) will be marked as INV.
- * </pre>
- * @param value
- * @return serialized form as a string.
- *
- * @since 1.1.0
- */
- public static String makeString(Object value) {
- StringBuffer out = new StringBuffer(100);
- makeString(value, out);
- return out.toString();
- }
-
- private static final Pattern QUOTE = Pattern.compile("\""); // Pattern for searching for double-quote. Make it static so don't waste time compiling each time. //$NON-NLS-1$
- private static final String NULL = "null"; // Output string for null //$NON-NLS-1$
- private static final String INVALID = "INV"; // Invalid object flag. //$NON-NLS-1$
- private static final String IMPLICIT = "implicit,"; // Implicit flag. //$NON-NLS-1$
-
- /*
- * Used for recursive building of the string.
- */
- private static void makeString(Object value, StringBuffer out) {
- if (value == null)
- out.append(NULL);
- else if (value instanceof String || value instanceof Class) {
- // String: "string" or "string\"stringend" if str included a double-quote.
- out.append('"');
- // If class, turn value into the classname.
- String str = value instanceof String ? (String) value : ((Class) value).getName();
- if (str.indexOf('"') != -1) {
- // Replace double-quote with escape double-quote so we can distinquish it from the terminating double-quote.
- out.append(QUOTE.matcher(str).replaceAll("\\\\\"")); // Don't know why we need the back-slash to be doubled for replaceall, but it doesn't work otherwise. //$NON-NLS-1$
- } else
- out.append(str);
- out.append('\"');
- } else if (value instanceof Number) {
- // Will go out as either a integer number or a floating point number.
- // When read back in it will be either a Long or a Double.
- out.append(value);
- } else if (value instanceof Boolean) {
- // It will go out as either true or false.
- out.append(value);
- } else if (value instanceof Character) {
- // Character: 'c' or '\'' if char was a quote.
- out.append('\'');
- Character c = (Character) value;
- if (c.charValue() != '\'')
- out.append(c.charValue());
- else
- out.append("\\'"); //$NON-NLS-1$
- out.append('\'');
- } else if (value.getClass().isArray()) {
- // Handle array format.
- Class type = value.getClass();
- // See if final type is a valid type.
- Class ft = type.getComponentType();
- int dims = 1;
- while (ft.isArray()) {
- dims++;
- ft = ft.getComponentType();
- }
- if (ft == Object.class || ft == String.class || ft == Boolean.class || ft == Character.class || ft.isPrimitive() || Number.class.isAssignableFrom(ft)) {
- // [length][][] {....}
- out.append('[');
- int length = Array.getLength(value);
- out.append(length);
- out.append(']');
- while(--dims > 0) {
- out.append("[]"); //$NON-NLS-1$
- }
- out.append('{');
- for (int i=0; i < length; i++) {
- if (i != 0)
- out.append(',');
- makeString(Array.get(value, i), out);
- }
- out.append('}');
- } else
- out.append(INVALID); // Any other kind of array is invalid.
- } else {
- out.append(INVALID);
- }
- }
-
-
- /**
- * Helper method to take the string input from EMF serialization and turn it
- * into an Object.
- * <p>
- * This is used internally. It can be used for development
- * purposes by clients, but they would not have any real
- * runtime need for this.
- * <p>
- * The object will be an object, null, or an Object array. Any value
- * that is invalid will be set to the {@link InvalidObject#INSTANCE} static
- * instance.
- *
- * @param input
- * @return object decoded from the input.
- *
- * @see #makeString(Object)
- * @since 1.1.0
- */
- public static Object parseString(String input) {
- return parseString(new StringParser(input));
- }
-
- private static class StringParser {
- private int next=0;
- private int length;
- private String input;
-
- public StringParser(String input) {
- this.input = input;
- this.length = input.length();
- }
-
- public String toString() {
- return "StringParser: \""+input+'"'; //$NON-NLS-1$
- }
-
- public void skipWhitespace() {
- while(next < length) {
- if (!Character.isWhitespace(input.charAt(next++))) {
- next--; // Put it back as not yet read since it is not whitespace.
- break;
- }
- }
- }
-
- /**
- * Return the next index
- * @return
- *
- * @since 1.1.0
- */
- public int nextIndex() {
- return next;
- }
-
- /**
- * Get the length of the input
- * @return input length
- *
- * @since 1.1.0
- */
- public int getLength() {
- return length;
- }
-
-
- /**
- * Read the current character and go to next.
- * @return current character
- *
- * @since 1.1.0
- */
- public char read() {
- return next<length ? input.charAt(next++) : 0;
- }
-
- /**
- * Backup the parser one character.
- *
- *
- * @since 1.1.0
- */
- public void backup() {
- if (--next < 0)
- next = 0;
- }
-
- /**
- * Peek at the char at the next index, but don't increment afterwards.
- * @return
- *
- * @since 1.1.0
- */
- public char peek() {
- return next<length ? input.charAt(next) : 0;
- }
-
- /**
- * Have we read the last char.
- * @return <code>true</code> if read last char.
- *
- * @since 1.1.0
- */
- public boolean atEnd() {
- return next>=length;
- }
-
- /**
- * Skip the next number of chars.
- * @param skip number of chars to skip.
- *
- * @since 1.1.0
- */
- public void skip(int skip) {
- if ((next+=skip) > length)
- next = length;
- }
-
- /**
- * Return the string input.
- * @return the string input
- *
- * @since 1.1.0
- */
- public String getInput() {
- return input;
- }
-
- }
-
- /*
- * Starting a parse for an object at the given index.
- * Return the parsed object or InvalidObject if no
- * object or if there was an error parsing.
- */
- private static Object parseString(StringParser parser) {
- parser.skipWhitespace();
- if (!parser.atEnd()) {
- char c = parser.read();
- switch (c) {
- case '"':
- // Start of a quoted string. Scan for closing quote, ignoring escaped quotes.
- int start = parser.nextIndex(); // Index of first char after '"'
- char[] dequoted = null; // Used if there is an escaped quote. That is the only thing we support escape on, quotes.
- int dequoteIndex = 0;
- while (!parser.atEnd()) {
- char cc = parser.read();
- if (cc == '"') {
- // If we didn't dequote, then just do substring.
- if (dequoted == null)
- return parser.getInput().substring(start, parser.nextIndex()-1); // next is char after '"', so end of string index is index of '"'
- else {
- // We have a dequoted string. So turn into a string.
- // Gather the last group
- int endNdx = parser.nextIndex()-1;
- parser.getInput().getChars(start, endNdx, dequoted, dequoteIndex);
- dequoteIndex+= (endNdx-start);
- return new String(dequoted, 0, dequoteIndex);
- }
- } else if (cc == '\\') {
- // We had an escape, see if next is a quote. If it is we need to strip out the '\'.
- if (parser.peek() == '"') {
- if (dequoted == null) {
- dequoted = new char[parser.getLength()];
- }
- int endNdx = parser.nextIndex()-1;
- parser.getInput().getChars(start, endNdx, dequoted, dequoteIndex); // Get up to, but not including '\'
- dequoteIndex+= (endNdx-start);
- // Now also add in the escaped quote.
- dequoted[dequoteIndex++] = parser.read();
- start = parser.nextIndex(); // Next group is from next index.
- }
- }
- }
- break; // If we got here, it is invalid.
-
- case '-':
- case '0':
- case '1':
- case '2':
- case '3':
- case '4':
- case '5':
- case '6':
- case '7':
- case '8':
- case '9':
- // Possible number.
- // Scan to next non-digit, or not part of valid number.
- boolean numberComplete = false;
- boolean floatType = false;
- boolean foundE = false;
- boolean foundESign = false;
- start = parser.nextIndex()-1; // We want to include the sign or first digit in the number.
- while (!parser.atEnd() && !numberComplete) {
- char cc = parser.read();
- switch (cc) {
- case '0':
- case '1':
- case '2':
- case '3':
- case '4':
- case '5':
- case '6':
- case '7':
- case '8':
- case '9':
- break; // This is good, go on.
- case '.':
- if (floatType)
- return InvalidObject.INSTANCE; // We already found a '.', two are invalid.
- floatType = true;
- break;
- case 'e':
- case 'E':
- if (foundE)
- return InvalidObject.INSTANCE; // We already found a 'e', two are invalid.
- foundE = true;
- floatType = true; // An 'e' makes it a float, if not already.
- break;
- case '+':
- case '-':
- if (!foundE || foundESign)
- return InvalidObject.INSTANCE; // A +/- with no 'e' first is invalid. Or more than one sign.
- foundESign = true;
- break;
- default:
- // Anything else is end of number.
- parser.backup(); // Back it up so that next parse will start with this char.
- numberComplete = true; // So we stop scanning
- break;
- }
- }
- try {
- if (!floatType)
- return Long.valueOf(parser.getInput().substring(start, parser.nextIndex()));
- else
- return Double.valueOf(parser.getInput().substring(start, parser.nextIndex()));
- } catch (NumberFormatException e) {
- }
- break; // If we got here, it is invalid.
-
- case 't':
- case 'T':
- case 'f':
- case 'F':
- // Possible boolean.
- if (parser.getInput().regionMatches(true, parser.nextIndex()-1, "true", 0, 4)) { //$NON-NLS-1$
- parser.skip(3); // Skip over rest of string.
- return Boolean.TRUE;
- } else if (parser.getInput().regionMatches(true, parser.nextIndex()-1, "false", 0, 5)) { //$NON-NLS-1$
- parser.skip(4); // Skip over rest of string.
- return Boolean.FALSE;
- }
- break; // If we got here, it is invalid.
-
- case '\'':
- // Possible character
- char cc = parser.read();
- // We really only support '\\' and '\'' anything else will be treated as ignore '\' because we don't know handle full escapes.
- if (cc == '\\')
- cc = parser.read(); // Get what's after it.
- else if (cc == '\'')
- break; // '' is invalid.
- if (parser.peek() == '\'') {
- // So next char after "character" is is a quote. This is good.
- parser.read(); // Now consume the quote
- return new Character(cc);
- }
- break; // If we got here, it is invalid.
-
- case 'n':
- // Possible null.
- if (parser.getInput().regionMatches(parser.nextIndex()-1, "null", 0, 4)) { //$NON-NLS-1$
- parser.skip(3); // Skip over rest of string.
- return null;
- }
- break; // If we got here, it is invalid.
-
- case 'I':
- // Possible invalid value.
- if (parser.getInput().regionMatches(parser.nextIndex()-1, INVALID, 0, INVALID.length())) {
- parser.skip(INVALID.length()-1); // Skip over rest of string.
- return InvalidObject.INSTANCE;
- }
- break; // If we got here, it is invalid.
-
- case '[':
- // Possible array.
- // The next field should be a number, so we'll use parseString to get the number.
- Object size = parseString(parser);
- if (size instanceof Long) {
- parser.skipWhitespace();
- cc = parser.read(); // Se if next is ']'
- if (cc == ']') {
- // Good, well-formed first dimension
- int dim = 1;
- boolean valid = true;
- // See if there are more of just "[]". the number of them is the dim.
- while (true) {
- parser.skipWhitespace();
- cc = parser.read();
- if (cc == '[') {
- parser.skipWhitespace();
- cc = parser.read();
- if (cc == ']')
- dim++;
- else {
- // This is invalid.
- valid = false;
- parser.backup();
- break; // No more dims.
- }
- } else {
- parser.backup();
- break; // No more dims.
- }
- }
- if (valid) {
- parser.skipWhitespace();
- cc = parser.read();
- if (cc == '{') {
- // Good, we're at the start of the initialization code.
- int[] dims = new int[dim];
- int len = ((Long) size).intValue();
- dims[0] = len;
- Object array = Array.newInstance(Object.class, dims);
- Arrays.fill((Object[]) array, null); // Because newInstance used above fills the array created with empty arrays when a dim>1.
-
- // Now we start filling it in.
- Object invSetting = null; // What we will use for the invalid setting. If this is a multidim, this needs to be an array. Will not create it until needed.
- Object entry = parseString(parser); // Get the first entry
- Class compType = array.getClass().getComponentType();
- int i = -1;
- while (true) {
- if (++i < len) {
- if (compType.isInstance(entry)) {
- // Good, it can be assigned.
- Array.set(array, i, entry);
- } else {
- // Bad. Need to set invalid.
- if (invSetting == null) {
- // We haven't created it yet.
- if (dim == 1)
- invSetting = InvalidObject.INSTANCE; // Great, one dimensional, we can use invalid directly
- else {
- // Multi-dim. Need to create a valid array that we can set.
- int[] invDims = new int[dim - 1];
- Arrays.fill(invDims, 1); // Length one all of the way so that the final component can be invalid object
- invSetting = Array.newInstance(Object.class, invDims);
- Object finalEntry = invSetting; // Final array (with component type of just Object). Start with the full array and work down.
- for (int j = invDims.length - 1; j > 0; j--) {
- finalEntry = Array.get(finalEntry, 0);
- }
- Array.set(finalEntry, 0, InvalidObject.INSTANCE);
- }
- }
- Array.set(array, i, invSetting);
- }
- }
-
- parser.skipWhitespace();
- cc = parser.read();
- if (cc == ',') {
- // Good, get next
- entry = parseString(parser);
- } else if (cc == '}') {
- // Good, reached the end.
- break;
- } else {
- if (!parser.atEnd()) {
- parser.backup();
- entry = parseString(parser); // Technically this should be invalid, but we'll let a whitespace also denote next entry.
- } else {
- // It's really screwed up. The string just ended. Log it.
- Exception e = new IllegalStateException(parser.toString());
- try {
- // See if Beaninfo plugin is available (we are running under eclipse). If so, use it, else just print to error.
- // We may be in the remote vm and so it won't be available.
- Class biPluginClass = Class.forName("org.eclipse.jem.internal.beaninfo.core.BeaninfoPlugin"); //$NON-NLS-1$
- Method getPlugin = biPluginClass.getMethod("getPlugin", (Class[]) null); //$NON-NLS-1$
- Method getLogger = biPluginClass.getMethod("getLogger", (Class[]) null); //$NON-NLS-1$
- Method log = getLogger.getReturnType().getMethod("log", new Class[] {Throwable.class, Level.class}); //$NON-NLS-1$
- Object biPlugin = getPlugin.invoke(null, (Object[]) null);
- Object logger = getLogger.invoke(biPlugin, (Object[]) null);
- log.invoke(logger, new Object[] {e, Level.WARNING});
- return InvalidObject.INSTANCE;
- } catch (SecurityException e1) {
- } catch (IllegalArgumentException e1) {
- } catch (ClassNotFoundException e1) {
- } catch (NoSuchMethodException e1) {
- } catch (IllegalAccessException e1) {
- } catch (InvocationTargetException e1) {
- } catch (NullPointerException e1) {
- }
- e.printStackTrace(); // Not in eclipse, so just print stack trace.
- return InvalidObject.INSTANCE;
- }
- }
- }
-
- return array;
- }
- }
- }
- }
- break; // If we got here, it is invalid.
- }
- }
- return InvalidObject.INSTANCE;
- }
-
- private void writeObject(ObjectOutputStream out) throws IOException {
- // Write out any hidden stuff
- out.defaultWriteObject();
- writeObject(value, out);
- }
-
- private void writeObject(Object value, ObjectOutputStream out) throws IOException {
- if (value == null)
- out.writeObject(value);
- else {
- if (value instanceof Class)
- out.writeObject(((Class) value).getName());
- else if (!value.getClass().isArray()) {
- if (value instanceof String || value instanceof Number || value instanceof Boolean || value instanceof Character)
- out.writeObject(value);
- else
- out.writeObject(InvalidObject.INSTANCE);
- } else {
- // Array is tricky. See if it is one we can handle, if not then invalid.
- // To indicate array, we will first write out the Class of the Component type of the array (it will
- // be converted to be Object or Object[]...).
- // This will be the clue that an array is coming. Class values will never
- // be returned, so that is how we can tell it is an array.
- // Note: The reason we are using the component type (converted to Object) is because to reconstruct on the other side we need
- // to use the component type plus length of the array's first dimension.
- //
- // We can not just serialize the array in the normal way because it may contain invalid values, and we need to
- // handle that. Also, if it wasn't an Object array, we need to turn it into an object array. We need consistency
- // in that it should always be an Object array.
- // So output format will be:
- // Class(component type)
- // int(size of first dimension)
- // Object(value of first entry) - Actually use out writeObject() format to allow nesting of arrays.
- // Object(value of second entry)
- // ... up to size of dimension.
- Class type = value.getClass();
- // See if final type is a valid type.
- Class ft = type.getComponentType();
- int dims = 1;
- while (ft.isArray()) {
- dims++;
- ft = ft.getComponentType();
- }
- if (ft == Object.class || ft == String.class || ft == Boolean.class || ft == Character.class || ft.isPrimitive() || ft == Class.class || Number.class.isAssignableFrom(ft)) {
- String jniType = dims == 1 ? "java.lang.Object" : MapTypes.getJNITypeName("java.lang.Object", dims-1); //$NON-NLS-1$ //$NON-NLS-2$
- try {
- Class componentType = Class.forName(jniType);
- out.writeObject(componentType);
- int length = Array.getLength(value);
- out.writeInt(length);
- for (int i = 0; i < length; i++) {
- writeObject(Array.get(value, i), out);
- }
- } catch (ClassNotFoundException e) {
- // This should never happen. Object arrays are always available.
- }
- } else
- out.writeObject(InvalidObject.INSTANCE);
- }
- }
- }
-
-
- private void readObject(ObjectInputStream in) throws IOException, ClassNotFoundException {
- // Read in any hidden stuff
- in.defaultReadObject();
-
- value = readActualObject(in);
- }
-
- private Object readActualObject(ObjectInputStream in) throws IOException, ClassNotFoundException {
- Object val = in.readObject();
- if (val instanceof Class) {
- // It must be an array. Only Class objects that come in are Arrays of Object.
- int length = in.readInt();
- Object array = Array.newInstance((Class) val, length);
- for (int i = 0; i < length; i++) {
- Array.set(array, i, readActualObject(in));
- }
- return array;
- } else
- return val; // It is the value itself.
- }
-
-
- /**
- * Is this FeatureAttributeValue an implicit value, i.e. one that came from
- * BeanInfo Introspection and not from an override file.
- *
- * @return Returns the implicitValue.
- *
- * @since 1.2.0
- */
- public boolean isImplicitValue() {
- return implicitValue;
- }
-
-
- /**
- * Set the implicit value flag.
- * @param implicitValue The implicitValue to set.
- *
- * @see #isImplicitValue()
- * @since 1.2.0
- */
- public void setImplicitValue(boolean implicitValue) {
- this.implicitValue = implicitValue;
- }
-
-}
diff --git a/plugins/org.eclipse.jem.beaninfo.vm.common/beaninfoCommon/org/eclipse/jem/internal/beaninfo/common/FeatureRecord.java b/plugins/org.eclipse.jem.beaninfo.vm.common/beaninfoCommon/org/eclipse/jem/internal/beaninfo/common/FeatureRecord.java
deleted file mode 100644
index 9d392fc..0000000
--- a/plugins/org.eclipse.jem.beaninfo.vm.common/beaninfoCommon/org/eclipse/jem/internal/beaninfo/common/FeatureRecord.java
+++ /dev/null
@@ -1,41 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2005 IBM Corporation and others.
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
- *
- * Contributors:
- * IBM Corporation - initial API and implementation
- *******************************************************************************/
-/*
-
-
- */
-package org.eclipse.jem.internal.beaninfo.common;
-
-import java.io.Serializable;
-
-
-/**
- * This is the data structure for sending the FeatureDescriptor info from
- * the BeanInfo vm to the IDE vm. It is serializable so that it can
- * be serialized for transmission.
- * <p>
- * It contains the properties of the FeatureDescriptor.
- * @since 1.1.0
- */
-public class FeatureRecord implements Serializable {
-
- private static final long serialVersionUID = 1105979276648L;
-
- public String name; // Some decorators use this and others don't. Each decorator type will decide whether this is of importance.
- public String displayName;
- public String shortDescription;
- public String category;
- public boolean expert;
- public boolean hidden;
- public boolean preferred;
- public String[] attributeNames;
- public FeatureAttributeValue[] attributeValues;
-}
diff --git a/plugins/org.eclipse.jem.beaninfo.vm.common/beaninfoCommon/org/eclipse/jem/internal/beaninfo/common/IBeanInfoIntrospectionConstants.java b/plugins/org.eclipse.jem.beaninfo.vm.common/beaninfoCommon/org/eclipse/jem/internal/beaninfo/common/IBeanInfoIntrospectionConstants.java
deleted file mode 100644
index e067449..0000000
--- a/plugins/org.eclipse.jem.beaninfo.vm.common/beaninfoCommon/org/eclipse/jem/internal/beaninfo/common/IBeanInfoIntrospectionConstants.java
+++ /dev/null
@@ -1,129 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2005 IBM Corporation and others.
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
- *
- * Contributors:
- * IBM Corporation - initial API and implementation
- *******************************************************************************/
-/*
-
-
- */
-package org.eclipse.jem.internal.beaninfo.common;
-
-
-/**
- * These are constants needed for transferring BeanInfo results from the BeanInfo VM.
- * @since 1.1.0
- */
-public interface IBeanInfoIntrospectionConstants {
-
- /**
- * Introspection bit flag indicating do the BeanDecorator. Sent to ModelingBeanInfo.introspect method.
- * @since 1.1.0
- */
- public static final int DO_BEAN_DECOR = 0x1;
-
- /**
- * Introspection bit flag indicating do the Properties. Sent to ModelingBeanInfo.introspect method.
- * @since 1.1.0
- */
- public static final int DO_PROPERTIES = 0x2;
-
- /**
- * Introspection bit flag indicating do the Methods. Sent to ModelingBeanInfo.introspect method.
- * @since 1.1.0
- */
- public static final int DO_METHODS = 0x4;
-
- /**
- * Introspection bit flag indicating do the Events. Sent to ModelingBeanInfo.introspect method.
- * @since 1.1.0
- */
- public static final int DO_EVENTS = 0x8;
-
- /**
- * BeanDecorator was sent command id.
- * <p>
- * This will be sent to callBack(int id, InputStream is). The InputStream will be Objects (use ObjectInputStream).
- * The stream will be broken into sections.
- * Each section will be headed by the command id of that section (e.g. BEAN_DECORATOR_SENT or PROPERTY_DECORATORS_SENT).
- * Following the command id will be the type of input specific data.
- * <p>
- * The data following the command id will be a BeanRecord from the ObjectInputStream.
- *
- * @see BeanRecord
- * @see org.eclipse.jem.internal.proxy.core.ICallback#calledBackStream(int, InputStream)
- * @since 1.1.0
- */
- public static final int BEAN_DECORATOR_SENT = 1;
-
- /**
- * PropertyDecorators send command id.
- * <p>
- * This will be sent to callBack(int id, InputStream is). The InputStream will be Objects (use ObjectInputStream).
- * The stream will be broken into sections.
- * Each section will be headed by the command id of that section (e.g. BEAN_DECORATOR_SENT or PROPERTY_DECORATORS_SENT).
- * Following the command id will be the type of input specific data.
- * <p>
- * The first object will be an int and will be the number of properties and each object after that
- * will be a PropertyRecord/IndexedPropertyRecord.
- *
- * @see org.eclipse.jem.internal.proxy.core.ICallback#calledBackStream(int, InputStream)
- * @see PropertyRecord
- * @see IndexedPropertyRecord
- */
- public static final int PROPERTY_DECORATORS_SENT = 2;
-
- /**
- * MethodDecorators send command id.
- * <p>
- * This will be sent to callBack(int id, InputStream is). The InputStream will be Objects (use ObjectInputStream).
- * The stream will be broken into sections.
- * Each section will be headed by the command id of that section (e.g. BEAN_DECORATOR_SENT or PROPERTY_DECORATORS_SENT).
- * Following the command id will be the type of input specific data.
- * <p>
- * The InputStream will be Objects (use ObjectInputStream).
- * The first object will be an int and will be the number of methods and each object after that
- * will be a MethodRecord.
- *
- * @see org.eclipse.jem.internal.proxy.core.ICallback#calledBackStream(int, InputStream)
- * @see MethodRecord
- */
- public static final int METHOD_DECORATORS_SENT = 3;
-
- /**
- * EventSetDecorators send command id.
- * <p>
- * This will be sent to callBack(int id, InputStream is). The InputStream will be Objects (use ObjectInputStream).
- * The stream will be broken into sections.
- * Each section will be headed by the command id of that section (e.g. BEAN_DECORATOR_SENT or PROPERTY_DECORATORS_SENT).
- * Following the command id will be the type of input specific data.
- * <p>
- * The first object will be an int and will be the number of events and each object after that
- * will be a EventSetRecord.
- *
- * @see org.eclipse.jem.internal.proxy.core.ICallback#calledBackStream(int, InputStream)
- * @see MethodRecord
- */
- public static final int EVENT_DECORATORS_SENT = 4;
-
- /**
- * Done send command id.
- * <p>
- * This will be sent to callBack(int id, InputStream is). The InputStream will be Objects (use ObjectInputStream).
- * The stream will be broken into sections.
- * Each section will be headed by the command id of that section (e.g. BEAN_DECORATOR_SENT or PROPERTY_DECORATORS_SENT).
- * Following the command id will be the type of input specific data.
- * <p>
- * This command id means there is no more data and it should return.
- *
- * @see org.eclipse.jem.internal.proxy.core.ICallback#calledBackStream(int, InputStream)
- * @see MethodRecord
- */
- public static final int DONE = 5;
-
-}
diff --git a/plugins/org.eclipse.jem.beaninfo.vm.common/beaninfoCommon/org/eclipse/jem/internal/beaninfo/common/IndexedPropertyRecord.java b/plugins/org.eclipse.jem.beaninfo.vm.common/beaninfoCommon/org/eclipse/jem/internal/beaninfo/common/IndexedPropertyRecord.java
deleted file mode 100644
index 88d2916..0000000
--- a/plugins/org.eclipse.jem.beaninfo.vm.common/beaninfoCommon/org/eclipse/jem/internal/beaninfo/common/IndexedPropertyRecord.java
+++ /dev/null
@@ -1,32 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2005 IBM Corporation and others.
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
- *
- * Contributors:
- * IBM Corporation - initial API and implementation
- *******************************************************************************/
-/*
-
-
- */
-package org.eclipse.jem.internal.beaninfo.common;
-
-
-/**
- * This is the data structure for sending the IndexedPropertyDescriptor info from
- * the BeanInfo vm to the IDE vm. It is serializable so that it can
- * be serialized for transmission.
- * <p>
- * It contains the properties of the IndexedPropertyDescriptor.
- * @since 1.1.0
- */
-public class IndexedPropertyRecord extends PropertyRecord {
- private static final long serialVersionUID = 1105983227990L;
-
- public ReflectMethodRecord indexedReadMethod;
- public ReflectMethodRecord indexedWriteMethod;
- public String indexedPropertyTypeName;
-}
diff --git a/plugins/org.eclipse.jem.beaninfo.vm.common/beaninfoCommon/org/eclipse/jem/internal/beaninfo/common/InvalidObject.java b/plugins/org.eclipse.jem.beaninfo.vm.common/beaninfoCommon/org/eclipse/jem/internal/beaninfo/common/InvalidObject.java
deleted file mode 100644
index 7e731ce..0000000
--- a/plugins/org.eclipse.jem.beaninfo.vm.common/beaninfoCommon/org/eclipse/jem/internal/beaninfo/common/InvalidObject.java
+++ /dev/null
@@ -1,53 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2005 IBM Corporation and others.
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
- *
- * Contributors:
- * IBM Corporation - initial API and implementation
- *******************************************************************************/
-/*
-
-
- */
-package org.eclipse.jem.internal.beaninfo.common;
-
-import java.io.ObjectStreamException;
-import java.io.Serializable;
-
-
-/**
- * An indicator object for invalid object type. This is used with feature attribute
- * values from the BeanInfo classes. We can only handle certain types when we
- * bring them over from the BeanInfo VM. That is because the classes instantiated
- * in the BeanInfo class may not be available in the IDE. So any invalid value
- * will be replaced by this class instance.
- * <p>
- * This is a singleton class.
- * There will be one instance (InvalidObject.INSTANCE) in the system. That way
- * "==" can be used to test for it.
- *
- * @since 1.1.0
- */
-public class InvalidObject implements Serializable {
-
- /**
- * Singleton instance of InvalidObject.
- * @since 1.1.0
- */
- public static final InvalidObject INSTANCE = new InvalidObject();
-
- private static final long serialVersionUID = 1105643804370L;
-
- /*
- * Nobody else should create one of these.
- */
- private InvalidObject() {
- }
-
- private Object readResolve() throws ObjectStreamException {
- return INSTANCE;
- }
-}
diff --git a/plugins/org.eclipse.jem.beaninfo.vm.common/beaninfoCommon/org/eclipse/jem/internal/beaninfo/common/MethodRecord.java b/plugins/org.eclipse.jem.beaninfo.vm.common/beaninfoCommon/org/eclipse/jem/internal/beaninfo/common/MethodRecord.java
deleted file mode 100644
index 4b37be9..0000000
--- a/plugins/org.eclipse.jem.beaninfo.vm.common/beaninfoCommon/org/eclipse/jem/internal/beaninfo/common/MethodRecord.java
+++ /dev/null
@@ -1,38 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2005 IBM Corporation and others.
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
- *
- * Contributors:
- * IBM Corporation - initial API and implementation
- *******************************************************************************/
-/*
-
-
- */
-package org.eclipse.jem.internal.beaninfo.common;
-
-
-/**
- * This is the data structure for sending the MethodDescriptor info from
- * the BeanInfo vm to the IDE vm. It is serializable so that it can
- * be serialized for transmission.
- * <p>
- * It contains the properties of the MethodDescriptor.
- * @since 1.1.0
- */
-public class MethodRecord extends FeatureRecord {
-
- private static final long serialVersionUID = 1105982213110L;
-
- /**
- * Method signature for the method this record describes.
- */
- public ReflectMethodRecord methodForDescriptor;
- /**
- * Parameter records array. It may be <code>null</code> if there aren't any.
- */
- public ParameterRecord[] parameters;
-}
diff --git a/plugins/org.eclipse.jem.beaninfo.vm.common/beaninfoCommon/org/eclipse/jem/internal/beaninfo/common/ParameterRecord.java b/plugins/org.eclipse.jem.beaninfo.vm.common/beaninfoCommon/org/eclipse/jem/internal/beaninfo/common/ParameterRecord.java
deleted file mode 100644
index 5b2f370..0000000
--- a/plugins/org.eclipse.jem.beaninfo.vm.common/beaninfoCommon/org/eclipse/jem/internal/beaninfo/common/ParameterRecord.java
+++ /dev/null
@@ -1,32 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2005 IBM Corporation and others.
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
- *
- * Contributors:
- * IBM Corporation - initial API and implementation
- *******************************************************************************/
-/*
-
-
- */
-package org.eclipse.jem.internal.beaninfo.common;
-
-
-/**
- * This is the data structure for sending the ParameterDescriptor info from
- * the BeanInfo vm to the IDE vm. It is serializable so that it can
- * be serialized for transmission.
- * <p>
- * It contains the properties of the ParameterDescriptor.
- * <p>
- * The only field of importance is the name, and that comes from FeatureRecord.
- * @since 1.1.0
- */
-public class ParameterRecord extends FeatureRecord {
-
- private static final long serialVersionUID = 1105982438955L;
-
-}
diff --git a/plugins/org.eclipse.jem.beaninfo.vm.common/beaninfoCommon/org/eclipse/jem/internal/beaninfo/common/PropertyRecord.java b/plugins/org.eclipse.jem.beaninfo.vm.common/beaninfoCommon/org/eclipse/jem/internal/beaninfo/common/PropertyRecord.java
deleted file mode 100644
index 3e03241..0000000
--- a/plugins/org.eclipse.jem.beaninfo.vm.common/beaninfoCommon/org/eclipse/jem/internal/beaninfo/common/PropertyRecord.java
+++ /dev/null
@@ -1,37 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2005 IBM Corporation and others.
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
- *
- * Contributors:
- * IBM Corporation - initial API and implementation
- *******************************************************************************/
-/*
-
-
- */
-package org.eclipse.jem.internal.beaninfo.common;
-
-
-/**
- * This is the data structure for sending the PropertyDescriptor info from
- * the BeanInfo vm to the IDE vm. It is serializable so that it can
- * be serialized for transmission.
- * <p>
- * It contains the properties of the PropertyDescriptor.
- * @since 1.1.0
- */
-public class PropertyRecord extends FeatureRecord {
- private static final long serialVersionUID = 1105979276648L;
-
- public String propertyEditorClassName;
- public String propertyTypeName;
- public ReflectMethodRecord readMethod;
- public ReflectMethodRecord writeMethod;
- public ReflectFieldRecord field;
- public boolean bound;
- public boolean constrained;
- public Boolean designTime;
-}
diff --git a/plugins/org.eclipse.jem.beaninfo.vm.common/beaninfoCommon/org/eclipse/jem/internal/beaninfo/common/ReflectFieldRecord.java b/plugins/org.eclipse.jem.beaninfo.vm.common/beaninfoCommon/org/eclipse/jem/internal/beaninfo/common/ReflectFieldRecord.java
deleted file mode 100644
index 9829839..0000000
--- a/plugins/org.eclipse.jem.beaninfo.vm.common/beaninfoCommon/org/eclipse/jem/internal/beaninfo/common/ReflectFieldRecord.java
+++ /dev/null
@@ -1,35 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2005 IBM Corporation and others.
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
- *
- * Contributors:
- * IBM Corporation - initial API and implementation
- *******************************************************************************/
-/*
-
-
- */
-package org.eclipse.jem.internal.beaninfo.common;
-
-import java.io.Serializable;
-
-
-/**
- * This is the data structure for sending the java.lang.reflect.Field info from
- * the BeanInfo vm to the IDE vm. It is serializable so that it can
- * be serialized for transmission.
- * <p>
- * It contains the properties of the java.lang.reflect.Field.
- * @since 1.1.0
- */
-public class ReflectFieldRecord implements Serializable {
-
- private static final long serialVersionUID = 1105981512453L;
-
- public String className;
- public String fieldName;
- public boolean readOnly;
-}
diff --git a/plugins/org.eclipse.jem.beaninfo.vm.common/beaninfoCommon/org/eclipse/jem/internal/beaninfo/common/ReflectMethodRecord.java b/plugins/org.eclipse.jem.beaninfo.vm.common/beaninfoCommon/org/eclipse/jem/internal/beaninfo/common/ReflectMethodRecord.java
deleted file mode 100644
index 9f11291..0000000
--- a/plugins/org.eclipse.jem.beaninfo.vm.common/beaninfoCommon/org/eclipse/jem/internal/beaninfo/common/ReflectMethodRecord.java
+++ /dev/null
@@ -1,35 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2005 IBM Corporation and others.
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
- *
- * Contributors:
- * IBM Corporation - initial API and implementation
- *******************************************************************************/
-/*
-
-
- */
-package org.eclipse.jem.internal.beaninfo.common;
-
-import java.io.Serializable;
-
-
-/**
- * This is the data structure for sending the java.lang.reflect.Method info from
- * the BeanInfo vm to the IDE vm. It is serializable so that it can
- * be serialized for transmission.
- * <p>
- * It contains the properties of the java.lang.reflect.Method.
- * @since 1.1.0
- */
-public class ReflectMethodRecord implements Serializable {
-
- private static final long serialVersionUID = 1105981512773L;
-
- public String className;
- public String methodName;
- public String[] parameterTypeNames; // Maybe null if no parameters.
-}
diff --git a/plugins/org.eclipse.jem.beaninfo.vm.common/build.properties b/plugins/org.eclipse.jem.beaninfo.vm.common/build.properties
deleted file mode 100644
index 4488430..0000000
--- a/plugins/org.eclipse.jem.beaninfo.vm.common/build.properties
+++ /dev/null
@@ -1,20 +0,0 @@
-###############################################################################
-# Copyright (c) 2003, 2006 IBM Corporation and others.
-# All rights reserved. This program and the accompanying materials
-# are made available under the terms of the Eclipse Public License v1.0
-# which accompanies this distribution, and is available at
-# http://www.eclipse.org/legal/epl-v10.html
-#
-# Contributors:
-# IBM Corporation - initial API and implementation
-###############################################################################
-src.excludes = **/.cvsignore
-bin.includes = plugin.properties,\
- about.html,\
- META-INF/,\
- .
-jars.compile.order = .
-src.includes = about.html
-source.. = beaninfoCommon/
-output.. = bin/
-
diff --git a/plugins/org.eclipse.jem.beaninfo.vm.common/plugin.properties b/plugins/org.eclipse.jem.beaninfo.vm.common/plugin.properties
deleted file mode 100644
index f651b77..0000000
--- a/plugins/org.eclipse.jem.beaninfo.vm.common/plugin.properties
+++ /dev/null
@@ -1,4 +0,0 @@
-#Properties file for org.eclipse.jem.beaninfo.vm.common
-Bundle-Name.0 = JEM Beaninfo Common Jar
-Bundle-Vendor.0 = Eclipse Web Tools Platform
-Bundle-Description.0 = This bundle is used only as a jar by the org.eclipse.jem.beaninfo bundle, so it should never be "pre-req'd" by others, only by o.e.jem.beaninfo. Other adopters would use only that o.e.jem.beaninfo bundle.
diff --git a/plugins/org.eclipse.jem.beaninfo.vm/.classpath b/plugins/org.eclipse.jem.beaninfo.vm/.classpath
deleted file mode 100644
index 18d82c6..0000000
--- a/plugins/org.eclipse.jem.beaninfo.vm/.classpath
+++ /dev/null
@@ -1,7 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<classpath>
- <classpathentry kind="con" path="org.eclipse.jdt.launching.JRE_CONTAINER/org.eclipse.jdt.internal.debug.ui.launcher.StandardVMType/J2SE-1.4"/>
- <classpathentry kind="con" path="org.eclipse.pde.core.requiredPlugins"/>
- <classpathentry kind="src" path="vm_beaninfovm"/>
- <classpathentry kind="output" path="bin"/>
-</classpath>
diff --git a/plugins/org.eclipse.jem.beaninfo.vm/.project b/plugins/org.eclipse.jem.beaninfo.vm/.project
deleted file mode 100644
index 8770b20..0000000
--- a/plugins/org.eclipse.jem.beaninfo.vm/.project
+++ /dev/null
@@ -1,28 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<projectDescription>
- <name>org.eclipse.jem.beaninfo.vm</name>
- <comment></comment>
- <projects>
- </projects>
- <buildSpec>
- <buildCommand>
- <name>org.eclipse.jdt.core.javabuilder</name>
- <arguments>
- </arguments>
- </buildCommand>
- <buildCommand>
- <name>org.eclipse.pde.ManifestBuilder</name>
- <arguments>
- </arguments>
- </buildCommand>
- <buildCommand>
- <name>org.eclipse.pde.SchemaBuilder</name>
- <arguments>
- </arguments>
- </buildCommand>
- </buildSpec>
- <natures>
- <nature>org.eclipse.pde.PluginNature</nature>
- <nature>org.eclipse.jdt.core.javanature</nature>
- </natures>
-</projectDescription>
diff --git a/plugins/org.eclipse.jem.beaninfo.vm/.settings/org.eclipse.jdt.core.prefs b/plugins/org.eclipse.jem.beaninfo.vm/.settings/org.eclipse.jdt.core.prefs
deleted file mode 100644
index 7e97998..0000000
--- a/plugins/org.eclipse.jem.beaninfo.vm/.settings/org.eclipse.jdt.core.prefs
+++ /dev/null
@@ -1,7 +0,0 @@
-#Wed Nov 26 01:23:00 EST 2008
-org.eclipse.jdt.core.compiler.problem.enumIdentifier=error
-org.eclipse.jdt.core.compiler.codegen.targetPlatform=1.2
-eclipse.preferences.version=1
-org.eclipse.jdt.core.compiler.problem.assertIdentifier=error
-org.eclipse.jdt.core.compiler.source=1.3
-org.eclipse.jdt.core.compiler.compliance=1.4
diff --git a/plugins/org.eclipse.jem.beaninfo.vm/META-INF/MANIFEST.MF b/plugins/org.eclipse.jem.beaninfo.vm/META-INF/MANIFEST.MF
deleted file mode 100644
index 5a137bd..0000000
--- a/plugins/org.eclipse.jem.beaninfo.vm/META-INF/MANIFEST.MF
+++ /dev/null
@@ -1,13 +0,0 @@
-Manifest-Version: 1.0
-Bundle-ManifestVersion: 2
-Bundle-Name: %Bundle-Name.0
-Bundle-SymbolicName: org.eclipse.jem.beaninfo.vm
-Bundle-Version: 2.0.300.qualifier
-Bundle-RequiredExecutionEnvironment: J2SE-1.4
-Bundle-Localization: plugin
-Bundle-Vendor: %Bundle-Vendor.0
-Export-Package: org.eclipse.jem.beaninfo.vm,
- org.eclipse.jem.internal.beaninfo.vm;x-internal:=true
-Require-Bundle: org.eclipse.jem.beaninfo.vm.common;bundle-version="[2.0.200,3.0.0)";visibility:=reexport
-Import-Package: org.eclipse.jem.internal.proxy.common;resolution:=optional
-Bundle-Description: %Bundle-Description.0
diff --git a/plugins/org.eclipse.jem.beaninfo.vm/about.html b/plugins/org.eclipse.jem.beaninfo.vm/about.html
deleted file mode 100644
index 5acea59..0000000
--- a/plugins/org.eclipse.jem.beaninfo.vm/about.html
+++ /dev/null
@@ -1,25 +0,0 @@
-<!DOCTYPE HTML PUBLIC "-//W3C//DTD HTML 4.0//EN">
-<html><head><title>About</title>
-
-
-
-<meta http-equiv="Content-Type" content="text/html; charset=ISO-8859-1"></head><body lang="EN-US">
-<h2>About This Content</h2>
-
-<P>June, 2008</P>
-<h3>License</h3>
-
-<p>The Eclipse Foundation makes available all content in this plug-in ("Content"). Unless otherwise
-indicated below, the Content is provided to you under the terms and conditions of the
-Eclipse Public License Version 1.0 ("EPL"). A copy of the EPL is available
-at <a href="http://www.eclipse.org/legal/epl-v10.html">http://www.eclipse.org/legal/epl-v10.html</a>.
-For purposes of the EPL, "Program" will mean the Content.</p>
-
-<p>If you did not receive this Content directly from the Eclipse Foundation, the Content is
-being redistributed by another party ("Redistributor") and different terms and conditions may
-apply to your use of any object code in the Content. Check the Redistributor's license that was
-provided with the Content. If no such license exists, contact the Redistributor. Unless otherwise
-indicated below, the terms and conditions of the EPL still apply to any source code in the Content
-and such source code may be obtained at <a href="http://www.eclipse.org/">http://www.eclipse.org</a>.</p>
-
-</body></html>
\ No newline at end of file
diff --git a/plugins/org.eclipse.jem.beaninfo.vm/build.properties b/plugins/org.eclipse.jem.beaninfo.vm/build.properties
deleted file mode 100644
index 35f8228..0000000
--- a/plugins/org.eclipse.jem.beaninfo.vm/build.properties
+++ /dev/null
@@ -1,19 +0,0 @@
-###############################################################################
-# Copyright (c) 2003, 2008 IBM Corporation and others.
-# All rights reserved. This program and the accompanying materials
-# are made available under the terms of the Eclipse Public License v1.0
-# which accompanies this distribution, and is available at
-# http://www.eclipse.org/legal/epl-v10.html
-#
-# Contributors:
-# IBM Corporation - initial API and implementation
-###############################################################################
-src.excludes = **/.cvsignore
-bin.includes = plugin.properties,\
- about.html,\
- META-INF/,\
- .
-src.includes = about.html
-source.. = vm_beaninfovm/
-output.. = bin/
-
diff --git a/plugins/org.eclipse.jem.beaninfo.vm/plugin.properties b/plugins/org.eclipse.jem.beaninfo.vm/plugin.properties
deleted file mode 100644
index 8755adf..0000000
--- a/plugins/org.eclipse.jem.beaninfo.vm/plugin.properties
+++ /dev/null
@@ -1,4 +0,0 @@
-#Properties file for org.eclipse.jem.beaninfo.vm
-Bundle-Name.0 = JEM Beaninfo VM Jar
-Bundle-Vendor.0 = Eclipse Web Tools Platform
-Bundle-Description.0 = This bundle is used only as a jar by the org.eclipse.jem.beaninfo bundle, so it should never be "pre-req'd" by others, only by o.e.jem.beaninfo. Extenders would use only that o.e.jem.beaninfo bundle.
\ No newline at end of file
diff --git a/plugins/org.eclipse.jem.beaninfo.vm/vm_beaninfovm/org/eclipse/jem/beaninfo/vm/BaseBeanInfo.java b/plugins/org.eclipse.jem.beaninfo.vm/vm_beaninfovm/org/eclipse/jem/beaninfo/vm/BaseBeanInfo.java
deleted file mode 100644
index b51b630..0000000
--- a/plugins/org.eclipse.jem.beaninfo.vm/vm_beaninfovm/org/eclipse/jem/beaninfo/vm/BaseBeanInfo.java
+++ /dev/null
@@ -1,850 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2001, 2006 IBM Corporation and others.
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
- *
- * Contributors:
- * IBM Corporation - initial API and implementation
- *******************************************************************************/
-package org.eclipse.jem.beaninfo.vm;
-
-/*
-
-
- */
-
-import java.awt.Image;
-import java.beans.*;
-import java.lang.reflect.*;
-
-import org.eclipse.jem.beaninfo.common.IBaseBeanInfoConstants;
-
-
-/**
- * A BaseBeanInfo that provides common support for BeanInfos within the JEM environment.
- *
- * @since 1.1.0
- */
-public abstract class BaseBeanInfo extends SimpleBeanInfo implements IBaseBeanInfoConstants {
-
- // Constants to use to create all descriptors etc.
- protected static java.util.ResourceBundle RESBUNDLE = java.util.ResourceBundle.getBundle("org.eclipse.jem.beaninfo.vm.beaninfo"); //$NON-NLS-1$
-
- /**
- * Bound indicator for apply property arguments.
- *
- * @since 1.1.0
- */
- public static final String BOUND = "bound";//$NON-NLS-1$
-
- /**
- * Constrained indicator for apply property arguments.
- *
- * @since 1.1.0
- */
- public static final String CONSTRAINED = "constrained";//$NON-NLS-1$
-
- /**
- * Property editor class indicator for apply property arguments.
- *
- * @since 1.1.0
- */
- public static final String PROPERTYEDITORCLASS = "propertyEditorClass";//$NON-NLS-1$
-
- /**
- * Read Method indicator for apply property arguments.
- *
- * @since 1.1.0
- */
- public static final String READMETHOD = "readMethod";//$NON-NLS-1$
-
- /**
- * Write method indicator for apply property arguments.
- *
- * @since 1.1.0
- */
- public static final String WRITEMETHOD = "writeMethod";//$NON-NLS-1$
-
- /**
- * Displayname indicator for apply property arguments.
- *
- * @since 1.1.0
- */
- public static final String DISPLAYNAME = "displayName";//$NON-NLS-1$
-
- /**
- * Expert indicator for apply property arguments.
- *
- * @since 1.1.0
- */
- public static final String EXPERT = "expert";//$NON-NLS-1$
-
- /**
- * Hidden indicator for apply property arguments.
- *
- * @since 1.1.0
- */
- public static final String HIDDEN = "hidden";//$NON-NLS-1$
-
- /**
- * Preferred indicator for apply property arguments.
- *
- * @since 1.1.0
- */
- public static final String PREFERRED = "preferred";//$NON-NLS-1$
-
- /**
- * Short description indicator for apply property arguments.
- *
- * @since 1.1.0
- */
- public static final String SHORTDESCRIPTION = "shortDescription";//$NON-NLS-1$
-
- /**
- * Customizer class indicator for apply property arguments.
- *
- * @since 1.1.0
- */
- public static final String CUSTOMIZERCLASS = "customizerClass";//$NON-NLS-1$
-
- /**
- * In Default eventset indicator for apply property arguments.
- *
- * @since 1.1.0
- */
- public static final String INDEFAULTEVENTSET = "inDefaultEventSet";//$NON-NLS-1$
-
- /**
- * This is a Feature Attribute Key. When this key exists, the value is a java.lang.reflect.Field. It means this property
- * is a field and not a getter/setter. The getter/setter will be ignored and the property type will be the type of the field.
- * <p>
- * At this time, do not use field on an indexed property. This is currently an undefined situation.
- *
- * @since 1.1.0
- */
- public static final String FIELDPROPERTY = "field"; //$NON-NLS-1$
-
- /**
- * Obscure indicator for apply property arguments. Obsure is a pre-defined attribute name too. That is where the obscure setting is stored.
- * <p>
- * Obsure means most users don't need it. In the future such features won't even be cached so as to reduce the in-memory costs. Currently this
- * flag is ignored.
- *
- * @since 1.1.0
- */
- public static final String OBSCURE = "ivjObscure";//$NON-NLS-1$
-
- /**
- * Design time indicator for apply property arguments. Design time is a pre-defined attribute name too. That is where the design time setting is
- * stored.
- * <p>
- * Design time means:
- * <ul>
- * <li>Not set: Will be a property that can be connected to, and shows on property sheet (if not hidden).
- * <li><code>true</code>: Special property (it will show on property sheet if not hidden), but it can't be connected to. Usually this is a
- * property that is fluffed up for the IDE purposes but doesn't have a get/set method. This means it is a property for design time and not for
- * runtime.
- * <li><code>false</code>: This property will not show up on property sheet but it can be connected to.
- * </ul>
- *
- * @since 1.1.0
- */
- public static final String DESIGNTIMEPROPERTY = "ivjDesignTimeProperty"; //$NON-NLS-1$
-
- /**
- * EventAdapterClass indicator for apply property arguments. Event adapter class is a pre-defined attribute name too. That is where the event
- * adapter is stored.
- * <p>
- * Adapter class for eventSetDescriptors that provide default no-op implementation of the interface methods. For example
- * <code>java.awt.event.WindowListener</code> has an adapter of <code>java.awt.event.WindowAdapter</code>. What is stored is actually the
- * class name, not the class itself.
- *
- * @since 1.1.0
- */
- public static final String EVENTADAPTERCLASS = "eventAdapterClass"; //$NON-NLS-1$
-
-
- public static final boolean JVM_1_3 = System.getProperty("java.version", "").startsWith("1.3"); //$NON-NLS-1$ //$NON-NLS-2$ //$NON-NLS-3$
-
- /**
- * Empty args list for those descriptors that don't have arguments.
- * @since 1.1.0
- */
- public static final Object[] EMPTY_ARGS = new Object[0];
-
- /**
- * Capitalize the string. This uppercases only the first character. So if you have property name of "abc" it will become "Abc".
- *
- * @param s
- * @return string with first letter capitalized.
- *
- * @since 1.1.0
- */
- public static String capitalize(String s) {
- if (s.length() == 0) { return s; }
- char chars[] = s.toCharArray();
- chars[0] = Character.toUpperCase(chars[0]);
- return new String(chars);
- }
-
- /**
- * Create a BeanDescriptor object given an array of keyword/value arguments. Use the keywords defined in this class, e.g. BOUND, EXPERT, etc.
- *
- * @param cls
- * bean for which the bean descriptor is being created.
- * @param args
- * arg pairs, [0] keyword, [1] value, [2] keyword, [3] value, etc. or null if no args
- * @return new bean descriptor
- *
- * @since 1.1.0
- */
- public static BeanDescriptor createBeanDescriptor(Class cls, Object[] args) {
- Class customizerClass = null;
-
- if (args != null) {
- /* Find the specified customizerClass */
- for (int i = 0; i < args.length; i += 2) {
- if (CUSTOMIZERCLASS.equals(args[i])) {
- customizerClass = (Class) args[i + 1];
- break;
- }
- }
- }
-
- BeanDescriptor bd = new BeanDescriptor(cls, customizerClass);
-
- if (args != null) {
- for (int i = 0; i < args.length; i += 2) {
- String key = (String) args[i];
- Object value = args[i + 1];
- setFeatureDescriptorValue(bd, key, value);
- }
- }
- return bd;
- }
-
- /**
- * Create a beans EventSetDescriptor given the following:
- *
- * @param cls
- * The bean class
- * @param name
- * Name of event set
- * @param args
- * arg pairs, [0] keyword, [1] value, [2] keyword, [3] value, etc. or null if no args.
- * @param lmds
- * array of MethodDescriptors defining the listener methods
- * @param listenerType
- * type of listener
- * @param addListenerName
- * add listener method name
- * @param removeListenerNameremove
- * listener method name
- * @return new event set descriptor
- * @since 1.1.0
- */
- public static EventSetDescriptor createEventSetDescriptor(Class cls, String name, Object[] args, MethodDescriptor[] lmds, Class listenerType,
- String addListenerName, String removeListenerName) {
- EventSetDescriptor esd = null;
- Class[] paramTypes = { listenerType};
- try {
- java.lang.reflect.Method addMethod = null;
- java.lang.reflect.Method removeMethod = null;
- try {
- /* get addListenerMethod with parameter types. */
- addMethod = cls.getMethod(addListenerName, paramTypes);
- } catch (Exception ie) {
- throwError(ie, java.text.MessageFormat.format(RESBUNDLE.getString("Cannot_get_the_meth1_EXC_"), //$NON-NLS-1$
- new Object[] { addListenerName}));
- }
- ;
- try {
- /* get removeListenerMethod with parameter types. */
- removeMethod = cls.getMethod(removeListenerName, paramTypes);
- } catch (Exception ie) {
- throwError(ie, java.text.MessageFormat.format(RESBUNDLE.getString("Cannot_get_the_meth1_EXC_"), //$NON-NLS-1$
- new Object[] { removeListenerName}));
- }
- ;
-
- esd = new EventSetDescriptor(name, listenerType, lmds, addMethod, removeMethod);
- } catch (Exception ie) {
- throwError(ie, java.text.MessageFormat.format(RESBUNDLE.getString("Cannot_create_the_E1_EXC_"), //$NON-NLS-1$
- new Object[] { name}));
- }
- ;
- if (args != null) {
- // set the event set descriptor properties
- for (int i = 0; i < args.length; i += 2) {
- String key = (String) args[i];
- Object value = args[i + 1];
- if (INDEFAULTEVENTSET.equals(key)) {
- esd.setInDefaultEventSet(((Boolean) value).booleanValue());
- } else
- setFeatureDescriptorValue(esd, key, value);
- }
- }
- return esd;
- }
-
- /**
- * Create a bean's MethodDescriptor.
- *
- * @param cls
- * class of the method.
- * @param name
- * name of the method.
- * @param args
- * arg pairs, [0] keyword, [1] value, [2] keyword, [3] value, etc. or null if no args
- * @param params
- * parameter descriptors or <code>null</code> if no parameter descriptors.
- * @param paramTypes
- * parameter types
- * @return new method descriptor
- *
- * @since 1.1.0
- */
- public static MethodDescriptor createMethodDescriptor(Class cls, String name, Object[] args, ParameterDescriptor[] params, Class[] paramTypes) {
- MethodDescriptor md = null;
- try {
- java.lang.reflect.Method aMethod = null;
- try {
- /* getMethod with parameter types. */
- aMethod = cls.getMethod(name, paramTypes);
- } catch (Exception ie) {
- throwError(ie, java.text.MessageFormat.format(RESBUNDLE.getString("Cannot_get_the_meth1_EXC_"), //$NON-NLS-1$
- new Object[] { name}));
- }
- ;
- if (params != null && params.length > 0)
- md = new MethodDescriptor(aMethod, params);
- else
- md = new MethodDescriptor(aMethod);
- } catch (Exception ie) {
- throwError(ie, java.text.MessageFormat.format(RESBUNDLE.getString("Cannot_create_Method_EXC_"), //$NON-NLS-1$
- new Object[] { name}));
- }
- ;
- if (args != null) {
- // set the method properties
- for (int i = 0; i < args.length; i += 2) {
- String key = (String) args[i];
- Object value = args[i + 1];
- setFeatureDescriptorValue(md, key, value);
- }
- }
- return md;
- }
-
- private static PropertyDescriptor createOtherPropertyDescriptor(String name, Class cls) throws IntrospectionException {
- Method readMethod = null;
- Method writeMethod = null;
- String base = capitalize(name);
- Class[] parameters = new Class[0];
-
- // First we try boolean accessor pattern
- try {
- readMethod = cls.getMethod("is" + base, parameters);//$NON-NLS-1$
- } catch (Exception ex1) {
- }
- if (readMethod == null) {
- try {
- // Else we try the get accessor pattern.
- readMethod = cls.getMethod("get" + base, parameters);//$NON-NLS-1$
- } catch (Exception ex2) {
- // Find by matching methods of the class
- readMethod = findMethod(cls, "get" + base, 0);//$NON-NLS-1$
- }
- }
-
- if (readMethod == null) {
- // For write-only properties, find the write method
- writeMethod = findMethod(cls, "set" + base, 1);//$NON-NLS-1$
- } else {
- // In Sun's code, reflection fails if there are two
- // setters with the same name and the first setter located
- // does not have the same return type of the getter.
- // This fixes that.
- parameters = new Class[1];
- parameters[0] = readMethod.getReturnType();
- try {
- writeMethod = cls.getMethod("set" + base, parameters);//$NON-NLS-1$
- } catch (Exception ex3) {
- }
- }
- // create the property descriptor
- if ((readMethod != null) || (writeMethod != null)) {
- return new PropertyDescriptor(name, readMethod, writeMethod);
- } else {
- throw new IntrospectionException(java.text.MessageFormat.format(RESBUNDLE.getString("Cannot_find_the_acc1_EXC_"), //$NON-NLS-1$
- new Object[] { name}));
- }
- }
-
- /**
- * Create a beans parameter descriptor.
- *
- * @param name
- * name of parameter
- * @param args
- * arg pairs, [0] keyword, [1] value, [2] keyword, [3] value, etc. or null if no args
- * @return new parameter descriptor
- *
- * @since 1.1.0
- */
- public static ParameterDescriptor createParameterDescriptor(String name, Object[] args) {
- ParameterDescriptor pd = null;
- try {
- pd = new ParameterDescriptor();
- } catch (Exception ie) {
- throwError(ie, java.text.MessageFormat.format(RESBUNDLE.getString("Cannot_create_Param1_EXC_"), //$NON-NLS-1$
- new Object[] { name}));
- }
- ;
- // set the name
- pd.setName(name);
- if (args != null) {
- // set the method properties
- for (int i = 0; i < args.length; i += 2) {
- String key = (String) args[i];
- Object value = args[i + 1];
- setFeatureDescriptorValue(pd, key, value);
- }
- }
- return pd;
- }
-
- private static Method GETCLASS;
-
- static {
- try {
- GETCLASS = Object.class.getMethod("getClass", (Class[]) null); //$NON-NLS-1$
- } catch (SecurityException e) {
- } catch (NoSuchMethodException e) {
- }
- }
- /**
- * Create a property descriptor describing a field property.
- * <p>
- * Note: This is non-standard. The VE knows how to handle this, but any one else using BeanInfo will see this as a property with
- * no getter or setter.
- * @param name
- * @param field
- * @param args arg pairs, [0] keyword, [1] value, [2] keyword, [3] value, etc. or null if no args
- * @return
- *
- * @since 1.1.0
- */
- public static PropertyDescriptor createFieldPropertyDescriptor(String name, Field field, Object[] args) {
- try {
- PropertyDescriptor pd = new PropertyDescriptor(name, null, null);
- pd.setValue(FIELDPROPERTY, field); // Set the field property so we know it is a field.
- applyFieldArguments(pd, args);
- // Need to set in a phony read method because Introspector will throw it away otherwise. We just use Object.getClass for this.
- // We will ignore the property type for fields. If used outside of VE then it will look like a class property.
- pd.setReadMethod(GETCLASS);
- return pd;
- } catch (IntrospectionException e) {
- throwError(e, java.text.MessageFormat.format(RESBUNDLE.getString("Cannot_create_the_P1_EXC_"), //$NON-NLS-1$
- new Object[] { name}));
- return null;
- }
- }
-
- /**
- * Create a bean's property descriptor.
- *
- * @param cls
- * class of who owns the property (usually the bean). It is used to look up get/set methods for the property.
- * @param name
- * name of the property. It will use get{Name} and set{Name} to find get/set methods.
- * @param args
- * arg pairs, [0] keyword, [1] value, [2] keyword, [3] value, etc.
- * @return new property descriptor
- *
- * @since 1.1.0
- */
- public static PropertyDescriptor createPropertyDescriptor(Class cls, String name, Object[] args) {
- PropertyDescriptor pd = null;
- try {
- // Create assuming that the getter/setter follows reflection patterns
- pd = new PropertyDescriptor(name, cls);
- } catch (IntrospectionException e) {
- // Try creating a property descriptor for read-only, write-only
- // or if Sun's reflection fails
- try {
- pd = createOtherPropertyDescriptor(name, cls);
- } catch (IntrospectionException ie) {
- throwError(ie, java.text.MessageFormat.format(RESBUNDLE.getString("Cannot_create_the_P1_EXC_"), //$NON-NLS-1$
- new Object[] { name}));
- }
- }
-
- applyPropertyArguments(pd, args, cls);
-
- return pd;
- }
-
-
- /**
- * Create a new PropertyDescriptor based upon the PD sent in. It will clone the sent in one, and apply the args to override any specific setting.
- * Class cls is used for finding read/write methods, if any.
- *
- * This is used when wanting to override only a few specific settings from a property descriptor from the super class.
- *
- * @param fromPDS
- * The PropertyDescriptor array to find the entry to clone. It will be changed in place in the array.
- * @param name
- * The name of the property to find and clone and override.
- * @param cls
- * The class to use to find read/write methods in args. If no read/write methods specified, then this may be null.
- * @param args
- * The arguments to override from fromPD. arg pairs, [0] keyword, [1] value, [2] keyword, [3] value, etc. or null if none to override
- */
- public void replacePropertyDescriptor(PropertyDescriptor[] pds, String name, Class cls, Object[] args) {
- PropertyDescriptor pd = null;
- int iPD = findPropertyDescriptor(pds, name);
- if (iPD == -1)
- return;
- PropertyDescriptor fromPD = pds[iPD];
- try {
-
- pd = pds[iPD] = new PropertyDescriptor(fromPD.getName(), null, null);
- } catch (IntrospectionException e) {
- throwError(e, java.text.MessageFormat.format(RESBUNDLE.getString("Cannot_create_the_P1_EXC_"), //$NON-NLS-1$
- new Object[] { fromPD.getName()}));
- }
-
- // Now copy over the contents of fromPD.
- clonePropertySettings(fromPD, pd);
-
- // Now apply the overrides
- applyPropertyArguments(pd, args, cls);
- return;
- }
-
- private void clonePropertySettings(PropertyDescriptor fromPD, PropertyDescriptor pd) {
- try {
- pd.setReadMethod(fromPD.getReadMethod());
- pd.setWriteMethod(fromPD.getWriteMethod());
- pd.setPropertyEditorClass(fromPD.getPropertyEditorClass());
- pd.setBound(fromPD.isBound());
- pd.setConstrained(fromPD.isConstrained());
- cloneFeatureSettings(fromPD, pd);
- } catch (IntrospectionException e) {
- throwError(e, java.text.MessageFormat.format(RESBUNDLE.getString("Cannot_create_the_P1_EXC_"), //$NON-NLS-1$
- new Object[] { fromPD.getName()}));
- }
- }
-
- private void cloneFeatureSettings(FeatureDescriptor fromFD, FeatureDescriptor fd) {
- fd.setExpert(fromFD.isExpert());
- fd.setHidden(fromFD.isHidden());
- fd.setPreferred(fromFD.isPreferred());
- fd.setShortDescription(fromFD.getShortDescription());
- fd.setDisplayName(fromFD.getDisplayName());
-
- java.util.Enumeration keys = fromFD.attributeNames();
- while (keys.hasMoreElements()) {
- String key = (String) keys.nextElement();
- Object value = fromFD.getValue(key);
- fd.setValue(key, value);
- }
- }
-
- /*
- * The common property arguments between field and standard properties.
- */
- private static boolean applyCommonPropertyArguments(PropertyDescriptor pd, String key, Object value) {
- if (BOUND.equals(key)) {
- pd.setBound(((Boolean) value).booleanValue());
- } else if (CONSTRAINED.equals(key)) {
- pd.setConstrained(((Boolean) value).booleanValue());
- } else if (PROPERTYEDITORCLASS.equals(key)) {
- pd.setPropertyEditorClass((Class) value);
- } else if (FIELDPROPERTY.equals(key))
- return true; // This should not be applied except through createFieldProperty.
- else
- return false;
- return true;
-
- }
-
- private static void applyPropertyArguments(PropertyDescriptor pd, Object[] args, Class cls) {
- if (args != null) {
- for (int i = 0; i < args.length; i += 2) {
- String key = (String) args[i];
- Object value = args[i + 1];
-
- if (!applyCommonPropertyArguments(pd, key, value)) {
- if (READMETHOD.equals(key)) {
- String methodName = (String) value;
- Method method;
- try {
- method = cls.getMethod(methodName, new Class[0]);
- pd.setReadMethod(method);
- } catch (Exception e) {
- throwError(e, java.text.MessageFormat.format(RESBUNDLE.getString("{0}_no_read_method_EXC_"), //$NON-NLS-1$
- new Object[] { cls, methodName}));
- }
- } else if (WRITEMETHOD.equals(key)) {
- String methodName = (String) value;
- try {
- if (methodName == null) {
- pd.setWriteMethod(null);
- } else {
- Method method;
- Class type = pd.getPropertyType();
- method = cls.getMethod(methodName, new Class[] { type});
- pd.setWriteMethod(method);
- }
- } catch (Exception e) {
- throwError(e, java.text.MessageFormat.format(RESBUNDLE.getString("{0}_no_write_method_EXC_"), //$NON-NLS-1$
- new Object[] { cls, methodName}));
- }
- } else {
- // arbitrary value
- setFeatureDescriptorValue(pd, key, value);
- }
- }
- }
- }
- }
-
- private static void applyFieldArguments(PropertyDescriptor pd, Object[] args) {
- if (args != null) {
- for (int i = 0; i < args.length; i += 2) {
- String key = (String) args[i];
- Object value = args[i + 1];
-
- if (!applyCommonPropertyArguments(pd, key, value)) {
- if (READMETHOD.equals(key)) {
- // ignored for field.
- } else if (WRITEMETHOD.equals(key)) {
- // ignored for field.
- } else {
- // arbitrary value
- setFeatureDescriptorValue(pd, key, value);
- }
- }
- }
- }
- }
-
- /**
- * Find the method by comparing (name & parameter size) against the methods in the class. This is an expensive call and should be used only if
- * getMethod with specific parameter types can't find method.
- *
- * @return java.lang.reflect.Method
- * @param aClass
- * java.lang.Class
- * @param methodName
- * java.lang.String
- * @param parameterCount
- * int
- */
- public static java.lang.reflect.Method findMethod(java.lang.Class aClass, java.lang.String methodName, int parameterCount) {
- try {
- /*
- * Since this method attempts to find a method by getting all methods from the class, this method should only be called if getMethod
- * cannot find the method.
- */
- java.lang.reflect.Method methods[] = aClass.getMethods();
- for (int index = 0; index < methods.length; index++) {
- java.lang.reflect.Method method = methods[index];
- if ((method.getParameterTypes().length == parameterCount) && (method.getName().equals(methodName))) { return method; }
- ;
- }
- ;
- } catch (java.lang.Throwable exception) {
- return null;
- }
- ;
- return null;
- }
-
- /**
- * Find a property descriptor of a given name in the list.
- *
- * @param pds
- * The array of property descriptors to search, may be null.
- * @param name
- * The name to search for.
- * @return The found property descriptor index, or -1 if not found.
- */
- public static int findPropertyDescriptor(PropertyDescriptor[] pds, String name) {
- for (int i = 0; i < pds.length; i++) {
- if (name.equals(pds[i].getName()))
- return i;
- }
- return -1;
- }
-
- /*
- * (non-Javadoc)
- *
- * @see java.beans.BeanInfo#getDefaultEventIndex()
- */
- public int getDefaultEventIndex() {
- return -1;
- }
-
- /*
- * (non-Javadoc)
- *
- * @see java.beans.BeanInfo#getDefaultPropertyIndex()
- */
- public int getDefaultPropertyIndex() {
- return -1;
- }
-
-
- /* (non-Javadoc)
- * @see java.beans.SimpleBeanInfo#getBeanDescriptor()
- */
- public BeanDescriptor getBeanDescriptor() {
- // Default is to create an empty one.
- return createBeanDescriptor(getBeanClass(), EMPTY_ARGS);
- }
-
- /**
- * Implementation for BeanInfo. This implementation will return the BeanInfo of the superclass.
- *
- * @see BeanInfo#getAdditionalBeanInfo()
- * @since 1.1.0
- */
- public BeanInfo[] getAdditionalBeanInfo() {
- try {
- BeanInfo[] result = new BeanInfo[] { Introspector.getBeanInfo(getBeanClass().getSuperclass())};
- PropertyDescriptor[] oPDs = result[0].getPropertyDescriptors();
- PropertyDescriptor[] nPDs = overridePropertyDescriptors(oPDs);
- if (oPDs != nPDs)
- result[0] = new OverridePDBeanInfo(result[0], nPDs);
- return result;
- } catch (IntrospectionException e) {
- return new BeanInfo[0];
- }
- }
-
- private static class OverridePDBeanInfo implements BeanInfo {
-
- private BeanInfo originalBeanInfo;
-
- private PropertyDescriptor[] overridePDs;
-
- public OverridePDBeanInfo(BeanInfo bi, PropertyDescriptor[] pds) {
- originalBeanInfo = bi;
- overridePDs = pds;
- }
-
- public BeanInfo[] getAdditionalBeanInfo() {
- return originalBeanInfo.getAdditionalBeanInfo();
- }
-
- public BeanDescriptor getBeanDescriptor() {
- return originalBeanInfo.getBeanDescriptor();
- }
-
- public int getDefaultEventIndex() {
- return originalBeanInfo.getDefaultEventIndex();
- }
-
- public int getDefaultPropertyIndex() {
- return originalBeanInfo.getDefaultPropertyIndex();
- }
-
- public EventSetDescriptor[] getEventSetDescriptors() {
- return originalBeanInfo.getEventSetDescriptors();
- }
-
- public Image getIcon(int iconKind) {
- return originalBeanInfo.getIcon(iconKind);
- }
-
- public MethodDescriptor[] getMethodDescriptors() {
- return originalBeanInfo.getMethodDescriptors();
- }
-
- public PropertyDescriptor[] getPropertyDescriptors() {
- return overridePDs;
- }
- }
-
- /**
- * Allow overrides to parent beaninfo. Subclasses should override this method if they wish to override and change any inherited properties. This
- * allows removal of inherited properties or changes of specific properties (such as change from hidden to not hidden).
- *
- * Note: If there any changes, this must return a DIFFERENT array. If it returns the same array, then the changes will not be accepted. If just
- * overriding, should use pds.clone() to get the new array and then change the specific entries.
- *
- * @param pds
- * @return The new changed array or the same array if no changes.
- * @since 1.1.0
- */
- protected PropertyDescriptor[] overridePropertyDescriptors(PropertyDescriptor[] pds) {
- return pds;
- }
-
- /**
- * Get the bean class this beaninfo is for. Used by subclasses to quickly get the bean class without having to code it over and over.
- *
- * @return bean class for this beaninfo.
- *
- * @since 1.1.0
- */
- public abstract Class getBeanClass();
-
- /**
- * Called whenever the bean information class throws an exception. By default it prints a message and then a stacktrace to sys err.
- *
- * @param exception
- * java.lang.Throwable
- * @since 1.1.0
- */
- public void handleException(Throwable exception) {
- System.err.println(RESBUNDLE.getString("UNCAUGHT_EXC_")); //$NON-NLS-1$
- exception.printStackTrace();
- }
-
- private static void setFeatureDescriptorValue(FeatureDescriptor fd, String key, Object value) {
- if (DISPLAYNAME.equals(key)) {
- fd.setDisplayName((String) value);
- } else if (EXPERT.equals(key)) {
- fd.setExpert(((Boolean) value).booleanValue());
- } else if (HIDDEN.equals(key)) {
- fd.setHidden(((Boolean) value).booleanValue());
- } else if (PREFERRED.equals(key)) {
- fd.setPreferred(((Boolean) value).booleanValue());
- if (JVM_1_3) {
- // Bug in 1.3 doesn't preserve the preferred flag, so we will put it into the attributes too.
- fd.setValue(PREFERRED, value);
- }
- } else if (SHORTDESCRIPTION.equals(key)) {
- fd.setShortDescription((String) value);
- }
- // Otherwise assume an arbitrary-named value
- // Assume that the FeatureDescriptor private hashTable\
- // contains only arbitrary-named attributes
- else {
- fd.setValue(key, value);
- }
- }
-
- /**
- * Fatal errors are handled by calling this method. By default it throws an Error exception.
- *
- * @param e
- * exception exception message placed into the new Error thrown.
- * @param s
- * message added to exception message. <code>null</code> if nothing to add.
- *
- * @throws Error
- * turns exception into an Error.
- * @since 1.1.0
- */
- protected static void throwError(Exception e, String s) {
- throw new Error(e.toString() + " " + s);//$NON-NLS-1$
- }
-}
diff --git a/plugins/org.eclipse.jem.beaninfo.vm/vm_beaninfovm/org/eclipse/jem/beaninfo/vm/basebeaninfonls.properties b/plugins/org.eclipse.jem.beaninfo.vm/vm_beaninfovm/org/eclipse/jem/beaninfo/vm/basebeaninfonls.properties
deleted file mode 100644
index 5a2a5a9..0000000
--- a/plugins/org.eclipse.jem.beaninfo.vm/vm_beaninfovm/org/eclipse/jem/beaninfo/vm/basebeaninfonls.properties
+++ /dev/null
@@ -1,31 +0,0 @@
-###############################################################################
-# Copyright (c) 2003, 2005 IBM Corporation and others.
-# All rights reserved. This program and the accompanying materials
-# are made available under the terms of the Eclipse Public License v1.0
-# which accompanies this distribution, and is available at
-# http://www.eclipse.org/legal/epl-v10.html
-#
-# Contributors:
-# IBM Corporation - initial API and implementation
-###############################################################################
-#
-# $Source: /cvsroot/webtools/jeetools.move/webtools.javaee.git/plugins/org.eclipse.jem.beaninfo.vm/vm_beaninfovm/org/eclipse/jem/beaninfo/vm/basebeaninfonls.properties,v $
-# $Revision: 1.1 $ $Date: 2008/11/26 06:40:21 $
-#
-
-
-#
-# Properties for the IvjBeanInfo
-#
-
-#
-# IvjBeanInfo Strings
-#
-Cannot_get_the_meth1_EXC_ = IWAV0011E Cannot get the method {0}.
-Cannot_create_the_E1_EXC_ = IWAV0012E Cannot create the EventSetDescriptor for {0}.
-Cannot_create_Method_EXC_ = IWAV0013E Cannot create the MethodDescriptor for {0}.
-Cannot_find_the_acc1_EXC_ = IWAV0014E Cannot find at least the write or read accessor for property {0}.
-Cannot_create_Param1_EXC_ = IWAV0015E Cannot create the ParameterDescriptor for {0}.
-Cannot_create_the_P1 = Cannot create the PropertyDescriptor for {0}.
-{0}_no_read_method_EXC_ = IWAV0016E Class {0} doesn''t have the requested read accessor {1}.
-{0}_no_write_method_EXC_ = IWAV0017E Class {0} doesn''t have the requested write accessor {1}.
diff --git a/plugins/org.eclipse.jem.beaninfo.vm/vm_beaninfovm/org/eclipse/jem/beaninfo/vm/beaninfo.properties b/plugins/org.eclipse.jem.beaninfo.vm/vm_beaninfovm/org/eclipse/jem/beaninfo/vm/beaninfo.properties
deleted file mode 100644
index 26e8ded..0000000
--- a/plugins/org.eclipse.jem.beaninfo.vm/vm_beaninfovm/org/eclipse/jem/beaninfo/vm/beaninfo.properties
+++ /dev/null
@@ -1,32 +0,0 @@
-###############################################################################
-# Copyright (c) 2003, 2005 IBM Corporation and others.
-# All rights reserved. This program and the accompanying materials
-# are made available under the terms of the Eclipse Public License v1.0
-# which accompanies this distribution, and is available at
-# http://www.eclipse.org/legal/epl-v10.html
-#
-# Contributors:
-# IBM Corporation - initial API and implementation
-###############################################################################
-#
-# $Source: /cvsroot/webtools/jeetools.move/webtools.javaee.git/plugins/org.eclipse.jem.beaninfo.vm/vm_beaninfovm/org/eclipse/jem/beaninfo/vm/beaninfo.properties,v $
-# $Revision: 1.1 $ $Date: 2008/11/26 06:40:21 $
-#
-
-
-#
-# Properties for the VCE Beaninfo
-#
-
-#
-# IvjBeanInfo Strings
-#
-Cannot_get_the_meth1_EXC_ = IWAV0007E Cannot get the method {0}.
-Cannot_create_the_E1_EXC_ = IWAV0008E Cannot create the EventSetDescriptor for {0}.
-Cannot_create_Method_EXC_ = IWAV0009E Cannot create the MethodDescriptor for {0}.
-Cannot_find_the_acc1_EXC_ = IWAV0010E Cannot find at least the write or read accessor for property {0}.
-Cannot_create_Param1_EXC_ = IWAV0146E Cannot create the ParameterDescriptor for {0}.
-Cannot_create_the_P1_EXC_ = IWAV0147E Cannot create the PropertyDescriptor for {0}.
-{0}_no_read_method_EXC_ = IWAV0148E Class {0} doesn''t have the requested read accessor {1}.
-{0}_no_write_method_EXC_ = IWAV0149E Class {0} doesn''t have the requested write accessor {1}.
-UNCAUGHT_EXC_ = IWAV0123E --------- UNCAUGHT EXCEPTION ---------
diff --git a/plugins/org.eclipse.jem.beaninfo.vm/vm_beaninfovm/org/eclipse/jem/internal/beaninfo/vm/BeanDescriptorEquality.java b/plugins/org.eclipse.jem.beaninfo.vm/vm_beaninfovm/org/eclipse/jem/internal/beaninfo/vm/BeanDescriptorEquality.java
deleted file mode 100644
index 3c99de2..0000000
--- a/plugins/org.eclipse.jem.beaninfo.vm/vm_beaninfovm/org/eclipse/jem/internal/beaninfo/vm/BeanDescriptorEquality.java
+++ /dev/null
@@ -1,77 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2001, 2005 IBM Corporation and others.
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
- *
- * Contributors:
- * IBM Corporation - initial API and implementation
- *******************************************************************************/
-package org.eclipse.jem.internal.beaninfo.vm;
-/*
-
-
- */
-
-import java.beans.*;
-/**
- * Equality tester for BeanDescriptors
- */
-public class BeanDescriptorEquality extends FeatureDescriptorEquality {
- static void INIT() {
- try {
- MAP_EQUALITY.put(BeanDescriptor.class, (BeanDescriptorEquality.class).getConstructor(new Class[] {BeanDescriptor.class}));
- } catch (NoSuchMethodException e) {
- }
- }
-
- /**
- * Constructor for BeanDescriptorEquality.
- */
- public BeanDescriptorEquality() {
- super();
- }
-
-
- public BeanDescriptorEquality(BeanDescriptor descr) {
- super(descr);
- }
-
- /**
- * Calculate the hashcode for the current feature, add this
- * to the hashcode received from super.calculateHashCode
- * and return the new value.
- *
- * NOTE: for subclasses, it is MANDITORY that the first line be:
- * int hashcode = super.calculateHashCode();
- * and the last line be:
- * return hashcode*31 + (your calculated hashcode for just this subclass);
- */
- protected int calculateHashCode() {
- int hashcode = super.calculateHashCode();
- BeanDescriptor bd = (BeanDescriptor) fFeature;
- int hc = bd.getBeanClass().hashCode();
- if (bd.getCustomizerClass() != null)
- hc += bd.getCustomizerClass().hashCode();
-
- return hashcode*31 + hc;
- }
-
- public boolean equals(Object obj) {
- if (identityTest(obj))
- return true;
- if (!super.equals(obj))
- return false;
-
- BeanDescriptor ob = (BeanDescriptor) ((FeatureDescriptorEquality) obj).fFeature;
- BeanDescriptor fb = (BeanDescriptor) fFeature;
-
- if (ob.getBeanClass() != fb.getBeanClass())
- return false;
- if (ob.getCustomizerClass() != fb.getCustomizerClass())
- return false;
-
- return true;
- }
-}
diff --git a/plugins/org.eclipse.jem.beaninfo.vm/vm_beaninfovm/org/eclipse/jem/internal/beaninfo/vm/EventSetDescriptorEquality.java b/plugins/org.eclipse.jem.beaninfo.vm/vm_beaninfovm/org/eclipse/jem/internal/beaninfo/vm/EventSetDescriptorEquality.java
deleted file mode 100644
index b53aa8a..0000000
--- a/plugins/org.eclipse.jem.beaninfo.vm/vm_beaninfovm/org/eclipse/jem/internal/beaninfo/vm/EventSetDescriptorEquality.java
+++ /dev/null
@@ -1,145 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2001, 2005 IBM Corporation and others.
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
- *
- * Contributors:
- * IBM Corporation - initial API and implementation
- *******************************************************************************/
-package org.eclipse.jem.internal.beaninfo.vm;
-/*
-
-
- */
-
-import java.beans.*;
-import java.util.*;
-import java.lang.reflect.Method;
-/**
- * Equality tester for EventSetDescriptors
- */
-public class EventSetDescriptorEquality extends FeatureDescriptorEquality {
-
- static void INIT() {
- try {
- MAP_EQUALITY.put(EventSetDescriptor.class, (EventSetDescriptorEquality.class).getConstructor(new Class[] {EventSetDescriptor.class}));
- } catch (NoSuchMethodException e) {
- }
- }
-
- private ArrayList fListenerMethodDescriptors; // Array of MethodDescriptorEquality's.
-
- /**
- * Constructor for EventSetDescriptorEquality.
- */
- public EventSetDescriptorEquality() {
- super();
- }
-
-
- public EventSetDescriptorEquality(EventSetDescriptor descr) {
- super(descr);
- }
-
- /**
- * A new feature is being set into this object,
- * clear any cache members so that they can be reconstructed.
- *
- * NOTE: Subclasses - remember to call super.clearFeature();
- */
- protected void clearFeature() {
- super.clearFeature();
- fListenerMethodDescriptors = null;
- }
-
- protected ArrayList listenerMethodDescriptors() {
- if (fListenerMethodDescriptors == null) {
- MethodDescriptor[] mds = ((EventSetDescriptor) fFeature).getListenerMethodDescriptors();
- fListenerMethodDescriptors = new ArrayList(mds.length);
- for (int i=0; i<mds.length; i++)
- fListenerMethodDescriptors.add(new MethodDescriptorEquality(mds[i]));
- }
- return fListenerMethodDescriptors;
- }
-
- /**
- * Calculate the hashcode for the current feature, add this
- * to the hashcode received from super.calculateHashCode
- * and return the new value.
- *
- * NOTE: for subclasses, it is MANDITORY that the first line be:
- * int hashcode = super.calculateHashCode();
- * and the last line be:
- * return hashcode*31 + (your calculated hashcode for just this subclass);
- */
- protected int calculateHashCode() {
- int hashcode = super.calculateHashCode();
- EventSetDescriptor bd = (EventSetDescriptor) fFeature;
- int hc = bd.getAddListenerMethod().hashCode();
- Method[] methods = bd.getListenerMethods();
- int mhc = 0;
- for (int i=0; i<methods.length; i++)
- mhc = mhc*31 + methods[i].hashCode();
- hc += mhc;
- hc += listenerMethodDescriptors().hashCode();
- hc += bd.getListenerType().hashCode();
- hc += bd.getRemoveListenerMethod().hashCode();
- hc += (bd.isInDefaultEventSet() ? Boolean.TRUE : Boolean.FALSE).hashCode();
- hc += (bd.isUnicast() ? Boolean.TRUE : Boolean.FALSE).hashCode();
-
- return hashcode*31 + hc;
- }
-
-
- public boolean equals(Object obj) {
- if (identityTest(obj))
- return true;
-
- if (!super.equals(obj))
- return false;
-
- EventSetDescriptor oe = (EventSetDescriptor) ((FeatureDescriptorEquality) obj).fFeature;
- EventSetDescriptor fe = (EventSetDescriptor) fFeature;
-
- EventSetDescriptorEquality oee = (EventSetDescriptorEquality) obj;
-
- if (!oe.getAddListenerMethod().equals(fe.getAddListenerMethod()))
- return false;
- if (!java.util.Arrays.equals(oe.getListenerMethods(), fe.getListenerMethods()))
- return false;
- if (oe.getListenerType() != fe.getListenerType())
- return false;
- if (oe.getRemoveListenerMethod() != fe.getRemoveListenerMethod())
- return false;
- if (oe.isInDefaultEventSet() != fe.isInDefaultEventSet())
- return false;
- if (oe.isUnicast() != oe.isUnicast())
- return false;
-
- if (fListenerMethodDescriptors != null || oee.fListenerMethodDescriptors != null) {
- // We are in a Map lookup situation, so one side has listener method equalities, so we will compare that way.
- if (!oee.listenerMethodDescriptors().equals(listenerMethodDescriptors()))
- return false;
- } else {
- // We are in the building the list phases, don't waste space building entire list.
- MethodDescriptor[] ours = fe.getListenerMethodDescriptors();
- MethodDescriptor[] theirs = oe.getListenerMethodDescriptors();
- if (ours.length != theirs.length)
- return false;
- if (ours.length > 0) {
- MethodDescriptorEquality workingOurs = new MethodDescriptorEquality();
- MethodDescriptorEquality workingThiers = new MethodDescriptorEquality();
- for (int i = 0; i < ours.length; i++) {
- workingOurs.setFeature(ours[i]);
- workingThiers.setFeature(theirs[i]);
- if (!workingOurs.equals(workingThiers))
- return false;
- }
- }
- }
-
- return true;
- }
-}
diff --git a/plugins/org.eclipse.jem.beaninfo.vm/vm_beaninfovm/org/eclipse/jem/internal/beaninfo/vm/FeatureDescriptorEquality.java b/plugins/org.eclipse.jem.beaninfo.vm/vm_beaninfovm/org/eclipse/jem/internal/beaninfo/vm/FeatureDescriptorEquality.java
deleted file mode 100644
index 9888393..0000000
--- a/plugins/org.eclipse.jem.beaninfo.vm/vm_beaninfovm/org/eclipse/jem/internal/beaninfo/vm/FeatureDescriptorEquality.java
+++ /dev/null
@@ -1,201 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2001, 2005 IBM Corporation and others.
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
- *
- * Contributors:
- * IBM Corporation - initial API and implementation
- *******************************************************************************/
-package org.eclipse.jem.internal.beaninfo.vm;
-/*
-
-
- */
-
-import java.beans.*;
-import java.util.*;
-import java.lang.reflect.*;
-/**
- * This object is used to test for semantic equality (equals())
- * between feature objects. It is needed because Feature's don't
- * provide a semantic equality, only an identity equality. Need
- * semantic equality so that keys in map can be found equal
- * semantically.
- */
-
-public class FeatureDescriptorEquality {
- protected FeatureDescriptor fFeature;
-
- private HashMap fValues; // The key/values for this feature. We grab them out
- // so that we don't have to keep re-getting them for equality
- // compares. This is done the first time needed in the equals
- // statement.
-
- private int fHashCode = 0; // Hashcode of this equality object. The hashcode for the feature is expensive
- // so we will calculate it once (the assumption is that
- // features once created aren't changed, which for our
- // purposes here in beaninfo land is good).
-
- protected static HashMap MAP_EQUALITY = new HashMap(10); // Map from descriptor to equality type.
- static {
- try {
- MAP_EQUALITY.put(FeatureDescriptor.class, (FeatureDescriptorEquality.class).getConstructor(new Class[] {FeatureDescriptor.class}));
- } catch (NoSuchMethodException e) {
- }
- // Need to set up the others.
- BeanDescriptorEquality.INIT();
- EventSetDescriptorEquality.INIT();
- IndexedPropertyDescriptorEquality.INIT();
- MethodDescriptorEquality.INIT();
- ParameterDescriptorEquality.INIT();
- }
-
- /**
- * Create the appropriate descriptor equality for this object.
- */
- public static FeatureDescriptorEquality createEquality(FeatureDescriptor descr) {
- try {
- return (FeatureDescriptorEquality) ((Constructor) MAP_EQUALITY.get(descr.getClass())).newInstance(new Object[] {descr});
- } catch (IllegalAccessException e) {
- } catch (InstantiationException e) {
- } catch (InvocationTargetException e) {
- e.printStackTrace();
- }
- return null;
- }
-
- public FeatureDescriptorEquality() {
- }
-
- /**
- * NOTE: Every subclass needs to implement an override for the methods:
- * calculateHashCode
- * equals
- * clearFeature - if it has any cache values
- */
-
- public FeatureDescriptorEquality(FeatureDescriptor feature) {
- setFeature(feature);
- }
-
- public final void setFeature(FeatureDescriptor feature) {
- clearFeature();
- fFeature = feature;
- }
-
- /**
- * A new feature is being set into this object,
- * clear any cache members so that they can be reconstructed.
- *
- * NOTE: Subclasses - remember to call super.clearFeature();
- */
- protected void clearFeature() {
- fValues = null;
- fHashCode = 0;
- }
-
- public final int hashCode() {
- if (fHashCode == 0)
- fHashCode = calculateHashCode();
- return fHashCode;
- }
-
- protected final HashMap values() {
- if (fValues == null) {
- fValues = new HashMap(5);
-
- Enumeration keys = fFeature.attributeNames();
- while (keys.hasMoreElements()) {
- String key = (String) keys.nextElement();
- fValues.put(key, fFeature.getValue(key));
- }
- }
- return fValues;
- }
-
- /**
- * Calculate the hashcode for the current feature, add this
- * to the hashcode received from super.calculateHashCode
- * and return the new value.
- *
- * NOTE: for subclasses, it is MANDITORY that the first line be:
- * int hashcode = super.calculateHashCode();
- * and the last line be:
- * return hashcode*31 + (your calculated hashcode for just this subclass);
- */
- protected int calculateHashCode() {
- int hashcode = 0;
- if (fFeature.getName() != null)
- hashcode += fFeature.getName().hashCode();
-
- if (fFeature.getDisplayName() != fFeature.getName())
- hashcode += fFeature.getDisplayName().hashCode();
- if (fFeature.getShortDescription() != fFeature.getDisplayName())
- hashcode += fFeature.getShortDescription().hashCode();
-
- hashcode += (fFeature.isExpert() ? Boolean.TRUE : Boolean.FALSE).hashCode();
- hashcode += (fFeature.isHidden() ? Boolean.TRUE : Boolean.FALSE).hashCode();
- hashcode += (fFeature.isPreferred() ? Boolean.TRUE : Boolean.FALSE).hashCode();
-
- hashcode += values().hashCode();
- return hashcode;
- }
-
- /**
- * equals: See if this is equal semantically.
- *
- * NOTE: Every subclass needs to implement this and
- * the first few lines should be:
- * if (identityTest())
- * return true;
- * if (!super.equals(obj))
- * return false;
- */
-
- public boolean equals(Object obj) {
- if (identityTest(obj))
- return true;
- if (!(obj instanceof FeatureDescriptorEquality))
- return false;
-
- FeatureDescriptorEquality ofe = (FeatureDescriptorEquality) obj;
- FeatureDescriptor of = ofe.fFeature;
-
- if (fFeature.getClass() != of.getClass())
- return false;
-
- if (!fFeature.getName().equals(of.getName()))
- return false;
- if (!fFeature.getDisplayName().equals(of.getDisplayName()))
- return false;
- if (!fFeature.getShortDescription().equals(of.getShortDescription()))
- return false;
- if (fFeature.isExpert() != of.isExpert() ||
- fFeature.isHidden() != of.isHidden() ||
- fFeature.isPreferred() != of.isPreferred())
- return false;
-
- if (!values().equals(ofe.values()))
- return false;
- return true;
- }
-
- /*
- * Identity test: Tests for quick identity of
- * descriptors. If this returns true, then
- * no other tests required.
- */
- protected boolean identityTest(Object obj) {
- if (!(obj instanceof FeatureDescriptorEquality))
- return false;
- if (this == obj)
- return true;
-
- if (((FeatureDescriptorEquality) obj).fFeature == fFeature)
- return true;
-
- return false;
- }
-}
diff --git a/plugins/org.eclipse.jem.beaninfo.vm/vm_beaninfovm/org/eclipse/jem/internal/beaninfo/vm/IndexedPropertyDescriptorEquality.java b/plugins/org.eclipse.jem.beaninfo.vm/vm_beaninfovm/org/eclipse/jem/internal/beaninfo/vm/IndexedPropertyDescriptorEquality.java
deleted file mode 100644
index 42100e4..0000000
--- a/plugins/org.eclipse.jem.beaninfo.vm/vm_beaninfovm/org/eclipse/jem/internal/beaninfo/vm/IndexedPropertyDescriptorEquality.java
+++ /dev/null
@@ -1,91 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2001, 2005 IBM Corporation and others.
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
- *
- * Contributors:
- * IBM Corporation - initial API and implementation
- *******************************************************************************/
-package org.eclipse.jem.internal.beaninfo.vm;
-/*
-
-
- */
-
-import java.beans.*;
-/**
- * IndexedPropertyDescriptor equality tester
- */
-public class IndexedPropertyDescriptorEquality extends PropertyDescriptorEquality {
-
- static void INIT() {
- try {
- MAP_EQUALITY.put(IndexedPropertyDescriptor.class, (IndexedPropertyDescriptorEquality.class).getConstructor(new Class[] {PropertyDescriptor.class}));
- MAP_EQUALITY.put(PropertyDescriptor.class, (IndexedPropertyDescriptorEquality.class).getConstructor(new Class[] {PropertyDescriptor.class}));
- } catch (NoSuchMethodException e) {
- }
- }
-
- public IndexedPropertyDescriptorEquality() {
- }
-
- public IndexedPropertyDescriptorEquality(PropertyDescriptor descr) {
- super(descr);
- }
- /**
- * Calculate the hashcode for the current feature, add this
- * to the hashcode received from super.calculateHashCode
- * and return the new value.
- *
- * NOTE: for subclasses, it is MANDITORY that the first line be:
- * int hashcode = super.calculateHashCode();
- * and the last line be:
- * return hashcode*31 + (your calculated hashcode for just this subclass);
- */
- protected int calculateHashCode() {
- int hashcode = super.calculateHashCode();
- if (fFeature instanceof IndexedPropertyDescriptor) {
- IndexedPropertyDescriptor pd = (IndexedPropertyDescriptor) fFeature;
-
- int hc = pd.getIndexedPropertyType().hashCode();
-
- if (pd.getIndexedReadMethod() != null)
- hc += pd.getIndexedReadMethod().hashCode();
- if (pd.getIndexedWriteMethod() != null)
- hc += pd.getIndexedWriteMethod().hashCode();
- return hashcode*31 + hc;
- } else
- return hashcode;
- }
-
- public boolean equals(Object obj) {
- if (!(obj instanceof FeatureDescriptorEquality))
- return false;
- if (identityTest(obj))
- return true;
- if (fFeature.getClass() != ((FeatureDescriptorEquality) obj).fFeature.getClass())
- return false; // If they aren't both PropertyDesciptors or IndexedPropertyDescriptors, then they don't match.
- if (!super.equals(obj))
- return false;
-
- if (fFeature instanceof IndexedPropertyDescriptor) {
- IndexedPropertyDescriptor op = (IndexedPropertyDescriptor) ((FeatureDescriptorEquality) obj).fFeature;
- IndexedPropertyDescriptor fp = (IndexedPropertyDescriptor) fFeature;
-
- if (op.getIndexedPropertyType() != fp.getIndexedPropertyType())
- return false;
- if (op.getIndexedReadMethod() != fp.getIndexedReadMethod())
- return false;
- if (op.getIndexedWriteMethod() != fp.getIndexedWriteMethod())
- return false;
- }
-
- return true;
- }
-
-
-
-
-}
diff --git a/plugins/org.eclipse.jem.beaninfo.vm/vm_beaninfovm/org/eclipse/jem/internal/beaninfo/vm/MethodDescriptorEquality.java b/plugins/org.eclipse.jem.beaninfo.vm/vm_beaninfovm/org/eclipse/jem/internal/beaninfo/vm/MethodDescriptorEquality.java
deleted file mode 100644
index a56159c..0000000
--- a/plugins/org.eclipse.jem.beaninfo.vm/vm_beaninfovm/org/eclipse/jem/internal/beaninfo/vm/MethodDescriptorEquality.java
+++ /dev/null
@@ -1,135 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2001, 2005 IBM Corporation and others.
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
- *
- * Contributors:
- * IBM Corporation - initial API and implementation
- *******************************************************************************/
-package org.eclipse.jem.internal.beaninfo.vm;
-/*
-
-
- */
-
-import java.beans.*;
-import java.util.*;
-/**
- * Equality tester for MethodDescriptors
- */
-public class MethodDescriptorEquality extends FeatureDescriptorEquality {
-
- static void INIT() {
- try {
- MAP_EQUALITY.put(MethodDescriptor.class, (MethodDescriptorEquality.class).getConstructor(new Class[] {MethodDescriptor.class}));
- } catch (NoSuchMethodException e) {
- }
- }
-
- private ArrayList fParameterDescriptors; // Array of ParameterDescriptorEquality's.
-
- public MethodDescriptorEquality() {
- }
-
- public MethodDescriptorEquality(MethodDescriptor descr) {
- super(descr);
- }
-
- /**
- * A new feature is being set into this object,
- * clear any cache members so that they can be reconstructed.
- *
- * NOTE: Subclasses - remember to call super.clearFeature();
- */
- protected void clearFeature() {
- super.clearFeature();
- fParameterDescriptors = null;
- }
-
- protected ArrayList parameterDescriptors() {
- if (fParameterDescriptors == null) {
- ParameterDescriptor[] pds = ((MethodDescriptor) fFeature).getParameterDescriptors();
- if (pds != null) {
- fParameterDescriptors = new ArrayList(pds.length);
- for (int i=0; i<pds.length; i++)
- fParameterDescriptors.add(new ParameterDescriptorEquality(pds[i]));
- }
- }
- return fParameterDescriptors;
- }
- /**
- * Calculate the hashcode for the current feature, add this
- * to the hashcode received from super.calculateHashCode
- * and return the new value.
- *
- * NOTE: for subclasses, it is MANDITORY that the first line be:
- * int hashcode = super.calculateHashCode();
- * and the last line be:
- * return hashcode*31 + (your calculated hashcode for just this subclass);
- */
- protected int calculateHashCode() {
- int hashcode = super.calculateHashCode();
- MethodDescriptor bd = (MethodDescriptor) fFeature;
- int hc = bd.getMethod().hashCode();
- if (parameterDescriptors() != null)
- hc += parameterDescriptors().hashCode();
-
- return hashcode*31 + hc;
- }
-
- public boolean equals(Object obj) {
- if (identityTest(obj))
- return true;
-
- if (!super.equals(obj))
- return false;
-
- MethodDescriptorEquality oem = (MethodDescriptorEquality) obj;
- MethodDescriptor om = (MethodDescriptor) oem.fFeature;
- MethodDescriptor fm = (MethodDescriptor) fFeature;
-
- if (fm.getMethod() != om.getMethod())
- return false;
-
- if (fParameterDescriptors != null || oem.fParameterDescriptors != null) {
- // We are in a Map lookup situation, so one side has listener method equalities, so we will compare that way.
- if (parameterDescriptors() == null)
- if (((MethodDescriptorEquality) obj).parameterDescriptors() != null)
- return false;
- else ;
- else
- if (!parameterDescriptors().equals(((MethodDescriptorEquality) obj).parameterDescriptors()))
- return false;
- } else {
- // We are in the building the list phases, don't waste space building entire list.
- ParameterDescriptor[] ours = fm.getParameterDescriptors();
- ParameterDescriptor[] theirs = om.getParameterDescriptors();
- if (ours == theirs)
- return true;
- else if (ours == null)
- if (theirs != null)
- return false;
- else
- ;
- else if (theirs == null)
- return false;
- else if (ours.length != theirs.length)
- return false;
- else if (ours.length > 0) {
- ParameterDescriptorEquality workingOurs = new ParameterDescriptorEquality();
- ParameterDescriptorEquality workingThiers = new ParameterDescriptorEquality();
- for (int i = 0; i < ours.length; i++) {
- workingOurs.setFeature(ours[i]);
- workingThiers.setFeature(theirs[i]);
- if (!workingOurs.equals(workingThiers))
- return false;
- }
- }
- }
-
-
- return true;
- }
-}
diff --git a/plugins/org.eclipse.jem.beaninfo.vm/vm_beaninfovm/org/eclipse/jem/internal/beaninfo/vm/ModelingBeanInfo.java b/plugins/org.eclipse.jem.beaninfo.vm/vm_beaninfovm/org/eclipse/jem/internal/beaninfo/vm/ModelingBeanInfo.java
deleted file mode 100644
index 1344589..0000000
--- a/plugins/org.eclipse.jem.beaninfo.vm/vm_beaninfovm/org/eclipse/jem/internal/beaninfo/vm/ModelingBeanInfo.java
+++ /dev/null
@@ -1,863 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2001, 2005 IBM Corporation and others.
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
- *
- * Contributors:
- * IBM Corporation - initial API and implementation
- *******************************************************************************/
-package org.eclipse.jem.internal.beaninfo.vm;
-
-/*
-
-
- */
-
-import java.beans.*;
-import java.io.IOException;
-import java.io.ObjectOutputStream;
-import java.lang.reflect.*;
-import java.util.*;
-
-import org.eclipse.jem.beaninfo.common.IBaseBeanInfoConstants;
-import org.eclipse.jem.beaninfo.vm.BaseBeanInfo;
-import org.eclipse.jem.internal.beaninfo.common.*;
-import org.eclipse.jem.internal.proxy.common.*;
-
-/**
- * This class is the beaninfo class that is created when beaninfo modeling introspects a bean. Its purpose is to gather together and analyze the
- * beaninfo. For example, it checks with the supertype beaninfo to see if all of the supertype's descriptors are included in this list. If they are,
- * then it knows that it does a straight inheritance of the supertype's descriptors, and those descriptors can be removed from the list. This makes it
- * easier on the model side so that there isn't a great proliferation of descriptors all describing the same properties. In that case they can be
- * merged from the supertype model. If some are not found, then that means this beaninfo is trying to hide some of them, and in that case this is the
- * definitive list and inheritance shouldn't be used on the model side. However, for those features which are essentially the inherited feature (i.e.
- * the BeanInfo simply filtered out some inherited but not all), they will be returnable (by name). The IDE side will take these that are "inherited"
- * and will return the actual structured feature from the inherited class.
- *
- * The test for seeing if the super feature is included in the beaninfo is first to see if the the feature is in the beaninfo by name, if it is then
- * it is marked as included. Then a check is made on equality, if they are equal, then the feature is removed from the beaninfo list, but the merge
- * flag is still left on, and removed inherited feature is added to the list of inherited features. If all inherited features are found, this list is
- * cleared and flag is set which simply says merge all inherited. This allows merging to occur but it also allows overrides to occur.
- *
- * Note: Test for identity is different between JDK 1.5 and above and below. 1.5 and above, we can use actual equals() because the same descriptor is
- * returned from inherited features. In 1.3, clones were always returned and equals() would answer false, so we need to create a special equality
- * descriptor which turns the equals() into one that can test clones for semantic equality. See Java Bug ID#4996673 The problem was supposed to be
- * fixed in 1.4 but it was not fixed. Originally a new clone was created each time a beaninfo was requested. That is no longer done in 1.4, but the
- * processing to create the original beaninfo does a clone accidently under the covers. Looking at 1.5 it looks this was fixed, but it hasn't been
- * tested here yet.
- */
-
-public abstract class ModelingBeanInfo implements ICallback {
-
- private static boolean PRE15;
- static {
- String version = System.getProperty("java.version", ""); //$NON-NLS-1$ //$NON-NLS-2$
- PRE15 = version.startsWith("1."); //$NON-NLS-1$
- if (PRE15) {
- // Continue to check, get the revision.
- int revision = 0;
- if (version.length() > 2) {
- int revEnd = version.indexOf('.', 2);
- revision = version.length() > 2 ? Integer.parseInt(revEnd != -1 ? version.substring(2, revEnd) : version.substring(2)) : 0;
- PRE15 = revision < 5;
- }
- }
- }
-
- static class FeatureEqualitySet extends HashSet {
-
- /**
- * Comment for <code>serialVersionUID</code>
- *
- * @since 1.1.0
- */
- private static final long serialVersionUID = -3744776740604328324L;
- private FeatureDescriptorEquality workingKey;
-
- public FeatureEqualitySet(List features) {
- super(features.size());
- // Get first feature to fiqure out type of working key. This will not be reentrant.
- workingKey = FeatureDescriptorEquality.createEquality((FeatureDescriptor) features.get(0));
- this.addAll(features);
- }
-
- /**
- * @see java.util.Collection#add(Object)
- */
- public boolean add(Object o) {
- return super.add(FeatureDescriptorEquality.createEquality((FeatureDescriptor) o));
- }
-
- /**
- * @see java.util.Collection#contains(Object)
- */
- public boolean contains(Object o) {
- workingKey.setFeature((FeatureDescriptor) o);
- return super.contains(workingKey);
- }
-
- }
-
- // The following fields indicate if the super info should be merged
- // in on the model side. no merge means there were no inherited methods at all. So the
- // beaninfo presented is definitive. If merge, then get...Descriptors will return just
- // the ones for this level, and getSuper...Descriptors will return the inherited ones.
- // Though in this case, if the returned super list is null, then that means use ALL of
- // the inherited ones.
- // The super list returns simply the names, don't need to have the full descriptors in that case.
- protected boolean fMergeInheritedEvents = false, fMergeInheritedMethods = false, fMergeInheritedProperties = false;
-
- protected final BeanInfo fTargetBeanInfo; // The beaninfo being modeled.
-
- // Local descriptors
- protected EventSetDescriptor[] fEventSets;
-
- protected MethodDescriptor[] fMethods;
-
- protected PropertyDescriptor[] fProperties;
-
- // Not inherited descriptor names, will be null if no merge or if merge all. This is list of names to NOT merge. It is usually shorter than the list to merge from super.
-
- // Methods are special. You can have duplicates, so name is not sufficient.
- // So for methods,
- // will use an array of Strings where:
- // For each one the full signature
- // will be in the list, e.g. "name:methodName(argtype,..." where argtype is the fullyqualified
- // classname (using "." notation for inner classes), and using format "java.lang.String[]" for
- // arrays.
- //
- // This is because even if there are no duplicates, it will take less time/space to simply create the entries
- // then it would to create a set to see if there are duplicates and then create the final array.
- protected String[] fNotInheritedEventSets;
-
- protected String[] fNotInheritedMethods;
-
- protected String[] fNotInheritedProperties;
-
- protected int doFlags;
-
- /**
- * Method used to do introspection and create the appropriate ModelingBeanInfo
- *
- * This will always introspect.
- */
- public static ModelingBeanInfo introspect(Class introspectClass, int doFlags) throws IntrospectionException {
- return introspect(introspectClass, true, doFlags);
- }
-
- /**
- * Method used to do introspection and create the appropriate ModelingBeanInfo
- *
- * introspectIfNoBeanInfo: If this is true, then if no explicit beaninfo was found for this class, then introspection will be done anyway. The
- * Introspector will use reflection for local methods/events/properties of this class and then add in the results of the superclass introspection.
- * If this parameter is false, then if the explicit beaninfo is not found, then no introspection will be done and null will be returned.
- */
- public static ModelingBeanInfo introspect(Class introspectClass, boolean introspectIfNoBeanInfo, int doFlags) throws IntrospectionException {
- if (!Beans.isDesignTime())
- Beans.setDesignTime(true); // Since this a jem beaninfo specific vm, we should also be considered design time.
- if (!introspectIfNoBeanInfo) {
- // Need to check if the beaninfo is explicitly supplied.
- // If not, then we return null.
- // The checks will be the same that Introspector will use.
-
- boolean found = false;
- // 1. Is there a BeanInfo class in the same package
- if (!classExists(introspectClass.getName() + "BeanInfo", introspectClass)) { //$NON-NLS-1$
- // 2. Is this class a BeanInfo class for itself.
- if (!(BeanInfo.class).isAssignableFrom(introspectClass)) {
- // 3. Can this class be found in the Beaninfo searchpath.
- String[] searchPath = Introspector.getBeanInfoSearchPath();
- int startClassname = introspectClass.getName().lastIndexOf(".") + 1; //$NON-NLS-1$
- String biName = "." + introspectClass.getName().substring(startClassname) + "BeanInfo"; //$NON-NLS-1$ //$NON-NLS-2$
- for (int i = 0; i < searchPath.length; i++) {
- if (classExists(searchPath[i] + biName, introspectClass)) {
- found = true;
- break;
- }
- }
- } else
- found = true;
- } else
- found = true;
-
- if (!found)
- return null;
- }
-
- BeanInfo bInfo = Introspector.getBeanInfo(introspectClass);
- Class superClass = introspectClass.getSuperclass();
-
- if (superClass == null)
- return PRE15 ? (ModelingBeanInfo) new ModelingBeanInfoPre15(bInfo, doFlags) : new ModelingBeanInfo15(bInfo, doFlags);
- else
- return PRE15 ? (ModelingBeanInfo) new ModelingBeanInfoPre15(bInfo, Introspector.getBeanInfo(superClass), doFlags) : new ModelingBeanInfo15(bInfo,
- Introspector.getBeanInfo(superClass), doFlags);
- }
-
- /**
- * See if this class exists, first in the class loader of the sent class, then in the system loader, then the bootstrap loader, and finally the
- * current thread context class loader.
- */
- protected static boolean classExists(String className, Class fromClass) {
- if (fromClass.getClassLoader() != null)
- try {
- fromClass.getClassLoader().loadClass(className);
- return true;
- } catch (ClassNotFoundException e) {
- }
- if (ClassLoader.getSystemClassLoader() != null)
- try {
- ClassLoader.getSystemClassLoader().loadClass(className);
- return true;
- } catch (ClassNotFoundException e) {
- }
- try {
- Class.forName(className);
- return true;
- } catch (ClassNotFoundException e) {
- }
-
- try {
- // Use the classloader from the current Thread.
- ClassLoader cl = Thread.currentThread().getContextClassLoader();
- cl.loadClass(className);
- return true;
- } catch (ClassNotFoundException e) {
- }
-
- return false;
-
- }
-
- /**
- * Used only for Object since that is the only bean that doesn't have a superclass. Superclass beaninfo required for all other classes. If this is
- * constructed then this means no merge and the list is definitive.
- */
- protected ModelingBeanInfo(BeanInfo beanInfo, int doFlags) {
- fTargetBeanInfo = beanInfo;
- this.doFlags = doFlags;
- }
-
- protected ModelingBeanInfo(BeanInfo beanInfo, BeanInfo superBeanInfo, int doFlags) {
- this(beanInfo, doFlags);
-
- // Now go through the beaninfo to determine the merge state.
- // The default is no merge.
-
- if ((doFlags & IBeanInfoIntrospectionConstants.DO_EVENTS) != 0) {
- List full = addAll(beanInfo.getEventSetDescriptors());
- List inherited = addAll(superBeanInfo.getEventSetDescriptors());
-
- fMergeInheritedEvents = stripList(full, inherited);
- if (fMergeInheritedEvents) {
- if (!full.isEmpty())
- fEventSets = (EventSetDescriptor[]) full.toArray(new EventSetDescriptor[full.size()]);
- if (!inherited.isEmpty())
- createEventArray(inherited); // This is actually a list of those NOT inherited.
- }
- }
-
- if ((doFlags & IBeanInfoIntrospectionConstants.DO_METHODS) != 0) {
- List full = addAll(beanInfo.getMethodDescriptors());
- List inherited = addAll(superBeanInfo.getMethodDescriptors());
-
- fMergeInheritedMethods = stripList(full, inherited);
- if (fMergeInheritedMethods) {
- if (!full.isEmpty())
- fMethods = (MethodDescriptor[]) full.toArray(new MethodDescriptor[full.size()]);
- if (!inherited.isEmpty())
- createMethodEntries(inherited); // This is actually a list of those NOT inherited.
- }
- }
-
- if ((doFlags & IBeanInfoIntrospectionConstants.DO_PROPERTIES) != 0) {
- List full = addAll(beanInfo.getPropertyDescriptors());
- List inherited = addAll(superBeanInfo.getPropertyDescriptors());
-
- fMergeInheritedProperties = stripList(full, inherited);
- if (fMergeInheritedProperties) {
- if (!full.isEmpty())
- fProperties = (PropertyDescriptor[]) full.toArray(new PropertyDescriptor[full.size()]);
- if (!inherited.isEmpty())
- createPropertyArray(inherited); // This is actually a list of those NOT inherited.
- }
- }
- }
-
- protected void createEventArray(List features) {
- fNotInheritedEventSets = createDescriptorNames(features);
- }
-
- protected void createMethodEntries(List features) {
- int s = features.size();
- fNotInheritedMethods = new String[s];
- for (int i = 0; i < s; i++) {
- fNotInheritedMethods[i] = longName((MethodDescriptor) features.get(i));
- }
- }
-
- protected String longName(MethodDescriptor md) {
- String n = md.getName();
- StringBuffer sb = new StringBuffer(n.length() + 20);
- sb.append(n);
- sb.append(':');
- Method m = md.getMethod();
- sb.append(m.getName());
- sb.append('(');
- Class[] parms = m.getParameterTypes();
- for (int j = 0; j < parms.length; j++) {
- if (j > 0)
- sb.append(',');
- if (!parms[j].isArray())
- sb.append(parms[j].getName().replace('$', '.'));
- else {
- Class finalType = parms[j].getComponentType();
- int insrt = sb.length();
- while (finalType.isArray()) {
- sb.append("[]"); //$NON-NLS-1$
- finalType = finalType.getComponentType();
- }
- sb.insert(insrt, finalType.getName().replace('$', '.'));
- }
- }
- return sb.toString();
- }
-
- protected void createPropertyArray(List features) {
- fNotInheritedProperties = createDescriptorNames(features);
- }
-
- protected String[] createDescriptorNames(List features) {
- String[] result = new String[features.size()];
- for (int i = 0; i < result.length; i++) {
- result[i] = ((FeatureDescriptor) features.get(i)).getName();
- }
- return result;
- }
-
- protected List addAll(Object[] set) {
- if (set != null) {
- ArrayList l = new ArrayList(set.length);
- for (int i = 0; i < set.length; i++) {
- l.add(set[i]);
- }
- return l;
- } else
- return Collections.EMPTY_LIST;
- }
-
- /**
- * If this returns true, then all of the super class's events should be merged in. If it returns false, then the events returned are it, there are
- * no others.
- */
- public boolean isMergeInheritedEvents() {
- return fMergeInheritedEvents;
- }
-
- /**
- * If this returns true, then all of the super class's methods should be merged in. If it returns false, then the methods returned are it, there
- * are no others.
- */
- public boolean isMergeInheritedMethods() {
- return fMergeInheritedMethods;
- }
-
- /**
- * If this returns true, then all of the super class's properties should be merged in. If it returns false, then the properties returned are it,
- * there are no others.
- */
- public boolean isMergeInheritedProperties() {
- return fMergeInheritedProperties;
- }
-
- public BeanInfo[] getAdditionalBeanInfo() {
- return fTargetBeanInfo.getAdditionalBeanInfo();
- }
-
- public BeanDescriptor getBeanDescriptor() {
- return fTargetBeanInfo.getBeanDescriptor();
- }
-
- public EventSetDescriptor[] getEventSetDescriptors() {
- return fMergeInheritedEvents ? fEventSets : fTargetBeanInfo.getEventSetDescriptors();
- }
-
- public java.awt.Image getIcon(int iconKind) {
- return fTargetBeanInfo.getIcon(iconKind);
- }
-
- public MethodDescriptor[] getMethodDescriptors() {
- return fMergeInheritedMethods ? fMethods : fTargetBeanInfo.getMethodDescriptors();
- }
-
- public PropertyDescriptor[] getPropertyDescriptors() {
- return fMergeInheritedProperties ? fProperties : fTargetBeanInfo.getPropertyDescriptors();
- }
-
- public String[] getNotInheritedEventSetDescriptors() {
- return fNotInheritedEventSets;
- }
-
- public String[] getNotInheritedMethodDescriptors() {
- return fNotInheritedMethods;
- }
-
- public String[] getNotInheritedPropertyDescriptors() {
- return fNotInheritedProperties;
- }
-
- protected String computeKey(FeatureDescriptor feature) {
- return feature instanceof MethodDescriptor ? longName((MethodDescriptor) feature) : feature.getName();
- }
-
- /*
- * Strip the list down using the Equality objects.
- */
- protected boolean stripList(List fullList, List inheritedList) {
- // The process is to create a boolean list mirroring the inheritedList.
- // This boolean list indicates if the corresponding (by index)
- // entry from the inheritedList is to be retained in the final computed
- // list.
- //
- // A Hashmap is created where the key is the computedKey from the inheritedList
- // and the value is the index into the inheritedList. This is so that we can quickly determine if the
- // entry is matching.
- //
- // Then the fullList will be stepped through and see if there is
- // an entry in the Hashmap for it. If there is an entry, then
- // the entry is checked to see if it is semantically equal.
- // If it is, then the boolean list entry is marked so that
- // the inheritedList entry will be retained, the fullList entry removed and the counter
- // of the number of entries in the inheritedList copy is incremented.
- // If they aren't semantically equal, then we know that this is
- // an override. In that case, the fullList entry is kept, the inheritedList
- // entry is not retained, but we don't prevent merge later.
- //
- // If the fullList entry is not found in the HashMap, then we know it is not
- // from the inheritedList, so it will be retained in the fullList.
- //
- // If we get all of the way through, then we know that what is left
- // in fullList is just this level.
- //
- // When we return we know that
- // a) fullList has only the features that are found at the local level
- // b) inheritedList if not empty contains the ones from super that SHOULD NOT be inherited.
- // If it is empty, then if this method returns true, then ALL should be inherited,
- // or if this method returns false, then it doesn't matter because we aren't merging any.
- //
- // All of this is based upon the assumption that the list can
- // get quite large (which it does for javax.swing) and that
- // a simple n-squared order search would be too slow.
-
- if (fullList.isEmpty()) {
- return false; // There are none in the full list, so there should be none, and don't merge.
- } else if (inheritedList.isEmpty())
- return false; // There are no inheritedList features, so treat as no merge.
-
- // We have some features and some inheritedList features, so we need to go through the lists.
-
- // Create a working copy of the FeatureDescriptorEquality for fullList and stripList and just reuse them
- FeatureDescriptorEquality workingStrip = FeatureDescriptorEquality.createEquality((FeatureDescriptor) inheritedList.get(0));
- FeatureDescriptorEquality workingFull = FeatureDescriptorEquality.createEquality((FeatureDescriptor) fullList.get(0));
-
- int inheritedSize = inheritedList.size();
- boolean[] copy = new boolean[inheritedSize];
-
- HashMap inheritedMap = new HashMap(inheritedSize);
- for (int i = 0; i < inheritedSize; i++) {
- FeatureDescriptor f = (FeatureDescriptor) inheritedList.get(i);
- String key = computeKey(f);
- Object value = inheritedMap.get(key);
- if (value == null)
- inheritedMap.put(key, new Integer(i));
- else {
- // Shouldn't occur.
- }
-
- }
-
- // When we are done with this processing, inheritedList will contain the super that should not be used, and full list will contain only the locals
- // (those defined at this class level).;
- int inheritedRetained = 0;
- Iterator fullItr = fullList.iterator();
- // Continue while we've retained less than the full super amount. If we've retained all of the inheritedList, there is no
- // need to continue processing the fullList because there can't possibly be any inheritedList entries left to find.
- while (inheritedRetained < inheritedSize && fullItr.hasNext()) {
- FeatureDescriptor f = (FeatureDescriptor) fullItr.next();
- boolean foundFull = false;
- Object index = inheritedMap.get(computeKey(f));
- if (index != null) {
- workingFull.setFeature(f);
- int ndx = ((Integer) index).intValue();
- workingStrip.setFeature((FeatureDescriptor) inheritedList.get(ndx));
- if (workingFull.equals(workingStrip)) {
- // They are semantically identical, so retain in the inheritedList.
- copy[ndx] = true;
- foundFull = true;
- inheritedRetained++;
- }
- }
-
- if (foundFull) {
- // We found the inheritedList entry semantically equal in the full list somewhere, so we need to remove the full entry.
- fullItr.remove();
- }
- }
-
- if (inheritedRetained == inheritedSize) {
- inheritedList.clear(); // All were found in inheritedList, so just clear the inheritedList and return just what was left in the found.
- // Those in full found in super had been removed from full during the processing.
- return true; // We merge with all inherited.
- } else if (inheritedRetained != 0) {
- // Some were retained, take out of the list those that were retained.
- // When done the list will contain those that should be dropped from the inherited list.
- // We start from end because the actual number of bytes moved overall will be less than if we started from the front.
- for (ListIterator itr = inheritedList.listIterator(inheritedList.size()); itr.hasPrevious();) {
- int i = itr.previousIndex();
- itr.previous(); // To back up the itr so that remove can remove it. We actually don't care what the value is.
- if (copy[i])
- itr.remove();
- }
- return true; // We merge, and the list is not empty but it did have some removed, so we leave the list alone. Those are not inherited.
- } else
- return false; // All were removed (retained == 0). None were retained. So we just don't do a merge. The list will be ignored.
- }
-
- // The modeling beaninfo is also used to send itself back in serialized mode as a callback.
-
- private IVMCallbackServer vmServer;
-
- private int callbackID;
-
- /*
- * (non-Javadoc)
- *
- * @see org.eclipse.jem.internal.proxy.common.ICallback#initializeCallback(org.eclipse.jem.internal.proxy.common.IVMServer, int)
- */
- public void initializeCallback(IVMCallbackServer vmServer, int callbackID) {
- this.vmServer = vmServer;
- this.callbackID = callbackID;
- }
-
- public void send() throws IOException, CommandException {
- if (doFlags != 0) {
- ObjectOutputStream stream = new ObjectOutputStream(vmServer.requestStream(callbackID, 0));
- if ((doFlags & IBeanInfoIntrospectionConstants.DO_BEAN_DECOR) != 0)
- sendBeanDecorator(stream);
- if ((doFlags & IBeanInfoIntrospectionConstants.DO_PROPERTIES) != 0)
- sendPropertyDecorators(stream);
- if ((doFlags & IBeanInfoIntrospectionConstants.DO_METHODS) != 0)
- sendMethodDecorators(stream);
- if ((doFlags & IBeanInfoIntrospectionConstants.DO_EVENTS) != 0)
- sendEventDecorators(stream);
- stream.writeInt(IBeanInfoIntrospectionConstants.DONE);
- stream.close();
- }
- }
-
- /**
- * Called by IDE to send the bean decorator information back through the callback.
- * @throws CommandException
- * @throws IOException
- *
- * @since 1.1.0
- */
- public void sendBeanDecorator(ObjectOutputStream stream) throws IOException, CommandException {
- BeanRecord br = new BeanRecord();
- BeanDescriptor bd = getBeanDescriptor();
-
- if (bd != null) {
- br.customizerClassName = getClassName(bd.getCustomizerClass());
- br.mergeInheritedProperties = isMergeInheritedProperties();
- br.mergeInheritedOperations = isMergeInheritedMethods();
- br.mergeInheritedEvents = isMergeInheritedEvents();
- br.notInheritedPropertyNames = getNotInheritedPropertyDescriptors();
- br.notInheritedOperationNames = getNotInheritedMethodDescriptors();
- br.notInheritedEventNames = getNotInheritedEventSetDescriptors();
- fill(bd, br, BEAN_RECORD_TYPE);
- }
- stream.writeInt(IBeanInfoIntrospectionConstants.BEAN_DECORATOR_SENT);
- stream.writeObject(br);
- }
-
- /**
- * Called by IDE to send the property decorators information back through the callback.
- *
- * @throws CommandException
- * @throws IOException
- * @since 1.1.0
- */
- public void sendPropertyDecorators(ObjectOutputStream stream) throws IOException, CommandException {
- PropertyDescriptor[] properties = getPropertyDescriptors();
- if (properties != null && properties.length > 0) {
- // Now start writing the records.
- stream.writeInt(IBeanInfoIntrospectionConstants.PROPERTY_DECORATORS_SENT);
- stream.writeInt(properties.length);
- for (int i = 0; i < properties.length; i++) {
- PropertyDescriptor pd = properties[i];
- // Much of the two types are common, so if indexed, fill in the index part and then pass on to property part.
- PropertyRecord usepr = null;
- int useType = 0;
- if (pd.getClass() == IndexedPropertyDescriptor.class) {
- IndexedPropertyDescriptor ipd = (IndexedPropertyDescriptor) pd;
- IndexedPropertyRecord ipr = new IndexedPropertyRecord();
- usepr = ipr;
- useType = INDEXEDPROPERTY_RECORD_TYPE;
- ipr.indexedReadMethod = getReflectedMethodRecord(ipd.getIndexedReadMethod());
- ipr.indexedWriteMethod = getReflectedMethodRecord(ipd.getIndexedWriteMethod());
- ipr.indexedPropertyTypeName = getClassName(ipd.getIndexedPropertyType());
- } else {
- usepr = new PropertyRecord();
- useType = PROPERTY_RECORD_TYPE;
- }
- usepr.propertyEditorClassName = getClassName(pd.getPropertyEditorClass());
- usepr.propertyTypeName = getClassName(pd.getPropertyType());
- usepr.readMethod = getReflectedMethodRecord(pd.getReadMethod());
- usepr.writeMethod = getReflectedMethodRecord((pd.getWriteMethod()));
- usepr.bound = pd.isBound();
- usepr.constrained = pd.isConstrained();
- usepr.designTime = null;
- usepr.field = null;
- fill(pd, usepr, useType);
- stream.writeObject(usepr);
- }
- }
- }
-
- /**
- * Called by IDE to send the method decorators information back through the callback.
- *
- * @throws CommandException
- * @throws IOException
- * @since 1.1.0
- */
- public void sendMethodDecorators(ObjectOutputStream stream) throws IOException, CommandException {
- MethodDescriptor[] methods = getMethodDescriptors();
- if (methods != null && methods.length > 0) {
- // Now start writing the records.
- stream.writeInt(IBeanInfoIntrospectionConstants.METHOD_DECORATORS_SENT);
- stream.writeInt(methods.length);
- for (int i = 0; i < methods.length; i++) {
- MethodRecord mr = new MethodRecord();
- fill(mr, methods[i]);
- stream.writeObject(mr);
- }
- }
- }
-
- /**
- * Fill in a MethodRecord from the MethodDescriptor.
- * @param mr
- * @param md
- *
- * @since 1.1.0
- */
- protected void fill(MethodRecord mr, MethodDescriptor md) {
- mr.methodForDescriptor = getReflectedMethodRecord(md.getMethod());
- ParameterDescriptor[] parms = md.getParameterDescriptors();
- if (parms == null)
- mr.parameters = null;
- else {
- mr.parameters = new ParameterRecord[parms.length];
- for (int j = 0; j < parms.length; j++) {
- ParameterRecord pr = new ParameterRecord();
- fill(parms[j], pr, PARAMETER_RECORD_TYPE);
- mr.parameters[j] = pr;
- }
- }
- fill(md, mr, METHOD_RECORD_TYPE);
- }
-
- /**
- * Called by IDE to send the event set decorators information back through the callback.
- *
- * @throws CommandException
- * @throws IOException
- * @since 1.1.0
- */
- public void sendEventDecorators(ObjectOutputStream stream ) throws IOException, CommandException {
- EventSetDescriptor[] events = getEventSetDescriptors();
- if (events != null && events.length > 0) {
- // Now start writing the records.
- stream.writeInt(IBeanInfoIntrospectionConstants.EVENT_DECORATORS_SENT);
- stream.writeInt(events.length);
- for (int i = 0; i < events.length; i++) {
- EventSetDescriptor ed = events[i];
- EventSetRecord er = new EventSetRecord();
- er.addListenerMethod = getReflectedMethodRecord(ed.getAddListenerMethod());
- MethodDescriptor[] mds = ed.getListenerMethodDescriptors();
- if (mds == null)
- er.listenerMethodDescriptors = null;
- else {
- er.listenerMethodDescriptors = new MethodRecord[mds.length];
- for (int j = 0; j < mds.length; j++) {
- fill(er.listenerMethodDescriptors[j] = new MethodRecord(), mds[j]);
- }
- }
- er.listenerTypeName = getClassName(ed.getListenerType());
- er.removeListenerMethod = getReflectedMethodRecord(ed.getRemoveListenerMethod());
- er.inDefaultEventSet = ed.isInDefaultEventSet();
- er.unicast = ed.isUnicast();
- er.eventAdapterClassName = null;
- fill(ed, er, EVENTSET_RECORD_TYPE);
- stream.writeObject(er);
- }
- }
- }
-
- protected static final int BEAN_RECORD_TYPE = 0;
-
- protected static final int PROPERTY_RECORD_TYPE = 1;
-
- protected static final int INDEXEDPROPERTY_RECORD_TYPE = 2;
-
- protected static final int METHOD_RECORD_TYPE = 3;
-
- protected static final int PARAMETER_RECORD_TYPE = 4;
-
- protected static final int EVENTSET_RECORD_TYPE = 5;
-
- /**
- * Fill in the special attr/values for the given record type. The default handles the standard ones.
- *
- * @param record
- * @param descr
- * @param attributeName
- * @param recordType
- * type of record ultimately being processed.
- * @return <code>true</code> if this attribute is a special one and processed, <code>false</code> if not special and should be added to
- * attributes list transferred to IDE.
- *
- * @see ModelingBeanInfo#PROPERTY_RECORD_TYPE
- * @since 1.1.0
- */
- protected boolean fillFromAttributes(FeatureRecord record, FeatureDescriptor descr, String attributeName, int recordType) {
- switch (recordType) {
- case INDEXEDPROPERTY_RECORD_TYPE:
- case PROPERTY_RECORD_TYPE:
- if (BaseBeanInfo.DESIGNTIMEPROPERTY.equals(attributeName)) {
- ((PropertyRecord) record).designTime = (Boolean) descr.getValue(attributeName);
- return true;
- } else if (BaseBeanInfo.FIELDPROPERTY.equals(attributeName)) {
- Field f = (Field) descr.getValue(attributeName);
- // We have a field, set the property type to this since we couldn't correctly create this otherwise.
- PropertyRecord pr = (PropertyRecord) record;
- pr.propertyTypeName = getClassName(f.getType());
- pr.field = getReflectedFieldRecord(f);
- pr.readMethod = null; // Need to wipe out our dummy.
- pr.writeMethod = null; // Or if it set, not valid for a field.
- return true;
- }
- break;
- case EVENTSET_RECORD_TYPE:
- if (BaseBeanInfo.EVENTADAPTERCLASS.equals(attributeName)) {
- ((EventSetRecord) record).eventAdapterClassName = (String) descr.getValue(attributeName);
- return true;
- }
- break;
- default:
- break; // Didn't handle it.
- }
- return false;
- }
-
- /**
- * Fill in the feature portion of the Descriptor into the record. We can be reusing some records (so we don't keep allocating when not needed), so
- * we will null out unset fields.
- *
- * @param descr
- * @param record
- * @param recordType
- * type of record ultimately being processed. Used for fillFromAttributes.
- *
- * @see ModelingBeanInfo#PROPERTY_RECORD_TYPE
- * @since 1.1.0
- */
- protected void fill(FeatureDescriptor descr, FeatureRecord record, int recordType) {
- record.name = descr.getName();
- String dn = descr.getDisplayName();
- if (!record.name.equals(dn))
- record.displayName = dn; // display name returns name if display name not set. We don't want to send it if identical. (Note some Beaninfos are setting displayname the same text but not same string).
- else
- record.displayName = null;
- String shd = descr.getShortDescription();
- if (!dn.equals(shd))
- record.shortDescription = shd; // short description returns displayname if short description not set. We don't want to send it if
- // identical.
- else
- record.shortDescription = null;
- record.expert = descr.isExpert();
- record.hidden = descr.isHidden();
- record.preferred = descr.isPreferred();
- record.category = null; // Clear out in case not set.
- Enumeration attrs = descr.attributeNames();
- if (attrs.hasMoreElements()) {
- // We don't have a way of knowing how many there are ahead of time, so we will build into lists and then turn into arrays at the end.
- List names = new ArrayList();
- List values = new ArrayList();
- while (attrs.hasMoreElements()) {
- String attrName = (String) attrs.nextElement();
- if (attrName.equals(IBaseBeanInfoConstants.CATEGORY))
- record.category = (String) descr.getValue(IBaseBeanInfoConstants.CATEGORY);
- else if (attrName.equals(BaseBeanInfo.PREFERRED)) {
- // A bug in Java 1.3, doing setPreferred was lost. So for those also stored it in attributes. So if set here, then use it.
- record.preferred = ((Boolean) descr.getValue(BaseBeanInfo.PREFERRED)).booleanValue();
- } else if (!fillFromAttributes(record, descr, attrName, recordType)) {
- // Just copy accross. FillfromAttributes didn't handle it.
- FeatureAttributeValue fv = new FeatureAttributeValue();
- fv.setValue(descr.getValue(attrName));
- names.add(attrName);
- values.add(fv);
- }
- }
- if (!names.isEmpty()) {
- record.attributeNames = (String[]) names.toArray(new String[names.size()]);
- record.attributeValues = (FeatureAttributeValue[]) values.toArray(new FeatureAttributeValue[values.size()]);
- } else {
- record.attributeNames = null;
- record.attributeValues = null;
- }
- } else {
- record.attributeNames = null;
- record.attributeValues = null;
- }
-
- }
-
- /*
- * Get the classname from the class. If classs is null, then this return null.
- */
- private String getClassName(Class classs) {
- return classs != null ? classs.getName() : null;
- }
-
- private ReflectMethodRecord getReflectedMethodRecord(Method method) {
- if (method != null) {
- ReflectMethodRecord rmr = new ReflectMethodRecord();
- rmr.className = getClassName(method.getDeclaringClass());
- rmr.methodName = method.getName();
- Class[] parmTypes = method.getParameterTypes();
- if (parmTypes.length > 0) {
- rmr.parameterTypeNames = new String[parmTypes.length];
- for (int i = 0; i < parmTypes.length; i++) {
- rmr.parameterTypeNames[i] = getClassName(parmTypes[i]);
- }
- }
- return rmr;
- } else
- return null;
- }
-
- private ReflectFieldRecord getReflectedFieldRecord(Field field) {
- if (field != null) {
- ReflectFieldRecord rf = new ReflectFieldRecord();
- rf.className = getClassName(field.getDeclaringClass());
- rf.fieldName = field.getName();
- rf.readOnly = Modifier.isFinal(field.getModifiers());
- return rf;
- } else
- return null;
- }
-}
diff --git a/plugins/org.eclipse.jem.beaninfo.vm/vm_beaninfovm/org/eclipse/jem/internal/beaninfo/vm/ModelingBeanInfo15.java b/plugins/org.eclipse.jem.beaninfo.vm/vm_beaninfovm/org/eclipse/jem/internal/beaninfo/vm/ModelingBeanInfo15.java
deleted file mode 100644
index 04d2cb6..0000000
--- a/plugins/org.eclipse.jem.beaninfo.vm/vm_beaninfovm/org/eclipse/jem/internal/beaninfo/vm/ModelingBeanInfo15.java
+++ /dev/null
@@ -1,43 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2003, 2005 IBM Corporation and others.
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
- *
- * Contributors:
- * IBM Corporation - initial API and implementation
- *******************************************************************************/
-package org.eclipse.jem.internal.beaninfo.vm;
-/*
-
-
- */
-
-import java.beans.BeanInfo;
-
-/**
- * This was supposed to for 1.4 or above where it can use identity
- * to test for inherited features, but it still is not correct
- * in 1.4. See the header comments in ModelingBeanInfo.
- * @see org.eclipse.jem.internal.beaninfo.vm.ModelingBeanInfo
- */
-public class ModelingBeanInfo15 extends ModelingBeanInfo {
-
- /**
- * Constructor for ModelingBeanInfo15.
- * @param beanInfo
- */
- public ModelingBeanInfo15(BeanInfo beanInfo, int doFlags) {
- super(beanInfo, doFlags);
- }
-
- /**
- * Constructor for ModelingBeanInfo15.
- * @param beanInfo
- * @param superBeanInfo
- */
- public ModelingBeanInfo15(BeanInfo beanInfo, BeanInfo superBeanInfo, int doFlags) {
- super(beanInfo, superBeanInfo, doFlags);
- }
-}
diff --git a/plugins/org.eclipse.jem.beaninfo.vm/vm_beaninfovm/org/eclipse/jem/internal/beaninfo/vm/ModelingBeanInfoPre15.java b/plugins/org.eclipse.jem.beaninfo.vm/vm_beaninfovm/org/eclipse/jem/internal/beaninfo/vm/ModelingBeanInfoPre15.java
deleted file mode 100644
index bd2d85c..0000000
--- a/plugins/org.eclipse.jem.beaninfo.vm/vm_beaninfovm/org/eclipse/jem/internal/beaninfo/vm/ModelingBeanInfoPre15.java
+++ /dev/null
@@ -1,31 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2003, 2005 IBM Corporation and others.
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
- *
- * Contributors:
- * IBM Corporation - initial API and implementation
- *******************************************************************************/
-package org.eclipse.jem.internal.beaninfo.vm;
-/*
-
-
- */
-
-import java.beans.BeanInfo;
-
-/**
- * This is the modeling BeanInfo for Pre-JDK 1.4.
- */
-public class ModelingBeanInfoPre15 extends ModelingBeanInfo {
-
- public ModelingBeanInfoPre15(BeanInfo beanInfo, int doFlags) {
- super(beanInfo, doFlags);
- }
-
- public ModelingBeanInfoPre15(BeanInfo beanInfo, BeanInfo superBeanInfo, int doFlags) {
- super(beanInfo, superBeanInfo, doFlags);
- }
-}
diff --git a/plugins/org.eclipse.jem.beaninfo.vm/vm_beaninfovm/org/eclipse/jem/internal/beaninfo/vm/ParameterDescriptorEquality.java b/plugins/org.eclipse.jem.beaninfo.vm/vm_beaninfovm/org/eclipse/jem/internal/beaninfo/vm/ParameterDescriptorEquality.java
deleted file mode 100644
index 8e09fcd..0000000
--- a/plugins/org.eclipse.jem.beaninfo.vm/vm_beaninfovm/org/eclipse/jem/internal/beaninfo/vm/ParameterDescriptorEquality.java
+++ /dev/null
@@ -1,37 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2001, 2005 IBM Corporation and others.
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
- *
- * Contributors:
- * IBM Corporation - initial API and implementation
- *******************************************************************************/
-package org.eclipse.jem.internal.beaninfo.vm;
-/*
-
-
- */
-
-import java.beans.*;
-/**
- * ParameterDescriptor equality tester
- */
-public class ParameterDescriptorEquality extends FeatureDescriptorEquality {
-
- static void INIT() {
- try {
- MAP_EQUALITY.put(ParameterDescriptor.class, (ParameterDescriptorEquality.class).getConstructor(new Class[] {ParameterDescriptor.class}));
- } catch (NoSuchMethodException e) {
- }
- }
-
- public ParameterDescriptorEquality() {
- }
-
- public ParameterDescriptorEquality(ParameterDescriptor descr) {
- super(descr);
- }
-
-}
diff --git a/plugins/org.eclipse.jem.beaninfo.vm/vm_beaninfovm/org/eclipse/jem/internal/beaninfo/vm/PropertyDescriptorEquality.java b/plugins/org.eclipse.jem.beaninfo.vm/vm_beaninfovm/org/eclipse/jem/internal/beaninfo/vm/PropertyDescriptorEquality.java
deleted file mode 100644
index 75d5eee..0000000
--- a/plugins/org.eclipse.jem.beaninfo.vm/vm_beaninfovm/org/eclipse/jem/internal/beaninfo/vm/PropertyDescriptorEquality.java
+++ /dev/null
@@ -1,83 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2001, 2005 IBM Corporation and others.
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
- *
- * Contributors:
- * IBM Corporation - initial API and implementation
- *******************************************************************************/
-package org.eclipse.jem.internal.beaninfo.vm;
-/*
-
-
- */
-
-import java.beans.*;
-/**
- * PropertyDescriptor equality tester
- */
-public abstract class PropertyDescriptorEquality extends FeatureDescriptorEquality {
-
- public PropertyDescriptorEquality() {
- }
-
- public PropertyDescriptorEquality(PropertyDescriptor descr) {
- super(descr);
- }
- /**
- * Calculate the hashcode for the current feature, add this
- * to the hashcode received from super.calculateHashCode
- * and return the new value.
- *
- * NOTE: for subclasses, it is MANDITORY that the first line be:
- * int hashcode = super.calculateHashCode();
- * and the last line be:
- * return hashcode*31 + (your calculated hashcode for just this subclass);
- */
- protected int calculateHashCode() {
- int hashcode = super.calculateHashCode();
- PropertyDescriptor pd = (PropertyDescriptor) fFeature;
- int hc = 0;
- if (pd.getPropertyEditorClass() != null)
- hc += pd.getPropertyEditorClass().hashCode();
- if (pd.getPropertyType() != null)
- hc += pd.getPropertyType().hashCode();
- if (pd.getReadMethod() != null)
- hc += pd.getReadMethod().hashCode();
- if (pd.getWriteMethod() != null)
- hc += pd.getWriteMethod().hashCode();
-
- hc += (pd.isBound() ? Boolean.TRUE : Boolean.FALSE).hashCode();
- hc += (pd.isConstrained() ? Boolean.TRUE : Boolean.FALSE).hashCode();
-
- return hashcode*31 + hc;
- }
-
- public boolean equals(Object obj) {
- if (identityTest(obj))
- return true;
-
- if (!super.equals(obj))
- return false;
-
- PropertyDescriptor op = (PropertyDescriptor) ((FeatureDescriptorEquality) obj).fFeature;
- PropertyDescriptor fp = (PropertyDescriptor) fFeature;
-
- if (op.getPropertyEditorClass() != fp.getPropertyEditorClass())
- return false;
- if (op.getReadMethod() != fp.getReadMethod())
- return false;
- if (op.getWriteMethod() != fp.getWriteMethod())
- return false;
- if (op.isBound() != fp.isBound())
- return false;
- if (op.isConstrained() != fp.isConstrained())
- return false;
-
- return true;
- }
-
-
-}
diff --git a/plugins/org.eclipse.jem.beaninfo/.classpath b/plugins/org.eclipse.jem.beaninfo/.classpath
deleted file mode 100644
index 58f0548..0000000
--- a/plugins/org.eclipse.jem.beaninfo/.classpath
+++ /dev/null
@@ -1,7 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<classpath>
- <classpathentry kind="src" path="beaninfo"/>
- <classpathentry kind="con" path="org.eclipse.jdt.launching.JRE_CONTAINER/org.eclipse.jdt.internal.debug.ui.launcher.StandardVMType/J2SE-1.5"/>
- <classpathentry kind="con" path="org.eclipse.pde.core.requiredPlugins"/>
- <classpathentry kind="output" path="bin"/>
-</classpath>
diff --git a/plugins/org.eclipse.jem.beaninfo/.cvsignore b/plugins/org.eclipse.jem.beaninfo/.cvsignore
deleted file mode 100644
index 15aa9ec..0000000
--- a/plugins/org.eclipse.jem.beaninfo/.cvsignore
+++ /dev/null
@@ -1,4 +0,0 @@
-bin
-build.xml
-@dot
-org.eclipse.jem.beaninfo*
diff --git a/plugins/org.eclipse.jem.beaninfo/.options b/plugins/org.eclipse.jem.beaninfo/.options
deleted file mode 100644
index 5b24652..0000000
--- a/plugins/org.eclipse.jem.beaninfo/.options
+++ /dev/null
@@ -1,3 +0,0 @@
-org.eclipse.jem.beaninfo/debug/logtrace=default
-org.eclipse.jem.beaninfo/debug/logtracefile=default
-org.eclipse.jem.beaninfo/debug/loglevel=default
diff --git a/plugins/org.eclipse.jem.beaninfo/.project b/plugins/org.eclipse.jem.beaninfo/.project
deleted file mode 100644
index c562a55..0000000
--- a/plugins/org.eclipse.jem.beaninfo/.project
+++ /dev/null
@@ -1,24 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<projectDescription>
- <name>org.eclipse.jem.beaninfo</name>
- <comment></comment>
- <projects></projects>
- <buildSpec>
- <buildCommand>
- <name>org.eclipse.jdt.core.javabuilder</name>
- <arguments></arguments>
- </buildCommand>
- <buildCommand>
- <name>org.eclipse.pde.ManifestBuilder</name>
- <arguments></arguments>
- </buildCommand>
- <buildCommand>
- <name>org.eclipse.pde.SchemaBuilder</name>
- <arguments></arguments>
- </buildCommand>
- </buildSpec>
- <natures>
- <nature>org.eclipse.pde.PluginNature</nature>
- <nature>org.eclipse.jdt.core.javanature</nature>
- </natures>
-</projectDescription>
diff --git a/plugins/org.eclipse.jem.beaninfo/.settings/org.eclipse.core.resources.prefs b/plugins/org.eclipse.jem.beaninfo/.settings/org.eclipse.core.resources.prefs
deleted file mode 100644
index 5a36f55..0000000
--- a/plugins/org.eclipse.jem.beaninfo/.settings/org.eclipse.core.resources.prefs
+++ /dev/null
@@ -1,4 +0,0 @@
-#Sun Apr 15 21:15:04 EDT 2007
-eclipse.preferences.version=1
-encoding//beaninfo/org/eclipse/jem/internal/beaninfo/core/messages.properties=8859_1
-encoding/<project>=ISO-8859-1
diff --git a/plugins/org.eclipse.jem.beaninfo/.settings/org.eclipse.jdt.core.prefs b/plugins/org.eclipse.jem.beaninfo/.settings/org.eclipse.jdt.core.prefs
deleted file mode 100644
index b88ad86..0000000
--- a/plugins/org.eclipse.jem.beaninfo/.settings/org.eclipse.jdt.core.prefs
+++ /dev/null
@@ -1,294 +0,0 @@
-#Sat Mar 31 23:05:43 EDT 2007
-eclipse.preferences.version=1
-org.eclipse.jdt.core.compiler.codegen.inlineJsrBytecode=enabled
-org.eclipse.jdt.core.compiler.codegen.targetPlatform=1.5
-org.eclipse.jdt.core.compiler.compliance=1.5
-org.eclipse.jdt.core.compiler.problem.annotationSuperInterface=warning
-org.eclipse.jdt.core.compiler.problem.assertIdentifier=error
-org.eclipse.jdt.core.compiler.problem.autoboxing=ignore
-org.eclipse.jdt.core.compiler.problem.deprecation=warning
-org.eclipse.jdt.core.compiler.problem.deprecationInDeprecatedCode=disabled
-org.eclipse.jdt.core.compiler.problem.deprecationWhenOverridingDeprecatedMethod=disabled
-org.eclipse.jdt.core.compiler.problem.emptyStatement=ignore
-org.eclipse.jdt.core.compiler.problem.enumIdentifier=error
-org.eclipse.jdt.core.compiler.problem.fieldHiding=ignore
-org.eclipse.jdt.core.compiler.problem.finalParameterBound=warning
-org.eclipse.jdt.core.compiler.problem.finallyBlockNotCompletingNormally=warning
-org.eclipse.jdt.core.compiler.problem.hiddenCatchBlock=warning
-org.eclipse.jdt.core.compiler.problem.incompatibleNonInheritedInterfaceMethod=warning
-org.eclipse.jdt.core.compiler.problem.incompleteEnumSwitch=ignore
-org.eclipse.jdt.core.compiler.problem.indirectStaticAccess=ignore
-org.eclipse.jdt.core.compiler.problem.localVariableHiding=ignore
-org.eclipse.jdt.core.compiler.problem.methodWithConstructorName=warning
-org.eclipse.jdt.core.compiler.problem.missingDeprecatedAnnotation=ignore
-org.eclipse.jdt.core.compiler.problem.missingOverrideAnnotation=ignore
-org.eclipse.jdt.core.compiler.problem.missingSerialVersion=warning
-org.eclipse.jdt.core.compiler.problem.noEffectAssignment=warning
-org.eclipse.jdt.core.compiler.problem.noImplicitStringConversion=warning
-org.eclipse.jdt.core.compiler.problem.nonExternalizedStringLiteral=ignore
-org.eclipse.jdt.core.compiler.problem.overridingPackageDefaultMethod=warning
-org.eclipse.jdt.core.compiler.problem.possibleAccidentalBooleanAssignment=ignore
-org.eclipse.jdt.core.compiler.problem.rawTypeReference=ignore
-org.eclipse.jdt.core.compiler.problem.specialParameterHidingField=disabled
-org.eclipse.jdt.core.compiler.problem.staticAccessReceiver=warning
-org.eclipse.jdt.core.compiler.problem.syntheticAccessEmulation=ignore
-org.eclipse.jdt.core.compiler.problem.typeParameterHiding=warning
-org.eclipse.jdt.core.compiler.problem.uncheckedTypeOperation=ignore
-org.eclipse.jdt.core.compiler.problem.undocumentedEmptyBlock=ignore
-org.eclipse.jdt.core.compiler.problem.unnecessaryElse=ignore
-org.eclipse.jdt.core.compiler.problem.unnecessaryTypeCheck=error
-org.eclipse.jdt.core.compiler.problem.unqualifiedFieldAccess=ignore
-org.eclipse.jdt.core.compiler.problem.unusedDeclaredThrownException=ignore
-org.eclipse.jdt.core.compiler.problem.unusedDeclaredThrownExceptionWhenOverriding=disabled
-org.eclipse.jdt.core.compiler.problem.unusedImport=error
-org.eclipse.jdt.core.compiler.problem.unusedLocal=error
-org.eclipse.jdt.core.compiler.problem.unusedParameter=ignore
-org.eclipse.jdt.core.compiler.problem.unusedParameterWhenImplementingAbstract=disabled
-org.eclipse.jdt.core.compiler.problem.unusedParameterWhenOverridingConcrete=disabled
-org.eclipse.jdt.core.compiler.problem.unusedPrivateMember=error
-org.eclipse.jdt.core.compiler.problem.varargsArgumentNeedCast=warning
-org.eclipse.jdt.core.compiler.source=1.5
-org.eclipse.jdt.core.formatter.align_type_members_on_columns=false
-org.eclipse.jdt.core.formatter.alignment_for_arguments_in_allocation_expression=16
-org.eclipse.jdt.core.formatter.alignment_for_arguments_in_enum_constant=16
-org.eclipse.jdt.core.formatter.alignment_for_arguments_in_explicit_constructor_call=16
-org.eclipse.jdt.core.formatter.alignment_for_arguments_in_method_invocation=16
-org.eclipse.jdt.core.formatter.alignment_for_arguments_in_qualified_allocation_expression=16
-org.eclipse.jdt.core.formatter.alignment_for_assignment=0
-org.eclipse.jdt.core.formatter.alignment_for_binary_expression=16
-org.eclipse.jdt.core.formatter.alignment_for_compact_if=16
-org.eclipse.jdt.core.formatter.alignment_for_conditional_expression=80
-org.eclipse.jdt.core.formatter.alignment_for_enum_constants=0
-org.eclipse.jdt.core.formatter.alignment_for_expressions_in_array_initializer=16
-org.eclipse.jdt.core.formatter.alignment_for_multiple_fields=16
-org.eclipse.jdt.core.formatter.alignment_for_parameters_in_constructor_declaration=16
-org.eclipse.jdt.core.formatter.alignment_for_parameters_in_method_declaration=16
-org.eclipse.jdt.core.formatter.alignment_for_selector_in_method_invocation=16
-org.eclipse.jdt.core.formatter.alignment_for_superclass_in_type_declaration=16
-org.eclipse.jdt.core.formatter.alignment_for_superinterfaces_in_enum_declaration=16
-org.eclipse.jdt.core.formatter.alignment_for_superinterfaces_in_type_declaration=16
-org.eclipse.jdt.core.formatter.alignment_for_throws_clause_in_constructor_declaration=16
-org.eclipse.jdt.core.formatter.alignment_for_throws_clause_in_method_declaration=16
-org.eclipse.jdt.core.formatter.blank_lines_after_imports=1
-org.eclipse.jdt.core.formatter.blank_lines_after_package=1
-org.eclipse.jdt.core.formatter.blank_lines_before_field=1
-org.eclipse.jdt.core.formatter.blank_lines_before_first_class_body_declaration=1
-org.eclipse.jdt.core.formatter.blank_lines_before_imports=1
-org.eclipse.jdt.core.formatter.blank_lines_before_member_type=1
-org.eclipse.jdt.core.formatter.blank_lines_before_method=1
-org.eclipse.jdt.core.formatter.blank_lines_before_new_chunk=1
-org.eclipse.jdt.core.formatter.blank_lines_before_package=0
-org.eclipse.jdt.core.formatter.blank_lines_between_type_declarations=1
-org.eclipse.jdt.core.formatter.brace_position_for_annotation_type_declaration=end_of_line
-org.eclipse.jdt.core.formatter.brace_position_for_anonymous_type_declaration=end_of_line
-org.eclipse.jdt.core.formatter.brace_position_for_array_initializer=end_of_line
-org.eclipse.jdt.core.formatter.brace_position_for_block=end_of_line
-org.eclipse.jdt.core.formatter.brace_position_for_block_in_case=end_of_line
-org.eclipse.jdt.core.formatter.brace_position_for_constructor_declaration=end_of_line
-org.eclipse.jdt.core.formatter.brace_position_for_enum_constant=end_of_line
-org.eclipse.jdt.core.formatter.brace_position_for_enum_declaration=end_of_line
-org.eclipse.jdt.core.formatter.brace_position_for_method_declaration=end_of_line
-org.eclipse.jdt.core.formatter.brace_position_for_switch=end_of_line
-org.eclipse.jdt.core.formatter.brace_position_for_type_declaration=end_of_line
-org.eclipse.jdt.core.formatter.comment.format_header=false
-org.eclipse.jdt.core.formatter.comment.format_html=true
-org.eclipse.jdt.core.formatter.comment.format_source_code=true
-org.eclipse.jdt.core.formatter.comment.indent_parameter_description=true
-org.eclipse.jdt.core.formatter.comment.indent_root_tags=true
-org.eclipse.jdt.core.formatter.comment.insert_new_line_before_root_tags=insert
-org.eclipse.jdt.core.formatter.comment.insert_new_line_for_parameter=insert
-org.eclipse.jdt.core.formatter.comment.line_length=150
-org.eclipse.jdt.core.formatter.compact_else_if=true
-org.eclipse.jdt.core.formatter.continuation_indentation=2
-org.eclipse.jdt.core.formatter.continuation_indentation_for_array_initializer=2
-org.eclipse.jdt.core.formatter.format_guardian_clause_on_one_line=true
-org.eclipse.jdt.core.formatter.indent_body_declarations_compare_to_annotation_declaration_header=true
-org.eclipse.jdt.core.formatter.indent_body_declarations_compare_to_enum_constant_header=true
-org.eclipse.jdt.core.formatter.indent_body_declarations_compare_to_enum_declaration_header=true
-org.eclipse.jdt.core.formatter.indent_body_declarations_compare_to_type_header=true
-org.eclipse.jdt.core.formatter.indent_breaks_compare_to_cases=true
-org.eclipse.jdt.core.formatter.indent_empty_lines=false
-org.eclipse.jdt.core.formatter.indent_statements_compare_to_block=true
-org.eclipse.jdt.core.formatter.indent_statements_compare_to_body=true
-org.eclipse.jdt.core.formatter.indent_switchstatements_compare_to_cases=true
-org.eclipse.jdt.core.formatter.indent_switchstatements_compare_to_switch=true
-org.eclipse.jdt.core.formatter.indentation.size=4
-org.eclipse.jdt.core.formatter.insert_new_line_after_annotation=insert
-org.eclipse.jdt.core.formatter.insert_new_line_after_opening_brace_in_array_initializer=do not insert
-org.eclipse.jdt.core.formatter.insert_new_line_at_end_of_file_if_missing=do not insert
-org.eclipse.jdt.core.formatter.insert_new_line_before_catch_in_try_statement=do not insert
-org.eclipse.jdt.core.formatter.insert_new_line_before_closing_brace_in_array_initializer=do not insert
-org.eclipse.jdt.core.formatter.insert_new_line_before_else_in_if_statement=do not insert
-org.eclipse.jdt.core.formatter.insert_new_line_before_finally_in_try_statement=do not insert
-org.eclipse.jdt.core.formatter.insert_new_line_before_while_in_do_statement=do not insert
-org.eclipse.jdt.core.formatter.insert_new_line_in_empty_annotation_declaration=insert
-org.eclipse.jdt.core.formatter.insert_new_line_in_empty_anonymous_type_declaration=insert
-org.eclipse.jdt.core.formatter.insert_new_line_in_empty_block=insert
-org.eclipse.jdt.core.formatter.insert_new_line_in_empty_enum_constant=insert
-org.eclipse.jdt.core.formatter.insert_new_line_in_empty_enum_declaration=insert
-org.eclipse.jdt.core.formatter.insert_new_line_in_empty_method_body=insert
-org.eclipse.jdt.core.formatter.insert_new_line_in_empty_type_declaration=insert
-org.eclipse.jdt.core.formatter.insert_space_after_and_in_type_parameter=insert
-org.eclipse.jdt.core.formatter.insert_space_after_assignment_operator=insert
-org.eclipse.jdt.core.formatter.insert_space_after_at_in_annotation=do not insert
-org.eclipse.jdt.core.formatter.insert_space_after_at_in_annotation_type_declaration=do not insert
-org.eclipse.jdt.core.formatter.insert_space_after_binary_operator=insert
-org.eclipse.jdt.core.formatter.insert_space_after_closing_angle_bracket_in_type_arguments=insert
-org.eclipse.jdt.core.formatter.insert_space_after_closing_angle_bracket_in_type_parameters=insert
-org.eclipse.jdt.core.formatter.insert_space_after_closing_brace_in_block=insert
-org.eclipse.jdt.core.formatter.insert_space_after_closing_paren_in_cast=insert
-org.eclipse.jdt.core.formatter.insert_space_after_colon_in_assert=insert
-org.eclipse.jdt.core.formatter.insert_space_after_colon_in_case=insert
-org.eclipse.jdt.core.formatter.insert_space_after_colon_in_conditional=insert
-org.eclipse.jdt.core.formatter.insert_space_after_colon_in_for=insert
-org.eclipse.jdt.core.formatter.insert_space_after_colon_in_labeled_statement=insert
-org.eclipse.jdt.core.formatter.insert_space_after_comma_in_allocation_expression=insert
-org.eclipse.jdt.core.formatter.insert_space_after_comma_in_annotation=insert
-org.eclipse.jdt.core.formatter.insert_space_after_comma_in_array_initializer=insert
-org.eclipse.jdt.core.formatter.insert_space_after_comma_in_constructor_declaration_parameters=insert
-org.eclipse.jdt.core.formatter.insert_space_after_comma_in_constructor_declaration_throws=insert
-org.eclipse.jdt.core.formatter.insert_space_after_comma_in_enum_constant_arguments=insert
-org.eclipse.jdt.core.formatter.insert_space_after_comma_in_enum_declarations=insert
-org.eclipse.jdt.core.formatter.insert_space_after_comma_in_explicitconstructorcall_arguments=insert
-org.eclipse.jdt.core.formatter.insert_space_after_comma_in_for_increments=insert
-org.eclipse.jdt.core.formatter.insert_space_after_comma_in_for_inits=insert
-org.eclipse.jdt.core.formatter.insert_space_after_comma_in_method_declaration_parameters=insert
-org.eclipse.jdt.core.formatter.insert_space_after_comma_in_method_declaration_throws=insert
-org.eclipse.jdt.core.formatter.insert_space_after_comma_in_method_invocation_arguments=insert
-org.eclipse.jdt.core.formatter.insert_space_after_comma_in_multiple_field_declarations=insert
-org.eclipse.jdt.core.formatter.insert_space_after_comma_in_multiple_local_declarations=insert
-org.eclipse.jdt.core.formatter.insert_space_after_comma_in_parameterized_type_reference=insert
-org.eclipse.jdt.core.formatter.insert_space_after_comma_in_superinterfaces=insert
-org.eclipse.jdt.core.formatter.insert_space_after_comma_in_type_arguments=insert
-org.eclipse.jdt.core.formatter.insert_space_after_comma_in_type_parameters=insert
-org.eclipse.jdt.core.formatter.insert_space_after_ellipsis=insert
-org.eclipse.jdt.core.formatter.insert_space_after_opening_angle_bracket_in_parameterized_type_reference=do not insert
-org.eclipse.jdt.core.formatter.insert_space_after_opening_angle_bracket_in_type_arguments=do not insert
-org.eclipse.jdt.core.formatter.insert_space_after_opening_angle_bracket_in_type_parameters=do not insert
-org.eclipse.jdt.core.formatter.insert_space_after_opening_brace_in_array_initializer=insert
-org.eclipse.jdt.core.formatter.insert_space_after_opening_bracket_in_array_allocation_expression=do not insert
-org.eclipse.jdt.core.formatter.insert_space_after_opening_bracket_in_array_reference=do not insert
-org.eclipse.jdt.core.formatter.insert_space_after_opening_paren_in_annotation=do not insert
-org.eclipse.jdt.core.formatter.insert_space_after_opening_paren_in_cast=do not insert
-org.eclipse.jdt.core.formatter.insert_space_after_opening_paren_in_catch=do not insert
-org.eclipse.jdt.core.formatter.insert_space_after_opening_paren_in_constructor_declaration=do not insert
-org.eclipse.jdt.core.formatter.insert_space_after_opening_paren_in_enum_constant=do not insert
-org.eclipse.jdt.core.formatter.insert_space_after_opening_paren_in_for=do not insert
-org.eclipse.jdt.core.formatter.insert_space_after_opening_paren_in_if=do not insert
-org.eclipse.jdt.core.formatter.insert_space_after_opening_paren_in_method_declaration=do not insert
-org.eclipse.jdt.core.formatter.insert_space_after_opening_paren_in_method_invocation=do not insert
-org.eclipse.jdt.core.formatter.insert_space_after_opening_paren_in_parenthesized_expression=do not insert
-org.eclipse.jdt.core.formatter.insert_space_after_opening_paren_in_switch=do not insert
-org.eclipse.jdt.core.formatter.insert_space_after_opening_paren_in_synchronized=do not insert
-org.eclipse.jdt.core.formatter.insert_space_after_opening_paren_in_while=do not insert
-org.eclipse.jdt.core.formatter.insert_space_after_postfix_operator=do not insert
-org.eclipse.jdt.core.formatter.insert_space_after_prefix_operator=do not insert
-org.eclipse.jdt.core.formatter.insert_space_after_question_in_conditional=insert
-org.eclipse.jdt.core.formatter.insert_space_after_question_in_wildcard=do not insert
-org.eclipse.jdt.core.formatter.insert_space_after_semicolon_in_for=insert
-org.eclipse.jdt.core.formatter.insert_space_after_unary_operator=do not insert
-org.eclipse.jdt.core.formatter.insert_space_before_and_in_type_parameter=insert
-org.eclipse.jdt.core.formatter.insert_space_before_assignment_operator=insert
-org.eclipse.jdt.core.formatter.insert_space_before_at_in_annotation_type_declaration=insert
-org.eclipse.jdt.core.formatter.insert_space_before_binary_operator=insert
-org.eclipse.jdt.core.formatter.insert_space_before_closing_angle_bracket_in_parameterized_type_reference=do not insert
-org.eclipse.jdt.core.formatter.insert_space_before_closing_angle_bracket_in_type_arguments=do not insert
-org.eclipse.jdt.core.formatter.insert_space_before_closing_angle_bracket_in_type_parameters=do not insert
-org.eclipse.jdt.core.formatter.insert_space_before_closing_brace_in_array_initializer=do not insert
-org.eclipse.jdt.core.formatter.insert_space_before_closing_bracket_in_array_allocation_expression=do not insert
-org.eclipse.jdt.core.formatter.insert_space_before_closing_bracket_in_array_reference=do not insert
-org.eclipse.jdt.core.formatter.insert_space_before_closing_paren_in_annotation=do not insert
-org.eclipse.jdt.core.formatter.insert_space_before_closing_paren_in_cast=do not insert
-org.eclipse.jdt.core.formatter.insert_space_before_closing_paren_in_catch=do not insert
-org.eclipse.jdt.core.formatter.insert_space_before_closing_paren_in_constructor_declaration=do not insert
-org.eclipse.jdt.core.formatter.insert_space_before_closing_paren_in_enum_constant=do not insert
-org.eclipse.jdt.core.formatter.insert_space_before_closing_paren_in_for=do not insert
-org.eclipse.jdt.core.formatter.insert_space_before_closing_paren_in_if=do not insert
-org.eclipse.jdt.core.formatter.insert_space_before_closing_paren_in_method_declaration=do not insert
-org.eclipse.jdt.core.formatter.insert_space_before_closing_paren_in_method_invocation=do not insert
-org.eclipse.jdt.core.formatter.insert_space_before_closing_paren_in_parenthesized_expression=do not insert
-org.eclipse.jdt.core.formatter.insert_space_before_closing_paren_in_switch=do not insert
-org.eclipse.jdt.core.formatter.insert_space_before_closing_paren_in_synchronized=do not insert
-org.eclipse.jdt.core.formatter.insert_space_before_closing_paren_in_while=do not insert
-org.eclipse.jdt.core.formatter.insert_space_before_colon_in_assert=insert
-org.eclipse.jdt.core.formatter.insert_space_before_colon_in_case=do not insert
-org.eclipse.jdt.core.formatter.insert_space_before_colon_in_conditional=insert
-org.eclipse.jdt.core.formatter.insert_space_before_colon_in_default=do not insert
-org.eclipse.jdt.core.formatter.insert_space_before_colon_in_for=insert
-org.eclipse.jdt.core.formatter.insert_space_before_colon_in_labeled_statement=do not insert
-org.eclipse.jdt.core.formatter.insert_space_before_comma_in_allocation_expression=do not insert
-org.eclipse.jdt.core.formatter.insert_space_before_comma_in_annotation=do not insert
-org.eclipse.jdt.core.formatter.insert_space_before_comma_in_array_initializer=do not insert
-org.eclipse.jdt.core.formatter.insert_space_before_comma_in_constructor_declaration_parameters=do not insert
-org.eclipse.jdt.core.formatter.insert_space_before_comma_in_constructor_declaration_throws=do not insert
-org.eclipse.jdt.core.formatter.insert_space_before_comma_in_enum_constant_arguments=do not insert
-org.eclipse.jdt.core.formatter.insert_space_before_comma_in_enum_declarations=do not insert
-org.eclipse.jdt.core.formatter.insert_space_before_comma_in_explicitconstructorcall_arguments=do not insert
-org.eclipse.jdt.core.formatter.insert_space_before_comma_in_for_increments=do not insert
-org.eclipse.jdt.core.formatter.insert_space_before_comma_in_for_inits=do not insert
-org.eclipse.jdt.core.formatter.insert_space_before_comma_in_method_declaration_parameters=do not insert
-org.eclipse.jdt.core.formatter.insert_space_before_comma_in_method_declaration_throws=do not insert
-org.eclipse.jdt.core.formatter.insert_space_before_comma_in_method_invocation_arguments=do not insert
-org.eclipse.jdt.core.formatter.insert_space_before_comma_in_multiple_field_declarations=do not insert
-org.eclipse.jdt.core.formatter.insert_space_before_comma_in_multiple_local_declarations=do not insert
-org.eclipse.jdt.core.formatter.insert_space_before_comma_in_parameterized_type_reference=do not insert
-org.eclipse.jdt.core.formatter.insert_space_before_comma_in_superinterfaces=do not insert
-org.eclipse.jdt.core.formatter.insert_space_before_comma_in_type_arguments=do not insert
-org.eclipse.jdt.core.formatter.insert_space_before_comma_in_type_parameters=do not insert
-org.eclipse.jdt.core.formatter.insert_space_before_ellipsis=do not insert
-org.eclipse.jdt.core.formatter.insert_space_before_opening_angle_bracket_in_parameterized_type_reference=do not insert
-org.eclipse.jdt.core.formatter.insert_space_before_opening_angle_bracket_in_type_arguments=do not insert
-org.eclipse.jdt.core.formatter.insert_space_before_opening_angle_bracket_in_type_parameters=do not insert
-org.eclipse.jdt.core.formatter.insert_space_before_opening_brace_in_annotation_type_declaration=insert
-org.eclipse.jdt.core.formatter.insert_space_before_opening_brace_in_anonymous_type_declaration=insert
-org.eclipse.jdt.core.formatter.insert_space_before_opening_brace_in_array_initializer=insert
-org.eclipse.jdt.core.formatter.insert_space_before_opening_brace_in_block=insert
-org.eclipse.jdt.core.formatter.insert_space_before_opening_brace_in_constructor_declaration=insert
-org.eclipse.jdt.core.formatter.insert_space_before_opening_brace_in_enum_constant=insert
-org.eclipse.jdt.core.formatter.insert_space_before_opening_brace_in_enum_declaration=insert
-org.eclipse.jdt.core.formatter.insert_space_before_opening_brace_in_method_declaration=insert
-org.eclipse.jdt.core.formatter.insert_space_before_opening_brace_in_switch=insert
-org.eclipse.jdt.core.formatter.insert_space_before_opening_brace_in_type_declaration=insert
-org.eclipse.jdt.core.formatter.insert_space_before_opening_bracket_in_array_allocation_expression=do not insert
-org.eclipse.jdt.core.formatter.insert_space_before_opening_bracket_in_array_reference=do not insert
-org.eclipse.jdt.core.formatter.insert_space_before_opening_bracket_in_array_type_reference=do not insert
-org.eclipse.jdt.core.formatter.insert_space_before_opening_paren_in_annotation=do not insert
-org.eclipse.jdt.core.formatter.insert_space_before_opening_paren_in_annotation_type_member_declaration=do not insert
-org.eclipse.jdt.core.formatter.insert_space_before_opening_paren_in_catch=insert
-org.eclipse.jdt.core.formatter.insert_space_before_opening_paren_in_constructor_declaration=do not insert
-org.eclipse.jdt.core.formatter.insert_space_before_opening_paren_in_enum_constant=do not insert
-org.eclipse.jdt.core.formatter.insert_space_before_opening_paren_in_for=insert
-org.eclipse.jdt.core.formatter.insert_space_before_opening_paren_in_if=insert
-org.eclipse.jdt.core.formatter.insert_space_before_opening_paren_in_method_declaration=do not insert
-org.eclipse.jdt.core.formatter.insert_space_before_opening_paren_in_method_invocation=do not insert
-org.eclipse.jdt.core.formatter.insert_space_before_opening_paren_in_parenthesized_expression=do not insert
-org.eclipse.jdt.core.formatter.insert_space_before_opening_paren_in_switch=insert
-org.eclipse.jdt.core.formatter.insert_space_before_opening_paren_in_synchronized=insert
-org.eclipse.jdt.core.formatter.insert_space_before_opening_paren_in_while=insert
-org.eclipse.jdt.core.formatter.insert_space_before_parenthesized_expression_in_return=insert
-org.eclipse.jdt.core.formatter.insert_space_before_postfix_operator=do not insert
-org.eclipse.jdt.core.formatter.insert_space_before_prefix_operator=do not insert
-org.eclipse.jdt.core.formatter.insert_space_before_question_in_conditional=insert
-org.eclipse.jdt.core.formatter.insert_space_before_question_in_wildcard=do not insert
-org.eclipse.jdt.core.formatter.insert_space_before_semicolon=do not insert
-org.eclipse.jdt.core.formatter.insert_space_before_semicolon_in_for=do not insert
-org.eclipse.jdt.core.formatter.insert_space_before_unary_operator=do not insert
-org.eclipse.jdt.core.formatter.insert_space_between_brackets_in_array_type_reference=do not insert
-org.eclipse.jdt.core.formatter.insert_space_between_empty_braces_in_array_initializer=do not insert
-org.eclipse.jdt.core.formatter.insert_space_between_empty_brackets_in_array_allocation_expression=do not insert
-org.eclipse.jdt.core.formatter.insert_space_between_empty_parens_in_annotation_type_member_declaration=do not insert
-org.eclipse.jdt.core.formatter.insert_space_between_empty_parens_in_constructor_declaration=do not insert
-org.eclipse.jdt.core.formatter.insert_space_between_empty_parens_in_enum_constant=do not insert
-org.eclipse.jdt.core.formatter.insert_space_between_empty_parens_in_method_declaration=do not insert
-org.eclipse.jdt.core.formatter.insert_space_between_empty_parens_in_method_invocation=do not insert
-org.eclipse.jdt.core.formatter.keep_else_statement_on_same_line=false
-org.eclipse.jdt.core.formatter.keep_empty_array_initializer_on_one_line=false
-org.eclipse.jdt.core.formatter.keep_imple_if_on_one_line=false
-org.eclipse.jdt.core.formatter.keep_then_statement_on_same_line=false
-org.eclipse.jdt.core.formatter.lineSplit=150
-org.eclipse.jdt.core.formatter.number_of_blank_lines_at_beginning_of_method_body=0
-org.eclipse.jdt.core.formatter.number_of_empty_lines_to_preserve=1
-org.eclipse.jdt.core.formatter.put_empty_statement_on_new_line=true
-org.eclipse.jdt.core.formatter.tabulation.char=tab
-org.eclipse.jdt.core.formatter.tabulation.size=4
-org.eclipse.jdt.core.formatter.use_tabs_only_for_leading_indentations=false
diff --git a/plugins/org.eclipse.jem.beaninfo/.settings/org.eclipse.jdt.ui.prefs b/plugins/org.eclipse.jem.beaninfo/.settings/org.eclipse.jdt.ui.prefs
deleted file mode 100644
index 855e136..0000000
--- a/plugins/org.eclipse.jem.beaninfo/.settings/org.eclipse.jdt.ui.prefs
+++ /dev/null
@@ -1,8 +0,0 @@
-#Tue Feb 21 10:09:18 EST 2006
-eclipse.preferences.version=1
-formatter_profile=_jve
-formatter_settings_version=10
-org.eclipse.jdt.ui.ignorelowercasenames=true
-org.eclipse.jdt.ui.importorder=java;javax;org;org.eclipse.wtp;org.eclipse.jem;org.eclipse.ve.internal.cdm;org.eclipse.ve.internal.cde;org.eclipse.ve.internal.jcm;org.eclipse.ve.internal.java;org.eclipse.ve;com;
-org.eclipse.jdt.ui.ondemandthreshold=3
-org.eclipse.jdt.ui.text.custom_code_templates=<?xml version\="1.0" encoding\="UTF-8"?><templates/>
diff --git a/plugins/org.eclipse.jem.beaninfo/.settings/org.eclipse.pde.core.prefs b/plugins/org.eclipse.jem.beaninfo/.settings/org.eclipse.pde.core.prefs
deleted file mode 100644
index 59dc168..0000000
--- a/plugins/org.eclipse.jem.beaninfo/.settings/org.eclipse.pde.core.prefs
+++ /dev/null
@@ -1,3 +0,0 @@
-#Thu Jun 16 11:09:08 EDT 2005
-eclipse.preferences.version=1
-selfhosting.binExcludes=/org.eclipse.jem.beaninfo/bin_vm_beaninfovm
diff --git a/plugins/org.eclipse.jem.beaninfo/META-INF/MANIFEST.MF b/plugins/org.eclipse.jem.beaninfo/META-INF/MANIFEST.MF
deleted file mode 100644
index 36dcafd..0000000
--- a/plugins/org.eclipse.jem.beaninfo/META-INF/MANIFEST.MF
+++ /dev/null
@@ -1,26 +0,0 @@
-Manifest-Version: 1.0
-Bundle-ManifestVersion: 2
-Bundle-Name: %pluginName
-Bundle-SymbolicName: org.eclipse.jem.beaninfo; singleton:=true
-Bundle-Version: 2.0.300.qualifier
-Bundle-Activator: org.eclipse.jem.internal.beaninfo.core.BeaninfoPlugin
-Bundle-Vendor: %providerName
-Bundle-Localization: plugin
-Export-Package: org.eclipse.jem.internal.beaninfo,
- org.eclipse.jem.internal.beaninfo.adapters,
- org.eclipse.jem.internal.beaninfo.core,
- org.eclipse.jem.internal.beaninfo.impl
-Require-Bundle: org.eclipse.jem.proxy;bundle-version="[2.0.0,3.0.0)",
- org.eclipse.jdt.core;bundle-version="[3.2.0,4.0.0)",
- org.eclipse.jem.workbench;bundle-version="[2.0.0,3.0.0)",
- org.eclipse.jem;bundle-version="[2.0.0,3.0.0)",
- org.eclipse.emf.ecore.xmi;bundle-version="[2.2.0,3.0.0)",
- org.eclipse.ui;bundle-version="[3.2.0,4.0.0)";resolution:=optional,
- org.eclipse.core.runtime;bundle-version="[3.2.0,4.0.0)",
- org.eclipse.debug.core;bundle-version="[3.2.0,4.0.0)",
- org.eclipse.jem.util;bundle-version="[2.0.0,3.0.0)",
- org.eclipse.emf.ecore.change;bundle-version="[2.2.0,3.0.0)",
- org.eclipse.jem.beaninfo.vm;bundle-version="[2.0.200,3.0.0)";visibility:=reexport
-Eclipse-LazyStart: true
-Bundle-RequiredExecutionEnvironment: J2SE-1.5
-Bundle-ActivationPolicy: lazy
diff --git a/plugins/org.eclipse.jem.beaninfo/about.html b/plugins/org.eclipse.jem.beaninfo/about.html
deleted file mode 100644
index 5acea59..0000000
--- a/plugins/org.eclipse.jem.beaninfo/about.html
+++ /dev/null
@@ -1,25 +0,0 @@
-<!DOCTYPE HTML PUBLIC "-//W3C//DTD HTML 4.0//EN">
-<html><head><title>About</title>
-
-
-
-<meta http-equiv="Content-Type" content="text/html; charset=ISO-8859-1"></head><body lang="EN-US">
-<h2>About This Content</h2>
-
-<P>June, 2008</P>
-<h3>License</h3>
-
-<p>The Eclipse Foundation makes available all content in this plug-in ("Content"). Unless otherwise
-indicated below, the Content is provided to you under the terms and conditions of the
-Eclipse Public License Version 1.0 ("EPL"). A copy of the EPL is available
-at <a href="http://www.eclipse.org/legal/epl-v10.html">http://www.eclipse.org/legal/epl-v10.html</a>.
-For purposes of the EPL, "Program" will mean the Content.</p>
-
-<p>If you did not receive this Content directly from the Eclipse Foundation, the Content is
-being redistributed by another party ("Redistributor") and different terms and conditions may
-apply to your use of any object code in the Content. Check the Redistributor's license that was
-provided with the Content. If no such license exists, contact the Redistributor. Unless otherwise
-indicated below, the terms and conditions of the EPL still apply to any source code in the Content
-and such source code may be obtained at <a href="http://www.eclipse.org/">http://www.eclipse.org</a>.</p>
-
-</body></html>
\ No newline at end of file
diff --git a/plugins/org.eclipse.jem.beaninfo/beaninfo/org/eclipse/jem/internal/beaninfo/BeanDecorator.java b/plugins/org.eclipse.jem.beaninfo/beaninfo/org/eclipse/jem/internal/beaninfo/BeanDecorator.java
deleted file mode 100644
index 13821d5..0000000
--- a/plugins/org.eclipse.jem.beaninfo/beaninfo/org/eclipse/jem/internal/beaninfo/BeanDecorator.java
+++ /dev/null
@@ -1,432 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2001, 2005 IBM Corporation and others.
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
- *
- * Contributors:
- * IBM Corporation - initial API and implementation
- *******************************************************************************/
-package org.eclipse.jem.internal.beaninfo;
-/*
-
-
- */
-
-
-import org.eclipse.emf.common.util.EList;
-
-import org.eclipse.jem.java.JavaClass;
-import java.net.URL;
-
-/**
- * <!-- begin-user-doc -->
- * A representation of the model object '<em><b>Bean Decorator</b></em>'.
- * <!-- end-user-doc -->
- *
- * <!-- begin-model-doc -->
- * Equivalent to BeanDecorator in java.
- * <!-- end-model-doc -->
- *
- * <p>
- * The following features are supported:
- * <ul>
- * <li>{@link org.eclipse.jem.internal.beaninfo.BeanDecorator#isMergeSuperProperties <em>Merge Super Properties</em>}</li>
- * <li>{@link org.eclipse.jem.internal.beaninfo.BeanDecorator#isMergeSuperMethods <em>Merge Super Methods</em>}</li>
- * <li>{@link org.eclipse.jem.internal.beaninfo.BeanDecorator#isMergeSuperEvents <em>Merge Super Events</em>}</li>
- * <li>{@link org.eclipse.jem.internal.beaninfo.BeanDecorator#isIntrospectProperties <em>Introspect Properties</em>}</li>
- * <li>{@link org.eclipse.jem.internal.beaninfo.BeanDecorator#isIntrospectMethods <em>Introspect Methods</em>}</li>
- * <li>{@link org.eclipse.jem.internal.beaninfo.BeanDecorator#isIntrospectEvents <em>Introspect Events</em>}</li>
- * <li>{@link org.eclipse.jem.internal.beaninfo.BeanDecorator#isDoBeaninfo <em>Do Beaninfo</em>}</li>
- * <li>{@link org.eclipse.jem.internal.beaninfo.BeanDecorator#getNotInheritedPropertyNames <em>Not Inherited Property Names</em>}</li>
- * <li>{@link org.eclipse.jem.internal.beaninfo.BeanDecorator#getNotInheritedMethodNames <em>Not Inherited Method Names</em>}</li>
- * <li>{@link org.eclipse.jem.internal.beaninfo.BeanDecorator#getNotInheritedEventNames <em>Not Inherited Event Names</em>}</li>
- * <li>{@link org.eclipse.jem.internal.beaninfo.BeanDecorator#getCustomizerClass <em>Customizer Class</em>}</li>
- * </ul>
- * </p>
- *
- * @see org.eclipse.jem.internal.beaninfo.BeaninfoPackage#getBeanDecorator()
- * @model
- * @generated
- */
-
-
-public interface BeanDecorator extends FeatureDecorator{
-
- /**
- * Returns the value of the '<em><b>Merge Super Properties</b></em>' attribute.
- * The default value is <code>"true"</code>.
- * <!-- begin-user-doc -->
- * <p>
- * If the meaning of the '<em>Merge Super Properties</em>' attribute isn't clear,
- * there really should be more of a description here...
- * </p>
- * <!-- end-user-doc -->
- * <!-- begin-model-doc -->
- * Should the properties of super types be merged when asking for eAllAttributes/eAllReferences.
- * <!-- end-model-doc -->
- * @return the value of the '<em>Merge Super Properties</em>' attribute.
- * @see #isSetMergeSuperProperties()
- * @see #unsetMergeSuperProperties()
- * @see #setMergeSuperProperties(boolean)
- * @see org.eclipse.jem.internal.beaninfo.BeaninfoPackage#getBeanDecorator_MergeSuperProperties()
- * @model default="true" unsettable="true"
- * @generated
- */
- boolean isMergeSuperProperties();
-
- /**
- * Sets the value of the '{@link org.eclipse.jem.internal.beaninfo.BeanDecorator#isMergeSuperProperties <em>Merge Super Properties</em>}' attribute.
- * <!-- begin-user-doc -->
- * <!-- end-user-doc -->
- * @param value the new value of the '<em>Merge Super Properties</em>' attribute.
- * @see #isSetMergeSuperProperties()
- * @see #unsetMergeSuperProperties()
- * @see #isMergeSuperProperties()
- * @generated
- */
- void setMergeSuperProperties(boolean value);
-
- /**
- * Unsets the value of the '{@link org.eclipse.jem.internal.beaninfo.BeanDecorator#isMergeSuperProperties <em>Merge Super Properties</em>}' attribute.
- * <!-- begin-user-doc -->
- * <!-- end-user-doc -->
- * @see #isSetMergeSuperProperties()
- * @see #isMergeSuperProperties()
- * @see #setMergeSuperProperties(boolean)
- * @generated
- */
- void unsetMergeSuperProperties();
-
- /**
- * Returns whether the value of the '{@link org.eclipse.jem.internal.beaninfo.BeanDecorator#isMergeSuperProperties <em>Merge Super Properties</em>}' attribute is set.
- * <!-- begin-user-doc -->
- * <!-- end-user-doc -->
- * @return whether the value of the '<em>Merge Super Properties</em>' attribute is set.
- * @see #unsetMergeSuperProperties()
- * @see #isMergeSuperProperties()
- * @see #setMergeSuperProperties(boolean)
- * @generated
- */
- boolean isSetMergeSuperProperties();
-
- /**
- * Returns the value of the '<em><b>Merge Super Methods</b></em>' attribute.
- * The default value is <code>"true"</code>.
- * <!-- begin-user-doc -->
- * <p>
- * If the meaning of the '<em>Merge Super Behaviors</em>' attribute isn't clear,
- * there really should be more of a description here...
- * </p>
- * <!-- end-user-doc -->
- * <!-- begin-model-doc -->
- * Should the methods of super types be merged when asking for eAllBehaviors.
- * <!-- end-model-doc -->
- * @return the value of the '<em>Merge Super Methods</em>' attribute.
- * @see #isSetMergeSuperMethods()
- * @see #unsetMergeSuperMethods()
- * @see #setMergeSuperMethods(boolean)
- * @see org.eclipse.jem.internal.beaninfo.BeaninfoPackage#getBeanDecorator_MergeSuperMethods()
- * @model default="true" unsettable="true"
- * @generated
- */
- boolean isMergeSuperMethods();
-
- /**
- * Sets the value of the '{@link org.eclipse.jem.internal.beaninfo.BeanDecorator#isMergeSuperMethods <em>Merge Super Methods</em>}' attribute.
- * <!-- begin-user-doc -->
- * <!-- end-user-doc -->
- * @param value the new value of the '<em>Merge Super Methods</em>' attribute.
- * @see #isSetMergeSuperMethods()
- * @see #unsetMergeSuperMethods()
- * @see #isMergeSuperMethods()
- * @generated
- */
- void setMergeSuperMethods(boolean value);
-
- /**
- * Unsets the value of the '{@link org.eclipse.jem.internal.beaninfo.BeanDecorator#isMergeSuperMethods <em>Merge Super Methods</em>}' attribute.
- * <!-- begin-user-doc -->
- * <!-- end-user-doc -->
- * @see #isSetMergeSuperMethods()
- * @see #isMergeSuperMethods()
- * @see #setMergeSuperMethods(boolean)
- * @generated
- */
- void unsetMergeSuperMethods();
-
- /**
- * Returns whether the value of the '{@link org.eclipse.jem.internal.beaninfo.BeanDecorator#isMergeSuperMethods <em>Merge Super Methods</em>}' attribute is set.
- * <!-- begin-user-doc -->
- * <!-- end-user-doc -->
- * @return whether the value of the '<em>Merge Super Methods</em>' attribute is set.
- * @see #unsetMergeSuperMethods()
- * @see #isMergeSuperMethods()
- * @see #setMergeSuperMethods(boolean)
- * @generated
- */
- boolean isSetMergeSuperMethods();
-
- /**
- * Returns the value of the '<em><b>Merge Super Events</b></em>' attribute.
- * The default value is <code>"true"</code>.
- * <!-- begin-user-doc -->
- * <p>
- * If the meaning of the '<em>Merge Super Events</em>' attribute isn't clear,
- * there really should be more of a description here...
- * </p>
- * <!-- end-user-doc -->
- * <!-- begin-model-doc -->
- * Should the events of super types be merged when asking for eAllEvents.
- * <!-- end-model-doc -->
- * @return the value of the '<em>Merge Super Events</em>' attribute.
- * @see #isSetMergeSuperEvents()
- * @see #unsetMergeSuperEvents()
- * @see #setMergeSuperEvents(boolean)
- * @see org.eclipse.jem.internal.beaninfo.BeaninfoPackage#getBeanDecorator_MergeSuperEvents()
- * @model default="true" unsettable="true"
- * @generated
- */
- boolean isMergeSuperEvents();
-
- /**
- * Sets the value of the '{@link org.eclipse.jem.internal.beaninfo.BeanDecorator#isMergeSuperEvents <em>Merge Super Events</em>}' attribute.
- * <!-- begin-user-doc -->
- * <!-- end-user-doc -->
- * @param value the new value of the '<em>Merge Super Events</em>' attribute.
- * @see #isSetMergeSuperEvents()
- * @see #unsetMergeSuperEvents()
- * @see #isMergeSuperEvents()
- * @generated
- */
- void setMergeSuperEvents(boolean value);
-
- /**
- * Unsets the value of the '{@link org.eclipse.jem.internal.beaninfo.BeanDecorator#isMergeSuperEvents <em>Merge Super Events</em>}' attribute.
- * <!-- begin-user-doc -->
- * <!-- end-user-doc -->
- * @see #isSetMergeSuperEvents()
- * @see #isMergeSuperEvents()
- * @see #setMergeSuperEvents(boolean)
- * @generated
- */
- void unsetMergeSuperEvents();
-
- /**
- * Returns whether the value of the '{@link org.eclipse.jem.internal.beaninfo.BeanDecorator#isMergeSuperEvents <em>Merge Super Events</em>}' attribute is set.
- * <!-- begin-user-doc -->
- * <!-- end-user-doc -->
- * @return whether the value of the '<em>Merge Super Events</em>' attribute is set.
- * @see #unsetMergeSuperEvents()
- * @see #isMergeSuperEvents()
- * @see #setMergeSuperEvents(boolean)
- * @generated
- */
- boolean isSetMergeSuperEvents();
-
- /**
- * Returns the value of the '<em><b>Introspect Properties</b></em>' attribute.
- * The default value is <code>"true"</code>.
- * <!-- begin-user-doc -->
- * <p>
- * If the meaning of the '<em>Introspect Properties</em>' attribute isn't clear,
- * there really should be more of a description here...
- * </p>
- * <!-- end-user-doc -->
- * <!-- begin-model-doc -->
- * Should the properties from the introspection be added to the class. This allows properties to not be introspected and to use only what is defined explicitly in the JavaClass xmi file.
- * <!-- end-model-doc -->
- * @return the value of the '<em>Introspect Properties</em>' attribute.
- * @see #setIntrospectProperties(boolean)
- * @see org.eclipse.jem.internal.beaninfo.BeaninfoPackage#getBeanDecorator_IntrospectProperties()
- * @model default="true"
- * @generated
- */
- boolean isIntrospectProperties();
-
- /**
- * Sets the value of the '{@link org.eclipse.jem.internal.beaninfo.BeanDecorator#isIntrospectProperties <em>Introspect Properties</em>}' attribute.
- * <!-- begin-user-doc -->
- * <!-- end-user-doc -->
- * @param value the new value of the '<em>Introspect Properties</em>' attribute.
- * @see #isIntrospectProperties()
- * @generated
- */
- void setIntrospectProperties(boolean value);
-
- /**
- * Returns the value of the '<em><b>Introspect Methods</b></em>' attribute.
- * The default value is <code>"true"</code>.
- * <!-- begin-user-doc -->
- * <p>
- * If the meaning of the '<em>Introspect Behaviors</em>' attribute isn't clear,
- * there really should be more of a description here...
- * </p>
- * <!-- end-user-doc -->
- * <!-- begin-model-doc -->
- * Should the methods from the introspection be added to the class. This allows methods to not be introspected and to use only what is defined explicitly in the JavaClass xmi file.
- * <!-- end-model-doc -->
- * @return the value of the '<em>Introspect Methods</em>' attribute.
- * @see #setIntrospectMethods(boolean)
- * @see org.eclipse.jem.internal.beaninfo.BeaninfoPackage#getBeanDecorator_IntrospectMethods()
- * @model default="true"
- * @generated
- */
- boolean isIntrospectMethods();
-
- /**
- * Sets the value of the '{@link org.eclipse.jem.internal.beaninfo.BeanDecorator#isIntrospectMethods <em>Introspect Methods</em>}' attribute.
- * <!-- begin-user-doc -->
- * <!-- end-user-doc -->
- * @param value the new value of the '<em>Introspect Methods</em>' attribute.
- * @see #isIntrospectMethods()
- * @generated
- */
- void setIntrospectMethods(boolean value);
-
- /**
- * Returns the value of the '<em><b>Introspect Events</b></em>' attribute.
- * The default value is <code>"true"</code>.
- * <!-- begin-user-doc -->
- * <p>
- * If the meaning of the '<em>Introspect Events</em>' attribute isn't clear,
- * there really should be more of a description here...
- * </p>
- * <!-- end-user-doc -->
- * <!-- begin-model-doc -->
- * Should the events from the introspection be added to the class. This allows events to not be introspected and to use only what is defined explicitly in the JavaClass xmi file.
- * <!-- end-model-doc -->
- * @return the value of the '<em>Introspect Events</em>' attribute.
- * @see #setIntrospectEvents(boolean)
- * @see org.eclipse.jem.internal.beaninfo.BeaninfoPackage#getBeanDecorator_IntrospectEvents()
- * @model default="true"
- * @generated
- */
- boolean isIntrospectEvents();
-
- /**
- * Sets the value of the '{@link org.eclipse.jem.internal.beaninfo.BeanDecorator#isIntrospectEvents <em>Introspect Events</em>}' attribute.
- * <!-- begin-user-doc -->
- * <!-- end-user-doc -->
- * @param value the new value of the '<em>Introspect Events</em>' attribute.
- * @see #isIntrospectEvents()
- * @generated
- */
- void setIntrospectEvents(boolean value);
-
- /**
- * Returns the value of the '<em><b>Customizer Class</b></em>' reference.
- * <!-- begin-user-doc -->
- * <p>
- * If the meaning of the '<em>Customizer Class</em>' reference isn't clear,
- * there really should be more of a description here...
- * </p>
- * <!-- end-user-doc -->
- * @return the value of the '<em>Customizer Class</em>' reference.
- * @see #setCustomizerClass(JavaClass)
- * @see org.eclipse.jem.internal.beaninfo.BeaninfoPackage#getBeanDecorator_CustomizerClass()
- * @model
- * @generated
- */
- JavaClass getCustomizerClass();
-
- /**
- * Sets the value of the '{@link org.eclipse.jem.internal.beaninfo.BeanDecorator#getCustomizerClass <em>Customizer Class</em>}' reference.
- * <!-- begin-user-doc -->
- * <!-- end-user-doc -->
- * @param value the new value of the '<em>Customizer Class</em>' reference.
- * @see #getCustomizerClass()
- * @generated
- */
- void setCustomizerClass(JavaClass value);
-
- /**
- * Returns the value of the '<em><b>Do Beaninfo</b></em>' attribute.
- * The default value is <code>"true"</code>.
- * <!-- begin-user-doc -->
- * <p>
- * If the meaning of the '<em>Do Beaninfo</em>' attribute isn't clear,
- * there really should be more of a description here...
- * </p>
- * <!-- end-user-doc -->
- * <!-- begin-model-doc -->
- * This means do we go and get the beaninfo from the remote vm. If false, then it will not try to get the beaninfo. This doesn't prevent introspection through reflection. That is controled by the separate introspect... attributes.
- * <!-- end-model-doc -->
- * @return the value of the '<em>Do Beaninfo</em>' attribute.
- * @see #setDoBeaninfo(boolean)
- * @see org.eclipse.jem.internal.beaninfo.BeaninfoPackage#getBeanDecorator_DoBeaninfo()
- * @model default="true"
- * @generated
- */
- boolean isDoBeaninfo();
-
- /**
- * Sets the value of the '{@link org.eclipse.jem.internal.beaninfo.BeanDecorator#isDoBeaninfo <em>Do Beaninfo</em>}' attribute.
- * <!-- begin-user-doc -->
- * <!-- end-user-doc -->
- * @param value the new value of the '<em>Do Beaninfo</em>' attribute.
- * @see #isDoBeaninfo()
- * @generated
- */
- void setDoBeaninfo(boolean value);
-
- /**
- * Returns the value of the '<em><b>Not Inherited Property Names</b></em>' attribute list.
- * The list contents are of type {@link java.lang.String}.
- * <!-- begin-user-doc -->
- * <!-- end-user-doc -->
- * <!-- begin-model-doc -->
- * This is the list of inherited property names to not use in getAllProperties(). These names are properties that should not be inherited and should not show through. If the inherited property is not on the list then it will show in getAllProperties().
- * <p>
- * This list will be empty if all properties are inherited or if the mergeSuperProperties flag is false.
- * <p>
- * Note: This attribute is not meant to be changed by clients. It is an internal attribute.
- * <!-- end-model-doc -->
- * @return the value of the '<em>Not Inherited Property Names</em>' attribute list.
- * @see org.eclipse.jem.internal.beaninfo.BeaninfoPackage#getBeanDecorator_NotInheritedPropertyNames()
- * @model type="java.lang.String"
- * @generated
- */
- EList getNotInheritedPropertyNames();
-
- /**
- * Returns the value of the '<em><b>Not Inherited Method Names</b></em>' attribute list.
- * The list contents are of type {@link java.lang.String}.
- * <!-- begin-user-doc -->
- * <!-- end-user-doc -->
- * <!-- begin-model-doc -->
- * This is the list of inherited method names to not use in eAllOperations(). These names are operations that should not be inherited and should not show through. If the inherited operation is not on the list then it will show in getAllOperations().
- * <p>
- * This list will be empty if all operations are inherited or if the mergeSuperBehaviors flag is false.
- * <!-- end-model-doc -->
- * @return the value of the '<em>Not Inherited Method Names</em>' attribute list.
- * @see org.eclipse.jem.internal.beaninfo.BeaninfoPackage#getBeanDecorator_NotInheritedMethodNames()
- * @model type="java.lang.String"
- * @generated
- */
- EList getNotInheritedMethodNames();
-
- /**
- * Returns the value of the '<em><b>Not Inherited Event Names</b></em>' attribute list.
- * The list contents are of type {@link java.lang.String}.
- * <!-- begin-user-doc -->
- * <!-- end-user-doc -->
- * <!-- begin-model-doc -->
- * This is the list of inherited event names to not use in getAllEvents(). These names are events that should not be inherited and should not show through. If the inherited event is not on the list then it will show in getAllEvents().
- * <p>
- * This list will be empty if all events are inherited or if the mergeSuperEvents flag is false.
- * <!-- end-model-doc -->
- * @return the value of the '<em>Not Inherited Event Names</em>' attribute list.
- * @see org.eclipse.jem.internal.beaninfo.BeaninfoPackage#getBeanDecorator_NotInheritedEventNames()
- * @model type="java.lang.String"
- * @generated
- */
- EList getNotInheritedEventNames();
-
- /**
- * Return the URL of a 16x16 Color icon
- */
- URL getIconURL();
-
-}
diff --git a/plugins/org.eclipse.jem.beaninfo/beaninfo/org/eclipse/jem/internal/beaninfo/BeanEvent.java b/plugins/org.eclipse.jem.beaninfo/beaninfo/org/eclipse/jem/internal/beaninfo/BeanEvent.java
deleted file mode 100644
index 852eba2..0000000
--- a/plugins/org.eclipse.jem.beaninfo/beaninfo/org/eclipse/jem/internal/beaninfo/BeanEvent.java
+++ /dev/null
@@ -1,41 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2001, 2005 IBM Corporation and others.
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
- *
- * Contributors:
- * IBM Corporation - initial API and implementation
- *******************************************************************************/
-package org.eclipse.jem.internal.beaninfo;
-/*
-
-
- */
-
-import org.eclipse.jem.java.JavaEvent;
-
-
-/**
- * <!-- begin-user-doc -->
- * A representation of the model object '<em><b>Bean Event</b></em>'.
- * <!-- end-user-doc -->
- *
- * <!-- begin-model-doc -->
- * Event from Introspection/Reflection.
- * <p>
- * The BeanEvent will be under the JavaClass' events and allEvents feature. Each BeanEvent will be decorated by an EventSetDecorator.
- * <!-- end-model-doc -->
- *
- *
- * @see org.eclipse.jem.internal.beaninfo.BeaninfoPackage#getBeanEvent()
- * @model
- * @generated
- */
-
-public interface BeanEvent extends JavaEvent{
-
-
-
-}
diff --git a/plugins/org.eclipse.jem.beaninfo/beaninfo/org/eclipse/jem/internal/beaninfo/BeaninfoFactory.java b/plugins/org.eclipse.jem.beaninfo/beaninfo/org/eclipse/jem/internal/beaninfo/BeaninfoFactory.java
deleted file mode 100644
index 3cc9a11..0000000
--- a/plugins/org.eclipse.jem.beaninfo/beaninfo/org/eclipse/jem/internal/beaninfo/BeaninfoFactory.java
+++ /dev/null
@@ -1,128 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2001, 2005 IBM Corporation and others.
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
- *
- * Contributors:
- * IBM Corporation - initial API and implementation
- *******************************************************************************/
-package org.eclipse.jem.internal.beaninfo;
-/*
-
-
- */
-
-
-import org.eclipse.emf.ecore.EFactory;
-/**
- * <!-- begin-user-doc -->
- * The <b>Factory</b> for the model.
- * It provides a create method for each non-abstract class of the model.
- * <!-- end-user-doc -->
- * @see org.eclipse.jem.internal.beaninfo.BeaninfoPackage
- * @generated
- */
-
-
-public interface BeaninfoFactory extends EFactory{
- /**
- * The singleton instance of the factory.
- * <!-- begin-user-doc -->
- * <!-- end-user-doc -->
- * @generated
- */
- BeaninfoFactory eINSTANCE = org.eclipse.jem.internal.beaninfo.impl.BeaninfoFactoryImpl.init();
-
- /**
- * Returns a new object of class '<em>Feature Decorator</em>'.
- * <!-- begin-user-doc -->
- * <!-- end-user-doc -->
- * @return a new object of class '<em>Feature Decorator</em>'.
- * @generated
- */
- FeatureDecorator createFeatureDecorator();
-
- /**
- * Returns a new object of class '<em>Event Set Decorator</em>'.
- * <!-- begin-user-doc -->
- * <!-- end-user-doc -->
- * @return a new object of class '<em>Event Set Decorator</em>'.
- * @generated
- */
- EventSetDecorator createEventSetDecorator();
-
- /**
- * Returns a new object of class '<em>Method Proxy</em>'.
- * <!-- begin-user-doc -->
- * <!-- end-user-doc -->
- * @return a new object of class '<em>Method Proxy</em>'.
- * @generated
- */
- MethodProxy createMethodProxy();
-
- /**
- * Returns a new object of class '<em>Property Decorator</em>'.
- * <!-- begin-user-doc -->
- * <!-- end-user-doc -->
- * @return a new object of class '<em>Property Decorator</em>'.
- * @generated
- */
- PropertyDecorator createPropertyDecorator();
-
- /**
- * Returns a new object of class '<em>Indexed Property Decorator</em>'.
- * <!-- begin-user-doc -->
- * <!-- end-user-doc -->
- * @return a new object of class '<em>Indexed Property Decorator</em>'.
- * @generated
- */
- IndexedPropertyDecorator createIndexedPropertyDecorator();
-
- /**
- * Returns a new object of class '<em>Bean Decorator</em>'.
- * <!-- begin-user-doc -->
- * <!-- end-user-doc -->
- * @return a new object of class '<em>Bean Decorator</em>'.
- * @generated
- */
- BeanDecorator createBeanDecorator();
-
- /**
- * Returns a new object of class '<em>Method Decorator</em>'.
- * <!-- begin-user-doc -->
- * <!-- end-user-doc -->
- * @return a new object of class '<em>Method Decorator</em>'.
- * @generated
- */
- MethodDecorator createMethodDecorator();
-
- /**
- * Returns a new object of class '<em>Parameter Decorator</em>'.
- * <!-- begin-user-doc -->
- * <!-- end-user-doc -->
- * @return a new object of class '<em>Parameter Decorator</em>'.
- * @generated
- */
- ParameterDecorator createParameterDecorator();
-
- /**
- * Returns the package supported by this factory.
- * <!-- begin-user-doc -->
- * <!-- end-user-doc -->
- * @return the package supported by this factory.
- * @generated
- */
- BeaninfoPackage getBeaninfoPackage();
-
- /**
- * Returns a new object of class '<em>Bean Event</em>'.
- * <!-- begin-user-doc -->
- * <!-- end-user-doc -->
- * @return a new object of class '<em>Bean Event</em>'.
- * @generated
- */
- BeanEvent createBeanEvent();
-
-}
diff --git a/plugins/org.eclipse.jem.beaninfo/beaninfo/org/eclipse/jem/internal/beaninfo/BeaninfoPackage.java b/plugins/org.eclipse.jem.beaninfo/beaninfo/org/eclipse/jem/internal/beaninfo/BeaninfoPackage.java
deleted file mode 100644
index 3dd81d3..0000000
--- a/plugins/org.eclipse.jem.beaninfo/beaninfo/org/eclipse/jem/internal/beaninfo/BeaninfoPackage.java
+++ /dev/null
@@ -1,3271 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2001, 2005 IBM Corporation and others.
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
- *
- * Contributors:
- * IBM Corporation - initial API and implementation
- *******************************************************************************/
-package org.eclipse.jem.internal.beaninfo;
-/*
-
-
- */
-
-import org.eclipse.emf.ecore.EAttribute;
-import org.eclipse.emf.ecore.EClass;
-import org.eclipse.emf.ecore.EDataType;
-import org.eclipse.emf.ecore.EEnum;
-import org.eclipse.emf.ecore.EPackage;
-import org.eclipse.emf.ecore.EReference;
-import org.eclipse.emf.ecore.EcorePackage;
-
-import org.eclipse.jem.java.JavaRefPackage;
-/**
- * <!-- begin-user-doc -->
- * The <b>Package</b> for the model.
- * It contains accessors for the meta objects to represent
- * <ul>
- * <li>each class,</li>
- * <li>each feature of each class,</li>
- * <li>each enum,</li>
- * <li>and each data type</li>
- * </ul>
- * <!-- end-user-doc -->
- * @see org.eclipse.jem.internal.beaninfo.BeaninfoFactory
- * @model kind="package"
- * @generated
- */
-
-public interface BeaninfoPackage extends EPackage{
- /**
- * The package name.
- * <!-- begin-user-doc -->
- * <!-- end-user-doc -->
- * @generated
- */
- String eNAME = "beaninfo"; //$NON-NLS-1$
-
- /**
- * The package namespace URI.
- * <!-- begin-user-doc -->
- * <!-- end-user-doc -->
- * @generated
- */
- String eNS_URI = "http:///org/eclipse/jem/internal/beaninfo/beaninfo.ecore"; //$NON-NLS-1$
-
- /**
- * The package namespace name.
- * <!-- begin-user-doc -->
- * <!-- end-user-doc -->
- * @generated
- */
- String eNS_PREFIX = "org.eclipse.jem.internal.beaninfo.beaninfo"; //$NON-NLS-1$
-
- /**
- * The singleton instance of the package.
- * <!-- begin-user-doc -->
- * <!-- end-user-doc -->
- * @generated
- */
- BeaninfoPackage eINSTANCE = org.eclipse.jem.internal.beaninfo.impl.BeaninfoPackageImpl.init();
-
-
- /**
- * The meta object id for the '{@link org.eclipse.jem.internal.beaninfo.impl.FeatureDecoratorImpl <em>Feature Decorator</em>}' class.
- * <!-- begin-user-doc -->
- * <!-- end-user-doc -->
- * @see org.eclipse.jem.internal.beaninfo.impl.FeatureDecoratorImpl
- * @see org.eclipse.jem.internal.beaninfo.impl.BeaninfoPackageImpl#getFeatureDecorator()
- * @generated
- */
- int FEATURE_DECORATOR = 0;
- /**
- * The feature id for the '<em><b>EAnnotations</b></em>' containment reference list.
- * <!-- begin-user-doc -->
- * <!-- end-user-doc -->
- * @generated
- * @ordered
- */
- int FEATURE_DECORATOR__EANNOTATIONS = EcorePackage.EANNOTATION__EANNOTATIONS;
-
- /**
- * The feature id for the '<em><b>Source</b></em>' attribute.
- * <!-- begin-user-doc -->
- * <!-- end-user-doc -->
- * @generated
- * @ordered
- */
- int FEATURE_DECORATOR__SOURCE = EcorePackage.EANNOTATION__SOURCE;
-
- /**
- * The feature id for the '<em><b>Details</b></em>' map.
- * <!-- begin-user-doc -->
- * <!-- end-user-doc -->
- * @generated
- * @ordered
- */
- int FEATURE_DECORATOR__DETAILS = EcorePackage.EANNOTATION__DETAILS;
-
- /**
- * The feature id for the '<em><b>EModel Element</b></em>' container reference.
- * <!-- begin-user-doc -->
- * <!-- end-user-doc -->
- * @generated
- * @ordered
- */
- int FEATURE_DECORATOR__EMODEL_ELEMENT = EcorePackage.EANNOTATION__EMODEL_ELEMENT;
-
- /**
- * The feature id for the '<em><b>Contents</b></em>' containment reference list.
- * <!-- begin-user-doc -->
- * <!-- end-user-doc -->
- * @generated
- * @ordered
- */
- int FEATURE_DECORATOR__CONTENTS = EcorePackage.EANNOTATION__CONTENTS;
-
- /**
- * The feature id for the '<em><b>References</b></em>' reference list.
- * <!-- begin-user-doc -->
- * <!-- end-user-doc -->
- * @generated
- * @ordered
- */
- int FEATURE_DECORATOR__REFERENCES = EcorePackage.EANNOTATION__REFERENCES;
-
- /**
- * The feature id for the '<em><b>Display Name</b></em>' attribute.
- * <!-- begin-user-doc -->
- * <!-- end-user-doc -->
- * @generated
- * @ordered
- */
- int FEATURE_DECORATOR__DISPLAY_NAME = EcorePackage.EANNOTATION_FEATURE_COUNT + 0;
- /**
- * The feature id for the '<em><b>Short Description</b></em>' attribute.
- * <!-- begin-user-doc -->
- * <!-- end-user-doc -->
- * @generated
- * @ordered
- */
- int FEATURE_DECORATOR__SHORT_DESCRIPTION = EcorePackage.EANNOTATION_FEATURE_COUNT + 1;
- /**
- * The feature id for the '<em><b>Category</b></em>' attribute.
- * <!-- begin-user-doc -->
- * <!-- end-user-doc -->
- * @generated
- * @ordered
- */
- int FEATURE_DECORATOR__CATEGORY = EcorePackage.EANNOTATION_FEATURE_COUNT + 2;
- /**
- * The feature id for the '<em><b>Expert</b></em>' attribute.
- * <!-- begin-user-doc -->
- * <!-- end-user-doc -->
- * @generated
- * @ordered
- */
- int FEATURE_DECORATOR__EXPERT = EcorePackage.EANNOTATION_FEATURE_COUNT + 3;
-
- /**
- * The feature id for the '<em><b>Hidden</b></em>' attribute.
- * <!-- begin-user-doc -->
- * <!-- end-user-doc -->
- * @generated
- * @ordered
- */
- int FEATURE_DECORATOR__HIDDEN = EcorePackage.EANNOTATION_FEATURE_COUNT + 4;
-
- /**
- * The feature id for the '<em><b>Preferred</b></em>' attribute.
- * <!-- begin-user-doc -->
- * <!-- end-user-doc -->
- * @generated
- * @ordered
- */
- int FEATURE_DECORATOR__PREFERRED = EcorePackage.EANNOTATION_FEATURE_COUNT + 5;
-
- /**
- * The feature id for the '<em><b>Merge Introspection</b></em>' attribute.
- * <!-- begin-user-doc -->
- * <!-- end-user-doc -->
- * @generated
- * @ordered
- */
- int FEATURE_DECORATOR__MERGE_INTROSPECTION = EcorePackage.EANNOTATION_FEATURE_COUNT + 6;
- /**
- * The feature id for the '<em><b>Attributes Explicit Empty</b></em>' attribute.
- * <!-- begin-user-doc -->
- * <!-- end-user-doc -->
- * @generated
- * @ordered
- */
- int FEATURE_DECORATOR__ATTRIBUTES_EXPLICIT_EMPTY = EcorePackage.EANNOTATION_FEATURE_COUNT + 7;
-
- /**
- * The feature id for the '<em><b>Implicitly Set Bits</b></em>' attribute.
- * <!-- begin-user-doc -->
- * <!-- end-user-doc -->
- * @generated
- * @ordered
- */
- int FEATURE_DECORATOR__IMPLICITLY_SET_BITS = EcorePackage.EANNOTATION_FEATURE_COUNT + 8;
-
- /**
- * The feature id for the '<em><b>Implicit Decorator Flag</b></em>' attribute.
- * <!-- begin-user-doc -->
- * <!-- end-user-doc -->
- * @generated
- * @ordered
- */
- int FEATURE_DECORATOR__IMPLICIT_DECORATOR_FLAG = EcorePackage.EANNOTATION_FEATURE_COUNT + 9;
-
- /**
- * The meta object id for the '{@link org.eclipse.jem.internal.beaninfo.impl.EventSetDecoratorImpl <em>Event Set Decorator</em>}' class.
- * <!-- begin-user-doc -->
- * <!-- end-user-doc -->
- * @see org.eclipse.jem.internal.beaninfo.impl.EventSetDecoratorImpl
- * @see org.eclipse.jem.internal.beaninfo.impl.BeaninfoPackageImpl#getEventSetDecorator()
- * @generated
- */
- int EVENT_SET_DECORATOR = 2;
- /**
- * The meta object id for the '{@link org.eclipse.jem.internal.beaninfo.impl.MethodProxyImpl <em>Method Proxy</em>}' class.
- * <!-- begin-user-doc -->
- * <!-- end-user-doc -->
- * @see org.eclipse.jem.internal.beaninfo.impl.MethodProxyImpl
- * @see org.eclipse.jem.internal.beaninfo.impl.BeaninfoPackageImpl#getMethodProxy()
- * @generated
- */
- int METHOD_PROXY = 7;
- /**
- * The meta object id for the '{@link org.eclipse.jem.internal.beaninfo.impl.PropertyDecoratorImpl <em>Property Decorator</em>}' class.
- * <!-- begin-user-doc -->
- * <!-- end-user-doc -->
- * @see org.eclipse.jem.internal.beaninfo.impl.PropertyDecoratorImpl
- * @see org.eclipse.jem.internal.beaninfo.impl.BeaninfoPackageImpl#getPropertyDecorator()
- * @generated
- */
- int PROPERTY_DECORATOR = 5;
- /**
- * The meta object id for the '{@link org.eclipse.jem.internal.beaninfo.impl.IndexedPropertyDecoratorImpl <em>Indexed Property Decorator</em>}' class.
- * <!-- begin-user-doc -->
- * <!-- end-user-doc -->
- * @see org.eclipse.jem.internal.beaninfo.impl.IndexedPropertyDecoratorImpl
- * @see org.eclipse.jem.internal.beaninfo.impl.BeaninfoPackageImpl#getIndexedPropertyDecorator()
- * @generated
- */
- int INDEXED_PROPERTY_DECORATOR = 6;
- /**
- * The meta object id for the '{@link org.eclipse.jem.internal.beaninfo.impl.BeanDecoratorImpl <em>Bean Decorator</em>}' class.
- * <!-- begin-user-doc -->
- * <!-- end-user-doc -->
- * @see org.eclipse.jem.internal.beaninfo.impl.BeanDecoratorImpl
- * @see org.eclipse.jem.internal.beaninfo.impl.BeaninfoPackageImpl#getBeanDecorator()
- * @generated
- */
- int BEAN_DECORATOR = 1;
- /**
- * The meta object id for the '{@link org.eclipse.jem.internal.beaninfo.impl.MethodDecoratorImpl <em>Method Decorator</em>}' class.
- * <!-- begin-user-doc -->
- * <!-- end-user-doc -->
- * @see org.eclipse.jem.internal.beaninfo.impl.MethodDecoratorImpl
- * @see org.eclipse.jem.internal.beaninfo.impl.BeaninfoPackageImpl#getMethodDecorator()
- * @generated
- */
- int METHOD_DECORATOR = 3;
- /**
- * The meta object id for the '{@link org.eclipse.jem.internal.beaninfo.impl.ParameterDecoratorImpl <em>Parameter Decorator</em>}' class.
- * <!-- begin-user-doc -->
- * <!-- end-user-doc -->
- * @see org.eclipse.jem.internal.beaninfo.impl.ParameterDecoratorImpl
- * @see org.eclipse.jem.internal.beaninfo.impl.BeaninfoPackageImpl#getParameterDecorator()
- * @generated
- */
- int PARAMETER_DECORATOR = 4;
- /**
- * The meta object id for the '<em>Feature Attribute Value</em>' data type.
- * <!-- begin-user-doc -->
- * <!-- end-user-doc -->
- * @see org.eclipse.jem.internal.beaninfo.common.FeatureAttributeValue
- * @see org.eclipse.jem.internal.beaninfo.impl.BeaninfoPackageImpl#getFeatureAttributeValue()
- * @generated
- */
- int FEATURE_ATTRIBUTE_VALUE = 11;
- /**
- * The feature id for the '<em><b>Attributes</b></em>' map.
- * <!-- begin-user-doc -->
- * <!-- end-user-doc -->
- * @generated
- * @ordered
- */
- int FEATURE_DECORATOR__ATTRIBUTES = EcorePackage.EANNOTATION_FEATURE_COUNT + 10;
- /**
- * The number of structural features of the '<em>Feature Decorator</em>' class.
- * <!-- begin-user-doc -->
- * <!-- end-user-doc -->
- * @generated
- * @ordered
- */
- int FEATURE_DECORATOR_FEATURE_COUNT = EcorePackage.EANNOTATION_FEATURE_COUNT + 11;
-
- /**
- * The feature id for the '<em><b>EAnnotations</b></em>' containment reference list.
- * <!-- begin-user-doc -->
- * <!-- end-user-doc -->
- * @generated
- * @ordered
- */
- int BEAN_DECORATOR__EANNOTATIONS = FEATURE_DECORATOR__EANNOTATIONS;
-
- /**
- * The feature id for the '<em><b>Source</b></em>' attribute.
- * <!-- begin-user-doc -->
- * <!-- end-user-doc -->
- * @generated
- * @ordered
- */
- int BEAN_DECORATOR__SOURCE = FEATURE_DECORATOR__SOURCE;
-
- /**
- * The feature id for the '<em><b>Details</b></em>' map.
- * <!-- begin-user-doc -->
- * <!-- end-user-doc -->
- * @generated
- * @ordered
- */
- int BEAN_DECORATOR__DETAILS = FEATURE_DECORATOR__DETAILS;
-
- /**
- * The feature id for the '<em><b>EModel Element</b></em>' container reference.
- * <!-- begin-user-doc -->
- * <!-- end-user-doc -->
- * @generated
- * @ordered
- */
- int BEAN_DECORATOR__EMODEL_ELEMENT = FEATURE_DECORATOR__EMODEL_ELEMENT;
-
- /**
- * The feature id for the '<em><b>Contents</b></em>' containment reference list.
- * <!-- begin-user-doc -->
- * <!-- end-user-doc -->
- * @generated
- * @ordered
- */
- int BEAN_DECORATOR__CONTENTS = FEATURE_DECORATOR__CONTENTS;
-
- /**
- * The feature id for the '<em><b>References</b></em>' reference list.
- * <!-- begin-user-doc -->
- * <!-- end-user-doc -->
- * @generated
- * @ordered
- */
- int BEAN_DECORATOR__REFERENCES = FEATURE_DECORATOR__REFERENCES;
-
- /**
- * The feature id for the '<em><b>Display Name</b></em>' attribute.
- * <!-- begin-user-doc -->
- * <!-- end-user-doc -->
- * @generated
- * @ordered
- */
- int BEAN_DECORATOR__DISPLAY_NAME = FEATURE_DECORATOR__DISPLAY_NAME;
- /**
- * The feature id for the '<em><b>Short Description</b></em>' attribute.
- * <!-- begin-user-doc -->
- * <!-- end-user-doc -->
- * @generated
- * @ordered
- */
- int BEAN_DECORATOR__SHORT_DESCRIPTION = FEATURE_DECORATOR__SHORT_DESCRIPTION;
- /**
- * The feature id for the '<em><b>Category</b></em>' attribute.
- * <!-- begin-user-doc -->
- * <!-- end-user-doc -->
- * @generated
- * @ordered
- */
- int BEAN_DECORATOR__CATEGORY = FEATURE_DECORATOR__CATEGORY;
- /**
- * The feature id for the '<em><b>Expert</b></em>' attribute.
- * <!-- begin-user-doc -->
- * <!-- end-user-doc -->
- * @generated
- * @ordered
- */
- int BEAN_DECORATOR__EXPERT = FEATURE_DECORATOR__EXPERT;
-
- /**
- * The feature id for the '<em><b>Hidden</b></em>' attribute.
- * <!-- begin-user-doc -->
- * <!-- end-user-doc -->
- * @generated
- * @ordered
- */
- int BEAN_DECORATOR__HIDDEN = FEATURE_DECORATOR__HIDDEN;
-
- /**
- * The feature id for the '<em><b>Preferred</b></em>' attribute.
- * <!-- begin-user-doc -->
- * <!-- end-user-doc -->
- * @generated
- * @ordered
- */
- int BEAN_DECORATOR__PREFERRED = FEATURE_DECORATOR__PREFERRED;
-
- /**
- * The feature id for the '<em><b>Merge Introspection</b></em>' attribute.
- * <!-- begin-user-doc -->
- * <!-- end-user-doc -->
- * @generated
- * @ordered
- */
- int BEAN_DECORATOR__MERGE_INTROSPECTION = FEATURE_DECORATOR__MERGE_INTROSPECTION;
- /**
- * The feature id for the '<em><b>Attributes Explicit Empty</b></em>' attribute.
- * <!-- begin-user-doc -->
- * <!-- end-user-doc -->
- * @generated
- * @ordered
- */
- int BEAN_DECORATOR__ATTRIBUTES_EXPLICIT_EMPTY = FEATURE_DECORATOR__ATTRIBUTES_EXPLICIT_EMPTY;
-
- /**
- * The feature id for the '<em><b>Implicitly Set Bits</b></em>' attribute.
- * <!-- begin-user-doc -->
- * <!-- end-user-doc -->
- * @generated
- * @ordered
- */
- int BEAN_DECORATOR__IMPLICITLY_SET_BITS = FEATURE_DECORATOR__IMPLICITLY_SET_BITS;
-
- /**
- * The feature id for the '<em><b>Implicit Decorator Flag</b></em>' attribute.
- * <!-- begin-user-doc -->
- * <!-- end-user-doc -->
- * @generated
- * @ordered
- */
- int BEAN_DECORATOR__IMPLICIT_DECORATOR_FLAG = FEATURE_DECORATOR__IMPLICIT_DECORATOR_FLAG;
-
- /**
- * The feature id for the '<em><b>Attributes</b></em>' map.
- * <!-- begin-user-doc -->
- * <!-- end-user-doc -->
- * @generated
- * @ordered
- */
- int BEAN_DECORATOR__ATTRIBUTES = FEATURE_DECORATOR__ATTRIBUTES;
- /**
- * The feature id for the '<em><b>Merge Super Properties</b></em>' attribute.
- * <!-- begin-user-doc -->
- * <!-- end-user-doc -->
- * @generated
- * @ordered
- */
- int BEAN_DECORATOR__MERGE_SUPER_PROPERTIES = FEATURE_DECORATOR_FEATURE_COUNT + 0;
- /**
- * The feature id for the '<em><b>Merge Super Methods</b></em>' attribute.
- * <!-- begin-user-doc -->
- * <!-- end-user-doc -->
- * @generated
- * @ordered
- */
- int BEAN_DECORATOR__MERGE_SUPER_METHODS = FEATURE_DECORATOR_FEATURE_COUNT + 1;
-
- /**
- * The feature id for the '<em><b>Merge Super Events</b></em>' attribute.
- * <!-- begin-user-doc -->
- * <!-- end-user-doc -->
- * @generated
- * @ordered
- */
- int BEAN_DECORATOR__MERGE_SUPER_EVENTS = FEATURE_DECORATOR_FEATURE_COUNT + 2;
- /**
- * The feature id for the '<em><b>Introspect Properties</b></em>' attribute.
- * <!-- begin-user-doc -->
- * <!-- end-user-doc -->
- * @generated
- * @ordered
- */
- int BEAN_DECORATOR__INTROSPECT_PROPERTIES = FEATURE_DECORATOR_FEATURE_COUNT + 3;
- /**
- * The feature id for the '<em><b>Introspect Methods</b></em>' attribute.
- * <!-- begin-user-doc -->
- * <!-- end-user-doc -->
- * @generated
- * @ordered
- */
- int BEAN_DECORATOR__INTROSPECT_METHODS = FEATURE_DECORATOR_FEATURE_COUNT + 4;
-
- /**
- * The feature id for the '<em><b>Introspect Events</b></em>' attribute.
- * <!-- begin-user-doc -->
- * <!-- end-user-doc -->
- * @generated
- * @ordered
- */
- int BEAN_DECORATOR__INTROSPECT_EVENTS = FEATURE_DECORATOR_FEATURE_COUNT + 5;
- /**
- * The feature id for the '<em><b>Do Beaninfo</b></em>' attribute.
- * <!-- begin-user-doc -->
- * <!-- end-user-doc -->
- * @generated
- * @ordered
- */
- int BEAN_DECORATOR__DO_BEANINFO = FEATURE_DECORATOR_FEATURE_COUNT + 6;
- /**
- * The feature id for the '<em><b>Not Inherited Property Names</b></em>' attribute list.
- * <!-- begin-user-doc -->
- * <!-- end-user-doc -->
- * @generated
- * @ordered
- */
- int BEAN_DECORATOR__NOT_INHERITED_PROPERTY_NAMES = FEATURE_DECORATOR_FEATURE_COUNT + 7;
-
- /**
- * The feature id for the '<em><b>Not Inherited Method Names</b></em>' attribute list.
- * <!-- begin-user-doc -->
- * <!-- end-user-doc -->
- * @generated
- * @ordered
- */
- int BEAN_DECORATOR__NOT_INHERITED_METHOD_NAMES = FEATURE_DECORATOR_FEATURE_COUNT + 8;
-
- /**
- * The feature id for the '<em><b>Not Inherited Event Names</b></em>' attribute list.
- * <!-- begin-user-doc -->
- * <!-- end-user-doc -->
- * @generated
- * @ordered
- */
- int BEAN_DECORATOR__NOT_INHERITED_EVENT_NAMES = FEATURE_DECORATOR_FEATURE_COUNT + 9;
-
- /**
- * The feature id for the '<em><b>Customizer Class</b></em>' reference.
- * <!-- begin-user-doc -->
- * <!-- end-user-doc -->
- * @generated
- * @ordered
- */
- int BEAN_DECORATOR__CUSTOMIZER_CLASS = FEATURE_DECORATOR_FEATURE_COUNT + 10;
- /**
- * The number of structural features of the '<em>Bean Decorator</em>' class.
- * <!-- begin-user-doc -->
- * <!-- end-user-doc -->
- * @generated
- * @ordered
- */
- int BEAN_DECORATOR_FEATURE_COUNT = FEATURE_DECORATOR_FEATURE_COUNT + 11;
-
- /**
- * The feature id for the '<em><b>EAnnotations</b></em>' containment reference list.
- * <!-- begin-user-doc -->
- * <!-- end-user-doc -->
- * @generated
- * @ordered
- */
- int EVENT_SET_DECORATOR__EANNOTATIONS = FEATURE_DECORATOR__EANNOTATIONS;
-
- /**
- * The feature id for the '<em><b>Source</b></em>' attribute.
- * <!-- begin-user-doc -->
- * <!-- end-user-doc -->
- * @generated
- * @ordered
- */
- int EVENT_SET_DECORATOR__SOURCE = FEATURE_DECORATOR__SOURCE;
-
- /**
- * The feature id for the '<em><b>Details</b></em>' map.
- * <!-- begin-user-doc -->
- * <!-- end-user-doc -->
- * @generated
- * @ordered
- */
- int EVENT_SET_DECORATOR__DETAILS = FEATURE_DECORATOR__DETAILS;
-
- /**
- * The feature id for the '<em><b>EModel Element</b></em>' container reference.
- * <!-- begin-user-doc -->
- * <!-- end-user-doc -->
- * @generated
- * @ordered
- */
- int EVENT_SET_DECORATOR__EMODEL_ELEMENT = FEATURE_DECORATOR__EMODEL_ELEMENT;
-
- /**
- * The feature id for the '<em><b>Contents</b></em>' containment reference list.
- * <!-- begin-user-doc -->
- * <!-- end-user-doc -->
- * @generated
- * @ordered
- */
- int EVENT_SET_DECORATOR__CONTENTS = FEATURE_DECORATOR__CONTENTS;
-
- /**
- * The feature id for the '<em><b>References</b></em>' reference list.
- * <!-- begin-user-doc -->
- * <!-- end-user-doc -->
- * @generated
- * @ordered
- */
- int EVENT_SET_DECORATOR__REFERENCES = FEATURE_DECORATOR__REFERENCES;
-
- /**
- * The feature id for the '<em><b>Display Name</b></em>' attribute.
- * <!-- begin-user-doc -->
- * <!-- end-user-doc -->
- * @generated
- * @ordered
- */
- int EVENT_SET_DECORATOR__DISPLAY_NAME = FEATURE_DECORATOR__DISPLAY_NAME;
- /**
- * The feature id for the '<em><b>Short Description</b></em>' attribute.
- * <!-- begin-user-doc -->
- * <!-- end-user-doc -->
- * @generated
- * @ordered
- */
- int EVENT_SET_DECORATOR__SHORT_DESCRIPTION = FEATURE_DECORATOR__SHORT_DESCRIPTION;
- /**
- * The feature id for the '<em><b>Category</b></em>' attribute.
- * <!-- begin-user-doc -->
- * <!-- end-user-doc -->
- * @generated
- * @ordered
- */
- int EVENT_SET_DECORATOR__CATEGORY = FEATURE_DECORATOR__CATEGORY;
- /**
- * The feature id for the '<em><b>Expert</b></em>' attribute.
- * <!-- begin-user-doc -->
- * <!-- end-user-doc -->
- * @generated
- * @ordered
- */
- int EVENT_SET_DECORATOR__EXPERT = FEATURE_DECORATOR__EXPERT;
-
- /**
- * The feature id for the '<em><b>Hidden</b></em>' attribute.
- * <!-- begin-user-doc -->
- * <!-- end-user-doc -->
- * @generated
- * @ordered
- */
- int EVENT_SET_DECORATOR__HIDDEN = FEATURE_DECORATOR__HIDDEN;
-
- /**
- * The feature id for the '<em><b>Preferred</b></em>' attribute.
- * <!-- begin-user-doc -->
- * <!-- end-user-doc -->
- * @generated
- * @ordered
- */
- int EVENT_SET_DECORATOR__PREFERRED = FEATURE_DECORATOR__PREFERRED;
-
- /**
- * The feature id for the '<em><b>Merge Introspection</b></em>' attribute.
- * <!-- begin-user-doc -->
- * <!-- end-user-doc -->
- * @generated
- * @ordered
- */
- int EVENT_SET_DECORATOR__MERGE_INTROSPECTION = FEATURE_DECORATOR__MERGE_INTROSPECTION;
- /**
- * The feature id for the '<em><b>Attributes Explicit Empty</b></em>' attribute.
- * <!-- begin-user-doc -->
- * <!-- end-user-doc -->
- * @generated
- * @ordered
- */
- int EVENT_SET_DECORATOR__ATTRIBUTES_EXPLICIT_EMPTY = FEATURE_DECORATOR__ATTRIBUTES_EXPLICIT_EMPTY;
-
- /**
- * The feature id for the '<em><b>Implicitly Set Bits</b></em>' attribute.
- * <!-- begin-user-doc -->
- * <!-- end-user-doc -->
- * @generated
- * @ordered
- */
- int EVENT_SET_DECORATOR__IMPLICITLY_SET_BITS = FEATURE_DECORATOR__IMPLICITLY_SET_BITS;
-
- /**
- * The feature id for the '<em><b>Implicit Decorator Flag</b></em>' attribute.
- * <!-- begin-user-doc -->
- * <!-- end-user-doc -->
- * @generated
- * @ordered
- */
- int EVENT_SET_DECORATOR__IMPLICIT_DECORATOR_FLAG = FEATURE_DECORATOR__IMPLICIT_DECORATOR_FLAG;
-
- /**
- * The feature id for the '<em><b>Attributes</b></em>' map.
- * <!-- begin-user-doc -->
- * <!-- end-user-doc -->
- * @generated
- * @ordered
- */
- int EVENT_SET_DECORATOR__ATTRIBUTES = FEATURE_DECORATOR__ATTRIBUTES;
- /**
- * The feature id for the '<em><b>In Default Event Set</b></em>' attribute.
- * <!-- begin-user-doc -->
- * <!-- end-user-doc -->
- * @generated
- * @ordered
- */
- int EVENT_SET_DECORATOR__IN_DEFAULT_EVENT_SET = FEATURE_DECORATOR_FEATURE_COUNT + 0;
-
- /**
- * The feature id for the '<em><b>Unicast</b></em>' attribute.
- * <!-- begin-user-doc -->
- * <!-- end-user-doc -->
- * @generated
- * @ordered
- */
- int EVENT_SET_DECORATOR__UNICAST = FEATURE_DECORATOR_FEATURE_COUNT + 1;
-
- /**
- * The feature id for the '<em><b>Listener Methods Explicit Empty</b></em>' attribute.
- * <!-- begin-user-doc -->
- * <!-- end-user-doc -->
- * @generated
- * @ordered
- */
- int EVENT_SET_DECORATOR__LISTENER_METHODS_EXPLICIT_EMPTY = FEATURE_DECORATOR_FEATURE_COUNT + 2;
-
- /**
- * The meta object id for the '{@link org.eclipse.jem.internal.beaninfo.impl.BeanEventImpl <em>Bean Event</em>}' class.
- * <!-- begin-user-doc -->
- * <!-- end-user-doc -->
- * @see org.eclipse.jem.internal.beaninfo.impl.BeanEventImpl
- * @see org.eclipse.jem.internal.beaninfo.impl.BeaninfoPackageImpl#getBeanEvent()
- * @generated
- */
- int BEAN_EVENT = 8;
- /**
- * The feature id for the '<em><b>Add Listener Method</b></em>' reference.
- * <!-- begin-user-doc -->
- * <!-- end-user-doc -->
- * @generated
- * @ordered
- */
- int EVENT_SET_DECORATOR__ADD_LISTENER_METHOD = FEATURE_DECORATOR_FEATURE_COUNT + 3;
- /**
- * The feature id for the '<em><b>Listener Methods</b></em>' reference list.
- * <!-- begin-user-doc -->
- * <!-- end-user-doc -->
- * @generated
- * @ordered
- */
- int EVENT_SET_DECORATOR__LISTENER_METHODS = FEATURE_DECORATOR_FEATURE_COUNT + 4;
- /**
- * The feature id for the '<em><b>Listener Type</b></em>' reference.
- * <!-- begin-user-doc -->
- * <!-- end-user-doc -->
- * @generated
- * @ordered
- */
- int EVENT_SET_DECORATOR__LISTENER_TYPE = FEATURE_DECORATOR_FEATURE_COUNT + 5;
- /**
- * The feature id for the '<em><b>Remove Listener Method</b></em>' reference.
- * <!-- begin-user-doc -->
- * <!-- end-user-doc -->
- * @generated
- * @ordered
- */
- int EVENT_SET_DECORATOR__REMOVE_LISTENER_METHOD = FEATURE_DECORATOR_FEATURE_COUNT + 6;
- /**
- * The feature id for the '<em><b>Event Adapter Class</b></em>' reference.
- * <!-- begin-user-doc -->
- * <!-- end-user-doc -->
- * @generated
- * @ordered
- */
- int EVENT_SET_DECORATOR__EVENT_ADAPTER_CLASS = FEATURE_DECORATOR_FEATURE_COUNT + 7;
-
- /**
- * The feature id for the '<em><b>Ser List Mthd</b></em>' containment reference list.
- * <!-- begin-user-doc -->
- * <!-- end-user-doc -->
- * @generated
- * @ordered
- */
- int EVENT_SET_DECORATOR__SER_LIST_MTHD = FEATURE_DECORATOR_FEATURE_COUNT + 8;
-
- /**
- * The number of structural features of the '<em>Event Set Decorator</em>' class.
- * <!-- begin-user-doc -->
- * <!-- end-user-doc -->
- * @generated
- * @ordered
- */
- int EVENT_SET_DECORATOR_FEATURE_COUNT = FEATURE_DECORATOR_FEATURE_COUNT + 9;
-
- /**
- * The feature id for the '<em><b>EAnnotations</b></em>' containment reference list.
- * <!-- begin-user-doc -->
- * <!-- end-user-doc -->
- * @generated
- * @ordered
- */
- int METHOD_DECORATOR__EANNOTATIONS = FEATURE_DECORATOR__EANNOTATIONS;
-
- /**
- * The feature id for the '<em><b>Source</b></em>' attribute.
- * <!-- begin-user-doc -->
- * <!-- end-user-doc -->
- * @generated
- * @ordered
- */
- int METHOD_DECORATOR__SOURCE = FEATURE_DECORATOR__SOURCE;
-
- /**
- * The feature id for the '<em><b>Details</b></em>' map.
- * <!-- begin-user-doc -->
- * <!-- end-user-doc -->
- * @generated
- * @ordered
- */
- int METHOD_DECORATOR__DETAILS = FEATURE_DECORATOR__DETAILS;
-
- /**
- * The feature id for the '<em><b>EModel Element</b></em>' container reference.
- * <!-- begin-user-doc -->
- * <!-- end-user-doc -->
- * @generated
- * @ordered
- */
- int METHOD_DECORATOR__EMODEL_ELEMENT = FEATURE_DECORATOR__EMODEL_ELEMENT;
-
- /**
- * The feature id for the '<em><b>Contents</b></em>' containment reference list.
- * <!-- begin-user-doc -->
- * <!-- end-user-doc -->
- * @generated
- * @ordered
- */
- int METHOD_DECORATOR__CONTENTS = FEATURE_DECORATOR__CONTENTS;
-
- /**
- * The feature id for the '<em><b>References</b></em>' reference list.
- * <!-- begin-user-doc -->
- * <!-- end-user-doc -->
- * @generated
- * @ordered
- */
- int METHOD_DECORATOR__REFERENCES = FEATURE_DECORATOR__REFERENCES;
-
- /**
- * The feature id for the '<em><b>Display Name</b></em>' attribute.
- * <!-- begin-user-doc -->
- * <!-- end-user-doc -->
- * @generated
- * @ordered
- */
- int METHOD_DECORATOR__DISPLAY_NAME = FEATURE_DECORATOR__DISPLAY_NAME;
- /**
- * The feature id for the '<em><b>Short Description</b></em>' attribute.
- * <!-- begin-user-doc -->
- * <!-- end-user-doc -->
- * @generated
- * @ordered
- */
- int METHOD_DECORATOR__SHORT_DESCRIPTION = FEATURE_DECORATOR__SHORT_DESCRIPTION;
- /**
- * The feature id for the '<em><b>Category</b></em>' attribute.
- * <!-- begin-user-doc -->
- * <!-- end-user-doc -->
- * @generated
- * @ordered
- */
- int METHOD_DECORATOR__CATEGORY = FEATURE_DECORATOR__CATEGORY;
- /**
- * The feature id for the '<em><b>Expert</b></em>' attribute.
- * <!-- begin-user-doc -->
- * <!-- end-user-doc -->
- * @generated
- * @ordered
- */
- int METHOD_DECORATOR__EXPERT = FEATURE_DECORATOR__EXPERT;
-
- /**
- * The feature id for the '<em><b>Hidden</b></em>' attribute.
- * <!-- begin-user-doc -->
- * <!-- end-user-doc -->
- * @generated
- * @ordered
- */
- int METHOD_DECORATOR__HIDDEN = FEATURE_DECORATOR__HIDDEN;
-
- /**
- * The feature id for the '<em><b>Preferred</b></em>' attribute.
- * <!-- begin-user-doc -->
- * <!-- end-user-doc -->
- * @generated
- * @ordered
- */
- int METHOD_DECORATOR__PREFERRED = FEATURE_DECORATOR__PREFERRED;
-
- /**
- * The feature id for the '<em><b>Merge Introspection</b></em>' attribute.
- * <!-- begin-user-doc -->
- * <!-- end-user-doc -->
- * @generated
- * @ordered
- */
- int METHOD_DECORATOR__MERGE_INTROSPECTION = FEATURE_DECORATOR__MERGE_INTROSPECTION;
- /**
- * The feature id for the '<em><b>Attributes Explicit Empty</b></em>' attribute.
- * <!-- begin-user-doc -->
- * <!-- end-user-doc -->
- * @generated
- * @ordered
- */
- int METHOD_DECORATOR__ATTRIBUTES_EXPLICIT_EMPTY = FEATURE_DECORATOR__ATTRIBUTES_EXPLICIT_EMPTY;
-
- /**
- * The feature id for the '<em><b>Implicitly Set Bits</b></em>' attribute.
- * <!-- begin-user-doc -->
- * <!-- end-user-doc -->
- * @generated
- * @ordered
- */
- int METHOD_DECORATOR__IMPLICITLY_SET_BITS = FEATURE_DECORATOR__IMPLICITLY_SET_BITS;
-
- /**
- * The feature id for the '<em><b>Implicit Decorator Flag</b></em>' attribute.
- * <!-- begin-user-doc -->
- * <!-- end-user-doc -->
- * @generated
- * @ordered
- */
- int METHOD_DECORATOR__IMPLICIT_DECORATOR_FLAG = FEATURE_DECORATOR__IMPLICIT_DECORATOR_FLAG;
-
- /**
- * The feature id for the '<em><b>Attributes</b></em>' map.
- * <!-- begin-user-doc -->
- * <!-- end-user-doc -->
- * @generated
- * @ordered
- */
- int METHOD_DECORATOR__ATTRIBUTES = FEATURE_DECORATOR__ATTRIBUTES;
- /**
- * The feature id for the '<em><b>Parms Explicit Empty</b></em>' attribute.
- * <!-- begin-user-doc -->
- * <!-- end-user-doc -->
- * @generated
- * @ordered
- */
- int METHOD_DECORATOR__PARMS_EXPLICIT_EMPTY = FEATURE_DECORATOR_FEATURE_COUNT + 0;
-
- /**
- * The feature id for the '<em><b>Parameter Descriptors</b></em>' reference list.
- * <!-- begin-user-doc -->
- * <!-- end-user-doc -->
- * @generated
- * @ordered
- */
- int METHOD_DECORATOR__PARAMETER_DESCRIPTORS = FEATURE_DECORATOR_FEATURE_COUNT + 1;
- /**
- * The feature id for the '<em><b>Ser Parm Desc</b></em>' containment reference list.
- * <!-- begin-user-doc -->
- * <!-- end-user-doc -->
- * @generated
- * @ordered
- */
- int METHOD_DECORATOR__SER_PARM_DESC = FEATURE_DECORATOR_FEATURE_COUNT + 2;
-
- /**
- * The number of structural features of the '<em>Method Decorator</em>' class.
- * <!-- begin-user-doc -->
- * <!-- end-user-doc -->
- * @generated
- * @ordered
- */
- int METHOD_DECORATOR_FEATURE_COUNT = FEATURE_DECORATOR_FEATURE_COUNT + 3;
-
- /**
- * The feature id for the '<em><b>EAnnotations</b></em>' containment reference list.
- * <!-- begin-user-doc -->
- * <!-- end-user-doc -->
- * @generated
- * @ordered
- */
- int PARAMETER_DECORATOR__EANNOTATIONS = FEATURE_DECORATOR__EANNOTATIONS;
-
- /**
- * The feature id for the '<em><b>Source</b></em>' attribute.
- * <!-- begin-user-doc -->
- * <!-- end-user-doc -->
- * @generated
- * @ordered
- */
- int PARAMETER_DECORATOR__SOURCE = FEATURE_DECORATOR__SOURCE;
-
- /**
- * The feature id for the '<em><b>Details</b></em>' map.
- * <!-- begin-user-doc -->
- * <!-- end-user-doc -->
- * @generated
- * @ordered
- */
- int PARAMETER_DECORATOR__DETAILS = FEATURE_DECORATOR__DETAILS;
-
- /**
- * The feature id for the '<em><b>EModel Element</b></em>' container reference.
- * <!-- begin-user-doc -->
- * <!-- end-user-doc -->
- * @generated
- * @ordered
- */
- int PARAMETER_DECORATOR__EMODEL_ELEMENT = FEATURE_DECORATOR__EMODEL_ELEMENT;
-
- /**
- * The feature id for the '<em><b>Contents</b></em>' containment reference list.
- * <!-- begin-user-doc -->
- * <!-- end-user-doc -->
- * @generated
- * @ordered
- */
- int PARAMETER_DECORATOR__CONTENTS = FEATURE_DECORATOR__CONTENTS;
-
- /**
- * The feature id for the '<em><b>References</b></em>' reference list.
- * <!-- begin-user-doc -->
- * <!-- end-user-doc -->
- * @generated
- * @ordered
- */
- int PARAMETER_DECORATOR__REFERENCES = FEATURE_DECORATOR__REFERENCES;
-
- /**
- * The feature id for the '<em><b>Display Name</b></em>' attribute.
- * <!-- begin-user-doc -->
- * <!-- end-user-doc -->
- * @generated
- * @ordered
- */
- int PARAMETER_DECORATOR__DISPLAY_NAME = FEATURE_DECORATOR__DISPLAY_NAME;
- /**
- * The feature id for the '<em><b>Short Description</b></em>' attribute.
- * <!-- begin-user-doc -->
- * <!-- end-user-doc -->
- * @generated
- * @ordered
- */
- int PARAMETER_DECORATOR__SHORT_DESCRIPTION = FEATURE_DECORATOR__SHORT_DESCRIPTION;
- /**
- * The feature id for the '<em><b>Category</b></em>' attribute.
- * <!-- begin-user-doc -->
- * <!-- end-user-doc -->
- * @generated
- * @ordered
- */
- int PARAMETER_DECORATOR__CATEGORY = FEATURE_DECORATOR__CATEGORY;
- /**
- * The feature id for the '<em><b>Expert</b></em>' attribute.
- * <!-- begin-user-doc -->
- * <!-- end-user-doc -->
- * @generated
- * @ordered
- */
- int PARAMETER_DECORATOR__EXPERT = FEATURE_DECORATOR__EXPERT;
-
- /**
- * The feature id for the '<em><b>Hidden</b></em>' attribute.
- * <!-- begin-user-doc -->
- * <!-- end-user-doc -->
- * @generated
- * @ordered
- */
- int PARAMETER_DECORATOR__HIDDEN = FEATURE_DECORATOR__HIDDEN;
-
- /**
- * The feature id for the '<em><b>Preferred</b></em>' attribute.
- * <!-- begin-user-doc -->
- * <!-- end-user-doc -->
- * @generated
- * @ordered
- */
- int PARAMETER_DECORATOR__PREFERRED = FEATURE_DECORATOR__PREFERRED;
-
- /**
- * The feature id for the '<em><b>Merge Introspection</b></em>' attribute.
- * <!-- begin-user-doc -->
- * <!-- end-user-doc -->
- * @generated
- * @ordered
- */
- int PARAMETER_DECORATOR__MERGE_INTROSPECTION = FEATURE_DECORATOR__MERGE_INTROSPECTION;
- /**
- * The feature id for the '<em><b>Attributes Explicit Empty</b></em>' attribute.
- * <!-- begin-user-doc -->
- * <!-- end-user-doc -->
- * @generated
- * @ordered
- */
- int PARAMETER_DECORATOR__ATTRIBUTES_EXPLICIT_EMPTY = FEATURE_DECORATOR__ATTRIBUTES_EXPLICIT_EMPTY;
-
- /**
- * The feature id for the '<em><b>Implicitly Set Bits</b></em>' attribute.
- * <!-- begin-user-doc -->
- * <!-- end-user-doc -->
- * @generated
- * @ordered
- */
- int PARAMETER_DECORATOR__IMPLICITLY_SET_BITS = FEATURE_DECORATOR__IMPLICITLY_SET_BITS;
-
- /**
- * The feature id for the '<em><b>Implicit Decorator Flag</b></em>' attribute.
- * <!-- begin-user-doc -->
- * <!-- end-user-doc -->
- * @generated
- * @ordered
- */
- int PARAMETER_DECORATOR__IMPLICIT_DECORATOR_FLAG = FEATURE_DECORATOR__IMPLICIT_DECORATOR_FLAG;
-
- /**
- * The feature id for the '<em><b>Attributes</b></em>' map.
- * <!-- begin-user-doc -->
- * <!-- end-user-doc -->
- * @generated
- * @ordered
- */
- int PARAMETER_DECORATOR__ATTRIBUTES = FEATURE_DECORATOR__ATTRIBUTES;
- /**
- * The feature id for the '<em><b>Name</b></em>' attribute.
- * <!-- begin-user-doc -->
- * <!-- end-user-doc -->
- * @generated
- * @ordered
- */
- int PARAMETER_DECORATOR__NAME = FEATURE_DECORATOR_FEATURE_COUNT + 0;
- /**
- * The feature id for the '<em><b>Parameter</b></em>' reference.
- * <!-- begin-user-doc -->
- * <!-- end-user-doc -->
- * @generated
- * @ordered
- */
- int PARAMETER_DECORATOR__PARAMETER = FEATURE_DECORATOR_FEATURE_COUNT + 1;
- /**
- * The number of structural features of the '<em>Parameter Decorator</em>' class.
- * <!-- begin-user-doc -->
- * <!-- end-user-doc -->
- * @generated
- * @ordered
- */
- int PARAMETER_DECORATOR_FEATURE_COUNT = FEATURE_DECORATOR_FEATURE_COUNT + 2;
-
- /**
- * The feature id for the '<em><b>EAnnotations</b></em>' containment reference list.
- * <!-- begin-user-doc -->
- * <!-- end-user-doc -->
- * @generated
- * @ordered
- */
- int PROPERTY_DECORATOR__EANNOTATIONS = FEATURE_DECORATOR__EANNOTATIONS;
-
- /**
- * The feature id for the '<em><b>Source</b></em>' attribute.
- * <!-- begin-user-doc -->
- * <!-- end-user-doc -->
- * @generated
- * @ordered
- */
- int PROPERTY_DECORATOR__SOURCE = FEATURE_DECORATOR__SOURCE;
-
- /**
- * The feature id for the '<em><b>Details</b></em>' map.
- * <!-- begin-user-doc -->
- * <!-- end-user-doc -->
- * @generated
- * @ordered
- */
- int PROPERTY_DECORATOR__DETAILS = FEATURE_DECORATOR__DETAILS;
-
- /**
- * The feature id for the '<em><b>EModel Element</b></em>' container reference.
- * <!-- begin-user-doc -->
- * <!-- end-user-doc -->
- * @generated
- * @ordered
- */
- int PROPERTY_DECORATOR__EMODEL_ELEMENT = FEATURE_DECORATOR__EMODEL_ELEMENT;
-
- /**
- * The feature id for the '<em><b>Contents</b></em>' containment reference list.
- * <!-- begin-user-doc -->
- * <!-- end-user-doc -->
- * @generated
- * @ordered
- */
- int PROPERTY_DECORATOR__CONTENTS = FEATURE_DECORATOR__CONTENTS;
-
- /**
- * The feature id for the '<em><b>References</b></em>' reference list.
- * <!-- begin-user-doc -->
- * <!-- end-user-doc -->
- * @generated
- * @ordered
- */
- int PROPERTY_DECORATOR__REFERENCES = FEATURE_DECORATOR__REFERENCES;
-
- /**
- * The feature id for the '<em><b>Display Name</b></em>' attribute.
- * <!-- begin-user-doc -->
- * <!-- end-user-doc -->
- * @generated
- * @ordered
- */
- int PROPERTY_DECORATOR__DISPLAY_NAME = FEATURE_DECORATOR__DISPLAY_NAME;
- /**
- * The feature id for the '<em><b>Short Description</b></em>' attribute.
- * <!-- begin-user-doc -->
- * <!-- end-user-doc -->
- * @generated
- * @ordered
- */
- int PROPERTY_DECORATOR__SHORT_DESCRIPTION = FEATURE_DECORATOR__SHORT_DESCRIPTION;
- /**
- * The feature id for the '<em><b>Category</b></em>' attribute.
- * <!-- begin-user-doc -->
- * <!-- end-user-doc -->
- * @generated
- * @ordered
- */
- int PROPERTY_DECORATOR__CATEGORY = FEATURE_DECORATOR__CATEGORY;
- /**
- * The feature id for the '<em><b>Expert</b></em>' attribute.
- * <!-- begin-user-doc -->
- * <!-- end-user-doc -->
- * @generated
- * @ordered
- */
- int PROPERTY_DECORATOR__EXPERT = FEATURE_DECORATOR__EXPERT;
-
- /**
- * The feature id for the '<em><b>Hidden</b></em>' attribute.
- * <!-- begin-user-doc -->
- * <!-- end-user-doc -->
- * @generated
- * @ordered
- */
- int PROPERTY_DECORATOR__HIDDEN = FEATURE_DECORATOR__HIDDEN;
-
- /**
- * The feature id for the '<em><b>Preferred</b></em>' attribute.
- * <!-- begin-user-doc -->
- * <!-- end-user-doc -->
- * @generated
- * @ordered
- */
- int PROPERTY_DECORATOR__PREFERRED = FEATURE_DECORATOR__PREFERRED;
-
- /**
- * The feature id for the '<em><b>Merge Introspection</b></em>' attribute.
- * <!-- begin-user-doc -->
- * <!-- end-user-doc -->
- * @generated
- * @ordered
- */
- int PROPERTY_DECORATOR__MERGE_INTROSPECTION = FEATURE_DECORATOR__MERGE_INTROSPECTION;
- /**
- * The feature id for the '<em><b>Attributes Explicit Empty</b></em>' attribute.
- * <!-- begin-user-doc -->
- * <!-- end-user-doc -->
- * @generated
- * @ordered
- */
- int PROPERTY_DECORATOR__ATTRIBUTES_EXPLICIT_EMPTY = FEATURE_DECORATOR__ATTRIBUTES_EXPLICIT_EMPTY;
-
- /**
- * The feature id for the '<em><b>Implicitly Set Bits</b></em>' attribute.
- * <!-- begin-user-doc -->
- * <!-- end-user-doc -->
- * @generated
- * @ordered
- */
- int PROPERTY_DECORATOR__IMPLICITLY_SET_BITS = FEATURE_DECORATOR__IMPLICITLY_SET_BITS;
-
- /**
- * The feature id for the '<em><b>Implicit Decorator Flag</b></em>' attribute.
- * <!-- begin-user-doc -->
- * <!-- end-user-doc -->
- * @generated
- * @ordered
- */
- int PROPERTY_DECORATOR__IMPLICIT_DECORATOR_FLAG = FEATURE_DECORATOR__IMPLICIT_DECORATOR_FLAG;
-
- /**
- * The feature id for the '<em><b>Attributes</b></em>' map.
- * <!-- begin-user-doc -->
- * <!-- end-user-doc -->
- * @generated
- * @ordered
- */
- int PROPERTY_DECORATOR__ATTRIBUTES = FEATURE_DECORATOR__ATTRIBUTES;
- /**
- * The feature id for the '<em><b>Bound</b></em>' attribute.
- * <!-- begin-user-doc -->
- * <!-- end-user-doc -->
- * @generated
- * @ordered
- */
- int PROPERTY_DECORATOR__BOUND = FEATURE_DECORATOR_FEATURE_COUNT + 0;
-
- /**
- * The feature id for the '<em><b>Constrained</b></em>' attribute.
- * <!-- begin-user-doc -->
- * <!-- end-user-doc -->
- * @generated
- * @ordered
- */
- int PROPERTY_DECORATOR__CONSTRAINED = FEATURE_DECORATOR_FEATURE_COUNT + 1;
-
- /**
- * The feature id for the '<em><b>Design Time</b></em>' attribute.
- * <!-- begin-user-doc -->
- * <!-- end-user-doc -->
- * @generated
- * @ordered
- */
- int PROPERTY_DECORATOR__DESIGN_TIME = FEATURE_DECORATOR_FEATURE_COUNT + 2;
-
- /**
- * The feature id for the '<em><b>Always Incompatible</b></em>' attribute.
- * <!-- begin-user-doc -->
- * <!-- end-user-doc -->
- * @generated
- * @ordered
- */
- int PROPERTY_DECORATOR__ALWAYS_INCOMPATIBLE = FEATURE_DECORATOR_FEATURE_COUNT + 3;
-
- /**
- * The feature id for the '<em><b>Filter Flags</b></em>' attribute list.
- * <!-- begin-user-doc -->
- * <!-- end-user-doc -->
- * @generated
- * @ordered
- */
- int PROPERTY_DECORATOR__FILTER_FLAGS = FEATURE_DECORATOR_FEATURE_COUNT + 4;
- /**
- * The feature id for the '<em><b>Field Read Only</b></em>' attribute.
- * <!-- begin-user-doc -->
- * <!-- end-user-doc -->
- * @generated
- * @ordered
- */
- int PROPERTY_DECORATOR__FIELD_READ_ONLY = FEATURE_DECORATOR_FEATURE_COUNT + 5;
-
- /**
- * The feature id for the '<em><b>Property Editor Class</b></em>' reference.
- * <!-- begin-user-doc -->
- * <!-- end-user-doc -->
- * @generated
- * @ordered
- */
- int PROPERTY_DECORATOR__PROPERTY_EDITOR_CLASS = FEATURE_DECORATOR_FEATURE_COUNT + 6;
- /**
- * The feature id for the '<em><b>Read Method</b></em>' reference.
- * <!-- begin-user-doc -->
- * <!-- end-user-doc -->
- * @generated
- * @ordered
- */
- int PROPERTY_DECORATOR__READ_METHOD = FEATURE_DECORATOR_FEATURE_COUNT + 7;
- /**
- * The feature id for the '<em><b>Write Method</b></em>' reference.
- * <!-- begin-user-doc -->
- * <!-- end-user-doc -->
- * @generated
- * @ordered
- */
- int PROPERTY_DECORATOR__WRITE_METHOD = FEATURE_DECORATOR_FEATURE_COUNT + 8;
- /**
- * The feature id for the '<em><b>Field</b></em>' reference.
- * <!-- begin-user-doc -->
- * <!-- end-user-doc -->
- * @generated
- * @ordered
- */
- int PROPERTY_DECORATOR__FIELD = FEATURE_DECORATOR_FEATURE_COUNT + 9;
-
- /**
- * The number of structural features of the '<em>Property Decorator</em>' class.
- * <!-- begin-user-doc -->
- * <!-- end-user-doc -->
- * @generated
- * @ordered
- */
- int PROPERTY_DECORATOR_FEATURE_COUNT = FEATURE_DECORATOR_FEATURE_COUNT + 10;
-
- /**
- * The feature id for the '<em><b>EAnnotations</b></em>' containment reference list.
- * <!-- begin-user-doc -->
- * <!-- end-user-doc -->
- * @generated
- * @ordered
- */
- int INDEXED_PROPERTY_DECORATOR__EANNOTATIONS = PROPERTY_DECORATOR__EANNOTATIONS;
-
- /**
- * The feature id for the '<em><b>Source</b></em>' attribute.
- * <!-- begin-user-doc -->
- * <!-- end-user-doc -->
- * @generated
- * @ordered
- */
- int INDEXED_PROPERTY_DECORATOR__SOURCE = PROPERTY_DECORATOR__SOURCE;
-
- /**
- * The feature id for the '<em><b>Details</b></em>' map.
- * <!-- begin-user-doc -->
- * <!-- end-user-doc -->
- * @generated
- * @ordered
- */
- int INDEXED_PROPERTY_DECORATOR__DETAILS = PROPERTY_DECORATOR__DETAILS;
-
- /**
- * The feature id for the '<em><b>EModel Element</b></em>' container reference.
- * <!-- begin-user-doc -->
- * <!-- end-user-doc -->
- * @generated
- * @ordered
- */
- int INDEXED_PROPERTY_DECORATOR__EMODEL_ELEMENT = PROPERTY_DECORATOR__EMODEL_ELEMENT;
-
- /**
- * The feature id for the '<em><b>Contents</b></em>' containment reference list.
- * <!-- begin-user-doc -->
- * <!-- end-user-doc -->
- * @generated
- * @ordered
- */
- int INDEXED_PROPERTY_DECORATOR__CONTENTS = PROPERTY_DECORATOR__CONTENTS;
-
- /**
- * The feature id for the '<em><b>References</b></em>' reference list.
- * <!-- begin-user-doc -->
- * <!-- end-user-doc -->
- * @generated
- * @ordered
- */
- int INDEXED_PROPERTY_DECORATOR__REFERENCES = PROPERTY_DECORATOR__REFERENCES;
-
- /**
- * The feature id for the '<em><b>Display Name</b></em>' attribute.
- * <!-- begin-user-doc -->
- * <!-- end-user-doc -->
- * @generated
- * @ordered
- */
- int INDEXED_PROPERTY_DECORATOR__DISPLAY_NAME = PROPERTY_DECORATOR__DISPLAY_NAME;
- /**
- * The feature id for the '<em><b>Short Description</b></em>' attribute.
- * <!-- begin-user-doc -->
- * <!-- end-user-doc -->
- * @generated
- * @ordered
- */
- int INDEXED_PROPERTY_DECORATOR__SHORT_DESCRIPTION = PROPERTY_DECORATOR__SHORT_DESCRIPTION;
- /**
- * The feature id for the '<em><b>Category</b></em>' attribute.
- * <!-- begin-user-doc -->
- * <!-- end-user-doc -->
- * @generated
- * @ordered
- */
- int INDEXED_PROPERTY_DECORATOR__CATEGORY = PROPERTY_DECORATOR__CATEGORY;
- /**
- * The feature id for the '<em><b>Expert</b></em>' attribute.
- * <!-- begin-user-doc -->
- * <!-- end-user-doc -->
- * @generated
- * @ordered
- */
- int INDEXED_PROPERTY_DECORATOR__EXPERT = PROPERTY_DECORATOR__EXPERT;
-
- /**
- * The feature id for the '<em><b>Hidden</b></em>' attribute.
- * <!-- begin-user-doc -->
- * <!-- end-user-doc -->
- * @generated
- * @ordered
- */
- int INDEXED_PROPERTY_DECORATOR__HIDDEN = PROPERTY_DECORATOR__HIDDEN;
-
- /**
- * The feature id for the '<em><b>Preferred</b></em>' attribute.
- * <!-- begin-user-doc -->
- * <!-- end-user-doc -->
- * @generated
- * @ordered
- */
- int INDEXED_PROPERTY_DECORATOR__PREFERRED = PROPERTY_DECORATOR__PREFERRED;
-
- /**
- * The feature id for the '<em><b>Merge Introspection</b></em>' attribute.
- * <!-- begin-user-doc -->
- * <!-- end-user-doc -->
- * @generated
- * @ordered
- */
- int INDEXED_PROPERTY_DECORATOR__MERGE_INTROSPECTION = PROPERTY_DECORATOR__MERGE_INTROSPECTION;
- /**
- * The feature id for the '<em><b>Attributes Explicit Empty</b></em>' attribute.
- * <!-- begin-user-doc -->
- * <!-- end-user-doc -->
- * @generated
- * @ordered
- */
- int INDEXED_PROPERTY_DECORATOR__ATTRIBUTES_EXPLICIT_EMPTY = PROPERTY_DECORATOR__ATTRIBUTES_EXPLICIT_EMPTY;
-
- /**
- * The feature id for the '<em><b>Implicitly Set Bits</b></em>' attribute.
- * <!-- begin-user-doc -->
- * <!-- end-user-doc -->
- * @generated
- * @ordered
- */
- int INDEXED_PROPERTY_DECORATOR__IMPLICITLY_SET_BITS = PROPERTY_DECORATOR__IMPLICITLY_SET_BITS;
-
- /**
- * The feature id for the '<em><b>Implicit Decorator Flag</b></em>' attribute.
- * <!-- begin-user-doc -->
- * <!-- end-user-doc -->
- * @generated
- * @ordered
- */
- int INDEXED_PROPERTY_DECORATOR__IMPLICIT_DECORATOR_FLAG = PROPERTY_DECORATOR__IMPLICIT_DECORATOR_FLAG;
-
- /**
- * The feature id for the '<em><b>Attributes</b></em>' map.
- * <!-- begin-user-doc -->
- * <!-- end-user-doc -->
- * @generated
- * @ordered
- */
- int INDEXED_PROPERTY_DECORATOR__ATTRIBUTES = PROPERTY_DECORATOR__ATTRIBUTES;
- /**
- * The feature id for the '<em><b>Bound</b></em>' attribute.
- * <!-- begin-user-doc -->
- * <!-- end-user-doc -->
- * @generated
- * @ordered
- */
- int INDEXED_PROPERTY_DECORATOR__BOUND = PROPERTY_DECORATOR__BOUND;
-
- /**
- * The feature id for the '<em><b>Constrained</b></em>' attribute.
- * <!-- begin-user-doc -->
- * <!-- end-user-doc -->
- * @generated
- * @ordered
- */
- int INDEXED_PROPERTY_DECORATOR__CONSTRAINED = PROPERTY_DECORATOR__CONSTRAINED;
-
- /**
- * The feature id for the '<em><b>Design Time</b></em>' attribute.
- * <!-- begin-user-doc -->
- * <!-- end-user-doc -->
- * @generated
- * @ordered
- */
- int INDEXED_PROPERTY_DECORATOR__DESIGN_TIME = PROPERTY_DECORATOR__DESIGN_TIME;
-
- /**
- * The feature id for the '<em><b>Always Incompatible</b></em>' attribute.
- * <!-- begin-user-doc -->
- * <!-- end-user-doc -->
- * @generated
- * @ordered
- */
- int INDEXED_PROPERTY_DECORATOR__ALWAYS_INCOMPATIBLE = PROPERTY_DECORATOR__ALWAYS_INCOMPATIBLE;
-
- /**
- * The feature id for the '<em><b>Filter Flags</b></em>' attribute list.
- * <!-- begin-user-doc -->
- * <!-- end-user-doc -->
- * @generated
- * @ordered
- */
- int INDEXED_PROPERTY_DECORATOR__FILTER_FLAGS = PROPERTY_DECORATOR__FILTER_FLAGS;
- /**
- * The feature id for the '<em><b>Field Read Only</b></em>' attribute.
- * <!-- begin-user-doc -->
- * <!-- end-user-doc -->
- * @generated
- * @ordered
- */
- int INDEXED_PROPERTY_DECORATOR__FIELD_READ_ONLY = PROPERTY_DECORATOR__FIELD_READ_ONLY;
-
- /**
- * The feature id for the '<em><b>Property Editor Class</b></em>' reference.
- * <!-- begin-user-doc -->
- * <!-- end-user-doc -->
- * @generated
- * @ordered
- */
- int INDEXED_PROPERTY_DECORATOR__PROPERTY_EDITOR_CLASS = PROPERTY_DECORATOR__PROPERTY_EDITOR_CLASS;
- /**
- * The feature id for the '<em><b>Read Method</b></em>' reference.
- * <!-- begin-user-doc -->
- * <!-- end-user-doc -->
- * @generated
- * @ordered
- */
- int INDEXED_PROPERTY_DECORATOR__READ_METHOD = PROPERTY_DECORATOR__READ_METHOD;
- /**
- * The feature id for the '<em><b>Write Method</b></em>' reference.
- * <!-- begin-user-doc -->
- * <!-- end-user-doc -->
- * @generated
- * @ordered
- */
- int INDEXED_PROPERTY_DECORATOR__WRITE_METHOD = PROPERTY_DECORATOR__WRITE_METHOD;
- /**
- * The feature id for the '<em><b>Field</b></em>' reference.
- * <!-- begin-user-doc -->
- * <!-- end-user-doc -->
- * @generated
- * @ordered
- */
- int INDEXED_PROPERTY_DECORATOR__FIELD = PROPERTY_DECORATOR__FIELD;
-
- /**
- * The feature id for the '<em><b>Indexed Read Method</b></em>' reference.
- * <!-- begin-user-doc -->
- * <!-- end-user-doc -->
- * @generated
- * @ordered
- */
- int INDEXED_PROPERTY_DECORATOR__INDEXED_READ_METHOD = PROPERTY_DECORATOR_FEATURE_COUNT + 0;
- /**
- * The feature id for the '<em><b>Indexed Write Method</b></em>' reference.
- * <!-- begin-user-doc -->
- * <!-- end-user-doc -->
- * @generated
- * @ordered
- */
- int INDEXED_PROPERTY_DECORATOR__INDEXED_WRITE_METHOD = PROPERTY_DECORATOR_FEATURE_COUNT + 1;
- /**
- * The number of structural features of the '<em>Indexed Property Decorator</em>' class.
- * <!-- begin-user-doc -->
- * <!-- end-user-doc -->
- * @generated
- * @ordered
- */
- int INDEXED_PROPERTY_DECORATOR_FEATURE_COUNT = PROPERTY_DECORATOR_FEATURE_COUNT + 2;
-
- /**
- * The feature id for the '<em><b>EAnnotations</b></em>' containment reference list.
- * <!-- begin-user-doc -->
- * <!-- end-user-doc -->
- * @generated
- * @ordered
- */
- int METHOD_PROXY__EANNOTATIONS = EcorePackage.EOPERATION__EANNOTATIONS;
-
- /**
- * The feature id for the '<em><b>Name</b></em>' attribute.
- * <!-- begin-user-doc -->
- * <!-- end-user-doc -->
- * @generated
- * @ordered
- */
- int METHOD_PROXY__NAME = EcorePackage.EOPERATION__NAME;
- /**
- * The feature id for the '<em><b>Ordered</b></em>' attribute.
- * <!-- begin-user-doc -->
- * <!-- end-user-doc -->
- * @generated
- * @ordered
- */
- int METHOD_PROXY__ORDERED = EcorePackage.EOPERATION__ORDERED;
-
- /**
- * The feature id for the '<em><b>Unique</b></em>' attribute.
- * <!-- begin-user-doc -->
- * <!-- end-user-doc -->
- * @generated
- * @ordered
- */
- int METHOD_PROXY__UNIQUE = EcorePackage.EOPERATION__UNIQUE;
-
- /**
- * The feature id for the '<em><b>Lower Bound</b></em>' attribute.
- * <!-- begin-user-doc -->
- * <!-- end-user-doc -->
- * @generated
- * @ordered
- */
- int METHOD_PROXY__LOWER_BOUND = EcorePackage.EOPERATION__LOWER_BOUND;
-
- /**
- * The feature id for the '<em><b>Upper Bound</b></em>' attribute.
- * <!-- begin-user-doc -->
- * <!-- end-user-doc -->
- * @generated
- * @ordered
- */
- int METHOD_PROXY__UPPER_BOUND = EcorePackage.EOPERATION__UPPER_BOUND;
-
- /**
- * The feature id for the '<em><b>Many</b></em>' attribute.
- * <!-- begin-user-doc -->
- * <!-- end-user-doc -->
- * @generated
- * @ordered
- */
- int METHOD_PROXY__MANY = EcorePackage.EOPERATION__MANY;
-
- /**
- * The feature id for the '<em><b>Required</b></em>' attribute.
- * <!-- begin-user-doc -->
- * <!-- end-user-doc -->
- * @generated
- * @ordered
- */
- int METHOD_PROXY__REQUIRED = EcorePackage.EOPERATION__REQUIRED;
-
- /**
- * The feature id for the '<em><b>EType</b></em>' reference.
- * <!-- begin-user-doc -->
- * <!-- end-user-doc -->
- * @generated
- * @ordered
- */
- int METHOD_PROXY__ETYPE = EcorePackage.EOPERATION__ETYPE;
-
- /**
- * The feature id for the '<em><b>EGeneric Type</b></em>' containment reference.
- * <!-- begin-user-doc -->
- * <!-- end-user-doc -->
- * @generated
- * @ordered
- */
- int METHOD_PROXY__EGENERIC_TYPE = EcorePackage.EOPERATION__EGENERIC_TYPE;
-
- /**
- * The feature id for the '<em><b>EContaining Class</b></em>' container reference.
- * <!-- begin-user-doc -->
- * <!-- end-user-doc -->
- * @generated
- * @ordered
- */
- int METHOD_PROXY__ECONTAINING_CLASS = EcorePackage.EOPERATION__ECONTAINING_CLASS;
-
- /**
- * The feature id for the '<em><b>EType Parameters</b></em>' containment reference list.
- * <!-- begin-user-doc -->
- * <!-- end-user-doc -->
- * @generated
- * @ordered
- */
- int METHOD_PROXY__ETYPE_PARAMETERS = EcorePackage.EOPERATION__ETYPE_PARAMETERS;
-
- /**
- * The feature id for the '<em><b>EParameters</b></em>' containment reference list.
- * <!-- begin-user-doc -->
- * <!-- end-user-doc -->
- * @generated
- * @ordered
- */
- int METHOD_PROXY__EPARAMETERS = EcorePackage.EOPERATION__EPARAMETERS;
-
- /**
- * The feature id for the '<em><b>EExceptions</b></em>' reference list.
- * <!-- begin-user-doc -->
- * <!-- end-user-doc -->
- * @generated
- * @ordered
- */
- int METHOD_PROXY__EEXCEPTIONS = EcorePackage.EOPERATION__EEXCEPTIONS;
-
- /**
- * The feature id for the '<em><b>EGeneric Exceptions</b></em>' containment reference list.
- * <!-- begin-user-doc -->
- * <!-- end-user-doc -->
- * @generated
- * @ordered
- */
- int METHOD_PROXY__EGENERIC_EXCEPTIONS = EcorePackage.EOPERATION__EGENERIC_EXCEPTIONS;
-
- /**
- * The feature id for the '<em><b>Method</b></em>' reference.
- * <!-- begin-user-doc -->
- * <!-- end-user-doc -->
- * @generated
- * @ordered
- */
- int METHOD_PROXY__METHOD = EcorePackage.EOPERATION_FEATURE_COUNT + 0;
- /**
- * The number of structural features of the '<em>Method Proxy</em>' class.
- * <!-- begin-user-doc -->
- * <!-- end-user-doc -->
- * @generated
- * @ordered
- */
- int METHOD_PROXY_FEATURE_COUNT = EcorePackage.EOPERATION_FEATURE_COUNT + 1;
-
- /**
- * The feature id for the '<em><b>EAnnotations</b></em>' containment reference list.
- * <!-- begin-user-doc -->
- * <!-- end-user-doc -->
- * @generated
- * @ordered
- */
- int BEAN_EVENT__EANNOTATIONS = JavaRefPackage.JAVA_EVENT__EANNOTATIONS;
-
- /**
- * The feature id for the '<em><b>Name</b></em>' attribute.
- * <!-- begin-user-doc -->
- * <!-- end-user-doc -->
- * @generated
- * @ordered
- */
- int BEAN_EVENT__NAME = JavaRefPackage.JAVA_EVENT__NAME;
- /**
- * The feature id for the '<em><b>Ordered</b></em>' attribute.
- * <!-- begin-user-doc -->
- * <!-- end-user-doc -->
- * @generated
- * @ordered
- */
- int BEAN_EVENT__ORDERED = JavaRefPackage.JAVA_EVENT__ORDERED;
-
- /**
- * The feature id for the '<em><b>Unique</b></em>' attribute.
- * <!-- begin-user-doc -->
- * <!-- end-user-doc -->
- * @generated
- * @ordered
- */
- int BEAN_EVENT__UNIQUE = JavaRefPackage.JAVA_EVENT__UNIQUE;
-
- /**
- * The feature id for the '<em><b>Lower Bound</b></em>' attribute.
- * <!-- begin-user-doc -->
- * <!-- end-user-doc -->
- * @generated
- * @ordered
- */
- int BEAN_EVENT__LOWER_BOUND = JavaRefPackage.JAVA_EVENT__LOWER_BOUND;
-
- /**
- * The feature id for the '<em><b>Upper Bound</b></em>' attribute.
- * <!-- begin-user-doc -->
- * <!-- end-user-doc -->
- * @generated
- * @ordered
- */
- int BEAN_EVENT__UPPER_BOUND = JavaRefPackage.JAVA_EVENT__UPPER_BOUND;
-
- /**
- * The feature id for the '<em><b>Many</b></em>' attribute.
- * <!-- begin-user-doc -->
- * <!-- end-user-doc -->
- * @generated
- * @ordered
- */
- int BEAN_EVENT__MANY = JavaRefPackage.JAVA_EVENT__MANY;
-
- /**
- * The feature id for the '<em><b>Required</b></em>' attribute.
- * <!-- begin-user-doc -->
- * <!-- end-user-doc -->
- * @generated
- * @ordered
- */
- int BEAN_EVENT__REQUIRED = JavaRefPackage.JAVA_EVENT__REQUIRED;
-
- /**
- * The feature id for the '<em><b>EType</b></em>' reference.
- * <!-- begin-user-doc -->
- * <!-- end-user-doc -->
- * @generated
- * @ordered
- */
- int BEAN_EVENT__ETYPE = JavaRefPackage.JAVA_EVENT__ETYPE;
-
- /**
- * The feature id for the '<em><b>EGeneric Type</b></em>' containment reference.
- * <!-- begin-user-doc -->
- * <!-- end-user-doc -->
- * @generated
- * @ordered
- */
- int BEAN_EVENT__EGENERIC_TYPE = JavaRefPackage.JAVA_EVENT__EGENERIC_TYPE;
-
- /**
- * The feature id for the '<em><b>Changeable</b></em>' attribute.
- * <!-- begin-user-doc -->
- * <!-- end-user-doc -->
- * @generated
- * @ordered
- */
- int BEAN_EVENT__CHANGEABLE = JavaRefPackage.JAVA_EVENT__CHANGEABLE;
-
- /**
- * The feature id for the '<em><b>Volatile</b></em>' attribute.
- * <!-- begin-user-doc -->
- * <!-- end-user-doc -->
- * @generated
- * @ordered
- */
- int BEAN_EVENT__VOLATILE = JavaRefPackage.JAVA_EVENT__VOLATILE;
-
- /**
- * The feature id for the '<em><b>Transient</b></em>' attribute.
- * <!-- begin-user-doc -->
- * <!-- end-user-doc -->
- * @generated
- * @ordered
- */
- int BEAN_EVENT__TRANSIENT = JavaRefPackage.JAVA_EVENT__TRANSIENT;
-
- /**
- * The feature id for the '<em><b>Default Value Literal</b></em>' attribute.
- * <!-- begin-user-doc -->
- * <!-- end-user-doc -->
- * @generated
- * @ordered
- */
- int BEAN_EVENT__DEFAULT_VALUE_LITERAL = JavaRefPackage.JAVA_EVENT__DEFAULT_VALUE_LITERAL;
-
- /**
- * The feature id for the '<em><b>Default Value</b></em>' attribute.
- * <!-- begin-user-doc -->
- * <!-- end-user-doc -->
- * @generated
- * @ordered
- */
- int BEAN_EVENT__DEFAULT_VALUE = JavaRefPackage.JAVA_EVENT__DEFAULT_VALUE;
-
- /**
- * The feature id for the '<em><b>Unsettable</b></em>' attribute.
- * <!-- begin-user-doc -->
- * <!-- end-user-doc -->
- * @generated
- * @ordered
- */
- int BEAN_EVENT__UNSETTABLE = JavaRefPackage.JAVA_EVENT__UNSETTABLE;
-
- /**
- * The feature id for the '<em><b>Derived</b></em>' attribute.
- * <!-- begin-user-doc -->
- * <!-- end-user-doc -->
- * @generated
- * @ordered
- */
- int BEAN_EVENT__DERIVED = JavaRefPackage.JAVA_EVENT__DERIVED;
-
- /**
- * The feature id for the '<em><b>EContaining Class</b></em>' container reference.
- * <!-- begin-user-doc -->
- * <!-- end-user-doc -->
- * @generated
- * @ordered
- */
- int BEAN_EVENT__ECONTAINING_CLASS = JavaRefPackage.JAVA_EVENT__ECONTAINING_CLASS;
-
- /**
- * The number of structural features of the '<em>Bean Event</em>' class.
- * <!-- begin-user-doc -->
- * <!-- end-user-doc -->
- * @generated
- * @ordered
- */
- int BEAN_EVENT_FEATURE_COUNT = JavaRefPackage.JAVA_EVENT_FEATURE_COUNT + 0;
-
-
- /**
- * The meta object id for the '{@link org.eclipse.jem.internal.beaninfo.impl.FeatureAttributeMapEntryImpl <em>Feature Attribute Map Entry</em>}' class.
- * <!-- begin-user-doc -->
- * <!-- end-user-doc -->
- * @see org.eclipse.jem.internal.beaninfo.impl.FeatureAttributeMapEntryImpl
- * @see org.eclipse.jem.internal.beaninfo.impl.BeaninfoPackageImpl#getFeatureAttributeMapEntry()
- * @generated
- */
- int FEATURE_ATTRIBUTE_MAP_ENTRY = 9;
-
- /**
- * The feature id for the '<em><b>Key</b></em>' attribute.
- * <!-- begin-user-doc -->
- * <!-- end-user-doc -->
- * @generated
- * @ordered
- */
- int FEATURE_ATTRIBUTE_MAP_ENTRY__KEY = 0;
-
- /**
- * The feature id for the '<em><b>Value</b></em>' attribute.
- * <!-- begin-user-doc -->
- * <!-- end-user-doc -->
- * @generated
- * @ordered
- */
- int FEATURE_ATTRIBUTE_MAP_ENTRY__VALUE = 1;
-
- /**
- * The number of structural features of the '<em>Feature Attribute Map Entry</em>' class.
- * <!-- begin-user-doc -->
- * <!-- end-user-doc -->
- * @generated
- * @ordered
- */
- int FEATURE_ATTRIBUTE_MAP_ENTRY_FEATURE_COUNT = 2;
-
-
- /**
- * The meta object id for the '{@link org.eclipse.jem.internal.beaninfo.ImplicitItem <em>Implicit Item</em>}' enum.
- * <!-- begin-user-doc -->
- * <!-- end-user-doc -->
- * @see org.eclipse.jem.internal.beaninfo.ImplicitItem
- * @see org.eclipse.jem.internal.beaninfo.impl.BeaninfoPackageImpl#getImplicitItem()
- * @generated
- */
- int IMPLICIT_ITEM = 10;
-
- /**
- * Returns the meta object for class '{@link org.eclipse.jem.internal.beaninfo.FeatureDecorator <em>Feature Decorator</em>}'.
- * <!-- begin-user-doc -->
- * <!-- end-user-doc -->
- * @return the meta object for class '<em>Feature Decorator</em>'.
- * @see org.eclipse.jem.internal.beaninfo.FeatureDecorator
- * @generated
- */
- EClass getFeatureDecorator();
-
- /**
- * Returns the meta object for the attribute '{@link org.eclipse.jem.internal.beaninfo.FeatureDecorator#getDisplayName <em>Display Name</em>}'.
- * <!-- begin-user-doc -->
- * <!-- end-user-doc -->
- * @return the meta object for the attribute '<em>Display Name</em>'.
- * @see org.eclipse.jem.internal.beaninfo.FeatureDecorator#getDisplayName()
- * @see #getFeatureDecorator()
- * @generated
- */
- EAttribute getFeatureDecorator_DisplayName();
-
- /**
- * Returns the meta object for the attribute '{@link org.eclipse.jem.internal.beaninfo.FeatureDecorator#getShortDescription <em>Short Description</em>}'.
- * <!-- begin-user-doc -->
- * <!-- end-user-doc -->
- * @return the meta object for the attribute '<em>Short Description</em>'.
- * @see org.eclipse.jem.internal.beaninfo.FeatureDecorator#getShortDescription()
- * @see #getFeatureDecorator()
- * @generated
- */
- EAttribute getFeatureDecorator_ShortDescription();
-
- /**
- * Returns the meta object for the attribute '{@link org.eclipse.jem.internal.beaninfo.FeatureDecorator#getCategory <em>Category</em>}'.
- * <!-- begin-user-doc -->
- * <!-- end-user-doc -->
- * @return the meta object for the attribute '<em>Category</em>'.
- * @see org.eclipse.jem.internal.beaninfo.FeatureDecorator#getCategory()
- * @see #getFeatureDecorator()
- * @generated
- */
- EAttribute getFeatureDecorator_Category();
-
- /**
- * Returns the meta object for the attribute '{@link org.eclipse.jem.internal.beaninfo.FeatureDecorator#isExpert <em>Expert</em>}'.
- * <!-- begin-user-doc -->
- * <!-- end-user-doc -->
- * @return the meta object for the attribute '<em>Expert</em>'.
- * @see org.eclipse.jem.internal.beaninfo.FeatureDecorator#isExpert()
- * @see #getFeatureDecorator()
- * @generated
- */
- EAttribute getFeatureDecorator_Expert();
-
- /**
- * Returns the meta object for the attribute '{@link org.eclipse.jem.internal.beaninfo.FeatureDecorator#isHidden <em>Hidden</em>}'.
- * <!-- begin-user-doc -->
- * <!-- end-user-doc -->
- * @return the meta object for the attribute '<em>Hidden</em>'.
- * @see org.eclipse.jem.internal.beaninfo.FeatureDecorator#isHidden()
- * @see #getFeatureDecorator()
- * @generated
- */
- EAttribute getFeatureDecorator_Hidden();
-
- /**
- * Returns the meta object for the attribute '{@link org.eclipse.jem.internal.beaninfo.FeatureDecorator#isPreferred <em>Preferred</em>}'.
- * <!-- begin-user-doc -->
- * <!-- end-user-doc -->
- * @return the meta object for the attribute '<em>Preferred</em>'.
- * @see org.eclipse.jem.internal.beaninfo.FeatureDecorator#isPreferred()
- * @see #getFeatureDecorator()
- * @generated
- */
- EAttribute getFeatureDecorator_Preferred();
-
- /**
- * Returns the meta object for the attribute '{@link org.eclipse.jem.internal.beaninfo.FeatureDecorator#isMergeIntrospection <em>Merge Introspection</em>}'.
- * <!-- begin-user-doc -->
- * <!-- end-user-doc -->
- * @return the meta object for the attribute '<em>Merge Introspection</em>'.
- * @see org.eclipse.jem.internal.beaninfo.FeatureDecorator#isMergeIntrospection()
- * @see #getFeatureDecorator()
- * @generated
- */
- EAttribute getFeatureDecorator_MergeIntrospection();
-
- /**
- * Returns the meta object for the attribute '{@link org.eclipse.jem.internal.beaninfo.FeatureDecorator#isAttributesExplicitEmpty <em>Attributes Explicit Empty</em>}'.
- * <!-- begin-user-doc -->
- * <!-- end-user-doc -->
- * @return the meta object for the attribute '<em>Attributes Explicit Empty</em>'.
- * @see org.eclipse.jem.internal.beaninfo.FeatureDecorator#isAttributesExplicitEmpty()
- * @see #getFeatureDecorator()
- * @generated
- */
- EAttribute getFeatureDecorator_AttributesExplicitEmpty();
-
- /**
- * Returns the meta object for the attribute '{@link org.eclipse.jem.internal.beaninfo.FeatureDecorator#getImplicitlySetBits <em>Implicitly Set Bits</em>}'.
- * <!-- begin-user-doc -->
- * <!-- end-user-doc -->
- * @return the meta object for the attribute '<em>Implicitly Set Bits</em>'.
- * @see org.eclipse.jem.internal.beaninfo.FeatureDecorator#getImplicitlySetBits()
- * @see #getFeatureDecorator()
- * @generated
- */
- EAttribute getFeatureDecorator_ImplicitlySetBits();
-
- /**
- * Returns the meta object for the attribute '{@link org.eclipse.jem.internal.beaninfo.FeatureDecorator#getImplicitDecoratorFlag <em>Implicit Decorator Flag</em>}'.
- * <!-- begin-user-doc -->
- * <!-- end-user-doc -->
- * @return the meta object for the attribute '<em>Implicit Decorator Flag</em>'.
- * @see org.eclipse.jem.internal.beaninfo.FeatureDecorator#getImplicitDecoratorFlag()
- * @see #getFeatureDecorator()
- * @generated
- */
- EAttribute getFeatureDecorator_ImplicitDecoratorFlag();
-
- /**
- * Returns the meta object for the map '{@link org.eclipse.jem.internal.beaninfo.FeatureDecorator#getAttributes <em>Attributes</em>}'.
- * <!-- begin-user-doc -->
- * <!-- end-user-doc -->
- * @return the meta object for the map '<em>Attributes</em>'.
- * @see org.eclipse.jem.internal.beaninfo.FeatureDecorator#getAttributes()
- * @see #getFeatureDecorator()
- * @generated
- */
- EReference getFeatureDecorator_Attributes();
-
- /**
- * Returns the meta object for class '{@link org.eclipse.jem.internal.beaninfo.EventSetDecorator <em>Event Set Decorator</em>}'.
- * <!-- begin-user-doc -->
- * <!-- end-user-doc -->
- * @return the meta object for class '<em>Event Set Decorator</em>'.
- * @see org.eclipse.jem.internal.beaninfo.EventSetDecorator
- * @generated
- */
- EClass getEventSetDecorator();
-
- /**
- * Returns the meta object for the attribute '{@link org.eclipse.jem.internal.beaninfo.EventSetDecorator#isInDefaultEventSet <em>In Default Event Set</em>}'.
- * <!-- begin-user-doc -->
- * <!-- end-user-doc -->
- * @return the meta object for the attribute '<em>In Default Event Set</em>'.
- * @see org.eclipse.jem.internal.beaninfo.EventSetDecorator#isInDefaultEventSet()
- * @see #getEventSetDecorator()
- * @generated
- */
- EAttribute getEventSetDecorator_InDefaultEventSet();
-
- /**
- * Returns the meta object for the attribute '{@link org.eclipse.jem.internal.beaninfo.EventSetDecorator#isUnicast <em>Unicast</em>}'.
- * <!-- begin-user-doc -->
- * <!-- end-user-doc -->
- * @return the meta object for the attribute '<em>Unicast</em>'.
- * @see org.eclipse.jem.internal.beaninfo.EventSetDecorator#isUnicast()
- * @see #getEventSetDecorator()
- * @generated
- */
- EAttribute getEventSetDecorator_Unicast();
-
- /**
- * Returns the meta object for the attribute '{@link org.eclipse.jem.internal.beaninfo.EventSetDecorator#isListenerMethodsExplicitEmpty <em>Listener Methods Explicit Empty</em>}'.
- * <!-- begin-user-doc -->
- * <!-- end-user-doc -->
- * @return the meta object for the attribute '<em>Listener Methods Explicit Empty</em>'.
- * @see org.eclipse.jem.internal.beaninfo.EventSetDecorator#isListenerMethodsExplicitEmpty()
- * @see #getEventSetDecorator()
- * @generated
- */
- EAttribute getEventSetDecorator_ListenerMethodsExplicitEmpty();
-
- /**
- * Returns the meta object for the reference '{@link org.eclipse.jem.internal.beaninfo.EventSetDecorator#getAddListenerMethod <em>Add Listener Method</em>}'.
- * <!-- begin-user-doc -->
- * <!-- end-user-doc -->
- * @return the meta object for the reference '<em>Add Listener Method</em>'.
- * @see org.eclipse.jem.internal.beaninfo.EventSetDecorator#getAddListenerMethod()
- * @see #getEventSetDecorator()
- * @generated
- */
- EReference getEventSetDecorator_AddListenerMethod();
-
- /**
- * Returns the meta object for the reference list '{@link org.eclipse.jem.internal.beaninfo.EventSetDecorator#getListenerMethods <em>Listener Methods</em>}'.
- * <!-- begin-user-doc -->
- * <!-- end-user-doc -->
- * @return the meta object for the reference list '<em>Listener Methods</em>'.
- * @see org.eclipse.jem.internal.beaninfo.EventSetDecorator#getListenerMethods()
- * @see #getEventSetDecorator()
- * @generated
- */
- EReference getEventSetDecorator_ListenerMethods();
-
- /**
- * Returns the meta object for the reference '{@link org.eclipse.jem.internal.beaninfo.EventSetDecorator#getListenerType <em>Listener Type</em>}'.
- * <!-- begin-user-doc -->
- * <!-- end-user-doc -->
- * @return the meta object for the reference '<em>Listener Type</em>'.
- * @see org.eclipse.jem.internal.beaninfo.EventSetDecorator#getListenerType()
- * @see #getEventSetDecorator()
- * @generated
- */
- EReference getEventSetDecorator_ListenerType();
-
- /**
- * Returns the meta object for the reference '{@link org.eclipse.jem.internal.beaninfo.EventSetDecorator#getRemoveListenerMethod <em>Remove Listener Method</em>}'.
- * <!-- begin-user-doc -->
- * <!-- end-user-doc -->
- * @return the meta object for the reference '<em>Remove Listener Method</em>'.
- * @see org.eclipse.jem.internal.beaninfo.EventSetDecorator#getRemoveListenerMethod()
- * @see #getEventSetDecorator()
- * @generated
- */
- EReference getEventSetDecorator_RemoveListenerMethod();
-
- /**
- * Returns the meta object for the reference '{@link org.eclipse.jem.internal.beaninfo.EventSetDecorator#getEventAdapterClass <em>Event Adapter Class</em>}'.
- * <!-- begin-user-doc -->
- * <!-- end-user-doc -->
- * @return the meta object for the reference '<em>Event Adapter Class</em>'.
- * @see org.eclipse.jem.internal.beaninfo.EventSetDecorator#getEventAdapterClass()
- * @see #getEventSetDecorator()
- * @generated
- */
- EReference getEventSetDecorator_EventAdapterClass();
-
- /**
- * Returns the meta object for the containment reference list '{@link org.eclipse.jem.internal.beaninfo.EventSetDecorator#getSerListMthd <em>Ser List Mthd</em>}'.
- * <!-- begin-user-doc -->
- * <!-- end-user-doc -->
- * @return the meta object for the containment reference list '<em>Ser List Mthd</em>'.
- * @see org.eclipse.jem.internal.beaninfo.EventSetDecorator#getSerListMthd()
- * @see #getEventSetDecorator()
- * @generated
- */
- EReference getEventSetDecorator_SerListMthd();
-
- /**
- * Returns the meta object for class '{@link org.eclipse.jem.internal.beaninfo.MethodProxy <em>Method Proxy</em>}'.
- * <!-- begin-user-doc -->
- * <!-- end-user-doc -->
- * @return the meta object for class '<em>Method Proxy</em>'.
- * @see org.eclipse.jem.internal.beaninfo.MethodProxy
- * @generated
- */
- EClass getMethodProxy();
-
- /**
- * Returns the meta object for the reference '{@link org.eclipse.jem.internal.beaninfo.MethodProxy#getMethod <em>Method</em>}'.
- * <!-- begin-user-doc -->
- * <!-- end-user-doc -->
- * @return the meta object for the reference '<em>Method</em>'.
- * @see org.eclipse.jem.internal.beaninfo.MethodProxy#getMethod()
- * @see #getMethodProxy()
- * @generated
- */
- EReference getMethodProxy_Method();
-
- /**
- * Returns the meta object for class '{@link org.eclipse.jem.internal.beaninfo.PropertyDecorator <em>Property Decorator</em>}'.
- * <!-- begin-user-doc -->
- * <!-- end-user-doc -->
- * @return the meta object for class '<em>Property Decorator</em>'.
- * @see org.eclipse.jem.internal.beaninfo.PropertyDecorator
- * @generated
- */
- EClass getPropertyDecorator();
-
- /**
- * Returns the meta object for the attribute '{@link org.eclipse.jem.internal.beaninfo.PropertyDecorator#isBound <em>Bound</em>}'.
- * <!-- begin-user-doc -->
- * <!-- end-user-doc -->
- * @return the meta object for the attribute '<em>Bound</em>'.
- * @see org.eclipse.jem.internal.beaninfo.PropertyDecorator#isBound()
- * @see #getPropertyDecorator()
- * @generated
- */
- EAttribute getPropertyDecorator_Bound();
-
- /**
- * Returns the meta object for the attribute '{@link org.eclipse.jem.internal.beaninfo.PropertyDecorator#isConstrained <em>Constrained</em>}'.
- * <!-- begin-user-doc -->
- * <!-- end-user-doc -->
- * @return the meta object for the attribute '<em>Constrained</em>'.
- * @see org.eclipse.jem.internal.beaninfo.PropertyDecorator#isConstrained()
- * @see #getPropertyDecorator()
- * @generated
- */
- EAttribute getPropertyDecorator_Constrained();
-
- /**
- * Returns the meta object for the attribute '{@link org.eclipse.jem.internal.beaninfo.PropertyDecorator#isDesignTime <em>Design Time</em>}'.
- * <!-- begin-user-doc -->
- * <!-- end-user-doc -->
- * @return the meta object for the attribute '<em>Design Time</em>'.
- * @see org.eclipse.jem.internal.beaninfo.PropertyDecorator#isDesignTime()
- * @see #getPropertyDecorator()
- * @generated
- */
- EAttribute getPropertyDecorator_DesignTime();
-
- /**
- * Returns the meta object for the attribute '{@link org.eclipse.jem.internal.beaninfo.PropertyDecorator#isAlwaysIncompatible <em>Always Incompatible</em>}'.
- * <!-- begin-user-doc -->
- * <!-- end-user-doc -->
- * @return the meta object for the attribute '<em>Always Incompatible</em>'.
- * @see org.eclipse.jem.internal.beaninfo.PropertyDecorator#isAlwaysIncompatible()
- * @see #getPropertyDecorator()
- * @generated
- */
- EAttribute getPropertyDecorator_AlwaysIncompatible();
-
- /**
- * Returns the meta object for the attribute list '{@link org.eclipse.jem.internal.beaninfo.PropertyDecorator#getFilterFlags <em>Filter Flags</em>}'.
- * <!-- begin-user-doc -->
- * <!-- end-user-doc -->
- * @return the meta object for the attribute list '<em>Filter Flags</em>'.
- * @see org.eclipse.jem.internal.beaninfo.PropertyDecorator#getFilterFlags()
- * @see #getPropertyDecorator()
- * @generated
- */
- EAttribute getPropertyDecorator_FilterFlags();
-
- /**
- * Returns the meta object for the attribute '{@link org.eclipse.jem.internal.beaninfo.PropertyDecorator#isFieldReadOnly <em>Field Read Only</em>}'.
- * <!-- begin-user-doc -->
- * <!-- end-user-doc -->
- * @return the meta object for the attribute '<em>Field Read Only</em>'.
- * @see org.eclipse.jem.internal.beaninfo.PropertyDecorator#isFieldReadOnly()
- * @see #getPropertyDecorator()
- * @generated
- */
- EAttribute getPropertyDecorator_FieldReadOnly();
-
- /**
- * Returns the meta object for the reference '{@link org.eclipse.jem.internal.beaninfo.PropertyDecorator#getPropertyEditorClass <em>Property Editor Class</em>}'.
- * <!-- begin-user-doc -->
- * <!-- end-user-doc -->
- * @return the meta object for the reference '<em>Property Editor Class</em>'.
- * @see org.eclipse.jem.internal.beaninfo.PropertyDecorator#getPropertyEditorClass()
- * @see #getPropertyDecorator()
- * @generated
- */
- EReference getPropertyDecorator_PropertyEditorClass();
-
- /**
- * Returns the meta object for the reference '{@link org.eclipse.jem.internal.beaninfo.PropertyDecorator#getReadMethod <em>Read Method</em>}'.
- * <!-- begin-user-doc -->
- * <!-- end-user-doc -->
- * @return the meta object for the reference '<em>Read Method</em>'.
- * @see org.eclipse.jem.internal.beaninfo.PropertyDecorator#getReadMethod()
- * @see #getPropertyDecorator()
- * @generated
- */
- EReference getPropertyDecorator_ReadMethod();
-
- /**
- * Returns the meta object for the reference '{@link org.eclipse.jem.internal.beaninfo.PropertyDecorator#getWriteMethod <em>Write Method</em>}'.
- * <!-- begin-user-doc -->
- * <!-- end-user-doc -->
- * @return the meta object for the reference '<em>Write Method</em>'.
- * @see org.eclipse.jem.internal.beaninfo.PropertyDecorator#getWriteMethod()
- * @see #getPropertyDecorator()
- * @generated
- */
- EReference getPropertyDecorator_WriteMethod();
-
- /**
- * Returns the meta object for the reference '{@link org.eclipse.jem.internal.beaninfo.PropertyDecorator#getField <em>Field</em>}'.
- * <!-- begin-user-doc -->
- * <!-- end-user-doc -->
- * @return the meta object for the reference '<em>Field</em>'.
- * @see org.eclipse.jem.internal.beaninfo.PropertyDecorator#getField()
- * @see #getPropertyDecorator()
- * @generated
- */
- EReference getPropertyDecorator_Field();
-
- /**
- * Returns the meta object for class '{@link org.eclipse.jem.internal.beaninfo.IndexedPropertyDecorator <em>Indexed Property Decorator</em>}'.
- * <!-- begin-user-doc -->
- * <!-- end-user-doc -->
- * @return the meta object for class '<em>Indexed Property Decorator</em>'.
- * @see org.eclipse.jem.internal.beaninfo.IndexedPropertyDecorator
- * @generated
- */
- EClass getIndexedPropertyDecorator();
-
- /**
- * Returns the meta object for the reference '{@link org.eclipse.jem.internal.beaninfo.IndexedPropertyDecorator#getIndexedReadMethod <em>Indexed Read Method</em>}'.
- * <!-- begin-user-doc -->
- * <!-- end-user-doc -->
- * @return the meta object for the reference '<em>Indexed Read Method</em>'.
- * @see org.eclipse.jem.internal.beaninfo.IndexedPropertyDecorator#getIndexedReadMethod()
- * @see #getIndexedPropertyDecorator()
- * @generated
- */
- EReference getIndexedPropertyDecorator_IndexedReadMethod();
-
- /**
- * Returns the meta object for the reference '{@link org.eclipse.jem.internal.beaninfo.IndexedPropertyDecorator#getIndexedWriteMethod <em>Indexed Write Method</em>}'.
- * <!-- begin-user-doc -->
- * <!-- end-user-doc -->
- * @return the meta object for the reference '<em>Indexed Write Method</em>'.
- * @see org.eclipse.jem.internal.beaninfo.IndexedPropertyDecorator#getIndexedWriteMethod()
- * @see #getIndexedPropertyDecorator()
- * @generated
- */
- EReference getIndexedPropertyDecorator_IndexedWriteMethod();
-
- /**
- * Returns the meta object for class '{@link org.eclipse.jem.internal.beaninfo.BeanDecorator <em>Bean Decorator</em>}'.
- * <!-- begin-user-doc -->
- * <!-- end-user-doc -->
- * @return the meta object for class '<em>Bean Decorator</em>'.
- * @see org.eclipse.jem.internal.beaninfo.BeanDecorator
- * @generated
- */
- EClass getBeanDecorator();
-
- /**
- * Returns the meta object for the attribute '{@link org.eclipse.jem.internal.beaninfo.BeanDecorator#isMergeSuperProperties <em>Merge Super Properties</em>}'.
- * <!-- begin-user-doc -->
- * <!-- end-user-doc -->
- * @return the meta object for the attribute '<em>Merge Super Properties</em>'.
- * @see org.eclipse.jem.internal.beaninfo.BeanDecorator#isMergeSuperProperties()
- * @see #getBeanDecorator()
- * @generated
- */
- EAttribute getBeanDecorator_MergeSuperProperties();
-
- /**
- * Returns the meta object for the attribute '{@link org.eclipse.jem.internal.beaninfo.BeanDecorator#isMergeSuperMethods <em>Merge Super Methods</em>}'.
- * <!-- begin-user-doc -->
- * <!-- end-user-doc -->
- * @return the meta object for the attribute '<em>Merge Super Methods</em>'.
- * @see org.eclipse.jem.internal.beaninfo.BeanDecorator#isMergeSuperMethods()
- * @see #getBeanDecorator()
- * @generated
- */
- EAttribute getBeanDecorator_MergeSuperMethods();
-
- /**
- * Returns the meta object for the attribute '{@link org.eclipse.jem.internal.beaninfo.BeanDecorator#isMergeSuperEvents <em>Merge Super Events</em>}'.
- * <!-- begin-user-doc -->
- * <!-- end-user-doc -->
- * @return the meta object for the attribute '<em>Merge Super Events</em>'.
- * @see org.eclipse.jem.internal.beaninfo.BeanDecorator#isMergeSuperEvents()
- * @see #getBeanDecorator()
- * @generated
- */
- EAttribute getBeanDecorator_MergeSuperEvents();
-
- /**
- * Returns the meta object for the attribute '{@link org.eclipse.jem.internal.beaninfo.BeanDecorator#isIntrospectProperties <em>Introspect Properties</em>}'.
- * <!-- begin-user-doc -->
- * <!-- end-user-doc -->
- * @return the meta object for the attribute '<em>Introspect Properties</em>'.
- * @see org.eclipse.jem.internal.beaninfo.BeanDecorator#isIntrospectProperties()
- * @see #getBeanDecorator()
- * @generated
- */
- EAttribute getBeanDecorator_IntrospectProperties();
-
- /**
- * Returns the meta object for the attribute '{@link org.eclipse.jem.internal.beaninfo.BeanDecorator#isIntrospectMethods <em>Introspect Methods</em>}'.
- * <!-- begin-user-doc -->
- * <!-- end-user-doc -->
- * @return the meta object for the attribute '<em>Introspect Methods</em>'.
- * @see org.eclipse.jem.internal.beaninfo.BeanDecorator#isIntrospectMethods()
- * @see #getBeanDecorator()
- * @generated
- */
- EAttribute getBeanDecorator_IntrospectMethods();
-
- /**
- * Returns the meta object for the attribute '{@link org.eclipse.jem.internal.beaninfo.BeanDecorator#isIntrospectEvents <em>Introspect Events</em>}'.
- * <!-- begin-user-doc -->
- * <!-- end-user-doc -->
- * @return the meta object for the attribute '<em>Introspect Events</em>'.
- * @see org.eclipse.jem.internal.beaninfo.BeanDecorator#isIntrospectEvents()
- * @see #getBeanDecorator()
- * @generated
- */
- EAttribute getBeanDecorator_IntrospectEvents();
-
- /**
- * Returns the meta object for the reference '{@link org.eclipse.jem.internal.beaninfo.BeanDecorator#getCustomizerClass <em>Customizer Class</em>}'.
- * <!-- begin-user-doc -->
- * <!-- end-user-doc -->
- * @return the meta object for the reference '<em>Customizer Class</em>'.
- * @see org.eclipse.jem.internal.beaninfo.BeanDecorator#getCustomizerClass()
- * @see #getBeanDecorator()
- * @generated
- */
- EReference getBeanDecorator_CustomizerClass();
-
- /**
- * Returns the meta object for class '{@link org.eclipse.jem.internal.beaninfo.MethodDecorator <em>Method Decorator</em>}'.
- * <!-- begin-user-doc -->
- * <!-- end-user-doc -->
- * @return the meta object for class '<em>Method Decorator</em>'.
- * @see org.eclipse.jem.internal.beaninfo.MethodDecorator
- * @generated
- */
- EClass getMethodDecorator();
-
- /**
- * Returns the meta object for the attribute '{@link org.eclipse.jem.internal.beaninfo.MethodDecorator#isParmsExplicitEmpty <em>Parms Explicit Empty</em>}'.
- * <!-- begin-user-doc -->
- * <!-- end-user-doc -->
- * @return the meta object for the attribute '<em>Parms Explicit Empty</em>'.
- * @see org.eclipse.jem.internal.beaninfo.MethodDecorator#isParmsExplicitEmpty()
- * @see #getMethodDecorator()
- * @generated
- */
- EAttribute getMethodDecorator_ParmsExplicitEmpty();
-
- /**
- * Returns the meta object for the reference list '{@link org.eclipse.jem.internal.beaninfo.MethodDecorator#getParameterDescriptors <em>Parameter Descriptors</em>}'.
- * <!-- begin-user-doc -->
- * <!-- end-user-doc -->
- * @return the meta object for the reference list '<em>Parameter Descriptors</em>'.
- * @see org.eclipse.jem.internal.beaninfo.MethodDecorator#getParameterDescriptors()
- * @see #getMethodDecorator()
- * @generated
- */
- EReference getMethodDecorator_ParameterDescriptors();
-
- /**
- * Returns the meta object for the containment reference list '{@link org.eclipse.jem.internal.beaninfo.MethodDecorator#getSerParmDesc <em>Ser Parm Desc</em>}'.
- * <!-- begin-user-doc -->
- * <!-- end-user-doc -->
- * @return the meta object for the containment reference list '<em>Ser Parm Desc</em>'.
- * @see org.eclipse.jem.internal.beaninfo.MethodDecorator#getSerParmDesc()
- * @see #getMethodDecorator()
- * @generated
- */
- EReference getMethodDecorator_SerParmDesc();
-
- /**
- * Returns the meta object for class '{@link org.eclipse.jem.internal.beaninfo.ParameterDecorator <em>Parameter Decorator</em>}'.
- * <!-- begin-user-doc -->
- * <!-- end-user-doc -->
- * @return the meta object for class '<em>Parameter Decorator</em>'.
- * @see org.eclipse.jem.internal.beaninfo.ParameterDecorator
- * @generated
- */
- EClass getParameterDecorator();
-
- /**
- * Returns the meta object for the attribute '{@link org.eclipse.jem.internal.beaninfo.ParameterDecorator#getName <em>Name</em>}'.
- * <!-- begin-user-doc -->
- * <!-- end-user-doc -->
- * @return the meta object for the attribute '<em>Name</em>'.
- * @see org.eclipse.jem.internal.beaninfo.ParameterDecorator#getName()
- * @see #getParameterDecorator()
- * @generated
- */
- EAttribute getParameterDecorator_Name();
-
- /**
- * Returns the meta object for data type '{@link org.eclipse.jem.internal.beaninfo.common.FeatureAttributeValue <em>Feature Attribute Value</em>}'.
- * <!-- begin-user-doc -->
- * <!-- end-user-doc -->
- * @return the meta object for data type '<em>Feature Attribute Value</em>'.
- * @see org.eclipse.jem.internal.beaninfo.common.FeatureAttributeValue
- * @model instanceClass="org.eclipse.jem.internal.beaninfo.common.FeatureAttributeValue"
- * @generated
- */
- EDataType getFeatureAttributeValue();
-
- /**
- * Returns the factory that creates the instances of the model.
- * <!-- begin-user-doc -->
- * <!-- end-user-doc -->
- * @return the factory that creates the instances of the model.
- * @generated
- */
- BeaninfoFactory getBeaninfoFactory();
-
- /**
- * <!-- begin-user-doc -->
- * Defines literals for the meta objects that represent
- * <ul>
- * <li>each class,</li>
- * <li>each feature of each class,</li>
- * <li>each enum,</li>
- * <li>and each data type</li>
- * </ul>
- * <!-- end-user-doc -->
- * @generated
- */
- interface Literals {
- /**
- * The meta object literal for the '{@link org.eclipse.jem.internal.beaninfo.impl.FeatureDecoratorImpl <em>Feature Decorator</em>}' class.
- * <!-- begin-user-doc -->
- * <!-- end-user-doc -->
- * @see org.eclipse.jem.internal.beaninfo.impl.FeatureDecoratorImpl
- * @see org.eclipse.jem.internal.beaninfo.impl.BeaninfoPackageImpl#getFeatureDecorator()
- * @generated
- */
- EClass FEATURE_DECORATOR = eINSTANCE.getFeatureDecorator();
-
- /**
- * The meta object literal for the '<em><b>Display Name</b></em>' attribute feature.
- * <!-- begin-user-doc -->
- * <!-- end-user-doc -->
- * @generated
- */
- EAttribute FEATURE_DECORATOR__DISPLAY_NAME = eINSTANCE.getFeatureDecorator_DisplayName();
-
- /**
- * The meta object literal for the '<em><b>Short Description</b></em>' attribute feature.
- * <!-- begin-user-doc -->
- * <!-- end-user-doc -->
- * @generated
- */
- EAttribute FEATURE_DECORATOR__SHORT_DESCRIPTION = eINSTANCE.getFeatureDecorator_ShortDescription();
-
- /**
- * The meta object literal for the '<em><b>Category</b></em>' attribute feature.
- * <!-- begin-user-doc -->
- * <!-- end-user-doc -->
- * @generated
- */
- EAttribute FEATURE_DECORATOR__CATEGORY = eINSTANCE.getFeatureDecorator_Category();
-
- /**
- * The meta object literal for the '<em><b>Expert</b></em>' attribute feature.
- * <!-- begin-user-doc -->
- * <!-- end-user-doc -->
- * @generated
- */
- EAttribute FEATURE_DECORATOR__EXPERT = eINSTANCE.getFeatureDecorator_Expert();
-
- /**
- * The meta object literal for the '<em><b>Hidden</b></em>' attribute feature.
- * <!-- begin-user-doc -->
- * <!-- end-user-doc -->
- * @generated
- */
- EAttribute FEATURE_DECORATOR__HIDDEN = eINSTANCE.getFeatureDecorator_Hidden();
-
- /**
- * The meta object literal for the '<em><b>Preferred</b></em>' attribute feature.
- * <!-- begin-user-doc -->
- * <!-- end-user-doc -->
- * @generated
- */
- EAttribute FEATURE_DECORATOR__PREFERRED = eINSTANCE.getFeatureDecorator_Preferred();
-
- /**
- * The meta object literal for the '<em><b>Merge Introspection</b></em>' attribute feature.
- * <!-- begin-user-doc -->
- * <!-- end-user-doc -->
- * @generated
- */
- EAttribute FEATURE_DECORATOR__MERGE_INTROSPECTION = eINSTANCE.getFeatureDecorator_MergeIntrospection();
-
- /**
- * The meta object literal for the '<em><b>Attributes Explicit Empty</b></em>' attribute feature.
- * <!-- begin-user-doc -->
- * <!-- end-user-doc -->
- * @generated
- */
- EAttribute FEATURE_DECORATOR__ATTRIBUTES_EXPLICIT_EMPTY = eINSTANCE.getFeatureDecorator_AttributesExplicitEmpty();
-
- /**
- * The meta object literal for the '<em><b>Implicitly Set Bits</b></em>' attribute feature.
- * <!-- begin-user-doc -->
- * <!-- end-user-doc -->
- * @generated
- */
- EAttribute FEATURE_DECORATOR__IMPLICITLY_SET_BITS = eINSTANCE.getFeatureDecorator_ImplicitlySetBits();
-
- /**
- * The meta object literal for the '<em><b>Implicit Decorator Flag</b></em>' attribute feature.
- * <!-- begin-user-doc -->
- * <!-- end-user-doc -->
- * @generated
- */
- EAttribute FEATURE_DECORATOR__IMPLICIT_DECORATOR_FLAG = eINSTANCE.getFeatureDecorator_ImplicitDecoratorFlag();
-
- /**
- * The meta object literal for the '<em><b>Attributes</b></em>' map feature.
- * <!-- begin-user-doc -->
- * <!-- end-user-doc -->
- * @generated
- */
- EReference FEATURE_DECORATOR__ATTRIBUTES = eINSTANCE.getFeatureDecorator_Attributes();
-
- /**
- * The meta object literal for the '{@link org.eclipse.jem.internal.beaninfo.impl.BeanDecoratorImpl <em>Bean Decorator</em>}' class.
- * <!-- begin-user-doc -->
- * <!-- end-user-doc -->
- * @see org.eclipse.jem.internal.beaninfo.impl.BeanDecoratorImpl
- * @see org.eclipse.jem.internal.beaninfo.impl.BeaninfoPackageImpl#getBeanDecorator()
- * @generated
- */
- EClass BEAN_DECORATOR = eINSTANCE.getBeanDecorator();
-
- /**
- * The meta object literal for the '<em><b>Merge Super Properties</b></em>' attribute feature.
- * <!-- begin-user-doc -->
- * <!-- end-user-doc -->
- * @generated
- */
- EAttribute BEAN_DECORATOR__MERGE_SUPER_PROPERTIES = eINSTANCE.getBeanDecorator_MergeSuperProperties();
-
- /**
- * The meta object literal for the '<em><b>Merge Super Methods</b></em>' attribute feature.
- * <!-- begin-user-doc -->
- * <!-- end-user-doc -->
- * @generated
- */
- EAttribute BEAN_DECORATOR__MERGE_SUPER_METHODS = eINSTANCE.getBeanDecorator_MergeSuperMethods();
-
- /**
- * The meta object literal for the '<em><b>Merge Super Events</b></em>' attribute feature.
- * <!-- begin-user-doc -->
- * <!-- end-user-doc -->
- * @generated
- */
- EAttribute BEAN_DECORATOR__MERGE_SUPER_EVENTS = eINSTANCE.getBeanDecorator_MergeSuperEvents();
-
- /**
- * The meta object literal for the '<em><b>Introspect Properties</b></em>' attribute feature.
- * <!-- begin-user-doc -->
- * <!-- end-user-doc -->
- * @generated
- */
- EAttribute BEAN_DECORATOR__INTROSPECT_PROPERTIES = eINSTANCE.getBeanDecorator_IntrospectProperties();
-
- /**
- * The meta object literal for the '<em><b>Introspect Methods</b></em>' attribute feature.
- * <!-- begin-user-doc -->
- * <!-- end-user-doc -->
- * @generated
- */
- EAttribute BEAN_DECORATOR__INTROSPECT_METHODS = eINSTANCE.getBeanDecorator_IntrospectMethods();
-
- /**
- * The meta object literal for the '<em><b>Introspect Events</b></em>' attribute feature.
- * <!-- begin-user-doc -->
- * <!-- end-user-doc -->
- * @generated
- */
- EAttribute BEAN_DECORATOR__INTROSPECT_EVENTS = eINSTANCE.getBeanDecorator_IntrospectEvents();
-
- /**
- * The meta object literal for the '<em><b>Do Beaninfo</b></em>' attribute feature.
- * <!-- begin-user-doc -->
- * <!-- end-user-doc -->
- * @generated
- */
- EAttribute BEAN_DECORATOR__DO_BEANINFO = eINSTANCE.getBeanDecorator_DoBeaninfo();
-
- /**
- * The meta object literal for the '<em><b>Not Inherited Property Names</b></em>' attribute list feature.
- * <!-- begin-user-doc -->
- * <!-- end-user-doc -->
- * @generated
- */
- EAttribute BEAN_DECORATOR__NOT_INHERITED_PROPERTY_NAMES = eINSTANCE.getBeanDecorator_NotInheritedPropertyNames();
-
- /**
- * The meta object literal for the '<em><b>Not Inherited Method Names</b></em>' attribute list feature.
- * <!-- begin-user-doc -->
- * <!-- end-user-doc -->
- * @generated
- */
- EAttribute BEAN_DECORATOR__NOT_INHERITED_METHOD_NAMES = eINSTANCE.getBeanDecorator_NotInheritedMethodNames();
-
- /**
- * The meta object literal for the '<em><b>Not Inherited Event Names</b></em>' attribute list feature.
- * <!-- begin-user-doc -->
- * <!-- end-user-doc -->
- * @generated
- */
- EAttribute BEAN_DECORATOR__NOT_INHERITED_EVENT_NAMES = eINSTANCE.getBeanDecorator_NotInheritedEventNames();
-
- /**
- * The meta object literal for the '<em><b>Customizer Class</b></em>' reference feature.
- * <!-- begin-user-doc -->
- * <!-- end-user-doc -->
- * @generated
- */
- EReference BEAN_DECORATOR__CUSTOMIZER_CLASS = eINSTANCE.getBeanDecorator_CustomizerClass();
-
- /**
- * The meta object literal for the '{@link org.eclipse.jem.internal.beaninfo.impl.EventSetDecoratorImpl <em>Event Set Decorator</em>}' class.
- * <!-- begin-user-doc -->
- * <!-- end-user-doc -->
- * @see org.eclipse.jem.internal.beaninfo.impl.EventSetDecoratorImpl
- * @see org.eclipse.jem.internal.beaninfo.impl.BeaninfoPackageImpl#getEventSetDecorator()
- * @generated
- */
- EClass EVENT_SET_DECORATOR = eINSTANCE.getEventSetDecorator();
-
- /**
- * The meta object literal for the '<em><b>In Default Event Set</b></em>' attribute feature.
- * <!-- begin-user-doc -->
- * <!-- end-user-doc -->
- * @generated
- */
- EAttribute EVENT_SET_DECORATOR__IN_DEFAULT_EVENT_SET = eINSTANCE.getEventSetDecorator_InDefaultEventSet();
-
- /**
- * The meta object literal for the '<em><b>Unicast</b></em>' attribute feature.
- * <!-- begin-user-doc -->
- * <!-- end-user-doc -->
- * @generated
- */
- EAttribute EVENT_SET_DECORATOR__UNICAST = eINSTANCE.getEventSetDecorator_Unicast();
-
- /**
- * The meta object literal for the '<em><b>Listener Methods Explicit Empty</b></em>' attribute feature.
- * <!-- begin-user-doc -->
- * <!-- end-user-doc -->
- * @generated
- */
- EAttribute EVENT_SET_DECORATOR__LISTENER_METHODS_EXPLICIT_EMPTY = eINSTANCE.getEventSetDecorator_ListenerMethodsExplicitEmpty();
-
- /**
- * The meta object literal for the '<em><b>Add Listener Method</b></em>' reference feature.
- * <!-- begin-user-doc -->
- * <!-- end-user-doc -->
- * @generated
- */
- EReference EVENT_SET_DECORATOR__ADD_LISTENER_METHOD = eINSTANCE.getEventSetDecorator_AddListenerMethod();
-
- /**
- * The meta object literal for the '<em><b>Listener Methods</b></em>' reference list feature.
- * <!-- begin-user-doc -->
- * <!-- end-user-doc -->
- * @generated
- */
- EReference EVENT_SET_DECORATOR__LISTENER_METHODS = eINSTANCE.getEventSetDecorator_ListenerMethods();
-
- /**
- * The meta object literal for the '<em><b>Listener Type</b></em>' reference feature.
- * <!-- begin-user-doc -->
- * <!-- end-user-doc -->
- * @generated
- */
- EReference EVENT_SET_DECORATOR__LISTENER_TYPE = eINSTANCE.getEventSetDecorator_ListenerType();
-
- /**
- * The meta object literal for the '<em><b>Remove Listener Method</b></em>' reference feature.
- * <!-- begin-user-doc -->
- * <!-- end-user-doc -->
- * @generated
- */
- EReference EVENT_SET_DECORATOR__REMOVE_LISTENER_METHOD = eINSTANCE.getEventSetDecorator_RemoveListenerMethod();
-
- /**
- * The meta object literal for the '<em><b>Event Adapter Class</b></em>' reference feature.
- * <!-- begin-user-doc -->
- * <!-- end-user-doc -->
- * @generated
- */
- EReference EVENT_SET_DECORATOR__EVENT_ADAPTER_CLASS = eINSTANCE.getEventSetDecorator_EventAdapterClass();
-
- /**
- * The meta object literal for the '<em><b>Ser List Mthd</b></em>' containment reference list feature.
- * <!-- begin-user-doc -->
- * <!-- end-user-doc -->
- * @generated
- */
- EReference EVENT_SET_DECORATOR__SER_LIST_MTHD = eINSTANCE.getEventSetDecorator_SerListMthd();
-
- /**
- * The meta object literal for the '{@link org.eclipse.jem.internal.beaninfo.impl.MethodDecoratorImpl <em>Method Decorator</em>}' class.
- * <!-- begin-user-doc -->
- * <!-- end-user-doc -->
- * @see org.eclipse.jem.internal.beaninfo.impl.MethodDecoratorImpl
- * @see org.eclipse.jem.internal.beaninfo.impl.BeaninfoPackageImpl#getMethodDecorator()
- * @generated
- */
- EClass METHOD_DECORATOR = eINSTANCE.getMethodDecorator();
-
- /**
- * The meta object literal for the '<em><b>Parms Explicit Empty</b></em>' attribute feature.
- * <!-- begin-user-doc -->
- * <!-- end-user-doc -->
- * @generated
- */
- EAttribute METHOD_DECORATOR__PARMS_EXPLICIT_EMPTY = eINSTANCE.getMethodDecorator_ParmsExplicitEmpty();
-
- /**
- * The meta object literal for the '<em><b>Parameter Descriptors</b></em>' reference list feature.
- * <!-- begin-user-doc -->
- * <!-- end-user-doc -->
- * @generated
- */
- EReference METHOD_DECORATOR__PARAMETER_DESCRIPTORS = eINSTANCE.getMethodDecorator_ParameterDescriptors();
-
- /**
- * The meta object literal for the '<em><b>Ser Parm Desc</b></em>' containment reference list feature.
- * <!-- begin-user-doc -->
- * <!-- end-user-doc -->
- * @generated
- */
- EReference METHOD_DECORATOR__SER_PARM_DESC = eINSTANCE.getMethodDecorator_SerParmDesc();
-
- /**
- * The meta object literal for the '{@link org.eclipse.jem.internal.beaninfo.impl.ParameterDecoratorImpl <em>Parameter Decorator</em>}' class.
- * <!-- begin-user-doc -->
- * <!-- end-user-doc -->
- * @see org.eclipse.jem.internal.beaninfo.impl.ParameterDecoratorImpl
- * @see org.eclipse.jem.internal.beaninfo.impl.BeaninfoPackageImpl#getParameterDecorator()
- * @generated
- */
- EClass PARAMETER_DECORATOR = eINSTANCE.getParameterDecorator();
-
- /**
- * The meta object literal for the '<em><b>Name</b></em>' attribute feature.
- * <!-- begin-user-doc -->
- * <!-- end-user-doc -->
- * @generated
- */
- EAttribute PARAMETER_DECORATOR__NAME = eINSTANCE.getParameterDecorator_Name();
-
- /**
- * The meta object literal for the '<em><b>Parameter</b></em>' reference feature.
- * <!-- begin-user-doc -->
- * <!-- end-user-doc -->
- * @generated
- */
- EReference PARAMETER_DECORATOR__PARAMETER = eINSTANCE.getParameterDecorator_Parameter();
-
- /**
- * The meta object literal for the '{@link org.eclipse.jem.internal.beaninfo.impl.PropertyDecoratorImpl <em>Property Decorator</em>}' class.
- * <!-- begin-user-doc -->
- * <!-- end-user-doc -->
- * @see org.eclipse.jem.internal.beaninfo.impl.PropertyDecoratorImpl
- * @see org.eclipse.jem.internal.beaninfo.impl.BeaninfoPackageImpl#getPropertyDecorator()
- * @generated
- */
- EClass PROPERTY_DECORATOR = eINSTANCE.getPropertyDecorator();
-
- /**
- * The meta object literal for the '<em><b>Bound</b></em>' attribute feature.
- * <!-- begin-user-doc -->
- * <!-- end-user-doc -->
- * @generated
- */
- EAttribute PROPERTY_DECORATOR__BOUND = eINSTANCE.getPropertyDecorator_Bound();
-
- /**
- * The meta object literal for the '<em><b>Constrained</b></em>' attribute feature.
- * <!-- begin-user-doc -->
- * <!-- end-user-doc -->
- * @generated
- */
- EAttribute PROPERTY_DECORATOR__CONSTRAINED = eINSTANCE.getPropertyDecorator_Constrained();
-
- /**
- * The meta object literal for the '<em><b>Design Time</b></em>' attribute feature.
- * <!-- begin-user-doc -->
- * <!-- end-user-doc -->
- * @generated
- */
- EAttribute PROPERTY_DECORATOR__DESIGN_TIME = eINSTANCE.getPropertyDecorator_DesignTime();
-
- /**
- * The meta object literal for the '<em><b>Always Incompatible</b></em>' attribute feature.
- * <!-- begin-user-doc -->
- * <!-- end-user-doc -->
- * @generated
- */
- EAttribute PROPERTY_DECORATOR__ALWAYS_INCOMPATIBLE = eINSTANCE.getPropertyDecorator_AlwaysIncompatible();
-
- /**
- * The meta object literal for the '<em><b>Filter Flags</b></em>' attribute list feature.
- * <!-- begin-user-doc -->
- * <!-- end-user-doc -->
- * @generated
- */
- EAttribute PROPERTY_DECORATOR__FILTER_FLAGS = eINSTANCE.getPropertyDecorator_FilterFlags();
-
- /**
- * The meta object literal for the '<em><b>Field Read Only</b></em>' attribute feature.
- * <!-- begin-user-doc -->
- * <!-- end-user-doc -->
- * @generated
- */
- EAttribute PROPERTY_DECORATOR__FIELD_READ_ONLY = eINSTANCE.getPropertyDecorator_FieldReadOnly();
-
- /**
- * The meta object literal for the '<em><b>Property Editor Class</b></em>' reference feature.
- * <!-- begin-user-doc -->
- * <!-- end-user-doc -->
- * @generated
- */
- EReference PROPERTY_DECORATOR__PROPERTY_EDITOR_CLASS = eINSTANCE.getPropertyDecorator_PropertyEditorClass();
-
- /**
- * The meta object literal for the '<em><b>Read Method</b></em>' reference feature.
- * <!-- begin-user-doc -->
- * <!-- end-user-doc -->
- * @generated
- */
- EReference PROPERTY_DECORATOR__READ_METHOD = eINSTANCE.getPropertyDecorator_ReadMethod();
-
- /**
- * The meta object literal for the '<em><b>Write Method</b></em>' reference feature.
- * <!-- begin-user-doc -->
- * <!-- end-user-doc -->
- * @generated
- */
- EReference PROPERTY_DECORATOR__WRITE_METHOD = eINSTANCE.getPropertyDecorator_WriteMethod();
-
- /**
- * The meta object literal for the '<em><b>Field</b></em>' reference feature.
- * <!-- begin-user-doc -->
- * <!-- end-user-doc -->
- * @generated
- */
- EReference PROPERTY_DECORATOR__FIELD = eINSTANCE.getPropertyDecorator_Field();
-
- /**
- * The meta object literal for the '{@link org.eclipse.jem.internal.beaninfo.impl.IndexedPropertyDecoratorImpl <em>Indexed Property Decorator</em>}' class.
- * <!-- begin-user-doc -->
- * <!-- end-user-doc -->
- * @see org.eclipse.jem.internal.beaninfo.impl.IndexedPropertyDecoratorImpl
- * @see org.eclipse.jem.internal.beaninfo.impl.BeaninfoPackageImpl#getIndexedPropertyDecorator()
- * @generated
- */
- EClass INDEXED_PROPERTY_DECORATOR = eINSTANCE.getIndexedPropertyDecorator();
-
- /**
- * The meta object literal for the '<em><b>Indexed Read Method</b></em>' reference feature.
- * <!-- begin-user-doc -->
- * <!-- end-user-doc -->
- * @generated
- */
- EReference INDEXED_PROPERTY_DECORATOR__INDEXED_READ_METHOD = eINSTANCE.getIndexedPropertyDecorator_IndexedReadMethod();
-
- /**
- * The meta object literal for the '<em><b>Indexed Write Method</b></em>' reference feature.
- * <!-- begin-user-doc -->
- * <!-- end-user-doc -->
- * @generated
- */
- EReference INDEXED_PROPERTY_DECORATOR__INDEXED_WRITE_METHOD = eINSTANCE.getIndexedPropertyDecorator_IndexedWriteMethod();
-
- /**
- * The meta object literal for the '{@link org.eclipse.jem.internal.beaninfo.impl.MethodProxyImpl <em>Method Proxy</em>}' class.
- * <!-- begin-user-doc -->
- * <!-- end-user-doc -->
- * @see org.eclipse.jem.internal.beaninfo.impl.MethodProxyImpl
- * @see org.eclipse.jem.internal.beaninfo.impl.BeaninfoPackageImpl#getMethodProxy()
- * @generated
- */
- EClass METHOD_PROXY = eINSTANCE.getMethodProxy();
-
- /**
- * The meta object literal for the '<em><b>Method</b></em>' reference feature.
- * <!-- begin-user-doc -->
- * <!-- end-user-doc -->
- * @generated
- */
- EReference METHOD_PROXY__METHOD = eINSTANCE.getMethodProxy_Method();
-
- /**
- * The meta object literal for the '{@link org.eclipse.jem.internal.beaninfo.impl.BeanEventImpl <em>Bean Event</em>}' class.
- * <!-- begin-user-doc -->
- * <!-- end-user-doc -->
- * @see org.eclipse.jem.internal.beaninfo.impl.BeanEventImpl
- * @see org.eclipse.jem.internal.beaninfo.impl.BeaninfoPackageImpl#getBeanEvent()
- * @generated
- */
- EClass BEAN_EVENT = eINSTANCE.getBeanEvent();
-
- /**
- * The meta object literal for the '{@link org.eclipse.jem.internal.beaninfo.impl.FeatureAttributeMapEntryImpl <em>Feature Attribute Map Entry</em>}' class.
- * <!-- begin-user-doc -->
- * <!-- end-user-doc -->
- * @see org.eclipse.jem.internal.beaninfo.impl.FeatureAttributeMapEntryImpl
- * @see org.eclipse.jem.internal.beaninfo.impl.BeaninfoPackageImpl#getFeatureAttributeMapEntry()
- * @generated
- */
- EClass FEATURE_ATTRIBUTE_MAP_ENTRY = eINSTANCE.getFeatureAttributeMapEntry();
-
- /**
- * The meta object literal for the '<em><b>Key</b></em>' attribute feature.
- * <!-- begin-user-doc -->
- * <!-- end-user-doc -->
- * @generated
- */
- EAttribute FEATURE_ATTRIBUTE_MAP_ENTRY__KEY = eINSTANCE.getFeatureAttributeMapEntry_Key();
-
- /**
- * The meta object literal for the '<em><b>Value</b></em>' attribute feature.
- * <!-- begin-user-doc -->
- * <!-- end-user-doc -->
- * @generated
- */
- EAttribute FEATURE_ATTRIBUTE_MAP_ENTRY__VALUE = eINSTANCE.getFeatureAttributeMapEntry_Value();
-
- /**
- * The meta object literal for the '{@link org.eclipse.jem.internal.beaninfo.ImplicitItem <em>Implicit Item</em>}' enum.
- * <!-- begin-user-doc -->
- * <!-- end-user-doc -->
- * @see org.eclipse.jem.internal.beaninfo.ImplicitItem
- * @see org.eclipse.jem.internal.beaninfo.impl.BeaninfoPackageImpl#getImplicitItem()
- * @generated
- */
- EEnum IMPLICIT_ITEM = eINSTANCE.getImplicitItem();
-
- /**
- * The meta object literal for the '<em>Feature Attribute Value</em>' data type.
- * <!-- begin-user-doc -->
- * <!-- end-user-doc -->
- * @see org.eclipse.jem.internal.beaninfo.common.FeatureAttributeValue
- * @see org.eclipse.jem.internal.beaninfo.impl.BeaninfoPackageImpl#getFeatureAttributeValue()
- * @generated
- */
- EDataType FEATURE_ATTRIBUTE_VALUE = eINSTANCE.getFeatureAttributeValue();
-
- }
-
- /**
- * Returns the meta object for the attribute '{@link org.eclipse.jem.internal.beaninfo.BeanDecorator#isDoBeaninfo <em>Do Beaninfo</em>}'.
- * <!-- begin-user-doc -->
- * <!-- end-user-doc -->
- * @return the meta object for the attribute '<em>Do Beaninfo</em>'.
- * @see org.eclipse.jem.internal.beaninfo.BeanDecorator#isDoBeaninfo()
- * @see #getBeanDecorator()
- * @generated
- */
- EAttribute getBeanDecorator_DoBeaninfo();
-
- /**
- * Returns the meta object for the attribute list '{@link org.eclipse.jem.internal.beaninfo.BeanDecorator#getNotInheritedPropertyNames <em>Not Inherited Property Names</em>}'.
- * <!-- begin-user-doc -->
- * <!-- end-user-doc -->
- * @return the meta object for the attribute list '<em>Not Inherited Property Names</em>'.
- * @see org.eclipse.jem.internal.beaninfo.BeanDecorator#getNotInheritedPropertyNames()
- * @see #getBeanDecorator()
- * @generated
- */
- EAttribute getBeanDecorator_NotInheritedPropertyNames();
-
- /**
- * Returns the meta object for the attribute list '{@link org.eclipse.jem.internal.beaninfo.BeanDecorator#getNotInheritedMethodNames <em>Not Inherited Method Names</em>}'.
- * <!-- begin-user-doc -->
- * <!-- end-user-doc -->
- * @return the meta object for the attribute list '<em>Not Inherited Method Names</em>'.
- * @see org.eclipse.jem.internal.beaninfo.BeanDecorator#getNotInheritedMethodNames()
- * @see #getBeanDecorator()
- * @generated
- */
- EAttribute getBeanDecorator_NotInheritedMethodNames();
-
- /**
- * Returns the meta object for the attribute list '{@link org.eclipse.jem.internal.beaninfo.BeanDecorator#getNotInheritedEventNames <em>Not Inherited Event Names</em>}'.
- * <!-- begin-user-doc -->
- * <!-- end-user-doc -->
- * @return the meta object for the attribute list '<em>Not Inherited Event Names</em>'.
- * @see org.eclipse.jem.internal.beaninfo.BeanDecorator#getNotInheritedEventNames()
- * @see #getBeanDecorator()
- * @generated
- */
- EAttribute getBeanDecorator_NotInheritedEventNames();
-
- /**
- * Returns the meta object for the reference '{@link org.eclipse.jem.internal.beaninfo.ParameterDecorator#getParameter <em>Parameter</em>}'.
- * <!-- begin-user-doc -->
- * <!-- end-user-doc -->
- * @return the meta object for the reference '<em>Parameter</em>'.
- * @see org.eclipse.jem.internal.beaninfo.ParameterDecorator#getParameter()
- * @see #getParameterDecorator()
- * @generated
- */
- EReference getParameterDecorator_Parameter();
-
- /**
- * Returns the meta object for class '{@link org.eclipse.jem.internal.beaninfo.BeanEvent <em>Bean Event</em>}'.
- * <!-- begin-user-doc -->
- * <!-- end-user-doc -->
- * @return the meta object for class '<em>Bean Event</em>'.
- * @see org.eclipse.jem.internal.beaninfo.BeanEvent
- * @generated
- */
- EClass getBeanEvent();
-
- /**
- * Returns the meta object for class '{@link java.util.Map.Entry <em>Feature Attribute Map Entry</em>}'.
- * <!-- begin-user-doc -->
- * <!-- end-user-doc -->
- * @return the meta object for class '<em>Feature Attribute Map Entry</em>'.
- * @see java.util.Map.Entry
- * @model keyType="java.lang.String"
- * valueType="org.eclipse.jem.internal.beaninfo.common.FeatureAttributeValue" valueDataType="org.eclipse.jem.internal.beaninfo.FeatureAttributeValue"
- * @generated
- */
- EClass getFeatureAttributeMapEntry();
-
- /**
- * Returns the meta object for the attribute '{@link java.util.Map.Entry <em>Key</em>}'.
- * <!-- begin-user-doc -->
- * <!-- end-user-doc -->
- * @return the meta object for the attribute '<em>Key</em>'.
- * @see java.util.Map.Entry
- * @see #getFeatureAttributeMapEntry()
- * @generated
- */
- EAttribute getFeatureAttributeMapEntry_Key();
-
- /**
- * Returns the meta object for the attribute '{@link java.util.Map.Entry <em>Value</em>}'.
- * <!-- begin-user-doc -->
- * <!-- end-user-doc -->
- * @return the meta object for the attribute '<em>Value</em>'.
- * @see java.util.Map.Entry
- * @see #getFeatureAttributeMapEntry()
- * @generated
- */
- EAttribute getFeatureAttributeMapEntry_Value();
-
- /**
- * Returns the meta object for enum '{@link org.eclipse.jem.internal.beaninfo.ImplicitItem <em>Implicit Item</em>}'.
- * <!-- begin-user-doc -->
- * <!-- end-user-doc -->
- * @return the meta object for enum '<em>Implicit Item</em>'.
- * @see org.eclipse.jem.internal.beaninfo.ImplicitItem
- * @generated
- */
- EEnum getImplicitItem();
-
-}
diff --git a/plugins/org.eclipse.jem.beaninfo/beaninfo/org/eclipse/jem/internal/beaninfo/EventSetDecorator.java b/plugins/org.eclipse.jem.beaninfo/beaninfo/org/eclipse/jem/internal/beaninfo/EventSetDecorator.java
deleted file mode 100644
index bb889dd..0000000
--- a/plugins/org.eclipse.jem.beaninfo/beaninfo/org/eclipse/jem/internal/beaninfo/EventSetDecorator.java
+++ /dev/null
@@ -1,326 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2001, 2005 IBM Corporation and others.
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
- *
- * Contributors:
- * IBM Corporation - initial API and implementation
- *******************************************************************************/
-package org.eclipse.jem.internal.beaninfo;
-/*
-
-
- */
-
-
-import org.eclipse.emf.common.util.EList;
-
-import org.eclipse.jem.java.JavaClass;
-import org.eclipse.jem.java.Method;
-/**
- * <!-- begin-user-doc -->
- * A representation of the model object '<em><b>Event Set Decorator</b></em>'.
- * <!-- end-user-doc -->
- *
- * <!-- begin-model-doc -->
- * Equivalent to EventSetDecorator in java.
- * <!-- end-model-doc -->
- *
- * <p>
- * The following features are supported:
- * <ul>
- * <li>{@link org.eclipse.jem.internal.beaninfo.EventSetDecorator#isInDefaultEventSet <em>In Default Event Set</em>}</li>
- * <li>{@link org.eclipse.jem.internal.beaninfo.EventSetDecorator#isUnicast <em>Unicast</em>}</li>
- * <li>{@link org.eclipse.jem.internal.beaninfo.EventSetDecorator#isListenerMethodsExplicitEmpty <em>Listener Methods Explicit Empty</em>}</li>
- * <li>{@link org.eclipse.jem.internal.beaninfo.EventSetDecorator#getAddListenerMethod <em>Add Listener Method</em>}</li>
- * <li>{@link org.eclipse.jem.internal.beaninfo.EventSetDecorator#getListenerMethods <em>Listener Methods</em>}</li>
- * <li>{@link org.eclipse.jem.internal.beaninfo.EventSetDecorator#getListenerType <em>Listener Type</em>}</li>
- * <li>{@link org.eclipse.jem.internal.beaninfo.EventSetDecorator#getRemoveListenerMethod <em>Remove Listener Method</em>}</li>
- * <li>{@link org.eclipse.jem.internal.beaninfo.EventSetDecorator#getEventAdapterClass <em>Event Adapter Class</em>}</li>
- * <li>{@link org.eclipse.jem.internal.beaninfo.EventSetDecorator#getSerListMthd <em>Ser List Mthd</em>}</li>
- * </ul>
- * </p>
- *
- * @see org.eclipse.jem.internal.beaninfo.BeaninfoPackage#getEventSetDecorator()
- * @model
- * @generated
- */
-
-
-public interface EventSetDecorator extends FeatureDecorator{
-
- /**
- * Returns the value of the '<em><b>In Default Event Set</b></em>' attribute.
- * <!-- begin-user-doc -->
- * <p>
- * If the meaning of the '<em>In Default Event Set</em>' attribute isn't clear,
- * there really should be more of a description here...
- * </p>
- * <!-- end-user-doc -->
- * @return the value of the '<em>In Default Event Set</em>' attribute.
- * @see #isSetInDefaultEventSet()
- * @see #unsetInDefaultEventSet()
- * @see #setInDefaultEventSet(boolean)
- * @see org.eclipse.jem.internal.beaninfo.BeaninfoPackage#getEventSetDecorator_InDefaultEventSet()
- * @model unsettable="true"
- * @generated
- */
- boolean isInDefaultEventSet();
-
- /**
- * Sets the value of the '{@link org.eclipse.jem.internal.beaninfo.EventSetDecorator#isInDefaultEventSet <em>In Default Event Set</em>}' attribute.
- * <!-- begin-user-doc -->
- * <!-- end-user-doc -->
- * @param value the new value of the '<em>In Default Event Set</em>' attribute.
- * @see #isSetInDefaultEventSet()
- * @see #unsetInDefaultEventSet()
- * @see #isInDefaultEventSet()
- * @generated
- */
- void setInDefaultEventSet(boolean value);
-
- /**
- * Unsets the value of the '{@link org.eclipse.jem.internal.beaninfo.EventSetDecorator#isInDefaultEventSet <em>In Default Event Set</em>}' attribute.
- * <!-- begin-user-doc -->
- * <!-- end-user-doc -->
- * @see #isSetInDefaultEventSet()
- * @see #isInDefaultEventSet()
- * @see #setInDefaultEventSet(boolean)
- * @generated
- */
- void unsetInDefaultEventSet();
-
- /**
- * Returns whether the value of the '{@link org.eclipse.jem.internal.beaninfo.EventSetDecorator#isInDefaultEventSet <em>In Default Event Set</em>}' attribute is set.
- * <!-- begin-user-doc -->
- * <!-- end-user-doc -->
- * @return whether the value of the '<em>In Default Event Set</em>' attribute is set.
- * @see #unsetInDefaultEventSet()
- * @see #isInDefaultEventSet()
- * @see #setInDefaultEventSet(boolean)
- * @generated
- */
- boolean isSetInDefaultEventSet();
-
- /**
- * Returns the value of the '<em><b>Unicast</b></em>' attribute.
- * <!-- begin-user-doc -->
- * <p>
- * If the meaning of the '<em>Unicast</em>' attribute isn't clear,
- * there really should be more of a description here...
- * </p>
- * <!-- end-user-doc -->
- * @return the value of the '<em>Unicast</em>' attribute.
- * @see #isSetUnicast()
- * @see #unsetUnicast()
- * @see #setUnicast(boolean)
- * @see org.eclipse.jem.internal.beaninfo.BeaninfoPackage#getEventSetDecorator_Unicast()
- * @model unsettable="true"
- * @generated
- */
- boolean isUnicast();
-
- /**
- * Sets the value of the '{@link org.eclipse.jem.internal.beaninfo.EventSetDecorator#isUnicast <em>Unicast</em>}' attribute.
- * <!-- begin-user-doc -->
- * <!-- end-user-doc -->
- * @param value the new value of the '<em>Unicast</em>' attribute.
- * @see #isSetUnicast()
- * @see #unsetUnicast()
- * @see #isUnicast()
- * @generated
- */
- void setUnicast(boolean value);
-
- /**
- * Unsets the value of the '{@link org.eclipse.jem.internal.beaninfo.EventSetDecorator#isUnicast <em>Unicast</em>}' attribute.
- * <!-- begin-user-doc -->
- * <!-- end-user-doc -->
- * @see #isSetUnicast()
- * @see #isUnicast()
- * @see #setUnicast(boolean)
- * @generated
- */
- void unsetUnicast();
-
- /**
- * Returns whether the value of the '{@link org.eclipse.jem.internal.beaninfo.EventSetDecorator#isUnicast <em>Unicast</em>}' attribute is set.
- * <!-- begin-user-doc -->
- * <!-- end-user-doc -->
- * @return whether the value of the '<em>Unicast</em>' attribute is set.
- * @see #unsetUnicast()
- * @see #isUnicast()
- * @see #setUnicast(boolean)
- * @generated
- */
- boolean isSetUnicast();
-
- /**
- * Returns the value of the '<em><b>Listener Methods Explicit Empty</b></em>' attribute.
- * <!-- begin-user-doc -->
- * <!-- end-user-doc -->
- * <!-- begin-model-doc -->
- * Set true if the listenerMethods feature is explicitly set as empty and is not to have listener methods merged in from BeanInfo or reflection.
- * <!-- end-model-doc -->
- * @return the value of the '<em>Listener Methods Explicit Empty</em>' attribute.
- * @see #setListenerMethodsExplicitEmpty(boolean)
- * @see org.eclipse.jem.internal.beaninfo.BeaninfoPackage#getEventSetDecorator_ListenerMethodsExplicitEmpty()
- * @model
- * @generated
- */
- boolean isListenerMethodsExplicitEmpty();
-
- /**
- * Sets the value of the '{@link org.eclipse.jem.internal.beaninfo.EventSetDecorator#isListenerMethodsExplicitEmpty <em>Listener Methods Explicit Empty</em>}' attribute.
- * <!-- begin-user-doc -->
- * <!-- end-user-doc -->
- * @param value the new value of the '<em>Listener Methods Explicit Empty</em>' attribute.
- * @see #isListenerMethodsExplicitEmpty()
- * @generated
- */
- void setListenerMethodsExplicitEmpty(boolean value);
-
- /**
- * Returns the value of the '<em><b>Add Listener Method</b></em>' reference.
- * <!-- begin-user-doc -->
- * <p>
- * If the meaning of the '<em>Add Listener Method</em>' reference isn't clear,
- * there really should be more of a description here...
- * </p>
- * <!-- end-user-doc -->
- * @return the value of the '<em>Add Listener Method</em>' reference.
- * @see #setAddListenerMethod(Method)
- * @see org.eclipse.jem.internal.beaninfo.BeaninfoPackage#getEventSetDecorator_AddListenerMethod()
- * @model required="true"
- * @generated
- */
- Method getAddListenerMethod();
-
- /**
- * Sets the value of the '{@link org.eclipse.jem.internal.beaninfo.EventSetDecorator#getAddListenerMethod <em>Add Listener Method</em>}' reference.
- * <!-- begin-user-doc -->
- * <!-- end-user-doc -->
- * @param value the new value of the '<em>Add Listener Method</em>' reference.
- * @see #getAddListenerMethod()
- * @generated
- */
- void setAddListenerMethod(Method value);
-
- /**
- * Returns the value of the '<em><b>Listener Methods</b></em>' reference list.
- * The list contents are of type {@link org.eclipse.jem.internal.beaninfo.MethodProxy}.
- * <!-- begin-user-doc -->
- * <p>
- * If the meaning of the '<em>Listener Methods</em>' containment reference list isn't clear,
- * there really should be more of a description here...
- * </p>
- * <!-- end-user-doc -->
- * <!-- begin-model-doc -->
- * listener methods. If it is desired that the list be explicitly empty and not have BeanInfo set it, then set listenerMethodsExplicitEmpty to true.
- * <p>
- * ListenerMethods will be decorated with MethodDecorators.
- * <p>
- * Note: This is a derived setting, which means it will not notify out changes to it. To here changes to it, listen on "serListMthd" notifications instead.
- * <!-- end-model-doc -->
- * @return the value of the '<em>Listener Methods</em>' reference list.
- * @see org.eclipse.jem.internal.beaninfo.BeaninfoPackage#getEventSetDecorator_ListenerMethods()
- * @model type="org.eclipse.jem.internal.beaninfo.MethodProxy" required="true" transient="true" volatile="true" derived="true"
- * @generated
- */
- EList getListenerMethods();
-
- /**
- * Returns the value of the '<em><b>Listener Type</b></em>' reference.
- * <!-- begin-user-doc -->
- * <p>
- * If the meaning of the '<em>Listener Type</em>' reference isn't clear,
- * there really should be more of a description here...
- * </p>
- * <!-- end-user-doc -->
- * @return the value of the '<em>Listener Type</em>' reference.
- * @see #setListenerType(JavaClass)
- * @see org.eclipse.jem.internal.beaninfo.BeaninfoPackage#getEventSetDecorator_ListenerType()
- * @model required="true"
- * @generated
- */
- JavaClass getListenerType();
-
- /**
- * Sets the value of the '{@link org.eclipse.jem.internal.beaninfo.EventSetDecorator#getListenerType <em>Listener Type</em>}' reference.
- * <!-- begin-user-doc -->
- * <!-- end-user-doc -->
- * @param value the new value of the '<em>Listener Type</em>' reference.
- * @see #getListenerType()
- * @generated
- */
- void setListenerType(JavaClass value);
-
- /**
- * Returns the value of the '<em><b>Remove Listener Method</b></em>' reference.
- * <!-- begin-user-doc -->
- * <p>
- * If the meaning of the '<em>Remove Listener Method</em>' reference isn't clear,
- * there really should be more of a description here...
- * </p>
- * <!-- end-user-doc -->
- * @return the value of the '<em>Remove Listener Method</em>' reference.
- * @see #setRemoveListenerMethod(Method)
- * @see org.eclipse.jem.internal.beaninfo.BeaninfoPackage#getEventSetDecorator_RemoveListenerMethod()
- * @model required="true"
- * @generated
- */
- Method getRemoveListenerMethod();
-
- /**
- * Sets the value of the '{@link org.eclipse.jem.internal.beaninfo.EventSetDecorator#getRemoveListenerMethod <em>Remove Listener Method</em>}' reference.
- * <!-- begin-user-doc -->
- * <!-- end-user-doc -->
- * @param value the new value of the '<em>Remove Listener Method</em>' reference.
- * @see #getRemoveListenerMethod()
- * @generated
- */
- void setRemoveListenerMethod(Method value);
-
- /**
- * Returns the value of the '<em><b>Event Adapter Class</b></em>' reference.
- * <!-- begin-user-doc -->
- * <!-- end-user-doc -->
- * <!-- begin-model-doc -->
- * For some listener interfaces an adapter class is provided that implements default no-op methods, e.g. java.awt.event.FocusEvent which has java.awt.event.FocusAdapter. The Adapter class is provided in a key/value pair on the java.beans.EventSetDescriptor with a key defined in a static final constants EVENTADAPTERCLASS = "eventAdapterClass".
- * <!-- end-model-doc -->
- * @return the value of the '<em>Event Adapter Class</em>' reference.
- * @see #setEventAdapterClass(JavaClass)
- * @see org.eclipse.jem.internal.beaninfo.BeaninfoPackage#getEventSetDecorator_EventAdapterClass()
- * @model
- * @generated
- */
- JavaClass getEventAdapterClass();
-
- /**
- * Sets the value of the '{@link org.eclipse.jem.internal.beaninfo.EventSetDecorator#getEventAdapterClass <em>Event Adapter Class</em>}' reference.
- * <!-- begin-user-doc -->
- * <!-- end-user-doc -->
- * @param value the new value of the '<em>Event Adapter Class</em>' reference.
- * @see #getEventAdapterClass()
- * @generated
- */
- void setEventAdapterClass(JavaClass value);
-
- /**
- * Returns the value of the '<em><b>Ser List Mthd</b></em>' containment reference list.
- * The list contents are of type {@link org.eclipse.jem.internal.beaninfo.MethodProxy}.
- * <!-- begin-user-doc -->
- * <!-- end-user-doc -->
- * <!-- begin-model-doc -->
- * This is a private feature. It is used internally only.
- * <!-- end-model-doc -->
- * @return the value of the '<em>Ser List Mthd</em>' containment reference list.
- * @see org.eclipse.jem.internal.beaninfo.BeaninfoPackage#getEventSetDecorator_SerListMthd()
- * @model type="org.eclipse.jem.internal.beaninfo.MethodProxy" containment="true" required="true"
- * @generated
- */
- EList getSerListMthd();
-
-}
diff --git a/plugins/org.eclipse.jem.beaninfo/beaninfo/org/eclipse/jem/internal/beaninfo/FeatureDecorator.java b/plugins/org.eclipse.jem.beaninfo/beaninfo/org/eclipse/jem/internal/beaninfo/FeatureDecorator.java
deleted file mode 100644
index 298fb38..0000000
--- a/plugins/org.eclipse.jem.beaninfo/beaninfo/org/eclipse/jem/internal/beaninfo/FeatureDecorator.java
+++ /dev/null
@@ -1,491 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2001, 2005 IBM Corporation and others.
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
- *
- * Contributors:
- * IBM Corporation - initial API and implementation
- *******************************************************************************/
-package org.eclipse.jem.internal.beaninfo;
-/*
-
-
- */
-
-
-import org.eclipse.emf.common.util.EMap;
-import org.eclipse.emf.ecore.EAnnotation;
-
-
-/**
- * <!-- begin-user-doc -->
- * A representation of the model object '<em><b>Feature Decorator</b></em>'.
- * <!-- end-user-doc -->
- *
- * <!-- begin-model-doc -->
- * Equivalent to FeatureDescriptor in java.
- * <p>
- * Note: If any attribute is explicitly set then the BeanInfo/Reflection will not be merged into the decorator. This provides a way of overriding the BeanInfos. Also for any many-valued attribute, if it is desired to have it explicitly empty and not have BeanInfo fill it in, there will be another attribute named of the form "attibutueExplicitEmpty" If this is true then the BeanInfo will not merge in and will leave it empty.
- * <p>
- * These comments about merging apply to all subclasses of this decorator too.
- * <!-- end-model-doc -->
- *
- * <p>
- * The following features are supported:
- * <ul>
- * <li>{@link org.eclipse.jem.internal.beaninfo.FeatureDecorator#getDisplayName <em>Display Name</em>}</li>
- * <li>{@link org.eclipse.jem.internal.beaninfo.FeatureDecorator#getShortDescription <em>Short Description</em>}</li>
- * <li>{@link org.eclipse.jem.internal.beaninfo.FeatureDecorator#getCategory <em>Category</em>}</li>
- * <li>{@link org.eclipse.jem.internal.beaninfo.FeatureDecorator#isExpert <em>Expert</em>}</li>
- * <li>{@link org.eclipse.jem.internal.beaninfo.FeatureDecorator#isHidden <em>Hidden</em>}</li>
- * <li>{@link org.eclipse.jem.internal.beaninfo.FeatureDecorator#isPreferred <em>Preferred</em>}</li>
- * <li>{@link org.eclipse.jem.internal.beaninfo.FeatureDecorator#isMergeIntrospection <em>Merge Introspection</em>}</li>
- * <li>{@link org.eclipse.jem.internal.beaninfo.FeatureDecorator#isAttributesExplicitEmpty <em>Attributes Explicit Empty</em>}</li>
- * <li>{@link org.eclipse.jem.internal.beaninfo.FeatureDecorator#getImplicitlySetBits <em>Implicitly Set Bits</em>}</li>
- * <li>{@link org.eclipse.jem.internal.beaninfo.FeatureDecorator#getImplicitDecoratorFlag <em>Implicit Decorator Flag</em>}</li>
- * <li>{@link org.eclipse.jem.internal.beaninfo.FeatureDecorator#getAttributes <em>Attributes</em>}</li>
- * </ul>
- * </p>
- *
- * @see org.eclipse.jem.internal.beaninfo.BeaninfoPackage#getFeatureDecorator()
- * @model
- * @generated
- */
-
-
-public interface FeatureDecorator extends EAnnotation{
-
- /**
- * Returns the value of the '<em><b>Display Name</b></em>' attribute.
- * <!-- begin-user-doc -->
- * <p>
- * If the meaning of the '<em>Display Name</em>' attribute isn't clear,
- * there really should be more of a description here...
- * </p>
- * <!-- end-user-doc -->
- * @return the value of the '<em>Display Name</em>' attribute.
- * @see #isSetDisplayName()
- * @see #unsetDisplayName()
- * @see #setDisplayName(String)
- * @see org.eclipse.jem.internal.beaninfo.BeaninfoPackage#getFeatureDecorator_DisplayName()
- * @model unsettable="true"
- * @generated
- */
- String getDisplayName();
-
- /**
- * Sets the value of the '{@link org.eclipse.jem.internal.beaninfo.FeatureDecorator#getDisplayName <em>Display Name</em>}' attribute.
- * <!-- begin-user-doc -->
- * <!-- end-user-doc -->
- * @param value the new value of the '<em>Display Name</em>' attribute.
- * @see #isSetDisplayName()
- * @see #unsetDisplayName()
- * @see #getDisplayName()
- * @generated
- */
- void setDisplayName(String value);
-
- /**
- * Unsets the value of the '{@link org.eclipse.jem.internal.beaninfo.FeatureDecorator#getDisplayName <em>Display Name</em>}' attribute.
- * <!-- begin-user-doc -->
- * <!-- end-user-doc -->
- * @see #isSetDisplayName()
- * @see #getDisplayName()
- * @see #setDisplayName(String)
- * @generated
- */
- void unsetDisplayName();
-
- /**
- * Returns whether the value of the '{@link org.eclipse.jem.internal.beaninfo.FeatureDecorator#getDisplayName <em>Display Name</em>}' attribute is set.
- * <!-- begin-user-doc -->
- * <!-- end-user-doc -->
- * @return whether the value of the '<em>Display Name</em>' attribute is set.
- * @see #unsetDisplayName()
- * @see #getDisplayName()
- * @see #setDisplayName(String)
- * @generated
- */
- boolean isSetDisplayName();
-
- /**
- * Returns the value of the '<em><b>Short Description</b></em>' attribute.
- * <!-- begin-user-doc -->
- * <p>
- * If the meaning of the '<em>Short Description</em>' attribute isn't clear,
- * there really should be more of a description here...
- * </p>
- * <!-- end-user-doc -->
- * @return the value of the '<em>Short Description</em>' attribute.
- * @see #isSetShortDescription()
- * @see #unsetShortDescription()
- * @see #setShortDescription(String)
- * @see org.eclipse.jem.internal.beaninfo.BeaninfoPackage#getFeatureDecorator_ShortDescription()
- * @model unsettable="true"
- * @generated
- */
- String getShortDescription();
-
- /**
- * Sets the value of the '{@link org.eclipse.jem.internal.beaninfo.FeatureDecorator#getShortDescription <em>Short Description</em>}' attribute.
- * <!-- begin-user-doc -->
- * <!-- end-user-doc -->
- * @param value the new value of the '<em>Short Description</em>' attribute.
- * @see #isSetShortDescription()
- * @see #unsetShortDescription()
- * @see #getShortDescription()
- * @generated
- */
- void setShortDescription(String value);
-
- /**
- * Unsets the value of the '{@link org.eclipse.jem.internal.beaninfo.FeatureDecorator#getShortDescription <em>Short Description</em>}' attribute.
- * <!-- begin-user-doc -->
- * <!-- end-user-doc -->
- * @see #isSetShortDescription()
- * @see #getShortDescription()
- * @see #setShortDescription(String)
- * @generated
- */
- void unsetShortDescription();
-
- /**
- * Returns whether the value of the '{@link org.eclipse.jem.internal.beaninfo.FeatureDecorator#getShortDescription <em>Short Description</em>}' attribute is set.
- * <!-- begin-user-doc -->
- * <!-- end-user-doc -->
- * @return whether the value of the '<em>Short Description</em>' attribute is set.
- * @see #unsetShortDescription()
- * @see #getShortDescription()
- * @see #setShortDescription(String)
- * @generated
- */
- boolean isSetShortDescription();
-
- /**
- * Returns the value of the '<em><b>Category</b></em>' attribute.
- * <!-- begin-user-doc -->
- * <p>
- * If the meaning of the '<em>Category</em>' attribute isn't clear,
- * there really should be more of a description here...
- * </p>
- * <!-- end-user-doc -->
- * @return the value of the '<em>Category</em>' attribute.
- * @see #setCategory(String)
- * @see org.eclipse.jem.internal.beaninfo.BeaninfoPackage#getFeatureDecorator_Category()
- * @model
- * @generated
- */
- String getCategory();
-
- /**
- * Sets the value of the '{@link org.eclipse.jem.internal.beaninfo.FeatureDecorator#getCategory <em>Category</em>}' attribute.
- * <!-- begin-user-doc -->
- * <!-- end-user-doc -->
- * @param value the new value of the '<em>Category</em>' attribute.
- * @see #getCategory()
- * @generated
- */
- void setCategory(String value);
-
- /**
- * Returns the value of the '<em><b>Expert</b></em>' attribute.
- * <!-- begin-user-doc -->
- * <p>
- * If the meaning of the '<em>Expert</em>' attribute isn't clear,
- * there really should be more of a description here...
- * </p>
- * <!-- end-user-doc -->
- * @return the value of the '<em>Expert</em>' attribute.
- * @see #isSetExpert()
- * @see #unsetExpert()
- * @see #setExpert(boolean)
- * @see org.eclipse.jem.internal.beaninfo.BeaninfoPackage#getFeatureDecorator_Expert()
- * @model unsettable="true"
- * @generated
- */
- boolean isExpert();
-
- /**
- * Sets the value of the '{@link org.eclipse.jem.internal.beaninfo.FeatureDecorator#isExpert <em>Expert</em>}' attribute.
- * <!-- begin-user-doc -->
- * <!-- end-user-doc -->
- * @param value the new value of the '<em>Expert</em>' attribute.
- * @see #isSetExpert()
- * @see #unsetExpert()
- * @see #isExpert()
- * @generated
- */
- void setExpert(boolean value);
-
- /**
- * Unsets the value of the '{@link org.eclipse.jem.internal.beaninfo.FeatureDecorator#isExpert <em>Expert</em>}' attribute.
- * <!-- begin-user-doc -->
- * <!-- end-user-doc -->
- * @see #isSetExpert()
- * @see #isExpert()
- * @see #setExpert(boolean)
- * @generated
- */
- void unsetExpert();
-
- /**
- * Returns whether the value of the '{@link org.eclipse.jem.internal.beaninfo.FeatureDecorator#isExpert <em>Expert</em>}' attribute is set.
- * <!-- begin-user-doc -->
- * <!-- end-user-doc -->
- * @return whether the value of the '<em>Expert</em>' attribute is set.
- * @see #unsetExpert()
- * @see #isExpert()
- * @see #setExpert(boolean)
- * @generated
- */
- boolean isSetExpert();
-
- /**
- * Returns the value of the '<em><b>Hidden</b></em>' attribute.
- * <!-- begin-user-doc -->
- * <p>
- * If the meaning of the '<em>Hidden</em>' attribute isn't clear,
- * there really should be more of a description here...
- * </p>
- * <!-- end-user-doc -->
- * @return the value of the '<em>Hidden</em>' attribute.
- * @see #isSetHidden()
- * @see #unsetHidden()
- * @see #setHidden(boolean)
- * @see org.eclipse.jem.internal.beaninfo.BeaninfoPackage#getFeatureDecorator_Hidden()
- * @model unsettable="true"
- * @generated
- */
- boolean isHidden();
-
- /**
- * Sets the value of the '{@link org.eclipse.jem.internal.beaninfo.FeatureDecorator#isHidden <em>Hidden</em>}' attribute.
- * <!-- begin-user-doc -->
- * <!-- end-user-doc -->
- * @param value the new value of the '<em>Hidden</em>' attribute.
- * @see #isSetHidden()
- * @see #unsetHidden()
- * @see #isHidden()
- * @generated
- */
- void setHidden(boolean value);
-
- /**
- * Unsets the value of the '{@link org.eclipse.jem.internal.beaninfo.FeatureDecorator#isHidden <em>Hidden</em>}' attribute.
- * <!-- begin-user-doc -->
- * <!-- end-user-doc -->
- * @see #isSetHidden()
- * @see #isHidden()
- * @see #setHidden(boolean)
- * @generated
- */
- void unsetHidden();
-
- /**
- * Returns whether the value of the '{@link org.eclipse.jem.internal.beaninfo.FeatureDecorator#isHidden <em>Hidden</em>}' attribute is set.
- * <!-- begin-user-doc -->
- * <!-- end-user-doc -->
- * @return whether the value of the '<em>Hidden</em>' attribute is set.
- * @see #unsetHidden()
- * @see #isHidden()
- * @see #setHidden(boolean)
- * @generated
- */
- boolean isSetHidden();
-
- /**
- * Returns the value of the '<em><b>Preferred</b></em>' attribute.
- * <!-- begin-user-doc -->
- * <p>
- * If the meaning of the '<em>Preferred</em>' attribute isn't clear,
- * there really should be more of a description here...
- * </p>
- * <!-- end-user-doc -->
- * @return the value of the '<em>Preferred</em>' attribute.
- * @see #isSetPreferred()
- * @see #unsetPreferred()
- * @see #setPreferred(boolean)
- * @see org.eclipse.jem.internal.beaninfo.BeaninfoPackage#getFeatureDecorator_Preferred()
- * @model unsettable="true"
- * @generated
- */
- boolean isPreferred();
-
- /**
- * Sets the value of the '{@link org.eclipse.jem.internal.beaninfo.FeatureDecorator#isPreferred <em>Preferred</em>}' attribute.
- * <!-- begin-user-doc -->
- * <!-- end-user-doc -->
- * @param value the new value of the '<em>Preferred</em>' attribute.
- * @see #isSetPreferred()
- * @see #unsetPreferred()
- * @see #isPreferred()
- * @generated
- */
- void setPreferred(boolean value);
-
- /**
- * Unsets the value of the '{@link org.eclipse.jem.internal.beaninfo.FeatureDecorator#isPreferred <em>Preferred</em>}' attribute.
- * <!-- begin-user-doc -->
- * <!-- end-user-doc -->
- * @see #isSetPreferred()
- * @see #isPreferred()
- * @see #setPreferred(boolean)
- * @generated
- */
- void unsetPreferred();
-
- /**
- * Returns whether the value of the '{@link org.eclipse.jem.internal.beaninfo.FeatureDecorator#isPreferred <em>Preferred</em>}' attribute is set.
- * <!-- begin-user-doc -->
- * <!-- end-user-doc -->
- * @return whether the value of the '<em>Preferred</em>' attribute is set.
- * @see #unsetPreferred()
- * @see #isPreferred()
- * @see #setPreferred(boolean)
- * @generated
- */
- boolean isSetPreferred();
-
- /**
- * Returns the value of the '<em><b>Merge Introspection</b></em>' attribute.
- * The default value is <code>"true"</code>.
- * <!-- begin-user-doc -->
- * <p>
- * If the meaning of the '<em>Merge Introspection</em>' attribute isn't clear,
- * there really should be more of a description here...
- * </p>
- * <!-- end-user-doc -->
- * <!-- begin-model-doc -->
- * Should the introspection results be merged into this decorator. If this is set to false, then the introspection results are ignored for this particular decorator. This is an internal feature simply to allow desired override capabilities. Customers would use it to prevent ANY introspection/reflection from occurring.
- * <!-- end-model-doc -->
- * @return the value of the '<em>Merge Introspection</em>' attribute.
- * @see #setMergeIntrospection(boolean)
- * @see org.eclipse.jem.internal.beaninfo.BeaninfoPackage#getFeatureDecorator_MergeIntrospection()
- * @model default="true"
- * @generated
- */
- boolean isMergeIntrospection();
-
- /**
- * Sets the value of the '{@link org.eclipse.jem.internal.beaninfo.FeatureDecorator#isMergeIntrospection <em>Merge Introspection</em>}' attribute.
- * <!-- begin-user-doc -->
- * <!-- end-user-doc -->
- * @param value the new value of the '<em>Merge Introspection</em>' attribute.
- * @see #isMergeIntrospection()
- * @generated
- */
- void setMergeIntrospection(boolean value);
-
- /**
- * Returns the value of the '<em><b>Attributes Explicit Empty</b></em>' attribute.
- * <!-- begin-user-doc -->
- * <!-- end-user-doc -->
- * <!-- begin-model-doc -->
- * The attributes are explicitly set as empty and not retrieved from the beaninfo/reflection. Customers should set this if they want the list of attributes to be empty and not merged with the BeanInfo results.
- * <!-- end-model-doc -->
- * @return the value of the '<em>Attributes Explicit Empty</em>' attribute.
- * @see #setAttributesExplicitEmpty(boolean)
- * @see org.eclipse.jem.internal.beaninfo.BeaninfoPackage#getFeatureDecorator_AttributesExplicitEmpty()
- * @model
- * @generated
- */
- boolean isAttributesExplicitEmpty();
-
- /**
- * Sets the value of the '{@link org.eclipse.jem.internal.beaninfo.FeatureDecorator#isAttributesExplicitEmpty <em>Attributes Explicit Empty</em>}' attribute.
- * <!-- begin-user-doc -->
- * <!-- end-user-doc -->
- * @param value the new value of the '<em>Attributes Explicit Empty</em>' attribute.
- * @see #isAttributesExplicitEmpty()
- * @generated
- */
- void setAttributesExplicitEmpty(boolean value);
-
- /**
- * Returns the value of the '<em><b>Implicitly Set Bits</b></em>' attribute.
- * <!-- begin-user-doc -->
- * <!-- end-user-doc -->
- * <!-- begin-model-doc -->
- * A bitflag for which attributes have been set by BeanInfo/Reflection.
- * <p>
- * This is an internal attribute that is used by the BeanInfo maintanance. It is not meant to be used by customers.
- * <!-- end-model-doc -->
- * @return the value of the '<em>Implicitly Set Bits</em>' attribute.
- * @see #setImplicitlySetBits(long)
- * @see org.eclipse.jem.internal.beaninfo.BeaninfoPackage#getFeatureDecorator_ImplicitlySetBits()
- * @model
- * @generated
- */
- long getImplicitlySetBits();
-
- /**
- * Sets the value of the '{@link org.eclipse.jem.internal.beaninfo.FeatureDecorator#getImplicitlySetBits <em>Implicitly Set Bits</em>}' attribute.
- * <!-- begin-user-doc -->
- * <!-- end-user-doc -->
- * @param value the new value of the '<em>Implicitly Set Bits</em>' attribute.
- * @see #getImplicitlySetBits()
- * @generated
- */
- void setImplicitlySetBits(long value);
-
- /**
- * Returns the value of the '<em><b>Implicit Decorator Flag</b></em>' attribute.
- * The literals are from the enumeration {@link org.eclipse.jem.internal.beaninfo.ImplicitItem}.
- * <!-- begin-user-doc -->
- * <!-- end-user-doc -->
- * <!-- begin-model-doc -->
- * Is this decorator/feature implicit. This means created by Introspection/Reflection and not by customer.
- * <p>
- * This is an internal attribute that is used by the BeanInfo maintanance. It is not meant to be used by customers.
- * <!-- end-model-doc -->
- * @return the value of the '<em>Implicit Decorator Flag</em>' attribute.
- * @see org.eclipse.jem.internal.beaninfo.ImplicitItem
- * @see #setImplicitDecoratorFlag(ImplicitItem)
- * @see org.eclipse.jem.internal.beaninfo.BeaninfoPackage#getFeatureDecorator_ImplicitDecoratorFlag()
- * @model
- * @generated
- */
- ImplicitItem getImplicitDecoratorFlag();
-
- /**
- * Sets the value of the '{@link org.eclipse.jem.internal.beaninfo.FeatureDecorator#getImplicitDecoratorFlag <em>Implicit Decorator Flag</em>}' attribute.
- * <!-- begin-user-doc -->
- * <!-- end-user-doc -->
- * @param value the new value of the '<em>Implicit Decorator Flag</em>' attribute.
- * @see org.eclipse.jem.internal.beaninfo.ImplicitItem
- * @see #getImplicitDecoratorFlag()
- * @generated
- */
- void setImplicitDecoratorFlag(ImplicitItem value);
-
- /**
- * Returns the value of the '<em><b>Attributes</b></em>' map.
- * The key is of type {@link java.lang.String},
- * and the value is of type {@link org.eclipse.jem.internal.beaninfo.common.FeatureAttributeValue},
- * <!-- begin-user-doc -->
- * <p>
- * If the meaning of the '<em>Attributes</em>' containment reference list isn't clear,
- * there really should be more of a description here...
- * </p>
- * <!-- end-user-doc -->
- * <!-- begin-model-doc -->
- * Feature attributes. Key/value pairs. If it is desired that the feature attributes is explicitly empty and not have BeanInfo/reflection set it, set attributesExplicitEmpty to true.
- * <!-- end-model-doc -->
- * @return the value of the '<em>Attributes</em>' map.
- * @see org.eclipse.jem.internal.beaninfo.BeaninfoPackage#getFeatureDecorator_Attributes()
- * @model mapType="org.eclipse.jem.internal.beaninfo.FeatureAttributeMapEntry" keyType="java.lang.String" valueType="org.eclipse.jem.internal.beaninfo.common.FeatureAttributeValue"
- * @generated
- */
- EMap getAttributes();
-
- /**
- * <!-- begin-user-doc -->
- * <!-- end-user-doc -->
- * @model kind="operation"
- * @generated
- */
- String getName();
-
-}
diff --git a/plugins/org.eclipse.jem.beaninfo/beaninfo/org/eclipse/jem/internal/beaninfo/ImplicitItem.java b/plugins/org.eclipse.jem.beaninfo/beaninfo/org/eclipse/jem/internal/beaninfo/ImplicitItem.java
deleted file mode 100644
index c5e5b4b..0000000
--- a/plugins/org.eclipse.jem.beaninfo/beaninfo/org/eclipse/jem/internal/beaninfo/ImplicitItem.java
+++ /dev/null
@@ -1,168 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2001, 2005 IBM Corporation and others.
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
- *
- * Contributors:
- * IBM Corporation - initial API and implementation
- *******************************************************************************/
-package org.eclipse.jem.internal.beaninfo;
-
-import java.util.Arrays;
-import java.util.Collections;
-import java.util.List;
-
-import org.eclipse.emf.common.util.AbstractEnumerator;
-
-/**
- * <!-- begin-user-doc -->
- * A representation of the literals of the enumeration '<em><b>Implicit Item</b></em>',
- * and utility methods for working with them.
- * <!-- end-user-doc -->
- * <!-- begin-model-doc -->
- * This enum is an internal enum. It is used by BeanInfo for cache maintenance.
- * <p>
- * This enum is not meant to be used by clients.
- * <!-- end-model-doc -->
- * @see org.eclipse.jem.internal.beaninfo.BeaninfoPackage#getImplicitItem()
- * @model
- * @generated
- */
-public final class ImplicitItem extends AbstractEnumerator {
- /**
- * The '<em><b>NOT IMPLICIT</b></em>' literal value.
- * <!-- begin-user-doc -->
- * <!-- end-user-doc -->
- * <!-- begin-model-doc -->
- * Means this decorator is not implicit. That is it was created by customer.
- * <!-- end-model-doc -->
- * @see #NOT_IMPLICIT_LITERAL
- * @model
- * @generated
- * @ordered
- */
- public static final int NOT_IMPLICIT = 0;
-
- /**
- * The '<em><b>IMPLICIT DECORATOR</b></em>' literal value.
- * <!-- begin-user-doc -->
- * <!-- end-user-doc -->
- * <!-- begin-model-doc -->
- * This means that the decorator is implicit. That is it was not created by the customer.
- * <!-- end-model-doc -->
- * @see #IMPLICIT_DECORATOR_LITERAL
- * @model
- * @generated
- * @ordered
- */
- public static final int IMPLICIT_DECORATOR = 1;
-
- /**
- * The '<em><b>IMPLICIT DECORATOR AND FEATURE</b></em>' literal value.
- * <!-- begin-user-doc -->
- * <!-- end-user-doc -->
- * <!-- begin-model-doc -->
- * This means the decorator and the feature where implicit. That is they were not created by the customer.
- * <!-- end-model-doc -->
- * @see #IMPLICIT_DECORATOR_AND_FEATURE_LITERAL
- * @model
- * @generated
- * @ordered
- */
- public static final int IMPLICIT_DECORATOR_AND_FEATURE = 2;
-
- /**
- * The '<em><b>NOT IMPLICIT</b></em>' literal object.
- * <!-- begin-user-doc -->
- * <!-- end-user-doc -->
- * @see #NOT_IMPLICIT
- * @generated
- * @ordered
- */
- public static final ImplicitItem NOT_IMPLICIT_LITERAL = new ImplicitItem(NOT_IMPLICIT, "NOT_IMPLICIT");
-
- /**
- * The '<em><b>IMPLICIT DECORATOR</b></em>' literal object.
- * <!-- begin-user-doc -->
- * <!-- end-user-doc -->
- * @see #IMPLICIT_DECORATOR
- * @generated
- * @ordered
- */
- public static final ImplicitItem IMPLICIT_DECORATOR_LITERAL = new ImplicitItem(IMPLICIT_DECORATOR, "IMPLICIT_DECORATOR");
-
- /**
- * The '<em><b>IMPLICIT DECORATOR AND FEATURE</b></em>' literal object.
- * <!-- begin-user-doc -->
- * <!-- end-user-doc -->
- * @see #IMPLICIT_DECORATOR_AND_FEATURE
- * @generated
- * @ordered
- */
- public static final ImplicitItem IMPLICIT_DECORATOR_AND_FEATURE_LITERAL = new ImplicitItem(IMPLICIT_DECORATOR_AND_FEATURE, "IMPLICIT_DECORATOR_AND_FEATURE");
-
- /**
- * An array of all the '<em><b>Implicit Item</b></em>' enumerators.
- * <!-- begin-user-doc -->
- * <!-- end-user-doc -->
- * @generated
- */
- private static final ImplicitItem[] VALUES_ARRAY =
- new ImplicitItem[] {
- NOT_IMPLICIT_LITERAL,
- IMPLICIT_DECORATOR_LITERAL,
- IMPLICIT_DECORATOR_AND_FEATURE_LITERAL,
- };
-
- /**
- * A public read-only list of all the '<em><b>Implicit Item</b></em>' enumerators.
- * <!-- begin-user-doc -->
- * <!-- end-user-doc -->
- * @generated
- */
- public static final List VALUES = Collections.unmodifiableList(Arrays.asList(VALUES_ARRAY));
-
- /**
- * Returns the '<em><b>Implicit Item</b></em>' literal with the specified name.
- * <!-- begin-user-doc -->
- * <!-- end-user-doc -->
- * @generated
- */
- public static ImplicitItem get(String name) {
- for (int i = 0; i < VALUES_ARRAY.length; ++i) {
- ImplicitItem result = VALUES_ARRAY[i];
- if (result.toString().equals(name)) {
- return result;
- }
- }
- return null;
- }
-
- /**
- * Returns the '<em><b>Implicit Item</b></em>' literal with the specified value.
- * <!-- begin-user-doc -->
- * <!-- end-user-doc -->
- * @generated
- */
- public static ImplicitItem get(int value) {
- switch (value) {
- case NOT_IMPLICIT: return NOT_IMPLICIT_LITERAL;
- case IMPLICIT_DECORATOR: return IMPLICIT_DECORATOR_LITERAL;
- case IMPLICIT_DECORATOR_AND_FEATURE: return IMPLICIT_DECORATOR_AND_FEATURE_LITERAL;
- }
- return null;
- }
-
- /**
- * Only this class can construct instances.
- * <!-- begin-user-doc -->
- * <!-- end-user-doc -->
- * @generated
- */
- private ImplicitItem(int value, String name) {
- super(value, name);
- }
-
-} //ImplicitItem
diff --git a/plugins/org.eclipse.jem.beaninfo/beaninfo/org/eclipse/jem/internal/beaninfo/IndexedPropertyDecorator.java b/plugins/org.eclipse.jem.beaninfo/beaninfo/org/eclipse/jem/internal/beaninfo/IndexedPropertyDecorator.java
deleted file mode 100644
index a453515..0000000
--- a/plugins/org.eclipse.jem.beaninfo/beaninfo/org/eclipse/jem/internal/beaninfo/IndexedPropertyDecorator.java
+++ /dev/null
@@ -1,149 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2001, 2005 IBM Corporation and others.
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
- *
- * Contributors:
- * IBM Corporation - initial API and implementation
- *******************************************************************************/
-package org.eclipse.jem.internal.beaninfo;
-/*
-
-
- */
-
-
-import org.eclipse.jem.java.Method;
-/**
- * <!-- begin-user-doc -->
- * A representation of the model object '<em><b>Indexed Property Decorator</b></em>'.
- * <!-- end-user-doc -->
- *
- * <!-- begin-model-doc -->
- * Equivalent to IndexedPropertyDecorator
- * <!-- end-model-doc -->
- *
- * <p>
- * The following features are supported:
- * <ul>
- * <li>{@link org.eclipse.jem.internal.beaninfo.IndexedPropertyDecorator#getIndexedReadMethod <em>Indexed Read Method</em>}</li>
- * <li>{@link org.eclipse.jem.internal.beaninfo.IndexedPropertyDecorator#getIndexedWriteMethod <em>Indexed Write Method</em>}</li>
- * </ul>
- * </p>
- *
- * @see org.eclipse.jem.internal.beaninfo.BeaninfoPackage#getIndexedPropertyDecorator()
- * @model
- * @generated
- */
-
-
-public interface IndexedPropertyDecorator extends PropertyDecorator{
- /**
- * Returns the value of the '<em><b>Indexed Read Method</b></em>' reference.
- * <!-- begin-user-doc -->
- * <p>
- * If the meaning of the '<em>Indexed Read Method</em>' reference isn't clear,
- * there really should be more of a description here...
- * </p>
- * <!-- end-user-doc -->
- * @return the value of the '<em>Indexed Read Method</em>' reference.
- * @see #isSetIndexedReadMethod()
- * @see #unsetIndexedReadMethod()
- * @see #setIndexedReadMethod(Method)
- * @see org.eclipse.jem.internal.beaninfo.BeaninfoPackage#getIndexedPropertyDecorator_IndexedReadMethod()
- * @model unsettable="true"
- * @generated
- */
- Method getIndexedReadMethod();
-
- /**
- * Sets the value of the '{@link org.eclipse.jem.internal.beaninfo.IndexedPropertyDecorator#getIndexedReadMethod <em>Indexed Read Method</em>}' reference.
- * <!-- begin-user-doc -->
- * <!-- end-user-doc -->
- * @param value the new value of the '<em>Indexed Read Method</em>' reference.
- * @see #isSetIndexedReadMethod()
- * @see #unsetIndexedReadMethod()
- * @see #getIndexedReadMethod()
- * @generated
- */
- void setIndexedReadMethod(Method value);
-
- /**
- * Unsets the value of the '{@link org.eclipse.jem.internal.beaninfo.IndexedPropertyDecorator#getIndexedReadMethod <em>Indexed Read Method</em>}' reference.
- * <!-- begin-user-doc -->
- * <!-- end-user-doc -->
- * @see #isSetIndexedReadMethod()
- * @see #getIndexedReadMethod()
- * @see #setIndexedReadMethod(Method)
- * @generated
- */
- void unsetIndexedReadMethod();
-
- /**
- * Returns whether the value of the '{@link org.eclipse.jem.internal.beaninfo.IndexedPropertyDecorator#getIndexedReadMethod <em>Indexed Read Method</em>}' reference is set.
- * <!-- begin-user-doc -->
- * <!-- end-user-doc -->
- * @return whether the value of the '<em>Indexed Read Method</em>' reference is set.
- * @see #unsetIndexedReadMethod()
- * @see #getIndexedReadMethod()
- * @see #setIndexedReadMethod(Method)
- * @generated
- */
- boolean isSetIndexedReadMethod();
-
- /**
- * Returns the value of the '<em><b>Indexed Write Method</b></em>' reference.
- * <!-- begin-user-doc -->
- * <p>
- * If the meaning of the '<em>Indexed Write Method</em>' reference isn't clear,
- * there really should be more of a description here...
- * </p>
- * <!-- end-user-doc -->
- * @return the value of the '<em>Indexed Write Method</em>' reference.
- * @see #isSetIndexedWriteMethod()
- * @see #unsetIndexedWriteMethod()
- * @see #setIndexedWriteMethod(Method)
- * @see org.eclipse.jem.internal.beaninfo.BeaninfoPackage#getIndexedPropertyDecorator_IndexedWriteMethod()
- * @model unsettable="true"
- * @generated
- */
- Method getIndexedWriteMethod();
-
- /**
- * Sets the value of the '{@link org.eclipse.jem.internal.beaninfo.IndexedPropertyDecorator#getIndexedWriteMethod <em>Indexed Write Method</em>}' reference.
- * <!-- begin-user-doc -->
- * <!-- end-user-doc -->
- * @param value the new value of the '<em>Indexed Write Method</em>' reference.
- * @see #isSetIndexedWriteMethod()
- * @see #unsetIndexedWriteMethod()
- * @see #getIndexedWriteMethod()
- * @generated
- */
- void setIndexedWriteMethod(Method value);
-
- /**
- * Unsets the value of the '{@link org.eclipse.jem.internal.beaninfo.IndexedPropertyDecorator#getIndexedWriteMethod <em>Indexed Write Method</em>}' reference.
- * <!-- begin-user-doc -->
- * <!-- end-user-doc -->
- * @see #isSetIndexedWriteMethod()
- * @see #getIndexedWriteMethod()
- * @see #setIndexedWriteMethod(Method)
- * @generated
- */
- void unsetIndexedWriteMethod();
-
- /**
- * Returns whether the value of the '{@link org.eclipse.jem.internal.beaninfo.IndexedPropertyDecorator#getIndexedWriteMethod <em>Indexed Write Method</em>}' reference is set.
- * <!-- begin-user-doc -->
- * <!-- end-user-doc -->
- * @return whether the value of the '<em>Indexed Write Method</em>' reference is set.
- * @see #unsetIndexedWriteMethod()
- * @see #getIndexedWriteMethod()
- * @see #setIndexedWriteMethod(Method)
- * @generated
- */
- boolean isSetIndexedWriteMethod();
-
-}
diff --git a/plugins/org.eclipse.jem.beaninfo/beaninfo/org/eclipse/jem/internal/beaninfo/MethodDecorator.java b/plugins/org.eclipse.jem.beaninfo/beaninfo/org/eclipse/jem/internal/beaninfo/MethodDecorator.java
deleted file mode 100644
index 3cd3cb8..0000000
--- a/plugins/org.eclipse.jem.beaninfo/beaninfo/org/eclipse/jem/internal/beaninfo/MethodDecorator.java
+++ /dev/null
@@ -1,109 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2001, 2005 IBM Corporation and others.
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
- *
- * Contributors:
- * IBM Corporation - initial API and implementation
- *******************************************************************************/
-package org.eclipse.jem.internal.beaninfo;
-/*
-
-
- */
-
-
-import org.eclipse.emf.common.util.EList;
-/**
- * <!-- begin-user-doc -->
- * A representation of the model object '<em><b>Method Decorator</b></em>'.
- * <!-- end-user-doc -->
- *
- * <!-- begin-model-doc -->
- * Equivalent to MethodDecorator in java.
- * <!-- end-model-doc -->
- *
- * <p>
- * The following features are supported:
- * <ul>
- * <li>{@link org.eclipse.jem.internal.beaninfo.MethodDecorator#isParmsExplicitEmpty <em>Parms Explicit Empty</em>}</li>
- * <li>{@link org.eclipse.jem.internal.beaninfo.MethodDecorator#getParameterDescriptors <em>Parameter Descriptors</em>}</li>
- * <li>{@link org.eclipse.jem.internal.beaninfo.MethodDecorator#getSerParmDesc <em>Ser Parm Desc</em>}</li>
- * </ul>
- * </p>
- *
- * @see org.eclipse.jem.internal.beaninfo.BeaninfoPackage#getMethodDecorator()
- * @model
- * @generated
- */
-
-
-public interface MethodDecorator extends FeatureDecorator{
- /**
- * Returns the value of the '<em><b>Parms Explicit Empty</b></em>' attribute.
- * <!-- begin-user-doc -->
- * <!-- end-user-doc -->
- * <!-- begin-model-doc -->
- * Set true if the parms feature is explicitly set as empty and is not to have parameters merged in from BeanInfo or reflection.
- * <!-- end-model-doc -->
- * @return the value of the '<em>Parms Explicit Empty</em>' attribute.
- * @see #setParmsExplicitEmpty(boolean)
- * @see org.eclipse.jem.internal.beaninfo.BeaninfoPackage#getMethodDecorator_ParmsExplicitEmpty()
- * @model
- * @generated
- */
- boolean isParmsExplicitEmpty();
-
- /**
- * Sets the value of the '{@link org.eclipse.jem.internal.beaninfo.MethodDecorator#isParmsExplicitEmpty <em>Parms Explicit Empty</em>}' attribute.
- * <!-- begin-user-doc -->
- * <!-- end-user-doc -->
- * @param value the new value of the '<em>Parms Explicit Empty</em>' attribute.
- * @see #isParmsExplicitEmpty()
- * @generated
- */
- void setParmsExplicitEmpty(boolean value);
-
- /**
- * Returns the value of the '<em><b>Parameter Descriptors</b></em>' reference list.
- * The list contents are of type {@link org.eclipse.jem.internal.beaninfo.ParameterDecorator}.
- * <!-- begin-user-doc -->
- * <p>
- * If the meaning of the '<em>Parameter Descriptors</em>' containment reference list isn't clear,
- * there really should be more of a description here...
- * </p>
- * <!-- end-user-doc -->
- * <!-- begin-model-doc -->
- * This is the parameter descriptors list.
- * <p>
- * Note: This is a derived setting, which means it will not notify out changes to it. To here changes to it, listen on "serParmDesc" notifications instead.
- * <!-- end-model-doc -->
- * @return the value of the '<em>Parameter Descriptors</em>' reference list.
- * @see org.eclipse.jem.internal.beaninfo.BeaninfoPackage#getMethodDecorator_ParameterDescriptors()
- * @model type="org.eclipse.jem.internal.beaninfo.ParameterDecorator" transient="true" volatile="true" derived="true"
- * @generated
- */
- EList getParameterDescriptors();
-
- /**
- * Returns the value of the '<em><b>Ser Parm Desc</b></em>' containment reference list.
- * The list contents are of type {@link org.eclipse.jem.internal.beaninfo.ParameterDecorator}.
- * <!-- begin-user-doc -->
- * <p>
- * If the meaning of the '<em>Ser Parm Desc</em>' containment reference list isn't clear,
- * there really should be more of a description here...
- * </p>
- * <!-- end-user-doc -->
- * <!-- begin-model-doc -->
- * This is a private feature. It is used internally only.
- * <!-- end-model-doc -->
- * @return the value of the '<em>Ser Parm Desc</em>' containment reference list.
- * @see org.eclipse.jem.internal.beaninfo.BeaninfoPackage#getMethodDecorator_SerParmDesc()
- * @model type="org.eclipse.jem.internal.beaninfo.ParameterDecorator" containment="true"
- * @generated
- */
- EList getSerParmDesc();
-
-}
diff --git a/plugins/org.eclipse.jem.beaninfo/beaninfo/org/eclipse/jem/internal/beaninfo/MethodProxy.java b/plugins/org.eclipse.jem.beaninfo/beaninfo/org/eclipse/jem/internal/beaninfo/MethodProxy.java
deleted file mode 100644
index 3945a75..0000000
--- a/plugins/org.eclipse.jem.beaninfo/beaninfo/org/eclipse/jem/internal/beaninfo/MethodProxy.java
+++ /dev/null
@@ -1,75 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2001, 2005 IBM Corporation and others.
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
- *
- * Contributors:
- * IBM Corporation - initial API and implementation
- *******************************************************************************/
-package org.eclipse.jem.internal.beaninfo;
-/*
-
-
- */
-
-
-import org.eclipse.emf.ecore.EOperation;
-
-import org.eclipse.jem.java.Method;
-
-/**
- * <!-- begin-user-doc -->
- * A representation of the model object '<em><b>Method Proxy</b></em>'.
- * <!-- end-user-doc -->
- *
- * <!-- begin-model-doc -->
- * This is just a wrapper of a java Method. It allows access to the method but doesn't duplicate the interface for it.
- * <p>
- * MethodProxies will be in the eBehaviors setting for any methods that are in the JavaClass methods setting so that they are not duplicated.
- * <p>
- * MethodProxies would also have MethodDecorators.
- * <!-- end-model-doc -->
- *
- * <p>
- * The following features are supported:
- * <ul>
- * <li>{@link org.eclipse.jem.internal.beaninfo.MethodProxy#getMethod <em>Method</em>}</li>
- * </ul>
- * </p>
- *
- * @see org.eclipse.jem.internal.beaninfo.BeaninfoPackage#getMethodProxy()
- * @model
- * @generated
- */
-
-
-public interface MethodProxy extends EOperation{
- /**
- * Returns the value of the '<em><b>Method</b></em>' reference.
- * <!-- begin-user-doc -->
- * <p>
- * If the meaning of the '<em>Method</em>' reference isn't clear,
- * there really should be more of a description here...
- * </p>
- * <!-- end-user-doc -->
- * @return the value of the '<em>Method</em>' reference.
- * @see #setMethod(Method)
- * @see org.eclipse.jem.internal.beaninfo.BeaninfoPackage#getMethodProxy_Method()
- * @model required="true"
- * @generated
- */
- Method getMethod();
-
- /**
- * Sets the value of the '{@link org.eclipse.jem.internal.beaninfo.MethodProxy#getMethod <em>Method</em>}' reference.
- * <!-- begin-user-doc -->
- * <!-- end-user-doc -->
- * @param value the new value of the '<em>Method</em>' reference.
- * @see #getMethod()
- * @generated
- */
- void setMethod(Method value);
-
-}
diff --git a/plugins/org.eclipse.jem.beaninfo/beaninfo/org/eclipse/jem/internal/beaninfo/ParameterDecorator.java b/plugins/org.eclipse.jem.beaninfo/beaninfo/org/eclipse/jem/internal/beaninfo/ParameterDecorator.java
deleted file mode 100644
index 485f9b8..0000000
--- a/plugins/org.eclipse.jem.beaninfo/beaninfo/org/eclipse/jem/internal/beaninfo/ParameterDecorator.java
+++ /dev/null
@@ -1,97 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2001, 2005 IBM Corporation and others.
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
- *
- * Contributors:
- * IBM Corporation - initial API and implementation
- *******************************************************************************/
-package org.eclipse.jem.internal.beaninfo;
-/*
-
-
- */
-
-
-import org.eclipse.jem.java.JavaParameter;
-/**
- * <!-- begin-user-doc -->
- * A representation of the model object '<em><b>Parameter Decorator</b></em>'.
- * <!-- end-user-doc -->
- *
- * <p>
- * The following features are supported:
- * <ul>
- * <li>{@link org.eclipse.jem.internal.beaninfo.ParameterDecorator#getName <em>Name</em>}</li>
- * <li>{@link org.eclipse.jem.internal.beaninfo.ParameterDecorator#getParameter <em>Parameter</em>}</li>
- * </ul>
- * </p>
- *
- * @see org.eclipse.jem.internal.beaninfo.BeaninfoPackage#getParameterDecorator()
- * @model
- * @generated
- */
-
-
-public interface ParameterDecorator extends FeatureDecorator{
- /**
- * Returns the value of the '<em><b>Name</b></em>' attribute.
- * <!-- begin-user-doc -->
- * <p>
- * If the meaning of the '<em>Name</em>' attribute isn't clear,
- * there really should be more of a description here...
- * </p>
- * <!-- end-user-doc -->
- * <!-- begin-model-doc -->
- * The name is explicit here because unlike the other feature decorators, the name does not come from the object being decorated.
- * <!-- end-model-doc -->
- * @return the value of the '<em>Name</em>' attribute.
- * @see #setName(String)
- * @see org.eclipse.jem.internal.beaninfo.BeaninfoPackage#getParameterDecorator_Name()
- * @model
- * @generated
- */
- String getName();
-
- /**
- * Sets the value of the '{@link org.eclipse.jem.internal.beaninfo.ParameterDecorator#getName <em>Name</em>}' attribute.
- * <!-- begin-user-doc -->
- * <!-- end-user-doc -->
- * @param value the new value of the '<em>Name</em>' attribute.
- * @see #getName()
- * @generated
- */
- void setName(String value);
-
- /**
- * Returns the value of the '<em><b>Parameter</b></em>' reference.
- * <!-- begin-user-doc -->
- * <p>
- * If the meaning of the '<em>Parameter</em>' reference isn't clear,
- * there really should be more of a description here...
- * </p>
- * <!-- end-user-doc -->
- * <!-- begin-model-doc -->
- * The JavaParameter that this ParameterDecorator is decorating. Can't use eDecorates in this.
- * <!-- end-model-doc -->
- * @return the value of the '<em>Parameter</em>' reference.
- * @see #setParameter(JavaParameter)
- * @see org.eclipse.jem.internal.beaninfo.BeaninfoPackage#getParameterDecorator_Parameter()
- * @model transient="true"
- * @generated
- */
- JavaParameter getParameter();
-
- /**
- * Sets the value of the '{@link org.eclipse.jem.internal.beaninfo.ParameterDecorator#getParameter <em>Parameter</em>}' reference.
- * <!-- begin-user-doc -->
- * <!-- end-user-doc -->
- * @param value the new value of the '<em>Parameter</em>' reference.
- * @see #getParameter()
- * @generated
- */
- void setParameter(JavaParameter value);
-
-}
diff --git a/plugins/org.eclipse.jem.beaninfo/beaninfo/org/eclipse/jem/internal/beaninfo/PropertyDecorator.java b/plugins/org.eclipse.jem.beaninfo/beaninfo/org/eclipse/jem/internal/beaninfo/PropertyDecorator.java
deleted file mode 100644
index 6977b47..0000000
--- a/plugins/org.eclipse.jem.beaninfo/beaninfo/org/eclipse/jem/internal/beaninfo/PropertyDecorator.java
+++ /dev/null
@@ -1,513 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2001, 2005 IBM Corporation and others.
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
- *
- * Contributors:
- * IBM Corporation - initial API and implementation
- *******************************************************************************/
-package org.eclipse.jem.internal.beaninfo;
-/*
-
-
- */
-
-
-import org.eclipse.emf.common.util.EList;
-import org.eclipse.emf.ecore.EClassifier;
-
-import org.eclipse.jem.java.Field;
-import org.eclipse.jem.java.JavaClass;
-import org.eclipse.jem.java.Method;
-/**
- * <!-- begin-user-doc -->
- * A representation of the model object '<em><b>Property Decorator</b></em>'.
- * <!-- end-user-doc -->
- *
- * <!-- begin-model-doc -->
- * Equivalent to PropertyDecorator in java.
- * <!-- end-model-doc -->
- *
- * <p>
- * The following features are supported:
- * <ul>
- * <li>{@link org.eclipse.jem.internal.beaninfo.PropertyDecorator#isBound <em>Bound</em>}</li>
- * <li>{@link org.eclipse.jem.internal.beaninfo.PropertyDecorator#isConstrained <em>Constrained</em>}</li>
- * <li>{@link org.eclipse.jem.internal.beaninfo.PropertyDecorator#isDesignTime <em>Design Time</em>}</li>
- * <li>{@link org.eclipse.jem.internal.beaninfo.PropertyDecorator#isAlwaysIncompatible <em>Always Incompatible</em>}</li>
- * <li>{@link org.eclipse.jem.internal.beaninfo.PropertyDecorator#getFilterFlags <em>Filter Flags</em>}</li>
- * <li>{@link org.eclipse.jem.internal.beaninfo.PropertyDecorator#isFieldReadOnly <em>Field Read Only</em>}</li>
- * <li>{@link org.eclipse.jem.internal.beaninfo.PropertyDecorator#getPropertyEditorClass <em>Property Editor Class</em>}</li>
- * <li>{@link org.eclipse.jem.internal.beaninfo.PropertyDecorator#getReadMethod <em>Read Method</em>}</li>
- * <li>{@link org.eclipse.jem.internal.beaninfo.PropertyDecorator#getWriteMethod <em>Write Method</em>}</li>
- * <li>{@link org.eclipse.jem.internal.beaninfo.PropertyDecorator#getField <em>Field</em>}</li>
- * </ul>
- * </p>
- *
- * @see org.eclipse.jem.internal.beaninfo.BeaninfoPackage#getPropertyDecorator()
- * @model
- * @generated
- */
-
-
-public interface PropertyDecorator extends FeatureDecorator{
- /**
- * Returns the value of the '<em><b>Bound</b></em>' attribute.
- * <!-- begin-user-doc -->
- * <p>
- * If the meaning of the '<em>Bound</em>' attribute isn't clear,
- * there really should be more of a description here...
- * </p>
- * <!-- end-user-doc -->
- * @return the value of the '<em>Bound</em>' attribute.
- * @see #isSetBound()
- * @see #unsetBound()
- * @see #setBound(boolean)
- * @see org.eclipse.jem.internal.beaninfo.BeaninfoPackage#getPropertyDecorator_Bound()
- * @model unsettable="true"
- * @generated
- */
- boolean isBound();
-
- /**
- * Sets the value of the '{@link org.eclipse.jem.internal.beaninfo.PropertyDecorator#isBound <em>Bound</em>}' attribute.
- * <!-- begin-user-doc -->
- * <!-- end-user-doc -->
- * @param value the new value of the '<em>Bound</em>' attribute.
- * @see #isSetBound()
- * @see #unsetBound()
- * @see #isBound()
- * @generated
- */
- void setBound(boolean value);
-
- /**
- * Unsets the value of the '{@link org.eclipse.jem.internal.beaninfo.PropertyDecorator#isBound <em>Bound</em>}' attribute.
- * <!-- begin-user-doc -->
- * <!-- end-user-doc -->
- * @see #isSetBound()
- * @see #isBound()
- * @see #setBound(boolean)
- * @generated
- */
- void unsetBound();
-
- /**
- * Returns whether the value of the '{@link org.eclipse.jem.internal.beaninfo.PropertyDecorator#isBound <em>Bound</em>}' attribute is set.
- * <!-- begin-user-doc -->
- * <!-- end-user-doc -->
- * @return whether the value of the '<em>Bound</em>' attribute is set.
- * @see #unsetBound()
- * @see #isBound()
- * @see #setBound(boolean)
- * @generated
- */
- boolean isSetBound();
-
- /**
- * Returns the value of the '<em><b>Constrained</b></em>' attribute.
- * <!-- begin-user-doc -->
- * <p>
- * If the meaning of the '<em>Constrained</em>' attribute isn't clear,
- * there really should be more of a description here...
- * </p>
- * <!-- end-user-doc -->
- * @return the value of the '<em>Constrained</em>' attribute.
- * @see #isSetConstrained()
- * @see #unsetConstrained()
- * @see #setConstrained(boolean)
- * @see org.eclipse.jem.internal.beaninfo.BeaninfoPackage#getPropertyDecorator_Constrained()
- * @model unsettable="true"
- * @generated
- */
- boolean isConstrained();
-
- /**
- * Sets the value of the '{@link org.eclipse.jem.internal.beaninfo.PropertyDecorator#isConstrained <em>Constrained</em>}' attribute.
- * <!-- begin-user-doc -->
- * <!-- end-user-doc -->
- * @param value the new value of the '<em>Constrained</em>' attribute.
- * @see #isSetConstrained()
- * @see #unsetConstrained()
- * @see #isConstrained()
- * @generated
- */
- void setConstrained(boolean value);
-
- /**
- * Unsets the value of the '{@link org.eclipse.jem.internal.beaninfo.PropertyDecorator#isConstrained <em>Constrained</em>}' attribute.
- * <!-- begin-user-doc -->
- * <!-- end-user-doc -->
- * @see #isSetConstrained()
- * @see #isConstrained()
- * @see #setConstrained(boolean)
- * @generated
- */
- void unsetConstrained();
-
- /**
- * Returns whether the value of the '{@link org.eclipse.jem.internal.beaninfo.PropertyDecorator#isConstrained <em>Constrained</em>}' attribute is set.
- * <!-- begin-user-doc -->
- * <!-- end-user-doc -->
- * @return whether the value of the '<em>Constrained</em>' attribute is set.
- * @see #unsetConstrained()
- * @see #isConstrained()
- * @see #setConstrained(boolean)
- * @generated
- */
- boolean isSetConstrained();
-
- /**
- * Returns the value of the '<em><b>Design Time</b></em>' attribute.
- * <!-- begin-user-doc -->
- * <p>
- * If the meaning of the '<em>Design Time</em>' attribute isn't clear,
- * there really should be more of a description here...
- * </p>
- * <!-- end-user-doc -->
- * <!-- begin-model-doc -->
- * If not set, then normal default processing.
- *
- * If set true, then this property is a design time property. This means it will show up in the property sheet, but it won't be able to be connected to at runtime. It may not even be a true bean property but instead the builder will know how to handle it.
- *
- * If set false, then this property will not show up on the property sheet, but will be able to be connected to for runtime.
- * <!-- end-model-doc -->
- * @return the value of the '<em>Design Time</em>' attribute.
- * @see #isSetDesignTime()
- * @see #unsetDesignTime()
- * @see #setDesignTime(boolean)
- * @see org.eclipse.jem.internal.beaninfo.BeaninfoPackage#getPropertyDecorator_DesignTime()
- * @model unsettable="true"
- * @generated
- */
- boolean isDesignTime();
-
- /**
- * Sets the value of the '{@link org.eclipse.jem.internal.beaninfo.PropertyDecorator#isDesignTime <em>Design Time</em>}' attribute.
- * <!-- begin-user-doc -->
- * <!-- end-user-doc -->
- * @param value the new value of the '<em>Design Time</em>' attribute.
- * @see #isSetDesignTime()
- * @see #unsetDesignTime()
- * @see #isDesignTime()
- * @generated
- */
- void setDesignTime(boolean value);
-
- /**
- * Unsets the value of the '{@link org.eclipse.jem.internal.beaninfo.PropertyDecorator#isDesignTime <em>Design Time</em>}' attribute.
- * <!-- begin-user-doc -->
- * <!-- end-user-doc -->
- * @see #isSetDesignTime()
- * @see #isDesignTime()
- * @see #setDesignTime(boolean)
- * @generated
- */
- void unsetDesignTime();
-
- /**
- * Returns whether the value of the '{@link org.eclipse.jem.internal.beaninfo.PropertyDecorator#isDesignTime <em>Design Time</em>}' attribute is set.
- * <!-- begin-user-doc -->
- * <!-- end-user-doc -->
- * @return whether the value of the '<em>Design Time</em>' attribute is set.
- * @see #unsetDesignTime()
- * @see #isDesignTime()
- * @see #setDesignTime(boolean)
- * @generated
- */
- boolean isSetDesignTime();
-
- /**
- * Returns the value of the '<em><b>Always Incompatible</b></em>' attribute.
- * <!-- begin-user-doc -->
- * <p>
- * If the meaning of the '<em>Always Incompatible</em>' attribute isn't clear,
- * there really should be more of a description here...
- * </p>
- * <!-- end-user-doc -->
- * <!-- begin-model-doc -->
- * If set true, then when multiple objects are selected, this property is always incompatible with each other. So in this case the property will not show up on the property sheet if more than one object has been selected.
- * <!-- end-model-doc -->
- * @return the value of the '<em>Always Incompatible</em>' attribute.
- * @see #setAlwaysIncompatible(boolean)
- * @see org.eclipse.jem.internal.beaninfo.BeaninfoPackage#getPropertyDecorator_AlwaysIncompatible()
- * @model
- * @generated
- */
- boolean isAlwaysIncompatible();
-
- /**
- * Sets the value of the '{@link org.eclipse.jem.internal.beaninfo.PropertyDecorator#isAlwaysIncompatible <em>Always Incompatible</em>}' attribute.
- * <!-- begin-user-doc -->
- * <!-- end-user-doc -->
- * @param value the new value of the '<em>Always Incompatible</em>' attribute.
- * @see #isAlwaysIncompatible()
- * @generated
- */
- void setAlwaysIncompatible(boolean value);
-
- /**
- * Returns the value of the '<em><b>Filter Flags</b></em>' attribute list.
- * The list contents are of type {@link java.lang.String}.
- * <!-- begin-user-doc -->
- * <p>
- * If the meaning of the '<em>Filter Flags</em>' attribute list isn't clear,
- * there really should be more of a description here...
- * </p>
- * <!-- end-user-doc -->
- * @return the value of the '<em>Filter Flags</em>' attribute list.
- * @see org.eclipse.jem.internal.beaninfo.BeaninfoPackage#getPropertyDecorator_FilterFlags()
- * @model type="java.lang.String"
- * @generated
- */
- EList getFilterFlags();
-
- /**
- * Returns the value of the '<em><b>Field Read Only</b></em>' attribute.
- * <!-- begin-user-doc -->
- * <!-- end-user-doc -->
- * <!-- begin-model-doc -->
- * Is this field read-only (i.e. is a "final" field). This is only referenced if the field reference is set.
- * <!-- end-model-doc -->
- * @return the value of the '<em>Field Read Only</em>' attribute.
- * @see #setFieldReadOnly(boolean)
- * @see org.eclipse.jem.internal.beaninfo.BeaninfoPackage#getPropertyDecorator_FieldReadOnly()
- * @model
- * @generated
- */
- boolean isFieldReadOnly();
-
- /**
- * Sets the value of the '{@link org.eclipse.jem.internal.beaninfo.PropertyDecorator#isFieldReadOnly <em>Field Read Only</em>}' attribute.
- * <!-- begin-user-doc -->
- * <!-- end-user-doc -->
- * @param value the new value of the '<em>Field Read Only</em>' attribute.
- * @see #isFieldReadOnly()
- * @generated
- */
- void setFieldReadOnly(boolean value);
-
- /**
- * Returns the value of the '<em><b>Property Editor Class</b></em>' reference.
- * <!-- begin-user-doc -->
- * <p>
- * If the meaning of the '<em>Property Editor Class</em>' reference isn't clear,
- * there really should be more of a description here...
- * </p>
- * <!-- end-user-doc -->
- * @return the value of the '<em>Property Editor Class</em>' reference.
- * @see #setPropertyEditorClass(JavaClass)
- * @see org.eclipse.jem.internal.beaninfo.BeaninfoPackage#getPropertyDecorator_PropertyEditorClass()
- * @model
- * @generated
- */
- JavaClass getPropertyEditorClass();
-
- /**
- * Sets the value of the '{@link org.eclipse.jem.internal.beaninfo.PropertyDecorator#getPropertyEditorClass <em>Property Editor Class</em>}' reference.
- * <!-- begin-user-doc -->
- * <!-- end-user-doc -->
- * @param value the new value of the '<em>Property Editor Class</em>' reference.
- * @see #getPropertyEditorClass()
- * @generated
- */
- void setPropertyEditorClass(JavaClass value);
-
- /**
- * Returns the value of the '<em><b>Read Method</b></em>' reference.
- * <!-- begin-user-doc -->
- * <p>
- * If the meaning of the '<em>Read Method</em>' reference isn't clear,
- * there really should be more of a description here...
- * </p>
- * <!-- end-user-doc -->
- * @return the value of the '<em>Read Method</em>' reference.
- * @see #isSetReadMethod()
- * @see #unsetReadMethod()
- * @see #setReadMethod(Method)
- * @see org.eclipse.jem.internal.beaninfo.BeaninfoPackage#getPropertyDecorator_ReadMethod()
- * @model unsettable="true"
- * @generated
- */
- Method getReadMethod();
-
- /**
- * Sets the value of the '{@link org.eclipse.jem.internal.beaninfo.PropertyDecorator#getReadMethod <em>Read Method</em>}' reference.
- * <!-- begin-user-doc -->
- * <!-- end-user-doc -->
- * @param value the new value of the '<em>Read Method</em>' reference.
- * @see #isSetReadMethod()
- * @see #unsetReadMethod()
- * @see #getReadMethod()
- * @generated
- */
- void setReadMethod(Method value);
-
- /**
- * Unsets the value of the '{@link org.eclipse.jem.internal.beaninfo.PropertyDecorator#getReadMethod <em>Read Method</em>}' reference.
- * <!-- begin-user-doc -->
- * <!-- end-user-doc -->
- * @see #isSetReadMethod()
- * @see #getReadMethod()
- * @see #setReadMethod(Method)
- * @generated
- */
- void unsetReadMethod();
-
- /**
- * Returns whether the value of the '{@link org.eclipse.jem.internal.beaninfo.PropertyDecorator#getReadMethod <em>Read Method</em>}' reference is set.
- * <!-- begin-user-doc -->
- * <!-- end-user-doc -->
- * @return whether the value of the '<em>Read Method</em>' reference is set.
- * @see #unsetReadMethod()
- * @see #getReadMethod()
- * @see #setReadMethod(Method)
- * @generated
- */
- boolean isSetReadMethod();
-
- /**
- * Returns the value of the '<em><b>Write Method</b></em>' reference.
- * <!-- begin-user-doc -->
- * <p>
- * If the meaning of the '<em>Write Method</em>' reference isn't clear,
- * there really should be more of a description here...
- * </p>
- * <!-- end-user-doc -->
- * @return the value of the '<em>Write Method</em>' reference.
- * @see #isSetWriteMethod()
- * @see #unsetWriteMethod()
- * @see #setWriteMethod(Method)
- * @see org.eclipse.jem.internal.beaninfo.BeaninfoPackage#getPropertyDecorator_WriteMethod()
- * @model unsettable="true"
- * @generated
- */
- Method getWriteMethod();
-
- /**
- * Sets the value of the '{@link org.eclipse.jem.internal.beaninfo.PropertyDecorator#getWriteMethod <em>Write Method</em>}' reference.
- * <!-- begin-user-doc -->
- * <!-- end-user-doc -->
- * @param value the new value of the '<em>Write Method</em>' reference.
- * @see #isSetWriteMethod()
- * @see #unsetWriteMethod()
- * @see #getWriteMethod()
- * @generated
- */
- void setWriteMethod(Method value);
-
- /**
- * Unsets the value of the '{@link org.eclipse.jem.internal.beaninfo.PropertyDecorator#getWriteMethod <em>Write Method</em>}' reference.
- * <!-- begin-user-doc -->
- * <!-- end-user-doc -->
- * @see #isSetWriteMethod()
- * @see #getWriteMethod()
- * @see #setWriteMethod(Method)
- * @generated
- */
- void unsetWriteMethod();
-
- /**
- * Returns whether the value of the '{@link org.eclipse.jem.internal.beaninfo.PropertyDecorator#getWriteMethod <em>Write Method</em>}' reference is set.
- * <!-- begin-user-doc -->
- * <!-- end-user-doc -->
- * @return whether the value of the '<em>Write Method</em>' reference is set.
- * @see #unsetWriteMethod()
- * @see #getWriteMethod()
- * @see #setWriteMethod(Method)
- * @generated
- */
- boolean isSetWriteMethod();
-
- /**
- * Returns the value of the '<em><b>Field</b></em>' reference.
- * <!-- begin-user-doc -->
- * <!-- end-user-doc -->
- * <!-- begin-model-doc -->
- * If this is set, then this property is a field and not a getter/setter property. This is an extension that the Visual Editor uses to the BeanInfo model.
- * <!-- end-model-doc -->
- * @return the value of the '<em>Field</em>' reference.
- * @see #isSetField()
- * @see #unsetField()
- * @see #setField(Field)
- * @see org.eclipse.jem.internal.beaninfo.BeaninfoPackage#getPropertyDecorator_Field()
- * @model unsettable="true"
- * @generated
- */
- Field getField();
-
- /**
- * Sets the value of the '{@link org.eclipse.jem.internal.beaninfo.PropertyDecorator#getField <em>Field</em>}' reference.
- * <!-- begin-user-doc -->
- * <!-- end-user-doc -->
- * @param value the new value of the '<em>Field</em>' reference.
- * @see #isSetField()
- * @see #unsetField()
- * @see #getField()
- * @generated
- */
- void setField(Field value);
-
- /**
- * Unsets the value of the '{@link org.eclipse.jem.internal.beaninfo.PropertyDecorator#getField <em>Field</em>}' reference.
- * <!-- begin-user-doc -->
- * <!-- end-user-doc -->
- * @see #isSetField()
- * @see #getField()
- * @see #setField(Field)
- * @generated
- */
- void unsetField();
-
- /**
- * Returns whether the value of the '{@link org.eclipse.jem.internal.beaninfo.PropertyDecorator#getField <em>Field</em>}' reference is set.
- * <!-- begin-user-doc -->
- * <!-- end-user-doc -->
- * @return whether the value of the '<em>Field</em>' reference is set.
- * @see #unsetField()
- * @see #getField()
- * @see #setField(Field)
- * @generated
- */
- boolean isSetField();
-
- /**
- * <!-- begin-user-doc -->
- * <!-- end-user-doc -->
- * <!-- begin-model-doc -->
- * Get the property type.
- * <!-- end-model-doc -->
- * @model kind="operation"
- * @generated
- */
- EClassifier getPropertyType();
-
- /**
- * <!-- begin-user-doc -->
- * This property type is not persisted if this class is serialized into an XMI file. Nor is
- * it a property that can be set from an XMI file. It is an operation. It is used by
- * clients which want a PropertyDecorator that is not part of a BeanInfo model.
- * <!-- end-user-doc -->
- * <!-- begin-model-doc -->
- * Set the property type.
- * <!-- end-model-doc -->
- * @model
- * @generated
- */
- void setPropertyType(EClassifier propertyType);
-
- /**
- * @return boolean for whether this property is writeable or not
- * It could have a write method or it could have a field (e.g. java.awt.Insets.top)
- */
- boolean isWriteable();
-
- /**
- * @return boolean for whether this property is readable or not
- * It could have a read method or it could have a field (e.g. java.awt.Insets.top)
- */
- boolean isReadable();
-
-}
diff --git a/plugins/org.eclipse.jem.beaninfo/beaninfo/org/eclipse/jem/internal/beaninfo/adapters/BeanInfoAdapterMessages.java b/plugins/org.eclipse.jem.beaninfo/beaninfo/org/eclipse/jem/internal/beaninfo/adapters/BeanInfoAdapterMessages.java
deleted file mode 100644
index 2b49711..0000000
--- a/plugins/org.eclipse.jem.beaninfo/beaninfo/org/eclipse/jem/internal/beaninfo/adapters/BeanInfoAdapterMessages.java
+++ /dev/null
@@ -1,31 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2000, 2005 IBM Corporation and others.
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
- *
- * Contributors:
- * IBM Corporation - initial API and implementation
- *******************************************************************************/
-package org.eclipse.jem.internal.beaninfo.adapters;
-
-import org.eclipse.osgi.util.NLS;
-
-public final class BeanInfoAdapterMessages extends NLS {
-
- private static final String BUNDLE_NAME = "org.eclipse.jem.internal.beaninfo.adapters.messages";//$NON-NLS-1$
-
- private BeanInfoAdapterMessages() {
- // Do not instantiate
- }
-
- public static String INTROSPECT_FAILED_EXC_;
- public static String BeaninfoClassAdapter_ClassNotFound;
- public static String BeaninfoNature_InvalidProject;
- public static String UICreateRegistryJobHandler_StartBeaninfoRegistry;
-
- static {
- NLS.initializeMessages(BUNDLE_NAME, BeanInfoAdapterMessages.class);
- }
-}
\ No newline at end of file
diff --git a/plugins/org.eclipse.jem.beaninfo/beaninfo/org/eclipse/jem/internal/beaninfo/adapters/BeanInfoDecoratorUtility.java b/plugins/org.eclipse.jem.beaninfo/beaninfo/org/eclipse/jem/internal/beaninfo/adapters/BeanInfoDecoratorUtility.java
deleted file mode 100644
index 85d65f9..0000000
--- a/plugins/org.eclipse.jem.beaninfo/beaninfo/org/eclipse/jem/internal/beaninfo/adapters/BeanInfoDecoratorUtility.java
+++ /dev/null
@@ -1,1457 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2005, 2006 IBM Corporation and others.
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
- *
- * Contributors:
- * IBM Corporation - initial API and implementation
- *******************************************************************************/
-/*
-
-
- */
-package org.eclipse.jem.internal.beaninfo.adapters;
-
-import java.io.*;
-import java.util.*;
-
-import org.eclipse.emf.common.util.EMap;
-import org.eclipse.emf.common.util.URI;
-import org.eclipse.emf.ecore.*;
-import org.eclipse.emf.ecore.change.*;
-import org.eclipse.emf.ecore.util.EcoreUtil;
-
-import org.eclipse.jem.internal.beaninfo.*;
-import org.eclipse.jem.internal.beaninfo.common.*;
-import org.eclipse.jem.internal.beaninfo.core.BeaninfoPlugin;
-import org.eclipse.jem.internal.beaninfo.core.Utilities;
-import org.eclipse.jem.internal.beaninfo.impl.*;
-import org.eclipse.jem.internal.proxy.core.*;
-import org.eclipse.jem.java.*;
-
-/**
- * This is a utility class for handling the BeanInfo decorators with respect to the overrides (explicit settings) vs. introspected/reflected (implicit
- * settings) It handles the transmission of data from the VM for introspection.
- * @since 1.1.0
- */
-public class BeanInfoDecoratorUtility {
-
- /**
- * Clear out the implicit settings for FeatureDecorator.
- *
- * @param decor
- *
- * @since 1.1.0
- */
- public static void clear(FeatureDecorator decor) {
- long implicitSettings = decor.getImplicitlySetBits();
- // For each setting, see if it was implicitly set, and if it was, then unset it.
- if ((implicitSettings & FeatureDecoratorImpl.FEATURE_DISPLAYNAME_IMPLICIT) != 0)
- decor.unsetDisplayName();
- if ((implicitSettings & FeatureDecoratorImpl.FEATURE_SHORTDESC_IMPLICIT) != 0)
- decor.unsetShortDescription();
- if ((implicitSettings & FeatureDecoratorImpl.FEATURE_CATEGORY_IMPLICIT) != 0)
- decor.eUnset(BeaninfoPackage.eINSTANCE.getFeatureDecorator_Category());
- if ((implicitSettings & FeatureDecoratorImpl.FEATURE_EXPERT_IMPLICIT) != 0)
- decor.unsetExpert();
- if ((implicitSettings & FeatureDecoratorImpl.FEATURE_HIDDEN_IMPLICIT) != 0)
- decor.unsetHidden();
- if ((implicitSettings & FeatureDecoratorImpl.FEATURE_PREFERRED_IMPLICIT) != 0)
- decor.unsetPreferred();
- if ((implicitSettings & FeatureDecoratorImpl.FEATURE_ATTRIBUTES_IMPLICIT) != 0) {
- for (Iterator itr = decor.getAttributes().listIterator(); itr.hasNext();) {
- FeatureAttributeMapEntryImpl entry = (FeatureAttributeMapEntryImpl)itr.next();
- if (entry.getTypedValue().isImplicitValue()) {
- itr.remove();
- }
- }
- }
- decor
- .setImplicitlySetBits(implicitSettings
- & ~(FeatureDecoratorImpl.FEATURE_DISPLAYNAME_IMPLICIT | FeatureDecoratorImpl.FEATURE_SHORTDESC_IMPLICIT
- | FeatureDecoratorImpl.FEATURE_CATEGORY_IMPLICIT | FeatureDecoratorImpl.FEATURE_EXPERT_IMPLICIT
- | FeatureDecoratorImpl.FEATURE_HIDDEN_IMPLICIT | FeatureDecoratorImpl.FEATURE_PREFERRED_IMPLICIT | FeatureDecoratorImpl.FEATURE_ATTRIBUTES_IMPLICIT));
- }
-
- /**
- * Clear out the implicit settings for BeanDecorator
- *
- * @param decor
- *
- * @since 1.1.0
- */
- public static void clear(BeanDecorator decor) {
- clear((FeatureDecorator) decor);
- long implicitSettings = decor.getImplicitlySetBits();
- // For each setting, see if it was implicitly set, and if it was, then unset it.
- if ((implicitSettings & BeanDecoratorImpl.BEAN_CUSTOMIZER_IMPLICIT) != 0)
- decor.eUnset(BeaninfoPackage.eINSTANCE.getBeanDecorator_CustomizerClass());
- if ((implicitSettings & BeanDecoratorImpl.BEAN_MERGE_INHERITED_PROPERTIES_IMPLICIT) != 0)
- decor.unsetMergeSuperProperties();
- if ((implicitSettings & BeanDecoratorImpl.BEAN_MERGE_INHERITED_OPERATIONS_IMPLICIT) != 0)
- decor.unsetMergeSuperMethods();
- if ((implicitSettings & BeanDecoratorImpl.BEAN_MERGE_INHERITED_EVENTS_IMPLICIT) != 0)
- decor.unsetMergeSuperEvents();
- if (decor.eIsSet(BeaninfoPackage.eINSTANCE.getBeanDecorator_NotInheritedPropertyNames()))
- decor.eUnset(BeaninfoPackage.eINSTANCE.getBeanDecorator_NotInheritedPropertyNames()); // Just clear them. This is our attribute. It should
- // not be set overrides.
- if (decor.eIsSet(BeaninfoPackage.eINSTANCE.getBeanDecorator_NotInheritedMethodNames()))
- decor.eUnset(BeaninfoPackage.eINSTANCE.getBeanDecorator_NotInheritedMethodNames()); // Just clear them. This is our attribute. It should
- // not be set overrides.
- if (decor.eIsSet(BeaninfoPackage.eINSTANCE.getBeanDecorator_NotInheritedEventNames()))
- decor.eUnset(BeaninfoPackage.eINSTANCE.getBeanDecorator_NotInheritedEventNames()); // Just clear them. This is our attribute. It should not
- // be set overrides.
-
- decor.setImplicitlySetBits(implicitSettings
- & ~(BeanDecoratorImpl.BEAN_CUSTOMIZER_IMPLICIT | BeanDecoratorImpl.BEAN_MERGE_INHERITED_PROPERTIES_IMPLICIT
- | BeanDecoratorImpl.BEAN_MERGE_INHERITED_OPERATIONS_IMPLICIT | BeanDecoratorImpl.BEAN_MERGE_INHERITED_EVENTS_IMPLICIT));
- }
-
- /**
- * Clear out the implicit settings of the PropertyDecorator.
- *
- * @param decor
- *
- * @since 1.1.0
- */
- public static void clear(PropertyDecorator decor) {
- clear((FeatureDecorator) decor);
- long implicitSettings = decor.getImplicitlySetBits();
- // For each setting, see if it was implicitly set, and if it was, then unset it.
- if ((implicitSettings & PropertyDecoratorImpl.PROPERTY_EDITOR_CLASS_IMPLICIT) != 0)
- decor.eUnset(BeaninfoPackage.eINSTANCE.getPropertyDecorator_PropertyEditorClass());
- if ((implicitSettings & PropertyDecoratorImpl.PROPERTY_READMETHOD_IMPLICIT) != 0)
- decor.unsetReadMethod();
- if ((implicitSettings & PropertyDecoratorImpl.PROPERTY_WRITEMETHOD_IMPLICIT) != 0)
- decor.unsetWriteMethod();
- if ((implicitSettings & PropertyDecoratorImpl.PROPERTY_FIELD_IMPLICIT) != 0) {
- decor.unsetField();
- decor.eUnset(BeaninfoPackage.eINSTANCE.getPropertyDecorator_Field());
- }
- if ((implicitSettings & PropertyDecoratorImpl.PROPERTY_BOUND_IMPLICIT) != 0)
- decor.unsetBound();
- if ((implicitSettings & PropertyDecoratorImpl.PROPERTY_CONSTRAINED_IMPLICIT) != 0)
- decor.unsetConstrained();
- if ((implicitSettings & PropertyDecoratorImpl.PROPERTY_DESIGNTIME_IMPLICIT) != 0)
- decor.unsetDesignTime();
- decor.setImplicitlySetBits(implicitSettings
- & ~(PropertyDecoratorImpl.PROPERTY_EDITOR_CLASS_IMPLICIT | PropertyDecoratorImpl.PROPERTY_READMETHOD_IMPLICIT
- | PropertyDecoratorImpl.PROPERTY_WRITEMETHOD_IMPLICIT | PropertyDecoratorImpl.PROPERTY_BOUND_IMPLICIT
- | PropertyDecoratorImpl.PROPERTY_CONSTRAINED_IMPLICIT | PropertyDecoratorImpl.PROPERTY_DESIGNTIME_IMPLICIT));
- }
-
- /**
- * Clear out the implicit settings of the IndexedPropertyDecorator.
- *
- * @param decor
- *
- * @since 1.1.0
- */
- public static void clear(IndexedPropertyDecorator decor) {
- clear((PropertyDecorator) decor);
- long implicitSettings = decor.getImplicitlySetBits();
- // For each setting, see if it was implicitly set, and if it was, then unset it.
- if ((implicitSettings & IndexedPropertyDecoratorImpl.INDEXED_READMETHOD_IMPLICIT) != 0)
- decor.unsetIndexedReadMethod();
- if ((implicitSettings & IndexedPropertyDecoratorImpl.INDEXED_WRITEMETHOD_IMPLICIT) != 0)
- decor.unsetIndexedWriteMethod();
- decor.setImplicitlySetBits(implicitSettings
- & ~(IndexedPropertyDecoratorImpl.INDEXED_READMETHOD_IMPLICIT | IndexedPropertyDecoratorImpl.INDEXED_WRITEMETHOD_IMPLICIT));
- }
-
- /**
- * Clear the method decorator of any implicit settings.
- *
- * @param decor
- *
- * @since 1.1.0
- */
- public static void clear(MethodDecorator decor) {
- clear((FeatureDecorator) decor);
- long implicitSettings = decor.getImplicitlySetBits();
- // For each setting, see if it was implicitly set, and if it was, then unset it.
- if ((implicitSettings & (MethodDecoratorImpl.METHOD_PARAMETERS_IMPLICIT | MethodDecoratorImpl.METHOD_PARAMETERS_DEFAULT)) != 0)
- decor.eUnset(BeaninfoPackage.eINSTANCE.getMethodDecorator_SerParmDesc());
- decor.setImplicitlySetBits(implicitSettings
- & ~(MethodDecoratorImpl.METHOD_PARAMETERS_IMPLICIT | MethodDecoratorImpl.METHOD_PARAMETERS_DEFAULT));
- }
-
- /**
- * Clear the event set decorator of any implicit settings.
- *
- * @param decor
- *
- * @since 1.1.0
- */
- public static void clear(EventSetDecorator decor) {
- clear((FeatureDecorator) decor);
- long implicitSettings = decor.getImplicitlySetBits();
- // For each setting, see if it was implicitly set, and if it was, then unset it.
- if ((implicitSettings & EventSetDecoratorImpl.EVENT_ADDLISTENERMETHOD_IMPLICIT) != 0)
- decor.eUnset(BeaninfoPackage.eINSTANCE.getEventSetDecorator_AddListenerMethod());
- if ((implicitSettings & EventSetDecoratorImpl.EVENT_ADAPTERCLASS_IMPLICIT) != 0)
- decor.eUnset(BeaninfoPackage.eINSTANCE.getEventSetDecorator_EventAdapterClass());
- if ((implicitSettings & (EventSetDecoratorImpl.EVENT_LISTENERMETHODS_IMPLICIT | EventSetDecoratorImpl.EVENT_LISTENERMETHODS_DEFAULT)) != 0)
- decor.eUnset(BeaninfoPackage.eINSTANCE.getEventSetDecorator_SerListMthd());
- if ((implicitSettings & EventSetDecoratorImpl.EVENT_REMOVELISTENERMETHOD_IMPLICIT) != 0)
- decor.eUnset(BeaninfoPackage.eINSTANCE.getEventSetDecorator_RemoveListenerMethod());
- if ((implicitSettings & EventSetDecoratorImpl.EVENT_DEFAULTEVENTSET_IMPLICIT) != 0)
- decor.unsetInDefaultEventSet();
- if ((implicitSettings & EventSetDecoratorImpl.EVENT_UNICAST_IMPLICIT) != 0)
- decor.unsetUnicast();
- if ((implicitSettings & EventSetDecoratorImpl.EVENT_LISTENERTYPE_IMPLICIT) != 0)
- decor.eUnset(BeaninfoPackage.eINSTANCE.getEventSetDecorator_ListenerType());
-
- decor.setImplicitlySetBits(implicitSettings
- & ~(EventSetDecoratorImpl.EVENT_ADDLISTENERMETHOD_IMPLICIT | EventSetDecoratorImpl.EVENT_ADAPTERCLASS_IMPLICIT
- | EventSetDecoratorImpl.EVENT_LISTENERMETHODS_IMPLICIT | EventSetDecoratorImpl.EVENT_LISTENERMETHODS_DEFAULT
- | EventSetDecoratorImpl.EVENT_REMOVELISTENERMETHOD_IMPLICIT | EventSetDecoratorImpl.EVENT_DEFAULTEVENTSET_IMPLICIT
- | EventSetDecoratorImpl.EVENT_UNICAST_IMPLICIT | EventSetDecoratorImpl.EVENT_LISTENERTYPE_IMPLICIT));
-
- }
-
- public static void introspect(IBeanProxy modelBeaninfoProxy, IntrospectCallBack callback) {
- ProxyIntrospectCallBack cb = new ProxyIntrospectCallBack(callback);
- modelBeaninfoProxy.getProxyFactoryRegistry().getCallbackRegistry().registerCallback(modelBeaninfoProxy, cb);
- try {
- BeaninfoProxyConstants.getConstants(modelBeaninfoProxy.getProxyFactoryRegistry()).getSendBeanInfoProxy()
- .invokeCatchThrowableExceptions(modelBeaninfoProxy);
- } finally {
- modelBeaninfoProxy.getProxyFactoryRegistry().getCallbackRegistry().deregisterCallback(modelBeaninfoProxy);
- }
-
- }
-
- /**
- * This call back is for each requested type of record. It allows the callee to process this record.
- *
- * @since 1.1.0
- */
- public interface IntrospectCallBack {
-
- /**
- * Process the BeanDecoratorRecord. The callee can decide what needs to be done with this record. It would return the BeandDecorator that needs
- * to have the record applied to. If it returns <code>null</code> then the record will be ignored.
- * <p>
- * Note: This will be called on a separate thread from that which initiated the request. Therefor be careful with any locks because you may
- * have them on a separate thread.
- *
- * @param record
- * @return BeanDecorator to be applied to, or <code>null</code> if record is to be ignored.
- *
- * @since 1.1.0
- */
- public BeanDecorator process(BeanRecord record);
-
- /**
- * Process the PropertyRecord. The callee can decide what needs to be done with this record. It would return the PropertyDecorator that needs
- * to have the record applied to. If it returns <code>null</code> then the record will be ignored.
- * <p>
- * Note: This will be called on a separate thread from that which initiated the request. Therefor be careful with any locks because you may
- * have them on a separate thread.
- *
- * @param record
- * @return PropertyDecorator to be applied to, or <code>null</code> if record is to be ignored.
- *
- * @since 1.1.0
- */
- public PropertyDecorator process(PropertyRecord record);
-
- /**
- * Process the IndexedPropertyRecord. The callee can decide what needs to be done with this record. It would return the
- * IndexedPropertyDecorator that needs to have the record applied to. If it returns <code>null</code> then the record will be ignored.
- *
- * <p>
- * Note: This will be called on a separate thread from that which initiated the request. Therefor be careful with any locks because you may
- * have them on a separate thread.
- *
- * @param record
- * @return PropertyDecorator to be applied to, or <code>null</code> if record is to be ignored. There is a possibility that a straight
- * PropertyDecorator can be returned instead (in the case that it was explictly set by overrides as a property but beaninfo thinks it
- * is an index. This can be handled by it will only set the PropertyRecord part. It normally should be an IndexedPropertyDecorator
- * returned.
- *
- * @since 1.1.0
- */
- public PropertyDecorator process(IndexedPropertyRecord record);
-
- /**
- * Process the MethodRecord. The callee can decide what needs to be done with this record. It would return the MethodDecorator that needs to
- * have the record applied to. If it returns <code>null</code> then the record will be ignored.
- *
- * <p>
- * Note: This will be called on a separate thread from that which initiated the request. Therefor be careful with any locks because you may
- * have them on a separate thread.
- *
- * @param record
- * @return MethodDecorator to be applied to, or <code>null</code> if record is to be ignored.
- *
- * @since 1.1.0
- */
-
- public MethodDecorator process(MethodRecord record);
-
- /**
- * Process the EventRecord. The callee can decide what needs to be done with this record. It would return the EventSetDecorator that needs to
- * have the record applied to. If it returns <code>null</code> then the record will be ignored.
- *
- * <p>
- * Note: This will be called on a separate thread from that which initiated the request. Therefor be careful with any locks because you may
- * have them on a separate thread.
- *
- * @param record
- * @return EventSetDecorator to be applied to, or <code>null</code> if record is to be ignored.
- *
- * @since 1.1.0
- */
-
- public EventSetDecorator process(EventSetRecord record);
- }
-
- private static class ProxyIntrospectCallBack implements ICallback {
-
- private IntrospectCallBack introspectCallback;
-
- public ProxyIntrospectCallBack(IntrospectCallBack introspectCallback) {
- this.introspectCallback = introspectCallback;
- }
-
- /*
- * (non-Javadoc)
- *
- * @see org.eclipse.jem.internal.proxy.core.ICallback#calledBack(int, org.eclipse.jem.internal.proxy.core.IBeanProxy)
- */
- public Object calledBack(int msgID, IBeanProxy parm) {
- return null; // Not used.
- }
-
- /*
- * (non-Javadoc)
- *
- * @see org.eclipse.jem.internal.proxy.core.ICallback#calledBack(int, java.lang.Object)
- */
- public Object calledBack(int msgID, Object parm) {
- return null; // Not used.
- }
-
- /*
- * (non-Javadoc)
- *
- * @see org.eclipse.jem.internal.proxy.core.ICallback#calledBack(int, java.lang.Object[])
- */
- public Object calledBack(int msgID, Object[] parms) {
- return null; // Not used.
- }
-
- /*
- * (non-Javadoc)
- *
- * @see org.eclipse.jem.internal.proxy.core.ICallback#calledBackStream(int, java.io.InputStream)
- */
- public void calledBackStream(int msgID, InputStream is) {
- ObjectInputStream ois;
- try {
- ois = new ObjectInputStream(is);
- while (true) {
- int cmdId = ois.readInt();
- switch (cmdId) {
- case IBeanInfoIntrospectionConstants.BEAN_DECORATOR_SENT:
- try {
- BeanRecord br = (BeanRecord) ois.readObject();
- BeanDecorator bd = introspectCallback.process(br);
- if (bd != null) {
- clear(bd);
- applyRecord(bd, br);
- }
- } catch (IOException e) {
- BeaninfoPlugin.getPlugin().getLogger().log(e);
- } catch (ClassCastException e) {
- BeaninfoPlugin.getPlugin().getLogger().log(e);
- } catch (ClassNotFoundException e) {
- BeaninfoPlugin.getPlugin().getLogger().log(e);
- }
- break;
- case IBeanInfoIntrospectionConstants.PROPERTY_DECORATORS_SENT:
- try {
- int propCount = ois.readInt();
- for (int i = 0; i < propCount; i++) {
- PropertyRecord pr = (PropertyRecord) ois.readObject();
- if (pr.getClass() == IndexedPropertyRecord.class) {
- IndexedPropertyRecord ipr = (IndexedPropertyRecord) pr;
- PropertyDecorator ip = introspectCallback.process(ipr);
- if (ip != null) {
- // It actually could be either a property decorator or an indexed property decorator. This could happen
- // because the overrides file has explicitly declared a PropertyDecorator, so we can't change it to an
- // Indexed.
- // So in that case we can only fill the property part.
- if (ip.eClass().getClassifierID() == BeaninfoPackage.INDEXED_PROPERTY_DECORATOR)
- applyRecord((IndexedPropertyDecorator) ip, ipr);
- else
- applyRecord(ip, pr); // It was forced to be a property and not indexed.
- }
- } else {
- PropertyDecorator p = introspectCallback.process(pr);
- if (p != null) {
- // It actually could be either a property decorator or an indexed property decorator. This could happen
- // because the overrides file has explicitly declared an IndexedPropertyDecorator, so we can't change it
- // to an
- // Property.
- // So in that case we can only fill the property part.
- applyRecord(p, pr);
- }
- }
- }
- } catch (IOException e) {
- BeaninfoPlugin.getPlugin().getLogger().log(e);
- } catch (ClassNotFoundException e) {
- BeaninfoPlugin.getPlugin().getLogger().log(e);
- } catch (ClassCastException e) {
- // In case we got bad data sent in.
- BeaninfoPlugin.getPlugin().getLogger().log(e);
- } finally {
- }
- break;
-
- case IBeanInfoIntrospectionConstants.METHOD_DECORATORS_SENT:
- try {
- int opCount = ois.readInt();
- for (int i = 0; i < opCount; i++) {
- MethodRecord mr = (MethodRecord) ois.readObject();
- MethodDecorator m = introspectCallback.process(mr);
- if (m != null)
- applyRecord(m, mr);
- }
- } catch (IOException e) {
- BeaninfoPlugin.getPlugin().getLogger().log(e);
- } catch (ClassNotFoundException e) {
- BeaninfoPlugin.getPlugin().getLogger().log(e);
- } catch (ClassCastException e) {
- // In case we got bad data sent in.
- BeaninfoPlugin.getPlugin().getLogger().log(e);
- }
- break;
-
- case IBeanInfoIntrospectionConstants.EVENT_DECORATORS_SENT:
- try {
- int opCount = ois.readInt();
- for (int i = 0; i < opCount; i++) {
- EventSetRecord evr = (EventSetRecord) ois.readObject();
- EventSetDecorator e = introspectCallback.process(evr);
- if (e != null)
- applyRecord(e, evr);
- }
- } catch (IOException e) {
- BeaninfoPlugin.getPlugin().getLogger().log(e);
- } catch (ClassNotFoundException e) {
- BeaninfoPlugin.getPlugin().getLogger().log(e);
- } catch (ClassCastException e) {
- // In case we got bad data sent in.
- BeaninfoPlugin.getPlugin().getLogger().log(e);
- }
- break;
-
- case IBeanInfoIntrospectionConstants.DONE:
- return; // Good. This is a good stop.
-
- default:
- return; // This is invalid. Should of gotton something.
- }
- }
- } catch (IOException e) {
- BeaninfoPlugin.getPlugin().getLogger().log(e);
- }
- }
- }
-
- /**
- * Apply the feature record to the feature decorator. This is protected because this is an abstract and should never be called by itself.
- * <p>
- *
- * @param decor
- * @param record
- *
- * @since 1.1.0
- */
- protected static void applyRecord(FeatureDecorator decor, FeatureRecord record) {
- // Subclasses will clear their decor, which will automatically clear the FeatureDecor part for us.
- long implicitSettings = decor.getImplicitlySetBits();
- if (record.displayName != null && !decor.isSetDisplayName()) {
- decor.setDisplayName(record.displayName);
- implicitSettings |= FeatureDecoratorImpl.FEATURE_DISPLAYNAME_IMPLICIT;
- }
- if (record.shortDescription != null && !decor.isSetShortDescription()) {
- decor.setShortDescription(record.shortDescription);
- implicitSettings |= FeatureDecoratorImpl.FEATURE_SHORTDESC_IMPLICIT;
- }
- if (record.category != null && !decor.eIsSet(BeaninfoPackage.eINSTANCE.getFeatureDecorator_Category())) {
- decor.setCategory(record.category);
- implicitSettings |= FeatureDecoratorImpl.FEATURE_CATEGORY_IMPLICIT;
- }
- if (!decor.isSetExpert()) {
- if (decor.isExpert() != record.expert)
- decor.setExpert(record.expert); // Don't want to explicitly set it if it is equal to default (this will put less out to the cache file
- // and so will parse and apply faster).
- implicitSettings |= FeatureDecoratorImpl.FEATURE_EXPERT_IMPLICIT;
- }
- if (!decor.isSetHidden()) {
- if (decor.isHidden() != record.hidden)
- decor.setHidden(record.hidden);
- implicitSettings |= FeatureDecoratorImpl.FEATURE_HIDDEN_IMPLICIT;
- }
- if (!decor.isSetPreferred()) {
- if (decor.isPreferred() != record.preferred)
- decor.setPreferred(record.preferred);
- implicitSettings |= FeatureDecoratorImpl.FEATURE_PREFERRED_IMPLICIT;
- }
- if (record.attributeNames != null && !decor.isAttributesExplicitEmpty()) {
- // This is a list, so we need to read an fill in.
- EMap attrs = decor.getAttributes();
- for (int i = 0; i < record.attributeNames.length; i++) {
- FeatureAttributeMapEntryImpl entry = (FeatureAttributeMapEntryImpl) ((BeaninfoFactoryImpl) BeaninfoFactory.eINSTANCE)
- .createFeatureAttributeMapEntry();
- entry.setTypedKey(record.attributeNames[i]);
- FeatureAttributeValue fv = record.attributeValues[i];
- fv.setImplicitValue(true);
- entry.setTypedValue(fv);
- attrs.add(entry);
- }
- implicitSettings |= FeatureDecoratorImpl.FEATURE_ATTRIBUTES_IMPLICIT;
- }
-
- decor.setImplicitlySetBits(implicitSettings); // Now save was implicitly set.
- }
-
- /**
- * Apply the bean record to the bean decorator.
- *
- * @param decor
- * @param record
- *
- * @since 1.1.0
- */
- public static void applyRecord(BeanDecorator decor, BeanRecord record) {
- applyRecord((FeatureDecorator) decor, record);
-
- long implicitSettings = decor.getImplicitlySetBits();
- if (record.customizerClassName != null && !decor.eIsSet(BeaninfoPackage.eINSTANCE.getBeanDecorator_CustomizerClass())) {
- decor.setCustomizerClass(createJavaClassProxy(record.customizerClassName));
- implicitSettings |= BeanDecoratorImpl.BEAN_CUSTOMIZER_IMPLICIT;
- }
- if (!decor.isSetMergeSuperProperties()) {
- if (decor.isMergeSuperProperties() != record.mergeInheritedProperties)
- decor.setMergeSuperProperties(record.mergeInheritedProperties);
- implicitSettings |= BeanDecoratorImpl.BEAN_MERGE_INHERITED_PROPERTIES_IMPLICIT;
- }
- if (!decor.isSetMergeSuperMethods()) {
- if (decor.isMergeSuperMethods() != record.mergeInheritedOperations)
- decor.setMergeSuperMethods(record.mergeInheritedOperations);
- implicitSettings |= BeanDecoratorImpl.BEAN_MERGE_INHERITED_OPERATIONS_IMPLICIT;
- }
- if (!decor.isSetMergeSuperEvents()) {
- if (decor.isMergeSuperEvents() != record.mergeInheritedEvents)
- decor.setMergeSuperEvents(record.mergeInheritedEvents);
- implicitSettings |= BeanDecoratorImpl.BEAN_MERGE_INHERITED_EVENTS_IMPLICIT;
- }
- if (record.notInheritedPropertyNames != null) {
- // This is always applied. This isn't a client override so we can just slam it.
- decor.getNotInheritedPropertyNames().addAll(Arrays.asList(record.notInheritedPropertyNames));
- }
- if (record.notInheritedOperationNames != null) {
- // This is always applied. This isn't a client override so we can just slam it.
- decor.getNotInheritedMethodNames().addAll(Arrays.asList(record.notInheritedOperationNames));
- }
- if (record.notInheritedEventNames != null) {
- // This is always applied. This isn't a client override so we can just slam it.
- decor.getNotInheritedEventNames().addAll(Arrays.asList(record.notInheritedEventNames));
- }
-
- decor.setImplicitlySetBits(implicitSettings); // Now save was implicitly set.
- }
-
- /**
- * Apply the PropertyRecord to the PropertyDecorator.
- *
- * @param decor
- * @param record
- *
- * @since 1.1.0
- */
- public static void applyRecord(PropertyDecorator decor, PropertyRecord record) {
- applyRecord((FeatureDecorator) decor, record);
-
- applyOnly(decor, record);
- }
-
- /*
- * Apply only to property decorator part. Allows IndexedProperty to apply just the Property part and not do duplicate work
- */
- private static void applyOnly(PropertyDecorator decor, PropertyRecord record) {
- long implicitSettings = decor.getImplicitlySetBits();
- if (record.propertyEditorClassName != null && !decor.eIsSet(BeaninfoPackage.eINSTANCE.getPropertyDecorator_PropertyEditorClass())) {
- decor.setPropertyEditorClass(createJavaClassProxy(record.propertyEditorClassName));
- implicitSettings |= PropertyDecoratorImpl.PROPERTY_EDITOR_CLASS_IMPLICIT;
- }
- if (record.readMethod != null && !decor.isSetReadMethod()) {
- decor.setReadMethod(createJavaMethodProxy(record.readMethod));
- implicitSettings |= PropertyDecoratorImpl.PROPERTY_READMETHOD_IMPLICIT;
- }
- if (record.writeMethod != null && !decor.isSetWriteMethod()) {
- decor.setWriteMethod(createJavaMethodProxy(record.writeMethod));
- implicitSettings |= PropertyDecoratorImpl.PROPERTY_WRITEMETHOD_IMPLICIT;
- }
- if (record.field != null && !decor.isSetField()) {
- decor.setField(createJavaFieldProxy(record.field));
- if (decor.isFieldReadOnly() != record.field.readOnly)
- decor.setFieldReadOnly(record.field.readOnly);
- implicitSettings |= PropertyDecoratorImpl.PROPERTY_FIELD_IMPLICIT;
- }
- if (!decor.isSetBound()) {
- if (decor.isBound() != record.bound)
- decor.setBound(record.bound);
- implicitSettings |= PropertyDecoratorImpl.PROPERTY_BOUND_IMPLICIT;
- }
- if (!decor.isSetConstrained()) {
- if (decor.isConstrained() != record.constrained)
- decor.setConstrained(record.constrained);
- implicitSettings |= PropertyDecoratorImpl.PROPERTY_CONSTRAINED_IMPLICIT;
- }
- if (record.designTime != null && !decor.isSetDesignTime()) {
- // Design time is slightly different than the other booleans because
- // explicitly set to true/false is important versus not explicitly set at all (which is false).
- decor.setDesignTime(record.designTime.booleanValue());
- implicitSettings |= PropertyDecoratorImpl.PROPERTY_DESIGNTIME_IMPLICIT;
- }
-
- decor.setImplicitlySetBits(implicitSettings); // Now save was implicitly set.
-
- }
-
- public static void applyRecord(IndexedPropertyDecorator decor, IndexedPropertyRecord record) {
- applyRecord((FeatureDecorator) decor, record);
- applyOnly(decor, record);
-
- long implicitSettings = decor.getImplicitlySetBits();
- if (record.indexedReadMethod != null && !decor.isSetIndexedReadMethod()) {
- decor.setIndexedReadMethod(createJavaMethodProxy(record.indexedReadMethod));
- implicitSettings |= IndexedPropertyDecoratorImpl.INDEXED_READMETHOD_IMPLICIT;
- }
- if (record.indexedWriteMethod != null && !decor.isSetIndexedWriteMethod()) {
- decor.setIndexedWriteMethod(createJavaMethodProxy(record.indexedWriteMethod));
- implicitSettings |= IndexedPropertyDecoratorImpl.INDEXED_WRITEMETHOD_IMPLICIT;
- }
- decor.setImplicitlySetBits(implicitSettings); // Now save was implicitly set.
- }
-
- /**
- * Apply the method record to the method decorator.
- *
- * @param decor
- * @param record
- *
- * @since 1.1.0
- */
- public static void applyRecord(MethodDecorator decor, MethodRecord record) {
- applyRecord((FeatureDecorator) decor, record);
-
- long implicitSettings = decor.getImplicitlySetBits();
- if (record.parameters != null && !decor.isParmsExplicitEmpty()
- && !decor.eIsSet(BeaninfoPackage.eINSTANCE.getMethodDecorator_ParameterDescriptors())) {
- // This is a list, so we need to read an fill in.
- List parms = decor.getSerParmDesc(); // So as not to have it implicitly fill it in, which it would if we called getParameterDescriptors.
- for (int i = 0; i < record.parameters.length; i++) {
- ParameterDecorator parm = BeaninfoFactory.eINSTANCE.createParameterDecorator();
- applyRecord(parm, record.parameters[i]);
- parms.add(parm);
- }
- implicitSettings |= MethodDecoratorImpl.METHOD_PARAMETERS_IMPLICIT;
- implicitSettings &= ~MethodDecoratorImpl.METHOD_PARAMETERS_DEFAULT; // Should of already been cleared, but be safe.
- }
-
- decor.setImplicitlySetBits(implicitSettings); // Now save was implicitly set.
- }
-
- public static void applyRecord(ParameterDecorator decor, ParameterRecord record) {
- applyRecord((FeatureDecorator) decor, record);
-
- long implicitSettings = decor.getImplicitlySetBits();
- if (record.name != null && !decor.eIsSet(BeaninfoPackage.eINSTANCE.getParameterDecorator_Name())) {
- decor.setName(record.name);
- implicitSettings |= ParameterDecoratorImpl.PARAMETER_NAME_IMPLICIT;
- }
- decor.setImplicitlySetBits(implicitSettings); // Now save was implicitly set.
- }
-
- /**
- * Apply the event set record to the event set decorator.
- *
- * @param decor
- * @param record
- *
- * @since 1.1.0
- */
- public static void applyRecord(EventSetDecorator decor, EventSetRecord record) {
- applyRecord((FeatureDecorator) decor, record);
-
- long implicitSettings = decor.getImplicitlySetBits();
- if (record.addListenerMethod != null && !decor.eIsSet(BeaninfoPackage.eINSTANCE.getEventSetDecorator_AddListenerMethod())) {
- decor.setAddListenerMethod(createJavaMethodProxy(record.addListenerMethod));
- implicitSettings |= EventSetDecoratorImpl.EVENT_ADDLISTENERMETHOD_IMPLICIT;
- }
- if (record.eventAdapterClassName != null && !decor.eIsSet(BeaninfoPackage.eINSTANCE.getEventSetDecorator_EventAdapterClass())) {
- decor.setEventAdapterClass(createJavaClassProxy(record.eventAdapterClassName));
- implicitSettings |= EventSetDecoratorImpl.EVENT_ADAPTERCLASS_IMPLICIT;
- }
- if (record.listenerMethodDescriptors != null && !decor.isListenerMethodsExplicitEmpty()
- && !decor.eIsSet(BeaninfoPackage.eINSTANCE.getEventSetDecorator_ListenerMethods())) {
- List methods = decor.getSerListMthd(); // So as not to have it implicitly fill it in, which it would if we called getListenerMethods.
- for (int i = 0; i < record.listenerMethodDescriptors.length; i++) {
- BeaninfoFactory bfact = BeaninfoFactory.eINSTANCE;
- MethodRecord mr = record.listenerMethodDescriptors[i];
- Method method = createJavaMethodProxy(mr.methodForDescriptor);
- // We need a method proxy, and a method decorator.
- MethodProxy mproxy = bfact.createMethodProxy();
- mproxy.setMethod(method);
- mproxy.setName(mr.name);
- MethodDecorator md = bfact.createMethodDecorator();
- applyRecord(md, mr);
- mproxy.getEAnnotations().add(md);
- methods.add(mproxy);
- }
- implicitSettings |= EventSetDecoratorImpl.EVENT_LISTENERMETHODS_IMPLICIT;
- implicitSettings &= ~EventSetDecoratorImpl.EVENT_LISTENERMETHODS_DEFAULT; // Should of already been cleared, but be safe.
- }
- if (record.listenerTypeName != null && !decor.eIsSet(BeaninfoPackage.eINSTANCE.getEventSetDecorator_ListenerType())) {
- decor.setListenerType(createJavaClassProxy(record.listenerTypeName));
- implicitSettings |= EventSetDecoratorImpl.EVENT_LISTENERTYPE_IMPLICIT;
- }
- if (record.removeListenerMethod != null && !decor.eIsSet(BeaninfoPackage.eINSTANCE.getEventSetDecorator_RemoveListenerMethod())) {
- decor.setRemoveListenerMethod(createJavaMethodProxy(record.removeListenerMethod));
- implicitSettings |= EventSetDecoratorImpl.EVENT_REMOVELISTENERMETHOD_IMPLICIT;
- }
- if (!decor.isSetInDefaultEventSet()) {
- if (record.inDefaultEventSet != decor.isInDefaultEventSet())
- decor.setInDefaultEventSet(record.inDefaultEventSet);
- implicitSettings |= EventSetDecoratorImpl.EVENT_DEFAULTEVENTSET_IMPLICIT;
- }
- if (!decor.isSetUnicast()) {
- if (record.unicast != decor.isUnicast())
- decor.setUnicast(record.unicast);
- implicitSettings |= EventSetDecoratorImpl.EVENT_UNICAST_IMPLICIT;
- }
-
- decor.setImplicitlySetBits(implicitSettings); // Now save was implicitly set.
- }
-
- /**
- * Create a java class proxy for the given name. By being a proxy we don't need to actually have the resource set. Nor do we need to fluff one up
- * until someone actually asks for it.
- * <p>
- * The jniName must refer to a JavaClass or errors could occur later on.
- *
- * @param jniName
- * classname in JNI format.
- * @return JavaClass proxy or <code>null</code> if not a java class (it may be a type).
- *
- * @since 1.1.0
- */
- public static JavaClass createJavaClassProxy(String jniName) {
- JavaHelpers jh = createJavaTypeProxy(jniName);
- return jh instanceof JavaClass ? (JavaClass) jh : null;
- }
-
- /**
- * Create a JavaHelpers proxy for the given name. By being a proxy we don't need to actually have the resource set. Nor do we need to fluff one up
- * until someone actually asks for it.
- *
- * @param jniName
- * typename in JNI format.
- * @return JavaHelper proxy.
- *
- * @since 1.1.0
- */
- public static JavaHelpers createJavaTypeProxy(String jniName) {
- String formalName = MapJNITypes.getFormalTypeName(jniName);
-
- URI uri = Utilities.getJavaClassURI(formalName);
- JavaHelpers jh = null;
- if (MapJNITypes.isFormalTypePrimitive(formalName))
- jh = JavaRefFactory.eINSTANCE.createJavaDataType();
- else
- jh = JavaRefFactory.eINSTANCE.createJavaClass();
- ((InternalEObject) jh).eSetProxyURI(uri);
- return jh;
- }
-
- public static Method createJavaMethodProxy(ReflectMethodRecord method) {
- String[] parmTypes = method.parameterTypeNames != null ? new String[method.parameterTypeNames.length] : null;
- if (parmTypes != null)
- for (int i = 0; i < method.parameterTypeNames.length; i++) {
- parmTypes[i] = MapJNITypes.getFormalTypeName(method.parameterTypeNames[i]);
- }
- URI uri = Utilities.getMethodURI(MapJNITypes.getFormalTypeName(method.className), method.methodName, parmTypes);
- Method methodEMF = JavaRefFactory.eINSTANCE.createMethod();
- ((InternalEObject) methodEMF).eSetProxyURI(uri);
- return methodEMF;
- }
-
- public static Field createJavaFieldProxy(ReflectFieldRecord field) {
- URI uri = Utilities.getFieldURI(MapJNITypes.getFormalTypeName(field.className), field.fieldName);
- Field fieldEMF = JavaRefFactory.eINSTANCE.createField();
- ((InternalEObject) fieldEMF).eSetProxyURI(uri);
- return fieldEMF;
- }
-
- /**
- * Set the properties on the PropertyDecorator. These come from reflection. Since this is a private interface between BeaninfoClassAdapter and
- * this class, not all possible settings need to be mentioned. Only the ones that can be set by reflection. It is assumed that clear has already
- * been done so that there are no old implicit settings. It will check if properties are set already before setting so that don't wipe out
- * explicit settings.
- *
- * @param prop
- * @param bound
- * @param constrained
- * @param getter
- * @param setter
- *
- * @since 1.1.0
- */
- public static void setProperties(PropertyDecorator prop, boolean bound, boolean constrained, Method getter, Method setter) {
- long implicitSettings = prop.getImplicitlySetBits();
- if (getter != null && !prop.isSetReadMethod()) {
- prop.setReadMethod(getter);
- implicitSettings |= PropertyDecoratorImpl.PROPERTY_READMETHOD_IMPLICIT;
- }
- if (setter != null && !prop.isSetWriteMethod()) {
- prop.setWriteMethod(setter);
- implicitSettings |= PropertyDecoratorImpl.PROPERTY_WRITEMETHOD_IMPLICIT;
- }
- if (!prop.isSetBound()) {
- if (prop.isBound() != bound)
- prop.setBound(bound);
- implicitSettings |= PropertyDecoratorImpl.PROPERTY_BOUND_IMPLICIT;
- }
- if (!prop.isSetConstrained()) {
- if (prop.isConstrained() != constrained)
- prop.setConstrained(constrained);
- implicitSettings |= PropertyDecoratorImpl.PROPERTY_CONSTRAINED_IMPLICIT;
- }
- prop.setImplicitlySetBits(implicitSettings); // Now save was implicitly set.
- }
-
- /**
- * Set the properties on the IndexedPropertyDecorator. These come from reflection. It is only the indexed portion. The base property portion
- * should have already been set. Since this is a private interface between BeaninfoClassAdapter and this class, not all possible settings need to
- * be mentioned. Only the ones that can be set by reflection. It is assumed that clear has already been done so that there are no old implicit
- * settings. It will check if properties are set already before setting so that don't wipe out explicit settings.
- *
- * @param prop
- * @param indexedGetter
- * @param indexedSetter
- *
- * @since 1.1.0
- */
- public static void setProperties(IndexedPropertyDecorator prop, Method indexedGetter, Method indexedSetter) {
- long implicitSettings = prop.getImplicitlySetBits();
- if (indexedGetter != null && !prop.isSetIndexedReadMethod()) {
- prop.setIndexedReadMethod(indexedGetter);
- implicitSettings |= IndexedPropertyDecoratorImpl.INDEXED_READMETHOD_IMPLICIT;
- }
- if (indexedSetter != null && !prop.isSetIndexedWriteMethod()) {
- prop.setIndexedWriteMethod(indexedSetter);
- implicitSettings |= IndexedPropertyDecoratorImpl.INDEXED_WRITEMETHOD_IMPLICIT;
- }
- prop.setImplicitlySetBits(implicitSettings); // Now save was implicitly set.
- }
-
- /**
- * Set the properties on the EventSetDecorator. These come from reflection. Since this is a private interface between BeaninfoClassAdapter and
- * this class, not all possible settings need to be mentioned. Only the ones that can be set by reflection. It is assumed that clear has already
- * been done so that there are no old implicit settings. It will check if properties are set already before setting so that don't wipe out
- * explicit settings.
- *
- * @param event
- * @param bound
- * @param constrained
- * @param getter
- * @param setter
- *
- * @since 1.1.0
- */
- public static void setProperties(EventSetDecorator event, Method addListenerMethod, Method removeListenerMethod, boolean unicast,
- JavaClass listenerType) {
- long implicitSettings = event.getImplicitlySetBits();
- if (addListenerMethod != null && !event.eIsSet(BeaninfoPackage.eINSTANCE.getEventSetDecorator_AddListenerMethod())) {
- event.setAddListenerMethod(addListenerMethod);
- implicitSettings |= EventSetDecoratorImpl.EVENT_ADDLISTENERMETHOD_IMPLICIT;
- }
- if (removeListenerMethod != null && !event.eIsSet(BeaninfoPackage.eINSTANCE.getEventSetDecorator_RemoveListenerMethod())) {
- event.setRemoveListenerMethod(removeListenerMethod);
- implicitSettings |= EventSetDecoratorImpl.EVENT_REMOVELISTENERMETHOD_IMPLICIT;
- }
- if (!event.isSetUnicast()) {
- if (event.isUnicast() != unicast)
- event.setUnicast(unicast);
- implicitSettings |= PropertyDecoratorImpl.PROPERTY_BOUND_IMPLICIT;
- }
- if (listenerType != null && !event.eIsSet(BeaninfoPackage.eINSTANCE.getEventSetDecorator_ListenerType())) {
- event.setListenerType(listenerType);
- implicitSettings |= EventSetDecoratorImpl.EVENT_LISTENERTYPE_IMPLICIT;
- }
-
- event.setImplicitlySetBits(implicitSettings); // Now save was implicitly set.
- }
-
- /**
- * Build the appropriate change record for the bean decorator. Either it is an add of a new bean decorator or it is the setting of the implicit
- * settings on an non-implicit bean decorator.
- * @param cd
- * @param bd
- *
- * @since 1.1.0
- */
- public static void buildChange(ChangeDescription cd, BeanDecorator bd) {
- // Only do anything if merge introspection. If no merge introspection, then there is no change needed.
- if (bd.isMergeIntrospection()) {
- if (bd.getImplicitDecoratorFlag() != ImplicitItem.NOT_IMPLICIT_LITERAL) {
- // It is implicit, so do an add to end, new value.
- doAddToEnd(cd, getFeatureChangeList(cd, bd.getEModelElement()), EcorePackage.eINSTANCE.getEModelElement_EAnnotations(), bd, true);
- } else {
- // Just do sets on implicit changed ones
- buildNonImplicitChange(cd, getFeatureChangeList(cd, bd), bd);
- }
- }
-
- }
-
- /**
- * Build the appropriate change record for the property decorator. Either it is an add of a new property decorator or it is the setting of the implicit
- * settings on an non-implicit property decorator. The same is true of the feature that it decorates. It may be new or it may be an existing one.
- * @param cd
- * @param pd
- *
- * @since 1.1.0
- */
- public static void buildChange(ChangeDescription cd, PropertyDecorator pd) {
- // Only do changes if merge introspection. If not merging, then there are no changes.
- if (pd.isMergeIntrospection()) {
- boolean indexed = pd.eClass().getClassifierID() == BeaninfoPackage.INDEXED_PROPERTY_DECORATOR;
- EStructuralFeature feature = (EStructuralFeature) pd.getEModelElement();
- switch (pd.getImplicitDecoratorFlag().getValue()) {
- case ImplicitItem.IMPLICIT_DECORATOR:
- // The decorator is implicit, so clone it, and apply to feature, and then do the standard property applies to the feature.
- List fcs = getFeatureChangeList(cd, feature);
- doAddToEnd(cd, fcs, pd.eContainingFeature(), pd, true);
- buildNonImplicitChange(cd, fcs, feature, indexed);
- break;
- case ImplicitItem.IMPLICIT_DECORATOR_AND_FEATURE:
- // The decorator AND feature are implicit. Just clone them and add to the class.
- doAddToEnd(cd, getFeatureChangeList(cd, feature.eContainer()), feature.eContainingFeature(), feature, true);
- break;
- case ImplicitItem.NOT_IMPLICIT:
- // Neither the feature nor the decorator are implicit. So need to do applies against them.
- buildNonImplicitChange(cd, getFeatureChangeList(cd, pd), pd, indexed);
- buildNonImplicitChange(cd, getFeatureChangeList(cd, feature), feature, indexed);
- break;
- }
- }
- }
-
- /**
- * Build the appropriate change record for the event set decorator. Either it is an add of a new event set decorator or it is the setting of the implicit
- * settings on an non-implicit event set decorator. The same is true of the feature that it decorates. It may be new or it may be an existing one.
- * @param cd
- * @param ed
- *
- * @since 1.1.0
- */
- public static void buildChange(ChangeDescription cd, EventSetDecorator ed) {
- // Only build changes if merge introspection. If not merge then there are no changes.
- if (ed.isMergeIntrospection()) {
- JavaEvent event = (JavaEvent) ed.getEModelElement();
- switch (ed.getImplicitDecoratorFlag().getValue()) {
- case ImplicitItem.IMPLICIT_DECORATOR:
- // The decorator is implicit, so clone it, and apply to feature, and then do the standard property applies to the feature.
- List fcs = getFeatureChangeList(cd, event);
- doAddToEnd(cd, fcs, ed.eContainingFeature(), ed, true);
- buildNonImplicitChange(cd, fcs, event);
- break;
- case ImplicitItem.IMPLICIT_DECORATOR_AND_FEATURE:
- // The decorator AND feature are implicit. Just clone them and add to the class.
- doAddToEnd(cd, getFeatureChangeList(cd, event.eContainer()), event.eContainingFeature(), event, true);
- break;
- case ImplicitItem.NOT_IMPLICIT:
- // Neither the feature nor the decorator are implicit. So need to do applies against them.
- buildNonImplicitChange(cd, getFeatureChangeList(cd, ed), ed);
- buildNonImplicitChange(cd, getFeatureChangeList(cd, event), event);
- break;
- }
- }
- }
-
- /**
- * Build the appropriate change record for the method decorator. Either it is an add of a new method decorator or it is the setting of the implicit
- * settings on an non-implicit method decorator. The same is true of the operation that it decorates. It may be new or it may be an existing one.
- * @param cd
- * @param md
- *
- * @since 1.1.0
- */
- public static void buildChange(ChangeDescription cd, MethodDecorator md) {
- // Only do any builds if merge introspection. If not merge introspection then nothing should be changed.
- if (md.isMergeIntrospection()) {
- EOperation oper = (EOperation) md.getEModelElement();
- switch (md.getImplicitDecoratorFlag().getValue()) {
- case ImplicitItem.IMPLICIT_DECORATOR:
- // The decorator is implicit, so clone it, and apply to feature, and then do the standard property applies to the feature.
- List fcs = getFeatureChangeList(cd, oper);
- doAddToEnd(cd, fcs, md.eContainingFeature(), md, true);
- buildNonImplicitChange(cd, fcs, oper);
- break;
- case ImplicitItem.IMPLICIT_DECORATOR_AND_FEATURE:
- // The decorator AND feature are implicit. Just clone them and add to the class.
- doAddToEnd(cd, getFeatureChangeList(cd, oper.eContainer()), oper.eContainingFeature(), oper, true);
- break;
- case ImplicitItem.NOT_IMPLICIT:
- // Neither the feature nor the decorator are implicit. So need to do applies against them.
- buildNonImplicitChange(cd, getFeatureChangeList(cd, md), md);
- buildNonImplicitChange(cd, getFeatureChangeList(cd, oper), oper);
- break;
- }
- }
- }
-
- private final static Integer ZERO = new Integer(0);
- private final static Integer ONE = new Integer(1);
- private final static Integer MINUS_ONE = new Integer(-1);
-
- /**
- * Build the non-implicit changes into the feature. This creates changes for the implicit settings
- * that always occur for a property decorator.
- *
- * @param cd
- * @param fcs FeatureChanges list for the feature.
- * @param feature
- * @param indexed <code>true</code> if this is for an indexed feature.
- *
- * @since 1.1.0
- */
- protected static void buildNonImplicitChange(ChangeDescription cd, List fcs, EStructuralFeature feature, boolean indexed) {
- doSet(cd, fcs, EcorePackage.eINSTANCE.getENamedElement_Name(), feature.getName(), false);
- doSet(cd, fcs, EcorePackage.eINSTANCE.getEStructuralFeature_Transient(), Boolean.FALSE, false);
- doSet(cd, fcs, EcorePackage.eINSTANCE.getEStructuralFeature_Volatile(), Boolean.FALSE, false);
- doSet(cd, fcs, EcorePackage.eINSTANCE.getEStructuralFeature_Changeable(), Boolean.valueOf(feature.isChangeable()), false);
- doSet(cd, fcs, EcorePackage.eINSTANCE.getETypedElement_EType(), feature.getEType(), false);
- if (!indexed) {
- doSet(cd, fcs, EcorePackage.eINSTANCE.getETypedElement_LowerBound(), ZERO, false);
- doSet(cd, fcs, EcorePackage.eINSTANCE.getETypedElement_UpperBound(), ONE, false);
- } else {
- doSet(cd, fcs, EcorePackage.eINSTANCE.getETypedElement_LowerBound(), ZERO, false);
- doSet(cd, fcs, EcorePackage.eINSTANCE.getETypedElement_UpperBound(), MINUS_ONE, false);
- doSet(cd, fcs, EcorePackage.eINSTANCE.getETypedElement_Unique(), Boolean.TRUE, false);
- }
- }
-
- /**
- * Build the non-implicit changes into the event. This creates changes for the implicit settings
- * that always occur for an event set decorator.
- *
- * @param cd
- * @param fcs FeatureChanges list for the feature.
- * @param event
- *
- * @since 1.1.0
- */
- protected static void buildNonImplicitChange(ChangeDescription cd, List fcs, JavaEvent event) {
- doSet(cd, fcs, EcorePackage.eINSTANCE.getENamedElement_Name(), event.getName(), false);
- }
-
- /**
- * Build the non-implicit changes into the operation. This creates changes for the implicit settings
- * that always occur for an method decorator.
- *
- * @param cd
- * @param fcs FeatureChanges list for the feature.
- * @param oper
- *
- * @since 1.1.0
- */
- protected static void buildNonImplicitChange(ChangeDescription cd, List fcs, EOperation oper) {
- doSet(cd, fcs, EcorePackage.eINSTANCE.getENamedElement_Name(), oper.getName(), false);
- try {
- doSet(cd, fcs, BeaninfoPackage.eINSTANCE.getMethodProxy_Method(), ((MethodProxy) oper).getMethod(), false); // This is a method that is not in this resource, so no clone.
- } catch (ClassCastException e) {
- // It will be a MethodProxy 99.9% of the time, so save by not doing instanceof.
- }
- }
-
- /**
- * Build up the changes for a non-implicit feature decorator. This means create changes for implicit set features.
- *
- * @param cd
- * @param fcs
- * the FeatureChanges list for the given decorator.
- * @param decor
- *
- * @since 1.1.0
- */
- protected static void buildNonImplicitChange(ChangeDescription cd, List fcs, FeatureDecorator decor) {
- long implicitSettings = decor.getImplicitlySetBits();
- if (implicitSettings != 0)
- doSet(cd, fcs, BeaninfoPackage.eINSTANCE.getFeatureDecorator_ImplicitlySetBits(), new Long(implicitSettings), false);
-
- if ((implicitSettings & FeatureDecoratorImpl.FEATURE_DISPLAYNAME_IMPLICIT) != 0) {
- doSet(cd, fcs, BeaninfoPackage.eINSTANCE.getFeatureDecorator_DisplayName(), decor.getDisplayName(), false);
- }
- if ((implicitSettings & FeatureDecoratorImpl.FEATURE_SHORTDESC_IMPLICIT) != 0) {
- doSet(cd, fcs, BeaninfoPackage.eINSTANCE.getFeatureDecorator_ShortDescription(), decor.getShortDescription(), false);
- }
- if ((implicitSettings & FeatureDecoratorImpl.FEATURE_CATEGORY_IMPLICIT) != 0) {
- doSet(cd, fcs, BeaninfoPackage.eINSTANCE.getFeatureDecorator_Category(), decor.getCategory(), false);
- }
- if ((implicitSettings & FeatureDecoratorImpl.FEATURE_EXPERT_IMPLICIT) != 0 && decor.isSetExpert()) {
- doSet(cd, fcs, BeaninfoPackage.eINSTANCE.getFeatureDecorator_Expert(), Boolean.valueOf(decor.isExpert()), false);
- }
- if ((implicitSettings & FeatureDecoratorImpl.FEATURE_HIDDEN_IMPLICIT) != 0 && decor.isSetHidden()) {
- doSet(cd, fcs, BeaninfoPackage.eINSTANCE.getFeatureDecorator_Hidden(), Boolean.valueOf(decor.isHidden()), false);
- }
- if ((implicitSettings & FeatureDecoratorImpl.FEATURE_PREFERRED_IMPLICIT) != 0 && decor.isSetPreferred()) {
- doSet(cd, fcs, BeaninfoPackage.eINSTANCE.getFeatureDecorator_Preferred(), Boolean.valueOf(decor.isPreferred()), false);
- }
- if ((implicitSettings & FeatureDecoratorImpl.FEATURE_ATTRIBUTES_IMPLICIT) != 0) {
- for (Iterator itr = decor.getAttributes().listIterator(); itr.hasNext();) {
- FeatureAttributeMapEntryImpl entry = (FeatureAttributeMapEntryImpl)itr.next();
- if (entry.getTypedValue().isImplicitValue()) {
- doAddToEnd(cd, fcs, BeaninfoPackage.eINSTANCE.getFeatureDecorator_Attributes(), entry, true);
- }
- }
- }
- }
-
- /**
- * Build up the changes for a non-implicit bean decorator. This means create changes for implicit set features.
- *
- * @param cd
- * @param fcs
- * the FeatureChanges list for the given decorator.
- * @param decor
- *
- * @since 1.1.0
- */
- protected static void buildNonImplicitChange(ChangeDescription cd, List fcs, BeanDecorator decor) {
- buildNonImplicitChange(cd, fcs, (FeatureDecorator) decor);
- long implicitSettings = decor.getImplicitlySetBits();
- if ((implicitSettings & BeanDecoratorImpl.BEAN_CUSTOMIZER_IMPLICIT) != 0) {
- doSet(cd, fcs, BeaninfoPackage.eINSTANCE.getBeanDecorator_CustomizerClass(), decor.getCustomizerClass(), false); // Customizer class is
- // not in this resource,
- // so we don't clone it.
- }
- if ((implicitSettings & BeanDecoratorImpl.BEAN_MERGE_INHERITED_PROPERTIES_IMPLICIT) != 0 && decor.isSetMergeSuperProperties()) {
- doSet(cd, fcs, BeaninfoPackage.eINSTANCE.getBeanDecorator_MergeSuperProperties(), Boolean.valueOf(decor.isMergeSuperProperties()), false);
- }
- if ((implicitSettings & BeanDecoratorImpl.BEAN_MERGE_INHERITED_OPERATIONS_IMPLICIT) != 0 && decor.isSetMergeSuperMethods()) {
- doSet(cd, fcs, BeaninfoPackage.eINSTANCE.getBeanDecorator_MergeSuperMethods(), Boolean.valueOf(decor.isMergeSuperMethods()), false);
- }
- if ((implicitSettings & BeanDecoratorImpl.BEAN_MERGE_INHERITED_EVENTS_IMPLICIT) != 0 && decor.isSetMergeSuperEvents()) {
- doSet(cd, fcs, BeaninfoPackage.eINSTANCE.getBeanDecorator_MergeSuperEvents(), Boolean.valueOf(decor.isMergeSuperEvents()), false);
- }
- if (!decor.getNotInheritedPropertyNames().isEmpty()) {
- doAddAllToEnd(cd, fcs, BeaninfoPackage.eINSTANCE.getBeanDecorator_NotInheritedPropertyNames(), decor.getNotInheritedPropertyNames(), false);
- }
- if (!decor.getNotInheritedMethodNames().isEmpty()) {
- doAddAllToEnd(cd, fcs, BeaninfoPackage.eINSTANCE.getBeanDecorator_NotInheritedMethodNames(), decor.getNotInheritedMethodNames(), false);
- }
- if (!decor.getNotInheritedEventNames().isEmpty()) {
- doAddAllToEnd(cd, fcs, BeaninfoPackage.eINSTANCE.getBeanDecorator_NotInheritedEventNames(), decor.getNotInheritedEventNames(), false);
- }
- }
-
- /**
- * Build up the changes for a non-implicit property decorator. This means create changes for implicit set features.
- *
- * @param cd
- * @param fcs
- * the FeatureChanges list for the given decorator.
- * @param decor
- * @param indexed <code>true</code> if this is an indexed property decorator.
- *
- * @since 1.1.0
- */
- protected static void buildNonImplicitChange(ChangeDescription cd, List fcs, PropertyDecorator decor, boolean indexed) {
- buildNonImplicitChange(cd, fcs, decor);
- long implicitSettings = decor.getImplicitlySetBits();
- if ((implicitSettings & PropertyDecoratorImpl.PROPERTY_EDITOR_CLASS_IMPLICIT) != 0) {
- doSet(cd, fcs, BeaninfoPackage.eINSTANCE.getPropertyDecorator_PropertyEditorClass(), decor.getPropertyEditorClass(), false); // Property Editor class is
- // not in this resource,
- // so we don't clone it.
- }
- if ((implicitSettings & PropertyDecoratorImpl.PROPERTY_READMETHOD_IMPLICIT) != 0) {
- doSet(cd, fcs, BeaninfoPackage.eINSTANCE.getPropertyDecorator_ReadMethod(), decor.getReadMethod(), false);
- }
- if ((implicitSettings & PropertyDecoratorImpl.PROPERTY_WRITEMETHOD_IMPLICIT) != 0) {
- doSet(cd, fcs, BeaninfoPackage.eINSTANCE.getPropertyDecorator_WriteMethod(), decor.getWriteMethod(), false);
- }
- if ((implicitSettings & PropertyDecoratorImpl.PROPERTY_FIELD_IMPLICIT) != 0) {
- doSet(cd, fcs, BeaninfoPackage.eINSTANCE.getPropertyDecorator_Field(), decor.getField(), false);
- if (decor.eIsSet(BeaninfoPackage.eINSTANCE.getPropertyDecorator_FieldReadOnly()))
- doSet(cd, fcs, BeaninfoPackage.eINSTANCE.getPropertyDecorator_FieldReadOnly(), Boolean.valueOf(decor.isFieldReadOnly()), false);
- }
- if ((implicitSettings & PropertyDecoratorImpl.PROPERTY_BOUND_IMPLICIT) != 0 && decor.isSetBound()) {
- doSet(cd, fcs, BeaninfoPackage.eINSTANCE.getPropertyDecorator_Bound(), Boolean.valueOf(decor.isBound()), false);
- }
- if ((implicitSettings & PropertyDecoratorImpl.PROPERTY_CONSTRAINED_IMPLICIT) != 0 && decor.isSetConstrained()) {
- doSet(cd, fcs, BeaninfoPackage.eINSTANCE.getPropertyDecorator_Constrained(), Boolean.valueOf(decor.isConstrained()), false);
- }
- if ((implicitSettings & PropertyDecoratorImpl.PROPERTY_DESIGNTIME_IMPLICIT) != 0) {
- doSet(cd, fcs, BeaninfoPackage.eINSTANCE.getPropertyDecorator_DesignTime(), Boolean.valueOf(decor.isDesignTime()), false);
- }
-
- if (indexed) {
- IndexedPropertyDecorator ipd = (IndexedPropertyDecorator) decor;
- if ((implicitSettings & IndexedPropertyDecoratorImpl.INDEXED_READMETHOD_IMPLICIT) != 0) {
- doSet(cd, fcs, BeaninfoPackage.eINSTANCE.getIndexedPropertyDecorator_IndexedReadMethod(), ipd.getIndexedReadMethod(), false);
- }
- if ((implicitSettings & IndexedPropertyDecoratorImpl.INDEXED_WRITEMETHOD_IMPLICIT) != 0) {
- doSet(cd, fcs, BeaninfoPackage.eINSTANCE.getIndexedPropertyDecorator_IndexedWriteMethod(), ipd.getIndexedWriteMethod(), false);
- }
- }
- }
-
- /**
- * Build up the changes for a non-implicit event set decorator. This means create changes for implicit set features.
- *
- * @param cd
- * @param fcs
- * the FeatureChanges list for the given decorator.
- * @param decor
- *
- * @since 1.1.0
- */
- protected static void buildNonImplicitChange(ChangeDescription cd, List fcs, EventSetDecorator decor) {
- buildNonImplicitChange(cd, fcs, (FeatureDecorator) decor);
- long implicitSettings = decor.getImplicitlySetBits();
- if ((implicitSettings & EventSetDecoratorImpl.EVENT_ADDLISTENERMETHOD_IMPLICIT) != 0) {
- doSet(cd, fcs, BeaninfoPackage.eINSTANCE.getEventSetDecorator_AddListenerMethod(), decor.getAddListenerMethod(), false); // listener method is
- // not in this resource,
- // so we don't clone it.
- }
- if ((implicitSettings & EventSetDecoratorImpl.EVENT_ADAPTERCLASS_IMPLICIT) != 0) {
- doSet(cd, fcs, BeaninfoPackage.eINSTANCE.getEventSetDecorator_EventAdapterClass(), decor.getEventAdapterClass(), false);
- }
- if ((implicitSettings & EventSetDecoratorImpl.EVENT_LISTENERMETHODS_IMPLICIT) != 0) {
- doAddAllToEnd(cd, fcs, BeaninfoPackage.eINSTANCE.getEventSetDecorator_SerListMthd(), decor.getSerListMthd(), true); // These need to be cloned because they are contained here.
- }
- if ((implicitSettings & EventSetDecoratorImpl.EVENT_LISTENERTYPE_IMPLICIT) != 0) {
- doSet(cd, fcs, BeaninfoPackage.eINSTANCE.getEventSetDecorator_ListenerType(), decor.getListenerType(), false);
- }
- if ((implicitSettings & EventSetDecoratorImpl.EVENT_REMOVELISTENERMETHOD_IMPLICIT) != 0) {
- doSet(cd, fcs, BeaninfoPackage.eINSTANCE.getEventSetDecorator_RemoveListenerMethod(), decor.getRemoveListenerMethod(), false);
- }
- if ((implicitSettings & EventSetDecoratorImpl.EVENT_DEFAULTEVENTSET_IMPLICIT) != 0 && decor.isSetInDefaultEventSet()) {
- doSet(cd, fcs, BeaninfoPackage.eINSTANCE.getEventSetDecorator_InDefaultEventSet(), Boolean.valueOf(decor.isInDefaultEventSet()), false);
- }
- if ((implicitSettings & EventSetDecoratorImpl.EVENT_UNICAST_IMPLICIT) != 0 && decor.isSetUnicast()) {
- doSet(cd, fcs, BeaninfoPackage.eINSTANCE.getEventSetDecorator_Unicast(), Boolean.valueOf(decor.isUnicast()), false);
- }
- }
-
- /**
- * Build up the changes for a non-implicit method decorator. This means create changes for implicit set features.
- *
- * @param cd
- * @param fcs
- * the FeatureChanges list for the given decorator.
- * @param decor
- *
- * @since 1.1.0
- */
- protected static void buildNonImplicitChange(ChangeDescription cd, List fcs, MethodDecorator decor) {
- buildNonImplicitChange(cd, fcs, (FeatureDecorator) decor);
- long implicitSettings = decor.getImplicitlySetBits();
- if ((implicitSettings & MethodDecoratorImpl.METHOD_PARAMETERS_IMPLICIT) != 0) {
- doAddAllToEnd(cd, fcs, BeaninfoPackage.eINSTANCE.getMethodDecorator_SerParmDesc(), decor.getSerParmDesc(), true);
- }
- }
-
-
- /**
- * Get the feature change list for an object. Create it one if necessary.
- *
- * @param cd
- * @param object
- * @return feature change list.
- *
- * @since 1.1.0
- */
- protected static List getFeatureChangeList(ChangeDescription cd, EObject object) {
- List fcs = cd.getObjectChanges().get(object); // Get the feature changes if any.
- if (fcs == null) {
- Map.Entry entry = ChangeFactory.eINSTANCE.createEObjectToChangesMapEntry(object);
- cd.getObjectChanges().add(entry);
- fcs = (List) entry.getValue();
- }
- return fcs;
- }
-
- /**
- * Return the FeatureChange record for a feature wrt/object. Create one if necessary. If it creates it, it will mark it as "set". All of our
- * changes here are set kind of changes, not unset kind.
- *
- * @param fcs
- * feature change list from the ChangeDescripion.getObjectChanges for the given object.
- * @param feature
- * @return feature change
- *
- * @since 1.1.0
- */
- protected static FeatureChange getFeatureChange(List fcs, EStructuralFeature feature) {
- if (!fcs.isEmpty()) {
- for (int i = 0; i < fcs.size(); i++) {
- FeatureChange fc = (FeatureChange) fcs.get(i);
- if (fc.getFeature() == feature)
- return fc;
- }
- }
-
- // Either new object changes or no feature change found. Create one.
- FeatureChange fc = ChangeFactory.eINSTANCE.createFeatureChange(feature, null, true);
- fcs.add(fc);
- return fc;
- }
-
- /**
- * Create a change for add to end of the given feature (must be isMany()). If newObject is true, then this means this is not a pointer to an
- * existing object and so it must be cloned. It is assumed that there will be no further changes to this object because those will not be known
- * about.
- *
- * @param cd
- * @param fcs
- * feature change list from the ChangeDescripion.getObjectChanges for the given object.
- * @param feature
- * the feature being added to.
- * @param addedValue
- * the value being added.
- * @param newValue
- * <code>true</code> if new object in the resource, a clone will be made. <code>false</code> if an existing object. Must be an
- * EObject for cloning. Best if not true for non-eobjects.
- * @return the addedValue or the clone if it was cloned.
- *
- * @since 1.1.0
- */
- protected static Object doAddToEnd(ChangeDescription cd, List fcs, EStructuralFeature feature, Object addedValue, boolean newValue) {
- FeatureChange fc = getFeatureChange(fcs, feature);
- if (newValue) {
- try {
- addedValue = EcoreUtil.copy((EObject) addedValue);
- cd.getObjectsToAttach().add((EObject)addedValue);
- } catch (ClassCastException e) {
- // Normally should not occur, but if it does, it means we can't clone, so don't clone.
- }
- }
- List lcs = fc.getListChanges();
- // Find the one with add and -1, i.e. add to end. There should only be one.
- ListChange lc = null;
- for (int i = 0; i < lcs.size(); i++) {
- ListChange lca = (ListChange) lcs.get(i);
- if (lca.getKind() == ChangeKind.ADD_LITERAL && lca.getIndex() == -1) {
- lc = lca;
- break;
- }
- }
- if (lc == null) {
- lc = ChangeFactory.eINSTANCE.createListChange();
- lcs.add(lc);
- }
-
- lc.getValues().add(addedValue);
- return addedValue;
- }
-
- /**
- * Create a change for add all to end of the given feature (must be isMany()). If newValue is true, then this means this is not a pointer to
- * existing objects and so it must be cloned. It is assumed that there will be no further changes to this object because those will not be known
- * about.
- *
- * @param cd
- * @param fcs
- * feature change list from the ChangeDescripion.getObjectChanges for the given object.
- * @param feature
- * the feature being added to.
- * @param addedValues
- * the values being added.
- * @param newValue
- * <code>true</code> if new objects in the resource, clones will be made. <code>false</code> if an existing object. Must be EObject
- * for cloning. Best if not true for non-eobjects.
- * @return the addedValues or the clones if it was cloned.
- *
- * @since 1.1.0
- */
- protected static Object doAddAllToEnd(ChangeDescription cd, List fcs, EStructuralFeature feature, Collection addedValues, boolean newValue) {
- FeatureChange fc = getFeatureChange(fcs, feature);
- if (newValue) {
- try {
- addedValues = EcoreUtil.copyAll(addedValues);
- cd.getObjectsToAttach().addAll(addedValues);
- } catch (ClassCastException e) {
- // Normally should not occur, but if it does, it means we can't clone, so don't clone.
- }
- }
- List lcs = fc.getListChanges();
- // Find the one with add and -1, i.e. add to end. There should only be one.
- ListChange lc = null;
- for (int i = 0; i < lcs.size(); i++) {
- ListChange lca = (ListChange) lcs.get(i);
- if (lca.getKind() == ChangeKind.ADD_LITERAL && lca.getIndex() == -1) {
- lc = lca;
- break;
- }
- }
- if (lc == null) {
- lc = ChangeFactory.eINSTANCE.createListChange();
- lcs.add(lc);
- }
-
- lc.getValues().addAll(addedValues);
- return addedValues;
- }
-
- /**
- * Create a change for set a given feature (must be !isMany()). If newValue is true, then this means this is not a pointer to an existing object
- * and so it must be cloned. It is assumed that there will be no further changes to this object because those will not be known about.
- * <p>
- * Any further sets to this feature will result in the previous setting being lost.
- *
- * @param cd
- * @param fcs
- * feature change list from the ChangeDescripion.getObjectChanges for the given object.
- * @param feature
- * the feature being set to.
- * @param setValue
- * the value being set.
- * @param newValue
- * <code>true</code> if new object in the resource, a clone will be made. <code>false</code> if an existing object. Must be an
- * EObject for cloning. Best if not true for non-eobjects.
- * @return the setValue or the clone if it was cloned.
- *
- * @since 1.1.0
- */
- protected static Object doSet(ChangeDescription cd, List fcs, EStructuralFeature feature, Object setValue, boolean newValue) {
-
- FeatureChange fc = getFeatureChange(fcs, feature);
- if (newValue) {
- try {
- setValue = EcoreUtil.copy((EObject) setValue);
- cd.getObjectsToAttach().add((EObject)setValue);
- } catch (ClassCastException e) {
- // Normally should not occur, but if it does, it means we can't clone, so don't clone.
- }
- }
-
- if (setValue instanceof EObject)
- fc.setReferenceValue((EObject) setValue);
- else
- fc.setDataValue(EcoreUtil.convertToString((EDataType) feature.getEType(), setValue));
- return setValue;
- }
-}
diff --git a/plugins/org.eclipse.jem.beaninfo/beaninfo/org/eclipse/jem/internal/beaninfo/adapters/BeaninfoAdapterFactory.java b/plugins/org.eclipse.jem.beaninfo/beaninfo/org/eclipse/jem/internal/beaninfo/adapters/BeaninfoAdapterFactory.java
deleted file mode 100644
index ef87e8f..0000000
--- a/plugins/org.eclipse.jem.beaninfo/beaninfo/org/eclipse/jem/internal/beaninfo/adapters/BeaninfoAdapterFactory.java
+++ /dev/null
@@ -1,255 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2001, 2005 IBM Corporation and others.
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
- *
- * Contributors:
- * IBM Corporation - initial API and implementation
- *******************************************************************************/
-package org.eclipse.jem.internal.beaninfo.adapters;
-/*
-
-
- */
-import java.lang.ref.ReferenceQueue;
-import java.lang.ref.WeakReference;
-import java.util.*;
-
-import org.eclipse.core.resources.IProject;
-import org.eclipse.emf.common.notify.Adapter;
-import org.eclipse.emf.common.notify.Notifier;
-import org.eclipse.emf.common.notify.impl.AdapterFactoryImpl;
-import org.eclipse.emf.ecore.resource.ResourceSet;
-
-import org.eclipse.jem.internal.beaninfo.core.*;
-import org.eclipse.jem.internal.java.beaninfo.IIntrospectionAdapter;
-import org.eclipse.jem.internal.proxy.core.ProxyFactoryRegistry;
-import org.eclipse.jem.java.ArrayType;
-import org.eclipse.jem.util.emf.workbench.ProjectResourceSet;
-/**
- * BeaninfoAdapterFactory - the factory for
- * beaninfo introspection to populate the Java Model.
- * Creation date: (11/1/2000 11:52:55 AM)
- * @author: Administrator
- */
-public class BeaninfoAdapterFactory extends AdapterFactoryImpl {
- protected IBeaninfoSupplier fInfoSupplier;
-
- // Maintain a mapping of the source objects to the adaptors which have
- // introspected from them. This allows a close operation to force those
- // adapters to clear out the data. It also allows for marking an adapter as stale
- // so that next time it introspects it will re-get the data.
- //
- // This is a WeakReference so that we don't hold onto adapters that were
- // explicitly removed in other ways.
- private Map fIntrospected = new HashMap(); // NOTE: This is to be accessed only under sync(this)!
- private ReferenceQueue fRefQ = new ReferenceQueue();
- private static class WeakValue extends WeakReference {
- private Object key;
- public WeakValue(Object aKey, Object value, ReferenceQueue que) {
- super(value, que);
- key = aKey;
- }
-
- public Object getKey() {
- return key;
- }
- };
-
- public BeaninfoAdapterFactory(IBeaninfoSupplier supplier) {
- fInfoSupplier = supplier;
- }
-
- public Adapter createAdapter(Notifier target, Object type) {
- if (type == IIntrospectionAdapter.ADAPTER_KEY) {
- return !(target instanceof ArrayType) ? new BeaninfoClassAdapter(this) : null; // Array types don't have beaninfo adapters.
- } else
- return new BeaninfoSuperAdapter();
- }
-
- /**
- * @see org.eclipse.emf.common.notify.AdapterFactory#isFactoryForType(Object)
- */
- public boolean isFactoryForType(Object type) {
- return IIntrospectionAdapter.ADAPTER_KEY == type || BeaninfoSuperAdapter.ADAPTER_KEY == type;
- }
-
- public ProxyFactoryRegistry getRegistry() {
- return fInfoSupplier.getRegistry();
- }
-
- public boolean isRegistryCreated() {
- return fInfoSupplier.isRegistryCreated();
- }
-
- public ProxyFactoryRegistry recycleRegistry() {
- markAllStale(); // At this point in time we need to mark them all stale because we are recycling. MarkAllStale also closes the registry.
- return getRegistry();
- }
-
- public IProject getProject() {
- return fInfoSupplier.getProject();
- }
-
- public ProjectResourceSet getNewResourceSet() {
- return fInfoSupplier.getNewResourceSet();
- }
-
- public ResourceSet getProjectResourceSet() {
- return fInfoSupplier.getProjectResourceSet();
- }
-
- /**
- * Close ALL adapters. Also remove the adapters so that they
- * are not being held onto. This means we are closing the project or removing the nature.
- */
- public void closeAll(boolean clearResults) {
- processQueue();
- synchronized (this) {
- // We are going to be removing all of them, so just set introspected to an empty one
- // and use the real one. This way we won't get concurrent modifications as we remove
- // it from the notifier removeAdapter.
- Map intr = fIntrospected;
- fIntrospected = Collections.EMPTY_MAP; // Since we are closing we can keep the unmodifiable one here.
- Iterator i = intr.values().iterator();
- while (i.hasNext()) {
- BeaninfoClassAdapter a = (BeaninfoClassAdapter) ((WeakValue) i.next()).get();
- if (a != null) {
- if (clearResults)
- a.clearIntrospection();
- Notifier notifier = a.getTarget();
- if (notifier != null)
- notifier.eAdapters().remove(a);
- }
- }
- }
- }
-
- /**
- * Mark all stale, but leave the overrides alone. The overrides aren't stale.
- *
- *
- * @since 1.1.0.1
- */
- public void markAllStale() {
- markAllStale(false);
- }
-
- /**
- * Mark the package as stale. The overrides are left alone since they are not stale.
- *
- * @param packageName name of package ('.' qualified).
- * @since 1.2.1
- */
- public void markPackageStale(String packageName) {
- processQueue();
- packageName+='.'; // Include the '.' so that can distinguish package from class.
- synchronized (this) {
- Iterator itr = fIntrospected.entrySet().iterator();
- while (itr.hasNext()) {
- Map.Entry entry = (Map.Entry) itr.next();
- String entryName = (String) entry.getKey();
- if (entryName.startsWith(packageName)) {
- // It is the item or one of its inner classes.
- WeakValue ref = (WeakValue) entry.getValue();
- BeaninfoClassAdapter a = (BeaninfoClassAdapter) ref.get();
- if (a != null) {
- a.markStaleFactory(isRegistryCreated() ? getRegistry() : null); // Mark it stale with the current registry.
- }
- }
- }
- }
- }
-
- /**
- * Mark ALL adapters as stale. This occurs because we've recycled the registry.
- *
- * @param clearOverrides clear the overrides too. This is full-fledged stale. The overrides are stale too.
- */
- public void markAllStale(boolean clearOverrides) {
- ProxyFactoryRegistry fact = isRegistryCreated() ? getRegistry() : null;
- processQueue();
- synchronized (this) {
- Iterator i = fIntrospected.values().iterator();
- while (i.hasNext()) {
- BeaninfoClassAdapter a = (BeaninfoClassAdapter) ((WeakValue) i.next()).get();
- if (a != null)
- a.markStaleFactory(fact, clearOverrides);
- }
- fInfoSupplier.closeRegistry(); // Get rid of the registry now since it is not needed. This way we won't accidentily hold onto it when not needed.
- }
- }
- /**
- * Mark the introspection as stale for a source object. Also clear results if told to.
- * @param sourceName Fully qualified source name, use type for reflection, i.e. "a.b.c.Class1$InnerClass"
- * @param clearResults clear out the results. If false, they will be reused if possible on recycle.
- */
- public void markStaleIntrospection(String sourceName, boolean clearResults) {
- processQueue();
- synchronized (this) {
- WeakValue ref = (WeakValue) fIntrospected.get(sourceName);
- if (ref != null) {
- BeaninfoClassAdapter a = (BeaninfoClassAdapter) ref.get();
- if (a != null) {
- if (clearResults)
- a.clearIntrospection();
- a.markStaleFactory(isRegistryCreated() ? getRegistry() : null); // Mark it stale with the current registry.
- }
- }
- }
- }
-
- public void markStaleIntrospectionPlusInner(String sourceName, boolean clearResults) {
- processQueue();
- String sourceNameForInner = sourceName + '$';
- synchronized (this) {
- Iterator itr = fIntrospected.entrySet().iterator();
- while (itr.hasNext()) {
- Map.Entry entry = (Map.Entry) itr.next();
- String entryName = (String) entry.getKey();
- if (entryName.equals(sourceName) || entryName.startsWith(sourceNameForInner)) {
- // It is the item or one of its inner classes.
- WeakValue ref = (WeakValue) entry.getValue();
- BeaninfoClassAdapter a = (BeaninfoClassAdapter) ref.get();
- if (a != null) {
- if (clearResults)
- a.clearIntrospection();
- a.markStaleFactory(isRegistryCreated() ? getRegistry() : null); // Mark it stale with the current registry.
- }
- }
- }
- }
- }
-
- /**
- * Register an adapter for introspection.
- * @param sourceName Fully qualified source name, use type for reflection, i.e. "a.b.c.Class1$InnerClass"
- * @param adapter The adapter to register
- */
- public void registerIntrospection(String sourceName, BeaninfoClassAdapter adapter) {
- // Create it as a weak reference so that it doesn't hold onto the adapter if it is ever removed
- // and thrown away (or the MOF resource itself is thrown away).
- processQueue();
- synchronized (this) {
- fIntrospected.put(sourceName, new WeakValue(sourceName, adapter, fRefQ));
- }
- }
-
- /**
- * Remove adapter. This happens in the case that adapter is being removed and
- * we want to remove it from our list. This is an internal API only for use by
- * the adapter itself.
- */
- public synchronized void removeAdapter(BeaninfoClassAdapter a) {
- fIntrospected.remove(a.getJavaClass().getQualifiedNameForReflection());
- }
-
- private synchronized void processQueue() {
- WeakValue wv;
- while ((wv = (WeakValue) fRefQ.poll()) != null) {
- fIntrospected.remove(wv.getKey());
- }
- }
-}
diff --git a/plugins/org.eclipse.jem.beaninfo/beaninfo/org/eclipse/jem/internal/beaninfo/adapters/BeaninfoClassAdapter.java b/plugins/org.eclipse.jem.beaninfo/beaninfo/org/eclipse/jem/internal/beaninfo/adapters/BeaninfoClassAdapter.java
deleted file mode 100644
index c3ab399..0000000
--- a/plugins/org.eclipse.jem.beaninfo/beaninfo/org/eclipse/jem/internal/beaninfo/adapters/BeaninfoClassAdapter.java
+++ /dev/null
@@ -1,2678 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2001, 2006 IBM Corporation and others.
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
- *
- * Contributors:
- * IBM Corporation - initial API and implementation
- *******************************************************************************/
-package org.eclipse.jem.internal.beaninfo.adapters;
-/*
-
-
- */
-
-import java.io.FileNotFoundException;
-import java.lang.ref.WeakReference;
-import java.lang.reflect.Field;
-import java.lang.reflect.InvocationTargetException;
-import java.text.MessageFormat;
-import java.util.*;
-import java.util.logging.Level;
-import java.util.regex.Pattern;
-
-import org.eclipse.core.resources.*;
-import org.eclipse.core.runtime.*;
-import org.eclipse.emf.common.notify.*;
-import org.eclipse.emf.common.notify.impl.AdapterImpl;
-import org.eclipse.emf.common.util.*;
-import org.eclipse.emf.ecore.*;
-import org.eclipse.emf.ecore.change.*;
-import org.eclipse.emf.ecore.impl.ENotificationImpl;
-import org.eclipse.emf.ecore.impl.ESuperAdapter;
-import org.eclipse.emf.ecore.resource.Resource;
-import org.eclipse.emf.ecore.resource.ResourceSet;
-import org.eclipse.emf.ecore.util.*;
-import org.eclipse.emf.ecore.xmi.PackageNotFoundException;
-import org.eclipse.emf.ecore.xmi.XMIResource;
-
-import org.eclipse.jem.internal.beaninfo.*;
-import org.eclipse.jem.internal.beaninfo.common.*;
-import org.eclipse.jem.internal.beaninfo.core.*;
-import org.eclipse.jem.internal.beaninfo.core.BeanInfoCacheController.ClassEntry;
-import org.eclipse.jem.internal.java.beaninfo.IIntrospectionAdapter;
-import org.eclipse.jem.internal.proxy.core.*;
-import org.eclipse.jem.java.*;
-import org.eclipse.jem.java.internal.impl.JavaClassImpl;
-import org.eclipse.jem.util.TimerTests;
-import org.eclipse.jem.util.logger.proxy.Logger;
-
-/**
- * Beaninfo adapter for doing introspection on a Java Model class.
- * <p>
- * The first time a introspect request is made, it will use the ClassEntry from the cache controller to determine if it should load from the
- * cache or do a complete introspection. After that it will always do a complete introspection when it is marked as needing introspection.
- * This is because the cache is useless to us then. At that point in time we already know that we or one of our superclasses or one of
- * outer classes has changed, thereby requiring us to reintrospect, the cache is invalid at that point. Also once we did an introspection we
- * don't want to do a load from cache but instead do a merge because someone may of been holding onto the features and we don't want to
- * throw them away unnecessarily.
- * <p>
- * TODO Need to re-look into this to see if we can do a merge with the cache file because if it was an external jar and it has now gone
- * valid, why waste time reintrospecting. But this needs to be carefully thought about.
- * <p>
- * The resource change listener
- * will automatically mark any subclasses (both the BeaninfoClassAdapter and the ClassEntry) as being stale for us. That way we don't need
- * to waste time checking the ce and superclasses everytime. We will keep the ClassEntry around simply to make the marking of it as stale easier for the
- * resource listener. Finding the ce everytime would be expensive.
- * <p>
- * This is the process for determining if introspection required:
- * <ol>
- * <li>If needsIntrospection flag is false, then do nothing. Doesn't need introspection.
- * <li>If class is undefined, then just set up for an undefined class and return. (In this case the CE should be thrown away, it should of been deleted).
- * <li>If never introspected (not RETRIEVED_FULL_DOCUMENT), get the CE, get the modification stamp and call isStaleStamp. This determines if this
- * stamp or any super class stamp is stale wrt to current stamp. If it is not stale, then load from cache because the cache is good.
- * <li>If no cache or cache is stale or has introspected once, then introspect and replace cache.
- * </ol>
- *
- */
-
-public class BeaninfoClassAdapter extends AdapterImpl implements IIntrospectionAdapter {
-
- public static final String REFLECT_PROPERTIES = "Reflect properties"; // Reflect properties in IDE //$NON-NLS-1$
- public static final String APPLY_EXTENSIONS = "Apply Overrides"; // Apply override files //$NON-NLS-1$
- public static final String REMOTE_INTROSPECT = "Remote Introspect"; // Introspect on remote //$NON-NLS-1$
- public static final String INTROSPECT = "Introspect"; // Straight introspection, whether load from cache or introspect. //$NON-NLS-1$
- public static final String LOAD_FROM_CACHE = "Load from Cache"; //$NON-NLS-1$
-
-
- public static BeaninfoClassAdapter getBeaninfoClassAdapter(EObject jc) {
- return (BeaninfoClassAdapter) EcoreUtil.getExistingAdapter(jc, IIntrospectionAdapter.ADAPTER_KEY);
- }
-
- /**
- * Clear out the introspection because introspection is being closed or removed from the project.
- * Don't want anything hanging around that we had done.
- */
- public void clearIntrospection() {
- // Clear out the beandecorator if implicitly created.
- Iterator beanItr = getJavaClass().getEAnnotationsInternal().iterator();
- while (beanItr.hasNext()) {
- EAnnotation dec = (EAnnotation) beanItr.next();
- if (dec instanceof BeanDecorator) {
- BeanDecorator decor = (BeanDecorator) dec;
- if (decor.getImplicitDecoratorFlag() == ImplicitItem.IMPLICIT_DECORATOR_LITERAL) {
- beanItr.remove();
- ((InternalEObject) decor).eSetProxyURI(BAD_URI); // Mark it as bad proxy so we know it is no longer any use.
- } else {
- BeanInfoDecoratorUtility.clear((BeanDecorator) dec);
- }
- break;
- }
- }
- // Clear out the features that we implicitly created.
- Iterator propItr = getJavaClass().getEStructuralFeaturesInternal().iterator();
- while (propItr.hasNext()) {
- EStructuralFeature prop = (EStructuralFeature) propItr.next();
- Iterator pdItr = prop.getEAnnotations().iterator();
- while (pdItr.hasNext()) {
- EAnnotation dec = (EAnnotation) pdItr.next();
- if (dec instanceof PropertyDecorator) {
- PropertyDecorator pd = (PropertyDecorator) dec;
- if (pd.getImplicitDecoratorFlag() == ImplicitItem.NOT_IMPLICIT_LITERAL)
- BeanInfoDecoratorUtility.clear(pd);
- else {
- pdItr.remove(); // Remove it from the property.
- ((InternalEObject) pd).eSetProxyURI(BAD_URI); // Mark it as bad proxy so we know it is no longer any use.
- }
- if (pd.getImplicitDecoratorFlag() == ImplicitItem.IMPLICIT_DECORATOR_AND_FEATURE_LITERAL) {
- propItr.remove(); // Remove the feature itself
- ((InternalEObject) prop).eSetProxyURI(BAD_URI); // Mark it as bad proxy so we know it is no longer any use.
- }
- break;
- }
- }
- }
-
- // Clear out the operations that we implicitly created.
- Iterator operItr = getJavaClass().getEOperationsInternal().iterator();
- while (operItr.hasNext()) {
- EOperation oper = (EOperation) operItr.next();
- Iterator mdItr = oper.getEAnnotations().iterator();
- while (mdItr.hasNext()) {
- EAnnotation dec = (EAnnotation) mdItr.next();
- if (dec instanceof MethodDecorator) {
- MethodDecorator md = (MethodDecorator) dec;
- if (md.getImplicitDecoratorFlag() == ImplicitItem.NOT_IMPLICIT_LITERAL)
- BeanInfoDecoratorUtility.clear(md);
- else {
- mdItr.remove(); // Remove it from the operation.
- ((InternalEObject) md).eSetProxyURI(BAD_URI); // Mark it as bad proxy so we know it is no longer any use.
- }
- if (md.getImplicitDecoratorFlag() == ImplicitItem.IMPLICIT_DECORATOR_AND_FEATURE_LITERAL) {
- operItr.remove(); // Remove the oepration itself
- ((InternalEObject) oper).eSetProxyURI(BAD_URI); // Mark it as bad proxy so we know it is no longer any use.
- }
- break;
- }
- }
-
- // Clear out the events that we implicitly created.
- Iterator evtItr = getJavaClass().getEventsGen().iterator();
- while (evtItr.hasNext()) {
- JavaEvent evt = (JavaEvent) evtItr.next();
- Iterator edItr = evt.getEAnnotations().iterator();
- while (edItr.hasNext()) {
- EAnnotation dec = (EAnnotation) edItr.next();
- if (dec instanceof EventSetDecorator) {
- EventSetDecorator ed = (EventSetDecorator) dec;
- if (ed.getImplicitDecoratorFlag() == ImplicitItem.NOT_IMPLICIT_LITERAL)
- BeanInfoDecoratorUtility.clear(ed);
- else {
- edItr.remove(); // Remove it from the event.
- ((InternalEObject) ed).eSetProxyURI(BAD_URI); // Mark it as bad proxy so we know it is no longer any use.
- }
- if (ed.getImplicitDecoratorFlag() == ImplicitItem.IMPLICIT_DECORATOR_AND_FEATURE_LITERAL) {
- evtItr.remove(); // Remove the event itself
- ((InternalEObject) evt).eSetProxyURI(BAD_URI); // Mark it as bad proxy so we know it is no longer any use.
- }
- break;
- }
- }
- }
- }
-
- synchronized(this) {
- needsIntrospection = true;
- }
- }
-
- private void clearAll() {
- clearIntrospection(); // First get rid of the ones we did so that they are marked as proxies.
-
- // Clear out the annotations.
- getJavaClass().getEAnnotationsInternal().clear();
- // Clear out the attributes.
- getJavaClass().getEStructuralFeaturesInternal().clear();
- // Clear out the operations.
- getJavaClass().getEOperationsInternal().clear();
- // Clear out the events.
- getJavaClass().getEventsGen().clear();
-
- retrievedExtensionDocument = NEVER_RETRIEVED_EXTENSION_DOCUMENT; // Since we cleared everything, go back to no doc applied.
- }
-
-
- /**
- * @version 1.0
- * @author
- */
-
- // A URI that will never resolve. Used to mark an object as no longer valid.
- protected static final URI BAD_URI = URI.createURI("baduri"); //$NON-NLS-1$
-
- protected boolean needsIntrospection = true;
-
- protected BeanInfoCacheController.ClassEntry classEntry;
-
- protected boolean isIntrospecting;
-
- protected boolean isDoingAllProperties;
-
- protected boolean isDoingAllOperations;
-
- protected boolean isDoingAllEvents;
-
- protected final static int
- NEVER_RETRIEVED_EXTENSION_DOCUMENT = 0,
- RETRIEVED_ROOT_ONLY = 1,
- RETRIEVED_FULL_DOCUMENT = 2,
- CLEAR_EXTENSIONS = 3;
- protected int retrievedExtensionDocument = NEVER_RETRIEVED_EXTENSION_DOCUMENT;
-
- protected BeaninfoAdapterFactory adapterFactory;
-
- private WeakReference staleFactory; // When reference not null, then this factory is a stale factory and
- // a new one is needed when the factory returned == this one.
- // It is a WeakRef so that if the factory goes away on its own
- // that we don't hold onto it.
-
- // A temporary hashset of the local properties. Used when creating a new
- // property to use the old one. It is cleared out at the end of attribute introspection.
- // It is only built once during attribute introspection so that we have the snapshot
- // of before the introspection (i.e. the ones that were specifically added by users
- // and not through introspection). The ones that we are adding do not need to be checked
- // against each other because there will not be conflicts.
- //
- // Also at the end, we will go through the properties and see if it exists in the fPropertiesMap and
- // it is not the value Boolean.FALSE in the map, and the entry is implicitly created. This means this
- // was an implicit entry from the previous introspection and was not re-created in this introspection.
- private HashMap propertiesMap;
- private List featuresRealList; // Temp pointer to the real list we are building. It is the true list in java class.
-
- // A temporary hashmap of the local operations. Used when creating a new
- // operation to reuse the old one. It is cleared out at the end of operation introspection.
- // It is only built once during operation introspection so that we have the snapshot
- // of before the introspection.
- private HashMap operationsMap;
- private EList operationsRealList; // Temp pointer to the real list we are building. It is the true list in java class.
- // A set of operations as we create them so that we which ones we added/kept and which are no longer in use and can be removed.
- // If they aren't in this set at the end, then we know it should be removed if it is one we had created in the past.
- private HashSet newoperations;
-
- // A temporary hashset of the local events. Used when creating a new
- // event to use the old one. It is cleared out at the end of event introspection.
- // It is only built once during event introspection so that we have the snapshot
- // of before the introspection (i.e. the ones that were specifically added by users
- // and not through introspection). The ones that we are adding do not need to be checked
- // against each other because there will not be conflicts.
- //
- // Also at the end, we will go through the events and see if it exists in the fEventsMap and
- // it is not the value Boolean.FALSE in the map, and the entry is implicitly created. This means this
- // was an implicit entry from the previous introspection and was not re-created in this introspection.
- private HashMap eventsMap;
- private EList eventsRealList; // Temp pointer to the real list we are building. It is the true list in java class.
-
- private Boolean defaultBound;
- // Whether this class is default bound or not (i.e. does this class implement add/remove property change listener. If null, then not yet queried.
-
- public BeaninfoClassAdapter(BeaninfoAdapterFactory factory) {
- super();
- adapterFactory = factory;
- }
-
- /*
- * Answer whether this java class is still connected to a live resource. It happens during unloading
- * that we are no longer connected to a resource (because the javapackage has already been processed and
- * unloaded) or the resource is in the process of being unloaded, but the unloading process will still
- * call accessors on this java class, which will come over here. In those cases we should treat as
- * introspection completed without doing anything.
- */
- protected boolean isResourceConnected() {
- Resource res = getJavaClass().eResource();
- return res != null && res.isLoaded();
- }
-
- protected final ProxyFactoryRegistry getRegistry() {
- ProxyFactoryRegistry factory = adapterFactory.getRegistry();
- if (staleFactory != null && factory == staleFactory.get()) {
- // We need to recycle the factory. The returned factory is the same factory when it went stale.
- factory = adapterFactory.recycleRegistry();
- }
- staleFactory = null; // Whether we recycled or not, it is no longer stale.
- return factory;
- }
-
- /**
- * Return whether this adapter has been marked as stale. Needed
- * by the users so that they can recycle if necessary.
- */
- public boolean isStale() {
- return staleFactory != null;
- }
-
- protected BeaninfoAdapterFactory getAdapterFactory() {
- return adapterFactory;
- }
-
- public boolean isAdapterForType(Object key) {
- return IIntrospectionAdapter.ADAPTER_KEY.equals(key);
- }
-
- /**
- * This map is keyed by name. It is a snapshot of the properties at the
- * time the introspection/reflection of properties was started. It is used
- * for quick lookup.
- *
- * Once a property is used, the entry is replaced with a Boolean.FALSE. This
- * is so we know which have already been used and at the end, which need
- * to be deleted since they weren't used (i.e. the ones that aren't FALSE).
- */
- protected HashMap getPropertiesMap() {
- if (propertiesMap == null) {
- List localFeatures = getJavaClass().getEStructuralFeaturesInternal();
- propertiesMap = new HashMap(localFeatures.size());
- Iterator itr = localFeatures.iterator();
- while (itr.hasNext()) {
- EStructuralFeature feature = (EStructuralFeature) itr.next();
- propertiesMap.put(feature.getName(), feature);
- }
- }
- return propertiesMap;
- }
-
- /**
- * Get it once so that we don't need to keep getting it over and over.
- */
- protected List getFeaturesList() {
- if (featuresRealList == null)
- featuresRealList = getJavaClass().getEStructuralFeaturesInternal();
- return featuresRealList;
- }
-
- /**
- * The map is keyed by longName. If a Method is passed in, then the
- * id of the method is used (this is in reflection), if an IBeanProxy
- * is passed in, then an id is created and looked up (this is in introspection).
- * The map is used for a quick lookup of behaviors at the time introspection
- * of behaviors started.
- */
- protected HashMap getOperationsMap() {
- if (operationsMap == null) {
- List locals = getJavaClass().getEOperationsInternal();
- int l = locals.size();
- operationsMap = new HashMap(l);
- for (int i = 0; i < l; i++) {
- EOperation op = (EOperation) locals.get(i);
- operationsMap.put(formLongName(op), op);
- }
- }
- return operationsMap;
- }
-
- /**
- * Get it once so that we don't need to keep getting it over and over.
- */
- protected EList getOperationsList() {
- if (operationsRealList == null)
- operationsRealList = getJavaClass().getEOperationsInternal();
- return operationsRealList;
- }
-
- /**
- * The map is keyed by name.
- * The map is used for a quick lookup of events at the time introspection
- * of events started.
- *
- * Once an event is used, the entry is replaced with a Boolean.FALSE. This
- * is so we know which have already been used and at the end, which need
- * to be deleted since they weren't used (i.e. the ones that aren't FALSE).
- */
- protected HashMap getEventsMap() {
- if (eventsMap == null) {
- List locals = getJavaClass().getEventsGen();
- eventsMap = new HashMap(locals.size());
- Iterator itr = locals.iterator();
- while (itr.hasNext()) {
- JavaEvent event = (JavaEvent) itr.next();
- eventsMap.put(event.getName(), event);
- }
- }
- return eventsMap;
- }
-
- /**
- * Get it once so that we don't need to keep getting it over and over.
- */
- protected EList getEventsList() {
- if (eventsRealList == null)
- eventsRealList = getJavaClass().getEventsGen();
- return eventsRealList;
- }
-
- public void introspectIfNecessary() {
- introspectIfNecessary(false);
- }
-
- protected void introspectIfNecessary(boolean doOperations) {
- boolean doIntrospection = false;
- synchronized (this) {
- doIntrospection = needsIntrospection && !isIntrospecting;
- if (doIntrospection)
- isIntrospecting = true;
- }
- if (doIntrospection) {
- boolean didIntrospection = false;
- try {
- introspect(doOperations);
- didIntrospection = true;
- } catch (Exception e) {
- BeaninfoPlugin.getPlugin().getLogger().log(
- new Status(
- IStatus.WARNING,
- BeaninfoPlugin.getPlugin().getBundle().getSymbolicName(),
- 0,
- MessageFormat.format(
- BeanInfoAdapterMessages.INTROSPECT_FAILED_EXC_,
- new Object[] { getJavaClass().getJavaName(), ""}), //$NON-NLS-1$
- e));
- } finally {
- synchronized (this) {
- isIntrospecting = false;
- needsIntrospection = !didIntrospection;
- }
- }
- }
- }
-
- /**
- * Get the class entry.
- * @return
- *
- * @since 1.1.0
- */
- public BeanInfoCacheController.ClassEntry getClassEntry() {
- return classEntry;
- }
-
- private boolean canUseCache() {
- // We check our level, we assume not stale unless CE says stale.
- synchronized (this) {
- // We may already have a class entry due to a subclass doing a check, so if we do, we'll use it. Else we'll get the latest one.
- if (classEntry == null)
- classEntry = BeanInfoCacheController.INSTANCE.getClassEntry(getJavaClass());
- if (classEntry != null) {
- // We have a cache to check.
- long modStamp = classEntry.getModificationStamp();
- // A sanity check, if this was an old, but now deleted one we want to throw it away and get it again. It may now be valid.
- if (modStamp == BeanInfoCacheController.ClassEntry.DELETED_MODIFICATION_STAMP) {
- classEntry = BeanInfoCacheController.INSTANCE.getClassEntry(getJavaClass());
- if (classEntry != null)
- modStamp = classEntry.getModificationStamp();
- }
- if (modStamp == IResource.NULL_STAMP || modStamp == BeanInfoCacheController.ClassEntry.DELETED_MODIFICATION_STAMP)
- return false; // We are stale.
- } else
- return false; // We don't have a cache entry to check against, which means are deleted, or never cached.
- }
-
- // Now try the supers to see if we are out of date to them.
- // Note: Only if this is an interface could there be more than one eSuperType.
- List supers = getJavaClass().getESuperTypes();
- if (!supers.isEmpty()) {
- BeaninfoClassAdapter bca = getBeaninfoClassAdapter((EObject) supers.get(0));
- ClassEntry superCE = bca.getClassEntry();
- // If super is defined and out of date don't use cache. If super is undefined and super modification stamp is not super_undefined,
- // then that means it was defined at time of cache and now not defined, so don't use cache.
- if (superCE != null) {
- if (superCE.getModificationStamp() != classEntry.getSuperModificationStamp())
- return false; // Out-of-date wrt/super.
- } else if (classEntry.getSuperModificationStamp() != ClassEntry.SUPER_UNDEFINED_MODIFICATION_STAMP)
- return false; // was previously defined, and now undefined, so out of date.
- String[] iNames = classEntry.getInterfaceNames();
- if (iNames != null) {
- if (iNames.length != supers.size() - 1)
- return false; // We have a different number of supers, so stale.
- // Now the interfaces may not be in the same order, but there shouldn't be too many, so we'll use O(n2) lookup. We'll try starting at
- // the same index just in case. That way if they are the same order it will be linear instead. Most likely will be same order.
- long[] iStamp = classEntry.getInterfaceModificationStamps();
- for (int i = 1; i <= iNames.length; i++) {
- JavaClass javaClass = (JavaClass) supers.get(i);
- String intName = (javaClass).getQualifiedNameForReflection();
- // Find it in the names list.
- int stop = i-1;
- int indx = stop; // Start at the stop, when we hit it again we will be done.
- boolean found = false;
- do {
- if (iNames[indx].equals(intName)) {
- found = true;
- break;
- }
- } while ((++indx)%iNames.length != stop);
- if (!found)
- return false; // Couldn't find it, so we are stale.]
-
- superCE = getBeaninfoClassAdapter(javaClass).getClassEntry();
- if (superCE != null) {
- if (superCE.getModificationStamp() != iStamp[indx])
- return false; // Out-of-date wrt/interface.
- } else if (iStamp[indx] != ClassEntry.SUPER_UNDEFINED_MODIFICATION_STAMP)
- return false; // was previously defined, and now undefined, so out of date.
- }
- }
- }
- return true; // If we got here everything is ok.
- }
-
- private boolean canUseOverrideCache() {
- // We check our config stamp.
- // TODO in future can we listen for config changes and mark classes stale if the config changes?
- synchronized (this) {
- // We may already have a class entry due to a subclass doing a check, so if we do, we'll use it. Else we'll get the latest one.
- if (classEntry == null)
- classEntry = BeanInfoCacheController.INSTANCE.getClassEntry(getJavaClass());
- if (classEntry != null) {
- // We have a cache to check.
- // A sanity check, if this was an old, but now deleted one we want to throw it away and get it again. It may now be valid.
- if (classEntry.isDeleted()) {
- classEntry = BeanInfoCacheController.INSTANCE.getClassEntry(getJavaClass());
- if (classEntry != null)
- if (classEntry.isDeleted())
- return false; // We have been deleted. Probably shouldn't of gotton here in this case.
- }
- } else
- return false; // We don't have a cache entry to check against, which means are deleted, or never cached.
- return classEntry.getConfigurationModificationStamp() == Platform.getPlatformAdmin().getState(false).getTimeStamp();
- }
-
- }
-
- /**
- * Check if the cache for this entry is stale compared to the modification stamp, or if the modification stamp itself is stale, meaning
- * subclass was stale already.
- *
- * @param requestStamp the timestamp to compare against.
- * @return <code>true</code> if we can use the incoming cache stamp.
- *
- * @since 1.1.0
- */
- protected boolean canUseCache(long requestStamp) {
- long modStamp;
- // Now get the current mod stamp for this class so we can compare it.
- synchronized (this) {
- // We may already have a class entry due to a subclass doing a check, so if we do, we'll use it. Else we'll get the latest one.
- if (classEntry == null)
- classEntry = BeanInfoCacheController.INSTANCE.getClassEntry(getJavaClass());
- if (classEntry != null) {
- // We have a cache to check.
- modStamp = classEntry.getModificationStamp();
- // A sanity check, if this was an old, but now deleted one we want to throw it away and get it again. It may now be valid.
- if (modStamp == BeanInfoCacheController.ClassEntry.DELETED_MODIFICATION_STAMP) {
- classEntry = BeanInfoCacheController.INSTANCE.getClassEntry(getJavaClass());
- if (classEntry != null)
- modStamp = classEntry.getModificationStamp();
- }
- if (modStamp == IResource.NULL_STAMP && modStamp == BeanInfoCacheController.ClassEntry.DELETED_MODIFICATION_STAMP)
- return false; // Since we are stale, child asking question must also be stale and can't use the cache.
- } else
- return false; // We don't have a cache entry to check against, so child must be stale too.
- }
- // If the requested stamp is not the same as ours, then it is out of date (it couldn't be newer but it could be older).
- return requestStamp == modStamp;
- }
-
- /*
- * This should only be called through introspectIfNecessary so that flags are set correctly.
- */
- private void introspect(boolean doOperations) {
- IBeanProxy beaninfo = null;
- try {
- if (isResourceConnected()) {
- // See if are valid kind of class.
- if (getJavaClass().getKind() == TypeKind.UNDEFINED_LITERAL) {
- // Not valid, don't let any further introspection occur.
- // Mark that we've done all introspections so as not to waste time until we get notified that it has been added
- // back in.
- synchronized(this) {
- if (classEntry != null) {
- classEntry.markDeleted(); // mark it deleted in case still sitting in cache (maybe because it was in an external jar, we can't know if deleted when jar changed).
- classEntry = null; // Get rid of it since now deleted.
- }
- needsIntrospection = false;
- }
-
- if (retrievedExtensionDocument == RETRIEVED_FULL_DOCUMENT || retrievedExtensionDocument == CLEAR_EXTENSIONS) {
- // We've been defined at one point. Need to clear everything and step back
- // to never retrieved so that we now get the root added in. If we had been
- // previously defined, then we didn't have root. We will have to lose
- // all other updates too. But they can come back when we're defined.
- // Or we've been asked to clear all.
- clearAll();
- retrievedExtensionDocument = NEVER_RETRIEVED_EXTENSION_DOCUMENT;
- }
- if (retrievedExtensionDocument == NEVER_RETRIEVED_EXTENSION_DOCUMENT)
- applyExtensionDocument(true); // Add in Root stuff so that it will work correctly even though undefined.
- } else {
- // TODO For now cause recycle of vm if any super type is stale so that if registry is stale for the super type it will be
- // recreated. This is needed because reflection requires superProperties, etc. and recreating the registry
- // currently re-marks everyone as stale, including this subclass. This would mean that
- // re-introspection would need to be done, even though we just did it. The stale registry business needs to be re-addressed so that it is
- // a lot smarter.
- List supers = getJavaClass().getEAllSuperTypes();
- for (int i = 0; i < supers.size(); i++) {
- BeaninfoClassAdapter bca = (BeaninfoClassAdapter) EcoreUtil.getExistingAdapter((EObject) supers.get(i),
- IIntrospectionAdapter.ADAPTER_KEY);
- if (bca != null && bca.isStale())
- bca.getRegistry();
- }
- // Now we need to force introspection, if needed, of all parents because we need them to be up-to-date for the
- // class entry.
- // TODO see if we can come up with a better way that we KNOW the CE is correct, even if any supers are stale.
- supers = getJavaClass().getESuperTypes();
- for (int i = 0; i < supers.size(); i++) {
- BeaninfoClassAdapter bca = (BeaninfoClassAdapter) EcoreUtil.getRegisteredAdapter((EObject) supers.get(i),
- IIntrospectionAdapter.ADAPTER_KEY);
- bca.introspectIfNecessary();
- }
-
- TimerTests.basicTest.startCumulativeStep(INTROSPECT);
- if (retrievedExtensionDocument == RETRIEVED_ROOT_ONLY || retrievedExtensionDocument == CLEAR_EXTENSIONS) {
- // We need to clear out EVERYTHING because we are coming from an undefined to a defined.
- // Nothing previous is now valid. (Particularly the root stuff).
- // Or we had a Clean requested and need to clear the extensions too.
- clearAll();
- }
- boolean firstTime = false;
- if (retrievedExtensionDocument != RETRIEVED_FULL_DOCUMENT) {
- firstTime = true; // If we need to apply the extension doc, then this is the first time.
- applyExtensionDocument(false); // Apply the extension doc before we do anything.
- }
-
- // Now check to see if we can use the cache.
- boolean doIntrospection = true;
- if (firstTime) {
- // Check if we can use the cache. Use Max value so that first level test (ourself) will always pass and go on to the supers.
- if (canUseCache()) {
- TimerTests.basicTest.startCumulativeStep(LOAD_FROM_CACHE);
- // We can use the cache.
- Resource cres = BeanInfoCacheController.INSTANCE.getCache(getJavaClass(), classEntry, true);
- if (cres != null) {
- try {
- // Got a cache to use, now apply it.
- for (Iterator cds = cres.getContents().iterator(); cds.hasNext();) {
- ChangeDescription cacheCD = (ChangeDescription) cds.next();
- cacheCD.apply();
- }
- // We need to walk through and create the appropriate ID's for events/actions/properties because by
- // default from the change descriptions these don't get reflected back. And if some one doesn't
- // use an ID to get them, they won't have an id set.
- doIDs();
- doIntrospection = false;
- } catch (RuntimeException e) {
- BeaninfoPlugin.getPlugin().getLogger().log(
- MessageFormat.format(
- BeanInfoAdapterMessages.INTROSPECT_FAILED_EXC_,
- new Object[] { getJavaClass().getJavaName(), ""}), //$NON-NLS-1$
- Level.WARNING);
- BeaninfoPlugin.getPlugin().getLogger().log(e);
- } finally {
- // Remove the cres since it is now invalid. The applies cause them to be invalid.
- cres.getResourceSet().getResources().remove(cres);
- if (doIntrospection) {
- // Apply had failed. We don't know how far it went. We need to wipe out and reget EVERYTHING.
- clearAll();
- applyExtensionDocument(false); // Re-apply the extension doc before we do anything else.
- }
- }
- }
- TimerTests.basicTest.stopCumulativeStep(LOAD_FROM_CACHE);
- }
- }
-
- if (doIntrospection) {
- // Finally we can get to handling ourselves.
- TimerTests.basicTest.startCumulativeStep(REMOTE_INTROSPECT);
- BeanDecorator decor = Utilities.getBeanDecorator(getJavaClass());
- if (decor == null) {
- decor = BeaninfoFactory.eINSTANCE.createBeanDecorator();
- decor.setImplicitDecoratorFlag(ImplicitItem.IMPLICIT_DECORATOR_LITERAL);
- getJavaClass().getEAnnotations().add(decor);
- } else
- BeanInfoDecoratorUtility.clear(decor); // Clear out previous results.
-
- boolean doReflection = true;
- if (doOperations)
- newoperations = new HashSet(50);
- if (decor.isDoBeaninfo()) {
- int doFlags = 0;
- if (decor == null || decor.isMergeIntrospection())
- doFlags |= IBeanInfoIntrospectionConstants.DO_BEAN_DECOR;
- if (decor == null || decor.isIntrospectEvents())
- doFlags |= IBeanInfoIntrospectionConstants.DO_EVENTS;
- if (decor == null || decor.isIntrospectProperties())
- doFlags |= IBeanInfoIntrospectionConstants.DO_PROPERTIES;
- if (doOperations && (decor == null || decor.isIntrospectMethods()))
- doFlags |= IBeanInfoIntrospectionConstants.DO_METHODS;
-
- if (doFlags != 0) {
- // There was something remote to do.
- IBeanTypeProxy targetType = null;
- ProxyFactoryRegistry registry = getRegistry();
- if (registry != null && registry.isValid())
- targetType = registry.getBeanTypeProxyFactory().getBeanTypeProxy(getJavaClass().getQualifiedNameForReflection());
- if (targetType != null) {
- if (targetType.getInitializationError() == null) {
- // If an exception is thrown, treat this as no proxy, however log it because we
- // shouldn't have exceptions during introspection, but if we do it should be logged
- // so it can be corrected.
- try {
- BeaninfoProxyConstants proxyConstants = getProxyConstants();
- if (proxyConstants != null) {
- beaninfo = proxyConstants.getIntrospectProxy().invoke(
- null,
- new IBeanProxy[] { targetType,
- getRegistry().getBeanProxyFactory().createBeanProxyWith(false),
- getRegistry().getBeanProxyFactory().createBeanProxyWith(doFlags)});
- }
- } catch (ThrowableProxy e) {
- BeaninfoPlugin.getPlugin().getLogger().log(
- new Status(IStatus.WARNING, BeaninfoPlugin.getPlugin().getBundle().getSymbolicName(), 0,
- MessageFormat.format(BeanInfoAdapterMessages.INTROSPECT_FAILED_EXC_, new Object[] { //$NON-NLS-1$
- getJavaClass().getJavaName(), ""}), //$NON-NLS-1$
- e));
- }
- } else {
- // The class itself couldn't be initialized. Just log it, but treat as no proxy.
- BeaninfoPlugin.getPlugin().getLogger()
- .log(
- new Status(IStatus.WARNING, BeaninfoPlugin.getPlugin().getBundle().getSymbolicName(), 0,
- MessageFormat.format(BeanInfoAdapterMessages.INTROSPECT_FAILED_EXC_, new Object[] { //$NON-NLS-1$
- getJavaClass().getJavaName(), targetType.getInitializationError()}), null));
- }
- } else {
- // The class itself could not be found. Just log it, but treat as no proxy.
- BeaninfoPlugin.getPlugin().getLogger().log(
- new Status(IStatus.INFO, BeaninfoPlugin.getPlugin().getBundle().getSymbolicName(), 0, MessageFormat.format(
- BeanInfoAdapterMessages.INTROSPECT_FAILED_EXC_, new Object[] {
- getJavaClass().getJavaName(),
- BeanInfoAdapterMessages.BeaninfoClassAdapter_ClassNotFound}),
- null));
- }
-
- if (beaninfo != null) {
- doReflection = false; // We have a beaninfo, so we are doing introspection.
- final BeanDecorator bdecor = decor;
- // We have a beaninfo to process.
- BeanInfoDecoratorUtility.introspect(beaninfo, new BeanInfoDecoratorUtility.IntrospectCallBack() {
-
- /*; (non-Javadoc)
- * @see org.eclipse.jem.internal.beaninfo.adapters.BeanInfoDecoratorUtility.IntrospectCallBack#process(org.eclipse.jem.internal.beaninfo.common.BeanRecord)
- */
- public BeanDecorator process(BeanRecord record) {
- return bdecor;
- }
-
- /* (non-Javadoc)
- * @see org.eclipse.jem.internal.beaninfo.adapters.BeanInfoDecoratorUtility.IntrospectCallBack#process(org.eclipse.jem.internal.beaninfo.common.PropertyRecord)
- */
- public PropertyDecorator process(PropertyRecord record) {
- return calculateProperty(record, false);
- }
-
- /* (non-Javadoc)
- * @see org.eclipse.jem.internal.beaninfo.adapters.BeanInfoDecoratorUtility.IntrospectCallBack#process(org.eclipse.jem.internal.beaninfo.common.IndexedPropertyRecord)
- */
- public PropertyDecorator process(IndexedPropertyRecord record) {
- return calculateProperty(record, true);
- }
-
- /* (non-Javadoc)
- * @see org.eclipse.jem.internal.beaninfo.adapters.BeanInfoDecoratorUtility.IntrospectCallBack#process(org.eclipse.jem.internal.beaninfo.common.MethodRecord)
- */
- public MethodDecorator process(MethodRecord record) {
- return calculateOperation(record);
- }
-
- /* (non-Javadoc)
- * @see org.eclipse.jem.internal.beaninfo.adapters.BeanInfoDecoratorUtility.IntrospectCallBack#process(org.eclipse.jem.internal.beaninfo.common.EventSetRecord)
- */
- public EventSetDecorator process(EventSetRecord record) {
- return calculateEvent(record);
- }
- });
- }
- }
- }
-
- if (doReflection) {
- // Need to do reflection stuff.
- if (decor.isIntrospectProperties())
- reflectProperties();
- if (doOperations && decor.isIntrospectMethods())
- reflectOperations();
- if (decor.isIntrospectEvents())
- reflectEvents();
- }
- ChangeDescription cd = ChangeFactory.eINSTANCE.createChangeDescription();
- BeanInfoDecoratorUtility.buildChange(cd, decor);
- finalizeProperties(cd);
- if (doOperations)
- finalizeOperations(cd);
- finalizeEvents(cd);
-
- classEntry = BeanInfoCacheController.INSTANCE.newCache(getJavaClass(), cd, doOperations ? BeanInfoCacheController.REFLECTION_OPERATIONS_CACHE : BeanInfoCacheController.REFLECTION_CACHE);
- TimerTests.basicTest.stopCumulativeStep(REMOTE_INTROSPECT);
- }
- TimerTests.basicTest.stopCumulativeStep(INTROSPECT);
- }
- getAdapterFactory().registerIntrospection(getJavaClass().getQualifiedNameForReflection(), this);
- }
- } finally {
- if (beaninfo != null) {
- beaninfo.getProxyFactoryRegistry().releaseProxy(beaninfo); // Dispose of the beaninfo since we now have everything.
- }
- eventsMap = null; // Clear out the temp lists.
- eventsRealList = null;
- operationsMap = null; // Clear out the temp lists.
- operationsRealList = null;
- newoperations = null;
- propertiesMap = null; // Get rid of accumulated map.
- featuresRealList = null; // Release the real list.
- }
- }
-
- private void doIDs() {
- // Do properties.
- if (getJavaClass().eIsSet(EcorePackage.eINSTANCE.getEClass_EStructuralFeatures())) {
- List features = getFeaturesList();
- int len = features.size();
- for (int i = 0; i < len; i++) {
- EStructuralFeature f = (EStructuralFeature) features.get(i);
- PropertyDecorator pd = Utilities.getPropertyDecorator(f);
- if (pd == null || !pd.isMergeIntrospection())
- continue; // Not a property for us to give an ID to.
- setPropertyID(f.getName(), f);
- }
- }
-
- // Do events.
- if (getJavaClass().eIsSet(JavaRefPackage.eINSTANCE.getJavaClass_Events())) {
- List events = getEventsList();
- int len = events.size();
- for (int i = 0; i < len; i++) {
- BeanEvent e = (BeanEvent) events.get(i);
- EventSetDecorator ed = Utilities.getEventSetDecorator(e);
- if (ed == null || !ed.isMergeIntrospection())
- continue; // Not an event for us to give an ID to.
- setEventID(e.getName(), e);
- }
- }
-
- // Do Operations.
- if (getJavaClass().eIsSet(EcorePackage.eINSTANCE.getEClass_EOperations())) {
- List ops = getOperationsList();
- int len = ops.size();
- for (int i = 0; i < len; i++) {
- EOperation o = (EOperation) ops.get(i);
- MethodDecorator md = Utilities.getMethodDecorator(o);
- if (md == null || !md.isMergeIntrospection())
- continue; // Not an event for us to give an ID to.
- setMethodID(o.getName(), o);
- }
- }
- }
-
- private static final String ROOT_OVERRIDE = BeaninfoPlugin.ROOT+'.'+BeaninfoPlugin.OVERRIDE_EXTENSION; //$NON-NLS-1$
-
- protected void applyExtensionDocument(boolean rootOnly) {
- try {
- TimerTests.basicTest.startCumulativeStep(APPLY_EXTENSIONS);
- boolean canUseCache = !rootOnly && canUseOverrideCache();
- boolean alreadyRetrievedRoot = retrievedExtensionDocument == RETRIEVED_ROOT_ONLY;
- retrievedExtensionDocument = rootOnly ? RETRIEVED_ROOT_ONLY : RETRIEVED_FULL_DOCUMENT;
- JavaClass jc = getJavaClass();
- Resource mergeIntoResource = jc.eResource();
- ResourceSet rset = mergeIntoResource.getResourceSet();
- String className = jc.getName();
- if (canUseCache) {
- // We can use the cache, see if we actually have one.
- if (getClassEntry().overrideCacheExists()) {
- // Get the cache and apply it before anything else.
- Resource cacheRes = BeanInfoCacheController.INSTANCE.getCache(jc, getClassEntry(), false);
- if (cacheRes != null) {
- try {
- new ExtensionDocApplies(null, rset, jc, null).run(cacheRes);
- } catch (WrappedException e) {
- BeaninfoPlugin.getPlugin().getLogger().log(
- new Status(IStatus.WARNING, BeaninfoPlugin.PI_BEANINFO_PLUGINID, 0,
- "Error processing file\"" + cacheRes.getURI() + "\"", e.exception())); //$NON-NLS-1$ //$NON-NLS-2$
- } finally {
- cacheRes.getResourceSet().getResources().remove(cacheRes); // We don't need it around once we do the merge. Normal merge would of gotton rid of it, but in case of error we do it here.
- }
- } else
- canUseCache = false; // Need to rebuild the cache.
- }
- }
- List overrideCache = null;
- if (!alreadyRetrievedRoot && (rootOnly || jc.getSupertype() == null)) {
- // It is a root class. Need to merge in root stuff.
- if (!canUseCache) {
- overrideCache = createOverrideCache(overrideCache, getAdapterFactory().getProject(), BeaninfoPlugin.ROOT, ROOT_OVERRIDE, rset, jc);
- }
- applyExtensionDocTo(rset, jc, ROOT_OVERRIDE, BeaninfoPlugin.ROOT, BeaninfoPlugin.ROOT);
- if (rootOnly)
- return;
- }
-
- String baseOverridefile = className + '.' + BeaninfoPlugin.OVERRIDE_EXTENSION; // getName() returns inner classes with "$" notation, which is good. //$NON-NLS-1$
- String packageName = jc.getJavaPackage().getPackageName();
- if (!canUseCache) {
- overrideCache = createOverrideCache(overrideCache, getAdapterFactory().getProject(), packageName, baseOverridefile, rset, jc);
- }
- applyExtensionDocTo(rset, jc, baseOverridefile, packageName, className);
-
- if (!canUseCache) {
- // We have an override cache to store. If the cache is null, this will flag that there is no override cache for the current configuration. That way we won't bother trying again until config changes.
- BeanInfoCacheController.INSTANCE.newCache(jc, overrideCache, BeanInfoCacheController.OVERRIDES_CACHE);
- }
-
- } finally {
- TimerTests.basicTest.stopCumulativeStep(APPLY_EXTENSIONS);
- }
- }
-
- /*
- * Build up the fixed overrides into the cache, and apply as we gather them.
- * Return the cache or null if the cache is empty at the end.
- */
- private List createOverrideCache(List cache, IProject project, String packageName, String overrideFile, ResourceSet rset, JavaClass mergeIntoJavaClass) {
- // Now get the overrides paths
- String[] paths = BeaninfoPlugin.getPlugin().getOverridePaths(project, packageName);
- if (paths.length == 0)
- return cache;
-
- // Now apply the overrides.
- if (cache == null)
- cache = new ArrayList();
- BeaninfoPlugin.IOverrideRunnable runnable = new ExtensionDocApplies(overrideFile, rset, mergeIntoJavaClass, cache);
- for (int i = 0; i < paths.length; i++) {
- runnable.run(paths[i]);
- }
- return !cache.isEmpty() ? cache : null;
- }
-
- private static final URI ROOT_URI = URI.createGenericURI(BeaninfoPlugin.ROOT_SCHEMA, BeaninfoPlugin.ROOT_OPAQUE, null);
- private static final String ROOT_FRAGMENT = "//@root"; //$NON-NLS-1$
- private static final Pattern FRAGMENT_SPLITTER = Pattern.compile("/"); //$NON-NLS-1$
-
- // TODO This is to make event util optional. This should be removed entirely with 1.3 when event util goes away.
- private static boolean RETRIEVED_EVENT_METHODS;
- private static Object EVENT_FACTORY_INSTANCE;
- private static java.lang.reflect.Method CREATE_EVENT_UTIL_METHOD;
- private static java.lang.reflect.Method DO_FORWARD_EVENTS_METHOD;
-
- private static boolean isEventUtilLoaded() {
- if (!RETRIEVED_EVENT_METHODS) {
- try {
- Class eventFactoryClass = Class.forName("com.ibm.etools.emf.event.EventFactory");
- Field eventFactoryField = eventFactoryClass.getField("eINSTANCE");
- Object eventFactoryInstance = eventFactoryField.get(null);
- java.lang.reflect.Method createEventMethod = eventFactoryClass.getMethod("createEventUtil", new Class[] {Notifier.class, ResourceSet.class});
- Class eventUtilClass = createEventMethod.getReturnType();
- java.lang.reflect.Method doForwardEventsMethod = eventUtilClass.getMethod("doForwardEvents", new Class[] {List.class});
- EVENT_FACTORY_INSTANCE = eventFactoryInstance;
- CREATE_EVENT_UTIL_METHOD = createEventMethod;
- DO_FORWARD_EVENTS_METHOD = doForwardEventsMethod;
- } catch (ClassNotFoundException e) {
- } catch (SecurityException e) {
- } catch (NoSuchFieldException e) {
- } catch (IllegalArgumentException e) {
- } catch (IllegalAccessException e) {
- } catch (NoSuchMethodException e) {
- }
- RETRIEVED_EVENT_METHODS = true;
- }
- return EVENT_FACTORY_INSTANCE != null;
-
- }
- private class ExtensionDocApplies implements BeaninfoPlugin.IOverrideRunnable {
-
- private final String overrideFile;
- private final ResourceSet rset;
- private final JavaClass mergeIntoJavaClass;
- private final List overridesCache;
-
- public ExtensionDocApplies(String overrideFile, ResourceSet rset, JavaClass mergeIntoJavaClass, List overridesCache) {
- this.overrideFile = overrideFile;
- this.rset = rset;
- this.mergeIntoJavaClass = mergeIntoJavaClass;
- this.overridesCache = overridesCache;
- }
-
- /* (non-Javadoc)
- * @see org.eclipse.jem.internal.beaninfo.core.BeaninfoPlugin.IOverrideRunnable#run(java.lang.String)
- */
- public void run(String overridePath) {
- Resource overrideRes = null;
- URI uri = URI.createURI(overridePath+overrideFile);
- try {
- overrideRes = rset.getResource(uri, true);
- run(overrideRes);
- } catch (WrappedException e) {
- // FileNotFoundException is ok
- if (!(e.exception() instanceof FileNotFoundException)) {
- if (e.exception() instanceof CoreException
- && ((CoreException) e.exception()).getStatus().getCode() == IResourceStatus.RESOURCE_NOT_FOUND) {
- // This is ok. Means uri_mapping not set so couldn't find in Workspace, also ok.
- } else if (e.exception() instanceof PackageNotFoundException && ((PackageNotFoundException) e.exception()).getMessage().indexOf("event.xmi") != -1) {
- if (!RETRIEVED_EVENT_METHODS) {
- BeaninfoPlugin.getPlugin().getLogger().log(new Status(IStatus.WARNING, BeaninfoPlugin.PI_BEANINFO_PLUGINID, 0, "An old style override file using the com.ibm.event format was found, but com.ibm.event was not installed. The first such file is "+uri, null)); //$NON-NLS-1$
- RETRIEVED_EVENT_METHODS = true; // Mark we've retrieved. This is ok because if event is missing here, it will be missing for retrieve too.
- }
- } else {
- BeaninfoPlugin.getPlugin().getLogger().log(new Status(IStatus.WARNING, BeaninfoPlugin.PI_BEANINFO_PLUGINID, 0, "Error loading file\"" + uri + "\"", e.exception())); //$NON-NLS-1$ //$NON-NLS-2$
- }
- }
- // In case it happened after creating resource but during load. Need to get rid of it in the finally.
- overrideRes = rset.getResource(uri, false);
- } catch (Exception e) {
- // Couldn't load it for some reason.
- BeaninfoPlugin.getPlugin().getLogger().log(new Status(IStatus.WARNING, BeaninfoPlugin.PI_BEANINFO_PLUGINID, 0, "Error loading file\"" + uri + "\"", e)); //$NON-NLS-1$ //$NON-NLS-2$
- overrideRes = rset.getResource(uri, false); // In case it happened after creating resource but during load so that we can get rid of it.
- } finally {
- if (overrideRes != null)
- rset.getResources().remove(overrideRes); // We don't need it around once we do the merge. Normal merge would of gotton rid of it, but in case of error we do it here.
- }
- }
-
- /* (non-Javadoc)
- * @see org.eclipse.jem.internal.beaninfo.core.BeaninfoPlugin.IOverrideRunnable#run(org.eclipse.emf.ecore.resource.Resource)
- */
- public void run(Resource overrideRes) {
- try {
- EList contents = overrideRes.getContents();
- if (overridesCache != null) {
- // TODO Until https://bugs.eclipse.org/bugs/show_bug.cgi?id=109169 is fixed, we need our own Copier.
- EcoreUtil.Copier copier = new EcoreUtil.Copier() {
-
- private static final long serialVersionUID = 1L;
-
- protected void copyReference(EReference eReference, EObject eObject, EObject copyEObject) {
- if (eObject.eIsSet(eReference)) {
- if (eReference.isMany()) {
- List source = (List) eObject.eGet(eReference);
- InternalEList target = (InternalEList) copyEObject.eGet(getTarget(eReference));
- if (source.isEmpty()) {
- target.clear();
- } else {
- boolean isBidirectional = eReference.getEOpposite() != null;
- int index = 0;
- for (Iterator k = ((EcoreEList) source).basicIterator(); k.hasNext();) {
- Object referencedEObject = k.next();
- Object copyReferencedEObject = get(referencedEObject);
- if (copyReferencedEObject == null) {
- if (!isBidirectional) {
- target.addUnique(index, referencedEObject);
- ++index;
- }
- } else {
- if (isBidirectional) {
- int position = target.indexOf(copyReferencedEObject);
- if (position == -1) {
- target.addUnique(index, copyReferencedEObject);
- } else if (index != position) {
- target.move(index, copyReferencedEObject);
- }
- } else {
- target.addUnique(index, copyReferencedEObject);
- }
- ++index;
- }
- }
- }
- } else {
- Object referencedEObject = eObject.eGet(eReference, false);
- if (referencedEObject == null) {
- copyEObject.eSet(getTarget(eReference), null);
- } else {
- Object copyReferencedEObject = get(referencedEObject);
- if (copyReferencedEObject == null) {
- if (eReference.getEOpposite() == null) {
- copyEObject.eSet(getTarget(eReference), referencedEObject);
- }
- } else {
- copyEObject.eSet(getTarget(eReference), copyReferencedEObject);
- }
- }
- }
- }
- }
- };
-
- // We fixup the CD first so that when serialized it will be to the correct object already. Simplifies apply later.
- Iterator itr = contents.iterator();
- while (itr.hasNext()) {
- Object o = itr.next();
- if (o instanceof ChangeDescription) {
- fixupCD((ChangeDescription) o);
- }
- }
-
- Collection result = copier.copyAll(contents);
- copier.copyReferences();
- overridesCache.addAll(result); // Make a copy for the override cache to be used next time needed.
- }
-
- if (!contents.isEmpty()) {
- // TODO It could be either the old event model or the new ChangeDescription. When we remove Event Model we need to remove
- // the test. This could be the override cache too, so we must apply the contents in the order they are in the resource.
- try {
- List events = null;
- Object[] eventsParm = null;
- Iterator itr = contents.iterator();
- while (itr.hasNext()) {
- Object o = itr.next();
- if (o instanceof ChangeDescription) {
- ChangeDescription cd = (ChangeDescription) o;
- fixupCD(cd);
- cd.apply();
- } else if (isEventUtilLoaded()) {
- if (events == null) {
- events = new ArrayList(1);
- events.add(null); // EventUtil needs a list, but we will be calling one by one. So just reuse this list.
- eventsParm = new Object[] { events};
- }
- // It is the old format.
- events.set(0, o);
- try {
- Object util = CREATE_EVENT_UTIL_METHOD.invoke(EVENT_FACTORY_INSTANCE, new Object[] {mergeIntoJavaClass, rset});
- DO_FORWARD_EVENTS_METHOD.invoke(util, eventsParm);
- } catch (IllegalArgumentException e) {
- } catch (IllegalAccessException e) {
- } catch (InvocationTargetException e) {
- BeaninfoPlugin.getPlugin().getLogger().log(new Status(IStatus.WARNING, BeaninfoPlugin.PI_BEANINFO_PLUGINID, 0, "Error processing file\"" + overrideRes.getURI() + "\"", e.getCause())); //$NON-NLS-1$ //$NON-NLS-2$
- }
- }
- }
- } finally {
- uninstallRootResource();
- }
- }
- } catch (WrappedException e) {
- BeaninfoPlugin.getPlugin().getLogger().log(new Status(IStatus.WARNING, BeaninfoPlugin.PI_BEANINFO_PLUGINID, 0, "Error processing file\"" + overrideRes.getURI() + "\"", e.exception())); //$NON-NLS-1$ //$NON-NLS-2$
- }
- }
-
- /*
- * fix it up so that references to "X:ROOT#//@root" are replaced with reference to the javaclass.
- */
- private void fixupCD(ChangeDescription cd) {
- EStructuralFeature keyFeature = ChangePackage.eINSTANCE.getEObjectToChangesMapEntry_Key();
- Iterator changes = cd.getObjectChanges().iterator();
- while (changes.hasNext()) {
- EObject entry = (EObject) changes.next();
- EObject key = (EObject) entry.eGet(keyFeature, false);
- if (key != null && key.eIsProxy()) {
- // See if it is our special.
- URI uri = ((InternalEObject) key).eProxyURI();
- String rootFrag = uri.fragment();
- if (BeaninfoPlugin.ROOT_SCHEMA.equals(uri.scheme()) && BeaninfoPlugin.ROOT_OPAQUE.equals(uri.opaquePart()) && (rootFrag != null && rootFrag.startsWith(ROOT_FRAGMENT))) {
- // It is one of ours. Get the fragment, remove the leading //root and append to the end of the
- // uri from the java class itself.
- if (rootFrag.length() <= ROOT_FRAGMENT.length())
- entry.eSet(keyFeature, mergeIntoJavaClass); // No sub-path, so just the java class.
- else {
- // There is a sub-path below the java class that is needed. Need to walk down the path.
- String[] path = FRAGMENT_SPLITTER.split(rootFrag.substring(ROOT_FRAGMENT.length()+1));
- InternalEObject newKey = (InternalEObject) mergeIntoJavaClass;
- for (int i = 0; newKey != null && i < path.length; i++) {
- newKey = (InternalEObject) newKey.eObjectForURIFragmentSegment(path[i]);
- }
- if (newKey != null)
- entry.eSet(keyFeature, newKey);
- }
- }
- }
- }
- }
-
- /*
- * Uninstall the fake root resource. This must be called after installRootResource has been called. So must use try/finally.
- *
- *
- * @since 1.2.0
- */
- private void uninstallRootResource() {
- Resource root = rset.getResource(ROOT_URI, false);
- if (root != null)
- rset.getResources().remove(root);
- }
- }
- protected void applyExtensionDocTo(ResourceSet rset, JavaClass mergeIntoJavaClass, String overrideFile, String packageName, String className) {
- BeaninfoPlugin.getPlugin().applyOverrides(getAdapterFactory().getProject(), packageName, className, mergeIntoJavaClass, rset,
- new ExtensionDocApplies(overrideFile, rset, mergeIntoJavaClass, null));
- }
-
- /**
- * Return the target as a JavaClass
- */
- protected JavaClassImpl getJavaClass() {
- return (JavaClassImpl) getTarget();
- }
-
- /**
- * Answer the beaninfo constants record
- */
- protected BeaninfoProxyConstants getProxyConstants() {
- return BeaninfoProxyConstants.getConstants(getRegistry());
- }
-
- /**
- * @see org.eclipse.jem.java.beaninfo.IIntrospectionAdapter#getEStructuralFeatures()
- */
- public EList getEStructuralFeatures() {
- introspectIfNecessary();
- return getJavaClass().getEStructuralFeaturesInternal();
- }
-
- /**
- * @see org.eclipse.jem.java.beaninfo.IIntrospectionAdapter#getAllProperties()
- */
- public EList getAllProperties() {
- return allProperties();
- }
-
- /**
- * @see org.eclipse.jem.java.beaninfo.IIntrospectionAdapter#getEOperations()
- */
- public EList getEOperations() {
- if (getClassEntry() != null && getClassEntry().isOperationsStored())
- introspectIfNecessary(); // Already stored, just do if necessary.
- else {
- synchronized (this) {
- needsIntrospection = true; // Force reintrospection because we either aren't storing operations, or have never loaded.
- }
- introspectIfNecessary(true); // But force the operations now.
- }
- return getJavaClass().getEOperationsInternal();
- }
-
- /**
- * @see org.eclipse.jem.java.beaninfo.IIntrospectionAdapter#getEAllOperations()
- */
- public BasicEList getEAllOperations() {
- return allOperations();
- }
-
- /**
- * @see org.eclipse.jem.java.beaninfo.IIntrospectionAdapter#getEvents()
- */
- public EList getEvents() {
- introspectIfNecessary();
- return getJavaClass().getEventsGen();
- }
-
- /**
- * @see org.eclipse.jem.java.beaninfo.IIntrospectionAdapter#getAllEvents()
- */
- public EList getAllEvents() {
- return allEvents();
- }
-
- private void finalizeProperties(ChangeDescription cd) {
- // Now go through the list and remove those that should be removed, and set the etype for those that don't have it set.
- Map oldLocals = getPropertiesMap();
- Iterator itr = getFeaturesList().iterator();
- while (itr.hasNext()) {
- EStructuralFeature a = (EStructuralFeature) itr.next();
- PropertyDecorator p = Utilities.getPropertyDecorator(a);
- Object aOld = oldLocals.get(a.getName());
- if (aOld != null && aOld != Boolean.FALSE) {
- // A candidate for removal. It was in the old list and it was not processed.
- if (p != null) {
- ImplicitItem implicit = p.getImplicitDecoratorFlag();
- if (implicit != ImplicitItem.NOT_IMPLICIT_LITERAL) {
- p.setEModelElement(null); // Remove from the feature;
- ((InternalEObject) p).eSetProxyURI(BAD_URI);
- // Mark it as bad proxy so we know it is no longer any use.
- p = null;
- if (implicit == ImplicitItem.IMPLICIT_DECORATOR_AND_FEATURE_LITERAL) {
- itr.remove(); // Remove it, this was implicitly created and not processed this time.
- ((InternalEObject) a).eSetProxyURI(BAD_URI); // Mark it as bad proxy so we know it is no longer any use.
- continue;
- }
- // Need to go on because we need to check the eType to make sure it is set. At this point we have no decorator but we still have a feature.
- }
- }
- }
-
- // [79083] Also check for eType not set, and if it is, set it to EObject type. That way it will be valid, but not valid as
- // a bean setting.
- if (a.getEType() == null) {
- // Set it to EObject type. If it becomes valid later (through the class being changed), then the introspect/reflect
- // will set it to the correct type.
- a.setEType(EcorePackage.eINSTANCE.getEObject());
- Logger logger = BeaninfoPlugin.getPlugin().getLogger();
- if (logger.isLoggingLevel(Level.WARNING))
- logger.logWarning("Feature \""+getJavaClass().getQualifiedName()+"->"+a.getName()+"\" did not have a type set. Typically due to override file creating feature but property not found on introspection/reflection."); //$NON-NLS-1$ //$NON-NLS-2$ //$NON-NLS-3$
- }
-
- if (p != null && cd != null) {
- // Now create the appropriate cache entry for this property.
- BeanInfoDecoratorUtility.buildChange(cd, p);
- }
- }
- }
-
- /**
- * merge all the Properties (i.e. supertypes) (properties)
- */
- protected EList allProperties() {
-
- EList jcAllProperties = getJavaClass().getAllPropertiesGen();
- BeaninfoSuperAdapter superAdapter =
- (BeaninfoSuperAdapter) EcoreUtil.getRegisteredAdapter(getJavaClass(), BeaninfoSuperAdapter.class);
- if (jcAllProperties != null) {
- // See if new one required.
- if (superAdapter == null || !superAdapter.isAllPropertiesCollectionModified())
- return jcAllProperties;
- // Can't get superadapter, so must not be attached to a resource, so return current list. Or no change required.
- }
-
- UniqueEList.FastCompare allProperties = new UniqueEList.FastCompare() {
- /**
- * Comment for <code>serialVersionUID</code>
- *
- * @since 1.1.0
- */
- private static final long serialVersionUID = 1L;
-
- protected Object[] newData(int capacity) {
- return new EStructuralFeature[capacity];
- }
- };
- boolean doAllProperties = false;
- synchronized(this) {
- // If we are introspecting, don't do all properties because it is an invalid list. Just return empty without reseting the all modified flag.
- doAllProperties = !isDoingAllProperties && !isIntrospecting && isResourceConnected();
- if (doAllProperties)
- isDoingAllProperties = true;
- }
- if (doAllProperties) {
- try {
- EList localProperties = getJavaClass().getProperties();
- // Kludge: BeanInfo spec doesn't address Interfaces, but some people want to use them.
- // Interfaces can have multiple extends, while the Introspector ignores these for reflection,
- // the truth is most people want these. So we will add them in. But since there could be more than one it
- // gets confusing. We need to look for dups from the super types and still keep order.
- //
- // Supertypes will never be more than one entry for classes, it is possible to be 0, 1, 2 or more for interfaces.
- List superTypes = getJavaClass().getESuperTypes();
- if (!superTypes.isEmpty()) {
- // Now we need to merge in the supers.
- BeanDecorator bd = Utilities.getBeanDecorator(getJavaClass());
- // If there is only one supertype, we can add to the actual events, else we will use the linked hashset so that
- // we don't add possible duplicates (e.g. IA extends IB,IC and IB extends IC. In this case there would be dups
- // because IB would contribute IC's too).
- Collection workingAllProperties = superTypes.size() == 1 ? (Collection) allProperties : new LinkedHashSet();
- // We will now merge as directed.
- boolean mergeAll = bd == null || bd.isMergeSuperProperties();
- if (!mergeAll) {
- // we don't to want to merge super properties, but we still need super non-properties or explict ones.
- int lenST = superTypes.size();
- for (int i=0; i<lenST; i++) {
- List supers = ((JavaClass) superTypes.get(i)).getAllProperties();
- int len = supers.size();
- for (int i1 = 0; i1 < len; i1++) {
- EStructuralFeature p = (EStructuralFeature) supers.get(i1);
- PropertyDecorator pd = Utilities.getPropertyDecorator(p);
- if ( pd == null || (pd.getImplicitDecoratorFlag() == ImplicitItem.NOT_IMPLICIT_LITERAL && !pd.isMergeIntrospection()))
- workingAllProperties.add(p);
- }
- }
- } else {
- // We want to merge all.
- // BeanInfo could of given us the not merge list. If the list is empty, then we accept all.
- if (bd != null && bd.eIsSet(BeaninfoPackage.eINSTANCE.getBeanDecorator_NotInheritedPropertyNames())) {
- // We were given a list of names.
- // Get the names into a set to create a quick lookup.
- HashSet superSet = new HashSet(bd.getNotInheritedPropertyNames());
-
- // Now walk and add in non-bean properties (and bean properties that were explicitly added and not mergeable (i.e. didn't come thru beaninfo))
- // and add those not specifically called out by BeanInfo in the not inherited list.
- int lenST = superTypes.size();
- for (int i=0; i<lenST; i++) {
- List supers = ((JavaClass) superTypes.get(i)).getAllProperties();
- int len = supers.size();
- for (int i1 = 0; i1 < len; i1++) {
- EStructuralFeature p = (EStructuralFeature) supers.get(i1);
- PropertyDecorator pd = Utilities.getPropertyDecorator(p);
- if (pd == null || (pd.getImplicitDecoratorFlag() == ImplicitItem.NOT_IMPLICIT_LITERAL && !pd.isMergeIntrospection()) || !superSet.contains(pd.getName()))
- workingAllProperties.add(p);
- }
- }
- } else {
- // BeanInfo (or reflection always does this) called out that all super properties are good
- int lenST = superTypes.size();
- for (int i=0; i<lenST; i++) {
- workingAllProperties.addAll(((JavaClass) superTypes.get(i)).getAllProperties());
- }
- }
- }
- if (workingAllProperties != allProperties)
- allProperties.addAll(workingAllProperties); // Now copy over the ordered super properties.
- }
- allProperties.addAll(localProperties);
- superAdapter.setAllPropertiesCollectionModified(false); // Now built, so reset to not changed.
- } finally {
- synchronized(this) {
- isDoingAllProperties = false;
- }
- }
- }
-
- if (!allProperties.isEmpty()) {
- allProperties.shrink();
- return new EcoreEList.UnmodifiableEList.FastCompare(
- getJavaClass(),
- null,
- allProperties.size(),
- allProperties.data());
- } else
- return ECollections.EMPTY_ELIST;
- }
-
- /*
- * Fill in the property using the prop record. If this one that should have merging done, then
- * return the PropertyDecorator so that it can have the PropertyRecord merged into it. Else
- * return null if no merging.
- */
- protected PropertyDecorator calculateProperty(PropertyRecord pr, boolean indexed) {
- // If this is an indexed property, then a few fields will not be set in here, but
- // will instead be set by the calculateIndexedProperty, which will be called.
- JavaHelpers type = pr.propertyTypeName != null ? Utilities.getJavaType(MapJNITypes.getFormalTypeName(pr.propertyTypeName), getJavaClass().eResource().getResourceSet()) : null;
-
- if (indexed) {
- // If no array write method found, then see if there is an indexed write method. If there is, then it is changable.
- if (type == null) {
- // If no array type from above, create one from the indexed type proxy. Add '[]' to turn it into an array.
- type = Utilities.getJavaType(MapJNITypes.getFormalTypeName(((IndexedPropertyRecord) pr).indexedPropertyTypeName)+"[]", getJavaClass().eResource().getResourceSet()); //$NON-NLS-1$
- }
- }
-
- if (type != null)
- return createProperty(pr.name, indexed, type); // A valid property descriptor.
- else
- return null;
- }
-
- /**
- * Fill in the property and its decorator using the passed in information.
- */
- protected PropertyDecorator createProperty(String name, boolean indexed, EClassifier type) {
- // First find if there is already a property of this name, and if there is, is the PropertyDecorator
- // marked to not allow merging in of introspection results.
- HashMap existingLocals = getPropertiesMap();
- EStructuralFeature prop = null;
- PropertyDecorator pd = null;
- Object p = existingLocals.get(name);
- if (Boolean.FALSE == p)
- return null; // We've already processed this name, can't process it again.
- if (p != null) {
- // We've found one of the same name. Whether we modify it or use it as is, we put in a
- // special dummy in its place. That marks that we've already processed it and accepted it.
- existingLocals.put(name, Boolean.FALSE);
-
- // If the decorator for this entry says not to merge then return.
- // If there is no PropertyDecorator, then we will merge. If they
- // didn't want to merge then should of created of property decorator and said no merge.
- pd = Utilities.getPropertyDecorator((EStructuralFeature) p);
- if (pd != null && !pd.isMergeIntrospection())
- return null;
- prop = (EStructuralFeature) p;
- }
-
- // Need to test if this is an implicit decorator and it is not of the
- // same type (i.e. is indexed now but wasn't or visa-versa, then we need
- // to get rid of the decorator and recreate it. If it is not implicit, then
- // we have to use it as is because the user specified, so it won't become
- // an indexed if the user did not created it as an index, and visa-versa.
- // Also if it is implicit, then we need to unset certain features that may of
- // been set by a previous reflection which has now become introspected.
- // When reflected we set the actual fields instead of the letting proxy determine them.
- if (pd != null) {
- if (pd.getImplicitDecoratorFlag() == ImplicitItem.NOT_IMPLICIT_LITERAL) {
- // We can't change the type for explicit.
- indexed = pd instanceof IndexedPropertyDecorator;
- } else {
- if ((indexed && !(pd instanceof IndexedPropertyDecorator)) || (!indexed && pd instanceof IndexedPropertyDecorator)) {
- // It is implicit and of a different type, so just get rid of it and let it be recreated correctly.
- prop.getEAnnotations().remove(pd);
- pd = null;
- }
- }
- if (pd != null)
- if (indexed)
- BeanInfoDecoratorUtility.clear((IndexedPropertyDecorator) pd);
- else
- BeanInfoDecoratorUtility.clear(pd);
- }
-
- ImplicitItem implicit = pd == null ? ImplicitItem.IMPLICIT_DECORATOR_LITERAL : pd.getImplicitDecoratorFlag();
- if (prop == null) {
- // We will create a new property.
- // We can't have an implicit feature, but an explicit decorator.
- getFeaturesList().add(prop = EcoreFactory.eINSTANCE.createEReference());
- implicit = ImplicitItem.IMPLICIT_DECORATOR_AND_FEATURE_LITERAL;
- }
-
- setPropertyID(name, prop);
- prop.setName(name);
- prop.setTransient(false);
- prop.setVolatile(false);
-
- // Containment and Unsettable is tricky for EReferences. There is no way to know whether it has been explicitly set to false, or it defaulted to
- // false because ECore has not made containment/unsettable an unsettable feature. So we need to instead use the algorithm of if we here
- // created the feature, then we will by default set it to containment/unsettable. If it was created through diff merge, then
- // we will leave it alone. It is the responsibility of the merge file writer to set containment/unsettable correctly.
- if (implicit == ImplicitItem.IMPLICIT_DECORATOR_AND_FEATURE_LITERAL) {
- prop.setUnsettable(true);
- }
- prop.setEType(type);
- if (!indexed) {
- prop.setLowerBound(0);
- prop.setUpperBound(1);
- } else {
- prop.setLowerBound(0);
- prop.setUpperBound(-1);
- prop.setUnique(true);
- }
-
- // Now create/fill in the property descriptor for it.
- // If there already is one then we
- // will use it. This allows merging with beanfinfo.
- if (pd == null) {
- pd =
- (!indexed)
- ? BeaninfoFactory.eINSTANCE.createPropertyDecorator()
- : BeaninfoFactory.eINSTANCE.createIndexedPropertyDecorator();
- pd.setImplicitDecoratorFlag(implicit);
- prop.getEAnnotations().add(pd);
- }
- return pd;
- }
-
- /**
- * @param name
- * @param prop
- *
- * @since 1.1.0
- */
- private void setPropertyID(String name, EStructuralFeature prop) {
- // Now fill it in. Normal id for an attribute is "classname.attributename" but we can't use that
- // for us because that format is used by Java Core for a field and there would be confusion.
- // So we will use '/' instead.
- ((XMIResource) prop.eResource()).setID(prop, getJavaClass().getName() + BeaninfoJavaReflectionKeyExtension.FEATURE + name);
- }
-
- /*
- * Reflect the properties. This requires going through local methods and matching them up to
- * see if they are properties.
- */
- private void reflectProperties() {
- // If we are set to mergeSuperTypeProperties, then we need to get the super properties.
- // This is so that duplicate any from super that we find here. When reflecting we don't
- // allow discovered duplicates unless they are different types.
- //
- // Kludge: BeanInfo spec doesn't address Interfaces, but some people want to use them.
- // Interfaces can have multiple extends, while the Introspector ignores these for reflection,
- // the truth is most people want these. So we will add them in. But since there could be more than one it
- // gets confusing. We need to look for dups from the super types.
- //
- // Supertypes will never be more than one entry for classes, it is possible to be 0, 1, 2 or more for interfaces.
- TimerTests.basicTest.startCumulativeStep(REFLECT_PROPERTIES);
- Set supers = new HashSet(50);
- BeanDecorator bd = Utilities.getBeanDecorator(getJavaClass());
- if (bd == null || bd.isMergeSuperProperties()) {
- List superTypes = getJavaClass().getESuperTypes();
- if (!superTypes.isEmpty()) {
- int lenST = superTypes.size();
- for (int i=0; i<lenST; i++) {
- List superAll = ((JavaClass) superTypes.get(i)).getAllProperties();
- int len = superAll.size();
- for (int i1=0; i1<len; i1++) {
- EStructuralFeature sf = (EStructuralFeature) superAll.get(i1);
- supers.add(sf.getName());
- }
- }
- }
- }
-
- // If any of the classes in the hierarchy are bound, then all reflected properties are considered bound.
- boolean isBound = isDefaultBound();
- if (!isBound) {
- List superTypes = getJavaClass().getEAllSuperTypes();
- // Start from end because that will be first class above the this one.
- for (int i=superTypes.size()-1; !isBound && i>=0; i--) {
- JavaClass spr = (JavaClass) superTypes.get(i);
- BeaninfoClassAdapter bi = (BeaninfoClassAdapter) EcoreUtil.getExistingAdapter(spr, IIntrospectionAdapter.ADAPTER_KEY);
- // They should all be reflected, but be on safe side, check if null.
- if (bi != null)
- isBound = bi.isDefaultBound();
- }
- }
-
- HashMap props = new HashMap();
-
- Iterator itr = getJavaClass().getPublicMethods().iterator();
- while (itr.hasNext()) {
- Method mthd = (Method) itr.next();
- if (mthd.isStatic() || mthd.isConstructor())
- continue; // Statics/constructors don't participate as properties
- if (mthd.getName().startsWith("get")) { //$NON-NLS-1$
- String name = java.beans.Introspector.decapitalize(mthd.getName().substring(3));
- if (name.length() == 0 || supers.contains(name))
- continue; // Had get(...) and not getXXX(...) so not a getter. Or this is the same name as a super, either way ignore it.
- PropertyInfo propInfo = (PropertyInfo) props.get(name);
- if (propInfo == null) {
- propInfo = new PropertyInfo();
- if (propInfo.setGetter(mthd, false))
- props.put(name, propInfo);
- } else
- propInfo.setGetter(mthd, false);
- } else if (mthd.getName().startsWith("is")) { //$NON-NLS-1$
- String name = java.beans.Introspector.decapitalize(mthd.getName().substring(2));
- if (name.length() == 0 || supers.contains(name))
- continue; // Had is(...) and not isXXX(...) so not a getter. Or this is the same name as a super, either way ignore it.
- PropertyInfo propInfo = (PropertyInfo) props.get(name);
- if (propInfo == null) {
- propInfo = new PropertyInfo();
- if (propInfo.setGetter(mthd, true))
- props.put(name, propInfo);
- } else
- propInfo.setGetter(mthd, true);
- } else if (mthd.getName().startsWith("set")) { //$NON-NLS-1$
- String name = java.beans.Introspector.decapitalize(mthd.getName().substring(3));
- if (name.length() == 0 || supers.contains(name))
- continue; // Had set(...) and not setXXX(...) so not a setter. Or this is the same name as a super, either way ignore it.
- PropertyInfo propInfo = (PropertyInfo) props.get(name);
- if (propInfo == null) {
- propInfo = new PropertyInfo();
- if (propInfo.setSetter(mthd))
- props.put(name, propInfo);
- } else
- propInfo.setSetter(mthd);
- }
- }
-
- // Now go through the hash map and create the properties.
- itr = props.entrySet().iterator();
- while (itr.hasNext()) {
- Map.Entry entry = (Map.Entry) itr.next();
- ((PropertyInfo) entry.getValue()).createProperty((String) entry.getKey(), isBound);
- }
- TimerTests.basicTest.stopCumulativeStep(REFLECT_PROPERTIES);
- }
-
- private class PropertyInfo {
-
- public EClassifier type, indexedType;
- public boolean constrained;
- public Method getter, setter, indexedGetter, indexedSetter;
-
- public boolean setGetter(Method get, boolean mustBeBoolean) {
- List parms = get.getParameters();
- if (parms.size() > 1)
- return false; // Invalid - improper number of parms.
- boolean indexed = parms.size() == 1;
- if (indexed && !((JavaParameter) parms.get(0)).getEType().getName().equals("int")) //$NON-NLS-1$
- return false; // Invalid - a parm that is not an int is invalid for indexed.
- EClassifier retType = get.getReturnType();
- if (retType == null || retType.getName().equals("void")) //$NON-NLS-1$
- return false; // Invalid - must have a return type
- if (mustBeBoolean && !retType.getName().equals("boolean")) //$NON-NLS-1$
- return false; // Invalid - it must be a boolean.
- if (indexed) {
- if (indexedType != null) {
- if (indexedType != retType)
- return false; // Invalid - type is different from previous info.
- }
- if (type != null && !(((JavaHelpers) type).isArray() && ((ArrayType) type).getComponentType() == retType))
- return false; // Invalid - indexed type doesn't match component type of base type.
- } else {
- if (type != null) {
- if (type != retType)
- return false; // Invalid - type is different from previous info.
- }
- if (indexedType != null && !(((JavaHelpers) retType).isArray() && ((ArrayType) retType).getComponentType() == indexedType))
- if (type == null) {
- // We had a potential indexed and had not yet found the regular type. We've now found
- // the regular type, and it is not indexed. So it takes priority and will wipe out
- // the indexed type.
- indexedGetter = null;
- indexedSetter = null;
- indexedType = null;
- } else
- return false; // Invalid - indexed type doesn't match component type of base type we already have
- }
-
- if (indexed) {
- if (indexedGetter != null)
- return false; // Already have an indexed getter.
- indexedGetter = get;
- indexedType = retType;
- } else {
- if (getter != null)
- return false; // Already have a getter
- getter = get;
- type = retType;
- }
- return true;
- }
-
- public boolean setSetter(Method set) {
- List parms = set.getParameters();
- if (parms.size() > 2 || parms.size() < 1)
- return false; // Invalid - improper number of parms.
- boolean indexed = parms.size() == 2;
- if (indexed && !((JavaParameter) parms.get(0)).getEType().getName().equals("int")) //$NON-NLS-1$
- return false; // Invalid - a parm that is not an int is invalid for indexed.
- EClassifier retType = set.getReturnType();
- if (retType != null && !retType.getName().equals("void")) //$NON-NLS-1$
- return false; // Invalid - must not have a return type
- EClassifier propType = null;
- if (indexed) {
- propType = ((JavaParameter) parms.get(1)).getEType();
- if (indexedType != null) {
- if (indexedType != propType)
- return false; // Invalid - type is different from previous info.
- }
- if (type != null && !(((JavaHelpers) type).isArray() && ((ArrayType) type).getComponentType() == propType))
- return false; // Invalid - indexed type doesn't match component type of base type, or base type not an array
- } else {
- propType = ((JavaParameter) parms.get(0)).getEType();
- if (type != null) {
- if (type != propType)
- return false; // Invalid - type is different from previous info.
- }
- if (indexedType != null
- && !(((JavaHelpers) propType).isArray() && ((ArrayType) propType).getComponentType() == indexedType))
- if (type == null) {
- // We had a potential indexed and had not yet found the regular type. We've now found
- // the regular type, and it is not indexed of the correct type. So it takes priority and will wipe out
- // the indexed type.
- indexedGetter = null;
- indexedSetter = null;
- indexedType = null;
- } else
- return false; // Invalid - indexed type doesn't match component type of base type from this setter.
- }
-
- if (indexed) {
- if (indexedSetter != null)
- return false; // Already have an indexed getter.
- indexedSetter = set;
- indexedType = propType;
- } else {
- if (setter != null)
- return false; // Already have a getter
- setter = set;
- type = propType;
- }
-
- if (set.getJavaExceptions().contains(Utilities.getJavaClass("java.beans.PropertyVetoException", getJavaClass().eResource().getResourceSet()))) //$NON-NLS-1$
- constrained = true;
- return true;
- }
-
- public void createProperty(String name, boolean isBound) {
- boolean indexed = indexedType != null;
- if (indexed && type == null)
- return; // A potential indexed, but never found the getter/setter of the regular type.
-
- PropertyDecorator prop =
- BeaninfoClassAdapter.this.createProperty(
- name,
- indexed,
- type);
- if (prop == null)
- return; // Reflection not wanted.
-
- indexed = prop instanceof IndexedPropertyDecorator; // It could of been forced back to not indexed if explicitly set.
-
- // At this point in time all implicit settings have been cleared. This is done back in createProperty() method above.
- // So now apply reflected settings on the property decorator.
- BeanInfoDecoratorUtility.setProperties(prop, isBound, constrained, getter, setter);
- if (indexed)
- BeanInfoDecoratorUtility.setProperties((IndexedPropertyDecorator) prop, indexedGetter, indexedSetter);
-
- }
- };
-
- /*
- * Should only be called from introspect so that flags are correct.
- */
- private void finalizeOperations(ChangeDescription cd) {
- // Now go through the list and remove those that should be removed.
- Iterator itr = getOperationsList().iterator();
- while (itr.hasNext()) {
- EOperation a = (EOperation) itr.next();
- MethodDecorator m = Utilities.getMethodDecorator(a);
- if (!newoperations.contains(a)) {
- // A candidate for removal. It is in the list but we didn't add it. Check to see if it one we had created in the past.
- // If no methoddecorator, then keep it, not one ours.
- if (m != null) {
- ImplicitItem implicit = m.getImplicitDecoratorFlag();
- if (implicit != ImplicitItem.NOT_IMPLICIT_LITERAL) {
- m.setEModelElement(null); // Remove it because it was implicit.
- ((InternalEObject) m).eSetProxyURI(BAD_URI);
- if (implicit == ImplicitItem.IMPLICIT_DECORATOR_AND_FEATURE_LITERAL) {
- itr.remove(); // The operation was implicit too.
- ((InternalEObject) a).eSetProxyURI(BAD_URI);
- }
- continue; // At this point we no longer have a method decorator, so go to next.
- }
- }
- }
-
- if (m != null && cd != null) {
- // Now create the appropriate cache entry for this method.
- BeanInfoDecoratorUtility.buildChange(cd, m);
- }
- }
- }
-
- /**
- * Fill in the behavior and its decorator using the mthdDesc.
- */
- protected MethodDecorator calculateOperation(MethodRecord record) {
- return createOperation(record.name, formLongName(record), null, record);
- }
-
- /**
- * Fill in the behavior and its decorator using the passed in information.
- */
- protected MethodDecorator createOperation(String name, String longName, Method method, MethodRecord record) {
- // First find if there is already a behavior of this name and method signature , and if there is, is the MethodDecorator
- // marked to not allow merging in of introspection results.
- HashMap existingLocals = getOperationsMap();
- EOperation oper = null;
- MethodDecorator md = null;
- Object b = null;
- if (name != null)
- b = existingLocals.get(longName);
- else
- b = existingLocals.get(longName);
-
- if (b != null) {
- // If the decorator for this entry says not to merge then return.
- // If there is no decorator, then we will merge. If they didn't want to
- // merge, then they should of created a decorator with no merge on it.
- md = Utilities.getMethodDecorator((EOperation) b);
- if (md != null && !md.isMergeIntrospection())
- return null;
- oper = (EOperation) b;
- }
-
- // Need to find the method and method id.
- if (method == null) {
- // No method sent, create a proxy to it from the record.
- method = BeanInfoDecoratorUtility.createJavaMethodProxy(record.methodForDescriptor);
- }
-
- ImplicitItem implicit = md == null ? ImplicitItem.IMPLICIT_DECORATOR_LITERAL : ImplicitItem.NOT_IMPLICIT_LITERAL;
- if (oper == null) {
- // We will create a new MethodProxy.
- oper = BeaninfoFactory.eINSTANCE.createMethodProxy();
- getOperationsList().add(oper);
- implicit = ImplicitItem.IMPLICIT_DECORATOR_AND_FEATURE_LITERAL;
- }
- if (name == null)
- name = method.getName();
-
- // Now fill it in.
- if (oper instanceof MethodProxy)
- ((MethodProxy) oper).setMethod(method);
- setMethodID(name, oper);
- oper.setName(name);
- newoperations.add(oper);
-
- // Now create/fill in the method decorator for it.
- // If there already is one then we
- // will use it. This allows merging with beaninfo.
- if (md == null) {
- md = BeaninfoFactory.eINSTANCE.createMethodDecorator();
- md.setImplicitDecoratorFlag(implicit);
- oper.getEAnnotations().add(md);
- } else
- BeanInfoDecoratorUtility.clear(md);
- return md;
- }
-
- /**
- * @param name
- * @param oper
- *
- * @since 1.1.0
- */
- private void setMethodID(String name, EOperation oper) {
- ((XMIResource) oper.eResource()).setID(oper, getJavaClass().getName() + BeaninfoJavaReflectionKeyExtension.BEHAVIOR + name);
- }
-
- private void reflectOperations() {
- // If we are set to mergeSuperTypeBehaviors, then we need to get the super behaviors.
- // This is so that duplicate any from super that we find here. When reflecting we don't
- // allow discovered duplicates unless they are different signatures. So all super operations
- // will be allowed and we will not override them.
- //
- // Kludge: BeanInfo spec doesn't address Interfaces, but some people want to use them.
- // Interfaces can have multiple extends, while the Introspector ignores these for reflection,
- // the truth is most people want these. So we will add them in. But since there could be more than one it
- // gets confusing. We need to look for dups from the super types.
- //
- // Supertypes will never be more than one entry for classes, it is possible to be 0, 1, 2 or more for interfaces.
- Set supers = new HashSet(50);
- BeanDecorator bd = Utilities.getBeanDecorator(getJavaClass());
- if (bd == null || bd.isMergeSuperMethods()) {
- List superTypes = getJavaClass().getESuperTypes();
- if (!superTypes.isEmpty()) {
- int lenST = superTypes.size();
- for (int i=0; i<lenST; i++) {
- List superAll = ((JavaClass) superTypes.get(i)).getEAllOperations();
- int len = superAll.size();
- for (int i1=0; i1<len; i1++) {
- EOperation op = (EOperation) superAll.get(i1);
- supers.add(formLongName(op));
- }
- }
- }
- }
-
- Iterator itr = getJavaClass().getPublicMethods().iterator();
- while (itr.hasNext()) {
- Method mthd = (Method) itr.next();
- if (mthd.isStatic() || mthd.isConstructor())
- continue; // Statics/constructors don't participate as behaviors
- String longName = formLongName(mthd);
- // Add if super not already contain it.
- if (!supers.contains(longName))
- createOperation(null, longName, mthd, null); // Don't pass a name, try to create it by name, only use ID if there is more than one of the same name.
- }
- }
-
- /*
- * merge all the Behaviors(i.e. supertypes)
- */
- protected BasicEList allOperations() {
- BasicEList jcAllOperations = (BasicEList) getJavaClass().primGetEAllOperations();
- BeaninfoSuperAdapter superAdapter =
- (BeaninfoSuperAdapter) EcoreUtil.getRegisteredAdapter(getJavaClass(), BeaninfoSuperAdapter.class);
- if (jcAllOperations != null) {
- // See if new one required.
- if (superAdapter == null || !superAdapter.isAllOperationsCollectionModified())
- return jcAllOperations;
- // Can't get superadapter, so must not be attached to a resource, so return current list. Or no change required.
- }
-
- UniqueEList.FastCompare allOperations = new UniqueEList.FastCompare() {
- /**
- * Comment for <code>serialVersionUID</code>
- *
- * @since 1.1.0
- */
- private static final long serialVersionUID = 1L;
-
- protected Object[] newData(int capacity) {
- return new EOperation[capacity];
- }
- };
- boolean doAllOperations = false;
- synchronized(this) {
- // If we are introspecting, don't do all operatoins because it is an invalid list. Just return empty without reseting the all modified flag.
- doAllOperations = !isDoingAllOperations && !isIntrospecting && isResourceConnected();
- if (doAllOperations)
- isDoingAllOperations = true;
- }
-
- if (doAllOperations) {
- try {
- EList localOperations = getJavaClass().getEOperations();
- // Kludge: BeanInfo spec doesn't address Interfaces, but some people want to use them.
- // Interfaces can have multiple extends, while the Introspector ignores these for reflection,
- // the truth is most people want these. So we will add them in. But since there could be more than one it
- // gets confusing. We need to look for dups from the super types and still keep order.
- //
- // Supertypes will never be more than one entry for classes, it is possible to be 0, 1, 2 or more for interfaces.
- List superTypes = getJavaClass().getESuperTypes();
- if (!superTypes.isEmpty()) {
- // Now we need to merge in the supers.
- BeanDecorator bd = Utilities.getBeanDecorator(getJavaClass());
- // If there is only one supertype, we can add to the actual events, else we will use the linked hashset so that
- // we don't add possible duplicates (e.g. IA extends IB,IC and IB extends IC. In this case there would be dups
- // because IB would contribute IC's too).
- Collection workingAllOperations = superTypes.size() == 1 ? (Collection) allOperations : new LinkedHashSet();
- // We will now merge as directed.
- boolean mergeAll = bd == null || bd.isMergeSuperMethods();
- if (!mergeAll) {
- // we don't to want to merge super operations, but we still need super non-operations.
- int lenST = superTypes.size();
- for (int i=0; i<lenST; i++) {
- List supers = ((JavaClass) superTypes.get(i)).getEAllOperations();
- int len = supers.size();
- for (int i1 = 0; i1 < len; i1++) {
- EOperation o = (EOperation) supers.get(i1);
- MethodDecorator md = Utilities.getMethodDecorator(o);
- if (md == null || (md.getImplicitDecoratorFlag() == ImplicitItem.NOT_IMPLICIT_LITERAL && !md.isMergeIntrospection()))
- workingAllOperations.add(o);
- }
- }
- } else {
- // We want to merge all.
- // BeanInfo could of given us the don't merge list. If the list is empty, then we accept all.
- if (bd != null && bd.eIsSet(BeaninfoPackage.eINSTANCE.getBeanDecorator_NotInheritedMethodNames())) {
- // We were given a list of names.
- // Get the names into a set to create a quick lookup.
- HashSet superSet = new HashSet(bd.getNotInheritedMethodNames());
-
- // Now walk and add in non-bean operations (and bean operations that were explicitly added and not mergeable (i.e. didn't come thru beaninfo))
- // and add those not specifically called out by BeanInfo not merge list.
- int lenST = superTypes.size();
- for (int i=0; i<lenST; i++) {
- List supers = ((JavaClass) superTypes.get(i)).getEAllOperations();
- int len = supers.size();
- for (int i1 = 0; i1 < len; i1++) {
- EOperation o = (EOperation) supers.get(i1);
- MethodDecorator md = Utilities.getMethodDecorator(o);
- if (md == null || (md.getImplicitDecoratorFlag() == ImplicitItem.NOT_IMPLICIT_LITERAL && !md.isMergeIntrospection()))
- workingAllOperations.add(o);
- else {
- String longName = formLongName(o);
- if (longName == null || !superSet.contains(longName))
- workingAllOperations.add(o);
- }
- }
- }
- } else {
- int lenST = superTypes.size();
- for (int i=0; i<lenST; i++) {
- workingAllOperations.addAll(((JavaClass) superTypes.get(i)).getEAllOperations());
- }
- }
- }
- if (workingAllOperations != allOperations)
- allOperations.addAll(workingAllOperations); // Now copy over the ordered super operations.
- }
- allOperations.addAll(localOperations);
- ESuperAdapter sa = getJavaClass().getESuperAdapter();
- sa.setAllOperationsCollectionModified(false); // Now built, so reset to not changed.
- } finally {
- synchronized(this) {
- isDoingAllOperations = false;
- }
- }
- }
-
- allOperations.shrink();
- return new EcoreEList.UnmodifiableEList.FastCompare(
- getJavaClass(),
- EcorePackage.eINSTANCE.getEClass_EAllOperations(),
- allOperations.size(),
- allOperations.data());
-
- }
-
- /*
- * Should only be called from introspect so that flags are correct.
- */
- private void finalizeEvents(ChangeDescription cd) {
- // Now go through the list and remove those that should be removed.
- Map oldLocals = getEventsMap();
- Iterator itr = getEventsList().iterator();
- while (itr.hasNext()) {
- JavaEvent a = (JavaEvent) itr.next();
- EventSetDecorator e = Utilities.getEventSetDecorator(a);
- Object aOld = oldLocals.get(a.getName());
- if (aOld != null && aOld != Boolean.FALSE) {
- // A candidate for removal. It was in the old list and it was not processed.
- if (e != null) {
- ImplicitItem implicit = e.getImplicitDecoratorFlag();
- if (implicit != ImplicitItem.NOT_IMPLICIT_LITERAL) {
- e.setEModelElement(null); // Remove it because it was implicit.
- ((InternalEObject) e).eSetProxyURI(BAD_URI);
- if (implicit == ImplicitItem.IMPLICIT_DECORATOR_AND_FEATURE_LITERAL) {
- itr.remove(); // The feature was implicit too.
- ((InternalEObject) a).eSetProxyURI(BAD_URI);
- }
- continue; // At this point we don't have a decorator any more, so don't bother going on.
- }
- }
- }
-
- if (e != null && cd != null) {
- // Now create the appropriate cache entry for this event.
- BeanInfoDecoratorUtility.buildChange(cd, e);
- }
- }
- }
-
- /**
- * Fill in the event and its decorator using the eventDesc.
- */
- protected EventSetDecorator calculateEvent(EventSetRecord record) {
- return createEvent(record.name);
- }
-
- /**
- * Fill in the event and its decorator using the passed in information.
- */
- protected EventSetDecorator createEvent(String name) {
- // First find if there is already an event of this name, and if there is, is the EventSetDecorator
- // marked to not allow merging in of introspection results.
- HashMap existingLocals = getEventsMap();
- JavaEvent event = null;
- EventSetDecorator ed = null;
- Object b = existingLocals.get(name);
- if (Boolean.FALSE == b)
- return null; // We've already processed this event, can't process it again.
- if (b != null) {
- // We've found one of the same event. Whether we modify it or use it as is, we put in a
- // special dummy in its place. That marks that we've already processed it and accepted it.
- existingLocals.put(name, Boolean.FALSE);
-
- // If the decorator for this entry says not to merge then return.
- // If there is no decorator, then we will merge. If they didn't want to
- // merge, then they should of created a decorator with no merge on it.
- ed = Utilities.getEventSetDecorator((JavaEvent) b);
- if (ed != null && !ed.isMergeIntrospection())
- return null;
- event = (JavaEvent) b;
- }
-
- ImplicitItem implicit = ed == null ? ImplicitItem.IMPLICIT_DECORATOR_LITERAL : ImplicitItem.NOT_IMPLICIT_LITERAL;
- if (event == null) {
- // We will create a new Event.
- event = BeaninfoFactory.eINSTANCE.createBeanEvent();
- getEventsList().add(event);
- implicit = ImplicitItem.IMPLICIT_DECORATOR_AND_FEATURE_LITERAL; // Can't have an implicit feature but explicit decorator.
- }
-
- setEventID(name, event);
- event.setName(name);
-
- // Now create in the event decorator for it.
- // If there already is one then we
- // will use it. This allows merging with beaninfo.
- if (ed == null) {
- ed = BeaninfoFactory.eINSTANCE.createEventSetDecorator();
- ed.setImplicitDecoratorFlag(implicit);
- event.getEAnnotations().add(ed);
- } else
- BeanInfoDecoratorUtility.clear(ed);
- return ed;
- }
-
- /**
- * @param name
- * @param event
- *
- * @since 1.1.0
- */
- private void setEventID(String name, JavaEvent event) {
- // Now fill it in.
- ((XMIResource) event.eResource()).setID(event, getJavaClass().getName() + BeaninfoJavaReflectionKeyExtension.EVENT + name);
- }
-
- /**
- * Reflect the events. This requires going through local public methods and creating an
- * event for the discovered events.
- */
- protected void reflectEvents() {
- // If we are set to mergeSuperTypeEvents, then we need to get the super events.
- // This is so that duplicate any from super that we find here. When reflecting we don't
- // allow discovered duplicates.
- //
- // Kludge: BeanInfo spec doesn't address Interfaces, but some people want to use them.
- // Interfaces can have multiple extends, while the Introspector ignores these for reflection,
- // the truth is most people want these. So we will add them in. But since there could be more than one it
- // gets confusing. We need to look for dups from the super types.
- //
- // Supertypes will never be more than one entry for classes, it is possible to be 0, 1, 2 or more for interfaces.
- Set supers = new HashSet(50);
- BeanDecorator bd = Utilities.getBeanDecorator(getJavaClass());
- if (bd == null || bd.isMergeSuperEvents()) {
- List superTypes = getJavaClass().getESuperTypes();
- if (!superTypes.isEmpty()) {
- int lenST = superTypes.size();
- for (int i=0; i<lenST; i++) {
- List superAll = ((JavaClass) superTypes.get(i)).getAllEvents();
- int len = superAll.size();
- for (int i1=0; i1<len; i1++) {
- JavaEvent se = (JavaEvent) superAll.get(i1);
- supers.add(se.getName());
- }
- }
- }
- }
-
- HashMap events = new HashMap();
- eventListenerClass = (JavaClass) JavaRefFactory.eINSTANCE.reflectType("java.util.EventListener", getJavaClass()); // Initialize, needed for building eventinfos. //$NON-NLS-1$
- tooManyExceptionClass = (JavaClass) JavaRefFactory.eINSTANCE.reflectType("java.util.TooManyListenersException", getJavaClass()); // Initialize, needed for building eventinfos. //$NON-NLS-1$
- Iterator itr = getJavaClass().getPublicMethods().iterator();
- while (itr.hasNext()) {
- Method mthd = (Method) itr.next();
- if (mthd.isStatic() || mthd.isConstructor())
- continue; // Statics/constructors don't participate in events.
- String key = validEventAdder(mthd);
- if (key != null) {
- EventInfo eventInfo = (EventInfo) events.get(key);
- if (eventInfo == null) {
- eventInfo = new EventInfo();
- eventInfo.setAdder(mthd);
- events.put(key, eventInfo);
- } else
- eventInfo.setAdder(mthd);
- } else {
- key = validEventRemove(mthd);
- if (key != null) {
- EventInfo eventInfo = (EventInfo) events.get(key);
- if (eventInfo == null) {
- eventInfo = new EventInfo();
- eventInfo.setRemover(mthd);
- events.put(key, eventInfo);
- } else
- eventInfo.setRemover(mthd);
- }
- }
- }
-
- eventListenerClass = null; // No longer need it.
-
- // Now actually create the events.
- HashSet eventNames = new HashSet(events.size()); // Set of found event names, to prevent duplicates
- Iterator evtItr = events.entrySet().iterator();
- while (evtItr.hasNext()) {
- Map.Entry eventMap = (Map.Entry) evtItr.next();
- EventInfo ei = (EventInfo) eventMap.getValue();
- if (ei.isValidInfo()) {
- String eventName = getEventName((String) eventMap.getKey());
- if (eventNames.contains(eventName))
- continue; // Aleady created it. (Note: Introspector actually takes last one over previous dups, but the order is totally undefined, so choosing first is just as good or bad.
-
- if (supers.contains(eventName))
- continue; // Don't override a super event.
-
- if (ei.createEvent(eventName))
- eventNames.add(eventName); // It was validly created.
- }
- }
-
- tooManyExceptionClass = null; // No longer need it.
- }
-
- /**
- * merge all the Events (i.e. supertypes)
- */
- protected EList allEvents() {
-
- EList jcAllEvents = getJavaClass().getAllEventsGen();
- BeaninfoSuperAdapter superAdapter =
- (BeaninfoSuperAdapter) EcoreUtil.getRegisteredAdapter(getJavaClass(), BeaninfoSuperAdapter.class);
- if (jcAllEvents != null) {
- // See if new one required.
- if (superAdapter == null || !superAdapter.isAllEventsCollectionModified())
- return jcAllEvents;
- // Can't get superadapter, so must not be attached to a resource, so return current list. Or no change required.
- }
-
- UniqueEList.FastCompare allEvents = new UniqueEList.FastCompare() {
- /**
- * Comment for <code>serialVersionUID</code>
- *
- * @since 1.1.0
- */
- private static final long serialVersionUID = 1L;
-
- protected Object[] newData(int capacity) {
- return new JavaEvent[capacity];
- }
- };
-
- boolean doAllEvents = false;
- synchronized(this) {
- // If we are introspecting, don't do all properties because it is an invalid list. Just return empty without reseting the all modified flag.
- doAllEvents = !isDoingAllEvents && !isIntrospecting && isResourceConnected();
- if (doAllEvents)
- isDoingAllEvents = true;
- }
-
- if (doAllEvents) {
- try {
- EList localEvents = getJavaClass().getEvents();
- // Kludge: BeanInfo spec doesn't address Interfaces, but some people want to use them.
- // Interfaces can have multiple extends, while the Introspector ignores these for reflection,
- // the truth is most people want these. So we will add them in. But since there could be more than one it
- // gets confusing. We need to look for dups from the super types and still keep order.
- //
- // Supertypes will never be more than one entry for classes, it is possible to be 0, 1, 2 or more for interfaces.
- List superTypes = getJavaClass().getESuperTypes();
- if (!superTypes.isEmpty()) {
- // Now we need to merge in the supers.
- BeanDecorator bd = Utilities.getBeanDecorator(getJavaClass());
- // If there is only one supertype, we can add to the actual events, else we will use the linked hashset so that
- // we don't add possible duplicates (e.g. IA extends IB,IC and IB extends IC. In this case there would be dups
- // because IB would contribute IC's too).
- Collection workingAllEvents = superTypes.size() == 1 ? (Collection) allEvents : new LinkedHashSet();
- // We will now merge as directed.
- boolean mergeAll = bd == null || bd.isMergeSuperEvents();
- if (!mergeAll) {
- // we don't to want to merge super events, but we still need super non-events or explicit ones.
- int lenST = superTypes.size();
- for (int i=0; i<lenST; i++) {
- List supers = ((JavaClass) superTypes.get(i)).getAllEvents();
- int len = supers.size();
- for (int i1 = 0; i1 < len; i1++) {
- JavaEvent e = (JavaEvent) supers.get(i1);
- EventSetDecorator ed = Utilities.getEventSetDecorator(e);
- if (ed == null || (ed.getImplicitDecoratorFlag() == ImplicitItem.NOT_IMPLICIT_LITERAL && !ed.isMergeIntrospection()))
- workingAllEvents.add(e);
- }
- }
- } else {
- // We want to merge all.
- // BeanInfo has given us the not merge list. If the list is empty, then we accept all.
- if (bd != null && bd.eIsSet(BeaninfoPackage.eINSTANCE.getBeanDecorator_NotInheritedEventNames())) {
- // We were given a list of names.
- // Get the names into a set to create a quick lookup.
- HashSet superSet = new HashSet(bd.getNotInheritedEventNames());
-
- // Now walk and add in non-bean events (and bean events that were explicitly added and not mergeable (i.e. didn't come thru beaninfo))
- // and add those not specifically called out by BeanInfo.
- int lenST = superTypes.size();
- for (int i=0; i<lenST; i++) {
- List supers = ((JavaClass) superTypes.get(i)).getAllEvents();
- int len = supers.size();
- for (int i1 = 0; i1 < len; i1++) {
- JavaEvent e = (JavaEvent) supers.get(i1);
- EventSetDecorator ed = Utilities.getEventSetDecorator(e);
- if (ed == null || (ed.getImplicitDecoratorFlag() == ImplicitItem.NOT_IMPLICIT_LITERAL && !ed.isMergeIntrospection()) || !superSet.contains(ed.getName()))
- workingAllEvents.add(e);
- }
- }
- } else {
- // BeanInfo called out that all super events should be added, or no beaninfo.
- int lenST = superTypes.size();
- for (int i=0; i<lenST; i++) {
- workingAllEvents.addAll(((JavaClass) superTypes.get(i)).getAllEvents());
- }
- }
- }
- if (workingAllEvents != allEvents)
- allEvents.addAll(workingAllEvents); // Now copy over the ordered super events.
- }
- allEvents.addAll(localEvents);
- superAdapter.setAllEventsCollectionModified(false); // Now built, so reset to not changed.
- } finally {
- synchronized (this) {
- isDoingAllEvents = false;
- }
- }
- }
-
- if (allEvents.isEmpty())
- return ECollections.EMPTY_ELIST;
- else {
- allEvents.shrink();
- return new EcoreEList.UnmodifiableEList.FastCompare(
- getJavaClass(),
- JavaRefPackage.eINSTANCE.getJavaClass_AllEvents(),
- allEvents.size(),
- allEvents.data());
- }
-
- }
-
- private JavaClass eventListenerClass, // Event Listener class. Needed for validation.
- tooManyExceptionClass; // Too many listeners exception.
-
- /*
- * Pass in the key, it will be used to form the name.
- */
- protected String getEventName(String key) {
- return key.substring(0, key.indexOf(':'));
- }
-
- /*
- * Answers event key if valid, null if not valid.
- */
- protected String validEventAdder(Method method) {
- String name = method.getName();
- if (!name.startsWith("add") || !name.endsWith("Listener")) //$NON-NLS-1$ //$NON-NLS-2$
- return null; // Not valid format for an add listener name.
- // Note. The Bean specs only state that it should be "add<ListenerType>" but the
- // introspector implicitly adds an additional constraint in that the listener type
- // should end with "Listener". If it doesn't the introspector would actually throw
- // an index out of bounds. We'll just ignore such methods.
-
- List parms = method.getParameters();
- if (parms.size() != 1)
- return null; // Invalid - improper number of parms.
-
- EClassifier returnType = method.getReturnType();
- if (returnType == null || !returnType.getName().equals("void")) //$NON-NLS-1$
- return null; // Invalid - must be void return type.
-
- EClassifier parmType = ((JavaParameter) parms.get(0)).getEType();
- if (!BeaninfoClassAdapter.this.eventListenerClass.isAssignableFrom(parmType))
- return null; // Parm must be inherit from EventListener
-
- // Beans introspector also requires that the "listener" part of the name be a
- // suffix of the type name. So if the type name was "ISomeListener" then
- // the method name must be "addSomeListener" (actually "addomeListener"
- // would also be valid according to the introspector!).
- // This allows the type to be an interface using the "I" convention while not
- // requiring the "I" to be in the name of the event.
- if (!parmType.getName().endsWith(name.substring(3)))
- return null; // It is not "add{ListenerType}".
-
- // This is a unique containing event name and listener type
- // This is so we can have a unique key for two events with the same
- // name but different listener type. (This matches Introspector so that we aren't
- // coming up with different results.
- return java.beans.Introspector.decapitalize(name.substring(3, name.length() - 8))
- + ':'
- + ((JavaHelpers) parmType).getQualifiedName();
- }
-
- /*
- * Answers event key if valid, null if not valid.
- */
- protected String validEventRemove(Method method) {
- String name = method.getName();
- if (!name.startsWith("remove") || !name.endsWith("Listener")) //$NON-NLS-1$ //$NON-NLS-2$
- return null; // Not valid format for a remove listener name.
- // Note. The Bean specs only state that it should be "add<ListenerType>" but the
- // introspector implicitly adds an additional constraint in that the listener type name
- // should end with "Listener". If it doesn't the introspector would actually throw
- // an index out of bounds. We'll just ignore such methods.
-
-
- List parms = method.getParameters();
- if (parms.size() != 1)
- return null; // Invalid - improper number of parms.
-
- EClassifier returnType = method.getReturnType();
- if (returnType == null || !returnType.getName().equals("void")) //$NON-NLS-1$
- return null; // Invalid - must be void return type.
-
- EClassifier parmType = ((JavaParameter) parms.get(0)).getEType();
- if (!BeaninfoClassAdapter.this.eventListenerClass.isAssignableFrom(parmType))
- return null; // Parm must be inherit from EventListener
-
- // Beans introspector also requires that the "listener" part of the name be a
- // suffix of the type name. So if the type name was "ISomeListener" then
- // the method name must be "removeSomeListener" (actually "removeomeListener"
- // would also be valid according to the introspector!).
- // This allows the type to be an interface using the "I" convention while not
- // requiring the "I" to be in the name of the event.
- if (!parmType.getName().endsWith(name.substring(6)))
- return null; // It is not "add{ListenerType}".
-
- // This is a unique containing event name and listener type
- // This is so we can have a unique key for two events with the same
- // name but different listener type. (This matches Introspector so that we aren't
- // coming up with different results).
- return java.beans.Introspector.decapitalize(name.substring(6, name.length() - 8))
- + ':'
- + ((JavaHelpers) parmType).getQualifiedName();
- }
-
- public boolean isDefaultBound() {
- if (defaultBound == null) {
- // Haven't yet decided on it.
- Iterator methods = getJavaClass().getPublicMethods().iterator();
- boolean foundAdd = false, foundRemove = false;
- while (methods.hasNext() && (!foundAdd || !foundRemove)) {
- Method method = (Method) methods.next();
- if ("addPropertyChangeListener".equals(method.getName())) { //$NON-NLS-1$
- List parms = method.getParameters();
- if (parms.size() == 1) {
- JavaParameter parm = (JavaParameter) parms.get(0);
- if ("java.beans.PropertyChangeListener".equals(((JavaHelpers) parm.getEType()).getQualifiedName())) { //$NON-NLS-1$
- foundAdd = true;
- continue;
- }
- }
- } else if ("removePropertyChangeListener".equals(method.getName())) { //$NON-NLS-1$
- List parms = method.getParameters();
- if (parms.size() == 1) {
- JavaParameter parm = (JavaParameter) parms.get(0);
- if ("java.beans.PropertyChangeListener".equals(((JavaHelpers) parm.getEType()).getQualifiedName())) { //$NON-NLS-1$
- foundRemove = true;
- continue;
- }
- }
- }
- }
-
- defaultBound = (foundAdd && foundRemove) ? Boolean.TRUE : Boolean.FALSE;
- }
- return defaultBound.booleanValue();
- }
-
- private class EventInfo {
-
- public Method addListenerMethod;
- public Method removeListenerMethod;
-
- public void setAdder(Method addMethod) {
- addListenerMethod = addMethod;
- }
-
- public void setRemover(Method removeMethod) {
- removeListenerMethod = removeMethod;
- }
-
- // Answer whether this is a valid event info.
- public boolean isValidInfo() {
- return (addListenerMethod != null && removeListenerMethod != null);
- }
-
- public boolean createEvent(String name) {
- EventSetDecorator ed = BeaninfoClassAdapter.this.createEvent(name);
- if (ed == null)
- return false; // Reflection not wanted.
-
-
- // See if unicast.
- boolean unicast = false;
- List exceptions = addListenerMethod.getJavaExceptions();
- int len = exceptions.size();
- for(int i=0; i<len; i++) {
- if (exceptions.get(i) == BeaninfoClassAdapter.this.tooManyExceptionClass) {
- unicast = true;
- break;
- }
- }
- // We'll let listener methods get retrieved dynamically when needed.
- BeanInfoDecoratorUtility.setProperties(ed, addListenerMethod, removeListenerMethod, unicast, (JavaClass) ((JavaParameter) addListenerMethod.getParameters().get(0)).getEType());
- return true;
- }
-
- }
-
- /**
- * Marh the factory as stale, but leave the overrides alone. They are not stale.
- * @param stale
- *
- * @since 1.1.0.1
- */
- public void markStaleFactory(ProxyFactoryRegistry stale) {
- markStaleFactory(stale, false);
- }
-
- /**
- * Mark this factory as the stale factory.
- *
- * @param clearOverriddes clear the overrides too. They are stale.
- */
- public void markStaleFactory(ProxyFactoryRegistry stale, boolean clearOverriddes) {
- if (staleFactory == null) {
- // It's not stale so make it stale.
- // So that next access will re-introspect
- defaultBound = null; // So query on next request.
- staleFactory = new WeakReference(stale);
-
- // Need to mark the esuperadapter that things have changed so that any
- // subtype will know to reuse the parent for anything that requires knowing parent info.
- Adapter a = EcoreUtil.getExistingAdapter(getTarget(), ESuperAdapter.class);
- // Simulate that this objects super has changed. This will make all subclasses
- // think about the super has changed and next retrieving anything that involves the
- // super will cause a rebuild to occur.
- Notification note =
- new ENotificationImpl((InternalEObject) getTarget(), Notification.SET, EcorePackage.ECLASS__ESUPER_TYPES, null, null);
- if (a != null)
- a.notifyChanged(note);
- // Do the same with BeaninfoSuperAdapter so that events also will be rebuilt.
- a = EcoreUtil.getExistingAdapter(getTarget(), BeaninfoSuperAdapter.ADAPTER_KEY);
- if (a != null)
- a.notifyChanged(note);
- synchronized (this) {
- needsIntrospection = true;
- if (clearOverriddes) {
- retrievedExtensionDocument = CLEAR_EXTENSIONS;
- if (classEntry != null) {
- classEntry.markDeleted();
- classEntry = null; // Get a new one next time.
- }
- }
- }
- }
- }
-
- /**
- * Form a longname for the addkey function.
- */
- private String formLongName(EOperation feature) {
- Method mthd = null;
- if (feature instanceof Method)
- mthd = (Method) feature;
- else if (feature instanceof MethodProxy)
- mthd = ((MethodProxy) feature).getMethod();
- else
- return null; // Don't know what it is.
-
- StringBuffer longName = new StringBuffer(100);
- longName.append(feature.getName()); // Feature Name
- longName.append(':');
- longName.append(mthd.getName()); // Method Name
- longName.append('(');
- List p = mthd.getParameters();
- for (int i = 0; i < p.size(); i++) {
- JavaParameter parm = (JavaParameter) p.get(i);
- if (i>0)
- longName.append(',');
- longName.append(parm.getJavaType().getQualifiedName());
- }
-
- return longName.toString();
- }
-
- /*
- * More than one operation can have the same name. To identify them uniquely, the long name is created,
- * which is formed from the name and the method signature.
- */
- private String formLongName(MethodRecord record) {
- StringBuffer longName = new StringBuffer(100);
- longName.append(record.name); // Feature Name
- longName.append(':');
- longName.append(record.methodForDescriptor.methodName); // Method Name
- longName.append('(');
- String[] p = record.methodForDescriptor.parameterTypeNames;
- if (p != null)
- for (int i = 0; i < p.length; i++) {
- if (i>0)
- longName.append(',');
- longName.append(MapJNITypes.getFormalTypeName(p[i]));
- }
-
- return longName.toString();
- }
- /**
- * @see org.eclipse.emf.common.notify.Adapter#notifyChanged(Notification)
- */
- public void notifyChanged(Notification msg) {
- // In case of removing adapter, make sure we are first removed from the factory so it doesn't know about us anymore.
- if (msg.getEventType() == Notification.REMOVING_ADAPTER)
- getAdapterFactory().removeAdapter(this);
- }
-
- /**
- * @see java.lang.Object#toString()
- */
- public String toString() {
- return super.toString() + '(' + (getJavaClass() != null ? getJavaClass().getQualifiedName() : "?") + ')'; //$NON-NLS-1$
- }
-
-
-}
diff --git a/plugins/org.eclipse.jem.beaninfo/beaninfo/org/eclipse/jem/internal/beaninfo/adapters/BeaninfoJavaReflectionKeyExtension.java b/plugins/org.eclipse.jem.beaninfo/beaninfo/org/eclipse/jem/internal/beaninfo/adapters/BeaninfoJavaReflectionKeyExtension.java
deleted file mode 100644
index 604306b..0000000
--- a/plugins/org.eclipse.jem.beaninfo/beaninfo/org/eclipse/jem/internal/beaninfo/adapters/BeaninfoJavaReflectionKeyExtension.java
+++ /dev/null
@@ -1,133 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2001, 2005 IBM Corporation and others.
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
- *
- * Contributors:
- * IBM Corporation - initial API and implementation
- *******************************************************************************/
-package org.eclipse.jem.internal.beaninfo.adapters;
-/*
-
-
- */
-
-import java.util.Iterator;
-import java.util.List;
-
-import org.eclipse.emf.ecore.EObject;
-import org.eclipse.emf.ecore.EStructuralFeature;
-import org.eclipse.emf.ecore.xmi.XMIResource;
-
-import org.eclipse.jem.java.JavaClass;
-import org.eclipse.jem.java.adapters.IJavaReflectionKey;
-import org.eclipse.jem.java.adapters.IJavaReflectionKeyExtension;
-
-/**
- * Java Reflection Key extension to retrieve keys for beaninfo creations.
- *
- * Handles attributes and behaviors.
- *
- * @version 1.0
- * @author R. L. Kulp
- */
-public class BeaninfoJavaReflectionKeyExtension implements IJavaReflectionKeyExtension {
-
- // The format of the keys are:
- // behaviors: "classname/behavior/behaviorname"
- // structural features: "classname/featurename"
- public static final String
- BEHAVIOR = "/operation/", // Piece in key that indicates this is a behavior. //$NON-NLS-1$
- EVENT = "/event/", // Piece in key that indicates this is an event. //$NON-NLS-1$
- FEATURE = "/"; // Piece in key that indicates this is an attribute. //$NON-NLS-1$
-
- /**
- * Get the object for this key.
- */
- public Object getObject(String key, IJavaReflectionKey reflectionKey) {
- if (key != null) {
- int ibehave = key.indexOf(BEHAVIOR);
- if (ibehave > -1) {
- // We have a possible behavior.
- String classname = key.substring(0, ibehave);
- int ibehaveName = ibehave+BEHAVIOR.length();
- if (ibehaveName < key.length()) {
- JavaClass javaclass = getJavaClass(reflectionKey, classname);
- if (javaclass != null) {
- javaclass.getEOperations(); // Get the list introspected and populated if not already.
- return reflectionKey.primGet(key); // It should now be there,
- }
- }
- } else {
- int ievent = key.indexOf(EVENT);
- if (ievent > -1) {
- // We have a possible event.
- String classname = key.substring(0, ievent);
- int ieventName = ievent+EVENT.length();
- if (ieventName < key.length()) {
- JavaClass javaclass = getJavaClass(reflectionKey, classname);
- if (javaclass != null) {
- javaclass.getEvents(); // Get the list introspected and populated if not already.
- return reflectionKey.primGet(key); // It should now be there,
- }
- }
- } else {
- int ifeature = key.indexOf(FEATURE);
- if (ifeature > -1) {
- // We have a possible feature.
- String classname = key.substring(0, ifeature);
- int ifeatureName = ifeature+FEATURE.length();
- if (ifeatureName < key.length()) {
- String feature = key.substring(ifeatureName);
- JavaClass javaclass = getJavaClass(reflectionKey, classname);
- if (javaclass != null) {
- // This is just a hack until we can get ID situation straightened out.
- // Need to cause introspection of the attributes and references.
- javaclass.getEStructuralFeatures();
- Object result = reflectionKey.primGet(key); // See if it now got added as an id.
- if (result == null) {
- // Well, it could of been added by the diff merge, which as of now can't handle ids.
- // So we will find it within the attributes/references.
- result = findFeature(feature, javaclass.getEReferences());
- if (result == null)
- result = findFeature(feature, javaclass.getEAttributes());
- if (result instanceof EStructuralFeature) {
- // Need to add it as an id so next time won't come through here.
- ((XMIResource) javaclass.eResource()).setID((EObject) result, key); // So next time it will find it directly.
- }
- }
- return result;
- }
- }
- }
- }
- }
- }
-
- return null;
- }
-
- private EStructuralFeature findFeature(String featureName, List featureList) {
- Iterator itr = featureList.iterator();
- while (itr.hasNext()) {
- EStructuralFeature feature = (EStructuralFeature) itr.next();
- if (featureName.equals(feature.getName())) {
- return feature;
- }
- }
- return null;
- }
-
- protected JavaClass getJavaClass(IJavaReflectionKey reflectionKey, String classname) {
- Object eclass = reflectionKey.primGet(classname);
- if (eclass == null)
- eclass = reflectionKey.getJavaType(classname); // Let it create it.
- if (eclass instanceof JavaClass)
- return (JavaClass) eclass;
- else
- return null;
- }
-
-}
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
deleted file mode 100644
index 9b90132..0000000
--- a/plugins/org.eclipse.jem.beaninfo/beaninfo/org/eclipse/jem/internal/beaninfo/adapters/BeaninfoModelSynchronizer.java
+++ /dev/null
@@ -1,198 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2001, 2006 IBM Corporation and others.
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
- *
- * Contributors:
- * IBM Corporation - initial API and implementation
- *******************************************************************************/
-package org.eclipse.jem.internal.beaninfo.adapters;
-/*
-
-
- */
-
-import org.eclipse.core.runtime.IPath;
-import org.eclipse.core.runtime.Path;
-import org.eclipse.jdt.core.*;
-
-import org.eclipse.jem.workbench.utility.JavaModelListener;
-/**
- * This class listens for changes to the java model and flushs the
- * appropriate class introspection.
- */
-
-public class BeaninfoModelSynchronizer extends JavaModelListener {
- protected BeaninfoAdapterFactory fAdapterFactory;
- protected IJavaProject fProject; // The project this listener is opened on.
- private static final IPath BEANINFOCONFIG_PATH = new Path(BeaninfoNature.P_BEANINFO_SEARCH_PATH); //$NON-NLS-1$
-
- public BeaninfoModelSynchronizer(BeaninfoAdapterFactory aFactory, IJavaProject aProject) {
- super(ElementChangedEvent.POST_CHANGE);
- fAdapterFactory = aFactory;
- fProject = aProject;
- }
-
- /* (non-Javadoc)
- * @see org.eclipse.jem.internal.adapters.jdom.JavaModelListener#getJavaProject()
- */
- protected IJavaProject getJavaProject() {
- return fProject;
- }
- /* (non-Javadoc)
- * @see org.eclipse.jem.internal.adapters.jdom.JavaModelListener#isAlsoClasspathChange(org.eclipse.core.runtime.IPath)
- */
- protected boolean isAlsoClasspathChange(IPath path) {
- return path.equals(BEANINFOCONFIG_PATH);
- }
-
- /**
- * Stop the synchronizer from listening to any more changes.
- */
- public void stopSynchronizer(boolean clearResults) {
- JavaCore.removeElementChangedListener(this);
- getAdapterFactory().closeAll(clearResults);
- }
-
- public BeaninfoAdapterFactory getAdapterFactory() {
- return fAdapterFactory;
- }
-
- protected void processJavaElementChanged(IJavaProject element, IJavaElementDelta delta) {
- if (isInClasspath(element)) {
- if (delta.getKind() == IJavaElementDelta.REMOVED || delta.getKind() == IJavaElementDelta.ADDED) {
- // Don't need to do anything for delete/close/add/open of main project because there is much more that needs to
- // be done by BeaninfoNature on project close/delete, so nature listens for this and does the appropriate cleanup.
- if (!element.equals(fProject)) {
- // However, all other projects are required projects and if they are deleted/closed/added/opened when need to do
- // a full flush because we don't know any of the state, whether they are still there or not.
- getAdapterFactory().markAllStale();
- }
- return;
- } else if (isClasspathResourceChange(delta)) {
- getAdapterFactory().markAllStale(); // The .classpath file (or .beaninfoconfig) itself in SOME DEPENDENT PROJECT has changed.
- return;
- }
- processChildren(element, delta);
- }
- }
-
- /**
- * Handle the change for a single element, children will be handled separately.
- * If a working copy, then ignore it because we don't care about changes until
- * they are committed. Else, if the CU has changed content then mark all of the
- * types in this CU (such as inner classes) as stale.
- * If it is not a content change then process the children.
- */
- protected void processJavaElementChanged(ICompilationUnit element, IJavaElementDelta delta) {
- switch (delta.getKind()) {
- case IJavaElementDelta.CHANGED :
- // A file save had occurred. It doesn't matter if currently working copy or not.
- // It means something has changed to the file on disk, but don't know what.
- if ((delta.getFlags() & IJavaElementDelta.F_PRIMARY_RESOURCE) != 0) {
- getAdapterFactory().markStaleIntrospectionPlusInner(getFullNameFromElement(element), false); // Flush everything, including inner classes.
- }
-
- break;
- case IJavaElementDelta.ADDED:
- case IJavaElementDelta.REMOVED:
- // Need to know for add because we optimize the beaninfo such that once found as undefined, it won't
- // introspect again until we mark it stale. So we need to mark it stale to refresh it.
-
- // It doesn't matter if totally removed or just moved somewhere else, we will clear out
- // adapter because there could be a rename which would be a different class.
- // Currently the element is already deleted or added and there is no way to find the types in the unit to flush.
- // So instead we ask factory to flush all it any that start with it plus for inner classes.
- getAdapterFactory().markStaleIntrospectionPlusInner(getFullNameFromElement(element), true); // Flush everything, including inner classes.
- break;
- }
- }
-
- /**
- * Handle the change for a single element, children will be handled separately.
- */
- protected void processJavaElementChanged(IClassFile element, IJavaElementDelta delta) {
- if (delta.getKind() == IJavaElementDelta.REMOVED) {
- // It doesn't matter if totally removed or just moved somewhere else, we will clear out and remove the
- // adapter because there could be a rename which would be a different class.
- // Currently the element is already deleted and there is no way to find the types in the unit to remove.
- // So instead we ask factory to remove all it any that start with it plus for inner classes.
- getAdapterFactory().markStaleIntrospectionPlusInner(getFullNameFromElement(element), true);
- return; // Since the classfile was removed we don't need to process the children (actually the children list will be empty
- }
- IJavaElementDelta[] children = delta.getAffectedChildren();
- for (int ii = 0; ii < children.length; ii++) {
- processDelta(children[ii]);
- }
- }
-
- protected String getFullNameFromElement(IJavaElement element) {
- String name = element.getElementName();
- if (!(element instanceof ICompilationUnit || element instanceof IClassFile))
- return name; // Shouldn't be here
-
- // remove extension.
- int periodNdx = name.lastIndexOf('.');
- if (periodNdx == -1)
- return name; // Shouldn't be here. There should be an extension
-
- String typeName = null;
- String parentName = element.getParent().getElementName();
- if (parentName == null || parentName.length() == 0)
- typeName = name.substring(0, periodNdx); // In default package
- else
- typeName = parentName + "." + name.substring(0, periodNdx); //$NON-NLS-1$
-
- return typeName;
- }
-
- /**
- * Handle the change for a single element, children will be handled separately.
- * If the classpath has changed, mark all as stale because we don't know what
- * has changed. Things that were in the path may no longer be in the path, or
- * the order was changed, which could affect the introspection.
- */
- protected void processJavaElementChanged(IPackageFragmentRoot element, IJavaElementDelta delta) {
- if (isClassPathChange(delta))
- fAdapterFactory.markAllStale();
- else
- super.processJavaElementChanged(element, delta);
- }
-
- protected void processJavaElementChanged(IPackageFragment element, IJavaElementDelta delta) {
- switch (delta.getKind()) {
- case IJavaElementDelta.ADDED:
- // Even though added there is possibility that package exists in other root but this
- // one may now take priority, so we will clear the package anyway.
- case IJavaElementDelta.REMOVED:
- fAdapterFactory.markPackageStale(element.getElementName());
- break;
- default :
- super.processJavaElementChanged(element, delta);
- }
- }
-
-
- /**
- * Handle the change for a single element, children will be handled separately.
- * Something about the type has changed. If it was removed (not a move), then close the
- * adapter too.
- */
- protected void processJavaElementChanged(IType element, IJavaElementDelta delta) {
- if (delta.getKind() == IJavaElementDelta.REMOVED) {
- // Close it out. Doesn't matter if moved_to, that would be a rename which requires brand new class.
- // We can't actually get rid of the beaninfo adapter because it may be asked for again
- // just to see if not defined. It may also come back later and we want to know about
- // it to recycle the vm.
- getAdapterFactory().markStaleIntrospection(element.getFullyQualifiedName(), true);
- } else
- getAdapterFactory().markStaleIntrospection(element.getFullyQualifiedName(), false); // Just mark it stale
- processChildren(element, delta);
- }
-
- public String toString() {
- return super.toString()+" "+fProject.getElementName(); //$NON-NLS-1$
- }
-}
diff --git a/plugins/org.eclipse.jem.beaninfo/beaninfo/org/eclipse/jem/internal/beaninfo/adapters/BeaninfoNature.java b/plugins/org.eclipse.jem.beaninfo/beaninfo/org/eclipse/jem/internal/beaninfo/adapters/BeaninfoNature.java
deleted file mode 100644
index 9359041..0000000
--- a/plugins/org.eclipse.jem.beaninfo/beaninfo/org/eclipse/jem/internal/beaninfo/adapters/BeaninfoNature.java
+++ /dev/null
@@ -1,1031 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2001, 2006 IBM Corporation and others.
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
- *
- * Contributors:
- * IBM Corporation - initial API and implementation
- *******************************************************************************/
-package org.eclipse.jem.internal.beaninfo.adapters;
-/*
-
-
- */
-
-import java.io.*;
-import java.text.MessageFormat;
-import java.util.*;
-import java.util.logging.Level;
-
-import javax.xml.parsers.*;
-import javax.xml.transform.*;
-import javax.xml.transform.dom.DOMSource;
-import javax.xml.transform.stream.StreamResult;
-
-import org.eclipse.core.resources.*;
-import org.eclipse.core.runtime.*;
-import org.eclipse.debug.core.ILaunchConfigurationWorkingCopy;
-import org.eclipse.emf.common.util.URI;
-import org.eclipse.emf.ecore.EObject;
-import org.eclipse.emf.ecore.resource.Resource;
-import org.eclipse.emf.ecore.resource.ResourceSet;
-import org.eclipse.emf.ecore.util.EcoreUtil;
-import org.eclipse.emf.ecore.xmi.impl.XMIResourceFactoryImpl;
-import org.eclipse.jdt.core.*;
-import org.osgi.framework.Bundle;
-import org.w3c.dom.Document;
-import org.w3c.dom.Element;
-import org.xml.sax.InputSource;
-
-import org.eclipse.jem.internal.beaninfo.core.*;
-import org.eclipse.jem.internal.java.beaninfo.IIntrospectionAdapter;
-import org.eclipse.jem.internal.java.init.JavaInit;
-import org.eclipse.jem.internal.plugin.JavaEMFNature;
-import org.eclipse.jem.internal.proxy.core.*;
-import org.eclipse.jem.internal.proxy.core.IConfigurationContributionInfo.ContainerPaths;
-import org.eclipse.jem.java.adapters.JavaXMIFactory;
-import org.eclipse.jem.util.emf.workbench.ProjectResourceSet;
-import org.eclipse.jem.util.emf.workbench.ResourceHandler;
-
-
-/**
- * The beaninfo nature. It is created for a project and holds the
- * necessary info for beaninfo to be performed on a project.
- */
-
-public class BeaninfoNature implements IProjectNature {
-
- public static final String NATURE_ID = BeaninfoPlugin.PI_BEANINFO_PLUGINID + ".BeanInfoNature"; //$NON-NLS-1$
- public static final String P_BEANINFO_SEARCH_PATH = ".beaninfoConfig"; //$NON-NLS-1$
-
- public static final QualifiedName CONFIG_INFO_SESSION_KEY = new QualifiedName(BeaninfoPlugin.PI_BEANINFO_PLUGINID, "CONFIG_INFO"); //$NON-NLS-1$
- public static final QualifiedName BEANINFO_CONTRIBUTORS_SESSION_KEY = new QualifiedName(BeaninfoPlugin.PI_BEANINFO_PLUGINID, "BEANINFO_CONTRIBUTORS"); //$NON-NLS-1$
-
- private ProxyFactoryRegistry.IRegistryListener registryListener = new ProxyFactoryRegistry.IRegistryListener() {
- /**
- * @see org.eclipse.jem.internal.proxy.core.ProxyFactoryRegistry.IRegistryListener#registryTerminated(ProxyFactoryRegistry)
- */
- public void registryTerminated(ProxyFactoryRegistry registry) {
- prematureRegistryTerminate();
- markAllStale();
- };
- };
-
- /**
- * Get the runtime nature for the project, create it if necessary.
- */
- public static BeaninfoNature getRuntime(IProject project) throws CoreException {
- JavaEMFNature.createRuntime(project); // Must force JAVAEMFNature creation first before we try to get ours. There is a chicken/egg problem if we let our nature try to get JavaEMFNature during setProject.
- if (project.hasNature(NATURE_ID))
- return (BeaninfoNature) project.getNature(NATURE_ID);
- else
- return createRuntime(project);
- }
-
- /**
- * Return whether this project has a BeanInfo runtime turned on.
- *
- * @param project
- * @return <code>true</code> if it has the a BeanInfo runtime.
- * @throws CoreException
- *
- * @since 1.0.0
- */
- public static boolean hasRuntime(IProject project) throws CoreException {
- return project.hasNature(NATURE_ID);
- }
-
- /**
- * Test if this is a valid project for a Beaninfo Nature. It must be
- * a JavaProject.
- */
- public static boolean isValidProject(IProject project) {
- try {
- return project.hasNature(JavaCore.NATURE_ID);
- } catch (CoreException e) {
- return false;
- }
- }
-
- /**
- * Create the runtime.
- */
- private static BeaninfoNature createRuntime(IProject project) throws CoreException {
- if (!isValidProject(project))
- throw new CoreException(
- new Status(
- IStatus.ERROR,
- BeaninfoPlugin.PI_BEANINFO_PLUGINID,
- 0,
- MessageFormat.format(
- BeanInfoAdapterMessages.INTROSPECT_FAILED_EXC_,
- new Object[] { project.getName(), BeanInfoAdapterMessages.BeaninfoNature_InvalidProject}),
- null));
-
- addNatureToProject(project, NATURE_ID);
- return (BeaninfoNature) project.getNature(NATURE_ID);
- }
-
- private static void addNatureToProject(IProject proj, String natureId) throws CoreException {
- IProjectDescription description = proj.getDescription();
- String[] prevNatures = description.getNatureIds();
- String[] newNatures = new String[prevNatures.length + 1];
- System.arraycopy(prevNatures, 0, newNatures, 0, prevNatures.length);
- newNatures[prevNatures.length] = natureId;
- description.setNatureIds(newNatures);
- proj.setDescription(description, null);
- }
-
- private IProject fProject;
- protected ProxyFactoryRegistry fRegistry;
- protected ResourceSet javaRSet;
- protected BeaninfoModelSynchronizer fSynchronizer;
- protected static BeaninfoJavaReflectionKeyExtension fReflectionKeyExtension;
-
- /**
- * Configures the project with this nature.
- * This is called by <code>IProject.getNature</code> and should not
- * be called directly by clients.
- * The nature extension id is added to the list of natures on the project by
- * <code>IProject.getNature</code>, and need not be added here.
- *
- * @exception CoreException if this method fails.
- */
- public void configure() throws CoreException {
- }
-
- /**
- * Removes this nature from the project, performing any required deconfiguration.
- * This is called by <code>IProject.removeNature</code> and should not
- * be called directly by clients.
- * The nature id is removed from the list of natures on the project by
- * <code>IProject.removeNature</code>, and need not be removed here.
- *
- * @exception CoreException if this method fails.
- */
- public void deconfigure() throws CoreException {
- removeSharedProperty(P_BEANINFO_SEARCH_PATH, null);
- cleanup(true, true);
- }
-
- /**
- * Shutdown the nature. Called by BeanInfoPlugin to tell the nature that the plugin is being shutdown.
- * It needs to cleanup.
- * TODO <package-protected> because only BeanInfoPlugin should call it. (public for now but when we make
- * BeanInfoNature an API it will be moved into the same package as BeanInfoPlugin).
- *
- * @since 1.0.0
- */
- public void shutdown() {
- cleanup(true, false);
- }
-
-
- /**
- * Return a new ResourceSet that is linked correctly to this Beaninfo Nature.
- * <p>
- * This links up a ResourceSet so that it will work correctly with this nature.
- * It makes sure that going through the ResourceSet that any "java:/..."
- * classes can be found and it makes sure that any new classes are placed into the
- * nature's resource set and not resource set doing the calling.
- * <p>
- * This should be used any time a resource set is needed that is not the
- * project wide resource set associated with beaninfos, but will reference
- * Java Model classes or instantiate.
- * <p>
- * An additional change is made too. The ResourceFactoryRegistry's extensionToResourceFactory map is modified
- * to have an "java"->XMIResourceFactory entry added to it if EMF Examples is loaded. EMF Examples add
- * the "java" extension and sets it to their own special JavaResourceFactory.
- * If EMF Examples is not loaded, then it falls back to the default "*" mapping, which is to XMIResourceFactory.
- * This normally causes problems for many
- * customers. If users of this resource set really want the EMF examples entry instead, after they retrieve the
- * new resource set they can do this:
- * <p>
- * <pre><code>
- * rset = beaninfoNature.newResourceSet();
- * rset.getResourceFactoryRegistry().getExtensionToFactoryMap().remove("java");
- * </code></pre>
- *
- * @return a ResourceSet that is specially connected to the JEM java model.
- *
- * @since 1.0.0
- */
- public ProjectResourceSet newResourceSet() {
- SpecialResourceSet rset = new SpecialResourceSet();
- rset.add(new ResourceHandler() {
- public EObject getEObjectFailed(ResourceSet originatingResourceSet, URI uri, boolean loadOnDemand) {
- return null; // We don't have any special things we can do in this case.
- }
-
- public Resource getResource(ResourceSet originatingResourceSet, URI uri) {
- // Always try to get it out of the nature's resource set because it may of been loaded there either as
- // the "java:..." type or it could of been an override extra file (such as an override EMF package, for
- // example jcf has a side package containing the definition of the new attribute type. That file
- // will also be loaded into this resourceset. So to find it we need to go in here and try.
- //
- // However, if not found we won't go and try to load the resource. That could load in the wrong place.
- // Kludge: Because of a bug (feature :-)) in XMLHandler.getPackageFromURI(), it doesn't use getResource(...,true) and it tries instead
- // to use uri inputstream to load the package when not found. This bypasses our special create resource and so
- // packages are not automatically created. So we need to do load on demand here instead if it is a java protocol.
- // EMF will not be fixing this. It is working as designed.
- return getResourceSet().getResource(uri, JavaXMIFactory.SCHEME.equals(uri.scheme()));
- }
-
- public Resource createResource(ResourceSet originatingResourceSet, URI uri) {
- // This is the one. It has got here because it couldn't find a resource already loaded.
- // If it is a "java:/..." protocol resource, then we want to make sure it is loaded at the BeaninfoNature context
- // instead of the lower one.
- if (JavaXMIFactory.SCHEME.equals(uri.scheme()))
- return getResourceSet().getResource(uri, true);
- else
- return null;
- }
- });
- // [71473] Restore "*.java" to be an XMIResource. If EMF Examples are loaded they overload this and load their special resource for "*.java" which we don't want.
- // If some user really wants that, they grab the resource resource set and remove our override.
- if (Resource.Factory.Registry.INSTANCE.getExtensionToFactoryMap().containsKey("java")) { //$NON-NLS-1$
- // Need to add an override to go to XMI instead.
- rset.getResourceFactoryRegistry().getExtensionToFactoryMap().put("java", new XMIResourceFactoryImpl()); //$NON-NLS-1$
- }
- return rset;
- }
- /**
- * Clean up, this means either the project is being closed, deleted, or it means that
- * the nature is being removed from the project. Either way that means to
- * terminate the VM and remove what we added to the context if the flag says clear it.
- * <p>
- * This should be called ONLY when this instance of the nature is no longer needed. It
- * will be recreated for any new uses. That is because we will be removing ourselves
- * from the list of active natures in the BeanInfoPlugin.
- * <p>
- * <b>Note:</b> This will be called from the BeanInfoCacheController. It knows when the project is
- * being closed or deleted.
- *
- * @param clearResults clear the results such that any JEM model objects have no BeanInfo
- * adapters attached to them. This allows BeanInfo to be GC'd without being hung onto.
- *
- * @param deregister Deregister from the BeanInfoPlugin. Normally this will always be true, but it
- * will be called with false when BeanInfoPlugin is calling back to shutdown.
- */
- public synchronized void cleanup(boolean clearResults, boolean deregister) {
- if (deregister)
- BeaninfoPlugin.getPlugin().removeBeanInfoNature(this);
- fSynchronizer.stopSynchronizer(clearResults);
- Init.cleanup(javaRSet, clearResults);
- if (fRegistry != null)
- fRegistry.terminateRegistry(true);
-
- projectCleaned();
- javaRSet = null;
- fRegistry = null;
- fProject = null;
- fSynchronizer = null;
- }
-
- /**
- * Returns the project to which this project nature applies.
- *
- * @return the project handle
- */
- public IProject getProject() {
- return fProject;
- }
-
- /**
- * Sets the project to which this nature applies.
- * Used when instantiating this project nature runtime.
- * This is called by <code>IProject.addNature</code>
- * and should not be called directly by clients.
- *
- * @param project the project to which this nature applies
- */
- public void setProject(IProject project) {
-// BeanInfoCacheController.INSTANCE.getClass(); // Instantiates the controller if not already started.
- fProject = project;
- BeaninfoPlugin.getPlugin().addBeanInfoNature(this);
-
- try {
- // The nature has been started for this project, need to setup the introspection process now.
- JavaEMFNature javaNature = JavaEMFNature.createRuntime(fProject);
- JavaInit.init();
- if (fReflectionKeyExtension == null) {
- // Register the reflection key extension.
- fReflectionKeyExtension = new BeaninfoJavaReflectionKeyExtension();
- JavaXMIFactory.INSTANCE.registerReflectionKeyExtension(fReflectionKeyExtension);
- }
-
- javaRSet = javaNature.getResourceSet();
- Init.initialize(javaRSet, new IBeaninfoSupplier() {
- public ProxyFactoryRegistry getRegistry() {
- return BeaninfoNature.this.getRegistry();
- }
-
- public boolean isRegistryCreated() {
- return BeaninfoNature.this.isRegistryCreated();
- }
-
- public void closeRegistry() {
- BeaninfoNature.this.closeRegistry();
- }
-
- public IProject getProject() {
- return BeaninfoNature.this.getProject();
- }
-
- public ProjectResourceSet getNewResourceSet() {
- return BeaninfoNature.this.newResourceSet();
- }
-
- public ResourceSet getProjectResourceSet() {
- return getResourceSet();
- }
- });
- fSynchronizer =
- new BeaninfoModelSynchronizer(
- (BeaninfoAdapterFactory) EcoreUtil.getAdapterFactory(javaRSet.getAdapterFactories(), IIntrospectionAdapter.ADAPTER_KEY),
- JavaCore.create(javaNature.getProject()));
- } catch (CoreException e) {
- BeaninfoPlugin.getPlugin().getLogger().log(e.getStatus());
- }
- }
-
- /**
- * Close the registry. It needs to be recycled because a class has changed
- * and now the new class needs to be accessed.
- */
- protected void closeRegistry() {
- ProxyFactoryRegistry reg = null;
- synchronized (this) {
- reg = fRegistry;
- fRegistry = null;
- try {
- // Wipe out the Session properties so that they are recomputed.
- getProject().setSessionProperty(CONFIG_INFO_SESSION_KEY, null);
- getProject().setSessionProperty(BEANINFO_CONTRIBUTORS_SESSION_KEY, null);
- } catch (CoreException e) {
- BeaninfoPlugin.getPlugin().getLogger().log(e, Level.INFO);
- }
- }
- if (reg != null) {
- reg.removeRegistryListener(registryListener);
- reg.terminateRegistry();
- }
- }
-
- private static final String PI_CLASS = "class"; //$NON-NLS-1$
-
- /**
- * Using the given configuration info, compute the BeanInfo config info needed. This sets the
- * session properties BEANINFO_CONTRIBUTORS_SESSION_KEY and CONFIG_INFO_SESSION_KEY.
- *
- * @param info
- * @throws CoreException
- *
- * @since 1.1.0
- */
- public static void computeBeanInfoConfigInfo(IConfigurationContributionInfo info) throws CoreException {
- // First time for this nature, or first time after registry reset. Need to compute the info.
- // It is possible for this to be called BEFORE the first usage of BeanInfo. The editor usually
- // brings up the editor's registry before it gets anything from BeanInfo.
- List contributorsList = new ArrayList(10);
- if (!info.getContainerIds().isEmpty()) {
- // Run through all of the visible container ids that are applicable and get BeanInfo contributors.
- Iterator containerIdItr = info.getContainerIds().values().iterator();
- while (containerIdItr.hasNext()) {
- ContainerPaths containerPaths = (ContainerPaths) containerIdItr.next();
- IConfigurationElement[] contributors = BeaninfoPlugin.getPlugin().getContainerIdContributors(containerPaths.getContainerId(), containerPaths.getVisibleContainerPaths());
- for (int i = 0; i < contributors.length; i++) {
- try {
- Object contributor = contributors[i].createExecutableExtension(PI_CLASS);
- if (contributor instanceof IBeanInfoContributor)
- contributorsList.add(contributor);
- } catch (CoreException e) {
- BeaninfoPlugin.getPlugin().getLogger().log(e, Level.WARNING);
- }
- }
- }
- }
-
- if (!info.getPluginIds().isEmpty()) {
- // Run through all of the visible plugin ids that are applicable and get BeanInfo contributors.
- Iterator pluginIdItr = info.getPluginIds().entrySet().iterator();
- while (pluginIdItr.hasNext()) {
- Map.Entry entry = (Map.Entry) pluginIdItr.next();
- if (((Boolean) entry.getValue()).booleanValue()) {
- IConfigurationElement[] contributors = BeaninfoPlugin.getPlugin().getPluginContributors(
- (String) entry.getKey());
- if (contributors != null) {
- for (int i = 0; i < contributors.length; i++) {
- try {
- Object contributor = contributors[i].createExecutableExtension(PI_CLASS);
- if (contributor instanceof IBeanInfoContributor)
- contributorsList.add(contributor);
- } catch (CoreException e) {
- BeaninfoPlugin.getPlugin().getLogger().log(e, Level.WARNING);
- }
- }
- }
- }
- }
- }
-
- // Save it for all beaninfo processing (and configuration processing if they implement proxy configuration contributor).
- IBeanInfoContributor[] explicitContributors = (IBeanInfoContributor[]) contributorsList.toArray(new IBeanInfoContributor[contributorsList.size()]);
- info.getJavaProject().getProject().setSessionProperty(BEANINFO_CONTRIBUTORS_SESSION_KEY, explicitContributors);
- // Save it for override processing. That happens over and over later after all config processing is done.
- // Do it last so that if there is a race condition, since this property is a flag to indicate we have data,
- // we need to make sure the Beaninfo data is already set at the point we set this.
- // We could actually set it twice because of this, but it is the same data, so, so what.
- info.getJavaProject().getProject().setSessionProperty(CONFIG_INFO_SESSION_KEY, info);
- }
-
- /**
- * Get registry, creating it if necessary.
- * @return the registry.
- *
- * @since 1.0.0
- */
- public ProxyFactoryRegistry getRegistry() {
- synchronized (this) {
- if (fRegistry != null)
- return fRegistry;
- }
- // Now need to start the appropriate job. In another class so that it can handle dynamically checking if
- // UI is available to even do this (it maybe not in a UI mode, so then just do it.
- CreateRegistryJobHandler.createRegistry(this);
- return fRegistry;
- }
-
- private static final long NO_PREMATURE_TERMINATE_TIME = -1;
- private int registryPrematureTerminateCount;
- private long registryLastPrematureTerminateTime = NO_PREMATURE_TERMINATE_TIME;
-
- /*
- * This is <package-protected> so that only the appropriate create job in this
- * package can call it. This is because this must be controlled to only be
- * done when build not in progress and serial access.
- */
- void createRegistry(IProgressMonitor pm) {
- pm.beginTask(BeanInfoAdapterMessages.UICreateRegistryJobHandler_StartBeaninfoRegistry, 100);
- if (isRegistryCreated()) {
- pm.done();
- return; // It had already been created. Could of been because threads were racing to do the creation, and one got there first.
- }
-
- // Test to see if we have terminated too many times within the last 10 minutes. If we have then don't try again.
- synchronized(this) {
- if (registryLastPrematureTerminateTime != NO_PREMATURE_TERMINATE_TIME) {
- long lastPrematureTerminateInterval = System.currentTimeMillis() - registryLastPrematureTerminateTime;
- // Don't try again within 1 sec of last premature terminate. It will still be bad.
- // Of if there have been more than 3 and it has been 10 mins since the last try.
- if (lastPrematureTerminateInterval < 3*1000 || (registryPrematureTerminateCount > 3 && lastPrematureTerminateInterval < 10 * 60 * 1000))
- return;
- }
- }
-
- ProxyFactoryRegistry registry = null;
- try {
- ConfigurationContributor configurationContributor = (ConfigurationContributor) getConfigurationContributor();
- configurationContributor.setNature(this);
- registry = ProxyLaunchSupport.startImplementation(fProject, "Beaninfo", //$NON-NLS-1$
- new IConfigurationContributor[] { configurationContributor}, false, new SubProgressMonitor(pm, 100));
- synchronized(this) {
- if (!isRegistryCreated()) {
- projectCleaned();
- registry.addRegistryListener(registryListener);
- fRegistry = registry;
- } else {
- // It was created while we were creating. So use the current one. Terminate the one just created. Not needed.
- registry.terminateRegistry(false);
- }
- }
- } catch (CoreException e) {
- BeaninfoPlugin.getPlugin().getLogger().log(e.getStatus());
- } finally {
- if (registry == null) {
- // It didn't create. Treat as premature terminate.
- prematureRegistryTerminate();
- }
- pm.done();
- }
- }
-
- /**
- * Called by others in package (BeaninfoCacheController) to let know a clean has occured.
- *
- * TODO this should be package-protected but until in same package as cache controller it is public.
- * @since 1.2.0
- */
- public synchronized void projectCleaned() {
- // On a clean we will reset the counters.
- registryPrematureTerminateCount = 0;
- registryLastPrematureTerminateTime = NO_PREMATURE_TERMINATE_TIME;
- }
-
- public synchronized boolean isRegistryCreated() {
- return fRegistry != null;
- }
-
- /**
- * Check to see if the nature is still valid. If the project has been
- * renamed, the nature is still around, but the project has been closed.
- * So the nature is now invalid.
- *
- * @return Is this a valid nature. I.e. is the project still open.
- */
- public boolean isValidNature() {
- return fProject != null;
- }
-
- /**
- * Set the search path onto the registry.
- */
- protected void setProxySearchPath(ProxyFactoryRegistry registry, List searchPaths) {
- if (searchPaths != null) {
- String[] stringSearchPath = (String[]) searchPaths.toArray(new String[searchPaths.size()]);
- Utilities.setBeanInfoSearchPath(registry, stringSearchPath);
- } else
- Utilities.setBeanInfoSearchPath(registry, null);
- }
-
- private static final String ENCODING = "UTF-8"; //$NON-NLS-1$
- static final String sBeaninfos = "beaninfos"; // Root element name //$NON-NLS-1$
- /**
- * Get the persistent search path. It is copy.
- */
- public BeaninfosDoc getSearchPath() {
- BeaninfosDoc bdoc = null;
- try {
- InputStream property = getSharedProperty(P_BEANINFO_SEARCH_PATH);
- if (property != null) {
- try {
- // Need to reconstruct from the XML format.
- Document doc = DocumentBuilderFactory.newInstance().newDocumentBuilder().parse(new InputSource(new InputStreamReader(property, ENCODING)));
- Element root = doc.getDocumentElement();
- if (root != null && root.getNodeName().equalsIgnoreCase(sBeaninfos)) {
- bdoc = BeaninfosDoc.readEntry(new DOMReader(), root, getProject());
- }
- } finally {
- try {
- property.close();
- } catch (IOException e) {
- }
- }
- }
- } catch (CoreException e) {
- BeaninfoPlugin.getPlugin().getLogger().log(e.getStatus());
- } catch (Exception e) {
- BeaninfoPlugin.getPlugin().getLogger().log(new Status(IStatus.WARNING, BeaninfoPlugin.PI_BEANINFO_PLUGINID, 0, "", e)); //$NON-NLS-1$
- }
- return bdoc;
- }
-
- /**
- * Set the persistent search path. No progress monitor.
- */
- public void setSearchPath(BeaninfosDoc searchPath) throws CoreException {
- setSearchPath(searchPath, null);
- }
-
- /**
- * Set the persistent search path with a progress monitor
- */
- public void setSearchPath(BeaninfosDoc searchPath, IProgressMonitor monitor) throws CoreException {
- String property = null;
- if (searchPath != null && searchPath.getSearchpath().length > 0) {
- try {
- Document doc = DocumentBuilderFactory.newInstance().newDocumentBuilder().newDocument();
- Element root = doc.createElement(sBeaninfos); // Create Root Element
- IBeaninfosDocEntry[] entries = searchPath.getSearchpath();
- for (int i = 0; i < entries.length; i++)
- root.appendChild(entries[i].writeEntry(doc, getProject())); // Add to the search path
- doc.appendChild(root); // Add Root to Document
- StringWriter strWriter = new StringWriter();
-
- Result result = new StreamResult(strWriter);
- Source source = new DOMSource(doc);
- Transformer transformer = TransformerFactory.newInstance().newTransformer();
- transformer.setOutputProperty(OutputKeys.INDENT, "yes"); //$NON-NLS-1$
- transformer.setOutputProperty(OutputKeys.METHOD, "xml"); //$NON-NLS-1$
- transformer.transform(source, result);
- property = strWriter.toString();
- } catch (TransformerConfigurationException e) {
- BeaninfoPlugin.getPlugin().getLogger().log(e, Level.WARNING);
- } catch (TransformerException e) {
- BeaninfoPlugin.getPlugin().getLogger().log(e, Level.WARNING);
- } catch (ParserConfigurationException e) {
- BeaninfoPlugin.getPlugin().getLogger().log(e, Level.WARNING);
- } catch (FactoryConfigurationError e) {
- BeaninfoPlugin.getPlugin().getLogger().log(e, Level.WARNING);
- }
- }
-
- if (property != null) {
- // If it hasn't changed, don't write it back out. This is so that if the file hasn't
- // been checked out and it is the same, we don't want to bother the user. This is because
- // we don't know if the user had simply browsed the search path or had actually changed and
- // set it back to what it was. In either of those cases it would be a bother to ask the
- // user to checkout the file.
- InputStream is = getSharedProperty(P_BEANINFO_SEARCH_PATH);
- if (is != null) {
- try {
- try {
- InputStreamReader reader = new InputStreamReader(is, ENCODING);
- char[] chars = new char[1000];
- StringBuffer oldProperty = new StringBuffer(1000);
- int read = reader.read(chars);
- while (read != -1) {
- oldProperty.append(chars, 0, read);
- read = reader.read(chars);
- }
- if (oldProperty.toString().equals(property))
- return;
- } catch (IOException e) {
- } // Didn't change.
- } finally {
- try {
- is.close();
- } catch (IOException e) {
- }
- }
- }
- setSharedProperty(P_BEANINFO_SEARCH_PATH, property, monitor);
- } else
- removeSharedProperty(P_BEANINFO_SEARCH_PATH, monitor);
- }
-
- /**
- * Return the resource set for all java packages in this nature.
- */
- public ResourceSet getResourceSet() {
- return javaRSet;
- }
-
- protected void markAllStale() {
- // Mark all stale so that the registry will be recycled.
- if (fRegistry != null) {
- // We have a registry running, we need to indicate recycle is needed.
- fSynchronizer.getAdapterFactory().markAllStale();
- // Mark all stale. Next time we need anything it will be recycled.
- }
- }
-
- /**
- * Compute the file name to use for a given shared property
- */
- protected String computeSharedPropertyFileName(QualifiedName qName) {
- return qName.getLocalName();
- }
-
- /**
- * Retrieve a shared property on a project. If the property is not defined, answers null.
- * Note that it is orthogonal to IResource persistent properties, and client code has to decide
- * which form of storage to use appropriately. Shared properties produce real resource files which
- * can be shared through a VCM onto a server. Persistent properties are not shareable.
- *
- */
- protected InputStream getSharedProperty(String propertyFileName) throws CoreException {
- IFile rscFile = getProject().getFile(propertyFileName);
- if (rscFile.exists())
- return rscFile.getContents(true);
- else
- return null;
- }
-
- /**
- * Record a shared persistent property onto a project.
- * Note that it is orthogonal to IResource persistent properties, and client code has to decide
- * which form of storage to use appropriately. Shared properties produce real resource files which
- * can be shared through a VCM onto a server. Persistent properties are not shareable.
- *
- * shared properties end up in resource files, and thus cannot be modified during
- * delta notifications (a CoreException would then be thrown).
- *
- */
- protected void setSharedProperty(String propertyName, String value, IProgressMonitor monitor) throws CoreException {
-
- try {
- IFile rscFile = getProject().getFile(propertyName);
- InputStream input = new ByteArrayInputStream(value.getBytes(ENCODING));
- // update the resource content
- if (rscFile.exists()) {
- rscFile.setContents(input, true, false, null);
- } else {
- rscFile.create(input, true, monitor);
- }
- } catch (UnsupportedEncodingException e) {
- }
- }
-
- /**
- * Remove a shared persistent property onto a project.
- * Note that it is orthogonal to IResource persistent properties, and client code has to decide
- * which form of storage to use appropriately. Shared properties produce real resource files which
- * can be shared through a VCM onto a server. Persistent properties are not shareable.
- *
- * shared properties end up in resource files, and thus cannot be modified during
- * delta notifications (a CoreException would then be thrown).
- *
- */
- protected void removeSharedProperty(String propertyName, IProgressMonitor monitor) throws CoreException {
-
- IFile rscFile = getProject().getFile(propertyName);
- rscFile.delete(true, true, monitor);
- }
-
- /**
- * Return a configuration contributor that sets up a vm to allow
- * introspection. This will make sure the appropriate paths
- * are in the classpath to allow access to the beaninfos, and
- * it will setup the beaninfo search path for this project.
- */
- public IConfigurationContributor getConfigurationContributor() {
- return new ConfigurationContributor(getSearchPath());
- }
-
- private void prematureRegistryTerminate() {
- synchronized(BeaninfoNature.this) {
- registryPrematureTerminateCount++;
- registryLastPrematureTerminateTime = System.currentTimeMillis();
- }
- }
-
- private static class ConfigurationContributor extends ConfigurationContributorAdapter {
-
- private BeaninfosDoc doc;
- List computedSearchPath;
-
- // The nature. If the nature is not set then this contributor is one
- // used by some other later proxy registry to get the beaninfo classes into their paths. In that case
- // we can expect the config info to be in the session variable for our use. Otherwise we will need to
- // add it here. Also don't set searchpath stuff if not nature because only the beaninfo one will do introspection.
- private BeaninfoNature nature;
-
- private IConfigurationContributionInfo info;
- private IBeanInfoContributor[] explicitContributors;
-
- public ConfigurationContributor(BeaninfosDoc doc) {
- this.doc = doc;
- }
-
- /*
- * Set that this is the nature contributor. Not null, means that this is the contributor being
- * used to setup the registry for the project's beaninfo nature. null (default) means that this
- * is one created to add to some editor's registry.
- *
- * Note: This MUST be set before initialize is called or it will not work correctly. If not set, it
- * will be considered not for BeanInfo nature directly.
- */
- public void setNature(BeaninfoNature nature) {
- this.nature = nature;
- if (nature != null)
- computedSearchPath = new ArrayList(3); // We will be gathering this info.
- }
-
- /* (non-Javadoc)
- * @see org.eclipse.jem.internal.proxy.core.IConfigurationContributor#initialize(org.eclipse.jem.internal.proxy.core.IConfigurationContributionInfo)
- */
- public void initialize(IConfigurationContributionInfo info) {
- this.info = info;
- try {
- if (info.getJavaProject().getProject().getSessionProperty(CONFIG_INFO_SESSION_KEY) == null) {
- // TODO For now we will rebuild for each time we open a registry, but it actually is only needed if a classpath
- // changes for some reason. At that point we can get it out of here.
-
- computeBeanInfoConfigInfo(info);
- }
- explicitContributors = (IBeanInfoContributor[]) info.getJavaProject().getProject().getSessionProperty(BEANINFO_CONTRIBUTORS_SESSION_KEY);
- } catch (CoreException e) {
- BeaninfoPlugin.getPlugin().getLogger().log(e);
- }
- }
-
- public void contributeClasspaths(final IConfigurationContributionController controller) throws CoreException {
- // Contribute for this project
- contributeClasspathsForProject(controller, info.getJavaProject().getProject(), doc, true);
-
- if (!info.getProjectPaths().isEmpty()) {
- // Run through all of the visible projects and contribute the classpaths (which come from the BeanInfo docs, if they have any).
- IWorkspaceRoot root = info.getJavaProject().getProject().getWorkspace().getRoot();
- Iterator projIter = info.getProjectPaths().entrySet().iterator();
- while (projIter.hasNext()) {
- Map.Entry entry = (Map.Entry) projIter.next();
- if (((Boolean) entry.getValue()).booleanValue()) {
- IResource res = root.findMember((IPath) entry.getKey());
- if (res instanceof IProject && ((IProject) res).isOpen() && BeaninfoNature.hasRuntime((IProject) res))
- contributeClasspathsForProject(controller, (IProject) res, BeaninfoNature.getRuntime((IProject) res)
- .getSearchPath(), false);
- }
- }
- }
-
- if (!info.getContainerIds().isEmpty()) {
- // Run through all of the visible container ids that are applicable.
- Iterator containerIdItr = info.getContainerIds().values().iterator();
- while (containerIdItr.hasNext()) {
- ContainerPaths containerPaths = (ContainerPaths) containerIdItr.next();
- processBeaninfoEntries(BeaninfoPlugin.getPlugin().getContainerIdBeanInfos(containerPaths.getContainerId(), containerPaths.getVisibleContainerPaths()),
- controller, info.getJavaProject());
- }
-
- }
-
- if (!info.getPluginIds().isEmpty()) {
- // Run through all of the visible plugin ids that are applicable.
- Iterator pluginIdItr = info.getPluginIds().entrySet().iterator();
- while (pluginIdItr.hasNext()) {
- Map.Entry entry = (Map.Entry) pluginIdItr.next();
- if (((Boolean) entry.getValue()).booleanValue()) {
- processBeaninfoEntries(BeaninfoPlugin.getPlugin().getPluginBeanInfos((String) entry.getKey()), controller, info.getJavaProject());
- }
- }
-
- }
-
- if (!info.getContainers().isEmpty()) {
- // Run through all of the visible containers that implement IBeanInfoContributor and ask them for the contributions.
- Iterator containerItr = info.getContainers().entrySet().iterator();
- while (containerItr.hasNext()) {
- Map.Entry entry = (Map.Entry) containerItr.next();
- if (((Boolean) entry.getValue()).booleanValue()) {
- if (entry.getKey() instanceof IBeanInfoContributor)
- processBeaninfoEntries(((IBeanInfoContributor) entry.getKey()).getBeanInfoEntryContributions(info),
- controller, info.getJavaProject());
- }
- }
-
- }
-
- // And finally run through the explicit contributors.
- for (int i = 0; i < explicitContributors.length; i++) {
- final IBeanInfoContributor contributor = explicitContributors[i];
- processBeaninfoEntries(contributor.getBeanInfoEntryContributions(info), controller, info.getJavaProject());
- if (contributor instanceof IConfigurationContributor) {
- SafeRunner.run(new ISafeRunnable() {
- public void handleException(Throwable exception) {
- // do nothing. by default platform logs.
- }
-
- public void run() throws Exception {;
- if (contributor instanceof IConfigurationContributor)
- ((IConfigurationContributor) contributor).contributeClasspaths(controller);
- }
- });
- }
- }
-
- // Add the common to the end of the classpath. (Since we are now a jarred plugin, the common is not the plugin jar itself).
- // With bug 256441 we've reverted to putting only the "common.jar" on the classpath, though now it is its own bundle. See
- // https://bugs.eclipse.org/bugs/show_bug.cgi?id=256441
- Bundle commonBundle = Platform.getBundle("org.eclipse.jem.beaninfo.vm.common");
- controller.contributeClasspath(commonBundle, (IPath) null, IConfigurationContributionController.APPEND_USER_CLASSPATH, false); //$NON-NLS-1$
-
- // Add the beaninfovm.jar and any nls to the end of the classpath.
- // https://bugs.eclipse.org/bugs/show_bug.cgi?id=256441
- Bundle vmBundle = Platform.getBundle("org.eclipse.jem.beaninfo.vm");
- controller.contributeClasspath(vmBundle, (IPath) null, IConfigurationContributionController.APPEND_USER_CLASSPATH, true); //$NON-NLS-1$
- }
-
- private IClasspathEntry get(IClasspathEntry[] array, SearchpathEntry se) {
- for (int i = 0; i < array.length; i++) {
- if (array[i].getEntryKind() == se.getKind() && array[i].getPath().equals(se.getPath()))
- return array[i];
- }
- return null;
- }
-
- private static final IBeaninfosDocEntry[] EMPTY_ENTRIES = new IBeaninfosDocEntry[0];
-
- /*
- * Contribute classpaths for the specified project. If doc is passed in, then this is the top level and
- * all should be added. If no doc, then this is pre-req'd project, and then we will handle exported entries only.
- */
- protected void contributeClasspathsForProject(
- IConfigurationContributionController controller,
- IProject project,
- BeaninfosDoc doc,
- boolean toplevelProject)
- throws CoreException {
-
- IJavaProject jProject = JavaCore.create(project);
- IClasspathEntry[] rawPath = jProject.getRawClasspath();
-
- // Search path of this project
- IBeaninfosDocEntry[] entries = (doc != null) ? doc.getSearchpath() : EMPTY_ENTRIES;
-
- for (int i = 0; i < entries.length; i++) {
- IBeaninfosDocEntry entry = entries[i];
- if (entry instanceof BeaninfoEntry) {
- BeaninfoEntry be = (BeaninfoEntry) entry;
- if (toplevelProject || be.isExported()) {
- // First project or this is an exported beaninfo, so we process it.
- processBeaninfoEntry(be, controller, jProject);
- }
- } else if (nature != null){
- // Just a search path entry. There is no beaninfo jar to pick up.
- // We have a nature, so we process search path.
- SearchpathEntry se = (SearchpathEntry) entry;
- if (!toplevelProject) {
- // We are in a nested project, find the raw classpath entry to see
- // if this entry is exported. Only do it if exported. (Note: exported is only used on non-source. Source are always exported).
- IClasspathEntry cpe = get(rawPath, se);
- if (cpe == null || (cpe.getEntryKind() != IClasspathEntry.CPE_SOURCE && !cpe.isExported())) {
- continue; // Not exist or not exported, so we don't want it here either.
- }
- }
-
- String pkg = se.getPackage();
- if (pkg != null) {
- // Explicit search path
- if (!computedSearchPath.contains(pkg))
- computedSearchPath.add(pkg);
- } else {
- // We no longer allow this, but just to be on safe side we test for it.
- }
- }
- }
- }
-
- protected void processBeaninfoEntries(
- BeaninfoEntry[] entries,
- IConfigurationContributionController controller,
- IJavaProject javaProject)
- throws CoreException {
- if (entries != null) {
- for (int i = 0; i < entries.length; i++)
- processBeaninfoEntry(entries[i], controller, javaProject);
- }
- }
-
- protected void processBeaninfoEntry(
- BeaninfoEntry entry,
- IConfigurationContributionController controller,
- IJavaProject javaProject)
- throws CoreException {
- Object[] cps = entry.getClasspath(javaProject);
- for (int j = 0; j < cps.length; j++) {
- Object cp = cps[j];
- if (cp instanceof IProject)
- controller.contributeProject((IProject) cp);
- else if (cp instanceof String)
- controller.contributeClasspath(ProxyLaunchSupport.convertStringPathToURL((String) cp), IConfigurationContributionController.APPEND_USER_CLASSPATH);
- else if (cp instanceof IPath) {
- IPath path = (IPath) cp;
- Bundle bundle = Platform.getBundle(path.segment(0));
- if (bundle != null)
- controller.contributeClasspath(bundle, path.removeFirstSegments(1), IConfigurationContributionController.APPEND_USER_CLASSPATH, true);
- }
- }
-
- if (nature != null) {
- // Now add in the package names.
- SearchpathEntry[] sees = entry.getSearchPaths();
- for (int j = 0; j < sees.length; j++) {
- SearchpathEntry searchpathEntry = sees[j];
- if (!computedSearchPath.contains(searchpathEntry.getPackage()))
- computedSearchPath.add(searchpathEntry.getPackage());
- }
- }
- }
-
- public void contributeToConfiguration(final ILaunchConfigurationWorkingCopy config) {
- for (int i = 0; i < explicitContributors.length; i++) {
- final int ii = i;
- SafeRunner.run(new ISafeRunnable() {
- public void handleException(Throwable exception) {
- // do nothing. by default platform logs.
- }
-
- public void run() throws Exception {
- IBeanInfoContributor contributor = explicitContributors[ii];
- if (contributor instanceof IConfigurationContributor)
- ((IConfigurationContributor) contributor).contributeToConfiguration(config);
- }
- });
- }
- }
-
- public void contributeToRegistry(final ProxyFactoryRegistry registry) {
- if (nature != null)
- nature.setProxySearchPath(registry, computedSearchPath);
- for (int i = 0; i < explicitContributors.length; i++) {
- final int ii = i;
- SafeRunner.run(new ISafeRunnable() {
- public void handleException(Throwable exception) {
- // do nothing. by default platform logs.
- }
-
- public void run() throws Exception {
- IBeanInfoContributor contributor = explicitContributors[ii];
- if (contributor instanceof IConfigurationContributor)
- ((IConfigurationContributor) contributor).contributeToRegistry(registry);
- }
- });
- }
- }
- }
-
-
-}
diff --git a/plugins/org.eclipse.jem.beaninfo/beaninfo/org/eclipse/jem/internal/beaninfo/adapters/BeaninfoProxyConstants.java b/plugins/org.eclipse.jem.beaninfo/beaninfo/org/eclipse/jem/internal/beaninfo/adapters/BeaninfoProxyConstants.java
deleted file mode 100644
index a9a0b81..0000000
--- a/plugins/org.eclipse.jem.beaninfo/beaninfo/org/eclipse/jem/internal/beaninfo/adapters/BeaninfoProxyConstants.java
+++ /dev/null
@@ -1,107 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2001, 2005 IBM Corporation and others.
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
- *
- * Contributors:
- * IBM Corporation - initial API and implementation
- *******************************************************************************/
-/*
-
-
- */
-package org.eclipse.jem.internal.beaninfo.adapters;
-
-import org.eclipse.jem.internal.proxy.core.*;
-
-
-/**
- * This holds the proxy constants for access in beaninfo. It is created on a per-registry basis and stored in the constants section of the registry so
- * that they can be accessed as needed.
- * <p>
- * To gain access to these constants, use the static accessor method "getConstants()" so that the instance is not created until actually needed.
- *
- * @since 1.0.0
- */
-public final class BeaninfoProxyConstants {
-
- private static final Object REGISTRY_KEY = new Object();
-
- private final IMethodProxy introspectProxy;
-
- private final IMethodProxy getBeanInfoSearchPathProxy;
-
- private final IMethodProxy setBeanInfoSearchPathProxy;
-
- private final IMethodProxy sendBeanInfoProxy;
-
- /**
- * Get the constants instance for the specified registry.
- */
- public static BeaninfoProxyConstants getConstants(ProxyFactoryRegistry registry) {
- if (registry != null && registry.isValid()) {
- BeaninfoProxyConstants constants = (BeaninfoProxyConstants) registry.getConstants(REGISTRY_KEY);
- if (constants == null)
- registry.registerConstants(REGISTRY_KEY, constants = new BeaninfoProxyConstants(registry));
- return constants;
- } else
- return null;
- }
-
- private BeaninfoProxyConstants(ProxyFactoryRegistry registry) {
-
- IStandardBeanTypeProxyFactory typeFactory = registry.getBeanTypeProxyFactory();
-
- IBeanTypeProxy introspector = typeFactory.getBeanTypeProxy("java.beans.Introspector"); //$NON-NLS-1$
- getBeanInfoSearchPathProxy = introspector.getMethodProxy("getBeanInfoSearchPath"); //$NON-NLS-1$
- setBeanInfoSearchPathProxy = introspector.getMethodProxy("setBeanInfoSearchPath", "[Ljava.lang.String;"); //$NON-NLS-1$ //$NON-NLS-2$
-
- IBeanTypeProxy modelingBeaninfo = typeFactory.getBeanTypeProxy("org.eclipse.jem.internal.beaninfo.vm.ModelingBeanInfo");//$NON-NLS-1$
- introspectProxy = modelingBeaninfo.getMethodProxy("introspect", new String[] { "java.lang.Class", "boolean", "int"}); //$NON-NLS-1$ //$NON-NLS-2$ //$NON-NLS-3$ //$NON-NLS-4$
-
- sendBeanInfoProxy = modelingBeaninfo.getMethodProxy("send"); //$NON-NLS-1$
-
- }
-
- /**
- * Get the sendBeanDecorator method proxy from ModelingBeanInfo.
- * @return
- *
- * @since 1.1.0
- */
- public IMethodProxy getSendBeanInfoProxy() {
- return sendBeanInfoProxy;
- }
-
- /**
- * Get the getBeanInfoSearchPath method proxy from Introspector.
- * @return
- *
- * @since 1.0.0
- */
- public IMethodProxy getGetBeanInfoSearchPathProxy() {
- return getBeanInfoSearchPathProxy;
- }
-
- /**
- * Get the setBeanInfoSearchPath method proxy from Introspector.
- * @return
- *
- * @since 1.0.0
- */
- public IMethodProxy getSetBeanInfoSearchPathProxy() {
- return setBeanInfoSearchPathProxy;
- }
-
- /**
- * Get the introspect method proxy from ModelingBeanInfo.
- * @return
- *
- * @since 1.1.0
- */
- public IMethodProxy getIntrospectProxy() {
- return introspectProxy;
- }
-}
diff --git a/plugins/org.eclipse.jem.beaninfo/beaninfo/org/eclipse/jem/internal/beaninfo/adapters/BeaninfoSuperAdapter.java b/plugins/org.eclipse.jem.beaninfo/beaninfo/org/eclipse/jem/internal/beaninfo/adapters/BeaninfoSuperAdapter.java
deleted file mode 100644
index 0d0493b..0000000
--- a/plugins/org.eclipse.jem.beaninfo/beaninfo/org/eclipse/jem/internal/beaninfo/adapters/BeaninfoSuperAdapter.java
+++ /dev/null
@@ -1,118 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2001, 2005 IBM Corporation and others.
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
- *
- * Contributors:
- * IBM Corporation - initial API and implementation
- *******************************************************************************/
-package org.eclipse.jem.internal.beaninfo.adapters;
-/*
-
-
- */
-
-import java.util.Collection;
-import java.util.Iterator;
-
-import org.eclipse.emf.common.notify.Notification;
-import org.eclipse.emf.common.notify.Notifier;
-import org.eclipse.emf.common.notify.impl.AdapterImpl;
-import org.eclipse.emf.ecore.impl.ESuperAdapter;
-import org.eclipse.emf.ecore.util.EcoreUtil;
-
-import org.eclipse.jem.java.JavaClass;
-import org.eclipse.jem.java.JavaRefPackage;
-import org.eclipse.jem.java.internal.impl.JavaClassImpl;
-
-/**
- * Used to know when events or any of the super classes change so
- * that we can re-construct our all events list next time we need it.
- * @version 1.0
- * @author
- */
-public class BeaninfoSuperAdapter extends AdapterImpl {
-
- public static final Class ADAPTER_KEY = BeaninfoSuperAdapter.class;
-
- private boolean allEventsCollectionModified = true;
- private boolean allPropertiesCollectionModified = true;
- private boolean allOperationsCollectionModified = true;
-
- public BeaninfoSuperAdapter() {
- super();
- }
-
- public void notifyChanged(Notification msg) {
- if (msg.getEventType() != Notification.REMOVING_ADAPTER)
- setFlags(msg.getFeatureID(JavaClass.class));
- }
-
- public boolean isAllEventsCollectionModified() {
- return allEventsCollectionModified;
- }
-
- public void setAllEventsCollectionModified(boolean newEventsModified) {
- allEventsCollectionModified = newEventsModified;
- }
-
- public boolean isAllOperationsCollectionModified() {
- return allOperationsCollectionModified;
- }
-
- public void setAllOperationsCollectionModified(boolean newOperationsModified) {
- allOperationsCollectionModified = newOperationsModified;
- }
-
- public void setAllPropertiesCollectionModified(boolean allPropertiesCollectionModified) {
- this.allPropertiesCollectionModified = allPropertiesCollectionModified;
- }
-
- public boolean isAllPropertiesCollectionModified() {
- return allPropertiesCollectionModified;
- }
-
- public Collection getSubclasses() {
- // Get them from the ESuperAdapter. Easiest to do.
- ESuperAdapter ea = ((JavaClassImpl) getTarget()).getESuperAdapter();
- return ea.getSubclasses();
- }
-
- public boolean isAdapterForType(Object type) {
- return ADAPTER_KEY.equals(type);
- }
-
- void setFlags(int featureId) {
- switch (featureId) {
- case JavaRefPackage.JAVA_CLASS__EVENTS :
- setAllEventsCollectionModified(true);
- break;
-
- case JavaRefPackage.JAVA_CLASS__EOPERATIONS:
- setAllOperationsCollectionModified(true);
- break;
-
- case JavaRefPackage.JAVA_CLASS__ESUPER_TYPES:
- setAllEventsCollectionModified(true);
- setAllPropertiesCollectionModified(true);
- break;
-
- case JavaRefPackage.JAVA_CLASS__ESTRUCTURAL_FEATURES:
- setAllPropertiesCollectionModified(true);
- break;
-
- default :
- break;
- }
- Iterator i = getSubclasses().iterator();
- while (i.hasNext()) {
- Notifier n = (Notifier) i.next();
- BeaninfoSuperAdapter a = (BeaninfoSuperAdapter) EcoreUtil.getExistingAdapter(n, ADAPTER_KEY);
- if (a != null)
- a.setFlags(featureId);
- }
- }
-
-}
diff --git a/plugins/org.eclipse.jem.beaninfo/beaninfo/org/eclipse/jem/internal/beaninfo/adapters/CreateRegistryJobHandler.java b/plugins/org.eclipse.jem.beaninfo/beaninfo/org/eclipse/jem/internal/beaninfo/adapters/CreateRegistryJobHandler.java
deleted file mode 100644
index e7a5c58..0000000
--- a/plugins/org.eclipse.jem.beaninfo/beaninfo/org/eclipse/jem/internal/beaninfo/adapters/CreateRegistryJobHandler.java
+++ /dev/null
@@ -1,165 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2004, 2005 IBM Corporation and others.
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
- *
- * Contributors:
- * IBM Corporation - initial API and implementation
- *******************************************************************************/
-/*
-
-
- */
-package org.eclipse.jem.internal.beaninfo.adapters;
-
-import java.util.logging.Level;
-
-import org.eclipse.core.resources.ResourcesPlugin;
-import org.eclipse.core.runtime.*;
-import org.eclipse.core.runtime.jobs.*;
-
-import org.eclipse.jem.internal.beaninfo.core.BeaninfoPlugin;
-import org.eclipse.jem.util.logger.proxy.Logger;
-
-
-
-/**
- * This class is used by BeaninfoNature to handle the creation of the registry,
- * This class will be a singleton. It is needed to handle if UI active without
- * requiring UI plugin. (So headless will work too). The subclass <code>UICreateRegistryJobHandler</code>
- * will be instantiated in case of UI active.
- * @since 1.0.0
- */
-class CreateRegistryJobHandler {
- private static CreateRegistryJobHandler jobHandler = null;
-
- public static void createRegistry(BeaninfoNature nature) {
- synchronized (CreateRegistryJobHandler.class) {
- if (jobHandler == null) {
- if (Platform.getBundle("org.eclipse.ui") != null) { //$NON-NLS-1$
- try {
- // There is a UI, it may not be active, but bring in UICreateRegistryJobHandler to do the
- // actual work since it can reference the UI.
- jobHandler = (CreateRegistryJobHandler) Class.forName("org.eclipse.jem.internal.beaninfo.adapters.UICreateRegistryJobHandler").newInstance(); //$NON-NLS-1$
- } catch (InstantiationException e) {
- jobHandler = new CreateRegistryJobHandler();
- } catch (IllegalAccessException e) {
- jobHandler = new CreateRegistryJobHandler();
- } catch (ClassNotFoundException e) {
- jobHandler = new CreateRegistryJobHandler();
- }
- }
- }
- }
-
- // See if Autobuild sleeping or waiting. This could be a race condition for us. We can't wait for it
- // because we may already have the build rule locked by our thread. No way of testing this if beginRule was used.
- // We can test if we are a build job (not an inline build), and if so, just go on.
- // Maybe we can figure out in future if we find race condition happens significant amount of time.
- IJobManager jobManager = Job.getJobManager();
- Job currentJob = jobManager.currentJob();
- if (currentJob == null || (!currentJob.belongsTo(ResourcesPlugin.FAMILY_AUTO_BUILD) && !currentJob.belongsTo(ResourcesPlugin.FAMILY_MANUAL_BUILD))) {
- // See if autojob is waiting or sleeping.
- // Give it up to a second at .2 second intervals to try (i.e. 5 tries)
- int tries = 5;
- while (isAutoWaiting() && --tries>0) {
- try {
- Thread.sleep(200); // Wait just .2 seconds to give build a chance to start. If it is still not started, then just go on.
- } catch (InterruptedException e) {
- }
- }
- if (tries==0) {
- Logger logger = BeaninfoPlugin.getPlugin().getLogger();
- if (logger.isLoggingLevel(Level.WARNING))
- logger.log("Build job waiting when trying to start beaninfo registry. Possible race.", Level.WARNING); // $NON-NLS-1$ //$NON-NLS-1$
- }
- }
-
- jobHandler.processCreateRegistry(nature);
- }
-
- private static boolean isAutoWaiting() {
- Job[] autojobs = Job.getJobManager().find(ResourcesPlugin.FAMILY_AUTO_BUILD);
- for (int i = 0; i < autojobs.length; i++) {
- int state = autojobs[i].getState();
- if (state == Job.WAITING || state == Job.SLEEPING)
- return true;
- }
- return false;
- }
-
-
- /**
- * Process the create of the registry. This should be overridden to
- * do what the UI needs. The UI implimentation should call doCreateRegistry at the
- * appropriate time.
- *
- * @param nature
- *
- * @since 1.0.0
- */
- protected void processCreateRegistry(final BeaninfoNature nature) {
- IJobManager jobManager = Job.getJobManager();
- ISchedulingRule buildRule = ResourcesPlugin.getWorkspace().getRuleFactory().buildRule();
- boolean gotRuleLocally = true;
- try {
- try {
- jobManager.beginRule(buildRule, new NullProgressMonitor());
- } catch (IllegalArgumentException e) {
- gotRuleLocally = false; // This thread already had a rule, and it conflicted with the build rule, so we need to spawn off.
- }
- if (gotRuleLocally)
- doCreateRegistry(nature, new NullProgressMonitor());
- } finally {
- jobManager.endRule(buildRule); // Whether we got the rule or not, we must do endrule.
- }
-
- if (!gotRuleLocally) {
- // Spawn off to a job and wait for it. Hopefully we don't have a deadlock somewhere.
- Job doCreateJob = new Job(BeanInfoAdapterMessages.UICreateRegistryJobHandler_StartBeaninfoRegistry) {
-
- protected IStatus run(IProgressMonitor monitor) {
- doCreateRegistry(nature, monitor);
- return Status.OK_STATUS;
- }
- };
- doCreateJob.schedule();
- while (true) {
- try {
- doCreateJob.join();
- break;
- } catch (InterruptedException e) {
- }
- }
- }
- }
-
- /*
- * Do the creation. It is expected that the build rule has already been given to this thread.
- * It is important that the build rule be given to this thread. This is so that a build won't
- * start trying to create the same registry (which has happened in the past) at the same time
- * a different thread was trying to start the registry. You would either have a deadlock, or
- * a race and get two different registries started.
- *
- * The build rule also means that all beaninfo registry creations will be serialized and have
- * a race condition. The unfortunate part is that two independent project's registries can't be
- * created at same time. But that is the result of the build rule. We can't allow the builds, so
- * we need to stop all parallel beaninfo registry creations.
- *
- * @param nature
- * @param pm
- *
- * @since 1.0.0
- */
- protected final void doCreateRegistry(BeaninfoNature nature, IProgressMonitor pm) {
- pm.beginTask("", 100); //$NON-NLS-1$
- try {
- nature.createRegistry(new SubProgressMonitor(pm, 100));
- } finally {
- pm.done();
- }
- }
-
-}
diff --git a/plugins/org.eclipse.jem.beaninfo/beaninfo/org/eclipse/jem/internal/beaninfo/adapters/DOMReader.java b/plugins/org.eclipse.jem.beaninfo/beaninfo/org/eclipse/jem/internal/beaninfo/adapters/DOMReader.java
deleted file mode 100644
index aa813c9..0000000
--- a/plugins/org.eclipse.jem.beaninfo/beaninfo/org/eclipse/jem/internal/beaninfo/adapters/DOMReader.java
+++ /dev/null
@@ -1,73 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2001, 2005 IBM Corporation and others.
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
- *
- * Contributors:
- * IBM Corporation - initial API and implementation
- *******************************************************************************/
-package org.eclipse.jem.internal.beaninfo.adapters;
-/*
-
-
- */
-
-import org.w3c.dom.Element;
-import org.w3c.dom.Node;
-import org.w3c.dom.NodeList;
-
-
-
-/**
- * The internal class for reading dom elements.
- * @version 1.0
- * @author
- */
-class DOMReader implements IReader {
-
- /*
- * @see IReader#getChildren(Object)
- */
- public Object getChildren(Object node) {
- return (node instanceof Node) ? ((Node) node).getChildNodes() : null;
- }
-
-
- /*
- * @see IReader#getLength(Object)
- */
- public int getLength(Object nodeList) {
- return (nodeList instanceof NodeList) ? ((NodeList) nodeList).getLength() : 0;
- }
-
- /*
- * @see IReader#getItem(Object, int)
- */
- public Object getItem(Object nodeList, int index) {
- return (nodeList instanceof NodeList) ? ((NodeList) nodeList).item(index) : null;
- }
-
- /*
- * @see IReader#isNodeTypeElement(Object)
- */
- public boolean isNodeTypeElement(Object node) {
- return (node instanceof Node) ? ((Node) node).getNodeType() == Node.ELEMENT_NODE : false;
- }
-
- /*
- * @see IReader#getNodeName(Object)
- */
- public String getNodeName(Object node) {
- return (node instanceof Node) ? ((Node) node).getNodeName() : ""; //$NON-NLS-1$
- }
-
- /*
- * @see IReader#getAttribute(Object, String)
- */
- public String getAttribute(Object element, String attributeName) {
- return (element instanceof Element) && ((Element) element).hasAttribute(attributeName) ? ((Element) element).getAttribute(attributeName) : null;
- }
-
-}
diff --git a/plugins/org.eclipse.jem.beaninfo/beaninfo/org/eclipse/jem/internal/beaninfo/adapters/IReader.java b/plugins/org.eclipse.jem.beaninfo/beaninfo/org/eclipse/jem/internal/beaninfo/adapters/IReader.java
deleted file mode 100644
index d638320..0000000
--- a/plugins/org.eclipse.jem.beaninfo/beaninfo/org/eclipse/jem/internal/beaninfo/adapters/IReader.java
+++ /dev/null
@@ -1,32 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2001, 2005 IBM Corporation and others.
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
- *
- * Contributors:
- * IBM Corporation - initial API and implementation
- *******************************************************************************/
-package org.eclipse.jem.internal.beaninfo.adapters;
-/*
-
-
- */
-/**
- * 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
- * TODO Need to move to core when we make things API.
- */
-public interface IReader {
-
- public Object getChildren(Object node);
- public int getLength(Object nodeList);
- public Object getItem(Object nodeList, int index);
- public boolean isNodeTypeElement(Object node); // Is this an element type node
- public String getNodeName(Object node);
- public String getAttribute(Object element, String attributeName);
-
-}
diff --git a/plugins/org.eclipse.jem.beaninfo/beaninfo/org/eclipse/jem/internal/beaninfo/adapters/SpecialResourceSet.java b/plugins/org.eclipse.jem.beaninfo/beaninfo/org/eclipse/jem/internal/beaninfo/adapters/SpecialResourceSet.java
deleted file mode 100644
index e00ef52..0000000
--- a/plugins/org.eclipse.jem.beaninfo/beaninfo/org/eclipse/jem/internal/beaninfo/adapters/SpecialResourceSet.java
+++ /dev/null
@@ -1,44 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2001, 2005 IBM Corporation and others.
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
- *
- * Contributors:
- * IBM Corporation - initial API and implementation
- *******************************************************************************/
-package org.eclipse.jem.internal.beaninfo.adapters;
-/*
-
-
- */
-
-import org.eclipse.jem.internal.util.emf.workbench.ProjectResourceSetImpl;
-import org.eclipse.jem.util.plugin.JEMUtilPlugin;
-
-
-/**
- * A Special resource set that is used to link together to the beaninfo
- * nature's resource set and makes sure that any request for a new "java:/..."
- * JavaClass is redirected to the beaninfo nature's resource set. Otherwise
- * the classes will be all over the place and not all gathered in one place.
- *
- * *package* protected because no one should create one of these. They are
- * returned by the BeaninfoNature.newResourceSet() request.
- *
- * @version 1.0
- * @author
- */
-class SpecialResourceSet extends ProjectResourceSetImpl {
-
- /**
- * Constructor for SpecialResourceSet.
- * @param aProject
- */
- public SpecialResourceSet() {
- super(null);
- JEMUtilPlugin.getSharedCache().stopListening(this); // We don't care about listening.
- }
-
-}
diff --git a/plugins/org.eclipse.jem.beaninfo/beaninfo/org/eclipse/jem/internal/beaninfo/adapters/UICreateRegistryJobHandler.java b/plugins/org.eclipse.jem.beaninfo/beaninfo/org/eclipse/jem/internal/beaninfo/adapters/UICreateRegistryJobHandler.java
deleted file mode 100644
index b41226f..0000000
--- a/plugins/org.eclipse.jem.beaninfo/beaninfo/org/eclipse/jem/internal/beaninfo/adapters/UICreateRegistryJobHandler.java
+++ /dev/null
@@ -1,106 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2004, 2006 IBM Corporation and others.
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
- *
- * Contributors:
- * IBM Corporation - initial API and implementation
- *******************************************************************************/
-/*
-
-
- */
-package org.eclipse.jem.internal.beaninfo.adapters;
-
-import java.lang.reflect.InvocationTargetException;
-import java.util.logging.Level;
-
-import org.eclipse.core.resources.ResourcesPlugin;
-import org.eclipse.core.runtime.*;
-import org.eclipse.core.runtime.jobs.*;
-import org.eclipse.jface.operation.IRunnableWithProgress;
-import org.eclipse.swt.custom.BusyIndicator;
-import org.eclipse.swt.widgets.Display;
-import org.eclipse.ui.PlatformUI;
-import org.eclipse.ui.progress.IProgressService;
-
-import org.eclipse.jem.internal.beaninfo.core.BeaninfoPlugin;
-
-/**
- * This is the version which can actually reference and use the UI classes. It won't be loaded except if ui plugin is available.
- *
- * It will check to see if UI is running, and if it is not, then let super class handle. If it is running, then if this is the UI thread, do special
- * but run in ui, else if not then let super handle it normally.
- *
- * @since 1.0.0
- */
-class UICreateRegistryJobHandler extends CreateRegistryJobHandler {
-
- /*
- * (non-Javadoc)
- *
- * @see org.eclipse.jem.internal.beaninfo.adapters.CreateRegistryJobHandler#processCreateRegistry(org.eclipse.jem.internal.beaninfo.adapters.BeaninfoNature)
- */
- protected void processCreateRegistry(final BeaninfoNature nature) {
- if (PlatformUI.isWorkbenchRunning()) {
- if (Display.getCurrent() == null)
- super.processCreateRegistry(nature); // We are not in the UI thread. Do normal.
- else {
- IProgressService ps = PlatformUI.getWorkbench().getProgressService();
- final ISchedulingRule buildRule = ResourcesPlugin.getWorkspace().getRuleFactory().buildRule();
- // First find out if we already have the build rule. If we do, we MUST run in the UI thread. Have no option, can't transfer the
- // rule to the thread and then back to us when done.
- // This means a busy cursor instead of a possible progress dialog to keep the UI active. Only possible deadlock
- // situation is if some other thread has the build rule (other than the build) and is doing an asyncExec or
- // is waiting on something from the UI thread.
- final IJobManager jobManager = Job.getJobManager();
- Job currentJob = jobManager.currentJob();
- if (currentJob == null || currentJob.getRule() == null || !currentJob.getRule().contains(buildRule)) {
- // UI is not in a job, or it is and there is no rule, or there is a rule and it is not compatible with the buildRule.
- // In that case we need to run in another thread. That is so that we can put up a progress dialog if it takes
- // too long.
- // If no rule then we can't run in UI because some other job may have the rule, and there is no way to test
- // for this. So we don't want to block the UI entirely waiting for the rule, so we can use progress dialog
- // for this. Also if we have a rule and it conflicts with build rule then we should also go to another thread.
- // busyCursorWhile will do this. It will run the create in another thread but keep the UI responsive with
- // progress dialog after a "long operation" timeout.
- try {
- ps.busyCursorWhile(new IRunnableWithProgress() {
-
- public void run(IProgressMonitor monitor) throws InvocationTargetException, InterruptedException {
- monitor.beginTask("", 200); //$NON-NLS-1$
- try {
- jobManager.beginRule(buildRule, new SubProgressMonitor(monitor, 100));
- doCreateRegistry(nature, new SubProgressMonitor(monitor, 100));
- } finally {
- jobManager.endRule(buildRule);
- monitor.done();
- }
- }
- });
- } catch (InterruptedException e1) {
- } catch (InvocationTargetException e2) {
- BeaninfoPlugin.getPlugin().getLogger().log(e2.getCause(), Level.WARNING);
- }
- } else {
- // We are a job in the UI and we have or can contain the build rule. Therefor we must run in the UI thread itself. Otherwise
- // there will be a deadlock because we have the build rule and the other thread won't be able to get it.
- // Note: There is ProgressService.runInUI() but that guy is complicated with some interactions I'm not sure about. Safer to do this.
- BusyIndicator.showWhile(Display.getCurrent(), new Runnable() {
- public void run() {
- try {
- jobManager.beginRule(buildRule, new NullProgressMonitor());
- doCreateRegistry(nature, new NullProgressMonitor());
- } finally {
- jobManager.endRule(buildRule);
- }
- }
- });
- }
- }
- } else
- super.processCreateRegistry(nature); // Workbench not running, do default.
- }
-}
diff --git a/plugins/org.eclipse.jem.beaninfo/beaninfo/org/eclipse/jem/internal/beaninfo/adapters/messages.properties b/plugins/org.eclipse.jem.beaninfo/beaninfo/org/eclipse/jem/internal/beaninfo/adapters/messages.properties
deleted file mode 100644
index 79ff64c..0000000
--- a/plugins/org.eclipse.jem.beaninfo/beaninfo/org/eclipse/jem/internal/beaninfo/adapters/messages.properties
+++ /dev/null
@@ -1,19 +0,0 @@
-###############################################################################
-# Copyright (c) 2004, 2005 IBM Corporation and others.
-# All rights reserved. This program and the accompanying materials
-# are made available under the terms of the Eclipse Public License v1.0
-# which accompanies this distribution, and is available at
-# http://www.eclipse.org/legal/epl-v10.html
-#
-# Contributors:
-# IBM Corporation - initial API and implementation
-###############################################################################
-#
-# $Source: /cvsroot/webtools/jeetools.move/webtools.javaee.git/plugins/org.eclipse.jem.beaninfo/beaninfo/org/eclipse/jem/internal/beaninfo/adapters/messages.properties,v $
-# $Revision: 1.6 $ $Date: 2005/08/24 20:31:29 $
-#
-
-INTROSPECT_FAILED_EXC_ = IWAV0155E Introspection failed on class "{0}." msg="{1}."
-BeaninfoClassAdapter_ClassNotFound = Class not found
-BeaninfoNature_InvalidProject = Invalid project
-UICreateRegistryJobHandler_StartBeaninfoRegistry = Start Beaninfo registry
diff --git a/plugins/org.eclipse.jem.beaninfo/beaninfo/org/eclipse/jem/internal/beaninfo/core/BeanInfoCacheController.java b/plugins/org.eclipse.jem.beaninfo/beaninfo/org/eclipse/jem/internal/beaninfo/core/BeanInfoCacheController.java
deleted file mode 100644
index 31904a2..0000000
--- a/plugins/org.eclipse.jem.beaninfo/beaninfo/org/eclipse/jem/internal/beaninfo/core/BeanInfoCacheController.java
+++ /dev/null
@@ -1,1603 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2005 IBM Corporation and others.
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
- *
- * Contributors:
- * IBM Corporation - initial API and implementation
- *******************************************************************************/
-/*
-
-
- */
-package org.eclipse.jem.internal.beaninfo.core;
-
-import java.io.*;
-import java.util.*;
-import java.util.logging.Level;
-
-import org.eclipse.core.resources.*;
-import org.eclipse.core.runtime.*;
-import org.eclipse.core.runtime.jobs.Job;
-import org.eclipse.emf.common.notify.*;
-import org.eclipse.emf.common.notify.impl.AdapterImpl;
-import org.eclipse.emf.common.util.URI;
-import org.eclipse.emf.ecore.EObject;
-import org.eclipse.emf.ecore.change.ChangeDescription;
-import org.eclipse.emf.ecore.change.impl.EObjectToChangesMapEntryImpl;
-import org.eclipse.emf.ecore.resource.Resource;
-import org.eclipse.emf.ecore.resource.ResourceSet;
-import org.eclipse.emf.ecore.util.EcoreUtil;
-import org.eclipse.emf.ecore.xmi.XMLResource;
-import org.eclipse.jdt.core.*;
-
-import org.eclipse.jem.internal.beaninfo.adapters.*;
-import org.eclipse.jem.internal.java.beaninfo.IIntrospectionAdapter;
-import org.eclipse.jem.java.JavaClass;
-import org.eclipse.jem.util.emf.workbench.ProjectResourceSet;
-import org.eclipse.jem.util.logger.proxy.Logger;
-import org.eclipse.jem.util.plugin.JEMUtilPlugin;
-import org.eclipse.jem.util.plugin.JEMUtilPlugin.CleanResourceChangeListener;
-
-/**
- * Controller of the BeanInfo cache. There is one per workspace (it is a static).
- *
- * The cache is stored on a per IPackageFragmentRoot basis. Each package fragment root will be:
- *
- * <pre>
- *
- * root{999}/classname.xmi
- *
- * </pre>
- *
- * "root{999}" will be a unigue name (root appended with a number}, one for each package fragment root. The "classname.xmi" will be the BeanInfo cache
- * for a class in the root. A root can't have more than one class with the same name, so there shouldn't be any collisions.
- * <p>
- * Now roots can either be in a project, or they can be an external jar (which can be shared between projects).
- * <p>
- * Now all roots for a project will be stored in the project's working location
- * {@link org.eclipse.core.resources.IProject#getWorkingLocation(java.lang.String)}under the ".cache" directory. It will be this format in each
- * project location (under the org.eclipse.jem.beaninfo directory):
- *
- * <pre>
- *
- * .index
- * root{999}/...
- *
- * </pre>
- *
- * The ".index" file will be stored/loaded through an ObjectStream. It will be a {@link BeanInfoCacheController.Index}. It is the index to all of the
- * root's in the directory.
- * <p>
- * All of the external jar roots will be stored in the org.eclipse.jem.beaninfo plugin's state location
- * {@link org.eclipse.core.runtime.Platform#getStateLocation(org.osgi.framework.Bundle)}under the ".cache" directory. The format of this directory
- * will be the same as for each project. And the roots will be for each unique shared external jar (such as the differnt jre's rt.jars).
- * <p>
- * Note: There are so many places where synchronization is needed, so it is decided to synchronize only on BeanInfoCacheController.INSTANCE. It would
- * be too easy to get a dead-lock because the order of synchronizations can't be easily controlled. Since each piece of sync control is very short
- * (except for save of the indices, but that is ok because we don't want them changing while saving) it shouldn't block a lot. There is one place we
- * violate this and that is we do a sync on ClassEntry instance when working with the pending. This is necessary because we don't want the cache write
- * job to hold up everything while writing, so we sync on the entry being written instead. There we must be very careful that we never to
- * BeanInfoCacheControler.INSTANCE sync and then a ClassEntry sync because we could deadlock. The CE access under the covers may do a CE sync and then
- * a BeanInfoCacheController.INSTANCE sync.
- *
- * @since 1.1.0
- */
-public class BeanInfoCacheController {
-
- /**
- * Singleton cache controller.
- *
- * @since 1.1.0
- */
- public static final BeanInfoCacheController INSTANCE = new BeanInfoCacheController();
-
- private BeanInfoCacheController() {
- // Start up save participent. This only is used for saving indexes and shutdown. Currently the saved state delta
- // is of no interest. If a project is deleted while we were not up, then the project index would be gone, so
- // our data will automatically be gone for the project.
- // If a class was deleted while the project's beaninfo was not active, the cache will still contain it. If the class ever came back it
- // would be stale and so recreated. If it never comes back, until a clean is done, it would just hang around.
- // The problem with delete is it is hard to determine that the file is actually a class of interest. The javamodel
- // handles that for us but we won't have a javamodel to handle this on start up to tell us the file was a class of interest. So
- // we'll take the hit of possible cache for non-existant classes. A clean will take care of this.
- saveParticipant = new SaveParticipant();
- try {
- ResourcesPlugin.getWorkspace().addSaveParticipant(BeaninfoPlugin.getPlugin(), saveParticipant);
- } catch (CoreException e) {
- BeaninfoPlugin.getPlugin().getLogger().log(e.getStatus());
- }
-
- // Create a cleanup listener to handle clean requests and project deletes. We need to know about project deletes while
- // active because we may have a project index in memory and that needs to be thrown away.
- JEMUtilPlugin.addCleanResourceChangeListener(new CleanResourceChangeListener() {
-
- protected void cleanProject(IProject project) {
- // Get rid of the project index and the data for the project.
- synchronized (BeanInfoCacheController.this) {
- try {
- Index projectIndex = (Index) project.getSessionProperty(PROJECT_INDEX_KEY);
- if (projectIndex != null) {
- project.setSessionProperty(PROJECT_INDEX_KEY, null);
- projectIndex.markDead();
- cleanDirectory(getCacheDir(project).toFile(), true);
- }
- BeaninfoNature nature = BeaninfoPlugin.getPlugin().getNature(project);
- if (nature != null) {
- nature.projectCleaned();
- BeaninfoAdapterFactory adapterFactory = (BeaninfoAdapterFactory) EcoreUtil.getAdapterFactory(nature.getResourceSet().getAdapterFactories(), IIntrospectionAdapter.ADAPTER_KEY);
- if (adapterFactory != null) {
- adapterFactory.markAllStale(true); // Also clear the overrides.
- }
- }
- } catch (CoreException e) {
- // Shouldn't occur.
- }
- }
- }
-
- protected void cleanAll() {
- synchronized(BeanInfoCacheController.this) {
- // Get MAIN_INDEX, mark it dead, and then delete everything under it.
- if (MAIN_INDEX != null) {
- MAIN_INDEX.markDead();
- MAIN_INDEX = null;
- cleanDirectory(getCacheDir(null).toFile(), true);
- }
- }
- super.cleanAll();
- }
-
- public void resourceChanged(IResourceChangeEvent event) {
- // We don't need to handle PRE_CLOSE because SaveParticipent project save will handle closing.
- switch (event.getType()) {
- case IResourceChangeEvent.PRE_DELETE:
- // Don't need to clear the cache directory because Eclipse will get rid of it.
- synchronized (BeanInfoCacheController.this) {
- try {
- Index projectIndex = (Index) event.getResource().getSessionProperty(PROJECT_INDEX_KEY);
- if (projectIndex != null) {
- // No need to remove from the project because the project is going away and will clean itself up.
- projectIndex.markDead();
- }
- } catch (CoreException e) {
- // Shouldn't occur.
- }
- }
- // Flow into PRE_CLOSE to release the nature.
- case IResourceChangeEvent.PRE_CLOSE:
- // About to close or delete, so release the nature, if any.
- IProject project = (IProject) event.getResource();
- BeaninfoNature nature = BeaninfoPlugin.getPlugin().getNature(project);
- if (nature != null) {
- nature.cleanup(false, true);
- }
- break;
- default:
- super.resourceChanged(event);
- break;
- }
- }
-
- }, IResourceChangeEvent.PRE_DELETE | IResourceChangeEvent.PRE_CLOSE);
- }
-
- protected SaveParticipant saveParticipant;
-
- /**
- * An index structure for the Main and Project indexes. Access to the index contents and methods should synchronize on the index itself.
- * <p>
- * Getting to the index instance should only be through the <code>getMainIndex()</code> and <code>getProjectIndex(IProject)</code> accessors
- * so that synchronization and serialization is controlled.
- *
- * @since 1.1.0
- */
- protected static class Index implements Serializable {
-
- private static final long serialVersionUID = 1106864425567L;
-
- /*
- * Is this a dirty index, i.e. it has been changed and needs to be saved.
- */
- transient private boolean dirty;
-
- private static final int DEAD = -1; // Used in highRootNumber to indicate the index is dead.
- /**
- * The highest root number used. It is incremented everytime one is needed. It doesn't ever decrease to recover removed roots.
- *
- * @since 1.1.0
- */
- public int highRootNumber;
-
- /**
- * Map of root names to the root Index. The key is a {@link IPath}. The path will be relative to the workspace if a project root, or an
- * absolute local path to the archive if it is an external archive. It is the IPath to package fragment root (either a folder or a jar file).
- * <p>
- * The value will be a {@link BeanInfoCacheController.RootIndex}. This is the index for the contents of that root.
- *
- * @since 1.1.0
- */
- transient public Map rootToRootIndex;
-
- /**
- * @param dirty
- * The dirty to set.
- *
- * @since 1.1.0
- */
- public void setDirty(boolean dirty) {
- synchronized (BeanInfoCacheController.INSTANCE) {
- this.dirty = dirty;
- }
- }
-
- /**
- * @return Returns the dirty.
- *
- * @since 1.1.0
- */
- public boolean isDirty() {
- synchronized (BeanInfoCacheController.INSTANCE) {
- return dirty;
- }
- }
-
- /**
- * Answer if this index is dead. It is dead if a clean has occurred. This is needed because there could be some ClassEntry's still
- * around (such as in the pending write queue) that are for cleaned roots. This is used to test if it has been cleaned.
- * @return
- *
- * @since 1.1.0
- */
- public boolean isDead() {
- return highRootNumber == DEAD;
- }
-
- /**
- * Mark the index as dead.
- *
- *
- * @since 1.1.0
- */
- void markDead() {
- highRootNumber = DEAD;
- }
-
- private void writeObject(ObjectOutputStream os) throws IOException {
- os.defaultWriteObject();
- // Now write out the root to root index map. We are not serializing the Map directly using normal Map serialization because
- // the key of the map is an IPath (which is a Path under the covers) and Path is not serializable.
- os.writeInt(rootToRootIndex.size());
- for (Iterator mapItr = rootToRootIndex.entrySet().iterator(); mapItr.hasNext();) {
- Map.Entry entry = (Map.Entry) mapItr.next();
- os.writeUTF(((IPath) entry.getKey()).toString());
- os.writeObject(entry.getValue());
- }
- }
-
- private void readObject(ObjectInputStream is) throws IOException, ClassNotFoundException {
- is.defaultReadObject();
- int size = is.readInt();
- rootToRootIndex = new HashMap(size < 100 ? 100 : size);
- while (size-- > 0) {
- rootToRootIndex.put(new Path(is.readUTF()), is.readObject());
- }
- }
- }
-
- /**
- * An index for a root. It has an entry for each class in this root. The class cache entry describes the cache, whether it is stale, what the
- * current mod stamp is, etc.
- *
- * @since 1.1.0
- */
- public static abstract class RootIndex implements Serializable {
-
- private static final long serialVersionUID = 1106868674101L;
-
- transient private IPath cachePath; // Absolute local filesystem IPath to the root cache directory. Computed at runtime because it may change
- // if workspace relocated.
-
- protected Map classNameToClassEntry; // Map of class names to class entries.
-
- private String rootName; // Name of the root directory in the cache (e.g. "root1").
-
- protected Index index; // Index containing this root index.
-
- protected RootIndex() {
- }
-
- public RootIndex(String rootName, Index index) {
- this.rootName = rootName;
- classNameToClassEntry = new HashMap(100); // When created brand new, put in a map. Otherwise object stream will create the map.
- this.index = index;
- }
-
- /**
- * Get the index that points to this root.
- * @return
- *
- * @since 1.1.0
- */
- Index getIndex() {
- return index;
- }
-
- /**
- * Return the root directory name
- *
- * @return rootname
- *
- * @since 1.1.0
- */
- public String getRootName() {
- return rootName;
- }
-
- /**
- * Set this RootIndex (and the containing Index) as being dirty and in need of saving.
- *
- *
- * @since 1.1.0
- */
- public void setDirty() {
- index.setDirty(true);
- }
-
- /*
- * Setup for index. It will initialize the path. Once set it won't set it again. This will be called repeatedly by the cache controller
- * because there is no way to know if it was lazily created or was brought in from file. When brought in from file the path is not set because
- * it should be relocatable and we don't want absolute paths out on the disk caches, and we don't want to waste time creating the path at load
- * time because it may not be needed for a while. So it will be lazily created. <p> If the project is set, then the path will be relative to
- * the project's working location. If project is <code> null </code> then it will be relative to the BeanInfo plugin's state location. <p>
- * This is <package-protected> because only the creator (BeanInfoCacheController class) should set this up.
- *
- * @param project
- *
- * @since 1.1.0
- */
- void setupIndex(IProject project) {
- if (getCachePath() == null)
- cachePath = getCacheDir(project).append(rootName);
- }
-
- /**
- * @return Returns the path of the cache directory for the root.
- *
- * @since 1.1.0
- */
- public IPath getCachePath() {
- return cachePath;
- }
-
- /**
- * Return whether this is a root for a archive or a folder.
- *
- * @return <code>true</code> if archive for a root. <code>false</code> if archive for a folder.
- *
- * @since 1.1.0
- */
- public abstract boolean isArchiveRoot();
- }
-
- /**
- * A root index that is for an archive, either internal or external. It contains the archive's modification stamp. Each class cache entry will
- * have this same modification stamp. If the archive is changed then all of the class cache entries will be removed because they are all possibly
- * stale. No way to know which may be stale and which not.
- *
- * @since 1.1.0
- */
- public static class ArchiveRootIndex extends RootIndex {
-
- private static final long serialVersionUID = 110686867444L;
-
- private long archiveModificationStamp;
-
- /*
- * For serializer to call.
- */
- protected ArchiveRootIndex() {
- }
-
- public ArchiveRootIndex(String rootName, long archiveModificationStamp, Index index) {
- super(rootName, index);
- this.archiveModificationStamp = archiveModificationStamp;
- }
-
- /*
- * (non-Javadoc)
- *
- * @see org.eclipse.jem.internal.beaninfo.core.BeanInfoCacheController.RootIndex#isArchiveRoot()
- */
- public boolean isArchiveRoot() {
- return true;
- }
-
- /*
- * Set the modification stamp. <p> <package-protected> because only the cache controller should change it.
- *
- * @param archiveModificationStamp The archiveModificationStamp to set.
- *
- * @see BeanInfoCacheController#MODIFICATION_STAMP_STALE
- * @since 1.1.0
- */
- void setArchiveModificationStamp(long archiveModificationStamp) {
- this.archiveModificationStamp = archiveModificationStamp;
- setDirty();
- }
-
- /**
- * Returns the modification stamp.
- *
- * @return Returns the archiveModificationStamp.
- * @see BeanInfoCacheController#MODIFICATION_STAMP_STALE
- * @since 1.1.0
- */
- public long getArchiveModificationStamp() {
- return archiveModificationStamp;
- }
- }
-
- /**
- * This is a root index for a folder (which will be in the workspace). Each class cache entry can have a different modification stamp with a
- * folder root index.
- *
- * @since 1.1.0
- */
- public static class FolderRootIndex extends RootIndex {
-
- private static final long serialVersionUID = 1106868674922L;
-
- /*
- * For serialization.
- */
- protected FolderRootIndex() {
- }
-
- /**
- * @param rootName
- *
- * @since 1.1.0
- */
- public FolderRootIndex(String rootName, Index index) {
- super(rootName, index);
- }
-
- /*
- * (non-Javadoc)
- *
- * @see org.eclipse.jem.internal.beaninfo.core.BeanInfoCacheController.RootIndex#isArchiveRoot()
- */
- public boolean isArchiveRoot() {
- return false;
- }
- }
-
- /**
- * An individual class entry from the cache. It has an entry for each class in the root. The class cache entry describes the cache, whether it is
- * stale, what the current mod stamp is, etc.
- * <p>
- * There is a method to call to see if deleted. This should only be called if entry is being held on to because
- * <code>getClassEntry(JavaClass)</code> will never return a deleted entry. There is a method to get the modification stamp of the current cache
- * entry. This is the time stamp of the cooresponding class resource (or archive file) that the cache file was created from. If the value is
- * <code>IResource.NULL_STAMP</code>, then the cache file is known to be stale. Otherwise if the value is less than a modification stamp of a
- * super class then the cache file is stale.
- *
- * @see ClassEntry#isDeleted()
- * @see ClassEntry#getModificationStamp()
- * @see BeanInfoCacheController#getClassEntry(JavaClass)
- * @since 1.1.0
- */
- public static class ClassEntry implements Serializable {
-
- private static final long serialVersionUID = 1106868674333L;
-
- public static final long DELETED_MODIFICATION_STAMP = Long.MIN_VALUE; // This flag won't be seen externally. It is used to indicate the entry
- // has been deleted for those that have been holding a CE.
-
- /**
- * Check against the super modification stamp and the interface stamps to see if they were set
- * by undefined super class or interface at cache creation time.
- *
- * @since 1.1.0
- */
- public static final long SUPER_UNDEFINED_MODIFICATION_STAMP = Long.MIN_VALUE+1;
-
- private long modificationStamp;
- private long superModificationStamp; // Stamp of superclass, if any, at time of cache creation.
- private String[] interfaceNames; // Interfaces names (null if no interfaces)
- private long[] interfaceModicationStamps; // Modification stamps of interfaces, if any. (null if no interfaces).
- private transient Resource pendingResource; // Resource is waiting to be saved, but the timestamps are for this pending resource so that we know what it will be ahead of time. At this point the class will be introspected.
-
- private RootIndex rootIndex; // The root index this class entry is in, so that any changes can mark the entry as dirty.
-
- private String className; // The classname for this entry.
-
- private boolean saveOperations; // Flag for saving operations. Once this is set, it will continue to save operations in the cache in addition to everything else.
-
- private long configurationModificationStamp; // Modification stamp of the Eclipse configuration. Used to determine if the cache of override files is out of date due to a config change.
- private boolean overrideCacheExists; // Flag that there is an override cache to load. This is orthogonal to the config mod stamp because it simply means that on the current configuration there is no override cache.
- private transient Resource pendingOverrideResource; // Override resource is waiting to be saved.
-
- protected ClassEntry() {
- }
-
- ClassEntry(RootIndex rootIndex, String className) {
- this.setRootIndex(rootIndex);
- this.className = className;
- modificationStamp = IResource.NULL_STAMP;
- rootIndex.classNameToClassEntry.put(className, this);
- }
-
- /**
- *
- * @return
- *
- * @since 1.1.0
- */
- public String getClassName() {
- return className;
- }
-
- /**
- * Return whether the entry has been deleted. This will never be seen in an entry that is still in an index. It is used for entries that have
- * been removed from the index. It is for classes (such as the BeanInfoClassAdapter) which are holding onto a copy of entry to let them know.
- * <p>
- * Holders of entries should call isDeleted if they don't need to further check the mod stamp. Else they should call getModificationStamp and
- * check of deleted, stale, or mod stamp. That would save extra synchronizations. If entry is deleted then it should throw the entry away.
- *
- * @return <code>true</code> if the entry has been deleted, <code>false</code> if still valid.
- *
- * @see ClassEntry#getModificationStamp()
- * @see ClassEntry#isStale()
- * @see ClassEntry#DELETED_MODIFICATION_STAMP
- * @since 1.1.0
- */
- public boolean isDeleted() {
- return getModificationStamp() == DELETED_MODIFICATION_STAMP;
- }
-
- /**
- * Mark the entry as deleted. It will also be removed from root index in that case.
- * <p>
- * Note: It is public only so that BeanInfoClassAdapter can access it. It should not be called by anyone else outside of BeanInfo.
- */
- public synchronized void markDeleted() {
- if (!isDeleted()) {
- getRootIndex().classNameToClassEntry.remove(className);
- setModificationStamp(DELETED_MODIFICATION_STAMP); // Also marks index as dirty.
- }
- }
-
- /**
- * Return whether the entry is stale or not. This orthoganal to isDeleted. isDeleted will not be true if isStale and isStale will not be true
- * if isDeleted. Normally you should use getModificationStamp and check the value for IResource.NULL_STAMP and other values to bring it down
- * to only one synchronized call to CE, but if only needing to know if stale, you can use this.
- *
- * @return
- *
- * @since 1.1.0
- * @see IResource#NULL_STAMP
- * @see ClassEntry#getModificationStamp()
- * @see ClassEntry#isDeleted()
- */
- public boolean isStale() {
- return getModificationStamp() == IResource.NULL_STAMP;
- }
-
- /**
- * Return the modification stamp. For those holding onto an entry, and they need to know more than if just deleted, then they should just the
- * return value from getModificationStamp. Else they should use isDeleted or isStale.
- *
- * @return modification stamp, or {@link IResource#NULL_STAMP}if stale or not yet created, or {@link ClassEntry#DELETED_MODIFICATION_STAMP}
- * if deleted.
- *
- * @see ClassEntry#isDeleted()
- * @see ClassEntry#isStale()
- * @since 1.1.0
- */
- public synchronized long getModificationStamp() {
- return modificationStamp;
- }
-
- /**
- * Return the super modification stamp.
- * @return
- *
- * @since 1.1.0
- */
- public synchronized long getSuperModificationStamp() {
- return superModificationStamp;
- }
-
- /**
- * Return the interface names or <code>null</code> if no interface names.
- * @return
- *
- * @since 1.1.0
- */
- public synchronized String[] getInterfaceNames() {
- return interfaceNames;
- }
-
- /**
- * Return the interface modification stamps or <code>null</code> if no interfaces.
- * @return
- *
- * @since 1.1.0
- */
- public synchronized long[] getInterfaceModificationStamps() {
- return interfaceModicationStamps;
- }
-
- /*
- * Set the modification stamp. <p> <package-protected> because only the cache controller should set it. @param modificationStamp
- *
- * @since 1.1.0
- */
- void setModificationStamp(long modificationStamp) {
- if (this.modificationStamp != modificationStamp) {
- this.modificationStamp = modificationStamp;
- getRootIndex().setDirty();
- }
- }
-
- /**
- * Answer whether operations are also stored in the cache for this class. By default they are not. Once turned on they
- * will always be stored for this class until the class is deleted.
- *
- * @return <code>true</code> if operations are cached, <code>false</code> if they are not cached.
- *
- * @since 1.1.0
- */
- public synchronized boolean isOperationsStored() {
- return saveOperations;
- }
-
- /*
- * Set the operations stored flag.
- * @param storeOperations
- *
- * @see BeanInfoCacheController.ClassEntry#isOperationsStored()
- * @since 1.1.0
- */
- void setOperationsStored(boolean storeOperations) {
- saveOperations = storeOperations;
- }
-
- /**
- * Get the configuration modification stamp of the last saved override cache.
- *
- * @return
- *
- * @since 1.1.0
- */
- public synchronized long getConfigurationModificationStamp() {
- return configurationModificationStamp;
- }
-
- /*
- * Set the configuration modification stamp.
- * <p> <package-protected> because only the cache controller should access it.
- *
- * @param configurationModificationStamp
- *
- * @since 1.1.0
- */
- void setConfigurationModificationStamp(long configurationModificationStamp) {
- this.configurationModificationStamp = configurationModificationStamp;
- getRootIndex().setDirty();
- }
-
- /**
- * Answer whether there is an override cache available.
- * @return
- *
- * @since 1.1.0
- */
- public synchronized boolean overrideCacheExists() {
- return overrideCacheExists;
- }
-
- /*
- * Set the override cache exists flag.
- * <p> <package-protected> because only the cache controller should access it.
- * @param overrideCacheExists
- *
- * @since 1.1.0
- */
- void setOverrideCacheExists(boolean overrideCacheExists) {
- this.overrideCacheExists = overrideCacheExists;
- }
-
- /**
- * Get the pending resource or <code>null</code> if not pending.
- *
- * @return the pending resource or <code>null</code> if not pending.
- *
- * @since 1.1.0
- */
- public synchronized Resource getPendingResource() {
- return pendingResource;
- }
-
- /*
- * Set the entry. The sequence get,do something,set must be grouped within a synchronized(ClassEntry).
- * <p> <package-protected> because only the cache controller should access it.
- * @param cacheResource The cacheResource to set.
- *
- * @since 1.1.0
- */
- void setPendingResource(Resource pendingResource) {
- this.pendingResource = pendingResource;
- }
-
- /**
- * Get the pending override resource or <code>null</code> if not pending.
- *
- * @return the pending override resource or <code>null</code> if not pending.
- *
- * @since 1.1.0
- */
- public synchronized Resource getPendingOverrideResource() {
- return pendingOverrideResource;
- }
-
- /*
- * Set the entry. The sequence get,do something,set must be grouped within a synchronized(ClassEntry).
- * <p> <package-protected> because only the cache controller should access it.
- * @param cacheResource The cacheResource to set.
- *
- * @since 1.1.0
- */
- void setPendingOverrideResource(Resource pendingOverrideResource) {
- this.pendingOverrideResource = pendingOverrideResource;
- }
-
- /*
- * <package-protected> because only the cache controller should access it. @param rootIndex The rootIndex to set.
- *
- * @since 1.1.0
- */
- void setRootIndex(RootIndex rootIndex) {
- this.rootIndex = rootIndex;
- }
-
- /*
- * <package-protected> because only the cache controller should access it. @return Returns the rootIndex.
- *
- * @since 1.1.0
- */
- RootIndex getRootIndex() {
- return rootIndex;
- }
-
- /*
- * <package-protected> because only the cache controller should access it.
- *
- * @since 1.1.0
- */
- void setSuperModificationStamp(long superModificationStamp) {
- this.superModificationStamp = superModificationStamp;
- }
-
- /*
- * <package-protected> because only the cache controller should access it.
- *
- * @since 1.1.0
- */
- void setInterfaceNames(String[] interfaceNames) {
- this.interfaceNames = interfaceNames;
- }
-
- /*
- * <package-protected> because only the cache controller should access it.
- *
- * @since 1.1.0
- */
- void setInterfaceModificationStamps(long[] interfaceModificationStamps) {
- this.interfaceModicationStamps = interfaceModificationStamps;
- }
-
- }
-
- /*
- * Main index for the external jars. This variable should not be referenced directly except through the getMainIndex() accessor. That controls
- * synchronization and restoration as needed.
- */
- private static Index MAIN_INDEX;
-
- /*
- * Key into the Project's session data for the project index. The Project index is stored in the project's session data. That
- * way when the project is closed or deleted it will go away.
- *
- * The project indexes will be read in as needed on a per-project basis. This variable should not be
- * referenced directly except through the getProjectIndex(IProject) accessor. That controls synchronization and restoration as needed.
- * Only during cleanup and such where we don't want to create one if it doesn't exist you must use sync(this). Be careful to keep
- * the sync small.
- */
- private static final QualifiedName PROJECT_INDEX_KEY = new QualifiedName(BeaninfoPlugin.PI_BEANINFO_PLUGINID, "project_index"); //$NON-NLS-1$
-
- /*
- * Suffix for class cache files.
- */
- private static final String CLASS_CACHE_SUFFIX = ".xmi"; //$NON-NLS-1$
- /*
- * Suffic for class override cache files.
- */
- private static final String OVERRIDE_CACHE_SUFFIX = ".override.xmi"; //$NON-NLS-1$
-
- /**
- * Return the current class entry for the JavaClass, or <code>null</code> if no current entry.
- *
- * @param jclass
- * @return class entry or <code>null</code> if no current entry.
- *
- * @since 1.1.0
- */
- public ClassEntry getClassEntry(JavaClass jclass) {
- IType type = (IType) jclass.getReflectionType();
- RootIndex rootIndex = getRootIndex(type);
- String className = jclass.getQualifiedNameForReflection();
- return getClassEntry(rootIndex, className, false);
- }
-
- /**
- * Enumeration for newCache: Signals that this cache is the Reflection Cache with no operations in it.
- * @since 1.1.0
- */
- public final static int REFLECTION_CACHE = 1;
- /**
- * Enumeration for newCache: Signals that this cache is the Reflection Cache with operations in it.
- * @since 1.1.0
- */
- public final static int REFLECTION_OPERATIONS_CACHE = 2;
- /**
- * Enumeration for newCache: Signals that this cache is the Overrides cache.
- * @since 1.1.0
- */
- public final static int OVERRIDES_CACHE = 3;
- /**
- * A new cache entry for the given class has been created. Need to write it out.
- *
- * @param jclass
- * the JavaClass the cache is for.
- * @param cache
- * the ChangeDescription to put out if cacheType is Reflection types, a List if override cache type.
- * @param cacheType
- * {@link BeanInfoCacheController.ClassEntry#REFLECTION_CACHE} for the enum values.
- * @return new class entry (or old one if same one). Should always replace one being held by this one. <code>null</code> if cache could not be
- * updated for some reason.
- * @since 1.1.0
- */
- public ClassEntry newCache(JavaClass jclass, Object cache, int cacheType) {
- if (BeaninfoPlugin.getPlugin().getLogger().isLoggingLevel(Level.FINER)) {
- Logger logger = BeaninfoPlugin.getPlugin().getLogger();
- String type = cacheType!=OVERRIDES_CACHE?"Class":"Overrides"; //$NON-NLS-1$ //$NON-NLS-2$
- if (cacheType == OVERRIDES_CACHE && cache == null)
- type+=" empty"; //$NON-NLS-1$
- logger.log("Creating cache for class "+jclass.getQualifiedNameForReflection()+" cache type="+type, Level.FINER); //$NON-NLS-1$ //$NON-NLS-2$
- }
- ChangeDescription cd = null;
- if (cacheType != OVERRIDES_CACHE) {
- // First go through the cd and remove any empty changes. This is because we created the feature change before we knew what went into
- // it, and at times nothing goes into it.
- cd = (ChangeDescription) cache;
- for (Iterator iter = cd.getObjectChanges().iterator(); iter.hasNext();) {
- EObjectToChangesMapEntryImpl fcEntry = (EObjectToChangesMapEntryImpl) iter.next();
- if (((List) fcEntry.getValue()).isEmpty())
- iter.remove(); // Empty changes, remove it.
- }
- }
- IType type = (IType) jclass.getReflectionType();
- RootIndex rootIndex = getRootIndex(type);
- String className = jclass.getQualifiedNameForReflection();
- ClassEntry ce = getClassEntry(rootIndex, className, true); // Create it if not existing.
- // Sync on ce so that only can create a cache for a class at a time and so that writing (if occurring at the same time for the class) can be
- // held up.
- // this is a violation of the agreement to only sync on THIS, but it is necessary or else the write job would lock everything out while it is
- // writing. This way it only locks out one class, if the class is at the same time.
- // We shouldn't have deadlock because here we lock ce and then THIS (maybe). The write job will lock ce, and then lock THIS. Everywhere else
- // we must
- // also do lock ce then THIS. Mustn't do other way around or possibility of deadlock. Be careful that any synchronized methods in this class
- // do
- // not lock an existing ce.
- ResourceSet cacheRset = null;
- synchronized (ce) {
- Resource cres;
- if (cacheType != OVERRIDES_CACHE) {
- cres = ce.getPendingResource();
- if (cres != null) {
- // We have a pending, so clear and reuse the resource.
- cres.getContents().clear();
- } else {
- // Not currently writing or waiting to write, so create a new resource.
- cres = jclass.eResource().getResourceSet().createResource(
- URI.createFileURI(rootIndex.getCachePath().append(className + CLASS_CACHE_SUFFIX).toString()));
- }
- cacheRset = cres.getResourceSet();
- ce.setOperationsStored(cacheType == REFLECTION_OPERATIONS_CACHE);
- ce.setPendingResource(cres);
- cres.getContents().add(cd);
- // Archives use same mod as archive (retrieve from rootindex), while non-archive use the underlying resource's mod stamp.
- if (rootIndex.isArchiveRoot())
- ce.setModificationStamp(((ArchiveRootIndex) rootIndex).getArchiveModificationStamp());
- else {
- try {
- ce.setModificationStamp(type.getUnderlyingResource().getModificationStamp());
- } catch (JavaModelException e) {
- BeaninfoPlugin.getPlugin().getLogger().log(e);
- ce.markDeleted(); // Mark as deleted in case this was an existing that someone is holding.
- return null; // Couldn't do it, throw cache entry away. This actually should never occur.
- }
- }
- // Need to get the supers info.
- List supers = jclass.getESuperTypes();
- if (!supers.isEmpty()) {
- // We assume that they all have been introspected. This was done back in main introspection. If they are introspected they will have a class entry.
- BeaninfoClassAdapter bca = BeaninfoClassAdapter.getBeaninfoClassAdapter((EObject) supers.get(0));
- ClassEntry superCE = bca.getClassEntry();
- if (superCE != null)
- ce.setSuperModificationStamp(superCE.getModificationStamp());
- else
- ce.setSuperModificationStamp(ClassEntry.SUPER_UNDEFINED_MODIFICATION_STAMP); // No classentry means undefined. So put something in so that when it becomes defined we will know.
- if(supers.size() == 1) {
- ce.setInterfaceNames(null);
- ce.setInterfaceModificationStamps(null);
- } else {
- String[] interNames = new String[supers.size()-1];
- long[] interMods = new long[interNames.length];
- for (int i = 1, indx = 0; indx < interNames.length; i++, indx++) {
- JavaClass javaClass = (JavaClass) supers.get(i);
- bca = BeaninfoClassAdapter.getBeaninfoClassAdapter(javaClass);
- bca.introspectIfNecessary(); // Force introspection to get a valid super mod stamp.
- superCE = bca.getClassEntry();
- interNames[indx] = javaClass.getQualifiedNameForReflection();
- if (superCE != null)
- interMods[indx] = superCE.getModificationStamp();
- else
- interMods[indx] = ClassEntry.SUPER_UNDEFINED_MODIFICATION_STAMP; // No classentry means undefined. So put something in so that when it becomes defined we will know.
- }
- ce.setInterfaceNames(interNames);
- ce.setInterfaceModificationStamps(interMods);
- }
- } else {
- ce.setSuperModificationStamp(IResource.NULL_STAMP);
- ce.setInterfaceNames(null);
- ce.setInterfaceModificationStamps(null);
- }
- } else {
- // We are an override cache.
- if (cache != null) {
- cres = ce.getPendingOverrideResource();
- if (cres != null) {
- // We have a pending, so clear and reuse the resource.
- cres.getContents().clear();
- } else {
- // Not currently writing or waiting to write, so create a new resource.
- cres = jclass.eResource().getResourceSet().createResource(
- URI.createFileURI(rootIndex.getCachePath().append(className + OVERRIDE_CACHE_SUFFIX).toString()));
- }
- cacheRset = cres.getResourceSet();
- cres.getContents().addAll((List) cache);
- ce.setPendingOverrideResource(cres);
- ce.setOverrideCacheExists(true);
- } else {
- ce.setPendingOverrideResource(null);
- ce.setOverrideCacheExists(false);
- }
- ce.setConfigurationModificationStamp(Platform.getPlatformAdmin().getState(false).getTimeStamp());
- }
- }
- queueClassEntry(ce, cacheRset); // Now queue it up.
- return ce;
- }
-
- /**
- * Get the cache resource for the given java class.
- * <p>
- * NOTE: It is the responsibility of the caller to ALWAYS remove the Resource from its resource set when done with it.
- *
- * @param jclass
- * @param ce the class entry for the jclass
- * @param reflectCache <code>true</code> if this the reflection/introspection cache or <code>false</code> if this is the override cache.
- * @return the loaded cache resource, or <code>null</code> if not there (for some reason) or an error trying to load it.
- *
- * @since 1.1.0
- */
- public Resource getCache(JavaClass jclass, ClassEntry ce, boolean reflectCache) {
- String className = jclass.getQualifiedNameForReflection();
- if (BeaninfoPlugin.getPlugin().getLogger().isLoggingLevel(Level.FINER)) {
- Logger logger = BeaninfoPlugin.getPlugin().getLogger();
- String type = reflectCache?"Class":"Overrides"; //$NON-NLS-1$ //$NON-NLS-2$
- logger.log("Loading cache for class "+className+" cache type="+type, Level.FINER); //$NON-NLS-1$ //$NON-NLS-2$
- }
-
- if (reflectCache) {
- boolean waitForJob = false;
- synchronized (ce) {
- if (ce.getPendingResource() != null) {
- // We have one pending. So wait until write cache job is done, and then load it in.
- // Note: Can't just copy the pending resource because it has references to JavaClasses
- // and these could be in a different project (since this could be a workspace wide class).
- // We would get the wrong java classes then when we apply it.
- waitForJob = true;
- if (BeaninfoPlugin.getPlugin().getLogger().isLoggingLevel(Level.FINER))
- BeaninfoPlugin.getPlugin().getLogger().log("Using pending class cache.", Level.FINER); //$NON-NLS-1$
- }
- }
- if (waitForJob)
- waitForCacheSaveJob();
-
- try {
- return jclass.eResource().getResourceSet().getResource(
- URI.createFileURI(ce.getRootIndex().getCachePath().append(
- className + CLASS_CACHE_SUFFIX).toString()), true);
- } catch (Exception e) {
- // Something happened and couldn't load it.
- // TODO - need to remove the Level.INFO arg when the beaninfo cache is working dynamically
- BeaninfoPlugin.getPlugin().getLogger().log(e, Level.INFO);
- return null;
- }
- } else {
- boolean waitForJob = false;
- synchronized (ce) {
- if (ce.getPendingOverrideResource() != null) {
- // We have one pending. So wait until write cache job is done, and then load it in.
- // Note: Can't just copy the pending resource because it has references to JavaClasses
- // and these could be in a different project (since this could be a workspace wide class).
- // We would get the wrong java classes then when we apply it.
- waitForJob = true;
- if (BeaninfoPlugin.getPlugin().getLogger().isLoggingLevel(Level.FINER))
- BeaninfoPlugin.getPlugin().getLogger().log("Using pending override cache.", Level.FINER); //$NON-NLS-1$
- }
- }
- if (waitForJob)
- waitForCacheSaveJob();
-
- try {
- return jclass.eResource().getResourceSet().getResource(
- URI.createFileURI(ce.getRootIndex().getCachePath().append(
- className + OVERRIDE_CACHE_SUFFIX).toString()), true);
- } catch (Exception e) {
- // Something happened and couldn't load it.
- // TODO - need to remove the Level.INFO arg when the beaninfo cache is working dynamically
- BeaninfoPlugin.getPlugin().getLogger().log(e, Level.INFO);
- return null;
- }
- }
- }
-
- private synchronized ClassEntry getClassEntry(RootIndex rootIndex, String className, boolean createEntry) {
- ClassEntry ce = (ClassEntry) rootIndex.classNameToClassEntry.get(className);
- if (createEntry && ce == null) {
- // Need to create one.
- ce = new ClassEntry(rootIndex, className);
- // Don't actually mark the rootIndex dirty until the cache for it is actually saved out.
- }
- return ce;
- }
-
- private static final String ROOT_PREFIX = "root"; //$NON-NLS-1$
-
- /*
- * Get the root index for the appropriate cache for the given java class.
- */
- private RootIndex getRootIndex(IType type) {
- IPackageFragmentRoot root = (IPackageFragmentRoot) type.getAncestor(IJavaElement.PACKAGE_FRAGMENT_ROOT);
- if (!root.isExternal()) {
- // So it is in a project. Get the project index.
- return getRootIndex(root, root.getJavaProject().getProject());
- } else {
- // It is an external jar (archive), so needs to come from main index, no project.
- return getRootIndex(root, null);
- }
- }
-
- /*
- * Get the root index for the given root. A Project index if project is not null.
- */
- private synchronized RootIndex getRootIndex(IPackageFragmentRoot root, IProject project) {
- Index index = project != null ? getProjectIndex(project) : getMainIndex();
- IPath rootPath = root.getPath();
- RootIndex rootIndex = (RootIndex) index.rootToRootIndex.get(rootPath);
- if (rootIndex == null) {
- // Need to do a new root path.
- String rootName = ROOT_PREFIX + (++index.highRootNumber);
- rootIndex = root.isArchive() ? createArchiveRootIndex(root, rootName, index) : new FolderRootIndex(rootName, index);
- index.rootToRootIndex.put(rootPath, rootIndex);
- // Don't set index dirty until we actually save a class cache file. Until then it only needs to be in memory.
- }
- rootIndex.setupIndex(project); // Set it up, or may already be set, so it will do nothing in that case.
- return rootIndex;
- }
-
- /*
- * Create an archive root with the given root number and root.
- */
- private RootIndex createArchiveRootIndex(IPackageFragmentRoot rootArchive, String rootName, Index index) {
- long modStamp = IResource.NULL_STAMP;
- if (rootArchive.isExternal()) {
- modStamp = rootArchive.getPath().toFile().lastModified();
- } else {
- try {
- modStamp = rootArchive.getUnderlyingResource().getModificationStamp();
- } catch (JavaModelException e) {
- BeaninfoPlugin.getPlugin().getLogger().log(e);
- }
- }
- return new ArchiveRootIndex(rootName, modStamp, index);
- }
-
- private static final String INDEXFILENAME = ".index"; //$NON-NLS-1$
-
- private static final String CACHEDIR = ".cache"; // Cache directory (so as not to conflict with any future BeanInfo Plugin specific data files. //$NON-NLS-1$
-
- /*
- * Get the cache directory for the project (or if project is null, the main plugin cache directory).
- */
- // TODO: make this one private
- public static IPath getCacheDir(IProject project) {
- if (project != null)
- return project.getWorkingLocation(BeaninfoPlugin.getPlugin().getBundle().getSymbolicName()).append(CACHEDIR);
- else
- return BeaninfoPlugin.getPlugin().getStateLocation().append(CACHEDIR);
- }
-
- /*
- * Get the project index. Synchronized so that we can create it if necessary and not get race conditions.
- */
- private synchronized Index getProjectIndex(IProject project) {
- try {
- Index index = (Index) project.getSessionProperty(PROJECT_INDEX_KEY);
- if (index == null) {
- // Read the index in.
- File indexDirFile = getCacheDir(project).append(INDEXFILENAME).toFile();
- if (indexDirFile.canRead()) {
- ObjectInputStream ois = null;
- try {
- ois = new ObjectInputStream(new BufferedInputStream(new FileInputStream(indexDirFile)));
- index = (Index) ois.readObject();
- } catch (InvalidClassException e) {
- // This is ok. It simply means the cache index is at a downlevel format and needs to be reconstructed.
- } catch (IOException e) {
- BeaninfoPlugin.getPlugin().getLogger().log(e);
- } catch (ClassNotFoundException e) {
- BeaninfoPlugin.getPlugin().getLogger().log(e);
- } finally {
- if (ois != null)
- try {
- ois.close();
- } catch (IOException e) {
- BeaninfoPlugin.getPlugin().getLogger().log(e);
- }
- }
- }
-
- if (index == null) {
- // Doesn't yet exist or it couldn't be read for some reason, or it was downlevel cache in which case we just throw it away and create
- // new).
- index = new Index();
- index.highRootNumber = 0;
- index.rootToRootIndex = new HashMap();
- }
-
- project.setSessionProperty(PROJECT_INDEX_KEY, index); // We either created a new one, or we were able to load it.
- }
- return index;
- } catch (CoreException e) {
- // Shouldn't occur,
- return null;
- }
- }
-
- /*
- * Get the main index. Synchronized so that we can create it if necessary and not get race conditions.
- */
- private synchronized Index getMainIndex() {
- if (MAIN_INDEX == null) {
- // Read the index in.
- File indexDirFile = getCacheDir(null).append(INDEXFILENAME).toFile();
- if (indexDirFile.canRead()) {
- ObjectInputStream ois = null;
- try {
- ois = new ObjectInputStream(new BufferedInputStream(new FileInputStream(indexDirFile)));
- MAIN_INDEX = (Index) ois.readObject();
- } catch (InvalidClassException e) {
- // This is ok. It just means that the cache index is at a downlevel format and needs to be reconstructed.
- } catch (IOException e) {
- BeaninfoPlugin.getPlugin().getLogger().log(e);
- } catch (ClassNotFoundException e) {
- BeaninfoPlugin.getPlugin().getLogger().log(e);
- } finally {
- if (ois != null)
- try {
- ois.close();
- } catch (IOException e) {
- BeaninfoPlugin.getPlugin().getLogger().log(e);
- }
- }
- }
-
- if (MAIN_INDEX == null) {
- // Doesn't yet exist or it couldn't be read for some reason, or it was downlevel cache in which case we just throw it away and create
- // new).
- MAIN_INDEX = new Index();
- MAIN_INDEX.highRootNumber = 0;
- MAIN_INDEX.rootToRootIndex = new HashMap();
- }
-
- }
- return MAIN_INDEX;
- }
-
- // -------------- Save Participant code -----------------
-
- protected class SaveParticipant implements ISaveParticipant {
-
- /*
- * (non-Javadoc)
- *
- * @see org.eclipse.core.resources.ISaveParticipant#doneSaving(org.eclipse.core.resources.ISaveContext)
- */
- public void doneSaving(ISaveContext context) {
- }
-
- /*
- * (non-Javadoc)
- *
- * @see org.eclipse.core.resources.ISaveParticipant#prepareToSave(org.eclipse.core.resources.ISaveContext)
- */
- public void prepareToSave(ISaveContext context) throws CoreException {
- }
-
- /*
- * (non-Javadoc)
- *
- * @see org.eclipse.core.resources.ISaveParticipant#rollback(org.eclipse.core.resources.ISaveContext)
- */
- public void rollback(ISaveContext context) {
- }
-
- /*
- * (non-Javadoc)
- *
- * @see org.eclipse.core.resources.ISaveParticipant#saving(org.eclipse.core.resources.ISaveContext)
- */
- public void saving(ISaveContext context) throws CoreException {
- boolean fullsave = false;
- switch (context.getKind()) {
- case ISaveContext.PROJECT_SAVE:
- IProject project = context.getProject();
- synchronized (BeanInfoCacheController.INSTANCE) {
- // Write the index. The cache save job will eventually run and at that point write out the pending cache files too.
- // They don't need to be written before the project save is complete.
- Index projectIndex = (Index) project.getSessionProperty(PROJECT_INDEX_KEY);
- if (projectIndex != null && projectIndex.isDirty())
- if (reconcileIndexDirectory(project, projectIndex))
- writeIndex(project, projectIndex);
- else {
- // It was empty, just get rid of the index. The directories have already been cleared.
- projectIndex.markDead();
- project.setSessionProperty(PROJECT_INDEX_KEY, null);
- }
- }
- break;
- case ISaveContext.FULL_SAVE:
- fullsave = true;
- waitForCacheSaveJob();
- // Now flow into the snapshot save to complete the fullsave.
- case ISaveContext.SNAPSHOT:
- // For a snapshot, just the dirty indexes, no clean up. If fullsave, cleanup the indexes, but only save the dirty.
- synchronized (BeanInfoCacheController.INSTANCE) {
- if (MAIN_INDEX != null) {
- if (fullsave) {
- if (reconcileIndexDirectory(null, MAIN_INDEX)) {
- if (MAIN_INDEX.isDirty())
- writeIndex(null, MAIN_INDEX);
- } else {
- // It was empty, just get rid of the index. The directories have already been cleared.
- MAIN_INDEX.markDead();
- MAIN_INDEX = null;
- }
- } else if (MAIN_INDEX.isDirty())
- writeIndex(null, MAIN_INDEX);
- }
- // Now do the project indexes. We have to walk all open projects to see which have an index. Since we are
- // doing a major save, the hit will ok
- IProject[] projects = ResourcesPlugin.getWorkspace().getRoot().getProjects();
- for (int i=0; i<projects.length; i++) {
- project = projects[i];
- if (project.isOpen()) {
- Index index = (Index) project.getSessionProperty(PROJECT_INDEX_KEY);
- if (index != null) {
- if (fullsave) {
- if (reconcileIndexDirectory(project, index)) {
- if (index.isDirty())
- writeIndex(project, index);
- } else {
- // It was empty, just get rid of the index from memory. It has already been deleted from disk.
- index.markDead();
- project.setSessionProperty(PROJECT_INDEX_KEY, null);
- }
- } else if (index.isDirty())
- writeIndex(project, index);
- }
- }
- }
- }
- }
- }
-
- /*
- * Write an index. Project if not null indicates a project index.
- */
- private void writeIndex(IProject project, Index index) {
- ObjectOutputStream oos = null;
- try {
- File indexDirFile = getCacheDir(project).toFile();
- indexDirFile.mkdirs();
- File indexFile = new File(indexDirFile, INDEXFILENAME);
- oos = new ObjectOutputStream(new BufferedOutputStream(new FileOutputStream(indexFile)));
- oos.writeObject(index);
- index.setDirty(false);
- } catch (IOException e) {
- BeaninfoPlugin.getPlugin().getLogger().log(e);
- } finally {
- if (oos != null)
- try {
- oos.close();
- } catch (IOException e) {
- BeaninfoPlugin.getPlugin().getLogger().log(e);
- }
- }
- }
-
- /*
- * Reconcile the index directory of unused (empty) root directories. If after reconciling the index is empty, then it will delete the index file too. @return
- * true if index not empty, false if index was empty and was erased too.
- */
- private boolean reconcileIndexDirectory(IProject project, Index index) {
- // clean out unused rootIndexes
- File indexDir = getCacheDir(project).toFile();
- if (indexDir.canWrite()) {
- // Create a set of all root names for quick look up.
- if (index.rootToRootIndex.isEmpty()) {
- // It is empty, clear everything, including index file.
- cleanDirectory(indexDir, false);
- return false;
- } else {
- // Need a set of the valid rootnames for quick lookup of names in the directory list.
- // And while accumulating this list, clean out the root indexes cache too (i.e. the class cache files).
- final Set validFiles = new HashSet(index.rootToRootIndex.size());
- validFiles.add(INDEXFILENAME);
- for (Iterator itr = index.rootToRootIndex.values().iterator(); itr.hasNext();) {
- RootIndex rootIndex = (RootIndex) itr.next();
- if (reconcileClassCacheDirectory(rootIndex, project)) {
- // The class cache has been reconciled, and there are still some classes left, so keep the root index.
- validFiles.add(rootIndex.getRootName());
- } else {
- itr.remove(); // The root index is empty, so get rid of it. Since not a valid name, it will be deleted in next step.
- index.setDirty(true); // Also set it dirty in case it wasn't because we need to write out the container Index since it was
- // changed.
- }
- }
- // Get list of files and delete those that are not a valid name (used root name, or index file)
- String[] fileNames = indexDir.list();
- for (int i = 0; i < fileNames.length; i++) {
- if (!validFiles.contains(fileNames[i])) {
- File file = new File(indexDir, fileNames[i]);
- if (file.isDirectory())
- cleanDirectory(file, true);
- else
- file.delete();
- }
- }
- return true;
- }
- } else
- return true; // Can't write, so treat as leave alone.
- }
-
- /*
- * Reconcile the class cache directory for the root index. Return true if reconciled good but not empty. Return false if the class cache
- * directory is now empty. In this case we should actually get rid of the entire root index. This makes sure that the directory matches
- * the contents of the index by removing any file not found in the index.
- */
- private boolean reconcileClassCacheDirectory(RootIndex rootIndex, IProject project) {
- if (rootIndex.classNameToClassEntry.isEmpty())
- return false; // There are no classes, so get rid the entire root index.
- else {
- final Set validFiles = rootIndex.classNameToClassEntry.keySet(); // The keys (classnames) are the filenames (without extension)
- // that
- // should be kept.
- File indexDir = getCacheDir(project).append(rootIndex.getRootName()).toFile();
- // Get list of files that are not a valid name (used classname)
- String[] fileNames = indexDir.list();
- if (fileNames != null) {
- for (int i = 0; i < fileNames.length; i++) {
- String fileName = fileNames[i];
- if (fileName.endsWith(OVERRIDE_CACHE_SUFFIX)) {
- // Ends with out class cache extension, see if valid classname.
- String classname = fileName.substring(0, fileName.length() - OVERRIDE_CACHE_SUFFIX.length());
- ClassEntry ce = (ClassEntry) rootIndex.classNameToClassEntry.get(classname);
- if (ce != null && ce.overrideCacheExists())
- continue; // It is one of ours. Keep it.
- } else if (fileName.endsWith(CLASS_CACHE_SUFFIX)) {
- // Ends with out class cache extension, see if valid classname.
- if (validFiles.contains(fileName.substring(0, fileName.length() - CLASS_CACHE_SUFFIX.length()))) // Strip down to just
- // class and see if
- // one of ours.
- continue; // It is one of ours. Keep it.
- }
- // Not valid, get rid of it.
- File file = new File(indexDir, fileName);
- if (file.isDirectory())
- cleanDirectory(file, true);
- else
- file.delete();
-
- }
- }
- return true;
- }
- }
- }
-
- private static void cleanDirectory(File dir, boolean eraseDir) {
- if (dir.canWrite()) {
- File[] files = dir.listFiles();
- for (int i = 0; i < files.length; i++) {
- if (files[i].isDirectory())
- cleanDirectory(files[i], true);
- else
- files[i].delete();
- }
- if (eraseDir)
- dir.delete();
- }
- }
-
- //-------------- Save Class Cache Entry Job -------------------
- // This is write queue for class caches. It is a FIFO queue. It is sychronized so that adds/removes are controlled.
- // Entries are ClassEntry's. The class entry has the resource that needs to be written out. It will be set to null
- // by the job when it is written. The job will have a ClassEntry locked while it is retrieving and resetting the resource
- // field in the entry.
- //
- // The process is the new cache will lock, create resource, set resource into the CE and release lock. Then add the CE to the queue
- // and schedule the job (in case job is not running).
- //
- // The job will lock the CE, get resource from the CE, write it out, set it back to null, release the CE). If the resource is null,
- // then it was already processed (this could happen if the job didn't get a chance to save it before another entry was posted
- // and this is the second request and it was actually processed by the first request).
- // IE:
- // 1) resource created, queue entry added
- // 2) 2nd req, job not processed yet, resource recreated and put back into CE, new queue entry.
- // 3) job pulls from queue, locks ce, grabs resource, writes out the resource, sets back to null, release ce.
- // 4) job pulls from queue. This time the resoure is null so it skips it.
- //
- // Need to lock Ce during entire create and write because the resource set is not reentrant so can't be writing it while creating it.
-
- private List cacheWriteQueue = null;
-
- void waitForCacheSaveJob() {
- // For a full save we want to get the class cache files written too, so we need to manipulate the job to get it to finish ASAP.
- if (cacheWriteJob != null) {
- if (BeaninfoPlugin.getPlugin().getLogger().isLoggingLevel(Level.FINER))
- BeaninfoPlugin.getPlugin().getLogger().log("Forcing a cache save job to start early.", Level.FINER); //$NON-NLS-1$
- switch (cacheWriteJob.getState()) {
- case Job.SLEEPING:
- // It could be waiting a long time, so we need to wake it up at a high priority to get it running ASAP.
- cacheWriteJob.setPriority(Job.INTERACTIVE); // Need to get it going right away
- cacheWriteJob.wakeUp();
- // Now drop into the wait.
- default:
- // Now wait for it (if not running this will return right away).
- try {
- cacheWriteJob.join();
- } catch (InterruptedException e) {
- }
- }
- }
- }
-
- static final Map SAVE_CACHE_OPTIONS;
- static {
- SAVE_CACHE_OPTIONS = new HashMap(3);
- SAVE_CACHE_OPTIONS.put(XMLResource.OPTION_SAVE_TYPE_INFORMATION, Boolean.TRUE);
- SAVE_CACHE_OPTIONS.put(XMLResource.OPTION_USE_ENCODED_ATTRIBUTE_STYLE, Boolean.TRUE);
- SAVE_CACHE_OPTIONS.put(XMLResource.OPTION_ENCODING, "UTF-8"); //$NON-NLS-1$
- }
-
- protected Job cacheWriteJob = null;
- protected Adapter projectReleaseAdapter = new AdapterImpl() {
-
- /* (non-Javadoc)
- * @see org.eclipse.emf.common.notify.impl.AdapterImpl#isAdapterForType(java.lang.Object)
- */
- public boolean isAdapterForType(Object type) {
- return type == BeanInfoCacheController.this; // We're making the BeanInfoCacheController.this be the adapter type.
- }
-
-
- /* (non-Javadoc)
- * @see org.eclipse.emf.common.notify.impl.AdapterImpl#notifyChanged(org.eclipse.emf.common.notify.Notification)
- */
- public void notifyChanged(Notification msg) {
- if (msg.getEventType() == ProjectResourceSet.SPECIAL_NOTIFICATION_TYPE && msg.getFeatureID(BeanInfoCacheController.class) == ProjectResourceSet.PROJECTRESOURCESET_ABOUT_TO_RELEASE_ID) {
- // This is an about to be closed. If we have an active write job, bring it up to top priority and wait for it to finish.
- // This will make sure any resources in the project are written. There may not be any waiting, but this is doing a close
- // project, which is slow already relatively speaking, that waiting for the cache write job to finish is not bad.
- waitForCacheSaveJob();
- }
- }
- };
-
- private void queueClassEntry(ClassEntry ce, ResourceSet rset) {
- if (cacheWriteQueue == null) {
- cacheWriteQueue = Collections.synchronizedList(new LinkedList());
- cacheWriteJob = new Job(BeaninfoCoreMessages.BeanInfoCacheController_Job_WriteBeaninfoCache_Title) {
-
- protected IStatus run(IProgressMonitor monitor) {
- monitor.beginTask("", cacheWriteQueue.size() + 10); // This is actually can change during the run, so we add 10 for the heck of it. //$NON-NLS-1$
- if (BeaninfoPlugin.getPlugin().getLogger().isLoggingLevel(Level.FINER))
- BeaninfoPlugin.getPlugin().getLogger().log("Starting write BeanInfo Cache files.", Level.FINER); //$NON-NLS-1$
- while (!monitor.isCanceled() && !cacheWriteQueue.isEmpty()) {
- ClassEntry ce = (ClassEntry) cacheWriteQueue.remove(0); // Get first one.
- boolean dead = false;
- synchronized (BeanInfoCacheController.this) {
- if (ce.getRootIndex().getIndex().isDead()) {
- dead = true; // The index is dead, so don't write it. We still need to go through and get the pending resource out of its resource set so that it goes away.
- }
- }
- synchronized (ce) {
- Resource cres = ce.getPendingResource();
- if (cres != null) {
- try {
- if (!dead)
- cres.save(SAVE_CACHE_OPTIONS);
- } catch (IOException e) {
- BeaninfoPlugin.getPlugin().getLogger().log(e);
- } finally {
- // Remove the resource from resource set, clear out the pending.
- cres.getResourceSet().getResources().remove(cres);
- ce.setPendingResource(null);
- }
- }
- cres = ce.getPendingOverrideResource();
- if (cres != null) {
- try {
- if (!dead)
- cres.save(SAVE_CACHE_OPTIONS);
- } catch (IOException e) {
- BeaninfoPlugin.getPlugin().getLogger().log(e);
- } finally {
- // Remove the resource from resource set, clear out the pending.
- cres.getResourceSet().getResources().remove(cres);
- ce.setPendingOverrideResource(null);
- }
- }
-
- monitor.worked(1);
- }
- }
- monitor.done();
- if (BeaninfoPlugin.getPlugin().getLogger().isLoggingLevel(Level.FINER))
- BeaninfoPlugin.getPlugin().getLogger().log("Finished write BeanInfo Cache files.", Level.FINER); //$NON-NLS-1$
- return Status.OK_STATUS;
- }
- };
- cacheWriteJob.setPriority(Job.SHORT);
- cacheWriteJob.setSystem(true);
- }
- if (rset != null && EcoreUtil.getExistingAdapter(rset, this) == null) {
- // If it is a project resource set, then add ourselves as listeners so we know when released.
- if (rset instanceof ProjectResourceSet)
- rset.eAdapters().add(projectReleaseAdapter);
- }
- cacheWriteQueue.add(ce);
- cacheWriteJob.schedule(60 * 1000L); // Put off for 1 minute to let other stuff go on. Not important that it happens immediately.
- }
-}
\ No newline at end of file
diff --git a/plugins/org.eclipse.jem.beaninfo/beaninfo/org/eclipse/jem/internal/beaninfo/core/BeanInfoContributorAdapter.java b/plugins/org.eclipse.jem.beaninfo/beaninfo/org/eclipse/jem/internal/beaninfo/core/BeanInfoContributorAdapter.java
deleted file mode 100644
index b787ff7..0000000
--- a/plugins/org.eclipse.jem.beaninfo/beaninfo/org/eclipse/jem/internal/beaninfo/core/BeanInfoContributorAdapter.java
+++ /dev/null
@@ -1,148 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2004, 2005 IBM Corporation and others.
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
- *
- * Contributors:
- * IBM Corporation - initial API and implementation
- *******************************************************************************/
-/*
-
-
- */
-package org.eclipse.jem.internal.beaninfo.core;
-
-import java.io.FileNotFoundException;
-
-import org.eclipse.core.resources.IResourceStatus;
-import org.eclipse.core.runtime.*;
-import org.eclipse.emf.common.util.URI;
-import org.eclipse.emf.common.util.WrappedException;
-import org.eclipse.emf.ecore.resource.Resource;
-import org.eclipse.emf.ecore.resource.ResourceSet;
-import org.osgi.framework.Bundle;
-
-import org.eclipse.jem.internal.beaninfo.core.BeaninfoPlugin.IContributorOverrideRunnable;
-import org.eclipse.jem.internal.proxy.core.IConfigurationContributionInfo;
-import org.eclipse.jem.java.JavaClass;
-import org.eclipse.jem.util.plugin.JEMUtilPlugin;
-
-
-/**
- * A default implementation of IBeanInfoContributor for users to subclass. Default does nothing.
- * <p>
- * But this does supply several very useful utility methods.
- *
- * @since 1.0.0
- */
-public class BeanInfoContributorAdapter implements IBeanInfoContributor {
-
- /**
- * An empty array of BeaninfoEntry. Available for subclasses to return if they
- * decide there is nothing to return.
- */
- public static final BeaninfoEntry[] EMPTY_BEANINFO_ENTRIES = new BeaninfoEntry[0];
-
- /**
- * Return true if the given fragment is part of the package. Used by subclasses to determine
- * if a override associated with a given fragment should be used for the package.
- * <p>
- * In other words, <code>org.eclipse</code> as a fragment and and <code>org.eclipse.core</code> as
- * a packagePath will answer true, but if you swapped them it will answer false.
- *
- * @param fragment
- * @param packagePath
- * @return <code>true</code> if the given fragment is a leading part of the package.
- *
- * @since 1.0.0
- */
- protected boolean isFragment(IPath fragment, IPath packagePath) {
- return fragment.isPrefixOf(packagePath);
- }
-
- /**
- * Return the unmatched portion of the package path from a fragment. Used by subclasses
- * to get the part of the package path that is after the fragment. This is then used to
- * append to the path from the override to get the full path to override files for this
- * package.
- * <p>
- * This will return the part of the packagePath that is not matched by the fragment.
- * <p>
- * Note: It is important that the fragment and packagePath have first been tested through
- * isFragment. Otherwise an invalid result will be returned.
- *
- * @param fragment
- * @param packagePath
- * @return the part of the package path not matched.
- *
- * @see BeanInfoContributorAdapter#isFragment(IPath, IPath)
- * @since 1.0.0
- */
- protected String getUnmatchedPath(IPath fragment, IPath packagePath) {
- return fragment.removeFirstSegments(packagePath.segmentCount()).toString();
- }
-
- /**
- * Subclasses can use this helper method to get the override resource from the given (plugin) bundle.
- *
- * @param bundle the bundle to use.
- * @param relativePath path of file relative to the plugin.
- * @param resource set to load into.
- * @param runnable the runnable that is being used for the override. It is used to determine if resource already used once.
- * @return the resource or <code>null</code> if couldn't be loaded or if it was already used once.
- *
- * @since 1.0.0
- */
- protected Resource loadOverrideResource(Bundle bundle, String relativePath, ResourceSet rset, BeaninfoPlugin.IContributorOverrideRunnable runnable) {
- URI uri = URI.createURI(JEMUtilPlugin.PLATFORM_PROTOCOL+":/"+JEMUtilPlugin.PLATFORM_PLUGIN+'/'+bundle.getSymbolicName()+'/'+relativePath); //$NON-NLS-1$
- if (runnable.resourceContributed(uri))
- return null; // Already contributed once.
- Resource result = null;
- try {
- result = rset.getResource(uri, true);
- } catch (WrappedException e) {
- // FileNotFoundException is ok
- if (!(e.exception() instanceof FileNotFoundException)) {
- if (e.exception() instanceof CoreException
- && ((CoreException) e.exception()).getStatus().getCode() == IResourceStatus.RESOURCE_NOT_FOUND) {
- // This is ok. Means uri_mapping not set so couldn't find in Workspace, also ok.
- } else {
- BeaninfoPlugin.getPlugin().getLogger().log(new Status(IStatus.WARNING, BeaninfoPlugin.PI_BEANINFO_PLUGINID, 0, "Error loading file\"" + uri + "\"", e.exception())); //$NON-NLS-1$ //$NON-NLS-2$
- }
- }
- // In case it happened after creating resource but during load. Need to get rid of it in the finally.
- result = null;
- Resource res = rset.getResource(uri, false);
- if (res != null)
- rset.getResources().remove(res);
- } catch (Exception e) {
- // Couldn't load it for some reason.
- BeaninfoPlugin.getPlugin().getLogger().log(new Status(IStatus.WARNING, BeaninfoPlugin.PI_BEANINFO_PLUGINID, 0, "Error loading file\"" + uri + "\"", e)); //$NON-NLS-1$ //$NON-NLS-2$
- // In case it happened after creating resource but during load. Need to get rid of it in the finally.
- result = null;
- Resource res = rset.getResource(uri, false);
- if (res != null)
- rset.getResources().remove(res);
- };
- return result;
- }
-
-
- /* (non-Javadoc)
- * @see org.eclipse.jem.internal.beaninfo.core.IBeanInfoContributor#getBeanInfoEntryContributions(org.eclipse.jem.internal.proxy.core.IConfigurationContributionInfo)
- */
- public BeaninfoEntry[] getBeanInfoEntryContributions(IConfigurationContributionInfo info) {
- return EMPTY_BEANINFO_ENTRIES;
- }
-
- /*
- * (non-Javadoc)
- * @see org.eclipse.jem.internal.beaninfo.core.IBeanInfoContributor#runOverrides(org.eclipse.core.runtime.IPath, java.lang.String, org.eclipse.jem.java.JavaClass, org.eclipse.emf.ecore.resource.ResourceSet, org.eclipse.jem.internal.beaninfo.core.BeaninfoPlugin.IContributorOverrideRunnable)
- */
- public void runOverrides(IPath packagePath, String className, JavaClass javaClass, ResourceSet rset, IContributorOverrideRunnable runnable) {
- // Default is do nothing
- }
-
-}
diff --git a/plugins/org.eclipse.jem.beaninfo/beaninfo/org/eclipse/jem/internal/beaninfo/core/BeaninfoCoreMessages.java b/plugins/org.eclipse.jem.beaninfo/beaninfo/org/eclipse/jem/internal/beaninfo/core/BeaninfoCoreMessages.java
deleted file mode 100644
index 2dd5656..0000000
--- a/plugins/org.eclipse.jem.beaninfo/beaninfo/org/eclipse/jem/internal/beaninfo/core/BeaninfoCoreMessages.java
+++ /dev/null
@@ -1,28 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2000, 2005 IBM Corporation and others.
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
- *
- * Contributors:
- * IBM Corporation - initial API and implementation
- *******************************************************************************/
-package org.eclipse.jem.internal.beaninfo.core;
-
-import org.eclipse.osgi.util.NLS;
-
-public final class BeaninfoCoreMessages extends NLS {
-
- private static final String BUNDLE_NAME = "org.eclipse.jem.internal.beaninfo.core.messages";//$NON-NLS-1$
-
- private BeaninfoCoreMessages() {
- // Do not instantiate
- }
-
- public static String BeanInfoCacheController_Job_WriteBeaninfoCache_Title;
-
- static {
- NLS.initializeMessages(BUNDLE_NAME, BeaninfoCoreMessages.class);
- }
-}
\ No newline at end of file
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
deleted file mode 100644
index fbd7fad..0000000
--- a/plugins/org.eclipse.jem.beaninfo/beaninfo/org/eclipse/jem/internal/beaninfo/core/BeaninfoEntry.java
+++ /dev/null
@@ -1,373 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2001, 2006 IBM Corporation and others.
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
- *
- * Contributors:
- * IBM Corporation - initial API and implementation
- *******************************************************************************/
-package org.eclipse.jem.internal.beaninfo.core;
-/*
-
-
- */
-
-import java.util.ArrayList;
-import java.util.List;
-import java.util.logging.Level;
-
-import org.eclipse.core.resources.*;
-import org.eclipse.core.runtime.*;
-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
- * a local file in the project, or as an external jar, or as external jar through a
- * variable, or an external jar through a plugin.
- * <p>
- * An external jar through containers is not valid because container are attached to
- * projects. they aren't standalone.
- *
- * @version 1.0
- * @author
- */
-public class BeaninfoEntry implements IBeaninfosDocEntry {
-
- final static String sBeaninfo = "beaninfo"; // Beaninfo entry, shared with BeaninfosDoc. //$NON-NLS-1$
-
- public static final int BIE_PLUGIN = 100; // Beaninfo jar can be found in a plugin.
-
- static int kindFromString(String kindStr) {
- if (kindStr == null || kindStr.length() == 0)
- return BIE_PLUGIN; // Default to plugin. If coming from beaninfoconfig, there should always be kind. But if coming from plugin.xml there shouldn't be one.
- if (kindStr.equalsIgnoreCase("con")) //$NON-NLS-1$
- return IClasspathEntry.CPE_CONTAINER;
- if (kindStr.equalsIgnoreCase("var")) //$NON-NLS-1$
- return IClasspathEntry.CPE_VARIABLE;
- if (kindStr.equalsIgnoreCase("src")) //$NON-NLS-1$
- return IClasspathEntry.CPE_SOURCE;
- if (kindStr.equalsIgnoreCase("lib")) //$NON-NLS-1$
- return IClasspathEntry.CPE_LIBRARY;
- if (kindStr.equalsIgnoreCase("plugin")) //$NON-NLS-1$
- return BIE_PLUGIN;
- return -1;
- }
-
- static String kindToString(int kind) {
-
- switch (kind) {
- case IClasspathEntry.CPE_PROJECT :
- return "src"; // backward compatibility //$NON-NLS-1$
- case IClasspathEntry.CPE_SOURCE :
- return "src"; //$NON-NLS-1$
- case IClasspathEntry.CPE_LIBRARY :
- return "lib"; //$NON-NLS-1$
- case IClasspathEntry.CPE_VARIABLE :
- return "var"; //$NON-NLS-1$
- case IClasspathEntry.CPE_CONTAINER:
- return "con"; //$NON-NLS-1$
- case BIE_PLUGIN:
- return "plugin"; //$NON-NLS-1$
- default :
- return "unknown"; //$NON-NLS-1$
- }
- }
-
- /**
- * Return the appropriate kind of entry when we know it is a classpath entry.
- */
- public static IClasspathEntry createEntry(int kind, IPath path, IProject project, boolean isExported) {
- switch (kind) {
-
- case IClasspathEntry.CPE_LIBRARY :
- if (path.isAbsolute())
- return JavaCore.newLibraryEntry(path, null, null, isExported);
- break;
-
- case IClasspathEntry.CPE_SOURCE :
- if (path.isAbsolute()) {
- // must be an entry in this project or specify another project
- String projSegment = path.segment(0);
- if (project != null && projSegment != null && projSegment.equals(project.getName())) {
- // this project
- return JavaCore.newSourceEntry(path);
- } else {
- // another project
- return JavaCore.newProjectEntry(path, isExported);
- }
- }
- break;
-
- case IClasspathEntry.CPE_VARIABLE :
- return JavaCore.newVariableEntry(path, null, null, isExported);
-
- case IClasspathEntry.CPE_CONTAINER:
- return JavaCore.newContainerEntry(path, isExported);
-
- }
-
- return null;
- }
- /**
- * Read the entry in from the element.
- */
- public static BeaninfoEntry readEntry(IReader reader, Object element, IProject project) {
- String elementKind = reader.getAttribute(element, BeaninfosDoc.sKind);
- String pathStr = reader.getAttribute(element, BeaninfosDoc.sPath);
- // ensure path is absolute
- IPath path = new Path(pathStr);
- int kind = kindFromString(elementKind);
- if (kind != IClasspathEntry.CPE_VARIABLE && kind != IClasspathEntry.CPE_CONTAINER && kind != BIE_PLUGIN && !path.isAbsolute()) {
- path = project != null ? project.getFullPath().append(path) : path.makeAbsolute(); // Some folder/jar within this project
- }
-
- // exported flag
- String exportedString = reader.getAttribute(element, BeaninfosDoc.sExported);
- boolean isExported = "true".equalsIgnoreCase(exportedString); //$NON-NLS-1$
- //$NON-NLS-1$
-
- // recreate the entry
- IClasspathEntry cpEntry = null;
- IPath pluginPath = null;
- if (kind != BIE_PLUGIN) {
- cpEntry = createEntry(kind, path, project, isExported);
- } else {
- if (path.isAbsolute())
- pluginPath = path;
- else {
- // Kludge This should only be a plugin type if from configuration element. So we will cast to that
- // and get the plugin id to create an absolute plugin path.
- if (element instanceof IConfigurationElement) {
- pluginPath = new Path('/'+((IConfigurationElement) element).getDeclaringExtension().getContributor().getName()).append(path);
- } else
- return null; // Not valid because can't have plugin from .beaninfoconfig file.
- }
- }
-
- ArrayList searchpaths = new ArrayList();
- Object children = reader.getChildren(element);
- int childrenLength = reader.getLength(children);
- for (int i = 0; i < childrenLength; i++) {
- Object child = reader.getItem(children, i);
- if (reader.isNodeTypeElement(child)) {
- Object entry = null;
- if (reader.getNodeName(child).equalsIgnoreCase(SearchpathEntry.sSearchpath)) {
- entry = SearchpathEntry.readEntry(reader, child, project, true);
- }
- if (entry != null)
- searchpaths.add(entry);
- }
- }
-
- if (cpEntry != null)
- return new BeaninfoEntry(
- cpEntry,
- (SearchpathEntry[]) searchpaths.toArray(new SearchpathEntry[searchpaths.size()]),
- isExported);
- else return new BeaninfoEntry(
- pluginPath,
- (SearchpathEntry[]) searchpaths.toArray(new SearchpathEntry[searchpaths.size()]),
- isExported);
- }
-
- protected IClasspathEntry entry; // Store it as a classpath entry for convienence. It is the RAW classpath entry. This is only used when pointing to something other than a plugin.
- protected IPath pluginPath; // When stored in a plugin, this will be set instead.
- protected boolean isExported;
- protected SearchpathEntry[] searchpaths;
-
- /**
- * Used when the beaninfo jar is within a plugin. In that case, the first segment
- * of the path is the plugin descriptor, and the rest is the path from the plugin
- * directory to the jar.
- */
- public BeaninfoEntry(IPath pluginPath, SearchpathEntry[] searchpaths, boolean isExported) {
- this(searchpaths, isExported);
- this.pluginPath = pluginPath;
- }
-
- /**
- * Used when the beaninfo jar/folder is either an external jar/folder or is somewhere else
- * in the workspace. In that case the entry is the RAW classpath entry to that code.
- */
- public BeaninfoEntry(IClasspathEntry entry, SearchpathEntry[] searchpaths, boolean isExported) {
- this(searchpaths, isExported);
- this.entry = entry;
- }
-
- protected BeaninfoEntry(SearchpathEntry[] searchpaths, boolean isExported) {
- this.isExported = isExported;
- this.searchpaths = searchpaths != null ? searchpaths : new SearchpathEntry[0];
- }
-
- public SearchpathEntry[] getSearchPaths() {
- return searchpaths;
- }
-
- public void setSearchPaths(SearchpathEntry[] searchpaths) {
- this.searchpaths = searchpaths;
- }
-
- public boolean isExported() {
- return isExported;
- }
-
- public void setIsExported(boolean isExported) {
- this.isExported = isExported;
- }
-
- public Node writeEntry(Document doc, IProject project) {
-
- Element element = doc.createElement(sBeaninfo);
- IPath path = null;
- if (entry != null) {
- element.setAttribute(BeaninfosDoc.sKind, kindToString(entry.getEntryKind()));
- path = entry.getPath();
- if (entry.getEntryKind() != IClasspathEntry.CPE_VARIABLE && entry.getEntryKind() != IClasspathEntry.CPE_CONTAINER) {
- // translate to project relative from absolute (unless a device path)
- if (path.isAbsolute()) {
- if (path.segment(0).equals(project.getFullPath().segment(0))) {
- path = path.removeFirstSegments(1);
- path = path.makeRelative();
- } else {
- path = path.makeAbsolute();
- }
- }
- }
- } else {
- element.setAttribute(BeaninfosDoc.sKind, kindToString(BIE_PLUGIN));
- path = pluginPath;
- }
-
- element.setAttribute(BeaninfosDoc.sPath, path.toString()); //$NON-NLS-1$
- if (isExported()) {
- element.setAttribute(BeaninfosDoc.sExported, "true"); //$NON-NLS-1$
- }
-
- for (int i = 0; i < searchpaths.length; i++) {
- SearchpathEntry spe = searchpaths[i];
- element.appendChild(spe.writeEntry(doc, project));
- }
-
- return element;
- }
-
- /**
- * If this is not a plugin info, then return the classpath entry.
- */
- public IClasspathEntry getClasspathEntry() {
- return entry;
- }
-
- /**
- * Return the resolved classpaths. Each entry in the array will be either:
- * 1) IProject - If it is a project type entry. Want the whole project
- * 2) String - an absolute external path to a jar
- * 3) IPath - a path to a plugin jar. The first segment is the plugin id, the rest is the path relative to that plugin.
- *
- *
- * @param javaProject
- * @return The array of paths, or <code>null</code> if no paths.
- *
- * @since 1.0.0
- */
- public Object[] getClasspath(IJavaProject javaProject) {
- if (entry != null) {
- // It is a standard CPE Entry.
- IWorkspaceRoot root = ResourcesPlugin.getWorkspace().getRoot();
- List paths = new ArrayList(1);
- IClasspathEntry resolvedEntry = JavaCore.getResolvedClasspathEntry(entry);
- resolveEntry(root, paths, resolvedEntry, javaProject);
- return paths.toArray();
- } else if (pluginPath != null)
- return new Object[] {pluginPath};
-
- return null;
-
- }
-
- private void resolveEntry(IWorkspaceRoot root, List paths, IClasspathEntry entry, IJavaProject javaProject) {
- switch (entry.getEntryKind()) {
- case IClasspathEntry.CPE_PROJECT :
- IProject reqProject = (IProject) root.findMember(entry.getPath().lastSegment());
- // Project entries only have one segment.
- if (reqProject != null && reqProject.isOpen())
- paths.add(reqProject);
- break;
-
- case IClasspathEntry.CPE_SOURCE :
- reqProject = (IProject) root.findMember(entry.getPath().segment(0));
- // Find project from the first segment.
- IJavaProject jProject = JavaCore.create(reqProject);
- if (jProject != null) {
- try {
- IPath outputLocation = jProject.getOutputLocation();
- IResource resource = root.findMember(outputLocation);
- if (resource != null) {
- paths.add(resource.getLocation().toString());
- }
- } catch(JavaModelException e) {
- }
- }
- break;
-
- case IClasspathEntry.CPE_LIBRARY :
- IResource library = root.findMember(entry.getPath());
- // can be external or in workspace
- paths.add((library != null) ? library.getLocation().toString() : entry.getPath().toString());
- break;
-
- case IClasspathEntry.CPE_CONTAINER:
- try {
- IClasspathContainer container = JavaCore.getClasspathContainer(entry.getPath(), javaProject);
- if (container != null) {
- IClasspathEntry[] entries = container.getClasspathEntries();
- for (int i = 0; i < entries.length; i++) {
- resolveEntry(root, paths, entries[i], javaProject);
- }
- }
- } catch (JavaModelException e) {
- BeaninfoPlugin.getPlugin().getLogger().log(e, Level.WARNING);
- }
- }
- }
-
- public int getKind() {
- return entry != null ? entry.getEntryKind() : BIE_PLUGIN;
- }
-
- public IPath getPath() {
- return entry != null ? entry.getPath() : pluginPath;
- }
-
- public boolean equals(Object other) {
- if (this == other)
- return true;
-
- if (!(other instanceof BeaninfoEntry))
- return false;
-
- // Return equal if the classpath entry is the same classpath entry or plugin path entry.
- // The search path doesn't have any affect on the semantic equality.
- BeaninfoEntry otherEntry = (BeaninfoEntry) other;
- if (isExported != otherEntry.isExported)
- return false;
- if (entry != null)
- return entry.equals(otherEntry.entry);
-
- return pluginPath.equals(otherEntry.pluginPath);
- }
-
- public int hashCode() {
- if (entry != null)
- return entry.hashCode() ^ (isExported ? Boolean.TRUE : Boolean.FALSE).hashCode();
- else
- return pluginPath.hashCode() ^ (isExported ? Boolean.TRUE : Boolean.FALSE).hashCode();
- }
-
-}
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
deleted file mode 100644
index 55512ec..0000000
--- a/plugins/org.eclipse.jem.beaninfo/beaninfo/org/eclipse/jem/internal/beaninfo/core/BeaninfoPlugin.java
+++ /dev/null
@@ -1,752 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2001, 2006 IBM Corporation and others.
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
- *
- * Contributors:
- * IBM Corporation - initial API and implementation
- *******************************************************************************/
-package org.eclipse.jem.internal.beaninfo.core;
-/*
-
-
- */
-
-
-import java.util.*;
-import java.util.Map.Entry;
-import java.util.logging.Level;
-import java.util.regex.Pattern;
-
-import org.eclipse.core.resources.IProject;
-import org.eclipse.core.runtime.*;
-import org.eclipse.emf.common.util.URI;
-import org.eclipse.emf.ecore.resource.Resource;
-import org.eclipse.emf.ecore.resource.ResourceSet;
-import org.eclipse.jdt.core.IClasspathContainer;
-import org.eclipse.jdt.core.JavaCore;
-import org.osgi.framework.Bundle;
-import org.osgi.framework.BundleContext;
-
-import org.eclipse.jem.internal.beaninfo.adapters.BeaninfoNature;
-import org.eclipse.jem.internal.proxy.core.*;
-import org.eclipse.jem.internal.proxy.core.ContainerPathContributionMapping.ContainerContributionEntry;
-import org.eclipse.jem.internal.proxy.core.IConfigurationContributionInfo.ContainerPaths;
-import org.eclipse.jem.java.JavaClass;
-import org.eclipse.jem.util.logger.proxy.Logger;
-import org.eclipse.jem.util.logger.proxyrender.EclipseLogger;
-import org.eclipse.jem.util.plugin.JEMUtilPlugin;
-
-
-/**
- * The plugin class for the org.eclipse.jem.internal.proxy.core plugin.
- */
-
-public class BeaninfoPlugin extends Plugin {
- public static final String PI_BEANINFO_PLUGINID = "org.eclipse.jem.beaninfo"; // Plugin ID, used for QualifiedName. //$NON-NLS-1$
- public static final String PI_BEANINFO_OVERRIDES = "overrides"; // ID of the overrides extension point. //$NON-NLS-1$
-
- private static BeaninfoPlugin BEANINFO_PLUGIN = null;
-
- public BeaninfoPlugin() {
- BEANINFO_PLUGIN = this;
- }
-
- /**
- * Accessor method to get the singleton plugin.
- */
- public static BeaninfoPlugin getPlugin() {
- return BEANINFO_PLUGIN;
- }
-
- /**
- * Special Override file name used when need to apply an override to a class that is at the root.
- * A root is one that doesn't have a super type. These are <code>java.lang.Object</code>, interfaces, and any
- * undefined classes (i.e. classes that don't actually exist).
- */
- public static final String ROOT = "..ROOT.."; //$NON-NLS-1$
-
-
- /**
- * Special override scheme to refer to the current java class. (As in "X:ROOT#//@root").
- * @since 1.2.0
- */
- public static final String ROOT_SCHEMA = "X"; //$NON-NLS-1$
-
- /**
- * Special override opaque part to refer to the current java class. (As in "X:ROOT#//@root").
- * @since 1.2.0
- */
- public static final String ROOT_OPAQUE = "ROOT"; //$NON-NLS-1$
-
- /**
- * The extension used on any override file when you pass in a path through the method that takes a string.
- */
- public static final String OVERRIDE_EXTENSION = "override"; //$NON-NLS-1$
-
-
- /*
- * Map of open natures. This map is needed because on shutdown of beaninfo plugin we need
- * to shutdown the natures. If we don't do that there is a slight possibility of an error
- * because proxy plugin will shutdown and this can cause a callback into beaninfo which has
- * already been shutdown. It calls back through the registry listener that BeaninfoNature
- * added to the registry to notify that the registry is being shutdown.
- *
- * Also BeanInfoCacheController needs to know so that it can tell it the project is closing or
- * being deleted or that it needs to be cleared due to a clear request.
- */
- private Map openNatures;
-
- private ContainerPathContributionMapping beaninfoEntryContributionsMapping;
- private ContainerPathContributionMapping contributorContributionsMapping;
- private Map pluginToBeaninfoEntryContributions;
- private Map pluginToContributors;
-
- /*
- * Override contributions from extension point.
- * ocFragments: Array of fragments paths. When a match is found for a path, the index
- * is the index into the ocContainerIds and ocPluginIds array for the contributions.
- * ocContainerIds: The first dimension is the index of the fragment that the list of OverrideContributions is for.
- * The second dimension is the array of contributions for that fragment, one per container id.
- * ocPluginIds: The first dimension is the index of the fragment that the list of OverrideContributions is for.
- * The second dimension is the array of contributions for that fragment, one per plugin id.
- *
- * If a particular fragment doesn't have any entries of container and/or plugin, then EMPTY_OC is used for that
- * entry so that we don't need to check for null.
- *
- * How this is used is for a particular path requested, the ocFragments will be searched for the fragments that
- * are appropriate, then the index of the entry is used to walk through the OC[] array returned from the ocContainerIds
- * or ocPluginIds. Each contribution would be checked to see if the container id/plugin id is in the visible classpath (through
- * the info data stored in the persistent property). If it is, then the overrides from that contribution will be used.
- */
- private IPath ocFragments[];
- private OverrideContribution[][] ocContainerIds;
- private OverrideContribution[][] ocPluginIds;
-
- private static final OverrideContribution[] EMPTY_OC = new OverrideContribution[0]; // Used for an empty contribution list for a fragment.
-
- public synchronized BeaninfoEntry[] getContainerIdBeanInfos(String containerID, String[] containerPaths) {
- if (beaninfoEntryContributionsMapping == null)
- processBeanInfoContributionExtensionPoint();
- return (BeaninfoEntry[]) beaninfoEntryContributionsMapping.getContributors(containerID, containerPaths);
- }
-
- public synchronized BeaninfoEntry[] getPluginBeanInfos(String pluginid) {
- if (pluginToBeaninfoEntryContributions == null)
- processBeanInfoContributionExtensionPoint();
- return (BeaninfoEntry[]) pluginToBeaninfoEntryContributions.get(pluginid);
- }
-
- public synchronized IConfigurationElement[] getPluginContributors(String pluginid) {
- if (pluginToContributors == null)
- processBeanInfoContributionExtensionPoint();
- return (IConfigurationElement[]) pluginToContributors.get(pluginid);
- }
-
- public synchronized IConfigurationElement[] getContainerIdContributors(String containerID, String[] containerPaths) {
- if (contributorContributionsMapping == null)
- processBeanInfoContributionExtensionPoint();
- return (IConfigurationElement[]) contributorContributionsMapping.getContributors(containerID, containerPaths);
- }
-
- public static final String PI_BEANINFO_CONTRIBUTION_EXTENSION_POINT = PI_BEANINFO_PLUGINID+".registrations"; //$NON-NLS-1$
- public static final String PI_REGISTRATION = "registration"; //$NON-NLS-1$
- public static final String PI_BEANINFO = "beaninfo"; //$NON-NLS-1$
- public static final String PI_OVERRIDE = "override"; //$NON-NLS-1$
- public static final String PI_CONTRIBUTOR = "contributor"; //$NON-NLS-1$
- public static final String PI_PACKAGE = "package"; //$NON-NLS-1$
- public static final String PI_PATH = "path"; //$NON-NLS-1$
-
- protected synchronized void processBeanInfoContributionExtensionPoint() {
- ContributorExtensionPointInfo info = ProxyPlugin.processContributionExtensionPoint(PI_BEANINFO_CONTRIBUTION_EXTENSION_POINT);
- ConfigurationElementReader reader = new ConfigurationElementReader();
- // Process the container IDs first. We can't use the info directly because the actual configuration elements of interest are
- // sub-elements of the info. The info contains the container path that we need.
- beaninfoEntryContributionsMapping = new ContainerPathContributionMapping(BeaninfoEntry.class);
- contributorContributionsMapping = new ContainerPathContributionMapping(IConfigurationElement.class);
-
- Map fragmentsToIds = new HashMap();
- for (Iterator iter = info.containerPathContributions.containerIdToContributions.entrySet().iterator(); iter.hasNext();) {
- Map.Entry entry= (Map.Entry) iter.next();
- String containerid = (String) entry.getKey();
- ContainerContributionEntry[] contribElements = (ContainerContributionEntry[]) entry.getValue();
- for (int i = 0; i < contribElements.length; i++) {
- ContainerContributionEntry contribElement = contribElements[i];
- IConfigurationElement element = (IConfigurationElement) contribElement.getContribution();
- if (PI_REGISTRATION.equals(element.getName())) {
- IConfigurationElement[] children = element.getChildren();
- for (int j = 0; j < children.length; j++) {
- IConfigurationElement child = children[j];
- if (PI_BEANINFO.equals(child.getName())) {
- // This is a beaninfo entry
- BeaninfoEntry be = BeaninfoEntry.readEntry(reader, child, null);
- if (be != null)
- beaninfoEntryContributionsMapping.addContribution(containerid, contribElement.getContainerPathPattern(), be);
- } else if (PI_OVERRIDE.equals(child.getName())) {
- addOverrideEntry(fragmentsToIds, true, containerid, contribElement.getContainerPathPattern(), child);
- }
- }
- } else if (PI_CONTRIBUTOR.equals(element.getName())) {
- contributorContributionsMapping.addContribution(containerid, contribElement.getContainerPathPattern(), element);
- }
- }
- }
-
- beaninfoEntryContributionsMapping.finalizeMapping();
- contributorContributionsMapping.finalizeMapping();
-
- // Now process the plugin IDs.
- pluginToBeaninfoEntryContributions = new HashMap(info.pluginToContributions.size());
- for (Iterator iter = info.pluginToContributions.entrySet().iterator(); iter.hasNext();) {
- Map.Entry entry= (Map.Entry) iter.next();
- String pluginId = (String) entry.getKey();
- IConfigurationElement[] configElements = (IConfigurationElement[]) entry.getValue();
- for (int i = 0; i < configElements.length; i++) {
- IConfigurationElement element = configElements[i];
- if (PI_REGISTRATION.equals(element.getName())) {
- IConfigurationElement[] children = element.getChildren();
- for (int j = 0; j < children.length; j++) {
- IConfigurationElement child = children[j];
- if (PI_BEANINFO.equals(child.getName())) {
- // This is a beaninfo entry
- BeaninfoEntry be = BeaninfoEntry.readEntry(reader, child, null);
- if (be != null)
- addEntry(pluginToBeaninfoEntryContributions, pluginId, be);
- } else if (PI_OVERRIDE.equals(child.getName())) {
- addOverrideEntry(fragmentsToIds, false, pluginId, null, child);
- }
- }
- } else if (PI_CONTRIBUTOR.equals(element.getName())) {
- if (pluginToContributors == null)
- pluginToContributors = new HashMap(5); // These are rare, don't create until necessary.
- addEntry(pluginToContributors, pluginId, element);
- }
- }
- }
-
- // Now go through and turn all of the contribution lists into arrays.
- for (Iterator iter = pluginToBeaninfoEntryContributions.entrySet().iterator(); iter.hasNext();) {
- Map.Entry entry = (Map.Entry) iter.next();
- entry.setValue(((List) entry.getValue()).toArray(new BeaninfoEntry[((List) entry.getValue()).size()]));
- }
-
- if (pluginToContributors == null)
- pluginToContributors = Collections.EMPTY_MAP; // Since we don't have any.
- else {
- for (Iterator iter = pluginToContributors.entrySet().iterator(); iter.hasNext();) {
- Map.Entry entry = (Map.Entry) iter.next();
- entry.setValue(((List) entry.getValue()).toArray(new IConfigurationElement[((List) entry.getValue()).size()]));
- }
- }
-
- // Now handle the entire list of fragments.
- ocFragments = new IPath[fragmentsToIds.size()];
- ocContainerIds = new OverrideContribution[ocFragments.length][];
- ocPluginIds = new OverrideContribution[ocFragments.length][];
- Iterator iter;
- int fragIndex;
- for (iter = fragmentsToIds.entrySet().iterator(), fragIndex=0; iter.hasNext(); fragIndex++) {
- Map.Entry mapEntry = (Map.Entry) iter.next();
- ocFragments[fragIndex] = (IPath) mapEntry.getKey();
- Map[] mapValue = (Map[]) mapEntry.getValue();
- if (mapValue[0] == null)
- ocContainerIds[fragIndex] = EMPTY_OC;
- else {
- Map containers = mapValue[0];
- List ocContributions = new ArrayList();
- for (Iterator ocIterator = containers.entrySet().iterator(); ocIterator.hasNext();) {
- Map.Entry containerEntry = (Map.Entry) ocIterator.next();
- String containerID = (String) containerEntry.getKey();
- for (Iterator patternIterator = ((Map) containerEntry.getValue()).entrySet().iterator(); patternIterator.hasNext();) {
- Map.Entry patternEntry = (Entry) patternIterator.next();
- OverrideContribution oc = new OverrideContribution();
- oc.id = containerID;
- oc.pattern = (Pattern) patternEntry.getKey();
- List[] ocLists = (List[]) patternEntry.getValue();
- oc.pluginIds = (String[]) ocLists[0].toArray(new String[ocLists[0].size()]);
- oc.paths = (String[]) ocLists[1].toArray(new String[ocLists[1].size()]);
- ocContributions.add(oc);
- }
- }
- ocContainerIds[fragIndex] = (OverrideContribution[]) ocContributions.toArray(new OverrideContribution[ocContributions.size()]);
- }
- if (mapValue[1] == null)
- ocPluginIds[fragIndex] = EMPTY_OC;
- else {
- Map plugins = mapValue[1];
- OverrideContribution[] ocContribution = ocPluginIds[fragIndex] = new OverrideContribution[plugins.size()];
- int ocIndex;
- Iterator ocIterator;
- for (ocIterator = plugins.entrySet().iterator(), ocIndex=0; ocIterator.hasNext(); ocIndex++) {
- Map.Entry pluginEntry = (Map.Entry) ocIterator.next();
- OverrideContribution oc = ocContribution[ocIndex] = new OverrideContribution();
- oc.id = (String) pluginEntry.getKey();
- List[] ocLists = (List[]) pluginEntry.getValue();
- oc.pluginIds = (String[]) ocLists[0].toArray(new String[ocLists[0].size()]);
- oc.paths = (String[]) ocLists[1].toArray(new String[ocLists[1].size()]);
- }
- }
- }
- }
-
- /*
- * Add an entry to the map. If the key doesn't exist, create an entry as an array. Then add the entry to array.
- */
- private void addEntry(Map map, Object key, Object entry) {
- List mapEntry = (List) map.get(key);
- if (mapEntry == null) {
- mapEntry = new ArrayList(1);
- map.put(key, mapEntry);
- }
- mapEntry.add(entry);
- }
-
- /*
- * Add an entry to the map.
- * id is the container path pattern/plugin id.
- *
- * The structure of the map is:
- * key: fragment name
- * value: Map[2], where [0] is for container id, and [1] is for plugin ids.
- * Map[x]:
- * key: container/plugin id
- * value: Map(pattern->List(FinalOverride)) for container, of FinalOverride for plugin.
- *
- * FinalOverride: List[2], where [0] is list of plugin ids for the override, and [1] is list of paths for the override files relative to that plugin id.
- *
- * After all done these maps/list will be boiled down to the arrays that will be used for lookup.
- */
- private void addOverrideEntry(Map map, boolean container, Object id, Pattern pattern, IConfigurationElement entry) {
-
- String packageName = entry.getAttribute(PI_PACKAGE);
- String plugin = null;
- String pathString = entry.getAttribute(PI_PATH);
- IPath fragment = null;
- if (packageName != null && packageName.length() > 0 && pathString != null && pathString.length() > 0) {
- fragment = new Path(packageName.replace('.', '/'));
- if (pathString.charAt(pathString.length()-1) != '/')
- pathString += '/';
- if (pathString.charAt(0) != '/')
- plugin = entry.getDeclaringExtension().getContributor().getName();
- else {
- if (pathString.length() > 4) {
- int pend = pathString.indexOf('/', 1);
- if (pend == -1 || pend >= pathString.length()-1)
- return; // invalid
- plugin = pathString.substring(1, pend);
- pathString = pathString.substring(pend+1);
- } else
- return; // invalid
- }
- }
- if (pathString.length() < 2)
- return; // invalid
-
- Map[] mapEntry = (Map[]) map.get(fragment);
- if (mapEntry == null) {
- mapEntry = new HashMap[2];
- map.put(fragment, mapEntry);
- }
- List[] idEntry;
- if (container) {
- if (mapEntry[0] == null)
- mapEntry[0] = new HashMap(2);
-
- Map patternMap = (Map) mapEntry[0].get(id);
- if (patternMap == null)
- mapEntry[0].put(id, patternMap = new HashMap());
-
- idEntry = (List[]) patternMap.get(pattern);
- if (idEntry == null) {
- patternMap.put(pattern, idEntry = new List[] { new ArrayList(1), new ArrayList(1)});
- }
- } else {
- if (mapEntry[1] == null)
- mapEntry[1] = new HashMap(2);
-
- idEntry = (List[]) mapEntry[1].get(id);
- if (idEntry == null) {
- mapEntry[1].put(id, idEntry = new List[] { new ArrayList(1), new ArrayList(1)});
- }
- }
- idEntry[0].add(plugin);
- idEntry[1].add(pathString);
-
-
- }
-
- /*
- * This is an list of overrides that are available as a contribution for a specific fragment.
- * <ul>
- * <li>The id of this contribution. Either container (Pattern) or plugin id depending on which list it was in..
- * <li>The plugins array lists the plugin ids for all of the paths in this contribution.
- * <li>The paths array lists the folder path under that corresponding plugin from "pluginIds".
- * </ul>
- * <p>
- *
- * @since 1.0.0
- */
- private static class OverrideContribution {
- public String id;
- public Pattern pattern; // Used only for containers.
- public String[] pluginIds;
- public String[] paths;
- }
-
- /**
- * The runnable is to used to apply override.
- * <p>
- * This will be called in sequence for each override path found. It is send in on the apply overrides call. This
- * interface implementation is private.
- * <p>
- * Clients (implementers of the IBeanInfoContributor) will be passed in the subinterface <code>IContributorOverrideRunnable</code> which
- * inherits from this interface.
- * <p>
- * This interface is not intended to be implemented by clients.
- *
- * @since 1.0.0
- * @see BeaninfoPlugin#applyOverrides(IProject, String, String, ResourceSet, IOverrideRunnable)
- */
- public interface IOverrideRunnable {
- /**
- * This will be called with the directory path to use. It will be called over and over for every
- * override path found for a package. The path will be complete, including trailing '/'.
- * It will be in a URI format for a directory. The overriderunnable implementation will then append the filename call (i.e. classbeingintrospected.override) to get a complete path.
- * <p>
- * Clients (IBeanInfoContributor implementers) can call this to apply a specific override file to the current
- * class being processed.
- *
- * @param overridePath the path will be complete, including trailing '/'. It will be in a URI format for a directory. The override file name (classname.override) will be appended to this and retrieved and applied.
- *
- * @since 1.0.0
- */
- public void run(String overridePath);
-
- /**
- * This will be called with the actual resource to use. This will be called by special contributors that want
- * a special explicit override resource to be used.
- * <p>
- * Contributors should use the ResourceSet that was passed into them. This is so that anything java class that
- * the override resource points to will be found.
- * <p>
- * This resource will be automatically removed by BeanInfo after being applied. It must not be left around because
- * in the process of being applied it will be modified, so it could not be reused.
- *
- * @param overrideResource the resource to apply to the current class. NOTE: This resource WILL be removed from
- * the resource set it is in automatically by this call. It won't be left around because the action of apply
- * will actually modify the resource.
- *
- * @since 1.0.0
- */
- public void run(Resource overrideRes);
- }
-
- /**
- * IBeanInfoContributor runnable to use to apply overrides.
- * <p>
- * An implementation of this will be passed in to IBeanInfoContributor's so that they can call back to apply the overrides. They
- * should call the appropriate run method once for each override to be applied. The run can be called more than once from each IBeanInfoContributor.
- * <p>
- * It inherits from <code>IOverrideRunnable</code>, so see that for more methods to call.
- * <p>
- * This interface is not intended to be implemented by clients.
- *
- * @see BeaninfoPlugin.IOverrideRunnable for more methods that can be called.
- * @since 1.0.0
- */
- public interface IContributorOverrideRunnable extends IOverrideRunnable {
-
- /**
- * Tests if path has already been contributed once for the current class.
- * <p>
- * This can be called by the IBeanInfoContributor for overrides to test if the path (same path as for the IOverrideRunnable.run(String) method)
- * has already been contributed once for this class. It can be used to save time. However it is not necessary because
- * BeanInfo will not permit it to be contributed more than once for a class.
- *
- * @param path
- * @return <code>true</code> if used already.
- *
- * @see IOverrideRunnable#run(String)
- * @since 1.0.0
- */
- public boolean pathContributed(String path);
-
- /**
- * Tests if the URI has already been contributed once for the current class.
- * <p>
- * This can be called by an IBeanInfoContributor for overrides to see if the URI (same path as the URI from the IOverrideRunnable.run(Resource) method)
- * has already been contributed once for this class. It can be used to save time. However, not necessary because
- * BeanInfo will not permit the URI to be contributed more than once for a class.
- *
- * @param resourceURI
- * @return <code>true</code> if used already.
- *
- * @see IOverrideRunnable#run(Resource)
- * @since 1.0.0
- */
- public boolean resourceContributed(URI resourceURI);
- }
-
- private static final String[] NO_PATHS = new String[0];
-
- /**
- * Return just the contributed override paths (through the BeanInfo registrations). Does not include any paths that are contributed from
- * IBeanInfoContributor's. This is used by the BeanInfoClassAdapter to load the overrides files into one cache file so that it can
- * be done at one time the next time it is needed.
- *
- * @param project
- * @param packageName
- * @return array of path strings to the override. The files may not exist, they is just possible overrides.
- *
- * @since 1.1.0
- */
- public String[] getOverridePaths(IProject project, String packageName) {
- final IPath packagePath = new Path(packageName.replace('.', '/')+'/');
- List overridePaths = new ArrayList();
- try {
- IConfigurationContributionInfo info = (IConfigurationContributionInfo) project.getSessionProperty(BeaninfoNature.CONFIG_INFO_SESSION_KEY);
- if (info == null) {
- // It hasn't been created yet, so we need to create our own internal version here.
- info = ProxyLaunchSupport.createDefaultConfigurationContributionInfo(JavaCore.create(project));
- BeaninfoNature.computeBeanInfoConfigInfo(info);
- }
- synchronized (this) {
- if (ocFragments == null)
- processBeanInfoContributionExtensionPoint(); // We haven't processed them yet.
- }
-
- // Cache of tested patterns. (Pattern->Boolean). If a pattern has been tested against all visible container paths we don't need to test the
- // pattern again if it is found again. (Note: This works for efficiency because ProxyPlugin uses the same pattern instance for
- // same pattern found while processing one extension point). The value is true if the pattern matches a visible container path.
- Map testedPatterns = new HashMap();
- for (int fragmentIndex = 0; fragmentIndex < ocFragments.length; fragmentIndex++) {
- if (ocFragments[fragmentIndex].isPrefixOf(packagePath)) {
- String leftOver = null; // The left over portion of the package. This will be set first time needed.
- OverrideContribution[] cntrContributions = ocContainerIds[fragmentIndex];
- for (int ocindex = 0; ocindex < cntrContributions.length; ocindex++) {
- OverrideContribution contribution = cntrContributions[ocindex];
- Boolean tested = (Boolean) testedPatterns.get(contribution.pattern);
- if (tested == null) {
- tested = Boolean.FALSE;
- ContainerPaths containerPaths = (ContainerPaths) info.getContainerIds().get(contribution.id);
- if (containerPaths != null) {
- String[] visible = containerPaths.getVisibleContainerPaths();
- for (int i = 0; i < visible.length; i++) {
- if (contribution.pattern.matcher(visible[i]).matches()) {
- tested = Boolean.TRUE;
- break;
- }
- }
- }
- testedPatterns.put(contribution.pattern, tested);
- }
-
- if (tested.booleanValue()) {
- for (int cindex = 0; cindex < contribution.pluginIds.length; cindex++) {
- // Because of URIConverters and normalization in org.eclipse.jem.util stuff, we
- // need to have plugin uri's in the form "platform:/plugin/pluginname".
- // Bundle's don't return this format. They return bundle:/stuff
- // So we will simple create it of the platform:/plugin format.
- // To save time, we will first see if we have the bundle.
- Bundle bundle = Platform.getBundle(contribution.pluginIds[cindex]);
- if (bundle != null) {
- if (leftOver == null)
- leftOver = getLeftOver(ocFragments[fragmentIndex], packagePath);
- overridePaths.add(JEMUtilPlugin.PLATFORM_PROTOCOL+":/"+JEMUtilPlugin.PLATFORM_PLUGIN+'/'+bundle.getSymbolicName()+'/'+contribution.paths[cindex]+leftOver); //$NON-NLS-1$
- }
- }
- }
- }
-
- OverrideContribution[] pluginContributions = ocPluginIds[fragmentIndex];
- for (int ocindex = 0; ocindex < pluginContributions.length; ocindex++) {
- OverrideContribution contribution = pluginContributions[ocindex];
- Boolean visible = (Boolean) info.getPluginIds().get(contribution.id);
- if (visible != null && visible.booleanValue()) {
- for (int cindex = 0; cindex < contribution.pluginIds.length; cindex++) {
- Bundle bundle = Platform.getBundle(contribution.pluginIds[cindex]);
- if (bundle != null) {
- if (leftOver == null)
- leftOver = getLeftOver(ocFragments[fragmentIndex], packagePath);
- overridePaths.add(JEMUtilPlugin.PLATFORM_PROTOCOL+":/"+JEMUtilPlugin.PLATFORM_PLUGIN+'/'+bundle.getSymbolicName()+'/'+contribution.paths[cindex]+leftOver); //$NON-NLS-1$
- }
- }
- }
- }
- }
- }
- } catch (CoreException e) {
- getLogger().log(e, Level.INFO);
- }
- return overridePaths.isEmpty() ? NO_PATHS : (String[]) overridePaths.toArray(new String[overridePaths.size()]);
- }
-
- /**
- * Apply the runnable to all of the override paths that are applicable to the
- * given package name. It will run through the explicit contributors and the IContainers that implement IBeanInfoContributor.
- * <p>
- * The package name uses '.' to delineate the fragments of the name,
- * i.e. use "<code>java.lang</code>" as a package name.
- * <p>
- * Note: This is not meant to be called by clients. It is public only because an internal class in another package needs to call it.
- * TODO This should be package-protected. Later the other class will be moved into this package.
- *
- * @param project the project to run against.
- * @param packageName
- * @param className class name of the class that is being overridden.
- * @param javaClass the java class the overrides will be applied to.
- * @param resource set that contributors can use to temporarily load dynamic override files.
- * @param runnable use this runnable to actually apply overrides.
- *
- * @since 1.0.0
- */
- public void applyOverrides(final IProject project, String packageName, final String className, final JavaClass javaClass, final ResourceSet rset, final IOverrideRunnable runnable) {
- final IPath packagePath = new Path(packageName.replace('.', '/')+'/');
- try {
- IConfigurationContributionInfo info = (IConfigurationContributionInfo) project.getSessionProperty(BeaninfoNature.CONFIG_INFO_SESSION_KEY);
- if (info == null) {
- // It hasn't been created yet, so we need to create our own internal version here.
- info = ProxyLaunchSupport.createDefaultConfigurationContributionInfo(JavaCore.create(project));
- BeaninfoNature.computeBeanInfoConfigInfo(info);
- }
- final IBeanInfoContributor[] explicitContributors = (IBeanInfoContributor[]) project.getSessionProperty(BeaninfoNature.BEANINFO_CONTRIBUTORS_SESSION_KEY);
- synchronized (this) {
- if (ocFragments == null)
- processBeanInfoContributionExtensionPoint(); // We haven't processed them yet.
- }
-
- final Set usedPaths = new HashSet(10); // Set of used paths. So that the contributors don't supply a path already used. This could cause problems if they did.
- final IContributorOverrideRunnable contribRunnable = new IContributorOverrideRunnable() {
- public void run(String overridePath) {
- if (!usedPaths.contains(overridePath)) {
- usedPaths.add(overridePath);
- runnable.run(overridePath);
- }
- }
-
- public void run(Resource overrideRes) {
- if (!usedPaths.contains(overrideRes.getURI())) {
- usedPaths.add(overrideRes.getURI());
- try {
- runnable.run(overrideRes);
- } finally {
- overrideRes.getResourceSet().getResources().remove(overrideRes);
- }
- }
- }
-
- public boolean pathContributed(String path) {
- return usedPaths.contains(path);
- }
-
- public boolean resourceContributed(URI resourceURI) {
- return usedPaths.contains(resourceURI);
- }
- };
-
- // Run through the containers that implement IBeanInfoContributor.
- for (Iterator iter = info.getContainers().entrySet().iterator(); iter.hasNext();) {
- Map.Entry mapEntry = (Map.Entry) iter.next();
- final IClasspathContainer container = (IClasspathContainer) mapEntry.getKey();
- if (container instanceof IBeanInfoContributor && ((Boolean) mapEntry.getValue()).booleanValue()) {
- SafeRunner.run(new ISafeRunnable() {
- public void handleException(Throwable exception) {
- // Standard run logs to .log
- }
- public void run() throws Exception {
- ((IBeanInfoContributor) container).runOverrides(packagePath, className, javaClass, rset, contribRunnable);
- }
- });
- }
- }
-
- // Run through the explicit contributors.
- for (int i=0; i<explicitContributors.length; i++) {
- final int ii = i;
- SafeRunner.run(new ISafeRunnable() {
- public void handleException(Throwable exception) {
- // Standard run logs to .log
- }
- public void run() throws Exception {
- explicitContributors[ii].runOverrides(packagePath, className, javaClass, rset, contribRunnable);
- }
- });
- }
- } catch (CoreException e) {
- getLogger().log(e, Level.INFO);
- }
- }
-
- private String getLeftOver(IPath fragment, IPath packagePath) {
- return packagePath.removeFirstSegments(fragment.segmentCount()).toString();
- }
-
- private Logger logger;
- public Logger getLogger() {
- if (logger == null)
- logger = EclipseLogger.getEclipseLogger(this);
- return logger;
- }
-
- /**
- * Add that a BeanInfo nature is active. This is used to tell it to shutdown when beaninfo shuts down.
- * TODO <package-protected> because only BeanInfoNature should call it. (public for now but when we make
- * BeanInfoNature an API it will be moved into the same package as BeanInfoPlugin).
- *
- * @param nature
- *
- * @since 1.0.0
- */
- public void addBeanInfoNature(BeaninfoNature nature) {
- if (openNatures == null)
- openNatures = new HashMap();
- openNatures.put(nature.getProject(), nature);
- }
-
- /**
- * Mark that a BeanInfo nature is not active. This is used to tell it to shutdown when beaninfo shuts down.
- * TODO <package-protected> because only BeanInfoNature should call it. (public for now but when we make
- * BeanInfoNature an API it will be moved into the same package as BeanInfoPlugin).
- *
- * @param nature
- *
- * @since 1.0.0
- */
- public void removeBeanInfoNature(BeaninfoNature nature) {
- if (openNatures != null)
- openNatures.remove(nature.getProject());
- }
-
- /**
- * Return the registered nature, if any, for the project. This will not cause the
- * nature to be created.
- * <p>
- * <package-protected> because only BeanInfoCacheController should access it.
- * @param project
- * @return nature for project or <code>null</code> if not registered.
- *
- * @since 1.1.0
- */
- BeaninfoNature getNature(IProject project) {
- return (BeaninfoNature) openNatures.get(project);
- }
-
-
- /* (non-Javadoc)
- * @see org.eclipse.core.runtime.Plugin#stop(org.osgi.framework.BundleContext)
- */
- public void stop(BundleContext context) throws Exception {
- if (openNatures != null && !openNatures.isEmpty()) {
- for (Iterator natureItr = openNatures.values().iterator(); natureItr.hasNext();) {
- BeaninfoNature nature = (BeaninfoNature) natureItr.next();
- nature.shutdown();
- }
- }
-
- super.stop(context);
- }
-}
-
-
diff --git a/plugins/org.eclipse.jem.beaninfo/beaninfo/org/eclipse/jem/internal/beaninfo/core/BeaninfoRegistration.java b/plugins/org.eclipse.jem.beaninfo/beaninfo/org/eclipse/jem/internal/beaninfo/core/BeaninfoRegistration.java
deleted file mode 100644
index d8cb816..0000000
--- a/plugins/org.eclipse.jem.beaninfo/beaninfo/org/eclipse/jem/internal/beaninfo/core/BeaninfoRegistration.java
+++ /dev/null
@@ -1,79 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2001, 2005 IBM Corporation and others.
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
- *
- * Contributors:
- * IBM Corporation - initial API and implementation
- *******************************************************************************/
-package org.eclipse.jem.internal.beaninfo.core;
-/*
-
-
- */
-
-import org.eclipse.core.runtime.IConfigurationElement;
-
-/**
- * This is the registration information for registered beaninfos in the BeaninfoPlugin.
- * @version 1.0
- * @author
- */
-public class BeaninfoRegistration {
-
- protected BeaninfosDoc doc;
- protected IConfigurationElement variableElement; // This is used to get contributor element. If null, then no contributor.
-
- public BeaninfoRegistration() {
- }
-
- /**
- * Construct with a BeaninfosDoc
- */
- public BeaninfoRegistration(BeaninfosDoc doc) {
- this.doc = doc;
- }
-
- /**
- * Construct with a BeaninfosDoc and variable element.
- */
- public BeaninfoRegistration(BeaninfosDoc doc, IConfigurationElement variableElement) {
- this.doc = doc;
- this.variableElement = variableElement;
- }
-
- /**
- * Gets the doc.
- * @return Returns a BeaninfosDoc
- */
- public BeaninfosDoc getDoc() {
- return doc;
- }
-
- /**
- * Sets the doc.
- * @param doc The doc to set
- */
- public void setDoc(BeaninfosDoc doc) {
- this.doc = doc;
- }
-
- /**
- * Gets the variableElement.
- * @return Returns a IConfigurationElement
- */
- public IConfigurationElement getVariableElement() {
- return variableElement;
- }
-
- /**
- * Sets the variableElement.
- * @param variableElement The variableElement to set
- */
- public void setVariableElement(IConfigurationElement variableElement) {
- this.variableElement = variableElement;
- }
-
-}
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
deleted file mode 100644
index 5869c80..0000000
--- a/plugins/org.eclipse.jem.beaninfo/beaninfo/org/eclipse/jem/internal/beaninfo/core/BeaninfosDoc.java
+++ /dev/null
@@ -1,87 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2001, 2005 IBM Corporation and others.
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
- *
- * Contributors:
- * IBM Corporation - initial API and implementation
- *******************************************************************************/
-package org.eclipse.jem.internal.beaninfo.core;
-/*
-
-
- */
-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.
- */
-
-public class BeaninfosDoc implements IBeaninfosDocEntry {
-
- protected IBeaninfosDocEntry[] searchpath;
-
- static final String sExported = "exported"; //$NON-NLS-1$
-
- static final String sKind = "kind"; //$NON-NLS-1$
-
- static final String sPath = "path"; //$NON-NLS-1$
-
- public BeaninfosDoc() {
- }
-
- public BeaninfosDoc(IBeaninfosDocEntry[] searchpath) {
- this.searchpath = searchpath;
- }
-
- public int getKind() {
- return -1; // N.A.
- }
-
- public IPath getPath() {
- return null; // N.A.
- }
-
- public static BeaninfosDoc readEntry(IReader reader, Object root, IProject project) {
- ArrayList paths = new ArrayList();
- Object children = reader.getChildren(root);
- int childrenLength = reader.getLength(children);
- for (int i = 0; i < childrenLength; i++) {
- Object child = reader.getItem(children, i);
- if (reader.isNodeTypeElement(child)) {
- Object entry = null;
- if (reader.getNodeName(child).equalsIgnoreCase(BeaninfoEntry.sBeaninfo)) {
- entry = BeaninfoEntry.readEntry(reader, child, project);
- } else if (reader.getNodeName(child).equalsIgnoreCase(SearchpathEntry.sSearchpath)) {
- entry = SearchpathEntry.readEntry(reader, child, project, false);
- }
- if (entry != null)
- paths.add(entry);
- }
- }
- return new BeaninfosDoc((IBeaninfosDocEntry[]) paths.toArray(new IBeaninfosDocEntry[paths.size()]));
- }
-
- public IBeaninfosDocEntry[] getSearchpath() {
- return searchpath;
- }
-
- public void setSearchpath(IBeaninfosDocEntry[] searchpath) {
- this.searchpath = searchpath;
- }
-
- public Node writeEntry(Document doc, IProject project) {
- Element root = doc.createElement(SearchpathEntry.sSearchpath); // Create Root Element
- for (int i = 0; i < searchpath.length; i++) {
- root.appendChild(searchpath[i].writeEntry(doc, project)); // Add to the document
- }
- return root;
- }
-}
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
deleted file mode 100644
index 896c1d2..0000000
--- a/plugins/org.eclipse.jem.beaninfo/beaninfo/org/eclipse/jem/internal/beaninfo/core/ConfigurationElementReader.java
+++ /dev/null
@@ -1,73 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2001, 2005 IBM Corporation and others.
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
- *
- * Contributors:
- * IBM Corporation - initial API and implementation
- *******************************************************************************/
-package org.eclipse.jem.internal.beaninfo.core;
-/*
-
-
- */
-
-import java.lang.reflect.Array;
-
-import org.eclipse.core.runtime.IConfigurationElement;
-
-import org.eclipse.jem.internal.beaninfo.adapters.*;
-
-
-/**
- * For reading from IConfigurationElements
- * @version 1.0
- * @author
- */
-class ConfigurationElementReader implements IReader {
-
- /*
- * @see IReader#getChildren(Object)
- */
- public Object getChildren(Object node) {
- return (node instanceof IConfigurationElement) ? ((IConfigurationElement) node).getChildren() : new IConfigurationElement[0];
- }
-
- /*
- * @see IReader#getLength(Object)
- */
- public int getLength(Object nodeList) {
- return (nodeList instanceof IConfigurationElement[]) ? Array.getLength(nodeList) : 0;
- }
-
- /*
- * @see IReader#getItem(Object, int)
- */
- public Object getItem(Object nodeList, int index) {
- return (nodeList instanceof IConfigurationElement[]) ? Array.get(nodeList, index) : null;
- }
-
- /*
- * @see IReader#isNodeTypeElement(Object)
- */
- public boolean isNodeTypeElement(Object node) {
- return node instanceof IConfigurationElement;
- }
-
- /*
- * @see IReader#getNodeName(Object)
- */
- public String getNodeName(Object node) {
- return (node instanceof IConfigurationElement) ? ((IConfigurationElement) node).getName() : ""; //$NON-NLS-1$
- }
-
- /*
- * @see IReader#getAttribute(Object, String)
- */
- public String getAttribute(Object element, String attributeName) {
- return (element instanceof IConfigurationElement) ? ((IConfigurationElement) element).getAttribute(attributeName) : null;
- }
-
-}
diff --git a/plugins/org.eclipse.jem.beaninfo/beaninfo/org/eclipse/jem/internal/beaninfo/core/IBeanInfoContributor.java b/plugins/org.eclipse.jem.beaninfo/beaninfo/org/eclipse/jem/internal/beaninfo/core/IBeanInfoContributor.java
deleted file mode 100644
index 8590738..0000000
--- a/plugins/org.eclipse.jem.beaninfo/beaninfo/org/eclipse/jem/internal/beaninfo/core/IBeanInfoContributor.java
+++ /dev/null
@@ -1,78 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2004, 2005 IBM Corporation and others.
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
- *
- * Contributors:
- * IBM Corporation - initial API and implementation
- *******************************************************************************/
-/*
-
-
- */
-package org.eclipse.jem.internal.beaninfo.core;
-
-import org.eclipse.core.runtime.IPath;
-import org.eclipse.emf.ecore.resource.ResourceSet;
-
-import org.eclipse.jem.internal.proxy.core.IConfigurationContributionInfo;
-import org.eclipse.jem.java.JavaClass;
-
-/**
- * Interface for BeanInfo contributors. Supplied either as additional interface on a IClasspathContainer, or as
- * an explicit contributor for BeanInfos from the manifest files.
- * <p>
- * Implementations of this interface allows a dynamic supply of BeanInfo contributions (beaninfo jars and search paths)
- * and override files. This is used when the default plugin extension mechanism is too static for the requirements.
- * <p>
- * There is a very useful default implementation (<code>BeanInfoContributorAdapter</code>) that can be subclassed. The
- * default doesn't do anything on its own. But it does have a very useful utility method for loading resources.
- *
- * @see org.eclipse.jem.internal.beaninfo.core.BeanInfoContributorAdapter
- * @since 1.0.0
- */
-public interface IBeanInfoContributor {
-
- /**
- * Return the BeanInfoEntry contributions that are needed.
- * <p>
- * This will be called by BeanInfo when it determines that this contributor is applicable
- * for the current project being processed. BeaninfoEntry's define the BeanInfo jars and search paths to use.
- *
- * @param info
- * @return BeanInfo contributions or <code>null</code> if none to contribute.
- *
- * @since 1.0.0
- */
- public BeaninfoEntry[] getBeanInfoEntryContributions(IConfigurationContributionInfo info);
-
- /**
- * For the given package path run the override contributions through the runnable.
- * <p>
- * This will be called by BeanInfo when it determines that this
- * contributor is applicable for the current project being processed.
- * <p>
- * Implementations must call the runnable (the argument <code>runnable</code>) for each override file that is to be applied to the incoming class.
- * You can either call the run method that passes in a string pointing to a directory where your override file is
- * located (i.e. <code>overrideFileName.override</code> where "overrideFileName" is the name passed. Or you can call the run method that
- * takes a Resource that is already loaded (and maybe modified or created locally).
- *
- * @param packagePath
- * @param overrideFileName the overrideFileName that the overrides is for. This can be used in very special cases to provide
- * exact override files instead of letting the path be searched. An example would be for providing a file that isn't the same name as the class.
- * A very special case is <code>ROOT</code>. This is used when asking to apply root overrides to classes that have no
- * super type.
- * @param javaClass the java class that the overrides will be applied to. Note: Do not call any property, features, events, or operations calls
- * or any property, events, or operations Utilities against this class. That is because this class is being introspected at this time
- * and those calls will return invalid values if called at this point since introspection is not yet complete.
- * @param resource set that contributors can use to temporarily load dynamic override files.
- * @param runnable the runnable that you call to actually apply the override files.
- *
- * @see BeaninfoPlugin#ROOT
- * @see BeaninfoPlugin#OVERRIDE_EXTENSION
- * @since 1.0.0
- */
- public void runOverrides(IPath packagePath, String overrideFileName, JavaClass javaClass, ResourceSet rset, BeaninfoPlugin.IContributorOverrideRunnable runnable);
-}
diff --git a/plugins/org.eclipse.jem.beaninfo/beaninfo/org/eclipse/jem/internal/beaninfo/core/IBeaninfoSupplier.java b/plugins/org.eclipse.jem.beaninfo/beaninfo/org/eclipse/jem/internal/beaninfo/core/IBeaninfoSupplier.java
deleted file mode 100644
index 37075e7..0000000
--- a/plugins/org.eclipse.jem.beaninfo/beaninfo/org/eclipse/jem/internal/beaninfo/core/IBeaninfoSupplier.java
+++ /dev/null
@@ -1,75 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2001, 2005 IBM Corporation and others.
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
- *
- * Contributors:
- * IBM Corporation - initial API and implementation
- *******************************************************************************/
-package org.eclipse.jem.internal.beaninfo.core;
-/*
-
-
- */
-
-
-import org.eclipse.core.resources.IProject;
-import org.eclipse.emf.ecore.resource.ResourceSet;
-
-import org.eclipse.jem.internal.proxy.core.ProxyFactoryRegistry;
-import org.eclipse.jem.util.emf.workbench.ProjectResourceSet;
-/**
- * Interface to supply information for beaninfo to decouple
- * the introspection from the desktop.
- */
-
-public interface IBeaninfoSupplier {
-
- /**
- * @return Return the registry to use. Initialize it if not already initialized.
- */
- public ProxyFactoryRegistry getRegistry();
-
- /**
- * Used to know if we currently have a registry created in the supplier.
- *
- * @return true if there is a registry currently in the supplier.
- */
- public boolean isRegistryCreated();
-
- /**
- * Close the registry. This tells the registry to close. This is necessary
- * at times because of changes to classes require the registry to be
- * reconstructed.
- */
- public void closeRegistry();
-
- /**
- * Return the project that this supplier is for.
- * @return
- *
- * @since 1.0.0
- */
- public IProject getProject();
-
- /**
- * Create a new resource set based upon the current project. This resource set is hooked into the
- * project's resource set so that any searches for java classes.
- *
- * @return a new resource set that is hooked into the project's java resource set.
- *
- * @since 1.2.0
- */
- public ProjectResourceSet getNewResourceSet();
-
- /**
- * The project resource set for this supplier.
- * @return
- *
- * @since 1.2.0
- */
- public ResourceSet getProjectResourceSet();
-
-}
diff --git a/plugins/org.eclipse.jem.beaninfo/beaninfo/org/eclipse/jem/internal/beaninfo/core/IBeaninfosDocEntry.java b/plugins/org.eclipse.jem.beaninfo/beaninfo/org/eclipse/jem/internal/beaninfo/core/IBeaninfosDocEntry.java
deleted file mode 100644
index 5cc90c5..0000000
--- a/plugins/org.eclipse.jem.beaninfo/beaninfo/org/eclipse/jem/internal/beaninfo/core/IBeaninfosDocEntry.java
+++ /dev/null
@@ -1,33 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2001, 2005 IBM Corporation and others.
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
- *
- * Contributors:
- * IBM Corporation - initial API and implementation
- *******************************************************************************/
-package org.eclipse.jem.internal.beaninfo.core;
-/*
-
-
- */
-
-import org.eclipse.core.resources.IProject;
-import org.eclipse.core.runtime.IPath;
-import org.w3c.dom.Document;
-import org.w3c.dom.Node;
-
-/**
- * Interface for DOM Doc writable entries.
- *
- * @version 1.0
- * @author
- */
-public interface IBeaninfosDocEntry {
- public Node writeEntry(Document doc, IProject project);
-
- public int getKind();
- public IPath getPath();
-}
diff --git a/plugins/org.eclipse.jem.beaninfo/beaninfo/org/eclipse/jem/internal/beaninfo/core/Init.java b/plugins/org.eclipse.jem.beaninfo/beaninfo/org/eclipse/jem/internal/beaninfo/core/Init.java
deleted file mode 100644
index ceefae9..0000000
--- a/plugins/org.eclipse.jem.beaninfo/beaninfo/org/eclipse/jem/internal/beaninfo/core/Init.java
+++ /dev/null
@@ -1,67 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2003, 2005 IBM Corporation and others.
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
- *
- * Contributors:
- * IBM Corporation - initial API and implementation
- *******************************************************************************/
-package org.eclipse.jem.internal.beaninfo.core;
-/*
-
-
- */
-import org.eclipse.emf.ecore.resource.ResourceSet;
-import org.eclipse.emf.ecore.util.EcoreUtil;
-
-import org.eclipse.jem.internal.beaninfo.adapters.BeaninfoAdapterFactory;
-import org.eclipse.jem.internal.java.beaninfo.IIntrospectionAdapter;
-import org.eclipse.jem.internal.proxy.core.ProxyFactoryRegistry;
-
-/**
- * Static initializer class to initialize the beaninfo stuff.
- * It is disconnected from the desktop and so doesn't require it.
- */
-
-public class Init {
-
- // So it can't be instantiated.
- private Init() {
- };
-
- /**
- * Initialize the context with an IBeaninfoSupplier, used to set up the
- * introspection process.
- *
- * The beaninfo supplier is responsible for setting up the bean info search path,
- * including removing the sun beaninfos, if desired.
- */
- public static void initialize(ResourceSet rset, final IBeaninfoSupplier supplier) {
- rset.getAdapterFactories().add(new BeaninfoAdapterFactory(supplier));
- }
-
- /**
- * Initialize the registry now that it is available.
- */
- public static void initialize(ProxyFactoryRegistry registry) {
- // Remove the "sun.beans.info" from the beaninfo search path because
- // we completely override the sun bean infos.
- Utilities.removeBeanInfoPath(registry, "sun.beans.infos"); //$NON-NLS-1$
- }
-
- /**
- * Cleanup from the context because we are being removed.
- * If clearResults is true, then the factory should clear the results of introspection
- * from the everything because the context will still be around.
- */
- public static void cleanup(ResourceSet rset, boolean clearResults) {
- BeaninfoAdapterFactory factory =
- (BeaninfoAdapterFactory) EcoreUtil.getAdapterFactory(rset.getAdapterFactories(), IIntrospectionAdapter.ADAPTER_KEY);
- rset.getAdapterFactories().remove(factory);
- if (factory != null)
- factory.closeAll(clearResults);
- }
-
-}
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
deleted file mode 100644
index ce77ecc..0000000
--- a/plugins/org.eclipse.jem.beaninfo/beaninfo/org/eclipse/jem/internal/beaninfo/core/SearchpathEntry.java
+++ /dev/null
@@ -1,189 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2001, 2005 IBM Corporation and others.
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
- *
- * Contributors:
- * IBM Corporation - initial API and implementation
- *******************************************************************************/
-package org.eclipse.jem.internal.beaninfo.core;
-/*
-
-
- */
-
-import org.eclipse.core.resources.IProject;
-import org.eclipse.core.runtime.IPath;
-import org.eclipse.core.runtime.Path;
-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.
- *
- * Note: if not a child of a BeanInfoEntry, then the path refers to a package
- * in the classpath, so container is supported here.
- *
- * @version 1.0
- * @author
- */
-public class SearchpathEntry implements IBeaninfosDocEntry {
-
- final static String sSearchpath = "searchpath"; // Searchpath entry, shared with BeaninfosDoc. //$NON-NLS-1$
- final static String sPackage = "package"; // Package name. //$NON-NLS-1$
-
- /**
- * Read the entry in from the element.
- */
- public static SearchpathEntry readEntry(IReader reader, Object element, IProject project, boolean beaninfoChild) {
- String packageName = reader.getAttribute(element, sPackage);
- if (beaninfoChild)
- return new SearchpathEntry(packageName); // Kind/path aren't valid on beaninfo children.
-
- String elementKind = reader.getAttribute(element, BeaninfosDoc.sKind);
- String pathStr = reader.getAttribute(element, BeaninfosDoc.sPath);
- int kind = BeaninfoEntry.kindFromString(elementKind);
- IPath path = null;
- if (pathStr != null) {
- // ensure path is absolute
- path = new Path(pathStr);
- if (kind != IClasspathEntry.CPE_VARIABLE && kind != IClasspathEntry.CPE_CONTAINER && !path.isAbsolute()) {
- path = project != null ? project.getFullPath().append(path) : path.makeAbsolute(); // Some folder/jar within this project
- }
- }
-
- // create the appropriate entry
- boolean valid = true;
- switch (kind) {
-
- case IClasspathEntry.CPE_LIBRARY :
- valid = path != null && path.isAbsolute();
- break;
-
- case IClasspathEntry.CPE_SOURCE :
- if (path == null)
- valid = false;
- else if (path.isAbsolute()) {
- // must be an entry in this project or specify another project
- String projSegment = path.segment(0);
- if (project == null || projSegment == null || !projSegment.equals(project.getName())) {
- // another project
- kind = IClasspathEntry.CPE_PROJECT;
- }
- }
- break;
-
- case IClasspathEntry.CPE_VARIABLE :
- case IClasspathEntry.CPE_CONTAINER:
- break;
-
- default :
- valid = false;
- break;
- }
-
- if (valid)
- return new SearchpathEntry(kind, path, packageName);
- else
- return null;
-
- }
-
- protected int kind = -1; // Under Beaninfo entry, these don't have kind/path's.
- protected IPath path; // Path can be null if under beaninfo entry
- protected String packageName; // Packagename can be null if kind/path refer to a project or registered variable.
- protected boolean isExported;
-
- public SearchpathEntry(int kind, IPath path, String packageName) {
- this.kind = kind;
- this.path = path;
- this.packageName = packageName;
- }
-
- public SearchpathEntry(String packageName) {
- this.packageName = packageName;
- }
-
- public int getKind() {
- return kind;
- }
-
- public IPath getPath() {
- return path;
- }
-
- public String getPackage() {
- return packageName;
- }
-
- public Node writeEntry(Document doc, IProject project) {
-
- Element element = doc.createElement(sSearchpath);
- if (kind != -1) {
- // A non-beaninfo child
- element.setAttribute(BeaninfosDoc.sKind, BeaninfoEntry.kindToString(kind));
- IPath tPath = path;
- if (kind != IClasspathEntry.CPE_VARIABLE && kind != IClasspathEntry.CPE_CONTAINER) {
- // translate to project relative from absolute (unless a device path)
- if (tPath.isAbsolute()) {
- if (tPath.segment(0).equals(project.getFullPath().segment(0))) {
- tPath = tPath.removeFirstSegments(1);
- tPath = tPath.makeRelative();
- } else {
- tPath = tPath.makeAbsolute();
- }
- }
- }
-
- element.setAttribute(BeaninfosDoc.sPath, tPath.toString());
- }
- if (packageName != null)
- element.setAttribute(sPackage, packageName);
- return element;
- }
-
- public boolean equals(Object other) {
- if (this == other)
- return true;
-
- if (!(other instanceof SearchpathEntry))
- return false;
-
- SearchpathEntry otherEntry = (SearchpathEntry) other;
- if (kind != otherEntry.kind)
- return false;
-
- if (path == null)
- if (otherEntry.path != null)
- return false;
- else
- ;
- else if (!path.equals(otherEntry.path))
- return false;
-
- if (packageName == null)
- if (otherEntry.packageName != null)
- return false;
- else
- ;
- else if (!packageName.equals(otherEntry.packageName))
- return false;
-
- return true;
- }
-
- public int hashCode() {
- int hashCode = kind;
- if (path != null)
- hashCode ^= path.hashCode();
- if (packageName != null)
- hashCode ^= packageName.hashCode();
- return hashCode;
- }
-
-}
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
deleted file mode 100644
index b001299..0000000
--- a/plugins/org.eclipse.jem.beaninfo/beaninfo/org/eclipse/jem/internal/beaninfo/core/Utilities.java
+++ /dev/null
@@ -1,501 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2003, 2006 IBM Corporation and others.
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
- *
- * Contributors:
- * IBM Corporation - initial API and implementation
- *******************************************************************************/
-package org.eclipse.jem.internal.beaninfo.core;
-/*
-
-
- */
-import java.util.Iterator;
-
-import org.eclipse.core.runtime.CoreException;
-import org.eclipse.emf.common.util.EList;
-import org.eclipse.emf.common.util.URI;
-import org.eclipse.emf.ecore.*;
-import org.eclipse.emf.ecore.resource.ResourceSet;
-
-import org.eclipse.jem.internal.beaninfo.*;
-import org.eclipse.jem.internal.beaninfo.adapters.BeaninfoNature;
-import org.eclipse.jem.internal.beaninfo.adapters.BeaninfoProxyConstants;
-import org.eclipse.jem.internal.java.adapters.ReflectionAdaptor;
-import org.eclipse.jem.internal.proxy.core.*;
-import org.eclipse.jem.java.*;
-
-/**
- * Beaninfo (introspection) utilities methods
- */
-
-public final class Utilities {
-
- private Utilities() {
- }
-
- /**
- * Utility to return the class as a JavaClass. If it actually is a JavaType this will
- * fail with a ClassCastException.
- * @param className
- * @param rset
- * @return java class
- *
- * @throws ClassCastException if not a java class, but instead a java primitive.
- * @since 1.1.0
- */
- public static JavaClass getJavaClass(String className, ResourceSet rset) {
- return (JavaClass) getJavaType(className, rset);
- }
-
- /**
- * Utility to return the class as a JavaHelpers.
- *
- * @param className
- * @param rset
- * @return java helpers.
- *
- * @since 1.1.0
- */
- public static JavaHelpers getJavaType(String className, ResourceSet rset) {
- return (JavaHelpers) rset.getEObject(getJavaClassURI(className), true);
- }
-
- /**
- * Create a URI to the given classname.
- * <p>
- * Note: It must be in normal form, i.e. fully-qualified, if primitive spelled out (e.g. "int" not I), and if
- * arrays it must readable form (e.g. "java.lang.String[]" and not "[Ljava.lang.String;").
- *
- * @param className
- * @return
- *
- * @since 1.1.0
- */
- public static URI getJavaClassURI(String className) {
- return JavaRefFactory.eINSTANCE.createTypeURI(className);
- }
-
- /**
- * Utility to return the EClassifier from the given IBeanTypeProxy.
- */
- public static EClassifier getJavaClass(IBeanTypeProxy type, ResourceSet rset) {
- if (type != null) {
- return getJavaType(type.getFormalTypeName(), rset);
- } else
- return null;
- }
-
- /**
- * Utility to return the Method from the given IMethodProxy.
- */
- public static Method getMethod(IMethodProxy method, ResourceSet rset) {
- return method != null ? (Method) rset.getEObject(URI.createURI(getMethodURL(method)), true) : null;
- }
-
- /**
- * Answer the URL String for Method from the given IMethodProxy
- */
- public static String getMethodURL(IMethodProxy method) {
- String className = method.getClassType().getTypeName();
- IBeanTypeProxy[] parms = method.getParameterTypes();
- String[] parmTypes = parms.length > 0 ? new String[parms.length] : null;
- for (int i = 0; i < parms.length; i++) {
- parmTypes[i] = parms[i].getFormalTypeName();
- }
- return computeMethodURL(className, method.getName(), parmTypes);
- }
-
- protected static String computeMethodURL(String fullyQualifiedClassName, String methodName, String[] parmTypes) {
- int classStart = fullyQualifiedClassName.lastIndexOf('.');
- StringBuffer url = new StringBuffer(50);
- url.append("java:/"); //$NON-NLS-1$
- if (classStart > -1)
- url.append(fullyQualifiedClassName.substring(0, classStart));
- url.append('#');
- url.append(computeMethodID(fullyQualifiedClassName.substring(classStart + 1), methodName, parmTypes));
- return url.toString();
- }
-
- protected static String computeFieldURL(String fullyQualifiedClassName, String fieldName) {
- int classStart = fullyQualifiedClassName.lastIndexOf('.');
- StringBuffer url = new StringBuffer(50);
- url.append("java:/"); //$NON-NLS-1$
- if (classStart > -1)
- url.append(fullyQualifiedClassName.substring(0, classStart));
- url.append('#');
- url.append(fullyQualifiedClassName.substring(classStart + 1));
- url.append(ReflectionAdaptor.C_CLASS_MEMBER_DELIMITER);
- url.append(fieldName);
- return url.toString();
- }
-
- /**
- * Return the field uri for the given classname, fieldname.
- * @param fullyQualifiedClassName
- * @param fieldName
- * @return
- *
- * @since 1.1.0
- */
- public static URI getFieldURI(String fullyQualifiedClassName, String fieldName) {
- return URI.createURI(computeFieldURL(fullyQualifiedClassName, fieldName));
- }
- /**
- * Return the method uri for the given classname, methodname, parm types.
- * @param fullyQualifiedClassName
- * @param methodName
- * @param parmTypes <code>null</code> if there are no parms.
- * @return
- *
- * @since 1.1.0
- */
- public static URI getMethodURI(String fullyQualifiedClassName, String methodName, String[] parmTypes) {
- return URI.createURI(computeMethodURL(fullyQualifiedClassName, methodName, parmTypes));
- }
-
- /**
- * Turn it into an URI.
- */
- public static URI getMethodURI(IMethodProxy method) {
- return URI.createURI(getMethodURL(method));
- }
-
- /**
- * Utility to compute the Java Modeling METHODID from method declaring class name,
- * method name, and parameter class names.
- */
- public static String computeMethodID(String className, String methodName, String[] parameterTypes) {
- StringBuffer out = new StringBuffer(50);
- out.append(className);
- out.append(ReflectionAdaptor.C_CLASS_MEMBER_DELIMITER);
- out.append(methodName);
- out.append(ReflectionAdaptor.C_METHOD_PARM_DELIMITER);
- if (parameterTypes != null)
- for (int i = 0; i < parameterTypes.length; i++) {
- out.append(parameterTypes[i]);
- if (i < parameterTypes.length - 1)
- out.append(ReflectionAdaptor.C_PARM_PARM_DELIMITER);
- }
- if (className.equals(methodName))
- out.append(ReflectionAdaptor.S_CONSTRUCTOR_TOKEN); //It's a constructor
- return out.toString();
- }
-
- /**
- * Utility to retrieve the BeanDecorator.
- */
- public static BeanDecorator getBeanDecorator(EModelElement model) {
- return (BeanDecorator) getDecorator(model, BeanDecorator.class);
- }
- /**
- * Utility to retrieve a decorator of the specified class.
- */
- public static EAnnotation getDecorator(EModelElement model, Class decoratorClass) {
- Iterator itr = model.getEAnnotations().iterator();
- while (itr.hasNext()) {
- EAnnotation decr = (EAnnotation) itr.next();
- if (decoratorClass.isInstance(decr))
- return decr;
- }
- return null;
- }
-
- /**
- * Utility to retrieve the EventSetDecorator.
- */
- public static EventSetDecorator getEventSetDecorator(EModelElement model) {
- return (EventSetDecorator) getDecorator(model, EventSetDecorator.class);
- }
-
- /**
- * Utility to retrieve the MethodDecorator.
- */
- public static MethodDecorator getMethodDecorator(EModelElement model) {
- return (MethodDecorator) getDecorator(model, MethodDecorator.class);
- }
-
- /**
- * Utility to retrieve the PropertyDecorator.
- */
- public static PropertyDecorator getPropertyDecorator(EModelElement model) {
- return (PropertyDecorator) getDecorator(model, PropertyDecorator.class);
- }
-
- /**
- * Utility to return an iterator on the list which will return the property decorators
- * of only the properties in the EList passed in. If the property does not have a
- * property decorator, then it is not a beaninfo property.
- */
- public static Iterator getPropertiesIterator(final EList properties) {
- return new Iterator() {
- private Iterator itr = properties.iterator();
- private boolean hasNext = true;
- private PropertyDecorator next;
- {
- findNext();
- }
- public boolean hasNext() {
- return hasNext;
- }
-
- public Object next() {
- PropertyDecorator temp = next;
- findNext();
- return temp;
- }
-
- public void remove() {
- throw new UnsupportedOperationException();
- }
-
- private void findNext() {
- while (itr.hasNext()) {
- EModelElement nextOne = (EModelElement) itr.next();
- next = getPropertyDecorator(nextOne);
- if (next != null) {
- return;
- }
- }
- hasNext = false;
- }
- };
- }
-
- /**
- * Utility to return an iterator on the list which will return the EventSet decorators
- * of only the BeanEvents in the EList passed in.
- */
- public static Iterator getEventSetsIterator(final EList events) {
- return new Iterator() {
- private Iterator itr = events.iterator();
- private boolean hasNext = true;
- private EventSetDecorator next;
- {
- findNext();
- }
- public boolean hasNext() {
- return hasNext;
- }
-
- public Object next() {
- EventSetDecorator temp = next;
- findNext();
- return temp;
- }
-
- public void remove() {
- throw new UnsupportedOperationException();
- }
-
- private void findNext() {
- while (itr.hasNext()) {
- EModelElement nextOne = (EModelElement) itr.next();
- next = getEventSetDecorator(nextOne);
- if (next != null) {
- return;
- }
- }
- hasNext = false;
- }
- };
- }
-
- /**
- * Utility to return an iterator on the list which will return the Method decorators
- * of only the Methods in the EList passed in.
- */
- public static Iterator getMethodsIterator(final EList methods) {
- return new Iterator() {
- private Iterator itr = methods.iterator();
- private boolean hasNext = true;
- private MethodDecorator next;
- {
- findNext();
- }
- public boolean hasNext() {
- return hasNext;
- }
-
- public Object next() {
- MethodDecorator temp = next;
- findNext();
- return temp;
- }
-
- public void remove() {
- throw new UnsupportedOperationException();
- }
-
- private void findNext() {
- while (itr.hasNext()) {
- EModelElement nextOne = (EModelElement) itr.next();
- next = getMethodDecorator(nextOne);
- if (next != null) {
- return;
- }
- }
- hasNext = false;
- }
- };
- }
-
- /**
- * Get the search path from the remote vm.
- *
- * Note: This shouldn't be used when working with a BeaninfoNature. Use the
- * accessors taking the nature instead. Otherwise there will be inconsistencies since the search path won't be
- * saved across invocations of the workspace if it is not updated through the nature).
- */
- public static IArrayBeanProxy getBeanInfoSearchPath(ProxyFactoryRegistry registry) {
- BeaninfoProxyConstants biconstants = BeaninfoProxyConstants.getConstants(registry);
- if (biconstants != null)
- return (IArrayBeanProxy) biconstants
- .getGetBeanInfoSearchPathProxy()
- .invokeCatchThrowableExceptions(
- null);
- else
- return null;
- }
-
- /**
- * Set the search path to the array of strings passed in on the remote vm.
- *
- * Note: This shouldn't be used when working with a BeaninfoNature. Use the
- * accessors taking the nature instead. Otherwise there will be inconsistencies since the search path won't be
- * saved across invocations of the workspace if it is not updated through the nature).
- */
- public static void setBeanInfoSearchPath(ProxyFactoryRegistry registry, String[] paths) {
-
- try {
- BeaninfoProxyConstants biConstants = BeaninfoProxyConstants.getConstants(registry);
- if (biConstants != null) {
- JavaStandardBeanProxyConstants jConstants = JavaStandardBeanProxyConstants.getConstants(registry);
- IStandardBeanProxyFactory proxyFactory = registry.getBeanProxyFactory();
- IArrayBeanProxy newPath = proxyFactory.createBeanProxyWith(jConstants.getStringType(), paths != null ? paths.length : 0);
- if (paths != null)
- for (int i = 0; i < paths.length; i++)
- newPath.set(proxyFactory.createBeanProxyWith(paths[i]), i);
- biConstants.getSetBeanInfoSearchPathProxy().invoke(null, newPath);
- }
- } catch (ThrowableProxy e) {
- }
- }
-
- /**
- * From the Beaninfo Nature, insert a path to the beaninfo path at the given index, -1 means at the end.
- * If index is larger than the current path, it will also add at the end.
- */
- public static void insertBeanInfoSearchPath(BeaninfoNature nature, IBeaninfosDocEntry path, int index) throws CoreException {
- BeaninfosDoc infoPath = nature.getSearchPath();
- IBeaninfosDocEntry[] oldPath = infoPath.getSearchpath();
-
- IBeaninfosDocEntry[] newPath = new IBeaninfosDocEntry[oldPath.length + 1];
-
- if (index == -1 || index >= oldPath.length) {
- // At the end or past end
- System.arraycopy(oldPath, 0, newPath, 0, oldPath.length);
- newPath[oldPath.length] = path;
- } else {
- // In the middle
- System.arraycopy(oldPath, 0, newPath, 0, index);
- newPath[index] = path;
- System.arraycopy(oldPath, index, newPath, index + 1, oldPath.length - index);
- }
-
- infoPath.setSearchpath(newPath);
- nature.setSearchPath(infoPath);
- }
-
- /**
- * Insert a path to the beaninfo path at the given index, -1 means at the end.
- * If index is larger than the current path, it will also add at the end.
- *
- * Note: This shouldn't be used when working with a BeaninfoNature. Use the
- * accessors taking the nature instead. Otherwise there will be inconsistencies since the search path won't be
- * saved across invocations of the workspace if it is not updated through the nature).
- */
- public static void insertBeanInfoSearchPath(ProxyFactoryRegistry registry, String path, int index) {
- try {
- BeaninfoProxyConstants biConstants = BeaninfoProxyConstants.getConstants(registry);
- if (biConstants != null) {
- IArrayBeanProxy infoPath = (IArrayBeanProxy) biConstants.getGetBeanInfoSearchPathProxy().invoke(null);
- int pathLength = infoPath.getLength();
- IStandardBeanProxyFactory proxyFactory = registry.getBeanProxyFactory();
- IArrayBeanProxy newPath = proxyFactory.createBeanProxyWith(infoPath.getTypeProxy(), pathLength + 1);
- IBeanProxy stringProxy = proxyFactory.createBeanProxyWith(path);
- JavaStandardBeanProxyConstants constants = JavaStandardBeanProxyConstants.getConstants(registry);
- if (index == -1 || index >= pathLength) {
- // At the end or past end
- constants.arraycopy(infoPath, 0, newPath, 0, infoPath.getLength());
- newPath.set(stringProxy, pathLength);
- } else {
- // In the middle
- constants.arraycopy(infoPath, 0, newPath, 0, index);
- newPath.set(stringProxy, index);
- constants.arraycopy(infoPath, index, newPath, index + 1, pathLength - index);
- }
- biConstants.getSetBeanInfoSearchPathProxy().invoke(null, newPath);
- }
- } catch (ThrowableProxy e) {
- }
- }
-
- /**
- * From the Beaninfo Nature, remove the specified path from the beaninfo search path.
- * Not an error if not found.
- */
- public static void removeBeanInfoPath(BeaninfoNature nature, IBeaninfosDocEntry path) throws CoreException {
- BeaninfosDoc infoPath = nature.getSearchPath();
- IBeaninfosDocEntry[] oldPath = infoPath.getSearchpath();
-
- for (int i = 0; i < oldPath.length; i++) {
- if (path.equals(oldPath[i])) {
- // We found it, so remove it.
- IBeaninfosDocEntry[] newPath = new IBeaninfosDocEntry[oldPath.length - 1];
- System.arraycopy(oldPath, 0, newPath, 0, i);
- if (i < oldPath.length - 1)
- System.arraycopy(oldPath, i + 1, newPath, i, oldPath.length - i - 1);
- infoPath.setSearchpath(newPath);
- nature.setSearchPath(infoPath);
- return;
- }
- }
- }
-
- /**
- * Remove the specified path from the beaninfo search path.
- * Not an error if not found.
- *
- * Note: This shouldn't be used when working with a BeaninfoNature. Use the
- * accessors taking the nature instead. Otherwise there will be inconsistencies since the search path won't be
- * saved across invocations of the workspace if it is not updated through the nature).
- */
- public static void removeBeanInfoPath(ProxyFactoryRegistry registry, String path) {
- try {
- BeaninfoProxyConstants biConstants = BeaninfoProxyConstants.getConstants(registry);
- if (biConstants != null) {
- IArrayBeanProxy infoPath = (IArrayBeanProxy) biConstants.getGetBeanInfoSearchPathProxy().invoke(null);
- int pathLength = infoPath.getLength();
- for (int i = 0; i < pathLength; i++) {
- IStringBeanProxy aPath = (IStringBeanProxy) infoPath.get(i);
- if (path.equals(aPath.stringValue())) {
- // We found it, so remove it.
- IArrayBeanProxy newPath = registry.getBeanProxyFactory().createBeanProxyWith(infoPath.getTypeProxy(), pathLength - 1);
- JavaStandardBeanProxyConstants constants = JavaStandardBeanProxyConstants.getConstants(registry);
- constants.arraycopy(infoPath, 0, newPath, 0, i);
- if (i < pathLength - 1)
- constants.arraycopy(infoPath, i + 1, newPath, i, pathLength - i - 1);
- biConstants.getSetBeanInfoSearchPathProxy().invoke(null, newPath);
- return;
- }
- }
- }
- } catch (ThrowableProxy e) {
- }
- };
-
-}
diff --git a/plugins/org.eclipse.jem.beaninfo/beaninfo/org/eclipse/jem/internal/beaninfo/core/messages.properties b/plugins/org.eclipse.jem.beaninfo/beaninfo/org/eclipse/jem/internal/beaninfo/core/messages.properties
deleted file mode 100644
index a634116..0000000
--- a/plugins/org.eclipse.jem.beaninfo/beaninfo/org/eclipse/jem/internal/beaninfo/core/messages.properties
+++ /dev/null
@@ -1,12 +0,0 @@
-###############################################################################
-# Copyright (c) 2004, 2005 IBM Corporation and others.
-# All rights reserved. This program and the accompanying materials
-# are made available under the terms of the Eclipse Public License v1.0
-# which accompanies this distribution, and is available at
-# http://www.eclipse.org/legal/epl-v10.html
-#
-# Contributors:
-# IBM Corporation - initial API and implementation
-###############################################################################
-#
-BeanInfoCacheController_Job_WriteBeaninfoCache_Title=Write BeanInfo cache files
diff --git a/plugins/org.eclipse.jem.beaninfo/beaninfo/org/eclipse/jem/internal/beaninfo/impl/BeanDecoratorImpl.java b/plugins/org.eclipse.jem.beaninfo/beaninfo/org/eclipse/jem/internal/beaninfo/impl/BeanDecoratorImpl.java
deleted file mode 100644
index f4e9370..0000000
--- a/plugins/org.eclipse.jem.beaninfo/beaninfo/org/eclipse/jem/internal/beaninfo/impl/BeanDecoratorImpl.java
+++ /dev/null
@@ -1,1072 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2001, 2005 IBM Corporation and others.
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
- *
- * Contributors:
- * IBM Corporation - initial API and implementation
- *******************************************************************************/
-package org.eclipse.jem.internal.beaninfo.impl;
-/*
-
-
- */
-
-
-import java.net.MalformedURLException;
-import java.net.URL;
-import java.util.Collection;
-import java.util.logging.Level;
-
-import org.eclipse.emf.common.notify.Notification;
-import org.eclipse.emf.common.notify.NotificationChain;
-import org.eclipse.emf.common.util.EList;
-
-import org.eclipse.emf.ecore.EClass;
-import org.eclipse.emf.ecore.EModelElement;
-import org.eclipse.emf.ecore.EStructuralFeature;
-import org.eclipse.emf.ecore.EcorePackage;
-import org.eclipse.emf.ecore.InternalEObject;
-import org.eclipse.emf.ecore.impl.ENotificationImpl;
-import org.eclipse.emf.ecore.util.EDataTypeUniqueEList;
-import org.eclipse.emf.ecore.util.InternalEList;
-
-import org.eclipse.jem.beaninfo.common.IBaseBeanInfoConstants;
-import org.eclipse.jem.internal.beaninfo.BeanDecorator;
-import org.eclipse.jem.internal.beaninfo.BeaninfoPackage;
-import org.eclipse.jem.internal.beaninfo.ImplicitItem;
-
-import org.eclipse.jem.internal.beaninfo.common.FeatureAttributeValue;
-import org.eclipse.jem.internal.beaninfo.core.*;
-import org.eclipse.jem.java.JavaClass;
-
-/**
- * <!-- begin-user-doc -->
- * An implementation of the model object '<em><b>Bean Decorator</b></em>'.
- * <!-- end-user-doc -->
- * <p>
- * The following features are implemented:
- * <ul>
- * <li>{@link org.eclipse.jem.internal.beaninfo.impl.BeanDecoratorImpl#isMergeSuperProperties <em>Merge Super Properties</em>}</li>
- * <li>{@link org.eclipse.jem.internal.beaninfo.impl.BeanDecoratorImpl#isMergeSuperMethods <em>Merge Super Methods</em>}</li>
- * <li>{@link org.eclipse.jem.internal.beaninfo.impl.BeanDecoratorImpl#isMergeSuperEvents <em>Merge Super Events</em>}</li>
- * <li>{@link org.eclipse.jem.internal.beaninfo.impl.BeanDecoratorImpl#isIntrospectProperties <em>Introspect Properties</em>}</li>
- * <li>{@link org.eclipse.jem.internal.beaninfo.impl.BeanDecoratorImpl#isIntrospectMethods <em>Introspect Methods</em>}</li>
- * <li>{@link org.eclipse.jem.internal.beaninfo.impl.BeanDecoratorImpl#isIntrospectEvents <em>Introspect Events</em>}</li>
- * <li>{@link org.eclipse.jem.internal.beaninfo.impl.BeanDecoratorImpl#isDoBeaninfo <em>Do Beaninfo</em>}</li>
- * <li>{@link org.eclipse.jem.internal.beaninfo.impl.BeanDecoratorImpl#getNotInheritedPropertyNames <em>Not Inherited Property Names</em>}</li>
- * <li>{@link org.eclipse.jem.internal.beaninfo.impl.BeanDecoratorImpl#getNotInheritedMethodNames <em>Not Inherited Method Names</em>}</li>
- * <li>{@link org.eclipse.jem.internal.beaninfo.impl.BeanDecoratorImpl#getNotInheritedEventNames <em>Not Inherited Event Names</em>}</li>
- * <li>{@link org.eclipse.jem.internal.beaninfo.impl.BeanDecoratorImpl#getCustomizerClass <em>Customizer Class</em>}</li>
- * </ul>
- * </p>
- *
- * @generated
- */
-
-
-public class BeanDecoratorImpl extends FeatureDecoratorImpl implements BeanDecorator{
-
- /**
- * Bits for implicitly set features. This is internal, not meant for clients.
- */
- public static final long BEAN_CUSTOMIZER_IMPLICIT = 0x1L;
- public static final long BEAN_MERGE_INHERITED_PROPERTIES_IMPLICIT = 0x2L;
- public static final long BEAN_MERGE_INHERITED_OPERATIONS_IMPLICIT = 0x4L;
- public static final long BEAN_MERGE_INHERITED_EVENTS_IMPLICIT = 0x8L;
-
- /**
- * The default value of the '{@link #isMergeSuperProperties() <em>Merge Super Properties</em>}' attribute.
- * <!-- begin-user-doc -->
- * <!-- end-user-doc -->
- * @see #isMergeSuperProperties()
- * @generated
- * @ordered
- */
- protected static final boolean MERGE_SUPER_PROPERTIES_EDEFAULT = true;
-
- /**
- * The flag representing the value of the '{@link #isMergeSuperProperties() <em>Merge Super Properties</em>}' attribute.
- * <!-- begin-user-doc -->
- * <!-- end-user-doc -->
- * @see #isMergeSuperProperties()
- * @generated
- * @ordered
- */
- protected static final int MERGE_SUPER_PROPERTIES_EFLAG = 1 << 18;
-
- /**
- * The flag representing whether the Merge Super Properties attribute has been set.
- * <!-- begin-user-doc -->
- * <!-- end-user-doc -->
- * @generated
- * @ordered
- */
- protected static final int MERGE_SUPER_PROPERTIES_ESETFLAG = 1 << 19;
-
- /**
- * The default value of the '{@link #isMergeSuperMethods() <em>Merge Super Methods</em>}' attribute.
- * <!-- begin-user-doc -->
- * <!-- end-user-doc -->
- * @see #isMergeSuperMethods()
- * @generated
- * @ordered
- */
- protected static final boolean MERGE_SUPER_METHODS_EDEFAULT = true;
-
- /**
- * The flag representing the value of the '{@link #isMergeSuperMethods() <em>Merge Super Methods</em>}' attribute.
- * <!-- begin-user-doc -->
- * <!-- end-user-doc -->
- * @see #isMergeSuperMethods()
- * @generated
- * @ordered
- */
- protected static final int MERGE_SUPER_METHODS_EFLAG = 1 << 20;
-
- /**
- * The flag representing whether the Merge Super Methods attribute has been set.
- * <!-- begin-user-doc -->
- * <!-- end-user-doc -->
- * @generated
- * @ordered
- */
- protected static final int MERGE_SUPER_METHODS_ESETFLAG = 1 << 21;
-
- /**
- * The default value of the '{@link #isMergeSuperEvents() <em>Merge Super Events</em>}' attribute.
- * <!-- begin-user-doc -->
- * <!-- end-user-doc -->
- * @see #isMergeSuperEvents()
- * @generated
- * @ordered
- */
- protected static final boolean MERGE_SUPER_EVENTS_EDEFAULT = true;
-
- /**
- * The flag representing the value of the '{@link #isMergeSuperEvents() <em>Merge Super Events</em>}' attribute.
- * <!-- begin-user-doc -->
- * <!-- end-user-doc -->
- * @see #isMergeSuperEvents()
- * @generated
- * @ordered
- */
- protected static final int MERGE_SUPER_EVENTS_EFLAG = 1 << 22;
-
- /**
- * The flag representing whether the Merge Super Events attribute has been set.
- * <!-- begin-user-doc -->
- * <!-- end-user-doc -->
- * @generated
- * @ordered
- */
- protected static final int MERGE_SUPER_EVENTS_ESETFLAG = 1 << 23;
-
- /**
- * The default value of the '{@link #isIntrospectProperties() <em>Introspect Properties</em>}' attribute.
- * <!-- begin-user-doc -->
- * <!-- end-user-doc -->
- * @see #isIntrospectProperties()
- * @generated
- * @ordered
- */
- protected static final boolean INTROSPECT_PROPERTIES_EDEFAULT = true;
-
- /**
- * The flag representing the value of the '{@link #isIntrospectProperties() <em>Introspect Properties</em>}' attribute.
- * <!-- begin-user-doc -->
- * <!-- end-user-doc -->
- * @see #isIntrospectProperties()
- * @generated
- * @ordered
- */
- protected static final int INTROSPECT_PROPERTIES_EFLAG = 1 << 24;
-
- /**
- * The default value of the '{@link #isIntrospectMethods() <em>Introspect Methods</em>}' attribute.
- * <!-- begin-user-doc -->
- * <!-- end-user-doc -->
- * @see #isIntrospectMethods()
- * @generated
- * @ordered
- */
- protected static final boolean INTROSPECT_METHODS_EDEFAULT = true;
-
- /**
- * The flag representing the value of the '{@link #isIntrospectMethods() <em>Introspect Methods</em>}' attribute.
- * <!-- begin-user-doc -->
- * <!-- end-user-doc -->
- * @see #isIntrospectMethods()
- * @generated
- * @ordered
- */
- protected static final int INTROSPECT_METHODS_EFLAG = 1 << 25;
-
- /**
- * The default value of the '{@link #isIntrospectEvents() <em>Introspect Events</em>}' attribute.
- * <!-- begin-user-doc -->
- * <!-- end-user-doc -->
- * @see #isIntrospectEvents()
- * @generated
- * @ordered
- */
- protected static final boolean INTROSPECT_EVENTS_EDEFAULT = true;
-
- /**
- * The flag representing the value of the '{@link #isIntrospectEvents() <em>Introspect Events</em>}' attribute.
- * <!-- begin-user-doc -->
- * <!-- end-user-doc -->
- * @see #isIntrospectEvents()
- * @generated
- * @ordered
- */
- protected static final int INTROSPECT_EVENTS_EFLAG = 1 << 26;
-
- /**
- * The default value of the '{@link #isDoBeaninfo() <em>Do Beaninfo</em>}' attribute.
- * <!-- begin-user-doc -->
- * <!-- end-user-doc -->
- * @see #isDoBeaninfo()
- * @generated
- * @ordered
- */
- protected static final boolean DO_BEANINFO_EDEFAULT = true;
-
- /**
- * The flag representing the value of the '{@link #isDoBeaninfo() <em>Do Beaninfo</em>}' attribute.
- * <!-- begin-user-doc -->
- * <!-- end-user-doc -->
- * @see #isDoBeaninfo()
- * @generated
- * @ordered
- */
- protected static final int DO_BEANINFO_EFLAG = 1 << 27;
-
- /**
- * The cached value of the '{@link #getNotInheritedPropertyNames() <em>Not Inherited Property Names</em>}' attribute list.
- * <!-- begin-user-doc -->
- * <!-- end-user-doc -->
- * @see #getNotInheritedPropertyNames()
- * @generated
- * @ordered
- */
- protected EList notInheritedPropertyNames = null;
-
- /**
- * The cached value of the '{@link #getNotInheritedMethodNames() <em>Not Inherited Method Names</em>}' attribute list.
- * <!-- begin-user-doc -->
- * <!-- end-user-doc -->
- * @see #getNotInheritedMethodNames()
- * @generated
- * @ordered
- */
- protected EList notInheritedMethodNames = null;
-
- /**
- * The cached value of the '{@link #getNotInheritedEventNames() <em>Not Inherited Event Names</em>}' attribute list.
- * <!-- begin-user-doc -->
- * <!-- end-user-doc -->
- * @see #getNotInheritedEventNames()
- * @generated
- * @ordered
- */
- protected EList notInheritedEventNames = null;
-
- /**
- * The cached value of the '{@link #getCustomizerClass() <em>Customizer Class</em>}' reference.
- * <!-- begin-user-doc -->
- * <!-- end-user-doc -->
- * @see #getCustomizerClass()
- * @generated
- * @ordered
- */
- protected JavaClass customizerClass = null;
-
- /**
- * <!-- begin-user-doc -->
- * <!-- end-user-doc -->
- * @generated
- */
- protected BeanDecoratorImpl() {
- super();
- eFlags |= MERGE_SUPER_PROPERTIES_EFLAG;
- eFlags |= MERGE_SUPER_METHODS_EFLAG;
- eFlags |= MERGE_SUPER_EVENTS_EFLAG;
- eFlags |= INTROSPECT_PROPERTIES_EFLAG;
- eFlags |= INTROSPECT_METHODS_EFLAG;
- eFlags |= INTROSPECT_EVENTS_EFLAG;
- eFlags |= DO_BEANINFO_EFLAG;
- }
-
- /**
- * <!-- begin-user-doc -->
- * <!-- end-user-doc -->
- * @generated
- */
- protected EClass eStaticClass() {
- return BeaninfoPackage.eINSTANCE.getBeanDecorator();
- }
-
- /**
- * <!-- begin-user-doc -->
- * <!-- end-user-doc -->
- * @generated
- */
- public boolean isMergeSuperProperties() {
- return (eFlags & MERGE_SUPER_PROPERTIES_EFLAG) != 0;
- }
-
- /**
- * <!-- begin-user-doc -->
- * <!-- end-user-doc -->
- * @generated
- */
- public void setMergeSuperProperties(boolean newMergeSuperProperties) {
- boolean oldMergeSuperProperties = (eFlags & MERGE_SUPER_PROPERTIES_EFLAG) != 0;
- if (newMergeSuperProperties) eFlags |= MERGE_SUPER_PROPERTIES_EFLAG; else eFlags &= ~MERGE_SUPER_PROPERTIES_EFLAG;
- boolean oldMergeSuperPropertiesESet = (eFlags & MERGE_SUPER_PROPERTIES_ESETFLAG) != 0;
- eFlags |= MERGE_SUPER_PROPERTIES_ESETFLAG;
- if (eNotificationRequired())
- eNotify(new ENotificationImpl(this, Notification.SET, BeaninfoPackage.BEAN_DECORATOR__MERGE_SUPER_PROPERTIES, oldMergeSuperProperties, newMergeSuperProperties, !oldMergeSuperPropertiesESet));
- }
-
- /**
- * <!-- begin-user-doc -->
- * <!-- end-user-doc -->
- * @generated
- */
- public void unsetMergeSuperProperties() {
- boolean oldMergeSuperProperties = (eFlags & MERGE_SUPER_PROPERTIES_EFLAG) != 0;
- boolean oldMergeSuperPropertiesESet = (eFlags & MERGE_SUPER_PROPERTIES_ESETFLAG) != 0;
- if (MERGE_SUPER_PROPERTIES_EDEFAULT) eFlags |= MERGE_SUPER_PROPERTIES_EFLAG; else eFlags &= ~MERGE_SUPER_PROPERTIES_EFLAG;
- eFlags &= ~MERGE_SUPER_PROPERTIES_ESETFLAG;
- if (eNotificationRequired())
- eNotify(new ENotificationImpl(this, Notification.UNSET, BeaninfoPackage.BEAN_DECORATOR__MERGE_SUPER_PROPERTIES, oldMergeSuperProperties, MERGE_SUPER_PROPERTIES_EDEFAULT, oldMergeSuperPropertiesESet));
- }
-
- /**
- * <!-- begin-user-doc -->
- * <!-- end-user-doc -->
- * @generated
- */
- public boolean isSetMergeSuperProperties() {
- return (eFlags & MERGE_SUPER_PROPERTIES_ESETFLAG) != 0;
- }
-
- /**
- * <!-- begin-user-doc -->
- * <!-- end-user-doc -->
- * @generated
- */
- public boolean isMergeSuperMethods() {
- return (eFlags & MERGE_SUPER_METHODS_EFLAG) != 0;
- }
-
- /**
- * <!-- begin-user-doc -->
- * <!-- end-user-doc -->
- * @generated
- */
- public void setMergeSuperMethods(boolean newMergeSuperMethods) {
- boolean oldMergeSuperMethods = (eFlags & MERGE_SUPER_METHODS_EFLAG) != 0;
- if (newMergeSuperMethods) eFlags |= MERGE_SUPER_METHODS_EFLAG; else eFlags &= ~MERGE_SUPER_METHODS_EFLAG;
- boolean oldMergeSuperMethodsESet = (eFlags & MERGE_SUPER_METHODS_ESETFLAG) != 0;
- eFlags |= MERGE_SUPER_METHODS_ESETFLAG;
- if (eNotificationRequired())
- eNotify(new ENotificationImpl(this, Notification.SET, BeaninfoPackage.BEAN_DECORATOR__MERGE_SUPER_METHODS, oldMergeSuperMethods, newMergeSuperMethods, !oldMergeSuperMethodsESet));
- }
-
- /**
- * <!-- begin-user-doc -->
- * <!-- end-user-doc -->
- * @generated
- */
- public void unsetMergeSuperMethods() {
- boolean oldMergeSuperMethods = (eFlags & MERGE_SUPER_METHODS_EFLAG) != 0;
- boolean oldMergeSuperMethodsESet = (eFlags & MERGE_SUPER_METHODS_ESETFLAG) != 0;
- if (MERGE_SUPER_METHODS_EDEFAULT) eFlags |= MERGE_SUPER_METHODS_EFLAG; else eFlags &= ~MERGE_SUPER_METHODS_EFLAG;
- eFlags &= ~MERGE_SUPER_METHODS_ESETFLAG;
- if (eNotificationRequired())
- eNotify(new ENotificationImpl(this, Notification.UNSET, BeaninfoPackage.BEAN_DECORATOR__MERGE_SUPER_METHODS, oldMergeSuperMethods, MERGE_SUPER_METHODS_EDEFAULT, oldMergeSuperMethodsESet));
- }
-
- /**
- * <!-- begin-user-doc -->
- * <!-- end-user-doc -->
- * @generated
- */
- public boolean isSetMergeSuperMethods() {
- return (eFlags & MERGE_SUPER_METHODS_ESETFLAG) != 0;
- }
-
- /**
- * <!-- begin-user-doc -->
- * <!-- end-user-doc -->
- * @generated
- */
- public boolean isMergeSuperEvents() {
- return (eFlags & MERGE_SUPER_EVENTS_EFLAG) != 0;
- }
-
- /**
- * <!-- begin-user-doc -->
- * <!-- end-user-doc -->
- * @generated
- */
- public void setMergeSuperEvents(boolean newMergeSuperEvents) {
- boolean oldMergeSuperEvents = (eFlags & MERGE_SUPER_EVENTS_EFLAG) != 0;
- if (newMergeSuperEvents) eFlags |= MERGE_SUPER_EVENTS_EFLAG; else eFlags &= ~MERGE_SUPER_EVENTS_EFLAG;
- boolean oldMergeSuperEventsESet = (eFlags & MERGE_SUPER_EVENTS_ESETFLAG) != 0;
- eFlags |= MERGE_SUPER_EVENTS_ESETFLAG;
- if (eNotificationRequired())
- eNotify(new ENotificationImpl(this, Notification.SET, BeaninfoPackage.BEAN_DECORATOR__MERGE_SUPER_EVENTS, oldMergeSuperEvents, newMergeSuperEvents, !oldMergeSuperEventsESet));
- }
-
- /**
- * <!-- begin-user-doc -->
- * <!-- end-user-doc -->
- * @generated
- */
- public void unsetMergeSuperEvents() {
- boolean oldMergeSuperEvents = (eFlags & MERGE_SUPER_EVENTS_EFLAG) != 0;
- boolean oldMergeSuperEventsESet = (eFlags & MERGE_SUPER_EVENTS_ESETFLAG) != 0;
- if (MERGE_SUPER_EVENTS_EDEFAULT) eFlags |= MERGE_SUPER_EVENTS_EFLAG; else eFlags &= ~MERGE_SUPER_EVENTS_EFLAG;
- eFlags &= ~MERGE_SUPER_EVENTS_ESETFLAG;
- if (eNotificationRequired())
- eNotify(new ENotificationImpl(this, Notification.UNSET, BeaninfoPackage.BEAN_DECORATOR__MERGE_SUPER_EVENTS, oldMergeSuperEvents, MERGE_SUPER_EVENTS_EDEFAULT, oldMergeSuperEventsESet));
- }
-
- /**
- * <!-- begin-user-doc -->
- * <!-- end-user-doc -->
- * @generated
- */
- public boolean isSetMergeSuperEvents() {
- return (eFlags & MERGE_SUPER_EVENTS_ESETFLAG) != 0;
- }
-
- /**
- * <!-- begin-user-doc -->
- * <!-- end-user-doc -->
- * @generated
- */
- public boolean isIntrospectProperties() {
- return (eFlags & INTROSPECT_PROPERTIES_EFLAG) != 0;
- }
-
- /**
- * <!-- begin-user-doc -->
- * <!-- end-user-doc -->
- * @generated
- */
- public void setIntrospectProperties(boolean newIntrospectProperties) {
- boolean oldIntrospectProperties = (eFlags & INTROSPECT_PROPERTIES_EFLAG) != 0;
- if (newIntrospectProperties) eFlags |= INTROSPECT_PROPERTIES_EFLAG; else eFlags &= ~INTROSPECT_PROPERTIES_EFLAG;
- if (eNotificationRequired())
- eNotify(new ENotificationImpl(this, Notification.SET, BeaninfoPackage.BEAN_DECORATOR__INTROSPECT_PROPERTIES, oldIntrospectProperties, newIntrospectProperties));
- }
-
- /**
- * <!-- begin-user-doc -->
- * <!-- end-user-doc -->
- * @generated
- */
- public boolean isIntrospectMethods() {
- return (eFlags & INTROSPECT_METHODS_EFLAG) != 0;
- }
-
- /**
- * <!-- begin-user-doc -->
- * <!-- end-user-doc -->
- * @generated
- */
- public void setIntrospectMethods(boolean newIntrospectMethods) {
- boolean oldIntrospectMethods = (eFlags & INTROSPECT_METHODS_EFLAG) != 0;
- if (newIntrospectMethods) eFlags |= INTROSPECT_METHODS_EFLAG; else eFlags &= ~INTROSPECT_METHODS_EFLAG;
- if (eNotificationRequired())
- eNotify(new ENotificationImpl(this, Notification.SET, BeaninfoPackage.BEAN_DECORATOR__INTROSPECT_METHODS, oldIntrospectMethods, newIntrospectMethods));
- }
-
- /**
- * <!-- begin-user-doc -->
- * <!-- end-user-doc -->
- * @generated
- */
- public boolean isIntrospectEvents() {
- return (eFlags & INTROSPECT_EVENTS_EFLAG) != 0;
- }
-
- /**
- * <!-- begin-user-doc -->
- * <!-- end-user-doc -->
- * @generated
- */
- public void setIntrospectEvents(boolean newIntrospectEvents) {
- boolean oldIntrospectEvents = (eFlags & INTROSPECT_EVENTS_EFLAG) != 0;
- if (newIntrospectEvents) eFlags |= INTROSPECT_EVENTS_EFLAG; else eFlags &= ~INTROSPECT_EVENTS_EFLAG;
- if (eNotificationRequired())
- eNotify(new ENotificationImpl(this, Notification.SET, BeaninfoPackage.BEAN_DECORATOR__INTROSPECT_EVENTS, oldIntrospectEvents, newIntrospectEvents));
- }
-
- /**
- * <!-- begin-user-doc -->
- * <!-- end-user-doc -->
- * @generated
- */
- public void setCustomizerClass(JavaClass newCustomizerClass) {
- JavaClass oldCustomizerClass = customizerClass;
- customizerClass = newCustomizerClass;
- if (eNotificationRequired())
- eNotify(new ENotificationImpl(this, Notification.SET, BeaninfoPackage.BEAN_DECORATOR__CUSTOMIZER_CLASS, oldCustomizerClass, customizerClass));
- }
-
- /**
- * <!-- begin-user-doc -->
- * <!-- end-user-doc -->
- * @generated
- */
- public NotificationChain eInverseAdd(InternalEObject otherEnd, int featureID, Class baseClass, NotificationChain msgs) {
- if (featureID >= 0) {
- switch (eDerivedStructuralFeatureID(featureID, baseClass)) {
- case BeaninfoPackage.BEAN_DECORATOR__EANNOTATIONS:
- return ((InternalEList)getEAnnotations()).basicAdd(otherEnd, msgs);
- case BeaninfoPackage.BEAN_DECORATOR__EMODEL_ELEMENT:
- if (eContainer != null)
- msgs = eBasicRemoveFromContainer(msgs);
- return eBasicSetContainer(otherEnd, BeaninfoPackage.BEAN_DECORATOR__EMODEL_ELEMENT, msgs);
- default:
- return eDynamicInverseAdd(otherEnd, featureID, baseClass, msgs);
- }
- }
- if (eContainer != null)
- msgs = eBasicRemoveFromContainer(msgs);
- return eBasicSetContainer(otherEnd, featureID, msgs);
- }
-
- /**
- * <!-- begin-user-doc -->
- * <!-- end-user-doc -->
- * @generated
- */
- public NotificationChain eInverseRemove(InternalEObject otherEnd, int featureID, Class baseClass, NotificationChain msgs) {
- if (featureID >= 0) {
- switch (eDerivedStructuralFeatureID(featureID, baseClass)) {
- case BeaninfoPackage.BEAN_DECORATOR__EANNOTATIONS:
- return ((InternalEList)getEAnnotations()).basicRemove(otherEnd, msgs);
- case BeaninfoPackage.BEAN_DECORATOR__DETAILS:
- return ((InternalEList)getDetails()).basicRemove(otherEnd, msgs);
- case BeaninfoPackage.BEAN_DECORATOR__EMODEL_ELEMENT:
- return eBasicSetContainer(null, BeaninfoPackage.BEAN_DECORATOR__EMODEL_ELEMENT, msgs);
- case BeaninfoPackage.BEAN_DECORATOR__CONTENTS:
- return ((InternalEList)getContents()).basicRemove(otherEnd, msgs);
- case BeaninfoPackage.BEAN_DECORATOR__ATTRIBUTES:
- return ((InternalEList)getAttributes()).basicRemove(otherEnd, msgs);
- default:
- return eDynamicInverseRemove(otherEnd, featureID, baseClass, msgs);
- }
- }
- return eBasicSetContainer(null, featureID, msgs);
- }
-
- /**
- * <!-- begin-user-doc -->
- * <!-- end-user-doc -->
- * @generated
- */
- public NotificationChain eBasicRemoveFromContainer(NotificationChain msgs) {
- if (eContainerFeatureID() >= 0) {
- switch (eContainerFeatureID()) {
- case BeaninfoPackage.BEAN_DECORATOR__EMODEL_ELEMENT:
- return eContainer.eInverseRemove(this, EcorePackage.EMODEL_ELEMENT__EANNOTATIONS, EModelElement.class, msgs);
- default:
- return eDynamicBasicRemoveFromContainer(msgs);
- }
- }
- return eContainer.eInverseRemove(this, EOPPOSITE_FEATURE_BASE - eContainerFeatureID(), null, msgs);
- }
-
- /**
- * <!-- begin-user-doc -->
- * <!-- end-user-doc -->
- * @generated
- */
- public Object eGet(EStructuralFeature eFeature, boolean resolve) {
- switch (eDerivedStructuralFeatureID(eFeature)) {
- case BeaninfoPackage.BEAN_DECORATOR__EANNOTATIONS:
- return getEAnnotations();
- case BeaninfoPackage.BEAN_DECORATOR__SOURCE:
- return getSource();
- case BeaninfoPackage.BEAN_DECORATOR__DETAILS:
- return getDetails();
- case BeaninfoPackage.BEAN_DECORATOR__EMODEL_ELEMENT:
- return getEModelElement();
- case BeaninfoPackage.BEAN_DECORATOR__CONTENTS:
- return getContents();
- case BeaninfoPackage.BEAN_DECORATOR__REFERENCES:
- return getReferences();
- case BeaninfoPackage.BEAN_DECORATOR__DISPLAY_NAME:
- return getDisplayName();
- case BeaninfoPackage.BEAN_DECORATOR__SHORT_DESCRIPTION:
- return getShortDescription();
- case BeaninfoPackage.BEAN_DECORATOR__CATEGORY:
- return getCategory();
- case BeaninfoPackage.BEAN_DECORATOR__EXPERT:
- return isExpert() ? Boolean.TRUE : Boolean.FALSE;
- case BeaninfoPackage.BEAN_DECORATOR__HIDDEN:
- return isHidden() ? Boolean.TRUE : Boolean.FALSE;
- case BeaninfoPackage.BEAN_DECORATOR__PREFERRED:
- return isPreferred() ? Boolean.TRUE : Boolean.FALSE;
- case BeaninfoPackage.BEAN_DECORATOR__MERGE_INTROSPECTION:
- return isMergeIntrospection() ? Boolean.TRUE : Boolean.FALSE;
- case BeaninfoPackage.BEAN_DECORATOR__ATTRIBUTES_EXPLICIT_EMPTY:
- return isAttributesExplicitEmpty() ? Boolean.TRUE : Boolean.FALSE;
- case BeaninfoPackage.BEAN_DECORATOR__IMPLICITLY_SET_BITS:
- return new Long(getImplicitlySetBits());
- case BeaninfoPackage.BEAN_DECORATOR__IMPLICIT_DECORATOR_FLAG:
- return getImplicitDecoratorFlag();
- case BeaninfoPackage.BEAN_DECORATOR__ATTRIBUTES:
- return getAttributes();
- case BeaninfoPackage.BEAN_DECORATOR__MERGE_SUPER_PROPERTIES:
- return isMergeSuperProperties() ? Boolean.TRUE : Boolean.FALSE;
- case BeaninfoPackage.BEAN_DECORATOR__MERGE_SUPER_METHODS:
- return isMergeSuperMethods() ? Boolean.TRUE : Boolean.FALSE;
- case BeaninfoPackage.BEAN_DECORATOR__MERGE_SUPER_EVENTS:
- return isMergeSuperEvents() ? Boolean.TRUE : Boolean.FALSE;
- case BeaninfoPackage.BEAN_DECORATOR__INTROSPECT_PROPERTIES:
- return isIntrospectProperties() ? Boolean.TRUE : Boolean.FALSE;
- case BeaninfoPackage.BEAN_DECORATOR__INTROSPECT_METHODS:
- return isIntrospectMethods() ? Boolean.TRUE : Boolean.FALSE;
- case BeaninfoPackage.BEAN_DECORATOR__INTROSPECT_EVENTS:
- return isIntrospectEvents() ? Boolean.TRUE : Boolean.FALSE;
- case BeaninfoPackage.BEAN_DECORATOR__DO_BEANINFO:
- return isDoBeaninfo() ? Boolean.TRUE : Boolean.FALSE;
- case BeaninfoPackage.BEAN_DECORATOR__NOT_INHERITED_PROPERTY_NAMES:
- return getNotInheritedPropertyNames();
- case BeaninfoPackage.BEAN_DECORATOR__NOT_INHERITED_METHOD_NAMES:
- return getNotInheritedMethodNames();
- case BeaninfoPackage.BEAN_DECORATOR__NOT_INHERITED_EVENT_NAMES:
- return getNotInheritedEventNames();
- case BeaninfoPackage.BEAN_DECORATOR__CUSTOMIZER_CLASS:
- if (resolve) return getCustomizerClass();
- return basicGetCustomizerClass();
- }
- return eDynamicGet(eFeature, resolve);
- }
-
- /**
- * <!-- begin-user-doc -->
- * <!-- end-user-doc -->
- * @generated
- */
- public void eSet(EStructuralFeature eFeature, Object newValue) {
- switch (eDerivedStructuralFeatureID(eFeature)) {
- case BeaninfoPackage.BEAN_DECORATOR__EANNOTATIONS:
- getEAnnotations().clear();
- getEAnnotations().addAll((Collection)newValue);
- return;
- case BeaninfoPackage.BEAN_DECORATOR__SOURCE:
- setSource((String)newValue);
- return;
- case BeaninfoPackage.BEAN_DECORATOR__DETAILS:
- getDetails().clear();
- getDetails().addAll((Collection)newValue);
- return;
- case BeaninfoPackage.BEAN_DECORATOR__EMODEL_ELEMENT:
- setEModelElement((EModelElement)newValue);
- return;
- case BeaninfoPackage.BEAN_DECORATOR__CONTENTS:
- getContents().clear();
- getContents().addAll((Collection)newValue);
- return;
- case BeaninfoPackage.BEAN_DECORATOR__REFERENCES:
- getReferences().clear();
- getReferences().addAll((Collection)newValue);
- return;
- case BeaninfoPackage.BEAN_DECORATOR__DISPLAY_NAME:
- setDisplayName((String)newValue);
- return;
- case BeaninfoPackage.BEAN_DECORATOR__SHORT_DESCRIPTION:
- setShortDescription((String)newValue);
- return;
- case BeaninfoPackage.BEAN_DECORATOR__CATEGORY:
- setCategory((String)newValue);
- return;
- case BeaninfoPackage.BEAN_DECORATOR__EXPERT:
- setExpert(((Boolean)newValue).booleanValue());
- return;
- case BeaninfoPackage.BEAN_DECORATOR__HIDDEN:
- setHidden(((Boolean)newValue).booleanValue());
- return;
- case BeaninfoPackage.BEAN_DECORATOR__PREFERRED:
- setPreferred(((Boolean)newValue).booleanValue());
- return;
- case BeaninfoPackage.BEAN_DECORATOR__MERGE_INTROSPECTION:
- setMergeIntrospection(((Boolean)newValue).booleanValue());
- return;
- case BeaninfoPackage.BEAN_DECORATOR__ATTRIBUTES_EXPLICIT_EMPTY:
- setAttributesExplicitEmpty(((Boolean)newValue).booleanValue());
- return;
- case BeaninfoPackage.BEAN_DECORATOR__IMPLICITLY_SET_BITS:
- setImplicitlySetBits(((Long)newValue).longValue());
- return;
- case BeaninfoPackage.BEAN_DECORATOR__IMPLICIT_DECORATOR_FLAG:
- setImplicitDecoratorFlag((ImplicitItem)newValue);
- return;
- case BeaninfoPackage.BEAN_DECORATOR__ATTRIBUTES:
- getAttributes().clear();
- getAttributes().addAll((Collection)newValue);
- return;
- case BeaninfoPackage.BEAN_DECORATOR__MERGE_SUPER_PROPERTIES:
- setMergeSuperProperties(((Boolean)newValue).booleanValue());
- return;
- case BeaninfoPackage.BEAN_DECORATOR__MERGE_SUPER_METHODS:
- setMergeSuperMethods(((Boolean)newValue).booleanValue());
- return;
- case BeaninfoPackage.BEAN_DECORATOR__MERGE_SUPER_EVENTS:
- setMergeSuperEvents(((Boolean)newValue).booleanValue());
- return;
- case BeaninfoPackage.BEAN_DECORATOR__INTROSPECT_PROPERTIES:
- setIntrospectProperties(((Boolean)newValue).booleanValue());
- return;
- case BeaninfoPackage.BEAN_DECORATOR__INTROSPECT_METHODS:
- setIntrospectMethods(((Boolean)newValue).booleanValue());
- return;
- case BeaninfoPackage.BEAN_DECORATOR__INTROSPECT_EVENTS:
- setIntrospectEvents(((Boolean)newValue).booleanValue());
- return;
- case BeaninfoPackage.BEAN_DECORATOR__DO_BEANINFO:
- setDoBeaninfo(((Boolean)newValue).booleanValue());
- return;
- case BeaninfoPackage.BEAN_DECORATOR__NOT_INHERITED_PROPERTY_NAMES:
- getNotInheritedPropertyNames().clear();
- getNotInheritedPropertyNames().addAll((Collection)newValue);
- return;
- case BeaninfoPackage.BEAN_DECORATOR__NOT_INHERITED_METHOD_NAMES:
- getNotInheritedMethodNames().clear();
- getNotInheritedMethodNames().addAll((Collection)newValue);
- return;
- case BeaninfoPackage.BEAN_DECORATOR__NOT_INHERITED_EVENT_NAMES:
- getNotInheritedEventNames().clear();
- getNotInheritedEventNames().addAll((Collection)newValue);
- return;
- case BeaninfoPackage.BEAN_DECORATOR__CUSTOMIZER_CLASS:
- setCustomizerClass((JavaClass)newValue);
- return;
- }
- eDynamicSet(eFeature, newValue);
- }
-
- /**
- * <!-- begin-user-doc -->
- * <!-- end-user-doc -->
- * @generated
- */
- public void eUnset(EStructuralFeature eFeature) {
- switch (eDerivedStructuralFeatureID(eFeature)) {
- case BeaninfoPackage.BEAN_DECORATOR__EANNOTATIONS:
- getEAnnotations().clear();
- return;
- case BeaninfoPackage.BEAN_DECORATOR__SOURCE:
- setSource(SOURCE_EDEFAULT);
- return;
- case BeaninfoPackage.BEAN_DECORATOR__DETAILS:
- getDetails().clear();
- return;
- case BeaninfoPackage.BEAN_DECORATOR__EMODEL_ELEMENT:
- setEModelElement((EModelElement)null);
- return;
- case BeaninfoPackage.BEAN_DECORATOR__CONTENTS:
- getContents().clear();
- return;
- case BeaninfoPackage.BEAN_DECORATOR__REFERENCES:
- getReferences().clear();
- return;
- case BeaninfoPackage.BEAN_DECORATOR__DISPLAY_NAME:
- unsetDisplayName();
- return;
- case BeaninfoPackage.BEAN_DECORATOR__SHORT_DESCRIPTION:
- unsetShortDescription();
- return;
- case BeaninfoPackage.BEAN_DECORATOR__CATEGORY:
- setCategory(CATEGORY_EDEFAULT);
- return;
- case BeaninfoPackage.BEAN_DECORATOR__EXPERT:
- unsetExpert();
- return;
- case BeaninfoPackage.BEAN_DECORATOR__HIDDEN:
- unsetHidden();
- return;
- case BeaninfoPackage.BEAN_DECORATOR__PREFERRED:
- unsetPreferred();
- return;
- case BeaninfoPackage.BEAN_DECORATOR__MERGE_INTROSPECTION:
- setMergeIntrospection(MERGE_INTROSPECTION_EDEFAULT);
- return;
- case BeaninfoPackage.BEAN_DECORATOR__ATTRIBUTES_EXPLICIT_EMPTY:
- setAttributesExplicitEmpty(ATTRIBUTES_EXPLICIT_EMPTY_EDEFAULT);
- return;
- case BeaninfoPackage.BEAN_DECORATOR__IMPLICITLY_SET_BITS:
- setImplicitlySetBits(IMPLICITLY_SET_BITS_EDEFAULT);
- return;
- case BeaninfoPackage.BEAN_DECORATOR__IMPLICIT_DECORATOR_FLAG:
- setImplicitDecoratorFlag(IMPLICIT_DECORATOR_FLAG_EDEFAULT);
- return;
- case BeaninfoPackage.BEAN_DECORATOR__ATTRIBUTES:
- getAttributes().clear();
- return;
- case BeaninfoPackage.BEAN_DECORATOR__MERGE_SUPER_PROPERTIES:
- unsetMergeSuperProperties();
- return;
- case BeaninfoPackage.BEAN_DECORATOR__MERGE_SUPER_METHODS:
- unsetMergeSuperMethods();
- return;
- case BeaninfoPackage.BEAN_DECORATOR__MERGE_SUPER_EVENTS:
- unsetMergeSuperEvents();
- return;
- case BeaninfoPackage.BEAN_DECORATOR__INTROSPECT_PROPERTIES:
- setIntrospectProperties(INTROSPECT_PROPERTIES_EDEFAULT);
- return;
- case BeaninfoPackage.BEAN_DECORATOR__INTROSPECT_METHODS:
- setIntrospectMethods(INTROSPECT_METHODS_EDEFAULT);
- return;
- case BeaninfoPackage.BEAN_DECORATOR__INTROSPECT_EVENTS:
- setIntrospectEvents(INTROSPECT_EVENTS_EDEFAULT);
- return;
- case BeaninfoPackage.BEAN_DECORATOR__DO_BEANINFO:
- setDoBeaninfo(DO_BEANINFO_EDEFAULT);
- return;
- case BeaninfoPackage.BEAN_DECORATOR__NOT_INHERITED_PROPERTY_NAMES:
- getNotInheritedPropertyNames().clear();
- return;
- case BeaninfoPackage.BEAN_DECORATOR__NOT_INHERITED_METHOD_NAMES:
- getNotInheritedMethodNames().clear();
- return;
- case BeaninfoPackage.BEAN_DECORATOR__NOT_INHERITED_EVENT_NAMES:
- getNotInheritedEventNames().clear();
- return;
- case BeaninfoPackage.BEAN_DECORATOR__CUSTOMIZER_CLASS:
- setCustomizerClass((JavaClass)null);
- return;
- }
- eDynamicUnset(eFeature);
- }
-
- /* (non-Javadoc)
- * @see org.eclipse.emf.ecore.EObject#eIsSet(org.eclipse.emf.ecore.EStructuralFeature)
- */
- public boolean eIsSet(EStructuralFeature eFeature) {
- switch (eDerivedStructuralFeatureID(eFeature)) {
- case BeaninfoPackage.BEAN_DECORATOR__SOURCE:
- return isSourceSet(); // Override so that if set to the same as classname, then it is considered not set.
- default:
- return eIsSetGen(eFeature);
- }
- }
-
- /**
- * <!-- begin-user-doc -->
- * <!-- end-user-doc -->
- * @generated
- */
- public boolean eIsSetGen(EStructuralFeature eFeature) {
- switch (eDerivedStructuralFeatureID(eFeature)) {
- case BeaninfoPackage.BEAN_DECORATOR__EANNOTATIONS:
- return eAnnotations != null && !eAnnotations.isEmpty();
- case BeaninfoPackage.BEAN_DECORATOR__SOURCE:
- return SOURCE_EDEFAULT == null ? source != null : !SOURCE_EDEFAULT.equals(source);
- case BeaninfoPackage.BEAN_DECORATOR__DETAILS:
- return details != null && !details.isEmpty();
- case BeaninfoPackage.BEAN_DECORATOR__EMODEL_ELEMENT:
- return getEModelElement() != null;
- case BeaninfoPackage.BEAN_DECORATOR__CONTENTS:
- return contents != null && !contents.isEmpty();
- case BeaninfoPackage.BEAN_DECORATOR__REFERENCES:
- return references != null && !references.isEmpty();
- case BeaninfoPackage.BEAN_DECORATOR__DISPLAY_NAME:
- return isSetDisplayName();
- case BeaninfoPackage.BEAN_DECORATOR__SHORT_DESCRIPTION:
- return isSetShortDescription();
- case BeaninfoPackage.BEAN_DECORATOR__CATEGORY:
- return CATEGORY_EDEFAULT == null ? category != null : !CATEGORY_EDEFAULT.equals(category);
- case BeaninfoPackage.BEAN_DECORATOR__EXPERT:
- return isSetExpert();
- case BeaninfoPackage.BEAN_DECORATOR__HIDDEN:
- return isSetHidden();
- case BeaninfoPackage.BEAN_DECORATOR__PREFERRED:
- return isSetPreferred();
- case BeaninfoPackage.BEAN_DECORATOR__MERGE_INTROSPECTION:
- return ((eFlags & MERGE_INTROSPECTION_EFLAG) != 0) != MERGE_INTROSPECTION_EDEFAULT;
- case BeaninfoPackage.BEAN_DECORATOR__ATTRIBUTES_EXPLICIT_EMPTY:
- return ((eFlags & ATTRIBUTES_EXPLICIT_EMPTY_EFLAG) != 0) != ATTRIBUTES_EXPLICIT_EMPTY_EDEFAULT;
- case BeaninfoPackage.BEAN_DECORATOR__IMPLICITLY_SET_BITS:
- return implicitlySetBits != IMPLICITLY_SET_BITS_EDEFAULT;
- case BeaninfoPackage.BEAN_DECORATOR__IMPLICIT_DECORATOR_FLAG:
- return implicitDecoratorFlag != IMPLICIT_DECORATOR_FLAG_EDEFAULT;
- case BeaninfoPackage.BEAN_DECORATOR__ATTRIBUTES:
- return attributes != null && !attributes.isEmpty();
- case BeaninfoPackage.BEAN_DECORATOR__MERGE_SUPER_PROPERTIES:
- return isSetMergeSuperProperties();
- case BeaninfoPackage.BEAN_DECORATOR__MERGE_SUPER_METHODS:
- return isSetMergeSuperMethods();
- case BeaninfoPackage.BEAN_DECORATOR__MERGE_SUPER_EVENTS:
- return isSetMergeSuperEvents();
- case BeaninfoPackage.BEAN_DECORATOR__INTROSPECT_PROPERTIES:
- return ((eFlags & INTROSPECT_PROPERTIES_EFLAG) != 0) != INTROSPECT_PROPERTIES_EDEFAULT;
- case BeaninfoPackage.BEAN_DECORATOR__INTROSPECT_METHODS:
- return ((eFlags & INTROSPECT_METHODS_EFLAG) != 0) != INTROSPECT_METHODS_EDEFAULT;
- case BeaninfoPackage.BEAN_DECORATOR__INTROSPECT_EVENTS:
- return ((eFlags & INTROSPECT_EVENTS_EFLAG) != 0) != INTROSPECT_EVENTS_EDEFAULT;
- case BeaninfoPackage.BEAN_DECORATOR__DO_BEANINFO:
- return ((eFlags & DO_BEANINFO_EFLAG) != 0) != DO_BEANINFO_EDEFAULT;
- case BeaninfoPackage.BEAN_DECORATOR__NOT_INHERITED_PROPERTY_NAMES:
- return notInheritedPropertyNames != null && !notInheritedPropertyNames.isEmpty();
- case BeaninfoPackage.BEAN_DECORATOR__NOT_INHERITED_METHOD_NAMES:
- return notInheritedMethodNames != null && !notInheritedMethodNames.isEmpty();
- case BeaninfoPackage.BEAN_DECORATOR__NOT_INHERITED_EVENT_NAMES:
- return notInheritedEventNames != null && !notInheritedEventNames.isEmpty();
- case BeaninfoPackage.BEAN_DECORATOR__CUSTOMIZER_CLASS:
- return customizerClass != null;
- }
- return eDynamicIsSet(eFeature);
- }
-
- /**
- * <!-- begin-user-doc -->
- * <!-- end-user-doc -->
- * @generated
- */
- public String toString() {
- if (eIsProxy()) return super.toString();
-
- StringBuffer result = new StringBuffer(super.toString());
- result.append(" (mergeSuperProperties: ");
- if ((eFlags & MERGE_SUPER_PROPERTIES_ESETFLAG) != 0) result.append((eFlags & MERGE_SUPER_PROPERTIES_EFLAG) != 0); else result.append("<unset>");
- result.append(", mergeSuperMethods: ");
- if ((eFlags & MERGE_SUPER_METHODS_ESETFLAG) != 0) result.append((eFlags & MERGE_SUPER_METHODS_EFLAG) != 0); else result.append("<unset>");
- result.append(", mergeSuperEvents: ");
- if ((eFlags & MERGE_SUPER_EVENTS_ESETFLAG) != 0) result.append((eFlags & MERGE_SUPER_EVENTS_EFLAG) != 0); else result.append("<unset>");
- result.append(", introspectProperties: ");
- result.append((eFlags & INTROSPECT_PROPERTIES_EFLAG) != 0);
- result.append(", introspectMethods: ");
- result.append((eFlags & INTROSPECT_METHODS_EFLAG) != 0);
- result.append(", introspectEvents: ");
- result.append((eFlags & INTROSPECT_EVENTS_EFLAG) != 0);
- result.append(", doBeaninfo: ");
- result.append((eFlags & DO_BEANINFO_EFLAG) != 0);
- result.append(", notInheritedPropertyNames: ");
- result.append(notInheritedPropertyNames);
- result.append(", notInheritedMethodNames: ");
- result.append(notInheritedMethodNames);
- result.append(", notInheritedEventNames: ");
- result.append(notInheritedEventNames);
- result.append(')');
- return result.toString();
- }
-
- /**
- * <!-- begin-user-doc -->
- * <!-- end-user-doc -->
- * @generated
- */
- public JavaClass basicGetCustomizerClass() {
- return customizerClass;
- }
-
- /**
- * <!-- begin-user-doc -->
- * <!-- end-user-doc -->
- * @generated
- */
- public boolean isDoBeaninfo() {
- return (eFlags & DO_BEANINFO_EFLAG) != 0;
- }
-
- /**
- * <!-- begin-user-doc -->
- * <!-- end-user-doc -->
- * @generated
- */
- public void setDoBeaninfo(boolean newDoBeaninfo) {
- boolean oldDoBeaninfo = (eFlags & DO_BEANINFO_EFLAG) != 0;
- if (newDoBeaninfo) eFlags |= DO_BEANINFO_EFLAG; else eFlags &= ~DO_BEANINFO_EFLAG;
- if (eNotificationRequired())
- eNotify(new ENotificationImpl(this, Notification.SET, BeaninfoPackage.BEAN_DECORATOR__DO_BEANINFO, oldDoBeaninfo, newDoBeaninfo));
- }
-
- /**
- * <!-- begin-user-doc -->
- * <!-- end-user-doc -->
- * @generated
- */
- public EList getNotInheritedPropertyNames() {
- if (notInheritedPropertyNames == null) {
- notInheritedPropertyNames = new EDataTypeUniqueEList(String.class, this, BeaninfoPackage.BEAN_DECORATOR__NOT_INHERITED_PROPERTY_NAMES);
- }
- return notInheritedPropertyNames;
- }
-
- /**
- * <!-- begin-user-doc -->
- * <!-- end-user-doc -->
- * @generated
- */
- public EList getNotInheritedMethodNames() {
- if (notInheritedMethodNames == null) {
- notInheritedMethodNames = new EDataTypeUniqueEList(String.class, this, BeaninfoPackage.BEAN_DECORATOR__NOT_INHERITED_METHOD_NAMES);
- }
- return notInheritedMethodNames;
- }
-
- /**
- * <!-- begin-user-doc -->
- * <!-- end-user-doc -->
- * @generated
- */
- public EList getNotInheritedEventNames() {
- if (notInheritedEventNames == null) {
- notInheritedEventNames = new EDataTypeUniqueEList(String.class, this, BeaninfoPackage.BEAN_DECORATOR__NOT_INHERITED_EVENT_NAMES);
- }
- return notInheritedEventNames;
- }
-
- /**
- * <!-- begin-user-doc -->
- * <!-- end-user-doc -->
- * @generated
- */
- public JavaClass getCustomizerClass() {
- if (customizerClass != null && customizerClass.eIsProxy()) {
- JavaClass oldCustomizerClass = customizerClass;
- customizerClass = (JavaClass)eResolveProxy((InternalEObject)customizerClass);
- if (customizerClass != oldCustomizerClass) {
- if (eNotificationRequired())
- eNotify(new ENotificationImpl(this, Notification.RESOLVE, BeaninfoPackage.BEAN_DECORATOR__CUSTOMIZER_CLASS, oldCustomizerClass, customizerClass));
- }
- }
- return customizerClass;
- }
-
- private URL iconURL;
- private boolean hasQueriedIconURL;
-
- public URL getIconURL(){
- if (!hasQueriedIconURL){
- FeatureAttributeValue value = (FeatureAttributeValue) getAttributes().get(IBaseBeanInfoConstants.ICONCOLOR16X16URL);
- if (value != null) {
- // Get the value
- Object attr = value.getValue();
- if (attr instanceof String) {
- try {
- hasQueriedIconURL = true;
- iconURL = new URL((String) attr);
- } catch ( MalformedURLException exc ) {
- BeaninfoPlugin.getPlugin().getLogger().log(exc, Level.INFO);
- }
- }
- }
- }
- return iconURL;
- }
-}
diff --git a/plugins/org.eclipse.jem.beaninfo/beaninfo/org/eclipse/jem/internal/beaninfo/impl/BeanEventImpl.java b/plugins/org.eclipse.jem.beaninfo/beaninfo/org/eclipse/jem/internal/beaninfo/impl/BeanEventImpl.java
deleted file mode 100644
index 3b7e5f6..0000000
--- a/plugins/org.eclipse.jem.beaninfo/beaninfo/org/eclipse/jem/internal/beaninfo/impl/BeanEventImpl.java
+++ /dev/null
@@ -1,55 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2001, 2005 IBM Corporation and others.
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
- *
- * Contributors:
- * IBM Corporation - initial API and implementation
- *******************************************************************************/
-package org.eclipse.jem.internal.beaninfo.impl;
-/*
-
-
- */
-
-import org.eclipse.emf.ecore.EClass;
-
-import org.eclipse.jem.internal.beaninfo.BeanEvent;
-import org.eclipse.jem.internal.beaninfo.BeaninfoPackage;
-import org.eclipse.jem.java.internal.impl.JavaEventImpl;
-
-
-/**
- * <!-- begin-user-doc -->
- * An implementation of the model object '<em><b>Bean Event</b></em>'.
- * <!-- end-user-doc -->
- * <p>
- * </p>
- *
- * @generated
- */
-
-public class BeanEventImpl extends JavaEventImpl implements BeanEvent{
-
-
- /**
- * <!-- begin-user-doc -->
- * <!-- end-user-doc -->
- * @generated
- */
- protected BeanEventImpl() {
- super();
- }
-
- /**
- * <!-- begin-user-doc -->
- * <!-- end-user-doc -->
- * @generated
- */
- protected EClass eStaticClass() {
- return BeaninfoPackage.Literals.BEAN_EVENT;
- }
-
-}
diff --git a/plugins/org.eclipse.jem.beaninfo/beaninfo/org/eclipse/jem/internal/beaninfo/impl/BeaninfoFactoryImpl.java b/plugins/org.eclipse.jem.beaninfo/beaninfo/org/eclipse/jem/internal/beaninfo/impl/BeaninfoFactoryImpl.java
deleted file mode 100644
index 1d73e69..0000000
--- a/plugins/org.eclipse.jem.beaninfo/beaninfo/org/eclipse/jem/internal/beaninfo/impl/BeaninfoFactoryImpl.java
+++ /dev/null
@@ -1,277 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2001, 2005 IBM Corporation and others.
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
- *
- * Contributors:
- * IBM Corporation - initial API and implementation
- *******************************************************************************/
-package org.eclipse.jem.internal.beaninfo.impl;
-/*
-
-
- */
-
-import java.util.Map;
-
-import org.eclipse.jem.internal.beaninfo.*;
-import org.eclipse.jem.internal.beaninfo.common.FeatureAttributeValue;
-
-import org.eclipse.emf.ecore.EClass;
-import org.eclipse.emf.ecore.EDataType;
-import org.eclipse.emf.ecore.EObject;
-import org.eclipse.emf.ecore.EPackage;
-import org.eclipse.emf.ecore.impl.EFactoryImpl;
-import org.eclipse.emf.ecore.plugin.EcorePlugin;
-
-/**
- * <!-- begin-user-doc -->
- * An implementation of the model <b>Factory</b>.
- * <!-- end-user-doc -->
- * @generated
- */
-
-
-public class BeaninfoFactoryImpl extends EFactoryImpl implements BeaninfoFactory{
-
- /**
- * Creates the default factory implementation.
- * <!-- begin-user-doc -->
- * <!-- end-user-doc -->
- * @generated
- */
- public static BeaninfoFactory init() {
- try {
- BeaninfoFactory theBeaninfoFactory = (BeaninfoFactory)EPackage.Registry.INSTANCE.getEFactory("http:///org/eclipse/jem/internal/beaninfo/beaninfo.ecore");
- if (theBeaninfoFactory != null) {
- return theBeaninfoFactory;
- }
- }
- catch (Exception exception) {
- EcorePlugin.INSTANCE.log(exception);
- }
- return new BeaninfoFactoryImpl();
- }
-
- /**
- * Creates an instance of the factory.
- * <!-- begin-user-doc -->
- * <!-- end-user-doc -->
- * @generated
- */
- public BeaninfoFactoryImpl() {
- super();
- }
-
- /**
- * <!-- begin-user-doc -->
- * <!-- end-user-doc -->
- * @generated
- */
- public EObject create(EClass eClass) {
- switch (eClass.getClassifierID()) {
- case BeaninfoPackage.FEATURE_DECORATOR: return createFeatureDecorator();
- case BeaninfoPackage.BEAN_DECORATOR: return createBeanDecorator();
- case BeaninfoPackage.EVENT_SET_DECORATOR: return createEventSetDecorator();
- case BeaninfoPackage.METHOD_DECORATOR: return createMethodDecorator();
- case BeaninfoPackage.PARAMETER_DECORATOR: return createParameterDecorator();
- case BeaninfoPackage.PROPERTY_DECORATOR: return createPropertyDecorator();
- case BeaninfoPackage.INDEXED_PROPERTY_DECORATOR: return createIndexedPropertyDecorator();
- case BeaninfoPackage.METHOD_PROXY: return createMethodProxy();
- case BeaninfoPackage.BEAN_EVENT: return createBeanEvent();
- case BeaninfoPackage.FEATURE_ATTRIBUTE_MAP_ENTRY: return (EObject)createFeatureAttributeMapEntry();
- default:
- throw new IllegalArgumentException("The class '" + eClass.getName() + "' is not a valid classifier");
- }
- }
-
- /**
- * <!-- begin-user-doc -->
- * <!-- end-user-doc -->
- * @generated
- */
- public Object createFromString(EDataType eDataType, String initialValue) {
- switch (eDataType.getClassifierID()) {
- case BeaninfoPackage.IMPLICIT_ITEM:
- return createImplicitItemFromString(eDataType, initialValue);
- case BeaninfoPackage.FEATURE_ATTRIBUTE_VALUE:
- return createFeatureAttributeValueFromString(eDataType, initialValue);
- default:
- throw new IllegalArgumentException("The datatype '" + eDataType.getName() + "' is not a valid classifier");
- }
- }
-
- /**
- * <!-- begin-user-doc -->
- * <!-- end-user-doc -->
- * @generated
- */
- public String convertToString(EDataType eDataType, Object instanceValue) {
- switch (eDataType.getClassifierID()) {
- case BeaninfoPackage.IMPLICIT_ITEM:
- return convertImplicitItemToString(eDataType, instanceValue);
- case BeaninfoPackage.FEATURE_ATTRIBUTE_VALUE:
- return convertFeatureAttributeValueToString(eDataType, instanceValue);
- default:
- throw new IllegalArgumentException("The datatype '" + eDataType.getName() + "' is not a valid classifier");
- }
- }
-
- /**
- * <!-- begin-user-doc -->
- * <!-- end-user-doc -->
- */
- public FeatureDecorator createFeatureDecorator() {
- FeatureDecoratorImpl featureDecorator = new FeatureDecoratorImpl();
- featureDecorator.setSource(FeatureDecorator.class.getName());
- return featureDecorator;
- }
-
- /**
- * <!-- begin-user-doc -->
- * <!-- end-user-doc -->
- */
- public EventSetDecorator createEventSetDecorator() {
- EventSetDecoratorImpl eventSetDecorator = new EventSetDecoratorImpl();
- eventSetDecorator.setSource(EventSetDecorator.class.getName());
- return eventSetDecorator;
- }
-
- /**
- * <!-- begin-user-doc -->
- * <!-- end-user-doc -->
- * @generated
- */
- public MethodProxy createMethodProxy() {
- MethodProxyImpl methodProxy = new MethodProxyImpl();
- return methodProxy;
- }
-
- /**
- * <!-- begin-user-doc -->
- * <!-- end-user-doc -->
- */
- public PropertyDecorator createPropertyDecorator() {
- PropertyDecoratorImpl propertyDecorator = new PropertyDecoratorImpl();
- propertyDecorator.setSource(PropertyDecorator.class.getName());
- return propertyDecorator;
- }
-
- /**
- * <!-- begin-user-doc -->
- * <!-- end-user-doc -->
- */
- public IndexedPropertyDecorator createIndexedPropertyDecorator() {
- IndexedPropertyDecoratorImpl indexedPropertyDecorator = new IndexedPropertyDecoratorImpl();
- indexedPropertyDecorator.setSource(IndexedPropertyDecorator.class.getName());
- return indexedPropertyDecorator;
- }
-
- /**
- * <!-- begin-user-doc -->
- * <!-- end-user-doc -->
- */
- public BeanDecorator createBeanDecorator() {
- BeanDecoratorImpl beanDecorator = new BeanDecoratorImpl();
- beanDecorator.setSource(BeanDecorator.class.getName());
- return beanDecorator;
- }
-
- /**
- * <!-- begin-user-doc -->
- * <!-- end-user-doc -->
- */
- public MethodDecorator createMethodDecorator() {
- MethodDecoratorImpl methodDecorator = new MethodDecoratorImpl();
- methodDecorator.setSource(MethodDecorator.class.getName());
- return methodDecorator;
- }
-
- /**
- * <!-- begin-user-doc -->
- * <!-- end-user-doc -->
- */
- public ParameterDecorator createParameterDecorator() {
- ParameterDecoratorImpl parameterDecorator = new ParameterDecoratorImpl();
- parameterDecorator.setSource(ParameterDecorator.class.getName());
- return parameterDecorator;
- }
-
- /**
- * <!-- begin-user-doc -->
- * <!-- end-user-doc -->
- * @generated
- */
- public BeaninfoPackage getBeaninfoPackage() {
- return (BeaninfoPackage)getEPackage();
- }
-
- /**
- * <!-- begin-user-doc -->
- * <!-- end-user-doc -->
- * @deprecated
- * @generated
- */
- public static BeaninfoPackage getPackage() {
- return BeaninfoPackage.eINSTANCE;
- }
-
- /**
- * <!-- begin-user-doc -->
- * <!-- end-user-doc -->
- * @generated
- */
- public BeanEvent createBeanEvent() {
- BeanEventImpl beanEvent = new BeanEventImpl();
- return beanEvent;
- }
-
- /**
- * <!-- begin-user-doc -->
- * <!-- end-user-doc -->
- * @generated
- */
- public Map.Entry createFeatureAttributeMapEntry() {
- FeatureAttributeMapEntryImpl featureAttributeMapEntry = new FeatureAttributeMapEntryImpl();
- return featureAttributeMapEntry;
- }
-
- /**
- * <!-- begin-user-doc -->
- * <!-- end-user-doc -->
- * @generated
- */
- public ImplicitItem createImplicitItemFromString(EDataType eDataType, String initialValue) {
- ImplicitItem result = ImplicitItem.get(initialValue);
- if (result == null) throw new IllegalArgumentException("The value '" + initialValue + "' is not a valid enumerator of '" + eDataType.getName() + "'");
- return result;
- }
-
- /**
- * <!-- begin-user-doc -->
- * <!-- end-user-doc -->
- * @generated
- */
- public String convertImplicitItemToString(EDataType eDataType, Object instanceValue) {
- return instanceValue == null ? null : instanceValue.toString();
- }
-
- /**
- * <!-- begin-user-doc -->
- * <!-- end-user-doc -->
- */
- public FeatureAttributeValue createFeatureAttributeValueFromString(EDataType eDataType, String initialValue) {
- return new FeatureAttributeValue(initialValue);
- }
-
- /**
- * <!-- begin-user-doc -->
- * <!-- end-user-doc -->
- */
- public String convertFeatureAttributeValueToString(EDataType eDataType, Object instanceValue) {
- return instanceValue.toString();
- }
-
-}
diff --git a/plugins/org.eclipse.jem.beaninfo/beaninfo/org/eclipse/jem/internal/beaninfo/impl/BeaninfoPackageImpl.java b/plugins/org.eclipse.jem.beaninfo/beaninfo/org/eclipse/jem/internal/beaninfo/impl/BeaninfoPackageImpl.java
deleted file mode 100644
index 2e4df75..0000000
--- a/plugins/org.eclipse.jem.beaninfo/beaninfo/org/eclipse/jem/internal/beaninfo/impl/BeaninfoPackageImpl.java
+++ /dev/null
@@ -1,992 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2001, 2005 IBM Corporation and others.
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
- *
- * Contributors:
- * IBM Corporation - initial API and implementation
- *******************************************************************************/
-package org.eclipse.jem.internal.beaninfo.impl;
-/*
-
-
- */
-
-import java.util.Map;
-
-import org.eclipse.emf.ecore.*;
-import org.eclipse.emf.ecore.impl.EPackageImpl;
-
-import org.eclipse.jem.internal.beaninfo.*;
-import org.eclipse.jem.internal.beaninfo.common.FeatureAttributeValue;
-import org.eclipse.jem.java.JavaRefPackage;
-/**
- * <!-- begin-user-doc -->
- * An implementation of the model <b>Package</b>.
- * <!-- end-user-doc -->
- * @generated
- */
-
-public class BeaninfoPackageImpl extends EPackageImpl implements BeaninfoPackage{
- /**
- * <!-- begin-user-doc -->
- * <!-- end-user-doc -->
- * @generated
- */
- private EClass featureDecoratorEClass = null;
-
- /**
- * <!-- begin-user-doc -->
- * <!-- end-user-doc -->
- * @generated
- */
- private EClass beanDecoratorEClass = null;
-
- /**
- * <!-- begin-user-doc -->
- * <!-- end-user-doc -->
- * @generated
- */
- private EClass eventSetDecoratorEClass = null;
-
- /**
- * <!-- begin-user-doc -->
- * <!-- end-user-doc -->
- * @generated
- */
- private EClass methodDecoratorEClass = null;
-
- /**
- * <!-- begin-user-doc -->
- * <!-- end-user-doc -->
- * @generated
- */
- private EClass parameterDecoratorEClass = null;
-
- /**
- * <!-- begin-user-doc -->
- * <!-- end-user-doc -->
- * @generated
- */
- private EClass propertyDecoratorEClass = null;
-
- /**
- * <!-- begin-user-doc -->
- * <!-- end-user-doc -->
- * @generated
- */
- private EClass indexedPropertyDecoratorEClass = null;
-
- /**
- * <!-- begin-user-doc -->
- * <!-- end-user-doc -->
- * @generated
- */
- private EClass methodProxyEClass = null;
-
- /**
- * <!-- begin-user-doc -->
- * <!-- end-user-doc -->
- * @generated
- */
- private EClass beanEventEClass = null;
-
- /**
- * <!-- begin-user-doc -->
- * <!-- end-user-doc -->
- * @generated
- */
- private EClass featureAttributeMapEntryEClass = null;
-
- /**
- * <!-- begin-user-doc -->
- * <!-- end-user-doc -->
- * @generated
- */
- private EEnum implicitItemEEnum = null;
-
- /**
- * <!-- begin-user-doc -->
- * <!-- end-user-doc -->
- * @generated
- */
- private EDataType featureAttributeValueEDataType = null;
-
- /**
- * Creates an instance of the model <b>Package</b>, registered with
- * {@link org.eclipse.emf.ecore.EPackage.Registry EPackage.Registry} by the package
- * package URI value.
- * <p>Note: the correct way to create the package is via the static
- * factory method {@link #init init()}, which also performs
- * initialization of the package, or returns the registered package,
- * if one already exists.
- * <!-- begin-user-doc -->
- * <!-- end-user-doc -->
- * @see org.eclipse.emf.ecore.EPackage.Registry
- * @see org.eclipse.jem.internal.beaninfo.BeaninfoPackage#eNS_URI
- * @see #init()
- * @generated
- */
- private BeaninfoPackageImpl() {
- super(eNS_URI, BeaninfoFactory.eINSTANCE);
- }
-
- /**
- * <!-- begin-user-doc -->
- * <!-- end-user-doc -->
- * @generated
- */
- private static boolean isInited = false;
-
- /**
- * Creates, registers, and initializes the <b>Package</b> for this
- * model, and for any others upon which it depends. Simple
- * dependencies are satisfied by calling this method on all
- * dependent packages before doing anything else. This method drives
- * initialization for interdependent packages directly, in parallel
- * with this package, itself.
- * <p>Of this package and its interdependencies, all packages which
- * have not yet been registered by their URI values are first created
- * and registered. The packages are then initialized in two steps:
- * meta-model objects for all of the packages are created before any
- * are initialized, since one package's meta-model objects may refer to
- * those of another.
- * <p>Invocation of this method will not affect any packages that have
- * already been initialized.
- * <!-- begin-user-doc -->
- * <!-- end-user-doc -->
- * @see #eNS_URI
- * @see #createPackageContents()
- * @see #initializePackageContents()
- * @generated
- */
- public static BeaninfoPackage init() {
- if (isInited) return (BeaninfoPackage)EPackage.Registry.INSTANCE.getEPackage(BeaninfoPackage.eNS_URI);
-
- // Obtain or create and register package
- BeaninfoPackageImpl theBeaninfoPackage = (BeaninfoPackageImpl)(EPackage.Registry.INSTANCE.getEPackage(eNS_URI) instanceof BeaninfoPackageImpl ? EPackage.Registry.INSTANCE.getEPackage(eNS_URI) : new BeaninfoPackageImpl());
-
- isInited = true;
-
- // Initialize simple dependencies
- EcorePackage.eINSTANCE.eClass();
- JavaRefPackage.eINSTANCE.eClass();
-
- // Create package meta-data objects
- theBeaninfoPackage.createPackageContents();
-
- // Initialize created meta-data
- theBeaninfoPackage.initializePackageContents();
-
- // Mark meta-data to indicate it can't be changed
- theBeaninfoPackage.freeze();
-
- return theBeaninfoPackage;
- }
-
- /**
- * <!-- begin-user-doc -->
- * <!-- end-user-doc -->
- * @generated
- */
- public EClass getFeatureDecorator() {
- return featureDecoratorEClass;
- }
-
- /**
- * <!-- begin-user-doc -->
- * <!-- end-user-doc -->
- * @generated
- */
- public EAttribute getFeatureDecorator_DisplayName() {
- return (EAttribute)featureDecoratorEClass.getEStructuralFeatures().get(0);
- }
-
- /**
- * <!-- begin-user-doc -->
- * <!-- end-user-doc -->
- * @generated
- */
- public EAttribute getFeatureDecorator_ShortDescription() {
- return (EAttribute)featureDecoratorEClass.getEStructuralFeatures().get(1);
- }
-
- /**
- * <!-- begin-user-doc -->
- * <!-- end-user-doc -->
- * @generated
- */
- public EAttribute getFeatureDecorator_Category() {
- return (EAttribute)featureDecoratorEClass.getEStructuralFeatures().get(2);
- }
-
- /**
- * <!-- begin-user-doc -->
- * <!-- end-user-doc -->
- * @generated
- */
- public EAttribute getFeatureDecorator_Expert() {
- return (EAttribute)featureDecoratorEClass.getEStructuralFeatures().get(3);
- }
-
- /**
- * <!-- begin-user-doc -->
- * <!-- end-user-doc -->
- * @generated
- */
- public EAttribute getFeatureDecorator_Hidden() {
- return (EAttribute)featureDecoratorEClass.getEStructuralFeatures().get(4);
- }
-
- /**
- * <!-- begin-user-doc -->
- * <!-- end-user-doc -->
- * @generated
- */
- public EAttribute getFeatureDecorator_Preferred() {
- return (EAttribute)featureDecoratorEClass.getEStructuralFeatures().get(5);
- }
-
- /**
- * <!-- begin-user-doc -->
- * <!-- end-user-doc -->
- * @generated
- */
- public EAttribute getFeatureDecorator_MergeIntrospection() {
- return (EAttribute)featureDecoratorEClass.getEStructuralFeatures().get(6);
- }
-
- /**
- * <!-- begin-user-doc -->
- * <!-- end-user-doc -->
- * @generated
- */
- public EAttribute getFeatureDecorator_AttributesExplicitEmpty() {
- return (EAttribute)featureDecoratorEClass.getEStructuralFeatures().get(7);
- }
-
- /**
- * <!-- begin-user-doc -->
- * <!-- end-user-doc -->
- * @generated
- */
- public EAttribute getFeatureDecorator_ImplicitlySetBits() {
- return (EAttribute)featureDecoratorEClass.getEStructuralFeatures().get(8);
- }
-
- /**
- * <!-- begin-user-doc -->
- * <!-- end-user-doc -->
- * @generated
- */
- public EAttribute getFeatureDecorator_ImplicitDecoratorFlag() {
- return (EAttribute)featureDecoratorEClass.getEStructuralFeatures().get(9);
- }
-
- /**
- * <!-- begin-user-doc -->
- * <!-- end-user-doc -->
- * @generated
- */
- public EReference getFeatureDecorator_Attributes() {
- return (EReference)featureDecoratorEClass.getEStructuralFeatures().get(10);
- }
-
- /**
- * <!-- begin-user-doc -->
- * <!-- end-user-doc -->
- * @generated
- */
- public EClass getEventSetDecorator() {
- return eventSetDecoratorEClass;
- }
-
- /**
- * <!-- begin-user-doc -->
- * <!-- end-user-doc -->
- * @generated
- */
- public EAttribute getEventSetDecorator_InDefaultEventSet() {
- return (EAttribute)eventSetDecoratorEClass.getEStructuralFeatures().get(0);
- }
-
- /**
- * <!-- begin-user-doc -->
- * <!-- end-user-doc -->
- * @generated
- */
- public EAttribute getEventSetDecorator_Unicast() {
- return (EAttribute)eventSetDecoratorEClass.getEStructuralFeatures().get(1);
- }
-
- /**
- * <!-- begin-user-doc -->
- * <!-- end-user-doc -->
- * @generated
- */
- public EAttribute getEventSetDecorator_ListenerMethodsExplicitEmpty() {
- return (EAttribute)eventSetDecoratorEClass.getEStructuralFeatures().get(2);
- }
-
- /**
- * <!-- begin-user-doc -->
- * <!-- end-user-doc -->
- * @generated
- */
- public EReference getEventSetDecorator_AddListenerMethod() {
- return (EReference)eventSetDecoratorEClass.getEStructuralFeatures().get(3);
- }
-
- /**
- * <!-- begin-user-doc -->
- * <!-- end-user-doc -->
- * @generated
- */
- public EReference getEventSetDecorator_ListenerMethods() {
- return (EReference)eventSetDecoratorEClass.getEStructuralFeatures().get(4);
- }
-
- /**
- * <!-- begin-user-doc -->
- * <!-- end-user-doc -->
- * @generated
- */
- public EReference getEventSetDecorator_ListenerType() {
- return (EReference)eventSetDecoratorEClass.getEStructuralFeatures().get(5);
- }
-
- /**
- * <!-- begin-user-doc -->
- * <!-- end-user-doc -->
- * @generated
- */
- public EReference getEventSetDecorator_RemoveListenerMethod() {
- return (EReference)eventSetDecoratorEClass.getEStructuralFeatures().get(6);
- }
-
- /**
- * <!-- begin-user-doc -->
- * <!-- end-user-doc -->
- * @generated
- */
- public EReference getEventSetDecorator_EventAdapterClass() {
- return (EReference)eventSetDecoratorEClass.getEStructuralFeatures().get(7);
- }
-
- /**
- * <!-- begin-user-doc -->
- * <!-- end-user-doc -->
- * @generated
- */
- public EReference getEventSetDecorator_SerListMthd() {
- return (EReference)eventSetDecoratorEClass.getEStructuralFeatures().get(8);
- }
-
- /**
- * <!-- begin-user-doc -->
- * <!-- end-user-doc -->
- * @generated
- */
- public EClass getMethodProxy() {
- return methodProxyEClass;
- }
-
- /**
- * <!-- begin-user-doc -->
- * <!-- end-user-doc -->
- * @generated
- */
- public EReference getMethodProxy_Method() {
- return (EReference)methodProxyEClass.getEStructuralFeatures().get(0);
- }
-
- /**
- * <!-- begin-user-doc -->
- * <!-- end-user-doc -->
- * @generated
- */
- public EClass getPropertyDecorator() {
- return propertyDecoratorEClass;
- }
-
- /**
- * <!-- begin-user-doc -->
- * <!-- end-user-doc -->
- * @generated
- */
- public EAttribute getPropertyDecorator_Bound() {
- return (EAttribute)propertyDecoratorEClass.getEStructuralFeatures().get(0);
- }
-
- /**
- * <!-- begin-user-doc -->
- * <!-- end-user-doc -->
- * @generated
- */
- public EAttribute getPropertyDecorator_Constrained() {
- return (EAttribute)propertyDecoratorEClass.getEStructuralFeatures().get(1);
- }
-
- /**
- * <!-- begin-user-doc -->
- * <!-- end-user-doc -->
- * @generated
- */
- public EAttribute getPropertyDecorator_DesignTime() {
- return (EAttribute)propertyDecoratorEClass.getEStructuralFeatures().get(2);
- }
-
- /**
- * <!-- begin-user-doc -->
- * <!-- end-user-doc -->
- * @generated
- */
- public EAttribute getPropertyDecorator_AlwaysIncompatible() {
- return (EAttribute)propertyDecoratorEClass.getEStructuralFeatures().get(3);
- }
-
- /**
- * <!-- begin-user-doc -->
- * <!-- end-user-doc -->
- * @generated
- */
- public EAttribute getPropertyDecorator_FilterFlags() {
- return (EAttribute)propertyDecoratorEClass.getEStructuralFeatures().get(4);
- }
-
- /**
- * <!-- begin-user-doc -->
- * <!-- end-user-doc -->
- * @generated
- */
- public EAttribute getPropertyDecorator_FieldReadOnly() {
- return (EAttribute)propertyDecoratorEClass.getEStructuralFeatures().get(5);
- }
-
- /**
- * <!-- begin-user-doc -->
- * <!-- end-user-doc -->
- * @generated
- */
- public EReference getPropertyDecorator_PropertyEditorClass() {
- return (EReference)propertyDecoratorEClass.getEStructuralFeatures().get(6);
- }
-
- /**
- * <!-- begin-user-doc -->
- * <!-- end-user-doc -->
- * @generated
- */
- public EReference getPropertyDecorator_ReadMethod() {
- return (EReference)propertyDecoratorEClass.getEStructuralFeatures().get(7);
- }
-
- /**
- * <!-- begin-user-doc -->
- * <!-- end-user-doc -->
- * @generated
- */
- public EReference getPropertyDecorator_WriteMethod() {
- return (EReference)propertyDecoratorEClass.getEStructuralFeatures().get(8);
- }
-
- /**
- * <!-- begin-user-doc -->
- * <!-- end-user-doc -->
- * @generated
- */
- public EReference getPropertyDecorator_Field() {
- return (EReference)propertyDecoratorEClass.getEStructuralFeatures().get(9);
- }
-
- /**
- * <!-- begin-user-doc -->
- * <!-- end-user-doc -->
- * @generated
- */
- public EClass getIndexedPropertyDecorator() {
- return indexedPropertyDecoratorEClass;
- }
-
- /**
- * <!-- begin-user-doc -->
- * <!-- end-user-doc -->
- * @generated
- */
- public EReference getIndexedPropertyDecorator_IndexedReadMethod() {
- return (EReference)indexedPropertyDecoratorEClass.getEStructuralFeatures().get(0);
- }
-
- /**
- * <!-- begin-user-doc -->
- * <!-- end-user-doc -->
- * @generated
- */
- public EReference getIndexedPropertyDecorator_IndexedWriteMethod() {
- return (EReference)indexedPropertyDecoratorEClass.getEStructuralFeatures().get(1);
- }
-
- /**
- * <!-- begin-user-doc -->
- * <!-- end-user-doc -->
- * @generated
- */
- public EClass getBeanDecorator() {
- return beanDecoratorEClass;
- }
-
- /**
- * <!-- begin-user-doc -->
- * <!-- end-user-doc -->
- * @generated
- */
- public EAttribute getBeanDecorator_MergeSuperProperties() {
- return (EAttribute)beanDecoratorEClass.getEStructuralFeatures().get(0);
- }
-
- /**
- * <!-- begin-user-doc -->
- * <!-- end-user-doc -->
- * @generated
- */
- public EAttribute getBeanDecorator_MergeSuperMethods() {
- return (EAttribute)beanDecoratorEClass.getEStructuralFeatures().get(1);
- }
-
- /**
- * <!-- begin-user-doc -->
- * <!-- end-user-doc -->
- * @generated
- */
- public EAttribute getBeanDecorator_MergeSuperEvents() {
- return (EAttribute)beanDecoratorEClass.getEStructuralFeatures().get(2);
- }
-
- /**
- * <!-- begin-user-doc -->
- * <!-- end-user-doc -->
- * @generated
- */
- public EAttribute getBeanDecorator_IntrospectProperties() {
- return (EAttribute)beanDecoratorEClass.getEStructuralFeatures().get(3);
- }
-
- /**
- * <!-- begin-user-doc -->
- * <!-- end-user-doc -->
- * @generated
- */
- public EAttribute getBeanDecorator_IntrospectMethods() {
- return (EAttribute)beanDecoratorEClass.getEStructuralFeatures().get(4);
- }
-
- /**
- * <!-- begin-user-doc -->
- * <!-- end-user-doc -->
- * @generated
- */
- public EAttribute getBeanDecorator_IntrospectEvents() {
- return (EAttribute)beanDecoratorEClass.getEStructuralFeatures().get(5);
- }
-
- /**
- * <!-- begin-user-doc -->
- * <!-- end-user-doc -->
- * @generated
- */
- public EReference getBeanDecorator_CustomizerClass() {
- return (EReference)beanDecoratorEClass.getEStructuralFeatures().get(10);
- }
-
- /**
- * <!-- begin-user-doc -->
- * <!-- end-user-doc -->
- * @generated
- */
- public EClass getMethodDecorator() {
- return methodDecoratorEClass;
- }
-
- /**
- * <!-- begin-user-doc -->
- * <!-- end-user-doc -->
- * @generated
- */
- public EAttribute getMethodDecorator_ParmsExplicitEmpty() {
- return (EAttribute)methodDecoratorEClass.getEStructuralFeatures().get(0);
- }
-
- /**
- * <!-- begin-user-doc -->
- * <!-- end-user-doc -->
- * @generated
- */
- public EReference getMethodDecorator_ParameterDescriptors() {
- return (EReference)methodDecoratorEClass.getEStructuralFeatures().get(1);
- }
-
- /**
- * <!-- begin-user-doc -->
- * <!-- end-user-doc -->
- * @generated
- */
- public EReference getMethodDecorator_SerParmDesc() {
- return (EReference)methodDecoratorEClass.getEStructuralFeatures().get(2);
- }
-
- /**
- * <!-- begin-user-doc -->
- * <!-- end-user-doc -->
- * @generated
- */
- public EClass getParameterDecorator() {
- return parameterDecoratorEClass;
- }
-
- /**
- * <!-- begin-user-doc -->
- * <!-- end-user-doc -->
- * @generated
- */
- public EAttribute getParameterDecorator_Name() {
- return (EAttribute)parameterDecoratorEClass.getEStructuralFeatures().get(0);
- }
-
- /**
- * <!-- begin-user-doc -->
- * <!-- end-user-doc -->
- * @generated
- */
- public EDataType getFeatureAttributeValue() {
- return featureAttributeValueEDataType;
- }
-
- /**
- * <!-- begin-user-doc -->
- * <!-- end-user-doc -->
- * @generated
- */
- public BeaninfoFactory getBeaninfoFactory() {
- return (BeaninfoFactory)getEFactoryInstance();
- }
-
- /**
- * <!-- begin-user-doc -->
- * <!-- end-user-doc -->
- * @generated
- */
- private boolean isCreated = false;
-
- /**
- * Creates the meta-model objects for the package. This method is
- * guarded to have no affect on any invocation but its first.
- * <!-- begin-user-doc -->
- * <!-- end-user-doc -->
- * @generated
- */
- public void createPackageContents() {
- if (isCreated) return;
- isCreated = true;
-
- // Create classes and their features
- featureDecoratorEClass = createEClass(FEATURE_DECORATOR);
- createEAttribute(featureDecoratorEClass, FEATURE_DECORATOR__DISPLAY_NAME);
- createEAttribute(featureDecoratorEClass, FEATURE_DECORATOR__SHORT_DESCRIPTION);
- createEAttribute(featureDecoratorEClass, FEATURE_DECORATOR__CATEGORY);
- createEAttribute(featureDecoratorEClass, FEATURE_DECORATOR__EXPERT);
- createEAttribute(featureDecoratorEClass, FEATURE_DECORATOR__HIDDEN);
- createEAttribute(featureDecoratorEClass, FEATURE_DECORATOR__PREFERRED);
- createEAttribute(featureDecoratorEClass, FEATURE_DECORATOR__MERGE_INTROSPECTION);
- createEAttribute(featureDecoratorEClass, FEATURE_DECORATOR__ATTRIBUTES_EXPLICIT_EMPTY);
- createEAttribute(featureDecoratorEClass, FEATURE_DECORATOR__IMPLICITLY_SET_BITS);
- createEAttribute(featureDecoratorEClass, FEATURE_DECORATOR__IMPLICIT_DECORATOR_FLAG);
- createEReference(featureDecoratorEClass, FEATURE_DECORATOR__ATTRIBUTES);
-
- beanDecoratorEClass = createEClass(BEAN_DECORATOR);
- createEAttribute(beanDecoratorEClass, BEAN_DECORATOR__MERGE_SUPER_PROPERTIES);
- createEAttribute(beanDecoratorEClass, BEAN_DECORATOR__MERGE_SUPER_METHODS);
- createEAttribute(beanDecoratorEClass, BEAN_DECORATOR__MERGE_SUPER_EVENTS);
- createEAttribute(beanDecoratorEClass, BEAN_DECORATOR__INTROSPECT_PROPERTIES);
- createEAttribute(beanDecoratorEClass, BEAN_DECORATOR__INTROSPECT_METHODS);
- createEAttribute(beanDecoratorEClass, BEAN_DECORATOR__INTROSPECT_EVENTS);
- createEAttribute(beanDecoratorEClass, BEAN_DECORATOR__DO_BEANINFO);
- createEAttribute(beanDecoratorEClass, BEAN_DECORATOR__NOT_INHERITED_PROPERTY_NAMES);
- createEAttribute(beanDecoratorEClass, BEAN_DECORATOR__NOT_INHERITED_METHOD_NAMES);
- createEAttribute(beanDecoratorEClass, BEAN_DECORATOR__NOT_INHERITED_EVENT_NAMES);
- createEReference(beanDecoratorEClass, BEAN_DECORATOR__CUSTOMIZER_CLASS);
-
- eventSetDecoratorEClass = createEClass(EVENT_SET_DECORATOR);
- createEAttribute(eventSetDecoratorEClass, EVENT_SET_DECORATOR__IN_DEFAULT_EVENT_SET);
- createEAttribute(eventSetDecoratorEClass, EVENT_SET_DECORATOR__UNICAST);
- createEAttribute(eventSetDecoratorEClass, EVENT_SET_DECORATOR__LISTENER_METHODS_EXPLICIT_EMPTY);
- createEReference(eventSetDecoratorEClass, EVENT_SET_DECORATOR__ADD_LISTENER_METHOD);
- createEReference(eventSetDecoratorEClass, EVENT_SET_DECORATOR__LISTENER_METHODS);
- createEReference(eventSetDecoratorEClass, EVENT_SET_DECORATOR__LISTENER_TYPE);
- createEReference(eventSetDecoratorEClass, EVENT_SET_DECORATOR__REMOVE_LISTENER_METHOD);
- createEReference(eventSetDecoratorEClass, EVENT_SET_DECORATOR__EVENT_ADAPTER_CLASS);
- createEReference(eventSetDecoratorEClass, EVENT_SET_DECORATOR__SER_LIST_MTHD);
-
- methodDecoratorEClass = createEClass(METHOD_DECORATOR);
- createEAttribute(methodDecoratorEClass, METHOD_DECORATOR__PARMS_EXPLICIT_EMPTY);
- createEReference(methodDecoratorEClass, METHOD_DECORATOR__PARAMETER_DESCRIPTORS);
- createEReference(methodDecoratorEClass, METHOD_DECORATOR__SER_PARM_DESC);
-
- parameterDecoratorEClass = createEClass(PARAMETER_DECORATOR);
- createEAttribute(parameterDecoratorEClass, PARAMETER_DECORATOR__NAME);
- createEReference(parameterDecoratorEClass, PARAMETER_DECORATOR__PARAMETER);
-
- propertyDecoratorEClass = createEClass(PROPERTY_DECORATOR);
- createEAttribute(propertyDecoratorEClass, PROPERTY_DECORATOR__BOUND);
- createEAttribute(propertyDecoratorEClass, PROPERTY_DECORATOR__CONSTRAINED);
- createEAttribute(propertyDecoratorEClass, PROPERTY_DECORATOR__DESIGN_TIME);
- createEAttribute(propertyDecoratorEClass, PROPERTY_DECORATOR__ALWAYS_INCOMPATIBLE);
- createEAttribute(propertyDecoratorEClass, PROPERTY_DECORATOR__FILTER_FLAGS);
- createEAttribute(propertyDecoratorEClass, PROPERTY_DECORATOR__FIELD_READ_ONLY);
- createEReference(propertyDecoratorEClass, PROPERTY_DECORATOR__PROPERTY_EDITOR_CLASS);
- createEReference(propertyDecoratorEClass, PROPERTY_DECORATOR__READ_METHOD);
- createEReference(propertyDecoratorEClass, PROPERTY_DECORATOR__WRITE_METHOD);
- createEReference(propertyDecoratorEClass, PROPERTY_DECORATOR__FIELD);
-
- indexedPropertyDecoratorEClass = createEClass(INDEXED_PROPERTY_DECORATOR);
- createEReference(indexedPropertyDecoratorEClass, INDEXED_PROPERTY_DECORATOR__INDEXED_READ_METHOD);
- createEReference(indexedPropertyDecoratorEClass, INDEXED_PROPERTY_DECORATOR__INDEXED_WRITE_METHOD);
-
- methodProxyEClass = createEClass(METHOD_PROXY);
- createEReference(methodProxyEClass, METHOD_PROXY__METHOD);
-
- beanEventEClass = createEClass(BEAN_EVENT);
-
- featureAttributeMapEntryEClass = createEClass(FEATURE_ATTRIBUTE_MAP_ENTRY);
- createEAttribute(featureAttributeMapEntryEClass, FEATURE_ATTRIBUTE_MAP_ENTRY__KEY);
- createEAttribute(featureAttributeMapEntryEClass, FEATURE_ATTRIBUTE_MAP_ENTRY__VALUE);
-
- // Create enums
- implicitItemEEnum = createEEnum(IMPLICIT_ITEM);
-
- // Create data types
- featureAttributeValueEDataType = createEDataType(FEATURE_ATTRIBUTE_VALUE);
- }
-
- /**
- * <!-- begin-user-doc -->
- * <!-- end-user-doc -->
- * @generated
- */
- private boolean isInitialized = false;
-
- /**
- * Complete the initialization of the package and its meta-model. This
- * method is guarded to have no affect on any invocation but its first.
- * <!-- begin-user-doc -->
- * <!-- end-user-doc -->
- * @generated
- */
- public void initializePackageContents() {
- if (isInitialized) return;
- isInitialized = true;
-
- // Initialize package
- setName(eNAME);
- setNsPrefix(eNS_PREFIX);
- setNsURI(eNS_URI);
-
- // Obtain other dependent packages
- EcorePackage theEcorePackage = (EcorePackage)EPackage.Registry.INSTANCE.getEPackage(EcorePackage.eNS_URI);
- JavaRefPackage theJavaRefPackage = (JavaRefPackage)EPackage.Registry.INSTANCE.getEPackage(JavaRefPackage.eNS_URI);
-
- // Add supertypes to classes
- featureDecoratorEClass.getESuperTypes().add(theEcorePackage.getEAnnotation());
- beanDecoratorEClass.getESuperTypes().add(this.getFeatureDecorator());
- eventSetDecoratorEClass.getESuperTypes().add(this.getFeatureDecorator());
- methodDecoratorEClass.getESuperTypes().add(this.getFeatureDecorator());
- parameterDecoratorEClass.getESuperTypes().add(this.getFeatureDecorator());
- propertyDecoratorEClass.getESuperTypes().add(this.getFeatureDecorator());
- indexedPropertyDecoratorEClass.getESuperTypes().add(this.getPropertyDecorator());
- methodProxyEClass.getESuperTypes().add(theEcorePackage.getEOperation());
- beanEventEClass.getESuperTypes().add(theJavaRefPackage.getJavaEvent());
-
- // Initialize classes and features; add operations and parameters
- initEClass(featureDecoratorEClass, FeatureDecorator.class, "FeatureDecorator", !IS_ABSTRACT, !IS_INTERFACE, IS_GENERATED_INSTANCE_CLASS);
- initEAttribute(getFeatureDecorator_DisplayName(), ecorePackage.getEString(), "displayName", null, 0, 1, FeatureDecorator.class, !IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE, IS_UNSETTABLE, !IS_ID, IS_UNIQUE, !IS_DERIVED, IS_ORDERED);
- initEAttribute(getFeatureDecorator_ShortDescription(), ecorePackage.getEString(), "shortDescription", null, 0, 1, FeatureDecorator.class, !IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE, IS_UNSETTABLE, !IS_ID, IS_UNIQUE, !IS_DERIVED, IS_ORDERED);
- initEAttribute(getFeatureDecorator_Category(), ecorePackage.getEString(), "category", null, 0, 1, FeatureDecorator.class, !IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE, !IS_UNSETTABLE, !IS_ID, IS_UNIQUE, !IS_DERIVED, IS_ORDERED);
- initEAttribute(getFeatureDecorator_Expert(), ecorePackage.getEBoolean(), "expert", null, 0, 1, FeatureDecorator.class, !IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE, IS_UNSETTABLE, !IS_ID, IS_UNIQUE, !IS_DERIVED, IS_ORDERED);
- initEAttribute(getFeatureDecorator_Hidden(), ecorePackage.getEBoolean(), "hidden", null, 0, 1, FeatureDecorator.class, !IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE, IS_UNSETTABLE, !IS_ID, IS_UNIQUE, !IS_DERIVED, IS_ORDERED);
- initEAttribute(getFeatureDecorator_Preferred(), ecorePackage.getEBoolean(), "preferred", null, 0, 1, FeatureDecorator.class, !IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE, IS_UNSETTABLE, !IS_ID, IS_UNIQUE, !IS_DERIVED, IS_ORDERED);
- initEAttribute(getFeatureDecorator_MergeIntrospection(), ecorePackage.getEBoolean(), "mergeIntrospection", "true", 0, 1, FeatureDecorator.class, !IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE, !IS_UNSETTABLE, !IS_ID, IS_UNIQUE, !IS_DERIVED, IS_ORDERED);
- initEAttribute(getFeatureDecorator_AttributesExplicitEmpty(), ecorePackage.getEBoolean(), "attributesExplicitEmpty", null, 0, 1, FeatureDecorator.class, !IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE, !IS_UNSETTABLE, !IS_ID, IS_UNIQUE, !IS_DERIVED, IS_ORDERED);
- initEAttribute(getFeatureDecorator_ImplicitlySetBits(), ecorePackage.getELong(), "implicitlySetBits", null, 0, 1, FeatureDecorator.class, !IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE, !IS_UNSETTABLE, !IS_ID, IS_UNIQUE, !IS_DERIVED, IS_ORDERED);
- initEAttribute(getFeatureDecorator_ImplicitDecoratorFlag(), this.getImplicitItem(), "implicitDecoratorFlag", null, 0, 1, FeatureDecorator.class, !IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE, !IS_UNSETTABLE, !IS_ID, IS_UNIQUE, !IS_DERIVED, IS_ORDERED);
- initEReference(getFeatureDecorator_Attributes(), this.getFeatureAttributeMapEntry(), null, "attributes", null, 0, -1, FeatureDecorator.class, !IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE, IS_COMPOSITE, !IS_RESOLVE_PROXIES, !IS_UNSETTABLE, IS_UNIQUE, !IS_DERIVED, IS_ORDERED);
-
- EOperation op = addEOperation(featureDecoratorEClass, ecorePackage.getEString(), "getName", 0, 1);
-
- initEClass(beanDecoratorEClass, BeanDecorator.class, "BeanDecorator", !IS_ABSTRACT, !IS_INTERFACE, IS_GENERATED_INSTANCE_CLASS);
- initEAttribute(getBeanDecorator_MergeSuperProperties(), ecorePackage.getEBoolean(), "mergeSuperProperties", "true", 0, 1, BeanDecorator.class, !IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE, IS_UNSETTABLE, !IS_ID, IS_UNIQUE, !IS_DERIVED, IS_ORDERED);
- initEAttribute(getBeanDecorator_MergeSuperMethods(), ecorePackage.getEBoolean(), "mergeSuperMethods", "true", 0, 1, BeanDecorator.class, !IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE, IS_UNSETTABLE, !IS_ID, IS_UNIQUE, !IS_DERIVED, IS_ORDERED);
- initEAttribute(getBeanDecorator_MergeSuperEvents(), ecorePackage.getEBoolean(), "mergeSuperEvents", "true", 0, 1, BeanDecorator.class, !IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE, IS_UNSETTABLE, !IS_ID, IS_UNIQUE, !IS_DERIVED, IS_ORDERED);
- initEAttribute(getBeanDecorator_IntrospectProperties(), ecorePackage.getEBoolean(), "introspectProperties", "true", 0, 1, BeanDecorator.class, !IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE, !IS_UNSETTABLE, !IS_ID, IS_UNIQUE, !IS_DERIVED, IS_ORDERED);
- initEAttribute(getBeanDecorator_IntrospectMethods(), ecorePackage.getEBoolean(), "introspectMethods", "true", 0, 1, BeanDecorator.class, !IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE, !IS_UNSETTABLE, !IS_ID, IS_UNIQUE, !IS_DERIVED, IS_ORDERED);
- initEAttribute(getBeanDecorator_IntrospectEvents(), ecorePackage.getEBoolean(), "introspectEvents", "true", 0, 1, BeanDecorator.class, !IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE, !IS_UNSETTABLE, !IS_ID, IS_UNIQUE, !IS_DERIVED, IS_ORDERED);
- initEAttribute(getBeanDecorator_DoBeaninfo(), ecorePackage.getEBoolean(), "doBeaninfo", "true", 0, 1, BeanDecorator.class, !IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE, !IS_UNSETTABLE, !IS_ID, IS_UNIQUE, !IS_DERIVED, IS_ORDERED);
- initEAttribute(getBeanDecorator_NotInheritedPropertyNames(), ecorePackage.getEString(), "notInheritedPropertyNames", null, 0, -1, BeanDecorator.class, !IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE, !IS_UNSETTABLE, !IS_ID, IS_UNIQUE, !IS_DERIVED, IS_ORDERED);
- initEAttribute(getBeanDecorator_NotInheritedMethodNames(), ecorePackage.getEString(), "notInheritedMethodNames", null, 0, -1, BeanDecorator.class, !IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE, !IS_UNSETTABLE, !IS_ID, IS_UNIQUE, !IS_DERIVED, IS_ORDERED);
- initEAttribute(getBeanDecorator_NotInheritedEventNames(), ecorePackage.getEString(), "notInheritedEventNames", null, 0, -1, BeanDecorator.class, !IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE, !IS_UNSETTABLE, !IS_ID, IS_UNIQUE, !IS_DERIVED, IS_ORDERED);
- initEReference(getBeanDecorator_CustomizerClass(), theJavaRefPackage.getJavaClass(), null, "customizerClass", null, 0, 1, BeanDecorator.class, !IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE, !IS_COMPOSITE, IS_RESOLVE_PROXIES, !IS_UNSETTABLE, IS_UNIQUE, !IS_DERIVED, IS_ORDERED);
-
- initEClass(eventSetDecoratorEClass, EventSetDecorator.class, "EventSetDecorator", !IS_ABSTRACT, !IS_INTERFACE, IS_GENERATED_INSTANCE_CLASS);
- initEAttribute(getEventSetDecorator_InDefaultEventSet(), ecorePackage.getEBoolean(), "inDefaultEventSet", null, 0, 1, EventSetDecorator.class, !IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE, IS_UNSETTABLE, !IS_ID, IS_UNIQUE, !IS_DERIVED, IS_ORDERED);
- initEAttribute(getEventSetDecorator_Unicast(), ecorePackage.getEBoolean(), "unicast", null, 0, 1, EventSetDecorator.class, !IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE, IS_UNSETTABLE, !IS_ID, IS_UNIQUE, !IS_DERIVED, IS_ORDERED);
- initEAttribute(getEventSetDecorator_ListenerMethodsExplicitEmpty(), ecorePackage.getEBoolean(), "listenerMethodsExplicitEmpty", null, 0, 1, EventSetDecorator.class, !IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE, !IS_UNSETTABLE, !IS_ID, IS_UNIQUE, !IS_DERIVED, IS_ORDERED);
- initEReference(getEventSetDecorator_AddListenerMethod(), theJavaRefPackage.getMethod(), null, "addListenerMethod", null, 1, 1, EventSetDecorator.class, !IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE, !IS_COMPOSITE, IS_RESOLVE_PROXIES, !IS_UNSETTABLE, IS_UNIQUE, !IS_DERIVED, IS_ORDERED);
- initEReference(getEventSetDecorator_ListenerMethods(), this.getMethodProxy(), null, "listenerMethods", null, 1, -1, EventSetDecorator.class, IS_TRANSIENT, IS_VOLATILE, IS_CHANGEABLE, !IS_COMPOSITE, IS_RESOLVE_PROXIES, !IS_UNSETTABLE, IS_UNIQUE, IS_DERIVED, IS_ORDERED);
- initEReference(getEventSetDecorator_ListenerType(), theJavaRefPackage.getJavaClass(), null, "listenerType", null, 1, 1, EventSetDecorator.class, !IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE, !IS_COMPOSITE, IS_RESOLVE_PROXIES, !IS_UNSETTABLE, IS_UNIQUE, !IS_DERIVED, IS_ORDERED);
- initEReference(getEventSetDecorator_RemoveListenerMethod(), theJavaRefPackage.getMethod(), null, "removeListenerMethod", null, 1, 1, EventSetDecorator.class, !IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE, !IS_COMPOSITE, IS_RESOLVE_PROXIES, !IS_UNSETTABLE, IS_UNIQUE, !IS_DERIVED, IS_ORDERED);
- initEReference(getEventSetDecorator_EventAdapterClass(), theJavaRefPackage.getJavaClass(), null, "eventAdapterClass", null, 0, 1, EventSetDecorator.class, !IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE, !IS_COMPOSITE, IS_RESOLVE_PROXIES, !IS_UNSETTABLE, IS_UNIQUE, !IS_DERIVED, IS_ORDERED);
- initEReference(getEventSetDecorator_SerListMthd(), this.getMethodProxy(), null, "serListMthd", null, 1, -1, EventSetDecorator.class, !IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE, IS_COMPOSITE, !IS_RESOLVE_PROXIES, !IS_UNSETTABLE, IS_UNIQUE, !IS_DERIVED, IS_ORDERED);
-
- initEClass(methodDecoratorEClass, MethodDecorator.class, "MethodDecorator", !IS_ABSTRACT, !IS_INTERFACE, IS_GENERATED_INSTANCE_CLASS);
- initEAttribute(getMethodDecorator_ParmsExplicitEmpty(), ecorePackage.getEBoolean(), "parmsExplicitEmpty", null, 0, 1, MethodDecorator.class, !IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE, !IS_UNSETTABLE, !IS_ID, IS_UNIQUE, !IS_DERIVED, IS_ORDERED);
- initEReference(getMethodDecorator_ParameterDescriptors(), this.getParameterDecorator(), null, "parameterDescriptors", null, 0, -1, MethodDecorator.class, IS_TRANSIENT, IS_VOLATILE, IS_CHANGEABLE, !IS_COMPOSITE, IS_RESOLVE_PROXIES, !IS_UNSETTABLE, IS_UNIQUE, IS_DERIVED, IS_ORDERED);
- initEReference(getMethodDecorator_SerParmDesc(), this.getParameterDecorator(), null, "serParmDesc", null, 0, -1, MethodDecorator.class, !IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE, IS_COMPOSITE, !IS_RESOLVE_PROXIES, !IS_UNSETTABLE, IS_UNIQUE, !IS_DERIVED, IS_ORDERED);
-
- initEClass(parameterDecoratorEClass, ParameterDecorator.class, "ParameterDecorator", !IS_ABSTRACT, !IS_INTERFACE, IS_GENERATED_INSTANCE_CLASS);
- initEAttribute(getParameterDecorator_Name(), ecorePackage.getEString(), "name", null, 0, 1, ParameterDecorator.class, !IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE, !IS_UNSETTABLE, !IS_ID, IS_UNIQUE, !IS_DERIVED, IS_ORDERED);
- initEReference(getParameterDecorator_Parameter(), theJavaRefPackage.getJavaParameter(), null, "parameter", null, 0, 1, ParameterDecorator.class, IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE, !IS_COMPOSITE, IS_RESOLVE_PROXIES, !IS_UNSETTABLE, IS_UNIQUE, !IS_DERIVED, IS_ORDERED);
-
- initEClass(propertyDecoratorEClass, PropertyDecorator.class, "PropertyDecorator", !IS_ABSTRACT, !IS_INTERFACE, IS_GENERATED_INSTANCE_CLASS);
- initEAttribute(getPropertyDecorator_Bound(), ecorePackage.getEBoolean(), "bound", null, 0, 1, PropertyDecorator.class, !IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE, IS_UNSETTABLE, !IS_ID, IS_UNIQUE, !IS_DERIVED, IS_ORDERED);
- initEAttribute(getPropertyDecorator_Constrained(), ecorePackage.getEBoolean(), "constrained", null, 0, 1, PropertyDecorator.class, !IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE, IS_UNSETTABLE, !IS_ID, IS_UNIQUE, !IS_DERIVED, IS_ORDERED);
- initEAttribute(getPropertyDecorator_DesignTime(), ecorePackage.getEBoolean(), "designTime", null, 0, 1, PropertyDecorator.class, !IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE, IS_UNSETTABLE, !IS_ID, IS_UNIQUE, !IS_DERIVED, IS_ORDERED);
- initEAttribute(getPropertyDecorator_AlwaysIncompatible(), ecorePackage.getEBoolean(), "alwaysIncompatible", null, 0, 1, PropertyDecorator.class, !IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE, !IS_UNSETTABLE, !IS_ID, IS_UNIQUE, !IS_DERIVED, IS_ORDERED);
- initEAttribute(getPropertyDecorator_FilterFlags(), ecorePackage.getEString(), "filterFlags", null, 0, -1, PropertyDecorator.class, !IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE, !IS_UNSETTABLE, !IS_ID, IS_UNIQUE, !IS_DERIVED, IS_ORDERED);
- initEAttribute(getPropertyDecorator_FieldReadOnly(), ecorePackage.getEBoolean(), "fieldReadOnly", null, 0, 1, PropertyDecorator.class, !IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE, !IS_UNSETTABLE, !IS_ID, IS_UNIQUE, !IS_DERIVED, IS_ORDERED);
- initEReference(getPropertyDecorator_PropertyEditorClass(), theJavaRefPackage.getJavaClass(), null, "propertyEditorClass", null, 0, 1, PropertyDecorator.class, !IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE, !IS_COMPOSITE, IS_RESOLVE_PROXIES, !IS_UNSETTABLE, IS_UNIQUE, !IS_DERIVED, IS_ORDERED);
- initEReference(getPropertyDecorator_ReadMethod(), theJavaRefPackage.getMethod(), null, "readMethod", null, 0, 1, PropertyDecorator.class, !IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE, !IS_COMPOSITE, IS_RESOLVE_PROXIES, IS_UNSETTABLE, IS_UNIQUE, !IS_DERIVED, IS_ORDERED);
- initEReference(getPropertyDecorator_WriteMethod(), theJavaRefPackage.getMethod(), null, "writeMethod", null, 0, 1, PropertyDecorator.class, !IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE, !IS_COMPOSITE, IS_RESOLVE_PROXIES, IS_UNSETTABLE, IS_UNIQUE, !IS_DERIVED, IS_ORDERED);
- initEReference(getPropertyDecorator_Field(), theJavaRefPackage.getField(), null, "field", null, 0, 1, PropertyDecorator.class, !IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE, !IS_COMPOSITE, IS_RESOLVE_PROXIES, IS_UNSETTABLE, IS_UNIQUE, !IS_DERIVED, IS_ORDERED);
-
- op = addEOperation(propertyDecoratorEClass, theEcorePackage.getEClassifier(), "getPropertyType", 0, 1);
-
- op = addEOperation(propertyDecoratorEClass, null, "setPropertyType");
- addEParameter(op, theEcorePackage.getEClassifier(), "propertyType", 0, 1);
-
- initEClass(indexedPropertyDecoratorEClass, IndexedPropertyDecorator.class, "IndexedPropertyDecorator", !IS_ABSTRACT, !IS_INTERFACE, IS_GENERATED_INSTANCE_CLASS);
- initEReference(getIndexedPropertyDecorator_IndexedReadMethod(), theJavaRefPackage.getMethod(), null, "indexedReadMethod", null, 0, 1, IndexedPropertyDecorator.class, !IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE, !IS_COMPOSITE, IS_RESOLVE_PROXIES, IS_UNSETTABLE, IS_UNIQUE, !IS_DERIVED, IS_ORDERED);
- initEReference(getIndexedPropertyDecorator_IndexedWriteMethod(), theJavaRefPackage.getMethod(), null, "indexedWriteMethod", null, 0, 1, IndexedPropertyDecorator.class, !IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE, !IS_COMPOSITE, IS_RESOLVE_PROXIES, IS_UNSETTABLE, IS_UNIQUE, !IS_DERIVED, IS_ORDERED);
-
- initEClass(methodProxyEClass, MethodProxy.class, "MethodProxy", !IS_ABSTRACT, !IS_INTERFACE, IS_GENERATED_INSTANCE_CLASS);
- initEReference(getMethodProxy_Method(), theJavaRefPackage.getMethod(), null, "method", null, 1, 1, MethodProxy.class, !IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE, !IS_COMPOSITE, IS_RESOLVE_PROXIES, !IS_UNSETTABLE, IS_UNIQUE, !IS_DERIVED, IS_ORDERED);
-
- initEClass(beanEventEClass, BeanEvent.class, "BeanEvent", !IS_ABSTRACT, !IS_INTERFACE, IS_GENERATED_INSTANCE_CLASS);
-
- initEClass(featureAttributeMapEntryEClass, Map.Entry.class, "FeatureAttributeMapEntry", !IS_ABSTRACT, !IS_INTERFACE, !IS_GENERATED_INSTANCE_CLASS);
- initEAttribute(getFeatureAttributeMapEntry_Key(), ecorePackage.getEString(), "key", null, 0, 1, Map.Entry.class, !IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE, !IS_UNSETTABLE, !IS_ID, IS_UNIQUE, !IS_DERIVED, IS_ORDERED);
- initEAttribute(getFeatureAttributeMapEntry_Value(), this.getFeatureAttributeValue(), "value", null, 0, 1, Map.Entry.class, !IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE, !IS_UNSETTABLE, !IS_ID, IS_UNIQUE, !IS_DERIVED, IS_ORDERED);
-
- // Initialize enums and add enum literals
- initEEnum(implicitItemEEnum, ImplicitItem.class, "ImplicitItem");
- addEEnumLiteral(implicitItemEEnum, ImplicitItem.NOT_IMPLICIT_LITERAL);
- addEEnumLiteral(implicitItemEEnum, ImplicitItem.IMPLICIT_DECORATOR_LITERAL);
- addEEnumLiteral(implicitItemEEnum, ImplicitItem.IMPLICIT_DECORATOR_AND_FEATURE_LITERAL);
-
- // Initialize data types
- initEDataType(featureAttributeValueEDataType, FeatureAttributeValue.class, "FeatureAttributeValue", IS_SERIALIZABLE, !IS_GENERATED_INSTANCE_CLASS);
-
- // Create resource
- createResource(eNS_URI);
- }
-
- /**
- * <!-- begin-user-doc -->
- * <!-- end-user-doc -->
- * @generated
- */
- public EAttribute getBeanDecorator_DoBeaninfo() {
- return (EAttribute)beanDecoratorEClass.getEStructuralFeatures().get(6);
- }
-
- /**
- * <!-- begin-user-doc -->
- * <!-- end-user-doc -->
- * @generated
- */
- public EAttribute getBeanDecorator_NotInheritedPropertyNames() {
- return (EAttribute)beanDecoratorEClass.getEStructuralFeatures().get(7);
- }
-
- /**
- * <!-- begin-user-doc -->
- * <!-- end-user-doc -->
- * @generated
- */
- public EAttribute getBeanDecorator_NotInheritedMethodNames() {
- return (EAttribute)beanDecoratorEClass.getEStructuralFeatures().get(8);
- }
-
- /**
- * <!-- begin-user-doc -->
- * <!-- end-user-doc -->
- * @generated
- */
- public EAttribute getBeanDecorator_NotInheritedEventNames() {
- return (EAttribute)beanDecoratorEClass.getEStructuralFeatures().get(9);
- }
-
- /**
- * <!-- begin-user-doc -->
- * <!-- end-user-doc -->
- * @generated
- */
- public EReference getParameterDecorator_Parameter() {
- return (EReference)parameterDecoratorEClass.getEStructuralFeatures().get(1);
- }
-
- /**
- * <!-- begin-user-doc -->
- * <!-- end-user-doc -->
- * @generated
- */
- public EClass getBeanEvent() {
- return beanEventEClass;
- }
-
- /**
- * <!-- begin-user-doc -->
- * <!-- end-user-doc -->
- * @generated
- */
- public EClass getFeatureAttributeMapEntry() {
- return featureAttributeMapEntryEClass;
- }
-
- /**
- * <!-- begin-user-doc -->
- * <!-- end-user-doc -->
- * @generated
- */
- public EAttribute getFeatureAttributeMapEntry_Key() {
- return (EAttribute)featureAttributeMapEntryEClass.getEStructuralFeatures().get(0);
- }
-
- /**
- * <!-- begin-user-doc -->
- * <!-- end-user-doc -->
- * @generated
- */
- public EAttribute getFeatureAttributeMapEntry_Value() {
- return (EAttribute)featureAttributeMapEntryEClass.getEStructuralFeatures().get(1);
- }
-
- /**
- * <!-- begin-user-doc -->
- * <!-- end-user-doc -->
- * @generated
- */
- public EEnum getImplicitItem() {
- return implicitItemEEnum;
- }
-
-}
diff --git a/plugins/org.eclipse.jem.beaninfo/beaninfo/org/eclipse/jem/internal/beaninfo/impl/EventSetDecoratorImpl.java b/plugins/org.eclipse.jem.beaninfo/beaninfo/org/eclipse/jem/internal/beaninfo/impl/EventSetDecoratorImpl.java
deleted file mode 100644
index a9ce813..0000000
--- a/plugins/org.eclipse.jem.beaninfo/beaninfo/org/eclipse/jem/internal/beaninfo/impl/EventSetDecoratorImpl.java
+++ /dev/null
@@ -1,991 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2001, 2005 IBM Corporation and others.
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
- *
- * Contributors:
- * IBM Corporation - initial API and implementation
- *******************************************************************************/
-package org.eclipse.jem.internal.beaninfo.impl;
-/*
-
-
- */
-
-
-import java.util.Collection;
-import java.util.List;
-
-import org.eclipse.emf.common.notify.Notification;
-import org.eclipse.emf.common.notify.NotificationChain;
-import org.eclipse.emf.common.util.EList;
-import org.eclipse.emf.ecore.EClass;
-import org.eclipse.emf.ecore.EModelElement;
-import org.eclipse.emf.ecore.EStructuralFeature;
-import org.eclipse.emf.ecore.EcorePackage;
-import org.eclipse.emf.ecore.InternalEObject;
-
-import org.eclipse.emf.ecore.impl.ENotificationImpl;
-import org.eclipse.emf.ecore.util.EObjectContainmentEList;
-import org.eclipse.emf.ecore.util.InternalEList;
-
-import org.eclipse.jem.internal.beaninfo.BeaninfoPackage;
-import org.eclipse.jem.internal.beaninfo.EventSetDecorator;
-import org.eclipse.jem.internal.beaninfo.ImplicitItem;
-import org.eclipse.jem.internal.beaninfo.MethodProxy;
-
-import org.eclipse.jem.java.JavaClass;
-import org.eclipse.jem.java.Method;
-
-import org.eclipse.jem.internal.beaninfo.*;
-import org.eclipse.jem.java.*;
-/**
- * <!-- begin-user-doc -->
- * An implementation of the model object '<em><b>Event Set Decorator</b></em>'.
- * <!-- end-user-doc -->
- * <p>
- * The following features are implemented:
- * <ul>
- * <li>{@link org.eclipse.jem.internal.beaninfo.impl.EventSetDecoratorImpl#isInDefaultEventSet <em>In Default Event Set</em>}</li>
- * <li>{@link org.eclipse.jem.internal.beaninfo.impl.EventSetDecoratorImpl#isUnicast <em>Unicast</em>}</li>
- * <li>{@link org.eclipse.jem.internal.beaninfo.impl.EventSetDecoratorImpl#isListenerMethodsExplicitEmpty <em>Listener Methods Explicit Empty</em>}</li>
- * <li>{@link org.eclipse.jem.internal.beaninfo.impl.EventSetDecoratorImpl#getAddListenerMethod <em>Add Listener Method</em>}</li>
- * <li>{@link org.eclipse.jem.internal.beaninfo.impl.EventSetDecoratorImpl#getListenerMethods <em>Listener Methods</em>}</li>
- * <li>{@link org.eclipse.jem.internal.beaninfo.impl.EventSetDecoratorImpl#getListenerType <em>Listener Type</em>}</li>
- * <li>{@link org.eclipse.jem.internal.beaninfo.impl.EventSetDecoratorImpl#getRemoveListenerMethod <em>Remove Listener Method</em>}</li>
- * <li>{@link org.eclipse.jem.internal.beaninfo.impl.EventSetDecoratorImpl#getEventAdapterClass <em>Event Adapter Class</em>}</li>
- * <li>{@link org.eclipse.jem.internal.beaninfo.impl.EventSetDecoratorImpl#getSerListMthd <em>Ser List Mthd</em>}</li>
- * </ul>
- * </p>
- *
- * @generated
- */
-
-
-public class EventSetDecoratorImpl extends FeatureDecoratorImpl implements EventSetDecorator{
-
- /**
- * Bits for implicitly set features. This is internal, not meant for clients.
- */
- public static final long EVENT_ADDLISTENERMETHOD_IMPLICIT = 0x1L;
- public static final long EVENT_ADAPTERCLASS_IMPLICIT = 0x2L;
- public static final long EVENT_LISTENERMETHODS_IMPLICIT = 0x4L;
- public static final long EVENT_LISTENERTYPE_IMPLICIT = 0x8L;
- public static final long EVENT_REMOVELISTENERMETHOD_IMPLICIT = 0x10L;
- public static final long EVENT_DEFAULTEVENTSET_IMPLICIT = 0x20L;
- public static final long EVENT_UNICAST_IMPLICIT = 0x40L;
- public static final long EVENT_LISTENERMETHODS_DEFAULT = 0x80L;
-
-
- /**
- * The default value of the '{@link #isInDefaultEventSet() <em>In Default Event Set</em>}' attribute.
- * <!-- begin-user-doc -->
- * <!-- end-user-doc -->
- * @see #isInDefaultEventSet()
- * @generated
- * @ordered
- */
- protected static final boolean IN_DEFAULT_EVENT_SET_EDEFAULT = false;
-
- /**
- * The flag representing the value of the '{@link #isInDefaultEventSet() <em>In Default Event Set</em>}' attribute.
- * <!-- begin-user-doc -->
- * <!-- end-user-doc -->
- * @see #isInDefaultEventSet()
- * @generated
- * @ordered
- */
- protected static final int IN_DEFAULT_EVENT_SET_EFLAG = 1 << 18;
-
- /**
- * The flag representing whether the In Default Event Set attribute has been set.
- * <!-- begin-user-doc -->
- * <!-- end-user-doc -->
- * @generated
- * @ordered
- */
- protected static final int IN_DEFAULT_EVENT_SET_ESETFLAG = 1 << 19;
-
- /**
- * The default value of the '{@link #isUnicast() <em>Unicast</em>}' attribute.
- * <!-- begin-user-doc -->
- * <!-- end-user-doc -->
- * @see #isUnicast()
- * @generated
- * @ordered
- */
- protected static final boolean UNICAST_EDEFAULT = false;
-
- /**
- * The flag representing the value of the '{@link #isUnicast() <em>Unicast</em>}' attribute.
- * <!-- begin-user-doc -->
- * <!-- end-user-doc -->
- * @see #isUnicast()
- * @generated
- * @ordered
- */
- protected static final int UNICAST_EFLAG = 1 << 20;
-
- /**
- * The flag representing whether the Unicast attribute has been set.
- * <!-- begin-user-doc -->
- * <!-- end-user-doc -->
- * @generated
- * @ordered
- */
- protected static final int UNICAST_ESETFLAG = 1 << 21;
-
- /**
- * The default value of the '{@link #isListenerMethodsExplicitEmpty() <em>Listener Methods Explicit Empty</em>}' attribute.
- * <!-- begin-user-doc -->
- * <!-- end-user-doc -->
- * @see #isListenerMethodsExplicitEmpty()
- * @generated
- * @ordered
- */
- protected static final boolean LISTENER_METHODS_EXPLICIT_EMPTY_EDEFAULT = false;
-
- /**
- * The flag representing the value of the '{@link #isListenerMethodsExplicitEmpty() <em>Listener Methods Explicit Empty</em>}' attribute.
- * <!-- begin-user-doc -->
- * <!-- end-user-doc -->
- * @see #isListenerMethodsExplicitEmpty()
- * @generated
- * @ordered
- */
- protected static final int LISTENER_METHODS_EXPLICIT_EMPTY_EFLAG = 1 << 22;
-
- /**
- * The cached value of the '{@link #getAddListenerMethod() <em>Add Listener Method</em>}' reference.
- * <!-- begin-user-doc -->
- * <!-- end-user-doc -->
- * @see #getAddListenerMethod()
- * @generated
- * @ordered
- */
- protected Method addListenerMethod = null;
-
- /**
- * The cached value of the '{@link #getListenerType() <em>Listener Type</em>}' reference.
- * <!-- begin-user-doc -->
- * <!-- end-user-doc -->
- * @see #getListenerType()
- * @generated
- * @ordered
- */
- protected JavaClass listenerType = null;
- /**
- * The cached value of the '{@link #getRemoveListenerMethod() <em>Remove Listener Method</em>}' reference.
- * <!-- begin-user-doc -->
- * <!-- end-user-doc -->
- * @see #getRemoveListenerMethod()
- * @generated
- * @ordered
- */
- protected Method removeListenerMethod = null;
-
- /**
- * The cached value of the '{@link #getEventAdapterClass() <em>Event Adapter Class</em>}' reference.
- * <!-- begin-user-doc -->
- * <!-- end-user-doc -->
- * @see #getEventAdapterClass()
- * @generated
- * @ordered
- */
- protected JavaClass eventAdapterClass = null;
-
- /**
- * The cached value of the '{@link #getSerListMthd() <em>Ser List Mthd</em>}' containment reference list.
- * <!-- begin-user-doc -->
- * <!-- end-user-doc -->
- * @see #getSerListMthd()
- * @generated
- * @ordered
- */
- protected EList serListMthd = null;
-
- /**
- * <!-- begin-user-doc -->
- * <!-- end-user-doc -->
- * @generated
- */
- protected EventSetDecoratorImpl() {
- super();
- }
-
- /**
- * <!-- begin-user-doc -->
- * <!-- end-user-doc -->
- * @generated
- */
- protected EClass eStaticClass() {
- return BeaninfoPackage.eINSTANCE.getEventSetDecorator();
- }
-
- /**
- * <!-- begin-user-doc -->
- * <!-- end-user-doc -->
- * @generated
- */
- public boolean isInDefaultEventSet() {
- return (eFlags & IN_DEFAULT_EVENT_SET_EFLAG) != 0;
- }
-
- /**
- * <!-- begin-user-doc -->
- * <!-- end-user-doc -->
- * @generated
- */
- public void setInDefaultEventSet(boolean newInDefaultEventSet) {
- boolean oldInDefaultEventSet = (eFlags & IN_DEFAULT_EVENT_SET_EFLAG) != 0;
- if (newInDefaultEventSet) eFlags |= IN_DEFAULT_EVENT_SET_EFLAG; else eFlags &= ~IN_DEFAULT_EVENT_SET_EFLAG;
- boolean oldInDefaultEventSetESet = (eFlags & IN_DEFAULT_EVENT_SET_ESETFLAG) != 0;
- eFlags |= IN_DEFAULT_EVENT_SET_ESETFLAG;
- if (eNotificationRequired())
- eNotify(new ENotificationImpl(this, Notification.SET, BeaninfoPackage.EVENT_SET_DECORATOR__IN_DEFAULT_EVENT_SET, oldInDefaultEventSet, newInDefaultEventSet, !oldInDefaultEventSetESet));
- }
-
- /**
- * <!-- begin-user-doc -->
- * <!-- end-user-doc -->
- * @generated
- */
- public void unsetInDefaultEventSet() {
- boolean oldInDefaultEventSet = (eFlags & IN_DEFAULT_EVENT_SET_EFLAG) != 0;
- boolean oldInDefaultEventSetESet = (eFlags & IN_DEFAULT_EVENT_SET_ESETFLAG) != 0;
- if (IN_DEFAULT_EVENT_SET_EDEFAULT) eFlags |= IN_DEFAULT_EVENT_SET_EFLAG; else eFlags &= ~IN_DEFAULT_EVENT_SET_EFLAG;
- eFlags &= ~IN_DEFAULT_EVENT_SET_ESETFLAG;
- if (eNotificationRequired())
- eNotify(new ENotificationImpl(this, Notification.UNSET, BeaninfoPackage.EVENT_SET_DECORATOR__IN_DEFAULT_EVENT_SET, oldInDefaultEventSet, IN_DEFAULT_EVENT_SET_EDEFAULT, oldInDefaultEventSetESet));
- }
-
- /**
- * <!-- begin-user-doc -->
- * <!-- end-user-doc -->
- * @generated
- */
- public boolean isSetInDefaultEventSet() {
- return (eFlags & IN_DEFAULT_EVENT_SET_ESETFLAG) != 0;
- }
-
- /**
- * <!-- begin-user-doc -->
- * <!-- end-user-doc -->
- * @generated
- */
- public boolean isUnicast() {
- return (eFlags & UNICAST_EFLAG) != 0;
- }
-
- /**
- * <!-- begin-user-doc -->
- * <!-- end-user-doc -->
- * @generated
- */
- public void setUnicast(boolean newUnicast) {
- boolean oldUnicast = (eFlags & UNICAST_EFLAG) != 0;
- if (newUnicast) eFlags |= UNICAST_EFLAG; else eFlags &= ~UNICAST_EFLAG;
- boolean oldUnicastESet = (eFlags & UNICAST_ESETFLAG) != 0;
- eFlags |= UNICAST_ESETFLAG;
- if (eNotificationRequired())
- eNotify(new ENotificationImpl(this, Notification.SET, BeaninfoPackage.EVENT_SET_DECORATOR__UNICAST, oldUnicast, newUnicast, !oldUnicastESet));
- }
-
- /**
- * <!-- begin-user-doc -->
- * <!-- end-user-doc -->
- * @generated
- */
- public void unsetUnicast() {
- boolean oldUnicast = (eFlags & UNICAST_EFLAG) != 0;
- boolean oldUnicastESet = (eFlags & UNICAST_ESETFLAG) != 0;
- if (UNICAST_EDEFAULT) eFlags |= UNICAST_EFLAG; else eFlags &= ~UNICAST_EFLAG;
- eFlags &= ~UNICAST_ESETFLAG;
- if (eNotificationRequired())
- eNotify(new ENotificationImpl(this, Notification.UNSET, BeaninfoPackage.EVENT_SET_DECORATOR__UNICAST, oldUnicast, UNICAST_EDEFAULT, oldUnicastESet));
- }
-
- /**
- * <!-- begin-user-doc -->
- * <!-- end-user-doc -->
- * @generated
- */
- public boolean isSetUnicast() {
- return (eFlags & UNICAST_ESETFLAG) != 0;
- }
-
- /**
- * <!-- begin-user-doc -->
- * <!-- end-user-doc -->
- * @generated
- */
- public boolean isListenerMethodsExplicitEmpty() {
- return (eFlags & LISTENER_METHODS_EXPLICIT_EMPTY_EFLAG) != 0;
- }
-
- /**
- * <!-- begin-user-doc -->
- * <!-- end-user-doc -->
- * @generated
- */
- public void setListenerMethodsExplicitEmpty(boolean newListenerMethodsExplicitEmpty) {
- boolean oldListenerMethodsExplicitEmpty = (eFlags & LISTENER_METHODS_EXPLICIT_EMPTY_EFLAG) != 0;
- if (newListenerMethodsExplicitEmpty) eFlags |= LISTENER_METHODS_EXPLICIT_EMPTY_EFLAG; else eFlags &= ~LISTENER_METHODS_EXPLICIT_EMPTY_EFLAG;
- if (eNotificationRequired())
- eNotify(new ENotificationImpl(this, Notification.SET, BeaninfoPackage.EVENT_SET_DECORATOR__LISTENER_METHODS_EXPLICIT_EMPTY, oldListenerMethodsExplicitEmpty, newListenerMethodsExplicitEmpty));
- }
-
- /**
- * <!-- begin-user-doc -->
- * <!-- end-user-doc -->
- * @generated
- */
- public Method getAddListenerMethod() {
- if (addListenerMethod != null && addListenerMethod.eIsProxy()) {
- Method oldAddListenerMethod = addListenerMethod;
- addListenerMethod = (Method)eResolveProxy((InternalEObject)addListenerMethod);
- if (addListenerMethod != oldAddListenerMethod) {
- if (eNotificationRequired())
- eNotify(new ENotificationImpl(this, Notification.RESOLVE, BeaninfoPackage.EVENT_SET_DECORATOR__ADD_LISTENER_METHOD, oldAddListenerMethod, addListenerMethod));
- }
- }
- return addListenerMethod;
- }
-
- /**
- * <!-- begin-user-doc -->
- * <!-- end-user-doc -->
- * @generated
- */
- public Method basicGetAddListenerMethod() {
- return addListenerMethod;
- }
-
- /**
- * <!-- begin-user-doc -->
- * <!-- end-user-doc -->
- * @generated
- */
- public void setAddListenerMethod(Method newAddListenerMethod) {
- Method oldAddListenerMethod = addListenerMethod;
- addListenerMethod = newAddListenerMethod;
- if (eNotificationRequired())
- eNotify(new ENotificationImpl(this, Notification.SET, BeaninfoPackage.EVENT_SET_DECORATOR__ADD_LISTENER_METHOD, oldAddListenerMethod, addListenerMethod));
- }
-
- public EList getListenerMethods() {
- if (!isListenerMethodsExplicitEmpty() && getSerListMthd().isEmpty() && (getImplicitlySetBits()&(EVENT_LISTENERMETHODS_IMPLICIT | EVENT_LISTENERMETHODS_DEFAULT)) == 0) {
- // Not explicitly empty, it is empty, and we have not implicitly or by defaults made it empty, then create the defaults.
- createDefaultListenerMethodsList();
- }
- return getSerListMthd();
- }
-
- /**
- * <!-- begin-user-doc -->
- * <!-- end-user-doc -->
- * @generated
- */
- public EList getListenerMethodsGen() {
- // TODO: implement this method to return the 'Listener Methods' reference list
- // Ensure that you remove @generated or mark it @generated NOT
- throw new UnsupportedOperationException();
- }
-
- /**
- * <!-- begin-user-doc -->
- * <!-- end-user-doc -->
- * @generated
- */
- public JavaClass getListenerType() {
- if (listenerType != null && listenerType.eIsProxy()) {
- JavaClass oldListenerType = listenerType;
- listenerType = (JavaClass)eResolveProxy((InternalEObject)listenerType);
- if (listenerType != oldListenerType) {
- if (eNotificationRequired())
- eNotify(new ENotificationImpl(this, Notification.RESOLVE, BeaninfoPackage.EVENT_SET_DECORATOR__LISTENER_TYPE, oldListenerType, listenerType));
- }
- }
- return listenerType;
- }
-
- /**
- * This is called if method listeners list not explicitly set and there is no feature proxy or
- * there is a feature proxy and the proxy has nothing defined.
- * <p>
- * This is an internal method used by BeanInfo classes. It is not to be used by clients.
- */
- public EList createDefaultListenerMethodsList() {
- if (!eIsSet(EcorePackage.eINSTANCE.getEAnnotation_EModelElement()))
- return this.getSerListMthd(); // We are not attached, can't determine the list yet.
- EList mthdsList = this.getSerListMthd();
-
- JavaClass eventObjectClass = (JavaClass) JavaRefFactory.eINSTANCE.reflectType("java.util.EventObject", getEModelElement().eResource().getResourceSet()); //$NON-NLS-1$
-
- mthdsList.clear();
-
- // This is a little tricky. Need to get the methods for the listener type, and
- // then go through the methods and filter out the non-event ones.
- JavaClass lt = getListenerType();
- if (lt == null)
- return mthdsList; // Couldn't get the listener type for some reason, so leave as is.
- setImplicitlySetBits(getImplicitlySetBits()|EVENT_LISTENERMETHODS_DEFAULT); // Mark as we implicitly filled it in.
-
- BeaninfoFactory bfact = BeaninfoFactory.eINSTANCE;
- List ms = lt.getPublicMethodsExtended();
- int msize = ms.size();
- for (int i=0; i<msize; i++) {
- Method method = (Method) ms.get(i);
- List parms = method.getParameters();
- if (parms.size() != 1)
- continue; // Must have only one parm.
- if (!eventObjectClass.isAssignableFrom(((JavaParameter) parms.get(0)).getEType()))
- continue; // Parm does not inherit from java.util.EventObject
-
- // We need a method proxy, and a method decorator.
- MethodProxy mproxy = bfact.createMethodProxy();
- mproxy.setMethod(method);
- mproxy.setName(method.getName());
- MethodDecorator md = bfact.createMethodDecorator();
- md.setImplicitDecoratorFlag(ImplicitItem.IMPLICIT_DECORATOR_AND_FEATURE_LITERAL);
- md.setEModelElement(mproxy);
- mthdsList.add(mproxy);
- }
- return mthdsList;
- }
-
-
- /**
- * <!-- begin-user-doc -->
- * <!-- end-user-doc -->
- * @generated
- */
- public JavaClass basicGetListenerType() {
- return listenerType;
- }
-
- /**
- * <!-- begin-user-doc -->
- * <!-- end-user-doc -->
- * @generated
- */
- public void setListenerType(JavaClass newListenerType) {
- JavaClass oldListenerType = listenerType;
- listenerType = newListenerType;
- if (eNotificationRequired())
- eNotify(new ENotificationImpl(this, Notification.SET, BeaninfoPackage.EVENT_SET_DECORATOR__LISTENER_TYPE, oldListenerType, listenerType));
- }
-
- /**
- * <!-- begin-user-doc -->
- * <!-- end-user-doc -->
- * @generated
- */
- public Method getRemoveListenerMethod() {
- if (removeListenerMethod != null && removeListenerMethod.eIsProxy()) {
- Method oldRemoveListenerMethod = removeListenerMethod;
- removeListenerMethod = (Method)eResolveProxy((InternalEObject)removeListenerMethod);
- if (removeListenerMethod != oldRemoveListenerMethod) {
- if (eNotificationRequired())
- eNotify(new ENotificationImpl(this, Notification.RESOLVE, BeaninfoPackage.EVENT_SET_DECORATOR__REMOVE_LISTENER_METHOD, oldRemoveListenerMethod, removeListenerMethod));
- }
- }
- return removeListenerMethod;
- }
-
- /**
- * <!-- begin-user-doc -->
- * <!-- end-user-doc -->
- * @generated
- */
- public Method basicGetRemoveListenerMethod() {
- return removeListenerMethod;
- }
-
- /**
- * <!-- begin-user-doc -->
- * <!-- end-user-doc -->
- * @generated
- */
- public void setRemoveListenerMethod(Method newRemoveListenerMethod) {
- Method oldRemoveListenerMethod = removeListenerMethod;
- removeListenerMethod = newRemoveListenerMethod;
- if (eNotificationRequired())
- eNotify(new ENotificationImpl(this, Notification.SET, BeaninfoPackage.EVENT_SET_DECORATOR__REMOVE_LISTENER_METHOD, oldRemoveListenerMethod, removeListenerMethod));
- }
-
- /**
- * <!-- begin-user-doc -->
- * <!-- end-user-doc -->
- * @generated
- */
- public JavaClass getEventAdapterClass() {
- if (eventAdapterClass != null && eventAdapterClass.eIsProxy()) {
- JavaClass oldEventAdapterClass = eventAdapterClass;
- eventAdapterClass = (JavaClass)eResolveProxy((InternalEObject)eventAdapterClass);
- if (eventAdapterClass != oldEventAdapterClass) {
- if (eNotificationRequired())
- eNotify(new ENotificationImpl(this, Notification.RESOLVE, BeaninfoPackage.EVENT_SET_DECORATOR__EVENT_ADAPTER_CLASS, oldEventAdapterClass, eventAdapterClass));
- }
- }
- return eventAdapterClass;
- }
-
- /**
- * <!-- begin-user-doc -->
- * <!-- end-user-doc -->
- * @generated
- */
- public JavaClass basicGetEventAdapterClass() {
- return eventAdapterClass;
- }
-
- /**
- * <!-- begin-user-doc -->
- * <!-- end-user-doc -->
- * @generated
- */
- public void setEventAdapterClass(JavaClass newEventAdapterClass) {
- JavaClass oldEventAdapterClass = eventAdapterClass;
- eventAdapterClass = newEventAdapterClass;
- if (eNotificationRequired())
- eNotify(new ENotificationImpl(this, Notification.SET, BeaninfoPackage.EVENT_SET_DECORATOR__EVENT_ADAPTER_CLASS, oldEventAdapterClass, eventAdapterClass));
- }
-
- /**
- * <!-- begin-user-doc -->
- * <!-- end-user-doc -->
- * @generated
- */
- public EList getSerListMthd() {
- if (serListMthd == null) {
- serListMthd = new EObjectContainmentEList(MethodProxy.class, this, BeaninfoPackage.EVENT_SET_DECORATOR__SER_LIST_MTHD);
- }
- return serListMthd;
- }
-
- /**
- * <!-- begin-user-doc -->
- * <!-- end-user-doc -->
- * @generated
- */
- public NotificationChain eInverseAdd(InternalEObject otherEnd, int featureID, Class baseClass, NotificationChain msgs) {
- if (featureID >= 0) {
- switch (eDerivedStructuralFeatureID(featureID, baseClass)) {
- case BeaninfoPackage.EVENT_SET_DECORATOR__EANNOTATIONS:
- return ((InternalEList)getEAnnotations()).basicAdd(otherEnd, msgs);
- case BeaninfoPackage.EVENT_SET_DECORATOR__EMODEL_ELEMENT:
- if (eContainer != null)
- msgs = eBasicRemoveFromContainer(msgs);
- return eBasicSetContainer(otherEnd, BeaninfoPackage.EVENT_SET_DECORATOR__EMODEL_ELEMENT, msgs);
- default:
- return eDynamicInverseAdd(otherEnd, featureID, baseClass, msgs);
- }
- }
- if (eContainer != null)
- msgs = eBasicRemoveFromContainer(msgs);
- return eBasicSetContainer(otherEnd, featureID, msgs);
- }
-
- /**
- * <!-- begin-user-doc -->
- * <!-- end-user-doc -->
- * @generated
- */
- public NotificationChain eInverseRemove(InternalEObject otherEnd, int featureID, Class baseClass, NotificationChain msgs) {
- if (featureID >= 0) {
- switch (eDerivedStructuralFeatureID(featureID, baseClass)) {
- case BeaninfoPackage.EVENT_SET_DECORATOR__EANNOTATIONS:
- return ((InternalEList)getEAnnotations()).basicRemove(otherEnd, msgs);
- case BeaninfoPackage.EVENT_SET_DECORATOR__DETAILS:
- return ((InternalEList)getDetails()).basicRemove(otherEnd, msgs);
- case BeaninfoPackage.EVENT_SET_DECORATOR__EMODEL_ELEMENT:
- return eBasicSetContainer(null, BeaninfoPackage.EVENT_SET_DECORATOR__EMODEL_ELEMENT, msgs);
- case BeaninfoPackage.EVENT_SET_DECORATOR__CONTENTS:
- return ((InternalEList)getContents()).basicRemove(otherEnd, msgs);
- case BeaninfoPackage.EVENT_SET_DECORATOR__ATTRIBUTES:
- return ((InternalEList)getAttributes()).basicRemove(otherEnd, msgs);
- case BeaninfoPackage.EVENT_SET_DECORATOR__SER_LIST_MTHD:
- return ((InternalEList)getSerListMthd()).basicRemove(otherEnd, msgs);
- default:
- return eDynamicInverseRemove(otherEnd, featureID, baseClass, msgs);
- }
- }
- return eBasicSetContainer(null, featureID, msgs);
- }
-
- /**
- * <!-- begin-user-doc -->
- * <!-- end-user-doc -->
- * @generated
- */
- public NotificationChain eBasicRemoveFromContainer(NotificationChain msgs) {
- if (eContainerFeatureID() >= 0) {
- switch (eContainerFeatureID()) {
- case BeaninfoPackage.EVENT_SET_DECORATOR__EMODEL_ELEMENT:
- return eContainer.eInverseRemove(this, EcorePackage.EMODEL_ELEMENT__EANNOTATIONS, EModelElement.class, msgs);
- default:
- return eDynamicBasicRemoveFromContainer(msgs);
- }
- }
- return eContainer.eInverseRemove(this, EOPPOSITE_FEATURE_BASE - eContainerFeatureID(), null, msgs);
- }
-
- /**
- * <!-- begin-user-doc -->
- * <!-- end-user-doc -->
- * @generated
- */
- public Object eGet(EStructuralFeature eFeature, boolean resolve) {
- switch (eDerivedStructuralFeatureID(eFeature)) {
- case BeaninfoPackage.EVENT_SET_DECORATOR__EANNOTATIONS:
- return getEAnnotations();
- case BeaninfoPackage.EVENT_SET_DECORATOR__SOURCE:
- return getSource();
- case BeaninfoPackage.EVENT_SET_DECORATOR__DETAILS:
- return getDetails();
- case BeaninfoPackage.EVENT_SET_DECORATOR__EMODEL_ELEMENT:
- return getEModelElement();
- case BeaninfoPackage.EVENT_SET_DECORATOR__CONTENTS:
- return getContents();
- case BeaninfoPackage.EVENT_SET_DECORATOR__REFERENCES:
- return getReferences();
- case BeaninfoPackage.EVENT_SET_DECORATOR__DISPLAY_NAME:
- return getDisplayName();
- case BeaninfoPackage.EVENT_SET_DECORATOR__SHORT_DESCRIPTION:
- return getShortDescription();
- case BeaninfoPackage.EVENT_SET_DECORATOR__CATEGORY:
- return getCategory();
- case BeaninfoPackage.EVENT_SET_DECORATOR__EXPERT:
- return isExpert() ? Boolean.TRUE : Boolean.FALSE;
- case BeaninfoPackage.EVENT_SET_DECORATOR__HIDDEN:
- return isHidden() ? Boolean.TRUE : Boolean.FALSE;
- case BeaninfoPackage.EVENT_SET_DECORATOR__PREFERRED:
- return isPreferred() ? Boolean.TRUE : Boolean.FALSE;
- case BeaninfoPackage.EVENT_SET_DECORATOR__MERGE_INTROSPECTION:
- return isMergeIntrospection() ? Boolean.TRUE : Boolean.FALSE;
- case BeaninfoPackage.EVENT_SET_DECORATOR__ATTRIBUTES_EXPLICIT_EMPTY:
- return isAttributesExplicitEmpty() ? Boolean.TRUE : Boolean.FALSE;
- case BeaninfoPackage.EVENT_SET_DECORATOR__IMPLICITLY_SET_BITS:
- return new Long(getImplicitlySetBits());
- case BeaninfoPackage.EVENT_SET_DECORATOR__IMPLICIT_DECORATOR_FLAG:
- return getImplicitDecoratorFlag();
- case BeaninfoPackage.EVENT_SET_DECORATOR__ATTRIBUTES:
- return getAttributes();
- case BeaninfoPackage.EVENT_SET_DECORATOR__IN_DEFAULT_EVENT_SET:
- return isInDefaultEventSet() ? Boolean.TRUE : Boolean.FALSE;
- case BeaninfoPackage.EVENT_SET_DECORATOR__UNICAST:
- return isUnicast() ? Boolean.TRUE : Boolean.FALSE;
- case BeaninfoPackage.EVENT_SET_DECORATOR__LISTENER_METHODS_EXPLICIT_EMPTY:
- return isListenerMethodsExplicitEmpty() ? Boolean.TRUE : Boolean.FALSE;
- case BeaninfoPackage.EVENT_SET_DECORATOR__ADD_LISTENER_METHOD:
- if (resolve) return getAddListenerMethod();
- return basicGetAddListenerMethod();
- case BeaninfoPackage.EVENT_SET_DECORATOR__LISTENER_METHODS:
- return getListenerMethods();
- case BeaninfoPackage.EVENT_SET_DECORATOR__LISTENER_TYPE:
- if (resolve) return getListenerType();
- return basicGetListenerType();
- case BeaninfoPackage.EVENT_SET_DECORATOR__REMOVE_LISTENER_METHOD:
- if (resolve) return getRemoveListenerMethod();
- return basicGetRemoveListenerMethod();
- case BeaninfoPackage.EVENT_SET_DECORATOR__EVENT_ADAPTER_CLASS:
- if (resolve) return getEventAdapterClass();
- return basicGetEventAdapterClass();
- case BeaninfoPackage.EVENT_SET_DECORATOR__SER_LIST_MTHD:
- return getSerListMthd();
- }
- return eDynamicGet(eFeature, resolve);
- }
-
- /**
- * <!-- begin-user-doc -->
- * <!-- end-user-doc -->
- * @generated
- */
- public void eSet(EStructuralFeature eFeature, Object newValue) {
- switch (eDerivedStructuralFeatureID(eFeature)) {
- case BeaninfoPackage.EVENT_SET_DECORATOR__EANNOTATIONS:
- getEAnnotations().clear();
- getEAnnotations().addAll((Collection)newValue);
- return;
- case BeaninfoPackage.EVENT_SET_DECORATOR__SOURCE:
- setSource((String)newValue);
- return;
- case BeaninfoPackage.EVENT_SET_DECORATOR__DETAILS:
- getDetails().clear();
- getDetails().addAll((Collection)newValue);
- return;
- case BeaninfoPackage.EVENT_SET_DECORATOR__EMODEL_ELEMENT:
- setEModelElement((EModelElement)newValue);
- return;
- case BeaninfoPackage.EVENT_SET_DECORATOR__CONTENTS:
- getContents().clear();
- getContents().addAll((Collection)newValue);
- return;
- case BeaninfoPackage.EVENT_SET_DECORATOR__REFERENCES:
- getReferences().clear();
- getReferences().addAll((Collection)newValue);
- return;
- case BeaninfoPackage.EVENT_SET_DECORATOR__DISPLAY_NAME:
- setDisplayName((String)newValue);
- return;
- case BeaninfoPackage.EVENT_SET_DECORATOR__SHORT_DESCRIPTION:
- setShortDescription((String)newValue);
- return;
- case BeaninfoPackage.EVENT_SET_DECORATOR__CATEGORY:
- setCategory((String)newValue);
- return;
- case BeaninfoPackage.EVENT_SET_DECORATOR__EXPERT:
- setExpert(((Boolean)newValue).booleanValue());
- return;
- case BeaninfoPackage.EVENT_SET_DECORATOR__HIDDEN:
- setHidden(((Boolean)newValue).booleanValue());
- return;
- case BeaninfoPackage.EVENT_SET_DECORATOR__PREFERRED:
- setPreferred(((Boolean)newValue).booleanValue());
- return;
- case BeaninfoPackage.EVENT_SET_DECORATOR__MERGE_INTROSPECTION:
- setMergeIntrospection(((Boolean)newValue).booleanValue());
- return;
- case BeaninfoPackage.EVENT_SET_DECORATOR__ATTRIBUTES_EXPLICIT_EMPTY:
- setAttributesExplicitEmpty(((Boolean)newValue).booleanValue());
- return;
- case BeaninfoPackage.EVENT_SET_DECORATOR__IMPLICITLY_SET_BITS:
- setImplicitlySetBits(((Long)newValue).longValue());
- return;
- case BeaninfoPackage.EVENT_SET_DECORATOR__IMPLICIT_DECORATOR_FLAG:
- setImplicitDecoratorFlag((ImplicitItem)newValue);
- return;
- case BeaninfoPackage.EVENT_SET_DECORATOR__ATTRIBUTES:
- getAttributes().clear();
- getAttributes().addAll((Collection)newValue);
- return;
- case BeaninfoPackage.EVENT_SET_DECORATOR__IN_DEFAULT_EVENT_SET:
- setInDefaultEventSet(((Boolean)newValue).booleanValue());
- return;
- case BeaninfoPackage.EVENT_SET_DECORATOR__UNICAST:
- setUnicast(((Boolean)newValue).booleanValue());
- return;
- case BeaninfoPackage.EVENT_SET_DECORATOR__LISTENER_METHODS_EXPLICIT_EMPTY:
- setListenerMethodsExplicitEmpty(((Boolean)newValue).booleanValue());
- return;
- case BeaninfoPackage.EVENT_SET_DECORATOR__ADD_LISTENER_METHOD:
- setAddListenerMethod((Method)newValue);
- return;
- case BeaninfoPackage.EVENT_SET_DECORATOR__LISTENER_METHODS:
- getListenerMethods().clear();
- getListenerMethods().addAll((Collection)newValue);
- return;
- case BeaninfoPackage.EVENT_SET_DECORATOR__LISTENER_TYPE:
- setListenerType((JavaClass)newValue);
- return;
- case BeaninfoPackage.EVENT_SET_DECORATOR__REMOVE_LISTENER_METHOD:
- setRemoveListenerMethod((Method)newValue);
- return;
- case BeaninfoPackage.EVENT_SET_DECORATOR__EVENT_ADAPTER_CLASS:
- setEventAdapterClass((JavaClass)newValue);
- return;
- case BeaninfoPackage.EVENT_SET_DECORATOR__SER_LIST_MTHD:
- getSerListMthd().clear();
- getSerListMthd().addAll((Collection)newValue);
- return;
- }
- eDynamicSet(eFeature, newValue);
- }
-
- /**
- * <!-- begin-user-doc -->
- * <!-- end-user-doc -->
- * @generated
- */
- public void eUnset(EStructuralFeature eFeature) {
- switch (eDerivedStructuralFeatureID(eFeature)) {
- case BeaninfoPackage.EVENT_SET_DECORATOR__EANNOTATIONS:
- getEAnnotations().clear();
- return;
- case BeaninfoPackage.EVENT_SET_DECORATOR__SOURCE:
- setSource(SOURCE_EDEFAULT);
- return;
- case BeaninfoPackage.EVENT_SET_DECORATOR__DETAILS:
- getDetails().clear();
- return;
- case BeaninfoPackage.EVENT_SET_DECORATOR__EMODEL_ELEMENT:
- setEModelElement((EModelElement)null);
- return;
- case BeaninfoPackage.EVENT_SET_DECORATOR__CONTENTS:
- getContents().clear();
- return;
- case BeaninfoPackage.EVENT_SET_DECORATOR__REFERENCES:
- getReferences().clear();
- return;
- case BeaninfoPackage.EVENT_SET_DECORATOR__DISPLAY_NAME:
- unsetDisplayName();
- return;
- case BeaninfoPackage.EVENT_SET_DECORATOR__SHORT_DESCRIPTION:
- unsetShortDescription();
- return;
- case BeaninfoPackage.EVENT_SET_DECORATOR__CATEGORY:
- setCategory(CATEGORY_EDEFAULT);
- return;
- case BeaninfoPackage.EVENT_SET_DECORATOR__EXPERT:
- unsetExpert();
- return;
- case BeaninfoPackage.EVENT_SET_DECORATOR__HIDDEN:
- unsetHidden();
- return;
- case BeaninfoPackage.EVENT_SET_DECORATOR__PREFERRED:
- unsetPreferred();
- return;
- case BeaninfoPackage.EVENT_SET_DECORATOR__MERGE_INTROSPECTION:
- setMergeIntrospection(MERGE_INTROSPECTION_EDEFAULT);
- return;
- case BeaninfoPackage.EVENT_SET_DECORATOR__ATTRIBUTES_EXPLICIT_EMPTY:
- setAttributesExplicitEmpty(ATTRIBUTES_EXPLICIT_EMPTY_EDEFAULT);
- return;
- case BeaninfoPackage.EVENT_SET_DECORATOR__IMPLICITLY_SET_BITS:
- setImplicitlySetBits(IMPLICITLY_SET_BITS_EDEFAULT);
- return;
- case BeaninfoPackage.EVENT_SET_DECORATOR__IMPLICIT_DECORATOR_FLAG:
- setImplicitDecoratorFlag(IMPLICIT_DECORATOR_FLAG_EDEFAULT);
- return;
- case BeaninfoPackage.EVENT_SET_DECORATOR__ATTRIBUTES:
- getAttributes().clear();
- return;
- case BeaninfoPackage.EVENT_SET_DECORATOR__IN_DEFAULT_EVENT_SET:
- unsetInDefaultEventSet();
- return;
- case BeaninfoPackage.EVENT_SET_DECORATOR__UNICAST:
- unsetUnicast();
- return;
- case BeaninfoPackage.EVENT_SET_DECORATOR__LISTENER_METHODS_EXPLICIT_EMPTY:
- setListenerMethodsExplicitEmpty(LISTENER_METHODS_EXPLICIT_EMPTY_EDEFAULT);
- return;
- case BeaninfoPackage.EVENT_SET_DECORATOR__ADD_LISTENER_METHOD:
- setAddListenerMethod((Method)null);
- return;
- case BeaninfoPackage.EVENT_SET_DECORATOR__LISTENER_METHODS:
- getListenerMethods().clear();
- return;
- case BeaninfoPackage.EVENT_SET_DECORATOR__LISTENER_TYPE:
- setListenerType((JavaClass)null);
- return;
- case BeaninfoPackage.EVENT_SET_DECORATOR__REMOVE_LISTENER_METHOD:
- setRemoveListenerMethod((Method)null);
- return;
- case BeaninfoPackage.EVENT_SET_DECORATOR__EVENT_ADAPTER_CLASS:
- setEventAdapterClass((JavaClass)null);
- return;
- case BeaninfoPackage.EVENT_SET_DECORATOR__SER_LIST_MTHD:
- getSerListMthd().clear();
- return;
- }
- eDynamicUnset(eFeature);
- }
-
- /*
- * This is overridden so that we can do special is set tests:
- * 1) parameter descriptors: check if serParmDesc exists and not empty, since parameter descriptors is derived.
- * 2) serParmDesc: if flag set to default parm desc, then answer not set, else do normal isSet test. That way if set by default it won't serialize
- * out the unneeded default parms. They can be reconstructed quickly when needed.
- */
- public boolean eIsSet(EStructuralFeature eFeature) {
- switch (eDerivedStructuralFeatureID(eFeature)) {
- case BeaninfoPackage.EVENT_SET_DECORATOR__SOURCE:
- return isSourceSet(); // Override so that if set to the same as classname, then it is considered not set.
- case BeaninfoPackage.EVENT_SET_DECORATOR__LISTENER_METHODS:
- return eIsSetGen(BeaninfoPackage.eINSTANCE.getEventSetDecorator_SerListMthd()); // Let default serListMthd is set work.
- case BeaninfoPackage.EVENT_SET_DECORATOR__SER_LIST_MTHD:
- if ((getImplicitlySetBits() & EVENT_LISTENERMETHODS_DEFAULT) != 0)
- return false; // Not considered set if initialized by default.
- else
- return eIsSetGen(eFeature); // Not set by default, so check true setting.
- default:
- return eIsSetGen(eFeature); // Everything else use the gen method.
- }
- }
- /**
- * <!-- begin-user-doc -->
- * <!-- end-user-doc -->
- * @generated
- */
- public boolean eIsSetGen(EStructuralFeature eFeature) {
- switch (eDerivedStructuralFeatureID(eFeature)) {
- case BeaninfoPackage.EVENT_SET_DECORATOR__EANNOTATIONS:
- return eAnnotations != null && !eAnnotations.isEmpty();
- case BeaninfoPackage.EVENT_SET_DECORATOR__SOURCE:
- return SOURCE_EDEFAULT == null ? source != null : !SOURCE_EDEFAULT.equals(source);
- case BeaninfoPackage.EVENT_SET_DECORATOR__DETAILS:
- return details != null && !details.isEmpty();
- case BeaninfoPackage.EVENT_SET_DECORATOR__EMODEL_ELEMENT:
- return getEModelElement() != null;
- case BeaninfoPackage.EVENT_SET_DECORATOR__CONTENTS:
- return contents != null && !contents.isEmpty();
- case BeaninfoPackage.EVENT_SET_DECORATOR__REFERENCES:
- return references != null && !references.isEmpty();
- case BeaninfoPackage.EVENT_SET_DECORATOR__DISPLAY_NAME:
- return isSetDisplayName();
- case BeaninfoPackage.EVENT_SET_DECORATOR__SHORT_DESCRIPTION:
- return isSetShortDescription();
- case BeaninfoPackage.EVENT_SET_DECORATOR__CATEGORY:
- return CATEGORY_EDEFAULT == null ? category != null : !CATEGORY_EDEFAULT.equals(category);
- case BeaninfoPackage.EVENT_SET_DECORATOR__EXPERT:
- return isSetExpert();
- case BeaninfoPackage.EVENT_SET_DECORATOR__HIDDEN:
- return isSetHidden();
- case BeaninfoPackage.EVENT_SET_DECORATOR__PREFERRED:
- return isSetPreferred();
- case BeaninfoPackage.EVENT_SET_DECORATOR__MERGE_INTROSPECTION:
- return ((eFlags & MERGE_INTROSPECTION_EFLAG) != 0) != MERGE_INTROSPECTION_EDEFAULT;
- case BeaninfoPackage.EVENT_SET_DECORATOR__ATTRIBUTES_EXPLICIT_EMPTY:
- return ((eFlags & ATTRIBUTES_EXPLICIT_EMPTY_EFLAG) != 0) != ATTRIBUTES_EXPLICIT_EMPTY_EDEFAULT;
- case BeaninfoPackage.EVENT_SET_DECORATOR__IMPLICITLY_SET_BITS:
- return implicitlySetBits != IMPLICITLY_SET_BITS_EDEFAULT;
- case BeaninfoPackage.EVENT_SET_DECORATOR__IMPLICIT_DECORATOR_FLAG:
- return implicitDecoratorFlag != IMPLICIT_DECORATOR_FLAG_EDEFAULT;
- case BeaninfoPackage.EVENT_SET_DECORATOR__ATTRIBUTES:
- return attributes != null && !attributes.isEmpty();
- case BeaninfoPackage.EVENT_SET_DECORATOR__IN_DEFAULT_EVENT_SET:
- return isSetInDefaultEventSet();
- case BeaninfoPackage.EVENT_SET_DECORATOR__UNICAST:
- return isSetUnicast();
- case BeaninfoPackage.EVENT_SET_DECORATOR__LISTENER_METHODS_EXPLICIT_EMPTY:
- return ((eFlags & LISTENER_METHODS_EXPLICIT_EMPTY_EFLAG) != 0) != LISTENER_METHODS_EXPLICIT_EMPTY_EDEFAULT;
- case BeaninfoPackage.EVENT_SET_DECORATOR__ADD_LISTENER_METHOD:
- return addListenerMethod != null;
- case BeaninfoPackage.EVENT_SET_DECORATOR__LISTENER_METHODS:
- return !getListenerMethods().isEmpty();
- case BeaninfoPackage.EVENT_SET_DECORATOR__LISTENER_TYPE:
- return listenerType != null;
- case BeaninfoPackage.EVENT_SET_DECORATOR__REMOVE_LISTENER_METHOD:
- return removeListenerMethod != null;
- case BeaninfoPackage.EVENT_SET_DECORATOR__EVENT_ADAPTER_CLASS:
- return eventAdapterClass != null;
- case BeaninfoPackage.EVENT_SET_DECORATOR__SER_LIST_MTHD:
- return serListMthd != null && !serListMthd.isEmpty();
- }
- return eDynamicIsSet(eFeature);
- }
-
- /**
- * <!-- begin-user-doc -->
- * <!-- end-user-doc -->
- * @generated
- */
- public String toString() {
- if (eIsProxy()) return super.toString();
-
- StringBuffer result = new StringBuffer(super.toString());
- result.append(" (inDefaultEventSet: ");
- if ((eFlags & IN_DEFAULT_EVENT_SET_ESETFLAG) != 0) result.append((eFlags & IN_DEFAULT_EVENT_SET_EFLAG) != 0); else result.append("<unset>");
- result.append(", unicast: ");
- if ((eFlags & UNICAST_ESETFLAG) != 0) result.append((eFlags & UNICAST_EFLAG) != 0); else result.append("<unset>");
- result.append(", listenerMethodsExplicitEmpty: ");
- result.append((eFlags & LISTENER_METHODS_EXPLICIT_EMPTY_EFLAG) != 0);
- result.append(')');
- return result.toString();
- }
-
-}
diff --git a/plugins/org.eclipse.jem.beaninfo/beaninfo/org/eclipse/jem/internal/beaninfo/impl/FeatureAttributeMapEntryImpl.java b/plugins/org.eclipse.jem.beaninfo/beaninfo/org/eclipse/jem/internal/beaninfo/impl/FeatureAttributeMapEntryImpl.java
deleted file mode 100644
index 0b8f067..0000000
--- a/plugins/org.eclipse.jem.beaninfo/beaninfo/org/eclipse/jem/internal/beaninfo/impl/FeatureAttributeMapEntryImpl.java
+++ /dev/null
@@ -1,308 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2001, 2006 IBM Corporation and others.
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
- *
- * Contributors:
- * IBM Corporation - initial API and implementation
- *******************************************************************************/
-/*
-
-
- */
-
-package org.eclipse.jem.internal.beaninfo.impl;
-
-import org.eclipse.emf.common.notify.Notification;
-
-import org.eclipse.emf.common.util.BasicEMap;
-import org.eclipse.emf.common.util.EMap;
-
-import org.eclipse.emf.ecore.EClass;
-import org.eclipse.emf.ecore.EObject;
-import org.eclipse.emf.ecore.EStructuralFeature;
-
-import org.eclipse.emf.ecore.impl.ENotificationImpl;
-import org.eclipse.emf.ecore.impl.EObjectImpl;
-
-import org.eclipse.jem.internal.beaninfo.BeaninfoPackage;
-
-import org.eclipse.jem.internal.beaninfo.common.FeatureAttributeValue;
-
-/**
- * <!-- begin-user-doc -->
- * An implementation of the model object '<em><b>Feature Attribute Map Entry</b></em>'.
- * <!-- end-user-doc -->
- * <p>
- * The following features are implemented:
- * <ul>
- * <li>{@link org.eclipse.jem.internal.beaninfo.impl.FeatureAttributeMapEntryImpl#getTypedKey <em>Key</em>}</li>
- * <li>{@link org.eclipse.jem.internal.beaninfo.impl.FeatureAttributeMapEntryImpl#getTypedValue <em>Value</em>}</li>
- * </ul>
- * </p>
- *
- * @generated
- */
-public class FeatureAttributeMapEntryImpl extends EObjectImpl implements BasicEMap.Entry {
-
- /**
- * The default value of the '{@link #getTypedKey() <em>Key</em>}' attribute.
- * <!-- begin-user-doc -->
- * <!-- end-user-doc -->
- * @see #getTypedKey()
- * @generated
- * @ordered
- */
- protected static final String KEY_EDEFAULT = null;
-
- /**
- * The cached value of the '{@link #getTypedKey() <em>Key</em>}' attribute.
- * <!-- begin-user-doc -->
- * <!-- end-user-doc -->
- * @see #getTypedKey()
- * @generated
- * @ordered
- */
- protected String key = KEY_EDEFAULT;
-
- /**
- * The default value of the '{@link #getTypedValue() <em>Value</em>}' attribute.
- * <!-- begin-user-doc -->
- * <!-- end-user-doc -->
- * @see #getTypedValue()
- * @generated
- * @ordered
- */
- protected static final FeatureAttributeValue VALUE_EDEFAULT = null;
-
- /**
- * The cached value of the '{@link #getTypedValue() <em>Value</em>}' attribute.
- * <!-- begin-user-doc -->
- * <!-- end-user-doc -->
- * @see #getTypedValue()
- * @generated
- * @ordered
- */
- protected FeatureAttributeValue value = VALUE_EDEFAULT;
-
- /**
- * <!-- begin-user-doc -->
- * <!-- end-user-doc -->
- * @generated
- */
- protected FeatureAttributeMapEntryImpl() {
- super();
- }
-
- /**
- * <!-- begin-user-doc -->
- * <!-- end-user-doc -->
- * @generated
- */
- protected EClass eStaticClass() {
- return BeaninfoPackage.eINSTANCE.getFeatureAttributeMapEntry();
- }
-
- /**
- * <!-- begin-user-doc -->
- * <!-- end-user-doc -->
- * @generated
- */
- public String getTypedKey() {
- return key;
- }
-
- /**
- * <!-- begin-user-doc -->
- * <!-- end-user-doc -->
- * @generated
- */
- public void setTypedKey(String newKey) {
- String oldKey = key;
- key = newKey;
- if (eNotificationRequired())
- eNotify(new ENotificationImpl(this, Notification.SET, BeaninfoPackage.FEATURE_ATTRIBUTE_MAP_ENTRY__KEY, oldKey, key));
- }
-
- /**
- * <!-- begin-user-doc -->
- * <!-- end-user-doc -->
- * @generated
- */
- public FeatureAttributeValue getTypedValue() {
- return value;
- }
-
- /**
- * <!-- begin-user-doc -->
- * <!-- end-user-doc -->
- * @generated
- */
- public void setTypedValue(FeatureAttributeValue newValue) {
- FeatureAttributeValue oldValue = value;
- value = newValue;
- if (eNotificationRequired())
- eNotify(new ENotificationImpl(this, Notification.SET, BeaninfoPackage.FEATURE_ATTRIBUTE_MAP_ENTRY__VALUE, oldValue, value));
- }
-
- /**
- * <!-- begin-user-doc -->
- * <!-- end-user-doc -->
- * @generated
- */
- public Object eGet(EStructuralFeature eFeature, boolean resolve) {
- switch (eDerivedStructuralFeatureID(eFeature)) {
- case BeaninfoPackage.FEATURE_ATTRIBUTE_MAP_ENTRY__KEY:
- return getTypedKey();
- case BeaninfoPackage.FEATURE_ATTRIBUTE_MAP_ENTRY__VALUE:
- return getTypedValue();
- }
- return eDynamicGet(eFeature, resolve);
- }
-
- /**
- * <!-- begin-user-doc -->
- * <!-- end-user-doc -->
- * @generated
- */
- public void eSet(EStructuralFeature eFeature, Object newValue) {
- switch (eDerivedStructuralFeatureID(eFeature)) {
- case BeaninfoPackage.FEATURE_ATTRIBUTE_MAP_ENTRY__KEY:
- setTypedKey((String)newValue);
- return;
- case BeaninfoPackage.FEATURE_ATTRIBUTE_MAP_ENTRY__VALUE:
- setTypedValue((FeatureAttributeValue)newValue);
- return;
- }
- eDynamicSet(eFeature, newValue);
- }
-
- /**
- * <!-- begin-user-doc -->
- * <!-- end-user-doc -->
- * @generated
- */
- public void eUnset(EStructuralFeature eFeature) {
- switch (eDerivedStructuralFeatureID(eFeature)) {
- case BeaninfoPackage.FEATURE_ATTRIBUTE_MAP_ENTRY__KEY:
- setTypedKey(KEY_EDEFAULT);
- return;
- case BeaninfoPackage.FEATURE_ATTRIBUTE_MAP_ENTRY__VALUE:
- setTypedValue(VALUE_EDEFAULT);
- return;
- }
- eDynamicUnset(eFeature);
- }
-
- /**
- * <!-- begin-user-doc -->
- * <!-- end-user-doc -->
- * @generated
- */
- public boolean eIsSet(EStructuralFeature eFeature) {
- switch (eDerivedStructuralFeatureID(eFeature)) {
- case BeaninfoPackage.FEATURE_ATTRIBUTE_MAP_ENTRY__KEY:
- return KEY_EDEFAULT == null ? key != null : !KEY_EDEFAULT.equals(key);
- case BeaninfoPackage.FEATURE_ATTRIBUTE_MAP_ENTRY__VALUE:
- return VALUE_EDEFAULT == null ? value != null : !VALUE_EDEFAULT.equals(value);
- }
- return eDynamicIsSet(eFeature);
- }
-
- /**
- * <!-- begin-user-doc -->
- * <!-- end-user-doc -->
- * @generated
- */
- public String toString() {
- if (eIsProxy()) return super.toString();
-
- StringBuffer result = new StringBuffer(super.toString());
- result.append(" (key: ");
- result.append(key);
- result.append(", value: ");
- result.append(value);
- result.append(')');
- return result.toString();
- }
-
- /**
- * <!-- begin-user-doc -->
- * <!-- end-user-doc -->
- * @generated
- */
- protected int hash = -1;
-
- /**
- * <!-- begin-user-doc -->
- * <!-- end-user-doc -->
- * @generated
- */
- public int getHash() {
- if (hash == -1) {
- Object theKey = getKey();
- hash = (theKey == null ? 0 : theKey.hashCode());
- }
- return hash;
- }
-
- /**
- * <!-- begin-user-doc -->
- * <!-- end-user-doc -->
- * @generated
- */
- public void setHash(int hash) {
- this.hash = hash;
- }
-
- /**
- * <!-- begin-user-doc -->
- * <!-- end-user-doc -->
- * @generated
- */
- public Object getKey() {
- return getTypedKey();
- }
-
- /**
- * <!-- begin-user-doc -->
- * <!-- end-user-doc -->
- * @generated
- */
- public void setKey(Object key) {
- setTypedKey((String)key);
- }
-
- /**
- * <!-- begin-user-doc -->
- * <!-- end-user-doc -->
- * @generated
- */
- public Object getValue() {
- return getTypedValue();
- }
-
- /**
- * <!-- begin-user-doc -->
- * <!-- end-user-doc -->
- * @generated
- */
- public Object setValue(Object value) {
- Object oldValue = getValue();
- setTypedValue((FeatureAttributeValue)value);
- return oldValue;
- }
-
- /**
- * <!-- begin-user-doc -->
- * <!-- end-user-doc -->
- * @generated
- */
- public EMap getEMap() {
- EObject container = eContainer();
- return container == null ? null : (EMap)container.eGet(eContainmentFeature());
- }
-
-} //FeatureAttributeMapEntryImpl
diff --git a/plugins/org.eclipse.jem.beaninfo/beaninfo/org/eclipse/jem/internal/beaninfo/impl/FeatureDecoratorImpl.java b/plugins/org.eclipse.jem.beaninfo/beaninfo/org/eclipse/jem/internal/beaninfo/impl/FeatureDecoratorImpl.java
deleted file mode 100644
index d401759..0000000
--- a/plugins/org.eclipse.jem.beaninfo/beaninfo/org/eclipse/jem/internal/beaninfo/impl/FeatureDecoratorImpl.java
+++ /dev/null
@@ -1,1058 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2001, 2006 IBM Corporation and others.
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
- *
- * Contributors:
- * IBM Corporation - initial API and implementation
- *******************************************************************************/
-package org.eclipse.jem.internal.beaninfo.impl;
-/*
-
-
- */
-
-
-import java.util.Collection;
-
-import org.eclipse.emf.common.notify.Notification;
-import org.eclipse.emf.common.notify.NotificationChain;
-import org.eclipse.emf.common.util.EMap;
-
-import org.eclipse.emf.ecore.EClass;
-import org.eclipse.emf.ecore.EModelElement;
-import org.eclipse.emf.ecore.ENamedElement;
-import org.eclipse.emf.ecore.EStructuralFeature;
-import org.eclipse.emf.ecore.EcorePackage;
-import org.eclipse.emf.ecore.InternalEObject;
-import org.eclipse.emf.ecore.impl.EAnnotationImpl;
-import org.eclipse.emf.ecore.impl.ENotificationImpl;
-import org.eclipse.emf.ecore.util.EcoreEMap;
-import org.eclipse.emf.ecore.util.InternalEList;
-
-import org.eclipse.jem.internal.beaninfo.BeaninfoPackage;
-import org.eclipse.jem.internal.beaninfo.FeatureDecorator;
-import org.eclipse.jem.internal.beaninfo.ImplicitItem;
-
-/**
- * <!-- begin-user-doc -->
- * An implementation of the model object '<em><b>Feature Decorator</b></em>'.
- * <!-- end-user-doc -->
- * <p>
- * The following features are implemented:
- * <ul>
- * <li>{@link org.eclipse.jem.internal.beaninfo.impl.FeatureDecoratorImpl#getDisplayName <em>Display Name</em>}</li>
- * <li>{@link org.eclipse.jem.internal.beaninfo.impl.FeatureDecoratorImpl#getShortDescription <em>Short Description</em>}</li>
- * <li>{@link org.eclipse.jem.internal.beaninfo.impl.FeatureDecoratorImpl#getCategory <em>Category</em>}</li>
- * <li>{@link org.eclipse.jem.internal.beaninfo.impl.FeatureDecoratorImpl#isExpert <em>Expert</em>}</li>
- * <li>{@link org.eclipse.jem.internal.beaninfo.impl.FeatureDecoratorImpl#isHidden <em>Hidden</em>}</li>
- * <li>{@link org.eclipse.jem.internal.beaninfo.impl.FeatureDecoratorImpl#isPreferred <em>Preferred</em>}</li>
- * <li>{@link org.eclipse.jem.internal.beaninfo.impl.FeatureDecoratorImpl#isMergeIntrospection <em>Merge Introspection</em>}</li>
- * <li>{@link org.eclipse.jem.internal.beaninfo.impl.FeatureDecoratorImpl#isAttributesExplicitEmpty <em>Attributes Explicit Empty</em>}</li>
- * <li>{@link org.eclipse.jem.internal.beaninfo.impl.FeatureDecoratorImpl#getImplicitlySetBits <em>Implicitly Set Bits</em>}</li>
- * <li>{@link org.eclipse.jem.internal.beaninfo.impl.FeatureDecoratorImpl#getImplicitDecoratorFlag <em>Implicit Decorator Flag</em>}</li>
- * <li>{@link org.eclipse.jem.internal.beaninfo.impl.FeatureDecoratorImpl#getAttributes <em>Attributes</em>}</li>
- * </ul>
- * </p>
- *
- * @generated
- */
-public class FeatureDecoratorImpl extends EAnnotationImpl implements FeatureDecorator{
-
- /**
- * Bits for implicitly set features. This is internal, not meant for clients.
- * Note: To make it easier to make changes Feature goes from high bits down, while the
- * subclasses go from low-bits up. That way if a change is made to add something of
- * interest to Feature, all of the subclasses don't need to have their bits re-ordered.
- * Since these are bits, it doesn't matter which ones to use.
- */
- public static final long FEATURE_DISPLAYNAME_IMPLICIT = 0x8000000000000000L;
- public static final long FEATURE_SHORTDESC_IMPLICIT = 0x4000000000000000L;
- public static final long FEATURE_CATEGORY_IMPLICIT = 0x2000000000000000L;
- public static final long FEATURE_EXPERT_IMPLICIT = 0x1000000000000000L;
- public static final long FEATURE_HIDDEN_IMPLICIT = 0x800000000000000L;
- public static final long FEATURE_PREFERRED_IMPLICIT = 0x400000000000000L;
- public static final long FEATURE_ATTRIBUTES_IMPLICIT = 0x200000000000000L;
-
- /**
- * The default value of the '{@link #getDisplayName() <em>Display Name</em>}' attribute.
- * <!-- begin-user-doc -->
- * <!-- end-user-doc -->
- * @see #getDisplayName()
- * @generated
- * @ordered
- */
- protected static final String DISPLAY_NAME_EDEFAULT = null;
-
-
- /**
- * The cached value of the '{@link #getDisplayName() <em>Display Name</em>}' attribute.
- * <!-- begin-user-doc -->
- * <!-- end-user-doc -->
- * @see #getDisplayName()
- * @generated
- * @ordered
- */
- protected String displayName = DISPLAY_NAME_EDEFAULT;
- /**
- * The flag representing whether the Display Name attribute has been set.
- * <!-- begin-user-doc -->
- * <!-- end-user-doc -->
- * @generated
- * @ordered
- */
- protected static final int DISPLAY_NAME_ESETFLAG = 1 << 8;
-
- /**
- * The default value of the '{@link #getShortDescription() <em>Short Description</em>}' attribute.
- * <!-- begin-user-doc -->
- * <!-- end-user-doc -->
- * @see #getShortDescription()
- * @generated
- * @ordered
- */
- protected static final String SHORT_DESCRIPTION_EDEFAULT = null;
-
- /**
- * The cached value of the '{@link #getShortDescription() <em>Short Description</em>}' attribute.
- * <!-- begin-user-doc -->
- * <!-- end-user-doc -->
- * @see #getShortDescription()
- * @generated
- * @ordered
- */
- protected String shortDescription = SHORT_DESCRIPTION_EDEFAULT;
- /**
- * The flag representing whether the Short Description attribute has been set.
- * <!-- begin-user-doc -->
- * <!-- end-user-doc -->
- * @generated
- * @ordered
- */
- protected static final int SHORT_DESCRIPTION_ESETFLAG = 1 << 9;
-
- /**
- * The default value of the '{@link #getCategory() <em>Category</em>}' attribute.
- * <!-- begin-user-doc -->
- * <!-- end-user-doc -->
- * @see #getCategory()
- * @generated
- * @ordered
- */
- protected static final String CATEGORY_EDEFAULT = null;
-
- /**
- * The cached value of the '{@link #getCategory() <em>Category</em>}' attribute.
- * <!-- begin-user-doc -->
- * <!-- end-user-doc -->
- * @see #getCategory()
- * @generated
- * @ordered
- */
- protected String category = CATEGORY_EDEFAULT;
- /**
- * The default value of the '{@link #isExpert() <em>Expert</em>}' attribute.
- * <!-- begin-user-doc -->
- * <!-- end-user-doc -->
- * @see #isExpert()
- * @generated
- * @ordered
- */
- protected static final boolean EXPERT_EDEFAULT = false;
-
- /**
- * The flag representing the value of the '{@link #isExpert() <em>Expert</em>}' attribute.
- * <!-- begin-user-doc -->
- * <!-- end-user-doc -->
- * @see #isExpert()
- * @generated
- * @ordered
- */
- protected static final int EXPERT_EFLAG = 1 << 10;
-
- /**
- * The flag representing whether the Expert attribute has been set.
- * <!-- begin-user-doc -->
- * <!-- end-user-doc -->
- * @generated
- * @ordered
- */
- protected static final int EXPERT_ESETFLAG = 1 << 11;
-
- /**
- * The default value of the '{@link #isHidden() <em>Hidden</em>}' attribute.
- * <!-- begin-user-doc -->
- * <!-- end-user-doc -->
- * @see #isHidden()
- * @generated
- * @ordered
- */
- protected static final boolean HIDDEN_EDEFAULT = false;
-
- /**
- * The flag representing the value of the '{@link #isHidden() <em>Hidden</em>}' attribute.
- * <!-- begin-user-doc -->
- * <!-- end-user-doc -->
- * @see #isHidden()
- * @generated
- * @ordered
- */
- protected static final int HIDDEN_EFLAG = 1 << 12;
-
- /**
- * The flag representing whether the Hidden attribute has been set.
- * <!-- begin-user-doc -->
- * <!-- end-user-doc -->
- * @generated
- * @ordered
- */
- protected static final int HIDDEN_ESETFLAG = 1 << 13;
-
- /**
- * The default value of the '{@link #isPreferred() <em>Preferred</em>}' attribute.
- * <!-- begin-user-doc -->
- * <!-- end-user-doc -->
- * @see #isPreferred()
- * @generated
- * @ordered
- */
- protected static final boolean PREFERRED_EDEFAULT = false;
-
- /**
- * The flag representing the value of the '{@link #isPreferred() <em>Preferred</em>}' attribute.
- * <!-- begin-user-doc -->
- * <!-- end-user-doc -->
- * @see #isPreferred()
- * @generated
- * @ordered
- */
- protected static final int PREFERRED_EFLAG = 1 << 14;
-
- /**
- * The flag representing whether the Preferred attribute has been set.
- * <!-- begin-user-doc -->
- * <!-- end-user-doc -->
- * @generated
- * @ordered
- */
- protected static final int PREFERRED_ESETFLAG = 1 << 15;
-
- /**
- * The default value of the '{@link #isMergeIntrospection() <em>Merge Introspection</em>}' attribute.
- * <!-- begin-user-doc -->
- * <!-- end-user-doc -->
- * @see #isMergeIntrospection()
- * @generated
- * @ordered
- */
- protected static final boolean MERGE_INTROSPECTION_EDEFAULT = true;
-
- /**
- * The flag representing the value of the '{@link #isMergeIntrospection() <em>Merge Introspection</em>}' attribute.
- * <!-- begin-user-doc -->
- * <!-- end-user-doc -->
- * @see #isMergeIntrospection()
- * @generated
- * @ordered
- */
- protected static final int MERGE_INTROSPECTION_EFLAG = 1 << 16;
-
- /**
- * The default value of the '{@link #isAttributesExplicitEmpty() <em>Attributes Explicit Empty</em>}' attribute.
- * <!-- begin-user-doc -->
- * <!-- end-user-doc -->
- * @see #isAttributesExplicitEmpty()
- * @generated
- * @ordered
- */
- protected static final boolean ATTRIBUTES_EXPLICIT_EMPTY_EDEFAULT = false;
-
- /**
- * The flag representing the value of the '{@link #isAttributesExplicitEmpty() <em>Attributes Explicit Empty</em>}' attribute.
- * <!-- begin-user-doc -->
- * <!-- end-user-doc -->
- * @see #isAttributesExplicitEmpty()
- * @generated
- * @ordered
- */
- protected static final int ATTRIBUTES_EXPLICIT_EMPTY_EFLAG = 1 << 17;
-
- /**
- * The default value of the '{@link #getImplicitlySetBits() <em>Implicitly Set Bits</em>}' attribute.
- * <!-- begin-user-doc -->
- * <!-- end-user-doc -->
- * @see #getImplicitlySetBits()
- * @generated
- * @ordered
- */
- protected static final long IMPLICITLY_SET_BITS_EDEFAULT = 0L;
-
- /**
- * The cached value of the '{@link #getImplicitlySetBits() <em>Implicitly Set Bits</em>}' attribute.
- * <!-- begin-user-doc -->
- * <!-- end-user-doc -->
- * @see #getImplicitlySetBits()
- * @generated
- * @ordered
- */
- protected long implicitlySetBits = IMPLICITLY_SET_BITS_EDEFAULT;
-
- /**
- * The default value of the '{@link #getImplicitDecoratorFlag() <em>Implicit Decorator Flag</em>}' attribute.
- * <!-- begin-user-doc -->
- * <!-- end-user-doc -->
- * @see #getImplicitDecoratorFlag()
- * @generated
- * @ordered
- */
- protected static final ImplicitItem IMPLICIT_DECORATOR_FLAG_EDEFAULT = ImplicitItem.NOT_IMPLICIT_LITERAL;
-
- /**
- * The cached value of the '{@link #getImplicitDecoratorFlag() <em>Implicit Decorator Flag</em>}' attribute.
- * <!-- begin-user-doc -->
- * <!-- end-user-doc -->
- * @see #getImplicitDecoratorFlag()
- * @generated
- * @ordered
- */
- protected ImplicitItem implicitDecoratorFlag = IMPLICIT_DECORATOR_FLAG_EDEFAULT;
-
- /**
- * The cached value of the '{@link #getAttributes() <em>Attributes</em>}' map.
- * <!-- begin-user-doc -->
- * <!-- end-user-doc -->
- * @see #getAttributes()
- * @generated
- * @ordered
- */
- protected EMap attributes = null;
-
- /**
- * <!-- begin-user-doc -->
- * <!-- end-user-doc -->
- * @generated
- */
- protected FeatureDecoratorImpl() {
- super();
- eFlags |= MERGE_INTROSPECTION_EFLAG;
- }
-
- /**
- * <!-- begin-user-doc -->
- * <!-- end-user-doc -->
- * @generated
- */
- protected EClass eStaticClass() {
- return BeaninfoPackage.eINSTANCE.getFeatureDecorator();
- }
-
- public String getDisplayName() {
- return isSetDisplayName() ? getDisplayNameGen() : getName();
- }
-
- /**
- * <!-- begin-user-doc -->
- * <!-- end-user-doc -->
- * @generated
- */
- public String getDisplayNameGen() {
- return displayName;
- }
-
- public String getName() {
- ENamedElement ne = (ENamedElement) getEModelElement();
- if (ne != null)
- return ne.getName(); // The name from the owner of the feature has to be the name of feature.
- else
- return "?"; // Don't know what it is. //$NON-NLS-1$
- }
-
-
-
- /**
- * <!-- begin-user-doc -->
- * <!-- end-user-doc -->
- * @generated
- */
- public void setDisplayName(String newDisplayName) {
- String oldDisplayName = displayName;
- displayName = newDisplayName;
- boolean oldDisplayNameESet = (eFlags & DISPLAY_NAME_ESETFLAG) != 0;
- eFlags |= DISPLAY_NAME_ESETFLAG;
- if (eNotificationRequired())
- eNotify(new ENotificationImpl(this, Notification.SET, BeaninfoPackage.FEATURE_DECORATOR__DISPLAY_NAME, oldDisplayName, displayName, !oldDisplayNameESet));
- }
-
- /**
- * <!-- begin-user-doc -->
- * <!-- end-user-doc -->
- * @generated
- */
- public void unsetDisplayName() {
- String oldDisplayName = displayName;
- boolean oldDisplayNameESet = (eFlags & DISPLAY_NAME_ESETFLAG) != 0;
- displayName = DISPLAY_NAME_EDEFAULT;
- eFlags &= ~DISPLAY_NAME_ESETFLAG;
- if (eNotificationRequired())
- eNotify(new ENotificationImpl(this, Notification.UNSET, BeaninfoPackage.FEATURE_DECORATOR__DISPLAY_NAME, oldDisplayName, DISPLAY_NAME_EDEFAULT, oldDisplayNameESet));
- }
-
- /**
- * <!-- begin-user-doc -->
- * <!-- end-user-doc -->
- * @generated
- */
- public boolean isSetDisplayName() {
- return (eFlags & DISPLAY_NAME_ESETFLAG) != 0;
- }
-
- /**
- * <!-- begin-user-doc -->
- * <!-- end-user-doc -->
- * @generated
- */
- public String getShortDescription() {
- return shortDescription;
- }
-
- /**
- * <!-- begin-user-doc -->
- * <!-- end-user-doc -->
- * @generated
- */
- public void setShortDescription(String newShortDescription) {
- String oldShortDescription = shortDescription;
- shortDescription = newShortDescription;
- boolean oldShortDescriptionESet = (eFlags & SHORT_DESCRIPTION_ESETFLAG) != 0;
- eFlags |= SHORT_DESCRIPTION_ESETFLAG;
- if (eNotificationRequired())
- eNotify(new ENotificationImpl(this, Notification.SET, BeaninfoPackage.FEATURE_DECORATOR__SHORT_DESCRIPTION, oldShortDescription, shortDescription, !oldShortDescriptionESet));
- }
-
- /**
- * <!-- begin-user-doc -->
- * <!-- end-user-doc -->
- * @generated
- */
- public void unsetShortDescription() {
- String oldShortDescription = shortDescription;
- boolean oldShortDescriptionESet = (eFlags & SHORT_DESCRIPTION_ESETFLAG) != 0;
- shortDescription = SHORT_DESCRIPTION_EDEFAULT;
- eFlags &= ~SHORT_DESCRIPTION_ESETFLAG;
- if (eNotificationRequired())
- eNotify(new ENotificationImpl(this, Notification.UNSET, BeaninfoPackage.FEATURE_DECORATOR__SHORT_DESCRIPTION, oldShortDescription, SHORT_DESCRIPTION_EDEFAULT, oldShortDescriptionESet));
- }
-
- /**
- * <!-- begin-user-doc -->
- * <!-- end-user-doc -->
- * @generated
- */
- public boolean isSetShortDescription() {
- return (eFlags & SHORT_DESCRIPTION_ESETFLAG) != 0;
- }
-
- /**
- * <!-- begin-user-doc -->
- * <!-- end-user-doc -->
- * @generated
- */
- public String getCategory() {
- return category;
- }
-
- /**
- * <!-- begin-user-doc -->
- * <!-- end-user-doc -->
- * @generated
- */
- public void setCategory(String newCategory) {
- String oldCategory = category;
- category = newCategory;
- if (eNotificationRequired())
- eNotify(new ENotificationImpl(this, Notification.SET, BeaninfoPackage.FEATURE_DECORATOR__CATEGORY, oldCategory, category));
- }
-
- /**
- * <!-- begin-user-doc -->
- * <!-- end-user-doc -->
- * @generated
- */
- public boolean isExpert() {
- return (eFlags & EXPERT_EFLAG) != 0;
- }
-
- /**
- * <!-- begin-user-doc -->
- * <!-- end-user-doc -->
- * @generated
- */
- public void setExpert(boolean newExpert) {
- boolean oldExpert = (eFlags & EXPERT_EFLAG) != 0;
- if (newExpert) eFlags |= EXPERT_EFLAG; else eFlags &= ~EXPERT_EFLAG;
- boolean oldExpertESet = (eFlags & EXPERT_ESETFLAG) != 0;
- eFlags |= EXPERT_ESETFLAG;
- if (eNotificationRequired())
- eNotify(new ENotificationImpl(this, Notification.SET, BeaninfoPackage.FEATURE_DECORATOR__EXPERT, oldExpert, newExpert, !oldExpertESet));
- }
-
- /**
- * <!-- begin-user-doc -->
- * <!-- end-user-doc -->
- * @generated
- */
- public void unsetExpert() {
- boolean oldExpert = (eFlags & EXPERT_EFLAG) != 0;
- boolean oldExpertESet = (eFlags & EXPERT_ESETFLAG) != 0;
- if (EXPERT_EDEFAULT) eFlags |= EXPERT_EFLAG; else eFlags &= ~EXPERT_EFLAG;
- eFlags &= ~EXPERT_ESETFLAG;
- if (eNotificationRequired())
- eNotify(new ENotificationImpl(this, Notification.UNSET, BeaninfoPackage.FEATURE_DECORATOR__EXPERT, oldExpert, EXPERT_EDEFAULT, oldExpertESet));
- }
-
- /**
- * <!-- begin-user-doc -->
- * <!-- end-user-doc -->
- * @generated
- */
- public boolean isSetExpert() {
- return (eFlags & EXPERT_ESETFLAG) != 0;
- }
-
- /**
- * <!-- begin-user-doc -->
- * <!-- end-user-doc -->
- * @generated
- */
- public boolean isHidden() {
- return (eFlags & HIDDEN_EFLAG) != 0;
- }
-
- /**
- * <!-- begin-user-doc -->
- * <!-- end-user-doc -->
- * @generated
- */
- public void setHidden(boolean newHidden) {
- boolean oldHidden = (eFlags & HIDDEN_EFLAG) != 0;
- if (newHidden) eFlags |= HIDDEN_EFLAG; else eFlags &= ~HIDDEN_EFLAG;
- boolean oldHiddenESet = (eFlags & HIDDEN_ESETFLAG) != 0;
- eFlags |= HIDDEN_ESETFLAG;
- if (eNotificationRequired())
- eNotify(new ENotificationImpl(this, Notification.SET, BeaninfoPackage.FEATURE_DECORATOR__HIDDEN, oldHidden, newHidden, !oldHiddenESet));
- }
-
- /**
- * <!-- begin-user-doc -->
- * <!-- end-user-doc -->
- * @generated
- */
- public void unsetHidden() {
- boolean oldHidden = (eFlags & HIDDEN_EFLAG) != 0;
- boolean oldHiddenESet = (eFlags & HIDDEN_ESETFLAG) != 0;
- if (HIDDEN_EDEFAULT) eFlags |= HIDDEN_EFLAG; else eFlags &= ~HIDDEN_EFLAG;
- eFlags &= ~HIDDEN_ESETFLAG;
- if (eNotificationRequired())
- eNotify(new ENotificationImpl(this, Notification.UNSET, BeaninfoPackage.FEATURE_DECORATOR__HIDDEN, oldHidden, HIDDEN_EDEFAULT, oldHiddenESet));
- }
-
- /**
- * <!-- begin-user-doc -->
- * <!-- end-user-doc -->
- * @generated
- */
- public boolean isSetHidden() {
- return (eFlags & HIDDEN_ESETFLAG) != 0;
- }
-
- /**
- * <!-- begin-user-doc -->
- * <!-- end-user-doc -->
- * @generated
- */
- public boolean isPreferred() {
- return (eFlags & PREFERRED_EFLAG) != 0;
- }
-
- /**
- * <!-- begin-user-doc -->
- * <!-- end-user-doc -->
- * @generated
- */
- public void setPreferred(boolean newPreferred) {
- boolean oldPreferred = (eFlags & PREFERRED_EFLAG) != 0;
- if (newPreferred) eFlags |= PREFERRED_EFLAG; else eFlags &= ~PREFERRED_EFLAG;
- boolean oldPreferredESet = (eFlags & PREFERRED_ESETFLAG) != 0;
- eFlags |= PREFERRED_ESETFLAG;
- if (eNotificationRequired())
- eNotify(new ENotificationImpl(this, Notification.SET, BeaninfoPackage.FEATURE_DECORATOR__PREFERRED, oldPreferred, newPreferred, !oldPreferredESet));
- }
-
- /**
- * <!-- begin-user-doc -->
- * <!-- end-user-doc -->
- * @generated
- */
- public void unsetPreferred() {
- boolean oldPreferred = (eFlags & PREFERRED_EFLAG) != 0;
- boolean oldPreferredESet = (eFlags & PREFERRED_ESETFLAG) != 0;
- if (PREFERRED_EDEFAULT) eFlags |= PREFERRED_EFLAG; else eFlags &= ~PREFERRED_EFLAG;
- eFlags &= ~PREFERRED_ESETFLAG;
- if (eNotificationRequired())
- eNotify(new ENotificationImpl(this, Notification.UNSET, BeaninfoPackage.FEATURE_DECORATOR__PREFERRED, oldPreferred, PREFERRED_EDEFAULT, oldPreferredESet));
- }
-
- /**
- * <!-- begin-user-doc -->
- * <!-- end-user-doc -->
- * @generated
- */
- public boolean isSetPreferred() {
- return (eFlags & PREFERRED_ESETFLAG) != 0;
- }
-
- /**
- * <!-- begin-user-doc -->
- * <!-- end-user-doc -->
- * @generated
- */
- public boolean isMergeIntrospection() {
- return (eFlags & MERGE_INTROSPECTION_EFLAG) != 0;
- }
-
- /**
- * <!-- begin-user-doc -->
- * <!-- end-user-doc -->
- * @generated
- */
- public void setMergeIntrospection(boolean newMergeIntrospection) {
- boolean oldMergeIntrospection = (eFlags & MERGE_INTROSPECTION_EFLAG) != 0;
- if (newMergeIntrospection) eFlags |= MERGE_INTROSPECTION_EFLAG; else eFlags &= ~MERGE_INTROSPECTION_EFLAG;
- if (eNotificationRequired())
- eNotify(new ENotificationImpl(this, Notification.SET, BeaninfoPackage.FEATURE_DECORATOR__MERGE_INTROSPECTION, oldMergeIntrospection, newMergeIntrospection));
- }
-
- /**
- * <!-- begin-user-doc -->
- * <!-- end-user-doc -->
- * @generated
- */
- public boolean isAttributesExplicitEmpty() {
- return (eFlags & ATTRIBUTES_EXPLICIT_EMPTY_EFLAG) != 0;
- }
-
- /**
- * <!-- begin-user-doc -->
- * <!-- end-user-doc -->
- * @generated
- */
- public void setAttributesExplicitEmpty(boolean newAttributesExplicitEmpty) {
- boolean oldAttributesExplicitEmpty = (eFlags & ATTRIBUTES_EXPLICIT_EMPTY_EFLAG) != 0;
- if (newAttributesExplicitEmpty) eFlags |= ATTRIBUTES_EXPLICIT_EMPTY_EFLAG; else eFlags &= ~ATTRIBUTES_EXPLICIT_EMPTY_EFLAG;
- if (eNotificationRequired())
- eNotify(new ENotificationImpl(this, Notification.SET, BeaninfoPackage.FEATURE_DECORATOR__ATTRIBUTES_EXPLICIT_EMPTY, oldAttributesExplicitEmpty, newAttributesExplicitEmpty));
- }
-
- /**
- * <!-- begin-user-doc -->
- * <!-- end-user-doc -->
- * @generated
- */
- public long getImplicitlySetBits() {
- return implicitlySetBits;
- }
-
- /**
- * <!-- begin-user-doc -->
- * <!-- end-user-doc -->
- * @generated
- */
- public void setImplicitlySetBits(long newImplicitlySetBits) {
- long oldImplicitlySetBits = implicitlySetBits;
- implicitlySetBits = newImplicitlySetBits;
- if (eNotificationRequired())
- eNotify(new ENotificationImpl(this, Notification.SET, BeaninfoPackage.FEATURE_DECORATOR__IMPLICITLY_SET_BITS, oldImplicitlySetBits, implicitlySetBits));
- }
-
- /**
- * <!-- begin-user-doc -->
- * <!-- end-user-doc -->
- * @generated
- */
- public ImplicitItem getImplicitDecoratorFlag() {
- return implicitDecoratorFlag;
- }
-
- /**
- * <!-- begin-user-doc -->
- * <!-- end-user-doc -->
- * @generated
- */
- public void setImplicitDecoratorFlag(ImplicitItem newImplicitDecoratorFlag) {
- ImplicitItem oldImplicitDecoratorFlag = implicitDecoratorFlag;
- implicitDecoratorFlag = newImplicitDecoratorFlag == null ? IMPLICIT_DECORATOR_FLAG_EDEFAULT : newImplicitDecoratorFlag;
- if (eNotificationRequired())
- eNotify(new ENotificationImpl(this, Notification.SET, BeaninfoPackage.FEATURE_DECORATOR__IMPLICIT_DECORATOR_FLAG, oldImplicitDecoratorFlag, implicitDecoratorFlag));
- }
-
- /**
- * <!-- begin-user-doc -->
- * <!-- end-user-doc -->
- * @generated
- */
- public EMap getAttributes() {
- if (attributes == null) {
- attributes = new EcoreEMap(BeaninfoPackage.eINSTANCE.getFeatureAttributeMapEntry(), FeatureAttributeMapEntryImpl.class, this, BeaninfoPackage.FEATURE_DECORATOR__ATTRIBUTES);
- }
- return attributes;
- }
-
- /**
- * <!-- begin-user-doc -->
- * <!-- end-user-doc -->
- * @generated
- */
- public String toString() {
- if (eIsProxy()) return super.toString();
-
- StringBuffer result = new StringBuffer(super.toString());
- result.append(" (displayName: ");
- if ((eFlags & DISPLAY_NAME_ESETFLAG) != 0) result.append(displayName); else result.append("<unset>");
- result.append(", shortDescription: ");
- if ((eFlags & SHORT_DESCRIPTION_ESETFLAG) != 0) result.append(shortDescription); else result.append("<unset>");
- result.append(", category: ");
- result.append(category);
- result.append(", expert: ");
- if ((eFlags & EXPERT_ESETFLAG) != 0) result.append((eFlags & EXPERT_EFLAG) != 0); else result.append("<unset>");
- result.append(", hidden: ");
- if ((eFlags & HIDDEN_ESETFLAG) != 0) result.append((eFlags & HIDDEN_EFLAG) != 0); else result.append("<unset>");
- result.append(", preferred: ");
- if ((eFlags & PREFERRED_ESETFLAG) != 0) result.append((eFlags & PREFERRED_EFLAG) != 0); else result.append("<unset>");
- result.append(", mergeIntrospection: ");
- result.append((eFlags & MERGE_INTROSPECTION_EFLAG) != 0);
- result.append(", attributesExplicitEmpty: ");
- result.append((eFlags & ATTRIBUTES_EXPLICIT_EMPTY_EFLAG) != 0);
- result.append(", implicitlySetBits: ");
- result.append(implicitlySetBits);
- result.append(", implicitDecoratorFlag: ");
- result.append(implicitDecoratorFlag);
- result.append(')');
- return result.toString();
- }
-
- /**
- * <!-- begin-user-doc -->
- * <!-- end-user-doc -->
- * @generated
- */
- public NotificationChain eInverseAdd(InternalEObject otherEnd, int featureID, Class baseClass, NotificationChain msgs) {
- if (featureID >= 0) {
- switch (eDerivedStructuralFeatureID(featureID, baseClass)) {
- case BeaninfoPackage.FEATURE_DECORATOR__EANNOTATIONS:
- return ((InternalEList)getEAnnotations()).basicAdd(otherEnd, msgs);
- case BeaninfoPackage.FEATURE_DECORATOR__EMODEL_ELEMENT:
- if (eContainer != null)
- msgs = eBasicRemoveFromContainer(msgs);
- return eBasicSetContainer(otherEnd, BeaninfoPackage.FEATURE_DECORATOR__EMODEL_ELEMENT, msgs);
- default:
- return eDynamicInverseAdd(otherEnd, featureID, baseClass, msgs);
- }
- }
- if (eContainer != null)
- msgs = eBasicRemoveFromContainer(msgs);
- return eBasicSetContainer(otherEnd, featureID, msgs);
- }
-
- /**
- * <!-- begin-user-doc -->
- * <!-- end-user-doc -->
- * @generated
- */
- public NotificationChain eInverseRemove(InternalEObject otherEnd, int featureID, Class baseClass, NotificationChain msgs) {
- if (featureID >= 0) {
- switch (eDerivedStructuralFeatureID(featureID, baseClass)) {
- case BeaninfoPackage.FEATURE_DECORATOR__EANNOTATIONS:
- return ((InternalEList)getEAnnotations()).basicRemove(otherEnd, msgs);
- case BeaninfoPackage.FEATURE_DECORATOR__DETAILS:
- return ((InternalEList)getDetails()).basicRemove(otherEnd, msgs);
- case BeaninfoPackage.FEATURE_DECORATOR__EMODEL_ELEMENT:
- return eBasicSetContainer(null, BeaninfoPackage.FEATURE_DECORATOR__EMODEL_ELEMENT, msgs);
- case BeaninfoPackage.FEATURE_DECORATOR__CONTENTS:
- return ((InternalEList)getContents()).basicRemove(otherEnd, msgs);
- case BeaninfoPackage.FEATURE_DECORATOR__ATTRIBUTES:
- return ((InternalEList)getAttributes()).basicRemove(otherEnd, msgs);
- default:
- return eDynamicInverseRemove(otherEnd, featureID, baseClass, msgs);
- }
- }
- return eBasicSetContainer(null, featureID, msgs);
- }
-
- /**
- * <!-- begin-user-doc -->
- * <!-- end-user-doc -->
- * @generated
- */
- public NotificationChain eBasicRemoveFromContainer(NotificationChain msgs) {
- if (eContainerFeatureID() >= 0) {
- switch (eContainerFeatureID()) {
- case BeaninfoPackage.FEATURE_DECORATOR__EMODEL_ELEMENT:
- return eContainer.eInverseRemove(this, EcorePackage.EMODEL_ELEMENT__EANNOTATIONS, EModelElement.class, msgs);
- default:
- return eDynamicBasicRemoveFromContainer(msgs);
- }
- }
- return eContainer.eInverseRemove(this, EOPPOSITE_FEATURE_BASE - eContainerFeatureID(), null, msgs);
- }
-
- /**
- * <!-- begin-user-doc -->
- * <!-- end-user-doc -->
- * @generated
- */
- public Object eGet(EStructuralFeature eFeature, boolean resolve) {
- switch (eDerivedStructuralFeatureID(eFeature)) {
- case BeaninfoPackage.FEATURE_DECORATOR__EANNOTATIONS:
- return getEAnnotations();
- case BeaninfoPackage.FEATURE_DECORATOR__SOURCE:
- return getSource();
- case BeaninfoPackage.FEATURE_DECORATOR__DETAILS:
- return getDetails();
- case BeaninfoPackage.FEATURE_DECORATOR__EMODEL_ELEMENT:
- return getEModelElement();
- case BeaninfoPackage.FEATURE_DECORATOR__CONTENTS:
- return getContents();
- case BeaninfoPackage.FEATURE_DECORATOR__REFERENCES:
- return getReferences();
- case BeaninfoPackage.FEATURE_DECORATOR__DISPLAY_NAME:
- return getDisplayName();
- case BeaninfoPackage.FEATURE_DECORATOR__SHORT_DESCRIPTION:
- return getShortDescription();
- case BeaninfoPackage.FEATURE_DECORATOR__CATEGORY:
- return getCategory();
- case BeaninfoPackage.FEATURE_DECORATOR__EXPERT:
- return isExpert() ? Boolean.TRUE : Boolean.FALSE;
- case BeaninfoPackage.FEATURE_DECORATOR__HIDDEN:
- return isHidden() ? Boolean.TRUE : Boolean.FALSE;
- case BeaninfoPackage.FEATURE_DECORATOR__PREFERRED:
- return isPreferred() ? Boolean.TRUE : Boolean.FALSE;
- case BeaninfoPackage.FEATURE_DECORATOR__MERGE_INTROSPECTION:
- return isMergeIntrospection() ? Boolean.TRUE : Boolean.FALSE;
- case BeaninfoPackage.FEATURE_DECORATOR__ATTRIBUTES_EXPLICIT_EMPTY:
- return isAttributesExplicitEmpty() ? Boolean.TRUE : Boolean.FALSE;
- case BeaninfoPackage.FEATURE_DECORATOR__IMPLICITLY_SET_BITS:
- return new Long(getImplicitlySetBits());
- case BeaninfoPackage.FEATURE_DECORATOR__IMPLICIT_DECORATOR_FLAG:
- return getImplicitDecoratorFlag();
- case BeaninfoPackage.FEATURE_DECORATOR__ATTRIBUTES:
- return getAttributes();
- }
- return eDynamicGet(eFeature, resolve);
- }
-
- /**
- * <!-- begin-user-doc -->
- * <!-- end-user-doc -->
- * @generated
- */
- public void eSet(EStructuralFeature eFeature, Object newValue) {
- switch (eDerivedStructuralFeatureID(eFeature)) {
- case BeaninfoPackage.FEATURE_DECORATOR__EANNOTATIONS:
- getEAnnotations().clear();
- getEAnnotations().addAll((Collection)newValue);
- return;
- case BeaninfoPackage.FEATURE_DECORATOR__SOURCE:
- setSource((String)newValue);
- return;
- case BeaninfoPackage.FEATURE_DECORATOR__DETAILS:
- getDetails().clear();
- getDetails().addAll((Collection)newValue);
- return;
- case BeaninfoPackage.FEATURE_DECORATOR__EMODEL_ELEMENT:
- setEModelElement((EModelElement)newValue);
- return;
- case BeaninfoPackage.FEATURE_DECORATOR__CONTENTS:
- getContents().clear();
- getContents().addAll((Collection)newValue);
- return;
- case BeaninfoPackage.FEATURE_DECORATOR__REFERENCES:
- getReferences().clear();
- getReferences().addAll((Collection)newValue);
- return;
- case BeaninfoPackage.FEATURE_DECORATOR__DISPLAY_NAME:
- setDisplayName((String)newValue);
- return;
- case BeaninfoPackage.FEATURE_DECORATOR__SHORT_DESCRIPTION:
- setShortDescription((String)newValue);
- return;
- case BeaninfoPackage.FEATURE_DECORATOR__CATEGORY:
- setCategory((String)newValue);
- return;
- case BeaninfoPackage.FEATURE_DECORATOR__EXPERT:
- setExpert(((Boolean)newValue).booleanValue());
- return;
- case BeaninfoPackage.FEATURE_DECORATOR__HIDDEN:
- setHidden(((Boolean)newValue).booleanValue());
- return;
- case BeaninfoPackage.FEATURE_DECORATOR__PREFERRED:
- setPreferred(((Boolean)newValue).booleanValue());
- return;
- case BeaninfoPackage.FEATURE_DECORATOR__MERGE_INTROSPECTION:
- setMergeIntrospection(((Boolean)newValue).booleanValue());
- return;
- case BeaninfoPackage.FEATURE_DECORATOR__ATTRIBUTES_EXPLICIT_EMPTY:
- setAttributesExplicitEmpty(((Boolean)newValue).booleanValue());
- return;
- case BeaninfoPackage.FEATURE_DECORATOR__IMPLICITLY_SET_BITS:
- setImplicitlySetBits(((Long)newValue).longValue());
- return;
- case BeaninfoPackage.FEATURE_DECORATOR__IMPLICIT_DECORATOR_FLAG:
- setImplicitDecoratorFlag((ImplicitItem)newValue);
- return;
- case BeaninfoPackage.FEATURE_DECORATOR__ATTRIBUTES:
- getAttributes().clear();
- getAttributes().addAll((Collection)newValue);
- return;
- }
- eDynamicSet(eFeature, newValue);
- }
-
- /**
- * <!-- begin-user-doc -->
- * <!-- end-user-doc -->
- * @generated
- */
- public void eUnset(EStructuralFeature eFeature) {
- switch (eDerivedStructuralFeatureID(eFeature)) {
- case BeaninfoPackage.FEATURE_DECORATOR__EANNOTATIONS:
- getEAnnotations().clear();
- return;
- case BeaninfoPackage.FEATURE_DECORATOR__SOURCE:
- setSource(SOURCE_EDEFAULT);
- return;
- case BeaninfoPackage.FEATURE_DECORATOR__DETAILS:
- getDetails().clear();
- return;
- case BeaninfoPackage.FEATURE_DECORATOR__EMODEL_ELEMENT:
- setEModelElement((EModelElement)null);
- return;
- case BeaninfoPackage.FEATURE_DECORATOR__CONTENTS:
- getContents().clear();
- return;
- case BeaninfoPackage.FEATURE_DECORATOR__REFERENCES:
- getReferences().clear();
- return;
- case BeaninfoPackage.FEATURE_DECORATOR__DISPLAY_NAME:
- unsetDisplayName();
- return;
- case BeaninfoPackage.FEATURE_DECORATOR__SHORT_DESCRIPTION:
- unsetShortDescription();
- return;
- case BeaninfoPackage.FEATURE_DECORATOR__CATEGORY:
- setCategory(CATEGORY_EDEFAULT);
- return;
- case BeaninfoPackage.FEATURE_DECORATOR__EXPERT:
- unsetExpert();
- return;
- case BeaninfoPackage.FEATURE_DECORATOR__HIDDEN:
- unsetHidden();
- return;
- case BeaninfoPackage.FEATURE_DECORATOR__PREFERRED:
- unsetPreferred();
- return;
- case BeaninfoPackage.FEATURE_DECORATOR__MERGE_INTROSPECTION:
- setMergeIntrospection(MERGE_INTROSPECTION_EDEFAULT);
- return;
- case BeaninfoPackage.FEATURE_DECORATOR__ATTRIBUTES_EXPLICIT_EMPTY:
- setAttributesExplicitEmpty(ATTRIBUTES_EXPLICIT_EMPTY_EDEFAULT);
- return;
- case BeaninfoPackage.FEATURE_DECORATOR__IMPLICITLY_SET_BITS:
- setImplicitlySetBits(IMPLICITLY_SET_BITS_EDEFAULT);
- return;
- case BeaninfoPackage.FEATURE_DECORATOR__IMPLICIT_DECORATOR_FLAG:
- setImplicitDecoratorFlag(IMPLICIT_DECORATOR_FLAG_EDEFAULT);
- return;
- case BeaninfoPackage.FEATURE_DECORATOR__ATTRIBUTES:
- getAttributes().clear();
- return;
- }
- eDynamicUnset(eFeature);
- }
-
- /**
- * Called by overrides to eIsSet to test if source is set. This is because for the
- * FeatureDecorator and subclasses, setting source to the classname is considered
- * to be not set since that is the new default for each class level. By doing this
- * when serializing it won't waste space and time adding a copy of the source string
- * to the serialized output and then creating a NEW copy on each decorator loaded
- * from an XMI file.
- *
- * @return <code>true</code> if source is not null and not equal to class name (less the "Impl" at the end).
- *
- * @since 1.1.0
- */
- protected boolean isSourceSet() {
- return source != null && !eClass().getInstanceClassName().equals(source);
- }
-
- /* (non-Javadoc)
- * @see org.eclipse.emf.ecore.EObject#eIsSet(org.eclipse.emf.ecore.EStructuralFeature)
- */
- public boolean eIsSet(EStructuralFeature eFeature) {
- switch (eDerivedStructuralFeatureID(eFeature)) {
- case BeaninfoPackage.FEATURE_DECORATOR__SOURCE:
- return isSourceSet(); // Override so that if set to the same as classname, then it is considered not set.
- default:
- return eIsSetGen(eFeature);
- }
- }
-
-
- /**
- * <!-- begin-user-doc -->
- * <!-- end-user-doc -->
- * @generated
- */
- public boolean eIsSetGen(EStructuralFeature eFeature) {
- switch (eDerivedStructuralFeatureID(eFeature)) {
- case BeaninfoPackage.FEATURE_DECORATOR__EANNOTATIONS:
- return eAnnotations != null && !eAnnotations.isEmpty();
- case BeaninfoPackage.FEATURE_DECORATOR__SOURCE:
- return SOURCE_EDEFAULT == null ? source != null : !SOURCE_EDEFAULT.equals(source);
- case BeaninfoPackage.FEATURE_DECORATOR__DETAILS:
- return details != null && !details.isEmpty();
- case BeaninfoPackage.FEATURE_DECORATOR__EMODEL_ELEMENT:
- return getEModelElement() != null;
- case BeaninfoPackage.FEATURE_DECORATOR__CONTENTS:
- return contents != null && !contents.isEmpty();
- case BeaninfoPackage.FEATURE_DECORATOR__REFERENCES:
- return references != null && !references.isEmpty();
- case BeaninfoPackage.FEATURE_DECORATOR__DISPLAY_NAME:
- return isSetDisplayName();
- case BeaninfoPackage.FEATURE_DECORATOR__SHORT_DESCRIPTION:
- return isSetShortDescription();
- case BeaninfoPackage.FEATURE_DECORATOR__CATEGORY:
- return CATEGORY_EDEFAULT == null ? category != null : !CATEGORY_EDEFAULT.equals(category);
- case BeaninfoPackage.FEATURE_DECORATOR__EXPERT:
- return isSetExpert();
- case BeaninfoPackage.FEATURE_DECORATOR__HIDDEN:
- return isSetHidden();
- case BeaninfoPackage.FEATURE_DECORATOR__PREFERRED:
- return isSetPreferred();
- case BeaninfoPackage.FEATURE_DECORATOR__MERGE_INTROSPECTION:
- return ((eFlags & MERGE_INTROSPECTION_EFLAG) != 0) != MERGE_INTROSPECTION_EDEFAULT;
- case BeaninfoPackage.FEATURE_DECORATOR__ATTRIBUTES_EXPLICIT_EMPTY:
- return ((eFlags & ATTRIBUTES_EXPLICIT_EMPTY_EFLAG) != 0) != ATTRIBUTES_EXPLICIT_EMPTY_EDEFAULT;
- case BeaninfoPackage.FEATURE_DECORATOR__IMPLICITLY_SET_BITS:
- return implicitlySetBits != IMPLICITLY_SET_BITS_EDEFAULT;
- case BeaninfoPackage.FEATURE_DECORATOR__IMPLICIT_DECORATOR_FLAG:
- return implicitDecoratorFlag != IMPLICIT_DECORATOR_FLAG_EDEFAULT;
- case BeaninfoPackage.FEATURE_DECORATOR__ATTRIBUTES:
- return attributes != null && !attributes.isEmpty();
- }
- return eDynamicIsSet(eFeature);
- }
-
-}
diff --git a/plugins/org.eclipse.jem.beaninfo/beaninfo/org/eclipse/jem/internal/beaninfo/impl/IndexedPropertyDecoratorImpl.java b/plugins/org.eclipse.jem.beaninfo/beaninfo/org/eclipse/jem/internal/beaninfo/impl/IndexedPropertyDecoratorImpl.java
deleted file mode 100644
index 12dc9b1..0000000
--- a/plugins/org.eclipse.jem.beaninfo/beaninfo/org/eclipse/jem/internal/beaninfo/impl/IndexedPropertyDecoratorImpl.java
+++ /dev/null
@@ -1,664 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2001, 2005 IBM Corporation and others.
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
- *
- * Contributors:
- * IBM Corporation - initial API and implementation
- *******************************************************************************/
-package org.eclipse.jem.internal.beaninfo.impl;
-/*
-
-
- */
-
-
-import java.util.Collection;
-
-import org.eclipse.emf.common.notify.Notification;
-import org.eclipse.emf.common.notify.NotificationChain;
-import org.eclipse.emf.ecore.EClass;
-import org.eclipse.emf.ecore.EModelElement;
-import org.eclipse.emf.ecore.EStructuralFeature;
-import org.eclipse.emf.ecore.EcorePackage;
-import org.eclipse.emf.ecore.InternalEObject;
-import org.eclipse.emf.ecore.impl.ENotificationImpl;
-import org.eclipse.emf.ecore.util.InternalEList;
-
-import org.eclipse.jem.internal.beaninfo.BeaninfoPackage;
-import org.eclipse.jem.internal.beaninfo.ImplicitItem;
-import org.eclipse.jem.internal.beaninfo.IndexedPropertyDecorator;
-import org.eclipse.jem.java.Field;
-import org.eclipse.jem.java.JavaClass;
-import org.eclipse.jem.java.Method;
-/**
- * <!-- begin-user-doc -->
- * An implementation of the model object '<em><b>Indexed Property Decorator</b></em>'.
- * <!-- end-user-doc -->
- * <p>
- * The following features are implemented:
- * <ul>
- * <li>{@link org.eclipse.jem.internal.beaninfo.impl.IndexedPropertyDecoratorImpl#getIndexedReadMethod <em>Indexed Read Method</em>}</li>
- * <li>{@link org.eclipse.jem.internal.beaninfo.impl.IndexedPropertyDecoratorImpl#getIndexedWriteMethod <em>Indexed Write Method</em>}</li>
- * </ul>
- * </p>
- *
- * @generated
- */
-
-
-public class IndexedPropertyDecoratorImpl extends PropertyDecoratorImpl implements IndexedPropertyDecorator{
-
- /**
- * Bits for implicitly set features. This is internal, not meant for clients.
- */
- public static final long INDEXED_READMETHOD_IMPLICIT = 0x100000L; // Start kind of high so as to allow PropertyDecorator to increase without conflig.
- public static final long INDEXED_WRITEMETHOD_IMPLICIT = 0x200000L;
-
- /**
- * The cached value of the '{@link #getIndexedReadMethod() <em>Indexed Read Method</em>}' reference.
- * <!-- begin-user-doc -->
- * <!-- end-user-doc -->
- * @see #getIndexedReadMethod()
- * @generated
- * @ordered
- */
- protected Method indexedReadMethod = null;
- /**
- * The flag representing whether the Indexed Read Method reference has been set.
- * <!-- begin-user-doc -->
- * <!-- end-user-doc -->
- * @generated
- * @ordered
- */
- protected static final int INDEXED_READ_METHOD_ESETFLAG = 1 << 29;
-
- /**
- * The cached value of the '{@link #getIndexedWriteMethod() <em>Indexed Write Method</em>}' reference.
- * <!-- begin-user-doc -->
- * <!-- end-user-doc -->
- * @see #getIndexedWriteMethod()
- * @generated
- * @ordered
- */
- protected Method indexedWriteMethod = null;
-
- /**
- * The flag representing whether the Indexed Write Method reference has been set.
- * <!-- begin-user-doc -->
- * <!-- end-user-doc -->
- * @generated
- * @ordered
- */
- protected static final int INDEXED_WRITE_METHOD_ESETFLAG = 1 << 30;
-
- /**
- * <!-- begin-user-doc -->
- * <!-- end-user-doc -->
- * @generated
- */
- protected IndexedPropertyDecoratorImpl() {
- super();
- }
-
- /**
- * <!-- begin-user-doc -->
- * <!-- end-user-doc -->
- * @generated
- */
- protected EClass eStaticClass() {
- return BeaninfoPackage.eINSTANCE.getIndexedPropertyDecorator();
- }
-
- /**
- * <!-- begin-user-doc -->
- * <!-- end-user-doc -->
- * @generated
- */
- public Method getIndexedReadMethod() {
- if (indexedReadMethod != null && indexedReadMethod.eIsProxy()) {
- Method oldIndexedReadMethod = indexedReadMethod;
- indexedReadMethod = (Method)eResolveProxy((InternalEObject)indexedReadMethod);
- if (indexedReadMethod != oldIndexedReadMethod) {
- if (eNotificationRequired())
- eNotify(new ENotificationImpl(this, Notification.RESOLVE, BeaninfoPackage.INDEXED_PROPERTY_DECORATOR__INDEXED_READ_METHOD, oldIndexedReadMethod, indexedReadMethod));
- }
- }
- return indexedReadMethod;
- }
-
- /**
- * <!-- begin-user-doc -->
- * <!-- end-user-doc -->
- * @generated
- */
- public void setIndexedReadMethod(Method newIndexedReadMethod) {
- Method oldIndexedReadMethod = indexedReadMethod;
- indexedReadMethod = newIndexedReadMethod;
- boolean oldIndexedReadMethodESet = (eFlags & INDEXED_READ_METHOD_ESETFLAG) != 0;
- eFlags |= INDEXED_READ_METHOD_ESETFLAG;
- if (eNotificationRequired())
- eNotify(new ENotificationImpl(this, Notification.SET, BeaninfoPackage.INDEXED_PROPERTY_DECORATOR__INDEXED_READ_METHOD, oldIndexedReadMethod, indexedReadMethod, !oldIndexedReadMethodESet));
- }
-
- /**
- * <!-- begin-user-doc -->
- * <!-- end-user-doc -->
- * @generated
- */
- public void unsetIndexedReadMethod() {
- Method oldIndexedReadMethod = indexedReadMethod;
- boolean oldIndexedReadMethodESet = (eFlags & INDEXED_READ_METHOD_ESETFLAG) != 0;
- indexedReadMethod = null;
- eFlags &= ~INDEXED_READ_METHOD_ESETFLAG;
- if (eNotificationRequired())
- eNotify(new ENotificationImpl(this, Notification.UNSET, BeaninfoPackage.INDEXED_PROPERTY_DECORATOR__INDEXED_READ_METHOD, oldIndexedReadMethod, null, oldIndexedReadMethodESet));
- }
-
- /**
- * <!-- begin-user-doc -->
- * <!-- end-user-doc -->
- * @generated
- */
- public boolean isSetIndexedReadMethod() {
- return (eFlags & INDEXED_READ_METHOD_ESETFLAG) != 0;
- }
-
- /**
- * <!-- begin-user-doc -->
- * <!-- end-user-doc -->
- * @generated
- */
- public Method getIndexedWriteMethod() {
- if (indexedWriteMethod != null && indexedWriteMethod.eIsProxy()) {
- Method oldIndexedWriteMethod = indexedWriteMethod;
- indexedWriteMethod = (Method)eResolveProxy((InternalEObject)indexedWriteMethod);
- if (indexedWriteMethod != oldIndexedWriteMethod) {
- if (eNotificationRequired())
- eNotify(new ENotificationImpl(this, Notification.RESOLVE, BeaninfoPackage.INDEXED_PROPERTY_DECORATOR__INDEXED_WRITE_METHOD, oldIndexedWriteMethod, indexedWriteMethod));
- }
- }
- return indexedWriteMethod;
- }
-
- /**
- * <!-- begin-user-doc -->
- * <!-- end-user-doc -->
- * @generated
- */
- public void setIndexedWriteMethod(Method newIndexedWriteMethod) {
- Method oldIndexedWriteMethod = indexedWriteMethod;
- indexedWriteMethod = newIndexedWriteMethod;
- boolean oldIndexedWriteMethodESet = (eFlags & INDEXED_WRITE_METHOD_ESETFLAG) != 0;
- eFlags |= INDEXED_WRITE_METHOD_ESETFLAG;
- if (eNotificationRequired())
- eNotify(new ENotificationImpl(this, Notification.SET, BeaninfoPackage.INDEXED_PROPERTY_DECORATOR__INDEXED_WRITE_METHOD, oldIndexedWriteMethod, indexedWriteMethod, !oldIndexedWriteMethodESet));
- }
-
- /**
- * <!-- begin-user-doc -->
- * <!-- end-user-doc -->
- * @generated
- */
- public void unsetIndexedWriteMethod() {
- Method oldIndexedWriteMethod = indexedWriteMethod;
- boolean oldIndexedWriteMethodESet = (eFlags & INDEXED_WRITE_METHOD_ESETFLAG) != 0;
- indexedWriteMethod = null;
- eFlags &= ~INDEXED_WRITE_METHOD_ESETFLAG;
- if (eNotificationRequired())
- eNotify(new ENotificationImpl(this, Notification.UNSET, BeaninfoPackage.INDEXED_PROPERTY_DECORATOR__INDEXED_WRITE_METHOD, oldIndexedWriteMethod, null, oldIndexedWriteMethodESet));
- }
-
- /**
- * <!-- begin-user-doc -->
- * <!-- end-user-doc -->
- * @generated
- */
- public boolean isSetIndexedWriteMethod() {
- return (eFlags & INDEXED_WRITE_METHOD_ESETFLAG) != 0;
- }
-
- /**
- * <!-- begin-user-doc -->
- * <!-- end-user-doc -->
- * @generated
- */
- public NotificationChain eInverseAdd(InternalEObject otherEnd, int featureID, Class baseClass, NotificationChain msgs) {
- if (featureID >= 0) {
- switch (eDerivedStructuralFeatureID(featureID, baseClass)) {
- case BeaninfoPackage.INDEXED_PROPERTY_DECORATOR__EANNOTATIONS:
- return ((InternalEList)getEAnnotations()).basicAdd(otherEnd, msgs);
- case BeaninfoPackage.INDEXED_PROPERTY_DECORATOR__EMODEL_ELEMENT:
- if (eContainer != null)
- msgs = eBasicRemoveFromContainer(msgs);
- return eBasicSetContainer(otherEnd, BeaninfoPackage.INDEXED_PROPERTY_DECORATOR__EMODEL_ELEMENT, msgs);
- default:
- return eDynamicInverseAdd(otherEnd, featureID, baseClass, msgs);
- }
- }
- if (eContainer != null)
- msgs = eBasicRemoveFromContainer(msgs);
- return eBasicSetContainer(otherEnd, featureID, msgs);
- }
-
- /**
- * <!-- begin-user-doc -->
- * <!-- end-user-doc -->
- * @generated
- */
- public NotificationChain eInverseRemove(InternalEObject otherEnd, int featureID, Class baseClass, NotificationChain msgs) {
- if (featureID >= 0) {
- switch (eDerivedStructuralFeatureID(featureID, baseClass)) {
- case BeaninfoPackage.INDEXED_PROPERTY_DECORATOR__EANNOTATIONS:
- return ((InternalEList)getEAnnotations()).basicRemove(otherEnd, msgs);
- case BeaninfoPackage.INDEXED_PROPERTY_DECORATOR__DETAILS:
- return ((InternalEList)getDetails()).basicRemove(otherEnd, msgs);
- case BeaninfoPackage.INDEXED_PROPERTY_DECORATOR__EMODEL_ELEMENT:
- return eBasicSetContainer(null, BeaninfoPackage.INDEXED_PROPERTY_DECORATOR__EMODEL_ELEMENT, msgs);
- case BeaninfoPackage.INDEXED_PROPERTY_DECORATOR__CONTENTS:
- return ((InternalEList)getContents()).basicRemove(otherEnd, msgs);
- case BeaninfoPackage.INDEXED_PROPERTY_DECORATOR__ATTRIBUTES:
- return ((InternalEList)getAttributes()).basicRemove(otherEnd, msgs);
- default:
- return eDynamicInverseRemove(otherEnd, featureID, baseClass, msgs);
- }
- }
- return eBasicSetContainer(null, featureID, msgs);
- }
-
- /**
- * <!-- begin-user-doc -->
- * <!-- end-user-doc -->
- * @generated
- */
- public NotificationChain eBasicRemoveFromContainer(NotificationChain msgs) {
- if (eContainerFeatureID() >= 0) {
- switch (eContainerFeatureID()) {
- case BeaninfoPackage.INDEXED_PROPERTY_DECORATOR__EMODEL_ELEMENT:
- return eContainer.eInverseRemove(this, EcorePackage.EMODEL_ELEMENT__EANNOTATIONS, EModelElement.class, msgs);
- default:
- return eDynamicBasicRemoveFromContainer(msgs);
- }
- }
- return eContainer.eInverseRemove(this, EOPPOSITE_FEATURE_BASE - eContainerFeatureID(), null, msgs);
- }
-
- /**
- * <!-- begin-user-doc -->
- * <!-- end-user-doc -->
- * @generated
- */
- public Object eGet(EStructuralFeature eFeature, boolean resolve) {
- switch (eDerivedStructuralFeatureID(eFeature)) {
- case BeaninfoPackage.INDEXED_PROPERTY_DECORATOR__EANNOTATIONS:
- return getEAnnotations();
- case BeaninfoPackage.INDEXED_PROPERTY_DECORATOR__SOURCE:
- return getSource();
- case BeaninfoPackage.INDEXED_PROPERTY_DECORATOR__DETAILS:
- return getDetails();
- case BeaninfoPackage.INDEXED_PROPERTY_DECORATOR__EMODEL_ELEMENT:
- return getEModelElement();
- case BeaninfoPackage.INDEXED_PROPERTY_DECORATOR__CONTENTS:
- return getContents();
- case BeaninfoPackage.INDEXED_PROPERTY_DECORATOR__REFERENCES:
- return getReferences();
- case BeaninfoPackage.INDEXED_PROPERTY_DECORATOR__DISPLAY_NAME:
- return getDisplayName();
- case BeaninfoPackage.INDEXED_PROPERTY_DECORATOR__SHORT_DESCRIPTION:
- return getShortDescription();
- case BeaninfoPackage.INDEXED_PROPERTY_DECORATOR__CATEGORY:
- return getCategory();
- case BeaninfoPackage.INDEXED_PROPERTY_DECORATOR__EXPERT:
- return isExpert() ? Boolean.TRUE : Boolean.FALSE;
- case BeaninfoPackage.INDEXED_PROPERTY_DECORATOR__HIDDEN:
- return isHidden() ? Boolean.TRUE : Boolean.FALSE;
- case BeaninfoPackage.INDEXED_PROPERTY_DECORATOR__PREFERRED:
- return isPreferred() ? Boolean.TRUE : Boolean.FALSE;
- case BeaninfoPackage.INDEXED_PROPERTY_DECORATOR__MERGE_INTROSPECTION:
- return isMergeIntrospection() ? Boolean.TRUE : Boolean.FALSE;
- case BeaninfoPackage.INDEXED_PROPERTY_DECORATOR__ATTRIBUTES_EXPLICIT_EMPTY:
- return isAttributesExplicitEmpty() ? Boolean.TRUE : Boolean.FALSE;
- case BeaninfoPackage.INDEXED_PROPERTY_DECORATOR__IMPLICITLY_SET_BITS:
- return new Long(getImplicitlySetBits());
- case BeaninfoPackage.INDEXED_PROPERTY_DECORATOR__IMPLICIT_DECORATOR_FLAG:
- return getImplicitDecoratorFlag();
- case BeaninfoPackage.INDEXED_PROPERTY_DECORATOR__ATTRIBUTES:
- return getAttributes();
- case BeaninfoPackage.INDEXED_PROPERTY_DECORATOR__BOUND:
- return isBound() ? Boolean.TRUE : Boolean.FALSE;
- case BeaninfoPackage.INDEXED_PROPERTY_DECORATOR__CONSTRAINED:
- return isConstrained() ? Boolean.TRUE : Boolean.FALSE;
- case BeaninfoPackage.INDEXED_PROPERTY_DECORATOR__DESIGN_TIME:
- return isDesignTime() ? Boolean.TRUE : Boolean.FALSE;
- case BeaninfoPackage.INDEXED_PROPERTY_DECORATOR__ALWAYS_INCOMPATIBLE:
- return isAlwaysIncompatible() ? Boolean.TRUE : Boolean.FALSE;
- case BeaninfoPackage.INDEXED_PROPERTY_DECORATOR__FILTER_FLAGS:
- return getFilterFlags();
- case BeaninfoPackage.INDEXED_PROPERTY_DECORATOR__FIELD_READ_ONLY:
- return isFieldReadOnly() ? Boolean.TRUE : Boolean.FALSE;
- case BeaninfoPackage.INDEXED_PROPERTY_DECORATOR__PROPERTY_EDITOR_CLASS:
- if (resolve) return getPropertyEditorClass();
- return basicGetPropertyEditorClass();
- case BeaninfoPackage.INDEXED_PROPERTY_DECORATOR__READ_METHOD:
- if (resolve) return getReadMethod();
- return basicGetReadMethod();
- case BeaninfoPackage.INDEXED_PROPERTY_DECORATOR__WRITE_METHOD:
- if (resolve) return getWriteMethod();
- return basicGetWriteMethod();
- case BeaninfoPackage.INDEXED_PROPERTY_DECORATOR__FIELD:
- if (resolve) return getField();
- return basicGetField();
- case BeaninfoPackage.INDEXED_PROPERTY_DECORATOR__INDEXED_READ_METHOD:
- if (resolve) return getIndexedReadMethod();
- return basicGetIndexedReadMethod();
- case BeaninfoPackage.INDEXED_PROPERTY_DECORATOR__INDEXED_WRITE_METHOD:
- if (resolve) return getIndexedWriteMethod();
- return basicGetIndexedWriteMethod();
- }
- return eDynamicGet(eFeature, resolve);
- }
-
- /**
- * <!-- begin-user-doc -->
- * <!-- end-user-doc -->
- * @generated
- */
- public void eSet(EStructuralFeature eFeature, Object newValue) {
- switch (eDerivedStructuralFeatureID(eFeature)) {
- case BeaninfoPackage.INDEXED_PROPERTY_DECORATOR__EANNOTATIONS:
- getEAnnotations().clear();
- getEAnnotations().addAll((Collection)newValue);
- return;
- case BeaninfoPackage.INDEXED_PROPERTY_DECORATOR__SOURCE:
- setSource((String)newValue);
- return;
- case BeaninfoPackage.INDEXED_PROPERTY_DECORATOR__DETAILS:
- getDetails().clear();
- getDetails().addAll((Collection)newValue);
- return;
- case BeaninfoPackage.INDEXED_PROPERTY_DECORATOR__EMODEL_ELEMENT:
- setEModelElement((EModelElement)newValue);
- return;
- case BeaninfoPackage.INDEXED_PROPERTY_DECORATOR__CONTENTS:
- getContents().clear();
- getContents().addAll((Collection)newValue);
- return;
- case BeaninfoPackage.INDEXED_PROPERTY_DECORATOR__REFERENCES:
- getReferences().clear();
- getReferences().addAll((Collection)newValue);
- return;
- case BeaninfoPackage.INDEXED_PROPERTY_DECORATOR__DISPLAY_NAME:
- setDisplayName((String)newValue);
- return;
- case BeaninfoPackage.INDEXED_PROPERTY_DECORATOR__SHORT_DESCRIPTION:
- setShortDescription((String)newValue);
- return;
- case BeaninfoPackage.INDEXED_PROPERTY_DECORATOR__CATEGORY:
- setCategory((String)newValue);
- return;
- case BeaninfoPackage.INDEXED_PROPERTY_DECORATOR__EXPERT:
- setExpert(((Boolean)newValue).booleanValue());
- return;
- case BeaninfoPackage.INDEXED_PROPERTY_DECORATOR__HIDDEN:
- setHidden(((Boolean)newValue).booleanValue());
- return;
- case BeaninfoPackage.INDEXED_PROPERTY_DECORATOR__PREFERRED:
- setPreferred(((Boolean)newValue).booleanValue());
- return;
- case BeaninfoPackage.INDEXED_PROPERTY_DECORATOR__MERGE_INTROSPECTION:
- setMergeIntrospection(((Boolean)newValue).booleanValue());
- return;
- case BeaninfoPackage.INDEXED_PROPERTY_DECORATOR__ATTRIBUTES_EXPLICIT_EMPTY:
- setAttributesExplicitEmpty(((Boolean)newValue).booleanValue());
- return;
- case BeaninfoPackage.INDEXED_PROPERTY_DECORATOR__IMPLICITLY_SET_BITS:
- setImplicitlySetBits(((Long)newValue).longValue());
- return;
- case BeaninfoPackage.INDEXED_PROPERTY_DECORATOR__IMPLICIT_DECORATOR_FLAG:
- setImplicitDecoratorFlag((ImplicitItem)newValue);
- return;
- case BeaninfoPackage.INDEXED_PROPERTY_DECORATOR__ATTRIBUTES:
- getAttributes().clear();
- getAttributes().addAll((Collection)newValue);
- return;
- case BeaninfoPackage.INDEXED_PROPERTY_DECORATOR__BOUND:
- setBound(((Boolean)newValue).booleanValue());
- return;
- case BeaninfoPackage.INDEXED_PROPERTY_DECORATOR__CONSTRAINED:
- setConstrained(((Boolean)newValue).booleanValue());
- return;
- case BeaninfoPackage.INDEXED_PROPERTY_DECORATOR__DESIGN_TIME:
- setDesignTime(((Boolean)newValue).booleanValue());
- return;
- case BeaninfoPackage.INDEXED_PROPERTY_DECORATOR__ALWAYS_INCOMPATIBLE:
- setAlwaysIncompatible(((Boolean)newValue).booleanValue());
- return;
- case BeaninfoPackage.INDEXED_PROPERTY_DECORATOR__FILTER_FLAGS:
- getFilterFlags().clear();
- getFilterFlags().addAll((Collection)newValue);
- return;
- case BeaninfoPackage.INDEXED_PROPERTY_DECORATOR__FIELD_READ_ONLY:
- setFieldReadOnly(((Boolean)newValue).booleanValue());
- return;
- case BeaninfoPackage.INDEXED_PROPERTY_DECORATOR__PROPERTY_EDITOR_CLASS:
- setPropertyEditorClass((JavaClass)newValue);
- return;
- case BeaninfoPackage.INDEXED_PROPERTY_DECORATOR__READ_METHOD:
- setReadMethod((Method)newValue);
- return;
- case BeaninfoPackage.INDEXED_PROPERTY_DECORATOR__WRITE_METHOD:
- setWriteMethod((Method)newValue);
- return;
- case BeaninfoPackage.INDEXED_PROPERTY_DECORATOR__FIELD:
- setField((Field)newValue);
- return;
- case BeaninfoPackage.INDEXED_PROPERTY_DECORATOR__INDEXED_READ_METHOD:
- setIndexedReadMethod((Method)newValue);
- return;
- case BeaninfoPackage.INDEXED_PROPERTY_DECORATOR__INDEXED_WRITE_METHOD:
- setIndexedWriteMethod((Method)newValue);
- return;
- }
- eDynamicSet(eFeature, newValue);
- }
-
- /**
- * <!-- begin-user-doc -->
- * <!-- end-user-doc -->
- * @generated
- */
- public void eUnset(EStructuralFeature eFeature) {
- switch (eDerivedStructuralFeatureID(eFeature)) {
- case BeaninfoPackage.INDEXED_PROPERTY_DECORATOR__EANNOTATIONS:
- getEAnnotations().clear();
- return;
- case BeaninfoPackage.INDEXED_PROPERTY_DECORATOR__SOURCE:
- setSource(SOURCE_EDEFAULT);
- return;
- case BeaninfoPackage.INDEXED_PROPERTY_DECORATOR__DETAILS:
- getDetails().clear();
- return;
- case BeaninfoPackage.INDEXED_PROPERTY_DECORATOR__EMODEL_ELEMENT:
- setEModelElement((EModelElement)null);
- return;
- case BeaninfoPackage.INDEXED_PROPERTY_DECORATOR__CONTENTS:
- getContents().clear();
- return;
- case BeaninfoPackage.INDEXED_PROPERTY_DECORATOR__REFERENCES:
- getReferences().clear();
- return;
- case BeaninfoPackage.INDEXED_PROPERTY_DECORATOR__DISPLAY_NAME:
- unsetDisplayName();
- return;
- case BeaninfoPackage.INDEXED_PROPERTY_DECORATOR__SHORT_DESCRIPTION:
- unsetShortDescription();
- return;
- case BeaninfoPackage.INDEXED_PROPERTY_DECORATOR__CATEGORY:
- setCategory(CATEGORY_EDEFAULT);
- return;
- case BeaninfoPackage.INDEXED_PROPERTY_DECORATOR__EXPERT:
- unsetExpert();
- return;
- case BeaninfoPackage.INDEXED_PROPERTY_DECORATOR__HIDDEN:
- unsetHidden();
- return;
- case BeaninfoPackage.INDEXED_PROPERTY_DECORATOR__PREFERRED:
- unsetPreferred();
- return;
- case BeaninfoPackage.INDEXED_PROPERTY_DECORATOR__MERGE_INTROSPECTION:
- setMergeIntrospection(MERGE_INTROSPECTION_EDEFAULT);
- return;
- case BeaninfoPackage.INDEXED_PROPERTY_DECORATOR__ATTRIBUTES_EXPLICIT_EMPTY:
- setAttributesExplicitEmpty(ATTRIBUTES_EXPLICIT_EMPTY_EDEFAULT);
- return;
- case BeaninfoPackage.INDEXED_PROPERTY_DECORATOR__IMPLICITLY_SET_BITS:
- setImplicitlySetBits(IMPLICITLY_SET_BITS_EDEFAULT);
- return;
- case BeaninfoPackage.INDEXED_PROPERTY_DECORATOR__IMPLICIT_DECORATOR_FLAG:
- setImplicitDecoratorFlag(IMPLICIT_DECORATOR_FLAG_EDEFAULT);
- return;
- case BeaninfoPackage.INDEXED_PROPERTY_DECORATOR__ATTRIBUTES:
- getAttributes().clear();
- return;
- case BeaninfoPackage.INDEXED_PROPERTY_DECORATOR__BOUND:
- unsetBound();
- return;
- case BeaninfoPackage.INDEXED_PROPERTY_DECORATOR__CONSTRAINED:
- unsetConstrained();
- return;
- case BeaninfoPackage.INDEXED_PROPERTY_DECORATOR__DESIGN_TIME:
- unsetDesignTime();
- return;
- case BeaninfoPackage.INDEXED_PROPERTY_DECORATOR__ALWAYS_INCOMPATIBLE:
- setAlwaysIncompatible(ALWAYS_INCOMPATIBLE_EDEFAULT);
- return;
- case BeaninfoPackage.INDEXED_PROPERTY_DECORATOR__FILTER_FLAGS:
- getFilterFlags().clear();
- return;
- case BeaninfoPackage.INDEXED_PROPERTY_DECORATOR__FIELD_READ_ONLY:
- setFieldReadOnly(FIELD_READ_ONLY_EDEFAULT);
- return;
- case BeaninfoPackage.INDEXED_PROPERTY_DECORATOR__PROPERTY_EDITOR_CLASS:
- setPropertyEditorClass((JavaClass)null);
- return;
- case BeaninfoPackage.INDEXED_PROPERTY_DECORATOR__READ_METHOD:
- unsetReadMethod();
- return;
- case BeaninfoPackage.INDEXED_PROPERTY_DECORATOR__WRITE_METHOD:
- unsetWriteMethod();
- return;
- case BeaninfoPackage.INDEXED_PROPERTY_DECORATOR__FIELD:
- unsetField();
- return;
- case BeaninfoPackage.INDEXED_PROPERTY_DECORATOR__INDEXED_READ_METHOD:
- unsetIndexedReadMethod();
- return;
- case BeaninfoPackage.INDEXED_PROPERTY_DECORATOR__INDEXED_WRITE_METHOD:
- unsetIndexedWriteMethod();
- return;
- }
- eDynamicUnset(eFeature);
- }
-
- /* (non-Javadoc)
- * @see org.eclipse.emf.ecore.EObject#eIsSet(org.eclipse.emf.ecore.EStructuralFeature)
- */
- public boolean eIsSet(EStructuralFeature eFeature) {
- switch (eDerivedStructuralFeatureID(eFeature)) {
- case BeaninfoPackage.INDEXED_PROPERTY_DECORATOR__SOURCE:
- return isSourceSet(); // Override so that if set to the same as classname, then it is considered not set.
- default:
- return eIsSetGen(eFeature);
- }
- }
-
- /**
- * <!-- begin-user-doc -->
- * <!-- end-user-doc -->
- * @generated
- */
- public boolean eIsSetGen(EStructuralFeature eFeature) {
- switch (eDerivedStructuralFeatureID(eFeature)) {
- case BeaninfoPackage.INDEXED_PROPERTY_DECORATOR__EANNOTATIONS:
- return eAnnotations != null && !eAnnotations.isEmpty();
- case BeaninfoPackage.INDEXED_PROPERTY_DECORATOR__SOURCE:
- return SOURCE_EDEFAULT == null ? source != null : !SOURCE_EDEFAULT.equals(source);
- case BeaninfoPackage.INDEXED_PROPERTY_DECORATOR__DETAILS:
- return details != null && !details.isEmpty();
- case BeaninfoPackage.INDEXED_PROPERTY_DECORATOR__EMODEL_ELEMENT:
- return getEModelElement() != null;
- case BeaninfoPackage.INDEXED_PROPERTY_DECORATOR__CONTENTS:
- return contents != null && !contents.isEmpty();
- case BeaninfoPackage.INDEXED_PROPERTY_DECORATOR__REFERENCES:
- return references != null && !references.isEmpty();
- case BeaninfoPackage.INDEXED_PROPERTY_DECORATOR__DISPLAY_NAME:
- return isSetDisplayName();
- case BeaninfoPackage.INDEXED_PROPERTY_DECORATOR__SHORT_DESCRIPTION:
- return isSetShortDescription();
- case BeaninfoPackage.INDEXED_PROPERTY_DECORATOR__CATEGORY:
- return CATEGORY_EDEFAULT == null ? category != null : !CATEGORY_EDEFAULT.equals(category);
- case BeaninfoPackage.INDEXED_PROPERTY_DECORATOR__EXPERT:
- return isSetExpert();
- case BeaninfoPackage.INDEXED_PROPERTY_DECORATOR__HIDDEN:
- return isSetHidden();
- case BeaninfoPackage.INDEXED_PROPERTY_DECORATOR__PREFERRED:
- return isSetPreferred();
- case BeaninfoPackage.INDEXED_PROPERTY_DECORATOR__MERGE_INTROSPECTION:
- return ((eFlags & MERGE_INTROSPECTION_EFLAG) != 0) != MERGE_INTROSPECTION_EDEFAULT;
- case BeaninfoPackage.INDEXED_PROPERTY_DECORATOR__ATTRIBUTES_EXPLICIT_EMPTY:
- return ((eFlags & ATTRIBUTES_EXPLICIT_EMPTY_EFLAG) != 0) != ATTRIBUTES_EXPLICIT_EMPTY_EDEFAULT;
- case BeaninfoPackage.INDEXED_PROPERTY_DECORATOR__IMPLICITLY_SET_BITS:
- return implicitlySetBits != IMPLICITLY_SET_BITS_EDEFAULT;
- case BeaninfoPackage.INDEXED_PROPERTY_DECORATOR__IMPLICIT_DECORATOR_FLAG:
- return implicitDecoratorFlag != IMPLICIT_DECORATOR_FLAG_EDEFAULT;
- case BeaninfoPackage.INDEXED_PROPERTY_DECORATOR__ATTRIBUTES:
- return attributes != null && !attributes.isEmpty();
- case BeaninfoPackage.INDEXED_PROPERTY_DECORATOR__BOUND:
- return isSetBound();
- case BeaninfoPackage.INDEXED_PROPERTY_DECORATOR__CONSTRAINED:
- return isSetConstrained();
- case BeaninfoPackage.INDEXED_PROPERTY_DECORATOR__DESIGN_TIME:
- return isSetDesignTime();
- case BeaninfoPackage.INDEXED_PROPERTY_DECORATOR__ALWAYS_INCOMPATIBLE:
- return ((eFlags & ALWAYS_INCOMPATIBLE_EFLAG) != 0) != ALWAYS_INCOMPATIBLE_EDEFAULT;
- case BeaninfoPackage.INDEXED_PROPERTY_DECORATOR__FILTER_FLAGS:
- return filterFlags != null && !filterFlags.isEmpty();
- case BeaninfoPackage.INDEXED_PROPERTY_DECORATOR__FIELD_READ_ONLY:
- return ((eFlags & FIELD_READ_ONLY_EFLAG) != 0) != FIELD_READ_ONLY_EDEFAULT;
- case BeaninfoPackage.INDEXED_PROPERTY_DECORATOR__PROPERTY_EDITOR_CLASS:
- return propertyEditorClass != null;
- case BeaninfoPackage.INDEXED_PROPERTY_DECORATOR__READ_METHOD:
- return isSetReadMethod();
- case BeaninfoPackage.INDEXED_PROPERTY_DECORATOR__WRITE_METHOD:
- return isSetWriteMethod();
- case BeaninfoPackage.INDEXED_PROPERTY_DECORATOR__FIELD:
- return isSetField();
- case BeaninfoPackage.INDEXED_PROPERTY_DECORATOR__INDEXED_READ_METHOD:
- return isSetIndexedReadMethod();
- case BeaninfoPackage.INDEXED_PROPERTY_DECORATOR__INDEXED_WRITE_METHOD:
- return isSetIndexedWriteMethod();
- }
- return eDynamicIsSet(eFeature);
- }
-
- /**
- * <!-- begin-user-doc -->
- * <!-- end-user-doc -->
- * @generated
- */
- public Method basicGetIndexedReadMethod() {
- return indexedReadMethod;
- }
-
- /**
- * <!-- begin-user-doc -->
- * <!-- end-user-doc -->
- * @generated
- */
- public Method basicGetIndexedWriteMethod() {
- return indexedWriteMethod;
- }
-
-}
diff --git a/plugins/org.eclipse.jem.beaninfo/beaninfo/org/eclipse/jem/internal/beaninfo/impl/MethodDecoratorImpl.java b/plugins/org.eclipse.jem.beaninfo/beaninfo/org/eclipse/jem/internal/beaninfo/impl/MethodDecoratorImpl.java
deleted file mode 100644
index 6678cac..0000000
--- a/plugins/org.eclipse.jem.beaninfo/beaninfo/org/eclipse/jem/internal/beaninfo/impl/MethodDecoratorImpl.java
+++ /dev/null
@@ -1,592 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2001, 2005 IBM Corporation and others.
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
- *
- * Contributors:
- * IBM Corporation - initial API and implementation
- *******************************************************************************/
-package org.eclipse.jem.internal.beaninfo.impl;
-/*
-
-
- */
-
-
-import java.util.Collection;
-
-import java.util.*;
-
-import org.eclipse.emf.common.notify.Notification;
-import org.eclipse.emf.common.notify.NotificationChain;
-import org.eclipse.emf.common.util.EList;
-import org.eclipse.emf.ecore.EClass;
-import org.eclipse.emf.ecore.EModelElement;
-import org.eclipse.emf.ecore.EStructuralFeature;
-import org.eclipse.emf.ecore.EcorePackage;
-import org.eclipse.emf.ecore.InternalEObject;
-import org.eclipse.emf.ecore.impl.ENotificationImpl;
-import org.eclipse.emf.ecore.util.EObjectContainmentEList;
-import org.eclipse.emf.ecore.util.InternalEList;
-
-import org.eclipse.jem.internal.beaninfo.BeaninfoFactory;
-import org.eclipse.jem.internal.beaninfo.BeaninfoPackage;
-import org.eclipse.jem.internal.beaninfo.ImplicitItem;
-import org.eclipse.jem.internal.beaninfo.MethodDecorator;
-import org.eclipse.jem.internal.beaninfo.MethodProxy;
-import org.eclipse.jem.internal.beaninfo.ParameterDecorator;
-import org.eclipse.jem.java.JavaParameter;
-import org.eclipse.jem.java.Method;
-/**
- * <!-- begin-user-doc -->
- * An implementation of the model object '<em><b>Method Decorator</b></em>'.
- * <!-- end-user-doc -->
- * <p>
- * The following features are implemented:
- * <ul>
- * <li>{@link org.eclipse.jem.internal.beaninfo.impl.MethodDecoratorImpl#isParmsExplicitEmpty <em>Parms Explicit Empty</em>}</li>
- * <li>{@link org.eclipse.jem.internal.beaninfo.impl.MethodDecoratorImpl#getParameterDescriptors <em>Parameter Descriptors</em>}</li>
- * <li>{@link org.eclipse.jem.internal.beaninfo.impl.MethodDecoratorImpl#getSerParmDesc <em>Ser Parm Desc</em>}</li>
- * </ul>
- * </p>
- *
- * @generated
- */
-
-
-public class MethodDecoratorImpl extends FeatureDecoratorImpl implements MethodDecorator{
-
- /**
- * Bits for implicitly set features. This is internal, not meant for clients.
- */
- public static final long METHOD_PARAMETERS_IMPLICIT = 0x1L;
- public static final long METHOD_PARAMETERS_DEFAULT = 02L; // Special, means were created by default and not by implicit (from beaninfo).
-
- /**
- * The default value of the '{@link #isParmsExplicitEmpty() <em>Parms Explicit Empty</em>}' attribute.
- * <!-- begin-user-doc -->
- * <!-- end-user-doc -->
- * @see #isParmsExplicitEmpty()
- * @generated
- * @ordered
- */
- protected static final boolean PARMS_EXPLICIT_EMPTY_EDEFAULT = false;
-
- /**
- * The flag representing the value of the '{@link #isParmsExplicitEmpty() <em>Parms Explicit Empty</em>}' attribute.
- * <!-- begin-user-doc -->
- * <!-- end-user-doc -->
- * @see #isParmsExplicitEmpty()
- * @generated
- * @ordered
- */
- protected static final int PARMS_EXPLICIT_EMPTY_EFLAG = 1 << 18;
-
- /**
- * The cached value of the '{@link #getSerParmDesc() <em>Ser Parm Desc</em>}' containment reference list.
- * <!-- begin-user-doc -->
- * <!-- end-user-doc -->
- * @see #getSerParmDesc()
- * @generated
- * @ordered
- */
- protected EList serParmDesc = null;
-
- /**
- * <!-- begin-user-doc -->
- * <!-- end-user-doc -->
- * @generated
- */
- protected MethodDecoratorImpl() {
- super();
- }
-
- /**
- * <!-- begin-user-doc -->
- * <!-- end-user-doc -->
- * @generated
- */
- protected EClass eStaticClass() {
- return BeaninfoPackage.eINSTANCE.getMethodDecorator();
- }
-
- /**
- * <!-- begin-user-doc -->
- * <!-- end-user-doc -->
- * @generated
- */
- public boolean isParmsExplicitEmpty() {
- return (eFlags & PARMS_EXPLICIT_EMPTY_EFLAG) != 0;
- }
-
- /**
- * <!-- begin-user-doc -->
- * <!-- end-user-doc -->
- * @generated
- */
- public void setParmsExplicitEmpty(boolean newParmsExplicitEmpty) {
- boolean oldParmsExplicitEmpty = (eFlags & PARMS_EXPLICIT_EMPTY_EFLAG) != 0;
- if (newParmsExplicitEmpty) eFlags |= PARMS_EXPLICIT_EMPTY_EFLAG; else eFlags &= ~PARMS_EXPLICIT_EMPTY_EFLAG;
- if (eNotificationRequired())
- eNotify(new ENotificationImpl(this, Notification.SET, BeaninfoPackage.METHOD_DECORATOR__PARMS_EXPLICIT_EMPTY, oldParmsExplicitEmpty, newParmsExplicitEmpty));
- }
-
- /*
- * This is called if parms list not explicitly set and it was empty from BeanInfo or
- * this is from reflection. This becomes the default list based upon the method
- * we are attached to.
- */
- private EList createDefaultParmsList() {
- EList parmsList = this.getSerParmDesc();
- parmsList.clear();
-
- setImplicitlySetBits(getImplicitlySetBits()|METHOD_PARAMETERS_DEFAULT); // Mark as we implicitly filled it in.
- List p = getMethodParameters();
- if (p == null)
- return parmsList; // Couldn't get the list for some reason, so leave as is.
- int psize = p.size();
- for (int i=0; i<psize; i++) {
- ParameterDecorator pd = BeaninfoFactory.eINSTANCE.createParameterDecorator();
- JavaParameter jp = (JavaParameter) p.get(i);
- pd.setName(jp.getName());
- pd.setImplicitlySetBits(ParameterDecoratorImpl.PARAMETER_NAME_IMPLICIT);
- pd.setParameter(jp);
- parmsList.add(pd);
- }
- return parmsList;
- }
-
- /*
- * Initialize the ParameterDecorators to hook up the JavaParameter they are describing.
- * This is called from ParameterDecorator when it finds that its JavaParameter has not been set.
- * This means that it was explicitly added and we need to setup the parms.
- * <p>
- * Note this an internal method for BeanInfo. It is not meant to be called by clients.
- */
- void initializeParameters() {
- if (this.serParmDesc == null)
- return;
- List mp = getMethodParameters();
- if (mp.isEmpty())
- return; // Nothing that can be described.
- int psize = Math.min(this.serParmDesc.size(), mp.size());
- for (int i=0; i < psize; i++)
- ((ParameterDecorator) this.serParmDesc.get(i)).setParameter((JavaParameter) mp.get(i));
- }
-
-
- /*
- * Get the jem parameters from the method (jem method)
- */
- private List getMethodParameters() {
- // Get the method
- Method m = null;
- Object d = getEModelElement();
- if (d instanceof Method)
- m = (Method) d;
- else
- if (d instanceof MethodProxy)
- m = ((MethodProxy) d).getMethod();
- else
- return Collections.EMPTY_LIST; // Not decorating correct object.
- if (m == null)
- return Collections.EMPTY_LIST; // Couldn't find the method.
- List p = m.getParameters();
- return p;
- }
-
-
-
- /**
- * <!-- begin-user-doc -->
- * <!-- end-user-doc -->
- * @generated
- */
- public String toString() {
- if (eIsProxy()) return super.toString();
-
- StringBuffer result = new StringBuffer(super.toString());
- result.append(" (parmsExplicitEmpty: ");
- result.append((eFlags & PARMS_EXPLICIT_EMPTY_EFLAG) != 0);
- result.append(')');
- return result.toString();
- }
-
- /*
- * (non-Javadoc)
- * @see org.eclipse.jem.internal.beaninfo.MethodDecorator#getParameterDescriptors()
- */
- public EList getParameterDescriptors() {
- if (!isParmsExplicitEmpty() && getSerParmDesc().isEmpty() && (getImplicitlySetBits()&(METHOD_PARAMETERS_IMPLICIT | METHOD_PARAMETERS_DEFAULT)) == 0) {
- // Not explicitly empty, it is empty, and we have not implicitly or by defaults made it empty, then create the defaults.
- createDefaultParmsList();
- }
- return getSerParmDesc();
- }
-
- /**
- * <!-- begin-user-doc -->
- * <!-- end-user-doc -->
- * @generated
- */
- public EList getParameterDescriptorsGen() {
- // TODO: implement this method to return the 'Parameter Descriptors' reference list
- // Ensure that you remove @generated or mark it @generated NOT
- throw new UnsupportedOperationException();
- }
-
- /**
- * <!-- begin-user-doc -->
- * <!-- end-user-doc -->
- * @generated
- */
- public EList getSerParmDesc() {
- if (serParmDesc == null) {
- serParmDesc = new EObjectContainmentEList(ParameterDecorator.class, this, BeaninfoPackage.METHOD_DECORATOR__SER_PARM_DESC);
- }
- return serParmDesc;
- }
-
- /**
- * <!-- begin-user-doc -->
- * <!-- end-user-doc -->
- * @generated
- */
- public NotificationChain eInverseAdd(InternalEObject otherEnd, int featureID, Class baseClass, NotificationChain msgs) {
- if (featureID >= 0) {
- switch (eDerivedStructuralFeatureID(featureID, baseClass)) {
- case BeaninfoPackage.METHOD_DECORATOR__EANNOTATIONS:
- return ((InternalEList)getEAnnotations()).basicAdd(otherEnd, msgs);
- case BeaninfoPackage.METHOD_DECORATOR__EMODEL_ELEMENT:
- if (eContainer != null)
- msgs = eBasicRemoveFromContainer(msgs);
- return eBasicSetContainer(otherEnd, BeaninfoPackage.METHOD_DECORATOR__EMODEL_ELEMENT, msgs);
- default:
- return eDynamicInverseAdd(otherEnd, featureID, baseClass, msgs);
- }
- }
- if (eContainer != null)
- msgs = eBasicRemoveFromContainer(msgs);
- return eBasicSetContainer(otherEnd, featureID, msgs);
- }
-
- /**
- * <!-- begin-user-doc -->
- * <!-- end-user-doc -->
- * @generated
- */
- public NotificationChain eInverseRemove(InternalEObject otherEnd, int featureID, Class baseClass, NotificationChain msgs) {
- if (featureID >= 0) {
- switch (eDerivedStructuralFeatureID(featureID, baseClass)) {
- case BeaninfoPackage.METHOD_DECORATOR__EANNOTATIONS:
- return ((InternalEList)getEAnnotations()).basicRemove(otherEnd, msgs);
- case BeaninfoPackage.METHOD_DECORATOR__DETAILS:
- return ((InternalEList)getDetails()).basicRemove(otherEnd, msgs);
- case BeaninfoPackage.METHOD_DECORATOR__EMODEL_ELEMENT:
- return eBasicSetContainer(null, BeaninfoPackage.METHOD_DECORATOR__EMODEL_ELEMENT, msgs);
- case BeaninfoPackage.METHOD_DECORATOR__CONTENTS:
- return ((InternalEList)getContents()).basicRemove(otherEnd, msgs);
- case BeaninfoPackage.METHOD_DECORATOR__ATTRIBUTES:
- return ((InternalEList)getAttributes()).basicRemove(otherEnd, msgs);
- case BeaninfoPackage.METHOD_DECORATOR__SER_PARM_DESC:
- return ((InternalEList)getSerParmDesc()).basicRemove(otherEnd, msgs);
- default:
- return eDynamicInverseRemove(otherEnd, featureID, baseClass, msgs);
- }
- }
- return eBasicSetContainer(null, featureID, msgs);
- }
-
- /**
- * <!-- begin-user-doc -->
- * <!-- end-user-doc -->
- * @generated
- */
- public NotificationChain eBasicRemoveFromContainer(NotificationChain msgs) {
- if (eContainerFeatureID() >= 0) {
- switch (eContainerFeatureID()) {
- case BeaninfoPackage.METHOD_DECORATOR__EMODEL_ELEMENT:
- return eContainer.eInverseRemove(this, EcorePackage.EMODEL_ELEMENT__EANNOTATIONS, EModelElement.class, msgs);
- default:
- return eDynamicBasicRemoveFromContainer(msgs);
- }
- }
- return eContainer.eInverseRemove(this, EOPPOSITE_FEATURE_BASE - eContainerFeatureID(), null, msgs);
- }
-
- /**
- * <!-- begin-user-doc -->
- * <!-- end-user-doc -->
- * @generated
- */
- public Object eGet(EStructuralFeature eFeature, boolean resolve) {
- switch (eDerivedStructuralFeatureID(eFeature)) {
- case BeaninfoPackage.METHOD_DECORATOR__EANNOTATIONS:
- return getEAnnotations();
- case BeaninfoPackage.METHOD_DECORATOR__SOURCE:
- return getSource();
- case BeaninfoPackage.METHOD_DECORATOR__DETAILS:
- return getDetails();
- case BeaninfoPackage.METHOD_DECORATOR__EMODEL_ELEMENT:
- return getEModelElement();
- case BeaninfoPackage.METHOD_DECORATOR__CONTENTS:
- return getContents();
- case BeaninfoPackage.METHOD_DECORATOR__REFERENCES:
- return getReferences();
- case BeaninfoPackage.METHOD_DECORATOR__DISPLAY_NAME:
- return getDisplayName();
- case BeaninfoPackage.METHOD_DECORATOR__SHORT_DESCRIPTION:
- return getShortDescription();
- case BeaninfoPackage.METHOD_DECORATOR__CATEGORY:
- return getCategory();
- case BeaninfoPackage.METHOD_DECORATOR__EXPERT:
- return isExpert() ? Boolean.TRUE : Boolean.FALSE;
- case BeaninfoPackage.METHOD_DECORATOR__HIDDEN:
- return isHidden() ? Boolean.TRUE : Boolean.FALSE;
- case BeaninfoPackage.METHOD_DECORATOR__PREFERRED:
- return isPreferred() ? Boolean.TRUE : Boolean.FALSE;
- case BeaninfoPackage.METHOD_DECORATOR__MERGE_INTROSPECTION:
- return isMergeIntrospection() ? Boolean.TRUE : Boolean.FALSE;
- case BeaninfoPackage.METHOD_DECORATOR__ATTRIBUTES_EXPLICIT_EMPTY:
- return isAttributesExplicitEmpty() ? Boolean.TRUE : Boolean.FALSE;
- case BeaninfoPackage.METHOD_DECORATOR__IMPLICITLY_SET_BITS:
- return new Long(getImplicitlySetBits());
- case BeaninfoPackage.METHOD_DECORATOR__IMPLICIT_DECORATOR_FLAG:
- return getImplicitDecoratorFlag();
- case BeaninfoPackage.METHOD_DECORATOR__ATTRIBUTES:
- return getAttributes();
- case BeaninfoPackage.METHOD_DECORATOR__PARMS_EXPLICIT_EMPTY:
- return isParmsExplicitEmpty() ? Boolean.TRUE : Boolean.FALSE;
- case BeaninfoPackage.METHOD_DECORATOR__PARAMETER_DESCRIPTORS:
- return getParameterDescriptors();
- case BeaninfoPackage.METHOD_DECORATOR__SER_PARM_DESC:
- return getSerParmDesc();
- }
- return eDynamicGet(eFeature, resolve);
- }
-
- /**
- * <!-- begin-user-doc -->
- * <!-- end-user-doc -->
- * @generated
- */
- public void eSet(EStructuralFeature eFeature, Object newValue) {
- switch (eDerivedStructuralFeatureID(eFeature)) {
- case BeaninfoPackage.METHOD_DECORATOR__EANNOTATIONS:
- getEAnnotations().clear();
- getEAnnotations().addAll((Collection)newValue);
- return;
- case BeaninfoPackage.METHOD_DECORATOR__SOURCE:
- setSource((String)newValue);
- return;
- case BeaninfoPackage.METHOD_DECORATOR__DETAILS:
- getDetails().clear();
- getDetails().addAll((Collection)newValue);
- return;
- case BeaninfoPackage.METHOD_DECORATOR__EMODEL_ELEMENT:
- setEModelElement((EModelElement)newValue);
- return;
- case BeaninfoPackage.METHOD_DECORATOR__CONTENTS:
- getContents().clear();
- getContents().addAll((Collection)newValue);
- return;
- case BeaninfoPackage.METHOD_DECORATOR__REFERENCES:
- getReferences().clear();
- getReferences().addAll((Collection)newValue);
- return;
- case BeaninfoPackage.METHOD_DECORATOR__DISPLAY_NAME:
- setDisplayName((String)newValue);
- return;
- case BeaninfoPackage.METHOD_DECORATOR__SHORT_DESCRIPTION:
- setShortDescription((String)newValue);
- return;
- case BeaninfoPackage.METHOD_DECORATOR__CATEGORY:
- setCategory((String)newValue);
- return;
- case BeaninfoPackage.METHOD_DECORATOR__EXPERT:
- setExpert(((Boolean)newValue).booleanValue());
- return;
- case BeaninfoPackage.METHOD_DECORATOR__HIDDEN:
- setHidden(((Boolean)newValue).booleanValue());
- return;
- case BeaninfoPackage.METHOD_DECORATOR__PREFERRED:
- setPreferred(((Boolean)newValue).booleanValue());
- return;
- case BeaninfoPackage.METHOD_DECORATOR__MERGE_INTROSPECTION:
- setMergeIntrospection(((Boolean)newValue).booleanValue());
- return;
- case BeaninfoPackage.METHOD_DECORATOR__ATTRIBUTES_EXPLICIT_EMPTY:
- setAttributesExplicitEmpty(((Boolean)newValue).booleanValue());
- return;
- case BeaninfoPackage.METHOD_DECORATOR__IMPLICITLY_SET_BITS:
- setImplicitlySetBits(((Long)newValue).longValue());
- return;
- case BeaninfoPackage.METHOD_DECORATOR__IMPLICIT_DECORATOR_FLAG:
- setImplicitDecoratorFlag((ImplicitItem)newValue);
- return;
- case BeaninfoPackage.METHOD_DECORATOR__ATTRIBUTES:
- getAttributes().clear();
- getAttributes().addAll((Collection)newValue);
- return;
- case BeaninfoPackage.METHOD_DECORATOR__PARMS_EXPLICIT_EMPTY:
- setParmsExplicitEmpty(((Boolean)newValue).booleanValue());
- return;
- case BeaninfoPackage.METHOD_DECORATOR__PARAMETER_DESCRIPTORS:
- getParameterDescriptors().clear();
- getParameterDescriptors().addAll((Collection)newValue);
- return;
- case BeaninfoPackage.METHOD_DECORATOR__SER_PARM_DESC:
- getSerParmDesc().clear();
- getSerParmDesc().addAll((Collection)newValue);
- return;
- }
- eDynamicSet(eFeature, newValue);
- }
-
- /**
- * <!-- begin-user-doc -->
- * <!-- end-user-doc -->
- * @generated
- */
- public void eUnset(EStructuralFeature eFeature) {
- switch (eDerivedStructuralFeatureID(eFeature)) {
- case BeaninfoPackage.METHOD_DECORATOR__EANNOTATIONS:
- getEAnnotations().clear();
- return;
- case BeaninfoPackage.METHOD_DECORATOR__SOURCE:
- setSource(SOURCE_EDEFAULT);
- return;
- case BeaninfoPackage.METHOD_DECORATOR__DETAILS:
- getDetails().clear();
- return;
- case BeaninfoPackage.METHOD_DECORATOR__EMODEL_ELEMENT:
- setEModelElement((EModelElement)null);
- return;
- case BeaninfoPackage.METHOD_DECORATOR__CONTENTS:
- getContents().clear();
- return;
- case BeaninfoPackage.METHOD_DECORATOR__REFERENCES:
- getReferences().clear();
- return;
- case BeaninfoPackage.METHOD_DECORATOR__DISPLAY_NAME:
- unsetDisplayName();
- return;
- case BeaninfoPackage.METHOD_DECORATOR__SHORT_DESCRIPTION:
- unsetShortDescription();
- return;
- case BeaninfoPackage.METHOD_DECORATOR__CATEGORY:
- setCategory(CATEGORY_EDEFAULT);
- return;
- case BeaninfoPackage.METHOD_DECORATOR__EXPERT:
- unsetExpert();
- return;
- case BeaninfoPackage.METHOD_DECORATOR__HIDDEN:
- unsetHidden();
- return;
- case BeaninfoPackage.METHOD_DECORATOR__PREFERRED:
- unsetPreferred();
- return;
- case BeaninfoPackage.METHOD_DECORATOR__MERGE_INTROSPECTION:
- setMergeIntrospection(MERGE_INTROSPECTION_EDEFAULT);
- return;
- case BeaninfoPackage.METHOD_DECORATOR__ATTRIBUTES_EXPLICIT_EMPTY:
- setAttributesExplicitEmpty(ATTRIBUTES_EXPLICIT_EMPTY_EDEFAULT);
- return;
- case BeaninfoPackage.METHOD_DECORATOR__IMPLICITLY_SET_BITS:
- setImplicitlySetBits(IMPLICITLY_SET_BITS_EDEFAULT);
- return;
- case BeaninfoPackage.METHOD_DECORATOR__IMPLICIT_DECORATOR_FLAG:
- setImplicitDecoratorFlag(IMPLICIT_DECORATOR_FLAG_EDEFAULT);
- return;
- case BeaninfoPackage.METHOD_DECORATOR__ATTRIBUTES:
- getAttributes().clear();
- return;
- case BeaninfoPackage.METHOD_DECORATOR__PARMS_EXPLICIT_EMPTY:
- setParmsExplicitEmpty(PARMS_EXPLICIT_EMPTY_EDEFAULT);
- return;
- case BeaninfoPackage.METHOD_DECORATOR__PARAMETER_DESCRIPTORS:
- getParameterDescriptors().clear();
- return;
- case BeaninfoPackage.METHOD_DECORATOR__SER_PARM_DESC:
- getSerParmDesc().clear();
- return;
- }
- eDynamicUnset(eFeature);
- }
-
- /*
- * This is overridden so that we can do special is set tests:
- * 1) parameter descriptors: check if serParmDesc exists and not empty, since parameter descriptors is derived.
- * 2) serParmDesc: if flag set to default parm desc, then answer not set, else do normal isSet test. That way if set by default it won't serialize
- * out the unneeded default parms. They can be reconstructed quickly when needed.
- */
- public boolean eIsSet(EStructuralFeature eFeature) {
- switch (eDerivedStructuralFeatureID(eFeature)) {
- case BeaninfoPackage.METHOD_DECORATOR__SOURCE:
- return isSourceSet(); // Override so that if set to the same as classname, then it is considered not set.
- case BeaninfoPackage.METHOD_DECORATOR__PARAMETER_DESCRIPTORS:
- return eIsSetGen(BeaninfoPackage.eINSTANCE.getMethodDecorator_SerParmDesc()); // Let default serParmDesc is set work.
- case BeaninfoPackage.METHOD_DECORATOR__SER_PARM_DESC:
- if ((getImplicitlySetBits() & METHOD_PARAMETERS_DEFAULT) != 0)
- return false; // Not considered set if initialized by default.
- else
- return eIsSetGen(eFeature); // Not set by default, so check true setting.
- default:
- return eIsSetGen(eFeature); // Everything else use the gen method.
- }
- }
-
- /**
- * <!-- begin-user-doc -->
- * <!-- end-user-doc -->
- * @generated
- */
- public boolean eIsSetGen(EStructuralFeature eFeature) {
- switch (eDerivedStructuralFeatureID(eFeature)) {
- case BeaninfoPackage.METHOD_DECORATOR__EANNOTATIONS:
- return eAnnotations != null && !eAnnotations.isEmpty();
- case BeaninfoPackage.METHOD_DECORATOR__SOURCE:
- return SOURCE_EDEFAULT == null ? source != null : !SOURCE_EDEFAULT.equals(source);
- case BeaninfoPackage.METHOD_DECORATOR__DETAILS:
- return details != null && !details.isEmpty();
- case BeaninfoPackage.METHOD_DECORATOR__EMODEL_ELEMENT:
- return getEModelElement() != null;
- case BeaninfoPackage.METHOD_DECORATOR__CONTENTS:
- return contents != null && !contents.isEmpty();
- case BeaninfoPackage.METHOD_DECORATOR__REFERENCES:
- return references != null && !references.isEmpty();
- case BeaninfoPackage.METHOD_DECORATOR__DISPLAY_NAME:
- return isSetDisplayName();
- case BeaninfoPackage.METHOD_DECORATOR__SHORT_DESCRIPTION:
- return isSetShortDescription();
- case BeaninfoPackage.METHOD_DECORATOR__CATEGORY:
- return CATEGORY_EDEFAULT == null ? category != null : !CATEGORY_EDEFAULT.equals(category);
- case BeaninfoPackage.METHOD_DECORATOR__EXPERT:
- return isSetExpert();
- case BeaninfoPackage.METHOD_DECORATOR__HIDDEN:
- return isSetHidden();
- case BeaninfoPackage.METHOD_DECORATOR__PREFERRED:
- return isSetPreferred();
- case BeaninfoPackage.METHOD_DECORATOR__MERGE_INTROSPECTION:
- return ((eFlags & MERGE_INTROSPECTION_EFLAG) != 0) != MERGE_INTROSPECTION_EDEFAULT;
- case BeaninfoPackage.METHOD_DECORATOR__ATTRIBUTES_EXPLICIT_EMPTY:
- return ((eFlags & ATTRIBUTES_EXPLICIT_EMPTY_EFLAG) != 0) != ATTRIBUTES_EXPLICIT_EMPTY_EDEFAULT;
- case BeaninfoPackage.METHOD_DECORATOR__IMPLICITLY_SET_BITS:
- return implicitlySetBits != IMPLICITLY_SET_BITS_EDEFAULT;
- case BeaninfoPackage.METHOD_DECORATOR__IMPLICIT_DECORATOR_FLAG:
- return implicitDecoratorFlag != IMPLICIT_DECORATOR_FLAG_EDEFAULT;
- case BeaninfoPackage.METHOD_DECORATOR__ATTRIBUTES:
- return attributes != null && !attributes.isEmpty();
- case BeaninfoPackage.METHOD_DECORATOR__PARMS_EXPLICIT_EMPTY:
- return ((eFlags & PARMS_EXPLICIT_EMPTY_EFLAG) != 0) != PARMS_EXPLICIT_EMPTY_EDEFAULT;
- case BeaninfoPackage.METHOD_DECORATOR__PARAMETER_DESCRIPTORS:
- return !getParameterDescriptors().isEmpty();
- case BeaninfoPackage.METHOD_DECORATOR__SER_PARM_DESC:
- return serParmDesc != null && !serParmDesc.isEmpty();
- }
- return eDynamicIsSet(eFeature);
- }
-
-}
diff --git a/plugins/org.eclipse.jem.beaninfo/beaninfo/org/eclipse/jem/internal/beaninfo/impl/MethodProxyImpl.java b/plugins/org.eclipse.jem.beaninfo/beaninfo/org/eclipse/jem/internal/beaninfo/impl/MethodProxyImpl.java
deleted file mode 100644
index 192994a..0000000
--- a/plugins/org.eclipse.jem.beaninfo/beaninfo/org/eclipse/jem/internal/beaninfo/impl/MethodProxyImpl.java
+++ /dev/null
@@ -1,166 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2001, 2005 IBM Corporation and others.
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
- *
- * Contributors:
- * IBM Corporation - initial API and implementation
- *******************************************************************************/
-package org.eclipse.jem.internal.beaninfo.impl;
-/*
-
-
- */
-
-
-import org.eclipse.emf.common.notify.Notification;
-import org.eclipse.emf.ecore.EClass;
-import org.eclipse.emf.ecore.InternalEObject;
-import org.eclipse.emf.ecore.impl.ENotificationImpl;
-import org.eclipse.emf.ecore.impl.EOperationImpl;
-
-import org.eclipse.jem.internal.beaninfo.BeaninfoPackage;
-import org.eclipse.jem.internal.beaninfo.MethodProxy;
-import org.eclipse.jem.java.Method;
-
-
-/**
- * <!-- begin-user-doc -->
- * An implementation of the model object '<em><b>Method Proxy</b></em>'.
- * <!-- end-user-doc -->
- * <p>
- * The following features are implemented:
- * <ul>
- * <li>{@link org.eclipse.jem.internal.beaninfo.impl.MethodProxyImpl#getMethod <em>Method</em>}</li>
- * </ul>
- * </p>
- *
- * @generated
- */
-
-
-public class MethodProxyImpl extends EOperationImpl implements MethodProxy {
- /**
- * The cached value of the '{@link #getMethod() <em>Method</em>}' reference.
- * <!-- begin-user-doc -->
- * <!-- end-user-doc -->
- * @see #getMethod()
- * @generated
- * @ordered
- */
- protected Method method = null;
-
- /**
- * <!-- begin-user-doc -->
- * <!-- end-user-doc -->
- * @generated
- */
- protected MethodProxyImpl() {
- super();
- }
-
- /**
- * <!-- begin-user-doc -->
- * <!-- end-user-doc -->
- * @generated
- */
- protected EClass eStaticClass() {
- return BeaninfoPackage.Literals.METHOD_PROXY;
- }
-
- /**
- * <!-- begin-user-doc -->
- * <!-- end-user-doc -->
- * @generated
- */
- public Method getMethod() {
- if (method != null && method.eIsProxy()) {
- InternalEObject oldMethod = (InternalEObject)method;
- method = (Method)eResolveProxy(oldMethod);
- if (method != oldMethod) {
- if (eNotificationRequired())
- eNotify(new ENotificationImpl(this, Notification.RESOLVE, BeaninfoPackage.METHOD_PROXY__METHOD, oldMethod, method));
- }
- }
- return method;
- }
-
- /**
- * <!-- begin-user-doc -->
- * <!-- end-user-doc -->
- * @generated
- */
- public Method basicGetMethod() {
- return method;
- }
-
- /**
- * <!-- begin-user-doc -->
- * <!-- end-user-doc -->
- * @generated
- */
- public void setMethod(Method newMethod) {
- Method oldMethod = method;
- method = newMethod;
- if (eNotificationRequired())
- eNotify(new ENotificationImpl(this, Notification.SET, BeaninfoPackage.METHOD_PROXY__METHOD, oldMethod, method));
- }
-
- /**
- * <!-- begin-user-doc -->
- * <!-- end-user-doc -->
- * @generated
- */
- public Object eGet(int featureID, boolean resolve, boolean coreType) {
- switch (featureID) {
- case BeaninfoPackage.METHOD_PROXY__METHOD:
- if (resolve) return getMethod();
- return basicGetMethod();
- }
- return super.eGet(featureID, resolve, coreType);
- }
-
- /**
- * <!-- begin-user-doc -->
- * <!-- end-user-doc -->
- * @generated
- */
- public void eSet(int featureID, Object newValue) {
- switch (featureID) {
- case BeaninfoPackage.METHOD_PROXY__METHOD:
- setMethod((Method)newValue);
- return;
- }
- super.eSet(featureID, newValue);
- }
-
- /**
- * <!-- begin-user-doc -->
- * <!-- end-user-doc -->
- * @generated
- */
- public void eUnset(int featureID) {
- switch (featureID) {
- case BeaninfoPackage.METHOD_PROXY__METHOD:
- setMethod((Method)null);
- return;
- }
- super.eUnset(featureID);
- }
-
- /**
- * <!-- begin-user-doc -->
- * <!-- end-user-doc -->
- * @generated
- */
- public boolean eIsSet(int featureID) {
- switch (featureID) {
- case BeaninfoPackage.METHOD_PROXY__METHOD:
- return method != null;
- }
- return super.eIsSet(featureID);
- }
-
-}
diff --git a/plugins/org.eclipse.jem.beaninfo/beaninfo/org/eclipse/jem/internal/beaninfo/impl/ParameterDecoratorImpl.java b/plugins/org.eclipse.jem.beaninfo/beaninfo/org/eclipse/jem/internal/beaninfo/impl/ParameterDecoratorImpl.java
deleted file mode 100644
index f75dbe0..0000000
--- a/plugins/org.eclipse.jem.beaninfo/beaninfo/org/eclipse/jem/internal/beaninfo/impl/ParameterDecoratorImpl.java
+++ /dev/null
@@ -1,522 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2001, 2005 IBM Corporation and others.
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
- *
- * Contributors:
- * IBM Corporation - initial API and implementation
- *******************************************************************************/
-/*
-
-
- */
-package org.eclipse.jem.internal.beaninfo.impl;
-
-
-
-import java.util.Collection;
-
-import org.eclipse.emf.common.notify.Notification;
-import org.eclipse.emf.common.notify.NotificationChain;
-import org.eclipse.emf.ecore.EClass;
-import org.eclipse.emf.ecore.EModelElement;
-import org.eclipse.emf.ecore.EObject;
-import org.eclipse.emf.ecore.EStructuralFeature;
-import org.eclipse.emf.ecore.EcorePackage;
-import org.eclipse.emf.ecore.InternalEObject;
-import org.eclipse.emf.ecore.impl.ENotificationImpl;
-import org.eclipse.emf.ecore.util.InternalEList;
-
-import org.eclipse.jem.internal.beaninfo.BeaninfoPackage;
-import org.eclipse.jem.internal.beaninfo.ImplicitItem;
-import org.eclipse.jem.internal.beaninfo.ParameterDecorator;
-import org.eclipse.jem.java.JavaParameter;
-/**
- * <!-- begin-user-doc -->
- * A representation of the model object '<em><b>Method Decorator</b></em>'.
- * <!-- end-user-doc -->
- * <p>
- * The following features are implemented:
- * <ul>
- * <li>{@link org.eclipse.jem.internal.beaninfo.impl.ParameterDecoratorImpl#getName <em>Name</em>}</li>
- * <li>{@link org.eclipse.jem.internal.beaninfo.impl.ParameterDecoratorImpl#getParameter <em>Parameter</em>}</li>
- * </ul>
- * </p>
- *
- * @generated
- */
-
-public class ParameterDecoratorImpl extends FeatureDecoratorImpl implements ParameterDecorator{
-
- /**
- * Bits for implicitly set features. This is internal, not meant for clients.
- */
- public static final long PARAMETER_NAME_IMPLICIT = 0x1L;
-
- /**
- * The default value of the '{@link #getName() <em>Name</em>}' attribute.
- * <!-- begin-user-doc -->
- * <!-- end-user-doc -->
- * @see #getName()
- * @generated
- * @ordered
- */
- protected static final String NAME_EDEFAULT = null;
-
- /**
- * <!-- begin-user-doc -->
- * <!-- end-user-doc -->
- * @generated
- */
- protected ParameterDecoratorImpl() {
- super();
- }
-
- /**
- * <!-- begin-user-doc -->
- * <!-- end-user-doc -->
- * @generated
- */
- protected EClass eStaticClass() {
- return BeaninfoPackage.eINSTANCE.getParameterDecorator();
- }
-
- /**
- * <!-- begin-user-doc -->
- * <!-- end-user-doc -->
- * @generated
- */
- public String getName() {
- return name;
- }
-
- /**
- * The cached value of the '{@link #getName() <em>Name</em>}' attribute.
- * <!-- begin-user-doc -->
- * <!-- end-user-doc -->
- * @see #getName()
- * @generated
- * @ordered
- */
- protected String name = NAME_EDEFAULT;
- /**
- * The cached value of the '{@link #getParameter() <em>Parameter</em>}' reference.
- * <!-- begin-user-doc -->
- * <!-- end-user-doc -->
- * @see #getParameter()
- * @generated
- * @ordered
- */
- protected JavaParameter parameter = null;
-
- /**
- * <!-- begin-user-doc -->
- * <!-- end-user-doc -->
- * @generated
- */
- public void setName(String newName) {
- String oldName = name;
- name = newName;
- if (eNotificationRequired())
- eNotify(new ENotificationImpl(this, Notification.SET, BeaninfoPackage.PARAMETER_DECORATOR__NAME, oldName, name));
- }
-
- /**
- * <!-- begin-user-doc -->
- * <!-- end-user-doc -->
- * @generated
- */
- public String toString() {
- if (eIsProxy()) return super.toString();
-
- StringBuffer result = new StringBuffer(super.toString());
- result.append(" (name: ");
- result.append(name);
- result.append(')');
- return result.toString();
- }
-
- /*
- * Flag for if we tried to link up this parameter to java parm.
- */
- private boolean triedOnce;
-
- /**
- * The JavaParameter that this ParameterDecorator is decorating.
- */
- public JavaParameter getParameter() {
- if (!eIsSet(BeaninfoPackage.eINSTANCE.getParameterDecorator_Parameter()) && !triedOnce) {
- // Need to try to fill in the parameter setting.
- triedOnce = true;
- EObject container = eContainer(); // See if we are in a MethodDecorator.
- if (container instanceof MethodDecoratorImpl)
- ((MethodDecoratorImpl) container).initializeParameters();
- }
-
- return getParameterGen();
- }
-
- /**
- * <!-- begin-user-doc -->
- * <!-- end-user-doc -->
- * @generated
- */
- public JavaParameter getParameterGen() {
- if (parameter != null && parameter.eIsProxy()) {
- JavaParameter oldParameter = parameter;
- parameter = (JavaParameter)eResolveProxy((InternalEObject)parameter);
- if (parameter != oldParameter) {
- if (eNotificationRequired())
- eNotify(new ENotificationImpl(this, Notification.RESOLVE, BeaninfoPackage.PARAMETER_DECORATOR__PARAMETER, oldParameter, parameter));
- }
- }
- return parameter;
- }
-
- /**
- * <!-- begin-user-doc -->
- * <!-- end-user-doc -->
- * @generated
- */
- public JavaParameter basicGetParameter() {
- return parameter;
- }
-
- public void setParameter(JavaParameter newParameter) {
- if (newParameter == null)
- triedOnce = false;
- setParameterGen(newParameter);
- }
-
- /**
- * <!-- begin-user-doc -->
- * <!-- end-user-doc -->
- * @generated
- */
- public void setParameterGen(JavaParameter newParameter) {
- JavaParameter oldParameter = parameter;
- parameter = newParameter;
- if (eNotificationRequired())
- eNotify(new ENotificationImpl(this, Notification.SET, BeaninfoPackage.PARAMETER_DECORATOR__PARAMETER, oldParameter, parameter));
- }
-
- /**
- * <!-- begin-user-doc -->
- * <!-- end-user-doc -->
- * @generated
- */
- public NotificationChain eInverseAdd(InternalEObject otherEnd, int featureID, Class baseClass, NotificationChain msgs) {
- if (featureID >= 0) {
- switch (eDerivedStructuralFeatureID(featureID, baseClass)) {
- case BeaninfoPackage.PARAMETER_DECORATOR__EANNOTATIONS:
- return ((InternalEList)getEAnnotations()).basicAdd(otherEnd, msgs);
- case BeaninfoPackage.PARAMETER_DECORATOR__EMODEL_ELEMENT:
- if (eContainer != null)
- msgs = eBasicRemoveFromContainer(msgs);
- return eBasicSetContainer(otherEnd, BeaninfoPackage.PARAMETER_DECORATOR__EMODEL_ELEMENT, msgs);
- default:
- return eDynamicInverseAdd(otherEnd, featureID, baseClass, msgs);
- }
- }
- if (eContainer != null)
- msgs = eBasicRemoveFromContainer(msgs);
- return eBasicSetContainer(otherEnd, featureID, msgs);
- }
-
- /**
- * <!-- begin-user-doc -->
- * <!-- end-user-doc -->
- * @generated
- */
- public NotificationChain eInverseRemove(InternalEObject otherEnd, int featureID, Class baseClass, NotificationChain msgs) {
- if (featureID >= 0) {
- switch (eDerivedStructuralFeatureID(featureID, baseClass)) {
- case BeaninfoPackage.PARAMETER_DECORATOR__EANNOTATIONS:
- return ((InternalEList)getEAnnotations()).basicRemove(otherEnd, msgs);
- case BeaninfoPackage.PARAMETER_DECORATOR__DETAILS:
- return ((InternalEList)getDetails()).basicRemove(otherEnd, msgs);
- case BeaninfoPackage.PARAMETER_DECORATOR__EMODEL_ELEMENT:
- return eBasicSetContainer(null, BeaninfoPackage.PARAMETER_DECORATOR__EMODEL_ELEMENT, msgs);
- case BeaninfoPackage.PARAMETER_DECORATOR__CONTENTS:
- return ((InternalEList)getContents()).basicRemove(otherEnd, msgs);
- case BeaninfoPackage.PARAMETER_DECORATOR__ATTRIBUTES:
- return ((InternalEList)getAttributes()).basicRemove(otherEnd, msgs);
- default:
- return eDynamicInverseRemove(otherEnd, featureID, baseClass, msgs);
- }
- }
- return eBasicSetContainer(null, featureID, msgs);
- }
-
- /**
- * <!-- begin-user-doc -->
- * <!-- end-user-doc -->
- * @generated
- */
- public NotificationChain eBasicRemoveFromContainer(NotificationChain msgs) {
- if (eContainerFeatureID() >= 0) {
- switch (eContainerFeatureID()) {
- case BeaninfoPackage.PARAMETER_DECORATOR__EMODEL_ELEMENT:
- return eContainer.eInverseRemove(this, EcorePackage.EMODEL_ELEMENT__EANNOTATIONS, EModelElement.class, msgs);
- default:
- return eDynamicBasicRemoveFromContainer(msgs);
- }
- }
- return eContainer.eInverseRemove(this, EOPPOSITE_FEATURE_BASE - eContainerFeatureID(), null, msgs);
- }
-
- /**
- * <!-- begin-user-doc -->
- * <!-- end-user-doc -->
- * @generated
- */
- public Object eGet(EStructuralFeature eFeature, boolean resolve) {
- switch (eDerivedStructuralFeatureID(eFeature)) {
- case BeaninfoPackage.PARAMETER_DECORATOR__EANNOTATIONS:
- return getEAnnotations();
- case BeaninfoPackage.PARAMETER_DECORATOR__SOURCE:
- return getSource();
- case BeaninfoPackage.PARAMETER_DECORATOR__DETAILS:
- return getDetails();
- case BeaninfoPackage.PARAMETER_DECORATOR__EMODEL_ELEMENT:
- return getEModelElement();
- case BeaninfoPackage.PARAMETER_DECORATOR__CONTENTS:
- return getContents();
- case BeaninfoPackage.PARAMETER_DECORATOR__REFERENCES:
- return getReferences();
- case BeaninfoPackage.PARAMETER_DECORATOR__DISPLAY_NAME:
- return getDisplayName();
- case BeaninfoPackage.PARAMETER_DECORATOR__SHORT_DESCRIPTION:
- return getShortDescription();
- case BeaninfoPackage.PARAMETER_DECORATOR__CATEGORY:
- return getCategory();
- case BeaninfoPackage.PARAMETER_DECORATOR__EXPERT:
- return isExpert() ? Boolean.TRUE : Boolean.FALSE;
- case BeaninfoPackage.PARAMETER_DECORATOR__HIDDEN:
- return isHidden() ? Boolean.TRUE : Boolean.FALSE;
- case BeaninfoPackage.PARAMETER_DECORATOR__PREFERRED:
- return isPreferred() ? Boolean.TRUE : Boolean.FALSE;
- case BeaninfoPackage.PARAMETER_DECORATOR__MERGE_INTROSPECTION:
- return isMergeIntrospection() ? Boolean.TRUE : Boolean.FALSE;
- case BeaninfoPackage.PARAMETER_DECORATOR__ATTRIBUTES_EXPLICIT_EMPTY:
- return isAttributesExplicitEmpty() ? Boolean.TRUE : Boolean.FALSE;
- case BeaninfoPackage.PARAMETER_DECORATOR__IMPLICITLY_SET_BITS:
- return new Long(getImplicitlySetBits());
- case BeaninfoPackage.PARAMETER_DECORATOR__IMPLICIT_DECORATOR_FLAG:
- return getImplicitDecoratorFlag();
- case BeaninfoPackage.PARAMETER_DECORATOR__ATTRIBUTES:
- return getAttributes();
- case BeaninfoPackage.PARAMETER_DECORATOR__NAME:
- return getName();
- case BeaninfoPackage.PARAMETER_DECORATOR__PARAMETER:
- if (resolve) return getParameter();
- return basicGetParameter();
- }
- return eDynamicGet(eFeature, resolve);
- }
-
- /**
- * <!-- begin-user-doc -->
- * <!-- end-user-doc -->
- * @generated
- */
- public void eSet(EStructuralFeature eFeature, Object newValue) {
- switch (eDerivedStructuralFeatureID(eFeature)) {
- case BeaninfoPackage.PARAMETER_DECORATOR__EANNOTATIONS:
- getEAnnotations().clear();
- getEAnnotations().addAll((Collection)newValue);
- return;
- case BeaninfoPackage.PARAMETER_DECORATOR__SOURCE:
- setSource((String)newValue);
- return;
- case BeaninfoPackage.PARAMETER_DECORATOR__DETAILS:
- getDetails().clear();
- getDetails().addAll((Collection)newValue);
- return;
- case BeaninfoPackage.PARAMETER_DECORATOR__EMODEL_ELEMENT:
- setEModelElement((EModelElement)newValue);
- return;
- case BeaninfoPackage.PARAMETER_DECORATOR__CONTENTS:
- getContents().clear();
- getContents().addAll((Collection)newValue);
- return;
- case BeaninfoPackage.PARAMETER_DECORATOR__REFERENCES:
- getReferences().clear();
- getReferences().addAll((Collection)newValue);
- return;
- case BeaninfoPackage.PARAMETER_DECORATOR__DISPLAY_NAME:
- setDisplayName((String)newValue);
- return;
- case BeaninfoPackage.PARAMETER_DECORATOR__SHORT_DESCRIPTION:
- setShortDescription((String)newValue);
- return;
- case BeaninfoPackage.PARAMETER_DECORATOR__CATEGORY:
- setCategory((String)newValue);
- return;
- case BeaninfoPackage.PARAMETER_DECORATOR__EXPERT:
- setExpert(((Boolean)newValue).booleanValue());
- return;
- case BeaninfoPackage.PARAMETER_DECORATOR__HIDDEN:
- setHidden(((Boolean)newValue).booleanValue());
- return;
- case BeaninfoPackage.PARAMETER_DECORATOR__PREFERRED:
- setPreferred(((Boolean)newValue).booleanValue());
- return;
- case BeaninfoPackage.PARAMETER_DECORATOR__MERGE_INTROSPECTION:
- setMergeIntrospection(((Boolean)newValue).booleanValue());
- return;
- case BeaninfoPackage.PARAMETER_DECORATOR__ATTRIBUTES_EXPLICIT_EMPTY:
- setAttributesExplicitEmpty(((Boolean)newValue).booleanValue());
- return;
- case BeaninfoPackage.PARAMETER_DECORATOR__IMPLICITLY_SET_BITS:
- setImplicitlySetBits(((Long)newValue).longValue());
- return;
- case BeaninfoPackage.PARAMETER_DECORATOR__IMPLICIT_DECORATOR_FLAG:
- setImplicitDecoratorFlag((ImplicitItem)newValue);
- return;
- case BeaninfoPackage.PARAMETER_DECORATOR__ATTRIBUTES:
- getAttributes().clear();
- getAttributes().addAll((Collection)newValue);
- return;
- case BeaninfoPackage.PARAMETER_DECORATOR__NAME:
- setName((String)newValue);
- return;
- case BeaninfoPackage.PARAMETER_DECORATOR__PARAMETER:
- setParameter((JavaParameter)newValue);
- return;
- }
- eDynamicSet(eFeature, newValue);
- }
-
- /**
- * <!-- begin-user-doc -->
- * <!-- end-user-doc -->
- * @generated
- */
- public void eUnset(EStructuralFeature eFeature) {
- switch (eDerivedStructuralFeatureID(eFeature)) {
- case BeaninfoPackage.PARAMETER_DECORATOR__EANNOTATIONS:
- getEAnnotations().clear();
- return;
- case BeaninfoPackage.PARAMETER_DECORATOR__SOURCE:
- setSource(SOURCE_EDEFAULT);
- return;
- case BeaninfoPackage.PARAMETER_DECORATOR__DETAILS:
- getDetails().clear();
- return;
- case BeaninfoPackage.PARAMETER_DECORATOR__EMODEL_ELEMENT:
- setEModelElement((EModelElement)null);
- return;
- case BeaninfoPackage.PARAMETER_DECORATOR__CONTENTS:
- getContents().clear();
- return;
- case BeaninfoPackage.PARAMETER_DECORATOR__REFERENCES:
- getReferences().clear();
- return;
- case BeaninfoPackage.PARAMETER_DECORATOR__DISPLAY_NAME:
- unsetDisplayName();
- return;
- case BeaninfoPackage.PARAMETER_DECORATOR__SHORT_DESCRIPTION:
- unsetShortDescription();
- return;
- case BeaninfoPackage.PARAMETER_DECORATOR__CATEGORY:
- setCategory(CATEGORY_EDEFAULT);
- return;
- case BeaninfoPackage.PARAMETER_DECORATOR__EXPERT:
- unsetExpert();
- return;
- case BeaninfoPackage.PARAMETER_DECORATOR__HIDDEN:
- unsetHidden();
- return;
- case BeaninfoPackage.PARAMETER_DECORATOR__PREFERRED:
- unsetPreferred();
- return;
- case BeaninfoPackage.PARAMETER_DECORATOR__MERGE_INTROSPECTION:
- setMergeIntrospection(MERGE_INTROSPECTION_EDEFAULT);
- return;
- case BeaninfoPackage.PARAMETER_DECORATOR__ATTRIBUTES_EXPLICIT_EMPTY:
- setAttributesExplicitEmpty(ATTRIBUTES_EXPLICIT_EMPTY_EDEFAULT);
- return;
- case BeaninfoPackage.PARAMETER_DECORATOR__IMPLICITLY_SET_BITS:
- setImplicitlySetBits(IMPLICITLY_SET_BITS_EDEFAULT);
- return;
- case BeaninfoPackage.PARAMETER_DECORATOR__IMPLICIT_DECORATOR_FLAG:
- setImplicitDecoratorFlag(IMPLICIT_DECORATOR_FLAG_EDEFAULT);
- return;
- case BeaninfoPackage.PARAMETER_DECORATOR__ATTRIBUTES:
- getAttributes().clear();
- return;
- case BeaninfoPackage.PARAMETER_DECORATOR__NAME:
- setName(NAME_EDEFAULT);
- return;
- case BeaninfoPackage.PARAMETER_DECORATOR__PARAMETER:
- setParameter((JavaParameter)null);
- return;
- }
- eDynamicUnset(eFeature);
- }
-
- /* (non-Javadoc)
- * @see org.eclipse.emf.ecore.EObject#eIsSet(org.eclipse.emf.ecore.EStructuralFeature)
- */
- public boolean eIsSet(EStructuralFeature eFeature) {
- switch (eDerivedStructuralFeatureID(eFeature)) {
- case BeaninfoPackage.PARAMETER_DECORATOR__SOURCE:
- return isSourceSet(); // Override so that if set to the same as classname, then it is considered not set.
- default:
- return eIsSetGen(eFeature);
- }
- }
-
- /**
- * <!-- begin-user-doc -->
- * <!-- end-user-doc -->
- * @generated
- */
- public boolean eIsSetGen(EStructuralFeature eFeature) {
- switch (eDerivedStructuralFeatureID(eFeature)) {
- case BeaninfoPackage.PARAMETER_DECORATOR__EANNOTATIONS:
- return eAnnotations != null && !eAnnotations.isEmpty();
- case BeaninfoPackage.PARAMETER_DECORATOR__SOURCE:
- return SOURCE_EDEFAULT == null ? source != null : !SOURCE_EDEFAULT.equals(source);
- case BeaninfoPackage.PARAMETER_DECORATOR__DETAILS:
- return details != null && !details.isEmpty();
- case BeaninfoPackage.PARAMETER_DECORATOR__EMODEL_ELEMENT:
- return getEModelElement() != null;
- case BeaninfoPackage.PARAMETER_DECORATOR__CONTENTS:
- return contents != null && !contents.isEmpty();
- case BeaninfoPackage.PARAMETER_DECORATOR__REFERENCES:
- return references != null && !references.isEmpty();
- case BeaninfoPackage.PARAMETER_DECORATOR__DISPLAY_NAME:
- return isSetDisplayName();
- case BeaninfoPackage.PARAMETER_DECORATOR__SHORT_DESCRIPTION:
- return isSetShortDescription();
- case BeaninfoPackage.PARAMETER_DECORATOR__CATEGORY:
- return CATEGORY_EDEFAULT == null ? category != null : !CATEGORY_EDEFAULT.equals(category);
- case BeaninfoPackage.PARAMETER_DECORATOR__EXPERT:
- return isSetExpert();
- case BeaninfoPackage.PARAMETER_DECORATOR__HIDDEN:
- return isSetHidden();
- case BeaninfoPackage.PARAMETER_DECORATOR__PREFERRED:
- return isSetPreferred();
- case BeaninfoPackage.PARAMETER_DECORATOR__MERGE_INTROSPECTION:
- return ((eFlags & MERGE_INTROSPECTION_EFLAG) != 0) != MERGE_INTROSPECTION_EDEFAULT;
- case BeaninfoPackage.PARAMETER_DECORATOR__ATTRIBUTES_EXPLICIT_EMPTY:
- return ((eFlags & ATTRIBUTES_EXPLICIT_EMPTY_EFLAG) != 0) != ATTRIBUTES_EXPLICIT_EMPTY_EDEFAULT;
- case BeaninfoPackage.PARAMETER_DECORATOR__IMPLICITLY_SET_BITS:
- return implicitlySetBits != IMPLICITLY_SET_BITS_EDEFAULT;
- case BeaninfoPackage.PARAMETER_DECORATOR__IMPLICIT_DECORATOR_FLAG:
- return implicitDecoratorFlag != IMPLICIT_DECORATOR_FLAG_EDEFAULT;
- case BeaninfoPackage.PARAMETER_DECORATOR__ATTRIBUTES:
- return attributes != null && !attributes.isEmpty();
- case BeaninfoPackage.PARAMETER_DECORATOR__NAME:
- return NAME_EDEFAULT == null ? name != null : !NAME_EDEFAULT.equals(name);
- case BeaninfoPackage.PARAMETER_DECORATOR__PARAMETER:
- return parameter != null;
- }
- return eDynamicIsSet(eFeature);
- }
-
-}
diff --git a/plugins/org.eclipse.jem.beaninfo/beaninfo/org/eclipse/jem/internal/beaninfo/impl/PropertyDecoratorImpl.java b/plugins/org.eclipse.jem.beaninfo/beaninfo/org/eclipse/jem/internal/beaninfo/impl/PropertyDecoratorImpl.java
deleted file mode 100644
index ec6a406..0000000
--- a/plugins/org.eclipse.jem.beaninfo/beaninfo/org/eclipse/jem/internal/beaninfo/impl/PropertyDecoratorImpl.java
+++ /dev/null
@@ -1,1177 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2001, 2006 IBM Corporation and others.
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
- *
- * Contributors:
- * IBM Corporation - initial API and implementation
- *******************************************************************************/
-package org.eclipse.jem.internal.beaninfo.impl;
-/*
-
-
- */
-
-
-import java.util.Collection;
-
-import org.eclipse.emf.common.notify.Notification;
-import org.eclipse.emf.common.notify.NotificationChain;
-import org.eclipse.emf.common.util.EList;
-import org.eclipse.emf.ecore.EClass;
-import org.eclipse.emf.ecore.EClassifier;
-import org.eclipse.emf.ecore.EModelElement;
-import org.eclipse.emf.ecore.EStructuralFeature;
-import org.eclipse.emf.ecore.EcorePackage;
-import org.eclipse.emf.ecore.InternalEObject;
-import org.eclipse.emf.ecore.impl.ENotificationImpl;
-import org.eclipse.emf.ecore.util.EDataTypeUniqueEList;
-import org.eclipse.emf.ecore.util.InternalEList;
-
-import org.eclipse.jem.internal.beaninfo.BeaninfoPackage;
-import org.eclipse.jem.internal.beaninfo.ImplicitItem;
-import org.eclipse.jem.internal.beaninfo.PropertyDecorator;
-import org.eclipse.jem.java.Field;
-import org.eclipse.jem.java.JavaClass;
-import org.eclipse.jem.java.Method;
-/**
- * <!-- begin-user-doc -->
- * An implementation of the model object '<em><b>Property Decorator</b></em>'.
- * <!-- end-user-doc -->
- * <p>
- * The following features are implemented:
- * <ul>
- * <li>{@link org.eclipse.jem.internal.beaninfo.impl.PropertyDecoratorImpl#isBound <em>Bound</em>}</li>
- * <li>{@link org.eclipse.jem.internal.beaninfo.impl.PropertyDecoratorImpl#isConstrained <em>Constrained</em>}</li>
- * <li>{@link org.eclipse.jem.internal.beaninfo.impl.PropertyDecoratorImpl#isDesignTime <em>Design Time</em>}</li>
- * <li>{@link org.eclipse.jem.internal.beaninfo.impl.PropertyDecoratorImpl#isAlwaysIncompatible <em>Always Incompatible</em>}</li>
- * <li>{@link org.eclipse.jem.internal.beaninfo.impl.PropertyDecoratorImpl#getFilterFlags <em>Filter Flags</em>}</li>
- * <li>{@link org.eclipse.jem.internal.beaninfo.impl.PropertyDecoratorImpl#isFieldReadOnly <em>Field Read Only</em>}</li>
- * <li>{@link org.eclipse.jem.internal.beaninfo.impl.PropertyDecoratorImpl#getPropertyEditorClass <em>Property Editor Class</em>}</li>
- * <li>{@link org.eclipse.jem.internal.beaninfo.impl.PropertyDecoratorImpl#getReadMethod <em>Read Method</em>}</li>
- * <li>{@link org.eclipse.jem.internal.beaninfo.impl.PropertyDecoratorImpl#getWriteMethod <em>Write Method</em>}</li>
- * <li>{@link org.eclipse.jem.internal.beaninfo.impl.PropertyDecoratorImpl#getField <em>Field</em>}</li>
- * </ul>
- * </p>
- *
- * @generated
- */
-
-
-public class PropertyDecoratorImpl extends FeatureDecoratorImpl implements PropertyDecorator{
-
- /**
- * Bits for implicitly set features. This is internal, not meant for clients.
- */
- public static final long PROPERTY_EDITOR_CLASS_IMPLICIT = 0x1L;
- public static final long PROPERTY_TYPE_IMPLICIT = 0x2L;
- public static final long PROPERTY_READMETHOD_IMPLICIT = 0x4L;
- public static final long PROPERTY_WRITEMETHOD_IMPLICIT = 0x8L;
- public static final long PROPERTY_BOUND_IMPLICIT = 0x10L;
- public static final long PROPERTY_CONSTRAINED_IMPLICIT = 0x20L;
- public static final long PROPERTY_DESIGNTIME_IMPLICIT = 0x40L;
- public static final long PROPERTY_FIELD_IMPLICIT = 0x80L;
-
-
- /**
- * The default value of the '{@link #isBound() <em>Bound</em>}' attribute.
- * <!-- begin-user-doc -->
- * <!-- end-user-doc -->
- * @see #isBound()
- * @generated
- * @ordered
- */
- protected static final boolean BOUND_EDEFAULT = false;
-
- /**
- * The flag representing the value of the '{@link #isBound() <em>Bound</em>}' attribute.
- * <!-- begin-user-doc -->
- * <!-- end-user-doc -->
- * @see #isBound()
- * @generated
- * @ordered
- */
- protected static final int BOUND_EFLAG = 1 << 18;
-
- /**
- * The flag representing whether the Bound attribute has been set.
- * <!-- begin-user-doc -->
- * <!-- end-user-doc -->
- * @generated
- * @ordered
- */
- protected static final int BOUND_ESETFLAG = 1 << 19;
-
- /**
- * The default value of the '{@link #isConstrained() <em>Constrained</em>}' attribute.
- * <!-- begin-user-doc -->
- * <!-- end-user-doc -->
- * @see #isConstrained()
- * @generated
- * @ordered
- */
- protected static final boolean CONSTRAINED_EDEFAULT = false;
-
- /**
- * The flag representing the value of the '{@link #isConstrained() <em>Constrained</em>}' attribute.
- * <!-- begin-user-doc -->
- * <!-- end-user-doc -->
- * @see #isConstrained()
- * @generated
- * @ordered
- */
- protected static final int CONSTRAINED_EFLAG = 1 << 20;
-
- /**
- * The flag representing whether the Constrained attribute has been set.
- * <!-- begin-user-doc -->
- * <!-- end-user-doc -->
- * @generated
- * @ordered
- */
- protected static final int CONSTRAINED_ESETFLAG = 1 << 21;
-
- /**
- * The default value of the '{@link #isDesignTime() <em>Design Time</em>}' attribute.
- * <!-- begin-user-doc -->
- * <!-- end-user-doc -->
- * @see #isDesignTime()
- * @generated
- * @ordered
- */
- protected static final boolean DESIGN_TIME_EDEFAULT = false;
-
- /**
- * The flag representing the value of the '{@link #isDesignTime() <em>Design Time</em>}' attribute.
- * <!-- begin-user-doc -->
- * <!-- end-user-doc -->
- * @see #isDesignTime()
- * @generated
- * @ordered
- */
- protected static final int DESIGN_TIME_EFLAG = 1 << 22;
-
- /**
- * The flag representing whether the Design Time attribute has been set.
- * <!-- begin-user-doc -->
- * <!-- end-user-doc -->
- * @generated
- * @ordered
- */
- protected static final int DESIGN_TIME_ESETFLAG = 1 << 23;
-
- /**
- * The default value of the '{@link #isAlwaysIncompatible() <em>Always Incompatible</em>}' attribute.
- * <!-- begin-user-doc -->
- * <!-- end-user-doc -->
- * @see #isAlwaysIncompatible()
- * @generated
- * @ordered
- */
- protected static final boolean ALWAYS_INCOMPATIBLE_EDEFAULT = false;
-
- /**
- * The flag representing the value of the '{@link #isAlwaysIncompatible() <em>Always Incompatible</em>}' attribute.
- * <!-- begin-user-doc -->
- * <!-- end-user-doc -->
- * @see #isAlwaysIncompatible()
- * @generated
- * @ordered
- */
- protected static final int ALWAYS_INCOMPATIBLE_EFLAG = 1 << 24;
-
- /**
- * The cached value of the '{@link #getFilterFlags() <em>Filter Flags</em>}' attribute list.
- * <!-- begin-user-doc -->
- * <!-- end-user-doc -->
- * @see #getFilterFlags()
- * @generated
- * @ordered
- */
- protected EList filterFlags = null;
- /**
- * The default value of the '{@link #isFieldReadOnly() <em>Field Read Only</em>}' attribute.
- * <!-- begin-user-doc -->
- * <!-- end-user-doc -->
- * @see #isFieldReadOnly()
- * @generated
- * @ordered
- */
- protected static final boolean FIELD_READ_ONLY_EDEFAULT = false;
-
- /**
- * The flag representing the value of the '{@link #isFieldReadOnly() <em>Field Read Only</em>}' attribute.
- * <!-- begin-user-doc -->
- * <!-- end-user-doc -->
- * @see #isFieldReadOnly()
- * @generated
- * @ordered
- */
- protected static final int FIELD_READ_ONLY_EFLAG = 1 << 25;
-
- /**
- * The cached value of the '{@link #getPropertyEditorClass() <em>Property Editor Class</em>}' reference.
- * <!-- begin-user-doc -->
- * <!-- end-user-doc -->
- * @see #getPropertyEditorClass()
- * @generated
- * @ordered
- */
- protected JavaClass propertyEditorClass = null;
- /**
- * The cached value of the '{@link #getReadMethod() <em>Read Method</em>}' reference.
- * <!-- begin-user-doc -->
- * <!-- end-user-doc -->
- * @see #getReadMethod()
- * @generated
- * @ordered
- */
- protected Method readMethod = null;
- /**
- * The flag representing whether the Read Method reference has been set.
- * <!-- begin-user-doc -->
- * <!-- end-user-doc -->
- * @generated
- * @ordered
- */
- protected static final int READ_METHOD_ESETFLAG = 1 << 26;
-
- /**
- * The cached value of the '{@link #getWriteMethod() <em>Write Method</em>}' reference.
- * <!-- begin-user-doc -->
- * <!-- end-user-doc -->
- * @see #getWriteMethod()
- * @generated
- * @ordered
- */
- protected Method writeMethod = null;
-
- /**
- * The flag representing whether the Write Method reference has been set.
- * <!-- begin-user-doc -->
- * <!-- end-user-doc -->
- * @generated
- * @ordered
- */
- protected static final int WRITE_METHOD_ESETFLAG = 1 << 27;
-
- /**
- * The cached value of the '{@link #getField() <em>Field</em>}' reference.
- * <!-- begin-user-doc -->
- * <!-- end-user-doc -->
- * @see #getField()
- * @generated
- * @ordered
- */
- protected Field field = null;
-
- /**
- * The flag representing whether the Field reference has been set.
- * <!-- begin-user-doc -->
- * <!-- end-user-doc -->
- * @generated
- * @ordered
- */
- protected static final int FIELD_ESETFLAG = 1 << 28;
-
- /**
- * This it the property type. If null, then it will
- * query against model element owner.
- *
- * @since 1.2.0
- */
- protected EClassifier propertyType;
-
- /**
- * <!-- begin-user-doc -->
- * <!-- end-user-doc -->
- * @generated
- */
- protected PropertyDecoratorImpl() {
- super();
- }
-
- /**
- * <!-- begin-user-doc -->
- * <!-- end-user-doc -->
- * @generated
- */
- protected EClass eStaticClass() {
- return BeaninfoPackage.eINSTANCE.getPropertyDecorator();
- }
-
- /**
- * <!-- begin-user-doc -->
- * <!-- end-user-doc -->
- * @generated
- */
- public boolean isBound() {
- return (eFlags & BOUND_EFLAG) != 0;
- }
-
- public EClassifier getPropertyType() {
- if (propertyType == null) {
- EStructuralFeature feature = (EStructuralFeature) getEModelElement();
- return (feature != null) ? feature.getEType() : null;
- } else
- return propertyType;
- }
-
- public void setPropertyType(EClassifier propertyType) {
- this.propertyType = propertyType;
- }
-
- /**
- * <!-- begin-user-doc -->
- * <!-- end-user-doc -->
- * @generated
- */
- public void setBound(boolean newBound) {
- boolean oldBound = (eFlags & BOUND_EFLAG) != 0;
- if (newBound) eFlags |= BOUND_EFLAG; else eFlags &= ~BOUND_EFLAG;
- boolean oldBoundESet = (eFlags & BOUND_ESETFLAG) != 0;
- eFlags |= BOUND_ESETFLAG;
- if (eNotificationRequired())
- eNotify(new ENotificationImpl(this, Notification.SET, BeaninfoPackage.PROPERTY_DECORATOR__BOUND, oldBound, newBound, !oldBoundESet));
- }
-
- /**
- * <!-- begin-user-doc -->
- * <!-- end-user-doc -->
- * @generated
- */
- public void unsetBound() {
- boolean oldBound = (eFlags & BOUND_EFLAG) != 0;
- boolean oldBoundESet = (eFlags & BOUND_ESETFLAG) != 0;
- if (BOUND_EDEFAULT) eFlags |= BOUND_EFLAG; else eFlags &= ~BOUND_EFLAG;
- eFlags &= ~BOUND_ESETFLAG;
- if (eNotificationRequired())
- eNotify(new ENotificationImpl(this, Notification.UNSET, BeaninfoPackage.PROPERTY_DECORATOR__BOUND, oldBound, BOUND_EDEFAULT, oldBoundESet));
- }
-
- /**
- * <!-- begin-user-doc -->
- * <!-- end-user-doc -->
- * @generated
- */
- public boolean isSetBound() {
- return (eFlags & BOUND_ESETFLAG) != 0;
- }
-
- /**
- * <!-- begin-user-doc -->
- * <!-- end-user-doc -->
- * @generated
- */
- public boolean isConstrained() {
- return (eFlags & CONSTRAINED_EFLAG) != 0;
- }
-
- /**
- * <!-- begin-user-doc -->
- * <!-- end-user-doc -->
- * @generated
- */
- public void setConstrained(boolean newConstrained) {
- boolean oldConstrained = (eFlags & CONSTRAINED_EFLAG) != 0;
- if (newConstrained) eFlags |= CONSTRAINED_EFLAG; else eFlags &= ~CONSTRAINED_EFLAG;
- boolean oldConstrainedESet = (eFlags & CONSTRAINED_ESETFLAG) != 0;
- eFlags |= CONSTRAINED_ESETFLAG;
- if (eNotificationRequired())
- eNotify(new ENotificationImpl(this, Notification.SET, BeaninfoPackage.PROPERTY_DECORATOR__CONSTRAINED, oldConstrained, newConstrained, !oldConstrainedESet));
- }
-
- /**
- * <!-- begin-user-doc -->
- * <!-- end-user-doc -->
- * @generated
- */
- public void unsetConstrained() {
- boolean oldConstrained = (eFlags & CONSTRAINED_EFLAG) != 0;
- boolean oldConstrainedESet = (eFlags & CONSTRAINED_ESETFLAG) != 0;
- if (CONSTRAINED_EDEFAULT) eFlags |= CONSTRAINED_EFLAG; else eFlags &= ~CONSTRAINED_EFLAG;
- eFlags &= ~CONSTRAINED_ESETFLAG;
- if (eNotificationRequired())
- eNotify(new ENotificationImpl(this, Notification.UNSET, BeaninfoPackage.PROPERTY_DECORATOR__CONSTRAINED, oldConstrained, CONSTRAINED_EDEFAULT, oldConstrainedESet));
- }
-
- /**
- * <!-- begin-user-doc -->
- * <!-- end-user-doc -->
- * @generated
- */
- public boolean isSetConstrained() {
- return (eFlags & CONSTRAINED_ESETFLAG) != 0;
- }
-
- /**
- * <!-- begin-user-doc -->
- * <!-- end-user-doc -->
- * @generated
- */
- public boolean isDesignTime() {
- return (eFlags & DESIGN_TIME_EFLAG) != 0;
- }
-
- /**
- * <!-- begin-user-doc -->
- * <!-- end-user-doc -->
- * @generated
- */
- public void setDesignTime(boolean newDesignTime) {
- boolean oldDesignTime = (eFlags & DESIGN_TIME_EFLAG) != 0;
- if (newDesignTime) eFlags |= DESIGN_TIME_EFLAG; else eFlags &= ~DESIGN_TIME_EFLAG;
- boolean oldDesignTimeESet = (eFlags & DESIGN_TIME_ESETFLAG) != 0;
- eFlags |= DESIGN_TIME_ESETFLAG;
- if (eNotificationRequired())
- eNotify(new ENotificationImpl(this, Notification.SET, BeaninfoPackage.PROPERTY_DECORATOR__DESIGN_TIME, oldDesignTime, newDesignTime, !oldDesignTimeESet));
- }
-
- /**
- * <!-- begin-user-doc -->
- * <!-- end-user-doc -->
- * @generated
- */
- public void unsetDesignTime() {
- boolean oldDesignTime = (eFlags & DESIGN_TIME_EFLAG) != 0;
- boolean oldDesignTimeESet = (eFlags & DESIGN_TIME_ESETFLAG) != 0;
- if (DESIGN_TIME_EDEFAULT) eFlags |= DESIGN_TIME_EFLAG; else eFlags &= ~DESIGN_TIME_EFLAG;
- eFlags &= ~DESIGN_TIME_ESETFLAG;
- if (eNotificationRequired())
- eNotify(new ENotificationImpl(this, Notification.UNSET, BeaninfoPackage.PROPERTY_DECORATOR__DESIGN_TIME, oldDesignTime, DESIGN_TIME_EDEFAULT, oldDesignTimeESet));
- }
-
- /**
- * <!-- begin-user-doc -->
- * <!-- end-user-doc -->
- * @generated
- */
- public boolean isSetDesignTime() {
- return (eFlags & DESIGN_TIME_ESETFLAG) != 0;
- }
-
- /**
- * <!-- begin-user-doc -->
- * <!-- end-user-doc -->
- * @generated
- */
- public boolean isAlwaysIncompatible() {
- return (eFlags & ALWAYS_INCOMPATIBLE_EFLAG) != 0;
- }
-
- /**
- * <!-- begin-user-doc -->
- * <!-- end-user-doc -->
- * @generated
- */
- public void setAlwaysIncompatible(boolean newAlwaysIncompatible) {
- boolean oldAlwaysIncompatible = (eFlags & ALWAYS_INCOMPATIBLE_EFLAG) != 0;
- if (newAlwaysIncompatible) eFlags |= ALWAYS_INCOMPATIBLE_EFLAG; else eFlags &= ~ALWAYS_INCOMPATIBLE_EFLAG;
- if (eNotificationRequired())
- eNotify(new ENotificationImpl(this, Notification.SET, BeaninfoPackage.PROPERTY_DECORATOR__ALWAYS_INCOMPATIBLE, oldAlwaysIncompatible, newAlwaysIncompatible));
- }
-
- /**
- * <!-- begin-user-doc -->
- * <!-- end-user-doc -->
- * @generated
- */
- public EList getFilterFlags() {
- if (filterFlags == null) {
- filterFlags = new EDataTypeUniqueEList(String.class, this, BeaninfoPackage.PROPERTY_DECORATOR__FILTER_FLAGS);
- }
- return filterFlags;
- }
-
- /**
- * <!-- begin-user-doc -->
- * <!-- end-user-doc -->
- * @generated
- */
- public boolean isFieldReadOnly() {
- return (eFlags & FIELD_READ_ONLY_EFLAG) != 0;
- }
-
- /**
- * <!-- begin-user-doc -->
- * <!-- end-user-doc -->
- * @generated
- */
- public void setFieldReadOnly(boolean newFieldReadOnly) {
- boolean oldFieldReadOnly = (eFlags & FIELD_READ_ONLY_EFLAG) != 0;
- if (newFieldReadOnly) eFlags |= FIELD_READ_ONLY_EFLAG; else eFlags &= ~FIELD_READ_ONLY_EFLAG;
- if (eNotificationRequired())
- eNotify(new ENotificationImpl(this, Notification.SET, BeaninfoPackage.PROPERTY_DECORATOR__FIELD_READ_ONLY, oldFieldReadOnly, newFieldReadOnly));
- }
-
- /**
- * <!-- begin-user-doc -->
- * <!-- end-user-doc -->
- * @generated
- */
- public JavaClass getPropertyEditorClass() {
- if (propertyEditorClass != null && propertyEditorClass.eIsProxy()) {
- JavaClass oldPropertyEditorClass = propertyEditorClass;
- propertyEditorClass = (JavaClass)eResolveProxy((InternalEObject)propertyEditorClass);
- if (propertyEditorClass != oldPropertyEditorClass) {
- if (eNotificationRequired())
- eNotify(new ENotificationImpl(this, Notification.RESOLVE, BeaninfoPackage.PROPERTY_DECORATOR__PROPERTY_EDITOR_CLASS, oldPropertyEditorClass, propertyEditorClass));
- }
- }
- return propertyEditorClass;
- }
-
- /**
- * <!-- begin-user-doc -->
- * <!-- end-user-doc -->
- * @generated
- */
- public void setPropertyEditorClass(JavaClass newPropertyEditorClass) {
- JavaClass oldPropertyEditorClass = propertyEditorClass;
- propertyEditorClass = newPropertyEditorClass;
- if (eNotificationRequired())
- eNotify(new ENotificationImpl(this, Notification.SET, BeaninfoPackage.PROPERTY_DECORATOR__PROPERTY_EDITOR_CLASS, oldPropertyEditorClass, propertyEditorClass));
- }
-
- /**
- * <!-- begin-user-doc -->
- * <!-- end-user-doc -->
- * @generated
- */
- public Method getReadMethod() {
- if (readMethod != null && readMethod.eIsProxy()) {
- Method oldReadMethod = readMethod;
- readMethod = (Method)eResolveProxy((InternalEObject)readMethod);
- if (readMethod != oldReadMethod) {
- if (eNotificationRequired())
- eNotify(new ENotificationImpl(this, Notification.RESOLVE, BeaninfoPackage.PROPERTY_DECORATOR__READ_METHOD, oldReadMethod, readMethod));
- }
- }
- return readMethod;
- }
-
- /**
- * <!-- begin-user-doc -->
- * <!-- end-user-doc -->
- * @generated
- */
- public void setReadMethod(Method newReadMethod) {
- Method oldReadMethod = readMethod;
- readMethod = newReadMethod;
- boolean oldReadMethodESet = (eFlags & READ_METHOD_ESETFLAG) != 0;
- eFlags |= READ_METHOD_ESETFLAG;
- if (eNotificationRequired())
- eNotify(new ENotificationImpl(this, Notification.SET, BeaninfoPackage.PROPERTY_DECORATOR__READ_METHOD, oldReadMethod, readMethod, !oldReadMethodESet));
- }
-
- /**
- * <!-- begin-user-doc -->
- * <!-- end-user-doc -->
- * @generated
- */
- public void unsetReadMethod() {
- Method oldReadMethod = readMethod;
- boolean oldReadMethodESet = (eFlags & READ_METHOD_ESETFLAG) != 0;
- readMethod = null;
- eFlags &= ~READ_METHOD_ESETFLAG;
- if (eNotificationRequired())
- eNotify(new ENotificationImpl(this, Notification.UNSET, BeaninfoPackage.PROPERTY_DECORATOR__READ_METHOD, oldReadMethod, null, oldReadMethodESet));
- }
-
- /**
- * <!-- begin-user-doc -->
- * <!-- end-user-doc -->
- * @generated
- */
- public boolean isSetReadMethod() {
- return (eFlags & READ_METHOD_ESETFLAG) != 0;
- }
-
- /**
- * <!-- begin-user-doc -->
- * <!-- end-user-doc -->
- * @generated
- */
- public Method getWriteMethod() {
- if (writeMethod != null && writeMethod.eIsProxy()) {
- Method oldWriteMethod = writeMethod;
- writeMethod = (Method)eResolveProxy((InternalEObject)writeMethod);
- if (writeMethod != oldWriteMethod) {
- if (eNotificationRequired())
- eNotify(new ENotificationImpl(this, Notification.RESOLVE, BeaninfoPackage.PROPERTY_DECORATOR__WRITE_METHOD, oldWriteMethod, writeMethod));
- }
- }
- return writeMethod;
- }
-
- /**
- * <!-- begin-user-doc -->
- * <!-- end-user-doc -->
- * @generated
- */
- public void setWriteMethod(Method newWriteMethod) {
- Method oldWriteMethod = writeMethod;
- writeMethod = newWriteMethod;
- boolean oldWriteMethodESet = (eFlags & WRITE_METHOD_ESETFLAG) != 0;
- eFlags |= WRITE_METHOD_ESETFLAG;
- if (eNotificationRequired())
- eNotify(new ENotificationImpl(this, Notification.SET, BeaninfoPackage.PROPERTY_DECORATOR__WRITE_METHOD, oldWriteMethod, writeMethod, !oldWriteMethodESet));
- }
-
- /**
- * <!-- begin-user-doc -->
- * <!-- end-user-doc -->
- * @generated
- */
- public void unsetWriteMethod() {
- Method oldWriteMethod = writeMethod;
- boolean oldWriteMethodESet = (eFlags & WRITE_METHOD_ESETFLAG) != 0;
- writeMethod = null;
- eFlags &= ~WRITE_METHOD_ESETFLAG;
- if (eNotificationRequired())
- eNotify(new ENotificationImpl(this, Notification.UNSET, BeaninfoPackage.PROPERTY_DECORATOR__WRITE_METHOD, oldWriteMethod, null, oldWriteMethodESet));
- }
-
- /**
- * <!-- begin-user-doc -->
- * <!-- end-user-doc -->
- * @generated
- */
- public boolean isSetWriteMethod() {
- return (eFlags & WRITE_METHOD_ESETFLAG) != 0;
- }
-
- /**
- * <!-- begin-user-doc -->
- * <!-- end-user-doc -->
- * @generated
- */
- public Field getField() {
- if (field != null && field.eIsProxy()) {
- Field oldField = field;
- field = (Field)eResolveProxy((InternalEObject)field);
- if (field != oldField) {
- if (eNotificationRequired())
- eNotify(new ENotificationImpl(this, Notification.RESOLVE, BeaninfoPackage.PROPERTY_DECORATOR__FIELD, oldField, field));
- }
- }
- return field;
- }
-
- /**
- * <!-- begin-user-doc -->
- * <!-- end-user-doc -->
- * @generated
- */
- public Field basicGetField() {
- return field;
- }
-
- /**
- * <!-- begin-user-doc -->
- * <!-- end-user-doc -->
- * @generated
- */
- public void setField(Field newField) {
- Field oldField = field;
- field = newField;
- boolean oldFieldESet = (eFlags & FIELD_ESETFLAG) != 0;
- eFlags |= FIELD_ESETFLAG;
- if (eNotificationRequired())
- eNotify(new ENotificationImpl(this, Notification.SET, BeaninfoPackage.PROPERTY_DECORATOR__FIELD, oldField, field, !oldFieldESet));
- }
-
- /**
- * <!-- begin-user-doc -->
- * <!-- end-user-doc -->
- * @generated
- */
- public void unsetField() {
- Field oldField = field;
- boolean oldFieldESet = (eFlags & FIELD_ESETFLAG) != 0;
- field = null;
- eFlags &= ~FIELD_ESETFLAG;
- if (eNotificationRequired())
- eNotify(new ENotificationImpl(this, Notification.UNSET, BeaninfoPackage.PROPERTY_DECORATOR__FIELD, oldField, null, oldFieldESet));
- }
-
- /**
- * <!-- begin-user-doc -->
- * <!-- end-user-doc -->
- * @generated
- */
- public boolean isSetField() {
- return (eFlags & FIELD_ESETFLAG) != 0;
- }
-
- /**
- * <!-- begin-user-doc -->
- * <!-- end-user-doc -->
- * @generated
- */
- public String toString() {
- if (eIsProxy()) return super.toString();
-
- StringBuffer result = new StringBuffer(super.toString());
- result.append(" (bound: ");
- if ((eFlags & BOUND_ESETFLAG) != 0) result.append((eFlags & BOUND_EFLAG) != 0); else result.append("<unset>");
- result.append(", constrained: ");
- if ((eFlags & CONSTRAINED_ESETFLAG) != 0) result.append((eFlags & CONSTRAINED_EFLAG) != 0); else result.append("<unset>");
- result.append(", designTime: ");
- if ((eFlags & DESIGN_TIME_ESETFLAG) != 0) result.append((eFlags & DESIGN_TIME_EFLAG) != 0); else result.append("<unset>");
- result.append(", alwaysIncompatible: ");
- result.append((eFlags & ALWAYS_INCOMPATIBLE_EFLAG) != 0);
- result.append(", filterFlags: ");
- result.append(filterFlags);
- result.append(", fieldReadOnly: ");
- result.append((eFlags & FIELD_READ_ONLY_EFLAG) != 0);
- result.append(')');
- return result.toString();
- }
-
- /**
- * <!-- begin-user-doc -->
- * <!-- end-user-doc -->
- * @generated
- */
- public JavaClass basicGetPropertyEditorClass() {
- return propertyEditorClass;
- }
-
- /**
- * <!-- begin-user-doc -->
- * <!-- end-user-doc -->
- * @generated
- */
- public Method basicGetReadMethod() {
- return readMethod;
- }
-
- /**
- * <!-- begin-user-doc -->
- * <!-- end-user-doc -->
- * @generated
- */
- public Method basicGetWriteMethod() {
- return writeMethod;
- }
-
- /**
- * <!-- begin-user-doc -->
- * <!-- end-user-doc -->
- * @generated
- */
- public NotificationChain eInverseAdd(InternalEObject otherEnd, int featureID, Class baseClass, NotificationChain msgs) {
- if (featureID >= 0) {
- switch (eDerivedStructuralFeatureID(featureID, baseClass)) {
- case BeaninfoPackage.PROPERTY_DECORATOR__EANNOTATIONS:
- return ((InternalEList)getEAnnotations()).basicAdd(otherEnd, msgs);
- case BeaninfoPackage.PROPERTY_DECORATOR__EMODEL_ELEMENT:
- if (eContainer != null)
- msgs = eBasicRemoveFromContainer(msgs);
- return eBasicSetContainer(otherEnd, BeaninfoPackage.PROPERTY_DECORATOR__EMODEL_ELEMENT, msgs);
- default:
- return eDynamicInverseAdd(otherEnd, featureID, baseClass, msgs);
- }
- }
- if (eContainer != null)
- msgs = eBasicRemoveFromContainer(msgs);
- return eBasicSetContainer(otherEnd, featureID, msgs);
- }
-
- /**
- * <!-- begin-user-doc -->
- * <!-- end-user-doc -->
- * @generated
- */
- public NotificationChain eInverseRemove(InternalEObject otherEnd, int featureID, Class baseClass, NotificationChain msgs) {
- if (featureID >= 0) {
- switch (eDerivedStructuralFeatureID(featureID, baseClass)) {
- case BeaninfoPackage.PROPERTY_DECORATOR__EANNOTATIONS:
- return ((InternalEList)getEAnnotations()).basicRemove(otherEnd, msgs);
- case BeaninfoPackage.PROPERTY_DECORATOR__DETAILS:
- return ((InternalEList)getDetails()).basicRemove(otherEnd, msgs);
- case BeaninfoPackage.PROPERTY_DECORATOR__EMODEL_ELEMENT:
- return eBasicSetContainer(null, BeaninfoPackage.PROPERTY_DECORATOR__EMODEL_ELEMENT, msgs);
- case BeaninfoPackage.PROPERTY_DECORATOR__CONTENTS:
- return ((InternalEList)getContents()).basicRemove(otherEnd, msgs);
- case BeaninfoPackage.PROPERTY_DECORATOR__ATTRIBUTES:
- return ((InternalEList)getAttributes()).basicRemove(otherEnd, msgs);
- default:
- return eDynamicInverseRemove(otherEnd, featureID, baseClass, msgs);
- }
- }
- return eBasicSetContainer(null, featureID, msgs);
- }
-
- /**
- * <!-- begin-user-doc -->
- * <!-- end-user-doc -->
- * @generated
- */
- public NotificationChain eBasicRemoveFromContainer(NotificationChain msgs) {
- if (eContainerFeatureID() >= 0) {
- switch (eContainerFeatureID()) {
- case BeaninfoPackage.PROPERTY_DECORATOR__EMODEL_ELEMENT:
- return eContainer.eInverseRemove(this, EcorePackage.EMODEL_ELEMENT__EANNOTATIONS, EModelElement.class, msgs);
- default:
- return eDynamicBasicRemoveFromContainer(msgs);
- }
- }
- return eContainer.eInverseRemove(this, EOPPOSITE_FEATURE_BASE - eContainerFeatureID(), null, msgs);
- }
-
- /**
- * <!-- begin-user-doc -->
- * <!-- end-user-doc -->
- * @generated
- */
- public Object eGet(EStructuralFeature eFeature, boolean resolve) {
- switch (eDerivedStructuralFeatureID(eFeature)) {
- case BeaninfoPackage.PROPERTY_DECORATOR__EANNOTATIONS:
- return getEAnnotations();
- case BeaninfoPackage.PROPERTY_DECORATOR__SOURCE:
- return getSource();
- case BeaninfoPackage.PROPERTY_DECORATOR__DETAILS:
- return getDetails();
- case BeaninfoPackage.PROPERTY_DECORATOR__EMODEL_ELEMENT:
- return getEModelElement();
- case BeaninfoPackage.PROPERTY_DECORATOR__CONTENTS:
- return getContents();
- case BeaninfoPackage.PROPERTY_DECORATOR__REFERENCES:
- return getReferences();
- case BeaninfoPackage.PROPERTY_DECORATOR__DISPLAY_NAME:
- return getDisplayName();
- case BeaninfoPackage.PROPERTY_DECORATOR__SHORT_DESCRIPTION:
- return getShortDescription();
- case BeaninfoPackage.PROPERTY_DECORATOR__CATEGORY:
- return getCategory();
- case BeaninfoPackage.PROPERTY_DECORATOR__EXPERT:
- return isExpert() ? Boolean.TRUE : Boolean.FALSE;
- case BeaninfoPackage.PROPERTY_DECORATOR__HIDDEN:
- return isHidden() ? Boolean.TRUE : Boolean.FALSE;
- case BeaninfoPackage.PROPERTY_DECORATOR__PREFERRED:
- return isPreferred() ? Boolean.TRUE : Boolean.FALSE;
- case BeaninfoPackage.PROPERTY_DECORATOR__MERGE_INTROSPECTION:
- return isMergeIntrospection() ? Boolean.TRUE : Boolean.FALSE;
- case BeaninfoPackage.PROPERTY_DECORATOR__ATTRIBUTES_EXPLICIT_EMPTY:
- return isAttributesExplicitEmpty() ? Boolean.TRUE : Boolean.FALSE;
- case BeaninfoPackage.PROPERTY_DECORATOR__IMPLICITLY_SET_BITS:
- return new Long(getImplicitlySetBits());
- case BeaninfoPackage.PROPERTY_DECORATOR__IMPLICIT_DECORATOR_FLAG:
- return getImplicitDecoratorFlag();
- case BeaninfoPackage.PROPERTY_DECORATOR__ATTRIBUTES:
- return getAttributes();
- case BeaninfoPackage.PROPERTY_DECORATOR__BOUND:
- return isBound() ? Boolean.TRUE : Boolean.FALSE;
- case BeaninfoPackage.PROPERTY_DECORATOR__CONSTRAINED:
- return isConstrained() ? Boolean.TRUE : Boolean.FALSE;
- case BeaninfoPackage.PROPERTY_DECORATOR__DESIGN_TIME:
- return isDesignTime() ? Boolean.TRUE : Boolean.FALSE;
- case BeaninfoPackage.PROPERTY_DECORATOR__ALWAYS_INCOMPATIBLE:
- return isAlwaysIncompatible() ? Boolean.TRUE : Boolean.FALSE;
- case BeaninfoPackage.PROPERTY_DECORATOR__FILTER_FLAGS:
- return getFilterFlags();
- case BeaninfoPackage.PROPERTY_DECORATOR__FIELD_READ_ONLY:
- return isFieldReadOnly() ? Boolean.TRUE : Boolean.FALSE;
- case BeaninfoPackage.PROPERTY_DECORATOR__PROPERTY_EDITOR_CLASS:
- if (resolve) return getPropertyEditorClass();
- return basicGetPropertyEditorClass();
- case BeaninfoPackage.PROPERTY_DECORATOR__READ_METHOD:
- if (resolve) return getReadMethod();
- return basicGetReadMethod();
- case BeaninfoPackage.PROPERTY_DECORATOR__WRITE_METHOD:
- if (resolve) return getWriteMethod();
- return basicGetWriteMethod();
- case BeaninfoPackage.PROPERTY_DECORATOR__FIELD:
- if (resolve) return getField();
- return basicGetField();
- }
- return eDynamicGet(eFeature, resolve);
- }
-
- /**
- * <!-- begin-user-doc -->
- * <!-- end-user-doc -->
- * @generated
- */
- public void eSet(EStructuralFeature eFeature, Object newValue) {
- switch (eDerivedStructuralFeatureID(eFeature)) {
- case BeaninfoPackage.PROPERTY_DECORATOR__EANNOTATIONS:
- getEAnnotations().clear();
- getEAnnotations().addAll((Collection)newValue);
- return;
- case BeaninfoPackage.PROPERTY_DECORATOR__SOURCE:
- setSource((String)newValue);
- return;
- case BeaninfoPackage.PROPERTY_DECORATOR__DETAILS:
- getDetails().clear();
- getDetails().addAll((Collection)newValue);
- return;
- case BeaninfoPackage.PROPERTY_DECORATOR__EMODEL_ELEMENT:
- setEModelElement((EModelElement)newValue);
- return;
- case BeaninfoPackage.PROPERTY_DECORATOR__CONTENTS:
- getContents().clear();
- getContents().addAll((Collection)newValue);
- return;
- case BeaninfoPackage.PROPERTY_DECORATOR__REFERENCES:
- getReferences().clear();
- getReferences().addAll((Collection)newValue);
- return;
- case BeaninfoPackage.PROPERTY_DECORATOR__DISPLAY_NAME:
- setDisplayName((String)newValue);
- return;
- case BeaninfoPackage.PROPERTY_DECORATOR__SHORT_DESCRIPTION:
- setShortDescription((String)newValue);
- return;
- case BeaninfoPackage.PROPERTY_DECORATOR__CATEGORY:
- setCategory((String)newValue);
- return;
- case BeaninfoPackage.PROPERTY_DECORATOR__EXPERT:
- setExpert(((Boolean)newValue).booleanValue());
- return;
- case BeaninfoPackage.PROPERTY_DECORATOR__HIDDEN:
- setHidden(((Boolean)newValue).booleanValue());
- return;
- case BeaninfoPackage.PROPERTY_DECORATOR__PREFERRED:
- setPreferred(((Boolean)newValue).booleanValue());
- return;
- case BeaninfoPackage.PROPERTY_DECORATOR__MERGE_INTROSPECTION:
- setMergeIntrospection(((Boolean)newValue).booleanValue());
- return;
- case BeaninfoPackage.PROPERTY_DECORATOR__ATTRIBUTES_EXPLICIT_EMPTY:
- setAttributesExplicitEmpty(((Boolean)newValue).booleanValue());
- return;
- case BeaninfoPackage.PROPERTY_DECORATOR__IMPLICITLY_SET_BITS:
- setImplicitlySetBits(((Long)newValue).longValue());
- return;
- case BeaninfoPackage.PROPERTY_DECORATOR__IMPLICIT_DECORATOR_FLAG:
- setImplicitDecoratorFlag((ImplicitItem)newValue);
- return;
- case BeaninfoPackage.PROPERTY_DECORATOR__ATTRIBUTES:
- getAttributes().clear();
- getAttributes().addAll((Collection)newValue);
- return;
- case BeaninfoPackage.PROPERTY_DECORATOR__BOUND:
- setBound(((Boolean)newValue).booleanValue());
- return;
- case BeaninfoPackage.PROPERTY_DECORATOR__CONSTRAINED:
- setConstrained(((Boolean)newValue).booleanValue());
- return;
- case BeaninfoPackage.PROPERTY_DECORATOR__DESIGN_TIME:
- setDesignTime(((Boolean)newValue).booleanValue());
- return;
- case BeaninfoPackage.PROPERTY_DECORATOR__ALWAYS_INCOMPATIBLE:
- setAlwaysIncompatible(((Boolean)newValue).booleanValue());
- return;
- case BeaninfoPackage.PROPERTY_DECORATOR__FILTER_FLAGS:
- getFilterFlags().clear();
- getFilterFlags().addAll((Collection)newValue);
- return;
- case BeaninfoPackage.PROPERTY_DECORATOR__FIELD_READ_ONLY:
- setFieldReadOnly(((Boolean)newValue).booleanValue());
- return;
- case BeaninfoPackage.PROPERTY_DECORATOR__PROPERTY_EDITOR_CLASS:
- setPropertyEditorClass((JavaClass)newValue);
- return;
- case BeaninfoPackage.PROPERTY_DECORATOR__READ_METHOD:
- setReadMethod((Method)newValue);
- return;
- case BeaninfoPackage.PROPERTY_DECORATOR__WRITE_METHOD:
- setWriteMethod((Method)newValue);
- return;
- case BeaninfoPackage.PROPERTY_DECORATOR__FIELD:
- setField((Field)newValue);
- return;
- }
- eDynamicSet(eFeature, newValue);
- }
-
- /**
- * <!-- begin-user-doc -->
- * <!-- end-user-doc -->
- * @generated
- */
- public void eUnset(EStructuralFeature eFeature) {
- switch (eDerivedStructuralFeatureID(eFeature)) {
- case BeaninfoPackage.PROPERTY_DECORATOR__EANNOTATIONS:
- getEAnnotations().clear();
- return;
- case BeaninfoPackage.PROPERTY_DECORATOR__SOURCE:
- setSource(SOURCE_EDEFAULT);
- return;
- case BeaninfoPackage.PROPERTY_DECORATOR__DETAILS:
- getDetails().clear();
- return;
- case BeaninfoPackage.PROPERTY_DECORATOR__EMODEL_ELEMENT:
- setEModelElement((EModelElement)null);
- return;
- case BeaninfoPackage.PROPERTY_DECORATOR__CONTENTS:
- getContents().clear();
- return;
- case BeaninfoPackage.PROPERTY_DECORATOR__REFERENCES:
- getReferences().clear();
- return;
- case BeaninfoPackage.PROPERTY_DECORATOR__DISPLAY_NAME:
- unsetDisplayName();
- return;
- case BeaninfoPackage.PROPERTY_DECORATOR__SHORT_DESCRIPTION:
- unsetShortDescription();
- return;
- case BeaninfoPackage.PROPERTY_DECORATOR__CATEGORY:
- setCategory(CATEGORY_EDEFAULT);
- return;
- case BeaninfoPackage.PROPERTY_DECORATOR__EXPERT:
- unsetExpert();
- return;
- case BeaninfoPackage.PROPERTY_DECORATOR__HIDDEN:
- unsetHidden();
- return;
- case BeaninfoPackage.PROPERTY_DECORATOR__PREFERRED:
- unsetPreferred();
- return;
- case BeaninfoPackage.PROPERTY_DECORATOR__MERGE_INTROSPECTION:
- setMergeIntrospection(MERGE_INTROSPECTION_EDEFAULT);
- return;
- case BeaninfoPackage.PROPERTY_DECORATOR__ATTRIBUTES_EXPLICIT_EMPTY:
- setAttributesExplicitEmpty(ATTRIBUTES_EXPLICIT_EMPTY_EDEFAULT);
- return;
- case BeaninfoPackage.PROPERTY_DECORATOR__IMPLICITLY_SET_BITS:
- setImplicitlySetBits(IMPLICITLY_SET_BITS_EDEFAULT);
- return;
- case BeaninfoPackage.PROPERTY_DECORATOR__IMPLICIT_DECORATOR_FLAG:
- setImplicitDecoratorFlag(IMPLICIT_DECORATOR_FLAG_EDEFAULT);
- return;
- case BeaninfoPackage.PROPERTY_DECORATOR__ATTRIBUTES:
- getAttributes().clear();
- return;
- case BeaninfoPackage.PROPERTY_DECORATOR__BOUND:
- unsetBound();
- return;
- case BeaninfoPackage.PROPERTY_DECORATOR__CONSTRAINED:
- unsetConstrained();
- return;
- case BeaninfoPackage.PROPERTY_DECORATOR__DESIGN_TIME:
- unsetDesignTime();
- return;
- case BeaninfoPackage.PROPERTY_DECORATOR__ALWAYS_INCOMPATIBLE:
- setAlwaysIncompatible(ALWAYS_INCOMPATIBLE_EDEFAULT);
- return;
- case BeaninfoPackage.PROPERTY_DECORATOR__FILTER_FLAGS:
- getFilterFlags().clear();
- return;
- case BeaninfoPackage.PROPERTY_DECORATOR__FIELD_READ_ONLY:
- setFieldReadOnly(FIELD_READ_ONLY_EDEFAULT);
- return;
- case BeaninfoPackage.PROPERTY_DECORATOR__PROPERTY_EDITOR_CLASS:
- setPropertyEditorClass((JavaClass)null);
- return;
- case BeaninfoPackage.PROPERTY_DECORATOR__READ_METHOD:
- unsetReadMethod();
- return;
- case BeaninfoPackage.PROPERTY_DECORATOR__WRITE_METHOD:
- unsetWriteMethod();
- return;
- case BeaninfoPackage.PROPERTY_DECORATOR__FIELD:
- unsetField();
- return;
- }
- eDynamicUnset(eFeature);
- }
-
- /* (non-Javadoc)
- * @see org.eclipse.emf.ecore.EObject#eIsSet(org.eclipse.emf.ecore.EStructuralFeature)
- */
- public boolean eIsSet(EStructuralFeature eFeature) {
- switch (eDerivedStructuralFeatureID(eFeature)) {
- case BeaninfoPackage.PROPERTY_DECORATOR__SOURCE:
- return isSourceSet(); // Override so that if set to the same as classname, then it is considered not set.
- default:
- return eIsSetGen(eFeature);
- }
- }
-
- /**
- * <!-- begin-user-doc -->
- * <!-- end-user-doc -->
- * @generated
- */
- public boolean eIsSetGen(EStructuralFeature eFeature) {
- switch (eDerivedStructuralFeatureID(eFeature)) {
- case BeaninfoPackage.PROPERTY_DECORATOR__EANNOTATIONS:
- return eAnnotations != null && !eAnnotations.isEmpty();
- case BeaninfoPackage.PROPERTY_DECORATOR__SOURCE:
- return SOURCE_EDEFAULT == null ? source != null : !SOURCE_EDEFAULT.equals(source);
- case BeaninfoPackage.PROPERTY_DECORATOR__DETAILS:
- return details != null && !details.isEmpty();
- case BeaninfoPackage.PROPERTY_DECORATOR__EMODEL_ELEMENT:
- return getEModelElement() != null;
- case BeaninfoPackage.PROPERTY_DECORATOR__CONTENTS:
- return contents != null && !contents.isEmpty();
- case BeaninfoPackage.PROPERTY_DECORATOR__REFERENCES:
- return references != null && !references.isEmpty();
- case BeaninfoPackage.PROPERTY_DECORATOR__DISPLAY_NAME:
- return isSetDisplayName();
- case BeaninfoPackage.PROPERTY_DECORATOR__SHORT_DESCRIPTION:
- return isSetShortDescription();
- case BeaninfoPackage.PROPERTY_DECORATOR__CATEGORY:
- return CATEGORY_EDEFAULT == null ? category != null : !CATEGORY_EDEFAULT.equals(category);
- case BeaninfoPackage.PROPERTY_DECORATOR__EXPERT:
- return isSetExpert();
- case BeaninfoPackage.PROPERTY_DECORATOR__HIDDEN:
- return isSetHidden();
- case BeaninfoPackage.PROPERTY_DECORATOR__PREFERRED:
- return isSetPreferred();
- case BeaninfoPackage.PROPERTY_DECORATOR__MERGE_INTROSPECTION:
- return ((eFlags & MERGE_INTROSPECTION_EFLAG) != 0) != MERGE_INTROSPECTION_EDEFAULT;
- case BeaninfoPackage.PROPERTY_DECORATOR__ATTRIBUTES_EXPLICIT_EMPTY:
- return ((eFlags & ATTRIBUTES_EXPLICIT_EMPTY_EFLAG) != 0) != ATTRIBUTES_EXPLICIT_EMPTY_EDEFAULT;
- case BeaninfoPackage.PROPERTY_DECORATOR__IMPLICITLY_SET_BITS:
- return implicitlySetBits != IMPLICITLY_SET_BITS_EDEFAULT;
- case BeaninfoPackage.PROPERTY_DECORATOR__IMPLICIT_DECORATOR_FLAG:
- return implicitDecoratorFlag != IMPLICIT_DECORATOR_FLAG_EDEFAULT;
- case BeaninfoPackage.PROPERTY_DECORATOR__ATTRIBUTES:
- return attributes != null && !attributes.isEmpty();
- case BeaninfoPackage.PROPERTY_DECORATOR__BOUND:
- return isSetBound();
- case BeaninfoPackage.PROPERTY_DECORATOR__CONSTRAINED:
- return isSetConstrained();
- case BeaninfoPackage.PROPERTY_DECORATOR__DESIGN_TIME:
- return isSetDesignTime();
- case BeaninfoPackage.PROPERTY_DECORATOR__ALWAYS_INCOMPATIBLE:
- return ((eFlags & ALWAYS_INCOMPATIBLE_EFLAG) != 0) != ALWAYS_INCOMPATIBLE_EDEFAULT;
- case BeaninfoPackage.PROPERTY_DECORATOR__FILTER_FLAGS:
- return filterFlags != null && !filterFlags.isEmpty();
- case BeaninfoPackage.PROPERTY_DECORATOR__FIELD_READ_ONLY:
- return ((eFlags & FIELD_READ_ONLY_EFLAG) != 0) != FIELD_READ_ONLY_EDEFAULT;
- case BeaninfoPackage.PROPERTY_DECORATOR__PROPERTY_EDITOR_CLASS:
- return propertyEditorClass != null;
- case BeaninfoPackage.PROPERTY_DECORATOR__READ_METHOD:
- return isSetReadMethod();
- case BeaninfoPackage.PROPERTY_DECORATOR__WRITE_METHOD:
- return isSetWriteMethod();
- case BeaninfoPackage.PROPERTY_DECORATOR__FIELD:
- return isSetField();
- }
- return eDynamicIsSet(eFeature);
- }
-
- /* (non-Javadoc)
- * @see org.eclipse.jem.internal.beaninfo.PropertyDecorator#isWriteable()
- */
- public boolean isWriteable() {
- return getWriteMethod() != null || (getField() != null && !isFieldReadOnly());
- }
-
- /* (non-Javadoc)
- * @see org.eclipse.jem.internal.beaninfo.PropertyDecorator#isReadable()
- */
- public boolean isReadable() {
- return getReadMethod() != null || getField() != null;
- }
-
-
-}
diff --git a/plugins/org.eclipse.jem.beaninfo/beaninfoCommon/org/eclipse/jem/beaninfo/common/IBaseBeanInfoConstants.java b/plugins/org.eclipse.jem.beaninfo/beaninfoCommon/org/eclipse/jem/beaninfo/common/IBaseBeanInfoConstants.java
deleted file mode 100644
index 3b63c76..0000000
--- a/plugins/org.eclipse.jem.beaninfo/beaninfoCommon/org/eclipse/jem/beaninfo/common/IBaseBeanInfoConstants.java
+++ /dev/null
@@ -1,155 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2005, 2006 IBM Corporation and others.
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
- *
- * Contributors:
- * IBM Corporation - initial API and implementation
- *******************************************************************************/
-/*
-
-
- */
-package org.eclipse.jem.beaninfo.common;
-
-
-
-/**
- * Constants for the BaseBeanInfo for arguments. This class is common between
- * the IDE and the remote vm so that these constants can be used on both sides.
- * <p>
- * These are constants used in FeatureAttributes as keys. The other special
- * constants that are not keys in FeatureAttributes are left in BaseBeanInfo
- * since they are not needed on both sides.
- *
- * @since 1.2.0
- */
-public interface IBaseBeanInfoConstants {
-
- /**
- * Indicator used to describe a factory instantiation pattern.
- * <p>
- * This will be on the attributes of the BeanDescriptor for the factory class. It will be complete, in that if this
- * factory is inherited from another factory, it must copy in the superclass's factory attribute. They won't be
- * automatically merged.
- * <p>
- * The format is an Object[][]. The first dimension at index zero is for toolkit wide information and then indexes one and beyond are one for each creation method name. The second dimension is for one entry
- * of classwide data and the rest are the data for
- * each creation method.
- * <p>
- * The first entry at Object[0] will be <code>{initString, isShared, onFreeform}</code> where:
- * <dl>
- * <dt>initString
- * <dd>The init string that should be used to create an instance of the toolkit if it needs one, or <code>null</code> if it doesn't
- * need one (i.e. all static) or if the default constructor should be used.
- * This is used when a component is dropped from the palette that is for a toolkit component.
- * <dt>isShared
- * <dd><code>false</code> if each call to the creation method should have a new instance of the toolkit. This means that the toolkit manages only
- * one instance. This is more like a controller than a toolkit in this case. <code>true</code> if it should
- * try to reuse the toolkit of the parent if it has one, or any other found toolkit of the same type, (i.e. a subtype will be acceptable).
- * This is used when a component is dropped from the palette that is for a toolkit component.
- * <dt>onFreeform
- * <dd><code>true</code> if the toolkit is created that it should appear on the freeform surface to be selectable. This would be of use
- * if the toolkit had properties that need to be set. If the toolkit had no properties then it doesn't need to be selectable and should
- * not be on the freeform. Use <code>false</code> in that case.
- * </dl>
- * <p>
- * The second and other entries of the array are of the format:
- * <code>{methodName, returnedClassname, isStatic, Object[], ...}</code> where:
- * <dl>
- * <dt>methodName
- * <dd>The name of the creation method this entry is for (String).
- * <dt>returnedClassname
- * <dd>The name of the class that is created and returned from the method (String).
- * <dt>isStatic
- * <dd><code>Boolean.TRUE</code> if the method is a static method, <code>Boolean.FALSE</code> if not.
- * This is used when a component is dropped from the palette that is for a toolkit component.
- * <dt>Object[]
- * <dd>Zero or more arrays. The array contains the name of the properties for each method signature that each
- * respective argument is for, or <code>null</code> if that arg is not a property. There can be more than one array if there
- * is more than one factory method of the same name, and returns the same type, but what is different is only the number of arguments.
- * If there is a
- * factory method that has no properties as arguments or has no arguments, don't include an array for it. For example if there was only one factory method and it had no
- * arguments then there would not be any arrays.
- * Currently cannot handle where more than one method has the same number of arguments but different types for the arguments.
- * </dl>
- * <p>
- * A example is:
- * <pre><code>
- * new Object[][] {
- * {"new a.b.c.Toolkit(\"ABC\")", Boolean.TRUE, Boolean.FALSE},
- * {"createButton", "a.b.c.Button", Boolean.FALSE, new Object[] {"parent", "text"}, new Object[] {"parent"}}
- * }
- * </code>
- * </pre>
- * <p>
- * This example says that this class is toolkit (factory). To construct an instead use <code>"new a.b.c.Toolkit(\"ABC\")"</code> and it is shared
- * with other objects created from this factory instance. Also, the factory method is "createButton", returns an "a.b.c.Button", and it is
- * not a static call (i.e. use a toolkit instance to create it). It has two forms of factory methods. One is two arguments where the first
- * arg is the parent property and the second arg is the text property. The other form has only one argument, the parent property.
- * <p>
- * The way this is used in a palette entry to drop a new object that a toolkit can create is to have an expression of the form
- * <code>{toolkit:classname}.factorymethod(args)</code>. So for the above example it would be <code>{toolkit:a.b.c.Toolkit}.createButton(parent)</code>.
- * The classname <b>must</b> be fully-qualified and if an inner class it must use the "$" instead of "." for the name, i.e. a.b.c.Toolkit.InnerFactory
- * would be a.b.c.Toolkit$InnerFactory.
- * <p>
- * <b>NOTE:</b> This is an EXPERIMENTAL API and can change in the future until committed.
- *
- * @since 1.2.0
- */
- public static final String FACTORY_CREATION = "FACTORY_CREATION";//$NON-NLS-1$
-
- /**
- * Category indicator for apply property arguments. Category is a pre-defined attribute name too. That is where the category is stored in a
- * descriptor.
- *
- * @since 1.1.0
- */
- public static final String CATEGORY = "category"; //$NON-NLS-1$
-
- /**
- * Enumeration values indicator for apply property arguments. Enumeration values is a pre-defined attribute name too. That is where the
- * enumeration values are stored.
- *
- * @since 1.1.0
- */
- public static final String ENUMERATIONVALUES = "enumerationValues";//$NON-NLS-1$
-
- // The keys for icon file names, NOT THE java.awt.icon key.
- public static final String ICONCOLOR16X16URL = "ICON_COLOR_16x16_URL"; //$NON-NLS-1$
- public static final String ICONCOLOR32X32URL = "ICON_COLOR_32x32_URL"; //$NON-NLS-1$ // Not used
- public static final String ICONMONO16X16URL = "ICON_MONO_16x16_URL"; //$NON-NLS-1$ // Not used
- public static final String ICONMONO32X32URL = "ICON_MONO_32x32_URL"; //$NON-NLS-1$ // Not used
-
-
- /**
- * FeatureAttribute key for explicit property changes. The value is a Boolean. <code>true</code>
- * indicates that the Customize Bean customizer supplied by the BeanInfo will indicate which
- * properties it has changed through firing {@link java.beans.PropertyChangeEvent} instead of the
- * Visual Editor automatically trying to determine the set of changed properties.
- * <p>
- * The default if not set is <code>false</code>.
- *
- * @since 1.1.0.1
- */
- public static final String EXPLICIT_PROPERTY_CHANGE = "EXPLICIT_PROPERTY_CHANGE"; //$NON-NLS-1$
-
- /**
- * Used by Visual Editor as feature attribute key/value to indicate that it must create an implicit setting of a property(s).
- * For example {@link javax.swing.JFrame#getContentPane()}. There must be a content pane
- * set in the VE model so that users can drop the components on it. Setting this here
- * means that the default content pane from the JFrame will show up in the editor to use.
- * <p>
- * This should be used with care in that not all properties are required to always show up.
- * They can be queried when needed.
- * <p>
- * The value can be either a {@link String} for one property. Or it can be a {@link String[]} for more
- * than one property.
- *
- * @since 1.2.0
- */
- public static final String REQUIRED_IMPLICIT_PROPERTIES = "requiredImplicitProperties"; //$NON-NLS-1$
-
-}
diff --git a/plugins/org.eclipse.jem.beaninfo/beaninfoCommon/org/eclipse/jem/internal/beaninfo/common/BeanRecord.java b/plugins/org.eclipse.jem.beaninfo/beaninfoCommon/org/eclipse/jem/internal/beaninfo/common/BeanRecord.java
deleted file mode 100644
index 724b0d8..0000000
--- a/plugins/org.eclipse.jem.beaninfo/beaninfoCommon/org/eclipse/jem/internal/beaninfo/common/BeanRecord.java
+++ /dev/null
@@ -1,53 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2005 IBM Corporation and others.
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
- *
- * Contributors:
- * IBM Corporation - initial API and implementation
- *******************************************************************************/
-/*
-
-
- */
-package org.eclipse.jem.internal.beaninfo.common;
-
-
-/**
- * This is the data structure for sending the BeanDescriptor info from
- * the BeanInfo vm to the IDE vm. It is serializable so that it can
- * be serialized for transmission.
- * <p>
- * It contains the properties of the BeanDescriptor.
- * @since 1.1.0
- */
-public class BeanRecord extends FeatureRecord {
-
- private static final long serialVersionUID = 1105979920664L;
-
- public String customizerClassName;
- public boolean mergeInheritedProperties;
- public boolean mergeInheritedOperations;
- public boolean mergeInheritedEvents;
- /**
- * Names of properties that are to not be inherited in getAllProperties(). It is set only
- * if the list is not the full list of inherited properties.
- * If all inherited or mergeInheritedProperties is false, then the field will be <code>null</code>. Save space that way.
- */
- public String[] notInheritedPropertyNames;
- /**
- * Names of operations that are to not be inherited in getEAllOperations(). It is set only
- * if the list is not the full list of inherited operations.
- * If all are inherited or if mergeInheritedOperations is false, then the field will be <code>null</code>. Save space that way.
- */
- public String[] notInheritedOperationNames;
- /**
- * Names of events that are to not be inherited in getAllEvents(). It is set only
- * if the list is not the full list of inherited events.
- * If all are inherited or if mergeInheritedEvents is false, then the field will be <code>null</code>. Save space that way.
- */
- public String[] notInheritedEventNames;
-
-}
diff --git a/plugins/org.eclipse.jem.beaninfo/beaninfoCommon/org/eclipse/jem/internal/beaninfo/common/EventSetRecord.java b/plugins/org.eclipse.jem.beaninfo/beaninfoCommon/org/eclipse/jem/internal/beaninfo/common/EventSetRecord.java
deleted file mode 100644
index b235382..0000000
--- a/plugins/org.eclipse.jem.beaninfo/beaninfoCommon/org/eclipse/jem/internal/beaninfo/common/EventSetRecord.java
+++ /dev/null
@@ -1,37 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2005 IBM Corporation and others.
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
- *
- * Contributors:
- * IBM Corporation - initial API and implementation
- *******************************************************************************/
-/*
-
-
- */
-package org.eclipse.jem.internal.beaninfo.common;
-
-
-/**
- * This is the data structure for sending the EventSetDescriptor info from
- * the BeanInfo vm to the IDE vm. It is serializable so that it can
- * be serialized for transmission.
- * <p>
- * It contains the properties of the EventSetDescriptor.
- * @since 1.1.0
- */
-public class EventSetRecord extends FeatureRecord {
-
- private static final long serialVersionUID = 1105980773420L;
-
- public ReflectMethodRecord addListenerMethod;
- public String eventAdapterClassName;
- public MethodRecord[] listenerMethodDescriptors;
- public String listenerTypeName;
- public ReflectMethodRecord removeListenerMethod;
- public boolean inDefaultEventSet;
- public boolean unicast;
-}
diff --git a/plugins/org.eclipse.jem.beaninfo/beaninfoCommon/org/eclipse/jem/internal/beaninfo/common/FeatureAttributeValue.java b/plugins/org.eclipse.jem.beaninfo/beaninfoCommon/org/eclipse/jem/internal/beaninfo/common/FeatureAttributeValue.java
deleted file mode 100644
index 860b55f..0000000
--- a/plugins/org.eclipse.jem.beaninfo/beaninfoCommon/org/eclipse/jem/internal/beaninfo/common/FeatureAttributeValue.java
+++ /dev/null
@@ -1,785 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2005, 2006 IBM Corporation and others.
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
- *
- * Contributors:
- * IBM Corporation - initial API and implementation
- *******************************************************************************/
-/*
-
-
- */
-package org.eclipse.jem.internal.beaninfo.common;
-
-import java.io.*;
-import java.lang.reflect.*;
-import java.util.Arrays;
-import java.util.logging.Level;
-import java.util.regex.Pattern;
-
-import org.eclipse.jem.internal.proxy.common.MapTypes;
-
-
-
-/**
- * This is the value for a FeatureAttribute. It wrappers the true java object.
- * Use the getObject method to get the java value.
- * <p>
- * We can only represent Strings, primitives, and arrays. (Primitives will converted
- * to their wrapper class (e.g. Long), and byte, short, and int will move up to Long,
- * and float will move up to Double). And any kind of valid array on the java BeanInfo side
- * will be converted to an Object array on the IDE side. We don't have the capability to allow more complex objects
- * because the IDE may not have the necessary classes available to it that
- * the BeanInfo may of had available to it. Invalid objects will be represented
- * by the singleton instance of {@link org.eclipse.jem.internal.beaninfo.common.InvalidObject}.
- * <p>
- * <b>Note:</b>
- * Class objects that are values of Feature attributes on the java BeanInfo side will be
- * converted to simple strings containing the classname when moved to the client (IDE) side.
- * That is because the classes probably will not be available on the IDE side, but can be
- * used to reconstruct the class when used back on the java vm side.
- * @since 1.1.0
- */
-public class FeatureAttributeValue implements Serializable {
-
- private transient Object value;
- private transient Object internalValue;
- private boolean implicitValue;
- private static final long serialVersionUID = 1105717634844L;
-
- /**
- * Create the value with the given init string.
- * <p>
- * This is not meant to be used by clients.
- * @param initString
- *
- * @since 1.1.0
- */
- public FeatureAttributeValue(String initString) {
- // Use the init string to create the value. This is our
- // own short-hand for this.
- if (initString.startsWith(IMPLICIT)) {
- setImplicitValue(true);
- initString = initString.substring(IMPLICIT.length());
- }
- value = parseString(initString);
- }
-
- /**
- * This is used when customer wants to fluff one up.
- *
- *
- * @since 1.1.0
- */
- public FeatureAttributeValue() {
-
- }
-
- /**
- * @return Returns the value.
- *
- * @since 1.1.0
- */
- public Object getValue() {
- return value;
- }
-
- /**
- * Set a value.
- * @param value The value to set.
- * @since 1.1.0
- */
- public void setValue(Object value) {
- this.value = value;
- this.setInternalValue(null);
- }
-
- /**
- * Set the internal value.
- * @param internalValue The internalValue to set.
- *
- * @since 1.1.0
- */
- public void setInternalValue(Object internalValue) {
- this.internalValue = internalValue;
- }
-
- /**
- * This is the internal value. It is the <code>value</code> massaged into an easier to use form
- * in the IDE. It will not be serialized out. It will not be reconstructed from an init string.
- * <p>
- * It does not need to be used. It will be cleared if
- * a new value is set. For example, if the value is a complicated array (because you can't have
- * special classes in the attribute value on the BeanInfo side) the first usage of this value can
- * be translated into an easier form to use, such as a map.
- *
- * @return Returns the internalValue.
- *
- * @since 1.1.0
- */
- public Object getInternalValue() {
- return internalValue;
- }
-
- /* (non-Javadoc)
- * @see java.lang.Object#toString()
- */
- public String toString() {
- if (value == null)
- return super.toString();
- StringBuffer out = new StringBuffer(100);
- if (isImplicitValue())
- out.append(IMPLICIT);
- makeString(value, out);
- return out.toString();
- }
-
-
- /**
- * Helper method to take the object and turn it into the
- * string form that is required for EMF serialization.
- * <p>
- * This is used internally. It can be used for development
- * purposes by clients, but they would not have any real
- * runtime need for this.
- * <p>
- * Output format would be (there won't be any newlines in the actual string)
- * <pre>
- * String: "zxvzxv"
- * Number: number
- * Boolean: true or false
- * Character: 'c'
- * null: null
- *
- * Array: (all arrays will be turned into Object[])
- * [dim]{e1, e2}
- * [dim1][dim2]{[dim1a]{e1, e2}, [dim2a]{e3, e4}}
- * where en are objects that follow the pattern for single output above.
- *
- * Any invalid object (i.e. not one of the ones we handle) will be:
- * INV
- *
- * Arrays of invalid types (not Object, String, Number, Boolean, Character,
- * or primitives) will be marked as INV.
- * </pre>
- * @param value
- * @return serialized form as a string.
- *
- * @since 1.1.0
- */
- public static String makeString(Object value) {
- StringBuffer out = new StringBuffer(100);
- makeString(value, out);
- return out.toString();
- }
-
- private static final Pattern QUOTE = Pattern.compile("\""); // Pattern for searching for double-quote. Make it static so don't waste time compiling each time. //$NON-NLS-1$
- private static final String NULL = "null"; // Output string for null //$NON-NLS-1$
- private static final String INVALID = "INV"; // Invalid object flag. //$NON-NLS-1$
- private static final String IMPLICIT = "implicit,"; // Implicit flag. //$NON-NLS-1$
-
- /*
- * Used for recursive building of the string.
- */
- private static void makeString(Object value, StringBuffer out) {
- if (value == null)
- out.append(NULL);
- else if (value instanceof String || value instanceof Class) {
- // String: "string" or "string\"stringend" if str included a double-quote.
- out.append('"');
- // If class, turn value into the classname.
- String str = value instanceof String ? (String) value : ((Class) value).getName();
- if (str.indexOf('"') != -1) {
- // Replace double-quote with escape double-quote so we can distinquish it from the terminating double-quote.
- out.append(QUOTE.matcher(str).replaceAll("\\\\\"")); // Don't know why we need the back-slash to be doubled for replaceall, but it doesn't work otherwise. //$NON-NLS-1$
- } else
- out.append(str);
- out.append('\"');
- } else if (value instanceof Number) {
- // Will go out as either a integer number or a floating point number.
- // When read back in it will be either a Long or a Double.
- out.append(value);
- } else if (value instanceof Boolean) {
- // It will go out as either true or false.
- out.append(value);
- } else if (value instanceof Character) {
- // Character: 'c' or '\'' if char was a quote.
- out.append('\'');
- Character c = (Character) value;
- if (c.charValue() != '\'')
- out.append(c.charValue());
- else
- out.append("\\'"); //$NON-NLS-1$
- out.append('\'');
- } else if (value.getClass().isArray()) {
- // Handle array format.
- Class type = value.getClass();
- // See if final type is a valid type.
- Class ft = type.getComponentType();
- int dims = 1;
- while (ft.isArray()) {
- dims++;
- ft = ft.getComponentType();
- }
- if (ft == Object.class || ft == String.class || ft == Boolean.class || ft == Character.class || ft.isPrimitive() || Number.class.isAssignableFrom(ft)) {
- // [length][][] {....}
- out.append('[');
- int length = Array.getLength(value);
- out.append(length);
- out.append(']');
- while(--dims > 0) {
- out.append("[]"); //$NON-NLS-1$
- }
- out.append('{');
- for (int i=0; i < length; i++) {
- if (i != 0)
- out.append(',');
- makeString(Array.get(value, i), out);
- }
- out.append('}');
- } else
- out.append(INVALID); // Any other kind of array is invalid.
- } else {
- out.append(INVALID);
- }
- }
-
-
- /**
- * Helper method to take the string input from EMF serialization and turn it
- * into an Object.
- * <p>
- * This is used internally. It can be used for development
- * purposes by clients, but they would not have any real
- * runtime need for this.
- * <p>
- * The object will be an object, null, or an Object array. Any value
- * that is invalid will be set to the {@link InvalidObject#INSTANCE} static
- * instance.
- *
- * @param input
- * @return object decoded from the input.
- *
- * @see #makeString(Object)
- * @since 1.1.0
- */
- public static Object parseString(String input) {
- return parseString(new StringParser(input));
- }
-
- private static class StringParser {
- private int next=0;
- private int length;
- private String input;
-
- public StringParser(String input) {
- this.input = input;
- this.length = input.length();
- }
-
- public String toString() {
- return "StringParser: \""+input+'"'; //$NON-NLS-1$
- }
-
- public void skipWhitespace() {
- while(next < length) {
- if (!Character.isWhitespace(input.charAt(next++))) {
- next--; // Put it back as not yet read since it is not whitespace.
- break;
- }
- }
- }
-
- /**
- * Return the next index
- * @return
- *
- * @since 1.1.0
- */
- public int nextIndex() {
- return next;
- }
-
- /**
- * Get the length of the input
- * @return input length
- *
- * @since 1.1.0
- */
- public int getLength() {
- return length;
- }
-
-
- /**
- * Read the current character and go to next.
- * @return current character
- *
- * @since 1.1.0
- */
- public char read() {
- return next<length ? input.charAt(next++) : 0;
- }
-
- /**
- * Backup the parser one character.
- *
- *
- * @since 1.1.0
- */
- public void backup() {
- if (--next < 0)
- next = 0;
- }
-
- /**
- * Peek at the char at the next index, but don't increment afterwards.
- * @return
- *
- * @since 1.1.0
- */
- public char peek() {
- return next<length ? input.charAt(next) : 0;
- }
-
- /**
- * Have we read the last char.
- * @return <code>true</code> if read last char.
- *
- * @since 1.1.0
- */
- public boolean atEnd() {
- return next>=length;
- }
-
- /**
- * Reset to the given next index.
- * @param nextIndex the next index to do a read at.
- *
- * @since 1.1.0
- */
- public void reset(int nextIndex) {
- if (nextIndex<=length)
- next = nextIndex;
- else
- next = length;
- }
-
- /**
- * Skip the next number of chars.
- * @param skip number of chars to skip.
- *
- * @since 1.1.0
- */
- public void skip(int skip) {
- if ((next+=skip) > length)
- next = length;
- }
-
- /**
- * Return the string input.
- * @return the string input
- *
- * @since 1.1.0
- */
- public String getInput() {
- return input;
- }
-
- }
-
- /*
- * Starting a parse for an object at the given index.
- * Return the parsed object or InvalidObject if no
- * object or if there was an error parsing.
- */
- private static Object parseString(StringParser parser) {
- parser.skipWhitespace();
- if (!parser.atEnd()) {
- char c = parser.read();
- switch (c) {
- case '"':
- // Start of a quoted string. Scan for closing quote, ignoring escaped quotes.
- int start = parser.nextIndex(); // Index of first char after '"'
- char[] dequoted = null; // Used if there is an escaped quote. That is the only thing we support escape on, quotes.
- int dequoteIndex = 0;
- while (!parser.atEnd()) {
- char cc = parser.read();
- if (cc == '"') {
- // If we didn't dequote, then just do substring.
- if (dequoted == null)
- return parser.getInput().substring(start, parser.nextIndex()-1); // next is char after '"', so end of string index is index of '"'
- else {
- // We have a dequoted string. So turn into a string.
- // Gather the last group
- int endNdx = parser.nextIndex()-1;
- parser.getInput().getChars(start, endNdx, dequoted, dequoteIndex);
- dequoteIndex+= (endNdx-start);
- return new String(dequoted, 0, dequoteIndex);
- }
- } else if (cc == '\\') {
- // We had an escape, see if next is a quote. If it is we need to strip out the '\'.
- if (parser.peek() == '"') {
- if (dequoted == null) {
- dequoted = new char[parser.getLength()];
- }
- int endNdx = parser.nextIndex()-1;
- parser.getInput().getChars(start, endNdx, dequoted, dequoteIndex); // Get up to, but not including '\'
- dequoteIndex+= (endNdx-start);
- // Now also add in the escaped quote.
- dequoted[dequoteIndex++] = parser.read();
- start = parser.nextIndex(); // Next group is from next index.
- }
- }
- }
- break; // If we got here, it is invalid.
-
- case '-':
- case '0':
- case '1':
- case '2':
- case '3':
- case '4':
- case '5':
- case '6':
- case '7':
- case '8':
- case '9':
- // Possible number.
- // Scan to next non-digit, or not part of valid number.
- boolean numberComplete = false;
- boolean floatType = false;
- boolean foundE = false;
- boolean foundESign = false;
- start = parser.nextIndex()-1; // We want to include the sign or first digit in the number.
- while (!parser.atEnd() && !numberComplete) {
- char cc = parser.read();
- switch (cc) {
- case '0':
- case '1':
- case '2':
- case '3':
- case '4':
- case '5':
- case '6':
- case '7':
- case '8':
- case '9':
- break; // This is good, go on.
- case '.':
- if (floatType)
- return InvalidObject.INSTANCE; // We already found a '.', two are invalid.
- floatType = true;
- break;
- case 'e':
- case 'E':
- if (foundE)
- return InvalidObject.INSTANCE; // We already found a 'e', two are invalid.
- foundE = true;
- floatType = true; // An 'e' makes it a float, if not already.
- break;
- case '+':
- case '-':
- if (!foundE || foundESign)
- return InvalidObject.INSTANCE; // A +/- with no 'e' first is invalid. Or more than one sign.
- foundESign = true;
- break;
- default:
- // Anything else is end of number.
- parser.backup(); // Back it up so that next parse will start with this char.
- numberComplete = true; // So we stop scanning
- break;
- }
- }
- try {
- if (!floatType)
- return Long.valueOf(parser.getInput().substring(start, parser.nextIndex()));
- else
- return Double.valueOf(parser.getInput().substring(start, parser.nextIndex()));
- } catch (NumberFormatException e) {
- }
- break; // If we got here, it is invalid.
-
- case 't':
- case 'T':
- case 'f':
- case 'F':
- // Possible boolean.
- if (parser.getInput().regionMatches(true, parser.nextIndex()-1, "true", 0, 4)) { //$NON-NLS-1$
- parser.skip(3); // Skip over rest of string.
- return Boolean.TRUE;
- } else if (parser.getInput().regionMatches(true, parser.nextIndex()-1, "false", 0, 5)) { //$NON-NLS-1$
- parser.skip(4); // Skip over rest of string.
- return Boolean.FALSE;
- }
- break; // If we got here, it is invalid.
-
- case '\'':
- // Possible character
- char cc = parser.read();
- // We really only support '\\' and '\'' anything else will be treated as ignore '\' because we don't know handle full escapes.
- if (cc == '\\')
- cc = parser.read(); // Get what's after it.
- else if (cc == '\'')
- break; // '' is invalid.
- if (parser.peek() == '\'') {
- // So next char after "character" is is a quote. This is good.
- parser.read(); // Now consume the quote
- return new Character(cc);
- }
- break; // If we got here, it is invalid.
-
- case 'n':
- // Possible null.
- if (parser.getInput().regionMatches(parser.nextIndex()-1, "null", 0, 4)) { //$NON-NLS-1$
- parser.skip(3); // Skip over rest of string.
- return null;
- }
- break; // If we got here, it is invalid.
-
- case 'I':
- // Possible invalid value.
- if (parser.getInput().regionMatches(parser.nextIndex()-1, INVALID, 0, INVALID.length())) {
- parser.skip(INVALID.length()-1); // Skip over rest of string.
- return InvalidObject.INSTANCE;
- }
- break; // If we got here, it is invalid.
-
- case '[':
- // Possible array.
- // The next field should be a number, so we'll use parseString to get the number.
- Object size = parseString(parser);
- if (size instanceof Long) {
- parser.skipWhitespace();
- cc = parser.read(); // Se if next is ']'
- if (cc == ']') {
- // Good, well-formed first dimension
- int dim = 1;
- boolean valid = true;
- // See if there are more of just "[]". the number of them is the dim.
- while (true) {
- parser.skipWhitespace();
- cc = parser.read();
- if (cc == '[') {
- parser.skipWhitespace();
- cc = parser.read();
- if (cc == ']')
- dim++;
- else {
- // This is invalid.
- valid = false;
- parser.backup();
- break; // No more dims.
- }
- } else {
- parser.backup();
- break; // No more dims.
- }
- }
- if (valid) {
- parser.skipWhitespace();
- cc = parser.read();
- if (cc == '{') {
- // Good, we're at the start of the initialization code.
- int[] dims = new int[dim];
- int len = ((Long) size).intValue();
- dims[0] = len;
- Object array = Array.newInstance(Object.class, dims);
- Arrays.fill((Object[]) array, null); // Because newInstance used above fills the array created with empty arrays when a dim>1.
-
- // Now we start filling it in.
- Object invSetting = null; // What we will use for the invalid setting. If this is a multidim, this needs to be an array. Will not create it until needed.
- Object entry = parseString(parser); // Get the first entry
- Class compType = array.getClass().getComponentType();
- int i = -1;
- while (true) {
- if (++i < len) {
- if (compType.isInstance(entry)) {
- // Good, it can be assigned.
- Array.set(array, i, entry);
- } else {
- // Bad. Need to set invalid.
- if (invSetting == null) {
- // We haven't created it yet.
- if (dim == 1)
- invSetting = InvalidObject.INSTANCE; // Great, one dimensional, we can use invalid directly
- else {
- // Multi-dim. Need to create a valid array that we can set.
- int[] invDims = new int[dim - 1];
- Arrays.fill(invDims, 1); // Length one all of the way so that the final component can be invalid object
- invSetting = Array.newInstance(Object.class, invDims);
- Object finalEntry = invSetting; // Final array (with component type of just Object). Start with the full array and work down.
- for (int j = invDims.length - 1; j > 0; j--) {
- finalEntry = Array.get(finalEntry, 0);
- }
- Array.set(finalEntry, 0, InvalidObject.INSTANCE);
- }
- }
- Array.set(array, i, invSetting);
- }
- }
-
- parser.skipWhitespace();
- cc = parser.read();
- if (cc == ',') {
- // Good, get next
- entry = parseString(parser);
- } else if (cc == '}') {
- // Good, reached the end.
- break;
- } else {
- if (!parser.atEnd()) {
- parser.backup();
- entry = parseString(parser); // Technically this should be invalid, but we'll let a whitespace also denote next entry.
- } else {
- // It's really screwed up. The string just ended. Log it.
- Exception e = new IllegalStateException(parser.toString());
- try {
- // See if Beaninfo plugin is available (we are running under eclipse). If so, use it, else just print to error.
- // We may be in the remote vm and so it won't be available.
- Class biPluginClass = Class.forName("org.eclipse.jem.internal.beaninfo.core.BeaninfoPlugin"); //$NON-NLS-1$
- Method getPlugin = biPluginClass.getMethod("getPlugin", (Class[]) null); //$NON-NLS-1$
- Method getLogger = biPluginClass.getMethod("getLogger", (Class[]) null); //$NON-NLS-1$
- Method log = getLogger.getReturnType().getMethod("log", new Class[] {Throwable.class, Level.class}); //$NON-NLS-1$
- Object biPlugin = getPlugin.invoke(null, (Object[]) null);
- Object logger = getLogger.invoke(biPlugin, (Object[]) null);
- log.invoke(logger, new Object[] {e, Level.WARNING});
- return InvalidObject.INSTANCE;
- } catch (SecurityException e1) {
- } catch (IllegalArgumentException e1) {
- } catch (ClassNotFoundException e1) {
- } catch (NoSuchMethodException e1) {
- } catch (IllegalAccessException e1) {
- } catch (InvocationTargetException e1) {
- } catch (NullPointerException e1) {
- }
- e.printStackTrace(); // Not in eclipse, so just print stack trace.
- return InvalidObject.INSTANCE;
- }
- }
- }
-
- return array;
- }
- }
- }
- }
- break; // If we got here, it is invalid.
- }
- }
- return InvalidObject.INSTANCE;
- }
-
- private void writeObject(ObjectOutputStream out) throws IOException {
- // Write out any hidden stuff
- out.defaultWriteObject();
- writeObject(value, out);
- }
-
- private void writeObject(Object value, ObjectOutputStream out) throws IOException {
- if (value == null)
- out.writeObject(value);
- else {
- if (value instanceof Class)
- out.writeObject(((Class) value).getName());
- else if (!value.getClass().isArray()) {
- if (value instanceof String || value instanceof Number || value instanceof Boolean || value instanceof Character)
- out.writeObject(value);
- else
- out.writeObject(InvalidObject.INSTANCE);
- } else {
- // Array is tricky. See if it is one we can handle, if not then invalid.
- // To indicate array, we will first write out the Class of the Component type of the array (it will
- // be converted to be Object or Object[]...).
- // This will be the clue that an array is coming. Class values will never
- // be returned, so that is how we can tell it is an array.
- // Note: The reason we are using the component type (converted to Object) is because to reconstruct on the other side we need
- // to use the component type plus length of the array's first dimension.
- //
- // We can not just serialize the array in the normal way because it may contain invalid values, and we need to
- // handle that. Also, if it wasn't an Object array, we need to turn it into an object array. We need consistency
- // in that it should always be an Object array.
- // So output format will be:
- // Class(component type)
- // int(size of first dimension)
- // Object(value of first entry) - Actually use out writeObject() format to allow nesting of arrays.
- // Object(value of second entry)
- // ... up to size of dimension.
- Class type = value.getClass();
- // See if final type is a valid type.
- Class ft = type.getComponentType();
- int dims = 1;
- while (ft.isArray()) {
- dims++;
- ft = ft.getComponentType();
- }
- if (ft == Object.class || ft == String.class || ft == Boolean.class || ft == Character.class || ft.isPrimitive() || ft == Class.class || Number.class.isAssignableFrom(ft)) {
- String jniType = dims == 1 ? "java.lang.Object" : MapTypes.getJNITypeName("java.lang.Object", dims-1); //$NON-NLS-1$ //$NON-NLS-2$
- try {
- Class componentType = Class.forName(jniType);
- out.writeObject(componentType);
- int length = Array.getLength(value);
- out.writeInt(length);
- for (int i = 0; i < length; i++) {
- writeObject(Array.get(value, i), out);
- }
- } catch (ClassNotFoundException e) {
- // This should never happen. Object arrays are always available.
- }
- } else
- out.writeObject(InvalidObject.INSTANCE);
- }
- }
- }
-
-
- private void readObject(ObjectInputStream in) throws IOException, ClassNotFoundException {
- // Read in any hidden stuff
- in.defaultReadObject();
-
- value = readActualObject(in);
- }
-
- private Object readActualObject(ObjectInputStream in) throws IOException, ClassNotFoundException {
- Object val = in.readObject();
- if (val instanceof Class) {
- // It must be an array. Only Class objects that come in are Arrays of Object.
- int length = in.readInt();
- Object array = Array.newInstance((Class) val, length);
- for (int i = 0; i < length; i++) {
- Array.set(array, i, readActualObject(in));
- }
- return array;
- } else
- return val; // It is the value itself.
- }
-
-
- /**
- * Is this FeatureAttributeValue an implicit value, i.e. one that came from
- * BeanInfo Introspection and not from an override file.
- *
- * @return Returns the implicitValue.
- *
- * @since 1.2.0
- */
- public boolean isImplicitValue() {
- return implicitValue;
- }
-
-
- /**
- * Set the implicit value flag.
- * @param implicitValue The implicitValue to set.
- *
- * @see #isImplicitValue()
- * @since 1.2.0
- */
- public void setImplicitValue(boolean implicitValue) {
- this.implicitValue = implicitValue;
- }
-
-}
diff --git a/plugins/org.eclipse.jem.beaninfo/beaninfoCommon/org/eclipse/jem/internal/beaninfo/common/FeatureRecord.java b/plugins/org.eclipse.jem.beaninfo/beaninfoCommon/org/eclipse/jem/internal/beaninfo/common/FeatureRecord.java
deleted file mode 100644
index 9d392fc..0000000
--- a/plugins/org.eclipse.jem.beaninfo/beaninfoCommon/org/eclipse/jem/internal/beaninfo/common/FeatureRecord.java
+++ /dev/null
@@ -1,41 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2005 IBM Corporation and others.
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
- *
- * Contributors:
- * IBM Corporation - initial API and implementation
- *******************************************************************************/
-/*
-
-
- */
-package org.eclipse.jem.internal.beaninfo.common;
-
-import java.io.Serializable;
-
-
-/**
- * This is the data structure for sending the FeatureDescriptor info from
- * the BeanInfo vm to the IDE vm. It is serializable so that it can
- * be serialized for transmission.
- * <p>
- * It contains the properties of the FeatureDescriptor.
- * @since 1.1.0
- */
-public class FeatureRecord implements Serializable {
-
- private static final long serialVersionUID = 1105979276648L;
-
- public String name; // Some decorators use this and others don't. Each decorator type will decide whether this is of importance.
- public String displayName;
- public String shortDescription;
- public String category;
- public boolean expert;
- public boolean hidden;
- public boolean preferred;
- public String[] attributeNames;
- public FeatureAttributeValue[] attributeValues;
-}
diff --git a/plugins/org.eclipse.jem.beaninfo/beaninfoCommon/org/eclipse/jem/internal/beaninfo/common/IBeanInfoIntrospectionConstants.java b/plugins/org.eclipse.jem.beaninfo/beaninfoCommon/org/eclipse/jem/internal/beaninfo/common/IBeanInfoIntrospectionConstants.java
deleted file mode 100644
index e067449..0000000
--- a/plugins/org.eclipse.jem.beaninfo/beaninfoCommon/org/eclipse/jem/internal/beaninfo/common/IBeanInfoIntrospectionConstants.java
+++ /dev/null
@@ -1,129 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2005 IBM Corporation and others.
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
- *
- * Contributors:
- * IBM Corporation - initial API and implementation
- *******************************************************************************/
-/*
-
-
- */
-package org.eclipse.jem.internal.beaninfo.common;
-
-
-/**
- * These are constants needed for transferring BeanInfo results from the BeanInfo VM.
- * @since 1.1.0
- */
-public interface IBeanInfoIntrospectionConstants {
-
- /**
- * Introspection bit flag indicating do the BeanDecorator. Sent to ModelingBeanInfo.introspect method.
- * @since 1.1.0
- */
- public static final int DO_BEAN_DECOR = 0x1;
-
- /**
- * Introspection bit flag indicating do the Properties. Sent to ModelingBeanInfo.introspect method.
- * @since 1.1.0
- */
- public static final int DO_PROPERTIES = 0x2;
-
- /**
- * Introspection bit flag indicating do the Methods. Sent to ModelingBeanInfo.introspect method.
- * @since 1.1.0
- */
- public static final int DO_METHODS = 0x4;
-
- /**
- * Introspection bit flag indicating do the Events. Sent to ModelingBeanInfo.introspect method.
- * @since 1.1.0
- */
- public static final int DO_EVENTS = 0x8;
-
- /**
- * BeanDecorator was sent command id.
- * <p>
- * This will be sent to callBack(int id, InputStream is). The InputStream will be Objects (use ObjectInputStream).
- * The stream will be broken into sections.
- * Each section will be headed by the command id of that section (e.g. BEAN_DECORATOR_SENT or PROPERTY_DECORATORS_SENT).
- * Following the command id will be the type of input specific data.
- * <p>
- * The data following the command id will be a BeanRecord from the ObjectInputStream.
- *
- * @see BeanRecord
- * @see org.eclipse.jem.internal.proxy.core.ICallback#calledBackStream(int, InputStream)
- * @since 1.1.0
- */
- public static final int BEAN_DECORATOR_SENT = 1;
-
- /**
- * PropertyDecorators send command id.
- * <p>
- * This will be sent to callBack(int id, InputStream is). The InputStream will be Objects (use ObjectInputStream).
- * The stream will be broken into sections.
- * Each section will be headed by the command id of that section (e.g. BEAN_DECORATOR_SENT or PROPERTY_DECORATORS_SENT).
- * Following the command id will be the type of input specific data.
- * <p>
- * The first object will be an int and will be the number of properties and each object after that
- * will be a PropertyRecord/IndexedPropertyRecord.
- *
- * @see org.eclipse.jem.internal.proxy.core.ICallback#calledBackStream(int, InputStream)
- * @see PropertyRecord
- * @see IndexedPropertyRecord
- */
- public static final int PROPERTY_DECORATORS_SENT = 2;
-
- /**
- * MethodDecorators send command id.
- * <p>
- * This will be sent to callBack(int id, InputStream is). The InputStream will be Objects (use ObjectInputStream).
- * The stream will be broken into sections.
- * Each section will be headed by the command id of that section (e.g. BEAN_DECORATOR_SENT or PROPERTY_DECORATORS_SENT).
- * Following the command id will be the type of input specific data.
- * <p>
- * The InputStream will be Objects (use ObjectInputStream).
- * The first object will be an int and will be the number of methods and each object after that
- * will be a MethodRecord.
- *
- * @see org.eclipse.jem.internal.proxy.core.ICallback#calledBackStream(int, InputStream)
- * @see MethodRecord
- */
- public static final int METHOD_DECORATORS_SENT = 3;
-
- /**
- * EventSetDecorators send command id.
- * <p>
- * This will be sent to callBack(int id, InputStream is). The InputStream will be Objects (use ObjectInputStream).
- * The stream will be broken into sections.
- * Each section will be headed by the command id of that section (e.g. BEAN_DECORATOR_SENT or PROPERTY_DECORATORS_SENT).
- * Following the command id will be the type of input specific data.
- * <p>
- * The first object will be an int and will be the number of events and each object after that
- * will be a EventSetRecord.
- *
- * @see org.eclipse.jem.internal.proxy.core.ICallback#calledBackStream(int, InputStream)
- * @see MethodRecord
- */
- public static final int EVENT_DECORATORS_SENT = 4;
-
- /**
- * Done send command id.
- * <p>
- * This will be sent to callBack(int id, InputStream is). The InputStream will be Objects (use ObjectInputStream).
- * The stream will be broken into sections.
- * Each section will be headed by the command id of that section (e.g. BEAN_DECORATOR_SENT or PROPERTY_DECORATORS_SENT).
- * Following the command id will be the type of input specific data.
- * <p>
- * This command id means there is no more data and it should return.
- *
- * @see org.eclipse.jem.internal.proxy.core.ICallback#calledBackStream(int, InputStream)
- * @see MethodRecord
- */
- public static final int DONE = 5;
-
-}
diff --git a/plugins/org.eclipse.jem.beaninfo/beaninfoCommon/org/eclipse/jem/internal/beaninfo/common/IndexedPropertyRecord.java b/plugins/org.eclipse.jem.beaninfo/beaninfoCommon/org/eclipse/jem/internal/beaninfo/common/IndexedPropertyRecord.java
deleted file mode 100644
index 88d2916..0000000
--- a/plugins/org.eclipse.jem.beaninfo/beaninfoCommon/org/eclipse/jem/internal/beaninfo/common/IndexedPropertyRecord.java
+++ /dev/null
@@ -1,32 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2005 IBM Corporation and others.
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
- *
- * Contributors:
- * IBM Corporation - initial API and implementation
- *******************************************************************************/
-/*
-
-
- */
-package org.eclipse.jem.internal.beaninfo.common;
-
-
-/**
- * This is the data structure for sending the IndexedPropertyDescriptor info from
- * the BeanInfo vm to the IDE vm. It is serializable so that it can
- * be serialized for transmission.
- * <p>
- * It contains the properties of the IndexedPropertyDescriptor.
- * @since 1.1.0
- */
-public class IndexedPropertyRecord extends PropertyRecord {
- private static final long serialVersionUID = 1105983227990L;
-
- public ReflectMethodRecord indexedReadMethod;
- public ReflectMethodRecord indexedWriteMethod;
- public String indexedPropertyTypeName;
-}
diff --git a/plugins/org.eclipse.jem.beaninfo/beaninfoCommon/org/eclipse/jem/internal/beaninfo/common/InvalidObject.java b/plugins/org.eclipse.jem.beaninfo/beaninfoCommon/org/eclipse/jem/internal/beaninfo/common/InvalidObject.java
deleted file mode 100644
index 7e731ce..0000000
--- a/plugins/org.eclipse.jem.beaninfo/beaninfoCommon/org/eclipse/jem/internal/beaninfo/common/InvalidObject.java
+++ /dev/null
@@ -1,53 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2005 IBM Corporation and others.
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
- *
- * Contributors:
- * IBM Corporation - initial API and implementation
- *******************************************************************************/
-/*
-
-
- */
-package org.eclipse.jem.internal.beaninfo.common;
-
-import java.io.ObjectStreamException;
-import java.io.Serializable;
-
-
-/**
- * An indicator object for invalid object type. This is used with feature attribute
- * values from the BeanInfo classes. We can only handle certain types when we
- * bring them over from the BeanInfo VM. That is because the classes instantiated
- * in the BeanInfo class may not be available in the IDE. So any invalid value
- * will be replaced by this class instance.
- * <p>
- * This is a singleton class.
- * There will be one instance (InvalidObject.INSTANCE) in the system. That way
- * "==" can be used to test for it.
- *
- * @since 1.1.0
- */
-public class InvalidObject implements Serializable {
-
- /**
- * Singleton instance of InvalidObject.
- * @since 1.1.0
- */
- public static final InvalidObject INSTANCE = new InvalidObject();
-
- private static final long serialVersionUID = 1105643804370L;
-
- /*
- * Nobody else should create one of these.
- */
- private InvalidObject() {
- }
-
- private Object readResolve() throws ObjectStreamException {
- return INSTANCE;
- }
-}
diff --git a/plugins/org.eclipse.jem.beaninfo/beaninfoCommon/org/eclipse/jem/internal/beaninfo/common/MethodRecord.java b/plugins/org.eclipse.jem.beaninfo/beaninfoCommon/org/eclipse/jem/internal/beaninfo/common/MethodRecord.java
deleted file mode 100644
index 4b37be9..0000000
--- a/plugins/org.eclipse.jem.beaninfo/beaninfoCommon/org/eclipse/jem/internal/beaninfo/common/MethodRecord.java
+++ /dev/null
@@ -1,38 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2005 IBM Corporation and others.
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
- *
- * Contributors:
- * IBM Corporation - initial API and implementation
- *******************************************************************************/
-/*
-
-
- */
-package org.eclipse.jem.internal.beaninfo.common;
-
-
-/**
- * This is the data structure for sending the MethodDescriptor info from
- * the BeanInfo vm to the IDE vm. It is serializable so that it can
- * be serialized for transmission.
- * <p>
- * It contains the properties of the MethodDescriptor.
- * @since 1.1.0
- */
-public class MethodRecord extends FeatureRecord {
-
- private static final long serialVersionUID = 1105982213110L;
-
- /**
- * Method signature for the method this record describes.
- */
- public ReflectMethodRecord methodForDescriptor;
- /**
- * Parameter records array. It may be <code>null</code> if there aren't any.
- */
- public ParameterRecord[] parameters;
-}
diff --git a/plugins/org.eclipse.jem.beaninfo/beaninfoCommon/org/eclipse/jem/internal/beaninfo/common/ParameterRecord.java b/plugins/org.eclipse.jem.beaninfo/beaninfoCommon/org/eclipse/jem/internal/beaninfo/common/ParameterRecord.java
deleted file mode 100644
index 5b2f370..0000000
--- a/plugins/org.eclipse.jem.beaninfo/beaninfoCommon/org/eclipse/jem/internal/beaninfo/common/ParameterRecord.java
+++ /dev/null
@@ -1,32 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2005 IBM Corporation and others.
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
- *
- * Contributors:
- * IBM Corporation - initial API and implementation
- *******************************************************************************/
-/*
-
-
- */
-package org.eclipse.jem.internal.beaninfo.common;
-
-
-/**
- * This is the data structure for sending the ParameterDescriptor info from
- * the BeanInfo vm to the IDE vm. It is serializable so that it can
- * be serialized for transmission.
- * <p>
- * It contains the properties of the ParameterDescriptor.
- * <p>
- * The only field of importance is the name, and that comes from FeatureRecord.
- * @since 1.1.0
- */
-public class ParameterRecord extends FeatureRecord {
-
- private static final long serialVersionUID = 1105982438955L;
-
-}
diff --git a/plugins/org.eclipse.jem.beaninfo/beaninfoCommon/org/eclipse/jem/internal/beaninfo/common/PropertyRecord.java b/plugins/org.eclipse.jem.beaninfo/beaninfoCommon/org/eclipse/jem/internal/beaninfo/common/PropertyRecord.java
deleted file mode 100644
index 3e03241..0000000
--- a/plugins/org.eclipse.jem.beaninfo/beaninfoCommon/org/eclipse/jem/internal/beaninfo/common/PropertyRecord.java
+++ /dev/null
@@ -1,37 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2005 IBM Corporation and others.
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
- *
- * Contributors:
- * IBM Corporation - initial API and implementation
- *******************************************************************************/
-/*
-
-
- */
-package org.eclipse.jem.internal.beaninfo.common;
-
-
-/**
- * This is the data structure for sending the PropertyDescriptor info from
- * the BeanInfo vm to the IDE vm. It is serializable so that it can
- * be serialized for transmission.
- * <p>
- * It contains the properties of the PropertyDescriptor.
- * @since 1.1.0
- */
-public class PropertyRecord extends FeatureRecord {
- private static final long serialVersionUID = 1105979276648L;
-
- public String propertyEditorClassName;
- public String propertyTypeName;
- public ReflectMethodRecord readMethod;
- public ReflectMethodRecord writeMethod;
- public ReflectFieldRecord field;
- public boolean bound;
- public boolean constrained;
- public Boolean designTime;
-}
diff --git a/plugins/org.eclipse.jem.beaninfo/beaninfoCommon/org/eclipse/jem/internal/beaninfo/common/ReflectFieldRecord.java b/plugins/org.eclipse.jem.beaninfo/beaninfoCommon/org/eclipse/jem/internal/beaninfo/common/ReflectFieldRecord.java
deleted file mode 100644
index 9829839..0000000
--- a/plugins/org.eclipse.jem.beaninfo/beaninfoCommon/org/eclipse/jem/internal/beaninfo/common/ReflectFieldRecord.java
+++ /dev/null
@@ -1,35 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2005 IBM Corporation and others.
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
- *
- * Contributors:
- * IBM Corporation - initial API and implementation
- *******************************************************************************/
-/*
-
-
- */
-package org.eclipse.jem.internal.beaninfo.common;
-
-import java.io.Serializable;
-
-
-/**
- * This is the data structure for sending the java.lang.reflect.Field info from
- * the BeanInfo vm to the IDE vm. It is serializable so that it can
- * be serialized for transmission.
- * <p>
- * It contains the properties of the java.lang.reflect.Field.
- * @since 1.1.0
- */
-public class ReflectFieldRecord implements Serializable {
-
- private static final long serialVersionUID = 1105981512453L;
-
- public String className;
- public String fieldName;
- public boolean readOnly;
-}
diff --git a/plugins/org.eclipse.jem.beaninfo/beaninfoCommon/org/eclipse/jem/internal/beaninfo/common/ReflectMethodRecord.java b/plugins/org.eclipse.jem.beaninfo/beaninfoCommon/org/eclipse/jem/internal/beaninfo/common/ReflectMethodRecord.java
deleted file mode 100644
index 9f11291..0000000
--- a/plugins/org.eclipse.jem.beaninfo/beaninfoCommon/org/eclipse/jem/internal/beaninfo/common/ReflectMethodRecord.java
+++ /dev/null
@@ -1,35 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2005 IBM Corporation and others.
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
- *
- * Contributors:
- * IBM Corporation - initial API and implementation
- *******************************************************************************/
-/*
-
-
- */
-package org.eclipse.jem.internal.beaninfo.common;
-
-import java.io.Serializable;
-
-
-/**
- * This is the data structure for sending the java.lang.reflect.Method info from
- * the BeanInfo vm to the IDE vm. It is serializable so that it can
- * be serialized for transmission.
- * <p>
- * It contains the properties of the java.lang.reflect.Method.
- * @since 1.1.0
- */
-public class ReflectMethodRecord implements Serializable {
-
- private static final long serialVersionUID = 1105981512773L;
-
- public String className;
- public String methodName;
- public String[] parameterTypeNames; // Maybe null if no parameters.
-}
diff --git a/plugins/org.eclipse.jem.beaninfo/build.properties b/plugins/org.eclipse.jem.beaninfo/build.properties
deleted file mode 100644
index 6e827fd..0000000
--- a/plugins/org.eclipse.jem.beaninfo/build.properties
+++ /dev/null
@@ -1,24 +0,0 @@
-###############################################################################
-# Copyright (c) 2003, 2008 IBM Corporation and others.
-# All rights reserved. This program and the accompanying materials
-# are made available under the terms of the Eclipse Public License v1.0
-# which accompanies this distribution, and is available at
-# http://www.eclipse.org/legal/epl-v10.html
-#
-# Contributors:
-# IBM Corporation - initial API and implementation
-###############################################################################
-bin.includes = plugin.xml,\
- plugin.properties,\
- about.html,\
- .options,\
- META-INF/,\
- .
-src.includes = about.html,\
- model/,\
- rose/,\
- proxy.jars,\
- schema/
-source.. = beaninfo
-output.. = bin/
-
diff --git a/plugins/org.eclipse.jem.beaninfo/model/beaninfo.ecore b/plugins/org.eclipse.jem.beaninfo/model/beaninfo.ecore
deleted file mode 100644
index cc92576..0000000
--- a/plugins/org.eclipse.jem.beaninfo/model/beaninfo.ecore
+++ /dev/null
@@ -1,290 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<ecore:EPackage xmi:version="2.0"
- xmlns:xmi="http://www.omg.org/XMI" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
- xmlns:ecore="http://www.eclipse.org/emf/2002/Ecore" name="beaninfo"
- nsURI="http:///org/eclipse/jem/internal/beaninfo/beaninfo.ecore" nsPrefix="org.eclipse.jem.internal.beaninfo.beaninfo">
- <eClassifiers xsi:type="ecore:EClass" name="FeatureDecorator" eSuperTypes="../../org.eclipse.emf.ecore/model/Ecore.ecore#//EAnnotation">
- <eAnnotations source="http://www.eclipse.org/emf/2002/GenModel">
- <details key="documentation" value="Equivalent to FeatureDescriptor in java.
<p>
Note: If any attribute is explicitly set then the BeanInfo/Reflection will not be merged into the decorator. This provides a way of overriding the BeanInfos. Also for any many-valued attribute, if it is desired to have it explicitly empty and not have BeanInfo fill it in, there will be another attribute named of the form "attibutueExplicitEmpty" If this is true then the BeanInfo will not merge in and will leave it empty.
<p>
These comments about merging apply to all subclasses of this decorator too. "/>
- </eAnnotations>
- <eOperations name="getName" eType="ecore:EDataType http://www.eclipse.org/emf/2002/Ecore#//EString"/>
- <eStructuralFeatures xsi:type="ecore:EAttribute" name="displayName" eType="ecore:EDataType http://www.eclipse.org/emf/2002/Ecore#//EString"
- unsettable="true"/>
- <eStructuralFeatures xsi:type="ecore:EAttribute" name="shortDescription" eType="ecore:EDataType http://www.eclipse.org/emf/2002/Ecore#//EString"
- unsettable="true"/>
- <eStructuralFeatures xsi:type="ecore:EAttribute" name="category" eType="ecore:EDataType http://www.eclipse.org/emf/2002/Ecore#//EString"/>
- <eStructuralFeatures xsi:type="ecore:EAttribute" name="expert" eType="ecore:EDataType http://www.eclipse.org/emf/2002/Ecore#//EBoolean"
- unsettable="true"/>
- <eStructuralFeatures xsi:type="ecore:EAttribute" name="hidden" eType="ecore:EDataType http://www.eclipse.org/emf/2002/Ecore#//EBoolean"
- unsettable="true"/>
- <eStructuralFeatures xsi:type="ecore:EAttribute" name="preferred" eType="ecore:EDataType http://www.eclipse.org/emf/2002/Ecore#//EBoolean"
- unsettable="true"/>
- <eStructuralFeatures xsi:type="ecore:EAttribute" name="mergeIntrospection" eType="ecore:EDataType http://www.eclipse.org/emf/2002/Ecore#//EBoolean"
- defaultValueLiteral="true">
- <eAnnotations source="http://www.eclipse.org/emf/2002/GenModel">
- <details key="documentation" value="Should the introspection results be merged into this decorator. If this is set to false, then the introspection results are ignored for this particular decorator. This is an internal feature simply to allow desired override capabilities. Customers would use it to prevent ANY introspection/reflection from occurring."/>
- </eAnnotations>
- </eStructuralFeatures>
- <eStructuralFeatures xsi:type="ecore:EAttribute" name="attributesExplicitEmpty"
- eType="ecore:EDataType http://www.eclipse.org/emf/2002/Ecore#//EBoolean">
- <eAnnotations source="http://www.eclipse.org/emf/2002/GenModel">
- <details key="documentation" value="The attributes are explicitly set as empty and not retrieved from the beaninfo/reflection. Customers should set this if they want the list of attributes to be empty and not merged with the BeanInfo results. "/>
- </eAnnotations>
- </eStructuralFeatures>
- <eStructuralFeatures xsi:type="ecore:EAttribute" name="implicitlySetBits" eType="ecore:EDataType http://www.eclipse.org/emf/2002/Ecore#//ELong">
- <eAnnotations source="http://www.eclipse.org/emf/2002/GenModel">
- <details key="documentation" value="A bitflag for which attributes have been set by BeanInfo/Reflection.
<p>
This is an internal attribute that is used by the BeanInfo maintanance. It is not meant to be used by customers."/>
- </eAnnotations>
- </eStructuralFeatures>
- <eStructuralFeatures xsi:type="ecore:EAttribute" name="implicitDecoratorFlag"
- eType="#//ImplicitItem">
- <eAnnotations source="http://www.eclipse.org/emf/2002/GenModel">
- <details key="documentation" value="Is this decorator/feature implicit. This means created by Introspection/Reflection and not by customer.
<p>
This is an internal attribute that is used by the BeanInfo maintanance. It is not meant to be used by customers."/>
- </eAnnotations>
- </eStructuralFeatures>
- <eStructuralFeatures xsi:type="ecore:EReference" name="attributes" upperBound="-1"
- eType="#//FeatureAttributeMapEntry" containment="true">
- <eAnnotations source="http://www.eclipse.org/emf/2002/GenModel">
- <details key="documentation" value="Feature attributes. Key/value pairs. If it is desired that the feature attributes is explicitly empty and not have BeanInfo/reflection set it, set attributesExplicitEmpty to true."/>
- </eAnnotations>
- </eStructuralFeatures>
- </eClassifiers>
- <eClassifiers xsi:type="ecore:EClass" name="BeanDecorator" eSuperTypes="#//FeatureDecorator">
- <eAnnotations source="http://www.eclipse.org/emf/2002/GenModel">
- <details key="documentation" value="Equivalent to BeanDecorator in java."/>
- </eAnnotations>
- <eStructuralFeatures xsi:type="ecore:EAttribute" name="mergeSuperProperties" eType="ecore:EDataType http://www.eclipse.org/emf/2002/Ecore#//EBoolean"
- defaultValueLiteral="true" unsettable="true">
- <eAnnotations source="http://www.eclipse.org/emf/2002/GenModel">
- <details key="documentation" value="Should the properties of super types be merged when asking for eAllAttributes/eAllReferences."/>
- </eAnnotations>
- </eStructuralFeatures>
- <eStructuralFeatures xsi:type="ecore:EAttribute" name="mergeSuperMethods" eType="ecore:EDataType http://www.eclipse.org/emf/2002/Ecore#//EBoolean"
- defaultValueLiteral="true" unsettable="true">
- <eAnnotations source="http://www.eclipse.org/emf/2002/GenModel">
- <details key="documentation" value="Should the methods of super types be merged when asking for eAllBehaviors."/>
- </eAnnotations>
- </eStructuralFeatures>
- <eStructuralFeatures xsi:type="ecore:EAttribute" name="mergeSuperEvents" eType="ecore:EDataType http://www.eclipse.org/emf/2002/Ecore#//EBoolean"
- defaultValueLiteral="true" unsettable="true">
- <eAnnotations source="http://www.eclipse.org/emf/2002/GenModel">
- <details key="documentation" value="Should the events of super types be merged when asking for eAllEvents."/>
- </eAnnotations>
- </eStructuralFeatures>
- <eStructuralFeatures xsi:type="ecore:EAttribute" name="introspectProperties" eType="ecore:EDataType http://www.eclipse.org/emf/2002/Ecore#//EBoolean"
- defaultValueLiteral="true">
- <eAnnotations source="http://www.eclipse.org/emf/2002/GenModel">
- <details key="documentation" value="Should the properties from the introspection be added to the class. This allows properties to not be introspected and to use only what is defined explicitly in the JavaClass xmi file."/>
- </eAnnotations>
- </eStructuralFeatures>
- <eStructuralFeatures xsi:type="ecore:EAttribute" name="introspectMethods" eType="ecore:EDataType http://www.eclipse.org/emf/2002/Ecore#//EBoolean"
- defaultValueLiteral="true">
- <eAnnotations source="http://www.eclipse.org/emf/2002/GenModel">
- <details key="documentation" value="Should the methods from the introspection be added to the class. This allows methods to not be introspected and to use only what is defined explicitly in the JavaClass xmi file."/>
- </eAnnotations>
- </eStructuralFeatures>
- <eStructuralFeatures xsi:type="ecore:EAttribute" name="introspectEvents" eType="ecore:EDataType http://www.eclipse.org/emf/2002/Ecore#//EBoolean"
- defaultValueLiteral="true">
- <eAnnotations source="http://www.eclipse.org/emf/2002/GenModel">
- <details key="documentation" value="Should the events from the introspection be added to the class. This allows events to not be introspected and to use only what is defined explicitly in the JavaClass xmi file."/>
- </eAnnotations>
- </eStructuralFeatures>
- <eStructuralFeatures xsi:type="ecore:EAttribute" name="doBeaninfo" eType="ecore:EDataType http://www.eclipse.org/emf/2002/Ecore#//EBoolean"
- defaultValueLiteral="true">
- <eAnnotations source="http://www.eclipse.org/emf/2002/GenModel">
- <details key="documentation" value="This means do we go and get the beaninfo from the remote vm. If false, then it will not try to get the beaninfo. This doesn't prevent introspection through reflection. That is controled by the separate introspect... attributes."/>
- </eAnnotations>
- </eStructuralFeatures>
- <eStructuralFeatures xsi:type="ecore:EAttribute" name="notInheritedPropertyNames"
- upperBound="-1" eType="ecore:EDataType http://www.eclipse.org/emf/2002/Ecore#//EString">
- <eAnnotations source="http://www.eclipse.org/emf/2002/GenModel">
- <details key="documentation" value="This is the list of inherited property names to not use in getAllProperties(). These names are properties that should not be inherited and should not show through. If the inherited property is not on the list then it will show in getAllProperties().
<p>
This list will be empty if all properties are inherited or if the mergeSuperProperties flag is false.
<p>
Note: This attribute is not meant to be changed by clients. It is an internal attribute."/>
- </eAnnotations>
- </eStructuralFeatures>
- <eStructuralFeatures xsi:type="ecore:EAttribute" name="notInheritedMethodNames"
- upperBound="-1" eType="ecore:EDataType http://www.eclipse.org/emf/2002/Ecore#//EString">
- <eAnnotations source="http://www.eclipse.org/emf/2002/GenModel">
- <details key="documentation" value="This is the list of inherited method names to not use in eAllOperations(). These names are operations that should not be inherited and should not show through. If the inherited operation is not on the list then it will show in getAllOperations().
<p>
This list will be empty if all operations are inherited or if the mergeSuperBehaviors flag is false."/>
- </eAnnotations>
- </eStructuralFeatures>
- <eStructuralFeatures xsi:type="ecore:EAttribute" name="notInheritedEventNames"
- upperBound="-1" eType="ecore:EDataType http://www.eclipse.org/emf/2002/Ecore#//EString">
- <eAnnotations source="http://www.eclipse.org/emf/2002/GenModel">
- <details key="documentation" value="This is the list of inherited event names to not use in getAllEvents(). These names are events that should not be inherited and should not show through. If the inherited event is not on the list then it will show in getAllEvents().
<p>
This list will be empty if all events are inherited or if the mergeSuperEvents flag is false."/>
- </eAnnotations>
- </eStructuralFeatures>
- <eStructuralFeatures xsi:type="ecore:EReference" name="customizerClass" eType="ecore:EClass ../../org.eclipse.jem/model/java.ecore#//JavaClass"/>
- </eClassifiers>
- <eClassifiers xsi:type="ecore:EClass" name="EventSetDecorator" eSuperTypes="#//FeatureDecorator">
- <eAnnotations source="http://www.eclipse.org/emf/2002/GenModel">
- <details key="documentation" value="Equivalent to EventSetDecorator in java."/>
- </eAnnotations>
- <eStructuralFeatures xsi:type="ecore:EAttribute" name="inDefaultEventSet" eType="ecore:EDataType http://www.eclipse.org/emf/2002/Ecore#//EBoolean"
- unsettable="true"/>
- <eStructuralFeatures xsi:type="ecore:EAttribute" name="unicast" eType="ecore:EDataType http://www.eclipse.org/emf/2002/Ecore#//EBoolean"
- unsettable="true"/>
- <eStructuralFeatures xsi:type="ecore:EAttribute" name="listenerMethodsExplicitEmpty"
- eType="ecore:EDataType http://www.eclipse.org/emf/2002/Ecore#//EBoolean">
- <eAnnotations source="http://www.eclipse.org/emf/2002/GenModel">
- <details key="documentation" value="Set true if the listenerMethods feature is explicitly set as empty and is not to have listener methods merged in from BeanInfo or reflection."/>
- </eAnnotations>
- </eStructuralFeatures>
- <eStructuralFeatures xsi:type="ecore:EReference" name="addListenerMethod" lowerBound="1"
- eType="ecore:EClass ../../org.eclipse.jem/model/java.ecore#//Method"/>
- <eStructuralFeatures xsi:type="ecore:EReference" name="listenerMethods" lowerBound="1"
- upperBound="-1" eType="#//MethodProxy" volatile="true" transient="true" derived="true">
- <eAnnotations source="http://www.eclipse.org/emf/2002/GenModel">
- <details key="documentation" value="listener methods. If it is desired that the list be explicitly empty and not have BeanInfo set it, then set listenerMethodsExplicitEmpty to true.
<p>
ListenerMethods will be decorated with MethodDecorators.
<p>
Note: This is a derived setting, which means it will not notify out changes to it. To here changes to it, listen on "serListMthd" notifications instead."/>
- </eAnnotations>
- </eStructuralFeatures>
- <eStructuralFeatures xsi:type="ecore:EReference" name="listenerType" lowerBound="1"
- eType="ecore:EClass ../../org.eclipse.jem/model/java.ecore#//JavaClass"/>
- <eStructuralFeatures xsi:type="ecore:EReference" name="removeListenerMethod" lowerBound="1"
- eType="ecore:EClass ../../org.eclipse.jem/model/java.ecore#//Method"/>
- <eStructuralFeatures xsi:type="ecore:EReference" name="eventAdapterClass" eType="ecore:EClass ../../org.eclipse.jem/model/java.ecore#//JavaClass">
- <eAnnotations source="http://www.eclipse.org/emf/2002/GenModel">
- <details key="documentation" value="For some listener interfaces an adapter class is provided that implements default no-op methods, e.g. java.awt.event.FocusEvent which has java.awt.event.FocusAdapter. The Adapter class is provided in a key/value pair on the java.beans.EventSetDescriptor with a key defined in a static final constants EVENTADAPTERCLASS = "eventAdapterClass"."/>
- </eAnnotations>
- </eStructuralFeatures>
- <eStructuralFeatures xsi:type="ecore:EReference" name="serListMthd" lowerBound="1"
- upperBound="-1" eType="#//MethodProxy" containment="true">
- <eAnnotations source="http://www.eclipse.org/emf/2002/GenModel">
- <details key="documentation" value="This is a private feature. It is used internally only. "/>
- </eAnnotations>
- </eStructuralFeatures>
- </eClassifiers>
- <eClassifiers xsi:type="ecore:EClass" name="MethodDecorator" eSuperTypes="#//FeatureDecorator">
- <eAnnotations source="http://www.eclipse.org/emf/2002/GenModel">
- <details key="documentation" value="Equivalent to MethodDecorator in java."/>
- </eAnnotations>
- <eStructuralFeatures xsi:type="ecore:EAttribute" name="parmsExplicitEmpty" eType="ecore:EDataType http://www.eclipse.org/emf/2002/Ecore#//EBoolean">
- <eAnnotations source="http://www.eclipse.org/emf/2002/GenModel">
- <details key="documentation" value="Set true if the parms feature is explicitly set as empty and is not to have parameters merged in from BeanInfo or reflection."/>
- </eAnnotations>
- </eStructuralFeatures>
- <eStructuralFeatures xsi:type="ecore:EReference" name="parameterDescriptors" upperBound="-1"
- eType="#//ParameterDecorator" volatile="true" transient="true" derived="true">
- <eAnnotations source="http://www.eclipse.org/emf/2002/GenModel">
- <details key="documentation" value="This is the parameter descriptors list.
<p>
Note: This is a derived setting, which means it will not notify out changes to it. To here changes to it, listen on "serParmDesc" notifications instead."/>
- </eAnnotations>
- </eStructuralFeatures>
- <eStructuralFeatures xsi:type="ecore:EReference" name="serParmDesc" upperBound="-1"
- eType="#//ParameterDecorator" containment="true">
- <eAnnotations source="http://www.eclipse.org/emf/2002/GenModel">
- <details key="documentation" value="This is a private feature. It is used internally only. "/>
- </eAnnotations>
- </eStructuralFeatures>
- </eClassifiers>
- <eClassifiers xsi:type="ecore:EClass" name="ParameterDecorator" eSuperTypes="#//FeatureDecorator">
- <eStructuralFeatures xsi:type="ecore:EAttribute" name="name" eType="ecore:EDataType http://www.eclipse.org/emf/2002/Ecore#//EString">
- <eAnnotations source="http://www.eclipse.org/emf/2002/GenModel">
- <details key="documentation" value="The name is explicit here because unlike the other feature decorators, the name does not come from the object being decorated."/>
- </eAnnotations>
- </eStructuralFeatures>
- <eStructuralFeatures xsi:type="ecore:EReference" name="parameter" eType="ecore:EClass ../../org.eclipse.jem/model/java.ecore#//JavaParameter"
- transient="true">
- <eAnnotations source="http://www.eclipse.org/emf/2002/GenModel">
- <details key="documentation" value="The JavaParameter that this ParameterDecorator is decorating. Can't use eDecorates in this."/>
- </eAnnotations>
- </eStructuralFeatures>
- </eClassifiers>
- <eClassifiers xsi:type="ecore:EClass" name="PropertyDecorator" eSuperTypes="#//FeatureDecorator">
- <eAnnotations source="http://www.eclipse.org/emf/2002/GenModel">
- <details key="documentation" value="Equivalent to PropertyDecorator in java."/>
- </eAnnotations>
- <eOperations name="getPropertyType" eType="ecore:EClass ../../org.eclipse.emf.ecore/model/Ecore.ecore#//EClassifier">
- <eAnnotations source="http://www.eclipse.org/emf/2002/GenModel">
- <details key="documentation" value="Get the property type."/>
- </eAnnotations>
- </eOperations>
- <eOperations name="setPropertyType">
- <eAnnotations source="http://www.eclipse.org/emf/2002/GenModel">
- <details key="documentation" value="Set the property type."/>
- </eAnnotations>
- <eParameters name="propertyType" eType="ecore:EClass ../../org.eclipse.emf.ecore/model/Ecore.ecore#//EClassifier"/>
- </eOperations>
- <eStructuralFeatures xsi:type="ecore:EAttribute" name="bound" eType="ecore:EDataType http://www.eclipse.org/emf/2002/Ecore#//EBoolean"
- unsettable="true"/>
- <eStructuralFeatures xsi:type="ecore:EAttribute" name="constrained" eType="ecore:EDataType http://www.eclipse.org/emf/2002/Ecore#//EBoolean"
- unsettable="true"/>
- <eStructuralFeatures xsi:type="ecore:EAttribute" name="designTime" eType="ecore:EDataType http://www.eclipse.org/emf/2002/Ecore#//EBoolean"
- unsettable="true">
- <eAnnotations source="http://www.eclipse.org/emf/2002/GenModel">
- <details key="documentation" value="If not set, then normal default processing.

If set true, then this property is a design time property. This means it will show up in the property sheet, but it won't be able to be connected to at runtime. It may not even be a true bean property but instead the builder will know how to handle it.

If set false, then this property will not show up on the property sheet, but will be able to be connected to for runtime."/>
- </eAnnotations>
- </eStructuralFeatures>
- <eStructuralFeatures xsi:type="ecore:EAttribute" name="alwaysIncompatible" eType="ecore:EDataType http://www.eclipse.org/emf/2002/Ecore#//EBoolean">
- <eAnnotations source="http://www.eclipse.org/emf/2002/GenModel">
- <details key="documentation" value="If set true, then when multiple objects are selected, this property is always incompatible with each other. So in this case the property will not show up on the property sheet if more than one object has been selected."/>
- </eAnnotations>
- </eStructuralFeatures>
- <eStructuralFeatures xsi:type="ecore:EAttribute" name="filterFlags" upperBound="-1"
- eType="ecore:EDataType http://www.eclipse.org/emf/2002/Ecore#//EString"/>
- <eStructuralFeatures xsi:type="ecore:EAttribute" name="fieldReadOnly" eType="ecore:EDataType http://www.eclipse.org/emf/2002/Ecore#//EBoolean">
- <eAnnotations source="http://www.eclipse.org/emf/2002/GenModel">
- <details key="documentation" value="Is this field read-only (i.e. is a "final" field). This is only referenced if the field reference is set."/>
- </eAnnotations>
- </eStructuralFeatures>
- <eStructuralFeatures xsi:type="ecore:EReference" name="propertyEditorClass" eType="ecore:EClass ../../org.eclipse.jem/model/java.ecore#//JavaClass"/>
- <eStructuralFeatures xsi:type="ecore:EReference" name="readMethod" eType="ecore:EClass ../../org.eclipse.jem/model/java.ecore#//Method"
- unsettable="true"/>
- <eStructuralFeatures xsi:type="ecore:EReference" name="writeMethod" eType="ecore:EClass ../../org.eclipse.jem/model/java.ecore#//Method"
- unsettable="true"/>
- <eStructuralFeatures xsi:type="ecore:EReference" name="field" eType="ecore:EClass ../../org.eclipse.jem/model/java.ecore#//Field"
- unsettable="true">
- <eAnnotations source="http://www.eclipse.org/emf/2002/GenModel">
- <details key="documentation" value="If this is set, then this property is a field and not a getter/setter property. This is an extension that the Visual Editor uses to the BeanInfo model."/>
- </eAnnotations>
- </eStructuralFeatures>
- </eClassifiers>
- <eClassifiers xsi:type="ecore:EClass" name="IndexedPropertyDecorator" eSuperTypes="#//PropertyDecorator">
- <eAnnotations source="http://www.eclipse.org/emf/2002/GenModel">
- <details key="documentation" value="Equivalent to IndexedPropertyDecorator"/>
- </eAnnotations>
- <eStructuralFeatures xsi:type="ecore:EReference" name="indexedReadMethod" eType="ecore:EClass ../../org.eclipse.jem/model/java.ecore#//Method"
- unsettable="true"/>
- <eStructuralFeatures xsi:type="ecore:EReference" name="indexedWriteMethod" eType="ecore:EClass ../../org.eclipse.jem/model/java.ecore#//Method"
- unsettable="true"/>
- </eClassifiers>
- <eClassifiers xsi:type="ecore:EClass" name="MethodProxy" eSuperTypes="../../org.eclipse.emf.ecore/model/Ecore.ecore#//EOperation">
- <eAnnotations source="http://www.eclipse.org/emf/2002/GenModel">
- <details key="documentation" value="This is just a wrapper of a java Method. It allows access to the method but doesn't duplicate the interface for it.
<p>
MethodProxies will be in the eBehaviors setting for any methods that are in the JavaClass methods setting so that they are not duplicated.
<p>
MethodProxies would also have MethodDecorators."/>
- </eAnnotations>
- <eStructuralFeatures xsi:type="ecore:EReference" name="method" lowerBound="1"
- eType="ecore:EClass ../../org.eclipse.jem/model/java.ecore#//Method"/>
- </eClassifiers>
- <eClassifiers xsi:type="ecore:EClass" name="BeanEvent" eSuperTypes="../../org.eclipse.jem/model/java.ecore#//JavaEvent">
- <eAnnotations source="http://www.eclipse.org/emf/2002/GenModel">
- <details key="documentation" value="Event from Introspection/Reflection.
<p>
The BeanEvent will be under the JavaClass' events and allEvents feature. Each BeanEvent will be decorated by an EventSetDecorator."/>
- </eAnnotations>
- </eClassifiers>
- <eClassifiers xsi:type="ecore:EClass" name="FeatureAttributeMapEntry" instanceClassName="java.util.Map$Entry">
- <eStructuralFeatures xsi:type="ecore:EAttribute" name="key" eType="ecore:EDataType http://www.eclipse.org/emf/2002/Ecore#//EString"/>
- <eStructuralFeatures xsi:type="ecore:EAttribute" name="value" eType="#//FeatureAttributeValue"/>
- </eClassifiers>
- <eClassifiers xsi:type="ecore:EDataType" name="FeatureAttributeValue" instanceClassName="org.eclipse.jem.internal.beaninfo.common.FeatureAttributeValue">
- <eAnnotations source="http://www.eclipse.org/emf/2002/GenModel">
- <details key="documentation" value="This is the attribute value for feature attribute. It can only represent the following:

- String
- primitives
- array (type Object) containing mixture of Strings and primitives (as the object types)
- array (type String)
- array (type primitive)

Anything else cannot be represented."/>
- </eAnnotations>
- </eClassifiers>
- <eClassifiers xsi:type="ecore:EEnum" name="ImplicitItem">
- <eAnnotations source="http://www.eclipse.org/emf/2002/GenModel">
- <details key="documentation" value="This enum is an internal enum. It is used by BeanInfo for cache maintenance.
<p>
This enum is not meant to be used by clients."/>
- </eAnnotations>
- <eLiterals name="NOT_IMPLICIT">
- <eAnnotations source="http://www.eclipse.org/emf/2002/GenModel">
- <details key="documentation" value="Means this decorator is not implicit. That is it was created by customer."/>
- </eAnnotations>
- </eLiterals>
- <eLiterals name="IMPLICIT_DECORATOR" value="1">
- <eAnnotations source="http://www.eclipse.org/emf/2002/GenModel">
- <details key="documentation" value="This means that the decorator is implicit. That is it was not created by the customer."/>
- </eAnnotations>
- </eLiterals>
- <eLiterals name="IMPLICIT_DECORATOR_AND_FEATURE" value="2">
- <eAnnotations source="http://www.eclipse.org/emf/2002/GenModel">
- <details key="documentation" value="This means the decorator and the feature where implicit. That is they were not created by the customer."/>
- </eAnnotations>
- </eLiterals>
- </eClassifiers>
-</ecore:EPackage>
diff --git a/plugins/org.eclipse.jem.beaninfo/model/introspect.genmodel b/plugins/org.eclipse.jem.beaninfo/model/introspect.genmodel
deleted file mode 100644
index 52616c4..0000000
--- a/plugins/org.eclipse.jem.beaninfo/model/introspect.genmodel
+++ /dev/null
@@ -1,97 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<genmodel:GenModel xmi:version="2.0"
- xmlns:xmi="http://www.omg.org/XMI" xmlns:ecore="http://www.eclipse.org/emf/2002/Ecore"
- xmlns:genmodel="http://www.eclipse.org/emf/2002/GenModel" modelDirectory="/org.eclipse.jem.beaninfo/beaninfo"
- editDirectory="/org.eclipse.jem.beaninfo.edit/src" editorDirectory="/org.eclipse.jem.beaninfo.editor/src"
- modelPluginID="" modelName="Beaninfo" editPluginClass="org.eclipse.jem.internal.beaninfo.provider.BeaninfoEditPlugin"
- editorPluginClass="org.eclipse.jem.internal.beaninfo.presentation.BeaninfoEditorPlugin"
- updateClasspath="false" booleanFlagsField="eFlags" booleanFlagsReservedBits="8"
- importerID="org.eclipse.emf.importer.rose" usedGenPackages="../../org.eclipse.emf.ecore/model/Ecore.genmodel#//ecore ../../org.eclipse.jem/model/javaModel.genmodel#//java">
- <foreignModel>..\rose\introspect.mdl</foreignModel>
- <foreignModel>WorkspaceRoot</foreignModel>
- <foreignModel>../..</foreignModel>
- <genPackages prefix="Beaninfo" basePackage="org.eclipse.jem.internal" adapterFactory="false"
- ecorePackage="beaninfo.ecore#/">
- <genEnums ecoreEnum="beaninfo.ecore#//ImplicitItem">
- <genEnumLiterals ecoreEnumLiteral="beaninfo.ecore#//ImplicitItem/NOT_IMPLICIT"/>
- <genEnumLiterals ecoreEnumLiteral="beaninfo.ecore#//ImplicitItem/IMPLICIT_DECORATOR"/>
- <genEnumLiterals ecoreEnumLiteral="beaninfo.ecore#//ImplicitItem/IMPLICIT_DECORATOR_AND_FEATURE"/>
- </genEnums>
- <genDataTypes ecoreDataType="beaninfo.ecore#//FeatureAttributeValue"/>
- <genClasses ecoreClass="beaninfo.ecore#//FeatureDecorator">
- <genFeatures createChild="false" ecoreFeature="ecore:EAttribute beaninfo.ecore#//FeatureDecorator/displayName"/>
- <genFeatures createChild="false" ecoreFeature="ecore:EAttribute beaninfo.ecore#//FeatureDecorator/shortDescription"/>
- <genFeatures createChild="false" ecoreFeature="ecore:EAttribute beaninfo.ecore#//FeatureDecorator/category"/>
- <genFeatures createChild="false" ecoreFeature="ecore:EAttribute beaninfo.ecore#//FeatureDecorator/expert"/>
- <genFeatures createChild="false" ecoreFeature="ecore:EAttribute beaninfo.ecore#//FeatureDecorator/hidden"/>
- <genFeatures createChild="false" ecoreFeature="ecore:EAttribute beaninfo.ecore#//FeatureDecorator/preferred"/>
- <genFeatures createChild="false" ecoreFeature="ecore:EAttribute beaninfo.ecore#//FeatureDecorator/mergeIntrospection"/>
- <genFeatures createChild="false" ecoreFeature="ecore:EAttribute beaninfo.ecore#//FeatureDecorator/attributesExplicitEmpty"/>
- <genFeatures createChild="false" ecoreFeature="ecore:EAttribute beaninfo.ecore#//FeatureDecorator/implicitlySetBits"/>
- <genFeatures createChild="false" ecoreFeature="ecore:EAttribute beaninfo.ecore#//FeatureDecorator/implicitDecoratorFlag"/>
- <genFeatures property="None" children="true" createChild="true" ecoreFeature="ecore:EReference beaninfo.ecore#//FeatureDecorator/attributes"/>
- <genOperations ecoreOperation="beaninfo.ecore#//FeatureDecorator/getName"/>
- </genClasses>
- <genClasses ecoreClass="beaninfo.ecore#//BeanDecorator">
- <genFeatures createChild="false" ecoreFeature="ecore:EAttribute beaninfo.ecore#//BeanDecorator/mergeSuperProperties"/>
- <genFeatures createChild="false" ecoreFeature="ecore:EAttribute beaninfo.ecore#//BeanDecorator/mergeSuperMethods"/>
- <genFeatures createChild="false" ecoreFeature="ecore:EAttribute beaninfo.ecore#//BeanDecorator/mergeSuperEvents"/>
- <genFeatures createChild="false" ecoreFeature="ecore:EAttribute beaninfo.ecore#//BeanDecorator/introspectProperties"/>
- <genFeatures createChild="false" ecoreFeature="ecore:EAttribute beaninfo.ecore#//BeanDecorator/introspectMethods"/>
- <genFeatures createChild="false" ecoreFeature="ecore:EAttribute beaninfo.ecore#//BeanDecorator/introspectEvents"/>
- <genFeatures createChild="false" ecoreFeature="ecore:EAttribute beaninfo.ecore#//BeanDecorator/doBeaninfo"/>
- <genFeatures createChild="false" ecoreFeature="ecore:EAttribute beaninfo.ecore#//BeanDecorator/notInheritedPropertyNames"/>
- <genFeatures createChild="false" ecoreFeature="ecore:EAttribute beaninfo.ecore#//BeanDecorator/notInheritedMethodNames"/>
- <genFeatures createChild="false" ecoreFeature="ecore:EAttribute beaninfo.ecore#//BeanDecorator/notInheritedEventNames"/>
- <genFeatures createChild="false" ecoreFeature="ecore:EReference beaninfo.ecore#//BeanDecorator/customizerClass"/>
- </genClasses>
- <genClasses ecoreClass="beaninfo.ecore#//EventSetDecorator">
- <genFeatures createChild="false" ecoreFeature="ecore:EAttribute beaninfo.ecore#//EventSetDecorator/inDefaultEventSet"/>
- <genFeatures createChild="false" ecoreFeature="ecore:EAttribute beaninfo.ecore#//EventSetDecorator/unicast"/>
- <genFeatures createChild="false" ecoreFeature="ecore:EAttribute beaninfo.ecore#//EventSetDecorator/listenerMethodsExplicitEmpty"/>
- <genFeatures createChild="false" ecoreFeature="ecore:EReference beaninfo.ecore#//EventSetDecorator/addListenerMethod"/>
- <genFeatures property="None" children="true" createChild="true" ecoreFeature="ecore:EReference beaninfo.ecore#//EventSetDecorator/listenerMethods"/>
- <genFeatures createChild="false" ecoreFeature="ecore:EReference beaninfo.ecore#//EventSetDecorator/listenerType"/>
- <genFeatures createChild="false" ecoreFeature="ecore:EReference beaninfo.ecore#//EventSetDecorator/removeListenerMethod"/>
- <genFeatures notify="false" createChild="false" ecoreFeature="ecore:EReference beaninfo.ecore#//EventSetDecorator/eventAdapterClass"/>
- <genFeatures property="None" children="true" createChild="true" ecoreFeature="ecore:EReference beaninfo.ecore#//EventSetDecorator/serListMthd"/>
- </genClasses>
- <genClasses ecoreClass="beaninfo.ecore#//MethodDecorator">
- <genFeatures createChild="false" ecoreFeature="ecore:EAttribute beaninfo.ecore#//MethodDecorator/parmsExplicitEmpty"/>
- <genFeatures property="None" children="true" createChild="true" ecoreFeature="ecore:EReference beaninfo.ecore#//MethodDecorator/parameterDescriptors"/>
- <genFeatures property="None" children="true" createChild="true" ecoreFeature="ecore:EReference beaninfo.ecore#//MethodDecorator/serParmDesc"/>
- </genClasses>
- <genClasses ecoreClass="beaninfo.ecore#//ParameterDecorator">
- <genFeatures createChild="false" ecoreFeature="ecore:EAttribute beaninfo.ecore#//ParameterDecorator/name"/>
- <genFeatures createChild="false" ecoreFeature="ecore:EReference beaninfo.ecore#//ParameterDecorator/parameter"/>
- </genClasses>
- <genClasses ecoreClass="beaninfo.ecore#//PropertyDecorator">
- <genFeatures createChild="false" ecoreFeature="ecore:EAttribute beaninfo.ecore#//PropertyDecorator/bound"/>
- <genFeatures createChild="false" ecoreFeature="ecore:EAttribute beaninfo.ecore#//PropertyDecorator/constrained"/>
- <genFeatures createChild="false" ecoreFeature="ecore:EAttribute beaninfo.ecore#//PropertyDecorator/designTime"/>
- <genFeatures createChild="false" ecoreFeature="ecore:EAttribute beaninfo.ecore#//PropertyDecorator/alwaysIncompatible"/>
- <genFeatures createChild="false" ecoreFeature="ecore:EAttribute beaninfo.ecore#//PropertyDecorator/filterFlags"/>
- <genFeatures createChild="false" ecoreFeature="ecore:EAttribute beaninfo.ecore#//PropertyDecorator/fieldReadOnly"/>
- <genFeatures createChild="false" ecoreFeature="ecore:EReference beaninfo.ecore#//PropertyDecorator/propertyEditorClass"/>
- <genFeatures createChild="false" ecoreFeature="ecore:EReference beaninfo.ecore#//PropertyDecorator/readMethod"/>
- <genFeatures createChild="false" ecoreFeature="ecore:EReference beaninfo.ecore#//PropertyDecorator/writeMethod"/>
- <genFeatures notify="false" createChild="false" ecoreFeature="ecore:EReference beaninfo.ecore#//PropertyDecorator/field"/>
- <genOperations ecoreOperation="beaninfo.ecore#//PropertyDecorator/getPropertyType"/>
- <genOperations ecoreOperation="beaninfo.ecore#//PropertyDecorator/setPropertyType">
- <genParameters ecoreParameter="beaninfo.ecore#//PropertyDecorator/setPropertyType/propertyType"/>
- </genOperations>
- </genClasses>
- <genClasses ecoreClass="beaninfo.ecore#//IndexedPropertyDecorator">
- <genFeatures createChild="false" ecoreFeature="ecore:EReference beaninfo.ecore#//IndexedPropertyDecorator/indexedReadMethod"/>
- <genFeatures createChild="false" ecoreFeature="ecore:EReference beaninfo.ecore#//IndexedPropertyDecorator/indexedWriteMethod"/>
- </genClasses>
- <genClasses ecoreClass="beaninfo.ecore#//MethodProxy">
- <genFeatures createChild="false" ecoreFeature="ecore:EReference beaninfo.ecore#//MethodProxy/method"/>
- </genClasses>
- <genClasses ecoreClass="beaninfo.ecore#//BeanEvent"/>
- <genClasses ecoreClass="beaninfo.ecore#//FeatureAttributeMapEntry">
- <genFeatures createChild="false" ecoreFeature="ecore:EAttribute beaninfo.ecore#//FeatureAttributeMapEntry/key"/>
- <genFeatures property="None" children="true" createChild="true" ecoreFeature="ecore:EAttribute beaninfo.ecore#//FeatureAttributeMapEntry/value"/>
- </genClasses>
- </genPackages>
-</genmodel:GenModel>
diff --git a/plugins/org.eclipse.jem.beaninfo/plugin.properties b/plugins/org.eclipse.jem.beaninfo/plugin.properties
deleted file mode 100644
index f7f55ad..0000000
--- a/plugins/org.eclipse.jem.beaninfo/plugin.properties
+++ /dev/null
@@ -1,20 +0,0 @@
-###############################################################################
-# Copyright (c) 2003, 2005 IBM Corporation and others.
-# All rights reserved. This program and the accompanying materials
-# are made available under the terms of the Eclipse Public License v1.0
-# which accompanies this distribution, and is available at
-# http://www.eclipse.org/legal/epl-v10.html
-#
-# Contributors:
-# IBM Corporation - initial API and implementation
-###############################################################################
-#
-# $Source: /cvsroot/webtools/jeetools.move/webtools.javaee.git/plugins/org.eclipse.jem.beaninfo/plugin.properties,v $
-# $Revision: 1.7 $ $Date: 2005/08/24 20:31:29 $
-#
-
-
-pluginName=Java EMF Model BeanInfo (Introspection) Support
-providerName = Eclipse.org
-beaninfoNatureName=Java Model BeanInfo Nature
-registrations.extensionpoint.name=BeanInfo extension registrations
diff --git a/plugins/org.eclipse.jem.beaninfo/plugin.xml b/plugins/org.eclipse.jem.beaninfo/plugin.xml
deleted file mode 100644
index a8f1f1d..0000000
--- a/plugins/org.eclipse.jem.beaninfo/plugin.xml
+++ /dev/null
@@ -1,36 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<?eclipse version="3.0"?>
-<plugin>
-
- <extension-point id="registrations" name="%registrations.extensionpoint.name" schema="schema/registrations.exsd"/>
-
- <extension
- id="BeanInfoNature"
- name="%beaninfoNatureName"
- point="org.eclipse.core.resources.natures">
- <runtime>
- <run
- class="org.eclipse.jem.internal.beaninfo.adapters.BeaninfoNature">
- </run>
- </runtime>
- </extension>
- <extension
- point="org.eclipse.emf.ecore.generated_package">
- <package
- uri="http:///org/eclipse/jem/internal/beaninfo/beaninfo.ecore"
- class="org.eclipse.jem.internal.beaninfo.BeaninfoPackage">
- </package>
- </extension>
- <extension
- point="org.eclipse.team.core.fileTypes">
- <fileTypes
- type="text"
- extension="beaninfoConfig">
- </fileTypes>
- <fileTypes
- type="text"
- extension="override">
- </fileTypes>
- </extension>
-
-</plugin>
diff --git a/plugins/org.eclipse.jem.beaninfo/proxy.jars b/plugins/org.eclipse.jem.beaninfo/proxy.jars
deleted file mode 100644
index 176820a..0000000
--- a/plugins/org.eclipse.jem.beaninfo/proxy.jars
+++ /dev/null
@@ -1,2 +0,0 @@
-vm/beaninfovm.jar=/org.eclipse.jem.beaninfo/bin_vm_beaninfovm/
-beaninfocommon.jar=/org.eclipse.jem.beaninfo/bin_beaninfocommon/
\ No newline at end of file
diff --git a/plugins/org.eclipse.jem.beaninfo/rose/.cvsignore b/plugins/org.eclipse.jem.beaninfo/rose/.cvsignore
deleted file mode 100644
index 1be3a37..0000000
--- a/plugins/org.eclipse.jem.beaninfo/rose/.cvsignore
+++ /dev/null
@@ -1,2 +0,0 @@
-*.md~
-*.ca~
\ No newline at end of file
diff --git a/plugins/org.eclipse.jem.beaninfo/rose/beaninfo.cat b/plugins/org.eclipse.jem.beaninfo/rose/beaninfo.cat
deleted file mode 100644
index dd227ce..0000000
--- a/plugins/org.eclipse.jem.beaninfo/rose/beaninfo.cat
+++ /dev/null
@@ -1,3301 +0,0 @@
-
-(object Petal
- version 47
- _written "Rose 8.0.0303.1400"
- charSet 0)
-
-(object Class_Category "beaninfo"
- is_unit TRUE
- is_loaded TRUE
- attributes (list Attribute_Set
- (object Attribute
- tool "Ecore"
- name "basePackage"
- value (value Text "org.eclipse.jem.internal.beaninfo")))
- quid "3A799ABB0353"
- exportControl "Public"
- logical_models (list unit_reference_list
- (object Class "FeatureDecorator"
- quid "3A799B3E01E9"
- documentation
-|Equivalent to FeatureDescriptor in java.
-|<p>
-|Note: If any attribute is explicitly set then the BeanInfo/Reflection will not be merged into the decorator. This provides a way of overriding the BeanInfos. Also for any many-valued attribute, if it is desired to have it explicitly empty and not have BeanInfo fill it in, there will be another attribute named of the form "attibutueExplicitEmpty" If this is true then the BeanInfo will not merge in and will leave it empty.
-|<p>
-|These comments about merging apply to all subclasses of this decorator too.
-
- superclasses (list inheritance_relationship_list
- (object Inheritance_Relationship
- quid "3DFA185900DC"
- supplier "Logical View::ecore::EAnnotation"
- quidu "3D98A1C701AB"))
- operations (list Operations
- (object Operation "getName"
- quid "3B867D0D0184"
- result "String"
- concurrency "Sequential"
- opExportControl "Public"
- uid 0))
- class_attributes (list class_attribute_list
- (object ClassAttribute "displayName"
- attributes (list Attribute_Set
- (object Attribute
- tool "Ecore"
- name "isUnsettable"
- value TRUE))
- quid "3A79CFCC0131"
- type "String"
- exportControl "Public")
- (object ClassAttribute "shortDescription"
- attributes (list Attribute_Set
- (object Attribute
- tool "Ecore"
- name "isUnsettable"
- value TRUE))
- quid "3A79CFD501E8"
- type "String"
- exportControl "Public")
- (object ClassAttribute "category"
- attributes (list Attribute_Set)
- quid "3BA2797102DC"
- type "String"
- exportControl "Public")
- (object ClassAttribute "expert"
- attributes (list Attribute_Set
- (object Attribute
- tool "Ecore"
- name "isUnsettable"
- value TRUE))
- quid "3A79CFE700FE"
- type "boolean"
- exportControl "Public")
- (object ClassAttribute "hidden"
- attributes (list Attribute_Set
- (object Attribute
- tool "Ecore"
- name "isUnsettable"
- value TRUE))
- quid "3A79D0050328"
- type "boolean"
- exportControl "Public")
- (object ClassAttribute "preferred"
- attributes (list Attribute_Set
- (object Attribute
- tool "Ecore"
- name "isUnsettable"
- value TRUE))
- quid "3A79D0240318"
- type "boolean"
- exportControl "Public")
- (object ClassAttribute "mergeIntrospection"
- quid "3A82C0A60389"
- documentation "Should the introspection results be merged into this decorator. If this is set to false, then the introspection results are ignored for this particular decorator. This is an internal feature simply to allow desired override capabilities. Customers would use it to prevent ANY introspection/reflection from occurring."
- type "boolean"
- initv "true"
- exportControl "Implementation")
- (object ClassAttribute "attributesExplicitEmpty"
- quid "3C9B49320265"
- documentation "The attributes are explicitly set as empty and not retrieved from the beaninfo/reflection. Customers should set this if they want the list of attributes to be empty and not merged with the BeanInfo results. "
- type "boolean"
- exportControl "Implementation")
- (object ClassAttribute "implicitlySetBits"
- quid "41E5815D02B9"
- documentation
-|A bitflag for which attributes have been set by BeanInfo/Reflection.
-|<p>
-|This is an internal attribute that is used by the BeanInfo maintanance. It is not meant to be used by customers.
-
- type "long")
- (object ClassAttribute "implicitDecoratorFlag"
- quid "41E5A05D021A"
- documentation
-|Is this decorator/feature implicit. This means created by Introspection/Reflection and not by customer.
-|<p>
-|This is an internal attribute that is used by the BeanInfo maintanance. It is not meant to be used by customers.
-
- type "ImplicitItem"
- quidu "41E59E5D0296")))
- (object Class "BeanDecorator"
- quid "3A79D0DF02D1"
- documentation "Equivalent to BeanDecorator in java."
- superclasses (list inheritance_relationship_list
- (object Inheritance_Relationship
- quid "3A79DE8E007F"
- supplier "Logical View::beaninfo::FeatureDecorator"
- quidu "3A799B3E01E9"))
- class_attributes (list class_attribute_list
- (object ClassAttribute "mergeSuperProperties"
- attributes (list Attribute_Set
- (object Attribute
- tool "Ecore"
- name "isUnsettable"
- value TRUE))
- quid "3A82B73E0200"
- documentation "Should the properties of super types be merged when asking for eAllAttributes/eAllReferences."
- type "boolean"
- initv "true"
- exportControl "Implementation")
- (object ClassAttribute "mergeSuperMethods"
- attributes (list Attribute_Set
- (object Attribute
- tool "Ecore"
- name "isUnsettable"
- value TRUE))
- quid "3A82B9940015"
- documentation "Should the methods of super types be merged when asking for eAllBehaviors."
- type "boolean"
- initv "true"
- exportControl "Implementation")
- (object ClassAttribute "mergeSuperEvents"
- attributes (list Attribute_Set
- (object Attribute
- tool "Ecore"
- name "isUnsettable"
- value TRUE))
- quid "3A82B99F0165"
- documentation "Should the events of super types be merged when asking for eAllEvents."
- type "boolean"
- initv "true"
- exportControl "Implementation")
- (object ClassAttribute "introspectProperties"
- quid "3A8427EC00A6"
- documentation "Should the properties from the introspection be added to the class. This allows properties to not be introspected and to use only what is defined explicitly in the JavaClass xmi file."
- type "boolean"
- initv "true"
- exportControl "Implementation")
- (object ClassAttribute "introspectMethods"
- quid "3A84287501B1"
- documentation "Should the methods from the introspection be added to the class. This allows methods to not be introspected and to use only what is defined explicitly in the JavaClass xmi file."
- type "boolean"
- initv "true"
- exportControl "Implementation")
- (object ClassAttribute "introspectEvents"
- quid "3A842877000F"
- documentation "Should the events from the introspection be added to the class. This allows events to not be introspected and to use only what is defined explicitly in the JavaClass xmi file."
- type "boolean"
- initv "true"
- exportControl "Implementation")
- (object ClassAttribute "doBeaninfo"
- quid "3C9A46FC027C"
- documentation "This means do we go and get the beaninfo from the remote vm. If false, then it will not try to get the beaninfo. This doesn't prevent introspection through reflection. That is controled by the separate introspect... attributes."
- type "boolean"
- initv "true"
- exportControl "Implementation")
- (object ClassAttribute "notInheritedPropertyNames"
- quid "41EED50B0185"
- documentation
-|This is the list of inherited property names to not use in getAllProperties(). These names are properties that should not be inherited and should not show through. If the inherited property is not on the list then it will show in getAllProperties().
-|<p>
-|This list will be empty if all properties are inherited or if the mergeSuperProperties flag is false.
-|<p>
-|Note: This attribute is not meant to be changed by clients. It is an internal attribute.
-
- stereotype "0..*"
- type "String")
- (object ClassAttribute "notInheritedMethodNames"
- quid "41F02C5F0399"
- documentation
-|This is the list of inherited method names to not use in eAllOperations(). These names are operations that should not be inherited and should not show through. If the inherited operation is not on the list then it will show in getAllOperations().
-|<p>
-|This list will be empty if all operations are inherited or if the mergeSuperBehaviors flag is false.
-
- stereotype "0..*"
- type "String")
- (object ClassAttribute "notInheritedEventNames"
- quid "41F02D0A0312"
- documentation
-|This is the list of inherited event names to not use in getAllEvents(). These names are events that should not be inherited and should not show through. If the inherited event is not on the list then it will show in getAllEvents().
-|<p>
-|This list will be empty if all events are inherited or if the mergeSuperEvents flag is false.
-
- stereotype "0..*"
- type "String")))
- (object Class "EventSetDecorator"
- quid "3A79D1D2004F"
- documentation "Equivalent to EventSetDecorator in java."
- superclasses (list inheritance_relationship_list
- (object Inheritance_Relationship
- quid "3A79DEA200EC"
- supplier "Logical View::beaninfo::FeatureDecorator"
- quidu "3A799B3E01E9"))
- class_attributes (list class_attribute_list
- (object ClassAttribute "inDefaultEventSet"
- attributes (list Attribute_Set
- (object Attribute
- tool "Ecore"
- name "isUnsettable"
- value TRUE))
- quid "3A79D94F004C"
- type "boolean"
- exportControl "Public")
- (object ClassAttribute "unicast"
- attributes (list Attribute_Set
- (object Attribute
- tool "Ecore"
- name "isUnsettable"
- value TRUE))
- quid "3A79D9580167"
- type "boolean"
- exportControl "Public")
- (object ClassAttribute "listenerMethodsExplicitEmpty"
- quid "3CB1AF7D0286"
- documentation "Set true if the listenerMethods feature is explicitly set as empty and is not to have listener methods merged in from BeanInfo or reflection."
- type "boolean"
- exportControl "Implementation")))
- (object Class "MethodDecorator"
- quid "3A79D35E0027"
- documentation "Equivalent to MethodDecorator in java."
- superclasses (list inheritance_relationship_list
- (object Inheritance_Relationship
- quid "3A79DEA603E1"
- supplier "Logical View::beaninfo::FeatureDecorator"
- quidu "3A799B3E01E9"))
- class_attributes (list class_attribute_list
- (object ClassAttribute "parmsExplicitEmpty"
- quid "3B86ABE80092"
- documentation "Set true if the parms feature is explicitly set as empty and is not to have parameters merged in from BeanInfo or reflection."
- type "boolean"
- exportControl "Implementation")))
- (object Class "ParameterDecorator"
- quid "3A79D9C20304"
- superclasses (list inheritance_relationship_list
- (object Inheritance_Relationship
- quid "3A79DEBB01C4"
- supplier "Logical View::beaninfo::FeatureDecorator"
- quidu "3A799B3E01E9"))
- class_attributes (list class_attribute_list
- (object ClassAttribute "name"
- quid "3B86A6700099"
- documentation "The name is explicit here because unlike the other feature decorators, the name does not come from the object being decorated."
- type "String"
- exportControl "Public")))
- (object Class "PropertyDecorator"
- quid "3A79DA68010E"
- documentation "Equivalent to PropertyDecorator in java."
- superclasses (list inheritance_relationship_list
- (object Inheritance_Relationship
- quid "3A79DE9702BD"
- supplier "Logical View::beaninfo::FeatureDecorator"
- quidu "3A799B3E01E9"))
- operations (list Operations
- (object Operation "getPropertyType"
- quid "3B8CF526039D"
- documentation "Get the property type."
- result "EClassifier"
- concurrency "Sequential"
- opExportControl "Public"
- uid 0
- quidu "3ACE4FEE0371")
- (object Operation "setPropertyType"
- quid "4329D1CE030E"
- documentation "Set the property type."
- parameters (list Parameters
- (object Parameter "propertyType"
- quid "4329D1E20168"
- type "EClassifier"
- quidu "3ACE4FEE0371"))
- concurrency "Sequential"
- opExportControl "Public"
- uid 0))
- class_attributes (list class_attribute_list
- (object ClassAttribute "bound"
- attributes (list Attribute_Set
- (object Attribute
- tool "Ecore"
- name "isUnsettable"
- value TRUE))
- quid "3A79DC250303"
- type "boolean"
- exportControl "Public")
- (object ClassAttribute "constrained"
- attributes (list Attribute_Set
- (object Attribute
- tool "Ecore"
- name "isUnsettable"
- value TRUE))
- quid "3A79DC2C00A0"
- type "boolean"
- exportControl "Public")
- (object ClassAttribute "designTime"
- attributes (list Attribute_Set
- (object Attribute
- tool "Ecore"
- name "isUnsettable"
- value TRUE))
- quid "3BA27455019B"
- documentation
-|If not set, then normal default processing.
-|
-|If set true, then this property is a design time property. This means it will show up in the property sheet, but it won't be able to be connected to at runtime. It may not even be a true bean property but instead the builder will know how to handle it.
-|
-|If set false, then this property will not show up on the property sheet, but will be able to be connected to for runtime.
-
- type "boolean"
- exportControl "Public")
- (object ClassAttribute "alwaysIncompatible"
- quid "3BA27A1700BE"
- documentation "If set true, then when multiple objects are selected, this property is always incompatible with each other. So in this case the property will not show up on the property sheet if more than one object has been selected."
- type "boolean"
- exportControl "Public")
- (object ClassAttribute "filterFlags"
- quid "3BA3B18F0036"
- stereotype "0..*"
- type "String"
- exportControl "Public")
- (object ClassAttribute "fieldReadOnly"
- quid "4207E101018E"
- documentation
-|Is this field read-only (i.e. is a "final" field). This is only referenced if the field reference is set.
-
- type "boolean"
- exportControl "Public")))
- (object Class "IndexedPropertyDecorator"
- quid "3A79DC450309"
- documentation "Equivalent to IndexedPropertyDecorator"
- superclasses (list inheritance_relationship_list
- (object Inheritance_Relationship
- quid "3A79DE840388"
- supplier "Logical View::beaninfo::PropertyDecorator"
- quidu "3A79DA68010E")))
- (object Class "MethodProxy"
- quid "3A8984C901C3"
- documentation
-|This is just a wrapper of a java Method. It allows access to the method but doesn't duplicate the interface for it.
-|<p>
-|MethodProxies will be in the eBehaviors setting for any methods that are in the JavaClass methods setting so that they are not duplicated.
-|<p>
-|MethodProxies would also have MethodDecorators.
-
- superclasses (list inheritance_relationship_list
- (object Inheritance_Relationship
- quid "3DFA19B600DE"
- supplier "Logical View::ecore::EOperation"
- quidu "3904DAA200A0")))
- (object Class "BeanEvent"
- quid "3CB09CA90212"
- documentation
-|Event from Introspection/Reflection.
-|<p>
-|The BeanEvent will be under the JavaClass' events and allEvents feature. Each BeanEvent will be decorated by an EventSetDecorator.
-
- superclasses (list inheritance_relationship_list
- (object Inheritance_Relationship
- quid "3CB09CB6038D"
- supplier "Logical View::java::JavaEvent"
- quidu "3C62FAF103C8")))
- (object Class "FeatureAttributeMapEntry"
- quid "404CC85501F5"
- stereotype "MapEntry"
- class_attributes (list class_attribute_list
- (object ClassAttribute "key"
- quid "404CC8B70304"
- type "String"
- exportControl "Public")
- (object ClassAttribute "value"
- attributes (list Attribute_Set)
- quid "41E58414010A"
- type "FeatureAttributeValue"
- quidu "41E582F800BB"
- exportControl "Public")))
- (object Class "FeatureAttributeValue"
- quid "41E582F800BB"
- documentation
-|This is the attribute value for feature attribute. It can only represent the following:
-|
-|- String
-|- primitives
-|- array (type Object) containing mixture of Strings and primitives (as the object types)
-|- array (type String)
-|- array (type primitive)
-|
-|Anything else cannot be represented.
-
- stereotype "datatype"
- class_attributes (list class_attribute_list
- (object ClassAttribute "org.eclipse.jem.internal.beaninfo.common.FeatureAttributeValue"
- quid "41E583B503CA"
- stereotype "javaclass")))
- (object Class "ImplicitItem"
- quid "41E59E5D0296"
- documentation
-|This enum is an internal enum. It is used by BeanInfo for cache maintenance.
-|<p>
-|This enum is not meant to be used by clients.
-
- stereotype "enumeration"
- exportControl "Protected"
- class_attributes (list class_attribute_list
- (object ClassAttribute "NOT_IMPLICIT"
- quid "41E59F2A00EC"
- documentation "Means this decorator is not implicit. That is it was created by customer.")
- (object ClassAttribute "IMPLICIT_DECORATOR"
- quid "41E59F7200B4"
- documentation "This means that the decorator is implicit. That is it was not created by the customer.")
- (object ClassAttribute "IMPLICIT_DECORATOR_AND_FEATURE"
- quid "41E59FA303B7"
- documentation "This means the decorator and the feature where implicit. That is they were not created by the customer.")))
- (object Association "$UNNAMED$0"
- quid "3A79CF6C0378"
- roles (list role_list
- (object Role "attributes"
- attributes (list Attribute_Set)
- quid "3A79CF6E00BE"
- documentation "Feature attributes. Key/value pairs. If it is desired that the feature attributes is explicitly empty and not have BeanInfo/reflection set it, set attributesExplicitEmpty to true."
- label "attributes"
- supplier "Logical View::beaninfo::FeatureAttributeMapEntry"
- quidu "404CC85501F5"
- client_cardinality (value cardinality "0..n")
- Containment "By Value"
- is_navigable TRUE)
- (object Role "$UNNAMED$1"
- quid "3A79CF6E00C8"
- supplier "Logical View::beaninfo::FeatureDecorator"
- quidu "3A799B3E01E9"
- is_aggregate TRUE)))
- (object Association "$UNNAMED$2"
- quid "3A79D1350248"
- roles (list role_list
- (object Role "customizerClass"
- attributes (list Attribute_Set)
- quid "3A79D13601D2"
- label "customizerClass"
- supplier "Logical View::java::JavaClass"
- quidu "36549FCC00FA"
- client_cardinality (value cardinality "0..1")
- Containment "By Reference"
- is_navigable TRUE)
- (object Role "$UNNAMED$3"
- quid "3A79D13601E6"
- supplier "Logical View::beaninfo::BeanDecorator"
- quidu "3A79D0DF02D1")))
- (object Association "$UNNAMED$4"
- quid "3A79D3080128"
- roles (list role_list
- (object Role "addListenerMethod"
- quid "3A79D3090346"
- label "addListenerMethod"
- supplier "Logical View::java::Method"
- quidu "3654AE910271"
- client_cardinality (value cardinality "1")
- Containment "By Reference"
- is_navigable TRUE)
- (object Role "$UNNAMED$5"
- quid "3A79D309035A"
- supplier "Logical View::beaninfo::EventSetDecorator"
- quidu "3A79D1D2004F")))
- (object Association "$UNNAMED$6"
- quid "3A79D3E10364"
- roles (list role_list
- (object Role "listenerMethods"
- attributes (list Attribute_Set
- (object Attribute
- tool "Ecore"
- name "isTransient"
- value TRUE)
- (object Attribute
- tool "Ecore"
- name "isVolatile"
- value TRUE))
- quid "3A79D3E6007D"
- documentation
-|listener methods. If it is desired that the list be explicitly empty and not have BeanInfo set it, then set listenerMethodsExplicitEmpty to true.
-|<p>
-|ListenerMethods will be decorated with MethodDecorators.
-|<p>
-|Note: This is a derived setting, which means it will not notify out changes to it. To here changes to it, listen on "serListMthd" notifications instead.
-
- label "listenerMethods"
- supplier "Logical View::beaninfo::MethodProxy"
- quidu "3A8984C901C3"
- client_cardinality (value cardinality "1..n")
- Containment "By Reference"
- is_navigable TRUE)
- (object Role "$UNNAMED$7"
- quid "3A79D3E60091"
- supplier "Logical View::beaninfo::EventSetDecorator"
- quidu "3A79D1D2004F"))
- derived TRUE)
- (object Association "$UNNAMED$8"
- quid "3A79D4A80158"
- roles (list role_list
- (object Role "listenerType"
- quid "3A79D4AA038B"
- label "listenerType"
- supplier "Logical View::java::JavaClass"
- quidu "36549FCC00FA"
- client_cardinality (value cardinality "1")
- Containment "By Reference"
- is_navigable TRUE)
- (object Role "$UNNAMED$9"
- quid "3A79D4AA03B4"
- supplier "Logical View::beaninfo::EventSetDecorator"
- quidu "3A79D1D2004F")))
- (object Association "$UNNAMED$10"
- quid "3A79D4DF020B"
- roles (list role_list
- (object Role "removeListenerMethod"
- quid "3A79D4E10395"
- label "removeListenerMethod"
- supplier "Logical View::java::Method"
- quidu "3654AE910271"
- client_cardinality (value cardinality "1")
- Containment "By Reference"
- is_navigable TRUE)
- (object Role "$UNNAMED$11"
- quid "3A79D4E103A9"
- supplier "Logical View::beaninfo::EventSetDecorator"
- quidu "3A79D1D2004F")))
- (object Association "$UNNAMED$12"
- quid "3A79DA1A02F7"
- roles (list role_list
- (object Role "parameterDescriptors"
- attributes (list Attribute_Set
- (object Attribute
- tool "Ecore"
- name "isTransient"
- value TRUE)
- (object Attribute
- tool "Ecore"
- name "isVolatile"
- value TRUE))
- quid "3A79DA1C0231"
- documentation
-|This is the parameter descriptors list.
-|<p>
-|Note: This is a derived setting, which means it will not notify out changes to it. To here changes to it, listen on "serParmDesc" notifications instead.
-
- label "parameterDescriptors"
- supplier "Logical View::beaninfo::ParameterDecorator"
- quidu "3A79D9C20304"
- client_cardinality (value cardinality "0..n")
- Containment "By Reference"
- is_navigable TRUE)
- (object Role "$UNNAMED$13"
- quid "3A79DA1C0232"
- supplier "Logical View::beaninfo::MethodDecorator"
- quidu "3A79D35E0027"))
- derived TRUE)
- (object Association "$UNNAMED$14"
- quid "3A79DB0B0339"
- roles (list role_list
- (object Role "propertyEditorClass"
- quid "3A79DB0E013F"
- label "propertyEditorClass"
- supplier "Logical View::java::JavaClass"
- quidu "36549FCC00FA"
- client_cardinality (value cardinality "0..1")
- Containment "By Reference"
- is_navigable TRUE)
- (object Role "$UNNAMED$15"
- quid "3A79DB0E0171"
- supplier "Logical View::beaninfo::PropertyDecorator"
- quidu "3A79DA68010E")))
- (object Association "$UNNAMED$16"
- quid "3A79DBBD0000"
- roles (list role_list
- (object Role "readMethod"
- attributes (list Attribute_Set
- (object Attribute
- tool "Ecore"
- name "isUnsettable"
- value TRUE))
- quid "3A79DBBF0071"
- label "readMethod"
- supplier "Logical View::java::Method"
- quidu "3654AE910271"
- client_cardinality (value cardinality "0..1")
- Containment "By Reference"
- is_navigable TRUE)
- (object Role "$UNNAMED$17"
- quid "3A79DBBF0085"
- supplier "Logical View::beaninfo::PropertyDecorator"
- quidu "3A79DA68010E")))
- (object Association "$UNNAMED$18"
- quid "3A79DBDF02D0"
- roles (list role_list
- (object Role "writeMethod"
- attributes (list Attribute_Set
- (object Attribute
- tool "Ecore"
- name "isUnsettable"
- value TRUE))
- quid "3A79DBE101F7"
- label "writeMethod"
- supplier "Logical View::java::Method"
- quidu "3654AE910271"
- client_cardinality (value cardinality "0..1")
- Containment "By Reference"
- is_navigable TRUE)
- (object Role "$UNNAMED$19"
- quid "3A79DBE1020B"
- supplier "Logical View::beaninfo::PropertyDecorator"
- quidu "3A79DA68010E")))
- (object Association "$UNNAMED$20"
- quid "3A79DE34036F"
- roles (list role_list
- (object Role "indexedReadMethod"
- attributes (list Attribute_Set
- (object Attribute
- tool "Ecore"
- name "isUnsettable"
- value TRUE))
- quid "3A79DE3503CA"
- label "indexedReadMethod"
- supplier "Logical View::java::Method"
- quidu "3654AE910271"
- client_cardinality (value cardinality "0..1")
- Containment "By Reference"
- is_navigable TRUE)
- (object Role "$UNNAMED$21"
- quid "3A79DE3503DE"
- supplier "Logical View::beaninfo::IndexedPropertyDecorator"
- quidu "3A79DC450309")))
- (object Association "$UNNAMED$22"
- quid "3A79DE540180"
- roles (list role_list
- (object Role "indexedWriteMethod"
- attributes (list Attribute_Set
- (object Attribute
- tool "Ecore"
- name "isUnsettable"
- value TRUE))
- quid "3A79DE5503D0"
- label "indexedWriteMethod"
- supplier "Logical View::java::Method"
- quidu "3654AE910271"
- client_cardinality (value cardinality "0..1")
- Containment "By Reference"
- is_navigable TRUE)
- (object Role "$UNNAMED$23"
- quid "3A79DE5503E4"
- supplier "Logical View::beaninfo::IndexedPropertyDecorator"
- quidu "3A79DC450309")))
- (object Association "$UNNAMED$24"
- quid "3A89865B01D5"
- roles (list role_list
- (object Role "method"
- quid "3A89865C01AE"
- label "method"
- supplier "Logical View::java::Method"
- quidu "3654AE910271"
- client_cardinality (value cardinality "1")
- Containment "By Reference"
- is_navigable TRUE)
- (object Role "$UNNAMED$25"
- quid "3A89865C01CC"
- supplier "Logical View::beaninfo::MethodProxy"
- quidu "3A8984C901C3")))
- (object Association "$UNNAMED$26"
- quid "3C9A6EDD02C2"
- roles (list role_list
- (object Role "parameter"
- attributes (list Attribute_Set
- (object Attribute
- tool "Ecore"
- name "isTransient"
- value TRUE))
- quid "3C9A6EDE01FB"
- documentation "The JavaParameter that this ParameterDecorator is decorating. Can't use eDecorates in this."
- label "parameter"
- supplier "Logical View::java::JavaParameter"
- quidu "3654AD780280"
- client_cardinality (value cardinality "0..1")
- is_navigable TRUE)
- (object Role "$UNNAMED$27"
- quid "3C9A6EDE0205"
- supplier "Logical View::beaninfo::ParameterDecorator"
- quidu "3A79D9C20304")))
- (object Association "$UNNAMED$28"
- quid "41F016E7002E"
- roles (list role_list
- (object Role "serParmDesc"
- quid "41F016E802A7"
- documentation "This is a private feature. It is used internally only. "
- label "serParmDesc"
- supplier "Logical View::beaninfo::ParameterDecorator"
- quidu "3A79D9C20304"
- client_cardinality (value cardinality "0..n")
- Containment "By Value"
- exportControl "Private"
- is_navigable TRUE)
- (object Role "$UNNAMED$29"
- quid "41F016E802B1"
- supplier "Logical View::beaninfo::MethodDecorator"
- quidu "3A79D35E0027"
- is_aggregate TRUE)))
- (object Association "$UNNAMED$30"
- quid "41F11E710387"
- roles (list role_list
- (object Role "eventAdapterClass"
- quid "41F11E730249"
- documentation
-|For some listener interfaces an adapter class is provided that implements default no-op methods, e.g. java.awt.event.FocusEvent which has java.awt.event.FocusAdapter. The Adapter class is provided in a key/value pair on the java.beans.EventSetDescriptor with a key defined in a static final constants EVENTADAPTERCLASS = "eventAdapterClass".
-
- label "eventAdapterClass"
- supplier "Logical View::java::JavaClass"
- quidu "36549FCC00FA"
- client_cardinality (value cardinality "0..1")
- Containment "By Reference"
- is_navigable TRUE)
- (object Role "$UNNAMED$31"
- quid "41F11E73025D"
- supplier "Logical View::beaninfo::EventSetDecorator"
- quidu "3A79D1D2004F")))
- (object Association "$UNNAMED$32"
- quid "41F1278A01A5"
- roles (list role_list
- (object Role "serListMthd"
- quid "41F1278B021F"
- documentation "This is a private feature. It is used internally only. "
- label "serListMthd"
- supplier "Logical View::beaninfo::MethodProxy"
- quidu "3A8984C901C3"
- client_cardinality (value cardinality "1..n")
- Containment "By Value"
- exportControl "Private"
- is_navigable TRUE)
- (object Role "$UNNAMED$33"
- quid "41F1278B0229"
- supplier "Logical View::beaninfo::EventSetDecorator"
- quidu "3A79D1D2004F"
- is_aggregate TRUE)))
- (object Association "$UNNAMED$34"
- quid "4207D83F01DA"
- roles (list role_list
- (object Role "field"
- attributes (list Attribute_Set
- (object Attribute
- tool "Ecore"
- name "isUnsettable"
- value TRUE))
- quid "4207D8400290"
- documentation "If this is set, then this property is a field and not a getter/setter property. This is an extension that the Visual Editor uses to the BeanInfo model."
- label "field"
- supplier "Logical View::java::Field"
- quidu "3654AF8F0280"
- client_cardinality (value cardinality "0..1")
- is_navigable TRUE)
- (object Role "$UNNAMED$35"
- quid "4207D8400292"
- supplier "Logical View::beaninfo::PropertyDecorator"
- quidu "3A79DA68010E"))))
- logical_presentations (list unit_reference_list
- (object ClassDiagram "Main"
- quid "3A799AC8038E"
- title "Main"
- zoom 100
- max_height 28350
- max_width 21600
- origin_x 0
- origin_y 94
- items (list diagram_item_list
- (object NoteView @1
- location (3232, 1712)
- font (object Font
- size 10
- face "Arial"
- bold FALSE
- italics FALSE
- underline FALSE
- strike FALSE
- color 0
- default_color TRUE)
- label (object ItemLabel
- Parent_View @1
- location (2950, 1624)
- fill_color 13434879
- nlines 3
- max_width 528
- label "ListenerMethods will be decorated with MethodDecorators.")
- line_color 3342489
- fill_color 13434879
- width 588
- height 188)
- (object NoteView @2
- location (3392, 2784)
- font (object Font
- size 10
- face "Arial"
- bold FALSE
- italics FALSE
- underline FALSE
- strike FALSE
- color 0
- default_color TRUE)
- label (object ItemLabel
- Parent_View @2
- location (3076, 2568)
- fill_color 13434879
- nlines 8
- max_width 596
- label
-|MethodProxies will be in the eBehaviors setting for any methods that are in the JavaClass methods setting so that they are not duplicated.
-|
-|MethodProxies would also have MethodDecorators.
- )
- line_color 3342489
- fill_color 13434879
- width 656
- height 444)
- (object ClassView "Class" "Logical View::java::JavaEvent" @3
- ShowCompartmentStereotypes TRUE
- IncludeAttribute TRUE
- IncludeOperation TRUE
- location (1248, 2688)
- font (object Font
- size 10
- face "Arial"
- bold FALSE
- italics TRUE
- underline FALSE
- strike FALSE
- color 0
- default_color TRUE)
- label (object ItemLabel
- Parent_View @3
- location (1114, 2614)
- fill_color 13434879
- nlines 1
- max_width 268
- justify 0
- label "JavaEvent")
- icon_style "Icon"
- line_color 3342489
- fill_color 16777088
- quidu "3C62FAF103C8"
- width 286
- height 172
- annotation 8
- autoResize TRUE)
- (object ClassView "Class" "Logical View::beaninfo::BeanEvent" @4
- ShowCompartmentStereotypes TRUE
- IncludeAttribute TRUE
- IncludeOperation TRUE
- location (1232, 2992)
- font (object Font
- size 10
- face "Arial"
- bold FALSE
- italics FALSE
- underline FALSE
- strike FALSE
- color 0
- default_color TRUE)
- label (object ItemLabel
- Parent_View @4
- location (1096, 2941)
- fill_color 13434879
- nlines 1
- max_width 272
- justify 0
- label "BeanEvent")
- icon_style "Icon"
- line_color 3342489
- fill_color 13434879
- quidu "3CB09CA90212"
- width 290
- height 126
- annotation 8
- autoResize TRUE)
- (object InheritView "" @5
- stereotype TRUE
- line_color 3342489
- quidu "3CB09CB6038D"
- client @4
- supplier @3
- line_style 0)
- (object NoteView @6
- location (1856, 2944)
- font (object Font
- size 10
- face "Arial"
- bold FALSE
- italics FALSE
- underline FALSE
- strike FALSE
- color 0
- default_color TRUE)
- label (object ItemLabel
- Parent_View @6
- location (1561, 2815)
- fill_color 13434879
- nlines 5
- max_width 555
- label "The BeanEvent will be under the JavaClass' events and allEvents feature. Each BeanEvent will be decorated by an EventSetDecorator.")
- line_color 3342489
- fill_color 13434879
- width 615
- height 270)
- (object ClassView "Class" "Logical View::ecore::EAnnotation" @7
- ShowCompartmentStereotypes TRUE
- location (1056, 128)
- font (object Font
- size 10
- face "Arial"
- bold FALSE
- italics FALSE
- underline FALSE
- strike FALSE
- color 0
- default_color TRUE)
- label (object ItemLabel
- Parent_View @7
- location (906, 54)
- fill_color 13434879
- nlines 1
- max_width 300
- justify 0
- label "EAnnotation")
- icon_style "Icon"
- line_color 3342489
- fill_color 16776960
- quidu "3D98A1C701AB"
- width 318
- height 172
- annotation 8
- autoResize TRUE)
- (object ClassView "Class" "Logical View::ecore::EOperation" @8
- ShowCompartmentStereotypes TRUE
- IncludeAttribute TRUE
- IncludeOperation TRUE
- location (2848, 2272)
- font (object Font
- size 10
- face "Arial"
- bold FALSE
- italics FALSE
- underline FALSE
- strike FALSE
- color 0
- default_color TRUE)
- label (object ItemLabel
- Parent_View @8
- location (2702, 2198)
- fill_color 13434879
- nlines 1
- max_width 292
- justify 0
- label "EOperation")
- icon_style "Icon"
- line_color 3342489
- fill_color 16776960
- quidu "3904DAA200A0"
- width 310
- height 172
- annotation 8
- autoResize TRUE)
- (object ClassView "Class" "Logical View::beaninfo::FeatureAttributeMapEntry" @9
- ShowCompartmentStereotypes TRUE
- IncludeAttribute TRUE
- IncludeOperation TRUE
- location (2224, 176)
- font (object Font
- size 10
- face "Arial"
- bold FALSE
- italics FALSE
- underline FALSE
- strike FALSE
- color 0
- default_color TRUE)
- label (object ItemLabel
- Parent_View @9
- location (1887, 92)
- fill_color 13434879
- nlines 1
- max_width 674
- justify 0
- label "FeatureAttributeMapEntry")
- stereotype (object ItemLabel
- Parent_View @9
- location (1887, 42)
- fill_color 13434879
- anchor 10
- nlines 1
- max_width 674
- justify 0
- label "<<MapEntry>>")
- icon_style "Icon"
- line_color 3342489
- fill_color 13434879
- quidu "404CC85501F5"
- compartment (object Compartment
- Parent_View @9
- location (1887, 153)
- font (object Font
- size 10
- face "Arial"
- bold FALSE
- italics FALSE
- underline FALSE
- strike FALSE
- color 0
- default_color TRUE)
- icon_style "Icon"
- fill_color 16777215
- anchor 2
- nlines 3
- max_width 581)
- width 692
- height 292
- annotation 8
- autoResize TRUE)
- (object ClassView "Class" "Logical View::beaninfo::FeatureDecorator" @10
- ShowCompartmentStereotypes TRUE
- IncludeAttribute TRUE
- IncludeOperation TRUE
- ShowOperationSignature TRUE
- location (1072, 656)
- font (object Font
- size 10
- face "Arial"
- bold FALSE
- italics FALSE
- underline FALSE
- strike FALSE
- color 0
- default_color TRUE)
- label (object ItemLabel
- Parent_View @10
- location (665, 325)
- fill_color 13434879
- nlines 1
- max_width 814
- justify 0
- label "FeatureDecorator")
- icon_style "Icon"
- line_color 3342489
- fill_color 13434879
- quidu "3A799B3E01E9"
- compartment (object Compartment
- Parent_View @10
- location (665, 386)
- font (object Font
- size 10
- face "Arial"
- bold FALSE
- italics FALSE
- underline FALSE
- strike FALSE
- color 0
- default_color TRUE)
- icon_style "Icon"
- fill_color 16777215
- anchor 2
- nlines 12
- max_width 700)
- width 832
- height 686
- annotation 8
- autoResize TRUE)
- (object InheritTreeView "" @11
- location (1072, 1105)
- line_color 3342489
- fill_color 13434879
- supplier @10
- vertices (list Points
- (1072, 1105)
- (1072, 999)))
- (object InheritView "" @12
- stereotype TRUE
- line_color 3342489
- quidu "3DFA185900DC"
- client @10
- supplier @7
- line_style 0)
- (object AssociationViewNew "$UNNAMED$0" @13
- location (1682, 401)
- font (object Font
- size 10
- face "Arial"
- bold FALSE
- italics FALSE
- underline FALSE
- strike FALSE
- color 0
- default_color TRUE)
- stereotype TRUE
- line_color 3342489
- quidu "3A79CF6C0378"
- roleview_list (list RoleViews
- (object RoleView "attributes" @14
- Parent_View @13
- location (626, -63)
- font (object Font
- size 10
- face "Arial"
- bold FALSE
- italics FALSE
- underline FALSE
- strike FALSE
- color 0
- default_color TRUE)
- label (object SegLabel @15
- Parent_View @14
- location (1747, 309)
- font (object Font
- size 10
- face "Arial"
- bold FALSE
- italics FALSE
- underline FALSE
- strike FALSE
- color 0
- default_color TRUE)
- anchor 1
- anchor_loc 1
- nlines 1
- max_width 207
- justify 0
- label "+attributes"
- pctDist 0.457012
- height 62
- orientation 0)
- stereotype TRUE
- line_color 3342489
- quidu "3A79CF6E00BE"
- client @13
- supplier @9
- line_style 0
- label (object SegLabel @16
- Parent_View @14
- location (1812, 396)
- font (object Font
- size 10
- face "Arial"
- bold FALSE
- italics FALSE
- underline FALSE
- strike FALSE
- color 0
- default_color TRUE)
- anchor 2
- anchor_loc 1
- nlines 1
- max_width 15
- justify 0
- label "0..n"
- pctDist 0.584653
- height 45
- orientation 1))
- (object RoleView "$UNNAMED$1" @17
- Parent_View @13
- location (626, -63)
- stereotype TRUE
- line_color 3342489
- quidu "3A79CF6E00C8"
- client @13
- supplier @10
- line_style 0)))
- (object ClassView "Class" "Logical View::beaninfo::FeatureAttributeValue" @18
- ShowCompartmentStereotypes TRUE
- IncludeAttribute TRUE
- IncludeOperation TRUE
- location (3456, 176)
- font (object Font
- size 10
- face "Arial"
- bold FALSE
- italics FALSE
- underline FALSE
- strike FALSE
- color 0
- default_color TRUE)
- label (object ItemLabel
- Parent_View @18
- location (2683, 117)
- fill_color 13434879
- nlines 1
- max_width 1546
- justify 0
- label "FeatureAttributeValue")
- stereotype (object ItemLabel
- Parent_View @18
- location (2683, 67)
- fill_color 13434879
- anchor 10
- nlines 1
- max_width 1546
- justify 0
- label "<<datatype>>")
- icon_style "Icon"
- line_color 3342489
- fill_color 13434879
- quidu "41E582F800BB"
- compartment (object Compartment
- Parent_View @18
- location (2683, 178)
- font (object Font
- size 10
- face "Arial"
- bold FALSE
- italics FALSE
- underline FALSE
- strike FALSE
- color 0
- default_color TRUE)
- icon_style "Icon"
- fill_color 16777215
- anchor 2
- nlines 2
- max_width 1493)
- width 1564
- height 242
- annotation 8
- autoResize TRUE)
- (object ClassView "Class" "Logical View::beaninfo::ImplicitItem" @19
- ShowCompartmentStereotypes TRUE
- IncludeAttribute TRUE
- IncludeOperation TRUE
- location (2288, 656)
- font (object Font
- size 10
- face "Arial"
- bold FALSE
- italics FALSE
- underline FALSE
- strike FALSE
- color 0
- default_color TRUE)
- label (object ItemLabel
- Parent_View @19
- location (1815, 547)
- fill_color 13434879
- nlines 1
- max_width 946
- justify 0
- label "ImplicitItem")
- stereotype (object ItemLabel
- Parent_View @19
- location (1815, 497)
- fill_color 13434879
- anchor 10
- nlines 1
- max_width 946
- justify 0
- label "<<enumeration>>")
- icon_style "Icon"
- line_color 3342489
- fill_color 12615935
- quidu "41E59E5D0296"
- compartment (object Compartment
- Parent_View @19
- location (1815, 608)
- font (object Font
- size 10
- face "Arial"
- bold FALSE
- italics FALSE
- underline FALSE
- strike FALSE
- color 0
- default_color TRUE)
- icon_style "Icon"
- fill_color 16777215
- anchor 2
- nlines 4
- max_width 812)
- width 964
- height 342
- annotation 8
- autoResize TRUE)
- (object ClassView "Class" "Logical View::java::JavaParameter" @20
- ShowCompartmentStereotypes TRUE
- location (4304, 1792)
- font (object Font
- size 10
- face "Arial"
- bold FALSE
- italics FALSE
- underline FALSE
- strike FALSE
- color 0
- default_color TRUE)
- label (object ItemLabel
- Parent_View @20
- location (4125, 1718)
- fill_color 13434879
- nlines 1
- max_width 358
- justify 0
- label "JavaParameter")
- icon_style "Icon"
- line_color 3342489
- fill_color 16777088
- quidu "3654AD780280"
- width 376
- height 172
- annotation 8
- autoResize TRUE)
- (object ClassView "Class" "Logical View::beaninfo::ParameterDecorator" @21
- ShowCompartmentStereotypes TRUE
- IncludeAttribute TRUE
- IncludeOperation TRUE
- location (4864, 1360)
- font (object Font
- size 10
- face "Arial"
- bold FALSE
- italics FALSE
- underline FALSE
- strike FALSE
- color 0
- default_color TRUE)
- label (object ItemLabel
- Parent_View @21
- location (4631, 1279)
- fill_color 13434879
- nlines 1
- max_width 466
- justify 0
- label "ParameterDecorator")
- icon_style "Icon"
- line_color 3342489
- fill_color 13434879
- quidu "3A79D9C20304"
- compartment (object Compartment
- Parent_View @21
- location (4631, 1340)
- font (object Font
- size 10
- face "Arial"
- bold FALSE
- italics FALSE
- underline FALSE
- strike FALSE
- color 0
- default_color TRUE)
- icon_style "Icon"
- fill_color 16777215
- anchor 2
- nlines 2
- max_width 294)
- width 484
- height 186
- annotation 8
- autoResize TRUE)
- (object AssociationViewNew "$UNNAMED$26" @22
- location (4578, 1579)
- font (object Font
- size 10
- face "Arial"
- bold FALSE
- italics FALSE
- underline FALSE
- strike FALSE
- color 0
- default_color TRUE)
- stereotype TRUE
- line_color 3342489
- quidu "3C9A6EDD02C2"
- roleview_list (list RoleViews
- (object RoleView "parameter" @23
- Parent_View @22
- location (1666, -21)
- font (object Font
- size 10
- face "Arial"
- bold FALSE
- italics FALSE
- underline FALSE
- strike FALSE
- color 0
- default_color TRUE)
- label (object SegLabel @24
- Parent_View @23
- location (4540, 1659)
- font (object Font
- size 10
- face "Arial"
- bold FALSE
- italics FALSE
- underline FALSE
- strike FALSE
- color 0
- default_color TRUE)
- anchor 1
- anchor_loc 1
- nlines 1
- max_width 215
- justify 0
- label "+parameter"
- pctDist 0.386598
- height 41
- orientation 0)
- stereotype TRUE
- line_color 3342489
- quidu "3C9A6EDE01FB"
- client @22
- supplier @20
- line_style 0
- label (object SegLabel @25
- Parent_View @23
- location (4480, 1588)
- font (object Font
- size 10
- face "Arial"
- bold FALSE
- italics FALSE
- underline FALSE
- strike FALSE
- color 0
- default_color TRUE)
- anchor 2
- anchor_loc 1
- nlines 1
- max_width 15
- justify 0
- label "0..1"
- pctDist 0.412371
- height 54
- orientation 1))
- (object RoleView "$UNNAMED$27" @26
- Parent_View @22
- location (1666, -21)
- stereotype TRUE
- line_color 3342489
- quidu "3C9A6EDE0205"
- client @22
- supplier @21
- line_style 0)))
- (object InheritView "" @27
- stereotype TRUE
- line_color 3342489
- quidu "3A79DEBB01C4"
- client @21
- supplier @10
- line_style 3
- origin_attachment (4658, 1267)
- terminal_attachment (4658, 1105)
- drawSupplier @11)
- (object ClassView "Class" "Logical View::beaninfo::MethodDecorator" @28
- ShowCompartmentStereotypes TRUE
- IncludeAttribute TRUE
- IncludeOperation TRUE
- location (3712, 1360)
- font (object Font
- size 10
- face "Arial"
- bold FALSE
- italics FALSE
- underline FALSE
- strike FALSE
- color 0
- default_color TRUE)
- label (object ItemLabel
- Parent_View @28
- location (3362, 1279)
- fill_color 13434879
- nlines 1
- max_width 700
- justify 0
- label "MethodDecorator")
- icon_style "Icon"
- line_color 3342489
- fill_color 13434879
- quidu "3A79D35E0027"
- compartment (object Compartment
- Parent_View @28
- location (3362, 1340)
- font (object Font
- size 10
- face "Arial"
- bold FALSE
- italics FALSE
- underline FALSE
- strike FALSE
- color 0
- default_color TRUE)
- icon_style "Icon"
- fill_color 16777215
- anchor 2
- nlines 2
- max_width 594)
- width 718
- height 186
- annotation 8
- autoResize TRUE)
- (object InheritView "" @29
- stereotype TRUE
- line_color 3342489
- quidu "3A79DEA603E1"
- client @28
- supplier @10
- line_style 3
- origin_attachment (3694, 1267)
- terminal_attachment (3694, 1105)
- drawSupplier @11)
- (object AssociationViewNew "$UNNAMED$12" @30
- location (4314, 1490)
- font (object Font
- size 10
- face "Arial"
- bold FALSE
- italics FALSE
- underline FALSE
- strike FALSE
- color 0
- default_color TRUE)
- stereotype TRUE
- line_color 3342489
- quidu "3A79DA1A02F7"
- roleview_list (list RoleViews
- (object RoleView "parameterDescriptors" @31
- Parent_View @30
- location (2842, 594)
- font (object Font
- size 10
- face "Arial"
- bold FALSE
- italics FALSE
- underline FALSE
- strike FALSE
- color 0
- default_color TRUE)
- label (object SegLabel @32
- Parent_View @31
- location (4389, 1427)
- font (object Font
- size 10
- face "Arial"
- bold FALSE
- italics FALSE
- underline FALSE
- strike FALSE
- color 0
- default_color TRUE)
- anchor 1
- anchor_loc 1
- nlines 1
- max_width 427
- justify 0
- label "+parameterDescriptors"
- pctDist 0.308262
- height 69
- orientation 0)
- stereotype TRUE
- line_color 3342489
- quidu "3A79DA1C0231"
- client @30
- supplier @21
- vertices (list Points
- (4314, 1490)
- (4373, 1503)
- (4621, 1429))
- line_style 0
- label (object SegLabel @33
- Parent_View @31
- location (4555, 1491)
- font (object Font
- size 10
- face "Arial"
- bold FALSE
- italics FALSE
- underline FALSE
- strike FALSE
- color 0
- default_color TRUE)
- anchor 2
- anchor_loc 1
- nlines 1
- max_width 15
- justify 0
- label "0..n"
- pctDist 0.745977
- height 41
- orientation 1))
- (object RoleView "$UNNAMED$13" @34
- Parent_View @30
- location (2842, 594)
- stereotype TRUE
- line_color 3342489
- quidu "3A79DA1C0232"
- client @30
- supplier @28
- line_style 0)))
- (object AssociationViewNew "$UNNAMED$28" @35
- location (4385, 1273)
- font (object Font
- size 10
- face "Arial"
- bold FALSE
- italics FALSE
- underline FALSE
- strike FALSE
- color 0
- default_color TRUE)
- stereotype TRUE
- line_color 3342489
- quidu "41F016E7002E"
- roleview_list (list RoleViews
- (object RoleView "serParmDesc" @36
- Parent_View @35
- location (1265, -71)
- font (object Font
- size 10
- face "Arial"
- bold FALSE
- italics FALSE
- underline FALSE
- strike FALSE
- color 0
- default_color TRUE)
- label (object SegLabel @37
- Parent_View @36
- location (4534, 1252)
- font (object Font
- size 10
- face "Arial"
- bold FALSE
- italics FALSE
- underline FALSE
- strike FALSE
- color 0
- default_color TRUE)
- anchor 1
- anchor_loc 1
- nlines 1
- max_width 285
- justify 0
- label "-serParmDesc"
- pctDist 0.595893
- height 48
- orientation 0)
- stereotype TRUE
- line_color 3342489
- quidu "41F016E802A7"
- client @35
- supplier @21
- line_style 0
- label (object SegLabel @38
- Parent_View @36
- location (4590, 1364)
- font (object Font
- size 10
- face "Arial"
- bold FALSE
- italics FALSE
- underline FALSE
- strike FALSE
- color 0
- default_color TRUE)
- anchor 2
- anchor_loc 1
- nlines 1
- max_width 15
- justify 0
- label "0..n"
- pctDist 0.904386
- height 54
- orientation 1))
- (object RoleView "$UNNAMED$29" @39
- Parent_View @35
- location (1265, -71)
- stereotype TRUE
- line_color 3342489
- quidu "41F016E802B1"
- client @35
- supplier @28
- vertices (list Points
- (4385, 1273)
- (4326, 1263)
- (4071, 1302))
- line_style 0)))
- (object ClassView "Class" "Logical View::java::Method" @40
- ShowCompartmentStereotypes TRUE
- SuppressAttribute TRUE
- IncludeAttribute TRUE
- location (2592, 3264)
- font (object Font
- size 10
- face "Arial"
- bold FALSE
- italics FALSE
- underline FALSE
- strike FALSE
- color 0
- default_color TRUE)
- label (object ItemLabel
- Parent_View @40
- location (2492, 3190)
- fill_color 13434879
- nlines 1
- max_width 200
- justify 0
- label "Method")
- icon_style "Icon"
- line_color 3342489
- fill_color 16776960
- quidu "3654AE910271"
- width 218
- height 172
- annotation 8
- autoResize TRUE)
- (object ClassView "Class" "Logical View::beaninfo::MethodProxy" @41
- ShowCompartmentStereotypes TRUE
- IncludeAttribute TRUE
- IncludeOperation TRUE
- location (2560, 2768)
- font (object Font
- size 10
- face "Arial"
- bold FALSE
- italics FALSE
- underline FALSE
- strike FALSE
- color 0
- default_color TRUE)
- label (object ItemLabel
- Parent_View @41
- location (2398, 2717)
- fill_color 13434879
- nlines 1
- max_width 324
- justify 0
- label "MethodProxy")
- icon_style "Icon"
- line_color 3342489
- fill_color 13434879
- quidu "3A8984C901C3"
- width 342
- height 126
- annotation 8
- autoResize TRUE)
- (object AttachView "" @42
- stereotype TRUE
- line_color 3342489
- client @2
- supplier @41
- line_style 0)
- (object AssociationViewNew "$UNNAMED$24" @43
- location (2575, 3004)
- font (object Font
- size 10
- face "Arial"
- bold FALSE
- italics FALSE
- underline FALSE
- strike FALSE
- color 0
- default_color TRUE)
- stereotype TRUE
- line_color 3342489
- quidu "3A89865B01D5"
- roleview_list (list RoleViews
- (object RoleView "method" @44
- Parent_View @43
- location (271, 1084)
- font (object Font
- size 10
- face "Arial"
- bold FALSE
- italics FALSE
- underline FALSE
- strike FALSE
- color 0
- default_color TRUE)
- label (object SegLabel @45
- Parent_View @44
- location (2539, 3072)
- font (object Font
- size 10
- face "Arial"
- bold FALSE
- italics FALSE
- underline FALSE
- strike FALSE
- color 0
- default_color TRUE)
- anchor 1
- anchor_loc 1
- nlines 1
- max_width 162
- justify 0
- label "+method"
- pctDist 0.376068
- height 41
- orientation 1)
- stereotype TRUE
- line_color 3342489
- quidu "3A89865C01AE"
- client @43
- supplier @40
- line_style 0
- label (object SegLabel @46
- Parent_View @44
- location (2639, 3158)
- font (object Font
- size 10
- face "Arial"
- bold FALSE
- italics FALSE
- underline FALSE
- strike FALSE
- color 0
- default_color TRUE)
- anchor 2
- anchor_loc 1
- nlines 1
- max_width 15
- justify 0
- label "1"
- pctDist 0.900000
- height 54
- orientation 0))
- (object RoleView "$UNNAMED$25" @47
- Parent_View @43
- location (271, 1084)
- stereotype TRUE
- line_color 3342489
- quidu "3A89865C01CC"
- client @43
- supplier @41
- line_style 0)))
- (object InheritView "" @48
- stereotype TRUE
- line_color 3342489
- quidu "3DFA19B600DE"
- client @41
- supplier @8
- line_style 0)
- (object AttachView "" @49
- stereotype TRUE
- line_color 3342489
- client @6
- supplier @4
- line_style 0)
- (object ClassView "Class" "Logical View::beaninfo::IndexedPropertyDecorator" @50
- ShowCompartmentStereotypes TRUE
- IncludeAttribute TRUE
- IncludeOperation TRUE
- location (752, 2288)
- font (object Font
- size 10
- face "Arial"
- bold FALSE
- italics FALSE
- underline FALSE
- strike FALSE
- color 0
- default_color TRUE)
- label (object ItemLabel
- Parent_View @50
- location (460, 2237)
- fill_color 13434879
- nlines 1
- max_width 584
- justify 0
- label "IndexedPropertyDecorator")
- icon_style "Icon"
- line_color 3342489
- fill_color 13434879
- quidu "3A79DC450309"
- width 602
- height 126
- annotation 8
- autoResize TRUE)
- (object ClassView "Class" "Logical View::beaninfo::BeanDecorator" @51
- ShowCompartmentStereotypes TRUE
- IncludeAttribute TRUE
- IncludeOperation TRUE
- location (512, 1456)
- font (object Font
- size 10
- face "Arial"
- bold FALSE
- italics FALSE
- underline FALSE
- strike FALSE
- color 0
- default_color TRUE)
- label (object ItemLabel
- Parent_View @51
- location (7, 1150)
- fill_color 13434879
- nlines 1
- max_width 1010
- justify 0
- label "BeanDecorator")
- icon_style "Icon"
- line_color 3342489
- fill_color 13434879
- quidu "3A79D0DF02D1"
- compartment (object Compartment
- Parent_View @51
- location (7, 1211)
- font (object Font
- size 10
- face "Arial"
- bold FALSE
- italics FALSE
- underline FALSE
- strike FALSE
- color 0
- default_color TRUE)
- icon_style "Icon"
- fill_color 16777215
- anchor 2
- nlines 11
- max_width 868)
- width 1028
- height 636
- annotation 8
- autoResize TRUE)
- (object InheritView "" @52
- stereotype TRUE
- line_color 3342489
- quidu "3A79DE8E007F"
- client @51
- supplier @10
- line_style 3
- origin_attachment (381, 1137)
- terminal_attachment (381, 1105)
- drawSupplier @11)
- (object ClassView "Class" "Logical View::beaninfo::EventSetDecorator" @53
- ShowCompartmentStereotypes TRUE
- IncludeAttribute TRUE
- IncludeOperation TRUE
- location (2848, 1424)
- font (object Font
- size 10
- face "Arial"
- bold FALSE
- italics FALSE
- underline FALSE
- strike FALSE
- color 0
- default_color TRUE)
- label (object ItemLabel
- Parent_View @53
- location (2395, 1268)
- fill_color 13434879
- nlines 2
- max_width 906
- justify 0
- label "EventSetDecorator")
- icon_style "Icon"
- line_color 3342489
- fill_color 13434879
- quidu "3A79D1D2004F"
- compartment (object Compartment
- Parent_View @53
- location (2395, 1329)
- font (object Font
- size 10
- face "Arial"
- bold FALSE
- italics FALSE
- underline FALSE
- strike FALSE
- color 0
- default_color TRUE)
- icon_style "Icon"
- fill_color 16777215
- anchor 2
- nlines 4
- max_width 778)
- width 924
- height 336
- annotation 8
- autoResize TRUE)
- (object InheritView "" @54
- stereotype TRUE
- line_color 3342489
- quidu "3A79DEA200EC"
- client @53
- supplier @10
- line_style 3
- origin_attachment (2831, 1255)
- terminal_attachment (2831, 1105)
- drawSupplier @11)
- (object AssociationViewNew "$UNNAMED$6" @55
- location (2692, 2148)
- font (object Font
- size 10
- face "Arial"
- bold FALSE
- italics FALSE
- underline FALSE
- strike FALSE
- color 0
- default_color TRUE)
- stereotype TRUE
- line_color 3342489
- quidu "3A79D3E10364"
- roleview_list (list RoleViews
- (object RoleView "listenerMethods" @56
- Parent_View @55
- location (1828, 1252)
- font (object Font
- size 10
- face "Arial"
- bold FALSE
- italics FALSE
- underline FALSE
- strike FALSE
- color 0
- default_color TRUE)
- label (object SegLabel @57
- Parent_View @56
- location (2580, 2585)
- font (object Font
- size 10
- face "Arial"
- bold FALSE
- italics FALSE
- underline FALSE
- strike FALSE
- color 0
- default_color TRUE)
- anchor 1
- anchor_loc 1
- nlines 1
- max_width 324
- justify 0
- label "+listenerMethods"
- pctDist 0.790503
- height 19
- orientation 1)
- stereotype TRUE
- line_color 3342489
- quidu "3A79D3E6007D"
- client @55
- supplier @41
- line_style 0
- label (object SegLabel @58
- Parent_View @56
- location (2598, 2522)
- font (object Font
- size 10
- face "Arial"
- bold FALSE
- italics FALSE
- underline FALSE
- strike FALSE
- color 0
- default_color TRUE)
- anchor 2
- anchor_loc 1
- nlines 1
- max_width 15
- justify 0
- label "1..n"
- pctDist 0.676961
- height 14
- orientation 1))
- (object RoleView "$UNNAMED$7" @59
- Parent_View @55
- location (1828, 1252)
- stereotype TRUE
- line_color 3342489
- quidu "3A79D3E60091"
- client @55
- supplier @53
- line_style 0)))
- (object AttachView "" @60
- stereotype TRUE
- line_color 3342489
- client @1
- supplier @55
- line_style 0)
- (object AssociationViewNew "$UNNAMED$32" @61
- location (2525, 2221)
- font (object Font
- size 10
- face "Arial"
- bold FALSE
- italics FALSE
- underline FALSE
- strike FALSE
- color 0
- default_color TRUE)
- stereotype TRUE
- line_color 3342489
- quidu "41F1278A01A5"
- roleview_list (list RoleViews
- (object RoleView "serListMthd" @62
- Parent_View @61
- location (269, 813)
- font (object Font
- size 10
- face "Arial"
- bold FALSE
- italics FALSE
- underline FALSE
- strike FALSE
- color 0
- default_color TRUE)
- label (object SegLabel @63
- Parent_View @62
- location (2296, 2688)
- font (object Font
- size 10
- face "Arial"
- bold FALSE
- italics FALSE
- underline FALSE
- strike FALSE
- color 0
- default_color TRUE)
- anchor 1
- anchor_loc 1
- nlines 1
- max_width 229
- justify 0
- label "-serListMthd"
- pctDist 0.765012
- height 39
- orientation 1)
- stereotype TRUE
- line_color 3342489
- quidu "41F1278B021F"
- client @61
- supplier @41
- vertices (list Points
- (2525, 2221)
- (2303, 2771)
- (2388, 2769))
- line_style 0
- label (object SegLabel @64
- Parent_View @62
- location (2239, 2587)
- font (object Font
- size 10
- face "Arial"
- bold FALSE
- italics FALSE
- underline FALSE
- strike FALSE
- color 0
- default_color TRUE)
- anchor 2
- anchor_loc 1
- nlines 1
- max_width 15
- justify 0
- label "1..n"
- pctDist 0.657692
- height 129
- orientation 1))
- (object RoleView "$UNNAMED$33" @65
- Parent_View @61
- location (269, 813)
- stereotype TRUE
- line_color 3342489
- quidu "41F1278B0229"
- client @61
- supplier @53
- line_style 0)))
- (object AttachView "" @66
- stereotype TRUE
- line_color 3342489
- client @6
- supplier @53
- vertices (list Points
- (1878, 2808)
- (2016, 2021)
- (2612, 1592))
- line_style 0)
- (object ClassView "Class" "Logical View::java::Method" @67
- ShowCompartmentStereotypes TRUE
- SuppressAttribute TRUE
- location (1664, 2096)
- font (object Font
- size 10
- face "Arial"
- bold FALSE
- italics FALSE
- underline FALSE
- strike FALSE
- color 0
- default_color TRUE)
- label (object ItemLabel
- Parent_View @67
- location (1564, 2022)
- fill_color 13434879
- nlines 1
- max_width 200
- justify 0
- label "Method")
- icon_style "Icon"
- line_color 3342489
- fill_color 16776960
- quidu "3654AE910271"
- width 218
- height 172
- annotation 8
- autoResize TRUE)
- (object AssociationViewNew "$UNNAMED$20" @68
- location (1315, 2289)
- font (object Font
- size 10
- face "Arial"
- bold FALSE
- italics FALSE
- underline FALSE
- strike FALSE
- color 0
- default_color TRUE)
- stereotype TRUE
- line_color 3342489
- quidu "3A79DE34036F"
- roleview_list (list RoleViews
- (object RoleView "indexedReadMethod" @69
- Parent_View @68
- location (563, 401)
- font (object Font
- size 10
- face "Arial"
- bold FALSE
- italics FALSE
- underline FALSE
- strike FALSE
- color 0
- default_color TRUE)
- label (object SegLabel @70
- Parent_View @69
- location (1421, 2275)
- font (object Font
- size 10
- face "Arial"
- bold FALSE
- italics FALSE
- underline FALSE
- strike FALSE
- color 0
- default_color TRUE)
- anchor 1
- anchor_loc 1
- nlines 1
- max_width 404
- justify 0
- label "+indexedReadMethod"
- pctDist 0.385248
- height 14
- orientation 1)
- stereotype TRUE
- line_color 3342489
- quidu "3A79DE3503CA"
- client @68
- supplier @67
- vertices (list Points
- (1315, 2289)
- (1375, 2289)
- (1554, 2168))
- line_style 0
- label (object SegLabel @71
- Parent_View @69
- location (1249, 2238)
- font (object Font
- size 10
- face "Arial"
- bold FALSE
- italics FALSE
- underline FALSE
- strike FALSE
- color 0
- default_color TRUE)
- anchor 2
- anchor_loc 1
- nlines 1
- max_width 15
- justify 0
- label "0..1"
- pctDist -0.240775
- height 52
- orientation 0))
- (object RoleView "$UNNAMED$21" @72
- Parent_View @68
- location (563, 401)
- stereotype TRUE
- line_color 3342489
- quidu "3A79DE3503DE"
- client @68
- supplier @50
- line_style 0)))
- (object AssociationViewNew "$UNNAMED$22" @73
- location (1442, 2361)
- font (object Font
- size 10
- face "Arial"
- bold FALSE
- italics FALSE
- underline FALSE
- strike FALSE
- color 0
- default_color TRUE)
- stereotype TRUE
- line_color 3342489
- quidu "3A79DE540180"
- roleview_list (list RoleViews
- (object RoleView "indexedWriteMethod" @74
- Parent_View @73
- location (690, 473)
- font (object Font
- size 10
- face "Arial"
- bold FALSE
- italics FALSE
- underline FALSE
- strike FALSE
- color 0
- default_color TRUE)
- label (object SegLabel @75
- Parent_View @74
- location (1597, 2374)
- font (object Font
- size 10
- face "Arial"
- bold FALSE
- italics FALSE
- underline FALSE
- strike FALSE
- color 0
- default_color TRUE)
- anchor 1
- anchor_loc 1
- nlines 1
- max_width 409
- justify 0
- label "+indexedWriteMethod"
- pctDist 0.501177
- height 37
- orientation 0)
- stereotype TRUE
- line_color 3342489
- quidu "3A79DE5503D0"
- client @73
- supplier @67
- vertices (list Points
- (1442, 2361)
- (1632, 2382)
- (1654, 2182))
- line_style 0
- label (object SegLabel @76
- Parent_View @74
- location (1639, 2306)
- font (object Font
- size 10
- face "Arial"
- bold FALSE
- italics FALSE
- underline FALSE
- strike FALSE
- color 0
- default_color TRUE)
- anchor 2
- anchor_loc 1
- nlines 1
- max_width 15
- justify 0
- label "0..1"
- pctDist 0.681972
- height 2
- orientation 0))
- (object RoleView "$UNNAMED$23" @77
- Parent_View @73
- location (690, 473)
- stereotype TRUE
- line_color 3342489
- quidu "3A79DE5503E4"
- client @73
- supplier @50
- line_style 0)))
- (object AssociationViewNew "$UNNAMED$4" @78
- location (1898, 1691)
- font (object Font
- size 10
- face "Arial"
- bold FALSE
- italics FALSE
- underline FALSE
- strike FALSE
- color 0
- default_color TRUE)
- stereotype TRUE
- line_color 3342489
- quidu "3A79D3080128"
- roleview_list (list RoleViews
- (object RoleView "addListenerMethod" @79
- Parent_View @78
- location (1034, 795)
- font (object Font
- size 10
- face "Arial"
- bold FALSE
- italics FALSE
- underline FALSE
- strike FALSE
- color 0
- default_color TRUE)
- label (object SegLabel @80
- Parent_View @79
- location (1561, 1824)
- font (object Font
- size 10
- face "Arial"
- bold FALSE
- italics FALSE
- underline FALSE
- strike FALSE
- color 0
- default_color TRUE)
- anchor 1
- anchor_loc 1
- nlines 1
- max_width 385
- justify 0
- label "+addListenerMethod"
- pctDist 0.627386
- height 90
- orientation 1)
- stereotype TRUE
- line_color 3342489
- quidu "3A79D3090346"
- client @78
- supplier @67
- vertices (list Points
- (1898, 1691)
- (1647, 1763)
- (1658, 2009))
- line_style 0
- label (object SegLabel @81
- Parent_View @79
- location (1699, 1853)
- font (object Font
- size 10
- face "Arial"
- bold FALSE
- italics FALSE
- underline FALSE
- strike FALSE
- color 0
- default_color TRUE)
- anchor 2
- anchor_loc 1
- nlines 1
- max_width 15
- justify 0
- label "1"
- pctDist 0.694068
- height 48
- orientation 0))
- (object RoleView "$UNNAMED$5" @82
- Parent_View @78
- location (1034, 795)
- stereotype TRUE
- line_color 3342489
- quidu "3A79D309035A"
- client @78
- supplier @53
- line_style 0)))
- (object AssociationViewNew "$UNNAMED$10" @83
- location (2162, 1812)
- font (object Font
- size 10
- face "Arial"
- bold FALSE
- italics FALSE
- underline FALSE
- strike FALSE
- color 0
- default_color TRUE)
- stereotype TRUE
- line_color 3342489
- quidu "3A79D4DF020B"
- roleview_list (list RoleViews
- (object RoleView "removeListenerMethod" @84
- Parent_View @83
- location (1298, 916)
- font (object Font
- size 10
- face "Arial"
- bold FALSE
- italics FALSE
- underline FALSE
- strike FALSE
- color 0
- default_color TRUE)
- label (object SegLabel @85
- Parent_View @84
- location (2115, 1846)
- font (object Font
- size 10
- face "Arial"
- bold FALSE
- italics FALSE
- underline FALSE
- strike FALSE
- color 0
- default_color TRUE)
- anchor 1
- anchor_loc 1
- nlines 1
- max_width 448
- justify 0
- label "+removeListenerMethod"
- pctDist 0.129058
- height 6
- orientation 0)
- stereotype TRUE
- line_color 3342489
- quidu "3A79D4E10395"
- client @83
- supplier @67
- line_style 0
- label (object SegLabel @86
- Parent_View @84
- location (1839, 2058)
- font (object Font
- size 10
- face "Arial"
- bold FALSE
- italics FALSE
- underline FALSE
- strike FALSE
- color 0
- default_color TRUE)
- anchor 2
- anchor_loc 1
- nlines 1
- max_width 15
- justify 0
- label "1"
- pctDist 0.900000
- height 54
- orientation 0))
- (object RoleView "$UNNAMED$11" @87
- Parent_View @83
- location (1298, 916)
- stereotype TRUE
- line_color 3342489
- quidu "3A79D4E103A9"
- client @83
- supplier @53
- line_style 0)))
- (object ClassView "Class" "Logical View::java::JavaClass" @88
- ShowCompartmentStereotypes TRUE
- SuppressAttribute TRUE
- location (240, 2192)
- font (object Font
- size 10
- face "Arial"
- bold FALSE
- italics FALSE
- underline FALSE
- strike FALSE
- color 0
- default_color TRUE)
- label (object ItemLabel
- Parent_View @88
- location (106, 2118)
- fill_color 13434879
- nlines 1
- max_width 268
- justify 0
- label "JavaClass")
- icon_style "Icon"
- line_color 3342489
- fill_color 16776960
- quidu "36549FCC00FA"
- width 286
- height 172
- annotation 8
- autoResize TRUE)
- (object AssociationViewNew "$UNNAMED$2" @89
- location (332, 1939)
- font (object Font
- size 10
- face "Arial"
- bold FALSE
- italics FALSE
- underline FALSE
- strike FALSE
- color 0
- default_color TRUE)
- stereotype TRUE
- line_color 3342489
- quidu "3A79D1350248"
- roleview_list (list RoleViews
- (object RoleView "customizerClass" @90
- Parent_View @89
- location (92, 1043)
- font (object Font
- size 10
- face "Arial"
- bold FALSE
- italics FALSE
- underline FALSE
- strike FALSE
- color 0
- default_color TRUE)
- label (object SegLabel @91
- Parent_View @90
- location (298, 2044)
- font (object Font
- size 10
- face "Arial"
- bold FALSE
- italics FALSE
- underline FALSE
- strike FALSE
- color 0
- default_color TRUE)
- anchor 1
- anchor_loc 1
- nlines 1
- max_width 328
- justify 0
- label "+customizerClass"
- pctDist 0.631674
- height 4
- orientation 0)
- stereotype TRUE
- line_color 3342489
- quidu "3A79D13601D2"
- client @89
- supplier @88
- line_style 0
- label (object SegLabel @92
- Parent_View @90
- location (326, 1989)
- font (object Font
- size 10
- face "Arial"
- bold FALSE
- italics FALSE
- underline FALSE
- strike FALSE
- color 0
- default_color TRUE)
- anchor 2
- anchor_loc 1
- nlines 1
- max_width 15
- justify 0
- label "0..1"
- pctDist 0.284188
- height 12
- orientation 0))
- (object RoleView "$UNNAMED$3" @93
- Parent_View @89
- location (92, 1043)
- stereotype TRUE
- line_color 3342489
- quidu "3A79D13601E6"
- client @89
- supplier @51
- line_style 0)))
- (object AssociationViewNew "$UNNAMED$8" @94
- location (1384, 1854)
- font (object Font
- size 10
- face "Arial"
- bold FALSE
- italics FALSE
- underline FALSE
- strike FALSE
- color 0
- default_color TRUE)
- stereotype TRUE
- line_color 3342489
- quidu "3A79D4A80158"
- roleview_list (list RoleViews
- (object RoleView "listenerType" @95
- Parent_View @94
- location (520, 958)
- font (object Font
- size 10
- face "Arial"
- bold FALSE
- italics FALSE
- underline FALSE
- strike FALSE
- color 0
- default_color TRUE)
- label (object SegLabel @96
- Parent_View @95
- location (782, 2066)
- font (object Font
- size 10
- face "Arial"
- bold FALSE
- italics FALSE
- underline FALSE
- strike FALSE
- color 0
- default_color TRUE)
- anchor 1
- anchor_loc 1
- nlines 1
- max_width 259
- justify 0
- label "+listenerType"
- pctDist 0.610677
- height 33
- orientation 0)
- stereotype TRUE
- line_color 3342489
- quidu "3A79D4AA038B"
- client @94
- supplier @88
- line_style 0
- label (object SegLabel @97
- Parent_View @95
- location (977, 2061)
- font (object Font
- size 10
- face "Arial"
- bold FALSE
- italics FALSE
- underline FALSE
- strike FALSE
- color 0
- default_color TRUE)
- anchor 2
- anchor_loc 1
- nlines 1
- max_width 15
- justify 0
- label "1"
- pctDist 0.429590
- height 83
- orientation 0))
- (object RoleView "$UNNAMED$9" @98
- Parent_View @94
- location (520, 958)
- stereotype TRUE
- line_color 3342489
- quidu "3A79D4AA03B4"
- client @94
- supplier @53
- line_style 0)))
- (object AssociationViewNew "$UNNAMED$30" @99
- location (1392, 1913)
- font (object Font
- size 10
- face "Arial"
- bold FALSE
- italics FALSE
- underline FALSE
- strike FALSE
- color 0
- default_color TRUE)
- stereotype TRUE
- line_color 3342489
- quidu "41F11E710387"
- roleview_list (list RoleViews
- (object RoleView "eventAdapterClass" @100
- Parent_View @99
- location (-864, 505)
- font (object Font
- size 10
- face "Arial"
- bold FALSE
- italics FALSE
- underline FALSE
- strike FALSE
- color 0
- default_color TRUE)
- label (object SegLabel @101
- Parent_View @100
- location (771, 2132)
- font (object Font
- size 10
- face "Arial"
- bold FALSE
- italics FALSE
- underline FALSE
- strike FALSE
- color 0
- default_color TRUE)
- anchor 1
- anchor_loc 1
- nlines 1
- max_width 367
- justify 0
- label "+eventAdapterClass"
- pctDist 0.629702
- height 10
- orientation 0)
- stereotype TRUE
- line_color 3342489
- quidu "41F11E730249"
- client @99
- supplier @88
- vertices (list Points
- (1392, 1913)
- (766, 2124)
- (383, 2172))
- line_style 0
- label (object SegLabel @102
- Parent_View @100
- location (494, 2197)
- font (object Font
- size 10
- face "Arial"
- bold FALSE
- italics FALSE
- underline FALSE
- strike FALSE
- color 0
- default_color TRUE)
- anchor 2
- anchor_loc 1
- nlines 1
- max_width 15
- justify 0
- label "0..1"
- pctDist 0.898257
- height 38
- orientation 0))
- (object RoleView "$UNNAMED$31" @103
- Parent_View @99
- location (-864, 505)
- stereotype TRUE
- line_color 3342489
- quidu "41F11E73025D"
- client @99
- supplier @53
- line_style 0)))
- (object ClassView "Class" "Logical View::java::Field" @104
- ShowCompartmentStereotypes TRUE
- location (816, 2672)
- font (object Font
- size 10
- face "Arial"
- bold FALSE
- italics FALSE
- underline FALSE
- strike FALSE
- color 0
- default_color TRUE)
- label (object ItemLabel
- Parent_View @104
- location (720, 2597)
- fill_color 13434879
- nlines 1
- max_width 192
- justify 0
- label "Field")
- icon_style "Icon"
- line_color 3342489
- fill_color 16777088
- quidu "3654AF8F0280"
- width 210
- height 174
- annotation 8
- autoResize TRUE)
- (object ClassView "Class" "Logical View::beaninfo::PropertyDecorator" @105
- ShowCompartmentStereotypes TRUE
- IncludeAttribute TRUE
- IncludeOperation TRUE
- ShowOperationSignature TRUE
- location (1808, 1456)
- font (object Font
- size 10
- face "Arial"
- bold FALSE
- italics FALSE
- underline FALSE
- strike FALSE
- color 0
- default_color TRUE)
- label (object ItemLabel
- Parent_View @105
- location (1316, 1200)
- fill_color 13434879
- nlines 1
- max_width 984
- justify 0
- label "PropertyDecorator")
- icon_style "Icon"
- line_color 3342489
- fill_color 13434879
- quidu "3A79DA68010E"
- compartment (object Compartment
- Parent_View @105
- location (1316, 1261)
- font (object Font
- size 10
- face "Arial"
- bold FALSE
- italics FALSE
- underline FALSE
- strike FALSE
- color 0
- default_color TRUE)
- icon_style "Icon"
- fill_color 16777215
- anchor 2
- nlines 9
- max_width 838)
- width 1002
- height 536
- annotation 8
- autoResize TRUE)
- (object InheritView "" @106
- stereotype TRUE
- line_color 3342489
- quidu "3A79DE840388"
- client @50
- supplier @105
- line_style 0)
- (object InheritView "" @107
- stereotype TRUE
- line_color 3342489
- quidu "3A79DE9702BD"
- client @105
- supplier @10
- line_style 3
- origin_attachment (1772, 1188)
- terminal_attachment (1772, 1105)
- drawSupplier @11)
- (object AssociationViewNew "$UNNAMED$16" @108
- location (1003, 1968)
- font (object Font
- size 10
- face "Arial"
- bold FALSE
- italics FALSE
- underline FALSE
- strike FALSE
- color 0
- default_color TRUE)
- stereotype TRUE
- line_color 3342489
- quidu "3A79DBBD0000"
- roleview_list (list RoleViews
- (object RoleView "readMethod" @109
- Parent_View @108
- location (235, 1072)
- font (object Font
- size 10
- face "Arial"
- bold FALSE
- italics FALSE
- underline FALSE
- strike FALSE
- color 0
- default_color TRUE)
- label (object SegLabel @110
- Parent_View @109
- location (1308, 2033)
- font (object Font
- size 10
- face "Arial"
- bold FALSE
- italics FALSE
- underline FALSE
- strike FALSE
- color 0
- default_color TRUE)
- anchor 1
- anchor_loc 1
- nlines 1
- max_width 254
- justify 0
- label "+readMethod"
- pctDist 0.553714
- height 7
- orientation 1)
- stereotype TRUE
- line_color 3342489
- quidu "3A79DBBF0071"
- client @108
- supplier @67
- line_style 0
- label (object SegLabel @111
- Parent_View @109
- location (1471, 2131)
- font (object Font
- size 10
- face "Arial"
- bold FALSE
- italics FALSE
- underline FALSE
- strike FALSE
- color 0
- default_color TRUE)
- anchor 2
- anchor_loc 1
- nlines 1
- max_width 15
- justify 0
- label "0..1"
- pctDist 0.873365
- height 72
- orientation 1))
- (object RoleView "$UNNAMED$17" @112
- Parent_View @108
- location (235, 1072)
- stereotype TRUE
- line_color 3342489
- quidu "3A79DBBF0085"
- client @108
- supplier @105
- vertices (list Points
- (1003, 1968)
- (909, 1950)
- (1316, 1724))
- line_style 0)))
- (object AssociationViewNew "$UNNAMED$18" @113
- location (1035, 2106)
- font (object Font
- size 10
- face "Arial"
- bold FALSE
- italics FALSE
- underline FALSE
- strike FALSE
- color 0
- default_color TRUE)
- stereotype TRUE
- line_color 3342489
- quidu "3A79DBDF02D0"
- roleview_list (list RoleViews
- (object RoleView "writeMethod" @114
- Parent_View @113
- location (267, 1210)
- font (object Font
- size 10
- face "Arial"
- bold FALSE
- italics FALSE
- underline FALSE
- strike FALSE
- color 0
- default_color TRUE)
- label (object SegLabel @115
- Parent_View @114
- location (1325, 2090)
- font (object Font
- size 10
- face "Arial"
- bold FALSE
- italics FALSE
- underline FALSE
- strike FALSE
- color 0
- default_color TRUE)
- anchor 1
- anchor_loc 1
- nlines 1
- max_width 254
- justify 0
- label "+writeMethod"
- pctDist 0.560930
- height 12
- orientation 0)
- stereotype TRUE
- line_color 3342489
- quidu "3A79DBE101F7"
- client @113
- supplier @67
- line_style 0
- label (object SegLabel @116
- Parent_View @114
- location (1503, 2056)
- font (object Font
- size 10
- face "Arial"
- bold FALSE
- italics FALSE
- underline FALSE
- strike FALSE
- color 0
- default_color TRUE)
- anchor 2
- anchor_loc 1
- nlines 1
- max_width 15
- justify 0
- label "0..1"
- pctDist 0.901632
- height 43
- orientation 0))
- (object RoleView "$UNNAMED$19" @117
- Parent_View @113
- location (267, 1210)
- stereotype TRUE
- line_color 3342489
- quidu "3A79DBE1020B"
- client @113
- supplier @105
- vertices (list Points
- (1035, 2106)
- (975, 2107)
- (1462, 1724))
- line_style 0)))
- (object AssociationViewNew "$UNNAMED$14" @118
- location (844, 1907)
- font (object Font
- size 10
- face "Arial"
- bold FALSE
- italics FALSE
- underline FALSE
- strike FALSE
- color 0
- default_color TRUE)
- stereotype TRUE
- line_color 3342489
- quidu "3A79DB0B0339"
- roleview_list (list RoleViews
- (object RoleView "propertyEditorClass" @119
- Parent_View @118
- location (76, 1011)
- font (object Font
- size 10
- face "Arial"
- bold FALSE
- italics FALSE
- underline FALSE
- strike FALSE
- color 0
- default_color TRUE)
- label (object SegLabel @120
- Parent_View @119
- location (778, 1967)
- font (object Font
- size 10
- face "Arial"
- bold FALSE
- italics FALSE
- underline FALSE
- strike FALSE
- color 0
- default_color TRUE)
- anchor 1
- anchor_loc 1
- nlines 1
- max_width 392
- justify 0
- label "+propertyEditorClass"
- pctDist 0.166430
- height 26
- orientation 0)
- stereotype TRUE
- line_color 3342489
- quidu "3A79DB0E013F"
- client @118
- supplier @88
- line_style 0
- label (object SegLabel @121
- Parent_View @119
- location (1123, 1915)
- font (object Font
- size 10
- face "Arial"
- bold FALSE
- italics FALSE
- underline FALSE
- strike FALSE
- color 0
- default_color TRUE)
- anchor 2
- anchor_loc 1
- nlines 1
- max_width 15
- justify 0
- label "0..1"
- pctDist -0.490182
- height 126
- orientation 0))
- (object RoleView "$UNNAMED$15" @122
- Parent_View @118
- location (76, 1011)
- stereotype TRUE
- line_color 3342489
- quidu "3A79DB0E0171"
- client @118
- supplier @105
- line_style 0)))
- (object AssociationViewNew "$UNNAMED$34" @123
- location (1296, 2186)
- font (object Font
- size 10
- face "Arial"
- bold FALSE
- italics FALSE
- underline FALSE
- strike FALSE
- color 0
- default_color TRUE)
- stereotype TRUE
- line_color 3342489
- quidu "4207D83F01DA"
- roleview_list (list RoleViews
- (object RoleView "field" @124
- Parent_View @123
- location (-112, 778)
- font (object Font
- size 10
- face "Arial"
- bold FALSE
- italics FALSE
- underline FALSE
- strike FALSE
- color 0
- default_color TRUE)
- label (object SegLabel @125
- Parent_View @124
- location (938, 2513)
- font (object Font
- size 10
- face "Arial"
- bold FALSE
- italics FALSE
- underline FALSE
- strike FALSE
- color 0
- default_color TRUE)
- anchor 1
- anchor_loc 1
- nlines 1
- max_width 112
- justify 0
- label "+field"
- pctDist 0.892515
- height 57
- orientation 1)
- stereotype TRUE
- line_color 3342489
- quidu "4207D8400290"
- client @123
- supplier @104
- vertices (list Points
- (1296, 2186)
- (1103, 2463)
- (921, 2593))
- line_style 0
- label (object SegLabel @126
- Parent_View @124
- location (1046, 2557)
- font (object Font
- size 10
- face "Arial"
- bold FALSE
- italics FALSE
- underline FALSE
- strike FALSE
- color 0
- default_color TRUE)
- anchor 2
- anchor_loc 1
- nlines 1
- max_width 15
- justify 0
- label "0..1"
- pctDist 0.780986
- height 43
- orientation 0))
- (object RoleView "$UNNAMED$35" @127
- Parent_View @123
- location (-112, 778)
- stereotype TRUE
- line_color 3342489
- quidu "4207D8400292"
- client @123
- supplier @105
- line_style 0)))))))
diff --git a/plugins/org.eclipse.jem.beaninfo/rose/introspect.mdl b/plugins/org.eclipse.jem.beaninfo/rose/introspect.mdl
deleted file mode 100644
index c7ca9ef..0000000
--- a/plugins/org.eclipse.jem.beaninfo/rose/introspect.mdl
+++ /dev/null
@@ -1,556 +0,0 @@
-
-(object Petal
- version 47
- _written "Rose 8.0.0303.1400"
- charSet 0)
-
-(object Design "Logical View"
- is_unit TRUE
- is_loaded TRUE
- attributes (list Attribute_Set
- (object Attribute
- tool "Java"
- name "IDE"
- value "Internal Editor")
- (object Attribute
- tool "Java"
- name "UserDefineTagName1"
- value "")
- (object Attribute
- tool "Java"
- name "UserDefineTagText1"
- value "")
- (object Attribute
- tool "Java"
- name "UserDefineTagApply1"
- value "")
- (object Attribute
- tool "Java"
- name "UserDefineTagName2"
- value "")
- (object Attribute
- tool "Java"
- name "UserDefineTagText2"
- value "")
- (object Attribute
- tool "Java"
- name "UserDefineTagApply2"
- value "")
- (object Attribute
- tool "Java"
- name "UserDefineTagName3"
- value "")
- (object Attribute
- tool "Java"
- name "UserDefineTagText3"
- value "")
- (object Attribute
- tool "Java"
- name "UserDefineTagApply3"
- value ""))
- quid "3A79EBA50331"
- defaults (object defaults
- rightMargin 0.250000
- leftMargin 0.250000
- topMargin 0.250000
- bottomMargin 0.500000
- pageOverlap 0.250000
- clipIconLabels TRUE
- autoResize TRUE
- snapToGrid TRUE
- gridX 16
- gridY 16
- defaultFont (object Font
- size 10
- face "Arial"
- bold FALSE
- italics FALSE
- underline FALSE
- strike FALSE
- color 0
- default_color TRUE)
- showMessageNum 1
- showClassOfObject TRUE
- notation "Unified")
- root_usecase_package (object Class_Category "Use Case View"
- quid "3A7999AD0297"
- exportControl "Public"
- global TRUE
- logical_models (list unit_reference_list)
- logical_presentations (list unit_reference_list
- (object UseCaseDiagram "Main"
- quid "3A7999B702F6"
- title "Main"
- zoom 100
- max_height 28350
- max_width 21600
- origin_x 0
- origin_y 0
- items (list diagram_item_list))))
- root_category (object Class_Category "Logical View"
- quid "3A7999AD028E"
- exportControl "Public"
- global TRUE
- subsystem "Component View"
- quidu "3A7999AD02A1"
- logical_models (list unit_reference_list
- (object Class_Category "ecore"
- is_unit TRUE
- is_loaded FALSE
- file_name "$WorkspaceRoot\\org.eclipse.emf.ecore\\model\\org.eclipse.emf.Ecore.cat"
- quid "39A5ED04004E")
- (object Class_Category "java"
- is_unit TRUE
- is_loaded FALSE
- file_name "$WorkspaceRoot\\org.eclipse.jem\\rose\\edocjava2.cat"
- quid "36549F2C004E")
- (object Class_Category "beaninfo"
- is_unit TRUE
- is_loaded FALSE
- file_name "$WorkspaceRoot\\org.eclipse.jem.beaninfo\\rose\\beaninfo.cat"
- quid "3A799ABB0353"))
- logical_presentations (list unit_reference_list
- (object ClassDiagram "Main"
- quid "3A7999B70309"
- title "Main"
- zoom 100
- max_height 28350
- max_width 21600
- origin_x 0
- origin_y 0
- items (list diagram_item_list
- (object CategoryView "Logical View::beaninfo" @1
- location (272, 224)
- font (object Font
- size 10
- face "Arial"
- bold FALSE
- italics FALSE
- underline FALSE
- strike FALSE
- color 0
- default_color TRUE)
- label (object ItemLabel
- Parent_View @1
- location (128, 140)
- fill_color 13434879
- nlines 2
- max_width 288
- justify 0
- label "beaninfo")
- icon_style "Icon"
- line_color 3342489
- fill_color 13434879
- quidu "3A799ABB0353"
- width 300
- height 180)))
- (object ClassDiagram "Dependencies (Don't edit)"
- quid "3B869C9102E4"
- title "Dependencies (Don't edit)"
- zoom 100
- max_height 28350
- max_width 21600
- origin_x 0
- origin_y 0
- items (list diagram_item_list
- (object CategoryView "Logical View::ecore" @2
- location (256, 240)
- font (object Font
- size 10
- face "Arial"
- bold FALSE
- italics FALSE
- underline FALSE
- strike FALSE
- color 0
- default_color TRUE)
- label (object ItemLabel
- Parent_View @2
- location (112, 156)
- fill_color 13434879
- nlines 2
- max_width 288
- justify 0
- label "ecore")
- icon_style "Icon"
- line_color 3342489
- fill_color 16776960
- quidu "39A5ED04004E"
- width 300
- height 180)
- (object CategoryView "Logical View::java" @3
- location (896, 256)
- font (object Font
- size 10
- face "Arial"
- bold FALSE
- italics FALSE
- underline FALSE
- strike FALSE
- color 0
- default_color TRUE)
- label (object ItemLabel
- Parent_View @3
- location (749, 222)
- fill_color 13434879
- nlines 2
- max_width 294
- justify 0
- label "java")
- stereotype (object ItemLabel
- Parent_View @3
- location (749, 172)
- fill_color 13434879
- anchor 10
- nlines 1
- max_width 294
- justify 0
- label "<<metamodel>>")
- icon_style "Icon"
- line_color 3342489
- fill_color 16776960
- quidu "36549F2C004E"
- width 306
- height 180)
- (object NoteView @4
- location (688, 688)
- font (object Font
- size 10
- face "Arial"
- bold FALSE
- italics FALSE
- underline FALSE
- strike FALSE
- color 0
- default_color TRUE)
- label (object ItemLabel
- Parent_View @4
- location (280, 532)
- fill_color 13434879
- nlines 7
- max_width 780
- label "These are packages (cat files) that this model depends on. They must not be edited in here. They are only be edited by the model that owns them.")
- line_color 3342489
- fill_color 16744703
- width 840
- height 325)))))
- root_subsystem (object SubSystem "Component View"
- quid "3A7999AD02A1"
- physical_models (list unit_reference_list)
- physical_presentations (list unit_reference_list
- (object Module_Diagram "Main"
- quid "3A7999B702F5"
- title "Main"
- zoom 100
- max_height 28350
- max_width 21600
- origin_x 0
- origin_y 0
- items (list diagram_item_list))))
- process_structure (object Processes
- quid "3A7999AD02A2"
- ProcsNDevs (list
- (object Process_Diagram "Deployment View"
- quid "3A7999AD02A4"
- title "Deployment View"
- zoom 100
- max_height 28350
- max_width 21600
- origin_x 0
- origin_y 0
- items (list diagram_item_list))))
- properties (object Properties
- attributes (list Attribute_Set
- (object Attribute
- tool "Ecore"
- name "propertyId"
- value "809135969")
- (object Attribute
- tool "Ecore"
- name "default__Category"
- value (list Attribute_Set
- (object Attribute
- tool "Ecore"
- name "packageName"
- value "")
- (object Attribute
- tool "Ecore"
- name "nsPrefix"
- value "")
- (object Attribute
- tool "Ecore"
- name "nsURI"
- value "")
- (object Attribute
- tool "Ecore"
- name "basePackage"
- value "")
- (object Attribute
- tool "Ecore"
- name "prefix"
- value "")
- (object Attribute
- tool "Ecore"
- name "annotation"
- value "")))
- (object Attribute
- tool "Ecore"
- name "default__Class"
- value (list Attribute_Set
- (object Attribute
- tool "Ecore"
- name "classifierName"
- value "")
- (object Attribute
- tool "Ecore"
- name "constraints"
- value "")
- (object Attribute
- tool "Ecore"
- name "xmlName"
- value "")
- (object Attribute
- tool "Ecore"
- name "xmlContentKind"
- value ("ContentKind" 0))
- (object Attribute
- tool "Ecore"
- name "ContentKind"
- value (list Attribute_Set
- (object Attribute
- tool "Ecore"
- name "Unspecified"
- value 0)
- (object Attribute
- tool "Ecore"
- name "Empty"
- value 1)
- (object Attribute
- tool "Ecore"
- name "Simple"
- value 2)
- (object Attribute
- tool "Ecore"
- name "Mixed"
- value 3)
- (object Attribute
- tool "Ecore"
- name "ElementOnly"
- value 4)))
- (object Attribute
- tool "Ecore"
- name "annotation"
- value "")))
- (object Attribute
- tool "Ecore"
- name "default__Operation"
- value (list Attribute_Set
- (object Attribute
- tool "Ecore"
- name "operationName"
- value "")
- (object Attribute
- tool "Ecore"
- name "isUnique"
- value TRUE)
- (object Attribute
- tool "Ecore"
- name "annotation"
- value "")))
- (object Attribute
- tool "Ecore"
- name "default__Attribute"
- value (list Attribute_Set
- (object Attribute
- tool "Ecore"
- name "attributeName"
- value "")
- (object Attribute
- tool "Ecore"
- name "isTransient"
- value FALSE)
- (object Attribute
- tool "Ecore"
- name "isVolatile"
- value FALSE)
- (object Attribute
- tool "Ecore"
- name "isChangeable"
- value TRUE)
- (object Attribute
- tool "Ecore"
- name "isUnsettable"
- value FALSE)
- (object Attribute
- tool "Ecore"
- name "isUnique"
- value TRUE)
- (object Attribute
- tool "Ecore"
- name "isID"
- value FALSE)
- (object Attribute
- tool "Ecore"
- name "visibility"
- value ("VisibilityKind" 0))
- (object Attribute
- tool "Ecore"
- name "VisibilityKind"
- value (list Attribute_Set
- (object Attribute
- tool "Ecore"
- name "Unspecified"
- value 0)
- (object Attribute
- tool "Ecore"
- name "None"
- value 1)
- (object Attribute
- tool "Ecore"
- name "Read-only"
- value 2)
- (object Attribute
- tool "Ecore"
- name "Read-write"
- value 3)
- (object Attribute
- tool "Ecore"
- name "Read-only unsettable"
- value 4)
- (object Attribute
- tool "Ecore"
- name "Read-write unsettable"
- value 5)))
- (object Attribute
- tool "Ecore"
- name "xmlName"
- value "")
- (object Attribute
- tool "Ecore"
- name "xmlNamespace"
- value "")
- (object Attribute
- tool "Ecore"
- name "xmlFeatureKind"
- value ("FeatureKind" 0))
- (object Attribute
- tool "Ecore"
- name "FeatureKind"
- value (list Attribute_Set
- (object Attribute
- tool "Ecore"
- name "Unspecified"
- value 0)
- (object Attribute
- tool "Ecore"
- name "Simple"
- value 1)
- (object Attribute
- tool "Ecore"
- name "Attribute"
- value 2)
- (object Attribute
- tool "Ecore"
- name "Element"
- value 4)))
- (object Attribute
- tool "Ecore"
- name "annotation"
- value "")))
- (object Attribute
- tool "Ecore"
- name "default__Role"
- value (list Attribute_Set
- (object Attribute
- tool "Ecore"
- name "referenceName"
- value "")
- (object Attribute
- tool "Ecore"
- name "isTransient"
- value FALSE)
- (object Attribute
- tool "Ecore"
- name "isVolatile"
- value FALSE)
- (object Attribute
- tool "Ecore"
- name "isChangeable"
- value TRUE)
- (object Attribute
- tool "Ecore"
- name "isUnsettable"
- value FALSE)
- (object Attribute
- tool "Ecore"
- name "isResolveProxies"
- value TRUE)
- (object Attribute
- tool "Ecore"
- name "visibility"
- value ("VisibilityKind" 0))
- (object Attribute
- tool "Ecore"
- name "VisibilityKind"
- value (list Attribute_Set
- (object Attribute
- tool "Ecore"
- name "Unspecified"
- value 0)
- (object Attribute
- tool "Ecore"
- name "None"
- value 1)
- (object Attribute
- tool "Ecore"
- name "Read-only"
- value 2)
- (object Attribute
- tool "Ecore"
- name "Read-write"
- value 3)
- (object Attribute
- tool "Ecore"
- name "Read-only unsettable"
- value 4)
- (object Attribute
- tool "Ecore"
- name "Read-write unsettable"
- value 5)))
- (object Attribute
- tool "Ecore"
- name "xmlName"
- value "")
- (object Attribute
- tool "Ecore"
- name "xmlNamespace"
- value "")
- (object Attribute
- tool "Ecore"
- name "xmlFeatureKind"
- value ("FeatureKind" 0))
- (object Attribute
- tool "Ecore"
- name "FeatureKind"
- value (list Attribute_Set
- (object Attribute
- tool "Ecore"
- name "Unspecified"
- value 0)
- (object Attribute
- tool "Ecore"
- name "Simple"
- value 1)
- (object Attribute
- tool "Ecore"
- name "Attribute"
- value 2)
- (object Attribute
- tool "Ecore"
- name "Element"
- value 4)))
- (object Attribute
- tool "Ecore"
- name "annotation"
- value ""))))
- quid "3A7999AD02A3"))
diff --git a/plugins/org.eclipse.jem.beaninfo/schema/registrations.exsd b/plugins/org.eclipse.jem.beaninfo/schema/registrations.exsd
deleted file mode 100644
index 6a90380..0000000
--- a/plugins/org.eclipse.jem.beaninfo/schema/registrations.exsd
+++ /dev/null
@@ -1,258 +0,0 @@
-<?xml version='1.0' encoding='UTF-8'?>
-<!-- Schema file written by PDE -->
-<schema targetNamespace="org.eclipse.jem.beaninfo">
-<annotation>
- <appInfo>
- <meta.schema plugin="org.eclipse.jem.beaninfo" id="registrations" name="BeanInfo Extension Registrations"/>
- </appInfo>
- <documentation>
- This extension point is used to register contributors, beaninfo, and overrides for BeanInfo contributions.
-<p>An important concept is visibility of a container, plugin, or project to the top-level project. The top-level project is the project being introspected. For a container, plugin, or project to be visible to that project, the container, plugin, or project must be in the classpath of the top-level project, or it must be exported from a visible project or plugin. Once a non-visible project/plugin is reached, any projects, containers, or plugins that it may contain are not considered to be visible.
-<p>The registrations are identified with the container id and/or plugin id. If that container or plugin is visible, then that registration will be processed for the top-level project. If the container/plugin is found more than once in the build path of the top-level project, it will only be processed once.
-<p>There are three forms of registrations.
-<ul>
-<li>BeanInfo registrations. These supply standard BeanInfo and overrides.
-<li><samp>IClasspathContainer</samp> that implements <samp>IBeanInfoContributor</samp>.
-<li>An explicit contributor that implements <samp>IBeanInfoContributor</samp>.
-</ul>
-<p>It runs through the visible BeanInfo registrations.
-<p>
-The IClasspathContainer registration isn't specified as part of this extension point. For all visible containers, if the classpath container (from JDT) also implements IBeanInfoContributor, then it will be called to contribute to the BeanInfo.
-<p>Then it runs through the visible explicit contributors. Note that if the explicit contributor also implements <samp>org.eclipse.jem.internal.proxy.core.IConfigurationContributor</samp> it will also be called for proxy contributions. This allows for special setup required by any contributed BeanInfo for the launched proxy registry. This shouldn't normally be necessary because normal classpath updates to include the BeanInfo jar will be done by the IBeanInfoContributor itself through the BeanInfo registration callback.
-<p>The order of processing for the overrides will be to first run through the specified overrides (through Beaninfo registrations). Then it runs through the visible containers that implement IBeanInfoContributor, and then finally it runs through the explicit IBeanInfoContributors. This order is chosen because the overrides files are not dynamic so they need to be applied in a consistent way. The contributors are dynamic and can handle change.
-<p>The only order guarantee is that contributions from this extension point will be processed in plugin order of where the extension was declared. For example if there was an extension declared in plugin A and in plugin B, and plugin B requires plugin A, then the extensions declarations in plugin A will be processed before the extension declarations in plugin B.
- </documentation>
- </annotation>
-
- <element name="extension">
- <complexType>
- <sequence>
- <element ref="registration" minOccurs="0" maxOccurs="unbounded"/>
- <element ref="contributor" minOccurs="0" maxOccurs="unbounded"/>
- </sequence>
- <attribute name="point" type="string" use="required">
- <annotation>
- <documentation>
- a fully qualified identifier of the target extension point
- </documentation>
- </annotation>
- </attribute>
- <attribute name="id" type="string">
- <annotation>
- <documentation>
- an optional identifier of the extension instance
- </documentation>
- </annotation>
- </attribute>
- <attribute name="name" type="string">
- <annotation>
- <documentation>
- an optional name of the extension instance
- </documentation>
- </annotation>
- </attribute>
- </complexType>
- </element>
-
- <element name="registration">
- <annotation>
- <documentation>
- This is a registration for a container or plugin. It supplies the BeanInfo and the overrides.
- </documentation>
- </annotation>
- <complexType>
- <sequence>
- <element ref="beaninfo" minOccurs="0" maxOccurs="unbounded"/>
- <element ref="override" minOccurs="0" maxOccurs="unbounded"/>
- </sequence>
- <attribute name="container" type="string">
- <annotation>
- <documentation>
- contributor is for a container. The value is the container id (e.g. <b>"JRE_CONTAINER"</b>). This will match "/JRE_CONTAINER" or "/JRE_CONTAINER/...". Or <b>"JRE_CONTAINER/XYZ"</b> would match "/JRE_CONTAINER/XYZ/...".
-<p>
-You can also use a regular expression. An expression such as <b>"SWT_CONTAINER/.*/JFACE"</b> will match "/SWT_CONTAINER/PDE/JFACE" but will not match "/SWT_CONTAINER".
- </documentation>
- </annotation>
- </attribute>
- <attribute name="plugin" type="string">
- <annotation>
- <documentation>
- contributor is for a plugin. The value is the plugin id (e.g. "org.eclipse.swt").
- </documentation>
- </annotation>
- </attribute>
- </complexType>
- </element>
-
- <element name="contributor">
- <annotation>
- <documentation>
- This is a contributor for the visible container/plugin defined by container and plugin attributes.
- </documentation>
- </annotation>
- <complexType>
- <attribute name="container" type="string">
- <annotation>
- <documentation>
- contributor is for a container. The value is the container id (e.g. <b>"JRE_CONTAINER"</b>). This will match "/JRE_CONTAINER" or "/JRE_CONTAINER/...". Or <b>"JRE_CONTAINER/XYZ"</b> would match "/JRE_CONTAINER/XYZ/...".
-<p>
-You can also use a regular expression. An expression such as <b>"SWT_CONTAINER/.*/JFACE"</b> will match "/SWT_CONTAINER/PDE/JFACE" but will not match "/SWT_CONTAINER".
- </documentation>
- </annotation>
- </attribute>
- <attribute name="plugin" type="string">
- <annotation>
- <documentation>
- contributor is for a plugin. The value is the plugin id (e.g. "org.eclipse.swt").
- </documentation>
- </annotation>
- </attribute>
- <attribute name="class" type="string" use="required">
- <annotation>
- <documentation>
- the class that implements this contributor. The class must implement IBeanInfoContributor.
- </documentation>
- <appInfo>
- <meta.attribute kind="java" basedOn="org.eclipse.jem.internal.beaninfo.core.IBeanInfoContributor"/>
- </appInfo>
- </annotation>
- </attribute>
- </complexType>
- </element>
-
- <element name="beaninfo">
- <annotation>
- <documentation>
- Provide a BeanInfo jar from this or some other plugin, and provide search path packages.
- </documentation>
- </annotation>
- <complexType>
- <sequence>
- <element ref="searchpath" minOccurs="0" maxOccurs="unbounded"/>
- </sequence>
- <attribute name="path" type="string" use="required">
- <annotation>
- <documentation>
- This is the path to the BeanInfo jar from within this or some other plugin. If it is within this plugin, there should be no leading '/'. There can be subfolders though, e.g. <samp>xyz/qxr.jar</samp>. If it is within another plugin, then it must be fully-qualified with leading '/' followed by plugin id, followed by a '/' and then the path to the jar relative to that plugin, e.g. <samp>/org.xyz/qxr/ddd.jar</samp>.
- </documentation>
- </annotation>
- </attribute>
- </complexType>
- </element>
-
- <element name="searchpath">
- <annotation>
- <documentation>
- This is a search path. It gives the package to add to the search path for BeanInfo.
-It refers to packages within the BeanInfo jar contributed by the <samp>beaninfo</samp> element that it is found within.
-There really should be at least one search path. The only way this jar could contribute BeanInfo and not need something added to the search path is if the BeanInfos are in the same package as the bean itself. This is not a recommended way of supplying BeanInfo.
- </documentation>
- </annotation>
- <complexType>
- <attribute name="package" type="string" use="required">
- <annotation>
- <documentation>
- This is the java package to search into for BeanInfo. If there are more than one search paths in this <samp>beaninfo</samp> element, then they will be searched in the order found in the element.
- </documentation>
- </annotation>
- </attribute>
- </complexType>
- </element>
-
- <element name="override">
- <annotation>
- <appInfo>
- <meta.element labelAttribute="package"/>
- </appInfo>
- <documentation>
- This describes an override file for BeanInfo. An override file is an XMI file that is read when a class is first introspected. It happens before the actual introspection. It allows overrides to the Java EMF model class (<samp>JavaClass</samp>) that can be done through standard BeanInfo. These are annotations that are specific to the Visual Editor implementation in Eclipse. The annotations have no meaning to the standard BeanInfo specification so they are supplied here instead. They provide a much enriched experience in the Visual Editor by providing classes that run in the editor.
- </documentation>
- </annotation>
- <complexType>
- <attribute name="package" type="string" use="required">
- <annotation>
- <documentation>
- This is the name of a package or a package fragment. When this package or package fragment matches the package or fragment of a class being introspected, the specified override file from the given path will be applied. For example if the package was <samp>javax.swing</samp> and the path was "xyz", then for class "javax.swing.Container" it will look for file "xyz/Container.override", and if found, it will apply it. If it was <samp>javax.swing.text.JTextComponent</samp> it will look for file "xyz/text/JTextComponent.override".
- </documentation>
- </annotation>
- </attribute>
- <attribute name="path" type="string" use="required">
- <annotation>
- <documentation>
- This is the path relative to the plugin where this extension is declared for the folder to search for the override files. See the package attribute description above for how this works.
- </documentation>
- </annotation>
- </attribute>
- </complexType>
- </element>
-
- <annotation>
- <appInfo>
- <meta.section type="since"/>
- </appInfo>
- <documentation>
- 1.0.0
- </documentation>
- </annotation>
-
- <annotation>
- <appInfo>
- <meta.section type="examples"/>
- </appInfo>
- <documentation>
- The following is an example of a registration:
-<p>
-<pre>
- <extension point="org.eclipse.jem.beaninfo.registration">
- <registration container="VE_CONTAINER">
- <beaninfo path="xyzbeaninfo.jar">
- <searchpath package="com.xyz.beaninfo"/>
- <searchpath package="com.xyz.qxr.beaninfo"/>
- </beaninfo>
- <override package="com.xyz" path="overrides/e"/>
- </registration>
- <contributor plugin="org.eclipse.ve" class="com.xyz.myContributor"/>
- </extension>
-</pre>
-</p>
-<p>
-This says that if container "VE_CONTAINER" is visible to the project being introspected, then then BeanInfo jar "xyzbeaninfo.jar" (found in the plugin that declared this extension) will be looked into for BeanInfos. The two packages listed will be added to the search path of packages.
-<p>
-The override says that, again for "VE_CONTAINER" visible, for any classes that start with "com.xyz", then the override file (classname.override) will be searched for in the directory "overrides/e". For example, if the class was <samp>com.xyz.ABC</samp> it will look for override file "overrides/e/ABC.override". If the class was <samp>com.xyz.qxr.ABC</samp> it will for file "overrides/e/qxr/ABC.override".
-<p>
-Finally if plugin "org.eclipse.ve" is visible to the project, then <samp>com.xyz.myContributor</samp> will be used to contribute to the BeanInfo.
- </documentation>
- </annotation>
-
- <annotation>
- <appInfo>
- <meta.section type="apiInfo"/>
- </appInfo>
- <documentation>
- The <samp>class</samp> attribute must be a class that implements the <samp>org.eclipse.jem.internal.beaninfo.core.IBeanInfoContributor</samp> interface.
- </documentation>
- </annotation>
-
- <annotation>
- <appInfo>
- <meta.section type="implementation"/>
- </appInfo>
- <documentation>
- [Enter information about supplied implementation of this extension point.]
- </documentation>
- </annotation>
-
- <annotation>
- <appInfo>
- <meta.section type="copyright"/>
- </appInfo>
- <documentation>
- Copyright (c) 2004 IBM Corporation and others.<br>
-All rights reserved. This program and the accompanying materials are made
-available under the terms of the Eclipse Public License v1.0 which accompanies
-this distribution, and is available at
-<a href="http://www.eclipse.org/legal/epl-v10.html">http://www.eclipse.org/legal/epl-v10.html</a>
- </documentation>
- </annotation>
-
-</schema>
diff --git a/plugins/org.eclipse.jem.proxy/.classpath b/plugins/org.eclipse.jem.proxy/.classpath
deleted file mode 100644
index 4dae102..0000000
--- a/plugins/org.eclipse.jem.proxy/.classpath
+++ /dev/null
@@ -1,13 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<classpath>
- <classpathentry kind="src" path="proxyCommon"/>
- <classpathentry kind="src" path="initParser"/>
- <classpathentry kind="src" path="remoteCommon"/>
- <classpathentry kind="src" output="vm_bin" path="vm_remotevm"/>
- <classpathentry kind="src" path="proxy"/>
- <classpathentry kind="src" path="proxyRemote"/>
- <classpathentry kind="src" path="proxyide"/>
- <classpathentry kind="con" path="org.eclipse.jdt.launching.JRE_CONTAINER/org.eclipse.jdt.internal.debug.ui.launcher.StandardVMType/J2SE-1.4"/>
- <classpathentry kind="con" path="org.eclipse.pde.core.requiredPlugins"/>
- <classpathentry kind="output" path="bin"/>
-</classpath>
diff --git a/plugins/org.eclipse.jem.proxy/.cvsignore b/plugins/org.eclipse.jem.proxy/.cvsignore
deleted file mode 100644
index 205e09f..0000000
--- a/plugins/org.eclipse.jem.proxy/.cvsignore
+++ /dev/null
@@ -1,9 +0,0 @@
-bin
-build.xml
-common_bin
-vm_bin
-javaCompiler.vm_remotevm.jar.args
-javaCompiler...args
-@dot
-org.eclipse.jem.proxy_2.0.100.200806031304.jar
-vm
diff --git a/plugins/org.eclipse.jem.proxy/.options b/plugins/org.eclipse.jem.proxy/.options
deleted file mode 100644
index 95c080f..0000000
--- a/plugins/org.eclipse.jem.proxy/.options
+++ /dev/null
@@ -1,9 +0,0 @@
-org.eclipse.jem.proxy/remote/debug/debugvm=false
-org.eclipse.jem.proxy/remote/debug/ioconsole=false
-org.eclipse.jem.proxy/remote/debug/vmtraceout=false
-org.eclipse.jem.proxy/remote/debug/notimeouts=false
-org.eclipse.jem.proxy/debug/traceexpressions=false
-org.eclipse.jem.proxy/debug/traceexpressionstimethreshold=100
-org.eclipse.jem.proxy/debug/logtrace=default
-org.eclipse.jem.proxy/debug/logtracefile=default
-org.eclipse.jem.proxy/debug/loglevel=default
\ No newline at end of file
diff --git a/plugins/org.eclipse.jem.proxy/.project b/plugins/org.eclipse.jem.proxy/.project
deleted file mode 100644
index 0f334e3..0000000
--- a/plugins/org.eclipse.jem.proxy/.project
+++ /dev/null
@@ -1,28 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<projectDescription>
- <name>org.eclipse.jem.proxy</name>
- <comment></comment>
- <projects>
- </projects>
- <buildSpec>
- <buildCommand>
- <name>org.eclipse.jdt.core.javabuilder</name>
- <arguments>
- </arguments>
- </buildCommand>
- <buildCommand>
- <name>org.eclipse.pde.ManifestBuilder</name>
- <arguments>
- </arguments>
- </buildCommand>
- <buildCommand>
- <name>org.eclipse.pde.SchemaBuilder</name>
- <arguments>
- </arguments>
- </buildCommand>
- </buildSpec>
- <natures>
- <nature>org.eclipse.pde.PluginNature</nature>
- <nature>org.eclipse.jdt.core.javanature</nature>
- </natures>
-</projectDescription>
diff --git a/plugins/org.eclipse.jem.proxy/.settings/org.eclipse.core.resources.prefs b/plugins/org.eclipse.jem.proxy/.settings/org.eclipse.core.resources.prefs
deleted file mode 100644
index b7d3725..0000000
--- a/plugins/org.eclipse.jem.proxy/.settings/org.eclipse.core.resources.prefs
+++ /dev/null
@@ -1,4 +0,0 @@
-#Sun Apr 15 21:15:15 EDT 2007
-eclipse.preferences.version=1
-encoding//proxyCommon/org/eclipse/jem/internal/proxy/common/messages.properties=8859_1
-encoding/<project>=ISO-8859-1
diff --git a/plugins/org.eclipse.jem.proxy/.settings/org.eclipse.jdt.core.prefs b/plugins/org.eclipse.jem.proxy/.settings/org.eclipse.jdt.core.prefs
deleted file mode 100644
index 97edd2d..0000000
--- a/plugins/org.eclipse.jem.proxy/.settings/org.eclipse.jdt.core.prefs
+++ /dev/null
@@ -1,292 +0,0 @@
-#Mon Mar 12 17:19:57 EDT 2007
-eclipse.preferences.version=1
-org.eclipse.jdt.core.compiler.codegen.targetPlatform=1.2
-org.eclipse.jdt.core.compiler.compliance=1.4
-org.eclipse.jdt.core.compiler.problem.annotationSuperInterface=warning
-org.eclipse.jdt.core.compiler.problem.assertIdentifier=warning
-org.eclipse.jdt.core.compiler.problem.autoboxing=ignore
-org.eclipse.jdt.core.compiler.problem.deprecation=warning
-org.eclipse.jdt.core.compiler.problem.deprecationInDeprecatedCode=disabled
-org.eclipse.jdt.core.compiler.problem.deprecationWhenOverridingDeprecatedMethod=disabled
-org.eclipse.jdt.core.compiler.problem.emptyStatement=ignore
-org.eclipse.jdt.core.compiler.problem.enumIdentifier=warning
-org.eclipse.jdt.core.compiler.problem.fieldHiding=ignore
-org.eclipse.jdt.core.compiler.problem.finalParameterBound=warning
-org.eclipse.jdt.core.compiler.problem.finallyBlockNotCompletingNormally=warning
-org.eclipse.jdt.core.compiler.problem.hiddenCatchBlock=warning
-org.eclipse.jdt.core.compiler.problem.incompatibleNonInheritedInterfaceMethod=warning
-org.eclipse.jdt.core.compiler.problem.incompleteEnumSwitch=ignore
-org.eclipse.jdt.core.compiler.problem.indirectStaticAccess=ignore
-org.eclipse.jdt.core.compiler.problem.localVariableHiding=ignore
-org.eclipse.jdt.core.compiler.problem.methodWithConstructorName=warning
-org.eclipse.jdt.core.compiler.problem.missingDeprecatedAnnotation=ignore
-org.eclipse.jdt.core.compiler.problem.missingOverrideAnnotation=ignore
-org.eclipse.jdt.core.compiler.problem.missingSerialVersion=error
-org.eclipse.jdt.core.compiler.problem.noEffectAssignment=warning
-org.eclipse.jdt.core.compiler.problem.noImplicitStringConversion=warning
-org.eclipse.jdt.core.compiler.problem.nonExternalizedStringLiteral=ignore
-org.eclipse.jdt.core.compiler.problem.overridingPackageDefaultMethod=warning
-org.eclipse.jdt.core.compiler.problem.possibleAccidentalBooleanAssignment=ignore
-org.eclipse.jdt.core.compiler.problem.specialParameterHidingField=disabled
-org.eclipse.jdt.core.compiler.problem.staticAccessReceiver=warning
-org.eclipse.jdt.core.compiler.problem.syntheticAccessEmulation=ignore
-org.eclipse.jdt.core.compiler.problem.typeParameterHiding=warning
-org.eclipse.jdt.core.compiler.problem.uncheckedTypeOperation=warning
-org.eclipse.jdt.core.compiler.problem.undocumentedEmptyBlock=ignore
-org.eclipse.jdt.core.compiler.problem.unnecessaryElse=ignore
-org.eclipse.jdt.core.compiler.problem.unnecessaryTypeCheck=error
-org.eclipse.jdt.core.compiler.problem.unqualifiedFieldAccess=ignore
-org.eclipse.jdt.core.compiler.problem.unusedDeclaredThrownException=ignore
-org.eclipse.jdt.core.compiler.problem.unusedDeclaredThrownExceptionWhenOverriding=disabled
-org.eclipse.jdt.core.compiler.problem.unusedImport=error
-org.eclipse.jdt.core.compiler.problem.unusedLocal=error
-org.eclipse.jdt.core.compiler.problem.unusedParameter=ignore
-org.eclipse.jdt.core.compiler.problem.unusedParameterWhenImplementingAbstract=disabled
-org.eclipse.jdt.core.compiler.problem.unusedParameterWhenOverridingConcrete=disabled
-org.eclipse.jdt.core.compiler.problem.unusedPrivateMember=error
-org.eclipse.jdt.core.compiler.problem.varargsArgumentNeedCast=warning
-org.eclipse.jdt.core.compiler.source=1.3
-org.eclipse.jdt.core.formatter.align_type_members_on_columns=false
-org.eclipse.jdt.core.formatter.alignment_for_arguments_in_allocation_expression=16
-org.eclipse.jdt.core.formatter.alignment_for_arguments_in_enum_constant=16
-org.eclipse.jdt.core.formatter.alignment_for_arguments_in_explicit_constructor_call=16
-org.eclipse.jdt.core.formatter.alignment_for_arguments_in_method_invocation=16
-org.eclipse.jdt.core.formatter.alignment_for_arguments_in_qualified_allocation_expression=16
-org.eclipse.jdt.core.formatter.alignment_for_assignment=0
-org.eclipse.jdt.core.formatter.alignment_for_binary_expression=16
-org.eclipse.jdt.core.formatter.alignment_for_compact_if=16
-org.eclipse.jdt.core.formatter.alignment_for_conditional_expression=80
-org.eclipse.jdt.core.formatter.alignment_for_enum_constants=0
-org.eclipse.jdt.core.formatter.alignment_for_expressions_in_array_initializer=16
-org.eclipse.jdt.core.formatter.alignment_for_multiple_fields=16
-org.eclipse.jdt.core.formatter.alignment_for_parameters_in_constructor_declaration=16
-org.eclipse.jdt.core.formatter.alignment_for_parameters_in_method_declaration=16
-org.eclipse.jdt.core.formatter.alignment_for_selector_in_method_invocation=16
-org.eclipse.jdt.core.formatter.alignment_for_superclass_in_type_declaration=16
-org.eclipse.jdt.core.formatter.alignment_for_superinterfaces_in_enum_declaration=16
-org.eclipse.jdt.core.formatter.alignment_for_superinterfaces_in_type_declaration=16
-org.eclipse.jdt.core.formatter.alignment_for_throws_clause_in_constructor_declaration=16
-org.eclipse.jdt.core.formatter.alignment_for_throws_clause_in_method_declaration=16
-org.eclipse.jdt.core.formatter.blank_lines_after_imports=1
-org.eclipse.jdt.core.formatter.blank_lines_after_package=1
-org.eclipse.jdt.core.formatter.blank_lines_before_field=1
-org.eclipse.jdt.core.formatter.blank_lines_before_first_class_body_declaration=1
-org.eclipse.jdt.core.formatter.blank_lines_before_imports=1
-org.eclipse.jdt.core.formatter.blank_lines_before_member_type=1
-org.eclipse.jdt.core.formatter.blank_lines_before_method=1
-org.eclipse.jdt.core.formatter.blank_lines_before_new_chunk=1
-org.eclipse.jdt.core.formatter.blank_lines_before_package=0
-org.eclipse.jdt.core.formatter.blank_lines_between_type_declarations=1
-org.eclipse.jdt.core.formatter.brace_position_for_annotation_type_declaration=end_of_line
-org.eclipse.jdt.core.formatter.brace_position_for_anonymous_type_declaration=end_of_line
-org.eclipse.jdt.core.formatter.brace_position_for_array_initializer=end_of_line
-org.eclipse.jdt.core.formatter.brace_position_for_block=end_of_line
-org.eclipse.jdt.core.formatter.brace_position_for_block_in_case=end_of_line
-org.eclipse.jdt.core.formatter.brace_position_for_constructor_declaration=end_of_line
-org.eclipse.jdt.core.formatter.brace_position_for_enum_constant=end_of_line
-org.eclipse.jdt.core.formatter.brace_position_for_enum_declaration=end_of_line
-org.eclipse.jdt.core.formatter.brace_position_for_method_declaration=end_of_line
-org.eclipse.jdt.core.formatter.brace_position_for_switch=end_of_line
-org.eclipse.jdt.core.formatter.brace_position_for_type_declaration=end_of_line
-org.eclipse.jdt.core.formatter.comment.format_header=false
-org.eclipse.jdt.core.formatter.comment.format_html=true
-org.eclipse.jdt.core.formatter.comment.format_source_code=true
-org.eclipse.jdt.core.formatter.comment.indent_parameter_description=true
-org.eclipse.jdt.core.formatter.comment.indent_root_tags=true
-org.eclipse.jdt.core.formatter.comment.insert_new_line_before_root_tags=insert
-org.eclipse.jdt.core.formatter.comment.insert_new_line_for_parameter=insert
-org.eclipse.jdt.core.formatter.comment.line_length=150
-org.eclipse.jdt.core.formatter.compact_else_if=true
-org.eclipse.jdt.core.formatter.continuation_indentation=2
-org.eclipse.jdt.core.formatter.continuation_indentation_for_array_initializer=2
-org.eclipse.jdt.core.formatter.format_guardian_clause_on_one_line=true
-org.eclipse.jdt.core.formatter.indent_body_declarations_compare_to_annotation_declaration_header=true
-org.eclipse.jdt.core.formatter.indent_body_declarations_compare_to_enum_constant_header=true
-org.eclipse.jdt.core.formatter.indent_body_declarations_compare_to_enum_declaration_header=true
-org.eclipse.jdt.core.formatter.indent_body_declarations_compare_to_type_header=true
-org.eclipse.jdt.core.formatter.indent_breaks_compare_to_cases=true
-org.eclipse.jdt.core.formatter.indent_empty_lines=false
-org.eclipse.jdt.core.formatter.indent_statements_compare_to_block=true
-org.eclipse.jdt.core.formatter.indent_statements_compare_to_body=true
-org.eclipse.jdt.core.formatter.indent_switchstatements_compare_to_cases=true
-org.eclipse.jdt.core.formatter.indent_switchstatements_compare_to_switch=true
-org.eclipse.jdt.core.formatter.indentation.size=4
-org.eclipse.jdt.core.formatter.insert_new_line_after_annotation=insert
-org.eclipse.jdt.core.formatter.insert_new_line_after_opening_brace_in_array_initializer=do not insert
-org.eclipse.jdt.core.formatter.insert_new_line_at_end_of_file_if_missing=do not insert
-org.eclipse.jdt.core.formatter.insert_new_line_before_catch_in_try_statement=do not insert
-org.eclipse.jdt.core.formatter.insert_new_line_before_closing_brace_in_array_initializer=do not insert
-org.eclipse.jdt.core.formatter.insert_new_line_before_else_in_if_statement=do not insert
-org.eclipse.jdt.core.formatter.insert_new_line_before_finally_in_try_statement=do not insert
-org.eclipse.jdt.core.formatter.insert_new_line_before_while_in_do_statement=do not insert
-org.eclipse.jdt.core.formatter.insert_new_line_in_empty_annotation_declaration=insert
-org.eclipse.jdt.core.formatter.insert_new_line_in_empty_anonymous_type_declaration=insert
-org.eclipse.jdt.core.formatter.insert_new_line_in_empty_block=insert
-org.eclipse.jdt.core.formatter.insert_new_line_in_empty_enum_constant=insert
-org.eclipse.jdt.core.formatter.insert_new_line_in_empty_enum_declaration=insert
-org.eclipse.jdt.core.formatter.insert_new_line_in_empty_method_body=insert
-org.eclipse.jdt.core.formatter.insert_new_line_in_empty_type_declaration=insert
-org.eclipse.jdt.core.formatter.insert_space_after_and_in_type_parameter=insert
-org.eclipse.jdt.core.formatter.insert_space_after_assignment_operator=insert
-org.eclipse.jdt.core.formatter.insert_space_after_at_in_annotation=do not insert
-org.eclipse.jdt.core.formatter.insert_space_after_at_in_annotation_type_declaration=do not insert
-org.eclipse.jdt.core.formatter.insert_space_after_binary_operator=insert
-org.eclipse.jdt.core.formatter.insert_space_after_closing_angle_bracket_in_type_arguments=insert
-org.eclipse.jdt.core.formatter.insert_space_after_closing_angle_bracket_in_type_parameters=insert
-org.eclipse.jdt.core.formatter.insert_space_after_closing_brace_in_block=insert
-org.eclipse.jdt.core.formatter.insert_space_after_closing_paren_in_cast=insert
-org.eclipse.jdt.core.formatter.insert_space_after_colon_in_assert=insert
-org.eclipse.jdt.core.formatter.insert_space_after_colon_in_case=insert
-org.eclipse.jdt.core.formatter.insert_space_after_colon_in_conditional=insert
-org.eclipse.jdt.core.formatter.insert_space_after_colon_in_for=insert
-org.eclipse.jdt.core.formatter.insert_space_after_colon_in_labeled_statement=insert
-org.eclipse.jdt.core.formatter.insert_space_after_comma_in_allocation_expression=insert
-org.eclipse.jdt.core.formatter.insert_space_after_comma_in_annotation=insert
-org.eclipse.jdt.core.formatter.insert_space_after_comma_in_array_initializer=insert
-org.eclipse.jdt.core.formatter.insert_space_after_comma_in_constructor_declaration_parameters=insert
-org.eclipse.jdt.core.formatter.insert_space_after_comma_in_constructor_declaration_throws=insert
-org.eclipse.jdt.core.formatter.insert_space_after_comma_in_enum_constant_arguments=insert
-org.eclipse.jdt.core.formatter.insert_space_after_comma_in_enum_declarations=insert
-org.eclipse.jdt.core.formatter.insert_space_after_comma_in_explicitconstructorcall_arguments=insert
-org.eclipse.jdt.core.formatter.insert_space_after_comma_in_for_increments=insert
-org.eclipse.jdt.core.formatter.insert_space_after_comma_in_for_inits=insert
-org.eclipse.jdt.core.formatter.insert_space_after_comma_in_method_declaration_parameters=insert
-org.eclipse.jdt.core.formatter.insert_space_after_comma_in_method_declaration_throws=insert
-org.eclipse.jdt.core.formatter.insert_space_after_comma_in_method_invocation_arguments=insert
-org.eclipse.jdt.core.formatter.insert_space_after_comma_in_multiple_field_declarations=insert
-org.eclipse.jdt.core.formatter.insert_space_after_comma_in_multiple_local_declarations=insert
-org.eclipse.jdt.core.formatter.insert_space_after_comma_in_parameterized_type_reference=insert
-org.eclipse.jdt.core.formatter.insert_space_after_comma_in_superinterfaces=insert
-org.eclipse.jdt.core.formatter.insert_space_after_comma_in_type_arguments=insert
-org.eclipse.jdt.core.formatter.insert_space_after_comma_in_type_parameters=insert
-org.eclipse.jdt.core.formatter.insert_space_after_ellipsis=insert
-org.eclipse.jdt.core.formatter.insert_space_after_opening_angle_bracket_in_parameterized_type_reference=do not insert
-org.eclipse.jdt.core.formatter.insert_space_after_opening_angle_bracket_in_type_arguments=do not insert
-org.eclipse.jdt.core.formatter.insert_space_after_opening_angle_bracket_in_type_parameters=do not insert
-org.eclipse.jdt.core.formatter.insert_space_after_opening_brace_in_array_initializer=insert
-org.eclipse.jdt.core.formatter.insert_space_after_opening_bracket_in_array_allocation_expression=do not insert
-org.eclipse.jdt.core.formatter.insert_space_after_opening_bracket_in_array_reference=do not insert
-org.eclipse.jdt.core.formatter.insert_space_after_opening_paren_in_annotation=do not insert
-org.eclipse.jdt.core.formatter.insert_space_after_opening_paren_in_cast=do not insert
-org.eclipse.jdt.core.formatter.insert_space_after_opening_paren_in_catch=do not insert
-org.eclipse.jdt.core.formatter.insert_space_after_opening_paren_in_constructor_declaration=do not insert
-org.eclipse.jdt.core.formatter.insert_space_after_opening_paren_in_enum_constant=do not insert
-org.eclipse.jdt.core.formatter.insert_space_after_opening_paren_in_for=do not insert
-org.eclipse.jdt.core.formatter.insert_space_after_opening_paren_in_if=do not insert
-org.eclipse.jdt.core.formatter.insert_space_after_opening_paren_in_method_declaration=do not insert
-org.eclipse.jdt.core.formatter.insert_space_after_opening_paren_in_method_invocation=do not insert
-org.eclipse.jdt.core.formatter.insert_space_after_opening_paren_in_parenthesized_expression=do not insert
-org.eclipse.jdt.core.formatter.insert_space_after_opening_paren_in_switch=do not insert
-org.eclipse.jdt.core.formatter.insert_space_after_opening_paren_in_synchronized=do not insert
-org.eclipse.jdt.core.formatter.insert_space_after_opening_paren_in_while=do not insert
-org.eclipse.jdt.core.formatter.insert_space_after_postfix_operator=do not insert
-org.eclipse.jdt.core.formatter.insert_space_after_prefix_operator=do not insert
-org.eclipse.jdt.core.formatter.insert_space_after_question_in_conditional=insert
-org.eclipse.jdt.core.formatter.insert_space_after_question_in_wildcard=do not insert
-org.eclipse.jdt.core.formatter.insert_space_after_semicolon_in_for=insert
-org.eclipse.jdt.core.formatter.insert_space_after_unary_operator=do not insert
-org.eclipse.jdt.core.formatter.insert_space_before_and_in_type_parameter=insert
-org.eclipse.jdt.core.formatter.insert_space_before_assignment_operator=insert
-org.eclipse.jdt.core.formatter.insert_space_before_at_in_annotation_type_declaration=insert
-org.eclipse.jdt.core.formatter.insert_space_before_binary_operator=insert
-org.eclipse.jdt.core.formatter.insert_space_before_closing_angle_bracket_in_parameterized_type_reference=do not insert
-org.eclipse.jdt.core.formatter.insert_space_before_closing_angle_bracket_in_type_arguments=do not insert
-org.eclipse.jdt.core.formatter.insert_space_before_closing_angle_bracket_in_type_parameters=do not insert
-org.eclipse.jdt.core.formatter.insert_space_before_closing_brace_in_array_initializer=do not insert
-org.eclipse.jdt.core.formatter.insert_space_before_closing_bracket_in_array_allocation_expression=do not insert
-org.eclipse.jdt.core.formatter.insert_space_before_closing_bracket_in_array_reference=do not insert
-org.eclipse.jdt.core.formatter.insert_space_before_closing_paren_in_annotation=do not insert
-org.eclipse.jdt.core.formatter.insert_space_before_closing_paren_in_cast=do not insert
-org.eclipse.jdt.core.formatter.insert_space_before_closing_paren_in_catch=do not insert
-org.eclipse.jdt.core.formatter.insert_space_before_closing_paren_in_constructor_declaration=do not insert
-org.eclipse.jdt.core.formatter.insert_space_before_closing_paren_in_enum_constant=do not insert
-org.eclipse.jdt.core.formatter.insert_space_before_closing_paren_in_for=do not insert
-org.eclipse.jdt.core.formatter.insert_space_before_closing_paren_in_if=do not insert
-org.eclipse.jdt.core.formatter.insert_space_before_closing_paren_in_method_declaration=do not insert
-org.eclipse.jdt.core.formatter.insert_space_before_closing_paren_in_method_invocation=do not insert
-org.eclipse.jdt.core.formatter.insert_space_before_closing_paren_in_parenthesized_expression=do not insert
-org.eclipse.jdt.core.formatter.insert_space_before_closing_paren_in_switch=do not insert
-org.eclipse.jdt.core.formatter.insert_space_before_closing_paren_in_synchronized=do not insert
-org.eclipse.jdt.core.formatter.insert_space_before_closing_paren_in_while=do not insert
-org.eclipse.jdt.core.formatter.insert_space_before_colon_in_assert=insert
-org.eclipse.jdt.core.formatter.insert_space_before_colon_in_case=do not insert
-org.eclipse.jdt.core.formatter.insert_space_before_colon_in_conditional=insert
-org.eclipse.jdt.core.formatter.insert_space_before_colon_in_default=do not insert
-org.eclipse.jdt.core.formatter.insert_space_before_colon_in_for=insert
-org.eclipse.jdt.core.formatter.insert_space_before_colon_in_labeled_statement=do not insert
-org.eclipse.jdt.core.formatter.insert_space_before_comma_in_allocation_expression=do not insert
-org.eclipse.jdt.core.formatter.insert_space_before_comma_in_annotation=do not insert
-org.eclipse.jdt.core.formatter.insert_space_before_comma_in_array_initializer=do not insert
-org.eclipse.jdt.core.formatter.insert_space_before_comma_in_constructor_declaration_parameters=do not insert
-org.eclipse.jdt.core.formatter.insert_space_before_comma_in_constructor_declaration_throws=do not insert
-org.eclipse.jdt.core.formatter.insert_space_before_comma_in_enum_constant_arguments=do not insert
-org.eclipse.jdt.core.formatter.insert_space_before_comma_in_enum_declarations=do not insert
-org.eclipse.jdt.core.formatter.insert_space_before_comma_in_explicitconstructorcall_arguments=do not insert
-org.eclipse.jdt.core.formatter.insert_space_before_comma_in_for_increments=do not insert
-org.eclipse.jdt.core.formatter.insert_space_before_comma_in_for_inits=do not insert
-org.eclipse.jdt.core.formatter.insert_space_before_comma_in_method_declaration_parameters=do not insert
-org.eclipse.jdt.core.formatter.insert_space_before_comma_in_method_declaration_throws=do not insert
-org.eclipse.jdt.core.formatter.insert_space_before_comma_in_method_invocation_arguments=do not insert
-org.eclipse.jdt.core.formatter.insert_space_before_comma_in_multiple_field_declarations=do not insert
-org.eclipse.jdt.core.formatter.insert_space_before_comma_in_multiple_local_declarations=do not insert
-org.eclipse.jdt.core.formatter.insert_space_before_comma_in_parameterized_type_reference=do not insert
-org.eclipse.jdt.core.formatter.insert_space_before_comma_in_superinterfaces=do not insert
-org.eclipse.jdt.core.formatter.insert_space_before_comma_in_type_arguments=do not insert
-org.eclipse.jdt.core.formatter.insert_space_before_comma_in_type_parameters=do not insert
-org.eclipse.jdt.core.formatter.insert_space_before_ellipsis=do not insert
-org.eclipse.jdt.core.formatter.insert_space_before_opening_angle_bracket_in_parameterized_type_reference=do not insert
-org.eclipse.jdt.core.formatter.insert_space_before_opening_angle_bracket_in_type_arguments=do not insert
-org.eclipse.jdt.core.formatter.insert_space_before_opening_angle_bracket_in_type_parameters=do not insert
-org.eclipse.jdt.core.formatter.insert_space_before_opening_brace_in_annotation_type_declaration=insert
-org.eclipse.jdt.core.formatter.insert_space_before_opening_brace_in_anonymous_type_declaration=insert
-org.eclipse.jdt.core.formatter.insert_space_before_opening_brace_in_array_initializer=insert
-org.eclipse.jdt.core.formatter.insert_space_before_opening_brace_in_block=insert
-org.eclipse.jdt.core.formatter.insert_space_before_opening_brace_in_constructor_declaration=insert
-org.eclipse.jdt.core.formatter.insert_space_before_opening_brace_in_enum_constant=insert
-org.eclipse.jdt.core.formatter.insert_space_before_opening_brace_in_enum_declaration=insert
-org.eclipse.jdt.core.formatter.insert_space_before_opening_brace_in_method_declaration=insert
-org.eclipse.jdt.core.formatter.insert_space_before_opening_brace_in_switch=insert
-org.eclipse.jdt.core.formatter.insert_space_before_opening_brace_in_type_declaration=insert
-org.eclipse.jdt.core.formatter.insert_space_before_opening_bracket_in_array_allocation_expression=do not insert
-org.eclipse.jdt.core.formatter.insert_space_before_opening_bracket_in_array_reference=do not insert
-org.eclipse.jdt.core.formatter.insert_space_before_opening_bracket_in_array_type_reference=do not insert
-org.eclipse.jdt.core.formatter.insert_space_before_opening_paren_in_annotation=do not insert
-org.eclipse.jdt.core.formatter.insert_space_before_opening_paren_in_annotation_type_member_declaration=do not insert
-org.eclipse.jdt.core.formatter.insert_space_before_opening_paren_in_catch=insert
-org.eclipse.jdt.core.formatter.insert_space_before_opening_paren_in_constructor_declaration=do not insert
-org.eclipse.jdt.core.formatter.insert_space_before_opening_paren_in_enum_constant=do not insert
-org.eclipse.jdt.core.formatter.insert_space_before_opening_paren_in_for=insert
-org.eclipse.jdt.core.formatter.insert_space_before_opening_paren_in_if=insert
-org.eclipse.jdt.core.formatter.insert_space_before_opening_paren_in_method_declaration=do not insert
-org.eclipse.jdt.core.formatter.insert_space_before_opening_paren_in_method_invocation=do not insert
-org.eclipse.jdt.core.formatter.insert_space_before_opening_paren_in_parenthesized_expression=do not insert
-org.eclipse.jdt.core.formatter.insert_space_before_opening_paren_in_switch=insert
-org.eclipse.jdt.core.formatter.insert_space_before_opening_paren_in_synchronized=insert
-org.eclipse.jdt.core.formatter.insert_space_before_opening_paren_in_while=insert
-org.eclipse.jdt.core.formatter.insert_space_before_parenthesized_expression_in_return=insert
-org.eclipse.jdt.core.formatter.insert_space_before_postfix_operator=do not insert
-org.eclipse.jdt.core.formatter.insert_space_before_prefix_operator=do not insert
-org.eclipse.jdt.core.formatter.insert_space_before_question_in_conditional=insert
-org.eclipse.jdt.core.formatter.insert_space_before_question_in_wildcard=do not insert
-org.eclipse.jdt.core.formatter.insert_space_before_semicolon=do not insert
-org.eclipse.jdt.core.formatter.insert_space_before_semicolon_in_for=do not insert
-org.eclipse.jdt.core.formatter.insert_space_before_unary_operator=do not insert
-org.eclipse.jdt.core.formatter.insert_space_between_brackets_in_array_type_reference=do not insert
-org.eclipse.jdt.core.formatter.insert_space_between_empty_braces_in_array_initializer=do not insert
-org.eclipse.jdt.core.formatter.insert_space_between_empty_brackets_in_array_allocation_expression=do not insert
-org.eclipse.jdt.core.formatter.insert_space_between_empty_parens_in_annotation_type_member_declaration=do not insert
-org.eclipse.jdt.core.formatter.insert_space_between_empty_parens_in_constructor_declaration=do not insert
-org.eclipse.jdt.core.formatter.insert_space_between_empty_parens_in_enum_constant=do not insert
-org.eclipse.jdt.core.formatter.insert_space_between_empty_parens_in_method_declaration=do not insert
-org.eclipse.jdt.core.formatter.insert_space_between_empty_parens_in_method_invocation=do not insert
-org.eclipse.jdt.core.formatter.keep_else_statement_on_same_line=false
-org.eclipse.jdt.core.formatter.keep_empty_array_initializer_on_one_line=false
-org.eclipse.jdt.core.formatter.keep_imple_if_on_one_line=false
-org.eclipse.jdt.core.formatter.keep_then_statement_on_same_line=false
-org.eclipse.jdt.core.formatter.lineSplit=150
-org.eclipse.jdt.core.formatter.number_of_blank_lines_at_beginning_of_method_body=0
-org.eclipse.jdt.core.formatter.number_of_empty_lines_to_preserve=1
-org.eclipse.jdt.core.formatter.put_empty_statement_on_new_line=true
-org.eclipse.jdt.core.formatter.tabulation.char=tab
-org.eclipse.jdt.core.formatter.tabulation.size=4
-org.eclipse.jdt.core.formatter.use_tabs_only_for_leading_indentations=false
diff --git a/plugins/org.eclipse.jem.proxy/.settings/org.eclipse.jdt.ui.prefs b/plugins/org.eclipse.jem.proxy/.settings/org.eclipse.jdt.ui.prefs
deleted file mode 100644
index 855e136..0000000
--- a/plugins/org.eclipse.jem.proxy/.settings/org.eclipse.jdt.ui.prefs
+++ /dev/null
@@ -1,8 +0,0 @@
-#Tue Feb 21 10:09:18 EST 2006
-eclipse.preferences.version=1
-formatter_profile=_jve
-formatter_settings_version=10
-org.eclipse.jdt.ui.ignorelowercasenames=true
-org.eclipse.jdt.ui.importorder=java;javax;org;org.eclipse.wtp;org.eclipse.jem;org.eclipse.ve.internal.cdm;org.eclipse.ve.internal.cde;org.eclipse.ve.internal.jcm;org.eclipse.ve.internal.java;org.eclipse.ve;com;
-org.eclipse.jdt.ui.ondemandthreshold=3
-org.eclipse.jdt.ui.text.custom_code_templates=<?xml version\="1.0" encoding\="UTF-8"?><templates/>
diff --git a/plugins/org.eclipse.jem.proxy/.settings/org.eclipse.pde.core.prefs b/plugins/org.eclipse.jem.proxy/.settings/org.eclipse.pde.core.prefs
deleted file mode 100644
index 78eace4..0000000
--- a/plugins/org.eclipse.jem.proxy/.settings/org.eclipse.pde.core.prefs
+++ /dev/null
@@ -1,3 +0,0 @@
-#Thu Jun 16 11:08:13 EDT 2005
-eclipse.preferences.version=1
-selfhosting.binExcludes=/org.eclipse.jem.proxy/vm_bin
diff --git a/plugins/org.eclipse.jem.proxy/META-INF/MANIFEST.MF b/plugins/org.eclipse.jem.proxy/META-INF/MANIFEST.MF
deleted file mode 100644
index 61b34aa..0000000
--- a/plugins/org.eclipse.jem.proxy/META-INF/MANIFEST.MF
+++ /dev/null
@@ -1,28 +0,0 @@
-Manifest-Version: 1.0
-Bundle-ManifestVersion: 2
-Bundle-Name: %pluginName
-Bundle-SymbolicName: org.eclipse.jem.proxy; singleton:=true
-Bundle-Version: 2.0.301.qualifier
-Bundle-Activator: org.eclipse.jem.internal.proxy.core.ProxyPlugin
-Bundle-Vendor: %providerName
-Bundle-Localization: plugin
-Export-Package: org.eclipse.jem.internal.proxy.awt,
- org.eclipse.jem.internal.proxy.common,
- org.eclipse.jem.internal.proxy.common.remote,
- org.eclipse.jem.internal.proxy.core,
- org.eclipse.jem.internal.proxy.ide,
- org.eclipse.jem.internal.proxy.ide.awt,
- org.eclipse.jem.internal.proxy.initParser,
- org.eclipse.jem.internal.proxy.initParser.tree,
- org.eclipse.jem.internal.proxy.remote,
- org.eclipse.jem.internal.proxy.remote.awt,
- org.eclipse.jem.internal.proxy.vm.remote
-Require-Bundle: org.eclipse.jdt.launching;bundle-version="[3.2.0,4.0.0)",
- org.eclipse.jdt.core;bundle-version="[3.3.0,4.0.0)",
- org.eclipse.debug.core;bundle-version="[3.3.0,4.0.0)",
- org.eclipse.jem.util;bundle-version="[2.0.0,3.0.0)",
- org.eclipse.pde.core;bundle-version="[3.3.0,4.0.0)";resolution:=optional,
- org.eclipse.core.runtime;bundle-version="[3.3.0,4.0.0)",
- org.eclipse.ui;bundle-version="[3.3.0,4.0.0)";resolution:=optional
-Eclipse-LazyStart: true
-Bundle-RequiredExecutionEnvironment: J2SE-1.4
diff --git a/plugins/org.eclipse.jem.proxy/META-INF/eclipse.inf b/plugins/org.eclipse.jem.proxy/META-INF/eclipse.inf
deleted file mode 100644
index 8f39f72..0000000
--- a/plugins/org.eclipse.jem.proxy/META-INF/eclipse.inf
+++ /dev/null
@@ -1,2 +0,0 @@
-jarprocessor.exclude.pack=true
-jarprocessor.exclude.children=true
\ No newline at end of file
diff --git a/plugins/org.eclipse.jem.proxy/about.html b/plugins/org.eclipse.jem.proxy/about.html
deleted file mode 100644
index 5acea59..0000000
--- a/plugins/org.eclipse.jem.proxy/about.html
+++ /dev/null
@@ -1,25 +0,0 @@
-<!DOCTYPE HTML PUBLIC "-//W3C//DTD HTML 4.0//EN">
-<html><head><title>About</title>
-
-
-
-<meta http-equiv="Content-Type" content="text/html; charset=ISO-8859-1"></head><body lang="EN-US">
-<h2>About This Content</h2>
-
-<P>June, 2008</P>
-<h3>License</h3>
-
-<p>The Eclipse Foundation makes available all content in this plug-in ("Content"). Unless otherwise
-indicated below, the Content is provided to you under the terms and conditions of the
-Eclipse Public License Version 1.0 ("EPL"). A copy of the EPL is available
-at <a href="http://www.eclipse.org/legal/epl-v10.html">http://www.eclipse.org/legal/epl-v10.html</a>.
-For purposes of the EPL, "Program" will mean the Content.</p>
-
-<p>If you did not receive this Content directly from the Eclipse Foundation, the Content is
-being redistributed by another party ("Redistributor") and different terms and conditions may
-apply to your use of any object code in the Content. Check the Redistributor's license that was
-provided with the Content. If no such license exists, contact the Redistributor. Unless otherwise
-indicated below, the terms and conditions of the EPL still apply to any source code in the Content
-and such source code may be obtained at <a href="http://www.eclipse.org/">http://www.eclipse.org</a>.</p>
-
-</body></html>
\ No newline at end of file
diff --git a/plugins/org.eclipse.jem.proxy/build.properties b/plugins/org.eclipse.jem.proxy/build.properties
deleted file mode 100644
index b449a7a..0000000
--- a/plugins/org.eclipse.jem.proxy/build.properties
+++ /dev/null
@@ -1,31 +0,0 @@
-###############################################################################
-# Copyright (c) 2003, 2005 IBM Corporation and others.
-# All rights reserved. This program and the accompanying materials
-# are made available under the terms of the Eclipse Public License v1.0
-# which accompanies this distribution, and is available at
-# http://www.eclipse.org/legal/epl-v10.html
-#
-# Contributors:
-# IBM Corporation - initial API and implementation
-###############################################################################
-bin.includes = plugin.xml,\
- plugin.properties,\
- vm/remotevm.jar,\
- .options,\
- about.html,\
- META-INF/,\
- .
-src.includes = about.html,\
- schema/,\
- proxy.jars
-jars.compile.order = .,\
- vm/remotevm.jar
-source.vm/remotevm.jar = vm_remotevm/
-output.vm/remotevm.jar = vm_bin/
-output.. = bin/
-source.. = proxyCommon/,\
- initParser/,\
- remoteCommon/,\
- proxy/,\
- proxyRemote/,\
- proxyide/
diff --git a/plugins/org.eclipse.jem.proxy/initParser/org/eclipse/jem/internal/proxy/initParser/ArrayArguments.java b/plugins/org.eclipse.jem.proxy/initParser/org/eclipse/jem/internal/proxy/initParser/ArrayArguments.java
deleted file mode 100644
index 05dd886..0000000
--- a/plugins/org.eclipse.jem.proxy/initParser/org/eclipse/jem/internal/proxy/initParser/ArrayArguments.java
+++ /dev/null
@@ -1,136 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2001, 2005 IBM Corporation and others.
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
- *
- * Contributors:
- * IBM Corporation - initial API and implementation
- *******************************************************************************/
-package org.eclipse.jem.internal.proxy.initParser;
-/*
-
-
- */
-
-import java.io.StringWriter;
-import java.lang.reflect.Array;
-import java.util.*;
-/**
- * This represents the arguments in a multi dimensional array with construction parameters, e.g.
- * new int[][] { { 2 ,3 } , { 4 ,5 }}
- * the arguments of the constructor will be instance of ArrayArguments
- */
-public class ArrayArguments extends Expression {
-
- Static fType;
- List arguments = new ArrayList(2);
- boolean argsClosed;
- boolean insideArgsOpenedParen;
- boolean insideArgsClosedParen;
-
-public Expression push(char[] token, char tokenDelimiter) {
-
- // If the args are opened and a token was supplied then it must be an argument
- //if ( argsOpened && ( tokenDelimiter == DelimiterCloseParen || tokenDelimiter == DelimiterComma ||
- //tokenDelimiter == DelimiterSpace || tokenDelimiter == DelimiterQuote || tokenDelimiter == DelimiterPeriod)) {
- if (!argsClosed){
- if ( arguments.size() > 0 ){
- Expression openArgument = (Expression)arguments.get(arguments.size()-1);
- if ( !openArgument.isComplete() ) {
- openArgument.push(token,tokenDelimiter);
- // If the argument is complete and we received a ) then the message is complete
- if ( openArgument.isComplete() && tokenDelimiter == DelimiterCloseElipse){
- argsClosed = true;
- }
- return this;
- }
- }
-
- // We must have a new argument - process accordingly
- Expression newArgument = null;
- if (!insideArgsOpenedParen && tokenDelimiter == DelimiterOpenParen){
- insideArgsOpenedParen = true;
- newArgument = new Statement(fClassLoader).push(token,tokenDelimiter);
- newArgument = new MessageArgument(newArgument);
- arguments.add(newArgument);
-
- }
- if ( token.length > 0 || tokenDelimiter == DelimiterQuote || tokenDelimiter == DelimiterSingleQuote || tokenDelimiter == OperMinus ) {
- newArgument = new Statement(fClassLoader).push(token,tokenDelimiter);
- newArgument = new MessageArgument(newArgument);
- arguments.add(newArgument);
- }
- // If the token after the argument is a ) then the message is being closed
- if ( !insideArgsOpenedParen && tokenDelimiter == DelimiterCloseElipse ) {
- argsClosed = true;
- return this;
- }
- if ( insideArgsOpenedParen && tokenDelimiter == DelimiterCloseElipse ) {
- insideArgsClosedParen = true;
- argsClosed = true;
- return this;
- }
- }
- return this;
-}
-/**
- * In the case of the expression new int[][] { {2,3} , {4,5} } then we are the 2,3 or the 4,5
- * to evaluate we must return an array of ints based on our size. The type we return is determined by the initial
- * constructor who will have given this to us as our fType
- */
-public Object evaluate() throws Exception {
-
- Object result = Array.newInstance(fType.getPrimitiveTypeClass(),arguments.size());
- for (int i = 0; i < arguments.size(); i++) {
- Object argumentValue = ((Expression)arguments.get(i)).evaluate();
- Array.set(result,i,argumentValue);
- }
- return result;
-}
-
-public Class getTypeClass() throws Exception {
- return null;
-}
-
-public boolean isComplete() {
- return argsClosed;
-}
-
-public boolean isPrimitive() throws Exception {
- return false;
-}
-public void setType(Static type) {
- fType = type;
-}
-public void contributeArgumentNumber(List argumentNumberList){
-
- // Add the number of arguments we have to the list
- argumentNumberList.add(new Integer(arguments.size()));
- // If our arguments are themselves array arguments ( which will occur in an array of 3 or more dimensions )
- // then we should cascade this message to our argument so that the total array depth is known
- if ( arguments.size() > 0 ) {
- Object firstArgument = arguments.get(0);
- if ( firstArgument instanceof ArrayArguments ) {
-// ((ArrayArguments)firstArgument)contributeArgumentNumber(argumentNumberList);
- }
- }
-
-}
-public String toString(){
- StringWriter writer = new StringWriter();
- writer.write("Args("); //$NON-NLS-1$
- writer.write(new Integer(arguments.size()).toString());
- writer.write(")-"); //$NON-NLS-1$
- writer.write(arguments.toString());
- return writer.toString();
-}
- /* (non-Javadoc)
- * @see org.eclipse.jem.internal.proxy.core.initParser.Expression#getTypeClassName()
- */
- protected String getTypeClassName() {
- return ""; // Not applicable //$NON-NLS-1$
- }
-
-}
diff --git a/plugins/org.eclipse.jem.proxy/initParser/org/eclipse/jem/internal/proxy/initParser/Block.java b/plugins/org.eclipse.jem.proxy/initParser/org/eclipse/jem/internal/proxy/initParser/Block.java
deleted file mode 100644
index 98c72fb..0000000
--- a/plugins/org.eclipse.jem.proxy/initParser/org/eclipse/jem/internal/proxy/initParser/Block.java
+++ /dev/null
@@ -1,113 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2001, 2005 IBM Corporation and others.
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
- *
- * Contributors:
- * IBM Corporation - initial API and implementation
- *******************************************************************************/
-package org.eclipse.jem.internal.proxy.initParser;
-/*
-
-
- */
-
-/**
- */
-public class Block extends Expression {
-
- protected boolean fIsClosed = false;
- protected boolean fIsComplete = false;
- protected boolean fMessageOrField = false;
-
- public Block(Expression anExpression){
- currentExpression = anExpression;
- }
-
- public Block(ClassLoader fClassLoader){
- currentExpression = new Statement(fClassLoader);
- }
-
- public Object evaluate() throws Exception {
- return currentExpression.evaluate();
- }
-
- public boolean isComplete() {
- return fIsComplete;
- }
-
- public Class getTypeClass() throws Exception {
- return currentExpression.getTypeClass();
- }
-
-
- public Expression push(char[] token, char tokenDelimiter) {
-
- // If we are closed (i.e. completed with a )) and we get a ) or , then we are all finished up
- // We should not forward this token to the expression, as it isComplete
- if ((fIsClosed || currentExpression.isComplete()) && (tokenDelimiter == DelimiterCloseParen || tokenDelimiter == DelimiterComma)){
- fIsComplete = true;
- return this;
- }
-
- // If we are a message of field and we get a ( we are message or a field otherwise
- if (fMessageOrField){
- fMessageOrField = false;
- // The problem now is that we are a block of an expression and we need to create a message
- // where we are the receiver. However we are on the stack and going to be popped when the message finishes
- // so we must alter ourself to be a block whose current expression is message whose argument
- // is a copy of us
- if ( tokenDelimiter == DelimiterOpenParen){
- Message message = new Message(currentExpression,token,fClassLoader);
- currentExpression = message;
- return message;
- } else {
- Field field = new Field(currentExpression,token,fClassLoader);
- currentExpression = field;
- return field;
- }
- }
-
- // If we are closed and we get a . then we must begin a message or field expression
- if (currentExpression.isComplete() && tokenDelimiter == DelimiterPeriod ){
- fMessageOrField = true;
- return this;
- }
-
- Expression result = currentExpression.push(token,tokenDelimiter);
- // If the result if a push then push the stack
- if ( result != currentExpression ) {
- pushExpressionStack(result);
- }
- // If our current expression is complete and we are receiving a close parent then we are closed
- if (currentExpression.isComplete() && tokenDelimiter == DelimiterCloseParen){
- fIsClosed = true;
-
- }
- // If we are here the current expression is still processing tokens so we should return it
- return currentExpression;
- }
-
- public boolean isPrimitive() throws Exception {
- return false;
- }
- public String toString(){
- StringBuffer buffer = new StringBuffer();
- buffer.append("Block("); //$NON-NLS-1$
- if ( currentExpression != null ) {
- buffer.append(currentExpression.toString());
- }
- buffer.append(')');
- return buffer.toString();
- }
-
- /* (non-Javadoc)
- * @see org.eclipse.jem.internal.proxy.core.initParser.Expression#getTypeClassName()
- */
- protected String getTypeClassName() {
- return currentExpression.getTypeClassName();
- }
-
-}
diff --git a/plugins/org.eclipse.jem.proxy/initParser/org/eclipse/jem/internal/proxy/initParser/BooleanLiteral.java b/plugins/org.eclipse.jem.proxy/initParser/org/eclipse/jem/internal/proxy/initParser/BooleanLiteral.java
deleted file mode 100644
index e8a15f7..0000000
--- a/plugins/org.eclipse.jem.proxy/initParser/org/eclipse/jem/internal/proxy/initParser/BooleanLiteral.java
+++ /dev/null
@@ -1,63 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2001, 2005 IBM Corporation and others.
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
- *
- * Contributors:
- * IBM Corporation - initial API and implementation
- *******************************************************************************/
-package org.eclipse.jem.internal.proxy.initParser;
-/*
-
-
- */
-
-
-public class BooleanLiteral extends Expression {
- public boolean value;
-public BooleanLiteral(boolean aValue){
-
- value = aValue;
-
-}
-
-public boolean isComplete(){
- return true;
-}
-/**
- * evaluate method comment.
- */
-public Object evaluate() {
- return new Boolean(value);
-}
-/**
- * evaluate method comment.
- */
-public Class getTypeClass(){
- return Boolean.TYPE;
-}
-/**
- * true or false cannot consume any kind of expression so we must return null
- */
-public Expression push(char[] token , char delimiter){
-
- return null;
-
-}
-
-/**
- * This is primitive
- */
-public boolean isPrimitive() {
- return true;
-}
- /* (non-Javadoc)
- * @see org.eclipse.jem.internal.proxy.core.initParser.Expression#getTypeClassName()
- */
- protected String getTypeClassName() {
- return Boolean.TYPE.getName();
- }
-
-}
diff --git a/plugins/org.eclipse.jem.proxy/initParser/org/eclipse/jem/internal/proxy/initParser/CannotProcessArrayTypesException.java b/plugins/org.eclipse.jem.proxy/initParser/org/eclipse/jem/internal/proxy/initParser/CannotProcessArrayTypesException.java
deleted file mode 100644
index 5defcb9..0000000
--- a/plugins/org.eclipse.jem.proxy/initParser/org/eclipse/jem/internal/proxy/initParser/CannotProcessArrayTypesException.java
+++ /dev/null
@@ -1,29 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2001, 2005 IBM Corporation and others.
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
- *
- * Contributors:
- * IBM Corporation - initial API and implementation
- *******************************************************************************/
-package org.eclipse.jem.internal.proxy.initParser;
-/*
-
-
- */
-
-/**
- * Exception to indicate that the initStringParser can't deal with arrays right now
- */
-public class CannotProcessArrayTypesException extends RuntimeException {
-
- /**
- * Comment for <code>serialVersionUID</code>
- *
- * @since 1.1.0
- */
- private static final long serialVersionUID = -4245984020065761634L;
-
-}
diff --git a/plugins/org.eclipse.jem.proxy/initParser/org/eclipse/jem/internal/proxy/initParser/CannotProcessInnerClassesException.java b/plugins/org.eclipse.jem.proxy/initParser/org/eclipse/jem/internal/proxy/initParser/CannotProcessInnerClassesException.java
deleted file mode 100644
index 5cbecd1..0000000
--- a/plugins/org.eclipse.jem.proxy/initParser/org/eclipse/jem/internal/proxy/initParser/CannotProcessInnerClassesException.java
+++ /dev/null
@@ -1,29 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2001, 2005 IBM Corporation and others.
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
- *
- * Contributors:
- * IBM Corporation - initial API and implementation
- *******************************************************************************/
-package org.eclipse.jem.internal.proxy.initParser;
-/*
-
-
- */
-
-/**
- * This exception is thrown to indicate that inner classes cannot be processed
- */
-public class CannotProcessInnerClassesException extends RuntimeException {
-
- /**
- * Comment for <code>serialVersionUID</code>
- *
- * @since 1.1.0
- */
- private static final long serialVersionUID = 8290504580738499445L;
-
-}
diff --git a/plugins/org.eclipse.jem.proxy/initParser/org/eclipse/jem/internal/proxy/initParser/Cast.java b/plugins/org.eclipse.jem.proxy/initParser/org/eclipse/jem/internal/proxy/initParser/Cast.java
deleted file mode 100644
index ef70b80..0000000
--- a/plugins/org.eclipse.jem.proxy/initParser/org/eclipse/jem/internal/proxy/initParser/Cast.java
+++ /dev/null
@@ -1,173 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2001, 2005 IBM Corporation and others.
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
- *
- * Contributors:
- * IBM Corporation - initial API and implementation
- *******************************************************************************/
-package org.eclipse.jem.internal.proxy.initParser;
-/*
-
-
- */
-
-
-import java.util.HashMap;
-
-public class Cast extends Expression {
- protected static final int BYTE_TYPE = 0;
- protected static final int SHORT_TYPE = 1;
- protected static final int INT_TYPE = 2;
- protected static final int LONG_TYPE = 3;
- protected static final int FLOAT_TYPE = 4;
- protected static final int DOUBLE_TYPE = 5;
-
- protected static final HashMap sTypeLookup;
- static {
- sTypeLookup = new HashMap(6);
- sTypeLookup.put(Byte.TYPE, new Integer(BYTE_TYPE));
- sTypeLookup.put(Short.TYPE, new Integer(SHORT_TYPE));
- sTypeLookup.put(Integer.TYPE, new Integer(INT_TYPE));
- sTypeLookup.put(Long.TYPE, new Integer(LONG_TYPE));
- sTypeLookup.put(Float.TYPE, new Integer(FLOAT_TYPE));
- sTypeLookup.put(Double.TYPE, new Integer(DOUBLE_TYPE));
- }
-
- protected Static fCastType;
- protected boolean fIsClosed = false;
-
- public Cast(Static castType, ClassLoader aClassLoader) {
- fCastType = castType;
- fClassLoader = aClassLoader;
- }
-
- public boolean isPrimitive() throws Exception {
- return getTypeClass().isPrimitive();
- }
-
- /**
- * The type of a Cast expression is the type of the cast type.
- */
- public Class getTypeClass() throws Exception {
- return fCastType.getTypeClass();
- }
-
-
- public boolean isComplete() {
- return currentExpression != null && currentExpression.isComplete();
- }
-
- /**
- * If the type is primitive, then we need to
- * convert the value, otherwise just pass
- * the value on.
- *
- * This is important for primitives because if your
- * entire initialization string was simply "(short) 3"
- * then a Short value must be returned so that the
- * correct kind of primitive proxy is created.
- */
- public Object evaluate() throws Exception {
- if (getTypeClass() == currentExpression.getTypeClass())
- return currentExpression.evaluate(); // They're the same, so just return it.
- if (getTypeClass().isPrimitive()) {
- // Can only cast a primitive to a primitive, except null can't be cast to a primitive.
- if (!currentExpression.getTypeClass().isPrimitive() || currentExpression.getTypeClass() == Void.TYPE)
- throw new EvaluationException(new ClassCastException(currentExpression.getTypeClass().getName()));
- // boolean only allows boolean cast.
- if (fCastType.getTypeClass() == Boolean.TYPE || currentExpression.getTypeClass() == Boolean.TYPE)
- throw new EvaluationException(new ClassCastException(currentExpression.getTypeClass().getName()));
- if (fCastType.getTypeClass() == Character.TYPE) {
- // So we have either a Character or a number as the value. Cast that.
- return new Character((char) ((Number) currentExpression.evaluate()).intValue());
- } else {
- Number value = null;
- // See if the value is character or a number.
- if (currentExpression.getTypeClass() == Character.TYPE)
- value = new Integer(((Character) currentExpression.evaluate()).charValue());
- else
- value = (Number) currentExpression.evaluate();
- switch (((Integer) sTypeLookup.get(fCastType.getTypeClass())).intValue()) {
- case BYTE_TYPE:
- return new Byte(value.byteValue());
- case SHORT_TYPE:
- return new Short(value.shortValue());
- case INT_TYPE:
- return new Integer(value.intValue());
- case LONG_TYPE:
- return new Long(value.longValue());
- case FLOAT_TYPE:
- return new Float(value.floatValue());
- case DOUBLE_TYPE:
- return new Double(value.doubleValue());
- default:
- return null; // Shouldn't occur. Just satisifies compiler.
- }
- }
-
- } else
- return currentExpression.evaluate();
- }
- /**
- * A cast expression always pushes onto the cast value
- */
- public Expression push(char[] token , char tokenDelimiter) {
- // If we don't have a class yet then we are within the statement to try and deterine the type being cast to
- if(fCastType.getPrimitiveTypeClass() == null && !fIsClosed){
- fCastType.push(token,tokenDelimiter);
- // If the type was completed and we have a ) then close us
- if(fCastType.getPrimitiveTypeClass() != null && tokenDelimiter == DelimiterCloseParen){
- fIsClosed = true;
- }
- return this;
- }
-
- if (!fIsClosed) {
- // The cast is not closed, but we have a static class. This class must therefore keep processing the tokens as it could be a method or message send
- Expression result = fCastType.push(token,tokenDelimiter);
- result.parenthesisLevel++;
- return result;
- }
-
- // If we have no expression push onto the cast value
- if(currentExpression == null){
- currentExpression = new Statement(fClassLoader);
- currentExpression = currentExpression.push(token,tokenDelimiter);
- return this;
- }
- Expression result = currentExpression.push(token, tokenDelimiter);
- // If the result if a push then push the stack
- if ( result.isComplete() ) {
- popExpressionStack();
- } else if ( result != currentExpression ) {
- pushExpressionStack(result);
- }
- return this;
- }
- public String toString(){
- StringBuffer buffer = new StringBuffer();
- buffer.append("Cast("); //$NON-NLS-1$
- if (fCastType != null){
- buffer.append(fCastType.toString());
- } else {
- buffer.append("???"); //$NON-NLS-1$
- }
- buffer.append(") "); //$NON-NLS-1$
- if ( currentExpression != null){
- buffer.append(currentExpression.toString());
- } else {
- buffer.append("???"); //$NON-NLS-1$
- }
- return buffer.toString();
- }
- /* (non-Javadoc)
- * @see org.eclipse.jem.internal.proxy.core.initParser.Expression#getTypeClassName()
- */
- protected String getTypeClassName() {
- return fCastType.getTypeClassName();
- }
-
-}
diff --git a/plugins/org.eclipse.jem.proxy/initParser/org/eclipse/jem/internal/proxy/initParser/CharLiteral.java b/plugins/org.eclipse.jem.proxy/initParser/org/eclipse/jem/internal/proxy/initParser/CharLiteral.java
deleted file mode 100644
index 88ad26c..0000000
--- a/plugins/org.eclipse.jem.proxy/initParser/org/eclipse/jem/internal/proxy/initParser/CharLiteral.java
+++ /dev/null
@@ -1,114 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2001, 2005 IBM Corporation and others.
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
- *
- * Contributors:
- * IBM Corporation - initial API and implementation
- *******************************************************************************/
-package org.eclipse.jem.internal.proxy.initParser;
-/*
-
-
- */
-
-import java.text.MessageFormat;
-
-
-
-public class CharLiteral extends Expression {
- protected boolean isComplete;
- public char value;
- public StringBuffer valueBuffer = new StringBuffer();
- protected boolean isEscaped = false;
-
-/**
- * constructor
- */
-public CharLiteral(){
-}
-
-/**
- * evaluate method comment.
- */
-public Object evaluate() throws Exception {
- if (valueBuffer.length() == 1)
- return new Character(valueBuffer.charAt(0));
- else
- throw new EvaluationException(
- new IllegalArgumentException(MessageFormat.format(ProxyInitParserMessages.getString("CharTooComplicated_EXC_"), //$NON-NLS-1$
- new Object[] {valueBuffer.toString()})));
-}
-
-public boolean isComplete(){
- return isComplete;
-}
-/**
- * We must evaluate ourself and return the type of the result
- */
-
-public Class getTypeClass() {
- return Character.TYPE;
-}
-
-protected String getTypeClassName() {
- return Character.TYPE.getName();
-}
-/**
- *This string might be broken into a few tokens
- *so we need a StringBuffer
- */
-public Expression push(char[] token , char delimiter){
-
- if (isEscaped) {
- isEscaped = false;
- if (token.length != 0) {
- // Had an escape followed by stuff, so not a true esc for our current definition
- valueBuffer.append(DelimiterEscape);
- } else {
- if (delimiter == DelimiterSingleQuote || delimiter == DelimiterEscape)
- valueBuffer.append(delimiter); // It was a true escape.
- else {
- valueBuffer.append(DelimiterEscape); // If wasn't a true escape
- valueBuffer.append(delimiter);
- }
- return this;
- }
- }
-
- valueBuffer.append(token);
-
- if (delimiter == DelimiterSingleQuote){
- isComplete =true;
- return this;
- }
-
- // If the delimiter is an escape character remember it so we can escape
- // the next token, otherwise treat it as a literal
- if (delimiter == DelimiterEscape ){
- isEscaped = true;
- } else {
- valueBuffer.append(delimiter);
- }
- return this;
-}
-
-/**
- * chars are primitives.
- */
-public boolean isPrimitive() {
- return true;
-}
-public String toString(){
- StringBuffer buffer = new StringBuffer();
- buffer.append("Char('"); //$NON-NLS-1$
- if ( valueBuffer != null ) {
- buffer.append(valueBuffer.toString());
- }
- buffer.append(')');
- return buffer.toString();
-}
-
-}
diff --git a/plugins/org.eclipse.jem.proxy/initParser/org/eclipse/jem/internal/proxy/initParser/Constructor.java b/plugins/org.eclipse.jem.proxy/initParser/org/eclipse/jem/internal/proxy/initParser/Constructor.java
deleted file mode 100644
index 0094e48..0000000
--- a/plugins/org.eclipse.jem.proxy/initParser/org/eclipse/jem/internal/proxy/initParser/Constructor.java
+++ /dev/null
@@ -1,339 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2001, 2006 IBM Corporation and others.
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
- *
- * Contributors:
- * IBM Corporation - initial API and implementation
- *******************************************************************************/
-package org.eclipse.jem.internal.proxy.initParser;
-/*
-
-
- */
-
-
-import java.util.*;
-
-import org.eclipse.jem.internal.proxy.common.AmbiguousMethodException;
-import org.eclipse.jem.internal.proxy.common.MethodHelper;
-/**
- * Insert the type's description here.
- * Creation date: (11/01/00 8:52:36 PM)
- * @author: Administrator
- */
-public class Constructor extends Expression {
- public boolean argsOpened = false;
- public boolean argsClosed = false;
- public boolean trailingPeriod = false;
- public ArrayList arguments = new ArrayList(2);
- public Static type;
- protected boolean fIsComplete;
- public boolean insideArgsOpenedParen = false;
- public boolean insideArgsClosedParen = false;
- public boolean isString = false;
- public java.lang.reflect.Constructor ctor;
-/**
- * Constructor constructor comment.
- */
-public Constructor(ClassLoader aClassLoader) {
- super();
- fClassLoader = aClassLoader;
-}
-
-public boolean isComplete(){
- return fIsComplete;
-}
-
-/**
- * Invoke the construtor
- */
-public Object evaluate() throws Exception {
-
- if ( type.isArray() ) {
- // For arrays we get the array that is actually held inside the static
- // To instantiate the array it is possible that the static knows the array size, e.g. new int[2]
- // or else it must be given this from the number of arguments we have, e.g. new int[] { 2 , 3 }
- if ( arguments.size() > 0 ) {
- type.setArrayArguments(arguments);
- }
- Object result = type.evaluate();
- // Deal with array initialization arguments
- return result;
- } else {
- // For non arrays we find the method and invoke it on the type
- cacheCtor();
- // Get the array of arguments
- Object[] args = new Object[arguments.size()];
- Iterator itr = arguments.iterator();
- for (int i = 0; i < arguments.size() ; i++){
- Expression anExpression = (Expression)itr.next();
- args[i] = anExpression.evaluate();
- }
-
- try {
- return ctor.newInstance(args);
- } catch (Exception e) {
- // If we got this far, then we have a valid parse, so anything is an evaluation exception.
- throw new EvaluationException(e);
- }
- }
-}
-/** A constructor can only return the class of its type
- */
-public Class getTypeClass() throws Exception {
- if ( type.isArray() ) {
- // For arrays we get the array that is actually held inside the static
- // To instantiate the array it is possible that the static knows the array size, e.g. new int[2]
- // or else it must be given this from the number of arguments we have, e.g. new int[] { 2 , 3 }
- if ( arguments.size() > 0 ) {
- type.setArrayArguments(arguments);
- }
- }
- return type.getTypeClass();
-}
-
-protected String getTypeClassName() {
- return type.getTypeClassName();
-}
-
-private void cacheCtor() throws Exception {
-
- if (ctor == null) {
- Class[] argTypes = new Class[arguments.size()];
- Iterator itr = arguments.iterator();
- for (int i=0; i<argTypes.length; i++)
- argTypes[i] = getEvaluationTypeClass((Expression) itr.next());
-
- try {
- ctor = MethodHelper.findCompatibleConstructor(getEvaluationTypeClass(this), argTypes);
- } catch (NoSuchMethodException e) {
- throw new EvaluationException(e);
- } catch (AmbiguousMethodException e) {
- throw new EvaluationException(e);
- } catch (IllegalAccessException e) {
- throw new EvaluationException(e);
- }
- }
-}
-protected boolean isDelimiterOpened(char token){
- return type.isArray() ? token == DelimiterOpenElipse : token == DelimiterOpenParen;
-}
-protected boolean isDelimiterClosed(char token){
- return type.isArray() ? token == DelimiterCloseElipse : token == DelimiterCloseParen;
-}
-/**
- * push method comment.
- */
-public Expression push(char[] token, char tokenDelimiter) {
-
- // If we are closed and we receive a . with no token then remember this
- if ( argsClosed && !trailingPeriod && tokenDelimiter == DelimiterPeriod && token.length == 0 ) {
- trailingPeriod = true;
- return this;
- }
- // If we have been closed with a . and we receive a . then we are a field
- if ( trailingPeriod && tokenDelimiter == DelimiterPeriod ) {
- return new Field(this,token,fClassLoader);
- }
- // If we have been closed with a . and we receive a ( we are a message
- if ( trailingPeriod && tokenDelimiter == DelimiterOpenParen ) {
- return new Message(this,token,fClassLoader);
- }
-
- // Lazy initialize the type if required
- if ( type == null ) {
- switch ( tokenDelimiter ) {
- case DelimiterPeriod: {
- type = new Static(token,tokenDelimiter,fClassLoader);
- type.setClassLoader(fClassLoader);
- return this;
- }
- case DelimiterOpenParen: {
- type = new Static(token,tokenDelimiter,fClassLoader);
- type.setClassLoader(fClassLoader);
- argsOpened = true;
- return this;
- }
- case DelimiterOpenSquareBrace: {
-// throw new CannotProcessArrayTypesException();
- // Array dimenions are created as staements in the arrayDimensions
- // This is for expressions like new String[] or new String[3], where the Statement represents the 3, i.e.
- // the code that declares the size of the array
- type = new Static(token,tokenDelimiter,fClassLoader,true);
- return this;
- }
- // If we get a { and our static is an array then this is the array initialization parameters
- case DelimiterOpenElipse: {
- if ( type != null && type.isArray() ) {
- argsOpened = true;
- }
- }
- default: {
- return null;
- }
- }
- }
-
- // If we have a static that is an array then it consumes token until it is complete
- if ( type != null && type.isArray() ) {
- // The type consumes token as long as it is still in the array declaration section
- if ( type.isProcessingArrayDimension || tokenDelimiter == DelimiterOpenSquareBrace ) {
- type.push(token,tokenDelimiter);
- return this;
- }
- }
-
- // If the type is incomplete and the token is a . ( for another class ) or a [ for an array then push it onto the type
- if (!type.isArray() && type.getTypeClass() == null && (tokenDelimiter == DelimiterPeriod || tokenDelimiter == DelimiterOpenSquareBrace)) {
- type.push(token , tokenDelimiter);
- return this;
- }
- // If the type is incomplete and the token is a ( then push it onto the type and open the parens
- if (!type.isArray()){
- if (type.getTypeClass() == null && !argsOpened && isDelimiterOpened(tokenDelimiter)) {
- argsOpened = true;
- insideArgsOpenedParen = true;
- type.push(token , DelimiterSpace );
- return this;
- }
- } else {
- if ( !argsOpened && isDelimiterOpened(tokenDelimiter)) {
- argsOpened = true;
- insideArgsOpenedParen = true;
- return this;
- }
- }
-
- // If the args are already closed and we get another close expression, then just return ourselves
- // This occurs in the case of nested array arguments within constructors
- if ( argsClosed && (tokenDelimiter == DelimiterCloseParen)){
- fIsComplete = true;
- return this;
- }
-
- // If the arguments are closed and we receive a { then this is an inner class declaration, e.g.
- // new javax.swing.table.DefaultTableModel(){}
- // This can't be processed by us so we need to throw an exception
- if (argsClosed && tokenDelimiter == DelimiterOpenElipse ) {
- throw new CannotProcessInnerClassesException();
- }
-
- // If the args are opened and a token was supplied then it must be an argument
- if (argsOpened){
- // If we already have an incomplete argument then this may be a constructor, a static reference, etc...
- // and we should forward the request to the argument
- Expression openArgument = null;
- if ( arguments.size() > 0 ){
- openArgument = (Expression)arguments.get(arguments.size()-1);
- if ( !openArgument.isComplete() ) {
- openArgument.push(token,tokenDelimiter);
- // If the argument is complete and we received a ) then the constructor is complete
- // or if we receive a } and are an array we are complete
- if ( openArgument.isComplete() && isDelimiterClosed(tokenDelimiter) ){
- argsClosed = true;
- }
- return this;
- }
- }
-
- Expression newArgument = null;
- // If we are not already inside the open arg and we get another open paren this is probably a cast
- // or some kind of statement, and OperMinus is probably the start of a number
- // If the args are not already open we must be opened with either a { or a ( depending on whether we are an array or not
- // however if the args are opened already and we receive a ( then this is the start of a new statement
-// if ((!insideArgsOpenedParen && isDelimiterOpened(tokenDelimiter)) || tokenDelimiter == DelimiterOpenParen){
- if (tokenDelimiter == DelimiterOpenElipse || tokenDelimiter == DelimiterOpenParen){
- insideArgsOpenedParen = true;
- newArgument = new Statement(fClassLoader).push(token,tokenDelimiter);
- if ( newArgument instanceof ArrayArguments ) {
- ((ArrayArguments)newArgument).setType(type);
- }
- newArgument = new MessageArgument(newArgument);
- arguments.add(newArgument);
-
- }
-
- // Start of a possible string or number or character
- if ( ( token.length > 0 || tokenDelimiter == DelimiterQuote || tokenDelimiter == DelimiterSingleQuote) || tokenDelimiter == OperMinus ){
- newArgument = new Statement(fClassLoader).push(token,tokenDelimiter);
- newArgument = new MessageArgument(newArgument);
- arguments.add(newArgument);
- }
- // If the token after the argument is a ) then the message is being closed
- if ( !insideArgsOpenedParen || argumentsAreComplete() && isDelimiterClosed(tokenDelimiter) ) {
- argsClosed = true;
- return this;
- }
- if ( insideArgsOpenedParen && isDelimiterClosed(tokenDelimiter) ) {
- insideArgsClosedParen = true;
- return this;
- }
-
- // If the token after the argument is a , or a ' ' then the argument is being closed
- if ( tokenDelimiter == DelimiterComma || tokenDelimiter == DelimiterSpace ) {
- // If our arguments are closed then we must be complete. We need to signal the fact we are closed
- // otherwise we will not be processed correctly if we are part of a stack
- if ( argsClosed ) {
- fIsComplete = true;
- }
- return this;
- }
-
- // If we receive a close bracket then we are closed as long as the last argument is closed
- if(argsOpened && isDelimiterClosed(tokenDelimiter)){
- // No parms - we are a closed constructor
- if(arguments.size() == 0){
- argsClosed = true;
- return this;
- }
- }
-
- // If our last argument is closed and receive a ) and we have no new argument then we are closed
- if (tokenDelimiter == DelimiterCloseParen && newArgument == null){
- Expression lastArgument = (Expression)arguments.get(arguments.size()-1);
- if ( lastArgument.isComplete() ) {
- argsClosed = true;
- return this;
- }
- }
-
- // Otherwise the new argument is stil processing. Return it
- return newArgument;
- }
-
- return this;
-}
-protected boolean argumentsAreComplete(){
- if ( arguments.size() == 0) return true;
- return ((Expression)arguments.get(arguments.size()-1)).isComplete();
-}
-public String toString(){
-
- java.io.StringWriter writer = new java.io.StringWriter();
- writer.write("Constructor \""); //$NON-NLS-1$
- if ( type != null ) {
- writer.write(type.typeWriter.toString());
- } else {
- writer.write("UNTYPED"); //$NON-NLS-1$
- }
- for (int i = 0; i < arguments.size() ; i++){
- writer.write(" Arg("); //$NON-NLS-1$
- writer.write("" + (i+1)); //$NON-NLS-1$
- writer.write(") = "); //$NON-NLS-1$
- writer.write(arguments.get(i).toString());
- }
-
- return writer.toString();
-
-}
-
-/**
- * This is never primitive
- */
-public boolean isPrimitive() {
- return false;
-}
-}
diff --git a/plugins/org.eclipse.jem.proxy/initParser/org/eclipse/jem/internal/proxy/initParser/EvaluationException.java b/plugins/org.eclipse.jem.proxy/initParser/org/eclipse/jem/internal/proxy/initParser/EvaluationException.java
deleted file mode 100644
index 67215b9..0000000
--- a/plugins/org.eclipse.jem.proxy/initParser/org/eclipse/jem/internal/proxy/initParser/EvaluationException.java
+++ /dev/null
@@ -1,46 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2001, 2005 IBM Corporation and others.
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
- *
- * Contributors:
- * IBM Corporation - initial API and implementation
- *******************************************************************************/
-package org.eclipse.jem.internal.proxy.initParser;
-/*
-
-
- */
-
-import java.lang.reflect.InvocationTargetException;
-
-/**
- * This is an InitializationStringEvaluationException, but
- * in addition, the exception that it wrappers is what should be
- * returned. This means it was a valid exception, parsing had
- * gone fine, but it was an evaluation that occured. This is
- * distinguished from the straight InitializationStringEvaluationException,
- * which means some error during parsing and evaluation.
- *
- * Note: InvocationTargetExceptions will be unwrappered to the true exception.
- */
-public class EvaluationException extends InitializationStringEvaluationException {
-
- /**
- * Comment for <code>serialVersionUID</code>
- *
- * @since 1.1.0
- */
- private static final long serialVersionUID = -6997239021885310986L;
-
- /**
- * Constructor for ReturnableException.
- * @param exc
- */
- public EvaluationException(Throwable exc) {
- super(exc instanceof InvocationTargetException ? ((InvocationTargetException) exc).getTargetException() : exc);
- }
-
-}
diff --git a/plugins/org.eclipse.jem.proxy/initParser/org/eclipse/jem/internal/proxy/initParser/Expression.java b/plugins/org.eclipse.jem.proxy/initParser/org/eclipse/jem/internal/proxy/initParser/Expression.java
deleted file mode 100644
index 22bf67c..0000000
--- a/plugins/org.eclipse.jem.proxy/initParser/org/eclipse/jem/internal/proxy/initParser/Expression.java
+++ /dev/null
@@ -1,130 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2001, 2005 IBM Corporation and others.
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
- *
- * Contributors:
- * IBM Corporation - initial API and implementation
- *******************************************************************************/
-package org.eclipse.jem.internal.proxy.initParser;
-/*
-
-
- */
-
-
-import java.util.*;
-/**
- * Insert the type's description here.
- * Creation date: (11/01/00 8:46:44 PM)
- * @author: Administrator
- */
-public abstract class Expression implements IParserConstants {
- protected Expression currentExpression;
- protected List fExpressionStack;
- protected ClassLoader fClassLoader;
- public int parenthesisLevel = 0;
-/** Compare the two char arrays
- */
-public static boolean compare(char[] from , char[] to){
-
- return Arrays.equals(from, to);
-}
-/**
- * Expression constructor comment.
- * Note: If any exceptions that are due to evaluation, and not due to some
- * invalid state, then the exception should be wrappered in an EvaluationException,
- * and the EvaluationException thrown instead. This way we can distinquish between
- * valid exceptions that result evaluations (such as null pointer exceptions) from
- * parser errors due to string is too complicated.
- */
-public abstract Object evaluate() throws Exception;
-
-public abstract boolean isComplete();
-/**
- * Return a class type that the expression syntactically would produce.
- * For example, if a field is of type XYZ, return XYZ, even though
- * the value of the field may be SubXYZ where SubXYZ is a subclass of XYZ.
- */
-public abstract Class getTypeClass() throws Exception;
-/**
- * In evaluation phase, get the type class from the expression.
- * If typeclass not found, then a ClassCastException is thrown.
- * @param exp To getTypeClass from
- * @return type class.
- * @throws Exception ClassNotFoundException if type not found.
- */
-public Class getEvaluationTypeClass(Expression exp) throws Exception {
- Class cls = exp.getTypeClass();
- if (cls == null)
- throw new EvaluationException(new ClassNotFoundException(exp.getTypeClassName()));
- return cls;
-}
-
-/**
- * @return Type name that should be returned from this expression.
- */
-protected abstract String getTypeClassName();
-
-public boolean isNumber(char[] token){
-
- if ( token.length == 0) return false;
- // See whether the token is a number
- int parsePosition = 0;
- // Take into account it may start with a - sign, e.g. -1
- if ( token[0] == '-' ) parsePosition = 1;
- for (int i = parsePosition; i < token.length ; i++){
- // If the next token is a digit return true
- // Other things like decimals or primitive types, e.g. 2.2 or 2.2f are
- // handled by NumberLiteral
- return Character.isDigit(token[i]);
- }
- return true;
-}
-public boolean isPop(){
- return false;
-}
-protected void popExpressionStack(){
-
- if ( fExpressionStack != null && fExpressionStack.size() > 0 ) {
- currentExpression = (Expression) fExpressionStack.remove(fExpressionStack.size()-1);
- }
-}
-protected void pushExpressionStack(Expression anExpression){
-
- if ( fExpressionStack == null ) fExpressionStack = new ArrayList(2);
- // The current expression should go onto the stack
- fExpressionStack.add(currentExpression);
- // The current expression is replaced with the argument
- currentExpression = anExpression;
-
-}
-
-void setClassLoader(ClassLoader aClassLoader){
-}
-
-/**
- * Push an expression onto us
- * Return the new expression onto which subsequent token should be pushed
- */
-public abstract Expression push(char[] token , char tokenDelimiter);
-
-/**
- * Answer if this expression results in a primitive.
- */
-public abstract boolean isPrimitive() throws Exception;
-
-public String toString(int depth, boolean aBreak){
- StringBuffer buffer = new StringBuffer();
- if ( aBreak ) {
- buffer.append(System.getProperty("System.lineSeparator")); //$NON-NLS-1$
- }
- for(int i=0;i<depth;i++){
- buffer.append(" "); //$NON-NLS-1$
- }
- buffer.append(toString());
- return buffer.toString();
-}
-}
diff --git a/plugins/org.eclipse.jem.proxy/initParser/org/eclipse/jem/internal/proxy/initParser/Field.java b/plugins/org.eclipse.jem.proxy/initParser/org/eclipse/jem/internal/proxy/initParser/Field.java
deleted file mode 100644
index 4625ca9..0000000
--- a/plugins/org.eclipse.jem.proxy/initParser/org/eclipse/jem/internal/proxy/initParser/Field.java
+++ /dev/null
@@ -1,146 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2001, 2005 IBM Corporation and others.
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
- *
- * Contributors:
- * IBM Corporation - initial API and implementation
- *******************************************************************************/
-package org.eclipse.jem.internal.proxy.initParser;
-/*
-
-
- */
-
-
-/**
- * Insert the type's description here.
- * Creation date: (11/05/00 10:39:28 PM)
- * @author: Administrator
- */
-public class Field extends Expression {
- public boolean isComplete;
- protected java.lang.reflect.Field fField;
- public Expression receiver;
- public String fieldName;
- protected Class fResultType;
-
-public Field(Expression aReceiver , char[] token , ClassLoader aClassLoader){
-
- receiver = aReceiver;
- if ( token.length > 0 ){
- fieldName = new String(token);
- }
-
-}
-public boolean isComplete(){
- return isComplete;
-}
-
-/**
- * Send the message to the receiver
- */
-public Object evaluate() throws Exception {
- Object receiverValue = receiver.evaluate(); // So if it fails, we get an evaluation exception going on up.
- try {
- cacheField();
- return fField.get(receiverValue);
- } catch (Exception e) {
- throw new EvaluationException(e); // Any exception at this point is an evaluation exception.
- }
-}
-
-/**
- * Get the field from reflection.
- */
-protected void cacheField() throws Exception {
- if (fField == null) {
- Class aReceiverClass = getEvaluationTypeClass(receiver);
- fField = aReceiverClass.getField(fieldName);
- fResultType = fField.getType();
- }
-}
-
-/**
- * The result type is the type of the field.
- */
-public Class getTypeClass() throws Exception {
- if ( fResultType == null ) {
- cacheField();
- }
- return fResultType;
-}
-
-protected String getTypeClassName() {
- return ""; // If we got this far, we don't know what it is. //$NON-NLS-1$
-}
-/**
- * push method comment.
- */
-public Expression push(char[] token, char tokenDelimiter) {
-
- // If the delimiter is a ( then this is the start of a message
- if ( tokenDelimiter == DelimiterOpenParen ) {
- return new Message(this , token , fClassLoader);
- }
-
- // If the delimiter is a . then this is a field
- if (token.length > 0 && ( tokenDelimiter == DelimiterPeriod || tokenDelimiter == DelimiterSpace
- || tokenDelimiter == DelimiterComma)) {
- isComplete = true;
- return new Field(this , token , fClassLoader);
-
- }
-
- if(fieldName != null && tokenDelimiter == DelimiterComma){
- isComplete = true;
- return this;
- }
-
- // If we have no delimiter or a close paren then we have just received the field name
- if (!isComplete && fieldName == null) {
- fieldName = new String(token);
- return this;
- }
-
- if(tokenDelimiter == BitOR || tokenDelimiter == BitAND){
- isComplete = true;
- PrimitiveOperation result = new PrimitiveOperation(this,tokenDelimiter);
- return result;
- }
-
- // Ignore spaces as this maybe padding between the field and the next valid token
- if(token.length == 0 && tokenDelimiter == ' ') return this;
-
- throw new RuntimeException(java.text.MessageFormat.format(ProxyInitParserMessages.getString(ProxyInitParserMessages.UNEXPECTED_TOKEN), new Object[] {new StringBuffer(token.length+1).append(token).append(tokenDelimiter).toString()}));
-
-}
-public String toString(){
-
- java.io.StringWriter writer = new java.io.StringWriter();
- writer.write("Field Name=\""); //$NON-NLS-1$
- if ( fieldName != null ) {
- writer.write(fieldName);
- } else {
- writer.write("UNNAMED"); //$NON-NLS-1$
- }
- writer.write("\" Receiver="); //$NON-NLS-1$
- if ( receiver != null ){
- writer.write(receiver.toString());
- } else {
- writer.write("NONE"); //$NON-NLS-1$
- }
- return writer.toString();
-
-}
-
-/**
- * Test the field type to determine if primitive or not.
- */
-public boolean isPrimitive() throws Exception {
- cacheField();
- return getTypeClass().isPrimitive();
-}
-}
diff --git a/plugins/org.eclipse.jem.proxy/initParser/org/eclipse/jem/internal/proxy/initParser/IParserConstants.java b/plugins/org.eclipse.jem.proxy/initParser/org/eclipse/jem/internal/proxy/initParser/IParserConstants.java
deleted file mode 100644
index dcc0f3b..0000000
--- a/plugins/org.eclipse.jem.proxy/initParser/org/eclipse/jem/internal/proxy/initParser/IParserConstants.java
+++ /dev/null
@@ -1,51 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2001, 2005 IBM Corporation and others.
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
- *
- * Contributors:
- * IBM Corporation - initial API and implementation
- *******************************************************************************/
-package org.eclipse.jem.internal.proxy.initParser;
-/*
-
-
- */
-
-
-/**
- * Constants for the parser.
- * Creation date: (11/05/00 9:37:45 PM)
- * @author: Administrator
- */
-public interface IParserConstants {
- // Define the delimiters
- public static final char DelimiterSpace = ' ';
- public static final char DelimiterPeriod = '.';
- public static final char DelimiterOpenParen = '(';
- public static final char DelimiterCloseParen = ')';
- public static final char DelimiterComma = ',';
- public static final char DelimiterQuote = '"';
- public static final char DelimiterEscape = '\\';
- public static final char DelimiterSingleQuote = '\'';
- public static final char DelimiterOpenElipse = '{';
- public static final char DelimiterCloseElipse = '}';
- public static final char DelimiterOpenSquareBrace = '[';
- public static final char DelimiterCloseSquareBrace = ']';
- // Define the math functions
- public static final char OperPlus = '+';
- public static final char OperMinus = '-';
- public static final char OperMultiply = '*';
- public static final char OperDivide = '/';
- // Define the primitive functions
- public static final char BitOR = '|';
- public static final char BitAND = '&';
-
- // Define constants
- public static final char[] ConstantNew = new char[] { 'n' , 'e' , 'w' };
- public static final char[] ConstantTrue = new char[] { 't' , 'r' , 'u' , 'e' };
- public static final char[] ConstantFalse = new char[] { 'f' , 'a' , 'l' , 's' , 'e' };
- public static final char[] ConstantNull = new char[] { 'n' , 'u' , 'l' , 'l' };
-}
diff --git a/plugins/org.eclipse.jem.proxy/initParser/org/eclipse/jem/internal/proxy/initParser/InitializationStringEvaluationException.java b/plugins/org.eclipse.jem.proxy/initParser/org/eclipse/jem/internal/proxy/initParser/InitializationStringEvaluationException.java
deleted file mode 100644
index 7a284c2..0000000
--- a/plugins/org.eclipse.jem.proxy/initParser/org/eclipse/jem/internal/proxy/initParser/InitializationStringEvaluationException.java
+++ /dev/null
@@ -1,34 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2001, 2005 IBM Corporation and others.
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
- *
- * Contributors:
- * IBM Corporation - initial API and implementation
- *******************************************************************************/
-package org.eclipse.jem.internal.proxy.initParser;
-/*
-
-
- */
-
-
-
-public class InitializationStringEvaluationException extends Exception {
-
-
-/**
- * Comment for <code>serialVersionUID</code>
- *
- * @since 1.1.0
- */
- private static final long serialVersionUID = -8633390926210276727L;
-public InitializationStringEvaluationException(Throwable exc){
- super(exc);
-}
-public Throwable getOriginalException(){
- return getCause();
-}
-}
diff --git a/plugins/org.eclipse.jem.proxy/initParser/org/eclipse/jem/internal/proxy/initParser/InitializationStringParser.java b/plugins/org.eclipse.jem.proxy/initParser/org/eclipse/jem/internal/proxy/initParser/InitializationStringParser.java
deleted file mode 100644
index 693f93c..0000000
--- a/plugins/org.eclipse.jem.proxy/initParser/org/eclipse/jem/internal/proxy/initParser/InitializationStringParser.java
+++ /dev/null
@@ -1,300 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2001, 2005 IBM Corporation and others.
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
- *
- * Contributors:
- * IBM Corporation - initial API and implementation
- *******************************************************************************/
-package org.eclipse.jem.internal.proxy.initParser;
-/*
-
-
- */
-
-
-import java.util.ArrayList;
-/**
- * Insert the type's description here.
- * Creation date: (11/01/00 8:53:45 PM)
- * @author: Administrator
- */
-public class InitializationStringParser implements IParserConstants {
- protected ClassLoader fClassLoader;
- protected boolean isComplete = false;
- protected String fInitString;
- protected int fSourceLength;
- protected char[] fSource;
- protected int fSourcePosition = -1;
- private char[] fCurrentToken;
- private char fCurrentTokenDelimiter = 0;
- protected ArrayList fExpressionStack = new ArrayList(4);
- protected Expression fExpression;
-/**
- * InitializationStringParser constructor comment.
- */
-public InitializationStringParser(String initString){
-
- fInitString = initString;
- fSource = initString.toCharArray();
- fSourceLength = fSource.length;
-
-}
-/** Look for a known token
- */
-protected void createNextToken(){
-
- fCurrentTokenDelimiter = 0;
- if ( fSourcePosition >= fSourceLength - 1 ) {
- isComplete = true;
- return;
- }
-
- fSourcePosition++;
- // If we are not in a token then look for " " or else for a period
- char[] fCurrentTokenSource = new char[fSourceLength];
- int i = 0;
- scanner : for ( ; fSourcePosition < fSourceLength ; fSourcePosition++ , i++ ){
- // Advance the source position so when finding the next token we skip over the '.' or ' '
- // Record the delimiter that was found
- switch ( fSource[fSourcePosition] ) {
- case DelimiterPeriod: {
- fCurrentTokenDelimiter = DelimiterPeriod;
- break scanner;
- }
- case DelimiterOpenParen: {
- fCurrentTokenDelimiter = DelimiterOpenParen;
- break scanner;
- }
- case DelimiterCloseParen: {
- fCurrentTokenDelimiter = DelimiterCloseParen;
- break scanner;
- }
- case DelimiterComma: {
- fCurrentTokenDelimiter = DelimiterComma;
- break scanner;
- }
- case DelimiterSpace: {
- fCurrentTokenDelimiter = DelimiterSpace;
- break scanner;
- }
- case DelimiterQuote: {
- fCurrentTokenDelimiter = DelimiterQuote;
- break scanner;
- }
- case DelimiterSingleQuote: {
- fCurrentTokenDelimiter = DelimiterSingleQuote;
- break scanner;
- }
- case DelimiterEscape: {
- fCurrentTokenDelimiter = DelimiterEscape;
- break scanner;
- }
- case DelimiterOpenElipse:{
- fCurrentTokenDelimiter = DelimiterOpenElipse;
- break scanner;
- }
- case DelimiterOpenSquareBrace:{
- fCurrentTokenDelimiter = DelimiterOpenSquareBrace;
- break scanner;
- }
- case DelimiterCloseSquareBrace:{
- fCurrentTokenDelimiter = DelimiterCloseSquareBrace;
- break scanner;
- }
- case DelimiterCloseElipse:{
- fCurrentTokenDelimiter = DelimiterCloseElipse;
- break scanner;
- }
- // Do the math functions
- case OperPlus: {
- fCurrentTokenDelimiter = OperPlus;
- break scanner;
- }
- case OperMinus: {
- fCurrentTokenDelimiter = OperMinus;
- break scanner;
- }
- case OperMultiply: {
- fCurrentTokenDelimiter = OperMultiply;
- break scanner;
- }
- case OperDivide: {
- fCurrentTokenDelimiter = OperDivide;
- break scanner;
- }
- // Do the primitive BitWise operations
- case BitOR: {
- fCurrentTokenDelimiter = BitOR;
- break scanner;
- }
- case BitAND: {
- fCurrentTokenDelimiter = BitAND;
- break scanner;
- }
- default: {
- fCurrentTokenSource[i] = fSource[fSourcePosition];
- }
- }
- }
-
- // Push the token onto the stack for later decoding
- if ( i >= 1 ) {
- fCurrentToken = new char[i];
- System.arraycopy( fCurrentTokenSource , 0 , fCurrentToken , 0 , i );
- } else {
- fCurrentToken = new char[0];
- }
-
-}
-/** Answer the result of evaluating the expression
- */
-public Object evaluate() throws InitializationStringEvaluationException {
-
- try {
- return fExpression.evaluate();
- } catch (java.lang.reflect.InvocationTargetException e) {
- throw new EvaluationException(e);
- } catch (EvaluationException e) {
- throw e; // Don't loose these
- } catch (Exception e) {
- throw new InitializationStringEvaluationException(e);
- }
-
-}
-public static Object evaluate(String initString) throws InitializationStringEvaluationException {
-
- return evaluate(initString,null);
-
-}
-public static Object evaluate(String initString,ClassLoader aClassLoader) throws InitializationStringEvaluationException {
-
- InitializationStringParser parser = null;;
- try {
- parser = new InitializationStringParser(initString);
- parser.setClassLoader(aClassLoader);
- parser.parse();
- } catch ( Throwable exc ) {
- throw new InitializationStringEvaluationException(exc);
- }
- return parser.evaluate();
-}
-
-/**
- * Return a parser already parsed. Use the default classloader (i.e. classloader that loaded InitializationStringParser).
- *
- * @param initString
- * @return The parser, already parsed.
- * @throws InitializationStringEvaluationException
- */
-
-public static InitializationStringParser createParser(String initString) throws InitializationStringEvaluationException {
- return createParser(initString, null);
-}
-
-/**
- * Return a parser already parsed. Use the given classloader.
- *
- * @param initString
- * @param classLoader
- * @return The parser, already parsed.
- * @throws InitializationStringEvaluationException
- */
-public static InitializationStringParser createParser(String initString, ClassLoader classLoader) throws InitializationStringEvaluationException {
-
- try {
- InitializationStringParser parser = new InitializationStringParser(initString);
- parser.setClassLoader(classLoader);
- parser.parse();
- return parser;
- } catch ( Throwable exc ) {
- throw new InitializationStringEvaluationException(exc);
- }
-
-}
-
-/** Analyze the string
- */
-public void parse(){
-
- createFirstExpression();
- //int i =1;
- while ( true ){
- createNextToken();
- if ( isComplete ) {
- // If the current expression is incomplete it must be completed
- // by the end, which is basically the equiavlent of a;
- return;
- } else {
- //i++;
- Expression result = fExpression.push( fCurrentToken , fCurrentTokenDelimiter );
- // If the result if a push then push the stack
- if ( result.isComplete() ) {
- popExpressionStack();
- } else if ( result != fExpression ) {
- pushExpressionStack(result);
- }
- }
- }
-}
-
-/**
- * Answer if the string results in a primitive.
- */
-public boolean isPrimitive() throws InitializationStringEvaluationException {
- try {
- return fExpression.isPrimitive();
- } catch (Exception e) {
- throw new InitializationStringEvaluationException(e);
- }
-}
-
-public Class getExpectedType() throws InitializationStringEvaluationException {
- try {
- return fExpression.getTypeClass();
- } catch (Exception e) {
- throw new InitializationStringEvaluationException(e);
- }
-}
-
-/* Pop the top expression off the stack
- */
-protected void popExpressionStack(){
-
- if ( fExpressionStack.size() > 0 ) {
- fExpression = (Expression) fExpressionStack.remove(fExpressionStack.size()-1);
- }
-}
-/* Push the expression onto the stack
- */
-protected void pushExpressionStack(Expression anExpression){
-
- // The current expression should go onto the stack
- fExpressionStack.add(fExpression);
- // The current expression is replaced with the argument
- fExpression = anExpression;
-
-}
-protected void createFirstExpression(){
- if ( fExpression == null ) {
- fExpression = new Statement(fClassLoader);
- };
-}
-public void setClassLoader(ClassLoader aClassLoader){
- fClassLoader = aClassLoader;
-}
-public String toString(){
- StringBuffer writer = new StringBuffer();
- writer.append("Parser. token=\""); //$NON-NLS-1$
- if ( fCurrentToken != null ) {
- writer.append(fCurrentToken);
- }
- writer.append("\", delim=\""); //$NON-NLS-1$
- writer.append(fCurrentTokenDelimiter);
- writer.append("\", initString=\""); //$NON-NLS-1$
- writer.append(fInitString);
- return writer.toString();
-}
-}
diff --git a/plugins/org.eclipse.jem.proxy/initParser/org/eclipse/jem/internal/proxy/initParser/Message.java b/plugins/org.eclipse.jem.proxy/initParser/org/eclipse/jem/internal/proxy/initParser/Message.java
deleted file mode 100644
index 35ccad9..0000000
--- a/plugins/org.eclipse.jem.proxy/initParser/org/eclipse/jem/internal/proxy/initParser/Message.java
+++ /dev/null
@@ -1,224 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2001, 2005 IBM Corporation and others.
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
- *
- * Contributors:
- * IBM Corporation - initial API and implementation
- *******************************************************************************/
-package org.eclipse.jem.internal.proxy.initParser;
-/*
-
-
- */
-
-
-import java.lang.reflect.Method;
-import java.util.ArrayList;
-import java.util.Iterator;
-
-import org.eclipse.jem.internal.proxy.common.AmbiguousMethodException;
-import org.eclipse.jem.internal.proxy.common.MethodHelper;
-
-public class Message extends Expression {
- protected boolean trailingPeriod = false;
- protected Method fMethod;
- public Expression receiver;
- public String message;
- public boolean argsClosed = false;
- public boolean insideArgsOpenedParen = false;
- public boolean insideArgsClosedParen = false;
- protected boolean isComplete = false;
- public ArrayList arguments = new ArrayList(2);
-
-public Message(Expression aReceiver , char[] token , ClassLoader aClassLoader){
- receiver = aReceiver;
- message = new String(token);
- fClassLoader = aClassLoader;
-}
-public boolean isComplete(){
- return isComplete;
-}
-
-/**
- * Send the message to the receiver
- */
-public Object evaluate() throws Exception {
- cacheMethod();
-
- // Get the array of arguments
- Object[] args = new Object[arguments.size()];
- Iterator itr = arguments.iterator();
- for (int i = 0; i < arguments.size() ; i++){
- Expression anExpression = (Expression)itr.next();
- args[i] = anExpression.evaluate();
- }
-
- Object receiverValue = receiver.evaluate(); // So if evaluation exception thrown, we don't wrapper again.
-
- try {
- return fMethod.invoke(receiverValue, args);
- } catch (Exception e) {
- throw new EvaluationException(e);
- }
-}
-
-/**
- * Cache the message
- */
-protected void cacheMethod() throws Exception {
- if (fMethod == null) {
- Class[] argTypes = new Class[arguments.size()];
- Iterator itr = arguments.iterator();
- for (int i=0; i<argTypes.length; i++)
- argTypes[i] = getEvaluationTypeClass((Expression) itr.next());
-
- try {
- fMethod = MethodHelper.findCompatibleMethod(getEvaluationTypeClass(receiver), message, argTypes);
- } catch (NoSuchMethodException e) {
- throw new EvaluationException(e);
- } catch (AmbiguousMethodException e) {
- throw new EvaluationException(e);
- }
- }
-}
-
-
-/**
- * getTypeClass method comment.
- */
-public Class getTypeClass() throws Exception {
- cacheMethod();
- return fMethod.getReturnType();
-}
-
-protected String getTypeClassName() {
- return ""; // If we got this far, we don't know what it is. //$NON-NLS-1$
-}
-/**
- * push method comment.
- */
-public Expression push(char[] token, char tokenDelimiter) {
-
- // If we are closed and we receive a . with no token then remember this
- if ( argsClosed && !trailingPeriod && tokenDelimiter == DelimiterPeriod && token.length == 0 ) {
- trailingPeriod = true;
- return this;
- }
- // If we have been closed with a . and we receive a . then we are a field
- if ( trailingPeriod && tokenDelimiter == DelimiterPeriod ) {
- return new Field(this,token,fClassLoader);
- }
- // If we have been closed with a . and we receive a ( we are a message
- if ( trailingPeriod && tokenDelimiter == DelimiterOpenParen ) {
- return new Message(this,token,fClassLoader);
- }
-
- // If we have been closed and we receive a , or a ) we are complete - this is a structural token intended for someone else,
- // probably a message argument lower down the stack
- if (argsClosed && (tokenDelimiter == DelimiterComma || tokenDelimiter == DelimiterCloseParen)){
- isComplete = true;
- return this;
- }
-
-
- // If the args are opened and a token was supplied then it must be an argument
- //if ( argsOpened && ( tokenDelimiter == DelimiterCloseParen || tokenDelimiter == DelimiterComma ||
- //tokenDelimiter == DelimiterSpace || tokenDelimiter == DelimiterQuote || tokenDelimiter == DelimiterPeriod)) {
- if (!argsClosed){
- if ( arguments.size() > 0 ){
- Expression openArgument = (Expression)arguments.get(arguments.size()-1);
- if ( !openArgument.isComplete() ) {
- openArgument.push(token,tokenDelimiter);
- // If the argument is complete and we received a ) then the message is complete
- if ( openArgument.isComplete() && tokenDelimiter == DelimiterCloseParen){
- argsClosed = true;
- }
- return this;
- }
- }
-
- // We must have a new argument - process accordingly
- Expression newArgument = null;
- if (!insideArgsOpenedParen && tokenDelimiter == DelimiterOpenParen){
- insideArgsOpenedParen = true;
- newArgument = new Statement(fClassLoader).push(token,tokenDelimiter);
- newArgument = new MessageArgument(newArgument);
- arguments.add(newArgument);
-
- }
- if ( newArgument == null && (token.length > 0 || tokenDelimiter == DelimiterQuote || tokenDelimiter == DelimiterSingleQuote || tokenDelimiter == DelimiterOpenParen )) {
- newArgument = new Statement(fClassLoader).push(token,tokenDelimiter);
- newArgument = new MessageArgument(newArgument);
- arguments.add(newArgument);
- }
- // If the token after the argument is a ) then the message is being closed
- if ( !insideArgsOpenedParen && tokenDelimiter == DelimiterCloseParen ) {
- argsClosed = true;
- return this;
- }
- if ( insideArgsOpenedParen && tokenDelimiter == DelimiterCloseParen ) {
- insideArgsClosedParen = true;
- return this;
- }
-
- // If the token after the argument is a , or a ' ' then the argument is being closed
- if ( tokenDelimiter == DelimiterComma || tokenDelimiter == DelimiterSpace ) {
- return this;
- }
-
- // Otherwise the new argument is stil processing. Return it
-// return newArgument;
- }
-
- // If we don't have a message yet, then consume this one
- if ( message.length() == 0 ) {
- message = new String(token);
- return this;
- }
-
- return this;
-}
-public String toString(){
-
- java.io.StringWriter writer = new java.io.StringWriter();
- writer.write("Msg Name=\""); //$NON-NLS-1$
- if ( message != null ) {
- writer.write(message);
- } else {
- writer.write("UNNAMED"); //$NON-NLS-1$
- }
- writer.write("\" Rcv=("); //$NON-NLS-1$
- if ( receiver != null ){
- writer.write(receiver.toString());
- } else {
- writer.write("NONE"); //$NON-NLS-1$
- }
- writer.write(')');
- if ( arguments != null ) {
- writer.write("Args("); //$NON-NLS-1$
- Iterator iter = arguments.iterator();
- int i=1;
- while(iter.hasNext()){
- writer.write(new Integer(i).toString());
- writer.write('(');
- writer.write(iter.next().toString());
- writer.write("),"); //$NON-NLS-1$
- }
- writer.write(')');
- }
-
- return writer.toString();
-
-}
-
-/**
- * Is the message result a primitive.
- */
-public boolean isPrimitive() throws Exception {
- cacheMethod();
- return fMethod.getReturnType().isPrimitive();
-}
-}
diff --git a/plugins/org.eclipse.jem.proxy/initParser/org/eclipse/jem/internal/proxy/initParser/MessageArgument.java b/plugins/org.eclipse.jem.proxy/initParser/org/eclipse/jem/internal/proxy/initParser/MessageArgument.java
deleted file mode 100644
index 66febdb..0000000
--- a/plugins/org.eclipse.jem.proxy/initParser/org/eclipse/jem/internal/proxy/initParser/MessageArgument.java
+++ /dev/null
@@ -1,123 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2001, 2005 IBM Corporation and others.
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
- *
- * Contributors:
- * IBM Corporation - initial API and implementation
- *******************************************************************************/
-package org.eclipse.jem.internal.proxy.initParser;
-/*
-
-
- */
-
-
-import java.io.StringWriter;
-import java.util.*;
-
-public class MessageArgument extends Expression {
-
- protected boolean isComplete = false;
- Expression fExpression;
- ArrayList fExpressionStack = new ArrayList();
-
-public MessageArgument(Expression anExpression){
- fExpression = anExpression;
-}
-
-public Object evaluate() throws Exception {
-
- return fExpression.evaluate();
-
-}
-
-public Class getTypeClass() throws Exception {
-
- return fExpression.getTypeClass();
-
-}
-
-protected String getTypeClassName() {
- return fExpression.getTypeClassName();
-}
-public boolean isComplete(){
- return isComplete || fExpression.isComplete();
-}
-
-public Expression push(char[] token , char delimiter){
-
- // Even if our expression is complete and we receive anything other than a , then the expression must process it as this may be a field or message
- // that is being sent to the expression to make up a complex argument
- Expression result = fExpression.push(token,delimiter);
- // If the result if a push then push the stack
- if ( result != fExpression ) {
- pushExpressionStack(result);
- } else if (result.isComplete()){
- // If our expression is complete, we are completed with a ) pop the stack so the previous expression can process us
- if (delimiter == DelimiterCloseParen ) {
- isComplete = true;
- popExpressionStack();
- } else if (delimiter == DelimiterComma || delimiter == DelimiterQuote ) {
- // If we receive a comma we pop the stack so the previous expression can process us but we don't flag us as complete
- popExpressionStack();
- // unless our expression is some array argument AND it is complete AND we have a close elipse }
- } else if ( delimiter == DelimiterCloseElipse ) {
- popExpressionStack();
- if ( fExpression instanceof ArrayArguments ) {
- isComplete = true;
- }
- }
- }
- return this;
-}
-
-/* Pop the top expression off the stack
- */
-protected void popExpressionStack(){
-
- if ( fExpressionStack.size() > 0 ) {
- Expression lastExpression = (Expression)fExpressionStack.get(fExpressionStack.size() - 1);
- if ( !lastExpression.isComplete() ) {
- fExpression = (Expression) fExpressionStack.remove(fExpressionStack.size() - 1);
- } else {
- isComplete = true;
- }
- } else {
- isComplete = true;
- }
-}
-
-/* Push the expression onto the stack
- */
-protected void pushExpressionStack(Expression anExpression){
-
- // The current expression should go onto the stack
- fExpressionStack.add(fExpression);
- // The current expression is replaced with the argument
- fExpression = anExpression;
-
-}
-
-public boolean isPrimitive(){
- return false;
-}
-public String toString(){
- StringWriter writer = new StringWriter();
- writer.write("Arg("); //$NON-NLS-1$
- if ( fExpression != null ) {
- writer.write(fExpression.toString());
- }
- writer.write(")"); //$NON-NLS-1$
- return writer.toString();
-}
-public void contributeArgumentNumber(List argumentNumberList){
-
- if ( fExpression instanceof ArrayArguments ) {
- ((ArrayArguments)fExpression).contributeArgumentNumber(argumentNumberList);
- }
-
-}
-}
diff --git a/plugins/org.eclipse.jem.proxy/initParser/org/eclipse/jem/internal/proxy/initParser/NullLiteral.java b/plugins/org.eclipse.jem.proxy/initParser/org/eclipse/jem/internal/proxy/initParser/NullLiteral.java
deleted file mode 100644
index ad3d0ef..0000000
--- a/plugins/org.eclipse.jem.proxy/initParser/org/eclipse/jem/internal/proxy/initParser/NullLiteral.java
+++ /dev/null
@@ -1,59 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2001, 2005 IBM Corporation and others.
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
- *
- * Contributors:
- * IBM Corporation - initial API and implementation
- *******************************************************************************/
-package org.eclipse.jem.internal.proxy.initParser;
-
-import org.eclipse.jem.internal.proxy.common.MethodHelper;
-
-/*
-
-
- */
-
-
-public class NullLiteral extends Expression {
-public NullLiteral(){
-}
-/**
- * evaluate method comment.
- */
-public Object evaluate() {
- return null;
-}
-/**
- * evaluate method comment.
- */
-public Class getTypeClass(){
- return MethodHelper.NULL_TYPE;
-}
-
-protected String getTypeClassName() {
- return MethodHelper.NULL_TYPE.getName();
-}
-/**
- * true or false cannot consume any kind of expression so we must return null
- */
-public Expression push(char[] token , char delimiter){
- return null;
-}
-
-public boolean isComplete(){
- return true;
-}
-
-/**
- * Null is not primitive
- */
-public boolean isPrimitive() {
- return false;
-}
-}
-
-
diff --git a/plugins/org.eclipse.jem.proxy/initParser/org/eclipse/jem/internal/proxy/initParser/NumberLiteral.java b/plugins/org.eclipse.jem.proxy/initParser/org/eclipse/jem/internal/proxy/initParser/NumberLiteral.java
deleted file mode 100644
index 27fd999..0000000
--- a/plugins/org.eclipse.jem.proxy/initParser/org/eclipse/jem/internal/proxy/initParser/NumberLiteral.java
+++ /dev/null
@@ -1,171 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2001, 2005 IBM Corporation and others.
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
- *
- * Contributors:
- * IBM Corporation - initial API and implementation
- *******************************************************************************/
-package org.eclipse.jem.internal.proxy.initParser;
-/*
-
-
- */
-
-
-public class NumberLiteral extends Expression {
- protected String numberString = ""; //$NON-NLS-1$
- protected boolean isComplete = false;
- protected Class numberClass = Integer.TYPE;
- protected int exponentFlag = NO_EXPONENT;
-
- protected static final int
- NO_EXPONENT = 0,
- HAS_EXPONENT = 1,
- HAS_EXPONENT_MINUS = 2;
-/**
- * evaluate method comment.
- */
-public NumberLiteral(){
-}
-/**
- * evaluate method comment.
- */
-public Object evaluate() throws Exception {
- try {
- // Return a number of the correct instance
- if (numberClass == Float.TYPE){
- return new Float(Float.parseFloat(numberString));
- } else if (numberClass == Long.TYPE ) {
- return Long.decode(numberString);
- } else if (numberClass == Double.TYPE ){
- return new Double(Double.parseDouble(numberString));
- } else
- return Integer.decode(numberString);
- } catch (Exception e) {
- throw new EvaluationException(e);
- }
-
-}
-public boolean isComplete(){
- return isComplete;
-}
-
-/**
- * Return the type of number that we are.
- */
-public Class getTypeClass(){
- return numberClass;
-}
-
-protected String getTypeClassName() {
- return numberClass != null ? numberClass.getName() : ""; //$NON-NLS-1$
-}
-/**
- * If the delimiter is an operation such as a +,-,/,* then we can consume it
- * If the delimiter is period and we don't already have one then it is the decimal portion of us
- */
-public Expression push(char[] token , char delimiter){
-
- // Close brackets complete use
- if(delimiter == DelimiterCloseParen || delimiter == DelimiterComma || delimiter == DelimiterCloseElipse){
- isComplete = true;
- }
-
- if (delimiter == OperMinus && numberString.length() == 0)
- numberString+=OperMinus; // No digits yet, but we have a minus sign, so add to accumulating number.
-
- numberString += processNumberToken(token);
-
- // If we have part of a number and are asked to do some arithmetic throw an
- // error that this has not been coded yet, except minus could be part of an exponent.
- if(numberString.length() > 0 && token.length > 1) {
- switch(delimiter){
- case OperMinus:
- if (exponentFlag == HAS_EXPONENT) {
- exponentFlag = HAS_EXPONENT_MINUS;
- numberString += OperMinus;
- break;
- }
- case OperPlus:
- case OperMultiply:
- case OperDivide:
- {
- throw new RuntimeException("Can't do arithmetic yet"); //$NON-NLS-1$
- }
- }
- }
-
- if (delimiter == DelimiterPeriod){
- numberClass = Double.TYPE; // A decimal makes it double.
- numberString += DelimiterPeriod;
- }
-
- if(delimiter == BitOR || delimiter == BitAND){
- Expression result = new PrimitiveOperation(this,delimiter);
- isComplete = true;
- return result;
- }
-
- return this;
-
-}
-protected String processNumberToken(char[] token){
-
- for (int i=0; i<token.length; i++)
- if (token[i] == 'E' || token[i] == 'e') {
- numberClass = Double.TYPE; // Definitely a floating because of this.
- exponentFlag = HAS_EXPONENT;
- break;
- }
-
- // The token could be a number, e.g. 10 or 5 or could be qualified with a primitive
- // suffix, e.g. 10l or 5f
- char[] numberToken = token;
- if ( token.length > 0 ) {
- switch(token[token.length - 1]){
- case 'F':
- case 'f':
- numberClass = Float.TYPE;
- numberToken = new char[token.length - 1];
- System.arraycopy(token,0,numberToken,0,numberToken.length);
- isComplete = true;
- break;
- case 'L':
- case 'l':
- numberClass = Long.TYPE;
- numberToken = new char[token.length - 1];
- System.arraycopy(token,0,numberToken,0,numberToken.length);
- isComplete = true;
- break;
- case 'D':
- case 'd':
- numberClass = Double.TYPE;
- numberToken = new char[token.length - 1];
- System.arraycopy(token,0,numberToken,0,numberToken.length);
- isComplete = true;
- break;
- }
- }
-
- return new String(numberToken);
-}
-public String toString(){
-
- java.io.StringWriter writer = new java.io.StringWriter();
- writer.write("Number \""); //$NON-NLS-1$
- writer.write(numberString);
- writer.write("\""); //$NON-NLS-1$
- return writer.toString();
-
-}
-
-/**
- * Number literals are primitive
- */
-public boolean isPrimitive() {
- return true;
-}
-}
diff --git a/plugins/org.eclipse.jem.proxy/initParser/org/eclipse/jem/internal/proxy/initParser/PrimitiveOperation.java b/plugins/org.eclipse.jem.proxy/initParser/org/eclipse/jem/internal/proxy/initParser/PrimitiveOperation.java
deleted file mode 100644
index 7f51479..0000000
--- a/plugins/org.eclipse.jem.proxy/initParser/org/eclipse/jem/internal/proxy/initParser/PrimitiveOperation.java
+++ /dev/null
@@ -1,113 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2003, 2005 IBM Corporation and others.
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
- *
- * Contributors:
- * IBM Corporation - initial API and implementation
- *******************************************************************************/
-/*
- * This is for primitive expressions that are optimized out the compiler such as bit or, bit and, etc..
- */
-package org.eclipse.jem.internal.proxy.initParser;
-
-import java.text.MessageFormat;
-
-/*
-
-
- */
-
-public class PrimitiveOperation extends Expression {
-
- protected int operation; // This can be BitOR or BitAND
- protected Expression receiver; // The left hand side of the expression
- protected boolean isComplete = false;
-
- public PrimitiveOperation(Expression aReceiver, int anOperation){
- receiver = aReceiver;
- operation = anOperation;
- }
-
- public Object evaluate() throws Exception {
- Object leftHandSide = receiver.evaluate();
- Object rightHandSide = currentExpression.evaluate();
- if (leftHandSide instanceof Integer && rightHandSide instanceof Integer) {
- if(operation == BitOR) {
- return new Integer(((Integer)leftHandSide).intValue() | ((Integer)rightHandSide).intValue());
- } else if(operation == BitAND) {
- return new Integer(((Integer)leftHandSide).intValue() & ((Integer)rightHandSide).intValue());
- }
- }
- throw new RuntimeException(MessageFormat.format(ProxyInitParserMessages.getString("PrimitiveOperation.Evaluate.InvalidOperator_EXC_"), new Object[]{getOperDescription(), leftHandSide, rightHandSide})); //$NON-NLS-1$
- }
- protected String getOperDescription(){
- if(operation == BitOR) return "|"; //$NON-NLS-1$
- if (operation == BitAND) return "&"; //$NON-NLS-1$
- return "???"; //$NON-NLS-1$
- }
-
- public boolean isComplete() {
- return isComplete;
- }
-
- public Class getTypeClass() throws Exception {
- return Integer.TYPE;
- }
-
- protected String getTypeClassName() {
- return Integer.TYPE.getName();
- }
-
- public Expression push(char[] token, char tokenDelimiter) {
-
- // Create a new statement if the argument is null ( we are always created with a receiver )
- if(currentExpression == null && token.length > 0){
- currentExpression = new Statement(fClassLoader).push(token,tokenDelimiter);
- pushExpressionStack(currentExpression);
- return this;
- }
-
- // Ignore whitespace
- if(token.length == 0 && tokenDelimiter == ' ') return this;
-
- // If we have an argument we just keep pushing the expression onto this
- if(currentExpression != null){
- Expression result = currentExpression.push(token,tokenDelimiter);
- if(result != currentExpression){
- pushExpressionStack(result);
- }
- }
-
- if(currentExpression != null && currentExpression.isComplete()){
- if(tokenDelimiter == DelimiterComma){
- isComplete = true;
- return this;
- } else if (tokenDelimiter == DelimiterCloseParen){
- if(receiver.parenthesisLevel > 0){
- receiver.parenthesisLevel--;
- } else {
- isComplete = true;
- return this;
- }
- }
- }
-
- return this;
- }
-
- public boolean isPrimitive() throws Exception {
- return true;
- }
-
- public String toString(){
- StringBuffer buffer = new StringBuffer();
- if (receiver != null) buffer.append(receiver.toString());
- buffer.append(getOperDescription());
- if (currentExpression != null) buffer.append(currentExpression.toString());
- return buffer.toString();
- }
-
-}
diff --git a/plugins/org.eclipse.jem.proxy/initParser/org/eclipse/jem/internal/proxy/initParser/ProxyInitParserMessages.java b/plugins/org.eclipse.jem.proxy/initParser/org/eclipse/jem/internal/proxy/initParser/ProxyInitParserMessages.java
deleted file mode 100644
index 8d9620e..0000000
--- a/plugins/org.eclipse.jem.proxy/initParser/org/eclipse/jem/internal/proxy/initParser/ProxyInitParserMessages.java
+++ /dev/null
@@ -1,46 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2001, 2005 IBM Corporation and others.
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
- *
- * Contributors:
- * IBM Corporation - initial API and implementation
- *******************************************************************************/
-package org.eclipse.jem.internal.proxy.initParser;
-/*
-
-
- */
-
-
-import java.util.MissingResourceException;
-import java.util.ResourceBundle;
-/**
- * General Proxy NLS Constants
- * Creation date: (4/13/00 10:46:58 AM)
- * @author: Administrator
- */
-public class ProxyInitParserMessages {
- // Resource Bundle to use for basic Proxy NLS resources.
- static private final ResourceBundle RESOURCE_BUNDLE = ResourceBundle.getBundle("org.eclipse.jem.internal.proxy.initParser.messages"); //$NON-NLS-1$
-
- // Keys for messages/strings within the resource bundle.
- static public final String
- UNEXPECTED_TOKEN = "UnexpectedToken_EXC_", //$NON-NLS-1$
- STATEMENT_UNEXPECTED_EXECUTION = "Statement.UnexpectedExecution_EXC_", //$NON-NLS-1$
- STATEMENT_UNEXPECTED_EVALUATION = "Statement.UnexpectedEvaluation_EXC_" ; //$NON-NLS-1$
-
- private ProxyInitParserMessages() {
- }
-
- public static String getString(String key) {
- try {
- return RESOURCE_BUNDLE.getString(key);
- } catch (MissingResourceException e) {
- return '!' + key + '!';
- }
- }
-
-}
diff --git a/plugins/org.eclipse.jem.proxy/initParser/org/eclipse/jem/internal/proxy/initParser/Statement.java b/plugins/org.eclipse.jem.proxy/initParser/org/eclipse/jem/internal/proxy/initParser/Statement.java
deleted file mode 100644
index 74bad26..0000000
--- a/plugins/org.eclipse.jem.proxy/initParser/org/eclipse/jem/internal/proxy/initParser/Statement.java
+++ /dev/null
@@ -1,201 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2001, 2005 IBM Corporation and others.
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
- *
- * Contributors:
- * IBM Corporation - initial API and implementation
- *******************************************************************************/
-package org.eclipse.jem.internal.proxy.initParser;
-/*
-
-
- */
-
-
-
-public class Statement extends Expression {
- public boolean isStringObject = false;
- public boolean isCast = false;
- protected boolean messageOrFieldStarted;
-
-/**
- * Statement constructor comment.
- */
-public Statement(ClassLoader aClassLoader) {
- super();
- fClassLoader = aClassLoader;
-}
-
-public boolean isComplete(){
- return currentExpression != null && currentExpression.isComplete();
-}
-
-/** Defer this to the expression
- */
-public Object evaluate() throws Exception {
- if ( currentExpression != null ) {
- return currentExpression.evaluate();
- } else {
- throw new RuntimeException(ProxyInitParserMessages.getString(ProxyInitParserMessages.STATEMENT_UNEXPECTED_EXECUTION)); // This is not an evaluation error, it shouldn't of occured, so it is a parser error.
- }
-}
-/**
- */
-public Class getTypeClass() throws Exception {
- return currentExpression.getTypeClass();
- //throw new RuntimeException(ProxyBaseVMNLS.RESBUNDLE.getString(ProxyBaseVMNLS.STATEMENT_UNEXPECTED_EVALUATION));
-}
-
-protected String getTypeClassName() {
- return currentExpression.getTypeClassName();
-}
-/** There are several types of token that can begin a statement.
- * new , ' ' - Create a constructor
- * 1-10, true, false, etc... - Create a literal
- * Foo, '.' - Create a Type
- */
-public Expression push(char[] token , char delimiter){
-
- // If messageOrFieldStart is true then our expression is complete and either a message or field is being created
- // See which it is and create the correct expression
- if (messageOrFieldStarted){
- messageOrFieldStarted = false;
- if ( delimiter == DelimiterOpenParen){
- Message message = new Message(currentExpression,token,fClassLoader);
- currentExpression = message;
- return message;
- } else {
- Field field = new Field(currentExpression,token,fClassLoader);
- currentExpression = field;
- return field;
- }
- }
-
- // Look for "new " for a constructor"
- if ( delimiter == DelimiterSpace && compare( token , ConstantNew ) ) {
- // If we thought we were a possible cast and we now aren't then we must be a block expression
- if ( isCast ) {
- currentExpression = new Block(new Constructor(fClassLoader));
- } else {
- currentExpression = new Constructor(fClassLoader);
- }
- isCast = false; // Can't be a cast now
- return currentExpression;
- }
-
- // Look for "null"
- if ( compare( token , ConstantNull ) ) {
- currentExpression = new NullLiteral();
- isCast = false; // Can't be a cast now
- // Null cannot process anything so we return the statement
- return this;
- }
-
- // Look for a number
- if ( isNumber( token ) || delimiter == OperMinus ) {
- currentExpression = new NumberLiteral();
- currentExpression = currentExpression.push(token,delimiter);
- isCast = false; // Can't be a cast now
- return currentExpression;
- }
-
- if ( compare( token , ConstantTrue ) ) {
- currentExpression = new BooleanLiteral(true);
- // true cannot process anything so we return the statement
- isCast = false; // Can't be a cast now
- return currentExpression;
-// return this;
- }
-
- if ( compare( token , ConstantFalse ) ) {
- // false cannot process anything so we return the statement
- currentExpression = new BooleanLiteral(false);
- isCast = false; // Can't be a cast now
- return this;
- }
-
- if ( delimiter == DelimiterQuote ) {
- currentExpression = new StringLiteral();
- isCast = false; // Can't be a cast now
- return currentExpression;
- }
-
- if ( delimiter == DelimiterSingleQuote ) {
- currentExpression = new CharLiteral();
- isCast = false; // Can't be a cast now
- return currentExpression;
- }
-
- if (delimiter == DelimiterPeriod && token.length == 0 && currentExpression != null){
- if (currentExpression instanceof StringLiteral){
- //String s = "\"" + (String)(currentExpression.evaluate()) + "\"" ;
- //return new Constructor(s);
- isStringObject = true;
- return this;
- }
- }
-
- if (isStringObject && (token.length > 0) && (delimiter == DelimiterOpenParen)){
- return new Message(currentExpression, token,fClassLoader);
- }
-
- //handle type casting
- if ((token.length == 0) && (delimiter == DelimiterOpenParen)){
- // If we are a already a cast then we must be a block.
- if ( isCast ) {
- currentExpression = new Block(fClassLoader);
- } else {
- isCast = true; // Possibly a cast
- }
- return this;
- }
- if (isCast && (delimiter == DelimiterCloseParen || token.length != 0)){
- Static aStatic = new Static(fClassLoader);
- Cast aCast = new Cast(aStatic,fClassLoader);
- currentExpression = aCast.push(token,delimiter);
- return currentExpression;
- }
-
- if ( token.length != 0 ) {
- currentExpression = new Static(fClassLoader).push(token,delimiter);
- return currentExpression;
- }
-
- // If we get a { then we are part of an array argument
- if (delimiter == DelimiterOpenElipse){
- currentExpression = new ArrayArguments();
- return currentExpression;
- }
-
- // If our expression is closed and we receive a . we are either a message or a field. We won't know this until
- // the next token we receive, which will be either be delimited by a ( in which case it is a message, else it is a field
- if (currentExpression != null && currentExpression.isComplete() && delimiter == DelimiterPeriod){
- messageOrFieldStarted = true;
- }
-
- return this;
-}
-
-public String toString(){
- StringBuffer buffer = new StringBuffer();
- buffer.append("Statement{"); //$NON-NLS-1$
- if ( currentExpression != null ) {
- buffer.append(currentExpression.toString());
- }
- buffer.append('}');
- return buffer.toString();
-}
-/**
- * Is this statement a primitive.
- */
-public boolean isPrimitive() throws Exception {
- if ( currentExpression != null ) {
- return currentExpression.isPrimitive();
- } else {
- throw new RuntimeException(ProxyInitParserMessages.getString(ProxyInitParserMessages.STATEMENT_UNEXPECTED_EXECUTION));
- }
-}
-}
diff --git a/plugins/org.eclipse.jem.proxy/initParser/org/eclipse/jem/internal/proxy/initParser/Static.java b/plugins/org.eclipse.jem.proxy/initParser/org/eclipse/jem/internal/proxy/initParser/Static.java
deleted file mode 100644
index 565b788..0000000
--- a/plugins/org.eclipse.jem.proxy/initParser/org/eclipse/jem/internal/proxy/initParser/Static.java
+++ /dev/null
@@ -1,305 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2001, 2005 IBM Corporation and others.
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
- *
- * Contributors:
- * IBM Corporation - initial API and implementation
- *******************************************************************************/
-package org.eclipse.jem.internal.proxy.initParser;
-/*
-
-
- */
-
-
-import java.io.*;
-import java.lang.reflect.Array;
-import java.util.*;
-
-public class Static extends Expression {
- protected static final HashMap sPrimitiveTypes;
-
- static {
- sPrimitiveTypes = new HashMap(10);
- sPrimitiveTypes.put("byte", Byte.TYPE); //$NON-NLS-1$
- sPrimitiveTypes.put("char", Character.TYPE); //$NON-NLS-1$
- sPrimitiveTypes.put("short", Short.TYPE); //$NON-NLS-1$
- sPrimitiveTypes.put("int", Integer.TYPE); //$NON-NLS-1$
- sPrimitiveTypes.put("long", Long.TYPE); //$NON-NLS-1$
- sPrimitiveTypes.put("float", Float.TYPE); //$NON-NLS-1$
- sPrimitiveTypes.put("double", Double.TYPE); //$NON-NLS-1$
- }
-
- protected ArrayList arrayDimensions;
- protected List fArrayArguments;
- protected StringWriter typeWriter = new StringWriter();
- protected boolean completedWithPeriod = false;
- protected char[] completionToken;
- public Class type;
- protected boolean isComplete;
-
- public boolean isProcessingArrayDimension;
-/**
- * Create an unknown expression
- */
-public Static(ClassLoader aClassLoader){
- fClassLoader = aClassLoader;
-}
-public Static(char[] aToken,char delimiter,ClassLoader aClassLoader){
-
- fClassLoader = aClassLoader;
- try {
- typeWriter.write(aToken);
- } catch ( IOException exc ) {};
- checkForValidType();
- if ( type == null && delimiter == DelimiterPeriod ){
- typeWriter.write(DelimiterPeriod);
- }
-
-}
-public Static(char[] aToken,char delimiter,ClassLoader aClassLoader,boolean isArray){
- this(aToken,delimiter,aClassLoader);
- isProcessingArrayDimension = true;
- arrayDimensions = new ArrayList(1);
- arrayDimensions.add(new Statement(aClassLoader));
-}
-
-public boolean isComplete(){
- return isComplete;
-}
-public boolean isArray(){
- return arrayDimensions != null;
-}
-/**
- * See whether or not we have a valid type
- * This uses the class loader given to us if one specified. The reason for this
- * is that Eclipse uses a special plugin class loader and when we are running
- * in a VM inside eclipse ( e.g. for IDEVM proxy stuff ) we must have
- * reference to the plugin that is using us otherwise we can't load its classes
- */
-protected void checkForValidType(){
-
- type = (Class) sPrimitiveTypes.get(typeWriter.toString());
- if (type == null)
- try {
- if ( fClassLoader == null ) {
- type = Class.forName(typeWriter.toString());
- } else {
- type = fClassLoader.loadClass(typeWriter.toString());
- }
- } catch ( ClassNotFoundException exc ) {
- try {
- type = Class.forName("java.lang." + typeWriter.toString()); //$NON-NLS-1$
- StringWriter writer = new StringWriter();
- writer.write(type.getName());
- typeWriter = writer;
- } catch ( ClassNotFoundException exc1 ) {}
- } catch ( NoClassDefFoundError exc ) {
- // A mismatch in some way. Found a class, probably different case. One possibility
- // is found a class, but this was really a package. So class and package with same name
- // but different case caused this to occur. [46376].
- }
-
-}
-/**
- * If we have any static methods return the result of evaluating them against the type
- */
-public Object evaluate() {
-
- // If we are an array but haven't created it do so
- if ( isArray() ) {
- if ( array == null ) {
- evaluateArray();
- }
- return array;
- } else {
- if ( type != null ) {
- return type;
- } else {
- // If we have no type then we are some kind incomplete expression that cannot be evaluted
- throw new RuntimeException();
- }
- }
-}
-/**
- * The type of us is either simply the class, or if we are an array then we must create the java.lang.reflect.Array
- * using the reflective APIs
- */
-protected Object array;
-public Class getTypeClass() {
-
- if ( isArray() ) {
- if ( array == null ) {
- // Do not evaluate the array and return its class. Instead just work out the class by our type
- // and number of dimensions
- Object result = Array.newInstance(type,getNumberOfDimensions());
- return result.getClass();
- } else {
- return array.getClass();
- }
- } else {
- return type;
- }
-}
-
-protected String getTypeClassName() {
- return typeWriter.toString();
-}
-public Class getPrimitiveTypeClass(){
- return type;
-}
-protected int[] getNumberOfDimensions(){
- List dimensions = new ArrayList(1);
- dimensions.add(new Integer(fArrayArguments.size()));
- ((MessageArgument)fArrayArguments.get(0)).contributeArgumentNumber(dimensions);
- // The total number of arguments is a set of Integer objects in the dimensions list
- // convert this to an int[]
- int[] intDimensions = new int[dimensions.size()];
- for (int i = 0; i < dimensions.size(); i++) {
- intDimensions[i] = ((Integer)dimensions.get(i)).intValue();
- }
- return intDimensions;
-}
-/**
- * Evaluate the array
- */
-protected void evaluateArray(){
- if ( fArrayArguments != null ) {
- // If the array isn't declared with a size but this is supplied with argument these will be in the fArrayArguments
- // new int[] { 2 ,3 } will have the constructor arguments supplied as two message arguments with
- if ( array == null ) {
- // The size of the array arguments is our array size, however for a multi arg array we need
- // to find the size of any nested arrays within arguments themselves, e.g.
- // new int[][] { {2,3} , {3,4} } then we have two array arguments, each of which is a MessageArgument
- // whose statement is an ArrayArguments that has two arguments, etc...
- // To find the number of arguments we create a list that we add our number of arguments to, and then
- // pass this all the way up the arguments chain using contributeArgumentNumber(List) so that each element
- // can add to the list the number of arguments ( if any ) that they have.
- array = Array.newInstance(type,getNumberOfDimensions());
- // Set the elements in the array to be the result of evaluating the constructor arguments
- for (int i = 0; i < fArrayArguments.size(); i++) {
- Expression expression = (Expression)fArrayArguments.get(i);
- try {
- Object element = expression.evaluate();
- Array.set(array,i,element);
- } catch ( Exception exc ) {
- // Any evaluation exceptions should be thrown back
- throw new RuntimeException();
- }
- }
- }
- } else if ( arrayDimensions != null ) {
- // To get the class of a reflective array we must actually first create it and then ask it for its class
- // The array Dimensions are present if the array was explicitly declared with a size, e.g. new int[2][3]
- // will have to arrayDimensions that represent the expressions 2 and 3 ( as NumberLiteral instances )
- if ( array == null ) {
- // Evaluate all of the arrayDimensions. These should be integers
- int[] dimensionSizes = new int[arrayDimensions.size()];
- for (int i = 0; i < dimensionSizes.length; i++) {
- try {
- Integer dimensionSize = (Integer) ((Expression)arrayDimensions.get(i)).evaluate();
- dimensionSizes[i] = dimensionSize.intValue();
- } catch ( Exception exc ) {
- throw new RuntimeException();
- }
- }
- // For a multi arg array we need to create using the static method on array that takes an int[] that represents
- // the number of dimensions, e.g. for new String[2][3] we do Array.newInstance(String.class,new int[] { 2 , 3 };
- array = Array.newInstance(type,dimensionSizes);
- }
- }
-}
-/**
- * If the token is a period then it could either be part of the type or else a static method call
- */
-public Expression push(char[] token , char delimiter ) {
-
- // If we don't yet have a valid type then see if we now do
- if (type == null){
- try {
- typeWriter.write(token);
- } catch ( IOException exc ) {};
- checkForValidType();
- // If we got a valid type and a period then remember it
- if ( delimiter == DelimiterPeriod ) {
- if (type != null) {
- completedWithPeriod = true;
- return this;
- }
- }
- }
-
- if ( arrayDimensions != null && isProcessingArrayDimension ) {
- Expression lastArrayDimension = (Expression)arrayDimensions.get(arrayDimensions.size()-1);
- lastArrayDimension.push(token,delimiter);
- if ( delimiter == DelimiterCloseSquareBrace && isProcessingArrayDimension ) {
- isProcessingArrayDimension = false;
- }
- return this;
- }
-
- if ( delimiter == DelimiterOpenSquareBrace && !isProcessingArrayDimension ) {
- if ( arrayDimensions == null ) arrayDimensions = new ArrayList(1);
- Statement statement = new Statement(fClassLoader);
- arrayDimensions.add(statement);
- isProcessingArrayDimension = true;
- return this;
- }
-
- // If we have a type and the delimiter is a ( then it must be a message beginning
- if ( type != null ) {
- if (delimiter == DelimiterOpenParen) {
- isComplete = true;
- return new Message( this , token , fClassLoader );
- } else if (completedWithPeriod){
- isComplete = true;
- Field field = new Field(this,token,fClassLoader);
- // If our token is a ), ' ' or , then the field is completed,
- // otherwise leave it open so it will process the remaining tokens
-// if (delimiter == DelimiterCloseParen || delimiter == DelimiterSpace || delimiter == DelimiterComma) {
- if (delimiter == DelimiterCloseParen || delimiter == DelimiterComma) {
- field.isComplete = true;
- }
- return field;
- }
- }
-
- // We are still looking for a type so append a .
- if ( type == null ) {
- typeWriter.write('.');
- }
- return this;
-}
-public String toString(){
-
- StringWriter writer = new StringWriter();
- writer.write("Static "); //$NON-NLS-1$
- if ( type == null ) {
- writer.write("(Incomplete) {"); //$NON-NLS-1$
- } else {
- writer.write("(Complete) {"); //$NON-NLS-1$
- }
- writer.write(typeWriter.toString());
- writer.write("}"); //$NON-NLS-1$
- if ( arrayDimensions != null ) {
- writer.write(" array dimensions="); //$NON-NLS-1$
- writer.write(new Integer(arrayDimensions.size()).toString());
- }
- if ( fArrayArguments != null ) {
- writer.write(" array dimensions="); //$NON-NLS-1$
- writer.write(new Integer(fArrayArguments.size()).toString());
- }
- return writer.toString();
-
-}
-
-public boolean isPrimitive() {
- return getTypeClass().isPrimitive();
-}
-public void setArrayArguments(List arguments) {
- fArrayArguments = arguments;
-}
-}
diff --git a/plugins/org.eclipse.jem.proxy/initParser/org/eclipse/jem/internal/proxy/initParser/StringLiteral.java b/plugins/org.eclipse.jem.proxy/initParser/org/eclipse/jem/internal/proxy/initParser/StringLiteral.java
deleted file mode 100644
index 14c73df..0000000
--- a/plugins/org.eclipse.jem.proxy/initParser/org/eclipse/jem/internal/proxy/initParser/StringLiteral.java
+++ /dev/null
@@ -1,142 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2001, 2005 IBM Corporation and others.
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
- *
- * Contributors:
- * IBM Corporation - initial API and implementation
- *******************************************************************************/
-package org.eclipse.jem.internal.proxy.initParser;
-/*
-
-
- */
-
-
-
-public class StringLiteral extends Expression {
- protected boolean isComplete;
- public String value;
- public StringBuffer valueBuffer = new StringBuffer();
- protected boolean isEscaped = false;
-
-/**
- * constructor
- */
-public StringLiteral(){
-}
-
-/**
- * evaluate method comment.
- */
-public Object evaluate() {
- return valueBuffer.toString();
-}
-
-public boolean isComplete(){
- return isComplete;
-}
-/**
- * We must evaluate ourself and return the type of the result
- */
-
-public Class getTypeClass() {
- return String.class;
-}
-
-protected String getTypeClassName() {
- return String.class.getName();
-}
-
-/**
- *This string might be broken into a few tokens
- *so we need a StringBuffer.
- *
- */
-public Expression push(char[] token , char delimiter){
- int appendTokenStart = 0;
- int appendTokenLength = token.length;
- if (isEscaped) {
- isEscaped = false;
- if (token.length != 0) {
- char c = token[0];
- switch (c) {
- case 'b':
- valueBuffer.append('\b');
- appendTokenStart = 1;
- appendTokenLength--;
- break;
- case 't':
- valueBuffer.append('\t');
- appendTokenStart = 1;
- appendTokenLength--;
- break;
- case 'n':
- valueBuffer.append('\n');
- appendTokenStart = 1;
- appendTokenLength--;
- break;
- case 'r':
- valueBuffer.append('\r');
- appendTokenStart = 1;
- appendTokenLength--;
- break;
- case 'u':
- // Unicode, next four gather for text;
- if (appendTokenLength>=5) {
- valueBuffer.append((char) Integer.parseInt(new String(token, 1, 4), 16));
- appendTokenStart=5;
- appendTokenLength-=5;
- }
- break;
- }
- // If we didn't append anything, then not a true escape, so put the escape on.
- if (appendTokenStart==0)
- valueBuffer.append(DelimiterEscape);
- } else {
- if (delimiter == DelimiterQuote || delimiter == DelimiterEscape || delimiter == DelimiterSingleQuote)
- valueBuffer.append(delimiter); // It was a true escape.
- else {
- valueBuffer.append(DelimiterEscape); // If wasn't a true escape
- valueBuffer.append(delimiter);
- }
- return this;
- }
- }
-
- if (appendTokenLength > 0)
- valueBuffer.append(token, appendTokenStart, appendTokenLength);
-
- if (delimiter == DelimiterQuote){
- isComplete =true;
- return this;
- }
-
- // If the delimiter is an escape character remember it so we can escape
- // the next token, otherwise treat it as a literal
- if (delimiter == DelimiterEscape ){
- isEscaped = true;
- } else {
- valueBuffer.append(delimiter);
- }
- return this;
-}
-
-/**
- * Strings are not primitives.
- */
-public boolean isPrimitive() {
- return false;
-}
-public String toString(){
- StringBuffer buffer = new StringBuffer();
- buffer.append("String(\""); //$NON-NLS-1$
- if ( valueBuffer != null ) {
- buffer.append(valueBuffer.toString());
- }
- buffer.append("\""); //$NON-NLS-1$
- return buffer.toString();
-}
-}
diff --git a/plugins/org.eclipse.jem.proxy/initParser/org/eclipse/jem/internal/proxy/initParser/messages.properties b/plugins/org.eclipse.jem.proxy/initParser/org/eclipse/jem/internal/proxy/initParser/messages.properties
deleted file mode 100644
index caa6923..0000000
--- a/plugins/org.eclipse.jem.proxy/initParser/org/eclipse/jem/internal/proxy/initParser/messages.properties
+++ /dev/null
@@ -1,24 +0,0 @@
-###############################################################################
-# Copyright (c) 2003, 2005 IBM Corporation and others.
-# All rights reserved. This program and the accompanying materials
-# are made available under the terms of the Eclipse Public License v1.0
-# which accompanies this distribution, and is available at
-# http://www.eclipse.org/legal/epl-v10.html
-#
-# Contributors:
-# IBM Corporation - initial API and implementation
-###############################################################################
-#
-# $Source: /cvsroot/webtools/jeetools.move/webtools.javaee.git/plugins/org.eclipse.jem.proxy/initParser/org/eclipse/jem/internal/proxy/initParser/messages.properties,v $
-# $Revision: 1.6 $ $Date: 2005/08/24 20:39:07 $
-#
-
-
-#
-# Properties for the Proxy Base VM Support
-#
-UnexpectedToken_EXC_ = IWAV0127E Unexpected Token "{0}".
-Statement.UnexpectedExecution_EXC_ = IWAV0128E Statement was executed unexpectedly.
-Statement.UnexpectedEvaluation_EXC_ = IWAV0129E Statements should not be evaluated.
-CharTooComplicated_EXC_ = IWAV0130E Input text not a char that can be evaluated. Too complicated. \"{0}"
-PrimitiveOperation.Evaluate.InvalidOperator_EXC_=Invalid operator {0} between {1} and {2}
diff --git a/plugins/org.eclipse.jem.proxy/initParser/org/eclipse/jem/internal/proxy/initParser/tree/AbstractEnum.java b/plugins/org.eclipse.jem.proxy/initParser/org/eclipse/jem/internal/proxy/initParser/tree/AbstractEnum.java
deleted file mode 100644
index 451e751..0000000
--- a/plugins/org.eclipse.jem.proxy/initParser/org/eclipse/jem/internal/proxy/initParser/tree/AbstractEnum.java
+++ /dev/null
@@ -1,73 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2005 IBM Corporation and others.
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
- *
- * Contributors:
- * IBM Corporation - initial API and implementation
- *******************************************************************************/
-/*
-
-
- */
-package org.eclipse.jem.internal.proxy.initParser.tree;
-
-/**
- * Base abstract implementation of the enum.
- * @since 1.1.0
- */
-public abstract class AbstractEnum implements Enum {
-
- /**
- * The name of the enumerator.
- */
- private final String name;
-
- /**
- * The <code>int</code> value of the enumerator.
- */
- private final int value;
-
- /**
- * Creates an initialized instance.
- *
- * @param value
- * the <code>int</code> value of the enumerator.
- * @param name
- * the name of the enumerator.
- */
- protected AbstractEnum(int value, String name) {
- this.name = name;
- this.value = value;
- }
-
- /**
- * Returns the name of the enumerator.
- *
- * @return the name.
- */
- public final String getName() {
- return name;
- }
-
- /**
- * Returns the <code>int</code> value of the enumerator.
- *
- * @return the value.
- */
- public final int getValue() {
- return value;
- }
-
- /**
- * Returns the name of the enumerator.
- *
- * @return the name.
- */
- public final String toString() {
- return name;
- }
-
-}
\ No newline at end of file
diff --git a/plugins/org.eclipse.jem.proxy/initParser/org/eclipse/jem/internal/proxy/initParser/tree/Enum.java b/plugins/org.eclipse.jem.proxy/initParser/org/eclipse/jem/internal/proxy/initParser/tree/Enum.java
deleted file mode 100644
index 8ffa63c..0000000
--- a/plugins/org.eclipse.jem.proxy/initParser/org/eclipse/jem/internal/proxy/initParser/tree/Enum.java
+++ /dev/null
@@ -1,37 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2005 IBM Corporation and others.
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
- *
- * Contributors:
- * IBM Corporation - initial API and implementation
- *******************************************************************************/
-/*
-
-
- */
-package org.eclipse.jem.internal.proxy.initParser.tree;
-
-/**
- * TypeSafe enumerations for the IExpression processing.
- *
- * @since 1.1.0
- */
-public interface Enum {
-
- /**
- * Returns the name of the enumerator.
- *
- * @return the name.
- */
- String getName();
-
- /**
- * Returns the <code>int</code> value of the enumerator.
- *
- * @return the value.
- */
- int getValue();
-}
\ No newline at end of file
diff --git a/plugins/org.eclipse.jem.proxy/initParser/org/eclipse/jem/internal/proxy/initParser/tree/ExpressionProcesser.java b/plugins/org.eclipse.jem.proxy/initParser/org/eclipse/jem/internal/proxy/initParser/tree/ExpressionProcesser.java
deleted file mode 100644
index 0c553ff..0000000
--- a/plugins/org.eclipse.jem.proxy/initParser/org/eclipse/jem/internal/proxy/initParser/tree/ExpressionProcesser.java
+++ /dev/null
@@ -1,3364 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2004, 2006 IBM Corporation and others.
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
- *
- * Contributors:
- * IBM Corporation - initial API and implementation
- *******************************************************************************/
-/*
-
-
- */
-package org.eclipse.jem.internal.proxy.initParser.tree;
-
-import java.lang.reflect.*;
-import java.text.MessageFormat;
-import java.util.ArrayList;
-import java.util.List;
-
-import org.eclipse.jem.internal.proxy.common.*;
-import org.eclipse.jem.internal.proxy.initParser.InitializationStringEvaluationException;
-import org.eclipse.jem.internal.proxy.initParser.InitializationStringParser;
-
-/**
- * Expression processing. This does the actual expression processing with the live objects.
- * It is meant to be subclassed only to provide additional expression types. All of the
- * current expressions cannot be overridden. This is because the stack is very sensitive to
- * call order.
- *
- * @since 1.0.0
- */
-public class ExpressionProcesser {
-
- /**
- * A variable reference for a field access.
- *
- * @since 1.1.0
- */
- protected static class FieldAccessReference extends VariableReference {
-
- private final Field field;
- private final Object receiver;
-
- /**
- * Use this to construct a FieldAccessReference. This will do checks to make sure
- * it is valid so that exceptions won't be thrown later when actually dereferenced.
- *
- * @param field
- * @param receiver
- * @return
- * @throws IllegalArgumentException
- *
- * @since 1.1.0
- */
- public static FieldAccessReference createFieldAccessReference(Field field, Object receiver) throws IllegalArgumentException {
- // If static, then receiver is ignored.
- if (!Modifier.isStatic(field.getModifiers())) {
- if (!field.getDeclaringClass().isInstance(receiver))
- throw new IllegalArgumentException(MessageFormat.format(InitparserTreeMessages.getString("ExpressionProcesser.CreateFieldAccessReference.FieldsTypesNotMatching_EXC_"), new Object[]{field.getType(), (receiver!=null ? receiver.getClass() : null)})); //$NON-NLS-1$
- }
- field.setAccessible(true); // Make it always accessible. Trust it.
- return new FieldAccessReference(field, receiver);
- }
-
- protected FieldAccessReference(Field field, Object receiver) {
- this.field = field;
- this.receiver = receiver;
- }
-
-
- /* (non-Javadoc)
- * @see org.eclipse.jem.internal.proxy.initParser.tree.ExpressionProcesser.VariableReference#dereference()
- */
- public Object dereference() {
- try {
- return field.get(receiver);
- } catch (IllegalArgumentException e) {
- // Shouldn't occur. Already tested for this.
- e.printStackTrace();
- } catch (IllegalAccessException e) {
- // Shouldn't occur. Already tested for this.
- e.printStackTrace();
- }
- return null;
- }
-
-
- /* (non-Javadoc)
- * @see org.eclipse.jem.internal.proxy.initParser.tree.ExpressionProcesser.VariableReference#set(java.lang.Object, java.lang.Class)
- */
- public Object set(Object value, Class type) throws IllegalArgumentException, IllegalAccessException {
- field.set(receiver, value);
- return field.get(receiver); // Just in case some conversion happened. Technically it is not the value set but the retrieved when in an assignment.
- }
-
-
- /* (non-Javadoc)
- * @see java.lang.Object#toString()
- */
- public String toString() {
- return "FieldAccess{"+field.toString()+"} on "+(receiver != null ? receiver.toString() : "<static access>"); //$NON-NLS-1$ //$NON-NLS-2$ //$NON-NLS-3$
- }
- }
-
- /**
- * A variable reference for an Array access. It will reference only the last indexed entry of the array.
- * For example if <code>x[3][4]</code> is the access, then what will be given to this reference will be
- * the array entry at x[3][4], not the x array itself.
- *
- * @since 1.1.0
- */
- protected static class ArrayAccessReference extends VariableReference {
-
-
- private final Object array;
- private final int index;
-
- /**
- * Use this to construct an array access reference. This will do checks to make sure
- * it is valid so that exceptions won't be thrown later when actually dereferenced.
- *
- * @param array
- * @param index
- * @return
- * @throws IllegalArgumentException
- *
- * @since 1.1.0
- */
- public static ArrayAccessReference createArrayAccessReference(Object array, int index) throws IllegalArgumentException, ArrayIndexOutOfBoundsException {
- int len = Array.getLength(array);
- if (index < 0 || len <= index)
- throw new ArrayIndexOutOfBoundsException(MessageFormat.format(InitparserTreeMessages.getString("ExpressionProcesser.CreateArrayAccessReference.OutOfBounds_EXC_"), new Object[]{new Integer(index), new Integer(len)})); //$NON-NLS-1$
- return new ArrayAccessReference(array, index);
- }
- /**
- * Construct the reference with the array and the index of the entry being referenced.
- * @param array
- * @param index
- *
- * @since 1.1.0
- */
- protected ArrayAccessReference(Object array, int index) {
- this.array = array;
- this.index = index;
- }
-
-
- /* (non-Javadoc)
- * @see org.eclipse.jem.internal.proxy.initParser.tree.VariableReference#dereference()
- */
- public Object dereference() {
- return Array.get(array, index);
- }
-
-
- /* (non-Javadoc)
- * @see org.eclipse.jem.internal.proxy.initParser.tree.VariableReference#set(java.lang.Object, java.lang.Class)
- */
- public Object set(Object value, Class type) throws IllegalArgumentException {
- Array.set(array, index, value);
- return Array.get(array, index); // In case there was some conversion applied. Technically it is not the value set but the retrieved when in an assignment.
- }
-
-
- /* (non-Javadoc)
- * @see java.lang.Object#toString()
- */
- public String toString() {
- return "ArrayAccess["+index+"]: "+array.toString(); //$NON-NLS-1$ //$NON-NLS-2$
- }
- }
-
- /**
- * The expression result stack and the expression result type stack.
- * The type stack is used to be expected type of the corresponding
- * expression result. This is needed for converting to primitives
- * and for finding correct method call from the argument types. In
- * this case, it is not the true value, but the value expected, e.g.
- * <code>Object getObject()</code> returns something of type Object.
- * This needs to be maintained so that if it goes into another method
- * we don't accidently return a more specific method instead of the
- * one that takes Object as an argument.
- *
- * expressionStack has result of the expression.
- * expressionTypeStack has the computed type of the expression i.e.
- * the type that the expression returns, not the type of the value.
- * These can be different because the expression (e.g. method) may
- * return an Object, but the expression value will be some specific
- * subclass. So the expressionTypeStack would have a <code>java.lang.Object.class</code>
- * on it in that case.
- * Note: if the expressionStack has a <code>null</code> on it, then the type stack
- * may either have a specific type in it, or it may be <code>MethodHelper.NULL_TYPE</code>. It
- * would be this if it was explicitly pushed in and not as the
- * result of a computation. If the result of a computation, it would have the
- * true value.
- * Note: if the expressionStack has a <code>Void.type</code> on it, then that
- * means the previous expression had no result. This is an error if trying to
- * use the expression in another expression.
- *
- * @see org.eclipse.jem.internal.proxy.initParser.MethodHelper#NULL_TYPE
- */
- private List expressionStack = new ArrayList(10);
- private List expressionTypeStack = new ArrayList(10);
-
- /**
- * List of the expression proxies. The index into the list is the
- * same as the expression proxy id.
- */
- private ArrayList expressionProxies; // It is array list because we want to call ensureCapacity and that is not available on List.
-
- /**
- * An error has occurred. At this point all subcommands will simply make sure they flush the input stream
- * correctly, but they do not process it.
- *
- * @since 1.0.0
- */
- private boolean errorOccurred = false;
- private boolean novalueException = false;
-
- private Throwable exception = null; // Was there another kind of exception that was caught.
-
- /**
- * Process all other exceptions then the NoExpressionValueException. This can be called from usage code so that if there was an error
- * in setting up for a call to the processer it can be logged.
- *
- * @param e
- *
- * @since 1.0.0
- */
- public final void processException(Throwable e) {
- // Process all other exceptions.
- novalueException = false;
- while (e.getCause() != null)
- e = e.getCause();
- if (traceOn) {
- System.out.println();
- System.out.print("***** >>>\tException: "); //$NON-NLS-1$
- System.out.println(e);
- }
- throwException(e); // Treat as a throw to let try/catches expressions handle it.
- }
-
- /**
- * This is a syntax exception. This means data coming across is corrupted in
- * some way so no further processing should occur.
- * @param e
- *
- * @since 1.1.0
- */
- protected final void processSyntaxException(Throwable e) {
- errorOccurred = true;
- novalueException = false;
- exception = e;
- }
-
- /**
- * Process a NoExpressionValueException. Don't wrapper these.
- * @param e
- *
- * @since 1.1.0
- */
- protected final void processSyntaxException(NoExpressionValueException e) {
- if (traceOn) {
- // This can happen at any time, so make sure we are on a new line.
- System.out.println();
- printTrace("Expression has no value", false); //$NON-NLS-1$
- }
- try {
- errorOccurred = true;
- novalueException = true;
- exception = e;
- } finally {
- if (traceOn)
- printTraceEnd();
- }
- }
-
- /**
- * Return whether there are any errors.
- *
- * @return <code>true</code> if no errors.
- *
- * @since 1.0.0
- */
- public boolean noErrors() {
- return !errorOccurred;
- }
-
- /**
- * Return whether the error is a NoExpressionValueException or not.
- * @return
- *
- * @since 1.1.0
- */
- public boolean isNoExpressionValue() {
- return novalueException;
- }
-
- /**
- * Return the throwable if a Throwable was caught.
- *
- * @return The throwable, or <code>null</code> if not set.
- *
- * @since 1.0.0
- */
- public Throwable getErrorThrowable() {
- return exception;
- }
-
- /**
- * Push the expression value and its expected type.
- * @param o
- * @param type
- *
- * @since 1.0.0
- */
- protected final void pushExpressionValue(Object o, Class type) {
- expressionStack.add(o);
- expressionTypeStack.add(type);
- }
-
- /**
- * Pop just the expression value. It is imperitive that the expression type
- * is popped immediately following. Separated the methods so that we
- * don't need to create an array to return two values. This will dereference
- * any variable references.
- *
- * @return The value.
- * @throws NoExpressionValueException
- *
- * @since 1.0.0
- */
- protected final Object popExpression() throws NoExpressionValueException {
- return popExpression(true);
- }
-
- /**
- * Pop just the expression value. It is imperitive that the expression type
- * is popped immediately following. Separated the methods so that we
- * don't need to create an array to return two values.
- *
- * @param deReference If the top expression is a Reference, then dereference it.
- * @return The value.
- * @throws NoExpressionValueException
- *
- * @since 1.0.0
- */
- protected final Object popExpression(boolean deReference) throws NoExpressionValueException {
- try {
- // Do not pop above the current subexpression pos, if any.
- if (topSubexpression != -1)
- if (expressionStack.size() == subexpressionStackPos[topSubexpression])
- throw new NoExpressionValueException();
-
- Object result = expressionStack.remove(expressionStack.size()-1);
- if (deReference && result instanceof VariableReference)
- result = ((VariableReference) result).dereference();
- return result;
- } catch (IndexOutOfBoundsException e) {
- throw new NoExpressionValueException();
- }
- }
-
- /**
- * Get the expression at <code>fromTop</code> down from the top. This is
- * need for when multi-operators happen and they are stored in reverse of
- * what is needed. They would normally be stored left to right, with the
- * rightmost one on top. But they need to be processed left to right, so
- * to get the left most one requires digging down in the stack.
- * <p>
- * When done, <code>popExpressions(int count)</code> must be called to
- * clean them out since they were processed.
- * <p>
- * This will not dereference the expression. It is the job of the caller to do this.
- *
- * @param fromTop <code>1</code> is the top one, <code>2</code> is the next one down.
- * @return The entry from the top that was requested.
- * @throws NoExpressionValueException
- *
- * @see IDEExpression#popExpressions(int)
- * @since 1.0.0
- */
- protected final Object getExpression(int fromTop) throws NoExpressionValueException {
- try {
- // Do not pull above the current subexpression pos, if any.
- if (topSubexpression != -1)
- if (expressionStack.size()-fromTop < subexpressionStackPos[topSubexpression])
- throw new NoExpressionValueException();
-
- return expressionStack.get(expressionStack.size()-fromTop);
- } catch (IndexOutOfBoundsException e) {
- throw new NoExpressionValueException();
- }
- }
-
- /**
- * Remove the top <code>count</code> items. This will not cause dereferencing to occur. It
- * removes the corresponding type stack entries.
- *
- * @param count
- * @throws NoExpressionValueException
- *
- * @since 1.0.0
- */
- protected final void popExpressions(int count) throws NoExpressionValueException {
- try {
- // Do not pop above the current subexpression pos, if any.
- int stop = topSubexpression != -1 ? subexpressionStackPos[topSubexpression] : -1;
- int remove = expressionStack.size()-1;
- while (count-- > 0) {
- if (expressionStack.size() <= stop)
- throw new NoExpressionValueException(); // Try to go above the current subexpression.
- expressionStack.remove(remove);
- expressionTypeStack.remove(remove--);
- }
- } catch (IndexOutOfBoundsException e) {
- throw new NoExpressionValueException();
- }
- }
-
- /**
- * Pop just the expression type. It is imperitive that the expression type
- * is popped immediately following popExpression. Separated the methods so that we
- * don't need to create an array to return two values.
- * <p>
- * If the allowVoid is false and type is void, then a NoExpressionValueException will be thrown.
- * This is for the case where the expression was trying to be used in a different
- * expression. This will be set to void only on expressions that return no value (only
- * method's do this for now).
- *
- * @param allowVoid Allow void types if <code>true</code>
- * @return The type.
- * @throws NoExpressionValueException
- * @since 1.0.0
- */
- protected final Class popExpressionType(boolean allowVoid) throws NoExpressionValueException {
- try {
- Class result = (Class) expressionTypeStack.remove(expressionTypeStack.size()-1);
- if (!allowVoid && result == Void.TYPE)
- throw new NoExpressionValueException(InitparserTreeMessages.getString("ExpressionProcesser.PopExpressionType.ExpressionVoid_EXC_")); //$NON-NLS-1$
- return result;
-
- } catch (IndexOutOfBoundsException e) {
- throw new NoExpressionValueException();
- }
- }
-
- /**
- * Get the expression type at <code>fromTop</code> down from the top. This is
- * need for when multi-operators happen and they are stored in reverse of
- * what is needed. They would normally be stored left to right, with the
- * rightmost one on top. But they need to be processed left to right, so
- * to get the left most one requires digging down in the stack.
- * <p>
- * When done, <code>popExpressionTypes(int count)</code> must be called to
- * clean them out since they were processed.
-
- * @param fromTop <code>1</code> is the top one, <code>2</code> is the next one down.
- * @param allowVoid Allow void types if <code>true</code>
- * @return The type from the top that was requested.
- * @throws ThrowableProxy
- * @throws NoExpressionValueException
- *
- * @see IDEExpression#popExpressionTypes(int)
- * @since 1.0.0
- */
- protected final Class getExpressionType(int fromTop, boolean allowVoid) throws NoExpressionValueException {
- try {
- Class result = (Class) expressionTypeStack.get(expressionTypeStack.size()-fromTop);
- if (!allowVoid && result == Void.TYPE)
- throw new NoExpressionValueException();
- return result;
- } catch (IndexOutOfBoundsException e) {
- throw new NoExpressionValueException();
- }
- }
-
- /**
- * Flag indicating expression should be ignored and not processed.
- * This happens because of few cases, like conditional and, that
- * if one returns false, the rest of the expressions in that conditional and
- * expression should be ignored and not processed.
- * <p>
- * It is an Object that acts as an enum for the type of expression that initiated the ignore.
- * If it is <code>null</code> then no one is ignoring.
- * <p>
- * All of the pushTo...Proxy methods must test this for this to work correctly.
- * Each expression has some way of testing that their particular nesting of
- * expressions is complete and they can turn off the ignore flag.
- * <p>
- * Only one type of ignore can exist at a time.
- */
- protected Object ignoreExpression = null;
-
-
- private List saveStates;
-
- /**
- * Are we tracing or not.
- */
- protected final boolean traceOn;
- private final long thresholdTime;
- private long startExpressionStepTime;
- private long startExpressionTime;
- private long lastExpressionEndTime;
-
- /**
- * Trace head of this expression. So that traces from different expressions can be distinquished.
- * It is simply an monotonically increasing counter. It is the header string for any trace output.
- */
- protected final String traceHeader;
-
- private int indent = 0; // Indented for certain block expressions.
-
- /*
- * Trace counter. It is incremented once for each expression and assigned to the traceId of the expression.
- */
- private static int TRACE_COUNTER;
-
- /**
- * Create the Expression without tracing.
- * @param registry
- *
- * @since 1.0.0
- */
- public ExpressionProcesser() {
- this(false, -1);
- }
-
- /**
- * Create the expression, and set the tracing mode and threshold time. Use -1
- * for default time of 100ms.
- * @param traceOn
- *
- * @since 1.1.0
- */
- public ExpressionProcesser(boolean traceOn, long threshold) {
- this.traceOn = traceOn;
- if (traceOn) {
- traceHeader = "**"+(++TRACE_COUNTER)+':'; //$NON-NLS-1$
- System.out.print(traceHeader);
- System.out.println(" Start expression"); //$NON-NLS-1$
- this.thresholdTime = threshold != -1 ? threshold : 100;
- lastExpressionEndTime = startExpressionTime = System.currentTimeMillis();
- } else {
- traceHeader = null;
- thresholdTime = 100;
- }
- }
-
- /**
- * Trace msg helper. Should only be called if traceOn is true. This method is only used to start a new trace message.
- * The caller is must call printTraceEnd at the end.
- *
- * @param msg message to print
- * @param ignore are we ignoring the expression, or is it being processed (this just alters the trace output slightly).
- *
- * @since 1.1.0
- */
- protected void printTrace(String msg, boolean ignore) {
- startExpressionStepTime = System.currentTimeMillis();
- long sinceLastExpression = startExpressionStepTime - lastExpressionEndTime;
- System.out.print(traceHeader);
- if (sinceLastExpression > 0) {
- System.out.print('(');
- if (sinceLastExpression > thresholdTime)
- System.out.print("***"); //$NON-NLS-1$
- System.out.print(sinceLastExpression);
- System.out.print("ms)"); //$NON-NLS-1$
- }
- System.out.print('\t');
- if (!ignore)
- System.out.print("\t"); //$NON-NLS-1$
- else
- System.out.print("##\t"); //$NON-NLS-1$
-
- printIndent();
- System.out.print(msg);
- }
-
- /**
- * print the indent. It will not do a new line before nor after.
- *
- * @since 1.1.0
- */
- protected void printIndent() {
- for(int i=indent; i>0; i--) {
- System.out.print(" "); //$NON-NLS-1$
- }
- }
-
- protected void printTraceEnd() {
- long stop = System.currentTimeMillis()-startExpressionStepTime;
- if (stop > 0) {
- System.out.print(" ("); //$NON-NLS-1$
- if (stop > thresholdTime)
- System.out.print("***"); //$NON-NLS-1$
- System.out.print(stop);
- System.out.print("ms)"); //$NON-NLS-1$
- }
- System.out.println();
- lastExpressionEndTime = System.currentTimeMillis();
- }
-
- /**
- * Do an indent (undent) according to indent flag.
- * @param indent <code>true</code> to increment indent, or otherwise decrement.
- *
- * @since 1.1.0
- */
- protected void indent(boolean indent) {
- this.indent += (indent ? 1 : -1);
- if (this.indent < 0)
- this.indent = 0;
- }
-
- /**
- * Print the object and type. It will not end with a newline char, so one will be needed afterwards.
- *
- * @param o
- * @param t
- *
- * @since 1.1.0
- */
- protected void printObjectAndType(Object o, Class t) {
- System.out.print(' ');
- System.out.print("Object-"); //$NON-NLS-1$
- System.out.print(o);
- System.out.print(" Type-"); //$NON-NLS-1$
- System.out.print(t);
- System.out.print(' ');
- }
-
- /**
- * Close the exception processing
- *
- * @since 1.0.0
- */
- public final void close() {
- boolean firstClose = expressionStack != null;
- if (firstClose && traceOn) {
- printTrace("End expression", false); //$NON-NLS-1$
- long totalTime = System.currentTimeMillis()-startExpressionTime;
- System.out.print(" Total expression evaluation time: "); //$NON-NLS-1$
- System.out.print(totalTime);
- System.out.print("ms."); //$NON-NLS-1$
- }
- try {
- expressionStack = null;
- expressionTypeStack = null;
- expressionProxies = null;
- exception = null;
- catchThrowable = null;
- saveStates = null;
- } finally {
- if (firstClose && traceOn)
- printTraceEnd();
- }
- }
-
- /**
- * Pull the value. The value will be placed into the array passed in.
- * It will be stored as value[0] = value value[1] = valuetype(Class).
- *
- * @param value The value array to store the value and type into.
- * @throws NoExpressionValueException
- * @since 1.0.0
- */
- public final void pullValue(Object[] value) throws NoExpressionValueException {
- if (traceOn)
- printTrace("Pull value:", false); //$NON-NLS-1$
- try {
- value[0] = popExpression();
- value[1] = popExpressionType(false);
- } finally {
- if (traceOn) {
- printObjectAndType(value[0], (Class) value[1]);
- printTraceEnd();
- }
- }
- close();
- }
-
- /**
- * Pull the value of the expression proxy, dereferencing it if necessary. This is for resolution only purposes at the
- * end of the expression being processed. Not meant for general access to the value of expression proxy. Use
- * {@link ExpressionProcesser#getExpressionProxyValue(int, Object[])} instead for general access to the value.
- *
- * @param proxyid
- * @param value
- * @throws NoExpressionValueException
- *
- * @since 1.1.0
- */
- public final void pullExpressionProxyValue(int proxyid, Object[] value) throws NoExpressionValueException {
- getExpressionProxyValue(proxyid, value, true, true);
- }
-
- /**
- * Get the expression proxy value. If the expression has not yet been evaluated it will
- * return false. If it has it will return true.
- * @param proxyid
- * @param value put value into value[0] and the type into value[1].
- * @return <code>true</code> if successful, or <code>false</code> if the expression proxy was never resolved or doesn't exist.
- *
- * @since 1.1.0
- */
- public boolean getExpressionProxyValue(int proxyid, Object[] value) {
- try {
- return getExpressionProxyValue(proxyid, value, true, false);
- } catch (NoExpressionValueException e) {
- return false;
- }
- }
-
- /**
- * Get the expression proxy value, or the NoExpressionValueException if not resolved. This
- * is useful for callers that need to handle the proxy itself for failed calls.
- *
- * @param proxyid
- * @param value
- * @throws NoExpressionValueException
- *
- * @since 1.1.0
- */
- public void getExpressionProxy(int proxyid, Object[] value) throws NoExpressionValueException {
- getExpressionProxyValue(proxyid, value, true, false);
- }
-
- /*
- * Internal method use to actually get the value, but to distinquish between pull and get of the public interface.
- * Get will process the errors as normal execution errors, while pull will throw the errors. finalTrace is when
- * this is the final call to return the values to the client. We will trace the results in that case.
- * Return true if successful.
- */
- private boolean getExpressionProxyValue(int proxyid, Object[] value, boolean pull, boolean finalTrace) throws NoExpressionValueException {
- // Note: This will throw the exceptions right away since this is called from outside to fill in the value and
- // so we are holding such exceptions.
- boolean doTrace = finalTrace && traceOn;
- try {
- if (expressionProxies != null && expressionProxies.size() > proxyid) {
- InternalExpressionProxy proxy = (InternalExpressionProxy) expressionProxies.get(proxyid);
- if (proxy != null && proxy.isSet()) {
- value[0] = proxy.getValue();
- if (value[0] instanceof VariableReference)
- value[0] = ((VariableReference) value[0]).dereference(); // Here we want the final current value.
- value[1] = proxy.getType();
- if (doTrace)
- if (value[1] != Void.TYPE) {
- printTrace("Return Proxy #" + proxyid + " Resolved to", false); //$NON-NLS-1$ //$NON-NLS-2$
- printObjectAndType(value[0], (Class) value[1]);
- } else
- printTrace("Return Proxy #" + proxyid + " Resolved to void.", false); //$NON-NLS-1$ //$NON-NLS-2$
- return true;
-
- } else {
- if (doTrace)
- printTrace("Return Proxy #" + proxyid + ": Not resolved", false); //$NON-NLS-1$ //$NON-NLS-2$
- NoExpressionValueException e = new NoExpressionValueException(InitparserTreeMessages.getString("ExpressionProcesser.GetExpressionProxyValue.ExpressionProxyNotSet_EXC_"), proxy); //$NON-NLS-1$
- if (pull)
- throw e;
- else
- processSyntaxException(e);
- return false;
- }
- } else {
- if (doTrace)
- printTrace("Return Proxy #" + proxyid + ": Never created.", false); //$NON-NLS-1$ //$NON-NLS-2$
- NoExpressionValueException e = new NoExpressionValueException(InitparserTreeMessages.getString("ExpressionProcesser.GetExpressionProxyValue.ExpressionProxyDoesntExist_EXC_")); //$NON-NLS-1$
- if (pull)
- throw e;
- else
- processSyntaxException(e);
- return false;
- }
- } finally {
- if (doTrace)
- printTraceEnd();
- }
- }
-
- /**
- * Push the expression (just a value) onto the stack.
- *
- * @param o
- * @param t
- *
- * @since 1.0.0
- */
- public final void pushExpression(Object o, Class t) {
- boolean ignore = (ignoreExpression != null || errorOccurred);
- if (traceOn) {
- printTrace("Push: ", ignore); //$NON-NLS-1$
- printObjectAndType(o, t);
- }
- try {
- if (ignore)
- return;
- pushExpressionValue(o, t);
- } finally {
- if (traceOn)
- printTraceEnd();
- }
- }
-
- /**
- * Get the value of the expression proxy (from proxy id), and push the value onto the stack.
- *
- * @param proxyid The proxy id of the ExpressionProxy to push as a value.
- *
- * @since 1.0.0
- */
- public final void pushExpressionProxy(int proxyid) {
- boolean ignore =(ignoreExpression != null || errorOccurred);
- if (traceOn)
- printTrace("Push Expression Proxy #"+proxyid, ignore); //$NON-NLS-1$
- try {
- if (ignore)
- return;
- if (expressionProxies != null && expressionProxies.size() > proxyid) {
- InternalExpressionProxy proxy = (InternalExpressionProxy) expressionProxies.get(proxyid);
- if (proxy != null && proxy.isSet()) {
- if (traceOn)
- printObjectAndType(proxy.getValue(), proxy.getType());
- pushExpressionValue(proxy.getValue(), proxy.getType()); // Can push a VariableReference. This is ok. When used it will then deref with the current value.
- } else
- processException(new NoExpressionValueException("Proxy id: "+proxyid)); //$NON-NLS-1$
- } else
- processException(new NoExpressionValueException("Proxy id: "+proxyid)); //$NON-NLS-1$
- } finally {
- if (traceOn)
- printTraceEnd();
- }
- }
-
- /**
- * Push a cast onto stack. The type passed in is either a String (with classname to cast to) or the
- * type to cast to.
- * @param type To cast to. If <code>String</code> then convert to type (using something like <code>Class.forName()</code>) or it is a Class
- *
- * @since 1.0.0
- */
- public final void pushCast(Class type) {
- boolean ignore = (ignoreExpression != null || errorOccurred);
- if (traceOn)
- printTrace("Cast to: "+type, ignore); //$NON-NLS-1$
- try {
- if (ignore)
- return;
-
- try {
- Object exp = popExpression();
- Class exptype = popExpressionType(false);
-
- pushExpressionValue(castBean(type, exp, exptype), type);
- } catch (RuntimeException e) {
- processException(e);
- } catch (NoExpressionValueException e) {
- processException(e);
- }
- } finally {
- if (traceOn)
- printTraceEnd();
- }
-
- }
-
- /**
- * Cast a bean into the return type. If the return type is not primitive, then
- * the bean is left alone, however it is checked to be an instance of
- * the return type. If the return type is primitive, then the
- * correct primitive wrapper is created from the bean (bean must be a number or character or boolean primitve so
- * that cast will work).
- * <p>
- * However if can't be cast for primitive or if not an instance of the
- * returntype for objects, a ClassCastException will be raised.
- * <p>
- * This is a helper method for expression processer to cast a bean. Since it is a helper method it doesn't
- * check nor process the exception. It throws it. Callers must handle it as they see fit.
- *
- * @param returnType
- * @param bean
- * @param beanType The type that bean is supposed to be (e.g. even though it is a Number, it actually represents a primitive).
- * @return The cast bean (either to the appropriate primitive wrapper type or bean)
- *
- * @throws ClassCastException
- * @since 1.0.0
- */
- protected final Object castBean(Class returnType, Object bean, Class beanType) throws ClassCastException {
- // Cast uses true value and true class of bean, not expected type (i.e. not beanType).
- if (bean == null)
- if (!returnType.isPrimitive())
- return bean; // bean is null, and return type is not primitive, so this is a valid cast.
- else
- throwClassCast(returnType, bean);
- else if (returnType.equals(bean.getClass()))
- return bean; // They are already the same.
- else if (!returnType.isPrimitive()) {
- if (!beanType.isPrimitive() && returnType.isInstance(bean))
- return bean;
- else
- throwClassCast(returnType, bean); // Either bean type was wrappering primitive or not instanceof returntype.
- } else {
- if (!beanType.isPrimitive())
- throwClassCast(returnType, bean); // bean type was not wrappering a primitive. Can't cast to primitive.
- // It is return type of primitive. Now convert to correct primitive.
- if (returnType == Boolean.TYPE)
- if (bean instanceof Boolean)
- return bean;
- else
- throwClassCast(returnType, bean);
- else {
- if (bean instanceof Number) {
- if (returnType == Integer.TYPE)
- if (bean instanceof Integer)
- return bean;
- else
- return new Integer(((Number) bean).intValue());
- else if (returnType == Byte.TYPE)
- if (bean instanceof Byte)
- return bean;
- else
- return new Byte(((Number) bean).byteValue());
- else if (returnType == Character.TYPE)
- if (bean instanceof Character)
- return bean;
- else
- return new Character((char) ((Number) bean).intValue());
- else if (returnType == Double.TYPE)
- if (bean instanceof Double)
- return bean;
- else
- return new Double(((Number) bean).doubleValue());
- else if (returnType == Float.TYPE)
- if (bean instanceof Float)
- return bean;
- else
- return new Float(((Number) bean).floatValue());
- else if (returnType == Long.TYPE)
- if (bean instanceof Long)
- return bean;
- else
- return new Long(((Number) bean).longValue());
- else if (returnType == Short.TYPE)
- if (bean instanceof Short)
- return bean;
- else
- return new Short(((Number) bean).shortValue());
- else
- throwClassCast(returnType, bean);
- } else if (bean instanceof Character) {
- if (returnType == Character.TYPE)
- return bean;
- else if (returnType == Integer.TYPE)
- return new Integer(((Character) bean).charValue());
- else if (returnType == Byte.TYPE)
- return new Byte((byte) ((Character) bean).charValue());
- else if (returnType == Double.TYPE)
- return new Double(((Character) bean).charValue());
- else if (returnType == Float.TYPE)
- return new Float(((Character) bean).charValue());
- else if (returnType == Long.TYPE)
- return new Long(((Character) bean).charValue());
- else if (returnType == Short.TYPE)
- return new Short((short) ((Character) bean).charValue());
- else
- throwClassCast(returnType, bean);
- } else
- throwClassCast(returnType, bean);
- }
-
- }
- return null; // It should never get here;
- }
-
- private void throwClassCast(Class returnType, Object bean) throws ClassCastException {
- throw new ClassCastException(MessageFormat.format(InitparserTreeMessages.getString("ExpressionProcesser.CannotCastXToY_EXC_"), new Object[] {bean != null ? bean.getClass().getName() : null, returnType.getName()})); //$NON-NLS-1$
- }
-
- /**
- * Return the primitive type that the wrapper bean represents (i.e. Boolean instance returns Boolean.TYPE)
- * <p>
- * This is a helper method for expression processer to get the primitive type. Since it is a helper method it doesn't
- * check nor process the exception. It throws it. Callers must handle it as they see fit.
-
- * @param bean
- * @return the primitive type class of the given bean.
- * @throws IllegalArgumentException if bean is <code>null</code> or not of the type that can be converted to a primitive.
- *
- * @since 1.0.0
- */
- protected final Class getPrimitiveType(Object bean) throws IllegalArgumentException {
- if (bean instanceof Boolean)
- return Boolean.TYPE;
- else if (bean instanceof Integer)
- return Integer.TYPE;
- else if (bean instanceof Byte)
- return Byte.TYPE;
- else if (bean instanceof Character)
- return Character.TYPE;
- else if (bean instanceof Double)
- return Double.TYPE;
- else if (bean instanceof Float)
- return Float.TYPE;
- else if (bean instanceof Long)
- return Long.TYPE;
- else if (bean instanceof Short)
- return Short.TYPE;
- else
- throw new IllegalArgumentException(bean != null ? bean.getClass().getName() : "null"); //$NON-NLS-1$
- }
-
- private static final Object IFELSE_IGNORE = "IF/ELSE IGNORE"; // Flag for if/else in ingore //$NON-NLS-1$
- private int ifElseNesting = 0; // Nesting of if/else expressions.
- private int ifElseIgnoreNestCount = 0; // When ignoring if/else expressions, ignore until this nest count.
- private boolean ifElseSkipTruePart;
-
-
- /**
- * Push an if test expression.
- * @param hasElseClause
- *
- * @since 1.0.0
- */
- public final void pushIfElse() {
- try {
- boolean ignore = true;
- try {
- if (errorOccurred)
- return;
- // Slightly different here in that if an ignoring occurred we still need to process at least part of it so that
- // we can get the expression grouping correct.
- ifElseNesting++; // We have the test.
-
- if (ignoreExpression != null)
- return;
- ignore = false;
- } finally {
- if (traceOn)
- printTrace("If test condition", ignore); //$NON-NLS-1$
- }
-
- try {
- Object condition = popExpression();
- Class type = popExpressionType(false);
- if (type != Boolean.TYPE)
- throwClassCast(Boolean.TYPE, condition);
- if (traceOn) {
- System.out.print(" Test Result="+condition); //$NON-NLS-1$
- printTraceEnd();
- indent(true);
- printTrace("Begin True Expression.", ignore); //$NON-NLS-1$
- printTraceEnd();
- indent(true);
- }
- if (((Boolean) condition).booleanValue()) {
- // Condition was true.
- // Do nothing. Let true condition be processed.
- } else {
- // Condition was false.
- ifElseSkipTruePart = true; // Tell the true condition should be ignored.
- ignoreExpression = IFELSE_IGNORE;
- ifElseIgnoreNestCount = ifElseNesting;
- }
- // We don't put anything back on the stack because the condition test is not ever returned.
- // The appropriate true or false condition evaluation will be left on the stack.
- } catch (RuntimeException e) {
- processException(e);
- } catch (NoExpressionValueException e) {
- processException(e);
- }
- } finally {
- if (traceOn)
- printTraceEnd();
- }
- }
-
- /**
- * Push an if/else clause. It can be any clause of the if (true, or false clause).
- * @param clauseType
- *
- * @since 1.0.0
- */
- public final void pushIfElse(InternalIfElseOperandType clauseType) {
- try {
- boolean ignore = true;
- if (errorOccurred)
- return;
- // Slightly different here in that if an ignoring occurred we still need to process at least part of it so that
- // we can get the expression grouping correct.
- switch (clauseType.getValue()) {
- case InternalIfElseOperandType.TRUE_CLAUSE_VALUE:
- if (traceOn) {
- indent(false);
- printTrace("Begin False Expression.", ignore); //$NON-NLS-1$
- printTraceEnd();
- indent(true);
- }
- if (ifElseSkipTruePart && ignoreExpression == IFELSE_IGNORE && ifElseIgnoreNestCount == ifElseNesting) {
- // stop ignoring, we've ignored the true condition of interest.
- ignoreExpression = null;
- return; // However, leave because since this condition was ignored.
- }
- break;
- case InternalIfElseOperandType.ELSE_CLAUSE_VALUE:
- if (traceOn) {
- indent(false);
- indent(false);
- printTrace("End IF/ELSE Expression.", ignore); //$NON-NLS-1$
- printTraceEnd();
- }
- int currentNesting = ifElseNesting--;
- if (ignoreExpression == IFELSE_IGNORE && ifElseIgnoreNestCount == currentNesting) {
- // stop ignoring, we've ignored the false condition of interest.
- ignoreExpression = null;
- return; // However, leave because since this condition was ignored.
- }
- }
-
- if (ignoreExpression != null)
- return;
- ignore = false;
-
-
- try {
- switch (clauseType.getValue()) {
- case InternalIfElseOperandType.TRUE_CLAUSE_VALUE:
- ifElseSkipTruePart = false; // Tell the false condition should be ignored.
- ignoreExpression = IFELSE_IGNORE;
- ifElseIgnoreNestCount = ifElseNesting;
- break;
- case InternalIfElseOperandType.ELSE_CLAUSE_VALUE:
- // There's nothing to do, if it was ignored due to true, we wouldn't of gotton here.
- // If it wasn't ignored, then the result of the false expression is on the stack, which is what it should be.
- break;
- }
- } catch (RuntimeException e) {
- processException(e);
- }
- } finally {
- if (traceOn)
- printTraceEnd();
- }
- }
-
- /**
- * Push the instanceof expression. The type passed in is either a String (with classname to test against) or the
- * type to test against.
- * @param type To test against.
- * @since 1.0.0
- */
- public final void pushInstanceof(Class type) {
- boolean ignore = (ignoreExpression != null || errorOccurred);
- if (traceOn)
- printTrace("Instanceof type: "+type, ignore); //$NON-NLS-1$
- try {
- if (ignore)
- return;
-
- try {
- Object exp = popExpression();
- Class exptype = popExpressionType(false);
- pushExpressionValue(Boolean.valueOf(isInstance(type, exp, exptype)), Boolean.TYPE);
- } catch (NoExpressionValueException e) {
- processException(e);
- } catch (RuntimeException e) {
- processException(e);
- }
- } finally {
- if (traceOn)
- printTraceEnd();
- }
- }
-
- /**
- * Test if instance of. It will make sure that primitive to non-primitive is not permitted.
- * This is a true instance of, which means null IS NOT AN instance of any type. This is
- * different then assignable from, in that case null can be assigned to any class type.
- * <p>
- * This is a helper method for expression processer to do isInstance. Since it is a helper method it doesn't
- * check nor process exceptions.
-
- * @param type
- * @param bean
- * @param beanType
- * @return
- *
- * @since 1.0.0
- */
- protected final boolean isInstance(Class type, Object bean, Class beanType) {
- if (type.isPrimitive())
- return beanType.isPrimitive() && type == beanType; // Can't use isInstance because for a primitive type isInstance returns false.
- else
- return type.isInstance(bean);
- }
-
- /**
- * Push new instance from string.
- * @param initializationString
- * @param resultType expected result type. If it isn't of that type, a classcast will be processed.
- * @param classloader classloader to use for finding classes, or <code>null</code> to use classloader of InitializationStringParser.class.
- *
- * @since 1.1.0
- */
- public final void pushNewInstanceFromString(String initializationString, Class resultType, ClassLoader classloader) {
- boolean ignore = (ignoreExpression != null || errorOccurred);
- if (traceOn)
- printTrace("New instance from string: \""+initializationString+"\" Type="+resultType, ignore); //$NON-NLS-1$ //$NON-NLS-2$
- try {
- if (ignore)
- return;
-
- try {
- InitializationStringParser parser = InitializationStringParser.createParser(initializationString, classloader);
- Object newValue = parser.evaluate();
- newValue = castBean(resultType, newValue, parser.getExpectedType());
- pushExpressionValue(newValue, resultType);
- } catch (RuntimeException e) {
- processException(e);
- } catch (InitializationStringEvaluationException e) {
- processException(e);
- }
- } finally {
- if (traceOn)
- printTraceEnd();
- }
-
- }
-
- /**
- * Push prefix expression.
- * @param operator
- * @since 1.0.0
- */
- public final void pushPrefix(PrefixOperator operator) {
- try {
- if (ignoreExpression != null || errorOccurred) {
- if (traceOn)
- printTrace("Prefix: \'"+operator+"\'", true); //$NON-NLS-1$ //$NON-NLS-2$
- return;
- }
-
- if (operator == PrefixOperator.PRE_PLUS)
- return; // Do nothing. "+" doesn't affect the result of the current top expression.
-
- if (traceOn)
- printTrace("Prefix: \'"+operator+"\' ", false); //$NON-NLS-1$ //$NON-NLS-2$
-
- try {
- Object exp = popExpression();
- Class exptype = popExpressionType(false);
- if (!exptype.isPrimitive())
- throwInvalidPrefix(operator, exp);
-
- int primTypeEnum = getEnumForPrimitive(exptype);
- switch (operator.getValue()) {
- case PrefixOperator.PRE_MINUS_VALUE:
- switch (primTypeEnum) {
- case BOOLEAN:
- throwInvalidPrefix(operator, exp);
- case BYTE:
- exp = new Integer(-((Number) exp).byteValue());
- break;
- case CHAR:
- exp = new Integer(-((Character) exp).charValue());
- break;
- case DOUBLE:
- exp = new Double(-((Number) exp).doubleValue());
- break;
- case FLOAT:
- exp = new Float(-((Number) exp).floatValue());
- break;
- case INT:
- exp = new Integer(-((Number) exp).intValue());
- break;
- case LONG:
- exp = new Long(-((Number) exp).longValue());
- break;
- case SHORT:
- exp = new Integer(-((Number) exp).shortValue());
- break;
- }
- exptype = getPrimitiveType(exp); // It can actually change the type.
- break;
-
- case PrefixOperator.PRE_COMPLEMENT_VALUE:
- switch (primTypeEnum) {
- case BOOLEAN:
- case DOUBLE:
- case FLOAT:
- throwInvalidPrefix(operator, exp);
- case BYTE:
- exp = new Integer(~((Number) exp).byteValue());
- break;
- case CHAR:
- exp = new Integer(~((Character) exp).charValue());
- break;
- case INT:
- exp = new Integer(~((Number) exp).intValue());
- break;
- case LONG:
- exp = new Long(~((Number) exp).longValue());
- break;
- case SHORT:
- exp = new Integer(~((Number) exp).shortValue());
- break;
- }
- exptype = getPrimitiveType(exp); // It can actually change the type.
- break;
- case PrefixOperator.PRE_NOT_VALUE:
- switch (primTypeEnum) {
- case BOOLEAN:
- exp = !((Boolean) exp).booleanValue() ? Boolean.TRUE : Boolean.FALSE;
- break;
- case BYTE:
- case CHAR:
- case DOUBLE:
- case FLOAT:
- case INT:
- case LONG:
- case SHORT:
- throwInvalidPrefix(operator, exp);
- }
- break;
- }
-
- if (traceOn)
- printObjectAndType(exp, exptype);
- pushExpressionValue(exp, exptype); // Push the result back on the stack.
-
- } catch (IllegalArgumentException e) {
- processSyntaxException(e);
- } catch (NoExpressionValueException e) {
- processException(e);
- } catch (RuntimeException e) {
- processException(e);
- }
- } finally {
- if (traceOn)
- printTraceEnd();
- }
-
- }
-
- /**
- * Assign the right expression to the left expression.
- * @since 1.1.0
- */
- public final void pushAssignment() {
- if (ignoreExpression != null || errorOccurred) {
- if (traceOn) {
- printTrace("Assignment", true); //$NON-NLS-1$
- printTraceEnd();
- }
- return;
- }
-
- try {
- // KLUDGE: The only reason leftValue/refType are outside of try/finally is because
- // of tracing. pushExpression() does its own trace statements, so we need to end
- // our trace before calling pushExpression.
- Object leftValue;
- Class refType;
- try {
- if (traceOn)
- printTrace("Assignment: ", false); //$NON-NLS-1$
- // The order on the stack is right then left operand.
- // First the right operand
- Object value = popExpression();
- Class type = popExpressionType(false);
-
- // Next the left operand, should be a reference.
- VariableReference left = (VariableReference) popExpression(false); // Don't dereference it.
- refType = popExpressionType(false);
-
- if (traceOn)
- printObjectAndType(left, refType);
-
- leftValue = left.set(value, type);
- } finally {
- if (traceOn)
- printTraceEnd();
- }
-
- // Now do assignment and return the value to the stack.
- pushExpression(leftValue, refType); // The type of the result is the type of the reference.
-
- } catch (IllegalArgumentException e) {
- processException(e);
- } catch (NoExpressionValueException e) {
- processException(e);
- } catch (IllegalAccessException e) {
- processException(e);
- } catch (RuntimeException e) {
- processException(e);
- }
-
- }
-
- /**
- * Assign the expression proxy to the top expression value.
- *
- * @param proxy
- *
- * @since 1.1.0
- */
- public final void pushAssignment(InternalExpressionProxy proxy) {
- boolean ignore = (ignoreExpression != null || errorOccurred);
- try {
- if (traceOn) {
- printTrace("Assign to Proxy #"+proxy.getProxyID(), ignore); //$NON-NLS-1$
- }
- if (ignore)
- return;
-
- try {
- assignToExpressionProxyFromTopStackEntry(proxy);
- if (traceOn)
- printObjectAndType(proxy.getValue(), proxy.getType());
- } catch (NoExpressionValueException e) {
- processException(e);
- } catch (RuntimeException e) {
- processException(e);
- }
- } finally {
- if (traceOn)
- printTraceEnd();
- }
-
- }
-
- /**
- * Assign the top stack entry to the new expression proxy and allocate it for callback later.
- * @param proxy
- * @throws NoExpressionValueException
- *
- * @since 1.1.0
- */
- protected void assignToExpressionProxyFromTopStackEntry(InternalExpressionProxy proxy) throws NoExpressionValueException {
- Object value = getExpression(1);
- Class type = getExpressionType(1, true);
- if (value instanceof VariableReference)
- value = ((VariableReference) value).dereference(); // Here we want the final current value.
-
- proxy.setProxy(value, type);
- allocateExpressionProxy(proxy);
- }
-
- /**
- * Allocate an expression proxy. This is used to make an expression proxy known to the processor. The expression proxy must
- * have been setProxy() at this point. This is used to assign from the top of the stack or to add from outside an evaluated proxy
- * to be used later by others.
- *
- * @param proxy
- *
- * @since 1.1.0
- */
- public void allocateExpressionProxy(InternalExpressionProxy proxy) {
- int minSize = proxy.getProxyID()+1;
- if (expressionProxies == null)
- expressionProxies = new ArrayList(minSize+10); // Allow room to grow ten more.
- else if (expressionProxies.size() < minSize)
- expressionProxies.ensureCapacity(minSize+10); // Allow room to grow ten more.
- int fill = minSize-expressionProxies.size(); // Number of "null" fill entries needed. Probably shouldn't occur, but to be safe.
- if (fill > 0) {
- while (--fill > 0)
- expressionProxies.add(null);
- expressionProxies.add(proxy);
- } else
- expressionProxies.set(proxy.getProxyID(), proxy); // Already large enough, replace entry.
-
- }
-
- /**
- * The primitive enums.
- * NOTE: Their order must not changed. They are in order of permitted widening.
- *
- */
- protected static final int
- BOOLEAN = 0,
- BYTE = 1,
- SHORT = 2,
- CHAR = 3,
- INT = 4,
- LONG = 5,
- FLOAT = 6,
- DOUBLE = 7;
-
-
-
- /**
- * Get the enum constant for the type of primitive passed in.
- * <p>
- * This is a helper method for expression processer to get the enum for the primitive type. Since it is a helper method it doesn't
- * check nor process the exception. It throws it. Callers must handle it as they see fit.
-
- * @param primitiveType
- * @return
- * @throws IllegalArgumentException if type is not a primitive.
- *
- * @see ExpressionProcesser#BOOLEAN
- * @since 1.0.0
- */
- protected final int getEnumForPrimitive(Class primitiveType) throws IllegalArgumentException {
- if (primitiveType == Boolean.TYPE)
- return BOOLEAN;
- else if (primitiveType == Integer.TYPE)
- return INT;
- else if (primitiveType == Byte.TYPE)
- return BYTE;
- else if (primitiveType == Character.TYPE)
- return CHAR;
- else if (primitiveType == Double.TYPE)
- return DOUBLE;
- else if (primitiveType == Float.TYPE)
- return FLOAT;
- else if (primitiveType == Long.TYPE)
- return LONG;
- else if (primitiveType == Short.TYPE)
- return SHORT;
- else
- throw new IllegalArgumentException(primitiveType != null ? primitiveType.getName() : "null"); //$NON-NLS-1$
- }
-
- private void throwInvalidPrefix(PrefixOperator operator, Object exp) throws IllegalArgumentException {
- throw new IllegalArgumentException(MessageFormat.format(InitparserTreeMessages.getString("ExpressionProcesser.InvalidOperandOfPrefixOperator_EXC_"), new Object[] {exp != null ? exp.toString() : null, operator.toString()})); //$NON-NLS-1$
- }
-
- private static final Object INFIX_IGNORE = "INFIX IGNORE"; // Flag for infix in ingore //$NON-NLS-1$
- private int infixNesting = 0; // Nesting of infix expressions.
- private int infixIgnoreNestCount = 0; // When ignoring infix expressions, ignore until this nest count.
- /**
- * Push the infix expression onto the stack.
- * @param operator
- * @param operandType The operator type. Left, right, other.
- * @since 1.0.0
- */
- public final void pushInfix(InfixOperator operator, InternalInfixOperandType operandType) {
- try {
- boolean ignore = true;
- try {
- if (errorOccurred) {
- return;
- }
- // Slightly different here in that if an ignored occurred we still need to process at least part of it so that
- // we can get the expression grouping correct.
- if (operandType == InternalInfixOperandType.INFIX_LEFT_OPERAND)
- infixNesting++;
- else if (operandType == InternalInfixOperandType.INFIX_LAST_OPERAND) {
- int currentNest = infixNesting--;
- if (ignoreExpression == INFIX_IGNORE && currentNest == infixIgnoreNestCount) {
- // We were ignoring, and it was this expression that was being ignore.
- // We have received the last operand of the nested expression that was being ignored,
- // so we can stop ignoring. But we still leave since the value of the expression is on the
- // top of the stack.
- ignoreExpression = null;
- return;
- }
- }
-
- if (ignoreExpression != null)
- return;
- ignore = false;
- } finally {
- if (traceOn)
- printTrace("Infix: "+operator, ignore); //$NON-NLS-1$
- }
-
- try {
- Object right = null;
- Class rightType = null;
- if (operandType != InternalInfixOperandType.INFIX_LEFT_OPERAND) {
- // We are not the left operand, so the stack has the right on the top, followed by the left.
- right = popExpression();
- rightType = popExpressionType(false);
- }
-
- Object value = popExpression();
- Class valueType = popExpressionType(false);
-
- switch (operator.getValue()) {
- case InfixOperator.IN_AND_VALUE:
- if (operandType == InternalInfixOperandType.INFIX_LEFT_OPERAND)
- break; // Do nothing with first operand
-
- testValidBitType(valueType, InfixOperator.IN_AND);
- testValidBitType(rightType, InfixOperator.IN_AND);
- if (valueType == Long.TYPE || rightType == Long.TYPE) {
- // If either side is long, the result will be long.
- value = new Long(getLong(value) & getLong(right));
- valueType = Long.TYPE;
- } else {
- // Else it is int. (even two shorts together produce an int).
- value = new Integer(getInt(value) & getInt(right));
- valueType = Integer.TYPE;
- }
- break;
- case InfixOperator.IN_CONDITIONAL_AND_VALUE:
- // This is tricky.
- // First if this is left type, then just continue.
- // Else if this other or last, then need to make it the new value.
- if (operandType != InternalInfixOperandType.INFIX_LEFT_OPERAND) {
- value = right;
- valueType = rightType;
- }
-
- //If the value is now false, we need to ignore the rest.
- if (valueType != Boolean.TYPE)
- throwInvalidInfix(operator, value);
- if (!((Boolean) value).booleanValue() && operandType != InternalInfixOperandType.INFIX_LAST_OPERAND)
- startInfixIgnore(); // Start ignoring because we know the value of the expression at this point. It is false.
- break;
- case InfixOperator.IN_CONDITIONAL_OR_VALUE:
- // This is tricky.
- // First if this is left type, then just continue.
- // Else if this other or last, then need to make it the new value.
- if (operandType != InternalInfixOperandType.INFIX_LEFT_OPERAND) {
- value = right;
- valueType = rightType;
- }
-
- //If the value is now true, we need to ignore the rest.
- if (valueType != Boolean.TYPE)
- throwInvalidInfix(operator, value);
- if (((Boolean) value).booleanValue() && operandType != InternalInfixOperandType.INFIX_LAST_OPERAND)
- startInfixIgnore(); // Start ignoring because we know the value of the expression at this point. It is true.
- break;
- case InfixOperator.IN_DIVIDE_VALUE:
- if (operandType == InternalInfixOperandType.INFIX_LEFT_OPERAND)
- break; // Do nothing with first operand
-
- testValidArithmeticType(valueType, InfixOperator.IN_DIVIDE);
- testValidArithmeticType(rightType, InfixOperator.IN_DIVIDE);
- if (valueType == Double.TYPE || rightType == Double.TYPE) {
- // If either side is double, the result will be double.
- value = new Double(getDouble(value) / getDouble(right));
- valueType = Double.TYPE;
- } else if (valueType == Float.TYPE || rightType == Float.TYPE) {
- // If either side is float, the result will be float.
- value = new Float(getFloat(value) / getFloat(right));
- valueType = Float.TYPE;
- } else if (valueType == Long.TYPE || rightType == Long.TYPE) {
- // If either side is long, the result will be long.
- value = new Long(getLong(value) / getLong(right));
- valueType = Long.TYPE;
- } else {
- // Else it will result in an int, even if both sides are short.
- value = new Integer(getInt(value) / getInt(right));
- valueType = Integer.TYPE;
- }
- break;
- case InfixOperator.IN_EQUALS_VALUE:
- if (operandType == InternalInfixOperandType.INFIX_LEFT_OPERAND)
- break; // Do nothing with first operand
- // We should never get extended operator for this, but we'll ignore the possibility.
- if (valueType.isPrimitive() && rightType.isPrimitive()) {
- // Primitives require more testing than just ==. boolean primitives
- if (valueType == Boolean.TYPE || rightType == Boolean.TYPE) {
- // If either side is a boolean, then the other side needs to be boolean for it to even try to be true.
- if (valueType != Boolean.TYPE || valueType != Boolean.TYPE)
- value = Boolean.FALSE;
- else
- value = (((Boolean) value).booleanValue() == ((Boolean) right).booleanValue()) ? Boolean.TRUE : Boolean.FALSE;
- } else {
- // Now do number tests since not boolean primitive, only numbers are left
- if (valueType == Double.TYPE || rightType == Double.TYPE) {
- // If either side is double, compare as double.
- value = (getDouble(value) == getDouble(right)) ? Boolean.TRUE : Boolean.FALSE;
- } else if (valueType == Float.TYPE || rightType == Float.TYPE) {
- // If either side is float, compare as float.
- value = (getFloat(value) == getFloat(right)) ? Boolean.TRUE : Boolean.FALSE;
- } else if (valueType == Long.TYPE || rightType == Long.TYPE) {
- // If either side is long, the compare as long.
- value = (getLong(value) == getLong(right)) ? Boolean.TRUE : Boolean.FALSE;
- } else {
- // Else it will compare as int, even if both sides are short.
- value = (getInt(value) == getInt(right)) ? Boolean.TRUE : Boolean.FALSE;
- }
- }
- } else if (valueType.isPrimitive() || rightType.isPrimitive())
- value = Boolean.FALSE; // Can't be true if one side prim and the other isn't
- else {
- // Just do object ==
- value = (value == right) ? Boolean.TRUE : Boolean.FALSE;
- }
- valueType = Boolean.TYPE; // We know result will be a boolean.
- break;
- case InfixOperator.IN_GREATER_VALUE:
- if (operandType == InternalInfixOperandType.INFIX_LEFT_OPERAND)
- break; // Do nothing with first operand
-
- testValidArithmeticType(valueType, InfixOperator.IN_GREATER);
- testValidArithmeticType(rightType, InfixOperator.IN_GREATER);
- if (valueType == Double.TYPE || rightType == Double.TYPE) {
- // If either side is double, compare will be double.
- value = (getDouble(value) > getDouble(right)) ? Boolean.TRUE : Boolean.FALSE;
- } else if (valueType == Float.TYPE || rightType == Float.TYPE) {
- // If either side is float, compare will be float.
- value = (getFloat(value) > getFloat(right)) ? Boolean.TRUE : Boolean.FALSE;
- } else if (valueType == Long.TYPE || rightType == Long.TYPE) {
- // If either side is long, compare will be long.
- value = (getLong(value) > getLong(right)) ? Boolean.TRUE : Boolean.FALSE;
- } else {
- // Else compare will be int, even if both sides are short.
- value = (getInt(value) > getInt(right)) ? Boolean.TRUE : Boolean.FALSE;
- }
- valueType = Boolean.TYPE; // We know result will be a boolean.
- break;
- case InfixOperator.IN_GREATER_EQUALS_VALUE:
- if (operandType == InternalInfixOperandType.INFIX_LEFT_OPERAND)
- break; // Do nothing with first operand
-
- testValidArithmeticType(valueType, InfixOperator.IN_GREATER_EQUALS);
- testValidArithmeticType(rightType, InfixOperator.IN_GREATER_EQUALS);
- if (valueType == Double.TYPE || rightType == Double.TYPE) {
- // If either side is double, compare will be double.
- value = (getDouble(value) >= getDouble(right)) ? Boolean.TRUE : Boolean.FALSE;
- } else if (valueType == Float.TYPE || rightType == Float.TYPE) {
- // If either side is float, compare will be float.
- value = (getFloat(value) >= getFloat(right)) ? Boolean.TRUE : Boolean.FALSE;
- } else if (valueType == Long.TYPE || rightType == Long.TYPE) {
- // If either side is long, compare will be long.
- value = (getLong(value) >= getLong(right)) ? Boolean.TRUE : Boolean.FALSE;
- } else {
- // Else compare will be int, even if both sides are short.
- value = (getInt(value) >= getInt(right)) ? Boolean.TRUE : Boolean.FALSE;
- }
- valueType = Boolean.TYPE; // We know result will be a boolean.
- break;
- case InfixOperator.IN_LEFT_SHIFT_VALUE:
- if (operandType == InternalInfixOperandType.INFIX_LEFT_OPERAND)
- break; // Do nothing with first operand
-
- testValidBitType(valueType, InfixOperator.IN_LEFT_SHIFT);
- testValidBitType(rightType, InfixOperator.IN_LEFT_SHIFT);
- if (valueType == Long.TYPE || rightType == Long.TYPE) {
- // If either side is long, the result will be long.
- value = new Long(getLong(value) << getLong(right));
- valueType = Long.TYPE;
- } else {
- // Else it is int. (even two shorts together produce an int).
- value = new Integer(getInt(value) << getInt(right));
- valueType = Integer.TYPE;
- }
- break;
- case InfixOperator.IN_LESS_VALUE:
- if (operandType == InternalInfixOperandType.INFIX_LEFT_OPERAND)
- break; // Do nothing with first operand
-
- testValidArithmeticType(valueType, InfixOperator.IN_LESS);
- testValidArithmeticType(rightType, InfixOperator.IN_LESS);
- if (valueType == Double.TYPE || rightType == Double.TYPE) {
- // If either side is double, compare will be double.
- value = (getDouble(value) < getDouble(right)) ? Boolean.TRUE : Boolean.FALSE;
- } else if (valueType == Float.TYPE || rightType == Float.TYPE) {
- // If either side is float, compare will be float.
- value = (getFloat(value) < getFloat(right)) ? Boolean.TRUE : Boolean.FALSE;
- } else if (valueType == Long.TYPE || rightType == Long.TYPE) {
- // If either side is long, compare will be long.
- value = (getLong(value) < getLong(right)) ? Boolean.TRUE : Boolean.FALSE;
- } else {
- // Else compare will be int, even if both sides are short.
- value = (getInt(value) < getInt(right)) ? Boolean.TRUE : Boolean.FALSE;
- }
- valueType = Boolean.TYPE; // We know result will be a boolean.
- break;
- case InfixOperator.IN_LESS_EQUALS_VALUE:
- if (operandType == InternalInfixOperandType.INFIX_LEFT_OPERAND)
- break; // Do nothing with first operand
-
- testValidArithmeticType(valueType, InfixOperator.IN_LESS_EQUALS);
- testValidArithmeticType(rightType, InfixOperator.IN_LESS_EQUALS);
- if (valueType == Double.TYPE || rightType == Double.TYPE) {
- // If either side is double, compare will be double.
- value = (getDouble(value) <= getDouble(right)) ? Boolean.TRUE : Boolean.FALSE;
- } else if (valueType == Float.TYPE || rightType == Float.TYPE) {
- // If either side is float, compare will be float.
- value = (getFloat(value) <= getFloat(right)) ? Boolean.TRUE : Boolean.FALSE;
- } else if (valueType == Long.TYPE || rightType == Long.TYPE) {
- // If either side is long, compare will be long.
- value = (getLong(value) <= getLong(right)) ? Boolean.TRUE : Boolean.FALSE;
- } else {
- // Else compare will be int, even if both sides are short.
- value = (getInt(value) <= getInt(right)) ? Boolean.TRUE : Boolean.FALSE;
- }
- valueType = Boolean.TYPE; // We know result will be a boolean.
- break;
- case InfixOperator.IN_MINUS_VALUE:
- if (operandType == InternalInfixOperandType.INFIX_LEFT_OPERAND)
- break; // Do nothing with first operand
-
- testValidArithmeticType(valueType, InfixOperator.IN_MINUS);
- testValidArithmeticType(rightType, InfixOperator.IN_MINUS);
- if (valueType == Double.TYPE || rightType == Double.TYPE) {
- // If either side is double, the result will be double.
- value = new Double(getDouble(value) - getDouble(right));
- valueType = Double.TYPE;
- } else if (valueType == Float.TYPE || rightType == Float.TYPE) {
- // If either side is float, the result will be float.
- value = new Float(getFloat(value) - getFloat(right));
- valueType = Float.TYPE;
- } else if (valueType == Long.TYPE || rightType == Long.TYPE) {
- // If either side is long, the result will be long.
- value = new Long(getLong(value) - getLong(right));
- valueType = Long.TYPE;
- } else {
- // Else it will result in an int, even if both sides are short.
- value = new Integer(getInt(value) - getInt(right));
- valueType = Integer.TYPE;
- }
- break;
- case InfixOperator.IN_NOT_EQUALS_VALUE:
- if (operandType == InternalInfixOperandType.INFIX_LEFT_OPERAND)
- break; // Do nothing with first operand
- // We should never get extended operator for this, but we'll ignore the possibility.
- if (valueType.isPrimitive() && rightType.isPrimitive()) {
- // Primitives require more testing than just ==. boolean primitives
- if (valueType == Boolean.TYPE || rightType == Boolean.TYPE) {
- // If either side is a boolean, then the other side needs to be boolean for it to even try to be true.
- if (valueType != Boolean.TYPE || valueType != Boolean.TYPE)
- value = Boolean.TRUE;
- else
- value = (((Boolean) value).booleanValue() != ((Boolean) right).booleanValue()) ? Boolean.TRUE : Boolean.FALSE;
- } else {
- // Now do number tests since not boolean primitive, only numbers are left
- if (valueType == Double.TYPE || rightType == Double.TYPE) {
- // If either side is double, compare as double.
- value = (getDouble(value) != getDouble(right)) ? Boolean.TRUE : Boolean.FALSE;
- } else if (valueType == Float.TYPE || rightType == Float.TYPE) {
- // If either side is float, compare as float.
- value = (getFloat(value) != getFloat(right)) ? Boolean.TRUE : Boolean.FALSE;
- } else if (valueType == Long.TYPE || rightType == Long.TYPE) {
- // If either side is long, the compare as long.
- value = (getLong(value) != getLong(right)) ? Boolean.TRUE : Boolean.FALSE;
- } else {
- // Else it will compare as int, even if both sides are short.
- value = (getInt(value) != getInt(right)) ? Boolean.TRUE : Boolean.FALSE;
- }
- }
- } else if (valueType.isPrimitive() || rightType.isPrimitive())
- value = Boolean.TRUE; // Must be true if one side prim and the other isn't
- else {
- // Just do object !=
- value = (value != right) ? Boolean.TRUE : Boolean.FALSE;
- }
- valueType = Boolean.TYPE; // We know result will be a boolean.
- break;
- case InfixOperator.IN_OR_VALUE:
- if (operandType == InternalInfixOperandType.INFIX_LEFT_OPERAND)
- break; // Do nothing with first operand
-
- testValidBitType(valueType, InfixOperator.IN_OR);
- testValidBitType(rightType, InfixOperator.IN_OR);
- if (valueType == Long.TYPE || rightType == Long.TYPE) {
- // If either side is long, the result will be long.
- value = new Long(getLong(value) | getLong(right));
- valueType = Long.TYPE;
- } else {
- // Else it is int. (even two shorts together produce an int).
- value = new Integer(getInt(value) | getInt(right));
- valueType = Integer.TYPE;
- }
- break;
- case InfixOperator.IN_PLUS_VALUE:
- if (operandType == InternalInfixOperandType.INFIX_LEFT_OPERAND) {
- if (valueType == String.class) {
- // Special. left argument is a string, so we want to store a string buffer instead
- // since we know we will be appending to it.
- value = new StringBuffer((String) value);
- }
- break; // Do nothing with first operand
- }
-
- testValidPlusType(valueType, rightType);
- if (valueType == String.class || rightType == String.class) {
- // Special we have a string on one side. Need to do it as strings instead.
- // We are going to be tricky in that we will store a StringBuffer on the stack (if not last operand)
- // but call it a string.
- StringBuffer sb = null;
- if (valueType == String.class) {
- sb = (StringBuffer) value; // We know that if the value (left) is string type, we've already converted it to buffer.
- } else {
- // The right is the one that introduces the string, so we change the value over to a string buffer.
- sb = new StringBuffer(((String) right).length()+16); // We can't put the value in yet, need to get left into it.
- appendToBuffer(sb, value, valueType); // Put the left value in now
- value = sb;
- valueType = String.class; // Make it a string class
- }
- appendToBuffer(sb, right, rightType);
- // Now if we are the last operand, we should get rid of the buffer and put a true string back in.
- if (operandType == InternalInfixOperandType.INFIX_LAST_OPERAND)
- value = sb.toString();
- } else if (valueType == Double.TYPE || rightType == Double.TYPE) {
- // If either side is double, the result will be double.
- value = new Double(getDouble(value) + getDouble(right));
- valueType = Double.TYPE;
- } else if (valueType == Float.TYPE || rightType == Float.TYPE) {
- // If either side is float, the result will be float.
- value = new Float(getFloat(value) + getFloat(right));
- valueType = Float.TYPE;
- } else if (valueType == Long.TYPE || rightType == Long.TYPE) {
- // If either side is long, the result will be long.
- value = new Long(getLong(value) + getLong(right));
- valueType = Long.TYPE;
- } else {
- // Else it will result in an int, even if both sides are short.
- value = new Integer(getInt(value) + getInt(right));
- valueType = Integer.TYPE;
- }
- break;
- case InfixOperator.IN_REMAINDER_VALUE:
- if (operandType == InternalInfixOperandType.INFIX_LEFT_OPERAND)
- break; // Do nothing with first operand
-
- testValidArithmeticType(valueType, InfixOperator.IN_REMAINDER);
- testValidArithmeticType(rightType, InfixOperator.IN_REMAINDER);
- if (valueType == Double.TYPE || rightType == Double.TYPE) {
- // If either side is double, the result will be double.
- value = new Double(getDouble(value) % getDouble(right));
- valueType = Double.TYPE;
- } else if (valueType == Float.TYPE || rightType == Float.TYPE) {
- // If either side is float, the result will be float.
- value = new Float(getFloat(value) % getFloat(right));
- valueType = Float.TYPE;
- } else if (valueType == Long.TYPE || rightType == Long.TYPE) {
- // If either side is long, the result will be long.
- value = new Long(getLong(value) % getLong(right));
- valueType = Long.TYPE;
- } else {
- // Else it will result in an int, even if both sides are short.
- value = new Integer(getInt(value) % getInt(right));
- valueType = Integer.TYPE;
- }
- break;
- case InfixOperator.IN_RIGHT_SHIFT_SIGNED_VALUE:
- if (operandType == InternalInfixOperandType.INFIX_LEFT_OPERAND)
- break; // Do nothing with first operand
-
- testValidBitType(valueType, InfixOperator.IN_RIGHT_SHIFT_SIGNED);
- testValidBitType(rightType, InfixOperator.IN_RIGHT_SHIFT_SIGNED);
- if (valueType == Long.TYPE || rightType == Long.TYPE) {
- // If either side is long, the result will be long.
- value = new Long(getLong(value) >> getLong(right));
- valueType = Long.TYPE;
- } else {
- // Else it is int. (even two shorts together produce an int).
- value = new Integer(getInt(value) >> getInt(right));
- valueType = Integer.TYPE;
- }
- break;
- case InfixOperator.IN_RIGHT_SHIFT_UNSIGNED_VALUE:
- if (operandType == InternalInfixOperandType.INFIX_LEFT_OPERAND)
- break; // Do nothing with first operand
-
- testValidBitType(valueType, InfixOperator.IN_RIGHT_SHIFT_UNSIGNED);
- testValidBitType(rightType, InfixOperator.IN_RIGHT_SHIFT_UNSIGNED);
- if (valueType == Long.TYPE || rightType == Long.TYPE) {
- // If either side is long, the result will be long.
- value = new Long(getLong(value) >>> getLong(right));
- valueType = Long.TYPE;
- } else {
- // Else it is int. (even two shorts together produce an int).
- value = new Integer(getInt(value) >>> getInt(right));
- valueType = Integer.TYPE;
- }
- break;
- case InfixOperator.IN_TIMES_VALUE:
- if (operandType == InternalInfixOperandType.INFIX_LEFT_OPERAND)
- break; // Do nothing with first operand
-
- testValidArithmeticType(valueType, InfixOperator.IN_TIMES);
- testValidArithmeticType(rightType, InfixOperator.IN_TIMES);
- if (valueType == Double.TYPE || rightType == Double.TYPE) {
- // If either side is double, the result will be double.
- value = new Double(getDouble(value) * getDouble(right));
- valueType = Double.TYPE;
- } else if (valueType == Float.TYPE || rightType == Float.TYPE) {
- // If either side is float, the result will be float.
- value = new Float(getFloat(value) * getFloat(right));
- valueType = Float.TYPE;
- } else if (valueType == Long.TYPE || rightType == Long.TYPE) {
- // If either side is long, the result will be long.
- value = new Long(getLong(value) * getLong(right));
- valueType = Long.TYPE;
- } else {
- // Else it will result in an int, even if both sides are short.
- value = new Integer(getInt(value) * getInt(right));
- valueType = Integer.TYPE;
- }
- break;
- case InfixOperator.IN_XOR_VALUE:
- if (operandType == InternalInfixOperandType.INFIX_LEFT_OPERAND)
- break; // Do nothing with first operand
-
- testValidBitType(valueType, InfixOperator.IN_XOR);
- testValidBitType(rightType, InfixOperator.IN_XOR);
- if (valueType == Long.TYPE || rightType == Long.TYPE) {
- // If either side is long, the result will be long.
- value = new Long(getLong(value) ^ getLong(right));
- valueType = Long.TYPE;
- } else {
- // Else it is int. (even two shorts together produce an int).
- value = new Integer(getInt(value) ^ getInt(right));
- valueType = Integer.TYPE;
- }
- break;
- }
-
- if (traceOn)
- printObjectAndType(value, valueType);
- pushExpressionValue(value, valueType); // Push the result back on the stack.
-
- } catch (IllegalArgumentException e) {
- processException(e);
- } catch (NoExpressionValueException e) {
- processException(e);
- } catch (RuntimeException e) {
- processException(e);
- }
- } finally {
- if (traceOn)
- printTraceEnd();
- }
-
- }
-
- /**
- * Start ignoring rest of the current infix expression.
- *
- * @since 1.1.0
- */
- private void startInfixIgnore() {
- ignoreExpression = INFIX_IGNORE;
- infixIgnoreNestCount = infixNesting; // Ignore until we get back to the current nesting.
-
- }
-
- /**
- * Get int value of the primitive wrapper bean passed in (must be either a <code>Number/code> or <code>Character</code>.
- * Anything else will cause a class cast error.
- * <p>
- * This is a helper method for expression processer to get the int value of the object. Since it is a helper method it doesn't
- * check nor process the exception. It throws it. Callers must handle it as they see fit.
- * @param bean
- * @return the int value of the number/character
- * @throws ClassCastException
- *
- * @since 1.0.0
- */
- protected final int getInt(Object bean) throws ClassCastException {
- return (bean instanceof Number) ? ((Number) bean).intValue() : ((Character) bean).charValue();
- }
-
- /**
- * Get float value of the primitive wrapper bean passed in (must be either a <code>Number/code> or <code>Character</code>.
- * Anything else will cause a class cast error.
- * <p>
- * This is a helper method for expression processer to get the float value of the object. Since it is a helper method it doesn't
- * check nor process the exception. It throws it. Callers must handle it as they see fit.
- * @param bean
- * @return float value of the Number/character
- * @throws ClassCastException
- * @since 1.0.0
- */
- protected final float getFloat(Object bean) throws ClassCastException {
- return (bean instanceof Number) ? ((Number) bean).floatValue() : ((Character) bean).charValue();
- }
-
- /**
- * Get double value of the primitive wrapper bean passed in (must be either a <code>Number/code> or <code>Character</code>.
- * Anything else will cause a class cast error.
- * <p>
- * This is a helper method for expression processer to get the float value of the object. Since it is a helper method it doesn't
- * check nor process the exception. It throws it. Callers must handle it as they see fit.
- *
- * @param bean
- * @return double value of the Number/Character.
- * @throws ClassCastException
- * @since 1.0.0
- */
- protected final double getDouble(Object bean) throws ClassCastException {
- return (bean instanceof Number) ? ((Number) bean).doubleValue() : ((Character) bean).charValue();
- }
-
- /**
- * Get long value of the primitive wrapper bean passed in (must be either a <code>Number/code> or <code>Character</code>.
- * Anything else will cause a class cast error.
- * <p>
- * This is a helper method for expression processer to get the float value of the object. Since it is a helper method it doesn't
- * check nor process the exception. It throws it. Callers must handle it as they see fit.
- *
- * @param bean
- * @return
- * @throws ClassCastException
- * @since 1.0.0
- */
- protected final long getLong(Object bean) throws ClassCastException {
- return (bean instanceof Number) ? ((Number) bean).longValue() : ((Character) bean).charValue();
- }
-
- private void throwInvalidInfix(InfixOperator operator, Object value) throws IllegalArgumentException {
- throw new IllegalArgumentException(MessageFormat.format(InitparserTreeMessages.getString("ExpressionProcesser.InvalidOperandOfOperator_EXC_"), new Object[] {value != null ? value.toString() : null, operator.toString()})); //$NON-NLS-1$
- }
-
- private void testValidBitType(Class type, InfixOperator operator) {
- if (!type.isPrimitive() || type == Boolean.TYPE || type == Double.TYPE|| type == Float.TYPE)
- throwInvalidInfix(operator, type);
- }
-
- private void testValidArithmeticType(Class type, InfixOperator operator) {
- if (!type.isPrimitive() || type == Boolean.TYPE)
- throwInvalidInfix(operator, type);
- }
-
- private void testValidPlusType(Class left, Class right) {
- // Plus is special in that string objects are also valid.
- if (left == String.class || right == String.class)
- return; // As long as one side is string. Anything is valid.
- // If neither is string, then standard arithmetic test.
- testValidArithmeticType(left, InfixOperator.IN_PLUS);
- testValidArithmeticType(right, InfixOperator.IN_PLUS);
- }
-
- private void appendToBuffer(StringBuffer sb, Object value, Class valueType) {
- if (value == null)
- sb.append((Object)null);
- else if (valueType == String.class)
- sb.append((String) value);
- else if (valueType.isPrimitive()) {
- switch (getEnumForPrimitive(valueType)) {
- case BOOLEAN:
- sb.append(((Boolean) value).booleanValue());
- break;
- case BYTE:
- sb.append(((Number) value).byteValue());
- break;
- case CHAR:
- sb.append(((Character) value).charValue());
- break;
- case DOUBLE:
- sb.append(((Number) value).doubleValue());
- break;
- case FLOAT:
- sb.append(((Number) value).floatValue());
- break;
- case INT:
- sb.append(((Number) value).intValue());
- break;
- case LONG:
- sb.append(((Number) value).longValue());
- break;
- case SHORT:
- sb.append(((Number) value).shortValue());
- break;
- }
- } else {
- // Just an object.
- sb.append(value);
- }
- }
-
- /**
- * Push the array access expression.
- *
- * @param indexCount Number of dimensions being accessed
- * @since 1.0.0
- */
- public final void pushArrayAccess(int indexCount) {
- boolean ignore = (ignoreExpression != null || errorOccurred);
-
- if (traceOn) {
- printTrace("Array Access["+indexCount+']', ignore); //$NON-NLS-1$
- }
- try {
- if (ignore)
- return;
-
- try {
- // We need to pop off the args. The topmost will be the rightmost index, and the bottom most will be the array itself.
- int[] arguments = new int[indexCount];
- // Fill the arg array in reverse order.
- for(int i=indexCount-1; i >= 0; i--) {
- Object index = popExpression();
- Class indexType = popExpressionType(false);
- if (indexType.isPrimitive() && (indexType == Integer.TYPE || indexType == Short.TYPE || indexType == Character.TYPE || indexType == Byte.TYPE)) {
- arguments[i] = getInt(index);
- } else
- throwClassCast(Integer.TYPE, index);
- }
-
- Object array = popExpression();
- Class arrayType = popExpressionType(false);
- if (arrayType.isArray()) {
- // First figure out how many dimensions are available. Stop when we hit indexcount because we won't be going further.
- int dimcount = 0;
- Class[] componentTypes = new Class[indexCount]; //
- Class componentType = arrayType;
- while (dimcount < indexCount && componentType.isArray()) {
- componentTypes[dimcount++] = componentType = componentType.getComponentType();
- }
-
- if (dimcount < indexCount)
- throw new IllegalArgumentException(MessageFormat.format(InitparserTreeMessages.getString("ExpressionProcesser.XIsGreaterThanNumberOfDimensionsInArray_EXC_"), new Object[] {new Integer(indexCount), new Integer(dimcount)})); //$NON-NLS-1$
-
- // Now start accessing one index at a time, stop just before the last one. The last one will be turned into an ArrayAccessReference.
- Object value = array; // Final value, start with full array.
- int pullCount = indexCount-1;
- for(int i=0; i<pullCount; i++) {
- value = Array.get(value, arguments[i]);
- }
- ArrayAccessReference arrayValue = ArrayAccessReference.createArrayAccessReference(value, arguments[pullCount]);
- if (traceOn)
- printObjectAndType(arrayValue, componentTypes[pullCount]);
- pushExpressionValue(arrayValue, componentTypes[pullCount]);
- } else
- throw new IllegalArgumentException(MessageFormat.format(InitparserTreeMessages.getString("ExpressionProcesser.NotAnArray_EXC_"), new Object[] {arrayType})); //$NON-NLS-1$
-
- } catch (NoExpressionValueException e) {
- processException(e);
- } catch (RuntimeException e) {
- processException(e);
- }
- } finally {
- if (traceOn)
- printTraceEnd();
- }
- }
-
- /**
- * Push the array creation request.
- *
- * @param arrayType The type of the array
- * @param dimensionCount The number of dimensions being initialized. Zero if using an initializer.
- * @since 1.0.0
- */
- public final void pushArrayCreation(Class arrayType, int dimensionCount) {
- boolean ignore = (ignoreExpression != null || errorOccurred);
- if (traceOn)
- printTrace("Array Creation: "+arrayType.getName()+'['+dimensionCount+']', ignore); //$NON-NLS-1$
-
- try {
- if (ignore)
- return;
-
- try {
- if (dimensionCount == 0) {
- // The top value is the array itself, from the array initializer.
- // So we do nothing.
- } else {
- // Strip off dimensionCounts from the array type, e.g.
- // ArrayType is int[][][]
- // Dimensioncount is 2
- // Then we need to strip two componenttypes off of the array type
- // wind up with int[]
- // This is necessary because Array.new will add those dimensions back
- // on through the dimension count.
- Class componentType = arrayType;
- for(int i=0; i < dimensionCount && componentType != null; i++)
- componentType = componentType.getComponentType();
- if (componentType == null)
- throw new IllegalArgumentException(MessageFormat.format(InitparserTreeMessages.getString("ExpressionProcesser.ArraytypeHasFewerDimensionsThanRequested_EXC_"), new Object[] {arrayType, new Integer(dimensionCount)})); //$NON-NLS-1$
-
- // We need to pull in the dimension initializers. They are stacked in reverse order.
- int[] dimInit = new int[dimensionCount];
- for(int i=dimensionCount-1; i >= 0; i--) {
- Object index = popExpression();
- Class dimType = popExpressionType(false);
- if (dimType.isPrimitive() && (dimType == Integer.TYPE || dimType == Short.TYPE || dimType == Character.TYPE || dimType == Byte.TYPE)) {
- dimInit[i] = getInt(index);
- } else
- throwClassCast(Integer.TYPE, index);
- }
-
- // Finally create the array.
- Object array = Array.newInstance(componentType, dimInit);
- pushExpressionValue(array, arrayType);
- }
- } catch (RuntimeException e) {
- processException(e);
- } catch (NoExpressionValueException e) {
- processException(e);
- }
- } finally {
- if (traceOn)
- printTraceEnd();
- }
-
- }
-
- /**
- * Push the array initializer request.
- *
- * @param arrayType The original type of the array to create.
- * @param stripCount the count of how many dimensions to strip to get the type needed for this initializer.
- * @param expressionCount
- * @since 1.0.0
- */
- public final void pushArrayInitializer(Class arrayType, int stripCount, int expressionCount) {
- boolean ignore = (ignoreExpression != null || errorOccurred);
-
- if (traceOn)
- printTrace("Initialize Array: "+arrayType.getName()+'{'+expressionCount+'}', ignore); //$NON-NLS-1$
-
- try {
- if (ignore)
- return;
-
- try {
- if (!arrayType.isArray()) {
- // It is not an array type.
- throw new ClassCastException(MessageFormat.format(InitparserTreeMessages.getString("ExpressionProcesser.CannotCastXToY_EXC_"), new Object[] {arrayType, "array"})); //$NON-NLS-1$ //$NON-NLS-2$
- }
- // Strip off the number of dimensions specified.
- while(stripCount-->0) {
- arrayType = arrayType.getComponentType();
- }
- Object[] dimValues = null;
- if (expressionCount > 0) {
- // We need to pull in the initializers. They are stacked in reverse order.
- dimValues = new Object[expressionCount];
- for (int i = expressionCount - 1; i >= 0; i--) {
- Object dimValue = dimValues[i] = popExpression();
- Class dimType = popExpressionType(false);
- if (arrayType.isPrimitive()) {
- if (dimValue == null || !dimType.isPrimitive())
- throwClassCast(arrayType, dimType);
- // A little trickier. Can assign short to an int, but can't assign long to an int. Widening is permitted.
- if (arrayType != dimType) {
- int compEnum = getEnumForPrimitive(arrayType);
- int dimEnum = getEnumForPrimitive(dimType);
- if (compEnum == BOOLEAN || dimEnum == BOOLEAN)
- throwClassCast(arrayType, dimType);
- int dimValueAsInt = getInt(dimValue);
- switch (compEnum) {
- case BYTE :
- // Can accept byte, short, char, or int as long as value is <= byte max. Can't accept long, double, float at all.
- // Note: This isn't actually true. The max/min test is only valid if the value is a literal, not an expression,
- // however, at this point in time we no longer know this. So we will simply allow it.
- if (dimEnum > INT || dimValueAsInt > Byte.MAX_VALUE || dimValueAsInt < Byte.MIN_VALUE)
- throwClassCast(arrayType, dimType);
- // But need to be changed to appropriate type for the array.set to work.
- dimValues[i] = new Byte((byte)dimValueAsInt);
- break;
- case SHORT :
- // Can accept byte, short, char, or int as long as value is <= byte max. Can't accept long, double, float at all.
- // Note: This isn't actually true. The max/min test is only valid if the value is a literal, not an expression,
- // however, at this point in time we no longer know this. So we will simply allow it.
- if (dimEnum > INT || dimValueAsInt > Short.MAX_VALUE || dimValueAsInt < Short.MIN_VALUE)
- throwClassCast(arrayType, dimType);
- // But need to be changed to appropriate type for the array.set to work.
- dimValues[i] = new Short((short)dimValueAsInt);
- break;
- case CHAR :
- // Can accept byte, short, char, or int as long as value is <= byte max. Can't accept long, double, float at all.
- // Note: This isn't actually true. The max/min test is only valid if the value is a literal, not an expression,
- // however, at this point in time we no longer know this. So we will simply allow it.
- if (dimEnum > INT || dimValueAsInt > Character.MAX_VALUE || dimValueAsInt < Character.MIN_VALUE)
- throwClassCast(arrayType, dimType);
- // But need to be changed to appropriate type for the array.set to work.
- dimValues[i] = new Character((char)dimValueAsInt);
- break;
- case INT :
- // Can accept byte, short, char, or int. Can't accept long, double, float at all.
- if (dimEnum > INT)
- throwClassCast(arrayType, dimType);
- // But need to be changed to appropriate type for the array.set to work.
- dimValues[i] = new Integer(dimValueAsInt);
- break;
- case LONG :
- // Can accept byte, short, char, int, or long. Can't accept double, float at all.
- if (dimEnum > LONG)
- throwClassCast(arrayType, dimType);
- // But need to be changed to appropriate type for the array.set to work.
- dimValues[i] = new Long(getLong(dimValue));
- break;
- case FLOAT :
- // Can accept byte, short, char, int, long, or float. Can't accept double at all.
- if (dimEnum > FLOAT)
- throwClassCast(arrayType, dimType);
- // But need to be changed to appropriate type for the array.set to work.
- dimValues[i] = new Float(getFloat(dimValue));
- break;
- case DOUBLE :
- // But need to be changed to appropriate type for the array.set to work.
- dimValues[i] = new Double(getDouble(dimValue));
- break;
-
- }
- }
- // Compatible, so ok.
- } else if (dimType != MethodHelper.NULL_TYPE && !arrayType.isAssignableFrom(dimType)) {
- // If it is NULL_TYPE, then this is a pushed null. This is always assignable to a non-primitive.
- // So we don't enter here in that case. However, a null that was returned from some expression
- // won't have a NULL_TYPE, it will instead have the expected return type. That must be used
- // in the assignment instead. That is because in java it uses the expected type to determine
- // compatibility, not the actual type.
- throwClassCast(arrayType, dimType);
- }
- }
-
- }
-
- // Now we finally create the array.
- Object array = Array.newInstance(arrayType, new int[] {expressionCount});
- for (int i = 0; i < expressionCount; i++) {
- Array.set(array, i, dimValues[i]);
- }
-
- pushExpressionValue(array, array.getClass()); // Adjust to true array type, not the incoming type (which is one dimension too small).
-
- } catch (RuntimeException e) {
- processException(e);
- } catch (NoExpressionValueException e) {
- processException(e);
- }
- } finally {
- if (traceOn)
- printTraceEnd();
- }
-
- }
-
- /**
- * Push the class instance creation request.
- *
- * @param type The type to create an instance of
- * @param argumentCount The number of arguments (which are stored on the stack). * @throws NoExpressionValueException
- * @since 1.0.0
- */
- public final void pushClassInstanceCreation(Class type, int argumentCount) {
- boolean ignore = (ignoreExpression != null || errorOccurred);
-
- if (traceOn)
- printTrace("Create Class: "+type+" (", ignore); //$NON-NLS-1$ //$NON-NLS-2$
- try {
- if (ignore)
- return;
-
- try {
- // We need to pull in the arguments. They are stacked in reverse order.
- Object value = null; // The new instance.
- Object[] args = new Object[argumentCount];
- Class[] argTypes = new Class[argumentCount];
- for (int i = argumentCount - 1; i >= 0; i--) {
- args[i] = popExpression();
- argTypes[i] = popExpressionType(false);
- }
-
- // Now we need to find the appropriate constructor.
- Constructor ctor;
- ctor = MethodHelper.findCompatibleConstructor(type, argTypes);
- if (traceOn) {
- if (argumentCount == 0) {
- // No args, just do default ctor.
- System.out.print("Default ctor)"); //$NON-NLS-1$
- } else {
- System.out.print(ctor);
- System.out.print(')');
- }
- }
- value = ctor.newInstance(args);
-
- pushExpressionValue(value, type);
- } catch (RuntimeException e) {
- processException(e);
- } catch (NoExpressionValueException e) {
- processException(e);
- } catch (InstantiationException e) {
- processException(e);
- } catch (IllegalAccessException e) {
- processException(e);
- } catch (InvocationTargetException e) {
- processException(e);
- } catch (NoSuchMethodException e) {
- processException(e);
- } catch (AmbiguousMethodException e) {
- processException(e);
- } catch (LinkageError e) {
- processException(e);
- } catch (Error e) {
- if (e.getClass() == Error.class) {
- // If exactly Error.class, then process it. This is hopefully just a "unresolved compilation error".
- processException(new UnresolvedCompilationError(e));
- } else
- throw e; // All subclasses we throw on out.
- }
- } finally {
- if (traceOn)
- printTraceEnd();
- }
-
- }
-
- /**
- * Push the field access expression.
- * @param field String for fieldname, or a java.lang.reflect.Field.
- * @param fieldIsString <code>true</code> if field is a string name, and not a java.lang.reflect.Field.
- * @param hasReceiver
- *
- * @since 1.0.0
- */
- public final void pushFieldAccess(Object field, boolean fieldIsString, boolean hasReceiver) {
- try {
- if (ignoreExpression != null || errorOccurred) {
- if (traceOn)
- printTrace("Field Access", true); //$NON-NLS-1$
- return;
- }
-
- if (traceOn)
- printTrace("Field Access: ", false); //$NON-NLS-1$
- try {
- // Get the receiver off of the stack.
- Object receiver = null;
- Class receiverType = null;
- if (hasReceiver) {
- receiver = popExpression();
- receiverType = popExpressionType(false);
- }
-
- // Find the field.
- Field reflectField = fieldIsString ? receiverType.getField((String) field) : (Field) field;
- // Access the field.
- Object value = FieldAccessReference.createFieldAccessReference(reflectField, receiver);
- Class valueType = reflectField.getType();
- if (traceOn) {
- System.out.print("Field: "); //$NON-NLS-1$
- if (fieldIsString)
- System.out.print("(looked up) "); //$NON-NLS-1$
- System.out.print(reflectField);
- System.out.print(">"); //$NON-NLS-1$
- printObjectAndType(value, valueType);
- }
-
- pushExpressionValue(value, valueType);
- } catch (RuntimeException e) {
- processException(e);
- } catch (NoExpressionValueException e) {
- processException(e);
- } catch (NoSuchFieldException e) {
- processException(e);
- }
- } finally {
- if (traceOn)
- printTraceEnd();
- }
-
- }
-
- /**
- * Push the method invocation expression.
- * @param method
- * @param methodIsString <code>true</code> if method is a string (so string name) or else it is a java.lang.reflect.Method.
- * @param hasReceiver
- * @param argCount
- * @since 1.0.0
- */
- public final void pushMethodInvocation(Object method, boolean methodIsString, boolean hasReceiver, int argCount) {
- try {
- if (ignoreExpression != null || errorOccurred) {
- if (traceOn)
- printTrace("Invoke", true); //$NON-NLS-1$
- return;
- }
-
- if (traceOn)
- printTrace("Invoke: ", false); //$NON-NLS-1$
-
- Method reflectMethod = null;
- try {
- // We need to pull in the arguments. They are stacked in reverse order.
- Object[] args = new Object[argCount];
- Class[] argTypes = new Class[argCount];
- for (int i = argCount - 1; i >= 0; i--) {
- args[i] = popExpression();
- argTypes[i] = popExpressionType(false);
- }
-
- // Now get receiver
- Object receiver = null;
- Class receiverType = null;
- if (hasReceiver) {
- receiver = popExpression();
- receiverType = popExpressionType(false);
- }
-
- // Now we need to find the appropriate method. If it is a string then there must be a receiver, otherwise no way to know.
- if (methodIsString) {
- reflectMethod = MethodHelper.findCompatibleMethod(receiverType, (String) method, argTypes);
- } else
- reflectMethod = (Method) method;
-
- if (traceOn && reflectMethod != null) {
- System.out.print("Method: "); //$NON-NLS-1$
- if (methodIsString)
- System.out.print("(looked up) "); //$NON-NLS-1$
- System.out.print(reflectMethod);
- }
-
- if (!Modifier.isStatic(reflectMethod.getModifiers()) && receiver == null)
- throw new NullPointerException("No receiver for non-static method: "+reflectMethod.toString()); //$NON-NLS-1$
-
- Object value = reflectMethod.invoke(receiver, args);
-
- if (traceOn) {
- System.out.print(" returns: "); //$NON-NLS-1$
- printObjectAndType(value, reflectMethod.getReturnType());
- }
- pushExpressionValue(value, reflectMethod.getReturnType());
- } catch (RuntimeException e) {
- processException(fixUpMethodException(e, reflectMethod));
- } catch (NoExpressionValueException e) {
- processException(fixUpMethodException(e, reflectMethod));
- } catch (IllegalAccessException e) {
- processException(fixUpMethodException(e, reflectMethod));
- } catch (InvocationTargetException e) {
- processException(fixUpMethodException(e.getCause(), reflectMethod));
- } catch (NoSuchMethodException e) {
- processException(e);
- } catch (AmbiguousMethodException e) {
- processException(e);
- }
- } finally {
- if (traceOn)
- printTraceEnd();
- }
-
- }
-
- /*
- * Many of the exceptions don't add in what method had the error, so we
- * will do that here.
- */
- private Throwable fixUpMethodException(Throwable e, Method method) {
- if (method == null)
- return e;
- try {
- String msg = e.getMessage();
- Constructor eWithStringCtor = e.getClass().getConstructor(new Class[] {String.class});
- String newMsg;
- if (msg == null) {
- newMsg = method.toString();
- } else {
- newMsg = method.toString()+": \""+msg+'\"'; //$NON-NLS-1$
- }
- Exception fixedupE = (Exception) eWithStringCtor.newInstance(new Object[] {newMsg});
- fixedupE.setStackTrace(e.getStackTrace());
- return fixedupE;
- } catch (Exception e1) {
- return e;
- }
-
- }
-
- private static final Object CONDITIONAL_IGNORE = "CONDITIONAL IGNORE"; // Flag for conditional in ingore //$NON-NLS-1$
- private int conditionalNesting = 0; // Nesting of conditional expressions.
- private int conditionalIgnoreNestCount = 0; // When ignoring conditional expressions, ignore until this nest count.
- private boolean skipTruePart;
-
- /**
- * Push a conditional expression. It can be any clause of the conditional (test, true, or false clause).
- * @param expressionType
- *
- * @since 1.0.0
- */
- public final void pushConditional(InternalConditionalOperandType expressionType) {
- try {
- boolean ignore = true;
- try {
- if (errorOccurred)
- return;
- // Slightly different here in that if an ignoring occurred we still need to process at least part of it so that
- // we can get the expression grouping correct.
- switch (expressionType.getValue()) {
- case InternalConditionalOperandType.CONDITIONAL_TEST_VALUE:
- conditionalNesting++;
- break;
- case InternalConditionalOperandType.CONDITIONAL_TRUE_VALUE:
- if (skipTruePart && ignoreExpression == CONDITIONAL_IGNORE && conditionalIgnoreNestCount == conditionalNesting) {
- // stop ignoring, we've ignored the true condition of interest.
- ignoreExpression = null;
- return; // However, leave because since this condition was ignored.
- }
- break;
- case InternalConditionalOperandType.CONDITIONAL_FALSE_VALUE:
- int currentNesting = conditionalNesting--;
- if (ignoreExpression == CONDITIONAL_IGNORE && conditionalIgnoreNestCount == currentNesting) {
- // stop ignoring, we've ignored the false condition of interest.
- ignoreExpression = null;
- return; // However, leave because since this condition was ignored.
- }
- }
-
- if (ignoreExpression != null)
- return;
- ignore = false;
- } finally {
- if (traceOn)
- printTrace("Conditional "+expressionType, ignore); //$NON-NLS-1$
- }
-
- try {
- switch (expressionType.getValue()) {
- case InternalConditionalOperandType.CONDITIONAL_TEST_VALUE:
- Object condition = popExpression();
- Class type = popExpressionType(false);
- if (type != Boolean.TYPE)
- throwClassCast(Boolean.TYPE, condition);
- if (((Boolean) condition).booleanValue()) {
- // Condition was true.
- // Do nothing. Let true condition be processed.
- } else {
- // Condition was false.
- skipTruePart = true; // Tell the true condition should be ignored.
- ignoreExpression = CONDITIONAL_IGNORE;
- conditionalIgnoreNestCount = conditionalNesting;
- }
- // We don't put anything back on the stack because the condition test is not ever returned.
- // The appropriate true or false condition evaluation will be left on the stack.
- break;
- case InternalConditionalOperandType.CONDITIONAL_TRUE_VALUE:
- skipTruePart = false; // Tell the false condition should be ignored.
- ignoreExpression = CONDITIONAL_IGNORE;
- conditionalIgnoreNestCount = conditionalNesting;
- break;
- case InternalConditionalOperandType.CONDITIONAL_FALSE_VALUE:
- // There's nothing to do, if it was ignored due to true, we wouldn't of gotton here.
- // If it wasn't ignored, then the result of the false expression is on the stack, which is what it should be.
- break;
- }
- } catch (RuntimeException e) {
- processException(e);
- } catch (NoExpressionValueException e) {
- processException(e);
- }
- } finally {
- if (traceOn)
- printTraceEnd();
- }
- }
-
- private static final Object BLOCK_IGNORE = "BLOCK IGNORE"; //$NON-NLS-1$
- private int[] blocks; // Stack of block numbers currently evaluating.
- private int topBlock = -1; // Top block index.
- private int breakBlock = -1; // Block number we are breaking to.
-
- /**
- * Push a begin block.
- * @param blockNumber
- *
- * @since 1.1.0
- */
- public final void pushBlockBegin(int blockNumber) {
- if (traceOn) {
- printTrace("Begin Block #"+blockNumber, errorOccurred); //$NON-NLS-1$
- indent(true);
- }
- try {
- if (errorOccurred)
- return;
- // We are not checking ignore because this is a structural concept instead of executable expressions, so we need to keep track of these.
- if (blocks == null)
- blocks = new int[10];
- if (++topBlock >= blocks.length) {
- int[] newList = new int[blocks.length*2];
- System.arraycopy(blocks, 0, newList, 0, blocks.length);
- blocks = newList;
- }
- blocks[topBlock] = blockNumber;
- } finally {
- if (traceOn)
- printTraceEnd();
- }
- }
-
- /**
- * Push a block end. The current block must be the given number, or it is an error.
- *
- * @param blockNumber
- *
- * @since 1.1.0
- */
- public final void pushBlockEnd(int blockNumber) {
- try {
- if (traceOn) {
- indent(false);
- printTrace("End Block #"+blockNumber, errorOccurred); //$NON-NLS-1$
- }
- if (errorOccurred)
- return;
- // We are not checking ignore because this is a structural concept instead of executable expressions, so we need to keep track of these.
- if (blocks == null || topBlock < 0 || blocks[topBlock] != blockNumber) {
- processSyntaxException(new IllegalStateException(InitparserTreeMessages.getString("ExpressionProcesser.PushBlockEnd.ReceivedEndBlocksOutOfOrder_EXC_"))); //$NON-NLS-1$
- } else {
- topBlock--;
- if (ignoreExpression == BLOCK_IGNORE && blockNumber == breakBlock) {
- ignoreExpression = null;
- }
- }
- } finally {
- if (traceOn)
- printTraceEnd();
- }
- }
-
- /**
- * Skip all following until we hit the requested block number.
- * @param blockNumber
- *
- * @since 1.1.0
- */
- public final void pushBlockBreak(int blockNumber) {
- try {
- if (traceOn)
- printTrace("Break Block #"+blockNumber, errorOccurred); //$NON-NLS-1$
- if (errorOccurred)
- return;
- if (ignoreExpression == null) {
- ignoreExpression = BLOCK_IGNORE; // Start ignoring expressions until we hit the block number end block.
- breakBlock = blockNumber;
- }
- } finally {
- if (traceOn)
- printTraceEnd();
- }
- }
-
- private static final Object TRY_THROW_IGNORE = "TRY THROW IGNORE"; //$NON-NLS-1$
- private static final Object TRY_FINAL_IGNORE = "TRY FINAL IGNORE"; //$NON-NLS-1$
- private int[] trys; // Stack of try numbers currently evaluating.
- // Stack of trys in catch clause (i.e. starting executing a catch/final clause for the try). Corresponds with try from same index in trys. Contains the throwable for the catch.
- // This is used to know we are executing a catch (entry not null) and for the rethrow short-hand to rethrow the same exception within the catch.
- private Throwable[] trysInCatch;
- private int topTry = -1; // Top try index.
- private int breakTry = -1; // Try number we are breaking to.
- private Throwable catchThrowable; // The throwable to check catches against.
-
- /**
- * Push a try statement.
- * @param tryNumber
- *
- * @since 1.1.0
- */
- public final void pushTryBegin(int tryNumber) {
- try {
- if (traceOn) {
- printTrace("Begin Try #"+tryNumber, errorOccurred); //$NON-NLS-1$
- indent(true);
- }
-
- if (errorOccurred)
- return;
- // We are not checking ignore because this is a structural concept instead of executable expressions, so we need to keep track of these.
- if (trys == null) {
- trys = new int[10];
- trysInCatch = new Throwable[10];
- }
- if (++topTry >= trys.length) {
- int[] newList = new int[trys.length*2];
- System.arraycopy(trys, 0, newList, 0, trys.length);
- trys = newList;
- Throwable[] newCatches = new Throwable[trys.length];
- System.arraycopy(trysInCatch, 0, newCatches, 0, trysInCatch.length);
- trysInCatch = newCatches;
- }
- trys[topTry] = tryNumber;
- trysInCatch[topTry] = null;
- } finally {
- if (traceOn)
- printTraceEnd();
- }
- }
-
- /**
- * Throw the top stack entry. It must be an exception.
- *
- *
- * @since 1.1.0
- */
- public final void pushThrowException() {
- try {
- boolean ignore = (ignoreExpression != null || errorOccurred);
- if (traceOn)
- printTrace("Throw exception: ", ignore); //$NON-NLS-1$
-
- if (ignore)
- return;
-
- try {
- Object t = popExpression();
- popExpressionType(false);
- if (traceOn) {
- System.out.print(t);
- }
- throwException((Throwable) t);
- } catch (NoExpressionValueException e) {
- processException(e);
- } catch (ClassCastException e) {
- processException(e);
- }
- } finally {
- if (traceOn)
- printTraceEnd();
- }
- }
-
- /**
- * Throw this exception (means throw through the expression being processed, not throw for this thread).
- * @param exception
- *
- * @since 1.1.0
- */
- protected final void throwException(Throwable exception) {
- if (topTry == -1) {
- // There are no tries, so treat this as a syntax error.
- if (exception instanceof NoExpressionValueException)
- processSyntaxException((NoExpressionValueException) exception);
- else
- processSyntaxException(exception);
- } else if (trysInCatch[topTry] == null) {
- // We are not in a catch clause of the top try. So do a throw ignore for toptry.
- ignoreExpression = TRY_THROW_IGNORE;
- breakTry = trys[topTry];
- catchThrowable = exception;
- } else {
- // We are in a catch of the top try. So do a throw to finally instead.
- ignoreExpression = TRY_FINAL_IGNORE;
- trysInCatch[topTry] = FINAL_CATCH;
- breakTry = trys[topTry];
- catchThrowable = exception;
- }
- }
-
- /**
- * Push a catch clause
- * @param tryNumber
- * @param exceptionType
- * @param expressionProxy
- *
- * @since 1.1.0
- */
- public final void pushTryCatchClause(int tryNumber, Class exceptionType, InternalExpressionProxy expressionProxy) {
- try {
- if (traceOn) {
- indent(false);
- if (expressionProxy == null)
- printTrace("Catch Try #"+tryNumber+" ("+exceptionType+')', errorOccurred); //$NON-NLS-1$ //$NON-NLS-2$
- else
- printTrace("Catch Try #"+tryNumber+" ("+exceptionType+") Return exception in proxy #"+expressionProxy.getProxyID(), errorOccurred); //$NON-NLS-1$ //$NON-NLS-2$ //$NON-NLS-3$
- indent(true);
- }
-
- if (errorOccurred)
- return;
-
- // We are not checking ignore because this is a structural concept instead of executable expressions, so we need to keep track of these.
- if (trys == null || topTry < 0 || trys[topTry] != tryNumber) {
- processSyntaxException(new IllegalStateException(InitparserTreeMessages.getString("ExpressionProcesser.PushTryCatchClause.CatchReceivedOutOfOrder_EXC_"))); //$NON-NLS-1$
- } else {
- if (ignoreExpression == null) {
- // Normal flow, no throw in progress, so just ignore now until the finally or end try reached.
- ignoreExpression = TRY_FINAL_IGNORE;
- breakTry = tryNumber;
- } else if (ignoreExpression == TRY_THROW_IGNORE && tryNumber == breakTry) {
- // We are here due to a throw occuring in this try block, see if for us, and if it is, stop ignoring.
- // Else just continue ignoring.
- if (exceptionType.isInstance(catchThrowable)) {
- // For us, so just turn everything back on, except mark that we are in the catch phase.
- ignoreExpression = null;
- trysInCatch[topTry] = catchThrowable; // This is so that we know if we throw again that we should not catch anything.
- breakTry = -1;
- if (expressionProxy != null) {
- expressionProxy.setProxy(catchThrowable, catchThrowable.getClass());
- allocateExpressionProxy(expressionProxy);
- }
- if (traceOn) {
- System.out.print(" Caught: "); //$NON-NLS-1$
- System.out.print(catchThrowable);
- }
- catchThrowable = null;
- }
- }
- }
- } finally {
- if (traceOn)
- printTraceEnd();
- }
- }
-
- // This is used only so that finally clause can indicate it was executing so that end expression knows this.
- private static final Throwable FINAL_CATCH = new RuntimeException();
-
- /**
- * Push the try finally clause.
- * @param tryNumber
- *
- * @since 1.1.0
- */
- public final void pushTryFinallyClause(int tryNumber) {
- try {
- if (traceOn) {
- indent(false);
- printTrace("Finally Try #"+tryNumber, errorOccurred); //$NON-NLS-1$
- indent(true);
- }
- if (errorOccurred)
- return;
- // We are not checking ignore because this is a structural concept instead of executable expressions, so we need to keep track of these.
- if (trys == null || topTry < 0 || trys[topTry] != tryNumber) {
- processSyntaxException(new IllegalStateException(InitparserTreeMessages.getString("ExpressionProcesser.PushTryFinallyClause.FinallyReceivedOutOfOrder_EXC_"))); //$NON-NLS-1$
- } else {
- if (tryNumber == breakTry && (ignoreExpression == TRY_THROW_IGNORE || ignoreExpression == TRY_FINAL_IGNORE)) {
- // We are here due to a throw occuring in this try block or a catch was reached (in which case all intervening catch's were ignored).
- // Now do a normal execution. If we are here due to a throw that wasn't cleared (either no catch or another throw occured within the catch)
- // then we leave it uncleared so that try/end may rethrow it.
- ignoreExpression = null;
- trysInCatch[topTry] = FINAL_CATCH; // We are in the finally clause of a exception being thrown within this try.
- breakTry = -1;
- if (traceOn)
- System.out.print(" Executing finally."); //$NON-NLS-1$
- }
- }
- } finally {
- if (traceOn)
- printTraceEnd();
- }
- }
-
- /**
- * Rethrow the caught exception. This is a shortcut for:
- * } catch (Exception e) {
- * ... do stuff ...
- * throw e;
- * }
- * @param tryNumber
- *
- * @since 1.1.0
- */
- public final void pushTryRethrow(int tryNumber) {
- if (traceOn)
- printTrace("Rethrow Try #"+tryNumber, errorOccurred || ignoreExpression != null); //$NON-NLS-1$
-
- try {
- if (errorOccurred)
- return;
- // We are not checking ignore because we need to make sure this is not called out of order.
- if (trys == null || topTry < 0 || trys[topTry] != tryNumber) {
- processSyntaxException(new IllegalStateException(InitparserTreeMessages.getString("ExpressionProcesser.PushTryRethrow.RethrowReceivedOutOfOrder_EXC_"))); //$NON-NLS-1$
- } else if (ignoreExpression == null) {
- if (trysInCatch[topTry] == null || trysInCatch[topTry] == FINAL_CATCH)
- processSyntaxException(new IllegalStateException(InitparserTreeMessages.getString("ExpressionProcesser.PushTryRethrow.RetryReceivedOutOfExecutingCatchClause_EXC_"))); //$NON-NLS-1$
- else {
- throwException(trysInCatch[topTry]);
- }
- }
- } finally {
- if (traceOn)
- printTraceEnd();
- }
- }
-
- public final void pushTryEnd(int tryNumber) {
- if (traceOn) {
- indent(false);
- printTrace("End Try #"+tryNumber, errorOccurred); //$NON-NLS-1$
- }
- try {
- if (errorOccurred)
- return;
- // We are not checking ignore because this is a structural concept instead of executable expressions, so we need to keep track of these.
- if (trys == null || topTry < 0 || trys[topTry] != tryNumber) {
- processSyntaxException(new IllegalStateException(InitparserTreeMessages.getString("ExpressionProcesser.PushTryEnd.TryEndReceivedOutOfOrder_EXC_"))); //$NON-NLS-1$
- } else {
- boolean inCatch = trysInCatch[topTry] != null;
- trysInCatch[topTry] = null;
- topTry--;
- if (inCatch || (tryNumber == breakTry && (ignoreExpression == TRY_THROW_IGNORE || ignoreExpression == TRY_FINAL_IGNORE))) {
- // We are here due to a throw or normal flow through a catch. Either way if there is a throwable still pending, we rethrow.
- ignoreExpression = null;
- breakTry = -1;
- if (catchThrowable != null)
- throwException(catchThrowable);
- }
- }
- } finally {
- if (traceOn)
- printTraceEnd();
- }
- }
-
- /**
- * Class used to save the state at time of mark. It will
- * be used to restore state if error.
- *
- * @since 1.1.0
- */
- protected class SaveState {
- public int markID;
-
- // Block state
- public int topBlock;
- public int breakBlock;
-
- // Subexpression state
- public int topSubexpression;
-
- // Try state
- public int topTry;
- public int breakTry;
- public Throwable catchThrowable;
-
- // Error state
- public boolean errorOccurred;
- public boolean novalueException;
- public Throwable exception;
- public Object ignoreExpression;
-
- // Expression stack state
- public int expressionStackPos;
-
- // If/else state
- public int ifElseNesting;
- public int ifElseIgnoreNestCount;
- public boolean ifElseSkipTruePart;
-
- // Other
- public int indent;
- public int expressionProxyPos;
-
- /**
- * Construct and save the state.
- *
- * @param markNumber
- *
- * @since 1.1.0
- */
- public SaveState(int markID) {
- this.markID = markID;
-
- ExpressionProcesser ep = ExpressionProcesser.this;
- this.topBlock = ep.topBlock;
- this.breakBlock = ep.breakBlock;
-
- this.topSubexpression = ep.topSubexpression;
-
- this.topTry = ep.topTry;
- this.breakTry = ep.breakTry;
- this.catchThrowable = ep.catchThrowable;
-
- this.errorOccurred = ep.errorOccurred;
- this.novalueException = ep.novalueException;
- this.exception = ep.exception;
- this.ignoreExpression = ep.ignoreExpression;
-
- this.expressionStackPos = expressionStack.size()-1;
-
- this.ifElseNesting = ep.ifElseNesting;
- this.ifElseIgnoreNestCount = ep.ifElseIgnoreNestCount;
- this.ifElseSkipTruePart = ep.ifElseSkipTruePart;
-
- this.indent = ep.indent;
- this.expressionProxyPos = expressionProxies != null ? expressionProxies.size()-1 : -1;
- }
-
- /**
- * Restore the state.
- *
- *
- * @since 1.1.0
- */
- public void restoreState() {
- ExpressionProcesser ep = ExpressionProcesser.this;
- ep.topBlock = this.topBlock;
- ep.breakBlock = this.breakBlock;
-
- ep.topSubexpression = this.topSubexpression;
-
- ep.topTry = this.topTry;
- ep.breakTry = this.breakTry;
- ep.catchThrowable = this.catchThrowable;
- if (trysInCatch != null) {
- for (int i = topTry + 1; i < ep.trysInCatch.length; i++) {
- ep.trysInCatch[i] = null;
- }
- }
-
- ep.errorOccurred = this.errorOccurred;
- ep.novalueException = ep.novalueException;
- ep.exception = this.exception;
- ep.ignoreExpression = this.ignoreExpression;
-
- // Pop stack down to saved state.
- for (int i = expressionStack.size()-1; i > this.expressionStackPos; i--) {
- expressionStack.remove(i);
- expressionTypeStack.remove(i);
- }
-
- ep.ifElseNesting = this.ifElseNesting;
- ep.ifElseIgnoreNestCount = this.ifElseIgnoreNestCount;
- ep.ifElseSkipTruePart = this.ifElseSkipTruePart;
-
- ep.indent = this.indent;
-
- if (expressionProxies != null) {
- for (int i = expressionProxies.size() - 1; i > this.expressionProxyPos; i--) {
- expressionProxies.remove(i);
- }
- }
-
- // These settings can't cross mark boundaries, so reset them to not set. This is in case we were in this state somewhere
- // in the mark when the restore occurred.
- ep.conditionalIgnoreNestCount = 0;
- ep.conditionalNesting = 0;
- ep.skipTruePart = false;
-
- ep.infixIgnoreNestCount = 0;
- ep.infixNesting = 0;
- }
- }
-
- /**
- * Create the save state with the given id.
- * @param markID
- * @return
- *
- * @since 1.1.0
- */
- protected SaveState createSaveState(int markID) {
- return new SaveState(markID);
- }
-
- /**
- * Push the start of a mark.
- * @param markNumber
- *
- * @since 1.1.0
- */
- public final void pushMark(int markNumber) {
- if (traceOn)
- printTrace("Mark#"+markNumber, false); //$NON-NLS-1$
-
- if (saveStates == null)
- saveStates = new ArrayList();
- saveStates.add(createSaveState(markNumber));
-
- if (traceOn)
- printTraceEnd();
- }
-
- /**
- * Push the end mark. If there is no error, it will simply
- * remove it and all save states in the map after it. If there
- * is an error it will do this plus it will restore the state.
- * <p>
- * It is assumed that the calls are coming in correct order from
- * the server so we won't check validity.
- *
- * @param markID
- * @param restore
- *
- * @since 1.1.0
- */
- public final void pushEndmark(int markID, boolean restore) {
- if (traceOn)
- printTrace("End Mark#"+markID+" Restored="+restore, false); //$NON-NLS-1$ //$NON-NLS-2$
-
- try {
- if (saveStates != null) {
- // Start from the end (since that is where it most likely will be) and start
- // search, removing the end one until we reach the markID.
- for (int i = saveStates.size() - 1; i >= 0; i--) {
- SaveState state = (SaveState) saveStates.remove(i);
- if (state.markID == markID) {
- // We found it.
- if (restore)
- state.restoreState();
- return;
- }
- }
- // But to be safe, if we got here, this is bad. We tried restore a mark we didn't have.
- processSyntaxException(new IllegalStateException(MessageFormat.format(InitparserTreeMessages.getString("ExpressionProcesser.PushEndmark.EndMarkOnNonExistingID_EXC_"), new Object[]{new Integer(markID)}))); //$NON-NLS-1$
- }
- } finally {
- if (traceOn)
- printTraceEnd();
- }
- }
-
- private int[] subexpressions; // Stack of subexpression numbers currently evaluating.
- private int[] subexpressionStackPos; // Stack of the expression stack positions (next entry index) for currently evaluating expressions. The evaluation stack cannot be popped beyond the current top. And at end it will be cleaned up to the position.
- private int topSubexpression = -1; // Top subexpression index.
-
-
- /**
- * Push a begin subexpression.
- * @param subexpressionNumber
- *
- * @since 1.1.0
- */
- public final void pushSubexpressionBegin(int subexpressionNumber) {
- if (traceOn) {
- printTrace("Begin Subexpression #"+subexpressionNumber, errorOccurred); //$NON-NLS-1$
- indent(true);
- }
- try {
- if (errorOccurred)
- return;
- // We are not checking ignore because this is a structural concept instead of executable expressions, so we need to keep track of these.
- if (subexpressions == null) {
- subexpressions = new int[10];
- subexpressionStackPos = new int[10];
- }
- if (++topSubexpression >= subexpressions.length) {
- int[] newList = new int[subexpressions.length*2];
- System.arraycopy(subexpressions, 0, newList, 0, subexpressions.length);
- subexpressions = newList;
- newList = new int[subexpressionStackPos.length*2];
- System.arraycopy(subexpressionStackPos, 0, newList, 0, subexpressionStackPos.length);
- subexpressionStackPos = newList;
- }
- subexpressions[topSubexpression] = subexpressionNumber;
- subexpressionStackPos[topSubexpression] = expressionStack.size();
- } finally {
- if (traceOn)
- printTraceEnd();
- }
- }
-
- /**
- * Push a subexpression end. The current subexpression must be the given number, or it is an error.
- *
- * @param subexpressionNumber
- *
- * @since 1.1.0
- */
- public final void pushSubexpressionEnd(int subexpressionNumber) {
- try {
- if (traceOn) {
- indent(false);
- printTrace("End Subexpression #"+subexpressionNumber, errorOccurred); //$NON-NLS-1$
- }
- if (errorOccurred)
- return;
- // We are not checking ignore because this is a structural concept instead of executable expressions, so we need to keep track of these.
- if (subexpressions == null || topSubexpression < 0 || subexpressions[topSubexpression] != subexpressionNumber) {
- processSyntaxException(new IllegalStateException(InitparserTreeMessages.getString("ExpressionProcesser.PushSubexpressionEnd.ReceivedEndSubexpressionsOutOfOrder_EXC_"))); //$NON-NLS-1$
- } else {
- try {
- popExpressions(expressionStack.size()-subexpressionStackPos[topSubexpression]);
- topSubexpression--;
- } catch (NoExpressionValueException e) {
- processException(e);
- }
- }
- } finally {
- if (traceOn)
- printTraceEnd();
- }
- }
-
-
-}
diff --git a/plugins/org.eclipse.jem.proxy/initParser/org/eclipse/jem/internal/proxy/initParser/tree/ForExpression.java b/plugins/org.eclipse.jem.proxy/initParser/org/eclipse/jem/internal/proxy/initParser/tree/ForExpression.java
deleted file mode 100644
index 8e47baf..0000000
--- a/plugins/org.eclipse.jem.proxy/initParser/org/eclipse/jem/internal/proxy/initParser/tree/ForExpression.java
+++ /dev/null
@@ -1,213 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2005 IBM Corporation and others.
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
- *
- * Contributors:
- * IBM Corporation - initial API and implementation
- *******************************************************************************/
-/*
-
-
- */
-package org.eclipse.jem.internal.proxy.initParser.tree;
-
-/**
- * Enum for the forExpression parameters.
- * <p>
- * This is not meant to be subclassed by customers.
- * @since 1.1.0
- */
-public class ForExpression extends AbstractEnum {
-
- /**
- * forExpression: Creating a root expression
- */
- public static final int ROOTEXPRESSION_VALUE = 0;
-
- public static final ForExpression ROOTEXPRESSION = new ForExpression(ROOTEXPRESSION_VALUE, "Root"); //$NON-NLS-1$
-
- /**
- * forExpression: Creating the array expression for an array access (i.e. the array to access)
- */
- public static final int ARRAYACCESS_ARRAY_VALUE = 1;
-
- public static final ForExpression ARRAYACCESS_ARRAY = new ForExpression(ARRAYACCESS_ARRAY_VALUE, "Array Access: Array Operand"); //$NON-NLS-1$
-
- /**
- * forExpression: Creating an index expression for an array access (i.e. one of the expressions within the <code>[]</code>).
- */
- public static final int ARRAYACCESS_INDEX_VALUE = 2;
-
- public static final ForExpression ARRAYACCESS_INDEX = new ForExpression(ARRAYACCESS_INDEX_VALUE, "Array Access: Index"); //$NON-NLS-1$
-
- /**
- * forExpression: Creating an dimension expression for an array creation (i.e. one of the expressions within the <code>[]</code>).
- */
- public static final int ARRAYCREATION_DIMENSION_VALUE = 3;
-
- public static final ForExpression ARRAYCREATION_DIMENSION = new ForExpression(ARRAYCREATION_DIMENSION_VALUE, "Array Access: Dimension"); //$NON-NLS-1$
-
- /**
- * forExpression: Creating an expression for an array initializer (i.e. one of the expressions with the <code>{}</code>). Special case is that
- * array initializers are valid as an expression within an array initializer and it doesn't use a for expression.
- */
- public static final int ARRAYINITIALIZER_EXPRESSION_VALUE = 4;
-
- public static final ForExpression ARRAYINITIALIZER_EXPRESSION = new ForExpression(ARRAYINITIALIZER_EXPRESSION_VALUE, "Array Initializer"); //$NON-NLS-1$
-
- /**
- * forExpression: Creating the expression for the cast (i.e. the expresion after the <code>(type)</code>).
- */
- public static final int CAST_EXPRESSION_VALUE = 5;
-
- public static final ForExpression CAST_EXPRESSION = new ForExpression(CAST_EXPRESSION_VALUE, "Cast"); //$NON-NLS-1$
-
- /**
- * forExpression: Creating the argument expression for the new instance.
- */
- public static final int CLASSINSTANCECREATION_ARGUMENT_VALUE = 6;
-
- public static final ForExpression CLASSINSTANCECREATION_ARGUMENT = new ForExpression(CLASSINSTANCECREATION_ARGUMENT_VALUE,
- "Class Instance Creation: Argument"); //$NON-NLS-1$
-
- /**
- * forExpression: Creating the condition for a conditional expression.
- */
- public static final int CONDITIONAL_CONDITION_VALUE = 7;
-
- public static final ForExpression CONDITIONAL_CONDITION = new ForExpression(CONDITIONAL_CONDITION_VALUE, "Conditional: Condition"); //$NON-NLS-1$
-
- /**
- * forExpression: Creating the true (then) expression for a conditional expression.
- */
- public static final int CONDITIONAL_TRUE_VALUE = 8;
-
- public static final ForExpression CONDITIONAL_TRUE = new ForExpression(CONDITIONAL_TRUE_VALUE, "Conditional: True"); //$NON-NLS-1$
-
- /**
- * forExpression: Creating the false (else) condition for a conditional expression.
- */
- public static final int CONDITIONAL_FALSE_VALUE = 9;
-
- public static final ForExpression CONDITIONAL_FALSE = new ForExpression(CONDITIONAL_FALSE_VALUE, "Conditional: False"); //$NON-NLS-1$
-
- /**
- * forExpression: Creating the receiver for a field access (i.e. the expression before the ".")
- */
- public static final int FIELD_RECEIVER_VALUE = 10;
-
- public static final ForExpression FIELD_RECEIVER = new ForExpression(FIELD_RECEIVER_VALUE, "Field Access: Receiver"); //$NON-NLS-1$
-
- /**
- * forExpression: Creating the left operand of an infix expression.
- */
- public static final int INFIX_LEFT_VALUE = 11;
-
- public static final ForExpression INFIX_LEFT = new ForExpression(INFIX_LEFT_VALUE, "Infix: Left"); //$NON-NLS-1$
-
- /**
- * forExpression: Creating the right operand of an infix expression.
- */
- public static final int INFIX_RIGHT_VALUE = 12;
-
- public static final ForExpression INFIX_RIGHT = new ForExpression(INFIX_RIGHT_VALUE, "Infix: Right"); //$NON-NLS-1$
-
- /**
- * forExpression: Creating an extended operand of an infix expression.
- */
- public static final int INFIX_EXTENDED_VALUE = 13;
-
- public static final ForExpression INFIX_EXTENDED = new ForExpression(INFIX_EXTENDED_VALUE, "Infix: Extended"); //$NON-NLS-1$
-
- /**
- * forExpression: Creating the value expression of an instanceof.
- */
- public static final int INSTANCEOF_VALUE_VALUE = 14;
-
- public static final ForExpression INSTANCEOF_VALUE = new ForExpression(INSTANCEOF_VALUE_VALUE, "Instanceof"); //$NON-NLS-1$
-
- /**
- * forExpression: Creating a receiver expression for a method invocation.
- */
- public static final int METHOD_RECEIVER_VALUE = 15;
-
- public static final ForExpression METHOD_RECEIVER = new ForExpression(METHOD_RECEIVER_VALUE, "Method Invoke: Receiver"); //$NON-NLS-1$
-
- /**
- * forExpression: Creating an argument for a method invocation.
- */
- public static final int METHOD_ARGUMENT_VALUE = 16;
-
- public static final ForExpression METHOD_ARGUMENT = new ForExpression(METHOD_ARGUMENT_VALUE, "Method Invoke: Argument"); //$NON-NLS-1$
-
- /**
- * forExpression: Creating the operand expression for a prefix operator.
- */
- public static final int PREFIX_OPERAND_VALUE = 17;
-
- public static final ForExpression PREFIX_OPERAND = new ForExpression(PREFIX_OPERAND_VALUE, "Prefix: Operand"); //$NON-NLS-1$
-
- /**
- * forExpression: Creating the right operand of an assignment operator.
- *
- * @since 1.1.0
- */
- public static final int ASSIGNMENT_RIGHT_VALUE = 18;
-
- public static final ForExpression ASSIGNMENT_RIGHT = new ForExpression(ASSIGNMENT_RIGHT_VALUE, "Assignment: Right"); //$NON-NLS-1$
-
- /**
- * forExpression: Creating the left operand of an assignment operator.
- * <p>
- * Note: The left expression can only be a FieldAccess or ArrayAccess.
- */
- public static final int ASSIGNMENT_LEFT_VALUE = 19;
-
- public static final ForExpression ASSIGNMENT_LEFT = new ForExpression(ASSIGNMENT_LEFT_VALUE, "Assignment: Left"); //$NON-NLS-1$
-
- /**
- * forExpression: Creating the throw operand of the throw expression.
- */
- public static final int THROW_OPERAND_VALUE = 20;
-
- public static final ForExpression THROW_OPERAND = new ForExpression(THROW_OPERAND_VALUE, "Throw operand"); //$NON-NLS-1$
-
- /**
- * forExpression: Creating the if conditional operand of the if expression.
- */
- public static final int IF_CONDITION_VALUE = 21;
-
- public static final ForExpression IF_CONDITION = new ForExpression(IF_CONDITION_VALUE, "If condition"); //$NON-NLS-1$
-
- /**
- * forExpression: Creating the if true clause of the if expression.
- */
- public static final int IF_TRUE_VALUE = 22;
-
- public static final ForExpression IF_TRUE = new ForExpression(IF_TRUE_VALUE, "If true clause"); //$NON-NLS-1$
-
- /**
- * forExpression: Creating the if else clause of the if expression.
- */
- public static final int IF_ELSE_VALUE = 23;
-
- public static final ForExpression IF_ELSE = new ForExpression(IF_ELSE_VALUE, "If else clause"); //$NON-NLS-1$
-
-
- /**
- * This is not private, but protected only so that proxy core can add an internal ForExpression enum.
- * <p>
- * This is not meant to be subclassed by customers.
- * @param value
- * @param name
- *
- * @since 1.1.0
- */
- protected ForExpression(int value, String name) {
- super(value, name);
- }
-
-}
\ No newline at end of file
diff --git a/plugins/org.eclipse.jem.proxy/initParser/org/eclipse/jem/internal/proxy/initParser/tree/IExpressionConstants.java b/plugins/org.eclipse.jem.proxy/initParser/org/eclipse/jem/internal/proxy/initParser/tree/IExpressionConstants.java
deleted file mode 100644
index de6724b..0000000
--- a/plugins/org.eclipse.jem.proxy/initParser/org/eclipse/jem/internal/proxy/initParser/tree/IExpressionConstants.java
+++ /dev/null
@@ -1,26 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2004, 2005 IBM Corporation and others.
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
- *
- * Contributors:
- * IBM Corporation - initial API and implementation
- *******************************************************************************/
-/*
-
-
- */
-package org.eclipse.jem.internal.proxy.initParser.tree;
-
-/**
- * These are constants needed by IExpression that will be common between
- * the vm and the IDE. They are also available to users of the IExpression
- * interface.
- *
- * @since 1.0.0
- */
-public interface IExpressionConstants {
-
-}
diff --git a/plugins/org.eclipse.jem.proxy/initParser/org/eclipse/jem/internal/proxy/initParser/tree/InfixOperator.java b/plugins/org.eclipse.jem.proxy/initParser/org/eclipse/jem/internal/proxy/initParser/tree/InfixOperator.java
deleted file mode 100644
index 1764860..0000000
--- a/plugins/org.eclipse.jem.proxy/initParser/org/eclipse/jem/internal/proxy/initParser/tree/InfixOperator.java
+++ /dev/null
@@ -1,212 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2005 IBM Corporation and others.
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
- *
- * Contributors:
- * IBM Corporation - initial API and implementation
- *******************************************************************************/
-/*
-
-
- */
-package org.eclipse.jem.internal.proxy.initParser.tree;
-
-/**
- * Enum for Infix operator
- *
- * @since 1.1.0
- */
-public class InfixOperator extends AbstractEnum {
-
- /**
- * Infix times "*"
- */
- public static final int IN_TIMES_VALUE = 0;
-
- public static final InfixOperator IN_TIMES = new InfixOperator(IN_TIMES_VALUE, "Infix *"); //$NON-NLS-1$
-
- /**
- * Infix divide "/"
- */
- public static final int IN_DIVIDE_VALUE = 1;
-
- public static final InfixOperator IN_DIVIDE = new InfixOperator(IN_DIVIDE_VALUE, "Infix /"); //$NON-NLS-1$
-
- /**
- * Infix remainder "%"
- */
- public static final int IN_REMAINDER_VALUE = 2;
-
- public static final InfixOperator IN_REMAINDER = new InfixOperator(IN_REMAINDER_VALUE, "Infix %"); //$NON-NLS-1$
-
- /**
- * Infix plus "+"
- */
- public static final int IN_PLUS_VALUE = 3;
-
- public static final InfixOperator IN_PLUS = new InfixOperator(IN_PLUS_VALUE, "Infix +"); //$NON-NLS-1$
-
- /**
- * Infix minus "-"
- */
- public static final int IN_MINUS_VALUE = 4;
-
- public static final InfixOperator IN_MINUS = new InfixOperator(IN_MINUS_VALUE, "Infix -"); //$NON-NLS-1$
-
- /**
- * Infix left shift " < <"
- */
- public static final int IN_LEFT_SHIFT_VALUE = 5;
-
- public static final InfixOperator IN_LEFT_SHIFT = new InfixOperator(IN_LEFT_SHIFT_VALUE, "Infix <<"); //$NON-NLS-1$
-
- /**
- * Infix right shift signed ">>"
- */
- public static final int IN_RIGHT_SHIFT_SIGNED_VALUE = 6;
-
- public static final InfixOperator IN_RIGHT_SHIFT_SIGNED = new InfixOperator(IN_RIGHT_SHIFT_SIGNED_VALUE, "Infix >>"); //$NON-NLS-1$
-
- /**
- * Infix right shift unsigned ">>>"
- */
- public static final int IN_RIGHT_SHIFT_UNSIGNED_VALUE = 7;
-
- public static final InfixOperator IN_RIGHT_SHIFT_UNSIGNED = new InfixOperator(IN_RIGHT_SHIFT_UNSIGNED_VALUE, "Infix >>>"); //$NON-NLS-1$
-
- /**
- * Infix less " <"
- */
- public static final int IN_LESS_VALUE = 8;
-
- public static final InfixOperator IN_LESS = new InfixOperator(IN_LESS_VALUE, "Infix <"); //$NON-NLS-1$
-
- /**
- * Infix greater ">"
- */
- public static final int IN_GREATER_VALUE = 9;
-
- public static final InfixOperator IN_GREATER = new InfixOperator(IN_GREATER_VALUE, "Infix >"); //$NON-NLS-1$
-
- /**
- * Infix less than or equals " <="
- */
- public static final int IN_LESS_EQUALS_VALUE = 10;
-
- public static final InfixOperator IN_LESS_EQUALS = new InfixOperator(IN_LESS_EQUALS_VALUE, "Infix <="); //$NON-NLS-1$
-
- /**
- * Infix Greater than or equlas ">="
- */
- public static final int IN_GREATER_EQUALS_VALUE = 11;
-
- public static final InfixOperator IN_GREATER_EQUALS = new InfixOperator(IN_GREATER_EQUALS_VALUE, "Infix >="); //$NON-NLS-1$
-
- /**
- * Infix equals "=="
- */
- public static final int IN_EQUALS_VALUE = 12;
-
- public static final InfixOperator IN_EQUALS = new InfixOperator(IN_EQUALS_VALUE, "Infix =="); //$NON-NLS-1$
-
- /**
- * Infix not equals "!="
- */
- public static final int IN_NOT_EQUALS_VALUE = 13;
-
- public static final InfixOperator IN_NOT_EQUALS = new InfixOperator(IN_NOT_EQUALS_VALUE, "Infix !="); //$NON-NLS-1$
-
- /**
- * Infix exclusive or "^"
- */
- public static final int IN_XOR_VALUE = 14;
-
- public static final InfixOperator IN_XOR = new InfixOperator(IN_XOR_VALUE, "Infix ^"); //$NON-NLS-1$
-
- /**
- * Infix bitwise and "&"
- */
- public static final int IN_AND_VALUE = 15;
-
- public static final InfixOperator IN_AND = new InfixOperator(IN_AND_VALUE, "Infix &"); //$NON-NLS-1$
-
- /**
- * Infix bitwise or "|"
- */
- public static final int IN_OR_VALUE = 16;
-
- public static final InfixOperator IN_OR = new InfixOperator(IN_OR_VALUE, "Infix |"); //$NON-NLS-1$
-
- /**
- * Infix Conditional logical and "&&"
- */
- public static final int IN_CONDITIONAL_AND_VALUE = 17;
-
- public static final InfixOperator IN_CONDITIONAL_AND = new InfixOperator(IN_CONDITIONAL_AND_VALUE, "Infix &&"); //$NON-NLS-1$
-
- /**
- * Infix Conditional logical or "||"
- */
- public static final int IN_CONDITIONAL_OR_VALUE = 18;
-
- public static final InfixOperator IN_CONDITIONAL_OR = new InfixOperator(IN_CONDITIONAL_OR_VALUE, "Ifnix ||"); //$NON-NLS-1$
-
- /**
- * Return the infix operator for the given enum value.
- * @param value
- * @return
- *
- * @since 1.1.0
- */
- public static InfixOperator get(int value) {
- switch (value) {
- case IN_TIMES_VALUE:
- return IN_TIMES;
- case IN_DIVIDE_VALUE:
- return IN_DIVIDE;
- case IN_REMAINDER_VALUE:
- return IN_REMAINDER;
- case IN_PLUS_VALUE:
- return IN_PLUS;
- case IN_MINUS_VALUE:
- return IN_MINUS;
- case IN_LEFT_SHIFT_VALUE:
- return IN_LEFT_SHIFT;
- case IN_RIGHT_SHIFT_SIGNED_VALUE:
- return IN_RIGHT_SHIFT_SIGNED;
- case IN_RIGHT_SHIFT_UNSIGNED_VALUE:
- return IN_RIGHT_SHIFT_UNSIGNED;
- case IN_LESS_VALUE:
- return IN_LESS;
- case IN_GREATER_VALUE:
- return IN_GREATER;
- case IN_LESS_EQUALS_VALUE:
- return IN_LESS_EQUALS;
- case IN_GREATER_EQUALS_VALUE:
- return IN_GREATER_EQUALS;
- case IN_EQUALS_VALUE:
- return IN_EQUALS;
- case IN_NOT_EQUALS_VALUE:
- return IN_NOT_EQUALS;
- case IN_XOR_VALUE:
- return IN_XOR;
- case IN_AND_VALUE:
- return IN_AND;
- case IN_OR_VALUE:
- return IN_OR;
- case IN_CONDITIONAL_AND_VALUE:
- return IN_CONDITIONAL_AND;
- case IN_CONDITIONAL_OR_VALUE:
- return IN_CONDITIONAL_OR;
- }
- return null;
- }
-
- private InfixOperator(int value, String name) {
- super(value, name);
- }
-
-}
\ No newline at end of file
diff --git a/plugins/org.eclipse.jem.proxy/initParser/org/eclipse/jem/internal/proxy/initParser/tree/InitparserTreeMessages.java b/plugins/org.eclipse.jem.proxy/initParser/org/eclipse/jem/internal/proxy/initParser/tree/InitparserTreeMessages.java
deleted file mode 100644
index bebdd83..0000000
--- a/plugins/org.eclipse.jem.proxy/initParser/org/eclipse/jem/internal/proxy/initParser/tree/InitparserTreeMessages.java
+++ /dev/null
@@ -1,43 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2004, 2005 IBM Corporation and others.
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
- *
- * Contributors:
- * IBM Corporation - initial API and implementation
- *******************************************************************************/
-/*
-
-
- */
-package org.eclipse.jem.internal.proxy.initParser.tree;
-
-import java.util.MissingResourceException;
-import java.util.ResourceBundle;
-
-/**
- * @author sri
- *
- * TODO To change the template for this generated type comment go to
- * Window - Preferences - Java - Code Style - Code Templates
- */
-public class InitparserTreeMessages {
-
- private static final String BUNDLE_NAME = "org.eclipse.jem.internal.proxy.initParser.tree.messages";//$NON-NLS-1$
-
- private static final ResourceBundle RESOURCE_BUNDLE = ResourceBundle.getBundle(BUNDLE_NAME);
-
- private InitparserTreeMessages() {
- }
-
- public static String getString(String key) {
- // TODO Auto-generated method stub
- try {
- return RESOURCE_BUNDLE.getString(key);
- } catch (MissingResourceException e) {
- return '!' + key + '!';
- }
- }
-}
diff --git a/plugins/org.eclipse.jem.proxy/initParser/org/eclipse/jem/internal/proxy/initParser/tree/InternalConditionalOperandType.java b/plugins/org.eclipse.jem.proxy/initParser/org/eclipse/jem/internal/proxy/initParser/tree/InternalConditionalOperandType.java
deleted file mode 100644
index 6d6b4eb..0000000
--- a/plugins/org.eclipse.jem.proxy/initParser/org/eclipse/jem/internal/proxy/initParser/tree/InternalConditionalOperandType.java
+++ /dev/null
@@ -1,70 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2005 IBM Corporation and others.
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
- *
- * Contributors:
- * IBM Corporation - initial API and implementation
- *******************************************************************************/
-/*
-
-
- */
-package org.eclipse.jem.internal.proxy.initParser.tree;
-
-/**
- * Internal class for the Conditional operand type. Not meant to be used by customers.
- *
- * @since 1.1.0
- */
-public class InternalConditionalOperandType extends AbstractEnum {
-
- /**
- * Used in Conditional processing. False operand on expression stack
- */
- public final static int CONDITIONAL_FALSE_VALUE = 0;
-
- public final static InternalConditionalOperandType CONDITIONAL_FALSE = new InternalConditionalOperandType(CONDITIONAL_FALSE_VALUE,
- "Conditional False Operand Flag"); //$NON-NLS-1$
-
- /**
- * Used in Conditional processing. True operand on expression stack
- */
- public final static int CONDITIONAL_TRUE_VALUE = 1;
-
- public final static InternalConditionalOperandType CONDITIONAL_TRUE = new InternalConditionalOperandType(CONDITIONAL_TRUE_VALUE,
- "Conditional True Operand Flag"); //$NON-NLS-1$
-
- /**
- * Used in Conditional processing. Test operand on expression stack
- */
- public final static int CONDITIONAL_TEST_VALUE = 2;
-
- public final static InternalConditionalOperandType CONDITIONAL_TEST = new InternalConditionalOperandType(CONDITIONAL_TEST_VALUE,
- "Conditional Test Operand Flag"); //$NON-NLS-1$
-
- /**
- * Return the enum for the given value.
- * @param value
- * @return
- *
- * @since 1.1.0
- */
- public static InternalConditionalOperandType get(int value) {
- switch (value) {
- case CONDITIONAL_FALSE_VALUE:
- return CONDITIONAL_FALSE;
- case CONDITIONAL_TRUE_VALUE:
- return CONDITIONAL_TRUE;
- case CONDITIONAL_TEST_VALUE:
- return CONDITIONAL_TEST;
- }
- return null;
- }
-
- private InternalConditionalOperandType(int value, String name) {
- super(value, name);
- }
-}
\ No newline at end of file
diff --git a/plugins/org.eclipse.jem.proxy/initParser/org/eclipse/jem/internal/proxy/initParser/tree/InternalExpressionProxy.java b/plugins/org.eclipse.jem.proxy/initParser/org/eclipse/jem/internal/proxy/initParser/tree/InternalExpressionProxy.java
deleted file mode 100644
index 05dd32a..0000000
--- a/plugins/org.eclipse.jem.proxy/initParser/org/eclipse/jem/internal/proxy/initParser/tree/InternalExpressionProxy.java
+++ /dev/null
@@ -1,77 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2005 IBM Corporation and others.
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
- *
- * Contributors:
- * IBM Corporation - initial API and implementation
- *******************************************************************************/
-/*
-
-
- */
-package org.eclipse.jem.internal.proxy.initParser.tree;
-
-
-/**
- * This interface is used for expression proxies in the evaluation side (in {@link org.eclipse.jem.internal.proxy.initParser.tree.ExpressionProcesser}).
- * <p>
- * It is meant to be implemented only by users of the ExpressionProcessor.
- *
- * @since 1.1.0
- */
-public interface InternalExpressionProxy {
-
- /**
- * Get the id of the proxy.
- * @return
- *
- * @since 1.1.0
- */
- public int getProxyID();
-
- /**
- * Called by ExpressionProcesser to give the expression proxy its value and type, i.e. it has been evaluated.
- * <p>
- * The type may not be the actual type of the value, it may be a superclass of it. It is the type that the proxy
- * represents from the return of the expression. For instance it may of returned null but it is supposed to be
- * java.lang.String. Or it is supposed to be a primitive int, since we can't store that, we need to store
- * an Integer value with the type indicating it is Interger.TYPE.
- *
- * @param value
- * @param type
- *
- * @since 1.1.0
- */
- public void setProxy(Object value, Class type);
-
- /**
- * Get the value of the proxy.
- * <p>
- * Note: The value may be a {@link VariableReference}, in which
- * case further dereferencing may be with the returned value.
- * @return the value of the proxy, it may be an ExpressionProcesser.VariableReference.
- *
- * @since 1.1.0
- */
- public Object getValue();
-
- /**
- * Get the type of the proxy.
- * @return
- *
- * @see InternalExpressionProxy#setProxy(Object, Class) for what type means.
- * @since 1.1.0
- */
- public Class getType();
-
- /**
- * Return whether the proxy has had a value/class set into it yet.
- * @return <code>true</code> if it has been set.
- *
- * @since 1.1.0
- */
- public boolean isSet();
-}
diff --git a/plugins/org.eclipse.jem.proxy/initParser/org/eclipse/jem/internal/proxy/initParser/tree/InternalExpressionTypes.java b/plugins/org.eclipse.jem.proxy/initParser/org/eclipse/jem/internal/proxy/initParser/tree/InternalExpressionTypes.java
deleted file mode 100644
index d1a35ed..0000000
--- a/plugins/org.eclipse.jem.proxy/initParser/org/eclipse/jem/internal/proxy/initParser/tree/InternalExpressionTypes.java
+++ /dev/null
@@ -1,303 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2004, 2005 IBM Corporation and others.
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
- *
- * Contributors:
- * IBM Corporation - initial API and implementation
- *******************************************************************************/
-package org.eclipse.jem.internal.proxy.initParser.tree;
-
-/**
- * These constants are for communicating between the IDE and the proxy side for expression evaluation. It is not meant to be used by customers.
- *
- * @since 1.0.0
- */
-public class InternalExpressionTypes extends AbstractEnum {
-
- /**
- * ARRAY ACCESS Expression
- */
- public final static int ARRAY_ACCESS_EXPRESSION_VALUE = 1;
-
- public final static InternalExpressionTypes ARRAY_ACCESS_EXPRESSION = new InternalExpressionTypes(ARRAY_ACCESS_EXPRESSION_VALUE,
- "Array Access Expression"); //$NON-NLS-1$
-
- /**
- * ARRAY CREATION Expression
- */
- public final static int ARRAY_CREATION_EXPRESSION_VALUE = 2;
-
- public final static InternalExpressionTypes ARRAY_CREATION_EXPRESSION = new InternalExpressionTypes(ARRAY_CREATION_EXPRESSION_VALUE,
- "Array Creation Expression"); //$NON-NLS-1$
-
- /**
- * ARRAY INITIALIZER expression
- */
- public final static int ARRAY_INITIALIZER_EXPRESSION_VALUE = 3;
-
- public final static InternalExpressionTypes ARRAY_INITIALIZER_EXPRESSION = new InternalExpressionTypes(ARRAY_INITIALIZER_EXPRESSION_VALUE,
- "Array Initializer Expression"); //$NON-NLS-1$
-
- /**
- * CAST Expression.
- */
- public final static int CAST_EXPRESSION_VALUE = 4;
-
- public final static InternalExpressionTypes CAST_EXPRESSION = new InternalExpressionTypes(CAST_EXPRESSION_VALUE, "Cast Expression"); //$NON-NLS-1$
-
- /**
- * CONDITIONAL expression
- */
- public final static int CONDITIONAL_EXPRESSION_VALUE = 5;
-
- public final static InternalExpressionTypes CONDITIONAL_EXPRESSION = new InternalExpressionTypes(CONDITIONAL_EXPRESSION_VALUE,
- "Conditional Expression"); //$NON-NLS-1$
-
- /**
- * CLASS INSTANCE CREATION expression
- */
- public final static int CLASS_INSTANCE_CREATION_EXPRESSION_VALUE = 6;
-
- public final static InternalExpressionTypes CLASS_INSTANCE_CREATION_EXPRESSION = new InternalExpressionTypes(
- CLASS_INSTANCE_CREATION_EXPRESSION_VALUE, "Class Instance Creation Expression"); //$NON-NLS-1$
-
- /**
- * FIELD ACCESS expression.
- */
- public final static int FIELD_ACCESS_EXPRESSION_VALUE = 7;
-
- public final static InternalExpressionTypes FIELD_ACCESS_EXPRESSION = new InternalExpressionTypes(FIELD_ACCESS_EXPRESSION_VALUE,
- "Field Access Expression"); //$NON-NLS-1$
-
- /**
- * INSTANCEOF Expression.
- */
- public final static int INSTANCEOF_EXPRESSION_VALUE = 8;
-
- public final static InternalExpressionTypes INSTANCEOF_EXPRESSION = new InternalExpressionTypes(INSTANCEOF_EXPRESSION_VALUE,
- "Instanceof Expression"); //$NON-NLS-1$
-
- /**
- * Infix expression
- */
- public final static int INFIX_EXPRESSION_VALUE = 9;
-
- public final static InternalExpressionTypes INFIX_EXPRESSION = new InternalExpressionTypes(INFIX_EXPRESSION_VALUE, "Infix Expression"); //$NON-NLS-1$
-
- /**
- * Method expression.
- */
- public final static int METHOD_EXPRESSION_VALUE = 10;
-
- public final static InternalExpressionTypes METHOD_EXPRESSION = new InternalExpressionTypes(METHOD_EXPRESSION_VALUE, "Method Invoke Expression"); //$NON-NLS-1$
-
- /**
- * Prefix expression
- */
- public final static int PREFIX_EXPRESSION_VALUE = 11;
-
- public final static InternalExpressionTypes PREFIX_EXPRESSION = new InternalExpressionTypes(PREFIX_EXPRESSION_VALUE, "Prefix Expression"); //$NON-NLS-1$
-
- /**
- * Push to proxy expression.
- */
- public final static int PUSH_TO_PROXY_EXPRESSION_VALUE = 12;
-
- public final static InternalExpressionTypes PUSH_TO_PROXY_EXPRESSION = new InternalExpressionTypes(PUSH_TO_PROXY_EXPRESSION_VALUE,
- "Push to Proxy Expression"); //$NON-NLS-1$
-
- /**
- * Push BeanType expression proxy expression.
- */
- public final static int PUSH_BEANTYPE_EXPRESSIONPROXY_EXPRESSION_VALUE = 13;
-
- public final static InternalExpressionTypes PUSH_BEANTYPE_EXPRESSIONPROXY_EXPRESSION = new InternalExpressionTypes(PUSH_BEANTYPE_EXPRESSIONPROXY_EXPRESSION_VALUE,
- "Push BeanType ExpressionProxy Expression"); //$NON-NLS-1$
-
-
- /**
- * Type receiver expression.
- */
- public final static int TYPERECEIVER_EXPRESSION_VALUE = 14;
-
- public final static InternalExpressionTypes TYPERECEIVER_EXPRESSION = new InternalExpressionTypes(TYPERECEIVER_EXPRESSION_VALUE,
- "Type Receiver Expression"); //$NON-NLS-1$
-
- /**
- * Assignment to an ExpressionProxy expression.
- */
- public final static int ASSIGNMENT_PROXY_EXPRESSION_VALUE = 15;
-
- public final static InternalExpressionTypes ASSIGNMENT_PROXY_EXPRESSION = new InternalExpressionTypes(ASSIGNMENT_PROXY_EXPRESSION_VALUE,
- "Assignment to Proxy Expression"); //$NON-NLS-1$
-
- /**
- * Push expression proxy value expression.
- */
- public final static int PUSH_TO_EXPRESSION_PROXY_EXPRESSION_VALUE = 16;
-
- public final static InternalExpressionTypes PUSH_TO_EXPRESSION_PROXY_EXPRESSION = new InternalExpressionTypes(
- PUSH_TO_EXPRESSION_PROXY_EXPRESSION_VALUE, "Push to Expression Proxy Expression"); //$NON-NLS-1$
-
- /**
- * Assignment expression.
- */
- public final static int ASSIGNMENT_EXPRESSION_VALUE = 17;
-
- public final static InternalExpressionTypes ASSIGNMENT_EXPRESSION = new InternalExpressionTypes(ASSIGNMENT_EXPRESSION_VALUE,
- "Assignment Expression"); //$NON-NLS-1$
-
- /**
- * Block End expression.
- */
- public final static int BLOCK_BEGIN_EXPRESSION_VALUE = 18;
-
- public final static InternalExpressionTypes BLOCK_BEGIN_EXPRESSION = new InternalExpressionTypes(BLOCK_BEGIN_EXPRESSION_VALUE,
- "Begin block Expression"); //$NON-NLS-1$
-
- /**
- * Block End expression.
- */
- public final static int BLOCK_BREAK_EXPRESSION_VALUE = 19;
-
- public final static InternalExpressionTypes BLOCK_BREAK_EXPRESSION = new InternalExpressionTypes(BLOCK_BREAK_EXPRESSION_VALUE,
- "Break block Expression"); //$NON-NLS-1$
-
- /**
- * Block End expression.
- */
- public final static int BLOCK_END_EXPRESSION_VALUE = 20;
-
- public final static InternalExpressionTypes BLOCK_END_EXPRESSION = new InternalExpressionTypes(BLOCK_END_EXPRESSION_VALUE,
- "End block Expression"); //$NON-NLS-1$
-
- /**
- * Try Begin expression.
- */
- public final static int TRY_BEGIN_EXPRESSION_VALUE = 21;
-
- public final static InternalExpressionTypes TRY_BEGIN_EXPRESSION = new InternalExpressionTypes(TRY_BEGIN_EXPRESSION_VALUE,
- "Begin try Expression"); //$NON-NLS-1$
-
- /**
- * Try Catch expression.
- */
- public final static int TRY_CATCH_EXPRESSION_VALUE = 22;
-
- public final static InternalExpressionTypes TRY_CATCH_EXPRESSION = new InternalExpressionTypes(TRY_CATCH_EXPRESSION_VALUE,
- "Try catch Expression"); //$NON-NLS-1$
-
- /**
- * Try Finally expression.
- */
- public final static int TRY_FINALLY_EXPRESSION_VALUE = 23;
-
- public final static InternalExpressionTypes TRY_FINALLY_EXPRESSION = new InternalExpressionTypes(TRY_FINALLY_EXPRESSION_VALUE,
- "Try finally Expression"); //$NON-NLS-1$
-
- /**
- * Try End expression.
- */
- public final static int TRY_END_EXPRESSION_VALUE = 24;
-
- public final static InternalExpressionTypes TRY_END_EXPRESSION = new InternalExpressionTypes(TRY_END_EXPRESSION_VALUE,
- "End try Expression"); //$NON-NLS-1$
-
- /**
- * Throw expression.
- */
- public final static int THROW_EXPRESSION_VALUE = 25;
-
- public final static InternalExpressionTypes THROW_EXPRESSION = new InternalExpressionTypes(THROW_EXPRESSION_VALUE,
- "Throw Expression"); //$NON-NLS-1$
-
- /**
- * Rethrow expression.
- */
- public final static int RETHROW_EXPRESSION_VALUE = 26;
-
- public final static InternalExpressionTypes RETHROW_EXPRESSION = new InternalExpressionTypes(RETHROW_EXPRESSION_VALUE,
- "Rethrow Expression"); //$NON-NLS-1$
-
- /**
- * Push Method Lookup expression proxy expression.
- */
- public final static int PUSH_METHOD_EXPRESSIONPROXY_EXPRESSION_VALUE = 27;
-
- public final static InternalExpressionTypes PUSH_METHOD_EXPRESSIONPROXY_EXPRESSION = new InternalExpressionTypes(PUSH_METHOD_EXPRESSIONPROXY_EXPRESSION_VALUE,
- "Push Method ExpressionProxy Expression"); //$NON-NLS-1$
-
- /**
- * Push Field Lookup expression proxy expression.
- */
- public final static int PUSH_FIELD_EXPRESSIONPROXY_EXPRESSION_VALUE = 28;
-
- public final static InternalExpressionTypes PUSH_FIELD_EXPRESSIONPROXY_EXPRESSION = new InternalExpressionTypes(PUSH_FIELD_EXPRESSIONPROXY_EXPRESSION_VALUE,
- "Push Field ExpressionProxy Expression"); //$NON-NLS-1$
-
- /**
- * Push If/else (the clauses) expression proxy expression.
- */
- public final static int IF_ELSE_EXPRESSION_VALUE = 29;
-
- public final static InternalExpressionTypes IF_ELSE_EXPRESSION = new InternalExpressionTypes(IF_ELSE_EXPRESSION_VALUE,
- "Push If/else Expression"); //$NON-NLS-1$
-
- /**
- * Push If/else condition test expression proxy expression.
- */
- public final static int IF_TEST_EXPRESSION_VALUE = 30;
-
- public final static InternalExpressionTypes IF_TEST_EXPRESSION = new InternalExpressionTypes(IF_TEST_EXPRESSION_VALUE,
- "Push If Test Expression"); //$NON-NLS-1$
-
-
- /**
- * Push new instance from init string proxy expression.
- */
- public final static int NEW_INSTANCE_VALUE = 31;
-
- public final static InternalExpressionTypes NEW_INSTANCE = new InternalExpressionTypes(NEW_INSTANCE_VALUE,
- "Push New Instance Expression"); //$NON-NLS-1$
-
-
- /**
- * Push mark proxy expression.
- */
- public final static int MARK_VALUE = 32;
-
- public final static InternalExpressionTypes MARK = new InternalExpressionTypes(MARK_VALUE,
- "Push Mark Expression"); //$NON-NLS-1$
-
- /**
- * Push end mark proxy expression.
- */
- public final static int ENDMARK_VALUE = 33;
-
- public final static InternalExpressionTypes ENDMARK = new InternalExpressionTypes(ENDMARK_VALUE,
- "Push End Mark Expression"); //$NON-NLS-1$
-
- /**
- * Subexpression End expression.
- */
- public final static int SUBEXPRESSION_BEGIN_EXPRESSION_VALUE = 34;
-
- public final static InternalExpressionTypes SUBEXPRESSION_BEGIN_EXPRESSION = new InternalExpressionTypes(SUBEXPRESSION_BEGIN_EXPRESSION_VALUE,
- "Begin Subexpression Expression"); //$NON-NLS-1$
-
- /**
- * Subexpression End expression.
- */
- public final static int SUBEXPRESSION_END_EXPRESSION_VALUE = 35;
-
- public final static InternalExpressionTypes SUBEXPRESSION_END_EXPRESSION = new InternalExpressionTypes(SUBEXPRESSION_END_EXPRESSION_VALUE,
- "End Subexpression Expression"); //$NON-NLS-1$
-
-
- private InternalExpressionTypes(int value, String name) {
- super(value, name);
- }
-}
\ No newline at end of file
diff --git a/plugins/org.eclipse.jem.proxy/initParser/org/eclipse/jem/internal/proxy/initParser/tree/InternalIfElseOperandType.java b/plugins/org.eclipse.jem.proxy/initParser/org/eclipse/jem/internal/proxy/initParser/tree/InternalIfElseOperandType.java
deleted file mode 100644
index ca998c9..0000000
--- a/plugins/org.eclipse.jem.proxy/initParser/org/eclipse/jem/internal/proxy/initParser/tree/InternalIfElseOperandType.java
+++ /dev/null
@@ -1,60 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2005 IBM Corporation and others.
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
- *
- * Contributors:
- * IBM Corporation - initial API and implementation
- *******************************************************************************/
-/*
-
-
- */
-package org.eclipse.jem.internal.proxy.initParser.tree;
-
-/**
- * Internal class for the If/else operand type. Not meant to be used by customers.
- *
- * @since 1.1.0
- */
-public class InternalIfElseOperandType extends AbstractEnum {
-
- /**
- * Used in If/else processing. False clause on expression stack
- */
- public final static int ELSE_CLAUSE_VALUE = 0;
-
- public final static InternalIfElseOperandType ELSE_CLAUSE = new InternalIfElseOperandType(ELSE_CLAUSE_VALUE,
- "Else Clause Flag"); //$NON-NLS-1$
-
- /**
- * Used in If/else processing. If operand on expression stack
- */
- public final static int TRUE_CLAUSE_VALUE = 1;
-
- public final static InternalIfElseOperandType TRUE_CLAUSE = new InternalIfElseOperandType(TRUE_CLAUSE_VALUE,
- "If True Clause Flag"); //$NON-NLS-1$
-
- /**
- * Return the enum for the given value.
- * @param value
- * @return
- *
- * @since 1.1.0
- */
- public static InternalIfElseOperandType get(int value) {
- switch (value) {
- case ELSE_CLAUSE_VALUE:
- return ELSE_CLAUSE;
- case TRUE_CLAUSE_VALUE:
- return TRUE_CLAUSE;
- }
- return null;
- }
-
- private InternalIfElseOperandType(int value, String name) {
- super(value, name);
- }
-}
\ No newline at end of file
diff --git a/plugins/org.eclipse.jem.proxy/initParser/org/eclipse/jem/internal/proxy/initParser/tree/InternalInfixOperandType.java b/plugins/org.eclipse.jem.proxy/initParser/org/eclipse/jem/internal/proxy/initParser/tree/InternalInfixOperandType.java
deleted file mode 100644
index 34604b1..0000000
--- a/plugins/org.eclipse.jem.proxy/initParser/org/eclipse/jem/internal/proxy/initParser/tree/InternalInfixOperandType.java
+++ /dev/null
@@ -1,63 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2005 IBM Corporation and others.
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
- *
- * Contributors:
- * IBM Corporation - initial API and implementation
- *******************************************************************************/
-/*
-
-
- */
-package org.eclipse.jem.internal.proxy.initParser.tree;
-
-
-/**
- * Internal class for the Prefix operand type. Not meant to be used by customers.
- * @since 1.1.0
- */
-public class InternalInfixOperandType extends AbstractEnum {
-
- /**
- * Used in Infix processing. Left operand on expression stack
- */
- public final static int INFIX_LEFT_OPERAND_VALUE = 0;
- public final static InternalInfixOperandType INFIX_LEFT_OPERAND = new InternalInfixOperandType(INFIX_LEFT_OPERAND_VALUE, "Infix Left Operand Flag"); //$NON-NLS-1$
- /**
- * Used in Infix processing. Other operand (but not last) on expression stack
- */
- public final static int INFIX_OTHER_OPERAND_VALUE = 1;
- public final static InternalInfixOperandType INFIX_OTHER_OPERAND = new InternalInfixOperandType(INFIX_OTHER_OPERAND_VALUE,
- "Infix Other Operand Flag"); //$NON-NLS-1$
- /**
- * Used in Infix processing. Rightmost (last) operand on expression stack
- */
- public final static int INFIX_LAST_OPERAND_VALUE = 2;
- public final static InternalInfixOperandType INFIX_LAST_OPERAND = new InternalInfixOperandType(INFIX_LAST_OPERAND_VALUE, "Infix Last Operand Flag"); //$NON-NLS-1$
-
- /**
- * Return the enum for the given value.
- * @param value
- * @return
- *
- * @since 1.1.0
- */
- public static InternalInfixOperandType get(int value) {
- switch (value) {
- case INFIX_LAST_OPERAND_VALUE:
- return INFIX_LAST_OPERAND;
- case INFIX_LEFT_OPERAND_VALUE:
- return INFIX_LEFT_OPERAND;
- case INFIX_OTHER_OPERAND_VALUE:
- return INFIX_OTHER_OPERAND;
- }
- return null;
- }
-
- private InternalInfixOperandType(int value, String name) {
- super(value, name);
- }
-}
diff --git a/plugins/org.eclipse.jem.proxy/initParser/org/eclipse/jem/internal/proxy/initParser/tree/NoExpressionValueException.java b/plugins/org.eclipse.jem.proxy/initParser/org/eclipse/jem/internal/proxy/initParser/tree/NoExpressionValueException.java
deleted file mode 100644
index 7005354..0000000
--- a/plugins/org.eclipse.jem.proxy/initParser/org/eclipse/jem/internal/proxy/initParser/tree/NoExpressionValueException.java
+++ /dev/null
@@ -1,87 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2005 IBM Corporation and others.
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
- *
- * Contributors:
- * IBM Corporation - initial API and implementation
- *******************************************************************************/
-/*
-
-
- */
-package org.eclipse.jem.internal.proxy.initParser.tree;
-
-
-/**
- * The expression (or some nested expression) did not return a value. I.e. it was <code>void</code>.
- * This would occur only if the value of expression was being retrieved through getExpressionValue,
- * or if a nested expression was used, since in that case the value would of been used as an
- * argument or receiver to another expression.
- *
- * @since 1.0.0
- */
-public class NoExpressionValueException extends Exception {
-
- /**
- * Comment for <code>serialVersionUID</code>
- *
- * @since 1.1.0
- */
- private static final long serialVersionUID = -7953101867782417964L;
-
- private InternalExpressionProxy proxy;
-
- /**
- * Construct with no arguments.
- *
- * @since 1.0.0
- */
- public NoExpressionValueException() {
- super();
- }
-
- public NoExpressionValueException(Throwable e) {
- super(e);
- }
-
- /**
- * Construct with a message.
- *
- * @param message
- *
- * @since 1.0.0
- */
- public NoExpressionValueException(String message) {
- this(message, null);
- }
-
- /**
- * Construct with a message and a proxy. This is only used from {@link ExpressionProcesser#getExpressionProxyValue(int, Object[])} when
- * the proxy existed but it was not set.
- *
- * @param message
- * @param proxy
- *
- * @since 1.1.0
- */
- public NoExpressionValueException(String message, InternalExpressionProxy proxy) {
- super (message);
- this.proxy = proxy;
- }
-
- /**
- * Get the proxy if there is one. It will be a proxy if {@link ExpressionProcesser#getExpressionProxyValue(int, Object[])}
- * was for an existing proxy but that proxy was not set. Otherwise it will be null. This is here for callers to
- * put special info in the proxy for the not set condition and report better info.
- *
- * @return the proxy (if not set) or <code>null</code> if no proxy available.
- *
- * @since 1.1.0
- */
- public InternalExpressionProxy getProxy() {
- return proxy;
- }
-}
\ No newline at end of file
diff --git a/plugins/org.eclipse.jem.proxy/initParser/org/eclipse/jem/internal/proxy/initParser/tree/PrefixOperator.java b/plugins/org.eclipse.jem.proxy/initParser/org/eclipse/jem/internal/proxy/initParser/tree/PrefixOperator.java
deleted file mode 100644
index b8b99b5..0000000
--- a/plugins/org.eclipse.jem.proxy/initParser/org/eclipse/jem/internal/proxy/initParser/tree/PrefixOperator.java
+++ /dev/null
@@ -1,77 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2005 IBM Corporation and others.
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
- *
- * Contributors:
- * IBM Corporation - initial API and implementation
- *******************************************************************************/
-/*
-
-
- */
-package org.eclipse.jem.internal.proxy.initParser.tree;
-
-/**
- * Enum for prefix operator.
- *
- * @since 1.1.0
- */
-public class PrefixOperator extends AbstractEnum {
-
- /**
- * Prefix plus "+"
- */
- public static final int PRE_PLUS_VALUE = 0;
-
- public static final PrefixOperator PRE_PLUS = new PrefixOperator(PRE_PLUS_VALUE, "Prefix +"); //$NON-NLS-1$
-
- /**
- * Prefix minus "-"
- */
- public static final int PRE_MINUS_VALUE = 1;
-
- public static final PrefixOperator PRE_MINUS = new PrefixOperator(PRE_MINUS_VALUE, "Prefix -"); //$NON-NLS-1$
-
- /**
- * Prefix bitwise complement "~"
- */
- public static final int PRE_COMPLEMENT_VALUE = 2;
-
- public static final PrefixOperator PRE_COMPLEMENT = new PrefixOperator(PRE_COMPLEMENT_VALUE, "Prefix ~"); //$NON-NLS-1$
-
- /**
- * Prefix logical not "!"
- */
- public static final int PRE_NOT_VALUE = 3;
-
- public static final PrefixOperator PRE_NOT = new PrefixOperator(PRE_NOT_VALUE, "Prefix !"); //$NON-NLS-1$
-
- /**
- * Return the prefix operator for the given enum value.
- * @param value
- * @return
- *
- * @since 1.1.0
- */
- public static PrefixOperator get(int value) {
- switch (value) {
- case PRE_PLUS_VALUE:
- return PRE_PLUS;
- case PRE_MINUS_VALUE:
- return PRE_MINUS;
- case PRE_COMPLEMENT_VALUE:
- return PRE_COMPLEMENT;
- case PRE_NOT_VALUE:
- return PRE_NOT;
- }
- return null;
- }
-
- private PrefixOperator(int value, String name) {
- super(value, name);
- }
-
-}
\ No newline at end of file
diff --git a/plugins/org.eclipse.jem.proxy/initParser/org/eclipse/jem/internal/proxy/initParser/tree/VariableReference.java b/plugins/org.eclipse.jem.proxy/initParser/org/eclipse/jem/internal/proxy/initParser/tree/VariableReference.java
deleted file mode 100644
index 7588b62..0000000
--- a/plugins/org.eclipse.jem.proxy/initParser/org/eclipse/jem/internal/proxy/initParser/tree/VariableReference.java
+++ /dev/null
@@ -1,58 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2005 IBM Corporation and others.
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
- *
- * Contributors:
- * IBM Corporation - initial API and implementation
- *******************************************************************************/
-/*
-
-
- */
-package org.eclipse.jem.internal.proxy.initParser.tree;
-
-
-/**
- * This represents a Variable Reference value. A variable reference value can be on the left
- * side of an assignment (e.g. field or array access) or on any side
- * of any expression. When on the left side of an assignment, then the
- * value can assigned to. Such as <code>x[3] = 4</code>. Or it is value
- * that can be used in expressions, such as <code>x[3] + 2</code>.
- * <p>
- * When dereferenced, the value is given (see {@link VariableReference#dereference()}) as
- * the result or it is set with a value and then deferenced (see {@link VariableReference#set(Object, Class)}).
- * <p>
- * The type of the reference is the type stored in the corresponding expressionTypeStack entry. This is the type
- * for assignment, and the type for dereferenced.
- * @since 1.1.0
- */
-public abstract class VariableReference {
-
- /**
- * Dereference the value.
- * @return the dereferenced value. Such as the result of <code>x[3]</code>. The type of the reference
- * is the type stored in the corresponding expressionTypeStack entry for this reference.
- * @throws IllegalAccessException
- * @throws IllegalArgumentException
- *
- * @since 1.1.0
- */
- public abstract Object dereference();
-
- /**
- * Set the value into the variable and dereference it. Once it is set it is
- * no longer a reference and must be dereferenced.
- * @param value value to set to.
- * @param type type of the value being set. It may be of use to the reference or maybe not.
- * @return the dereferenced value after being set. The type of the dereferenced value
- * is the type stored in the corresponding expressionTypeStack entry for this reference.
- * @throws IllegalAccessException
- * @throws IllegalArgumentException
- *
- * @since 1.1.0
- */
- public abstract Object set(Object value, Class type) throws IllegalArgumentException, IllegalAccessException;
-}
diff --git a/plugins/org.eclipse.jem.proxy/initParser/org/eclipse/jem/internal/proxy/initParser/tree/messages.properties b/plugins/org.eclipse.jem.proxy/initParser/org/eclipse/jem/internal/proxy/initParser/tree/messages.properties
deleted file mode 100644
index da6840d..0000000
--- a/plugins/org.eclipse.jem.proxy/initParser/org/eclipse/jem/internal/proxy/initParser/tree/messages.properties
+++ /dev/null
@@ -1,29 +0,0 @@
-###############################################################################
-# Copyright (c) 2003, 2005 IBM Corporation and others.
-# All rights reserved. This program and the accompanying materials
-# are made available under the terms of the Eclipse Public License v1.0
-# which accompanies this distribution, and is available at
-# http://www.eclipse.org/legal/epl-v10.html
-#
-# Contributors:
-# IBM Corporation - initial API and implementation
-###############################################################################
-ExpressionProcesser.CannotCastXToY_EXC_ = IWAV0156E Cannot cast "{0}" to be "{1}".
-ExpressionProcesser.InvalidOperandOfPrefixOperator_EXC_ = IWAV0157E {0} not valid as the operand of prefix operator "{1}".
-ExpressionProcesser.PopExpressionType.ExpressionVoid_EXC_=Expression was void.
-ExpressionProcesser.InvalidOperandOfOperator_EXC_ = IWAV0158E {0} not valid as the operand of operator "{1}".
-ExpressionProcesser.XIsGreaterThanNumberOfDimensionsInArray_EXC_ = IWAV0159E {0} is greater then number of dimensions ({1}) in the array
-ExpressionProcesser.CreateArrayAccessReference.OutOfBounds_EXC_=Index: {0} size:{1}
-ExpressionProcesser.PushTryEnd.TryEndReceivedOutOfOrder_EXC_=Try/end received out of order.
-ExpressionProcesser.PushEndmark.EndMarkOnNonExistingID_EXC_=Tried to do an end mark on a non-existing markID ({0})
-ExpressionProcesser.NotAnArray_EXC_ = IWAV0160E "{0}" is not an array.
-ExpressionProcesser.ArraytypeHasFewerDimensionsThanRequested_EXC_ = IWAV0161E Arraytype "{0}" has fewer dimensions than creation requested ({1}).
-ExpressionProcesser.CreateFieldAccessReference.FieldsTypesNotMatching_EXC_=Field receiver does not match the type of the field: Field: {0} receiver: {1}
-ExpressionProcesser.GetExpressionProxyValue.ExpressionProxyNotSet_EXC_=Expression Proxy never set.
-ExpressionProcesser.GetExpressionProxyValue.ExpressionProxyDoesntExist_EXC_=Expression proxy doesn't exist.
-ExpressionProcesser.PushBlockEnd.ReceivedEndBlocksOutOfOrder_EXC_=End Blocks received out of order.
-ExpressionProcesser.PushTryCatchClause.CatchReceivedOutOfOrder_EXC_=Catch received out of order.
-ExpressionProcesser.PushTryFinallyClause.FinallyReceivedOutOfOrder_EXC_=Finally received out of order.
-ExpressionProcesser.PushTryRethrow.RethrowReceivedOutOfOrder_EXC_=Rethrow received out of order.
-ExpressionProcesser.PushTryRethrow.RetryReceivedOutOfExecutingCatchClause_EXC_=Retry received outside of an executing catch clause
-ExpressionProcesser.PushSubexpressionEnd.ReceivedEndSubexpressionsOutOfOrder_EXC_=End Subexpressions received out of order.
diff --git a/plugins/org.eclipse.jem.proxy/plugin.properties b/plugins/org.eclipse.jem.proxy/plugin.properties
deleted file mode 100644
index e07dfc9..0000000
--- a/plugins/org.eclipse.jem.proxy/plugin.properties
+++ /dev/null
@@ -1,21 +0,0 @@
-###############################################################################
-# Copyright (c) 2003, 2005 IBM Corporation and others.
-# All rights reserved. This program and the accompanying materials
-# are made available under the terms of the Eclipse Public License v1.0
-# which accompanies this distribution, and is available at
-# http://www.eclipse.org/legal/epl-v10.html
-#
-# Contributors:
-# IBM Corporation - initial API and implementation
-###############################################################################
-#
-# $Source: /cvsroot/webtools/jeetools.move/webtools.javaee.git/plugins/org.eclipse.jem.proxy/plugin.properties,v $
-# $Revision: 1.7 $ $Date: 2005/08/24 20:39:07 $
-#
-
-
-pluginName=Java EMF Model Proxy Support
-providerName = Eclipse.org
-contributors.extensionpoint.name=Proxy configuration contributors
-extensions.extensionpoint.name=Proxy configuration extension registrations
-Launch.localProxy=Local Proxy Application
diff --git a/plugins/org.eclipse.jem.proxy/plugin.xml b/plugins/org.eclipse.jem.proxy/plugin.xml
deleted file mode 100644
index ca74b42..0000000
--- a/plugins/org.eclipse.jem.proxy/plugin.xml
+++ /dev/null
@@ -1,21 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<?eclipse version="3.0"?>
-<plugin>
-
- <extension-point id="contributors" name="%contributors.extensionpoint.name" schema="schema/contributors.exsd"/>
- <extension-point id="extensions" name="%extensions.extensionpoint.name" schema="schema/extensions.exsd"/>
-
- <extension
- point="org.eclipse.debug.core.launchConfigurationTypes">
- <launchConfigurationType
- name="%Launch.localProxy"
- delegate="org.eclipse.jem.internal.proxy.remote.LocalProxyLaunchDelegate"
- category="org.eclipse.jem.proxy"
- modes="run"
- id="org.eclipse.jem.proxy.LocalProxyLaunchConfigurationType"
- sourceLocatorId="org.eclipse.jdt.launching.sourceLocator.JavaSourceLookupDirector"
- sourcePathComputerId="org.eclipse.jdt.launching.sourceLookup.javaSourcePathComputer">
- </launchConfigurationType>
- </extension>
-
-</plugin>
diff --git a/plugins/org.eclipse.jem.proxy/proxy.jars b/plugins/org.eclipse.jem.proxy/proxy.jars
deleted file mode 100644
index 10aede4..0000000
--- a/plugins/org.eclipse.jem.proxy/proxy.jars
+++ /dev/null
@@ -1,4 +0,0 @@
-proxycommon.jar=/org.eclipse.jem.proxy/common_bin/
-initparser.jar=/org.eclipse.jem.proxy/common_bin/
-remotecommon.jar=/org.eclipse.jem.proxy/common_bin/
-vm/remotevm.jar=/org.eclipse.jem.proxy/vm_bin/
\ No newline at end of file
diff --git a/plugins/org.eclipse.jem.proxy/proxy/org/eclipse/jem/internal/proxy/awt/IStandardAwtBeanProxyFactory.java b/plugins/org.eclipse.jem.proxy/proxy/org/eclipse/jem/internal/proxy/awt/IStandardAwtBeanProxyFactory.java
deleted file mode 100644
index 00e894e..0000000
--- a/plugins/org.eclipse.jem.proxy/proxy/org/eclipse/jem/internal/proxy/awt/IStandardAwtBeanProxyFactory.java
+++ /dev/null
@@ -1,48 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2001, 2005 IBM Corporation and others.
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
- *
- * Contributors:
- * IBM Corporation - initial API and implementation
- *******************************************************************************/
-package org.eclipse.jem.internal.proxy.awt;
-/*
-
-
- */
-
-
-import org.eclipse.jem.internal.proxy.core.*;
-import org.eclipse.jem.internal.proxy.core.IBeanProxyFactory;
-/**
- * The Standard awt bean proxy factory.
- * This is the Interface that the desktop will talk
- * to.
- * Creation date: (12/3/99 11:52:09 AM)
- * @author: Joe Winchester
- */
-public interface IStandardAwtBeanProxyFactory extends IBeanProxyFactory {
- public static final String REGISTRY_KEY = "standard-java.awt"; //$NON-NLS-1$
-
-/**
- * Return a new bean proxy for the dimension argument
- * Creation date: (12/3/99 11:52:20 AM)
- * @author Joe Winchester
- */
-public IDimensionBeanProxy createDimensionBeanProxyWith(int width, int height);
-/**
- * Return a new bean proxy for the point argument
- * Creation date: (12/3/99 11:52:20 AM)
- * @author Joe Winchester
- */
-public IPointBeanProxy createPointBeanProxyWith(int x, int y);
-/**
- * Return a new bean proxy for the rectangle argument
- * Creation date: (12/3/99 11:52:20 AM)
- * @author Joe Winchester
- */
-public IRectangleBeanProxy createBeanProxyWith(int x, int y, int width, int height);
-}
diff --git a/plugins/org.eclipse.jem.proxy/proxy/org/eclipse/jem/internal/proxy/awt/JavaStandardAwtBeanConstants.java b/plugins/org.eclipse.jem.proxy/proxy/org/eclipse/jem/internal/proxy/awt/JavaStandardAwtBeanConstants.java
deleted file mode 100644
index 57cecb7..0000000
--- a/plugins/org.eclipse.jem.proxy/proxy/org/eclipse/jem/internal/proxy/awt/JavaStandardAwtBeanConstants.java
+++ /dev/null
@@ -1,254 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2001, 2005 IBM Corporation and others.
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
- *
- * Contributors:
- * IBM Corporation - initial API and implementation
- *******************************************************************************/
-package org.eclipse.jem.internal.proxy.awt;
-/*
-
-
- */
-
-
-import org.eclipse.jem.internal.proxy.core.*;
-
-/**
- * Standard AWT Constants
- *
- * Use the static accessor method (getConstants()) to get the appropriate
- * constants instance for the registry. This is done so that until the
- * the constants are needed, they aren't registered.
- *
- * NOTE: Since everything in here just proxies, there is
- * no need to have them separated by VM. That is why
- * this in the Proxy package.
- *
- * This is final because this can't be extended. This specific one
- * will be registered with the factory for this key. Any extensions
- * must be done in their own constants and registry key.
- *
- * Creation date: (4/7/00 4:47:48 PM)
- * @author: Administrator
- */
-public final class JavaStandardAwtBeanConstants {
-
- public static final Object REGISTRY_KEY = new Object();
-
- final boolean AWTLoaded; // AWT may not be available. So non-ui JVM's don't have AWT.
- final boolean AWTRegistered; // AWT was registered to be used in this VM. It may be registered, but still not available.
-
- final IFieldProxy dimensionHeightProxy;
- final IFieldProxy dimensionWidthProxy;
- final IMethodProxy setDimensionSizeHWProxy;
- final IMethodProxy setDimensionSizeDProxy;
-
- final IFieldProxy pointXProxy;
- final IFieldProxy pointYProxy;
- final IMethodProxy setPointLocationXYProxy;
- final IMethodProxy setPointLocationPProxy;
-
- final IFieldProxy rectangleHeightProxy;
- final IFieldProxy rectangleWidthProxy;
- final IFieldProxy rectangleXProxy;
- final IFieldProxy rectangleYProxy;
- final IMethodProxy setRectangleSizeHWProxy;
- final IMethodProxy setRectangleSizeDProxy;
- final IMethodProxy setRectangleLocationXYProxy;
- final IMethodProxy setRectangleLocationPProxy;
- final IMethodProxy setRectangleBoundsXYHWProxy;
- final IMethodProxy setRectangleBoundsRProxy;
-
-/**
- * Get the constants instance for the specified registry.
- */
-public static JavaStandardAwtBeanConstants getConstants(ProxyFactoryRegistry registry) {
- JavaStandardAwtBeanConstants constants = (JavaStandardAwtBeanConstants) registry.getConstants(REGISTRY_KEY);
- if (constants == null)
- registry.registerConstants(REGISTRY_KEY, constants = new JavaStandardAwtBeanConstants(registry, registry.getBeanProxyFactoryExtension(IStandardAwtBeanProxyFactory.REGISTRY_KEY) != null));
- return constants;
-}
-
-
-public JavaStandardAwtBeanConstants(ProxyFactoryRegistry registry, boolean isRegistered) {
- super();
-
- AWTRegistered = isRegistered;
- if (!AWTRegistered) {
- AWTLoaded = false;
- dimensionHeightProxy = dimensionWidthProxy = pointXProxy = pointYProxy = rectangleHeightProxy = rectangleWidthProxy = rectangleXProxy = rectangleYProxy = null;
- setDimensionSizeHWProxy = setDimensionSizeDProxy = setPointLocationXYProxy = setPointLocationPProxy = setRectangleSizeHWProxy = setRectangleSizeDProxy = setRectangleLocationXYProxy = setRectangleLocationPProxy = setRectangleBoundsXYHWProxy = setRectangleBoundsRProxy = null;
- return;
- }
-
- IStandardBeanTypeProxyFactory typeFactory = registry.getBeanTypeProxyFactory();
-
- IBeanTypeProxy dimensionTypeProxy = typeFactory.getBeanTypeProxy("java.awt.Dimension");//$NON-NLS-1$
- if (dimensionTypeProxy != null) {
- // AWT is available.
- AWTLoaded = true;
- IBeanTypeProxy intTypeProxy = typeFactory.getBeanTypeProxy("int"); //$NON-NLS-1$
-
- dimensionHeightProxy = dimensionTypeProxy.getFieldProxy("height");//$NON-NLS-1$
- dimensionWidthProxy = dimensionTypeProxy.getFieldProxy("width");//$NON-NLS-1$
- setDimensionSizeHWProxy = dimensionTypeProxy.getMethodProxy("setSize", new IBeanTypeProxy[] {intTypeProxy, intTypeProxy}); //$NON-NLS-1$
- setDimensionSizeDProxy = dimensionTypeProxy.getMethodProxy("setSize", new IBeanTypeProxy[] {dimensionTypeProxy}); //$NON-NLS-1$
-
- IBeanTypeProxy pointTypeProxy = typeFactory.getBeanTypeProxy("java.awt.Point");//$NON-NLS-1$
- pointXProxy = pointTypeProxy.getFieldProxy("x");//$NON-NLS-1$
- pointYProxy = pointTypeProxy.getFieldProxy("y"); //$NON-NLS-1$
- setPointLocationXYProxy = pointTypeProxy.getMethodProxy("setLocation", new IBeanTypeProxy[] {intTypeProxy, intTypeProxy}); //$NON-NLS-1$
- setPointLocationPProxy = pointTypeProxy.getMethodProxy("setLocation", new IBeanTypeProxy[] {pointTypeProxy}); //$NON-NLS-1$
-
-
- IBeanTypeProxy rectangleTypeProxy = typeFactory.getBeanTypeProxy("java.awt.Rectangle");//$NON-NLS-1$
- rectangleHeightProxy = rectangleTypeProxy.getFieldProxy("height");//$NON-NLS-1$
- rectangleWidthProxy = rectangleTypeProxy.getFieldProxy("width");//$NON-NLS-1$
- rectangleXProxy = rectangleTypeProxy.getFieldProxy("x");//$NON-NLS-1$
- rectangleYProxy = rectangleTypeProxy.getFieldProxy("y");//$NON-NLS-1$
- setRectangleSizeHWProxy = rectangleTypeProxy.getMethodProxy("setSize", new IBeanTypeProxy[] {intTypeProxy, intTypeProxy}); //$NON-NLS-1$
- setRectangleSizeDProxy = rectangleTypeProxy.getMethodProxy("setSize", new IBeanTypeProxy[] {dimensionTypeProxy}); //$NON-NLS-1$
- setRectangleLocationXYProxy = rectangleTypeProxy.getMethodProxy("setLocation", new IBeanTypeProxy[] {intTypeProxy, intTypeProxy}); //$NON-NLS-1$
- setRectangleLocationPProxy = rectangleTypeProxy.getMethodProxy("setLocation", new IBeanTypeProxy[] {pointTypeProxy}); //$NON-NLS-1$
- setRectangleBoundsXYHWProxy = rectangleTypeProxy.getMethodProxy("setBounds", new IBeanTypeProxy[] {intTypeProxy, intTypeProxy, intTypeProxy, intTypeProxy}); //$NON-NLS-1$
- setRectangleBoundsRProxy = rectangleTypeProxy.getMethodProxy("setBounds", new IBeanTypeProxy[] {rectangleTypeProxy}); //$NON-NLS-1$
- } else {
- AWTLoaded = false;
- dimensionHeightProxy = dimensionWidthProxy = pointXProxy = pointYProxy = rectangleHeightProxy = rectangleWidthProxy = rectangleXProxy = rectangleYProxy = null;
- setDimensionSizeHWProxy = setDimensionSizeDProxy = setPointLocationXYProxy = setPointLocationPProxy = setRectangleSizeHWProxy = setRectangleSizeDProxy = setRectangleLocationXYProxy = setRectangleLocationPProxy = setRectangleBoundsXYHWProxy = setRectangleBoundsRProxy = null;
- }
-}
-
-/**
- * Answer if AWT is available.
- */
-public boolean isAWTAvailable() {
- return AWTLoaded;
-}
-
-/**
- * Answer if AWT was registered to be available.
- */
-public boolean isAWTRegistered() {
- return AWTRegistered;
-}
-
-
-
-/**
- * getDimensionHeightFieldProxy method comment.
- */
-public IFieldProxy getDimensionHeightFieldProxy() {
- return dimensionHeightProxy;
-}
-/**
- * getDimensionWidthProxy method comment.
- */
-public IFieldProxy getDimensionWidthFieldProxy() {
- return dimensionWidthProxy;
-}
-/**
- * getDimensionSetSizeWHProxy method comment.
- */
-public IMethodProxy getDimensionSetSizeHWProxy() {
- return setDimensionSizeHWProxy;
-}
-/**
- * getDimensionSetSizeDProxy method comment.
- */
-public IMethodProxy getDimensionSetSizeDProxy() {
- return setDimensionSizeDProxy;
-}
-
-/**
- * getPointXFieldProxy method comment.
- */
-public IFieldProxy getPointXFieldProxy() {
- return pointXProxy;
-}
-/**
- * getPointYFieldProxy method comment.
- */
-public IFieldProxy getPointYFieldProxy() {
- return pointYProxy;
-}
-/**
- * getPointSetLocationXYProxy method comment.
- */
-public IMethodProxy getPointSetLocationXYProxy() {
- return setPointLocationXYProxy;
-}
-/**
- * getPointSetLocationPProxy method comment.
- */
-public IMethodProxy getPointSetLocationPProxy() {
- return setPointLocationPProxy;
-}
-/**
- * getRectangleHeightFieldProxy method comment.
- */
-public IFieldProxy getRectangleHeightFieldProxy() {
- return rectangleHeightProxy;
-}
-/**
- * getRectangleWidthFieldProxy method comment.
- */
-public IFieldProxy getRectangleWidthFieldProxy() {
- return rectangleWidthProxy;
-}
-/**
- * getRectangleXFieldProxy method comment.
- */
-public IFieldProxy getRectangleXFieldProxy() {
- return rectangleXProxy;
-}
-/**
- * getRectangleYFieldProxy method comment.
- */
-public IFieldProxy getRectangleYFieldProxy() {
- return rectangleYProxy;
-}
-/**
- * getRectangleSetSizeWHProxy method comment.
- */
-public IMethodProxy getRectangleSetSizeHWProxy() {
- return setRectangleSizeHWProxy;
-}
-/**
- * getRectangleSetSizeDProxy method comment.
- */
-public IMethodProxy getRectangleSetSizeDProxy() {
- return setRectangleSizeDProxy;
-}
-/**
- * getRectangleSetLocationXYProxy method comment.
- */
-public IMethodProxy getRectangleSetLocationXYProxy() {
- return setRectangleLocationXYProxy;
-}
-/**
- * getRectangleSetLocationPProxy method comment.
- */
-public IMethodProxy getRectangleSetLocationPProxy() {
- return setRectangleLocationPProxy;
-}
-
-/**
- * getRectangleSetBoundsXYHWProxy method comment.
- */
-public IMethodProxy getRectangleSetBoundsXYHWProxy() {
- return setRectangleBoundsXYHWProxy;
-}
-/**
- * getRectangleSetBoundsRProxy method comment.
- */
-public IMethodProxy getRectangleSetBoundsRProxy() {
- return setRectangleBoundsRProxy;
-}
-
-
-}
diff --git a/plugins/org.eclipse.jem.proxy/proxy/org/eclipse/jem/internal/proxy/core/BaseProxyFactoryRegistry.java b/plugins/org.eclipse.jem.proxy/proxy/org/eclipse/jem/internal/proxy/core/BaseProxyFactoryRegistry.java
deleted file mode 100644
index ba97229..0000000
--- a/plugins/org.eclipse.jem.proxy/proxy/org/eclipse/jem/internal/proxy/core/BaseProxyFactoryRegistry.java
+++ /dev/null
@@ -1,89 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2005 IBM Corporation and others.
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
- *
- * Contributors:
- * IBM Corporation - initial API and implementation
- *******************************************************************************/
-/*
-
-
- */
-package org.eclipse.jem.internal.proxy.core;
-
-/**
- * This is the Base Registry that all implementations should subclass.
- * <p>
- * It is not meant to be used by customers. It provides public functions only for access of individual implementations.
- * Customers should only access {@link org.eclipse.jem.internal.proxy.core.ProxyFactoryRegistry}.
- *
- * @since 1.1.0
- */
-public abstract class BaseProxyFactoryRegistry extends ProxyFactoryRegistry {
-
- private final String registryTypeID;
-
- /**
- * Construct with registry type ID. The type id should be provided by
- * each implementation. This will be used to provide specific type
- * registrations through contributions.
- *
- * @param registryTypeID
- *
- * @since 1.1.0
- */
- protected BaseProxyFactoryRegistry(String registryTypeID) {
- super();
- this.registryTypeID = registryTypeID;
- }
-
- /**
- * Return the reqistry type id.
- * @return
- *
- * @since 1.1.0
- */
- public String getRegistryTypeID() {
- return registryTypeID;
- }
-
- /**
- Register the current registered bean proxy factory to be used for creating IBeanProxy instances
- */
- public void registerBeanProxyFactory(IStandardBeanProxyFactory aStandardFactory) {
- fCurrentStandardBeanProxyFactory = aStandardFactory;
- }
-
- /**
- Register a factory to be used for creating IBeanProxy instances
- */
- public void registerBeanProxyFactory(String packageName, IBeanProxyFactory aFactory) {
- fRegisteredExtensionBeanProxyFactories.put(packageName, aFactory);
- }
-
- /**
- Register the current registered bean type proxy factory to be used for creating IBeanTypeProxy instances
- */
- public void registerBeanTypeProxyFactory(IStandardBeanTypeProxyFactory aStandardFactory) {
- fCurrentStandardBeanTypeProxyFactory = aStandardFactory;
- }
-
- /**
- Register a factory to be used for creating IBeanTypeProxy instances
- */
- public void registerBeanTypeProxyFactory(String packageName, IBeanTypeProxyFactory aFactory) {
- fRegisteredExtensionBeanTypeProxyFactories.put(packageName, aFactory);
- }
-
- /**
- * Set the Method Proxy Factory for this VM.
- * Creation date: (3/13/00 10:58:19 AM)
- */
- public void registerMethodProxyFactory(IMethodProxyFactory newMethodProxyFactory) {
- fMethodProxyFactory = newMethodProxyFactory;
- }
-
-}
diff --git a/plugins/org.eclipse.jem.proxy/proxy/org/eclipse/jem/internal/proxy/core/CollectionBeanProxyWrapper.java b/plugins/org.eclipse.jem.proxy/proxy/org/eclipse/jem/internal/proxy/core/CollectionBeanProxyWrapper.java
deleted file mode 100644
index 51c4158..0000000
--- a/plugins/org.eclipse.jem.proxy/proxy/org/eclipse/jem/internal/proxy/core/CollectionBeanProxyWrapper.java
+++ /dev/null
@@ -1,137 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2001, 2005 IBM Corporation and others.
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
- *
- * Contributors:
- * IBM Corporation - initial API and implementation
- *******************************************************************************/
-package org.eclipse.jem.internal.proxy.core;
-/*
-
-
- */
-
-import org.eclipse.core.runtime.*;
-/**
- * This is a wrapper for an java.util.Collection proxy.
- * It provides the collection methods to interface to
- * the proxy.
- */
-
-public class CollectionBeanProxyWrapper {
- protected final IBeanProxy fCollection;
- protected final JavaStandardBeanProxyConstants fConstants;
-
- /**
- * Construct with the collection.
- */
- public CollectionBeanProxyWrapper(IBeanProxy aCollectionProxy) {
- if (!aCollectionProxy.getTypeProxy().isKindOf(aCollectionProxy.getProxyFactoryRegistry().getBeanTypeProxyFactory().getBeanTypeProxy("java.util.Collection"))) //$NON-NLS-1$
- throw new ClassCastException(java.text.MessageFormat.format(ProxyMessages.ClassCast_EXC__IncorrectType, new Object[] {aCollectionProxy.getTypeProxy().getTypeName(), "java.util.Collection"})); //$NON-NLS-1$
- else
- fCollection = aCollectionProxy;
-
- fConstants = JavaStandardBeanProxyConstants.getConstants(aCollectionProxy.getProxyFactoryRegistry());
- }
-
- /**
- * Answer the collection proxy that this is wrappering.
- */
- public IBeanProxy getBeanProxy() {
- return fCollection;
- }
-
- /**
- * equals - Pass it on to the proxy to handle this.
- */
- public boolean equals(Object object) {
- return fCollection.equals(object);
- }
-
- /**
- * hashCode - Pass it on to the proxy to handle this.
- */
- public int hashCode() {
- return fCollection.hashCode();
- }
-
- /**
- * Collection accessors
- */
- public boolean add(IBeanProxy object) throws ThrowableProxy {
- return ((IBooleanBeanProxy) fConstants.getCollectionAdd().invoke(fCollection, object)).booleanValue();
- }
- public boolean addAll(IBeanProxy collection) throws ThrowableProxy {
- return ((IBooleanBeanProxy) fConstants.getCollectionAddAll().invoke(fCollection, collection)).booleanValue();
- }
- public void clear() throws ThrowableProxy {
- fConstants.getCollectionClear().invoke(fCollection);
- }
- public boolean contains(IBeanProxy object) {
- try {
- return ((IBooleanBeanProxy) fConstants.getCollectionContains().invoke(fCollection, object)).booleanValue();
- } catch (ThrowableProxy e) {
- // This shouldn't occur, so just log it.
- ProxyPlugin.getPlugin().getLogger().log(new Status(IStatus.ERROR, ProxyPlugin.getPlugin().getBundle().getSymbolicName(), 0, ProxyMessages.UnexpectedException_EXC_, e));
- return false;
- }
- }
- public boolean containsAll(IBeanProxy collection) {
- try {
- return ((IBooleanBeanProxy) fConstants.getCollectionContainsAll().invoke(fCollection, collection)).booleanValue();
- } catch (ThrowableProxy e) {
- // This shouldn't occur, so just log it.
- ProxyPlugin.getPlugin().getLogger().log(new Status(IStatus.ERROR, ProxyPlugin.getPlugin().getBundle().getSymbolicName(), 0, ProxyMessages.UnexpectedException_EXC_, e));
- return false;
- }
- }
- public boolean isEmpty() {
- try {
- return ((IBooleanBeanProxy) fConstants.getCollectionIsEmpty().invoke(fCollection)).booleanValue();
- } catch (ThrowableProxy e) {
- // This shouldn't occur, so just log it.
- ProxyPlugin.getPlugin().getLogger().log(new Status(IStatus.ERROR, ProxyPlugin.getPlugin().getBundle().getSymbolicName(), 0, ProxyMessages.UnexpectedException_EXC_, e));
- return true;
- }
- }
- public IteratorBeanProxyWrapper iterator() {
- try {
- IBeanProxy itr = fConstants.getCollectionIterator().invoke(fCollection);
- if (itr != null)
- return new IteratorBeanProxyWrapper(itr);
- else
- return null;
- } catch (ThrowableProxy e) {
- // This shouldn't occur, so just log it.
- ProxyPlugin.getPlugin().getLogger().log(new Status(IStatus.ERROR, ProxyPlugin.getPlugin().getBundle().getSymbolicName(), 0, ProxyMessages.UnexpectedException_EXC_, e));
- return null;
- }
- }
- public boolean remove(IBeanProxy object) throws ThrowableProxy {
- return ((IBooleanBeanProxy) fConstants.getCollectionRemove().invoke(fCollection, object)).booleanValue();
- }
- public boolean removeAll(IBeanProxy collection) throws ThrowableProxy {
- return ((IBooleanBeanProxy) fConstants.getCollectionRemoveAll().invoke(fCollection, collection)).booleanValue();
- }
- public boolean retainAll(IBeanProxy collection) throws ThrowableProxy {
- return ((IBooleanBeanProxy) fConstants.getCollectionRetainAll().invoke(fCollection, collection)).booleanValue();
- }
- public int size() {
- try {
- return ((IIntegerBeanProxy) fConstants.getCollectionSize().invoke(fCollection)).intValue();
- } catch (ThrowableProxy e) {
- // This shouldn't occur, so just log it.
- ProxyPlugin.getPlugin().getLogger().log(new Status(IStatus.ERROR, ProxyPlugin.getPlugin().getBundle().getSymbolicName(), 0, ProxyMessages.UnexpectedException_EXC_, e));
- return 0;
- }
- }
- public IArrayBeanProxy toArray() throws ThrowableProxy {
- return (IArrayBeanProxy) fConstants.getCollectionToArray().invoke(fCollection);
- }
- public IArrayBeanProxy toArray(IArrayBeanProxy array) throws ThrowableProxy {
- return (IArrayBeanProxy) fConstants.getCollectionToArrayWithArray().invoke(fCollection, array);
- }
-}
diff --git a/plugins/org.eclipse.jem.proxy/proxy/org/eclipse/jem/internal/proxy/core/ConfigurationContributorAdapter.java b/plugins/org.eclipse.jem.proxy/proxy/org/eclipse/jem/internal/proxy/core/ConfigurationContributorAdapter.java
deleted file mode 100644
index 570c72b..0000000
--- a/plugins/org.eclipse.jem.proxy/proxy/org/eclipse/jem/internal/proxy/core/ConfigurationContributorAdapter.java
+++ /dev/null
@@ -1,51 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2004, 2005 IBM Corporation and others.
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
- *
- * Contributors:
- * IBM Corporation - initial API and implementation
- *******************************************************************************/
-/*
-
-
- */
-package org.eclipse.jem.internal.proxy.core;
-
-import org.eclipse.core.runtime.CoreException;
-import org.eclipse.debug.core.ILaunchConfigurationWorkingCopy;
-
-/**
- * This is an implementation of IConfigurationContributor that does nothing. It
- * can be subclassed to provide specific overrides.
- * @since 1.0.0
- */
-public class ConfigurationContributorAdapter implements IConfigurationContributor {
-
-
- /* (non-Javadoc)
- * @see org.eclipse.jem.internal.proxy.core.IConfigurationContributor#initialize(org.eclipse.jem.internal.proxy.core.IConfigurationContributionInfo)
- */
- public void initialize(IConfigurationContributionInfo info) {
- }
-
- /* (non-Javadoc)
- * @see org.eclipse.jem.internal.proxy.core.IConfigurationContributor#contributeClasspaths(org.eclipse.jem.internal.proxy.core.IConfigurationContributionController)
- */
- public void contributeClasspaths(IConfigurationContributionController controller) throws CoreException {
- }
-
- /* (non-Javadoc)
- * @see org.eclipse.jem.internal.proxy.core.IConfigurationContributor#contributeToConfiguration(org.eclipse.debug.core.ILaunchConfigurationWorkingCopy)
- */
- public void contributeToConfiguration(ILaunchConfigurationWorkingCopy config) throws CoreException {
- }
-
- /* (non-Javadoc)
- * @see org.eclipse.jem.internal.proxy.core.IConfigurationContributor#contributeToRegistry(org.eclipse.jem.internal.proxy.core.ProxyFactoryRegistry)
- */
- public void contributeToRegistry(ProxyFactoryRegistry registry) {
- }
-}
diff --git a/plugins/org.eclipse.jem.proxy/proxy/org/eclipse/jem/internal/proxy/core/ContainerPathContributionMapping.java b/plugins/org.eclipse.jem.proxy/proxy/org/eclipse/jem/internal/proxy/core/ContainerPathContributionMapping.java
deleted file mode 100644
index 1f4ca36..0000000
--- a/plugins/org.eclipse.jem.proxy/proxy/org/eclipse/jem/internal/proxy/core/ContainerPathContributionMapping.java
+++ /dev/null
@@ -1,196 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2005 IBM Corporation and others.
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
- *
- * Contributors:
- * IBM Corporation - initial API and implementation
- *******************************************************************************/
-package org.eclipse.jem.internal.proxy.core;
-
-import java.lang.reflect.Array;
-import java.util.*;
-import java.util.regex.Pattern;
-
-
-/**
- * Mapping of container paths (Regular expressions) to configuration elements.
- * <p>
- * It can be instantiated by clients that need to built up a subset of the mapping from the
- * normal mapping done by {@link ProxyPlugin#getPluginExtensions(String)}.
- * <p>
- * To build one up separately clients would:
- * <pre><code>
- * ContainerPathContributionMapping mapping = new ContainerPathContributionMapping(contributionType);
- * mapping.addContribution(containerid, pattern, contribution);
- * ...
- * mapping.finalizeMapping();
- * </code></pre>
- *
- * @since 1.2.0
- */
-public class ContainerPathContributionMapping {
-
- /**
- * Used in {@link ContainerPathContributionMapping#containerIdToContributions} as the value of the map.
- * This contains a Pattern for a container path to match against to see if the contribution
- * should be used.
- * <p>
- * Normally it would be better to use {@link ContainerPathContributionMapping#getContributors(String, String[])}
- * to get all of the contributors for all of the paths of the same container id.
- *
- * @since 1.2.0
- */
- public static class ContainerContributionEntry {
-
- private final Object contribution;
- private final Pattern containerPathPattern;
-
- public ContainerContributionEntry(Object contribution, Pattern containerPathPattern) {
- this.contribution = contribution;
- this.containerPathPattern = containerPathPattern;
- }
-
-
- /**
- * @return Returns the contribution.
- *
- * @since 1.2.0
- */
- public final Object getContribution() {
- return contribution;
- }
-
-
- /**
- * @return Returns the container pattern for matching.
- *
- * @since 1.2.0
- */
- public final Pattern getContainerPathPattern() {
- return containerPathPattern;
- }
- }
-
-
- /**
- * Map of container ids (String, first segment of container path) to {@link ContainerContributionEntry[]}.
- * <p>
- * Normally it would be better to use {@link #getContributors(String, String[])}
- * to get all of the contributors for all of the paths of the same container id.
- *
- * @since 1.2.0
- */
- public Map containerIdToContributions = Collections.EMPTY_MAP;
-
- // TODO When 1.5, this can go away.
- private final Class contributionType;
-
- /**
- * Create with contribution type (i.e. the array type returned from {@link #getContributors(String, String[])}.
- * <p>
- * TODO This will go away with 1.5 because this will be templated.
- *
- * @param type
- *
- *
- * @since 1.2.0
- */
- public ContainerPathContributionMapping(Class type) {
- contributionType = type;
- }
-
-
- /**
- * Get the unique array of configuration elements (no duplicates) for the given container id, and
- * the set of container paths for that container id. For example, "SWT_CONTAINER" as containerID and
- * {"/SWT_CONTAINER/", "/SWT_CONTAINER/PDE/JFACE"} for container paths. This will then return configuration elements
- * that match these two paths in the container attribute of the configuration element. The container attribute
- * is a regular expression. For example "SWT_CONTAINER" will match both "/SWT_CONTAINER/" and "/SWT_CONTAINER/PDE/JFACE"
- * while "SWT_CONTAINER/.* /JFACE" will match "/SWT_CONTAINER/PDE/JFACE". (Note it is actually no space between the "*" and "/" but java comment syntax won't allow it.)
- * @param containerId id of all the containers in the list of paths (the first segment of all of the paths).
- * @param containerPaths array of all of the paths to look for contributions for.
- * @return array of configuration elements for the given list of paths. They will be in order declared within a plugin within plugin order.
- *
- * @since 1.2.0
- */
- public Object[] getContributors(String containerId, String[] containerPaths) {
- ContainerContributionEntry[] bundleContributions = (ContainerContributionEntry[]) containerIdToContributions.get(containerId);
- if (bundleContributions == null)
- return (Object[]) Array.newInstance(contributionType, 0);
- List contributions = new ArrayList();
- // Patterns that have been tested. Key is a pattern, value is Boolean. true if this pattern matched any of the container paths.
- // This way a pattern will only be tested once for the list of paths. If the pattern is found the list again we will know if it
- // should be selected or not.
- // The bundleContributions are in order declared within each plugin within plugin order.
- Map testedPatterns = new HashMap();
- for (int i = 0; i < bundleContributions.length; i++) {
- Boolean tested = (Boolean) testedPatterns.get(bundleContributions[i].getContainerPathPattern());
- if (tested == null) {
- // Need to test it.
- // Run through container paths and see if any match.
- tested = Boolean.FALSE;
- Pattern pattern = bundleContributions[i].getContainerPathPattern();
- for (int j = 0; j < containerPaths.length; j++) {
- if (pattern.matcher(containerPaths[j]).matches()) {
- tested = Boolean.TRUE;
- break;
- }
- }
- testedPatterns.put(pattern, tested);
- }
- if (tested.booleanValue())
- contributions.add(bundleContributions[i].getContribution());
- }
- return contributions.toArray((Object[]) Array.newInstance(contributionType, contributions.size()));
- }
-
- /**
- * Add contribution to mapping. This is not normally needed by clients unless the client needs to
- * build up a different container path mapping than the one normally created by {@link ProxyPlugin#processContributionExtensionPoint(String)}.
- * <p>
- * After all contributions have been added {@link #finalizeMapping()} must be called. If this
- * is not called then {@link #getContributors(String, String[])} will fail with exceptions.
-
- * @param containerId
- * @param pattern
- * @param contribution
- *
- * @since 1.2.0
- */
- public void addContribution(String containerId, Pattern pattern, Object contribution) {
- if (containerIdToContributions == Collections.EMPTY_MAP)
- containerIdToContributions = new HashMap(); // This is first call to add something.
- // We will build as list, but then change to array when done.
- Object contributions = containerIdToContributions.get(containerId);
- if (contributions == null) {
- contributions = new ArrayList(1);
- containerIdToContributions.put(containerId, contributions);
- } else if (!(contributions instanceof List)) {
- // It must be an array, so convert back to list so that we can add to it.
- List oldContributions = Arrays.asList((Object[]) contribution);
- contributions = new ArrayList(oldContributions.size());
- ((List) contributions).addAll(oldContributions);
- containerIdToContributions.put(containerId, contributions);
- }
- ((List) contributions).add(new ContainerContributionEntry(contribution, pattern));
-
- }
-
- /**
- * Finalize the mapping. This is called when clients are done with all {@link #addContribution(String)}.
- * It takes the mapping from an internal format that allowed for quicker building into the final format.
- *
- *
- * @since 1.2.0
- */
- public void finalizeMapping() {
- for (Iterator iter = containerIdToContributions.entrySet().iterator(); iter.hasNext();) {
- Map.Entry entry = (Map.Entry) iter.next();
- if (entry.getValue() instanceof List)
- entry.setValue(((List) entry.getValue()).toArray(new ContainerContributionEntry[((List) entry.getValue()).size()]));
- }
- }
-}
\ No newline at end of file
diff --git a/plugins/org.eclipse.jem.proxy/proxy/org/eclipse/jem/internal/proxy/core/ContributorExtensionPointInfo.java b/plugins/org.eclipse.jem.proxy/proxy/org/eclipse/jem/internal/proxy/core/ContributorExtensionPointInfo.java
deleted file mode 100644
index 61839e0..0000000
--- a/plugins/org.eclipse.jem.proxy/proxy/org/eclipse/jem/internal/proxy/core/ContributorExtensionPointInfo.java
+++ /dev/null
@@ -1,42 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2005 IBM Corporation and others.
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
- *
- * Contributors:
- * IBM Corporation - initial API and implementation
- *******************************************************************************/
-package org.eclipse.jem.internal.proxy.core;
-
-import java.util.Map;
-
-
-/**
- * Result from {@link ProxyPlugin#processContributionExtensionPoint(String)}
- *
- * @since 1.0.0
- */
-public class ContributorExtensionPointInfo {
-
- /**
- * Contributions that are based upon container paths that are built up from
- * the extension point.
- *
- * @since 1.2.0
- */
- public ContainerPathContributionMapping containerPathContributions;
-
- ContributorExtensionPointInfo() {
- // Not meant to be instantiated or subclassed outside of ProxyPlugin.
- }
-
- /**
- * Map of plugin ids (String) to contributions (IConfigurationElement[]) that was found with that id. For each plugin,
- * the contributions will be listed in plugin prereq order.
- */
- public Map pluginToContributions;
-
-
-}
\ No newline at end of file
diff --git a/plugins/org.eclipse.jem.proxy/proxy/org/eclipse/jem/internal/proxy/core/EnumerationBeanProxyWrapper.java b/plugins/org.eclipse.jem.proxy/proxy/org/eclipse/jem/internal/proxy/core/EnumerationBeanProxyWrapper.java
deleted file mode 100644
index feb900f..0000000
--- a/plugins/org.eclipse.jem.proxy/proxy/org/eclipse/jem/internal/proxy/core/EnumerationBeanProxyWrapper.java
+++ /dev/null
@@ -1,77 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2001, 2005 IBM Corporation and others.
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
- *
- * Contributors:
- * IBM Corporation - initial API and implementation
- *******************************************************************************/
-package org.eclipse.jem.internal.proxy.core;
-/*
-
-
- */
-
-
-import org.eclipse.core.runtime.IStatus;
-import org.eclipse.core.runtime.Status;
-/**
- * This is a wrapper for an java.util.Enumeration proxy.
- * It provides the Enumeration methods to interface to
- * the proxy.
- */
-
-public class EnumerationBeanProxyWrapper {
- protected final IBeanProxy fEnumeration;
- protected final JavaStandardBeanProxyConstants fConstants;
-
- /**
- * Construct with the collection.
- */
- public EnumerationBeanProxyWrapper(IBeanProxy anEnumerationProxy) {
-
- fEnumeration = anEnumerationProxy;
-
- fConstants = JavaStandardBeanProxyConstants.getConstants(anEnumerationProxy.getProxyFactoryRegistry());
- }
-
- /**
- * Answer the iterator proxy that this is wrappering.
- */
- public IBeanProxy getBeanProxy() {
- return fEnumeration;
- }
-
- /**
- * equals - Pass it on to the proxy to handle this.
- */
- public boolean equals(Object object) {
- return fEnumeration.equals(object);
- }
-
- /**
- * hashCode - Pass it on to the proxy to handle this.
- */
- public int hashCode() {
- return fEnumeration.hashCode();
- }
-
- /**
- * Enumeration accessors
- */
- public boolean hasMoreElements() {
- try {
- return ((IBooleanBeanProxy) fConstants.getEnumerationHasMoreElements().invoke(fEnumeration)).booleanValue();
- } catch (ThrowableProxy e) {
- // This shouldn't occur, so just log it.
- ProxyPlugin.getPlugin().getLogger().log(new Status(IStatus.ERROR, ProxyPlugin.getPlugin().getBundle().getSymbolicName(), 0, ProxyMessages.UnexpectedException_EXC_, e));
- return false;
- }
- }
- public IBeanProxy nextElement() throws ThrowableProxy {
- return fConstants.getEnumerationNextElement().invoke(fEnumeration);
- }
-
-}
diff --git a/plugins/org.eclipse.jem.proxy/proxy/org/eclipse/jem/internal/proxy/core/Expression.java b/plugins/org.eclipse.jem.proxy/proxy/org/eclipse/jem/internal/proxy/core/Expression.java
deleted file mode 100644
index 99645a7..0000000
--- a/plugins/org.eclipse.jem.proxy/proxy/org/eclipse/jem/internal/proxy/core/Expression.java
+++ /dev/null
@@ -1,2546 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2004, 2005 IBM Corporation and others.
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
- *
- * Contributors:
- * IBM Corporation - initial API and implementation
- *******************************************************************************/
-/*
-
-
- */
-package org.eclipse.jem.internal.proxy.core;
-
-import java.text.MessageFormat;
-import java.util.*;
-
-import org.eclipse.jem.internal.proxy.initParser.tree.*;
-
-/**
- * This is implementation of IExpression. It encapsulates much of the processing required
- * into a common form that will be turned into simple push/pop/evaluate type of interaction with the
- * actual other side. All registry specific implementations of IExpression must subclass this class.
- * <p>
- * It will maintain a stack of the expressions. As the expressions come in they will be stacked if not
- * able to be executed immediately. The expressions come to this class in an outside to inside order,
- * but they need to be processed in an inside-out order instead.
- * <p>
- * Subclasses will be used for the different types of proxy interfaces. The abstract methods will
- * then be the simple interface.
- * <p>
- * It is not meant for subclasses to override the actual create expression methods because the processing the stack
- * is very sensitive and must execute in the proper sequence. So the create methods are final for this reason.
- * <p>
- * This class is not thread-safe.
- * <p>
- * This class also has API of its own and can be used by customers for advanced usage. Those advanced API are
- * listed on each method as to whether it is customer API or implementers API (i.e. API for implementers of
- * expression subclasses to use).
- *
- *
- * @since 1.0.0
- */
-public abstract class Expression implements IExpression {
-
- /*
- * We have stack here, but rather than create a class that does the
- * stack protocol, will simply have some private methods to do
- * the same thing for the stack. (Note: Can't use java.util.Stack
- * because that is a synchronized class, and don't want the overhead).
- *
- * The purpose of the stack is to stack up expressions that have not yet
- * been evaluated.
- *
- * Each expression type will control the content of what it pushes and pops.
- * The expression type will be the last thing it pushes so that on popping
- * we know what kind of expression is now completed and ready for evaluation.
- */
- private ArrayList controlStack = new ArrayList(30);
-
- protected final ProxyFactoryRegistry registry;
- protected final IStandardBeanProxyFactory beanProxyFactory;
- protected Boolean traceFlag;
-
- /**
- * Answer whether trace has been explicitly set.
- * This is not in the IExpression interface because it is for advanced users.
- * @return
- *
- * @since 1.1.0
- */
- public boolean isTraceSet() {
- return traceFlag != null;
- }
-
- /**
- * Answer if trace is on. If not explicitly set this will answer false.
- * Use {@link Expression#isTraceSet()} first to determine if this
- * should be called or not.
- * This is not in the IExpression interface because it is for advanced users.
- * @return
- *
- * @since 1.1.0
- */
- public boolean isTrace() {
- return traceFlag != null ? traceFlag.booleanValue() : false;
- }
-
- /**
- * Explicitly set the trace flag. This will only be honoured before any
- * expressions have been created. After that this will be ignored.
- * The trace is initially set to use default. Once set it cannot be unset.
- * This is not in the IExpression interface because it is for advanced users.
- * @param trace
- *
- * @since 1.1.0
- */
- public void setTrace(boolean trace) {
- traceFlag = Boolean.valueOf(trace);
- }
-
- /**
- * Push an object onto the control stack.
- *
- * @param o
- *
- * @since 1.0.0
- */
- protected final void push(Object o) {
- controlStack.add(o);
- }
-
- /**
- * Pop an object off of the control stack
- * @return
- *
- * @since 1.0.0
- */
- protected final Object pop() {
- return controlStack.remove(controlStack.size()-1);
- }
-
- /**
- * Peek at an object from the control stack. <code>fromTop</code> is how far from the top of the stack to look.
- * If it one, then it is the top entry, two is the next one down. Zero is an invalid value for the parameter.
- * @param fromTop How far from the top to peek. <code>1</code> is the top, not zero.
- * @return
- *
- * @since 1.0.0
- */
- protected final Object peek(int fromTop) {
- // 1 means the top, 2 is the next one down.
- return controlStack.get(controlStack.size()-fromTop);
- }
-
- /*
- * Expression type constants.
- */
-
- /*
- * ARRAY ACCESS expression.
- * The expression stack will have:
- * IExpression.ARRAYACCESS_ARRAY
- * IExpression.ARRAYACCESS_INDEX (for 1 to n times depending on index count)
- * PROCESS_EXPRESSION
- *
- * The value stack will have
- * ARRAYACCESS
- * Integer(index count)
- */
- private static final Integer ARRAYACCESS_INDEX_1 = new Integer(1); // Use in normal case of one index count. Saves object creation.
-
- /*
- * ARRAY CREATION expression.
- * The expression stack will have:
- * ARRAYCREATION_INITIALIZER - if hasInitializer
- * IExpression.ARRAYCREATION_DIMENSION (for 0 to n times depending on dimension count)
- * PROCESS_EXPRESSION
- *
- * The value stack will have
- * ARRAYCREATION
- * type (either a string representing the type, or an IBeanProxyType representing the type).
- * Integer(dimension count) (if zero then there is an initializer)
- *
- *
- * Note: Array Initializer works with this in that it will peek into the value stack two entries down
- * to find the type of array it should be creating.
- */
- private static final Integer ARRAY_CREATION_DIMENSION_1 = new Integer(1); // Use in normal case of one dimension. Save object creation.
- private static final Integer ARRAY_CREATION_DIMENSION_0 = new Integer(0); // Use in normal case of initializer. Save object creation.
- private static final ForExpression ARRAY_INITIALIZER = new ExpressionEnum(Integer.MIN_VALUE+1, "Array Initializer Internal"); //$NON-NLS-1$
-
- /*
- * ARRAY INITIALIZER expression
- * The expression stack will have:
- * IExpression.ARRAYINITIALIZER_EXPRESSION (for n times depending on number of expressions count)
- * PROCESS_EXPRESSION
- *
- * The value stack will have
- * ARRAYINITIALIZER
- * type (either a string representing the type, or an IBeanProxyType representing the type).
- * I.e. if array being created is int[][], the value pushed here will be int[]. This is because when created
- * the array will wind up with int[expressioncount][] in the end.
- * Integer (expression count)
- *
- * Note: Imbedded Array Initializers works with this in that it will peek into the value stack two entries down
- * to find the type of array it should be creating.
- */
- private static final Integer ARRAYINITIALIZER_COUNT_0 = new Integer(0); // Use in normal case of empty array. Save object creation.
- private static final Integer ARRAYINITIALIZER_COUNT_1 = new Integer(1); // Use in normal case of one element array. Save object creation.
- private static final Integer ARRAYINITIALIZER_COUNT_2 = new Integer(2); // Use in normal case of two element array. Save object creation.
-
- /*
- * CAST expression.
- * The expression stack will have:
- * IExpression.CAST_EXPRESSION
- * PROCESS_EXPRESSION
- *
- * The value stack will have:
- * CAST
- * type (either a string representing the type, or an IBeanProxyType representing the type).
- */
-
- /*
- * CLASS INSTANCE CREATION expression.
- * The expression stack will have:
- * IExpression.CLASSINSTANCECREATION_ARGUMENT (for 0 to n times depending on argument count)
- * PROCESS_EXPRESSION
- *
- * The value stack will have
- * CLASSINSTANCECREATION
- * type (either a string representing the type, or an IBeanProxyType representing the type).
- * Integer(argument count)
- *
- *
- * Note: Array Initializer works with this in that it will peek into the value stack two entries down
- * to find the type of array it should be creating.
- */
- private static final Integer CLASS_INSTANCE_CREATION_ARGUMENTS_1 = new Integer(1); // Use in normal case of one argument. Save object creation.
- private static final Integer CLASS_INSTANCE_CREATION_ARGUMENTS_0 = new Integer(0); // Use in normal case of no arguments (default ctor). Save object creation.
-
- /*
- * CONDITIONAL expression.
- * Since this can cause skipping of expressions (e.g. if condition is false, then the true condition should not be evaluated),
- * we need to have a process expression and process call to the other side for each expression so that it can
- * determine if it should be ignored or not.
- *
- * The expression stack will have:
- * IExpression.CONDITIONAL_CONDITION
- * PROCESS_EXPRESSION
- * IExpression.CONDITIONAL_TRUE
- * PROCESS_EXPRESSION
- * IExpression.CONDITIONAL_FALSE
- * PROCESS_EXPRESSION
- *
- * The value stack will have:
- * CONDITIONAL
- * CONDITIONAL_CONDITION
- * CONDITIONAL
- * CONDITIONAL_TRUE
- * CONDITIONAL
- * CONDITIONAL_FALSE
- *
- */
-
- /*
- * PREFIX expression.
- * The expression stack will have:
- * IExpression.PREFIX_OPERAND
- * PROCESS_EXPRESSION
- *
- * The value stack will have:
- * PREFIX
- * operator (using Integer prefix operator constants defined here)
- */
-
- /*
- * INFIX expression.
- * Since two types of infix operators (conditional and AND or) can cause skipping of expressions (e.g. once
- * conditional and sees a false expression, the rest of the expressions are skipped and should not be evaluated),
- * we need to have a process expression and process call to the other side for each expression so that it can
- * determine if it should be ignored or not.
- *
- * The expression stack will have:
- * IExpression.INFIX_LEFT
- * PROCESS_EXPRESSION
- * IExpression.INFIX_RIGHT
- * PROCESS_EXPRESSION
- * (for 0 to n times depending upon extended count)
- * IExpression.INFIX_EXTENDED
- * PROCESS_EXPRESSION
- *
- * The value stack will have:
- * INFIX
- * operator (using Integer infix operator constants defined here)
- * IN_LEFT
- * (for (extendedCount) times) This will cover the right one and all but last extended
- * INFIX
- * operator (using Integer infix operator constants defined here)
- * IN_OTHER
- * INFIX
- * operator (using Integer infix operator constants defined here)
- * IN_LAST (this is covers either the right one if no extended, or the last extended)
- */
-
- /*
- * INSTANCEOF expression.
- * The expression stack will have:
- * IExpression.INSTANCEOF_EXPRESSION
- * PROCESS_EXPRESSION
- *
- * The value stack will have:
- * INSTANCEOF
- * type (either a string representing the type, or an IBeanProxyType representing the type).
- */
-
- /*
- * Field access expression.
- * The expression stack will have:
- * IExpression.FIELD_RECEIVER (if hasReceiver is true)
- * PROCESS_EXPRESSION
- *
- * The value stack will have:
- * FIELDACCESS
- * name (the name of the field)
- * Boolean (true if has receiver)
- */
-
- /*
- * Method invocation expression.
- * The expression stack will have:
- * IExpression.METHOD_RECEIVER (if hasReceiver is true)
- * IExpression.METHOD_ARGUMENT (0 to n times for how many arguments).
- * PROCESS_EXPRESSION
- *
- * The value stack will have:
- * METHODINVOCATION
- * name (the name of the method)
- * Boolean (true if has receiver)
- * argCount (the number of arguments).
- */
- private static final Integer METHOD_ARGUMENTS_1 = new Integer(1); // Use in normal case of one argument. Save object creation.
- private static final Integer METHOD_ARGUMENTS_0 = new Integer(0); // Use in normal case of no arguments. Save object creation.
-
-
- /*
- * Assignment expression
- * The expression stack will have:
- * IExpression.ASSIGNMENT_RIGHT
- * IExpression.ASSIGNMENT_LEFT
- * PROCESS_EXPRESSION
- *
- * The value stack will have:
- * ASSIGNMENT
- * left expression (variable reference)
- * right expression
- */
-
- /*
- * Assignment proxy expression
- * The expression stack will have:
- * IExpression.ASSIGNMENT_RIGHT
- * PROCESS_EXPRESSION
- *
- * The value stack will have:
- * ASSIGNMENT_PROXY
- * expression proxy (an expression proxy)
- */
-
- /*
- * Next valid for expression stack. This is kept as a stack also.
- * As the expressions come in, the appropriate order (in reverse)
- * of expression types will be pushed, and then popped as they
- * come in.
- *
- * Since we can't have an array list of ints, will simulate the
- * stack here.
- */
- private ForExpression[] nextForExpressionStack = new ForExpression[30];
- private int nextForExpressionStackPos = -1; // Position of top entry in stack.
- private boolean expressionValid = true; // Is the expression currently valid.
- private String invalidMsg = null; // Msg for being invalid if default msg not sufficient.
- private List expressionProxies; // List of expression proxies. The index of the proxy is its id. This list must never shrink in size.
-
- // A MarkEntry. To allow restore in case of error.
- private static class MarkEntry {
- public int markID;
- public int controlStackPos; // Position of control stack at time of mark.
- public int nextExpressionStackPos; // Position of nextForExpression stack at time of mark.
- public int expressionProxiesPos; // Position of expressionProxies list at time of mark.
- }
-
- private int highestMarkID = 0; // Next mark id. '0' is invalid, as in no marks. This is incremented for each new mark. Never decremented.
- private MarkEntry currentMarkEntry; // Just a convienence to the current mark entry so no need to look into the list every time.
- private List markEntries; // Stack of mark entries.
-
- // This class is here so we can add our special internal ForExpression: PROCESS_EXPRESSION. These are never used outside Expression.
- private static class ExpressionEnum extends ForExpression {
-
- public ExpressionEnum(int value, String name) {
- super(value, name);
- }
-
- }
-
- // This is pushed onto the next expression stack, and when it is popped, then the expression is complete and ready to be pushed to the proxy side.
- private static final ForExpression PROCESS_EXPRESSION = new ExpressionEnum(Integer.MIN_VALUE, "Process Expression"); //$NON-NLS-1$
-
- // This is pushed onto the next expression stack for end block and will test if this there to make sure that it is being called correctly.
- private static final ForExpression BLOCKEND_EXPRESSION = new ExpressionEnum(PROCESS_EXPRESSION.getValue()-2, "End Block Expression"); //$NON-NLS-1$
-
- // This is pushed onto the next expression stack for end try and will test if this there to make sure that it is being called correctly.
- private static final ForExpression TRYEND_EXPRESSION = new ExpressionEnum(BLOCKEND_EXPRESSION.getValue()-1, "End Try Expression"); //$NON-NLS-1$
-
- // This is pushed onto the next expression stack for catch and will test if this there to make sure that it is being called correctly.
- private static final ForExpression TRYCATCH_EXPRESSION = new ExpressionEnum(TRYEND_EXPRESSION.getValue()-1, "Catch Expression"); //$NON-NLS-1$
-
-
- // This is pushed onto the next expression stack for begin thread transfer and will test if this there to make sure that it is being called correctly.
- private static final ForExpression THREADTRANSFER_EXPRESSION = new ExpressionEnum(TRYCATCH_EXPRESSION.getValue()-1, "Catch Expression"); //$NON-NLS-1$
-
- // This is pushed onto the next expression stack for end subexpression and will test if this there to make sure that it is being called correctly.
- private static final ForExpression SUBEXPRESSIONEND_EXPRESSION = new ExpressionEnum(THREADTRANSFER_EXPRESSION.getValue()-2, "End Subexpression"); //$NON-NLS-1$
-
- /**
- * Check the for expression, and if legal, set to the next valid for expression type,
- * if it can. If the stack entry is ROOTEXPRESSION, and the forExpression is ROOTEXPRESSION,
- * then the expression is allowed, but it is not popped. It must be popped later when appropriate.
- * <p>
- * This is for "block" expressions. We don't want to pop down the stack passed the ROOTEXPRESSION
- * that got added by the create block until we get an end block. That allows root expressions to
- * be added to the block without the stack popping up past the block start in the stack.
- *
- * @param forExpression
- * @throws IllegalStateException
- *
- * @since 1.0.0
- */
- protected final void checkForExpression(ForExpression forExpression) throws IllegalStateException {
- if (expressionValid) {
- if (nextForExpressionStackPos == -1)
- if (forExpression == ForExpression.ROOTEXPRESSION)
- return; // valid. We are at the root (i.e. nothing is waiting).
- else
- ; // invalid. drop through
- else if (nextForExpressionStack[nextForExpressionStackPos] == forExpression) {
- // Valid, either the root expression matched (We don't implicitly pop those. That needs to be done explicitly).
- // Or we matched non-root, those will be popped.
- if (forExpression != ForExpression.ROOTEXPRESSION) {
- popForExpression(); // Pop the stack since stack not a root expression.
- }
- return;
- }
- } else {
- String expMsg = invalidMsg != null ? MessageFormat.format(ProxyMessages.Expression_InInvalidStateDueTo_EXC_, new Object[] {invalidMsg}) : ProxyMessages.Expression_InInvalidState_EXC_;
- throw new IllegalStateException(expMsg);
- }
-
- // If we got here, then invalid.
- ForExpression expected = nextForExpressionStackPos >= 0 ? nextForExpressionStack[nextForExpressionStackPos] : ForExpression.ROOTEXPRESSION;
- expressionValid = false;
- throw new IllegalStateException(MessageFormat.format(ProxyMessages.Expression_TypeSentInInvalidOrder_EXC_, new Object[] {forExpression, expected}));
- }
-
- /**
- * Pop the top for expression, whatever it is.
- * @throws IllegalStateException thrown if try to pop through through the current mark entry. The endMark is the only one who can do this.
- * @since 1.1.0
- */
- protected final void popForExpression() throws IllegalStateException {
- if (expressionValid && nextForExpressionStackPos >= 0) {
- nextForExpressionStackPos--;
- if (currentMarkEntry != null && nextForExpressionStackPos < currentMarkEntry.nextExpressionStackPos) {
- nextForExpressionStackPos++; // Restore to what it was
- throwInvalidMarkNesting();
- }
- }
- }
-
- /*
- * @throws IllegalStateException
- *
- * @since 1.1.0
- */
- private void throwInvalidMarkNesting() throws IllegalStateException {
- expressionValid = false;
- throw new IllegalStateException(MessageFormat.format(ProxyMessages.Expression_InvalidMarkNesting, new Object[] {new Integer(currentMarkEntry != null ? currentMarkEntry.markID : 0)}));
- }
-
- /**
- * Peek into the for expression stack to see if the top entry is the passed in value. It will
- * not pop the stack nor throw any exceptions.
- *
- * @param forExpression The top expression flag will be compared against this value.
- * @return <code>true</code> if the top expression equals the parameter passed in.
- *
- * @since 1.0.0
- */
- protected final boolean peekForExpression(ForExpression forExpression) {
- if (expressionValid) {
- if (nextForExpressionStackPos == -1)
- if (forExpression == ForExpression.ROOTEXPRESSION)
- return true; // valid. We are at the root (i.e. nothing is waiting).
- else
- ; // invalid. drop through
- else if (nextForExpressionStack[nextForExpressionStackPos] == forExpression)
- return true; // Valid, the top expression matched.
- }
- return false;
- }
-
- /**
- * Mark this expression as now invalid.
- */
- protected final void markInvalid() {
- expressionValid = false;
- }
-
- /**
- * Mark this expression as now invalid, but supply a message to go with it.
- *
- * @param msg
- *
- * @since 1.0.0
- */
- protected final void markInvalid(String msg) {
- invalidMsg = msg;
- markInvalid();
- }
-
- public void close() {
- nextForExpressionStackPos = -1;
- controlStack.clear();
- if (expressionProxies != null)
- markAllProxiesNotResolved(expressionProxies); // They weren't processed, close must of been called early.
- expressionProxies = null;
- markEntries = null;
- expressionValid = false;
- closeProxy();
- }
-
-
- /* (non-Javadoc)
- * @see org.eclipse.jem.internal.proxy.core.IExpression#isValid()
- */
- public boolean isValid() {
- return expressionValid;
- }
-
- /*
- * Check if the pending expression is ready for evaluation.
- * It is complete if the next entry on the stack is a PROCESS_EXPRESSION
- */
- private boolean expressionReady() {
- if (nextForExpressionStackPos >= 0 && nextForExpressionStack[nextForExpressionStackPos] == PROCESS_EXPRESSION) {
- checkForExpression(PROCESS_EXPRESSION); // pop it
- return true;
- } else
- return false;
- }
-
- /*
- * Push the next expression type.
- */
- private void pushForExpression(ForExpression nextExpression) {
- if (++nextForExpressionStackPos >= nextForExpressionStack.length) {
- // Increase stack size.
- ForExpression[] newStack = new ForExpression[nextForExpressionStackPos*2]; // So room to grow without excessive allocations.
- System.arraycopy(nextForExpressionStack, 0, newStack, 0, nextForExpressionStack.length);
- nextForExpressionStack = newStack;
- }
- nextForExpressionStack[nextForExpressionStackPos] = nextExpression;
- }
-
- /*
- * Check if expression is complete, and if it is, process it.
- */
- private void processExpression() {
- while (expressionReady()) {
- try {
- // We've received all of the expressions for the expression, so process it.
- int expType = ((InternalExpressionTypes) pop()).getValue();
- switch (expType) {
- case InternalExpressionTypes.CAST_EXPRESSION_VALUE:
- pushCastToProxy((IProxyBeanType) pop());
- break;
- case InternalExpressionTypes.INSTANCEOF_EXPRESSION_VALUE:
- pushInstanceofToProxy((IProxyBeanType) pop());
- break;
- case InternalExpressionTypes.PREFIX_EXPRESSION_VALUE:
- pushPrefixToProxy((PrefixOperator)pop());
- break;
- case InternalExpressionTypes.INFIX_EXPRESSION_VALUE:
- pushInfixToProxy((InfixOperator) pop(), (InternalInfixOperandType) pop());
- break;
- case InternalExpressionTypes.ARRAY_ACCESS_EXPRESSION_VALUE:
- pushArrayAccessToProxy(((Integer) pop()).intValue());
- break;
- case InternalExpressionTypes.ARRAY_CREATION_EXPRESSION_VALUE:
- pushArrayCreationToProxy((IProxyBeanType) pop(), ((Integer) pop()).intValue());
- break;
- case InternalExpressionTypes.ARRAY_INITIALIZER_EXPRESSION_VALUE:
- pushArrayInitializerToProxy((IProxyBeanType) pop(), ((Integer) pop()).intValue(), ((Integer) pop()).intValue());
- break;
- case InternalExpressionTypes.CLASS_INSTANCE_CREATION_EXPRESSION_VALUE:
- pushClassInstanceCreationToProxy((IProxyBeanType) pop(), ((Integer) pop()).intValue());
- break;
- case InternalExpressionTypes.FIELD_ACCESS_EXPRESSION_VALUE:
- pushFieldAccessToProxy(pop(), ((Boolean) pop()).booleanValue());
- break;
- case InternalExpressionTypes.METHOD_EXPRESSION_VALUE:
- pushMethodInvocationToProxy(pop(), ((Boolean) pop()).booleanValue(), ((Integer) pop()).intValue());
- break;
- case InternalExpressionTypes.CONDITIONAL_EXPRESSION_VALUE:
- pushConditionalToProxy((InternalConditionalOperandType) pop());
- break;
- case InternalExpressionTypes.ASSIGNMENT_PROXY_EXPRESSION_VALUE:
- pushAssignmentToProxy((ExpressionProxy) pop());
- break;
- case InternalExpressionTypes.ASSIGNMENT_EXPRESSION_VALUE:
- pushAssignmentToProxy();
- break;
- case InternalExpressionTypes.BLOCK_END_EXPRESSION_VALUE:
- pushBlockEndToProxy(((Integer) pop()).intValue());
- break;
- case InternalExpressionTypes.TRY_END_EXPRESSION_VALUE:
- pushTryEndToProxy(((Integer) pop()).intValue());
- break;
- case InternalExpressionTypes.THROW_EXPRESSION_VALUE:
- pushThrowToProxy();
- break;
- case InternalExpressionTypes.IF_TEST_EXPRESSION_VALUE:
- pushIfTestToProxy();
- break;
- case InternalExpressionTypes.IF_ELSE_EXPRESSION_VALUE:
- pushIfElseToProxy((InternalIfElseOperandType) pop());
- break;
- case InternalExpressionTypes.SUBEXPRESSION_END_EXPRESSION_VALUE:
- pushSubexpressionEndToProxy(((Integer) pop()).intValue());
- break;
- default:
- internalProcessUnknownExpressionType(expType);
- break;
- }
- } catch (RuntimeException e) {
- markInvalid();
- throw e;
- }
- }
- }
-
-
- private void internalProcessUnknownExpressionType(int expressionType) throws IllegalArgumentException {
- if (!processUnknownExpressionType(expressionType))
- throw new IllegalArgumentException();
- }
-
- /**
- * An unknown expression type was found in the processing of expression stack. Subclasses can override
- * to process new types of expressions.
- * <p>
- * Overrides must return <code>true</code> if they processed the expression type. If they return <code>false</code>
- * it means they didn't understand it either and we should do default processing for unknow type.
- * @param expressionType
- * @return <code>true</code> if type was processed, <code>false</code> if not known by subclass either.
- *
- * @since 1.0.0
- */
- protected boolean processUnknownExpressionType(int expressionType) {
- return false;
- }
-
- /**
- * Create the expression.
- *
- * @param registry
- *
- * @since 1.0.0
- */
- protected Expression(ProxyFactoryRegistry registry) {
- this.registry = registry;
- this.beanProxyFactory = this.registry.getBeanProxyFactory();
- }
-
-
- /* (non-Javadoc)
- * @see org.eclipse.jem.internal.proxy.core.IExpression#getRegistry()
- */
- public ProxyFactoryRegistry getRegistry() {
- return registry;
- }
-
- /* (non-Javadoc)
- * @see org.eclipse.jem.internal.proxy.core.IExpression#invokeExpression()
- */
- public final void invokeExpression() throws ThrowableProxy, IllegalStateException, NoExpressionValueException {
- try {
- checkForExpression(ForExpression.ROOTEXPRESSION); // We are at the root.
- popForExpression(); // Get rid of any intermediate roots.
- checkForExpression(ForExpression.ROOTEXPRESSION); // We should be at true root now. We don't have more than one intermediate root pushed in sequence.
- List proxies = expressionProxies;
- expressionProxies = null;
- pushInvoke(processExpressionProxyCallbacks(proxies), proxies);
- } finally {
- markInvalid(); // Mark invalid so any new calls after this will fail.
- close();
- }
- }
-
- /*
- * Process the expression proxy callbacks, if any.
- * @return the number of proxies that have callbacks.
- */
- private int processExpressionProxyCallbacks(List proxies) {
- if (proxies != null) {
- // Strip list down to only those with callbacks and send on.
- int proxiesWithCallbacks = 0;
- for (ListIterator eps = proxies.listIterator(); eps.hasNext();) {
- ExpressionProxy proxy = (ExpressionProxy) eps.next();
- if (!proxy.hasListeners())
- eps.set(null); // Remove it from the list. No one cares.
- else
- proxiesWithCallbacks++;
- }
- return proxiesWithCallbacks;
- }
- return 0;
- }
-
- /**
- * Called to validate this is a valid proxy for this expression. This could happen
- * if a proxy from another expression is sent to this expression. If the proxy
- * is a bean proxy or is an expression proxy for this expression, then this
- * just returns. Else it will throw the {@link IllegalArgumentException}.
- * @param proxy
- * @throws IllegalArgumentException if the proxy is an expression proxy for another expression.
- *
- * @since 1.1.0.1
- */
- private void validateProxy(IProxy proxy) throws IllegalArgumentException {
- if (proxy != null && (proxy.isExpressionProxy() && ((ExpressionProxy) proxy).getExpression() != this))
- throw new IllegalArgumentException(ProxyMessages.Expression_InvalidProxy);
- }
-
- /**
- * Called by subclass to fill in the value of an expression proxy. See {@link Expression#pullProxyValue(int, List))} for an example of who would call it.
- * @param ep
- * @param beanproxy
- *
- * @since 1.1.0
- */
- protected void fireProxyResolved(ExpressionProxy ep, IBeanProxy beanproxy) {
- ep.fireResolved(beanproxy);
- }
-
- /**
- * Called by subclass to fire proxy was not resolved. See {@link Expression#pullProxyValue(int, List))} for an example of who would call it.
- * @param ep
- *
- * @since 1.1.0
- */
- protected void fireProxyNotResolved(ExpressionProxy ep) {
- ep.fireNotResolved();
- }
-
- /**
- * Called by subclass to fire proxy resolved to a void return type. See {@link Expression#pullProxyValue(int, List))} for an example of who would call it.
- * @param ep
- *
- * @since 1.1.0
- */
- protected void fireProxyVoid(ExpressionProxy ep) {
- ep.fireVoidResolved();
- }
-
- /* (non-Javadoc)
- * @see org.eclipse.jem.internal.proxy.core.IExpression#getExpressionValue()
- */
- public final IBeanProxy getExpressionValue() throws ThrowableProxy, NoExpressionValueException, IllegalStateException {
- try {
- checkForExpression(ForExpression.ROOTEXPRESSION); // We are at the root.
- popForExpression(); // Get rid of any intermediate roots.
- checkForExpression(ForExpression.ROOTEXPRESSION); // We should be at true root now. We don't have more than one intermediate root pushed in sequence.
- List proxies = expressionProxies;
- expressionProxies = null;
- return pullProxyValue(processExpressionProxyCallbacks(proxies), proxies); // Get the top value.
- } finally {
- markInvalid(); // Mark invalid so any new calls after this will fail.
- close();
- }
- }
-
-
- /**
- * Mark the list of proxies as not resolved.
- *
- * @since 1.1.0
- */
- protected void markAllProxiesNotResolved(List proxies) {
- if (proxies != null) {
- for (ListIterator eps = proxies.listIterator(); eps.hasNext();) {
- ExpressionProxy proxy = (ExpressionProxy) eps.next();
- if (proxy != null && proxy.hasListeners())
- fireProxyNotResolved(proxy);
- }
- }
- }
-
- private int blockNumber = -1; // Current block number. This is always incrementing.
-
- /*
- * (non-Javadoc)
- * @see org.eclipse.jem.internal.proxy.core.IExpression#createBlockBegin()
- */
- public final int createBlockBegin() throws IllegalStateException {
- try {
- // Blocks are special, they can be anywhere at root, of could be the true or else clause of an if/else.
- if (peekForExpression(ForExpression.ROOTEXPRESSION))
- checkForExpression(ForExpression.ROOTEXPRESSION);
- else if (peekForExpression(ForExpression.IF_TRUE))
- checkForExpression(ForExpression.IF_TRUE);
- else
- checkForExpression(ForExpression.IF_ELSE);
-
- pushForExpression(PROCESS_EXPRESSION);
- pushForExpression(BLOCKEND_EXPRESSION);
- pushForExpression(ForExpression.ROOTEXPRESSION);
-
- pushBlockBeginToProxy(++blockNumber);
- push(new Integer(blockNumber));
- push(InternalExpressionTypes.BLOCK_END_EXPRESSION);
- processExpression();
- return blockNumber;
- } catch (RuntimeException e) {
- markInvalid();
- throw e;
- }
- }
-
-
- /* (non-Javadoc)
- * @see org.eclipse.jem.internal.proxy.core.IExpression#createBlockBreak(int)
- */
- public final void createBlockBreak(int blockNumber) throws IllegalStateException {
- try {
- checkForExpression(ForExpression.ROOTEXPRESSION);
- pushBlockBreakToProxy(blockNumber);
- processExpression();
- } catch (RuntimeException e) {
- markInvalid();
- throw e;
- }
- }
-
- /*
- * (non-Javadoc)
- * @see org.eclipse.jem.internal.proxy.core.IExpression#createBlockEnd()
- */
- public final void createBlockEnd() throws IllegalStateException {
- try {
- checkForExpression(ForExpression.ROOTEXPRESSION);
- popForExpression(); // Remove the root expression since block is done.
- checkForExpression(BLOCKEND_EXPRESSION); // This needs to be next for it to be valid.
- processExpression(); // Now let it handle the previously pushed end block, containing the block number being ended.
- } catch (RuntimeException e) {
- markInvalid();
- throw e;
- }
- }
-
- /* (non-Javadoc)
- * @see org.eclipse.jem.internal.proxy.core.IExpression#createArrayAccess(int, int)
- */
- public final void createArrayAccess(ForExpression forExpression, int indexCount) {
- try {
- checkForExpression(forExpression);
- pushForExpression(PROCESS_EXPRESSION);
- int i = indexCount;
- while (i-- > 0)
- pushForExpression(ForExpression.ARRAYACCESS_INDEX);
- pushForExpression(ForExpression.ARRAYACCESS_ARRAY);
-
- push(indexCount == 1 ? ARRAYACCESS_INDEX_1 : new Integer(indexCount));
- push(InternalExpressionTypes.ARRAY_ACCESS_EXPRESSION);
- processExpression(); // See if previous expression is ready for processing.
- } catch (RuntimeException e) {
- markInvalid();
- throw e;
- }
- }
- /* (non-Javadoc)
- * @see org.eclipse.jem.internal.proxy.core.IExpression#createArrayCreation(int, java.lang.String, int)
- */
- public final void createArrayCreation(ForExpression forExpression, String type, int dimensionExpressionCount)
- throws IllegalStateException {
- pushArrayCreation(forExpression, getProxyBeanType(type), dimensionExpressionCount);
- }
-
- /*
- * (non-Javadoc)
- * @see org.eclipse.jem.internal.proxy.core.IExpression#createArrayCreation(org.eclipse.jem.internal.proxy.initParser.tree.ForExpression, org.eclipse.jem.internal.proxy.core.IProxyBeanType, int)
- */
- public final void createArrayCreation(ForExpression forExpression, IProxyBeanType type, int dimensionExpressionCount)
- throws IllegalStateException, IllegalArgumentException {
- pushArrayCreation(forExpression, type, dimensionExpressionCount);
- }
-
- private void pushArrayCreation(ForExpression forExpression, IProxyBeanType type, int dimensionExpressionCount) throws IllegalStateException, IllegalArgumentException {
- try {
- checkForExpression(forExpression);
- validateProxy(type);
- switch (dimensionExpressionCount) {
- case 0:
- push(ARRAY_CREATION_DIMENSION_0);
- break;
- case 1:
- push(ARRAY_CREATION_DIMENSION_1);
- break;
- default:
- push(new Integer(dimensionExpressionCount));
- break;
- }
- push(type);
- push(InternalExpressionTypes.ARRAY_CREATION_EXPRESSION);
-
- pushForExpression(PROCESS_EXPRESSION);
- if (dimensionExpressionCount == 0)
- pushForExpression(ARRAY_INITIALIZER);
- else {
- while (dimensionExpressionCount-- > 0)
- pushForExpression(ForExpression.ARRAYCREATION_DIMENSION);
- }
- processExpression(); // See if previous expression is ready for processing.
- } catch (RuntimeException e) {
- markInvalid();
- throw e;
- }
- }
-
- /* (non-Javadoc)
- * @see org.eclipse.jem.internal.proxy.core.IExpression#createArrayInitializer(int)
- */
- public final void createArrayInitializer(int expressionCount) throws IllegalStateException {
- try {
- // This is special, we could be waiting for an array initializer or an array initializer expression.
- // We will peek to see what it is and handle it.
- if (peekForExpression(ARRAY_INITIALIZER))
- checkForExpression(ARRAY_INITIALIZER);
- else
- checkForExpression(ForExpression.ARRAYINITIALIZER_EXPRESSION);
-
- // At this point in time that stack may either have:
- // array_type, array_creation
- // strip_count, array_type, array_initializer
- // So we can get the array type from peek(2), and get the command type from peek(1).
- // Then if the command type is array_creation, strip_count will be inited to 0, while
- // else it will be inited to peek(3). From that we can increment the strip_count to
- // use for this initializer.
- //
- // We need to peek here because we will be adding various pushes to the stack and we
- // need to get the info while it is still at the top of the stack.
- Object arrayType = peek(2);
- int stripCount = 0;
- if (peek(1) == InternalExpressionTypes.ARRAY_INITIALIZER_EXPRESSION)
- stripCount = ((Integer) peek(3)).intValue();
-
- switch (expressionCount) {
- case 0:
- push(ARRAYINITIALIZER_COUNT_0);
- break;
- case 1:
- push(ARRAYINITIALIZER_COUNT_1);
- break;
- case 2:
- push(ARRAYINITIALIZER_COUNT_2);
- break;
- default:
- push(new Integer(expressionCount));
- break;
- }
-
- if (arrayType instanceof String) {
- String at = (String) arrayType;
- int i = at.lastIndexOf("[]"); //$NON-NLS-1$
- if (i == -1)
- throw new IllegalArgumentException(MessageFormat.format(
- ProxyMessages.Expression_ArrayTypeNotAnArray_EXC_, new Object[] { arrayType}));
- arrayType = getProxyBeanType(at);
- } else if (!(arrayType instanceof IProxyBeanType)) {
- throw new IllegalArgumentException(MessageFormat.format(
- ProxyMessages.Expression_ArrayTypeNotAnArray_EXC_, new Object[] { arrayType}));
- }
- push(new Integer(++stripCount));
- push(arrayType);
- push(InternalExpressionTypes.ARRAY_INITIALIZER_EXPRESSION);
-
- pushForExpression(PROCESS_EXPRESSION);
- while (expressionCount-- > 0)
- pushForExpression(ForExpression.ARRAYINITIALIZER_EXPRESSION);
-
- processExpression();
- } catch (RuntimeException e) {
- markInvalid();
- throw e;
- }
- }
-
- /* (non-Javadoc)
- * @see org.eclipse.jem.internal.proxy.core.IExpression#createCastExpression(int, java.lang.String)
- * A cast expression has one nested expression.
- */
- public final void createCastExpression(ForExpression forExpression, String type) throws IllegalStateException {
- pushCast(forExpression, getProxyBeanType(type)); // Push this onto the local stack to wait for completion.
- }
-
- /*
- * (non-Javadoc)
- * @see org.eclipse.jem.internal.proxy.core.IExpression#createCastExpression(org.eclipse.jem.internal.proxy.initParser.tree.ForExpression, org.eclipse.jem.internal.proxy.core.IProxyBeanType)
- */
- public final void createCastExpression(ForExpression forExpression, IProxyBeanType type) throws IllegalStateException, IllegalArgumentException {
- pushCast(forExpression, type); // Push this onto the local stack to wait for completion.
- }
-
- /*
- * Push for a cast.
- */
- private void pushCast(ForExpression forExpression, IProxyBeanType type) throws IllegalStateException, IllegalArgumentException {
- try {
- checkForExpression(forExpression);
- validateProxy(type);
- push(type);
- push(InternalExpressionTypes.CAST_EXPRESSION);
- pushForExpression(PROCESS_EXPRESSION);
- pushForExpression(ForExpression.CAST_EXPRESSION); // The next expression must be for the cast expression.
- processExpression();
- } catch (RuntimeException e) {
- markInvalid();
- throw e;
- }
- }
-
- /* (non-Javadoc)
- * @see org.eclipse.jem.internal.proxy.core.IExpression#createClassInstanceCreation(int, java.lang.String, int)
- */
- public final void createClassInstanceCreation(ForExpression forExpression, String type, int argumentCount)
- throws IllegalStateException {
- pushClassInstanceCreation(forExpression, getProxyBeanType(type), argumentCount); // Push this onto the local stack to wait for completion.
- }
-
- /*
- * (non-Javadoc)
- * @see org.eclipse.jem.internal.proxy.core.IExpression#createClassInstanceCreation(org.eclipse.jem.internal.proxy.initParser.tree.ForExpression, org.eclipse.jem.internal.proxy.core.IProxyBeanType, int)
- */
- public final void createClassInstanceCreation(ForExpression forExpression, IProxyBeanType type, int argumentCount)
- throws IllegalStateException, IllegalArgumentException {
- pushClassInstanceCreation(forExpression, type, argumentCount); // Push this onto the local stack to wait for completion.
- }
-
- /*
- * Push for a class instance creation
- */
- private void pushClassInstanceCreation(ForExpression forExpression, IProxyBeanType type, int argumentCount) throws IllegalStateException, IllegalArgumentException {
- try {
- checkForExpression(forExpression);
- validateProxy(type);
- switch (argumentCount) {
- case 0:
- push(CLASS_INSTANCE_CREATION_ARGUMENTS_0);
- break;
- case 1:
- push(CLASS_INSTANCE_CREATION_ARGUMENTS_1);
- break;
- default:
- push(new Integer(argumentCount));
- break;
- }
- push(type);
- push(InternalExpressionTypes.CLASS_INSTANCE_CREATION_EXPRESSION);
-
- pushForExpression(PROCESS_EXPRESSION);
- while (argumentCount-- > 0)
- pushForExpression(ForExpression.CLASSINSTANCECREATION_ARGUMENT);
- processExpression(); // See if previous expression is ready for processing.
- } catch (RuntimeException e) {
- markInvalid();
- throw e;
- }
- }
-
- /* (non-Javadoc)
- * @see org.eclipse.jem.internal.proxy.core.IExpression#createConditionalExpression(int)
- */
- public final void createConditionalExpression(ForExpression forExpression) throws IllegalStateException {
- try {
- checkForExpression(forExpression);
- pushForExpression(PROCESS_EXPRESSION);
- pushForExpression(ForExpression.CONDITIONAL_FALSE);
- pushForExpression(PROCESS_EXPRESSION);
- pushForExpression(ForExpression.CONDITIONAL_TRUE);
- pushForExpression(PROCESS_EXPRESSION);
- pushForExpression(ForExpression.CONDITIONAL_CONDITION);
-
- push(InternalConditionalOperandType.CONDITIONAL_FALSE);
- push(InternalExpressionTypes.CONDITIONAL_EXPRESSION);
- push(InternalConditionalOperandType.CONDITIONAL_TRUE);
- push(InternalExpressionTypes.CONDITIONAL_EXPRESSION);
- push(InternalConditionalOperandType.CONDITIONAL_TEST);
- push(InternalExpressionTypes.CONDITIONAL_EXPRESSION);
- processExpression();
- } catch (RuntimeException e) {
- markInvalid();
- throw e;
- }
- }
-
- /* (non-Javadoc)
- * @see org.eclipse.jem.internal.proxy.core.IExpression#createFieldAccess(int, java.lang.String, boolean)
- */
- public final void createFieldAccess(ForExpression forExpression, String fieldName, boolean hasReceiver) throws IllegalStateException, IllegalArgumentException {
- try {
- // Only for string fieldnames is this invalid when no receiver because no way to determine receiver. (Don't handle implicit "this" yet for fields).
- // For the accessor that takes a IFieldProxy we can get away with no receiver because the field proxy can determine if static or not, and if not
- // static it will fail at evaluation time.
- if (!hasReceiver)
- throw new IllegalArgumentException(MessageFormat.format(
- ProxyMessages.Expression_CannotHandleNoReceiveOnFieldAccess_EXC_, new Object[] { fieldName}));
- pushFieldAccess(forExpression, fieldName, hasReceiver);
- } catch (RuntimeException e) {
- markInvalid();
- throw e;
- }
- }
-
-
- /* (non-Javadoc)
- * @see org.eclipse.jem.internal.proxy.core.IExpression#createIfElse(boolean)
- */
- public final void createIfElse(boolean hasElseClause) throws IllegalStateException {
- try {
- checkForExpression(ForExpression.ROOTEXPRESSION);
-
- pushForExpression(PROCESS_EXPRESSION);
- if (hasElseClause) {
- pushForExpression(ForExpression.IF_ELSE);
- }
- pushForExpression(PROCESS_EXPRESSION);
- pushForExpression(ForExpression.IF_TRUE);
- pushForExpression(PROCESS_EXPRESSION);
- pushForExpression(ForExpression.IF_CONDITION);
-
- // We still push an else clause so that we know when finished. We don't have a pushForExpression for it because there
- // won't be any. But the else clause processing will be on the push stack so that we can clean up when end of if stmt occurs.
- push(InternalIfElseOperandType.ELSE_CLAUSE);
- push(InternalExpressionTypes.IF_ELSE_EXPRESSION);
-
- push(InternalIfElseOperandType.TRUE_CLAUSE);
- push(InternalExpressionTypes.IF_ELSE_EXPRESSION);
- push(InternalExpressionTypes.IF_TEST_EXPRESSION);
- processExpression();
- } catch (RuntimeException e) {
- markInvalid();
- throw e;
- }
- }
-
- /*
- * Push the field access.
- * @param forExpression
- * @param field String if field name, or IProxyField.
- * @param hasReceiver
- * @throws IllegalAccessException
- *
- * @since 1.1.0
- */
- private void pushFieldAccess(ForExpression forExpression, Object field, boolean hasReceiver) throws IllegalStateException {
- try {
- checkForExpression(forExpression);
- push(hasReceiver ? Boolean.TRUE : Boolean.FALSE); // We have a receiver
- push(field);
- push(InternalExpressionTypes.FIELD_ACCESS_EXPRESSION);
-
- pushForExpression(PROCESS_EXPRESSION);
- if (hasReceiver)
- pushForExpression(ForExpression.FIELD_RECEIVER);
- processExpression(); // See if previous expression is ready for processing.
- } catch (RuntimeException e) {
- markInvalid();
- throw e;
- }
- }
-
- /* (non-Javadoc)
- * @see org.eclipse.jem.internal.proxy.core.IExpression#createInfixExpression(int, int, int)
- */
- public final void createInfixExpression(ForExpression forExpression, InfixOperator operator, int extendedOperandCount) throws IllegalStateException {
- try {
- checkForExpression(forExpression);
- push(InternalInfixOperandType.INFIX_LAST_OPERAND);
- push(operator);
- push(InternalExpressionTypes.INFIX_EXPRESSION);
- int i = extendedOperandCount;
- while (i-- > 0) {
- push(InternalInfixOperandType.INFIX_OTHER_OPERAND);
- push(operator);
- push(InternalExpressionTypes.INFIX_EXPRESSION);
- }
- push(InternalInfixOperandType.INFIX_LEFT_OPERAND);
- push(operator);
- push(InternalExpressionTypes.INFIX_EXPRESSION);
-
- i = extendedOperandCount;
- while (i-- > 0) {
- pushForExpression(PROCESS_EXPRESSION);
- pushForExpression(ForExpression.INFIX_EXTENDED);
- }
- pushForExpression(PROCESS_EXPRESSION);
- pushForExpression(ForExpression.INFIX_RIGHT);
- pushForExpression(PROCESS_EXPRESSION);
- pushForExpression(ForExpression.INFIX_LEFT);
- processExpression(); // See if previous expression is ready for processing.
- } catch (RuntimeException e) {
- markInvalid();
- throw e;
- }
- }
-
- /* (non-Javadoc)
- * @see org.eclipse.jem.internal.proxy.core.IExpression#createInstanceofExpression(int, java.lang.String)
- */
- public final void createInstanceofExpression(ForExpression forExpression, String type) throws IllegalStateException {
- pushInstanceof(forExpression, getProxyBeanType(type)); // Push this onto the local stack to wait for completion.
- }
-
- /*
- * (non-Javadoc)
- * @see org.eclipse.jem.internal.proxy.core.IExpression#createInstanceofExpression(org.eclipse.jem.internal.proxy.initParser.tree.ForExpression, org.eclipse.jem.internal.proxy.core.IProxyBeanType)
- */
- public final void createInstanceofExpression(ForExpression forExpression, IProxyBeanType type) throws IllegalStateException, IllegalArgumentException {
- pushInstanceof(forExpression, type); // Push this onto the local stack to wait for completion.
- }
-
- /*
- * Push for a cast.
- */
- private void pushInstanceof(ForExpression forExpression, IProxyBeanType type) throws IllegalStateException, IllegalArgumentException {
- try {
- checkForExpression(forExpression);
- validateProxy(type);
- push(type);
- push(InternalExpressionTypes.INSTANCEOF_EXPRESSION);
- pushForExpression(PROCESS_EXPRESSION);
- pushForExpression(ForExpression.INSTANCEOF_VALUE); // The next expression must be for the instance of expression.
- processExpression();
- } catch (RuntimeException e) {
- markInvalid();
- throw e;
- }
- }
-
- /* (non-Javadoc)
- * @see org.eclipse.jem.internal.proxy.core.IExpression#createMethodInvocation(int, java.lang.String, boolean, int)
- */
- public final void createMethodInvocation(ForExpression forExpression, String name, boolean hasReceiver, int argumentCount)
- throws IllegalStateException, IllegalArgumentException {
- try {
- // Only for string methodnames is this invalid when no receiver because no way to determine receiver. (Don't handle implicit "this" yet for methods).
- // For the accessor that takes a IFieldProxy we can get away with no receiver because the field proxy can determine if static or not, and if not
- // static it will fail at evaluation time.
- if (!hasReceiver)
- throw new IllegalArgumentException(MessageFormat.format(
- ProxyMessages.Expression_MethodsNeedReceiver_EXC_, new Object[] { name}));
-
- pushMethodInvocation(forExpression, name, hasReceiver, argumentCount);
- } catch (RuntimeException e) {
- markInvalid();
- throw e;
- }
- }
-
- /**
- * @param forExpression
- * @param method String for method name, IMethodProxy otherwise.
- * @param hasReceiver
- * @param argumentCount
- * @throws ThrowableProxy
- * @throws NoExpressionValueException
- *
- * @since 1.1.0
- */
- private void pushMethodInvocation(ForExpression forExpression, Object method, boolean hasReceiver, int argumentCount) throws IllegalArgumentException, IllegalStateException {
- try {
- checkForExpression(forExpression);
- switch (argumentCount) {
- case 0:
- push(METHOD_ARGUMENTS_0);
- break;
- case 1:
- push(METHOD_ARGUMENTS_1);
- break;
- default:
- push(new Integer(argumentCount));
- break;
- }
- push(hasReceiver ? Boolean.TRUE : Boolean.FALSE);
- push(method);
- push(InternalExpressionTypes.METHOD_EXPRESSION);
-
- pushForExpression(PROCESS_EXPRESSION);
- while (argumentCount-- > 0)
- pushForExpression(ForExpression.METHOD_ARGUMENT);
- if (hasReceiver)
- pushForExpression(ForExpression.METHOD_RECEIVER);
- processExpression(); // See if previous expression is ready for processing.
- } catch (RuntimeException e) {
- markInvalid();
- throw e;
- }
- }
-
- /*
- * (non-Javadoc)
- * @see org.eclipse.jem.internal.proxy.core.IExpression#createPrefixExpression(int, org.eclipse.jem.internal.proxy.initParser.tree.PrefixOperator)
- */
- public final void createPrefixExpression(ForExpression forExpression, PrefixOperator operator) throws IllegalStateException {
- try {
- checkForExpression(forExpression);
- push(operator);
- push(InternalExpressionTypes.PREFIX_EXPRESSION);
-
- pushForExpression(PROCESS_EXPRESSION);
- pushForExpression(ForExpression.PREFIX_OPERAND);
- processExpression(); // See if previous expression is ready for processing.
- } catch (RuntimeException e) {
- markInvalid();
- throw e;
- }
- }
-
- /**
- * Create a new instance using the initialization string. The result must be compatible with the
- * given type. This is not on the IExpression interface because it is not for use of regular
- * customers. It is here for the allocation processer to create entries that are just strings.
- * <p>
- * This is not customer advanced API. This API for the implementers of registries and expression subclasses.
- *
- * @param forExpression
- * @param initializationString
- * @param type
- * @throws IllegalStateException
- * @throws IllegalArgumentException
- *
- * @since 1.1.0
- */
- public final void createNewInstance(ForExpression forExpression, String initializationString, IProxyBeanType type) throws IllegalStateException, IllegalArgumentException{
- try {
- checkForExpression(forExpression);
- validateProxy(type);
- pushNewInstanceToProxy(initializationString, type);
- processExpression();
- } catch (RuntimeException e) {
- markInvalid();
- throw e;
- }
- }
-
- /* (non-Javadoc)
- * @see org.eclipse.jem.internal.proxy.core.IExpression#createNull(int)
- */
- public final void createNull(ForExpression forExpression) throws IllegalStateException {
- try {
- checkForExpression(forExpression);
- pushToProxy(null);
- processExpression(); // See if previous expression is ready for processing.
- } catch (RuntimeException e) {
- markInvalid();
- throw e;
- }
- }
-
- /* (non-Javadoc)
- * @see org.eclipse.jem.internal.proxy.core.IExpression#createTypeLiteral(int, java.lang.String)
- */
- public final void createTypeLiteral(ForExpression forExpression, String type) throws IllegalStateException {
- createProxyExpression(forExpression, getProxyBeanType(type));
- }
-
- /* (non-Javadoc)
- * @see org.eclipse.jem.internal.proxy.core.IExpression#createTypeReceiver(java.lang.String)
- */
- public final void createTypeReceiver(String type) throws IllegalStateException {
- pushTypeReceiver(getProxyBeanType(type));
- }
-
- /*
- * (non-Javadoc)
- * @see org.eclipse.jem.internal.proxy.core.IExpression#createTypeReceiver(org.eclipse.jem.internal.proxy.core.IProxyBeanType)
- */
- public final void createTypeReceiver(IProxyBeanType type) throws IllegalStateException, IllegalArgumentException {
- validateProxy(type);
- pushTypeReceiver(type);
- }
-
- /*
- * Push for a type receiver.
- * @param type
- *
- * @since 1.0.0
- */
- private void pushTypeReceiver(IProxyBeanType type) throws IllegalStateException {
- try {
- // This is special because type receivers are only valid as the receiver for a field access or a method access.
- // Since each has a different forExpression we need to test for one or the other. It doesn't make any difference
- // which one it is, but it must be one or the other.
- if (peekForExpression(ForExpression.FIELD_RECEIVER))
- checkForExpression(ForExpression.FIELD_RECEIVER);
- else
- checkForExpression(ForExpression.METHOD_RECEIVER);
-
- pushTypeReceiverToProxy(type);
- processExpression(); // See if previous expression is ready for processing.
- } catch (RuntimeException e) {
- markInvalid();
- throw e;
- }
- }
-
- /*
- * For all of the primitive types we will be creating a IBeanProxy for them. That is because that
- * would be the expected result of the expression, and no need to get the other side involved.
- */
-
-
- /* (non-Javadoc)
- * @see org.eclipse.jem.internal.proxy.core.IExpression#createPrimitiveLiteral(int, boolean)
- */
- public final void createPrimitiveLiteral(ForExpression forExpression, boolean value) throws IllegalStateException {
- try {
- checkForExpression(forExpression);
- pushToProxy(beanProxyFactory.createBeanProxyWith(value));
- processExpression();
- } catch (RuntimeException e) {
- markInvalid();
- throw e;
- }
- }
-
- /* (non-Javadoc)
- * @see org.eclipse.jem.internal.proxy.core.IExpression#createPrimitiveLiteral(int, char)
- */
- public final void createPrimitiveLiteral(ForExpression forExpression, char value) throws IllegalStateException {
- try {
- checkForExpression(forExpression);
- pushToProxy(beanProxyFactory.createBeanProxyWith(value));
- processExpression();
- } catch (RuntimeException e) {
- markInvalid();
- throw e;
- }
- }
-
- /* (non-Javadoc)
- * @see org.eclipse.jem.internal.proxy.core.IExpression#createPrimitiveLiteral(int, byte)
- */
- public final void createPrimitiveLiteral(ForExpression forExpression, byte value) throws IllegalStateException {
- try {
- checkForExpression(forExpression);
- pushToProxy(beanProxyFactory.createBeanProxyWith(value));
- processExpression();
- } catch (RuntimeException e) {
- markInvalid();
- throw e;
- }
- }
-
- /* (non-Javadoc)
- * @see org.eclipse.jem.internal.proxy.core.IExpression#createPrimitiveLiteral(int, double)
- */
- public final void createPrimitiveLiteral(ForExpression forExpression, double value) throws IllegalStateException {
- try {
- checkForExpression(forExpression);
- pushToProxy(beanProxyFactory.createBeanProxyWith(value));
- processExpression();
- } catch (RuntimeException e) {
- markInvalid();
- throw e;
- }
- }
-
- /* (non-Javadoc)
- * @see org.eclipse.jem.internal.proxy.core.IExpression#createPrimitiveLiteral(int, float)
- */
- public final void createPrimitiveLiteral(ForExpression forExpression, float value) throws IllegalStateException {
- try {
- checkForExpression(forExpression);
- pushToProxy(beanProxyFactory.createBeanProxyWith(value));
- processExpression();
- } catch (RuntimeException e) {
- markInvalid();
- throw e;
- }
- }
-
- /* (non-Javadoc)
- * @see org.eclipse.jem.internal.proxy.core.IExpression#createPrimitiveLiteral(int, int)
- */
- public final void createPrimitiveLiteral(ForExpression forExpression, int value) throws IllegalStateException {
- try {
- checkForExpression(forExpression);
- pushToProxy(beanProxyFactory.createBeanProxyWith(value));
- processExpression();
- } catch (RuntimeException e) {
- markInvalid();
- throw e;
- }
- }
-
- /* (non-Javadoc)
- * @see org.eclipse.jem.internal.proxy.core.IExpression#createPrimitiveLiteral(int, long)
- */
- public final void createPrimitiveLiteral(ForExpression forExpression, long value) throws IllegalStateException {
- try {
- checkForExpression(forExpression);
- pushToProxy(beanProxyFactory.createBeanProxyWith(value));
- processExpression();
- } catch (RuntimeException e) {
- markInvalid();
- throw e;
- }
- }
-
- /* (non-Javadoc)
- * @see org.eclipse.jem.internal.proxy.core.IExpression#createPrimitiveLiteral(int, short)
- */
- public final void createPrimitiveLiteral(ForExpression forExpression, short value) throws IllegalStateException {
- try {
- checkForExpression(forExpression);
- pushToProxy(beanProxyFactory.createBeanProxyWith(value));
- processExpression();
- } catch (RuntimeException e) {
- markInvalid();
- throw e;
- }
- }
-
- /* (non-Javadoc)
- * @see org.eclipse.jem.internal.proxy.core.IExpression#createStringLiteral(int, java.lang.String)
- */
- public final void createStringLiteral(ForExpression forExpression, String value) throws IllegalStateException {
- try {
- checkForExpression(forExpression);
- pushToProxy(beanProxyFactory.createBeanProxyWith(value));
- processExpression();
- } catch (RuntimeException e) {
- markInvalid();
- throw e;
- }
- }
-
- /*
- * (non-Javadoc)
- * @see org.eclipse.jem.internal.proxy.core.IExpression#createProxyExpression(int, org.eclipse.jem.internal.proxy.core.IProxy)
- */
- public final void createProxyExpression(ForExpression forExpression, IProxy proxy) throws IllegalStateException, IllegalArgumentException {
- try {
- checkForExpression(forExpression);
- validateProxy(proxy);
- pushToProxy(proxy);
- processExpression();
- } catch (RuntimeException e) {
- markInvalid();
- throw e;
- }
- }
-
-
- /* (non-Javadoc)
- * @see org.eclipse.jem.internal.proxy.core.IExpression#createAssignmentExpression(int)
- */
- public final void createAssignmentExpression(ForExpression forExpression) throws IllegalStateException {
- try {
- checkForExpression(forExpression);
- push(InternalExpressionTypes.ASSIGNMENT_EXPRESSION);
-
- pushForExpression(PROCESS_EXPRESSION);
- pushForExpression(ForExpression.ASSIGNMENT_RIGHT);
- pushForExpression(ForExpression.ASSIGNMENT_LEFT);
- processExpression(); // See if previous expression is ready for processing.
- } catch (RuntimeException e) {
- markInvalid();
- throw e;
- }
- }
-
- /*
- * (non-Javadoc)
- * @see org.eclipse.jem.internal.proxy.core.IExpression#createAssignmentExpression(int)
- */
- public final ExpressionProxy createProxyAssignmentExpression(ForExpression forExpression) throws IllegalStateException {
- try {
- checkForExpression(forExpression);
- ExpressionProxy proxy = allocateExpressionProxy(NORMAL_EXPRESSION_PROXY);
- push(proxy);
- push(InternalExpressionTypes.ASSIGNMENT_PROXY_EXPRESSION);
-
- pushForExpression(PROCESS_EXPRESSION);
- pushForExpression(ForExpression.ASSIGNMENT_RIGHT);
- processExpression(); // See if previous expression is ready for processing.
- return proxy;
- } catch (RuntimeException e) {
- markInvalid();
- throw e;
- }
- }
-
- /**
- * Called by registries to create an expression proxy for a bean type. It is not in the interface because it should
- * only be called by the proxy registry to create an expression proxy. It shouldn't be called outside of the registries
- * because there may already exist in the registry the true IBeanTypeProxy, and that one should be used instead.
- * <p>
- * This is not customer advanced API. This API for the implementers of registries and expression subclasses.
- *
- * @param typeName
- * @return expression proxy that is hooked up and will notify when resolved. It can be called at any time. The resolution will occur at this point in the
- * execution stack, but since it will not interfere with the stack this is OK, other than it could throw a ClassNotFoundException on the
- * execution.
- *
- * @since 1.1.0
- */
- public final IProxyBeanType createBeanTypeExpressionProxy(String typeName) {
- IBeanTypeExpressionProxy proxy = (IBeanTypeExpressionProxy) allocateExpressionProxy(BEANTYPE_EXPRESSION_PROXY);
- proxy.setTypeName(typeName);
- // This can be sent at any time. It doesn't matter what is on the expression stack. It will be sent to be resolved immediately.
- pushBeanTypeToProxy(proxy);
- return proxy;
- }
-
- /**
- * Called by registries to create an expression proxy for a method. It is not in the interface because it should
- * only be called by the proxy registry to create an expression proxy. It shouldn't be called outside of the registries
- * because there may already exist in the registry the true IMethodProxy, and that one should be used instead.
- * <p>
- * This is not customer advanced API. This API for the implementers of registries and expression subclasses.
- *
- * @param declaringType
- * @param methodName
- * @param parameterTypes parameter types or <code>null</code> if no parameter types.
- * @return
- *
- * @throws IllegalArgumentException
- * @since 1.1.0
- */
- public final IProxyMethod createMethodExpressionProxy(IProxyBeanType declaringType, String methodName, IProxyBeanType[] parameterTypes) throws IllegalArgumentException{
- validateProxy(declaringType);
- if (parameterTypes != null && parameterTypes.length > 0) {
- for (int i = 0; i < parameterTypes.length; i++) {
- validateProxy(parameterTypes[i]);
- }
- }
- ExpressionProxy proxy = allocateExpressionProxy(METHOD_EXPRESSION_PROXY);
- // This can be sent at any time. It doesn't matter what is on the expression stack. It will be sent to be resolved immediately.
- pushMethodToProxy(proxy, declaringType, methodName, parameterTypes);
- return (IProxyMethod) proxy;
- }
-
- /**
- * Called by registries to create an expression proxy for a field. It is not in the interface because it should
- * only be called by the proxy registry to create an expression proxy. It shouldn't be called outside of the registries
- * because there may already exist in the registry the true IFieldProxy, and that one should be used instead.
- * <p>
- * This is not customer advanced API. This API for the implementers of registries and expression subclasses.
- *
- * @param declaringType
- * @param fieldName
- * @return
- *
- * @throws IllegalArgumentException
- * @since 1.1.0
- */
- public final IProxyField createFieldExpressionProxy(IProxyBeanType declaringType, String fieldName) throws IllegalArgumentException {
- validateProxy(declaringType);
- ExpressionProxy proxy = allocateExpressionProxy(FIELD_EXPRESSION_PROXY);
- // This can be sent at any time. It doesn't matter what is on the expression stack. It will be sent to be resolved immediately.
- pushFieldToProxy(proxy, declaringType, fieldName);
- return (IProxyField) proxy;
- }
-
- /* (non-Javadoc)
- * @see org.eclipse.jem.internal.proxy.core.IExpression#createProxyReassignmentExpression(org.eclipse.jem.internal.proxy.initParser.tree.ForExpression, org.eclipse.jem.internal.proxy.core.ExpressionProxy)
- */
- public final void createProxyReassignmentExpression(ForExpression forExpression, ExpressionProxy proxy) throws IllegalStateException, IllegalArgumentException {
- try {
- checkForExpression(forExpression);
- if (!proxy.isValidForReassignment())
- throw new IllegalArgumentException(MessageFormat.format(ProxyMessages.Expression_CreateProxyReassignmentExpression_InvalidForReassignment_EXC_, new Object[]{proxy.toString()}));
- push(proxy);
- push(InternalExpressionTypes.ASSIGNMENT_PROXY_EXPRESSION);
-
- pushForExpression(PROCESS_EXPRESSION);
- pushForExpression(ForExpression.ASSIGNMENT_RIGHT);
- processExpression(); // See if previous expression is ready for processing.
- } catch (RuntimeException e) {
- markInvalid();
- throw e;
- }
- }
-
- protected static final int NORMAL_EXPRESSION_PROXY = 0;
- protected static final int BEANTYPE_EXPRESSION_PROXY = 1;
- protected static final int METHOD_EXPRESSION_PROXY = 2;
- protected static final int FIELD_EXPRESSION_PROXY = 3;
- /**
- * Allocate a new ExpressionProxy
- * @return new ExpressionProxy.
- *
- * @since 1.1.0
- */
- protected final ExpressionProxy allocateExpressionProxy(int proxyType) {
- if (expressionProxies == null)
- expressionProxies = new ArrayList();
- // It is very important that this always creates a proxy id that is greater than all previous. This is
- // so that it can be assured that proxies will be resolved in order of creation.
- // Currently this is done here by using expressionProxies.size().
- ExpressionProxy proxy = createExpressionProxy(proxyType, expressionProxies.size());
- expressionProxies.add(proxy);
- return proxy;
- }
-
- /*
- * (non-Javadoc)
- * @see org.eclipse.jem.internal.proxy.core.IExpression#createFieldAccess(org.eclipse.jem.internal.proxy.initParser.tree.ForExpression, org.eclipse.jem.internal.proxy.core.IProxyField, boolean)
- */
- public final void createFieldAccess(ForExpression forExpression, IProxyField fieldProxy, boolean hasReceiver) throws IllegalStateException, IllegalArgumentException {
- validateProxy(fieldProxy);
- pushFieldAccess(forExpression, fieldProxy, hasReceiver);
- }
-
- /*
- * (non-Javadoc)
- * @see org.eclipse.jem.internal.proxy.core.IExpression#createMethodInvocation(org.eclipse.jem.internal.proxy.initParser.tree.ForExpression, org.eclipse.jem.internal.proxy.core.IProxyMethod, boolean, int)
- */
- public final void createMethodInvocation(ForExpression forExpression, IProxyMethod methodProxy, boolean hasReceiver, int argumentCount) throws IllegalArgumentException,
- IllegalStateException {
- validateProxy(methodProxy);
- pushMethodInvocation(forExpression, methodProxy, hasReceiver, argumentCount);
- }
-
- /*
- * (non-Javadoc)
- * @see org.eclipse.jem.internal.proxy.core.IExpression#createSimpleFieldAccess(org.eclipse.jem.internal.proxy.core.IProxyField, org.eclipse.jem.internal.proxy.core.IProxy)
- */
- public final ExpressionProxy createSimpleFieldAccess(IProxyField field, IProxy receiver) throws IllegalStateException, IllegalArgumentException {
- validateProxy(field);
- validateProxy(receiver);
- ExpressionProxy result = createProxyAssignmentExpression(ForExpression.ROOTEXPRESSION);
- createFieldAccess(ForExpression.ASSIGNMENT_RIGHT, field, receiver != null);
- if (receiver != null)
- createProxyExpression(ForExpression.FIELD_RECEIVER, receiver);
- return result;
- }
-
- /*
- * (non-Javadoc)
- * @see org.eclipse.jem.internal.proxy.core.IExpression#createSimpleFieldSet(org.eclipse.jem.internal.proxy.core.IProxyField, org.eclipse.jem.internal.proxy.core.IProxy, org.eclipse.jem.internal.proxy.core.IProxy, boolean)
- */
- public final ExpressionProxy createSimpleFieldSet(IProxyField field, IProxy receiver, IProxy value, boolean wantResult) throws IllegalStateException, IllegalArgumentException {
- validateProxy(field);
- validateProxy(receiver);
- ExpressionProxy result = null;
- ForExpression forExpression = ForExpression.ROOTEXPRESSION;
- if (wantResult) {
- result = createProxyAssignmentExpression(forExpression);
- forExpression = ForExpression.ASSIGNMENT_RIGHT;
- }
- createAssignmentExpression(forExpression);
- createFieldAccess(ForExpression.ASSIGNMENT_LEFT, field, receiver != null);
- if (receiver != null)
- createProxyExpression(ForExpression.FIELD_RECEIVER, receiver);
- createProxyExpression(ForExpression.ASSIGNMENT_RIGHT, value);
- return result;
- }
-
- /* (non-Javadoc)
- * @see org.eclipse.jem.internal.proxy.core.IExpression#createSimpleMethodInvoke(org.eclipse.jem.internal.proxy.core.IMethodProxy, org.eclipse.jem.internal.proxy.core.IProxy, org.eclipse.jem.internal.proxy.core.IProxy[], boolean)
- */
- public final ExpressionProxy createSimpleMethodInvoke(IProxyMethod method, IProxy receiver, IProxy[] arguments, boolean wantResult)
- throws IllegalStateException, IllegalArgumentException {
- validateProxy(method);
- validateProxy(receiver);
- if (arguments != null && arguments.length > 0) {
- for (int i = 0; i < arguments.length; i++) {
- validateProxy(arguments[i]);
- }
- }
- ForExpression nextExpression = ForExpression.ROOTEXPRESSION;
- ExpressionProxy result = null;
- if (wantResult) {
- result = createProxyAssignmentExpression(nextExpression);
- nextExpression = ForExpression.ASSIGNMENT_RIGHT;
- }
- createMethodInvocation(nextExpression, method, receiver != null, arguments != null ? arguments.length : 0);
- if (receiver != null)
- createProxyExpression(ForExpression.METHOD_RECEIVER, receiver);
- if (arguments != null) {
- for (int i = 0; i < arguments.length; i++) {
- createProxyExpression(ForExpression.METHOD_ARGUMENT, arguments[i]);
- }
- }
- return result;
- }
-
- private int subexpressionNumber = -1; // Current subexpression number. This is always incrementing.
-
- public void createSubexpression() throws IllegalStateException {
- try {
- // Subexpressions are special, they can be anywhere.
- pushForExpression(PROCESS_EXPRESSION);
- pushForExpression(SUBEXPRESSIONEND_EXPRESSION);
- pushForExpression(ForExpression.ROOTEXPRESSION);
-
- pushSubexpressionBeginToProxy(++subexpressionNumber);
- push(new Integer(subexpressionNumber));
- push(InternalExpressionTypes.SUBEXPRESSION_END_EXPRESSION);
- processExpression();
- return;
- } catch (RuntimeException e) {
- markInvalid();
- throw e;
- }
- }
-
- public void createSubexpressionEnd() throws IllegalStateException {
- try {
- checkForExpression(ForExpression.ROOTEXPRESSION);
- popForExpression(); // Remove the root expression since block is done.
- checkForExpression(SUBEXPRESSIONEND_EXPRESSION); // This needs to be next for it to be valid.
- processExpression(); // Now let it handle the previously pushed end subexpression, containing the subexpression number being ended.
- } catch (RuntimeException e) {
- markInvalid();
- throw e;
- }
- }
-
-
- private int tryNumber = -1; // Current try number. This is always incrementing.
-
- /* (non-Javadoc)
- * @see org.eclipse.jem.internal.proxy.core.IExpression#createTry()
- */
- public final void createTry() throws IllegalStateException {
- try {
- checkForExpression(ForExpression.ROOTEXPRESSION);
- pushForExpression(PROCESS_EXPRESSION); // Set up so that when reached we can process the TRY_END that we've pushed data for later in this method.
- pushForExpression(TRYEND_EXPRESSION); // Must get a try end before we can process it.
- pushForExpression(TRYCATCH_EXPRESSION); // Must get a catch/finally clause (or try end, which knows how to handle this).
- pushForExpression(ForExpression.ROOTEXPRESSION); // Expecting root expressions for the try clause.
-
- pushTryBeginToProxy(++tryNumber);
- push(new Integer(tryNumber));
- push(InternalExpressionTypes.TRY_END_EXPRESSION);
- processExpression();
- } catch (RuntimeException e) {
- markInvalid();
- throw e;
- }
- }
-
- /*
- * (non-Javadoc)
- * @see org.eclipse.jem.internal.proxy.core.IExpression#createTryCatchClause(org.eclipse.jem.internal.proxy.core.IProxyBeanType, boolean)
- */
- public final ExpressionProxy createTryCatchClause(IProxyBeanType exceptionType, boolean wantExceptionReturned)
- throws IllegalStateException, IllegalArgumentException {
- validateProxy(exceptionType);
- return pushTryCatch(exceptionType, wantExceptionReturned);
- }
-
- /*
- * (non-Javadoc)
- * @see org.eclipse.jem.internal.proxy.core.IExpression#createTryCatchClause(java.lang.String, boolean)
- */
- public final ExpressionProxy createTryCatchClause(String exceptionType, boolean wantExceptionReturned)
- throws IllegalStateException {
- return pushTryCatch(getProxyBeanType(exceptionType), wantExceptionReturned);
- }
-
- /**
- * @param exceptionType
- * @param wantExceptionReturned
- * @return
- * @throws IllegalStateException
- *
- * @since 1.1.0
- */
- private ExpressionProxy pushTryCatch(IProxyBeanType exceptionType, boolean wantExceptionReturned) throws IllegalStateException {
- try {
- checkForExpression(ForExpression.ROOTEXPRESSION);
- popForExpression(); // Remove the root expression since try or previous catch clause is done.
- checkForExpression(TRYCATCH_EXPRESSION); // This needs to be next for it to be valid.
- pushForExpression(TRYCATCH_EXPRESSION); // Set up for a following catch/finally clause.
- pushForExpression(ForExpression.ROOTEXPRESSION); // Root expressions are next for the catch clause.
-
- int tryNumber = ((Integer) peek(2)).intValue(); // Get the try#. It should be in this place on the stack.
-
- ExpressionProxy ep = null;
- if (wantExceptionReturned)
- ep = allocateExpressionProxy(NORMAL_EXPRESSION_PROXY);
- pushTryCatchClauseToProxy(tryNumber, exceptionType, ep);
-
- processExpression();
- return ep;
- } catch (RuntimeException e) {
- markInvalid();
- throw e;
- }
- }
-
- /* (non-Javadoc)
- * @see org.eclipse.jem.internal.proxy.core.IExpression#createTryEnd()
- */
- public final void createTryEnd() throws IllegalStateException {
- try {
- checkForExpression(ForExpression.ROOTEXPRESSION);
- popForExpression(); // Remove the root expression since try or previous catch clause is done.
- if (peekForExpression(TRYCATCH_EXPRESSION))
- checkForExpression(TRYCATCH_EXPRESSION); // This may of been next if no finally clause was added. If a finally clause was added this would not be here.
- checkForExpression(TRYEND_EXPRESSION); // And this needs to be after that to be valid.
-
- processExpression();
- } catch (RuntimeException e) {
- markInvalid();
- throw e;
- }
- }
-
- /* (non-Javadoc)
- * @see org.eclipse.jem.internal.proxy.core.IExpression#createTryFinallyClause()
- */
- public final void createTryFinallyClause() throws IllegalStateException {
- try {
- checkForExpression(ForExpression.ROOTEXPRESSION);
- popForExpression(); // Remove the root expression since try or previous catch clause is done.
- checkForExpression(TRYCATCH_EXPRESSION); // This needs to be next for it to be valid.
- pushForExpression(ForExpression.ROOTEXPRESSION); // Root expressions are next for the finally clause.
-
- int tryNumber = ((Integer) peek(2)).intValue(); // Get the try#. It should be in this place on the stack.
-
- pushTryFinallyClauseToProxy(tryNumber);
- processExpression();
- } catch (RuntimeException e) {
- markInvalid();
- throw e;
- }
- }
-
-
-
- /* (non-Javadoc)
- * @see org.eclipse.jem.internal.proxy.core.IExpression#createRethrow()
- */
- public final void createRethrow() throws IllegalStateException {
- try {
- checkForExpression(ForExpression.ROOTEXPRESSION);
- popForExpression(); // Remove the root expression since try or previous catch clause is done.
- checkForExpression(TRYCATCH_EXPRESSION); // This needs to be next for it to be valid.
- // It is in a valid state, so put the catch and root back on so that things work correctly.
- pushForExpression(TRYCATCH_EXPRESSION);
- pushForExpression(ForExpression.ROOTEXPRESSION);
-
- int tryNumber = ((Integer) peek(2)).intValue(); // Get the try#. It should be in this place on the stack.
-
- pushRethrowToProxy(tryNumber);
- processExpression();
- } catch (RuntimeException e) {
- markInvalid();
- throw e;
- }
- }
-
- /* (non-Javadoc)
- * @see org.eclipse.jem.internal.proxy.core.IExpression#createThrow()
- */
- public final void createThrow() throws IllegalStateException {
- try {
- checkForExpression(ForExpression.ROOTEXPRESSION);
- push(InternalExpressionTypes.THROW_EXPRESSION);
- pushForExpression(PROCESS_EXPRESSION);
- pushForExpression(ForExpression.THROW_OPERAND); // The next expression must be for the throw value.
- processExpression();
- } catch (RuntimeException e) {
- markInvalid();
- throw e;
- }
- }
-
-
- public final int mark() throws IllegalStateException {
- try {
- checkForExpression(ForExpression.ROOTEXPRESSION);
- ++highestMarkID;
- currentMarkEntry = new MarkEntry();
- currentMarkEntry.markID = highestMarkID;
- currentMarkEntry.controlStackPos = controlStack.size() - 1;
- currentMarkEntry.nextExpressionStackPos = nextForExpressionStackPos;
- currentMarkEntry.expressionProxiesPos = expressionProxies != null ? expressionProxies.size() - 1 : -1;
- if (markEntries == null)
- markEntries = new ArrayList(5);
- markEntries.add(currentMarkEntry);
- pushMarkToProxy(highestMarkID);
- return highestMarkID;
- } catch (RuntimeException e) {
- markInvalid();
- throw e;
- }
- }
-
- public void endMark(int markNumber) throws IllegalStateException {
- if (isValid()) {
- // Can only do a valid end mark if we are at root. If not at root, we fall through and treat as invalid.
- if (peekForExpression(ForExpression.ROOTEXPRESSION)) {
- checkForExpression(ForExpression.ROOTEXPRESSION); // Now remove it if it should be removed.
- // If the current mark number is not the same as the incoming mark number, we have improper nesting.
- if (currentMarkEntry == null || currentMarkEntry.markID != markNumber)
- throwInvalidMarkNesting(); // We have improper nesting.
- // We are popping the current mark. Since we are valid, just move up one in the mark stack.
- MarkEntry me = (MarkEntry) markEntries.remove(markEntries.size()-1);
- if (!markEntries.isEmpty())
- currentMarkEntry = (MarkEntry) markEntries.get(markEntries.size()-1);
- else
- currentMarkEntry = null;
- pushEndmarkToProxy(markNumber, false);
- if (me.controlStackPos != controlStack.size()-1 || me.nextExpressionStackPos != nextForExpressionStackPos)
- throwInvalidMarkNesting(); // The stacks should be back to the same size at this point for a valid end mark.
- return;
- }
- }
-
- // It was invalid, or became invalid.
- if (markEntries == null)
- throwInvalidMarkNesting(); // We have no marks, so this is an invalid end mark.
-
- // We are invalid, need to pop to the given markNumber.
- // Starting from the end we search back to find the entry for the given mark number. We do it
- // from the end because it is more likely to be closer to the end than to the beginning.
- for (int i = markEntries.size()-1; i >=0; i--) {
- MarkEntry me = (MarkEntry) markEntries.get(i);
- if (me.markID == markNumber) {
- // Found it.
- // Trim the control stack down to the size at time of mark. (No easy way to do this other than repeated remove's.
- // We do it backwards to eliminate repeated shuffling of entries.
- for (int j = controlStack.size()-1; j > me.controlStackPos; j--) {
- controlStack.remove(j);
- }
-
- // Trim the expression stack. This is simple, just reset the next entry pointer.
- nextForExpressionStackPos = me.nextExpressionStackPos;
-
- if (expressionProxies != null) {
- // Now we need to mark all of the expression proxies that occured after the mark as
- // not resolved (since someone may be listening), and remove them, and reuse the proxies.
- for (int j = expressionProxies.size()-1; j > me.expressionProxiesPos; j--) {
- ExpressionProxy proxy = (ExpressionProxy) expressionProxies.remove(j);
- if (proxy != null && proxy.hasListeners())
- fireProxyNotResolved(proxy);
- }
- }
-
- // Now that we know it is valid, we want to remove all of the mark entries above it in the stack
- // since those are now invalid. We couldn't remove them as we were searching for the entry because
- // if the entry wasn't found we didn't want to wipe out the probably valid ones.
- for (int j = markEntries.size()-1; j >= i; j--) {
- markEntries.remove(j);
- }
-
- if (!markEntries.isEmpty())
- currentMarkEntry = (MarkEntry) markEntries.get(markEntries.size()-1);
- else
- currentMarkEntry = null;
- pushEndmarkToProxy(markNumber, true);
- expressionValid = true;
- return;
- }
- }
- throwInvalidMarkNesting(); // The mark number wasn't found, so this is an invalid end mark.
- }
-
- /**
- * Begin the transfer of the expression to another thread.
- * <p>
- * This is used when the expression needs to continue to be built up, but it needs
- * to be done on a different thread. The reason for doing something special other
- * than just using it on the other thread is that some proxy registries connections are
- * tied through the thread. If you switched to another thread the connections would not
- * be properly set up.
- * This is not on the IExpression interface because even though it is API, it is tricky
- * to use and so not exposed to everyone. Users can legitimately cast to Expression and
- * use this as API for advanced use.
- * <p>
- * This is used to begin the transfer. It puts it into a state ready for the transfer. Calling this
- * method will cause a synchronization of the expression up to the current level. This means
- * that it will not return until the expression has been completely processed in the proxy registry
- * up to this point. Typically the connection is a pipe where the instructions are just pushed onto
- * it and the caller is not held up waiting for the registry to process it.
- * <p>
- * Then when the other thread is done, it will call beginTransferThread itself to signal that it is done
- * and that the old thread can pick it up. Then the old thread will call transferThread to pick up processing.
- * <p>
- * It will be:
- * <pre><code>
- * ... expression stuff ...
- * expression.beginTransferThread()
- * ... do what is necessary to get to the other thread ...
- * ... on other thread:
- * expression.transferThread();
- * try {
- * ... do your expression stuff on this thread ...
- * } finally {
- * expression.beginTransferThread(); // This is to return it to old thread.
- * }
- * ... tell old thread to pick up ...
- * ... back on old thread:
- * expression.transferThread();
- * ... do more expression stuff ...
- * expression.invokeExpression();
- * </code></pre>
- *
- * @throws IllegalStateException
- * @throws ThrowableProxy Thrown if there was an exception with the remote vm during this request.
- * @since 1.1.0
- */
- public final void beginTransferThread() throws IllegalStateException, ThrowableProxy {
- try {
- pushForExpression(THREADTRANSFER_EXPRESSION);
- pushBeginTransferThreadToProxy();
- } catch (RuntimeException e) {
- markInvalid();
- throw e;
- }
- }
-
- /**
- * Transfer the expression to the current thread.
- * <p>
- * This is called to actually transfer to the current thread. It must be the next call against
- * the expression after the beginTransferThread, but on the new thread.
- * <p>
- * This is not on the IExpression interface because even though it is API, it is tricky
- * to use and so not exposed to everyone. Users can legitimately cast to Expression and
- * use this as API for advanced use.
- * @see Expression#beginTransferThread() for a full explanation.
- * @throws IllegalStateException
- *
- * @since 1.1.0
- */
- public final void transferThread() throws IllegalStateException {
- try {
- checkForExpression(THREADTRANSFER_EXPRESSION);
- pushTransferThreadToProxy();
- } catch (RuntimeException e) {
- markInvalid();
- throw e;
- }
- }
-
-
- /**
- * Get the IProxyBeanType for the type string sent in.
- * @param type
- * @return
- *
- * @since 1.1.0
- */
- protected IProxyBeanType getProxyBeanType(String type) {
- return getRegistry().getBeanTypeProxyFactory().getBeanTypeProxy(this, type);
- }
-
- /**
- * Create the expression proxy subclass that is applicable for this kind of processor.
- * @param proxyType type of proxy. {@link Expression#NORMAL_EXPRESSION_PROXY
- * @param proxyID the id of the new expression proxy.
- *
- * @return
- *
- * @since 1.1.0
- */
- protected abstract ExpressionProxy createExpressionProxy(int proxyType, int proxyID);
-
- /**
- * Push this proxy to the other side. It will simply take the proxy and push it onto
- * its evaluation stack. It will be treated as the result of an expression. It's just
- * that the expression was evaluatable on this side (since it is already a proxy).
- *
- * @param proxy
- *
- * @since 1.0.0
- */
- protected abstract void pushToProxy(IProxy proxy);
-
- /**
- * Tell the other side we are complete. This will always be called after expression evaluation, or
- * if expression was prematurely closed.
- * <p>
- * <b>Note:</b> The implementation must be able to handle multiple invocations, where the first call is a valid close and any
- * subsequent call should be ignored.
- *
- * @throws ThrowableProxy
- *
- * @since 1.0.0
- */
- protected abstract void closeProxy();
-
- /**
- * Do invoke. This should simply make sure everything is done and throw any pending errors.
- * <p>
- * <b>Note:</b> The expression proxies MUST be resolved (callbacks called) in the order they are found in the expressionProxies list. This
- * is so that the contract is followed that resolution notifications will occur in the order of creation.
- *
- * @param proxycount Number of Expression Proxies that need a callback.
- * @param list of expression proxies. If proxycount > 0, then process the non-null entries in the list. They will be of type ExpressionProxy.
- * @throws ThrowableProxy
- *
- * @since 1.0.0
- */
- protected abstract void pushInvoke(int proxycount, List expressionProxies) throws ThrowableProxy, NoExpressionValueException;
-
- /**
- * Pull the top expression value from the evaluation stack. It will also under
- * the covers call closeProxy. It also must process the expression proxy callbacks. It must do the expression proxy callbacks first, and then
- * process the result value. If an error had occured sometime during processing, it should still process the proxy callbacks before throwing
- * an exception.
- * <p>
- * <b>Note:</b> The expression proxies MUST be resolved (callbacks called) in the order they are found in the expressionProxies list. This
- * is so that the contract is followed that resolution notifications will occur in the order of creation. Also <b>REQUIRED</b> is that
- * the entire list must be processed of proxies must be processed by this call. It cannot do some or none.
- *
- * @param proxycount Number of Expression Proxies that need a callback.
- * @param list of expression proxies. If proxycount > 0, then process the non-null entries in the list. They will be of type ExpressionProxy.
- * @return The top level evaluation stack value.
- * @throws ThrowableProxy
- * @throws NoExpressionValueException
- *
- * @since 1.0.0
- */
- protected abstract IBeanProxy pullProxyValue(int proxycount, List expressionProxies) throws ThrowableProxy, NoExpressionValueException;
-
- /**
- * Push to proxy the cast expression. The expression to use will be on the top of its evaluation stack.
- * The result of the cast expression will be placed onto the evaluation stack.
- *
- * @param type Cast type.
- *
- * @since 1.0.0
- */
- protected abstract void pushCastToProxy(IProxyBeanType type);
-
- /**
- * Push to proxy the instanceof expression. The expression to use will be on the top of its evaluation stack.
- * The result of the instanceof expression will be placed onto the evaluation stack.
- *
- * @param type Instanceof type.
- *
- * @since 1.0.0
- */
- protected abstract void pushInstanceofToProxy(IProxyBeanType type);
-
- /**
- * Push to proxy the infix operation. This is called on the completion of each operand of the expression.
- * So it will be called a minimum of two times.
- *
- * @param operator The operator.
- * @param operandType The operand type. left, other, or last.
- *
- * @since 1.0.0
- */
- protected abstract void pushInfixToProxy(InfixOperator operator, InternalInfixOperandType operandType);
-
- /**
- * Push to proxy the prefix expression. The expression to use will be on top of its evaluation stack.
- * The result of the prefix operation will be placed onto the evaluation stack.
- *
- * @param operator
- *
- * @see IExpressionConstants#PRE_MINUS
- * @since 1.0.0
- */
- protected abstract void pushPrefixToProxy(PrefixOperator operator);
-
-
- /**
- * Push to proxy the array access. The result will be placed onto the evaluation stack.
- *
- * @param indexCount
- *
- * @since 1.0.0
- */
- protected abstract void pushArrayAccessToProxy(int indexCount);
-
- /**
- * Push to proxy the array creation. The result will be placed onto the evaluation stack.
- * @param type The array type.
- * @param dimensionCount
- *
- * @since 1.0.0
- */
- protected abstract void pushArrayCreationToProxy(IProxyBeanType type, int dimensionCount);
-
- /**
- * Push to proxy the array initializer. The resulting array will be placed onto the evaluation stack.
- * @param type The array type. (must be an array type).
- * @param stripDimCount the number of dimensions that must be stripped from the array type. This is needed
- * because the first array initializer needs to be for the component type of the array (array minus one dimension), and
- * each initializer after that needs one more dimension stripped off. But since we are working with possible expression
- * proxies for "type", we can't create the appropriate component types of the array. So we need to tell the
- * processor how many dims to strip from the original type (which is what is sent in on every initializer push, the original type).
- * @param expressionCount
- *
- * @since 1.0.0
- */
- protected abstract void pushArrayInitializerToProxy(IProxyBeanType type, int stripDimCount, int expressionCount);
-
- /**
- * Push to proxy the class instance creation. The resulting class instance will be placed onto the evaluation stack.
- *
- * @param type Class type.
- * @param argumentCount The number of arguments.
- *
- * @since 1.0.0
- */
- protected abstract void pushClassInstanceCreationToProxy(IProxyBeanType type, int argumentCount);
-
- /**
- * Push to proxy the type receiver. The resulting class will be placed onto the evaluation stack, along with it also
- * being the expression type.
- * @param type Class type.
- *
- * @since 1.0.0
- */
- protected abstract void pushTypeReceiverToProxy(IProxyBeanType type);
-
- /**
- * Push to proxy the field access. The result value will be placed onto the evaluation stack.
- * @param field The name of the field if string, or an IFieldProxy.
- * @param hasReceiver Has receiver flag.
- *
- * @since 1.0.0
- */
- protected abstract void pushFieldAccessToProxy(Object field, boolean hasReceiver);
-
- /**
- * Push to proxy the method invocation. The result value will be placed onto the evaluation stack.
- *
- * @param method String for method name or IProxyMethod
- * @param hasReceiver
- * @param argCount
- *
- * @since 1.0.0
- */
- protected abstract void pushMethodInvocationToProxy(Object method, boolean hasReceiver, int argCount);
-
- /**
- * Push to proxy the conditional expression. This will be called on each part of expression. The expression type
- * will be the current part (e.g. test, true, false).
- *
- * @param expressionType The expression type.
- *
- * @since 1.0.0
- */
- protected abstract void pushConditionalToProxy(InternalConditionalOperandType expressionType);
-
- /**
- * Push to the proxy the expression proxy. Whatever the last expression value is will be assigned to the ExpressionProxy.
- *
- * @param proxy
- *
- * @since 1.1.0
- */
- protected abstract void pushAssignmentToProxy(ExpressionProxy proxy);
-
- /**
- * Push the assignment expression. The operands are already on the stack.
- *
- * @since 1.1.0
- */
- protected abstract void pushAssignmentToProxy();
-
-
- /**
- * Push the begin block expression.
- * @param blockNumber
- *
- * @since 1.1.0
- */
- protected abstract void pushBlockBeginToProxy(int blockNumber);
-
- /**
- * Push the end block expression.
- * @param blockNumber
- *
- * @since 1.1.0
- */
- protected abstract void pushBlockEndToProxy(int blockNumber);
-
- /**
- * Push the break block expression.
- * @param blockNumber
- *
- * @since 1.1.0
- *
- */
- protected abstract void pushBlockBreakToProxy(int blockNumber);
-
- /**
- * Push the begin try expression.
- * @param tryNumber
- *
- * @since 1.1.0
- */
- protected abstract void pushTryBeginToProxy(int tryNumber);
-
- /**
- * Push the catch clause to proxy.
- * @param tryNumber
- * @param exceptionType
- * @param ep ExpressionProxy to be assigned with the exception or <code>null</code> if exception is not to be assigned.
- *
- * @since 1.1.0
- */
- protected abstract void pushTryCatchClauseToProxy(int tryNumber, IProxyBeanType exceptionType, ExpressionProxy ep);
-
- /**
- * Push the finally clause to proxy.
- * @param tryNumber
- *
- * @since 1.1.0
- */
- protected abstract void pushTryFinallyClauseToProxy(int tryNumber);
-
- /**
- * Push try end to proxy.
- * @param tryNumber
- *
- * @since 1.1.0
- */
- protected abstract void pushTryEndToProxy(int tryNumber);
-
- /**
- * Push the throw of the exception to proxy.
- * @param exception
- *
- * @since 1.1.0
- */
- protected abstract void pushThrowToProxy();
-
- /**
- * Push a rethrow to proxy.
- * @param tryNumber
- *
- * @since 1.1.0
- */
- protected abstract void pushRethrowToProxy(int tryNumber);
-
- /**
- * Push the BeanType Expression proxy to be resolved on the execution side.
- * @param proxy
- *
- * @since 1.1.0
- */
- protected abstract void pushBeanTypeToProxy(IBeanTypeExpressionProxy proxy);
-
- /**
- * Push the Method Expression proxy to be resolved on the execution side.
- * @param proxy
- * @param declaringType
- * @param methodName
- * @param parameterTypes parameter types or <code>null</code> if no parameters.
- *
- * @since 1.1.0
- */
- protected abstract void pushMethodToProxy(ExpressionProxy proxy, IProxyBeanType declaringType, String methodName, IProxyBeanType[] parameterTypes);
-
- /**
- * Push the Field Expression Proxy to be resolved on the execution side.
- * @param proxy
- * @param declaringType
- * @param fieldName
- *
- * @since 1.1.0
- */
- protected abstract void pushFieldToProxy(ExpressionProxy proxy, IProxyBeanType declaringType, String fieldName);
-
- /**
- * Push the If test condition to proxy.
- *
- * @since 1.1.0
- */
- protected abstract void pushIfTestToProxy();
-
- /**
- * Push a true or else clause to proxy.
- * @param clauseType
- *
- * @since 1.1.0
- */
- protected abstract void pushIfElseToProxy(InternalIfElseOperandType clauseType);
-
- /**
- * Push to proxy a new instance using an initialization string.
- * @param initializationString
- * @param resultType
- *
- * @since 1.1.0
- */
- protected abstract void pushNewInstanceToProxy(String initializationString, IProxyBeanType resultType);
-
- /**
- * Push the mark id to proxy.
- *
- * @param markID
- *
- * @since 1.1.0
- */
- protected abstract void pushMarkToProxy(int markID);
-
- /**
- * Push the end mark id to proxy.
- *
- * @param markID
- * @param restore <code>true</code> if this is a restore due to error, <code>false</code> if this is just a normal end mark.
- *
- * @since 1.1.0
- */
- protected abstract void pushEndmarkToProxy(int markID, boolean restore);
-
- /**
- * Push the begin transfer thread to proxy.
- *
- *
- * @since 1.1.0
- */
- protected abstract void pushBeginTransferThreadToProxy() throws ThrowableProxy;
-
- /**
- * Push the actual transfer to the current thread to proxy.
- *
- *
- * @since 1.1.0
- */
- protected abstract void pushTransferThreadToProxy();
-
- /**
- * Push the subexpression begin to proxy.
- * @param subexpressionNumber
- *
- * @since 1.1.0
- */
- protected abstract void pushSubexpressionBeginToProxy(int subexpressionNumber);
-
- /**
- * Push the subexpression end to proxy.
- * @param subexpressionNumber
- *
- * @since 1.1.0
- */
- protected abstract void pushSubexpressionEndToProxy(int subexpressionNumber);
-}
diff --git a/plugins/org.eclipse.jem.proxy/proxy/org/eclipse/jem/internal/proxy/core/ExpressionProxy.java b/plugins/org.eclipse.jem.proxy/proxy/org/eclipse/jem/internal/proxy/core/ExpressionProxy.java
deleted file mode 100644
index ec12faa..0000000
--- a/plugins/org.eclipse.jem.proxy/proxy/org/eclipse/jem/internal/proxy/core/ExpressionProxy.java
+++ /dev/null
@@ -1,349 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2005 IBM Corporation and others.
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
- *
- * Contributors:
- * IBM Corporation - initial API and implementation
- *******************************************************************************/
-/*
-
-
- */
-package org.eclipse.jem.internal.proxy.core;
-
-import java.util.EventObject;
-import java.util.logging.Level;
-
-
-/**
- * This is a proxy for an IExpression evaluation value. It is used as a place holder proxy value for result of an expression, and
- * then the value can be used in a later expression, or at the end, it can callback and return a proxy in the IDE
- * side in a callback for usage later on outside of the IExpression.
- * <p>
- * After receiving the resolved event, listeners should not hold onto the ExpressionProxy because it would then be invalid. At that
- * point they should instead hold onto the resolved bean proxy.
- *
- * @see org.eclipse.jem.internal.proxy.core.IExpression#assignExpressionProxy()
- * @see org.eclipse.jem.internal.proxy.core.IExpression#createExpressionProxyExpression(int, ExpressionProxy)
- * @since 1.1.0
- */
-public class ExpressionProxy implements IProxy {
-
- public ProxyFactoryRegistry getProxyFactoryRegistry() {
- return getExpression().getRegistry();
- }
-
- /**
- * The event object for the resolved event of the proxy listener.
- * <p>
- * The source will be the ExpressionProxy that is being resolved.
- * @since 1.1.0
- */
- public static class ProxyEvent extends EventObject {
-
- /**
- * Comment for <code>serialVersionUID</code>
- *
- * @since 1.1.0
- */
- private static final long serialVersionUID = -2305781662465107377L;
- private final IBeanProxy proxy;
-
- /**
- * @param source the expression proxy for the event.
- * @param proxy the bean proxy the expression proxy (source) resolved to.
- *
- * @since 1.1.0
- */
- public ProxyEvent(ExpressionProxy source, IBeanProxy proxy) {
- super(source);
- this.proxy = proxy;
- }
-
- /**
- * Construct the event with no proxy. Used for not resolved and void.
- * @param source
- *
- * @since 1.1.0
- */
- public ProxyEvent(ExpressionProxy source) {
- this(source, null);
- }
-
- /**
- * Get the proxy value that the expression proxy (source) resolved to.
- * @return
- *
- * @since 1.1.0
- */
- public IBeanProxy getProxy() {
- return proxy;
- }
- }
-
- /**
- * Listener for expression proxy events.
- *
- * @since 1.1.0
- */
- public interface ProxyListener {
- /**
- * The expression proxy has been resolved. The event contains the resolved proxy.
- * At this point, any listeners should no longer hold onto the ExpressionProxy
- * because it is now invalid. They should hold onto the resolved bean proxy instead.
- *
- * @param event
- *
- * @since 1.1.0
- */
- public void proxyResolved(ProxyEvent event);
-
- /**
- * This is called for ExpressionProxies that have a callback listener, but the proxy
- * was never resolved. This means that the expression that assigns to the proxy was
- * not executed. In this case the event does not have a bean proxy in it.
- *
- * @param event
- *
- * @since 1.1.0
- */
- public void proxyNotResolved(ProxyEvent event);
-
- /**
- * This is called for ExpressionProxies that were assigned to an expression that
- * had a <code>VOID</code> return type. This is usually for method invocations that
- * have a void return type. In this case the event does not have a bean proxy in it.
- * @param event
- *
- * @since 1.1.0
- */
- public void proxyVoid(ProxyEvent event);
- }
-
- /**
- * An implementation of ProxyListener that does nothing. It can be
- * used as a superclass for individual listeners that are only interested
- * in some of the events.
- *
- * @since 1.1.0
- */
- public static class ProxyAdapter implements ProxyListener {
-
- /* (non-Javadoc)
- * @see org.eclipse.jem.internal.proxy.core.ExpressionProxy.ProxyListener#proxyNotResolved(org.eclipse.jem.internal.proxy.core.ExpressionProxy.ProxyEvent)
- */
- public void proxyNotResolved(ProxyEvent event) {
- }
-
- /* (non-Javadoc)
- * @see org.eclipse.jem.internal.proxy.core.ExpressionProxy.ProxyListener#proxyResolved(org.eclipse.jem.internal.proxy.core.ExpressionProxy.ProxyEvent)
- */
- public void proxyResolved(ProxyEvent event) {
- }
-
- /* (non-Javadoc)
- * @see org.eclipse.jem.internal.proxy.core.ExpressionProxy.ProxyListener#proxyVoid(org.eclipse.jem.internal.proxy.core.ExpressionProxy.ProxyEvent)
- */
- public void proxyVoid(ProxyEvent event) {
- }
- }
-
- final private int proxyID;
- final private int proxyType;
- private ListenerList listenerList;
- private Expression expression;
-
- /**
- * Create with the given proxy id.
- * @param proxyid
- *
- * @since 1.1.0
- */
- public ExpressionProxy(int proxyid, int proxyType, Expression expression) {
- this.proxyID = proxyid;
- this.proxyType = proxyType;
- this.expression = expression;
- }
-
- /**
- * Get the expression this proxy is for.
- * @return
- *
- * @since 1.1.0
- */
- public Expression getExpression() {
- return expression;
- }
-
- /**
- * Used internally in expression to get the proxy type.
- * @return
- *
- * @since 1.1.0
- */
- protected final int getProxyType() {
- return proxyType;
- }
-
- /**
- * Return the proxy id.
- * @return
- *
- * @since 1.1.0
- */
- public final int getProxyID() {
- return proxyID;
- }
-
- /**
- * Add a listener. If listener already added, it has no effect.
- * @param listener
- *
- * @since 1.1.0
- */
- public void addProxyListener(ProxyListener listener) {
- if (listenerList == null)
- listenerList = new ListenerList();
- listenerList.add(listener);
- }
-
- /**
- * Remove a listener. If listener not already added, then no error.
- * @param listener
- *
- * @since 1.1.0
- */
- public void removeProxyListener(ProxyListener listener) {
- if (listenerList != null)
- listenerList.remove(listener);
- }
-
- /**
- * Used by internal subclasses or Expression to know if anyone is listening.
- * @return
- *
- * @since 1.1.0
- */
- protected final boolean hasListeners() {
- return listenerList != null && !listenerList.isEmpty();
- }
-
- /**
- * The proxy has been fired (one of the events has occurred). Subclasses should clean
- * up and not hold onto anything that would be expensive in case the proxy is still
- * held onto be someone. For example the default clears the listener list.
- * <p>
- * <b>Note:</b> Subclasses must call super.dispose().
- *
- * @since 1.1.0
- */
- protected void dispose() {
- listenerList = null;
- expression = null;
- }
-
- /**
- * Used by internal subclasses or by Expression to fire the resolved event. Once fired all listeners are removed.
- * This is because only one kind of firing can be done for a expression proxy and then the proxy is dead. This
- * prevents listeners from being held on to if any one accidently still holds the proxy.
- * @param proxy
- *
- * @since 1.1.0
- */
- protected void fireResolved(IBeanProxy proxy) {
- if (hasListeners()) {
- ProxyEvent event = new ProxyEvent(this, proxy);
- Object[] listeners = listenerList.getListeners();
- for (int i = 0; i < listeners.length; i++) {
- try {
- ((ProxyListener) listeners[i]).proxyResolved(event);
- } catch (RuntimeException e) {
- ProxyPlugin.getPlugin().getLogger().log(e, Level.WARNING);
- }
- }
- }
- dispose();
- }
-
- /**
- * Used by internal subclasses or by Expression to fire the not resolved event. Once fired all listeners are removed.
- * This is because only one kind of firing can be done for a expression proxy and then the proxy is dead. This
- * prevents listeners from being held on to if any one accidently still holds the proxy.
- *
- * @since 1.1.0
- */
- protected void fireNotResolved() {
- if (hasListeners()) {
- ProxyEvent event = new ProxyEvent(this);
- Object[] listeners = listenerList.getListeners();
- for (int i = 0; i < listeners.length; i++) {
- try {
- ((ProxyListener) listeners[i]).proxyNotResolved(event);
- } catch (RuntimeException e) {
- ProxyPlugin.getPlugin().getLogger().log(e, Level.WARNING);
- }
-
- }
- }
- dispose();
- }
-
- /**
- * Used by internal subclasses or by Expression to fire the void resolved event. Once fired all listeners are removed.
- * This is because only one kind of firing can be done for a expression proxy and then the proxy is dead. This
- * prevents listeners from being held on to if any one accidently still holds the proxy.
- *
- * @since 1.1.0
- */
- protected void fireVoidResolved() {
- if (hasListeners()) {
- ProxyEvent event = new ProxyEvent(this);
- Object[] listeners = listenerList.getListeners();
- for (int i = 0; i < listeners.length; i++) {
- try {
- ((ProxyListener) listeners[i]).proxyVoid(event);
- } catch (RuntimeException e) {
- ProxyPlugin.getPlugin().getLogger().log(e, Level.WARNING);
- }
-
- }
- }
- dispose();
- }
-
- /* (non-Javadoc)
- * @see org.eclipse.jem.internal.proxy.core.IProxy#isBeanProxy()
- */
- public final boolean isBeanProxy() {
- return false;
- }
- /* (non-Javadoc)
- * @see org.eclipse.jem.internal.proxy.core.IProxy#isExpressionProxy()
- */
- public final boolean isExpressionProxy() {
- return true;
- }
-
- /**
- * Is this proxy valid for reassignment. By default only if the type is NORMAL_EXPRESSION_PROXY.
- * Subclasses may override and return true in their cases.
- *
- * @return
- *
- * @since 1.1.0
- */
- public boolean isValidForReassignment() {
- return getProxyType() == Expression.NORMAL_EXPRESSION_PROXY;
- }
-
-
- /* (non-Javadoc)
- * @see java.lang.Object#toString()
- */
- public String toString() {
- return super.toString()+": "+getProxyID(); //$NON-NLS-1$
- }
-}
diff --git a/plugins/org.eclipse.jem.proxy/proxy/org/eclipse/jem/internal/proxy/core/IAccessibleObjectProxy.java b/plugins/org.eclipse.jem.proxy/proxy/org/eclipse/jem/internal/proxy/core/IAccessibleObjectProxy.java
deleted file mode 100644
index d563228..0000000
--- a/plugins/org.eclipse.jem.proxy/proxy/org/eclipse/jem/internal/proxy/core/IAccessibleObjectProxy.java
+++ /dev/null
@@ -1,39 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2001, 2005 IBM Corporation and others.
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
- *
- * Contributors:
- * IBM Corporation - initial API and implementation
- *******************************************************************************/
-package org.eclipse.jem.internal.proxy.core;
-/*
-
-
- */
-
-/**
- * Proxy for an AccessibleObject.
- *
- * @since 1.0.0
- */
-public interface IAccessibleObjectProxy extends IBeanProxy {
-
- /**
- * Is the proxy accessible or not?
- *
- * @return <code>true</code> if accessible.
- */
- public boolean isAccessible() throws ThrowableProxy;
-
- /**
- * Set the accessible flag on the proxy.
- *
- * @param flag <code>true</code> if accessible.
- * @throws ThrowableProxy
- */
- public void setAccessible(boolean flag) throws ThrowableProxy;
-
-}
diff --git a/plugins/org.eclipse.jem.proxy/proxy/org/eclipse/jem/internal/proxy/core/IArrayBeanProxy.java b/plugins/org.eclipse.jem.proxy/proxy/org/eclipse/jem/internal/proxy/core/IArrayBeanProxy.java
deleted file mode 100644
index 8bdbaa2..0000000
--- a/plugins/org.eclipse.jem.proxy/proxy/org/eclipse/jem/internal/proxy/core/IArrayBeanProxy.java
+++ /dev/null
@@ -1,92 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2001, 2005 IBM Corporation and others.
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
- *
- * Contributors:
- * IBM Corporation - initial API and implementation
- *******************************************************************************/
-package org.eclipse.jem.internal.proxy.core;
-/*
-
-
- */
-
-
-/**
- * Proxy wrappering an array.
- */
-public interface IArrayBeanProxy extends IBeanProxy {
- /**
- * Get the object at the specified index.
- */
- IBeanProxy get(int index) throws ThrowableProxy;
-
- IBeanProxy getCatchThrowableException(int index);
-
- /**
- * Get the object at the specified multi-dimensional index.
- * The array must be at least the number of dimensions specified,
- * and each index along the way must exist.
- * The number of dimensions can't be greater than the number
- * of dimensions of the real object.
- */
- IBeanProxy get(int [] indexes) throws ThrowableProxy;
-
- /**
- * Get a snapshot of the array. It will return an array of proxies of the
- * complete first dimension of the array. This is useful if you need
- * to be working with more than one entry of the array. You can save
- * accesses to the vm by doing this.
- * <p>
- * NOTE: This is a snapshot. It will not see changes to the array.
- * If an entry is set into the returned array of proxies, this will
- * not be reflected into the real array. Also any changes in the
- * contents of the first dimension of the real array will not
- * be reflected into this returned array of proxies. The proxies
- * returned are real proxies, so any changes to them will be reflected
- * back and forth. Treat this as an array copy to a new array.
- *
- * @return array of proxies of the first dimension of the array.
- * @throws ThrowableProxy
- *
- * @since 1.1.0
- */
- IBeanProxy[] getSnapshot() throws ThrowableProxy;
-
- /**
- * Set the object at the specified index.
- */
- void set(IBeanProxy value, int index) throws ThrowableProxy;
-
- /**
- * Set the object at the specified multi-dimensional index.
- * The array must be at least the number of dimensions specified,
- * and each index along the way must exist.
- * The number of dimensions can't be greater than the number
- * of dimensions of the real object.
- */
- void set(IBeanProxy value, int [] indexes) throws ThrowableProxy;
-
- /**
- * Get the length of the first dimension of this array.
- * If there are multi-dimensions, you must get the appropriate
- * dimension from the get method to see the size of that dimension.
- *
- * e.g.
- * int [3] returns 3
- * int [3][2] returns 3
- *
- * ((IArrayBeanProxy) get(1)).getLength() returns 2
- * Since arrays do not have to be homogenous, there could
- * be a different length array for each of the arrays
- * returned from the first dimension, the returned length
- * from get(2) and get(3) could result in a different value
- * from get(1).
- */
- int getLength();
-
-
-}
diff --git a/plugins/org.eclipse.jem.proxy/proxy/org/eclipse/jem/internal/proxy/core/IArrayBeanTypeProxy.java b/plugins/org.eclipse.jem.proxy/proxy/org/eclipse/jem/internal/proxy/core/IArrayBeanTypeProxy.java
deleted file mode 100644
index aceff09..0000000
--- a/plugins/org.eclipse.jem.proxy/proxy/org/eclipse/jem/internal/proxy/core/IArrayBeanTypeProxy.java
+++ /dev/null
@@ -1,41 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2001, 2005 IBM Corporation and others.
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
- *
- * Contributors:
- * IBM Corporation - initial API and implementation
- *******************************************************************************/
-package org.eclipse.jem.internal.proxy.core;
-/*
-
-
- */
-
-
-/**
- * A Proxy for an array type.
- */
-
-public interface IArrayBeanTypeProxy extends IBeanTypeProxy {
- /**
- * getComponentType: Get the component type of this array.
- * e.g. (new Object[3]).getClass().getComponentType() will
- * return "java.lang.Object".
- * and (new Object[3][2][1]).getClass().getComponentType() will
- * return "Object[][]";
- */
- public IBeanTypeProxy getComponentType();
- /**
- * Return the final type, i.e. the final non-array type.
- * i.e. int[][] will return int.
- */
- public IBeanTypeProxy getFinalComponentType();
- /**
- * Return the number of dimensions for this type.
- * i.e. int [][] will return 2.
- */
- public int getDimensions();
-}
diff --git a/plugins/org.eclipse.jem.proxy/proxy/org/eclipse/jem/internal/proxy/core/IBeanProxy.java b/plugins/org.eclipse.jem.proxy/proxy/org/eclipse/jem/internal/proxy/core/IBeanProxy.java
deleted file mode 100644
index 7fc92f4..0000000
--- a/plugins/org.eclipse.jem.proxy/proxy/org/eclipse/jem/internal/proxy/core/IBeanProxy.java
+++ /dev/null
@@ -1,80 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2001, 2005 IBM Corporation and others.
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
- *
- * Contributors:
- * IBM Corporation - initial API and implementation
- *******************************************************************************/
-package org.eclipse.jem.internal.proxy.core;
-/*
-
-
- */
-
-
-/**
- * Bean Proxy interface. This is the
- * root interface for any bean proxy instance.
- * Creation date: (12/3/99 11:37:01 AM)
- * @author: Joe Winchester
- */
-public interface IBeanProxy extends IProxy {
-/**
- * equals: Equal if:
- * 1) This proxy == (identity) to the other object
- * 2) Else if other is an IBeanProxy, then if
- * equals on the server.
- * 3) If this is a constant proxy and the other is too or is a constant
- * value (e.g. IStringBeanProxy.equals(String), then true if values are equals.
- */
-public boolean equals(Object anObject);
-
-/**
- * Test for identity among this bean proxy and the other bean proxy.
- * For some proxy systems, this may be redundent and you can be assured
- * that if the objects being proxied are identical you will receive the
- * same proxy for both. However, other implementations may not have this
- * condition. Therefor this method was created.
- *
- * There is one restriction, constants may not necessarily be identical.
- * For instance, in some implementations, the Boolean proxy (i.e. an instance of class Boolean) is a constant, i.e.
- * it cannot be changed. In those cases a new proxy may be created for each
- * access and so they will not be considered to be identical. In those cases false will be returned.
- * But in other implementations a new proxy will not be created and so sameAs will return true.
- *
- * Primitives will return true if just equal because in Java primitives are identical if the same value.
- *
- * @param aBeanProxy
- * @return true if they are identical (i.e. ==) and not just equals.
- */
-public boolean sameAs(IBeanProxy aBeanProxy);
-
-/**
- * Return the registry this proxy was created with.
- */
-public ProxyFactoryRegistry getProxyFactoryRegistry();
-/**
- * Return the proxied class of the bean
- * Creation date: (12/3/99 11:37:01 AM)
- * @author: Joe Winchester
- */
-public IBeanTypeProxy getTypeProxy();
-
-/**
- * Return a string representation of the bean itself
- * This could be done by finding the toString() method by a findMethod()
- * on the type proxy, etc... but toString() is so ubiquitous that it is
- * explicitly declared on the IBeanProxy interface
- * Creation date: (12/3/99 11:37:01 AM)
- * @author: Joe Winchester
- */
-public String toBeanString();
-/**
- * Is this bean still valid? It could be invalid because it
- * was specifically released but someone is still holding onto it.
- */
-public boolean isValid();
-}
diff --git a/plugins/org.eclipse.jem.proxy/proxy/org/eclipse/jem/internal/proxy/core/IBeanProxyFactory.java b/plugins/org.eclipse.jem.proxy/proxy/org/eclipse/jem/internal/proxy/core/IBeanProxyFactory.java
deleted file mode 100644
index 510d8f9..0000000
--- a/plugins/org.eclipse.jem.proxy/proxy/org/eclipse/jem/internal/proxy/core/IBeanProxyFactory.java
+++ /dev/null
@@ -1,49 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2001, 2005 IBM Corporation and others.
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
- *
- * Contributors:
- * IBM Corporation - initial API and implementation
- *******************************************************************************/
-package org.eclipse.jem.internal.proxy.core;
-/*
-
-
- */
-
-
-/**
- * Bean Proxy Factory for creating bean proxies.
- * Creation methods are actually package protected.
- * All creation is done through the IBeanTypeProxy.
- * Specific factories may have helper methods that
- * allow creation of specific types, such as the
- * standard factory allows creation of Boolean, int's, etc.
- * Creation date: (12/3/99 11:52:09 AM)
- * @author: Joe Winchester
- */
-public interface IBeanProxyFactory {
- /**
- * The factory is being terminated.
- * <p>
- * It should clean up its resources.
- * It should not reference any other factory because they could of
- * already been terminated.
- * <p>
- * For example, if it is holding onto IREMBeanProxy's, it doesn't
- * need to call release on them except if they are constants because
- * the BeanProxyFactory has all non-constant bean proxies registered
- * and will call the release itself.
- * <p>
- * Note: This is not meant to be called by users. It will be called internally by the proxy registry when necessary.
- *
- * @param wait <code>true</code> should wait for completion, <code>false</code> don't necessarily wait. False is just
- * a suggestion. The factory may not permit not waiting. True must be honoured and it must wait.
- *
- * @since 1.0.2
- */
- public void terminateFactory(boolean wait);
-}
diff --git a/plugins/org.eclipse.jem.proxy/proxy/org/eclipse/jem/internal/proxy/core/IBeanTypeExpressionProxy.java b/plugins/org.eclipse.jem.proxy/proxy/org/eclipse/jem/internal/proxy/core/IBeanTypeExpressionProxy.java
deleted file mode 100644
index 8966aa1..0000000
--- a/plugins/org.eclipse.jem.proxy/proxy/org/eclipse/jem/internal/proxy/core/IBeanTypeExpressionProxy.java
+++ /dev/null
@@ -1,32 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2005 IBM Corporation and others.
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
- *
- * Contributors:
- * IBM Corporation - initial API and implementation
- *******************************************************************************/
-/*
-
-
- */
-package org.eclipse.jem.internal.proxy.core;
-
-
-/**
- * An internal interface for the registries to create the appropriate beantype expression proxy.
- * Not to be implemented or referenced by customers.
- * @since 1.1.0
- */
-public interface IBeanTypeExpressionProxy extends IProxyBeanType {
-
- /**
- * Allow the expression to set the type name.
- * @param typeName
- *
- * @since 1.1.0
- */
- public void setTypeName(String typeName);
-}
diff --git a/plugins/org.eclipse.jem.proxy/proxy/org/eclipse/jem/internal/proxy/core/IBeanTypeProxy.java b/plugins/org.eclipse.jem.proxy/proxy/org/eclipse/jem/internal/proxy/core/IBeanTypeProxy.java
deleted file mode 100644
index 30f733f..0000000
--- a/plugins/org.eclipse.jem.proxy/proxy/org/eclipse/jem/internal/proxy/core/IBeanTypeProxy.java
+++ /dev/null
@@ -1,319 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2001, 2006 IBM Corporation and others.
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
- *
- * Contributors:
- * IBM Corporation - initial API and implementation
- *******************************************************************************/
-/*
-
-
- */
-package org.eclipse.jem.internal.proxy.core;
-
-import org.eclipse.jem.internal.proxy.common.AmbiguousMethodException;
-
-/**
- * A proxy for a BeanType (i.e. Java type/class). Creation date: (12/3/99 11:38:06 AM)
- *
- * @author: Joe Winchester
- */
-public interface IBeanTypeProxy extends IBeanProxy, IProxyBeanType {
-
- /**
- * Find the most compatible constructor (out of the declared constructors). This means it will
- * find either an exact match or an override that is compatible, e.g. X(Object j) is returned when looking with arg type of "java.lang.String".
- * @param argumentTypes array of arg types or <code>null</code> if none. (In case of null, this is the default ctor, so just use that).
- * @return
- * @throws NoSuchMethodException
- * @throws AmbiguousMethodException
- * @throws IllegalAccessException
- *
- * @since 1.1.0
- */
- public IConstructorProxy getCompatibleConstructor(IBeanTypeProxy[] argumentTypes) throws AmbiguousMethodException, NoSuchMethodException, IllegalAccessException;
-
- /**
- * Find the most compatible public method, including inheritied. This means it will
- * find either an exact match or an override that is compatible, e.g. xyz(Object j) is returned when looking with arg type of "java.lang.String".
- * @param methodName
- * @param argumentTypes array of arg types or <code>null</code> if none. (In case of null, just use getMethod(String methodName) since only one is compatible then.
- * @return
- * @throws AmbiguousMethodException
- * @throws NoSuchMethodException
- *
- * @since 1.1.0
- */
- public IMethodProxy getCompatibleMethod(String methodName, IBeanTypeProxy[] argumentTypes) throws AmbiguousMethodException, NoSuchMethodException;
-
- /**
- * Return the constructor proxy on the receiver with the specified arguments Creation date: (12/3/99 2:25:07 PM)
- */
- public IConstructorProxy getConstructorProxy(String[] argumentClassNames);
-
- /**
- * Return the constructor proxy on the receiver with the specified types Creation date: (12/3/99 2:25:07 PM)
- */
- public IConstructorProxy getConstructorProxy(IBeanTypeProxy[] argumentTypes);
-
- /**
- * Return an array of public constructors for this class.
- *
- * @return an array of constructor proxies or <code>null</code> if an error.
- *
- * @since 1.1.0
- */
- public IConstructorProxy[] getConstructors();
-
- /**
- * Return the declared constructor proxy on the receiver with the specified arguments Creation date: (12/3/99 2:25:07 PM)
- */
- public IConstructorProxy getDeclaredConstructorProxy(String[] argumentClassNames);
-
- /**
- * Return the declared constructor proxy on the receiver with the specified types Creation date: (12/3/99 2:25:07 PM)
- */
- public IConstructorProxy getDeclaredConstructorProxy(IBeanTypeProxy[] argumentTypes);
-
- /**
- * Return an array of declared constructors for this class.
- *
- * @return an array of constructor proxies or <code>null</code> if an error.
- *
- * @since 1.1.0
- */
- public IConstructorProxy[] getDeclaredConstructors();
-
- /**
- * Return the array of field proxies.
- * @return
- *
- * @since 1.1.0
- */
- public IFieldProxy[] getFields();
-
- /**
- * Return the array of declared field proxies.
- * @return
- *
- * @since 1.1.0
- */
- public IFieldProxy[] getDeclaredFields();
-
- /**
- * Return the fieldproxy on the receiver with the specified name Creation date: (12/3/99 2:25:07 PM)
- */
- public IFieldProxy getFieldProxy(String fieldName);
-
- /**
- * Return the declared fieldproxy on the receiver with the specified name
- */
- public IFieldProxy getDeclaredFieldProxy(String fieldName);
-
- /**
- * Return the method proxy on the receiver with the specified name and no arguments.
- *
- * @param methodName
- * @return
- * @since 1.0.0
- */
- public IMethodProxy getMethodProxy(String methodName);
-
- /**
- * Return the method proxy on the receiver with the qualified class names as string arguments
- *
- * @param methodName
- * @param argumentClassNames
- * @return
- * @since 1.0.0
- */
- public IMethodProxy getMethodProxy(String methodName, String[] argumentClassNames);
-
- /**
- * Return the method proxy on the receiver with the specified name and one argument
- *
- * @param methodName
- * @param argumentClassName
- * @return
- * @since 1.0.0
- */
- public IMethodProxy getMethodProxy(String methodName, String argumentClassName);
-
- /**
- * Return the method proxy on the receiver with the beanTypes as arguments
- *
- * @param methodName
- * @param argumentTypes
- * @return
- * @since 1.0.0
- */
- public IMethodProxy getMethodProxy(String methodName, IBeanTypeProxy[] argumentTypes);
-
- /**
- * Return an array of public methods for this class.
- *
- * @return an array of method proxies or <code>null</code> if an error.
- *
- * @since 1.1.0
- */
- public IMethodProxy[] getMethods();
-
- /**
- * Return the declared method proxy on the receiver with the specified arguments Creation date: (12/3/99 2:25:07 PM)
- */
- public IMethodProxy getDeclaredMethodProxy(String methodName, String[] argumentClassNames);
-
- /**
- * Return the declared method proxy on the receiver with the specified types Creation date: (12/3/99 2:25:07 PM)
- */
- public IMethodProxy getDeclaredMethodProxy(String methodName, IBeanTypeProxy[] argumentTypes);
-
- /**
- * Return an array of declared methods for this class.
- *
- * @return an array of method proxies or <code>null</code> if an error.
- *
- * @since 1.1.0
- */
- public IMethodProxy[] getDeclaredMethods();
-
- /**
- * Return the invokable on the receiver with the specified name and no arguments.
- * <p>
- * The method proxy is not retrieved. Instead the method will be looked up
- * each time on the vm. Because of this these are suitable only for one-shot invokations. If it is to be invoked often, then a method proxy should
- * be retrieved instead.
- * <p>
- * Though typical for one-shot deal the invokable can be used over and over. There is just overhead because the method is looked up each time. So a reasonable compromise
- * would be if using it infrequently or is used closely together once or twice it is better to use a Invokable instead of a method proxy.
- * <p>
- * Note there is no guarantee that the method is available. This won't be known until the actual invoke is done.
- *
- * @param methodName
- * @return
- * @since 1.0.0
- */
- public IInvokable getInvokable(String methodName);
-
- /**
- * Return the method proxy on the receiver with the qualified class names as string arguments
- * <p>
- * The method proxy is not retrieved. Instead the method will be looked up
- * each time on the vm. Because of this these are suitable only for one-shot invokations. If it is to be invoked often, then a method proxy should
- * be retrieved instead.
- * <p>
- * Though typical for one-shot deal the invokable can be used over and over. There is just overhead because the method is looked up each time. So a reasonable compromise
- * would be if using it infrequently or is used closely together once or twice it is better to use a Invokable instead of a method proxy.
- * <p>
- * Note there is no guarantee that the method is available. This won't be known until the actual invoke is done.
- *
- * @param methodName
- * @param argumentClassNames
- * @return
- * @since 1.0.0
- */
- public IInvokable getInvokable(String methodName, String[] argumentClassNames);
-
- /**
- * Return the method proxy on the receiver with the specified name and one argument
- * <p>
- * The method proxy is not retrieved. Instead the method will be looked up
- * each time on the vm. Because of this these are suitable only for one-shot invokations. If it is to be invoked often, then a method proxy should
- * be retrieved instead.
- * <p>
- * Though typical for one-shot deal the invokable can be used over and over. There is just overhead because the method is looked up each time. So a reasonable compromise
- * would be if using it infrequently or is used closely together once or twice it is better to use a Invokable instead of a method proxy.
- * <p>
- * Note there is no guarantee that the method is available. This won't be known until the actual invoke is done.
- *
- * @param methodName
- * @param argumentClassName
- * @return
- * @since 1.0.0
- */
- public IInvokable getInvokable(String methodName, String argumentClassName);
-
- /**
- * Return the method proxy on the receiver with the beanTypes as arguments
- * <p>
- * The method proxy is not retrieved. Instead the method will be looked up
- * each time on the vm. Because of this these are suitable only for one-shot invokations. If it is to be invoked often, then a method proxy should
- * be retrieved instead.
- * <p>
- * Though typical for one-shot deal the invokable can be used over and over. There is just overhead because the method is looked up each time. So a reasonable compromise
- * would be if using it infrequently or is used closely together once or twice it is better to use a Invokable instead of a method proxy.
- * <p>
- * Note there is no guarantee that the method is available. This won't be known until the actual invoke is done.
- *
- * @param methodName
- * @param argumentTypes
- * @return
- * @since 1.0.0
- */
- public IInvokable getInvokable(String methodName, IBeanTypeProxy[] argumentTypes);
-
- /**
- * Return the constructor proxy on the receiver with no arguments Creation date: (12/3/99 2:25:07 PM)
- */
- public IConstructorProxy getNullConstructorProxy();
-
- /**
- * Answer the type proxy for the superclass Creation date: (12/3/99 2:25:07 PM)
- */
- public IBeanTypeProxy getSuperBeanTypeProxy();
-
- /**
- * Answer the name of the type we are proxying This is the fully qualified name. For arrays it will return the format: [Lclassname; Creation date:
- * (12/3/99 2:25:07 PM)
- */
- public String getTypeName();
-
- /**
- * Answer the formal format type name. For normal classes, this just the same as getTypeName(), but for arrays, it is of the format classname[]
- */
- public String getFormalTypeName();
-
- /**
- * Answer a boolean as to whether we are an array type.
- */
- public boolean isArray();
-
- /**
- * Answer a boolean as to whether we are a type or an interface Creation date: (12/3/99 2:25:07 PM)
- */
- public boolean isInterface();
-
- /**
- * Answer a boolean as to whether we are a primitive or not.
- */
- public boolean isPrimitive();
-
- /**
- * Answer a boolean as to whether we are a kind of the argument We can either be it, inherit from it, or implement it
- */
- public boolean isKindOf(IBeanTypeProxy aBeanProxyType);
-
- /**
- * Return a new instance Creation date: (12/3/99 2:25:07 PM)
- */
- public IBeanProxy newInstance() throws ThrowableProxy;
-
- /**
- * Return a new instance of this type using the initialization string to create the proxy. ClassCastException is thrown if the initstring doesn't
- * result in an object compatible with this type. InstantiationException is thrown when the initialization string cannot be parsed correctly.
- * Creation date: (12/3/99 2:25:07 PM)
- */
- public IBeanProxy newInstance(String initializationString) throws ThrowableProxy, ClassCastException, InstantiationException;
-
- /**
- * Return the exception message that happened when trying to find this bean type. Class not found is not such an exception. In that case the bean
- * type will be returned as a null instead. An example of such is an initialization error during loading the class, i.e. it was found but some
- * static failed to initialize.
- *
- * Return null if there is no initialization error.
- */
- public String getInitializationError();
-}
diff --git a/plugins/org.eclipse.jem.proxy/proxy/org/eclipse/jem/internal/proxy/core/IBeanTypeProxyFactory.java b/plugins/org.eclipse.jem.proxy/proxy/org/eclipse/jem/internal/proxy/core/IBeanTypeProxyFactory.java
deleted file mode 100644
index ce11646..0000000
--- a/plugins/org.eclipse.jem.proxy/proxy/org/eclipse/jem/internal/proxy/core/IBeanTypeProxyFactory.java
+++ /dev/null
@@ -1,31 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2001, 2005 IBM Corporation and others.
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
- *
- * Contributors:
- * IBM Corporation - initial API and implementation
- *******************************************************************************/
-package org.eclipse.jem.internal.proxy.core;
-/*
-
-
- */
-
-
-/**
- * Factory for creating BeanTypeProxy's.
- * This is a common tag interface so that
- * the factory can be registered. But each
- * VM requires a different interface that
- * extends this interface. That extended
- * interface is what must be implemented in
- * each VM.
- * Creation date: (12/3/99 2:26:00 PM)
- * @author: Joe Winchester
- */
-public interface IBeanTypeProxyFactory extends IBeanProxyFactory {
-
-}
diff --git a/plugins/org.eclipse.jem.proxy/proxy/org/eclipse/jem/internal/proxy/core/IBooleanBeanProxy.java b/plugins/org.eclipse.jem.proxy/proxy/org/eclipse/jem/internal/proxy/core/IBooleanBeanProxy.java
deleted file mode 100644
index 625d839..0000000
--- a/plugins/org.eclipse.jem.proxy/proxy/org/eclipse/jem/internal/proxy/core/IBooleanBeanProxy.java
+++ /dev/null
@@ -1,31 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2001, 2005 IBM Corporation and others.
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
- *
- * Contributors:
- * IBM Corporation - initial API and implementation
- *******************************************************************************/
-package org.eclipse.jem.internal.proxy.core;
-/*
-
-
- */
-
-
-/**
- * Optimized implementation that should be used for Boolean proxies that
- * allows the IDE VM to get the boolean value easily
- * Creation date: (2/6/00 8:58:22 AM)
- * @author: Joe Winchester
- */
-public interface IBooleanBeanProxy extends IBeanProxy {
-/**
- * Return the proxied boolean as a boolean that the IDE can use
- * Creation date: (2/6/00 8:58:32 AM)
- */
-boolean booleanValue();
-Boolean getBooleanValue();
-}
diff --git a/plugins/org.eclipse.jem.proxy/proxy/org/eclipse/jem/internal/proxy/core/ICallback.java b/plugins/org.eclipse.jem.proxy/proxy/org/eclipse/jem/internal/proxy/core/ICallback.java
deleted file mode 100644
index 7f8a02d..0000000
--- a/plugins/org.eclipse.jem.proxy/proxy/org/eclipse/jem/internal/proxy/core/ICallback.java
+++ /dev/null
@@ -1,152 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2001, 2005 IBM Corporation and others.
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
- *
- * Contributors:
- * IBM Corporation - initial API and implementation
- *******************************************************************************/
-package org.eclipse.jem.internal.proxy.core;
-/*
-
-
- */
-
-import java.io.InputStream;
-
-/**
- * Users will create a callback of this interface
- * and register it with the factory. Then when ever
- * the callback occurs, this callback will be called
- * with data from the proxy. It can return a value too.
- *
- * Or an InputStream can be returned to supply the data.
- *
- * @since 1.0.0
- */
-public interface ICallback {
-
- /**
- * This is the entry point of the callback.
- * It will be called whenever the callback
- * occurred. It will be on its own thread.
- * A particular thread cannot be requested.
- * <p>
- * The implementation MUST return. This is
- * because the callback will not be completed
- * until it is returned, and the process will
- * not continue on the remote vm until it is
- * returned.
- * <p>
- * The value returned must either be an
- * IBeanProxy or IBeanProxy[]. It is typed
- * to Object to allow either one, but it
- * will be checked, and if it isn't, then
- * null will be returned instead to the
- * caller.
- *
- * @param msgID
- * @param parm The beanproxy - will not be null
- * @return
- *
- * @since 1.0.0
- */
- public Object calledBack(int msgID, IBeanProxy parm);
-
- /**
- * This is the entry point of the callback.
- * It will be called whenever the callback
- * occurred. It will be on its own thread.
- * A particular thread cannot be requested.
- * <p>
- * The parms will be an array of IBeanProxys,
- * or an entry could be another array of IBeanProxys,
- * or null if null was sent to callBackWithParms.
- * The final component of any entry will be an
- * IBeanProxy. It is up to the developers to
- * agree on the format of the parms.
- * <p>
- * The implementation MUST return. This is
- * because the callback will not be completed
- * until it is returned, and the process will
- * not continue on the remote vm until it is
- * returned.
- * <p>
- * The value returned must either be an
- * IBeanProxy or IBeanProxy[]. It is typed
- * to Object to allow either one, but it
- * will be checked, and if it isn't, then
- * null will be returned instead to the
- * caller.
- *
- * @param msgID
- * @param parms
- * @return
- *
- * @see org.eclipse.jem.internal.proxy.common.ICallbackHandler#callbackWithParms(int, int, Object[])
- * @since 1.0.0
- */
- public Object calledBack(int msgID, Object[] parms);
-
- /**
- * This is the entry point of the callback.
- * It will be called whenever the callback
- * occurred. It will be on its own thread.
- * A particular thread cannot be requested.
- * <p>
- * The parm will be an object. This occurs
- * if remote vm just wanted to send some objects.
- * They will not be proxies. It is recommended
- * that this be used only for small items. For
- * anything large, the callbackStream should be
- * used instead.
- * <p>
- * The implementation MUST return. This is
- * because the callback will not be completed
- * until it is returned, and the process will
- * not continue on the remote vm until it is
- * returned.
- * <p>
- * The value returned must either be an
- * IBeanProxy or IBeanProxy[]. It is typed
- * to Object to allow either one, but it
- * will be checked, and if it isn't, then
- * null will be returned instead to the
- * caller.
- *
- * @param msgID
- * @param parm The parm or <code>null</code> if null was sent.
- * @return
- *
- * @see ICallback#calledBackStream(int, InputStream)
- * @since 1.0.0
- */
- public Object calledBack(int msgID, Object parm);
-
- /**
- * This is the entry point of the callback.
- * It will be called whenever the callback stream
- * occurred. It will be on its own thread.
- * A particular thread cannot be requested.
- * <p>
- * The callback should continue to read from the InputStream
- * until it returns -1 indicating no more data. The stream can
- * be closed. In that case the next time the remote vm wants to
- * send data it will first check that the stream has not been closed.
- * If it has, it will raise an exception on that side.
- * <p>
- * The implementation MUST return. This is
- * because the callback will not be completed
- * until it is returned, and the process will
- * not continue on the remote vm until it is
- * returned.
- *
- * @param msgID
- * @param is
- *
- * @since 1.0.0
- */
- public void calledBackStream(int msgID, InputStream is);
-}
diff --git a/plugins/org.eclipse.jem.proxy/proxy/org/eclipse/jem/internal/proxy/core/ICallbackRegistry.java b/plugins/org.eclipse.jem.proxy/proxy/org/eclipse/jem/internal/proxy/core/ICallbackRegistry.java
deleted file mode 100644
index 0e3c561..0000000
--- a/plugins/org.eclipse.jem.proxy/proxy/org/eclipse/jem/internal/proxy/core/ICallbackRegistry.java
+++ /dev/null
@@ -1,75 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2001, 2005 IBM Corporation and others.
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
- *
- * Contributors:
- * IBM Corporation - initial API and implementation
- *******************************************************************************/
-package org.eclipse.jem.internal.proxy.core;
-/*
-
-
- */
-
-/**
- * This is the registry for handling callbacks.
- * It is used to register and deregister callbacks.
- *
- * Callbacks are split into two parts:
- * 1) CallbackProxy. This is any proxy that implements the
- * interface ICallback. (Or the
- * equivalent one if not standard remote vm). This is the
- * object which will actually submit the callback on the remote
- * vm. For example, any kind of listener. It would implement
- * both the ICallback and the appropriate listener interface.
- * Then when it gets called as a listener, it will redirect the
- * call to the remote vm callback handler to submit it to the
- * proxy side.
- * 2) Callback. This is on this side and is the object that will
- * be notified of the callback and will execute at that time.
- *
- */
-
-public interface ICallbackRegistry {
-
- /**
- * Register this callback proxy and this callback.
- *
- * The process is to:
- * 1) Create the callbackProxy and the callback
- * 2) register these with registerCallback
- * 3) Now connect the callbackProxy so that it will start notifying.
- * For example, if it is a normal listener, at this time do the
- * addListener call to add the callbackProxy to the appropriate object.
- * You don't want it to start notifying before registering it.
- * (Though it won't hust it, it will just return null).
- */
- public void registerCallback(IBeanProxy callbackProxy, ICallback cb);
-
- /**
- * Same as {@link ICallbackRegistry#registerCallback(IBeanProxy, ICallback) registerCallback} except that
- * it is deferred off into an expression.
- *
- * @param callbackProxy
- * @param cb
- * @param expression
- *
- * @since 1.1.0
- */
- public void registerCallback(IProxy callbackProxy, ICallback cb, IExpression expression);
-
- /**
- * Deregister the callback proxy. This will remove it from the
- * registry and release the callback.
- *
- * The process is to:
- * 1) Stop the proxy from listening so it no notifies. This is usually
- * removeListener on the remote vm. You don't want it notifying
- * after it deregister (though it won't hurt it, it will just return null).
- * 2) deregister it.
- */
- public void deregisterCallback(IBeanProxy callbackProxy);
-}
diff --git a/plugins/org.eclipse.jem.proxy/proxy/org/eclipse/jem/internal/proxy/core/ICharacterBeanProxy.java b/plugins/org.eclipse.jem.proxy/proxy/org/eclipse/jem/internal/proxy/core/ICharacterBeanProxy.java
deleted file mode 100644
index b2e7c3e..0000000
--- a/plugins/org.eclipse.jem.proxy/proxy/org/eclipse/jem/internal/proxy/core/ICharacterBeanProxy.java
+++ /dev/null
@@ -1,35 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2001, 2005 IBM Corporation and others.
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
- *
- * Contributors:
- * IBM Corporation - initial API and implementation
- *******************************************************************************/
-package org.eclipse.jem.internal.proxy.core;
-/*
-
-
- */
-
-
-/**
- * Optimized implementation that should be used for character proxies that
- * allows the IDE VM to get the character value easily
- * Creation date: (2/6/00 8:58:22 AM)
- * @author: Joe Winchester
- */
-public interface ICharacterBeanProxy extends IBeanProxy, INumberBeanProxy {
-/**
- * Return the proxied character as a char that the IDE can use
- * Creation date: (2/6/00 8:58:32 AM)
- */
-char charValue();
-/**
- * Return the proxied character as a Character that the IDE can use
- * Creation date: (2/6/00 8:58:32 AM)
- */
-Character characterValue();
-}
diff --git a/plugins/org.eclipse.jem.proxy/proxy/org/eclipse/jem/internal/proxy/core/IConfigurationContributionController.java b/plugins/org.eclipse.jem.proxy/proxy/org/eclipse/jem/internal/proxy/core/IConfigurationContributionController.java
deleted file mode 100644
index 03267f9..0000000
--- a/plugins/org.eclipse.jem.proxy/proxy/org/eclipse/jem/internal/proxy/core/IConfigurationContributionController.java
+++ /dev/null
@@ -1,172 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2001, 2005 IBM Corporation and others.
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
- *
- * Contributors:
- * IBM Corporation - initial API and implementation
- *******************************************************************************/
-package org.eclipse.jem.internal.proxy.core;
-/*
-
-
- */
-
-import java.net.URL;
-
-import org.eclipse.core.resources.IProject;
-import org.eclipse.core.runtime.CoreException;
-import org.eclipse.core.runtime.IPath;
-import org.eclipse.jdt.core.IJavaProject;
-import org.osgi.framework.Bundle;
-;
-/**
- * Controls contribution to the configuration. This allows the classpath
- * to be modified in an acceptable manner, so that duplicates aren't in
- * the path, or adding a project to the path in an acceptable way.
- *
- * If only deleting or moving entries from the classpath, that can be done directly
- * to the classpath list passed in. Adding entries needs to go through this
- * controller.
- *
- * This is meant to be implemented by developers of proxy launch configurations.
- *
- * @version 1.0
- * @author
- */
-public interface IConfigurationContributionController {
-
- /**
- * Append to the user classpath.
- */
- public static final int APPEND_USER_CLASSPATH = 0;
-
- /**
- * Prepend to the user classpath. This will stick it in position 0. If
- * another prepend comes along, it will go in pos 0 and this one will move to 1.
- */
- public static final int PREPEND_USER_CLASSPATH = 1;
-
-
- /**
- * Append to the boot classpath.
- */
- public static final int APPEND_BOOT_CLASSPATH = 2;
-
- /**
- * Prepend to the boot classpath.
- */
- public static final int PREPEND_BOOT_CLASSPATH = 3;
-
- /**
- * Append a folder to the java.library.path (for things like
- * dll's). This should result in a folder only.
- * The nlsLocalize flag contribute via plugin will be
- * ignored for this type flag.
- */
- public static final int APPEND_JAVA_LIBRARY_PATH = 4;
-
- /**
- * Get the java project that we are contributing for.
- *
- * @return javaproject, may be <code>null</code>
- *
- * @since 1.0.0
- */
- public IJavaProject getJavaProject();
-
- /**
- * Add a project to the classpath. The type flag tells where to add it.
- *
- * @param project
- * @throws CoreException
- *
- * @since 1.0.0
- */
- public void contributeProject(IProject project) throws CoreException;
-
- /**
- * Add an external file/folder to the classpath. The type flag tells where to add it.
- *
- * @param classpath
- * @param typeFlag One of <code>APPEND_USER_CLASSPATH</code>, <code>APPEND_BOOT_CLASSPATH</code>, <code>PREPEND_BOOT_CLASSPATH</code>, or <code>APPEND_JAVA_LIBRARY_PATH</code>.
- *
- * @deprecated use contributeClasspath(URL, int) instead.
- * @see #contributeClasspath(URL, int)
- * @since 1.0.0
- */
- public void contributeClasspath(String classpath, int typeFlag);
-
- /**
- * Add an external file/folder to the classpath. The type flag tells where to add it.
- *
- * @param classpathURL
- * @param typeFlag One of <code>APPEND_USER_CLASSPATH</code>, <code>APPEND_BOOT_CLASSPATH</code>, <code>PREPEND_BOOT_CLASSPATH</code>, or <code>APPEND_JAVA_LIBRARY_PATH</code>.
- *
- * @since 1.0.0
- */
- public void contributeClasspath(URL classpathURL, int typeFlag);
-
- /**
- * Add an external files/folders to the classpath. The type flag tells where to add it.
- *
- * @param classpaths
- * @param typeFlag One of <code>APPEND_USER_CLASSPATH</code>, <code>APPEND_BOOT_CLASSPATH</code>, <code>PREPEND_BOOT_CLASSPATH</code>, or <code>APPEND_JAVA_LIBRARY_PATH</code>.
- *
- * @deprecated use contributeClasspath(URL[], int) instead.
- * @see #contributeClasspath(URL[], int)
- * @since 1.0.0
- */
- public void contributeClasspath(String[] classpaths, int typeFlag);
-
- /**
- * Add an external files/folders to the classpath. The type flag tells where to add it.
- *
- * @param classpathURLs
- * @param typeFlag One of <code>APPEND_USER_CLASSPATH</code>, <code>APPEND_BOOT_CLASSPATH</code>, <code>PREPEND_BOOT_CLASSPATH</code>, or <code>APPEND_JAVA_LIBRARY_PATH</code>.
- *
- * @since 1.0.0
- */
- public void contributeClasspath(URL[] classpathURLs, int typeFlag);
-
- /**
- * Add a file/folder from a plugin in the running Eclipse to the classpath. The type flag tells where to add it.
- * In development mode it will find the bin class files instead if proxy.jars is setup correctly.
- * <p>
- * If nlsLocalize is <code>true</code>, then it will also search through the fragments in this manner:
- * (Note: if <code>false</code> it will still search in the fragments, but it will only return the first file found that matches.
- * <p>
- * Find in the plugin and all of the fragments those that match the name exactly
- * <p>
- * This is useful for nls where the nls for the filename will be in one or more of the fragments of the plugin.
- *
- * @param bundle The bundle it can be found in.
- * @param relativePath Path to file/folder relative to bundle root. Or <code>null</code> if it is the bundle/fragment itself (for when the bundle has been jar'ed up).
- * <b>Note: </b>If it is <code>APPEND_JAVA_LIBRARY_PATH</code>, it should be folder and nlsLocalize will be ignored.
- * In this case be careful that if a folder and the plugin is jarred that the folder <b>IS NOT THE ROOT OF THE PLUGIN</b>. This will
- * cause the entire plugin to be extracted instead of just the directory containing the libraries. If the libraries are in the root
- * of a jarred plugin then a separate cache directory should be created instead and the libraries of interest extracted to there. And
- * then point to the cache directory instead.
- * @param typeFlag One of <code>APPEND_USER_CLASSPATH</code>, <code>APPEND_BOOT_CLASSPATH</code>, <code>PREPEND_BOOT_CLASSPATH</code>, or <code>APPEND_JAVA_LIBRARY_PATH</code>.
- * @param nlsLocalize The usual value should be <code>false</code>. Use <code>true</code> if should look through fragments to gather them all as described in this methods description. This will work for jarred bundles/fragments too.
- *
- * @since 1.0.0
- */
- public void contributeClasspath(Bundle bundle, String relativePath, int typeFlag, boolean nlsLocalize);
-
- /**
- * Same as {@link #contributeClasspath(Bundle, String, int, boolean)} except an IPath can be used as the relative path.
- *
- * @param bundle
- * @param relativePath path to file within bundle. Or <code>null</code> if it is the bundle/fragment itself (for when the bundle has been jar'ed up).
- * @param typeFlag
- * @param nlsLocalize
- *
- * @see #contributeClasspath(Bundle, String, int, boolean)
- * @since 1.0.0
- */
- public void contributeClasspath(Bundle bundle, IPath relativePath, int typeFlag, boolean nlsLocalize);
-
-}
diff --git a/plugins/org.eclipse.jem.proxy/proxy/org/eclipse/jem/internal/proxy/core/IConfigurationContributionInfo.java b/plugins/org.eclipse.jem.proxy/proxy/org/eclipse/jem/internal/proxy/core/IConfigurationContributionInfo.java
deleted file mode 100644
index 9d25a45..0000000
--- a/plugins/org.eclipse.jem.proxy/proxy/org/eclipse/jem/internal/proxy/core/IConfigurationContributionInfo.java
+++ /dev/null
@@ -1,164 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2004, 2005 IBM Corporation and others.
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
- *
- * Contributors:
- * IBM Corporation - initial API and implementation
- *******************************************************************************/
-/*
-
-
- */
-package org.eclipse.jem.internal.proxy.core;
-
-import java.util.Map;
-
-import org.eclipse.jdt.core.IJavaProject;
-
-/**
- * This interface will be passed to the IConfigurationContributor initialize method. It has info
- * that may be needed by the contributor. It may be saved for later use, but if classpaths have changed,
- * it won't be kept up to date.
- * <p>
- * This interface is not intended to be implemented by clients.
- * </p>
- *
- * @see org.eclipse.jem.internal.proxy.core.IConfigurationContributor#initialize(IConfigurationContributionInfo)
- * @since 1.0.0
- */
-public interface IConfigurationContributionInfo {
-
- /**
- * Hold the visible and hidden container paths.
- * A visible container path means it has been exported up to the top-level project. And also
- * the array of those not visible. The paths are the String form (i.e. IPath.toString()).
- * <p>
- * These are the values of the {@link IConfigurationContributionInfo#getContainerIds()} map.
- *
- * @since 1.2.0
- */
- public static class ContainerPaths {
-
- private final String[] visiblePath;
- private final String[] hiddenPaths;
- private final String containerId;
-
- ContainerPaths(String containerId, String[] visiblePath, String[] hiddenPaths) {
- // Not meant to be subclassed or constructed by clients.
- this.containerId = containerId;
- this.visiblePath = visiblePath;
- this.hiddenPaths = hiddenPaths;
- }
-
-
- /**
- * @return Returns the containerId.
- *
- * @since 1.2.0
- */
- public final String getContainerId() {
- return containerId;
- }
-
- /**
- * Array of visible container paths. A path is visible if it is exported up to and can
- * see by the top-level project.
- *
- * @return
- *
- * @since 1.2.0
- */
- public final String[] getVisibleContainerPaths() {
- return visiblePath;
- }
-
- /**
- * Array of hidden container paths. A path is hidden if it is not exported up to and cannot
- * see by the top-level project.
- *
- * @return
- *
- * @since 1.2.0
- */
- public final String[] getHiddenContainerPaths() {
- return hiddenPaths;
- }
-
- /**
- * Get all of the paths together, both visible and hidden.
- * @return
- *
- * @since 1.2.0
- */
- public String[] getAllPaths() {
- String[] allPaths = new String[visiblePath.length+hiddenPaths.length];
- System.arraycopy(visiblePath, 0, allPaths, 0, visiblePath.length);
- System.arraycopy(hiddenPaths, 0, allPaths, visiblePath.length, hiddenPaths.length);
- return allPaths;
- }
- }
-
- /**
- * Get the java project that we are contributing for.
- *
- * @return javaproject, may be <code>null</code>
- *
- * @since 1.0.0
- */
- public IJavaProject getJavaProject();
-
- /**
- * Return the map of containers (the key) that are found in the classpath. This is useful for determining
- * if the container impliments a contributor interface.
- * <p>
- * Value will be {@link ContainerPaths}
- *
- * @return Map of containers. Keys of type String for container id (e.g. "SWT_CONTAINER" for a container classpath of "/SWT_CONTAINER/PDE/xyz".
- * Values will be {@link ContainerPaths} Empty if launch not in a project.
- *
- * @since 1.0.0
- */
- public Map getContainers();
-
- /**
- * Return the map of container ids that are found in the classpath.
- * <p>
- * Key will be String and it is the first segment of a container path. Value will {@link ContainerPaths}. This
- * will contain all of the visible and hidden paths that the project can see. All of the paths will have
- * the key (container id) as the first segment of the path.
- *
- * @return map of container ids. Keys of type String. Values will be {@link ContainerPaths} Empty if launch not in a project.
- *
- * @since 1.0.0
- */
- public Map getContainerIds();
-
- /**
- * Return the map of plugin ids (the key) that are found in the classpath.
- * <p>
- * Value will <code>Boolean</code> and will be true if plugin was visible to top-level project.
- *
- * @return map of plugin ids. Key of type String. Empty if launch not in a project.
- *
- * @since 1.0.0
- */
- public Map getPluginIds();
-
- /**
- * Return the map of project paths (the key) that are found in the classpath. The top-level project
- * will NOT be in this list since it is assumed to be visible to itself.
- * <p>
- * Value will <code>Boolean</code> and will be true if project was visible to top-level project.
- *
- * @return map of project paths. Key of type <code>IPath</code>. Empty if launch not in a project.
- *
- * @see org.eclipse.core.runtime.IPath
- * @since 1.0.0
- */
- public Map getProjectPaths();
-
-
-}
diff --git a/plugins/org.eclipse.jem.proxy/proxy/org/eclipse/jem/internal/proxy/core/IConfigurationContributor.java b/plugins/org.eclipse.jem.proxy/proxy/org/eclipse/jem/internal/proxy/core/IConfigurationContributor.java
deleted file mode 100644
index d456b48..0000000
--- a/plugins/org.eclipse.jem.proxy/proxy/org/eclipse/jem/internal/proxy/core/IConfigurationContributor.java
+++ /dev/null
@@ -1,76 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2001, 2005 IBM Corporation and others.
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
- *
- * Contributors:
- * IBM Corporation - initial API and implementation
- *******************************************************************************/
-package org.eclipse.jem.internal.proxy.core;
-/*
-
-
- */
-
-
-import org.eclipse.core.runtime.CoreException;
-import org.eclipse.debug.core.ILaunchConfigurationWorkingCopy;
-
-
-/**
- * This interface is used to contribute to the configuration that will be
- * used to start a proxy registry.
- *
- * @since 1.0.0
- */
-public interface IConfigurationContributor {
-
- /**
- * Called first before any of the other calls. This can be used to do any internal initializations
- * required by the other calls. That way the other calls can have the order changed as the implementation
- * requires.
- * <p>
- * NOTE: For those who nest configuration contributors (i.e. within an implementation of a contributor, more
- * contributors are discovered) then it is imperitive that when those contributors are discovered that this method
- * be called on them too. This is necessary so the contract with contributors can be followed. It is best if the
- * discoveries are actually done in the initialize method itself so that it can pass the launch info right there.
- *
- * @param info info contains things like containers visible, etc.
- *
- * @see IConfigurationContributionInfo
- * @since 1.0.0
- */
- public void initialize(IConfigurationContributionInfo info);
-
- /**
- * Contribute to the classpath. The controller is used to do the actual contribution.
- *
- * @param controller
- * @throws CoreException
- *
- * @since 1.0.0
- */
- public void contributeClasspaths(IConfigurationContributionController controller) throws CoreException;
-
- /**
- * Contribute updates to the configuration. It will be called before the launch has started.
- *
- * @param config
- * @throws CoreException
- *
- * @since 1.0.0
- */
- public void contributeToConfiguration(ILaunchConfigurationWorkingCopy config) throws CoreException;
-
- /**
- * Contribute to the registry (or interact with the remote vm) after the registry has been
- * created.
- *
- * @param registry
- *
- * @since 1.0.0
- */
- public void contributeToRegistry(ProxyFactoryRegistry registry);
-}
diff --git a/plugins/org.eclipse.jem.proxy/proxy/org/eclipse/jem/internal/proxy/core/IConstructorProxy.java b/plugins/org.eclipse.jem.proxy/proxy/org/eclipse/jem/internal/proxy/core/IConstructorProxy.java
deleted file mode 100644
index 0bc0083..0000000
--- a/plugins/org.eclipse.jem.proxy/proxy/org/eclipse/jem/internal/proxy/core/IConstructorProxy.java
+++ /dev/null
@@ -1,42 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2001, 2005 IBM Corporation and others.
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
- *
- * Contributors:
- * IBM Corporation - initial API and implementation
- *******************************************************************************/
-package org.eclipse.jem.internal.proxy.core;
-/*
-
-
- */
-
-
-/**
- * This is a proxy that allows a constructor to exist in the target VM
- * and be referenced in the IDE VM
- * Creation date: (1/17/00 1:21:52 PM)
- * @author: Joe Winchester
- */
-public interface IConstructorProxy extends IAccessibleObjectProxy {
-/**
- * Return a new instance with no creation arguments,
- * i.e. for a null constructor
- * Creation date: (1/17/00 1:22:11 PM)
- */
-IBeanProxy newInstance() throws ThrowableProxy;
-/**
- * Return a new instance with the specified creation arguments
- * Creation date: (1/17/00 1:22:11 PM)
- */
-IBeanProxy newInstance(IBeanProxy[] creationArguments) throws ThrowableProxy;
-
-IBeanProxy newInstanceCatchThrowableExceptions();
-IBeanProxy newInstanceCatchThrowableExceptions(IBeanProxy[] creationArguments);
-
-IBeanTypeProxy[] getParameterTypes();
-
-}
diff --git a/plugins/org.eclipse.jem.proxy/proxy/org/eclipse/jem/internal/proxy/core/IDimensionBeanProxy.java b/plugins/org.eclipse.jem.proxy/proxy/org/eclipse/jem/internal/proxy/core/IDimensionBeanProxy.java
deleted file mode 100644
index 549c1cb..0000000
--- a/plugins/org.eclipse.jem.proxy/proxy/org/eclipse/jem/internal/proxy/core/IDimensionBeanProxy.java
+++ /dev/null
@@ -1,34 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2001, 2005 IBM Corporation and others.
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
- *
- * Contributors:
- * IBM Corporation - initial API and implementation
- *******************************************************************************/
-package org.eclipse.jem.internal.proxy.core;
-/*
-
-
- */
-
-
-
-/**
- * Interface to a Dimension bean proxy.
- * <p>
- * These are common for different windowing systems, e.g. AWT and SWT. So this here
- * is common interface for them.
- * Creation date: (4/7/00 3:46:39 PM)
- * @author: Administrator
- */
-public interface IDimensionBeanProxy extends IBeanProxy {
- public int getHeight();
- public int getWidth();
- public void setHeight(int height);
- public void setWidth(int width);
- public void setSize(int width, int height);
- public void setSize(IDimensionBeanProxy dim);
-}
diff --git a/plugins/org.eclipse.jem.proxy/proxy/org/eclipse/jem/internal/proxy/core/IExpression.java b/plugins/org.eclipse.jem.proxy/proxy/org/eclipse/jem/internal/proxy/core/IExpression.java
deleted file mode 100644
index 561fe41..0000000
--- a/plugins/org.eclipse.jem.proxy/proxy/org/eclipse/jem/internal/proxy/core/IExpression.java
+++ /dev/null
@@ -1,1009 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2004, 2005 IBM Corporation and others.
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
- *
- * Contributors:
- * IBM Corporation - initial API and implementation
- *******************************************************************************/
-/*
-
-
- */
-package org.eclipse.jem.internal.proxy.core;
-
-import org.eclipse.jem.internal.proxy.initParser.tree.*;
-import org.eclipse.jem.internal.proxy.initParser.tree.IExpressionConstants;
-import org.eclipse.jem.internal.proxy.initParser.tree.NoExpressionValueException;
-
-/**
- * This is an expression. It will be evaluated on the other side. The difference between an
- * expression and using IMethodProxy's, IConstructorProxy's, etc. is the granularity. The proxies
- * are one round-trip to the other side for each access or execution. The expression builds them up
- * and will execute them all at once on the other side. Another difference is that the reflection
- * will be done on the other side too. For instance when invoking a method, the method name is
- * passed into the expression as a string then reflected and then invoked, while with method
- * proxies, the string is used to find the proxy on the other side, and then a later round-trip
- * will be used to invoke it.
- * <p>
- * Also an expression is a one-time use object. It can't be reused a second time. A new one must be
- * built up again.
- * <p>
- * We are not using separate instances of expressions, and types of expressions, because we don't
- * want to build up many objects (in a form of an expression tree) that will then be thrown away
- * (one for each expression in the nested list of expressions). We just build the command list as
- * we build the expression.
- * <p>
- * To use, you call the IStandardBeanProxyFactory's createExpression method. An IExpression is
- * returned. From there you will start creating the contents of the expression. And then you will
- * finally either getExpressionValue() to get the final value of the expression, or use
- * invokeExpression() to just execute the expression(s). If you use getExpressionValue(), there can
- * only be one root expression. If you use invokeExpression there can be more than one root
- * expression, and they will all be executed.
- * <p>
- * Since sequence is so important, it will be tested and if anything is done out of order an
- * IllegalStateException will be thrown.
- * <p>
- * Each time an expression is created, one argument passed in will be <code>forExpression</code> flag.
- * This is a set of constants used as a clue for what expression this expression is being created.
- * This is for a sanity check on the state. For example, when creating the array expression for an
- * array access, the ARRAYACCESS_ARRAY flag is passed in. This way if the current expression on the
- * stack is not for an array access waiting for the array expression, an IllegalStateException will be thrown.
- * Without this flag, it would be easy to accidently create the wrong expression at the wrong time.
- * Once such an error occurs, this IExpression will no longer be valid. IllegalStateException will be thrown
- * for any type of access.
- * <p>
- * It is guarenteed that the entire stack of commands will be sent without stopping except for IllegalStateException
- * due to out of order expressions.
- * <p>
- * <b>Note:</b> This interface is not meant to be neither instantiated nor implemented by customers.
- * It is the interface into the expression processing. It is to be instantiated through the createExpression request.
- * The {@link org.eclipse.jem.internal.proxy.core.Expression} class is available as API. It is not meant to
- * be instantiated by customers, but customers can take the IExpression and cast to Expression for some advanced
- * API.
- *
- * @see org.eclipse.jem.internal.proxy.core.IStandardBeanProxyFactory#createExpression()
- * @see java.lang.IllegalStateException
- * @since 1.0.0
- */
-public interface IExpression extends IExpressionConstants {
-
- /**
- * Return the registry this expression is working against.
- * @return
- *
- * @since 1.1.0
- */
- public ProxyFactoryRegistry getRegistry();
-
- /**
- * Invoke the expression(s). If there is more than one root expression, it will invoke them
- * in the order created. If the expression stack is not complete, then <code>IllegalStateException</code>
- * will be thrown.
- *
- * @throws ThrowableProxy
- * @throws IllegalStateException
- * @throws NoExpressionValueException
- *
- * @since 1.0.0
- */
- public void invokeExpression() throws ThrowableProxy, NoExpressionValueException, IllegalStateException;
-
- /**
- * Return whether the expression is valid. It would be invalid if any of the create... calls had thrown an
- * exception or if the expression has already been evaluated (invoked or getExpressionValue()).
- *
- * @return <code>true</code> if expression is valid, <code>false</code> if there had been some error, or if the expression has already been evaluated.
- *
- * @since 1.1.0
- */
- public boolean isValid();
-
- /**
- * Close the expression. This needs to be called if for some reason {@link IExpression#invokeExpression()} or {@link IExpression#getExpressionValue()}
- * were not called. It is not an error to always call this after these calls. It will not have any problems with the expression already
- * being closed. invoke and getvalue automatically call close for you. If you don't call close in case of an error, the resources
- * for the expression will not be freed up.
- *
- *
- * @since 1.1.0
- */
- public void close();
-
- /**
- * Invoke the root expression and return the value of the expression. If the expression stack
- * is not complete, or if there is more than one root expression, then <code>IllegalStateException</code>
- * will be thrown.
- *
- * @return The value of the root expression.
- *
- * @throws ThrowableProxy
- * @throws IllegalStateException
- * @throws NoExpressionValueException
- *
- * @since 1.0.0
- */
- public IBeanProxy getExpressionValue() throws ThrowableProxy, NoExpressionValueException, IllegalStateException;
-
- /**
- * Create an Array Access (e.g. x[3]).
- * This must be followed by create expressions for:
- * <pre>
- * <code>ARRAYACCESS_ARRAY</code>
- * <code>ARRAYACCESS_INDEX</code> an indexCount times.
- * </pre>
- * <p>
- * So the array access must be followed by 1+indexCount expressions.
- *
- * @param forExpression This is for what expression this expression is being created.
- * @param indexCount The number of index expressions that will be created.
- * @throws IllegalStateException
- *
- * @since 1.0.0
- */
- public void createArrayAccess(ForExpression forExpression, int indexCount) throws IllegalStateException;
-
- /**
- * Create an Array Creation (e.g. <code>new int[3]</code> or <code>new int[3][]</code> or <code>new int[] {3, 4}</code>).
- * If <code>dimensionExpressionCount</code> is zero, then there must be an initializer. This is because
- * if there are any dimension expressions, then initializers are invalid and visa-versa.
- * <p>
- * The dimensionExpressionCount is for how many dimensions have an expression in them. For instance,
- * <code>new int[3]</code> will have a dimensionExpressionCount of 1. While
- * <code>new int[3][]</code> will also have count of 1. And finally
- * <code>new int []</code> will have a count of 0.
- * <p>
- * This must be followed by create expressions for:
- * <pre>
- * <code>ARRAYCREATION_DIMENSION</code> a dimensionExpressionCount times,
- * or an <code>createArrayInitializer()</code> if dimension count is 0.
- * </pre>
- *
- * @param forExpression
- * @param type This is the type. It must be fully-qualified and if an inner class, it must have the "$" format. It must also include the correct number of <code>[]</code> at the end.
- * @param dimensionExpressionCount
- * @throws IllegalStateException
- *
- * @since 1.0.0
- */
- public void createArrayCreation(ForExpression forExpression, String type, int dimensionExpressionCount) throws IllegalStateException;
-
- /**
- * Create an Array Creation (e.g. <code>new int[3]</code> or <code>new int[3][]</code> or <code>new int[] {3, 4}</code>).
- * If <code>dimensionExpressionCount</code> is zero, then there must be an initializer. This is because
- * if there are any dimension expressions, then initializers are invalid and visa-versa.
- * <p>
- * The dimensionExpressionCount is for how many dimensions have an expression in them. For instance,
- * <ol>
- * <li><code>new int[3]</code> will have a dimensionExpressionCount of 1. While
- * <li><code>new int[3][]</code> will also have count of 1. And finally
- * <li><code>new int []</code> will have a count of 0.
- * </ol>
- * The expressions that follow if dimensionExpressionCount is not zero must evaluate to be compatible to an int type (i.e. byte, char, short, or int).
- * Each expression will be used to create an array for that dimension of that size. For example <code>new int[3][]</code> will have an
- * dimension expression that evaluates to "3", and so it will create an array int[3][].
- * <p>
- * This must be followed by create expressions for:
- * dimensionExpressionCount times an: <code>ARRAYCREATION_DIMENSION</code>
- * or an createArrayInitializer if dimension count is 0.
- *
- * @param forExpression
- * @param type This is the type. This must be the actual type with the correct total number of dimensions (e.g. "java.lang.Object[][]").
- * @param dimensionExpressionCount number of int valued expressions that follow that give the size for each dimension.
- * @throws IllegalStateException
- * @throws IllegalArgumentException
- *
- * @since 1.0.0
- */
- public void createArrayCreation(ForExpression forExpression, IProxyBeanType type, int dimensionExpressionCount) throws IllegalStateException, IllegalArgumentException;
-
- /**
- * Create an array initializer. (e.g. <code>{2,3}</code>).
- * This one is unusual in that there is no forExpression. That is because array initializers are only valid in
- * certain places. And so if called when not expected, this is an IllegalStateException.
- * <p>
- * This must be followed by createExpressions for:
- * expressionCount times an: <code>ARRAYINITIALIZER_EXPRESSION</code>
- * except if the expression is another array initializer. That is valid and doesn't have a forExpression,
- * but it does count as one of the expressionCounts.
- *
- * @param expressionCount Number of expressions, may be 0.
- * @throws IllegalStateException
- *
- * @since 1.0.0
- */
- public void createArrayInitializer(int expressionCount) throws IllegalStateException;
-
- /**
- * Create a cast expression (e.g. <code>(short)10</code> or <code>(java.lang.String) "asd"</code>)
- * <p>
- * This must be followed by createExpressions for:
- * <code>CAST_EXPRESSION</code>
- *
- * @param forExpression
- * @param type This is the type. It must be fully-qualified and if an inner class, it must have the "$" format.
- * @throws IllegalStateException
- *
- * @since 1.0.0
- */
- public void createCastExpression(ForExpression forExpression, String type) throws IllegalStateException;
-
- /**
- * Create a cast expression (e.g. <code>(short)10</code> or <code>(java.lang.String) "asd"</code>)
- * <p>
- * This must be followed by createExpressions for:
- * <code>CAST_EXPRESSION</code>
- *
- * @param forExpression
- * @param type This is the type.
- * @throws IllegalStateException
- * @throws IllegalArgumentException
- *
- * @since 1.0.0
- */
- public void createCastExpression(ForExpression forExpression, IProxyBeanType type) throws IllegalStateException, IllegalArgumentException;
-
- /**
- * Create a new class instance expression (e.g. <code>new java.lang.Integer(5)</code>)
- * <p>
- * This must be followed by createExpressions for:
- * argumentCount times an: <code>CLASSINSTANCECREATION_ARGUMENT</code>
- *
- * <p>
- * <b>Note:</b> This method can throw {@link org.eclipse.jem.internal.proxy.common.UnresolvedCompilationError} while processing
- * and can be caught by an Expression try/catch. This is not thrown such that it can be caught by a real java try/catch.
- *
- * @param forExpression
- * @param type This is the type. It must be fully-qualified and if an inner class, it must have the "$" format.
- * @param argumentCount
- * @throws IllegalStateException
- *
- * @since 1.0.0
- */
- public void createClassInstanceCreation(ForExpression forExpression, String type, int argumentCount) throws IllegalStateException;
-
- /**
- * Create a new class instance expression (e.g. <code>new java.lang.Integer(5)</code>)
- * <p>
- * This must be followed by createExpressions for:
- * argumentCount times an: <code>CLASSINSTANCECREATION_ARGUMENT</code>
- *
- * <p>
- * <b>Note:</b> This method can throw {@link org.eclipse.jem.internal.proxy.common.UnresolvedCompilationError} while processing
- * and can be caught by an Expression try/catch. This is not thrown such that it can be caught by a real java try/catch.
- *
- * @param forExpression
- * @param type This is the type.
- * @param argumentCount
- * @throws IllegalStateException
- * @throws IllegalArgumentException
- *
- * @since 1.0.0
- */
- public void createClassInstanceCreation(ForExpression forExpression, IProxyBeanType type, int argumentCount) throws IllegalStateException, IllegalArgumentException;
-
- /**
- * Create a conditional expression (e.g. <code>x != 3 ? 4 : 5</code>)
- * <p>
- * This must be followed by createExpressions for:
- * <code>CONDITIONAL_CONDITION</code>
- * <code>CONDITIONAL_TRUE</code>
- * <code>CONDITIONAL_FALSE</code>
- *
- * @param forExpression
- * @throws IllegalStateException
- *
- * @since 1.0.0
- */
- public void createConditionalExpression(ForExpression forExpression) throws IllegalStateException;
-
- /**
- * Create a field access (e.g. <code>java.awt.Color.red</code>)
- * <p>
- * Note: At this time we require a receiver. In the future it may be possible to not have one, but
- * for that we need a <code>this</code> object to know who the receiver implicitly is.
- * The receiver may be a "type receiver" if it is a type, e.g. <code>java.awt.Color</code>.
- * <p>
- * This must be followed by createExpressions for:
- * <code>FIELD_RECEIVER</code> if hasReceiver is <code>true</code>
- *
- * @param forExpression
- * @param fieldName The name of the field.
- * @param hasReceiver Has a receiver flag. Currently this must always be true. This is because can't tell what class to look into for the field without a receiver.
- * @throws IllegalArgumentException
- * @throws IllegalStateException
- *
- * @see IExpression#createTypeReceiver(String)
- * @since 1.0.0
- */
- public void createFieldAccess(ForExpression forExpression, String fieldName, boolean hasReceiver) throws IllegalArgumentException, IllegalStateException;
-
- /**
- * Create a field access (e.g. <code>java.awt.Color.red</code>)
- * <p>
- * Note: At this time we require a receiver for non-static access. In the future it may be possible to not have one, but
- * for that we need a <code>this</code> object to know who the receiver implicitly is.
- * The receiver may be a "type receiver" if it is a type, e.g. <code>java.awt.Color</code>.
- * <p>
- * This must be followed by createExpressions for:
- * <pre>
- * <code>FIELD_RECEIVER</code> if hasReceiver is <code>true</code>
- * </pre>
- *
- * @param forExpression
- * @param fieldProxy The field proxy for the field.
- * @param hasReceiver Has a receiver flag.
- * @throws IllegalStateException
- * @throws IllegalArgumentException
- *
- * @see IExpression#createTypeReceiver(String)
- * @since 1.0.0
- */
- public void createFieldAccess(ForExpression forExpression, IProxyField fieldProxy, boolean hasReceiver) throws IllegalStateException, IllegalArgumentException;
-
- /**
- * Create an if/else stmt. Since this is a statment, there is no ForExpression. ROOT_EXPRESSION must be the next expression type.
- * <p<
- * This must be followed by createExpressions for:
- * <pre>
- * <code>IF_CONDITION</code> The if test, must return boolean.
- * <code>IF_TRUE</code> The if condition is true clause. The clause may be an expression, or a block.
- * <code>IF_ELSE</code> if hasElseClause is <code>true</code>. The else clause. The clause may be an expression, or a block.
- * </pre>
- *
- * @param hasElseClause
- * @throws IllegalStateException
- *
- * @since 1.1.0
- */
- public void createIfElse(boolean hasElseClause) throws IllegalStateException;
-
- /**
- * Create an infix expression (e.g. <code>3 + 4</code> or <code>3 + 4 + 5</code>).
- * <p>
- * If there are more than 2 operands (all with the same operator) then for convienence all of
- * the expression can be done in one expression than requiring several, one for each operator.
- * If they are different operators, then different expressions will be required.
- * <p>
- * <pre>
- * This must be followed by createExpressions for:
- * <code>INFIX_LEFT</code>
- * <code>INFIX_RIGHT</code>
- * extendedOperandCount times an: <code>INFIX_EXTENDED</code>
- * </pre>
- *
- * @param forExpression
- * @param operator The operator.
- * @param extendedOperandCount The number of extended operands. May be zero.
- * @throws IllegalStateException
- *
- * @see org.eclipse.jem.internal.proxy.common.IExpressionConstants#IN_AND
- * @since 1.0.0
- */
- public void createInfixExpression(ForExpression forExpression, InfixOperator operator, int extendedOperandCount) throws IllegalStateException;
-
- /**
- * Create an instanceof expression (e.g. <code>x instanceof java.lang.String</code>
- * <p>
- * This must be followed by createExpression for:
- * <code>INSTANCEOF_VALUE</code>
- * @param forExpression
- * @param type This is the type. It must be fully-qualified and if an inner class, it must have the "$" format.
- * @throws IllegalStateException
- *
- * @since 1.0.0
- */
- public void createInstanceofExpression(ForExpression forExpression, String type) throws IllegalStateException;
-
- /**
- * Create an instanceof expression (e.g. <code>x instanceof java.lang.String</code>
- * <p>
- * This must be followed by createExpression for:
- * <code>INSTANCEOF_VALUE</code>
- * @param forExpression
- * @param type This is the type.
- * @throws IllegalStateException
- * @throws IllegalArgumentException
- *
- * @since 1.0.0
- */
- public void createInstanceofExpression(ForExpression forExpression, IProxyBeanType type) throws IllegalStateException, IllegalArgumentException;
-
- /**
- * Create a method invocation expression (e.g. <code>java.lang.String.valueOf(10)</code>).
- * When using a string the method invoked will be the one most compatible with the arguments sent.
- * This allows overloading a method to occur when coming in from a parse tree, since the parse tree
- * doesn't know the exact method to use.
- * <p>
- * Note: At this time we require a receiver. In the future it may be possible to not have one, but
- * for that we need a <code>this</code> object to know who the receiver implicitly is.
- * The receiver may be a "type receiver" if it is a type, e.g. <code>java.awt.Color</code>.
- * <p>
- * This must be followed by createExpression for:
- * <code>METHOD_RECEIVER</code>
- * argumentCounts times expressions for: <code>METHOD_ARGUMENT</code>
- *
- * @param forExpression
- * @param name The name of the method
- * @param hasReceiver Has a receiver flag. Currently this must always be true.
- * @param argumentCount Count of number of arguments. May be zero.
- * @throws IllegalStateException
- * @throws IllegalArgumentException
- *
- * @see IExpression#createTypeReceiver(String)
- * @since 1.0.0
- */
- public void createMethodInvocation(ForExpression forExpression, String name, boolean hasReceiver, int argumentCount) throws IllegalStateException, IllegalArgumentException;
-
- /**
- * Create a method invocation expression (e.g. <code>java.lang.String.valueOf(10)</code>)
- * <p>
- * Note: At this time we require a receiver. In the future it may be possible to not have one, but
- * for that we need a <code>this</code> object to know who the receiver implicitly is.
- * The receiver may be a "type receiver" if it is a type, e.g. <code>java.awt.Color</code>.
- * <p>
- * This must be followed by createExpression for:
- * <code>METHOD_RECEIVER</code>
- * argumentCounts times expressions for: <code>METHOD_ARGUMENT</code>
- *
- * @param forExpression
- * @param methodProxy The proxy of the method
- * @param hasReceiver Has a receiver flag. Currently this must always be true.
- * @param argumentCount Count of number of arguments. May be zero.
- * @throws IllegalStateException
- * @throws IllegalArgumentException
- *
- * @see IExpression#createTypeReceiver(String)
- * @since 1.0.0
- */
- public void createMethodInvocation(ForExpression forExpression, IProxyMethod methodProxy, boolean hasReceiver, int argumentCount) throws IllegalStateException, IllegalArgumentException;
-
- /**
- * Create a prefix expression (e.g. <code>!flag</code> or <code>-(3+4)</code>).
- * If you are just trying to create a signed numeric literal, just use the createPrimitiveLiteral passing in a
- * negative value. You don't need to use prefix expression for that.
- * <p>
- * <pre>
- * This must be followed by createExpressions for:
- * <code>PREFIX_OPERAND</code>
- * </pre>
- * @param forExpression
- * @param operator The operator. The values come from IExpressionConstants, the prefix constants.
- * @throws IllegalStateException
- *
- * @see org.eclipse.jem.internal.proxy.common.IExpressionConstants#PRE_PLUS
- * @since 1.0.0
- */
- public void createPrefixExpression(ForExpression forExpression, PrefixOperator operator) throws IllegalStateException;
-
- /**
- * Create a reference to <code>null</code>.
- *
- * @param forExpression
- * @throws IllegalStateException
- *
- * @since 1.0.0
- */
- public void createNull(ForExpression forExpression) throws IllegalStateException;
-
- /**
- * Create a type literal (e.g. <code>java.lang.String.class</code>). This is used when the type is being used as value itself, not
- * as a receiver for a field or method or constructor or instanceof. Like as an argument to a method.
- * <p>
- * Note: If you want a type literal to be an IProxyBeanType, just use {@link IExpression#createProxyExpression(ForExpression, IProxy)} and pass in the
- * IProxyBeanType.
- *
- * @param forExpression
- * @param type This is the type. It must be fully-qualified and if an inner class, it must have the "$" format.
- * @throws IllegalStateException
- *
- * @since 1.0.0
- */
- public void createTypeLiteral(ForExpression forExpression, String type) throws IllegalStateException;
-
- /**
- * Create a type receiver. This is where a type is used as the receiver of a field access or a method invocation.
- * (e.g. <code>java.lang.String.valueOf(10)</code>). For this the "java.lang.String" IBeanTypeProxy is the type receiver.
- * <p>
- * This is unusual in that there is no forExpression. It isn't needed because these are only valid
- * in certain situations (method or field receiver) and if used anywhere else it is an error.
- *
- * @param type This is the type. It must be fully-qualified and if an inner class, it must have the "$" format.
- * @throws IllegalStateException
- *
- * @since 1.0.0
- */
- public void createTypeReceiver(String type) throws IllegalStateException;
-
- /**
- * Create a type receiver. This is where a type is used as the receiver of a field access or a method invocation.
- * (e.g. <code>java.lang.String.valueOf(10)</code>). For this the "java.lang.String" IProxyBeanType is the type receiver.
- * <p>
- * This is unusual in that there is no forExpression. It isn't needed because these are only valid
- * in certain situations (method or field receiver) and if used anywhere else it is an error.
- *
- * @param type This is the type proxy.
- * @throws IllegalStateException
- * @throws IllegalArgumentException
- *
- * @since 1.0.0
- */
- public void createTypeReceiver(IProxyBeanType type) throws IllegalStateException, IllegalArgumentException;
-
- /**
- * Create a boolean primitive literal (e.g. <code>true</code>).
- *
- * @param forExpression
- * @param value The boolean value for the literal.
- * @throws IllegalStateException
- *
- * @since 1.0.0
- */
- public void createPrimitiveLiteral(ForExpression forExpression, boolean value) throws IllegalStateException;
-
- /**
- * Create a character literal (e.g. <code>'a'</code> or <code>'\n'</code>)
- *
- * @param forExpression
- * @param value The character value for this literal.
- * @throws IllegalStateException
- *
- * @since 1.0.0
- */
- public void createPrimitiveLiteral(ForExpression forExpression, char value) throws IllegalStateException;
-
- /**
- * Create a byte literal (e.g. <code>(byte)10</code>)
- *
- * @param forExpression
- * @param value The byte value for this literal.
- * @throws IllegalStateException
- *
- * @since 1.0.0
- */
- public void createPrimitiveLiteral(ForExpression forExpression, byte value) throws IllegalStateException;
-
- /**
- * Create a double literal (e.g. <code>10d</code>)
- *
- * @param forExpression
- * @param value The double value for this literal.
- * @throws IllegalStateException
- *
- * @since 1.0.0
- */
- public void createPrimitiveLiteral(ForExpression forExpression, double value) throws IllegalStateException;
-
- /**
- * Create a float literal (e.g. <code>10f</code>)
- *
- * @param forExpression
- * @param value The float value for this literal.
- * @throws IllegalStateException
- *
- * @since 1.0.0
- */
- public void createPrimitiveLiteral(ForExpression forExpression, float value) throws IllegalStateException;
-
- /**
- * Create a int literal (e.g. <code>100000</code>)
- *
- * @param forExpression
- * @param value The int value for this literal.
- * @throws IllegalStateException
- *
- * @since 1.0.0
- */
- public void createPrimitiveLiteral(ForExpression forExpression, int value) throws IllegalStateException;
-
- /**
- * Create a long literal (e.g. <code>10l</code>)
- *
- * @param forExpression
- * @param value The long value for this literal.
- * @throws IllegalStateException
- *
- * @since 1.0.0
- */
- public void createPrimitiveLiteral(ForExpression forExpression, long value) throws IllegalStateException;
-
- /**
- * Create a short literal (e.g. <code>(short)10</code>)
- *
- * @param forExpression
- * @param value The short value for this literal.
- * @throws IllegalStateException
- *
- * @since 1.0.0
- */
- public void createPrimitiveLiteral(ForExpression forExpression, short value) throws IllegalStateException;
-
- /**
- * Create a string literal (e.g. <code>"asdf"</code>). The value is the actual string, with escapes already
- * translated into the true character values.
- *
- * @param forExpression
- * @param value The string value for this literal.
- * @throws IllegalStateException
- *
- * @since 1.0.0
- */
- public void createStringLiteral(ForExpression forExpression, String value) throws IllegalStateException;
-
- /**
- * Create a subexpression.
- * <p>
- * A subexpression allows, at any time, to fork off the expression stack and do some other sets of expressions.
- * When the cooresponding {@link #createSubexpressionEnd()} is called, all of the expression results on the
- * stack that accumulated during the subexpression evaluation will be thrown away and the stack will be
- * what it was at the start of subexpression. Any ExpressionProxies that were resolved during the evaluation
- * will not be thrown away and will still be valid.
- * <p>
- * This is useful if in the middle of an expression (such as method invocation and an argument is needed) to
- * go off and get the necessary value. This will allow expressions that require ROOTEXPRESSION state like a
- * try/catch. If you know the expression doesn't need this, then it is more efficient to not use subexpression.
- * <p>
- * For example:
- * <pre><code>
- * new XYZ(
- * {(subexpression)
- * try {
- * x = 3*y.get();
- * } catch (Exception e) {
- * x =4;
- * }
- * (end subexpression)}
- * x);
- * </code></pre>
- *
- * In the above example, we needed to calculate "x" as the argument for XYZ, but it was too complicated and
- * could throw exceptions. So we used a subexpression instead.
- * <p>
- * Of course the following would of been the better way to do it without subexpressions. But sometimes
- * your code is in a position that you don't know you need to do this until it is too late.
- * <pre><code>
- * try {
- * x = 3*y.get();
- * } catch (Exception e) {
- * x =4;
- * }
- * new XYZ(x);
- * </code></pre>
- * @throws IllegalStateException
- *
- * @since 1.1.0
- */
- public void createSubexpression() throws IllegalStateException;
-
- public void createSubexpressionEnd() throws IllegalStateException;
-
- /**
- * Create an expression that has an existing bean proxy as its value.
- *
- * @param forExpression This is for what expression this expression is being created.
- * @param proxy The proxy that should be used as a value, either a bean proxy or an expression proxy.
- * @throws IllegalStateException
- * @throws IllegalArgumentException
- *
- * @since 1.0.0
- */
- public void createProxyExpression(ForExpression forExpression, IProxy proxy) throws IllegalStateException, IllegalArgumentException;
-
- /**
- * Create an assignment expression between a VariableReference and an expression. The left operand must be a variable reference (e.g. FieldAccess or
- * ArrayAccess). The right operand may be any expression that results in a value.
- * <p>
- * <pre>
- * This must be followed by createExpressions for:
- * <code>ASSIGNMENT_LEFT</code>
- * <code>ASSIGNMENT_RIGHT</code>
- * </pre>
- * @param forExpression
- * @throws ThrowableProxy
- * @throws IllegalStateException
- * @throws NoExpressionValueException
- *
- * @since 1.1.0
- */
- public void createAssignmentExpression(ForExpression forExpression) throws IllegalStateException;
-
- /**
- * Create an assignment expression (e.g. x = 3+4) where x will be assigned to the ExpressionProxy.
- * It may be used later on as a value in {@link IExpression#createExpressionProxyExpression(int, ExpressionProxy)}.
- * Or if callbacks were added, the callbacks would be called to return the true IBeanProxy value of the expression proxy when the complete
- * IExpression has been evaluated. The value of the assignment expression (e.g. x) will be passed on into the next expression.
- * <p>
- * <pre>
- * This must be followed by createExpressions for:
- * <code>ASSIGNMENT_RIGHT</code>
- * </pre>
- * <p>
- * <b>Note:</b> It is guarenteed as part of the contract that expression proxies will be notified through the listeners of the final state in the
- * order the expression proxies were created.
- * @param forExpression This is for what expression this expression is being created.
- * @return a proxy to the expression value.
- * @throws IllegalStateException
- *
- * @since 1.1.0
- */
- public ExpressionProxy createProxyAssignmentExpression(ForExpression forExpression) throws IllegalStateException;
-
- /**
- * Create a reassignment expression. This is like the original proxy assignment except that instead of returning a new proxy, it
- * reassigns the new value to the existing proxy. This cannot be used on IBeanTypeExpressionProxy's. That is because
- * they are controlled by the registry and severe errors would occur if they were reassigned.
- * <p>
- * <pre>
- * This must be followed by createExpressions for:
- * <code>ASSIGNMENT_RIGHT</code>
- * </pre>
- * <p>
- * <b>Note:</b> Since we are not creating a new proxy, the notification on the callbacks will be in the original order of proxies. This
- * does not change the notification position of this proxy.
- *
- * @param forExpression
- * @param proxy
- * @throws IllegalStateException
- * @throws IllegalArgumentException if the expression proxy is for a BeanType instead of just a standard expression proxy.
- *
- * @since 1.1.0
- */
- public void createProxyReassignmentExpression(ForExpression forExpression, ExpressionProxy proxy) throws IllegalStateException, IllegalArgumentException;
-
- /**
- * A simple method invocation. This is a helper to make it easier for a simple method invoke. It uses only the
- * method proxy (not a string to look it up), it uses a IBeanProxy receiver (not a complicated expression), and the
- * arguments are a mixture of IBeanProxies and ExpressionProxies. Also it can be called only when the next
- * expression must be a RootExpression.
- *
- * @param method methodproxy of the method
- * @param receiver the receiver proxy or <code>null</code> if a static method
- * @param arguments array of arguments, where each element can only be either <code>null</code> for a null argument, <code>IProxy</code>. The array can be <code>null</code> if no arguments.
- * @param wantResult <code>true</code> if you want an ExpressionProxy back, otherwise it will return <code>null</code>. For performance reasons, only use <code>true</code> if you really need the expression proxy.
- * @return expression proxy if "wantResult" was true, else <code>null</code>.
- * @throws IllegalStateException
- * @throws IllegalArgumentException
- *
- * @since 1.1.0
- */
- public ExpressionProxy createSimpleMethodInvoke(IProxyMethod method, IProxy receiver, IProxy[] arguments, boolean wantResult) throws IllegalStateException, IllegalArgumentException;
-
- /**
- * A simple field access. This is a helper to make it easier for a simple field access. It uses only the
- * field proxy (not a string to look it up), and the bean proxy that is the receiver. Also it can be called only when the next
- * expression must be a RootExpression. It doesn't allow complicated field access, such as <code>fielda.fieldb.fieldc</code>.
- * Since this is a field access, it will always return an ExpressionProxy. It doesn't make sense to have a simple field access
- * that doesn't return one.
- *
- * @param field field proxy of the field.
- * @param receiver the receiver proxy. It may be <code>null</code> for static fields.
- * @return expression proxy to the result of the access.
- * @throws IllegalStateException
- * @throws IllegalArgumentException
- *
- * @since 1.1.0
- */
- public ExpressionProxy createSimpleFieldAccess(IProxyField field, IProxy receiver) throws IllegalStateException, IllegalArgumentException;
-
- /**
- * A simple field set. This is a helper to make it easier for a simple field access. It uses only the
- * field proxy (not a string to look it up), and the bean proxy that is the receiver. Also it can be called only when the next
- * expression must be a RootExpression. It doesn't allow complicated field access setting, such as <code>fielda.fieldb.fieldc = 3</code>.
- *
- * @param field field proxy of the field.
- * @param receiver the receiver proxy. It may be <code>null</code> if this is a static field.
- * @param value the value proxy to set it to or <code>null</code> if set to null value.
- * @param wantResult <code>true</code> if you want an ExpressionProxy back, otherwise it will return <code>null</code>. For performance reasons, only use <code>true</code> if you really need the expression proxy.
- * @return expression proxy if "wantResult" was true, else <code>null</code>.
- * @throws IllegalStateException
- * @throws IllegalArgumentException
- *
- * @since 1.1.0
- */
- public ExpressionProxy createSimpleFieldSet(IProxyField field, IProxy receiver, IProxy value, boolean wantResult) throws IllegalStateException, IllegalArgumentException;
-
- /**
- * Begin a block. No need for a forExpression because it must currently be at ROOTEXPRESSION.
- * <p>
- * Eventually {@link Expression#createBlockEnd()} must be called. You should use this pattern:
- * <pre><code>
- * exp.createBeginBlock();
- * try {
- * exp.create something else.
- * ...
- * } finally {
- * exp.createEndBlock();
- * }
- * </code></pre>
- *
- * @return blocknumber for the block just opened. Can be used in {@link Expression#createBlockBreak(int)}.
- * @throws IllegalStateException
- *
- * @since 1.1.0
- */
- public int createBlockBegin() throws IllegalStateException;
-
- /**
- * Does a break for the specified block number. No need for a forExpression because it must currently be at ROOTEXPRESSION.
- * @param blockNumber
- * @throws IllegalStateException
- *
- * @since 1.1.0
- */
- public void createBlockBreak(int blockNumber) throws IllegalStateException;
-
- /**
- * End a block. It will always end the inner most block that currently is on the stack. No need for a forExpression because it must currently be at ROOTEXPRESSION.
- * @throws IllegalStateException
- *
- * @see Expression#createBlockBegin()
- * @since 1.1.0
- */
- public void createBlockEnd() throws IllegalStateException;
-
- /**
- * Create a try/catch statement. No need for a forExpression because it must currently be at ROOTEXPRESSION.
- * There must be at least one catch or finally clause before try end or this is invalid.
- * <p>
- * This should be executed in the following way:
- * <pre><code>
- * exp.createTry();
- * try {
- * ... create other exceptions ...
- * ... create catch/finally clauses as needed.
- * } finally {
- * if (exp.isValid())
- * exp.createTryEnd();
- * }
- * </code></pre>
- * @throws IllegalStateException
- *
- * @since 1.1.0
- */
- public void createTry() throws IllegalStateException;
-
-
- /**
- * Create a catch clause for the inner most try statement. No need for a forExpression because it must currently be at ROOTEXPRESSION.
- * <p>
- * Using this you can get just the exception as a proxy and/or execute some expressions as part of the catch clause.
- * <p>
- * This can be followed by RootExpressions, or another catch, or a finally, or a try end.
- *
- * @param exceptionType the type of the exception to catch on.
- * @param wantExceptionReturned <code>true</code> if you want an expression proxy for the exception.
- * @return the ExpressionProxy for the exception if <code>wantExceptionReturned</code> is <code>true</code>, <code>null</code> otherwise.
- *
- * @throws IllegalStateException
- * @throws IllegalArgumentException
- * @since 1.1.0
- */
- public ExpressionProxy createTryCatchClause(IProxyBeanType exceptionType, boolean wantExceptionReturned) throws IllegalStateException, IllegalArgumentException;
-
- /**
- * Create a catch clause for the inner most try statement. No need for a forExpression because it must currently be at ROOTEXPRESSION.
- * <p>
- * Using this you can get just the exception as a proxy and/or execute some expressions as part of the catch clause.
- * <p>
- * This can be followed by RootExpressions, or another catch, or a finally, or a try end.
- *
- * @param exceptionType the type of the exception to catch on.
- * @param wantExceptionReturned <code>true</code> if you want an expression proxy for the exception.
- * @return the ExpressionProxy for the exception if <code>wantExceptionReturned</code> is <code>true</code>, <code>null</code> otherwise.
- *
- * @throws IllegalStateException
- * @since 1.1.0
- */
- public ExpressionProxy createTryCatchClause(String exceptionType, boolean wantExceptionReturned) throws IllegalStateException;;
-
- /**
- * Create a finally clause for the inner most try statement. No need for a forExpression because it must currently be at ROOTEXPRESSION.
- * There must be no more catch clauses for the try statement after this finally clause.
- *
- * @throws IllegalStateException
- * @since 1.1.0
- */
- public void createTryFinallyClause() throws IllegalStateException;;
-
- /**
- * Create the end of the inner most try statement. No need for a forExpression because it must currently be at ROOTEXPRESSION.
- * There must be no more catch/finally clauses after this except if a new try statement is started.
- *
- * @throws IllegalStateException
- * @since 1.1.0
- */
- public void createTryEnd() throws IllegalStateException;;
-
- /**
- * Create a throw. No need for a forExpression because it must currently be at ROOTEXPRESSION.
- * The next expression is the exception to be thrown.
- * <p>
- * This must be followed by createExpression for:
- * <code>THROW_OPERAND</code>
- *
- * @throws IllegalStateException
- *
- * @since 1.1.0
- */
- public void createThrow() throws IllegalStateException;
-
- /**
- * Create a rethrow. This must be within a catch clause or there is an error.
- * <p>
- * This is a shortcut for:
- * <pre><code>
- * try {
- * .. do something ..
- * } catch (AnException e) {
- * .. do something ..
- * throw e;
- * }
- * </code></pre>
- * @throws IllegalStateException
- *
- * @since 1.1.0
- */
- public void createRethrow() throws IllegalStateException;
-
-
- /**
- * Mark the expression stack so that if there are IllegalStateExceptions errors that would make the
- * expression invalid, you can restore back to this mark point and the expression will now be valid
- * again and at the state it was when mark was created. All marks must be ended, and at the same nesting
- * level.
- * <p>
- * No need for a forExpression because it must currently be at ROOTEXPRESSION.
- * <p>
- * It must be used in conjunction with endMark. You must use <code>mark;try/finally{endMark;}</code> because
- * the mark/endMark must match up.
- * <pre><code>
- * int mark = expression.mark();
- * try {
- * expression.create ...
- * } catch (IllegalStateException e) {
- * process the error.
- * } finally {
- * expression.endMark(mark); // After this, the expression will be valid again.
- * }
- * </code></pre>
- * <p>
- * However, the following code would be invalid nesting, and will throw an IllegalStateException on the createTryEnd. This is because
- * we tried to end the Try statement within the mark. This is invalid because if we let it go through it would
- * of popped the stack and when we got to the endMark the stack would of been popped past it and it could not
- * be restored to the same state as it was at the time of the mark. The try would of already been ended.
- * <pre><code>
- * expression.createTry();
- * int mark = expression.mark();
- * try {
- * expression.create ...
- * expression.createTryEnd();
- * } catch (IllegalStateException e) {
- * process the error. The expression is now invalid.
- * } finally {
- * expression.endMark(mark); // After this, the expression will be valid again, if it had gone invalid.
- * }
- * </code></pre>
- * <p>
- * If not at RootExpression at time of mark() request, an IllegalStateException will be thrown.
- * @return mark number, this number will be used in the cooresponding endMark.
- * @throws IllegalStateException
- *
- * @see IExpression#endMark(int)
- * @since 1.1.0
- */
- public int mark() throws IllegalStateException;
-
- /**
- * The end mark for a mark.
- * <p>
- * No need for a forExpression because it must currently be at ROOTEXPRESSION.
- * @param markNumber
- * @throws IllegalStateException
- *
- * @see IExpression#mark()
- * @since 1.1.0
- */
- public void endMark(int markNumber) throws IllegalStateException;
-}
diff --git a/plugins/org.eclipse.jem.proxy/proxy/org/eclipse/jem/internal/proxy/core/IExtensionRegistration.java b/plugins/org.eclipse.jem.proxy/proxy/org/eclipse/jem/internal/proxy/core/IExtensionRegistration.java
deleted file mode 100644
index f3ebe38..0000000
--- a/plugins/org.eclipse.jem.proxy/proxy/org/eclipse/jem/internal/proxy/core/IExtensionRegistration.java
+++ /dev/null
@@ -1,42 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2005 IBM Corporation and others.
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
- *
- * Contributors:
- * IBM Corporation - initial API and implementation
- *******************************************************************************/
-/*
-
-
- */
-package org.eclipse.jem.internal.proxy.core;
-
-
-/**
- * Extensions point ("extensions" elements of the "org.eclipse.jem.proxy.contributors" extension point).
- * <p>
- * Implementers of this interface are called when the appropriate registry type for a given classPath/plugin is present.
- * It is used to register the registry type specific extensions.
- * @since 1.1.0
- */
-public interface IExtensionRegistration {
-
- /**
- * This will be called before any contributeToRegistry's have been called. Typically all that
- * should be done in here is to register extension factories or constants. It is best if no
- * actual proxy calls are made. This is because the registry does not yet have all of the
- * appropriate extensions registered and it would be possible to accidently reference a bean type
- * that has not yet had its appropriate factory registered.
- * <p>
- * <b>Note:</b> This may be called more than once if used in more than one extension or if used in a plugin and a container path and both are found.
- * Should take this into account and not register twice.
- * @param baseRegistry
- *
- * @since 1.1.0
- */
- public void register(BaseProxyFactoryRegistry baseRegistry);
-
-}
diff --git a/plugins/org.eclipse.jem.proxy/proxy/org/eclipse/jem/internal/proxy/core/IFieldProxy.java b/plugins/org.eclipse.jem.proxy/proxy/org/eclipse/jem/internal/proxy/core/IFieldProxy.java
deleted file mode 100644
index b79db1b..0000000
--- a/plugins/org.eclipse.jem.proxy/proxy/org/eclipse/jem/internal/proxy/core/IFieldProxy.java
+++ /dev/null
@@ -1,45 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2001, 2005 IBM Corporation and others.
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
- *
- * Contributors:
- * IBM Corporation - initial API and implementation
- *******************************************************************************/
-package org.eclipse.jem.internal.proxy.core;
-/*
-
-
- */
-
-
-/**
- * A Proxy to a field that allows the field value to be retrieved and set
- * This allows target VM proxying of the field and is analagous to the java.lang.Reflect.Field
- * in the same way IMethodProxy is analagous to java.lang.Reflect.Method
- * Creation date: (1/17/00 12:17:52 PM)
- * @author: Joe Winchester
- */
-public interface IFieldProxy extends IAccessibleObjectProxy, IProxyField {
-/**
- * Return the type of the field.
- */
-IBeanTypeProxy getFieldType();
-
-/**
- * Return the value of us on the subject argument.
- * If the field is a primitive type, the return proxy
- * will be of the primitive type too.
- * Creation date: (1/17/00 12:28:48 PM)
- */
-IBeanProxy get(IBeanProxy aSubject) throws ThrowableProxy;
-
-/**
- * Set the argument as the field value on the subject
- * Creation date: (1/17/00 12:28:48 PM)
- */
-void set(IBeanProxy aSubject, IBeanProxy argument) throws ThrowableProxy;
-
-}
diff --git a/plugins/org.eclipse.jem.proxy/proxy/org/eclipse/jem/internal/proxy/core/IIntegerBeanProxy.java b/plugins/org.eclipse.jem.proxy/proxy/org/eclipse/jem/internal/proxy/core/IIntegerBeanProxy.java
deleted file mode 100644
index a8dd2b4..0000000
--- a/plugins/org.eclipse.jem.proxy/proxy/org/eclipse/jem/internal/proxy/core/IIntegerBeanProxy.java
+++ /dev/null
@@ -1,29 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2001, 2005 IBM Corporation and others.
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
- *
- * Contributors:
- * IBM Corporation - initial API and implementation
- *******************************************************************************/
-package org.eclipse.jem.internal.proxy.core;
-/*
-
-
- */
-
-
-/**
- * Interface to an integer bean proxy.
- * We originally had only an Integer proxy,
- * so the use of it was throughout the system.
- * We are now supporting Number instead, but
- * because there were so many places using int,
- * we've left it in.
- * Creation date: (2/6/00 8:52:42 AM)
- * @author: Joe Winchester
- */
-public interface IIntegerBeanProxy extends INumberBeanProxy {
-}
diff --git a/plugins/org.eclipse.jem.proxy/proxy/org/eclipse/jem/internal/proxy/core/IInvokable.java b/plugins/org.eclipse.jem.proxy/proxy/org/eclipse/jem/internal/proxy/core/IInvokable.java
deleted file mode 100644
index c551675..0000000
--- a/plugins/org.eclipse.jem.proxy/proxy/org/eclipse/jem/internal/proxy/core/IInvokable.java
+++ /dev/null
@@ -1,83 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2004, 2005 IBM Corporation and others.
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
- *
- * Contributors:
- * IBM Corporation - initial API and implementation
- *******************************************************************************/
-/*
-
-
- */
-package org.eclipse.jem.internal.proxy.core;
-
-
-/**
- * Interface for invoking method calls on the vm.
- * IMethodProxy implements it for when you have a method proxy available,
- * but you can also get a straight invokable which will get the
- * proxy on the vm at the time of execution.
- * <p>
- * The method proxy factory can be used to return either method
- * proxies when the invokable will be used over and over, and
- * it can return IInvokable's when it is one shot deal. Though even
- * when one-shot deal it can be used over and over. There is just overhead because the
- * method is looked up each time. So a reasonable compromise would be if
- * using it infrequently or use closely together once or twice it is better
- * to use a Invokable instead of a method proxy.
- * @since 1.0.0
- */
-public interface IInvokable {
-
- /**
- * Invoke us on the subject
- * Creation date: (12/3/99 11:37:12 AM)
- * @author Joe Winchester
- */
- IBeanProxy invoke(IBeanProxy subject) throws ThrowableProxy;
-
- /**
- * Invoke us on the subject with the specified argument
- * Creation date: (12/3/99 11:37:12 AM)
- * @author Joe Winchester
- */
- IBeanProxy invoke(IBeanProxy subject, IBeanProxy argument) throws ThrowableProxy;
-
- /**
- * Invoke us on the subject with the specified arguments
- * Creation date: (12/3/99 11:37:12 AM)
- * @author Joe Winchester
- */
- IBeanProxy invoke(IBeanProxy subject, IBeanProxy[] arguments) throws ThrowableProxy;
-
- /**
- * Invoke us on the subject, however catch all exceptions
- * Only to be used when you don't want ThrowableExceptions. This should
- * not be the normal way to invoke.
- * Creation date: (12/3/99 11:37:12 AM)
- * @author Joe Winchester
- */
- IBeanProxy invokeCatchThrowableExceptions(IBeanProxy subject);
-
- /**
- * Invoke us on the subject with the specified argument, however catch all exceptions
- * Only to be used when you don't want ThrowableExceptions. This should
- * not be the normal way to invoke.
- * Creation date: (12/3/99 11:37:12 AM)
- * @author Joe Winchester
- */
- IBeanProxy invokeCatchThrowableExceptions(IBeanProxy subject, IBeanProxy argument);
-
- /**
- * Invoke us on the subject with the specified arguments, however catch all exceptions
- * Only to be used when you don't want ThrowableExceptions. This should
- * not be the normal way to invoke.
- * Creation date: (12/3/99 11:37:12 AM)
- * @author Joe Winchester
- */
- IBeanProxy invokeCatchThrowableExceptions(IBeanProxy subject, IBeanProxy[] arguments);
-
-}
diff --git a/plugins/org.eclipse.jem.proxy/proxy/org/eclipse/jem/internal/proxy/core/IMethodProxy.java b/plugins/org.eclipse.jem.proxy/proxy/org/eclipse/jem/internal/proxy/core/IMethodProxy.java
deleted file mode 100644
index e04442c..0000000
--- a/plugins/org.eclipse.jem.proxy/proxy/org/eclipse/jem/internal/proxy/core/IMethodProxy.java
+++ /dev/null
@@ -1,52 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2001, 2005 IBM Corporation and others.
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
- *
- * Contributors:
- * IBM Corporation - initial API and implementation
- *******************************************************************************/
-/*
-
-
- */
-package org.eclipse.jem.internal.proxy.core;
-
-/**
- * Interface for Method Proxies Creation date: (12/3/99 11:36:29 AM)
- *
- * @author: Joe Winchester
- */
-public interface IMethodProxy extends IAccessibleObjectProxy, IInvokable, IProxyMethod {
-
- /**
- * Answer the class the method is defined in. Creation date: (12/3/99 11:37:12 AM)
- *
- * @author Joe Winchester
- */
- IBeanTypeProxy getClassType();
-
- /**
- * Answer the name of the method Creation date: (12/3/99 11:37:12 AM)
- *
- * @author Joe Winchester
- */
- String getName();
-
- /**
- * Answer the parameter types of the method Creation date: (12/3/99 11:37:12 AM)
- *
- * @author Joe Winchester
- */
- IBeanTypeProxy[] getParameterTypes();
-
- /**
- * Answer the return type of the method Creation date: (12/3/99 11:37:12 AM)
- *
- * @author Joe Winchester
- */
- IBeanTypeProxy getReturnType();
-
-}
diff --git a/plugins/org.eclipse.jem.proxy/proxy/org/eclipse/jem/internal/proxy/core/IMethodProxyFactory.java b/plugins/org.eclipse.jem.proxy/proxy/org/eclipse/jem/internal/proxy/core/IMethodProxyFactory.java
deleted file mode 100644
index 216cdcc..0000000
--- a/plugins/org.eclipse.jem.proxy/proxy/org/eclipse/jem/internal/proxy/core/IMethodProxyFactory.java
+++ /dev/null
@@ -1,83 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2001, 2005 IBM Corporation and others.
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
- *
- * Contributors:
- * IBM Corporation - initial API and implementation
- *******************************************************************************/
-/*
-
-
- */
-package org.eclipse.jem.internal.proxy.core;
-
-/**
- * Factory for creating method proxies.
- *
- * The factory exists for use, but generally it is better to go through the bean type proxy to get a method proxy. This is useful for setting up a
- * bunch of method proxies in initialization routines so you don't need to have a bean type proxy for each.
- *
- * Creation date: (12/3/99 6:21:52 PM)
- *
- * @author: Joe Winchester
- */
-public interface IMethodProxyFactory extends IBeanProxyFactory {
-
- /**
- * Return a method proxy for the specified name, arguments from the class.
- *
- * @param className
- * @param methodName
- * @param parameterTypes
- * parameter type names or <code>null</code> for parameterTypes means no parameters.
- * @return a method proxy or null if can't be found.
- * @since 1.0.0
- */
- IMethodProxy getMethodProxy(String className, String methodName, String[] parameterTypes);
-
- /**
- * Return an IProxyMethod for the specified name, arguments from the given class.
- * @param expression
- * @param className
- * @param methodName
- * @param parameterTypes
- * @return
- *
- * @since 1.1.0
- */
- IProxyMethod getMethodProxy(IExpression expression, String className, String methodName, String[] parameterTypes);
-
- /**
- * Return an IProxyField for the specified name, arguments from the given class.
- * @param expression
- * @param className
- * @param fieldName
- * @return
- *
- * @since 1.1.0
- */
- IProxyField getFieldProxy(IExpression expression, String className, String fieldName);
-
-
- /**
- * Return an invokable for the specified name, arguments from the class. The method proxy is not retrieved. Instead the method will be looked up
- * each time on the vm. Because of this these are suitable only for one-shot invokations. If it is to be invoked often, then a method proxy should
- * be retrieved instead.
- * <p>
- * Though typical for one-shot deal the invokable can be used over and over. There is just overhead because the method is looked up each time. So a reasonable compromise
- * would be if using it infrequently or is used closely together once or twice it is better to use a Invokable instead of a method proxy.
- * <p>
- * Note there is no guarantee that the method is available. This won't be known until the actual invoke is done.
- *
- * @param className
- * @param methodName
- * @param parameterTypes
- * parameter type names or <code>null</code> for parameterTypes means no parameters.
- * @return an invokable
- * @since 1.0.0
- */
- IInvokable getInvokable(String className, String methodName, String[] parameterTypes);
-}
diff --git a/plugins/org.eclipse.jem.proxy/proxy/org/eclipse/jem/internal/proxy/core/INumberBeanProxy.java b/plugins/org.eclipse.jem.proxy/proxy/org/eclipse/jem/internal/proxy/core/INumberBeanProxy.java
deleted file mode 100644
index efe7a42..0000000
--- a/plugins/org.eclipse.jem.proxy/proxy/org/eclipse/jem/internal/proxy/core/INumberBeanProxy.java
+++ /dev/null
@@ -1,59 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2001, 2005 IBM Corporation and others.
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
- *
- * Contributors:
- * IBM Corporation - initial API and implementation
- *******************************************************************************/
-package org.eclipse.jem.internal.proxy.core;
-/*
-
-
- */
-
-
-/**
- * Interface to an integer bean proxy.
- * Creation date: (2/6/00 8:52:42 AM)
- * @author: Joe Winchester
- */
-public interface INumberBeanProxy extends IBeanProxy {
-/**
- * Return the primitive byte value of the proxied Number
- * Creation date: (2/6/00 8:52:59 AM)
- */
-byte byteValue();
-/**
- * Return the primitive double value of the proxied Number
- * Creation date: (2/6/00 8:52:59 AM)
- */
-double doubleValue();
-/**
- * Return the primitive float value of the proxied Number
- * Creation date: (2/6/00 8:52:59 AM)
- */
-float floatValue();
-/**
- * Return the primitive int value of the proxied Number
- * Creation date: (2/6/00 8:52:59 AM)
- */
-int intValue();
-/**
- * Return the primitive long value of the proxied Number
- * Creation date: (2/6/00 8:52:59 AM)
- */
-long longValue();
-/**
- * Return the value as a Number.
- * Creation date: (2/6/00 8:52:59 AM)
- */
-Number numberValue();
-/**
- * Return the primitive short value of the proxied Number
- * Creation date: (2/6/00 8:52:59 AM)
- */
-short shortValue();
-}
diff --git a/plugins/org.eclipse.jem.proxy/proxy/org/eclipse/jem/internal/proxy/core/IPDEContributeClasspath.java b/plugins/org.eclipse.jem.proxy/proxy/org/eclipse/jem/internal/proxy/core/IPDEContributeClasspath.java
deleted file mode 100644
index 6c16870..0000000
--- a/plugins/org.eclipse.jem.proxy/proxy/org/eclipse/jem/internal/proxy/core/IPDEContributeClasspath.java
+++ /dev/null
@@ -1,49 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2004, 2005 IBM Corporation and others.
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
- *
- * Contributors:
- * IBM Corporation - initial API and implementation
- *******************************************************************************/
-/*
-
-
- */
-package org.eclipse.jem.internal.proxy.core;
-
-import org.eclipse.core.runtime.CoreException;
-
-
-/**
- * Contribute to classpath PDE entries that are needed for a launch.
- * <p>
- * Use the <code>INSTANCE()</code> to access the contributor. If the value
- * is <code>null</code>, then PDE is not available.
- *
- * @since 1.0.2
- */
-public interface IPDEContributeClasspath {
-
- public static IPDEContributeClasspath INSTANCE = PDEContributeClasspathInstance.getInstance();
-
- /**
- * Return the classpath contributions for the plugins in the given project.
- * <p>
- * This will add in the libraries from any fragments of any plugin that this
- * project references, either directly or indirectly through other plugins.
- * <p>
- * It is used by launches to get the fragment libraries since these are not
- * added by default to the classpath for a project by PDE. That is because they
- * aren't needed for compilation purposes, but they are needed for running.
- *
- * @param controller the controller to contribute to.
- * @param info configuration info for the project
- * @throws CoreException
- *
- * @since 1.0.2
- */
- public abstract void getPDEContributions(IConfigurationContributionController controller, IConfigurationContributionInfo info) throws CoreException;
-}
diff --git a/plugins/org.eclipse.jem.proxy/proxy/org/eclipse/jem/internal/proxy/core/IPointBeanProxy.java b/plugins/org.eclipse.jem.proxy/proxy/org/eclipse/jem/internal/proxy/core/IPointBeanProxy.java
deleted file mode 100644
index a41a51a..0000000
--- a/plugins/org.eclipse.jem.proxy/proxy/org/eclipse/jem/internal/proxy/core/IPointBeanProxy.java
+++ /dev/null
@@ -1,33 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2001, 2005 IBM Corporation and others.
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
- *
- * Contributors:
- * IBM Corporation - initial API and implementation
- *******************************************************************************/
-package org.eclipse.jem.internal.proxy.core;
-/*
-
-
- */
-
-
-/**
- * Interface to a Point bean proxy.
- * <p>
- * These are common for different windowing systems, e.g. AWT and SWT. So this here
- * is common interface for them.
- * Creation date: (4/7/00 3:46:39 PM)
- * @author: Administrator
- */
-public interface IPointBeanProxy extends IBeanProxy {
- public int getX();
- public int getY();
- public void setX(int x);
- public void setY(int y);
- public void setLocation(int x, int y);
- public void setLocation(IPointBeanProxy point);
-}
diff --git a/plugins/org.eclipse.jem.proxy/proxy/org/eclipse/jem/internal/proxy/core/IProxy.java b/plugins/org.eclipse.jem.proxy/proxy/org/eclipse/jem/internal/proxy/core/IProxy.java
deleted file mode 100644
index dfaf838..0000000
--- a/plugins/org.eclipse.jem.proxy/proxy/org/eclipse/jem/internal/proxy/core/IProxy.java
+++ /dev/null
@@ -1,48 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2005 IBM Corporation and others.
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
- *
- * Contributors:
- * IBM Corporation - initial API and implementation
- *******************************************************************************/
-/*
-
-
- */
-package org.eclipse.jem.internal.proxy.core;
-
-
-/**
- * A common interface for proxies. It is used by the expression processor to easily distinquish between
- * a proxy and an Expression proxy.
- * @since 1.1.0
- */
-public interface IProxy {
-
- /**
- * Return the registry this proxy was created with.
- * @return
- *
- * @since 1.1.0
- */
- public ProxyFactoryRegistry getProxyFactoryRegistry();
-
- /**
- * Is this a bean proxy (including all of the subinterfaces of it, like IMethodProxy).
- * @return <code>true</code> if this is a bean proxy.
- *
- * @since 1.1.0
- */
- public boolean isBeanProxy();
-
- /**
- * Is this an expression proxy.
- * @return <code>true</code> if this is an expression proxy.
- *
- * @since 1.1.0
- */
- public boolean isExpressionProxy();
-}
diff --git a/plugins/org.eclipse.jem.proxy/proxy/org/eclipse/jem/internal/proxy/core/IProxyBeanType.java b/plugins/org.eclipse.jem.proxy/proxy/org/eclipse/jem/internal/proxy/core/IProxyBeanType.java
deleted file mode 100644
index 59635a7..0000000
--- a/plugins/org.eclipse.jem.proxy/proxy/org/eclipse/jem/internal/proxy/core/IProxyBeanType.java
+++ /dev/null
@@ -1,85 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2005 IBM Corporation and others.
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
- *
- * Contributors:
- * IBM Corporation - initial API and implementation
- *******************************************************************************/
-/*
-
-
- */
-package org.eclipse.jem.internal.proxy.core;
-
-
-/**
- * This interface is for IBeanTypeProxy's and BeanTypeExpressionProxy's so that we can lazily
- * get the beantype proxy and have the expression process it when needed.
- *
- * @since 1.1.0
- */
-public interface IProxyBeanType extends IProxy {
-
- /**
- * Answer the name of the type we are proxying This is the fully qualified name. For arrays it will return the format: [Lclassname;
- * @return
- *
- * @since 1.1.0
- */
- public String getTypeName();
-
- /**
- * Get the IProxyMethod for the method from this beantype. It may be either a resolved method proxy (if already resolved) or
- * it may be an ExpressionProxy if not yet resolved.
- *
- * @param expression
- * @param methodName
- * @param parameterTypes array of parameter types or <code>null</code> if no parameters.
- * @return
- *
- * @since 1.1.0
- */
- public IProxyMethod getMethodProxy(IExpression expression, String methodName, IProxyBeanType[] parameterTypes);
-
- /**
- * Get the IProxyMethod for the method from this beantype where the method has no arguments. It may be either a resolved method proxy (if already resolved) or
- * it may be an ExpressionProxy if not yet resolved.
- * <p>
- * This is a shortcut for getMethodProxy() that takes arguments names where the names have been sent as null.
- *
- * @param expression
- * @param methodName
- * @return
- *
- * @since 1.1.0
- */
- public IProxyMethod getMethodProxy(IExpression expression, String methodName);
-
- /**
- * Get the IProxyMethod for the method from this beantype. It may be either a resolved method proxy (if already resolved) or
- * it may be an ExpressionProxy if not yet resolved.
- *
- * @param expression
- * @param methodName
- * @param parameterTypes array of parameter types or <code>null</code> if no parameters.
- * @return
- *
- * @since 1.1.0
- */
- public IProxyMethod getMethodProxy(IExpression expression, String methodName, String[] parameterTypes);
-
- /**
- * Get the IProxyyField for the field from this beantype. It may be either a resolved field proxy (if already resolved) or
- * it may be an ExpressionProxy if not yet resolved.
- *
- * @param expression
- * @param fieldName
- * @return
- *
- * @since 1.1.0
- */
- public IProxyField getFieldProxy(IExpression expression, String fieldName);
-}
diff --git a/plugins/org.eclipse.jem.proxy/proxy/org/eclipse/jem/internal/proxy/core/IProxyConstants.java b/plugins/org.eclipse.jem.proxy/proxy/org/eclipse/jem/internal/proxy/core/IProxyConstants.java
deleted file mode 100644
index 0d819f3..0000000
--- a/plugins/org.eclipse.jem.proxy/proxy/org/eclipse/jem/internal/proxy/core/IProxyConstants.java
+++ /dev/null
@@ -1,69 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2004, 2005 IBM Corporation and others.
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
- *
- * Contributors:
- * IBM Corporation - initial API and implementation
- *******************************************************************************/
-/*
-
-
- */
-package org.eclipse.jem.internal.proxy.core;
-
-/**
- * Constants used with the plugin xml.
- *
- * @since 1.0.0
- */
-public interface IProxyConstants {
-
- /**
- * Launch group id for proxy launch configurations.
- */
- public static final String ID_PROXY_LAUNCH_GROUP = "org.eclipse.jem.proxy"; //$NON-NLS-1$
-
- /**
- * Launch configuration type for local proxy. It is local in that it is on the same machine, but a different
- * VM then the one running the IDE.
- *
- * It here because this is the default config type when no launch config specified for a project.
- */
- public static final String LOCAL_LAUNCH_TYPE = "org.eclipse.jem.proxy.LocalProxyLaunchConfigurationType"; //$NON-NLS-1$
-
- /**
- * Attribute on Proxy Launch Configuration:
- *
- * Key used in Launch Configuration for attaching AWT/Swing to the registry. This means simply
- * that AWT/Swing should be treated as being in the registry or not. It doesn't actually prevent
- * them from being there.
- *
- * The default value for this attribute is "true", so it should be set only to "false".
- */
- public static final String ATTRIBUTE_AWT_SWING = "org.eclipse.jem.proxy.AWT/Swing"; //$NON-NLS-1$
-
- /**
- * Attribute on Proxy Launch Configuration:
- *
- * Key used in Launch Configuration for the contributors and returning the registry. After retrieving key,
- * go back to ProxyLaunchSupport to retrieve the contributors. And it uses it to return the registry.
- *
- * Not to be set by contributors. This will be set only by the ProxyLaunchSupport start implementation methods.
- * It is here only because external developer's launch configurations will need to be able to access this.
- */
- public static final String ATTRIBUTE_LAUNCH_KEY = "org.eclipse.jem.proxy.LaunchKey"; //$NON-NLS-1$
-
- /**
- * Attribute on Proxy Launch Configuration:
- *
- * VM title used for the launch registry.
- *
- * Not to be set by contributors. This will be set only by the ProxyLaunchSupport start implementation methods.
- * It is here only because external developer's launch configurations will need to be able to access this.
- */
- public static final String ATTRIBUTE_VM_TITLE = "org.eclipse.jem.proxy.vmtitle"; //$NON-NLS-1$
-
-}
diff --git a/plugins/org.eclipse.jem.proxy/proxy/org/eclipse/jem/internal/proxy/core/IProxyField.java b/plugins/org.eclipse.jem.proxy/proxy/org/eclipse/jem/internal/proxy/core/IProxyField.java
deleted file mode 100644
index 1f2e1da..0000000
--- a/plugins/org.eclipse.jem.proxy/proxy/org/eclipse/jem/internal/proxy/core/IProxyField.java
+++ /dev/null
@@ -1,25 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2005 IBM Corporation and others.
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
- *
- * Contributors:
- * IBM Corporation - initial API and implementation
- *******************************************************************************/
-/*
-
-
- */
-package org.eclipse.jem.internal.proxy.core;
-
-
-/**
- * This interface is for IFieldProxy's and FieldExpressionProxy's so that we can lazily
- * get the field proxy and have the expression process it when needed.
- * @since 1.1.0
- */
-public interface IProxyField extends IProxy {
-
-}
diff --git a/plugins/org.eclipse.jem.proxy/proxy/org/eclipse/jem/internal/proxy/core/IProxyMethod.java b/plugins/org.eclipse.jem.proxy/proxy/org/eclipse/jem/internal/proxy/core/IProxyMethod.java
deleted file mode 100644
index f260a23..0000000
--- a/plugins/org.eclipse.jem.proxy/proxy/org/eclipse/jem/internal/proxy/core/IProxyMethod.java
+++ /dev/null
@@ -1,26 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2005 IBM Corporation and others.
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
- *
- * Contributors:
- * IBM Corporation - initial API and implementation
- *******************************************************************************/
-/*
-
-
- */
-package org.eclipse.jem.internal.proxy.core;
-
-
-/**
- * This interface is for IMethodProxy's and MethodExpressionProxy's so that we can lazily
- * get the method proxy and have the expression process it when needed.
- *
- * @since 1.1.0
- */
-public interface IProxyMethod extends IProxy {
-
-}
diff --git a/plugins/org.eclipse.jem.proxy/proxy/org/eclipse/jem/internal/proxy/core/IRectangleBeanProxy.java b/plugins/org.eclipse.jem.proxy/proxy/org/eclipse/jem/internal/proxy/core/IRectangleBeanProxy.java
deleted file mode 100644
index f38660d..0000000
--- a/plugins/org.eclipse.jem.proxy/proxy/org/eclipse/jem/internal/proxy/core/IRectangleBeanProxy.java
+++ /dev/null
@@ -1,43 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2001, 2005 IBM Corporation and others.
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
- *
- * Contributors:
- * IBM Corporation - initial API and implementation
- *******************************************************************************/
-package org.eclipse.jem.internal.proxy.core;
-/*
-
-
- */
-
-
-/**
- * Interface to a Rectangle bean proxy.
- * <p>
- * These are common for different windowing systems, e.g. AWT and SWT. So this here
- * is common interface for them.
- * Creation date: (4/7/00 3:46:39 PM)
- * @author: Administrator
- */
-public interface IRectangleBeanProxy extends IBeanProxy {
- public int getX();
- public int getY();
- public void setX(int x);
- public void setY(int y);
- public void setLocation(int x, int y);
- public void setLocation(IPointBeanProxy point);
-
- public int getHeight();
- public int getWidth();
- public void setHeight(int height);
- public void setWidth(int width);
- public void setSize(int width, int height);
- public void setSize(IDimensionBeanProxy dim);
-
- public void setBounds(int x, int y, int width, int height);
- public void setBounds(IRectangleBeanProxy rect);
-}
diff --git a/plugins/org.eclipse.jem.proxy/proxy/org/eclipse/jem/internal/proxy/core/IStandardBeanProxyFactory.java b/plugins/org.eclipse.jem.proxy/proxy/org/eclipse/jem/internal/proxy/core/IStandardBeanProxyFactory.java
deleted file mode 100644
index 4353e52..0000000
--- a/plugins/org.eclipse.jem.proxy/proxy/org/eclipse/jem/internal/proxy/core/IStandardBeanProxyFactory.java
+++ /dev/null
@@ -1,202 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2001, 2005 IBM Corporation and others.
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
- *
- * Contributors:
- * IBM Corporation - initial API and implementation
- *******************************************************************************/
-package org.eclipse.jem.internal.proxy.core;
-
-
-/*
-
-
- */
-
-
-/**
- * The Standard base bean proxy factory.
- * This is the Interface that the desktop will talk
- * to.
- * Creation date: (12/3/99 11:52:09 AM)
- * @author: Joe Winchester
- */
-public interface IStandardBeanProxyFactory extends IBeanProxyFactory {
-
-/**
- * Get the {@link org.eclipse.jem.internal.proxy.common.IVMServer} proxy for the
- * this registry. This is only needed if you need to give the IVMserver to a proxy so that
- * it can access it.
- * <p>
- * <b>Note:</b> Does not need to be given to callback proxies because they are given
- * an {@link org.eclipse.jem.internal.proxy.common.IVMCallbackServer} on initialization, and
- * that interface implements the IVMServer interface too.
- *
- * @return
- *
- * @since 1.1.0
- */
-public IBeanProxy getIVMServerProxy();
-/**
- * Return a new bean proxy for the primitive integer argument
- * Creation date: (12/3/99 11:52:20 AM)
- * @author Joe Winchester
- */
-public IIntegerBeanProxy createBeanProxyWith(int aPrimitiveInteger);
-/**
- * Return a new bean proxy for the primitive character argument
- * Creation date: (12/3/99 11:52:20 AM)
- * @author Joe Winchester
- */
-public ICharacterBeanProxy createBeanProxyWith(char aPrimitiveCharacter);
-/**
- * Return a new bean proxy for the primitive byte argument
- * Creation date: (12/3/99 11:52:20 AM)
- * @author Joe Winchester
- */
-public INumberBeanProxy createBeanProxyWith(byte aPrimitiveByte);
-/**
- * Return a new bean proxy for the primitive short argument
- * Creation date: (12/3/99 11:52:20 AM)
- * @author Joe Winchester
- */
-public INumberBeanProxy createBeanProxyWith(short aPrimitiveShort);
-/**
- * Return a new bean proxy for the primitive long argument
- * Creation date: (12/3/99 11:52:20 AM)
- * @author Joe Winchester
- */
-public INumberBeanProxy createBeanProxyWith(long aPrimitiveLong);
-/**
- * Return a new bean proxy for the primitive float argument
- * Creation date: (12/3/99 11:52:20 AM)
- * @author Joe Winchester
- */
-public INumberBeanProxy createBeanProxyWith(float aPrimitiveFloat);
-/**
- * Return a new bean proxy for the primitive double argument
- * Creation date: (12/3/99 11:52:20 AM)
- * @author Joe Winchester
- */
-public INumberBeanProxy createBeanProxyWith(double aPrimitiveDouble);
-/**
- * Return a new bean proxy for the Boolean argument
- * Creation date: (12/3/99 11:52:20 AM)
- * @author Joe Winchester
- */
-public IBooleanBeanProxy createBeanProxyWith(Boolean aBoolean);
-/**
- * Return a new bean proxy for the Integer argument
- * Creation date: (12/3/99 11:52:20 AM)
- * @author Joe Winchester
- */
-public IIntegerBeanProxy createBeanProxyWith(Integer anInteger);
-/**
- * Return a new bean proxy for the Character argument
- * Creation date: (12/3/99 11:52:20 AM)
- * @author Joe Winchester
- */
-public ICharacterBeanProxy createBeanProxyWith(Character aCharacter);
-/**
- * Return a new bean proxy for the Number argument, can handle any of the numbers.
- * Creation date: (12/3/99 11:52:20 AM)
- * @author Joe Winchester
- */
-public INumberBeanProxy createBeanProxyWith(Number aNumber);
-/**
- * Return a new bean proxy for the string argument
- * Creation date: (12/3/99 11:52:20 AM)
- * @author Joe Winchester
- */
-public IStringBeanProxy createBeanProxyWith(String aString);
-
-/**
- * Convert the non-primitive proxy to a primitive proxy, if it
- * of one of the wrapper types. If not, then just return the proxy as is.
- * <p>
- * I.E. BooleanClassProxy will convert to BooleanTypeProxy, but ObjectClassProxy will just return unchanged.
- * @param nonPrimitiveProxy
- * @return either the primitive proxy that nonPrimitive wrappers, or the non-primitive if not a wrapper type.
- *
- * @since 1.0.0
- */
-public IBeanProxy convertToPrimitiveBeanProxy(IBeanProxy nonPrimitiveProxy);
-/**
- * Return a new bean proxy for the boolean argument
- * Creation date: (12/3/99 11:52:20 AM)
- * @author Joe Winchester
- */
-public IBooleanBeanProxy createBeanProxyWith(boolean aBoolean);
-/**
- * Create an array bean proxy.
- *
- * - (int, new int[2] {3, 4}) will create:
- * int [3] [4]
- *
- * - (int[], new int[1] {1})
- * int [1]
- *
- * - (int[], new int[2] {2,3})
- * int [2] [3]
- *
- *
- * - (int[], null) or (int[], new int[0]) or (int, null) or (int, new int[0])
- * int [0]...
- * or
- * (int[][]..., null) or (int[][]..., new int[0])
- * int[0][]...
- * This is because an array instance with no specified dimensions is not valid.
- *
- * - (int[][], new int[1] {3})
- * int[3][]
- */
-public IArrayBeanProxy createBeanProxyWith(IBeanTypeProxy type, int[] dimensions) throws ThrowableProxy;
-/**
- * Create a one-dimensional array.
- * The result will be the same as calling
- * createBeanProxyWith(IBeanTypeProxy type, new int[1] {x})
- * where 'x' is the value passed in as the dimension.
- */
-public IArrayBeanProxy createBeanProxyWith(IBeanTypeProxy type, int dimension) throws ThrowableProxy;
-
-/**
- * Create a bean proxy from an initialization string.
- * <p>
- * It is not recommended that this method be commonly used. That is because no type checking will be performed
- * on the result. Whatever it evaluates to be will be what it is. It is useful for the rare cases where the desired
- * result type is not known.
- * <p>
- * It is recommended instead to use the newInstance(initString) method on the appropriate IBeanTypeProxy so that the
- * result can be type-checked to make sure the string evaluates to something of that type.
- *
- * @param initializationString
- * @return
- * @throws ThrowableProxy
- * @throws InstantiationException
- * @throws ClassCastException
- *
- * @since 1.0.0
- */
-public IBeanProxy createBeanProxyFrom(String initializationString) throws ThrowableProxy, InstantiationException, ClassCastException;
-
-/**
- * Release the proxy. In the case of Remote VM, this means
- * it will remove the proxy on the client side, and remove
- * the reference to the real object on the server side. On the server
- * side the real object may not go away because something else could
- * be holding onto it, but it won't be held simply because the client
- * is holding onto it.
- */
-public void releaseProxy(IBeanProxy proxy);
-
-/**
- * Create an expression.
- * @return The expression.
- *
- * @since 1.0.0
- */
-public IExpression createExpression();
-}
diff --git a/plugins/org.eclipse.jem.proxy/proxy/org/eclipse/jem/internal/proxy/core/IStandardBeanTypeProxyFactory.java b/plugins/org.eclipse.jem.proxy/proxy/org/eclipse/jem/internal/proxy/core/IStandardBeanTypeProxyFactory.java
deleted file mode 100644
index 77df7e9..0000000
--- a/plugins/org.eclipse.jem.proxy/proxy/org/eclipse/jem/internal/proxy/core/IStandardBeanTypeProxyFactory.java
+++ /dev/null
@@ -1,168 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2001, 2005 IBM Corporation and others.
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
- *
- * Contributors:
- * IBM Corporation - initial API and implementation
- *******************************************************************************/
-package org.eclipse.jem.internal.proxy.core;
-/*
-
-
- */
-
-import java.util.Set;
-/**
- * The standard bean type proxy factory.
- * This is the Interface that the desktop will talk
- * to, the one that is returned when getCurrent() is called.
- * Creation date: (3/10/00 11:00:50 AM)
- * @author: Richard Lee Kulp
- */
-public interface IStandardBeanTypeProxyFactory extends IBeanProxyFactory {
-
-/**
- * Used by other registered bean type proxy factories to
- * register their bean type proxies with the standard factory
- * so that it will be cached there.
- * <p><b>Note:</b> This is not meant to be called by customers. It is here for the usage
- * of registry extensions.
- * @param aBeanTypeProxy
- * @param permanent indicates that beantype will never be released,
- * not even if explicit request is made.
- *
- * @since 1.1.0
- */
-void registerBeanTypeProxy(IBeanTypeProxy aBeanTypeProxy, boolean permanent);
-
-/**
- * Used by other registered bean type proxy factories to
- * register their proxy bean type with the standard factory
- * so that it will be cached there.
- * <p><b>Note:</b> This is not meant to be called by customers. It is here for the usage
- * of registry extensions.
- * @param aBeanTypeProxy
- * @param permanent indicates that beantype will never be released,
- * not even if explicit request is made.
- *
- * @since 1.1.0
- */
-void registerBeanTypeProxy(IProxyBeanType aBeanTypeProxy, boolean permanent);
-
-/**
- * Return the beanType proxy for the given class name.
- * It must be fully qualified. And for arrays it can handle
- * either the jni type ([Ljava.lang.Object;) or the Java EMF Model
- * formal type (java.lang.Object[]).
- */
-IBeanTypeProxy getBeanTypeProxy(String className);
-
-/**
- * Get the beantype proxy suitable for an expression.
- *
- * @param expression
- * @param typeName
- * @return
- *
- * @since 1.1.0
- */
-IProxyBeanType getBeanTypeProxy(IExpression expression, String typeName);
-
-/**
- * Return an Array type proxy for the given class name of
- * the specified dimensions. This is a helper method. The
- * same result can be gotton from getBeanTypeProxy.
- * e.g.
- * getBeanTypeProxy("java.lang.Object", 3)
- * is the same as:
- * getBeanTypeProxy("[[[Ljava.lang.Object;")
- *
- * They both result in a type of:
- * Object [][][]
- *
- * or if using the JNI format (proxy format)
- * getBeanTypeProxy("[Ljava.langObject;", 3)
- * becomes
- * Object [][][][]
- *
- * or if using the standard java format (as in actual code)
- * getBeanTypeProxy("java.langObject[];", 3)
- * becomes
- * Object [][][][]
- */
-IBeanTypeProxy getBeanTypeProxy(String componentClassName, int dimensions);
-
-/**
- * Return an Array type proxy for the given class name of
- * the specified dimensions. This is a helper method. The
- * same result can be gotton from getBeanTypeProxy.
- * e.g.
- * getBeanTypeProxy("java.lang.Object", 3)
- * is the same as:
- * getBeanTypeProxy("[[[Ljava.lang.Object;")
- *
- * They both result in a type of:
- * Object [][][]
- *
- * or if using the JNI format (proxy format)
- * getBeanTypeProxy("[Ljava.langObject;", 3)
- * becomes
- * Object [][][][]
- *
- * or if using the standard java format (as in actual code)
- * getBeanTypeProxy("java.langObject[];", 3)
- * becomes
- * Object [][][][]
- *
- * @param expression
- * @param componentClassName
- * @param dimensions
- * @return
- *
- * @since 1.1.0
- */
-IProxyBeanType getBeanTypeProxy(IExpression expression, String componentClassName, int dimensions);
-
-/**
- * Test if a specific bean type has been registered. Don't access and create
- * if it isn't currently registered.
- */
-boolean isBeanTypeRegistered(String className);
-
-/**
- * Registered types. Return a set of strings that are the registered classes.
- * This Set isn't synchronized, there may be changes while accessing it.
- */
-Set registeredTypes();
-
-/**
- * Maintain list of not found types. This list is types that were requested,
- * but didn't exist. This method sets whether list should be maintained or not.
- * If set to false, the list will be empty. The default is false.
- *
- * @param maintain
- */
-void setMaintainNotFoundTypes(boolean maintain);
-
-/**
- * Maintain list of not found types. This list is types that were requested,
- * but didn't exist. This method returns whether list should be maintained or not.
- * If false, the list will be empty. The default is false.
- *
- * @return maintaining not found types.
- */
-boolean isMaintainNotFoundTypes();
-
-/**
- * Maintain list of not found types. This list is types that were requested,
- * but didn't exist.
- *
- * @param className Classname to search for to see if ever not found.
- * @return true if the bean type had been searched for but was not found. If not maintaining, then result will be false.
- */
-boolean isBeanTypeNotFound(String className);
-
-}
diff --git a/plugins/org.eclipse.jem.proxy/proxy/org/eclipse/jem/internal/proxy/core/IStringBeanProxy.java b/plugins/org.eclipse.jem.proxy/proxy/org/eclipse/jem/internal/proxy/core/IStringBeanProxy.java
deleted file mode 100644
index 2078fad..0000000
--- a/plugins/org.eclipse.jem.proxy/proxy/org/eclipse/jem/internal/proxy/core/IStringBeanProxy.java
+++ /dev/null
@@ -1,30 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2001, 2005 IBM Corporation and others.
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
- *
- * Contributors:
- * IBM Corporation - initial API and implementation
- *******************************************************************************/
-package org.eclipse.jem.internal.proxy.core;
-/*
-
-
- */
-
-
-/**
- * Optimized implementation that should be used for string proxies that
- * allows the IDE VM to get the string value easily
- * Creation date: (2/6/00 8:58:22 AM)
- * @author: Joe Winchester
- */
-public interface IStringBeanProxy extends IBeanProxy {
-/**
- * Return the proxied string as a string that the IDE can use
- * Creation date: (2/6/00 8:58:32 AM)
- */
-String stringValue();
-}
diff --git a/plugins/org.eclipse.jem.proxy/proxy/org/eclipse/jem/internal/proxy/core/IUIRunner.java b/plugins/org.eclipse.jem.proxy/proxy/org/eclipse/jem/internal/proxy/core/IUIRunner.java
deleted file mode 100644
index 9356c2d..0000000
--- a/plugins/org.eclipse.jem.proxy/proxy/org/eclipse/jem/internal/proxy/core/IUIRunner.java
+++ /dev/null
@@ -1,40 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2004, 2005 IBM Corporation and others.
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
- *
- * Contributors:
- * IBM Corporation - initial API and implementation
- *******************************************************************************/
-/*
-
-
- */
-package org.eclipse.jem.internal.proxy.core;
-
-import org.eclipse.core.runtime.CoreException;
-import org.eclipse.core.runtime.IProgressMonitor;
-
-
-/**
- * Interface that doesn't require UI. The implementation will. This will
- * only be used if within UI environment.
- *
- * <package-protected> because should only be used within here.
- *
- * @since 1.0.0
- */
-interface IUIRunner {
- /**
- * Handle the build. If not in UI thread, just call back to ProxyLaunchSupport
- * to handle the build. If on UI thread, then use the IProgressService to do it.
- * This will keep the UI from "locking", though it will be disabled it won't deadlock.
- *
- * @param pm
- *
- * @since 1.0.0
- */
- public void handleBuild(IProgressMonitor pm) throws CoreException;
-}
diff --git a/plugins/org.eclipse.jem.proxy/proxy/org/eclipse/jem/internal/proxy/core/IteratorBeanProxyWrapper.java b/plugins/org.eclipse.jem.proxy/proxy/org/eclipse/jem/internal/proxy/core/IteratorBeanProxyWrapper.java
deleted file mode 100644
index 43f64fc..0000000
--- a/plugins/org.eclipse.jem.proxy/proxy/org/eclipse/jem/internal/proxy/core/IteratorBeanProxyWrapper.java
+++ /dev/null
@@ -1,84 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2001, 2005 IBM Corporation and others.
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
- *
- * Contributors:
- * IBM Corporation - initial API and implementation
- *******************************************************************************/
-package org.eclipse.jem.internal.proxy.core;
-/*
-
-
- */
-
-
-import java.text.MessageFormat;
-
-import org.eclipse.core.runtime.IStatus;
-import org.eclipse.core.runtime.Status;
-/**
- * This is a wrapper for an java.util.Iterator proxy.
- * It provides the iterator methods to interface to
- * the proxy.
- */
-
-public class IteratorBeanProxyWrapper {
- protected final IBeanProxy fIterator;
- protected final JavaStandardBeanProxyConstants fConstants;
-
- /**
- * Construct with the collection.
- */
- public IteratorBeanProxyWrapper(IBeanProxy anIteratorProxy) {
- if (!anIteratorProxy.getTypeProxy().isKindOf(anIteratorProxy.getProxyFactoryRegistry().getBeanTypeProxyFactory().getBeanTypeProxy("java.util.Iterator"))) //$NON-NLS-1$
- throw new ClassCastException(MessageFormat.format(ProxyMessages.ClassCast_EXC__IncorrectType, new Object[] {anIteratorProxy.getTypeProxy().getTypeName(), "java.util.Iterator"})); //$NON-NLS-1$
- else
- fIterator = anIteratorProxy;
-
- fConstants = JavaStandardBeanProxyConstants.getConstants(anIteratorProxy.getProxyFactoryRegistry());
- }
-
- /**
- * Answer the iterator proxy that this is wrappering.
- */
- public IBeanProxy getBeanProxy() {
- return fIterator;
- }
-
- /**
- * equals - Pass it on to the proxy to handle this.
- */
- public boolean equals(Object object) {
- return fIterator.equals(object);
- }
-
- /**
- * hashCode - Pass it on to the proxy to handle this.
- */
- public int hashCode() {
- return fIterator.hashCode();
- }
-
- /**
- * Iterator accessors
- */
- public boolean hasNext() {
- try {
- return ((IBooleanBeanProxy) fConstants.getIteratorHasNext().invoke(fIterator)).booleanValue();
- } catch (ThrowableProxy e) {
- // This shouldn't occur, so just log it.
- ProxyPlugin.getPlugin().getLogger().log(new Status(IStatus.ERROR, ProxyPlugin.getPlugin().getBundle().getSymbolicName(), 0, ProxyMessages.UnexpectedException_EXC_, e));
- return false;
- }
- }
- public IBeanProxy next() throws ThrowableProxy {
- return fConstants.getIteratorNext().invoke(fIterator);
- }
- public void remove() throws ThrowableProxy {
- fConstants.getIteratorRemove().invoke(fIterator);
- }
-
-}
diff --git a/plugins/org.eclipse.jem.proxy/proxy/org/eclipse/jem/internal/proxy/core/JavaStandardBeanProxyConstants.java b/plugins/org.eclipse.jem.proxy/proxy/org/eclipse/jem/internal/proxy/core/JavaStandardBeanProxyConstants.java
deleted file mode 100644
index df46f16..0000000
--- a/plugins/org.eclipse.jem.proxy/proxy/org/eclipse/jem/internal/proxy/core/JavaStandardBeanProxyConstants.java
+++ /dev/null
@@ -1,347 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2001, 2005 IBM Corporation and others.
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
- *
- * Contributors:
- * IBM Corporation - initial API and implementation
- *******************************************************************************/
-package org.eclipse.jem.internal.proxy.core;
-/*
-
-
- */
-
-
-/**
- * Standard Proxy constants.
- *
- * Use the static accessor method (getConstants()) to get the appropriate
- * constants instance for the registry. This is done so that until the
- * the constants are needed, they aren't registered.
- *
- * There are some standard utility functions too.
- *
- * NOTE: Since everything in here just proxies, there is
- * no need to have them separated by VM. That is why
- * this in the Proxy package.
- *
- * This is final because this can't be extended. This specific one
- * will be registered with the factory for this key. Any extensions
- * must be done in their own constants and registry key.
- *
- * Creation date: (4/7/00 4:47:48 PM)
- * @author: Administrator
- */
-public final class JavaStandardBeanProxyConstants {
- public static final Object REGISTRY_KEY = new Object();
-
- final IBeanTypeProxy fCollectionType;
- final IBeanTypeProxy fListType;
- final IBeanTypeProxy fIteratorType;
- final IBeanTypeProxy fListIteratorType;
- final IBeanTypeProxy fEnumerationType;
- final IBeanTypeProxy fSystemType;
- final IBeanTypeProxy fStringType;
-
- IMethodProxy fCollectionAdd, fCollectionAddAll, fCollectionClear, fCollectionContains,
- fCollectionContainsAll, fCollectionIsEmpty, fCollectionIterator, fCollectionRemove,
- fCollectionRemoveAll, fCollectionRetainAll, fCollectionSize, fCollectionToArray,
- fCollectionToArrayWithArray;
-
- IMethodProxy fListAddWithInt, fListAddAllWithInt, fListGet, fListIndexOf, fListLastIndexOf,
- fListListIterator, fListListIteratorWithInt, fListRemoveInt,
- fListSet, fListSubList;
-
- IMethodProxy fIteratorHasNext, fIteratorNext, fIteratorRemove;
-
- IMethodProxy fListIteratorAdd, fListIteratorHasPrevious, fListIteratorNextIndex, fListIteratorPrevious,
- fListIteratorPreviousIndex, fListIteratorRemove, fListIteratorSet;
-
- IMethodProxy fEnumerationHasMoreElements, fEnumerationNextElement;
-
- IMethodProxy fSystemArraycopy;
-
-/**
- * Get the constants instance for the specified registry.
- */
-public static JavaStandardBeanProxyConstants getConstants(ProxyFactoryRegistry registry) {
- JavaStandardBeanProxyConstants constants = (JavaStandardBeanProxyConstants) registry.getConstants(REGISTRY_KEY);
- if (constants == null)
- registry.registerConstants(REGISTRY_KEY, constants = new JavaStandardBeanProxyConstants(registry));
- return constants;
-}
-
-
-/**
- * IDEJavaBeanConstants constructor comment.
- */
-private JavaStandardBeanProxyConstants(ProxyFactoryRegistry registry) {
- super();
-
- IStandardBeanTypeProxyFactory typeFactory = registry.getBeanTypeProxyFactory();
- fCollectionType = typeFactory.getBeanTypeProxy("java.util.Collection");//$NON-NLS-1$
- fListType = typeFactory.getBeanTypeProxy("java.util.List"); //$NON-NLS-1$
- fIteratorType = typeFactory.getBeanTypeProxy("java.util.Iterator"); //$NON-NLS-1$
- fListIteratorType = typeFactory.getBeanTypeProxy("java.util.ListIterator"); //$NON-NLS-1$
- fEnumerationType = typeFactory.getBeanTypeProxy("java.util.Enumeration"); //$NON-NLS-1$
- fSystemType = typeFactory.getBeanTypeProxy("java.lang.System"); //$NON-NLS-1$
- fStringType = typeFactory.getBeanTypeProxy("java.lang.String"); //$NON-NLS-1$
-}
-
-public IBeanTypeProxy getStringType() {
- return fStringType;
-}
-
-/**
- * Collection method accessors
- */
-public IMethodProxy getCollectionAdd() {
- if (fCollectionAdd == null)
- fCollectionAdd = fCollectionType.getMethodProxy("add", "java.lang.Object"); //$NON-NLS-1$ //$NON-NLS-2$
- return fCollectionAdd;
-}
-
-public IMethodProxy getCollectionAddAll(){
- if (fCollectionAddAll == null)
- fCollectionAddAll = fCollectionType.getMethodProxy("addAll", "java.util.Collection"); //$NON-NLS-1$ //$NON-NLS-2$
- return fCollectionAddAll;
-}
-
-public IMethodProxy getCollectionClear() {
- if (fCollectionClear == null)
- fCollectionClear = fCollectionType.getMethodProxy("clear"); //$NON-NLS-1$
- return fCollectionClear;
-}
-
-public IMethodProxy getCollectionContains() {
- if (fCollectionContains == null)
- fCollectionContains = fCollectionType.getMethodProxy("contains", "java.lang.Object"); //$NON-NLS-1$ //$NON-NLS-2$
- return fCollectionContains;
-}
-
-public IMethodProxy getCollectionContainsAll() {
- if (fCollectionContainsAll == null)
- fCollectionContainsAll = fCollectionType.getMethodProxy("containsAll", "java.util.Collection"); //$NON-NLS-1$ //$NON-NLS-2$
- return fCollectionContainsAll;
-}
-
-public IMethodProxy getCollectionIsEmpty() {
- if (fCollectionIsEmpty == null)
- fCollectionIsEmpty = fCollectionType.getMethodProxy("isEmpty"); //$NON-NLS-1$
- return fCollectionIsEmpty;
-}
-
-public IMethodProxy getCollectionIterator() {
- if (fCollectionIterator == null)
- fCollectionIterator = fCollectionType.getMethodProxy("iterator"); //$NON-NLS-1$
- return fCollectionIterator;
-}
-
-public IMethodProxy getCollectionRemove() {
- if (fCollectionRemove == null)
- fCollectionRemove = fCollectionType.getMethodProxy("remove", "java.lang.Object"); //$NON-NLS-1$ //$NON-NLS-2$
- return fCollectionRemove;
-}
-
-public IMethodProxy getCollectionRemoveAll() {
- if (fCollectionRemoveAll == null)
- fCollectionRemoveAll = fCollectionType.getMethodProxy("removeAll", "java.util.Collection"); //$NON-NLS-1$ //$NON-NLS-2$
- return fCollectionRemoveAll;
-}
-
-public IMethodProxy getCollectionRetainAll() {
- if (fCollectionRetainAll == null)
- fCollectionRetainAll = fCollectionType.getMethodProxy("retainAll", "java.util.Collection"); //$NON-NLS-1$ //$NON-NLS-2$
- return fCollectionRetainAll;
-}
-
-public IMethodProxy getCollectionSize() {
- if (fCollectionSize == null)
- fCollectionSize = fCollectionType.getMethodProxy("size"); //$NON-NLS-1$
- return fCollectionSize;
-}
-
-public IMethodProxy getCollectionToArray() {
- if (fCollectionToArray == null)
- fCollectionToArray = fCollectionType.getMethodProxy("toArray"); //$NON-NLS-1$
- return fCollectionToArray;
-}
-
-public IMethodProxy getCollectionToArrayWithArray() {
- if (fCollectionToArrayWithArray == null)
- fCollectionToArrayWithArray = fCollectionType.getMethodProxy("toArray", "[Ljava.lang.Object;"); //$NON-NLS-1$ //$NON-NLS-2$
- return fCollectionToArrayWithArray;
-}
-
-/**
- * Iterator accessors
- */
-
-public IMethodProxy getIteratorHasNext() {
- if (fIteratorHasNext == null)
- fIteratorHasNext = fIteratorType.getMethodProxy("hasNext"); //$NON-NLS-1$
- return fIteratorHasNext;
-}
-
-public IMethodProxy getIteratorNext() {
- if (fIteratorNext == null)
- fIteratorNext = fIteratorType.getMethodProxy("next"); //$NON-NLS-1$
- return fIteratorNext;
-}
-
-public IMethodProxy getIteratorRemove() {
- if (fIteratorRemove == null)
- fIteratorRemove = fIteratorType.getMethodProxy("remove"); //$NON-NLS-1$
- return fIteratorRemove;
-}
-
-/**
- * Listaccessors
- */
-
-public IMethodProxy getListAddWithInt() {
- if (fListAddWithInt == null)
- fListAddWithInt = fListType.getMethodProxy("add", new String[] {"int", "java.lang.Object"}); //$NON-NLS-1$ //$NON-NLS-2$ //$NON-NLS-3$
- return fListAddWithInt;
-}
-
-public IMethodProxy getListAddAllWithInt() {
- if (fListAddAllWithInt == null)
- fListAddAllWithInt = fListType.getMethodProxy("addAll", new String[] {"int", "java.util.Collection"}); //$NON-NLS-1$ //$NON-NLS-2$ //$NON-NLS-3$
- return fListAddAllWithInt;
-}
-
-public IMethodProxy getListGet() {
- if (fListGet == null)
- fListGet = fListType.getMethodProxy("get", "int"); //$NON-NLS-1$ //$NON-NLS-2$
- return fListGet;
-}
-
-public IMethodProxy getListIndexOf() {
- if (fListIndexOf == null)
- fListIndexOf = fListType.getMethodProxy("indexOf", "java.lang.Object"); //$NON-NLS-1$ //$NON-NLS-2$
- return fListIndexOf;
-}
-
-public IMethodProxy getListLastIndexOf() {
- if (fListLastIndexOf == null)
- fListLastIndexOf = fListType.getMethodProxy("lastIndexOf", "java.lang.Object"); //$NON-NLS-1$ //$NON-NLS-2$
- return fListLastIndexOf;
-}
-
-public IMethodProxy getListListIterator() {
- if (fListListIterator == null)
- fListListIterator = fListType.getMethodProxy("listIterator"); //$NON-NLS-1$
- return fListListIterator;
-}
-
-public IMethodProxy getListListIteratorWithInt() {
- if (fListListIteratorWithInt == null)
- fListListIteratorWithInt = fListType.getMethodProxy("listIterator", "int"); //$NON-NLS-1$ //$NON-NLS-2$
- return fListListIteratorWithInt;
-}
-
-public IMethodProxy getListRemoveInt() {
- if (fListRemoveInt == null)
- fListRemoveInt = fListType.getMethodProxy("remove", "int"); //$NON-NLS-1$ //$NON-NLS-2$
- return fListRemoveInt;
-}
-
-public IMethodProxy getListSet() {
- if (fListSet == null)
- fListSet = fListType.getMethodProxy("set", new String[] {"int", "java.lang.Object"}); //$NON-NLS-1$ //$NON-NLS-2$ //$NON-NLS-3$
- return fListSet;
-}
-
-public IMethodProxy getListSubList() {
- if (fListSubList == null)
- fListSubList = fListType.getMethodProxy("subList", new String[] {"int", "int"}); //$NON-NLS-1$ //$NON-NLS-2$ //$NON-NLS-3$
- return fListSubList;
-}
-
-/**
- * ListIterator accessors
- */
-
-public IMethodProxy getListIteratorAdd() {
- if (fListIteratorAdd == null)
- fListIteratorAdd = fListIteratorType.getMethodProxy("add", "java.lang.Object"); //$NON-NLS-1$ //$NON-NLS-2$
- return fListIteratorAdd;
-}
-
-public IMethodProxy getListIteratorHasPrevious() {
- if (fListIteratorHasPrevious == null)
- fListIteratorHasPrevious = fListIteratorType.getMethodProxy("hasPrevious"); //$NON-NLS-1$
- return fListIteratorHasPrevious;
-}
-
-public IMethodProxy getListIteratorNextIndex() {
- if (fListIteratorNextIndex == null)
- fListIteratorNextIndex = fListIteratorType.getMethodProxy("nextIndex"); //$NON-NLS-1$
- return fListIteratorNextIndex;
-}
-
-public IMethodProxy getListIteratorPrevious() {
- if (fListIteratorPrevious == null)
- fListIteratorPrevious = fListIteratorType.getMethodProxy("previous"); //$NON-NLS-1$
- return fListIteratorPrevious;
-}
-
-public IMethodProxy getListIteratorPreviousIndex() {
- if (fListIteratorPreviousIndex == null)
- fListIteratorPreviousIndex = fListIteratorType.getMethodProxy("previousIndex"); //$NON-NLS-1$
- return fListIteratorPreviousIndex;
-}
-
-public IMethodProxy getListIteratorSet() {
- if (fListIteratorSet == null)
- fListIteratorSet = fListIteratorType.getMethodProxy("set", "java.lang.Object"); //$NON-NLS-1$ //$NON-NLS-2$
- return fListIteratorSet;
-}
-
-public IMethodProxy getListIteratorRemove() {
- if (fListIteratorRemove == null)
- fListIteratorRemove = fListIteratorType.getMethodProxy("remove"); //$NON-NLS-1$
- return fListIteratorRemove;
-}
-
-protected IMethodProxy getSystemArraycopy() {
- if (fSystemArraycopy == null)
- fSystemArraycopy = fSystemType.getMethodProxy("arraycopy", new String[] {"java.lang.Object", "int", "java.lang.Object", "int", "int"}); //$NON-NLS-1$ //$NON-NLS-2$ //$NON-NLS-3$ //$NON-NLS-4$ //$NON-NLS-5$ //$NON-NLS-6$
- return fSystemArraycopy;
-}
-
-/**
- * Enumeration accessors
- */
-public IMethodProxy getEnumerationHasMoreElements() {
- if (fEnumerationHasMoreElements == null)
- fEnumerationHasMoreElements = fEnumerationType.getMethodProxy("hasMoreElements"); //$NON-NLS-1$
- return fEnumerationHasMoreElements;
-}
-
-public IMethodProxy getEnumerationNextElement() {
- if (fEnumerationNextElement == null)
- fEnumerationNextElement = fEnumerationType.getMethodProxy("nextElement"); //$NON-NLS-1$
- return fEnumerationNextElement;
-}
-
-/**
- * Utility function to copy an array.
- */
-public void arraycopy(IBeanProxy src, int srcPosition, IBeanProxy dest, int destPosition, int length) throws ThrowableProxy {
- IStandardBeanProxyFactory factory = src.getProxyFactoryRegistry().getBeanProxyFactory();
- IBeanProxy[] args = new IBeanProxy[] {
- src,
- factory.createBeanProxyWith(srcPosition),
- dest,
- factory.createBeanProxyWith(destPosition),
- factory.createBeanProxyWith(length)
- };
-
- getSystemArraycopy().invoke(null, args);
-}
-}
diff --git a/plugins/org.eclipse.jem.proxy/proxy/org/eclipse/jem/internal/proxy/core/ListBeanProxyWrapper.java b/plugins/org.eclipse.jem.proxy/proxy/org/eclipse/jem/internal/proxy/core/ListBeanProxyWrapper.java
deleted file mode 100644
index a472783..0000000
--- a/plugins/org.eclipse.jem.proxy/proxy/org/eclipse/jem/internal/proxy/core/ListBeanProxyWrapper.java
+++ /dev/null
@@ -1,111 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2001, 2005 IBM Corporation and others.
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
- *
- * Contributors:
- * IBM Corporation - initial API and implementation
- *******************************************************************************/
-package org.eclipse.jem.internal.proxy.core;
-/*
-
-
- */
-
-
-import java.text.MessageFormat;
-
-import org.eclipse.core.runtime.IStatus;
-import org.eclipse.core.runtime.Status;
-/**
- * This is a wrapper for an java.util.Collection proxy.
- * It provides the collection methods to interface to
- * the proxy.
- */
-
-public class ListBeanProxyWrapper extends CollectionBeanProxyWrapper {
- /**
- * Construct with the List.
- */
- public ListBeanProxyWrapper(IBeanProxy aListProxy) {
- super(aListProxy);
-
- if (!aListProxy.getTypeProxy().isKindOf(aListProxy.getProxyFactoryRegistry().getBeanTypeProxyFactory().getBeanTypeProxy("java.util.List"))) //$NON-NLS-1$
- throw new ClassCastException(MessageFormat.format(ProxyMessages.ClassCast_EXC__IncorrectType, new Object[] {aListProxy.getTypeProxy().getTypeName(), "java.util.List"})); //$NON-NLS-1$
- }
-
-
- /**
- * List accessors
- */
- public void add(int index, IBeanProxy object) throws ThrowableProxy {
- fConstants.getListAddWithInt().invoke(fCollection, new IBeanProxy[] {fCollection.getProxyFactoryRegistry().getBeanProxyFactory().createBeanProxyWith(index), object});
- }
- public boolean addAll(int index, IBeanProxy aCollection) throws ThrowableProxy {
- return ((IBooleanBeanProxy) fConstants.getListAddAllWithInt().invoke(fCollection, new IBeanProxy[] {fCollection.getProxyFactoryRegistry().getBeanProxyFactory().createBeanProxyWith(index), aCollection})).booleanValue();
- }
- public IBeanProxy get(int index) throws ThrowableProxy {
- return fConstants.getListGet().invoke(fCollection, fCollection.getProxyFactoryRegistry().getBeanProxyFactory().createBeanProxyWith(index));
- }
- public int indexOf(IBeanProxy object) {
- try {
- return ((IIntegerBeanProxy) fConstants.getListIndexOf().invoke(fCollection, object)).intValue();
- } catch (ThrowableProxy e) {
- // This shouldn't occur, so just log it.
- ProxyPlugin.getPlugin().getLogger().log(new Status(IStatus.ERROR, ProxyPlugin.getPlugin().getBundle().getSymbolicName(), 0, ProxyMessages.UnexpectedException_EXC_, e));
- return -1;
- }
- }
- public int lastIndexOf(IBeanProxy object) {
- try {
- return ((IIntegerBeanProxy) fConstants.getListLastIndexOf().invoke(fCollection, object)).intValue();
- } catch (ThrowableProxy e) {
- // This shouldn't occur, so just log it.
- ProxyPlugin.getPlugin().getLogger().log(new Status(IStatus.ERROR, ProxyPlugin.getPlugin().getBundle().getSymbolicName(), 0, ProxyMessages.UnexpectedException_EXC_, e));
- return -1;
- }
- }
- public ListIteratorBeanProxyWrapper listIterator() {
- try {
- IBeanProxy itr = fConstants.getListListIterator().invoke(fCollection);
- if (itr != null)
- return new ListIteratorBeanProxyWrapper(itr);
- else
- return null;
- } catch (ThrowableProxy e) {
- // This shouldn't occur, so just log it.
- ProxyPlugin.getPlugin().getLogger().log(new Status(IStatus.ERROR, ProxyPlugin.getPlugin().getBundle().getSymbolicName(), 0, ProxyMessages.UnexpectedException_EXC_, e));
- return null;
- }
- }
- public ListIteratorBeanProxyWrapper listIterator(int index) {
- try {
- IBeanProxy itr = fConstants.getListListIteratorWithInt().invoke(fCollection, fCollection.getProxyFactoryRegistry().getBeanProxyFactory().createBeanProxyWith(index));
- if (itr != null)
- return new ListIteratorBeanProxyWrapper(itr);
- else
- return null;
- } catch (ThrowableProxy e) {
- // This shouldn't occur, so just log it.
- ProxyPlugin.getPlugin().getLogger().log(new Status(IStatus.ERROR, ProxyPlugin.getPlugin().getBundle().getSymbolicName(), 0, ProxyMessages.UnexpectedException_EXC_, e));
- return null;
- }
- }
- public IBeanProxy remove(int index, IBeanProxy object) throws ThrowableProxy {
- return fConstants.getListSet().invoke(fCollection, fCollection.getProxyFactoryRegistry().getBeanProxyFactory().createBeanProxyWith(index));
- }
- public IBeanProxy set(int index, IBeanProxy object) throws ThrowableProxy {
- return fConstants.getListRemoveInt().invoke(fCollection, new IBeanProxy[] {fCollection.getProxyFactoryRegistry().getBeanProxyFactory().createBeanProxyWith(index), object});
- }
- public ListBeanProxyWrapper subList(int fromIndex, int toIndex) throws ThrowableProxy {
- IBeanProxy list = fConstants.getListSubList().invoke(fCollection, new IBeanProxy[] {fCollection.getProxyFactoryRegistry().getBeanProxyFactory().createBeanProxyWith(fromIndex), fCollection.getProxyFactoryRegistry().getBeanProxyFactory().createBeanProxyWith(toIndex)});
- if (list != null)
- return new ListBeanProxyWrapper(list);
- else
- return null;
- }
-
-
-}
diff --git a/plugins/org.eclipse.jem.proxy/proxy/org/eclipse/jem/internal/proxy/core/ListIteratorBeanProxyWrapper.java b/plugins/org.eclipse.jem.proxy/proxy/org/eclipse/jem/internal/proxy/core/ListIteratorBeanProxyWrapper.java
deleted file mode 100644
index e198028..0000000
--- a/plugins/org.eclipse.jem.proxy/proxy/org/eclipse/jem/internal/proxy/core/ListIteratorBeanProxyWrapper.java
+++ /dev/null
@@ -1,84 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2001, 2005 IBM Corporation and others.
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
- *
- * Contributors:
- * IBM Corporation - initial API and implementation
- *******************************************************************************/
-package org.eclipse.jem.internal.proxy.core;
-/*
-
-
- */
-
-
-import java.text.MessageFormat;
-
-import org.eclipse.core.runtime.IStatus;
-import org.eclipse.core.runtime.Status;
-/**
- * This is a wrapper for an java.util.ListIterator proxy.
- * It provides the ListIterator methods to interface to
- * the proxy.
- */
-
-public class ListIteratorBeanProxyWrapper extends IteratorBeanProxyWrapper {
-
- /**
- * Construct with the ListIterator.
- */
- public ListIteratorBeanProxyWrapper(IBeanProxy anIteratorProxy) {
- super(anIteratorProxy);
-
- if (!anIteratorProxy.getTypeProxy().isKindOf(anIteratorProxy.getProxyFactoryRegistry().getBeanTypeProxyFactory().getBeanTypeProxy("java.util.ListIterator"))) //$NON-NLS-1$
- throw new ClassCastException(MessageFormat.format(ProxyMessages.ClassCast_EXC__IncorrectType, new Object[] {anIteratorProxy.getTypeProxy().getTypeName(), "java.util.ListIterator"})); //$NON-NLS-1$
- }
-
-
- /**
- * ListIterator accessors
- */
- public void add(IBeanProxy object) throws ThrowableProxy {
- fConstants.getListIteratorAdd().invoke(fIterator, object);
- }
- public boolean hasPrevious() {
- try {
- return ((IBooleanBeanProxy) fConstants.getListIteratorHasPrevious().invoke(fIterator)).booleanValue();
- } catch (ThrowableProxy e) {
- // This shouldn't occur, so just log it.
- ProxyPlugin.getPlugin().getLogger().log(new Status(IStatus.ERROR, ProxyPlugin.getPlugin().getBundle().getSymbolicName(), 0, ProxyMessages.UnexpectedException_EXC_, e));
- return false;
- }
- }
- public int nextIndex() {
- try {
- return ((IIntegerBeanProxy) fConstants.getListIteratorNextIndex().invoke(fIterator)).intValue();
- } catch (ThrowableProxy e) {
- // This shouldn't occur, so just log it.
- ProxyPlugin.getPlugin().getLogger().log(new Status(IStatus.ERROR, ProxyPlugin.getPlugin().getBundle().getSymbolicName(), 0, ProxyMessages.UnexpectedException_EXC_, e));
- return -1;
- }
- }
- public IBeanProxy previous() throws ThrowableProxy {
- return fConstants.getListIteratorPrevious().invoke(fIterator);
- }
- public int previousIndex() {
- try {
- return ((IIntegerBeanProxy) fConstants.getListIteratorPreviousIndex().invoke(fIterator)).intValue();
- } catch (ThrowableProxy e) {
- // This shouldn't occur, so just log it.
- ProxyPlugin.getPlugin().getLogger().log(new Status(IStatus.ERROR, ProxyPlugin.getPlugin().getBundle().getSymbolicName(), 0, ProxyMessages.UnexpectedException_EXC_, e));
- return -1;
- }
- }
- public void remove() throws ThrowableProxy {
- fConstants.getListIteratorRemove().invoke(fIterator);
- }
- public void set(IBeanProxy object) throws ThrowableProxy {
- fConstants.getListIteratorSet().invoke(fIterator, object);
- }
-
-}
diff --git a/plugins/org.eclipse.jem.proxy/proxy/org/eclipse/jem/internal/proxy/core/ListenerList.java b/plugins/org.eclipse.jem.proxy/proxy/org/eclipse/jem/internal/proxy/core/ListenerList.java
deleted file mode 100644
index d4b47e9..0000000
--- a/plugins/org.eclipse.jem.proxy/proxy/org/eclipse/jem/internal/proxy/core/ListenerList.java
+++ /dev/null
@@ -1,195 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2003, 2005 IBM Corporation and others.
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
- *
- * Contributors:
- * IBM Corporation - initial API and implementation
- *******************************************************************************/
-/*
-
-
- */
-package org.eclipse.jem.internal.proxy.core;
-
-/**
- * This class is used to maintain a list of listeners, and
- * is used in the implementations of several classes within jem
- * which allow you to register listeners of various kinds.
- * It is a fairly lightweight object, occupying minimal space when
- * no listeners are registered.
- * <p>
- * Note that the <code>add</code> method checks for and eliminates
- * duplicates based on identity (not equality). Likewise, the
- * <code>remove</code> method compares based on identity.
- * </p>
- * <p>
- * Use the <code>getListeners</code> method when notifying listeners.
- * Note that no garbage is created if no listeners are registered.
- * The recommended code sequence for notifying all registered listeners
- * of say, <code>FooListener.eventHappened</code>, is:
- * <pre>
- * Object[] listeners = myListenerList.getListeners();
- * for (int i = 0; i < listeners.length; ++i) {
- * ((FooListener) listeners[i]).eventHappened(event);
- * }
- * </pre>
- * </p>
- */
-
-public class ListenerList {
-
- /**
- * The initial capacity of the list. Always >= 1.
- */
- private int capacity;
-
- /**
- * The current number of listeners.
- * Maintains invariant: 0 <= size <= listeners.length.
- */
- private int size;
-
- /**
- * The list of listeners. Initially <code>null</code> but initialized
- * to an array of size capacity the first time a listener is added.
- * Maintains invariant: listeners != null IFF size != 0
- */
- private Object[] listeners = null;
-
- /**
- * The empty array singleton instance, returned by getListeners()
- * when size == 0.
- */
- private static final Object[] EmptyArray = new Object[0];
-
- /**
- * Creates a listener list with an initial capacity of 1.
- */
- public ListenerList() {
- this(1);
- }
-
- /**
- * Creates a listener list with the given initial capacity.
- *
- * @param capacity the number of listeners which this list can initially accept
- * without growing its internal representation; must be at least 1
- */
- public ListenerList(int capacity) {
- if (!(capacity >= 1))
- throw new IllegalArgumentException();
- this.capacity = capacity;
- }
-
- /**
- * Adds the given listener to this list. Has no effect if an identical listener
- * is already registered.
- *
- * @param listener the listener
- */
- public void add(Object listener) {
- if (listener == null)
- throw new IllegalArgumentException();
- if (size == 0) {
- listeners = new Object[capacity];
- } else {
- // check for duplicates using identity
- for (int i = 0; i < size; ++i) {
- if (listeners[i] == listener) {
- return;
- }
- }
- // grow array if necessary
- if (size == listeners.length) {
- System.arraycopy(
- listeners,
- 0,
- listeners = new Object[size * 2 + 1],
- 0,
- size);
- }
- }
- listeners[size++] = listener;
- }
-
- /**
- * Removes all listeners from this list.
- */
- public void clear() {
- size = 0;
- listeners = null;
- }
-
- /**
- * Returns an array containing all the registered listeners,
- * in the order in which they were added.
- * <p>
- * The resulting array is unaffected by subsequent adds or removes.
- * If there are no listeners registered, the result is an empty array
- * singleton instance (no garbage is created).
- * Use this method when notifying listeners, so that any modifications
- * to the listener list during the notification will have no effect on the
- * notification itself.
- * </p>
- *
- * @return the list of registered listeners
- */
- public Object[] getListeners() {
- if (size == 0)
- return EmptyArray;
- Object[] result = new Object[size];
- System.arraycopy(listeners, 0, result, 0, size);
- return result;
- }
-
- /**
- * Returns whether this listener list is empty.
- *
- * @return <code>true</code> if there are no registered listeners, and
- * <code>false</code> otherwise
- */
- public boolean isEmpty() {
- return size == 0;
- }
-
- /**
- * Removes the given listener from this list. Has no effect if an identical
- * listener was not already registered.
- *
- * @param listener the listener
- */
- public void remove(Object listener) {
- if (listener == null)
- throw new IllegalArgumentException();
- for (int i = 0; i < size; ++i) {
- if (listeners[i] == listener) {
- if (size == 1) {
- listeners = null;
- size = 0;
- } else {
- System.arraycopy(
- listeners,
- i + 1,
- listeners,
- i,
- --size - i);
- listeners[size] = null;
- }
- return;
- }
- }
- }
-
- /**
- * Returns the number of registered listeners.
- *
- * @return the number of registered listeners
- */
- public int size() {
- return size;
- }
-
-}
diff --git a/plugins/org.eclipse.jem.proxy/proxy/org/eclipse/jem/internal/proxy/core/MapJNITypes.java b/plugins/org.eclipse.jem.proxy/proxy/org/eclipse/jem/internal/proxy/core/MapJNITypes.java
deleted file mode 100644
index 7ed975f..0000000
--- a/plugins/org.eclipse.jem.proxy/proxy/org/eclipse/jem/internal/proxy/core/MapJNITypes.java
+++ /dev/null
@@ -1,72 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2005 IBM Corporation and others.
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
- *
- * Contributors:
- * IBM Corporation - initial API and implementation
- *******************************************************************************/
-/*
-
-
- */
-package org.eclipse.jem.internal.proxy.core;
-
-import org.eclipse.jem.internal.proxy.common.MapTypes;
-
-
-/**
- * This is a public class to map between JNI and normal format (e.g. "[Ljava.lang.String;" to "java.lang.String[]") and back again.
- * This is for arrays, non-arrays will be left alone since they are already correct.
- * @since 1.1.0
- */
-public class MapJNITypes {
-
- /**
- * Convert the formal type name to the JNI format.
- * @param formalTypeName
- * @return JNI format
- *
- * @since 1.1.0
- */
- public static String getJNITypeName(String formalTypeName) {
- return MapTypes.getJNIFormatName(formalTypeName);
- }
-
- /**
- * Convert the JNI format to the formal type name.
- * @param jniTypeName
- * @return formal type name or "" if not valid.
- *
- * @since 1.1.0
- */
- public static String getFormalTypeName(String jniTypeName) {
- return MapTypes.getFormalTypeName(jniTypeName);
- }
-
- /**
- * Return whether the formal type name is for a primitive or not.
- * @param formalType
- * @return <code>true</code> if for a primitive.
- *
- * @since 1.1.0
- */
- public static boolean isFormalTypePrimitive(String formalType) {
- return MapTypes.MAP_TYPENAME_TO_SHORTSIG.get(formalType) != null;
- }
-
- /**
- * Convert the formal type name, with the given number of dimensions,
- * to an array JNI type.
- * @param finalComponent final component name, should not be an array type.
- * @param dimensions number of dimensions for the array.
- * @return
- *
- * @since 1.1.0
- */
- public static String getJNITypeName(String finalComponent, int dimensions) {
- return MapTypes.getJNITypeName(finalComponent, dimensions);
- }
-}
diff --git a/plugins/org.eclipse.jem.proxy/proxy/org/eclipse/jem/internal/proxy/core/PDEContributeClasspath.java b/plugins/org.eclipse.jem.proxy/proxy/org/eclipse/jem/internal/proxy/core/PDEContributeClasspath.java
deleted file mode 100644
index ba03061..0000000
--- a/plugins/org.eclipse.jem.proxy/proxy/org/eclipse/jem/internal/proxy/core/PDEContributeClasspath.java
+++ /dev/null
@@ -1,126 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2004, 2005 IBM Corporation and others.
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
- *
- * Contributors:
- * IBM Corporation - initial API and implementation
- *******************************************************************************/
-/*
-
-
- */
-package org.eclipse.jem.internal.proxy.core;
-
-import java.io.File;
-import java.net.MalformedURLException;
-import java.net.URL;
-import java.util.*;
-import java.util.logging.Level;
-
-import org.eclipse.core.resources.IProject;
-import org.eclipse.core.resources.IResource;
-import org.eclipse.core.runtime.CoreException;
-import org.eclipse.core.runtime.IPath;
-import org.eclipse.jdt.core.JavaCore;
-import org.eclipse.pde.core.plugin.*;
-
-/**
- * Contribute to classpath PDE entries that are needed for a launch.
- * <p>
- * This is a special class that should not be referenced directly from code. Reference it through the interface that it implements.
- *
- * @see org.eclipse.jem.internal.proxy.core.IPDEContributeClasspath
- * @since 1.0.2
- */
-class PDEContributeClasspath implements IPDEContributeClasspath {
-
- public void getPDEContributions(IConfigurationContributionController controller, IConfigurationContributionInfo info) throws CoreException {
- if (!info.getPluginIds().isEmpty()) {
- Collection pluginIds = info.getPluginIds().keySet();
-
- IPluginModelBase[] allModels = PluginRegistry.getAllModels();
- List fragments = new ArrayList();
- for (int i = 0; i < allModels.length; i++) {
- if (allModels[i].isFragmentModel()) {
- fragments.add(allModels[i]);
- }
- }
-
- for (Iterator itr = fragments.iterator(); itr.hasNext();) {
- IFragmentModel fragmentModel = (IFragmentModel) itr.next();
- IFragment fragment = fragmentModel.getFragment();
- if (pluginIds.contains(fragment.getPluginId())) {
- // We'll do a cheat for now and assume fragment is for same version of plugin. PDECore actually
- // checks the version of the fragment against the version of the plugin to see they are for each
- // other, but we'll just assume they are for now. Change this later if we actually do run into this case.
- IResource resource = fragment.getModel().getUnderlyingResource();
- if (resource != null) {
- IProject fragProject = resource.getProject();
- if (fragProject.hasNature(JavaCore.NATURE_ID)) {
- controller.contributeProject(fragProject);
- }
- continue;
- }
-
- IPluginLibrary[] libraries = fragment.getLibraries();
- for (int j = 0; j < libraries.length; j++) {
- IPluginLibrary library = libraries[j];
- String name = library.getName();
- String expandedName = expandLibraryName(name);
-
- IPluginModelBase model = library.getPluginModel();
- URL url = getPath(model, expandedName);
- if (url != null)
- controller.contributeClasspath(url, IConfigurationContributionController.APPEND_USER_CLASSPATH);
- }
- }
- }
- }
-
- return;
- }
-
- private URL getPath(IPluginModelBase model, String libraryName) {
- try {
- IResource resource = model.getUnderlyingResource();
- if (resource != null) {
- IResource jarFile = resource.getProject().findMember(libraryName);
- if (jarFile != null)
- return jarFile.getFullPath().toFile().toURL();
- } else {
- File file = new File(model.getInstallLocation(), libraryName);
- if (file.exists())
- return file.toURL();
- }
- } catch (MalformedURLException e) {
- ProxyPlugin.getPlugin().getLogger().log(e, Level.WARNING);
- }
- return null;
- }
-
- /**
- * This utility method was originally copied from method of same name, in org.eclipse.pde.internal.core.ClasspathUtilCore. It was not API, and
- * seems safe enough to copy here. But, see https://bugs.eclipse.org/bugs/show_bug.cgi?id=182555
- * in case there is ever an API method provided to codify these Eclipse rules.
- */
- private static String expandLibraryName(String source) {
- if (source == null || source.length() == 0)
- return ""; //$NON-NLS-1$
- if (source.indexOf("$ws$") != -1) //$NON-NLS-1$
- source = source.replaceAll("\\$ws\\$", //$NON-NLS-1$
- "ws" + IPath.SEPARATOR + TargetPlatform.getWS()); //$NON-NLS-1$
- if (source.indexOf("$os$") != -1) //$NON-NLS-1$
- source = source.replaceAll("\\$os\\$", //$NON-NLS-1$
- "os" + IPath.SEPARATOR + TargetPlatform.getOS()); //$NON-NLS-1$
- if (source.indexOf("$nl$") != -1) //$NON-NLS-1$
- source = source.replaceAll("\\$nl\\$", //$NON-NLS-1$
- "nl" + IPath.SEPARATOR + TargetPlatform.getNL()); //$NON-NLS-1$
- if (source.indexOf("$arch$") != -1) //$NON-NLS-1$
- source = source.replaceAll("\\$arch\\$", //$NON-NLS-1$
- "arch" + IPath.SEPARATOR + TargetPlatform.getOSArch()); //$NON-NLS-1$
- return source;
- }
-}
diff --git a/plugins/org.eclipse.jem.proxy/proxy/org/eclipse/jem/internal/proxy/core/PDEContributeClasspathInstance.java b/plugins/org.eclipse.jem.proxy/proxy/org/eclipse/jem/internal/proxy/core/PDEContributeClasspathInstance.java
deleted file mode 100644
index 90c7529..0000000
--- a/plugins/org.eclipse.jem.proxy/proxy/org/eclipse/jem/internal/proxy/core/PDEContributeClasspathInstance.java
+++ /dev/null
@@ -1,52 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2004, 2005 IBM Corporation and others.
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
- *
- * Contributors:
- * IBM Corporation - initial API and implementation
- *******************************************************************************/
-/*
-
-
- */
-package org.eclipse.jem.internal.proxy.core;
-
-import java.util.logging.Level;
-
-import org.eclipse.core.runtime.Platform;
-
-
-
-/**
- * Accessor to the IPDEContributeClasspath instance to use.
- * <pacakge-protected> because only IPDEContributeClasspath should access it.
- *
- * @since 1.0.2
- */
-class PDEContributeClasspathInstance {
-
- /**
- * Get the instance to use.
- * @return the instance to use or <code>null</code> if PDE not available.
- *
- * @since 1.0.2
- */
- public static IPDEContributeClasspath getInstance() {
- if (Platform.getBundle("org.eclipse.pde.core") != null) { //$NON-NLS-1$
- try {
- Class pdeClass = Class.forName("org.eclipse.jem.internal.proxy.core.PDEContributeClasspath"); //$NON-NLS-1$
- return (IPDEContributeClasspath) pdeClass.newInstance();
- } catch (ClassNotFoundException e) {
- // PDE not available, this is ok.
- } catch (InstantiationException e) {
- ProxyPlugin.getPlugin().getLogger().log(e.getCause(), Level.WARNING);
- } catch (IllegalAccessException e) {
- ProxyPlugin.getPlugin().getLogger().log(e, Level.WARNING);
- }
- }
- return null;
- }
-}
diff --git a/plugins/org.eclipse.jem.proxy/proxy/org/eclipse/jem/internal/proxy/core/PDEProcessForPlugin.java b/plugins/org.eclipse.jem.proxy/proxy/org/eclipse/jem/internal/proxy/core/PDEProcessForPlugin.java
deleted file mode 100644
index b77dc51..0000000
--- a/plugins/org.eclipse.jem.proxy/proxy/org/eclipse/jem/internal/proxy/core/PDEProcessForPlugin.java
+++ /dev/null
@@ -1,72 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2004, 2005 IBM Corporation and others.
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
- *
- * Contributors:
- * IBM Corporation - initial API and implementation
- *******************************************************************************/
-/*
-
-
- */
-package org.eclipse.jem.internal.proxy.core;
-
-import org.eclipse.jdt.core.IJavaProject;
-import org.eclipse.pde.core.plugin.*;
-
-import org.eclipse.jem.internal.proxy.core.ProxyPlugin.FoundIDs;
-
-
-/*
- * Used for PDE Processing for the Proxy Plugin class. It will be optionally loaded
- * if PDE plugin is installed. This allows usage in an installation that doesn't have
- * PDE installed.
- *
- * @since 1.0.2
- */
-class PDEProcessForPlugin implements ProxyPlugin.IPDEProcessForPlugin {
-
- /*
- * (non-Javadoc)
- * @see org.eclipse.jem.internal.proxy.core.ProxyPlugin.IPDEProcessForPlugin#processPlugin(org.eclipse.jdt.core.IJavaProject, java.util.Map, boolean, boolean)
- */
- public void findPlugins(IJavaProject project, FoundIDs foundIds, boolean visible, boolean first) {
- IPluginModelBase m = PluginRegistry.findModel(project.getProject());
- if (m instanceof IPluginModel) {
- // it is a plugin, process it.
- IPlugin plugin = ((IPluginModel) m).getPlugin();
- if (foundIds.pluginIds.containsKey(plugin.getId()))
- return; // already processed it
- foundIds.pluginIds.put(plugin.getId(), first || visible ? Boolean.TRUE : Boolean.FALSE);
- expandPlugin(plugin, foundIds, visible, first);
- }
- return;
- }
-
- private void expandPlugin(IPluginBase plugin, FoundIDs foundIds, boolean visible, boolean first) {
- IPluginImport[] imports = plugin.getImports();
- for (int i = 0; i < imports.length; i++) {
- IPluginImport pi = imports[i];
- Boolean piValue = (Boolean) foundIds.pluginIds.get(pi.getId());
- boolean importVisible = first || (visible && pi.isReexported());
- if (piValue != null && (!importVisible || piValue.booleanValue()))
- continue; // we already processed it, this time not visible, or this time visible and was previously visible.
- // Now either first time, or it was there before, but now visible, but this time it is visible.
- // We want it to become visible in that case.
- foundIds.pluginIds.put(pi.getId(), importVisible ? Boolean.TRUE : Boolean.FALSE);
-
- // Note: this search does not take into account the IPluginImport's version or match level
- // but neither did the previous version
- IPluginModelBase model = PluginRegistry.findModel(pi.getId());
- if (model != null && model.isEnabled()) {
- IPluginBase foundPlugin = model.getPluginBase();
- if (foundPlugin != null) {
- expandPlugin(foundPlugin, foundIds, importVisible, false);
- }
- }
- }
- }
-}
diff --git a/plugins/org.eclipse.jem.proxy/proxy/org/eclipse/jem/internal/proxy/core/ProxyFactoryRegistry.java b/plugins/org.eclipse.jem.proxy/proxy/org/eclipse/jem/internal/proxy/core/ProxyFactoryRegistry.java
deleted file mode 100644
index c87f191..0000000
--- a/plugins/org.eclipse.jem.proxy/proxy/org/eclipse/jem/internal/proxy/core/ProxyFactoryRegistry.java
+++ /dev/null
@@ -1,327 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2001, 2005 IBM Corporation and others.
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
- *
- * Contributors:
- * IBM Corporation - initial API and implementation
- *******************************************************************************/
-package org.eclipse.jem.internal.proxy.core;
-/*
-
-
- */
-
-
-import java.util.Hashtable;
-import java.util.Iterator;
-
-import org.eclipse.jem.util.TimerTests;
-
-/**
- * Registry of proxy factories on a per-VM basis.
- * There can be multiple VM's, this would be required by the
- * desktop because more than one project could be open, and each
- * would require their own VM because the classpaths would be different.
- * This class may be subclassed to provide more factories for a particular
- * VM.
- * Creation date: (3/13/00 10:48:10 AM)
- * @author: Richard Lee Kulp
- */
-public abstract class ProxyFactoryRegistry {
-
- protected boolean fIsValid = true; // The registry is valid until terminated.
- protected ListenerList registryListeners = new ListenerList();
-
- /**
- * IRegistryListener
- * Listen for the registry being terminated.
- */
- public interface IRegistryListener {
- /**
- * Method registryTerminated.
- *
- * The registry has been terminated. When this is called the registry
- * is no longer valid. It should not be assumed any calls can be made
- * to the registry.
- *
- * @param registry
- */
- public void registryTerminated(ProxyFactoryRegistry registry);
- }
-
-
- // Factory registration IS NOT a dynamic registration. Once registered for a VM or an instance
- // they should not be changed. This is because references are cached in other objects.
- // The VM associated with this Registry shouldn't exited and restarted because
- // the cached object will then have invalid references to no longer existing objects.
- // If the VM needs to be restarted, then all proxies need to be tossed.
-
- //
- // Individual ProxyFactoryRegistry, applies to a particular VM.
- //
-
- // ***************************
- //
- // IBeanProxyFactory Registry
- //
-
- // The standard bean proxy factory, the one the desktop will use for packages that have not
- // been extended and registered by customization developers.
- protected IStandardBeanProxyFactory fCurrentStandardBeanProxyFactory;
-
- // The directory of registered extension factories, typically registered by package.
- final protected Hashtable fRegisteredExtensionBeanProxyFactories = new Hashtable();
-
- // ***************************
- //
- // IBeanTypeProxyFactory Registry
- //
-
- // The standard bean type proxy factory, the one the desktop will use for packages that have not
- // been extended and registered by customization developers.
- protected IStandardBeanTypeProxyFactory fCurrentStandardBeanTypeProxyFactory;
-
- // The directory of registered extension factories, typically registered by package.
- final protected Hashtable fRegisteredExtensionBeanTypeProxyFactories = new Hashtable();
-
-
- // ***************************
- //
- // Other factories
- //
-
- protected IMethodProxyFactory fMethodProxyFactory = null; // Method Proxy Factory
-
- // ***************************
- //
- // Constants Registry. Different extensions can store
- // objects by key as a registry of constants.
- // For example, java.awt extension will store an object
- // which has some pre-fetched method proxies stored in it so
- // that they don't need to be continually recreated.
- //
- // This feature should be used with care, so that
- // only proxies that really need to be cached should
- // be cached.
- //
- // Don't store proxies to live beans in here because
- // those will be created and destroyed over and over,
- // and the instance in this cache will get stale.
- // Should only store things like often used method
- // proxies that once created are rarely changed.
- //
- // Since the proxies can be on any VM, you should have
- // an interface defining what's available in your
- // constants entry, and access it through that.
-
- protected final Hashtable fRegisteredConstants = new Hashtable();
-
- /**
- * ProxyFactoryRegistry constructor comment.
- */
- public ProxyFactoryRegistry() {
- super();
- }
-
- /**
- * Method addRegistryListener.
- * @param listener
- */
- public void addRegistryListener(IRegistryListener listener) {
- registryListeners.add(listener);
- }
-
- /**
- * Method removeRegistryListener.
- * @param listener
- */
- public void removeRegistryListener(IRegistryListener listener) {
- registryListeners.remove(listener);
- }
-
- protected void fireRegistryTerminated() {
- if (!registryListeners.isEmpty()) {
- Object[] list = registryListeners.getListeners();
- for (int i = 0; i < list.length; i++) {
- ((IRegistryListener) list[i]).registryTerminated(this);
- }
- }
- }
-
- /**
- Return the current factory to be used for creating IBeanProxy instances
- */
- public IStandardBeanProxyFactory getBeanProxyFactory() {
- if (fCurrentStandardBeanProxyFactory == null) {
- throw new RuntimeException(ProxyMessages.ProxyFactory_EXC__NoBeanProxyFactory);
- }
- return fCurrentStandardBeanProxyFactory;
- }
- /**
- Return the current registered bean proxy factory to be used for creating IBeanProxy instances
- */
- public IBeanProxyFactory getBeanProxyFactoryExtension(String packageName) {
- return (IBeanProxyFactory)fRegisteredExtensionBeanProxyFactories.get(packageName);
- }
-
- /**
- Return the current factory to be used for creating IBeanTypeProxy instances
- */
- public IStandardBeanTypeProxyFactory getBeanTypeProxyFactory() {
- if (fCurrentStandardBeanTypeProxyFactory == null) {
- throw new RuntimeException(ProxyMessages.ProxyFactory_EXC__NoBeanTypeProxyFactory);
- }
- return fCurrentStandardBeanTypeProxyFactory;
- }
- /**
- Return the current registered bean type proxy factory to be used for creating IBeanTypeProxy instances
- */
- public IBeanTypeProxyFactory getBeanTypeProxyFactoryExtension(String packageName) {
- return (IBeanTypeProxyFactory)fRegisteredExtensionBeanTypeProxyFactories.get(packageName);
- }
- /**
- * Return the requested constants entry
- */
- public Object getConstants(Object key) {
- return fRegisteredConstants.get(key);
- }
- /**
- * Return the MethodProxyFactory for this VM.
- * Creation date: (3/13/00 10:54:59 AM)
- * @return org.eclipse.jem.internal.proxy.core.IMethodProxyFactory
- */
- public IMethodProxyFactory getMethodProxyFactory() {
- return fMethodProxyFactory;
- }
-
-
- /**
- * Set the requested constants entry for this VM.
- */
- public void registerConstants(Object key, Object constant) {
- fRegisteredConstants.put(key, constant);
- }
-
- /**
- * Remove the constants for the given key.
- * @param key
- *
- * @since 1.1.0
- */
- public void deregisterConstants(Object key) {
- fRegisteredConstants.remove(key);
- }
- /**
- * Release the proxy, no longer needed.
- * This is a helper method to easily access the release from the bean proxy factory.
- */
- public void releaseProxy(IBeanProxy proxy) {
- // To simply things if release is called when the factory is down (invalid), then just
- // go on because the proxy is already released.
- if (fCurrentStandardBeanProxyFactory != null)
- fCurrentStandardBeanProxyFactory.releaseProxy(proxy);
- }
-
- /**
- * Is this a valid registry, i.e. is it not terminated.
- */
- public boolean isValid() {
- return fIsValid;
- }
-
- /**
- * Terminate the registry without waiting.
- * <p>
- * Terminate the registry, but don't necessarily wait for it.
- *
- * @see #terminateRegistry(boolean)
- * @since 1.0.0
- */
- public final void terminateRegistry() {
- terminateRegistry(false);
- }
-
- /**
- * Terminate the registry.
- * <p>
- * This will go through each factory and terminate it, and
- * let the subclass terminate. It will then remove all of the factories so that
- * if there are any proxies still hanging around they won't hold onto everything,
- * just the this registry will be held onto.
- *<p>
- * Note during termination, the factories should not reference any other factory.
- * It can assume that the factories will take care of themselves and they should
- * only release their resources.
- * <p>
- * The constants registry will not be terminated because they aren't factories.
- * However, they will be cleared (no longer referenced) from here so that they
- * can be GC'd.
- *
- * @param wait <code>true</code> to wait for complete termination, <code>false</code> to kick off termination but return ASAP.
- * @since 1.0.2
- */
- public final void terminateRegistry(boolean wait) {
- if (!fIsValid)
- return; // Already or are already terminating. Don't do it again and don't notify again.
- fIsValid = false;
- if (fCurrentStandardBeanTypeProxyFactory != null) {
-// TimerTests.basicTest.startStep("Terminate Bean Type Factory");
- fCurrentStandardBeanTypeProxyFactory.terminateFactory(wait);
-// TimerTests.basicTest.stopStep("Terminate Bean Type Factory");
- fCurrentStandardBeanTypeProxyFactory = null;
- }
- if (fCurrentStandardBeanProxyFactory != null) {
- fCurrentStandardBeanProxyFactory.terminateFactory(wait);
- fCurrentStandardBeanProxyFactory = null;
- }
- if (fMethodProxyFactory != null) {
- fMethodProxyFactory.terminateFactory(wait);
- fMethodProxyFactory = null;
- }
-
- Iterator itr = fRegisteredExtensionBeanTypeProxyFactories.values().iterator();
- while (itr.hasNext()) {
- ((IBeanProxyFactory) itr.next()).terminateFactory(wait);
- }
- fRegisteredExtensionBeanTypeProxyFactories.clear();
-
- itr = fRegisteredExtensionBeanProxyFactories.values().iterator();
- while (itr.hasNext()) {
- ((IBeanProxyFactory) itr.next()).terminateFactory(wait);
- }
- fRegisteredExtensionBeanProxyFactories.clear();
-
- fRegisteredConstants.clear();
-
- TimerTests.basicTest.startStep("Registry Terminated"); //$NON-NLS-1$
- registryTerminated(wait);
- TimerTests.basicTest.stopStep("Registry Terminated"); //$NON-NLS-1$
-
-// TimerTests.basicTest.startStep("Registry Terminated Notification");
- fireRegistryTerminated(); // Let everyone know that we are gone. This is fired even if wait is false because at this point in time the registry is invalid.
-// TimerTests.basicTest.stopStep("Registry Terminated Notification");
- }
-
-
- /**
- * Terminate the Registry.
- * <p>
- * It is up to each registry to determine what this means.
- * <p>
- * The wait parm is a suggestion if it is <code>false</code>, but it must be honoured if <code>true</code>
- *
- * @param wait wait for registry to terminate flag.
- *
- * @since 1.0.2
- */
- protected abstract void registryTerminated(boolean wait);
-
- /**
- * Get the callback registry.
- */
- public abstract ICallbackRegistry getCallbackRegistry();
-
-}
diff --git a/plugins/org.eclipse.jem.proxy/proxy/org/eclipse/jem/internal/proxy/core/ProxyFindSupport.java b/plugins/org.eclipse.jem.proxy/proxy/org/eclipse/jem/internal/proxy/core/ProxyFindSupport.java
deleted file mode 100644
index fe977cf..0000000
--- a/plugins/org.eclipse.jem.proxy/proxy/org/eclipse/jem/internal/proxy/core/ProxyFindSupport.java
+++ /dev/null
@@ -1,209 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2005, 2006 IBM Corporation and others.
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
- *
- * Contributors:
- * IBM Corporation - initial API and implementation
- *******************************************************************************/
-/*
-
-
- */
-package org.eclipse.jem.internal.proxy.core;
-
-import java.io.*;
-import java.net.URL;
-import java.util.ArrayList;
-import java.util.Properties;
-
-import org.eclipse.core.runtime.*;
-import org.osgi.framework.Bundle;
-
-
-/**
- * Utility to help finding files. It is used to find them within plugins of the current platform or to find them in the PDE target platform.
- * Also if in the current platform and the current platform is in development mode it will find the bin directories for the jars instead since
- * there are no jars in that case.
- * It can also extract non-local files (such as files within a jar) and make a cache of them so that are a local file and not extracted everytime
- * they are needed.
- *
- * TODO If we ever get back to continuing development we should add to this PDE Target support. And test the code here
- * since it hasn't been tested yet. Also note that in configuration contributor,
- * when we add the library path we expect it to be a folder. This would be a problem with jarred plugins because the directory containing the
- * libraries may be the root of the plugin and localizing a directory would extract and cache the entire plugin. Need to change to figure out
- * how to only extract the dll/so needed instead. Also, none of these handle the case where the bundle is actually non-local (e.g. "http:/").
- * @since 1.2.0
- */
-public class ProxyFindSupport {
-
-
- /**
- * Find the filename relative to the platform bundle. It will search in the bundle and in all fragments for the file name.
- * It will return a URL for each found file.
- * <p>
- * This is useful for NLS purposes. In NLS situations the main bundle would contain the main non-library jar with the default properties files.
- * Then a fragment for each set of languages will be installed. Within each fragment will be a jar with the same filepath, and it will
- * contain the properties files for that language. This would be done only for plugin non-library jars.
- * The NLS for library jars of a plugin (i.e. those jars that are the <runtime> jars for the plugin) are usually library jars themselves in
- * the fragment, and they usually have a different name than the main library jar. So this should not be used for library jars.
- * <p>
- * If in development mode, then if the jar is not found it will look in the plugin project's build.properties to find the output directory
- * of the jar. If not in the build.properties (meaning it isn't being built by PDE), it will look in the proxy.jars file (if there is one).
- * This file is used for jars that are built in a separate project from the plugin but will be found in the plugin at execution.
- *
- * @param bundle bundle and its fragments to look in.
- * @param filenameWithinBundle path to filename within the bundle and fragments. <b>This must be a file, not a directory.</b>
- * For finding the bundle itself (only when the bundle is packaged as a jar), use <@link #platformFind(Bundle)>. This does not use
- * the platform shortcuts like "$os$". It finds the files exactly as specified.
- * @param asLocal <code>true</code> if the urls need to point to local filesystem files. This may cause caching of files locally. This
- * could happen if the file is within a plugin that is jarred. <code>false</code> if the url can be a non-local filesystem url.
- * @return array of URL's for found files.
- *
- * @since 1.2.0
- */
- public static URL[] platformFindAll(Bundle bundle, IPath filenameWithinBundle, boolean asLocal) {
- Bundle[] fragments = Platform.getFragments(bundle);
- ArrayList urls = new ArrayList((fragments == null ? 0 : fragments.length) + 1);
- String filename = filenameWithinBundle.toString();
- URL url = internalFindFromBundleOnly(bundle, filename, asLocal);
- if (url != null)
- urls.add(url);
- if (fragments != null) {
- for (int i = 0; i < fragments.length; i++) {
- Bundle fragment = fragments[i];
- url = internalFindFromBundleOnly(fragment, filename, asLocal);
- if (url != null)
- urls.add(url);
- }
- }
- return (URL[]) urls.toArray(new URL[urls.size()]);
- }
-
- /**
- * @param bundle
- * @param filenameWithinBundle
- * @param asLocal
- * @return
- *
- * @since 1.2.0
- */
- private static URL internalFindFromBundleOnly(Bundle bundle, String filenameWithinBundle, boolean asLocal) {
- try {
- URL pvm = bundle.getEntry(filenameWithinBundle);
- if (pvm != null)
- return asLocal ? FileLocator.toFileURL(pvm) : pvm;
- } catch (IOException e) {
- }
- if (ProxyPlugin.getPlugin().isDevMode()) {
- return findDev(bundle, filenameWithinBundle, asLocal);
- } else
- return null;
- }
-
- /**
- * Find the filename relative to the platform bundle. It will search in the bundle and in all fragments for the file name. It will return
- * URL for the file if found.
- * <p>
- * If in development mode, then if the jar is not found it will look in the plugin project's build.properties to find the output directory
- * of the jar. If not in the build.properties (meaning it isn't being built by PDE), it will look in the proxy.jars file (if there is one).
- * This file is used for jars that are built in a separate project from the plugin but will be found in the plugin at execution.
- *
- * @param bundle bundle and its fragments to look in.
- * @param filenameWithinBundle path to filename within the bundle and fragments. <b>This must be a file, not a directory.</b>
- * For finding the bundle itself (only when the bundle is packaged as a jar), use <@link #platformFind(Bundle)>.
- * @param asLocal <code>true</code> if the urls need to point to local filesystem files. This may cause caching of files locally. This
- * could happen if the file is within a plugin that is jarred. <code>false</code> if the url can be a non-local filesystem url.
- * @return the found url or <code>null</code> if not found.
- *
- * @since 1.2.0
- */
- public static URL platformFind(Bundle bundle, IPath filenameWithinBundle, boolean asLocal) {
- try {
- URL pvm = FileLocator.find(bundle, filenameWithinBundle, null);
- if (pvm != null)
- return asLocal ? FileLocator.toFileURL(pvm) : pvm;
- } catch (IOException e) {
- }
- if (ProxyPlugin.getPlugin().isDevMode()) {
- return findDev(bundle, filenameWithinBundle.toString(), asLocal);
- } else
- return null;
-
- }
-
- private static final String BUILDPROPERTIES = "build.properties"; //$NON-NLS-1$
- private static final String PROXYJARS = "proxy.jars"; //$NON-NLS-1$
-
- private static URL findDev(Bundle bundle, String filenameWithinBundle, boolean asLocal) {
- // Got this far and in dev mode means it wasn't found, so we'll try for development style.
- // It is assumed that in dev mode, we are running with the IDE as local and any
- // build outputs will be local so local file protocol will be returned
- // from Platform.resolve(). We won't be running in dev mode with our entireplugin being in a jar,
- // or on a separate system.
- try {
- URL bp = bundle.getEntry(BUILDPROPERTIES);
- if (bp != null) {
- InputStream ios = null;
- try {
- ios = bp.openStream();
- Properties props = new Properties();
- props.load(ios);
- String pathString = props.getProperty("output."+filenameWithinBundle.toString()); //$NON-NLS-1$
- if (pathString != null) {
- URL pvm = bundle.getEntry(pathString);
- if (pvm != null)
- return asLocal ? FileLocator.toFileURL(pvm) : pvm;
- }
- } finally {
- if (ios != null)
- ios.close();
- }
- }
- } catch (IOException e) {
- }
-
- try {
- URL pvm = bundle.getEntry(PROXYJARS);
- if (pvm != null) {
- InputStream ios = null;
- try {
- ios = pvm.openStream();
- Properties props = new Properties();
- props.load(ios);
- String pathString = props.getProperty(filenameWithinBundle.toString());
- if (pathString != null) {
- URL url = FileLocator.resolve(bundle.getEntry("/")); // It is assumed that if in debug mode, then this plugin is an imported plugin within the developement workspace. //$NON-NLS-1$
- if (url.getProtocol().equals("file")) { //$NON-NLS-1$
- File file = new File(url.getFile()).getParentFile(); // This gets us to workspace root of development workspace.
- file = new File(file, pathString);
- return file.toURL();
- }
- }
- } finally {
- if (ios != null)
- ios.close();
- }
- }
- } catch (IOException e) {
- }
- return null;
- }
-
-
- /**
- * Find the bundle and all active fragments libraries. This should normally be used only when the bundle is packaged as a jar and not as a directory. It will
- * return the urls to the jars of the bundle and fragments. If in development mode it will find the bundle's "." output directory.
- * @param bundle
- * @return array of URL's for the jarred bundle and fragments. If the bundle/fragments are not packaged as jars, then the array will be empty.
- *
- * @since 1.2.0
- */
- public static URL[] platformFind(Bundle bundle) {
- return null;
- }
-
-
-}
diff --git a/plugins/org.eclipse.jem.proxy/proxy/org/eclipse/jem/internal/proxy/core/ProxyLaunchSupport.java b/plugins/org.eclipse.jem.proxy/proxy/org/eclipse/jem/internal/proxy/core/ProxyLaunchSupport.java
deleted file mode 100644
index 4a18afb..0000000
--- a/plugins/org.eclipse.jem.proxy/proxy/org/eclipse/jem/internal/proxy/core/ProxyLaunchSupport.java
+++ /dev/null
@@ -1,871 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2004, 2006 IBM Corporation and others.
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
- *
- * Contributors:
- * IBM Corporation - initial API and implementation
- *******************************************************************************/
-/*
-
-
- */
-package org.eclipse.jem.internal.proxy.core;
-
-import java.io.File;
-import java.net.MalformedURLException;
-import java.net.URL;
-import java.text.MessageFormat;
-import java.util.*;
-import java.util.logging.Level;
-
-import org.eclipse.core.resources.*;
-import org.eclipse.core.runtime.*;
-import org.eclipse.core.runtime.jobs.IJobManager;
-import org.eclipse.core.runtime.jobs.Job;
-import org.eclipse.debug.core.*;
-import org.eclipse.jdt.core.*;
-import org.eclipse.jdt.launching.IJavaLaunchConfigurationConstants;
-import org.osgi.framework.Bundle;
-
-import org.eclipse.jem.internal.proxy.core.IConfigurationContributionInfo.ContainerPaths;
-import org.eclipse.jem.internal.proxy.core.ProxyPlugin.FoundIDs;
-import org.eclipse.jem.util.PerformanceMonitorUtil;
-import org.eclipse.jem.util.TimerTests;
-
-
-/**
- * This is the used to launch the proxy registries.
- * This is a static helper class, it is not meant to be instantiated.
- *
- * @since 1.0.0
- */
-public class ProxyLaunchSupport {
-
- // The key for the persisten property is in ProxyPlugin so that it can set it on startup without
- // causing this class to be initialized. We don't want this class initialized until the very last
- // moment when needed. This is because it needs UI to be active when initialized to query some
- // values and if ProxyPlugin.start() causes this class to initialize, it may be too soon.
- //
- // If a project's persistent property is set with this value, that means there is at least one
- // launch configuration with this project, but none are selected as the default. This is here
- // so that we can check in the object contribution that if not set then don't show the menu
- // item at all. This is to clean up the popup menu so not so cluttered.
- // If the property is trully not set, then there is no default and there are no configurations for it.
- public static final String NOT_SET = "...not..set.."; //$NON-NLS-1$
-
- public static final String EXPRESSION_TRACING = "/debug/traceexpressions"; // Trace IExpressions. //$NON-NLS-1$
-
- /**
- * Timer threshold for indicating any expressions that took longer than this.
- * If not set, then threshold will default to 100ms.
- * It will only be used if traceexpressions is true.
- */
- public static final String EXPRESSION_TRACEING_TIMER_THRESHOLD = "/debug/traceexpressionstimethreshold"; //$NON-NLS-1$
-
- /*
- * Registry of launch key to LaunchInfo classes.
- */
- private static Map LAUNCH_INFO = new HashMap(2);
-
- /**
- * Public only for access by other launch delegates to set up if they go outside of ProxyLaunchSupport,
- * e.g. IDE proxy. Must not be used for any purpose.
- *
- * @since 1.0.0
- */
- public static class LaunchSupportIConfigurationContributionInfo implements IConfigurationContributionInfo {
-
- /**
- * Construct with no settings. This is to be used by other launch delegates that
- * don't have a {@link FoundIDs} available to fill in the fields. Those
- * delegates must fill the fields themselves.
- *
- *
- * @since 1.2.0
- */
- public LaunchSupportIConfigurationContributionInfo(IJavaProject javaProject) {
- this.javaProject = javaProject;
- }
-
- public LaunchSupportIConfigurationContributionInfo(IJavaProject javaProject, FoundIDs foundIDs) {
- this(javaProject);
- containerIds = foundIDs.containerIds;
- containers = foundIDs.containers;
- pluginIds = foundIDs.pluginIds;
- projectPaths = foundIDs.projects;
- }
-
- /* (non-Javadoc)
- * Map of containers (IClasspathContainer) found in classpath (including required projects).
- * This is for each project found. If there was a container in more than one project with the
- * id, this set will contain the container from each such project. They are not considered the
- * same because they come from a different project.
- * <p>
- * The key will be the containers, and the value will be a <code>Boolean</code>, where true means it
- * is visible to the top-level project.
- * <p>
- * This is used for determining if a project's container implements the desired contributor.
- *
- * Will be empty if no project sent in to launch configuration.
- *
- * @see org.eclipse.jdt.core.IClasspathContainer
- *
- */
- public Map containers = Collections.EMPTY_MAP;
-
-
- /* (non-Javadoc)
- * Map of unique container id strings found in classpath (including required projects).
- * If a container with the same id was found in more than one project, only one id will
- * be in this set since they are the same.
- * <p>
- * The key will be the container ids, and the value will be ContainerPaths
- *
- * Will be empty if no project sent in to launch configuration.
- *
- */
- public Map containerIds = Collections.EMPTY_MAP;
-
- /* (non-Javadoc)
- * Set of unique plugin id strings found in classpath (including required projects).
- * If a required plugin with the same id was found in more than one project, only one id will
- * be in this set since they are the same.
- * <p>
- * The key will be the plugin ids, and the value will be a <code>Boolean</code>, where true means it
- * is visible to the top-level project.
- *
- * Will be empty if no project sent in to launch configuration.
- */
- public Map pluginIds = Collections.EMPTY_MAP;;
-
- /* (non-Javadoc)
- * Map of unique projects found in classpath (including required projects), but not including top-level project.
- * <p>
- * The key will be the <code>IPath</code> for the project, and the value will be a <code>Boolean</code>, where true means it
- * is visible to the top-level project.
- *
- * Will be <code>null</code> if no project sent in to launch configuration.
- */
- public Map projectPaths;
-
- /* (non-Javadoc)
- * Java project for this launch. <code>null</code> if not for a project.
- */
- public IJavaProject javaProject;
-
- /* (non-Javadoc)
- * @see org.eclipse.jem.internal.proxy.core.IConfigurationContributionInfo#getContainerIds()
- */
- public Map getContainerIds() {
- return containerIds;
- }
- /* (non-Javadoc)
- * @see org.eclipse.jem.internal.proxy.core.IConfigurationContributionInfo#getContainers()
- */
- public Map getContainers() {
- return containers;
- }
-
- /* (non-Javadoc)
- * @see org.eclipse.jem.internal.proxy.core.IConfigurationContributionInfo#getJavaProject()
- */
- public IJavaProject getJavaProject() {
- return javaProject;
- }
- /* (non-Javadoc)
- * @see org.eclipse.jem.internal.proxy.core.IConfigurationContributionInfo#getPluginIds()
- */
- public Map getPluginIds() {
- return pluginIds;
- }
- /* (non-Javadoc)
- * @see org.eclipse.jem.internal.proxy.core.IConfigurationContributionInfo#getProjectPaths()
- */
- public Map getProjectPaths() {
- return projectPaths;
- }
-
- }
-
- /**
- * LaunchInfo for a launch. Stored by key and retrievable by the key.
- * This is only passed to launch delegates. It should not be passed on to
- * others, though the IConfigurationContributionInfo may be.
- *
- * <p>
- * This class is not intended to be subclassed by clients.
- * </p>
- *
- * @see ProxyLaunchSupport#getInfo(String)
- * @see IConfigurationContributionInfo
- * @since 1.0.0
- */
- public static class LaunchInfo {
- /**
- * Contributors for this launch. It will never be <code>null</code>. It may be empty.
- */
- public IConfigurationContributor[] contributors;
-
- /**
- * The registry returned from the launch. The launch needs to set this before it returns.
- */
- public ProxyFactoryRegistry resultRegistry;
-
-
- /* (non-Javadoc)
- * @see org.eclipse.jem.internal.proxy.core.IConfigurationContributionInfo#getJavaProject()
- */
- public IJavaProject getJavaProject() {
- return configInfo.getJavaProject();
- }
-
- /**
- * Return the IConfigurationContributionInfo for this launch.
- * @return
- *
- * @since 1.0.0
- */
- public IConfigurationContributionInfo getConfigInfo() {
- return configInfo;
- }
-
- protected IConfigurationContributionInfo configInfo;
-
- }
-
- /**
- * Start an implementation using the default config for the given project.
- * <p>
- * This will wait for build. If you
- * know the build has been suspended by your thread, then you must use the other method that takes a waitForThread
- * boolean, and you must pass in false. Otherwise it will deadlock.
- *
- * @param project The project. It must be a java project, and it cannot be <code>null</code>.
- * @param vmTitle title for VM. It may be <code>null</code>.
- * @param aContribs The contributions array. It may be <code>null</code>.
- * @param pm
- * @return The created registry.
- * @throws CoreException
- *
- * @see ProxyLaunchSupport#startImplementation(IProject, String, IConfigurationContributor[], boolean, IProgressMonitor)
- * @since 1.0.0
- */
- public static ProxyFactoryRegistry startImplementation(
- IProject project,
- String vmTitle,
- IConfigurationContributor[] aContribs,
- IProgressMonitor pm)
- throws CoreException {
- return startImplementation(project, vmTitle, aContribs, true, pm);
- }
-
- /**
- * Start an implementation using the default config for the given project.
- * <p>
- * If you know the build has been suspended by your thread, then you must use call this with false for waitForThread. Otherwise it will deadlock.
- *
- * @param project The project. It must be a java project, and it cannot be <code>null</code>.
- * @param vmTitle title for VM. It may be <code>null</code>.
- * @param aContribs The contributions array. It may be <code>null</code>.
- * @param waitForBuild wait for the build. If caller knows that the build has been suspended by this thread, then it must call this with false. Otherwise a deadlock will occur.
- * @param pm
- * @return The created registry.
- * @throws CoreException
- *
- * @since 1.0.0
- */
- public static ProxyFactoryRegistry startImplementation(
- IProject project,
- String vmTitle,
- IConfigurationContributor[] aContribs,
- boolean waitForBuild,
- IProgressMonitor pm)
- throws CoreException {
- // First find the appropriate launch configuration to use for this project.
- // The process is:
- // 1) See if the project's persistent property has a setting for "proxyLaunchConfiguration", if it does,
- // get the configuration of that name and create a working copy of it.
- // 2) If not, then get the "org.eclipse.jem.proxy.LocalProxyLaunchConfigurationType"
- // and create a new instance working copy.
-
- IJavaProject javaProject = JavaCore.create(project);
- if (javaProject == null) {
- throw new CoreException(
- new Status(
- IStatus.WARNING,
- ProxyPlugin.getPlugin().getBundle().getSymbolicName(),
- 0,
- MessageFormat.format(
- ProxyMessages.Not_Java_Project_WARN_,
- new Object[] { project.getName()}),
- null));
- }
-
- // First if specific set.
- String launchName = project.getPersistentProperty(ProxyPlugin.PROPERTY_LAUNCH_CONFIGURATION);
- ILaunchConfiguration config = null;
- if (launchName != null && !NOT_SET.equals(launchName)) {
- ILaunchConfiguration[] configs = DebugPlugin.getDefault().getLaunchManager().getLaunchConfigurations();
- for (int i = 0; i < configs.length; i++) {
- if (configs[i].getName().equals(launchName)) {
- config = configs[i];
- break;
- }
- }
- if (config == null || !config.getAttribute(IJavaLaunchConfigurationConstants.ATTR_PROJECT_NAME, "").equals(project.getName())) { //$NON-NLS-1$
- project.setPersistentProperty(ProxyPlugin.PROPERTY_LAUNCH_CONFIGURATION, (String) null); // Config not found, or for a different project, so no longer the default.
- config = null;
- }
- }
-
- if (config == null) {
- ILaunchConfigurationWorkingCopy configwc = DebugPlugin.getDefault().getLaunchManager().getLaunchConfigurationType(IProxyConstants.LOCAL_LAUNCH_TYPE).newInstance(null, DebugPlugin.getDefault().getLaunchManager().generateUniqueLaunchConfigurationNameFrom("LocalProxy_"+project.getName())); //$NON-NLS-1$
- configwc.setAttribute(IJavaLaunchConfigurationConstants.ATTR_PROJECT_NAME, project.getName());
- config = configwc;
- }
-
- return startImplementation(config, vmTitle, aContribs, waitForBuild, pm);
- }
-
- /**
- * Launch a registry using the given configuration.
- * <p>
- * This will wait for build. If you
- * know the build has been suspended by your thread, then you must use the other method that takes a waitForThread
- * boolean, and you must pass in false. Otherwise it will deadlock.
- *
- * @param config
- * @param vmTitle title for VM. It may be <code>null</code>.
- * @param aContribs The contributions array. It may be <code>null</code>.
- * @param pm
- * @return The registry from this configuration.
- * @throws CoreException
- *
- * @see ProxyLaunchSupport#startImplementation(ILaunchConfiguration, String, IConfigurationContributor[], boolean, IProgressMonitor)
- * @since 1.0.0
- */
- public static ProxyFactoryRegistry startImplementation(
- ILaunchConfiguration config,
- String vmTitle,
- IConfigurationContributor[] aContribs,
- IProgressMonitor pm)
- throws CoreException {
- return startImplementation(config, vmTitle, aContribs, true, pm);
- }
-
- /**
- * Launch a registry using the given configuration.
- * <p>
- * If you know the build has been suspended by your thread, then you must use you must pass in false for waitForThread. Otherwise it will deadlock.
- *
- * @param config
- * @param vmTitle title for VM. It may be <code>null</code>.
- * @param aContribs The contributions array. It may be <code>null</code>.
- * @param waitForBuild wait for the build. If caller knows that the build has been suspended by this thread, then it must call this with false. Otherwise a deadlock will occur.
- * @param pm
- * @return The registry from this configuration.
- * @throws CoreException
- *
- * @since 1.0.0
- */
- public static ProxyFactoryRegistry startImplementation(
- ILaunchConfiguration config,
- String vmTitle,
- IConfigurationContributor[] aContribs,
- boolean waitForBuild,
- IProgressMonitor pm)
- throws CoreException {
-
- if (pm == null)
- pm = new NullProgressMonitor();
- String stepId = "Pre-launch VM ( " + vmTitle + " )"; //$NON-NLS-1$ //$NON-NLS-2$
- TimerTests.basicTest.startStep(stepId);
- if (vmTitle.equals("Beaninfo")) //$NON-NLS-1$
- PerformanceMonitorUtil.getMonitor().snapshot(125);
- final ILaunchConfigurationWorkingCopy configwc = config.getWorkingCopy();
-
- pm.beginTask("", 400); //$NON-NLS-1$
- pm.subTask(ProxyMessages.ProxyLaunch);
- if (waitForBuild) {
- // See if build needed or waiting or inprogress, if so, wait for it to complete. We've
- // decided too difficult to determine if build would affect us or not, so just wait.
- if (UI_RUNNER != null)
- UI_RUNNER.handleBuild(new SubProgressMonitor(pm, 100));
- else
- runBuild(new SubProgressMonitor(pm, 100));
-
- if (pm.isCanceled())
- return null;
- }
-
- if (aContribs != null) {
- IConfigurationContributor[] newContribs = new IConfigurationContributor[aContribs.length+1];
- System.arraycopy(aContribs, 0, newContribs, 1, aContribs.length);
- newContribs[0] = new ProxyContributor();
- aContribs = newContribs;
- } else
- aContribs = new IConfigurationContributor[] {new ProxyContributor()};
-
- String launchKey = String.valueOf(System.currentTimeMillis());
- LaunchInfo launchInfo = new LaunchInfo();
- synchronized (ProxyLaunchSupport.class) {
- while (LAUNCH_INFO.containsKey(launchKey)) {
- launchKey += 'a'; // Just add something on to make it unique.
- }
- LAUNCH_INFO.put(launchKey, launchInfo);
- }
-
- String projectName = configwc.getAttribute(IJavaLaunchConfigurationConstants.ATTR_PROJECT_NAME, (String) null);
- aContribs = fillInLaunchInfo(aContribs, launchInfo, projectName);
-
- try {
- configwc.setAttribute(IProxyConstants.ATTRIBUTE_LAUNCH_KEY, launchKey);
- if (vmTitle != null && vmTitle.length()>0)
- configwc.setAttribute(IProxyConstants.ATTRIBUTE_VM_TITLE, vmTitle);
-
- if (ATTR_PRIVATE != null)
- configwc.setAttribute(ATTR_PRIVATE, true);
-
- // Let contributors modify the configuration.
- final IConfigurationContributor[] contribs = aContribs;
- final LaunchInfo linfo = launchInfo;
- for (int i = 0; i < contribs.length; i++) {
- // First run the initialize.
- // Run in safe mode so that anything happens we don't go away.
- final int ii = i;
- SafeRunner.run(new ISafeRunnable() {
- public void handleException(Throwable exception) {
- // Don't need to do anything. Platform.run logs it for me.
- }
-
- public void run() throws Exception {
- contribs[ii].initialize(linfo.getConfigInfo());
- }
- });
-
- // Now run the contribute to configuration.
- // Run in safe mode so that anything happens we don't go away.
- SafeRunner.run(new ISafeRunnable() {
- public void handleException(Throwable exception) {
- // Don't need to do anything. Platform.run logs it for me.
- }
-
- public void run() throws Exception {
- contribs[ii].contributeToConfiguration(configwc);
- }
- });
- }
- pm.worked(100);
-
- configwc.launch(ILaunchManager.RUN_MODE, new SubProgressMonitor(pm, 100));
-
- final ProxyFactoryRegistry reg = launchInfo.resultRegistry;
- if (!pm.isCanceled() && reg == null)
- throw new CoreException(new Status(IStatus.WARNING, ProxyPlugin.getPlugin().getBundle().getSymbolicName(), 0, ProxyMessages.ProxyLaunchSupport_RegistryCouldNotStartForSomeReason_WARN_, null));
- if (pm.isCanceled()) {
- if (reg != null)
- reg.terminateRegistry();
- return null;
- }
-
- performExtensionRegistrations((BaseProxyFactoryRegistry) reg, launchInfo);
-
-// TimerTests.basicTest.startStep("contribute to registry");
- for (int i = 0; i < contribs.length; i++) {
- final int ii = i;
- // Run in safe mode so that anything happens we don't go away.
- SafeRunner.run(new ISafeRunnable() {
- public void handleException(Throwable exception) {
- // Don't need to do anything. Platform.run logs it for me.
- }
-
- public void run() throws Exception {
-// String stepid = "contribute to registry for " + contribs[ii].getClass();
-// TimerTests.basicTest.startStep(stepid);
- contribs[ii].contributeToRegistry(reg);
-// TimerTests.basicTest.stopStep(stepid);
- }
- });
- }
-// TimerTests.basicTest.stopStep("contribute to registry");
- } finally {
- // Clean up and return.
- LAUNCH_INFO.remove(launchKey);
- }
-
- pm.done();
- if (vmTitle.equals("Beaninfo")) //$NON-NLS-1$
- PerformanceMonitorUtil.getMonitor().snapshot(126);
- TimerTests.basicTest.stopStep(stepId);
- return launchInfo.resultRegistry;
- }
-
- /**
- * Create a default IConfigurationContributionInfo for the given project. This is useful info even when not launching a
- * vm.
- *
- * @param javaProject
- * @return new contrib info.
- * @throws JavaModelException
- *
- * @since 1.1.0
- */
- public static IConfigurationContributionInfo createDefaultConfigurationContributionInfo(IJavaProject javaProject) throws JavaModelException {
- LaunchSupportIConfigurationContributionInfo configInfo = new LaunchSupportIConfigurationContributionInfo(javaProject,
- ProxyPlugin.getPlugin().getIDsFound(javaProject));
- return configInfo;
-
- }
-
- /**
- * Use in calling {@link ProxyLaunchSupport#fillInLaunchInfo(IConfigurationContributor[], LaunchInfo, String)} for the configuration
- * contributors array if there are no incoming contributors.
- *
- * @since 1.1.0
- */
- public static final IConfigurationContributor[] EMPTY_CONFIG_CONTRIBUTORS = new IConfigurationContributor[0];
- /**
- * Fill in the launch info config info and contribs. The contribs sent in may be expanded due to extension
- * points and a new one created. Either the expanded copy or the original (if no change) will be stored in
- * the launchinfo and returned from this call.
- *
- * @param aContribs this should never be <code>null</code>. Pass in {@link ProxyLaunchSupport#EMPTY_CONFIG_CONTRIBUTORS} in that case.
- * @param launchInfo
- * @param projectName
- * @return a modified aContribs if any change was made to it. This will never be <code>null</code>. It will return an empty list if aContribs was null and no changes were made.
- * @throws JavaModelException
- * @throws CoreException
- *
- * @since 1.0.0
- */
- public static IConfigurationContributor[] fillInLaunchInfo(IConfigurationContributor[] aContribs, LaunchInfo launchInfo, String projectName) throws JavaModelException, CoreException {
- if (projectName != null) {
- projectName = projectName.trim();
- if (projectName.length() > 0) {
- IProject project = ResourcesPlugin.getWorkspace().getRoot().getProject(projectName);
- IJavaProject javaProject = JavaCore.create(project);
- if (javaProject != null && javaProject.exists()) {
- launchInfo.configInfo = createDefaultConfigurationContributionInfo(javaProject);
- if (!launchInfo.configInfo.getContainerIds().isEmpty() || !launchInfo.configInfo.getContainers().isEmpty() || !launchInfo.configInfo.getPluginIds().isEmpty()) {
- List computedContributors = new ArrayList(launchInfo.configInfo.getContainerIds().size()+launchInfo.configInfo.getContainers().size()+launchInfo.configInfo.getPluginIds().size());
- // Note: We don't care about the visibility business here. For contributors to proxy it means
- // some classes in the projects/plugins/etc. need configuration whether they are visible or not.
- // This is because even though not visible, some other visible class may instantiate it. So it
- // needs the configuration.
- // First handle explicit classpath containers that implement IConfigurationContributor
- for (Iterator iter = launchInfo.configInfo.getContainers().keySet().iterator(); iter.hasNext();) {
- IClasspathContainer container = (IClasspathContainer) iter.next();
- if (container instanceof IConfigurationContributor)
- computedContributors.add(container);
- }
-
- // Second add in contributors that exist for a container id.
- for (Iterator iter = launchInfo.configInfo.getContainerIds().values().iterator(); iter.hasNext();) {
- ContainerPaths paths = (ContainerPaths) iter.next();
- IConfigurationElement[] contributors = ProxyPlugin.getPlugin().getContainerConfigurations(paths.getContainerId(), paths.getAllPaths());
- if (contributors != null)
- for (int i = 0; i < contributors.length; i++) {
- Object contributor = contributors[i].createExecutableExtension(ProxyPlugin.PI_CLASS);
- if (contributor instanceof IConfigurationContributor)
- computedContributors.add(contributor);
- }
- }
-
- // Finally add in contributors that exist for a plugin id.
- for (Iterator iter = launchInfo.configInfo.getPluginIds().keySet().iterator(); iter.hasNext();) {
- String pluginId = (String) iter.next();
- IConfigurationElement[] contributors = ProxyPlugin.getPlugin().getPluginConfigurations(pluginId);
- if (contributors != null)
- for (int i = 0; i < contributors.length; i++) {
- Object contributor = contributors[i].createExecutableExtension(ProxyPlugin.PI_CLASS);
- if (contributor instanceof IConfigurationContributor)
- computedContributors.add(contributor);
- }
- }
-
- // Now turn into array
- if (!computedContributors.isEmpty()) {
- IConfigurationContributor[] newContribs = new IConfigurationContributor[aContribs.length
- + computedContributors.size()];
- System.arraycopy(aContribs, 0, newContribs, 0, aContribs.length);
- IConfigurationContributor[] cContribs = (IConfigurationContributor[]) computedContributors
- .toArray(new IConfigurationContributor[computedContributors.size()]);
- System.arraycopy(cContribs, 0, newContribs, aContribs.length, cContribs.length);
- aContribs = newContribs;
- }
- }
- }
- }
- }
-
- launchInfo.contributors = aContribs;
- return aContribs;
- }
-
- /**
- * Execute the extension registrations that are valid for this type of registry and the launchinfo paths.
- * <p>
- * This is meant to be called only by registry implementations that do not launch through a launch configration after the registry is created but
- * before the {@link IConfigurationContributor#contributeToRegistry(ProxyFactoryRegistry)} is called. This will be called automatically
- * by registries that used a launch configuration to launch.
- *
- * @param baseRegistry
- * @param launchInfo
- * @throws CoreException
- *
- * @since 1.1.0
- */
- public static void performExtensionRegistrations(final BaseProxyFactoryRegistry baseRegistry, LaunchInfo launchInfo) throws CoreException {
- IConfigurationContributionInfo configInfo = launchInfo.configInfo;
- if (configInfo != null && (!configInfo.getContainerIds().isEmpty() || !configInfo.getPluginIds().isEmpty())) {
- String registryID = baseRegistry.getRegistryTypeID();
- // Note: We don't care about the visibility business here. For contributors to proxy it means
- // some classes in the projects/plugins/etc. need configuration whether they are visible or not.
- // This is because even though not visible, some other visible class may instantiate it. So it
- // needs the configuration.
-
- // First call registrations that exist for a container id.
- for (Iterator iter = configInfo.getContainerIds().values().iterator(); iter.hasNext();) {
- ContainerPaths paths = (ContainerPaths) iter.next();
- IConfigurationElement[] contributors = ProxyPlugin.getPlugin().getContainerExtensions(paths.getContainerId(), paths.getAllPaths());
- if (contributors != null)
- for (int i = 0; i < contributors.length; i++) {
- if (registryID.equals(contributors[i].getAttribute(ProxyPlugin.PI_REGISTRY_TYPE))) {
- try {
- final IExtensionRegistration contributor = (IExtensionRegistration) contributors[i].createExecutableExtension(ProxyPlugin.PI_CLASS);
- SafeRunner.run(new ISafeRunnable() {
-
- public void run() throws Exception {
- contributor.register(baseRegistry);
- }
-
- public void handleException(Throwable exception) {
- // Don't need to do anything, Platform logs it for me.
- }
-
- });
- } catch (ClassCastException e) {
- // If not right class, just ignore it.
- }
- }
- }
- }
-
- // Finally add in contributors that exist for a plugin id.
- for (Iterator iter = configInfo.getPluginIds().keySet().iterator(); iter.hasNext();) {
- String pluginId = (String) iter.next();
- IConfigurationElement[] contributors = ProxyPlugin.getPlugin().getPluginExtensions(pluginId);
- if (contributors != null)
- for (int i = 0; i < contributors.length; i++) {
- if (registryID.equals(contributors[i].getAttribute(ProxyPlugin.PI_REGISTRY_TYPE))) {
- try {
- final IExtensionRegistration contributor = (IExtensionRegistration) contributors[i].createExecutableExtension(ProxyPlugin.PI_CLASS);
- SafeRunner.run(new ISafeRunnable() {
-
- public void run() throws Exception {
- contributor.register(baseRegistry);
- }
-
- public void handleException(Throwable exception) {
- // Don't need to do anything, Platform logs it for me.
- }
-
- });
- } catch (ClassCastException e) {
- // If not right class, just ignore it.
- }
- }
- }
- }
- }
-}
-
-
- /*
- * Run the build. If the original launch was in the UI thread, this will
- * be called under control of an IProgressService so that it is in a separate
- * thread and the UI will remain responsive (in that either a busy cursor comes
- * up or eventually a progress dialog).
- * If the pm is canceled, this will just return, but the caller must check if the pm is canceled.
- *
- * <package-protected> so that only the UI handler will access it.
- */
- static void runBuild(IProgressMonitor pm) throws CoreException {
- boolean autobuilding = ResourcesPlugin.getWorkspace().isAutoBuilding();
- if (!autobuilding) {
- try {
- // We are not autobuilding. So kick off a build right here and
- // wait for it. (If we already within a build on this thread, then this
- // will return immediately without building. We will take that risk. If
- // some other thread is building, we will wait for it finish before we
- // can get it and do our build.
- ResourcesPlugin.getWorkspace().build(IncrementalProjectBuilder.INCREMENTAL_BUILD, pm);
- } catch (OperationCanceledException e) {
- // The pm is already marked canceled, so caller can check that instead.
- }
- } else {
- pm.beginTask("", 200); //$NON-NLS-1$
- IJobManager jobManager = Job.getJobManager();
- Job currentJob = jobManager.currentJob();
- if (currentJob == null || (!currentJob.belongsTo(ResourcesPlugin.FAMILY_AUTO_BUILD) && !currentJob.belongsTo(ResourcesPlugin.FAMILY_MANUAL_BUILD))) {
- if (jobManager.find(ResourcesPlugin.FAMILY_AUTO_BUILD).length > 0 || jobManager.find(ResourcesPlugin.FAMILY_MANUAL_BUILD).length >0) {
- // We are not within a build job. If we were, then we don't do the build. We will take
- // that risk. The problem is that if within the build, we can't wait for it to finish because
- // we would stop the thread and so the build would not complete.
- pm.subTask(ProxyMessages.ProxyWaitForBuild);
- try {
- while (true) {
- try {
- jobManager.join(ResourcesPlugin.FAMILY_AUTO_BUILD, new SubProgressMonitor(pm, 100));
- jobManager.join(ResourcesPlugin.FAMILY_MANUAL_BUILD, new SubProgressMonitor(pm, 100));
- break;
- } catch (InterruptedException e) {
- }
- }
- } catch (OperationCanceledException e) {
- }
- }
- }
- pm.done();
- }
- }
-
-
- /*
- * This prevents the launch from being shown. However these constants are in UI component, and we don't
- * want to pre-req that. So we will get them reflectively instead.
- * public but only so that launch delegate can get to it.
- */
- public static String ATTR_PRIVATE;
- private static IUIRunner UI_RUNNER = null;
-
- static {
- ATTR_PRIVATE = null;
- try {
- // See if we have a UI bundle and it is active. If it exists but is not active,
- // then we won't do anything. If we were running a UI application, it should already
- // of been active before we got here.
- Bundle uiBundle = Platform.getBundle("org.eclipse.ui"); //$NON-NLS-1$
- if (uiBundle != null && uiBundle.getState() == Bundle.ACTIVE) {
- try {
- // We have a UI bundle, so we can load our UIRunner class and it will load fine.
- UI_RUNNER = (IUIRunner) Class.forName("org.eclipse.jem.internal.proxy.core.UIRunner").newInstance(); //$NON-NLS-1$
- } catch (InstantiationException e1) {
- ProxyPlugin.getPlugin().getLogger().log(e1, Level.WARNING);
- }
-
- // So that we can run headless (w/o ui), need to do class forName for debugui contants
- Bundle debuguiBundle = Platform.getBundle("org.eclipse.debug.ui"); //$NON-NLS-1$
- if (debuguiBundle != null && debuguiBundle.getState() == Bundle.ACTIVE) {
- Class debugUIConstants = debuguiBundle.loadClass("org.eclipse.debug.ui.IDebugUIConstants"); //$NON-NLS-1$
- ATTR_PRIVATE = (String) debugUIConstants.getField("ATTR_PRIVATE").get(null); //$NON-NLS-1$
- }
- }
- } catch (SecurityException e) {
- } catch (ClassNotFoundException e) {
- } catch (NoSuchFieldException e) {
- } catch (IllegalArgumentException e) {
- } catch (IllegalAccessException e) {
- }
- }
-
- /* (non-Javadoc)
- * Only referenced by launch delegates. public because they are in other packages,
- * or even external developers packages. Not meant to be generally available.
- *
- * This is needed because we can't pass the generic info into a launch configuration
- * because a launch configuration can't take objects. Only can take strings and numbers.
- */
- public static synchronized LaunchInfo getInfo(String key) {
- return (LaunchInfo) LAUNCH_INFO.get(key);
- }
-
- /**
- * Convert the string path into a valid url.
- * @param path
- * @return the url or <code>null</code> if not convertable (i.e. not well-formed).
- *
- * @since 1.0.0
- */
- public static URL convertStringPathToURL(String path) {
- try {
- return path != null ? new File(path).toURL() : null;
- } catch (MalformedURLException e) {
- return null;
- }
- }
-
- /**
- * Convert the string paths into a valid urls.
- *
- * @param paths
- * @return the urls or <code>null</code> if paths is null. Any path not convertable (i.e. not well-formed) will not be in the final list.
- * So this means the result length may be smaller than the paths length.
- *
- * @since 1.0.0
- */
- public static URL[] convertStringPathsToURL(String[] paths) {
- if (paths != null) {
- URL[] result = new URL[paths.length];
- int nextURL = 0;
- for (int i = 0; i < paths.length; i++) {
- URL url = convertStringPathToURL(paths[i]);
- if (url != null)
- result[nextURL++] = url;
- }
- if (nextURL == 0)
- return null; // None were found.
-
- if (nextURL != result.length) {
- URL[] nr = new URL[nextURL];
- System.arraycopy(result, 0, nr, 0, nr.length);
- result = nr;
- }
- return result;
- } else
- return null;
- }
-
- /**
- * Convert the urls to string array. It is assumed the urls are in file protocol. It handles platform and JDK reqts. too.
- * @param urls
- * @return string paths or <code>null</code> if urls is <code>null</code>. Any <code>null</code> entry of urls will result in
- * a corresponding <code>null</code> in the strings.
- *
- * @since 1.0.0
- */
- public static String[] convertURLsToStrings(URL[] urls) {
- if (urls != null) {
- String[] strings = new String[urls.length];
- for (int i = 0; i < urls.length; i++) {
- // [132378] There is a problem with IBM JDK's. They can't handle the getFile() from a URL in the java lib path on Windows.
- // That is because the normalized format of a file url on windows is "file:/D:/asdfasf". But IBM JDKs can't handle the
- // leading slash. Sun JDKs do.
- URL url = urls[i];
- if (url != null) {
- strings[i] = url.getFile();
- if(strings[i].startsWith("/") && Platform.getOS().equals(Platform.OS_WIN32)) //$NON-NLS-1$
- strings[i] = strings[i].substring(1);
- }
- }
- return strings;
- } else
- return null;
- }
-
- /* (non-Javadoc)
- * Local contributor used to make sure that certain jars are in the path.
- *
- * @since 1.0.0
- */
- static class ProxyContributor extends ConfigurationContributorAdapter {
- public void contributeClasspaths(IConfigurationContributionController controller) {
- // Add the required jars to the end of the classpath. (We want proxyCommon and initParser (+ initParser NLS), but they are in the runtime of the proxy bundle (which is jarred up), so we contribute the bundle instead.
- controller.contributeClasspath(ProxyPlugin.getPlugin().getBundle(), (IPath) null, IConfigurationContributionController.APPEND_USER_CLASSPATH, true); //$NON-NLS-1$
- }
- }
-
-}
diff --git a/plugins/org.eclipse.jem.proxy/proxy/org/eclipse/jem/internal/proxy/core/ProxyMessages.java b/plugins/org.eclipse.jem.proxy/proxy/org/eclipse/jem/internal/proxy/core/ProxyMessages.java
deleted file mode 100644
index 8178652..0000000
--- a/plugins/org.eclipse.jem.proxy/proxy/org/eclipse/jem/internal/proxy/core/ProxyMessages.java
+++ /dev/null
@@ -1,48 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2000, 2005 IBM Corporation and others.
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
- *
- * Contributors:
- * IBM Corporation - initial API and implementation
- *******************************************************************************/
-package org.eclipse.jem.internal.proxy.core;
-
-import org.eclipse.osgi.util.NLS;
-
-public final class ProxyMessages extends NLS {
-
- private static final String BUNDLE_NAME = "org.eclipse.jem.internal.proxy.core.messages";//$NON-NLS-1$
-
- private ProxyMessages() {
- // Do not instantiate
- }
-
- public static String UnexpectedException_EXC_;
- public static String ClassCast_EXC__IncorrectType;
- public static String ProxyFactory_EXC__NoBeanProxyFactory;
- public static String ProxyFactory_EXC__NoBeanTypeProxyFactory;
- public static String Not_Java_Project_WARN_;
- public static String No_VM_WARN_;
- public static String No_Implementation_WARN_;
- public static String ProxyLaunch;
- public static String ProxyWaitForBuild;
- public static String Expression_InInvalidStateDueTo_EXC_;
- public static String Expression_InInvalidState_EXC_;
- public static String Expression_TypeSentInInvalidOrder_EXC_;
- public static String Expression_ArrayTypeNotAnArray_EXC_;
- public static String Expression_CannotHandleNoReceiveOnFieldAccess_EXC_;
- public static String Expression_MethodsNeedReceiver_EXC_;
- public static String Expression_InvalidMarkNesting;
- public static String ProxyPlugin_CleanupDefaultProxyLaunchConfigurations;
- public static String ProxyLaunchSupport_RegistryCouldNotStartForSomeReason_WARN_;
- public static String Expression_CreateProxyReassignmentExpression_InvalidForReassignment_EXC_;
-
- static {
- NLS.initializeMessages(BUNDLE_NAME, ProxyMessages.class);
- }
-
- public static String Expression_InvalidProxy;
-}
\ No newline at end of file
diff --git a/plugins/org.eclipse.jem.proxy/proxy/org/eclipse/jem/internal/proxy/core/ProxyPlugin.java b/plugins/org.eclipse.jem.proxy/proxy/org/eclipse/jem/internal/proxy/core/ProxyPlugin.java
deleted file mode 100644
index dfd3fd5..0000000
--- a/plugins/org.eclipse.jem.proxy/proxy/org/eclipse/jem/internal/proxy/core/ProxyPlugin.java
+++ /dev/null
@@ -1,1371 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2001, 2006 IBM Corporation and others.
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
- *
- * Contributors:
- * IBM Corporation - initial API and implementation
- *******************************************************************************/
-package org.eclipse.jem.internal.proxy.core;
-/*
-
-
- */
-
-
-import java.io.*;
-import java.net.MalformedURLException;
-import java.net.URL;
-import java.util.*;
-import java.util.Map.Entry;
-import java.util.logging.Level;
-import java.util.regex.Pattern;
-
-import org.eclipse.core.resources.*;
-import org.eclipse.core.runtime.*;
-import org.eclipse.core.runtime.jobs.Job;
-import org.eclipse.debug.core.*;
-import org.eclipse.jdt.core.*;
-import org.eclipse.jdt.launching.IJavaLaunchConfigurationConstants;
-import org.eclipse.jdt.launching.JavaRuntime;
-import org.eclipse.osgi.service.resolver.BundleSpecification;
-import org.eclipse.osgi.util.ManifestElement;
-import org.osgi.framework.*;
-
-import org.eclipse.jem.util.logger.proxy.Logger;
-import org.eclipse.jem.util.logger.proxyrender.EclipseLogger;
-
-import org.eclipse.jem.internal.proxy.core.IConfigurationContributionInfo.ContainerPaths;
-
-/**
- * The plugin class for the org.eclipse.jem.internal.proxy.core plugin.
- */
-
-public class ProxyPlugin extends Plugin {
-
- /**
- * This interface is for a listener that needs to know if this plugin (ProxyPlugin) is being shutdown.
- * It is needed because there are some extensions that get added dynamically that need to know when the
- * plugin is being shutdown. Can't use new bundle listener for this because it notifies AFTER shutdown.
- *
- * @since 1.0.0
- */
- public interface IProxyPluginShutdownListener {
- /**
- * ProxyPlugin is in shutdown.
- *
- * @since 1.0.0
- */
- public void shutdown();
- }
-
- private static ProxyPlugin PROXY_PLUGIN = null;
- public static final String PREFERENCES_VM_NOVERIFY_KEY = "JEM_PREFERENCES_VM_NOVERIFY_KEY"; // Key for NOVERIFY option of VM //$NON-NLS-1$
- public static final String PDE_NATURE_ID = "org.eclipse.pde.PluginNature" ; //$NON-NLS-1$
-
- // If this is set to true, then in development mode and it will try for proxy jars in directories.
- private boolean devMode;
-
- private ListenerList shutdownListeners;
-
- public ProxyPlugin() {
- super();
- PROXY_PLUGIN = this;
- devMode = Platform.inDevelopmentMode();
- }
-
- public boolean isDevMode() {
- return devMode;
- }
-
- /**
- * Access the singleton
- * @return the singleton plugin
- *
- * @since 1.0.0
- */
- public static ProxyPlugin getPlugin() {
- return PROXY_PLUGIN;
- }
-
- private Logger logger;
- public Logger getLogger() {
- if (logger == null)
- logger = EclipseLogger.getEclipseLogger(this);
- return logger;
- }
-
- /**
- * This will take the bundle and file name and make it local and return that
- * fully qualified. It will look in fragments, but only returns first found. If there can be multiples use
- * the one for bundles and it fragments.
- * <p>
- * If we are in development and it will pick it up from the path
- * that is listed in the proxy.jars file located in the bundle passed in. This allows development code to be
- * used in place of the actual runtime jars. If the runtime jars are found,
- * they will be used.
- * <p>
- * For example if looking for file runtime/xyz.jar in bundle abc, then in bundle directory for abc,
- * there should be a file called proxy.jars. This should only be in development, this file should not
- * be distributed for production. It would be distributed in the SDK environment when testing is desired.
- * <p>
- * The format of the file is:
- * runtimefile=/projectname/builddirectory
- * <p>
- * For this to work when the actual jar is not found, the Eclipse must of been started in
- * dev mode (i.e. the bundle location will be a project within the developer Eclipse. That way
- * we can go up one level for the current install location and assume the above projectname
- * will be found relative to the directory.
- * <p>
- * For the above example:
- * runtime/xyz.jar=/xyzproject/bin
- * <p>
- * It will return "." if file can't be found. It means nothing but it won't cause jvm to crash.
- *
- * @param bundle
- * @param filenameWithinBundle
- * @return the path to the file or <code>"."</code> if not found.
- *
- * @since 1.0.0
- */
- public String localizeFromBundleOnly(Bundle bundle, String filenameWithinBundle) {
- URL url = urlLocalizeFromBundleOnly(bundle, filenameWithinBundle);
- return url != null ? getFileFromURL(url) : "."; //$NON-NLS-1$
- }
- public String localizeFromBundleAndFragments(Bundle bundle, String filenameWithinBundle) {
- URL url = urlLocalizeFromBundleAndFragments(bundle, filenameWithinBundle);
- return url != null ? getFileFromURL(url) : "."; //$NON-NLS-1$
- }
-
- /**
- * Just like localizeFromBundle except it will return an array of Strings. It will look for the filename
- * within the bundle and any fragments of the bundle. If none are found, an empty array will be returned.
- * <p>
- * To find the files in the fragments that are in the runtime path (i.e. libraries), it will need to use a suffix,
- * This is because the JDT will get confused if a runtime jar in a fragment has the same name
- * as a runtime jar in the main bundle.
- * NOTE: This is obsolete. JDT no longer has this problem. So we can find libraries in fragments that have the
- * same file path.
- * <p>
- * So we will use the following search pattern:
- * <ol>
- * <li>Find in all of the fragments those that match the name exactly in the same paths if paths are supplied.</li>
- * <li>Find in all of the fragments, in their runtime path (library stmt), those that match the name
- * but have a suffix the same as the uniqueid of the fragment (preceeded by a period). This is so that it can be easily
- * found but yet be unique in the entire list of fragments. For example if looking for "runtime/xyz.jar"
- * and we have fragment "a.b.c.d.frag", then in the runtime path we will look for the file
- * "runtime/xyz.a.b.c.d.frag.jar". Note: This is obsolete. Still here only for possible old code. Will go
- * away in future.</li>
- * <p>
- * If the files in the fragments are not in the fragments library path then it can have the same name. NOTE: Obsolete,
- * JDT can now handle same name.
- * <p>
- * This is useful for nls where the nls for the filename will be in one or more of the fragments of the plugin.
- *
- * @param bundle
- * @param filenameWithinBundle
- * @return
- *
- * @since 1.0.0
- */
- public String[] localizeAllFromBundleAndFragments(Bundle bundle, String filenameWithinBundle) {
- URL[] urls = urlLocalizeAllFromBundleAndFragments(bundle, filenameWithinBundle);
- String[] result = new String[urls.length];
- for (int i = 0; i < urls.length; i++) {
- result[i] = getFileFromURL(urls[i]);
- }
- return result;
- }
-
- public static String getFileFromURL(URL url) {
- // We need to do this in a device independent way. The URL will always put a leading '/' in the
- // file part of the URL, but on Windows we need to have this '/' removed. Some JRE's don't understand it.
- return new File(url.getFile()).getAbsolutePath();
-
- }
-
- public URL urlLocalizeFromBundleAndFragments(Bundle bundle, String filenameWithinBundle) {
- return urlLocalizeFromBundleAndFragments(bundle, new Path(filenameWithinBundle));
- }
- public URL urlLocalizeFromBundleAndFragments(Bundle bundle, IPath filenameWithinBundle) {
- try {
- URL pvm = FileLocator.find(bundle, filenameWithinBundle, null);
- if (pvm != null)
- return FileLocator.toFileURL(pvm);
- } catch (IOException e) {
- }
- if (devMode) {
- URL[] urls = findDevAllFromBundleAndFragments(bundle, filenameWithinBundle.toString());
- if (urls.length > 0)
- return urls[0];
- else
- return null;
- } else
- return null;
- }
-
- /**
- * Like <code>localizeFromBundleAndFragments</code> except it returns URL's instead.
- *
- * @param bundle
- * @param filenameWithinBundle
- * @return
- *
- * @see ProxyPlugin#localizeFromBundleAndFragments(Bundle, String)
- * @since 1.0.0
- */
- public URL[] urlLocalizeAllFromBundleAndFragments(Bundle bundle, String filenameWithinBundle) {
- return urlLocalizeAllBundleAndFragments(bundle, Platform.getFragments(bundle), filenameWithinBundle);
- }
- public URL[] urlLocalizeAllFromBundleAndFragments(Bundle bundle, IPath filenameWithinBundle) {
- return urlLocalizeAllBundleAndFragments(bundle, Platform.getFragments(bundle), filenameWithinBundle.toString());
- }
-
- /**
- * @param bundle
- * @param filenameWithinBundle
- * @param fragments
- * @return
- *
- * @since 1.0.0
- */
- private URL[] urlLocalizeAllBundleAndFragments(Bundle bundle, Bundle[] fragments, String filenameWithinBundle) {
-
- ArrayList urls = new ArrayList((fragments == null ? 0 : fragments.length) + 1);
- URL url = internalUrlLocalizeFromBundleOnly(bundle, filenameWithinBundle);
- if (url != null)
- urls.add(url);
- if (fragments != null) {
- for (int i = 0; i < fragments.length; i++) {
- Bundle fragment = fragments[i];
- url = internalUrlLocalizeFromBundleOnly(fragment, filenameWithinBundle);
- if (url != null)
- urls.add(url);
- }
- }
- return (URL[]) urls.toArray(new URL[urls.size()]);
- }
-
- private static final String PROXYJARS = "proxy.jars"; //$NON-NLS-1$
-
- /**
- * @see ProxyPlugin#localizeFromBundle(Bundle, String)
- *
- * This is just a helper to return a url instead.
- *
- * @param bundle
- * @param filenameWithinBundle
- * @return
- *
- * @since 1.0.0
- */
- public URL urlLocalizeFromBundleOnly(Bundle bundle, String filenameWithinBundle) {
- // If the filenameWithinBundle begins with one of these special characters,
- // it might be in a fragment.
- if (filenameWithinBundle.charAt(0) == '$'
- && (filenameWithinBundle.regionMatches(true, 0, "$nl$", 0, "$nl$".length()) //$NON-NLS-1$ //$NON-NLS-2$
- || filenameWithinBundle.regionMatches(true, 0, "$os$", 0, "$os$".length()) || filenameWithinBundle.regionMatches(true, 0, //$NON-NLS-1$ //$NON-NLS-2$
- "$ws$", 0, "$ws$".length()))) //$NON-NLS-1$ //$NON-NLS-2$
- return urlLocalizeFromBundleAndFragments(bundle, filenameWithinBundle);
- try {
- URL pvm = new URL(bundle.getEntry("/"), filenameWithinBundle); //$NON-NLS-1$
- pvm = verifyFound(FileLocator.toFileURL(pvm));
- if (pvm != null)
- return pvm;
- } catch (IOException e) {
- }
- return findDev(bundle, filenameWithinBundle);
-
- }
-
- protected URL internalUrlLocalizeFromBundleOnly(Bundle bundle, String filenameWithinBundle) {
- try {
- URL pvm = bundle.getEntry(filenameWithinBundle);
- if (pvm != null)
- return FileLocator.toFileURL(pvm);
- } catch (IOException e) {
- }
- return findDev(bundle, filenameWithinBundle);
-
- }
-
- private URL verifyFound(URL pvm) throws IOException {
- if (devMode) {
- // Need to test if found in devmode. Otherwise we will just assume it is found. If not found on remote and moved to cache, an IOException would be thrown.
- if (pvm != null) {
- InputStream ios = null;
- try {
- ios = pvm.openStream();
- if (ios != null)
- return pvm; // Found it, so return it.
- } finally {
- if (ios != null)
- ios.close();
- }
- }
- } else
- return pvm;
- return null;
- }
-
- /**
- * @see ProxyPlugin#localizeFromBundle(bundle, String)
- *
- * This is just a helper to return a url instead.
- *
- * @param bundle
- * @param filenameWithinBundle
- * @return
- *
- * @since 1.0.0
- */
- public URL urlLocalizeFromBundleOnly(Bundle bundle, IPath filenameWithinBundle) {
- return urlLocalizeFromBundleOnly(bundle, filenameWithinBundle.toString());
- }
-
- private URL findDev(Bundle bundle, String filenameWithinBundle) {
- if (devMode) {
- // Got this far and in dev mode means it wasn't found, so we'll try for development style.
- // It is assumed that in dev mode, we are running with the IDE as local and any
- // build outputs will be local so local file protocol will be returned
- // from Platform.resolve(). We won't be running in dev mode with our entireplugin being in a jar,
- // or on a separate system.
- try {
- URL pvm = bundle.getEntry(PROXYJARS);
- if (pvm != null) {
- InputStream ios = null;
- try {
- ios = pvm.openStream();
- Properties props = new Properties();
- props.load(ios);
- String pathString = props.getProperty(filenameWithinBundle.toString());
- if (pathString != null) {
- URL url = FileLocator.resolve(bundle.getEntry("/")); // It is assumed that if in debug mode, then this plugin is an imported plugin within the developement workspace. //$NON-NLS-1$
- if (url.getProtocol().equals("file")) { //$NON-NLS-1$
- File file = new File(url.getFile()).getParentFile(); // This gets us to workspace root of development workspace.
- file = new File(file, pathString);
- return file.toURL();
- }
- }
- } finally {
- if (ios != null)
- ios.close();
- }
- }
- } catch (IOException e) {
- }
- }
-
- return null;
-
- }
- private URL[] findDevAllFromBundleAndFragments(Bundle bundle, String filenameWithinBundle) {
- Bundle [] fragments = Platform.getFragments(bundle);
- ArrayList urls = new ArrayList((fragments == null ? 0 : fragments.length) + 1);
- URL url = findDev(bundle, filenameWithinBundle);
- if (url != null)
- urls.add(url);
- if (fragments != null) {
- for (int i = 0; i < fragments.length; i++) {
- Bundle fragment = fragments[i];
- url = findDev(fragment, filenameWithinBundle);
- if (url != null)
- urls.add(url);
- }
- }
- return (URL[]) urls.toArray(new URL[urls.size()]);
- }
-
- /**
- * Get the urls for the bundle and all fragments. This is used when bundles/fragments are jarred. It won't work correctly if not
- * a jarred bundle and fragments. This would most likely be used for NLS
- * purposes to bring in the bundle and all of the nls. If a specific fragment was wanted use {@link #urlLocalizeBundle(Bundle)} instead.
- *
- * @param bundle
- * @return urls for bundle and all fragments.
- *
- * @since 1.2.0
- */
- public URL[] urlLocalizeBundleAndFragments(Bundle bundle) {
- Bundle[] fragments = Platform.getFragments(bundle);
- List urls = new ArrayList((fragments == null ? 0 : fragments.length) + 1);
- URL[] burls = urlLocalizeBundle(bundle);
- if (burls != null) {
- urls.addAll(Arrays.asList(burls));
- }
- if (fragments != null) {
- for (int i = 0; i < fragments.length; i++) {
- burls = urlLocalizeBundle(fragments[i]);
- if (burls != null)
- urls.addAll(Arrays.asList(burls));
- }
- }
-
- return (URL[]) urls.toArray(new URL[urls.size()]);
-
- }
-
- /**
- * Get the urls for the bundle libraries only. If a fragment is wanted, then pass in the fragment instead.
- * If bundle and all fragments are wanted use {@link #urlLocalizeBundleAndFragments(Bundle)} instead.
- * <p>
- * If in dev mode, it will use the binary output directory for the plugin libraries from the build.properties file.
- *
- * @param bundle
- * @return URL array of local library references for the bundle or null if can't resolve to local.
- *
- * @since 1.2.0
- */
- public URL[] urlLocalizeBundle(Bundle bundle) {
- URL[] pvms;
- try {
- pvms = new URL[] {FileLocator.resolve(bundle.getEntry("/"))}; //$NON-NLS-1$
- if (pvms[0].getProtocol().equals("jar")) { //$NON-NLS-1$
- // The bundle is a jar, so use as is.
- pvms[0] = getFilePath(pvms[0]);
- return pvms;
- }
- } catch (IOException e) {
- pvms = null;
- }
- try {
- // It is a directory. We could be in either development mode or not. Walk the manifest classpath and find the libraries.
- Properties buildProps = null;
- String libraries = (String) bundle.getHeaders().get(Constants.BUNDLE_CLASSPATH);
- ManifestElement[] elements = ManifestElement.parseHeader(Constants.BUNDLE_CLASSPATH, libraries);
- List urls = new ArrayList();
- if (elements != null) {
- for (int i = 0; i < elements.length; i++) {
- try {
- URL pvm = bundle.getEntry(elements[i].getValue());
- if (pvm != null) {
- urls.add(FileLocator.toFileURL(pvm));
- continue;
- }
- } catch (IOException e) {
- }
- if (devMode) {
- // Not found as a jar, so see if can be found in devmode.
- if (buildProps == null) {
- buildProps = new Properties();
- try {
- URL bp = bundle.getEntry("build.properties"); //$NON-NLS-1$
- if (bp != null) {
- InputStream ios = null;
- try {
- ios = bp.openStream();
- buildProps.load(ios);
- } finally {
- if (ios != null)
- ios.close();
- }
- }
- } catch (IOException e) {
- }
- }
- String pathString = buildProps.getProperty("output."+elements[i].getValue()); //$NON-NLS-1$
- if (pathString != null) {
- try {
- urls.add(FileLocator.toFileURL(bundle.getEntry(pathString)));
- } catch (IOException e) {
- }
- }
- }
- }
- return (URL[]) urls.toArray(new URL[urls.size()]);
- } else if (devMode) {
- // If dev mode then we would look in the build.properties to find the output.. entry. This tells where the binaries are
- // for project. If there is no "output.." entry then either it is not a runnable plugin or the rare case is it is only
- // classfiles in a folder. In that case see if there is a "source.." entry and use that.
- try {
- URL bp = bundle.getEntry("build.properties"); //$NON-NLS-1$
- if (bp != null) {
- InputStream ios = null;
- try {
- ios = bp.openStream();
- Properties props = new Properties();
- props.load(ios);
- String pathString = props.getProperty("output.."); //$NON-NLS-1$
- if (pathString != null) {
- return new URL[] {FileLocator.resolve(bundle.getEntry(pathString))};
- } else if ((pathString = props.getProperty("source..")) != null) { //$NON-NLS-1$
- // Probably a class folder, so use the source instead.
- return new URL[] {FileLocator.resolve(bundle.getEntry(pathString))};
- } else
- return pvms; // Try the root of the plugin.
- } finally {
- if (ios != null)
- ios.close();
- }
- }
- } catch (IOException e) {
- }
-
- }
- } catch (BundleException e) {
- }
- return null;
- }
-
- /**
- * Returns a url as file url if it can. If it is already a file url, it will just return it.
- * If it is "jar:file:...." type protocol, then it will strip it down to the file part, which is
- * the jar itself, and not the file within the jar.
- * @param l
- * @return
- *
- * @since 1.2.0
- */
- public static URL getFilePath(URL l) {
- if (l != null) {
- if (l.getProtocol().equals("file")) //$NON-NLS-1$
- return l;
- else if (l.getProtocol().equals("jar")) { //$NON-NLS-1$
- String f = l.getFile();
- int idx = f.lastIndexOf('!');
- if (idx>=0)
- f = f.substring(0,idx);
- try {
- return getFilePath(new URL(f));
- } catch (MalformedURLException e) {}
- }
- }
- return null;
- }
-
- /**
- * A helper to order the plugins into pre-req order.
- * If A eventually depends on B, then B will be ahead of A in the
- * list of plugins. (I.e. B is a pre-req somewhere of A).
- *
- * @param bundlesToOrder - Bundles of interest. The results will have these in thiee correct order.
- * @return An array of the Bundlers in there order from no prereqs in set to the leaves.
- *
- * @since 1.0.0
- */
- public static Bundle[] orderPlugins(final Set bundlesToOrder) {
- Map prereqsMap = new HashMap(bundlesToOrder.size()*3);
- int ndx = bundlesToOrder.size();
- Bundle[] result = new Bundle[ndx];
- Map dependents = getDependentCounts(false, bundlesToOrder, prereqsMap); // We want the inactive ones too. That way have complete order. They can be ignored later if necessary.
- // keep iterating until all have been visited. This will actually find them in reverse order from what we
- // want, i.e. it will find the leaves first. So we will build result array in reverse order.
- while (!dependents.isEmpty()) {
- // loop over the dependents list. For each entry, if there are no dependents, visit
- // the bundle and remove it from the list. Make a copy of the keys so we don't end up
- // with concurrent accesses (since we are deleting the values as we go)
- Iterator ib = dependents.entrySet().iterator();
- while (ib.hasNext()) {
- Map.Entry entry = (Map.Entry) ib.next();
- Bundle bundle = (Bundle) entry.getKey() ;
- int[] count = (int[]) entry.getValue();
- if (count != null && count[0] <= 0) {
- if (bundlesToOrder.contains(bundle)) {
- result[--ndx] = bundle;
- if (ndx == 0)
- return result; // We've ordered all that we care about. Anything left over is unimportant.
- }
- ib.remove();
- // decrement the dependent count for all of the prerequisites.
- Bundle[] requires = getPrereqs(bundle, prereqsMap);
- for (int j = 0; j < requires.length; j++) {
- Bundle prereq = requires[j];
- int[] countPrereq = (int[]) dependents.get(prereq);
- if (countPrereq != null)
- --countPrereq[0];
- }
- }
- }
- }
- return result;
- }
-
- /**
- * Get all of the prereqs for this bundle, all of the way down to the root.
- * They will be in top-down depth-first order. There won't be duplicates. They will show up
- * only once the first time they are found.
- *
- * @param bundle
- * @return list of all pre-reqs.
- *
- * @since 1.0.0
- */
- public static List getAllPrereqs(Bundle bundle) {
- List prereqs = new ArrayList();
- getAllPrereqs(bundle, prereqs, new HashMap());
- return prereqs;
- }
-
- private static void getAllPrereqs(Bundle bundle, List prereqs, Map prereqsMap) {
- Bundle[] prs = getPrereqs(bundle, prereqsMap);
- for (int i = 0; i < prs.length; i++) {
- Bundle pre = prs[i];
- if (prereqsMap.containsKey(pre))
- continue; // Already processed this one once.
- prereqs.add(pre); // Add to the list of pre-reqs accumulated so far.
- getAllPrereqs(pre, prereqs, prereqsMap);
- }
- }
-
- private static Bundle[] getPrereqs(Bundle bundle, Map prereqsMap) {
- Bundle[] prereqs = (Bundle[]) prereqsMap.get(bundle);
- if (prereqs == null) {
- prereqs = getPrereqs(bundle);
- prereqsMap.put(bundle, prereqs);
- }
- return prereqs;
- }
-
- public static Bundle[] getPrereqs(Bundle bundle) {
- Bundle[] l = (Bundle[]) pluginRequiredMap.get(bundle.getSymbolicName());
- if (l == null) {
- BundleSpecification specs[] = Platform.getPlatformAdmin().getState(false).getBundle(bundle.getBundleId()).getRequiredBundles();
- ArrayList bundles = new ArrayList(specs.length);
- for (int i = 0; i < specs.length; i++) {
- Bundle b = Platform.getBundle(specs[i].getName());
- if (b != null)
- bundles.add(b);
- }
- l = (Bundle[]) bundles.toArray(new Bundle[bundles.size()]);
- pluginRequiredMap.put(bundle.getSymbolicName(), l);
- }
- return l;
- }
-
- private static Map getDependentCounts(boolean activeOnly, Set startingSet, Map prereqsMap) {
- // Try to maintain independents in order from the starting set (which happens to be ordered, and hopefully reversed.).
- // Trying to have leaves show up in same order they are found in the Eclipse extensions, so we should
- // have the starting set be in reverse order from that. The actual process
- // builds them in reverse order from the starting set, so we expect the startingSet to be in reverse order so they will be in forward order
- // hopefully. This is just a heuristic. There is no guarentee it will actually produce the
- // desired output.
- Map dependents = new LinkedHashMap(startingSet.size());
- // build a table of all dependent counts. The table is keyed by descriptor and
- // the value the integer number of dependent plugins.
- List processNow = new ArrayList(startingSet);
- List processNext = new ArrayList(processNow.size());
- if (!processNow.isEmpty()) {
- // Go through the first time from the starting set to get an entry into the list.
- // If there is an entry, then it won't be marked for processNext. Only new entries
- // are added to processNext in the following loop.
- int pnSize = processNow.size();
- for (int i = 0; i < pnSize; i++) {
- Bundle bundle = (Bundle) processNow.get(i);
- if (activeOnly && bundle.getState() != Bundle.ACTIVE)
- continue;
- // ensure there is an entry for this descriptor (otherwise it will not be visited)
- int[] entry = (int[]) dependents.get(bundle);
- if (entry == null)
- dependents.put(bundle, new int[1]);
- }
- }
-
- // Now process the processNow to find the requireds, increment them, and add to processNext if never found before.
- while (!processNow.isEmpty()) {
- processNext.clear();
- int pnSize = processNow.size();
- for (int i = 0; i < pnSize; i++) {
- Bundle bundle = (Bundle) processNow.get(i);
- if (activeOnly && bundle.getState() != Bundle.ACTIVE)
- continue;
- Bundle[] requires = getPrereqs(bundle, prereqsMap);
- for (int j = 0; j < requires.length; j++) {
- Bundle prereq = requires[j];
- if (prereq == null || activeOnly
- && bundle.getState() != Bundle.ACTIVE)
- continue;
- int[] entry = (int[]) dependents.get(prereq);
- if (entry == null) {
- dependents.put(prereq, new int[]{1});
- processNext.add(prereq); // Never processed before, so we add it to the next process loop.
- } else
- ++entry[0];
- }
- }
-
- // Now swap the lists so that we processNext will be now and visa-versa.
- List t = processNext;
- processNext = processNow;
- processNow = t;
- }
- return dependents;
- }
-
- /**
- * Add a shutdown listener
- * @param listener
- *
- * @since 1.0.0
- */
- public void addProxyShutdownListener(IProxyPluginShutdownListener listener) {
- if (shutdownListeners == null)
- shutdownListeners = new ListenerList();
- shutdownListeners.add(listener);
- }
-
- /**
- * Remove a shutdown listener
- * @param listener
- *
- * @since 1.0.0
- */
- public void removeProxyShutdownListener(IProxyPluginShutdownListener listener) {
- if (shutdownListeners != null)
- shutdownListeners.remove(listener);
- }
-
- private ILaunchConfigurationListener launchListener = new ILaunchConfigurationListener() {
- public void launchConfigurationAdded(ILaunchConfiguration configuration) {
- try {
- if (!configuration.isWorkingCopy() && IProxyConstants.ID_PROXY_LAUNCH_GROUP.equals(configuration.getCategory()))
- startCleanupJob();
- } catch (Exception e) {
- }
- }
-
- public void launchConfigurationChanged(ILaunchConfiguration configuration) {
- try {
- if (!configuration.isWorkingCopy() && IProxyConstants.ID_PROXY_LAUNCH_GROUP.equals(configuration.getCategory()))
- startCleanupJob();
- } catch (Exception e) {
- }
- }
-
- public void launchConfigurationRemoved(ILaunchConfiguration configuration) {
- try {
- // On delete you can't tell the category or anything because all of that info has already removed.
- if (!configuration.isWorkingCopy())
- startCleanupJob();
- } catch (Exception e) {
- }
- }
- };
-
- private Job cleanupJob = new Job(ProxyMessages.ProxyPlugin_CleanupDefaultProxyLaunchConfigurations) {
- {
- setSystem(true); // So it doesn't show up in progress monitor. No need to interrupt user.
- setPriority(Job.SHORT); // A quick running job.
- }
- protected IStatus run(IProgressMonitor monitor) {
- synchronized (this) {
- if (monitor.isCanceled())
- return Status.CANCEL_STATUS;
- }
- // all we want to do is find out if any launch configurations (from proxy launch group) exist for
- // a project. If they don't, then unset the project's property. If they do, and the property is not
- // set, then set it to NOT_SET to indicate not set, but there are some configs for it.
- // We just gather the project names that have launch configurations.
- try {
- Set projectNames = new HashSet();
- ILaunchConfiguration[] configs = DebugPlugin.getDefault().getLaunchManager().getLaunchConfigurations();
- for (int i = 0; i < configs.length; i++) {
- if (IProxyConstants.ID_PROXY_LAUNCH_GROUP.equals(configs[i].getCategory())
- && (ProxyLaunchSupport.ATTR_PRIVATE == null || !configs[i].getAttribute(ProxyLaunchSupport.ATTR_PRIVATE, false)))
- projectNames.add(configs[i].getAttribute(IJavaLaunchConfigurationConstants.ATTR_PROJECT_NAME, "")); //$NON-NLS-1$
- }
-
- IJavaModel model = JavaCore.create(ResourcesPlugin.getWorkspace().getRoot());
- IJavaElement[] children = model.getChildren();
- int cancelCount = 10;
- for (int j = 0; j < children.length; j++) {
- if (children[j].getElementType() == IJavaElement.JAVA_PROJECT) {
- if (--cancelCount <= 0)
- synchronized (this) {
- cancelCount = 10; // Rest for next set of ten.
- // Checking on every 10 projects because they may be many projects, while only few configs.
- // This way it will stop sooner.
- if (monitor.isCanceled())
- return Status.CANCEL_STATUS;
- }
- IProject p = ((IJavaProject) children[j]).getProject();
- if (projectNames.contains(p.getName())) {
- // This project has a launch config. If it has a setting, then do nothing, else need to put on not set.
- if (p.getPersistentProperty(ProxyPlugin.PROPERTY_LAUNCH_CONFIGURATION) == null)
- p.getProject().setPersistentProperty(
- ProxyPlugin.PROPERTY_LAUNCH_CONFIGURATION,
- ProxyLaunchSupport.NOT_SET);
- } else {
- // This project has no launch configs. Remove any setting if it exists.
- p.setPersistentProperty(ProxyPlugin.PROPERTY_LAUNCH_CONFIGURATION, (String) null);
- }
- }
- }
- return Status.OK_STATUS;
- } catch (CoreException e) {
- return e.getStatus();
- }
- }
- };
-
- private void startCleanupJob() {
- cleanupJob.cancel(); // Stop what we are doing.
- cleanupJob.schedule(1000l); // Schedule to start in one second.
- }
-
-
- /* (non-Javadoc)
- * @see org.osgi.framework.BundleActivator#start(org.osgi.framework.BundleContext)
- */
- public void start(final BundleContext context) throws Exception {
- super.start(context);
- DebugPlugin.getDefault().getLaunchManager().addLaunchConfigurationListener(launchListener);
- context.addBundleListener(new BundleListener() {
- public void bundleChanged(BundleEvent event) {
- if (event.getBundle() != ProxyPlugin.this.getBundle())
- return; // Not of interest to us.
- switch (event.getType()) {
- case BundleEvent.STARTED:
- context.removeBundleListener(this); // Since we don't care anymore
- startCleanupJob();
- break;
- case BundleEvent.STOPPED:
- case BundleEvent.UNINSTALLED:
- case BundleEvent.UNRESOLVED:
- context.removeBundleListener(this); // We stopped before we started, so remove ourselves.
- break;
- }
- }
- });
- getPluginPreferences().setDefault(PREFERENCES_VM_NOVERIFY_KEY, true);
- }
-
-
- /* (non-Javadoc)
- * @see org.osgi.framework.BundleActivator#stop(org.osgi.framework.BundleContext)
- */
- public void stop(BundleContext context) throws Exception {
- // Handle case where debug plugin shuts down before we do since order not guarenteed.
- if (DebugPlugin.getDefault() != null)
- DebugPlugin.getDefault().getLaunchManager().removeLaunchConfigurationListener(launchListener);
- cleanupJob.cancel(); // Stop what we are doing.
- if (shutdownListeners != null) {
- Object[] listeners = shutdownListeners.getListeners();
- for (int i = 0; i < listeners.length; i++) {
- ((IProxyPluginShutdownListener) listeners[i]).shutdown();
- }
- }
- super.stop(context);
- }
-
- public static final String PI_CONFIGURATION_CONTRIBUTION_EXTENSION_POINT = "org.eclipse.jem.proxy.contributors"; //$NON-NLS-1$
- public static final String PI_EXTENSION_REGISTRATION_EXTENSION_POINT = "org.eclipse.jem.proxy.extensions"; //$NON-NLS-1$
- public static final String PI_CONTAINER = "container"; //$NON-NLS-1$
- public static final String PI_PLUGIN = "plugin"; //$NON-NLS-1$
- public static final String PI_CLASS = "class"; //$NON-NLS-1$
- public static final String PI_REGISTRY_TYPE = "registryType"; //$NON-NLS-1$
- public static final Map pluginRequiredMap = new HashMap(50);
-
- /*
- * Processed extension point info for contributors.
- */
- protected ContributorExtensionPointInfo contributions;
-
- /*
- * Processed extension point info for registry extensions.
- */
- protected ContributorExtensionPointInfo extensions;
-
-
- /**
- * These are public only so that jem.ui can access this constant. Not meant to be accessed by others.
- */
- public static final QualifiedName PROPERTY_LAUNCH_CONFIGURATION = new QualifiedName("org.eclipse.jem.proxy", "proxyLaunchConfiguration"); //$NON-NLS-1$ //$NON-NLS-2$
-
- /**
- * Return the plugin ordered array of configuration elements for the given container, or <code>null</code> if not contributed.
- *
- * @param containerid the first segment of all of the container paths is the container id.
- * @param containerPaths array of container paths to match against for contributions. The paths must all be of the same container id.
- * @return Array of configuration elements.
- *
- * @since 1.0.0
- */
- public synchronized IConfigurationElement[] getContainerConfigurations(String containerid, String[] containerPaths) {
- if (contributions == null)
- processProxyContributionExtensionPoint();
- return (IConfigurationElement[]) contributions.containerPathContributions.getContributors(containerid, containerPaths);
- }
-
- /**
- * Return the plugin ordered array of configuration elements for the given plugin, or <code>null</code> if not contributed.
- *
- * @param pluginid
- * @return Array of configuration elements or <code>null</code> if this plugin has no contributions.
- *
- * @since 1.0.0
- */
- public synchronized IConfigurationElement[] getPluginConfigurations(String pluginid) {
- if (contributions == null)
- processProxyContributionExtensionPoint();
- return (IConfigurationElement[]) contributions.pluginToContributions.get(pluginid);
- }
-
- /**
- * Return the plugin ordered array of configuration elements for the given container, or <code>null</code> if not contributed.
- *
- * @param containerid the first segment of all of the container paths is the container id.
- * @param containerPaths array of container paths to match against for contributions. The paths must all be of the same container id.
- * @return Array of configuration elements.
- *
- * @since 1.0.0
- */
- public synchronized IConfigurationElement[] getContainerExtensions(String containerid, String[] containerPaths) {
- if (extensions == null)
- processProxyExtensionExtensionPoint();
- return (IConfigurationElement[]) extensions.containerPathContributions.getContributors(containerid, containerPaths);
- }
-
- /**
- * Return the plugin ordered array of configuration elements for the given plugin, or <code>null</code> if not contributed.
- *
- * @param pluginid
- * @return Array of configuration elements or <code>null</code> if this plugin has no contributions.
- *
- * @since 1.0.0
- */
- public synchronized IConfigurationElement[] getPluginExtensions(String pluginid) {
- if (extensions == null)
- processProxyExtensionExtensionPoint();
- return (IConfigurationElement[]) extensions.pluginToContributions.get(pluginid);
- }
-
- protected synchronized void processProxyContributionExtensionPoint() {
- contributions = processContributionExtensionPoint(PI_CONFIGURATION_CONTRIBUTION_EXTENSION_POINT);
- }
-
- protected synchronized void processProxyExtensionExtensionPoint() {
- extensions = processContributionExtensionPoint(PI_EXTENSION_REGISTRATION_EXTENSION_POINT);
- }
-
- /**
- * Process the extension point looking contributors. It will find entries that have the "container" or "plugin" attributes
- * set on them.
- *
- * @param extensionPoint fully-qualified extension point id, including plugin id of the extension point.
- * @return the contributor info record.
- *
- * @since 1.0.0
- */
- public static ContributorExtensionPointInfo processContributionExtensionPoint(String extensionPoint) {
- // We are processing this once because it is accessed often (once per vm per project).
- // This can add up so we get it together once here.
- IExtensionPoint extp = Platform.getExtensionRegistry().getExtensionPoint(extensionPoint);
- ContributorExtensionPointInfo result = new ContributorExtensionPointInfo();
- result.containerPathContributions = new ContainerPathContributionMapping(IConfigurationElement.class);
- if (extp == null) {
- result.pluginToContributions = Collections.EMPTY_MAP;
- return result;
- }
-
- IExtension[] extensions = extp.getExtensions();
- if (extensions.length > 0) {
- // Need to be in plugin order so that first ones processed have no dependencies on others.
- // Gather in extension order.
- // We want the list in reverse order of found extensions for a bundle. This is a heuristic to try
- // to get leaves ordered in the order found from the extension list. Since the orderPlugins actually
- // reverses the leaf order, hopefully this will set it back to what we want at the end.
- HashMap bundlesToExtensions = new LinkedHashMap(extensions.length);
- for (int i = extensions.length-1; i >= 0; i--) {
- Bundle bundle = Platform.getBundle(extensions[i].getContributor().getName());
- IExtension[] ext = (IExtension[]) bundlesToExtensions.get(bundle);
- if (ext == null)
- bundlesToExtensions.put(bundle, new IExtension[] { extensions[i]});
- else {
- // More than one extension defined in this plugin.
- IExtension[] newExt = new IExtension[ext.length + 1];
- System.arraycopy(ext, 0, newExt, 0, ext.length);
- newExt[newExt.length - 1] = extensions[i];
- bundlesToExtensions.put(bundle, newExt);
- }
- }
-
- // Now order them so we process in required order.
- Bundle[] ordered = ProxyPlugin.orderPlugins(bundlesToExtensions.keySet());
- Map patternStringToID_Pattern = new HashMap(); // Map of string patterns to the {container id, compiled pattern}. This so that we use the same compiled pattern everywhere.
- result.pluginToContributions = new HashMap(ordered.length);
- for (int i = 0; i < ordered.length; i++) {
- IExtension[] exts = (IExtension[]) bundlesToExtensions.get(ordered[i]);
- for (int j = 0; j < exts.length; j++) {
- IConfigurationElement[] configs = exts[j].getConfigurationElements();
- // Technically we expect the config elements to have a name of "contributor", but since that
- // is all that can be there, we will ignore it. The content is what is important.
- for (int k = 0; k < configs.length; k++) {
- String containerPattern = configs[k].getAttribute(PI_CONTAINER);
- if (containerPattern != null) {
- Object[] id_Pattern = (Object[]) patternStringToID_Pattern.get(containerPattern);
- if (id_Pattern == null) {
- int slash = containerPattern.indexOf('/');
- String containerID = slash != -1 ? containerPattern.substring(0, slash) : containerPattern;
- // The pattern becomes for the containerPattern "SWT_CONTAINER" becomes "SWT_CONTAINER(/.*)*". This
- // means to match the string must start with "SWT_CONTAINER" and it must have either nothing after this
- // or it must have a "/" and any characters after that. So this means it will not match "SWT_CONTAINERXZ"
- // but it will match "SWT_CONTAINER/XYZ".
- id_Pattern = new Object[] { containerID, Pattern.compile(containerPattern + "(/.*)*")}; //$NON-NLS-1$
- patternStringToID_Pattern.put(containerPattern, id_Pattern);
- }
- result.containerPathContributions.addContribution((String) id_Pattern[0], (Pattern) id_Pattern[1], configs[k]);
- }
-
- String plugin = configs[k].getAttribute(PI_PLUGIN);
- if (plugin != null) {
- List contributions = (List) result.pluginToContributions.get(plugin);
- if (contributions == null) {
- contributions = new ArrayList(1);
- result.pluginToContributions.put(plugin, contributions);
- }
- contributions.add(configs[k]);
- }
- }
- }
- }
-
- // Finalize the mappings for both container paths and plugins.
- result.containerPathContributions.finalizeMapping();
- for (Iterator iter = result.pluginToContributions.entrySet().iterator(); iter.hasNext();) {
- Map.Entry entry = (Map.Entry) iter.next();
- entry.setValue(((List) entry.getValue()).toArray(new IConfigurationElement[((List) entry.getValue()).size()]));
- }
- } else
- result.pluginToContributions = Collections.EMPTY_MAP;
- return result;
- }
-
- /**
- * The result of the {@link ProxyPlugin#getIDsFound(IJavaProject)}.
- *
- * @since 1.2.0
- */
- public static class FoundIDs {
-
- /**
- * Map of (containerIds(String)->{@link ContainerPaths}) of containers classpaths found in the project's classpath.
- *
- */
- public Map containerIds = new HashMap(2);
-
- /**
- * Map of (containers({@link IClasspathContainer})->Boolean) of containers found in the project's classpath. The value will be <code>true</code> if the container is visible to the top-level project.
- */
- public Map containers = new HashMap(2);
-
- /**
- * Map of (pluginIds(String)->Boolean) of plugin ids found in the project's classpath if the project is a plugin project. The value will be <code>true</code> if the plugin is visible to the top-level project.
- */
- public Map pluginIds;
-
- /**
- * Map of (projects({@link IPath}->Boolean) of project found in the project's classpath. The value will be <code>true</code> if the project is visible to the top-level project.
- */
- public Map projects = new HashMap(2);
-
- FoundIDs() {
- // not meant to be instantiated or subclassed by clients.
- }
- }
-
- /**
- * For the given java project, return the maps of found ids.
- *
- * @param jproject
- * @return the found ids.
- *
- * @since 1.0.0
- */
- public FoundIDs getIDsFound(IJavaProject jproject) throws JavaModelException {
- IPath projectPath = jproject.getProject().getFullPath();
- FoundIDs foundIDs = new FoundIDs();
- foundIDs.projects.put(projectPath, Boolean.TRUE);
- expandProject(projectPath, foundIDs, true, true);
-
- // The containerIds values will actually be an Map[] {Map(visibleIPath->pathString), Map(hiddenIPath->pathString)}. Needs to be converted to a ContainerPaths now
- // that we are done.
- for (Iterator itr = foundIDs.containerIds.entrySet().iterator(); itr.hasNext();) {
- Map.Entry entry = (Entry) itr.next();
- Map[] value = (Map[]) entry.getValue();
- entry.setValue(new ContainerPaths((String) entry.getKey(), (String[]) value[0].values().toArray(new String[value[0].size()]), (String[]) value[1].values().toArray(new String[value[1].size()])));
- }
-
- if (foundIDs.pluginIds == null)
- foundIDs.pluginIds = Collections.EMPTY_MAP;
-
- foundIDs.projects.remove(projectPath); // Don't need to include itself now, was needed for testing so if ciruclar we don't get into a loop.
- if (foundIDs.projects.isEmpty())
- foundIDs.projects = Collections.EMPTY_MAP;
-
- return foundIDs;
-
- }
-
- private static final IPath JRE_CONTAINER_PATH = new Path(JavaRuntime.JRE_CONTAINER);
-
- /*
- * The passed in visible flag tells if this project is visible and its contents are visible if they are exported.
- * Only exception is if first is true, then all contents are visible to the top level project.
- */
- private void expandProject(IPath projectPath, FoundIDs foundIds, boolean visible, boolean first) throws JavaModelException {
- IResource res = ResourcesPlugin.getWorkspace().getRoot().findMember(projectPath.lastSegment());
- if (res == null)
- return; // Not exist so don't delve into it.
- IJavaProject project = (IJavaProject)JavaCore.create(res);
- if (project == null || !project.exists() || !project.getProject().isOpen())
- return; // Not exist as a java project or not open, so don't delve into it.
-
- IClasspathEntry[] entries = project.getRawClasspath();
- for (int i = 0; i < entries.length; i++) {
- IClasspathEntry entry = entries[i];
- Boolean currentFlag = null; // Current setting value.
- boolean newFlag; // The new setting value.
- switch (entry.getEntryKind()) {
- case IClasspathEntry.CPE_PROJECT:
- // Force true if already true, or this is the first project, or this project is visible and the entry is exported. These override a previous false.
- currentFlag = (Boolean) foundIds.projects.get(entry.getPath());
- newFlag = (currentFlag != null && currentFlag.booleanValue()) || first || (visible && entry.isExported());
- if (currentFlag == null || currentFlag.booleanValue() != newFlag)
- foundIds.projects.put(entry.getPath(), newFlag ? Boolean.TRUE : Boolean.FALSE );
- if (currentFlag == null)
- expandProject(entry.getPath(), foundIds, visible && entry.isExported(), false);
- break;
- case IClasspathEntry.CPE_CONTAINER:
- if (!first && JavaRuntime.JRE_CONTAINER.equals(entry.getPath().segment(0))) //$NON-NLS-1$
- break; // The first project determines the JRE, so any subsequent ones can be ignored.
- Map[] paths = (Map[]) foundIds.containerIds.get(entry.getPath().segment(0));
- if (paths == null) {
- paths = new Map[] {new HashMap(2), new HashMap(2)};
- foundIds.containerIds.put(entry.getPath().segment(0), paths);
- }
- currentFlag = null;
- if (paths[0].containsKey(entry.getPath()))
- currentFlag = Boolean.TRUE;
- else if (paths[1].containsKey(entry.getPath()))
- currentFlag = Boolean.FALSE;
- newFlag = (currentFlag != null && currentFlag.booleanValue()) || first || (visible && entry.isExported());
- if (currentFlag == null || currentFlag.booleanValue() != newFlag) {
- if (newFlag) {
- // It is visible, remove from hidden, if there, and add to visible.
- paths[1].remove(entry.getPath());
- paths[0].put(entry.getPath(), entry.getPath().toString());
- } else {
- // It is hidden, remove from visible, if there, and add to hidden.
- paths[0].remove(entry.getPath());
- paths[1].put(entry.getPath(), entry.getPath().toString());
- }
- }
-
- IClasspathContainer container = JavaCore.getClasspathContainer(entry.getPath(), project);
- // Force true if already true, or this is the first project, or this project is visible and the entry is exported. These override a previous false.
- currentFlag = (Boolean) foundIds.containers.get(container);
- newFlag = (currentFlag != null && currentFlag.booleanValue()) || first || (visible && entry.isExported());
- if (currentFlag == null || currentFlag.booleanValue() != newFlag)
- foundIds.containers.put(container, newFlag ? Boolean.TRUE : Boolean.FALSE );
- break;
- case IClasspathEntry.CPE_VARIABLE:
- // We only care about JRE_LIB. If we have that, then we will treat it as JRE_CONTAINER. Only
- // care about first project too, because the first project is the one that determines the JRE type.
- if (first && JavaRuntime.JRELIB_VARIABLE.equals(entry.getPath().segment(0))) { //$NON-NLS-1$
- paths = (Map[]) foundIds.containerIds.get(JavaRuntime.JRE_CONTAINER);
- if (paths == null) {
- paths = new Map[] {new HashMap(2), new HashMap(2)};
- foundIds.containerIds.put(JavaRuntime.JRE_CONTAINER, paths);
- }
- currentFlag = null;
- if (paths[0].containsKey(JRE_CONTAINER_PATH))
- currentFlag = Boolean.TRUE;
- else if (paths[1].containsKey(JRE_CONTAINER_PATH))
- currentFlag = Boolean.FALSE;
- newFlag = (currentFlag != null && currentFlag.booleanValue()) || first || (visible && entry.isExported());
- if (currentFlag == null || currentFlag.booleanValue() != newFlag) {
- if (newFlag) {
- // It is visible, remove from hidden, if there, and add to visible.
- paths[1].remove(JRE_CONTAINER_PATH);
- paths[0].put(JRE_CONTAINER_PATH, JavaRuntime.JRE_CONTAINER);
- } else {
- // It is hidden, remove from visible, if there, and add to hidden.
- paths[0].remove(JRE_CONTAINER_PATH);
- paths[1].put(JRE_CONTAINER_PATH, JavaRuntime.JRE_CONTAINER);
- }
- }
- }
- break;
- default:
- break;
- }
- }
-
- findPlugins(foundIds, visible, first, project);
- }
-
- /**
- * Find the plugins that the given project references, either directly or indirectly.
- * <p>
- * The map will be of plugin ids to a Boolean. If the boolean is <code>BooleanTRUE</code>,
- * then the plugin is visible to the given project. the visible and first flags
- * will modify this. If first is true, then all direct plugins will be visible,
- * else only exported plugins will be visible. If visible is false and first is false, then it doesn't matter, all of the
- * plugins will not be visible.
- * <p>
- * Visible means that classes in the plugin can be referenced directly from code. Not visible
- * means that they can only be referenced from some other plugin in the list. In other words,
- * visible ones can be directly referenced, but invisible ones can only be referenced from
- * plugins that can see it.
- * <p>
- * For most uses, first and visible should be true. Then it will treat the project as the toplevel
- * project and will return true for those that are visible to it, either directly or indirectly.
- * These flags were added for more special cases where may be calling on a project that is deeper
- * down in the classpath were visibilty has already been decided.
- * <p>
- * Note: PDE must be installed for this to return anything, otherwise it will leave
- * the map alone.
- *
- * @param foundIds foundIds structure to get plugin info from.
- * @param visible <code>true</code> means this project is visible, so any plugins visible to it will be visible, else none will be visible.
- * @param first <code>true</code> if this is the top project of interest. This means that all plugins within the project are visible. Else only exported projects will be visible.
- * @param project project to start looking from
- *
- * @since 1.0.2
- */
- public void findPlugins(FoundIDs foundIds, boolean visible, boolean first, IJavaProject project) {
- try {
- // To prevent unnecessary loading of the PDE plugin, find the plugins only if this project is a PDE plugin project.
- if (isPDEProject(project)) {
- IPDEProcessForPlugin pdeprocess = getPDEProcessForPlugin();
- if (pdeprocess != null) {
- if (foundIds.pluginIds == null)
- foundIds.pluginIds = new HashMap();
- pdeprocess.findPlugins(project, foundIds, visible, first); // expand the plugins for this project, if any.
- }
- }
- } catch (CoreException e) {
- }
- }
-
- /**
- *
- * @param project
- *
- * @return true if this is a Plugin project or false if not
- * @throws CoreException
- *
- * @since 1.1.0
- */
- public static boolean isPDEProject(IJavaProject project) throws CoreException {
- return project.getProject().hasNature(PDE_NATURE_ID);
- }
-
-
- /*
- * Interface for processing Plugins. Used when PDE plugin is present in the installation.
- *
- * @since 1.0.2
- */
- interface IPDEProcessForPlugin {
-
- /*
- * Go through the project and find all of the plugins it references, either directly or through
- * the referenced plugins, and mark them as visible or not.
- */
- public abstract void findPlugins(IJavaProject project, FoundIDs foundIds, boolean visible, boolean first);
- }
-
- /*
- * Try to get the pde process for plugin. If already tried once and not found, then forget it.
- * <package-protected> because PDEContributeClasspath needs it too.
- */
- private IPDEProcessForPlugin pdeProcessForPlugin;
- private boolean triedPDEProcess;
- IPDEProcessForPlugin getPDEProcessForPlugin() {
- if (!triedPDEProcess) {
- triedPDEProcess = true;
- if (Platform.getBundle("org.eclipse.pde.core") != null) { //$NON-NLS-1$
- try {
- Class classPDEProcess = Class.forName("org.eclipse.jem.internal.proxy.core.PDEProcessForPlugin"); //$NON-NLS-1$
- pdeProcessForPlugin = (IPDEProcessForPlugin) classPDEProcess.newInstance();
- } catch (ClassNotFoundException e) {
- // Not found, do nothing.
- } catch (InstantiationException e) {
- getLogger().log(e, Level.WARNING);
- } catch (IllegalAccessException e) {
- getLogger().log(e, Level.WARNING);
- }
- }
- }
- return pdeProcessForPlugin;
- }
-
- /**
- * This tries to find a jar in the bundle specified, and the attached source using the
- * PDE source location extension point. The jar must exist for source to be attachable.
- * The source must be in the standard PDE source plugin. I.e. it must be in a directory
- * of the name "bundlename_bundleversion", and in the same path from there as in the
- * jar, plus the name must be "jarnamesrc.zip".
- * <p>
- * The returned URL's will not be Platform.resolve(). They will be in form returned from
- * Platform.find().
- *
- * @param bundle bundle to search, will search fragments too.
- * @param filepath filepath from the root of the bundle/fragment where the jar will be found.
- * @return two URL's. [0] is the URL to the jar, <code>null</code> if not found, [2] is the URL to the source zip, <code>null</code> if not found.
- *
- * @since 1.0.0
- */
- public URL[] findPluginJarAndAttachedSource(Bundle bundle, IPath filepath) {
- // This is a bit kludgy, but the algorithm is to find the file first, and then get the root url of the bundle/fragment
- // that matches the found file. This will be used to calculate the name of the directory under the source. From there
- // all of the source extensions will be searched for the source zip file.
- // This is assuming that find returns a url where the file part of the url is a standard path and doesn't have
- // things like special chars to indicate within a jar. That would appear when it is resolved, but I think that the
- // unresolved ones from find are typically "jarbundle://nnn/path" or something like that. This is a gray area.
- URL jarURL = FileLocator.find(bundle, filepath, null);
- if (jarURL == null)
- return new URL[2];
-
- // Found it, so let's try to find which bundle/fragment it was found in.
- String jarString = jarURL.toExternalForm();
- // First the bundle itself.
- String installLoc = bundle.getEntry("/").toExternalForm(); //$NON-NLS-1$
- URL sourceURL = null;
- if (jarString.startsWith(installLoc))
- sourceURL = getSrcFrom(bundle, installLoc, jarString);
- else {
- // Now look in the fragments.
- Bundle[] frags = Platform.getFragments(bundle);
- for (int i = 0; i < frags.length; i++) {
- installLoc = frags[i].getEntry("/").toExternalForm(); //$NON-NLS-1$
- if (jarString.startsWith(installLoc)) {
- sourceURL = getSrcFrom(frags[i], installLoc, jarString);
- break;
- }
- }
- }
- return new URL[] {jarURL, sourceURL};
- }
-
- private URL getSrcFrom(Bundle bundle, String installLoc, String jarString) {
- // format of path in a PDE source plugin is (under the "src" directory from the extension point),
- // "bundlename_bundleversion/pathOfJar/jarnamesrc.zip". However there is no way to know
- // which extension has the source in it, so we need to search them all.
-
- IPath srcPath = new Path(bundle.getSymbolicName()+"_"+ (String) bundle.getHeaders("").get(Constants.BUNDLE_VERSION)); //$NON-NLS-1$ //$NON-NLS-2$ $NON-NLS-2$
- srcPath = srcPath.append(new Path(jarString.substring(installLoc.length())));
- if (srcPath.segmentCount() < 2)
- return null; // Something is not right. No jar name.
- srcPath = srcPath.removeFileExtension(); // Remove the .jar.
- String jarName = srcPath.lastSegment(); // This should be the jar name.
- srcPath = srcPath.removeLastSegments(1).append(jarName+"src.zip"); //$NON-NLS-1$
-
- // Now look through all of the src extensions. Can't tell if the extension is from a fragment or a bundle, so we need to
- // use Platform.find() to look in the bundle and fragment. So we may get a dup search if there is a fragment source
- // (for example platform source and win32 platform source (which is a fragment of platform source).
- IConfigurationElement[] ces = Platform.getExtensionRegistry().getConfigurationElementsFor("org.eclipse.pde.core.source"); //$NON-NLS-1$
- for (int i = 0; i < ces.length; i++) {
- IPath srcsrch = new Path(ces[i].getAttribute("path")).append(srcPath); //$NON-NLS-1$
- Bundle srcBundle = Platform.getBundle(ces[i].getDeclaringExtension().getContributor().getName());
- URL srcUrl = FileLocator.find(srcBundle, srcsrch, null);
- if (srcUrl != null) {
- return srcUrl;
- }
- }
- return null;
- }
-}
diff --git a/plugins/org.eclipse.jem.proxy/proxy/org/eclipse/jem/internal/proxy/core/ThrowableProxy.java b/plugins/org.eclipse.jem.proxy/proxy/org/eclipse/jem/internal/proxy/core/ThrowableProxy.java
deleted file mode 100644
index dd8014f..0000000
--- a/plugins/org.eclipse.jem.proxy/proxy/org/eclipse/jem/internal/proxy/core/ThrowableProxy.java
+++ /dev/null
@@ -1,73 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2001, 2005 IBM Corporation and others.
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
- *
- * Contributors:
- * IBM Corporation - initial API and implementation
- *******************************************************************************/
-package org.eclipse.jem.internal.proxy.core;
-/*
-
-
- */
-
-
-/**
- * This is a proxy wrapper for an exception being thrown on the
- * remove VM. The standard exception methods refer to this proxy.
- * To refer to the proxied exception itself, the methods defined
- * in here would be used.
- */
-public abstract class ThrowableProxy extends java.lang.Exception implements IBeanProxy {
- /**
- *
- */
- private static final long serialVersionUID = 1L;
-
-/**
- * Constructs an <code>Exception</code> with no specified detail message.
- */
- public ThrowableProxy() {
- super();
- }
-
- /**
- * @param message
- * @param cause
- *
- * @since 1.1.0
- */
- protected ThrowableProxy(String message, Throwable cause) {
- super(message, cause);
- }
- /**
- * @param cause
- *
- * @since 1.1.0
- */
- protected ThrowableProxy(Throwable cause) {
- super(cause);
- }
- /**
- * Constructs an <code>Exception</code> with the specified detail message.
- *
- * @param s the detail message.
- */
- public ThrowableProxy(String s) {
- super(s);
- }
-
-
- public abstract String getProxyLocalizedMessage();
- public abstract String getProxyMessage();
- public abstract void printProxyStackTrace(java.io.PrintWriter writer);
- public abstract void printProxyStackTrace(java.io.PrintStream stream);
- public abstract void printProxyStackTrace();
-
- public String toString() {
- return super.toString() + "Proxy: " + toBeanString(); //$NON-NLS1$ - toString's aren't nls'ed. //$NON-NLS-1$
- }
-}
diff --git a/plugins/org.eclipse.jem.proxy/proxy/org/eclipse/jem/internal/proxy/core/UIRunner.java b/plugins/org.eclipse.jem.proxy/proxy/org/eclipse/jem/internal/proxy/core/UIRunner.java
deleted file mode 100644
index 06fdbf1..0000000
--- a/plugins/org.eclipse.jem.proxy/proxy/org/eclipse/jem/internal/proxy/core/UIRunner.java
+++ /dev/null
@@ -1,105 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2004, 2005 IBM Corporation and others.
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
- *
- * Contributors:
- * IBM Corporation - initial API and implementation
- *******************************************************************************/
-/*
-
-
- */
-package org.eclipse.jem.internal.proxy.core;
-
-import java.lang.reflect.InvocationTargetException;
-import java.util.logging.Level;
-
-import org.eclipse.core.runtime.*;
-import org.eclipse.core.runtime.CoreException;
-import org.eclipse.core.runtime.IProgressMonitor;
-import org.eclipse.jface.operation.IRunnableWithProgress;
-import org.eclipse.swt.widgets.Display;
-import org.eclipse.ui.PlatformUI;
-
-
-/**
- * The actual implementation of IUIRunner to run the build under
- * IProgressService control if in the UI thread.
- *
- * <package-protected> because should only be used within here.
- *
- * @since 1.0.0
- */
-class UIRunner implements IUIRunner {
-
- /*
- * Special class that takes a progress monitor 1 and only handles isCanceled from it,
- * but everything else is forwarded to progress monitor 2. This allows the pm that
- * is sent into handleBuild to signal a cancel even though the progress service
- * sends in its own pm.
- *
- * @since 1.0.0
- */
- private static class UIRunnerProgressMonitor extends ProgressMonitorWrapper {
- private IProgressMonitor pmcancel;
-
- public UIRunnerProgressMonitor(IProgressMonitor pmcancel, IProgressMonitor pmmain) {
- super(pmmain);
- this.pmcancel = pmcancel;
- }
-
-
- /* (non-Javadoc)
- * @see org.eclipse.core.runtime.IProgressMonitor#isCanceled()
- */
- public boolean isCanceled() {
- return pmcancel.isCanceled() || super.isCanceled();
- }
-
- /* (non-Javadoc)
- * @see org.eclipse.core.runtime.IProgressMonitor#setCanceled(boolean)
- */
- public void setCanceled(boolean value) {
- super.setCanceled(value);
- pmcancel.setCanceled(value); // Cancel it too now.
- }
- }
-
- /* (non-Javadoc)
- * @see org.eclipse.jem.internal.proxy.core.IUIRunner#handleBuild(org.eclipse.core.runtime.IProgressMonitor)
- */
- public void handleBuild(final IProgressMonitor pm) throws CoreException {
- if (!PlatformUI.isWorkbenchRunning() || Display.getCurrent() == null) {
- ProxyLaunchSupport.runBuild(pm);
- } else {
- pm.beginTask("", 100); //$NON-NLS-1$
- try {
- PlatformUI.getWorkbench().getProgressService().busyCursorWhile(new IRunnableWithProgress() {
-
- public void run(IProgressMonitor monitor) throws InvocationTargetException, InterruptedException {
- IProgressMonitor uipm = new UIRunnerProgressMonitor(pm, monitor);
- try {
- ProxyLaunchSupport.runBuild(uipm);
- } catch (CoreException e) {
- throw new InvocationTargetException(e);
- }
- if (uipm.isCanceled()) {
- pm.setCanceled(true); // Make sure that cancel got through (could of come from monitor instead).
- throw new InterruptedException();
- }
- }
- });
- } catch (InvocationTargetException e) {
- if (e.getCause() instanceof CoreException)
- throw (CoreException) e.getCause();
- ProxyPlugin.getPlugin().getLogger().log(e.getCause(), Level.WARNING);
- } catch (InterruptedException e) {
- // It was canceled, launch will be canceled too. pm is already marked canceled and caller can check that
- }
- pm.done();
- }
- }
-}
diff --git a/plugins/org.eclipse.jem.proxy/proxy/org/eclipse/jem/internal/proxy/core/messages.properties b/plugins/org.eclipse.jem.proxy/proxy/org/eclipse/jem/internal/proxy/core/messages.properties
deleted file mode 100644
index e6e08c3..0000000
--- a/plugins/org.eclipse.jem.proxy/proxy/org/eclipse/jem/internal/proxy/core/messages.properties
+++ /dev/null
@@ -1,49 +0,0 @@
-###############################################################################
-# Copyright (c) 2003, 2005 IBM Corporation and others.
-# All rights reserved. This program and the accompanying materials
-# are made available under the terms of the Eclipse Public License v1.0
-# which accompanies this distribution, and is available at
-# http://www.eclipse.org/legal/epl-v10.html
-#
-# Contributors:
-# IBM Corporation - initial API and implementation
-###############################################################################
-#
-# $Source: /cvsroot/webtools/jeetools.move/webtools.javaee.git/plugins/org.eclipse.jem.proxy/proxy/org/eclipse/jem/internal/proxy/core/messages.properties,v $
-# $Revision: 1.12 $ $Date: 2005/08/24 20:39:05 $
-#
-
-
-
-#
-# Exception Messages. All of these messages are the text of an java exception.
-#
-UnexpectedException_EXC_ = IWAV0064E Unexpected exception thrown.
-
-# {0} and {1} are java classes (e.g. java.lang.Object)
-ClassCast_EXC__IncorrectType = IWAV0065E "{0}" is neither a subclass of, nor does it implement, class "{1}".
-
-# Standard Bean Proxy Factory and Standard Bean Type Proxy Factory are terms in beaninfo. They are the
-# standard (i.e. base) factories for beans or bean types. Bean types are java classes.
-ProxyFactory_EXC__NoBeanProxyFactory = IWAV0066E No Standard Bean Proxy Factory has been set.
-ProxyFactory_EXC__NoBeanTypeProxyFactory = IWAV0067E No Standard Bean Type Proxy Factory has been set.
-
-
-# {0} is the title of a project.
-Not_Java_Project_WARN_ = IWAV0068W Project "{0}" is not a java project.
-No_VM_WARN_ = IWAV0069W Project "{0}" has no Java JRE defined to use to run programs within this project.
-No_Implementation_WARN_ = IWAV0070W Cannot find a proxy implementation to use for project "{0}."
-
-ProxyLaunch = Launching Local Proxy VM
-ProxyWaitForBuild = Waiting for build to complete
-Expression_InInvalidStateDueTo_EXC_ = IWAV0162E Expression is in invalid state due to "{0}"
-Expression_InInvalidState_EXC_ = IWAV0163E Expression is in invalid state
-Expression_TypeSentInInvalidOrder_EXC_ = IWAV0164E Expression type sent in invalid order, received: {0}, expected {1}.
-Expression_ArrayTypeNotAnArray_EXC_ = IWAV0165E ArrayType "{0}" is not an array.
-Expression_CannotHandleNoReceiveOnFieldAccess_EXC_ = IWAV0166E Access by field name ({0}) (not by proxy) requires a receiver.
-Expression_MethodsNeedReceiver_EXC_ = IWAV0167E Access by method name ({0}) (not by proxy) requires a receiver.
-Expression_InvalidMarkNesting = IWAV0168E Improper nesting of mark statements in Expression. Tried to pop or endMark to before current mark. Tried to go past Mark# {0}.
-Expression_InvalidProxy=Expression Proxy is for a different expression
-ProxyPlugin_CleanupDefaultProxyLaunchConfigurations = Clean up default proxy launch configurations.
-ProxyLaunchSupport_RegistryCouldNotStartForSomeReason_WARN_ = IWAV0168W Registry could not be started for some reason.
-Expression_CreateProxyReassignmentExpression_InvalidForReassignment_EXC_=Invalid expression type for reassignment: {0}
diff --git a/plugins/org.eclipse.jem.proxy/proxyCommon/org/eclipse/jem/internal/proxy/common/AmbiguousMethodException.java b/plugins/org.eclipse.jem.proxy/proxyCommon/org/eclipse/jem/internal/proxy/common/AmbiguousMethodException.java
deleted file mode 100644
index 2856eba..0000000
--- a/plugins/org.eclipse.jem.proxy/proxyCommon/org/eclipse/jem/internal/proxy/common/AmbiguousMethodException.java
+++ /dev/null
@@ -1,33 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2005 IBM Corporation and others.
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
- *
- * Contributors:
- * IBM Corporation - initial API and implementation
- *******************************************************************************/
-/*
-
-
- */
-package org.eclipse.jem.internal.proxy.common;
-
-
-/**
- * Ambiguous Method Exception. I.E. There is more than one that could be used.
- */
-public class AmbiguousMethodException extends Exception {
- /**
- * Comment for <code>serialVersionUID</code>
- *
- * @since 1.1.0
- */
- private static final long serialVersionUID = -7084137612344373381L;
- public AmbiguousMethodException() {
- }
- public AmbiguousMethodException(String msg) {
- super(msg);
- }
-}
\ No newline at end of file
diff --git a/plugins/org.eclipse.jem.proxy/proxyCommon/org/eclipse/jem/internal/proxy/common/CommandException.java b/plugins/org.eclipse.jem.proxy/proxyCommon/org/eclipse/jem/internal/proxy/common/CommandException.java
deleted file mode 100644
index cbb25f2..0000000
--- a/plugins/org.eclipse.jem.proxy/proxyCommon/org/eclipse/jem/internal/proxy/common/CommandException.java
+++ /dev/null
@@ -1,50 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2001, 2005 IBM Corporation and others.
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
- *
- * Contributors:
- * IBM Corporation - initial API and implementation
- *******************************************************************************/
-package org.eclipse.jem.internal.proxy.common;
-/*
-
-
- */
-/**
- * An error occurred during command processing.
- *
- */
-
-public class CommandException extends Exception {
- /**
- * Comment for <code>serialVersionUID</code>
- *
- * @since 1.1.0
- */
- private static final long serialVersionUID = -2519238571145682514L;
- protected final Object fExceptionData;
-
- public CommandException() {
- fExceptionData = null;
- }
-
- public CommandException(Object data) {
- fExceptionData = data;
- }
-
- public CommandException(String msg, Object data) {
- super(msg);
- fExceptionData = data;
- }
-
- public Object getExceptionData() {
- return fExceptionData;
- }
-
- public boolean isRecoverable() {
- return false; // By default Command Exceptions are not recoverable.
- }
-}
diff --git a/plugins/org.eclipse.jem.proxy/proxyCommon/org/eclipse/jem/internal/proxy/common/GenericEventQueue.java b/plugins/org.eclipse.jem.proxy/proxyCommon/org/eclipse/jem/internal/proxy/common/GenericEventQueue.java
deleted file mode 100644
index 72fd9fd..0000000
--- a/plugins/org.eclipse.jem.proxy/proxyCommon/org/eclipse/jem/internal/proxy/common/GenericEventQueue.java
+++ /dev/null
@@ -1,146 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2005 IBM Corporation and others.
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
- *
- * Contributors:
- * IBM Corporation - initial API and implementation
- *******************************************************************************/
-/*
- * $RCSfile$
- * $Revision$ $Date$
- */
-package org.eclipse.jem.internal.proxy.common;
-
-import java.util.LinkedList;
-
-/**
- * A generic event queue. It runs on its own thread and will execute any queued up runnables.
- * <p>
- * When a runnable is added to the queue, the thread will be notified. If the thread is free it will
- * run the runnable. If it is not free, the runnable will be added to the queue. The thread will process
- * all intervening runnables and then execute the runnable in sequence with all of the rest.
- * <p>
- * This is used when you can't use the system widget (e.g. AWT event queue or SWT asyncExec) or when the
- * runnable must be executed on a non-ui thread.
- * <p>
- * <b>Note:</b> It is required that {@link #close()} be called so that resources are cleared up.
- *
- * @since 1.1.0.1
- */
-public class GenericEventQueue {
-
- private LinkedList queue = new LinkedList();
-
- private class EventThread extends Thread {
- private boolean run = true;
-
- public EventThread(String title) {
- super(title);
- }
-
- public void close() {
- synchronized (queue) {
- run = false;
- queue.clear();
- queue.notifyAll();
- }
- }
-
- public void postEvent(Runnable run) {
- if (!this.isAlive()) {
- throw new IllegalStateException("Event queue thread is not executing."); //$NON-NLS-1$
- }
- synchronized (queue) {
- if (run != null)
- queue.addLast(run);
- queue.notifyAll();
- }
- }
-
- public void run() {
- while (true) {
- Runnable runnable;
- synchronized (queue) {
- while (run && queue.isEmpty()) {
- try {
- queue.wait();
- } catch (InterruptedException e) {
- }
- }
- if (!run)
- return; // Done.
- else {
- runnable = (Runnable) queue.removeFirst();
- }
- }
-
- try {
- runnable.run();
- } catch (RuntimeException e) {
- e.printStackTrace();
- } finally {
- runnable = null; // Set this so that we don't hold onto resources in the runnable while waiting for next quy.
- }
- }
- }
- }
-
- private EventThread eventThread;
-
- /**
- * Construct with a title. (This title will be the title on the Thread for the queue).
- * The thread will have the same priority as the current thread.
- * @param queueTitle
- *
- * @since 1.1.0.1
- */
- public GenericEventQueue(String queueTitle) {
- this(queueTitle, Thread.currentThread().getPriority());
- }
-
- /**
- * Construct with a title. (This title will be the title on the Thread for the queue).
- * And a priority for the event queue's processing thread.
- * @param queueTitle
- * @param priority priority to use for event queue's thread.
- *
- * @since 1.1.0.1
- */
- public GenericEventQueue(String queueTitle, int priority) {
- eventThread = new EventThread(queueTitle);
- eventThread.setPriority(priority);
- synchronized(queue) {
- eventThread.start();
- try {
- queue.wait(100); // Wait for thread to start.
- } catch (InterruptedException e) {
- }
- }
- }
-
- /**
- * Close the event queue. This will clear out any pending events. They will not
- * be executed.
- *
- *
- * @since 1.1.0.1
- */
- public void close() {
- eventThread.close();
- }
-
- /**
- * Post the event.
- * @param runnable runnable to execute, or <code>null</code> to kick-start the thread if for some reason it may be waiting and it shouldn't be.
- *
- * @throws IllegalStateException thrown if the event queue thread has already been closed, or ended for some severe error.
- * @since 1.1.0.1
- */
- public void postEvent(Runnable runnable) {
- eventThread.postEvent(runnable);
- }
-
-}
diff --git a/plugins/org.eclipse.jem.proxy/proxyCommon/org/eclipse/jem/internal/proxy/common/ICallback.java b/plugins/org.eclipse.jem.proxy/proxyCommon/org/eclipse/jem/internal/proxy/common/ICallback.java
deleted file mode 100644
index 4d718fe..0000000
--- a/plugins/org.eclipse.jem.proxy/proxyCommon/org/eclipse/jem/internal/proxy/common/ICallback.java
+++ /dev/null
@@ -1,30 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2001, 2005 IBM Corporation and others.
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
- *
- * Contributors:
- * IBM Corporation - initial API and implementation
- *******************************************************************************/
-package org.eclipse.jem.internal.proxy.common;
-/*
-
-
- */
-
-/**
- * This interface is to be implemented by any callback.
- * The callback will use the IVMCallbackServer passed in to
- * get callback handlers, and the id passed in is
- * to be passed to these handlers.
- */
-public interface ICallback {
-
- /**
- * Initialize the callback
- */
- public void initializeCallback(IVMCallbackServer vmServer, int callbackID);
-
-}
diff --git a/plugins/org.eclipse.jem.proxy/proxyCommon/org/eclipse/jem/internal/proxy/common/ICallbackHandler.java b/plugins/org.eclipse.jem.proxy/proxyCommon/org/eclipse/jem/internal/proxy/common/ICallbackHandler.java
deleted file mode 100644
index 1d2f829..0000000
--- a/plugins/org.eclipse.jem.proxy/proxyCommon/org/eclipse/jem/internal/proxy/common/ICallbackHandler.java
+++ /dev/null
@@ -1,101 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2001, 2005 IBM Corporation and others.
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
- *
- * Contributors:
- * IBM Corporation - initial API and implementation
- *******************************************************************************/
-package org.eclipse.jem.internal.proxy.common;
-/*
-
-
- */
-
-/**
- * This is the interface for a callback handler.
- * Users will talk to this interface to perform
- * callbacks.
- */
-public interface ICallbackHandler {
-
- /**
- * Callback, but send the parm as an object, ie. it must
- * be nothing but constants, e.g. String, Integer, or an
- * array of constants. Constants should not be things like
- * regular objects. This is because only standard java.lang
- * type constants can be assured to be available on the other
- * client. Also you don't want to send big objects. It must
- * be constants that don't need to be sent back for any reason
- * since their identity will be lost in the transfer.
- * <p>
- * This should be used if there are no parms (i.e. it is null).
- * <p>
- * To send big objects, use the callback stream.
- *
- * @param callbackID
- * @param msgID
- * @param parm
- * @return
- * @throws CommandException
- *
- * @see IVMCallbackServer#requestStream(int, int)
- * @since 1.0.0
- */
- public Object callbackAsConstants(int callbackID, int msgID, Object parm) throws CommandException;
-
- /**
- * Callback to registered client.
- * <p>
- * The parms can be <code>null</code> if no parms, or it is an array of parms.
- * The parms
- * will be turned into proxies on the client vm. So the callback
- * will recieve an array of proxies to the values in the parms.
- * If any of the entries in the array is itself an array, a
- * proxy to the array will be created and sent. The array itself
- * will not be sent.
- * <p>
- * If an array entry should go across as an array of proxies and
- * not as one proxy to an array, then the entry needs to be an
- * instance of {@link ICallbackHandler.TransmitableArray transmitableArray}. This will flag
- * that it should transmit the entire entry as proxies. This should
- * be used sparingly, only if there isn't much data in the array and
- * all of the array would be used on the client. That way transmitting
- * the entire array will be faster than accessing individual components.
- * <p>
- * If the array contains only one entry or the parm itself is null, then {@link org.eclipse.jem.internal.proxy.core.ICallback#calledBack(int, IBeanProxy)}
- * will be called. Else {@link org.eclipse.jem.internal.proxy.core.ICallback#calledBack(int, Object[])} will be called with all of the parms
- * turned into proxies as mentioned in the previous paragraph.
- *
- * @param callbackID The id of the callback. This will be given
- * to the callback when it is created, and it must pass
- * on to the handler. That way it is know which callback
- * to call on the client.
- * @param msgID The id of the message for the callback. This is an
- * agreed upon id of the developers of the callback on both
- * sides.
- * @param parms Null if no parms, or an array of objects to send to the client vm. See the comments
- * above for a complete description of the parameter.
- *
- * @see ICallbackHandler.TransmitableArray
- */
- public Object callbackWithParms(int callbackID, int msgID, Object[] parms) throws CommandException;
-
- /**
- * Array wrapper that turns an array for parameters into a transmittable array.
- *
- * @see ICallbackHandler#callbackWithParms(int, int, Object[])
- * @since 1.1.0
- */
- public static class TransmitableArray {
- protected final Object[] fArray;
- public TransmitableArray(Object[] array) {
- fArray = array;
- }
- public Object[] getArray() {
- return fArray;
- }
- }
-}
diff --git a/plugins/org.eclipse.jem.proxy/proxyCommon/org/eclipse/jem/internal/proxy/common/ICallbackRunnable.java b/plugins/org.eclipse.jem.proxy/proxyCommon/org/eclipse/jem/internal/proxy/common/ICallbackRunnable.java
deleted file mode 100644
index ceaae7c..0000000
--- a/plugins/org.eclipse.jem.proxy/proxyCommon/org/eclipse/jem/internal/proxy/common/ICallbackRunnable.java
+++ /dev/null
@@ -1,28 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2001, 2005 IBM Corporation and others.
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
- *
- * Contributors:
- * IBM Corporation - initial API and implementation
- *******************************************************************************/
-/*
-
-
- */
-package org.eclipse.jem.internal.proxy.common;
-
-/**
- * Users would implement this as a runnable to
- * send a callback request.
- */
-public interface ICallbackRunnable {
-
- /**
- * The actual run code.
- */
- public Object run(ICallbackHandler handler) throws CommandException;
-
-}
diff --git a/plugins/org.eclipse.jem.proxy/proxyCommon/org/eclipse/jem/internal/proxy/common/ICommandException.java b/plugins/org.eclipse.jem.proxy/proxyCommon/org/eclipse/jem/internal/proxy/common/ICommandException.java
deleted file mode 100644
index 66b04df..0000000
--- a/plugins/org.eclipse.jem.proxy/proxyCommon/org/eclipse/jem/internal/proxy/common/ICommandException.java
+++ /dev/null
@@ -1,20 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2001, 2005 IBM Corporation and others.
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
- *
- * Contributors:
- * IBM Corporation - initial API and implementation
- *******************************************************************************/
-package org.eclipse.jem.internal.proxy.common;
-/*
-
-
- */
-
-
-public class ICommandException {
-
-}
diff --git a/plugins/org.eclipse.jem.proxy/proxyCommon/org/eclipse/jem/internal/proxy/common/IVMCallbackServer.java b/plugins/org.eclipse.jem.proxy/proxyCommon/org/eclipse/jem/internal/proxy/common/IVMCallbackServer.java
deleted file mode 100644
index e79349a..0000000
--- a/plugins/org.eclipse.jem.proxy/proxyCommon/org/eclipse/jem/internal/proxy/common/IVMCallbackServer.java
+++ /dev/null
@@ -1,48 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2001, 2005 IBM Corporation and others.
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
- *
- * Contributors:
- * IBM Corporation - initial API and implementation
- *******************************************************************************/
-package org.eclipse.jem.internal.proxy.common;
-/*
- * $RCSfile$
- * $Revision$ $Date$
- */
-
-import java.io.OutputStream;
-/**
- * This is the interface for accessing the
- * VM callback Server. It will be given to an
- * ICallback so that the callback can access
- * the server to request a callback.
- */
-public interface IVMCallbackServer {
-
- /**
- * Get the IVMServer for this callback server.
- * @return
- *
- * @since 1.1.0
- */
- public IVMServer getIVMServer();
-
-
- /**
- * Process a callback. The runnable contains the
- * actual code.
- */
- public Object doCallback(ICallbackRunnable runnable) throws CommandException;
-
- /**
- * Request a stream for writing a lot of data (suggested for larger
- * than several thousand bytes). The connection will be assigned
- * to this stream until the stream is closed.
- */
- public OutputStream requestStream(int callbackID, int msgID) throws CommandException;
-
-}
diff --git a/plugins/org.eclipse.jem.proxy/proxyCommon/org/eclipse/jem/internal/proxy/common/IVMServer.java b/plugins/org.eclipse.jem.proxy/proxyCommon/org/eclipse/jem/internal/proxy/common/IVMServer.java
deleted file mode 100644
index cdedb34..0000000
--- a/plugins/org.eclipse.jem.proxy/proxyCommon/org/eclipse/jem/internal/proxy/common/IVMServer.java
+++ /dev/null
@@ -1,50 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2005 IBM Corporation and others.
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
- *
- * Contributors:
- * IBM Corporation - initial API and implementation
- *******************************************************************************/
-/*
-
-
- */
-package org.eclipse.jem.internal.proxy.common;
-
-/**
- * This is the base server for the vm on the vm side (i.e. not the client side).
- * <p>
- * It can be passed to proxies if they need to access the vm server.
- * @since 1.1.0
- */
-public interface IVMServer {
-
- /**
- * Add a runnable that will be called if shutdown is requested. If already added,
- * it will not be added again.
- * <p>
- * The body of the runnable must not do any vm server calls. That is because
- * the server is shutdown at this point. The body must simply do clean up code.
- * The shutdown will not continue until the call to the runnable is returned.
- * <p>
- * Calls to this will be ignored if shutdown has already started.
- * @param runnable
- *
- * @since 1.1.0
- */
- public void addShutdownListener(Runnable runnable);
-
- /**
- * Remove the shutdown runnable from the list. If not added, then not an error to call this.
- * <p>
- * Calls to this will be ignored if shutdown has already started.
- * @param runnable
- *
- * @since 1.1.0
- */
- public void removeShutdownListener(Runnable runnable);
-
-}
diff --git a/plugins/org.eclipse.jem.proxy/proxyCommon/org/eclipse/jem/internal/proxy/common/MapTypes.java b/plugins/org.eclipse.jem.proxy/proxyCommon/org/eclipse/jem/internal/proxy/common/MapTypes.java
deleted file mode 100644
index c42afee..0000000
--- a/plugins/org.eclipse.jem.proxy/proxyCommon/org/eclipse/jem/internal/proxy/common/MapTypes.java
+++ /dev/null
@@ -1,159 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2004, 2005 IBM Corporation and others.
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
- *
- * Contributors:
- * IBM Corporation - initial API and implementation
- *******************************************************************************/
-/*
-
-
- */
-package org.eclipse.jem.internal.proxy.common;
-
-import java.util.HashMap;
-
-
-/**
- * This is used for mapping between JNI format and non-JNI format. It also has the
- * maps for primitives.
- * @since 1.0.0
- */
-public class MapTypes {
-
- public final static HashMap MAP_SHORTSIG_TO_TYPE = new HashMap(8);
- public final static HashMap MAP_TYPENAME_TO_SHORTSIG = new HashMap(8);
- static {
- MapTypes.MAP_SHORTSIG_TO_TYPE.put("B", Byte.TYPE); //$NON-NLS-1$
- MapTypes.MAP_SHORTSIG_TO_TYPE.put("C", Character.TYPE); //$NON-NLS-1$
- MapTypes.MAP_SHORTSIG_TO_TYPE.put("D", Double.TYPE); //$NON-NLS-1$
- MapTypes.MAP_SHORTSIG_TO_TYPE.put("F", Float.TYPE); //$NON-NLS-1$
- MapTypes.MAP_SHORTSIG_TO_TYPE.put("I", Integer.TYPE); //$NON-NLS-1$
- MapTypes.MAP_SHORTSIG_TO_TYPE.put("J", Long.TYPE); //$NON-NLS-1$
- MapTypes.MAP_SHORTSIG_TO_TYPE.put("S", Short.TYPE); //$NON-NLS-1$
- MapTypes.MAP_SHORTSIG_TO_TYPE.put("Z", Boolean.TYPE); //$NON-NLS-1$
-
- MapTypes.MAP_TYPENAME_TO_SHORTSIG.put("byte","B"); //$NON-NLS-1$ //$NON-NLS-2$
- MapTypes.MAP_TYPENAME_TO_SHORTSIG.put("char","C"); //$NON-NLS-1$ //$NON-NLS-2$
- MapTypes.MAP_TYPENAME_TO_SHORTSIG.put("double","D"); //$NON-NLS-1$ //$NON-NLS-2$
- MapTypes.MAP_TYPENAME_TO_SHORTSIG.put("float","F"); //$NON-NLS-1$ //$NON-NLS-2$
- MapTypes.MAP_TYPENAME_TO_SHORTSIG.put("int","I"); //$NON-NLS-1$ //$NON-NLS-2$
- MapTypes.MAP_TYPENAME_TO_SHORTSIG.put("long","J"); //$NON-NLS-1$ //$NON-NLS-2$
- MapTypes.MAP_TYPENAME_TO_SHORTSIG.put("short","S"); //$NON-NLS-1$ //$NON-NLS-2$
- MapTypes.MAP_TYPENAME_TO_SHORTSIG.put("boolean","Z"); //$NON-NLS-1$ //$NON-NLS-2$
- }
-
-
-
- /**
- * Convert formal type name for an array (i.e. java.lang.Object[]
- * to the jni format (i.e. [Ljava.lang.Object;)
- * This is used when a name is passed in from the IDE side.
- * The VM side uses the jni format, and all of proxy uses the jni format.
- *
- * @param classname
- * @return string jni form of name.
- *
- * @since 1.0.0
- */
- public static String getJNIFormatName(String classname) {
- if (classname.length() == 0 || !classname.endsWith("]")) //$NON-NLS-1$
- return classname; // Not an array,or invalid
-
- StringBuffer jni = new StringBuffer(classname.length());
- int firstOpenBracket = classname.indexOf('[');
- int ob = firstOpenBracket;
- while (ob > -1) {
- int cb = classname.indexOf(']', ob);
- if (cb == -1)
- break;
- jni.append('[');
- ob = classname.indexOf('[', cb);
- }
-
- String finalType = classname.substring(0, firstOpenBracket).trim();
- if (finalType != null) {
- String shortSig = (String) MapTypes.MAP_TYPENAME_TO_SHORTSIG.get(finalType);
- if (shortSig == null) {
- jni.append('L');
- jni.append(finalType);
- jni.append(';');
- } else {
- jni.append(shortSig);
- }
- }
-
- return jni.toString();
- }
-
- /**
- * This converts from the JNI format to the formal typename.
- *
- * @param jniName
- * @return formal typename
- *
- * @since 1.1.0
- */
- public static String getFormalTypeName(String jniName) {
- if (jniName.charAt(0) == '[') {
- // It is an array
- int dims = jniName.lastIndexOf('[')+1; // Number of dimensions
- int startType = dims;
- StringBuffer fName = new StringBuffer(jniName.length()+(2*dims));
- if (jniName.charAt(startType) == 'L')
- fName.append(jniName.substring(startType+1, jniName.length()-1)); // For "[Ljava.lang.String;" return "java.lang.String"
- else if (jniName.length() == startType+1) {
- // Possible primitive
- Class type = (Class) MAP_SHORTSIG_TO_TYPE.get(jniName.substring(startType, startType+1));
- if (type != null) {
- fName.append(type.getName());
- } else
- return ""; // Invalid if no 'L' and not a primitive. //$NON-NLS-1$
- } else
- return ""; // Invalid, must be either a primitive or 'L' type. //$NON-NLS-1$
- while(dims-- > 0) {
- fName.append("[]"); //$NON-NLS-1$
- }
- return fName.toString();
- } else if (jniName.length() == 1) {
- // Possible primitive.
- Class type = (Class) MAP_SHORTSIG_TO_TYPE.get(jniName);
- if (type != null) {
- return type.getName();
- }
- }
-
- // If got here then just a name as is.
- return jniName;
- }
-
- /**
- * Convert the formal type name, with the given number of dimensions,
- * to an array JNI type.
- * @param finalComponent final component name, should not be an array type.
- * @param dimensions number of dimensions for the array.
- * @return
- *
- * @since 1.1.0
- */
- public static String getJNITypeName(String finalComponent, int dimensions) {
- StringBuffer jni = new StringBuffer(finalComponent.length()+dimensions+2);
- while (dimensions-- > 0) {
- jni.append('[');
- }
-
- String shortSig = (String) MapTypes.MAP_TYPENAME_TO_SHORTSIG.get(finalComponent);
- if (shortSig == null) {
- jni.append('L');
- jni.append(finalComponent);
- jni.append(';');
- } else {
- jni.append(shortSig);
- }
-
- return jni.toString();
- }
-}
diff --git a/plugins/org.eclipse.jem.proxy/proxyCommon/org/eclipse/jem/internal/proxy/common/Messages.java b/plugins/org.eclipse.jem.proxy/proxyCommon/org/eclipse/jem/internal/proxy/common/Messages.java
deleted file mode 100644
index e9d2984..0000000
--- a/plugins/org.eclipse.jem.proxy/proxyCommon/org/eclipse/jem/internal/proxy/common/Messages.java
+++ /dev/null
@@ -1,41 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2006 IBM Corporation and others.
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
- *
- * Contributors:
- * IBM Corporation - initial API and implementation
- *******************************************************************************/
-/*
-
-
- */
-package org.eclipse.jem.internal.proxy.common;
-
-import java.util.MissingResourceException;
-import java.util.ResourceBundle;
-
-/**
- *
- * @since 1.2.0
- */
-public class Messages {
-
- private static final String BUNDLE_NAME = "org.eclipse.jem.internal.proxy.common.messages"; //$NON-NLS-1$
-
- private static final ResourceBundle RESOURCE_BUNDLE = ResourceBundle.getBundle(BUNDLE_NAME);
-
- private Messages() {
- }
-
- public static String getString(String key) {
- // TODO Auto-generated method stub
- try {
- return RESOURCE_BUNDLE.getString(key);
- } catch (MissingResourceException e) {
- return '!' + key + '!';
- }
- }
-}
diff --git a/plugins/org.eclipse.jem.proxy/proxyCommon/org/eclipse/jem/internal/proxy/common/MethodHelper.java b/plugins/org.eclipse.jem.proxy/proxyCommon/org/eclipse/jem/internal/proxy/common/MethodHelper.java
deleted file mode 100644
index 3bceb66..0000000
--- a/plugins/org.eclipse.jem.proxy/proxyCommon/org/eclipse/jem/internal/proxy/common/MethodHelper.java
+++ /dev/null
@@ -1,272 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2001, 2006 IBM Corporation and others.
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
- *
- * Contributors:
- * IBM Corporation - initial API and implementation
- *******************************************************************************/
-package org.eclipse.jem.internal.proxy.common;
-import java.lang.reflect.*;
-import java.text.MessageFormat;
-import java.util.*;
-
-/**
- * This is a class to do message/constructor work.
- * Specifically to find the most appropriate method.
- */
-public class MethodHelper {
-
- /*
- * The class that is used to represent Null class type.
- *
- * @since 1.0.0
- */
- private static class NULL_CLASS {
- }
-
- public static final Class NULL_TYPE = NULL_CLASS.class;
-
- static final ArrayList sPrimitivesOrder;
- static final int sCharPos;
-
- static {
- sPrimitivesOrder = new ArrayList(6);
- sPrimitivesOrder.add(Byte.TYPE);
- sPrimitivesOrder.add(Short.TYPE);
- sPrimitivesOrder.add(Integer.TYPE);
- sPrimitivesOrder.add(Long.TYPE);
- sPrimitivesOrder.add(Float.TYPE);
- sPrimitivesOrder.add(Double.TYPE);
-
- // char can be treated like a short for purposes of ordering.
- sCharPos = sPrimitivesOrder.indexOf(Short.TYPE);
- }
-
- /**
- * Return whether the type2 can be assigned to type1 in
- * method argument conversion.
- */
- public static boolean isAssignableFrom(Class type1, Class type2) {
- if (type1 == type2)
- return true; // They're the same, so assignable.
- if (type1.isPrimitive()) {
- if (type2.isPrimitive()) {
- if (type1 == Boolean.TYPE || type2 == Boolean.TYPE)
- return false; // Since not equal and one is boolean and the other isn't, not assignable
- int type1Pos = (type1 != Character.TYPE) ? sPrimitivesOrder.indexOf(type1) : sCharPos;
- int type2Pos = (type2 != Character.TYPE) ? sPrimitivesOrder.indexOf(type2) : sCharPos;
- return type1Pos > type2Pos; // It can be widened if type1 is higher in the order
- }
- return false; // primitive to non-primitive, not assignable.
- } else
- if (type2 == NULL_TYPE)
- return true; // NULL_TYPE represents null for us, and null can be assigned to any object
- else
- return type1.isAssignableFrom(type2); // Can type2 be assigned to type1
- }
-
-
- /**
- * Every entry in Array2 can be assigned to the corresponding entry in Array1.
- */
- public static boolean isAssignableFrom(Class[] types1, Class[] types2) {
- if (types1.length != types2.length)
- return false; // Not the same size, so not compatible.
- for (int i=0; i<types1.length; i++) {
- if (!isAssignableFrom(types1[i], types2[i]))
- return false;
- }
- return true; // All are assignable
- }
-
- /**
- * Return the index of the most compatible method/constructor from the lists passed in.
- * MethodsList: List of methods (if null then this is for constructors)
- * ParmsList: List of parms for each method (each entry will be Class[]).
- */
- private static int findMostCompatible(List methods, List parms, String ambiguousName) throws AmbiguousMethodException {
- // The algorithm used is from the Java Language Specification 15.12.2.2
- // Find the maximally specific ones
- // This is defined as the one that is more specific then all of the rest.
- // If there are duplicates parms that are maximally specific, then it doesn't matter which choosen
- // because when invoked the JVM will make sure the right thing is done.
- //
- Class[][] parmsCopy = (Class[][]) parms.toArray(new Class[parms.size()][]);
- int size = parmsCopy.length;
- // For each entry see if it is maximally specific, i.e. it is more specific then all of the others.
-nextMethod: for (int i=0; i<size; i++) {
- // For ctors we don't need to test the declaring class because it will always be the same class.
- Class dclClassi = methods != null ? ((Method) methods.get(i)).getDeclaringClass() : null;
- Class[] parmsi = parmsCopy[i];
- for (int j=0; j<size; j++) {
- if (i == j)
- continue;
- // Methodi is more specific if
- // a) Methodi declaring class is assignable to Methodj declaring class
- // b) Methodi parms are assignable to Methodj parms
- //
- // First see if Methodi is more specific, if it is
- // then throw out Methodj and continue
- // If Methodi is not compatible to Methodj, go to the next method for i. Methodi is not the most specific
- // Something else is either more specific or none are ma
- if (dclClassi != null) {
- // Step a
- if (!isAssignableFrom(((Method) methods.get(j)).getDeclaringClass(), dclClassi))
- continue nextMethod; // Methodi is not more specific than Methodj, so try next i.
- }
-
- // Step b
- Class[] parmsj = parmsCopy[j];
- if (!isAssignableFrom(parmsj, parmsi)) {
- // Methodi is not more specific than Methodj, so go to next i.
- continue nextMethod;
- }
- }
- return i; // Methodi is more specific than all of the other ones.
- }
-
- throw new AmbiguousMethodException(ambiguousName); // There was not one more specific than all of the others.
- }
-
- /**
- * Find the most compatible method for the given arguments.
- */
- public static Method findCompatibleMethod(Class receiver, String methodName, Class[] arguments) throws NoSuchMethodException, AmbiguousMethodException {
- try {
- return receiver.getMethod(methodName, arguments); // Found exact match in public
- } catch (NoSuchMethodException exc) {
- if (arguments != null) {
- // Need to find most compatible one. We will take protected into consideration (i.e. inheritance).
- ArrayList parmsList = new ArrayList(); // The parm list from each compatible method.
- ArrayList mthdsList = new ArrayList(); // The list of compatible methods, same order as the parms above.
- Class cls = receiver;
- while (cls != null) {
- Method mthds[] = cls.getDeclaredMethods();
- for (int i = 0; i < mthds.length; i++) {
- Method mthd = mthds[i];
- if (!mthd.getName().equals(methodName))
- continue; // Not compatible, not same name
- int modifiers = mthd.getModifiers();
- if (!(Modifier.isPublic(modifiers) || Modifier.isProtected(modifiers)))
- continue; // Will not call private or package-protected because we don't know the context.
- Class[] parms = mthd.getParameterTypes();
- // If exact match we found a non-public exact match, which is good.
- if (Arrays.equals(arguments, parms))
- return makeMethodAccessable(mthd);
- if (!isAssignableFrom(parms, arguments))
- continue; // Not compatible, parms
- // It is compatible with the requested method - now see if we already have an exact match from a subclass. Don't want to add it twice.
- // We are assuming the actual number of compatible methods is small, so this O(n-squared) search is efficient enough.
- int size = parmsList.size();
- for (int j = 0; j < size; j++) {
- if (Arrays.equals(parms, (Object[]) parmsList.get(j)))
- continue;
- }
- parmsList.add(parms);
- mthdsList.add(mthd);
- }
- cls = cls.getSuperclass();
- }
- // Now have list of compatible methods.
- if (parmsList.size() == 0)
- throw throwFixedNoSuchMethod(exc, receiver, methodName, arguments); // None found, so rethrow the exception
- if (parmsList.size() == 1)
- return makeMethodAccessable((Method) mthdsList.get(0)); // Only one, so return it
-
- // Now find the most compatible method
- int mostCompatible = findMostCompatible(mthdsList, parmsList, methodName);
- return makeMethodAccessable((Method) mthdsList.get(mostCompatible));
- } else
- throw throwFixedNoSuchMethod(exc, receiver, methodName, arguments); // None found, so rethrow the exception
- }
- }
-
- private static Method makeMethodAccessable(Method m) {
- m.setAccessible(true); // We allow all access, let ide and compiler handle security.
- return m;
- }
-
- /*
- * NoSuchMEthodExeception doesn't include the signature. Since these are dynamic searches, the exception itself is useless without
- * the signature. So we add it.
- */
- private static NoSuchMethodException throwFixedNoSuchMethod(NoSuchMethodException e, Class declareClass, String methodName, Class[] argClasses) {
-
- // The default trace doesn't show what method was being searched for, so recreate with that.
- StringBuffer s = new StringBuffer();
- s.append(declareClass.getName());
- s.append('.');
- s.append(methodName);
- s.append('(');
- if (argClasses != null) {
- for (int i = 0; i < argClasses.length; i++) {
- if (i > 0)
- s.append(',');
- s.append(argClasses[i].getName());
- }
- }
- s.append(')');
- NoSuchMethodException ne = new NoSuchMethodException(s.toString());
- ne.setStackTrace(e.getStackTrace());
- return ne;
- }
-
-
- /**
- * Find the most compatible constructor for the class with the given arguments.
- * @param receiver class to get the constructor for
- * @param arguments array of argument types
- * @return the constructor
- * @throws NoSuchMethodException no compatible constructor can be found
- * @throws AmbiguousMethodException there is more than one compatible constructor
- * @throws IllegalAccessException it can't be accessed. Such as it is a non-static inner class.
- *
- * @since 1.2.0
- */
- public static Constructor findCompatibleConstructor(Class receiver, Class[] arguments) throws NoSuchMethodException, AmbiguousMethodException, IllegalAccessException {
- if (receiver.getDeclaringClass() != null && !Modifier.isStatic(receiver.getModifiers()))
- throw new IllegalAccessException(MessageFormat.format(Messages.getString("MethodHelper.NONSTATICINNERCLASS_WARNING"), new Object[] {receiver.getName()})); //$NON-NLS-1$
- try {
- java.lang.reflect.Constructor ctor = receiver.getDeclaredConstructor(arguments);
- ctor.setAccessible(true); // We allow all access, let ide and compiler handle security.
- return ctor; // Found exact match
- } catch (NoSuchMethodException exc) {
- if (arguments != null) {
- // Need to find most compatible one.
- java.lang.reflect.Constructor ctors[] = receiver.getDeclaredConstructors();
- ArrayList parmsList = new ArrayList(ctors.length); // The parm list from each compatible method.
- ArrayList ctorsList = new ArrayList(ctors.length); // The list of compatible methods, same order as the parms above.
- for (int i = 0; i < ctors.length; i++) {
- java.lang.reflect.Constructor ctor = ctors[i];
- Class[] parms = ctor.getParameterTypes();
- if (!isAssignableFrom(parms, arguments))
- continue; // Not compatible, parms
- // It is compatible with the requested method
- parmsList.add(parms);
- ctorsList.add(ctor);
- }
-
- // Now have list of compatible methods.
- if (parmsList.size() == 0)
- throw exc; // None found, so rethrow the exception
- if (parmsList.size() == 1) {
- java.lang.reflect.Constructor ctor = (java.lang.reflect.Constructor) ctorsList.get(0); // Only one, so return it
- ctor.setAccessible(true); // We allow all access, let ide and compilor handle security.
- return ctor;
- }
-
- // Now find the most compatible ctor
- int mostCompatible = findMostCompatible(null, parmsList, receiver.getName());
- java.lang.reflect.Constructor ctor = (java.lang.reflect.Constructor) ctorsList.get(mostCompatible);
- ctor.setAccessible(true); // We allow all access, let ide and compilor handle security.
- return ctor;
- } else
- throw exc; // None found, so rethrow the exception
- }
- }
-
-
-}
diff --git a/plugins/org.eclipse.jem.proxy/proxyCommon/org/eclipse/jem/internal/proxy/common/UnresolvedCompilationError.java b/plugins/org.eclipse.jem.proxy/proxyCommon/org/eclipse/jem/internal/proxy/common/UnresolvedCompilationError.java
deleted file mode 100644
index 687dd6f..0000000
--- a/plugins/org.eclipse.jem.proxy/proxyCommon/org/eclipse/jem/internal/proxy/common/UnresolvedCompilationError.java
+++ /dev/null
@@ -1,47 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2005 IBM Corporation and others.
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
- *
- * Contributors:
- * IBM Corporation - initial API and implementation
- *******************************************************************************/
-/*
- * $RCSfile$
- * $Revision$ $Date$
- */
-package org.eclipse.jem.internal.proxy.common;
-
-/**
- * Used by the the registries to indicate "UnresolvedCompilationError". This is because the
- * normal java throws just an Error with a message. To make it easier in processing, it will
- * be turned into this error instead so that it can be explicitly caught.
- * <p>
- * This will only be used in certain explicit parts of the code. It will be detailed where
- * it can be thrown.
- *
- * @since 1.1.0.1
- */
-public class UnresolvedCompilationError extends Error {
-
- /**
- * Comment for <code>serialVersionUID</code>
- *
- * @since 1.1.0.1
- */
- private static final long serialVersionUID = 7778842211073592790L;
-
- /**
- * Construct from an Error.
- * @param error The error that is the actual one. <b>This will not be the cause, the message and stacktrace will be copied into this new error.</b>
- *
- * @since 1.1.0.1
- */
- public UnresolvedCompilationError(Error error) {
- super(error.getMessage());
- setStackTrace(error.getStackTrace());
- }
-
-}
diff --git a/plugins/org.eclipse.jem.proxy/proxyCommon/org/eclipse/jem/internal/proxy/common/messages.properties b/plugins/org.eclipse.jem.proxy/proxyCommon/org/eclipse/jem/internal/proxy/common/messages.properties
deleted file mode 100644
index 937eea7..0000000
--- a/plugins/org.eclipse.jem.proxy/proxyCommon/org/eclipse/jem/internal/proxy/common/messages.properties
+++ /dev/null
@@ -1,11 +0,0 @@
-###############################################################################
-# Copyright (c) 2006 IBM Corporation and others.
-# All rights reserved. This program and the accompanying materials
-# are made available under the terms of the Eclipse Public License v1.0
-# which accompanies this distribution, and is available at
-# http://www.eclipse.org/legal/epl-v10.html
-#
-# Contributors:
-# IBM Corporation - initial API and implementation
-###############################################################################
-MethodHelper.NONSTATICINNERCLASS_WARNING=Class {0} is a non-static inner class. These cannot be instantiated at this time.
diff --git a/plugins/org.eclipse.jem.proxy/proxyRemote/org/eclipse/jem/internal/proxy/remote/BeanProxyValueSender.java b/plugins/org.eclipse.jem.proxy/proxyRemote/org/eclipse/jem/internal/proxy/remote/BeanProxyValueSender.java
deleted file mode 100644
index 3765039..0000000
--- a/plugins/org.eclipse.jem.proxy/proxyRemote/org/eclipse/jem/internal/proxy/remote/BeanProxyValueSender.java
+++ /dev/null
@@ -1,96 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2005 IBM Corporation and others.
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
- *
- * Contributors:
- * IBM Corporation - initial API and implementation
- *******************************************************************************/
-/*
-
-
- */
-package org.eclipse.jem.internal.proxy.remote;
-
-import org.eclipse.core.runtime.IStatus;
-import org.eclipse.core.runtime.Status;
-
-import org.eclipse.jem.internal.proxy.common.CommandException;
-import org.eclipse.jem.internal.proxy.common.remote.Commands;
-import org.eclipse.jem.internal.proxy.core.ProxyPlugin;
-import org.eclipse.jem.internal.proxy.core.ThrowableProxy;
-
-/**
- * Useful in REM to get the array of BeanProxyValues.
- *
- * @since 1.1.0
- */
-public class BeanProxyValueSender implements Commands.ValueSender {
- protected int index = 0;
- protected Object[] array;
- private Exception exception;
- private final REMStandardBeanProxyFactory factory;
-
- /**
- * See if there was an exception thrown during reading.
- *
- * @return an exception or <code>null</code> if no exception.
- *
- * @since 1.1.0
- */
- public Exception getException() {
- return exception;
- }
-
- public BeanProxyValueSender(REMStandardBeanProxyFactory factory) {
- this.factory = factory;
- }
- public BeanProxyValueSender(REMStandardBeanProxyFactory factory, Commands.ValueObject arrayHeader) {
- this(factory);
- initialize(arrayHeader);
- }
-
- public void initialize(Commands.ValueObject arrayHeader) {
- index = 0;
- // The array type doesn't matter, it will be an array of objects.
- // The values will either be IBeanProxies or an array, or constants.
- array = new Object[arrayHeader.anInt];
- }
-
- public void clear() {
- array = null;
- index = 0;
- }
-
- public Object[] getArray() {
- return array;
- }
-
- // A new value is being sent to the array
- // NOTE: It is important that this has been called within a transaction.
- public void sendValue(Commands.ValueObject value) {
- try {
- array[index++] = factory.getBeanProxy(value); // Add it to the array
- } catch (ThrowableProxy e) {
- // We can't stop it right away because we can't send exception on, however,
- // we can log it and save the exception.
- ProxyPlugin.getPlugin().getLogger().log(new Status(IStatus.ERROR, ProxyPlugin.getPlugin().getBundle().getSymbolicName(), 0, "", e)); //$NON-NLS-1$
- exception = e;
- } catch (CommandException e) {
- // We can't stop it right away because we can't send exception on, however,
- // we can log it and save the exception.
- ProxyPlugin.getPlugin().getLogger().log(new Status(IStatus.ERROR, ProxyPlugin.getPlugin().getBundle().getSymbolicName(), 0, "", e)); //$NON-NLS-1$
- exception = e;
- }
- }
-
- // The next entry is an array too!
- public Commands.ValueSender nestedArray(Commands.ValueObject arrayHeader) {
- BeanProxyValueSender sender = new BeanProxyValueSender(factory, arrayHeader);
- // Take the newly created array and put it into the current array.
- array[index++] = sender.getArray();
- return sender;
- }
-}
\ No newline at end of file
diff --git a/plugins/org.eclipse.jem.proxy/proxyRemote/org/eclipse/jem/internal/proxy/remote/DebugModeHelper.java b/plugins/org.eclipse.jem.proxy/proxyRemote/org/eclipse/jem/internal/proxy/remote/DebugModeHelper.java
deleted file mode 100644
index caab643..0000000
--- a/plugins/org.eclipse.jem.proxy/proxyRemote/org/eclipse/jem/internal/proxy/remote/DebugModeHelper.java
+++ /dev/null
@@ -1,365 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2001, 2005 IBM Corporation and others.
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
- *
- * Contributors:
- * IBM Corporation - initial API and implementation
- *******************************************************************************/
-/*
-
-
- */
-package org.eclipse.jem.internal.proxy.remote;
-
-
-import java.lang.reflect.*;
-
-import org.eclipse.core.runtime.Platform;
-import org.osgi.framework.Bundle;
-
-import org.eclipse.jem.internal.proxy.core.ProxyPlugin;
-/**
- * This is a helper for debug mode. It allows access to
- * the workbench, if available, or AWT, if available, for
- * the debug prompts. It uses reflection so that nothing is
- * forced to be loaded or pre-reqd. That way it can run headless.
- */
-
-class DebugModeHelper {
- boolean awt = false;
- boolean console = false;
- boolean setup = false;
- java.io.InputStreamReader inReader = null;
-
- // Workbench reflections
- Object display = null;
- Constructor cMB = null;
- Field fPrimaryModel = null;
- Method fasync = null;
- Method fsync = null;
- Method fSetText = null;
- Method fSetMessage = null;
- Method fOpen = null;
- Method fGetWorkbench = null;
- Class cSWT = null;
-
-
- // AWT Reflections
- Class cMessageDialog = null;
- Method fDoit = null;
-
- protected void setupType() {
- if (setup)
- return;
-
- setup = true;
-
- // See if use system console instead. If false or not set, then try to query usage.
- console = "true".equalsIgnoreCase(Platform.getDebugOption(ProxyPlugin.getPlugin().getBundle().getSymbolicName()+ProxyRemoteUtil.IO_CONSOLE)); //$NON-NLS-1$
- if (console)
- return;
-
- try {
- // See if PlatformUI plugin available.
- Bundle uiBundle = Platform.getBundle("org.eclipse.ui"); //$NON-NLS-1$
- if (uiBundle == null) {
- setupAWT(); // UI not available, try through AWT.
- return;
- }
-
- // Setup Eclipse
- Class cPlatformUI = uiBundle.loadClass("org.eclipse.ui.PlatformUI"); //$NON-NLS-1$
- Method isWBRunning = cPlatformUI.getMethod("isWorkbenchRunning", null); //$NON-NLS-1$
- if (!((Boolean) isWBRunning.invoke(null, null)).booleanValue()) {
- setupAWT(); // UI not available, try through AWT.
- return;
- }
-
- fGetWorkbench = cPlatformUI.getMethod("getWorkbench", null); //$NON-NLS-1$
- Object w = fGetWorkbench.invoke(null, null);
-
- if (w != null) {
- Class cDisplay = uiBundle.loadClass("org.eclipse.swt.widgets.Display"); //$NON-NLS-1$
- Method fGetCurrent = cDisplay.getMethod("getCurrent", null); //$NON-NLS-1$
- Method fGetDefault = cDisplay.getMethod("getDefault", null); //$NON-NLS-1$
- fasync = cDisplay.getMethod("asyncExec", new Class[] {Runnable.class}); //$NON-NLS-1$
- fsync = cDisplay.getMethod("syncExec", new Class[] {Runnable.class}); //$NON-NLS-1$
-
- // Get the display
- display = fGetCurrent.invoke(null, null);
- if (display == null)
- display = fGetDefault.invoke(null, null);
- }
-
- if (display != null) {
- Class cShell = uiBundle.loadClass("org.eclipse.swt.widgets.Shell"); //$NON-NLS-1$
- Class cMessageBox = uiBundle.loadClass("org.eclipse.swt.widgets.MessageBox"); //$NON-NLS-1$
- cMB = cMessageBox.getConstructor(new Class[] {cShell, Integer.TYPE});
-
- fSetText = cMessageBox.getMethod("setText", new Class[] {String.class}); //$NON-NLS-1$
- fSetMessage = cMessageBox.getMethod("setMessage", new Class[] {String.class}); //$NON-NLS-1$
- fOpen = cMessageBox.getMethod("open", null); //$NON-NLS-1$
-
- cSWT = uiBundle.loadClass("org.eclipse.swt.SWT"); //$NON-NLS-1$
- fPrimaryModel = cSWT.getField("PRIMARY_MODAL"); //$NON-NLS-1$
- } else {
- setupAWT(); // UI not available, try through AWT.
- }
- } catch (NoSuchMethodException e) {
- } catch (ClassNotFoundException e) {
- } catch (IllegalAccessException e) {
- } catch (InvocationTargetException e) {
- } catch (NoSuchFieldException e) {
- }
-
- return;
-
- }
-
- protected void setupAWT() {
-
- // See if AWT is available.
- try {
- cMessageDialog = Class.forName("org.eclipse.jem.internal.proxy.remote.MessageDialog"); //$NON-NLS-1$
- fDoit = cMessageDialog.getMethod("doit", new Class[] {String.class, String.class, String.class, String.class}); //$NON-NLS-1$
- awt = true;
- return;
- } catch (ClassNotFoundException e) {
- } catch (NoSuchMethodException e) {
- }
- console = true; // No AWT either, i.e. true headless environment
- }
-
- public boolean debugMode(final String name) {
- boolean debugMode = "true".equalsIgnoreCase(Platform.getDebugOption(ProxyPlugin.getPlugin().getBundle().getSymbolicName()+ProxyRemoteUtil.DEBUG_VM)); //$NON-NLS-1$
- if (!debugMode)
- return debugMode;
-
- setupType();
-
- // See if use system console instead. If false or not set, then try to query usage.
- if (console)
- return debugModeConsole(name);
-
- if (awt)
- return debugModeAWT(name);
-
- try {
- final Field fYes = cSWT.getField("YES"); //$NON-NLS-1$
- Field fNo = cSWT.getField("NO"); //$NON-NLS-1$
- Field fIcon = cSWT.getField("ICON_QUESTION"); //$NON-NLS-1$
-
- final int style = fYes.getInt(null) | fNo.getInt(null) | fIcon.getInt(null) | fPrimaryModel.getInt(null);
- final boolean[] db = new boolean[1];
-
- fsync.invoke(display, new Object[] { new Runnable() {
- /**
- * @see java.lang.Runnable#run()
- */
- public void run() {
- try {
- Object shell = getActiveShell();
- Object mb = cMB.newInstance(new Object[] {shell, new Integer(style)});
- fSetText.invoke(mb, new Object[] {"Debug RemoteVM?"}); //$NON-NLS-1$
- fSetMessage.invoke(mb, new Object[] {"Do you want to start the remote vm ("+name+") in debug mode?"}); // Not NLS'd because this is for internal developers only //$NON-NLS-1$ //$NON-NLS-2$
-
- db[0] = fYes.get(null).equals(fOpen.invoke(mb, null));
- } catch (InstantiationException e) {
- } catch (IllegalAccessException e) {
- } catch (InvocationTargetException e) {
- }
- }
- }});
- return db[0];
- } catch (IllegalAccessException e) {
- } catch (InvocationTargetException e) {
- } catch (NoSuchFieldException e) {
- }
-
- return debugModeAWT(name);
- }
-
-
- /*
- * This must be called from within the display thread.
- */
- protected Object getActiveShell() {
- Object shell = null;
- try {
- Object w = fGetWorkbench.invoke(null, null);
- Object ww = null;
- if (w != null) {
- Class cWorkbench = w.getClass();
- Method getWorkbenchWindow = cWorkbench.getMethod("getActiveWorkbenchWindow", null); //$NON-NLS-1$
- ww = getWorkbenchWindow.invoke(w, null);
- }
- if (ww != null) {
- Class cWorkbenchWindow = ww.getClass();
- Method getShell = cWorkbenchWindow.getMethod("getShell", null); //$NON-NLS-1$
- shell = getShell.invoke(ww, null);
- }
- } catch (IllegalAccessException e) {
- } catch (InvocationTargetException e) {
- } catch (NoSuchMethodException e) {
- }
-
- return shell;
- }
-
- protected boolean debugModeAWT(String name) {
-
- // See if AWT is available.
- try {
- Integer r = (Integer) fDoit.invoke(null, new Object[] {"Debug RemoteVM?", "Do you want to start the remote vm ("+name+") in debug mode?", "Yes", "No"}); //$NON-NLS-1$ //$NON-NLS-2$ //$NON-NLS-3$ //$NON-NLS-4$ //$NON-NLS-5$
- return r.intValue() == 1; // i.e. button1 or "yes" was hit.
- } catch (IllegalAccessException e) {
- } catch (InvocationTargetException e) {
- }
-
- return false; // No AWT either, i.e. headless environment, shouldn't of gotton here.
- }
-
- protected boolean debugModeConsole(String name) {
-
- // Debug through the console
- inReader = new java.io.InputStreamReader(System.in);
- System.out.println("Do you want to start the remote vm ("+name+") in debug mode? (Enter Y or N):"); //$NON-NLS-1$ //$NON-NLS-2$
- char r = ' ';
- try {
- r = Character.toLowerCase((char) inReader.read());
- // Need to flush the input reader now.
- while (inReader.ready())
- inReader.read();
- return r == 'y'; // i.e. "y" was entered.
- } catch (java.io.IOException e) {
- }
-
- return false; // Error reading, so no debugging.
- }
-
- /**
- * Return true if continue debugging.
- */
- public boolean promptPort(final int dport) {
- if (awt)
- return promptPortAWT(dport);
- else if (console)
- return promptPortConsole(dport);
-
- try {
- final Field fOK = cSWT.getField("OK"); //$NON-NLS-1$
- Field fCancel = cSWT.getField("CANCEL"); //$NON-NLS-1$
- Field fIcon = cSWT.getField("ICON_WORKING"); //$NON-NLS-1$
-
- final int style = fOK.getInt(null) | fCancel.getInt(null) | fIcon.getInt(null) | fPrimaryModel.getInt(null);
-
- final boolean[] ok = new boolean[1];
- fsync.invoke(display, new Object[] { new Runnable() {
- /**
- * @see java.lang.Runnable#run()
- */
- public void run() {
- try {
- Object shell = getActiveShell();
- Object mb = cMB.newInstance(new Object[] {shell, new Integer(style)});
- fSetText.invoke(mb, new Object[] {"Connect Debugger to RemoteVM!"}); //$NON-NLS-1$
- fSetMessage.invoke(mb, new Object[] {"You must now attach the debugger to port number "+dport+". Press OK when the debugger is attached. The program will not continue properly without the debugger being attached. Press Cancel if you could not connect the debugger. This will still cause an error, but it will clean up better."}); // Not NLS'd because this is for internal developers only //$NON-NLS-1$ //$NON-NLS-2$
- ok[0] = fOK.get(null).equals(fOpen.invoke(mb, null));
- } catch (InstantiationException e) {
- } catch (IllegalAccessException e) {
- } catch (InvocationTargetException e) {
- }
- }
- }});
- return ok[0];
- } catch (NoSuchFieldException e) {
- } catch (InvocationTargetException e) {
- } catch (IllegalAccessException e) {
- }
- return false;
- }
-
- protected boolean promptPortAWT(int dport) {
- try {
- Integer r = (Integer) fDoit.invoke(null, new Object[] {"Connect Debugger to RemoteVM!", "You must now attach the debugger to port number "+dport+". Press OK when the debugger is attached. The program will not continue properly without the debugger being attached. Press Cancel if you could not connect the debugger. This will still cause an error, but it will clean up better.", "OK", "Cancel"}); //$NON-NLS-1$ //$NON-NLS-2$ //$NON-NLS-3$ //$NON-NLS-4$ //$NON-NLS-5$
- return r.intValue() == 1; // i.e. button1 or "OK" was hit.
- } catch (InvocationTargetException e) {
- } catch (IllegalAccessException e) {
- }
-
- return false;
- }
-
- protected boolean promptPortConsole(int dport) {
- System.out.println("You must now attach the debugger to port number "+dport+". Enter 'y' when the debugger is attached. The program will not continue properly without the debugger being attached. Press 'n' if you could not connect the debugger. This will still cause an error, but it will clean up better. Enter 'y' or 'n':"); //$NON-NLS-1$ //$NON-NLS-2$
- char r = ' ';
- try {
- r = Character.toLowerCase((char) inReader.read());
- while (inReader.ready())
- inReader.read();
- return r == 'y'; // i.e. "y" was entered, go on
- } catch (java.io.IOException e) {
- }
-
- return false;
- }
-
- /**
- * Display an error msg. There will only be an OK button.
- * This will always display, debug mode won't be looked at.
- * This is for errors. This will be displayed async, so this
- * may return before the msg has been displayed and answered,
- * but since the only response is OK, it doesn't really matter.
- */
- public void displayErrorMessage(final String title, final String msg) {
- setupType();
- if (console)
- displayErrorMessageConsole(title, msg);
- else if (awt)
- displayErrorMessageAWT(title, msg);
- else {
- try { // This needs to be done in display thread.
- Field fOK = cSWT.getField("OK"); //$NON-NLS-1$
- Field fIcon = cSWT.getField("ICON_ERROR"); //$NON-NLS-1$
-
- final int style = fOK.getInt(null) | fIcon.getInt(null) | fPrimaryModel.getInt(null);
- fasync.invoke(display, new Object[] { new Runnable() {
- /**
- * @see java.lang.Runnable#run()
- */
- public void run() { try { Object shell = getActiveShell();
- Object mb = cMB.newInstance(new Object[] { shell, new Integer(style)});
-
- fSetText.invoke(mb, new Object[] { title });
- fSetMessage.invoke(mb, new Object[] { msg });
- fOpen.invoke(mb, null);
- } catch (InstantiationException e) {
- } catch (IllegalAccessException e) {
- } catch (InvocationTargetException e) {
- }
- }
- }
- });
- } catch (NoSuchFieldException e) {
- } catch (InvocationTargetException e) {
- } catch (IllegalAccessException e) {
- }
- }
- }
-
- protected void displayErrorMessageConsole(String title, String msg) {
- System.out.println("Error: " + title); //$NON-NLS-1$
- System.out.println(" " + msg); //$NON-NLS-1$
- }
-
- protected void displayErrorMessageAWT(String title, String msg) {
- try {
- fDoit.invoke(null, new Object[] {title, msg, ProxyRemoteMessages.OK_7, null});
- } catch (InvocationTargetException e) {
- } catch (IllegalAccessException e) {
- }
- }
-}
diff --git a/plugins/org.eclipse.jem.proxy/proxyRemote/org/eclipse/jem/internal/proxy/remote/IREMBeanProxy.java b/plugins/org.eclipse.jem.proxy/proxyRemote/org/eclipse/jem/internal/proxy/remote/IREMBeanProxy.java
deleted file mode 100644
index 8e04276..0000000
--- a/plugins/org.eclipse.jem.proxy/proxyRemote/org/eclipse/jem/internal/proxy/remote/IREMBeanProxy.java
+++ /dev/null
@@ -1,63 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2001, 2005 IBM Corporation and others.
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
- *
- * Contributors:
- * IBM Corporation - initial API and implementation
- *******************************************************************************/
-package org.eclipse.jem.internal.proxy.remote;
-/*
-
-
- */
-
-
-import org.eclipse.jem.internal.proxy.core.IBeanProxy;
-import org.eclipse.jem.internal.proxy.common.remote.Commands;
-/**
- * A Remote VM proxy. All IBeanProxy implementations
- * for the Remote VM must also implement this interface.
- * This is necessary for proper functioning.
- *
- * NOTE: This is an internal interface to the Remote VM Proxy.
- * It MUST not be used outside of the proxy factory family.
- */
-
-public interface IREMBeanProxy extends IBeanProxy {
- /**
- * Return the ID of this proxy
- */
- public Integer getID();
-
- /**
- * Proxy is about to be released, MUST mark it invalid.
- * This is required. Resources can also be cleaned up
- * if they are being held and need to be cleaned up.
- *
- * NOTE: This method will only be called when the proxy
- * is explicitly released. If it is simply garbage collected,
- * then this method will not be called. Simple garbage collection
- * means that no one is referencing this proxy. The proxy factory
- * will know what id this proxy was referencing and will release it
- * on the server at GC time.
- *
- * If there are resources
- * that absolutely must be released, then the finalize method
- * should be implemented to do the clean up. However, try not
- * to have this be the case. Finalize methods add overhead that is
- * usually better not to have. The better way is for any users
- * that get this kind of proxy object know to call release on
- * ProxyFactoryRegistry to release it before garbage collection.
- */
- public void release();
-
- /**
- * Render this bean for transport to the server into a Commands.ValueObject.
- * For example, a string may put a string. An id type may put out the id.
- */
- public void renderBean(Commands.ValueObject renderInto);
-
-}
diff --git a/plugins/org.eclipse.jem.proxy/proxyRemote/org/eclipse/jem/internal/proxy/remote/IREMBeanTypeProxy.java b/plugins/org.eclipse.jem.proxy/proxyRemote/org/eclipse/jem/internal/proxy/remote/IREMBeanTypeProxy.java
deleted file mode 100644
index 391ad30..0000000
--- a/plugins/org.eclipse.jem.proxy/proxyRemote/org/eclipse/jem/internal/proxy/remote/IREMBeanTypeProxy.java
+++ /dev/null
@@ -1,42 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2001, 2005 IBM Corporation and others.
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
- *
- * Contributors:
- * IBM Corporation - initial API and implementation
- *******************************************************************************/
-package org.eclipse.jem.internal.proxy.remote;
-/*
-
-
- */
-
-
-import org.eclipse.jem.internal.proxy.core.*;
-/**
- * All bean type proxies in remote vm must implement this interface.
- *
- * NOTE: This is an internal interface to the Remote VM Proxy.
- * It MUST not be used outside of the proxy factory family.
- */
-public interface IREMBeanTypeProxy extends IBeanTypeProxy, IREMBeanProxy {
-
-/**
- * Create a new bean proxy with the specified id.
- */
-public IREMBeanProxy newBeanProxy(Integer anID);
-
-/**
- * newBeanTypeForClass: Create a new beantypeproxy of this kind for the given class.
- * This is used by beantype proxy factory when creating a beantype proxy for a subclass.
- * This is because subclasses, unless explicitly overridden, should use the same kind
- * of beantype proxy. This way if anything special is needed for a specific type, then
- * that can be done.
- */
-public IREMBeanTypeProxy newBeanTypeForClass(Integer anID, String aClassname, boolean anAbstract);
-
-
-}
diff --git a/plugins/org.eclipse.jem.proxy/proxyRemote/org/eclipse/jem/internal/proxy/remote/IREMBeanTypeProxyFactory.java b/plugins/org.eclipse.jem.proxy/proxyRemote/org/eclipse/jem/internal/proxy/remote/IREMBeanTypeProxyFactory.java
deleted file mode 100644
index 10f8b68..0000000
--- a/plugins/org.eclipse.jem.proxy/proxyRemote/org/eclipse/jem/internal/proxy/remote/IREMBeanTypeProxyFactory.java
+++ /dev/null
@@ -1,85 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2001, 2005 IBM Corporation and others.
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
- *
- * Contributors:
- * IBM Corporation - initial API and implementation
- *******************************************************************************/
-package org.eclipse.jem.internal.proxy.remote;
-/*
-
-
- */
-
-
-import org.eclipse.jem.internal.proxy.core.*;
-/**
- * Interface for Remote VM Bean Type Proxy Factories.
- * All extension factories for Remote VM must implement this interface.
- */
-
-public interface IREMBeanTypeProxyFactory extends IBeanTypeProxyFactory {
-/**
- * Return a bean type proxy for the class name.
- * Return null if the extension factory doesn't handle this class.
- * Don't register any proxies returned, they will automatically be registered.
- * This should only return bean type proxies where the factory can determine
- * everything it needs, such as supertype and classID.
- * NOTE: This is implemented for the usage of the
- * standard BeanType proxy factory. It should
- * NOT be called by anyone else. They should
- * go through the IStandardBeanTypeFactory
- * instead. The standard bean type factory
- * will call this method on the appropriate
- * extension when it needs to.
- *
- * Creation date: (12/3/99 2:26:12 PM)
- */
-public IREMBeanTypeProxy getExtensionBeanTypeProxy(String typeName);
-
-/**
- * Return a bean type proxy for the class name.
- * Return null if the extension factory doesn't handle this class.
- * Don't register any proxies returned, they will automatically be registered.
- * This should only return bean type proxies where the factory can determine
- * everything it needs, such as supertype and classID.
- * NOTE: This is implemented for the usage of the
- * standard BeanType proxy factory. It should
- * NOT be called by anyone else. They should
- * go through the IStandardBeanTypeFactory
- * instead. The standard bean type factory
- * will call this method on the appropriate
- * extension when it needs to.
-
- * @param typeName
- * @param expression
- * @return
- *
- * @since 1.1.0
- */
-public IProxyBeanType getExtensionBeanTypeProxy(String typeName, IExpression expression);
-
-/**
- * Return a bean type proxy for the class id and class name.
- * Return null if the extension factory doesn't handle this class.
- * Don't register any proxies returned, they will automatically be registered.
- * This will be called in the case that a new class id was returned
- * from the server that we don't have registered yet. Implementers will
- * created a proxy out of the name and the id and return it.
- * The supertype will be passed in so that the extension factory doesn't need to
- * try to find it.
- * NOTE: This is implemented for the usage of the
- * standard BeanType proxy factory. It should
- * NOT be called by anyone else. They should
- * go through the IStandardBeanTypeFactory
- * instead. The standard bean type factory
- * will call this method on the appropriate
- * extension when it needs to.
- *
- * Creation date: (12/3/99 2:26:12 PM)
- */
-public IREMBeanTypeProxy getExtensionBeanTypeProxy(String typeName, Integer classID, IBeanTypeProxy superType);
-}
diff --git a/plugins/org.eclipse.jem.proxy/proxyRemote/org/eclipse/jem/internal/proxy/remote/IREMConnection.java b/plugins/org.eclipse.jem.proxy/proxyRemote/org/eclipse/jem/internal/proxy/remote/IREMConnection.java
deleted file mode 100644
index 6e7e475..0000000
--- a/plugins/org.eclipse.jem.proxy/proxyRemote/org/eclipse/jem/internal/proxy/remote/IREMConnection.java
+++ /dev/null
@@ -1,106 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2001, 2005 IBM Corporation and others.
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
- *
- * Contributors:
- * IBM Corporation - initial API and implementation
- *******************************************************************************/
-package org.eclipse.jem.internal.proxy.remote;
-/*
-
-
- */
-
-
-import org.eclipse.jem.internal.proxy.common.CommandException;
-import org.eclipse.jem.internal.proxy.common.remote.Commands;
-/**
- * Interface for the Remote VM Connection object.
- */
-
-public interface IREMConnection {
-
- /**
- * Did this construct correctly.
- * This is needed because an exception could be thrown in the ctor and
- * that's not a good thing to do.
- */
- public boolean isConnected();
-
- /**
- * Terminate the server.
- * WARNING: This is only here so that factory can to it. Termination should ONLY
- * be done by the Factory not any one else.
- */
- public void terminateServer();
-
- /**
- * Close the connection.
- */
- public void close();
-
- /**
- * Get the class information. Null return if not found.
- */
- public Commands.GetClassReturn getClass(String className) throws CommandException;
-
- /**
- * Get the class information from the id.
- */
- public Commands.GetClassIDReturn getClassFromID(int classID) throws CommandException;
-
-
-
- /**
- * Get object data from an id.
- */
- public void getObjectData(int objectID, Commands.ValueObject valueReturn) throws CommandException;
-
- /**
- * Get a new instance using the initialization string.
- */
- public void getNewInstance(int classID, String initString, Commands.ValueObject newInstance) throws CommandException;
-
- /**
- * Invoke the get array contents command.
- * @param arrayID
- * @param returnValue
- * @throws CommandException
- *
- * @since 1.1.0
- */
- public void getArrayContents(int arrayID, Commands.ValueObject returnValue) throws CommandException;
-
- /**
- * Invoke the method call.
- * The parms valueObject must represent an Object[] (either through ARRAY_IDS or OBJECT)
- */
- public void invokeMethod(int methodID, Commands.ValueObject invokeOn, Commands.ValueObject parms, Commands.ValueObject returnValue) throws CommandException;
-
- /**
- * Invoke the method call with method passed.
- * The parms valueObject must represent an Object[] (either through ARRAY_IDS or OBJECT)
- */
- public void invokeMethod(Commands.ValueObject classType, String methodName, Commands.ValueObject parmTypes, Commands.ValueObject invokeOn, Commands.ValueObject parms, Commands.ValueObject returnValue) throws CommandException;
-
- /**
- * Release the id. It is no longer needed on the client.
- */
- public void releaseID(int id);
-
- /**
- * Read array values as BeanProxies into valueSender.
- * @param returnValue
- * @param valueSender
- * @param allowFlag <code>true</code> to allow FLAG values, <code>false</code> if not allow flag values.
- *
- * @throws CommandException
- *
- * @since 1.1.0
- */
- public void readProxyArrayValues(Commands.ValueObject returnValue, Commands.ValueSender valueSender, boolean allowFlag) throws CommandException;
-
-}
diff --git a/plugins/org.eclipse.jem.proxy/proxyRemote/org/eclipse/jem/internal/proxy/remote/IREMConstantBeanProxy.java b/plugins/org.eclipse.jem.proxy/proxyRemote/org/eclipse/jem/internal/proxy/remote/IREMConstantBeanProxy.java
deleted file mode 100644
index dccb9d5..0000000
--- a/plugins/org.eclipse.jem.proxy/proxyRemote/org/eclipse/jem/internal/proxy/remote/IREMConstantBeanProxy.java
+++ /dev/null
@@ -1,25 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2001, 2005 IBM Corporation and others.
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
- *
- * Contributors:
- * IBM Corporation - initial API and implementation
- *******************************************************************************/
-package org.eclipse.jem.internal.proxy.remote;
-/*
-
-
- */
-
-
-/**
- * Tag interface to indicate this proxy is a constant proxy, i.e. there
- * is no bean on the server representing this (e.g. Strings and Integers).
- */
-
-public interface IREMConstantBeanProxy extends IREMBeanProxy {
-
-}
diff --git a/plugins/org.eclipse.jem.proxy/proxyRemote/org/eclipse/jem/internal/proxy/remote/IREMConstantBeanTypeProxy.java b/plugins/org.eclipse.jem.proxy/proxyRemote/org/eclipse/jem/internal/proxy/remote/IREMConstantBeanTypeProxy.java
deleted file mode 100644
index 2c3f9fd..0000000
--- a/plugins/org.eclipse.jem.proxy/proxyRemote/org/eclipse/jem/internal/proxy/remote/IREMConstantBeanTypeProxy.java
+++ /dev/null
@@ -1,32 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2001, 2005 IBM Corporation and others.
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
- *
- * Contributors:
- * IBM Corporation - initial API and implementation
- *******************************************************************************/
-package org.eclipse.jem.internal.proxy.remote;
-/*
-
-
- */
-
-
-import org.eclipse.jem.internal.proxy.core.*;
-import org.eclipse.jem.internal.proxy.common.remote.Commands;
-/**
- * This interface is used for any BeanType that represents a constant type bean.
- * These are types that are immutable and a copy of the actual value is kept here
- * in the client and not stored as an object id.
- */
-
-public interface IREMConstantBeanTypeProxy extends IBeanTypeProxy {
-
- /**
- * Create a new bean proxy the ValueObject passed in.
- */
- public IBeanProxy newBeanProxy(Commands.ValueObject value);
-}
diff --git a/plugins/org.eclipse.jem.proxy/proxyRemote/org/eclipse/jem/internal/proxy/remote/IREMExpressionConnection.java b/plugins/org.eclipse.jem.proxy/proxyRemote/org/eclipse/jem/internal/proxy/remote/IREMExpressionConnection.java
deleted file mode 100644
index 335fb43..0000000
--- a/plugins/org.eclipse.jem.proxy/proxyRemote/org/eclipse/jem/internal/proxy/remote/IREMExpressionConnection.java
+++ /dev/null
@@ -1,182 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2004, 2005 IBM Corporation and others.
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
- *
- * Contributors:
- * IBM Corporation - initial API and implementation
- *******************************************************************************/
-/*
-
-
- */
-package org.eclipse.jem.internal.proxy.remote;
-
-import java.io.IOException;
-
-import org.eclipse.jem.internal.proxy.common.CommandException;
-import org.eclipse.jem.internal.proxy.common.remote.Commands;
-
-/**
- * Additional function on a connection for expression tree processing.
- * Connections returned (IREMConnections) will always also implement IREMExpressionConnection,
- * but they are separated so that expression functions don't pollute the regular
- * connection interface with added commands that shouldn't be called except
- * when processing an expression. If they were called out of order, big problems
- * can occur.
- * <p>
- * To use, simply cast the IREMConnection to be an IREMExpressionConnection.
- *
- * @since 1.0.0
- */
-public interface IREMExpressionConnection extends IREMConnection {
-
- /**
- * Start expression processing.
- * @param expressionID
- * @param trace TODO
- * @throws IOException
- *
- * @since 1.0.0
- */
- public void startExpressionProcessing(int expressionID, byte trace) throws IOException;
-
- /**
- * Transfer the expression. This tells the remote vm to stop processing on the
- * given connection and return the expression processing controller for the expression.
- *
- * @param expressionID
- * @param expController
- * @throws IOException
- *
- * @since 1.1.0
- */
- public void transferExpression(int expressionID, Commands.ValueObject expController) throws CommandException;
-
- /**
- * Resume the expression on this connection.
- * @param expressionID
- * @param expController expression processor controller to use for the expression on this new connection.
- * @throws CommandException
- *
- * @since 1.1.0
- */
- public void resumeExpression(int expressionID, Commands.ValueObject expController) throws CommandException;
-
- /**
- * Push an expression command. This is the common portion of the
- * subcommand. The actual data of the command will be separately done.
- * @param expressionID
- * @param subcommand The subcommand being sent. From IInternalExpressionConstants.
- *
- * @throws IOException
- *
- * @see org.eclipse.jem.internal.proxy.initParser.tree.IInternalExpressionConstants#PUSH_TO_PROXY_EXPRESSION
- * @since 1.0.0
- */
- public void pushExpressionCommand(int expressionID, byte subcommand) throws IOException;
-
- /**
- * Push the value object to the remote side.
- *
- * @param valueObject
- * @throws CommandException
- *
- * @since 1.0.0
- */
- public void pushValueObject(Commands.ValueObject valueObject) throws CommandException;
-
- /**
- * Push just the single byte to the remote side.
- * @param abyte
- * @throws IOException
- *
- * @since 1.0.0
- */
- public void pushByte(byte abyte) throws IOException;
-
- /**
- * Push just the single int to the remote side.
- *
- * @param anInt
- * @throws IOException
- *
- * @since 1.0.0
- */
- public void pushInt(int anInt) throws IOException;
-
-
- /**
- * Push just the singe string to the remote side.
- *
- * @param aString
- * @throws IOException
- *
- * @since 1.0.0
- */
- public void pushString(String aString) throws IOException;
-
- /**
- * Push just the bool to the remote side.
- * @param aBool
- * @throws IOException
- *
- * @since 1.0.0
- */
- public void pushBoolean(boolean aBool) throws IOException;
-
- /**
- * Get the final value. It must be called after processing the proxy id resolutions even for sync (so that we can get
- * any thrown errors).
- *
- * @param result
- * @throws CommandException
- *
- * @since 1.1.0
- */
- public void getFinalValue(Commands.ValueObject result) throws CommandException;
-
- /**
- * Send the pull value command, with the proxyids of intereset. If an error
- * occurs, command exception is thrown.
- * <p>
- * After the pull value call, if no errors, the proxyids must be read, and then getFinalValue call must be sent.
- * @param expressionID
- * @param proxyids expression proxyids that request feedback or <code>null</code> if no proxy ids.
- * @param sender sender to use to process the returned proxy ids, or <code>null</code> if expecting no proxy resolutions.
- *
- * @throws CommandException
- *
- * @since 1.0.0
- */
- public void pullValue(int expressionID, Commands.ValueObject proxyids, Commands.ValueSender sender) throws CommandException;
-
- /**
- * Send the sync command, with the proxyids of intereset. If an error
- * occurs, command exception is thrown.
- * <p>
- * After the sync call, if no errors, the returned proxyids must be processed and then the final endValue call must be sent.
- *
- * @param expressionID
- * @param proxyids expression proxyids that request feedback or <code>null</code> if no proxy ids.
- * @param sender sender to use to process the proxy id resolutions, or <code>null</code> if expecting no proxy ids.
- *
- * @throws CommandException
- *
- * @since 1.0.0
- */
- public void sync(int expressionID, Commands.ValueObject proxyids, Commands.ValueSender sender) throws CommandException;
-
- /**
- * Stop expression processing.
- * @param expressionID
- *
- * @throws IOException
- *
- * @since 1.0.0
- */
- public void stopExpressionProcessing(int expressionID) throws IOException;
-
-}
diff --git a/plugins/org.eclipse.jem.proxy/proxyRemote/org/eclipse/jem/internal/proxy/remote/IREMMethodProxy.java b/plugins/org.eclipse.jem.proxy/proxyRemote/org/eclipse/jem/internal/proxy/remote/IREMMethodProxy.java
deleted file mode 100644
index f56556b..0000000
--- a/plugins/org.eclipse.jem.proxy/proxyRemote/org/eclipse/jem/internal/proxy/remote/IREMMethodProxy.java
+++ /dev/null
@@ -1,34 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2001, 2005 IBM Corporation and others.
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
- *
- * Contributors:
- * IBM Corporation - initial API and implementation
- *******************************************************************************/
-package org.eclipse.jem.internal.proxy.remote;
-/*
-
-
- */
-
-
-import org.eclipse.jem.internal.proxy.core.*;
-/**
- * This interface for REMMethodProxy allows the invokation where
- * the parms are a mixture of constant objects (i.e. can be sent
- * as values to the client) and IBeanProxies. It is only to be
- * used by other factories that want to invoke methods where
- * some of the parms are constants so that there is no need
- * create IBeanProxies for them, e.g. String. This should be
- * used with extreme care.
- */
-
-public interface IREMMethodProxy extends IMethodProxy, IREMBeanProxy {
- public IBeanProxy invokeWithParms(IBeanProxy subject, Object[] parms) throws ThrowableProxy;
-
-
-
-}
diff --git a/plugins/org.eclipse.jem.proxy/proxyRemote/org/eclipse/jem/internal/proxy/remote/IREMSpecialBeanTypeProxy.java b/plugins/org.eclipse.jem.proxy/proxyRemote/org/eclipse/jem/internal/proxy/remote/IREMSpecialBeanTypeProxy.java
deleted file mode 100644
index 897a4ff..0000000
--- a/plugins/org.eclipse.jem.proxy/proxyRemote/org/eclipse/jem/internal/proxy/remote/IREMSpecialBeanTypeProxy.java
+++ /dev/null
@@ -1,32 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2001, 2005 IBM Corporation and others.
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
- *
- * Contributors:
- * IBM Corporation - initial API and implementation
- *******************************************************************************/
-package org.eclipse.jem.internal.proxy.remote;
-/*
-
-
- */
-
-import org.eclipse.jem.internal.proxy.core.IBeanTypeProxy;
-/**
- * This is a special interface for allowing abstract
- * types to create the correct subclass types.
- * Only ones that use REMAnAbstractBeanTypeProxy
- * should implement this.
- */
-public interface IREMSpecialBeanTypeProxy {
-
- /**
- * Called by REMAnAbstractBeanTypeProxy to create a subclass of it.
- * This allows correct types to be created depending upon the
- * main super type.
- */
- public IREMBeanTypeProxy newBeanTypeForClass(Integer anID, String aClassname, boolean anAbstract, IBeanTypeProxy superType);
-}
diff --git a/plugins/org.eclipse.jem.proxy/proxyRemote/org/eclipse/jem/internal/proxy/remote/LocalFileConfigurationContributorController.java b/plugins/org.eclipse.jem.proxy/proxyRemote/org/eclipse/jem/internal/proxy/remote/LocalFileConfigurationContributorController.java
deleted file mode 100644
index df8937b..0000000
--- a/plugins/org.eclipse.jem.proxy/proxyRemote/org/eclipse/jem/internal/proxy/remote/LocalFileConfigurationContributorController.java
+++ /dev/null
@@ -1,314 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2004, 2005 IBM Corporation and others.
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
- *
- * Contributors:
- * IBM Corporation - initial API and implementation
- *******************************************************************************/
-/*
-
-
- */
-package org.eclipse.jem.internal.proxy.remote;
-
-import java.net.URL;
-import java.util.*;
-
-import org.eclipse.core.resources.IProject;
-import org.eclipse.core.runtime.CoreException;
-import org.eclipse.core.runtime.IPath;
-import org.eclipse.jdt.core.*;
-import org.eclipse.jdt.launching.IRuntimeClasspathEntry;
-import org.eclipse.jdt.launching.JavaRuntime;
-import org.osgi.framework.Bundle;
-
-import org.eclipse.jem.internal.proxy.core.*;
-import org.eclipse.jem.util.plugin.JEMUtilPlugin;
-
-/**
- * This version works with local files being added to the classpath, and the classpath is strings.
- *
- * @since 1.0.0
- */
-public class LocalFileConfigurationContributorController implements IConfigurationContributionController {
-
- private URL[] classpathInfo;
-
- private URL[][] bootpathInfo;
-
- private List classpath;
-
- private List prependBootpath;
-
- private List appendBootpath;
-
- private List javaLibraryPath;
-
- private ProxyLaunchSupport.LaunchInfo launchInfo;
-
- public LocalFileConfigurationContributorController(URL[] classpathInfo, URL[][] bootpathInfo, ProxyLaunchSupport.LaunchInfo launchInfo) {
- this.classpathInfo = classpathInfo;
- this.bootpathInfo = bootpathInfo;
- this.launchInfo = launchInfo;
- }
-
- public URL[] getFinalClasspath() {
- if (classpath == null)
- return classpathInfo;
- else
- return (URL[]) classpath.toArray(new URL[classpath.size()]);
- }
-
- public URL[] getFinalPrependBootpath() {
- if (prependBootpath == null)
- return bootpathInfo[0];
- else
- return (URL[]) prependBootpath.toArray(new URL[prependBootpath.size()]);
- }
-
- public URL[] getFinalAppendBootpath() {
- if (appendBootpath == null)
- return bootpathInfo[2];
- else
- return (URL[]) appendBootpath.toArray(new URL[appendBootpath.size()]);
- }
-
- public List getFinalJavaLibraryPath() {
- if (javaLibraryPath == null)
- return Collections.EMPTY_LIST;
- else
- return javaLibraryPath;
- }
-
- protected List getClasspath() {
- if (classpath == null) {
- classpath = new ArrayList(classpathInfo.length);
- addAll(classpath, classpathInfo, -1);
- }
- return classpath;
- }
-
- protected List getPrependBootpath() {
- if (prependBootpath == null) {
- if (bootpathInfo[0] != null) {
- prependBootpath = new ArrayList(bootpathInfo[0].length);
- addAll(prependBootpath, bootpathInfo[0], -1);
- } else
- prependBootpath = new ArrayList(1);
- }
- return prependBootpath;
- }
-
- protected List getAppendBootpath() {
- if (appendBootpath == null) {
- if (bootpathInfo[2] != null) {
- appendBootpath = new ArrayList(bootpathInfo[2].length);
- addAll(appendBootpath, bootpathInfo[2], -1);
- } else
- appendBootpath = new ArrayList(1);
- }
- return appendBootpath;
- }
-
- protected List getJavaLibraryPath() {
- if (javaLibraryPath == null) {
- javaLibraryPath = new ArrayList(3);
- }
- return javaLibraryPath;
- }
-
- protected void addAll(List toList, Object[] array, int loc) {
- for (int i = 0; i < array.length; i++) {
- // Need a dup check, sometimes dups come in especially during development
- if (toList.contains(array[i]))
- continue;
- if (loc == -1)
- toList.add(array[i]);
- else
- toList.add(loc++, array[i]);
- }
- }
-
- protected void addLocations(List toList, IRuntimeClasspathEntry[] entries) {
- for (int i = 0; i < entries.length; i++) {
- IRuntimeClasspathEntry entry = entries[i];
- URL location = ProxyLaunchSupport.convertStringPathToURL(entry.getLocation());
- if (location != null && !toList.contains(location))
- toList.add(location);
- }
- }
-
- /*
- * (non-Javadoc)
- *
- * @see org.eclipse.jem.internal.proxy.core.IConfigurationContributionController#getJavaProject()
- */
- public IJavaProject getJavaProject() {
- return launchInfo.getJavaProject();
- }
-
- /*
- * (non-Javadoc)
- *
- * @see org.eclipse.jem.internal.proxy.core.IConfigurationContributionController#contributeProject(org.eclipse.core.resources.IProject)
- */
- public void contributeProject(IProject project) throws CoreException {
- IJavaProject jproject = JavaCore.create(project);
- IRuntimeClasspathEntry[] projPath = JavaRuntime.computeUnresolvedRuntimeClasspath(jproject);
- boolean jreContainerFound = false;
- for (int i = 0; i < projPath.length; i++) {
- IRuntimeClasspathEntry entry = projPath[i];
- if (entry.getClasspathProperty() == IRuntimeClasspathEntry.BOOTSTRAP_CLASSES
- || entry.getClasspathProperty() == IRuntimeClasspathEntry.STANDARD_CLASSES) {
- int entryKind = entry.getClasspathEntry().getEntryKind();
- String segment0 = entry.getPath().segment(0);
- if (entryKind == IClasspathEntry.CPE_CONTAINER && JavaRuntime.JRE_CONTAINER.equals(segment0)
- || entryKind == IClasspathEntry.CPE_VARIABLE && JavaRuntime.JRELIB_VARIABLE.equals(segment0)) {
- jreContainerFound = true;
- } else {
- if (jreContainerFound)
- addLocations(getAppendBootpath(), JavaRuntime.resolveRuntimeClasspathEntry(entry, jproject));
- else
- addLocations(getPrependBootpath(), JavaRuntime.resolveRuntimeClasspathEntry(entry, jproject));
- }
- } else {
- addLocations(getClasspath(), JavaRuntime.resolveRuntimeClasspathEntry(entry, jproject));
- }
- }
- }
-
- /*
- * (non-Javadoc)
- *
- * @see org.eclipse.jem.internal.proxy.core.IConfigurationContributionController#contributeClasspath(java.lang.String, int)
- */
- public void contributeClasspath(String classpath, int typeFlag) {
- contributeClasspath(ProxyLaunchSupport.convertStringPathToURL(classpath), typeFlag);
- }
-
- /*
- * (non-Javadoc)
- *
- * @see org.eclipse.jem.internal.proxy.core.IConfigurationContributionController#contributeClasspath(java.net.URL, int)
- */
- public void contributeClasspath(URL classpathURL, int typeFlag) {
- if (classpathURL == null)
- return;
- switch (typeFlag) {
- case PREPEND_BOOT_CLASSPATH:
- if (!getPrependBootpath().contains(classpathURL))
- getPrependBootpath().add(classpathURL);
- break;
- case PREPEND_USER_CLASSPATH:
- if (!getClasspath().contains(classpathURL))
- getClasspath().add(0, classpathURL);
- break;
- case APPEND_USER_CLASSPATH:
- if (!getClasspath().contains(classpathURL))
- getClasspath().add(classpathURL);
- break;
- case APPEND_BOOT_CLASSPATH:
- if (!getAppendBootpath().contains(classpathURL))
- getAppendBootpath().add(classpathURL);
- break;
- case APPEND_JAVA_LIBRARY_PATH:
- if (!getJavaLibraryPath().contains(classpathURL))
- getJavaLibraryPath().add(classpathURL);
- break;
- }
- }
-
- /*
- * (non-Javadoc)
- *
- * @see org.eclipse.jem.internal.proxy.core.IConfigurationContributionController#contributeClasspath(org.osgi.framework.Bundle, java.lang.String,
- * int, boolean)
- */
- public void contributeClasspath(Bundle bundle, String relativePath, int typeFlag, boolean nlsLocalize) {
- // If not nls localize, or if it is java library path, then just find the one in the plugin/fragment and add it.
- if (nlsLocalize)
- contributeClasspath(ProxyPlugin.getPlugin().urlLocalizeAllFromBundleAndFragments(bundle, relativePath), typeFlag);
- else if (typeFlag == IConfigurationContributionController.APPEND_JAVA_LIBRARY_PATH) {
- if (relativePath == null || relativePath.length() == 0) {
- // PDE is not here to help us extract that @#$ dll
- JEMUtilPlugin.getLogger().log("Can't extract a directory from the root of a plugin."); //$NON-NLS-1$
- return;
- }
- URL contribution = ProxyPlugin.getPlugin().urlLocalizeFromBundleAndFragments(bundle, relativePath);
- contributeClasspath(contribution, typeFlag);
- } else {
- if (relativePath != null)
- contributeClasspath(ProxyPlugin.getPlugin().urlLocalizeFromBundleOnly(bundle, relativePath), typeFlag);
- else
- contributeClasspath(ProxyPlugin.getPlugin().urlLocalizeBundle(bundle), typeFlag);
- }
- }
-
- /*
- * (non-Javadoc)
- *
- * @see org.eclipse.jem.internal.proxy.core.IConfigurationContributionController#contributeClasspath(org.osgi.framework.Bundle,
- * org.eclipse.core.runtime.IPath, int, boolean)
- */
- public void contributeClasspath(Bundle bundle, IPath relativePath, int typeFlag, boolean nlsLocalize) {
- if (nlsLocalize)
- if (relativePath != null)
- contributeClasspath(ProxyPlugin.getPlugin().urlLocalizeAllFromBundleAndFragments(bundle, relativePath), typeFlag);
- else
- contributeClasspath(ProxyPlugin.getPlugin().urlLocalizeBundleAndFragments(bundle), typeFlag);
- else if (typeFlag == IConfigurationContributionController.APPEND_JAVA_LIBRARY_PATH) {
- if (relativePath == null || relativePath.segmentCount() == 0) {
- // PDE is not here to help us extract that @#$ dll
- JEMUtilPlugin.getLogger().log("Can't extract a directory from the root of a plugin."); //$NON-NLS-1$
- return;
- }
- URL contribution = ProxyPlugin.getPlugin().urlLocalizeFromBundleAndFragments(bundle, relativePath);
- contributeClasspath(contribution, typeFlag);
- } else {
- if (relativePath != null)
- contributeClasspath(ProxyPlugin.getPlugin().urlLocalizeFromBundleOnly(bundle, relativePath), typeFlag);
- else
- contributeClasspath(ProxyPlugin.getPlugin().urlLocalizeBundle(bundle), typeFlag);
- }
- }
-
- /*
- * (non-Javadoc)
- *
- * @see org.eclipse.jem.internal.proxy.core.IConfigurationContributionController#contributeClasspath(java.lang.String[], int)
- */
- public void contributeClasspath(String[] classpaths, int typeFlag) {
- contributeClasspath(ProxyLaunchSupport.convertStringPathsToURL(classpaths), typeFlag);
- }
-
- /*
- * (non-Javadoc)
- *
- * @see org.eclipse.jem.internal.proxy.core.IConfigurationContributionController#contributeClasspath(java.net.URL[], int)
- */
- public void contributeClasspath(URL[] classpathURLs, int typeFlag) {
- if (classpathURLs == null)
- return;
- switch (typeFlag) {
- case PREPEND_BOOT_CLASSPATH:
- addAll(getPrependBootpath(), classpathURLs, -1);
- break;
- case PREPEND_USER_CLASSPATH:
- addAll(getClasspath(), classpathURLs, 0);
- break;
- case APPEND_USER_CLASSPATH:
- addAll(getClasspath(), classpathURLs, -1);
- break;
- case APPEND_BOOT_CLASSPATH:
- addAll(getAppendBootpath(), classpathURLs, -1);
- break;
- case APPEND_JAVA_LIBRARY_PATH:
- addAll(getJavaLibraryPath(), classpathURLs, -1);
- break;
- }
- }
-
-}
diff --git a/plugins/org.eclipse.jem.proxy/proxyRemote/org/eclipse/jem/internal/proxy/remote/LocalProxyLaunchDelegate.java b/plugins/org.eclipse.jem.proxy/proxyRemote/org/eclipse/jem/internal/proxy/remote/LocalProxyLaunchDelegate.java
deleted file mode 100644
index c59772c..0000000
--- a/plugins/org.eclipse.jem.proxy/proxyRemote/org/eclipse/jem/internal/proxy/remote/LocalProxyLaunchDelegate.java
+++ /dev/null
@@ -1,475 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2001, 2006 IBM Corporation and others.
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
- *
- * Contributors:
- * IBM Corporation - initial API and implementation
- *******************************************************************************/
-/*
- * $RCSfile: LocalProxyLaunchDelegate.java,v $ $Revision: 1.35 $ $Date: 2006/05/23 15:43:03 $
- */
-package org.eclipse.jem.internal.proxy.remote;
-
-import java.io.File;
-import java.io.IOException;
-import java.net.*;
-import java.text.MessageFormat;
-import java.util.*;
-import java.util.logging.Level;
-
-import org.eclipse.core.runtime.*;
-import org.eclipse.core.runtime.jobs.Job;
-import org.eclipse.debug.core.*;
-import org.eclipse.debug.core.model.*;
-import org.eclipse.jdt.core.IJavaProject;
-import org.eclipse.jdt.launching.*;
-
-import org.eclipse.jem.internal.proxy.common.remote.ExpressionCommands;
-import org.eclipse.jem.internal.proxy.core.*;
-import org.eclipse.jem.internal.proxy.remote.awt.REMRegisterAWT;
-import org.eclipse.jem.util.TimerTests;
-import org.eclipse.jem.util.logger.proxy.Logger;
-
-
-/**
- * Launch Delegate for launching Local (i.e. remote vm is on local system). Here "remote" means the
- * registry is not in the IDE but in a separate VM, and "local" means that is in on the local
- * physical machine and not on a separate machine.
- *
- * @since 1.0.0
- */
-public class LocalProxyLaunchDelegate extends AbstractJavaLaunchConfigurationDelegate {
-
- /*
- * (non-Javadoc)
- *
- * @see org.eclipse.debug.core.model.ILaunchConfigurationDelegate#launch(org.eclipse.debug.core.ILaunchConfiguration,
- * java.lang.String, org.eclipse.debug.core.ILaunch,
- * org.eclipse.core.runtime.IProgressMonitor)
- */
- public void launch(ILaunchConfiguration configuration, String mode, ILaunch launch, IProgressMonitor pm) throws CoreException {
-
- String launchKey = configuration.getAttribute(IProxyConstants.ATTRIBUTE_LAUNCH_KEY, (String) null);
- if (launchKey == null)
- abort(ProxyRemoteMessages.ProxyRemoteNoLaunchKey, null, 0);
-
- // In Eclipse, even if private, a launch will show up in the debug process tree and in the console viewer.
- // To be absolutely private, we need to remove the launch which has already been added.
- if (ProxyLaunchSupport.ATTR_PRIVATE != null && configuration.getAttribute(ProxyLaunchSupport.ATTR_PRIVATE, false))
- DebugPlugin.getDefault().getLaunchManager().removeLaunch(launch);
- if (pm == null) {
- pm = new NullProgressMonitor();
- }
-
- IJavaProject project = getJavaProject(configuration);
- String name = configuration.getAttribute(IProxyConstants.ATTRIBUTE_VM_TITLE, (String) null);
- if (name == null)
- name = MessageFormat.format(ProxyRemoteMessages.ProxyRemoteVMName, new Object[] { project != null ? project.getProject().getName() : "" }); //$NON-NLS-1$
- else
- name = MessageFormat.format(ProxyRemoteMessages.ProxyRemoteVMNameWithComment, new Object[] { project != null ? project.getProject().getName() : "", name }); //$NON-NLS-1$
-
- String stepId = "Launch VM ( " + name + " )"; //$NON-NLS-1$ //$NON-NLS-2$
- TimerTests.basicTest.startStep(stepId);
- // Problem with launch, can't have double-quotes in vmName.
- if (name.indexOf('"') != -1)
- name = name.replace('"', '\'');
-
- pm.beginTask("", 500); //$NON-NLS-1$
- pm.subTask(MessageFormat.format(ProxyRemoteMessages.ProxyRemoteLaunchVM, new Object[] { name }));
- // check for cancellation
- if (pm.isCanceled())
- return;
-
- IVMInstall vm = verifyVMInstall(configuration);
-
- IVMRunner runner = vm.getVMRunner(mode);
- if (runner == null) {
- abort(MessageFormat.format(ProxyRemoteMessages.Proxy_NoRunner_ERROR_, new Object[] { name }), null, 0);
- }
-
- File workingDir = verifyWorkingDirectory(configuration);
- String workingDirName = null;
- if (workingDir != null) {
- workingDirName = workingDir.getAbsolutePath();
- }
-
- // Environment variables
- String[] envp = DebugPlugin.getDefault().getLaunchManager().getEnvironment(configuration);
-
- // Program & VM args
- String pgmArgs = getProgramArguments(configuration);
- String vmArgs = getVMArguments(configuration);
- ExecutionArguments execArgs = new ExecutionArguments(vmArgs, pgmArgs);
-
- // VM-specific attributes
- Map vmAttributesMap = getVMSpecificAttributesMap(configuration);
-
- pm.worked(100);
-
- // Now let's get the classpaths created through the contributors.
- URL[] classpath = ProxyLaunchSupport.convertStringPathsToURL(getClasspath(configuration));
- String[][] bootpathInfoStrings = getBootpathExt(vmAttributesMap);
- URL[][] bootpathInfo = new URL[][]{
- ProxyLaunchSupport.convertStringPathsToURL(bootpathInfoStrings[0]),
- ProxyLaunchSupport.convertStringPathsToURL(bootpathInfoStrings[1]),
- ProxyLaunchSupport.convertStringPathsToURL(bootpathInfoStrings[2]),
- };
- ProxyLaunchSupport.LaunchInfo launchInfo = ProxyLaunchSupport.getInfo(launchKey);
- final IConfigurationContributor[] contributors = launchInfo.contributors;
- final LocalFileConfigurationContributorController controller =
- new LocalFileConfigurationContributorController(classpath, bootpathInfo, launchInfo);
- if (contributors != null) {
- for (int i = 0; i < contributors.length; i++) {
- // Run in safe mode so that anything happens we don't go away.
- final int ii = i;
- SafeRunner.run(new ISafeRunnable() {
- public void handleException(Throwable exception) {
- // Don't need to do anything. Platform.run logs it for me.
- }
-
- public void run() throws Exception {
- contributors[ii].contributeClasspaths(controller);
- }
- });
- }
- }
-
- // Add in the required ones by the Proxy support. These are hard-coded since they are
- // required.
- ProxyRemoteUtil.updateClassPaths(controller);
- addInFragmentLibraries(controller, launchInfo.getConfigInfo());
-
- classpath = controller.getFinalClasspath();
- if (bootpathInfo[0] != controller.getFinalPrependBootpath()) {
- if (vmAttributesMap == null)
- vmAttributesMap = new HashMap(2);
- vmAttributesMap.put(IJavaLaunchConfigurationConstants.ATTR_BOOTPATH_PREPEND, ProxyLaunchSupport.convertURLsToStrings(bootpathInfo[0]));
- }
- if (bootpathInfo[2] != controller.getFinalAppendBootpath()) {
- if (vmAttributesMap == null)
- vmAttributesMap = new HashMap(2);
- vmAttributesMap.put(IJavaLaunchConfigurationConstants.ATTR_BOOTPATH_APPEND, ProxyLaunchSupport.convertURLsToStrings(bootpathInfo[2]));
- }
-
- // check for cancellation
- if (pm.isCanceled())
- return;
- pm.worked(100);
-
- // Create VM config
- VMRunnerConfiguration runConfig =
- new VMRunnerConfiguration("org.eclipse.jem.internal.proxy.vm.remote.RemoteVMApplication", ProxyLaunchSupport.convertURLsToStrings(classpath)); //$NON-NLS-1$
-
- REMProxyFactoryRegistry registry = new REMProxyFactoryRegistry(ProxyRemoteUtil.getRegistryController(), name);
- Integer registryKey = registry.getRegistryKey();
-
- Integer bufSize = Integer.getInteger("proxyvm.bufsize"); //$NON-NLS-1$
- if (bufSize == null)
- bufSize = new Integer(16000);
-
- int masterServerPort = ProxyRemoteUtil.getRegistryController().getMasterSocketPort();
-
- // See if debug mode is requested.
- DebugModeHelper dh = new DebugModeHelper();
- boolean debugMode = dh.debugMode(name);
- boolean useNoverify = ProxyPlugin.getPlugin().getPluginPreferences().getBoolean(ProxyPlugin.PREFERENCES_VM_NOVERIFY_KEY);
-
- String[] evmArgs = execArgs.getVMArgumentsArray();
-
- int extraArgs = 4; // Number of extra standard args added (if number changes below, this must change)
- if (debugMode)
- extraArgs+=4; // Number of extra args added for debug mode (if number changes below, this must change).
- if(useNoverify)
- extraArgs++; // An extra arg added for '-noverify' flag (if number changes below, this must change).
-
- boolean useExpressionTracing = "true".equalsIgnoreCase(Platform.getDebugOption(ProxyPlugin.getPlugin().getBundle().getSymbolicName() + ProxyLaunchSupport.EXPRESSION_TRACING)); //$NON-NLS-1$
- long expressionTracingThreshold = -1;
- if (useExpressionTracing) {
- extraArgs++;
- String thresholdString = Platform.getDebugOption(ProxyPlugin.getPlugin().getBundle().getSymbolicName() + ProxyLaunchSupport.EXPRESSION_TRACEING_TIMER_THRESHOLD);
- if (thresholdString != null) {
- try {
- expressionTracingThreshold = Long.valueOf(thresholdString).longValue();
- extraArgs++;
- } catch (NumberFormatException e) {
- }
- }
- }
-
- List javaLibPaths = controller.getFinalJavaLibraryPath();
- int existingLibpaths = -1;
- if (!javaLibPaths.isEmpty()) {
- // first need to see if java lib path also specified in standard args by someone configuring the configuration by hand.
- for (int i = 0; i < evmArgs.length; i++) {
- if (evmArgs[i].startsWith("-Djava.library.path")) { //$NON-NLS-1$
- // We found one already here, save the spot so we update it later.
- existingLibpaths = i;
- break;
- }
- }
- if (existingLibpaths == -1)
- ++extraArgs; // Need to have room for one more.
- }
-
- String[] cvmArgs = new String[evmArgs.length + extraArgs];
- System.arraycopy(evmArgs, 0, cvmArgs, extraArgs, evmArgs.length); // Put existing into new list at the end.
-
- int cvmArgsCount=0;
- cvmArgs[cvmArgsCount++] = "-Dproxyvm.registryKey=" + registryKey; //$NON-NLS-1$
- cvmArgs[cvmArgsCount++] = "-Dproxyvm.masterPort=" + String.valueOf(masterServerPort); //$NON-NLS-1$
- cvmArgs[cvmArgsCount++] = "-Dproxyvm.bufsize=" + bufSize; //$NON-NLS-1$
- cvmArgs[cvmArgsCount++] = "-Dproxyvm.servername=" + name; //$NON-NLS-1$
-
- if(useNoverify)
- cvmArgs[cvmArgsCount++] = "-noverify"; //$NON-NLS-1$
-
- if (useExpressionTracing) {
- cvmArgs[cvmArgsCount++] = "-D"+ExpressionCommands.EXPRESSIONTRACE+"=true"; //$NON-NLS-1$ //$NON-NLS-2$
- if (expressionTracingThreshold != -1)
- cvmArgs[cvmArgsCount++] = "-D"+ExpressionCommands.EXPRESSIONTRACE_TIMER_THRESHOLD+'='+String.valueOf(expressionTracingThreshold); //$NON-NLS-1$
- }
-
- // If in debug mode, we need to find a port for it to use.
- int dport = -1;
- if (debugMode) {
- dport = findUnusedLocalPort("localhost", 5000, 15000, new int[0]); //$NON-NLS-1$
- cvmArgs[cvmArgsCount++] = "-Djava.compiler=NONE"; //$NON-NLS-1$
- cvmArgs[cvmArgsCount++] = "-Xdebug"; //$NON-NLS-1$
- cvmArgs[cvmArgsCount++] = "-Xnoagent"; //$NON-NLS-1$
- cvmArgs[cvmArgsCount++] = "-Xrunjdwp:transport=dt_socket,server=y,address=" + dport; //$NON-NLS-1$
- }
-
- if (!javaLibPaths.isEmpty()) {
- StringBuffer appendTo = null;
- if (existingLibpaths != -1) {
- appendTo = new StringBuffer(evmArgs[existingLibpaths]);
- appendTo.append(File.pathSeparatorChar); // Plus a separator so we can append
- } else
- appendTo = new StringBuffer("-Djava.library.path="); //$NON-NLS-1$
- String [] libPaths = ProxyLaunchSupport.convertURLsToStrings((URL[]) javaLibPaths.toArray(new URL[javaLibPaths.size()]));
- for (int i = 0; i < libPaths.length; i++) {
- if (i != 0)
- appendTo.append(File.pathSeparator);
- appendTo.append(libPaths[i]);
- }
- if (existingLibpaths != -1)
- cvmArgs[extraArgs+existingLibpaths] = appendTo.toString();
- else
- cvmArgs[extraArgs-1] = appendTo.toString();
- }
-
- runConfig.setProgramArguments(execArgs.getProgramArgumentsArray());
- runConfig.setEnvironment(envp);
- runConfig.setVMArguments(cvmArgs);
- runConfig.setWorkingDirectory(workingDirName);
- runConfig.setVMSpecificAttributesMap(vmAttributesMap);
-
- // Bootpath
- runConfig.setBootClassPath(getBootpath(configuration));
-
- // check for cancellation
- if (pm.isCanceled())
- return;
- pm.worked(100);
-
- // set the default source locator if required
- setDefaultSourceLocator(launch, configuration);
-
- // Launch the configuration - 1 unit of work
- runner.run(runConfig, launch, new SubProgressMonitor(pm, 100));
-
- // check for cancellation
- if (pm.isCanceled())
- return;
-
- IProcess[] processes = launch.getProcesses();
- IProcess process = processes[0]; // There is only one.
- // Check if it is already terminated. If it is, then there was a bad error, so just
- // print out the results from it.
- if (process.isTerminated()) {
- IStreamsProxy stProxy = process.getStreamsProxy();
- // Using a printWriter for println capability, but it needs to be on another
- // writer, which will be string
- java.io.StringWriter s = new java.io.StringWriter();
- java.io.PrintWriter w = new java.io.PrintWriter(s);
-
- w.println(ProxyRemoteMessages.VM_TERMINATED_INFO_);
- w.println(ProxyRemoteMessages.VM_COMMAND_LINE);
- w.println(process.getAttribute(IProcess.ATTR_CMDLINE));
- w.println(ProxyRemoteMessages.VM_TERMINATED_LINE1);
- w.println(stProxy.getErrorStreamMonitor().getContents());
- w.println(ProxyRemoteMessages.VM_TERMINATED_LINE2);
- w.println(stProxy.getOutputStreamMonitor().getContents());
- w.println(ProxyRemoteMessages.VM_TERMINATED_LINE3);
- w.close();
-
- String msg = MessageFormat.format(ProxyRemoteMessages.Proxy_Terminated_too_soon_ERROR_, new Object[] { name });
- dh.displayErrorMessage(ProxyRemoteMessages.Proxy_Error_Title, msg);
- throw new CoreException(
- new Status(IStatus.WARNING, ProxyPlugin.getPlugin().getBundle().getSymbolicName(), 0, s.toString(), null));
- } else {
- final String traceName = name;
- IStreamsProxy fStreamsProxy = process.getStreamsProxy();
-
- /**
- * StreamListener. Should not be created if ProxyPlugin logger is not logging the requested level.
- *
- * @since 1.1.0
- */
- class StreamListener implements IStreamListener {
- String tracePrefix;
- Level level;
- Job printJob; // Job to try to gather printing together.
- Logger logger;
- StringBuffer gatheredText = new StringBuffer(100);
- {
- logger = ProxyPlugin.getPlugin().getLogger();
- printJob = new Job("") { //$NON-NLS-1$
-
- protected IStatus run(IProgressMonitor monitor) {
- monitor.beginTask(ProxyRemoteMessages.LocalProxyLaunchDelegate_Monitor_PrintRemoteTrace_Text, 1);
- while(true) {
- String output = null;
- synchronized (gatheredText) {
- if (gatheredText.length() <= tracePrefix.length())
- break; // We've reached the end, no more to print.
- output = gatheredText.toString();
- gatheredText.setLength(tracePrefix.length()); // Reset the length to the prefix.
- }
- logger.log(output, level);
- }
- monitor.done();
- return Status.OK_STATUS;
- }
- };
- printJob.setPriority(Job.SHORT);
- printJob.setSystem(true);
- }
-
- public StreamListener(String type, Level level, Logger logger) {
- tracePrefix = traceName + ':' + type + '>' + System.getProperty("line.separator"); //$NON-NLS-1$
- gatheredText.append(tracePrefix);
- this.level = level;
- this.logger = logger;
- }
-
- public void streamAppended(String newText, IStreamMonitor monitor) {
- synchronized(gatheredText) {
- gatheredText.append(newText);
- }
- printJob.schedule(100L); // Wait tenth of second to gather as much as can together.
- }
- };
-
- Logger logger = ProxyPlugin.getPlugin().getLogger();
- if (logger.isLoggingLevel(Level.WARNING)) {
- // Always listen to System.err output if we are at least logging warnings.
- IStreamMonitor monitor = fStreamsProxy.getErrorStreamMonitor();
- if (monitor != null)
- monitor.addListener(new StreamListener("err", Level.WARNING, logger)); //$NON-NLS-1$
- }
-
- // If debug trace is requested, then attach trace listener for System.out
- // Expression tracing requires debug trace too because it prints to sysout. However, it requesting expressionTracing, change logging level to INFO,
- // we want them to show if this true. It is confusing to also have to change logging level in .options file.
- if (useExpressionTracing)
- if (!logger.isLoggingLevel(Level.INFO))
- logger.setLevel(Level.INFO);
- if (useExpressionTracing || "true".equalsIgnoreCase(Platform.getDebugOption(ProxyPlugin.getPlugin().getBundle().getSymbolicName() + ProxyRemoteUtil.DEBUG_VM_TRACEOUT))) { //$NON-NLS-1$
- // Want to trace the output of the remote vm's. And we are logging at least level info.
- if (logger.isLoggingLevel(Level.INFO)) {
- IStreamMonitor monitor = fStreamsProxy.getOutputStreamMonitor();
- if (monitor != null)
- monitor.addListener(new StreamListener("out", Level.INFO, logger)); //$NON-NLS-1$
- }
- }
- }
-
- // If in debug mode, tester must start debugger before going on.
- if (debugMode) {
- if (!dh.promptPort(dport)) {
- process.terminate();
- throw new CoreException(
- new Status(
- IStatus.WARNING,
- ProxyPlugin.getPlugin().getBundle().getSymbolicName(),
- 0,
- "Debugger attach canceled", //$NON-NLS-1$
- null));
- }
- }
-
- // Now set up the registry.
- registry.initializeRegistry(process);
- new REMStandardBeanTypeProxyFactory(registry);
- new REMStandardBeanProxyFactory(registry);
- new REMMethodProxyFactory(registry);
-
- if (debugMode || REMProxyFactoryRegistry.fGlobalNoTimeouts)
- registry.fNoTimeouts = true;
- if (configuration.getAttribute(IProxyConstants.ATTRIBUTE_AWT_SWING, true))
- REMRegisterAWT.registerAWT(registry);
-
- launchInfo.resultRegistry = registry;
-
- pm.done();
- TimerTests.basicTest.stopStep(stepId);
- }
-
- /**
- * @param controller
- * @param info
- * @throws CoreException
- *
- * @since 1.0.2
- */
- private void addInFragmentLibraries(IConfigurationContributionController controller, IConfigurationContributionInfo info) throws CoreException {
- IPDEContributeClasspath instance = IPDEContributeClasspath.INSTANCE;
- if (instance != null) {
- instance.getPDEContributions(controller, info);
- }
- }
-
- // Utilities to find the free port
- private static final Random fgRandom = new Random(System.currentTimeMillis());
-
- private static int findUnusedLocalPort(String host, int searchFrom, int searchTo, int[] exclude) {
- for (int i = 0; i < 10; i++) {
- int port = 0;
- newport : while (true) {
- port = getRandomPort(searchFrom, searchTo);
- if (exclude != null)
- for (int e = 0; e < exclude.length; e++)
- if (port == exclude[e])
- continue newport;
- break;
- }
- try {
- new Socket(host, port);
- } catch (ConnectException e) {
- return port;
- } catch (IOException e) {
- }
- }
- return -1;
- }
-
- private static int getRandomPort(int low, int high) {
- return (int) (fgRandom.nextFloat() * (high - low)) + low;
- }
-
- private String[][] getBootpathExt(Map vmMap) {
- String[][] ext = new String[3][];
- if (vmMap != null) {
- ext[0] = (String[]) vmMap.get(IJavaLaunchConfigurationConstants.ATTR_BOOTPATH_PREPEND);
- ext[1] = (String[]) vmMap.get(IJavaLaunchConfigurationConstants.ATTR_BOOTPATH);
- ext[2] = (String[]) vmMap.get(IJavaLaunchConfigurationConstants.ATTR_BOOTPATH_APPEND);
- }
- return ext;
- }
-
-
-}
diff --git a/plugins/org.eclipse.jem.proxy/proxyRemote/org/eclipse/jem/internal/proxy/remote/MessageDialog.java b/plugins/org.eclipse.jem.proxy/proxyRemote/org/eclipse/jem/internal/proxy/remote/MessageDialog.java
deleted file mode 100644
index dd60e3d..0000000
--- a/plugins/org.eclipse.jem.proxy/proxyRemote/org/eclipse/jem/internal/proxy/remote/MessageDialog.java
+++ /dev/null
@@ -1,331 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2001, 2005 IBM Corporation and others.
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
- *
- * Contributors:
- * IBM Corporation - initial API and implementation
- *******************************************************************************/
-package org.eclipse.jem.internal.proxy.remote;
-/*
-
-
- */
-
-import java.awt.*;
-/**
- * This is an AWT message dialog. It will only be used
- * if not running in the workbench by the debug mode helper.
- * It won't be loaded unless AWT is available, so it can be
- * distributed without causing problems on systems that
- * don't have AWT because it won't be loaded in that case.
- */
-class MessageDialog extends Dialog {
- /**
- * Comment for <code>serialVersionUID</code>
- *
- * @since 1.1.0
- */
- private static final long serialVersionUID = 2547670349372067345L;
- private java.awt.Panel ivjContentsPane = null;
- IvjEventHandler ivjEventHandler = new IvjEventHandler();
- private java.awt.TextArea ivjTextArea1 = null;
- private java.awt.Button ivjButton1 = null;
- public int result = 2; // Nothing hit is the same as button 2.
- private java.awt.Button ivjButton2 = null;
-
-class IvjEventHandler implements java.awt.event.ActionListener, java.awt.event.WindowListener {
- public void actionPerformed(java.awt.event.ActionEvent e) {
- if (e.getSource() == MessageDialog.this.getButton1())
- connEtoC2(e);
- if (e.getSource() == MessageDialog.this.getButton2())
- connEtoC3(e);
- };
- public void windowActivated(java.awt.event.WindowEvent e) {};
- public void windowClosed(java.awt.event.WindowEvent e) {};
- public void windowClosing(java.awt.event.WindowEvent e) {
- if (e.getSource() == MessageDialog.this)
- connEtoC1(e);
- };
- public void windowDeactivated(java.awt.event.WindowEvent e) {};
- public void windowDeiconified(java.awt.event.WindowEvent e) {};
- public void windowIconified(java.awt.event.WindowEvent e) {};
- public void windowOpened(java.awt.event.WindowEvent e) {};
- };
-/**
- * MessageDialog constructor comment.
- * @param owner java.awt.Frame
- * @param title java.lang.String
- * @param modal boolean
- */
-public MessageDialog(Frame owner, String title, boolean modal, String msg, String button1, String button2) {
- super(owner, title, modal);
-
- initialize();
- getTextArea1().setText(msg);
- getButton1().setLabel(button1);
- if (button2 != null)
- getButton2().setLabel(button2);
- else {
- // We only want one button, so remove button2
- getContentsPane().remove(getButton2());
- }
-
-}
-/**
- * Comment
- */
-public void button1_ActionPerformed() {
- result = 1;
- setVisible(false);
- return;
-}
-/**
- * Comment
- */
-public void button2_ActionPerformed() {
- result = 2;
- setVisible(false);
- return;
-}
-/**
- * connEtoC1: (MessageDialog.window.windowClosing(java.awt.event.WindowEvent) --> MessageDialog.dispose()V)
- * @param arg1 java.awt.event.WindowEvent
- */
-/* WARNING: THIS METHOD WILL BE REGENERATED. */
-private void connEtoC1(java.awt.event.WindowEvent arg1) {
- try {
- // user code begin {1}
- // user code end
- this.dispose();
- // user code begin {2}
- // user code end
- } catch (java.lang.Throwable ivjExc) {
- // user code begin {3}
- // user code end
- handleException(ivjExc);
- }
-}
-/**
- * connEtoC2: (Button1.action.actionPerformed(java.awt.event.ActionEvent) --> MessageDialog.button1_ActionPerformed()V)
- * @param arg1 java.awt.event.ActionEvent
- */
-/* WARNING: THIS METHOD WILL BE REGENERATED. */
-private void connEtoC2(java.awt.event.ActionEvent arg1) {
- try {
- // user code begin {1}
- // user code end
- this.button1_ActionPerformed();
- // user code begin {2}
- // user code end
- } catch (java.lang.Throwable ivjExc) {
- // user code begin {3}
- // user code end
- handleException(ivjExc);
- }
-}
-/**
- * connEtoC3: (Button2.action.actionPerformed(java.awt.event.ActionEvent) --> MessageDialog.button2_ActionPerformed()V)
- * @param arg1 java.awt.event.ActionEvent
- */
-/* WARNING: THIS METHOD WILL BE REGENERATED. */
-private void connEtoC3(java.awt.event.ActionEvent arg1) {
- try {
- // user code begin {1}
- // user code end
- this.button2_ActionPerformed();
- // user code begin {2}
- // user code end
- } catch (java.lang.Throwable ivjExc) {
- // user code begin {3}
- // user code end
- handleException(ivjExc);
- }
-}
-/**
- * Display dialog.
- * @param args java.lang.String[]
- */
-public static int doit(String title, String message, String button1, String button2) {
- try {
- Frame f = new java.awt.Frame(title);
- f.setVisible(true);
- // Need to massage the method since AWT doesn't have wordwrap. This is for left to right only.
- String msg = message;
- if (message.length() > 95) {
- msg = ""; //$NON-NLS-1$
-nextSeg: while (message.length() > 95) {
- // Too wide, wrapping should be done. This is just a rough guess.
- for (int i=95; 0<=i; i--) {
- if (message.charAt(i) == ' ') {
- // Break here.
- msg = msg + message.substring(0, i) + '\n';
- if (i+1 < message.length())
- message = message.substring(i+1);
- else
- message = ""; //$NON-NLS-1$
- continue nextSeg;
- }
- }
- // If we got here, then there weren't any spaces in the first 80, so look right for first space.
- for (int i=96; i<message.length(); i++) {
- if (message.charAt(i) == ' ') {
- // Break here
- msg = msg + message.substring(0, i) + '\n';
- if (i+1 < message.length())
- message = message.substring(i+1);
- else
- message = ""; //$NON-NLS-1$
- continue nextSeg;
- }
- }
- }
- msg += message; // Now put on whatever is left.
- }
- MessageDialog aMessageDialog = new MessageDialog(f,title,true, msg, button1, button2);
- aMessageDialog.pack();
- aMessageDialog.getToolkit().beep();
- aMessageDialog.setVisible(true);
- f.dispose();
- aMessageDialog.dispose();
-
- return aMessageDialog.result;
- } catch (Exception exception) {
- }
-
- return 2;
-}
-/**
- * Return the Button1 property value.
- * @return java.awt.Button
- */
-/* WARNING: THIS METHOD WILL BE REGENERATED. */
-private java.awt.Button getButton1() {
- if (ivjButton1 == null) {
- try {
- ivjButton1 = new java.awt.Button();
- ivjButton1.setName("Button1"); //$NON-NLS-1$
- ivjButton1.setLabel("Button1"); //$NON-NLS-1$
- // user code begin {1}
- // user code end
- } catch (java.lang.Throwable ivjExc) {
- // user code begin {2}
- // user code end
- handleException(ivjExc);
- }
- }
- return ivjButton1;
-}
-/**
- * Return the Button2 property value.
- * @return java.awt.Button
- */
-/* WARNING: THIS METHOD WILL BE REGENERATED. */
-private java.awt.Button getButton2() {
- if (ivjButton2 == null) {
- try {
- ivjButton2 = new java.awt.Button();
- ivjButton2.setName("Button2"); //$NON-NLS-1$
- ivjButton2.setLabel("Button2"); //$NON-NLS-1$
- // user code begin {1}
- // user code end
- } catch (java.lang.Throwable ivjExc) {
- // user code begin {2}
- // user code end
- handleException(ivjExc);
- }
- }
- return ivjButton2;
-}
-/**
- * Return the ContentsPane property value.
- * @return java.awt.Panel
- */
-/* WARNING: THIS METHOD WILL BE REGENERATED. */
-private java.awt.Panel getContentsPane() {
- if (ivjContentsPane == null) {
- try {
- ivjContentsPane = new java.awt.Panel();
- ivjContentsPane.setName("ContentsPane"); //$NON-NLS-1$
- ivjContentsPane.setLayout(new java.awt.FlowLayout());
- getContentsPane().add(getTextArea1(), getTextArea1().getName());
- getContentsPane().add(getButton1(), getButton1().getName());
- getContentsPane().add(getButton2(), getButton2().getName());
- // user code begin {1}
- // user code end
- } catch (java.lang.Throwable ivjExc) {
- // user code begin {2}
- // user code end
- handleException(ivjExc);
- }
- }
- return ivjContentsPane;
-}
-/**
- * Return the TextArea1 property value.
- * @return java.awt.TextArea
- */
-/* WARNING: THIS METHOD WILL BE REGENERATED. */
-private java.awt.TextArea getTextArea1() {
- if (ivjTextArea1 == null) {
- try {
- ivjTextArea1 = new TextArea();
- ivjTextArea1.setName("TextArea1"); //$NON-NLS-1$
- ivjTextArea1.setText("TextArea1"); //$NON-NLS-1$
- ivjTextArea1.setRows(20);
- ivjTextArea1.setColumns(100);
- ivjTextArea1.setEditable(false);
- // user code begin {1}
- // user code end
- } catch (java.lang.Throwable ivjExc) {
- // user code begin {2}
- // user code end
- handleException(ivjExc);
- }
- }
- return ivjTextArea1;
-}
-/**
- * Called whenever the part throws an exception.
- * @param exception java.lang.Throwable
- */
-private void handleException(java.lang.Throwable exception) {
-
- /* Uncomment the following lines to print uncaught exceptions to stdout */
- // ProxyPlugin.getPlugin().getMsgLogger().write(Level.WARNING,"--------- UNCAUGHT EXCEPTION ---------");
- // ProxyPlugin.getPlugin().getMsgLogger().write(Level.WARNING,exception);
-}
-/**
- * Initializes connections
- * @exception java.lang.Exception The exception description.
- */
-/* WARNING: THIS METHOD WILL BE REGENERATED. */
-private void initConnections() throws java.lang.Exception {
- // user code begin {1}
- // user code end
- this.addWindowListener(ivjEventHandler);
- getButton1().addActionListener(ivjEventHandler);
- getButton2().addActionListener(ivjEventHandler);
-}
-/**
- * Initialize the class.
- */
-/* WARNING: THIS METHOD WILL BE REGENERATED. */
-private void initialize() {
- try {
- // user code begin {1}
- // user code end
- setName("MessageDialog"); //$NON-NLS-1$
- setLayout(new java.awt.BorderLayout());
- setSize(426, 240);
- add(getContentsPane(), "Center"); //$NON-NLS-1$
- initConnections();
- } catch (java.lang.Throwable ivjExc) {
- handleException(ivjExc);
- }
- // user code begin {2}
- // user code end
-}
-}
diff --git a/plugins/org.eclipse.jem.proxy/proxyRemote/org/eclipse/jem/internal/proxy/remote/ProxyRemoteMessages.java b/plugins/org.eclipse.jem.proxy/proxyRemote/org/eclipse/jem/internal/proxy/remote/ProxyRemoteMessages.java
deleted file mode 100644
index 68ddb07..0000000
--- a/plugins/org.eclipse.jem.proxy/proxyRemote/org/eclipse/jem/internal/proxy/remote/ProxyRemoteMessages.java
+++ /dev/null
@@ -1,55 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2000, 2005 IBM Corporation and others.
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
- *
- * Contributors:
- * IBM Corporation - initial API and implementation
- *******************************************************************************/
-package org.eclipse.jem.internal.proxy.remote;
-
-import org.eclipse.osgi.util.NLS;
-
-public final class ProxyRemoteMessages extends NLS {
-
- private static final String BUNDLE_NAME = "org.eclipse.jem.internal.proxy.remote.messages";//$NON-NLS-1$
-
- private ProxyRemoteMessages() {
- // Do not instantiate
- }
-
- public static String NO_OUTPUT_FOLDER_EXC_;
- public static String VM_COMMAND_LINE;
- public static String VM_TERMINATED_INFO_;
- public static String VM_TERMINATED_LINE1;
- public static String VM_TERMINATED_LINE2;
- public static String VM_TERMINATED_LINE3;
- public static String REMOTE_VM_TRACE_INFO_;
- public static String REMOTE_VM_LOCAL_TRACE_INFO_;
- public static String Classcast_EXC_;
- public static String Instantiate_EXC_;
- public static String RemoteCmd_EXC_;
- public static String ExceptionErrorMsg_EXC_;
- public static String OK_7;
- public static String Proxy_NoRunner_ERROR_;
- public static String Proxy_Error_Title;
- public static String Proxy_Terminated_too_soon_ERROR_;
- public static String ProxyRemoteVMName;
- public static String ProxyRemoteVMNameWithComment;
- public static String ProxyRemoteNoLaunchKey;
- public static String ProxyRemoteLaunchVM;
- public static String CleanupJob_title;
- public static String REMProxyFactoryRegistry_CallbackConnectionNotWorking_EXC_;
- public static String REMProxyFactoryRegistry_ConnectionCreationFailed_INFO_;
- public static String REMProxyFactoryRegistry_Job_TerminateProcess_Title;
- public static String REMProxyFactoryRegistry_CouldNotCreateSocketConnectionToRemoteVM_EXC_;
- public static String REMExpression_IOExceptionSeeLog_INFO_;
- public static String REMExpression_CommandExceptionSeeLog_INFO_;
- public static String LocalProxyLaunchDelegate_Monitor_PrintRemoteTrace_Text;
-
- static {
- NLS.initializeMessages(BUNDLE_NAME, ProxyRemoteMessages.class);
- }
-}
\ No newline at end of file
diff --git a/plugins/org.eclipse.jem.proxy/proxyRemote/org/eclipse/jem/internal/proxy/remote/ProxyRemoteUtil.java b/plugins/org.eclipse.jem.proxy/proxyRemote/org/eclipse/jem/internal/proxy/remote/ProxyRemoteUtil.java
deleted file mode 100644
index 73eed8a..0000000
--- a/plugins/org.eclipse.jem.proxy/proxyRemote/org/eclipse/jem/internal/proxy/remote/ProxyRemoteUtil.java
+++ /dev/null
@@ -1,61 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2001, 2005 IBM Corporation and others.
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
- *
- * Contributors:
- * IBM Corporation - initial API and implementation
- *******************************************************************************/
-package org.eclipse.jem.internal.proxy.remote;
-/*
-
-
- */
-
-
-import org.eclipse.core.runtime.IPath;
-import org.osgi.framework.Bundle;
-
-import org.eclipse.jem.internal.proxy.core.IConfigurationContributionController;
-import org.eclipse.jem.internal.proxy.core.ProxyPlugin;
-
-
-public class ProxyRemoteUtil {
-
- // Debug options
- public static final String DEBUG_VM = "/remote/debug/debugvm", // Bring up debugger on remote vm's. //$NON-NLS-1$
- IO_CONSOLE = "/remote/debug/ioconsole", // IO Through console (system in and out) for asking questions. //$NON-NLS-1$
- DEBUG_VM_TRACEOUT = "/remote/debug/vmtraceout", // Trace the output from the remote vm's. //$NON-NLS-1$
- NO_TIMEOUTS = "/remote/debug/notimeouts"; // No socket timeouts when talking to remote vm. Turn this on when doing callback testing. Not needed otherwise. //$NON-NLS-1$
-
- private static REMRegistryController pluginRegistryController;
-
- /**
- * Return the registry controller.
- */
- public synchronized static REMRegistryController getRegistryController() {
- return pluginRegistryController != null ? pluginRegistryController : (pluginRegistryController = new REMRegistryController());
- }
-
- /**
- * Method to update any class paths with any
- * paths that need to be added to a VM. In this case, it is
- * the remotevm.jar and the remotecommon.jar that need to be added. The first jar contains
- * the code necessary to run the remote vm and listen for commands. The second jar contains
- * the common code that is required to be shared on both the IDE side and remote side. It
- * is the interface code so that they both talk the same language.
- * support.
- */
- public static void updateClassPaths(IConfigurationContributionController controller) {
- Bundle proxyBundle = ProxyPlugin.getPlugin().getBundle();
- // Need to have our jars at the beginning. (Struts causes a problem because
- // they have a jar (commons-fileupload.jar) that if when searching for a class and
- // this jar is reached, it causes the class loader to barf. Our jars used to be at
- // the end, and so it found the fileupload jar first and no remote vm could be started
- // because of this.
- controller.contributeClasspath(proxyBundle, (IPath) null, IConfigurationContributionController.PREPEND_USER_CLASSPATH, false); //$NON-NLS-1$
- controller.contributeClasspath(proxyBundle, "vm/remotevm.jar", IConfigurationContributionController.PREPEND_USER_CLASSPATH, false); //$NON-NLS-1$
- }
-}
diff --git a/plugins/org.eclipse.jem.proxy/proxyRemote/org/eclipse/jem/internal/proxy/remote/REMAbstractBeanProxy.java b/plugins/org.eclipse.jem.proxy/proxyRemote/org/eclipse/jem/internal/proxy/remote/REMAbstractBeanProxy.java
deleted file mode 100644
index 9ada523..0000000
--- a/plugins/org.eclipse.jem.proxy/proxyRemote/org/eclipse/jem/internal/proxy/remote/REMAbstractBeanProxy.java
+++ /dev/null
@@ -1,134 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2001, 2005 IBM Corporation and others.
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
- *
- * Contributors:
- * IBM Corporation - initial API and implementation
- *******************************************************************************/
-package org.eclipse.jem.internal.proxy.remote;
-/*
-
-
- */
-
-
-import org.eclipse.jem.internal.proxy.core.*;
-import org.eclipse.jem.internal.proxy.common.remote.*;
-/**
- * An abstract base class of IREMBeanProxy that doesn't
- * have the bean type stored in it. The subclasses will
- * supply it. It does however have an ID because it does
- * exist over on the remote VM.
- */
-public abstract class REMAbstractBeanProxy implements IREMBeanProxy {
- protected final REMProxyFactoryRegistry fFactory;
- private Integer fID;
-
- /**
- * Set the bean we are proxying. We are a proxy for a bean running on the remote VM.
- */
- protected REMAbstractBeanProxy(REMProxyFactoryRegistry aRegistry, Integer anID){
- fFactory = aRegistry;
- fID = anID;
- }
-
- /**
- * equals: Equal if:
- * 1) This proxy == (identity) to the other object
- * 2) Else if other is an IBeanProxy and not a constant one, then if
- * equals on the server.
- * 3) If this is a constant proxy and the other is too or is a constant
- * value (e.g. IStringBeanProxy.equals(String), then true if values are equals.
- */
- public boolean equals(Object anObject) {
- if (super.equals(anObject))
- return true; // Identity
- if (anObject instanceof IBeanProxy && !(anObject instanceof IREMConstantBeanProxy) && fFactory.isValid() && ((IBeanProxy) anObject).getProxyFactoryRegistry() == fFactory)
- try {
- // The other is a bean proxy and is not a constant one, let the server do the check.
- return ((IBooleanBeanProxy) REMStandardBeanProxyConstants.getConstants(fFactory).getObjectEquals().invoke(this, (IBeanProxy) anObject)).booleanValue();
- } catch (ThrowableProxy e) {
- }
- return false;
- }
-
- /* (non-Javadoc)
- * @see org.eclipse.jem.internal.proxy.core.IBeanProxy#sameAs(org.eclipse.jem.internal.proxy.core.IBeanProxy)
- */
- public boolean sameAs(IBeanProxy aBeanProxy) {
- return this == aBeanProxy; // We can be assured in Remote Proxy that identity of proxy and identity of object are the same.
- }
-
- public ProxyFactoryRegistry getProxyFactoryRegistry() {
- return fFactory;
- }
-
- /**
- * Get ID. An internal method to be used only within the ProxyFactory family.
- */
- public Integer getID() {
- return fID;
- }
-
- /**
- * isValid.
- */
- public boolean isValid() {
- return fID != null;
- }
-
- /**
- * Proxy is about to be released, MUST mark it invalid.
- * This is required. Resources can also be cleaned up
- * if they are being held and need to be cleaned up.
- *
- * NOTE: This method will only be called when the proxy
- * is explicitly released. If it is simply garbage collected,
- * then this method will not be called. Simple garbage collection
- * means that no one is referencing this proxy. The proxy factory
- * will know what id this proxy was referencing and will release it
- * on the server at GC time.
- *
- * If there are resources
- * that absolutely must be released, then the finalize method
- * should be implemented to do the clean up. However, try not
- * to have this be the case. Finalize methods add overhead that is
- * usually better not to have. The better way is for any users
- * that get this kind of proxy object know to call release on
- * ProxyFactoryRegistry to release it before garbage collection.
- */
- public void release() {
- fID = null;
- }
-
- /**
- * Return the toString of the actual bean on the remote side.
- */
- public String toBeanString() {
- IStringBeanProxy string = (IStringBeanProxy) REMStandardBeanProxyConstants.getConstants(fFactory).getObjectToString().invokeCatchThrowableExceptions(this);
- return (string != null) ? string.stringValue() : null;
- }
-
- /**
- * Render the bean proxy into the value field.
- */
- public void renderBean(Commands.ValueObject value) {
- value.setObjectID(isValid() ? getID().intValue() : Commands.VOID); // No longer exists, so send over null.
- }
-
- /* (non-Javadoc)
- * @see org.eclipse.jem.internal.proxy.core.IProxy#isBeanProxy()
- */
- public final boolean isBeanProxy() {
- return true;
- }
- /* (non-Javadoc)
- * @see org.eclipse.jem.internal.proxy.core.IProxy#isExpressionProxy()
- */
- public final boolean isExpressionProxy() {
- return false;
- }
-}
diff --git a/plugins/org.eclipse.jem.proxy/proxyRemote/org/eclipse/jem/internal/proxy/remote/REMAbstractBeanTypeProxy.java b/plugins/org.eclipse.jem.proxy/proxyRemote/org/eclipse/jem/internal/proxy/remote/REMAbstractBeanTypeProxy.java
deleted file mode 100644
index dd09366..0000000
--- a/plugins/org.eclipse.jem.proxy/proxyRemote/org/eclipse/jem/internal/proxy/remote/REMAbstractBeanTypeProxy.java
+++ /dev/null
@@ -1,703 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2001, 2006 IBM Corporation and others.
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
- *
- * Contributors:
- * IBM Corporation - initial API and implementation
- *******************************************************************************/
-/*
-
-
- */
-package org.eclipse.jem.internal.proxy.remote;
-
-import org.eclipse.core.runtime.IStatus;
-import org.eclipse.core.runtime.Status;
-
-import org.eclipse.jem.internal.proxy.core.*;
-import org.eclipse.jem.internal.proxy.common.AmbiguousMethodException;
-import org.eclipse.jem.internal.proxy.common.CommandException;
-import org.eclipse.jem.internal.proxy.common.remote.Commands;
-import org.eclipse.jem.internal.proxy.common.remote.TransmitableArray;
-
-/**
- * This implementation of IBeanTypeProxy is for where the Bean is on a different VM then the IDE
- *
- * Creation date: (12/3/99 12:29:26 PM)
- *
- * @author: Joe Winchester
- */
-public abstract class REMAbstractBeanTypeProxy implements IREMBeanTypeProxy {
-
- private Integer fID;
-
- protected final REMProxyFactoryRegistry fRegistry;
-
- protected final String fClassname; // This is cached here so that we don't need to go over the line to get it.
-
- private IBeanTypeProxy fSuperType; // This is cached so as not to have to go over the line for it.
-
- /**
- * Create with a registry and a class. It is protected so that only subclasses and the factory with this REM package can call it.
- */
- protected REMAbstractBeanTypeProxy(REMProxyFactoryRegistry aRegistry, Integer anID, String aClassname, IBeanTypeProxy aSuperType) {
- fRegistry = aRegistry;
- fID = anID;
- fClassname = aClassname;
- fSuperType = aSuperType;
- }
-
- /**
- * equals: Equal if: 1) This proxy == (identity) to the other object This is all that is needed for BeanTypes because we know these are classes,
- * there is only one per class, and Class equals is true only for identity.
- */
- public boolean equals(Object anObject) {
- return super.equals(anObject);
- }
-
- /*
- * (non-Javadoc)
- *
- * @see org.eclipse.jem.internal.proxy.core.IBeanProxy#sameAs(org.eclipse.jem.internal.proxy.core.IBeanProxy)
- */
- public boolean sameAs(IBeanProxy aBeanProxy) {
- return this == aBeanProxy; // We can be assured in Remote Proxy that identity of proxy and identity of object are the same.
- }
-
- /*
- * (non-Javadoc)
- *
- * @see org.eclipse.jem.internal.proxy.remote.IREMBeanProxy#getID()
- */
- public Integer getID() {
- return fID;
- }
-
- /*
- * (non-Javadoc)
- *
- * @see org.eclipse.jem.internal.proxy.core.IBeanProxy#isValid()
- */
- public boolean isValid() {
- return fID != null;
- }
-
- /*
- * (non-Javadoc)
- *
- * @see org.eclipse.jem.internal.proxy.remote.IREMBeanProxy#release()
- */
- public void release() {
- // Clear the id and supertype (supertype is cleared so that
- // it won't hold onto it and will let the supertype be GC'd
- // if necessary.
-
- fID = null;
- fSuperType = null;
- }
-
- /*
- * (non-Javadoc)
- *
- * @see org.eclipse.jem.internal.proxy.core.IBeanTypeProxy#getConstructorProxy(java.lang.String[])
- */
- public IConstructorProxy getConstructorProxy(String[] argumentClassNames) {
- if (isInterface())
- return null; // Interfaces don't have ctor's.
-
- // Turn class names into array of BeanTypes.
- IBeanTypeProxy[] argTypes = null;
- if (argumentClassNames != null) {
- IStandardBeanTypeProxyFactory typeFactory = fRegistry.getBeanTypeProxyFactory();
- argTypes = new IBeanTypeProxy[argumentClassNames.length];
- for (int i = 0; i < argumentClassNames.length; i++) {
- IBeanTypeProxy type = argTypes[i] = typeFactory.getBeanTypeProxy(argumentClassNames[i]);
- if (type == null)
- return null; // Couldn't find the type.
- }
- }
-
- return getConstructorProxy(argTypes);
- }
-
- /*
- * (non-Javadoc)
- *
- * @see org.eclipse.jem.internal.proxy.core.IBeanTypeProxy#getConstructorProxy(org.eclipse.jem.internal.proxy.core.IBeanTypeProxy[])
- */
- public IConstructorProxy getConstructorProxy(IBeanTypeProxy[] argumentTypes) {
- if (isInterface())
- return null; // Interfaces don't have ctor's.
-
- IREMMethodProxy getCtorMethod = (IREMMethodProxy) REMStandardBeanProxyConstants.getConstants(fRegistry).getClassConstructor();
-
- // Create the argument array
- Object[] getParms = (argumentTypes != null) ? new Object[] { new TransmitableArray(Commands.CLASS_CLASS, argumentTypes)} : // Get Ctor has
- // only one parm,
- // the array of
- // parm types.
- null;
-
- try {
- return (IConstructorProxy) getCtorMethod.invokeWithParms(this, getParms);
- } catch (ThrowableProxy e) {
- fRegistry.releaseProxy(e);
- return null;
- }
- }
-
-
- /* (non-Javadoc)
- * @see org.eclipse.jem.internal.proxy.core.IBeanTypeProxy#getConstructors()
- */
- public IConstructorProxy[] getConstructors() {
-
- if (isInterface())
- return null; // Interfaces don't have ctor's.
-
- IREMMethodProxy getCtorMethod = (IREMMethodProxy) REMStandardBeanProxyConstants.getConstants(fRegistry).getClassConstructors();
-
- try {
- IArrayBeanProxy ctors = (IArrayBeanProxy) getCtorMethod.invokeWithParms(this, null);
- IBeanProxy[] proxies = ctors.getSnapshot();
- IConstructorProxy[] ctorproxies = new IConstructorProxy[proxies.length];
- System.arraycopy(proxies, 0, ctorproxies, 0, proxies.length);
- return ctorproxies;
- } catch (ThrowableProxy e) {
- fRegistry.releaseProxy(e);
- return null;
- }
- }
-
- /*
- * (non-Javadoc)
- *
- * @see org.eclipse.jem.internal.proxy.core.IBeanTypeProxy#getConstructorProxy(java.lang.String[])
- */
- public IConstructorProxy getDeclaredConstructorProxy(String[] argumentClassNames) {
- if (isInterface())
- return null; // Interfaces don't have ctor's.
-
- // Turn class names into array of BeanTypes.
- IBeanTypeProxy[] argTypes = null;
- if (argumentClassNames != null) {
- IStandardBeanTypeProxyFactory typeFactory = fRegistry.getBeanTypeProxyFactory();
- argTypes = new IBeanTypeProxy[argumentClassNames.length];
- for (int i = 0; i < argumentClassNames.length; i++) {
- IBeanTypeProxy type = argTypes[i] = typeFactory.getBeanTypeProxy(argumentClassNames[i]);
- if (type == null)
- return null; // Couldn't find the type.
- }
- }
-
- return getDeclaredConstructorProxy(argTypes);
- }
-
- /*
- * (non-Javadoc)
- *
- * @see org.eclipse.jem.internal.proxy.core.IBeanTypeProxy#getConstructorProxy(org.eclipse.jem.internal.proxy.core.IBeanTypeProxy[])
- */
- public IConstructorProxy getDeclaredConstructorProxy(IBeanTypeProxy[] argumentTypes) {
- if (isInterface())
- return null; // Interfaces don't have ctor's.
-
- IREMMethodProxy getCtorMethod = (IREMMethodProxy) REMStandardBeanProxyConstants.getConstants(fRegistry).getDeclaredClassConstructor();
-
- // Create the argument array
- Object[] getParms = (argumentTypes != null) ? new Object[] { new TransmitableArray(Commands.CLASS_CLASS, argumentTypes)} : // Get Ctor has
- // only one parm,
- // the array of
- // parm types.
- null;
-
- try {
- return (IConstructorProxy) getCtorMethod.invokeWithParms(this, getParms);
- } catch (ThrowableProxy e) {
- fRegistry.releaseProxy(e);
- return null;
- }
- }
-
-
- /* (non-Javadoc)
- * @see org.eclipse.jem.internal.proxy.core.IBeanTypeProxy#getConstructors()
- */
- public IConstructorProxy[] getDeclaredConstructors() {
-
- if (isInterface())
- return null; // Interfaces don't have ctor's.
-
- IREMMethodProxy getCtorMethod = (IREMMethodProxy) REMStandardBeanProxyConstants.getConstants(fRegistry).getDeclaredClassConstructors();
-
- try {
- IArrayBeanProxy ctors = (IArrayBeanProxy) getCtorMethod.invokeWithParms(this, null);
- IBeanProxy[] proxies = ctors.getSnapshot();
- IConstructorProxy[] ctorproxies = new IConstructorProxy[proxies.length];
- System.arraycopy(proxies, 0, ctorproxies, 0, proxies.length);
- return ctorproxies;
- } catch (ThrowableProxy e) {
- fRegistry.releaseProxy(e);
- return null;
- }
- }
-
- /* (non-Javadoc)
- * @see org.eclipse.jem.internal.proxy.core.IBeanTypeProxy#getConstructors()
- */
- public IFieldProxy[] getFields() {
-
- IREMMethodProxy getFieldsMethod = (IREMMethodProxy) REMStandardBeanProxyConstants.getConstants(fRegistry).getClassGetFields();
-
- try {
- IArrayBeanProxy fields = (IArrayBeanProxy) getFieldsMethod.invokeWithParms(this, null);
- IBeanProxy[] proxies = fields.getSnapshot();
- IFieldProxy[] fieldProxies = new IFieldProxy[proxies.length];
- System.arraycopy(proxies, 0, fieldProxies, 0, proxies.length);
- return fieldProxies;
- } catch (ThrowableProxy e) {
- fRegistry.releaseProxy(e);
- return null;
- }
- }
-
- /* (non-Javadoc)
- * @see org.eclipse.jem.internal.proxy.core.IBeanTypeProxy#getConstructors()
- */
- public IFieldProxy[] getDeclaredFields() {
-
- IREMMethodProxy getDeclaredFieldsMethod = (IREMMethodProxy) REMStandardBeanProxyConstants.getConstants(fRegistry).getClassGetDeclaredFields();
-
- try {
- IArrayBeanProxy fields = (IArrayBeanProxy) getDeclaredFieldsMethod.invokeWithParms(this, null);
- IBeanProxy[] proxies = fields.getSnapshot();
- IFieldProxy[] fieldProxies = new IFieldProxy[proxies.length];
- System.arraycopy(proxies, 0, fieldProxies, 0, proxies.length);
- return fieldProxies;
- } catch (ThrowableProxy e) {
- fRegistry.releaseProxy(e);
- return null;
- }
- }
-
- /*
- * (non-Javadoc)
- *
- * @see org.eclipse.jem.internal.proxy.core.IBeanTypeProxy#getDeclaredFieldProxy(java.lang.String)
- */
- public IFieldProxy getDeclaredFieldProxy(String fieldName) {
- return (IFieldProxy) REMStandardBeanProxyConstants.getConstants(fRegistry).getClassGetDeclaredField().invokeCatchThrowableExceptions(this,
- fRegistry.getBeanProxyFactory().createBeanProxyWith(fieldName));
- }
-
- /*
- * (non-Javadoc)
- *
- * @see org.eclipse.jem.internal.proxy.core.IBeanTypeProxy#getFieldProxy(java.lang.String)
- */
- public IFieldProxy getFieldProxy(String fieldName) {
- return ((REMStandardBeanTypeProxyFactory) fRegistry.getBeanTypeProxyFactory()).proxyConstants.getFieldProxy(this,fieldName);
- }
-
-
- /* (non-Javadoc)
- * @see org.eclipse.jem.internal.proxy.core.IProxyBeanType#getFieldProxy(org.eclipse.jem.internal.proxy.core.IExpression, java.lang.String)
- */
- public IProxyField getFieldProxy(IExpression expression, String fieldName) {
- REMProxyFactoryRegistry registry = (REMProxyFactoryRegistry) expression.getRegistry();
- return ((REMMethodProxyFactory) registry.getMethodProxyFactory()).getFieldProxy(expression, this, fieldName);
- }
-
- /* (non-Javadoc)
- * @see org.eclipse.jem.internal.proxy.core.IBeanTypeProxy#getConstructors()
- */
- public IMethodProxy[] getMethods() {
-
- IREMMethodProxy getMethodsMethod = (IREMMethodProxy) REMStandardBeanProxyConstants.getConstants(fRegistry).getClassMethods();
-
- try {
- IArrayBeanProxy methods = (IArrayBeanProxy) getMethodsMethod.invokeWithParms(this, null);
- IBeanProxy[] proxies = methods.getSnapshot();
- IMethodProxy[] methodProxies = new IMethodProxy[proxies.length];
- System.arraycopy(proxies, 0, methodProxies, 0, proxies.length);
- return methodProxies;
- } catch (ThrowableProxy e) {
- fRegistry.releaseProxy(e);
- return null;
- }
- }
-
- /* (non-Javadoc)
- * @see org.eclipse.jem.internal.proxy.core.IBeanTypeProxy#getConstructors()
- */
- public IMethodProxy[] getDeclaredMethods() {
-
- IREMMethodProxy getDeclaredMethodsMethod = (IREMMethodProxy) REMStandardBeanProxyConstants.getConstants(fRegistry).getClassDeclaredMethods();
-
- try {
- IArrayBeanProxy methods = (IArrayBeanProxy) getDeclaredMethodsMethod.invokeWithParms(this, null);
- IBeanProxy[] proxies = methods.getSnapshot();
- IMethodProxy[] methodProxies = new IMethodProxy[proxies.length];
- System.arraycopy(proxies, 0, methodProxies, 0, proxies.length);
- return methodProxies;
- } catch (ThrowableProxy e) {
- fRegistry.releaseProxy(e);
- return null;
- }
- }
-
- /*
- * (non-Javadoc)
- *
- * @see org.eclipse.jem.internal.proxy.core.IBeanTypeProxy#getMethodProxy(java.lang.String)
- */
- public IMethodProxy getMethodProxy(String methodName) {
- return ((REMStandardBeanTypeProxyFactory) fRegistry.getBeanTypeProxyFactory()).proxyConstants.getMethodProxy(this,methodName,(String[])null);
- }
-
- /*
- * (non-Javadoc)
- *
- * @see org.eclipse.jem.internal.proxy.core.IBeanTypeProxy#getMethodProxy(java.lang.String, java.lang.String[])
- */
- public IMethodProxy getMethodProxy(String methodName, String[] argumentClassNames) {
- return ((REMStandardBeanTypeProxyFactory) fRegistry.getBeanTypeProxyFactory()).proxyConstants.getMethodProxy(this,methodName,argumentClassNames);
- }
-
-
- /* (non-Javadoc)
- * @see org.eclipse.jem.internal.proxy.core.IProxyBeanType#getMethodProxy(org.eclipse.jem.internal.proxy.core.IExpression, java.lang.String, org.eclipse.jem.internal.proxy.core.IProxyBeanType[])
- */
- public IProxyMethod getMethodProxy(IExpression expression, String methodName, IProxyBeanType[] parameterTypes) {
- REMProxyFactoryRegistry registry = (REMProxyFactoryRegistry) expression.getRegistry();
- return ((REMMethodProxyFactory) registry.getMethodProxyFactory()).getMethodProxy(expression, this, methodName, parameterTypes);
- }
-
-
- /* (non-Javadoc)
- * @see org.eclipse.jem.internal.proxy.core.IProxyBeanType#getMethodProxy(org.eclipse.jem.internal.proxy.core.IExpression, java.lang.String, java.lang.String[])
- */
- public IProxyMethod getMethodProxy(IExpression expression, String methodName, String[] parameterTypes) {
- REMProxyFactoryRegistry registry = (REMProxyFactoryRegistry) expression.getRegistry();
- return ((REMMethodProxyFactory) registry.getMethodProxyFactory()).getMethodProxy(expression, this, methodName, parameterTypes);
- }
-
- public IProxyMethod getMethodProxy(IExpression expression, String methodName) {
- return getMethodProxy(expression, methodName, (IProxyBeanType[]) null);
- }
- /*
- * (non-Javadoc)
- *
- * @see org.eclipse.jem.internal.proxy.core.IBeanTypeProxy#getMethodProxy(java.lang.String, java.lang.String)
- */
- public IMethodProxy getMethodProxy(String methodName, String argumentQualifiedTypeName) {
- return ((REMStandardBeanTypeProxyFactory) fRegistry.getBeanTypeProxyFactory()).proxyConstants.getMethodProxy(this,methodName,new String[] {argumentQualifiedTypeName});
- }
-
- /*
- * (non-Javadoc)
- *
- * @see org.eclipse.jem.internal.proxy.core.IBeanTypeProxy#getMethodProxy(java.lang.String, org.eclipse.jem.internal.proxy.core.IBeanTypeProxy[])
- */
- public IMethodProxy getMethodProxy(String methodName, IBeanTypeProxy[] argumentTypes) {
- return ((REMStandardBeanTypeProxyFactory) fRegistry.getBeanTypeProxyFactory()).proxyConstants.getMethodProxy(this,methodName,argumentTypes);
- }
-
- /*
- * (non-Javadoc)
- *
- * @see org.eclipse.jem.internal.proxy.core.IBeanTypeProxy#getConstructorProxy(java.lang.String[])
- */
- public IMethodProxy getDeclaredMethodProxy(String methodName, String[] argumentClassNames) {
-
- // Turn class names into array of BeanTypes.
- IBeanTypeProxy[] argTypes = null;
- if (argumentClassNames != null) {
- IStandardBeanTypeProxyFactory typeFactory = fRegistry.getBeanTypeProxyFactory();
- argTypes = new IBeanTypeProxy[argumentClassNames.length];
- for (int i = 0; i < argumentClassNames.length; i++) {
- IBeanTypeProxy type = argTypes[i] = typeFactory.getBeanTypeProxy(argumentClassNames[i]);
- if (type == null)
- return null; // Couldn't find the type.
- }
- }
-
- return getDeclaredMethodProxy(methodName, argTypes);
- }
-
- /*
- * (non-Javadoc)
- *
- * @see org.eclipse.jem.internal.proxy.core.IBeanTypeProxy#getConstructorProxy(org.eclipse.jem.internal.proxy.core.IBeanTypeProxy[])
- */
- public IMethodProxy getDeclaredMethodProxy(String methodName, IBeanTypeProxy[] argumentTypes) {
- IREMMethodProxy getDeclaredMethodMethod = (IREMMethodProxy) REMStandardBeanProxyConstants.getConstants(fRegistry).getClassDeclaredMethod();
- IBeanProxy nameProxy = fRegistry.getBeanProxyFactory().createBeanProxyWith(methodName);
- // Create the argument array
- Object[] getParms = (argumentTypes != null) ? new Object[] { nameProxy, new TransmitableArray(Commands.CLASS_CLASS, argumentTypes)} : new Object[] {nameProxy, null};
-
- try {
- return (IMethodProxy) getDeclaredMethodMethod.invokeWithParms(this, getParms);
- } catch (ThrowableProxy e) {
- fRegistry.releaseProxy(e);
- return null;
- }
- }
-
- /*
- * (non-Javadoc)
- *
- * @see org.eclipse.jem.internal.proxy.core.IBeanTypeProxy#getInvokable(java.lang.String)
- */
- public IInvokable getInvokable(String methodName) {
- return ((REMStandardBeanTypeProxyFactory) fRegistry.getBeanTypeProxyFactory()).proxyConstants.getInvokable(this,methodName,(String[])null);
- }
-
- /*
- * (non-Javadoc)
- *
- * @see org.eclipse.jem.internal.proxy.core.IBeanTypeProxy#getInvokable(java.lang.String, java.lang.String[])
- */
- public IInvokable getInvokable(String methodName, String[] argumentClassNames) {
- return ((REMStandardBeanTypeProxyFactory) fRegistry.getBeanTypeProxyFactory()).proxyConstants.getInvokable(this,methodName,argumentClassNames);
- }
-
- /*
- * (non-Javadoc)
- *
- * @see org.eclipse.jem.internal.proxy.core.IBeanTypeProxy#getInvokable(java.lang.String, java.lang.String)
- */
- public IInvokable getInvokable(String methodName, String argumentQualifiedTypeName) {
- return getInvokable(methodName, new String[] { argumentQualifiedTypeName});
- }
-
- /*
- * (non-Javadoc)
- *
- * @see org.eclipse.jem.internal.proxy.core.IBeanTypeProxy#getInvokable(java.lang.String, org.eclipse.jem.internal.proxy.core.IBeanTypeProxy[])
- */
- public IInvokable getInvokable(String methodName, IBeanTypeProxy[] argumentTypes) {
- return ((REMStandardBeanTypeProxyFactory) fRegistry.getBeanTypeProxyFactory()).proxyConstants.getInvokable(this,methodName,argumentTypes);
- }
-
- /*
- * (non-Javadoc)
- *
- * @see org.eclipse.jem.internal.proxy.core.IBeanTypeProxy#getNullConstructorProxy()
- */
- public IConstructorProxy getNullConstructorProxy() {
- return getConstructorProxy((IBeanTypeProxy[]) null);
- }
-
- /*
- * (non-Javadoc)
- *
- * @see org.eclipse.jem.internal.proxy.core.IBeanProxy#getProxyFactoryRegistry()
- */
- public ProxyFactoryRegistry getProxyFactoryRegistry() {
- return fRegistry;
- }
-
- /*
- * (non-Javadoc)
- *
- * @see org.eclipse.jem.internal.proxy.core.IBeanTypeProxy#getSuperBeanTypeProxy()
- */
- public IBeanTypeProxy getSuperBeanTypeProxy() {
- return fSuperType;
- }
-
- /*
- * (non-Javadoc)
- *
- * @see org.eclipse.jem.internal.proxy.core.IBeanTypeProxy#getTypeName()
- */
- public String getTypeName() {
- return fClassname;
- }
-
- /*
- * (non-Javadoc)
- *
- * @see org.eclipse.jem.internal.proxy.core.IBeanTypeProxy#isArray()
- */
- public boolean isArray() {
- return false;
- }
-
- /*
- * (non-Javadoc)
- *
- * @see org.eclipse.jem.internal.proxy.core.IBeanTypeProxy#isInterface()
- */
- public boolean isInterface() {
- return false;
- }
-
- /*
- * (non-Javadoc)
- *
- * @see org.eclipse.jem.internal.proxy.core.IBeanTypeProxy#isPrimitive()
- */
- public boolean isPrimitive() {
- return false;
- }
-
- /*
- * (non-Javadoc)
- *
- * @see org.eclipse.jem.internal.proxy.core.IBeanTypeProxy#isKindOf(org.eclipse.jem.internal.proxy.core.IBeanTypeProxy)
- */
- public boolean isKindOf(IBeanTypeProxy aBeanProxyType) {
- return ((IBooleanBeanProxy) REMStandardBeanProxyConstants.getConstants(fRegistry).getClassIsAssignableFrom().invokeCatchThrowableExceptions(
- aBeanProxyType, this)).booleanValue();
- }
-
- /*
- * (non-Javadoc)
- *
- * @see org.eclipse.jem.internal.proxy.core.IBeanTypeProxy#newInstance(java.lang.String)
- */
- public IBeanProxy newInstance(String initializationString) throws ThrowableProxy, ClassCastException, InstantiationException {
- try {
- return ((REMStandardBeanProxyFactory) fRegistry.getBeanProxyFactory()).createBeanProxy(this, initializationString);
- } catch (CommandException e) {
- ProxyPlugin.getPlugin().getLogger().log(new Status(IStatus.WARNING, ProxyPlugin.getPlugin().getBundle().getSymbolicName(), 0, "", e)); //$NON-NLS-1$
- return null;
- }
- }
-
- /*
- * (non-Javadoc)
- *
- * @see java.lang.Object#toString()
- */
- public String toString() {
- return super.toString() + "(" + getTypeName() + ")"; //$NON-NLS-2$//$NON-NLS-1$
- }
-
- /*
- * (non-Javadoc)
- *
- * @see org.eclipse.jem.internal.proxy.core.IBeanProxy#getTypeProxy()
- */
- public IBeanTypeProxy getTypeProxy() {
- return ((REMStandardBeanTypeProxyFactory) fRegistry.getBeanTypeProxyFactory()).classClass;
- }
-
- /*
- * (non-Javadoc)
- *
- * @see org.eclipse.jem.internal.proxy.core.IBeanProxy#toBeanString()
- */
- public String toBeanString() {
- return getTypeName();
- }
-
- /*
- * (non-Javadoc)
- *
- * @see org.eclipse.jem.internal.proxy.core.IBeanTypeProxy#newInstance()
- */
- public IBeanProxy newInstance() throws ThrowableProxy {
- return ((REMStandardBeanProxyFactory) fRegistry.getBeanProxyFactory()).createBeanProxy(this);
- }
-
- /*
- * (non-Javadoc)
- *
- * @see org.eclipse.jem.internal.proxy.remote.IREMBeanProxy#renderBean(org.eclipse.jem.internal.proxy.common.remote.Commands.ValueObject)
- */
- public void renderBean(Commands.ValueObject value) {
- value.setObjectID(getID().intValue());
- }
-
- /*
- * (non-Javadoc)
- *
- * @see org.eclipse.jem.internal.proxy.core.IBeanTypeProxy#getFormalTypeName()
- */
- public String getFormalTypeName() {
- return getTypeName();
- }
-
- /*
- * (non-Javadoc)
- *
- * @see org.eclipse.jem.internal.proxy.core.IBeanTypeProxy#getInitializationError()
- */
- public String getInitializationError() {
- return null; // By default none have an initialization error. There is a special instance for init errors.
- }
-
- /* (non-Javadoc)
- * @see org.eclipse.jem.internal.proxy.core.IBeanTypeProxy#getCompatibleConstructor(org.eclipse.jem.internal.proxy.core.IBeanTypeProxy[])
- */
- public IConstructorProxy getCompatibleConstructor(IBeanTypeProxy[] argumentTypes) throws NoSuchMethodException, AmbiguousMethodException, IllegalAccessException {
- if (isInterface())
- return null; // Interfaces don't have ctor's.
-
- IREMMethodProxy findCompatibleMethod = (IREMMethodProxy) REMStandardBeanProxyConstants.getConstants(fRegistry).getFindCompatibleConstructorMethod();
-
- // Create the argument array
- Object[] getParms = (argumentTypes != null) ? new Object[] { this, new TransmitableArray(Commands.CLASS_CLASS, argumentTypes)} : new Object[] {this, null};
-
- try {
- return (IConstructorProxy) findCompatibleMethod.invokeWithParms(this, getParms);
- } catch (ThrowableProxy e) {
- try {
- if (e.getTypeProxy().equals(fRegistry.getBeanTypeProxyFactory().getBeanTypeProxy("java.lang.NoSuchMethodException"))) //$NON-NLS-1$
- throw new NoSuchMethodException(e.getProxyLocalizedMessage());
- else if (e.getTypeProxy().equals(fRegistry.getBeanTypeProxyFactory().getBeanTypeProxy("org.eclipse.jem.internal.proxy.common.AmbiguousMethodException"))) //$NON-NLS-1$
- throw new AmbiguousMethodException(e.getProxyLocalizedMessage());
- else if (e.getTypeProxy().equals(fRegistry.getBeanTypeProxyFactory().getBeanTypeProxy("java.lang.IllegalAccessException"))) //$NON-NLS-1$
- throw new IllegalAccessException(e.getProxyLocalizedMessage());
- ProxyPlugin.getPlugin().getLogger().log(e);
- return null;
- } finally {
- fRegistry.releaseProxy(e);
- }
- }
- }
- /* (non-Javadoc)
- * @see org.eclipse.jem.internal.proxy.core.IBeanTypeProxy#getCompatibleMethod(java.lang.String, org.eclipse.jem.internal.proxy.core.IBeanTypeProxy[])
- */
- public IMethodProxy getCompatibleMethod(String methodName, IBeanTypeProxy[] argumentTypes) throws NoSuchMethodException, AmbiguousMethodException {
-
- IREMMethodProxy findCompatibleMethod = (IREMMethodProxy) REMStandardBeanProxyConstants.getConstants(fRegistry).getFindCompatibleMethodMethod();
- IBeanProxy methodNameProxy = fRegistry.getBeanProxyFactory().createBeanProxyWith(methodName);
-
- // Create the argument array
- Object[] getParms = (argumentTypes != null) ? new Object[] { this, methodNameProxy, new TransmitableArray(Commands.CLASS_CLASS, argumentTypes)} : new Object[] {this, methodNameProxy, null};
-
- try {
- return (IMethodProxy) findCompatibleMethod.invokeWithParms(this, getParms);
- } catch (ThrowableProxy e) {
- try {
- if (e.getTypeProxy().equals(fRegistry.getBeanTypeProxyFactory().getBeanTypeProxy("java.lang.NoSuchMethodException"))) //$NON-NLS-1$
- throw new NoSuchMethodException(e.getProxyLocalizedMessage());
- else if (e.getTypeProxy().equals(fRegistry.getBeanTypeProxyFactory().getBeanTypeProxy("org.eclipse.jem.internal.proxy.common.AmbiguousMethodException"))) //$NON-NLS-1$
- throw new AmbiguousMethodException(e.getProxyLocalizedMessage());
- ProxyPlugin.getPlugin().getLogger().log(e);
- return null;
- } finally {
- fRegistry.releaseProxy(e);
- }
- }
- }
- /* (non-Javadoc)
- * @see org.eclipse.jem.internal.proxy.core.IProxy#isBeanProxy()
- */
- public final boolean isBeanProxy() {
- return true;
- }
- /* (non-Javadoc)
- * @see org.eclipse.jem.internal.proxy.core.IProxy#isExpressionProxy()
- */
- public final boolean isExpressionProxy() {
- return false;
- }
-}
diff --git a/plugins/org.eclipse.jem.proxy/proxyRemote/org/eclipse/jem/internal/proxy/remote/REMAbstractNumberBeanTypeProxy.java b/plugins/org.eclipse.jem.proxy/proxyRemote/org/eclipse/jem/internal/proxy/remote/REMAbstractNumberBeanTypeProxy.java
deleted file mode 100644
index 73a318b..0000000
--- a/plugins/org.eclipse.jem.proxy/proxyRemote/org/eclipse/jem/internal/proxy/remote/REMAbstractNumberBeanTypeProxy.java
+++ /dev/null
@@ -1,72 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2001, 2005 IBM Corporation and others.
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
- *
- * Contributors:
- * IBM Corporation - initial API and implementation
- *******************************************************************************/
-package org.eclipse.jem.internal.proxy.remote;
-/*
-
-
- */
-
-
-import org.eclipse.jem.internal.proxy.core.*;
-
-/**
- * Abstract class for any of the number bean type subclasses.
- * NOTE: This does not represent the beantype Number. It is a
- * class that provides functions for Number subclass beantypes.
- * The Number beantype itself is simply a REMBeanTypeProxy since
- * Number is abstract and has no necessary extra function.
- * Creation date: (08/31/00 11:49:12 AM)
- * @author: Administrator
- */
-public abstract class REMAbstractNumberBeanTypeProxy extends REMAbstractBeanTypeProxy implements IREMConstantBeanTypeProxy {
-
-protected REMAbstractNumberBeanTypeProxy(REMProxyFactoryRegistry aRegistry, Integer anID, String aClassname, IBeanTypeProxy aSuperType) {
- super(aRegistry, anID, aClassname, aSuperType);
-}
-/**
- * Helper to create a bean proxy
- * protected because everyone should go through the factory API
- * that is defined as part of IBeanProxyFactory
- */
-protected abstract INumberBeanProxy createNumberBeanProxy(Number aNumber);
-
-/**
- * Create a new bean proxy with the specified id.
- *
- * For all of the Number types, this is an invalid operation. They are created
- * explicitly through the appropriate create method.
- */
-public IREMBeanProxy newBeanProxy(Integer anID) {
- throw new UnsupportedOperationException();
-}
-
-/**
- * newBeanTypeForClass: Create a new beantypeproxy of this kind for the given class.
- * This is used by beantype proxy factory when creating a beantype proxy for a subclass.
- * This is because subclasses, unless explicitly overridden, should use the same kind
- * of beantype proxy. This way if anything special is needed for a specific type, then
- * that can be done.
- *
- * For all of the Number types, they are final classes, so you can't create a newBeanType
- * for subclasses.
- */
-public IREMBeanTypeProxy newBeanTypeForClass(Integer anID, String aClassname, boolean anAbstract) {
- throw new UnsupportedOperationException();
-}
-
-/**
- * newInstance method. Number's don't have a default ctor, so the standard way won't work.
- * Each beantype will return a default value (usually a value of 0).
- */
-public abstract IBeanProxy newInstance() throws ThrowableProxy;
-}
-
-
diff --git a/plugins/org.eclipse.jem.proxy/proxyRemote/org/eclipse/jem/internal/proxy/remote/REMAccessibleObjectProxy.java b/plugins/org.eclipse.jem.proxy/proxyRemote/org/eclipse/jem/internal/proxy/remote/REMAccessibleObjectProxy.java
deleted file mode 100644
index 8c2eb00..0000000
--- a/plugins/org.eclipse.jem.proxy/proxyRemote/org/eclipse/jem/internal/proxy/remote/REMAccessibleObjectProxy.java
+++ /dev/null
@@ -1,53 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2004, 2005 IBM Corporation and others.
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
- *
- * Contributors:
- * IBM Corporation - initial API and implementation
- *******************************************************************************/
-/*
-
-
- */
-package org.eclipse.jem.internal.proxy.remote;
-
-import org.eclipse.jem.internal.proxy.core.*;
-import org.eclipse.jem.internal.proxy.core.IAccessibleObjectProxy;
-import org.eclipse.jem.internal.proxy.core.ThrowableProxy;
-
-/**
- * AccessibleObject Proxy.
- *
- * @since 1.0.0
- */
-public class REMAccessibleObjectProxy extends REMAbstractBeanProxy implements IAccessibleObjectProxy {
-
- protected REMAccessibleObjectProxy(REMProxyFactoryRegistry aRegistry, Integer anID) {
- super(aRegistry, anID);
- }
-
- /* (non-Javadoc)
- * @see org.eclipse.jem.internal.proxy.core.IAccessibleObjectProxy#isAccessible()
- */
- public boolean isAccessible() throws ThrowableProxy {
- return ((IBooleanBeanProxy) REMStandardBeanProxyConstants.getConstants(fFactory).getAccessibleIsAccessible().invoke(this)).booleanValue();
- }
-
- /* (non-Javadoc)
- * @see org.eclipse.jem.internal.proxy.core.IAccessibleObjectProxy#setAccessible(boolean)
- */
- public void setAccessible(boolean flag) throws ThrowableProxy {
- REMStandardBeanProxyConstants.getConstants(fFactory).getAccessibleSetAccessible().invoke(this, fFactory.getBeanProxyFactory().createBeanProxyWith(flag));
- }
-
- /* (non-Javadoc)
- * @see org.eclipse.jem.internal.proxy.core.IBeanProxy#getTypeProxy()
- */
- public IBeanTypeProxy getTypeProxy() {
- return ((REMMethodProxyFactory) fFactory.getMethodProxyFactory()).accessibleType;
- }
-
-}
diff --git a/plugins/org.eclipse.jem.proxy/proxyRemote/org/eclipse/jem/internal/proxy/remote/REMAnAbstractBeanTypeProxy.java b/plugins/org.eclipse.jem.proxy/proxyRemote/org/eclipse/jem/internal/proxy/remote/REMAnAbstractBeanTypeProxy.java
deleted file mode 100644
index ce7fae1..0000000
--- a/plugins/org.eclipse.jem.proxy/proxyRemote/org/eclipse/jem/internal/proxy/remote/REMAnAbstractBeanTypeProxy.java
+++ /dev/null
@@ -1,75 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2001, 2005 IBM Corporation and others.
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
- *
- * Contributors:
- * IBM Corporation - initial API and implementation
- *******************************************************************************/
-package org.eclipse.jem.internal.proxy.remote;
-/*
-
-
- */
-
-
-import org.eclipse.jem.internal.proxy.core.*;
-
-/**
- * This is a proxy for an abstract bean type. I.e. you can't create a new instance of it.
- * It can be used as a general abstract type. It will pass newBeanTypeForClass unto
- * the main super type passed in.
- */
-
-public class REMAnAbstractBeanTypeProxy extends REMAbstractBeanTypeProxy {
-
- protected IREMSpecialBeanTypeProxy fMainSuperType; // The type that this was created from so that
- // any non-abstract subclasses can create the correct
- // type of beantype proxy.
-
- public REMAnAbstractBeanTypeProxy(REMProxyFactoryRegistry aRegistry, Integer anID, String aClassname, IBeanTypeProxy aSuperType, IREMSpecialBeanTypeProxy aType) {
- super(aRegistry, anID, aClassname, aSuperType);
- fMainSuperType = aType;
- }
-
- /**
- * Create a new bean proxy with the specified id.
- *
- * For all of the abstract types, this is an invalid operation.
- */
- public IREMBeanProxy newBeanProxy(Integer anID) {
- throw new UnsupportedOperationException();
- }
-
- /**
- * Note: Since new instances of abstract classes can never be done,
- * this function is not supported.
- */
- public IBeanProxy newInstance() {
- throw new UnsupportedOperationException();
- }
-
- /**
- * newBeanTypeForClass: Create a new beantypeproxy of this kind for the given class.
- * This is used by beantype proxy factory when creating a beantype proxy for a subclass.
- * This is because subclasses, unless explicitly overridden, should use the same kind
- * of beantype proxy. This way if anything special is needed for a specific type, then
- * that can be done.
- */
- public IREMBeanTypeProxy newBeanTypeForClass(Integer anID, String aClassname, boolean anAbstract) {
- return fMainSuperType.newBeanTypeForClass(anID, aClassname, anAbstract, this);
- }
-
- /**
- * release - BeanType is about to be released.
- * Clear the fMainSupertype (supertype is cleared so that
- * it won't hold onto it and will let the supertype be GC'd
- * if necessary.
- */
- public void release() {
- fMainSuperType = null;
- super.release();
- }
-}
diff --git a/plugins/org.eclipse.jem.proxy/proxyRemote/org/eclipse/jem/internal/proxy/remote/REMArrayBeanProxy.java b/plugins/org.eclipse.jem.proxy/proxyRemote/org/eclipse/jem/internal/proxy/remote/REMArrayBeanProxy.java
deleted file mode 100644
index 2041d8a..0000000
--- a/plugins/org.eclipse.jem.proxy/proxyRemote/org/eclipse/jem/internal/proxy/remote/REMArrayBeanProxy.java
+++ /dev/null
@@ -1,268 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2001, 2005 IBM Corporation and others.
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
- *
- * Contributors:
- * IBM Corporation - initial API and implementation
- *******************************************************************************/
-package org.eclipse.jem.internal.proxy.remote;
-/*
-
-
- */
-
-import java.lang.reflect.Array;
-import java.util.logging.Level;
-
-import org.eclipse.core.runtime.IStatus;
-import org.eclipse.core.runtime.Status;
-
-import org.eclipse.jem.internal.proxy.common.CommandException;
-import org.eclipse.jem.internal.proxy.common.remote.CommandErrorException;
-import org.eclipse.jem.internal.proxy.common.remote.Commands;
-import org.eclipse.jem.internal.proxy.common.remote.Commands.ValueObject;
-import org.eclipse.jem.internal.proxy.core.*;
-/**
- * IDE VM version of the Array proxy
- */
-
-public final class REMArrayBeanProxy extends REMBeanProxy implements IArrayBeanProxy {
- private int fLength = -1;
-
- REMArrayBeanProxy(REMProxyFactoryRegistry aRegistry, Integer anID, IBeanTypeProxy aType) {
- super(aRegistry, anID, aType);
- }
-
- public boolean equals(Object anObject) {
- if (!(anObject instanceof IArrayBeanProxy))
- return false;
- if (sameAs((IBeanProxy) anObject))
- return true; // Identity
- if (((IBeanProxy) anObject).getProxyFactoryRegistry() == fFactory)
- try {
- // The other is an array also, let the server do the check. We will use Arrays.equals.
- return ((IBooleanBeanProxy) REMStandardBeanProxyConstants.getConstants(fFactory).getArrayHelperEquals().invoke(null, new IBeanProxy[] {this, (IBeanProxy) anObject})).booleanValue();
- } catch (ThrowableProxy e) {
- ProxyPlugin.getPlugin().getLogger().log(e, Level.INFO);
- }
- return false;
- }
-
- /**
- * Get the object at the specified index.
- */
- public IBeanProxy get(int index) throws ThrowableProxy {
- // Format of getter parms is: (Object (array), int (index)).
- Object[] parms = new Object[] {this, new Integer(index)};
- // If the component type is primitive, we need to use the correct getter so that a valid value is returned,
- // if we just used the standard get, if the type was "int" the value returned would be an java.lang.Integer.
- IBeanTypeProxy compType = ((IArrayBeanTypeProxy) getTypeProxy()).getComponentType();
- if (!compType.isPrimitive()) {
- // Use standard getter.
- return ((IREMMethodProxy) REMStandardBeanProxyConstants.getConstants(fFactory).getArrayGet()).invokeWithParms(null, parms);
- } else {
- // Use the correct primitive getter.
- int id = ((IREMBeanProxy) compType).getID().intValue();
- switch (id) {
- case Commands.BYTE_TYPE:
- return ((IREMMethodProxy) REMStandardBeanProxyConstants.getConstants(fFactory).getArrayGetByte()).invokeWithParms(null, parms);
- case Commands.BOOLEAN_TYPE:
- return ((IREMMethodProxy) REMStandardBeanProxyConstants.getConstants(fFactory).getArrayGetBoolean()).invokeWithParms(null, parms);
- case Commands.CHARACTER_TYPE:
- return ((IREMMethodProxy) REMStandardBeanProxyConstants.getConstants(fFactory).getArrayGetChar()).invokeWithParms(null, parms);
- case Commands.DOUBLE_TYPE:
- return ((IREMMethodProxy) REMStandardBeanProxyConstants.getConstants(fFactory).getArrayGetDouble()).invokeWithParms(null, parms);
- case Commands.FLOAT_TYPE:
- return ((IREMMethodProxy) REMStandardBeanProxyConstants.getConstants(fFactory).getArrayGetFloat()).invokeWithParms(null, parms);
- case Commands.INTEGER_TYPE:
- return ((IREMMethodProxy) REMStandardBeanProxyConstants.getConstants(fFactory).getArrayGetInt()).invokeWithParms(null, parms);
- case Commands.LONG_TYPE:
- return ((IREMMethodProxy) REMStandardBeanProxyConstants.getConstants(fFactory).getArrayGetLong()).invokeWithParms(null, parms);
- case Commands.SHORT_TYPE:
- return ((IREMMethodProxy) REMStandardBeanProxyConstants.getConstants(fFactory).getArrayGetShort()).invokeWithParms(null, parms);
- }
- }
-
- return null;
- }
-
- /**
- * Get the object at the specified multi-dimensional index.
- * The array must be at least the number of dimensions specified,
- * and each index along the way must exist.
- * The number of dimensions can't be greater than the number
- * of dimensions of the real object.
- */
- public IBeanProxy get(int [] indexes) throws ThrowableProxy {
- // Format of getter parms is: (Object (array), int[] (indexes)).
- Object[] parms = new Object[] {this, indexes};
- // If the component type at the specified dimension is primitive, we need to use the correct getter so that a valid value is returned,
- // if we just used the standard get, if the type was "int" the value returned would be an java.lang.Integer.
- int dims = ((IArrayBeanTypeProxy) getTypeProxy()).getDimensions();
- if (dims < indexes.length)
- throw new IllegalArgumentException(); // Too many dimensions
- IBeanTypeProxy finalCompType = ((IArrayBeanTypeProxy) getTypeProxy()).getFinalComponentType();
- if (dims == indexes.length && finalCompType.isPrimitive()) {
- // Use the correct primitive getter because we are accessing the final component and it is primitive.
- int id = ((IREMBeanProxy) finalCompType).getID().intValue();
- switch (id) {
- case Commands.BYTE_TYPE:
- return ((IREMMethodProxy) REMStandardBeanProxyConstants.getConstants(fFactory).getArrayHelperGetByte()).invokeWithParms(null, parms);
- case Commands.BOOLEAN_TYPE:
- return ((IREMMethodProxy) REMStandardBeanProxyConstants.getConstants(fFactory).getArrayHelperGetBoolean()).invokeWithParms(null, parms);
- case Commands.CHARACTER_TYPE:
- return ((IREMMethodProxy) REMStandardBeanProxyConstants.getConstants(fFactory).getArrayHelperGetChar()).invokeWithParms(null, parms);
- case Commands.DOUBLE_TYPE:
- return ((IREMMethodProxy) REMStandardBeanProxyConstants.getConstants(fFactory).getArrayHelperGetDouble()).invokeWithParms(null, parms);
- case Commands.FLOAT_TYPE:
- return ((IREMMethodProxy) REMStandardBeanProxyConstants.getConstants(fFactory).getArrayHelperGetFloat()).invokeWithParms(null, parms);
- case Commands.INTEGER_TYPE:
- return ((IREMMethodProxy) REMStandardBeanProxyConstants.getConstants(fFactory).getArrayHelperGetInt()).invokeWithParms(null, parms);
- case Commands.LONG_TYPE:
- return ((IREMMethodProxy) REMStandardBeanProxyConstants.getConstants(fFactory).getArrayHelperGetLong()).invokeWithParms(null, parms);
- case Commands.SHORT_TYPE:
- return ((IREMMethodProxy) REMStandardBeanProxyConstants.getConstants(fFactory).getArrayHelperGetShort()).invokeWithParms(null, parms);
- }
- } else {
- // It is not the final component, or it is not primitive, use the standard accessor.
- return ((IREMMethodProxy) REMStandardBeanProxyConstants.getConstants(fFactory).getArrayHelperGet()).invokeWithParms(null, parms);
- }
-
- return null;
- }
-
- /**
- * Set the object at the specified index.
- */
- public void set(IBeanProxy value, int index) throws ThrowableProxy {
- // Format of setter parms is: (Object (array), int (index), Object (value)).
- Object[] parms = new Object[] {this, new Integer(index), value};
- ((IREMMethodProxy) REMStandardBeanProxyConstants.getConstants(fFactory).getArraySet()).invokeWithParms(null, parms);
- }
-
- /**
- * Set the object at the specified multi-dimensional index.
- * The array must be at least the number of dimensions specified,
- * and each index along the way must exist.
- * The number of dimensions can't be greater than the number
- * of dimensions of the real object.
- */
- public void set(IBeanProxy value, int [] indexes) throws ThrowableProxy {
- // Format of setter parms is: (Object (array), int[] (indexes), Object (value)).
- Object[] parms = new Object[] {this, indexes, value};
- ((IREMMethodProxy) REMStandardBeanProxyConstants.getConstants(fFactory).getArrayHelperSet()).invokeWithParms(null, parms);
- }
-
- /**
- * Get the length of the first dimension of this array.
- * If there are multi-dimensions, you must get the appropriate
- * dimension from the get method to see the size of that dimension.
- *
- * e.g.
- * int [3] returns 3
- * int [3][2] returns 3
- *
- * ((IArrayBeanProxy) get(1)).getLength() returns 2
- * Since arrays do not have to be homogenous, there could
- * be a different length array for each of the arrays
- * returned from the first dimension, the returned length
- * from get(2) and get(3) could result in a different value
- * from get(1).
- */
- public int getLength() {
- if (fLength == -1) {
- // It hasn't yet been quiered.
- fLength = ((IIntegerBeanProxy) REMStandardBeanProxyConstants.getConstants(fFactory).getArrayGetLength().invokeCatchThrowableExceptions(null, this)).intValue();
- }
- return fLength;
- }
-
- public IBeanProxy getCatchThrowableException(int index){
- try {
- return get(index);
- } catch (ThrowableProxy e) {
- ProxyPlugin.getPlugin().getLogger().log(new Status(IStatus.WARNING, ProxyPlugin.getPlugin().getBundle().getSymbolicName(), 0, "", e)); //$NON-NLS-1$
- fFactory.releaseProxy(e); // Since it's no longer needed, get rid of now instead of GC time.
- return null;
- }
- }
-
-
- /* (non-Javadoc)
- * @see org.eclipse.jem.internal.proxy.core.IArrayBeanProxy#getSnapshot()
- */
- public IBeanProxy[] getSnapshot() throws ThrowableProxy {
- IREMConnection connect = fFactory.getFreeConnection();
- REMStandardBeanProxyFactory proxyFactory = (REMStandardBeanProxyFactory) fFactory.getBeanProxyFactory();
- proxyFactory.startTransaction(); // This is definately a transaction, so start it.
- try {
- Commands.ValueObject returnValue = new Commands.ValueObject();
- try {
- try {
- connect.getArrayContents(getID().intValue(), returnValue);
- return processReturnValue(connect, returnValue);
- } catch (CommandErrorException e) {
- proxyFactory.processErrorReturn(e);
- }
- } catch (CommandException e) {
- if (!e.isRecoverable()) {
- // Close the connection and try again.
- fFactory.closeConnection(connect);
- connect = null;
- connect = fFactory.getFreeConnection();
- try {
- connect.getArrayContents(getID().intValue(), returnValue);
- return processReturnValue(connect, returnValue);
- } catch (CommandException eAgain) {
- // Failed again. Just close and print trace.
- fFactory.closeConnection(connect);
- connect = null;
- ProxyPlugin.getPlugin().getLogger().log(new Status(IStatus.WARNING, ProxyPlugin.getPlugin().getBundle().getSymbolicName(), 0, "", eAgain)); //$NON-NLS-1$
- return null;
- }
- } else {
- // A recoverable error, print trace and return
- ProxyPlugin.getPlugin().getLogger().log(new Status(IStatus.WARNING, ProxyPlugin.getPlugin().getBundle().getSymbolicName(), 0, "", e)); //$NON-NLS-1$
- return null;
- }
- }
- } finally {
- proxyFactory.stopTransaction();
- if (connect != null)
- fFactory.returnConnection(connect);
- }
- return null;
- }
-
-
- /*
- * @param returnValue
- * @return
- *
- * @since 1.1.0
- */
- private IBeanProxy[] processReturnValue(IREMConnection connection, ValueObject returnValue) throws CommandException, ThrowableProxy {
- // It is an array containing IDs, as it normally would be.
- // However it will become IBeanProxy[]. That is because if ID's
- // they must be proxies over here.
- BeanProxyValueSender valueSender = new BeanProxyValueSender((REMStandardBeanProxyFactory) fFactory.getBeanProxyFactory(), returnValue);
- connection.readProxyArrayValues(returnValue, valueSender, false);
- Exception e = valueSender.getException();
- if (e != null) {
- if (e instanceof ThrowableProxy)
- throw (ThrowableProxy) e;
- else
- throw (CommandException) e;
- }
- Object vals = valueSender.getArray();
- IBeanProxy[] proxyArray = new IBeanProxy[Array.getLength(vals)];
- System.arraycopy(vals, 0, proxyArray, 0, proxyArray.length);
- return proxyArray;
- }
-
-}
-
-
diff --git a/plugins/org.eclipse.jem.proxy/proxyRemote/org/eclipse/jem/internal/proxy/remote/REMArrayBeanTypeProxy.java b/plugins/org.eclipse.jem.proxy/proxyRemote/org/eclipse/jem/internal/proxy/remote/REMArrayBeanTypeProxy.java
deleted file mode 100644
index ca4f3a9..0000000
--- a/plugins/org.eclipse.jem.proxy/proxyRemote/org/eclipse/jem/internal/proxy/remote/REMArrayBeanTypeProxy.java
+++ /dev/null
@@ -1,340 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2001, 2005 IBM Corporation and others.
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
- *
- * Contributors:
- * IBM Corporation - initial API and implementation
- *******************************************************************************/
-package org.eclipse.jem.internal.proxy.remote;
-/*
-
-
- */
-
-
-
-import org.eclipse.jem.internal.proxy.common.MapTypes;
-import org.eclipse.jem.internal.proxy.core.*;
-/**
- * Array Type Proxy for the IDE VM.
- *
- * The class is final because array's are special and shouldn't have
- * any subclasses since the factory would never call it.
- */
-
-public final class REMArrayBeanTypeProxy extends REMAbstractBeanTypeProxy implements IArrayBeanTypeProxy {
-
- /**
- * Create with a registry and a class. It is package so that only
- * the factory with this IDE package can call it.
- */
- protected REMArrayBeanTypeProxy(REMProxyFactoryRegistry aRegistry, Integer anID, String aClassname, IBeanTypeProxy objectType) {
- super(aRegistry, anID, aClassname, objectType);
- }
- /**
- * This is an array type!
- */
- public boolean isArray() {
- return true;
- }
- /**
- * Return the final component type.
- */
- public IBeanTypeProxy getFinalComponentType() {
- // Component type is strip off all '[' and return class name (if we ever add classLoader support, this won't work).
- // However, if the type is a primitive we need to go through the change table).
- int typeStart = getTypeName().lastIndexOf('[')+1;
- if (getTypeName().charAt(typeStart) == 'L') {
- // It is a class.
- // Strip off up to the 'L', and the trailing ';'. That is the class name.
- return fRegistry.getBeanTypeProxyFactory().getBeanTypeProxy(getTypeName().substring(typeStart+1, getTypeName().length()-1));
- } else {
- // It is a type. Need to map it.
- Class aType = (Class) MapTypes.MAP_SHORTSIG_TO_TYPE.get(getTypeName().substring(typeStart, typeStart+1));
- return aType != null ? fRegistry.getBeanTypeProxyFactory().getBeanTypeProxy(aType.getName()) : null;
- }
- }
-
- /**
- * Return the component type.
- */
- public IBeanTypeProxy getComponentType() {
- // Component type is strip off first '[' and return class name (if we ever add classLoader support, this won't work).
- // However, if the type is a primitive we need to go through the change table).
- if (getTypeName().charAt(1) != '[') {
- // It is a one dimensional array, just send to getFinalComponentType to figure out the type.
- return getFinalComponentType();
- } else {
- // It is a multi-dimensional array. Just strip off one '[' and send that to the bean type factory.
- return fRegistry.getBeanTypeProxyFactory().getBeanTypeProxy(getTypeName().substring(1));
- }
- }
- /**
- * Return the number of dimensions.
- */
- public int getDimensions() {
- return getTypeName().lastIndexOf('[')+1;
- }
-
- /**
- * Create a new bean proxy with the specified object
- * Use the constructor that allows the type proxy to be set as well as the bean
- * because we are the type and by setting it now we might avoid it being lookup for in the
- * factory the first time it is asked for.
- */
- public IREMBeanProxy newBeanProxy(Integer anID) {
- return new REMArrayBeanProxy(fRegistry, anID, this);
- }
-
-
- /**
- * newBeanTypeForClass: Create a new beantypeproxy of this kind for the given class.
- * This is used by beantype proxy factory when creating a beantype proxy for a subclass.
- * This is because subclasses, unless explicitly overridden, should use the same kind
- * of beantype proxy. This way if anything special is needed for a specific type, then
- * that can be done.
- *
- * Arrays can't be subclassed.
- */
- public IREMBeanTypeProxy newBeanTypeForClass(Integer anID, String aClassname, boolean anAbstract) {
- throw new UnsupportedOperationException();
- }
-
- /**
- * Return the null ctor proxy for this method with these arguments.
- * For all of the array types, this is an invalid operation.
- */
- public IConstructorProxy getNullConstructorProxy() {
- throw new UnsupportedOperationException();
- }
-
- /**
- * Return a proxy to the constructor for the target VM being the same as the REM
- * For all of the array types, this is an invalid operation.
- */
- public IConstructorProxy getConstructorProxy(String[] argumentClassNames) {
- throw new UnsupportedOperationException();
- }
-
- /**
- * Return a proxy to the constructor for the target VM being the same as the REM
- * For all of the array types, this is an invalid operation.
- */
- public IConstructorProxy getConstructorProxy(IBeanTypeProxy[] argumentTypes) {
- throw new UnsupportedOperationException();
- }
-
- /* (non-Javadoc)
- * @see org.eclipse.jem.internal.proxy.core.IBeanTypeProxy#getConstructors()
- *
- * For all of the array types, this is an invalid operation.
- */
- public IConstructorProxy[] getConstructors() {
- throw new UnsupportedOperationException();
- }
-
- /* (non-Javadoc)
- * @see org.eclipse.jem.internal.proxy.core.IBeanTypeProxy#getConstructors()
- *
- * For all of the array types, this is an invalid operation.
- */
- public IConstructorProxy[] getDeclaredConstructors() {
- throw new UnsupportedOperationException();
- }
-
- /**
- * Return a proxy to the constructor for the target VM being the same as the REM
- * For all of the array types, this is an invalid operation.
- */
- public IConstructorProxy getDeclaredConstructorProxy(String[] argumentClassNames) {
- throw new UnsupportedOperationException();
- }
-
- /**
- * Return a proxy to the constructor for the target VM being the same as the REM
- * For all of the array types, this is an invalid operation.
- */
- public IConstructorProxy getDeclaredConstructorProxy(IBeanTypeProxy[] argumentTypes) {
- throw new UnsupportedOperationException();
- }
-
- /**
- * Return a proxy to the field for the target VM being the same as the REM
- * For all of the array types, this is an invalid operation.
- */
- public IFieldProxy getFieldProxy(String fieldName) {
- throw new UnsupportedOperationException();
- }
-
- /* (non-Javadoc)
- * @see org.eclipse.jem.internal.proxy.core.IBeanTypeProxy#getConstructors()
- *
- * For all of the array types, this is an invalid operation.
- */
- public IFieldProxy[] getFields() {
- throw new UnsupportedOperationException();
- }
-
- /* (non-Javadoc)
- * @see org.eclipse.jem.internal.proxy.core.IBeanTypeProxy#getConstructors()
- *
- * For all of the array types, this is an invalid operation.
- */
- public IFieldProxy[] getDeclaredFields() {
- throw new UnsupportedOperationException();
- }
-
- /* (non-Javadoc)
- * @see org.eclipse.jem.internal.proxy.core.IBeanTypeProxy#getConstructors()
- *
- * For all of the array types, this is an invalid operation.
- */
- public IMethodProxy[] getMethods() {
- throw new UnsupportedOperationException();
- }
-
- /* (non-Javadoc)
- * @see org.eclipse.jem.internal.proxy.core.IBeanTypeProxy#getConstructors()
- *
- * For all of the array types, this is an invalid operation.
- */
- public IMethodProxy[] getDeclaredMethods() {
- throw new UnsupportedOperationException();
- }
-
-
- /**
- * Return the method proxy for this method with these arguments.
- * For all of the array types, this is an invalid operation.
- */
- public IMethodProxy getMethodProxy(String methodName, IBeanTypeProxy[] argumentTypes) {
- throw new UnsupportedOperationException();
- }
-
- /**
- * Return the method proxy for this method with these arguments.
- * For all of the array types, this is an invalid operation.
- */
- public IMethodProxy getMethodProxy(String methodName, String[] argumentClassNames) {
- throw new UnsupportedOperationException();
- }
-
- /**
- * Return the method proxy for this method with these arguments.
- * For all of the array types, this is an invalid operation.
- */
- public IMethodProxy getDeclaredMethodProxy(String methodName, IBeanTypeProxy[] argumentTypes) {
- throw new UnsupportedOperationException();
- }
-
- /**
- * Return the method proxy for this method with these arguments.
- * For all of the array types, this is an invalid operation.
- */
- public IMethodProxy getDeclaredMethodProxy(String methodName, String[] argumentClassNames) {
- throw new UnsupportedOperationException();
- }
-
- /**
- * Return the method proxy for this method with these arguments.
- * For all of the array types, this is an invalid operation.
- */
- public IMethodProxy getMethodProxy(String methodName, String argumentQualifiedTypeName) {
- throw new UnsupportedOperationException();
- }
-
- /**
- * Return the method proxy for this method with these arguments.
- * For all of the array types, this is an invalid operation.
- */
- public IMethodProxy getMethodProxy(String methodName) {
- throw new UnsupportedOperationException();
- }
-
- /**
- * Create an array bean proxy.
- *
- * - (int, new int[2] {3, 4}) will create:
- * int [3] [4]
- *
- * - (int[], new int[1] {1})
- * int [1]
- *
- * - (int[], new int[2] {2,3})
- * int [2] [3]
- *
- *
- * - (int[], null) or (int[], new int[0]) or (int, null) or (int, new int[0])
- * int [0]
- * (int[][], null) or (int[][], new int[0])
- * int[0][]
- * This is because an array instance with no dimensions specified is not valid.
- *
- * - (int[][], new int[1] {3})
- * int[3][]
- *
- * It is package protected so that only the REM Factory can call it.
- */
- REMArrayBeanProxy createBeanProxyWith(int[] dimensions) throws ThrowableProxy {
- // If the dimensions is null or zero length, then create the
- // array as a 0 sized array one dimensional array.
- if (dimensions == null || dimensions.length == 0)
- return createBeanProxyWith(new int[] {0});
-
- // Remove from this type the number of dimensions specified
- // coming in, up to but no further than the final component.
- // From here we can then use the appropriate java.lang.reflect.Array
- // method to create the array.
- IBeanTypeProxy compType = null; // The type of array to create (it may be different number of dimensions).
- int numDims = getDimensions();
- if (numDims <= dimensions.length)
- compType = getFinalComponentType(); // There are the same or more requested dimensions, so use final component type
- else {
- // There are fewer requested dimensions, so strip off that many
- String compClass = getTypeName().substring(dimensions.length);
- compType = fRegistry.getBeanTypeProxyFactory().getBeanTypeProxy(compClass);
- }
-
- if (dimensions.length == 1) {
- // Use the one dimension call
- Object[] parms = new Object[] {compType, new Integer(dimensions[0])};
- return (REMArrayBeanProxy) ((IREMMethodProxy) REMStandardBeanProxyConstants.getConstants(fRegistry).getArrayNewInstanceOneDimension()).invokeWithParms(null, parms);
- } else {
- // Use the multi dimension call
- Object[] parms = new Object[] {compType, dimensions};
- return (REMArrayBeanProxy) ((IREMMethodProxy) REMStandardBeanProxyConstants.getConstants(fRegistry).getArrayNewInstanceMultiDimension()).invokeWithParms(null, parms);
- }
- }
-
- /**
- * @see IBeanTypeProxy#getFormalTypeName()
- */
- public String getFormalTypeName() {
- String name = getTypeName();
- int dims = name.lastIndexOf('[') + 1;
- String type = getFinalComponentType().getTypeName();
- StringBuffer formalType = new StringBuffer(type.length()+("[]".length()*dims)); //$NON-NLS-1$
- formalType.append(type);
- for (int i=0; i<dims; i++)
- formalType.append("[]"); //$NON-NLS-1$
- return formalType.toString();
- }
-
- /* (non-Javadoc)
- * @see org.eclipse.jem.internal.proxy.core.IBeanTypeProxy#getCompatibleConstructor(org.eclipse.jem.internal.proxy.core.IBeanTypeProxy[])
- */
- public IConstructorProxy getCompatibleConstructor(IBeanTypeProxy[] argumentTypes) {
- throw new UnsupportedOperationException();
- }
- /* (non-Javadoc)
- * @see org.eclipse.jem.internal.proxy.core.IBeanTypeProxy#getCompatibleMethod(java.lang.String, org.eclipse.jem.internal.proxy.core.IBeanTypeProxy[])
- */
- public IMethodProxy getCompatibleMethod(String methodName, IBeanTypeProxy[] argumentTypes) {
- throw new UnsupportedOperationException();
- }
-}
-
-
diff --git a/plugins/org.eclipse.jem.proxy/proxyRemote/org/eclipse/jem/internal/proxy/remote/REMBeanProxy.java b/plugins/org.eclipse.jem.proxy/proxyRemote/org/eclipse/jem/internal/proxy/remote/REMBeanProxy.java
deleted file mode 100644
index 86e0500..0000000
--- a/plugins/org.eclipse.jem.proxy/proxyRemote/org/eclipse/jem/internal/proxy/remote/REMBeanProxy.java
+++ /dev/null
@@ -1,39 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2001, 2005 IBM Corporation and others.
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
- *
- * Contributors:
- * IBM Corporation - initial API and implementation
- *******************************************************************************/
-package org.eclipse.jem.internal.proxy.remote;
-/*
-
-
- */
-
-
-import org.eclipse.jem.internal.proxy.core.*;
-/**
- * Standard implementation of IREMBeanProxy
- */
-
-public class REMBeanProxy extends REMAbstractBeanProxy {
- private IBeanTypeProxy fType;
-
- protected REMBeanProxy(REMProxyFactoryRegistry aRegistry, Integer anID, IBeanTypeProxy aType){
- super(aRegistry, anID);
- fType = aType;
- }
-
- public IBeanTypeProxy getTypeProxy() {
- return fType;
- }
-
- public void release() {
- fType = null;
- super.release();
- }
-}
diff --git a/plugins/org.eclipse.jem.proxy/proxyRemote/org/eclipse/jem/internal/proxy/remote/REMBeanTypeProxy.java b/plugins/org.eclipse.jem.proxy/proxyRemote/org/eclipse/jem/internal/proxy/remote/REMBeanTypeProxy.java
deleted file mode 100644
index bda0aef..0000000
--- a/plugins/org.eclipse.jem.proxy/proxyRemote/org/eclipse/jem/internal/proxy/remote/REMBeanTypeProxy.java
+++ /dev/null
@@ -1,66 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2001, 2005 IBM Corporation and others.
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
- *
- * Contributors:
- * IBM Corporation - initial API and implementation
- *******************************************************************************/
-package org.eclipse.jem.internal.proxy.remote;
-/*
-
-
- */
-
-
-import org.eclipse.jem.internal.proxy.core.IBeanTypeProxy;
-/**
- * Default implementation for a BeanTypeProxy. This is what is used
- * for regular default beans and beantypes when no special beans or bean types are needed.
- */
-public class REMBeanTypeProxy extends REMAbstractBeanTypeProxy implements IREMSpecialBeanTypeProxy {
-
- /**
- * Create with a registry and a class. It is protected so that only subclasses
- * and the factory with this REM package can call it.
- */
- public REMBeanTypeProxy(REMProxyFactoryRegistry aRegistry, Integer anID, String aClassname, IBeanTypeProxy aSuperType) {
- super(aRegistry, anID, aClassname, aSuperType);
- }
-
- /**
- * newBeanTypeForClass: Create a new beantypeproxy of this kind for the given class.
- * This is used by beantype proxy factory when creating a beantype proxy for a subclass.
- * This is because subclasses, unless explicitly overridden, should use the same kind
- * of beantype proxy. This way if anything special is needed for a specific type, then
- * that can be done.
- *
- * NOTE: All subclasses must override this to return the correct type of BeanTypeProxy.
- */
- public IREMBeanTypeProxy newBeanTypeForClass(Integer anID, String aClassname, boolean anAbstract) {
- return newBeanTypeForClass(anID, aClassname, anAbstract, this);
- }
-
- /**
- * The special method to handle subclassing from an abstract).
- */
- public IREMBeanTypeProxy newBeanTypeForClass(Integer anID, String aClassname, boolean anAbstract, IBeanTypeProxy superType) {
- if (!anAbstract)
- return new REMBeanTypeProxy(fRegistry, anID, aClassname, superType);
- else
- return new REMAnAbstractBeanTypeProxy(fRegistry, anID, aClassname, superType, this);
- }
-
- /**
- * Create a new bean proxy with the specified id.
- */
- public IREMBeanProxy newBeanProxy(Integer anID){
-
- return new REMBeanProxy(fRegistry, anID, this);
-
- }
-
-
-}
diff --git a/plugins/org.eclipse.jem.proxy/proxyRemote/org/eclipse/jem/internal/proxy/remote/REMBigDecimalBeanProxy.java b/plugins/org.eclipse.jem.proxy/proxyRemote/org/eclipse/jem/internal/proxy/remote/REMBigDecimalBeanProxy.java
deleted file mode 100644
index de04272..0000000
--- a/plugins/org.eclipse.jem.proxy/proxyRemote/org/eclipse/jem/internal/proxy/remote/REMBigDecimalBeanProxy.java
+++ /dev/null
@@ -1,45 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2001, 2005 IBM Corporation and others.
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
- *
- * Contributors:
- * IBM Corporation - initial API and implementation
- *******************************************************************************/
-package org.eclipse.jem.internal.proxy.remote;
-/*
-
-
- */
-
-
-import org.eclipse.jem.internal.proxy.core.*;
-import java.math.BigDecimal;
-import org.eclipse.jem.internal.proxy.common.remote.Commands;
-/**
- * Remote Proxy for BigDecimals.
- */
-class REMBigDecimalBeanProxy extends REMNumberBeanProxy {
-
-REMBigDecimalBeanProxy(REMProxyFactoryRegistry aRegistry, BigDecimal aBigDecimal) {
- super(aRegistry, aBigDecimal);
-}
-
-/**
- * Get the beantype
- */
-public IBeanTypeProxy getTypeProxy() {
- return ((REMStandardBeanTypeProxyFactory) fFactory.getBeanTypeProxyFactory()).bigDecimalClass;
-}
-
-/**
- * Render the bean into value object.
- */
-public void renderBean(Commands.ValueObject value) {
- value.set(numberValue(), ((IREMBeanTypeProxy) getTypeProxy()).getID().intValue());
-}
-}
-
-
diff --git a/plugins/org.eclipse.jem.proxy/proxyRemote/org/eclipse/jem/internal/proxy/remote/REMBigDecimalBeanTypeProxy.java b/plugins/org.eclipse.jem.proxy/proxyRemote/org/eclipse/jem/internal/proxy/remote/REMBigDecimalBeanTypeProxy.java
deleted file mode 100644
index 8d0fce7..0000000
--- a/plugins/org.eclipse.jem.proxy/proxyRemote/org/eclipse/jem/internal/proxy/remote/REMBigDecimalBeanTypeProxy.java
+++ /dev/null
@@ -1,73 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2001, 2005 IBM Corporation and others.
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
- *
- * Contributors:
- * IBM Corporation - initial API and implementation
- *******************************************************************************/
-package org.eclipse.jem.internal.proxy.remote;
-/*
-
-
- */
-
-
-import org.eclipse.jem.internal.proxy.core.*;
-import org.eclipse.jem.internal.proxy.common.remote.Commands;
-import java.math.BigDecimal;
-/**
- * Remote Implementation of IBeanTypeProxy for BigDecimal.
- * Creation date: (2/6/00 9:01:40 AM)
- * @author: Joe Winchester
- */
-final class REMBigDecimalBeanTypeProxy extends REMAbstractNumberBeanTypeProxy {
-// Some values are cache'd for speed
- private final INumberBeanProxy zeroProxy;
- private final static BigDecimal zeroValue = new BigDecimal(0D);
-
-REMBigDecimalBeanTypeProxy(REMProxyFactoryRegistry aRegistry, IBeanTypeProxy numberType) {
- super(aRegistry, new Integer(Commands.BIG_DECIMAL_CLASS), BigDecimal.class.getName(), numberType);
-
- // Create the cached values
- zeroProxy = new REMBigDecimalBeanProxy(aRegistry, zeroValue);
-}
-
-/**
- * Helper to create a bean proxy
- * Package protected because everyone should go through the factory API
- * that is defined as part of IBeanProxyFactory
- */
-INumberBeanProxy createBigDecimalBeanProxy(BigDecimal aBigDecimal) {
- return (!zeroValue.equals(aBigDecimal)) ?
- new REMBigDecimalBeanProxy(fRegistry, aBigDecimal) : zeroProxy;
-}
-
-/**
- * Generic way to create an BigDecimal proxy, however, the Number must be a BigDecimal.
- */
-protected INumberBeanProxy createNumberBeanProxy(Number aNumber) {
- return createBigDecimalBeanProxy((BigDecimal) aNumber);
-}
-
-/**
- * newInstance method. Number's don't have a default ctor, so the standard way won't work.
- * Return the zero proxy for this case.
- */
-public IBeanProxy newInstance() {
- return zeroProxy;
-}
-
-/**
- * Create a new bean proxy the ValueObject passed in.
- * We will assume the object is correct type.
- */
-public IBeanProxy newBeanProxy(Commands.ValueObject value) {
- return createBigDecimalBeanProxy((BigDecimal) value.anObject);
-}
-
-}
-
-
diff --git a/plugins/org.eclipse.jem.proxy/proxyRemote/org/eclipse/jem/internal/proxy/remote/REMBigIntegerBeanProxy.java b/plugins/org.eclipse.jem.proxy/proxyRemote/org/eclipse/jem/internal/proxy/remote/REMBigIntegerBeanProxy.java
deleted file mode 100644
index cfd4dbf..0000000
--- a/plugins/org.eclipse.jem.proxy/proxyRemote/org/eclipse/jem/internal/proxy/remote/REMBigIntegerBeanProxy.java
+++ /dev/null
@@ -1,45 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2001, 2005 IBM Corporation and others.
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
- *
- * Contributors:
- * IBM Corporation - initial API and implementation
- *******************************************************************************/
-package org.eclipse.jem.internal.proxy.remote;
-/*
-
-
- */
-
-
-import org.eclipse.jem.internal.proxy.core.*;
-import org.eclipse.jem.internal.proxy.common.remote.Commands;
-import java.math.BigInteger;
-/**
- * Remote Proxy for BigIntegers.
- */
-class REMBigIntegerBeanProxy extends REMNumberBeanProxy {
-
-REMBigIntegerBeanProxy(REMProxyFactoryRegistry aRegistry, BigInteger aBigInteger) {
- super(aRegistry, aBigInteger);
-}
-
-/**
- * Get the beantype
- */
-public IBeanTypeProxy getTypeProxy() {
- return ((REMStandardBeanTypeProxyFactory) fFactory.getBeanTypeProxyFactory()).bigIntegerClass;
-}
-
-/**
- * Render the bean into value object.
- */
-public void renderBean(Commands.ValueObject value) {
- value.set(numberValue(), ((IREMBeanTypeProxy) getTypeProxy()).getID().intValue());
-}
-}
-
-
diff --git a/plugins/org.eclipse.jem.proxy/proxyRemote/org/eclipse/jem/internal/proxy/remote/REMBigIntegerBeanTypeProxy.java b/plugins/org.eclipse.jem.proxy/proxyRemote/org/eclipse/jem/internal/proxy/remote/REMBigIntegerBeanTypeProxy.java
deleted file mode 100644
index 8661f33..0000000
--- a/plugins/org.eclipse.jem.proxy/proxyRemote/org/eclipse/jem/internal/proxy/remote/REMBigIntegerBeanTypeProxy.java
+++ /dev/null
@@ -1,75 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2001, 2005 IBM Corporation and others.
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
- *
- * Contributors:
- * IBM Corporation - initial API and implementation
- *******************************************************************************/
-package org.eclipse.jem.internal.proxy.remote;
-/*
-
-
- */
-
-
-import org.eclipse.jem.internal.proxy.core.*;
-import org.eclipse.jem.internal.proxy.common.remote.Commands;
-import java.math.BigInteger;
-/**
- * Remote Implementation of IBeanTypeProxy for BigInteger.
- * Creation date: (2/6/00 9:01:40 AM)
- * @author: Joe Winchester
- */
-final class REMBigIntegerBeanTypeProxy extends REMAbstractNumberBeanTypeProxy {
-// Some values are cache'd for speed
- private final INumberBeanProxy zeroProxy;
- private final static BigInteger zeroValue = new BigInteger("0"); //$NON-NLS-1$
-/**
- * REMIntegerBeanTypeProxy constructor comment.
- * @param aClass java.lang.Class
- */
-REMBigIntegerBeanTypeProxy(REMProxyFactoryRegistry aRegistry, IBeanTypeProxy numberType) {
- super(aRegistry, new Integer(Commands.BIG_INTEGER_CLASS), BigInteger.class.getName(), numberType);
-
- // Create the cached values
- zeroProxy = new REMBigIntegerBeanProxy(aRegistry, zeroValue);
-}
-
-/**
- * Helper to create a bean proxy
- * Package protected because everyone should go through the factory API
- * that is defined as part of IBeanProxyFactory
- */
-INumberBeanProxy createBigIntegerBeanProxy(BigInteger aBigInteger) {
- return (!zeroValue.equals(aBigInteger)) ?
- new REMBigIntegerBeanProxy(fRegistry, aBigInteger) : zeroProxy;
-}
-
-/**
- * Generic way to create an BigInteger proxy, however, the Number must be a BigInteger.
- */
-protected INumberBeanProxy createNumberBeanProxy(Number aNumber) {
- return createBigIntegerBeanProxy((BigInteger) aNumber);
-}
-
-/**
- * newInstance method. Number's don't have a default ctor, so the standard way won't work.
- * Return the zero proxy for this case.
- */
-public IBeanProxy newInstance() {
- return zeroProxy;
-}
-
-/**
- * Create a new bean proxy the ValueObject passed in.
- * We will assume the object is correct type.
- */
-public IBeanProxy newBeanProxy(Commands.ValueObject value) {
- return createBigIntegerBeanProxy((BigInteger) value.anObject);
-}
-}
-
-
diff --git a/plugins/org.eclipse.jem.proxy/proxyRemote/org/eclipse/jem/internal/proxy/remote/REMBooleanClassBeanProxy.java b/plugins/org.eclipse.jem.proxy/proxyRemote/org/eclipse/jem/internal/proxy/remote/REMBooleanClassBeanProxy.java
deleted file mode 100644
index 77ec3c4..0000000
--- a/plugins/org.eclipse.jem.proxy/proxyRemote/org/eclipse/jem/internal/proxy/remote/REMBooleanClassBeanProxy.java
+++ /dev/null
@@ -1,96 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2001, 2005 IBM Corporation and others.
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
- *
- * Contributors:
- * IBM Corporation - initial API and implementation
- *******************************************************************************/
-package org.eclipse.jem.internal.proxy.remote;
-/*
-
-
- */
-
-
-import org.eclipse.jem.internal.proxy.core.*;
-import org.eclipse.jem.internal.proxy.common.remote.Commands;
-/**
- * Remote Implementation of IBooleanBeanProxy for Boolean.class.
- * Creation date: (2/6/00 9:02:54 AM)
- * @author: Joe Winchester
- */
-final class REMBooleanClassBeanProxy extends REMConstantBeanProxy implements IBooleanBeanProxy {
- private final Boolean fBooleanValue;
-
-/**
- * Store the boolean value so that we can return the booleanValue faster
- * without the need for going across the line. It is package protected because it is created in
- * special way, so no one else should create these.
- * @param aBean java.lang.Object
- */
-REMBooleanClassBeanProxy(REMProxyFactoryRegistry aRegistry, Boolean value) {
- super(aRegistry);
- fBooleanValue = value;
-}
-
-/**
- * equals: Equal if:
- * 1) This proxy == (identity) to the other object
- * 2) Else if other is an IBeanProxy and not a constant one, then if
- * equals on the server.
- * 3) If this is a constant proxy and the other is too or is a constant
- * value (e.g. IStringBeanProxy.equals(String), then true if values are equals.
- */
-public boolean equals(Object anObject) {
- if (this == anObject)
- return true; // Identity
- if (anObject instanceof REMBooleanClassBeanProxy)
- return fBooleanValue.booleanValue() == ((REMBooleanClassBeanProxy) anObject).booleanValue();
- if (anObject instanceof Boolean)
- return fBooleanValue.booleanValue() == ((Boolean) anObject).booleanValue();
- return false;
-}
-
-/**
- * Return the boolean value
- */
-public boolean booleanValue() {
- return fBooleanValue.booleanValue();
-}
-/**
- * Return the java.lang.Boolean value
- */
-public Boolean getBooleanValue() {
- return fBooleanValue;
-}
-
-/**
- * Return the toString of the bean itself.
- */
-public String toBeanString() {
- return fBooleanValue.toString();
-}
-
-/**
- * Get the beantype
- */
-public IBeanTypeProxy getTypeProxy() {
- return ((REMStandardBeanTypeProxyFactory) fFactory.getBeanTypeProxyFactory()).booleanClass;
-}
-
-/**
- * Render the bean into value object.
- */
-public void renderBean(Commands.ValueObject value) {
- value.set(fBooleanValue);
-}
-}
-
-
-
-
-
-
diff --git a/plugins/org.eclipse.jem.proxy/proxyRemote/org/eclipse/jem/internal/proxy/remote/REMBooleanClassBeanTypeProxy.java b/plugins/org.eclipse.jem.proxy/proxyRemote/org/eclipse/jem/internal/proxy/remote/REMBooleanClassBeanTypeProxy.java
deleted file mode 100644
index b5960a3..0000000
--- a/plugins/org.eclipse.jem.proxy/proxyRemote/org/eclipse/jem/internal/proxy/remote/REMBooleanClassBeanTypeProxy.java
+++ /dev/null
@@ -1,93 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2001, 2005 IBM Corporation and others.
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
- *
- * Contributors:
- * IBM Corporation - initial API and implementation
- *******************************************************************************/
-package org.eclipse.jem.internal.proxy.remote;
-/*
-
-
- */
-
-
-import org.eclipse.jem.internal.proxy.core.*;
-import org.eclipse.jem.internal.proxy.common.remote.Commands;
-/**
- * Boolean BeanType Proxy for Boolean.class.
- * Creation date: (2/23/00 1:59:02 PM)
- * @author: Richard Lee Kulp
- */
-final class REMBooleanClassBeanTypeProxy extends REMAbstractBeanTypeProxy implements IREMConstantBeanTypeProxy {
-
- // Cache these instances. Since the BeanType proxies are cached also, only one instance
- // of true/false will be in system.
- protected final IBooleanBeanProxy trueProxy;
- protected final IBooleanBeanProxy falseProxy;
-/**
- * REMBooleanBeanTypeProxy constructor comment.
- */
-protected REMBooleanClassBeanTypeProxy(REMProxyFactoryRegistry aRegistry, IBeanTypeProxy objectType) {
- super(aRegistry, new Integer(Commands.BOOLEAN_CLASS), Boolean.class.getName(), objectType);
-
- trueProxy = new REMBooleanClassBeanProxy( fRegistry, Boolean.TRUE);
- falseProxy = new REMBooleanClassBeanProxy( fRegistry, Boolean.FALSE);
-}
-
-/**
- * Helper to create a bean proxy
- * Package protected because everyone should go through the factory API
- * that is defined as part of IBeanProxyFactory
- * Use the cache.
- */
-IBooleanBeanProxy createBooleanBeanProxy(Boolean aBoolean) {
- return aBoolean.booleanValue() ? trueProxy : falseProxy;
-}
-
-/**
- * Create a new bean proxy with the specified id.
- *
- * For all of the primitive wrapper types, this is an invalid operation. They are created
- * explicitly through the appropriate create method.
- */
-public IREMBeanProxy newBeanProxy(Integer anID) {
- throw new UnsupportedOperationException();
-}
-
-/**
- * newBeanTypeForClass: Create a new beantypeproxy of this kind for the given class.
- * This is used by beantype proxy factory when creating a beantype proxy for a subclass.
- * This is because subclasses, unless explicitly overridden, should use the same kind
- * of beantype proxy. This way if anything special is needed for a specific type, then
- * that can be done.
- *
- * For all of the primitive wrapper types, they are final classes, so you can't create a newBeanType
- * for subclasses.
- */
-public IREMBeanTypeProxy newBeanTypeForClass(Integer anID, String aClassname, boolean anAbstract) {
- throw new UnsupportedOperationException();
-}
-
-/**
- * newInstance method. Boolean doesn't have a default ctor, so the standard way won't work.
- * Return the falseProxy for this case because that is the default value.
- */
-public IBeanProxy newInstance() {
- return falseProxy;
-}
-
-/**
- * Create a new bean proxy the ValueObject passed in.
- * We will assume the object is correct type.
- */
-public IBeanProxy newBeanProxy(Commands.ValueObject value) {
- return createBooleanBeanProxy(value.aBool ? Boolean.TRUE : Boolean.FALSE);
-}
-
-}
-
-
diff --git a/plugins/org.eclipse.jem.proxy/proxyRemote/org/eclipse/jem/internal/proxy/remote/REMBooleanTypeBeanProxy.java b/plugins/org.eclipse.jem.proxy/proxyRemote/org/eclipse/jem/internal/proxy/remote/REMBooleanTypeBeanProxy.java
deleted file mode 100644
index 2dd4c09..0000000
--- a/plugins/org.eclipse.jem.proxy/proxyRemote/org/eclipse/jem/internal/proxy/remote/REMBooleanTypeBeanProxy.java
+++ /dev/null
@@ -1,104 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2001, 2005 IBM Corporation and others.
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
- *
- * Contributors:
- * IBM Corporation - initial API and implementation
- *******************************************************************************/
-package org.eclipse.jem.internal.proxy.remote;
-/*
-
-
- */
-
-
-import org.eclipse.jem.internal.proxy.common.remote.Commands;
-import org.eclipse.jem.internal.proxy.core.*;
-/**
- * Remote Implementation of IBooleanBeanProxy for Boolean.TYPE.
- * Creation date: (2/6/00 9:02:54 AM)
- * @author: Joe Winchester
- */
-final class REMBooleanTypeBeanProxy extends REMConstantBeanProxy implements IBooleanBeanProxy {
- private final boolean fBoolean;
-
-/**
- * Store the boolean value so that we can return the booleanValue faster
- * without the need for going across the line. It is package protected because it is created in
- * special way, so no one else should create these.
- * @param aBean java.lang.Object
- */
-REMBooleanTypeBeanProxy(REMProxyFactoryRegistry aRegistry, boolean value) {
- super(aRegistry);
- fBoolean = value;
-}
-
-/**
- * equals: Equal if:
- * 1) This proxy == (identity) to the other object
- * 2) Else if other is an IBeanProxy and not a constant one, then if
- * equals on the server.
- * 3) If this is a constant proxy and the other is too or is a constant
- * value (e.g. IStringBeanProxy.equals(String), then true if values are equals.
- */
-public boolean equals(Object anObject) {
- if (this == anObject)
- return true; // Identity
- if (anObject instanceof REMBooleanTypeBeanProxy)
- return fBoolean == ((REMBooleanTypeBeanProxy) anObject).booleanValue();
- if (anObject instanceof Boolean)
- return fBoolean == ((Boolean) anObject).booleanValue();
- return false;
-}
-
-/* (non-Javadoc)
- * @see org.eclipse.jem.internal.proxy.core.IBeanProxy#sameAs(org.eclipse.jem.internal.proxy.core.IBeanProxy)
- */
-public boolean sameAs(IBeanProxy aBeanProxy) {
- if (this == aBeanProxy)
- return true; // Identity
- if (aBeanProxy instanceof REMBooleanTypeBeanProxy)
- return fBoolean == ((REMBooleanTypeBeanProxy) aBeanProxy).booleanValue();
- return false;
-}
-
-/**
- * Return the boolean value
- */
-public boolean booleanValue() {
- return fBoolean;
-}
-/**
- * Return the java.lang.Boolean value
- */
-public Boolean getBooleanValue() {
- return fBoolean ? Boolean.TRUE : Boolean.FALSE;
-}
-
-/**
- * Return the toString of the bean itself.
- */
-public String toBeanString() {
- return fBoolean ? Boolean.TRUE.toString() : Boolean.FALSE.toString();
-}
-
-/**
- * Get the beantype
- */
-public IBeanTypeProxy getTypeProxy() {
- return ((REMStandardBeanTypeProxyFactory) fFactory.getBeanTypeProxyFactory()).booleanType;
-}
-
-/**
- * Render the bean into value object.
- */
-public void renderBean(Commands.ValueObject value) {
- value.set(fBoolean);
-}
-
-}
-
-
diff --git a/plugins/org.eclipse.jem.proxy/proxyRemote/org/eclipse/jem/internal/proxy/remote/REMBooleanTypeBeanTypeProxy.java b/plugins/org.eclipse.jem.proxy/proxyRemote/org/eclipse/jem/internal/proxy/remote/REMBooleanTypeBeanTypeProxy.java
deleted file mode 100644
index 58aab10..0000000
--- a/plugins/org.eclipse.jem.proxy/proxyRemote/org/eclipse/jem/internal/proxy/remote/REMBooleanTypeBeanTypeProxy.java
+++ /dev/null
@@ -1,69 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2001, 2005 IBM Corporation and others.
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
- *
- * Contributors:
- * IBM Corporation - initial API and implementation
- *******************************************************************************/
-package org.eclipse.jem.internal.proxy.remote;
-/*
-
-
- */
-
-
-import org.eclipse.jem.internal.proxy.core.*;
-import org.eclipse.jem.internal.proxy.common.remote.Commands;
-/**
- * Boolean BeanType Proxy for Boolean.TYPE
- * Creation date: (2/23/00 1:59:02 PM)
- * @author: Richard Lee Kulp
- */
-final class REMBooleanTypeBeanTypeProxy extends REMPrimitiveBeanTypeProxy {
-
- // Cache these instances. Since the BeanType proxies are cached also, only one instance
- // of true/false will be in system.
- protected final IBooleanBeanProxy trueProxy;
- protected final IBooleanBeanProxy falseProxy;
-/**
- * REMBooleanBeanTypeProxy constructor comment.
- */
-protected REMBooleanTypeBeanTypeProxy(REMProxyFactoryRegistry aRegistry) {
- super(aRegistry, new Integer(Commands.BOOLEAN_TYPE), Boolean.TYPE.getName());
-
- trueProxy = new REMBooleanTypeBeanProxy( fRegistry, true);
- falseProxy = new REMBooleanTypeBeanProxy( fRegistry, false);
-}
-
-/**
- * Helper to create a bean proxy
- * Package protected because everyone should go through the factory API
- * that is defined as part of IBeanProxyFactory
- * Use the cache.
- */
-IBooleanBeanProxy createBooleanBeanProxy(boolean aBoolean) {
- return aBoolean ? trueProxy : falseProxy;
-}
-
-
-/**
- * newInstance method. boolean is a primitive, so the standard way won't work.
- * Return the falseProxy for this case because that is the default value.
- */
-public IBeanProxy newInstance() {
- return falseProxy;
-}
-
-/**
- * Create a new bean proxy the ValueObject passed in.
- * We will assume the object is correct type.
- */
-public IBeanProxy newBeanProxy(Commands.ValueObject value) {
- return createBooleanBeanProxy(value.aBool);
-}
-}
-
-
diff --git a/plugins/org.eclipse.jem.proxy/proxyRemote/org/eclipse/jem/internal/proxy/remote/REMByteClassBeanProxy.java b/plugins/org.eclipse.jem.proxy/proxyRemote/org/eclipse/jem/internal/proxy/remote/REMByteClassBeanProxy.java
deleted file mode 100644
index e8a4455..0000000
--- a/plugins/org.eclipse.jem.proxy/proxyRemote/org/eclipse/jem/internal/proxy/remote/REMByteClassBeanProxy.java
+++ /dev/null
@@ -1,45 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2001, 2005 IBM Corporation and others.
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
- *
- * Contributors:
- * IBM Corporation - initial API and implementation
- *******************************************************************************/
-package org.eclipse.jem.internal.proxy.remote;
-/*
-
-
- */
-
-
-import org.eclipse.jem.internal.proxy.core.*;
-import org.eclipse.jem.internal.proxy.common.remote.Commands;
-
-/**
- * Remote Proxy for Byte.class.
- */
-class REMByteClassBeanProxy extends REMNumberBeanProxy {
-
-REMByteClassBeanProxy(REMProxyFactoryRegistry aRegistry, Byte aByte) {
- super(aRegistry, aByte);
-}
-
-/**
- * Get the beantype
- */
-public IBeanTypeProxy getTypeProxy() {
- return ((REMStandardBeanTypeProxyFactory) fFactory.getBeanTypeProxyFactory()).byteClass;
-}
-
-/**
- * Render the bean into value object.
- */
-public void renderBean(Commands.ValueObject value) {
- value.set((Byte) numberValue());
-}
-}
-
-
diff --git a/plugins/org.eclipse.jem.proxy/proxyRemote/org/eclipse/jem/internal/proxy/remote/REMByteClassBeanTypeProxy.java b/plugins/org.eclipse.jem.proxy/proxyRemote/org/eclipse/jem/internal/proxy/remote/REMByteClassBeanTypeProxy.java
deleted file mode 100644
index bfbf1ac..0000000
--- a/plugins/org.eclipse.jem.proxy/proxyRemote/org/eclipse/jem/internal/proxy/remote/REMByteClassBeanTypeProxy.java
+++ /dev/null
@@ -1,85 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2001, 2005 IBM Corporation and others.
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
- *
- * Contributors:
- * IBM Corporation - initial API and implementation
- *******************************************************************************/
-package org.eclipse.jem.internal.proxy.remote;
-/*
-
-
- */
-
-
-import org.eclipse.jem.internal.proxy.core.*;
-import org.eclipse.jem.internal.proxy.common.remote.Commands;
-/**
- * BeanType Proxy for Byte.class.
- * Creation date: (2/6/00 9:01:40 AM)
- * @author: Joe Winchester
- */
-final class REMByteClassBeanTypeProxy extends REMAbstractNumberBeanTypeProxy {
-// Some values are cache'd for speed
- private final INumberBeanProxy zeroProxy;
- private final INumberBeanProxy oneProxy;
- private final INumberBeanProxy twoProxy;
- private final INumberBeanProxy threeProxy;
-/**
- * REMIntegerBeanTypeProxy constructor comment.
- * @param aClass java.lang.Class
- */
-REMByteClassBeanTypeProxy(REMProxyFactoryRegistry aRegistry, IBeanTypeProxy numberType) {
- super(aRegistry, new Integer(Commands.BYTE_CLASS), Byte.class.getName(), numberType);
-
- // Create the cached values
- zeroProxy = new REMByteClassBeanProxy(aRegistry, new Byte((byte)0));
- oneProxy = new REMByteClassBeanProxy(aRegistry, new Byte((byte)1));
- twoProxy = new REMByteClassBeanProxy(aRegistry, new Byte((byte)2));
- threeProxy = new REMByteClassBeanProxy(aRegistry, new Byte((byte)3));
-}
-
-/**
- * Helper to create a bean proxy
- * Package protected because everyone should go through the factory API
- * that is defined as part of IBeanProxyFactory
- */
-INumberBeanProxy createByteBeanProxy(Byte aByte) {
- switch(aByte.byteValue()) {
- case 0: return zeroProxy;
- case 1: return oneProxy ;
- case 2: return twoProxy ;
- case 3: return threeProxy ;
- default: return new REMByteClassBeanProxy(fRegistry, aByte);
- }
-}
-
-/**
- * Generic way to create an Integer proxy, however, the Number must be an Integer.
- */
-protected INumberBeanProxy createNumberBeanProxy(Number aNumber) {
- return createByteBeanProxy((Byte) aNumber);
-}
-
-/**
- * newInstance method. Number's don't have a default ctor, so the standard way won't work.
- * Return the zero proxy for this case.
- */
-public IBeanProxy newInstance() {
- return zeroProxy;
-}
-
-/**
- * Create a new bean proxy the ValueObject passed in.
- * We will assume the object is correct type.
- */
-public IBeanProxy newBeanProxy(Commands.ValueObject value) {
- return createByteBeanProxy(new Byte(value.aByte));
-}
-
-}
-
-
diff --git a/plugins/org.eclipse.jem.proxy/proxyRemote/org/eclipse/jem/internal/proxy/remote/REMByteTypeBeanProxy.java b/plugins/org.eclipse.jem.proxy/proxyRemote/org/eclipse/jem/internal/proxy/remote/REMByteTypeBeanProxy.java
deleted file mode 100644
index b762b9b..0000000
--- a/plugins/org.eclipse.jem.proxy/proxyRemote/org/eclipse/jem/internal/proxy/remote/REMByteTypeBeanProxy.java
+++ /dev/null
@@ -1,133 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2001, 2005 IBM Corporation and others.
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
- *
- * Contributors:
- * IBM Corporation - initial API and implementation
- *******************************************************************************/
-package org.eclipse.jem.internal.proxy.remote;
-/*
-
-
- */
-
-
-import org.eclipse.jem.internal.proxy.common.remote.Commands;
-import org.eclipse.jem.internal.proxy.core.*;
-/**
- * Remote Implementation of INumberBeanProxy for Byte.TYPE.
- * It can answer all of the primitive number types (int, long, short, byte, double, float).
- * Creation date: (2/6/00 9:02:54 AM)
- * @author: Joe Winchester
- */
-class REMByteTypeBeanProxy extends REMConstantBeanProxy implements INumberBeanProxy {
- private final byte fByte;
-
-/**
- * It is package protected because they are created
- * in a special way and no one else should create them.
- * @param aBean java.lang.Object
- */
-REMByteTypeBeanProxy(REMProxyFactoryRegistry aRegistry, byte aByte) {
- super(aRegistry);
- fByte = aByte;
-}
-
-/**
- * equals: Equal if:
- * 1) This proxy == (identity) to the other object
- * 2) Else if other is an IBeanProxy and not a constant one, then if
- * equals on the server.
- * 3) If this is a constant proxy and the other is too or is a constant
- * value (e.g. IStringBeanProxy.equals(String), then true if values are equals.
- */
-public boolean equals(Object anObject) {
- if (this == anObject)
- return true; // Identity
- if (anObject instanceof REMByteTypeBeanProxy)
- return fByte == ((REMByteTypeBeanProxy) anObject).byteValue();
- if (anObject instanceof Byte)
- return fByte == ((Byte) anObject).byteValue();
- return false;
-}
-
-/* (non-Javadoc)
- * @see org.eclipse.jem.internal.proxy.core.IBeanProxy#sameAs(org.eclipse.jem.internal.proxy.core.IBeanProxy)
- */
-public boolean sameAs(IBeanProxy aBeanProxy) {
- if (this == aBeanProxy)
- return true; // Identity
- if (aBeanProxy instanceof REMByteTypeBeanProxy)
- return fByte == ((REMByteTypeBeanProxy) aBeanProxy).byteValue();
- return false;
-}
-
-/**
- * byteValue method comment.
- */
-public byte byteValue() {
- return fByte;
-}
-/**
- * doubleValue method comment.
- */
-public double doubleValue() {
- return fByte;
-}
-/**
- * floatValue method comment.
- */
-public float floatValue() {
- return fByte;
-}
-/**
- * Return the int value
- */
-public int intValue() {
- return fByte;
-}
-/**
- * longValue method comment.
- */
-public long longValue() {
- return fByte;
-}
-/**
- * numberValue method comment.
- */
-public Number numberValue() {
- return new Byte(fByte);
-}
-/**
- * shortValue method comment.
- */
-public short shortValue() {
- return fByte;
-}
-
-/**
- * The bean's toString.
- */
-public String toBeanString() {
- return String.valueOf(fByte);
-}
-
-/**
- * Get the beantype
- */
-public IBeanTypeProxy getTypeProxy() {
- return ((REMStandardBeanTypeProxyFactory) fFactory.getBeanTypeProxyFactory()).byteType;
-}
-
-/**
- * Render the bean into value object.
- */
-public void renderBean(Commands.ValueObject value) {
- value.set(fByte);
-}
-}
-
-
diff --git a/plugins/org.eclipse.jem.proxy/proxyRemote/org/eclipse/jem/internal/proxy/remote/REMByteTypeBeanTypeProxy.java b/plugins/org.eclipse.jem.proxy/proxyRemote/org/eclipse/jem/internal/proxy/remote/REMByteTypeBeanTypeProxy.java
deleted file mode 100644
index 514192a..0000000
--- a/plugins/org.eclipse.jem.proxy/proxyRemote/org/eclipse/jem/internal/proxy/remote/REMByteTypeBeanTypeProxy.java
+++ /dev/null
@@ -1,110 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2001, 2005 IBM Corporation and others.
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
- *
- * Contributors:
- * IBM Corporation - initial API and implementation
- *******************************************************************************/
-package org.eclipse.jem.internal.proxy.remote;
-/*
-
-
- */
-
-
-import org.eclipse.jem.internal.proxy.core.*;
-import org.eclipse.jem.internal.proxy.common.remote.Commands;
-/**
- * Remote Implementation of IBeanTypeProxy for Byte.TYPE.
- * Creation date: (2/6/00 9:01:40 AM)
- * @author: Joe Winchester
- */
-final class REMByteTypeBeanTypeProxy extends REMPrimitiveBeanTypeProxy {
-// Some values are cache'd for speed
- private final INumberBeanProxy zeroProxy;
- private final INumberBeanProxy oneProxy;
- private final INumberBeanProxy twoProxy;
- private final INumberBeanProxy threeProxy;
-/**
- * REMIntegerBeanTypeProxy constructor comment.
- * @param aClass java.lang.Class
- */
-REMByteTypeBeanTypeProxy(REMProxyFactoryRegistry aRegistry) {
- super(aRegistry, new Integer(Commands.BYTE_TYPE), Byte.TYPE.getName());
-
- // Create the cached values
- zeroProxy = new REMByteTypeBeanProxy(aRegistry, (byte)0);
- oneProxy = new REMByteTypeBeanProxy(aRegistry, (byte)1);
- twoProxy = new REMByteTypeBeanProxy(aRegistry, (byte)2);
- threeProxy = new REMByteTypeBeanProxy(aRegistry, (byte)3);
-}
-
-/**
- * Helper to create a bean proxy
- * Package protected because everyone should go through the factory API
- * that is defined as part of IBeanProxyFactory
- */
-INumberBeanProxy createByteBeanProxy(byte aByte) {
- switch(aByte) {
- case 0: return zeroProxy;
- case 1: return oneProxy ;
- case 2: return twoProxy ;
- case 3: return threeProxy ;
- default: return new REMByteTypeBeanProxy(fRegistry, aByte);
- }
-}
-
-/**
- * newInstance method. byte is a primitive, so the standard way won't work.
- * Return the zeroProxy for this case because that is the default value.
- */
-public IBeanProxy newInstance() {
- return zeroProxy;
-}
-
-/**
- * Create a new bean proxy the ValueObject passed in.
- * We will assume the object is correct type.
- */
-public IBeanProxy newBeanProxy(Commands.ValueObject value) {
- return createByteBeanProxy(value.aByte);
-}
-
-/**
- * Short cut for newInstance where the string follows the
- * specific pattern we expect. That way it won't be necessary to ship over to the vm
- * to process it.
- *
- * The pattern it can accept is:
- * 1) (byte) validNumber - number can be any number because (byte) explicitly casts it down.
- * 2) validNumber
- * It will use the decode function of byte to determine the valid number.
- */
-public IBeanProxy newInstance(String initializationString) throws ThrowableProxy, ClassCastException, InstantiationException {
- String trim = initializationString.trim();
- if (trim.length() == 0)
- return super.newInstance(initializationString);
- byte aByte;
- if (trim.startsWith("(byte)")) { //$NON-NLS-1$
- Number v = parseString(trim.substring("(byte)".length()).trim()); //$NON-NLS-1$
- if (v != null)
- aByte = v.byteValue();
- else
- return super.newInstance(initializationString); // Can't decode it, let full parser handle it.
- } else {
- try {
- aByte = Byte.decode(trim).byteValue(); // See if valid byte format.
- } catch (NumberFormatException e) {
- return super.newInstance(initializationString); // Can't decode it, let full parser handle it.
- }
- }
-
- return getProxyFactoryRegistry().getBeanProxyFactory().createBeanProxyWith(aByte);
-}
-
-}
-
-
diff --git a/plugins/org.eclipse.jem.proxy/proxyRemote/org/eclipse/jem/internal/proxy/remote/REMCallbackInputStream.java b/plugins/org.eclipse.jem.proxy/proxyRemote/org/eclipse/jem/internal/proxy/remote/REMCallbackInputStream.java
deleted file mode 100644
index 9e2075b..0000000
--- a/plugins/org.eclipse.jem.proxy/proxyRemote/org/eclipse/jem/internal/proxy/remote/REMCallbackInputStream.java
+++ /dev/null
@@ -1,146 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2001, 2005 IBM Corporation and others.
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
- *
- * Contributors:
- * IBM Corporation - initial API and implementation
- *******************************************************************************/
-package org.eclipse.jem.internal.proxy.remote;
-/*
-
-
- */
-
-import java.io.*;
-
-import org.eclipse.core.runtime.IStatus;
-import org.eclipse.core.runtime.Status;
-import org.eclipse.jem.internal.proxy.core.ProxyPlugin;
-import org.eclipse.jem.internal.proxy.common.CommandException;
-import org.eclipse.jem.internal.proxy.common.remote.Commands;
-import org.eclipse.jem.internal.proxy.common.remote.IOCommandException;
-/**
- * This is the inputstream used to return a lot of data from
- * the server.
- */
-
-public class REMCallbackInputStream extends InputStream {
-
- protected DataInputStream fIn;
- protected DataOutputStream fOut;
- protected byte[] fBuffer;
- protected int fNextByte = 0;
- protected int fLastByte = 0;
-
- public REMCallbackInputStream(DataInputStream in, DataOutputStream out) {
- fIn = in;
- fOut = out;
-
- Integer bufSize = Integer.getInteger("proxyvm.bufsize"); //$NON-NLS-1$
- if (bufSize == null)
- bufSize = new Integer(16000);
- fBuffer = new byte[bufSize.intValue()];
- }
-
- protected void clearStream() {
- fIn = null;
- fOut = null;
- fBuffer = null;
- }
-
- protected void fillBuffer() throws IOException {
- if (fIn == null)
- throw new InterruptedIOException();
- try {
- if (fLastByte != -1) {
- fLastByte = Commands.readBytes(fIn, fBuffer);
- if (fLastByte != -1)
- fNextByte = 0;
- else {
- fNextByte = -1;
- }
- }
- } catch (CommandException e) {
- try {
- close(false);
- } catch (IOException e1) {
- ProxyPlugin.getPlugin().getLogger().log(new Status(IStatus.WARNING, ProxyPlugin.getPlugin().getBundle().getSymbolicName(), 0, "", e1)); // Error during close, just log it. //$NON-NLS-1$
- }
- throw new IOCommandException(e);
- }
- }
-
- public int read() throws IOException {
- if (fNextByte >= fLastByte) {
- fillBuffer();
- }
- if (fLastByte == -1)
- return -1; // We've previously reached the end.
-
- return fBuffer[fNextByte++] & 0xFF; // So that it is in range 0 to 255.
- }
-
- public int read(byte b[], int off, int len) throws IOException {
- if (b == null) {
- throw new NullPointerException();
- } else if ((off < 0) || (off > b.length) || (len < 0) ||
- ((off + len) > b.length) || ((off + len) < 0)) {
- throw new IndexOutOfBoundsException();
- } else if (len == 0) {
- return 0;
- }
-
- int read = 0;
- while (len > 0) {
- if (fNextByte >= fLastByte)
- fillBuffer();
- if (fLastByte == -1)
- return read != 0 ? read : -1; // No more, return amount read, or if none read, then -1
- int move = fLastByte - fNextByte;
- if (move > len)
- move = len;
- System.arraycopy(fBuffer, fNextByte, b, off, move);
- read += move;
- fNextByte += move;
- off += move;
- len -= move;
- }
-
- return read;
- }
-
- public int available() throws IOException {
- return fLastByte != -1 ? fLastByte - fNextByte : 0;
- }
-
- public void close() throws IOException {
- close(true);
- }
-
- protected void close(boolean wait) throws IOException {
- if (fOut == null)
- return; // Already closed.
- try {
- fOut.writeByte(Commands.CALLBACK_STREAM_TERMINATE);
- fOut.flush();
- fOut = null; // So that we know we closed already if error occurs during in read() below.
- if (wait) {
- // Need to read until End of stream because we need to flush out the
- // stream so that next time we use this connection we start fresh.
- // If the server has already finished writing, we will read until then.
- // If the server has not yet finished writing, when it reads the terminate
- // request it will send an end of stream marker for us to read. But either
- // way we can't leave until we've read everything from the stream.
-
- // If called with no wait, then we are closing hard and will be closing the socket too.
- while (read() != -1) {
- }
- }
- } finally {
- clearStream();
- }
- }
-}
diff --git a/plugins/org.eclipse.jem.proxy/proxyRemote/org/eclipse/jem/internal/proxy/remote/REMCallbackRegistry.java b/plugins/org.eclipse.jem.proxy/proxyRemote/org/eclipse/jem/internal/proxy/remote/REMCallbackRegistry.java
deleted file mode 100644
index 816c40c..0000000
--- a/plugins/org.eclipse.jem.proxy/proxyRemote/org/eclipse/jem/internal/proxy/remote/REMCallbackRegistry.java
+++ /dev/null
@@ -1,185 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2001, 2005 IBM Corporation and others.
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
- *
- * Contributors:
- * IBM Corporation - initial API and implementation
- *******************************************************************************/
-package org.eclipse.jem.internal.proxy.remote;
-/*
-
-
- */
-
-import java.net.Socket;
-import java.util.*;
-
-import org.eclipse.jem.internal.proxy.common.remote.Commands;
-import org.eclipse.jem.internal.proxy.core.*;
-import org.eclipse.jem.internal.proxy.core.ExpressionProxy.ProxyEvent;
-
-/**
- * This registry will handle callbacks.
- * It is package protected because no one
- * should access it outside.
- */
-class REMCallbackRegistry implements ICallbackRegistry {
- final REMProxyFactoryRegistry fFactory;
- final String fNamePostfix;
- List fThreads = Collections.synchronizedList(new LinkedList()); // List of active callback threads.
-
- Map fIdToCallback = new HashMap(5); // ID to Callback map.
- Map fCallbackProxyToId = new HashMap(5); // Callback to ID map. This will also hold onto the callback proxies so that they don't get GC'd while the callback is registered.
-
- IREMMethodProxy fInitializeCallback;
- IBeanProxy fRemoteServer;
-
- boolean registryOpen = true;
-
- public REMCallbackRegistry(String name, REMProxyFactoryRegistry aFactory) {
-
- fFactory = aFactory;
- fNamePostfix = name;
-
- // Now register common proxies.
- IREMBeanTypeProxy callbackType = new REMInterfaceBeanTypeProxy(fFactory, new Integer(Commands.ICALLBACK_CLASS), "org.eclipse.jem.internal.proxy.vm.remote.ICallback"); //$NON-NLS-1$
-
- fInitializeCallback = (IREMMethodProxy) ((REMMethodProxyFactory) fFactory.getMethodProxyFactory()).methodType.newBeanProxy(new Integer(Commands.INITIALIZECALLBACK_METHOD_ID));
-
- fRemoteServer = aFactory.getBeanProxyFactory().getIVMServerProxy(); // For us, the IVMServer on the remote vm ALSO implements IVMCallbackServer.
-
- ((REMStandardBeanTypeProxyFactory) fFactory.getBeanTypeProxyFactory()).registerBeanTypeProxy(callbackType, true);
- ((REMStandardBeanProxyFactory) fFactory.getBeanProxyFactory()).registerProxy(fInitializeCallback);
-
- }
-
- public boolean createCallback(Socket incoming) {
- if (registryOpen) {
- Thread st = new REMCallbackThread(incoming, this, "Callback Thread-"+fNamePostfix, fFactory, fFactory.fNoTimeouts); //$NON-NLS-1$
- fThreads.add(st);
- st.start();
- return true;
- } else
- return false;
- }
-
- /**
- * Use this to request a shutdown. If the server is already shutdown, this will return false.
- */
- public boolean requestShutdown() {
- if (registryOpen)
- shutdown();
- else
- return false;
- return true;
- }
-
- /**
- * Remove a thread from the list.
- */
- public void removeCallbackThread(REMCallbackThread thread) {
- fThreads.remove(thread);
- }
-
- private void shutdown() {
-
- // Go through each thread and ask it to close. Make a copy of the list so that we
- // won't get into deadlocks.
- REMCallbackThread[] threadsArray = (REMCallbackThread[]) fThreads.toArray(new REMCallbackThread[fThreads.size()]);
- for (int i=0; i<threadsArray.length; i++) {
- // This is a harsh way to shut a connection down, but there's no
- // other way I know of to interrupt the read on a socket.
- threadsArray[i].close();
- }
-
- // Now that they've been told to close, wait on each one to finish.
- for (int i=0; i<threadsArray.length; i++)
- try {
- threadsArray[i].join(10000); // Wait ten seconds, if longer, just go on to next one.
- } catch (InterruptedException e) {
- }
-
- fThreads.clear();
- fIdToCallback.clear();
- fCallbackProxyToId.clear();
- fInitializeCallback = null;
- fRemoteServer = null;
-
- }
-
- public ICallback getRegisteredCallback(int id) {
- synchronized(fIdToCallback) {
- return (ICallback) fIdToCallback.get(new Integer(id));
- }
- }
-
- /*
- * (non-Javadoc)
- * @see org.eclipse.jem.internal.proxy.core.ICallbackRegistry#registerCallback(org.eclipse.jem.internal.proxy.core.IBeanProxy, org.eclipse.jem.internal.proxy.core.ICallback)
- */
- public void registerCallback(IBeanProxy callbackProxy, ICallback cb) {
- synchronized(fIdToCallback) {
- fIdToCallback.put(((IREMBeanProxy) callbackProxy).getID(), cb);
- fCallbackProxyToId.put(callbackProxy, ((IREMBeanProxy) callbackProxy).getID());
- fInitializeCallback.invokeCatchThrowableExceptions(callbackProxy, new IBeanProxy[] {fRemoteServer, fFactory.getBeanProxyFactory().createBeanProxyWith(((IREMBeanProxy) callbackProxy).getID().intValue())});
- }
- }
-
-
- /* (non-Javadoc)
- * @see org.eclipse.jem.internal.proxy.core.ICallbackRegistry#registerCallback(org.eclipse.jem.internal.proxy.core.IProxy, org.eclipse.jem.internal.proxy.core.ICallback, org.eclipse.jem.internal.proxy.core.IExpression)
- */
- public void registerCallback(IProxy callbackProxy, final ICallback cb, IExpression expression) {
- final Integer id;
- if (callbackProxy.isBeanProxy()) {
- id = ((IREMBeanProxy) callbackProxy).getID();
- synchronized(fIdToCallback) {
- fIdToCallback.put(id, cb);
- fCallbackProxyToId.put(callbackProxy, id);
- }
- } else {
- id = new Integer(callbackProxy.hashCode());
- synchronized (fIdToCallback) {
- fIdToCallback.put(id, cb); // This is so that it is registered in case callback is invoked from remote vm during expression processing.
- }
- ((ExpressionProxy) callbackProxy).addProxyListener(new ExpressionProxy.ProxyListener() {
- public void proxyResolved(ProxyEvent event) {
- synchronized(fIdToCallback) {
- fCallbackProxyToId.put(event.getProxy(), id);
- }
- }
-
- public void proxyNotResolved(ProxyEvent event) {
- // Failed, so remove registration completely.
- synchronized (fIdToCallback) {
- fIdToCallback.remove(id);
- }
- }
-
- public void proxyVoid(ProxyEvent event) {
- // Failed, so remove registration completely.
- synchronized (fIdToCallback) {
- fIdToCallback.remove(id);
- }
- }
-
- });
- }
- expression.createSimpleMethodInvoke(fInitializeCallback, callbackProxy, new IProxy[] {fRemoteServer, fFactory.getBeanProxyFactory().createBeanProxyWith(id.intValue())}, false);
- }
-
- /**
- * The public interface for deregistering callbacks.
- */
- public void deregisterCallback(IBeanProxy callbackProxy) {
- synchronized(fIdToCallback) {
- Integer id = (Integer) fCallbackProxyToId.remove(callbackProxy);
- fIdToCallback.remove(id);
- }
- }
-
-
-}
diff --git a/plugins/org.eclipse.jem.proxy/proxyRemote/org/eclipse/jem/internal/proxy/remote/REMCallbackThread.java b/plugins/org.eclipse.jem.proxy/proxyRemote/org/eclipse/jem/internal/proxy/remote/REMCallbackThread.java
deleted file mode 100644
index 5625d1c..0000000
--- a/plugins/org.eclipse.jem.proxy/proxyRemote/org/eclipse/jem/internal/proxy/remote/REMCallbackThread.java
+++ /dev/null
@@ -1,327 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2001, 2005 IBM Corporation and others.
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
- *
- * Contributors:
- * IBM Corporation - initial API and implementation
- *******************************************************************************/
-package org.eclipse.jem.internal.proxy.remote;
-/*
-
-
- */
-
-import java.io.*;
-import java.net.Socket;
-import java.util.logging.Level;
-
-import org.eclipse.core.runtime.IStatus;
-import org.eclipse.core.runtime.Status;
-
-import org.eclipse.jem.internal.proxy.common.remote.Commands;
-import org.eclipse.jem.internal.proxy.common.remote.TransmitableArray;
-import org.eclipse.jem.internal.proxy.core.*;
-
-/**
- * This thread handles the actual callback.
- * It is package protected because no one else should access it.
- */
-class REMCallbackThread extends Thread {
- final REMConnection fConnection; // A connection to use
- final REMCallbackRegistry fServer;
- final REMStandardBeanProxyFactory fFactory;
- final REMStandardBeanTypeProxyFactory fTypeFactory;
- final REMProxyFactoryRegistry registry;
- protected boolean shuttingDown;
- protected boolean inTransaction; // Is this thread currently participating in a transaction, (i.e. reading/writing), if so then we can't use it for another transaction.
-
-
- /**
- * Is this callback thread currently participating in a transaction (reading/writing). If so then it can't be used for an
- * independent new transaction. In other words you can't write/read data using this callback thread's
- * connection because it is being used by someone else expecting to have exclusive read/write on this connection.
- *
- * @return
- *
- * @since 1.1.0
- */
- public boolean inTransaction() {
- return inTransaction;
- }
-
- /**
- * Set whether this callback thread is in a transaction or not. If it is in a transaction it cannot be used
- * for an independent new transaction. In other words you can't write/read data using this callback thread's
- * connection because it is being used by someone else expecting to have exclusive read/write on this connection.
- * @param inTransaction
- *
- * @since 1.1.0
- */
- public void setIntransaction(boolean inTransaction) {
- this.inTransaction = inTransaction;
- }
-
- // Kludge: Bug in Linux 1.3.xxx of JVM. Closing a socket while the socket is being read/accept will not interrupt the
- // wait. Need to timeout to the socket read/accept before the socket close will be noticed. This has been fixed
- // in Linux 1.4. So on Linux 1.3 need to put timeouts in on those sockets that can be separately closed while reading/accepting.
- static boolean LINUX_1_3 = "linux".equalsIgnoreCase(System.getProperty("os.name")) && System.getProperty("java.version","").startsWith("1.3"); //$NON-NLS-1$ //$NON-NLS-2$ //$NON-NLS-3$ //$NON-NLS-4$ //$NON-NLS-5$
-
- public REMCallbackThread(Socket socket, REMCallbackRegistry server, String name, REMProxyFactoryRegistry registry, boolean noTimeouts) {
- super(name);
-
- fConnection = new REMConnection(socket, true); // No timeouts since this is a server thread.
- this.registry = registry;
- fServer = server;
- fFactory = (REMStandardBeanProxyFactory) registry.getBeanProxyFactory();
- fTypeFactory = (REMStandardBeanTypeProxyFactory) registry.getBeanTypeProxyFactory();
- }
-
- /**
- * Request the thread to close down.
- */
- public void close() {
- try {
- shuttingDown = true; // So that if this is a forced close then it will know not to print error msgs.
- if (fConnection.fSocket != null)
- fConnection.fSocket.close();
- } catch (Exception e) {
- }
- }
-
-
- /*
- * Return the IREMConnection associated with this callback. Used by
- * the connection server to return this connection for any requests
- * made on this thread.
- * <package-protected> so that only remote proxy can access.
- */
- IREMConnection getConnection() {
- return fConnection;
- }
-
- public void run() {
-
- DataInputStream in = fConnection.in;
- DataOutputStream out = fConnection.out;
- InputStream ins = null;
- boolean shutdown = false;
- Commands.ValueObject valueObject = new Commands.ValueObject(); // Working value object so not continually recreated.
- BeanProxyValueSender valueSender = new BeanProxyValueSender(this.fFactory); // Working valuesender so not continually recreated.
- try {
- boolean doLoop = true;
-
- /**
- * Note: In the cases below you will see a lot of finally clauses that null variables out.
- * This is because this is a long running loop, and variables declared within blocks are not
- * garbage collected until the method is terminated, so these variables once set would never
- * be GC'd. The nulling at the end of the case makes sure that any of those objects set are
- * now available for garbage collection when necessary.
- */
- while(doLoop) {
- byte cmd = 0;
- try {
- if (LINUX_1_3)
- fConnection.fSocket.setSoTimeout(1000); // Linux 1.3 bug, see static LINUX_1_3 above
- cmd = in.readByte();
- if (LINUX_1_3)
- fConnection.fSocket.setSoTimeout(0); // Linux 1.3 bug, see static LINUX_1_3 above
- } catch (InterruptedIOException e) {
- continue; // Timed out, try again
- }
-
- switch (cmd) {
- case Commands.QUIT_CONNECTION:
- doLoop = false;
- break; // Close this connection
-
- case Commands.TERMINATE_SERVER:
- doLoop = false;
- shutdown = true; // Shutdown everything
- break;
-
- case Commands.CALLBACK:
- int callID = in.readInt(); // The id of the registered callback to call.
- int msgID = in.readInt(); // The id of the message to call.
- Object parm = null;
- Object result = null;
- ICallback cb = null;
- try {
- // The register callback handler will know how to handle the parm,
- // it will know if it is an array of proxies, or an object of some kind.
- fFactory.startTransaction(); // Start a transaction.
- setIntransaction(true); // Also tell ourselves that we are in a transaction.
- boolean isProxies = true;
- try {
- Commands.readValue(in, valueObject);
- if (valueObject.type == Commands.ARRAY_IDS) {
- // It is an array containing IDs, as it normally would be.
- // However it will become IBeanProxy[]. That is because if ID's
- // they must be proxies over here.
- valueSender.initialize(valueObject);
- Commands.readArray(in, valueObject.anInt, valueSender, valueObject, false);
- if (valueSender.getException() != null) {
- close(); // Something wrong, close the thread so next time we get a new one.
- }
- parm = valueSender.getArray();
- } else {
- // It is object or null. It could be an array of objects, or one object.
- isProxies = false;
- parm = valueObject.getAsObject();
- }
- } finally {
- setIntransaction(false);
- fFactory.stopTransaction();
- }
- // Now perform the callback.
- cb = fServer.getRegisteredCallback(callID);
- if (cb != null) {
- // Callback still registered. If proxies, then if first entry is just a proxy,
- // then we are sending only one. A convienence factor for callbacks.
- // If not a single entry of IBeanProxy, then send whole array.
- try {
- if (isProxies)
- if (((Object[]) parm).length == 1 && (((Object[]) parm)[0] == null || ((Object[]) parm)[0] instanceof IBeanProxy))
- result = cb.calledBack(msgID, (IBeanProxy) ((Object[]) parm)[0]);
- else
- result = cb.calledBack(msgID, (Object[]) parm);
- else
- result = cb.calledBack(msgID, parm);
- // We only accept null, IREMBeanProxies, and Object[], where
- // contents of Object[] are bean proxies.
- valueObject.set();
- if (result instanceof IREMBeanProxy)
- ((IREMBeanProxy) result).renderBean(valueObject);
- else if (result instanceof Object[]) {
- class Retriever implements Commands.ValueRetrieve {
- int index = 0;
- Object[] array;
- Commands.ValueObject worker = new Commands.ValueObject();
-
- public Retriever(Object[] anArray) {
- array = anArray;
- }
-
- public Commands.ValueObject nextValue() {
- Object retParm = array[index++];
- if (retParm != null)
- if (retParm instanceof IREMBeanProxy)
- ((IREMBeanProxy) retParm).renderBean(worker);
- else if (retParm instanceof TransmitableArray) {
- // It is another array, create a new
- // retriever.
- worker.setArrayIDS(
- new Retriever(((TransmitableArray) retParm).array),
- ((TransmitableArray) retParm).array.length,
- ((TransmitableArray) retParm).componentTypeID);
- } else {
- // It's an object. Need to get bean
- // type so that we can send it.
- IREMBeanProxy type =
- (IREMBeanProxy) fTypeFactory.getBeanTypeProxy(retParm.getClass().getName());
- if (type == null)
- throw new IllegalArgumentException();
- int classID = type.getID().intValue();
- worker.setAsObject(retParm, classID);
- }
- else
- worker.set();
- return worker;
- }
- };
-
- valueObject.setArrayIDS(
- new Retriever((Object[]) result),
- ((Object[]) result).length,
- Commands.OBJECT_CLASS);
- }
-
- Commands.sendCallbackDoneCommand(out, valueObject, Commands.NO_ERROR);
- } catch (RuntimeException e) {
- // Something happened, turn it into an error object
- // to send back.
- valueObject.set(e.getClass().getName() + ':' + e.getLocalizedMessage());
- Commands.sendCallbackDoneCommand(out, valueObject, Commands.CALLBACK_RUNTIME_EXCEPTION);
- ProxyPlugin.getPlugin().getLogger().log(e, Level.INFO); // Just log it, but assume safe enough to just go back and wait for next callback request.
- }
- } else {
- valueObject.set();
- Commands.sendCallbackDoneCommand(out, valueObject, Commands.CALLBACK_NOT_REGISTERED); // Send error msg back to indicate we weren't registered.
- }
- } finally {
- parm = null; // Clear out for GC to work
- result = null;
- cb = null;
- valueObject.set();
- valueSender.clear();
- }
- break;
-
- case Commands.CALLBACK_STREAM:
- // A request for a stream
- callID = in.readInt(); // The id of the registered callback to call.
- msgID = in.readInt(); // The id of the message to call.
- cb = null;
- try {
- // Now perform the callback.
- cb = fServer.getRegisteredCallback(callID);
- if (cb != null) {
- // Callback still registered
- valueObject.set();
- Commands.sendCallbackDoneCommand(out, valueObject, Commands.NO_ERROR); // Send null to let it know we've accepted the stream
- ins = new REMCallbackInputStream(in, out);
- try {
- cb.calledBackStream(msgID, ins);
- } finally {
- try {
- ins.close(); // Make sure it's closed.
- } catch (IOException e) {
- // Exception while closing, just log it and then mark to end the loop so we close connection too.
- doLoop = false;
- ProxyPlugin.getPlugin().getLogger().log(new Status(IStatus.ERROR, ProxyPlugin.getPlugin().getBundle().getSymbolicName(), 0, "In REMCallbackThread", e)); //$NON-NLS-1$
- }
- }
- } else {
- valueObject.set();
- Commands.sendCallbackDoneCommand(out, valueObject, Commands.CALLBACK_NOT_REGISTERED); // Send error msg back to indicate we weren't registered.
- }
- } finally {
- cb = null; // Clear out for GC to work
- ins = null;
- valueObject.set();
- }
- break;
-
- default:
- // Unknown command. We don't know how long the command is, so we need to close the connection.
- ProxyPlugin.getPlugin().getLogger().log(new Status(IStatus.ERROR, ProxyPlugin.getPlugin().getBundle().getSymbolicName(), 0, "REMCallback: Invalid cmd sent="+cmd, null)); //$NON-NLS-1$
- doLoop = false;
- break;
- }
- }
- } catch (EOFException e) {
- // This is ok. It means that the connection on the other side was terminated.
- // So just accept this and go down.
- } catch (Exception e) {
- if (!shuttingDown)
- ProxyPlugin.getPlugin().getLogger().log(new Status(IStatus.ERROR, ProxyPlugin.getPlugin().getBundle().getSymbolicName(), 0, "In REMCallbackThread", e)); //$NON-NLS-1$
- } finally {
- if (in != null)
- try {
- in.close();
- } catch (Exception e) {
- }
- if (out != null)
- try {
- out.close();
- } catch (Exception e) {
- }
- close();
- }
- fServer.removeCallbackThread(this);
- if (shutdown)
- fServer.requestShutdown();
- }
-}
diff --git a/plugins/org.eclipse.jem.proxy/proxyRemote/org/eclipse/jem/internal/proxy/remote/REMCharacterClassBeanProxy.java b/plugins/org.eclipse.jem.proxy/proxyRemote/org/eclipse/jem/internal/proxy/remote/REMCharacterClassBeanProxy.java
deleted file mode 100644
index 4fc5cf9..0000000
--- a/plugins/org.eclipse.jem.proxy/proxyRemote/org/eclipse/jem/internal/proxy/remote/REMCharacterClassBeanProxy.java
+++ /dev/null
@@ -1,150 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2001, 2005 IBM Corporation and others.
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
- *
- * Contributors:
- * IBM Corporation - initial API and implementation
- *******************************************************************************/
-package org.eclipse.jem.internal.proxy.remote;
-/*
- * $RCSfile: REMCharacterClassBeanProxy.java,v $ $Revision: 1.6 $ $Date: 2005/08/24 20:39:06 $
- */
-
-import org.eclipse.jem.internal.proxy.core.*;
-import org.eclipse.jem.internal.proxy.common.remote.Commands;
-/**
- * IDE Implementation of ICharacterBeanProxy for the Character class. Creation date: (2/6/00
- * 9:02:54 AM) @author: Joe Winchester
- */
-final class REMCharacterClassBeanProxy extends REMConstantBeanProxy implements ICharacterBeanProxy {
- protected Character fCharValue;
-
- /**
- * As well as storing the bean store the char value so that we can return the charValue faster
- * without the need for repeated re-casting. It is package protected because it is created in
- * special way, so no one else should create these.
- *
- * @param aBean
- * java.lang.Object
- */
- REMCharacterClassBeanProxy(REMProxyFactoryRegistry aRegistry, Character value) {
- super(aRegistry);
- fCharValue = value;
- }
-
- /**
- * equals: Equal if: 1) This proxy == (identity) to the other object 2) Else if other is an
- * IBeanProxy and not a constant one, then if equals on the server. 3) If this is a constant
- * proxy and the other is too or is a constant value (e.g. IStringBeanProxy.equals(String),
- * then true if values are equals.
- */
- public boolean equals(Object anObject) {
- if (this == anObject)
- return true; // Identity
- if (anObject instanceof REMCharacterClassBeanProxy)
- return fCharValue.charValue() == ((REMCharacterClassBeanProxy) anObject).charValue();
- if (anObject instanceof Character)
- return fCharValue.charValue() == ((Character) anObject).charValue();
- return false;
- }
-
- /**
- * Return the char value
- */
- public char charValue() {
- return fCharValue.charValue();
- }
- /**
- * Return the java.lang.Character value
- */
- public Character characterValue() {
- return fCharValue;
- }
-
- /**
- * Answer the toString() of the value.
- */
- public String toBeanString() {
- return fCharValue.toString();
- }
-
- /**
- * Get the beantype
- */
- public IBeanTypeProxy getTypeProxy() {
- return ((REMStandardBeanTypeProxyFactory) fFactory.getBeanTypeProxyFactory()).characterClass;
- }
-
- /**
- * Render the bean into value object.
- */
- public void renderBean(Commands.ValueObject value) {
- value.set(fCharValue);
- }
- /*
- * (non-Javadoc)
- *
- * @see org.eclipse.jem.internal.proxy.core.INumberBeanProxy#byteValue()
- */
- public byte byteValue() {
- return (byte) fCharValue.charValue();
- }
-
- /*
- * (non-Javadoc)
- *
- * @see org.eclipse.jem.internal.proxy.core.INumberBeanProxy#doubleValue()
- */
- public double doubleValue() {
- return fCharValue.charValue();
- }
-
- /*
- * (non-Javadoc)
- *
- * @see org.eclipse.jem.internal.proxy.core.INumberBeanProxy#floatValue()
- */
- public float floatValue() {
- return fCharValue.charValue();
- }
-
- /*
- * (non-Javadoc)
- *
- * @see org.eclipse.jem.internal.proxy.core.INumberBeanProxy#intValue()
- */
- public int intValue() {
- return fCharValue.charValue();
- }
-
- /*
- * (non-Javadoc)
- *
- * @see org.eclipse.jem.internal.proxy.core.INumberBeanProxy#longValue()
- */
- public long longValue() {
- return fCharValue.charValue();
- }
-
- /*
- * (non-Javadoc)
- *
- * @see org.eclipse.jem.internal.proxy.core.INumberBeanProxy#numberValue()
- */
- public Number numberValue() {
- return new Integer(charValue()); // Kludge.
- }
-
- /*
- * (non-Javadoc)
- *
- * @see org.eclipse.jem.internal.proxy.core.INumberBeanProxy#shortValue()
- */
- public short shortValue() {
- return (short) fCharValue.charValue();
- }
-
-}
diff --git a/plugins/org.eclipse.jem.proxy/proxyRemote/org/eclipse/jem/internal/proxy/remote/REMCharacterClassBeanTypeProxy.java b/plugins/org.eclipse.jem.proxy/proxyRemote/org/eclipse/jem/internal/proxy/remote/REMCharacterClassBeanTypeProxy.java
deleted file mode 100644
index b3d9ff7..0000000
--- a/plugins/org.eclipse.jem.proxy/proxyRemote/org/eclipse/jem/internal/proxy/remote/REMCharacterClassBeanTypeProxy.java
+++ /dev/null
@@ -1,85 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2001, 2005 IBM Corporation and others.
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
- *
- * Contributors:
- * IBM Corporation - initial API and implementation
- *******************************************************************************/
-package org.eclipse.jem.internal.proxy.remote;
-/*
-
-
- */
-
-
-import org.eclipse.jem.internal.proxy.core.*;
-import org.eclipse.jem.internal.proxy.common.remote.Commands;
-
-/**
- * Character BeanType Proxy for Character.class.
- * Creation date: (2/23/00 1:59:02 PM)
- * @author: Richard Lee Kulp
- */
-final class REMCharacterClassBeanTypeProxy extends REMAbstractBeanTypeProxy implements IREMConstantBeanTypeProxy {
- final REMCharacterClassBeanProxy nilProxy; // Value of '\0'
-
-REMCharacterClassBeanTypeProxy(REMProxyFactoryRegistry aRegistry, IBeanTypeProxy objectType) {
- super(aRegistry, new Integer(Commands.CHARACTER_CLASS), Character.class.getName(), objectType);
-
- nilProxy = new REMCharacterClassBeanProxy(aRegistry, new Character('\0'));
-}
-/**
- * Static helper to create a bean proxy
- * Package protected because everyone should go through the factory API
- * that is defined as part of IBeanProxyFactory
- */
-ICharacterBeanProxy createCharacterBeanProxy(Character aCharacter) {
- return (aCharacter.charValue() != '\0') ?
- new REMCharacterClassBeanProxy(fRegistry, aCharacter) : nilProxy;
-}
-
-/**
- * Create a new bean proxy with the specified id.
- *
- * For all of the primitive wrapper types, this is an invalid operation. They are created
- * explicitly through the appropriate create method.
- */
-public IREMBeanProxy newBeanProxy(Integer anID) {
- throw new UnsupportedOperationException();
-}
-
-/**
- * newBeanTypeForClass: Create a new beantypeproxy of this kind for the given class.
- * This is used by beantype proxy factory when creating a beantype proxy for a subclass.
- * This is because subclasses, unless explicitly overridden, should use the same kind
- * of beantype proxy. This way if anything special is needed for a specific type, then
- * that can be done.
- *
- * For all of the primitive wrapper types, they are final classes, so you can't create a newBeanType
- * for subclasses.
- */
-public IREMBeanTypeProxy newBeanTypeForClass(Integer anID, String aClassname, boolean anAbstract) {
- throw new UnsupportedOperationException();
-}
-
-/**
- * newInstance method. Character doesn't have a default ctor, so the standard way won't work.
- * Return the nilProxy for this case because that is the default value.
- */
-public IBeanProxy newInstance() {
- return nilProxy;
-}
-
-/**
- * Create a new bean proxy the ValueObject passed in.
- * We will assume the object is correct type.
- */
-public IBeanProxy newBeanProxy(Commands.ValueObject value) {
- return createCharacterBeanProxy(new Character(value.aChar));
-}
-}
-
-
diff --git a/plugins/org.eclipse.jem.proxy/proxyRemote/org/eclipse/jem/internal/proxy/remote/REMCharacterTypeBeanProxy.java b/plugins/org.eclipse.jem.proxy/proxyRemote/org/eclipse/jem/internal/proxy/remote/REMCharacterTypeBeanProxy.java
deleted file mode 100644
index 1c8966b..0000000
--- a/plugins/org.eclipse.jem.proxy/proxyRemote/org/eclipse/jem/internal/proxy/remote/REMCharacterTypeBeanProxy.java
+++ /dev/null
@@ -1,155 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2001, 2005 IBM Corporation and others.
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
- *
- * Contributors:
- * IBM Corporation - initial API and implementation
- *******************************************************************************/
-package org.eclipse.jem.internal.proxy.remote;
-/*
- * $RCSfile: REMCharacterTypeBeanProxy.java,v $ $Revision: 1.6 $ $Date: 2005/08/24 20:39:07 $
- */
-
-import org.eclipse.jem.internal.proxy.common.remote.Commands;
-import org.eclipse.jem.internal.proxy.core.*;
-/**
- * Remote implementation of ICharacterBeanProxy. Creation date: (2/6/00 9:02:54 AM) @author: Joe
- * Winchester
- */
-final class REMCharacterTypeBeanProxy extends REMConstantBeanProxy implements ICharacterBeanProxy {
- protected char fChar;
-
- REMCharacterTypeBeanProxy(REMProxyFactoryRegistry aRegistry, char value) {
- super(aRegistry);
- fChar = value;
- }
-
- /**
- * equals: Equal if: 1) This proxy == (identity) to the other object 2) Else if other is an
- * IBeanProxy and not a constant one, then if equals on the server. 3) If this is a constant
- * proxy and the other is too or is a constant value (e.g. IStringBeanProxy.equals(String),
- * then true if values are equals.
- */
- public boolean equals(Object anObject) {
- if (this == anObject)
- return true; // Identity
- if (anObject instanceof REMCharacterTypeBeanProxy)
- return fChar == ((REMCharacterTypeBeanProxy) anObject).charValue();
- if (anObject instanceof Character)
- return fChar == ((Character) anObject).charValue();
- return false;
- }
-
- /*
- * (non-Javadoc)
- *
- * @see org.eclipse.jem.internal.proxy.core.IBeanProxy#sameAs(org.eclipse.jem.internal.proxy.core.IBeanProxy)
- */
- public boolean sameAs(IBeanProxy aBeanProxy) {
- if (this == aBeanProxy)
- return true; // Identity
- if (aBeanProxy instanceof REMCharacterTypeBeanProxy)
- return fChar == ((REMCharacterTypeBeanProxy) aBeanProxy).charValue();
- return false;
- }
-
- /**
- * Return the char value
- */
- public char charValue() {
- return fChar;
- }
- /**
- * Return the java.lang.Character value
- */
- public Character characterValue() {
- return new Character(fChar);
- }
-
- /**
- * Answer the toString() of the value.
- */
- public String toBeanString() {
- return String.valueOf(fChar);
- }
-
- /**
- * Get the beantype
- */
- public IBeanTypeProxy getTypeProxy() {
- return ((REMStandardBeanTypeProxyFactory) fFactory.getBeanTypeProxyFactory()).charType;
- }
-
- /**
- * Render the bean into value object.
- */
- public void renderBean(Commands.ValueObject value) {
- value.set(fChar);
- }
- /*
- * (non-Javadoc)
- *
- * @see org.eclipse.jem.internal.proxy.core.INumberBeanProxy#byteValue()
- */
- public byte byteValue() {
- return (byte) fChar;
- }
-
- /*
- * (non-Javadoc)
- *
- * @see org.eclipse.jem.internal.proxy.core.INumberBeanProxy#doubleValue()
- */
- public double doubleValue() {
- return fChar;
- }
-
- /*
- * (non-Javadoc)
- *
- * @see org.eclipse.jem.internal.proxy.core.INumberBeanProxy#floatValue()
- */
- public float floatValue() {
- return fChar;
- }
-
- /*
- * (non-Javadoc)
- *
- * @see org.eclipse.jem.internal.proxy.core.INumberBeanProxy#intValue()
- */
- public int intValue() {
- return fChar;
- }
-
- /*
- * (non-Javadoc)
- *
- * @see org.eclipse.jem.internal.proxy.core.INumberBeanProxy#longValue()
- */
- public long longValue() {
- return fChar;
- }
-
- /*
- * (non-Javadoc)
- *
- * @see org.eclipse.jem.internal.proxy.core.INumberBeanProxy#numberValue()
- */
- public Number numberValue() {
- return new Integer(fChar); // Kludge
- }
-
- /*
- * (non-Javadoc)
- *
- * @see org.eclipse.jem.internal.proxy.core.INumberBeanProxy#shortValue()
- */
- public short shortValue() {
- return (short) fChar;
- }
-
-}
diff --git a/plugins/org.eclipse.jem.proxy/proxyRemote/org/eclipse/jem/internal/proxy/remote/REMCharacterTypeBeanTypeProxy.java b/plugins/org.eclipse.jem.proxy/proxyRemote/org/eclipse/jem/internal/proxy/remote/REMCharacterTypeBeanTypeProxy.java
deleted file mode 100644
index 2c9f309..0000000
--- a/plugins/org.eclipse.jem.proxy/proxyRemote/org/eclipse/jem/internal/proxy/remote/REMCharacterTypeBeanTypeProxy.java
+++ /dev/null
@@ -1,66 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2001, 2005 IBM Corporation and others.
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
- *
- * Contributors:
- * IBM Corporation - initial API and implementation
- *******************************************************************************/
-package org.eclipse.jem.internal.proxy.remote;
-/*
-
-
- */
-
-
-import org.eclipse.jem.internal.proxy.core.*;
-import org.eclipse.jem.internal.proxy.common.remote.Commands;
-
-/**
- * Character.TYPE BeanType Proxy.
- * Creation date: (2/23/00 1:59:02 PM)
- * @author: Richard Lee Kulp
- */
-final class REMCharacterTypeBeanTypeProxy extends REMPrimitiveBeanTypeProxy {
-
- final REMCharacterTypeBeanProxy nilProxy; // Value of '\0'
-/**
- * REMCharacterBeanTypeProxy constructor comment.
- * @param aClass java.lang.Class
- */
-REMCharacterTypeBeanTypeProxy(REMProxyFactoryRegistry aRegistry) {
- super(aRegistry, new Integer(Commands.CHARACTER_TYPE), Character.TYPE.getName());
-
- nilProxy = new REMCharacterTypeBeanProxy(aRegistry, '\0');
-}
-
-/**
- * Static helper to create a bean proxy
- * Package protected because everyone should go through the factory API
- * that is defined as part of IBeanProxyFactory
- * Use the cache.
- */
-ICharacterBeanProxy createCharacterBeanProxy(char aCharacter) {
- return new REMCharacterTypeBeanProxy(fRegistry, aCharacter);
-}
-
-/**
- * newInstance method. Character doesn't have a default ctor, so the standard way won't work.
- * Return the nilProxy for this case because that is the default value.
- */
-public IBeanProxy newInstance() {
- return nilProxy;
-}
-
-/**
- * Create a new bean proxy the ValueObject passed in.
- * We will assume the object is correct type.
- */
-public IBeanProxy newBeanProxy(Commands.ValueObject value) {
- return createCharacterBeanProxy(value.aChar);
-}
-}
-
-
diff --git a/plugins/org.eclipse.jem.proxy/proxyRemote/org/eclipse/jem/internal/proxy/remote/REMClassBeanTypeProxy.java b/plugins/org.eclipse.jem.proxy/proxyRemote/org/eclipse/jem/internal/proxy/remote/REMClassBeanTypeProxy.java
deleted file mode 100644
index cd8da01..0000000
--- a/plugins/org.eclipse.jem.proxy/proxyRemote/org/eclipse/jem/internal/proxy/remote/REMClassBeanTypeProxy.java
+++ /dev/null
@@ -1,75 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2001, 2005 IBM Corporation and others.
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
- *
- * Contributors:
- * IBM Corporation - initial API and implementation
- *******************************************************************************/
-package org.eclipse.jem.internal.proxy.remote;
-/*
-
-
- */
-
-
-import org.eclipse.jem.internal.proxy.core.*;
-import org.eclipse.jem.internal.proxy.common.remote.Commands;
-/**
- * This is a bean type for the Class object. It is needed so that
- * when a new object id comes in that represents a class, it will
- * go through this bean type to create it. We need to do something
- * special so that the correct bean type object is created.
- */
-
-final class REMClassBeanTypeProxy extends REMAbstractBeanTypeProxy {
-
-
-REMClassBeanTypeProxy(REMProxyFactoryRegistry aRegistry, IBeanTypeProxy objectType) {
- super(aRegistry, new Integer(Commands.CLASS_CLASS), Class.class.getName(), objectType);
-}
-
-/**
- * Note: Since new instances of Class are never done through a default ctor,
- * this function is not supported.
- */
-public IBeanProxy newInstance() {
- throw new UnsupportedOperationException();
-}
-
-/**
- * Note: Since new instances of Class are never done through a initialization strings,
- * this function is not supported.
- */
-public IBeanProxy newInstance(String initializationString) {
- throw new UnsupportedOperationException();
-}
-
-/**
- * newBeanTypeForClass: Create a new beantypeproxy of this kind for the given class.
- * This is used by beantype proxy factory when creating a beantype proxy for a subclass.
- * This is because subclasses, unless explicitly overridden, should use the same kind
- * of beantype proxy. This way if anything special is needed for a specific type, then
- * that can be done.
- *
- * NOTE: Since the Class type is final, this function isn't supported.
- */
-public IREMBeanTypeProxy newBeanTypeForClass(Integer anID, String aClassname, boolean anAbstract) {
- throw new UnsupportedOperationException();
-}
-
-/**
- * Create a new bean proxy with the specified id.
- *
- * In this case it means we need a new IBeanProxyType. We will let the
- * Beantype factory handle this since it knows how to get the information
- * for a specific id.
- */
-public IREMBeanProxy newBeanProxy(Integer anID) {
- return ((REMStandardBeanTypeProxyFactory) fRegistry.getBeanTypeProxyFactory()).createBeanTypeProxy(anID);
-}
-
-
-}
diff --git a/plugins/org.eclipse.jem.proxy/proxyRemote/org/eclipse/jem/internal/proxy/remote/REMConnection.java b/plugins/org.eclipse.jem.proxy/proxyRemote/org/eclipse/jem/internal/proxy/remote/REMConnection.java
deleted file mode 100644
index d37e800..0000000
--- a/plugins/org.eclipse.jem.proxy/proxyRemote/org/eclipse/jem/internal/proxy/remote/REMConnection.java
+++ /dev/null
@@ -1,342 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2001, 2005 IBM Corporation and others.
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
- *
- * Contributors:
- * IBM Corporation - initial API and implementation
- *******************************************************************************/
-package org.eclipse.jem.internal.proxy.remote;
-/*
-
-
- */
-
-
-import java.io.*;
-import java.net.Socket;
-
-import org.eclipse.core.runtime.IStatus;
-import org.eclipse.core.runtime.Status;
-
-import org.eclipse.jem.internal.proxy.common.CommandException;
-import org.eclipse.jem.internal.proxy.common.remote.*;
-import org.eclipse.jem.internal.proxy.common.remote.Commands.*;
-import org.eclipse.jem.internal.proxy.core.ProxyPlugin;
-import org.eclipse.jem.util.TimerTests;
-/**
- * The default implementation of the connection.
- *
- * It uses the property "proxyvm.bufsize" to determine the buffer size to use. If not specified, it uses the system default
- */
-public class REMConnection implements IREMConnection, IREMExpressionConnection {
-
- public final static String INVOKE_STEP = "Invoke"; //$NON-NLS-1$
- public final static String INVOKE_METHOD_STEP = "Invoke Method"; //$NON-NLS-1$
- protected Socket fSocket = null;
- protected DataInputStream in = null;
- protected DataOutputStream out = null;
- private static final int TIME_OUT = 1000 * 60; // Wait up to a minute before timeout.
-
- public REMConnection(Socket socket, boolean noTimeouts) {
- try {
- fSocket = socket;
- fSocket.setSoLinger(true, 30); // Wait 30 seconds if necessary for the final stuff to go out after closing.
- if (!noTimeouts)
- fSocket.setSoTimeout(TIME_OUT); // Timeout period
- Integer bufSize = Integer.getInteger("proxyvm.bufsize"); //$NON-NLS-1$
- if (bufSize == null)
- bufSize = new Integer(16000);
- out = new DataOutputStream(new BufferedOutputStream(fSocket.getOutputStream(), bufSize.intValue())); // It didn't take the hint, so we will buffer it.
- in = new DataInputStream(new BufferedInputStream(fSocket.getInputStream(), bufSize.intValue())); // It didn't take the hint, so we will buffer it.
- } catch (IOException e) {
- ProxyPlugin.getPlugin().getLogger().log(new Status(IStatus.ERROR, ProxyPlugin.getPlugin().getBundle().getSymbolicName(), 0, "", e)); //$NON-NLS-1$
-
- if (out != null)
- try {
- out.close();
- } catch (IOException e2) {
- }
- if (in != null)
- try {
- in.close();
- } catch (IOException e3) {
- }
- try {
- fSocket.close();
- } catch (IOException e4) {
- }
- fSocket = null;
- in = null;
- out = null;
- }
- }
-
- /**
- * Did this construct correctly.
- * This is needed because an exception could be thrown in the ctor and
- * that's not a good thing to do.
- */
- public boolean isConnected() {
- return fSocket != null;
- }
-
- /**
- * Terminate the server.
- */
- public void terminateServer() {
- if (isConnected()) {
- try {
- Commands.sendTerminateCommand(out);
- } catch (IOException e) {
- }
- close();
- }
- }
-
- /**
- * Close the connection.
- */
- public void close() {
- if (isConnected()) {
- try {
- Commands.sendQuitCommand(out);
- } catch (IOException e) {
- } finally {
- try {
- out.close();
- } catch (IOException e2) {
- }
- try {
- in.close();
- } catch (IOException e3) {
- }
- try {
- fSocket.close();
- } catch (IOException e4) {
- }
- }
- fSocket = null;
- in = null;
- out = null;
- }
- }
-
-
- /**
- * Return the class information.
- */
- public GetClassReturn getClass(String className) throws CommandException {
- if (isConnected())
- try {
- // It's simple, just pass onto Commands.
- return Commands.sendGetClassCommand(out, in, className);
- } catch (CommandErrorException e) {
- if (e.getErrorCode() != Commands.GET_CLASS_NOT_FOUND)
- throw e; // Not class not found, send it on
- }
- return null; // Not found, so return null
- }
-
-
- /**
- * Return the class information given an ID.
- */
- public GetClassIDReturn getClassFromID(int classID) throws CommandException {
- if (isConnected()) {
- // It's simple, just pass onto Commands.
- return Commands.sendGetClassFromIDCommand(out, in, classID);
- }
- return null; // Not found, so return null
- }
-
- /**
- * Get the object data from an id.
- */
- public void getObjectData(int classID, Commands.ValueObject valueReturn) throws CommandException {
- if (isConnected()) {
- // Just pass onto Commands.
- Commands.sendGetObjectData(out, in, classID, valueReturn);
- } else
- valueReturn.set(); // Set it to null since we aren't connected.
- }
-
- /**
- * Get a new instance using an init string
- */
- public void getNewInstance(int classID, String initString, Commands.ValueObject newInstance) throws CommandException {
- if (isConnected()) {
- // Just pass onto Commands.
- Commands.sendNewInstance(out, in, classID, initString, newInstance);
- } else
- newInstance.set(); // Set it to null since we aren't connected.
- }
-
- /**
- * Release the id.
- */
- public void releaseID(int id){
- if (isConnected())
- try {
- // Just pass onto Commands.
- Commands.releaseObjectCommand(out, id);
- } catch (IOException e) {
- // Don't care it didn't work
- }
- }
-
- /*
- * (non-Javadoc)
- * @see org.eclipse.jem.internal.proxy.remote.IREMConnection#getArrayContents(int, org.eclipse.jem.internal.proxy.common.remote.Commands.ValueObject)
- */
- public void getArrayContents(int arrayID, Commands.ValueObject returnValue) throws CommandException {
- if (isConnected()) {
- // It's simple, just pass onto Commands.
- Commands.sendGetArrayContentsCommand(out, in, arrayID, returnValue);
- }
- }
-
- /**
- * Invoke the method call
- */
- public void invokeMethod(int methodID, Commands.ValueObject invokeOn, Commands.ValueObject parms, Commands.ValueObject returnValue) throws CommandException {
- if (isConnected()) {
- // It's simple, just pass onto Commands.
- TimerTests.basicTest.startCumulativeStep(INVOKE_METHOD_STEP);
- Commands.sendInvokeMethodCommand(out, in, methodID, invokeOn, parms, returnValue);
- TimerTests.basicTest.stopCumulativeStep(INVOKE_METHOD_STEP);
- }
- }
-
- /* (non-Javadoc)
- * @see org.eclipse.jem.internal.proxy.remote.IREMConnection#invokeMethod(org.eclipse.jem.internal.proxy.common.remote.Commands.ValueObject, java.lang.String, org.eclipse.jem.internal.proxy.common.remote.Commands.ValueObject, org.eclipse.jem.internal.proxy.common.remote.Commands.ValueObject, org.eclipse.jem.internal.proxy.common.remote.Commands.ValueObject, org.eclipse.jem.internal.proxy.common.remote.Commands.ValueObject)
- */
- public void invokeMethod(ValueObject classType, String methodName, ValueObject parmTypes, ValueObject invokeOn, ValueObject parms,
- ValueObject returnValue) throws CommandException {
- if (isConnected()) {
- // It's simple, just pass onto Commands.
- TimerTests.basicTest.startCumulativeStep(INVOKE_STEP);
- Commands.sendInvokeMethodCommand(out, in, classType, methodName, parmTypes, invokeOn, parms, returnValue);
- TimerTests.basicTest.stopCumulativeStep(INVOKE_STEP);
- }
- }
-
- /* ************************************************************
- * Put the Expression processing commands here.
- *
- * ************************************************************/
-
- /* (non-Javadoc)
- * @see org.eclipse.jem.internal.proxy.remote.IREMExpressionConnection#startExpressionProcessing()
- */
- public void startExpressionProcessing(int expressionID, byte trace) throws IOException {
- if (isConnected())
- ExpressionCommands.sendStartExpressionProcessingCommand(expressionID, trace, out);
- }
-
- /* (non-Javadoc)
- * @see org.eclipse.jem.internal.proxy.remote.IREMExpressionConnection#pushExpressionCommand(byte)
- */
- public void pushExpressionCommand(int expressionID, byte subcommand) throws IOException {
- if (isConnected())
- ExpressionCommands.sendExpressionCommand(expressionID, out, subcommand);
- }
-
- /* (non-Javadoc)
- * @see org.eclipse.jem.internal.proxy.remote.IREMExpressionConnection#stopExpressionProcessing()
- */
- public void stopExpressionProcessing(int expressionID) throws IOException {
- if (isConnected())
- ExpressionCommands.sendEndExpressionProcessingCommand(expressionID, out);
- }
-
- /* (non-Javadoc)
- * @see org.eclipse.jem.internal.proxy.remote.IREMExpressionConnection#pushValueObject(org.eclipse.jem.internal.proxy.common.remote.Commands.ValueObject)
- */
- public void pushValueObject(ValueObject valueObject) throws CommandException {
- if (isConnected())
- Commands.writeValue(out, valueObject, false);
- }
-
- /* (non-Javadoc)
- * @see org.eclipse.jem.internal.proxy.remote.IREMExpressionConnection#pushByte(byte)
- */
- public void pushByte(byte abyte) throws IOException {
- if (isConnected())
- ExpressionCommands.sendByte(out, abyte);
- }
-
- /* (non-Javadoc)
- * @see org.eclipse.jem.internal.proxy.remote.IREMExpressionConnection#pushInt(int)
- */
- public void pushInt(int anInt) throws IOException {
- if (isConnected())
- ExpressionCommands.sendInt(out, anInt);
- }
-
- /* (non-Javadoc)
- * @see org.eclipse.jem.internal.proxy.remote.IREMExpressionConnection#pushString(java.lang.String)
- */
- public void pushString(String aString) throws IOException {
- if (isConnected())
- ExpressionCommands.sendString(out, aString);
- }
-
- /* (non-Javadoc)
- * @see org.eclipse.jem.internal.proxy.remote.IREMExpressionConnection#pushBoolean(boolean)
- */
- public void pushBoolean(boolean aBool) throws IOException {
- if (isConnected())
- ExpressionCommands.sendBoolean(out, aBool);
- }
-
-
-
- /* (non-Javadoc)
- * @see org.eclipse.jem.internal.proxy.remote.IREMExpressionConnection#getFinalValue(org.eclipse.jem.internal.proxy.common.remote.Commands.ValueObject)
- */
- public void getFinalValue(ValueObject result) throws CommandException {
- if (isConnected())
- Commands.readBackValue(in, result, Commands.NO_TYPE_CHECK);
- }
-
- /*
- * (non-Javadoc)
- * @see org.eclipse.jem.internal.proxy.remote.IREMExpressionConnection#pullValue(int, org.eclipse.jem.internal.proxy.common.remote.Commands.ValueObject)
- */
- public void pullValue(int expressionID, ValueObject proxyids, ValueSender sender) throws CommandException {
- if (isConnected())
- ExpressionCommands.sendPullValueCommand(expressionID, out, in, proxyids, sender);
- }
-
- /*
- * (non-Javadoc)
- * @see org.eclipse.jem.internal.proxy.remote.IREMExpressionConnection#sync(int, org.eclipse.jem.internal.proxy.common.remote.Commands.ValueObject)
- */
- public void sync(int expressionID, ValueObject proxyids, ValueSender sender) throws CommandException {
- if (isConnected())
- ExpressionCommands.sendSyncCommand(expressionID, out, in, proxyids, sender);
- }
-
- /*
- * (non-Javadoc)
- * @see org.eclipse.jem.internal.proxy.remote.IREMConnection#readProxyArrayValues(org.eclipse.jem.internal.proxy.common.remote.Commands.ValueObject, org.eclipse.jem.internal.proxy.common.remote.Commands.ValueSender, boolean)
- */
- public void readProxyArrayValues(Commands.ValueObject returnValue, Commands.ValueSender valueSender, boolean allowFlag) throws CommandException {
- if (isConnected())
- Commands.readArray(in, returnValue.anInt, valueSender, returnValue, allowFlag);
- }
-
- public void transferExpression(int expressionID, ValueObject expController) throws CommandException {
- if (isConnected())
- ExpressionCommands.sendTransferExpressionCommand(expressionID, out, in, expController);
- }
-
- public void resumeExpression(int expressionID, ValueObject expController) throws CommandException {
- if (isConnected())
- ExpressionCommands.sendResumeExpressionCommand(expressionID, out, expController);
- }
-
-}
diff --git a/plugins/org.eclipse.jem.proxy/proxyRemote/org/eclipse/jem/internal/proxy/remote/REMConstantBeanProxy.java b/plugins/org.eclipse.jem.proxy/proxyRemote/org/eclipse/jem/internal/proxy/remote/REMConstantBeanProxy.java
deleted file mode 100644
index 7742b5b..0000000
--- a/plugins/org.eclipse.jem.proxy/proxyRemote/org/eclipse/jem/internal/proxy/remote/REMConstantBeanProxy.java
+++ /dev/null
@@ -1,100 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2001, 2005 IBM Corporation and others.
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
- *
- * Contributors:
- * IBM Corporation - initial API and implementation
- *******************************************************************************/
-package org.eclipse.jem.internal.proxy.remote;
-/*
-
-
- */
-
-
-import org.eclipse.jem.internal.proxy.common.remote.Commands;
-import org.eclipse.jem.internal.proxy.core.IBeanProxy;
-import org.eclipse.jem.internal.proxy.core.ProxyFactoryRegistry;
-/**
- * This is a base for bean proxies that are constants and
- * do not have an object on the remote VM side. They are
- * shipped back and forth by value.
- */
-
-public abstract class REMConstantBeanProxy implements IREMConstantBeanProxy {
- protected final REMProxyFactoryRegistry fFactory;
- private final static Integer ID = new Integer(Commands.NOT_AN_ID);
-
- protected REMConstantBeanProxy(REMProxyFactoryRegistry aFactory) {
- fFactory = aFactory;
- }
- /**
- * Return the registry this proxy was created with.
- */
- public ProxyFactoryRegistry getProxyFactoryRegistry() {
- return fFactory;
- }
-
- /**
- * equals: Equal if:
- * 1) This proxy == (identity) to the other object
- * 2) Else if other is an IBeanProxy and not a constant one, then if
- * equals on the server.
- * 3) If this is a constant proxy and the other is too or is a constant
- * value (e.g. IStringBeanProxy.equals(String), then true if values are equals.
- * This is abstract because each type needs to do a unique test for equality.
- */
- public abstract boolean equals(Object anObject);
-
- /* (non-Javadoc)
- * @see org.eclipse.jem.internal.proxy.core.IBeanProxy#sameAs(org.eclipse.jem.internal.proxy.core.IBeanProxy)
- */
- public boolean sameAs(IBeanProxy aBeanProxy) {
- // We can't be assured that there are not non-identical constants that are actually identical.
- // This is because for constants we do not know the id of the original. That is not sent across from the vm.
- return this == aBeanProxy;
- }
-
- /**
- * Return the ID of this proxy.
- * Constants have no id's, so we return -1.
- */
- public Integer getID() {
- return ID;
- }
-
- /**
- * isValid. Constant ones are always valid unless the registry is terminated, except if an
- * override releases resources. In that case the overriding
- * subclass should also override isValid() to return false
- * if release() was called.
- */
- public boolean isValid() {
- return fFactory.isValid();
- }
-
- /**
- * release. Constant ones don't need to typically be released, however
- * if an override does do something to release, then it MUST also
- * override isValid() to return false.
- */
- public void release() {
- }
-
-
- /* (non-Javadoc)
- * @see org.eclipse.jem.internal.proxy.core.IProxy#isBeanProxy()
- */
- public final boolean isBeanProxy() {
- return true;
- }
- /* (non-Javadoc)
- * @see org.eclipse.jem.internal.proxy.core.IProxy#isExpressionProxy()
- */
- public final boolean isExpressionProxy() {
- return false;
- }
-}
diff --git a/plugins/org.eclipse.jem.proxy/proxyRemote/org/eclipse/jem/internal/proxy/remote/REMConstructorProxy.java b/plugins/org.eclipse.jem.proxy/proxyRemote/org/eclipse/jem/internal/proxy/remote/REMConstructorProxy.java
deleted file mode 100644
index 555670a..0000000
--- a/plugins/org.eclipse.jem.proxy/proxyRemote/org/eclipse/jem/internal/proxy/remote/REMConstructorProxy.java
+++ /dev/null
@@ -1,109 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2001, 2005 IBM Corporation and others.
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
- *
- * Contributors:
- * IBM Corporation - initial API and implementation
- *******************************************************************************/
-package org.eclipse.jem.internal.proxy.remote;
-/*
-
-
- */
-
-import org.eclipse.core.runtime.IStatus;
-import org.eclipse.core.runtime.Status;
-
-import org.eclipse.jem.internal.proxy.common.remote.Commands;
-import org.eclipse.jem.internal.proxy.common.remote.TransmitableArray;
-import org.eclipse.jem.internal.proxy.core.*;
-/**
- * Proxy for a constructor.
- */
-
-final class REMConstructorProxy extends REMAccessibleObjectProxy implements IConstructorProxy {
-
- REMConstructorProxy(REMProxyFactoryRegistry aRegistry, Integer anID) {
- super(aRegistry, anID);
- }
-
- /**
- * Using this constructor (assuming it takes no arguments) create a new instance.
- * Exception will be raised if this constructor takes arguments.
- */
- public IBeanProxy newInstance() throws ThrowableProxy {
- return newInstance(null);
- }
-
- /**
- * The type proxy is constant proxy out of the method factory.
- */
- public IBeanTypeProxy getTypeProxy() {
- return ((REMMethodProxyFactory) fFactory.getMethodProxyFactory()).ctorType;
- }
-
- /**
- * Using this constructor (with the arguments) create a new instance.
- * Exception will be raised if arguments don't match the constructor.
- */
- public IBeanProxy newInstance(IBeanProxy[] creationArguments) throws ThrowableProxy {
- IREMMethodProxy newInstanceMethod =
- (IREMMethodProxy) REMStandardBeanProxyConstants.getConstants(fFactory).getConstructorNewInstance();
-
- // Constructor.newInstance takes one parm (Object[]) where [0] is an Object[] of the arguments to the constructor.
- Object[] parms = null;
- if (creationArguments != null)
- parms = new Object[] { new TransmitableArray(Commands.OBJECT_CLASS, creationArguments)};
-
- return newInstanceMethod.invokeWithParms(this, parms);
- }
- public IBeanProxy newInstanceCatchThrowableExceptions() {
- try {
- return newInstance();
- } catch (ThrowableProxy e) {
- ProxyPlugin.getPlugin().getLogger().log(new Status(IStatus.WARNING, ProxyPlugin.getPlugin().getBundle().getSymbolicName(), 0, "", e)); //$NON-NLS-1$
- fFactory.releaseProxy(e); // Since it's no longer needed, get rid of now instead of GC time.
- return null;
- }
- }
- public IBeanProxy newInstanceCatchThrowableExceptions(IBeanProxy[] args) {
- try {
- return newInstance(args);
- } catch (ThrowableProxy e) {
- ProxyPlugin.getPlugin().getLogger().log(new Status(IStatus.WARNING, ProxyPlugin.getPlugin().getBundle().getSymbolicName(), 0, "", e)); //$NON-NLS-1$
- fFactory.releaseProxy(e); // Since it's no longer needed, get rid of now instead of GC time.
- return null;
- }
- }
-
- private IBeanTypeProxy[] fParameterTypes;
-
- /*
- * (non-Javadoc)
- * @see org.eclipse.jem.internal.proxy.core.IConstructorProxy#getParameterTypes()
- */
- public synchronized IBeanTypeProxy[] getParameterTypes() {
- if (fParameterTypes == null) {
- IArrayBeanProxy parmTypes = (IArrayBeanProxy) REMStandardBeanProxyConstants.getConstants(fFactory)
- .getConstructorParameterTypesMessage().invokeCatchThrowableExceptions(this);
- if (parmTypes == null)
- fParameterTypes = new IBeanTypeProxy[0]; // There was some error, only way null is returned
- else {
- int len = parmTypes.getLength();
- fParameterTypes = new IBeanTypeProxy[len];
- for (int i = 0; i < len; i++)
- try {
- fParameterTypes[i] = (IBeanTypeProxy) parmTypes.get(i);
- } catch (ThrowableProxy e) {
- }
- fFactory.releaseProxy(parmTypes); // Don't need the array on the server anymore.
- }
- }
-
- return fParameterTypes;
- }
-
-}
diff --git a/plugins/org.eclipse.jem.proxy/proxyRemote/org/eclipse/jem/internal/proxy/remote/REMConstructorTypeProxy.java b/plugins/org.eclipse.jem.proxy/proxyRemote/org/eclipse/jem/internal/proxy/remote/REMConstructorTypeProxy.java
deleted file mode 100644
index 831ab28..0000000
--- a/plugins/org.eclipse.jem.proxy/proxyRemote/org/eclipse/jem/internal/proxy/remote/REMConstructorTypeProxy.java
+++ /dev/null
@@ -1,67 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2001, 2005 IBM Corporation and others.
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
- *
- * Contributors:
- * IBM Corporation - initial API and implementation
- *******************************************************************************/
-package org.eclipse.jem.internal.proxy.remote;
-/*
-
-
- */
-
-
-import org.eclipse.jem.internal.proxy.core.*;
-import org.eclipse.jem.internal.proxy.common.remote.Commands;
-/**
- * BeanType Proxy for Method class.
- */
-
-final class REMConstructorTypeProxy extends REMAbstractBeanTypeProxy {
-
-REMConstructorTypeProxy(REMProxyFactoryRegistry aRegistry, IBeanTypeProxy accessibleTypeProxy) {
- super(aRegistry, new Integer(Commands.CONSTRUCTOR_CLASS), java.lang.reflect.Constructor.class.getName(), accessibleTypeProxy);
-}
-
-/**
- * newBeanTypeForClass: Create a new beantypeproxy of this kind for the given class.
- * This is used by beantype proxy factory when creating a beantype proxy for a subclass.
- * This is because subclasses, unless explicitly overridden, should use the same kind
- * of beantype proxy. This way if anything special is needed for a specific type, then
- * that can be done.
- *
- * For all of the accessible object types, they are final classes, so you can't create a newBeanType
- * for subclasses.
- */
-public IREMBeanTypeProxy newBeanTypeForClass(Integer anID, String aClassname, boolean anAbstract) {
- throw new UnsupportedOperationException();
-}
-
-/**
- * Specialized from REMAbstractBeanTypeProxy to ensure Constructor proxies are created correctly.
- */
-public IREMBeanProxy newBeanProxy(Integer objectID) {
- return new REMConstructorProxy(fRegistry, objectID);
-}
-
-/**
- * Note: Since new instances of Constructor are never done through a default ctor,
- * this function is not supported.
- */
-public IBeanProxy newInstance() {
- throw new UnsupportedOperationException();
-}
-
-/**
- * Note: Since new instances of Constructor are never done through an initialization string,
- * this function is not supported.
- */
-public IBeanProxy newInstance(String initializationString) {
- throw new UnsupportedOperationException();
-}
-
-}
diff --git a/plugins/org.eclipse.jem.proxy/proxyRemote/org/eclipse/jem/internal/proxy/remote/REMDoubleClassBeanProxy.java b/plugins/org.eclipse.jem.proxy/proxyRemote/org/eclipse/jem/internal/proxy/remote/REMDoubleClassBeanProxy.java
deleted file mode 100644
index 1b124dc..0000000
--- a/plugins/org.eclipse.jem.proxy/proxyRemote/org/eclipse/jem/internal/proxy/remote/REMDoubleClassBeanProxy.java
+++ /dev/null
@@ -1,44 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2001, 2005 IBM Corporation and others.
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
- *
- * Contributors:
- * IBM Corporation - initial API and implementation
- *******************************************************************************/
-package org.eclipse.jem.internal.proxy.remote;
-/*
-
-
- */
-
-
-import org.eclipse.jem.internal.proxy.core.*;
-import org.eclipse.jem.internal.proxy.common.remote.Commands;
-/**
- * Remote Proxy for Double.class.
- */
-class REMDoubleClassBeanProxy extends REMNumberBeanProxy {
-
-REMDoubleClassBeanProxy(REMProxyFactoryRegistry aRegistry, Double aDouble) {
- super(aRegistry, aDouble);
-}
-
-/**
- * Get the beantype
- */
-public IBeanTypeProxy getTypeProxy() {
- return ((REMStandardBeanTypeProxyFactory) fFactory.getBeanTypeProxyFactory()).doubleClass;
-}
-
-/**
- * Render the bean into value object.
- */
-public void renderBean(Commands.ValueObject value) {
- value.set((Double) numberValue());
-}
-}
-
-
diff --git a/plugins/org.eclipse.jem.proxy/proxyRemote/org/eclipse/jem/internal/proxy/remote/REMDoubleClassBeanTypeProxy.java b/plugins/org.eclipse.jem.proxy/proxyRemote/org/eclipse/jem/internal/proxy/remote/REMDoubleClassBeanTypeProxy.java
deleted file mode 100644
index 1f316f7..0000000
--- a/plugins/org.eclipse.jem.proxy/proxyRemote/org/eclipse/jem/internal/proxy/remote/REMDoubleClassBeanTypeProxy.java
+++ /dev/null
@@ -1,73 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2001, 2005 IBM Corporation and others.
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
- *
- * Contributors:
- * IBM Corporation - initial API and implementation
- *******************************************************************************/
-package org.eclipse.jem.internal.proxy.remote;
-/*
-
-
- */
-
-
-import org.eclipse.jem.internal.proxy.core.*;
-import org.eclipse.jem.internal.proxy.common.remote.Commands;
-/**
- * Remote Implementation of IBeanTypeProxy for Double.class.
- * Creation date: (2/6/00 9:01:40 AM)
- * @author: Joe Winchester
- */
-final class REMDoubleClassBeanTypeProxy extends REMAbstractNumberBeanTypeProxy {
-// Some values are cache'd for speed
- private final INumberBeanProxy zeroProxy;
-/**
- * REMIntegerBeanTypeProxy constructor comment.
- * @param aClass java.lang.Class
- */
-REMDoubleClassBeanTypeProxy(REMProxyFactoryRegistry aRegistry, IBeanTypeProxy numberType) {
- super(aRegistry, new Integer(Commands.DOUBLE_CLASS), Double.class.getName(), numberType);
-
- // Create the cached values
- zeroProxy = new REMDoubleClassBeanProxy(aRegistry, new Double(0D));
-}
-
-/**
- * Helper to create a bean proxy
- * Package protected because everyone should go through the factory API
- * that is defined as part of IBeanProxyFactory
- */
-INumberBeanProxy createDoubleBeanProxy(Double aDouble) {
- return (aDouble.doubleValue() != 0D) ?
- new REMDoubleClassBeanProxy(fRegistry, aDouble) : zeroProxy;
-}
-
-/**
- * Generic way to create an Double proxy, however, the Number must be a Double.
- */
-protected INumberBeanProxy createNumberBeanProxy(Number aNumber) {
- return createDoubleBeanProxy((Double) aNumber);
-}
-
-/**
- * newInstance method. Number's don't have a default ctor, so the standard way won't work.
- * Return the zero proxy for this case.
- */
-public IBeanProxy newInstance() {
- return zeroProxy;
-}
-
-/**
- * Create a new bean proxy the ValueObject passed in.
- * We will assume the object is correct type.
- */
-public IBeanProxy newBeanProxy(Commands.ValueObject value) {
- return createDoubleBeanProxy(new Double(value.aDouble));
-}
-}
-
-
diff --git a/plugins/org.eclipse.jem.proxy/proxyRemote/org/eclipse/jem/internal/proxy/remote/REMDoubleTypeBeanProxy.java b/plugins/org.eclipse.jem.proxy/proxyRemote/org/eclipse/jem/internal/proxy/remote/REMDoubleTypeBeanProxy.java
deleted file mode 100644
index 90f075c..0000000
--- a/plugins/org.eclipse.jem.proxy/proxyRemote/org/eclipse/jem/internal/proxy/remote/REMDoubleTypeBeanProxy.java
+++ /dev/null
@@ -1,133 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2001, 2005 IBM Corporation and others.
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
- *
- * Contributors:
- * IBM Corporation - initial API and implementation
- *******************************************************************************/
-package org.eclipse.jem.internal.proxy.remote;
-/*
-
-
- */
-
-
-import org.eclipse.jem.internal.proxy.common.remote.Commands;
-import org.eclipse.jem.internal.proxy.core.*;
-/**
- * Remote Implementation of INumberProxy for the primitive "double".
- * It can answer all of the primitive number types (int, long, short, byte, double, float).
- * Creation date: (2/6/00 9:02:54 AM)
- * @author: Joe Winchester
- */
-class REMDoubleTypeBeanProxy extends REMConstantBeanProxy implements INumberBeanProxy {
- private final double fDouble;
-
-/**
- * It is package protected because they are created
- * in a special way and no one else should create them.
- * @param aBean java.lang.Object
- */
-REMDoubleTypeBeanProxy(REMProxyFactoryRegistry aRegistry, double aDouble) {
- super(aRegistry);
- fDouble = aDouble;
-}
-
-/**
- * equals: Equal if:
- * 1) This proxy == (identity) to the other object
- * 2) Else if other is an IBeanProxy and not a constant one, then if
- * equals on the server.
- * 3) If this is a constant proxy and the other is too or is a constant
- * value (e.g. IStringBeanProxy.equals(String), then true if values are equals.
- */
-public boolean equals(Object anObject) {
- if (this == anObject)
- return true; // Identity
- if (anObject instanceof REMDoubleTypeBeanProxy)
- return fDouble == ((REMDoubleTypeBeanProxy) anObject).doubleValue();
- if (anObject instanceof Double)
- return fDouble == ((Double) anObject).doubleValue();
- return false;
-}
-
-/* (non-Javadoc)
- * @see org.eclipse.jem.internal.proxy.core.IBeanProxy#sameAs(org.eclipse.jem.internal.proxy.core.IBeanProxy)
- */
-public boolean sameAs(IBeanProxy aBeanProxy) {
- if (this == aBeanProxy)
- return true; // Identity
- if (aBeanProxy instanceof REMDoubleTypeBeanProxy)
- return fDouble == ((REMDoubleTypeBeanProxy) aBeanProxy).doubleValue();
- return false;
-}
-
-/**
- * byteValue method comment.
- */
-public byte byteValue() {
- return (byte) fDouble;
-}
-/**
- * doubleValue method comment.
- */
-public double doubleValue() {
- return fDouble;
-}
-/**
- * floatValue method comment.
- */
-public float floatValue() {
- return (float) fDouble;
-}
-/**
- * Return the int value
- */
-public int intValue() {
- return (int) fDouble;
-}
-/**
- * longValue method comment.
- */
-public long longValue() {
- return (long) fDouble;
-}
-/**
- * numberValue method comment.
- */
-public Number numberValue() {
- return new Double(fDouble);
-}
-/**
- * shortValue method comment.
- */
-public short shortValue() {
- return (short) fDouble;
-}
-
-/**
- * The bean's toString.
- */
-public String toBeanString() {
- return String.valueOf(fDouble);
-}
-
-/**
- * Get the beantype
- */
-public IBeanTypeProxy getTypeProxy() {
- return ((REMStandardBeanTypeProxyFactory) fFactory.getBeanTypeProxyFactory()).doubleType;
-}
-
-/**
- * Render the bean into value object.
- */
-public void renderBean(Commands.ValueObject value) {
- value.set(fDouble);
-}
-}
-
-
diff --git a/plugins/org.eclipse.jem.proxy/proxyRemote/org/eclipse/jem/internal/proxy/remote/REMDoubleTypeBeanTypeProxy.java b/plugins/org.eclipse.jem.proxy/proxyRemote/org/eclipse/jem/internal/proxy/remote/REMDoubleTypeBeanTypeProxy.java
deleted file mode 100644
index aa17f7d..0000000
--- a/plugins/org.eclipse.jem.proxy/proxyRemote/org/eclipse/jem/internal/proxy/remote/REMDoubleTypeBeanTypeProxy.java
+++ /dev/null
@@ -1,98 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2001, 2005 IBM Corporation and others.
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
- *
- * Contributors:
- * IBM Corporation - initial API and implementation
- *******************************************************************************/
-package org.eclipse.jem.internal.proxy.remote;
-/*
-
-
- */
-
-
-import org.eclipse.jem.internal.proxy.core.*;
-import org.eclipse.jem.internal.proxy.common.remote.Commands;
-/**
- * Remote Implementation of IBeanTypeProxy for Double.TYPE
- * Creation date: (2/6/00 9:01:40 AM)
- * @author: Joe Winchester
- */
-final class REMDoubleTypeBeanTypeProxy extends REMPrimitiveBeanTypeProxy {
-// Some values are cache'd for speed
- private final INumberBeanProxy zeroProxy;
-/**
- * REMIntegerBeanTypeProxy constructor comment.
- * @param aClass java.lang.Class
- */
-REMDoubleTypeBeanTypeProxy(REMProxyFactoryRegistry aRegistry) {
- super(aRegistry, new Integer(Commands.DOUBLE_TYPE), Double.TYPE.getName());
-
- // Create the cached values
- zeroProxy = new REMDoubleTypeBeanProxy(aRegistry, 0D);
-}
-
-/**
- * Helper to create a bean proxy
- * Package protected because everyone should go through the factory API
- * that is defined as part of IBeanProxyFactory
- */
-INumberBeanProxy createDoubleBeanProxy(double aDouble) {
- return (aDouble != 0D) ?
- new REMDoubleTypeBeanProxy(fRegistry, aDouble) : zeroProxy;
-}
-
-/**
- * newInstance method. double is a primitive, so the standard way won't work.
- * Return the zeroProxy for this case because that is the default value.
- */
-public IBeanProxy newInstance() {
- return zeroProxy;
-}
-
-/**
- * Create a new bean proxy the ValueObject passed in.
- * We will assume the object is correct type.
- */
-public IBeanProxy newBeanProxy(Commands.ValueObject value) {
- return createDoubleBeanProxy(value.aDouble);
-}
-
-/**
- * Short cut for newInstance where the string follows the
- * specific pattern we expect. That way it won't be necessary to ship over to the vm
- * to process it.
- *
- * The pattern it can accept is:
- * 1) (double) validNumber - number can be any number because (double) explicitly casts it down.
- * 2) validNumber
- * It will use the decode function of double to determine the valid number.
- */
-public IBeanProxy newInstance(String initializationString) throws ThrowableProxy, ClassCastException, InstantiationException {
- String trim = initializationString.trim();
- if (trim.length() == 0)
- return super.newInstance(initializationString);
- double aDouble;
- if (trim.startsWith("(double)")) { //$NON-NLS-1$
- Number v = parseString(trim.substring("(double)".length()).trim()); //$NON-NLS-1$
- if (v != null)
- aDouble = v.doubleValue();
- else
- return super.newInstance(initializationString); // Can't decode it, let full parser handle it.
- } else {
- try {
- aDouble = Double.valueOf(initializationString).doubleValue(); // See if valid double format.
- } catch (NumberFormatException e) {
- return super.newInstance(initializationString); // Can't decode it, let full parser handle it.
- }
- }
-
- return getProxyFactoryRegistry().getBeanProxyFactory().createBeanProxyWith(aDouble);
-}
-}
-
-
diff --git a/plugins/org.eclipse.jem.proxy/proxyRemote/org/eclipse/jem/internal/proxy/remote/REMExpression.java b/plugins/org.eclipse.jem.proxy/proxyRemote/org/eclipse/jem/internal/proxy/remote/REMExpression.java
deleted file mode 100644
index ee7f450..0000000
--- a/plugins/org.eclipse.jem.proxy/proxyRemote/org/eclipse/jem/internal/proxy/remote/REMExpression.java
+++ /dev/null
@@ -1,1864 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2004, 2005 IBM Corporation and others.
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
- *
- * Contributors:
- * IBM Corporation - initial API and implementation
- *******************************************************************************/
-/*
-
-
- */
-package org.eclipse.jem.internal.proxy.remote;
-
-import java.io.*;
-import java.util.*;
-import java.util.logging.Level;
-
-import org.eclipse.jem.internal.proxy.common.CommandException;
-import org.eclipse.jem.internal.proxy.common.remote.*;
-import org.eclipse.jem.internal.proxy.common.remote.Commands.ValueObject;
-import org.eclipse.jem.internal.proxy.core.*;
-import org.eclipse.jem.internal.proxy.initParser.tree.*;
-
-/**
- * The Remote proxy version of Expression.
- *
- * @since 1.0.0
- */
-public class REMExpression extends Expression {
-
- private IREMExpressionConnection connection;
- private boolean closed; // Are we closed.
-
- protected Commands.ValueObject workerValue; // A worker object so that we don't need to keep creating one and throwing it away.
-
- protected Map beanTypeCache; // Use to cache pending BeanTypes. Used in conjunction with REMStandardBeanTypeFactory.
- protected Map methodsCache; // Use to cache pending expression method proxies. Used in conjunction with REMProxyConsants.
- protected Map fieldsCache; // Use to cache pending expression field proxies. Used in conjunction with REMProxyConsants.
-
- /*
- * This is very special list. It tries to eliminate unneeded traffic. For example a mark immediately followed by an endmark does
- * not need to be sent. Many expressions can look like: mark, endmark, endtransaction. This is a do nothing and we don't want
- * to create a connection to just send this. So this list is used to queue up these and remove them too when found as not needed.
- *
- * However, this is very tricky because all pushToProxy transactions that actually do something MUST call the processPending() method
- * first to make sure any pending transactions are submitted. Because once a real type transaction, such as assignment occurs, any
- * pending transaction is a valid transaction, and no longer a do-nothing transaction.
- *
- * Each transaction type uses a subclass of PendingTransaction to be an entry on the list.
- *
- * The pendings currently supported are:
- * mark/endmark
- * try/catch/endtry
- * block/endblock
- *
- * See each individual transaction type to see how it is handled.
- */
- protected List pendingTransactions;
-
- /**
- * PendingTransaction entry.
- *
- * @since 1.1.0
- */
- protected abstract static class PendingTransaction {
-
- /**
- * The transaction is now being pushed. The implementation should
- * actually do the push.
- *
- * @param remExpression The REMExpression for this transaction.
- *
- * @since 1.1.0
- */
- public abstract void pushTransaction(REMExpression remExpression);
- }
-
- /**
- * @param registry
- *
- * @since 1.0.0
- */
- public REMExpression(REMProxyFactoryRegistry registry) {
- super(registry);
- }
-
- /**
- * Return the expression id for this REMExpression. This id is used on the remote vm to
- * identify who the request is for.
- * @return
- *
- * @since 1.1.0
- */
- protected int getREMExpressionID() {
- return this.hashCode();
- }
- /**
- * Get the pending transactions list.
- * @return
- *
- * @since 1.1.0
- */
- protected List getPendingTransactions() {
- if (pendingTransactions == null)
- pendingTransactions = new ArrayList();
- return pendingTransactions;
- }
-
- // Use this flag when debugging to test if errors are due to improper pending processing.
- // If true they will be treated as if not pending and will be executed immediately.
- private static final boolean EXECUTE_PENDING_IMMEDIATELY = false;
- protected void addPendingTransaction(PendingTransaction pending) {
- if (!EXECUTE_PENDING_IMMEDIATELY)
- getPendingTransactions().add(pending);
- else
- pending.pushTransaction(this);
- }
-
- private boolean sentData; // Flag to indicate if we have sent anything yet to the remote vm. This is used for the pending optimizations.
-
- /**
- * Have we sent any data in this transaction yet.
- * @return
- *
- * @since 1.1.0
- */
- protected boolean haveSentData() {
- return sentData;
- }
-
- /**
- * @return Returns the connection.
- *
- * @since 1.1.0
- */
- protected IREMExpressionConnection getConnection() {
- if (connection == null) {
- if (!sentData)
- getREMBeanProxyFactory().startTransaction(); // This is the first time we send data, so start transaction.
-
- sentData = true; // If we are getting a transaction, that means we are sending data.
- connection = (IREMExpressionConnection) getREMRegistry().getFreeConnection();
- // This will actually not be stopped until closeproxy. There could be a slight problem if the expression is never closed.
- // But that shouldn't happen. This is to prevent any proxy that was released during the execution but was used by
- // the expression from being released on the remote vm until after the expression is finished.
- try {
- if (workerValue == null)
- workerValue = new Commands.ValueObject();
- if (expressionProcesserController == null) {
- byte trace = !isTraceSet() ? ExpressionCommands.TRACE_DEFAULT : (isTrace() ? ExpressionCommands.TRACE_ON : ExpressionCommands.TRACE_OFF);
- connection.startExpressionProcessing(getREMExpressionID(), trace); // It is a new expression.
- } else {
- fillProxy(expressionProcesserController, workerValue);
- connection.resumeExpression(getREMExpressionID(), workerValue);
- expressionProcesserController = null;
- }
- } catch (IOException e) {
- connection.close();
- ProxyPlugin.getPlugin().getLogger().log(e);
- throwIllegalStateException(IO_EXCEPTION_MSG);
- } catch (CommandException e) {
- ProxyPlugin.getPlugin().getLogger().log(e);
- if (!e.isRecoverable()) {
- connection.close();
- connection = null;
- }
- throwIllegalStateException(COMMAND_EXCEPTION_MSG);
- }
- }
- return connection;
- }
-
- /**
- * General IOException occurred msg.
- */
- protected static final String IO_EXCEPTION_MSG = ProxyRemoteMessages.REMExpression_IOExceptionSeeLog_INFO_;
-
- protected static final String COMMAND_EXCEPTION_MSG = ProxyRemoteMessages.REMExpression_CommandExceptionSeeLog_INFO_;
-
- /**
- * Throw an an illegal state exception if some general error, in particular an I/O or Command Exception
- * occurred so that callers know there is something wrong.
- *
- * @param msg
- * @throws IllegalStateException
- *
- * @since 1.0.0
- */
- protected void throwIllegalStateException(String msg) throws IllegalStateException {
- throw new IllegalStateException(msg);
- }
-
- /**
- * Return the registry as a REMProxyFactoryRegistry
- * @return
- *
- * @since 1.0.0
- */
- protected final REMProxyFactoryRegistry getREMRegistry() {
- return (REMProxyFactoryRegistry) registry;
- }
-
- /**
- * Return the bean proxy factory as a REMStandardBeanProxyFactory.
- * @return
- *
- * @since 1.0.0
- */
- protected final REMStandardBeanProxyFactory getREMBeanProxyFactory() {
- return (REMStandardBeanProxyFactory) beanProxyFactory;
- }
-
- /**
- * Process any pending transactions.
- * <p>
- * <b>Note: </b>It is required that all non-pending-participating transactions must
- * call this method first to make sure pending transactions are sent. If this is
- * not done, there will be errors in the expression.
- *
- *
- * @since 1.1.0
- */
- protected void processPendingTransactions() {
- if (pendingTransactions != null && !pendingTransactions.isEmpty()) {
- try {
- for (int i = 0; i < pendingTransactions.size(); i++) {
- ((PendingTransaction) pendingTransactions.get(i)).pushTransaction(this);
- }
- } finally {
- pendingTransactions.clear();
- }
- }
- }
-
- /**
- * Get the pending entry from top. If top is 1, then get top entry (i.e. last one added), 2 is next one.
- * @param fromTop
- * @return entry requested, or <code>null</code> if no such entry.
- *
- * @since 1.1.0
- */
- protected PendingTransaction getPendingEntryFromTop(int fromTop) {
- if (pendingTransactions != null && pendingTransactions.size() >= fromTop) {
- return (PendingTransaction) pendingTransactions.get(pendingTransactions.size()-fromTop);
- } else
- return null;
- }
-
- /**
- * Pop up the top entry from the pending transactions queue.
- * @param fromTop how many entries to pop from the pending transaction list.
- *
- *
- * @since 1.1.0
- */
- protected void popPendingEntry(int fromTop) {
- if (pendingTransactions != null)
- if (pendingTransactions.size() > fromTop) {
- while(fromTop-- >0)
- pendingTransactions.remove(pendingTransactions.size()-1);
- } else
- pendingTransactions.clear();
- }
-
- /* (non-Javadoc)
- * @see org.eclipse.jem.internal.proxy.core.Expression#pushToProxy(org.eclipse.jem.internal.proxy.core.IProxy)
- */
- protected void pushToProxy(IProxy proxy) {
- if (proxy == null || proxy.isBeanProxy())
- pushToProxy((IBeanProxy) proxy);
- else
- pushToExpressionProxy((ExpressionProxy) proxy);
- }
-
- private void pushToProxy(IBeanProxy proxy) {
- processPendingTransactions();
- IREMExpressionConnection connection = getConnection();
- try {
- // Format of push proxy command is:
- // PushExpressionCommand(push to proxy) followed by:
- // ValueObject containing the rendered proxy.
- connection.pushExpressionCommand(getREMExpressionID(), (byte)InternalExpressionTypes.PUSH_TO_PROXY_EXPRESSION_VALUE);
- if (proxy == null)
- workerValue.set();
- else
- ((IREMBeanProxy) proxy).renderBean(workerValue);
- connection.pushValueObject(workerValue);
- } catch (IOException e) {
- connection.close();
- ProxyPlugin.getPlugin().getLogger().log(e);
- markInvalid(e.getLocalizedMessage());
- throwIllegalStateException(IO_EXCEPTION_MSG);
- } catch (CommandException e) {
- ProxyPlugin.getPlugin().getLogger().log(e);
- markInvalid(e.getLocalizedMessage());
- if (!e.isRecoverable()) {
- connection.close();
- throwIllegalStateException(COMMAND_EXCEPTION_MSG);
- }
- }
- }
-
- /* (non-Javadoc)
- * @see org.eclipse.jem.internal.proxy.core.Expression#closeProxy()
- */
- protected void closeProxy() {
- if (!closed) {
- try {
- if (connection != null && connection.isConnected()) {
- try {
- connection.stopExpressionProcessing(getREMExpressionID());
- } catch (IOException e) {
- connection.close();
- ProxyPlugin.getPlugin().getLogger().log(e, Level.INFO);
- // Not throwing an illegal state here because we don't care, other than logging and not
- // returning the connection to the registry that there was an error on close.
- } finally {
- getREMRegistry().returnConnection(connection);
- }
- }
- } finally {
- closed = true;
- if (sentData)
- getREMBeanProxyFactory().stopTransaction(); // Resume proxy releases. We've sent data at least once.
- }
- }
- methodsCache = null;
- fieldsCache = null;
- beanTypeCache = null;
- pendingTransactions = null;
- connection = null;
- }
-
- private static final Object VOIDTYPE = new Object(); // A void type was sent in expression proxy resolution.
- private static final Object NOTRESOLVED = new Object(); // A not resolved type was sent in expression proxy resolution.
-
- /*
- * Get the sender to use for pulling the expression proxy resolutions.
- */
- private BeanProxyValueSender getExpressionProxiesSender() {
- return new BeanProxyValueSender(getREMBeanProxyFactory()) {
-
- /*
- * (non-Javadoc)
- *
- * @see org.eclipse.jem.internal.proxy.remote.BeanProxyValueSender#sendValue(org.eclipse.jem.internal.proxy.common.remote.Commands.ValueObject)
- */
- public void sendValue(ValueObject value) {
- if (value.getType() == Commands.FLAG) {
- switch (value.anInt) {
- case ExpressionCommands.EXPRESSIONPROXY_NOTRESOLVED:
- array[index++] = NOTRESOLVED;
- break;
- case ExpressionCommands.EXPRESSIONPROXY_VOIDTYPE:
- array[index++] = VOIDTYPE;
- break;
- default:
- // Shouldn't happen.
- break;
- }
- } else
- super.sendValue(value);
- }
- };
- }
-
- /*
- * Process the pulled expression proxy resolutions.
- */
- private void processpulledExpressionProxies(List expressionProxies, BeanProxyValueSender sender) {
-
- // It is expected that each entry will coorespond to the next non-null expression proxy and will be the bean proxy or one of the special
- // types.
- int len = expressionProxies.size();
- int j = 0;
- Object[] resolveds = sender.getArray();
- for (int i = 0; i < len; i++) {
- ExpressionProxy ep = (ExpressionProxy) expressionProxies.get(i);
- if (ep != null) {
- Object resolved = resolveds[j++];
- if (resolved == NOTRESOLVED)
- fireProxyNotResolved(ep);
- else if (resolved == VOIDTYPE)
- fireProxyVoid(ep);
- else
- fireProxyResolved(ep, (IBeanProxy) resolved);
- }
- }
- }
-
- /*
- * (non-Javadoc)
- *
- * @see org.eclipse.jem.internal.proxy.core.Expression#pullProxyValue(int, java.util.List)
- */
- protected IBeanProxy pullProxyValue(int proxycount, List expressionProxies) throws ThrowableProxy, NoExpressionValueException {
- if (!haveSentData()) {
- markAllProxiesNotResolved(expressionProxies);
- return null; // We haven't pushed any commands, so there is nothing to do. Don't create a connection for this.
- }
- // If there are any pending transactions at this point in time, there is no need to send them. They would be do nothings anyway.
-
- boolean processedExpressionProxies = false;
- IREMExpressionConnection lclConnection = getConnection();
- markInTransaction(lclConnection);
- try {
- Commands.ValueObject proxyids = null;
- BeanProxyValueSender sender = null;
- if (proxycount > 0) {
- proxyids = createExpressionProxiesValueObject(proxycount, expressionProxies);
- sender = getExpressionProxiesSender();
- }
-
- lclConnection.pullValue(getREMExpressionID(), proxyids, sender);
- // If we got this far, then if there are proxies, we need to process these too.
- if (proxycount > 0)
- processpulledExpressionProxies(expressionProxies, sender);
- processedExpressionProxies =true;
- lclConnection.getFinalValue(workerValue); // Get the returned value.
- return getREMBeanProxyFactory().getBeanProxy(workerValue);
- } catch (CommandErrorException e) {
- try {
- if (e.getErrorCode() == ExpressionCommands.EXPRESSION_NOEXPRESSIONVALUE_EXCEPTION) {
- // Need to turn it into a Throwable.
- ThrowableProxy t = null;
- try {
- getREMBeanProxyFactory().getBeanProxy(e.getValue()); // This will cause a throw to occur, but we don't want it going out, we want to capture it.
- } catch (ThrowableProxy e1) {
- t = e1;
- }
- throw new REMNoExpressionValueException(t);
- }
- getREMBeanProxyFactory().processErrorReturn(e);
- } catch (CommandException e1) {
- ProxyPlugin.getPlugin().getLogger().log(e);
- if (!e.isRecoverable()) {
- lclConnection.close();
- throwIllegalStateException(COMMAND_EXCEPTION_MSG);
- }
- }
- } catch (CommandException e) {
- ProxyPlugin.getPlugin().getLogger().log(e);
- if (!e.isRecoverable()) {
- lclConnection.close();
- throwIllegalStateException(COMMAND_EXCEPTION_MSG);
- }
- } finally {
- markEndTransaction(lclConnection);
- if (!processedExpressionProxies)
- markAllProxiesNotResolved(expressionProxies); // We failed before we could process the expression proxies. So mark all as not resolved.
- }
- return null;
- }
-
- /**
- * This is called by commands that write some data and will be reading data back immediately
- * (i.e. pull value and invoke expression). If we are on a callback thread and have the
- * used the connection from the callback thread, we need to tell the callback thread that
- * it is in a transaction. This is needed because while reading data back there are
- * sometimes calls back to the vm to get beantype data for new classes. This would
- * normally be through a new connection so that it doesn't get stuck in the middle of the
- * data being sent back. But when running on a callback the same connection is used. So it
- * would stick data in the middle of the return stream of data. To prevent this we need
- * to tell the callback thread that it is in a transaction during this call so that any
- * such new connection requests will get a new connection.
- * <p>
- * This is not nestable (i.e. the first markEndTransaction will set it false, even if several nested
- * markInTransactions are called).
- * <p>
- * markEndTransaction must be called in ALL cases, such use try/finally.
- * @param remConnection the connection to see check against and mark in transaction for.
- *
- *
- * @since 1.1.0
- */
- protected void markInTransaction(IREMExpressionConnection remConnection) {
- Thread thread = Thread.currentThread();
- if (thread instanceof REMCallbackThread) {
- // We are in a callback, and the callback connection is our connection, tell the callback that it is in transaction.
- REMCallbackThread callbackThread = (REMCallbackThread) thread;
- if (callbackThread.getConnection() == remConnection) {
- callbackThread.setIntransaction(true);
- }
- }
- }
-
- /**
- * Mark end of transaction.
- * @param remConn REMConnection to test and mark not in connection for.
- *
- * @see REMExpression#markInTransaction(IREMExpressionConnection)
- * @since 1.1.0
- */
- protected void markEndTransaction(IREMExpressionConnection remConn) {
- Thread thread = Thread.currentThread();
- if (thread instanceof REMCallbackThread) {
- // We are in a callback, and the callback connection is our connection, tell the callback that it is in transaction.
- REMCallbackThread callbackThread = (REMCallbackThread) thread;
- if (callbackThread.getConnection() == remConn) {
- callbackThread.setIntransaction(false);
- }
- }
- }
-
- /**
- * @param expressionProxies
- *
- * @since 1.1.0
- */
- private Commands.ValueObject createExpressionProxiesValueObject(int actualCount, List expressionProxies) {
- class ExpressionProxyRetriever implements Commands.ValueRetrieve {
- Iterator expressionProxiesItr;
- Commands.ValueObject worker = new Commands.ValueObject();
-
- public ExpressionProxyRetriever(List expressionProxies) {
- this.expressionProxiesItr = expressionProxies.iterator();
- }
-
- public Commands.ValueObject nextValue() {
- worker.set(-1);
- while (expressionProxiesItr.hasNext()) {
- Object parm = expressionProxiesItr.next();
- if (parm != null) {
- worker.set(((ExpressionProxy) parm).getProxyID());
- break;
- }
- }
- return worker;
- }
- };
-
- workerValue.setArrayIDS(new ExpressionProxyRetriever(expressionProxies), actualCount, Commands.INT);
- return workerValue;
- }
-
- /*
- * (non-Javadoc)
- * @see org.eclipse.jem.internal.proxy.core.Expression#pushCastToProxy(org.eclipse.jem.internal.proxy.core.IProxyBeanType)
- */
- protected void pushCastToProxy(IProxyBeanType type) {
- processPendingTransactions();
- IREMExpressionConnection connection = getConnection();
- try {
- // Format of push cast to proxy command is:
- // PushExpressionCommand(push cast to proxy) followed by:
- connection.pushExpressionCommand(getREMExpressionID(), (byte)InternalExpressionTypes.CAST_EXPRESSION_VALUE);
- fillProxy(type, workerValue);
- connection.pushValueObject(workerValue);
- } catch (IOException e) {
- connection.close();
- ProxyPlugin.getPlugin().getLogger().log(e);
- markInvalid(e.getLocalizedMessage());
- throwIllegalStateException(IO_EXCEPTION_MSG);
- } catch (CommandException e) {
- ProxyPlugin.getPlugin().getLogger().log(e);
- markInvalid(e.getLocalizedMessage());
- if (!e.isRecoverable()) {
- connection.close();
- throwIllegalStateException(COMMAND_EXCEPTION_MSG);
- }
- }
- }
-
- /**
- * Push the proxy bean type in the format depending on expression proxy or beantype proxy.
- * @param type
- * @throws IOException
- *
- * @since 1.1.0
- */
- protected void fillProxy(IProxy type, Commands.ValueObject value) throws IOException {
- // ValueObject containing the rendered bean type proxy if IBeanTypeProxy or int (for expression proxy id) if expression proxy.
- if (type.isBeanProxy()) {
- ((IREMBeanProxy) type).renderBean(value);
- } else {
- ExpressionProxy ep = (ExpressionProxy) type;
- value.set(ep.getProxyID());
- }
- }
-
- /*
- * (non-Javadoc)
- * @see org.eclipse.jem.internal.proxy.core.Expression#pushInstanceofToProxy(org.eclipse.jem.internal.proxy.core.IProxyBeanType)
- */
- protected void pushInstanceofToProxy(IProxyBeanType type) {
- processPendingTransactions();
- IREMExpressionConnection connection = getConnection();
- try {
- // Format of push instanceof to proxy command is:
- // PushExpressionCommand(push instanceof to proxy) followed by:
- // ValueObject containing the rendered bean type proxy or the String representing the name of class.
- connection.pushExpressionCommand(getREMExpressionID(), (byte)InternalExpressionTypes.INSTANCEOF_EXPRESSION_VALUE);
- fillProxy(type, workerValue);
- connection.pushValueObject(workerValue);
- } catch (IOException e) {
- connection.close();
- ProxyPlugin.getPlugin().getLogger().log(e);
- markInvalid(e.getLocalizedMessage());
- throwIllegalStateException(IO_EXCEPTION_MSG);
- } catch (CommandException e) {
- ProxyPlugin.getPlugin().getLogger().log(e);
- markInvalid(e.getLocalizedMessage());
- if (!e.isRecoverable()) {
- connection.close();
- throwIllegalStateException(COMMAND_EXCEPTION_MSG);
- }
- }
- }
-
- /*
- * (non-Javadoc)
- * @see org.eclipse.jem.internal.proxy.core.Expression#pushInfixToProxy(org.eclipse.jem.internal.proxy.initParser.tree.InfixOperator, int)
- */
- protected void pushInfixToProxy(InfixOperator operator, InternalInfixOperandType operandType) {
- processPendingTransactions();
- IREMExpressionConnection connection = getConnection();
- try {
- // Format of push infix to proxy command is:
- // PushExpressionCommand(push infix to proxy) followed by:
- // byte: operator
- // byte: operandType
- connection.pushExpressionCommand(getREMExpressionID(), (byte)InternalExpressionTypes.INFIX_EXPRESSION_VALUE);
- connection.pushByte((byte) operator.getValue());
- connection.pushByte((byte) operandType.getValue());
- } catch (IOException e) {
- connection.close();
- ProxyPlugin.getPlugin().getLogger().log(e);
- markInvalid(e.getLocalizedMessage());
- throwIllegalStateException(IO_EXCEPTION_MSG);
- }
- }
-
- /*
- * (non-Javadoc)
- * @see org.eclipse.jem.internal.proxy.core.Expression#pushPrefixToProxy(org.eclipse.jem.internal.proxy.initParser.tree.PrefixOperator)
- */
- protected void pushPrefixToProxy(PrefixOperator operator) {
- processPendingTransactions();
- IREMExpressionConnection connection = getConnection();
- try {
- // Format of push prefix to proxy command is:
- // PushExpressionCommand(push prefix to proxy) followed by:
- // byte: operator
- connection.pushExpressionCommand(getREMExpressionID(), (byte)InternalExpressionTypes.PREFIX_EXPRESSION_VALUE);
- connection.pushByte((byte) operator.getValue());
- } catch (IOException e) {
- connection.close();
- ProxyPlugin.getPlugin().getLogger().log(e);
- markInvalid(e.getLocalizedMessage());
- throwIllegalStateException(IO_EXCEPTION_MSG);
- }
- }
-
- /* (non-Javadoc)
- * @see org.eclipse.jem.internal.proxy.core.Expression#pushArrayAccessToProxy(int)
- */
- protected void pushArrayAccessToProxy(int indexCount) {
- processPendingTransactions();
- IREMExpressionConnection connection = getConnection();
- try {
- // Format of push array access to proxy command is:
- // PushExpressionCommand(push array acces to proxy) followed by:
- // int: indexCount
- connection.pushExpressionCommand(getREMExpressionID(), (byte)InternalExpressionTypes.ARRAY_ACCESS_EXPRESSION_VALUE);
- connection.pushInt(indexCount);
- } catch (IOException e) {
- connection.close();
- ProxyPlugin.getPlugin().getLogger().log(e);
- markInvalid(e.getLocalizedMessage());
- throwIllegalStateException(IO_EXCEPTION_MSG);
- }
- }
-
- /*
- * (non-Javadoc)
- * @see org.eclipse.jem.internal.proxy.core.Expression#pushArrayCreationToProxy(org.eclipse.jem.internal.proxy.core.IProxyBeanType, int)
- */
- protected void pushArrayCreationToProxy(IProxyBeanType type, int dimensionCount) {
- processPendingTransactions();
- IREMExpressionConnection connection = getConnection();
- try {
- // Format of push array creation to proxy command is:
- // PushExpressionCommand(push array creation to proxy) followed by:
- // ValueObject containing the rendered bean type proxy or the expression proxy.
- // int: dimension count
- connection.pushExpressionCommand(getREMExpressionID(), (byte)InternalExpressionTypes.ARRAY_CREATION_EXPRESSION_VALUE);
- fillProxy(type, workerValue);
- connection.pushValueObject(workerValue);
- connection.pushInt(dimensionCount);
- } catch (IOException e) {
- connection.close();
- ProxyPlugin.getPlugin().getLogger().log(e);
- markInvalid(e.getLocalizedMessage());
- throwIllegalStateException(IO_EXCEPTION_MSG);
- } catch (CommandException e) {
- ProxyPlugin.getPlugin().getLogger().log(e);
- markInvalid(e.getLocalizedMessage());
- if (!e.isRecoverable()) {
- connection.close();
- throwIllegalStateException(COMMAND_EXCEPTION_MSG);
- }
- }
- }
-
- protected void pushArrayInitializerToProxy(IProxyBeanType type, int stripCount, int expressionCount) {
- processPendingTransactions();
- IREMExpressionConnection connection = getConnection();
- try {
- // Format of push array initializer to proxy command is:
- // PushExpressionCommand(push array initializer to proxy) followed by:
- // ValueObject containing the rendered bean type proxy or expression proxy.
- // int: strip count
- // int: expression count
- connection.pushExpressionCommand(getREMExpressionID(), (byte)InternalExpressionTypes.ARRAY_INITIALIZER_EXPRESSION_VALUE);
- fillProxy(type, workerValue);
- connection.pushValueObject(workerValue);
- connection.pushInt(stripCount);
- connection.pushInt(expressionCount);
- } catch (IOException e) {
- connection.close();
- ProxyPlugin.getPlugin().getLogger().log(e);
- markInvalid(e.getLocalizedMessage());
- throwIllegalStateException(IO_EXCEPTION_MSG);
- } catch (CommandException e) {
- ProxyPlugin.getPlugin().getLogger().log(e);
- markInvalid(e.getLocalizedMessage());
- if (!e.isRecoverable()) {
- connection.close();
- throwIllegalStateException(COMMAND_EXCEPTION_MSG);
- }
- }
- }
-
- /*
- * (non-Javadoc)
- * @see org.eclipse.jem.internal.proxy.core.Expression#pushClassInstanceCreationToProxy(org.eclipse.jem.internal.proxy.core.IProxyBeanType, int)
- */
- protected void pushClassInstanceCreationToProxy(IProxyBeanType type, int argumentCount) {
- processPendingTransactions();
- IREMExpressionConnection connection = getConnection();
- try {
- // Format of push class instance creation to proxy command is:
- // PushExpressionCommand(push class instance creation to proxy) followed by:
- // ValueObject containing the rendered bean type proxy or the expression proxy
- // int: argument count
- connection.pushExpressionCommand(getREMExpressionID(), (byte)InternalExpressionTypes.CLASS_INSTANCE_CREATION_EXPRESSION_VALUE);
- fillProxy(type, workerValue);
- connection.pushValueObject(workerValue);
- connection.pushInt(argumentCount);
- } catch (IOException e) {
- connection.close();
- ProxyPlugin.getPlugin().getLogger().log(e);
- markInvalid(e.getLocalizedMessage());
- throwIllegalStateException(IO_EXCEPTION_MSG);
- } catch (CommandException e) {
- ProxyPlugin.getPlugin().getLogger().log(e);
- markInvalid(e.getLocalizedMessage());
- if (!e.isRecoverable()) {
- connection.close();
- throwIllegalStateException(COMMAND_EXCEPTION_MSG);
- }
- }
- }
-
- /*
- * (non-Javadoc)
- * @see org.eclipse.jem.internal.proxy.core.Expression#pushTypeReceiverToProxy(org.eclipse.jem.internal.proxy.core.IProxyBeanType)
- */
- protected void pushTypeReceiverToProxy(IProxyBeanType type) {
- processPendingTransactions();
- IREMExpressionConnection connection = getConnection();
- try {
- // Format of push type receiver to proxy command is:
- // PushExpressionCommand(push type receiver to proxy) followed by:
- // ValueObject containing the rendered bean type proxy or the expression proxy.
- connection.pushExpressionCommand(getREMExpressionID(), (byte)InternalExpressionTypes.TYPERECEIVER_EXPRESSION_VALUE);
- fillProxy(type, workerValue);
- connection.pushValueObject(workerValue);
- } catch (IOException e) {
- connection.close();
- ProxyPlugin.getPlugin().getLogger().log(e);
- markInvalid(e.getLocalizedMessage());
- throwIllegalStateException(IO_EXCEPTION_MSG);
- } catch (CommandException e) {
- ProxyPlugin.getPlugin().getLogger().log(e);
- markInvalid(e.getLocalizedMessage());
- if (!e.isRecoverable()) {
- connection.close();
- throwIllegalStateException(COMMAND_EXCEPTION_MSG);
- }
- }
- }
-
- /* (non-Javadoc)
- * @see org.eclipse.jem.internal.proxy.core.Expression#pushFieldAccessToProxy(java.lang.String, boolean)
- */
- protected void pushFieldAccessToProxy(Object field, boolean hasReceiver) {
- processPendingTransactions();
- IREMExpressionConnection connection = getConnection();
- try {
- // Format of push field access to proxy command is:
- // PushExpressionCommand(push field access to proxy) followed by:
- // Commands.Value: fieldName or IProxyField
- // boolean: hasReceiver
- connection.pushExpressionCommand(getREMExpressionID(), (byte)InternalExpressionTypes.FIELD_ACCESS_EXPRESSION_VALUE);
- if (field instanceof String) {
- workerValue.set((String) field);
- } else {
- fillProxy((IProxy) field, workerValue);
- }
- connection.pushValueObject(workerValue);
- connection.pushBoolean(hasReceiver);
- } catch (IOException e) {
- connection.close();
- ProxyPlugin.getPlugin().getLogger().log(e);
- markInvalid(e.getLocalizedMessage());
- throwIllegalStateException(IO_EXCEPTION_MSG);
- } catch (CommandException e) {
- ProxyPlugin.getPlugin().getLogger().log(e);
- markInvalid(e.getLocalizedMessage());
- if (!e.isRecoverable()) {
- connection.close();
- throwIllegalStateException(COMMAND_EXCEPTION_MSG);
- }
- }
- }
-
- /* (non-Javadoc)
- * @see org.eclipse.jem.internal.proxy.core.Expression#pushMethodInvocationToProxy(java.lang.String, boolean, int)
- */
- protected void pushMethodInvocationToProxy(Object method, boolean hasReceiver, int argCount) {
- processPendingTransactions();
- IREMExpressionConnection connection = getConnection();
- try {
- // Format of push method invocation to proxy command is:
- // PushExpressionCommand(push method invocation to proxy) followed by:
- // Commands.ValueObject: methodName or IMethodProxy
- // boolean: hasReceiver
- // int: argCount
- connection.pushExpressionCommand(getREMExpressionID(), (byte)InternalExpressionTypes.METHOD_EXPRESSION_VALUE);
- if (method instanceof String) {
- workerValue.set((String) method);
- } else {
- fillProxy((IProxy) method, workerValue);
- }
- connection.pushValueObject(workerValue);
- connection.pushBoolean(hasReceiver);
- connection.pushInt(argCount);
- } catch (IOException e) {
- connection.close();
- ProxyPlugin.getPlugin().getLogger().log(e);
- markInvalid(e.getLocalizedMessage());
- throwIllegalStateException(IO_EXCEPTION_MSG);
- } catch (CommandException e) {
- ProxyPlugin.getPlugin().getLogger().log(e);
- markInvalid(e.getLocalizedMessage());
- if (!e.isRecoverable()) {
- connection.close();
- throwIllegalStateException(COMMAND_EXCEPTION_MSG);
- }
- }
- }
-
- /* (non-Javadoc)
- * @see org.eclipse.jem.internal.proxy.core.Expression#pushConditionalToProxy(int)
- */
- protected void pushConditionalToProxy(InternalConditionalOperandType expressionType) {
- processPendingTransactions();
- IREMExpressionConnection connection = getConnection();
- try {
- // Format of push conditional to proxy command is:
- // PushExpressionCommand(push conditional to proxy) followed by:
- // byte: expression type
- connection.pushExpressionCommand(getREMExpressionID(), (byte)InternalExpressionTypes.CONDITIONAL_EXPRESSION_VALUE);
- connection.pushByte((byte) expressionType.getValue());
- } catch (IOException e) {
- connection.close();
- ProxyPlugin.getPlugin().getLogger().log(e);
- markInvalid(e.getLocalizedMessage());
- throwIllegalStateException(IO_EXCEPTION_MSG);
- }
- }
-
- /*
- * A special one that takes the ThrowableProxy for no expression value and
- * wrappers it prints its stack trace instead, but still makes it a subclass
- * of NoExpressionValueException.
- *
- * @since 1.1.0
- */
- private static class REMNoExpressionValueException extends NoExpressionValueException {
- /**
- * Comment for <code>serialVersionUID</code>
- *
- * @since 1.1.0
- */
- private static final long serialVersionUID = 1692406777391812694L;
-
-
- public REMNoExpressionValueException(ThrowableProxy e) {
- super(e);
- }
-
-
- /* (non-Javadoc)
- * @see java.lang.Throwable#getLocalizedMessage()
- */
- public String getLocalizedMessage() {
- return ((ThrowableProxy) getCause()).getProxyLocalizedMessage();
- }
-
-
- /* (non-Javadoc)
- * @see java.lang.Throwable#getMessage()
- */
- public String getMessage() {
- return ((ThrowableProxy) getCause()).getProxyMessage();
- }
-
-
- /* (non-Javadoc)
- * @see java.lang.Throwable#printStackTrace()
- */
- public void printStackTrace() {
- getCause().printStackTrace();
- }
-
-
- /* (non-Javadoc)
- * @see java.lang.Throwable#printStackTrace(java.io.PrintStream)
- */
- public void printStackTrace(PrintStream s) {
- getCause().printStackTrace(s);
- }
-
-
- /* (non-Javadoc)
- * @see java.lang.Throwable#printStackTrace(java.io.PrintWriter)
- */
- public void printStackTrace(PrintWriter s) {
- getCause().printStackTrace(s);
- }
- }
-
- /*
- * (non-Javadoc)
- * @see org.eclipse.jem.internal.proxy.core.Expression#pushInvoke(int, java.util.List)
- */
- protected void pushInvoke(int proxycount, List expressionProxies) throws ThrowableProxy, NoExpressionValueException {
- if (!haveSentData()) {
- markAllProxiesNotResolved(expressionProxies);
- return; // We haven't pushed any commands, so there is nothing to do. Don't create a connection for this.
- }
- // If at this point there are pending transactions, there is no need to send them because they would all be do-nothings.
-
- boolean processedExpressionProxies = false;
- IREMExpressionConnection lclConnection = getConnection();
- markInTransaction(lclConnection);
- try {
- Commands.ValueObject proxyids = null;
- BeanProxyValueSender sender = null;
- if (proxycount > 0) {
- proxyids = createExpressionProxiesValueObject(proxycount, expressionProxies);
- sender = getExpressionProxiesSender();
- }
-
- lclConnection.sync(getREMExpressionID(), proxyids, sender);
-
- // If we got this far, then if there are proxies, we need to process these too.
- if (proxycount > 0)
- processpulledExpressionProxies(expressionProxies, sender);
- processedExpressionProxies = true;
- lclConnection.getFinalValue(workerValue); // We don't care what it is, we just need to see if there is an error.
- } catch (CommandErrorException e) {
- try {
- if (e.getErrorCode() == ExpressionCommands.EXPRESSION_NOEXPRESSIONVALUE_EXCEPTION) {
- // Need to turn it into a Throwable.
- ThrowableProxy t = null;
- try {
- getREMBeanProxyFactory().getBeanProxy(e.getValue()); // This will cause a throw to occur, but we don't want it going out, we want to capture it.
- } catch (ThrowableProxy e1) {
- t = e1;
- }
- throw new REMNoExpressionValueException(t);
- }
- getREMBeanProxyFactory().processErrorReturn(e);
- } catch (CommandException e1) {
- ProxyPlugin.getPlugin().getLogger().log(e);
- if (!e.isRecoverable()) {
- lclConnection.close();
- throwIllegalStateException(COMMAND_EXCEPTION_MSG);
- }
- }
- } catch (CommandException e) {
- ProxyPlugin.getPlugin().getLogger().log(e);
- if (!e.isRecoverable()) {
- lclConnection.close();
- throwIllegalStateException(COMMAND_EXCEPTION_MSG);
- }
- } finally {
- markEndTransaction(lclConnection);
- if (!processedExpressionProxies)
- markAllProxiesNotResolved(expressionProxies); // We failed before we could process the expression proxies. So mark all as not resolved.
- }
- }
-
- private static class REMBeanTypeExpressionProxy extends ExpressionProxy implements IBeanTypeExpressionProxy {
-
- private String typeName;
-
- /**
- * @param proxyid
- *
- * @since 1.1.0
- */
- private REMBeanTypeExpressionProxy(int proxyid, Expression expression) {
- super(proxyid, BEANTYPE_EXPRESSION_PROXY, expression);
- }
-
- public void setTypeName(String typeName) {
- this.typeName = typeName;
- }
-
- public String getTypeName() {
- return typeName;
- }
-
-
- /* (non-Javadoc)
- * @see org.eclipse.jem.internal.proxy.core.ExpressionProxy#toString()
- */
- public String toString() {
- return super.toString()+" - "+getTypeName(); //$NON-NLS-1$
- }
-
-
- /* (non-Javadoc)
- * @see org.eclipse.jem.internal.proxy.core.IProxyBeanType#getMethodProxy(org.eclipse.jem.internal.proxy.core.IExpression, java.lang.String, org.eclipse.jem.internal.proxy.core.IProxyBeanType[])
- */
- public IProxyMethod getMethodProxy(IExpression expression, String methodName, IProxyBeanType[] parameterTypes) {
- REMProxyFactoryRegistry registry = (REMProxyFactoryRegistry) expression.getRegistry();
- return ((REMMethodProxyFactory) registry.getMethodProxyFactory()).getMethodProxy(expression, this, methodName, parameterTypes);
- }
-
-
- /* (non-Javadoc)
- * @see org.eclipse.jem.internal.proxy.core.IProxyBeanType#getMethodProxy(org.eclipse.jem.internal.proxy.core.IExpression, java.lang.String, java.lang.String[])
- */
- public IProxyMethod getMethodProxy(IExpression expression, String methodName, String[] parameterTypes) {
- REMProxyFactoryRegistry registry = (REMProxyFactoryRegistry) expression.getRegistry();
- return ((REMMethodProxyFactory) registry.getMethodProxyFactory()).getMethodProxy(expression, this, methodName, parameterTypes);
- }
-
- public IProxyMethod getMethodProxy(IExpression expression, String methodName) {
- return getMethodProxy(expression, methodName, (IProxyBeanType[]) null);
- }
-
- /* (non-Javadoc)
- * @see org.eclipse.jem.internal.proxy.core.IProxyBeanType#getFieldProxy(org.eclipse.jem.internal.proxy.core.IExpression, java.lang.String)
- */
- public IProxyField getFieldProxy(IExpression expression, String fieldName) {
- REMProxyFactoryRegistry registry = (REMProxyFactoryRegistry) expression.getRegistry();
- return ((REMMethodProxyFactory) registry.getMethodProxyFactory()).getFieldProxy(expression, this, fieldName);
- }
- }
-
- private static class REMMethodExpressionProxy extends ExpressionProxy implements IProxyMethod {
-
- /**
- * @param proxyid
- * @param proxyType
- * @param expression
- *
- * @since 1.1.0
- */
- private REMMethodExpressionProxy(int proxyid, Expression expression) {
- super(proxyid, METHOD_EXPRESSION_PROXY, expression);
- }
- }
-
- private static class REMFieldExpressionProxy extends ExpressionProxy implements IProxyField {
-
- /**
- * @param proxyid
- * @param proxyType
- * @param expression
- *
- * @since 1.1.0
- */
- private REMFieldExpressionProxy(int proxyid, Expression expression) {
- super(proxyid, FIELD_EXPRESSION_PROXY, expression);
- }
- }
-
- /* (non-Javadoc)
- * @see org.eclipse.jem.internal.proxy.core.Expression#createExpressionProxy(int)
- */
- protected ExpressionProxy createExpressionProxy(int proxyType, int proxyID) {
- switch (proxyType) {
- case NORMAL_EXPRESSION_PROXY:
- default:
- return new ExpressionProxy(proxyID, NORMAL_EXPRESSION_PROXY, this);
-
- case BEANTYPE_EXPRESSION_PROXY:
- return new REMBeanTypeExpressionProxy(proxyID, this);
-
- case METHOD_EXPRESSION_PROXY:
- return new REMMethodExpressionProxy(proxyID, this);
-
- case FIELD_EXPRESSION_PROXY:
- return new REMFieldExpressionProxy(proxyID, this);
- }
- }
-
- /* (non-Javadoc)
- * @see org.eclipse.jem.internal.proxy.core.Expression#pushAssignmentToProxy(org.eclipse.jem.internal.proxy.core.ExpressionProxy)
- */
- protected void pushAssignmentToProxy(ExpressionProxy proxy) {
- processPendingTransactions();
- IREMExpressionConnection connection = getConnection();
- try {
- // Format of push assignment to proxy command is:
- // PushExpressionCommand(push assignment to proxy) followed by:
- // int: proxy id
- connection.pushExpressionCommand(getREMExpressionID(), (byte)InternalExpressionTypes.ASSIGNMENT_PROXY_EXPRESSION_VALUE);
- connection.pushInt(proxy.getProxyID());
- } catch (IOException e) {
- connection.close();
- ProxyPlugin.getPlugin().getLogger().log(e);
- markInvalid(e.getLocalizedMessage());
- throwIllegalStateException(IO_EXCEPTION_MSG);
- }
- }
-
-
- /* (non-Javadoc)
- * @see org.eclipse.jem.internal.proxy.core.Expression#pushAssignmentToProxy()
- */
- protected void pushAssignmentToProxy() {
- processPendingTransactions();
- IREMExpressionConnection connection = getConnection();
- try {
- // Format of the push assignment command is:
- // PushAssignmentCommand.
- connection.pushExpressionCommand(getREMExpressionID(), (byte) InternalExpressionTypes.ASSIGNMENT_EXPRESSION_VALUE);
- } catch (IOException e) {
- connection.close();
- ProxyPlugin.getPlugin().getLogger().log(e);
- markInvalid(e.getLocalizedMessage());
- throwIllegalStateException(IO_EXCEPTION_MSG);
- }
- }
-
-
- private void pushToExpressionProxy(ExpressionProxy proxy) {
- processPendingTransactions();
- IREMExpressionConnection connection = getConnection();
- try {
- // Format of push to expression proxy command is:
- // PushExpressionCommand(push expression proxy to proxy) followed by:
- // int: proxy id
- connection.pushExpressionCommand(getREMExpressionID(), (byte)InternalExpressionTypes.PUSH_TO_EXPRESSION_PROXY_EXPRESSION_VALUE);
- connection.pushInt(proxy.getProxyID());
- } catch (IOException e) {
- connection.close();
- ProxyPlugin.getPlugin().getLogger().log(e);
- markInvalid(e.getLocalizedMessage());
- throwIllegalStateException(IO_EXCEPTION_MSG);
- }
-
- }
-
- private static class BlockBegin extends PendingTransaction {
- public int blockNumber;
-
- public BlockBegin(int blockNumber) {
- this.blockNumber = blockNumber;
- }
-
- public void pushTransaction(REMExpression remExpression) {
- IREMExpressionConnection connection = remExpression.getConnection();
- try {
- // Format of push to block begin proxy command is:
- // PushExpressionCommand(push block begin proxy to proxy) followed by:
- // int: block id
- connection.pushExpressionCommand(remExpression.getREMExpressionID(), (byte)InternalExpressionTypes.BLOCK_BEGIN_EXPRESSION_VALUE);
- connection.pushInt(blockNumber);
- } catch (IOException e) {
- connection.close();
- ProxyPlugin.getPlugin().getLogger().log(e);
- remExpression.markInvalid(e.getLocalizedMessage());
- remExpression.throwIllegalStateException(IO_EXCEPTION_MSG);
- }
- }
-
- }
-
- /* (non-Javadoc)
- * @see org.eclipse.jem.internal.proxy.core.Expression#pushBlockBeginToProxy(int)
- */
- protected void pushBlockBeginToProxy(int blockNumber) {
- addPendingTransaction(new BlockBegin(blockNumber));
- }
-
- /* (non-Javadoc)
- * @see org.eclipse.jem.internal.proxy.core.Expression#pushBlockEndToProxy(int)
- */
- protected void pushBlockEndToProxy(int blockNumber) {
- // See if the top pending transactions is BreakBlock(blockNumber). If it is then the BreakBlock can be thrown away.
- PendingTransaction topEntry = getPendingEntryFromTop(1);
- if (topEntry instanceof BlockBreak && ((BlockBreak) topEntry).blockNumber == blockNumber) {
- popPendingEntry(1);
- topEntry = getPendingEntryFromTop(1);
- }
- // See if the top pending transaction is now BeginBlock(blockNumber). If it is, then this transaction and the block begin
- // can be thrown away because they are an empty block.
- if (topEntry instanceof BlockBegin && ((BlockBegin) topEntry).blockNumber == blockNumber) {
- popPendingEntry(1);
- return;
- }
- processPendingTransactions();
- IREMExpressionConnection connection = getConnection();
- try {
- // Format of push to block end proxy command is:
- // PushExpressionCommand(push block end proxy to proxy) followed by:
- // int: block id
- connection.pushExpressionCommand(getREMExpressionID(), (byte)InternalExpressionTypes.BLOCK_END_EXPRESSION_VALUE);
- connection.pushInt(blockNumber);
- } catch (IOException e) {
- connection.close();
- ProxyPlugin.getPlugin().getLogger().log(e);
- markInvalid(e.getLocalizedMessage());
- throwIllegalStateException(IO_EXCEPTION_MSG);
- }
- }
-
- private static class BlockBreak extends PendingTransaction {
- public int blockNumber;
-
- public BlockBreak(int blockNumber) {
- this.blockNumber = blockNumber;
- }
-
- public void pushTransaction(REMExpression remExpression) {
- IREMExpressionConnection connection = remExpression.getConnection();
- try {
- // Format of push to block break proxy command is:
- // PushExpressionCommand(push block break proxy to proxy) followed by:
- // int: block id
- connection.pushExpressionCommand(remExpression.getREMExpressionID(), (byte)InternalExpressionTypes.BLOCK_BREAK_EXPRESSION_VALUE);
- connection.pushInt(blockNumber);
- } catch (IOException e) {
- connection.close();
- ProxyPlugin.getPlugin().getLogger().log(e);
- remExpression.markInvalid(e.getLocalizedMessage());
- remExpression.throwIllegalStateException(IO_EXCEPTION_MSG);
- }
- }
- }
-
- /* (non-Javadoc)
- * @see org.eclipse.jem.internal.proxy.core.Expression#pushBlockBreakToProxy(int)
- */
- protected void pushBlockBreakToProxy(int blockNumber) {
- // Even if there is no pending block begin for this block, we will pend the break.
- // This is so that if the break occurred just before the block end, then it can be ignored.
- addPendingTransaction(new BlockBreak(blockNumber));
- }
-
- private static class TryBegin extends PendingTransaction {
-
- public final int tryNumber;
-
- public TryBegin(int tryNumber) {
- this.tryNumber = tryNumber;
-
- }
- public void pushTransaction(REMExpression remExpression) {
- IREMExpressionConnection connection = remExpression.getConnection();
- try {
- // Format of push to try begin proxy command is:
- // PushExpressionCommand(push try begin to proxy) followed by:
- // int: try id
- connection.pushExpressionCommand(remExpression.getREMExpressionID(), (byte)InternalExpressionTypes.TRY_BEGIN_EXPRESSION_VALUE);
- connection.pushInt(tryNumber);
- } catch (IOException e) {
- connection.close();
- ProxyPlugin.getPlugin().getLogger().log(e);
- remExpression.markInvalid(e.getLocalizedMessage());
- remExpression.throwIllegalStateException(IO_EXCEPTION_MSG);
- }
- }
-
- }
- /* (non-Javadoc)
- * @see org.eclipse.jem.internal.proxy.core.Expression#pushTryBeginToProxy(int)
- */
- protected void pushTryBeginToProxy(int tryNumber) {
- addPendingTransaction(new TryBegin(tryNumber));
- }
-
- private static class TryCatch extends PendingTransaction {
-
- public final int tryNumber;
- private final IProxyBeanType exceptionType;
- private final ExpressionProxy ep;
-
- public TryCatch(int tryNumber, IProxyBeanType exceptionType, ExpressionProxy ep) {
- this.tryNumber = tryNumber;
- this.exceptionType = exceptionType;
- this.ep = ep;
- }
-
- public void pushTransaction(REMExpression remExpression) {
- IREMExpressionConnection connection = remExpression.getConnection();
- try {
- // Format of push to try begin proxy command is:
- // PushExpressionCommand(push try begin to proxy) followed by:
- // int: try id
- // object: expression type (as beantype or as expression proxy)
- // int: proxy id or (-1 if null).
- connection.pushExpressionCommand(remExpression.getREMExpressionID(), (byte)InternalExpressionTypes.TRY_CATCH_EXPRESSION_VALUE);
- connection.pushInt(tryNumber);
- remExpression.fillProxy(exceptionType, remExpression.workerValue);
- connection.pushValueObject(remExpression.workerValue);
- if (ep != null)
- connection.pushInt(ep.getProxyID());
- else
- connection.pushInt(-1);
- } catch (IOException e) {
- connection.close();
- ProxyPlugin.getPlugin().getLogger().log(e);
- remExpression.markInvalid(e.getLocalizedMessage());
- remExpression.throwIllegalStateException(IO_EXCEPTION_MSG);
- } catch (CommandException e) {
- ProxyPlugin.getPlugin().getLogger().log(e);
- remExpression.markInvalid(e.getLocalizedMessage());
- if (!e.isRecoverable()) {
- connection.close();
- remExpression.throwIllegalStateException(COMMAND_EXCEPTION_MSG);
- }
- }
- }
-
- }
- /*
- * (non-Javadoc)
- * @see org.eclipse.jem.internal.proxy.core.Expression#pushTryCatchClauseToProxy(int, org.eclipse.jem.internal.proxy.core.IProxyBeanType, org.eclipse.jem.internal.proxy.core.ExpressionProxy)
- */
- protected void pushTryCatchClauseToProxy(int tryNumber, IProxyBeanType exceptionType, ExpressionProxy ep) {
- addPendingTransaction(new TryCatch(tryNumber, exceptionType, ep));
- }
-
- private static class TryFinally extends PendingTransaction {
-
- public final int tryNumber;
-
- public TryFinally(int tryNumber) {
- this.tryNumber = tryNumber;
-
- }
-
- public void pushTransaction(REMExpression remExpression) {
- IREMExpressionConnection connection = remExpression.getConnection();
- try {
- // Format of push to try begin proxy command is:
- // PushExpressionCommand(push try finally to proxy) followed by:
- // int: try id
- connection.pushExpressionCommand(remExpression.getREMExpressionID(), (byte)InternalExpressionTypes.TRY_FINALLY_EXPRESSION_VALUE);
- connection.pushInt(tryNumber);
- } catch (IOException e) {
- connection.close();
- ProxyPlugin.getPlugin().getLogger().log(e);
- remExpression.markInvalid(e.getLocalizedMessage());
- remExpression.throwIllegalStateException(IO_EXCEPTION_MSG);
- }
- }
-
- }
- /* (non-Javadoc)
- * @see org.eclipse.jem.internal.proxy.core.Expression#pushTryFinallyClauseToProxy(int)
- */
- protected void pushTryFinallyClauseToProxy(int tryNumber) {
- addPendingTransaction(new TryFinally(tryNumber));
- }
-
- /* (non-Javadoc)
- * @see org.eclipse.jem.internal.proxy.core.Expression#pushTryEndToProxy(int)
- */
- protected void pushTryEndToProxy(int tryNumber) {
- // This is a little tricky. We need to find if there is nothing but try/catch/finally for this tryNumber on the pending
- // transactions up to the try begin, if there is nothing else, then we can throw the entire try away. That
- // means there was no code at all in any of the try/catch/finally blocks.
- int fromTop = 0;
- while (true) {
- PendingTransaction topEntry = getPendingEntryFromTop(++fromTop);
- if (topEntry instanceof TryFinally) {
- if (((TryFinally) topEntry).tryNumber != tryNumber)
- break; // We met a finally that wasn't ours, so entire try group must be sent.
- } else if (topEntry instanceof TryCatch) {
- if (((TryCatch) topEntry).tryNumber != tryNumber)
- break; // We met a catch that wasn't ours, so entire try group must be sent.
- } else if (topEntry instanceof TryBegin) {
- if (((TryBegin) topEntry).tryNumber == tryNumber) {
- // We've met our try begin, and nothing but empty catch/finally in between, so the entire group can be thrown away
- popPendingEntry(fromTop);
- return;
- } else
- break; // We've hit a try begin that wasn't ours, so the entire try group must be sent.
- } else
- break; // We've hit something other than our try group, so process everything.
- }
- processPendingTransactions();
- IREMExpressionConnection connection = getConnection();
- try {
- // Format of push to try begin proxy command is:
- // PushExpressionCommand(push try end to proxy) followed by:
- // int: try id
- connection.pushExpressionCommand(getREMExpressionID(), (byte)InternalExpressionTypes.TRY_END_EXPRESSION_VALUE);
- connection.pushInt(tryNumber);
- } catch (IOException e) {
- connection.close();
- ProxyPlugin.getPlugin().getLogger().log(e);
- markInvalid(e.getLocalizedMessage());
- throwIllegalStateException(IO_EXCEPTION_MSG);
- }
- }
-
- /* (non-Javadoc)
- * @see org.eclipse.jem.internal.proxy.core.Expression#pushThrowToProxy()
- */
- protected void pushThrowToProxy() {
- processPendingTransactions();
- IREMExpressionConnection connection = getConnection();
- try {
- // Format of push to try begin proxy command is:
- // PushExpressionCommand(push throw to proxy)
- connection.pushExpressionCommand(getREMExpressionID(), (byte)InternalExpressionTypes.THROW_EXPRESSION_VALUE);
- } catch (IOException e) {
- connection.close();
- ProxyPlugin.getPlugin().getLogger().log(e);
- markInvalid(e.getLocalizedMessage());
- throwIllegalStateException(IO_EXCEPTION_MSG);
- }
- }
-
- /* (non-Javadoc)
- * @see org.eclipse.jem.internal.proxy.core.Expression#pushRethrowToProxy(int)
- */
- protected void pushRethrowToProxy(int tryNumber) {
- processPendingTransactions();
- IREMExpressionConnection connection = getConnection();
- try {
- // Format of push to rethow proxy command is:
- // PushExpressionCommand(push rethrow to proxy)
- // int: try id
- connection.pushExpressionCommand(getREMExpressionID(), (byte)InternalExpressionTypes.RETHROW_EXPRESSION_VALUE);
- connection.pushInt(tryNumber);
- } catch (IOException e) {
- connection.close();
- ProxyPlugin.getPlugin().getLogger().log(e);
- markInvalid(e.getLocalizedMessage());
- throwIllegalStateException(IO_EXCEPTION_MSG);
- }
- }
-
- /* (non-Javadoc)
- * @see org.eclipse.jem.internal.proxy.core.Expression#pushBeanTypeToProxy(org.eclipse.jem.internal.proxy.core.IBeanTypeExpressionProxy)
- */
- protected void pushBeanTypeToProxy(IBeanTypeExpressionProxy proxy) {
- // Push beantype to proxy is sent out of sequence without respect to where in expression we are,
- // so no need to handle pending transactions at this point. They would not affect the result
- // of this call.
- IREMExpressionConnection connection = getConnection();
- try {
- // Format of push to beanType proxy command is:
- // PushExpressionCommand(push bean type expression proxy)
- // int: proxy id
- // string: typename
- connection.pushExpressionCommand(getREMExpressionID(), (byte)InternalExpressionTypes.PUSH_BEANTYPE_EXPRESSIONPROXY_EXPRESSION_VALUE);
- REMBeanTypeExpressionProxy ep = (REMBeanTypeExpressionProxy) proxy;
- connection.pushInt(ep.getProxyID());
- connection.pushString(ep.getTypeName());
- } catch (IOException e) {
- connection.close();
- ProxyPlugin.getPlugin().getLogger().log(e);
- markInvalid(e.getLocalizedMessage());
- throwIllegalStateException(IO_EXCEPTION_MSG);
- }
- }
-
- /* (non-Javadoc)
- * @see org.eclipse.jem.internal.proxy.core.Expression#pushMethodToProxy(org.eclipse.jem.internal.proxy.core.ExpressionProxy, org.eclipse.jem.internal.proxy.core.IProxyBeanType, java.lang.String, org.eclipse.jem.internal.proxy.core.IProxyBeanType[])
- */
- protected void pushMethodToProxy(ExpressionProxy proxy, IProxyBeanType declaringType, String methodName, IProxyBeanType[] parameterTypes) {
- // Push method to proxy is sent out of sequence without respect to where in expression we are,
- // so no need to handle pending transactions at this point. They would not affect the result
- // of this call.
-
- IREMExpressionConnection connection = getConnection();
- try {
- // Format of push to method proxy command is:
- // PushExpressionCommand(push method type expression proxy)
- // int: proxy id
- // ValueObject: containing the rendered bean type proxy or the expression proxy for the declaring type
- // string: method name
- // int: number of parameter types
- // ValueObject(s): containing the rendered bean type proxy or the expression proxy for the parameter types.
- connection.pushExpressionCommand(getREMExpressionID(), (byte)InternalExpressionTypes.PUSH_METHOD_EXPRESSIONPROXY_EXPRESSION_VALUE);
- connection.pushInt(proxy.getProxyID());
- fillProxy(declaringType, workerValue);
- connection.pushValueObject(workerValue);
- connection.pushString(methodName);
- if (parameterTypes == null || parameterTypes.length == 0)
- connection.pushInt(0);
- else {
- connection.pushInt(parameterTypes.length);
- for (int i = 0; i < parameterTypes.length; i++) {
- fillProxy(parameterTypes[i], workerValue);
- connection.pushValueObject(workerValue);
- }
- }
- } catch (IOException e) {
- connection.close();
- ProxyPlugin.getPlugin().getLogger().log(e);
- markInvalid(e.getLocalizedMessage());
- throwIllegalStateException(IO_EXCEPTION_MSG);
- } catch (CommandException e) {
- ProxyPlugin.getPlugin().getLogger().log(e);
- markInvalid(e.getLocalizedMessage());
- if (!e.isRecoverable()) {
- connection.close();
- throwIllegalStateException(COMMAND_EXCEPTION_MSG);
- }
- }
- }
-
- /* (non-Javadoc)
- * @see org.eclipse.jem.internal.proxy.core.Expression#pushFieldToProxy(org.eclipse.jem.internal.proxy.core.ExpressionProxy, org.eclipse.jem.internal.proxy.core.IProxyBeanType, java.lang.String)
- */
- protected void pushFieldToProxy(ExpressionProxy proxy, IProxyBeanType declaringType, String fieldName) {
- // Push field to proxy is sent out of sequence without respect to where in expression we are,
- // so no need to handle pending transactions at this point. They would not affect the result
- // of this call.
-
- IREMExpressionConnection connection = getConnection();
- try {
- // Format of push to field proxy command is:
- // PushExpressionCommand(push field type expression proxy)
- // int: proxy id
- // ValueObject: containing the rendered bean type proxy or the expression proxy for the declaring type
- // string: field name
- connection.pushExpressionCommand(getREMExpressionID(), (byte)InternalExpressionTypes.PUSH_FIELD_EXPRESSIONPROXY_EXPRESSION_VALUE);
- connection.pushInt(proxy.getProxyID());
- fillProxy(declaringType, workerValue);
- connection.pushValueObject(workerValue);
- connection.pushString(fieldName);
- } catch (IOException e) {
- connection.close();
- ProxyPlugin.getPlugin().getLogger().log(e);
- markInvalid(e.getLocalizedMessage());
- throwIllegalStateException(IO_EXCEPTION_MSG);
- } catch (CommandException e) {
- ProxyPlugin.getPlugin().getLogger().log(e);
- markInvalid(e.getLocalizedMessage());
- if (!e.isRecoverable()) {
- connection.close();
- throwIllegalStateException(COMMAND_EXCEPTION_MSG);
- }
- }
- }
-
- /**
- * Get the map of IProxyMethods for a beantype. Meant to be used only in conjunction with REMProxyConstants.
- * It is here so the REMProxyConstants can store pending proxies per expression.
- *
- * @param beanType
- * @return
- *
- * @since 1.1.0
- */
- public Map getMethods(IProxyBeanType beanType) {
- if (methodsCache == null)
- methodsCache = new HashMap();
- Map methods = (Map) methodsCache.get(beanType.getTypeName());
- if(methods == null){
- methods = new HashMap(20);
- methodsCache.put(beanType.getTypeName(),methods);
- }
- return methods;
- }
-
- /**
- * Get the map of IProxyFields for a beantype. Meant to be used only in conjunction with REMProxyConstants.
- * It is here so the REMProxyConstants can store pending proxies per expression.
- *
- * @param beanType
- * @return
- *
- * @since 1.1.0
- */
- public Map getFields(IProxyBeanType beanType) {
- if (fieldsCache == null)
- fieldsCache = new HashMap();
- Map fields = (Map) fieldsCache.get(beanType.getTypeName());
- if(fields == null){
- fields = new HashMap(20);
- fieldsCache.put(beanType.getTypeName(),fields);
- }
- return fields;
- }
-
- /**
- * Get the map of IProxyBeanTypes for a beantype name. Meant to be used only in conjunction with REMSgtandardBeanTypeFactory.
- * It is here so the REMStandardBeanTypeFactory can store pending proxies per expression.
- *
- * @param beanType
- * @return
- *
- * @since 1.1.0
- */
- public IProxyBeanType getBeanType(String beanTypeName) {
- if (beanTypeCache == null)
- beanTypeCache = new HashMap();
- return (IProxyBeanType) beanTypeCache.get(beanTypeName);
- }
-
- /**
- * Add the beantype expression proxy to the map of bean type expression proxies. Used in conjunction with REMStandardBeanTypeFactory.
- * It is here so the REMStandardBeanTypeFactory can store pending proxies per expression.
- * @param beanTypeName
- * @param beantype
- *
- * @since 1.1.0
- */
- public void addBeanType(String beanTypeName, IProxyBeanType beantype) {
- beanTypeCache.put(beanTypeName, beantype);
- }
-
- /**
- * Remove the beantype expression proxy from the map. This is called because there was a rollback due to an endmark.
- * @param beanTypeName
- *
- * @since 1.1.0
- */
- public void removeBeanType(String beanTypeName) {
- beanTypeCache.remove(beanTypeName);
- }
-
- /* (non-Javadoc)
- * @see org.eclipse.jem.internal.proxy.core.Expression#pushIfTestToProxy()
- */
- protected void pushIfTestToProxy() {
- processPendingTransactions();
- IREMExpressionConnection connection = getConnection();
- try {
- // Format of push if test to proxy command is:
- // PushExpressionCommand(push if test to proxy)
- connection.pushExpressionCommand(getREMExpressionID(), (byte)InternalExpressionTypes.IF_TEST_EXPRESSION_VALUE);
- } catch (IOException e) {
- connection.close();
- ProxyPlugin.getPlugin().getLogger().log(e);
- markInvalid(e.getLocalizedMessage());
- throwIllegalStateException(IO_EXCEPTION_MSG);
- }
- }
-
- /* (non-Javadoc)
- * @see org.eclipse.jem.internal.proxy.core.Expression#pushIfElseToProxy(org.eclipse.jem.internal.proxy.initParser.tree.InternalIfElseOperandType)
- */
- protected void pushIfElseToProxy(InternalIfElseOperandType clauseType) {
- processPendingTransactions();
- IREMExpressionConnection connection = getConnection();
- try {
- // Format of push conditional to proxy command is:
- // PushExpressionCommand(push if/else clause to proxy) followed by:
- // byte: clause type
- connection.pushExpressionCommand(getREMExpressionID(), (byte)InternalExpressionTypes.IF_ELSE_EXPRESSION_VALUE);
- connection.pushByte((byte) clauseType.getValue());
- } catch (IOException e) {
- connection.close();
- ProxyPlugin.getPlugin().getLogger().log(e);
- markInvalid(e.getLocalizedMessage());
- throwIllegalStateException(IO_EXCEPTION_MSG);
- }
- }
-
- /* (non-Javadoc)
- * @see org.eclipse.jem.internal.proxy.core.Expression#pushNewInstanceToProxy(java.lang.String, org.eclipse.jem.internal.proxy.core.IProxyBeanType)
- */
- protected void pushNewInstanceToProxy(String initializationString, IProxyBeanType resultType) {
- processPendingTransactions();
- IREMExpressionConnection connection = getConnection();
- try {
- // Format of push new instance from initstring to proxy command is:
- // PushExpressionCommand(push new instance to proxy) followed by:
- // string: init string
- // ValueObject: containing the rendered bean type proxy or the expression proxy for the declaring type
- connection.pushExpressionCommand(getREMExpressionID(), (byte)InternalExpressionTypes.NEW_INSTANCE_VALUE);
- connection.pushString(initializationString);
- fillProxy(resultType, workerValue);
- connection.pushValueObject(workerValue);
- } catch (IOException e) {
- connection.close();
- ProxyPlugin.getPlugin().getLogger().log(e);
- markInvalid(e.getLocalizedMessage());
- throwIllegalStateException(IO_EXCEPTION_MSG);
- } catch (CommandException e) {
- ProxyPlugin.getPlugin().getLogger().log(e);
- markInvalid(e.getLocalizedMessage());
- if (!e.isRecoverable()) {
- connection.close();
- throwIllegalStateException(COMMAND_EXCEPTION_MSG);
- }
- }
- }
-
- private static class Mark extends PendingTransaction {
- public int markID;
-
- public Mark(int markID) {
- this.markID = markID;
- }
-
- public void pushTransaction(REMExpression remExpression) {
- IREMExpressionConnection connection = remExpression.getConnection();
- try {
- // Format of push mark to proxy command is:
- // PushExpressionCommand(push mark to proxy) followed by:
- // int: markID
- connection.pushExpressionCommand(remExpression.getREMExpressionID(), (byte)InternalExpressionTypes.MARK_VALUE);
- connection.pushInt(markID);
- } catch (IOException e) {
- connection.close();
- ProxyPlugin.getPlugin().getLogger().log(e);
- remExpression.markInvalid(e.getLocalizedMessage());
- remExpression.throwIllegalStateException(IO_EXCEPTION_MSG);
- }
- }
-
- }
-
- protected void pushMarkToProxy(int markID) {
- addPendingTransaction(new Mark(markID));
- }
-
- protected void pushEndmarkToProxy(int markID, boolean restore) {
- // See if the top pending transaction is now Mark(markID). If it is, then this transaction and the mark begin
- // can be thrown away because they are an empty block.
- PendingTransaction topEntry = getPendingEntryFromTop(1);
- if (topEntry instanceof Mark && ((Mark) topEntry).markID == markID) {
- popPendingEntry(1);
- return;
- }
- processPendingTransactions();
- IREMExpressionConnection connection = getConnection();
- try {
- // Format of push end mark to proxy command is:
- // PushExpressionCommand(push end mark to proxy) followed by:
- // int: markID
- // boolean: restore
- connection.pushExpressionCommand(getREMExpressionID(), (byte)InternalExpressionTypes.ENDMARK_VALUE);
- connection.pushInt(markID);
- connection.pushBoolean(restore);
- } catch (IOException e) {
- connection.close();
- ProxyPlugin.getPlugin().getLogger().log(e);
- markInvalid(e.getLocalizedMessage());
- throwIllegalStateException(IO_EXCEPTION_MSG);
- }
- }
-
- // This is the expression processor controller used to transfer.
- // This is the guy that maintains continuity of the transaction as
- // it is passed from one connection to another.
- protected IBeanProxy expressionProcesserController;
- protected void pushBeginTransferThreadToProxy() throws ThrowableProxy {
- // If the controller is not null, that means we had already requested a transfer
- // but had not used it in this thread so there is no need to do anything. It
- // will be handled when switching back to the other thread.
- // If the connection is null, no need to do anything since there is no connection
- // to transfer.
- if (connection != null && expressionProcesserController == null) {
- IREMExpressionConnection lclConnection = getConnection();
- markInTransaction(lclConnection);
- try {
- workerValue.set();
- lclConnection.transferExpression(getREMExpressionID(), workerValue);
- expressionProcesserController = getREMBeanProxyFactory().getBeanProxy(workerValue);
- getREMRegistry().returnConnection(lclConnection);
- this.connection = null;
- } catch (CommandException e) {
- ProxyPlugin.getPlugin().getLogger().log(e);
- if (!e.isRecoverable()) {
- lclConnection.close();
- throwIllegalStateException(COMMAND_EXCEPTION_MSG);
- }
- } finally {
- markEndTransaction(lclConnection);
- }
- }
- }
-
- protected void pushTransferThreadToProxy() {
- // Don't need to do anything. The next time we need to push data across, we will get a connection and the getConnection()
- // will hook up the expression processor controller for us. This way if nothing happens in this thread then we won't
- // waste communication time on it.
- }
-
- private static class SubexpressionBegin extends PendingTransaction {
- public int subexpressionNumber;
-
- public SubexpressionBegin(int subexpressionNumber) {
- this.subexpressionNumber = subexpressionNumber;
- }
-
- public void pushTransaction(REMExpression remExpression) {
- IREMExpressionConnection connection = remExpression.getConnection();
- try {
- // Format of push to subexpression begin proxy command is:
- // PushExpressionCommand(push subexpression begin proxy to proxy) followed by:
- // int: subexpression id
- connection.pushExpressionCommand(remExpression.getREMExpressionID(), (byte)InternalExpressionTypes.SUBEXPRESSION_BEGIN_EXPRESSION_VALUE);
- connection.pushInt(subexpressionNumber);
- } catch (IOException e) {
- connection.close();
- ProxyPlugin.getPlugin().getLogger().log(e);
- remExpression.markInvalid(e.getLocalizedMessage());
- remExpression.throwIllegalStateException(IO_EXCEPTION_MSG);
- }
- }
-
- }
-
- protected void pushSubexpressionBeginToProxy(int subexpressionNumber) {
- addPendingTransaction(new SubexpressionBegin(subexpressionNumber));
- }
-
- protected void pushSubexpressionEndToProxy(int subexpressionNumber) {
- // See if the top pending transactions is SubexpressionBegin(subexpressionNumber). If it is then the SubexpressionBegin can be thrown away.
- PendingTransaction topEntry = getPendingEntryFromTop(1);
- if (topEntry instanceof SubexpressionBegin && ((SubexpressionBegin) topEntry).subexpressionNumber == subexpressionNumber) {
- popPendingEntry(1);
- return;
- }
- processPendingTransactions();
- IREMExpressionConnection connection = getConnection();
- try {
- // Format of push to block end proxy command is:
- // PushExpressionCommand(push subexpression end proxy to proxy) followed by:
- // int: subexpression id
- connection.pushExpressionCommand(getREMExpressionID(), (byte)InternalExpressionTypes.SUBEXPRESSION_END_EXPRESSION_VALUE);
- connection.pushInt(subexpressionNumber);
- } catch (IOException e) {
- connection.close();
- ProxyPlugin.getPlugin().getLogger().log(e);
- markInvalid(e.getLocalizedMessage());
- throwIllegalStateException(IO_EXCEPTION_MSG);
- }
- }
-}
diff --git a/plugins/org.eclipse.jem.proxy/proxyRemote/org/eclipse/jem/internal/proxy/remote/REMFieldProxy.java b/plugins/org.eclipse.jem.proxy/proxyRemote/org/eclipse/jem/internal/proxy/remote/REMFieldProxy.java
deleted file mode 100644
index b99a596..0000000
--- a/plugins/org.eclipse.jem.proxy/proxyRemote/org/eclipse/jem/internal/proxy/remote/REMFieldProxy.java
+++ /dev/null
@@ -1,106 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2001, 2005 IBM Corporation and others.
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
- *
- * Contributors:
- * IBM Corporation - initial API and implementation
- *******************************************************************************/
-package org.eclipse.jem.internal.proxy.remote;
-/*
-
-
- */
-
-import org.eclipse.jem.internal.proxy.core.*;
-import org.eclipse.jem.internal.proxy.common.remote.Commands;
-
-final class REMFieldProxy extends REMAccessibleObjectProxy implements IFieldProxy {
- private IBeanTypeProxy fFieldType;
-
- REMFieldProxy(REMProxyFactoryRegistry aRegistry, Integer anID) {
- super(aRegistry, anID);
- }
-
- /**
- * Return the type of the field.
- */
- public IBeanTypeProxy getFieldType() {
- if (fFieldType == null)
- fFieldType =
- (IBeanTypeProxy) REMStandardBeanProxyConstants.getConstants(fFactory).getFieldGetType().invokeCatchThrowableExceptions(
- this);
-
- return fFieldType;
- }
-
- /**
- * Release the proxy, i.e. mark it invalid.
- */
- public void release() {
- fFieldType = null;
- super.release();
- }
-
- /**
- * Get the value of this field from the subject
- */
- public IBeanProxy get(IBeanProxy subject) throws ThrowableProxy {
- // Format of getter parms is: (Object (subject)).
- // If the component type is primitive, we need to use the correct getter so that a valid value is returned,
- // if we just used the standard get, if the type was "int" the value returned would be an java.lang.Integer.
- IBeanTypeProxy fieldType = getFieldType();
- if (!fieldType.isPrimitive()) {
- // Use standard getter.
- return ((IREMMethodProxy) REMStandardBeanProxyConstants.getConstants(fFactory).getFieldGet()).invoke(this, subject);
- } else {
- // Use the correct primitive getter.
- int id = ((IREMBeanProxy) fieldType).getID().intValue();
- switch (id) {
- case Commands.BYTE_TYPE :
- return ((IREMMethodProxy) REMStandardBeanProxyConstants.getConstants(fFactory).getFieldGetByte()).invoke(this, subject);
- case Commands.BOOLEAN_TYPE :
- return ((IREMMethodProxy) REMStandardBeanProxyConstants.getConstants(fFactory).getFieldGetBoolean()).invoke(
- this,
- subject);
- case Commands.CHARACTER_TYPE :
- return ((IREMMethodProxy) REMStandardBeanProxyConstants.getConstants(fFactory).getFieldGetChar()).invoke(this, subject);
- case Commands.DOUBLE_TYPE :
- return ((IREMMethodProxy) REMStandardBeanProxyConstants.getConstants(fFactory).getFieldGetDouble()).invoke(
- this,
- subject);
- case Commands.FLOAT_TYPE :
- return ((IREMMethodProxy) REMStandardBeanProxyConstants.getConstants(fFactory).getFieldGetFloat()).invoke(
- this,
- subject);
- case Commands.INTEGER_TYPE :
- return ((IREMMethodProxy) REMStandardBeanProxyConstants.getConstants(fFactory).getFieldGetInt()).invoke(this, subject);
- case Commands.LONG_TYPE :
- return ((IREMMethodProxy) REMStandardBeanProxyConstants.getConstants(fFactory).getFieldGetLong()).invoke(this, subject);
- case Commands.SHORT_TYPE :
- return ((IREMMethodProxy) REMStandardBeanProxyConstants.getConstants(fFactory).getFieldGetShort()).invoke(
- this,
- subject);
- }
- }
-
- return null;
- }
-
- /**
- * Set the value of this field in this subject to this value.
- */
- public void set(IBeanProxy subject, IBeanProxy value) throws ThrowableProxy {
- REMStandardBeanProxyConstants.getConstants(fFactory).getFieldSet().invoke(this, new IBeanProxy[] { subject, value });
- }
-
- /**
- * The type proxy is constant proxy out of the method factory.
- */
- public IBeanTypeProxy getTypeProxy() {
- return ((REMMethodProxyFactory) fFactory.getMethodProxyFactory()).fieldType;
- }
-
-}
diff --git a/plugins/org.eclipse.jem.proxy/proxyRemote/org/eclipse/jem/internal/proxy/remote/REMFieldTypeProxy.java b/plugins/org.eclipse.jem.proxy/proxyRemote/org/eclipse/jem/internal/proxy/remote/REMFieldTypeProxy.java
deleted file mode 100644
index 06f6670..0000000
--- a/plugins/org.eclipse.jem.proxy/proxyRemote/org/eclipse/jem/internal/proxy/remote/REMFieldTypeProxy.java
+++ /dev/null
@@ -1,67 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2001, 2005 IBM Corporation and others.
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
- *
- * Contributors:
- * IBM Corporation - initial API and implementation
- *******************************************************************************/
-package org.eclipse.jem.internal.proxy.remote;
-/*
-
-
- */
-
-
-import org.eclipse.jem.internal.proxy.core.*;
-import org.eclipse.jem.internal.proxy.common.remote.Commands;
-/**
- * BeanType Proxy for Method class.
- */
-
-final class REMFieldTypeProxy extends REMAbstractBeanTypeProxy {
-
-REMFieldTypeProxy(REMProxyFactoryRegistry aRegistry, IBeanTypeProxy accessibleTypeProxy) {
- super(aRegistry, new Integer(Commands.FIELD_CLASS), java.lang.reflect.Field.class.getName(), accessibleTypeProxy);
-}
-
-/**
- * newBeanTypeForClass: Create a new beantypeproxy of this kind for the given class.
- * This is used by beantype proxy factory when creating a beantype proxy for a subclass.
- * This is because subclasses, unless explicitly overridden, should use the same kind
- * of beantype proxy. This way if anything special is needed for a specific type, then
- * that can be done.
- *
- * For all of the accessible object types, they are final classes, so you can't create a newBeanType
- * for subclasses.
- */
-public IREMBeanTypeProxy newBeanTypeForClass(Integer anID, String aClassname, boolean anAbstract) {
- throw new UnsupportedOperationException();
-}
-
-/**
- * Specialized from REMAbstractBeanTypeProxy to ensure Constructor proxies are created correctly.
- */
-public IREMBeanProxy newBeanProxy(Integer objectID) {
- return new REMFieldProxy(fRegistry, objectID);
-}
-
-/**
- * Note: Since new instances of Constructor are never done through a default ctor,
- * this function is not supported.
- */
-public IBeanProxy newInstance() {
- throw new UnsupportedOperationException();
-}
-
-/**
- * Note: Since new instances of Constructor are never done through an initialization string,
- * this function is not supported.
- */
-public IBeanProxy newInstance(String initializationString) {
- throw new UnsupportedOperationException();
-}
-
-}
diff --git a/plugins/org.eclipse.jem.proxy/proxyRemote/org/eclipse/jem/internal/proxy/remote/REMFloatClassBeanProxy.java b/plugins/org.eclipse.jem.proxy/proxyRemote/org/eclipse/jem/internal/proxy/remote/REMFloatClassBeanProxy.java
deleted file mode 100644
index ab325e3..0000000
--- a/plugins/org.eclipse.jem.proxy/proxyRemote/org/eclipse/jem/internal/proxy/remote/REMFloatClassBeanProxy.java
+++ /dev/null
@@ -1,44 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2001, 2005 IBM Corporation and others.
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
- *
- * Contributors:
- * IBM Corporation - initial API and implementation
- *******************************************************************************/
-package org.eclipse.jem.internal.proxy.remote;
-/*
-
-
- */
-
-
-import org.eclipse.jem.internal.proxy.core.*;
-import org.eclipse.jem.internal.proxy.common.remote.Commands;
-/**
- * Remote proxy implementation of INumberBeanProxy for Float.class
- */
-class REMFloatClassBeanProxy extends REMNumberBeanProxy {
-
-REMFloatClassBeanProxy(REMProxyFactoryRegistry aRegistry, Float aFloat) {
- super(aRegistry, aFloat);
-}
-
-/**
- * Get the beantype
- */
-public IBeanTypeProxy getTypeProxy() {
- return ((REMStandardBeanTypeProxyFactory) fFactory.getBeanTypeProxyFactory()).floatClass;
-}
-
-/**
- * Render the bean into value object.
- */
-public void renderBean(Commands.ValueObject value) {
- value.set((Float) numberValue());
-}
-}
-
-
diff --git a/plugins/org.eclipse.jem.proxy/proxyRemote/org/eclipse/jem/internal/proxy/remote/REMFloatClassBeanTypeProxy.java b/plugins/org.eclipse.jem.proxy/proxyRemote/org/eclipse/jem/internal/proxy/remote/REMFloatClassBeanTypeProxy.java
deleted file mode 100644
index da271be..0000000
--- a/plugins/org.eclipse.jem.proxy/proxyRemote/org/eclipse/jem/internal/proxy/remote/REMFloatClassBeanTypeProxy.java
+++ /dev/null
@@ -1,74 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2001, 2005 IBM Corporation and others.
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
- *
- * Contributors:
- * IBM Corporation - initial API and implementation
- *******************************************************************************/
-package org.eclipse.jem.internal.proxy.remote;
-/*
-
-
- */
-
-
-import org.eclipse.jem.internal.proxy.core.*;
-import org.eclipse.jem.internal.proxy.common.remote.Commands;
-/**
- * Remote Implementation of IBeanTypePRoxy for Float.class
- * Creation date: (2/6/00 9:01:40 AM)
- * @author: Joe Winchester
- */
-final class REMFloatClassBeanTypeProxy extends REMAbstractNumberBeanTypeProxy {
-// Some values are cache'd for speed
- private final INumberBeanProxy zeroProxy;
-/**
- * REMIntegerBeanTypeProxy constructor comment.
- * @param aClass java.lang.Class
- */
-REMFloatClassBeanTypeProxy(REMProxyFactoryRegistry aRegistry, IBeanTypeProxy numberType) {
- super(aRegistry, new Integer(Commands.FLOAT_CLASS), Float.class.getName(), numberType);
-
- // Create the cached values
- zeroProxy = new REMFloatClassBeanProxy(aRegistry, new Float(0F));
-}
-
-/**
- * Helper to create a bean proxy
- * Package protected because everyone should go through the factory API
- * that is defined as part of IBeanProxyFactory
- */
-INumberBeanProxy createFloatBeanProxy(Float aFloat) {
- return (aFloat.floatValue() != 0F) ?
- new REMFloatClassBeanProxy(fRegistry, aFloat) : zeroProxy;
-}
-
-/**
- * Generic way to create an Float proxy, however, the Number must be a Float.
- */
-protected INumberBeanProxy createNumberBeanProxy(Number aNumber) {
- return createFloatBeanProxy((Float) aNumber);
-}
-
-/**
- * newInstance method. Number's don't have a default ctor, so the standard way won't work.
- * Return the zero proxy for this case.
- */
-public IBeanProxy newInstance() {
- return zeroProxy;
-}
-
-/**
- * Create a new bean proxy the ValueObject passed in.
- * We will assume the object is correct type.
- */
-public IBeanProxy newBeanProxy(Commands.ValueObject value) {
- return createFloatBeanProxy(new Float(value.aFloat));
-}
-
-}
-
-
diff --git a/plugins/org.eclipse.jem.proxy/proxyRemote/org/eclipse/jem/internal/proxy/remote/REMFloatTypeBeanProxy.java b/plugins/org.eclipse.jem.proxy/proxyRemote/org/eclipse/jem/internal/proxy/remote/REMFloatTypeBeanProxy.java
deleted file mode 100644
index 67fab41..0000000
--- a/plugins/org.eclipse.jem.proxy/proxyRemote/org/eclipse/jem/internal/proxy/remote/REMFloatTypeBeanProxy.java
+++ /dev/null
@@ -1,131 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2001, 2005 IBM Corporation and others.
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
- *
- * Contributors:
- * IBM Corporation - initial API and implementation
- *******************************************************************************/
-package org.eclipse.jem.internal.proxy.remote;
-/*
-
-
- */
-
-
-import org.eclipse.jem.internal.proxy.common.remote.Commands;
-import org.eclipse.jem.internal.proxy.core.*;
-/**
- * Remote Implementation of INumberBeanProxy for the primitive "float".
- * It can answer all of the primitive number types (int, long, short, byte, double, float).
- * Creation date: (2/6/00 9:02:54 AM)
- * @author: Joe Winchester
- */
-class REMFloatTypeBeanProxy extends REMConstantBeanProxy implements INumberBeanProxy {
- private final float fFloat;
-
-/**
- * It is package protected because they are created
- * in a special way and no one else should create them.
- * @param aBean java.lang.Object
- */
-REMFloatTypeBeanProxy(REMProxyFactoryRegistry aRegistry, float aFloat) {
- super(aRegistry);
- fFloat = aFloat;
-}
-/**
- * equals: Equal if:
- * 1) This proxy == (identity) to the other object
- * 2) Else if other is an IBeanProxy and not a constant one, then if
- * equals on the server.
- * 3) If this is a constant proxy and the other is too or is a constant
- * value (e.g. IStringBeanProxy.equals(String), then true if values are equals.
- */
-public boolean equals(Object anObject) {
- if (this == anObject)
- return true; // Identity
- if (anObject instanceof REMFloatTypeBeanProxy)
- return fFloat == ((REMFloatTypeBeanProxy) anObject).floatValue();
- if (anObject instanceof Double)
- return fFloat == ((Float) anObject).floatValue();
- return false;
-}
-
-/* (non-Javadoc)
- * @see org.eclipse.jem.internal.proxy.core.IBeanProxy#sameAs(org.eclipse.jem.internal.proxy.core.IBeanProxy)
- */
-public boolean sameAs(IBeanProxy aBeanProxy) {
- if (this == aBeanProxy)
- return true; // Identity
- if (aBeanProxy instanceof REMFloatTypeBeanProxy)
- return fFloat == ((REMFloatTypeBeanProxy) aBeanProxy).floatValue();
- return false;
-}
-/**
- * byteValue method comment.
- */
-public byte byteValue() {
- return (byte) fFloat;
-}
-/**
- * doubleValue method comment.
- */
-public double doubleValue() {
- return fFloat;
-}
-/**
- * floatValue method comment.
- */
-public float floatValue() {
- return fFloat;
-}
-/**
- * Return the int value
- */
-public int intValue() {
- return (int) fFloat;
-}
-/**
- * longValue method comment.
- */
-public long longValue() {
- return (long) fFloat;
-}
-/**
- * numberValue method comment.
- */
-public Number numberValue() {
- return new Float(fFloat);
-}
-/**
- * shortValue method comment.
- */
-public short shortValue() {
- return (short) fFloat;
-}
-
-/**
- * The bean's toString.
- */
-public String toBeanString() {
- return String.valueOf(fFloat);
-}
-
-/**
- * Get the beantype
- */
-public IBeanTypeProxy getTypeProxy() {
- return ((REMStandardBeanTypeProxyFactory) fFactory.getBeanTypeProxyFactory()).floatType;
-}
-
-/**
- * Render the bean into value object.
- */
-public void renderBean(Commands.ValueObject value) {
- value.set(fFloat);
-}
-}
-
-
diff --git a/plugins/org.eclipse.jem.proxy/proxyRemote/org/eclipse/jem/internal/proxy/remote/REMFloatTypeBeanTypeProxy.java b/plugins/org.eclipse.jem.proxy/proxyRemote/org/eclipse/jem/internal/proxy/remote/REMFloatTypeBeanTypeProxy.java
deleted file mode 100644
index edc7eb1..0000000
--- a/plugins/org.eclipse.jem.proxy/proxyRemote/org/eclipse/jem/internal/proxy/remote/REMFloatTypeBeanTypeProxy.java
+++ /dev/null
@@ -1,98 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2001, 2005 IBM Corporation and others.
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
- *
- * Contributors:
- * IBM Corporation - initial API and implementation
- *******************************************************************************/
-package org.eclipse.jem.internal.proxy.remote;
-/*
-
-
- */
-
-
-import org.eclipse.jem.internal.proxy.core.*;
-import org.eclipse.jem.internal.proxy.common.remote.Commands;
-/**
- * Remote Implementation of IBeanTypeProxy for Float.TYPE.
- * Creation date: (2/6/00 9:01:40 AM)
- * @author: Joe Winchester
- */
-final class REMFloatTypeBeanTypeProxy extends REMPrimitiveBeanTypeProxy {
-// Some values are cache'd for speed
- private final INumberBeanProxy zeroProxy;
-/**
- * REMIntegerBeanTypeProxy constructor comment.
- * @param aClass java.lang.Class
- */
-REMFloatTypeBeanTypeProxy(REMProxyFactoryRegistry aRegistry) {
- super(aRegistry, new Integer(Commands.FLOAT_TYPE), Float.TYPE.getName());
-
- // Create the cached values
- zeroProxy = new REMFloatTypeBeanProxy(aRegistry, 0F);
-}
-
-/**
- * Helper to create a bean proxy
- * Package protected because everyone should go through the factory API
- * that is defined as part of IBeanProxyFactory
- */
-INumberBeanProxy createFloatBeanProxy(float aFloat) {
- return (aFloat != 0F) ?
- new REMFloatTypeBeanProxy(fRegistry, aFloat) : zeroProxy;
-}
-
-/**
- * newInstance method. float is a primitive, so the standard way won't work.
- * Return the zeroProxy for this case because that is the default value.
- */
-public IBeanProxy newInstance() {
- return zeroProxy;
-}
-
-/**
- * Create a new bean proxy the ValueObject passed in.
- * We will assume the object is correct type.
- */
-public IBeanProxy newBeanProxy(Commands.ValueObject value) {
- return createFloatBeanProxy(value.aFloat);
-}
-
-/**
- * Short cut for newInstance where the string follows the
- * specific pattern we expect. That way it won't be necessary to ship over to the vm
- * to process it.
- *
- * The pattern it can accept is:
- * 1) (float) validNumber - number can be any number because (float) explicitly casts it down.
- * 2) validNumber
- * It will use the decode function of float to determine the valid number.
- */
-public IBeanProxy newInstance(String initializationString) throws ThrowableProxy, ClassCastException, InstantiationException {
- String trim = initializationString.trim();
- if (trim.length() == 0)
- return super.newInstance(initializationString);
- float aFloat;
- if (trim.startsWith("(float)")) { //$NON-NLS-1$
- Number v = parseString(trim.substring("(float)".length()).trim()); //$NON-NLS-1$
- if (v != null)
- aFloat = v.floatValue();
- else
- return super.newInstance(initializationString); // Can't decode it, let full parser handle it.
- } else {
- try {
- aFloat = Float.valueOf(initializationString).floatValue(); // See if valid float format.
- } catch (NumberFormatException e) {
- return super.newInstance(initializationString); // Can't decode it, let full parser handle it.
- }
- }
-
- return getProxyFactoryRegistry().getBeanProxyFactory().createBeanProxyWith(aFloat);
-}
-}
-
-
diff --git a/plugins/org.eclipse.jem.proxy/proxyRemote/org/eclipse/jem/internal/proxy/remote/REMInitErrorBeanTypeProxy.java b/plugins/org.eclipse.jem.proxy/proxyRemote/org/eclipse/jem/internal/proxy/remote/REMInitErrorBeanTypeProxy.java
deleted file mode 100644
index d70efd2..0000000
--- a/plugins/org.eclipse.jem.proxy/proxyRemote/org/eclipse/jem/internal/proxy/remote/REMInitErrorBeanTypeProxy.java
+++ /dev/null
@@ -1,469 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2001, 2005 IBM Corporation and others.
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
- *
- * Contributors:
- * IBM Corporation - initial API and implementation
- *******************************************************************************/
-/*
-
-
- */package org.eclipse.jem.internal.proxy.remote;
-
-import org.eclipse.jem.internal.proxy.core.*;
-import org.eclipse.jem.internal.proxy.common.remote.Commands;
-
-/**
- * A special bean type proxy. It is for those bean types that had an instantiation error while being initialized. It is so we have the message. All
- * other actions against it will fail.
- *
- * @author richkulp
- */
-public class REMInitErrorBeanTypeProxy implements IREMBeanTypeProxy {
-
- protected final String initializationError;
-
- protected final REMProxyFactoryRegistry registry;
-
- protected final String classname;
-
- /**
- * Constructor for REMInitErrorBeanTypeProxy.
- */
- public REMInitErrorBeanTypeProxy(REMProxyFactoryRegistry registry, String initializationError, String classname) {
- super();
- this.registry = registry;
- this.initializationError = initializationError;
- this.classname = classname;
- }
-
- /*
- * (non-Javadoc)
- *
- * @see org.eclipse.jem.internal.proxy.remote.IREMBeanTypeProxy#newBeanProxy(java.lang.Integer)
- */
- public IREMBeanProxy newBeanProxy(Integer anID) {
- return null;
- }
-
- /*
- * (non-Javadoc)
- *
- * @see org.eclipse.jem.internal.proxy.remote.IREMBeanTypeProxy#newBeanTypeForClass(java.lang.Integer, java.lang.String, boolean)
- */
- public IREMBeanTypeProxy newBeanTypeForClass(Integer anID, String aClassname, boolean anAbstract) {
- return null;
- }
-
- /*
- * (non-Javadoc)
- *
- * @see org.eclipse.jem.internal.proxy.core.IBeanTypeProxy#getConstructorProxy(java.lang.String[])
- */
- public IConstructorProxy getConstructorProxy(String[] argumentClassNames) {
- return null;
- }
-
- /*
- * (non-Javadoc)
- *
- * @see org.eclipse.jem.internal.proxy.core.IBeanTypeProxy#getConstructorProxy(org.eclipse.jem.internal.proxy.core.IBeanTypeProxy[])
- */
- public IConstructorProxy getConstructorProxy(IBeanTypeProxy[] argumentTypes) {
- return null;
- }
-
-
- /* (non-Javadoc)
- * @see org.eclipse.jem.internal.proxy.core.IBeanTypeProxy#getConstructors()
- */
- public IConstructorProxy[] getConstructors() {
- return null;
- }
-
- /*
- * (non-Javadoc)
- *
- * @see org.eclipse.jem.internal.proxy.core.IBeanTypeProxy#getConstructorProxy(java.lang.String[])
- */
- public IConstructorProxy getDeclaredConstructorProxy(String[] argumentClassNames) {
- return null;
- }
-
- /*
- * (non-Javadoc)
- *
- * @see org.eclipse.jem.internal.proxy.core.IBeanTypeProxy#getConstructorProxy(org.eclipse.jem.internal.proxy.core.IBeanTypeProxy[])
- */
- public IConstructorProxy getDeclaredConstructorProxy(IBeanTypeProxy[] argumentTypes) {
- return null;
- }
-
-
- /* (non-Javadoc)
- * @see org.eclipse.jem.internal.proxy.core.IBeanTypeProxy#getConstructors()
- */
- public IConstructorProxy[] getDeclaredConstructors() {
- return null;
- }
-
- /* (non-Javadoc)
- * @see org.eclipse.jem.internal.proxy.core.IBeanTypeProxy#getConstructors()
- */
- public IFieldProxy[] getFields() {
- return null;
- }
-
- /* (non-Javadoc)
- * @see org.eclipse.jem.internal.proxy.core.IBeanTypeProxy#getConstructors()
- */
- public IFieldProxy[] getDeclaredFields() {
- return null;
- }
-
- /*
- * (non-Javadoc)
- *
- * @see org.eclipse.jem.internal.proxy.core.IBeanTypeProxy#getFieldProxy(java.lang.String)
- */
- public IFieldProxy getFieldProxy(String fieldName) {
- return null;
- }
-
- /*
- * (non-Javadoc)
- *
- * @see org.eclipse.jem.internal.proxy.core.IBeanTypeProxy#getDeclaredFieldProxy(java.lang.String)
- */
- public IFieldProxy getDeclaredFieldProxy(String fieldName) {
- return null;
- }
-
- /* (non-Javadoc)
- * @see org.eclipse.jem.internal.proxy.core.IBeanTypeProxy#getConstructors()
- */
- public IMethodProxy[] getMethods() {
- return null;
- }
-
- /* (non-Javadoc)
- * @see org.eclipse.jem.internal.proxy.core.IBeanTypeProxy#getConstructors()
- */
- public IMethodProxy[] getDeclaredMethods() {
- return null;
- }
-
-
- /*
- * (non-Javadoc)
- *
- * @see org.eclipse.jem.internal.proxy.core.IBeanTypeProxy#getMethodProxy(java.lang.String)
- */
- public IMethodProxy getMethodProxy(String methodName) {
- return null;
- }
-
- /*
- * (non-Javadoc)
- *
- * @see org.eclipse.jem.internal.proxy.core.IBeanTypeProxy#getMethodProxy(java.lang.String, java.lang.String[])
- */
- public IMethodProxy getMethodProxy(String methodName, String[] argumentClassNames) {
- return null;
- }
-
- /*
- * (non-Javadoc)
- *
- * @see org.eclipse.jem.internal.proxy.core.IBeanTypeProxy#getMethodProxy(java.lang.String, java.lang.String)
- */
- public IMethodProxy getMethodProxy(String methodName, String argumentClassName) {
- return null;
- }
-
- /*
- * (non-Javadoc)
- *
- * @see org.eclipse.jem.internal.proxy.core.IBeanTypeProxy#getMethodProxy(java.lang.String, org.eclipse.jem.internal.proxy.core.IBeanTypeProxy[])
- */
- public IMethodProxy getMethodProxy(String methodName, IBeanTypeProxy[] argumentTypes) {
- return null;
- }
-
- /*
- * (non-Javadoc)
- *
- * @see org.eclipse.jem.internal.proxy.core.IBeanTypeProxy#getMethodProxy(java.lang.String, org.eclipse.jem.internal.proxy.core.IBeanTypeProxy[])
- */
- public IMethodProxy getDeclaredMethodProxy(String methodName, IBeanTypeProxy[] argumentTypes) {
- return null;
- }
-
- /*
- * (non-Javadoc)
- *
- * @see org.eclipse.jem.internal.proxy.core.IBeanTypeProxy#getMethodProxy(java.lang.String, java.lang.String[])
- */
- public IMethodProxy getDeclaredMethodProxy(String methodName, String[] argumentClassNames) {
- return null;
- }
-
- /*
- * (non-Javadoc)
- *
- * @see org.eclipse.jem.internal.proxy.core.IBeanTypeProxy#getNullConstructorProxy()
- */
- public IConstructorProxy getNullConstructorProxy() {
- return null;
- }
-
- /*
- * (non-Javadoc)
- *
- * @see org.eclipse.jem.internal.proxy.core.IBeanProxy#getProxyFactoryRegistry()
- */
- public ProxyFactoryRegistry getProxyFactoryRegistry() {
- return registry;
- }
-
- /*
- * (non-Javadoc)
- *
- * @see org.eclipse.jem.internal.proxy.core.IBeanTypeProxy#getSuperBeanTypeProxy()
- */
- public IBeanTypeProxy getSuperBeanTypeProxy() {
- return null;
- }
-
- /*
- * (non-Javadoc)
- *
- * @see org.eclipse.jem.internal.proxy.core.IBeanTypeProxy#getTypeName()
- */
- public String getTypeName() {
- return classname;
- }
-
- /*
- * (non-Javadoc)
- *
- * @see org.eclipse.jem.internal.proxy.core.IBeanTypeProxy#getFormalTypeName()
- */
- public String getFormalTypeName() {
- return getTypeName();
- }
-
- /*
- * (non-Javadoc)
- *
- * @see org.eclipse.jem.internal.proxy.core.IBeanTypeProxy#isArray()
- */
- public boolean isArray() {
- return false;
- }
-
- /*
- * (non-Javadoc)
- *
- * @see org.eclipse.jem.internal.proxy.core.IBeanTypeProxy#isInterface()
- */
- public boolean isInterface() {
- return false;
- }
-
- /*
- * (non-Javadoc)
- *
- * @see org.eclipse.jem.internal.proxy.core.IBeanTypeProxy#isPrimitive()
- */
- public boolean isPrimitive() {
- return false;
- }
-
- /*
- * (non-Javadoc)
- *
- * @see org.eclipse.jem.internal.proxy.core.IBeanTypeProxy#isKindOf(org.eclipse.jem.internal.proxy.core.IBeanTypeProxy)
- */
- public boolean isKindOf(IBeanTypeProxy aBeanProxyType) {
- return false;
- }
-
- /*
- * (non-Javadoc)
- *
- * @see org.eclipse.jem.internal.proxy.core.IBeanTypeProxy#newInstance()
- */
- public IBeanProxy newInstance() throws ThrowableProxy {
- return null;
- }
-
- /*
- * (non-Javadoc)
- *
- * @see org.eclipse.jem.internal.proxy.core.IBeanTypeProxy#newInstance(java.lang.String)
- */
- public IBeanProxy newInstance(String initializationString) throws ThrowableProxy, ClassCastException, InstantiationException {
- return null;
- }
-
- /*
- * (non-Javadoc)
- *
- * @see org.eclipse.jem.internal.proxy.core.IBeanTypeProxy#getInitializationError()
- */
- public String getInitializationError() {
- return initializationError;
- }
-
- /*
- * (non-Javadoc)
- *
- * @see org.eclipse.jem.internal.proxy.remote.IREMBeanProxy#getID()
- */
- public Integer getID() {
- return null;
- }
-
- /*
- * (non-Javadoc)
- *
- * @see org.eclipse.jem.internal.proxy.remote.IREMBeanProxy#release()
- */
- public void release() {
- }
-
- /*
- * (non-Javadoc)
- *
- * @see org.eclipse.jem.internal.proxy.remote.IREMBeanProxy#renderBean(org.eclipse.jem.internal.proxy.common.remote.Commands.ValueObject)
- */
- public void renderBean(Commands.ValueObject renderInto) {
- }
-
- /*
- * (non-Javadoc)
- *
- * @see org.eclipse.jem.internal.proxy.core.IBeanProxy#getTypeProxy()
- */
- public IBeanTypeProxy getTypeProxy() {
- return null;
- }
-
- /*
- * (non-Javadoc)
- *
- * @see org.eclipse.jem.internal.proxy.core.IBeanProxy#toBeanString()
- */
- public String toBeanString() {
- return ""; //$NON-NLS-1$
- }
-
- /*
- * (non-Javadoc)
- *
- * @see org.eclipse.jem.internal.proxy.core.IBeanProxy#isValid()
- */
- public boolean isValid() {
- return false;
- }
-
- /*
- * (non-Javadoc)
- *
- * @see org.eclipse.jem.internal.proxy.core.IBeanProxy#sameAs(org.eclipse.jem.internal.proxy.core.IBeanProxy)
- */
- public boolean sameAs(IBeanProxy aBeanProxy) {
- return this == aBeanProxy; // This is place holder anyway. So only identical if same proxy.
- }
-
- /*
- * (non-Javadoc)
- *
- * @see org.eclipse.jem.internal.proxy.core.IBeanTypeProxy#getInvokable(java.lang.String, org.eclipse.jem.internal.proxy.core.IBeanTypeProxy[])
- */
- public IInvokable getInvokable(String methodName, IBeanTypeProxy[] argumentTypes) {
- return null;
- }
-
- /*
- * (non-Javadoc)
- *
- * @see org.eclipse.jem.internal.proxy.core.IBeanTypeProxy#getInvokable(java.lang.String, java.lang.String)
- */
- public IInvokable getInvokable(String methodName, String argumentClassName) {
- return null;
- }
-
- /*
- * (non-Javadoc)
- *
- * @see org.eclipse.jem.internal.proxy.core.IBeanTypeProxy#getInvokable(java.lang.String, java.lang.String[])
- */
- public IInvokable getInvokable(String methodName, String[] argumentClassNames) {
- return null;
- }
-
- /*
- * (non-Javadoc)
- *
- * @see org.eclipse.jem.internal.proxy.core.IBeanTypeProxy#getInvokable(java.lang.String)
- */
- public IInvokable getInvokable(String methodName) {
- return null;
- }
- /* (non-Javadoc)
- * @see org.eclipse.jem.internal.proxy.core.IBeanTypeProxy#getCompatibleConstructor(org.eclipse.jem.internal.proxy.core.IBeanTypeProxy[])
- */
- public IConstructorProxy getCompatibleConstructor(IBeanTypeProxy[] argumentTypes) {
- return null;
- }
- /* (non-Javadoc)
- * @see org.eclipse.jem.internal.proxy.core.IBeanTypeProxy#getCompatibleMethod(java.lang.String, org.eclipse.jem.internal.proxy.core.IBeanTypeProxy[])
- */
- public IMethodProxy getCompatibleMethod(String methodName, IBeanTypeProxy[] argumentTypes) {
- return null;
- }
- /* (non-Javadoc)
- * @see org.eclipse.jem.internal.proxy.core.IProxy#isBeanProxy()
- */
- public final boolean isBeanProxy() {
- return true;
- }
- /* (non-Javadoc)
- * @see org.eclipse.jem.internal.proxy.core.IProxy#isExpressionProxy()
- */
- public final boolean isExpressionProxy() {
- return false;
- }
-
- /* (non-Javadoc)
- * @see org.eclipse.jem.internal.proxy.core.IProxyBeanType#getMethodProxy(org.eclipse.jem.internal.proxy.core.IExpression, java.lang.String, org.eclipse.jem.internal.proxy.core.IProxyBeanType[])
- */
- public IProxyMethod getMethodProxy(IExpression expression, String methodName, IProxyBeanType[] parameters) {
- return null; // Since this guy is invalid, we can't return a method.
- }
-
- /* (non-Javadoc)
- * @see org.eclipse.jem.internal.proxy.core.IProxyBeanType#getMethodProxy(org.eclipse.jem.internal.proxy.core.IExpression, java.lang.String, java.lang.String[])
- */
- public IProxyMethod getMethodProxy(IExpression expression, String methodName, String[] parameterTypes) {
- return null;
- }
-
- public IProxyMethod getMethodProxy(IExpression expression, String methodName) {
- return null;
- }
-
- /* (non-Javadoc)
- * @see org.eclipse.jem.internal.proxy.core.IProxyBeanType#getFieldProxy(org.eclipse.jem.internal.proxy.core.IExpression, java.lang.String)
- */
- public IProxyField getFieldProxy(IExpression expression, String fieldName) {
- return null;
- }
-
-
-}
diff --git a/plugins/org.eclipse.jem.proxy/proxyRemote/org/eclipse/jem/internal/proxy/remote/REMIntegerClassBeanProxy.java b/plugins/org.eclipse.jem.proxy/proxyRemote/org/eclipse/jem/internal/proxy/remote/REMIntegerClassBeanProxy.java
deleted file mode 100644
index 7905968..0000000
--- a/plugins/org.eclipse.jem.proxy/proxyRemote/org/eclipse/jem/internal/proxy/remote/REMIntegerClassBeanProxy.java
+++ /dev/null
@@ -1,49 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2001, 2005 IBM Corporation and others.
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
- *
- * Contributors:
- * IBM Corporation - initial API and implementation
- *******************************************************************************/
-package org.eclipse.jem.internal.proxy.remote;
-/*
-
-
- */
-
-
-import org.eclipse.jem.internal.proxy.core.*;
-import org.eclipse.jem.internal.proxy.common.remote.Commands;
-/**
- * Remote Proxy for Integers. Since Integers were first implemented
- * in the VCE, and because they are often referenced, we've created
- * a subclass to handle them. That way we wouldn't need to change
- * everyone that was using the IIntegerProxy interface.
- * Creation date: (08/31/00 11:28:48 AM)
- * @author: Administrator
- */
-class REMIntegerClassBeanProxy extends REMNumberBeanProxy implements IIntegerBeanProxy {
-
-REMIntegerClassBeanProxy(REMProxyFactoryRegistry aRegistry, Integer anInteger) {
- super(aRegistry, anInteger);
-}
-
-/**
- * Get the beantype
- */
-public IBeanTypeProxy getTypeProxy() {
- return ((REMStandardBeanTypeProxyFactory) fFactory.getBeanTypeProxyFactory()).integerClass;
-}
-
-/**
- * Render the bean into value object.
- */
-public void renderBean(Commands.ValueObject value) {
- value.set((Integer) numberValue());
-}
-}
-
-
diff --git a/plugins/org.eclipse.jem.proxy/proxyRemote/org/eclipse/jem/internal/proxy/remote/REMIntegerClassBeanTypeProxy.java b/plugins/org.eclipse.jem.proxy/proxyRemote/org/eclipse/jem/internal/proxy/remote/REMIntegerClassBeanTypeProxy.java
deleted file mode 100644
index 7e5d6cc..0000000
--- a/plugins/org.eclipse.jem.proxy/proxyRemote/org/eclipse/jem/internal/proxy/remote/REMIntegerClassBeanTypeProxy.java
+++ /dev/null
@@ -1,85 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2001, 2005 IBM Corporation and others.
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
- *
- * Contributors:
- * IBM Corporation - initial API and implementation
- *******************************************************************************/
-package org.eclipse.jem.internal.proxy.remote;
-/*
-
-
- */
-
-
-import org.eclipse.jem.internal.proxy.core.*;
-import org.eclipse.jem.internal.proxy.common.remote.Commands;
-/**
- * Remote Implementation of INumberBeanProxy for Integer.class.
- * Creation date: (2/6/00 9:01:40 AM)
- * @author: Joe Winchester
- */
-final class REMIntegerClassBeanTypeProxy extends REMAbstractNumberBeanTypeProxy {
-// Some values are cache'd for speed
- private final IIntegerBeanProxy zeroProxy;
- private final IIntegerBeanProxy oneProxy;
- private final IIntegerBeanProxy twoProxy;
- private final IIntegerBeanProxy threeProxy;
-/**
- * REMIntegerBeanTypeProxy constructor comment.
- * @param aClass java.lang.Class
- */
-REMIntegerClassBeanTypeProxy(REMProxyFactoryRegistry aRegistry, IBeanTypeProxy numberType) {
- super(aRegistry, new Integer(Commands.INTEGER_CLASS), Integer.class.getName(), numberType);
-
- // Create the cached values
- zeroProxy = new REMIntegerClassBeanProxy(aRegistry, new Integer(0));
- oneProxy = new REMIntegerClassBeanProxy(aRegistry, new Integer(1));
- twoProxy = new REMIntegerClassBeanProxy(aRegistry, new Integer(2));
- threeProxy = new REMIntegerClassBeanProxy(aRegistry, new Integer(3));
-
-}
-
-/**
- * Helper to create a bean proxy
- * Package protected because everyone should go through the factory API
- * that is defined as part of IBeanProxyFactory
- */
-IIntegerBeanProxy createIntegerBeanProxy(Integer anInteger) {
- switch(anInteger.intValue()) {
- case 0: return zeroProxy;
- case 1: return oneProxy ;
- case 2: return twoProxy ;
- case 3: return threeProxy ;
- default: return new REMIntegerClassBeanProxy(fRegistry, anInteger);
- }
-}
-
-/**
- * Generic way to create an Integer proxy, however, the Number must be an Integer.
- */
-protected INumberBeanProxy createNumberBeanProxy(Number aNumber) {
- return createIntegerBeanProxy((Integer) aNumber);
-}
-
-/**
- * newInstance method. Number's don't have a default ctor, so the standard way won't work.
- * Return the zero proxy for this case.
- */
-public IBeanProxy newInstance() {
- return zeroProxy;
-}
-
-/**
- * Create a new bean proxy the ValueObject passed in.
- * We will assume the object is correct type.
- */
-public IBeanProxy newBeanProxy(Commands.ValueObject value) {
- return createIntegerBeanProxy(new Integer(value.anInt));
-}
-}
-
-
diff --git a/plugins/org.eclipse.jem.proxy/proxyRemote/org/eclipse/jem/internal/proxy/remote/REMIntegerTypeBeanProxy.java b/plugins/org.eclipse.jem.proxy/proxyRemote/org/eclipse/jem/internal/proxy/remote/REMIntegerTypeBeanProxy.java
deleted file mode 100644
index e80dcc1..0000000
--- a/plugins/org.eclipse.jem.proxy/proxyRemote/org/eclipse/jem/internal/proxy/remote/REMIntegerTypeBeanProxy.java
+++ /dev/null
@@ -1,132 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2001, 2005 IBM Corporation and others.
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
- *
- * Contributors:
- * IBM Corporation - initial API and implementation
- *******************************************************************************/
-package org.eclipse.jem.internal.proxy.remote;
-/*
-
-
- */
-
-
-import org.eclipse.jem.internal.proxy.common.remote.Commands;
-import org.eclipse.jem.internal.proxy.core.*;
-/**
- * Remote Implementation of IIntegerBeanProxy for the primitive "int".
- * It can answer all of the primitive number types (int, long, short, byte, double, float).
- * Creation date: (2/6/00 9:02:54 AM)
- * @author: Joe Winchester
- */
-class REMIntegerTypeBeanProxy extends REMConstantBeanProxy implements IIntegerBeanProxy {
- private final int fInt;
-
-/**
- * It is package protected because they are created
- * in a special way and no one else should create them.
- * @param aBean java.lang.Object
- */
-REMIntegerTypeBeanProxy(REMProxyFactoryRegistry aRegistry, int anInt) {
- super(aRegistry);
- fInt = anInt;
-}
-/**
- * equals: Equal if:
- * 1) This proxy == (identity) to the other object
- * 2) Else if other is an IBeanProxy and not a constant one, then if
- * equals on the server.
- * 3) If this is a constant proxy and the other is too or is a constant
- * value (e.g. IStringBeanProxy.equals(String), then true if values are equals.
- */
-public boolean equals(Object anObject) {
- if (this == anObject)
- return true; // Identity
- if (anObject instanceof REMIntegerTypeBeanProxy)
- return fInt == ((REMIntegerTypeBeanProxy) anObject).intValue();
- if (anObject instanceof Integer)
- return fInt == ((Integer) anObject).intValue();
- return false;
-}
-
-/* (non-Javadoc)
- * @see org.eclipse.jem.internal.proxy.core.IBeanProxy#sameAs(org.eclipse.jem.internal.proxy.core.IBeanProxy)
- */
-public boolean sameAs(IBeanProxy aBeanProxy) {
- if (this == aBeanProxy)
- return true; // Identity
- if (aBeanProxy instanceof REMIntegerTypeBeanProxy)
- return fInt == ((REMIntegerTypeBeanProxy) aBeanProxy).intValue();
- return false;
-}
-
-/**
- * byteValue method comment.
- */
-public byte byteValue() {
- return (byte) fInt;
-}
-/**
- * doubleValue method comment.
- */
-public double doubleValue() {
- return fInt;
-}
-/**
- * floatValue method comment.
- */
-public float floatValue() {
- return fInt;
-}
-/**
- * Return the int value
- */
-public int intValue() {
- return fInt;
-}
-/**
- * longValue method comment.
- */
-public long longValue() {
- return fInt;
-}
-/**
- * numberValue method comment.
- */
-public Number numberValue() {
- return new Integer(fInt);
-}
-/**
- * shortValue method comment.
- */
-public short shortValue() {
- return (short) fInt;
-}
-
-/**
- * The bean's toString.
- */
-public String toBeanString() {
- return String.valueOf(fInt);
-}
-
-/**
- * Get the beantype
- */
-public IBeanTypeProxy getTypeProxy() {
- return ((REMStandardBeanTypeProxyFactory) fFactory.getBeanTypeProxyFactory()).intType;
-}
-
-/**
- * Render the bean into value object.
- */
-public void renderBean(Commands.ValueObject value) {
- value.set(fInt);
-}
-}
-
-
diff --git a/plugins/org.eclipse.jem.proxy/proxyRemote/org/eclipse/jem/internal/proxy/remote/REMIntegerTypeBeanTypeProxy.java b/plugins/org.eclipse.jem.proxy/proxyRemote/org/eclipse/jem/internal/proxy/remote/REMIntegerTypeBeanTypeProxy.java
deleted file mode 100644
index 1f35e7f..0000000
--- a/plugins/org.eclipse.jem.proxy/proxyRemote/org/eclipse/jem/internal/proxy/remote/REMIntegerTypeBeanTypeProxy.java
+++ /dev/null
@@ -1,111 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2001, 2005 IBM Corporation and others.
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
- *
- * Contributors:
- * IBM Corporation - initial API and implementation
- *******************************************************************************/
-package org.eclipse.jem.internal.proxy.remote;
-/*
-
-
- */
-
-
-import org.eclipse.jem.internal.proxy.core.*;
-import org.eclipse.jem.internal.proxy.common.remote.Commands;
-/**
- * Remote Implementation of IBeanTypeProxy for Integer.TYPE.
- * Creation date: (2/6/00 9:01:40 AM)
- * @author: Joe Winchester
- */
-final class REMIntegerTypeBeanTypeProxy extends REMPrimitiveBeanTypeProxy {
-// Some values are cache'd for speed
- private final IIntegerBeanProxy zeroProxy;
- private final IIntegerBeanProxy oneProxy;
- private final IIntegerBeanProxy twoProxy;
- private final IIntegerBeanProxy threeProxy;
-/**
- * REMIntegerBeanTypeProxy constructor comment.
- * @param aClass java.lang.Class
- */
-REMIntegerTypeBeanTypeProxy(REMProxyFactoryRegistry aRegistry) {
- super(aRegistry, new Integer(Commands.INTEGER_TYPE), Integer.TYPE.getName());
-
- // Create the cached values
- zeroProxy = new REMIntegerTypeBeanProxy(aRegistry, 0);
- oneProxy = new REMIntegerTypeBeanProxy(aRegistry, 1);
- twoProxy = new REMIntegerTypeBeanProxy(aRegistry, 2);
- threeProxy = new REMIntegerTypeBeanProxy(aRegistry, 3);
-
-}
-/**
- * Helper to create a bean proxy
- * Package protected because everyone should go through the factory API
- * that is defined as part of IBeanProxyFactory
- * Use the cache to see if the value is being held before creating a new one
- */
-IIntegerBeanProxy createIntegerBeanProxy(int anInt) {
-
- switch(anInt) {
- case 0: return zeroProxy;
- case 1: return oneProxy ;
- case 2: return twoProxy ;
- case 3: return threeProxy ;
- default: return new REMIntegerTypeBeanProxy(fRegistry, anInt);
- }
-}
-
-/**
- * newInstance method. integer is a primitive, so the standard way won't work.
- * Return the zeroProxy for this case because that is the default value.
- */
-public IBeanProxy newInstance() {
- return zeroProxy;
-}
-
-/**
- * Create a new bean proxy the ValueObject passed in.
- * We will assume the object is correct type.
- */
-public IBeanProxy newBeanProxy(Commands.ValueObject value) {
- return createIntegerBeanProxy(value.anInt);
-}
-
-/**
- * Short cut for newInstance where the string follows the
- * specific pattern we expect. That way it won't be necessary to ship over to the vm
- * to process it.
- *
- * The pattern it can accept is:
- * 1) (int) validNumber - number can be any number because (byte) explicitly casts it down.
- * 2) validNumber
- * It will use the decode function of int to determine the valid number.
- */
-public IBeanProxy newInstance(String initializationString) throws ThrowableProxy, ClassCastException, InstantiationException {
- String trim = initializationString.trim();
- if (trim.length() == 0)
- return super.newInstance(initializationString);
- int anInt;
- if (trim.startsWith("(int)")) { //$NON-NLS-1$
- Number v = parseString(trim.substring("(int)".length()).trim()); //$NON-NLS-1$
- if (v != null)
- anInt = v.intValue();
- else
- return super.newInstance(initializationString); // Can't decode it, let full parser handle it.
- } else {
- try {
- anInt = Integer.decode(trim).intValue(); // See if valid int format.
- } catch (NumberFormatException e) {
- return super.newInstance(initializationString); // Can't decode it, let full parser handle it.
- }
- }
-
- return getProxyFactoryRegistry().getBeanProxyFactory().createBeanProxyWith(anInt);
-}
-}
-
-
diff --git a/plugins/org.eclipse.jem.proxy/proxyRemote/org/eclipse/jem/internal/proxy/remote/REMInterfaceBeanTypeProxy.java b/plugins/org.eclipse.jem.proxy/proxyRemote/org/eclipse/jem/internal/proxy/remote/REMInterfaceBeanTypeProxy.java
deleted file mode 100644
index f18ed52..0000000
--- a/plugins/org.eclipse.jem.proxy/proxyRemote/org/eclipse/jem/internal/proxy/remote/REMInterfaceBeanTypeProxy.java
+++ /dev/null
@@ -1,72 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2001, 2005 IBM Corporation and others.
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
- *
- * Contributors:
- * IBM Corporation - initial API and implementation
- *******************************************************************************/
-package org.eclipse.jem.internal.proxy.remote;
-/*
-
-
- */
-
-
-import org.eclipse.jem.internal.proxy.core.*;
-/**
- * Default beantype proxy for an interface.
- */
-
-public class REMInterfaceBeanTypeProxy extends REMAbstractBeanTypeProxy {
-
- protected REMInterfaceBeanTypeProxy(REMProxyFactoryRegistry aRegistry, Integer anID, String aClassname) {
- super(aRegistry, anID, aClassname, null);
- }
-
- /**
- * Interfaces are interfaces.
- */
- public boolean isInterface() {
- return true;
- }
-
- /**
- * Create a new bean proxy with the specified id.
- *
- * For all of the interface types, this is an invalid operation.
- */
- public IREMBeanProxy newBeanProxy(Integer anID) {
- throw new UnsupportedOperationException();
- }
-
- /**
- * newBeanTypeForClass: Create a new beantypeproxy of this kind for the given class.
- * This is used by beantype proxy factory when creating a beantype proxy for a subclass.
- * This is because subclasses, unless explicitly overridden, should use the same kind
- * of beantype proxy. This way if anything special is needed for a specific type, then
- * that can be done.
- *
- * For all of the interface types, you can't create a newBeanType for subclasses since
- * interface aren't subclassable, only extendable.
- */
- public IREMBeanTypeProxy newBeanTypeForClass(Integer anID, String aClassname, boolean anAbstact) {
- throw new UnsupportedOperationException();
- }
-
- /**
- * Note: Since new instances of interfaces can never be done,
- * this function is not supported.
- */
- public IBeanProxy newInstance() {
- throw new UnsupportedOperationException();
- }
-
- /**
- * newInstance(initializationString) is valid because it can be used to create
- * an instance of an implementation of the interface.
- */
-
-}
diff --git a/plugins/org.eclipse.jem.proxy/proxyRemote/org/eclipse/jem/internal/proxy/remote/REMInvokable.java b/plugins/org.eclipse.jem.proxy/proxyRemote/org/eclipse/jem/internal/proxy/remote/REMInvokable.java
deleted file mode 100644
index fc4514b..0000000
--- a/plugins/org.eclipse.jem.proxy/proxyRemote/org/eclipse/jem/internal/proxy/remote/REMInvokable.java
+++ /dev/null
@@ -1,233 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2004, 2005 IBM Corporation and others.
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
- *
- * Contributors:
- * IBM Corporation - initial API and implementation
- *******************************************************************************/
-/*
-
-
- */
-package org.eclipse.jem.internal.proxy.remote;
-
-import org.eclipse.core.runtime.IStatus;
-import org.eclipse.core.runtime.Status;
-
-import org.eclipse.jem.internal.proxy.common.CommandException;
-import org.eclipse.jem.internal.proxy.common.remote.*;
-import org.eclipse.jem.internal.proxy.core.*;
-import org.eclipse.jem.internal.proxy.core.IInvokable;
-
-
-/**
- * Remote Invokable. This invokes on the remote vm, but it doesn't use a method proxy. Instead
- * it sends the information to get the method to the remote vm along with the parms. That way
- * it will do the lookup on the remote vm and we don't have the overhead of two calls, one to
- * get the methodproxy and the other to actually do the invoke. This should typically be used
- * only for infrequent calls so that cache of the method proxy is not needed.
- *
- * @since 1.0.0
- */
-class REMInvokable implements IInvokable {
-
- protected final IREMBeanTypeProxy beanType; // Beantype to get method from.
- protected final String methodName; // Method name
- protected final IBeanTypeProxy[] methodArgTypes; // Argument types (or null if no arguments).
- protected final REMProxyFactoryRegistry factory; // Factory for this invokable
-
-
- REMInvokable(IREMBeanTypeProxy beanType, String methodName, IBeanTypeProxy[] methodArgTypes) {
- this.beanType = beanType;
- this.methodName = methodName;
- this.methodArgTypes = methodArgTypes;
- this.factory = (REMProxyFactoryRegistry) beanType.getProxyFactoryRegistry();
- }
-
- public IBeanProxy invoke(IBeanProxy subject) throws ThrowableProxy {
- return invoke(subject, (IBeanProxy[]) null);
- }
-
- public IBeanProxy invoke(IBeanProxy subject, IBeanProxy[] parms) throws ThrowableProxy {
- return invokeWithParms(subject, parms);
- }
-
- /**
- * The internal method that allows mixture of constants (e.g. String) with bean proxies.
- * A parm value can be a REMMethodProxy.ParmArray. This means this parm is an array that
- * needs to have a ValueRetriever created for it. This is used if the array has ID's in
- * it and is not an existing array on the server or all constant values.
- *
- * NOTE: It is assumed that all IBeanTypeProxies of the parms have already been retrieved.
- * It should still work, but it could be asking for them in the middle of the request
- * if they are not first gotton.
- *
- */
- public IBeanProxy invokeWithParms(IBeanProxy subject, final Object[] parms) throws ThrowableProxy {
- IREMConnection connect = factory.getFreeConnection();
- REMStandardBeanProxyFactory proxyFactory = (REMStandardBeanProxyFactory) factory.getBeanProxyFactory();
- proxyFactory.startTransaction(); // This is definately a transaction, so start it.
- try {
- // First need to send the method info.
- Commands.ValueObject classValue = new Commands.ValueObject();
- beanType.renderBean(classValue);
-
- Commands.ValueObject parmTypesValue = new Commands.ValueObject();
- if (methodArgTypes != null) {
- class Retriever implements Commands.ValueRetrieve {
- int index = 0;
- Object[] array;
- Commands.ValueObject worker = new Commands.ValueObject();
-
- public Retriever(Object[] anArray) {
- array = anArray;
- }
-
- public Commands.ValueObject nextValue() {
- Object parm = array[index++];
- ((IREMBeanTypeProxy) parm).renderBean(worker);
- return worker;
- }
- };
-
- parmTypesValue.setArrayIDS(new Retriever(methodArgTypes), methodArgTypes.length, Commands.CLASS_CLASS); // Create Class[].
- }
-
-
- // Now we start building the actual invocation.
-
- Commands.ValueObject subjectValue = new Commands.ValueObject();
- if (subject != null)
- ((IREMBeanProxy) subject).renderBean(subjectValue);
-
- Commands.ValueObject parmsValue = new Commands.ValueObject();
-
- if (parms != null) {
- // Have a local definition of the retriever so that the retriever can create
- // another one of itself if necessary.
- final IStandardBeanTypeProxyFactory typeFactory = factory.getBeanTypeProxyFactory();
-
- class Retriever implements Commands.ValueRetrieve {
- int index = 0;
- Object[] array;
- Commands.ValueObject worker = new Commands.ValueObject();
-
- public Retriever(Object[] anArray) {
- array = anArray;
- }
-
- public Commands.ValueObject nextValue() {
- Object parm = array[index++];
- if (parm != null)
- if (parm instanceof IREMBeanProxy)
- ((IREMBeanProxy) parm).renderBean(worker);
- else if (parm instanceof TransmitableArray) {
- // It is another array, create a new retriever.
- worker.setArrayIDS(
- new Retriever(((TransmitableArray) parm).array),
- ((TransmitableArray) parm).array.length,
- ((TransmitableArray) parm).componentTypeID);
- } else {
- // It's an object. Need to get bean type so that we can send it.
- IREMBeanProxy type = (IREMBeanProxy) typeFactory.getBeanTypeProxy(parm.getClass().getName());
- if (type == null)
- throw new IllegalArgumentException();
- int classID = type.getID().intValue();
- worker.setAsObject(parm, classID);
- }
- else
- worker.set();
- return worker;
- }
- };
-
- parmsValue.setArrayIDS(new Retriever(parms), parms.length, Commands.OBJECT_CLASS); // Create Object[].
- }
-
- Commands.ValueObject returnValue = new Commands.ValueObject();
- try {
- invoke(connect, proxyFactory, classValue, parmTypesValue, subjectValue, parmsValue, returnValue);
- return proxyFactory.getBeanProxy(returnValue);
- } catch (CommandException e) {
- if (!e.isRecoverable()) {
- // Close the connection and try again.
- factory.closeConnection(connect);
- connect = null;
- connect = factory.getFreeConnection();
- try {
- invoke(connect, proxyFactory, classValue, parmTypesValue, subjectValue, parmsValue, returnValue);
- return proxyFactory.getBeanProxy(returnValue);
- } catch (CommandException eAgain) {
- // Failed again. Just close and print trace.
- factory.closeConnection(connect);
- connect = null;
- ProxyPlugin.getPlugin().getLogger().log(new Status(IStatus.WARNING, ProxyPlugin.getPlugin().getBundle().getSymbolicName(), 0, "", eAgain)); //$NON-NLS-1$
- return null;
- }
- } else {
- // A recoverable error, print trace and return
- ProxyPlugin.getPlugin().getLogger().log(new Status(IStatus.WARNING, ProxyPlugin.getPlugin().getBundle().getSymbolicName(), 0, "", e)); //$NON-NLS-1$
- return null;
- }
- }
- } finally {
- proxyFactory.stopTransaction();
- if (connect != null)
- factory.returnConnection(connect);
- }
- }
-
-private void invoke(
- IREMConnection connect,
- REMStandardBeanProxyFactory proxyFactory,
- Commands.ValueObject classTypeValue,
- Commands.ValueObject parmTypesValue,
- Commands.ValueObject subjectValue,
- Commands.ValueObject parmsValue,
- Commands.ValueObject returnValue)
- throws ThrowableProxy, CommandException {
- try {
- connect.invokeMethod(classTypeValue, methodName, parmTypesValue, subjectValue, parmsValue, returnValue);
- } catch (CommandErrorException e) {
- proxyFactory.processErrorReturn(e);
- }
- }
-
- public IBeanProxy invoke(IBeanProxy subject, IBeanProxy parm) throws ThrowableProxy {
- return invoke(subject, new IBeanProxy[] { parm });
- }
-
- public IBeanProxy invokeCatchThrowableExceptions(IBeanProxy subject) {
- try {
- return invoke(subject);
- } catch (ThrowableProxy e) {
- ProxyPlugin.getPlugin().getLogger().log(new Status(IStatus.WARNING, ProxyPlugin.getPlugin().getBundle().getSymbolicName(), 0, "", e)); //$NON-NLS-1$
- factory.releaseProxy(e); // Since it's no longer needed, get rid of now instead of GC time.
- return null;
- }
- }
-
- public IBeanProxy invokeCatchThrowableExceptions(IBeanProxy subject, IBeanProxy[] parms) {
- try {
- return invoke(subject, parms);
- } catch (ThrowableProxy e) {
- ProxyPlugin.getPlugin().getLogger().log(new Status(IStatus.WARNING, ProxyPlugin.getPlugin().getBundle().getSymbolicName(), 0, "", e)); //$NON-NLS-1$
- factory.releaseProxy(e); // Since it's no longer needed, get rid of now instead of GC time.
- return null;
- }
- }
-
- public IBeanProxy invokeCatchThrowableExceptions(IBeanProxy subject, IBeanProxy parm) {
- try {
- return invoke(subject, parm);
- } catch (ThrowableProxy e) {
- ProxyPlugin.getPlugin().getLogger().log(new Status(IStatus.WARNING, ProxyPlugin.getPlugin().getBundle().getSymbolicName(), 0, "", e)); //$NON-NLS-1$
- factory.releaseProxy(e); // Since it's no longer needed, get rid of now instead of GC time.
- return null;
- }
- }
-
-}
diff --git a/plugins/org.eclipse.jem.proxy/proxyRemote/org/eclipse/jem/internal/proxy/remote/REMLongClassBeanProxy.java b/plugins/org.eclipse.jem.proxy/proxyRemote/org/eclipse/jem/internal/proxy/remote/REMLongClassBeanProxy.java
deleted file mode 100644
index 94b41a2..0000000
--- a/plugins/org.eclipse.jem.proxy/proxyRemote/org/eclipse/jem/internal/proxy/remote/REMLongClassBeanProxy.java
+++ /dev/null
@@ -1,44 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2001, 2005 IBM Corporation and others.
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
- *
- * Contributors:
- * IBM Corporation - initial API and implementation
- *******************************************************************************/
-package org.eclipse.jem.internal.proxy.remote;
-/*
-
-
- */
-
-
-import org.eclipse.jem.internal.proxy.core.*;
-import org.eclipse.jem.internal.proxy.common.remote.Commands;
-/**
- * Remote Proxy for Long.class.
- */
-class REMLongClassBeanProxy extends REMNumberBeanProxy {
-
-REMLongClassBeanProxy(REMProxyFactoryRegistry aRegistry, Long aLong) {
- super(aRegistry, aLong);
-}
-
-/**
- * Get the beantype
- */
-public IBeanTypeProxy getTypeProxy() {
- return ((REMStandardBeanTypeProxyFactory) fFactory.getBeanTypeProxyFactory()).longClass;
-}
-
-/**
- * Render the bean into value object.
- */
-public void renderBean(Commands.ValueObject value) {
- value.set((Long) numberValue());
-}
-}
-
-
diff --git a/plugins/org.eclipse.jem.proxy/proxyRemote/org/eclipse/jem/internal/proxy/remote/REMLongClassBeanTypeProxy.java b/plugins/org.eclipse.jem.proxy/proxyRemote/org/eclipse/jem/internal/proxy/remote/REMLongClassBeanTypeProxy.java
deleted file mode 100644
index 45556c2..0000000
--- a/plugins/org.eclipse.jem.proxy/proxyRemote/org/eclipse/jem/internal/proxy/remote/REMLongClassBeanTypeProxy.java
+++ /dev/null
@@ -1,87 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2001, 2005 IBM Corporation and others.
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
- *
- * Contributors:
- * IBM Corporation - initial API and implementation
- *******************************************************************************/
-package org.eclipse.jem.internal.proxy.remote;
-/*
-
-
- */
-
-
-import org.eclipse.jem.internal.proxy.core.*;
-import org.eclipse.jem.internal.proxy.common.remote.Commands;
-/**
- * Remote Implementation of IBeanTypeProxy Long.class.
- * Creation date: (2/6/00 9:01:40 AM)
- * @author: Joe Winchester
- */
-final class REMLongClassBeanTypeProxy extends REMAbstractNumberBeanTypeProxy {
-// Some values are cache'd for speed
- private final INumberBeanProxy zeroProxy;
- private final INumberBeanProxy oneProxy;
- private final INumberBeanProxy twoProxy;
- private final INumberBeanProxy threeProxy;
-/**
- * REMIntegerBeanTypeProxy constructor comment.
- * @param aClass java.lang.Class
- */
-REMLongClassBeanTypeProxy(REMProxyFactoryRegistry aRegistry, IBeanTypeProxy numberType) {
- super(aRegistry, new Integer(Commands.LONG_CLASS), Long.class.getName(), numberType);
-
- // Create the cached values
- zeroProxy = new REMLongClassBeanProxy(aRegistry, new Long(0));
- oneProxy = new REMLongClassBeanProxy(aRegistry, new Long(1));
- twoProxy = new REMLongClassBeanProxy(aRegistry, new Long(2));
- threeProxy = new REMLongClassBeanProxy(aRegistry, new Long(3));
-}
-
-/**
- * Helper to create a bean proxy
- * Package protected because everyone should go through the factory API
- * that is defined as part of IBeanProxyFactory
- */
-INumberBeanProxy createLongBeanProxy(Long aLong) {
- if (aLong.longValue() >= 0 && aLong.longValue() < 4) {
- // Switch statements don't work with longs.
- switch(aLong.intValue()) {
- case 0: return zeroProxy;
- case 1: return oneProxy ;
- case 2: return twoProxy ;
- case 3: return threeProxy ;
- }
- }
- return new REMLongClassBeanProxy(fRegistry, aLong);
-}
-
-/**
- * Generic way to create a Long proxy, however, the Number must be a Long.
- */
-protected INumberBeanProxy createNumberBeanProxy(Number aNumber) {
- return createLongBeanProxy((Long) aNumber);
-}
-
-/**
- * newInstance method. Number's don't have a default ctor, so the standard way won't work.
- * Return the zero proxy for this case.
- */
-public IBeanProxy newInstance() {
- return zeroProxy;
-}
-
-/**
- * Create a new bean proxy the ValueObject passed in.
- * We will assume the object is correct type.
- */
-public IBeanProxy newBeanProxy(Commands.ValueObject value) {
- return createLongBeanProxy(new Long(value.aLong));
-}
-}
-
-
diff --git a/plugins/org.eclipse.jem.proxy/proxyRemote/org/eclipse/jem/internal/proxy/remote/REMLongTypeBeanProxy.java b/plugins/org.eclipse.jem.proxy/proxyRemote/org/eclipse/jem/internal/proxy/remote/REMLongTypeBeanProxy.java
deleted file mode 100644
index a26d800..0000000
--- a/plugins/org.eclipse.jem.proxy/proxyRemote/org/eclipse/jem/internal/proxy/remote/REMLongTypeBeanProxy.java
+++ /dev/null
@@ -1,131 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2001, 2005 IBM Corporation and others.
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
- *
- * Contributors:
- * IBM Corporation - initial API and implementation
- *******************************************************************************/
-package org.eclipse.jem.internal.proxy.remote;
-/*
-
-
- */
-
-
-import org.eclipse.jem.internal.proxy.common.remote.Commands;
-import org.eclipse.jem.internal.proxy.core.*;
-/**
- * Remote Implementation of INumberBeanProxy for the primitive "long".
- * It can answer all of the primitive number types (int, long, short, byte, double, float).
- * Creation date: (2/6/00 9:02:54 AM)
- * @author: Joe Winchester
- */
-class REMLongTypeBeanProxy extends REMConstantBeanProxy implements INumberBeanProxy {
- private final long fLong;
-
-/**
- * It is package protected because they are created
- * in a special way and no one else should create them.
- * @param aBean java.lang.Object
- */
-REMLongTypeBeanProxy(REMProxyFactoryRegistry aRegistry, long aLong) {
- super(aRegistry);
- fLong = aLong;
-}
-/**
- * equals: Equal if:
- * 1) This proxy == (identity) to the other object
- * 2) Else if other is an IBeanProxy and not a constant one, then if
- * equals on the server.
- * 3) If this is a constant proxy and the other is too or is a constant
- * value (e.g. IStringBeanProxy.equals(String), then true if values are equals.
- */
-public boolean equals(Object anObject) {
- if (this == anObject)
- return true; // Identity
- if (anObject instanceof REMLongTypeBeanProxy)
- return fLong == ((REMLongTypeBeanProxy) anObject).longValue();
- if (anObject instanceof Long)
- return fLong == ((Long) anObject).longValue();
- return false;
-}
-
-/* (non-Javadoc)
- * @see org.eclipse.jem.internal.proxy.core.IBeanProxy#sameAs(org.eclipse.jem.internal.proxy.core.IBeanProxy)
- */
-public boolean sameAs(IBeanProxy aBeanProxy) {
- if (this == aBeanProxy)
- return true; // Identity
- if (aBeanProxy instanceof REMLongTypeBeanProxy)
- return fLong == ((REMLongTypeBeanProxy) aBeanProxy).longValue();
- return false;
-}
-/**
- * byteValue method comment.
- */
-public byte byteValue() {
- return (byte) fLong;
-}
-/**
- * doubleValue method comment.
- */
-public double doubleValue() {
- return fLong;
-}
-/**
- * floatValue method comment.
- */
-public float floatValue() {
- return fLong;
-}
-/**
- * Return the int value
- */
-public int intValue() {
- return (int) fLong;
-}
-/**
- * longValue method comment.
- */
-public long longValue() {
- return fLong;
-}
-/**
- * numberValue method comment.
- */
-public Number numberValue() {
- return new Long(fLong);
-}
-/**
- * shortValue method comment.
- */
-public short shortValue() {
- return (short) fLong;
-}
-
-/**
- * The bean's toString.
- */
-public String toBeanString() {
- return String.valueOf(fLong);
-}
-
-/**
- * Get the beantype
- */
-public IBeanTypeProxy getTypeProxy() {
- return ((REMStandardBeanTypeProxyFactory) fFactory.getBeanTypeProxyFactory()).longType;
-}
-
-/**
- * Render the bean into value object.
- */
-public void renderBean(Commands.ValueObject value) {
- value.set(fLong);
-}
-}
-
-
diff --git a/plugins/org.eclipse.jem.proxy/proxyRemote/org/eclipse/jem/internal/proxy/remote/REMLongTypeBeanTypeProxy.java b/plugins/org.eclipse.jem.proxy/proxyRemote/org/eclipse/jem/internal/proxy/remote/REMLongTypeBeanTypeProxy.java
deleted file mode 100644
index b357401..0000000
--- a/plugins/org.eclipse.jem.proxy/proxyRemote/org/eclipse/jem/internal/proxy/remote/REMLongTypeBeanTypeProxy.java
+++ /dev/null
@@ -1,115 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2001, 2005 IBM Corporation and others.
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
- *
- * Contributors:
- * IBM Corporation - initial API and implementation
- *******************************************************************************/
-package org.eclipse.jem.internal.proxy.remote;
-/*
-
-
- */
-
-
-import org.eclipse.jem.internal.proxy.core.*;
-import org.eclipse.jem.internal.proxy.common.remote.Commands;
-/**
- * Remote Implementation of IBeanTypeProxy for Long.TYPE/
- * Creation date: (2/6/00 9:01:40 AM)
- * @author: Joe Winchester
- */
-final class REMLongTypeBeanTypeProxy extends REMPrimitiveBeanTypeProxy {
-// Some values are cache'd for speed
- private final INumberBeanProxy zeroProxy;
- private final INumberBeanProxy oneProxy;
- private final INumberBeanProxy twoProxy;
- private final INumberBeanProxy threeProxy;
-/**
- * REMIntegerBeanTypeProxy constructor comment.
- * @param aClass java.lang.Class
- */
-REMLongTypeBeanTypeProxy(REMProxyFactoryRegistry aRegistry) {
- super(aRegistry, new Integer(Commands.LONG_TYPE), Long.TYPE.getName());
-
- // Create the cached values
- zeroProxy = new REMLongTypeBeanProxy(aRegistry, 0);
- oneProxy = new REMLongTypeBeanProxy(aRegistry, 1);
- twoProxy = new REMLongTypeBeanProxy(aRegistry, 2);
- threeProxy = new REMLongTypeBeanProxy(aRegistry, 3);
-}
-
-/**
- * Helper to create a bean proxy
- * Package protected because everyone should go through the factory API
- * that is defined as part of IBeanProxyFactory
- */
-INumberBeanProxy createLongBeanProxy(long aLong) {
- if (aLong >= 0 && aLong < 4) {
- // Switch statements don't work with longs.
- switch((int) aLong) {
- case 0: return zeroProxy;
- case 1: return oneProxy ;
- case 2: return twoProxy ;
- case 3: return threeProxy ;
- }
- }
- return new REMLongTypeBeanProxy(fRegistry, aLong);
-}
-
-/**
- * newInstance method. long is a primitive, so the standard way won't work.
- * Return the zeroProxy for this case because that is the default value.
- */
-public IBeanProxy newInstance() {
- return zeroProxy;
-}
-
-/**
- * Create a new bean proxy the ValueObject passed in.
- * We will assume the object is correct type.
- */
-public IBeanProxy newBeanProxy(Commands.ValueObject value) {
- return createLongBeanProxy(value.aLong);
-}
-
-/**
- * Short cut for newInstance where the string follows the
- * specific pattern we expect. That way it won't be necessary to ship over to the vm
- * to process it.
- *
- * The pattern it can accept is:
- * 1) (long) validNumber - number can be any number because (byte) explicitly casts it down.
- * 2) validNumber
- * It will use the decode function of long to determine the valid number.
- */
-public IBeanProxy newInstance(String initializationString) throws ThrowableProxy, ClassCastException, InstantiationException {
- String trim = initializationString.trim();
- if (trim.length() == 0)
- return super.newInstance(initializationString);
- long aLong;
- if (trim.startsWith("(long)")) { //$NON-NLS-1$
- Number v = parseString(trim.substring("(long)".length()).trim()); //$NON-NLS-1$
- if (v != null)
- aLong = v.longValue();
- else
- return super.newInstance(initializationString); // Can't decode it, let full parser handle it.
- } else {
- if (trim.charAt(trim.length()-1) == 'L' || trim.charAt(trim.length()-1) == 'l')
- trim = trim.substring(0, trim.length()-1);
- try {
- aLong = Long.decode(trim).longValue(); // See if valid long format.
- } catch (NumberFormatException e) {
- return super.newInstance(initializationString); // Can't decode it, let full parser handle it.
- }
- }
-
- return getProxyFactoryRegistry().getBeanProxyFactory().createBeanProxyWith(aLong);
-}
-
-}
-
-
diff --git a/plugins/org.eclipse.jem.proxy/proxyRemote/org/eclipse/jem/internal/proxy/remote/REMMasterServerThread.java b/plugins/org.eclipse.jem.proxy/proxyRemote/org/eclipse/jem/internal/proxy/remote/REMMasterServerThread.java
deleted file mode 100644
index da70385..0000000
--- a/plugins/org.eclipse.jem.proxy/proxyRemote/org/eclipse/jem/internal/proxy/remote/REMMasterServerThread.java
+++ /dev/null
@@ -1,172 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2001, 2005 IBM Corporation and others.
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
- *
- * Contributors:
- * IBM Corporation - initial API and implementation
- *******************************************************************************/
-package org.eclipse.jem.internal.proxy.remote;
-/*
-
-
- */
-
-import java.io.*;
-import java.net.*;
-
-import org.eclipse.core.runtime.IStatus;
-import org.eclipse.core.runtime.Status;
-import org.eclipse.jem.internal.proxy.core.ProxyPlugin;
-import org.eclipse.jem.internal.proxy.common.remote.Commands;
-
-/**
- * Master Server thread for the Remote VMs.
- *
- * It responds to the remote vm requests to this IDE.
- *
- * It is package-protected because only ProxyRemotePluguin should access it.
- * @author richkulp
- */
-class REMMasterServerThread extends Thread {
-
- protected ServerSocket masterServerSocket;
- protected REMRegistryController registryController;
- protected boolean shuttingDown = false;
-
- // Kludge: Bug in Linux 1.3.xxx of JVM. Closing a socket while the socket is being read/accept will not interrupt the
- // wait. Need to timeout to the socket read/accept before the socket close will be noticed. This has been fixed
- // in Linux 1.4. So on Linux 1.3 need to put timeouts in on those sockets that can be separately closed while reading/accepting.
- static boolean LINUX_1_3 = "linux".equalsIgnoreCase(System.getProperty("os.name")) && System.getProperty("java.version","").startsWith("1.3"); //$NON-NLS-1$ //$NON-NLS-2$ //$NON-NLS-3$ //$NON-NLS-4$ //$NON-NLS-5$
-
-
- public REMMasterServerThread(REMRegistryController registryController) {
- super("Remote Proxy Master Server Thread"); //$NON-NLS-1$
- this.registryController = registryController;
-
- try {
- masterServerSocket = new ServerSocket(0, 50, InetAddress.getByName("localhost")); // Any available port //$NON-NLS-1$
- if (LINUX_1_3)
- masterServerSocket.setSoTimeout(1000); // Linux 1.3 bug, see comment on LINUX_1_3
- } catch (SocketException e) {
- ProxyPlugin.getPlugin().getLogger().log(new Status(IStatus.ERROR, ProxyPlugin.getPlugin().getBundle().getSymbolicName(), 0, "", e)); // This is bad. Should be no exceptions creating a socket. //$NON-NLS-1$
- } catch (IOException e) {
- ProxyPlugin.getPlugin().getLogger().log(new Status(IStatus.ERROR, ProxyPlugin.getPlugin().getBundle().getSymbolicName(), 0, "", e)); // This is bad. Should be no exceptions creating a socket. //$NON-NLS-1$
- }
- }
-
- public ServerSocket getMasterSocket() {
- return masterServerSocket;
- }
-
- /**
- * @see java.lang.Thread#run()
- */
- public void run() {
- try {
- while (masterServerSocket != null) {
- Socket incoming = null;
- try {
- incoming = masterServerSocket.accept();
- } catch (InterruptedIOException e) {
- continue; // Timeout, try again
- } catch (NullPointerException e) {
- continue; // In Linux 1.3 case masterServerSocket could of gone null between loop test and try block.
- }
- boolean close = false; // process request will tell if socket should be closed. it may be passed onto callback thread instead.
- try {
- close = processRequest(incoming);
- } finally {
- if (close) {
- try {
- incoming.close();
- } catch (IOException e) {
- }
- }
-}
- incoming = null;
- }
- } catch (Exception e) {
- if (!shuttingDown)
- ProxyPlugin.getPlugin().getLogger().log(new Status(IStatus.ERROR, ProxyPlugin.getPlugin().getBundle().getSymbolicName(), 0, "", e)); //$NON-NLS-1$
- }
-
- shutdown(); // Either a bad exception or we were closed. Either way is shutdown.
- }
-
- /**
- * Use this to request a shutdown.
- */
- public void requestShutdown() {
- if (masterServerSocket == null)
- return;
- // Closing the server socket should cause a break.
- try {
- shuttingDown = true;
- masterServerSocket.close();
- } catch (Exception e) {
- }
- return;
- }
-
- protected boolean processRequest(Socket remote) throws IOException {
- DataInputStream in = new DataInputStream(remote.getInputStream());
- DataOutputStream out = new DataOutputStream(remote.getOutputStream());
- boolean close = true; // flag indicating socket not given over to callback. Don't close the socket when done because callback has it.
- try {
- byte cmd = in.readByte();
- switch (cmd) {
- case Commands.ALIVE:
- int registryID = in.readInt();
- out.writeBoolean(registryController.getRegistry(new Integer(registryID)) != null); // Return if registry still alive
- out.flush();
- break;
-
- case Commands.REMOTE_STARTED:
- registryID = in.readInt();
- int remoteServerPort = in.readInt();
- REMProxyFactoryRegistry registry = registryController.getRegistry(new Integer(registryID));
- if (registry != null) {
- registry.setServerPort(remoteServerPort);
- out.writeBoolean(true);
- } else
- out.writeBoolean(false); // No registry
- out.flush();
- break;
-
- case Commands.ATTACH_CALLBACK:
- registryID = in.readInt();
- registry = registryController.getRegistry(new Integer(registryID));
- if (registry != null) {
- close = !((REMCallbackRegistry) registry.getCallbackRegistry()).createCallback(remote); // close if failed, don't close if good.
- out.writeBoolean(!close); // if not close, then return it worked.
- } else
- out.writeBoolean(false);
- out.flush();
- break;
- }
- } catch (Exception e) {
- ProxyPlugin.getPlugin().getLogger().log(new Status(IStatus.ERROR, ProxyPlugin.getPlugin().getBundle().getSymbolicName(), 0, "", e)); //$NON-NLS-1$
- } finally {
- if (close) {
- try {
- in.close();
- } catch (IOException e) {
- }
- try {
- out.close();
- } catch (IOException e) {
- }
- }
- }
- return close;
- }
-
- private void shutdown() {
- requestShutdown();
- masterServerSocket = null;
- }
-
-}
diff --git a/plugins/org.eclipse.jem.proxy/proxyRemote/org/eclipse/jem/internal/proxy/remote/REMMethodProxy.java b/plugins/org.eclipse.jem.proxy/proxyRemote/org/eclipse/jem/internal/proxy/remote/REMMethodProxy.java
deleted file mode 100644
index 681a90d..0000000
--- a/plugins/org.eclipse.jem.proxy/proxyRemote/org/eclipse/jem/internal/proxy/remote/REMMethodProxy.java
+++ /dev/null
@@ -1,276 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2001, 2005 IBM Corporation and others.
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
- *
- * Contributors:
- * IBM Corporation - initial API and implementation
- *******************************************************************************/
-package org.eclipse.jem.internal.proxy.remote;
-/*
-
-
- */
-
-import org.eclipse.core.runtime.IStatus;
-import org.eclipse.core.runtime.Status;
-
-import org.eclipse.jem.internal.proxy.common.CommandException;
-import org.eclipse.jem.internal.proxy.common.remote.*;
-import org.eclipse.jem.internal.proxy.core.*;
-/**
- * Remote VM implementation of the MethodProxy
- */
-
-final class REMMethodProxy extends REMAccessibleObjectProxy implements IREMMethodProxy {
-
- private IBeanTypeProxy fDeclaringType;
- private String fMethodName;
- private IBeanTypeProxy[] fParameterTypes;
- private IBeanTypeProxy fReturnType;
-
- REMMethodProxy(REMProxyFactoryRegistry aRegistry, Integer anID) {
- super(aRegistry, anID);
- }
-
- public IBeanTypeProxy getClassType() {
- if (fDeclaringType == null)
- fDeclaringType =
- (IBeanTypeProxy) REMStandardBeanProxyConstants
- .getConstants(fFactory)
- .getMethodDeclaringClassMessage()
- .invokeCatchThrowableExceptions(
- this);
- return fDeclaringType;
- }
-
- public String getName() {
- if (fMethodName == null) {
- IStringBeanProxy proxy =
- (IStringBeanProxy) REMStandardBeanProxyConstants
- .getConstants(fFactory)
- .getMethodMethodNameMessage()
- .invokeCatchThrowableExceptions(
- this);
- if (proxy != null)
- fMethodName = proxy.stringValue();
- else
- fMethodName = ""; //$NON-NLS-1$
- }
- return fMethodName;
- }
-
- public synchronized IBeanTypeProxy[] getParameterTypes() {
- if (fParameterTypes == null) {
- IArrayBeanProxy parmTypes = (IArrayBeanProxy) REMStandardBeanProxyConstants.getConstants(fFactory)
- .getMethodParameterTypesMessage().invokeCatchThrowableExceptions(this);
- if (parmTypes == null)
- fParameterTypes = new IBeanTypeProxy[0]; // There was some error, only way null is returned
- else {
- int len = parmTypes.getLength();
- fParameterTypes = new IBeanTypeProxy[len];
- for (int i = 0; i < len; i++)
- try {
- fParameterTypes[i] = (IBeanTypeProxy) parmTypes.get(i);
- } catch (ThrowableProxy e) {
- }
- fFactory.releaseProxy(parmTypes); // Don't need the array on the server anymore.
- }
- }
-
- return fParameterTypes;
- }
-
- public IBeanTypeProxy getReturnType() {
- if (fReturnType == null)
- fReturnType =
- (IBeanTypeProxy) REMStandardBeanProxyConstants
- .getConstants(fFactory)
- .getMethodReturnTypeMessage()
- .invokeCatchThrowableExceptions(
- this);
- return fReturnType;
- }
-
- public IBeanProxy invoke(IBeanProxy subject) throws ThrowableProxy {
- return invoke(subject, (IBeanProxy[]) null);
- }
-
- public IBeanProxy invoke(IBeanProxy subject, IBeanProxy[] parms) throws ThrowableProxy {
- return invokeWithParms(subject, parms);
- }
-
- /**
- * The internal method that allows mixture of constants (e.g. String) with bean proxies.
- * A parm value can be a REMMethodProxy.ParmArray. This means this parm is an array that
- * needs to have a ValueRetriever created for it. This is used if the array has ID's in
- * it and is not an existing array on the server or all constant values.
- *
- * NOTE: It is assumed that all IBeanTypeProxies of the parms have already been retrieved.
- * It should still work, but it could be asking for them in the middle of the request
- * if they are not first gotton.
- *
- * NOTE: This is in IREMMethodProxy only so that other REM proxy implementations can access it.
- */
-
- public IBeanProxy invokeWithParms(IBeanProxy subject, final Object[] parms) throws ThrowableProxy {
- IREMConnection connect = fFactory.getFreeConnection();
- REMStandardBeanProxyFactory proxyFactory = (REMStandardBeanProxyFactory) fFactory.getBeanProxyFactory();
- proxyFactory.startTransaction(); // This is definately a transaction, so start it.
- try {
- Commands.ValueObject subjectValue = new Commands.ValueObject();
- if (subject != null)
- ((IREMBeanProxy) subject).renderBean(subjectValue);
-
- Commands.ValueObject parmsValue = new Commands.ValueObject();
-
- class Retriever implements Commands.ValueRetrieve {
- int index = 0;
- Object[] array;
- Commands.ValueObject worker = new Commands.ValueObject();
- IStandardBeanTypeProxyFactory typeFactory = fFactory.getBeanTypeProxyFactory();
-
- public Retriever(Object[] anArray) {
- array = anArray;
- }
-
- public void reset() {
- index = 0;
- }
-
- public Commands.ValueObject nextValue() {
- Object parm = array[index++];
- if (parm != null)
- if (parm instanceof IREMBeanProxy)
- ((IREMBeanProxy) parm).renderBean(worker);
- else if (parm instanceof TransmitableArray) {
- // It is another array, create a new retriever.
- worker.setArrayIDS(
- new Retriever(((TransmitableArray) parm).array),
- ((TransmitableArray) parm).array.length,
- ((TransmitableArray) parm).componentTypeID);
- } else {
- // It's an object. Need to get bean type so that we can send it.
- IREMBeanProxy type = (IREMBeanProxy) typeFactory.getBeanTypeProxy(parm.getClass().getName());
- if (type == null)
- throw new IllegalArgumentException();
- int classID = type.getID().intValue();
- worker.setAsObject(parm, classID);
- }
- else
- worker.set();
- return worker;
- }
- };
-
- Retriever retriever = null;
-
- if (parms != null) {
- // Have a local definition of the retriever so that the retriever can create
- // another one of itself if necessary.
- parmsValue.setArrayIDS(retriever = new Retriever(parms), parms.length, Commands.OBJECT_CLASS); // Create Object[].
- }
-
- Commands.ValueObject returnValue = new Commands.ValueObject();
- try {
- invoke(connect, proxyFactory, subjectValue, parmsValue, returnValue);
- return proxyFactory.getBeanProxy(returnValue);
- } catch (CommandException e) {
- if (!e.isRecoverable()) {
- // Close the connection and try again.
- fFactory.closeConnection(connect);
- connect = null;
- connect = fFactory.getFreeConnection();
- try {
- if (retriever != null)
- retriever.reset();
- invoke(connect, proxyFactory, subjectValue, parmsValue, returnValue);
- return proxyFactory.getBeanProxy(returnValue);
- } catch (CommandException eAgain) {
- // Failed again. Just close and print trace.
- fFactory.closeConnection(connect);
- connect = null;
- ProxyPlugin.getPlugin().getLogger().log(new Status(IStatus.WARNING, ProxyPlugin.getPlugin().getBundle().getSymbolicName(), 0, "", eAgain)); //$NON-NLS-1$
- return null;
- }
- } else {
- // A recoverable error, print trace and return
- ProxyPlugin.getPlugin().getLogger().log(new Status(IStatus.WARNING, ProxyPlugin.getPlugin().getBundle().getSymbolicName(), 0, "", e)); //$NON-NLS-1$
- return null;
- }
- }
- } finally {
- proxyFactory.stopTransaction();
- if (connect != null)
- fFactory.returnConnection(connect);
- }
- }
-
-private void invoke(
- IREMConnection connect,
- REMStandardBeanProxyFactory proxyFactory,
- Commands.ValueObject subjectValue,
- Commands.ValueObject parmsValue,
- Commands.ValueObject returnValue)
- throws ThrowableProxy, CommandException {
- try {
- connect.invokeMethod(getID().intValue(), subjectValue, parmsValue, returnValue);
- } catch (CommandErrorException e) {
- proxyFactory.processErrorReturn(e);
- }
- }
-
- public IBeanProxy invoke(IBeanProxy subject, IBeanProxy parm) throws ThrowableProxy {
- return invoke(subject, new IBeanProxy[] { parm });
- }
-
- public IBeanProxy invokeCatchThrowableExceptions(IBeanProxy subject) {
- try {
- return invoke(subject);
- } catch (ThrowableProxy e) {
- ProxyPlugin.getPlugin().getLogger().log(new Status(IStatus.WARNING, ProxyPlugin.getPlugin().getBundle().getSymbolicName(), 0, "", e)); //$NON-NLS-1$
- fFactory.releaseProxy(e); // Since it's no longer needed, get rid of now instead of GC time.
- return null;
- }
- }
-
- public IBeanProxy invokeCatchThrowableExceptions(IBeanProxy subject, IBeanProxy[] parms) {
- try {
- return invoke(subject, parms);
- } catch (ThrowableProxy e) {
- ProxyPlugin.getPlugin().getLogger().log(new Status(IStatus.WARNING, ProxyPlugin.getPlugin().getBundle().getSymbolicName(), 0, "", e)); //$NON-NLS-1$
- fFactory.releaseProxy(e); // Since it's no longer needed, get rid of now instead of GC time.
- return null;
- }
- }
-
- public IBeanProxy invokeCatchThrowableExceptions(IBeanProxy subject, IBeanProxy parm) {
- try {
- return invoke(subject, parm);
- } catch (ThrowableProxy e) {
- ProxyPlugin.getPlugin().getLogger().log(new Status(IStatus.WARNING, ProxyPlugin.getPlugin().getBundle().getSymbolicName(), 0, "", e)); //$NON-NLS-1$
- fFactory.releaseProxy(e); // Since it's no longer needed, get rid of now instead of GC time.
- return null;
- }
- }
-
- /**
- * The type proxy is constant proxy out of the method factory.
- */
- public IBeanTypeProxy getTypeProxy() {
- return ((REMMethodProxyFactory) fFactory.getMethodProxyFactory()).methodType;
- }
-
- /**
- * The bean is being released, clear out the fields so they can be GC'd if necessary.
- * Usually only big objects and proxy fields need to be cleared.
- */
- public void release() {
- fDeclaringType = null;
- fParameterTypes = null;
- fReturnType = null;
- super.release();
- }
-}
diff --git a/plugins/org.eclipse.jem.proxy/proxyRemote/org/eclipse/jem/internal/proxy/remote/REMMethodProxyFactory.java b/plugins/org.eclipse.jem.proxy/proxyRemote/org/eclipse/jem/internal/proxy/remote/REMMethodProxyFactory.java
deleted file mode 100644
index 8660c8e..0000000
--- a/plugins/org.eclipse.jem.proxy/proxyRemote/org/eclipse/jem/internal/proxy/remote/REMMethodProxyFactory.java
+++ /dev/null
@@ -1,305 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2001, 2005 IBM Corporation and others.
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
- *
- * Contributors:
- * IBM Corporation - initial API and implementation
- *******************************************************************************/
-/*
-
-
- */
-package org.eclipse.jem.internal.proxy.remote;
-
-import java.lang.reflect.AccessibleObject;
-
-import org.eclipse.core.runtime.IStatus;
-import org.eclipse.core.runtime.Status;
-import org.eclipse.jem.internal.proxy.core.*;
-import org.eclipse.jem.internal.proxy.common.remote.Commands;
-import org.eclipse.jem.internal.proxy.common.remote.TransmitableArray;
-
-/**
- * Factory for creating method proxies. Creation date: (12/3/99 6:29:40 PM)
- *
- * @author: Joe Winchester
- */
-public class REMMethodProxyFactory implements IMethodProxyFactory {
-
- final protected REMProxyFactoryRegistry fFactoryRegistry;
-
- // Cached copy of a few typical method type proxies.
- IREMBeanTypeProxy accessibleType;
-
- REMMethodTypeProxy methodType;
-
- REMFieldTypeProxy fieldType;
-
- REMConstructorTypeProxy ctorType;
-
- REMMethodProxy getMethodProxy;
-
- REMMethodProxyFactory(REMProxyFactoryRegistry aRegistry) {
- fFactoryRegistry = aRegistry;
- aRegistry.registerMethodProxyFactory(this);
- REMStandardBeanTypeProxyFactory typeFactory = (REMStandardBeanTypeProxyFactory) aRegistry.getBeanTypeProxyFactory();
-
- accessibleType = typeFactory.objectClass.newBeanTypeForClass(new Integer(Commands.ACCESSIBLEOBJECT_CLASS), AccessibleObject.class.getName(),
- false);
- methodType = new REMMethodTypeProxy(aRegistry, accessibleType);
- fieldType = new REMFieldTypeProxy(aRegistry, accessibleType);
- ctorType = new REMConstructorTypeProxy(aRegistry, accessibleType);
- aRegistry.getBeanTypeProxyFactory().registerBeanTypeProxy(accessibleType, true);
- aRegistry.getBeanTypeProxyFactory().registerBeanTypeProxy(methodType, true);
- aRegistry.getBeanTypeProxyFactory().registerBeanTypeProxy(fieldType, true);
- aRegistry.getBeanTypeProxyFactory().registerBeanTypeProxy(ctorType, true);
-
- getMethodProxy = (REMMethodProxy) methodType.newBeanProxy(new Integer(Commands.GET_METHOD_ID));
- ((REMStandardBeanProxyFactory) aRegistry.getBeanProxyFactory()).registerProxy(getMethodProxy);
-
- }
-
- /*
- * (non-Javadoc)
- *
- * @see org.eclipse.jem.internal.proxy.core.IMethodProxyFactory#getMethodProxy(java.lang.String, java.lang.String, java.lang.String[])
- */
- public IMethodProxy getMethodProxy(String className, String methodName, String[] parameterTypes) {
- IStandardBeanTypeProxyFactory typeFactory = fFactoryRegistry.getBeanTypeProxyFactory();
- IBeanTypeProxy clsProxy = typeFactory.getBeanTypeProxy(className);
- if (clsProxy == null)
- return null;
- // This will redirect to the beantype, which will go through the method cache.
- return clsProxy.getMethodProxy(methodName, parameterTypes);
- }
-
- /**
- * A helper method to get the method proxy for the expression. This is used by registries and beantype proxies. It will go through
- * the method cache to make sure we get only one.
- *
- * @param expression
- * @param aBeanTypeProxy
- * @param methodName
- * @param parmTypes
- * @return
- *
- * @since 1.1.0
- */
- public IProxyMethod getMethodProxy(IExpression expression, IProxyBeanType aBeanTypeProxy, String methodName, IProxyBeanType[] parmTypes){
- return ((REMStandardBeanTypeProxyFactory) fFactoryRegistry.getBeanTypeProxyFactory()).proxyConstants.getMethodProxy(expression, aBeanTypeProxy, methodName, parmTypes);
- }
-
- /**
- * A helper method to get the field proxy for the expression. This is used by registries and beantype proxies. It will go through
- * the method cache to make sure we get only one.
- * @param expression
- * @param aBeanTypeProxy
- * @param fieldName
- *
- * @return
- *
- * @since 1.1.0
- */
- public IProxyField getFieldProxy(IExpression expression, IProxyBeanType aBeanTypeProxy, String fieldName){
- return ((REMStandardBeanTypeProxyFactory) fFactoryRegistry.getBeanTypeProxyFactory()).proxyConstants.getFieldProxy(expression, aBeanTypeProxy, fieldName);
- }
-
-
- /* (non-Javadoc)
- * @see org.eclipse.jem.internal.proxy.core.IMethodProxyFactory#getFieldProxy(org.eclipse.jem.internal.proxy.core.IExpression, java.lang.String, java.lang.String)
- */
- public IProxyField getFieldProxy(IExpression expression, String className, String fieldName) {
- // We are getting the class resolved through the expression. Might as well because it probably will
- // be needed again and this way when the expression is finished it will be resolved for later usage.
- IStandardBeanTypeProxyFactory beanTypeProxyFactory = fFactoryRegistry.getBeanTypeProxyFactory();
- IProxyBeanType beanType = beanTypeProxyFactory.getBeanTypeProxy(expression, className);
- return beanType.getFieldProxy(expression, fieldName);
- }
-
- /* (non-Javadoc)
- * @see org.eclipse.jem.internal.proxy.core.IMethodProxyFactory#getMethodProxy(org.eclipse.jem.internal.proxy.core.IExpression, java.lang.String, java.lang.String, java.lang.String[])
- */
- public IProxyMethod getMethodProxy(IExpression expression, String className, String methodName, String[] parameterTypes) {
- // We are getting the class and parmtypes resolved through the expression. Might as well because they probably will
- // be needed again and this way when the expression is finished they will be resolved for later usage.
- IStandardBeanTypeProxyFactory beanTypeProxyFactory = fFactoryRegistry.getBeanTypeProxyFactory();
- IProxyBeanType beanType = beanTypeProxyFactory.getBeanTypeProxy(expression, className);
- IProxyBeanType[] parmTypes = getParameterTypes(expression, parameterTypes, beanTypeProxyFactory);
- return beanType.getMethodProxy(expression, methodName, parmTypes);
- }
-
- /**
- * Helper method for BeanTypes and proxy Beantypes. So they don't need to have common code to convert string to proxy bean type.
- * @param expression
- * @param classType
- * @param methodName
- * @param parameterTypes
- * @return
- *
- * @since 1.1.0
- */
- public IProxyMethod getMethodProxy(IExpression expression, IProxyBeanType classType, String methodName, String[] parameterTypes) {
- // We are getting the class and parmtypes resolved through the expression. Might as well because they probably will
- // be needed again and this way when the expression is finished they will be resolved for later usage.
- IStandardBeanTypeProxyFactory beanTypeProxyFactory = fFactoryRegistry.getBeanTypeProxyFactory();
- IProxyBeanType[] parmTypes = getParameterTypes(expression, parameterTypes, beanTypeProxyFactory);
- return classType.getMethodProxy(expression, methodName, parmTypes);
- }
-
- /**
- * @param expression
- * @param parameterTypes
- * @param beanTypeProxyFactory
- * @return
- *
- * @since 1.1.0
- */
- protected IProxyBeanType[] getParameterTypes(IExpression expression, String[] parameterTypes, IStandardBeanTypeProxyFactory beanTypeProxyFactory) {
- IProxyBeanType[] parmTypes;
- if (parameterTypes == null || parameterTypes.length == 0)
- parmTypes = null;
- else {
- parmTypes = new IProxyBeanType[parameterTypes.length];
- for (int i = 0; i < parameterTypes.length; i++) {
- parmTypes[i] = beanTypeProxyFactory.getBeanTypeProxy(expression, parameterTypes[i]);
- }
- }
- return parmTypes;
- }
-
- /*
- * (non-Javadoc)
- *
- * @see org.eclipse.jem.internal.proxy.core.IMethodProxyFactory#getInvokable(java.lang.String, java.lang.String, java.lang.String[])
- */
- public IInvokable getInvokable(String className, String methodName, String[] parameterTypes) {
- IStandardBeanTypeProxyFactory typeFactory = fFactoryRegistry.getBeanTypeProxyFactory();
- IBeanTypeProxy clsProxy = typeFactory.getBeanTypeProxy(className);
- if (clsProxy == null)
- return null;
- return clsProxy.getInvokable(methodName, parameterTypes);
- }
-
- /**
- * Get the method id from the remote system and create the method proxy.
- *
- * NOTE: It is public ONLY so that IBeanTypeProxy implementations can call it. It must not be used by anyone else.
- *
- * @param beanType
- * @param methodName
- * @param parameterTypes
- * @return
- *
- * @since 1.0.0
- */
- public IInvokable getInvokable(IREMBeanTypeProxy beanType, String methodName, String[] parameterTypes) {
- // First convert the parameter types into IBeanTypeProxy[].
- IREMBeanTypeProxy[] types = null;
- if (parameterTypes != null) {
- IStandardBeanTypeProxyFactory typeFactory = fFactoryRegistry.getBeanTypeProxyFactory();
- types = new IREMBeanTypeProxy[parameterTypes.length];
- for (int i = 0; i < parameterTypes.length; i++) {
- IBeanTypeProxy type = types[i] = (IREMBeanTypeProxy) typeFactory.getBeanTypeProxy(parameterTypes[i]);
- if (type == null)
- return null; // One of the parm types doesn't exist.
- }
- }
-
- return getInvokable(beanType, methodName, types);
- }
-
- /**
- * Get the method id from the remote system and create the method proxy.
- * This does not go through the method cache. It goes direct to the remote vm.
- *
- * NOTE: It is public ONLY so that IBeanTypeProxy implementations can call it. It must not be used by anyone else.
- */
- public IMethodProxy getMethodProxy(IREMBeanTypeProxy beanType, String methodName, String[] parameterTypes) {
- // First convert the parameter types into IBeanTypeProxy[].
- IBeanTypeProxy[] types = null;
- if (parameterTypes != null) {
- IStandardBeanTypeProxyFactory typeFactory = fFactoryRegistry.getBeanTypeProxyFactory();
- types = new IBeanTypeProxy[parameterTypes.length];
- for (int i = 0; i < parameterTypes.length; i++) {
- IBeanTypeProxy type = types[i] = typeFactory.getBeanTypeProxy(parameterTypes[i]);
- if (type == null)
- return null; // One of the parm types doesn't exist.
- }
- }
-
- return getMethodProxy(beanType, methodName, types);
- }
-
-
- /**
- * Get the invokable.
- *
- * NOTE: It is public ONLY so that IBeanTypeProxy implementations can call it. It must not be used by anyone else.
- * @param beanType
- * @param methodName
- * @param parameterTypes
- * @return
- *
- * @since 1.0.0
- */
- public IInvokable getInvokable(IREMBeanTypeProxy beanType, String methodName, IBeanTypeProxy[] parameterTypes) {
- return new REMInvokable(beanType, methodName, parameterTypes);
- }
-
- /**
- * Get the method id from the remote system and create the method proxy.
- * <p>
- * This does not go through the method cache. It goes direct to the remote vm.
- *
- * NOTE: It is public ONLY so that IBeanTypeProxy implementations can call it. It must not be used by anyone else.
- */
- public IMethodProxy getMethodProxy(IREMBeanTypeProxy beanType, String methodName, IBeanTypeProxy[] parameterTypes) {
- // The parms to getMethod are:
- // parm[0] = String - method name
- // parm[1] = Class[] - Parameter Classes.
- Object[] parms = new Object[] { methodName, parameterTypes != null ? (new TransmitableArray(Commands.CLASS_CLASS, parameterTypes)) : null};
- IBeanProxy result = null;
- try {
- result = getMethodProxy.invokeWithParms(beanType, parms);
- return (IMethodProxy) result;
- } catch (ThrowableProxy e) {
- fFactoryRegistry.releaseProxy(e); // Since it's not needed, get rid of now instead of GC time.
- return null;
- } catch (ClassCastException e) {
- // Some trace msgs because we keep getting into a mode after awhile (though not reproducible) that returns non-method proxies and we need
- // more info.
- StringBuffer buf = new StringBuffer("Method requested is \"" + methodName + "("); //$NON-NLS-1$ //$NON-NLS-2$
- for (int i = 0; i < parameterTypes.length; i++) {
- if (i > 0)
- buf.append(','); //$NON-NLS-1$
- buf.append(parameterTypes[i].getTypeName());
- }
- buf.append(")\""); //$NON-NLS-1$
- ProxyPlugin.getPlugin().getLogger().log(
- new Status(IStatus.ERROR, ProxyPlugin.getPlugin().getBundle().getSymbolicName(), 0, buf.toString(), null));
- try {
- if (result != null) {
- ProxyPlugin.getPlugin().getLogger().log(
- new Status(IStatus.ERROR, ProxyPlugin.getPlugin().getBundle().getSymbolicName(), 0,
- "ClassCastException of result. Return type is \"" + result.getTypeProxy().getTypeName() + "\"\n" + //$NON-NLS-1$ //$NON-NLS-2$
- "Return type bean type proxy class=\"" + result.getTypeProxy().getClass().getName() + "\"\n" + //$NON-NLS-1$ //$NON-NLS-2$
- "GetMethodProxy valid=" + getMethodProxy.isValid() + "\n" + //$NON-NLS-1$ //$NON-NLS-2$
- "GetMethodProxy real name is \"" + getMethodProxy.getName() + "\"\n", null)); //$NON-NLS-1$ //$NON-NLS-2$
- }
- } catch (Exception e2) {
- ProxyPlugin.getPlugin().getLogger().log(new Status(IStatus.ERROR, ProxyPlugin.getPlugin().getBundle().getSymbolicName(), 0, "", e2)); //$NON-NLS-1$
- }
- throw e; // Rethrow it.
- }
- }
-
- /*
- * Terminate the factory. Don't need to do anything because of the proxies being held onto are registered any will be cleaned up themselves.
- */
- public void terminateFactory(boolean wait) {
- }
-
-}
diff --git a/plugins/org.eclipse.jem.proxy/proxyRemote/org/eclipse/jem/internal/proxy/remote/REMMethodTypeProxy.java b/plugins/org.eclipse.jem.proxy/proxyRemote/org/eclipse/jem/internal/proxy/remote/REMMethodTypeProxy.java
deleted file mode 100644
index d3019b9..0000000
--- a/plugins/org.eclipse.jem.proxy/proxyRemote/org/eclipse/jem/internal/proxy/remote/REMMethodTypeProxy.java
+++ /dev/null
@@ -1,67 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2001, 2005 IBM Corporation and others.
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
- *
- * Contributors:
- * IBM Corporation - initial API and implementation
- *******************************************************************************/
-package org.eclipse.jem.internal.proxy.remote;
-/*
-
-
- */
-
-
-import org.eclipse.jem.internal.proxy.core.*;
-import org.eclipse.jem.internal.proxy.common.remote.Commands;
-/**
- * BeanType Proxy for Method class.
- */
-
-final class REMMethodTypeProxy extends REMAbstractBeanTypeProxy {
-
-REMMethodTypeProxy(REMProxyFactoryRegistry aRegistry, IBeanTypeProxy accessibleTypeProxy) {
- super(aRegistry, new Integer(Commands.METHOD_CLASS), java.lang.reflect.Method.class.getName(), accessibleTypeProxy);
-}
-
-/**
- * newBeanTypeForClass: Create a new beantypeproxy of this kind for the given class.
- * This is used by beantype proxy factory when creating a beantype proxy for a subclass.
- * This is because subclasses, unless explicitly overridden, should use the same kind
- * of beantype proxy. This way if anything special is needed for a specific type, then
- * that can be done.
- *
- * For all of the accessible object types, they are final classes, so you can't create a newBeanType
- * for subclasses.
- */
-public IREMBeanTypeProxy newBeanTypeForClass(Integer anID, String aClassname, boolean anAbstract) {
- throw new UnsupportedOperationException();
-}
-
-/**
- * Specialized from REMAbstractBeanTypeProxy to ensure Constructor proxies are created correctly.
- */
-public IREMBeanProxy newBeanProxy(Integer objectID) {
- return new REMMethodProxy(fRegistry, objectID);
-}
-
-/**
- * Note: Since new instances of Constructor are never done through a default ctor,
- * this function is not supported.
- */
-public IBeanProxy newInstance() {
- throw new UnsupportedOperationException();
-}
-
-/**
- * Note: Since new instances of Constructor are never done through an initialization string,
- * this function is not supported.
- */
-public IBeanProxy newInstance(String initializationString) {
- throw new UnsupportedOperationException();
-}
-
-}
diff --git a/plugins/org.eclipse.jem.proxy/proxyRemote/org/eclipse/jem/internal/proxy/remote/REMNumberBeanProxy.java b/plugins/org.eclipse.jem.proxy/proxyRemote/org/eclipse/jem/internal/proxy/remote/REMNumberBeanProxy.java
deleted file mode 100644
index 8ca6e7a..0000000
--- a/plugins/org.eclipse.jem.proxy/proxyRemote/org/eclipse/jem/internal/proxy/remote/REMNumberBeanProxy.java
+++ /dev/null
@@ -1,106 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2001, 2005 IBM Corporation and others.
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
- *
- * Contributors:
- * IBM Corporation - initial API and implementation
- *******************************************************************************/
-package org.eclipse.jem.internal.proxy.remote;
-/*
-
-
- */
-
-
-import org.eclipse.jem.internal.proxy.core.*;
-
-/**
- * Remote Implementation of INumberBeanProxy for any Number (i.e. the non-primitives)
- * It can answer all of the primitive number types (int, long, short, byte, double, float).
- * Creation date: (2/6/00 9:02:54 AM)
- * @author: Joe Winchester
- */
-abstract class REMNumberBeanProxy extends REMConstantBeanProxy implements INumberBeanProxy {
- private final Number fNumberValue;
-
-/**
- * It is package protected because they are created
- * in a special way and no one else should create them.
- * @param aBean java.lang.Object
- */
-REMNumberBeanProxy(REMProxyFactoryRegistry aRegistry, Number aNumber) {
- super(aRegistry);
- fNumberValue = aNumber;
-}
-/**
- * equals: Equal if:
- * 1) This proxy == (identity) to the other object
- * 2) Else if other is an IBeanProxy and not a constant one, then if
- * equals on the server.
- * 3) If this is a constant proxy and the other is too or is a constant
- * value (e.g. IStringBeanProxy.equals(String), then true if values are equals.
- */
-public boolean equals(Object anObject) {
- if (this == anObject)
- return true; // Identity
- if (anObject instanceof REMNumberBeanProxy)
- return fNumberValue.equals(((REMNumberBeanProxy) anObject).numberValue());
- if (anObject instanceof Number)
- return fNumberValue.equals(anObject);
- return false;
-}
-/**
- * byteValue method comment.
- */
-public byte byteValue() {
- return fNumberValue.byteValue();
-}
-/**
- * doubleValue method comment.
- */
-public double doubleValue() {
- return fNumberValue.doubleValue();
-}
-/**
- * floatValue method comment.
- */
-public float floatValue() {
- return fNumberValue.floatValue();
-}
-/**
- * Return the int value
- */
-public int intValue() {
- return fNumberValue.intValue();
-}
-/**
- * longValue method comment.
- */
-public long longValue() {
- return fNumberValue.longValue();
-}
-/**
- * numberValue method comment.
- */
-public Number numberValue() {
- return fNumberValue;
-}
-/**
- * shortValue method comment.
- */
-public short shortValue() {
- return fNumberValue.shortValue();
-}
-
-/**
- * The bean's toString.
- */
-public String toBeanString() {
- return fNumberValue.toString();
-}
-}
-
-
diff --git a/plugins/org.eclipse.jem.proxy/proxyRemote/org/eclipse/jem/internal/proxy/remote/REMPrimitiveBeanTypeProxy.java b/plugins/org.eclipse.jem.proxy/proxyRemote/org/eclipse/jem/internal/proxy/remote/REMPrimitiveBeanTypeProxy.java
deleted file mode 100644
index 78c6f75..0000000
--- a/plugins/org.eclipse.jem.proxy/proxyRemote/org/eclipse/jem/internal/proxy/remote/REMPrimitiveBeanTypeProxy.java
+++ /dev/null
@@ -1,234 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2001, 2005 IBM Corporation and others.
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
- *
- * Contributors:
- * IBM Corporation - initial API and implementation
- *******************************************************************************/
-package org.eclipse.jem.internal.proxy.remote;
-/*
-
-
- */
-
-
-import org.eclipse.jem.internal.proxy.core.*;
-/**
- * Primitive BeanType Proxies
- */
-public abstract class REMPrimitiveBeanTypeProxy extends REMAbstractBeanTypeProxy implements IREMConstantBeanTypeProxy {
-
- protected REMPrimitiveBeanTypeProxy(REMProxyFactoryRegistry aRegistry, Integer anID, String aClassname) {
- super(aRegistry, anID, aClassname, null);
- }
-
- /**
- * Return whether this is the primitive Byte.TYPE or Byte.class
- */
- public boolean isPrimitive() {
- return true;
- }
-
- /**
- * Return the null ctor proxy for this method with these arguments.
- * For all of the primitive types, this is an invalid operation.
- */
- public IConstructorProxy getNullConstructorProxy() {
- throw new UnsupportedOperationException();
- }
-
- /**
- * Return a proxy to the constructor for the target VM being the same as the REM
- * For all of the primitive types, this is an invalid operation.
- */
- public IConstructorProxy getConstructorProxy(String[] argumentClassNames) {
- throw new UnsupportedOperationException();
- }
-
- /**
- * Return a proxy to the constructor for the target VM being the same as the REM
- * For all of the primitive types, this is an invalid operation.
- */
- public IConstructorProxy getConstructorProxy(IBeanTypeProxy[] argumentTypes) {
- throw new UnsupportedOperationException();
- }
-
-
- /* (non-Javadoc)
- * @see org.eclipse.jem.internal.proxy.core.IBeanTypeProxy#getConstructors()
- *
- * For all of the primitive types, this is an invalid operation.
- */
- public IConstructorProxy[] getConstructors() {
- throw new UnsupportedOperationException();
- }
-
- /**
- * Return a proxy to the constructor for the target VM being the same as the REM
- * For all of the primitive types, this is an invalid operation.
- */
- public IConstructorProxy getDeclaredConstructorProxy(String[] argumentClassNames) {
- throw new UnsupportedOperationException();
- }
-
- /**
- * Return a proxy to the constructor for the target VM being the same as the REM
- * For all of the primitive types, this is an invalid operation.
- */
- public IConstructorProxy getDeclaredConstructorProxy(IBeanTypeProxy[] argumentTypes) {
- throw new UnsupportedOperationException();
- }
-
-
- /* (non-Javadoc)
- * @see org.eclipse.jem.internal.proxy.core.IBeanTypeProxy#getConstructors()
- *
- * For all of the primitive types, this is an invalid operation.
- */
- public IConstructorProxy[] getDeclaredConstructors() {
- throw new UnsupportedOperationException();
- }
-
- /* (non-Javadoc)
- * @see org.eclipse.jem.internal.proxy.core.IBeanTypeProxy#getConstructors()
- *
- * For all of the primitive types, this is an invalid operation.
- */
- public IFieldProxy[] getFields() {
- throw new UnsupportedOperationException();
- }
-
- /* (non-Javadoc)
- * @see org.eclipse.jem.internal.proxy.core.IBeanTypeProxy#getConstructors()
- *
- * For all of the primitive types, this is an invalid operation.
- */
- public IFieldProxy[] getDeclaredFields() {
- throw new UnsupportedOperationException();
- }
-
- /**
- * Return a proxy to the field for the target VM being the same as the REM
- * For all of the primitive types, this is an invalid operation.
- */
- public IFieldProxy getFieldProxy(String fieldName) {
- throw new UnsupportedOperationException();
- }
-
- /**
- * Return the method proxy for this method with these arguments.
- * For all of the primitive types, this is an invalid operation.
- */
- public IMethodProxy getMethodProxy(String methodName, IBeanTypeProxy[] argumentTypes) {
- throw new UnsupportedOperationException();
- }
-
- /**
- * Return the method proxy for this method with these arguments.
- * For all of the primitive types, this is an invalid operation.
- */
- public IMethodProxy getMethodProxy(String methodName, String[] argumentClassNames) {
- throw new UnsupportedOperationException();
- }
-
- /**
- * Return the method proxy for this method with these arguments.
- * For all of the primitive types, this is an invalid operation.
- */
- public IMethodProxy getMethodProxy(String methodName, String argumentQualifiedTypeName) {
- throw new UnsupportedOperationException();
- }
-
- /**
- * Return the method proxy for this method with these arguments.
- * For all of the primitive types, this is an invalid operation.
- */
- public IMethodProxy getMethodProxy(String methodName) {
- throw new UnsupportedOperationException();
- }
-
-
- /**
- * Create a new bean proxy with the specified id.
- *
- * For all of the primitive types, this is an invalid operation. They are created
- * explicitly through the appropriate create method.
- */
- public IREMBeanProxy newBeanProxy(Integer anID) {
- throw new UnsupportedOperationException();
- }
-
- /**
- * newBeanTypeForClass: Create a new beantypeproxy of this kind for the given class.
- * This is used by beantype proxy factory when creating a beantype proxy for a subclass.
- * This is because subclasses, unless explicitly overridden, should use the same kind
- * of beantype proxy. This way if anything special is needed for a specific type, then
- * that can be done.
- *
- * For all of the primitive types, they aren't classes, so you can't create a newBeanType
- * for subclasses.
- */
- public IREMBeanTypeProxy newBeanTypeForClass(Integer anID, String aClassname, boolean anAbstract) {
- throw new UnsupportedOperationException();
- }
-
- /**
- * release - BeanType is about to be released.
- * primitives don't need to be released, they don't hold onto any ids or resources.
- */
- public void release() {
- }
-
- /**
- * Have a string that should represent a number.
- * See if it ends in a type letter, if so parse as such.
- * See if there is an 'E' in it, then parse as a double.
- * If neither condition, then try parse as long, if that
- * fails try as double.
- */
- protected static Number parseString(String v) {
- if (v.length() == 0)
- return null;
- char last = v.charAt(v.length()-1);
- try {
- switch (last) {
- case 'd':
- case 'D':
- return Double.valueOf(v);
- case 'f':
- case 'F':
- return Float.valueOf(v);
- case 'l':
- case 'L':
- return Long.decode(v.substring(0, v.length()-1));
- }
- } catch (NumberFormatException e) {
- return null;
- }
-
- try {
- return Long.decode(v);
- } catch (NumberFormatException e) {
- try {
- return Double.valueOf(v);
- } catch (NumberFormatException e1) {
- return null;
- }
- }
- }
- /* (non-Javadoc)
- * @see org.eclipse.jem.internal.proxy.core.IBeanTypeProxy#getCompatibleConstructor(org.eclipse.jem.internal.proxy.core.IBeanTypeProxy[])
- */
- public IConstructorProxy getCompatibleConstructor(IBeanTypeProxy[] argumentTypes) {
- throw new UnsupportedOperationException();
- }
- /* (non-Javadoc)
- * @see org.eclipse.jem.internal.proxy.core.IBeanTypeProxy#getCompatibleMethod(java.lang.String, org.eclipse.jem.internal.proxy.core.IBeanTypeProxy[])
- */
- public IMethodProxy getCompatibleMethod(String methodName, IBeanTypeProxy[] argumentTypes) {
- throw new UnsupportedOperationException();
- }
-}
diff --git a/plugins/org.eclipse.jem.proxy/proxyRemote/org/eclipse/jem/internal/proxy/remote/REMProxyConstants.java b/plugins/org.eclipse.jem.proxy/proxyRemote/org/eclipse/jem/internal/proxy/remote/REMProxyConstants.java
deleted file mode 100644
index 92a9d3b..0000000
--- a/plugins/org.eclipse.jem.proxy/proxyRemote/org/eclipse/jem/internal/proxy/remote/REMProxyConstants.java
+++ /dev/null
@@ -1,679 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2005 IBM Corporation and others.
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
- *
- * Contributors:
- * IBM Corporation - initial API and implementation
- *******************************************************************************/
-/*
-
-
- */
-package org.eclipse.jem.internal.proxy.remote;
-
-import java.util.*;
-import java.util.Map.Entry;
-
-import org.eclipse.jem.internal.proxy.core.*;
-import org.eclipse.jem.internal.proxy.core.ExpressionProxy.ProxyEvent;
-
-
-
-
-/**
- * MethodProxyConstants is a cache of IMethodProxies to avoid repeated lookup
- * and thereby avoid the relatively expensive java.lang.reflect calls to repeatedly
- * lookup method by name
- *
- * @since 1.1.0
- */
-public class REMProxyConstants {
-
- private Map methodsCache = new HashMap(80);
- private Map invokablesCache = new HashMap(80);
- private Map fieldsCache = new HashMap(80);
-
- private REMProxyFactoryRegistry registry;
-
- public REMProxyConstants(REMProxyFactoryRegistry registry) {
- this.registry = registry;
- }
-
- /*
- * Used as the key to the methodCache and invokablesCache when there are parms.
- * It allows the parms to be either strings or IBeanTypeProxies without the
- * overhead of creating complicated strings.
- *
- * It will compare method name and each individual parm name without fluffing
- * up a string and building it up.
- *
- * For no parm methods, just the name of the method as a string will be the key.
- *
- * @since 1.1.0
- */
- private abstract static class MethodKey {
- public String methodName;
- public MethodKey(String methodName) {
- this.methodName = methodName;
- }
-
- protected abstract boolean compareParms(IProxyBeanType[] parms);
- protected abstract boolean compareParms(String[] parms);
-
-
- /* (non-Javadoc)
- * @see java.lang.Object#hashCode()
- */
- public int hashCode() {
- return methodName.hashCode();
- }
- }
-
- private static class MethodKeyStringParms extends MethodKey {
- public String[] parmNames;
-
- public MethodKeyStringParms(String methodName, String[] parmNames) {
- super(methodName);
- this.parmNames = parmNames;
- }
-
- /* (non-Javadoc)
- * @see java.lang.Object#equals(java.lang.Object)
- */
- public boolean equals(Object obj) {
- if (this == obj)
- return true;
- try {
- return ((MethodKey) obj).compareParms(parmNames);
- } catch (ClassCastException e) {
- return false;
- }
- }
-
-
- /* (non-Javadoc)
- * @see org.eclipse.jem.internal.proxy.remote.REMProxyConstants.MethodKey#hashCode()
- */
- public int hashCode() {
- int h = super.hashCode();
- for (int i = 0; i < parmNames.length; i++) {
- h += parmNames[i].hashCode();
- }
- return h;
- }
-
- /* (non-Javadoc)
- * @see org.eclipse.jem.internal.proxy.remote.REMProxyConstants.MethodKey#compareParms(org.eclipse.jem.internal.proxy.core.IBeanTypeProxy[])
- */
- protected boolean compareParms(IProxyBeanType[] parms) {
- if (parms.length != parmNames.length)
- return false;
- for (int i = 0; i < parms.length; i++) {
- if (!parms[i].getTypeName().equals(parmNames[i]))
- return false;
- }
- return true;
- }
-
-
- /* (non-Javadoc)
- * @see org.eclipse.jem.internal.proxy.remote.REMProxyConstants.MethodKey#compareParms(java.lang.String[])
- */
- protected boolean compareParms(String[] parms) {
- return Arrays.equals(parms, parmNames);
- }
- }
-
- private static class MethodKeyProxyParms extends MethodKey {
- public IProxyBeanType[] parmTypes;
-
- public MethodKeyProxyParms(String methodName, IProxyBeanType[] parmTypes) {
- super(methodName);
- this.parmTypes = parmTypes;
- }
-
- public Object toMethodKeyStringParms() {
- String[] parms = new String[parmTypes.length];
- for (int i = 0; i < parmTypes.length; i++) {
- parms[i] = parmTypes[i].getTypeName();
- }
- return new MethodKeyStringParms(methodName, parms);
- }
-
- /* (non-Javadoc)
- * @see java.lang.Object#equals(java.lang.Object)
- */
- public boolean equals(Object obj) {
- if (this == obj)
- return true;
- try {
- return ((MethodKey) obj).compareParms(parmTypes);
- } catch (ClassCastException e) {
- return false;
- }
- }
-
- /* (non-Javadoc)
- * @see org.eclipse.jem.internal.proxy.remote.REMProxyConstants.MethodKey#hashCode()
- */
- public int hashCode() {
- int h = super.hashCode();
- for (int i = 0; i < parmTypes.length; i++) {
- h += parmTypes[i].getTypeName().hashCode();
- }
- return h;
- }
-
- /* (non-Javadoc)
- * @see org.eclipse.jem.internal.proxy.remote.REMProxyConstants.MethodKey#compareParms(org.eclipse.jem.internal.proxy.core.IBeanTypeProxy[])
- */
- protected boolean compareParms(String[] parms) {
- if (parms.length != parmTypes.length)
- return false;
- for (int i = 0; i < parms.length; i++) {
- if (!parmTypes[i].getTypeName().equals(parms[i]))
- return false;
- }
- return true;
- }
-
-
- /* (non-Javadoc)
- * @see org.eclipse.jem.internal.proxy.remote.REMProxyConstants.MethodKey#compareParms(java.lang.String[])
- */
- protected boolean compareParms(IProxyBeanType[] parms) {
- if (parms.length != parmTypes.length)
- return false;
- for (int i = 0; i < parms.length; i++) {
- if (!parmTypes[i].getTypeName().equals(parms[i].getTypeName()))
- return false;
- }
- return true;
- }
- }
-
- static int REMMETHODCOUNT = 0;
- static int UNIQUEMETHODCOUNT = 0;
- static int REMINVOKABLECOUNT = 0;
- static int UNIQUEINVOKABLECOUNT = 0;
- static int INVOKEINVOKECOUNT = 0;
- static int METHODPROXYINVOKECOUNT = 0;
- static int REMFIELDCOUNT = 0;
- static int UNIQUEFIELDCOUNT = 0;
- static int REMCONSTRUCTORCALLED = 0;
- static HashMap METHODCOUNTMAP;
- static HashMap FIELDCOUNTMAP;
- static HashMap FIELDSETCOUNTMAP;
- static boolean GATHER_COUNTS;
-
- /**
- * Set if counts should be gathered.
- *
- * @param gatherCounts
- *
- * @since 1.1.0
- */
- public static void setGatherCounts(boolean gatherCounts) {
- if (gatherCounts != GATHER_COUNTS) {
- reset();
- if (gatherCounts) {
- if (METHODCOUNTMAP == null) {
- METHODCOUNTMAP = new HashMap();
- FIELDCOUNTMAP = new HashMap();
- FIELDSETCOUNTMAP = new HashMap();
- }
- }
- GATHER_COUNTS = gatherCounts;
- }
- }
-
-
- public static void reset(){
- REMMETHODCOUNT = UNIQUEMETHODCOUNT = REMINVOKABLECOUNT = UNIQUEINVOKABLECOUNT = REMCONSTRUCTORCALLED = METHODPROXYINVOKECOUNT = INVOKEINVOKECOUNT = REMFIELDCOUNT = UNIQUEFIELDCOUNT = 0;
- if (GATHER_COUNTS) {
- METHODCOUNTMAP.clear();
- FIELDCOUNTMAP.clear();
- FIELDSETCOUNTMAP.clear();
- }
- }
-
- public static void println(){
-
- if (GATHER_COUNTS) {
- System.out.println("--------------------------------------------------"); //$NON-NLS-1$
- System.out.println("Method proxies invokes = " + METHODPROXYINVOKECOUNT); //$NON-NLS-1$
- System.out.println("Invoke invokes = " + INVOKEINVOKECOUNT); //$NON-NLS-1$
- System.out.println(".................................................."); //$NON-NLS-1$
- System.out.println("Methods retrieved = " + REMMETHODCOUNT + "(" + UNIQUEMETHODCOUNT + ")"); //$NON-NLS-1$ //$NON-NLS-2$ //$NON-NLS-3$
- System.out.println("Invokes retrieved = " + REMINVOKABLECOUNT + "(" + UNIQUEINVOKABLECOUNT + ")"); //$NON-NLS-1$ //$NON-NLS-2$ //$NON-NLS-3$
- System.out.println("Fields retrieved = " + REMFIELDCOUNT + "(" + UNIQUEFIELDCOUNT + ")"); //$NON-NLS-1$ //$NON-NLS-2$ //$NON-NLS-3$
- System.out.println("Constructor calls = " + REMCONSTRUCTORCALLED); //$NON-NLS-1$
- System.out.println("--------------------------------------------------"); //$NON-NLS-1$
- System.out.println("-Count of methods invoked-------------------------"); //$NON-NLS-1$
- System.out.println("--------------------------------------------------"); //$NON-NLS-1$
-
- // Collate the methods called
- Iterator entries = METHODCOUNTMAP.entrySet().iterator();
- while (entries.hasNext()) {
- Map.Entry entry = (Entry) entries.next();
- REMMethodProxy methodProxy = (REMMethodProxy) entry.getKey();
- System.out.println(methodProxy.getClassType().getTypeName() + "," + methodProxy.getName() + "," + entry.getValue()); //$NON-NLS-1$ //$NON-NLS-2$
- }
-
- System.out.println("--------------------------------------------------"); //$NON-NLS-1$
- System.out.println("-Count of fields get called ----------------------"); //$NON-NLS-1$
- System.out.println("--------------------------------------------------"); //$NON-NLS-1$
-
- // Collate the fields accessed
- entries = FIELDCOUNTMAP.entrySet().iterator();
- while (entries.hasNext()) {
- Map.Entry entry = (Entry) entries.next();
- REMFieldProxy fieldProxy = (REMFieldProxy) entry.getKey();
- System.out.println(fieldProxy.toBeanString() + "," + entry.getValue()); //$NON-NLS-1$
- }
-
- System.out.println("--------------------------------------------------"); //$NON-NLS-1$
- System.out.println("-Count of fields set called ----------------------"); //$NON-NLS-1$
- System.out.println("--------------------------------------------------"); //$NON-NLS-1$
-
- // Collate the fields set
- entries = FIELDSETCOUNTMAP.entrySet().iterator();
- while (entries.hasNext()) {
- Map.Entry entry = (Entry) entries.next();
- REMFieldProxy fieldProxy = (REMFieldProxy) entry.getKey();
- System.out.println(fieldProxy.toBeanString() + "," + entry.getValue()); //$NON-NLS-1$
- }
- }
-
- }
-
-/**
- * @param aBeanTypeProxy = BeanTypeProxy for the method
- * @param methodName = methodName to be looked for
- * @param parmTypes = array of qualified type names for the method arguments, null if no methods
- */
- public IMethodProxy getMethodProxy(IBeanTypeProxy aBeanTypeProxy, String methodName, String[] parmTypes){
- if (!registry.isValid())
- return null;
-
- REMMETHODCOUNT++;
- Map methods;
- Object key;
- synchronized (this) {
- // The classCache map is keyed by the BeanTypeProxy and holds a further map of cache'd methods
- methods = getMethods(aBeanTypeProxy);
-
- // The syntax of the key is methodName(parmType1,parmType2)
- if (parmTypes == null || parmTypes.length == 0) {
- key = methodName;
- } else {
- key = new MethodKeyStringParms(methodName, parmTypes);
- }
-
- IMethodProxy result = (IMethodProxy) methods.get(key);
- if (result != null)
- return result;
- }
-
- UNIQUEMETHODCOUNT++;
- // Get the method proxy and cache this before returning it
- // Get the method proxy and cache this before returning it
- REMMethodProxyFactory proxyFactory = (REMMethodProxyFactory) registry.getMethodProxyFactory();
- IMethodProxy result = proxyFactory.getMethodProxy((IREMBeanTypeProxy)aBeanTypeProxy,methodName,parmTypes);
- synchronized (this) {
- // Get it again to make sure it hasn't changed due to a race condition. We don't sync for the getMethodProxy because that goes to the remote vm and could deadlock.
- IMethodProxy mValue = (IMethodProxy) methods.get(key);
- if (mValue != null && mValue != result) {
- registry.releaseProxy(result); // Don't need the result now, got it through a race condition.
- return mValue; // We have a real value now.
- }
- methods.put(key, result);
- }
- return result;
- }
-/**
- * @param aBeanTypeProxy
- * @return Map of cache'd methods
- */
-private Map getMethods(IProxyBeanType aBeanTypeProxy) {
- Map methods = (Map) methodsCache.get(aBeanTypeProxy.getTypeName());
- if(methods == null){
- methods = new HashMap(20);
- methodsCache.put(aBeanTypeProxy.getTypeName(),methods);
- }
- return methods;
-}
-/**
- * @param aBeanTypeProxy
- * @return Map of cache'd invokables
- */
-private Map getInvokables(IBeanTypeProxy aBeanTypeProxy) {
- Map invokables = (Map) invokablesCache.get(aBeanTypeProxy);
- if(invokables == null){
- invokables = new HashMap(20);
- invokablesCache.put(aBeanTypeProxy,invokables);
- }
- return invokables;
-}
-/**
- * @param aBeanTypeProxy
- * @return Map of cache'd fields
- */
-private Map getFields(IProxyBeanType aBeanTypeProxy) {
- Map fields = (Map) fieldsCache.get(aBeanTypeProxy.getTypeName());
- if(fields == null){
- fields = new HashMap(20);
- fieldsCache.put(aBeanTypeProxy.getTypeName(),fields);
- }
- return fields;
-}
-/**
- * @param aBeanTypeProxy = BeanTypeProxy for the method
- * @param methodName = methodName to be looked for
- * @param parmTypes = array of qualified type names for the method arguments, null if no arguments
- */
- public IInvokable getInvokable(IBeanTypeProxy aBeanTypeProxy, String invokableName, String[] parmTypeNames){
-
- REMINVOKABLECOUNT++;
- // The classCache map is keyed by the BeanTypeProxy and holds a further map of cache'd methods
- Map invokables = getInvokables(aBeanTypeProxy);
-
- Object key = null;
- if(parmTypeNames == null || parmTypeNames.length == 0){
- key = invokableName;
- } else {
- key = new MethodKeyStringParms(invokableName, parmTypeNames);
- }
-
- IInvokable result = (IInvokable) invokables.get(key);
- if(result != null) return result;
-
- UNIQUEINVOKABLECOUNT++;
- // Get the method proxy and cache this before returning it
- // Get the method proxy and cache this before returning it
- REMMethodProxyFactory proxyFactory = (REMMethodProxyFactory) aBeanTypeProxy.getProxyFactoryRegistry().getMethodProxyFactory();
- result = proxyFactory.getInvokable((IREMBeanTypeProxy)aBeanTypeProxy,invokableName,parmTypeNames);
- invokables.put(key,result);
- return result;
-
- }
- /**
- * @param aBeanTypeProxy = BeanTypeProxy for the method
- * @param methodName = methodName to be looked for
- * @param parmTypes = array of IBeanTypeProxy types for the method arguments, null if no arguments
- */
- public IInvokable getInvokable(IBeanTypeProxy aBeanTypeProxy, String invokableName, IBeanTypeProxy[] parmTypes){
-
- REMINVOKABLECOUNT++;
- // The classCache map is keyed by the BeanTypeProxy and holds a further map of cache'd methods
- Map invokables = getInvokables(aBeanTypeProxy);
-
- Object key = null;
- if(parmTypes == null || parmTypes.length == 0){
- key = invokableName;
- } else {
- key = new MethodKeyProxyParms(invokableName, parmTypes);
- }
-
- IInvokable result = (IInvokable) invokables.get(key);
- if(result != null) return result;
-
- UNIQUEINVOKABLECOUNT++;
- // Get the method proxy and cache this before returning it
- // Get the method proxy and cache this before returning it
- REMMethodProxyFactory proxyFactory = (REMMethodProxyFactory) aBeanTypeProxy.getProxyFactoryRegistry().getMethodProxyFactory();
- result = proxyFactory.getInvokable((IREMBeanTypeProxy)aBeanTypeProxy,invokableName,parmTypes);
- invokables.put(key,result);
- return result;
-
- }
-/**
- * @param aBeanTypeProxy = BeanTypeProxy for the method
- * @param methodName = methodName to be looked for
- * @param parmTypes = array of qualified type names for the method arguments, null if no methods
- */
- public IMethodProxy getMethodProxy(IBeanTypeProxy aBeanTypeProxy, String methodName, IBeanTypeProxy[] parmTypes){
- if (!registry.isValid())
- return null;
-
- REMMETHODCOUNT++;
- // The classCache map is keyed by the BeanTypeProxy and holds a further map of cache'd methods
- Map methods;
- Object key;
- synchronized (this) {
- methods = getMethods(aBeanTypeProxy);
-
- key = null;
- if (parmTypes == null || parmTypes.length == 0) {
- key = methodName;
- } else {
- key = new MethodKeyProxyParms(methodName, parmTypes);
- }
-
- IMethodProxy result = (IMethodProxy) methods.get(key);
- if (result != null)
- return result;
- }
-
- UNIQUEMETHODCOUNT++;
- // Get the method proxy and cache this before returning it
- // Get the method proxy and cache this before returning it
- REMMethodProxyFactory proxyFactory = (REMMethodProxyFactory) registry.getMethodProxyFactory();
- IMethodProxy result = proxyFactory.getMethodProxy((IREMBeanTypeProxy)aBeanTypeProxy,methodName,parmTypes);
- synchronized (this) {
- // Get it again to make sure it hasn't changed due to a race condition. We don't sync for the getMethodProxy because that goes to the remote vm and could deadlock.
- IMethodProxy mValue = (IMethodProxy) methods.get(key);
- if (mValue != null && mValue != result) {
- registry.releaseProxy(result); // Don't need result now, got it already through a race condition.
- return mValue; // We have a real value now.
- }
- methods.put(key, result);
- }
-
- return result;
- }
-
- /**
- * Return the proxy method for the method through the expression.
- * @param expression
- * @param aBeanTypeProxy
- * @param methodName
- * @param parmTypes
- * @return either the IMethodProxy if already resolved or an ExpressionProxy if not yet resolved.
- *
- * @since 1.1.0
- */
- public IProxyMethod getMethodProxy(IExpression expression, IProxyBeanType aBeanTypeProxy, String methodName, IProxyBeanType[] parmTypes){
- if (!registry.isValid())
- return null;
-
- REMMETHODCOUNT++;
- Map methods;
- Map epMethods;
- Object key;
- boolean isKey;
- synchronized (this) {
- // The classCache map is keyed by the BeanTypeProxy name and holds a further map of cache'd methods
- methods = getMethods(aBeanTypeProxy);
-
- if (parmTypes == null || parmTypes.length == 0) {
- key = methodName;
- isKey = false;
- } else {
- key = new MethodKeyProxyParms(methodName, parmTypes);
- isKey = true;
- }
-
- IProxyMethod result = (IProxyMethod) methods.get(key);
- if (result != null)
- return result;
-
- // See if stored in the expression.
- epMethods = ((REMExpression) expression).getMethods(aBeanTypeProxy);
- result = (IProxyMethod) epMethods.get(key);
- if (result != null)
- return result;
- }
-
- UNIQUEMETHODCOUNT++;
- // Get the method expression proxy and cache this before returning it
- IProxyMethod result = ((Expression) expression).createMethodExpressionProxy(aBeanTypeProxy,methodName,parmTypes);
- epMethods.put(key, result);
- final Object epKey = key;
- final Map rMethods = methods;
- final Map fepMethods = epMethods;
- final boolean isKeyType = isKey;
- ((ExpressionProxy) result).addProxyListener(new ExpressionProxy.ProxyAdapter() {
- public void proxyResolved(ProxyEvent event) {
- synchronized (REMProxyConstants.this) {
- if (rMethods.containsKey(epKey))
- return; // We already have a true method proxy in there. A race condition occurred.
-
- // Now put this resolved guy into the methods.
- // We don't want the key to contain expression proxies in the final map, so if it is a key type
- // we will turn it into a string type key.
- Object key;
- if (isKeyType) {
- key = ((MethodKeyProxyParms) epKey).toMethodKeyStringParms(); // So that we don't put a ket that contains expression proxy parm types into the main map.
- } else
- key = epKey;
-
- rMethods.put(key, event.getProxy());
- }
- }
-
- public void proxyNotResolved(ExpressionProxy.ProxyEvent event) {
- synchronized (REMProxyConstants.this) {
- fepMethods.remove(epKey);
- }
- }
-
- });
- return result;
- }
-
- /**
- * @param proxy
- */
- static void methodInvoked(REMMethodProxy proxy) {
-
- if (GATHER_COUNTS) {
- Integer count = (Integer) METHODCOUNTMAP.get(proxy);
- if (count == null) {
- METHODCOUNTMAP.put(proxy, new Integer(1));
- } else {
- METHODCOUNTMAP.put(proxy, new Integer(count.intValue() + 1));
- }
- }
- }
-
- static void fieldGetInvoked(IBeanProxy proxy) {
-
- if (GATHER_COUNTS) {
- Integer count = (Integer) FIELDCOUNTMAP.get(proxy);
- if (count == null) {
- FIELDCOUNTMAP.put(proxy, new Integer(1));
- } else {
- FIELDCOUNTMAP.put(proxy, new Integer(count.intValue() + 1));
- }
- }
- }
-
- static void fieldSetInvoked(IBeanProxy proxy, IBeanProxy value) {
-
- if (GATHER_COUNTS) {
- Integer count = (Integer) FIELDSETCOUNTMAP.get(proxy);
- if (count == null) {
- FIELDSETCOUNTMAP.put(proxy, new Integer(1));
- } else {
- FIELDSETCOUNTMAP.put(proxy, new Integer(count.intValue() + 1));
- }
- }
- }
-
- /**
- * @param proxy for the BeanType of the field
- * @param fieldName of the field, e.g. (java.awt.Dimension, width) for the "width" field on Dimension
- * @return The field proxy that is cache'd for performance
- */
- public IFieldProxy getFieldProxy(REMAbstractBeanTypeProxy aBeanTypeProxy, String fieldName) {
- if (!registry.isValid())
- return null;
-
- REMFIELDCOUNT++;
- Map fields;
- synchronized (this) {
- // The field map is keyed by the BeanTypeProxy and holds a further map of cache'd fields
- fields = getFields(aBeanTypeProxy);
-
- // Lookup the cache'd Field proxy
- IFieldProxy result = (IFieldProxy) fields.get(fieldName);
- if (result != null)
- return result;
- }
-
- UNIQUEFIELDCOUNT++;
- IFieldProxy result = (IFieldProxy) REMStandardBeanProxyConstants.getConstants(aBeanTypeProxy.getProxyFactoryRegistry()).getClassGetField().invokeCatchThrowableExceptions(
- aBeanTypeProxy,
- registry.getBeanProxyFactory().createBeanProxyWith(fieldName));
- synchronized (this) {
- IFieldProxy fValue = (IFieldProxy) fields.get(fieldName);
- if (fValue != null) {
- registry.releaseProxy(result); // Don't need it now. A race had put another one in.
- return fValue;
- }
- fields.put(fieldName,result);
- }
- return result;
- }
-
- public IProxyField getFieldProxy(IExpression expression, IProxyBeanType aBeanTypeProxy, final String fieldName){
- if (!registry.isValid())
- return null;
-
- REMFIELDCOUNT++;
- Map fields;
- Map epFields;
- synchronized (this) {
- // The classCache map is keyed by the BeanTypeProxy name and holds a further map of cache'd methods
- fields = getFields(aBeanTypeProxy);
-
- IProxyField result = (IProxyField) fields.get(fieldName);
- if (result != null)
- return result;
-
- // See if stored in the expression.
- epFields = ((REMExpression) expression).getFields(aBeanTypeProxy);
- result = (IProxyField) epFields.get(fieldName);
- if (result != null)
- return result;
- }
-
- UNIQUEFIELDCOUNT++;
- // Get the field expression proxy and cache this before returning it
- IProxyField result = ((REMExpression) expression).createFieldExpressionProxy(aBeanTypeProxy, fieldName);
- epFields.put(fieldName, result);
- final Map fpFields = fields;
- final Map fepFields = epFields;
- ((ExpressionProxy) result).addProxyListener(new ExpressionProxy.ProxyAdapter() {
-
- public void proxyResolved(ProxyEvent event) {
- synchronized (REMProxyConstants.this) {
- if (fpFields.containsKey(fieldName))
- return; // Already set to resolved value by someone else.
- fpFields.put(fieldName, event.getProxy());
- }
- }
- public void proxyNotResolved(ExpressionProxy.ProxyEvent event) {
- synchronized (REMProxyConstants.this) {
- fepFields.remove(fieldName);
- }
- }
- });
-
- return result;
- }
-}
diff --git a/plugins/org.eclipse.jem.proxy/proxyRemote/org/eclipse/jem/internal/proxy/remote/REMProxyFactoryRegistry.java b/plugins/org.eclipse.jem.proxy/proxyRemote/org/eclipse/jem/internal/proxy/remote/REMProxyFactoryRegistry.java
deleted file mode 100644
index db1e31e..0000000
--- a/plugins/org.eclipse.jem.proxy/proxyRemote/org/eclipse/jem/internal/proxy/remote/REMProxyFactoryRegistry.java
+++ /dev/null
@@ -1,476 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2001, 2005 IBM Corporation and others.
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
- *
- * Contributors:
- * IBM Corporation - initial API and implementation
- *******************************************************************************/
-package org.eclipse.jem.internal.proxy.remote;
-/*
-
-
- */
-
-
-import java.io.IOException;
-import java.net.Socket;
-import java.text.MessageFormat;
-import java.util.Iterator;
-import java.util.Stack;
-
-import org.eclipse.core.runtime.*;
-import org.eclipse.core.runtime.jobs.IJobManager;
-import org.eclipse.core.runtime.jobs.Job;
-import org.eclipse.debug.core.*;
-import org.eclipse.debug.core.model.IProcess;
-import org.eclipse.debug.core.model.IStreamsProxy;
-
-import org.eclipse.jem.internal.proxy.core.*;
-/**
- * This is the factory registry to use for Remote VM.
- * It adds to the standard registry, connection specific information.
- *
- * This will always hold onto one connection open until termination is requested.
- * That way while the IDE is up, the remove vm won't time out.
- */
-
-public class REMProxyFactoryRegistry extends BaseProxyFactoryRegistry {
-
- public static final String REMOTE_REGISTRY_TYPE_ID = "org.eclipse.jem.REMOTE"; //$NON-NLS-1$
-
- protected int fServerPort = 0; // The server port to use when making connections.
- protected REMCallbackRegistry fCallbackServer; // The callback server thread for this remote vm.
- protected Stack fConnectionPool = new Stack(); // Stack of free connections.
- protected static int NUMBER_FREE_CONNECTIONS = 5; // Number of free connections to keep open.
- protected IProcess fProcess; // The process that is the server. If null and fServerPort is not zero,
- // then this registry is in test mode
- // and the server is in same the process.
- protected String fName;
- protected int fCallbackServerPort;
- protected Integer fRegistryKey;
- protected REMRegistryController fRegistryController;
-
- protected final static Object TERMINATE_JOB_FAMILY = new Object();
-
- // Package protected because only the ProxyVMStarter should set this flag. It would set it if
- // working with a debugger because we don't how long it will be to respond to requests when
- // someone is working with a debugger.
- boolean fNoTimeouts = false;
-
- // This is set via the static setGlobalNoTimeouts() method, or via debug options flag. It is here so that
- // when debugging callbacks, but not debugging remote vm, that no timeouts for any registry will occur.
- // Or it can be set through the debug .options flag.
- static boolean fGlobalNoTimeouts = "true".equalsIgnoreCase(Platform.getDebugOption(ProxyPlugin.getPlugin().getBundle().getSymbolicName()+ProxyRemoteUtil.NO_TIMEOUTS)); //$NON-NLS-1$;
-
- /**
- * Typicall set through the "expression" evaluation of the debugger.
- * @param noTimeouts
- *
- * @since 1.0.0
- */
- public static void setGlobalNoTimeouts(boolean noTimeouts) {
- fGlobalNoTimeouts = noTimeouts;
- }
-
- // An internal thread that locks and waits for the remote vm to register itself.
- private WaitForRegistrationThread waitRegistrationThread;
-
- private class WaitForRegistrationThread extends Thread {
- public WaitForRegistrationThread() {
- super("Wait for remote vm registration thread"); //$NON-NLS-1$
- }
-
- /**
- * @see java.lang.Thread#run()
- */
- public void run() {
- // Wait for registration. Put it into a thread so this
- // can occur while other stuff goes on. It locks the fConnectionPool
- // until done so that the first request for a connection by anyone
- // else will wait until this thread is finished.
-
- synchronized(fConnectionPool) {
- synchronized(REMProxyFactoryRegistry.this) {
- // Notify the main thread that we have the
- // connection pool locked.
- REMProxyFactoryRegistry.this.notifyAll();
- }
- synchronized (this) {
- // sync on self so that it can be notified when finally receive the registration
- long stopTime = System.currentTimeMillis()+60000;
- while (waitRegistrationThread != null && (fNoTimeouts || System.currentTimeMillis() < stopTime)) {
- try {
- Thread.currentThread().wait(60000);
- } catch (InterruptedException e) {
- }
- }
- }
- }
-
- waitRegistrationThread = null; // No longer exists.
- }
- }
-
-
- public REMProxyFactoryRegistry(REMRegistryController registryController, String name) {
- super(REMOTE_REGISTRY_TYPE_ID);
- fRegistryController = registryController;
- fRegistryKey = fRegistryController.registerRegistry(this); // Register the registry with the plugin.
- fName = name;
-
- // Get the waitRegistrationThread started before we actually launch remote vm so
- // that it is waiting when the callback comes in.
- synchronized (this) {
- waitRegistrationThread = new WaitForRegistrationThread();
- waitRegistrationThread.start();
-
- // Now we will wait until the registration callback has been done. The thread will
- // signal us when that is done. This is so that we don't continue on and let
- // a work connection be requested before we even got a chance to start waiting
- // for the registration.
- while(true) {
- try {
- wait();
- break;
- } catch (InterruptedException e) {
- }
- };
- }
- }
-
- public Integer getRegistryKey() {
- return fRegistryKey;
- }
-
- public void initializeRegistry(IProcess process) {
- fProcess = process;
- processListener = new IDebugEventSetListener() {
- /**
- * @see org.eclipse.debug.core.IDebugEventSetListener#handleDebugEvents(DebugEvent[])
- */
- public void handleDebugEvents(DebugEvent[] events) {
- for (int i = 0; i < events.length; i++) {
- DebugEvent e = events[i];
- if (e.getSource() == fProcess && e.getKind() == DebugEvent.TERMINATE) {
- // We terminating too soon. Pop up a msg.
- IStreamsProxy stProxy = fProcess.getStreamsProxy();
- java.io.StringWriter s = new java.io.StringWriter();
- java.io.PrintWriter w = new java.io.PrintWriter(s);
-
- String msg = MessageFormat.format(ProxyRemoteMessages.Proxy_Terminated_too_soon_ERROR_, new Object[] {fName});
- w.println(msg);
- w.println(ProxyRemoteMessages.VM_TERMINATED_INFO_);
- w.println(ProxyRemoteMessages.VM_COMMAND_LINE);
- w.println(fProcess.getAttribute(IProcess.ATTR_CMDLINE));
- w.println(ProxyRemoteMessages.VM_TERMINATED_LINE1);
- w.println(stProxy.getErrorStreamMonitor().getContents());
- w.println(ProxyRemoteMessages.VM_TERMINATED_LINE2);
- w.println(stProxy.getOutputStreamMonitor().getContents());
- w.println(ProxyRemoteMessages.VM_TERMINATED_LINE3);
- w.close();
-
- DebugModeHelper dh = new DebugModeHelper();
- dh.displayErrorMessage(ProxyRemoteMessages.Proxy_Error_Title, msg);
- ProxyPlugin.getPlugin().getLogger().log(new Status(IStatus.WARNING, ProxyPlugin.getPlugin().getBundle().getSymbolicName(), 0, s.toString(), null));
- processListener = null;
- DebugPlugin.getDefault().removeDebugEventListener(this);
- terminateRegistry();
- break;
- }
- }
- }
- };
-
- DebugPlugin.getDefault().addDebugEventListener(processListener);
- }
-
- private IDebugEventSetListener processListener = null;
-
- /**
- * Get the CallbackRegistry
- */
- public ICallbackRegistry getCallbackRegistry() {
- if (fCallbackServer == null)
- fCallbackServer = new REMCallbackRegistry(fName, this);
- return fCallbackServer;
- }
-
- /**
- * This is called by the registry controller to tell
- * the registry to terminate with prejudice all
- * pending TerminateJobs.
- *
- *
- * @since 1.1.0
- */
- public static void cancelAllTerminateJobs() {
- IJobManager jobManager = Job.getJobManager();
- jobManager.cancel(TERMINATE_JOB_FAMILY);
- try {
- jobManager.join(TERMINATE_JOB_FAMILY, null);
- } catch (OperationCanceledException e) {
- } catch (InterruptedException e) {
- }
- }
-
- private static class TerminateProcess extends Job {
- private IProcess process;
-
- public TerminateProcess(IProcess process) {
- super(ProxyRemoteMessages.REMProxyFactoryRegistry_Job_TerminateProcess_Title);
- this.process = process;
- }
-
- public boolean belongsTo(Object family) {
- return family == TERMINATE_JOB_FAMILY || super.belongsTo(family);
- }
-
-
- /* (non-Javadoc)
- * @see java.lang.Thread#run()
- */
- public IStatus run(IProgressMonitor mon) {
- try {
- // There is no join on a process available, so we will have to
- // busy wait. Give it 10 seconds in 1/10 second intervals.
- for (int i=0; !process.isTerminated() && i<100; i++) {
- try {
- Thread.sleep(100);
- } catch (InterruptedException e) {
- }
- }
- if (!process.isTerminated()) {
- process.terminate();
- }
- } catch (DebugException e) {
- }
- return Status.OK_STATUS;
- }
- }
-
- protected void registryTerminated(boolean wait) {
- if (processListener != null) {
- // Remove listener cause we are now going to terminate process and don't want premature terminate notice.
- // Sometimes in shutdown we are called and the debug plugin may of already been shutdown. In that case the db
- // will be null and there is nothing remove listener from.
- DebugPlugin db = DebugPlugin.getDefault();
- if (db != null)
- db.removeDebugEventListener(processListener);
- processListener = null;
- }
-
- Job tjob = null;
- if (waitRegistrationThread != null) {
- synchronized (waitRegistrationThread) {
- // Still waiting. close it out.
- WaitForRegistrationThread wThread = waitRegistrationThread;
- waitRegistrationThread = null;
- wThread.notifyAll();
- }
- }
- if (fServerPort != 0) {
- IREMConnection closeCon = null; // The connection we will use to close the remote vm.
- synchronized(fConnectionPool) {
- // Now we walk through all of the free connections and close them properly.
- Iterator itr = fConnectionPool.iterator();
- if (itr.hasNext())
- closeCon = (IREMConnection) itr.next();
- while (itr.hasNext()) {
- IREMConnection con = (IREMConnection) itr.next();
- con.close();
- }
- }
-
- // Now we terminate the server.
- if (closeCon == null)
- try {
- closeCon = getFreeConnection(); // There weren't any free connections, so get a new one so that we can close it.
- } catch (IllegalStateException e) {
- // Do nothing, don't want to stop termination just because we can't get a connection.
- }
- if (closeCon != null) {
- closeCon.terminateServer(); // We got a connection to terminate (process may of terminated early, so we would not have a conn then).
- }
- fConnectionPool.clear();
- fServerPort = 0;
-
- if (fProcess != null && !fRegistryController.inShutDown()) {
- tjob = new TerminateProcess(fProcess);
- tjob.setSystem(true);
- tjob.schedule();
- fProcess = null;
- }
- }
-
- if (fCallbackServer != null) {
- fCallbackServer.requestShutdown();
- fCallbackServer = null;
- }
-
- fConnectionPool.clear();
- fRegistryController.deregisterRegistry(fRegistryKey); // De-register this registry.
-
- if (wait && tjob != null) {
- try {
- tjob.join();
- } catch (InterruptedException e) {
- // It timed out, so we'll just go on.
- }
- }
- }
-
- /**
- * Return the server port number.
- */
- public int getServerPort() {
- return fServerPort;
- }
-
- /*
- * set the server port.
- */
- void setServerPort(int serverport) {
- fServerPort = serverport;
- if (waitRegistrationThread != null) {
- synchronized (waitRegistrationThread) {
- // Close it out, we are now registered
- WaitForRegistrationThread wThread = waitRegistrationThread;
- waitRegistrationThread = null;
- wThread.notifyAll();
- }
- }
- }
-
- /**
- * Get a free connection
- * @return
- * @throws IllegalStateException - Thrown if a connection cannot be created.
- *
- * @since 1.0.0
- */
- public IREMConnection getFreeConnection() throws IllegalStateException {
- Thread thread = Thread.currentThread();
- if (thread instanceof REMCallbackThread) {
- // The current thread is a call back thread, so just reuse the connection.
- // But this thread could actually be trying to access another registry.
- // So if this thread is for this registry, use it, if not for this registry, create a new connection.
- // But if for this registry AND is already in a transaction, we need a fresh connection.
- REMCallbackThread callbackThread = (REMCallbackThread) thread;
- if (callbackThread.registry == this && !callbackThread.inTransaction()) {
- // This way any calls out to the remote vm will be on same thread as callback caller
- // on remote vm because that thread is waiting on this connection for commands.
- IREMConnection c = (callbackThread).getConnection();
- if (c.isConnected())
- return c;
- else
- throw new IllegalStateException(ProxyRemoteMessages.REMProxyFactoryRegistry_CallbackConnectionNotWorking_EXC_);
- }
- }
- synchronized(fConnectionPool) {
- if (!fConnectionPool.isEmpty())
- return (IREMConnection) fConnectionPool.pop();
- // else we need to allocate one.
- return createConnection();
- }
- }
-
-
- /**
- * Make a new connection.
- * @return
- * @throws IllegalStateException - Thrown if connection cannot be created.
- *
- * @since 1.0.0
- */
- protected IREMConnection createConnection() throws IllegalStateException {
- // If we have a server port, then the server is probably open. If we don't then there is no server.
- if (fServerPort != 0) {
- // We are putting it off into a thread because there are no timeout capabilities on getting a socket.
- // So we need to allow for that.
- final Socket[] scArray = new Socket[1];
- final boolean[] waiting = new boolean[] {true};
- Thread doIt = new Thread(new Runnable() {
- public void run() {
- try {
- Socket sc = new Socket("localhost", fServerPort); //$NON-NLS-1$
- synchronized (this) {
- if (waiting[0])
- scArray[0] = sc;
- else
- sc.close(); // We are no longer waiting on this thread so close the socket since no one will use it.
- }
- } catch (IOException e) {
- ProxyPlugin.getPlugin().getLogger().log(new Status(IStatus.WARNING, ProxyPlugin.getPlugin().getBundle().getSymbolicName(), 0, "", e)); //$NON-NLS-1$
- }
- }
- });
-
- doIt.start();
- while (true) {
- try {
- doIt.join(!fNoTimeouts ? 60000 : 0);
- synchronized (doIt) {
- waiting[0] = false; // To let it know we are no longer waiting
- }
- break;
- } catch (InterruptedException e) {
- }
- }
-
- if (scArray[0] == null) {
- // Log where we are at so we can know where it was we down.
- ProxyPlugin.getPlugin().getLogger().log(new Status(IStatus.WARNING, ProxyPlugin.getPlugin().getBundle().getSymbolicName(), 0, "", new IllegalStateException(ProxyRemoteMessages.REMProxyFactoryRegistry_ConnectionCreationFailed_INFO_))); //$NON-NLS-1$
- throw new IllegalStateException(ProxyRemoteMessages.REMProxyFactoryRegistry_CouldNotCreateSocketConnectionToRemoteVM_EXC_); // Couldn't get one, probably server is down. //$NON-NLS-1$
- }
-
- REMConnection connection = new REMConnection(scArray[0], fNoTimeouts);
- if (connection.isConnected())
- return connection;
-
- // Failed, close the socket.
- try {
- scArray[0].close();
- } catch (IOException e) {
- }
- } else
- ProxyPlugin.getPlugin().getLogger().log(new Status(IStatus.WARNING, ProxyPlugin.getPlugin().getBundle().getSymbolicName(), 0, "No Server to retrieve a connection.", null)); ///$NON-NLS-1$
-
- throw new IllegalStateException(ProxyRemoteMessages.REMProxyFactoryRegistry_CouldNotCreateSocketConnectionToRemoteVM_EXC_);
- }
-
- /**
- * Free the connection
- */
- public void returnConnection(IREMConnection connection) {
- if (connection.isConnected()) {
- Thread thread = Thread.currentThread();
- if (!(thread instanceof REMCallbackThread) || ((REMCallbackThread) thread).getConnection() != connection) {
- // We are not a callback thread, or we are but the connection is not for the thread, then the connection
- // can be returned.
- synchronized (fConnectionPool) {
- if (fConnectionPool.size() < NUMBER_FREE_CONNECTIONS)
- fConnectionPool.push(connection);
- else
- connection.close(); // We don't need to maintain more than five free connections.
- }
- }
- }
- }
-
- /**
- * Release this connection. This means close it out.
- */
- public void closeConnection(IREMConnection connection) {
- connection.close();
- }
-
-
- public int connectionCount() {
- synchronized (fConnectionPool) {
- return fConnectionPool.size();
- }
- }
-}
diff --git a/plugins/org.eclipse.jem.proxy/proxyRemote/org/eclipse/jem/internal/proxy/remote/REMRegistryController.java b/plugins/org.eclipse.jem.proxy/proxyRemote/org/eclipse/jem/internal/proxy/remote/REMRegistryController.java
deleted file mode 100644
index 8405d6f..0000000
--- a/plugins/org.eclipse.jem.proxy/proxyRemote/org/eclipse/jem/internal/proxy/remote/REMRegistryController.java
+++ /dev/null
@@ -1,198 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2001, 2005 IBM Corporation and others.
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
- *
- * Contributors:
- * IBM Corporation - initial API and implementation
- *******************************************************************************/
-package org.eclipse.jem.internal.proxy.remote;
-/*
-
-
- */
-
-import java.util.HashMap;
-import java.util.Map;
-
-import org.eclipse.core.runtime.*;
-import org.eclipse.core.runtime.IProgressMonitor;
-import org.eclipse.core.runtime.IStatus;
-import org.eclipse.core.runtime.jobs.Job;
-
-import org.eclipse.jem.internal.proxy.core.ProxyPlugin;
-
-/**
- * This class is a controller for all of the registries.
- * @author richkulp
- */
-public class REMRegistryController {
-
- private Map fActiveRegistries = new HashMap(); // Access to this must be sync(REMRegistryController)
- private static final long CLEANUP_INTERVAL = 60000l; // The interval between clean up job execution.
-
- protected boolean inShutdown; // Are we in shutdown mode. Terminate registries runs differently in shutdown mode.
-
- // Thread to clean up GC'd proxies. Runs as a daemon at the lowest priority
- private Job processQueueJob= new Job(ProxyRemoteMessages.CleanupJob_title) {
- public IStatus run(IProgressMonitor m) {
- REMProxyFactoryRegistry[] registries = null;
- synchronized (REMRegistryController.this) {
- // This list may be updated by others, so we need to make a copy
- // or else we could get a failure.
- registries =
- (REMProxyFactoryRegistry[]) fActiveRegistries.values().toArray(
- new REMProxyFactoryRegistry[fActiveRegistries.size()]);
- }
- for (int i = 0; i < registries.length; i++) {
- try {
- ((REMStandardBeanProxyFactory) registries[i].getBeanProxyFactory()).processQueue();
- } catch (RuntimeException e) {
- // When debugging, getBeanProxyFactory can throw exception because it hasn't been initialized
- // yet when the thread wakes up, though the registry has been registered. It has to do with it
- // can take significant time for the user to start up the debugger, and during that time this
- // thread could kick in.
- }
- }
- synchronized(this) {
- if (!m.isCanceled())
- this.schedule(CLEANUP_INTERVAL); // Schedule to start again in one minute.
- }
- return Status.OK_STATUS;
- }
-
- }; //$NON-NLS-1$
-
- public REMRegistryController() {
-
- ProxyPlugin.getPlugin().addProxyShutdownListener(new ProxyPlugin.IProxyPluginShutdownListener() {
- /*
- * (non-Javadoc)
- *
- * @see org.eclipse.jem.internal.proxy.core.ProxyPlugin.IProxyPluginShutdownListener#shutdown()
- */
- public void shutdown() {
- REMRegistryController.this.shutdown();
- }
- });
-
- masterThread = new REMMasterServerThread(this);
- masterThread.start();
-
- processQueueJob.setSystem(true); // So that it won't show processing in process view. Not of interest to general users.
- processQueueJob.setPriority(Job.SHORT);
- processQueueJob.schedule(CLEANUP_INTERVAL);
-
- }
-
- /**
- * Answer whether we are shutting down or not.
- * @return
- *
- * @since 1.1.0
- */
- public boolean inShutDown() {
- return inShutdown;
- }
-
- /*
- * Add registry to list of active. Return a unique number to be the key.
- * Package-protected so that only locals can access it.
- */
- synchronized Integer registerRegistry(REMProxyFactoryRegistry registry) {
-
- Integer hashcode = new Integer(registry.hashCode());
- while (true) {
- REMProxyFactoryRegistry existing = (REMProxyFactoryRegistry) fActiveRegistries.get(hashcode);
- if (existing == null)
- break; // Not yet registered, use use the hashcode
- else if (existing != registry)
- hashcode = new Integer(hashcode.intValue()+1);
- else
- return hashcode; // Same guy, use the hashcode.
- }
-
- fActiveRegistries.put(hashcode, registry);
- return hashcode;
- }
-
- /*
- * deregister the registry.
- */
- synchronized void deregisterRegistry(Integer key) {
- fActiveRegistries.remove(key);
- }
-
- /*
- * Return the registry for the given key
- */
- synchronized REMProxyFactoryRegistry getRegistry(Integer key) {
- return (REMProxyFactoryRegistry) fActiveRegistries.get(key);
- }
-
- /**
- * Master server thread. Handles keep-alive requests and register remote server threads.
- * It will be created when needed.
- */
- protected REMMasterServerThread masterThread;
-
- /*
- * Shuts down this plug-in and discards all plug-in state.
- *
- * In this case, terminate all of the active registries so that they can be shutdown.
- * Don't want them hanging around after termination of the desktop.
- */
- void shutdown() {
-
- synchronized(processQueueJob) {
- processQueueJob.cancel();
- }
-
- REMProxyFactoryRegistry[] registries = null;
- synchronized (this) {
- // This list will be updated in the terminateRegistry, so we need to make a copy
- // or else we get a failure.
- registries =
- (REMProxyFactoryRegistry[]) fActiveRegistries.values().toArray(
- new REMProxyFactoryRegistry[fActiveRegistries.size()]);
- }
-
- inShutdown = true; // We are now in shutdown mode.
- // In shutdown mode the registries will not create the job that waits for the process
- // to terminate, and if it doesn't in 1.5 secs it does a force.
- // Instead what we will do is shutdown all of the registries. If they don't
- // shutdown on their own then they stay out there. But they do have an
- // internal timer that checks every five minutes to see if the host is
- // still there, and if it isn't they will shut themselves down. They
- // would have to be really hosed if the suicide timer wasn't working.
-
- for (int i = 0; i < registries.length; i++)
- registries[i].terminateRegistry();
-
- if (masterThread != null) {
- try {
- masterThread.requestShutdown();
- masterThread.join(20000); // Wait 20 seconds for everything to go down.
- masterThread = null;
- } catch (InterruptedException e) {
- }
- }
-
- try {
- processQueueJob.join();
- } catch(InterruptedException e) {
- }
-
- REMProxyFactoryRegistry.cancelAllTerminateJobs();
- }
-
- /**
- * Return the master socket port number.
- */
- public int getMasterSocketPort() {
- return masterThread != null ? masterThread.getMasterSocket().getLocalPort() : -1;
- }
-
-}
diff --git a/plugins/org.eclipse.jem.proxy/proxyRemote/org/eclipse/jem/internal/proxy/remote/REMShortClassBeanProxy.java b/plugins/org.eclipse.jem.proxy/proxyRemote/org/eclipse/jem/internal/proxy/remote/REMShortClassBeanProxy.java
deleted file mode 100644
index 27ea767..0000000
--- a/plugins/org.eclipse.jem.proxy/proxyRemote/org/eclipse/jem/internal/proxy/remote/REMShortClassBeanProxy.java
+++ /dev/null
@@ -1,44 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2001, 2005 IBM Corporation and others.
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
- *
- * Contributors:
- * IBM Corporation - initial API and implementation
- *******************************************************************************/
-package org.eclipse.jem.internal.proxy.remote;
-/*
-
-
- */
-
-
-import org.eclipse.jem.internal.proxy.core.*;
-import org.eclipse.jem.internal.proxy.common.remote.Commands;
-/**
- * Remote Proxy for Short.class.
- */
-class REMShortClassBeanProxy extends REMNumberBeanProxy {
-
-REMShortClassBeanProxy(REMProxyFactoryRegistry aRegistry, Short aShort) {
- super(aRegistry, aShort);
-}
-
-/**
- * Get the beantype
- */
-public IBeanTypeProxy getTypeProxy() {
- return ((REMStandardBeanTypeProxyFactory) fFactory.getBeanTypeProxyFactory()).shortClass;
-}
-
-/**
- * Render the bean into value object.
- */
-public void renderBean(Commands.ValueObject value) {
- value.set((Short) numberValue());
-}
-}
-
-
diff --git a/plugins/org.eclipse.jem.proxy/proxyRemote/org/eclipse/jem/internal/proxy/remote/REMShortClassBeanTypeProxy.java b/plugins/org.eclipse.jem.proxy/proxyRemote/org/eclipse/jem/internal/proxy/remote/REMShortClassBeanTypeProxy.java
deleted file mode 100644
index d93e66f..0000000
--- a/plugins/org.eclipse.jem.proxy/proxyRemote/org/eclipse/jem/internal/proxy/remote/REMShortClassBeanTypeProxy.java
+++ /dev/null
@@ -1,84 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2001, 2005 IBM Corporation and others.
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
- *
- * Contributors:
- * IBM Corporation - initial API and implementation
- *******************************************************************************/
-package org.eclipse.jem.internal.proxy.remote;
-/*
-
-
- */
-
-
-import org.eclipse.jem.internal.proxy.core.*;
-import org.eclipse.jem.internal.proxy.common.remote.Commands;
-/**
- * Remote Implementation of IBeanTypeProxy for Short.class.
- * Creation date: (2/6/00 9:01:40 AM)
- * @author: Joe Winchester
- */
-final class REMShortClassBeanTypeProxy extends REMAbstractNumberBeanTypeProxy {
-// Some values are cache'd for speed
- private final INumberBeanProxy zeroProxy;
- private final INumberBeanProxy oneProxy;
- private final INumberBeanProxy twoProxy;
- private final INumberBeanProxy threeProxy;
-/**
- * REMIntegerBeanTypeProxy constructor comment.
- * @param aClass java.lang.Class
- */
-REMShortClassBeanTypeProxy(REMProxyFactoryRegistry aRegistry, IBeanTypeProxy numberType) {
- super(aRegistry, new Integer(Commands.SHORT_CLASS), Short.class.getName(), numberType);
-
- // Create the cached values
- zeroProxy = new REMShortClassBeanProxy(aRegistry, new Short((short)0));
- oneProxy = new REMShortClassBeanProxy(aRegistry, new Short((short)1));
- twoProxy = new REMShortClassBeanProxy(aRegistry, new Short((short)2));
- threeProxy = new REMShortClassBeanProxy(aRegistry, new Short((short)3));
-}
-
-/**
- * Helper to create a bean proxy
- * Package protected because everyone should go through the factory API
- * that is defined as part of IBeanProxyFactory
- */
-INumberBeanProxy createShortBeanProxy(Short aShort) {
- switch(aShort.shortValue()) {
- case 0: return zeroProxy;
- case 1: return oneProxy ;
- case 2: return twoProxy ;
- case 3: return threeProxy ;
- default: return new REMShortClassBeanProxy(fRegistry, aShort);
- }
-}
-
-/**
- * Generic way to create a Short proxy, however, the Number must be a Short.
- */
-protected INumberBeanProxy createNumberBeanProxy(Number aNumber) {
- return createShortBeanProxy((Short) aNumber);
-}
-
-/**
- * newInstance method. Number's don't have a default ctor, so the standard way won't work.
- * Return the zero proxy for this case.
- */
-public IBeanProxy newInstance() {
- return zeroProxy;
-}
-
-/**
- * Create a new bean proxy the ValueObject passed in.
- * We will assume the object is correct type.
- */
-public IBeanProxy newBeanProxy(Commands.ValueObject value) {
- return createShortBeanProxy(new Short(value.aShort));
-}
-}
-
-
diff --git a/plugins/org.eclipse.jem.proxy/proxyRemote/org/eclipse/jem/internal/proxy/remote/REMShortTypeBeanProxy.java b/plugins/org.eclipse.jem.proxy/proxyRemote/org/eclipse/jem/internal/proxy/remote/REMShortTypeBeanProxy.java
deleted file mode 100644
index d2bc1e2..0000000
--- a/plugins/org.eclipse.jem.proxy/proxyRemote/org/eclipse/jem/internal/proxy/remote/REMShortTypeBeanProxy.java
+++ /dev/null
@@ -1,132 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2001, 2005 IBM Corporation and others.
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
- *
- * Contributors:
- * IBM Corporation - initial API and implementation
- *******************************************************************************/
-package org.eclipse.jem.internal.proxy.remote;
-/*
-
-
- */
-
-
-import org.eclipse.jem.internal.proxy.common.remote.Commands;
-import org.eclipse.jem.internal.proxy.core.*;
-/**
- * Remote Implementation of INumberBeanProxy for the primitive "short".
- * It can answer all of the primitive number types (int, long, short, byte, double, float).
- * Creation date: (2/6/00 9:02:54 AM)
- * @author: Joe Winchester
- */
-class REMShortTypeBeanProxy extends REMConstantBeanProxy implements INumberBeanProxy {
- private final short fShort;
-
-/**
- * It is package protected because they are created
- * in a special way and no one else should create them.
- * @param aBean java.lang.Object
- */
-REMShortTypeBeanProxy(REMProxyFactoryRegistry aRegistry, short aShort) {
- super(aRegistry);
- fShort = aShort;
-}
-/**
- * equals: Equal if:
- * 1) This proxy == (identity) to the other object
- * 2) Else if other is an IBeanProxy and not a constant one, then if
- * equals on the server.
- * 3) If this is a constant proxy and the other is too or is a constant
- * value (e.g. IStringBeanProxy.equals(String), then true if values are equals.
- */
-public boolean equals(Object anObject) {
- if (this == anObject)
- return true; // Identity
- if (anObject instanceof REMShortTypeBeanProxy)
- return fShort == ((REMShortTypeBeanProxy) anObject).shortValue();
- if (anObject instanceof Short)
- return fShort == ((Short) anObject).shortValue();
- return false;
-}
-
-/* (non-Javadoc)
- * @see org.eclipse.jem.internal.proxy.core.IBeanProxy#sameAs(org.eclipse.jem.internal.proxy.core.IBeanProxy)
- */
-public boolean sameAs(IBeanProxy aBeanProxy) {
- if (this == aBeanProxy)
- return true; // Identity
- if (aBeanProxy instanceof REMShortTypeBeanProxy)
- return fShort == ((REMShortTypeBeanProxy) aBeanProxy).shortValue();
- return false;
-}
-
-/**
- * byteValue method comment.
- */
-public byte byteValue() {
- return (byte) fShort;
-}
-/**
- * doubleValue method comment.
- */
-public double doubleValue() {
- return fShort;
-}
-/**
- * floatValue method comment.
- */
-public float floatValue() {
- return fShort;
-}
-/**
- * Return the int value
- */
-public int intValue() {
- return fShort;
-}
-/**
- * longValue method comment.
- */
-public long longValue() {
- return fShort;
-}
-/**
- * numberValue method comment.
- */
-public Number numberValue() {
- return new Short(fShort);
-}
-/**
- * shortValue method comment.
- */
-public short shortValue() {
- return fShort;
-}
-
-/**
- * The bean's toString.
- */
-public String toBeanString() {
- return String.valueOf(fShort);
-}
-
-/**
- * Get the beantype
- */
-public IBeanTypeProxy getTypeProxy() {
- return ((REMStandardBeanTypeProxyFactory) fFactory.getBeanTypeProxyFactory()).shortType;
-}
-
-/**
- * Render the bean into value object.
- */
-public void renderBean(Commands.ValueObject value) {
- value.set(fShort);
-}
-}
-
-
diff --git a/plugins/org.eclipse.jem.proxy/proxyRemote/org/eclipse/jem/internal/proxy/remote/REMShortTypeBeanTypeProxy.java b/plugins/org.eclipse.jem.proxy/proxyRemote/org/eclipse/jem/internal/proxy/remote/REMShortTypeBeanTypeProxy.java
deleted file mode 100644
index 8dbbd7f..0000000
--- a/plugins/org.eclipse.jem.proxy/proxyRemote/org/eclipse/jem/internal/proxy/remote/REMShortTypeBeanTypeProxy.java
+++ /dev/null
@@ -1,109 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2001, 2005 IBM Corporation and others.
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
- *
- * Contributors:
- * IBM Corporation - initial API and implementation
- *******************************************************************************/
-package org.eclipse.jem.internal.proxy.remote;
-/*
-
-
- */
-
-
-import org.eclipse.jem.internal.proxy.core.*;
-import org.eclipse.jem.internal.proxy.common.remote.Commands;
-/**
- * Remote Implementation of IBeanTypeProxy for Short.TYPE.
- * Creation date: (2/6/00 9:01:40 AM)
- * @author: Joe Winchester
- */
-final class REMShortTypeBeanTypeProxy extends REMPrimitiveBeanTypeProxy {
-// Some values are cache'd for speed
- private final INumberBeanProxy zeroProxy;
- private final INumberBeanProxy oneProxy;
- private final INumberBeanProxy twoProxy;
- private final INumberBeanProxy threeProxy;
-/**
- * REMIntegerBeanTypeProxy constructor comment.
- * @param aClass java.lang.Class
- */
-REMShortTypeBeanTypeProxy(REMProxyFactoryRegistry aRegistry) {
- super(aRegistry, new Integer(Commands.SHORT_TYPE), Short.TYPE.getName());
-
- // Create the cached values
- zeroProxy = new REMShortTypeBeanProxy(aRegistry, (short) 0);
- oneProxy = new REMShortTypeBeanProxy(aRegistry, (short) 1);
- twoProxy = new REMShortTypeBeanProxy(aRegistry, (short) 2);
- threeProxy = new REMShortTypeBeanProxy(aRegistry, (short) 3);
-}
-
-/**
- * Helper to create a bean proxy
- * Package protected because everyone should go through the factory API
- * that is defined as part of IBeanProxyFactory
- */
-INumberBeanProxy createShortBeanProxy(short aShort) {
- switch(aShort) {
- case 0: return zeroProxy;
- case 1: return oneProxy ;
- case 2: return twoProxy ;
- case 3: return threeProxy ;
- default: return new REMShortTypeBeanProxy(fRegistry, aShort);
- }
-}
-
-/**
- * newInstance method. short is a primitive, so the standard way won't work.
- * Return the zeroProxy for this case because that is the default value.
- */
-public IBeanProxy newInstance() {
- return zeroProxy;
-}
-
-/**
- * Create a new bean proxy the ValueObject passed in.
- * We will assume the object is correct type.
- */
-public IBeanProxy newBeanProxy(Commands.ValueObject value) {
- return createShortBeanProxy(value.aShort);
-}
-
-/**
- * Short cut for newInstance where the string follows the
- * specific pattern we expect. That way it won't be necessary to ship over to the vm
- * to process it.
- *
- * The pattern it can accept is:
- * 1) (short) validNumber - number can be any number because (byte) explicitly casts it down.
- * 2) validNumber
- * It will use the decode function of short to determine the valid number.
- */
-public IBeanProxy newInstance(String initializationString) throws ThrowableProxy, ClassCastException, InstantiationException {
- String trim = initializationString.trim();
- if (trim.length() == 0)
- return super.newInstance(initializationString);
- short aShort;
- if (trim.startsWith("(short)")) { //$NON-NLS-1$
- Number v = parseString(trim.substring("(short)".length()).trim()); //$NON-NLS-1$
- if (v != null)
- aShort = v.shortValue();
- else
- return super.newInstance(initializationString); // Can't decode it, let full parser handle it.
- } else {
- try {
- aShort = Short.decode(trim).shortValue(); // See if valid short format.
- } catch (NumberFormatException e) {
- return super.newInstance(initializationString); // Can't decode it, let full parser handle it.
- }
- }
-
- return getProxyFactoryRegistry().getBeanProxyFactory().createBeanProxyWith(aShort);
-}
-}
-
-
diff --git a/plugins/org.eclipse.jem.proxy/proxyRemote/org/eclipse/jem/internal/proxy/remote/REMStandardBeanProxyConstants.java b/plugins/org.eclipse.jem.proxy/proxyRemote/org/eclipse/jem/internal/proxy/remote/REMStandardBeanProxyConstants.java
deleted file mode 100644
index 70faa91..0000000
--- a/plugins/org.eclipse.jem.proxy/proxyRemote/org/eclipse/jem/internal/proxy/remote/REMStandardBeanProxyConstants.java
+++ /dev/null
@@ -1,514 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2001, 2005 IBM Corporation and others.
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
- *
- * Contributors:
- * IBM Corporation - initial API and implementation
- *******************************************************************************/
-package org.eclipse.jem.internal.proxy.remote;
-/*
-
-
- */
-
-
-import org.eclipse.jem.internal.proxy.core.IMethodProxy;
-import org.eclipse.jem.internal.proxy.core.ProxyFactoryRegistry;
-/**
- * REM Standard Proxy constants.
- *
- * Use the static accessor method (getConstants()) to get the appropriate
- * constants instance for the registry. This is done so that until the
- * the constants are needed, they aren't registered.
- *
- * There are some standard utility functions too.
- *
- * This is final because this can't be extended. This specific one
- * will be registered with the factory for this key. Any extensions
- * must be done in their own constants and registry key.
- *
- * Creation date: (4/7/00 4:47:48 PM)
- * @author: Administrator
- */
-public final class REMStandardBeanProxyConstants {
- public static final Object REGISTRY_KEY = new Object();
-
- private final ProxyFactoryRegistry fRegistry;
-
- private IMethodProxy fClassNewInstance;
- private IMethodProxy fClassGetField;
- private IMethodProxy fClassGetDeclaredField;
- private IMethodProxy fClassGetDeclaredFields;
- private IMethodProxy fClassGetFields;
- private IMethodProxy fClassGetConstructor;
- private IMethodProxy fClassGetConstructors;
- private IMethodProxy fClassGetDeclaredConstructor;
- private IMethodProxy fClassGetDeclaredConstructors;
- private IMethodProxy fClassGetMethods;
- private IMethodProxy fClassGetDeclaredMethods;
- private IMethodProxy fClassGetDeclaredMethod;
-
- private IMethodProxy fMethodHelperFindCompatibleConstructor;
- private IMethodProxy fMethodHelperFindCompatibleMethod;
-
- private IMethodProxy fClassIsAssignableFrom;
-
- private IMethodProxy fObjectToString;
- private IMethodProxy fObjectEquals;
-
- private IMethodProxy fThrowableLocalizedMessage;
- private IMethodProxy fThrowableMessage;
-
- private IMethodProxy fMethodDeclaringClassMessage;
- private IMethodProxy fMethodMethodNameMessage;
- private IMethodProxy fMethodParameterTypesMessage;
- private IMethodProxy fMethodReturnTypeMessage;
-
- private IMethodProxy fAccessibleIsAccessible;
- private IMethodProxy fAccessibleSetAccessible;
-
- private IMethodProxy fFieldGet;
- private IMethodProxy fFieldGetType;
- private IMethodProxy fFieldGetByte;
- private IMethodProxy fFieldGetBoolean;
- private IMethodProxy fFieldGetChar;
- private IMethodProxy fFieldGetDouble;
- private IMethodProxy fFieldGetFloat;
- private IMethodProxy fFieldGetInt;
- private IMethodProxy fFieldGetShort;
- private IMethodProxy fFieldGetLong;
- private IMethodProxy fFieldSet;
-
- private IMethodProxy fConstructorNewInstance;
- private IMethodProxy fConstructorParameterTypesMessage;
-
- private IMethodProxy fArrayNewInstanceOneDimension;
- private IMethodProxy fArrayNewInstanceMultiDimensions;
- private IMethodProxy fArrayGetLength;
- private IMethodProxy fArrayGet;
- private IMethodProxy fArrayGetByte;
- private IMethodProxy fArrayGetBoolean;
- private IMethodProxy fArrayGetChar;
- private IMethodProxy fArrayGetDouble;
- private IMethodProxy fArrayGetFloat;
- private IMethodProxy fArrayGetInt;
- private IMethodProxy fArrayGetShort;
- private IMethodProxy fArrayGetLong;
- private IMethodProxy fArraySet;
-
- private IMethodProxy fArrayHelperGet;
- private IMethodProxy fArrayHelperGetByte;
- private IMethodProxy fArrayHelperGetBoolean;
- private IMethodProxy fArrayHelperGetChar;
- private IMethodProxy fArrayHelperGetDouble;
- private IMethodProxy fArrayHelperGetFloat;
- private IMethodProxy fArrayHelperGetInt;
- private IMethodProxy fArrayHelperGetShort;
- private IMethodProxy fArrayHelperGetLong;
- private IMethodProxy fArrayHelperSet;
- private IMethodProxy fArrayHelperEquals;
-
-/**
- * Get the constants instance for the specified registry.
- */
-public static REMStandardBeanProxyConstants getConstants(ProxyFactoryRegistry registry) {
- REMStandardBeanProxyConstants constants = (REMStandardBeanProxyConstants) registry.getConstants(REGISTRY_KEY);
- if (constants == null)
- registry.registerConstants(REGISTRY_KEY, constants = new REMStandardBeanProxyConstants(registry));
- return constants;
-}
-
-
-private REMStandardBeanProxyConstants(ProxyFactoryRegistry registry) {
- super();
- fRegistry = registry;
-}
-
-public IMethodProxy getClassNewInstance() {
- // We actually need a special new instance because we want to be able to access outside of security. For our purposes security doesn't matter for construction.
- if (fClassNewInstance == null)
- fClassNewInstance = fRegistry.getMethodProxyFactory().getMethodProxy("org.eclipse.jem.internal.proxy.vm.remote.ClassHelper", "newInstance", new String[] {"java.lang.Class"}); //$NON-NLS-1$ //$NON-NLS-2$ //$NON-NLS-3$
- return fClassNewInstance;
-}
-
-public IMethodProxy getClassGetField() {
- if (fClassGetField == null)
- fClassGetField = fRegistry.getMethodProxyFactory().getMethodProxy("java.lang.Class", "getField", new String[] {"java.lang.String"}); //$NON-NLS-1$ //$NON-NLS-2$ //$NON-NLS-3$
- return fClassGetField;
-}
-
-public IMethodProxy getClassConstructor() {
- if (fClassGetConstructor == null)
- fClassGetConstructor = fRegistry.getMethodProxyFactory().getMethodProxy("java.lang.Class", "getConstructor", new String[] {"[Ljava.lang.Class;"}); //$NON-NLS-1$ //$NON-NLS-2$ //$NON-NLS-3$
- return fClassGetConstructor;
-}
-
-public IMethodProxy getClassConstructors() {
- if (fClassGetConstructors == null)
- fClassGetConstructors = fRegistry.getMethodProxyFactory().getMethodProxy("java.lang.Class", "getConstructors", null); //$NON-NLS-1$ //$NON-NLS-2$
- return fClassGetConstructors;
-}
-
-public IMethodProxy getDeclaredClassConstructor() {
- if (fClassGetDeclaredConstructor == null)
- fClassGetDeclaredConstructor = fRegistry.getMethodProxyFactory().getMethodProxy("java.lang.Class", "getDeclaredConstructor", new String[] {"[Ljava.lang.Class;"}); //$NON-NLS-1$ //$NON-NLS-2$ //$NON-NLS-3$
- return fClassGetDeclaredConstructor;
-}
-
-public IMethodProxy getDeclaredClassConstructors() {
- if (fClassGetDeclaredConstructors == null)
- fClassGetDeclaredConstructors = fRegistry.getMethodProxyFactory().getMethodProxy("java.lang.Class", "getDeclaredConstructors", null); //$NON-NLS-1$ //$NON-NLS-2$
- return fClassGetDeclaredConstructors;
-}
-
-public IMethodProxy getClassIsAssignableFrom() {
- if (fClassIsAssignableFrom == null)
- fClassIsAssignableFrom = fRegistry.getMethodProxyFactory().getMethodProxy("java.lang.Class", "isAssignableFrom", new String[] {"java.lang.Class"}); //$NON-NLS-1$ //$NON-NLS-2$ //$NON-NLS-3$
- return fClassIsAssignableFrom;
-}
-
-public IMethodProxy getObjectToString() {
- if (fObjectToString == null)
- fObjectToString = fRegistry.getMethodProxyFactory().getMethodProxy("java.lang.Object", "toString", null); //$NON-NLS-1$ //$NON-NLS-2$
- return fObjectToString;
-}
-
-public IMethodProxy getObjectEquals() {
- if (fObjectEquals == null)
- fObjectEquals = fRegistry.getMethodProxyFactory().getMethodProxy("java.lang.Object", "equals", new String[] {"java.lang.Object"}); //$NON-NLS-1$ //$NON-NLS-2$ //$NON-NLS-3$
- return fObjectEquals;
-}
-public IMethodProxy getThrowableLocalizedMessage() {
- if (fThrowableLocalizedMessage == null)
- fThrowableLocalizedMessage = fRegistry.getMethodProxyFactory().getMethodProxy("java.lang.Throwable", "getLocalizedMessage", null); //$NON-NLS-1$ //$NON-NLS-2$
- return fThrowableLocalizedMessage;
-}
-
-public IMethodProxy getThrowableMessage() {
- if (fThrowableMessage == null)
- fThrowableMessage = fRegistry.getMethodProxyFactory().getMethodProxy("java.lang.Throwable", "getMessage", null); //$NON-NLS-1$ //$NON-NLS-2$
- return fThrowableMessage;
-}
-
-public IMethodProxy getMethodDeclaringClassMessage() {
- if (fMethodDeclaringClassMessage == null)
- fMethodDeclaringClassMessage = fRegistry.getMethodProxyFactory().getMethodProxy("java.lang.reflect.Method", "getDeclaringClass", null); //$NON-NLS-1$ //$NON-NLS-2$
- return fMethodDeclaringClassMessage;
-}
-
-public IMethodProxy getMethodMethodNameMessage() {
- if (fMethodMethodNameMessage == null)
- fMethodMethodNameMessage = fRegistry.getMethodProxyFactory().getMethodProxy("java.lang.reflect.Method", "getName", null); //$NON-NLS-1$ //$NON-NLS-2$
- return fMethodMethodNameMessage;
-}
-
-public IMethodProxy getMethodParameterTypesMessage() {
- if (fMethodParameterTypesMessage == null)
- fMethodParameterTypesMessage = fRegistry.getMethodProxyFactory().getMethodProxy("java.lang.reflect.Method", "getParameterTypes", null); //$NON-NLS-1$ //$NON-NLS-2$
- return fMethodParameterTypesMessage;
-}
-
-public IMethodProxy getMethodReturnTypeMessage() {
- if (fMethodReturnTypeMessage == null)
- fMethodReturnTypeMessage = fRegistry.getMethodProxyFactory().getMethodProxy("java.lang.reflect.Method", "getReturnType", null); //$NON-NLS-1$ //$NON-NLS-2$
- return fMethodReturnTypeMessage;
-}
-
-public IMethodProxy getAccessibleIsAccessible() {
- if (fAccessibleIsAccessible == null)
- fAccessibleIsAccessible = fRegistry.getMethodProxyFactory().getMethodProxy("java.lang.reflect.AccessibleObject", "isAccessible", null); //$NON-NLS-1$ //$NON-NLS-2$
- return fAccessibleIsAccessible;
-}
-
-public IMethodProxy getAccessibleSetAccessible() {
- if (fAccessibleSetAccessible == null)
- fAccessibleSetAccessible = fRegistry.getMethodProxyFactory().getMethodProxy("java.lang.reflect.AccessibleObject", "setAccessible", new String[] {"boolean"}); //$NON-NLS-1$ //$NON-NLS-2$ //$NON-NLS-3$
- return fAccessibleSetAccessible;
-}
-
-public IMethodProxy getFieldGetType() {
- if (fFieldGetType == null)
- fFieldGetType = fRegistry.getMethodProxyFactory().getMethodProxy("java.lang.reflect.Field", "getType", null); //$NON-NLS-1$ //$NON-NLS-2$
- return fFieldGetType;
-}
-
-public IMethodProxy getFieldGet() {
- if (fFieldGet == null)
- fFieldGet = fRegistry.getMethodProxyFactory().getMethodProxy("java.lang.reflect.Field", "get", new String[] {"java.lang.Object"}); //$NON-NLS-1$ //$NON-NLS-2$ //$NON-NLS-3$
- return fFieldGet;
-}
-
-public IMethodProxy getFieldGetByte() {
- if (fFieldGetByte == null)
- fFieldGetByte = fRegistry.getMethodProxyFactory().getMethodProxy("java.lang.reflect.Field", "getByte", new String[] {"java.lang.Object"}); //$NON-NLS-1$ //$NON-NLS-2$ //$NON-NLS-3$
- return fFieldGetByte;
-}
-
-public IMethodProxy getFieldGetBoolean() {
- if (fFieldGetBoolean == null)
- fFieldGetBoolean = fRegistry.getMethodProxyFactory().getMethodProxy("java.lang.reflect.Field", "getBoolean", new String[] {"java.lang.Object"}); //$NON-NLS-1$ //$NON-NLS-2$ //$NON-NLS-3$
- return fFieldGetBoolean;
-}
-
-public IMethodProxy getFieldGetChar() {
- if (fFieldGetChar == null)
- fFieldGetChar = fRegistry.getMethodProxyFactory().getMethodProxy("java.lang.reflect.Field", "getChar", new String[] {"java.lang.Object"}); //$NON-NLS-1$ //$NON-NLS-2$ //$NON-NLS-3$
- return fFieldGetChar;
-}
-
-public IMethodProxy getFieldGetDouble() {
- if (fFieldGetDouble == null)
- fFieldGetDouble = fRegistry.getMethodProxyFactory().getMethodProxy("java.lang.reflect.Field", "getDouble", new String[] {"java.lang.Object"}); //$NON-NLS-1$ //$NON-NLS-2$ //$NON-NLS-3$
- return fFieldGetDouble;
-}
-
-public IMethodProxy getFieldGetFloat() {
- if (fFieldGetFloat == null)
- fFieldGetFloat = fRegistry.getMethodProxyFactory().getMethodProxy("java.lang.reflect.Field", "getFloat", new String[] {"java.lang.Object"}); //$NON-NLS-1$ //$NON-NLS-2$ //$NON-NLS-3$
- return fFieldGetFloat;
-}
-
-public IMethodProxy getFieldGetInt() {
- if (fFieldGetInt == null)
- fFieldGetInt = fRegistry.getMethodProxyFactory().getMethodProxy("java.lang.reflect.Field", "getInt", new String[] {"java.lang.Object"}); //$NON-NLS-1$ //$NON-NLS-2$ //$NON-NLS-3$
- return fFieldGetInt;
-}
-
-public IMethodProxy getFieldGetLong() {
- if (fFieldGetLong == null)
- fFieldGetLong = fRegistry.getMethodProxyFactory().getMethodProxy("java.lang.reflect.Field", "getLong", new String[] {"java.lang.Object"}); //$NON-NLS-1$ //$NON-NLS-2$ //$NON-NLS-3$
- return fFieldGetLong;
-}
-
-public IMethodProxy getFieldGetShort() {
- if (fFieldGetShort == null)
- fFieldGetShort = fRegistry.getMethodProxyFactory().getMethodProxy("java.lang.reflect.Field", "getShort", new String[] {"java.lang.Object"}); //$NON-NLS-1$ //$NON-NLS-2$ //$NON-NLS-3$
- return fFieldGetShort;
-}
-
-public IMethodProxy getFieldSet() {
- if (fFieldSet == null)
- fFieldSet = fRegistry.getMethodProxyFactory().getMethodProxy("java.lang.reflect.Field", "set", new String[] {"java.lang.Object", "java.lang.Object"}); //$NON-NLS-1$ //$NON-NLS-2$ //$NON-NLS-3$ //$NON-NLS-4$
- return fFieldSet;
-}
-
-public IMethodProxy getConstructorNewInstance() {
- if (fConstructorNewInstance == null)
- fConstructorNewInstance = fRegistry.getMethodProxyFactory().getMethodProxy("java.lang.reflect.Constructor", "newInstance", new String[] {"[Ljava.lang.Object;"}); //$NON-NLS-1$ //$NON-NLS-2$ //$NON-NLS-3$
- return fConstructorNewInstance;
-}
-
-public IMethodProxy getConstructorParameterTypesMessage() {
- if (fConstructorParameterTypesMessage == null)
- fConstructorParameterTypesMessage = fRegistry.getMethodProxyFactory().getMethodProxy("java.lang.reflect.Constructor", "getParameterTypes", null); //$NON-NLS-1$ //$NON-NLS-2$
- return fConstructorParameterTypesMessage;
-}
-
-public IMethodProxy getArrayNewInstanceOneDimension() {
- if (fArrayNewInstanceOneDimension == null)
- fArrayNewInstanceOneDimension = fRegistry.getMethodProxyFactory().getMethodProxy("java.lang.reflect.Array", "newInstance", new String[] {"java.lang.Class", "int"}); //$NON-NLS-1$ //$NON-NLS-2$ //$NON-NLS-3$ //$NON-NLS-4$
- return fArrayNewInstanceOneDimension;
-}
-
-public IMethodProxy getArrayNewInstanceMultiDimension() {
- if (fArrayNewInstanceMultiDimensions == null)
- fArrayNewInstanceMultiDimensions = fRegistry.getMethodProxyFactory().getMethodProxy("java.lang.reflect.Array", "newInstance", new String[] {"java.lang.Class", "[I"}); //$NON-NLS-1$ //$NON-NLS-2$ //$NON-NLS-3$ //$NON-NLS-4$
- return fArrayNewInstanceMultiDimensions;
-}
-
-public IMethodProxy getArrayGetLength() {
- if (fArrayGetLength == null)
- fArrayGetLength = fRegistry.getMethodProxyFactory().getMethodProxy("java.lang.reflect.Array", "getLength", new String[] {"java.lang.Object"}); //$NON-NLS-1$ //$NON-NLS-2$ //$NON-NLS-3$
- return fArrayGetLength;
-}
-
-public IMethodProxy getArrayGet() {
- if (fArrayGet == null)
- fArrayGet = fRegistry.getMethodProxyFactory().getMethodProxy("java.lang.reflect.Array", "get", new String[] {"java.lang.Object", "int"}); //$NON-NLS-1$ //$NON-NLS-2$ //$NON-NLS-3$ //$NON-NLS-4$
- return fArrayGet;
-}
-
-public IMethodProxy getArrayGetByte() {
- if (fArrayGetByte == null)
- fArrayGetByte = fRegistry.getMethodProxyFactory().getMethodProxy("java.lang.reflect.Array", "getByte", new String[] {"java.lang.Object", "int"}); //$NON-NLS-1$ //$NON-NLS-2$ //$NON-NLS-3$ //$NON-NLS-4$
- return fArrayGetByte;
-}
-
-public IMethodProxy getArrayGetBoolean() {
- if (fArrayGetBoolean == null)
- fArrayGetBoolean = fRegistry.getMethodProxyFactory().getMethodProxy("java.lang.reflect.Array", "getBoolean", new String[] {"java.lang.Object", "int"}); //$NON-NLS-1$ //$NON-NLS-2$ //$NON-NLS-3$ //$NON-NLS-4$
- return fArrayGetBoolean;
-}
-
-public IMethodProxy getArrayGetChar() {
- if (fArrayGetChar == null)
- fArrayGetChar = fRegistry.getMethodProxyFactory().getMethodProxy("java.lang.reflect.Array", "getChar", new String[] {"java.lang.Object", "int"}); //$NON-NLS-1$ //$NON-NLS-2$ //$NON-NLS-3$ //$NON-NLS-4$
- return fArrayGetChar;
-}
-
-public IMethodProxy getArrayGetDouble() {
- if (fArrayGetDouble == null)
- fArrayGetDouble = fRegistry.getMethodProxyFactory().getMethodProxy("java.lang.reflect.Array", "getDouble", new String[] {"java.lang.Object", "int"}); //$NON-NLS-1$ //$NON-NLS-2$ //$NON-NLS-3$ //$NON-NLS-4$
- return fArrayGetDouble;
-}
-
-public IMethodProxy getArrayGetFloat() {
- if (fArrayGetFloat == null)
- fArrayGetFloat = fRegistry.getMethodProxyFactory().getMethodProxy("java.lang.reflect.Array", "getFloat", new String[] {"java.lang.Object", "int"}); //$NON-NLS-1$ //$NON-NLS-2$ //$NON-NLS-3$ //$NON-NLS-4$
- return fArrayGetFloat;
-}
-
-public IMethodProxy getArrayGetInt() {
- if (fArrayGetInt == null)
- fArrayGetInt = fRegistry.getMethodProxyFactory().getMethodProxy("java.lang.reflect.Array", "getInt", new String[] {"java.lang.Object", "int"}); //$NON-NLS-1$ //$NON-NLS-2$ //$NON-NLS-3$ //$NON-NLS-4$
- return fArrayGetInt;
-}
-
-public IMethodProxy getArrayGetLong() {
- if (fArrayGetLong == null)
- fArrayGetLong = fRegistry.getMethodProxyFactory().getMethodProxy("java.lang.reflect.Array", "getLong", new String[] {"java.lang.Object", "int"}); //$NON-NLS-1$ //$NON-NLS-2$ //$NON-NLS-3$ //$NON-NLS-4$
- return fArrayGetLong;
-}
-
-public IMethodProxy getArrayGetShort() {
- if (fArrayGetShort == null)
- fArrayGetShort = fRegistry.getMethodProxyFactory().getMethodProxy("java.lang.reflect.Array", "getShort", new String[] {"java.lang.Object", "int"}); //$NON-NLS-1$ //$NON-NLS-2$ //$NON-NLS-3$ //$NON-NLS-4$
- return fArrayGetShort;
-}
-
-public IMethodProxy getArraySet() {
- if (fArraySet == null)
- fArraySet = fRegistry.getMethodProxyFactory().getMethodProxy("java.lang.reflect.Array", "set", new String[] {"java.lang.Object", "int", "java.lang.Object"}); //$NON-NLS-1$ //$NON-NLS-2$ //$NON-NLS-3$ //$NON-NLS-4$ //$NON-NLS-5$
- return fArraySet;
-}
-
-public IMethodProxy getArrayHelperGet() {
- if (fArrayHelperGet == null)
- fArrayHelperGet = fRegistry.getMethodProxyFactory().getMethodProxy("org.eclipse.jem.internal.proxy.vm.remote.ArrayHelper", "get", new String[] {"java.lang.Object", "[I"}); //$NON-NLS-1$ //$NON-NLS-2$ //$NON-NLS-3$ //$NON-NLS-4$
- return fArrayHelperGet;
-}
-
-public IMethodProxy getArrayHelperGetByte() {
- if (fArrayHelperGetByte == null)
- fArrayHelperGetByte = fRegistry.getMethodProxyFactory().getMethodProxy("org.eclipse.jem.internal.proxy.vm.remote.ArrayHelper", "getByte", new String[] {"java.lang.Object", "[I"}); //$NON-NLS-1$ //$NON-NLS-2$ //$NON-NLS-3$ //$NON-NLS-4$
- return fArrayHelperGetByte;
-}
-
-public IMethodProxy getArrayHelperGetBoolean() {
- if (fArrayHelperGetBoolean == null)
- fArrayHelperGetBoolean = fRegistry.getMethodProxyFactory().getMethodProxy("org.eclipse.jem.internal.proxy.vm.remote.ArrayHelper", "getBoolean", new String[] {"java.lang.Object", "[I"}); //$NON-NLS-1$ //$NON-NLS-2$ //$NON-NLS-3$ //$NON-NLS-4$
- return fArrayHelperGetBoolean;
-}
-
-public IMethodProxy getArrayHelperGetChar() {
- if (fArrayHelperGetChar == null)
- fArrayHelperGetChar = fRegistry.getMethodProxyFactory().getMethodProxy("org.eclipse.jem.internal.proxy.vm.remote.ArrayHelper", "getChar", new String[] {"java.lang.Object", "[I"}); //$NON-NLS-1$ //$NON-NLS-2$ //$NON-NLS-3$ //$NON-NLS-4$
- return fArrayHelperGetChar;
-}
-
-public IMethodProxy getArrayHelperGetDouble() {
- if (fArrayHelperGetDouble == null)
- fArrayHelperGetDouble = fRegistry.getMethodProxyFactory().getMethodProxy("org.eclipse.jem.internal.proxy.vm.remote.ArrayHelper", "getDouble", new String[] {"java.lang.Object", "[I"}); //$NON-NLS-1$ //$NON-NLS-2$ //$NON-NLS-3$ //$NON-NLS-4$
- return fArrayHelperGetDouble;
-}
-
-public IMethodProxy getArrayHelperGetFloat() {
- if (fArrayHelperGetFloat == null)
- fArrayHelperGetFloat = fRegistry.getMethodProxyFactory().getMethodProxy("org.eclipse.jem.internal.proxy.vm.remote.ArrayHelper", "getFloat", new String[] {"java.lang.Object", "[I"}); //$NON-NLS-1$ //$NON-NLS-2$ //$NON-NLS-3$ //$NON-NLS-4$
- return fArrayHelperGetFloat;
-}
-
-public IMethodProxy getArrayHelperGetInt() {
- if (fArrayHelperGetInt == null)
- fArrayHelperGetInt = fRegistry.getMethodProxyFactory().getMethodProxy("org.eclipse.jem.internal.proxy.vm.remote.ArrayHelper", "getInt", new String[] {"java.lang.Object", "[I"}); //$NON-NLS-1$ //$NON-NLS-2$ //$NON-NLS-3$ //$NON-NLS-4$
- return fArrayHelperGetInt;
-}
-
-public IMethodProxy getArrayHelperGetLong() {
- if (fArrayHelperGetLong == null)
- fArrayHelperGetLong = fRegistry.getMethodProxyFactory().getMethodProxy("org.eclipse.jem.internal.proxy.vm.remote.ArrayHelper", "getLong", new String[] {"java.lang.Object", "[I"}); //$NON-NLS-1$ //$NON-NLS-2$ //$NON-NLS-3$ //$NON-NLS-4$
- return fArrayHelperGetLong;
-}
-
-public IMethodProxy getArrayHelperGetShort() {
- if (fArrayHelperGetShort == null)
- fArrayHelperGetShort = fRegistry.getMethodProxyFactory().getMethodProxy("org.eclipse.jem.internal.proxy.vm.remote.ArrayHelper", "getShort", new String[] {"java.lang.Object", "[I"}); //$NON-NLS-1$ //$NON-NLS-2$ //$NON-NLS-3$ //$NON-NLS-4$
- return fArrayHelperGetShort;
-}
-
-public IMethodProxy getArrayHelperSet() {
- if (fArrayHelperSet == null)
- fArrayHelperSet = fRegistry.getMethodProxyFactory().getMethodProxy("org.eclipse.jem.internal.proxy.vm.remote.ArrayHelper", "set", new String[] {"java.lang.Object", "[I", "java.lang.Object"}); //$NON-NLS-1$ //$NON-NLS-2$ //$NON-NLS-3$ //$NON-NLS-4$ //$NON-NLS-5$
- return fArrayHelperSet;
-}
-
-public IMethodProxy getArrayHelperEquals() {
- if (fArrayHelperEquals == null)
- fArrayHelperEquals = fRegistry.getMethodProxyFactory().getMethodProxy("org.eclipse.jem.internal.proxy.vm.remote.ArrayHelper", "equals", new String[] {"java.lang.Object", "java.lang.Object"}); //$NON-NLS-1$ //$NON-NLS-2$ //$NON-NLS-3$ //$NON-NLS-4$
- return fArrayHelperEquals;
-}
-
-public IMethodProxy getClassGetDeclaredField() {
-
- if (fClassGetDeclaredField == null)
- fClassGetDeclaredField = fRegistry.getMethodProxyFactory().getMethodProxy("java.lang.Class", "getDeclaredField", new String[] {"java.lang.String"}); //$NON-NLS-1$ //$NON-NLS-2$ //$NON-NLS-3$
- return fClassGetDeclaredField;
-}
-
-public IMethodProxy getClassGetDeclaredFields() {
-
- if (fClassGetDeclaredFields == null)
- fClassGetDeclaredFields = fRegistry.getMethodProxyFactory().getMethodProxy("java.lang.Class", "getDeclaredFields", null); //$NON-NLS-1$ //$NON-NLS-2$
- return fClassGetDeclaredFields;
-}
-public IMethodProxy getClassGetFields() {
-
- if (fClassGetFields == null)
- fClassGetFields = fRegistry.getMethodProxyFactory().getMethodProxy("java.lang.Class", "getFields", null); //$NON-NLS-1$ //$NON-NLS-2$
- return fClassGetFields;
-}
-
-
-/**
- * @return
- *
- * @since 1.1.0
- */
-public IMethodProxy getClassMethods() {
- if (fClassGetMethods == null)
- fClassGetMethods = fRegistry.getMethodProxyFactory().getMethodProxy("java.lang.Class", "getMethods", null); //$NON-NLS-1$ //$NON-NLS-2$
- return fClassGetMethods;
-}
-
-/**
- * @return
- *
- * @since 1.1.0
- */
-public IMethodProxy getClassDeclaredMethods() {
- if (fClassGetDeclaredMethods == null)
- fClassGetDeclaredMethods = fRegistry.getMethodProxyFactory().getMethodProxy("java.lang.Class", "getDeclaredMethods", null); //$NON-NLS-1$ //$NON-NLS-2$
- return fClassGetDeclaredMethods;
-}
-
-public IMethodProxy getClassDeclaredMethod() {
- if (fClassGetDeclaredMethod == null)
- fClassGetDeclaredMethod = fRegistry.getMethodProxyFactory().getMethodProxy("java.lang.Class", "getDeclaredMethod", new String[] {"java.lang.String", "[Ljava.lang.Class;"}); //$NON-NLS-1$ //$NON-NLS-2$ //$NON-NLS-3$ //$NON-NLS-4$
- return fClassGetDeclaredMethod;
-}
-
-public IMethodProxy getFindCompatibleConstructorMethod() {
- if (fMethodHelperFindCompatibleConstructor == null)
- fMethodHelperFindCompatibleConstructor = fRegistry.getMethodProxyFactory().getMethodProxy("org.eclipse.jem.internal.proxy.common.MethodHelper", "findCompatibleConstructor", new String[] {"java.lang.Class", "[Ljava.lang.Class;"}); //$NON-NLS-1$ //$NON-NLS-2$ //$NON-NLS-3$ //$NON-NLS-4$
- return fMethodHelperFindCompatibleConstructor;
-}
-
-public IMethodProxy getFindCompatibleMethodMethod() {
- if (fMethodHelperFindCompatibleMethod == null)
- fMethodHelperFindCompatibleMethod = fRegistry.getMethodProxyFactory().getMethodProxy("org.eclipse.jem.internal.proxy.common.MethodHelper", "findCompatibleMethod", new String[] {"java.lang.Class", "java.lang.String", "[Ljava.lang.Class;"}); //$NON-NLS-1$ //$NON-NLS-2$ //$NON-NLS-3$ //$NON-NLS-4$ //$NON-NLS-5$
- return fMethodHelperFindCompatibleMethod;
-}
-}
diff --git a/plugins/org.eclipse.jem.proxy/proxyRemote/org/eclipse/jem/internal/proxy/remote/REMStandardBeanProxyFactory.java b/plugins/org.eclipse.jem.proxy/proxyRemote/org/eclipse/jem/internal/proxy/remote/REMStandardBeanProxyFactory.java
deleted file mode 100644
index 772956a..0000000
--- a/plugins/org.eclipse.jem.proxy/proxyRemote/org/eclipse/jem/internal/proxy/remote/REMStandardBeanProxyFactory.java
+++ /dev/null
@@ -1,850 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2001, 2005 IBM Corporation and others.
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
- *
- * Contributors:
- * IBM Corporation - initial API and implementation
- *******************************************************************************/
-package org.eclipse.jem.internal.proxy.remote;
-/*
-
-
- */
-
-
-import java.text.MessageFormat;
-import java.util.*;
-
-import org.eclipse.core.runtime.IStatus;
-import org.eclipse.core.runtime.Status;
-import org.eclipse.jem.internal.proxy.core.*;
-import org.eclipse.jem.internal.proxy.common.CommandException;
-import org.eclipse.jem.internal.proxy.common.remote.CommandErrorException;
-import org.eclipse.jem.internal.proxy.common.remote.Commands;
-
-/**
- * The Remote VM Standard Bean Proxy Factory.
- * Creation date: (12/3/99 12:01:45 PM)
- * @author: Joe Winchester
- */
-public final class REMStandardBeanProxyFactory implements IStandardBeanProxyFactory {
- protected final REMProxyFactoryRegistry fRegistry;
- protected final REMStandardBeanTypeProxyFactory fBeanTypeProxyFactory; // Convenience field.
- protected final IREMBeanProxy vmServerProxy;
-
-
- // We need a map for mapping object id's to the proxy. The entry will actually be
- // a REMStandardBeanProxyFactory.WeakProxyReference. This is so that the
- // proxy will not be held tightly by this map and can be GC'd if not referenced.
- // Periodically, the reference queue will be processed to remove any of the
- // entries that have been GC'd and the server will be told that it can release
- // the ID on its side.
- //
- // This map will be used as synchronize object also for access to it.
- //
- // There will be a low priority job that will occasionally process the GC'd objects
- // and remove them from the queue and the remote vm. It will not remove during lockedTransactions.
- //
- // NOTE: Certain proxies never get added to the map. They are the
- // standard types/class (i.e. null, byte, int, long, short, double, float, byte, string). These
- // always have the value saved in the proxy so that it can be retrieved without going back
- // to the server.
- private final HashMap fIDToProxiesMap = new HashMap(1000); // Map ID's to proxies. The proxies have their id's so we don't need a reverse map
- private int transactionLockCount = 0; // Count of transactions that have locked access. It is changed under sync control of fIDToProxies map.
-
- /**
- * The Weak reference used for the id to proxies map for the proxy
- * so that we can clean it up when the proxy has been garbage collected.
- *
- * It is important that all changes to the ProxyRef are done through sync on fIDToProxiesMap.
- */
- private static class ProxyRef extends java.lang.ref.WeakReference {
- private Integer id; // We need the id because this reference will be on the value side
- // and not the key side of the map, so we need to know the key
- // so that the object can be removed from the map.
- //
- // If the ID is null, then this means this entry has been processed
- // in some way and should not be released or removed from the table.
- private int useCnt = 1; // Usage/Ref count. Needed so that we don't get rid of too soon. Since we don't
- // create a ProxyRef without a usage, we start it off with one. It will be incremented
- // then on retrievals when needed by users outside of the remote factories themselves.
- // It won't be physically released until either GC got rid of it, or it goes to 0 or less
- // on a release request.
-
- public ProxyRef(Integer anID, Object proxy, java.lang.ref.ReferenceQueue q) {
- super(proxy, q);
- id = anID;
- }
-
- public Integer getID() {
- return id;
- }
-
- public void clear() {
- super.clear();
- id = null;
- }
-
- public synchronized void incrUseCnt() {
- useCnt++;
- }
-
- public synchronized int decrUseCnt() {
- if (--useCnt < 0)
- useCnt = 0;
- return useCnt;
- }
- }
-
- /* Reference queue for cleared Proxies */
- private java.lang.ref.ReferenceQueue queue = new java.lang.ref.ReferenceQueue();
-
- /**
- * Process the entries on the id to proxies map that have been garbage collected.
- * It is package-protected because only REMRegistryController should call it.
- */
- void processQueue() {
- ProxyRef pr;
- while (true) {
- if (Thread.interrupted())
- return; // Maybe going down. (This actually a kludge because the thread happens to be the master thread from the registry controller).
-
- synchronized (fIDToProxiesMap) {
- if (queue == null || transactionLockCount > 0)
- break; // Either no queue (we are cleaning up) or in a transaction, stop processing and retry on next time slice.
- if ((pr = (ProxyRef) queue.poll()) != null) {
- if (pr.getID() != null) {
- // It hasn't been processed by some other means.
- fIDToProxiesMap.remove(pr.getID());
- releaseID(pr.getID().intValue());
- }
- } else
- break; // There are no more waiting, so leave.
- }
- }
- }
-
-
-/**
- * REMBeanProxyFactory constructor comment.
- *
- * Note: It assumes the beantype factory has already been registered.
- */
-REMStandardBeanProxyFactory(REMProxyFactoryRegistry aRegistry) {
- fRegistry = aRegistry;
- aRegistry.registerBeanProxyFactory(this);
- fBeanTypeProxyFactory = (REMStandardBeanTypeProxyFactory) aRegistry.getBeanTypeProxyFactory();
- fBeanTypeProxyFactory.initialize(this); // Now we're ready for the beantype factory to be initialized.
-
- IREMBeanTypeProxy serverType = fBeanTypeProxyFactory.objectClass.newBeanTypeForClass(new Integer(Commands.REMOTEVMSERVER_CLASS), "org.eclipse.jem.internal.proxy.vm.remote.RemoteVMServerThread", false); //$NON-NLS-1$
- fBeanTypeProxyFactory.registerBeanTypeProxy(serverType, true);
- vmServerProxy = serverType.newBeanProxy(new Integer(Commands.REMOTESERVER_ID));
- registerProxy(vmServerProxy);
-}
-
-
-/**
- * Register a collection of Proxies
- */
-public void registerProxies(Collection proxies) {
- synchronized(fIDToProxiesMap) {
- Iterator itr = proxies.iterator();
- while (itr.hasNext()) {
- IREMBeanProxy proxy = (IREMBeanProxy) itr.next();
- if (proxy instanceof IBeanTypeProxy || !(proxy.getTypeProxy() instanceof IREMConstantBeanTypeProxy)) {
- ProxyRef oldRef = (ProxyRef) fIDToProxiesMap.put(proxy.getID(), new ProxyRef(proxy.getID(), proxy, queue));
- if (oldRef != null) {
- // We've replaced it with a new one, so we will clear out the ref so that it won't later try to remove itself
- oldRef.clear();
- }
- }
- }
- }
-}
-
-/**
- * Register a single proxy
- */
-public void registerProxy(IREMBeanProxy proxy) {
- if (proxy instanceof IBeanTypeProxy || !(proxy.getTypeProxy() instanceof IREMConstantBeanTypeProxy))
- synchronized(fIDToProxiesMap) {
- ProxyRef oldRef = (ProxyRef) fIDToProxiesMap.put(proxy.getID(), new ProxyRef(proxy.getID(), proxy, queue));
- if (oldRef != null) {
- // We've replaced it with a new one, so we will clear out the ref so that it won't later try to remove itself
- oldRef.clear();
- }
- }
-}
-
-/**
- * Release a proxy because no longer needed.
- */
-public void releaseProxy(IBeanProxy proxy) {
- if (!proxy.isValid())
- return;
- if (proxy instanceof IBeanTypeProxy && !fBeanTypeProxyFactory.releaseProxy((IBeanTypeProxy) proxy))
- return; // BeanType and type factory won't allow release of it.
- Integer id = ((IREMBeanProxy) proxy).getID();
- synchronized(fIDToProxiesMap) {
- // Synced in here so that we will remove it before some one else from a different thread may try
- // to access it again.
- if (id.intValue() != Commands.NOT_AN_ID) {
- ProxyRef ref = (ProxyRef) fIDToProxiesMap.get(id);
- if (ref == null || ref.decrUseCnt() <= 0) {
- // No usage, so do actual release.
- fIDToProxiesMap.remove(id);
- ((IREMBeanProxy) proxy).release();
- if (ref != null)
- ref.enqueue(); // Queue it up so that on next release cycle it will go away.
- }
- } else {
- ((IREMBeanProxy) proxy).release();
- }
- }
-}
-
-/**
- * Release a specific ID. This is used in case an ID has been sent
- * but we couldn't proxy it. In that case we only have an ID. It is
- * also used when a proxy has been released explicitly or through GC.
- * In that case it has already been de-registered.
- */
-private void releaseID(int anID) {
- try {
- IREMConnection connect = fRegistry.getFreeConnection();
- try {
- connect.releaseID(anID);
- } finally {
- fRegistry.returnConnection(connect);
- }
- } catch (IllegalStateException e) {
- // Couldn't get connection, don't bother with a release.
- }
-}
-
-/**
- * For the Remote Factory we will create an REMBeanProxy using the null constructor
- * Package protected so only REMBeanTypeProxies can create instances.
- */
-
-IBeanProxy createBeanProxy(IREMBeanTypeProxy aTypeProxy) throws ThrowableProxy {
- return REMStandardBeanProxyConstants.getConstants(fRegistry).getClassNewInstance().invoke(null, aTypeProxy);
-}
-
-/**
- * For the Remote Factory we will create a REMBeanProxy using the initializationString.
- * Package protected so only REMBeanTypeProxies can create instances.
- */
-IBeanProxy createBeanProxy(IREMBeanTypeProxy aTypeProxy, String initializationString)
- throws ThrowableProxy, CommandException, ClassCastException, InstantiationException, IllegalStateException {
- IREMConnection connect = fRegistry.getFreeConnection();
- startTransaction();
- // Starting a transaction, we will be getting id's back and need to get data in a separate step, so we need to group it in a transaction.
- try {
- Commands.ValueObject newInstanceData = null;
- try {
- newInstanceData = getNewInstanceData(aTypeProxy, initializationString, connect);
- } catch (CommandErrorException e) {
- switch (e.getErrorCode()) {
- case Commands.CLASS_CAST_EXCEPTION:
- // The result was not of the correct type.
- throw new ClassCastException(
- MessageFormat.format(ProxyRemoteMessages.Classcast_EXC_, new Object[] {extractFirstLine(initializationString), aTypeProxy.getTypeName()}));
- case Commands.CANNOT_EVALUATE_STRING:
- // Want to log the exception that caused it to not evaluate.
- // Don't need to log this side, just log the RemoteVM side of the trace.
- java.io.StringWriter s = new java.io.StringWriter();
- java.io.PrintWriter w = new java.io.PrintWriter(s);
- ((ThrowableProxy) e.getErrorObject()).printProxyStackTrace(w);
- ProxyPlugin.getPlugin().getLogger().log(new Status(IStatus.WARNING, ProxyPlugin.getPlugin().getBundle().getSymbolicName(), 0, s.toString(), null));
- throw new InstantiationException(
- MessageFormat.format(ProxyRemoteMessages.Instantiate_EXC_, new Object[] {extractFirstLine(initializationString)}));
- default:
- throw e; //$NON-NLS-1$
- }
- } catch (CommandException e) {
- if (e.isRecoverable()) {
- ProxyPlugin.getPlugin().getLogger().log(
- new Status(
- IStatus.WARNING,
- ProxyPlugin.getPlugin().getBundle().getSymbolicName(),
- 0,
- "", //$NON-NLS-1$
- e));
- } else {
- // It failed in the command, try again.
- fRegistry.closeConnection(connect);
- connect = null;
- connect = fRegistry.getFreeConnection();
- try {
- newInstanceData = getNewInstanceData(aTypeProxy, initializationString, connect);
- } catch (CommandException eAgain) {
- // It failed again. Close this connection and don't let it be returned.
- fRegistry.closeConnection(connect);
- connect = null; // This is so that it won't be returned.
- }
- }
- } finally {
- if (connect != null)
- fRegistry.returnConnection(connect);
- }
-
- if (newInstanceData != null)
- return getBeanProxy(newInstanceData); // Turn it into a proxy
- } finally {
- stopTransaction(); // Now we can release the transaction.
- }
-
-return null;
-}
-
-private String extractFirstLine(String initString) {
- // Need to extract the first line for the messageFormat not to barf.
- int cr = initString.indexOf('\r');
- int lf = initString.indexOf('\n');
- if (cr != -1 || lf != -1) {
- if (cr == -1 || (lf != -1 && lf < cr))
- return initString.substring(0, lf);
- else
- return initString.substring(0, cr);
- } else
- return initString;
-}
-
-
-/**
- * actually create it using a passed in connection. This allows retry capability.
- *
- * This will send the request over to the connection.
- *
- * If we get an OBJECT back, then the beantypeproxy that the classID in the
- * value points to must be of type IREMConstantBeanTypeProxy so that we can
- * send this new object to the correct beantype to create the correct proxy.
- *
- * If we get an OBJECT_ID back, then the beantypeproxy that the classID in
- * the value points to must be able to handle creating a proxy of that type.
- */
-private Commands.ValueObject getNewInstanceData(IREMBeanTypeProxy aTypeProxy, String initializationString, IREMConnection connect) throws ThrowableProxy, CommandException {
- try {
- Commands.ValueObject newInstanceData = new Commands.ValueObject();
- connect.getNewInstance(aTypeProxy.getID().intValue(), initializationString, newInstanceData);
- return newInstanceData;
- } catch (CommandErrorException e) {
- // TBD - Needs to handle error of not evaluatable and send over to the compilor.
- processErrorReturn(e); // Process this
- }
- return null;
-}
-
-/**
- * actually create it using a passed in connection. This allows retry capability.
- */
-private void getObjectInstanceData(IREMConnection connect, int objectID, Commands.ValueObject valueReturn) throws ThrowableProxy, CommandException {
- try {
- connect.getObjectData(objectID, valueReturn);
- } catch (CommandErrorException e) {
- processErrorReturn(e); // Process this
- }
-}
-
-/**
- * Get a bean proxy from the value object passed in. If not yet created, create one.
- * NOTE: NULL type actually returns a true null. This is so that if people are casting
- * the returned proxy to a specific type (e.g IIntegerBeanProxy), then they won't get
- * a ClassCastException, they will get a null. This is easier for them to handle.
- *
- * NOTE: This is public ONLY so that extension factories can create correct types of
- * proxies in consistent manner from a value object.
- *
- * It is important that this is called
- * from within a transaction only because otherwise the value could have invalid data
- * by the time we try to get the data out of it.
- */
-public IBeanProxy getBeanProxy(Commands.ValueObject value) throws ThrowableProxy, CommandException {
- switch (value.type) {
- // Null result.
- case (byte) Commands.VOID_TYPE:
- return null;
- // A constant object was received.
- case Commands.OBJECT:
- IREMConstantBeanTypeProxy constantBeanType = null;
- try {
- constantBeanType = (IREMConstantBeanTypeProxy) getBeanType(value.classID);
- if (constantBeanType == null)
- return null; // Cannot find the type to create it.
- } catch (ClassCastException e) {
- // It wasn't a constant type, so we can't create it. Return null.
- ProxyPlugin.getPlugin().getLogger().log(new Status(IStatus.WARNING, ProxyPlugin.getPlugin().getBundle().getSymbolicName(), 0, "", e)); //$NON-NLS-1$
- return null;
- }
-
- return constantBeanType.newBeanProxy(value);
-
- // An existing object_id was returned, the object should exist. If it doesn't
- // then submit the info command to try to recreate it correctly.
- case Commands.OBJECT_ID:
- Integer objectID = new Integer(value.objectID);
- IBeanProxy proxy = retrieveProxy(objectID, true);
- if (proxy != null)
- return proxy;
-
- // Not found, need to try to recreate it.
- IREMConnection connect = fRegistry.getFreeConnection();
- try {
- getObjectInstanceData(connect, value.objectID, value); // Go and get the data
- } catch (CommandErrorException e) {
- if (e.isRecoverable()) {
- ProxyPlugin.getPlugin().getLogger().log(
- new Status(
- IStatus.WARNING,
- ProxyPlugin.getPlugin().getBundle().getSymbolicName(),
- 0,
- "", //$NON-NLS-1$
- e));
- return null;
- } else {
- // Try one more time.
- fRegistry.closeConnection(connect);
- connect = null;
- connect = fRegistry.getFreeConnection();
- try {
- getObjectInstanceData(connect, value.objectID, value); // Go and get the data
- } catch (CommandErrorException eAgain) {
- fRegistry.closeConnection(connect);
- connect = null;
- throw eAgain;
- }
- }
- } finally {
- if (connect != null)
- fRegistry.returnConnection(connect);
- }
-
- return getBeanProxy(value); // Now process it to create the new data.
-
- // An new object id. Need to get the class type and let it create it.
- case Commands.NEW_OBJECT_ID:
- try {
- IREMBeanTypeProxy newBeanType = getBeanType(value.classID);
- IREMBeanProxy newProxy = newBeanType.newBeanProxy(new Integer(value.objectID));
- if (newProxy != null)
- registerProxy(newProxy);
- return newProxy;
- } catch (CommandException e) {
- // The server has created a new object, but we couldn't create/register a proxy for it.
- // We need to release it so that the server can get rid of it. Otherwise it would hang
- // around over there forever.
- releaseID(value.objectID);
- throw e;
- } catch (RuntimeException e) {
- // The server has created a new object, but we couldn't create/register a proxy for it.
- // We need to release it so that the server can get rid of it. Otherwise it would hang
- // around over there forever.
- releaseID(value.objectID);
- throw e;
- }
-
- // An exception was thrown, create the ThrowableProxy and then throw it.
- case Commands.THROW:
- IREMBeanProxy newThrowProxy = null;
- try {
- IREMBeanTypeProxy newThrowType = getBeanType(value.classID);
- newThrowProxy = newThrowType.newBeanProxy(new Integer(value.objectID));
- if (newThrowProxy != null)
- registerProxy(newThrowProxy);
- } catch (CommandException e) {
- // The server has created a new object, but we couldn't create/register a proxy for it.
- // We need to release it so that the server can get rid of it. Otherwise it would hang
- // around over there forever.
- releaseID(value.objectID);
- throw e;
- } catch (RuntimeException e) {
- // The server has created a new object, but we couldn't create/register a proxy for it.
- // We need to release it so that the server can get rid of it. Otherwise it would hang
- // around over there forever.
- releaseID(value.objectID);
- throw e;
- }
- // It really should be a throwable, but if not, just return it.
- if (newThrowProxy instanceof ThrowableProxy)
- throw (ThrowableProxy) newThrowProxy;
- else
- return newThrowProxy;
-
- // It is one of the standard kinds, which are Constant types
- default:
- IREMConstantBeanTypeProxy standardBeanType = null;
- try {
- standardBeanType = (IREMConstantBeanTypeProxy) getBeanType(value.type);
- if (standardBeanType == null)
- return null; // Cannot find the type to create it.
- } catch (ClassCastException e) {
- // It wasn't a standard type, so we can't create it. Return null.
- ProxyPlugin.getPlugin().getLogger().log(new Status(IStatus.WARNING, ProxyPlugin.getPlugin().getBundle().getSymbolicName(), 0, "", e)); //$NON-NLS-1$
- return null;
- }
- return standardBeanType.newBeanProxy(value);
- }
-}
-
-/**
- * Process the error exception. Get the data from it and turn it into proxy data.
- * If it is a THROW, then it will throw the Throwable instead.
- *
- * NOTE: It is public ONLY so that extension factories can process errors in
- * an consistent manner.
- *
- * It is important that this be called only within a transaction.
- */
-public void processErrorReturn(CommandErrorException e) throws CommandException, ThrowableProxy {
- int code = e.getErrorCode();
- Object data = null;
- if (code == Commands.THROWABLE_SENT)
- data = getBeanProxy(e.getValue()); // It is Throw sent, so let the throw from getBeanProxy continue on out. (But as a safety, we still try to get the data.
- else {
- try {
- data = getBeanProxy(e.getValue());
- } catch (ThrowableProxy t) {
- // But we want to keep throwables in this case. They are just data for the command error.
- data = t;
- }
- }
- throw new CommandErrorException(MessageFormat.format(ProxyRemoteMessages.RemoteCmd_EXC_, new Object[] {new Integer(code)}), code, e.getValue(), data); // Create a new one and throw it containing the proxied data. //$NON-NLS-1$
-}
-
-
-/**
- * Get a beantype where the id passed in is the classID of the beantype.
- * If not found, then go get it loaded. If it can't be found, then we will
- * release the id because it means we have an id from the server, but we
- * can't create a proxy for it, so don't keep the server holding it.
- * NOTE: This is public ONLY so that extension factories can create correct types
- * in a consistent manner from the id.
- *
- * It is important that this be called only from within a transaction.
- */
-public IREMBeanTypeProxy getBeanType(int id) throws CommandException {
- IREMBeanTypeProxy beanType = null;
- try {
- Integer classID = new Integer(id);
- beanType = (IREMBeanTypeProxy) retrieveProxy(classID, false);
- if (beanType == null)
- beanType = fBeanTypeProxyFactory.createBeanTypeProxy(classID); // We don't have it, need to go to the factory so that it can go query what it needs
- if (beanType == null)
- return null; // Cannot find the type to create it.
- } catch (ClassCastException e) {
- // It wasn't a bean type, so we can't create it. Return null.
- ProxyPlugin.getPlugin().getLogger().log(new Status(IStatus.WARNING, ProxyPlugin.getPlugin().getBundle().getSymbolicName(), 0, "", e)); //$NON-NLS-1$
- } finally {
- if (beanType == null)
- releaseID(id); // Couldn't create a proxy, so release the id.
- }
- return beanType;
-}
-
-
-/**
- * Return a proxy wrapping the primitive integer
- */
-public IIntegerBeanProxy createBeanProxyWith(int aPrimitiveInteger) {
-
- return fBeanTypeProxyFactory.intType.createIntegerBeanProxy(aPrimitiveInteger);
-}
-
-/**
- * Return a proxy wrapping the primitive byte
- */
-public INumberBeanProxy createBeanProxyWith(byte aPrimitiveByte) {
-
- return fBeanTypeProxyFactory.byteType.createByteBeanProxy(aPrimitiveByte);
-}
-
-/**
- * Return a proxy wrapping the primitive char
- */
-public ICharacterBeanProxy createBeanProxyWith(char aPrimitiveChar) {
-
- return fBeanTypeProxyFactory.charType.createCharacterBeanProxy(aPrimitiveChar);
-}
-
-/**
- * Return a proxy wrapping the primitive short
- */
-public INumberBeanProxy createBeanProxyWith(short aPrimitiveShort) {
-
- return fBeanTypeProxyFactory.shortType.createShortBeanProxy(aPrimitiveShort);
-}
-
-/**
- * Return a proxy wrapping the primitive long
- */
-public INumberBeanProxy createBeanProxyWith(long aPrimitiveLong) {
-
- return fBeanTypeProxyFactory.longType.createLongBeanProxy(aPrimitiveLong);
-}
-/**
- * Return a proxy wrapping the primitive double
- */
-public INumberBeanProxy createBeanProxyWith(double aPrimitiveDouble) {
-
- return fBeanTypeProxyFactory.doubleType.createDoubleBeanProxy(aPrimitiveDouble);
-}
-/**
- * Return a proxy wrapping the primitive float
- */
-public INumberBeanProxy createBeanProxyWith(float aPrimitiveFloat) {
-
- return fBeanTypeProxyFactory.floatType.createFloatBeanProxy(aPrimitiveFloat);
-}
-
-/**
- * createBeanProxyWith method comment.
- */
-public IBooleanBeanProxy createBeanProxyWith(Boolean aBoolean) {
- return fBeanTypeProxyFactory.booleanClass.createBooleanBeanProxy(aBoolean);
-}
-/**
- * Return a proxy that wraps the Integer argument
- */
-public IIntegerBeanProxy createBeanProxyWith(Integer anInteger) {
-
- return fBeanTypeProxyFactory.integerClass.createIntegerBeanProxy(anInteger);
-}
-/**
- * createBeanProxyWith method comment.
- */
-public INumberBeanProxy createBeanProxyWith(Number aNumber) {
- REMAbstractNumberBeanTypeProxy type = (REMAbstractNumberBeanTypeProxy) fBeanTypeProxyFactory.getBeanTypeProxy(aNumber.getClass().getName());
- return type.createNumberBeanProxy(aNumber);
-}
-/**
- * Return a proxy for the argument
- */
-public IStringBeanProxy createBeanProxyWith(String aString) {
-
- return fBeanTypeProxyFactory.stringClass.createStringBeanProxy(aString);
-
-}
-/**
- * Return a proxy for the argument
- */
-public ICharacterBeanProxy createBeanProxyWith(Character aCharacter) {
-
- return fBeanTypeProxyFactory.characterClass.createCharacterBeanProxy(aCharacter);
-
-}
-/**
- * createBeanProxyWith method comment.
- */
-public IBooleanBeanProxy createBeanProxyWith(boolean aPrimitiveBoolean) {
- return fBeanTypeProxyFactory.booleanType.createBooleanBeanProxy(aPrimitiveBoolean);
-}
-
-/**
- * Create an array bean proxy.
- *
- * - (int, new int[2] {3, 4}) will create:
- * int [3] [4]
- *
- * - (int[], new int[1] {1})
- * int [1]
- *
- * - (int[], new int[2] {2,3})
- * int [2] [3]
- *
- *
- * - (int[], null) or (int[], new int[0]) or (int, null) or (int, new int[0])
- * int [0]...
- * or
- * (int[][]..., null) or (int[][]..., new int[0])
- * int[0][]...
- * This is because an array instance with no specified dimensions is not valid.
- *
- * - (int[][], new int[1] {3})
- * int[3][]
- */
-public IArrayBeanProxy createBeanProxyWith(IBeanTypeProxy type, int[] dimensions) throws ThrowableProxy {
- if (type.isArray())
- return ((REMArrayBeanTypeProxy) type).createBeanProxyWith(dimensions); // Already an array type, just pass it on.
- else {
- // It is not an array type, so we need to get an array of this type and dimensions.
- REMArrayBeanTypeProxy arrayType = (REMArrayBeanTypeProxy) fBeanTypeProxyFactory.getBeanTypeProxy(type.getTypeName(), dimensions.length);
- return arrayType.createBeanProxyWith(dimensions);
- }
-}
-/**
- * Create a one-dimensional array.
- * The result will be the same as calling
- * createBeanProxyWith(IBeanTypeProxy type, new int[1] {x})
- * where 'x' is the value passed in as the dimension.
- */
-public IArrayBeanProxy createBeanProxyWith(IBeanTypeProxy type, int dimension) throws ThrowableProxy {
- return createBeanProxyWith(type, new int[] {dimension});
-}
-
-/**
- * Retrieve the proxy from the mapping table. Handle already GC'd.
- * If this returns null, it is important that the caller tries to recreate
- * it since the id is still valid on the server.
- */
-private IBeanProxy retrieveProxy(Integer objectID, boolean incrementUseCnt) {
- synchronized (fIDToProxiesMap) {
- ProxyRef ref = (ProxyRef) fIDToProxiesMap.get(objectID);
- if (ref != null) {
- Object bp = ref.get();
- if (ref.isEnqueued() || bp == null) {
- // It's waiting to be removed, or has been removed. i.e. GC'd, so just remove it from the map, next processQueue will remove it from the queue.
- fIDToProxiesMap.remove(objectID);
- ref.clear(); // This is so that when the processQueue see's it,
- // it won't send a release request to the server
- // since it will be recreated when this method returns.
- return null;
- } else {
- if (incrementUseCnt)
- ref.incrUseCnt();
- return (IBeanProxy) bp;
- }
- } else
- return null;
- }
-}
-
-/**
- * Start Transaction: During the time between start/stop transaction,
- * proxies will not be cleaned up. This prevents the case of a two step
- * transaction where the returned ID from the remote vm is for a proxy
- * that is about to be cleaned up, and then having that proxy disappear
- * when going for the data for it.
- *
- * Note: It is IMPERITIVE that the start/stop is used in the following way:
- * factory.startTransaction();
- * try {
- * do your stuff...
- * } finally {
- * factory.stopTransaction();
- * }
- *
- * This way it can never accidently leave it in a locked state.
- */
-public void startTransaction() {
- synchronized (fIDToProxiesMap) {
- transactionLockCount++;
- }
-}
-
-public boolean inTransaction() {
- synchronized (fIDToProxiesMap) {
- return transactionLockCount != 0;
- }
-}
-
-/**
- * Stop Transaction: During the time between start/stop transaction,
- * proxies will not be cleaned up. This prevents the case of a two step
- * transaction where the returned ID from the remote vm is for a proxy
- * that is about to be cleaned up, and then having that proxy disappear
- * when going for the data for it.
- *
- * Note: It is IMPERITIVE that the start/stop is used in the following way:
- * factory.startTransaction();
- * try {
- * do your stuff...
- * } finally {
- * factory.stopTransaction();
- * }
- *
- * This way it can never accidently leave it in a locked state.
- */
-public void stopTransaction() {
- synchronized (fIDToProxiesMap) {
- if (--transactionLockCount < 0)
- transactionLockCount = 0; // Shouldn't occur, but just in case.
- }
-}
-
-/**
- * Terminate the factory. If this is being terminated, then the server is being terminated too.
- * So just go through all of the proxies and release them, but don't send any notification to
- * the server since the server is subsequently just going to throw them away when it terminates.
- * <p>
- * This can't run async, so wait is a suggestion here.
- */
-public void terminateFactory(boolean wait) {
- synchronized (fIDToProxiesMap) {
- Iterator itr = fIDToProxiesMap.values().iterator();
- while (itr.hasNext()) {
- ProxyRef ref = (ProxyRef) itr.next();
- if (ref != null) {
- Object bp = ref.get();
- // If not cleaned up and not enqueued, release it.
- if (bp != null && !ref.isEnqueued())
- ((IREMBeanProxy) bp).release();
- }
- }
-
- fIDToProxiesMap.clear();
- queue = null; // Don't bother processing the queue, don't need to now.
- }
-}
- /* (non-Javadoc)
- * @see org.eclipse.jem.internal.proxy.core.IStandardBeanProxyFactory#createExpression()
- */
- public IExpression createExpression() {
- return new REMExpression(this.fRegistry);
- }
-
- /* (non-Javadoc)
- * @see org.eclipse.jem.internal.proxy.core.IStandardBeanProxyFactory#createBeanProxyFrom(java.lang.String)
- */
- public IBeanProxy createBeanProxyFrom(String initializationString) throws ThrowableProxy, ClassCastException, InstantiationException {
- try {
- return createBeanProxy(fBeanTypeProxyFactory.voidType, initializationString);
- } catch (CommandException e) {
- ProxyPlugin.getPlugin().getLogger().log(new Status(IStatus.WARNING, ProxyPlugin.getPlugin().getBundle().getSymbolicName(), 0, "", e)); //$NON-NLS-1$ }
- }
- return null;
- }
-
- /*
- * (non-Javadoc)
- * @see org.eclipse.jem.internal.proxy.core.IStandardBeanProxyFactory#convertToPrimitiveBeanProxy(org.eclipse.jem.internal.proxy.core.IBeanProxy)
- */
- public IBeanProxy convertToPrimitiveBeanProxy(IBeanProxy nonPrimitiveProxy) {
- if (nonPrimitiveProxy == null)
- return null;
- if (!nonPrimitiveProxy.isValid())
- return nonPrimitiveProxy;
- IREMBeanTypeProxy type = (IREMBeanTypeProxy) nonPrimitiveProxy.getTypeProxy();
- // Step into the internals. The ID is a constant int, so we can use a switch stmt.
- switch (type.getID().intValue()) {
- case Commands.BOOLEAN_CLASS:
- return this.createBeanProxyWith(((IBooleanBeanProxy) nonPrimitiveProxy).booleanValue());
- case Commands.BYTE_CLASS:
- return this.createBeanProxyWith(((INumberBeanProxy) nonPrimitiveProxy).byteValue());
- case Commands.CHARACTER_CLASS:
- return this.createBeanProxyWith(((ICharacterBeanProxy) nonPrimitiveProxy).charValue());
- case Commands.DOUBLE_CLASS:
- return this.createBeanProxyWith(((INumberBeanProxy) nonPrimitiveProxy).doubleValue());
- case Commands.FLOAT_CLASS:
- return this.createBeanProxyWith(((INumberBeanProxy) nonPrimitiveProxy).floatValue());
- case Commands.INTEGER_CLASS:
- return this.createBeanProxyWith(((INumberBeanProxy) nonPrimitiveProxy).intValue());
- case Commands.LONG_CLASS:
- return this.createBeanProxyWith(((INumberBeanProxy) nonPrimitiveProxy).longValue());
- case Commands.SHORT_CLASS:
- return this.createBeanProxyWith(((INumberBeanProxy) nonPrimitiveProxy).shortValue());
- default:
- return nonPrimitiveProxy;
- }
- }
-
-
- public IBeanProxy getIVMServerProxy() {
- return vmServerProxy;
- }
-}
-
-
diff --git a/plugins/org.eclipse.jem.proxy/proxyRemote/org/eclipse/jem/internal/proxy/remote/REMStandardBeanTypeProxyFactory.java b/plugins/org.eclipse.jem.proxy/proxyRemote/org/eclipse/jem/internal/proxy/remote/REMStandardBeanTypeProxyFactory.java
deleted file mode 100644
index d9a5243..0000000
--- a/plugins/org.eclipse.jem.proxy/proxyRemote/org/eclipse/jem/internal/proxy/remote/REMStandardBeanTypeProxyFactory.java
+++ /dev/null
@@ -1,690 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2001, 2005 IBM Corporation and others.
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
- *
- * Contributors:
- * IBM Corporation - initial API and implementation
- *******************************************************************************/
-package org.eclipse.jem.internal.proxy.remote;
-
-/*
-
-
- */
-
-import java.text.MessageFormat;
-import java.util.*;
-
-import org.eclipse.core.runtime.IStatus;
-import org.eclipse.core.runtime.Status;
-import org.eclipse.jem.internal.proxy.core.*;
-import org.eclipse.jem.internal.proxy.core.ExpressionProxy.ProxyEvent;
-import org.eclipse.jem.internal.proxy.common.CommandException;
-import org.eclipse.jem.internal.proxy.common.MapTypes;
-import org.eclipse.jem.internal.proxy.common.remote.CommandErrorException;
-import org.eclipse.jem.internal.proxy.common.remote.Commands;
-
-/**
- * We are a beanTypeProxyFactory for creating REMBeanTypeProxy objects Primitive types as well as common types like String are cached for speed of
- * lookup. We are the standard one that the VCE uses. Creation date: (12/3/99 2:32:48 PM)
- *
- * @author: Joe Winchester
- */
-public final class REMStandardBeanTypeProxyFactory implements IStandardBeanTypeProxyFactory {
-
- protected final REMProxyFactoryRegistry fFactoryRegistry;
-
- protected REMStandardBeanProxyFactory fBeanFactory;
-
- // Hashtable to cache proxies for classes so they are found on second and subsequent lookups
- protected Map fBeanProxies = new HashMap(1000);
-
- // A Cache of bean type proxies that should not ever be released. These are the standard ones
- // that we create here. They are never released because they wouldn't be correctly re-created
- // if they were. Also they are standard ones with standard ID's that don't change so they
- // don't need to be re-created later.
- protected Set fPermanentProxies = new HashSet(30);
-
- // Cache of requested but not found bean types. If not maintaining the list, this variable will be null.
- // The values are strings (classnames in JNI format).
- protected Set fNotFoundTypes = null;
-
- // Cached copy of a few typical bean type proxies.
- REMBeanTypeProxy objectClass;
-
- REMClassBeanTypeProxy classClass;
-
- REMVoidBeanTypeProxy voidType;
-
- REMBooleanTypeBeanTypeProxy booleanType;
-
- REMBooleanClassBeanTypeProxy booleanClass;
-
- REMIntegerTypeBeanTypeProxy intType;
-
- REMIntegerClassBeanTypeProxy integerClass;
-
- REMByteTypeBeanTypeProxy byteType;
-
- REMByteClassBeanTypeProxy byteClass;
-
- REMShortClassBeanTypeProxy shortClass;
-
- REMShortTypeBeanTypeProxy shortType;
-
- REMLongClassBeanTypeProxy longClass;
-
- REMLongTypeBeanTypeProxy longType;
-
- REMDoubleClassBeanTypeProxy doubleClass;
-
- REMDoubleTypeBeanTypeProxy doubleType;
-
- REMFloatClassBeanTypeProxy floatClass;
-
- REMFloatTypeBeanTypeProxy floatType;
-
- REMBigDecimalBeanTypeProxy bigDecimalClass;
-
- REMBigIntegerBeanTypeProxy bigIntegerClass;
-
- REMCharacterTypeBeanTypeProxy charType;
-
- REMCharacterClassBeanTypeProxy characterClass;
-
- REMStringBeanTypeProxy stringClass;
-
- /**
- * Available to all REM beantypes.
- */
- public REMProxyConstants proxyConstants;
-
- /**
- * IDEBeanTypeProxyFactory constructor comment.
- */
- REMStandardBeanTypeProxyFactory(REMProxyFactoryRegistry aRegistry) {
- fFactoryRegistry = aRegistry;
- aRegistry.registerBeanTypeProxyFactory(this);
-
- proxyConstants = new REMProxyConstants(aRegistry);
-
- // Now initialize the cache.
- objectClass = new REMBeanTypeProxy(fFactoryRegistry, new Integer(Commands.OBJECT_CLASS), Object.class.getName(), null);
- classClass = new REMClassBeanTypeProxy(fFactoryRegistry, objectClass);
- voidType = new REMVoidBeanTypeProxy(fFactoryRegistry);
- booleanType = new REMBooleanTypeBeanTypeProxy(fFactoryRegistry);
- booleanClass = new REMBooleanClassBeanTypeProxy(fFactoryRegistry, objectClass);
- IBeanTypeProxy numberClass = objectClass.newBeanTypeForClass(new Integer(Commands.NUMBER_CLASS), Number.class.getName(), true);
- intType = new REMIntegerTypeBeanTypeProxy(fFactoryRegistry);
- integerClass = new REMIntegerClassBeanTypeProxy(fFactoryRegistry, numberClass);
- byteType = new REMByteTypeBeanTypeProxy(fFactoryRegistry);
- byteClass = new REMByteClassBeanTypeProxy(fFactoryRegistry, numberClass);
- shortType = new REMShortTypeBeanTypeProxy(fFactoryRegistry);
- shortClass = new REMShortClassBeanTypeProxy(fFactoryRegistry, numberClass);
- longType = new REMLongTypeBeanTypeProxy(fFactoryRegistry);
- longClass = new REMLongClassBeanTypeProxy(fFactoryRegistry, numberClass);
- doubleType = new REMDoubleTypeBeanTypeProxy(fFactoryRegistry);
- doubleClass = new REMDoubleClassBeanTypeProxy(fFactoryRegistry, numberClass);
- floatType = new REMFloatTypeBeanTypeProxy(fFactoryRegistry);
- floatClass = new REMFloatClassBeanTypeProxy(fFactoryRegistry, numberClass);
- bigDecimalClass = new REMBigDecimalBeanTypeProxy(fFactoryRegistry, numberClass);
- bigIntegerClass = new REMBigIntegerBeanTypeProxy(fFactoryRegistry, numberClass);
- charType = new REMCharacterTypeBeanTypeProxy(fFactoryRegistry);
- characterClass = new REMCharacterClassBeanTypeProxy(fFactoryRegistry, objectClass);
- stringClass = new REMStringBeanTypeProxy(fFactoryRegistry, objectClass);
- IBeanTypeProxy throwableClass = new REMThrowableBeanTypeProxy(fFactoryRegistry, new Integer(Commands.THROWABLE_CLASS), Throwable.class
- .getName(), objectClass);
- IBeanTypeProxy threadClass = objectClass.newBeanTypeForClass(new Integer(Commands.THREAD_CLASS), Thread.class.getName(), false);
- IBeanTypeProxy expressionProcessorControllerClass = objectClass.newBeanTypeForClass(new Integer(Commands.EXPRESSIONPROCESSERCONTROLLER_CLASS), "org.eclipse.jem.internal.proxy.vm.remote.ExpressionProcesserController", false); //$NON-NLS-1$
-
- // Initialize the hashtable with the primitives, their lang equivalents, and also common classes like String
-
- // Primitives
- fBeanProxies.put(voidType.getTypeName(), voidType);
- fBeanProxies.put(intType.getTypeName(), intType);
- fBeanProxies.put(booleanType.getTypeName(), booleanType);
- fBeanProxies.put(charType.getTypeName(), charType);
- fBeanProxies.put(byteType.getTypeName(), byteType);
- fBeanProxies.put(shortType.getTypeName(), shortType);
- fBeanProxies.put(longType.getTypeName(), longType);
- fBeanProxies.put(floatType.getTypeName(), floatType);
- fBeanProxies.put(doubleType.getTypeName(), doubleType);
-
- // java.lang primitive peers
- // Note that special classes are used for some of these which allow the IDE to get the
- // lang objects from the objects that are holding proxies
- fBeanProxies.put(integerClass.getTypeName(), integerClass);
- fBeanProxies.put(booleanClass.getTypeName(), booleanClass);
- fBeanProxies.put(characterClass.getTypeName(), characterClass);
- fBeanProxies.put(byteClass.getTypeName(), byteClass);
- fBeanProxies.put(shortClass.getTypeName(), shortClass);
- fBeanProxies.put(longClass.getTypeName(), longClass);
- fBeanProxies.put(floatClass.getTypeName(), floatClass);
- fBeanProxies.put(doubleClass.getTypeName(), doubleClass);
- fBeanProxies.put(bigDecimalClass.getTypeName(), bigDecimalClass);
- fBeanProxies.put(bigIntegerClass.getTypeName(), bigIntegerClass);
- fBeanProxies.put(stringClass.getTypeName(), stringClass);
- fBeanProxies.put(throwableClass.getTypeName(), throwableClass);
- fBeanProxies.put(objectClass.getTypeName(), objectClass);
- fBeanProxies.put(classClass.getTypeName(), classClass);
- fBeanProxies.put(numberClass.getTypeName(), numberClass);
- fBeanProxies.put(threadClass.getTypeName(), threadClass);
- fBeanProxies.put(expressionProcessorControllerClass.getTypeName(), expressionProcessorControllerClass);
-
- // Mark these as permanent.
- fPermanentProxies.addAll(fBeanProxies.values());
- }
-
- /**
- * Initialize AFTER BeanProxyFactory has been created. This is REQUIRED! NOTE: It is package protected so that only REMStandardBeanProxyFactory
- * can call it when ready.
- */
- synchronized void initialize(REMStandardBeanProxyFactory proxyFactory) {
- fBeanFactory = proxyFactory;
- fBeanFactory.registerProxies(fBeanProxies.values());
- }
-
- /*
- * This is called when we know we don't have the class registered, so we need to create the proxy. We have a connection passed in and will reuse
- * it as necessary
- *
- * It is important that this be called only from within a transaction.
- */
- private synchronized IREMBeanTypeProxy createBeanTypeProxy(String typeName, IREMConnection connection) throws CommandException {
-
- // We don't have the beantype proxy, so create it.
- IREMBeanTypeProxy beanTypeProxy = null;
- Commands.GetClassReturn ret = null;
- try {
- ret = getClassReturn(connection, typeName);
- } catch (ThrowableProxy ep) {
- // Print out the trace and return proxy with init error.
- ProxyPlugin.getPlugin().getLogger().log(new Status(IStatus.WARNING, ProxyPlugin.getPlugin().getBundle().getSymbolicName(), 0, "", ep)); //$NON-NLS-1$
- IREMBeanTypeProxy proxy = new REMInitErrorBeanTypeProxy(fFactoryRegistry, MessageFormat.format(ProxyRemoteMessages.ExceptionErrorMsg_EXC_, new Object[] { ep.getTypeProxy().getTypeName(), ep.getProxyLocalizedMessage()}), typeName); //$NON-NLS-1$
- registerBeanTypeProxy(proxy, false);
- return proxy;
- }
- if (ret == null) {
- if (fNotFoundTypes != null)
- fNotFoundTypes.add(typeName);
- return null; // The class doesn't even exist on the server.
- }
-
- if (typeName.charAt(0) != '[') {
- // It is not an array.
- IREMBeanTypeProxy superTypeProxy = null;
- if (!ret.isInterface && ret.superClassname.length() != 0) {
- // Get the beantype proxy of the superclass.
- superTypeProxy = getBeanTypeProxy(ret.superClassname, connection);
- }
-
- // First check with the factory for the package of the class.
- // Inner classes have to use the dollar notation since if they didn't we couldn't tell where
- // the package ended and the class started. This check is here in case the
- // extension factory can handle this class but needs the id from the server to
- // create it.
- int packageIndex = typeName.lastIndexOf('.');
- if (packageIndex != -1) {
- String packageName = typeName.substring(0, packageIndex);
- IREMBeanTypeProxyFactory packageFactory = (IREMBeanTypeProxyFactory) fFactoryRegistry.getBeanTypeProxyFactoryExtension(packageName);
- if (packageFactory != null) {
- beanTypeProxy = packageFactory.getExtensionBeanTypeProxy(typeName, new Integer(ret.classID), superTypeProxy);
- if (beanTypeProxy != null) {
- registerBeanTypeProxy(beanTypeProxy, false);
- return beanTypeProxy;
- }
- }
- }
-
- if (ret.isInterface) {
- // Interface never have a super type, so we will create a specific type.
- beanTypeProxy = new REMInterfaceBeanTypeProxy(fFactoryRegistry, new Integer(ret.classID), typeName);
- } else {
- // Ask the supertype
- // to create a beantype proxy of the same beantype proxy class.
- // This is so that any subclasses will get the same beantype proxy class
- // for it if it is special.
- if (superTypeProxy != null)
- beanTypeProxy = superTypeProxy.newBeanTypeForClass(new Integer(ret.classID), typeName, ret.isAbstract);
- }
- } else
- beanTypeProxy = new REMArrayBeanTypeProxy(fFactoryRegistry, new Integer(ret.classID), typeName, objectClass);
-
- // Cache the instance so we can re-use it again
- if (beanTypeProxy != null)
- registerBeanTypeProxy(beanTypeProxy, false);
- return beanTypeProxy;
- }
-
- /**
- * Using the helper class to find a class by name, then create the proxy.
- */
- public IBeanTypeProxy getBeanTypeProxy(String typeName) {
- try {
- return getBeanTypeProxy(MapTypes.getJNIFormatName(typeName), (IREMConnection) null);
- } catch (CommandException e) {
- // Try once more (we won't have received recoverable exceptions here, they were already caught and handled)
- try {
- return getBeanTypeProxy(typeName, (IREMConnection) null);
- } catch (CommandException eAgain) {
- // Failed again.
- ProxyPlugin.getPlugin().getLogger().log(
- new Status(IStatus.WARNING, ProxyPlugin.getPlugin().getBundle().getSymbolicName(), 0, "", eAgain)); //$NON-NLS-1$
- }
- }
- return null;
- }
-
- /*
- * (non-Javadoc)
- *
- * @see org.eclipse.jem.internal.proxy.core.IStandardBeanTypeProxyFactory#getBeanTypeProxy(org.eclipse.jem.internal.proxy.core.IExpression,
- * java.lang.String)
- */
- public synchronized IProxyBeanType getBeanTypeProxy(IExpression expression, String typeName) {
- typeName = MapTypes.getJNIFormatName(typeName);
- // See whether we already have the proxy for the argument name
- IProxyBeanType beanTypeProxy = (IProxyBeanType) fBeanProxies.get(typeName);
- if (beanTypeProxy != null)
- return beanTypeProxy;
-
- // Now see if an expression proxy cached.
- beanTypeProxy = ((REMExpression) expression).getBeanType(typeName);
- if (beanTypeProxy != null)
- return beanTypeProxy;
-
- // If not an array, then see if the package extension mechanism can find it.
- // Do this here so that if it is found in the package extension we won't necessarily create an
- // extra connection when not needed.
- if (typeName.charAt(0) != '[') {
- // It is not an array
- // First check with the factory for the package of the class.
- // Inner classes have to use the dollar notation since if they didn't we couldn't tell where
- // the package ended and the class started.
- int packageIndex = typeName.lastIndexOf('.');
- if (packageIndex != -1) {
- String packageName = typeName.substring(0, packageIndex);
- IREMBeanTypeProxyFactory packageFactory = (IREMBeanTypeProxyFactory) fFactoryRegistry.getBeanTypeProxyFactoryExtension(packageName);
- if (packageFactory != null) {
- beanTypeProxy = packageFactory.getExtensionBeanTypeProxy(typeName, expression);
- if (beanTypeProxy != null) {
- registerBeanTypeProxy(beanTypeProxy, false);
- return beanTypeProxy;
- }
- }
- }
- }
-
- // Need to create the expression proxy for it.
- beanTypeProxy = ((Expression) expression).createBeanTypeExpressionProxy(typeName);
- registerBeanTypeProxy(beanTypeProxy, false);
- return beanTypeProxy;
-
- }
-
- /**
- * One that internally allows that we already have a connection to work with. If the connection is null, then one will be created.
- *
- * It is important that if the connection is not null, then we are in a transaction.
- */
- private synchronized IREMBeanTypeProxy getBeanTypeProxy(String typeName, IREMConnection inConnect) throws CommandException {
-
- // See whether we already have the proxy for the argument name
- IProxyBeanType beanTypeProxy = (IProxyBeanType) fBeanProxies.get(typeName);
- // See if there and resolved, if so, return it. If not resolved, that means we need it NOW
- // so we must go for it. When finally resolved the original ExpressionProxy will be deregistered and
- // the resolved beantypeproxy will be in its place.
- if (beanTypeProxy != null && beanTypeProxy.isBeanProxy()) { return (IREMBeanTypeProxy) beanTypeProxy; }
-
- // If not an array, then see if the package extension mechanism can find it.
- // Do this here so that if it is found in the package extension we won't necessarily create an
- // extra connection when not needed.
- if (typeName.charAt(0) != '[') {
- // It is not an array
- // First check with the factory for the package of the class.
- // Inner classes have to use the dollar notation since if they didn't we couldn't tell where
- // the package ended and the class started.
- int packageIndex = typeName.lastIndexOf('.');
- if (packageIndex != -1) {
- String packageName = typeName.substring(0, packageIndex);
- IREMBeanTypeProxyFactory packageFactory = (IREMBeanTypeProxyFactory) fFactoryRegistry.getBeanTypeProxyFactoryExtension(packageName);
- if (packageFactory != null) {
- beanTypeProxy = packageFactory.getExtensionBeanTypeProxy(typeName);
- if (beanTypeProxy != null) {
- registerBeanTypeProxy((IREMBeanTypeProxy) beanTypeProxy, false);
- return (IREMBeanTypeProxy) beanTypeProxy;
- }
- }
- }
- }
-
- IREMConnection connect = inConnect != null ? inConnect : fFactoryRegistry.getFreeConnection();
- if (inConnect == null)
- fBeanFactory.startTransaction(); // Start a transation.
- try {
- return createBeanTypeProxy(typeName, connect);
- } catch (CommandException e) {
- if (inConnect == null) {
- // Need to close the connection, not return it.
- fFactoryRegistry.closeConnection(connect);
- connect = null; // So that it won't be returned.
- }
- throw e; // Pass it on up
- } finally {
- if (inConnect == null)
- fBeanFactory.stopTransaction();
- if (inConnect == null && connect != null)
- fFactoryRegistry.returnConnection(connect);
- }
- }
-
- /*
- * It is important this be called only from within a transaction.
- */
- private Commands.GetClassReturn getClassReturn(IREMConnection connection, String className) throws CommandException, ThrowableProxy {
- try {
- return connection.getClass(className);
- } catch (CommandErrorException e) {
- fBeanFactory.processErrorReturn(e); // Let proxy factory handle the error return
- }
- return null;
- }
-
- /**
- * Return an Array type proxy for the given class name of the specified dimensions. This is a helper method. The same result can be gotton from
- * getBeanTypeProxy. e.g. getBeanTypeProxy("java.lang.Object", 3) is the same as: getBeanTypeProxy("[[[Ljava.lang.Object;")
- *
- * They both result in a type of: Object [][][]
- *
- * or getBeanTypeProxy("[Ljava.langObject;", 3) becomes Object [][][][]
- */
- public IBeanTypeProxy getBeanTypeProxy(String componentClassName, int dimensions) {
- return getBeanTypeProxy(getArrayClassName(componentClassName, dimensions));
- }
-
- /**
- * @param componentClassName
- * @param dimensions
- * @return
- *
- * @since 1.1.0
- */
- private String getArrayClassName(String componentClassName, int dimensions) {
- String jniComponentClassName = MapTypes.getJNIFormatName(componentClassName);
- String compType = jniComponentClassName;
- if (jniComponentClassName.charAt(0) != '[') {
- // We're not already an array, so create correct template.
- compType = (String) MapTypes.MAP_TYPENAME_TO_SHORTSIG.get(jniComponentClassName);
- if (compType == null) {
- // It is a class, and not a type.
- compType = "L" + jniComponentClassName + ";"; //$NON-NLS-1$ //$NON-NLS-2$
- }
- }
-
- // Now create it with the appropriate number of '[' in front.
- StringBuffer buffer = new StringBuffer(dimensions + compType.length());
- for (int i = 0; i < dimensions; i++)
- buffer.append('[');
- buffer.append(compType);
- return buffer.toString();
- }
-
- /*
- * (non-Javadoc)
- *
- * @see org.eclipse.jem.internal.proxy.core.IStandardBeanTypeProxyFactory#getBeanTypeProxy(org.eclipse.jem.internal.proxy.core.IExpression,
- * java.lang.String, int)
- */
- public IProxyBeanType getBeanTypeProxy(IExpression expression, String componentClassName, int dimensions) {
- return getBeanTypeProxy(expression, getArrayClassName(componentClassName, dimensions));
- }
-
- /**
- * Get the bean type proxy from a class id. This means that a new class id was sent back from the server that we don't have yet. We need to go ask
- * the server for information on this type so that we can create it.
- *
- * NOTE: This is package protected so that only the standard bean proxy factory can call it.
- *
- * It is important that this has been called within a transaction.
- */
- IREMBeanTypeProxy createBeanTypeProxy(Integer classID) {
- IREMConnection connect = fFactoryRegistry.getFreeConnection();
- try {
- return createBeanTypeProxy(classID, connect);
- } catch (CommandException e) {
- if (e.isRecoverable()) {
- // It is recoverable, print message, keep connection live and return it.
- ProxyPlugin.getPlugin().getLogger().log(new Status(IStatus.WARNING, ProxyPlugin.getPlugin().getBundle().getSymbolicName(), 0, "", e)); //$NON-NLS-1$
- } else {
- // Try again, close connection, get a new one.
- fFactoryRegistry.closeConnection(connect);
- connect = null;
- connect = fFactoryRegistry.getFreeConnection();
- try {
- return createBeanTypeProxy(classID, connect);
- } catch (CommandException eAgain) {
- // Failed again. Close connection, don't return it.
- ProxyPlugin.getPlugin().getLogger().log(
- new Status(IStatus.WARNING, ProxyPlugin.getPlugin().getBundle().getSymbolicName(), 0, "", eAgain)); //$NON-NLS-1$
- fFactoryRegistry.closeConnection(connect);
- connect = null;
- }
- }
- } finally {
- if (connect != null)
- fFactoryRegistry.returnConnection(connect);
- }
- return null;
- }
-
- /*
- * One that internally allows that we already have a connection to work with. If the connection is null, then one will be created.
- *
- * It is important this be called only from within a transaction.
- */
- private synchronized IREMBeanTypeProxy createBeanTypeProxy(Integer classID, IREMConnection connect) throws CommandException {
- // We don't have the beantype proxy, so create it.
- IREMBeanTypeProxy beanTypeProxy = null;
-
- Commands.GetClassIDReturn ret = null;
- try {
- ret = getClassIDReturn(connect, classID);
- } catch (ThrowableProxy ep) {
- // Just print out the trace and return proxy not found.
- ProxyPlugin.getPlugin().getLogger().log(new Status(IStatus.WARNING, ProxyPlugin.getPlugin().getBundle().getSymbolicName(), 0, "", ep)); //$NON-NLS-1$
- return null;
- }
-
- // If the signature is that of a class.
- if (ret.className.charAt(0) != '[') {
- // It is not an array.
- IREMBeanTypeProxy superTypeProxy = null;
- if (!ret.isInterface && ret.superClassname.length() != 0) {
- // Get the beantype proxy of the superclass.
- superTypeProxy = getBeanTypeProxy(ret.superClassname, connect);
- }
-
- // First check with the factory for the package of the class.
- // Inner classes have to use the dollar notation since if they didn't we couldn't tell where
- // the package ended and the class started.
- int packageIndex = ret.className.lastIndexOf('.');
- if (packageIndex != -1) {
- String packageName = ret.className.substring(0, packageIndex);
- IREMBeanTypeProxyFactory packageFactory = (IREMBeanTypeProxyFactory) fFactoryRegistry.getBeanTypeProxyFactoryExtension(packageName);
- if (packageFactory != null) {
- beanTypeProxy = packageFactory.getExtensionBeanTypeProxy(ret.className, classID, superTypeProxy);
- if (beanTypeProxy != null) {
- registerBeanTypeProxy(beanTypeProxy, false);
- return beanTypeProxy;
- }
- }
- }
-
- if (ret.isInterface) {
- // Interface never have a super type, so we will let the object class do it for us.
- beanTypeProxy = new REMInterfaceBeanTypeProxy(fFactoryRegistry, classID, ret.className);
- } else {
- // Ask the beantype proxy of the superclass
- // to create a beantype proxy of the same beantype proxy class.
- // This is so that any subclasses will get the same beantype proxy class
- // for it if it is special.
- if (superTypeProxy != null)
- beanTypeProxy = superTypeProxy.newBeanTypeForClass(classID, ret.className, ret.isAbstract);
- }
-
- // Cache the instance so we can re-use it again
- if (beanTypeProxy != null)
- registerBeanTypeProxy(beanTypeProxy, false);
- return beanTypeProxy;
- } else {
- // It is an array.
- beanTypeProxy = new REMArrayBeanTypeProxy(fFactoryRegistry, classID, ret.className, objectClass);
- registerBeanTypeProxy(beanTypeProxy, false);
- return beanTypeProxy;
- }
- }
-
- /*
- * It is important that this be called only from within a transaction.
- */
- private Commands.GetClassIDReturn getClassIDReturn(IREMConnection connection, Integer classID) throws CommandException, ThrowableProxy {
- try {
- return connection.getClassFromID(classID.intValue());
- } catch (CommandErrorException e) {
- fBeanFactory.processErrorReturn(e); // Let proxy factory handle the error return
- }
- return null;
- }
-
- /*
- * (non-Javadoc)
- *
- * @see org.eclipse.jem.internal.proxy.core.IStandardBeanTypeProxyFactory#registerBeanTypeProxy(org.eclipse.jem.internal.proxy.core.IBeanTypeProxy,
- * boolean)
- */
- public synchronized void registerBeanTypeProxy(IBeanTypeProxy aBeanTypeProxy, boolean permanent) {
- fBeanProxies.put(aBeanTypeProxy.getTypeName(), aBeanTypeProxy);
- fBeanFactory.registerProxy((IREMBeanProxy) aBeanTypeProxy);
- if (permanent)
- fPermanentProxies.add(aBeanTypeProxy);
- }
-
- /*
- * (non-Javadoc)
- *
- * @see org.eclipse.jem.internal.proxy.core.IStandardBeanTypeProxyFactory#registerBeanTypeProxy(org.eclipse.jem.internal.proxy.core.IProxyBeanType,
- * boolean)
- */
- public void registerBeanTypeProxy(IProxyBeanType aProxyBeanType, final boolean permanent) {
- if (aProxyBeanType.isBeanProxy())
- registerBeanTypeProxy((IBeanTypeProxy) aProxyBeanType, permanent); // A regular kind, do regular registration.
- else {
- ExpressionProxy beanExpressionProxy = ((ExpressionProxy) aProxyBeanType);
- final String typeName = aProxyBeanType.getTypeName();
- ((REMExpression) beanExpressionProxy.getExpression()).addBeanType(typeName, aProxyBeanType);
- beanExpressionProxy.addProxyListener(new ExpressionProxy.ProxyAdapter() {
-
- public void proxyResolved(ProxyEvent event) {
- String typeName = ((IProxyBeanType) event.getSource()).getTypeName();
- synchronized (REMStandardBeanTypeProxyFactory.this) {
- if (!fBeanProxies.containsKey(typeName)) {
- // It hasn't been resolved through some other means. So this is good. Actually this should never
- // occur because upon resolution we've already registered the bean type proxy through the
- // normal mechanisms. But to be safe, we'll do it here.
- fBeanProxies.put(typeName, event.getProxy());
- if (permanent)
- fPermanentProxies.add(event.getProxy());
- }
- }
- }
-
- public void proxyNotResolved(ExpressionProxy.ProxyEvent event) {
- ((REMExpression) ((ExpressionProxy) event.getSource()).getExpression()).removeBeanType(typeName);
- }
- });
- }
-
- }
-
- /**
- * A beantype proxy is asked to be released. We can only release ones that were not in the permanent set that we initialized with. Those in the
- * permanent set can't be changed so we can't release them.
- *
- * Answer whether it can be released from the server too.
- *
- * NOTE: Package protected since only REMStandardBeanProxyFactory should call it.
- */
- boolean releaseProxy(IBeanTypeProxy proxy) {
- /**
- * Currently we won't allow any bean type proxies to be released. We don't have a good strategy for handling that there may be hard refs from
- * subtypes. One thought is that beanproxies table should store SoftReferences so that only when space is needed, that any beantype that
- * doesn't have a subtype (since subtypes hold a strong ref) or, is in the permanent table (since that is hardref) could be GC'd. Then what
- * would happen is on releaseProxy we don't actually release, we change it to a WeakRef so that it would definitely be released on a GC. These
- * are complicated arch. and we're not sure if it should be allowed or not. So for now, we don't allow them to be released. if
- * (!fPermanentProxies.contains(proxy)) { // We can release it. It is not one of the permanent ones. synchronized(this) {
- * fBeanProxies.remove(proxy.getTypeName()); return true; } }
- */
- return false;
- }
-
- /*
- * Terminate this factory. Since all of the proxies are registered in the proxy factory, there is no need to release them here. There is no need
- * to clear out any fields since this factory will not be held onto by anything and so it will be GC'd.
- */
- public void terminateFactory(boolean wait) {
- }
-
- /*
- * (non-Javadoc)
- *
- * @see org.eclipse.jem.internal.proxy.core.IStandardBeanTypeProxyFactory#isBeanTypeRegistered(String)
- */
- public synchronized boolean isBeanTypeRegistered(String className) {
- return fBeanProxies.containsKey(MapTypes.getJNIFormatName(className));
- }
-
- /*
- * (non-Javadoc)
- *
- * @see org.eclipse.jem.internal.proxy.core.IStandardBeanTypeProxyFactory#registeredTypes()
- */
- public Set registeredTypes() {
- return fBeanProxies.keySet();
- }
-
- /*
- * (non-Javadoc)
- *
- * @see org.eclipse.jem.internal.proxy.core.IStandardBeanTypeProxyFactory#isBeanTypeNotFound(String)
- */
- public synchronized boolean isBeanTypeNotFound(String className) {
- return fNotFoundTypes != null && fNotFoundTypes.contains(MapTypes.getJNIFormatName(className));
- }
-
- /*
- * (non-Javadoc)
- *
- * @see org.eclipse.jem.internal.proxy.core.IStandardBeanTypeProxyFactory#isMaintainNotFoundTypes()
- */
- public synchronized boolean isMaintainNotFoundTypes() {
- return fNotFoundTypes != null;
- }
-
- /*
- * (non-Javadoc)
- *
- * @see org.eclipse.jem.internal.proxy.core.IStandardBeanTypeProxyFactory#setMaintainNotFoundTypes(boolean)
- */
- public synchronized void setMaintainNotFoundTypes(boolean maintain) {
- if (maintain) {
- if (fNotFoundTypes == null)
- fNotFoundTypes = new HashSet();
- } else
- fNotFoundTypes = null;
- }
-
-}
-
diff --git a/plugins/org.eclipse.jem.proxy/proxyRemote/org/eclipse/jem/internal/proxy/remote/REMStringBeanProxy.java b/plugins/org.eclipse.jem.proxy/proxyRemote/org/eclipse/jem/internal/proxy/remote/REMStringBeanProxy.java
deleted file mode 100644
index 7d396d0..0000000
--- a/plugins/org.eclipse.jem.proxy/proxyRemote/org/eclipse/jem/internal/proxy/remote/REMStringBeanProxy.java
+++ /dev/null
@@ -1,83 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2001, 2005 IBM Corporation and others.
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
- *
- * Contributors:
- * IBM Corporation - initial API and implementation
- *******************************************************************************/
-package org.eclipse.jem.internal.proxy.remote;
-/*
-
-
- */
-
-
-import org.eclipse.jem.internal.proxy.core.*;
-import org.eclipse.jem.internal.proxy.common.remote.Commands;
-
-/**
- * Remote VM Implementation of IStringBeanProxy
- * Creation date: (2/6/00 9:02:42 AM)
- * @author: Joe Winchester
- */
-final class REMStringBeanProxy extends REMConstantBeanProxy implements IStringBeanProxy {
- private final String fString;
-
-/**
- * Store the bean in the string field to save re-casting each time it is asked for.
- * It is package protected because they are created
- * in a special way and no one else should create them.
- */
-REMStringBeanProxy(REMProxyFactoryRegistry aRegistry, String value) {
- super(aRegistry);
- fString = value;
-}
-/**
- * equals: Equal if:
- * 1) This proxy == (identity) to the other object
- * 2) Else if other is an IBeanProxy and not a constant one, then if
- * equals on the server.
- * 3) If this is a constant proxy and the other is too or is a constant
- * value (e.g. IStringBeanProxy.equals(String), then true if values are equals.
- */
-public boolean equals(Object anObject) {
- if (this == anObject)
- return true; // Identity
- if (anObject instanceof IStringBeanProxy)
- return fString.equals(((IStringBeanProxy) anObject).stringValue());
- else
- return fString.equals(anObject);
-}
-/**
- * Return the cache'd string that is a java.lang.String that the IDE can use
- */
-public String stringValue() {
- return fString;
-}
-
-/**
- * Return the toString value from the bean.
- */
-public String toBeanString() {
- return fString.toString();
-}
-
-/**
- * Get the beantype
- */
-public IBeanTypeProxy getTypeProxy() {
- return ((REMStandardBeanTypeProxyFactory) fFactory.getBeanTypeProxyFactory()).stringClass;
-}
-
-/**
- * Render the bean into value object.
- */
-public void renderBean(Commands.ValueObject value) {
- value.set(fString);
-}
-}
-
-
diff --git a/plugins/org.eclipse.jem.proxy/proxyRemote/org/eclipse/jem/internal/proxy/remote/REMStringBeanTypeProxy.java b/plugins/org.eclipse.jem.proxy/proxyRemote/org/eclipse/jem/internal/proxy/remote/REMStringBeanTypeProxy.java
deleted file mode 100644
index f48c29d..0000000
--- a/plugins/org.eclipse.jem.proxy/proxyRemote/org/eclipse/jem/internal/proxy/remote/REMStringBeanTypeProxy.java
+++ /dev/null
@@ -1,124 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2001, 2005 IBM Corporation and others.
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
- *
- * Contributors:
- * IBM Corporation - initial API and implementation
- *******************************************************************************/
-package org.eclipse.jem.internal.proxy.remote;
-/*
-
-
- */
-
-
-import org.eclipse.jem.internal.proxy.common.remote.Commands;
-import org.eclipse.jem.internal.proxy.core.*;
-
-/**
- * Remote Implementation of the BeanType proxy for java.lang.String
- * Creation date: (2/6/00 9:01:23 AM)
- * @author: Joe Winchester
- */
-final class REMStringBeanTypeProxy extends REMAbstractBeanTypeProxy implements IREMConstantBeanTypeProxy {
- // Cache a proxy to an empty string for speed
- protected final IStringBeanProxy emptyStringProxy;
-/**
- * IDEStringBeanTypeProxy constructor comment.
- * @param aClass java.lang.Class
- */
-REMStringBeanTypeProxy(REMProxyFactoryRegistry aRegistry, IBeanTypeProxy objectTypeProxy) {
- super(aRegistry, new Integer(Commands.STRING_CLASS), String.class.getName(), objectTypeProxy);
-
- // Cache a proxy to an empty string for speed
- emptyStringProxy = new REMStringBeanProxy(aRegistry, ""); //$NON-NLS-1$
-}
-/**
- * Helper to create string beans
- * Package protected because no-one else outside the package should use this, they
- * must go through the API where you look up a factory first.
- */
-IStringBeanProxy createStringBeanProxy(String aString){
- if ( aString.equals("") ) {//$NON-NLS-1$
- return emptyStringProxy;
- } else {
- return new REMStringBeanProxy(fRegistry, aString);
- }
-}
-
-/**
- * Create a new bean proxy with the specified id.
- *
- * For all of the primitive wrapper types, this is an invalid operation. They are created
- * explicitly through the appropriate create method.
- */
-public IREMBeanProxy newBeanProxy(Integer anID) {
- throw new UnsupportedOperationException();
-}
-
-/**
- * newBeanTypeForClass: Create a new beantypeproxy of this kind for the given class.
- * This is used by beantype proxy factory when creating a beantype proxy for a subclass.
- * This is because subclasses, unless explicitly overridden, should use the same kind
- * of beantype proxy. This way if anything special is needed for a specific type, then
- * that can be done.
- *
- * For all of the primitive wrapper types, they are final classes, so you can't create a newBeanType
- * for subclasses.
- */
-public IREMBeanTypeProxy newBeanTypeForClass(Integer anID, String aClassname, boolean anAbstract) {
- throw new UnsupportedOperationException();
-}
-
-/**
- * newInstance method. String has a default ctor, but it results in the emptyStringProxy,
- * so return the zeroProxy for this case because that is the default value.
- */
-public IBeanProxy newInstance() {
- return emptyStringProxy;
-}
-
-/**
- * newInstance method comment. Put a short cut in for strings so we don't need to go to the remote
- * vm just to create a string.
- */
-public IBeanProxy newInstance(String initializationString) throws ThrowableProxy, ClassCastException, InstantiationException {
- if (initializationString.length() <= 1)
- return super.newInstance(initializationString); // Not large enough for two quotes, so let default handle it.
- // Need a quick check that it is only one quoted string. Anything else needs to be passed on up.
- String s = initializationString.trim();
- int sl = s.length()-1;
- if (s.charAt(0) != '"' || s.charAt(sl) != '"')
- return super.newInstance(initializationString); // No leading and trailing quote.
-
- StringBuffer sb = new StringBuffer(sl);
- boolean escape = false;
- for (int i=1; i<sl; i++) {
- char c = s.charAt(i);
- if (c == '\\') {
- escape = true;
- continue;
- }
- if (!escape && c == '"')
- return super.newInstance(initializationString); // Had a quote in the middle without an escape. This means an expression, send on up.
- escape = false;
- sb.append(c);
- }
-
- return getProxyFactoryRegistry().getBeanProxyFactory().createBeanProxyWith(sb.toString());
-}
-
-/**
- * Create a new bean proxy the ValueObject passed in.
- * We will assume the object is correct type.
- */
-public IBeanProxy newBeanProxy(Commands.ValueObject value) {
- return createStringBeanProxy((String) value.anObject);
-}
-
-}
-
-
diff --git a/plugins/org.eclipse.jem.proxy/proxyRemote/org/eclipse/jem/internal/proxy/remote/REMThrowableBeanProxy.java b/plugins/org.eclipse.jem.proxy/proxyRemote/org/eclipse/jem/internal/proxy/remote/REMThrowableBeanProxy.java
deleted file mode 100644
index 1b45591..0000000
--- a/plugins/org.eclipse.jem.proxy/proxyRemote/org/eclipse/jem/internal/proxy/remote/REMThrowableBeanProxy.java
+++ /dev/null
@@ -1,214 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2001, 2005 IBM Corporation and others.
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
- *
- * Contributors:
- * IBM Corporation - initial API and implementation
- *******************************************************************************/
-package org.eclipse.jem.internal.proxy.remote;
-/*
-
-
- */
-
-
-import org.eclipse.jem.internal.proxy.core.*;
-import org.eclipse.jem.internal.proxy.common.remote.*;
-/**
- * Exception Proxy for exception on Remote.
- * NOTE: This one is unusual in that it doesn't inherit from
- * IDEBeanProxy because it needs to be an exception, and
- * exceptions are not an interface.
- */
-public class REMThrowableBeanProxy extends ThrowableProxy implements IREMBeanProxy {
-
- /**
- * Comment for <code>serialVersionUID</code>
- *
- * @since 1.1.0
- */
- private static final long serialVersionUID = 2076777336810215206L;
- private Integer fID;
- protected final REMProxyFactoryRegistry fFactory;
- private IBeanTypeProxy fTypeProxy;
-
- /**
- * Set the bean we are proxying. We are a proxy for a bean running on the remote VM.
- */
- protected REMThrowableBeanProxy(REMProxyFactoryRegistry aRegistry, Integer anID, IBeanTypeProxy aType){
- fFactory = aRegistry;
- fID = anID;
- fTypeProxy = aType;
- }
-
- /**
- * equals: Equal if:
- * 1) This proxy == (identity) to the other object
- * 2) Else if other is an IBeanProxy and not a constant one, then if
- * equals on the server.
- * 3) If this is a constant proxy and the other is too or is a constant
- * value (e.g. IStringBeanProxy.equals(String), then true if values are equals.
- */
- public boolean equals(Object anObject) {
- if (super.equals(anObject))
- return true; // Identity
- if (anObject instanceof IBeanProxy && !(anObject instanceof IREMConstantBeanProxy) && fFactory.isValid() && ((IBeanProxy) anObject).getProxyFactoryRegistry() == fFactory)
- try {
- // The other is a bean proxy and is not a constant one, let the server do the check.
- return ((IBooleanBeanProxy) REMStandardBeanProxyConstants.getConstants(fFactory).getObjectEquals().invoke(this, (IBeanProxy) anObject)).booleanValue();
- } catch (ThrowableProxy e) {
- }
- return false;
- }
-
- /* (non-Javadoc)
- * @see org.eclipse.jem.internal.proxy.core.IBeanProxy#sameAs(org.eclipse.jem.internal.proxy.core.IBeanProxy)
- */
- public boolean sameAs(IBeanProxy aBeanProxy) {
- return this == aBeanProxy; // We can be assured in Remote Proxy that identity of proxy and identity of object are the same.
- }
-
-
- /**
- * Get ID. An internal method to be used only within the ProxyFactory family.
- */
- public Integer getID() {
- return fID;
- }
-
- /**
- * isValid - has this bean been released.
- */
- public boolean isValid() {
- return fID != null;
- }
-
- /**
- * release - The bean is being released.
- */
- public void release() {
- fID = null;
- fTypeProxy = null;
- }
-
- /**
- * Return the registry this proxy was created with.
- */
- public ProxyFactoryRegistry getProxyFactoryRegistry() {
- return fFactory;
- }
-
- /**
- * Return the proxied class of the bean
- * Creation date: (12/3/99 11:37:01 AM)
- * @author: Joe Winchester
- */
- public IBeanTypeProxy getTypeProxy() {
- return fTypeProxy;
- }
-
- /**
- * Return the toString of the actual bean on the remote side.
- */
- public String toBeanString() {
- IStringBeanProxy string = (IStringBeanProxy) REMStandardBeanProxyConstants.getConstants(fFactory).getObjectToString().invokeCatchThrowableExceptions(this);
- return (string != null) ? string.stringValue() : null;
- }
-
- public String getProxyLocalizedMessage() {
- IStringBeanProxy msg = (IStringBeanProxy) REMStandardBeanProxyConstants.getConstants(fFactory).getThrowableLocalizedMessage().invokeCatchThrowableExceptions(this);
- return msg != null ? msg.stringValue() : null;
- }
-
- public String getProxyMessage() {
- IStringBeanProxy msg = (IStringBeanProxy) REMStandardBeanProxyConstants.getConstants(fFactory).getThrowableMessage().invokeCatchThrowableExceptions(this);
- return msg != null ? msg.stringValue() : null;
- }
-
- /**
- * Temporary way to get the string value of the stacktrace.
- */
- private String getProxyStackTrace() {
- IMethodProxy tempGetStackTrace = fFactory.getMethodProxyFactory().getMethodProxy("org.eclipse.jem.internal.proxy.vm.remote.StackTraceUtility", "printStackTrace", new String[] {"java.lang.Throwable"}); //$NON-NLS-1$ //$NON-NLS-2$ //$NON-NLS-3$
- IStringBeanProxy trace = (IStringBeanProxy) tempGetStackTrace.invokeCatchThrowableExceptions(null, this);
- return trace != null ? trace.stringValue() : ""; //$NON-NLS-1$
- }
-
- public void printProxyStackTrace(java.io.PrintWriter writer) {
- String trace = getProxyStackTrace();
- synchronized(writer) {
- writer.print(trace);
- }
- }
-
- public void printProxyStackTrace(java.io.PrintStream stream) {
- String trace = getProxyStackTrace();
- synchronized(stream) {
- stream.print(trace);
- }
-
- }
-
- public void printProxyStackTrace() {
- String trace = getProxyStackTrace();
- synchronized(System.err) {
- System.err.print(trace);
- }
- }
-
-
- /**
- * Below are the actual printStackTrace. They are set up to first call
- * the proxy trace so that it can show where it occurred on the server,
- * and then it will do a super to show where it occurred on this side.
- */
- public void printStackTrace() {
- synchronized (System.err) {
- System.err.println(ProxyRemoteMessages.REMOTE_VM_TRACE_INFO_);
- printProxyStackTrace();
- System.err.println(ProxyRemoteMessages.REMOTE_VM_LOCAL_TRACE_INFO_);
- super.printStackTrace();
- }
- }
-
- public void printStackTrace(java.io.PrintWriter s) {
- synchronized (s) {
- s.println(ProxyRemoteMessages.REMOTE_VM_TRACE_INFO_);
- printProxyStackTrace(s);
- s.println(ProxyRemoteMessages.REMOTE_VM_LOCAL_TRACE_INFO_);
- super.printStackTrace(s);
- }
- }
-
- public void printStackTrace(java.io.PrintStream s) {
- synchronized (s) {
- s.println(ProxyRemoteMessages.REMOTE_VM_TRACE_INFO_);
- printProxyStackTrace(s);
- s.println(ProxyRemoteMessages.REMOTE_VM_LOCAL_TRACE_INFO_);
- super.printStackTrace(s);
- }
- }
-
- /**
- * Render the bean into value object.
- */
- public void renderBean(Commands.ValueObject value) {
- value.setObjectID(getID().intValue());
- }
-
- /* (non-Javadoc)
- * @see org.eclipse.jem.internal.proxy.core.IProxy#isBeanProxy()
- */
- public final boolean isBeanProxy() {
- return true;
- }
- /* (non-Javadoc)
- * @see org.eclipse.jem.internal.proxy.core.IProxy#isExpressionProxy()
- */
- public final boolean isExpressionProxy() {
- return false;
- }
-}
diff --git a/plugins/org.eclipse.jem.proxy/proxyRemote/org/eclipse/jem/internal/proxy/remote/REMThrowableBeanTypeProxy.java b/plugins/org.eclipse.jem.proxy/proxyRemote/org/eclipse/jem/internal/proxy/remote/REMThrowableBeanTypeProxy.java
deleted file mode 100644
index 997bddc..0000000
--- a/plugins/org.eclipse.jem.proxy/proxyRemote/org/eclipse/jem/internal/proxy/remote/REMThrowableBeanTypeProxy.java
+++ /dev/null
@@ -1,68 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2001, 2005 IBM Corporation and others.
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
- *
- * Contributors:
- * IBM Corporation - initial API and implementation
- *******************************************************************************/
-package org.eclipse.jem.internal.proxy.remote;
-/*
-
-
- */
-
-
-import org.eclipse.jem.internal.proxy.core.*;
-/**
- * The Remote implementation of a Throwable bean type.
- */
-public class REMThrowableBeanTypeProxy extends REMAbstractBeanTypeProxy implements IREMSpecialBeanTypeProxy {
-
- protected REMThrowableBeanTypeProxy(REMProxyFactoryRegistry aRegistry, Integer anID, String aClassname, IBeanTypeProxy aSuperType) {
- super(aRegistry, anID, aClassname, aSuperType);
- }
-
- /**
- * Helper to create a bean proxy
- * Package protected because everyone should go through the factory API
- * that is defined as part of IBeanProxyFactory
- */
- REMThrowableBeanProxy createThrowableBeanProxy(Integer objectID) {
- return new REMThrowableBeanProxy(fRegistry, objectID, this);
- }
-
- /**
- * newBeanTypeForClass: Create a new beantypeproxy of this kind for the given class.
- * This is used by beantype proxy factory when creating a beantype proxy for a subclass.
- * This is because subclasses, unless explicitly overridden, should use the same kind
- * of beantype proxy. This way if anything special is needed for a specific type, then
- * that can be done.
- *
- * NOTE: All subclasses must override this to return the correct type of BeanTypeProxy.
- */
- public IREMBeanTypeProxy newBeanTypeForClass(Integer anID, String aClassname, boolean anAbstract) {
- return newBeanTypeForClass(anID, aClassname, anAbstract, this);
- }
-
- /**
- * The special method to handle subclassing from an abstract).
- */
- public IREMBeanTypeProxy newBeanTypeForClass(Integer anID, String aClassname, boolean anAbstract, IBeanTypeProxy superType) {
- // We can never have an interface of type Throwable since that doesn't exist.
- if (!anAbstract)
- return new REMThrowableBeanTypeProxy(fRegistry, anID, aClassname, superType);
- else
- return new REMAnAbstractBeanTypeProxy(fRegistry, anID, aClassname, superType, this);
- }
-
- /**
- * Specialized from REMAbstractBeanTypeProxy to ensure ExceptionBeanProxies are created correctly.
- */
- public IREMBeanProxy newBeanProxy(Integer objectID) {
- return createThrowableBeanProxy(objectID);
- }
-
-}
diff --git a/plugins/org.eclipse.jem.proxy/proxyRemote/org/eclipse/jem/internal/proxy/remote/REMVoidBeanTypeProxy.java b/plugins/org.eclipse.jem.proxy/proxyRemote/org/eclipse/jem/internal/proxy/remote/REMVoidBeanTypeProxy.java
deleted file mode 100644
index 1fb6c26..0000000
--- a/plugins/org.eclipse.jem.proxy/proxyRemote/org/eclipse/jem/internal/proxy/remote/REMVoidBeanTypeProxy.java
+++ /dev/null
@@ -1,83 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2001, 2005 IBM Corporation and others.
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
- *
- * Contributors:
- * IBM Corporation - initial API and implementation
- *******************************************************************************/
-package org.eclipse.jem.internal.proxy.remote;
-/*
-
-
- */
-
-
-import org.eclipse.jem.internal.proxy.core.*;
-import org.eclipse.jem.internal.proxy.common.remote.Commands;
-/**
- * BeanTypeProxy for representing the "void" type value, and a value of this type is "null".
- * Creation date: (2/11/00 2:26:47 PM)
- * @author: Richard Lee Kulp
- */
-final class REMVoidBeanTypeProxy extends REMAbstractBeanTypeProxy implements IREMConstantBeanTypeProxy {
-
-
-protected REMVoidBeanTypeProxy(REMProxyFactoryRegistry aRegistry) {
- super(aRegistry, new Integer(Commands.VOID_TYPE), Void.TYPE.getName(), null);
-}
-
-/**
- * Return the supertype for us
- * null/void has no superclass.
- * This is required as part of the interface
- */
-public IBeanTypeProxy getSuperBeanTypeProxy() {
- return null;
-}
-
-/**
- * Create a new bean proxy with the specified id.
- *
- * For void, this is an invalid operation. They are created
- * explicitly through the appropriate create method.
- */
-public IREMBeanProxy newBeanProxy(Integer anID) {
- throw new UnsupportedOperationException();
-}
-
-/**
- * newBeanTypeForClass: Create a new beantypeproxy of this kind for the given class.
- * This is used by beantype proxy factory when creating a beantype proxy for a subclass.
- * This is because subclasses, unless explicitly overridden, should use the same kind
- * of beantype proxy. This way if anything special is needed for a specific type, then
- * that can be done.
- *
- * For void is a final class, so you can't create a newBeanType
- * for subclasses.
- */
-public IREMBeanTypeProxy newBeanTypeForClass(Integer anID, String aClassname, boolean anAbstract) {
- throw new UnsupportedOperationException();
-}
-
-/**
- * newInstance method. void represents "null",
- * so return the null for this case because that is the default value.
- */
-public IBeanProxy newInstance() {
- return null;
-}
-
-/**
- * Create a new bean proxy the ValueObject passed in.
- * We will assume the object is correct type.
- */
-public IBeanProxy newBeanProxy(Commands.ValueObject value) {
- return newInstance();
-}
-
-}
-
-
diff --git a/plugins/org.eclipse.jem.proxy/proxyRemote/org/eclipse/jem/internal/proxy/remote/awt/REMDimensionBeanProxy.java b/plugins/org.eclipse.jem.proxy/proxyRemote/org/eclipse/jem/internal/proxy/remote/awt/REMDimensionBeanProxy.java
deleted file mode 100644
index fdd351b..0000000
--- a/plugins/org.eclipse.jem.proxy/proxyRemote/org/eclipse/jem/internal/proxy/remote/awt/REMDimensionBeanProxy.java
+++ /dev/null
@@ -1,68 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2001, 2005 IBM Corporation and others.
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
- *
- * Contributors:
- * IBM Corporation - initial API and implementation
- *******************************************************************************/
-package org.eclipse.jem.internal.proxy.remote.awt;
-/*
-
-
- */
-
-import org.eclipse.jem.internal.proxy.remote.*;
-import org.eclipse.jem.internal.proxy.awt.*;
-import org.eclipse.jem.internal.proxy.core.*;
-/**
- * The REM Bean Proxy for java.awt.Dimension.
- */
-public class REMDimensionBeanProxy extends REMBeanProxy implements IDimensionBeanProxy {
-
- protected REMDimensionBeanProxy(REMProxyFactoryRegistry aRegistry, Integer anID, IBeanTypeProxy aType) {
- super(aRegistry, anID, aType);
- }
-
- public int getHeight() {
- try {
- IIntegerBeanProxy h = (IIntegerBeanProxy) JavaStandardAwtBeanConstants.getConstants(fFactory).getDimensionHeightFieldProxy().get(this);
- return h.intValue();
- } catch (ThrowableProxy e) {
- return 0;
- }
- }
-
- public int getWidth() {
- try {
- IIntegerBeanProxy h = (IIntegerBeanProxy) JavaStandardAwtBeanConstants.getConstants(fFactory).getDimensionWidthFieldProxy().get(this);
- return h.intValue();
- } catch (ThrowableProxy e) {
- return 0;
- }
- }
-
- public void setHeight(int height) {
- try {
- JavaStandardAwtBeanConstants.getConstants(fFactory).getDimensionHeightFieldProxy().set(this, fFactory.getBeanProxyFactory().createBeanProxyWith(height));
- } catch (ThrowableProxy e) {
- }
- }
-
- public void setWidth(int width) {
- try {
- JavaStandardAwtBeanConstants.getConstants(fFactory).getDimensionWidthFieldProxy().set(this, fFactory.getBeanProxyFactory().createBeanProxyWith(width));
- } catch (ThrowableProxy e) {
- }
- }
-
- public void setSize(int width, int height) {
- JavaStandardAwtBeanConstants.getConstants(fFactory).getDimensionSetSizeHWProxy().invokeCatchThrowableExceptions(this, new IBeanProxy[] {fFactory.getBeanProxyFactory().createBeanProxyWith(width), fFactory.getBeanProxyFactory().createBeanProxyWith(height)});
- }
-
- public void setSize(IDimensionBeanProxy fromDimensionProxy) {
- JavaStandardAwtBeanConstants.getConstants(fFactory).getDimensionSetSizeDProxy().invokeCatchThrowableExceptions(this, fromDimensionProxy);
- }
-}
diff --git a/plugins/org.eclipse.jem.proxy/proxyRemote/org/eclipse/jem/internal/proxy/remote/awt/REMDimensionBeanTypeProxy.java b/plugins/org.eclipse.jem.proxy/proxyRemote/org/eclipse/jem/internal/proxy/remote/awt/REMDimensionBeanTypeProxy.java
deleted file mode 100644
index 7ea93de..0000000
--- a/plugins/org.eclipse.jem.proxy/proxyRemote/org/eclipse/jem/internal/proxy/remote/awt/REMDimensionBeanTypeProxy.java
+++ /dev/null
@@ -1,67 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2001, 2005 IBM Corporation and others.
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
- *
- * Contributors:
- * IBM Corporation - initial API and implementation
- *******************************************************************************/
-package org.eclipse.jem.internal.proxy.remote.awt;
-/*
-
-
- */
-
-import org.eclipse.jem.internal.proxy.remote.*;
-import org.eclipse.jem.internal.proxy.core.IBeanTypeProxy;
-/**
- * Beantype proxy for java.awt.Dimension
- */
-public class REMDimensionBeanTypeProxy extends REMAbstractBeanTypeProxy implements IREMSpecialBeanTypeProxy {
-
- protected REMDimensionBeanTypeProxy(REMProxyFactoryRegistry aRegistry, Integer anID, String aClassname, IBeanTypeProxy aSuperType) {
- super(aRegistry, anID, aClassname, aSuperType);
- }
-
- /**
- * Helper to create a bean proxy
- * Package protected because everyone should go through the factory API
- * that is defined as part of IBeanProxyFactory
- */
- REMDimensionBeanProxy createDimensionBeanProxy(Integer objectID) {
- return new REMDimensionBeanProxy(fRegistry, objectID, this);
- }
-
- /**
- * newBeanTypeForClass: Create a new beantypeproxy of this kind for the given class.
- * This is used by beantype proxy factory when creating a beantype proxy for a subclass.
- * This is because subclasses, unless explicitly overridden, should use the same kind
- * of beantype proxy. This way if anything special is needed for a specific type, then
- * that can be done.
- *
- * NOTE: All subclasses must override this to return the correct type of BeanTypeProxy.
- */
- public IREMBeanTypeProxy newBeanTypeForClass(Integer anID, String aClassname, boolean anAbstract) {
- return newBeanTypeForClass(anID, aClassname, anAbstract, this);
- }
-
- /**
- * The special method to handle subclassing from an abstract).
- */
- public IREMBeanTypeProxy newBeanTypeForClass(Integer anID, String aClassname, boolean anAbstract, IBeanTypeProxy superType) {
- if (!anAbstract)
- return new REMDimensionBeanTypeProxy(fRegistry, anID, aClassname, superType);
- else
- return new REMAnAbstractBeanTypeProxy(fRegistry, anID, aClassname, superType, this);
- }
-
- /**
- * Specialized from REMAbstractBeanTypeProxy to ensure ExceptionBeanProxies are created correctly.
- */
- public IREMBeanProxy newBeanProxy(Integer objectID) {
- return createDimensionBeanProxy(objectID);
- }
-
-}
diff --git a/plugins/org.eclipse.jem.proxy/proxyRemote/org/eclipse/jem/internal/proxy/remote/awt/REMPointBeanProxy.java b/plugins/org.eclipse.jem.proxy/proxyRemote/org/eclipse/jem/internal/proxy/remote/awt/REMPointBeanProxy.java
deleted file mode 100644
index c817747..0000000
--- a/plugins/org.eclipse.jem.proxy/proxyRemote/org/eclipse/jem/internal/proxy/remote/awt/REMPointBeanProxy.java
+++ /dev/null
@@ -1,71 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2001, 2005 IBM Corporation and others.
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
- *
- * Contributors:
- * IBM Corporation - initial API and implementation
- *******************************************************************************/
-package org.eclipse.jem.internal.proxy.remote.awt;
-/*
-
-
- */
-
-import org.eclipse.jem.internal.proxy.remote.*;
-import org.eclipse.jem.internal.proxy.awt.*;
-import org.eclipse.jem.internal.proxy.core.*;
-
-/**
- * The REM Bean Proxy for java.awt.Point.
- */
-public class REMPointBeanProxy extends REMBeanProxy implements IPointBeanProxy {
-
- protected REMPointBeanProxy(REMProxyFactoryRegistry aRegistry, Integer anID, IBeanTypeProxy aType) {
- super(aRegistry, anID, aType);
- }
-
- public int getX() {
- try {
- IIntegerBeanProxy h = (IIntegerBeanProxy) JavaStandardAwtBeanConstants.getConstants(fFactory).getPointXFieldProxy().get(this);
- return h.intValue();
- } catch (ThrowableProxy e) {
- return 0;
- }
- }
-
- public int getY() {
- try {
- IIntegerBeanProxy h = (IIntegerBeanProxy) JavaStandardAwtBeanConstants.getConstants(fFactory).getPointYFieldProxy().get(this);
- return h.intValue();
- } catch (ThrowableProxy e) {
- return 0;
- }
- }
-
- public void setX(int x) {
- try {
- JavaStandardAwtBeanConstants.getConstants(fFactory).getPointXFieldProxy().set(this, fFactory.getBeanProxyFactory().createBeanProxyWith(x));
- } catch (ThrowableProxy e) {
- }
- }
-
- public void setY(int y) {
- try {
- JavaStandardAwtBeanConstants.getConstants(fFactory).getPointYFieldProxy().set(this, fFactory.getBeanProxyFactory().createBeanProxyWith(y));
- } catch (ThrowableProxy e) {
- }
- }
-
- public void setLocation(int x, int y) {
- JavaStandardAwtBeanConstants.getConstants(fFactory).getPointSetLocationXYProxy().invokeCatchThrowableExceptions(this, new IBeanProxy[] {fFactory.getBeanProxyFactory().createBeanProxyWith(x), fFactory.getBeanProxyFactory().createBeanProxyWith(y)});
- }
-
- public void setLocation(IPointBeanProxy fromPointProxy) {
- JavaStandardAwtBeanConstants.getConstants(fFactory).getPointSetLocationPProxy().invokeCatchThrowableExceptions(this, fromPointProxy);
- }
-}
-
-
diff --git a/plugins/org.eclipse.jem.proxy/proxyRemote/org/eclipse/jem/internal/proxy/remote/awt/REMPointBeanTypeProxy.java b/plugins/org.eclipse.jem.proxy/proxyRemote/org/eclipse/jem/internal/proxy/remote/awt/REMPointBeanTypeProxy.java
deleted file mode 100644
index e0768ef..0000000
--- a/plugins/org.eclipse.jem.proxy/proxyRemote/org/eclipse/jem/internal/proxy/remote/awt/REMPointBeanTypeProxy.java
+++ /dev/null
@@ -1,67 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2001, 2005 IBM Corporation and others.
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
- *
- * Contributors:
- * IBM Corporation - initial API and implementation
- *******************************************************************************/
-package org.eclipse.jem.internal.proxy.remote.awt;
-/*
-
-
- */
-
-import org.eclipse.jem.internal.proxy.remote.*;
-import org.eclipse.jem.internal.proxy.core.IBeanTypeProxy;
-/**
- * Beantype proxy for java.awt.Dimension
- */
-public class REMPointBeanTypeProxy extends REMAbstractBeanTypeProxy implements IREMSpecialBeanTypeProxy {
-
- protected REMPointBeanTypeProxy(REMProxyFactoryRegistry aRegistry, Integer anID, String aClassname, IBeanTypeProxy aSuperType) {
- super(aRegistry, anID, aClassname, aSuperType);
- }
-
- /**
- * Helper to create a bean proxy
- * Package protected because everyone should go through the factory API
- * that is defined as part of IBeanProxyFactory
- */
- REMPointBeanProxy createPointBeanProxy(Integer objectID) {
- return new REMPointBeanProxy(fRegistry, objectID, this);
- }
-
- /**
- * newBeanTypeForClass: Create a new beantypeproxy of this kind for the given class.
- * This is used by beantype proxy factory when creating a beantype proxy for a subclass.
- * This is because subclasses, unless explicitly overridden, should use the same kind
- * of beantype proxy. This way if anything special is needed for a specific type, then
- * that can be done.
- *
- * NOTE: All subclasses must override this to return the correct type of BeanTypeProxy.
- */
- public IREMBeanTypeProxy newBeanTypeForClass(Integer anID, String aClassname, boolean anAbstract) {
- return newBeanTypeForClass(anID, aClassname, anAbstract, this);
- }
-
- /**
- * The special method to handle subclassing from an abstract).
- */
- public IREMBeanTypeProxy newBeanTypeForClass(Integer anID, String aClassname, boolean anAbstract, IBeanTypeProxy superType) {
- if (!anAbstract)
- return new REMPointBeanTypeProxy(fRegistry, anID, aClassname, superType);
- else
- return new REMAnAbstractBeanTypeProxy(fRegistry, anID, aClassname, superType, this);
- }
-
- /**
- * Specialized from REMAbstractBeanTypeProxy to ensure ExceptionBeanProxies are created correctly.
- */
- public IREMBeanProxy newBeanProxy(Integer objectID) {
- return createPointBeanProxy(objectID);
- }
-
-}
diff --git a/plugins/org.eclipse.jem.proxy/proxyRemote/org/eclipse/jem/internal/proxy/remote/awt/REMRectangleBeanProxy.java b/plugins/org.eclipse.jem.proxy/proxyRemote/org/eclipse/jem/internal/proxy/remote/awt/REMRectangleBeanProxy.java
deleted file mode 100644
index 96ee2ec..0000000
--- a/plugins/org.eclipse.jem.proxy/proxyRemote/org/eclipse/jem/internal/proxy/remote/awt/REMRectangleBeanProxy.java
+++ /dev/null
@@ -1,120 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2001, 2005 IBM Corporation and others.
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
- *
- * Contributors:
- * IBM Corporation - initial API and implementation
- *******************************************************************************/
-package org.eclipse.jem.internal.proxy.remote.awt;
-/*
-
-
- */
-
-
-import org.eclipse.jem.internal.proxy.remote.*;
-import org.eclipse.jem.internal.proxy.awt.*;
-import org.eclipse.jem.internal.proxy.core.*;
-/**
- * The REM Bean Proxy for java.awt.Rectangle.
- */
-public class REMRectangleBeanProxy extends REMBeanProxy implements IRectangleBeanProxy {
-
- protected REMRectangleBeanProxy(REMProxyFactoryRegistry aRegistry, Integer anID, IBeanTypeProxy aType) {
- super(aRegistry, anID, aType);
- }
-
- public int getX() {
- try {
- IIntegerBeanProxy h = (IIntegerBeanProxy) JavaStandardAwtBeanConstants.getConstants(fFactory).getRectangleXFieldProxy().get(this);
- return h.intValue();
- } catch (ThrowableProxy e) {
- return 0;
- }
- }
-
- public int getY() {
- try {
- IIntegerBeanProxy h = (IIntegerBeanProxy) JavaStandardAwtBeanConstants.getConstants(fFactory).getRectangleYFieldProxy().get(this);
- return h.intValue();
- } catch (ThrowableProxy e) {
- return 0;
- }
- }
-
- public void setX(int x) {
- try {
- JavaStandardAwtBeanConstants.getConstants(fFactory).getRectangleXFieldProxy().set(this, fFactory.getBeanProxyFactory().createBeanProxyWith(x));
- } catch (ThrowableProxy e) {
- }
- }
-
- public void setY(int y) {
- try {
- JavaStandardAwtBeanConstants.getConstants(fFactory).getRectangleYFieldProxy().set(this, fFactory.getBeanProxyFactory().createBeanProxyWith(y));
- } catch (ThrowableProxy e) {
- }
- }
-
- public void setLocation(int x, int y) {
- JavaStandardAwtBeanConstants.getConstants(fFactory).getRectangleSetLocationXYProxy().invokeCatchThrowableExceptions(this, new IBeanProxy[] {fFactory.getBeanProxyFactory().createBeanProxyWith(x), fFactory.getBeanProxyFactory().createBeanProxyWith(y)});
- }
-
- public void setLocation(IPointBeanProxy fromPointProxy) {
- JavaStandardAwtBeanConstants.getConstants(fFactory).getRectangleSetLocationPProxy().invokeCatchThrowableExceptions(this, fromPointProxy);
- }
-
-
- public int getHeight() {
- try {
- IIntegerBeanProxy h = (IIntegerBeanProxy) JavaStandardAwtBeanConstants.getConstants(fFactory).getRectangleHeightFieldProxy().get(this);
- return h.intValue();
- } catch (ThrowableProxy e) {
- return 0;
- }
- }
-
- public int getWidth() {
- try {
- IIntegerBeanProxy h = (IIntegerBeanProxy) JavaStandardAwtBeanConstants.getConstants(fFactory).getRectangleWidthFieldProxy().get(this);
- return h.intValue();
- } catch (ThrowableProxy e) {
- return 0;
- }
- }
-
- public void setHeight(int height) {
- try {
- JavaStandardAwtBeanConstants.getConstants(fFactory).getRectangleHeightFieldProxy().set(this, fFactory.getBeanProxyFactory().createBeanProxyWith(height));
- } catch (ThrowableProxy e) {
- }
- }
-
- public void setWidth(int width) {
- try {
- JavaStandardAwtBeanConstants.getConstants(fFactory).getRectangleWidthFieldProxy().set(this, fFactory.getBeanProxyFactory().createBeanProxyWith(width));
- } catch (ThrowableProxy e) {
- }
- }
-
- public void setSize(int width, int height) {
- JavaStandardAwtBeanConstants.getConstants(fFactory).getRectangleSetSizeHWProxy().invokeCatchThrowableExceptions(this, new IBeanProxy[] {fFactory.getBeanProxyFactory().createBeanProxyWith(width), fFactory.getBeanProxyFactory().createBeanProxyWith(height)});
- }
-
- public void setSize(IDimensionBeanProxy fromDimensionProxy) {
- JavaStandardAwtBeanConstants.getConstants(fFactory).getRectangleSetSizeDProxy().invokeCatchThrowableExceptions(this, fromDimensionProxy);
- }
-
- public void setBounds(int x, int y, int width, int height) {
- JavaStandardAwtBeanConstants.getConstants(fFactory).getRectangleSetBoundsXYHWProxy().invokeCatchThrowableExceptions(this, new IBeanProxy[] {fFactory.getBeanProxyFactory().createBeanProxyWith(x), fFactory.getBeanProxyFactory().createBeanProxyWith(y), fFactory.getBeanProxyFactory().createBeanProxyWith(width), fFactory.getBeanProxyFactory().createBeanProxyWith(height)});
- }
-
- public void setBounds(IRectangleBeanProxy fromRectangleProxy) {
- JavaStandardAwtBeanConstants.getConstants(fFactory).getRectangleSetBoundsRProxy().invokeCatchThrowableExceptions(this, fromRectangleProxy);
- }
-}
-
-
diff --git a/plugins/org.eclipse.jem.proxy/proxyRemote/org/eclipse/jem/internal/proxy/remote/awt/REMRectangleBeanTypeProxy.java b/plugins/org.eclipse.jem.proxy/proxyRemote/org/eclipse/jem/internal/proxy/remote/awt/REMRectangleBeanTypeProxy.java
deleted file mode 100644
index e272f50..0000000
--- a/plugins/org.eclipse.jem.proxy/proxyRemote/org/eclipse/jem/internal/proxy/remote/awt/REMRectangleBeanTypeProxy.java
+++ /dev/null
@@ -1,67 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2001, 2005 IBM Corporation and others.
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
- *
- * Contributors:
- * IBM Corporation - initial API and implementation
- *******************************************************************************/
-package org.eclipse.jem.internal.proxy.remote.awt;
-/*
-
-
- */
-
-import org.eclipse.jem.internal.proxy.remote.*;
-import org.eclipse.jem.internal.proxy.core.IBeanTypeProxy;
-/**
- * Beantype proxy for java.awt.Dimension
- */
-public class REMRectangleBeanTypeProxy extends REMAbstractBeanTypeProxy implements IREMSpecialBeanTypeProxy {
-
- protected REMRectangleBeanTypeProxy(REMProxyFactoryRegistry aRegistry, Integer anID, String aClassname, IBeanTypeProxy aSuperType) {
- super(aRegistry, anID, aClassname, aSuperType);
- }
-
- /**
- * Helper to create a bean proxy
- * Package protected because everyone should go through the factory API
- * that is defined as part of IBeanProxyFactory
- */
- REMRectangleBeanProxy createRectangleBeanProxy(Integer objectID) {
- return new REMRectangleBeanProxy(fRegistry, objectID, this);
- }
-
- /**
- * newBeanTypeForClass: Create a new beantypeproxy of this kind for the given class.
- * This is used by beantype proxy factory when creating a beantype proxy for a subclass.
- * This is because subclasses, unless explicitly overridden, should use the same kind
- * of beantype proxy. This way if anything special is needed for a specific type, then
- * that can be done.
- *
- * NOTE: All subclasses must override this to return the correct type of BeanTypeProxy.
- */
- public IREMBeanTypeProxy newBeanTypeForClass(Integer anID, String aClassname, boolean anAbstract) {
- return newBeanTypeForClass(anID, aClassname, anAbstract, this);
- }
-
- /**
- * The special method to handle subclassing from an abstract).
- */
- public IREMBeanTypeProxy newBeanTypeForClass(Integer anID, String aClassname, boolean anAbstract, IBeanTypeProxy superType) {
- if (!anAbstract)
- return new REMRectangleBeanTypeProxy(fRegistry, anID, aClassname, superType);
- else
- return new REMAnAbstractBeanTypeProxy(fRegistry, anID, aClassname, superType, this);
- }
-
- /**
- * Specialized from REMAbstractBeanTypeProxy to ensure ExceptionBeanProxies are created correctly.
- */
- public IREMBeanProxy newBeanProxy(Integer objectID) {
- return createRectangleBeanProxy(objectID);
- }
-
-}
diff --git a/plugins/org.eclipse.jem.proxy/proxyRemote/org/eclipse/jem/internal/proxy/remote/awt/REMRegisterAWT.java b/plugins/org.eclipse.jem.proxy/proxyRemote/org/eclipse/jem/internal/proxy/remote/awt/REMRegisterAWT.java
deleted file mode 100644
index 2734556..0000000
--- a/plugins/org.eclipse.jem.proxy/proxyRemote/org/eclipse/jem/internal/proxy/remote/awt/REMRegisterAWT.java
+++ /dev/null
@@ -1,38 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2001, 2005 IBM Corporation and others.
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
- *
- * Contributors:
- * IBM Corporation - initial API and implementation
- *******************************************************************************/
-package org.eclipse.jem.internal.proxy.remote.awt;
-/*
-
-
- */
-
-import org.eclipse.jem.internal.proxy.core.IBeanTypeProxy;
-import org.eclipse.jem.internal.proxy.core.IMethodProxy;
-import org.eclipse.jem.internal.proxy.remote.REMProxyFactoryRegistry;
-/**
- * This class is used to register the AWT factories. It is not
- * meant to be called by anyone other than ProxyVMStarter.
- */
-public final class REMRegisterAWT {
- public static void registerAWT(REMProxyFactoryRegistry registry) {
- new REMStandardAWTBeanTypeProxyFactory(registry);
- new REMStandardAWTBeanProxyFactory(registry);
-
- // If we are doing AWT, get the AWT event queue going. This is trying to be a time-saver
- // by having it up right away.
- IBeanTypeProxy starterBeanType = registry.getBeanTypeProxyFactory().getBeanTypeProxy("org.eclipse.jem.internal.proxy.vm.remote.AWTStarter"); //$NON-NLS-1$
- if (starterBeanType != null) {
- IMethodProxy starter = starterBeanType.getMethodProxy("startAWT"); //$NON-NLS-1$
- if (starter != null)
- starter.invokeCatchThrowableExceptions(null);
- }
- }
-}
diff --git a/plugins/org.eclipse.jem.proxy/proxyRemote/org/eclipse/jem/internal/proxy/remote/awt/REMStandardAWTBeanProxyFactory.java b/plugins/org.eclipse.jem.proxy/proxyRemote/org/eclipse/jem/internal/proxy/remote/awt/REMStandardAWTBeanProxyFactory.java
deleted file mode 100644
index 6e938c4..0000000
--- a/plugins/org.eclipse.jem.proxy/proxyRemote/org/eclipse/jem/internal/proxy/remote/awt/REMStandardAWTBeanProxyFactory.java
+++ /dev/null
@@ -1,74 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2001, 2005 IBM Corporation and others.
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
- *
- * Contributors:
- * IBM Corporation - initial API and implementation
- *******************************************************************************/
-package org.eclipse.jem.internal.proxy.remote.awt;
-/*
-
-
- */
-
-import org.eclipse.jem.internal.proxy.awt.*;
-import org.eclipse.jem.internal.proxy.core.*;
-import org.eclipse.jem.internal.proxy.remote.REMProxyFactoryRegistry;
-
-/**
- * Standard AWT Bean Proxy Factory.
- * Package protected because it should not referenced
- * outside of the package other than through the interface.
- */
-class REMStandardAWTBeanProxyFactory implements IStandardAwtBeanProxyFactory {
-
- final IStandardBeanTypeProxyFactory fBeanTypeFactory;
-
- public REMStandardAWTBeanProxyFactory(REMProxyFactoryRegistry factory) {
- factory.registerBeanProxyFactory(IStandardAwtBeanProxyFactory.REGISTRY_KEY, this);
- fBeanTypeFactory = factory.getBeanTypeProxyFactory();
- }
-
- public IDimensionBeanProxy createDimensionBeanProxyWith(int width, int height){
- try {
- return (IDimensionBeanProxy) fBeanTypeFactory.getBeanTypeProxy("java.awt.Dimension").newInstance("new java.awt.Dimension("+width+","+height+")"); //$NON-NLS-1$ //$NON-NLS-2$ //$NON-NLS-3$ //$NON-NLS-4$
- } catch (ThrowableProxy e) {
- return null;
- } catch (InstantiationException e) {
- return null; // Shouldn't occur
- }
- }
-
- public IPointBeanProxy createPointBeanProxyWith(int x, int y){
- try {
- return (IPointBeanProxy) fBeanTypeFactory.getBeanTypeProxy("java.awt.Point").newInstance("new java.awt.Point("+x+","+y+")"); //$NON-NLS-1$ //$NON-NLS-2$ //$NON-NLS-3$ //$NON-NLS-4$
- } catch (ThrowableProxy e) {
- return null;
- } catch (InstantiationException e) {
- return null; // Shouldn't occur
- }
-
- }
-
- public IRectangleBeanProxy createBeanProxyWith(int x, int y, int width, int height){
- try {
- return (IRectangleBeanProxy) fBeanTypeFactory.getBeanTypeProxy("java.awt.Rectangle").newInstance("new java.awt.Rectangle("+x+","+y+","+width+","+height+")"); //$NON-NLS-1$ //$NON-NLS-2$ //$NON-NLS-3$ //$NON-NLS-4$ //$NON-NLS-5$ //$NON-NLS-6$
- } catch (ThrowableProxy e) {
- return null;
- } catch (InstantiationException e) {
- return null; // Shouldn't occur
- }
-
- }
-
- /*
- * Terminate this factory. Since it doesn't hold onto anything other than the beantype factory,
- * and nothing will be holding onto this factory, nothing needs to be done. It will be GC'd.
- */
- public void terminateFactory(boolean wait) {
- }
-
-}
diff --git a/plugins/org.eclipse.jem.proxy/proxyRemote/org/eclipse/jem/internal/proxy/remote/awt/REMStandardAWTBeanTypeProxyFactory.java b/plugins/org.eclipse.jem.proxy/proxyRemote/org/eclipse/jem/internal/proxy/remote/awt/REMStandardAWTBeanTypeProxyFactory.java
deleted file mode 100644
index 2e6d50f..0000000
--- a/plugins/org.eclipse.jem.proxy/proxyRemote/org/eclipse/jem/internal/proxy/remote/awt/REMStandardAWTBeanTypeProxyFactory.java
+++ /dev/null
@@ -1,82 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2001, 2005 IBM Corporation and others.
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
- *
- * Contributors:
- * IBM Corporation - initial API and implementation
- *******************************************************************************/
-/*
-
-
- */
-package org.eclipse.jem.internal.proxy.remote.awt;
-
-
-import org.eclipse.jem.internal.proxy.core.*;
-import org.eclipse.jem.internal.proxy.core.IBeanTypeProxy;
-import org.eclipse.jem.internal.proxy.remote.*;
-
-/**
- * BeanType factory standard AWT bean types. This is package protected because it shouldn't be referenced outside the package. It should only be
- * accessed through the interface.
- */
-class REMStandardAWTBeanTypeProxyFactory implements IREMBeanTypeProxyFactory {
-
- static final String BEAN_TYPE_FACTORY_KEY = "java.awt"; //$NON-NLS-1$
-
- protected final REMProxyFactoryRegistry fFactoryRegistry;
-
- REMStandardAWTBeanTypeProxyFactory(REMProxyFactoryRegistry aRegistry) {
- fFactoryRegistry = aRegistry;
- fFactoryRegistry.registerBeanTypeProxyFactory(BEAN_TYPE_FACTORY_KEY, this);
- }
-
- /*
- * (non-Javadoc)
- *
- * @see org.eclipse.jem.internal.proxy.remote.IREMBeanTypeProxyFactory#getExtensionBeanTypeProxy(java.lang.String)
- */
- public IREMBeanTypeProxy getExtensionBeanTypeProxy(String className) {
- return null;
- }
-
- /*
- * (non-Javadoc)
- *
- * @see org.eclipse.jem.internal.proxy.remote.IREMBeanTypeProxyFactory#getExtensionBeanTypeProxy(java.lang.String, java.lang.Integer,
- * org.eclipse.jem.internal.proxy.core.IBeanTypeProxy)
- */
- public IREMBeanTypeProxy getExtensionBeanTypeProxy(String className, Integer classID, IBeanTypeProxy superType) {
-
- if ("java.awt.Dimension".equals(className)) //$NON-NLS-1$
- return new REMDimensionBeanTypeProxy(fFactoryRegistry, classID, className, superType);
- else if ("java.awt.Point".equals(className)) //$NON-NLS-1$
- return new REMPointBeanTypeProxy(fFactoryRegistry, classID, className, superType);
- else if ("java.awt.Rectangle".equals(className)) //$NON-NLS-1$
- return new REMRectangleBeanTypeProxy(fFactoryRegistry, classID, className, superType);
- else
- return null;
- }
-
- /*
- * (non-Javadoc)
- *
- * @see org.eclipse.jem.internal.proxy.remote.IREMBeanTypeProxyFactory#getExtensionBeanTypeProxy(java.lang.String,
- * org.eclipse.jem.internal.proxy.core.IExpression)
- */
- public IProxyBeanType getExtensionBeanTypeProxy(String typeName, IExpression expression) {
- return getExtensionBeanTypeProxy(typeName);
- }
-
- /*
- * (non-Javadoc)
- *
- * @see org.eclipse.jem.internal.proxy.core.IBeanProxyFactory#terminateFactory(boolean)
- */
- public void terminateFactory(boolean wait) {
- }
-
-}
diff --git a/plugins/org.eclipse.jem.proxy/proxyRemote/org/eclipse/jem/internal/proxy/remote/messages.properties b/plugins/org.eclipse.jem.proxy/proxyRemote/org/eclipse/jem/internal/proxy/remote/messages.properties
deleted file mode 100644
index fca5f07..0000000
--- a/plugins/org.eclipse.jem.proxy/proxyRemote/org/eclipse/jem/internal/proxy/remote/messages.properties
+++ /dev/null
@@ -1,67 +0,0 @@
-###############################################################################
-# Copyright (c) 2003, 2005 IBM Corporation and others.
-# All rights reserved. This program and the accompanying materials
-# are made available under the terms of the Eclipse Public License v1.0
-# which accompanies this distribution, and is available at
-# http://www.eclipse.org/legal/epl-v10.html
-#
-# Contributors:
-# IBM Corporation - initial API and implementation
-###############################################################################
-#
-# $Source: /cvsroot/webtools/jeetools.move/webtools.javaee.git/plugins/org.eclipse.jem.proxy/proxyRemote/org/eclipse/jem/internal/proxy/remote/messages.properties,v $
-# $Revision: 1.17 $ $Date: 2006/09/14 18:29:35 $
-#
-
-
-
-# Exception message - {0} is the name of a project within Eclipse.
-NO_OUTPUT_FOLDER_EXC_ = IWAV0071E No output folder for project "{0}."
-
-# These are lines that are placed into a log file listing the outputs from the two different streams.
-VM_TERMINATED_INFO_ = IWAV0072I Remote VM terminated before any commands can be sent. Following are the error and output streams.
-VM_TERMINATED_LINE1 = -- Error Stream --
-VM_TERMINATED_LINE2 = -- Output Stream --
-VM_TERMINATED_LINE3 = -- End of Stream Output --
-
-# These are the headers for two parts of a stack trace of an exception. The first one is the trace from the remote system.
-# The second is the trace from the local system.
-REMOTE_VM_TRACE_INFO_ = IWAV0073I *** RemoteVM Exception - Trace from Remote VM:
-REMOTE_VM_LOCAL_TRACE_INFO_ = IWAV0074I *** Local StackTrace:
-
-# In the two below, {0} is a string that is a java creation string, e.g. "new Integer(3)", so they don't participate in translation.
-# In Classcast, {1} is a java type name, e.g. java.lang.Integer.
-Classcast_EXC_ = IWAV0124E "{0}" does not evaluate to an object of type {1}
-Instantiate_EXC_ = IWAV0125E "{0}" is too complicated to be evaluated
-
-# {0} is a number, e.g. 1, 2, ...
-RemoteCmd_EXC_ = IWAV0126E Remote command error {0}
-
-# The following is an exception error where {0} is the name of the class of the exception and {1} is the message from the exception
-# The message {1} has already been localized (if it supplied it localized). It comes from somewhere outside of our project.
-ExceptionErrorMsg_EXC_ = IWAV0135E {0}({1})
-OK_7 = OK
-Proxy_NoRunner_ERROR_ = IWAV0137E Could not find a Run type runner to launch for \"{0}\".
-Proxy_Error_Title = Error:
-Proxy_Terminated_too_soon_ERROR_ = IWAV0138E Remote VM terminated too soon. See .log file for trace of output. For VM \"{0}\".
-# This is a launch name for a given project name ({0}).
-# WARNING for the ProxyRemoteVMName and ProxyRemoteVMNameWithComment do not use double-quote ("). It will cause problems.
-ProxyRemoteVMName = Project ({0})
-# This is a launch name that has a comment ({0} is project name, {1} is the comment for this project launch)
-ProxyRemoteVMNameWithComment = Project ({0})-{1}
-
-ProxyRemoteNoLaunchKey = Cannot launch local proxy registry. Not launched from valid launcher.
-
-# {0} is the appropriate VMName from the above two entries.
-ProxyRemoteLaunchVM = Launching remote vm "{0}"
-
-CleanupJob_title = Remote VM Cleanup GC'd Proxies Job
-
-REMProxyFactoryRegistry_CallbackConnectionNotWorking_EXC_ = IWAV0169E Callback connection is not working.
-REMProxyFactoryRegistry_ConnectionCreationFailed_INFO_ = IWAV0170I Connection creation failed.
-REMProxyFactoryRegistry_Job_TerminateProcess_Title=Terminate the remote vm process.
-REMProxyFactoryRegistry_CouldNotCreateSocketConnectionToRemoteVM_EXC_ = IWAV0171E Could not create a socket connection to remote vm. This is often due to your firewall blocking access from your java to do local access.
-REMExpression_IOExceptionSeeLog_INFO_ = IWAV0172I I/O Exception occurred. See .log file for details.
-REMExpression_CommandExceptionSeeLog_INFO_ = IWAV0173I Command Exception occurred. See .log file for details.
-LocalProxyLaunchDelegate_Monitor_PrintRemoteTrace_Text=Print remote vm trace output
-VM_COMMAND_LINE=Remote VM Commandline:
diff --git a/plugins/org.eclipse.jem.proxy/proxyide/org/eclipse/jem/internal/proxy/ide/IDEAccessibleObjectProxy.java b/plugins/org.eclipse.jem.proxy/proxyide/org/eclipse/jem/internal/proxy/ide/IDEAccessibleObjectProxy.java
deleted file mode 100644
index 66fdfcf..0000000
--- a/plugins/org.eclipse.jem.proxy/proxyide/org/eclipse/jem/internal/proxy/ide/IDEAccessibleObjectProxy.java
+++ /dev/null
@@ -1,56 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2004, 2005 IBM Corporation and others.
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
- *
- * Contributors:
- * IBM Corporation - initial API and implementation
- *******************************************************************************/
-/*
-
-
- */
-package org.eclipse.jem.internal.proxy.ide;
-
-import java.lang.reflect.AccessibleObject;
-
-import org.eclipse.jem.internal.proxy.core.*;
-
-/**
- *
- * @since 1.0.0
- */
-public class IDEAccessibleObjectProxy extends IDEBeanProxy implements IAccessibleObjectProxy {
-
- protected IDEAccessibleObjectProxy(IDEProxyFactoryRegistry aProxyFactoryRegistry) {
- super(aProxyFactoryRegistry);
- }
-
- protected IDEAccessibleObjectProxy(IDEProxyFactoryRegistry aProxyFactoryRegistry, Object anObject) {
- super(aProxyFactoryRegistry, anObject);
- }
-
- /* (non-Javadoc)
- * @see org.eclipse.jem.internal.proxy.core.IAccessibleObjectProxy#isAccessible()
- */
- public boolean isAccessible() throws ThrowableProxy {
- return ((AccessibleObject) getBean()).isAccessible();
- }
-
- /* (non-Javadoc)
- * @see org.eclipse.jem.internal.proxy.core.IAccessibleObjectProxy#setAccessible(boolean)
- */
- public void setAccessible(boolean flag) throws ThrowableProxy {
- ((AccessibleObject) getBean()).setAccessible(flag);
- }
-
- /* (non-Javadoc)
- * @see org.eclipse.jem.internal.proxy.core.IBeanProxy#getTypeProxy()
- */
- public IBeanTypeProxy getTypeProxy() {
- return ((IDEMethodProxyFactory) fProxyFactoryRegistry.getMethodProxyFactory()).accessibleType;
- }
-
-}
diff --git a/plugins/org.eclipse.jem.proxy/proxyide/org/eclipse/jem/internal/proxy/ide/IDEArrayBeanProxy.java b/plugins/org.eclipse.jem.proxy/proxyide/org/eclipse/jem/internal/proxy/ide/IDEArrayBeanProxy.java
deleted file mode 100644
index 1d32446..0000000
--- a/plugins/org.eclipse.jem.proxy/proxyide/org/eclipse/jem/internal/proxy/ide/IDEArrayBeanProxy.java
+++ /dev/null
@@ -1,322 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2001, 2005 IBM Corporation and others.
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
- *
- * Contributors:
- * IBM Corporation - initial API and implementation
- *******************************************************************************/
-package org.eclipse.jem.internal.proxy.ide;
-/*
-
-
- */
-
-import org.eclipse.jem.internal.proxy.core.*;
-import java.lang.reflect.*;
-import java.util.Arrays;
-
-import org.eclipse.core.runtime.IStatus;
-import org.eclipse.core.runtime.Status;
-/**
- * IDE VM version of the Array proxy
- */
-
-public final class IDEArrayBeanProxy extends IDEObjectBeanProxy implements IArrayBeanProxy {
-
- private IDEStandardBeanTypeProxyFactory fBeanTypeProxyFactory;
-
-IDEArrayBeanProxy(IDEProxyFactoryRegistry aRegistry, Object array,IBeanTypeProxy aType) {
- super(aRegistry, array ,aType);
- fBeanTypeProxyFactory = (IDEStandardBeanTypeProxyFactory)aRegistry.getBeanTypeProxyFactory();
-}
-
-/* (non-Javadoc)
- * @see org.eclipse.jem.internal.proxy.ide.IDEBeanProxy#equals(java.lang.Object)
- */
-public boolean equals(Object obj) {
- if (super.equals(obj))
- return true;
- if (!(obj instanceof IDEArrayBeanProxy))
- return false;
- Object arrayBean = ((IDEArrayBeanProxy) obj).getBean();
-
- if (getBean() == null || arrayBean == null)
- return false;
- Object thisArrayBean = getBean();
- Class aclass = thisArrayBean.getClass();
- Class bclass = arrayBean.getClass();
- Class acomp = aclass.getComponentType();
- Class bcomp = bclass.getComponentType();
- if (acomp.isPrimitive() || bcomp.isPrimitive()) {
- if (acomp != bcomp)
- return false;
- if (acomp == Integer.TYPE)
- return Arrays.equals((int[]) thisArrayBean, (int[]) arrayBean);
- else if (acomp == Boolean.TYPE)
- return Arrays.equals((boolean[]) thisArrayBean, (boolean[]) arrayBean);
- else if (acomp == Long.TYPE)
- return Arrays.equals((long[]) thisArrayBean, (long[]) arrayBean);
- else if (acomp == Short.TYPE)
- return Arrays.equals((short[]) thisArrayBean, (short[]) arrayBean);
- else if (acomp == Double.TYPE)
- return Arrays.equals((double[]) thisArrayBean, (double[]) arrayBean);
- else if (acomp == Float.TYPE)
- return Arrays.equals((float[]) thisArrayBean, (float[]) arrayBean);
- else if (acomp == Character.TYPE)
- return Arrays.equals((char[]) thisArrayBean, (char[]) arrayBean);
- else if (acomp == Byte.TYPE)
- return Arrays.equals((byte[]) thisArrayBean, (byte[]) arrayBean);
- else
- return false;
- } else
- return Arrays.equals((Object[]) thisArrayBean, (Object[]) arrayBean);
-}
-/**
- * Get the object at the specified index.
- */
-public IBeanProxy get(int index) throws ThrowableProxy {
- // If the component type is primitive, we need to use the correct getter so that a valid value is returned,
- // if we just used the standard get, if the type was "int" the value returned would be an java.lang.Integer.
- IBeanTypeProxy compType = ((IArrayBeanTypeProxy) getTypeProxy()).getComponentType();
- if (!compType.isPrimitive()) {
- // Use standard getter.
- Object result = Array.get(fBean,index);
- if ( result == null ) return null;
- return ((IDEBeanTypeProxy)fBeanTypeProxyFactory.getBeanTypeProxy(result.getClass())).newBeanProxy(result);
- } else {
- // Use the correct primitive getter.
- int id = ((IDEPrimitiveBeanTypeProxy)compType).getPrimitiveType();
- switch (id) {
- case IDEPrimitiveBeanTypeProxy.BYTE:
- return fBeanTypeProxyFactory.byteType.createByteBeanProxy(Array.getByte(fBean,index));
- case IDEPrimitiveBeanTypeProxy.BOOLEAN:
- return fBeanTypeProxyFactory.booleanType.createBooleanBeanProxy(Array.getBoolean(fBean,index));
- case IDEPrimitiveBeanTypeProxy.CHAR:
- return fBeanTypeProxyFactory.charType.createCharBeanProxy(Array.getChar(fBean,index));
- case IDEPrimitiveBeanTypeProxy.DOUBLE:
- return fBeanTypeProxyFactory.doubleType.createDoubleBeanProxy(Array.getDouble(fBean,index));
- case IDEPrimitiveBeanTypeProxy.FLOAT:
- return fBeanTypeProxyFactory.floatType.createFloatBeanProxy(Array.getFloat(fBean,index));
- case IDEPrimitiveBeanTypeProxy.INTEGER:
- return fBeanTypeProxyFactory.intType.createIntegerBeanProxy(Array.getInt(fBean,index));
- case IDEPrimitiveBeanTypeProxy.LONG:
- return fBeanTypeProxyFactory.longType.createLongBeanProxy(Array.getLong(fBean,index));
- case IDEPrimitiveBeanTypeProxy.SHORT:
- return fBeanTypeProxyFactory.shortType.createShortBeanProxy(Array.getShort(fBean,index));
- default :
- return null; // Shouldn't get here, said it was primitive, but not one we understand
- }
- }
-}
-/**
- * Get the object at the specified multi-dimensional index.
- * The array must be at least the number of dimensions specified,
- * and each index along the way must exist.
- * The number of dimensions can't be greater than the number
- * of dimensions of the real object.
- */
-public IBeanProxy get(int[] indexes) throws ThrowableProxy {
- if (indexes.length == 1)
- return get(indexes[0]);
- int dims = ((IArrayBeanTypeProxy) getTypeProxy()).getDimensions();
- if (dims < indexes.length)
- throw new IllegalArgumentException(); // Too many dimensions
- // Get up to the next to last dimension so that we can do the appropriate final get depending upon primitive or not.
- Object array = fBean;
- int lastArrayDim = indexes.length - 1;
- for (int i = 0; i < lastArrayDim; i++)
- array = Array.get(array, indexes[i]);
-
- int index = indexes[lastArrayDim]; // Final array dim to retrieve
-
- if (dims == indexes.length) {
- IBeanTypeProxy finalCompType = ((IArrayBeanTypeProxy) getTypeProxy()).getFinalComponentType();
- if (finalCompType.isPrimitive()) {
- // If the component type at the specified dimension is primitive, we need to use the correct getter so that a valid value is returned,
- // if we just used the standard get, if the type was "int" the value returned would be an java.lang.Integer.
- int id = ((IDEPrimitiveBeanTypeProxy) finalCompType).getPrimitiveType();
- switch (id) {
- case IDEPrimitiveBeanTypeProxy.BYTE :
- return fBeanTypeProxyFactory.byteType.createByteBeanProxy(Array.getByte(array, index));
- case IDEPrimitiveBeanTypeProxy.BOOLEAN :
- return fBeanTypeProxyFactory.booleanType.createBooleanBeanProxy(Array.getBoolean(array, index));
- case IDEPrimitiveBeanTypeProxy.CHAR :
- return fBeanTypeProxyFactory.charType.createCharBeanProxy(Array.getChar(array, index));
- case IDEPrimitiveBeanTypeProxy.DOUBLE :
- return fBeanTypeProxyFactory.doubleType.createDoubleBeanProxy(Array.getDouble(array, index));
- case IDEPrimitiveBeanTypeProxy.FLOAT :
- return fBeanTypeProxyFactory.floatType.createFloatBeanProxy(Array.getFloat(array, index));
- case IDEPrimitiveBeanTypeProxy.INTEGER :
- return fBeanTypeProxyFactory.intType.createIntegerBeanProxy(Array.getInt(array, index));
- case IDEPrimitiveBeanTypeProxy.LONG :
- return fBeanTypeProxyFactory.longType.createLongBeanProxy(Array.getLong(array, index));
- case IDEPrimitiveBeanTypeProxy.SHORT :
- return fBeanTypeProxyFactory.shortType.createShortBeanProxy(Array.getShort(array, index));
- default :
- return null; // Shouldn't get here, said it was primitive, but not one we understand
- }
- }
- }
-
- // Won't be returning a primitive, so use standard accessor
- Object result = Array.get(array, index);
- if (result == null)
- return null;
- return ((IDEBeanTypeProxy) fBeanTypeProxyFactory.getBeanTypeProxy(result.getClass())).newBeanProxy(
- result);
-}
-
-/**
- * Set the object at the specified index.
- */
-public void set(IBeanProxy valueProxy, int index) throws ThrowableProxy {
- // If the component type is primitive, we need to use the correct getter so that a valid value is returned,
- // if we just used the standard get, if the type was "int" the value returned would be an java.lang.Integer.
- Object value = ((IIDEBeanProxy)valueProxy).getBean();
- Class valueClass = value.getClass();
- if (!valueClass.isPrimitive()) {
- // Use standard getter.
- Array.set(fBean,index,value);
- } else if (valueClass == Byte.TYPE ) {
- Array.setByte(fBean,index,((Byte)value).byteValue());
- } else if (valueClass == Boolean.TYPE ){
- Array.setBoolean(fBean,index,((Boolean)value).booleanValue());
- } else if (valueClass == Character.TYPE) {
- Array.setChar(fBean,index,((Character)value).charValue());
- } else if (valueClass == Double.TYPE) {
- Array.setDouble(fBean,index,((Double)value).doubleValue());
- } else if (valueClass == Float.TYPE) {
- Array.setFloat(fBean,index,((Float)value).floatValue());
- } else if (valueClass == Integer.TYPE) {
- Array.setInt(fBean,index,((Integer)value).intValue());
- } else if (valueClass == Long.TYPE ) {
- Array.setLong(fBean,index,((Long)value).longValue());
- } else if (valueClass == Short.TYPE ) {
- Array.setShort(fBean,index,((Short)value).shortValue());
- }
-}
-/**
- * Set the object at the specified multi-dimensional index.
- * The array must be at least the number of dimensions specified,
- * and each index along the way must exist.
- * The number of dimensions can't be greater than the number
- * of dimensions of the real object.
- */
-public void set(IBeanProxy valueProxy, int[] indexes) throws ThrowableProxy {
-
- Object subArray = fBean;
- int upTo = indexes.length - 1;
- for (int i = 0; i < upTo; i++)
- subArray = Array.get(subArray, indexes[i]);
- int index = indexes[upTo];
-
- // Now set the appropriate value in
- // If the component type is primitive, we need to use the correct getter so that a valid value is returned,
- // if we just used the standard get, if the type was "int" the value returned would be an java.lang.Integer.
- Object value = ((IIDEBeanProxy) valueProxy).getBean();
- Class valueClass = value.getClass();
- if (!valueClass.isPrimitive()) {
- // Use standard getter.
- Array.set(subArray, index, value);
- } else if (valueClass == Byte.TYPE) {
- Array.setByte(subArray, index, ((Byte) value).byteValue());
- } else if (valueClass == Boolean.TYPE) {
- Array.setBoolean(subArray, index, ((Boolean) value).booleanValue());
- } else if (valueClass == Character.TYPE) {
- Array.setChar(subArray, index, ((Character) value).charValue());
- } else if (valueClass == Double.TYPE) {
- Array.setDouble(subArray, index, ((Double) value).doubleValue());
- } else if (valueClass == Float.TYPE) {
- Array.setFloat(subArray, index, ((Float) value).floatValue());
- } else if (valueClass == Integer.TYPE) {
- Array.setInt(subArray, index, ((Integer) value).intValue());
- } else if (valueClass == Long.TYPE) {
- Array.setLong(subArray, index, ((Long) value).longValue());
- } else if (valueClass == Short.TYPE) {
- Array.setShort(subArray, index, ((Short) value).shortValue());
- }
-
-}
-/**
- * Get the length of the first dimension of this array.
- * If there are multi-dimensions, you must get the appropriate
- * dimension from the get method to see the size of that dimension.
- *
- * e.g.
- * int [3] returns 3
- * int [3][2] returns 3
- *
- * ((IArrayBeanProxy) get(1)).getLength() returns 2
- * Since arrays do not have to be homogenous, there could
- * be a different length array for each of the arrays
- * returned from the first dimension, the returned length
- * from get(2) and get(3) could result in a different value
- * from get(1).
- */
-public int getLength() {
- return Array.getLength(fBean);
-}
- /**
- * @see org.eclipse.jem.internal.proxy.core.IArrayBeanProxy#getCatchThrowableException(int)
- */
- public IBeanProxy getCatchThrowableException(int index) {
- try {
- return get(index);
- } catch ( ThrowableProxy exc ) {
- ProxyPlugin.getPlugin().getLogger().log(new Status(IStatus.WARNING, ProxyPlugin.getPlugin().getBundle().getSymbolicName(), 0, "", exc)); //$NON-NLS-1$
- return null;
- }
- }
-
-
- public IBeanProxy[] getSnapshot() throws ThrowableProxy {
- // If the component type is primitive, we need to use the correct getter so that a valid value is returned,
- // if we just used the standard get, if the type was "int" the value returned would be an java.lang.Integer.
- IBeanTypeProxy compType = ((IArrayBeanTypeProxy) getTypeProxy()).getComponentType();
- int id = compType.isPrimitive() ? ((IDEPrimitiveBeanTypeProxy)compType).getPrimitiveType() : -1;
- IBeanProxy[] result = new IBeanProxy[Array.getLength(fBean)];
- for (int i = 0; i < result.length; i++) {
- if (id == -1) {
- // Use standard getter.
- Object val = Array.get(fBean,i);
- if ( val != null )
- result[i] = ((IDEBeanTypeProxy)fBeanTypeProxyFactory.getBeanTypeProxy(val.getClass())).newBeanProxy(val);
- } else {
- // Use the correct primitive getter.
- switch (id) {
- case IDEPrimitiveBeanTypeProxy.BYTE:
- result[i] = fBeanTypeProxyFactory.byteType.createByteBeanProxy(Array.getByte(fBean,i));
- break;
- case IDEPrimitiveBeanTypeProxy.BOOLEAN:
- result[i] = fBeanTypeProxyFactory.booleanType.createBooleanBeanProxy(Array.getBoolean(fBean,i));
- break;
- case IDEPrimitiveBeanTypeProxy.CHAR:
- result[i] = fBeanTypeProxyFactory.charType.createCharBeanProxy(Array.getChar(fBean,i));
- break;
- case IDEPrimitiveBeanTypeProxy.DOUBLE:
- result[i] = fBeanTypeProxyFactory.doubleType.createDoubleBeanProxy(Array.getDouble(fBean,i));
- break;
- case IDEPrimitiveBeanTypeProxy.FLOAT:
- result[i] = fBeanTypeProxyFactory.floatType.createFloatBeanProxy(Array.getFloat(fBean,i));
- break;
- case IDEPrimitiveBeanTypeProxy.INTEGER:
- result[i] = fBeanTypeProxyFactory.intType.createIntegerBeanProxy(Array.getInt(fBean,i));
- break;
- case IDEPrimitiveBeanTypeProxy.LONG:
- result[i] = fBeanTypeProxyFactory.longType.createLongBeanProxy(Array.getLong(fBean,i));
- break;
- case IDEPrimitiveBeanTypeProxy.SHORT:
- result[i] = fBeanTypeProxyFactory.shortType.createShortBeanProxy(Array.getShort(fBean,i));
- break;
- default :
- break; // Shouldn't get here, said it was primitive, but not one we understand
- }
- }
- }
- return result;
- }
-
-}
diff --git a/plugins/org.eclipse.jem.proxy/proxyide/org/eclipse/jem/internal/proxy/ide/IDEArrayBeanTypeProxy.java b/plugins/org.eclipse.jem.proxy/proxyide/org/eclipse/jem/internal/proxy/ide/IDEArrayBeanTypeProxy.java
deleted file mode 100644
index a9d7cf4..0000000
--- a/plugins/org.eclipse.jem.proxy/proxyide/org/eclipse/jem/internal/proxy/ide/IDEArrayBeanTypeProxy.java
+++ /dev/null
@@ -1,326 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2001, 2005 IBM Corporation and others.
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
- *
- * Contributors:
- * IBM Corporation - initial API and implementation
- *******************************************************************************/
-package org.eclipse.jem.internal.proxy.ide;
-
-/*
-
-
- */
-
-import org.eclipse.jem.internal.proxy.core.*;
-
-import java.lang.reflect.*;
-
-/**
- * Array Type Proxy for the IDE VM.
- *
- * The class is final because array's are special and shouldn't have any subclasses since the factory would never call it.
- */
-
-public final class IDEArrayBeanTypeProxy extends IDEBeanTypeProxy implements IArrayBeanTypeProxy {
-
- IBeanTypeProxy fFinalComponentType;
-
- IBeanTypeProxy fComponentType;
-
- String fTypeName;
-
- /**
- * Create with a registry and a class. It is package so that only the factory with this IDE package can call it.
- */
- IDEArrayBeanTypeProxy(IDEProxyFactoryRegistry aRegistry, String aTypeName, Class aClass) {
- // The class of an Array is always Object
- super(aRegistry, aClass);
- fTypeName = aTypeName;
- }
-
- /**
- * This is an array type!
- */
- public boolean isArray() {
- return true;
- }
-
- public String getTypeName() {
- return fTypeName;
- }
-
- /**
- * Return the final component type.
- */
- public IBeanTypeProxy getFinalComponentType() {
- if (fFinalComponentType == null) {
- // Component type is strip off all '[' and return class name (if we ever add classLoader support, this won't work).
- // However, if the type is a primitive we need to go through the change table).
- int typeStart = getTypeName().lastIndexOf('[') + 1;
- if (getTypeName().charAt(typeStart) == 'L') {
- // It is a class.
- // Strip off up to the 'L', and the trailing ';'. That is the class name.
- fFinalComponentType = fProxyFactoryRegistry.getBeanTypeProxyFactory().getBeanTypeProxy(
- getTypeName().substring(typeStart + 1, getTypeName().length() - 1));
- } else {
- // It is a type. Need to map it.
- Class aType = (Class) IDEStandardBeanTypeProxyFactory.MAP_SHORTSIG_TO_TYPE.get(getTypeName().substring(typeStart, typeStart + 1));
- fFinalComponentType = aType != null ? fProxyFactoryRegistry.getBeanTypeProxyFactory().getBeanTypeProxy(aType.getName()) : null;
- }
- }
- return fFinalComponentType;
- }
-
- /**
- * Return the component type.
- */
- public IBeanTypeProxy getComponentType() {
- if (fComponentType == null) {
- // Component type is strip off first '[' and return class name (if we ever add classLoader support, this won't work).
- // However, if the type is a primitive we need to go through the change table).
- if (getTypeName().charAt(1) != '[') {
- // It is a one dimensional array, just send to getFinalComponentType to figure out the type.
- fComponentType = getFinalComponentType();
- } else {
- // It is a multi-dimensional array. Just strip off one '[' and send that to the bean type factory.
- fComponentType = fProxyFactoryRegistry.getBeanTypeProxyFactory().getBeanTypeProxy(getTypeName().substring(1));
- }
- }
- return fComponentType;
- }
-
- /**
- * Return the number of dimensions.
- */
- public int getDimensions() {
- return getTypeName().lastIndexOf('[') + 1;
- }
-
- /**
- * Return the null ctor proxy for this method with these arguments. For all of the array types, this is an invalid operation.
- */
- public IConstructorProxy getNullConstructorProxy() {
- throw new UnsupportedOperationException();
- }
-
- /**
- * Return a proxy to the constructor for the target VM being the same as the REM For all of the array types, this is an invalid operation.
- */
- public IConstructorProxy getConstructorProxy(String[] argumentClassNames) {
- throw new UnsupportedOperationException();
- }
-
- /**
- * Return a proxy to the constructor for the target VM being the same as the REM For all of the array types, this is an invalid operation.
- */
- public IConstructorProxy getConstructorProxy(IBeanTypeProxy[] argumentTypes) {
- throw new UnsupportedOperationException();
- }
-
- /*
- * (non-Javadoc)
- *
- * @see org.eclipse.jem.internal.proxy.core.IBeanTypeProxy#getConstructors() For all of the array types, this is an invalid operation.
- */
- public IConstructorProxy[] getConstructors() {
- throw new UnsupportedOperationException();
- }
-
- /**
- * Return a proxy to the constructor for the target VM being the same as the REM For all of the array types, this is an invalid operation.
- */
- public IConstructorProxy getDeclaredConstructorProxy(String[] argumentClassNames) {
- throw new UnsupportedOperationException();
- }
-
- /**
- * Return a proxy to the constructor for the target VM being the same as the REM For all of the array types, this is an invalid operation.
- */
- public IConstructorProxy getDeclaredConstructorProxy(IBeanTypeProxy[] argumentTypes) {
- throw new UnsupportedOperationException();
- }
-
- /*
- * (non-Javadoc)
- *
- * @see org.eclipse.jem.internal.proxy.core.IBeanTypeProxy#getConstructors() For all of the array types, this is an invalid operation.
- */
- public IConstructorProxy[] getDeclaredConstructors() {
- throw new UnsupportedOperationException();
- }
-
- /*
- * (non-Javadoc)
- *
- * @see org.eclipse.jem.internal.proxy.core.IBeanTypeProxy#getConstructors() For all of the array types, this is an invalid operation.
- */
- public IFieldProxy[] getFields() {
- throw new UnsupportedOperationException();
- }
-
- /*
- * (non-Javadoc)
- *
- * @see org.eclipse.jem.internal.proxy.core.IBeanTypeProxy#getCompatibleConstructor(org.eclipse.jem.internal.proxy.core.IBeanTypeProxy[])
- */
- public IConstructorProxy getCompatibleConstructor(IBeanTypeProxy[] argumentTypes) {
- throw new UnsupportedOperationException();
- }
-
- /*
- * (non-Javadoc)
- *
- * @see org.eclipse.jem.internal.proxy.core.IBeanTypeProxy#getCompatibleMethod(java.lang.String,
- * org.eclipse.jem.internal.proxy.core.IBeanTypeProxy[])
- */
- public IMethodProxy getCompatibleMethod(String methodName, IBeanTypeProxy[] argumentTypes) {
- throw new UnsupportedOperationException();
- }
-
- /*
- * (non-Javadoc)
- *
- * @see org.eclipse.jem.internal.proxy.core.IBeanTypeProxy#getConstructors() For all of the array types, this is an invalid operation.
- */
- public IFieldProxy[] getDeclaredFields() {
- throw new UnsupportedOperationException();
- }
-
- /**
- * Return a proxy to the field for the target VM being the same as the REM For all of the array types, this is an invalid operation.
- */
- public IFieldProxy getFieldProxy(String fieldName) {
- throw new UnsupportedOperationException();
- }
-
- /**
- * Return the method proxy for this method with these arguments. For all of the array types, this is an invalid operation.
- */
- public IMethodProxy getMethodProxy(String methodName, IBeanTypeProxy[] argumentTypes) {
- throw new UnsupportedOperationException();
- }
-
- /**
- * Return the method proxy for this method with these arguments. For all of the array types, this is an invalid operation.
- */
- public IMethodProxy getMethodProxy(String methodName, String[] argumentClassNames) {
- throw new UnsupportedOperationException();
- }
-
- /**
- * Return the method proxy for this method with these arguments. For all of the array types, this is an invalid operation.
- */
- public IMethodProxy getMethodProxy(String methodName, String argumentQualifiedTypeName) {
- throw new UnsupportedOperationException();
- }
-
- /**
- * Return the method proxy for this method with these arguments. For all of the array types, this is an invalid operation.
- */
- public IMethodProxy getMethodProxy(String methodName) {
- throw new UnsupportedOperationException();
- }
-
- /*
- * (non-Javadoc)
- *
- * @see org.eclipse.jem.internal.proxy.core.IBeanTypeProxy#getConstructors() For all of the array types, this is an invalid operation.
- */
- public IMethodProxy[] getMethods() {
- throw new UnsupportedOperationException();
- }
-
- /*
- * (non-Javadoc)
- *
- * @see org.eclipse.jem.internal.proxy.core.IBeanTypeProxy#getConstructors() For all of the array types, this is an invalid operation.
- */
- public IMethodProxy[] getDeclaredMethods() {
- throw new UnsupportedOperationException();
- }
-
- /**
- * Return the method proxy for this method with these arguments. For all of the array types, this is an invalid operation.
- */
- public IMethodProxy getDeclaredMethodProxy(String methodName, IBeanTypeProxy[] argumentTypes) {
- throw new UnsupportedOperationException();
- }
-
- /**
- * Return the method proxy for this method with these arguments. For all of the array types, this is an invalid operation.
- */
- public IMethodProxy getDeclaredMethodProxy(String methodName, String[] argumentClassNames) {
- throw new UnsupportedOperationException();
- }
-
- /**
- * Create an array bean proxy.
- * - (int, new int[2] {3, 4}) will create: int [3] [4]
- * - (int[], new int[1] {1}) int [1]
- * - (int[], new int[2] {2,3}) int [2] [3]
- *
- * - (int[], null) or (int[], new int[0]) or (int, null) or (int, new int[0]) int [0] (int[][], null) or (int[][], new int[0]) int[0][] This is
- * because an array instance with no dimensions specified is not valid.
- * - (int[][], new int[1] {3}) int[3][]
- *
- * It is package protected so that only the REM Factory can call it.
- */
- IDEArrayBeanProxy createBeanProxyWith(int[] dimensions) throws ThrowableProxy {
- // If the dimensions is null or zero length, then create the
- // array as a 0 sized array one dimensional array.
- if (dimensions == null || dimensions.length == 0)
- return createBeanProxyWith(new int[] { 0});
-
- // Remove from this type the number of dimensions specified
- // coming in, up to but no further than the final component.
- // From here we can then use the appropriate java.lang.reflect.Array
- // method to create the array.
- IBeanTypeProxy compType = null; // The type of array to create (it may be different number of dimensions).
- int numDims = getDimensions();
- if (numDims <= dimensions.length)
- compType = getFinalComponentType(); // There are the same or more requested dimensions, so use final component type
- else {
- // There are fewer requested dimensions, so strip off that many
- String compClass = getTypeName().substring(dimensions.length);
- compType = fProxyFactoryRegistry.getBeanTypeProxyFactory().getBeanTypeProxy(compClass);
- }
-
- if (dimensions.length == 1) {
- // Use the one dimension call
- Object array = Array.newInstance(((IDEBeanTypeProxy) compType).fClass, dimensions[0]);
- return new IDEArrayBeanProxy(fProxyFactoryRegistry, array, null);
- } else {
- // Use the multi dimension call
- Object array = Array.newInstance(((IDEBeanTypeProxy) compType).fClass, dimensions);
- return new IDEArrayBeanProxy(fProxyFactoryRegistry, array, null);
- }
- }
-
- /**
- * Create a new bean proxy with the specified object
- */
- protected IIDEBeanProxy newBeanProxy(Object anObject) {
-
- return new IDEArrayBeanProxy(fProxyFactoryRegistry, anObject, this);
-
- }
-
- /**
- * @see IBeanTypeProxy#getFormalTypeName()
- */
- public String getFormalTypeName() {
- String name = getTypeName();
- int dims = name.lastIndexOf('[') + 1;
- String type = getFinalComponentType().getTypeName();
- StringBuffer formalType = new StringBuffer(type.length() + ("[]".length() * dims)); //$NON-NLS-1$
- formalType.append(type);
- for (int i = 0; i < dims; i++)
- formalType.append("[]"); //$NON-NLS-1$
- return formalType.toString();
- }
-
-}
diff --git a/plugins/org.eclipse.jem.proxy/proxyide/org/eclipse/jem/internal/proxy/ide/IDEBeanProxy.java b/plugins/org.eclipse.jem.proxy/proxyide/org/eclipse/jem/internal/proxy/ide/IDEBeanProxy.java
deleted file mode 100644
index 52ed180..0000000
--- a/plugins/org.eclipse.jem.proxy/proxyide/org/eclipse/jem/internal/proxy/ide/IDEBeanProxy.java
+++ /dev/null
@@ -1,101 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2001, 2005 IBM Corporation and others.
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
- *
- * Contributors:
- * IBM Corporation - initial API and implementation
- *******************************************************************************/
-package org.eclipse.jem.internal.proxy.ide;
-/*
-
-
- */
-
-import org.eclipse.jem.internal.proxy.core.*;
-
-public abstract class IDEBeanProxy implements IBeanProxy, IIDEBeanProxy {
-
- protected Object fBean;
- protected final IDEProxyFactoryRegistry fProxyFactoryRegistry;
-
- protected IDEBeanProxy(IDEProxyFactoryRegistry aProxyFactoryRegistry) {
- fProxyFactoryRegistry = aProxyFactoryRegistry;
- }
- protected IDEBeanProxy(IDEProxyFactoryRegistry aProxyFactoryRegistry, Object anObject) {
- fProxyFactoryRegistry = aProxyFactoryRegistry;
- fBean = anObject;
- }
- public boolean isValid() {
- return true;
- }
- public ProxyFactoryRegistry getProxyFactoryRegistry() {
- return fProxyFactoryRegistry;
- }
- /**
- * USE with extreme care
- */
- public final Object getBean() {
- return fBean;
- }
- /**
- * Return the toString() of the bean
- */
- public String toBeanString() {
- return (fBean != null ? fBean.toString() : "null"); //$NON-NLS-1$
- }
- /**
- Append the bean's to string to our own name if we have one
- */
- public String toString() {
-
- if (fBean == null)
- return super.toString();
- else
- return super.toString() + "(" + fBean.toString() + ")"; //$NON-NLS-2$//$NON-NLS-1$
-
- }
- /**
- * equals: If there are identical or if they wrapper the same bean. In the IDE VM this
- * can happen if bean proxies are created from a Bean, since proxies aren't cached in
- * the beanproxy factory, more than one proxy can be created for the same bean.
- */
- public boolean equals(Object obj) {
- if (super.equals(obj))
- return true;
- if (obj instanceof IIDEBeanProxy) {
- return fBean.equals(((IIDEBeanProxy) obj).getBean());
- }
- return false;
- }
-
- public int hashCode() {
- return 12345 + (getBean() != null ? getBean().hashCode() : 0);
- }
-
- /* (non-Javadoc)
- * @see org.eclipse.jem.internal.proxy.core.IBeanProxy#sameAs(org.eclipse.jem.internal.proxy.core.IBeanProxy)
- */
- public boolean sameAs(IBeanProxy aBeanProxy) {
- if (this == aBeanProxy)
- return true;
- if (aBeanProxy instanceof IIDEBeanProxy)
- return getBean() == ((IIDEBeanProxy) aBeanProxy).getBean();
- return false;
- }
-
- /* (non-Javadoc)
- * @see org.eclipse.jem.internal.proxy.core.IProxy#isBeanProxy()
- */
- public final boolean isBeanProxy() {
- return true;
- }
- /* (non-Javadoc)
- * @see org.eclipse.jem.internal.proxy.core.IProxy#isExpressionProxy()
- */
- public final boolean isExpressionProxy() {
- return false;
- }
-}
diff --git a/plugins/org.eclipse.jem.proxy/proxyide/org/eclipse/jem/internal/proxy/ide/IDEBeanTypeProxy.java b/plugins/org.eclipse.jem.proxy/proxyide/org/eclipse/jem/internal/proxy/ide/IDEBeanTypeProxy.java
deleted file mode 100644
index 4401b7e..0000000
--- a/plugins/org.eclipse.jem.proxy/proxyide/org/eclipse/jem/internal/proxy/ide/IDEBeanTypeProxy.java
+++ /dev/null
@@ -1,451 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2001, 2006 IBM Corporation and others.
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
- *
- * Contributors:
- * IBM Corporation - initial API and implementation
- *******************************************************************************/
-/*
- * $RCSfile: IDEBeanTypeProxy.java,v $ $Revision: 1.16 $ $Date: 2006/05/17 20:13:05 $
- */
-package org.eclipse.jem.internal.proxy.ide;
-
-import org.eclipse.jem.internal.proxy.common.AmbiguousMethodException;
-import org.eclipse.jem.internal.proxy.core.*;
-
-import java.lang.reflect.*;
-
-import org.eclipse.core.runtime.IStatus;
-import org.eclipse.core.runtime.Status;
-
-public class IDEBeanTypeProxy extends IDEBeanProxy implements IBeanTypeProxy {
-
- protected IDEProxyFactoryRegistry fProxyFactoryRegistry;
-
- Class fClass;
-
- protected IDEBeanTypeProxy(IDEProxyFactoryRegistry aRegistry, Class aClass) {
- super(aRegistry, aClass);
- fProxyFactoryRegistry = aRegistry;
- fClass = aClass;
- }
-
- /**
- * Get Type Proxy. The type proxy of a BeanType is Class.
- */
- public IBeanTypeProxy getTypeProxy() {
- return ((IDEStandardBeanTypeProxyFactory) fProxyFactoryRegistry.getBeanTypeProxyFactory()).classClass;
- }
-
- public Class getTypeClass() {
- return fClass;
- }
-
- public String toBeanString() {
- return fClass.toString();
- }
-
- public ProxyFactoryRegistry getProxyFactoryRegistry() {
- return fProxyFactoryRegistry;
- }
-
- public String getTypeName() {
- return fClass.getName();
- }
-
- public boolean isKindOf(IBeanTypeProxy aBeanTypeProxy) {
- return ((IDEBeanTypeProxy) aBeanTypeProxy).fClass.isAssignableFrom(fClass);
- }
-
- public boolean isInterface() {
- return fClass.isInterface();
- }
-
- public boolean isPrimitive() {
- return fClass.isPrimitive();
- }
-
- public boolean isArray() {
- return fClass.isArray();
- }
-
- /*
- * (non-Javadoc)
- *
- * @see org.eclipse.jem.internal.proxy.core.IBeanTypeProxy#getConstructors()
- */
- public IMethodProxy[] getMethods() {
- return ((IDEMethodProxyFactory) fProxyFactoryRegistry.getMethodProxyFactory()).getMethods(fClass);
- }
-
- /*
- * (non-Javadoc)
- *
- * @see org.eclipse.jem.internal.proxy.core.IBeanTypeProxy#getConstructors()
- */
- public IMethodProxy[] getDeclaredMethods() {
- return ((IDEMethodProxyFactory) fProxyFactoryRegistry.getMethodProxyFactory()).getDeclaredMethods(fClass);
- }
-
- /**
- * We can use reflection on our class to find the java.reflect.Method instance and create the IDEMethodProxy directly
- */
- public IMethodProxy getMethodProxy(String methodName) {
-
- try {
- Method aMethod = fClass.getMethod(methodName, new Class[0]);
- return ((IDEMethodProxyFactory) fProxyFactoryRegistry.getMethodProxyFactory()).getMethodProxy(aMethod);
- } catch (Exception exc) {
- ProxyPlugin.getPlugin().getLogger().log(new Status(IStatus.WARNING, ProxyPlugin.getPlugin().getBundle().getSymbolicName(), 0, "", exc)); //$NON-NLS-1$
- }
- return null;
-
- }
-
- public IMethodProxy getMethodProxy(String methodName, String[] argumentClassNames) {
- return ((IDEMethodProxyFactory) fProxyFactoryRegistry.getMethodProxyFactory()).getMethodProxy(this, methodName, argumentClassNames);
- }
-
- public IMethodProxy getMethodProxy(String methodName, String firstArgClass) {
- return getMethodProxy(methodName, new String[] { firstArgClass});
- }
-
- public IMethodProxy getMethodProxy(String methodName, IBeanTypeProxy[] args) {
- Class[] argClasses = new Class[args.length];
- for (int i = 0; i < args.length; i++) {
- argClasses[i] = ((IDEBeanTypeProxy) args[i]).fClass;
- }
- return ((IDEMethodProxyFactory) fProxyFactoryRegistry.getMethodProxyFactory()).getMethodProxy(fClass, methodName, argClasses);
- }
-
- public IMethodProxy getDeclaredMethodProxy(String methodName, String[] argumentClassNames) {
- return ((IDEMethodProxyFactory) fProxyFactoryRegistry.getMethodProxyFactory()).getDeclaredMethodProxy(fClass, methodName, argumentClassNames);
- }
-
- public IMethodProxy getDeclaredMethodProxy(String methodName, IBeanTypeProxy[] args) {
- Class[] argClasses = null;
- if (args != null) {
- argClasses = new Class[args.length];
- for (int i = 0; i < args.length; i++) {
- argClasses[i] = ((IDEBeanTypeProxy) args[i]).fClass;
- }
- }
- return ((IDEMethodProxyFactory) fProxyFactoryRegistry.getMethodProxyFactory()).getDeclaredMethodProxy(fClass, methodName, argClasses);
- }
-
- /*
- * (non-Javadoc)
- *
- * @see org.eclipse.jem.internal.proxy.core.IBeanTypeProxy#getInvokable(java.lang.String, org.eclipse.jem.internal.proxy.core.IBeanTypeProxy[])
- */
- public IInvokable getInvokable(String methodName, IBeanTypeProxy[] argumentTypes) {
- return getMethodProxy(methodName, argumentTypes);
- }
-
- /*
- * (non-Javadoc)
- *
- * @see org.eclipse.jem.internal.proxy.core.IBeanTypeProxy#getInvokable(java.lang.String, java.lang.String)
- */
- public IInvokable getInvokable(String methodName, String argumentClassName) {
- return getMethodProxy(methodName, argumentClassName);
- }
-
- /*
- * (non-Javadoc)
- *
- * @see org.eclipse.jem.internal.proxy.core.IBeanTypeProxy#getInvokable(java.lang.String, java.lang.String[])
- */
- public IInvokable getInvokable(String methodName, String[] argumentClassNames) {
- return getMethodProxy(methodName, argumentClassNames);
- }
-
- /*
- * (non-Javadoc)
- *
- * @see org.eclipse.jem.internal.proxy.core.IBeanTypeProxy#getInvokable(java.lang.String)
- */
- public IInvokable getInvokable(String methodName) {
- return getMethodProxy(methodName);
- }
-
- public IConstructorProxy getConstructorProxy(String[] argTypeNames) {
- IBeanTypeProxy[] argClasses = new IBeanTypeProxy[argTypeNames.length];
- IStandardBeanTypeProxyFactory btFactory = fProxyFactoryRegistry.getBeanTypeProxyFactory();
- for (int i = 0; i < argTypeNames.length; i++) {
- argClasses[i] = btFactory.getBeanTypeProxy(argTypeNames[i]);
- if (argClasses[i] == null) {
- ProxyPlugin.getPlugin().getLogger().log(
- new Status(IStatus.WARNING, ProxyPlugin.getPlugin().getBundle().getSymbolicName(), 0, "Constructor not found - " //$NON-NLS-1$
- + fClass.getName() + " args=" + argTypeNames, null)); //$NON-NLS-1$
- return null;
- }
- }
- return getConstructorProxy(argClasses);
- }
-
- public IConstructorProxy getConstructorProxy(IBeanTypeProxy[] args) {
- Class[] argClasses = new Class[args.length];
- for (int i = 0; i < args.length; i++) {
- argClasses[i] = ((IDEBeanTypeProxy) args[i]).fClass;
- }
- return ((IDEMethodProxyFactory) fProxyFactoryRegistry.getMethodProxyFactory()).getConstructorProxy(fClass, argClasses);
- }
-
- /*
- * (non-Javadoc)
- *
- * @see org.eclipse.jem.internal.proxy.core.IBeanTypeProxy#getConstructors()
- */
- public IConstructorProxy[] getConstructors() {
- return ((IDEMethodProxyFactory) fProxyFactoryRegistry.getMethodProxyFactory()).getConstructors(fClass);
- }
-
- public IConstructorProxy getDeclaredConstructorProxy(String[] argTypeNames) {
- IBeanTypeProxy[] argClasses = new IBeanTypeProxy[argTypeNames.length];
- IStandardBeanTypeProxyFactory btFactory = fProxyFactoryRegistry.getBeanTypeProxyFactory();
- for (int i = 0; i < argTypeNames.length; i++) {
- argClasses[i] = btFactory.getBeanTypeProxy(argTypeNames[i]);
- if (argClasses[i] == null) {
- ProxyPlugin.getPlugin().getLogger().log(
- new Status(IStatus.WARNING, ProxyPlugin.getPlugin().getBundle().getSymbolicName(), 0, "Constructor not found - " //$NON-NLS-1$
- + fClass.getName() + " args=" + argTypeNames, null)); //$NON-NLS-1$
- return null;
- }
- }
- return getDeclaredConstructorProxy(argClasses);
- }
-
- public IConstructorProxy getDeclaredConstructorProxy(IBeanTypeProxy[] args) {
- Class[] argClasses = new Class[args.length];
- for (int i = 0; i < args.length; i++) {
- argClasses[i] = ((IDEBeanTypeProxy) args[i]).fClass;
- }
- return ((IDEMethodProxyFactory) fProxyFactoryRegistry.getMethodProxyFactory()).getDeclaredConstructorProxy(fClass, argClasses);
- }
-
- /*
- * (non-Javadoc)
- *
- * @see org.eclipse.jem.internal.proxy.core.IBeanTypeProxy#getConstructors()
- */
- public IConstructorProxy[] getDeclaredConstructors() {
- return ((IDEMethodProxyFactory) fProxyFactoryRegistry.getMethodProxyFactory()).getDeclaredConstructors(fClass);
- }
-
- /**
- * Return the supertype for us Use the factory to get it rather than create it directly so that the factory has the chance to cache classes if
- * required This is required as part of the interface
- */
- public IBeanTypeProxy getSuperBeanTypeProxy() {
-
- if (fClass.isInterface())
- return null;
- else
- return fProxyFactoryRegistry.getBeanTypeProxyFactory().getBeanTypeProxy(fClass.getSuperclass().getName());
-
- }
-
- /*
- * (non-Javadoc)
- *
- * @see org.eclipse.jem.internal.proxy.core.IBeanTypeProxy#getConstructors()
- */
- public IFieldProxy[] getFields() {
- return ((IDEMethodProxyFactory) fProxyFactoryRegistry.getMethodProxyFactory()).getFields(fClass);
- }
-
- /*
- * (non-Javadoc)
- *
- * @see org.eclipse.jem.internal.proxy.core.IBeanTypeProxy#getConstructors()
- */
- public IFieldProxy[] getDeclaredFields() {
- return ((IDEMethodProxyFactory) fProxyFactoryRegistry.getMethodProxyFactory()).getDeclaredFields(fClass);
- }
-
- public IFieldProxy getFieldProxy(String fieldName) {
- try {
- Field field = fClass.getField(fieldName);
- return ((IDEMethodProxyFactory) fProxyFactoryRegistry.getMethodProxyFactory()).getFieldProxy(field);
- } catch (NoSuchFieldException exc) {
- ProxyPlugin.getPlugin().getLogger().log(
- new Status(IStatus.WARNING, ProxyPlugin.getPlugin().getBundle().getSymbolicName(), 0, "Field not found " + fClass.getName() //$NON-NLS-1$
- + " - " + fieldName, exc)); //$NON-NLS-1$
- return null;
- }
- }
-
- public IFieldProxy getDeclaredFieldProxy(String fieldName) {
- try {
- Field field = fClass.getDeclaredField(fieldName);
- return ((IDEMethodProxyFactory) fProxyFactoryRegistry.getMethodProxyFactory()).getFieldProxy(field);
- } catch (NoSuchFieldException exc) {
- ProxyPlugin.getPlugin().getLogger().log(
- new Status(IStatus.WARNING, ProxyPlugin.getPlugin().getBundle().getSymbolicName(), 0, "Field not found " + fClass.getName() //$NON-NLS-1$
- + " - " + fieldName, exc)); //$NON-NLS-1$
- return null;
- }
- }
-
- /**
- * Return a proxy to the constructor for the target VM being the same as the IDE We can use the package protected contstructor on
- * IDEConstructorProxy
- */
- IConstructorProxy getConstructorProxy(Class[] parameterTypes) {
-
- Constructor aConstructor = null;
-
- // Use reflection to try and find a constructor. The argumentClassNames must be converted to classes
- try {
- aConstructor = fClass.getConstructor(parameterTypes);
- } catch (Exception e) {
- ProxyPlugin.getPlugin().getLogger().log(new Status(IStatus.WARNING, ProxyPlugin.getPlugin().getBundle().getSymbolicName(), 0, "", e)); //$NON-NLS-1$
- }
- // If we have a constructor return it
- if (aConstructor != null) {
- return getNewConstructorProxy(aConstructor);
- } else {
- return null;
- }
-
- }
-
- /**
- * Factored into its own method so subclass can override
- */
- protected IConstructorProxy getNewConstructorProxy(Constructor aConstructor) {
-
- return ((IDEMethodProxyFactory) fProxyFactoryRegistry.getMethodProxyFactory()).getConstructorProxy(aConstructor);
-
- }
-
- /**
- * Return a proxy to the null constructor for the target VM being the same as the IDE We can use the package protected contstructor on
- * IDEConstructorProxy
- */
- public IConstructorProxy getNullConstructorProxy() {
-
- Constructor aConstructor = null;
-
- // Use reflection to try and find a constructor. The argumentClassNames must be converted to classes
- try {
- aConstructor = fClass.getConstructor(null);
- return ((IDEMethodProxyFactory) fProxyFactoryRegistry.getMethodProxyFactory()).getConstructorProxy(aConstructor);
- } catch (Exception e) {
- ProxyPlugin.getPlugin().getLogger().log(new Status(IStatus.WARNING, ProxyPlugin.getPlugin().getBundle().getSymbolicName(), 0, "", e)); //$NON-NLS-1$
- return null;
- }
-
- }
-
- public IBeanProxy newInstance(String initializationString) {
- return ((IDEStandardBeanProxyFactory) fProxyFactoryRegistry.getBeanProxyFactory()).createBeanProxy(this, initializationString);
- }
-
- public IBeanProxy newInstance() {
- return ((IDEStandardBeanProxyFactory) fProxyFactoryRegistry.getBeanProxyFactory()).createBeanProxy(this);
- }
-
- /**
- * Create a new bean proxy with the specified object Use the constructor that allows the type proxy to be set as well as the bean because we are
- * the type and by setting it now we might avoid it being lookup for in the factory the first time it is asked for
- *
- * NOTE: All subclasses need to override this to return the appropriate IDEBeanProxy.
- */
- protected IIDEBeanProxy newBeanProxy(Object anObject) {
-
- return new IDEObjectBeanProxy(fProxyFactoryRegistry, anObject, this);
-
- }
-
- /**
- * Create a subclass beantype proxy.
- */
- public IDEBeanTypeProxy newBeanTypeForClass(Class type) {
- // Default is just another instance of this same class.
- return new IDEBeanTypeProxy(fProxyFactoryRegistry, type);
- }
-
- /**
- * @see IBeanTypeProxy#getFormalTypeName()
- */
- public String getFormalTypeName() {
- return getTypeName();
- }
-
- /**
- * @see org.eclipse.jem.internal.proxy.core.IBeanTypeProxy#getInitializationError()
- */
- public String getInitializationError() {
- return null; // By default none have an initialization error. There is a special instance for init errors.
- }
-
- /*
- * (non-Javadoc)
- *
- * @see org.eclipse.jem.internal.proxy.core.IBeanTypeProxy#getCompatibleConstructor(org.eclipse.jem.internal.proxy.core.IBeanTypeProxy[])
- */
- public IConstructorProxy getCompatibleConstructor(IBeanTypeProxy[] argumentTypes) throws AmbiguousMethodException, NoSuchMethodException, IllegalAccessException {
-
- Class[] argClasses = new Class[argumentTypes.length];
- for (int i = 0; i < argumentTypes.length; i++) {
- argClasses[i] = ((IDEBeanTypeProxy) argumentTypes[i]).fClass;
- }
- return ((IDEMethodProxyFactory) fProxyFactoryRegistry.getMethodProxyFactory()).getCompatibleConstructor(fClass, argClasses);
- }
-
- /*
- * (non-Javadoc)
- *
- * @see org.eclipse.jem.internal.proxy.core.IBeanTypeProxy#getCompatibleMethod(java.lang.String,
- * org.eclipse.jem.internal.proxy.core.IBeanTypeProxy[])
- */
- public IMethodProxy getCompatibleMethod(String methodName, IBeanTypeProxy[] argumentTypes) throws NoSuchMethodException, AmbiguousMethodException {
- Class[] argClasses = new Class[argumentTypes.length];
- for (int i = 0; i < argumentTypes.length; i++) {
- argClasses[i] = ((IDEBeanTypeProxy) argumentTypes[i]).fClass;
- }
- return ((IDEMethodProxyFactory) fProxyFactoryRegistry.getMethodProxyFactory()).getCompatibleMethod(fClass, methodName, argClasses);
- }
-
- /*
- * (non-Javadoc)
- * @see org.eclipse.jem.internal.proxy.core.IProxyBeanType#getMethodProxy(org.eclipse.jem.internal.proxy.core.IExpression, java.lang.String, org.eclipse.jem.internal.proxy.core.IProxyBeanType[])
- */
- public IProxyMethod getMethodProxy(IExpression expression, String methodName, IProxyBeanType[] parameterTypes) {
- IProxyMethod method = ((IDEExpression) expression).getMethodExpressionProxy(this, methodName, parameterTypes);
- if (method == null) {
- // Need to go to the expression and create it.
- method = ((Expression) expression).createMethodExpressionProxy(this, methodName, parameterTypes);
- }
- return method;
- }
-
-
- /* (non-Javadoc)
- * @see org.eclipse.jem.internal.proxy.core.IProxyBeanType#getMethodProxy(org.eclipse.jem.internal.proxy.core.IExpression, java.lang.String, java.lang.String[])
- */
- public IProxyMethod getMethodProxy(IExpression expression, String methodName, String[] parameterTypes) {
- return ((IDEMethodProxyFactory) fProxyFactoryRegistry.getMethodProxyFactory()).getMethodProxy(expression, this, methodName, parameterTypes);
- }
-
- public IProxyMethod getMethodProxy(IExpression expression, String methodName) {
- return getMethodProxy(expression, methodName, (IProxyBeanType[]) null);
- }
-
- /* (non-Javadoc)
- * @see org.eclipse.jem.internal.proxy.core.IProxyBeanType#getFieldProxy(org.eclipse.jem.internal.proxy.core.IExpression, java.lang.String)
- */
- public IProxyField getFieldProxy(IExpression expression, String fieldName) {
- IProxyField field = ((IDEExpression) expression).getFieldExpressionProxy(this, fieldName);
- if (field == null) {
- // Need to go to the expression and create it.
- field = ((Expression) expression).createFieldExpressionProxy(this, fieldName);
- }
- return field;
- }
-}
diff --git a/plugins/org.eclipse.jem.proxy/proxyide/org/eclipse/jem/internal/proxy/ide/IDEBigDecimalBeanTypeProxy.java b/plugins/org.eclipse.jem.proxy/proxyide/org/eclipse/jem/internal/proxy/ide/IDEBigDecimalBeanTypeProxy.java
deleted file mode 100644
index a49926e..0000000
--- a/plugins/org.eclipse.jem.proxy/proxyide/org/eclipse/jem/internal/proxy/ide/IDEBigDecimalBeanTypeProxy.java
+++ /dev/null
@@ -1,38 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2001, 2005 IBM Corporation and others.
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
- *
- * Contributors:
- * IBM Corporation - initial API and implementation
- *******************************************************************************/
-package org.eclipse.jem.internal.proxy.ide;
-/*
-
-
- */
-
-import org.eclipse.jem.internal.proxy.core.*;
-import java.math.*;
-
-final class IDEBigDecimalBeanTypeProxy extends IDENumberBeanTypeProxy {
-// Some values are cache'd for speed
-IDEBigDecimalBeanTypeProxy(IDEProxyFactoryRegistry aRegistry, Class aClass) {
- super(aRegistry, aClass,new BigDecimal(0));
-}
-/**
- * Static helper to create a bean proxy
- * Package protected because everyone should go through the factory API
- * that is defined as part of IBeanProxyFactory
- */
-INumberBeanProxy createBigDecimalBeanProxy(BigDecimal aBigDecimal) {
- if ( aBigDecimal == null || aBigDecimal.intValue() == 0 ) {
- return zeroProxy;
- } else {
- return new IDENumberBeanProxy(fProxyFactoryRegistry,aBigDecimal,this);
- }
-}
-}
-
diff --git a/plugins/org.eclipse.jem.proxy/proxyide/org/eclipse/jem/internal/proxy/ide/IDEBigIntegerBeanTypeProxy.java b/plugins/org.eclipse.jem.proxy/proxyide/org/eclipse/jem/internal/proxy/ide/IDEBigIntegerBeanTypeProxy.java
deleted file mode 100644
index 07e3cae..0000000
--- a/plugins/org.eclipse.jem.proxy/proxyide/org/eclipse/jem/internal/proxy/ide/IDEBigIntegerBeanTypeProxy.java
+++ /dev/null
@@ -1,40 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2001, 2005 IBM Corporation and others.
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
- *
- * Contributors:
- * IBM Corporation - initial API and implementation
- *******************************************************************************/
-package org.eclipse.jem.internal.proxy.ide;
-/*
-
-
- */
-
-import org.eclipse.jem.internal.proxy.core.*;
-import java.math.*;
-/**
- * IDE Implementation of IIntegerBeanTypeProxy
- */
-final class IDEBigIntegerBeanTypeProxy extends IDENumberBeanTypeProxy {
-// Some values are cache'd for speed
-IDEBigIntegerBeanTypeProxy(IDEProxyFactoryRegistry aRegistry, Class aClass) {
- super(aRegistry, aClass, new BigInteger("0")); //$NON-NLS-1$
-}
-/**
- * Static helper to create a bean proxy
- * Package protected because everyone should go through the factory API
- * that is defined as part of IBeanProxyFactory
- */
-INumberBeanProxy createBigIntegerBeanProxy(BigInteger aBigInteger) {
- if ( aBigInteger == null || aBigInteger.intValue() == 0 ) {
- return zeroProxy;
- } else {
- return new IDENumberBeanProxy(fProxyFactoryRegistry,aBigInteger,this);
- }
-}
-}
-
diff --git a/plugins/org.eclipse.jem.proxy/proxyide/org/eclipse/jem/internal/proxy/ide/IDEBooleanBeanProxy.java b/plugins/org.eclipse.jem.proxy/proxyide/org/eclipse/jem/internal/proxy/ide/IDEBooleanBeanProxy.java
deleted file mode 100644
index 607d780..0000000
--- a/plugins/org.eclipse.jem.proxy/proxyide/org/eclipse/jem/internal/proxy/ide/IDEBooleanBeanProxy.java
+++ /dev/null
@@ -1,45 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2001, 2005 IBM Corporation and others.
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
- *
- * Contributors:
- * IBM Corporation - initial API and implementation
- *******************************************************************************/
-package org.eclipse.jem.internal.proxy.ide;
-/*
-
-
- */
-
-import org.eclipse.jem.internal.proxy.core.*;
-/**
- * IDE Implementation of IBooleanBeanProxy..
- * Creation date: (2/6/00 9:02:54 AM)
- * @author: Joe Winchester
- */
-class IDEBooleanBeanProxy extends IDEObjectBeanProxy implements IBooleanBeanProxy {
- protected Boolean fBooleanValue;
-/**
- * As well as storing the bean store the boolean value so that we can return the booleanValue faster
- * without the need for repeated re-casting. It is package protected because it is created in
- * special way, so no one else should create these.
- * @param aBean java.lang.Object
- */
-IDEBooleanBeanProxy(IDEProxyFactoryRegistry aRegistry, Object aBean, IBeanTypeProxy aBeanTypeProxy) {
- super(aRegistry, aBean,aBeanTypeProxy);
- fBooleanValue = (Boolean)aBean;
-}
-public boolean booleanValue() {
- return fBooleanValue.booleanValue();
-}
-public Boolean getBooleanValue() {
- return fBooleanValue;
-}
-}
-
-
-
-
diff --git a/plugins/org.eclipse.jem.proxy/proxyide/org/eclipse/jem/internal/proxy/ide/IDEBooleanBeanTypeProxy.java b/plugins/org.eclipse.jem.proxy/proxyide/org/eclipse/jem/internal/proxy/ide/IDEBooleanBeanTypeProxy.java
deleted file mode 100644
index c06f941..0000000
--- a/plugins/org.eclipse.jem.proxy/proxyide/org/eclipse/jem/internal/proxy/ide/IDEBooleanBeanTypeProxy.java
+++ /dev/null
@@ -1,46 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2003, 2005 IBM Corporation and others.
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
- *
- * Contributors:
- * IBM Corporation - initial API and implementation
- *******************************************************************************/
-/*
- * Created on Sep 15, 2003
- *
- * To change the template for this generated file go to
- * Window>Preferences>Java>Code Generation>Code and Comments
- */
-package org.eclipse.jem.internal.proxy.ide;
-
-import org.eclipse.jem.internal.proxy.core.IBeanProxy;
-import org.eclipse.jem.internal.proxy.core.IBeanTypeProxy;
-
-/**
- * @author richkulp
- *
- * To change the template for this generated type comment go to
- * Window>Preferences>Java>Code Generation>Code and Comments
- */
-public class IDEBooleanBeanTypeProxy extends IDEBooleanBeanProxy {
-
- /**
- * @param aRegistry
- * @param aBean
- * @param aBeanTypeProxy
- */
- public IDEBooleanBeanTypeProxy(IDEProxyFactoryRegistry aRegistry, Object aBean, IBeanTypeProxy aBeanTypeProxy) {
- super(aRegistry, aBean, aBeanTypeProxy);
- }
-
- /* (non-Javadoc)
- * @see org.eclipse.jem.internal.proxy.core.IBeanProxy#sameAs(org.eclipse.jem.internal.proxy.core.IBeanProxy)
- */
- public boolean sameAs(IBeanProxy aBeanProxy) {
- return (aBeanProxy instanceof IDEBooleanBeanTypeProxy) ? getBooleanValue() == ((IDEBooleanBeanTypeProxy) aBeanProxy).getBooleanValue() : false;
- }
-
-}
diff --git a/plugins/org.eclipse.jem.proxy/proxyide/org/eclipse/jem/internal/proxy/ide/IDEBooleanClassBeanTypeProxy.java b/plugins/org.eclipse.jem.proxy/proxyide/org/eclipse/jem/internal/proxy/ide/IDEBooleanClassBeanTypeProxy.java
deleted file mode 100644
index 8a38395..0000000
--- a/plugins/org.eclipse.jem.proxy/proxyide/org/eclipse/jem/internal/proxy/ide/IDEBooleanClassBeanTypeProxy.java
+++ /dev/null
@@ -1,49 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2001, 2005 IBM Corporation and others.
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
- *
- * Contributors:
- * IBM Corporation - initial API and implementation
- *******************************************************************************/
-package org.eclipse.jem.internal.proxy.ide;
-/*
-
-
- */
-
-import org.eclipse.jem.internal.proxy.core.*;
-
-final public class IDEBooleanClassBeanTypeProxy extends IDEBeanTypeProxy {
-
- // Cache these instances. Since the BeanType proxies are cached also, only one instance
- // of true/false will be in system.
- protected final IDEBooleanBeanProxy trueProxy;
- protected final IDEBooleanBeanProxy falseProxy;
-
-IDEBooleanClassBeanTypeProxy(IDEProxyFactoryRegistry aRegistry, Class aClass) {
-
- super(aRegistry, aClass);
- trueProxy = new IDEBooleanBeanProxy( fProxyFactoryRegistry, Boolean.TRUE, this );
- falseProxy = new IDEBooleanBeanProxy( fProxyFactoryRegistry, Boolean.FALSE, this);
-}
-IBooleanBeanProxy createBooleanBeanProxy(Boolean aBoolean) {
- if ( aBoolean.booleanValue() ){
- return trueProxy;
- } else {
- return falseProxy;
- }
-}
-/* Specialized from IDEBeanTypeProxy to ensure IBooleanBeanProxies are created correctly
- */
-protected IIDEBeanProxy newBeanProxy(Object anObject){
-
- if ( anObject == null || anObject == Boolean.FALSE ) {
- return falseProxy;
- } else {
- return trueProxy;
- }
-}
-}
diff --git a/plugins/org.eclipse.jem.proxy/proxyide/org/eclipse/jem/internal/proxy/ide/IDEBooleanTypeBeanTypeProxy.java b/plugins/org.eclipse.jem.proxy/proxyide/org/eclipse/jem/internal/proxy/ide/IDEBooleanTypeBeanTypeProxy.java
deleted file mode 100644
index 29548f5..0000000
--- a/plugins/org.eclipse.jem.proxy/proxyide/org/eclipse/jem/internal/proxy/ide/IDEBooleanTypeBeanTypeProxy.java
+++ /dev/null
@@ -1,59 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2001, 2005 IBM Corporation and others.
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
- *
- * Contributors:
- * IBM Corporation - initial API and implementation
- *******************************************************************************/
-package org.eclipse.jem.internal.proxy.ide;
-/*
-
-
- */
-
-import org.eclipse.jem.internal.proxy.core.*;
-
-final public class IDEBooleanTypeBeanTypeProxy extends IDEPrimitiveBeanTypeProxy {
-
- // Cache these instances. Since the BeanType proxies are cached also, only one instance
- // of true/false will be in system.
- protected final IDEBooleanBeanProxy trueProxy;
- protected final IDEBooleanBeanProxy falseProxy;
-
-IDEBooleanTypeBeanTypeProxy(IDEProxyFactoryRegistry aRegistry, Class aClass) {
-
- super(aRegistry, aClass);
- trueProxy = new IDEBooleanBeanTypeProxy( fProxyFactoryRegistry, Boolean.TRUE, this );
- falseProxy = new IDEBooleanBeanTypeProxy( fProxyFactoryRegistry, Boolean.FALSE, this );
-
- // TODO Need to go through all of the primitives, separate them out into a separate classes so
- // that sameAs can work with them correctly. Currently only boolean type will do sameAs correctly.
- // Should also look into storing the primitive in the proxy instead of creating a new wrapper object
- // for each for the non-boolean primitives.
-}
-/**
- * Static helper to create a bean proxy
- * Package protected because everyone should go through the factory API
- * that is defined as part of IBeanProxyFactory
- */
-IBooleanBeanProxy createBooleanBeanProxy(boolean aBoolean) {
- if ( aBoolean ){
- return trueProxy;
- } else {
- return falseProxy;
- }
-}
-/* Specialized from IDEBeanTypeProxy to ensure IBooleanBeanProxies are created correctly
- */
-protected IIDEBeanProxy newBeanProxy(Object anObject){
-
- return (IIDEBeanProxy)createBooleanBeanProxy( anObject != null ? ((Boolean)anObject).booleanValue() : false );
-
-}
-int getPrimitiveType(){
- return BOOLEAN;
-}
-}
diff --git a/plugins/org.eclipse.jem.proxy/proxyide/org/eclipse/jem/internal/proxy/ide/IDEByteClassBeanTypeProxy.java b/plugins/org.eclipse.jem.proxy/proxyide/org/eclipse/jem/internal/proxy/ide/IDEByteClassBeanTypeProxy.java
deleted file mode 100644
index a8e3e6a..0000000
--- a/plugins/org.eclipse.jem.proxy/proxyide/org/eclipse/jem/internal/proxy/ide/IDEByteClassBeanTypeProxy.java
+++ /dev/null
@@ -1,32 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2001, 2005 IBM Corporation and others.
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
- *
- * Contributors:
- * IBM Corporation - initial API and implementation
- *******************************************************************************/
-package org.eclipse.jem.internal.proxy.ide;
-/*
-
-
- */
-
-import org.eclipse.jem.internal.proxy.core.*;
-
-/**
- * Byte BeanType Proxy.
- */
-final class IDEByteClassBeanTypeProxy extends IDENumberBeanTypeProxy {
-
-protected IDEByteClassBeanTypeProxy(IDEProxyFactoryRegistry aRegistry, Class aClass) {
- super(aRegistry, aClass, new Byte((byte)0));
-}
-INumberBeanProxy createByteBeanProxy(Byte aByte){
- return new IDENumberBeanProxy(fProxyFactoryRegistry,aByte,this);
-}
-}
-
-
diff --git a/plugins/org.eclipse.jem.proxy/proxyide/org/eclipse/jem/internal/proxy/ide/IDEByteTypeBeanTypeProxy.java b/plugins/org.eclipse.jem.proxy/proxyide/org/eclipse/jem/internal/proxy/ide/IDEByteTypeBeanTypeProxy.java
deleted file mode 100644
index 5017110..0000000
--- a/plugins/org.eclipse.jem.proxy/proxyide/org/eclipse/jem/internal/proxy/ide/IDEByteTypeBeanTypeProxy.java
+++ /dev/null
@@ -1,36 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2001, 2005 IBM Corporation and others.
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
- *
- * Contributors:
- * IBM Corporation - initial API and implementation
- *******************************************************************************/
-package org.eclipse.jem.internal.proxy.ide;
-/*
-
-
- */
-
-import org.eclipse.jem.internal.proxy.core.*;
-/**
- * Byte BeanType Proxy.
- */
-final class IDEByteTypeBeanTypeProxy extends IDEPrimitiveBeanTypeProxy {
-protected IDEByteTypeBeanTypeProxy(IDEProxyFactoryRegistry aRegistry, Class aClass) {
- super(aRegistry, aClass);
-}
-INumberBeanProxy createByteBeanProxy(byte aByte){
- return new IDENumberBeanProxy(fProxyFactoryRegistry,new Byte(aByte),this);
-}
-int getPrimitiveType(){
- return BYTE;
-}
-protected IIDEBeanProxy newBeanProxy(Object anObject){
- Number n = anObject instanceof Character ? new Byte((byte)((Character) anObject).charValue()) : (Number) anObject;
- return new IDENumberBeanProxy(fProxyFactoryRegistry, n, this);
-}
-}
-
diff --git a/plugins/org.eclipse.jem.proxy/proxyide/org/eclipse/jem/internal/proxy/ide/IDECallbackRegistry.java b/plugins/org.eclipse.jem.proxy/proxyide/org/eclipse/jem/internal/proxy/ide/IDECallbackRegistry.java
deleted file mode 100644
index e25f767..0000000
--- a/plugins/org.eclipse.jem.proxy/proxyide/org/eclipse/jem/internal/proxy/ide/IDECallbackRegistry.java
+++ /dev/null
@@ -1,150 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2001, 2005 IBM Corporation and others.
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
- *
- * Contributors:
- * IBM Corporation - initial API and implementation
- *******************************************************************************/
-package org.eclipse.jem.internal.proxy.ide;
-/*
-
-
- */
-
-import java.io.*;
-import java.lang.reflect.Method;
-import java.util.HashMap;
-import java.util.Map;
-
-import org.eclipse.core.runtime.IStatus;
-import org.eclipse.core.runtime.Status;
-
-import org.eclipse.jem.internal.proxy.core.*;
-import org.eclipse.jem.internal.proxy.core.ExpressionProxy.ProxyEvent;
-
-public class IDECallbackRegistry implements ICallbackRegistry {
-
- IDEVMServer fVMServer;
- int fNextCallbackID;
- IDEProxyFactoryRegistry fProxyFactoryRegistry;
- Map fCallbackIDToCallback = new HashMap(25);
- Map fBeanProxyToCallbackID = new HashMap(25);
- Map fCallbackIDToStream = new HashMap(25);
- private IProxyMethod initializeCallbackMethodProxy;
- private IBeanProxy vmServerProxy;
-
-IDECallbackRegistry(IDEProxyFactoryRegistry aRegistry){
- fProxyFactoryRegistry = aRegistry;
- fVMServer = new IDEVMServer(this);
-
- vmServerProxy = aRegistry.getBeanProxy(fVMServer.getClass(), fVMServer);
-
- try {
- Method initializeCallbackMethod = org.eclipse.jem.internal.proxy.common.ICallback.class.getMethod("initializeCallback", new Class[] {org.eclipse.jem.internal.proxy.common.IVMCallbackServer.class, Integer.TYPE}); //$NON-NLS-1$
- initializeCallbackMethodProxy = (IProxyMethod) aRegistry.getBeanProxy(Method.class, initializeCallbackMethod);
- } catch (SecurityException e) {
- e.printStackTrace();
- } catch (NoSuchMethodException e) {
- e.printStackTrace();
- }
-
-}
-
-
-/**
- * Add a callback. aBeanProxy is running on the target VM and ICallback runs on our VM
- * aBeanProxy will implement ICallback on the target side
- */
-public void registerCallback(IBeanProxy aBeanProxy, ICallback aCallback){
-
- // Get a handle to the remote VM callback
- org.eclipse.jem.internal.proxy.common.ICallback vmCallback = (org.eclipse.jem.internal.proxy.common.ICallback) ((IIDEBeanProxy)aBeanProxy).getBean();
- fNextCallbackID = fNextCallbackID + 1;
- int callbackID = fNextCallbackID;
- vmCallback.initializeCallback(
- fVMServer,
- callbackID);
- Integer callbackIntegerID = new Integer(callbackID);
- fCallbackIDToCallback.put(callbackIntegerID,aCallback);
- fBeanProxyToCallbackID.put(aBeanProxy,callbackIntegerID);
-
-}
-
-
-/* (non-Javadoc)
- * @see org.eclipse.jem.internal.proxy.core.ICallbackRegistry#registerCallback(org.eclipse.jem.internal.proxy.core.IProxy, org.eclipse.jem.internal.proxy.core.ICallback, org.eclipse.jem.internal.proxy.core.IExpression)
- */
-public void registerCallback(IProxy callbackProxy, final ICallback cb, IExpression expression) {
- final Integer callbackID = new Integer(++fNextCallbackID);
- fCallbackIDToCallback.put(callbackID, cb);
- if (callbackProxy.isBeanProxy()) {
- fBeanProxyToCallbackID.put(callbackProxy, callbackID);
- } else {
- ((ExpressionProxy) callbackProxy).addProxyListener(new ExpressionProxy.ProxyAdapter() {
- public void proxyResolved(ProxyEvent event) {
- fBeanProxyToCallbackID.put(event.getProxy(), callbackID);
- }
- });
- }
- expression.createSimpleMethodInvoke(initializeCallbackMethodProxy, callbackProxy, new IProxy[] {vmServerProxy, fProxyFactoryRegistry.getBeanProxyFactory().createBeanProxyWith(callbackID.intValue())}, false);
-
-}
-
-OutputStream requestStream(final int aCallbackID, final int aMsgID){
- final PipedOutputStream result = new PipedOutputStream();
- PipedInputStream tempStream = null;
- try {
- tempStream = new PipedInputStream(result);
- } catch ( IOException exc ) {
- ProxyPlugin.getPlugin().getLogger().log(new Status(IStatus.WARNING, ProxyPlugin.getPlugin().getBundle().getSymbolicName(), 0, "", exc)); //$NON-NLS-1$
- return null;
- }
- final PipedInputStream inputStream = tempStream;
- Thread streamProcessor = new Thread(){
- public void run(){
- ICallback ideCallback = (ICallback)fCallbackIDToCallback.get(new Integer(aCallbackID));
- if (ideCallback != null) {
- try {
- ideCallback.calledBackStream(aMsgID, inputStream);
- } finally {
- try {
- inputStream.close(); // Make sure it's closed.
- } catch ( IOException exc ){
- ProxyPlugin.getPlugin().getLogger().log(new Status(IStatus.WARNING, ProxyPlugin.getPlugin().getBundle().getSymbolicName(), 0, "", exc)); //$NON-NLS-1$
- }
- }
- }
- }
- };
- streamProcessor.start();
- return result;
-}
-
-Object vmCallback(int aCallbackID ,int aMsgID, Object[] parms){
- // Find the bean proxy that registered with the ID
- ICallback ideCallback = (ICallback) fCallbackIDToCallback.get(new Integer(aCallbackID));
- Object callbackResult = null;
- if ( parms.length == 1 ) {
- callbackResult = ideCallback.calledBack(aMsgID,(IBeanProxy)parms[0]);
- } else {
- callbackResult = ideCallback.calledBack(aMsgID,parms);
- }
- return callbackResult;
-}
-
-Object vmCallback(int aCallbackID ,int aMsgID, Object parm){
- // Find the bean proxy that registered with the ID
- ICallback ideCallback = (ICallback) fCallbackIDToCallback.get(new Integer(aCallbackID));
- return ideCallback.calledBack(aMsgID,parm);
-}
-
-public void deregisterCallback(IBeanProxy aBeanProxy){
- // Remove the callback from both maps. The actual unregistering of the callback
- // on the target VM is done separately by the object that added the event handler on the target VM
- Integer callbackID = (Integer) fBeanProxyToCallbackID.remove(aBeanProxy);
- fCallbackIDToCallback.remove(callbackID);
-}
-}
diff --git a/plugins/org.eclipse.jem.proxy/proxyide/org/eclipse/jem/internal/proxy/ide/IDECharTypeBeanTypeProxy.java b/plugins/org.eclipse.jem.proxy/proxyide/org/eclipse/jem/internal/proxy/ide/IDECharTypeBeanTypeProxy.java
deleted file mode 100644
index 970d7f5..0000000
--- a/plugins/org.eclipse.jem.proxy/proxyide/org/eclipse/jem/internal/proxy/ide/IDECharTypeBeanTypeProxy.java
+++ /dev/null
@@ -1,39 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2001, 2005 IBM Corporation and others.
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
- *
- * Contributors:
- * IBM Corporation - initial API and implementation
- *******************************************************************************/
-package org.eclipse.jem.internal.proxy.ide;
-/*
-
-
- */
-
-import org.eclipse.jem.internal.proxy.core.*;
-
-/**
- * char BeanType Proxy.
- */
-final class IDECharTypeBeanTypeProxy extends IDEPrimitiveBeanTypeProxy {
-protected IDECharTypeBeanTypeProxy(IDEProxyFactoryRegistry aRegistry, Class aClass) {
- super(aRegistry, aClass);
-}
-ICharacterBeanProxy createCharBeanProxy(char aChar){
- return new IDECharacterBeanProxy(fProxyFactoryRegistry,new Character(aChar),this);
-}
-int getPrimitiveType(){
- return CHAR;
-}
-protected IIDEBeanProxy newBeanProxy(Object anObject){
- Character c = anObject instanceof Character ? (Character) anObject : new Character((char)((Number) anObject).intValue());
- return new IDECharacterBeanProxy(fProxyFactoryRegistry, c, this);
-
-}
-}
-
-
diff --git a/plugins/org.eclipse.jem.proxy/proxyide/org/eclipse/jem/internal/proxy/ide/IDECharacterBeanProxy.java b/plugins/org.eclipse.jem.proxy/proxyide/org/eclipse/jem/internal/proxy/ide/IDECharacterBeanProxy.java
deleted file mode 100644
index cf5b69b..0000000
--- a/plugins/org.eclipse.jem.proxy/proxyide/org/eclipse/jem/internal/proxy/ide/IDECharacterBeanProxy.java
+++ /dev/null
@@ -1,84 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2001, 2005 IBM Corporation and others.
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
- *
- * Contributors:
- * IBM Corporation - initial API and implementation
- *******************************************************************************/
-package org.eclipse.jem.internal.proxy.ide;
-/*
- * $RCSfile: IDECharacterBeanProxy.java,v $ $Revision: 1.6 $ $Date: 2005/08/24 20:39:06 $
- */
-
-import org.eclipse.jem.internal.proxy.core.*;
-/**
- * IDE Implementation of ICharacterBeanBeanProxy..
- */
-class IDECharacterBeanProxy extends IDEObjectBeanProxy implements ICharacterBeanProxy {
- protected Character fCharacterValue;
- IDECharacterBeanProxy(IDEProxyFactoryRegistry aRegistry, Object aBean, IBeanTypeProxy aBeanTypeProxy) {
- super(aRegistry, aBean, aBeanTypeProxy);
- fCharacterValue = (Character) aBean;
- }
- public char charValue() {
- return fCharacterValue.charValue();
- }
- public Character characterValue() {
- return fCharacterValue;
- }
- /*
- * (non-Javadoc)
- *
- * @see org.eclipse.jem.internal.proxy.core.IIntegerBeanProxy#intValue()
- */
- public int intValue() {
- return charValue();
- }
-
- /* (non-Javadoc)
- * @see org.eclipse.jem.internal.proxy.core.INumberBeanProxy#byteValue()
- */
- public byte byteValue() {
- return (byte) charValue();
- }
-
- /* (non-Javadoc)
- * @see org.eclipse.jem.internal.proxy.core.INumberBeanProxy#doubleValue()
- */
- public double doubleValue() {
- return charValue();
- }
-
- /* (non-Javadoc)
- * @see org.eclipse.jem.internal.proxy.core.INumberBeanProxy#floatValue()
- */
- public float floatValue() {
- return charValue();
- }
-
- /* (non-Javadoc)
- * @see org.eclipse.jem.internal.proxy.core.INumberBeanProxy#longValue()
- */
- public long longValue() {
- return charValue();
- }
-
- /* (non-Javadoc)
- * @see org.eclipse.jem.internal.proxy.core.INumberBeanProxy#numberValue()
- */
- public Number numberValue() {
- // This is a kludge. Need to new one up.
- return new Integer(charValue());
- }
-
- /* (non-Javadoc)
- * @see org.eclipse.jem.internal.proxy.core.INumberBeanProxy#shortValue()
- */
- public short shortValue() {
- return (short) charValue();
- }
-
-}
diff --git a/plugins/org.eclipse.jem.proxy/proxyide/org/eclipse/jem/internal/proxy/ide/IDECharacterClassBeanTypeProxy.java b/plugins/org.eclipse.jem.proxy/proxyide/org/eclipse/jem/internal/proxy/ide/IDECharacterClassBeanTypeProxy.java
deleted file mode 100644
index 8698759..0000000
--- a/plugins/org.eclipse.jem.proxy/proxyide/org/eclipse/jem/internal/proxy/ide/IDECharacterClassBeanTypeProxy.java
+++ /dev/null
@@ -1,30 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2001, 2005 IBM Corporation and others.
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
- *
- * Contributors:
- * IBM Corporation - initial API and implementation
- *******************************************************************************/
-package org.eclipse.jem.internal.proxy.ide;
-/*
-
-
- */
-
-import org.eclipse.jem.internal.proxy.core.*;
-
-/**
- * Char BeanType Proxy.
- */
-final class IDECharacterClassBeanTypeProxy extends IDEBeanTypeProxy {
-
-protected IDECharacterClassBeanTypeProxy(IDEProxyFactoryRegistry aRegistry, Class aClass) {
- super(aRegistry, aClass);
-}
-ICharacterBeanProxy createCharacterBeanProxy(Character aChar){
- return new IDECharacterBeanProxy(fProxyFactoryRegistry,aChar,this);
-}
-}
diff --git a/plugins/org.eclipse.jem.proxy/proxyide/org/eclipse/jem/internal/proxy/ide/IDEClassBeanTypeProxy.java b/plugins/org.eclipse.jem.proxy/proxyide/org/eclipse/jem/internal/proxy/ide/IDEClassBeanTypeProxy.java
deleted file mode 100644
index a95a6cf..0000000
--- a/plugins/org.eclipse.jem.proxy/proxyide/org/eclipse/jem/internal/proxy/ide/IDEClassBeanTypeProxy.java
+++ /dev/null
@@ -1,63 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2004, 2005 IBM Corporation and others.
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
- *
- * Contributors:
- * IBM Corporation - initial API and implementation
- *******************************************************************************/
-/*
-
-
- */
-package org.eclipse.jem.internal.proxy.ide;
-
-import org.eclipse.jem.internal.proxy.core.IBeanProxy;
-
-/**
- * For java.lang.Class type.
- * @since 1.0.0
- */
-public class IDEClassBeanTypeProxy extends IDEBeanTypeProxy {
-
- /**
- * @param aRegistry
- * @param aClass
- *
- * @since 1.0.0
- */
- public IDEClassBeanTypeProxy(IDEProxyFactoryRegistry aRegistry, Class aClass) {
- super(aRegistry, aClass);
- }
-
- /* (non-Javadoc)
- * @see org.eclipse.jem.internal.proxy.ide.IDEBeanTypeProxy#newBeanProxy(java.lang.Object)
- */
- protected IIDEBeanProxy newBeanProxy(Object anObject) {
- return (IIDEBeanProxy) ((IDEStandardBeanTypeProxyFactory) fProxyFactoryRegistry.getBeanTypeProxyFactory()).getBeanTypeProxy((Class) anObject);
- }
-
- /* (non-Javadoc)
- * @see org.eclipse.jem.internal.proxy.ide.IDEBeanTypeProxy#newBeanTypeForClass(java.lang.Class)
- */
- public IDEBeanTypeProxy newBeanTypeForClass(Class type) {
- throw new UnsupportedOperationException();
- }
-
- /* (non-Javadoc)
- * @see org.eclipse.jem.internal.proxy.core.IBeanTypeProxy#newInstance()
- */
- public IBeanProxy newInstance() {
- throw new UnsupportedOperationException();
- }
-
- /* (non-Javadoc)
- * @see org.eclipse.jem.internal.proxy.core.IBeanTypeProxy#newInstance(java.lang.String)
- */
- public IBeanProxy newInstance(String initializationString) {
- throw new UnsupportedOperationException();
- }
-
-}
diff --git a/plugins/org.eclipse.jem.proxy/proxyide/org/eclipse/jem/internal/proxy/ide/IDEConstructorProxy.java b/plugins/org.eclipse.jem.proxy/proxyide/org/eclipse/jem/internal/proxy/ide/IDEConstructorProxy.java
deleted file mode 100644
index 1e2723b..0000000
--- a/plugins/org.eclipse.jem.proxy/proxyide/org/eclipse/jem/internal/proxy/ide/IDEConstructorProxy.java
+++ /dev/null
@@ -1,119 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2001, 2005 IBM Corporation and others.
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
- *
- * Contributors:
- * IBM Corporation - initial API and implementation
- *******************************************************************************/
-package org.eclipse.jem.internal.proxy.ide;
-/*
-
-
- */
-
-import java.lang.reflect.Constructor;
-
-import org.eclipse.core.runtime.IStatus;
-import org.eclipse.core.runtime.Status;
-
-import org.eclipse.jem.internal.proxy.core.*;
-
-/**
- * This is an implementation of IConstructorProxy where the target VM is the same as
- * the IDE. The java.lang.reflect.Constructor instance is held in a field
- */
-class IDEConstructorProxy extends IDEAccessibleObjectProxy implements IConstructorProxy {
-
- /**
- * package protected constructor where the instance of java.lang.reflect.Constructor
- * can be passed in directly
- */
- IDEConstructorProxy(IDEProxyFactoryRegistry aRegistry, Constructor aConstructor) {
- super(aRegistry, aConstructor);
- }
- /**
- * The type proxy is constant proxy out of the method factory.
- */
- public IBeanTypeProxy getTypeProxy() {
- return ((IDEMethodProxyFactory) fProxyFactoryRegistry.getMethodProxyFactory()).constructorType;
- }
-
- /**
- * This is factored into a special method so that subclasses can override
- * if they wish.
- */
- protected IBeanProxy getNewIDEBeanProxy(Object aBean) {
-
- return IDEStandardBeanProxyFactory.createBeanProxy(fProxyFactoryRegistry, aBean); // Use local helper method to do this.
- }
- /**
- * Invoke the constructor and return an IDEBeanProxy with the result
- */
- public IBeanProxy newInstance() {
-
- // Invoke the constructor
- try {
- Object result = ((Constructor) getBean()).newInstance(null);
- return getNewIDEBeanProxy(result);
- } catch (Exception e) {
- ProxyPlugin.getPlugin().getLogger().log(
- new Status(IStatus.WARNING, ProxyPlugin.getPlugin().getBundle().getSymbolicName(), 0, "", e)); //$NON-NLS-1$
- return null;
- }
-
- }
- public IBeanProxy newInstanceCatchThrowableExceptions() {
- return newInstance();
- }
- public IBeanProxy newInstanceCatchThrowableExceptions(IBeanProxy[] args) {
- return newInstance(args);
- }
- /**
- * Invoke the constructor and return an IDEBeanProxy with the result
- */
- public IBeanProxy newInstance(IBeanProxy[] creationArguments) {
-
- // Get an array of bean objects from the bean proxy arguments
- Object result = null;
- Object[] creationObjects = new Object[creationArguments.length];
- for (int i = 0; i < creationArguments.length; i++) {
- // It is possible the arguments are null which is perfectly valid
- if (creationArguments[i] != null)
- creationObjects[i] = ((IIDEBeanProxy) creationArguments[i]).getBean();
- }
-
- // Invoke the constructor
- try {
- result = ((Constructor) getBean()).newInstance(creationObjects);
- } catch (Exception e) {
- ProxyPlugin.getPlugin().getLogger().log(
- new Status(IStatus.WARNING, ProxyPlugin.getPlugin().getBundle().getSymbolicName(), 0, "", e)); //$NON-NLS-1$
- }
-
- // If we have a non-null result create an IDEBeanProxy and return it
- if (result != null) {
- return getNewIDEBeanProxy(result);
- } else {
- return null;
- }
-
- }
-
- /*
- * (non-Javadoc)
- * @see org.eclipse.jem.internal.proxy.core.IConstructorProxy#getParameterTypes()
- */
- public IBeanTypeProxy[] getParameterTypes() {
- Class[] parmClasses = ((Constructor) getBean()).getParameterTypes();
- IBeanTypeProxy[] parmTypes = new IBeanTypeProxy[parmClasses.length];
- IDEStandardBeanTypeProxyFactory factory = (IDEStandardBeanTypeProxyFactory) fProxyFactoryRegistry.getBeanTypeProxyFactory();
- for (int i = 0; i < parmClasses.length; i++) {
- parmTypes[i] = factory.getBeanTypeProxy(parmClasses[i]);
- }
- return parmTypes;
- }
-
-}
diff --git a/plugins/org.eclipse.jem.proxy/proxyide/org/eclipse/jem/internal/proxy/ide/IDEConstructorTypeProxy.java b/plugins/org.eclipse.jem.proxy/proxyide/org/eclipse/jem/internal/proxy/ide/IDEConstructorTypeProxy.java
deleted file mode 100644
index cbeb754..0000000
--- a/plugins/org.eclipse.jem.proxy/proxyide/org/eclipse/jem/internal/proxy/ide/IDEConstructorTypeProxy.java
+++ /dev/null
@@ -1,35 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2001, 2005 IBM Corporation and others.
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
- *
- * Contributors:
- * IBM Corporation - initial API and implementation
- *******************************************************************************/
-package org.eclipse.jem.internal.proxy.ide;
-/*
-
-
- */
-
-
-/**
- * @version 1.0
- * @author
- */
-public class IDEConstructorTypeProxy extends IDEBeanTypeProxy {
-
- IDEConstructorTypeProxy(IDEProxyFactoryRegistry registry) {
- super(registry, java.lang.reflect.Constructor.class);
- }
-
- /*
- * @see IDEBeanTypeProxy#newBeanProxy(Object)
- */
- protected IIDEBeanProxy newBeanProxy(Object anObject) {
- return new IDEConstructorProxy(fProxyFactoryRegistry, (java.lang.reflect.Constructor) anObject);
- }
-
-}
diff --git a/plugins/org.eclipse.jem.proxy/proxyide/org/eclipse/jem/internal/proxy/ide/IDEDoubleClassBeanTypeProxy.java b/plugins/org.eclipse.jem.proxy/proxyide/org/eclipse/jem/internal/proxy/ide/IDEDoubleClassBeanTypeProxy.java
deleted file mode 100644
index 4fcb751..0000000
--- a/plugins/org.eclipse.jem.proxy/proxyide/org/eclipse/jem/internal/proxy/ide/IDEDoubleClassBeanTypeProxy.java
+++ /dev/null
@@ -1,32 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2001, 2005 IBM Corporation and others.
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
- *
- * Contributors:
- * IBM Corporation - initial API and implementation
- *******************************************************************************/
-package org.eclipse.jem.internal.proxy.ide;
-/*
-
-
- */
-
-import org.eclipse.jem.internal.proxy.core.*;
-
-/**
- * Double BeanType Proxy.
- */
-final class IDEDoubleClassBeanTypeProxy extends IDENumberBeanTypeProxy {
-
-protected IDEDoubleClassBeanTypeProxy(IDEProxyFactoryRegistry aRegistry, Class aClass) {
- super(aRegistry, aClass, new Double(0));
-}
-INumberBeanProxy createDoubleBeanProxy(Double aDouble){
- return new IDENumberBeanProxy(fProxyFactoryRegistry,aDouble,this);
-}
-}
-
-
diff --git a/plugins/org.eclipse.jem.proxy/proxyide/org/eclipse/jem/internal/proxy/ide/IDEDoubleTypeBeanTypeProxy.java b/plugins/org.eclipse.jem.proxy/proxyide/org/eclipse/jem/internal/proxy/ide/IDEDoubleTypeBeanTypeProxy.java
deleted file mode 100644
index 2945dfb..0000000
--- a/plugins/org.eclipse.jem.proxy/proxyide/org/eclipse/jem/internal/proxy/ide/IDEDoubleTypeBeanTypeProxy.java
+++ /dev/null
@@ -1,37 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2001, 2005 IBM Corporation and others.
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
- *
- * Contributors:
- * IBM Corporation - initial API and implementation
- *******************************************************************************/
-package org.eclipse.jem.internal.proxy.ide;
-/*
-
-
- */
-
-import org.eclipse.jem.internal.proxy.core.*;
-
-/**
- * double BeanType Proxy.
- */
-final class IDEDoubleTypeBeanTypeProxy extends IDEPrimitiveBeanTypeProxy {
-protected IDEDoubleTypeBeanTypeProxy(IDEProxyFactoryRegistry aRegistry, Class aClass) {
- super(aRegistry, aClass);
-}
-INumberBeanProxy createDoubleBeanProxy(double aDouble){
- return new IDENumberBeanProxy(fProxyFactoryRegistry,new Double(aDouble),this);
-}
-int getPrimitiveType(){
- return DOUBLE;
-}
-
-protected IIDEBeanProxy newBeanProxy(Object anObject){
- Number n = anObject instanceof Character ? new Double(((Character) anObject).charValue()) : (Number) anObject;
- return new IDENumberBeanProxy(fProxyFactoryRegistry, n, this);
-}
-}
diff --git a/plugins/org.eclipse.jem.proxy/proxyide/org/eclipse/jem/internal/proxy/ide/IDEExpression.java b/plugins/org.eclipse.jem.proxy/proxyide/org/eclipse/jem/internal/proxy/ide/IDEExpression.java
deleted file mode 100644
index ac88762..0000000
--- a/plugins/org.eclipse.jem.proxy/proxyide/org/eclipse/jem/internal/proxy/ide/IDEExpression.java
+++ /dev/null
@@ -1,1077 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2004, 2005 IBM Corporation and others.
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
- *
- * Contributors:
- * IBM Corporation - initial API and implementation
- *******************************************************************************/
-/*
- * $RCSfile: IDEExpression.java,v $ $Revision: 1.12 $ $Date: 2005/08/24 20:39:06 $
- */
-package org.eclipse.jem.internal.proxy.ide;
-
-import java.util.*;
-
-import org.eclipse.core.runtime.Platform;
-
-import org.eclipse.jem.internal.proxy.common.MethodHelper;
-import org.eclipse.jem.internal.proxy.core.*;
-import org.eclipse.jem.internal.proxy.core.ExpressionProxy.ProxyEvent;
-import org.eclipse.jem.internal.proxy.initParser.tree.*;
-
-/**
- * IDE expression processing.
- *
- * @since 1.0.0
- */
-public class IDEExpression extends Expression {
-
- private final IDEStandardBeanTypeProxyFactory beantypefactory;
- protected final ExpressionProcesser eproc;
- {
- boolean useTracing = !isTraceSet() ?
- "true".equalsIgnoreCase(Platform.getDebugOption(ProxyPlugin.getPlugin().getBundle().getSymbolicName() + ProxyLaunchSupport.EXPRESSION_TRACING)) : //$NON-NLS-1$
- isTrace();
- long threshold = Long.getLong(Platform.getDebugOption(ProxyPlugin.getPlugin().getBundle().getSymbolicName() + ProxyLaunchSupport.EXPRESSION_TRACEING_TIMER_THRESHOLD), -1L).longValue();
- eproc = new ExpressionProcesser(useTracing, threshold);
- }
-
-
- private void processExpressionError() throws ThrowableProxy, NoExpressionValueException {
- if (!eproc.noErrors())
- if (eproc.isNoExpressionValue())
- throw (NoExpressionValueException) eproc.getErrorThrowable();
- else {
- Throwable t = eproc.getErrorThrowable();
- if (t instanceof ThrowableProxy)
- throw (ThrowableProxy) t;
- else
- throw new IDEThrowableProxy(eproc.getErrorThrowable(), beantypefactory.getBeanTypeProxy(t.getClass()));
- }
- }
-
- /**
- * Create the IDEExpression
- *
- * @param registry
- *
- * @since 1.0.0
- */
- public IDEExpression(ProxyFactoryRegistry registry) {
- super(registry);
- beantypefactory = (IDEStandardBeanTypeProxyFactory) registry.getBeanTypeProxyFactory();
- }
-
- protected final IDEProxyFactoryRegistry getIDERegistry() {
- return (IDEProxyFactoryRegistry) registry;
- }
-
- protected final IDEStandardBeanTypeProxyFactory getIDEBeanTypeFactory() {
- return beantypefactory;
- }
-
- /*
- * (non-Javadoc)
- * @see org.eclipse.jem.internal.proxy.core.Expression#pushToProxy(org.eclipse.jem.internal.proxy.core.IProxy)
- */
- protected void pushToProxy(IProxy proxy) {
- if (proxy == null)
- eproc.pushExpression(null, MethodHelper.NULL_TYPE);
- else if (proxy.isBeanProxy())
- eproc.pushExpression(((IDEBeanProxy) proxy).getBean(), ((IDEBeanTypeProxy) ((IBeanProxy) proxy).getTypeProxy()).getTypeClass());
- else
- eproc.pushExpressionProxy(((ExpressionProxy) proxy).getProxyID());
- }
-
- /*
- * (non-Javadoc)
- *
- * @see org.eclipse.jem.internal.proxy.core.Expression#closeProxy()
- */
- protected void closeProxy() {
- methodExpressionProxies = fieldExpressionProxies = null;
- eproc.close();
- }
-
- /*
- * (non-Javadoc)
- * @see org.eclipse.jem.internal.proxy.core.Expression#pullProxyValue(int, java.util.List)
- */
- protected IBeanProxy pullProxyValue(int proxycount, List expressionProxies) throws ThrowableProxy, NoExpressionValueException {
- processExtensionProxies(proxycount, expressionProxies);
- processExpressionError();
- Object result[] = new Object[2];
- eproc.pullValue(result);
- IBeanProxy resultProxy = getIDERegistry().getBeanProxy((Class) result[1], result[0]);
- return resultProxy;
- }
-
- private void processExtensionProxies(int proxycount, List expressionProxies) {
- if (proxycount > 0) {
- int len = expressionProxies.size();
- Object[] proxyResolution = new Object[2];
- for (int i = 0; i < len; i++) {
- ExpressionProxy ep = (ExpressionProxy) expressionProxies.get(i);
- if (ep != null) {
- try {
- eproc.pullExpressionProxyValue(ep.getProxyID(), proxyResolution);
- if (proxyResolution[1] != Void.TYPE)
- fireProxyResolved(ep, getIDERegistry().getBeanProxy((Class) proxyResolution[1], proxyResolution[0]));
- else
- fireProxyVoid(ep);
- } catch (NoExpressionValueException e) {
- fireProxyNotResolved(ep);
- }
- }
- }
- }
- }
-
- /*
- * (non-Javadoc)
- * @see org.eclipse.jem.internal.proxy.core.Expression#pushCastToProxy(org.eclipse.jem.internal.proxy.core.IProxyBeanType)
- */
- protected void pushCastToProxy(IProxyBeanType type) {
- try {
- eproc.pushCast(getIDEBeanTypeProxy(type).getTypeClass());
- } catch (ThrowableProxy e) {
- eproc.processException(e);
- }
- }
-
- /*
- * (non-Javadoc)
- * @see org.eclipse.jem.internal.proxy.core.Expression#pushInstanceofToProxy(org.eclipse.jem.internal.proxy.core.IProxyBeanType)
- */
- protected void pushInstanceofToProxy(IProxyBeanType type) {
- try {
- eproc.pushInstanceof(getIDEBeanTypeProxy(type).getTypeClass());
- } catch (ThrowableProxy e) {
- eproc.processException(e);
- }
- }
-
- /**
- * Get the BeanType proxy and test if valid. Throw ThrowableProxy if not valid.
- *
- * @param type
- * @return
- * @throws ThrowableProxy
- *
- * @since 1.0.0
- */
- protected IDEBeanTypeProxy getIDEBeanTypeProxy(IProxyBeanType type) throws ThrowableProxy {
- IDEBeanTypeProxy typeProxy;
- if (type.isExpressionProxy()) {
- // It should already be resolved at this point.
- typeProxy = ((IDEBeanTypeExpressionProxy) type).getBeanTypeProxy();
- } else
- typeProxy = (IDEBeanTypeProxy) type;
- if (!typeProxy.isValid()) {
- throw new IDEThrowableProxy(
- new Exception(typeProxy.getInitializationError()),
- getIDEBeanTypeFactory().getBeanTypeProxy(Exception.class));
- } else
- return typeProxy;
- }
-
-
- /**
- * Get the BeanType proxy and test if valid. Throw ThrowableProxy if not valid.
- * @param type
- * @return
- * @throws ThrowableProxy
- *
- * @since 1.1.0
- */
- protected IDEBeanTypeProxy getIDEBeanTypeProxy(String type) throws ThrowableProxy {
- return (IDEBeanTypeProxy) registry.getBeanTypeProxyFactory().getBeanTypeProxy(type);
- }
-
- /*
- * (non-Javadoc)
- * @see org.eclipse.jem.internal.proxy.core.Expression#pushPrefixToProxy(org.eclipse.jem.internal.proxy.initParser.tree.PrefixOperator)
- */
- protected void pushPrefixToProxy(PrefixOperator operator) {
- eproc.pushPrefix(operator);
- }
-
- /*
- * (non-Javadoc)
- * @see org.eclipse.jem.internal.proxy.core.Expression#pushInfixToProxy(org.eclipse.jem.internal.proxy.initParser.tree.InfixOperator, org.eclipse.jem.internal.proxy.initParser.tree.InternalInfixOperandType)
- */
- protected void pushInfixToProxy(InfixOperator operator, InternalInfixOperandType operandType) {
- eproc.pushInfix(operator, operandType);
- }
-
- /* (non-Javadoc)
- * @see org.eclipse.jem.internal.proxy.core.Expression#pushArrayAccessToProxy(int)
- */
- protected void pushArrayAccessToProxy(int indexCount) {
- eproc.pushArrayAccess(indexCount);
- }
-
- /*
- * (non-Javadoc)
- * @see org.eclipse.jem.internal.proxy.core.Expression#pushArrayCreationToProxy(org.eclipse.jem.internal.proxy.core.IProxyBeanType, int)
- */
- protected void pushArrayCreationToProxy(IProxyBeanType type, int dimensionCount) {
- try {
- eproc.pushArrayCreation(getIDEBeanTypeProxy(type).getTypeClass(), dimensionCount);
- } catch (ThrowableProxy e) {
- eproc.processException(e);
- }
- }
-
- protected void pushArrayInitializerToProxy(IProxyBeanType type, int stripCount, int expressionCount) {
- try {
- eproc.pushArrayInitializer(getIDEBeanTypeProxy(type).getTypeClass(), stripCount, expressionCount);
- } catch (ThrowableProxy e) {
- eproc.processException(e);
- }
- }
-
- /*
- * (non-Javadoc)
- * @see org.eclipse.jem.internal.proxy.core.Expression#pushClassInstanceCreationToProxy(org.eclipse.jem.internal.proxy.core.IProxyBeanType, int)
- */
- protected void pushClassInstanceCreationToProxy(IProxyBeanType type, int argumentCount) {
- try {
- eproc.pushClassInstanceCreation(getIDEBeanTypeProxy(type).getTypeClass(), argumentCount);
- } catch (ThrowableProxy e) {
- eproc.processException(e);
- }
- }
-
- /*
- * (non-Javadoc)
- * @see org.eclipse.jem.internal.proxy.core.Expression#pushTypeReceiverToProxy(org.eclipse.jem.internal.proxy.core.IProxyBeanType)
- */
- protected void pushTypeReceiverToProxy(IProxyBeanType type) {
- try {
- Class c = getIDEBeanTypeProxy(type).getTypeClass();
- eproc.pushExpression(c, c); // When as a receiver, the type is the same as the receiver.
- } catch (ThrowableProxy e) {
- eproc.processException(e);
- } catch (RuntimeException e) {
- eproc.processException(e);
- }
- }
-
- /* (non-Javadoc)
- * @see org.eclipse.jem.internal.proxy.core.Expression#pushFieldAccessToProxy(java.lang.Object, boolean)
- */
- protected void pushFieldAccessToProxy(Object field, boolean hasReceiver) {
- boolean isString = field instanceof String;
- try {
- eproc.pushFieldAccess(isString ? field : getIDEFieldProxy((IProxyField) field).getBean(), isString, hasReceiver);
- } catch (ThrowableProxy e) {
- eproc.processException(e);
- }
- }
-
- /* (non-Javadoc)
- * @see org.eclipse.jem.internal.proxy.core.Expression#pushMethodInvocationToProxy(java.lang.Object, boolean, int)
- */
- protected void pushMethodInvocationToProxy(Object method, boolean hasReceiver, int argCount) {
- boolean isString = method instanceof String;
- try {
- eproc.pushMethodInvocation(isString ? method : getIDEMethodProxy((IProxyMethod) method).getBean(), isString, hasReceiver, argCount);
- } catch (ThrowableProxy e) {
- eproc.processException(e);
- }
- }
-
- /*
- * (non-Javadoc)
- * @see org.eclipse.jem.internal.proxy.core.Expression#pushConditionalToProxy(org.eclipse.jem.internal.proxy.initParser.tree.InternalConditionalOperandType)
- */
- protected void pushConditionalToProxy(InternalConditionalOperandType expressionType) {
- eproc.pushConditional(expressionType);
- }
-
- /* (non-Javadoc)
- * @see org.eclipse.jem.internal.proxy.core.Expression#pushInvoke()
- */
- protected void pushInvoke(int proxycount, List expressionProxies) throws ThrowableProxy, NoExpressionValueException {
- // In the IDE case do nothing. Nothing is pending. But still need to handle proxy resolution.
- processExtensionProxies(proxycount, expressionProxies);
- processExpressionError();
- }
-
- /**
- * This is used as both an ExpressionProxy (i.e. IDE side) and the Expressions expression proxy result on the other side.
- * This makes it easier to just use same instance on both sides.
- *
- * @since 1.1.0
- */
- protected static class IDEExpressionProxy extends ExpressionProxy implements InternalExpressionProxy {
-
- protected IDEExpressionProxy(int proxyid, int proxyType, Expression expression) {
- super(proxyid, proxyType, expression);
- }
-
- private Object value;
- private Class type;
- private boolean set;
-
-
- /* (non-Javadoc)
- * @see org.eclipse.jem.internal.proxy.core.ExpressionProxy#dispose()
- */
- protected void dispose() {
- super.dispose();
- value = null;
- type = null;
- set = false;
- }
-
- /* (non-Javadoc)
- * @see org.eclipse.jem.internal.proxy.initParser.tree.InternalExpressionProxy#getType()
- */
- public Class getType() {
- return type;
- }
-
- /* (non-Javadoc)
- * @see org.eclipse.jem.internal.proxy.initParser.tree.InternalExpressionProxy#getValue()
- */
- public Object getValue() {
- return value;
- }
- /* (non-Javadoc)
- * @see org.eclipse.jem.internal.proxy.initParser.tree.InternalExpressionProxy#setProxy(java.lang.Object, java.lang.Class)
- */
- public void setProxy(Object value, Class type) {
- this.value = value;
- this.type = type;
- set = true;
- }
- /* (non-Javadoc)
- * @see org.eclipse.jem.internal.proxy.initParser.tree.InternalExpressionProxy#isSet()
- */
- public boolean isSet() {
- return set;
- }
- }
-
- /**
- * The Expression proxy for IDE BeanTypes.
- *
- * @since 1.1.0
- */
- protected static class IDEBeanTypeExpressionProxy extends IDEExpressionProxy implements IBeanTypeExpressionProxy {
-
- private String typeName;
- private IDEBeanTypeProxy resolvedProxy;
-
- /**
- * @param proxyid
- *
- * @since 1.1.0
- */
- public IDEBeanTypeExpressionProxy(int proxyid, Expression expression) {
- super(proxyid, BEANTYPE_EXPRESSION_PROXY, expression);
- }
-
- /*
- * (non-Javadoc)
- * @see org.eclipse.jem.internal.proxy.core.IBeanTypeExpressionProxy#setTypeName(java.lang.String)
- */
- public void setTypeName(String typeName) {
- this.typeName = typeName;
- }
-
- /*
- * (non-Javadoc)
- * @see org.eclipse.jem.internal.proxy.core.IProxyBeanType#getTypeName()
- */
- public String getTypeName() {
- return typeName;
- }
-
- /* (non-Javadoc)
- * @see org.eclipse.jem.internal.proxy.core.ExpressionProxy#toString()
- */
- public String toString() {
- return super.toString()+" - "+getTypeName(); //$NON-NLS-1$
- }
-
- /**
- * Called by IDEExpression to resolve the beantype.
- * @param beantypeProxy
- *
- * @since 1.1.0
- */
- void setProxy(IDEBeanTypeProxy beantypeProxy) {
- this.resolvedProxy = beantypeProxy;
- setProxy(resolvedProxy.getTypeClass(), Class.class);
- }
-
- /**
- * Called by IDEExpression to get the resolved beantype proxy.
- * @return
- *
- * @since 1.1.0
- */
- IDEBeanTypeProxy getBeanTypeProxy() {
- return resolvedProxy;
- }
-
- /*
- * (non-Javadoc)
- * @see org.eclipse.jem.internal.proxy.core.IProxyBeanType#getMethodProxy(org.eclipse.jem.internal.proxy.core.IExpression, java.lang.String, org.eclipse.jem.internal.proxy.core.IProxyBeanType[])
- */
- public IProxyMethod getMethodProxy(IExpression expression, String methodName, IProxyBeanType[] parameterTypes) {
- IProxyMethod method = ((IDEExpression) expression).getMethodExpressionProxy(this, methodName, parameterTypes);
- if (method == null) {
- // Need to go to the expression and create it.
- method = ((Expression) expression).createMethodExpressionProxy(this, methodName, parameterTypes);
- }
- return method;
- }
-
- /* (non-Javadoc)
- * @see org.eclipse.jem.internal.proxy.core.IProxyBeanType#getMethodProxy(org.eclipse.jem.internal.proxy.core.IExpression, java.lang.String, java.lang.String[])
- */
- public IProxyMethod getMethodProxy(IExpression expression, String methodName, String[] parameterTypes) {
- return ((IDEMethodProxyFactory) expression.getRegistry().getMethodProxyFactory()).getMethodProxy(expression, this, methodName, parameterTypes);
- }
-
- public IProxyMethod getMethodProxy(IExpression expression, String methodName) {
- return getMethodProxy(expression, methodName, (IProxyBeanType[]) null);
- }
-
- /* (non-Javadoc)
- * @see org.eclipse.jem.internal.proxy.core.IProxyBeanType#getFieldProxy(org.eclipse.jem.internal.proxy.core.IExpression, java.lang.String)
- */
- public IProxyField getFieldProxy(IExpression expression, String fieldName) {
- IProxyField field = ((IDEExpression) expression).getFieldExpressionProxy(this, fieldName);
- if (field == null) {
- // Need to go to the expression and create it.
- field = ((Expression) expression).createFieldExpressionProxy(this, fieldName);
- }
- return field;
- }
- }
-
- /**
- * The Expression proxy for IDE BeanTypes.
- *
- * @since 1.1.0
- */
- protected static class IDEMethodExpressionProxy extends IDEExpressionProxy implements IProxyMethod {
-
- private String methodName;
- private IDEMethodProxy resolvedProxy;
- private ThrowableProxy errorThrowable;
-
- /**
- * @param proxyid
- *
- * @since 1.1.0
- */
- public IDEMethodExpressionProxy(int proxyid, Expression expression) {
- super(proxyid, METHOD_EXPRESSION_PROXY, expression);
- }
-
- /**
- * Set by IDEExpression with the method name.
- * @param methodName
- *
- * @since 1.1.0
- */
- void setMethodName(String methodName) {
- this.methodName = methodName;
- }
-
- /* (non-Javadoc)
- * @see org.eclipse.jem.internal.proxy.core.ExpressionProxy#toString()
- */
- public String toString() {
- return super.toString()+" - "+methodName; //$NON-NLS-1$
- }
-
- /**
- * Called by IDEExpression to resolve the beantype.
- * @param methodProxy
- *
- * @since 1.1.0
- */
- void setProxy(IDEMethodProxy methodProxy) {
- this.resolvedProxy = methodProxy;
- setProxy(resolvedProxy.getBean(), Class.class);
- }
-
- /**
- * Called by IDEExpression to say there was error in creating the proxy.
- * @param errorThrowable
- *
- * @since 1.1.0
- */
- void setThrowable(ThrowableProxy errorThrowable) {
- this.errorThrowable = errorThrowable;
- }
-
- /**
- * Called by IDEExpression to get the resolved method proxy.
- * @return
- * @throws ThrowableProxy
- *
- * @since 1.1.0
- */
- IDEMethodProxy getMethodProxy() throws ThrowableProxy {
- if (errorThrowable != null)
- throw errorThrowable;
- return resolvedProxy;
- }
- }
-
- protected static class IDEFieldExpressionProxy extends IDEExpressionProxy implements IProxyField {
-
- private String fieldName;
- private IDEFieldProxy resolvedProxy;
- private ThrowableProxy errorThrowable;
-
- /**
- * @param proxyid
- *
- * @since 1.1.0
- */
- public IDEFieldExpressionProxy(int proxyid, Expression expression) {
- super(proxyid, FIELD_EXPRESSION_PROXY, expression);
- }
-
- /**
- * Set by IDEExpression with the method name.
- * @param fieldName
- *
- * @since 1.1.0
- */
- void setField(String fieldName) {
- this.fieldName = fieldName;
- }
-
- /* (non-Javadoc)
- * @see org.eclipse.jem.internal.proxy.core.ExpressionProxy#toString()
- */
- public String toString() {
- return super.toString()+" - "+fieldName; //$NON-NLS-1$
- }
-
- /**
- * Called by IDEExpression to resolve the beantype.
- * @param fieldProxy
- *
- * @since 1.1.0
- */
- void setProxy(IDEFieldProxy fieldProxy) {
- this.resolvedProxy = fieldProxy;
- setProxy(resolvedProxy.getBean(), Class.class);
- }
-
- /**
- * Called by IDEExpression to say there was error in creating the proxy.
- * @param errorThrowable
- *
- * @since 1.1.0
- */
- void setThrowable(ThrowableProxy errorThrowable) {
- this.errorThrowable = errorThrowable;
- }
-
- /**
- * Called by IDEExpression to get the resolved field proxy.
- * @return
- * @throws ThrowableProxy
- *
- * @since 1.1.0
- */
- IDEFieldProxy getFieldProxy() throws ThrowableProxy {
- if (errorThrowable != null)
- throw errorThrowable;
- return resolvedProxy;
- }
- }
-
- /*
- * (non-Javadoc)
- * @see org.eclipse.jem.internal.proxy.core.Expression#createExpressionProxy(int, int)
- */
- protected ExpressionProxy createExpressionProxy(int proxyType, int proxyID) {
- switch (proxyType) {
- case NORMAL_EXPRESSION_PROXY:
- default:
- return new IDEExpressionProxy(proxyID, NORMAL_EXPRESSION_PROXY, this);
-
- case BEANTYPE_EXPRESSION_PROXY:
- return new IDEBeanTypeExpressionProxy(proxyID, this);
-
- case METHOD_EXPRESSION_PROXY:
- return new IDEMethodExpressionProxy(proxyID, this);
-
- case FIELD_EXPRESSION_PROXY:
- return new IDEFieldExpressionProxy(proxyID, this);
- }
-
- }
-
-
- /* (non-Javadoc)
- * @see org.eclipse.jem.internal.proxy.core.Expression#pushAssignmentToProxy(org.eclipse.jem.internal.proxy.core.ExpressionProxy)
- */
- protected void pushAssignmentToProxy(ExpressionProxy proxy) {
- eproc.pushAssignment((InternalExpressionProxy) proxy);
- }
-
-
- /* (non-Javadoc)
- * @see org.eclipse.jem.internal.proxy.core.Expression#pushAssignmentToProxy()
- */
- protected void pushAssignmentToProxy() {
- eproc.pushAssignment();
- }
-
- /* (non-Javadoc)
- * @see org.eclipse.jem.internal.proxy.core.Expression#pushBlockBeginToProxy(int)
- */
- protected void pushBlockBeginToProxy(int blockNumber) {
- eproc.pushBlockBegin(blockNumber);
- }
-
- /* (non-Javadoc)
- * @see org.eclipse.jem.internal.proxy.core.Expression#pushBlockEndToProxy(int)
- */
- protected void pushBlockEndToProxy(int blockNumber) {
- eproc.pushBlockEnd(blockNumber);
- }
-
- /*
- * (non-Javadoc)
- * @see org.eclipse.jem.internal.proxy.core.Expression#pushBlockBreakToProxy(int)
- */
- protected void pushBlockBreakToProxy(int blockNumber) {
- eproc.pushBlockBreak(blockNumber);
- }
-
-
- /* (non-Javadoc)
- * @see org.eclipse.jem.internal.proxy.core.Expression#pushTryBeginToProxy(int)
- */
- protected void pushTryBeginToProxy(int tryNumber) {
- eproc.pushTryBegin(tryNumber);
- }
-
- /*
- * (non-Javadoc)
- * @see org.eclipse.jem.internal.proxy.core.Expression#pushTryCatchClauseToProxy(int, org.eclipse.jem.internal.proxy.core.IProxyBeanType, org.eclipse.jem.internal.proxy.core.ExpressionProxy)
- */
- protected void pushTryCatchClauseToProxy(int tryNumber, IProxyBeanType exceptionType, ExpressionProxy ep) {
- try {
- eproc.pushTryCatchClause(tryNumber, getIDEBeanTypeProxy(exceptionType).getTypeClass(), (InternalExpressionProxy) ep);
- } catch (ThrowableProxy e) {
- eproc.processException(e);
- }
- }
-
- /* (non-Javadoc)
- * @see org.eclipse.jem.internal.proxy.core.Expression#pushTryFinallyClauseToProxy(int)
- */
- protected void pushTryFinallyClauseToProxy(int tryNumber) {
- eproc.pushTryFinallyClause(tryNumber);
- }
-
-
- /* (non-Javadoc)
- * @see org.eclipse.jem.internal.proxy.core.Expression#pushTryEndToProxy(int)
- */
- protected void pushTryEndToProxy(int tryNumber) {
- eproc.pushTryEnd(tryNumber);
- }
-
-
- /* (non-Javadoc)
- * @see org.eclipse.jem.internal.proxy.core.Expression#pushThrowToProxy()
- */
- protected void pushThrowToProxy() {
- eproc.pushThrowException();
- }
-
- /* (non-Javadoc)
- * @see org.eclipse.jem.internal.proxy.core.Expression#pushRethrowToProxy(int)
- */
- protected void pushRethrowToProxy(int tryNumber) {
- eproc.pushTryRethrow(tryNumber);
- }
-
- /*
- * (non-Javadoc)
- * @see org.eclipse.jem.internal.proxy.core.Expression#pushBeanTypeToProxy(org.eclipse.jem.internal.proxy.core.IBeanTypeExpressionProxy)
- */
- protected void pushBeanTypeToProxy(IBeanTypeExpressionProxy proxy) {
- try {
- IDEBeanTypeExpressionProxy ep = (IDEBeanTypeExpressionProxy) proxy;
- IDEBeanTypeProxy typeProxy = getIDEBeanTypeProxy(proxy.getTypeName());
- ep.setProxy(typeProxy);
- eproc.allocateExpressionProxy(ep);
- if (!typeProxy.isValid()) {
- Throwable cause = ((IDEInitErrorBeanTypeProxy) typeProxy).getCause();
- if (cause == null)
- throw new IDEThrowableProxy(
- new Exception(typeProxy.getInitializationError()),
- getIDEBeanTypeFactory().getBeanTypeProxy(Exception.class));
- else
- throw new IDEThrowableProxy(
- cause,
- getIDEBeanTypeFactory().getBeanTypeProxy(cause.getClass()));
-
- }
- } catch (ThrowableProxy e) {
- eproc.processException(e);
- }
- }
-
- /**
- * Get the map of IProxyBeanTypes for a beantype name. Meant to be used only in conjunction with IDEStandardBeanTypeFactory.
- * It is here so the IDDEStandardBeanTypeFactory can store pending proxies per expression.
- *
- * @param beanType
- * @return
- *
- * @since 1.1.0
- */
- public IProxyBeanType getBeanType(String beanTypeName) {
- if (beanTypeCache == null)
- beanTypeCache = new HashMap();
- return (IProxyBeanType) beanTypeCache.get(beanTypeName);
- }
-
- /**
- * Add the beantype expression proxy to the map of bean type expression proxies. Used in conjunction with IDEStandardBeanTypeFactory.
- * It is here so the IDEStandardBeanTypeFactory can store pending proxies per expression.
- * @param beanTypeName
- * @param beantype
- *
- * @since 1.1.0
- */
- public void addBeanType(String beanTypeName, IProxyBeanType beantype) {
- beanTypeCache.put(beanTypeName, beantype);
- }
-
- /**
- * Remove the beantype expression proxy from the map. This is called because there was a rollback due to an endmark.
- * @param beanTypeName
- *
- * @since 1.1.0
- */
- public void removeBeanType(String beanTypeName) {
- beanTypeCache.remove(beanTypeName);
- }
-
- /**
- * Keeping a local map of Method Expression Proxies so that we don't keep recreating them for each request from within this expression.
- * The map will be: declaringTypeName->(Map) methodName or IDEMethodKey -> method expression proxy.
- * @see IDEExpression#pushMethodToProxy(ExpressionProxy, IProxyBeanType, String, IProxyBeanType[]) for the actual implementation.
- */
- protected Map methodExpressionProxies;
-
- /**
- * Keeping a local map of Field Expression Proxies so that we don't keep recreating them for each request from within this expression.
- * The map will be: declaringTypeName->(Map) fieldname -> field expression proxy.
- * @see IDEExpression#pushFieldToProxy(ExpressionProxy, IProxyBeanType, String)
- */
- protected Map fieldExpressionProxies;
-
- /**
- * Keeping a local map of BeanType expression proxies so that we don't keep recreating them for each request from within this expression.
- * The map will be: typename->beanTypeExpressionProxy
- */
- protected Map beanTypeCache; // Use to cache pending BeanTypes. Used in conjunction with IDEStandardBeanTypeFactory.
-
- /*
- * Used as the key to the methodCache when there are parms.
- * It allows the parms to be either IProxyBeanType without the
- * overhead of creating complicated strings.
- *
- * It will compare method name and each individual parm name without fluffing
- * up a string and building it up.
- *
- * For no parm methods, just the name of the method as a string will be the key.
- *
- * @since 1.1.0
- */
- private static class MethodKey {
- public String methodName;
- public IProxyBeanType[] parmTypes;
- public MethodKey(String methodName, IProxyBeanType[] parmTypes) {
- this.methodName = methodName;
- this.parmTypes = parmTypes;
- }
-
-
- /* (non-Javadoc)
- * @see java.lang.Object#equals(java.lang.Object)
- */
- public boolean equals(Object obj) {
- if (this == obj)
- return true;
- try {
- return ((MethodKey) obj).compareParms(parmTypes);
- } catch (ClassCastException e) {
- return false;
- }
- }
-
- /* (non-Javadoc)
- * @see org.eclipse.jem.internal.proxy.remote.REMProxyConstants.MethodKey#hashCode()
- */
- public int hashCode() {
- int h = methodName.hashCode();;
- for (int i = 0; i < parmTypes.length; i++) {
- h += parmTypes[i].getTypeName().hashCode();
- }
- return h;
- }
-
- /* (non-Javadoc)
- * @see org.eclipse.jem.internal.proxy.remote.REMProxyConstants.MethodKey#compareParms(java.lang.String[])
- */
- protected boolean compareParms(IProxyBeanType[] parms) {
- if (parms.length != parmTypes.length)
- return false;
- for (int i = 0; i < parms.length; i++) {
- if (!parmTypes[i].getTypeName().equals(parms[i].getTypeName()))
- return false;
- }
- return true;
- }
- }
-
-
- /* (non-Javadoc)
- * @see org.eclipse.jem.internal.proxy.core.Expression#pushMethodToProxy(org.eclipse.jem.internal.proxy.core.ExpressionProxy, org.eclipse.jem.internal.proxy.core.IProxyBeanType, java.lang.String, org.eclipse.jem.internal.proxy.core.IProxyBeanType[])
- */
- protected void pushMethodToProxy(ExpressionProxy proxy, IProxyBeanType declaringType, String methodName, IProxyBeanType[] parameterTypes) {
- try {
- final Map methods = getMethods(declaringType);
- final Object key = getMethodKey(methodName, parameterTypes);
- methods.put(key, proxy);
- proxy.addProxyListener(new ExpressionProxy.ProxyAdapter() {
-
- public void proxyNotResolved(ProxyEvent event) {
- methods.remove(key); // Back it out. tis could happen due to endmark rollback.
- }
-
- });
-
- IDEMethodExpressionProxy ep = (IDEMethodExpressionProxy) proxy;
- ep.setMethodName(methodName);
- // We resolve immediately. Any expression proxies should also be resolved at this point too.
- Class declaringClass = getIDEBeanTypeProxy(declaringType).getTypeClass();
- Class[] parameterClasses;
- if (parameterTypes == null || parameterTypes.length == 0)
- parameterClasses = null;
- else {
- parameterClasses = new Class[parameterTypes.length];
- for (int i = 0; i < parameterClasses.length; i++) {
- parameterClasses[i] = getIDEBeanTypeProxy(parameterTypes[i]).getTypeClass();
- }
- }
- IDEMethodProxy methodProxy = ((IDEMethodProxyFactory) registry.getMethodProxyFactory()).getMethodProxy(declaringClass, methodName, parameterClasses);
- if (methodProxy == null) {
- String parms = ""; //$NON-NLS-1$
- if (parameterTypes != null && parameterTypes.length > 0) {
- StringBuffer st = new StringBuffer(100);
- for (int i = 0; i < parameterClasses.length; i++) {
- if (i > 0)
- st.append(',');
- st.append(parameterTypes[i].getTypeName());
- }
- parms = st.toString();
- }
- throw new IDEThrowableProxy(new NoSuchMethodException("No method: "+declaringType+'.'+methodName+"("+parms+')'), //$NON-NLS-1$ //$NON-NLS-2$
- getIDEBeanTypeFactory().getBeanTypeProxy(NoSuchMethodException.class));
- }
-
- ep.setProxy(methodProxy);
- eproc.allocateExpressionProxy(ep);
- } catch (ThrowableProxy e) {
- ((IDEMethodExpressionProxy) proxy).setThrowable(e); // So we don't recreate throwable all of the time.
- eproc.processException(e);
- }
- }
-
- private Map getMethods(IProxyBeanType classtype) {
- if (methodExpressionProxies == null)
- methodExpressionProxies = new HashMap();
- Map methods = (Map) methodExpressionProxies.get(classtype.getTypeName());
- if (methods == null)
- methodExpressionProxies.put(classtype.getTypeName(), methods = new HashMap());
- return methods;
- }
-
- private Object getMethodKey(String methodName, IProxyBeanType[] parameterTypes) {
- if (parameterTypes == null || parameterTypes.length == 0)
- return methodName;
- else
- return new MethodKey(methodName, parameterTypes);
- }
-
- private Map getFields(IProxyBeanType classtype) {
- if (fieldExpressionProxies == null)
- fieldExpressionProxies = new HashMap();
- Map fields = (Map) fieldExpressionProxies.get(classtype.getTypeName());
- if (fields == null)
- fieldExpressionProxies.put(classtype.getTypeName(), fields = new HashMap());
- return fields;
- }
-
- /**
- * This is used by IDEBeanTypes and IDEBeanTypeExpressionProxy to access any already created Method Expression Proxies.
- *
- * @param declaringType
- * @param methodName
- * @param parameterTypes
- * @return IProxyMethod or <code>null</code> if not yet created.
- *
- * @since 1.1.0
- */
- IProxyMethod getMethodExpressionProxy(IProxyBeanType declaringType, String methodName, IProxyBeanType[] parameterTypes) {
- Map methods = getMethods(declaringType);
- Object key = getMethodKey(methodName, parameterTypes);
- return (IProxyMethod) methods.get(key);
- }
-
- /**
- * This is used by IDEBeanTypes and IDEBeanTypeExpressionProxy to access any already created Field Expression Proxies.
- * @param declaringType
- * @param fieldName
- * @return
- *
- * @since 1.1.0
- */
- IProxyField getFieldExpressionProxy(IProxyBeanType declaringType, String fieldName) {
- Map fields = getFields(declaringType);
- return (IProxyField) fields.get(fieldName);
- }
-
- /**
- * Get the IDEMethodProxy out of the already resolved Expression Proxy or IDEMethodProxy itself.
- * @param method
- * @return
- * @throws ThrowableProxy
- *
- * @since 1.1.0
- */
- protected IDEMethodProxy getIDEMethodProxy(IProxyMethod method) throws ThrowableProxy {
- IDEMethodProxy methodProxy;
- if (method.isExpressionProxy()) {
- // It should already be resolved at this point.
- methodProxy = ((IDEMethodExpressionProxy) method).getMethodProxy();
- } else
- methodProxy = (IDEMethodProxy) method;
- return methodProxy;
- }
-
- /* (non-Javadoc)
- * @see org.eclipse.jem.internal.proxy.core.Expression#pushFieldToProxy(org.eclipse.jem.internal.proxy.core.ExpressionProxy, org.eclipse.jem.internal.proxy.core.IProxyBeanType, java.lang.String)
- */
- protected void pushFieldToProxy(ExpressionProxy proxy, IProxyBeanType declaringType, final String fieldName) {
-
- try {
- final Map fields = getFields(declaringType);
- fields.put(fieldName, proxy);
- proxy.addProxyListener(new ExpressionProxy.ProxyAdapter(){
- public void proxyNotResolved(ExpressionProxy.ProxyEvent event) {
- fields.remove(fieldName); // this can happen due to an endmark. It could be one of the ones that are rolled back.
- }
- });
-
-
- IDEFieldExpressionProxy ep = (IDEFieldExpressionProxy) proxy;
- // We resolve immediately. Any expression proxies should also be resolved at this point too.
- IDEFieldProxy fieldProxy = (IDEFieldProxy) getIDEBeanTypeProxy(declaringType).getFieldProxy(fieldName);
- if (fieldProxy == null) {
- throw new IDEThrowableProxy(new NoSuchFieldException("No field: "+declaringType+'.'+fieldName), //$NON-NLS-1$
- getIDEBeanTypeFactory().getBeanTypeProxy(NoSuchFieldException.class));
- }
-
- ep.setProxy(fieldProxy);
- eproc.allocateExpressionProxy(ep);
- } catch (ThrowableProxy e) {
- ((IDEFieldExpressionProxy) proxy).setThrowable(e); // So we don't recreate throwable all of the time.
- eproc.processException(e);
- }
-
- }
-
- /**
- * Get the IDEFieldProxy out of the already resolved Expression Proxy or IDEFieldProxy itself.
- * @param field
- * @return
- * @throws ThrowableProxy
- *
- * @since 1.1.0
- */
- protected IDEFieldProxy getIDEFieldProxy(IProxyField field) throws ThrowableProxy {
- IDEFieldProxy fieldProxy;
- if (field.isExpressionProxy()) {
- // It should already be resolved at this point.
- fieldProxy = ((IDEFieldExpressionProxy) field).getFieldProxy();
- } else
- fieldProxy = (IDEFieldProxy) field;
- return fieldProxy;
- }
-
- /* (non-Javadoc)
- * @see org.eclipse.jem.internal.proxy.core.Expression#pushIfTestToProxy()
- */
- protected void pushIfTestToProxy() {
- eproc.pushIfElse();
- }
-
- /* (non-Javadoc)
- * @see org.eclipse.jem.internal.proxy.core.Expression#pushIfElseToProxy(org.eclipse.jem.internal.proxy.initParser.tree.InternalIfElseOperandType)
- */
- protected void pushIfElseToProxy(InternalIfElseOperandType clauseType) {
- eproc.pushIfElse(clauseType);
- }
-
- /* (non-Javadoc)
- * @see org.eclipse.jem.internal.proxy.core.Expression#pushNewInstanceToProxy(java.lang.String, org.eclipse.jem.internal.proxy.core.IProxyBeanType)
- */
- protected void pushNewInstanceToProxy(String initializationString, IProxyBeanType resultType) {
- try {
- eproc.pushNewInstanceFromString(initializationString, getIDEBeanTypeProxy(resultType).getTypeClass(), getIDERegistry().fClassLoader);
- } catch (ThrowableProxy e) {
- eproc.processException(e);
- }
- }
-
- protected void pushMarkToProxy(int markID) {
- eproc.pushMark(markID);
- }
-
- protected void pushEndmarkToProxy(int markID, boolean restore) {
- eproc.pushEndmark(markID, restore);
- }
-
- protected void pushBeginTransferThreadToProxy() {
- // For IDE it doesn't matter. Just go ahead and continue processing.
- }
-
- protected void pushTransferThreadToProxy() {
- // For IDE it doesn't matter. Just go ahead and continue processing.
- }
-
- protected void pushSubexpressionBeginToProxy(int subexpressionNumber) {
- eproc.pushSubexpressionBegin(subexpressionNumber);
- }
-
- protected void pushSubexpressionEndToProxy(int subexpressionNumber) {
- eproc.pushSubexpressionEnd(subexpressionNumber);
- }
-}
diff --git a/plugins/org.eclipse.jem.proxy/proxyide/org/eclipse/jem/internal/proxy/ide/IDEExtensionBeanTypeProxyFactory.java b/plugins/org.eclipse.jem.proxy/proxyide/org/eclipse/jem/internal/proxy/ide/IDEExtensionBeanTypeProxyFactory.java
deleted file mode 100644
index c3fb277..0000000
--- a/plugins/org.eclipse.jem.proxy/proxyide/org/eclipse/jem/internal/proxy/ide/IDEExtensionBeanTypeProxyFactory.java
+++ /dev/null
@@ -1,28 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2001, 2005 IBM Corporation and others.
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
- *
- * Contributors:
- * IBM Corporation - initial API and implementation
- *******************************************************************************/
-package org.eclipse.jem.internal.proxy.ide;
-/*
-
-
- */
-
-import org.eclipse.jem.internal.proxy.core.*;
-
-public interface IDEExtensionBeanTypeProxyFactory extends IBeanTypeProxyFactory {
-
-public IDEBeanTypeProxy getExtensionBeanTypeProxy(String className);
-
-public IDEBeanTypeProxy getExtensionBeanTypeProxy(String typeName, IBeanTypeProxy superType);
-
-public IProxyBeanType getExtensionBeanTypeProxy(String typeName, IExpression expression);
-
-
-}
diff --git a/plugins/org.eclipse.jem.proxy/proxyide/org/eclipse/jem/internal/proxy/ide/IDEFieldProxy.java b/plugins/org.eclipse.jem.proxy/proxyide/org/eclipse/jem/internal/proxy/ide/IDEFieldProxy.java
deleted file mode 100644
index c23081b..0000000
--- a/plugins/org.eclipse.jem.proxy/proxyide/org/eclipse/jem/internal/proxy/ide/IDEFieldProxy.java
+++ /dev/null
@@ -1,96 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2001, 2005 IBM Corporation and others.
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
- *
- * Contributors:
- * IBM Corporation - initial API and implementation
- *******************************************************************************/
-package org.eclipse.jem.internal.proxy.ide;
-/*
-
-
- */
-
-import java.lang.reflect.Field;
-
-import org.eclipse.core.runtime.IStatus;
-import org.eclipse.core.runtime.Status;
-
-import org.eclipse.jem.internal.proxy.core.*;
-
-/**
- * Implementation of IFieldProxy where the bean vm is the same as the IDE
- * Therefore we hold the instance of a java.lang.reflect.Field in a field
- * directly and have a package protected constructor to set this
- * Creation date: (1/17/00 12:32:24 PM)
- * @author: Joe Winchester
- */
-public class IDEFieldProxy extends IDEAccessibleObjectProxy implements IFieldProxy {
- protected IBeanTypeProxy fFieldType;
- /**
- * Package protected constructor that takes the field directly
- * This is package protected because only classes in the IDE package can construct
- * this. Everyone else must go via the typeProxy
- */
- IDEFieldProxy(IDEProxyFactoryRegistry aRegistry, Field aField) {
- super(aRegistry, aField);
- }
- /**
- * Get the value of the field and return it wrapped in a bean proxy
- */
- public IBeanProxy get(IBeanProxy aSubject) {
-
- Object result = null;
- // Get the field value and catch any errors
- try {
- result = ((Field) getBean()).get(aSubject != null ? ((IIDEBeanProxy) aSubject).getBean() : null);
- } catch (Exception e) {
- ProxyPlugin.getPlugin().getLogger().log(
- new Status(IStatus.WARNING, ProxyPlugin.getPlugin().getBundle().getSymbolicName(), 0, "", e)); //$NON-NLS-1$
- }
-
- // If we have a non null result wrap it in an IBeanProxy and return it
- if (result != null) {
- return fProxyFactoryRegistry.getBeanProxy(((Field) getBean()).getType(), result);
- } else {
- return null;
- }
-
- }
- /**
- * Get the beans from both of the proxies and invoke the field set method
- * Cast to IDEBeanProxy and use package protected method
- */
- public void set(IBeanProxy aSubject, IBeanProxy argument) {
-
- // Set the field value and catch any errors
- try {
- ((Field) getBean()).set(
- aSubject != null ? ((IIDEBeanProxy) aSubject).getBean() : null,
- argument != null ? ((IIDEBeanProxy) argument).getBean() : null);
- } catch (Exception e) {
- ProxyPlugin.getPlugin().getLogger().log(
- new Status(IStatus.WARNING, ProxyPlugin.getPlugin().getBundle().getSymbolicName(), 0, "", e)); //$NON-NLS-1$
- }
- }
- /**
- * The type proxy is constant proxy out of the method factory.
- */
- public IBeanTypeProxy getTypeProxy() {
- return ((IDEMethodProxyFactory) fProxyFactoryRegistry.getMethodProxyFactory()).fieldType;
- }
- /**
- * Return the type of the field.
- */
- public IBeanTypeProxy getFieldType() {
- if (fFieldType == null) {
- fFieldType =
- ((IDEStandardBeanTypeProxyFactory) fProxyFactoryRegistry.getBeanTypeProxyFactory()).getBeanTypeProxy(
- ((Field) getBean()).getType());
- }
- return fFieldType;
- }
-}
diff --git a/plugins/org.eclipse.jem.proxy/proxyide/org/eclipse/jem/internal/proxy/ide/IDEFieldTypeProxy.java b/plugins/org.eclipse.jem.proxy/proxyide/org/eclipse/jem/internal/proxy/ide/IDEFieldTypeProxy.java
deleted file mode 100644
index 6772f1f..0000000
--- a/plugins/org.eclipse.jem.proxy/proxyide/org/eclipse/jem/internal/proxy/ide/IDEFieldTypeProxy.java
+++ /dev/null
@@ -1,33 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2001, 2005 IBM Corporation and others.
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
- *
- * Contributors:
- * IBM Corporation - initial API and implementation
- *******************************************************************************/
-package org.eclipse.jem.internal.proxy.ide;
-/*
-
-
- */
-
-/**
- * @version 1.0
- * @author
- */
-public class IDEFieldTypeProxy extends IDEBeanTypeProxy {
-
- IDEFieldTypeProxy(IDEProxyFactoryRegistry registry) {
- super(registry, java.lang.reflect.Field.class);
- }
-
- /*
- * @see IDEBeanTypeProxy#newBeanProxy(Object)
- */
- protected IIDEBeanProxy newBeanProxy(Object anObject) {
- return new IDEFieldProxy(fProxyFactoryRegistry, (java.lang.reflect.Field) anObject);
- }
-}
diff --git a/plugins/org.eclipse.jem.proxy/proxyide/org/eclipse/jem/internal/proxy/ide/IDEFloatClassBeanTypeProxy.java b/plugins/org.eclipse.jem.proxy/proxyide/org/eclipse/jem/internal/proxy/ide/IDEFloatClassBeanTypeProxy.java
deleted file mode 100644
index 26de58b..0000000
--- a/plugins/org.eclipse.jem.proxy/proxyide/org/eclipse/jem/internal/proxy/ide/IDEFloatClassBeanTypeProxy.java
+++ /dev/null
@@ -1,30 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2001, 2005 IBM Corporation and others.
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
- *
- * Contributors:
- * IBM Corporation - initial API and implementation
- *******************************************************************************/
-package org.eclipse.jem.internal.proxy.ide;
-/*
-
-
- */
-
-import org.eclipse.jem.internal.proxy.core.*;
-/**
- * Float BeanType Proxy.
- */
-final class IDEFloatClassBeanTypeProxy extends IDENumberBeanTypeProxy {
-
-protected IDEFloatClassBeanTypeProxy(IDEProxyFactoryRegistry aRegistry, Class aClass) {
- super(aRegistry, aClass, new Float(0));
-}
-INumberBeanProxy createFloatBeanProxy(Float aFloat){
- return new IDENumberBeanProxy(fProxyFactoryRegistry,aFloat,this);
-}
-}
-
diff --git a/plugins/org.eclipse.jem.proxy/proxyide/org/eclipse/jem/internal/proxy/ide/IDEFloatTypeBeanTypeProxy.java b/plugins/org.eclipse.jem.proxy/proxyide/org/eclipse/jem/internal/proxy/ide/IDEFloatTypeBeanTypeProxy.java
deleted file mode 100644
index 86dbe3c..0000000
--- a/plugins/org.eclipse.jem.proxy/proxyide/org/eclipse/jem/internal/proxy/ide/IDEFloatTypeBeanTypeProxy.java
+++ /dev/null
@@ -1,40 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2001, 2005 IBM Corporation and others.
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
- *
- * Contributors:
- * IBM Corporation - initial API and implementation
- *******************************************************************************/
-package org.eclipse.jem.internal.proxy.ide;
-/*
-
-
- */
-
-import org.eclipse.jem.internal.proxy.core.*;
-
-/**
- * Float BeanType Proxy.
- */
-final class IDEFloatTypeBeanTypeProxy extends IDEPrimitiveBeanTypeProxy {
-protected IDEFloatTypeBeanTypeProxy(IDEProxyFactoryRegistry aRegistry, Class aClass) {
- super(aRegistry, aClass);
-}
-INumberBeanProxy createFloatBeanProxy(float aFloat){
- return new IDENumberBeanProxy(fProxyFactoryRegistry,new Float(aFloat),this);
-}
-int getPrimitiveType(){
- return FLOAT;
-}
-
-protected IIDEBeanProxy newBeanProxy(Object anObject){
- Number n = anObject instanceof Character ? new Float(((Character) anObject).charValue()) : (Number) anObject;
- return new IDENumberBeanProxy(fProxyFactoryRegistry, n, this);
-
-}
-}
-
-
diff --git a/plugins/org.eclipse.jem.proxy/proxyide/org/eclipse/jem/internal/proxy/ide/IDEInitErrorBeanTypeProxy.java b/plugins/org.eclipse.jem.proxy/proxyide/org/eclipse/jem/internal/proxy/ide/IDEInitErrorBeanTypeProxy.java
deleted file mode 100644
index 3b13375..0000000
--- a/plugins/org.eclipse.jem.proxy/proxyide/org/eclipse/jem/internal/proxy/ide/IDEInitErrorBeanTypeProxy.java
+++ /dev/null
@@ -1,260 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2001, 2005 IBM Corporation and others.
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
- *
- * Contributors:
- * IBM Corporation - initial API and implementation
- *******************************************************************************/
-package org.eclipse.jem.internal.proxy.ide;
-
-/*
-
-
- */
-
-import org.eclipse.jem.internal.proxy.core.*;
-
-/**
- * @author richkulp
- *
- * To change this generated comment edit the template variable "typecomment": Window>Preferences>Java>Templates. To enable and disable the creation of
- * type comments go to Window>Preferences>Java>Code Generation.
- */
-public class IDEInitErrorBeanTypeProxy extends IDEBeanTypeProxy {
-
- protected String classname;
-
- protected String initializationError;
-
- protected Throwable cause;
-
- protected IDEInitErrorBeanTypeProxy(IDEProxyFactoryRegistry registry, String classname, String initializationError, Throwable cause) {
- super(registry, null);
- this.classname = classname;
- this.initializationError = initializationError;
- this.cause = cause;
- }
-
- /**
- * Get the throwable (cause) that made this bean type bad.
- * @return the Throwable that was the cause, or null if not caused by an throwable.
- *
- * @since 1.1.0
- */
- public Throwable getCause() {
- return cause;
- }
- /**
- * @see org.eclipse.jem.internal.proxy.core.IBeanTypeProxy#getConstructorProxy(String[])
- */
- public IConstructorProxy getConstructorProxy(String[] argumentClassNames) {
- return null;
- }
-
- /**
- * @see org.eclipse.jem.internal.proxy.core.IBeanTypeProxy#getConstructorProxy(IBeanTypeProxy[])
- */
- public IConstructorProxy getConstructorProxy(IBeanTypeProxy[] argumentTypes) {
- return null;
- }
-
- public IConstructorProxy[] getConstructors() {
- return null;
- }
-
- /**
- * @see org.eclipse.jem.internal.proxy.core.IBeanTypeProxy#getConstructorProxy(String[])
- */
- public IConstructorProxy getDeclaredConstructorProxy(String[] argumentClassNames) {
- return null;
- }
-
- /**
- * @see org.eclipse.jem.internal.proxy.core.IBeanTypeProxy#getConstructorProxy(IBeanTypeProxy[])
- */
- public IConstructorProxy getDeclaredConstructorProxy(IBeanTypeProxy[] argumentTypes) {
- return null;
- }
-
- public IConstructorProxy[] getDeclaredConstructors() {
- return null;
- }
-
- public IFieldProxy[] getFields() {
- return null;
- }
-
- public IFieldProxy[] getDeclaredFields() {
- return null;
- }
-
- /**
- * @see org.eclipse.jem.internal.proxy.core.IBeanTypeProxy#getFieldProxy(String)
- */
- public IFieldProxy getFieldProxy(String fieldName) {
- return null;
- }
-
- public IMethodProxy[] getMethods() {
- return null;
- }
-
- public IMethodProxy[] getDeclaredMethods() {
- return null;
- }
-
- /**
- * @see org.eclipse.jem.internal.proxy.core.IBeanTypeProxy#getMethodProxy(String)
- */
- public IMethodProxy getMethodProxy(String methodName) {
- return null;
- }
-
- /**
- * @see org.eclipse.jem.internal.proxy.core.IBeanTypeProxy#getMethodProxy(String, String[])
- */
- public IMethodProxy getMethodProxy(String methodName, String[] argumentClassNames) {
- return null;
- }
-
- /**
- * @see org.eclipse.jem.internal.proxy.core.IBeanTypeProxy#getMethodProxy(String, String)
- */
- public IMethodProxy getMethodProxy(String methodName, String argumentClassName) {
- return null;
- }
-
- /**
- * @see org.eclipse.jem.internal.proxy.core.IBeanTypeProxy#getMethodProxy(String, IBeanTypeProxy[])
- */
- public IMethodProxy getMethodProxy(String methodName, IBeanTypeProxy[] argumentTypes) {
- return null;
- }
-
- /**
- * @see org.eclipse.jem.internal.proxy.core.IBeanTypeProxy#getMethodProxy(String, String[])
- */
- public IMethodProxy getDeclaredMethodProxy(String methodName, String[] argumentClassNames) {
- return null;
- }
-
- /**
- * @see org.eclipse.jem.internal.proxy.core.IBeanTypeProxy#getMethodProxy(String, IBeanTypeProxy[])
- */
- public IMethodProxy getDeclaredMethodProxy(String methodName, IBeanTypeProxy[] argumentTypes) {
- return null;
- }
-
- /**
- * @see org.eclipse.jem.internal.proxy.core.IBeanTypeProxy#getNullConstructorProxy()
- */
- public IConstructorProxy getNullConstructorProxy() {
- return null;
- }
-
- /**
- * @see org.eclipse.jem.internal.proxy.core.IBeanTypeProxy#getSuperBeanTypeProxy()
- */
- public IBeanTypeProxy getSuperBeanTypeProxy() {
- return null;
- }
-
- /**
- * @see org.eclipse.jem.internal.proxy.core.IBeanTypeProxy#getTypeName()
- */
- public String getTypeName() {
- return classname;
- }
-
- /**
- * @see org.eclipse.jem.internal.proxy.core.IBeanTypeProxy#getFormalTypeName()
- */
- public String getFormalTypeName() {
- return getTypeName();
- }
-
- /**
- * @see org.eclipse.jem.internal.proxy.core.IBeanTypeProxy#isArray()
- */
- public boolean isArray() {
- return false;
- }
-
- /**
- * @see org.eclipse.jem.internal.proxy.core.IBeanTypeProxy#isInterface()
- */
- public boolean isInterface() {
- return false;
- }
-
- /**
- * @see org.eclipse.jem.internal.proxy.core.IBeanTypeProxy#isPrimitive()
- */
- public boolean isPrimitive() {
- return false;
- }
-
- /**
- * @see org.eclipse.jem.internal.proxy.core.IBeanTypeProxy#isKindOf(IBeanTypeProxy)
- */
- public boolean isKindOf(IBeanTypeProxy aBeanProxyType) {
- return false;
- }
-
- /**
- * @see org.eclipse.jem.internal.proxy.core.IBeanTypeProxy#newInstance()
- */
- public IBeanProxy newInstance() {
- return null;
- }
-
- /**
- * @see org.eclipse.jem.internal.proxy.core.IBeanTypeProxy#newInstance(String)
- */
- public IBeanProxy newInstance(String initializationString) {
- return null;
- }
-
- /**
- * @see org.eclipse.jem.internal.proxy.core.IBeanTypeProxy#getInitializationError()
- */
- public String getInitializationError() {
- return initializationError;
- }
-
- /**
- * @see org.eclipse.jem.internal.proxy.core.IBeanProxy#toBeanString()
- */
- public String toBeanString() {
- return classname;
- }
-
- /**
- * @see org.eclipse.jem.internal.proxy.core.IBeanProxy#isValid()
- */
- public boolean isValid() {
- return false;
- }
-
- /*
- * (non-Javadoc)
- *
- * @see org.eclipse.jem.internal.proxy.core.IBeanTypeProxy#getCompatibleConstructor(org.eclipse.jem.internal.proxy.core.IBeanTypeProxy[])
- */
- public IConstructorProxy getCompatibleConstructor(IBeanTypeProxy[] argumentTypes) {
- return null;
- }
-
- /*
- * (non-Javadoc)
- *
- * @see org.eclipse.jem.internal.proxy.core.IBeanTypeProxy#getCompatibleMethod(java.lang.String,
- * org.eclipse.jem.internal.proxy.core.IBeanTypeProxy[])
- */
- public IMethodProxy getCompatibleMethod(String methodName, IBeanTypeProxy[] argumentTypes) {
- return null;
- }
-}
diff --git a/plugins/org.eclipse.jem.proxy/proxyide/org/eclipse/jem/internal/proxy/ide/IDEIntegerBeanProxy.java b/plugins/org.eclipse.jem.proxy/proxyide/org/eclipse/jem/internal/proxy/ide/IDEIntegerBeanProxy.java
deleted file mode 100644
index 09e3a43..0000000
--- a/plugins/org.eclipse.jem.proxy/proxyide/org/eclipse/jem/internal/proxy/ide/IDEIntegerBeanProxy.java
+++ /dev/null
@@ -1,38 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2001, 2005 IBM Corporation and others.
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
- *
- * Contributors:
- * IBM Corporation - initial API and implementation
- *******************************************************************************/
-package org.eclipse.jem.internal.proxy.ide;
-/*
-
-
- */
-
-import org.eclipse.jem.internal.proxy.core.*;
-
-/**
- * IDE Proxy for Integers. Since Integers were first implemented
- * in the VCE, and because they are often referenced, we've created
- * a subclass to handle them. That way we wouldn't need to change
- * everyone that was using the IIntegerProxy interface and we
- * can store the int value to speed up access.
- */
-public class IDEIntegerBeanProxy extends IDENumberBeanProxy implements IIntegerBeanProxy {
- protected int fIntValue;
-IDEIntegerBeanProxy(IDEProxyFactoryRegistry aRegistry, Number anInteger, IBeanTypeProxy aBeanTypeProxy) {
- super(aRegistry, anInteger , aBeanTypeProxy);
- fIntValue = anInteger.intValue();
-}
-/**
- * Return the int value
- */
-public int intValue() {
- return fIntValue;
-}
-}
diff --git a/plugins/org.eclipse.jem.proxy/proxyide/org/eclipse/jem/internal/proxy/ide/IDEIntegerClassBeanTypeProxy.java b/plugins/org.eclipse.jem.proxy/proxyide/org/eclipse/jem/internal/proxy/ide/IDEIntegerClassBeanTypeProxy.java
deleted file mode 100644
index 5de18c0..0000000
--- a/plugins/org.eclipse.jem.proxy/proxyide/org/eclipse/jem/internal/proxy/ide/IDEIntegerClassBeanTypeProxy.java
+++ /dev/null
@@ -1,57 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2001, 2005 IBM Corporation and others.
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
- *
- * Contributors:
- * IBM Corporation - initial API and implementation
- *******************************************************************************/
-package org.eclipse.jem.internal.proxy.ide;
-/*
-
-
- */
-
-import org.eclipse.jem.internal.proxy.core.IIntegerBeanProxy;
-
-/**
- * IDE Implementation of IIntegerBeanTypeProxy
- */
-final class IDEIntegerClassBeanTypeProxy extends IDENumberBeanTypeProxy {
-// Some values are cache'd for speed
- private final IDEIntegerBeanProxy zeroIntProxy;
- private final IDEIntegerBeanProxy oneIntProxy;
- private final IDEIntegerBeanProxy twoIntProxy;
- private final IDEIntegerBeanProxy threeIntProxy;
-IDEIntegerClassBeanTypeProxy(IDEProxyFactoryRegistry aRegistry, Class aClass) {
- super(aRegistry, aClass, new Integer(0));
- // Create the cached values
- zeroIntProxy = new IDEIntegerBeanProxy(aRegistry, new Integer(0), this );
- oneIntProxy = new IDEIntegerBeanProxy(aRegistry, new Integer(1), this );
- twoIntProxy = new IDEIntegerBeanProxy(aRegistry, new Integer(2), this );
- threeIntProxy = new IDEIntegerBeanProxy(aRegistry, new Integer(3), this );
-
-}
-/**
- * Static helper to create a bean proxy
- * Package protected because everyone should go through the factory API
- * that is defined as part of IBeanProxyFactory
- */
-IIntegerBeanProxy createIntegerBeanProxy(Integer anInteger) {
- switch(anInteger.intValue()){
- case 0: return zeroIntProxy ;
- case 1: return oneIntProxy ;
- case 2: return twoIntProxy ;
- case 3: return threeIntProxy ;
- default: return new IDEIntegerBeanProxy(fProxyFactoryRegistry,anInteger,this);
- }
-}
-protected IIDEBeanProxy newBeanProxy(Object anObject){
-
- return (IIDEBeanProxy)createIntegerBeanProxy((Integer)anObject);
-
-}
-}
-
diff --git a/plugins/org.eclipse.jem.proxy/proxyide/org/eclipse/jem/internal/proxy/ide/IDEIntegerTypeBeanTypeProxy.java b/plugins/org.eclipse.jem.proxy/proxyide/org/eclipse/jem/internal/proxy/ide/IDEIntegerTypeBeanTypeProxy.java
deleted file mode 100644
index bf93deb..0000000
--- a/plugins/org.eclipse.jem.proxy/proxyide/org/eclipse/jem/internal/proxy/ide/IDEIntegerTypeBeanTypeProxy.java
+++ /dev/null
@@ -1,69 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2001, 2005 IBM Corporation and others.
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
- *
- * Contributors:
- * IBM Corporation - initial API and implementation
- *******************************************************************************/
-package org.eclipse.jem.internal.proxy.ide;
-/*
-
-
- */
-
-import org.eclipse.jem.internal.proxy.core.IIntegerBeanProxy;
-
-/**
- * IDE Implementation of IIntegerBeanTypeProxy
- */
-final class IDEIntegerTypeBeanTypeProxy extends IDEPrimitiveBeanTypeProxy {
-// Some values are cache'd for speed
- private final IDEIntegerBeanProxy zeroProxy;
- private final IDEIntegerBeanProxy oneProxy;
- private final IDEIntegerBeanProxy twoProxy;
- private final IDEIntegerBeanProxy threeProxy;
-IDEIntegerTypeBeanTypeProxy(IDEProxyFactoryRegistry aRegistry, Class aClass) {
- super(aRegistry, aClass);
- // Create the cached values
- zeroProxy = new IDEIntegerBeanProxy(aRegistry, new Integer(0), this );
- oneProxy = new IDEIntegerBeanProxy(aRegistry, new Integer(1), this );
- twoProxy = new IDEIntegerBeanProxy(aRegistry, new Integer(2), this );
- threeProxy = new IDEIntegerBeanProxy(aRegistry, new Integer(3), this );
-
-}
-/**
- * Static helper to create a bean proxy
- * Package protected because everyone should go through the factory API
- * that is defined as part of IBeanProxyFactory
- */
-IIntegerBeanProxy createIntegerBeanProxy(int anInt) {
- switch(anInt){
- case 0: return zeroProxy ;
- case 1: return oneProxy ;
- case 2: return twoProxy ;
- case 3: return threeProxy ;
- default: return new IDEIntegerBeanProxy(fProxyFactoryRegistry,new Integer(anInt),this);
- }
-}
-/* Specialized from IDEBeanTypeProxy to ensure IIntegerBeanProxies are created correctly
- */
-protected IIDEBeanProxy newBeanProxy(Object anObject){
- Number n = anObject instanceof Character ? new Integer(((Character) anObject).charValue()) : (Number) anObject;
- switch(n.intValue()){
- case 0: return zeroProxy ;
- case 1: return oneProxy ;
- case 2: return twoProxy ;
- case 3: return threeProxy ;
- default: return new IDEIntegerBeanProxy(fProxyFactoryRegistry, n, this);
- }
-
-
-}
-int getPrimitiveType(){
- return INTEGER;
-}
-}
-
diff --git a/plugins/org.eclipse.jem.proxy/proxyide/org/eclipse/jem/internal/proxy/ide/IDELongClassBeanTypeProxy.java b/plugins/org.eclipse.jem.proxy/proxyide/org/eclipse/jem/internal/proxy/ide/IDELongClassBeanTypeProxy.java
deleted file mode 100644
index 2bef122..0000000
--- a/plugins/org.eclipse.jem.proxy/proxyide/org/eclipse/jem/internal/proxy/ide/IDELongClassBeanTypeProxy.java
+++ /dev/null
@@ -1,32 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2001, 2005 IBM Corporation and others.
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
- *
- * Contributors:
- * IBM Corporation - initial API and implementation
- *******************************************************************************/
-package org.eclipse.jem.internal.proxy.ide;
-/*
-
-
- */
-
-import org.eclipse.jem.internal.proxy.core.*;
-
-/**
- * Long BeanType Proxy.
- */
-final class IDELongClassBeanTypeProxy extends IDENumberBeanTypeProxy {
-
-protected IDELongClassBeanTypeProxy(IDEProxyFactoryRegistry aRegistry, Class aClass) {
- super(aRegistry, aClass, new Long(0));
-}
-INumberBeanProxy createLongBeanProxy(Long aLong){
- return new IDENumberBeanProxy(fProxyFactoryRegistry,aLong,this);
-}
-}
-
-
diff --git a/plugins/org.eclipse.jem.proxy/proxyide/org/eclipse/jem/internal/proxy/ide/IDELongTypeBeanTypeProxy.java b/plugins/org.eclipse.jem.proxy/proxyide/org/eclipse/jem/internal/proxy/ide/IDELongTypeBeanTypeProxy.java
deleted file mode 100644
index 0c1d10a..0000000
--- a/plugins/org.eclipse.jem.proxy/proxyide/org/eclipse/jem/internal/proxy/ide/IDELongTypeBeanTypeProxy.java
+++ /dev/null
@@ -1,41 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2001, 2005 IBM Corporation and others.
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
- *
- * Contributors:
- * IBM Corporation - initial API and implementation
- *******************************************************************************/
-package org.eclipse.jem.internal.proxy.ide;
-/*
-
-
- */
-
-import org.eclipse.jem.internal.proxy.core.*;
-/**
- * Long BeanType Proxy.
- */
-final class IDELongTypeBeanTypeProxy extends IDEPrimitiveBeanTypeProxy {
-
-protected IDELongTypeBeanTypeProxy(IDEProxyFactoryRegistry aRegistry, Class aClass) {
- super(aRegistry, aClass);
-}
-INumberBeanProxy createLongBeanProxy(long aLong){
- return new IDENumberBeanProxy(fProxyFactoryRegistry,new Long(aLong),this);
-}
-int getPrimitiveType(){
- return LONG;
-}
-
-protected IIDEBeanProxy newBeanProxy(Object anObject){
- Number n = anObject instanceof Character ? new Long(((Character) anObject).charValue()) : (Number) anObject;
- return new IDENumberBeanProxy(fProxyFactoryRegistry, n, this);
-}
-}
-
-
-
-
diff --git a/plugins/org.eclipse.jem.proxy/proxyide/org/eclipse/jem/internal/proxy/ide/IDEMethodProxy.java b/plugins/org.eclipse.jem.proxy/proxyide/org/eclipse/jem/internal/proxy/ide/IDEMethodProxy.java
deleted file mode 100644
index 50ed31f..0000000
--- a/plugins/org.eclipse.jem.proxy/proxyide/org/eclipse/jem/internal/proxy/ide/IDEMethodProxy.java
+++ /dev/null
@@ -1,191 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2001, 2005 IBM Corporation and others.
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
- *
- * Contributors:
- * IBM Corporation - initial API and implementation
- *******************************************************************************/
-package org.eclipse.jem.internal.proxy.ide;
-/*
-
-
- */
-
-import java.lang.reflect.InvocationTargetException;
-import java.lang.reflect.Method;
-
-import org.eclipse.core.runtime.IStatus;
-import org.eclipse.core.runtime.Status;
-
-import org.eclipse.jem.internal.proxy.core.*;
-
-public class IDEMethodProxy extends IDEAccessibleObjectProxy implements IMethodProxy {
-
- protected IDEMethodProxy(IDEProxyFactoryRegistry aRegistry, Method aMethod) {
- super(aRegistry, aMethod);
- }
-
- public IBeanTypeProxy getClassType() {
- return ((IDEStandardBeanTypeProxyFactory) fProxyFactoryRegistry.getBeanTypeProxyFactory()).getBeanTypeProxy(
- ((Method) getBean()).getDeclaringClass());
- }
- public IBeanTypeProxy getReturnType() {
- return ((IDEStandardBeanTypeProxyFactory) fProxyFactoryRegistry.getBeanTypeProxyFactory()).getBeanTypeProxy(
- ((Method) getBean()).getReturnType());
- }
- public IBeanTypeProxy[] getParameterTypes() {
- Class[] parmClasses = ((Method) getBean()).getParameterTypes();
- IBeanTypeProxy[] parmTypes = new IBeanTypeProxy[parmClasses.length];
- IDEStandardBeanTypeProxyFactory factory = (IDEStandardBeanTypeProxyFactory) fProxyFactoryRegistry.getBeanTypeProxyFactory();
- for (int i = 0; i < parmClasses.length; i++) {
- parmTypes[i] = factory.getBeanTypeProxy(parmClasses[i]);
- }
- return parmTypes;
- }
- public String getName() {
- return ((Method) getBean()).getName();
- }
-
- /**
- * The type proxy is constant proxy out of the method factory.
- */
- public IBeanTypeProxy getTypeProxy() {
- return ((IDEMethodProxyFactory) fProxyFactoryRegistry.getMethodProxyFactory()).methodType;
- }
-
- /**
- * Invoke the method directly. Because we are an IDEMethodProxy we can assume that IBeanProxy
- * is an IDEBeanProxy and we can get its bean directly
- */
- public IBeanProxy invoke(IBeanProxy subject) throws ThrowableProxy {
- try {
- Object result = ((Method) getBean()).invoke(subject != null ? ((IIDEBeanProxy) subject).getBean() : null, new Object[0]);
- if (result == null) {
- return null;
- } else {
- // The result may be a java.lang.Integer when we really want to create an int
- // Reflection always give you the big object
- Class returnType = ((Method) getBean()).getReturnType();
- return getBeanProxy(returnType, result);
- }
- } catch (InvocationTargetException e) {
- // This is a wrappered exception. Return the wrappered one so it looks like
- // it was the real one.
- IBeanTypeProxy exceptionTypeProxy =
- ((IDEStandardBeanTypeProxyFactory) fProxyFactoryRegistry.getBeanTypeProxyFactory()).getBeanTypeProxy(
- e.getTargetException().getClass());
- throw new IDEThrowableProxy(e.getTargetException(), exceptionTypeProxy);
- } catch (Exception exc) {
- IBeanTypeProxy exceptionTypeProxy =
- ((IDEStandardBeanTypeProxyFactory) fProxyFactoryRegistry.getBeanTypeProxyFactory()).getBeanTypeProxy(exc.getClass());
- throw new IDEThrowableProxy(exc, exceptionTypeProxy);
- }
- }
- /**
- * Do not throw an exception
- */
- public IBeanProxy invokeCatchThrowableExceptions(IBeanProxy subject) {
- try {
- return invoke(subject);
- } catch (ThrowableProxy exc) {
- ProxyPlugin.getPlugin().getLogger().log(
- new Status(IStatus.WARNING, ProxyPlugin.getPlugin().getBundle().getSymbolicName(), 0, "", exc)); //$NON-NLS-1$
- }
- return null;
- }
- /**
- * Invoke the method with argument. The argument will be an IDEBeanProxy
- * ( because we are an IDEMethodProxy ) so we can cast to it and get the actual bean
- * itself and use this to invoke against method which is the actual
- * java.lang.Reflect instance
- */
- public IBeanProxy invoke(IBeanProxy subject, IBeanProxy argument) throws ThrowableProxy {
- try {
- Object result =
- ((Method) getBean()).invoke(
- subject != null ? ((IIDEBeanProxy) subject).getBean() : null,
- new Object[] { argument != null ? ((IIDEBeanProxy) argument).getBean() : null });
- if (result == null) {
- return null;
- } else {
- Class returnType = ((Method) getBean()).getReturnType();
- return getBeanProxy(returnType, result);
- }
- } catch (InvocationTargetException e) {
- // This is a wrappered exception. Return the wrappered one so it looks like
- // it was the real one.
- IBeanTypeProxy exceptionTypeProxy =
- ((IDEStandardBeanTypeProxyFactory) fProxyFactoryRegistry.getBeanTypeProxyFactory()).getBeanTypeProxy(
- e.getTargetException().getClass());
- throw new IDEThrowableProxy(e.getTargetException(), exceptionTypeProxy);
- } catch (Exception exc) {
- IBeanTypeProxy exceptionTypeProxy =
- ((IDEStandardBeanTypeProxyFactory) fProxyFactoryRegistry.getBeanTypeProxyFactory()).getBeanTypeProxy(exc.getClass());
- throw new IDEThrowableProxy(exc, exceptionTypeProxy);
- }
- }
- /**
- * Invoke without throwing an exception
- */
- public IBeanProxy invokeCatchThrowableExceptions(IBeanProxy subject, IBeanProxy argument) {
- try {
- return invoke(subject, argument);
- } catch (ThrowableProxy exc) {
- ProxyPlugin.getPlugin().getLogger().log(
- new Status(IStatus.WARNING, ProxyPlugin.getPlugin().getBundle().getSymbolicName(), 0, "", exc)); //$NON-NLS-1$
- }
- return null;
- }
- /**
- * Invoke the method with arguments. The arguments will be IDEBeanProxy objects
- * ( because we are an IDEMethodProxy ) so we can cast to them and get the actual bean
- * objects themselves and use these to invoke against method which is the actual
- * java.lang.Reflect instance
- */
- public IBeanProxy invoke(IBeanProxy subject, IBeanProxy[] arguments) throws ThrowableProxy {
- Object[] beanArguments = new Object[arguments.length];
- for (int i = 0; i < arguments.length; i++) {
- if (arguments[i] != null) {
- beanArguments[i] = ((IIDEBeanProxy) arguments[i]).getBean();
- }
- }
- try {
- Object result = ((Method) getBean()).invoke(subject != null ? ((IIDEBeanProxy) subject).getBean() : null, beanArguments);
- if (result == null) {
- return null;
- } else {
- Class returnType = ((Method) getBean()).getReturnType();
- return getBeanProxy(returnType, result);
- }
- } catch (InvocationTargetException e) {
- // This is a wrappered exception. Return the wrappered one so it looks like
- // it was the real one.
- IBeanTypeProxy exceptionTypeProxy =
- ((IDEStandardBeanTypeProxyFactory) fProxyFactoryRegistry.getBeanTypeProxyFactory()).getBeanTypeProxy(
- e.getTargetException().getClass());
- throw new IDEThrowableProxy(e.getTargetException(), exceptionTypeProxy);
- } catch (Exception exc) {
- IBeanTypeProxy exceptionTypeProxy =
- ((IDEStandardBeanTypeProxyFactory) fProxyFactoryRegistry.getBeanTypeProxyFactory()).getBeanTypeProxy(exc.getClass());
- throw new IDEThrowableProxy(exc, exceptionTypeProxy);
- }
- }
- /**
- * Invoke without throwing an exception
- */
- public IBeanProxy invokeCatchThrowableExceptions(IBeanProxy subject, IBeanProxy[] arguments) {
- try {
- return invoke(subject, arguments);
- } catch (ThrowableProxy exc) {
- ProxyPlugin.getPlugin().getLogger().log(
- new Status(IStatus.WARNING, ProxyPlugin.getPlugin().getBundle().getSymbolicName(), 0, "", exc)); //$NON-NLS-1$
- }
- return null;
- }
- IBeanProxy getBeanProxy(Class returnType, Object bean) {
- return fProxyFactoryRegistry.getBeanProxy(returnType, bean);
- }
-}
diff --git a/plugins/org.eclipse.jem.proxy/proxyide/org/eclipse/jem/internal/proxy/ide/IDEMethodProxyFactory.java b/plugins/org.eclipse.jem.proxy/proxyide/org/eclipse/jem/internal/proxy/ide/IDEMethodProxyFactory.java
deleted file mode 100644
index 9122b67..0000000
--- a/plugins/org.eclipse.jem.proxy/proxyide/org/eclipse/jem/internal/proxy/ide/IDEMethodProxyFactory.java
+++ /dev/null
@@ -1,337 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2001, 2006 IBM Corporation and others.
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
- *
- * Contributors:
- * IBM Corporation - initial API and implementation
- *******************************************************************************/
-/*
- * $RCSfile: IDEMethodProxyFactory.java,v $ $Revision: 1.14 $ $Date: 2006/05/17 20:13:05 $
- */
-package org.eclipse.jem.internal.proxy.ide;
-
-import java.lang.reflect.*;
-import java.util.HashMap;
-import java.util.Map;
-
-import org.eclipse.core.runtime.IStatus;
-import org.eclipse.core.runtime.Status;
-
-import org.eclipse.jem.internal.proxy.common.AmbiguousMethodException;
-import org.eclipse.jem.internal.proxy.common.MethodHelper;
-import org.eclipse.jem.internal.proxy.core.*;
-
-public class IDEMethodProxyFactory implements IMethodProxyFactory {
-
- final protected IDEProxyFactoryRegistry fProxyFactoryRegistry;
-
- final protected static Map primLookup = new HashMap();
-
- IDEBeanTypeProxy accessibleType, fieldType, methodType, constructorType;
- // Cached copy of a few typical method type proxies.
- static {
- primLookup.put("int", Integer.TYPE); //$NON-NLS-1$
- primLookup.put("char", Character.TYPE); //$NON-NLS-1$
- primLookup.put("long", Long.TYPE); //$NON-NLS-1$
- primLookup.put("short", Short.TYPE); //$NON-NLS-1$
- primLookup.put("double", Double.TYPE); //$NON-NLS-1$
- primLookup.put("boolean", Boolean.TYPE); //$NON-NLS-1$
- primLookup.put("byte", Byte.TYPE); //$NON-NLS-1$
- primLookup.put("float", Float.TYPE); //$NON-NLS-1$
- }
-
- IDEMethodProxyFactory(IDEProxyFactoryRegistry aRegistry) {
- fProxyFactoryRegistry = aRegistry;
- fProxyFactoryRegistry.registerMethodProxyFactory(this);
- accessibleType = new IDEBeanTypeProxy(aRegistry, AccessibleObject.class);
- fieldType = new IDEFieldTypeProxy(aRegistry);
- methodType = new IDEMethodTypeProxy(aRegistry);
- constructorType = new IDEConstructorTypeProxy(aRegistry);
- fProxyFactoryRegistry.getBeanTypeProxyFactory().registerBeanTypeProxy(accessibleType, true);
- fProxyFactoryRegistry.getBeanTypeProxyFactory().registerBeanTypeProxy(fieldType, true);
- fProxyFactoryRegistry.getBeanTypeProxyFactory().registerBeanTypeProxy(methodType, true);
- fProxyFactoryRegistry.getBeanTypeProxyFactory().registerBeanTypeProxy(constructorType, true);
- }
-
- /**
- * Return an instance of an IDEConstructorProxy This is package protected because the only people who can use this are priveledge objects that
- * have the aMethod instance. These are part of the idevm package only. If you have to make this method public you are doing things incorrectly.
- * To get a method proxy you must use the interface methods on IMethodProxyFactory to do lookup by string or else on IBeanTypeProxy that has
- * getMethod(String) as well
- */
- IConstructorProxy getConstructorProxy(Constructor aConstructor) {
-
- return (IConstructorProxy) constructorType.newBeanProxy(aConstructor);
-
- }
-
- IConstructorProxy[] getConstructors(Class aClass) {
- Constructor[] ctors = aClass.getConstructors();
- IConstructorProxy[] ctorProxies = new IConstructorProxy[ctors.length];
- for (int i = 0; i < ctors.length; i++) {
- ctorProxies[i] = getConstructorProxy(ctors[i]);
- }
- return ctorProxies;
- }
-
- IConstructorProxy[] getDeclaredConstructors(Class aClass) {
- Constructor[] ctors = aClass.getDeclaredConstructors();
- IConstructorProxy[] ctorProxies = new IConstructorProxy[ctors.length];
- for (int i = 0; i < ctors.length; i++) {
- ctorProxies[i] = getConstructorProxy(ctors[i]);
- }
- return ctorProxies;
- }
-
- IConstructorProxy getConstructorProxy(Class aClass, Class[] args) {
-
- try {
- Constructor ctor = aClass.getConstructor(args);
- return getConstructorProxy(ctor);
- } catch (NoSuchMethodException exc) {
- return null;
- }
- }
-
- IConstructorProxy getDeclaredConstructorProxy(Class aClass, Class[] args) {
-
- try {
- Constructor ctor = aClass.getDeclaredConstructor(args);
- return getConstructorProxy(ctor);
- } catch (NoSuchMethodException exc) {
- return null;
- }
- }
-
- IFieldProxy[] getFields(Class aClass) {
- Field[] fields = aClass.getFields();
- IFieldProxy[] fieldProxies = new IFieldProxy[fields.length];
- for (int i = 0; i < fields.length; i++) {
- fieldProxies[i] = getFieldProxy(fields[i]);
- }
- return fieldProxies;
- }
-
- IFieldProxy[] getDeclaredFields(Class aClass) {
- Field[] fields = aClass.getDeclaredFields();
- IFieldProxy[] fieldProxies = new IFieldProxy[fields.length];
- for (int i = 0; i < fields.length; i++) {
- fieldProxies[i] = getFieldProxy(fields[i]);
- }
- return fieldProxies;
- }
-
- /**
- * Return an instance of an IDEFieldProxy This is package protected because the only people who can use this are priveledge objects that have the
- * aField instance. These are part of the idevm package only. If you have to make this method public you are doing things incorrectly. To get a
- * field proxy you must use the interface methods on IBeanTypeProxy that has getField(String) as well
- */
- IFieldProxy getFieldProxy(Field aField) {
-
- return (IFieldProxy) fieldType.newBeanProxy(aField);
-
- }
-
- /* (non-Javadoc)
- * @see org.eclipse.jem.internal.proxy.core.IMethodProxyFactory#getFieldProxy(org.eclipse.jem.internal.proxy.core.IExpression, java.lang.String, java.lang.String)
- */
- public IProxyField getFieldProxy(IExpression expression, String className, String fieldName) {
- // We are getting the class resolved through the expression. Might as well because it probably will
- // be needed again and this way when the expression is finished they will be resolved for later usage.
- IStandardBeanTypeProxyFactory beanTypeProxyFactory = fProxyFactoryRegistry.getBeanTypeProxyFactory();
- IProxyBeanType beanType = beanTypeProxyFactory.getBeanTypeProxy(expression, className);
- return beanType.getFieldProxy(expression, fieldName);
- }
-
- /**
- * Return an instance of an IDEMethodProxy This is package protected because the only people who can use this are priveledge objects that have the
- * aMethod instance. These are part of the idevm package only. If you have to make this method public you are doing things incorrectly. To get a
- * method proxy you must use the interface methods on IMethodProxyFactory to do lookup by string or else on IBeanTypeProxy that has
- * getMethod(String) as well
- */
- IDEMethodProxy getMethodProxy(Method aMethod) {
-
- return (IDEMethodProxy) methodType.newBeanProxy(aMethod);
-
- }
-
- public IMethodProxy getMethodProxy(String className, String methodName, String[] parameterTypes) {
- try {
- Class aClass = fProxyFactoryRegistry.loadClass(className);
- return getMethodProxy(aClass, methodName, parameterTypes);
- } catch (ClassNotFoundException exc) {
- ProxyPlugin.getPlugin().getLogger().log(new Status(IStatus.WARNING, ProxyPlugin.getPlugin().getBundle().getSymbolicName(), 0, "", exc)); //$NON-NLS-1$
- return null;
- }
- }
-
- /*
- * (non-Javadoc)
- * @see org.eclipse.jem.internal.proxy.core.IMethodProxyFactory#getMethodProxy(org.eclipse.jem.internal.proxy.core.IExpression, java.lang.String, java.lang.String, java.lang.String[])
- */
- public IProxyMethod getMethodProxy(IExpression expression, String className, String methodName, String[] parameterTypes) {
- // We are getting the class and parmtypes resolved through the expression. Might as well because they probably will
- // be needed again and this way when the expression is finished they will be resolved for later usage.
- IStandardBeanTypeProxyFactory beanTypeProxyFactory = fProxyFactoryRegistry.getBeanTypeProxyFactory();
- IProxyBeanType beanType = beanTypeProxyFactory.getBeanTypeProxy(expression, className);
- IProxyBeanType[] parmTypes = getParameterTypes(expression, parameterTypes, beanTypeProxyFactory);
- return beanType.getMethodProxy(expression, methodName, parmTypes);
- }
-
- /**
- * Helper method for Beantypes and Proxy bean types to get the proxy.
- * @param expression
- * @param classType
- * @param methodName
- * @param parameterTypes
- * @return
- *
- * @since 1.1.0
- */
- public IProxyMethod getMethodProxy(IExpression expression, IProxyBeanType classType, String methodName, String[] parameterTypes) {
- // We are getting the parmtypes resolved through the expression. Might as well because they probably will
- // be needed again and this way when the expression is finished they will be resolved for later usage.
- IStandardBeanTypeProxyFactory beanTypeProxyFactory = fProxyFactoryRegistry.getBeanTypeProxyFactory();
- IProxyBeanType[] parmTypes = getParameterTypes(expression, parameterTypes, beanTypeProxyFactory);
- return classType.getMethodProxy(expression, methodName, parmTypes);
- }
-
- /**
- * @param expression
- * @param parameterTypes
- * @param beanTypeProxyFactory
- * @return
- *
- * @since 1.1.0
- */
- protected IProxyBeanType[] getParameterTypes(IExpression expression, String[] parameterTypes, IStandardBeanTypeProxyFactory beanTypeProxyFactory) {
- IProxyBeanType[] parmTypes;
- if (parameterTypes == null || parameterTypes.length == 0)
- parmTypes = null;
- else {
- parmTypes = new IProxyBeanType[parameterTypes.length];
- for (int i = 0; i < parameterTypes.length; i++) {
- parmTypes[i] = beanTypeProxyFactory.getBeanTypeProxy(expression, parameterTypes[i]);
- }
- }
- return parmTypes;
- }
-
- public IMethodProxy getMethodProxy(Class cls, String methodName, String[] parameterTypes) {
- try {
- Class[] parmClasses = null;
- if (parameterTypes != null) {
- parmClasses = new Class[parameterTypes.length];
- for (int i = 0; i < parmClasses.length; i++) {
- Class temp = (Class) primLookup.get(parameterTypes[i]);
- if (temp == null)
- temp = fProxyFactoryRegistry.loadClass(parameterTypes[i]);
- parmClasses[i] = temp;
- }
- }
- return getMethodProxy(cls.getMethod(methodName, parmClasses));
- } catch (ClassNotFoundException e) {
- ProxyPlugin.getPlugin().getLogger().log(new Status(IStatus.WARNING, ProxyPlugin.getPlugin().getBundle().getSymbolicName(), 0, "", e)); //$NON-NLS-1$
- } catch (NoSuchMethodException e) {
- ProxyPlugin.getPlugin().getLogger().log(new Status(IStatus.WARNING, ProxyPlugin.getPlugin().getBundle().getSymbolicName(), 0, "", e)); //$NON-NLS-1$
- }
- return null;
- }
-
- IMethodProxy getDeclaredMethodProxy(Class cls, String methodName, String[] parameterTypes) {
- try {
- Class[] parmClasses = null;
- if (parameterTypes != null) {
- parmClasses = new Class[parameterTypes.length];
- for (int i = 0; i < parmClasses.length; i++) {
- Class temp = (Class) primLookup.get(parameterTypes[i]);
- if (temp == null)
- temp = fProxyFactoryRegistry.loadClass(parameterTypes[i]);
- parmClasses[i] = temp;
- }
- }
- return getMethodProxy(cls.getDeclaredMethod(methodName, parmClasses));
- } catch (ClassNotFoundException e) {
- ProxyPlugin.getPlugin().getLogger().log(new Status(IStatus.WARNING, ProxyPlugin.getPlugin().getBundle().getSymbolicName(), 0, "", e)); //$NON-NLS-1$
- } catch (NoSuchMethodException e) {
- ProxyPlugin.getPlugin().getLogger().log(new Status(IStatus.WARNING, ProxyPlugin.getPlugin().getBundle().getSymbolicName(), 0, "", e)); //$NON-NLS-1$
- }
- return null;
- }
-
- IDEMethodProxy getMethodProxy(Class aClass, String methodName, Class[] args) {
- try {
- Method method = aClass.getMethod(methodName, args);
- return getMethodProxy(method);
- } catch (NoSuchMethodException exc) {
- ProxyPlugin.getPlugin().getLogger().log(
- new Status(IStatus.WARNING, ProxyPlugin.getPlugin().getBundle().getSymbolicName(), 0, "Unable to find method " + aClass.getName() //$NON-NLS-1$
- + ":" + methodName + " args=" + args, exc)); //$NON-NLS-1$ //$NON-NLS-2$
- return null;
- }
- }
-
- IMethodProxy getDeclaredMethodProxy(Class aClass, String methodName, Class[] args) {
- try {
- Method method = aClass.getDeclaredMethod(methodName, args);
- return getMethodProxy(method);
- } catch (NoSuchMethodException exc) {
- ProxyPlugin.getPlugin().getLogger().log(
- new Status(IStatus.WARNING, ProxyPlugin.getPlugin().getBundle().getSymbolicName(), 0, "Unable to find method " + aClass.getName() //$NON-NLS-1$
- + ":" + methodName + " args=" + args, exc)); //$NON-NLS-1$ //$NON-NLS-2$
- return null;
- }
- }
-
- IMethodProxy getMethodProxy(IDEBeanTypeProxy aTypeProxy, String methodName, String[] parameterTypes) {
- return getMethodProxy(aTypeProxy.fClass, methodName, parameterTypes);
- }
-
- IMethodProxy[] getMethods(Class aClass) {
- Method[] methods = aClass.getMethods();
- IMethodProxy[] methodProxies = new IMethodProxy[methods.length];
- for (int i = 0; i < methods.length; i++) {
- methodProxies[i] = getMethodProxy(methods[i]);
- }
- return methodProxies;
- }
-
- IMethodProxy getCompatibleMethod(Class aClass, String methodName, Class[] parmTypes) throws NoSuchMethodException, AmbiguousMethodException {
- Method method = MethodHelper.findCompatibleMethod(aClass, methodName, parmTypes);
- return getMethodProxy(method);
- }
-
- IConstructorProxy getCompatibleConstructor(Class aClass, Class[] parmTypes) throws AmbiguousMethodException, NoSuchMethodException, IllegalAccessException {
- Constructor method = MethodHelper.findCompatibleConstructor(aClass, parmTypes);
- return getConstructorProxy(method);
- }
-
-
- IMethodProxy[] getDeclaredMethods(Class aClass) {
- Method[] methods = aClass.getDeclaredMethods();
- IMethodProxy[] methodProxies = new IMethodProxy[methods.length];
- for (int i = 0; i < methods.length; i++) {
- methodProxies[i] = getMethodProxy(methods[i]);
- }
- return methodProxies;
- }
- /*
- * (non-Javadoc)
- *
- * @see org.eclipse.jem.internal.proxy.core.IMethodProxyFactory#getInvokable(java.lang.String, java.lang.String, java.lang.String[])
- */
- public IInvokable getInvokable(String className, String methodName, String[] parameterTypes) {
- return getMethodProxy(className, methodName, parameterTypes);
- }
-
- /*
- * (non-Javadoc)
- * @see org.eclipse.jem.internal.proxy.core.IBeanProxyFactory#terminateFactory(boolean)
- */
- public void terminateFactory(boolean wait) {
- }
-
-}
diff --git a/plugins/org.eclipse.jem.proxy/proxyide/org/eclipse/jem/internal/proxy/ide/IDEMethodTypeProxy.java b/plugins/org.eclipse.jem.proxy/proxyide/org/eclipse/jem/internal/proxy/ide/IDEMethodTypeProxy.java
deleted file mode 100644
index 681daca..0000000
--- a/plugins/org.eclipse.jem.proxy/proxyide/org/eclipse/jem/internal/proxy/ide/IDEMethodTypeProxy.java
+++ /dev/null
@@ -1,35 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2001, 2005 IBM Corporation and others.
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
- *
- * Contributors:
- * IBM Corporation - initial API and implementation
- *******************************************************************************/
-package org.eclipse.jem.internal.proxy.ide;
-/*
-
-
- */
-
-
-/**
- * @version 1.0
- * @author
- */
-public class IDEMethodTypeProxy extends IDEBeanTypeProxy {
-
- IDEMethodTypeProxy(IDEProxyFactoryRegistry registry) {
- super(registry, java.lang.reflect.Method.class);
- }
-
- /*
- * @see IDEBeanTypeProxy#newBeanProxy(Object)
- */
- protected IIDEBeanProxy newBeanProxy(Object anObject) {
- return new IDEMethodProxy(fProxyFactoryRegistry, (java.lang.reflect.Method) anObject);
- }
-
-}
diff --git a/plugins/org.eclipse.jem.proxy/proxyide/org/eclipse/jem/internal/proxy/ide/IDENumberBeanProxy.java b/plugins/org.eclipse.jem.proxy/proxyide/org/eclipse/jem/internal/proxy/ide/IDENumberBeanProxy.java
deleted file mode 100644
index 00069a2..0000000
--- a/plugins/org.eclipse.jem.proxy/proxyide/org/eclipse/jem/internal/proxy/ide/IDENumberBeanProxy.java
+++ /dev/null
@@ -1,107 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2001, 2005 IBM Corporation and others.
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
- *
- * Contributors:
- * IBM Corporation - initial API and implementation
- *******************************************************************************/
-package org.eclipse.jem.internal.proxy.ide;
-/*
-
-
- */
-
-import org.eclipse.jem.internal.proxy.core.*;
-/**
- * IDE Implementation of INumberBeanProxy for any Number (i.e. the non-primitives)
- * It can answer all of the primitive number types (int, long, short, byte, double, float).
- * Creation date: (2/6/00 9:02:54 AM)
- * @author: Joe Winchester
- */
-public class IDENumberBeanProxy extends IDEBeanProxy implements INumberBeanProxy {
- private final Number fNumberValue;
- protected IBeanTypeProxy fBeanTypeProxy;
-
-/**
- * It is package protected because they are created
- * in a special way and no one else should create them.
- * @param aBean java.lang.Object
- */
-IDENumberBeanProxy(IDEProxyFactoryRegistry aRegistry, Number aNumber , IBeanTypeProxy aBeanTypeProxy) {
- super(aRegistry,aNumber);
- fNumberValue = aNumber;
- fBeanTypeProxy = aBeanTypeProxy;
-}
-/**
- * equals: Equal if:
- * 1) This proxy == (identity) to the other object
- * 2) Else if other is an IBeanProxy and not a constant one, then if
- * equals on the server.
- * 3) If this is a constant proxy and the other is too or is a constant
- * value (e.g. IStringBeanProxy.equals(String), then true if values are equals.
- */
-public boolean equals(Object anObject) {
- if (this == anObject)
- return true; // Identity
- if (anObject instanceof IDENumberBeanProxy)
- return fNumberValue.equals(((IDENumberBeanProxy) anObject).numberValue());
- if (anObject instanceof Number)
- return fNumberValue.equals(anObject);
- return false;
-}
-/**
- * byteValue method comment.
- */
-public byte byteValue() {
- return fNumberValue.byteValue();
-}
-/**
- * doubleValue method comment.
- */
-public double doubleValue() {
- return fNumberValue.doubleValue();
-}
-/**
- * floatValue method comment.
- */
-public float floatValue() {
- return fNumberValue.floatValue();
-}
-/**
- * Return the int value
- */
-public int intValue() {
- return fNumberValue.intValue();
-}
-/**
- * longValue method comment.
- */
-public long longValue() {
- return fNumberValue.longValue();
-}
-/**
- * numberValue method comment.
- */
-public Number numberValue() {
- return fNumberValue;
-}
-/**
- * shortValue method comment.
- */
-public short shortValue() {
- return fNumberValue.shortValue();
-}
-
-/**
- * The bean's toString.
- */
-public String toBeanString() {
- return fNumberValue.toString();
-}
-public IBeanTypeProxy getTypeProxy(){
- return fBeanTypeProxy;
-}
-}
diff --git a/plugins/org.eclipse.jem.proxy/proxyide/org/eclipse/jem/internal/proxy/ide/IDENumberBeanTypeProxy.java b/plugins/org.eclipse.jem.proxy/proxyide/org/eclipse/jem/internal/proxy/ide/IDENumberBeanTypeProxy.java
deleted file mode 100644
index 0a96946..0000000
--- a/plugins/org.eclipse.jem.proxy/proxyide/org/eclipse/jem/internal/proxy/ide/IDENumberBeanTypeProxy.java
+++ /dev/null
@@ -1,51 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2001, 2005 IBM Corporation and others.
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
- *
- * Contributors:
- * IBM Corporation - initial API and implementation
- *******************************************************************************/
-package org.eclipse.jem.internal.proxy.ide;
-/*
-
-
- */
-
-import org.eclipse.jem.internal.proxy.core.*;
-/**
- * Number BeanType Proxy.
- */
-public abstract class IDENumberBeanTypeProxy extends IDEBeanTypeProxy {
- protected final IDENumberBeanProxy zeroProxy;
-/**
- * IDENumberBeanTypeProxy constructor comment.
- * @param aRegistry com.ibm.etools.vce.proxy.ProxyFactoryRegistry
- * @param aClass java.lang.Class
- */
-protected IDENumberBeanTypeProxy(IDEProxyFactoryRegistry aRegistry, Class aClass, Number zeroNumber) {
- super(aRegistry, aClass);
- // Cache a zero proxy of this type (though the number will be Long).
- zeroProxy = new IDENumberBeanProxy(aRegistry, zeroNumber , this);
-}
-/**
- * Helper to create a bean proxy
- * Package protected because everyone should go through the factory API
- * that is defined as part of IBeanProxyFactory
- */
-INumberBeanProxy createNumberBeanProxy(Number aNumber) {
- if (aNumber == null || zeroProxy.fBean.equals(aNumber))
- return zeroProxy;
- return new IDENumberBeanProxy(fProxyFactoryRegistry, aNumber, this);
-}
-/**
- * Specialized from IDEBeanTypeProxy to ensure INumberBeanProxies are created correctly.
- */
-protected IIDEBeanProxy newBeanProxy(Object anObject){
-
- return (IIDEBeanProxy)createNumberBeanProxy((Number) anObject);
-
-}
-}
diff --git a/plugins/org.eclipse.jem.proxy/proxyide/org/eclipse/jem/internal/proxy/ide/IDEObjectBeanProxy.java b/plugins/org.eclipse.jem.proxy/proxyide/org/eclipse/jem/internal/proxy/ide/IDEObjectBeanProxy.java
deleted file mode 100644
index 55215e1..0000000
--- a/plugins/org.eclipse.jem.proxy/proxyide/org/eclipse/jem/internal/proxy/ide/IDEObjectBeanProxy.java
+++ /dev/null
@@ -1,65 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2001, 2005 IBM Corporation and others.
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
- *
- * Contributors:
- * IBM Corporation - initial API and implementation
- *******************************************************************************/
-package org.eclipse.jem.internal.proxy.ide;
-/*
-
-
- */
-
-import org.eclipse.jem.internal.proxy.core.*;
-
-public class IDEObjectBeanProxy extends IDEBeanProxy {
-
- protected IBeanTypeProxy fBeanTypeProxy; // Cache the type proxy for speed
-
-protected IDEObjectBeanProxy(IDEProxyFactoryRegistry aRegistry){
- super(aRegistry);
-}
-/**
- * Constructor that lets the bean type be set on creation.
- * This saves the overhead of it being looked up the first time it is asked for.
- *
- * This is protected because the only person
- * who should use it is the IDEBeanTypeProxy or a subclass. Making it package protected stops people from
- * writing bogus code and doing casts and slamming new beans in without going through the proper API
- * that is based around any kind of VM artifact being proxied to support target VMs and pluggable JDK
- * levels
- */
-protected IDEObjectBeanProxy(IDEProxyFactoryRegistry aRegistry, Object aBean, IBeanTypeProxy aBeanTypeProxy){
-
- this(aRegistry, aBean);
- fBeanTypeProxy = aBeanTypeProxy;
-
-}
-/**
- * Set the bean we are proxying. We are a proxy for a bean running on the same IDE
- * so we hold the bean directly and can return it.
- */
-protected IDEObjectBeanProxy(IDEProxyFactoryRegistry aRegistry, Object aBean){
- this(aRegistry);
-
- fBean = aBean;
-
-}
-/**
- * The type proxy is got from our class name
- * If we have the type return it, otherwise go the factory for it
- * Don't new it up because the factory must be responsible for creating type proxies as it
- * has to perform instance management on them
- */
-public IBeanTypeProxy getTypeProxy() {
-
- if ( fBeanTypeProxy == null ) {
- fBeanTypeProxy = fProxyFactoryRegistry.getBeanTypeProxyFactory().getBeanTypeProxy( fBean.getClass().getName() );
- }
- return fBeanTypeProxy;
-}
-}
diff --git a/plugins/org.eclipse.jem.proxy/proxyide/org/eclipse/jem/internal/proxy/ide/IDEPrimitiveBeanTypeProxy.java b/plugins/org.eclipse.jem.proxy/proxyide/org/eclipse/jem/internal/proxy/ide/IDEPrimitiveBeanTypeProxy.java
deleted file mode 100644
index 36e9703..0000000
--- a/plugins/org.eclipse.jem.proxy/proxyide/org/eclipse/jem/internal/proxy/ide/IDEPrimitiveBeanTypeProxy.java
+++ /dev/null
@@ -1,36 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2001, 2005 IBM Corporation and others.
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
- *
- * Contributors:
- * IBM Corporation - initial API and implementation
- *******************************************************************************/
-package org.eclipse.jem.internal.proxy.ide;
-/*
-
-
- */
-
-
-public abstract class IDEPrimitiveBeanTypeProxy extends IDEBeanTypeProxy {
-
- static final int BOOLEAN = 1;
- static final int BYTE = 2;
- static final int CHAR = 3;
- static final int DOUBLE = 4;
- static final int FLOAT = 5;
- static final int INTEGER = 6;
- static final int LONG = 7;
- static final int SHORT = 8;
-
-public IDEPrimitiveBeanTypeProxy(IDEProxyFactoryRegistry aRegistry,Class aClass){
- super(aRegistry,aClass);
-}
-public boolean isPrimitive() {
- return true;
-}
-abstract int getPrimitiveType();
-}
diff --git a/plugins/org.eclipse.jem.proxy/proxyide/org/eclipse/jem/internal/proxy/ide/IDEProxyFactoryRegistry.java b/plugins/org.eclipse.jem.proxy/proxyide/org/eclipse/jem/internal/proxy/ide/IDEProxyFactoryRegistry.java
deleted file mode 100644
index fd2726e..0000000
--- a/plugins/org.eclipse.jem.proxy/proxyide/org/eclipse/jem/internal/proxy/ide/IDEProxyFactoryRegistry.java
+++ /dev/null
@@ -1,205 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2001, 2005 IBM Corporation and others.
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
- *
- * Contributors:
- * IBM Corporation - initial API and implementation
- *******************************************************************************/
-package org.eclipse.jem.internal.proxy.ide;
-/*
-
-
- */
-
-import java.net.URL;
-import java.net.URLClassLoader;
-import java.util.*;
-import java.util.ArrayList;
-import java.util.List;
-
-import org.eclipse.core.runtime.Platform;
-import org.osgi.framework.Bundle;
-
-import org.eclipse.jem.internal.proxy.common.IVMServer;
-import org.eclipse.jem.internal.proxy.core.*;
-/**
- * This implementation runs the Beans inside the Eclipse IDE
- * It should only be used by plugins that can guarantee their their beans do
- * not change during the lifetime of the IDE and can run at the same JDK level
- * that the Eclipse IDE is running
- */
-
-public class IDEProxyFactoryRegistry extends BaseProxyFactoryRegistry implements IVMServer {
-
- public static final String IDE_REGISTRY_TYPE_ID = "org.eclipse.jem.IDE"; //$NON-NLS-1$
- protected String fName;
- protected ClassLoader fClassLoader;
- protected IDECallbackRegistry fCallbackRegistry;
-
- /*
- * Special classloader that firsts tries to load from bundle then tries from url paths so
- * that bundle is treated as being at the head of the url paths.
- *
- * @since 1.0.0
- */
- private static class IDESpecialClassLoader extends URLClassLoader {
-
- private Bundle bundle;
- // This is the bundle that contains the IDE Eclipse code.
- // This must be checked first because there are IDE specific stuff that is used on the "remote vm" too and
- // so must be common.
- private Bundle ideBundle;
-
- public IDESpecialClassLoader(URL[] urls, Bundle bundle) {
- super(urls, null);
- ideBundle = ProxyPlugin.getPlugin().getBundle();
- this.bundle = bundle;
- }
-
- public IDESpecialClassLoader(URL[] urls) {
- this(urls, null);
- }
-
- /* (non-Javadoc)
- * @see java.lang.ClassLoader#findClass(java.lang.String)
- */
- protected Class findClass(String name) throws ClassNotFoundException {
- try {
- return ideBundle.loadClass(name);
- } catch (ClassNotFoundException e) {
- if (bundle != null) {
- try {
- return bundle.loadClass(name);
- } catch (ClassNotFoundException e1) {
- }
- }
- return super.findClass(name);
- }
- }
-
- /*
- * (non-Javadoc)
- *
- * @see java.lang.ClassLoader#findResource(java.lang.String)
- */
- public URL findResource(String name) {
- URL r = ideBundle.getResource(name);
- if (r == null && bundle != null)
- r = bundle.getResource(name);
- return r != null ? r : super.findResource(name);
- }
-}
-
-/**
- * Create a special loader that has the plugin classloader of the passed in plugin
- * as the parent loader, plus all of the urls, plus the remotevm.jar file that is
- * needed by IDE Proxy to work.
- */
-public static ClassLoader createSpecialLoader(String pluginName, URL[] otherURLs) {
- Bundle bundle = pluginName != null ? Platform.getBundle(pluginName) : null;
-
- URL[] mustHaveUrls = ProxyPlugin.getPlugin().urlLocalizeAllFromBundleAndFragments(ProxyPlugin.getPlugin().getBundle(), "vm/remotevm.jar"); //$NON-NLS-1$
-
- URL[] urls = null;
- if (otherURLs != null) {
- urls = new URL[otherURLs.length+mustHaveUrls.length];
- System.arraycopy(mustHaveUrls, 0, urls, 0, mustHaveUrls.length);
- System.arraycopy(otherURLs, 0, urls, mustHaveUrls.length, otherURLs.length);
- } else
- urls = mustHaveUrls;
-
- return bundle != null ? new IDESpecialClassLoader(urls, bundle) : new IDESpecialClassLoader(urls);
-}
-
-public IDEProxyFactoryRegistry(String aName, ClassLoader loader) {
- super(IDE_REGISTRY_TYPE_ID);
- fName = aName;
- fClassLoader = loader;
-}
-
-ClassLoader getPluginClassLoader(){
- return fClassLoader;
-}
-
-protected void registryTerminated(boolean wait){
- List runnables = null;
- synchronized (this) {
- runnables = shutdownRunnables;
- shutdownRunnables = null;
- }
- if (runnables != null) {
- for (Iterator itr = runnables.iterator(); itr.hasNext();) {
- try {
- ((Runnable) itr.next()).run();
- } catch (RuntimeException e) {
- e.printStackTrace();
- }
- }
- }
-}
-
-Class loadClass(String aClassName) throws ClassNotFoundException, ExceptionInInitializerError, LinkageError {
- return fClassLoader.loadClass(aClassName);
-}
-
-public ICallbackRegistry getCallbackRegistry(){
- if ( fCallbackRegistry == null ){
- fCallbackRegistry = new IDECallbackRegistry(this);
- }
- return fCallbackRegistry;
-}
-
-
-/**
- * Get a bean proxy from the bean of the correct type.
- *
- * @param returnType
- * @param bean
- * @return
- *
- * @since 1.0.0
- */
-IBeanProxy getBeanProxy(Class returnType, Object bean) {
- IDEStandardBeanTypeProxyFactory proxyFactory = (IDEStandardBeanTypeProxyFactory) this.getBeanTypeProxyFactory();
- if (!returnType.isPrimitive()) {
- return IDEStandardBeanProxyFactory.createBeanProxy(this, bean);
- } else if (returnType == Integer.TYPE) {
- return proxyFactory.intType.newBeanProxy(bean);
- } else if (returnType == Boolean.TYPE) {
- return proxyFactory.booleanType.newBeanProxy(bean);
- } else if (returnType == Float.TYPE) {
- return proxyFactory.floatType.newBeanProxy(bean);
- } else if (returnType == Long.TYPE) {
- return proxyFactory.longType.newBeanProxy(bean);
- } else if (returnType == Short.TYPE) {
- return proxyFactory.shortType.newBeanProxy(bean);
- } else if (returnType == Double.TYPE) {
- return proxyFactory.doubleType.newBeanProxy(bean);
- } else if (returnType == Byte.TYPE) {
- return proxyFactory.byteType.newBeanProxy(bean);
- } else if (returnType == Character.TYPE) {
- return proxyFactory.charType.newBeanProxy(bean);
- } else {
- throw new RuntimeException("Unknown primitive type " + returnType.getName()); //$NON-NLS-1$
- }
-}
-
-List shutdownRunnables;
-
-public synchronized void addShutdownListener(Runnable runnable) {
- if (shutdownRunnables == null) {
- shutdownRunnables = new ArrayList();
- } else if (shutdownRunnables.contains(runnable))
- return;
- shutdownRunnables.add(runnable);
-}
-
-public synchronized void removeShutdownListener(Runnable runnable) {
- if (shutdownRunnables != null)
- shutdownRunnables.remove(runnable);
-}
-
-}
diff --git a/plugins/org.eclipse.jem.proxy/proxyide/org/eclipse/jem/internal/proxy/ide/IDERegistration.java b/plugins/org.eclipse.jem.proxy/proxyide/org/eclipse/jem/internal/proxy/ide/IDERegistration.java
deleted file mode 100644
index 8af6861..0000000
--- a/plugins/org.eclipse.jem.proxy/proxyide/org/eclipse/jem/internal/proxy/ide/IDERegistration.java
+++ /dev/null
@@ -1,154 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2001, 2006 IBM Corporation and others.
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
- *
- * Contributors:
- * IBM Corporation - initial API and implementation
- *******************************************************************************/
-package org.eclipse.jem.internal.proxy.ide;
-/*
-
-
- */
-
-import java.net.URL;
-
-import org.eclipse.core.resources.IProject;
-import org.eclipse.core.runtime.*;
-import org.eclipse.jdt.core.IJavaProject;
-import org.eclipse.jdt.core.JavaCore;
-import org.eclipse.jdt.launching.JavaRuntime;
-
-import org.eclipse.jem.internal.proxy.core.*;
-import org.eclipse.jem.internal.proxy.ide.awt.IDERegisterAWT;
-import org.eclipse.jem.internal.proxy.remote.LocalFileConfigurationContributorController;
-/**
- * This is the registration class for starting an IDERemote VM.
- */
-
-public class IDERegistration {
-
- public static ProxyFactoryRegistry startAnImplementation(
- IConfigurationContributor[] contributors,
- boolean attachAWT,
- IProject project,
- String vmName,
- String pluginName,
- IProgressMonitor pm) throws CoreException {
- IDERegistration idereg = new IDERegistration(pluginName);
- return idereg.startImplementation(contributors, attachAWT, project, vmName, pm);
- }
-
- public IDERegistration() {
- }
-
- private IDERegistration(String pluginName) {
- this.pluginName = pluginName;
- }
- private String pluginName;
-
- /**
- * This will create a remote VM and return an initialized REMProxyFactoryRegistry.
- * Passed in are:
- * project: The project this is being started on. Must not be null and must be a JavaProject. (Currently ignored for IDE).
- * attachAWT: Should AWT be attached to this implementation.
- * contributors: Contributors to the configuration. Can be null.
- * pm: ProgressMonitor to use. Must not be null.
- * vmName: Name for the vm. Can be null.
- */
- public ProxyFactoryRegistry startImplementation(
- IConfigurationContributor[] contributors,
- boolean attachAWT,
- IProject project,
- String vmName,
- IProgressMonitor pm)
- throws CoreException {
-
- URL[] classPaths = null;
- IJavaProject javaProject = null;
- if (project != null) {
- javaProject = JavaCore.create(project);
- // Add in the paths for the project
- classPaths = ProxyLaunchSupport.convertStringPathsToURL(JavaRuntime.computeDefaultRuntimeClassPath(javaProject));
- } else
- classPaths = new URL[0];
-
- final IJavaProject jp = javaProject;
-
- final ProxyLaunchSupport.LaunchInfo launchInfo = new ProxyLaunchSupport.LaunchInfo();
- contributors = ProxyLaunchSupport.fillInLaunchInfo(contributors == null ? ProxyLaunchSupport.EMPTY_CONFIG_CONTRIBUTORS : contributors, launchInfo, jp != null ? jp.getElementName() : null);
- final LocalFileConfigurationContributorController controller = new LocalFileConfigurationContributorController(classPaths, new URL[3][], launchInfo);
- final IConfigurationContributor[] contribs = contributors;
- for (int i = 0; i < contributors.length; i++) {
- final int ii = i;
- // Run in safe mode so that anything happens we don't go away.
- SafeRunner.run(new ISafeRunnable() {
- public void handleException(Throwable exception) {
- // Don't need to do anything. Platform.run logs it for me.
- }
-
- public void run() throws Exception {
- contribs[ii].initialize(launchInfo.getConfigInfo());
- }
- });
- }
- for (int i = 0; i < contributors.length; i++) {
- final int ii = i;
- // Run in safe mode so that anything happens we don't go away.
- SafeRunner.run(new ISafeRunnable() {
- public void handleException(Throwable exception) {
- // Don't need to do anything. Platform.run logs it for me.
- }
-
- public void run() throws Exception {
- contribs[ii].contributeClasspaths(controller);
- }
- });
- }
- classPaths = controller.getFinalClasspath();
-
- final BaseProxyFactoryRegistry registry = (BaseProxyFactoryRegistry) createIDEProxyFactoryRegistry(vmName, pluginName, classPaths);
- ProxyLaunchSupport.performExtensionRegistrations(registry, launchInfo);
- for (int i = 0; i < contribs.length; i++) {
- final int ii = i;
- // Run in safe mode so that anything happens we don't go away.
- SafeRunner.run(new ISafeRunnable() {
- public void handleException(Throwable exception) {
- // Don't need to do anything. Platform.run logs it for me.
- }
-
- public void run() throws Exception {
- contribs[ii].contributeToRegistry(registry);
- }
- });
- }
-
- return registry;
- }
-
- public static ProxyFactoryRegistry createIDEProxyFactoryRegistry(String aName, String aPluginName, URL[] otherURLs) {
- // Create the registry.
- IDEProxyFactoryRegistry registry =
- new IDEProxyFactoryRegistry(aName, IDEProxyFactoryRegistry.createSpecialLoader(aPluginName, otherURLs));
- initRegistry(registry);
- return registry;
- }
-
- public static ProxyFactoryRegistry createIDEProxyFactoryRegistry(String aName, ClassLoader loader) {
- // Create the registry.
- IDEProxyFactoryRegistry registry = new IDEProxyFactoryRegistry(aName, loader);
- initRegistry(registry);
- return registry;
- }
-
- private static void initRegistry(IDEProxyFactoryRegistry registry) {
- new IDEStandardBeanTypeProxyFactory(registry);
- new IDEStandardBeanProxyFactory(registry);
- new IDEMethodProxyFactory(registry);
- // Always support AWT for now
- IDERegisterAWT.registerAWT(registry);
- }
-}
diff --git a/plugins/org.eclipse.jem.proxy/proxyide/org/eclipse/jem/internal/proxy/ide/IDEShortClassBeanTypeProxy.java b/plugins/org.eclipse.jem.proxy/proxyide/org/eclipse/jem/internal/proxy/ide/IDEShortClassBeanTypeProxy.java
deleted file mode 100644
index 2bac55d..0000000
--- a/plugins/org.eclipse.jem.proxy/proxyide/org/eclipse/jem/internal/proxy/ide/IDEShortClassBeanTypeProxy.java
+++ /dev/null
@@ -1,28 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2001, 2005 IBM Corporation and others.
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
- *
- * Contributors:
- * IBM Corporation - initial API and implementation
- *******************************************************************************/
-package org.eclipse.jem.internal.proxy.ide;
-/*
-
-
- */
-
-import org.eclipse.jem.internal.proxy.core.*;
-/**
- * Short BeanType Proxy.
- */
-final class IDEShortClassBeanTypeProxy extends IDENumberBeanTypeProxy {
-protected IDEShortClassBeanTypeProxy(IDEProxyFactoryRegistry aRegistry, Class aClass) {
- super(aRegistry, aClass, new Short((short)0));
-}
-INumberBeanProxy createShortBeanProxy(Short aShort){
- return new IDENumberBeanProxy(fProxyFactoryRegistry,aShort,this);
-}
-}
diff --git a/plugins/org.eclipse.jem.proxy/proxyide/org/eclipse/jem/internal/proxy/ide/IDEShortTypeBeanTypeProxy.java b/plugins/org.eclipse.jem.proxy/proxyide/org/eclipse/jem/internal/proxy/ide/IDEShortTypeBeanTypeProxy.java
deleted file mode 100644
index 3ae6dfb..0000000
--- a/plugins/org.eclipse.jem.proxy/proxyide/org/eclipse/jem/internal/proxy/ide/IDEShortTypeBeanTypeProxy.java
+++ /dev/null
@@ -1,36 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2001, 2005 IBM Corporation and others.
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
- *
- * Contributors:
- * IBM Corporation - initial API and implementation
- *******************************************************************************/
-package org.eclipse.jem.internal.proxy.ide;
-/*
-
-
- */
-
-import org.eclipse.jem.internal.proxy.core.*;
-
-/**
- * Short BeanType Proxy.
- */
-final class IDEShortTypeBeanTypeProxy extends IDEPrimitiveBeanTypeProxy {
-protected IDEShortTypeBeanTypeProxy(IDEProxyFactoryRegistry aRegistry, Class aClass) {
- super(aRegistry, aClass);
-}
-INumberBeanProxy createShortBeanProxy(short aShort){
- return new IDENumberBeanProxy(fProxyFactoryRegistry,new Short(aShort),this);
-}
-int getPrimitiveType(){
- return SHORT;
-}
-protected IIDEBeanProxy newBeanProxy(Object anObject){
- Number n = anObject instanceof Character ? new Short((short) ((Character) anObject).charValue()) : (Number) anObject;
- return new IDENumberBeanProxy(fProxyFactoryRegistry, n, this);
-}
-}
diff --git a/plugins/org.eclipse.jem.proxy/proxyide/org/eclipse/jem/internal/proxy/ide/IDEStandardBeanProxyFactory.java b/plugins/org.eclipse.jem.proxy/proxyide/org/eclipse/jem/internal/proxy/ide/IDEStandardBeanProxyFactory.java
deleted file mode 100644
index 85a852b..0000000
--- a/plugins/org.eclipse.jem.proxy/proxyide/org/eclipse/jem/internal/proxy/ide/IDEStandardBeanProxyFactory.java
+++ /dev/null
@@ -1,262 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2001, 2005 IBM Corporation and others.
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
- *
- * Contributors:
- * IBM Corporation - initial API and implementation
- *******************************************************************************/
-package org.eclipse.jem.internal.proxy.ide;
-/*
- * $RCSfile: IDEStandardBeanProxyFactory.java,v $ $Revision: 1.11 $ $Date: 2005/08/24 20:39:06 $
- */
-
-import org.eclipse.core.runtime.IStatus;
-import org.eclipse.core.runtime.Status;
-
-import org.eclipse.jem.internal.proxy.common.IVMServer;
-import org.eclipse.jem.internal.proxy.core.*;
-import org.eclipse.jem.internal.proxy.initParser.InitializationStringParser;
-
-public class IDEStandardBeanProxyFactory implements IStandardBeanProxyFactory {
-
-
- protected IDEProxyFactoryRegistry fRegistry;
- protected IDEStandardBeanTypeProxyFactory fBeanTypeProxyFactory;
- private IBeanProxy ivmServerProxy;
-
- /*
- * Return a bean proxy for the argument. To do this create through the correct BeanTypeProxy
- * Which ensures that special subclasses of IDEBeanProxy are created. This is just a local
- * helper method.
- */
- static IIDEBeanProxy createBeanProxy(ProxyFactoryRegistry aRegistry, Object anObject) {
-
- return ((IDEStandardBeanProxyFactory) aRegistry.getBeanProxyFactory()).createIDEBeanProxyWith(anObject);
- }
-
- IDEStandardBeanProxyFactory(IDEProxyFactoryRegistry aRegistry) {
- fRegistry = aRegistry;
- fRegistry.registerBeanProxyFactory(this);
- fBeanTypeProxyFactory = (IDEStandardBeanTypeProxyFactory) aRegistry.getBeanTypeProxyFactory();
- ivmServerProxy = fRegistry.getBeanProxy(IVMServer.class, fRegistry);
- }
-
- public IStringBeanProxy createBeanProxyWith(String aString) {
- return fBeanTypeProxyFactory.stringClass.createStringBeanProxy(aString);
- }
-
- public INumberBeanProxy createBeanProxyWith(float aFloat) {
- return fBeanTypeProxyFactory.floatType.createFloatBeanProxy(aFloat);
- }
-
- public INumberBeanProxy createBeanProxyWith(short aShort) {
- return fBeanTypeProxyFactory.shortType.createShortBeanProxy(aShort);
- }
-
- public ICharacterBeanProxy createBeanProxyWith(char aChar) {
- return fBeanTypeProxyFactory.charType.createCharBeanProxy(aChar);
- }
-
- public ICharacterBeanProxy createBeanProxyWith(Character aCharacter) {
- return fBeanTypeProxyFactory.charClass.createCharacterBeanProxy(aCharacter);
- }
-
- public IIntegerBeanProxy createBeanProxyWith(int anInt) {
- return fBeanTypeProxyFactory.intType.createIntegerBeanProxy(anInt);
- }
-
- public IIntegerBeanProxy createBeanProxyWith(Integer anInteger) {
- return fBeanTypeProxyFactory.integerClass.createIntegerBeanProxy(anInteger);
- }
-
- public INumberBeanProxy createBeanProxyWith(long aLong) {
- return fBeanTypeProxyFactory.longType.createLongBeanProxy(aLong);
- }
-
- public INumberBeanProxy createBeanProxyWith(Number aNumber) {
- IDENumberBeanTypeProxy numberTypeProxy = (IDENumberBeanTypeProxy) fBeanTypeProxyFactory.getBeanTypeProxy(aNumber.getClass());
- return numberTypeProxy.createNumberBeanProxy(aNumber);
- }
-
- public IBooleanBeanProxy createBeanProxyWith(boolean aBoolean) {
- return fBeanTypeProxyFactory.booleanType.createBooleanBeanProxy(aBoolean);
- }
-
- public IBooleanBeanProxy createBeanProxyWith(Boolean aBoolean) {
- return fBeanTypeProxyFactory.booleanClass.createBooleanBeanProxy(aBoolean);
- }
-
- public INumberBeanProxy createBeanProxyWith(byte aByte) {
- return fBeanTypeProxyFactory.byteType.createByteBeanProxy(aByte);
- }
-
- public INumberBeanProxy createBeanProxyWith(double aDouble) {
- return fBeanTypeProxyFactory.doubleType.createDoubleBeanProxy(aDouble);
- }
-
- /* (non-Javadoc)
- * @see org.eclipse.jem.internal.proxy.core.IStandardBeanProxyFactory#convertToPrimitiveBeanProxy(org.eclipse.jem.internal.proxy.core.IBeanProxy)
- */
- public IBeanProxy convertToPrimitiveBeanProxy(IBeanProxy nonPrimitiveProxy) {
- if (nonPrimitiveProxy == null)
- return null;
- if (!nonPrimitiveProxy.isValid())
- return nonPrimitiveProxy;
- IDEBeanTypeProxy type = (IDEBeanTypeProxy) nonPrimitiveProxy.getTypeProxy();
- if (type.getClass() == Boolean.class)
- return this.createBeanProxyWith(((IBooleanBeanProxy) nonPrimitiveProxy).booleanValue());
- else if (type.getClass() == Byte.class)
- return this.createBeanProxyWith(((INumberBeanProxy) nonPrimitiveProxy).byteValue());
- else if (type.getClass() == Character.class)
- return this.createBeanProxyWith(((ICharacterBeanProxy) nonPrimitiveProxy).charValue());
- else if (type.getClass() == Double.class)
- return this.createBeanProxyWith(((INumberBeanProxy) nonPrimitiveProxy).doubleValue());
- else if (type.getClass() == Float.class)
- return this.createBeanProxyWith(((INumberBeanProxy) nonPrimitiveProxy).floatValue());
- else if (type.getClass() == Integer.class)
- return this.createBeanProxyWith(((INumberBeanProxy) nonPrimitiveProxy).intValue());
- else if (type.getClass() == Long.class)
- return this.createBeanProxyWith(((INumberBeanProxy) nonPrimitiveProxy).longValue());
- else if (type.getClass() == Short.class)
- return this.createBeanProxyWith(((INumberBeanProxy) nonPrimitiveProxy).shortValue());
- else
- return nonPrimitiveProxy;
- }
-
- /**
- * Create a one-dimensional array. The result will be the same as calling
- * createBeanProxyWith(IBeanTypeProxy type, new int[1] {x}) where 'x' is the value passed in as
- * the dimension.
- */
- public IArrayBeanProxy createBeanProxyWith(IBeanTypeProxy type, int dimension) throws ThrowableProxy {
- return createBeanProxyWith(type, new int[] { dimension });
- }
-
- /**
- * Create an array bean proxy.
- * - (int, new int[2] {3, 4}) will create: int [3] [4]
- * - (int[], new int[1] {1}) int [1]
- * - (int[], new int[2] {2,3}) int [2] [3]
- *
- * - (int[], null) or (int[], new int[0]) or (int, null) or (int, new int[0]) int [0]... or
- * (int[][]..., null) or (int[][]..., new int[0]) int[0][]... This is because an array instance
- * with no specified dimensions is not valid.
- * - (int[][], new int[1] {3}) int[3][]
- */
- public IArrayBeanProxy createBeanProxyWith(IBeanTypeProxy type, int[] dimensions) throws ThrowableProxy {
- if (type.isArray())
- return ((IDEArrayBeanTypeProxy) type).createBeanProxyWith(dimensions); // Already an
- // array type,
- // just pass it
- // on.
- else {
- // It is not an array type, so we need to get an array of this type and dimensions.
- IDEArrayBeanTypeProxy arrayType =
- (IDEArrayBeanTypeProxy) fBeanTypeProxyFactory.getBeanTypeProxy(type.getTypeName(), dimensions.length);
- return arrayType.createBeanProxyWith(dimensions);
- }
- }
-
- public void releaseProxy(IBeanProxy aProxy) {
- // Do nothing. This is more for remote proxies
- }
-
- /**
- * createIDEBeanProxyWith method comment. This is not part of the IStandardBeanProxyFactory
- * interface. It is available only from IDEBeanProxyFactory so that IDE registered extensions
- * can wrapper a bean. They will need to get current and explicitly cast to
- * IDEBeanProxyFactory, so they should only be IDE types themselves.
- */
- public IIDEBeanProxy createIDEBeanProxyWith(Object anObject) {
- if (anObject == null)
- return null;
- return ((IDEBeanTypeProxy) fBeanTypeProxyFactory.getBeanTypeProxy(anObject.getClass())).newBeanProxy(anObject);
- }
-
- /**
- * For the IDE Factory we will create an IDEBeanProxy using the initializationString. If the
- * format of the string is not one we understand, pass it onto the evaluator. The
- * initStringParser is passed to allow shortcut evaluation. Package protected so only
- * IDEBeanTypeProxies can create instances.
- */
- IBeanProxy createBeanProxy(IDEBeanTypeProxy aTypeProxy, String initializationString) {
- if (initializationString.equals("null")) //$NON-NLS-1$
- return null; // Value is initialized as null.
- // We have to evaluate the result of the initializationString
- try {
- ClassLoader pluginClassLoader = fRegistry.getPluginClassLoader();
- Object newValue = InitializationStringParser.evaluate(initializationString, pluginClassLoader);
- return newValue != null ? aTypeProxy.newBeanProxy(newValue) : null;
- } catch (Exception exc) {
- ProxyPlugin.getPlugin().getLogger().log(
- new Status(IStatus.WARNING, ProxyPlugin.getPlugin().getBundle().getSymbolicName(), 0, "", exc)); //$NON-NLS-1$
- return null;
- }
- }
-
- /**
- * For the IDE Factory we will create an IDEBeanProxy using the null constructor Package
- * protected so only IDEBeanTypeProxies can create instances.
- */
- IBeanProxy createBeanProxy(IDEBeanTypeProxy aTypeProxy) {
-
- Class beanType = aTypeProxy.fClass;
-
- // If the beanType is a primitive, the creation will fail because you can't
- // create a primitive without a value.
- try {
- return aTypeProxy.newBeanProxy(!(aTypeProxy.isPrimitive()) ? beanType.newInstance() : null);
- } catch (Exception exc) {
- ProxyPlugin.getPlugin().getLogger().log(
- new Status(IStatus.WARNING, ProxyPlugin.getPlugin().getBundle().getSymbolicName(), 0, "", exc)); //$NON-NLS-1$
- return null;
- }
- }
-
- /*
- * (non-Javadoc)
- * @see org.eclipse.jem.internal.proxy.core.IBeanProxyFactory#terminateFactory(boolean)
- */
- public void terminateFactory(boolean wait) {
- // Nothing really to do here - more applicable to remote proxy factories
- }
-
- /*
- * (non-Javadoc)
- *
- * @see org.eclipse.jem.internal.proxy.core.IStandardBeanProxyFactory#createExpression()
- */
- public IExpression createExpression() {
- return new IDEExpression(this.fRegistry);
- }
-
- /* (non-Javadoc)
- * @see org.eclipse.jem.internal.proxy.core.IStandardBeanProxyFactory#createBeanProxyFrom(java.lang.String)
- */
- public IBeanProxy createBeanProxyFrom(String initializationString) throws ThrowableProxy {
- if (initializationString.equals("null")) //$NON-NLS-1$
- return null; // Value is initialized as null.
- // We have to evaluate the result of the initializationString
- try {
- ClassLoader pluginClassLoader = fRegistry.getPluginClassLoader();
- InitializationStringParser parser = InitializationStringParser.createParser(initializationString, pluginClassLoader);
- Object newValue = parser.evaluate();
- if (newValue != null) {
- return fRegistry.getBeanProxy(parser.getExpectedType(), newValue);
- } else
- return null;
- } catch (Exception exc) {
- ProxyPlugin.getPlugin().getLogger().log(
- new Status(IStatus.WARNING, ProxyPlugin.getPlugin().getBundle().getSymbolicName(), 0, "", exc)); //$NON-NLS-1$
- return null;
- }
- }
-
- public IBeanProxy getIVMServerProxy() {
- return ivmServerProxy;
- }
-
-}
diff --git a/plugins/org.eclipse.jem.proxy/proxyide/org/eclipse/jem/internal/proxy/ide/IDEStandardBeanTypeProxyFactory.java b/plugins/org.eclipse.jem.proxy/proxyide/org/eclipse/jem/internal/proxy/ide/IDEStandardBeanTypeProxyFactory.java
deleted file mode 100644
index 2dfd7fb..0000000
--- a/plugins/org.eclipse.jem.proxy/proxyide/org/eclipse/jem/internal/proxy/ide/IDEStandardBeanTypeProxyFactory.java
+++ /dev/null
@@ -1,465 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2001, 2005 IBM Corporation and others.
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
- *
- * Contributors:
- * IBM Corporation - initial API and implementation
- *******************************************************************************/
-package org.eclipse.jem.internal.proxy.ide;
-
-/*
- * $RCSfile: IDEStandardBeanTypeProxyFactory.java,v $ $Revision: 1.12 $ $Date: 2005/08/24 20:39:06 $
- */
-
-import java.lang.reflect.Array;
-import java.math.BigDecimal;
-import java.math.BigInteger;
-import java.text.MessageFormat;
-import java.util.*;
-
-import org.eclipse.core.runtime.IStatus;
-import org.eclipse.core.runtime.Status;
-
-import org.eclipse.jem.internal.proxy.common.MapTypes;
-import org.eclipse.jem.internal.proxy.core.*;
-import org.eclipse.jem.internal.proxy.core.ExpressionProxy.ProxyEvent;
-
-public class IDEStandardBeanTypeProxyFactory implements IStandardBeanTypeProxyFactory {
-
- protected final IDEProxyFactoryRegistry fFactoryRegistry;
-
- // Hashtable to cache proxies for classes so they are found on second and subsequent lookups
- protected Map beanProxies;
-
- public static Map MAP_SHORTSIG_TO_TYPE = new HashMap(8);
-
- public static Map MAP_TYPENAME_TO_SHORTSIG = new HashMap(8);
-
- static {
- MAP_SHORTSIG_TO_TYPE.put("B", Byte.TYPE); //$NON-NLS-1$
- MAP_SHORTSIG_TO_TYPE.put("C", Character.TYPE); //$NON-NLS-1$
- MAP_SHORTSIG_TO_TYPE.put("D", Double.TYPE); //$NON-NLS-1$
- MAP_SHORTSIG_TO_TYPE.put("F", Float.TYPE); //$NON-NLS-1$
- MAP_SHORTSIG_TO_TYPE.put("I", Integer.TYPE); //$NON-NLS-1$
- MAP_SHORTSIG_TO_TYPE.put("J", Long.TYPE); //$NON-NLS-1$
- MAP_SHORTSIG_TO_TYPE.put("S", Short.TYPE); //$NON-NLS-1$
- MAP_SHORTSIG_TO_TYPE.put("Z", Boolean.TYPE); //$NON-NLS-1$
-
- MAP_TYPENAME_TO_SHORTSIG.put("byte", "B"); //$NON-NLS-1$ //$NON-NLS-2$
- MAP_TYPENAME_TO_SHORTSIG.put("char", "C"); //$NON-NLS-1$ //$NON-NLS-2$
- MAP_TYPENAME_TO_SHORTSIG.put("double", "D"); //$NON-NLS-1$ //$NON-NLS-2$
- MAP_TYPENAME_TO_SHORTSIG.put("float", "F"); //$NON-NLS-1$ //$NON-NLS-2$
- MAP_TYPENAME_TO_SHORTSIG.put("int", "I"); //$NON-NLS-1$ //$NON-NLS-2$
- MAP_TYPENAME_TO_SHORTSIG.put("long", "J"); //$NON-NLS-1$ //$NON-NLS-2$
- MAP_TYPENAME_TO_SHORTSIG.put("short", "S"); //$NON-NLS-1$ //$NON-NLS-2$
- MAP_TYPENAME_TO_SHORTSIG.put("boolean", "Z"); //$NON-NLS-1$ //$NON-NLS-2$
- }
-
- // Cached copy of a few typical bean type proxies.
- IDEBeanTypeProxy objectClass;
-
- IDEBooleanTypeBeanTypeProxy booleanType;
-
- IDEBooleanClassBeanTypeProxy booleanClass;
-
- IDEIntegerTypeBeanTypeProxy intType;
-
- IDEIntegerClassBeanTypeProxy integerClass;
-
- IDEFloatTypeBeanTypeProxy floatType;
-
- IDEFloatClassBeanTypeProxy floatClass;
-
- IDELongTypeBeanTypeProxy longType;
-
- IDELongClassBeanTypeProxy longClass;
-
- IDEShortTypeBeanTypeProxy shortType;
-
- IDEShortClassBeanTypeProxy shortClass;
-
- IDEByteTypeBeanTypeProxy byteType;
-
- IDEByteClassBeanTypeProxy byteClass;
-
- IDECharTypeBeanTypeProxy charType;
-
- IDECharacterClassBeanTypeProxy charClass;
-
- IDEDoubleTypeBeanTypeProxy doubleType;
-
- IDEDoubleClassBeanTypeProxy doubleClass;
-
- IDEStringBeanTypeProxy stringClass;
-
- IDEClassBeanTypeProxy classClass;
-
- IDEBeanTypeProxy voidType;
-
- public IDEStandardBeanTypeProxyFactory(IDEProxyFactoryRegistry aRegistry) {
- fFactoryRegistry = aRegistry;
- aRegistry.registerBeanTypeProxyFactory(this);
-
- // Now initialize the cache.
- objectClass = new IDEBeanTypeProxy(fFactoryRegistry, Object.class);
- booleanType = new IDEBooleanTypeBeanTypeProxy(fFactoryRegistry, Boolean.TYPE);
- booleanClass = new IDEBooleanClassBeanTypeProxy(fFactoryRegistry, Boolean.class);
- intType = new IDEIntegerTypeBeanTypeProxy(fFactoryRegistry, Integer.TYPE);
- integerClass = new IDEIntegerClassBeanTypeProxy(fFactoryRegistry, Integer.class);
- floatType = new IDEFloatTypeBeanTypeProxy(fFactoryRegistry, Float.TYPE);
- floatClass = new IDEFloatClassBeanTypeProxy(fFactoryRegistry, Float.class);
- longType = new IDELongTypeBeanTypeProxy(fFactoryRegistry, Long.TYPE);
- longClass = new IDELongClassBeanTypeProxy(fFactoryRegistry, Long.class);
- shortType = new IDEShortTypeBeanTypeProxy(fFactoryRegistry, Short.TYPE);
- shortClass = new IDEShortClassBeanTypeProxy(fFactoryRegistry, Short.class);
- byteType = new IDEByteTypeBeanTypeProxy(fFactoryRegistry, Byte.TYPE);
- byteClass = new IDEByteClassBeanTypeProxy(fFactoryRegistry, Byte.class);
- charType = new IDECharTypeBeanTypeProxy(fFactoryRegistry, Character.TYPE);
- charClass = new IDECharacterClassBeanTypeProxy(fFactoryRegistry, Character.class);
- doubleType = new IDEDoubleTypeBeanTypeProxy(fFactoryRegistry, Double.TYPE);
- doubleClass = new IDEDoubleClassBeanTypeProxy(fFactoryRegistry, Double.class);
- stringClass = new IDEStringBeanTypeProxy(fFactoryRegistry, String.class);
- classClass = new IDEClassBeanTypeProxy(fFactoryRegistry, java.lang.Class.class);
- voidType = new IDEBeanTypeProxy(fFactoryRegistry, Void.TYPE);
-
- // Initialize the hashtable with the primitives, their lang equivalents, and also common classes like String
- beanProxies = new HashMap(20);
-
- // Primitives
- beanProxies.put(intType.getTypeName(), intType);
- beanProxies.put(booleanType.getTypeName(), booleanType);
- beanProxies.put(charType.getTypeName(), charType);
- beanProxies.put(byteType.getTypeName(), byteType);
- beanProxies.put(shortType.getTypeName(), shortType);
- beanProxies.put(longType.getTypeName(), longType);
- beanProxies.put(floatType.getTypeName(), floatType);
- beanProxies.put(doubleType.getTypeName(), doubleType);
-
- // java.lang primitive peers
- // Note that special classes are used for some of these which allow the IDE to get the
- // lang objects from the objects that are holding proxies
- beanProxies.put(integerClass.getTypeName(), integerClass);
- beanProxies.put(booleanClass.getTypeName(), booleanClass);
- beanProxies.put(charClass.getTypeName(), charClass);
- beanProxies.put(byteClass.getTypeName(), byteClass);
- beanProxies.put(shortClass.getTypeName(), shortClass);
- beanProxies.put(longClass.getTypeName(), longClass);
- beanProxies.put(floatClass.getTypeName(), floatClass);
- beanProxies.put(doubleClass.getTypeName(), doubleClass);
- beanProxies.put(BigDecimal.class.getName(), new IDEBigDecimalBeanTypeProxy(fFactoryRegistry, BigDecimal.class));//$NON-NLS-1$
- beanProxies.put(BigInteger.class.getName(), new IDEBigIntegerBeanTypeProxy(fFactoryRegistry, BigInteger.class));//$NON-NLS-1$
- beanProxies.put(stringClass.getTypeName(), stringClass);
-
- beanProxies.put(classClass.getTypeName(), classClass);
- beanProxies.put(voidType.getTypeName(), voidType);
- }
-
- /**
- * We are an IDE proxy and know that the type is in the same VM as the IDE. the IDEBeanTypeProxy object NOTE This is package protected because the
- * only person who can call it are priveledged classes that are also creating things in an IDEProxy environment. If anyone needs to make this
- * method public they are doing the wrong thing as they should use the public method getBeanTypeProxy(String) that is on the interface. The only
- * other object that can guarantee that they have the class for the argument are those that are part of the idevm package
- */
- IBeanTypeProxy getBeanTypeProxy(Class anIDEClass) {
- return getBeanTypeProxy(anIDEClass.getName());
-
- }
-
- /*
- * (non-Javadoc)
- *
- * @see org.eclipse.jem.internal.proxy.core.IStandardBeanTypeProxyFactory#getBeanTypeProxy(java.lang.String)
- */
- public synchronized IBeanTypeProxy getBeanTypeProxy(String typeName) {
- typeName = MapTypes.getJNIFormatName(typeName);
-
- // See whether we already have the proxy for the argument name
- IProxyBeanType beanTypeProxy = (IProxyBeanType) beanProxies.get(typeName);
- // See if there and resolved, if so, return it. If not resolved, that means we need it NOW
- // so we must go for it. When finally resolved the original ExpressionProxy will be deregistered and
- // the resolved beantypeproxy will be in its place.
- if (beanTypeProxy != null && beanTypeProxy.isBeanProxy()) {
- return (IBeanTypeProxy) beanTypeProxy;
- }
-
- // If not an array, then see if the package extension mechanism can find it.
- // Do this here so that if it is found in the package extension we won't necessarily create an
- // extra connection when not needed.
- if (typeName.charAt(0) != '[') {
- // It is not an array
- // First check with the factory for the package of the class.
- // Inner classes have to use the dollar notation since if they didn't we couldn't tell where
- // the package ended and the class started.
- int packageIndex = typeName.lastIndexOf('.');
- if (packageIndex != -1) {
- String packageName = typeName.substring(0, packageIndex);
- IDEExtensionBeanTypeProxyFactory packageFactory = (IDEExtensionBeanTypeProxyFactory) fFactoryRegistry
- .getBeanTypeProxyFactoryExtension(packageName);
- if (packageFactory != null) {
- beanTypeProxy = packageFactory.getExtensionBeanTypeProxy(typeName);
- if (beanTypeProxy != null) {
- registerBeanTypeProxy((IBeanTypeProxy) beanTypeProxy, false);
- return (IBeanTypeProxy) beanTypeProxy;
- }
- }
- }
- // There was not a registered factory that dealt with the class. Load it using the factory
- // registry which has the plugin's class loader
- try {
- Class ideClass = fFactoryRegistry.loadClass(typeName);
- IDEBeanTypeProxy superTypeProxy = null;
- if (ideClass.getSuperclass() != null) {
- // Get the beantype proxy of the superclass.
- superTypeProxy = (IDEBeanTypeProxy) getBeanTypeProxy(ideClass.getSuperclass());
- }
-
- // Ask the supertype
- // to create a beantype proxy of the same beantype proxy class.
- // This is so that any subclasses will get the same beantype proxy class
- // for it if it is special.
- if (superTypeProxy != null)
- beanTypeProxy = superTypeProxy.newBeanTypeForClass(ideClass);
-
- if (beanTypeProxy == null)
- beanTypeProxy = new IDEBeanTypeProxy(fFactoryRegistry, ideClass);
- } catch (ClassNotFoundException e) {
- ProxyPlugin.getPlugin().getLogger().log(new Status(IStatus.INFO, ProxyPlugin.getPlugin().getBundle().getSymbolicName(), 0, "", e)); //$NON-NLS-1$
- String msg = MessageFormat.format("{0}({1})", new Object[] { e.getClass(), e.getMessage()}); //$NON-NLS-1$
- beanTypeProxy = new IDEInitErrorBeanTypeProxy(fFactoryRegistry, typeName, msg, e);
- } catch (ExceptionInInitializerError e) {
- ProxyPlugin.getPlugin().getLogger().log(new Status(IStatus.WARNING, ProxyPlugin.getPlugin().getBundle().getSymbolicName(), 0, "", e)); //$NON-NLS-1$
- String msg = MessageFormat.format("{0}({1})", new Object[] { e.getClass(), e.getMessage()}); //$NON-NLS-1$
- beanTypeProxy = new IDEInitErrorBeanTypeProxy(fFactoryRegistry, typeName, msg, e.getCause());
- } catch (LinkageError e) {
- ProxyPlugin.getPlugin().getLogger().log(new Status(IStatus.WARNING, ProxyPlugin.getPlugin().getBundle().getSymbolicName(), 0, "", e)); //$NON-NLS-1$
- String msg = MessageFormat.format("{0}({1})", new Object[] { e.getClass(), e.getMessage()}); //$NON-NLS-1$
- beanTypeProxy = new IDEInitErrorBeanTypeProxy(fFactoryRegistry, typeName, msg, e);
- }
-
- // Cache the instance so we can re-use it again
- beanProxies.put(typeName, beanTypeProxy);
- return (IBeanTypeProxy) beanTypeProxy;
- } else {
- // need to create a array of this many dimensions so that we can get the appropriate class for it.
- int dims = typeName.lastIndexOf('[') + 1;
- Class finalComponentType = null;
- if (typeName.charAt(dims) == 'L') {
- // It is a class.
- // Strip off up to the 'L', and the trailing ';'. That is the class name.
- IDEBeanTypeProxy finalType = (IDEBeanTypeProxy) getBeanTypeProxy(typeName.substring(dims + 1, typeName.length() - 1));
- if (finalType != null)
- finalComponentType = finalType.fClass;
- } else {
- // It is a type. Need to map it.
- finalComponentType = (Class) IDEStandardBeanTypeProxyFactory.MAP_SHORTSIG_TO_TYPE.get(typeName.substring(dims, dims + 1));
- }
-
- if (finalComponentType != null) {
- Object dummyArray = Array.newInstance(finalComponentType, new int[dims]);
- beanTypeProxy = new IDEArrayBeanTypeProxy(fFactoryRegistry, typeName, dummyArray.getClass());
- beanProxies.put(typeName, beanTypeProxy);
- }
- return (IBeanTypeProxy) beanTypeProxy;
- }
- }
-
- /*
- * (non-Javadoc)
- *
- * @see org.eclipse.jem.internal.proxy.core.IStandardBeanTypeProxyFactory#getBeanTypeProxy(org.eclipse.jem.internal.proxy.core.IExpression,
- * java.lang.String)
- */
- public synchronized IProxyBeanType getBeanTypeProxy(IExpression expression, String typeName) {
- typeName = MapTypes.getJNIFormatName(typeName);
-
- // See whether we already have the proxy for the argument name
- IProxyBeanType beanTypeProxy = (IProxyBeanType) beanProxies.get(typeName);
- if (beanTypeProxy != null) { return beanTypeProxy; }
-
- // Now see if an expression proxy cached.
- beanTypeProxy = ((IDEExpression) expression).getBeanType(typeName);
- if (beanTypeProxy != null)
- return beanTypeProxy;
-
-
- // If not an array, then see if the package extension mechanism can find it.
- // Do this here so that if it is found in the package extension we won't necessarily create an
- // extra connection when not needed.
- if (typeName.charAt(0) != '[') {
- // It is not an array
- // First check with the factory for the package of the class.
- // Inner classes have to use the dollar notation since if they didn't we couldn't tell where
- // the package ended and the class started.
- int packageIndex = typeName.lastIndexOf('.');
- if (packageIndex != -1) {
- String packageName = typeName.substring(0, packageIndex);
- IDEExtensionBeanTypeProxyFactory packageFactory = (IDEExtensionBeanTypeProxyFactory) fFactoryRegistry
- .getBeanTypeProxyFactoryExtension(packageName);
- if (packageFactory != null) {
- beanTypeProxy = packageFactory.getExtensionBeanTypeProxy(typeName, expression);
- if (beanTypeProxy != null) {
- registerBeanTypeProxy(beanTypeProxy, false);
- return beanTypeProxy;
- }
- }
- }
- }
-
- // There was not a registered factory that dealt with the class. So create the expression proxy.
- beanTypeProxy = ((Expression) expression).createBeanTypeExpressionProxy(typeName);
- registerBeanTypeProxy(beanTypeProxy, false);
- return beanTypeProxy;
-
- }
-
- /*
- * (non-Javadoc)
- *
- * @see org.eclipse.jem.internal.proxy.core.IStandardBeanTypeProxyFactory#getBeanTypeProxy(java.lang.String, int)
- */
- public IBeanTypeProxy getBeanTypeProxy(String componentClassName, int dimensions) {
- return getBeanTypeProxy(getArrayClassname(componentClassName, dimensions));
- }
-
- /*
- * (non-Javadoc)
- *
- * @see org.eclipse.jem.internal.proxy.core.IStandardBeanTypeProxyFactory#getBeanTypeProxy(org.eclipse.jem.internal.proxy.core.IExpression,
- * java.lang.String, int)
- */
- public IProxyBeanType getBeanTypeProxy(IExpression expression, String componentClassName, int dimensions) {
- return getBeanTypeProxy(expression, getArrayClassname(componentClassName, dimensions));
- }
-
- /**
- * @param componentClassName
- * @param dimensions
- * @return
- *
- * @since 1.1.0
- */
- protected String getArrayClassname(String componentClassName, int dimensions) {
- String jniComponentTypeName = MapTypes.getJNIFormatName(componentClassName);
- String compType = jniComponentTypeName;
- if (jniComponentTypeName.charAt(0) != '[') {
- // We're not already an array, so create correct template.
- compType = (String) MAP_TYPENAME_TO_SHORTSIG.get(componentClassName);
- if (compType == null) {
- // It is a class, and not a type.
- compType = "L" + jniComponentTypeName + ";"; //$NON-NLS-1$ //$NON-NLS-2$
- }
- }
- // Now create it with the appropriate number of '[' in front.
- StringBuffer buffer = new StringBuffer(dimensions + compType.length());
- for (int i = 0; i < dimensions; i++)
- buffer.append('[');
- buffer.append(compType);
- return buffer.toString();
- }
-
- /*
- * (non-Javadoc)
- *
- * @see org.eclipse.jem.internal.proxy.core.IBeanProxyFactory#terminateFactory(boolean)
- */
- public void terminateFactory(boolean wait) {
- }
-
- /*
- * (non-Javadoc)
- *
- * @see org.eclipse.jem.internal.proxy.core.IStandardBeanTypeProxyFactory#registerBeanTypeProxy(org.eclipse.jem.internal.proxy.core.IBeanTypeProxy,
- * boolean)
- */
- public synchronized void registerBeanTypeProxy(IBeanTypeProxy aBeanTypeProxy, boolean permanent) {
- beanProxies.put(aBeanTypeProxy.getTypeName(), aBeanTypeProxy);
- }
-
- /*
- * (non-Javadoc)
- *
- * @see org.eclipse.jem.internal.proxy.core.IStandardBeanTypeProxyFactory#registerBeanTypeProxy(org.eclipse.jem.internal.proxy.core.IProxyBeanType,
- * boolean)
- */
- public void registerBeanTypeProxy(IProxyBeanType aProxyBeanType, boolean permanent) {
- if (aProxyBeanType.isBeanProxy())
- registerBeanTypeProxy((IBeanTypeProxy) aProxyBeanType, permanent); // A regular kind, do regular registration.
- else {
- ExpressionProxy beanExpressionProxy = ((ExpressionProxy) aProxyBeanType);
- final String typeName = aProxyBeanType.getTypeName();
- ((IDEExpression) beanExpressionProxy.getExpression()).addBeanType(typeName, aProxyBeanType);
- beanExpressionProxy.addProxyListener(new ExpressionProxy.ProxyAdapter() {
-
- public void proxyResolved(ProxyEvent event) {
- String typeName = ((IProxyBeanType) event.getSource()).getTypeName();
- synchronized (IDEStandardBeanTypeProxyFactory.this) {
- if (!beanProxies.containsKey(typeName)) {
- // It hasn't been resolved through some other means. So this is good. Actually this should never
- // occur because upon resolution we've already registered the bean type proxy through the
- // normal mechanisms. But to be safe, we'll do it here.
- beanProxies.put(typeName, event.getProxy());
- }
- }
- }
-
- public void proxyNotResolved(ExpressionProxy.ProxyEvent event) {
- ((IDEExpression) ((ExpressionProxy) event.getSource()).getExpression()).removeBeanType(typeName);
- }
- });
- }
-
- }
-
- /*
- * (non-Javadoc)
- *
- * @see org.eclipse.jem.internal.proxy.core.IStandardBeanTypeProxyFactory#isBeanTypeRegistered(String)
- */
- public synchronized boolean isBeanTypeRegistered(String className) {
- return beanProxies.containsKey(MapTypes.getJNIFormatName(className));
- }
-
- /*
- * (non-Javadoc)
- *
- * @see org.eclipse.jem.internal.proxy.core.IStandardBeanTypeProxyFactory#registeredTypes()
- */
- public Set registeredTypes() {
- return beanProxies.keySet();
- }
-
- /*
- * (non-Javadoc)
- *
- * @see org.eclipse.jem.internal.proxy.core.IStandardBeanTypeProxyFactory#isBeanTypeNotFound(String)
- */
- public boolean isBeanTypeNotFound(String className) {
- // Do nothing. No need for it in IDE system because there will always be a proxy, even when not found.
- // In that case an IDEInitErrorBeanTypeProxy will be created.
- return false;
- }
-
- /*
- * (non-Javadoc)
- *
- * @see org.eclipse.jem.internal.proxy.core.IStandardBeanTypeProxyFactory#isMaintainNotFoundTypes()
- */
- public boolean isMaintainNotFoundTypes() {
- // Do nothing. No need for it in IDE system because there will always be a proxy, even when not found.
- // In that case an IDEInitErrorBeanTypeProxy will be created.
- return false;
- }
-
- /*
- * (non-Javadoc)
- *
- * @see org.eclipse.jem.internal.proxy.core.IStandardBeanTypeProxyFactory#setMaintainNotFoundTypes(boolean)
- */
- public void setMaintainNotFoundTypes(boolean maintain) {
- // Do nothing. No need for it in IDE system because there will always be a proxy, even when not found.
- // In that case an IDEInitErrorBeanTypeProxy will be created.
- }
-}
diff --git a/plugins/org.eclipse.jem.proxy/proxyide/org/eclipse/jem/internal/proxy/ide/IDEStringBeanProxy.java b/plugins/org.eclipse.jem.proxy/proxyide/org/eclipse/jem/internal/proxy/ide/IDEStringBeanProxy.java
deleted file mode 100644
index 7dfaa9c..0000000
--- a/plugins/org.eclipse.jem.proxy/proxyide/org/eclipse/jem/internal/proxy/ide/IDEStringBeanProxy.java
+++ /dev/null
@@ -1,40 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2001, 2005 IBM Corporation and others.
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
- *
- * Contributors:
- * IBM Corporation - initial API and implementation
- *******************************************************************************/
-package org.eclipse.jem.internal.proxy.ide;
-/*
-
-
- */
-
-import org.eclipse.jem.internal.proxy.core.*;
-/**
- * IDE Implementation of IStringBeanProxy
- * Creation date: (2/6/00 9:02:42 AM)
- * @author: Joe Winchester
- */
-final class IDEStringBeanProxy extends IDEObjectBeanProxy implements IStringBeanProxy {
- protected String fString;
-/**
- * Store the bean in the string field to save re-casting each time it is asked for.
- * It is package protected because they are created
- * in a special way and no one else should create them.
- */
-IDEStringBeanProxy(IDEProxyFactoryRegistry aRegistry, Object aBean, IBeanTypeProxy aBeanTypeProxy) {
- super(aRegistry, aBean,aBeanTypeProxy);
- fString = (String)aBean;
-}
-/**
- * Return the cache'd string that is a java.lang.String that the IDE can use
- */
-public String stringValue() {
- return fString;
-}
-}
diff --git a/plugins/org.eclipse.jem.proxy/proxyide/org/eclipse/jem/internal/proxy/ide/IDEStringBeanTypeProxy.java b/plugins/org.eclipse.jem.proxy/proxyide/org/eclipse/jem/internal/proxy/ide/IDEStringBeanTypeProxy.java
deleted file mode 100644
index 7df370d..0000000
--- a/plugins/org.eclipse.jem.proxy/proxyide/org/eclipse/jem/internal/proxy/ide/IDEStringBeanTypeProxy.java
+++ /dev/null
@@ -1,49 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2001, 2005 IBM Corporation and others.
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
- *
- * Contributors:
- * IBM Corporation - initial API and implementation
- *******************************************************************************/
-package org.eclipse.jem.internal.proxy.ide;
-/*
-
-
- */
-
-import org.eclipse.jem.internal.proxy.core.IStringBeanProxy;
-/**
- * IDE Implementation of the BeanType proxy for java.lang.String
- */
-final class IDEStringBeanTypeProxy extends IDEBeanTypeProxy {
- // Cache a proxy to an empty string for speed
- protected final IDEStringBeanProxy emptyStringProxy;
-
-IDEStringBeanTypeProxy(IDEProxyFactoryRegistry aRegistry, Class aClass) {
- super(aRegistry, aClass);
- // Cache a proxy to an empty string for speed
- emptyStringProxy = new IDEStringBeanProxy(aRegistry, "",this); //$NON-NLS-1$
-}
-/**
- * Helper to create string beans
- * Package protected because no-one else outside the package should use this, they
- * must go through the API where you look up a factory first.
- */
-IStringBeanProxy createStringBeanProxy(String aString){
- if ( aString.equals("") ) {//$NON-NLS-1$
- return emptyStringProxy;
- } else {
- return new IDEStringBeanProxy(fProxyFactoryRegistry,aString,this);
- }
-}
-/* Specialized from IDEBeanTypeProxy to ensure IStringBeanProxies are created correctly
- */
-protected IIDEBeanProxy newBeanProxy(Object anObject){
-
- return (IIDEBeanProxy)createStringBeanProxy( (String)anObject );
-
-}
-}
diff --git a/plugins/org.eclipse.jem.proxy/proxyide/org/eclipse/jem/internal/proxy/ide/IDEThrowableProxy.java b/plugins/org.eclipse.jem.proxy/proxyide/org/eclipse/jem/internal/proxy/ide/IDEThrowableProxy.java
deleted file mode 100644
index 0ad0e81..0000000
--- a/plugins/org.eclipse.jem.proxy/proxyide/org/eclipse/jem/internal/proxy/ide/IDEThrowableProxy.java
+++ /dev/null
@@ -1,100 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2001, 2005 IBM Corporation and others.
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
- *
- * Contributors:
- * IBM Corporation - initial API and implementation
- *******************************************************************************/
-package org.eclipse.jem.internal.proxy.ide;
-/*
-
-
- */
-
-import org.eclipse.jem.internal.proxy.core.*;
-
-public class IDEThrowableProxy extends ThrowableProxy implements IIDEBeanProxy {
-
- /**
- * Comment for <code>serialVersionUID</code>
- *
- * @since 1.1.0
- */
- private static final long serialVersionUID = 7162757961175978338L;
- protected IBeanTypeProxy fBeanTypeProxy;
-
- protected IDEThrowableProxy(Throwable exc, IBeanTypeProxy aBeanTypeProxy) {
- super(exc);
- fBeanTypeProxy = aBeanTypeProxy;
- }
-
- public boolean equals(Object obj) {
- if (super.equals(obj))
- return true;
- if (obj instanceof IIDEBeanProxy) {
- return getCause().equals(((IIDEBeanProxy) obj).getBean());
- }
- return false;
- }
-
- /* (non-Javadoc)
- * @see org.eclipse.jem.internal.proxy.core.IBeanProxy#sameAs(org.eclipse.jem.internal.proxy.core.IBeanProxy)
- */
- public boolean sameAs(IBeanProxy aBeanProxy) {
- if (this == aBeanProxy)
- return true;
- if (aBeanProxy instanceof IIDEBeanProxy)
- return getCause() == ((IIDEBeanProxy) aBeanProxy).getBean();
- return false;
- }
-
- public String getProxyLocalizedMessage() {
- return getCause().getLocalizedMessage();
- }
- public String getProxyMessage() {
- return getCause().getMessage();
- }
- public void printProxyStackTrace(java.io.PrintWriter writer) {
- getCause().printStackTrace(writer);
- }
- public void printProxyStackTrace(java.io.PrintStream stream) {
- getCause().printStackTrace(stream);
- }
- public void printProxyStackTrace() {
- getCause().printStackTrace();
- }
- public IBeanTypeProxy getTypeProxy() {
- return fBeanTypeProxy;
- }
- public ProxyFactoryRegistry getProxyFactoryRegistry() {
- return fBeanTypeProxy.getProxyFactoryRegistry();
- }
- public String toBeanString() {
- return getCause().toString();
- }
- public boolean isValid() {
- return true;
- }
- /**
- * Return the exception which is the live bean
- */
- public Object getBean() {
- return getCause();
- }
-
- /* (non-Javadoc)
- * @see org.eclipse.jem.internal.proxy.core.IProxy#isBeanProxy()
- */
- public final boolean isBeanProxy() {
- return true;
- }
- /* (non-Javadoc)
- * @see org.eclipse.jem.internal.proxy.core.IProxy#isExpressionProxy()
- */
- public final boolean isExpressionProxy() {
- return false;
- }
-}
diff --git a/plugins/org.eclipse.jem.proxy/proxyide/org/eclipse/jem/internal/proxy/ide/IDEVMServer.java b/plugins/org.eclipse.jem.proxy/proxyide/org/eclipse/jem/internal/proxy/ide/IDEVMServer.java
deleted file mode 100644
index 7ded239..0000000
--- a/plugins/org.eclipse.jem.proxy/proxyide/org/eclipse/jem/internal/proxy/ide/IDEVMServer.java
+++ /dev/null
@@ -1,83 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2001, 2005 IBM Corporation and others.
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
- *
- * Contributors:
- * IBM Corporation - initial API and implementation
- *******************************************************************************/
-package org.eclipse.jem.internal.proxy.ide;
-/*
-
-
- */
-
-import java.io.OutputStream;
-
-import org.eclipse.jem.internal.proxy.common.*;
-
-public class IDEVMServer implements IVMCallbackServer {
-
- IDECallbackRegistry fCallbackRegistry;
- IDEStandardBeanProxyFactory fBeanProxyFactory;
-
-IDEVMServer(IDECallbackRegistry aCallbackRegistry){
- fCallbackRegistry = aCallbackRegistry;
- fBeanProxyFactory = (IDEStandardBeanProxyFactory)fCallbackRegistry.fProxyFactoryRegistry.getBeanProxyFactory();
-
-}
-public Object doCallback(ICallbackRunnable aRunnable){
- try {
- return aRunnable.run(new ICallbackHandler(){
- public Object callbackWithParms(int callbackID, int msgID, Object[] parms){
- // We are running in the same IDE so just call the registry directly
- // although we must convert the parms to bean proxies
- Object[] proxyParms = null;
- // If we have any parms then convert them to bean proxies
- if ( parms != null ) {
- proxyParms = new Object[parms.length];
- for ( int i=0;i<parms.length;i++){
- Object p = parms[i];
- proxyParms[i] = createNextParm(p);
- }
- }
- return fCallbackRegistry.vmCallback(callbackID,msgID,proxyParms);
- }
-
- private Object createNextParm(Object p) {
- if (!(p instanceof ICallbackHandler.TransmitableArray)) {
- return fBeanProxyFactory.createIDEBeanProxyWith(p);
- } else {
- Object[] array = ((ICallbackHandler.TransmitableArray) p).getArray();
- Object[] parm = new Object[array.length];
- for (int i = 0; i < array.length; i++) {
- parm[i] = createNextParm(array[i]);
- }
- return parm;
- }
- }
-
- /* (non-Javadoc)
- * @see org.eclipse.jem.internal.proxy.common.ICallbackHandler#callbackAsConstants(int, int, java.lang.Object)
- */
- public Object callbackAsConstants(int callbackID, int msgID, Object parm) throws CommandException {
- return fCallbackRegistry.vmCallback(callbackID,msgID,parm);
- }
- });
-
- } catch ( CommandException exc ) {
- return null;
- }
-}
-
-public OutputStream requestStream(int callbackID, int msgID) throws CommandException {
- return fCallbackRegistry.requestStream(callbackID,msgID);
-}
-public IVMServer getIVMServer() {
- return fCallbackRegistry.fProxyFactoryRegistry;
-}
-
-
-}
diff --git a/plugins/org.eclipse.jem.proxy/proxyide/org/eclipse/jem/internal/proxy/ide/IIDEBeanProxy.java b/plugins/org.eclipse.jem.proxy/proxyide/org/eclipse/jem/internal/proxy/ide/IIDEBeanProxy.java
deleted file mode 100644
index a0fc42d..0000000
--- a/plugins/org.eclipse.jem.proxy/proxyide/org/eclipse/jem/internal/proxy/ide/IIDEBeanProxy.java
+++ /dev/null
@@ -1,29 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2001, 2005 IBM Corporation and others.
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
- *
- * Contributors:
- * IBM Corporation - initial API and implementation
- *******************************************************************************/
-package org.eclipse.jem.internal.proxy.ide;
-/*
-
-
- */
-
-import org.eclipse.jem.internal.proxy.core.IBeanProxy;
-
-
-/**
- * Interface that allows the IDE VM to get the actual bean.
- */
-public interface IIDEBeanProxy extends IBeanProxy {
-/**
- * Get the actual live bean.
- * USE with extreme care.
- */
-public Object getBean();
-}
diff --git a/plugins/org.eclipse.jem.proxy/proxyide/org/eclipse/jem/internal/proxy/ide/awt/IDEDimensionBeanProxy.java b/plugins/org.eclipse.jem.proxy/proxyide/org/eclipse/jem/internal/proxy/ide/awt/IDEDimensionBeanProxy.java
deleted file mode 100644
index d42440d..0000000
--- a/plugins/org.eclipse.jem.proxy/proxyide/org/eclipse/jem/internal/proxy/ide/awt/IDEDimensionBeanProxy.java
+++ /dev/null
@@ -1,51 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2001, 2005 IBM Corporation and others.
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
- *
- * Contributors:
- * IBM Corporation - initial API and implementation
- *******************************************************************************/
-package org.eclipse.jem.internal.proxy.ide.awt;
-/*
-
-
- */
-
-import java.awt.Dimension;
-
-import org.eclipse.jem.internal.proxy.core.IBeanTypeProxy;
-import org.eclipse.jem.internal.proxy.core.IDimensionBeanProxy;
-import org.eclipse.jem.internal.proxy.ide.IDEObjectBeanProxy;
-import org.eclipse.jem.internal.proxy.ide.IDEProxyFactoryRegistry;
-
-public class IDEDimensionBeanProxy extends IDEObjectBeanProxy implements IDimensionBeanProxy {
-
- protected Dimension fDimension;
-
-IDEDimensionBeanProxy(IDEProxyFactoryRegistry aRegistry,Object aDimension, IBeanTypeProxy aBeanTypeProxy){
- super(aRegistry,aDimension,aBeanTypeProxy);
- fDimension = (Dimension)aDimension;
-}
-public int getWidth(){
- return fDimension.width;
-}
-public void setWidth(int aWidth){
- fDimension.width = aWidth;
-}
-public int getHeight(){
- return fDimension.height;
-}
-public void setHeight(int aHeight){
- fDimension.height = aHeight;
-}
-public void setSize(IDimensionBeanProxy aBeanProxy){
- fDimension.setSize(new Dimension(aBeanProxy.getWidth(),aBeanProxy.getHeight()));
-}
-public void setSize(int width, int height){
- fDimension.width = width;
- fDimension.height = height;
-}
-}
diff --git a/plugins/org.eclipse.jem.proxy/proxyide/org/eclipse/jem/internal/proxy/ide/awt/IDEDimensionBeanTypeProxy.java b/plugins/org.eclipse.jem.proxy/proxyide/org/eclipse/jem/internal/proxy/ide/awt/IDEDimensionBeanTypeProxy.java
deleted file mode 100644
index 30ca7e3..0000000
--- a/plugins/org.eclipse.jem.proxy/proxyide/org/eclipse/jem/internal/proxy/ide/awt/IDEDimensionBeanTypeProxy.java
+++ /dev/null
@@ -1,46 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2001, 2005 IBM Corporation and others.
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
- *
- * Contributors:
- * IBM Corporation - initial API and implementation
- *******************************************************************************/
-package org.eclipse.jem.internal.proxy.ide.awt;
-/*
-
-
- */
-
-import java.awt.Dimension;
-
-import org.eclipse.jem.internal.proxy.ide.*;
-
-public class IDEDimensionBeanTypeProxy extends IDEBeanTypeProxy {
-
-IDEDimensionBeanTypeProxy(IDEProxyFactoryRegistry aRegistry){
- this(aRegistry,Dimension.class);
-}
-
-private IDEDimensionBeanTypeProxy(IDEProxyFactoryRegistry aRegistry, Class type){
- super(aRegistry, type);
-}
-
-protected IIDEBeanProxy newBeanProxy(Object anObject){
-
- return new IDEDimensionBeanProxy(fProxyFactoryRegistry, anObject, this);
-
-}
-IDEDimensionBeanProxy createDimensionBeanProxy(int width, int height){
- return new IDEDimensionBeanProxy(fProxyFactoryRegistry,new Dimension(width,height),this);
-}
- /*
- * @see IDEBeanTypeProxy#newBeanTypeForClass(Class)
- */
- public IDEBeanTypeProxy newBeanTypeForClass(Class type) {
- return new IDEDimensionBeanTypeProxy(fProxyFactoryRegistry, type);
- }
-
-}
diff --git a/plugins/org.eclipse.jem.proxy/proxyide/org/eclipse/jem/internal/proxy/ide/awt/IDEPointBeanProxy.java b/plugins/org.eclipse.jem.proxy/proxyide/org/eclipse/jem/internal/proxy/ide/awt/IDEPointBeanProxy.java
deleted file mode 100644
index 8d7ae78..0000000
--- a/plugins/org.eclipse.jem.proxy/proxyide/org/eclipse/jem/internal/proxy/ide/awt/IDEPointBeanProxy.java
+++ /dev/null
@@ -1,51 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2001, 2005 IBM Corporation and others.
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
- *
- * Contributors:
- * IBM Corporation - initial API and implementation
- *******************************************************************************/
-package org.eclipse.jem.internal.proxy.ide.awt;
-/*
-
-
- */
-
-import java.awt.Point;
-
-import org.eclipse.jem.internal.proxy.core.IBeanTypeProxy;
-import org.eclipse.jem.internal.proxy.core.IPointBeanProxy;
-import org.eclipse.jem.internal.proxy.ide.IDEObjectBeanProxy;
-import org.eclipse.jem.internal.proxy.ide.IDEProxyFactoryRegistry;
-
-public class IDEPointBeanProxy extends IDEObjectBeanProxy implements IPointBeanProxy {
-
- protected Point fPoint;
-
-IDEPointBeanProxy(IDEProxyFactoryRegistry aRegistry,Object aPoint, IBeanTypeProxy aBeanTypeProxy){
- super(aRegistry,aPoint,aBeanTypeProxy);
- fPoint = (Point)aPoint;
-}
-public int getX(){
- return fPoint.x;
-}
-public void setX(int anX){
- fPoint.x = anX;
-}
-public int getY(){
- return fPoint.y;
-}
-public void setY(int aY){
- fPoint.y = aY;
-}
-public void setLocation(IPointBeanProxy aBeanProxy){
- fPoint.setLocation(new Point(aBeanProxy.getX(),aBeanProxy.getY()));
-}
-public void setLocation(int anX, int aY){
- fPoint.x = anX;
- fPoint.y = aY;
-}
-}
diff --git a/plugins/org.eclipse.jem.proxy/proxyide/org/eclipse/jem/internal/proxy/ide/awt/IDEPointBeanTypeProxy.java b/plugins/org.eclipse.jem.proxy/proxyide/org/eclipse/jem/internal/proxy/ide/awt/IDEPointBeanTypeProxy.java
deleted file mode 100644
index 0d4fb91..0000000
--- a/plugins/org.eclipse.jem.proxy/proxyide/org/eclipse/jem/internal/proxy/ide/awt/IDEPointBeanTypeProxy.java
+++ /dev/null
@@ -1,44 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2001, 2005 IBM Corporation and others.
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
- *
- * Contributors:
- * IBM Corporation - initial API and implementation
- *******************************************************************************/
-package org.eclipse.jem.internal.proxy.ide.awt;
-/*
-
-
- */
-
-import java.awt.Point;
-
-import org.eclipse.jem.internal.proxy.ide.*;
-
-public class IDEPointBeanTypeProxy extends IDEBeanTypeProxy {
-
-IDEPointBeanTypeProxy(IDEProxyFactoryRegistry aRegistry){
- this(aRegistry,Point.class);
-}
-private IDEPointBeanTypeProxy(IDEProxyFactoryRegistry aRegistry, Class type){
- super(aRegistry,type);
-}
-protected IIDEBeanProxy newBeanProxy(Object anObject){
-
- return new IDEPointBeanProxy(fProxyFactoryRegistry, anObject, this);
-
-}
-IDEPointBeanProxy createPointBeanProxy(int x, int y){
- return new IDEPointBeanProxy(fProxyFactoryRegistry,new Point(x,y),this);
-}
- /*
- * @see IDEBeanTypeProxy#newBeanTypeForClass(Class)
- */
- public IDEBeanTypeProxy newBeanTypeForClass(Class type) {
- return new IDEPointBeanTypeProxy(fProxyFactoryRegistry, type);
- }
-
-}
diff --git a/plugins/org.eclipse.jem.proxy/proxyide/org/eclipse/jem/internal/proxy/ide/awt/IDERectangleBeanProxy.java b/plugins/org.eclipse.jem.proxy/proxyide/org/eclipse/jem/internal/proxy/ide/awt/IDERectangleBeanProxy.java
deleted file mode 100644
index baa2f6f..0000000
--- a/plugins/org.eclipse.jem.proxy/proxyide/org/eclipse/jem/internal/proxy/ide/awt/IDERectangleBeanProxy.java
+++ /dev/null
@@ -1,73 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2001, 2005 IBM Corporation and others.
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
- *
- * Contributors:
- * IBM Corporation - initial API and implementation
- *******************************************************************************/
-package org.eclipse.jem.internal.proxy.ide.awt;
-/*
-
-
- */
-
-import java.awt.Rectangle;
-
-import org.eclipse.jem.internal.proxy.core.*;
-import org.eclipse.jem.internal.proxy.ide.IDEObjectBeanProxy;
-import org.eclipse.jem.internal.proxy.ide.IDEProxyFactoryRegistry;
-
-public class IDERectangleBeanProxy extends IDEObjectBeanProxy implements IRectangleBeanProxy {
-
- protected Rectangle fRectangle;
-
-IDERectangleBeanProxy(IDEProxyFactoryRegistry aRegistry,Object aRectangle, IBeanTypeProxy aBeanTypeProxy){
- super(aRegistry,aRectangle,aBeanTypeProxy);
- fRectangle = (Rectangle)aRectangle;
-}
-public int getX(){
- return fRectangle.x;
-}
-public void setX(int anX){
- fRectangle.x = anX;
-}
-public int getY(){
- return fRectangle.y;
-}
-public void setY(int aY){
- fRectangle.y = aY;
-}
-public int getHeight(){
- return fRectangle.height;
-}
-public void setHeight(int aHeight){
- fRectangle.height = aHeight;
-}
-public void setWidth(int aWidth){
- fRectangle.width = aWidth;
-}
-public int getWidth(){
- return fRectangle.width;
-}
-public void setBounds(IRectangleBeanProxy aBeanProxy){
- fRectangle.setBounds(aBeanProxy.getX(),aBeanProxy.getY(),aBeanProxy.getWidth(),aBeanProxy.getHeight());
-}
-public void setBounds(int x, int y, int width, int height){
- fRectangle.setBounds(x,y,width,height);
-}
-public void setSize(IDimensionBeanProxy aBeanProxy){
- fRectangle.setSize(aBeanProxy.getWidth(),aBeanProxy.getWidth());
-}
-public void setLocation(IPointBeanProxy aBeanProxy){
- fRectangle.setLocation(aBeanProxy.getX(),aBeanProxy.getY());
-}
-public void setLocation(int x, int y){
- fRectangle.setLocation(x,y);
-}
-public void setSize(int width, int height){
- fRectangle.setSize(width,height);
-}
-}
diff --git a/plugins/org.eclipse.jem.proxy/proxyide/org/eclipse/jem/internal/proxy/ide/awt/IDERectangleBeanTypeProxy.java b/plugins/org.eclipse.jem.proxy/proxyide/org/eclipse/jem/internal/proxy/ide/awt/IDERectangleBeanTypeProxy.java
deleted file mode 100644
index fd53317..0000000
--- a/plugins/org.eclipse.jem.proxy/proxyide/org/eclipse/jem/internal/proxy/ide/awt/IDERectangleBeanTypeProxy.java
+++ /dev/null
@@ -1,45 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2001, 2005 IBM Corporation and others.
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
- *
- * Contributors:
- * IBM Corporation - initial API and implementation
- *******************************************************************************/
-package org.eclipse.jem.internal.proxy.ide.awt;
-/*
-
-
- */
-
-import java.awt.Rectangle;
-
-import org.eclipse.jem.internal.proxy.ide.*;
-
-public class IDERectangleBeanTypeProxy extends IDEBeanTypeProxy {
-
-IDERectangleBeanTypeProxy(IDEProxyFactoryRegistry aRegistry){
- this(aRegistry,Rectangle.class);
-}
-
-private IDERectangleBeanTypeProxy(IDEProxyFactoryRegistry aRegistry, Class type){
- super(aRegistry,type);
-}
-protected IIDEBeanProxy newBeanProxy(Object anObject){
-
- return new IDERectangleBeanProxy(fProxyFactoryRegistry, anObject, this);
-
-}
-IDERectangleBeanProxy createRectangleBeanProxy(int x, int y, int width, int height){
- return new IDERectangleBeanProxy(fProxyFactoryRegistry,new Rectangle(x,y,width,height),this);
-}
- /*
- * @see IDEBeanTypeProxy#newBeanTypeForClass(Class)
- */
- public IDEBeanTypeProxy newBeanTypeForClass(Class type) {
- return new IDERectangleBeanTypeProxy(fProxyFactoryRegistry, type);
- }
-
-}
diff --git a/plugins/org.eclipse.jem.proxy/proxyide/org/eclipse/jem/internal/proxy/ide/awt/IDERegisterAWT.java b/plugins/org.eclipse.jem.proxy/proxyide/org/eclipse/jem/internal/proxy/ide/awt/IDERegisterAWT.java
deleted file mode 100644
index 657487c..0000000
--- a/plugins/org.eclipse.jem.proxy/proxyide/org/eclipse/jem/internal/proxy/ide/awt/IDERegisterAWT.java
+++ /dev/null
@@ -1,29 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2001, 2005 IBM Corporation and others.
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
- *
- * Contributors:
- * IBM Corporation - initial API and implementation
- *******************************************************************************/
-package org.eclipse.jem.internal.proxy.ide.awt;
-/*
-
-
- */
-
-
-import org.eclipse.jem.internal.proxy.ide.IDEProxyFactoryRegistry;
-/**
- * This class is used to register the AWT factories.
- */
-public final class IDERegisterAWT {
- public static void registerAWT(IDEProxyFactoryRegistry registry) {
- new IDEStandardAWTBeanTypeProxyFactory(registry);
- new IDEStandardAWTBeanProxyFactory(registry);
- }
-}
-
-
diff --git a/plugins/org.eclipse.jem.proxy/proxyide/org/eclipse/jem/internal/proxy/ide/awt/IDEStandardAWTBeanProxyFactory.java b/plugins/org.eclipse.jem.proxy/proxyide/org/eclipse/jem/internal/proxy/ide/awt/IDEStandardAWTBeanProxyFactory.java
deleted file mode 100644
index 77c36f9..0000000
--- a/plugins/org.eclipse.jem.proxy/proxyide/org/eclipse/jem/internal/proxy/ide/awt/IDEStandardAWTBeanProxyFactory.java
+++ /dev/null
@@ -1,47 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2001, 2005 IBM Corporation and others.
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
- *
- * Contributors:
- * IBM Corporation - initial API and implementation
- *******************************************************************************/
-package org.eclipse.jem.internal.proxy.ide.awt;
-/*
-
-
- */
-
-
-import org.eclipse.jem.internal.proxy.awt.*;
-import org.eclipse.jem.internal.proxy.core.*;
-import org.eclipse.jem.internal.proxy.ide.IDEProxyFactoryRegistry;
-/**
- * Standard AWT Bean Proxy Factory.
- * Package protected because it should not referenced
- * outside of the package other than through the interface.
- */
-class IDEStandardAWTBeanProxyFactory implements IStandardAwtBeanProxyFactory {
-
- final IDEStandardAWTBeanTypeProxyFactory fAWTBeanTypeFactory;
-
-public IDEStandardAWTBeanProxyFactory(IDEProxyFactoryRegistry factory) {
- factory.registerBeanProxyFactory(IStandardAwtBeanProxyFactory.REGISTRY_KEY, this);
- fAWTBeanTypeFactory = (IDEStandardAWTBeanTypeProxyFactory)factory.getBeanTypeProxyFactoryExtension(IDEStandardAWTBeanTypeProxyFactory.BEAN_TYPE_FACTORY_KEY);
-}
-public IDimensionBeanProxy createDimensionBeanProxyWith(int width, int height){
- return fAWTBeanTypeFactory.dimensionType.createDimensionBeanProxy(width,height);
-}
-
-public IPointBeanProxy createPointBeanProxyWith(int x, int y){
- return fAWTBeanTypeFactory.pointType.createPointBeanProxy(x,y);
-}
-public IRectangleBeanProxy createBeanProxyWith(int x, int y, int width, int height){
- return fAWTBeanTypeFactory.rectangleType.createRectangleBeanProxy(x,y,width,height);
-}
-public void terminateFactory(boolean wait) {
-}
-}
-
diff --git a/plugins/org.eclipse.jem.proxy/proxyide/org/eclipse/jem/internal/proxy/ide/awt/IDEStandardAWTBeanTypeProxyFactory.java b/plugins/org.eclipse.jem.proxy/proxyide/org/eclipse/jem/internal/proxy/ide/awt/IDEStandardAWTBeanTypeProxyFactory.java
deleted file mode 100644
index e98a622..0000000
--- a/plugins/org.eclipse.jem.proxy/proxyide/org/eclipse/jem/internal/proxy/ide/awt/IDEStandardAWTBeanTypeProxyFactory.java
+++ /dev/null
@@ -1,85 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2001, 2005 IBM Corporation and others.
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
- *
- * Contributors:
- * IBM Corporation - initial API and implementation
- *******************************************************************************/
-/*
-
-
- */
-package org.eclipse.jem.internal.proxy.ide.awt;
-
-import org.eclipse.jem.internal.proxy.core.*;
-import org.eclipse.jem.internal.proxy.ide.*;
-
-/**
- * BeanType factory standard AWT bean types. This is package protected because it shouldn't be referenced outside the package. It should only be
- * accessed through the interface.
- */
-class IDEStandardAWTBeanTypeProxyFactory implements IDEExtensionBeanTypeProxyFactory {
-
- static final String BEAN_TYPE_FACTORY_KEY = "java.awt"; //$NON-NLS-1$
-
- protected final IDEProxyFactoryRegistry fFactoryRegistry;
-
- protected final IDEDimensionBeanTypeProxy dimensionType;
-
- protected final IDEPointBeanTypeProxy pointType;
-
- protected final IDERectangleBeanTypeProxy rectangleType;
-
- IDEStandardAWTBeanTypeProxyFactory(IDEProxyFactoryRegistry aRegistry) {
- fFactoryRegistry = aRegistry;
- fFactoryRegistry.registerBeanTypeProxyFactory(BEAN_TYPE_FACTORY_KEY, this);
- dimensionType = new IDEDimensionBeanTypeProxy(fFactoryRegistry);
- pointType = new IDEPointBeanTypeProxy(fFactoryRegistry);
- rectangleType = new IDERectangleBeanTypeProxy(fFactoryRegistry);
- }
-
- /*
- * (non-Javadoc)
- * @see org.eclipse.jem.internal.proxy.ide.IDEExtensionBeanTypeProxyFactory#getExtensionBeanTypeProxy(java.lang.String)
- */
- public IDEBeanTypeProxy getExtensionBeanTypeProxy(String className) {
-
- if ("java.awt.Dimension".equals(className)) //$NON-NLS-1$
- return dimensionType;
- else if ("java.awt.Point".equals(className)) //$NON-NLS-1$
- return pointType;
- else if ("java.awt.Rectangle".equals(className)) //$NON-NLS-1$
- return rectangleType;
- else
- return null;
- }
-
- /*
- * (non-Javadoc)
- * @see org.eclipse.jem.internal.proxy.ide.IDEExtensionBeanTypeProxyFactory#getExtensionBeanTypeProxy(java.lang.String, org.eclipse.jem.internal.proxy.core.IBeanTypeProxy)
- */
- public IDEBeanTypeProxy getExtensionBeanTypeProxy(String className, IBeanTypeProxy beanTypeProxy) {
-
- return getExtensionBeanTypeProxy(className);
- }
-
- /*
- * (non-Javadoc)
- *
- * @see org.eclipse.jem.internal.proxy.ide.IDEExtensionBeanTypeProxyFactory#getExtensionBeanTypeProxy(java.lang.String,
- * org.eclipse.jem.internal.proxy.core.IExpression)
- */
- public IProxyBeanType getExtensionBeanTypeProxy(String typeName, IExpression expression) {
- return getExtensionBeanTypeProxy(typeName);
- }
-
- /*
- * (non-Javadoc)
- * @see org.eclipse.jem.internal.proxy.core.IBeanProxyFactory#terminateFactory(boolean)
- */
- public void terminateFactory(boolean wait) {
- }
-}
diff --git a/plugins/org.eclipse.jem.proxy/remoteCommon/org/eclipse/jem/internal/proxy/common/remote/CommandErrorException.java b/plugins/org.eclipse.jem.proxy/remoteCommon/org/eclipse/jem/internal/proxy/common/remote/CommandErrorException.java
deleted file mode 100644
index 49979b9..0000000
--- a/plugins/org.eclipse.jem.proxy/remoteCommon/org/eclipse/jem/internal/proxy/common/remote/CommandErrorException.java
+++ /dev/null
@@ -1,76 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2001, 2005 IBM Corporation and others.
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
- *
- * Contributors:
- * IBM Corporation - initial API and implementation
- *******************************************************************************/
-package org.eclipse.jem.internal.proxy.common.remote;
-/*
-
-
- */
-
-import org.eclipse.jem.internal.proxy.common.CommandException;
-/**
- * An error return from a command. This is clean return in that
- * the connection is still valid and alive.
- * After it has been processed the data will be the value retrieved
- * out of the valueobject and made into a proxy.
- */
-public class CommandErrorException extends CommandException {
- /**
- * Comment for <code>serialVersionUID</code>
- *
- * @since 1.1.0
- */
- private static final long serialVersionUID = 1701752035606593305L;
- private final Object fErrorObject;
- private final int fErrorCode;
-
- public CommandErrorException(int errorCode, Commands.ValueObject errorData) {
- super(errorData.clone()); // Clone it because typically these get reused and cleared out. This way we have our own.
- fErrorObject = null;
- fErrorCode = errorCode;
- }
-
- public CommandErrorException(String msg, int errorCode, Commands.ValueObject errorData, Object errorObject) {
- super(msg, errorData.clone());
- fErrorObject = errorObject;
- fErrorCode = errorCode;
- }
-
- public Commands.ValueObject getValue() {
- return (Commands.ValueObject) getExceptionData();
- }
-
- public boolean isRecoverable() {
- return true; // Command errors are recoverable.
- }
-
- /**
- * Return the error code.
- */
- public int getErrorCode() {
- return fErrorCode;
- }
-
- /**
- * Return the error object after conversion to proxy format.
- */
- public Object getErrorObject() {
- return fErrorObject;
- }
-
-
- /* (non-Javadoc)
- * @see java.lang.Object#toString()
- */
- public String toString() {
- return super.toString() + "-- Error code:"+getErrorCode() + (getValue() != null ? " Value data:\"" + getValue().getAsObject() + "\"" : " ") + (fErrorObject != null ? " Error object:\""+fErrorObject.toString()+"\"" : " "); //$NON-NLS-1$ //$NON-NLS-2$ //$NON-NLS-3$ //$NON-NLS-4$ //$NON-NLS-5$ //$NON-NLS-6$ //$NON-NLS-7$
- }
-
-}
diff --git a/plugins/org.eclipse.jem.proxy/remoteCommon/org/eclipse/jem/internal/proxy/common/remote/Commands.java b/plugins/org.eclipse.jem.proxy/remoteCommon/org/eclipse/jem/internal/proxy/common/remote/Commands.java
deleted file mode 100644
index d846925..0000000
--- a/plugins/org.eclipse.jem.proxy/remoteCommon/org/eclipse/jem/internal/proxy/common/remote/Commands.java
+++ /dev/null
@@ -1,1450 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2001, 2005 IBM Corporation and others.
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
- *
- * Contributors:
- * IBM Corporation - initial API and implementation
- *******************************************************************************/
-package org.eclipse.jem.internal.proxy.common.remote;
-/*
-
-
- */
-
-import java.io.*;
-
-import org.eclipse.jem.internal.proxy.common.CommandException;
-/**
- * The commands that can be passed back and forth between
- * client and server. And other constants.
- *
- * - Contains helper methods for reading/writing commands.
- */
-public class Commands {
- // The commands will be written in writeByte format .
- public final static byte
- GET_CLASS = 1, // Get the class object,
- VALUE = 2, // Returning a value
- QUIT_CONNECTION = 4, // Close this connection
- TERMINATE_SERVER = 5, // Terminate the entire server.
- ERROR = 6, // Returning an error
- RELEASE_OBJECT = 7, // An object is no longer needed on the client side, so
- // it can be removed from the server id table and released.
- GET_CLASS_RETURN = 8, // The return command from GET_CLASS
- // Obsolete, not used anymore GET_METHOD = 9, // Return the id for a method
- // Obsolete, not used anymore GET_CTOR = 10, // Return the id for a constructor
- NEW_INIT_STRING = 11, // Create a new bean using the init string
- GET_CLASS_FROM_ID = 12, // We have an ID, return the class info for this id.
- GET_CLASS_ID_RETURN = 13, // The return command from GET_CLASS_FROM_ID
- GET_OBJECT_DATA = 14, // We have an ID, but we don't have the info, return it. This is a
- // corrective command only. This would happen if for some strange
- // reason the proxy has been removed but has not been released. This
- // really shouldn't happen except as a possible race condition between
- // GC and returning id from the server.
- INVOKE = 15, // Invoke a method.
-
-
- // These commands are to the Master Server thread in the IDE.
- ALIVE = 16, // Are you alive?
- REMOTE_STARTED = 17, // Remote VM has started.
- ATTACH_CALLBACK = 18, // Attach to a callback thread on the IDE side. The remote vm will use its socket as the callback socket.
- // it will return boolean <code>true</code> if attach worked or <code>false</code> if it failed.
-
- // These are more regular commands. They were historically added after the master server thread commands, so
- // they are shown here after them and with numbers greater than them.
- EXPRESSION_TREE_COMMAND = 19, // An expression tree subcommand has come in.
- INVOKE_WITH_METHOD_PASSED = 20, // Invoke where the description of the method is passed in with the command.
- GET_ARRAY_CONTENTS = 21; // Get the first dimension contents as an array of ids and send them back.
-
-
- // Callback commands
- public final static byte
- CALLBACK = (byte) 255, // A callback has come in.
- CALLBACK_DONE = (byte) 254, // A callback done command, sent to the remote vm upon callback completion.
- CALLBACK_STREAM = (byte) 253, // A callback for a byte stream has come in.
- // This is a special callback. When this comes in a special
- // input stream will be created that will take over control of
- // the connection until the stream is terminated on the remote
- // side. At this time the connection will be returned.
- CALLBACK_STREAM_TERMINATE = (byte) 252; // A callback stream is asked to terminate early.
-
- // The error values from the command on the server.
- public final static int
- NO_ERROR = 0, // No error status.
- UNKNOWN_COMMAND_SENT = 1, // An unknown command was sent to the server. Value is void.
- GET_CLASS_NOT_FOUND = 2, // The class was not found in GetClass. Value is void.
- CANNOT_EVALUATE_STRING = 3, // Evaluator couldn't evaluate the init string. Too complicated. Value is a throwable of the wrappered Init string error.
- CLASS_CAST_EXCEPTION = 4, // The result is not assignable to the expected type. Value is void.
- GET_METHOD_NOT_FOUND = 5, // Method requested wasn't found. Value is void.
- THROWABLE_SENT = 6, // A Throwable is being sent back as the error, not as just data for the error. Value is the Throwable.
- CALLBACK_RUNTIME_EXCEPTION = 7, // A runtime exception occurred during a callback. The data is the message.
- CALLBACK_NOT_REGISTERED = 8,
- MAX_ERROR_CODE = CALLBACK_NOT_REGISTERED; // This is just the max code. Not actually sent. Used as a flag.
-
- // Predefined standard id's for standard classes/objects. Both sides will assume these id's have been assigned
- // to these classes/types/objects
- public final static int
- NOT_AN_ID = -1, // This value means it is not an id. It is never a valid id.
- VOID_TYPE = 0,
- BOOLEAN_TYPE = 1,
- BOOLEAN_CLASS = 2,
- INTEGER_TYPE = 3,
- INTEGER_CLASS = 4,
- BYTE_TYPE = 5,
- BYTE_CLASS = 6,
- CHARACTER_TYPE = 7,
- CHARACTER_CLASS = 8,
- DOUBLE_TYPE = 9,
- DOUBLE_CLASS = 10,
- FLOAT_TYPE = 11,
- FLOAT_CLASS = 12,
- SHORT_TYPE = 13,
- SHORT_CLASS = 14,
- LONG_TYPE = 15,
- LONG_CLASS = 16,
- STRING_CLASS = 17,
- BIG_DECIMAL_CLASS = 18,
- BIG_INTEGER_CLASS = 19,
- NUMBER_CLASS = 20,
- THROWABLE_CLASS = 21,
- CLASS_CLASS = 22,
- OBJECT_CLASS = 23,
- ACCESSIBLEOBJECT_CLASS = 24,
- METHOD_CLASS = 25,
- FIELD_CLASS = 26,
- CONSTRUCTOR_CLASS = 27,
- GET_METHOD_ID = 28, // Class.getMethod(...) predefined id.
- IVMSERVER_CLASS = 29, // IVMServer.class
- ICALLBACK_CLASS = 30, // ICallback.class
- REMOTESERVER_ID = 31, // id of RemoteVMServerThread instance.
- REMOTEVMSERVER_CLASS = 32, // RemoteVMServer.class
- INITIALIZECALLBACK_METHOD_ID = 33, // ICallback.initializeCallback method.
- THREAD_CLASS = 34,
- EXPRESSIONPROCESSERCONTROLLER_CLASS = 35,
- FIRST_FREE_ID = 36;
-
- // The type flags written in writeByte format
- public final static byte
- VOID = VOID_TYPE, // null - nothing follows
- BYTE = BYTE_TYPE, // byte - writeByte
- L_BYTE = BYTE_CLASS, // java.lang.Byte - writeByte
- CHAR = CHARACTER_TYPE, // char - writeChar
- L_CHAR = CHARACTER_CLASS, // java.lang.Character - writeChar
- DOUBLE = DOUBLE_TYPE, // double - writeDouble
- L_DOUBLE = DOUBLE_CLASS, // java.lang.Double - writeDouble
- FLOAT = FLOAT_TYPE, // float - writeFloat
- L_FLOAT = FLOAT_CLASS, // java.lang.Float - writeFloat
- INT = INTEGER_TYPE, // int - writeInt
- L_INT = INTEGER_CLASS, // java.lang.Integer - writeInt
- LONG = LONG_TYPE, // long - writeLong
- L_LONG = LONG_CLASS, // java.lang.Long - writeLong
- SHORT = SHORT_TYPE, // short - writeShort
- L_SHORT = SHORT_CLASS, // java.lang.Short - writeShort
- BOOL = BOOLEAN_TYPE, // boolean - writeBoolean
- L_BOOL = BOOLEAN_CLASS, // java.lang.Boolean - writeBoolean
- STRING = STRING_CLASS, // java.lang.String - writeUTF
- OBJECT = OBJECT_CLASS, // Object - special, see below (Object can be used to return an array (except if the array contains any object_ids, that has a special type)
- OBJECT_ID = 50, // Object identity key - writeInt
- NEW_OBJECT_ID = 51, // New Object identity (this is a new object that didn't exist before)
- THROW = 52, // An exception occured. The value is a throwable, it is of the same format as NEW_OBJECT_ID.
- ARRAY_IDS = 53, // An array of values, where there are at least one ID in the array. If there were no
- // ID's (i.e. all just values), then use OBJECT type intead and have it written as
- // writeObject.
- FLAG = 54; // The value is a flag int. If this is allowed on a read, the anInt field will contain the flag value.
-
-
-
- // Unless specified below, the commands are one byte long.
- // Also, unless specified below, the commands do not return a confirmation response.
- //
- // NOTE: VERY IMPORTANT, after every command, flush() should be used so that the
- // the data is immediately sent to the server.
- //
- // n means int (e.g. 1)
- // nb means byte (e.g. 1b)
- // 'x' means Unicode char (i.e. writeChar())
- // "xxx" means UTF8 string (i.e. writeUTF)
- // bool means a one byte boolean value
- //
- // The commas aren't actually written, they are used as separaters in the comments below
- //
- // GET_CLASS: 1b, "classname"
- // Will return on the output stream GET_CLASS_RETURN command:
- // 8b, n1, bool1, bool2, "superclassname"
- // The "n1" is the class id.
- // The bool1 is whether this class is an interface (true if it is).
- // The bool2 is whether this class is abstract (true if it is).
- // The "superclassname" is the class name of the super class (0 length if no superclass)
- // If the class is not found, then it will return an error with a value for the error.
- //
- // GET_CLASS_FROM_ID: 12b, n
- // Where "n" is the class id.
- // Will return on the output stream GET_CLASS_ID_RETURN command:
- // 13b, "classname", bool1, bool2, "superclassname"
- // The bool1 is whether this class is an interface (true if it is).
- // The bool2 is whether this class is abstract (true if it is).
- //
- // VALUE: 2b, tb, value
- // Where tb is the type in byte, and value is the appropriate value shown in
- // table above.
- // OBJECT_ID: 50b, n
- // Where "n" is the object id.
- // NEW_OBJECT_ID: 51b, n1, n2
- // Where "n1" is class ObjectID of the object that the object_id ("n2") is made of.
- // OBJECT: 19b, n, writeObject
- // Where "n" is the classObjectID of the class of the type of the object.
- // NOTE: Object should be used only very rarely. Identity is lost, i.e.
- // a copy is made each time and it can't be referenced back on the remote
- // VM.
- // ARRAY_IDS: 52b, id, n, [tb, value, ...]
- // This is a very special array. It contains at least one ID. Therefor all of the
- // First level entries are value objects.
- // "id" is the id of the component type of the array(e.g. id for Object, or if multi-dimensional String[] (this will produce String[][]).
- // "n" is the number of entries in the array. Followed by the values, one of the
- // values could be an ARRAY_IDS too. The reading/writing of these are special because
- // there is a callback mechanism to process the individual entries. This is so that
- // temp arrays of ValueObjects won't need to be created to handle this, so it can
- // go directly from the array to/from the stream.
- //
- // RELEASE_OBJECT: 7b, n
- // Where the n is the object id to release. There is no confirmation to read back.
- //
- // ERROR: 6b, n, tb, ...
- // n is the error code for this error.
- // tb is a type flag, followed by the value. The value is dependent upon
- // the command that this is error is from. If a THROW, then the THROW is ALWAYS a new
- // ID, it can never be an existing id.
- //
- //
- // TO_BEAN_STRING: 9b, n
- // Where n is the object id to produce the bean string for.
- // It will return a VALUE command where the type is String.
- //
- // NEW_INSTANCE: 10b, n
- // Where n is the class object id of the class to create a new instance of using the default ctor.
- // It will return either a VALUE command containing the new value (of type OBJECT_ID/NEW_OBJECT_ID if not
- // one of the constant types with the true classID in it) or an ERROR command. (The ERROR could
- // be a THROW type). If the object created is not assignable to the type passed in, then
- // an ERROR is returned with CLASS_CAST_EXCEPTION flag.
- //
- // NEW_INIT_STRING: 11b, n, "initstring"
- // Where n is the class object id of the class this initstring is supposed to create for.
- // It will return either a VALUE command containing the new value (of type OBJECT_ID/NEW_OBJECT_ID if not
- // one of the constant types with the true classID in it) or an ERROR command. (The ERROR could
- // be a THROW type). The error could also be CANNOT_EVALUATE_STRING. This means that the string was too
- // complicated for the evaluator and needs to be compiled and tried again. (TBD)
- // If the object created is not assignable to the type passed in, then
- // an ERROR is returned with CLASS_CAST_EXCEPTION flag.
- //
- // GET_OBJECT_DATA: 14b, n
- // Where n is the id of the object being requested. It will return a NEW_OBJECT_ID value with the info.
- //
- // GET_METHOD: 9b, classId, "methodName", n1, [n2]...
- // Where classID is the id of the class the method should be found in.
- // Where n1 is the number of parm types following, and n2 is replicated that many times,
- // each entry is the id of class for the parm type. (0 is valid which means there are no parms).
- // The return will be a VALUE command containing the OBJECT_ID of the method.
- //
- // GET_CTOR: 10b, classId, n1, [n2]...
- // Where classID is the id of the class the method should be found in.
- // Where n1 is the number of parm types following, and n2 is replicated that many times,
- // each entry is the id of class for the parm type. (0 is valid which means there are no parms).
- // The return will be a VALUE command containing the OBJECT_ID of the method.
- //
- // GET_FIELD:
- //
- // GET_CTOR:
- //
- // INVOKE: 15b, n1, tb, value1, value2
- // Where "n1" is the id of the method to invoke.
- // tb, value1 is the value of who to invoke against (it is usually an OBJECT_ID for tb)
- // value2 is an ARRAY_IDS type or an OBJECT array of values if all constants.
- // What is returned is a VALUE command containing the return value, (the value will be null (VOID) if
- // there is no return type (i.e. the method was void). So null can be returned either if the value
- // was null or if the return type was void.
- //
- // EXPRESSION_TREE_COMMAND: 20b, n, b
- // Receiving an expression tree subcommand. Where "n" is a unique id number of the
- // expression being processed. Where "b" is byte code, defined in ExpressionCommands, that
- // determines the type of expression tree commands.
- // There can be more data following, but it is read by the
- // ExpressionProcesserController, not by the connection. See the controller for the subcommands.
- //
- // The id number is the id of the expression being processed. This allows more than one expression
- // to be processed at a time from this connection.
- //
- // @see ExpressionCommands
- // @see ExpressionProcessController
- //
- // INVOKE_WITH_METHOD_PASSED: 20b, classId, "methodName", value0, tb, value1, value2
- // Where classID is the id of the class the method should be found in.
- // value0 is an ARRAY_IDS type for the type of the parms, or null type for no parms.
- // tb, value1 is the value of who to invoke against (it is usually an OBJECT_ID for tb)
- // value2 is an ARRAY_IDS type or an OBJECT array of values if all constants.
- // What is returned is a VALUE command containing the return value, (the value will be null (VOID) if
- // there is no return type (i.e. the method was void). So null can be returned either if the value
- // was null or if the return type was void.
- //
- // GET_ARRAY_CONTENTS: 21b, arrayId
- // Where arrayID is the id of the array to get the contents of. What is returned is a value command
- // containing an array of ids of the first dimension contents.
- //
- // Callback commands:
- //
- // CALLBACK: 255b, n1, n2, value1
- // Where
- // "n1" is the id of callback type (these are registered with the callback server)
- // "n2" is the msgId for the callback (These are entirely callback dependent and are maintained by the callback developer)
- // value1 is an ARRAY_IDS type or an OBJECT array of values if all constants. These are
- // parms to send to the callback msg.
- // It will return a CALLBACK_DONE.
- //
- // CALLBACK_DONE: 254b, value command.
- // What comes back is a value command (i.e. Commands.VALUE followed by value). This allows
- // ERRORS to be sent back too.
- //
- // CALLBACK_STREAM: 253b, n1, n2
- // Where
- // "n1" is the id of callback type (these are registered with the callback server)
- // "n2" is the msgId for the callback (These are entirely callback dependent and are maintained by the callback developer)
- // It will create a CallbackInputStream and notify the registered callback that the
- // stream is available. It will send a callback_done when it has accepted the request
- // but before it notifies the registered callback with the stream. This lets the remote
- // vm know that it can start sending data.
-
-
- // To the MasterServer socket:
- // The MasterServer socket will expect input in DataInputStream format, and DataOutputStream for return.
- // The socket will be short-lived. It will be for one transaction only. Each request will return a new socket.
- //
- // ALIVE: 16b, n1
- // Where
- // "n1" is the id of the registry this is asking to test for aliveness
- // Will return bool, where false if registry is not alive, true if it is alive.
- // REMOTE_STARTED: 17b, n1, n2
- // Where
- // "n1" is the id of the registry this is telling that it is started
- // "n2" is the serversocket port number of the server socket in this remote vm.
- // Will return bool, where false if registry is not alive, true if it is alive. If false, then terminate the server because nothing to talk to.
- // GET_CALLBACK_PORT: 18b, n1
- // Where
- // "n1" is the id of the registry this is asking for the callback server port.
- // Will return int, where the value is the callback server port number. -1 if there is no callback server port.
-
- /**
- * This class is the return from a read value. It contains the
- * type of the value and the value itself. Since primitives can be
- * returned also, there is a slot for each one and the type should
- * be checked to see which one is set.
- *
- * Also, if the type is OBJECT, then the anObject has the object in it, AND
- * the classID field has the object_id of the class of the object so that the
- * appropriate beantypeproxy can be found to use that object. Also, only
- * IREMConstantBeanTypeProxies can be of type OBJECT. That is because those
- * are the only ones that know how to take the value object and interpret it.
- *
- * If the type is OBJECT_ID or NEW_OBJECT_ID, then the objectID field will be set with
- * the id.
- * If the type is NEW_OBJECT_ID, then the classID field will
- * have the class objectID of the class of the object for which object_id proxies.
- *
- * THROW is treated like NEW_OBJECT_ID in what fields are set since it is a new object.
- *
- * Note: so as not to create unnecessary objects, if the Object type of the primitive is being
- * sent, then the primitive field will be set instead, though the type
- * will still be the Object type (i.e. if type = L_BYTE, the aByte will
- * have the value in it).
- *
- * Note: Also flags can be send back. The type will be FLAG and the anInt field will be the
- * flag value. This is used to indicate special things that aren't values. Most useful in
- * arrays where one of the entries is not a value. This can only be used if readValue
- * is passed a flag indicating flags are valid, otherwise it will be treated as not valie.
- */
- public static class ValueObject implements Cloneable {
- public byte type; // Same as the types above
- public byte aByte;
- public char aChar;
- public double aDouble;
- public float aFloat;
- public int anInt;
- public short aShort;
- public long aLong;
- public boolean aBool;
- public int objectID; // The object id for either OBJECT_ID or NEW_OBJECT_ID.
- public int classID; // The class object id of the value in Object if the type is Object
- public Object anObject; // String also will be in here
-
- public ValueObject() {
- type = VOID;
- }
-
- public Object clone() {
- try {
- return super.clone();
- } catch (CloneNotSupportedException e) {
- return null;
- }
- }
-
- /**
- * Return whether the value stored here is a primitive.
- *
- * @return <code>true</code> if value is a primitive type.
- *
- * @since 1.0.0
- */
- public boolean isPrimitive() {
- return getPrimitiveType().isPrimitive();
- }
-
- /**
- * Get the primitive type of the value.
- * @return The primitive type, or if not primitive, it returns simply <code>Object.class</code>.
- *
- * @since 1.0.0
- */
- public Class getPrimitiveType() {
- switch (type) {
- case BYTE:
- return Byte.TYPE;
- case CHAR:
- return Character.TYPE;
- case DOUBLE:
- return Double.TYPE;
- case FLOAT:
- return Float.TYPE;
- case INT:
- return Integer.TYPE;
- case SHORT:
- return Short.TYPE;
- case LONG:
- return Long.TYPE;
- case BOOL:
- return Boolean.TYPE;
- default:
- return Object.class;
- }
-
- }
-
- /**
- * Get the type as one of the valid Commands.Types. VOID, BYTE, L_BYTE, etc.
- * @return
- *
- * @since 1.1.0
- */
- public int getType() {
- return type;
- }
-
- /**
- * Special getter to get the type as an Object, this is used by invoke for example.
- */
- public Object getAsObject() {
- switch (type) {
- case VOID:
- return null;
- case BYTE:
- case L_BYTE:
- return new Byte(aByte);
- case CHAR:
- case L_CHAR:
- return new Character(aChar);
- case DOUBLE:
- case L_DOUBLE:
- return new Double(aDouble);
- case FLOAT:
- case L_FLOAT:
- return new Float(aFloat);
- case INT:
- case L_INT:
- return new Integer(anInt);
- case SHORT:
- case L_SHORT:
- return new Short(aShort);
- case LONG:
- case L_LONG:
- return new Long(aLong);
- case BOOL:
- case L_BOOL:
- return aBool ? Boolean.TRUE : Boolean.FALSE;
- case STRING:
- return anObject;
- case OBJECT:
- return anObject;
-
- default:
- return null; // Can't handle others. Those need to be checked before calling.
- }
- }
-
- /**
- * Special setter to set the value depending upon the type.
- */
- public void setAsObject(Object value, int valueClassID) {
- switch (valueClassID) {
- case VOID:
- set();
- break;
- case BYTE_CLASS:
- set((Byte) value);
- break;
- case CHARACTER_CLASS:
- set((Character) value);
- break;
- case DOUBLE_CLASS:
- set((Double) value);
- break;
- case FLOAT_CLASS:
- set((Float) value);
- break;
- case INTEGER_CLASS:
- set((Integer) value);
- break;
- case SHORT_CLASS:
- set((Short) value);
- break;
- case LONG_CLASS:
- set((Long) value);
- break;
- case BOOLEAN_CLASS:
- set((Boolean) value);
- break;
- case STRING_CLASS:
- set((String) value);
- break;
- default:
- set(value, valueClassID);
- break;
- }
- }
-
- public void set() {
- type = VOID;
- anObject = null;
- }
-
- public void setFlag(int flag) {
- type = FLAG;
- anInt = flag;
- }
-
- public void set(byte value) {
- type = BYTE;
- aByte = value;
- anObject = null;
- }
- public void set(Byte value) {
- if (value != null) {
- type = L_BYTE;
- aByte = value.byteValue();
- anObject = null;
- } else
- set();
- }
- public void set(char value) {
- type = CHAR;
- aChar = value;
- anObject = null;
- }
- public void set(Character value) {
- if (value != null) {
- type = L_CHAR;
- aChar = value.charValue();
- anObject = null;
- } else
- set();
- }
- public void set(double value) {
- type = DOUBLE;
- aDouble = value;
- anObject = null;
- }
- public void set(Double value) {
- if (value != null) {
- type = L_DOUBLE;
- aDouble = value.doubleValue();
- anObject = null;
- } else
- set();
- }
- public void set(float value) {
- type = FLOAT;
- aFloat = value;
- anObject = null;
- }
- public void set(Float value) {
- if (value != null) {
- type = L_FLOAT;
- aFloat = value.floatValue();
- anObject = null;
- } else
- set();
- }
- public void set(int value) {
- type = INT;
- anInt = value;
- anObject = null;
- }
- public void set(Integer value) {
- if (value != null) {
- type = L_INT;
- anInt = value.intValue();
- anObject = null;
- } else
- set();
- }
- public void set(short value) {
- type = SHORT;
- aShort = value;
- anObject = null;
- }
- public void set(Short value) {
- if (value != null) {
- type = L_SHORT;
- aShort = value.shortValue();
- anObject = null;
- } else
- set();
- }
- public void set(long value) {
- type = LONG;
- aLong = value;
- anObject = null;
- }
- public void set(Long value) {
- type = L_LONG;
- aLong = value.longValue();
- anObject = null;
- }
- public void set(boolean value) {
- type = BOOL;
- aBool = value;
- anObject = null;
- }
- public void set(Boolean value) {
- if (value != null) {
- type = L_BOOL;
- aBool = value.booleanValue();
- anObject = null;
- } else
- set();
- }
- public void set(String value) {
- if (value != null) {
- type = STRING;
- anObject = value;
- } else
- set();
- }
- public void set(Object value, int classObjectID) {
- if (value != null) {
- type = OBJECT;
- classID = classObjectID;
- anObject = value;
- } else
- set();
- }
- public void setObjectID(int value) {
- type = OBJECT_ID;
- objectID = value;
- anObject = null;
- }
-
- // Use this if the object is an array containing IDs. The retriever
- // will be used to get the next value to write to the stream.
- public void setArrayIDS(ValueRetrieve retriever, int arraySize, int componentType) {
- type = ARRAY_IDS;
- classID = componentType;
- anInt = arraySize;
- anObject = retriever;
- }
-
-
- // Use this if this is a new object so that we can get the correct class type.
- public void setObjectID(int value, int classObjectID) {
- type = NEW_OBJECT_ID;
- objectID = value;
- classID = classObjectID;
- anObject = null;
- }
-
- // Use this to indicate an exception occured.
- public void setException(int throwID, int throwClassID) {
- type = THROW;
- objectID = throwID;
- classID = throwClassID;
- anObject = null;
- }
- }
-
- /************************
- * Helpful commands.
- * - If a command throws any exception except CommandErrorException, or
- * UnexpectedCommandException with recoverable true, then the connection is in a bad state
- * and needs to be closed.
- ************************/
-
- /**
- * Use this to read a value (inputstream should be pointing to the type byte as the next byte to read).
- * The primitive fields of "value" will not be changed if they are not the
- * type of the value being read. However, anObject will be set to null.
- */
-
- /**
- * Error flags for UnexpectedCommandExceptions that can be thrown.
- */
- public static final Object UNKNOWN_READ_TYPE = "UNKNOWN_READ_TYPE"; // The read type byte was not a valid type //$NON-NLS-1$
- public static final Object UNKNOWN_WRITE_TYPE = "UNKNOWN_WRITE_TYPE"; // The write type byte was not a valid type //$NON-NLS-1$
- public static final Object TYPE_INVALID_FOR_COMMAND = "TYPE_INVALID_FOR_COMMAND"; // The data type read is not valid for this command //$NON-NLS-1$
- public static final Object UNKNOWN_COMMAND = "UNKNOWN_COMMAND"; // The command flag is unknown //$NON-NLS-1$
- public static final Object SOME_UNEXPECTED_EXCEPTION = "SOME_UNEXPECTED_EXCEPTION"; // There was some kind of exception that wasn't expected. The data will be the exception. //$NON-NLS-1$
- public static final Object TOO_MANY_BYTES = "TOO_MANY_BYTES"; // Too many bytes were sent on a writeBytes. It was //$NON-NLS-1$
- // more than could be read into the buffer. The data will be the size sent.
-
- /**
- * Read a value from the stream into the value object. It will not allow values of type FLAG.
- *
- * @param is
- * @param value
- * @param allowFlag
- * @return the value object sent in. This allows <code>value = Commands.readValue(is, new Commands.ValueObject());</code>
- * @throws CommandException
- *
- *
- * @since 1.0.0
- */
- public static ValueObject readValue(DataInputStream is, ValueObject value) throws CommandException {
- readValue(is, value, false);
- return value;
- }
-
- /**
- * Read a value from the stream into the value object. It will allow values of type FLAG if allowFlag is true.
- * @param is
- * @param value
- * @param allowFlag <code>true</code> if values of type flag are allow.
- * @throws CommandException
- *
- * @since 1.1.0
- */
- public static void readValue(DataInputStream is, ValueObject value, boolean allowFlag) throws CommandException {
- try {
- value.anObject = null;
- value.type = is.readByte();
- switch (value.type) {
- case BYTE:
- case L_BYTE:
- value.aByte = is.readByte();
- break;
- case CHAR:
- case L_CHAR:
- value.aChar = is.readChar();
- break;
- case DOUBLE:
- case L_DOUBLE:
- value.aDouble = is.readDouble();
- break;
- case FLOAT:
- case L_FLOAT:
- value.aFloat = is.readFloat();
- break;
- case INT:
- case L_INT:
- value.anInt = is.readInt();
- break;
- case OBJECT_ID:
- value.objectID = is.readInt();
- break;
- case NEW_OBJECT_ID:
- value.classID = is.readInt();
- value.objectID = is.readInt();
- break;
- case THROW:
- value.classID = is.readInt();
- value.objectID = is.readInt();
- break;
- case SHORT:
- case L_SHORT:
- value.aShort = is.readShort();
- break;
- case LONG:
- case L_LONG:
- value.aLong = is.readLong();
- break;
- case BOOL:
- case L_BOOL:
- value.aBool = is.readBoolean();
- break;
- case STRING:
- value.anObject = readStringData(is);
- break;
- case OBJECT:
- value.classID = is.readInt(); // Read the class id
- ObjectInputStream oi = new ObjectInputStream(is);
- value.anObject = oi.readObject(); // Read the object itself
- oi = null; // Don't close it, that would close the stream itself.
- break;
- case ARRAY_IDS:
- // The header for an array of ids.
- value.classID = is.readInt(); // The component type of the array
- value.anInt = is.readInt(); // The size of the array.
- // At this point, it is the responsibility of the caller to use readArray to read in the array.
- break;
- case VOID:
- break;
- case FLAG:
- if (allowFlag) {
- value.anInt = is.readInt();
- break;
- }
- // Flags not allowed, so drop into default.
- default:
- throw new UnexpectedCommandException(UNKNOWN_READ_TYPE, false, new Byte(value.type));
- }
- } catch (CommandException e) {
- // rethrow this exception since we want these to go on out.
- throw e;
- } catch (Exception e) {
- // Wrapper this one.
- throw new UnexpectedExceptionCommandException(false, e);
- }
- }
-
- /**
- * Special interface used to read back arrays. It will be called when
- */
- public static interface ValueSender {
- /**
- * This is called for each entry from the array. It is assumed that the ValueSender has
- * the array that is being built.
- * @param value
- *
- * @since 1.1.0
- */
- public void sendValue(ValueObject value);
-
- /**
- * This is called when an ARRAY_IDS is found within the reading of the array (i.e. nested arrays)
- * It is asking for a new ValueSender to use while this nested array. The arrayValue contains
- * the valueobject for the array header (i.e. the class id of the array and the number of elements).
- * It is the responsibility of the ValueSender to store this array in the array that is being built.
- * @param arrayValue
- * @return
- *
- * @since 1.1.0
- */
- public ValueSender nestedArray(ValueObject arrayValue);
-
- /**
- * Called to initialize the sender with the given array header. This is not always called, each usage
- * knows whether it can be called or not. For example the implementation of nestedArray may not need to call initialize.
- * @param arrayHeader
- *
- * @since 1.1.0
- */
- public void initialize(ValueObject arrayHeader);
-
- }
-
- /*
- * NOTE: It is important that on the IDE side that this is called within a transaction.
- * If not, there could be some corruption if proxy cleanup occurs in the middle.
- */
- public static void readArray(DataInputStream is, int arraySize, ValueSender valueSender, ValueObject value, boolean allowFlag) throws CommandException {
- // Anything exception other than a CommandException, we will try to flush the input so that
- // it can continue with the next command and not close the connection.
- RuntimeException exception = null;
- for (int i=0; i<arraySize; i++) {
- readValue(is, value, allowFlag);
- if (exception == null)
- try {
- if (value.type != ARRAY_IDS)
- valueSender.sendValue(value);
- else {
- // We have a nested array.
- ValueSender nestedSender = null;
- try {
- nestedSender = valueSender.nestedArray(value);
- } catch (RuntimeException e) {
- // We still need to read in the array to flush. Create
- // a dummy sender that accepts everything sent to it.
- exception = e;
- nestedSender = new ValueSender() {
- public void sendValue(ValueObject value) {
- }
- public ValueSender nestedArray(ValueObject arrayValue) {
- return this;
- }
- public void initialize(ValueObject arrayHeader) {
- }
- };
- }
- readArray(is, value.anInt, nestedSender, value, allowFlag);
- if (exception != null)
- throw exception; // An exception ocurred in new sender request.
- }
- } catch (RuntimeException e) {
- // We want to flush the queue, so save the exception for later.
- exception = e;
- }
- }
- if (exception != null)
- throw exception;
- }
-
-
- /**
- * Special interface to handle writing the ARRAY_IDS type.
- * An instance of this object will be in the valueObject sent to writeValue when the type of the value
- * is ARRAY_IDS. Then write value will know to call this interface to write out the values.
- *
- * @since 1.1.0
- */
- public static interface ValueRetrieve {
- /**
- * Returns the next value object to send. It will be called the number of times that the size of
- * the array was set to be send.
- * @return The value object to send.
- * @throws EOFException
- *
- * @since 1.1.0
- */
- public ValueObject nextValue() throws EOFException;
- }
-
- public static void writeValue(DataOutputStream os, ValueObject value, boolean asValueCommand) throws CommandException {
- writeValue(os, value, asValueCommand, asValueCommand ? true : false);
- }
-
- public static void writeValue(DataOutputStream os, ValueObject value, boolean asValueCommand, boolean flush) throws CommandException {
- try {
- if (asValueCommand)
- os.writeByte(VALUE);
- switch (value.type) {
- case BYTE:
- case L_BYTE:
- os.writeByte(value.type);
- os.writeByte(value.aByte);
- break;
- case CHAR:
- case L_CHAR:
- os.writeByte(value.type);
- os.writeChar(value.aChar);
- break;
- case DOUBLE:
- case L_DOUBLE:
- os.writeByte(value.type);
- os.writeDouble(value.aDouble);
- break;
- case FLOAT:
- case L_FLOAT:
- os.writeByte(value.type);
- os.writeFloat(value.aFloat);
- break;
- case INT:
- case L_INT:
- os.writeByte(value.type);
- os.writeInt(value.anInt);
- break;
- case OBJECT_ID:
- os.writeByte(value.type);
- os.writeInt(value.objectID);
- break;
- case NEW_OBJECT_ID:
- os.writeByte(value.type);
- os.writeInt(value.classID);
- os.writeInt(value.objectID);
- break;
- case THROW:
- os.writeByte(value.type);
- os.writeInt(value.classID);
- os.writeInt(value.objectID);
- break;
- case SHORT:
- case L_SHORT:
- os.writeByte(value.type);
- os.writeShort(value.aShort);
- break;
- case LONG:
- case L_LONG:
- os.writeByte(value.type);
- os.writeLong(value.aLong);
- break;
- case BOOL:
- case L_BOOL:
- os.writeByte(value.type);
- os.writeBoolean(value.aBool);
- break;
- case STRING:
- os.writeByte(value.type);
- sendStringData(os, (String) value.anObject);
- break;
- case OBJECT:
- os.writeByte(value.type);
- os.writeInt(value.classID); // Write the class ID.
- ObjectOutputStream oos = new ObjectOutputStream(os);
- oos.writeObject(value.anObject);
- oos.flush();
- oos = null; // Don't close it, that would close the stream itself.
- break;
- case ARRAY_IDS:
- // We are writing out an array with ID's in it. The fields of the vale object will be:
- // classID: The class id of the component type of the array.
- // anObject: Contains the ValueRetriever to get the next value.
- os.writeByte(ARRAY_IDS);
- os.writeInt(value.classID);
- os.writeInt(value.anInt); // The size of the array.
- // Now comes the kludgy part, writing the values.
- ValueRetrieve retriever = (ValueRetrieve) value.anObject;
- int len = value.anInt;
- while (len-- > 0)
- writeValue(os, retriever.nextValue(), false);
- break;
- case VOID:
- os.writeByte(value.type);
- break;
- case FLAG:
- os.writeByte(FLAG);
- os.writeInt(value.anInt);
- break;
- default:
- os.writeByte(VOID);
- throw new UnexpectedCommandException(UNKNOWN_WRITE_TYPE, true, value);
- }
- if (flush)
- os.flush();
- } catch (CommandException e) {
- // rethrow this exception since we want these to go on out.
- throw e;
- } catch (Exception e) {
- // Wrapper this one.
- throw new UnexpectedExceptionCommandException(false, e);
- }
- }
-
- /**
- * For reading a large number of bytes. This is a value type, not a command. The command
- * needs to be handled separately. It returns the number of bytes read. -1 if there
- * is no more data to send and the stream should closed. If read something but not all,
- * then just what it could read will be returned. The next read will return -1 for EOF.
- *
- * It will read from the format:
- * int - number of bytes to read (retrieved from the stream).
- * bytes - the actual bytes.
- *
- * Note: A command exception will be thrown if the number of bytes to read
- * is larger than the size of the byte array.
- */
- public static int readBytes(DataInputStream is, byte[] bytes) throws CommandException {
- try {
- int bytesToRead = -1;
- try {
- bytesToRead = is.readInt();
- } catch (EOFException e) {
- }
- if (bytesToRead == -1)
- return -1;
- if (bytesToRead > bytes.length)
- throw new UnexpectedCommandException(TOO_MANY_BYTES, false, new Integer(bytesToRead));
- int start = 0;
- int toRead = bytesToRead;
- while (toRead > 0) {
- int bytesRead = is.read(bytes, start, toRead);
- if (bytesRead == -1)
- return bytesToRead != toRead ? bytesToRead-toRead : -1; // Actual number read, or if none read, then EOF
- start+=bytesRead;
- toRead-=bytesRead;
- }
- return bytesToRead;
- } catch (CommandException e) {
- // rethrow this exception since we want these to go on out.
- throw e;
- } catch (Exception e) {
- // Wrapper this one.
- throw new UnexpectedExceptionCommandException(false, e);
- }
- }
-
- /**
- * For writing a large number of bytes. This is a value type, not a command. The command
- * needs to be handled separately.
- *
- * It will write it in the format:
- * int - number of bytes
- * bytes - the actual bytes.
- *
- */
- public static void writeBytes(DataOutputStream os, byte[] bytes, int bytesToWrite) throws CommandException {
- try {
- os.writeInt(bytesToWrite);
- os.write(bytes, 0, bytesToWrite);
- } catch (Exception e) {
- // Wrapper this one.
- throw new UnexpectedExceptionCommandException(false, e);
- }
- }
-
- /************************
- * Send command helpers
- ************************/
-
- public static void sendQuitCommand(DataOutputStream os) throws IOException {
- os.writeByte(QUIT_CONNECTION);
- os.flush();
-
- }
-
- public static void sendTerminateCommand(DataOutputStream os) throws IOException {
- os.writeByte(TERMINATE_SERVER);
- os.flush();
- }
-
-
- public static void releaseObjectCommand(DataOutputStream os, int id) throws IOException {
- os.writeByte(Commands.RELEASE_OBJECT);
- os.writeInt(id);
- os.flush();
- }
-
- /**
- * Send a callback request. The value is to be send separately.
- */
- public static void sendCallbackCommand(DataOutputStream os, int callbackID, int msgID) throws CommandException {
- try {
- os.writeByte(CALLBACK);
- os.writeInt(callbackID);
- os.writeInt(msgID);
- } catch (Exception e) {
- // Wrapper this one.
- throw new UnexpectedExceptionCommandException(false, e);
- }
- }
-
- public static void sendCallbackDoneCommand(DataOutputStream os, ValueObject value, int errorCode) throws CommandException {
- try {
- os.writeByte(CALLBACK_DONE);
- if (errorCode == NO_ERROR) {
- writeValue(os, value, true);
- os.flush();
- } else
- sendErrorCommand(os, errorCode, value);
- } catch (CommandException e) {
- // rethrow this exception since we want these to go on out.
- throw e;
- } catch (Exception e) {
- // Wrapper this one.
- throw new UnexpectedExceptionCommandException(false, e);
- }
- }
-
- /**
- * Send a start callback stream request. The data will be written separately.
- * There will not be a callback done command. It will return as soon as the command
- * is sent.
- */
- public static void sendCallbackStreamCommand(DataOutputStream os, int callbackID, int msgID) throws CommandException {
- try {
- os.writeByte(CALLBACK_STREAM);
- os.writeInt(callbackID);
- os.writeInt(msgID);
- } catch (Exception e) {
- // Wrapper this one.
- throw new UnexpectedExceptionCommandException(false, e);
- }
- }
-
- protected static final byte STRING_NOT_CHUNKED = 0;
- protected static final byte STRING_CHUNKED = 1;
- protected static final byte MORE_CHUNKS = 2;
- protected static final byte LAST_CHUNK = 3;
- protected static final int CHUNK_SIZE = 65000/3;
-
- /**
- * Send string data. This is for general string data. It makes sure that if the string is too big (there is a UTF-8 limit)
- * that it will send it in chunks. Use the corresponding <code>readStringData</code> to read such data in.
- * @param os
- * @param string
- * @throws IOException
- *
- * @since 1.0.0
- */
- public static void sendStringData(DataOutputStream os, String string) throws IOException {
- // UTF-8 can take up to three bytes for each char. To be on safe side we will
- // not send a string larger than 65K/3 as one chunk.
- if (string.length() <= CHUNK_SIZE) {
- // Less than the limit, send byte to indicate not chunked.
- os.writeByte(STRING_NOT_CHUNKED);
- os.writeUTF(string);
- } else {
- // Over limit, need to chunk it.
- // send byte to indicate chunked, then send true length so that other side knows how big to create.
- os.writeByte(STRING_CHUNKED);
- os.writeInt(string.length());
- // Now send first chunk
- for(int i=0; i<string.length(); i+=CHUNK_SIZE) {
- int endIndex = i+CHUNK_SIZE;
- if (i == 0) {
- // The first chunk is just written as is. We know endIndex will be ok because we wouldn't get here unless LARGER than chunksize.
- os.writeUTF(string.substring(i, endIndex));
- } else {
- // Following chunks have either byte MORE_CHUNKS or LAST_CHUNK
- if (endIndex >= string.length()) {
- // This is last chunk.
- os.writeByte(LAST_CHUNK);
- os.writeUTF(string.substring(i));
- } else {
- // This is an intermediate chunk.
- os.writeByte(MORE_CHUNKS);
- os.writeUTF(string.substring(i, endIndex));
- }
- }
- }
- }
- }
-
- /**
- * Read a string that was sent using the sendStringData command.
- * @param in
- * @return
- * @throws IOException
- *
- * @since 1.0.0
- */
- public static String readStringData(DataInputStream is) throws IOException {
- byte chunked = is.readByte();
- if (chunked == STRING_NOT_CHUNKED)
- return is.readUTF(); // Not chunk, just read it.
- else {
- // It is chunked.
- int totalLength = is.readInt(); // Get the total length.
- StringBuffer sbr = new StringBuffer(totalLength);
- while(true) {
- sbr.append(is.readUTF());
- if (chunked != LAST_CHUNK)
- chunked = is.readByte();
- else
- break;
- }
- return sbr.toString();
- }
- }
-
- /**
- * Read back command, expecting either a VALUE or an ERROR. You can request that
- * it be of a specific type (if any type can be accepted then enter -1 for the type).
- */
- public static final byte NO_TYPE_CHECK = -1;
- public static void readBackValue(DataInputStream is, ValueObject value, byte expectedType) throws CommandException {
- try {
- byte v = is.readByte();
- switch (v) {
- case VALUE:
- readValue(is, value);
- if (expectedType != NO_TYPE_CHECK &&
- !(expectedType == value.type || (expectedType == Commands.OBJECT_ID && value.type == NEW_OBJECT_ID)))
- throw new UnexpectedCommandException(TYPE_INVALID_FOR_COMMAND, true, value);
- break;
- case ERROR:
- int code = is.readInt();
- readValue(is, value);
- throw new CommandErrorException(code, value);
- default:
- throw new UnexpectedCommandException(UNKNOWN_COMMAND, false, new Byte(v));
- }
- } catch (CommandException e) {
- // rethrow this exception since we want these to go on out.
- throw e;
- } catch (Exception e) {
- // Wrapper this one.
- throw new UnexpectedExceptionCommandException(false, e);
- }
- }
-
-
- /**
- * GetClass command returns a GetClassReturn object.
- */
- public static class GetClassReturn {
- public int classID;
- public boolean isInterface;
- public boolean isAbstract;
- public String superClassname;
- }
-
- public static GetClassReturn sendGetClassCommand(DataOutputStream os, DataInputStream is, String className) throws CommandException {
- try {
- os.writeByte(GET_CLASS);
- os.writeUTF(className);
- os.flush();
-
- GetClassReturn ret = new GetClassReturn();
- byte v = is.readByte();
- switch (v) {
- case GET_CLASS_RETURN:
- ret.classID = is.readInt(); // Get the new class id.
- ret.isInterface = is.readBoolean(); // Get the isInterface flag
- ret.isAbstract = is.readBoolean(); // Get the isAbstract flag.
- ret.superClassname = is.readUTF(); // Get the super class name.
- return ret;
- case ERROR:
- int code = is.readInt();
- ValueObject value = new ValueObject();
- readValue(is, value);
- throw new CommandErrorException(code, value);
- default:
- throw new UnexpectedCommandException(UNKNOWN_COMMAND, false, new Byte(v));
- }
- } catch (CommandException e) {
- // rethrow this exception since we want these to go on out.
- throw e;
- } catch (Exception e) {
- // Wrapper this one.
- throw new UnexpectedExceptionCommandException(false, e);
- }
- }
-
- /**
- * GetClassFromID command returns a GetClassIDReturn object.
- */
- public static class GetClassIDReturn {
- public String className;
- public boolean isInterface;
- public boolean isAbstract;
- public String superClassname;
- }
-
- public static GetClassIDReturn sendGetClassFromIDCommand(DataOutputStream os, DataInputStream is, int classID) throws CommandException {
- try {
- os.writeByte(GET_CLASS_FROM_ID);
- os.writeInt(classID);
- os.flush();
-
- GetClassIDReturn ret = new GetClassIDReturn();
- byte v = is.readByte();
- switch (v) {
- case GET_CLASS_ID_RETURN:
- ret.className = is.readUTF(); // Get the new class name.
- ret.isInterface = is.readBoolean(); // Get the isInterface flag
- ret.isAbstract = is.readBoolean(); // Get the isAbstract flag.
- ret.superClassname = is.readUTF(); // Get the super class name.
- return ret;
- case ERROR:
- int code = is.readInt();
- ValueObject value = new ValueObject();
- readValue(is, value);
- throw new CommandErrorException(code, value);
- default:
- throw new UnexpectedCommandException(UNKNOWN_COMMAND, false, new Byte(v));
- }
- } catch (CommandException e) {
- // rethrow this exception since we want these to go on out.
- throw e;
- } catch (Exception e) {
- // Wrapper this one.
- throw new UnexpectedExceptionCommandException(false, e);
- }
- }
-
- public static void sendGetObjectData(DataOutputStream os, DataInputStream is, int objectID, ValueObject valueReturn) throws CommandException {
- try {
- os.writeByte(GET_OBJECT_DATA);
- os.writeInt(objectID);
- os.flush();
- readBackValue(is, valueReturn, NEW_OBJECT_ID);
- } catch (CommandException e) {
- // rethrow this exception since we want these to go on out.
- throw e;
- } catch (Exception e) {
- // Wrapper this one.
- throw new UnexpectedExceptionCommandException(false, e);
- }
- }
-
- public static void sendErrorCommand(DataOutputStream os, int code, ValueObject errorValue) throws CommandException {
- try {
- os.writeByte(ERROR);
- os.writeInt(code);
- writeValue(os, errorValue, false);
- os.flush();
- } catch (Exception e) {
- // Wrapper this one.
- throw new UnexpectedExceptionCommandException(false, e);
- }
- }
-
- public static void sendNewInstance(DataOutputStream os, DataInputStream is, int classId, String initializationString, ValueObject newValueReturn) throws CommandException {
- try {
- os.writeByte(NEW_INIT_STRING);
- os.writeInt(classId);
- os.writeUTF(initializationString);
- os.flush();
- readBackValue(is, newValueReturn, NO_TYPE_CHECK);
- } catch (CommandException e) {
- // rethrow this exception since we want these to go on out.
- throw e;
- } catch (Exception e) {
- // Wrapper this one.
- throw new UnexpectedExceptionCommandException(false, e);
- }
- }
-
-
- public static void sendInvokeMethodCommand(DataOutputStream os, DataInputStream is, int methodID, ValueObject invokeOn, ValueObject parms, ValueObject valueReturn) throws CommandException {
- try {
- os.writeByte(INVOKE);
- os.writeInt(methodID);
- writeValue(os, invokeOn, false);
- writeValue(os, parms, false);
- os.flush();
- readBackValue(is, valueReturn, NO_TYPE_CHECK);
- } catch (CommandException e) {
- // rethrow this exception since we want these to go on out.
- throw e;
- } catch (Exception e) {
- // Wrapper this one.
- throw new UnexpectedExceptionCommandException(false, e);
- }
- }
-
- public static void sendInvokeMethodCommand(DataOutputStream os, DataInputStream is, ValueObject classType, String methodName, ValueObject parmTypes, ValueObject invokeOn, ValueObject parms, ValueObject valueReturn) throws CommandException {
- try {
- os.writeByte(INVOKE_WITH_METHOD_PASSED);
- writeValue(os, classType, false);
- os.writeUTF(methodName);
- writeValue(os, parmTypes, false);
- writeValue(os, invokeOn, false);
- writeValue(os, parms, false);
- os.flush();
- readBackValue(is, valueReturn, NO_TYPE_CHECK);
- } catch (CommandException e) {
- // rethrow this exception since we want these to go on out.
- throw e;
- } catch (Exception e) {
- // Wrapper this one.
- throw new UnexpectedExceptionCommandException(false, e);
- }
- }
-
- public static void sendGetArrayContentsCommand(DataOutputStream os, DataInputStream is, int arrayID, ValueObject valueReturn) throws CommandException {
- try {
- os.writeByte(GET_ARRAY_CONTENTS);
- os.writeInt(arrayID);
- os.flush();
- readBackValue(is, valueReturn, NO_TYPE_CHECK);
- } catch (CommandException e) {
- // rethrow this exception since we want these to go on out.
- throw e;
- } catch (Exception e) {
- // Wrapper this one.
- throw new UnexpectedExceptionCommandException(false, e);
- }
- }
-
- private Commands() {
- // Never intended to be instantiated.
- }
-}
diff --git a/plugins/org.eclipse.jem.proxy/remoteCommon/org/eclipse/jem/internal/proxy/common/remote/ExpressionCommands.java b/plugins/org.eclipse.jem.proxy/remoteCommon/org/eclipse/jem/internal/proxy/common/remote/ExpressionCommands.java
deleted file mode 100644
index 4337086..0000000
--- a/plugins/org.eclipse.jem.proxy/remoteCommon/org/eclipse/jem/internal/proxy/common/remote/ExpressionCommands.java
+++ /dev/null
@@ -1,345 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2004, 2005 IBM Corporation and others.
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
- *
- * Contributors:
- * IBM Corporation - initial API and implementation
- *******************************************************************************/
-/*
-
-
- */
-package org.eclipse.jem.internal.proxy.common.remote;
-
-import java.io.*;
-
-import org.eclipse.jem.internal.proxy.common.CommandException;
-
-
-/**
- *
- * @since 1.0.0
- */
-public class ExpressionCommands {
-
- // These are the sub-commands under EXPRESSION_TREE_COMMANDS that can be send.
- public static final byte
- START_EXPRESSION_TREE_PROCESSING = 0,
- PUSH_EXPRESSION = 1,
- END_EXPRESSION_TREE_PROCESSING = 2,
- SYNC_REQUEST = 3,
- PULL_VALUE_REQUEST = 4,
- TRANSFER_EXPRESSION_REQUEST = 5,
- RESUME_EXPRESSION_REQUEST = 6;
-
- // These are the expression specific error codes (it can also send back general ones. See SYNC_REQUEST docs lower down).
- public static final int
- EXPRESSION_NOEXPRESSIONVALUE_EXCEPTION = Commands.MAX_ERROR_CODE+1; // No expression value occurred.
-
- // These are the flag values sent in proxy resolution when doesn't resolve to proxy.
- public static final int
- EXPRESSIONPROXY_VOIDTYPE = 0, // Expression proxy resolves to void type.
- EXPRESSIONPROXY_NOTRESOLVED = 1; // Expression proxy not resolved.
-
- // These are the trace values sent in START_EXPRESSION_TREE_PROCESSING
- public static final byte
- TRACE_DEFAULT = -1,
- TRACE_OFF = 0,
- TRACE_ON = 1;
-
- public static final String EXPRESSIONTRACE = "proxyvm.expressionTrace"; // The system property for turning on expression tracing. //$NON-NLS-1$
- public static final String EXPRESSIONTRACE_TIMER_THRESHOLD = "proxyvm.expressionTraceTimerThreshold"; // The system property for timer threshold. //$NON-NLS-1$
-
- /*
- * The format of the commands are:
- * Note: Most of the commands will not being doing a os.flush() at the end. We are just going to
- * be streaming the data over the line. At the end we will flush and then catch up. That way
- * we aren't waiting for the other side as we send the data.
- *
- * START_EXPRESSION_TREE_PROCESSING: 0b, trace
- * Start processing.
- * byte(trace): -1 : do default
- * 0 : no trace
- * 1 : do trace
- *
- * PUSH_EXPRESSION: 1b, b
- * Push an expression. Where "b" is the expression type from IInternalExpressionConstants.
- * The actual data that follows is expression type dependent and will be
- * sent in a following call to ExpressionCommands as it builds up the actual command.
- * See REMExpression and each type of push call method within it to see the actual
- * sent data.
- *
- * END_EXPRESSION_TREE_PROCESSING: 2b
- * End the processing and clean up.
- *
- * SYNC_REQUEST: 3b
- * This will return the current status. The reason it is called sync is because the
- * IDE will wait for it to complete and read back the value. It will send back:
- * 1: VALUE command with boolean true as the value.
- * 2: ERROR command with code of ExpressionClassNotFound, with value of String with message from exception.
- * 3: ERROR command with code of EXPRESSION_NOEXPRESSIONVALUE_EXCEPTION, with value of String with message from exception.
- * 4: THROWABLE command with the actual exception that occurred.
- *
- *
- * PULL_VALUE_REQUEST: 4b
- * This will do a sync up and return the value from the expression.
- * IDE will wait for it to compleate and read back the value. It will send back:
- * 1: VALUE command with the result as the value.
- * 2: ERROR or EXCEPTION if there were errors, see SYNC_REQUEST with the format they are sent back.
- *
- * TRANSFER_EXPRESSION_REQUEST: 5b
- * This will do a sync up, and return the ExpressionProcessorController that the request is for. And remove
- * the controller from its list of active expression controllers.
- *
- * RESUME_EXPRESSION_REQUEST: 6b, anExpressionProcessorController
- * This will take the given controller and add it to the list of controllers this connection is handling. It returns nothing.
- *
- * @see org.eclipse.jem.internal.proxy.initParser.tree.IInternalExpressionConstants
- * @see org.eclipse.jem.internal.proxy.remote.REMExpression
- *
- */
-
- /**
- * Send the start expression processing command.
- * @param expressionID
- * @param trace
- * @param os
- *
- * @throws IOException
- *
- * @since 1.0.0
- */
- public static void sendStartExpressionProcessingCommand(int expressionID, byte trace, DataOutputStream os) throws IOException {
- os.writeByte(Commands.EXPRESSION_TREE_COMMAND);
- os.writeInt(expressionID);
- os.writeByte(START_EXPRESSION_TREE_PROCESSING);
- os.writeByte(trace);
- }
-
- /**
- * Send the end expression processing command.
- * @param expressionID
- * @param os
- *
- * @throws IOException
- *
- * @since 1.0.0
- */
- public static void sendEndExpressionProcessingCommand(int expressionID, DataOutputStream os) throws IOException {
- os.writeByte(Commands.EXPRESSION_TREE_COMMAND);
- os.writeInt(expressionID);
- os.writeByte(END_EXPRESSION_TREE_PROCESSING);
- os.flush(); // Flushing because we are done and want to make sure everything goes out.
- }
-
- /**
- * Send an expression subcommand.
- * @param expressionID
- * @param os
- * @param subcommand
- *
- * @throws IOException
- *
- * @since 1.0.0
- */
- public static void sendExpressionCommand(int expressionID, DataOutputStream os, byte subcommand) throws IOException {
- os.writeByte(Commands.EXPRESSION_TREE_COMMAND);
- os.writeInt(expressionID);
- os.writeByte(PUSH_EXPRESSION);
- os.writeByte(subcommand);
- }
-
- /**
- * Send just a byte.
- *
- * @param os
- * @param aByte
- * @throws IOException
- *
- * @since 1.0.0
- */
- public static void sendByte(DataOutputStream os, byte aByte) throws IOException {
- os.writeByte(aByte);
- }
-
- /**
- * Send just an int.
- *
- * @param os
- * @param anInt
- * @throws IOException
- *
- * @since 1.0.0
- */
- public static void sendInt(DataOutputStream os, int anInt) throws IOException {
- os.writeInt(anInt);
- }
-
- /**
- * Send just a string.
- *
- * @param os
- * @param aString
- * @throws IOException
- *
- * @since 1.0.0
- */
- public static void sendString(DataOutputStream os, String aString) throws IOException {
- Commands.sendStringData(os, aString);
- }
-
- /**
- * Send just a boolean.
- *
- * @param os
- * @param aBool
- * @throws IOException
- *
- * @since 1.0.0
- */
- public static void sendBoolean(DataOutputStream os, boolean aBool) throws IOException {
- os.writeBoolean(aBool);
- }
-
- /**
- * Send the pull value command. After processing the proxies, caller should call getFinalValue() to get the value.
- * @param expressionID
- * @param os
- * @param is
- * @param proxyids if not <code>null</code>, then this is the list of expression proxy ids that need to be returned as rendered.
- * @param sender sender used to process the resolved proxy ids, or <code>null</code> if no proxy ids.
- * @throws CommandException
- *
- * @since 1.0.0
- */
- public static void sendPullValueCommand(int expressionID, DataOutputStream os, DataInputStream is, Commands.ValueObject proxyids, Commands.ValueSender sender) throws CommandException {
- try {
- os.writeByte(Commands.EXPRESSION_TREE_COMMAND);
- os.writeInt(expressionID);
- os.writeByte(PULL_VALUE_REQUEST);
- sendProxyIDs(os, proxyids);
- os.flush();
- if (proxyids != null) {
- Commands.readBackValue(is, proxyids, Commands.ARRAY_IDS); // Read the array header.
- sender.initialize(proxyids);
- Commands.readArray(is, proxyids.anInt, sender, proxyids, true); // Read the array.
- }
- } catch (CommandException e) {
- // rethrow this exception since we want these to go on out.
- throw e;
- } catch (IOException e) {
- // Wrapper this one.
- throw new UnexpectedExceptionCommandException(false, e);
- }
- }
-
- /**
- * Send a sync command. This does a synchronize with the remote expression processor. It makes sure that the
- * stream is caught and doesn't return until everything on the stream has been processed. Should then call
- * getFinalValue() to verify the expression is valid.
- * @param expressionID
- * @param os
- * @param is
- * @param proxyids if not <code>null</code>, then this is the list of expression proxy ids that need to be returned as rendered.
- * @param sender the sender used for reading back the proxyid resolutions, or <code>null</code> if no proxy ids.
- *
- * @throws CommandException
- *
- * @since 1.0.0
- */
- public static void sendSyncCommand(int expressionID, DataOutputStream os, DataInputStream is, Commands.ValueObject proxyids, Commands.ValueSender sender) throws CommandException {
- try {
- os.writeByte(Commands.EXPRESSION_TREE_COMMAND);
- os.writeInt(expressionID);
- os.writeByte(SYNC_REQUEST);
- sendProxyIDs(os, proxyids);
- os.flush();
- if (proxyids != null) {
- Commands.readBackValue(is, proxyids, Commands.ARRAY_IDS); // Read the array header.
- sender.initialize(proxyids);
- Commands.readArray(is, proxyids.anInt, sender, proxyids, true); // Read the array.
- }
- } catch (CommandException e) {
- // rethrow this exception since we want these to go on out.
- throw e;
- } catch (Exception e) {
- // Wrapper this one.
- throw new UnexpectedExceptionCommandException(false, e);
- }
- }
-
- /**
- * Send the proxyids (if not null) as part of a command. Used by sync and pullValue.
- * @param os
- * @param proxyids <code>null</code> if not requesting proxy ids.
- * @throws IOException
- * @throws CommandException
- *
- * @since 1.1.0
- */
- private static void sendProxyIDs(DataOutputStream os, Commands.ValueObject proxyids) throws IOException, CommandException {
- if (proxyids != null) {
- os.writeBoolean(true); // Indicates proxy ids being sent.
- Commands.writeValue(os, proxyids, false, false);
- } else
- os.writeBoolean(false); // No proxyids being sent.
- }
-
- /**
- * Send the transfer expression command and receive back the expression processor controller.
- *
- * @param expressionID
- * @param os
- * @param is
- * @param expressionProcesserController
- * @throws CommandException
- *
- * @since 1.1.0
- */
- public static void sendTransferExpressionCommand(int expressionID, DataOutputStream os, DataInputStream is, Commands.ValueObject expressionProcesserController) throws CommandException {
- try {
- os.writeByte(Commands.EXPRESSION_TREE_COMMAND);
- os.writeInt(expressionID);
- os.writeByte(TRANSFER_EXPRESSION_REQUEST);
- os.flush();
- Commands.readBackValue(is, expressionProcesserController, Commands.NO_TYPE_CHECK); // Read the expression processor controller
- } catch (CommandException e) {
- throw e;
- } catch (Exception e) {
- // Wrapper this one.
- throw new UnexpectedExceptionCommandException(false, e);
- }
- }
-
- /**
- * Send the resume expression command with given expression processor controller.
- *
- * @param expressionID
- * @param os
- * @param expressionProcessorController
- * @throws CommandException
- *
- * @since 1.1.0
- */
- public static void sendResumeExpressionCommand(int expressionID, DataOutputStream os, Commands.ValueObject expressionProcessorController) throws CommandException {
- try {
- os.writeByte(Commands.EXPRESSION_TREE_COMMAND);
- os.writeInt(expressionID);
- os.writeByte(RESUME_EXPRESSION_REQUEST);
- Commands.writeValue(os, expressionProcessorController, false, false);
- } catch (CommandException e) {
- throw e;
- } catch (Exception e) {
- // Wrapper this one.
- throw new UnexpectedExceptionCommandException(false, e);
- }
- }
-
- private ExpressionCommands() {
- // Never intended to be instantiated.
- }
-
-}
diff --git a/plugins/org.eclipse.jem.proxy/remoteCommon/org/eclipse/jem/internal/proxy/common/remote/IOCommandException.java b/plugins/org.eclipse.jem.proxy/remoteCommon/org/eclipse/jem/internal/proxy/common/remote/IOCommandException.java
deleted file mode 100644
index eb51a70..0000000
--- a/plugins/org.eclipse.jem.proxy/remoteCommon/org/eclipse/jem/internal/proxy/common/remote/IOCommandException.java
+++ /dev/null
@@ -1,60 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2001, 2005 IBM Corporation and others.
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
- *
- * Contributors:
- * IBM Corporation - initial API and implementation
- *******************************************************************************/
-package org.eclipse.jem.internal.proxy.common.remote;
-/*
-
-
- */
-
-import java.io.IOException;
-import org.eclipse.jem.internal.proxy.common.CommandException;
-
-/**
- * A command exception occured while processing an io request
- * in a callback stream. This exception wrappers the command exception.
- */
-
-public class IOCommandException extends IOException {
- /**
- * Comment for <code>serialVersionUID</code>
- *
- * @since 1.1.0
- */
- private static final long serialVersionUID = -2308947195164382779L;
- protected CommandException fException;
-
- public IOCommandException(CommandException e) {
- fException = e;
- }
-
- public CommandException getException() {
- return fException;
- }
-
- public String getMessage() {
- return fException.getMessage();
- }
-
- public void printStackTrace() {
- fException.printStackTrace();
- }
-
- public void printStackTrace(java.io.PrintStream p) {
- fException.printStackTrace(p);
- }
-
- public void printStackTrace(java.io.PrintWriter p) {
- fException.printStackTrace(p);
- }
-
-}
-
-
diff --git a/plugins/org.eclipse.jem.proxy/remoteCommon/org/eclipse/jem/internal/proxy/common/remote/TransmitableArray.java b/plugins/org.eclipse.jem.proxy/remoteCommon/org/eclipse/jem/internal/proxy/common/remote/TransmitableArray.java
deleted file mode 100644
index a6c4271..0000000
--- a/plugins/org.eclipse.jem.proxy/remoteCommon/org/eclipse/jem/internal/proxy/common/remote/TransmitableArray.java
+++ /dev/null
@@ -1,36 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2001, 2005 IBM Corporation and others.
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
- *
- * Contributors:
- * IBM Corporation - initial API and implementation
- *******************************************************************************/
-package org.eclipse.jem.internal.proxy.common.remote;
-/*
-
-
- */
-
-
-/**
- * A value can be a TransmitableArray. This means this value is an array that
- * needs to have a ValueRetriever created for it. This is used if the array has ID's in
- * it and is not an existing array on the server or all constant values.
- *
- * NOTE: It is assumed that all IBeanTypeProxies of the parms have already been retrieved.
- * It should still work, but it could be asking for them in the middle of the request
- * if they are not first gotton. And this could throw a non-recoverable exception if not found.
- */
-public final class TransmitableArray {
- public int componentTypeID; // The id of the type of the component type of the array.
- public Object[] array; // The array it self.
- public TransmitableArray(int typeID, Object[] anArray) {
- componentTypeID = typeID;
- array = anArray;
- }
-}
-
-
diff --git a/plugins/org.eclipse.jem.proxy/remoteCommon/org/eclipse/jem/internal/proxy/common/remote/UnexpectedCommandException.java b/plugins/org.eclipse.jem.proxy/remoteCommon/org/eclipse/jem/internal/proxy/common/remote/UnexpectedCommandException.java
deleted file mode 100644
index 3afd478..0000000
--- a/plugins/org.eclipse.jem.proxy/remoteCommon/org/eclipse/jem/internal/proxy/common/remote/UnexpectedCommandException.java
+++ /dev/null
@@ -1,72 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2001, 2005 IBM Corporation and others.
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
- *
- * Contributors:
- * IBM Corporation - initial API and implementation
- *******************************************************************************/
-package org.eclipse.jem.internal.proxy.common.remote;
-/*
-
-
- */
-
-import org.eclipse.jem.internal.proxy.common.CommandException;
-/**
- * This is an exception that is thrown when the processing
- * of data was invalid for the command.
- * There will be a flag indicting error type, and a flag
- * indicating whether the connection is recoverable or not.
- * If not recoverable, then the connection needs to be closed.
- *
- */
-public class UnexpectedCommandException extends CommandException {
- /**
- * Comment for <code>serialVersionUID</code>
- *
- * @since 1.1.0
- */
- private static final long serialVersionUID = 7097693384453243113L;
- private final Object fErrorType;
- private final boolean fRecoverable;
-
- public UnexpectedCommandException(Object errorType, boolean recoverable) {
- fErrorType = errorType;
- fRecoverable = recoverable;
- }
-
- public UnexpectedCommandException(Object errorType, boolean recoverable, Object data) {
- super(data);
- fErrorType = errorType;
- fRecoverable = recoverable;
- }
-
- public UnexpectedCommandException(Object errorType, boolean recoverable, String msg, Object data) {
- super(msg, data);
- fErrorType = errorType;
- fRecoverable = recoverable;
- }
-
- public Object getErrorType() {
- return fErrorType;
- }
-
- public boolean isRecoverable() {
- return fRecoverable;
- }
-
- public String getMessage() {
- String m = super.getMessage();
- if (fErrorType != null) {
- String dataMsg = getExceptionData() != null ? " Errordata="+getExceptionData().toString() : ""; //$NON-NLS-1$ //$NON-NLS-2$
- if (m == null)
- return "Errortype="+fErrorType.toString() + dataMsg; //$NON-NLS-1$
- else
- return m + ':' + "Errortype="+fErrorType.toString() + dataMsg; //$NON-NLS-1$
- } else
- return m;
- }
-}
diff --git a/plugins/org.eclipse.jem.proxy/remoteCommon/org/eclipse/jem/internal/proxy/common/remote/UnexpectedExceptionCommandException.java b/plugins/org.eclipse.jem.proxy/remoteCommon/org/eclipse/jem/internal/proxy/common/remote/UnexpectedExceptionCommandException.java
deleted file mode 100644
index dc0316a..0000000
--- a/plugins/org.eclipse.jem.proxy/remoteCommon/org/eclipse/jem/internal/proxy/common/remote/UnexpectedExceptionCommandException.java
+++ /dev/null
@@ -1,67 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2001, 2005 IBM Corporation and others.
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
- *
- * Contributors:
- * IBM Corporation - initial API and implementation
- *******************************************************************************/
-package org.eclipse.jem.internal.proxy.common.remote;
-/*
-
-
- */
-
-/**
- * Wrapper an unexpected exception in a Command Exception.
- */
-public class UnexpectedExceptionCommandException extends UnexpectedCommandException {
-
- /**
- * Comment for <code>serialVersionUID</code>
- *
- * @since 1.1.0
- */
- private static final long serialVersionUID = -1654134370115650969L;
-
- public UnexpectedExceptionCommandException(boolean recoverable, Throwable data) {
- super(Commands.SOME_UNEXPECTED_EXCEPTION, recoverable, data);
- }
-
- public UnexpectedExceptionCommandException(boolean recoverable, String msg, Throwable data) {
- super(Commands.SOME_UNEXPECTED_EXCEPTION, recoverable, msg, data);
- }
-
- public Throwable getException() {
- return (Throwable) getExceptionData();
- }
-
- public String getMessage() {
- String localMsg = super.getMessage();
- if (getException() != null)
- if (localMsg == null || localMsg.length() == 0)
- return getException().getLocalizedMessage();
- else
- return localMsg + ": " + getException().getLocalizedMessage(); //$NON-NLS-1$
- return
- localMsg;
- }
-
- public void printExceptionStackTrace() {
- getException().printStackTrace();
- }
-
- public void printStackTrace() {
- printExceptionStackTrace();
- }
-
- public void printStackTrace(java.io.PrintStream p) {
- getException().printStackTrace(p);
- }
-
- public void printStackTrace(java.io.PrintWriter p) {
- getException().printStackTrace(p);
- }
-}
diff --git a/plugins/org.eclipse.jem.proxy/schema/contributors.exsd b/plugins/org.eclipse.jem.proxy/schema/contributors.exsd
deleted file mode 100644
index 672a552..0000000
--- a/plugins/org.eclipse.jem.proxy/schema/contributors.exsd
+++ /dev/null
@@ -1,149 +0,0 @@
-<?xml version='1.0' encoding='UTF-8'?>
-<!-- Schema file written by PDE -->
-<schema targetNamespace="org.eclipse.jem.proxy">
-<annotation>
- <appInfo>
- <meta.schema plugin="org.eclipse.jem.proxy" id="contributors" name="Proxy Configuration Contributors"/>
- </appInfo>
- <documentation>
- This extension point is used to supply configuration contributors for proxy support. You can supply a contributor for a specific classpath container or for a plugin.
-<p>
-The way configuration contributors work is that when a proxy vm is started, it first runs through all of the explicit contributors that were given to it. It then goes through the classpath of the project and finds the containers. If the container implements IConfigurationContributor, it will be called as a contributor. Then all of the extensions of this extension point will be searched for those have the same container id, and if so they will be called as a contributor.
-<p>
-The extensions will be called in plugin order. In other words if plugin A depends on plugin B, the contribution in plugin A will not be called before the contribution in plugin B.
-<p>
-If a plugin is in the classpath of the project (in other words the project is PDE plugin development project and requires a plugin) then the contributor with the given plugin id will be called.
-<p>
-Both container and plugin can be specified, but at least one of them must be specified. If both are specified, then this entry will be used if either the container or the plugin is found in the classpath.
- </documentation>
- </annotation>
-
- <element name="extension">
- <complexType>
- <sequence>
- <element ref="contributor" minOccurs="0" maxOccurs="unbounded"/>
- </sequence>
- <attribute name="point" type="string" use="required">
- <annotation>
- <documentation>
- a fully qualified identifier of the target extension point
- </documentation>
- </annotation>
- </attribute>
- <attribute name="id" type="string">
- <annotation>
- <documentation>
- an optional identifier of the extension instance
- </documentation>
- </annotation>
- </attribute>
- <attribute name="name" type="string">
- <annotation>
- <documentation>
- an optional name of the extension instance
- </documentation>
- </annotation>
- </attribute>
- </complexType>
- </element>
-
- <element name="contributor">
- <annotation>
- <appInfo>
- <meta.element labelAttribute="class"/>
- </appInfo>
- <documentation>
- A contributor. Either the container and/or the plugin attributes must be set.
- </documentation>
- </annotation>
- <complexType>
- <attribute name="container" type="string">
- <annotation>
- <documentation>
- contributor is for a container. The value is the container id (e.g. <b>"JRE_CONTAINER"</b>). This will match "/JRE_CONTAINER" or "/JRE_CONTAINER/...". Or <b>"JRE_CONTAINER/XYZ"</b> would match "/JRE_CONTAINER/XYZ/...".
-<p>
-You can also use a regular expression. An expression such as <b>"SWT_CONTAINER/(.*/)*PDE"</b> will match "/SWT_CONTAINER/JFACE/PDE" and "/SWT_CONTAINER/PDE" but will not match "/SWT_CONTAINER".
- </documentation>
- </annotation>
- </attribute>
- <attribute name="plugin" type="string">
- <annotation>
- <documentation>
- contributor is for a plugin. The value is the plugin id (e.g. "org.eclipse.swt").
- </documentation>
- </annotation>
- </attribute>
- <attribute name="class" type="string" use="required">
- <annotation>
- <documentation>
- the class that implements this contributor. The class must implement IConfigurationContributor.
- </documentation>
- <appInfo>
- <meta.attribute kind="java" basedOn="org.eclipse.jem.internal.proxy.core.IConfigurationContributor"/>
- </appInfo>
- </annotation>
- </attribute>
- </complexType>
- </element>
-
- <annotation>
- <appInfo>
- <meta.section type="since"/>
- </appInfo>
- <documentation>
- 1.0.0
- </documentation>
- </annotation>
-
- <annotation>
- <appInfo>
- <meta.section type="examples"/>
- </appInfo>
- <documentation>
- The following is an example of a contributor:
-
-<p>
-<pre>
- <extension point="org.eclipse.jem.proxy.contributors">
- <contributor
- class="com.example.ContributorImplementation"
- container="MY_CONTAINER">
- </contributor>
- </extension>
-</pre>
-</p>
- </documentation>
- </annotation>
-
- <annotation>
- <appInfo>
- <meta.section type="apiInfo"/>
- </appInfo>
- <documentation>
- The <samp>class</samp> attribute must be a fully-qualified class that implements the <samp>org.eclipse.jem.internal.proxy.core.IConfigurationContributor</samp> interface for contributor.
- </documentation>
- </annotation>
-
- <annotation>
- <appInfo>
- <meta.section type="implementation"/>
- </appInfo>
- <documentation>
- There is <samp>org.eclipse.jem.internal.proxy.core.ConfigurationContributorAdapter</samp> available to subclass to provide specific overrides. The default for the adapter is that it doesn't do anything.
- </documentation>
- </annotation>
-
- <annotation>
- <appInfo>
- <meta.section type="copyright"/>
- </appInfo>
- <documentation>
- Copyright (c) 2004 IBM Corporation and others.<br>
-All rights reserved. This program and the accompanying materials are made
-available under the terms of the Eclipse Public License v1.0 which accompanies
-this distribution, and is available at
-<a href="http://www.eclipse.org/legal/epl-v10.html">http://www.eclipse.org/legal/epl-v10.html</a>
- </documentation>
- </annotation>
-
-</schema>
diff --git a/plugins/org.eclipse.jem.proxy/schema/extensions.exsd b/plugins/org.eclipse.jem.proxy/schema/extensions.exsd
deleted file mode 100644
index 38dc8db..0000000
--- a/plugins/org.eclipse.jem.proxy/schema/extensions.exsd
+++ /dev/null
@@ -1,157 +0,0 @@
-<?xml version='1.0' encoding='UTF-8'?>
-<!-- Schema file written by PDE -->
-<schema targetNamespace="org.eclipse.jem.proxy">
-<annotation>
- <appInfo>
- <meta.schema plugin="org.eclipse.jem.proxy" id="extensions" name="Proxy Extension Registration Contributors"/>
- </appInfo>
- <documentation>
- This extension point is used to supply extension registrations for proxy support. You can supply an extension registration for a specific classpath container or for a plugin.
-<p>
-Just after the registry has been started and before any contributions to the registry can be made, the extension registrations for the given registry type (such as "org.eclipse.jem.REMOTE") for any paths/plugins/containers that have that match will be executed. These are used to do extension registrations (such as BaseProxyFactroyRegistry.registerBeanTypeProxyFactory(String packageName, IBeanTypeProxyFactory aFactory)). These registrations shouldn't do any actual proxy calls because at this time not all of the extensions had been run yet and it may accidently reference a package that should have an extension factory on it, but that factory has not yet been registered. Instead the contributor extension point should be used for that because at that time all of the extensions will be registered.
-<p>
-The way extension registrations work is that when a proxy vm is started, it finds all of the extensions of this extension point will be searched for those have the same container id and registry type id, and if so they will be called as an extension registration.
-<p>
-If a plugin is in the classpath of the project (in other words the project is PDE plugin development project and requires a plugin) then the extension registration with the given plugin id will be called.
-<p>
-Both container and plugin can be specified, but at least one of them must be specified. If both are specified, then this entry will be used if either the container or the plugin is found in the classpath.
- </documentation>
- </annotation>
-
- <element name="extension">
- <complexType>
- <sequence>
- <element ref="registration" minOccurs="0" maxOccurs="unbounded"/>
- </sequence>
- <attribute name="point" type="string" use="required">
- <annotation>
- <documentation>
- a fully qualified identifier of the target extension point
- </documentation>
- </annotation>
- </attribute>
- <attribute name="id" type="string">
- <annotation>
- <documentation>
- an optional identifier of the extension instance
- </documentation>
- </annotation>
- </attribute>
- <attribute name="name" type="string">
- <annotation>
- <documentation>
- an optional name of the extension instance
- </documentation>
- </annotation>
- </attribute>
- </complexType>
- </element>
-
- <element name="registration">
- <annotation>
- <appInfo>
- <meta.element labelAttribute="class"/>
- </appInfo>
- <documentation>
- Proxy Extension factories registration contributor. Used to contribute the factory extensions based upon the registry type (e.g. "org.eclipse.jem.REMOTE" for remote vm registries) depending upon the container or plugin path.
- </documentation>
- </annotation>
- <complexType>
- <attribute name="registryType" type="string" use="required">
- <annotation>
- <documentation>
- The type of the registry this extensionRegistration is for, such as "org.eclipse.jem.REMOTE" for the remote vm registry type.
- </documentation>
- </annotation>
- </attribute>
- <attribute name="container" type="string">
- <annotation>
- <documentation>
- extension registration is for a container. The value is the container id (e.g. <b>"JRE_CONTAINER"</b>). This will match "/JRE_CONTAINER" or "/JRE_CONTAINER/...". Or <b>"JRE_CONTAINER/XYZ"</b> would match "/JRE_CONTAINER/XYZ/...".
-<p>
-You can also use a regular expression. An expression such as <b>"SWT_CONTAINER/.*/JFACE"</b> will match "/SWT_CONTAINER/PDE/JFACE" but will not match "/SWT_CONTAINER".
- </documentation>
- </annotation>
- </attribute>
- <attribute name="plugin" type="string">
- <annotation>
- <documentation>
- extension registration is for a plugin. The value is the plugin id (e.g. "org.eclipse.swt").
- </documentation>
- </annotation>
- </attribute>
- <attribute name="class" type="string" use="required">
- <annotation>
- <documentation>
- the class that implements this extension registration. The class must implement IExtensionRegistration.
- </documentation>
- <appInfo>
- <meta.attribute kind="java" basedOn="org.eclipse.jem.internal.proxy.core.IExtensionRegistration"/>
- </appInfo>
- </annotation>
- </attribute>
- </complexType>
- </element>
-
- <annotation>
- <appInfo>
- <meta.section type="since"/>
- </appInfo>
- <documentation>
- 1.1.0
- </documentation>
- </annotation>
-
- <annotation>
- <appInfo>
- <meta.section type="examples"/>
- </appInfo>
- <documentation>
- The following is an example of a contributor:
-
-<p>
-<pre>
- <extension point="org.eclipse.jem.proxy.extensions">
- <contributor
- registryType="org.eclipse.jem.REMOTE"
- class="com.example.ExtensionRegistrationImplementation"
- container="MY_CONTAINER">
- </contributor>
- </extension>
-</pre>
-</p>
- </documentation>
- </annotation>
-
- <annotation>
- <appInfo>
- <meta.section type="apiInfo"/>
- </appInfo>
- <documentation>
- The <samp>class</samp> attribute must be a fully-qualified class that implements the <samp>org.eclipse.jem.internal.proxy.core.IExtensionRegistration</samp> interface for extension registration.
- </documentation>
- </annotation>
-
- <annotation>
- <appInfo>
- <meta.section type="implementation"/>
- </appInfo>
- <documentation>
-
- </documentation>
- </annotation>
-
- <annotation>
- <appInfo>
- <meta.section type="copyright"/>
- </appInfo>
- <documentation>
- Copyright (c) 2004 IBM Corporation and others.<br>
-All rights reserved. This program and the accompanying materials are made
-available under the terms of the Eclipse Public License v1.0 which accompanies
-this distribution, and is available at
-<a href="http://www.eclipse.org/legal/epl-v10.html">http://www.eclipse.org/legal/epl-v10.html</a>
- </documentation>
- </annotation>
-
-</schema>
diff --git a/plugins/org.eclipse.jem.proxy/vm_remotevm/org/eclipse/jem/internal/proxy/vm/remote/AWTStarter.java b/plugins/org.eclipse.jem.proxy/vm_remotevm/org/eclipse/jem/internal/proxy/vm/remote/AWTStarter.java
deleted file mode 100644
index 9bebf32..0000000
--- a/plugins/org.eclipse.jem.proxy/vm_remotevm/org/eclipse/jem/internal/proxy/vm/remote/AWTStarter.java
+++ /dev/null
@@ -1,35 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2005 IBM Corporation and others.
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
- *
- * Contributors:
- * IBM Corporation - initial API and implementation
- *******************************************************************************/
-/*
-
-
- */
-package org.eclipse.jem.internal.proxy.vm.remote;
-
-import java.awt.Toolkit;
-
-
-/**
- * This class is used to do start the AWT eventqueue ahead of time to try to parallel process it.
- * @since 1.1.0
- */
-public class AWTStarter {
-
- public static void startAWT() {
- Thread t = new Thread() {
- public void run() {
- Thread.yield(); // So as not to possibly hold up the guy doing the starting.
- Toolkit.getDefaultToolkit();
- }
- };
- t.start();
- }
-}
diff --git a/plugins/org.eclipse.jem.proxy/vm_remotevm/org/eclipse/jem/internal/proxy/vm/remote/ArrayHelper.java b/plugins/org.eclipse.jem.proxy/vm_remotevm/org/eclipse/jem/internal/proxy/vm/remote/ArrayHelper.java
deleted file mode 100644
index 64583c5..0000000
--- a/plugins/org.eclipse.jem.proxy/vm_remotevm/org/eclipse/jem/internal/proxy/vm/remote/ArrayHelper.java
+++ /dev/null
@@ -1,118 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2001, 2005 IBM Corporation and others.
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
- *
- * Contributors:
- * IBM Corporation - initial API and implementation
- *******************************************************************************/
-package org.eclipse.jem.internal.proxy.vm.remote;
-
-import java.util.Arrays;
-/*
-
-
- */
-
-
-/**
- * This class provides similiar function as the java.lang.reflect.Array class but
- * it handles multi-dimensional arrays. Without this helper, the client would have
- * to walk down through each dimension executing a get command. This would mean
- * many transactions instead of one provided by this helper.
- *
- * It also provides some other helper functions for arrays that Array doesn't provide.
- */
-
-public final class ArrayHelper {
- // It can never be instantiated.
- private ArrayHelper() {
- }
-
- public static Object get(Object array, int[] indexes) {
- Object answer = array;
- for (int i=0; i<indexes.length; i++)
- answer = java.lang.reflect.Array.get(answer, indexes[i]);
- return answer;
- }
-
- public static byte getByte(Object array, int[] indexes) {
- return ((Byte) get(array, indexes)).byteValue();
- }
- public static boolean getBoolean(Object array, int[] indexes) {
- return ((Boolean) get(array, indexes)).booleanValue();
- }
- public static char getChar(Object array, int[] indexes) {
- return ((Character) get(array, indexes)).charValue();
- }
- public static double getDouble(Object array, int[] indexes) {
- return ((Double) get(array, indexes)).doubleValue();
- }
- public static float getFloat(Object array, int[] indexes) {
- return ((Float) get(array, indexes)).floatValue();
- }
- public static int getInt(Object array, int[] indexes) {
- return ((Integer) get(array, indexes)).intValue();
- }
- public static long getLong(Object array, int[] indexes) {
- return ((Long) get(array, indexes)).longValue();
- }
- public static short getShort(Object array, int[] indexes) {
- return ((Short) get(array, indexes)).shortValue();
- }
-
- public static void set(Object array, int[] indexes, Object value) {
- Object subArray = array;
- int upTo = indexes.length-1;
- for (int i=0; i<upTo; i++)
- subArray = java.lang.reflect.Array.get(subArray, indexes[i]);
- java.lang.reflect.Array.set(subArray, indexes[upTo], value);
- }
-
- /**
- * See if the two arrays are "equal" (not identidy, but that the contents are equal).
- * @param array1 must be an array
- * @param array2 must be an array
- * @return true if semantically equal using {@link Arrays#equals(Object[], Object[])};
- *
- * @see Arrays#equals(Object[], Object[]);
- * @since 1.2.1
- */
- public static boolean equals(Object array1, Object array2) {
- if (array1 == array2)
- return true;
- if (array1 == null || array2 == null)
- return false;
- Class aclass = array1.getClass();
- Class bclass = array2.getClass();
- if (!aclass.isArray() || !bclass.isArray())
- return false;
- Class acomp = aclass.getComponentType();
- Class bcomp = bclass.getComponentType();
- if (acomp.isPrimitive() || bcomp.isPrimitive()) {
- if (acomp != bcomp)
- return false;
- if (acomp == Integer.TYPE)
- return Arrays.equals((int[]) array1, (int[]) array2);
- else if (acomp == Boolean.TYPE)
- return Arrays.equals((boolean[]) array1, (boolean[]) array2);
- else if (acomp == Long.TYPE)
- return Arrays.equals((long[]) array1, (long[]) array2);
- else if (acomp == Short.TYPE)
- return Arrays.equals((short[]) array1, (short[]) array2);
- else if (acomp == Double.TYPE)
- return Arrays.equals((double[]) array1, (double[]) array2);
- else if (acomp == Float.TYPE)
- return Arrays.equals((float[]) array1, (float[]) array2);
- else if (acomp == Character.TYPE)
- return Arrays.equals((char[]) array1, (char[]) array2);
- else if (acomp == Byte.TYPE)
- return Arrays.equals((byte[]) array1, (byte[]) array2);
- else
- return false;
- } else
- return Arrays.equals((Object[]) array1, (Object[]) array2);
- }
-}
diff --git a/plugins/org.eclipse.jem.proxy/vm_remotevm/org/eclipse/jem/internal/proxy/vm/remote/CallbackHandler.java b/plugins/org.eclipse.jem.proxy/vm_remotevm/org/eclipse/jem/internal/proxy/vm/remote/CallbackHandler.java
deleted file mode 100644
index 5757351..0000000
--- a/plugins/org.eclipse.jem.proxy/vm_remotevm/org/eclipse/jem/internal/proxy/vm/remote/CallbackHandler.java
+++ /dev/null
@@ -1,181 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2001, 2005 IBM Corporation and others.
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
- *
- * Contributors:
- * IBM Corporation - initial API and implementation
- *******************************************************************************/
-package org.eclipse.jem.internal.proxy.vm.remote;
-/*
-
-
- */
-
-import java.net.Socket;
-import java.io.*;
-import org.eclipse.jem.internal.proxy.common.remote.Commands;
-import org.eclipse.jem.internal.proxy.common.remote.UnexpectedExceptionCommandException;
-import org.eclipse.jem.internal.proxy.common.*;
-/**
- * This is a handler for doing callbacks to the
- * client.
- *
- * This is package protected because no one should
- * use it from the outside. It is too critical that
- * callback's work only in this specified way.
- */
-class CallbackHandler extends ConnectionHandler implements ICallbackHandler {
- public CallbackHandler(Socket sc, RemoteVMServerThread svr) {
- super(sc, svr, null);
- }
-
- /**
- * Initiate a stream callback request.
- */
- public void initiateCallbackStream(int callbackID, int msgID) throws CommandException {
- try {
- Commands.sendCallbackStreamCommand(out, callbackID, msgID);
- out.flush();
- } catch (CommandException e) {
- throw e;
- } catch (Exception e) {
- throw new UnexpectedExceptionCommandException(false, e);
- }
- run(); // Now run and wait for return. If no command exeception thrown, then it signals to continue.
- }
-
- /**
- * Write bytes to the client. If bytesToWrite is -1, then this is end and
- * no bytes are being written. Just write the -1 then.
- */
- public void writeBytes(byte[] bytes, int bytesToWrite) throws CommandException {
- try {
- if (bytesToWrite != -1)
- Commands.writeBytes(out, bytes, bytesToWrite);
- else
- out.writeInt(-1);
- } catch (CommandException e) {
- throw e;
- } catch (Exception e) {
- throw new UnexpectedExceptionCommandException(false, e);
- }
- }
-
-
- /**
- * Callback, but send the parm as an object, ie. it must
- * be nothing but constants, e.g. String, Integer, or an
- * array of constants. Constants should not be things like
- * regular objects. This is because only standard java.lang
- * type constants can be assured to be available on the other
- * client. Also you don't want to send big objects, except
- * maybe something like an array of bytes or strings. It must
- * be constants that don't need to be sent back for any reason
- * since their identity will be lost in the transfer.
- *
- * This should be used if there are no parms (i.e. it is null).
- */
- public Object callbackAsConstants(int callbackID, int msgID, Object parm) throws CommandException {
-
- try {
- Commands.sendCallbackCommand(out, callbackID, msgID);
- Commands.ValueObject v = new Commands.ValueObject();
- sendObject(parm, SEND_AS_IS, v, out, false);
- out.flush();
- } catch (CommandException e) {
- throw e;
- } catch (Exception e) {
- throw new UnexpectedExceptionCommandException(false, e);
- }
- return run(); // Now run and wait for return.
- }
-
-
- // A retriever is what handles the array part.
- private class Retriever implements Commands.ValueRetrieve {
- int index=0;
- Object[] array;
- Commands.ValueObject worker = new Commands.ValueObject();
-
-
- public Retriever(Object[] anArray) {
- array = anArray;
- }
-
- public Commands.ValueObject nextValue() {
- Object parm = array[index++];
- if (parm != null) {
- if (parm instanceof ICallbackHandler.TransmitableArray) {
- // It is another array, create a new retriever.
- worker.setArrayIDS(new Retriever(((ICallbackHandler.TransmitableArray) parm).getArray()), ((ICallbackHandler.TransmitableArray) parm).getArray().length, Commands.OBJECT_CLASS);
- } else {
- // They may add some new ID's and if there is an error, they
- // won't get released, but that is a slight chance we will have
- // to take because we don't know which ones were new and which
- // ones weren't.
- fillInValue(parm, NOT_A_PRIMITIVE, worker);
- }
- } else
- worker.set();
- return worker;
- }
- };
-
- private static final Object[] NULL_SENT = new Object[1];
- /**
- * Callback, but send the parm as IDs so that proxies
- * will be created for the objects and can be referenced.
- *
- * This should be used even if there is only one parm.
- */
- public Object callbackWithParms(int callbackID, int msgID, Object[] parms) throws CommandException {
- try {
- if (parms == null)
- parms = NULL_SENT;
-
- Commands.ValueObject v = new Commands.ValueObject();
-
- v.setArrayIDS(new Retriever(parms), parms.length, Commands.OBJECT_CLASS);
- Commands.sendCallbackCommand(out, callbackID, msgID);
- Commands.writeValue(out, v, false);
- out.flush();
- } catch (CommandException e) {
- throw e;
- } catch (Exception e) {
- throw new UnexpectedExceptionCommandException(false, e);
- }
- return run(); // Now run and wait for return.
- }
-
- /**
- * A closeHandler has been requested. This is called when
- * not waiting within a loop, so we need to do the cleanup ourselves.
- */
- public void closeHandler() {
- if (isConnected()) {
- try {
- Commands.sendQuitCommand(out);
- } catch (IOException e) {
- } finally {
- if (in != null)
- try {
- in.close();
- } catch (Exception e) {
- }
- if (out != null)
- try {
- out.close();
- } catch (Exception e) {
- }
- close();
- in = null;
- out = null;
- socket = null;
- }
- }
- }
-
-}
diff --git a/plugins/org.eclipse.jem.proxy/vm_remotevm/org/eclipse/jem/internal/proxy/vm/remote/CallbackOutputStream.java b/plugins/org.eclipse.jem.proxy/vm_remotevm/org/eclipse/jem/internal/proxy/vm/remote/CallbackOutputStream.java
deleted file mode 100644
index c4d7ef7..0000000
--- a/plugins/org.eclipse.jem.proxy/vm_remotevm/org/eclipse/jem/internal/proxy/vm/remote/CallbackOutputStream.java
+++ /dev/null
@@ -1,155 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2001, 2005 IBM Corporation and others.
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
- *
- * Contributors:
- * IBM Corporation - initial API and implementation
- *******************************************************************************/
-package org.eclipse.jem.internal.proxy.vm.remote;
-/*
-
-
- */
-
-import java.io.OutputStream;
-import java.io.IOException;
-import java.io.InterruptedIOException;
-import org.eclipse.jem.internal.proxy.common.CommandException;
-import org.eclipse.jem.internal.proxy.common.remote.IOCommandException;
-/**
- * This is the special stream used to buffer and write a lot
- * of bytes to callback into the client.
- *
- * Before writing any bytes to the client, it will see if the
- * client has sent anything back. If it has, this is an indication
- * that that client has requested that the stream be closed. In that
- * case an InterruptedIOException is raised to indicate that
- * the stream will be closed and no more data will be sent.
- */
-public class CallbackOutputStream extends OutputStream {
-
- protected CallbackHandler fHandler;
- protected RemoteVMServerThread fSvr;
- protected byte[] fBuffer;
- protected int fNextByte = 0;
-
- public CallbackOutputStream(CallbackHandler handler, RemoteVMServerThread svr) {
- fHandler = handler;
- fSvr = svr;
-
- Integer bufSize = Integer.getInteger("proxyvm.bufsize"); //$NON-NLS-1$
- if (bufSize == null)
- bufSize = new Integer(5000);
- fBuffer = new byte[bufSize.intValue()];
- }
-
- protected void clearStream() {
- fSvr.returnCallbackHandler(fHandler);
- fSvr = null;
- fHandler = null;
- fBuffer = null;
- }
-
- protected void processException(CommandException e) throws IOException {
- clearStream();
- throw new IOCommandException(e);
- }
-
- public void flush() throws IOException {
- flushBuffer();
- fHandler.out.flush();
- }
-
- protected void flushBuffer() throws IOException {
- if (fHandler == null)
- throw new IOException("Stream closed. No more operations permitted."); //$NON-NLS-1$
- if (fNextByte > 0) {
- try {
- if (fHandler.in.available() > 0) {
- // There was something waiting. This means a cancel has been requested.
- fHandler.in.skip(fHandler.in.available());
- close(false); // Now close the stream. We need to have the close indicator sent so that the remote side, but we don't need to wait because the terminate response has already been sent.
- throw new InterruptedIOException();
- }
- fHandler.writeBytes(fBuffer, fNextByte);
- fNextByte = 0;
- } catch (CommandException e) {
- processException(e);
- }
- }
- }
-
- /**
- * Closes this output stream and releases any system resources
- * associated with this stream. The general contract of <code>close</code>
- * is that it closes the output stream. A closed stream cannot perform
- * output operations and cannot be reopened.
- * <p>
- * Close will send a -1 to the client and set to indicate it is closed.
- *
- * @exception IOException if an I/O error occurs.
- */
- public void close() throws IOException {
- close(true);
- }
-
-
- protected void close(boolean wait) throws IOException {
- if (fHandler != null) {
- try {
- flushBuffer();
- try {
- fHandler.writeBytes(null, -1);
- fHandler.out.flush();
- if (wait) {
- // Wait means wait for the remote side to send the terminated response.
- // A normal close will do this. If the remote side sent a cancel request, then it has already
- // sent the terminated response and it is waiting for us to send the end-of-file command.
-
- fHandler.in.readByte(); // Block and wait until the terminate request. There shouldn't be anything else in the pipeline.
- if (fHandler.in.available() > 0)
- // There was something else waiting. Let's just clear it out to be safe.
- fHandler.in.skip(fHandler.in.available());
- }
- } catch (CommandException e) {
- processException(e);
- }
- } finally {
- clearStream();
- }
- }
- }
-
- public void write(int b) throws IOException {
- fBuffer[fNextByte++] = (byte) b;
- if (fNextByte >= fBuffer.length)
- flushBuffer();
- }
-
- public void write(byte b[], int off, int len) throws IOException {
- if (b == null) {
- throw new NullPointerException();
- } else if ((off < 0) || (off > b.length) || (len < 0) ||
- ((off + len) > b.length) || ((off + len) < 0)) {
- throw new IndexOutOfBoundsException();
- } else if (len == 0) {
- return;
- }
-
- while (len > 0) {
- int move = fBuffer.length-fNextByte;
- if (len < move)
- move = len;
- System.arraycopy(b, off, fBuffer, fNextByte, move);
- len -= move;
- off += move;
- fNextByte += move;
- if (fNextByte >= fBuffer.length)
- flushBuffer();
- }
- }
-
-}
diff --git a/plugins/org.eclipse.jem.proxy/vm_remotevm/org/eclipse/jem/internal/proxy/vm/remote/ClassHelper.java b/plugins/org.eclipse.jem.proxy/vm_remotevm/org/eclipse/jem/internal/proxy/vm/remote/ClassHelper.java
deleted file mode 100644
index d1fbc55..0000000
--- a/plugins/org.eclipse.jem.proxy/vm_remotevm/org/eclipse/jem/internal/proxy/vm/remote/ClassHelper.java
+++ /dev/null
@@ -1,48 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2001, 2005 IBM Corporation and others.
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
- *
- * Contributors:
- * IBM Corporation - initial API and implementation
- *******************************************************************************/
-package org.eclipse.jem.internal.proxy.vm.remote;
-/*
-
-
- */
-
-import java.lang.reflect.Constructor;
-import java.lang.reflect.InvocationTargetException;
-
-/**
- * This class is a helper for Class accessing functions.
- * Its main function is to bypass security. This is because
- * we don't care about security for remote vm. Security is
- * handled by the IDE and compilor over there. We do what
- * we're told.
- *
- * @author richkulp
- */
-public class ClassHelper {
-
- /**
- * Constructor for ClassHelper.
- */
- private ClassHelper() {
- super();
- }
-
- private static final Class[] EMPTY_CLASS_ARRAY = new Class[0];
- private static final Object[] EMPTY_OBJECT_ARRAY = new Object[0];
- public static Object newInstance(Class targetClass) throws NoSuchMethodException, InvocationTargetException, IllegalAccessException, InstantiationException {
- // We want to get the default ctor, which is in the declared list. No need
- // to worry about inheritance because ctors are never virtual.
- Constructor ctor = targetClass.getDeclaredConstructor(EMPTY_CLASS_ARRAY);
- ctor.setAccessible(true);
- return ctor.newInstance(EMPTY_OBJECT_ARRAY);
- }
-
-}
diff --git a/plugins/org.eclipse.jem.proxy/vm_remotevm/org/eclipse/jem/internal/proxy/vm/remote/ConnectionHandler.java b/plugins/org.eclipse.jem.proxy/vm_remotevm/org/eclipse/jem/internal/proxy/vm/remote/ConnectionHandler.java
deleted file mode 100644
index 82c60d9..0000000
--- a/plugins/org.eclipse.jem.proxy/vm_remotevm/org/eclipse/jem/internal/proxy/vm/remote/ConnectionHandler.java
+++ /dev/null
@@ -1,948 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2001, 2005 IBM Corporation and others.
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
- *
- * Contributors:
- * IBM Corporation - initial API and implementation
- *******************************************************************************/
-package org.eclipse.jem.internal.proxy.vm.remote;
-/*
-
-
- */
-
-
-import java.io.*;
-import java.lang.reflect.Array;
-import java.net.Socket;
-import java.net.SocketException;
-import java.util.*;
-
-import org.eclipse.jem.internal.proxy.common.CommandException;
-import org.eclipse.jem.internal.proxy.common.remote.*;
-import org.eclipse.jem.internal.proxy.initParser.*;
-import org.eclipse.jem.internal.proxy.initParser.tree.NoExpressionValueException;
-
-/**
- * This handles one connection.
- */
-
-public class ConnectionHandler {
-
- protected Socket socket;
- final protected RemoteVMServerThread server;
- final protected Thread connectionThread;
- protected DataInputStream in;
- protected DataOutputStream out;
-
- // Kludge: Bug in Linux 1.3.xxx of JVM. Closing a socket while the socket is being read/accept will not interrupt the
- // wait. Need to timeout to the socket read/accept before the socket close will be noticed. This has been fixed
- // in Linux 1.4. So on Linux 1.3 need to put timeouts in on those sockets that can be separately closed while reading/accepting.
- static boolean LINUX_1_3 = "linux".equalsIgnoreCase(System.getProperty("os.name")) && System.getProperty("java.version","").startsWith("1.3"); //$NON-NLS-1$ //$NON-NLS-2$ //$NON-NLS-3$ //$NON-NLS-4$ //$NON-NLS-5$
-
-
- static {
- try{
- Class.forName("java.awt.Dialog");
- }
- catch (ExceptionInInitializerError e){}
- catch (LinkageError e){}
- catch (ClassNotFoundException e) {}
-
- try{
- Class.forName("sun.awt.windows.WToolkit");
- }
- catch (ExceptionInInitializerError e){}
- catch (LinkageError e){}
- catch (ClassNotFoundException e) {}
-
- try{
- Class.forName("java.awt.Component");
- }
- catch (ExceptionInInitializerError e){}
- catch (LinkageError e){}
- catch (ClassNotFoundException e) {}
- }
-
- /**
- * This may be running as a callback, in that case there is no connectionThread.
- */
- public ConnectionHandler(Socket sc, RemoteVMServerThread svr, Thread connectionThread) {
- socket = sc;
- server = svr;
- this.connectionThread = connectionThread;
-
- Integer bufSize = Integer.getInteger("proxyvm.bufsize"); //$NON-NLS-1$
- if (bufSize == null)
- bufSize = new Integer(5000);
-
- try {
- out = new DataOutputStream(new BufferedOutputStream(socket.getOutputStream(), bufSize.intValue()));
- in = new DataInputStream(new BufferedInputStream(socket.getInputStream(), bufSize.intValue()));
- } catch (IOException e) {
- }
-
- }
-
- /**
- * Did this construct correctly.
- * This is needed because an exception could be thrown in the ctor and
- * that's not a good thing to do.
- */
- public boolean isConnected() {
- return socket != null;
- }
-
- /**
- * Request the thread to close down.
- */
- public void close() {
- if (socket != null) {
- try {
- Socket s = socket;
- socket = null;
- s.close();
- } catch (Exception e) {
- }
- }
- }
-
- // Map of ID to expression processers that are currently being processed.
- private Map expressionProcessors = new HashMap();
-
- /**
- * Process and loop until told to stop. A callback_done will stop
- * the loop and will return a result. Otherwise null is returned.
- */
- public Object run() throws CommandException {
- Object result = null;
- boolean shutdown = false;
- boolean closeWhenDone = true;
- Commands.ValueObject valueObject = new Commands.ValueObject(); // Working value object so not continually recreated.
- InvokableValueSender valueSender = new InvokableValueSender(); // Working valuesender so not continually recreated.
- try {
- boolean doLoop = true;
-
- /**
- * Note: In the cases below you will see a lot of finally clauses that null variables out.
- * This is because this is a long running loop, and variables declared within blocks are not
- * garbage collected until the method is terminated, so these variables once set would never
- * be GC'd. The nulling at the end of the case makes sure that any of those objects set are
- * now available for garbage collection when necessary.
- */
- while(doLoop && isConnected()) {
- byte cmd = 0;
- try {
- if (LINUX_1_3)
- socket.setSoTimeout(1000); // Linux 1.3 bug, see comment on LINUX_1_3
- cmd = in.readByte();
- if (LINUX_1_3 && isConnected())
- socket.setSoTimeout(0); // Linux 1.3 bug, see comment on LINUX_1_3
- } catch (InterruptedIOException e) {
- continue; // Timeout, try again
- }
- switch (cmd) {
- case Commands.QUIT_CONNECTION:
- doLoop = false;
- break; // Close this connection
-
- case Commands.TERMINATE_SERVER:
- doLoop = false;
- shutdown = true; // Shutdown everything
- break;
-
- case Commands.GET_CLASS:
- String className = in.readUTF();
- Class aClass = null;
- Class superClass = null;
- String superClassName = null;
- boolean added = false;
- try {
- aClass = Class.forName(className); // Turns out using JNI format for array type will work fine.
-
- added = server.getIdentityID(aClass, valueObject);
- boolean isInterface = aClass.isInterface();
- boolean isAbstract = java.lang.reflect.Modifier.isAbstract(aClass.getModifiers());
- superClass = aClass.getSuperclass();
- superClassName = (superClass != null) ? superClass.getName() : ""; //$NON-NLS-1$
- out.writeByte(Commands.GET_CLASS_RETURN);
- out.writeInt(valueObject.objectID);
- out.writeBoolean(isInterface);
- out.writeBoolean(isAbstract);
- out.writeUTF(superClassName);
- out.flush();
- } catch (ClassNotFoundException e) {
- valueObject.set();
- Commands.sendErrorCommand(out, Commands.GET_CLASS_NOT_FOUND, valueObject);
- } catch (ExceptionInInitializerError e) {
- sendException(e.getException(), valueObject, out);
- } catch (LinkageError e) {
- sendException(e, valueObject, out);
- } catch (Throwable e) {
- // Something bad, did we add a class? If we did remove it from the table.
- if (added)
- server.removeObject(server.getObject(valueObject.objectID));
- throw e;
- } finally {
- // clear out for GC to work.
- className = null;
- aClass = null;
- superClass = null;
- superClassName = null;
- valueObject.set();
- }
- break;
-
- case Commands.GET_CLASS_FROM_ID:
- int classID = in.readInt();
- try {
- aClass = (Class) server.getObject(classID);
- boolean isInterface = aClass.isInterface();
- boolean isAbstract = java.lang.reflect.Modifier.isAbstract(aClass.getModifiers());
- superClass = aClass.getSuperclass();
- superClassName = (superClass != null) ? superClass.getName() : ""; //$NON-NLS-1$
- out.writeByte(Commands.GET_CLASS_ID_RETURN);
- out.writeUTF(aClass.getName());
- out.writeBoolean(isInterface);
- out.writeBoolean(isAbstract);
- out.writeUTF(superClassName);
- out.flush();
- } catch (ClassCastException e) {
- valueObject.set();
- Commands.sendErrorCommand(out, Commands.CLASS_CAST_EXCEPTION, valueObject);
- } finally {
- // clear out for GC to work.
- aClass = null;
- superClass = null;
- superClassName = null;
- valueObject.set();
- }
- break;
-
- case Commands.GET_OBJECT_DATA:
- int objectID = in.readInt();
- Object anObject = null;
- try {
- anObject = server.getObject(objectID);
- valueObject.setObjectID(objectID, server.getIdentityID(anObject.getClass()));
- Commands.writeValue(out, valueObject, true);
- } catch (ClassCastException e) {
- valueObject.set();
- Commands.sendErrorCommand(out, Commands.CLASS_CAST_EXCEPTION, valueObject);
- } finally {
- anObject = null; // Clear out for GC to work
- valueObject.set();
- }
- break;
-
- case Commands.RELEASE_OBJECT:
- int id = in.readInt();
- server.removeObject(server.getObject(id));
- break;
-
- case Commands.NEW_INIT_STRING:
- classID = in.readInt(); // ID Of class to do new upon.
- String initString = in.readUTF(); // The init string.
- Object newValue = null;
- Class theClass = null;
- try {
- theClass = (Class) server.getObject(classID);
- if (theClass == null) {
- // The class wasn't found. So imply ClassNotFound exception.
- throw new ClassNotFoundException();
- }
-
- InitializationStringParser parser = null;
- try {
- parser = InitializationStringParser.createParser(initString);
- newValue = parser.evaluate();
- boolean primitive = parser.isPrimitive();
- // If expected class is Void.TYPE, that means don't test the type of the result
- // to verify if correct type, just return what it really is.
- if (theClass != Void.TYPE && primitive != theClass.isPrimitive()) {
- valueObject.set();
- Commands.sendErrorCommand(out, Commands.CLASS_CAST_EXCEPTION, valueObject);
- continue; // Goto next command.
- }
- if (primitive) {
- try {
- // Need to do special tests for compatibility and assignment.
- sendObject(newValue, classID != Commands.VOID_TYPE ? classID : server.getIdentityID(parser.getExpectedType()), valueObject, out, true); // This will make sure it goes out as the correct primitive type
- } catch (ClassCastException e) {
- // The returned type is not of the correct type for what is expected.
- valueObject.set();
- Commands.sendErrorCommand(out, Commands.CLASS_CAST_EXCEPTION, valueObject);
- continue; // Goto next command
- }
- } else {
- if (newValue != null) {
- // Test to see if they are compatible. (Null can be assigned to any object,
- // so that is why it was tested out above).
- // If expected class is Void.TYPE, that means don't test the type of the result
- // to verify if correct type, just return what it really is.
- if (theClass != Void.TYPE && !theClass.isInstance(newValue)) {
- // The returned type is not of the correct type for what is expected.
- valueObject.set();
- Commands.sendErrorCommand(out, Commands.CLASS_CAST_EXCEPTION, valueObject);
- continue; // Goto next command
- }
- }
- sendObject(newValue, NOT_A_PRIMITIVE, valueObject, out, true); // Send out as an object.
- }
- } catch (InitializationStringEvaluationException e) {
- if (e instanceof EvaluationException) {
- // Want to return the real exception.
- sendException(e.getOriginalException(), valueObject, out);
- } else {
- // Couldn't be evaluated, return an error for this.
- setExceptionIntoValue(e.getOriginalException(), valueObject);
- Commands.sendErrorCommand(out, Commands.CANNOT_EVALUATE_STRING, valueObject);
- }
- } finally {
- parser = null; // Clear out for GC to work
- }
- } catch (Throwable e) {
- sendException(e, valueObject, out);
- } finally {
- // Clear out for GC to work
- initString = null;
- theClass = null;
- newValue = null;
- valueObject.set();
- }
- break;
-
- case Commands.INVOKE:
- Object target = null;
- Object[] parms = null;
- Class returnType = null;
- java.lang.reflect.Method aMethod = null;
- try {
- int methodID = in.readInt(); // ID of method to invoke
- aMethod = (java.lang.reflect.Method) server.getObject(methodID); // Method to invoke
- Commands.readValue(in, valueObject);
- target = getInvokableObject(valueObject);
- Commands.readValue(in, valueObject);
- if (valueObject.type == Commands.ARRAY_IDS) {
- // It is an array containing IDs, as it normally would be.
- valueSender.initialize(valueObject);
- Commands.readArray(in, valueObject.anInt, valueSender, valueObject, false);
- parms = (Object[]) valueSender.getArray();
- } else {
- // It is all objects or null, so it should be an Object[] or null. If not, then this is an error.
- parms = (Object[]) valueObject.anObject;
- }
-
- if (!aMethod.isAccessible())
- aMethod.setAccessible(true); // We will allow all to occur. Let access control be handled by IDE and compiler.
- newValue = aMethod.invoke(target, parms);
- returnType = aMethod.getReturnType();
- if (returnType.isPrimitive()) {
- int returnTypeID = server.getIdentityID(returnType);
- // Need to tell sendObject the correct primitive type.
- sendObject(newValue, returnTypeID, valueObject, out, true);
-
- } else {
- sendObject(newValue, NOT_A_PRIMITIVE, valueObject, out, true); // Just send the object back. sendObject knows how to iterpret the type
- }
- } catch (CommandException e) {
- throw e; // Throw it again. These we don't want to come up as an exception proxy. These should end the thread.
- } catch (java.lang.reflect.InvocationTargetException e) {
- // This is a wrappered exception. Return the wrappered one so it looks like
- // it was the real one. (Sometimes the method being invoked is on a java.lang.reflect.Constructor.newInstance,
- // which in turn is an InvocationTargetException, so we will go until we don't have an InvocationTargetException.
- Throwable t = e;
- do {
- t = ((java.lang.reflect.InvocationTargetException) t).getTargetException();
- } while (t instanceof java.lang.reflect.InvocationTargetException);
- sendException(t, valueObject, out);
- } catch (Throwable e) {
- sendException(e, valueObject, out); // Turn it into a exception proxy on the client.
- } finally {
- // Clear out for GC to work
- valueObject.set();
- parms = null;
- target = null;
- aMethod = null;
- returnType = null;
- newValue = null;
- valueSender.clear();
- }
- break;
-
- case Commands.INVOKE_WITH_METHOD_PASSED:
- aClass = null;
- String methodName = null;
- Class[] parmTypes = null;
- target = null;
- parms = null;
- returnType = null;
- aMethod = null;
-
- try {
- Commands.readValue(in, valueObject);
- aClass = (Class) getInvokableObject(valueObject); // The class that has the method.
- methodName = in.readUTF();
- Commands.readValue(in, valueObject);
- if (valueObject.type == Commands.ARRAY_IDS) {
- // It is an array containing IDs, as it normally would be.
- valueSender.initialize(valueObject);
- Commands.readArray(in, valueObject.anInt, valueSender, valueObject, false);
- parmTypes = (Class[]) valueSender.getArray();
- } else {
- // It null, so it should be an null. If not, then this is an error.
- parmTypes = null;
- }
- aMethod = aClass.getMethod(methodName, parmTypes);
-
- // Now we get the info for the invocation of the method and execute it.
- Commands.readValue(in, valueObject);
- target = getInvokableObject(valueObject);
- Commands.readValue(in, valueObject);
- if (valueObject.type == Commands.ARRAY_IDS) {
- // It is an array containing IDs, as it normally would be.
- valueSender.initialize(valueObject);
- Commands.readArray(in, valueObject.anInt, valueSender, valueObject, false);
- parms = (Object[]) valueSender.getArray();
- } else {
- // It is all objects or null, so it should be an Object[] or null. If not, then this is an error.
- parms = (Object[]) valueObject.anObject;
- }
-
- if (!aMethod.isAccessible())
- aMethod.setAccessible(true); // We will allow all to occur. Let access control be handled by IDE and compiler.
- newValue = aMethod.invoke(target, parms);
- returnType = aMethod.getReturnType();
- if (returnType.isPrimitive()) {
- int returnTypeID = server.getIdentityID(returnType);
- // Need to tell sendObject the correct primitive type.
- sendObject(newValue, returnTypeID, valueObject, out, true);
-
- } else {
- sendObject(newValue, NOT_A_PRIMITIVE, valueObject, out, true); // Just send the object back. sendObject knows how to iterpret the type
- }
- } catch (CommandException e) {
- throw e; // Throw it again. These we don't want to come up as an exception proxy. These should end the thread.
- } catch (java.lang.reflect.InvocationTargetException e) {
- // This is a wrappered exception. Return the wrappered one so it looks like
- // it was the real one. (Sometimes the method being invoked is on a java.lang.reflect.Constructor.newInstance,
- // which in turn is an InvocationTargetException, so we will go until we don't have an InvocationTargetException.
- Throwable t = e;
- do {
- t = ((java.lang.reflect.InvocationTargetException) t).getTargetException();
- } while (t instanceof java.lang.reflect.InvocationTargetException);
- sendException(t, valueObject, out);
-
- } catch (Throwable e) {
- sendException(e, valueObject, out); // Turn it into a exception proxy on the client.
- } finally {
- aClass = null;
- methodName = null;
- parmTypes = null;
- // Clear out for GC to work
- valueObject.set();
- parms = null;
- target = null;
- aMethod = null;
- returnType = null;
- newValue = null;
- valueSender.clear();
- }
- break;
-
- case Commands.GET_ARRAY_CONTENTS:
- try {
- target = server.getObject(in.readInt()); // Array to get the ids for.
- valueObject.setArrayIDS(new ArrayContentsRetriever(target), Array.getLength(target), Commands.OBJECT_CLASS);
- Commands.writeValue(out, valueObject, true); // Write it back as a value command.
- } catch (CommandException e) {
- throw e; // Throw it again. These we don't want to come up as an exception proxy. These should end the thread.
- } catch (Throwable e) {
- sendException(e, valueObject, out); // Turn it into a exception proxy on the client.
- } finally {
- target = null;
- valueObject.set();
- }
- break;
-
- case Commands.CALLBACK_DONE:
- try {
- if (connectionThread != null) {
- valueObject.set();
- Commands.sendErrorCommand(out, Commands.UNKNOWN_COMMAND_SENT, valueObject);
- } else {
- try {
- Commands.readBackValue(in, valueObject, Commands.NO_TYPE_CHECK);
- if (valueObject.type == Commands.ARRAY_IDS) {
- // It is an array containing IDs, as it normally would be.
- valueSender.initialize(valueObject);
- Commands.readArray(in, valueObject.anInt, valueSender, valueObject, false);
- result = valueSender.getArray();
- } else {
- result = getInvokableObject(valueObject);
- }
- doLoop = false; // We need to terminate and return result
- closeWhenDone = false; // Don't close, we will continue.
- } catch (CommandErrorException e) {
- // There was an command error on the other side. This means
- // connection still good, but don't continue the callback processing.
- doLoop = false; // We need to terminate and return result
- closeWhenDone = false; // Don't close, we will continue.
- throw e; // Let it go on out.
- }
- }
- } finally {
- valueObject.set();
- valueSender.clear();
- }
- break;
-
- case Commands.ERROR:
- try {
- // Got an error command. Don't know what to do but read the
- // value and simply print it out.
- Commands.readValue(in, valueObject);
- result = getInvokableObject(valueObject);
- System.out.println("Error sent to server: Result=" + result); //$NON-NLS-1$
- } finally {
- valueObject.set();
- }
- break;
-
- case Commands.EXPRESSION_TREE_COMMAND:
- try {
- processExpressionCommand(valueObject, valueSender);
- } finally {
- valueObject.set();
- valueSender.clear();
- }
- break;
-
- default:
- // Unknown command. We don't know how long it is, so we need to shut the connection down.
- System.err.println("Error: Invalid cmd send to server: Cmd=" + cmd); //$NON-NLS-1$
- doLoop = false;
- closeWhenDone = true;
- break;
- }
- }
- } catch (EOFException e) {
- // This is ok. It means that the connection on the other side was terminated.
- // So just accept this and go down.
- } catch (CommandException e) {
- throw e;
- } catch (SocketException e) {
- if (socket != null)
- throw new UnexpectedExceptionCommandException(false, e); // socket null means a valid close request
- } catch (Throwable e) {
- e.printStackTrace();
- } finally {
- if (closeWhenDone) {
- try {
- for (Iterator itr = expressionProcessors.values().iterator(); itr.hasNext();) {
- ExpressionProcesserController exp = (ExpressionProcesserController) itr.next();
- exp.close();
- }
- } finally {
- expressionProcessors.clear();
- }
-
- if (in != null)
- try {
- in.close();
- } catch (Exception e) {
- }
- in = null;
- if (out != null)
- try {
- out.close();
- } catch (Exception e) {
- }
- out = null;
- close();
- }
- }
-
- if (closeWhenDone && connectionThread != null)
- server.removeConnectionThread(connectionThread);
- if (shutdown)
- server.requestShutdown();
-
- return result;
- }
-
- // A retriever is what handles the array get contents.
- private class ArrayContentsRetriever implements Commands.ValueRetrieve {
- int index=0;
- Object array;
- int componentType;
- Commands.ValueObject worker = new Commands.ValueObject();
-
-
- public ArrayContentsRetriever(Object anArray) {
- array = anArray;
- if (anArray.getClass().getComponentType().isPrimitive()) {
- componentType = server.getIdentityID(anArray.getClass().getComponentType());
- } else
- componentType = NOT_A_PRIMITIVE;
- }
-
- public Commands.ValueObject nextValue() {
- fillInValue(Array.get(array, index++), componentType, worker);
- return worker;
- }
- };
-
-
- private void processExpressionCommand(Commands.ValueObject valueObject, InvokableValueSender valueSender) throws IOException, CommandException {
- Integer expressionID = new Integer(in.readInt());
- byte cmdType = in.readByte();
- ExpressionProcesserController exp = null;
- switch (cmdType) {
- case ExpressionCommands.START_EXPRESSION_TREE_PROCESSING:
- byte trace = in.readByte();
- if (trace == ExpressionCommands.TRACE_DEFAULT)
- exp = new ExpressionProcesserController(server, this);
- else
- exp = new ExpressionProcesserController(server, this, trace == ExpressionCommands.TRACE_ON);
- expressionProcessors.put(expressionID, exp);
- break;
- case ExpressionCommands.TRANSFER_EXPRESSION_REQUEST:
- exp = (ExpressionProcesserController) expressionProcessors.remove(expressionID);
- sendObject(exp, NOT_A_PRIMITIVE, valueObject, out, true);
- break;
- case ExpressionCommands.RESUME_EXPRESSION_REQUEST:
- Commands.readValue(in, valueObject);
- exp = (ExpressionProcesserController) getInvokableObject(valueObject);
- expressionProcessors.put(expressionID, exp);
- break;
- case ExpressionCommands.PUSH_EXPRESSION:
- exp = (ExpressionProcesserController) expressionProcessors.get(expressionID);
- exp.process(in);
- break;
- case ExpressionCommands.SYNC_REQUEST:
- boolean haveProxies = in.readBoolean(); // See if we expression proxy ids that need to be resolved
- if (haveProxies) {
- Commands.readValue(in, valueObject);
- valueSender.initialize(valueObject);
- Commands.readArray(in, valueObject.anInt, valueSender, valueObject, false);
- }
-
- exp = (ExpressionProcesserController) expressionProcessors.get(expressionID);
- if (haveProxies)
- sendExpressionProxyResolutions(valueObject, (int[]) valueSender.getArray(), exp);
- if (exp.noErrors()) {
- valueObject.set(true); // Mark that all is good.
- Commands.writeValue(out, valueObject, true, true);
- } else {
- processExpressionError(exp, valueObject);
- }
- break;
- case ExpressionCommands.PULL_VALUE_REQUEST:
- haveProxies = in.readBoolean(); // See if we expression proxy ids that need to be resolved
- if (haveProxies) {
- Commands.readValue(in, valueObject);
- valueSender.initialize(valueObject);
- Commands.readArray(in, valueObject.anInt, valueSender, valueObject, false);
- }
-
- exp = (ExpressionProcesserController) expressionProcessors.get(expressionID);
- if (haveProxies)
- sendExpressionProxyResolutions(valueObject, (int[]) valueSender.getArray(), exp);
- if (exp.noErrors()) {
- try {
- Object[] pulledValue = exp.pullValue();
- // Send back the command code for pull value. Don't flush. We will flush when all done.
- if (((Class) pulledValue[1]).isPrimitive()) {
- int returnTypeID = server.getIdentityID(pulledValue[1]);
- // Need to tell sendObject the correct primitive type.
- sendObject(pulledValue[0], returnTypeID, valueObject, out, true, true);
-
- } else {
- sendObject(pulledValue[0], NOT_A_PRIMITIVE, valueObject, out, true, true); // Just send the object back. sendObject knows how to iterpret the type
- }
- } catch (NoExpressionValueException e) {
- sendNoValueErrorCommand(exp, valueObject);
- }
- } else
- processExpressionError(exp, valueObject);
- break;
- case ExpressionCommands.END_EXPRESSION_TREE_PROCESSING:
- exp = (ExpressionProcesserController) expressionProcessors.remove(expressionID);
- exp.close();
- break;
- }
- }
-
- /*
- * @param is
- * @param exp
- *
- * @since 1.1.0
- */
- private void sendExpressionProxyResolutions(Commands.ValueObject valueObject, final int[] proxyIDs, final ExpressionProcesserController exp) throws CommandException {
- class ExpressionProxyRetriever implements Commands.ValueRetrieve {
- int index = 0;
- Object[] proxyResolution = new Object[2];
- Commands.ValueObject worker = new Commands.ValueObject();
-
- public Commands.ValueObject nextValue() {
- int proxyID = proxyIDs[index++];
- if (exp.pullExpressionProxyValue(proxyID, proxyResolution)) {
- if (proxyResolution[1] != Void.TYPE) {
- if (((Class) proxyResolution[1]).isPrimitive()) {
- int returnTypeID = server.getIdentityID(proxyResolution[1]);
- // Need to tell worker the correct primitive type.
- fillInValue(proxyResolution[0], returnTypeID, worker);
- } else {
- fillInValue(proxyResolution[0], NOT_A_PRIMITIVE, worker);
- }
- } else
- worker.setFlag(ExpressionCommands.EXPRESSIONPROXY_VOIDTYPE); // It was resolved, but to not set due to void type of expression.
- } else
- worker.setFlag(ExpressionCommands.EXPRESSIONPROXY_NOTRESOLVED); // It wasn't resolved.
-
- return worker;
- }
- };
-
- valueObject.setArrayIDS(new ExpressionProxyRetriever(), proxyIDs.length, Commands.OBJECT_CLASS);
- Commands.writeValue(out, valueObject, true, false); // Write it back as a value command.
-
- }
-
- private void processExpressionError(ExpressionProcesserController exp, Commands.ValueObject valueObject) throws CommandException {
- if (exp.isNoExpressionValue()) {
- sendNoValueErrorCommand(exp, valueObject);
- } else
- sendException(exp.getErrorThrowable(), valueObject, out);
- }
-
- /*
- * @param exp
- * @param valueObject
- * @throws CommandException
- *
- * @since 1.1.0
- */
- private void sendNoValueErrorCommand(ExpressionProcesserController exp, Commands.ValueObject valueObject) throws CommandException {
- setExceptionIntoValue(exp.getErrorThrowable(), valueObject);
- Commands.sendErrorCommand(out, ExpressionCommands.EXPRESSION_NOEXPRESSIONVALUE_EXCEPTION, valueObject);
- }
-
-protected static final int NOT_A_PRIMITIVE = Commands.NOT_AN_ID;
-protected static final int SEND_AS_IS = -2; // This means sends as an object not as an id.
-
-public static final int CLASS_ADDED = 1;
-public static final int OBJECT_ADDED = 2;
-public int fillInValue(Object object, int primitiveTypeID, Commands.ValueObject valueObject) {
- int added = 0;
- if (object == null) {
- valueObject.set();
- } else {
- int classID = 0;
- if (primitiveTypeID != NOT_A_PRIMITIVE && primitiveTypeID != SEND_AS_IS) {
- classID = primitiveTypeID; // The object is really supposed to be a primitive of this type
- switch (classID) {
- case Commands.BOOLEAN_TYPE:
- valueObject.set(((Boolean) object).booleanValue());
- break;
- case Commands.INTEGER_TYPE:
- if (object instanceof Character)
- valueObject.set((int) ((Character) object).charValue()); // Because char can be widened to an int
- else
- valueObject.set(((Number) object).intValue());
- break;
- case Commands.BYTE_TYPE:
- valueObject.set(((Number) object).byteValue());
- break;
- case Commands.CHARACTER_TYPE:
- valueObject.set(((Character) object).charValue());
- break;
- case Commands.DOUBLE_TYPE:
- if (object instanceof Character)
- valueObject.set((double) ((Character) object).charValue()); // Because char can be widened to a double
- else
- valueObject.set(((Number) object).doubleValue());
- break;
- case Commands.FLOAT_TYPE:
- if (object instanceof Character)
- valueObject.set((float) ((Character) object).charValue()); // Because char can be widened to a float
- else
- valueObject.set(((Number) object).floatValue());
- break;
- case Commands.SHORT_TYPE:
- valueObject.set(((Number) object).shortValue());
- break;
- case Commands.LONG_TYPE:
- if (object instanceof Character)
- valueObject.set((long) ((Character) object).charValue()); // Because char can be widened to a long
- else
- valueObject.set(((Number) object).longValue());
- break;
- }
- } else {
- // It's not a primitive.
- boolean addObject = false, addClass = false;
- Class objClass = object.getClass();
- classID = server.getIdentityID(objClass);
- if (classID == RemoteVMServerThread.ID_NOT_FOUND) {
- Commands.ValueObject classValue = new Commands.ValueObject();
- addClass = server.getIdentityID(objClass, classValue);
- if (addClass)
- added |= CLASS_ADDED;
- classID = classValue.objectID;
- }
-
- switch (classID) {
- case Commands.BYTE_CLASS:
- valueObject.set((Byte) object);
- break;
- case Commands.CHARACTER_CLASS:
- valueObject.set((Character) object);
- break;
- case Commands.DOUBLE_CLASS:
- valueObject.set((Double) object);
- break;
- case Commands.FLOAT_CLASS:
- valueObject.set((Float) object);
- break;
- case Commands.INTEGER_CLASS:
- valueObject.set((Integer) object);
- break;
- case Commands.LONG_CLASS:
- valueObject.set((Long) object);
- break;
- case Commands.SHORT_CLASS:
- valueObject.set((Short) object);
- break;
- case Commands.BOOLEAN_CLASS:
- valueObject.set((Boolean) object);
- break;
- case Commands.STRING_CLASS:
- valueObject.set((String) object);
- break;
- case Commands.BIG_DECIMAL_CLASS:
- valueObject.set(object, Commands.BIG_DECIMAL_CLASS);
- break;
- case Commands.BIG_INTEGER_CLASS:
- valueObject.set(object, Commands.BIG_INTEGER_CLASS);
- break;
- default:
- if (primitiveTypeID != SEND_AS_IS) {
- addObject = server.getIdentityID(object, valueObject);
- if (addObject) {
- added |= OBJECT_ADDED;
- valueObject.setObjectID(valueObject.objectID, classID);
- } else
- valueObject.setObjectID(valueObject.objectID);
- } else
- valueObject.set(object, classID);
- break;
- }
- }
- }
-
- return added;
-}
-
-public void sendObject(Object object, int primitiveTypeID, Commands.ValueObject valueObject, DataOutputStream out, boolean writeAsCommand) throws CommandException {
- sendObject(object, primitiveTypeID, valueObject, out, writeAsCommand, writeAsCommand);
-}
-public void sendObject(Object object, int primitiveTypeID, Commands.ValueObject valueObject, DataOutputStream out, boolean writeAsCommand, boolean flush) throws CommandException {
- int added = fillInValue(object, primitiveTypeID, valueObject);
- boolean sent = false;
- try {
- Commands.writeValue(out, valueObject, writeAsCommand, flush); // Write it back as a value command.
- sent = true;
- } finally {
- if (!sent) {
- // Ending due to some problem, so clean up any added objects from the id table.
- if ((added & OBJECT_ADDED) != 0)
- server.removeObject(valueObject.objectID);
- if ((added & CLASS_ADDED) != 0)
- server.removeObject(valueObject.classID);
- }
- }
-}
-
-
- public void sendException(Throwable e, Commands.ValueObject value, DataOutputStream out) throws CommandException {
- // Exception ocurred, return a value command with the exception within it.
- setExceptionIntoValue(e, value);
- Commands.sendErrorCommand(out, Commands.THROWABLE_SENT, value);
- }
-
- public void setExceptionIntoValue(Throwable e, Commands.ValueObject value) {
- server.getIdentityID(e, value); // It should always create it so we don't need to know.
- int eID = value.objectID;
- Class eClass = e.getClass();
- server.getIdentityID(eClass, value);
- int eClassID = value.objectID;
- value.setException(eID, eClassID);
- }
-
- /**
- * From the valueObject, get an Object that is invokable (i.e. can be the target of an invoke, or one of its parms).
- * If it is an array type, the a ValueSender is returned. The invoker needs to then cast this
- * to a ValueSender and call the readArray routine.
- */
- public Object getInvokableObject(final Commands.ValueObject value) {
- switch (value.type) {
- case Commands.NEW_OBJECT_ID:
- case Commands.OBJECT_ID:
- // These need to have access to the server to get the real object
- return server.getObject(value.objectID);
- default:
- // These have all the info needed within the value object itself, so ask it.
- return value.getAsObject();
- }
- }
-
- // Helper class for getting an array.
- private class InvokableValueSender implements Commands.ValueSender {
- int index = 0;
- Object array;
-
- public InvokableValueSender() {
- }
-
- public InvokableValueSender(Commands.ValueObject arrayHeader) {
- initialize(arrayHeader);
- }
-
- public void initialize(Commands.ValueObject arrayHeader) {
- index = 0;
- Class arrayType = (Class) server.getObject(arrayHeader.classID);
- array = java.lang.reflect.Array.newInstance(arrayType, arrayHeader.anInt);
- }
-
- public void clear() {
- array = null;
- index = 0;
- }
-
- public Object getArray() {
- return array;
- }
-
- // A new value is being sent to the array
- public void sendValue(Commands.ValueObject value) {
- java.lang.reflect.Array.set(array, index++, getInvokableObject(value)); // add it to the array
- }
-
- // The next entry is an array too!
- public Commands.ValueSender nestedArray(Commands.ValueObject arrayHeader) {
- InvokableValueSender sender = new InvokableValueSender(arrayHeader);
- // Take the newly created array and put it into the current array.
- java.lang.reflect.Array.set(array, index++, sender.getArray());
- return sender;
- }
- }
-
-}
-
-
diff --git a/plugins/org.eclipse.jem.proxy/vm_remotevm/org/eclipse/jem/internal/proxy/vm/remote/ConnectionThread.java b/plugins/org.eclipse.jem.proxy/vm_remotevm/org/eclipse/jem/internal/proxy/vm/remote/ConnectionThread.java
deleted file mode 100644
index 7232753..0000000
--- a/plugins/org.eclipse.jem.proxy/vm_remotevm/org/eclipse/jem/internal/proxy/vm/remote/ConnectionThread.java
+++ /dev/null
@@ -1,53 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2001, 2005 IBM Corporation and others.
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
- *
- * Contributors:
- * IBM Corporation - initial API and implementation
- *******************************************************************************/
-package org.eclipse.jem.internal.proxy.vm.remote;
-/*
-
-
- */
-
-
-import java.net.Socket;
-
-import org.eclipse.jem.internal.proxy.common.CommandException;
-/**
- * This is a thread to handle one connection.
- */
-
-public class ConnectionThread extends Thread {
-
- final protected ConnectionHandler connectionHandler;
-
- public ConnectionThread(Socket sc, RemoteVMServerThread svr, String name) {
- super(name);
-
- connectionHandler = new ConnectionHandler(sc, svr, this);
- }
-
- /**
- * Request the thread to close down.
- */
- public void close() {
- try {
- connectionHandler.close();
- } catch (Exception e) {
- }
- }
-
- public void run() {
- try {
- connectionHandler.run();
- } catch (CommandException e) {
- e.printStackTrace();
- }
- }
-
-}
diff --git a/plugins/org.eclipse.jem.proxy/vm_remotevm/org/eclipse/jem/internal/proxy/vm/remote/ExpressionProcesserController.java b/plugins/org.eclipse.jem.proxy/vm_remotevm/org/eclipse/jem/internal/proxy/vm/remote/ExpressionProcesserController.java
deleted file mode 100644
index 3db60db..0000000
--- a/plugins/org.eclipse.jem.proxy/vm_remotevm/org/eclipse/jem/internal/proxy/vm/remote/ExpressionProcesserController.java
+++ /dev/null
@@ -1,801 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2004, 2005 IBM Corporation and others.
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
- *
- * Contributors:
- * IBM Corporation - initial API and implementation
- *******************************************************************************/
-/*
-
-
- */
-package org.eclipse.jem.internal.proxy.vm.remote;
-
-import java.io.DataInputStream;
-import java.io.IOException;
-import java.lang.reflect.Field;
-import java.lang.reflect.Method;
-import java.util.Arrays;
-import java.util.List;
-
-import org.eclipse.jem.internal.proxy.common.*;
-import org.eclipse.jem.internal.proxy.common.remote.Commands;
-import org.eclipse.jem.internal.proxy.common.remote.ExpressionCommands;
-import org.eclipse.jem.internal.proxy.initParser.tree.*;
-
-
-/**
- * This processes the commands for expression processing and sends them over
- * to the common expression processer.
- *
- * This will be instantiated on the start of an expression. And then
- * each expression request from the IDE will be sent into here. The
- * reason this guy doesn't hold onto the connection and process the
- * entire expression is because we need to return to the connection
- * handler to keep the connection live (there is timeouts and stuff
- * in there that we don't want to duplicate here).
- * <p>
- * If there are any expression processing errors (versus hard io errors) we
- * will save up the error but don't do any more processing other than to make
- * sure we read the complete subcommand. This is so that the inputstream is left
- * in a valid state without standed data.
- * <p>
- * The at the sync point (either get value or sync subcommand) we will send back
- * the error.
- *
- * @since 1.0.0
- */
-public class ExpressionProcesserController {
-
-
- protected final RemoteVMServerThread server;
- protected final ConnectionHandler connHandler;
- protected final ExpressionProcesser exp;
- protected Commands.ValueObject workerValue = new Commands.ValueObject(); // A worker value object so we don't need to keep creating them and releasing them.
- private ClassLoader classLoader;
-
- /**
- * Create with a default expression processer and use default flag for trace.
- * @param server
- *
- * @since 1.0.0
- */
- public ExpressionProcesserController(RemoteVMServerThread server, ConnectionHandler connHandler) {
- this(server, connHandler, new ExpressionProcesser(Boolean.getBoolean(ExpressionCommands.EXPRESSIONTRACE), Long.getLong(ExpressionCommands.EXPRESSIONTRACE_TIMER_THRESHOLD, -1L).longValue()));
- }
-
- /**
- * Construct with a default expression processer.
- * @param server
- * @param connHandler
- * @param trace
- *
- * @since 1.1.0
- */
- public ExpressionProcesserController(RemoteVMServerThread server, ConnectionHandler connHandler, boolean trace) {
- this(server, connHandler, new ExpressionProcesser(trace, Long.getLong(ExpressionCommands.EXPRESSIONTRACE_TIMER_THRESHOLD, -1L).longValue()));
- }
-
- /**
- * Create from a subclass with a given expression processer.
- *
- * @param server
- * @param exp
- *
- * @since 1.0.0
- */
- protected ExpressionProcesserController(RemoteVMServerThread server, ConnectionHandler connHandler, ExpressionProcesser exp) {
- this.server = server;
- this.connHandler = connHandler;
- this.exp = exp;
- }
-
- /**
- * Set the class loader to use for finding classes. If never set, or if <code>null</code>, then
- * <code>Class.forName</code> will be used.
- *
- * @param classLoader
- *
- * @since 1.0.0
- */
- public void setClassLoader(ClassLoader classLoader) {
- this.classLoader = classLoader;
- }
-
- /*
- * Array of primitive type names. Used to look up primtive types in primitive types array.
- *
- * @since 1.0.0
- */
- private static final List PRIMITIVE_NAMES = Arrays.asList(new String[] {"byte", "char", "short", "int", "long", "float", "double"}); //$NON-NLS-1$ //$NON-NLS-2$ //$NON-NLS-3$ //$NON-NLS-4$ //$NON-NLS-5$ //$NON-NLS-6$ //$NON-NLS-7$
- private static final Class[] PRIMITIVE_TYPES = new Class[] {Byte.TYPE, Character.TYPE, Short.TYPE, Integer.TYPE, Long.TYPE, Float.TYPE, Double.TYPE};
- /**
- * Load the class given the name. If not found, return null.
- *
- * @param className
- * @return
- *
- * @since 1.0.0
- */
- protected Class loadClass(String className) throws ClassNotFoundException {
- if (className == null)
- return null;
- else if (className.endsWith("[]")) { //$NON-NLS-1$
- // We have an array request instead. This is trickier.
- return loadClass(MapTypes.getJNIFormatName(className));
- } else {
- int primIndex = PRIMITIVE_NAMES.indexOf(className);
- if (primIndex >= 0)
- return PRIMITIVE_TYPES[primIndex];
- else if (classLoader == null) {
- return Class.forName(className);
- } else {
- return classLoader.loadClass(className);
- }
- }
- }
-
- /**
- * Now process the input stream. If either throws occurs, this is a hard error and we must terminate
- * the entire connection. The input stream is in an unknown state.
- *
- * @param in The input stream to get the data for the current sub-command.
- *
- * @throws CommandException
- * @throws IOException
- * @since 1.0.0
- */
- public void process(DataInputStream in) throws CommandException, IOException {
- // In the following subcommand processing, we always read the entire subcommand from the stream.
- // This is so that any errors during processing will not mess up the stream with unread data.
- //
- // Then we check if an error has occurred in the past. If it has, we simply break. This is because
- // once an error occurred we don't want to continue wasting time evaluating, however we need to make
- // sure that the stream is read completely so that we don't have a corrupted input stream. That way
- // when all is done we can return the error and still have a valid connection socket.
- byte subcommand = in.readByte();
- try {
- switch (subcommand) {
- case InternalExpressionTypes.PUSH_TO_PROXY_EXPRESSION_VALUE:
- // Getting a proxy push. The value is sent as valueObject, so use that to read it in.
- Commands.readValue(in, workerValue);
- Object value = connHandler.getInvokableObject(workerValue);
- if (value == null)
- exp.pushExpression(null, MethodHelper.NULL_TYPE);
- else if (workerValue.isPrimitive())
- exp.pushExpression(value, workerValue.getPrimitiveType());
- else
- exp.pushExpression(value, value.getClass());
- break;
-
- case InternalExpressionTypes.CAST_EXPRESSION_VALUE:
- // Get a cast request. The type is sent as valueObject.
- Commands.readValue(in, workerValue);
- try {
- Class classValue = getBeanTypeValue(workerValue);
- exp.pushCast(classValue);
- } catch (FailedProxyException e) {
- exp.processException(e.getCause()); // Let the processor know we have a stopping error.
- }
- break;
-
- case InternalExpressionTypes.INSTANCEOF_EXPRESSION_VALUE:
- // Get a instanceof request. The type is sent as valueObject.
- Commands.readValue(in, workerValue);
- try {
- Class classValue = getBeanTypeValue(workerValue);
- exp.pushInstanceof(classValue);
- } catch (FailedProxyException e) {
- exp.processException(e.getCause()); // Let the processor know we have a stopping error.
- }
- break;
-
- case InternalExpressionTypes.INFIX_EXPRESSION_VALUE:
- // Get an infix request. The operator and operand type are sent as bytes.
- byte infix_operator = in.readByte();
- byte infix_operandType = in.readByte();
- exp.pushInfix(InfixOperator.get(infix_operator), InternalInfixOperandType.get(infix_operandType));
- break;
-
- case InternalExpressionTypes.PREFIX_EXPRESSION_VALUE:
- // Get a prefix request. The operator is sent as byte.
- byte prefix_operandType = in.readByte();
- exp.pushPrefix(PrefixOperator.get(prefix_operandType));
- break;
-
- case InternalExpressionTypes.ARRAY_ACCESS_EXPRESSION_VALUE:
- // Get an array access request. The index cound is sent as int.
- int arrayAccess_Indexcount = in.readInt();
- exp.pushArrayAccess(arrayAccess_Indexcount);
- break;
-
- case InternalExpressionTypes.ARRAY_CREATION_EXPRESSION_VALUE:
- // Get an array creation request. The type is sent as valueObject, followed by int dimension count.
- Commands.readValue(in, workerValue);
- int arrayCreation_dimCount = in.readInt();
- try {
- Class classValue = getBeanTypeValue(workerValue);
- exp.pushArrayCreation(classValue, arrayCreation_dimCount);
- } catch (FailedProxyException e) {
- exp.processException(e.getCause()); // Let the processor know we have a stopping error.
- }
- break;
-
- case InternalExpressionTypes.ARRAY_INITIALIZER_EXPRESSION_VALUE:
- // Get an array initializer request. The type is sent as valueObject, followed by int expression count.
- Commands.readValue(in, workerValue);
- int stripCount = in.readInt();
- int arrayInitializer_expressionCount = in.readInt();
- try {
- Class classValue = getBeanTypeValue(workerValue);
- exp.pushArrayInitializer(classValue, stripCount, arrayInitializer_expressionCount);
- } catch (FailedProxyException e) {
- exp.processException(e.getCause()); // Let the processor know we have a stopping error.
- }
- break;
-
- case InternalExpressionTypes.CLASS_INSTANCE_CREATION_EXPRESSION_VALUE:
- // Get a class instance creation request. The type is sent as valueObject, followed by int argument count.
- Commands.readValue(in, workerValue);
- int newInstance_argCount = in.readInt();
- try {
- Class classValue = getBeanTypeValue(workerValue);
- exp.pushClassInstanceCreation(classValue, newInstance_argCount);
- } catch (FailedProxyException e) {
- exp.processException(e.getCause()); // Let the processor know we have a stopping error.
- }
- break;
-
- case InternalExpressionTypes.TYPERECEIVER_EXPRESSION_VALUE:
- // Get a type receiver request. The type is sent as valueObject.
- Commands.readValue(in, workerValue);
- try {
- Class classValue = getBeanTypeValue(workerValue);
- exp.pushExpression(classValue, classValue);
- } catch (FailedProxyException e) {
- exp.processException(e.getCause()); // Let the processor know we have a stopping error.
- }
- break;
-
- case InternalExpressionTypes.FIELD_ACCESS_EXPRESSION_VALUE:
- // Get a field access request. Command.ValueObject, followed by hasReceiver as boolean.
- Commands.readValue(in, workerValue);
- boolean has_fieldAccess_receiver = in.readBoolean();
- try {
- Object fieldAccess = getFieldValue(workerValue);
- exp.pushFieldAccess(fieldAccess, workerValue.getType() == Commands.STRING, has_fieldAccess_receiver);
- } catch (ClassCastException e) {
- exp.processException(e); // Let the processor know we have a stopping error.
- } catch (FailedProxyException e) {
- exp.processException(e.getCause()); // Let the processor know we have a stopping error.
- }
- break;
-
- case InternalExpressionTypes.METHOD_EXPRESSION_VALUE:
- // Get a method invocation request. Sent as Commands.ValueObject, followed by hasReceiver as boolean., and argCount as int.
- Commands.readValue(in, workerValue);
- boolean has_method_receiver = in.readBoolean();
- int method_argCount = in.readInt();
- try {
- Object method = getMethodValue(workerValue);
- exp.pushMethodInvocation(method, workerValue.getType() == Commands.STRING, has_method_receiver, method_argCount);
- } catch (FailedProxyException e) {
- exp.processException(e.getCause()); // Let the processor know we have a stopping error.
- }
- break;
-
- case InternalExpressionTypes.CONDITIONAL_EXPRESSION_VALUE:
- // Get a conditional expression request. The expression type (ie. condition/true/false) is sent as a byte
- exp.pushConditional(InternalConditionalOperandType.get(in.readByte()));
- break;
-
- case InternalExpressionTypes.ASSIGNMENT_PROXY_EXPRESSION_VALUE:
- // Get an assignment expression request. The proxy id is sent as an int.
- int proxyid = in.readInt();
- exp.pushAssignment(new RemoteExpressionProxy(proxyid));
- break;
-
- case InternalExpressionTypes.ASSIGNMENT_EXPRESSION_VALUE:
- // Get an assignment expression request. Nothing else to read from stream.
- exp.pushAssignment();
- break;
-
- case InternalExpressionTypes.PUSH_TO_EXPRESSION_PROXY_EXPRESSION_VALUE:
- // Get a push expression proxy expression. The proxy id is sent as an int.
- // First test if a possible FailedExpressionProxy because we could of been pushing
- // a failed reflection proxy.
- proxyid = in.readInt();
- try {
- exp.getExpressionProxy(proxyid, new Object[] {null, null});
- } catch (NoExpressionValueException e1) {
- if (e1.getProxy() != null) {
- FailedRemoteExpressionProxy failure = (FailedRemoteExpressionProxy) e1.getProxy();
- exp.processException((Throwable) failure.getValue());
- break; // Don't go on, we processed it. A standard no expression value should be passed on and let following code handle it.
- }
- }
- exp.pushExpressionProxy(proxyid);
- break;
-
- case InternalExpressionTypes.BLOCK_BEGIN_EXPRESSION_VALUE:
- // Get a begin block proxy expression. The block id is sent as an int.
- exp.pushBlockBegin(in.readInt());
- break;
-
- case InternalExpressionTypes.BLOCK_BREAK_EXPRESSION_VALUE:
- // Get a break block proxy expression. The block id is sent as an int.
- exp.pushBlockBreak(in.readInt());
- break;
-
- case InternalExpressionTypes.BLOCK_END_EXPRESSION_VALUE:
- // Get a end block proxy expression. The block id is sent as an int.
- exp.pushBlockEnd(in.readInt());
- break;
-
- case InternalExpressionTypes.TRY_BEGIN_EXPRESSION_VALUE:
- // Get a try begin proxy expression. The try id is sent as an int.
- exp.pushTryBegin(in.readInt());
- break;
-
- case InternalExpressionTypes.TRY_CATCH_EXPRESSION_VALUE:
- int tryNumber = in.readInt();
- Commands.readValue(in, workerValue);
- proxyid = in.readInt();
- try {
- Class classValue = getBeanTypeValue(workerValue);
- exp.pushTryCatchClause(tryNumber, classValue, proxyid != -1 ? new RemoteExpressionProxy(proxyid) : null);
- } catch (FailedProxyException e) {
- exp.processException(e.getCause()); // Let the processor know we have a stopping error.
- }
- break;
-
- case InternalExpressionTypes.TRY_FINALLY_EXPRESSION_VALUE:
- // Get a try finally proxy expression. The try id is sent as an int.
- exp.pushTryFinallyClause(in.readInt());
- break;
-
- case InternalExpressionTypes.TRY_END_EXPRESSION_VALUE:
- // Get a try end proxy expression. The try id is sent as an int.
- exp.pushTryEnd(in.readInt());
- break;
-
- case InternalExpressionTypes.THROW_EXPRESSION_VALUE:
- exp.pushThrowException();
- break;
-
- case InternalExpressionTypes.RETHROW_EXPRESSION_VALUE:
- // Get a rethrow proxy expression. The try id is sent as an int.
- exp.pushTryRethrow(in.readInt());
- break;
-
- case InternalExpressionTypes.PUSH_BEANTYPE_EXPRESSIONPROXY_EXPRESSION_VALUE:
- // Get the beantype expression proxy and resolve it.
- proxyid = in.readInt();
- String typeName = Commands.readStringData(in);
- try {
- Class classValue = loadClass(typeName);
- RemoteExpressionProxy rep = new RemoteExpressionProxy(proxyid);
- rep.setProxy(classValue, Class.class);
- exp.allocateExpressionProxy(rep);
- } catch (ClassNotFoundException e) {
- FailedRemoteExpressionProxy rep = new FailedRemoteExpressionProxy(proxyid);
- rep.setProxy(e, e.getClass());
- exp.allocateExpressionProxy(rep);
- } catch (LinkageError e) {
- FailedRemoteExpressionProxy rep = new FailedRemoteExpressionProxy(proxyid);
- rep.setProxy(e, e.getClass());
- exp.allocateExpressionProxy(rep);
- }
- break;
-
- case InternalExpressionTypes.PUSH_METHOD_EXPRESSIONPROXY_EXPRESSION_VALUE:
- // Get the Method expression proxy and resolve it.
- // Comes over as:
- // int for proxy id for the method
- // beanTypeValue for declaring class (either beantype or expression proxy)
- // string for method name
- // int for arg count
- // beanTypeValue(s) for arg types (as many as arg count).
- proxyid = in.readInt();
- Commands.ValueObject decClassValue = Commands.readValue(in, new Commands.ValueObject());
- String methodName = Commands.readStringData(in);
- int argCount = in.readInt();
- Commands.ValueObject[] args = null;
- if (argCount > 0) {
- args = new Commands.ValueObject[argCount];
- for (int i = 0; i < argCount; i++) {
- args[i] = Commands.readValue(in, new Commands.ValueObject());
- }
- }
- Class decClass = null;
- Class[] argClasses = null;
- try {
- decClass = getBeanTypeValue(decClassValue);
- argClasses = null;
- if (argCount>0) {
- argClasses = new Class[argCount];
- for (int i = 0; i < argCount; i++) {
- argClasses[i] = getBeanTypeValue(args[i]);
- }
- }
- // Now get the method itself.
- Method m = decClass.getMethod(methodName, argClasses);
- RemoteExpressionProxy rep = new RemoteExpressionProxy(proxyid);
- rep.setProxy(m, Method.class);
- exp.allocateExpressionProxy(rep);
- } catch (FailedProxyException e) {
- FailedRemoteExpressionProxy rep = new FailedRemoteExpressionProxy(proxyid);
- rep.setProxy(e.getCause(), e.getCause().getClass());
- exp.allocateExpressionProxy(rep);
- } catch (NoSuchMethodException e) {
- // The default trace doesn't show what method was being searched for, so recreate with that.
- StringBuffer s = new StringBuffer();
- s.append(decClass.getName());
- s.append('.');
- s.append(methodName);
- s.append('(');
- if (argClasses != null) {
- for (int i = 0; i < argClasses.length; i++) {
- if (i > 0)
- s.append(',');
- s.append(argClasses[i].getName());
- }
- }
- s.append(')');
- NoSuchMethodException ne = new NoSuchMethodException(s.toString());
- ne.setStackTrace(e.getStackTrace());
- FailedRemoteExpressionProxy rep = new FailedRemoteExpressionProxy(proxyid);
- rep.setProxy(ne, ne.getClass());
- exp.allocateExpressionProxy(rep);
- }
- break;
-
- case InternalExpressionTypes.PUSH_FIELD_EXPRESSIONPROXY_EXPRESSION_VALUE:
- // Get the Filed expression proxy and resolve it.
- // Comes over as:
- // int for proxy id for the field
- // beanTypeValue for declaring class (either beantype or expression proxy)
- // string for field name
- proxyid = in.readInt();
- decClassValue = Commands.readValue(in, new Commands.ValueObject());
- String fieldName = Commands.readStringData(in);
- try {
- decClass = getBeanTypeValue(decClassValue);
- // Now get the field itself.
- Field f = decClass.getField(fieldName);
- RemoteExpressionProxy rep = new RemoteExpressionProxy(proxyid);
- rep.setProxy(f, Method.class);
- exp.allocateExpressionProxy(rep);
- } catch (FailedProxyException e) {
- FailedRemoteExpressionProxy rep = new FailedRemoteExpressionProxy(proxyid);
- rep.setProxy(e.getCause(), e.getCause().getClass());
- exp.allocateExpressionProxy(rep);
- } catch (NoSuchFieldException e) {
- FailedRemoteExpressionProxy rep = new FailedRemoteExpressionProxy(proxyid);
- rep.setProxy(e, e.getClass());
- exp.allocateExpressionProxy(rep);
- }
- break;
-
- case InternalExpressionTypes.IF_TEST_EXPRESSION_VALUE:
- // Get a if test expression request.
- exp.pushIfElse();
- break;
-
- case InternalExpressionTypes.IF_ELSE_EXPRESSION_VALUE:
- // Get a if/else expression clause request. The clause type (ie. true/false) is sent as a byte
- exp.pushIfElse(InternalIfElseOperandType.get(in.readByte()));
- break;
-
- case InternalExpressionTypes.NEW_INSTANCE_VALUE:
- // Get a new instance from string.
- String initString = Commands.readStringData(in);
- workerValue = Commands.readValue(in, new Commands.ValueObject());
- try {
- Class classValue = getBeanTypeValue(workerValue);
- exp.pushNewInstanceFromString(initString, classValue, classLoader);
- } catch (FailedProxyException e) {
- exp.processException(e.getCause()); // Let the processor know we have a stopping error.
- }
- break;
-
- case InternalExpressionTypes.MARK_VALUE:
- // Do a mark.
- int markID = in.readInt();
- exp.pushMark(markID);
- break;
-
- case InternalExpressionTypes.ENDMARK_VALUE:
- // Do an end mark.
- markID = in.readInt();
- boolean restore = in.readBoolean();
- exp.pushEndmark(markID, restore);
- break;
-
- case InternalExpressionTypes.SUBEXPRESSION_BEGIN_EXPRESSION_VALUE:
- // Get a begin subexpression proxy expression. The subexpression id is sent as an int.
- exp.pushSubexpressionBegin(in.readInt());
- break;
-
- case InternalExpressionTypes.SUBEXPRESSION_END_EXPRESSION_VALUE:
- // Get a end subexpression proxy expression. The subexpression id is sent as an int.
- exp.pushSubexpressionEnd(in.readInt());
- break;
-
- }
-
- } catch (RuntimeException e) {
- exp.processException(e);
- }
-
- workerValue.set(); // Clear it out so nothing being held onto.
- }
-
- /**
- * This is an exception that is thrown from the getBeanType, field, method (reflect type stuff)
- * that wrappers the real throwable that occurred during the previous reflection. This is
- * because reflection is done out of sequence with the use of the reflect value. So we need
- * to store the reflection exception in this exception and then store this exception in
- * a {@link FailedRemoteExpressionProxy}. This will then be picked up when trying to be
- * used and it will get the true exception out of the {@link Throwable#getCause()}.
- *
- * @since 1.1.0
- */
- private static class FailedProxyException extends Exception {
- /**
- * Comment for <code>serialVersionUID</code>
- *
- * @since 1.1.0
- */
- private static final long serialVersionUID = 2872325672166348923L;
-
- public FailedProxyException(Throwable realThrowable) {
- super(realThrowable);
- }
- }
-
- /**
- * Get the beantype (class) out of the value object sent in. It can handle the beantype sent or
- * as an expression proxy to a beantype expression proxy.
- *
- * @param value
- * @return
- * @throws FailedProxyException Wrappers the real throwable that caused the bean type to not be found.
- *
- * @since 1.1.0
- */
- protected Class getBeanTypeValue(Commands.ValueObject value) throws FailedProxyException {
- Object beantype = connHandler.getInvokableObject(value);
- // It is either a type directly or is an expression proxy.
- if (value.type == Commands.INT) {
- // It is an expression proxy request.
- Object[] expvalue = new Object[2];
- try {
- exp.getExpressionProxy(((Integer) beantype).intValue(), expvalue);
- beantype = expvalue[0];
- } catch (NoExpressionValueException e) {
- // See if there is a failed proxy.
- if (e.getProxy() != null) {
- FailedRemoteExpressionProxy failure = (FailedRemoteExpressionProxy) e.getProxy();
- throw new FailedProxyException((Throwable) failure.getValue());
- } else
- throw new FailedProxyException(new ClassNotFoundException()); // This shouldn't of occurred.
- }
- }
- return (Class) beantype;
- }
-
- /**
- * Get the method out of the value object sent in. It can handle the method sent or
- * as an expression proxy to a method expression proxy.
- * @param value
- * @return method if a method or string if a string or get the method if an expression proxy.
- * @throws FailedProxyException Wrappers the real Throwable that caused the method to not be found.
- *
- * @since 1.1.0
- */
- protected Object getMethodValue(Commands.ValueObject value) throws FailedProxyException {
- Object method = connHandler.getInvokableObject(value);
- // It is either a method directly or is an expression proxy.
- if (value.type == Commands.INT) {
- // It is an expression proxy request.
- Object[] expvalue = new Object[2];
- try {
- exp.getExpressionProxy(((Integer) method).intValue(), expvalue);
- method = expvalue[0];
- } catch (NoExpressionValueException e) {
- // See if there is a failed proxy.
- if (e.getProxy() != null) {
- FailedRemoteExpressionProxy failure = (FailedRemoteExpressionProxy) e.getProxy();
- throw new FailedProxyException((Throwable) failure.getValue());
- } else
- throw new FailedProxyException(new NoSuchMethodException()); // This shouldn't of occurred.
- }
- }
- return method;
- }
-
- /**
- * Get the field out of the value object sent in. It can handle the field sent or
- * as an expression proxy to a field expression proxy.
- * @param value
- * @return field if a field or string if a string or get the field if an expression proxy.
- * @throws FailedProxyException Wrappers the real throwable that caused the field to not be found.
- *
- * @since 1.1.0
- */
- protected Object getFieldValue(Commands.ValueObject value) throws FailedProxyException {
- Object field = connHandler.getInvokableObject(value);
- // It is either a field directly or is an expression proxy.
- if (value.type == Commands.INT) {
- // It is an expression proxy request.
- Object[] expvalue = new Object[2];
- try {
- exp.getExpressionProxy(((Integer) field).intValue(), expvalue);
- field = expvalue[0];
- } catch (NoExpressionValueException e) {
- // See if there is a failed proxy.
- if (e.getProxy() != null) {
- FailedRemoteExpressionProxy failure = (FailedRemoteExpressionProxy) e.getProxy();
- throw new FailedProxyException((Throwable) failure.getValue());
- } else
- throw new FailedProxyException(new NoSuchFieldException()); // This shouldn't of occurred.
-
- }
- }
- return field;
- }
-
- /**
- * Pull the Expression Proxy value into the result object.
- * @param proxyID
- * @param result
- * @return <code>true</code> if value could be returned, <code>false</code> if it was no expression value assigned.
- *
- * @since 1.1.0
- */
- public boolean pullExpressionProxyValue(int proxyID, Object[] result) {
- try {
- exp.pullExpressionProxyValue(proxyID, result);
- return true;
- } catch (NoExpressionValueException e) {
- }
- return false;
- }
-
- private static class RemoteExpressionProxy implements InternalExpressionProxy {
-
-
- private final int proxyID;
- private Object value;
- private Class type;
- private boolean set;
-
- public RemoteExpressionProxy(int proxyID) {
- this.proxyID = proxyID;
-
- }
-
- /* (non-Javadoc)
- * @see org.eclipse.jem.internal.proxy.initParser.tree.InternalExpressionProxy#getProxyID()
- */
- public int getProxyID() {
- return proxyID;
- }
-
- /* (non-Javadoc)
- * @see org.eclipse.jem.internal.proxy.initParser.tree.InternalExpressionProxy#getType()
- */
- public Class getType() {
- return type;
- }
-
- /* (non-Javadoc)
- * @see org.eclipse.jem.internal.proxy.initParser.tree.InternalExpressionProxy#getValue()
- */
- public Object getValue() {
- return value;
- }
-
- /* (non-Javadoc)
- * @see org.eclipse.jem.internal.proxy.initParser.tree.InternalExpressionProxy#isSet()
- */
- public boolean isSet() {
- return set;
- }
-
- /* (non-Javadoc)
- * @see org.eclipse.jem.internal.proxy.initParser.tree.InternalExpressionProxy#setProxy(java.lang.Object, java.lang.Class)
- */
- public void setProxy(Object value, Class type) {
- this.value = value;
- this.type = type;
- set = true;
- }
- }
-
- /**
- * Used for the java.lang.reflect things (class, field, method) to indicate
- * why they aren't found.
- * <p>
- * The exception will be placed into value, BUT this should never be sent
- * back to the caller. It is intended only as a place-holder for subsequent
- * usage. Use the {@link RemoteExpressionProxy#isFailedExpression()} method
- * to determine if it is a failed one.
- * <p>
- * This is used because the reflect calls are done out of sequence from where
- * they are used and so if there was an error, the error is reported in the
- * wrong place.
- *
- * @since 1.1.0
- */
- private static class FailedRemoteExpressionProxy extends RemoteExpressionProxy {
-
- public FailedRemoteExpressionProxy(int proxyID) {
- super(proxyID);
- }
-
- public boolean isSet() {
- return false; // This should never be considered to be set. It is holder of info only.
- }
-
- }
-
-
- /**
- * Pull the value.
- *
- * @return r[0] is the value, r[1] is the type of the value.
- * @throws NoExpressionValueException
- *
- * @since 1.0.0
- */
- public Object[] pullValue() throws NoExpressionValueException {
- Object[] result = new Object[2];
- exp.pullValue(result);
- return result;
- }
-
- /**
- * Close out things.
- *
- * @since 1.0.0
- */
- public void close() {
- exp.close();
- }
-
- /**
- * Get the throwable error.
- * @return
- *
- * @since 1.1.0
- */
- public Throwable getErrorThrowable() {
- return exp.getErrorThrowable();
- }
-
- /**
- * Return whether there were no errors or not.
- * @return
- *
- * @since 1.1.0
- */
- public boolean noErrors() {
- return exp.noErrors();
- }
-
- /**
- * Return whether there is a no expression value exception or not.
- * @return
- *
- * @since 1.1.0
- */
- public boolean isNoExpressionValue() {
- return exp.isNoExpressionValue();
- }
-
-}
diff --git a/plugins/org.eclipse.jem.proxy/vm_remotevm/org/eclipse/jem/internal/proxy/vm/remote/IdentityMap.java b/plugins/org.eclipse.jem.proxy/vm_remotevm/org/eclipse/jem/internal/proxy/vm/remote/IdentityMap.java
deleted file mode 100644
index 0dc8d93..0000000
--- a/plugins/org.eclipse.jem.proxy/vm_remotevm/org/eclipse/jem/internal/proxy/vm/remote/IdentityMap.java
+++ /dev/null
@@ -1,96 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2001, 2005 IBM Corporation and others.
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
- *
- * Contributors:
- * IBM Corporation - initial API and implementation
- *******************************************************************************/
-package org.eclipse.jem.internal.proxy.vm.remote;
-/*
-
-
- */
-
-
-import java.util.*;
-/**
- * A HashMap where the key is
- * done as an identity (i.e. found by '==' not equals()).
- */
-
-public class IdentityMap extends HashMap{
-
- /**
- * Comment for <code>serialVersionUID</code>
- *
- * @since 1.1.0
- */
- private static final long serialVersionUID = -6817274833221383683L;
-
- /**
- * Key that returns true on equals() only
- * if the item it is wrappering is '=='
- * not equals()
- */
- static class IdentityKey {
-
- public static IdentityKey createKey(Object obj) {
- return obj != null ? new IdentityKey(obj) : null;
- }
-
- final Object o;
-
- public IdentityKey(Object obj) {
- o = obj;
- }
-
- public boolean equals(Object obj) {
- if (this == obj) return true;
- if (!(obj instanceof IdentityKey)) return false;
- if (this.o == (((IdentityKey) obj).o)) return true;
- return false;
- }
-
- public int hashCode() {
- return o.hashCode();
- }
- }
-
- public IdentityMap() {
- }
-
- public IdentityMap(int capacity) {
- super(capacity);
- }
-
- public IdentityMap(int capacity, float loadFactor) {
- super(capacity, loadFactor);
- }
-
- public boolean containsKey(Object key) {
- return super.containsKey(IdentityKey.createKey(key));
- }
-
- public Object get(Object key) {
- return super.get(IdentityKey.createKey(key));
- }
-
- public Object put(Object key, Object value) {
- return super.put(IdentityKey.createKey(key), value);
- }
-
- public Object remove(Object key) {
- return super.remove(IdentityKey.createKey(key));
- }
-
- /**
- * NOTE: Didn't bother implementing entrySet(). If that becomes
- * needed, then it will be implemented.
- */
- public Set entrySet() {
- throw new UnsupportedOperationException();
- }
-}
diff --git a/plugins/org.eclipse.jem.proxy/vm_remotevm/org/eclipse/jem/internal/proxy/vm/remote/RemoteVMApplication.java b/plugins/org.eclipse.jem.proxy/vm_remotevm/org/eclipse/jem/internal/proxy/vm/remote/RemoteVMApplication.java
deleted file mode 100644
index 4930b11..0000000
--- a/plugins/org.eclipse.jem.proxy/vm_remotevm/org/eclipse/jem/internal/proxy/vm/remote/RemoteVMApplication.java
+++ /dev/null
@@ -1,45 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2001, 2005 IBM Corporation and others.
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
- *
- * Contributors:
- * IBM Corporation - initial API and implementation
- *******************************************************************************/
-package org.eclipse.jem.internal.proxy.vm.remote;
-/*
-
-
- */
-
-
-/**
- * The application to run to kick off the remote VM server side.
- *
- *
- * All this does is start the Server Thread and waits for it to finish.
- * This allows other mains to have a server thread, and some other
- * threads if they wished. They could start the server thread too
- * and some other thread, and then wait for both to finish.
- */
-
-public class RemoteVMApplication {
-
-public static void main(java.lang.String[] args) {
- String serverName = "Server Thread"; //$NON-NLS-1$
- if (System.getProperty("proxyvm.servername") != null) //$NON-NLS-1$
- serverName = serverName + "-" + System.getProperty("proxyvm.servername"); //$NON-NLS-1$ //$NON-NLS-2$
- Thread t = new RemoteVMServerThread(serverName);
- t.start();
- try {
- t.join();
- } catch (Exception e) {
- }
- System.exit(0);
-}
-
-
-
-}
diff --git a/plugins/org.eclipse.jem.proxy/vm_remotevm/org/eclipse/jem/internal/proxy/vm/remote/RemoteVMServerThread.java b/plugins/org.eclipse.jem.proxy/vm_remotevm/org/eclipse/jem/internal/proxy/vm/remote/RemoteVMServerThread.java
deleted file mode 100644
index 0b12eb7..0000000
--- a/plugins/org.eclipse.jem.proxy/vm_remotevm/org/eclipse/jem/internal/proxy/vm/remote/RemoteVMServerThread.java
+++ /dev/null
@@ -1,717 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2001, 2005 IBM Corporation and others.
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
- *
- * Contributors:
- * IBM Corporation - initial API and implementation
- *******************************************************************************/
-package org.eclipse.jem.internal.proxy.vm.remote;
-/*
-
-
- */
-
-
-import java.util.*;
-import java.io.*;
-import java.lang.reflect.Constructor;
-import java.lang.reflect.InvocationTargetException;
-import java.net.*;
-import org.eclipse.jem.internal.proxy.common.remote.*;
-import org.eclipse.jem.internal.proxy.common.*;
-/**
- * RemoteVM Server Thread. This thread is the one
- * that waits for connections and spins off
- * server connection threads. It manages the
- * connection threads and handles shutting them
- * down.
- *
- * System Properties:
- * proxyvm.port - Port number to use for the ServerSocket (default is 8888)
- * proxyvm.bufsize - Buffer size to use for TCP/IP buffers (default is system default)
- */
-
-public class RemoteVMServerThread extends Thread implements IVMServer, IVMCallbackServer {
- protected List threads = Collections.synchronizedList(new LinkedList()); // List of active threads.
- protected ServerSocket server; // Server Socket for this application
- private int highestIdentityID = 0; // Identity codes to identify objects between server and client.
- private Map objectToIDMap;
- private HashMap idToObjectMap = new HashMap(100); // Map from identity id to object
-
- protected Stack fCallbackHandlerPool = new Stack(); // Stack of free callback handlers
- protected static int NUMBER_FREE_CALLBACKS = 5; // Number of free callback handlers to keep open.
-
- public static int ID_NOT_FOUND = Commands.NOT_AN_ID; // The id was not found in the table.
-
- protected int masterIDESocketPort = -1; // Port of master server socket on IDE. Used for special global requests.
- protected int registryKey = -1; // Key of registry on the IDE.
-
- // Kludge: Bug in Linux 1.3.xxx of JVM. Closing a socket while the socket is being read/accept will not interrupt the
- // wait. Need to timeout to the socket read/accept before the socket close will be noticed. This has been fixed
- // in Linux 1.4. So on Linux 1.3 need to put timeouts in on those sockets that can be separately closed while reading/accepting.
- static boolean LINUX_1_3 = "linux".equalsIgnoreCase(System.getProperty("os.name")) && System.getProperty("java.version","").startsWith("1.3"); //$NON-NLS-1$ //$NON-NLS-2$ //$NON-NLS-3$ //$NON-NLS-4$ //$NON-NLS-5$
-
- // If version 1.3.x, we need to use our IdentidyMap, if 1.4 or greater then we can use Java's IdentidyHashMap, which is more efficient than ours.
- static Constructor IDENTIDYMAP_CLASS_CTOR;
- static {
- Class idClass;
- try {
- idClass = Class.forName("java.util.IdentityHashMap"); //$NON-NLS-1$
- } catch (ClassNotFoundException e) {
- idClass = IdentityMap.class;
- }
- try {
- IDENTIDYMAP_CLASS_CTOR = idClass.getConstructor(new Class[] {Integer.TYPE});
- } catch (SecurityException e) {
- e.printStackTrace();
- } catch (NoSuchMethodException e) {
- e.printStackTrace();
- }
- }
-
- public RemoteVMServerThread(String name) {
- super(name);
- try {
- objectToIDMap = (Map) IDENTIDYMAP_CLASS_CTOR.newInstance(new Object[] {new Integer(100)});
- } catch (IllegalArgumentException e) {
- e.printStackTrace();
- } catch (InstantiationException e) {
- e.printStackTrace();
- } catch (IllegalAccessException e) {
- e.printStackTrace();
- } catch (InvocationTargetException e) {
- e.printStackTrace();
- }
- }
-
- // The purpose of this thread is to wait 5 minutes, then see if the IDE is still
- // up. If it isn't it will go down. This is safety mechanism
- // in case the client went down without cleaning up and telling the server to go down.
- // That way it won't hang around forever.
- private boolean goingDown = false;
- private Thread safeClean = new Thread(new Runnable() {
- public void run() {
- while (!goingDown) {
- if (Thread.interrupted())
- continue; // Get to clean uninterrupted state.
- try {
- Thread.sleep(5 * 60 * 1000); // Sleep five minutes
- // Test if IDE still up.
- if (!isAlive()) {
- System.err.println("No registry available to connect with after five minutes. Shutting down."); //$NON-NLS-1$
- requestShutdown();
- break;
- }
- } catch (InterruptedException e) {
- }
- }
- }
-
- /*
- * See if still alive
- */
- private boolean isAlive() {
- Socket socket = getSocket();
- if (socket != null) {
- try {
- DataOutputStream out = new DataOutputStream(socket.getOutputStream());
- DataInputStream in = new DataInputStream(socket.getInputStream());
-
- try {
- out.writeByte(Commands.ALIVE);
- out.writeInt(registryKey);
- out.flush();
- return in.readBoolean();
- // Now get the result.
- } finally {
- try {
- in.close();
- } catch (IOException e) {
- }
- try {
- out.close();
- } catch (IOException e) {
- }
- }
- } catch (IOException e) {
- e.printStackTrace();
- } finally {
- try {
- socket.close();
- } catch (IOException e) {
- e.printStackTrace(); // They should be closing. If they aren't, then they accumulate and master server will start rejecting new ones.
- }
- }
- }
-
- return false;
- }
-
- }, "Timeout Termination Thread"); //$NON-NLS-1$
-
-
- public void run() {
-
- // Initialize the mapping table with certain pre-defined ids.
- synchronized(objectToIDMap) {
- objectToIDMap.put(Void.TYPE, new Integer(Commands.VOID_TYPE));
- idToObjectMap.put(new Integer(Commands.VOID_TYPE), Void.TYPE);
-
- objectToIDMap.put(Boolean.TYPE, new Integer(Commands.BOOLEAN_TYPE));
- idToObjectMap.put(new Integer(Commands.BOOLEAN_TYPE), Boolean.TYPE);
- objectToIDMap.put(Boolean.class, new Integer(Commands.BOOLEAN_CLASS));
- idToObjectMap.put(new Integer(Commands.BOOLEAN_CLASS), Boolean.class);
-
- objectToIDMap.put(Integer.TYPE, new Integer(Commands.INTEGER_TYPE));
- idToObjectMap.put(new Integer(Commands.INTEGER_TYPE), Integer.TYPE);
- objectToIDMap.put(Integer.class, new Integer(Commands.INTEGER_CLASS));
- idToObjectMap.put(new Integer(Commands.INTEGER_CLASS), Integer.class);
-
- objectToIDMap.put(Byte.TYPE, new Integer(Commands.BYTE_TYPE));
- idToObjectMap.put(new Integer(Commands.BYTE_TYPE), Byte.TYPE);
- objectToIDMap.put(Byte.class, new Integer(Commands.BYTE_CLASS));
- idToObjectMap.put(new Integer(Commands.BYTE_CLASS), Byte.class);
-
- objectToIDMap.put(Short.TYPE, new Integer(Commands.SHORT_TYPE));
- idToObjectMap.put(new Integer(Commands.SHORT_TYPE), Short.TYPE);
- objectToIDMap.put(Short.class, new Integer(Commands.SHORT_CLASS));
- idToObjectMap.put(new Integer(Commands.SHORT_CLASS), Short.class);
-
- objectToIDMap.put(Long.TYPE, new Integer(Commands.LONG_TYPE));
- idToObjectMap.put(new Integer(Commands.LONG_TYPE), Long.TYPE);
- objectToIDMap.put(Long.class, new Integer(Commands.LONG_CLASS));
- idToObjectMap.put(new Integer(Commands.LONG_CLASS), Long.class);
-
- objectToIDMap.put(Character.TYPE, new Integer(Commands.CHARACTER_TYPE));
- idToObjectMap.put(new Integer(Commands.CHARACTER_TYPE), Character.TYPE);
- objectToIDMap.put(Character.class, new Integer(Commands.CHARACTER_CLASS));
- idToObjectMap.put(new Integer(Commands.CHARACTER_CLASS), Character.class);
-
- objectToIDMap.put(Double.TYPE, new Integer(Commands.DOUBLE_TYPE));
- idToObjectMap.put(new Integer(Commands.DOUBLE_TYPE), Double.TYPE);
- objectToIDMap.put(Double.class, new Integer(Commands.DOUBLE_CLASS));
- idToObjectMap.put(new Integer(Commands.DOUBLE_CLASS), Double.class);
-
- objectToIDMap.put(Float.TYPE, new Integer(Commands.FLOAT_TYPE));
- idToObjectMap.put(new Integer(Commands.FLOAT_TYPE), Float.TYPE);
- objectToIDMap.put(Float.class, new Integer(Commands.FLOAT_CLASS));
- idToObjectMap.put(new Integer(Commands.FLOAT_CLASS), Float.class);
-
- objectToIDMap.put(String.class, new Integer(Commands.STRING_CLASS));
- idToObjectMap.put(new Integer(Commands.STRING_CLASS), String.class);
-
- objectToIDMap.put(java.math.BigDecimal.class, new Integer(Commands.BIG_DECIMAL_CLASS));
- idToObjectMap.put(new Integer(Commands.BIG_DECIMAL_CLASS), java.math.BigDecimal.class);
-
- objectToIDMap.put(java.math.BigInteger.class, new Integer(Commands.BIG_INTEGER_CLASS));
- idToObjectMap.put(new Integer(Commands.BIG_INTEGER_CLASS), java.math.BigInteger.class);
-
- objectToIDMap.put(Number.class, new Integer(Commands.NUMBER_CLASS));
- idToObjectMap.put(new Integer(Commands.NUMBER_CLASS), Number.class);
-
- objectToIDMap.put(Throwable.class, new Integer(Commands.THROWABLE_CLASS));
- idToObjectMap.put(new Integer(Commands.THROWABLE_CLASS), Throwable.class);
-
-
- objectToIDMap.put(Object.class, new Integer(Commands.OBJECT_CLASS));
- idToObjectMap.put(new Integer(Commands.OBJECT_CLASS), Object.class);
-
- objectToIDMap.put(Class.class, new Integer(Commands.CLASS_CLASS));
- idToObjectMap.put(new Integer(Commands.CLASS_CLASS), Class.class);
-
- objectToIDMap.put(java.lang.reflect.AccessibleObject.class, new Integer(Commands.ACCESSIBLEOBJECT_CLASS));
- idToObjectMap.put(new Integer(Commands.ACCESSIBLEOBJECT_CLASS), java.lang.reflect.AccessibleObject.class);
-
- objectToIDMap.put(java.lang.reflect.Method.class, new Integer(Commands.METHOD_CLASS));
- idToObjectMap.put(new Integer(Commands.METHOD_CLASS), java.lang.reflect.Method.class);
-
- objectToIDMap.put(java.lang.reflect.Constructor.class, new Integer(Commands.CONSTRUCTOR_CLASS));
- idToObjectMap.put(new Integer(Commands.CONSTRUCTOR_CLASS), java.lang.reflect.Constructor.class);
-
- objectToIDMap.put(java.lang.reflect.Field.class, new Integer(Commands.FIELD_CLASS));
- idToObjectMap.put(new Integer(Commands.FIELD_CLASS), java.lang.reflect.Field.class);
-
- objectToIDMap.put(IVMServer.class, new Integer(Commands.IVMSERVER_CLASS));
- idToObjectMap.put(new Integer(Commands.IVMSERVER_CLASS), IVMServer.class);
-
- objectToIDMap.put(ICallback.class, new Integer(Commands.ICALLBACK_CLASS));
- idToObjectMap.put(new Integer(Commands.ICALLBACK_CLASS), ICallback.class);
-
- objectToIDMap.put(this, new Integer(Commands.REMOTESERVER_ID));
- idToObjectMap.put(new Integer(Commands.REMOTESERVER_ID), this);
-
- objectToIDMap.put(RemoteVMServerThread.class, new Integer(Commands.REMOTEVMSERVER_CLASS));
- idToObjectMap.put(new Integer(Commands.REMOTEVMSERVER_CLASS), RemoteVMServerThread.class);
-
- objectToIDMap.put(Thread.class, new Integer(Commands.THREAD_CLASS));
- idToObjectMap.put(new Integer(Commands.THREAD_CLASS), Thread.class);
-
- objectToIDMap.put(ExpressionProcesserController.class, new Integer(Commands.EXPRESSIONPROCESSERCONTROLLER_CLASS));
- idToObjectMap.put(new Integer(Commands.EXPRESSIONPROCESSERCONTROLLER_CLASS), ExpressionProcesserController.class);
-
- try {
- java.lang.reflect.Method getMethod = Class.class.getMethod("getMethod", new Class[] {String.class, (new Class[0]).getClass()}); //$NON-NLS-1$
- objectToIDMap.put(getMethod, new Integer(Commands.GET_METHOD_ID));
- idToObjectMap.put(new Integer(Commands.GET_METHOD_ID), getMethod);
-
- java.lang.reflect.Method initMethod = ICallback.class.getMethod("initializeCallback", new Class[] {IVMCallbackServer.class, Integer.TYPE}); //$NON-NLS-1$
- objectToIDMap.put(initMethod, new Integer(Commands.INITIALIZECALLBACK_METHOD_ID));
- idToObjectMap.put(new Integer(Commands.INITIALIZECALLBACK_METHOD_ID), initMethod);
-
- } catch (NoSuchMethodException e) {
- // Shouldn't really ever occur.
- }
-
- highestIdentityID = Commands.FIRST_FREE_ID;
- }
-
- masterIDESocketPort = Integer.getInteger("proxyvm.masterPort", -1).intValue(); //$NON-NLS-1$
- if (masterIDESocketPort == -1) {
- // No ports specified, need to just shutdown.
- shutdown();
- return;
- }
-
- registryKey = Integer.getInteger("proxyvm.registryKey", -1).intValue(); //$NON-NLS-1$
- if (registryKey == -1) {
- // No registry specified, need to just shutdown.
- shutdown();
- return;
- }
-
- safeClean.setPriority(Thread.MIN_PRIORITY);
- safeClean.start();
- boolean trying = true;
- try {
- server = new ServerSocket(0, 50 , InetAddress.getByName("localhost")); //$NON-NLS-1$
- trying = false;
- if (LINUX_1_3)
- server.setSoTimeout(1000); // Linux 1.3 bug, see comment on LINUX_1_3
- if (registerServer(server.getLocalPort())) {
- while(server != null) {
- Socket incoming = null;
- try {
- incoming = server.accept();
- } catch (InterruptedIOException e) {
- continue; // Timeout, try again
- } catch (NullPointerException e) {
- continue; // Server could of gone null after test in while, means shutting down. This probably would only happen Linux 1.3.
- }
- Thread st = new ConnectionThread(incoming, this, "Connection Thread"); //$NON-NLS-1$
- threads.add(st);
- safeClean.interrupt(); // Let safeClean know there is a change
- st.start();
- // Null out locals so they can be GC'd since this is a long running loop.
- st = null;
- incoming = null;
- }
- }
- } catch (SocketException e) {
- if (trying || server != null)
- e.printStackTrace(); // Exception and not shutdown request, so print stack trace.
- } catch (Exception e) {
- e.printStackTrace();
- }
-
- // We've had an exception, either something really bad, or we were closed,
- // so go through shutdowns.
- shutdown();
- }
-
-
- /**
- * Get an identityID, return -1 if not found.
- */
- public int getIdentityID(Object anObject) {
- synchronized(objectToIDMap) {
- Integer id = (Integer) objectToIDMap.get(anObject);
- return id != null ? id.intValue() : ID_NOT_FOUND;
- }
- }
-
- /**
- * Get an identityID and add it if not found. Place the id in the
- * ValueObject passed in and return whether it was added (true) or was already in table (false)
- */
- public boolean getIdentityID(Object anObject, Commands.ValueObject intoValue ) {
- boolean added = false;
- synchronized(objectToIDMap) {
- Integer id = (Integer) objectToIDMap.get(anObject);
- if (id == null) {
- do {
- if (++highestIdentityID == Commands.NOT_AN_ID)
- ++highestIdentityID; // Don't let -1 be a valid id.
- id = new Integer(highestIdentityID);
- } while (idToObjectMap.containsKey(id)); // Make sure not in use, really shouldn't ever happen because we have over 4 billion before it wraps back
- objectToIDMap.put(anObject, id);
- idToObjectMap.put(id, anObject);
- added = true;
- }
- intoValue.setObjectID(id.intValue());
- }
- return added;
- }
-
- /**
- * Remove an identity object from the mapping.
- */
- public void removeObject(Object anObject) {
- synchronized(objectToIDMap) {
- Integer id = (Integer) objectToIDMap.remove(anObject);
- idToObjectMap.remove(id);
- }
- }
-
- /**
- * Remove an identity object from the mapping, given the id.
- */
- public void removeObject(int id) {
- synchronized(objectToIDMap) {
- Object o = idToObjectMap.remove(new Integer(id));
- objectToIDMap.remove(o);
- }
- }
-
- /**
- * Get the object for an identity id
- */
- public Object getObject(int id) {
- synchronized(objectToIDMap) {
- return idToObjectMap.get(new Integer(id));
- }
- }
-
- /**
- * Remove a thread from the list.
- */
- public void removeConnectionThread(Thread thread) {
- threads.remove(thread);
- safeClean.interrupt(); // Let safe clean know there is a change.
- }
-
- /**
- * Use this to request a shutdown. If the server hasn't even been
- * created yet, this will return false.
- */
- public boolean requestShutdown() {
- if (server == null)
- return false;
- // Closing the server socket should cause a break.
- try {
- ServerSocket srv = server;
- server = null; // So that server knows it is being shutdown and not print exception msg.
- srv.close();
- } catch (Exception e) {
- }
- return true;
- }
-
- /**
- * Request a callback stream to write to.
- * When done, the stream should be closed to release the connection.
- */
- public OutputStream requestStream(int callbackID, int msgID) throws CommandException {
- CallbackHandler h = (CallbackHandler) getFreeCallbackHandler();
- if (h == null)
- throw new CommandException("No callback handler retrieved.", null); //$NON-NLS-1$
- h.initiateCallbackStream(callbackID, msgID);
- return new CallbackOutputStream(h, this);
- }
-
- protected void shutdown() {
- goingDown = true;
- safeClean.interrupt(); // Let safeClean know to come down.
-
- if (server != null)
- try {
- server.close(); // Close it so that no more requests can be made.
- } catch (Exception e) {
- }
-
- // Go through each thread and ask it to close. Make a copy of the list so that we
- // won't get into deadlocks.
- ConnectionThread[] threadsArray = (ConnectionThread[]) threads.toArray(new ConnectionThread[0]);
- for (int i=0; i<threadsArray.length; i++) {
- // This is a harsh way to shut a connection down, but there's no
- // other way I know of to interrupt the read on a socket.
- threadsArray[i].close();
- }
-
- // Now that they've been told to close, wait on each one to finish.
- for (int i=0; i<threadsArray.length; i++)
- try {
- threadsArray[i].join(10000); // Wait ten seconds, if longer, just go on to next one.
- if (threadsArray[i].isAlive())
- System.out.println("*** Connection "+i+" did not die."); //$NON-NLS-1$ //$NON-NLS-2$
- } catch (InterruptedException e) {
- }
-
- if (safeClean.isAlive()) {
- try {
- safeClean.join(10000);
- if (safeClean.isAlive())
- System.out.println("*** Cleanup thread did not die."); //$NON-NLS-1$
- } catch (InterruptedException e) {
- }
- }
-
- // Now close the callbacks.
- synchronized(fCallbackHandlerPool) {
- // Now we walk through all of the free handlers and close them properly.
- Iterator itr = fCallbackHandlerPool.iterator();
- while (itr.hasNext()) {
- ((CallbackHandler) itr.next()).closeHandler();
- }
-
- fCallbackHandlerPool.clear();
- }
-
- List runnables = null;
- synchronized (this) {
- runnables = shutdownRunnables;
- shutdownRunnables = null;
- }
- if (runnables != null) {
- for (Iterator itr = runnables.iterator(); itr.hasNext();) {
- try {
- ((Runnable) itr.next()).run();
- } catch (RuntimeException e) {
- e.printStackTrace();
- }
- }
- }
- }
-
- /**
- * Return a free callback handler
- */
- public ICallbackHandler getFreeCallbackHandler() {
- synchronized(fCallbackHandlerPool) {
- if (!fCallbackHandlerPool.isEmpty())
- return (ICallbackHandler) fCallbackHandlerPool.pop();
- // else we need to allocate one.
- return createCallbackHandler();
- }
- }
-
- /**
- * Make a new callback handler
- */
- protected ICallbackHandler createCallbackHandler() {
- Socket callbackSocket = requestCallbackSocket();
- if (callbackSocket != null) {
- CallbackHandler handler = new CallbackHandler(callbackSocket, this);
- if (handler.isConnected())
- return handler;
-
- // Failed, close the socket.
- try {
- callbackSocket.close();
- } catch (IOException e) {
- }
- }
- return null;
- }
-
- /**
- * Free the handler
- */
- public void returnCallbackHandler(ICallbackHandler aHandler) {
- CallbackHandler handler = (CallbackHandler) aHandler;
- if (handler.isConnected())
- synchronized (fCallbackHandlerPool) {
- if (fCallbackHandlerPool.size() < NUMBER_FREE_CALLBACKS)
- fCallbackHandlerPool.push(handler);
- else
- handler.closeHandler(); // We don't need to maintain more than five free connections.
- }
- }
-
- /**
- * Process a callback.
- */
- public Object doCallback(ICallbackRunnable run) throws CommandException {
- CallbackHandler handler = (CallbackHandler) getFreeCallbackHandler();
- if (handler != null) {
- try {
- try {
- return run.run(handler);
- } catch (CommandErrorException e) {
- // This is command error, connection still good, don't retry, just pass it on.
- // It means the other side said I processed it, but there is an error.
- throw e;
- } catch (CommandException e) {
- if (!e.isRecoverable()) {
- // Close this handler and try a new one, one more time.
- handler.closeHandler();
- handler = (CallbackHandler) getFreeCallbackHandler();
- try {
- return run.run(handler);
- } catch (CommandException eAgain) {
- // It failed again, just close the connection and rethrow the exception.
- handler.closeHandler();
- throw eAgain;
- }
- } else
- throw e; // Recoverable, rethrow exception.
- }
- } finally {
- returnCallbackHandler(handler);
- }
- } else
- throw new CommandException("No callback handler retrieved.", null); //$NON-NLS-1$
-
- }
-
- /*
- * Register the server. Return if ide still active
- */
- private boolean registerServer(int vmserverPort) {
- Socket socket = getSocket();
- if (socket != null) {
- try {
- DataOutputStream out = new DataOutputStream(socket.getOutputStream());
- DataInputStream in = new DataInputStream(socket.getInputStream());
-
- try {
- out.writeByte(Commands.REMOTE_STARTED);
- out.writeInt(registryKey);
- out.writeInt(vmserverPort);
- out.flush();
- return in.readBoolean();
- } finally {
- try {
- in.close();
- } catch (IOException e) {
- }
- try {
- out.close();
- } catch (IOException e) {
- }
- }
- } catch (IOException e) {
- e.printStackTrace();
- } finally {
- try {
- socket.close();
- } catch (IOException e) {
- e.printStackTrace();
- }
- }
-
- }
-
- return false;
- }
-
- /*
- * Request the callback socket. <code>null</code> if there isn't one.
- */
- private Socket requestCallbackSocket() {
- Socket socket = getSocket();
- if (socket != null) {
- boolean closeSocket = true;
- try {
- DataOutputStream out = new DataOutputStream(socket.getOutputStream());
- DataInputStream in = new DataInputStream(socket.getInputStream());
-
- try {
- out.writeByte(Commands.ATTACH_CALLBACK);
- out.writeInt(registryKey);
- out.flush();
- closeSocket = !in.readBoolean();
- return !closeSocket ? socket : null;
- } finally {
- if (closeSocket) {
- try {
- in.close();
- } catch (IOException e) {
- }
- try {
- out.close();
- } catch (IOException e) {
- }
- }
- }
- } catch (IOException e) {
- e.printStackTrace();
- } finally {
- if (closeSocket) {
- try {
- socket.close();
- } catch (IOException e) {
- e.printStackTrace();
- }
- }
- }
- }
-
- return null;
- }
-
-
-
- protected Socket getSocket() {
- // We are putting it off into a thread because there are no timeout capabilities on getting a socket.
- // So we need to allow for that.
- final Socket[] scArray = new Socket[1];
- final boolean[] waiting = new boolean[] {true};
- Thread doIt = new Thread(new Runnable() {
- public void run() {
- try {
- Socket sc = new Socket("localhost", masterIDESocketPort); //$NON-NLS-1$
- synchronized (this) {
- if (waiting[0])
- scArray[0] = sc;
- else
- sc.close(); // We are no longer waiting on this thread so close the socket since no one will use it.
- }
- } catch (IOException e) {
- e.printStackTrace();
- }
- }
- });
-
- doIt.start();
- while (true) {
- try {
- doIt.join(60000);
- synchronized (doIt) {
- waiting[0] = false; // To let it know we are no longer waiting
- }
- break;
- } catch (InterruptedException e) {
- }
- }
-
- if (scArray[0] == null) {
- System.out.println("Couldn't retrieve a socket from master server in 60 seconds."); //$NON-NLS-1$
- return null; // Couldn't get one, probably server is down.
- }
-
- return scArray[0];
- }
-
- private List shutdownRunnables;
-
- public synchronized void addShutdownListener(Runnable runnable) {
- if (shutdownRunnables == null) {
- shutdownRunnables = new ArrayList();
- } else if (shutdownRunnables.contains(runnable))
- return;
- shutdownRunnables.add(runnable);
- }
-
- public synchronized void removeShutdownListener(Runnable runnable) {
- if (shutdownRunnables != null)
- shutdownRunnables.remove(runnable);
- }
-
-
- public IVMServer getIVMServer() {
- return this;
- }
-}
diff --git a/plugins/org.eclipse.jem.proxy/vm_remotevm/org/eclipse/jem/internal/proxy/vm/remote/StackTraceUtility.java b/plugins/org.eclipse.jem.proxy/vm_remotevm/org/eclipse/jem/internal/proxy/vm/remote/StackTraceUtility.java
deleted file mode 100644
index acf0afb..0000000
--- a/plugins/org.eclipse.jem.proxy/vm_remotevm/org/eclipse/jem/internal/proxy/vm/remote/StackTraceUtility.java
+++ /dev/null
@@ -1,32 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2001, 2005 IBM Corporation and others.
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
- *
- * Contributors:
- * IBM Corporation - initial API and implementation
- *******************************************************************************/
-package org.eclipse.jem.internal.proxy.vm.remote;
-/*
-
-
- */
-
-
-import java.io.*;
-/**
- * A utility to get the stack trace from an exception
- * back to the client.
- */
-public class StackTraceUtility {
-
- public static String printStackTrace(Throwable t) {
- StringWriter writer = new StringWriter();
- t.printStackTrace(new PrintWriter(writer));
- return writer.toString();
- }
-
-
-}
diff --git a/plugins/org.eclipse.jem.workbench/.classpath b/plugins/org.eclipse.jem.workbench/.classpath
deleted file mode 100644
index 8fd3a20..0000000
--- a/plugins/org.eclipse.jem.workbench/.classpath
+++ /dev/null
@@ -1,7 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<classpath>
- <classpathentry kind="src" path="workbench/"/>
- <classpathentry kind="con" path="org.eclipse.jdt.launching.JRE_CONTAINER/org.eclipse.jdt.internal.debug.ui.launcher.StandardVMType/J2SE-1.4"/>
- <classpathentry kind="con" path="org.eclipse.pde.core.requiredPlugins"/>
- <classpathentry kind="output" path="bin"/>
-</classpath>
diff --git a/plugins/org.eclipse.jem.workbench/.cvsignore b/plugins/org.eclipse.jem.workbench/.cvsignore
deleted file mode 100644
index b49ba99..0000000
--- a/plugins/org.eclipse.jem.workbench/.cvsignore
+++ /dev/null
@@ -1,5 +0,0 @@
-bin
-build.xml
-javaCompiler...args
-@dot
-org.eclipse.jem.workbench_2.0.100.200806031304.jar
diff --git a/plugins/org.eclipse.jem.workbench/.project b/plugins/org.eclipse.jem.workbench/.project
deleted file mode 100644
index c4f7354..0000000
--- a/plugins/org.eclipse.jem.workbench/.project
+++ /dev/null
@@ -1,28 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<projectDescription>
- <name>org.eclipse.jem.workbench</name>
- <comment></comment>
- <projects>
- </projects>
- <buildSpec>
- <buildCommand>
- <name>org.eclipse.jdt.core.javabuilder</name>
- <arguments>
- </arguments>
- </buildCommand>
- <buildCommand>
- <name>org.eclipse.pde.ManifestBuilder</name>
- <arguments>
- </arguments>
- </buildCommand>
- <buildCommand>
- <name>org.eclipse.pde.SchemaBuilder</name>
- <arguments>
- </arguments>
- </buildCommand>
- </buildSpec>
- <natures>
- <nature>org.eclipse.pde.PluginNature</nature>
- <nature>org.eclipse.jdt.core.javanature</nature>
- </natures>
-</projectDescription>
diff --git a/plugins/org.eclipse.jem.workbench/.settings/org.eclipse.core.resources.prefs b/plugins/org.eclipse.jem.workbench/.settings/org.eclipse.core.resources.prefs
deleted file mode 100644
index 1f2666a..0000000
--- a/plugins/org.eclipse.jem.workbench/.settings/org.eclipse.core.resources.prefs
+++ /dev/null
@@ -1,3 +0,0 @@
-#Sun Apr 15 21:15:54 EDT 2007
-eclipse.preferences.version=1
-encoding/<project>=ISO-8859-1
diff --git a/plugins/org.eclipse.jem.workbench/.settings/org.eclipse.jdt.core.prefs b/plugins/org.eclipse.jem.workbench/.settings/org.eclipse.jdt.core.prefs
deleted file mode 100644
index b92aec7..0000000
--- a/plugins/org.eclipse.jem.workbench/.settings/org.eclipse.jdt.core.prefs
+++ /dev/null
@@ -1,292 +0,0 @@
-#Sat Mar 31 22:55:22 EDT 2007
-eclipse.preferences.version=1
-org.eclipse.jdt.core.compiler.codegen.targetPlatform=1.2
-org.eclipse.jdt.core.compiler.compliance=1.4
-org.eclipse.jdt.core.compiler.problem.annotationSuperInterface=warning
-org.eclipse.jdt.core.compiler.problem.assertIdentifier=warning
-org.eclipse.jdt.core.compiler.problem.autoboxing=ignore
-org.eclipse.jdt.core.compiler.problem.deprecation=warning
-org.eclipse.jdt.core.compiler.problem.deprecationInDeprecatedCode=disabled
-org.eclipse.jdt.core.compiler.problem.deprecationWhenOverridingDeprecatedMethod=disabled
-org.eclipse.jdt.core.compiler.problem.emptyStatement=ignore
-org.eclipse.jdt.core.compiler.problem.enumIdentifier=warning
-org.eclipse.jdt.core.compiler.problem.fieldHiding=ignore
-org.eclipse.jdt.core.compiler.problem.finalParameterBound=warning
-org.eclipse.jdt.core.compiler.problem.finallyBlockNotCompletingNormally=warning
-org.eclipse.jdt.core.compiler.problem.hiddenCatchBlock=warning
-org.eclipse.jdt.core.compiler.problem.incompatibleNonInheritedInterfaceMethod=warning
-org.eclipse.jdt.core.compiler.problem.incompleteEnumSwitch=ignore
-org.eclipse.jdt.core.compiler.problem.indirectStaticAccess=ignore
-org.eclipse.jdt.core.compiler.problem.localVariableHiding=ignore
-org.eclipse.jdt.core.compiler.problem.methodWithConstructorName=warning
-org.eclipse.jdt.core.compiler.problem.missingDeprecatedAnnotation=ignore
-org.eclipse.jdt.core.compiler.problem.missingOverrideAnnotation=ignore
-org.eclipse.jdt.core.compiler.problem.missingSerialVersion=error
-org.eclipse.jdt.core.compiler.problem.noEffectAssignment=warning
-org.eclipse.jdt.core.compiler.problem.noImplicitStringConversion=warning
-org.eclipse.jdt.core.compiler.problem.nonExternalizedStringLiteral=ignore
-org.eclipse.jdt.core.compiler.problem.overridingPackageDefaultMethod=warning
-org.eclipse.jdt.core.compiler.problem.possibleAccidentalBooleanAssignment=ignore
-org.eclipse.jdt.core.compiler.problem.specialParameterHidingField=disabled
-org.eclipse.jdt.core.compiler.problem.staticAccessReceiver=warning
-org.eclipse.jdt.core.compiler.problem.syntheticAccessEmulation=ignore
-org.eclipse.jdt.core.compiler.problem.typeParameterHiding=warning
-org.eclipse.jdt.core.compiler.problem.uncheckedTypeOperation=warning
-org.eclipse.jdt.core.compiler.problem.undocumentedEmptyBlock=ignore
-org.eclipse.jdt.core.compiler.problem.unnecessaryElse=ignore
-org.eclipse.jdt.core.compiler.problem.unnecessaryTypeCheck=error
-org.eclipse.jdt.core.compiler.problem.unqualifiedFieldAccess=ignore
-org.eclipse.jdt.core.compiler.problem.unusedDeclaredThrownException=ignore
-org.eclipse.jdt.core.compiler.problem.unusedDeclaredThrownExceptionWhenOverriding=disabled
-org.eclipse.jdt.core.compiler.problem.unusedImport=error
-org.eclipse.jdt.core.compiler.problem.unusedLocal=error
-org.eclipse.jdt.core.compiler.problem.unusedParameter=ignore
-org.eclipse.jdt.core.compiler.problem.unusedParameterWhenImplementingAbstract=disabled
-org.eclipse.jdt.core.compiler.problem.unusedParameterWhenOverridingConcrete=disabled
-org.eclipse.jdt.core.compiler.problem.unusedPrivateMember=error
-org.eclipse.jdt.core.compiler.problem.varargsArgumentNeedCast=warning
-org.eclipse.jdt.core.compiler.source=1.3
-org.eclipse.jdt.core.formatter.align_type_members_on_columns=false
-org.eclipse.jdt.core.formatter.alignment_for_arguments_in_allocation_expression=16
-org.eclipse.jdt.core.formatter.alignment_for_arguments_in_enum_constant=16
-org.eclipse.jdt.core.formatter.alignment_for_arguments_in_explicit_constructor_call=16
-org.eclipse.jdt.core.formatter.alignment_for_arguments_in_method_invocation=16
-org.eclipse.jdt.core.formatter.alignment_for_arguments_in_qualified_allocation_expression=16
-org.eclipse.jdt.core.formatter.alignment_for_assignment=0
-org.eclipse.jdt.core.formatter.alignment_for_binary_expression=16
-org.eclipse.jdt.core.formatter.alignment_for_compact_if=16
-org.eclipse.jdt.core.formatter.alignment_for_conditional_expression=80
-org.eclipse.jdt.core.formatter.alignment_for_enum_constants=0
-org.eclipse.jdt.core.formatter.alignment_for_expressions_in_array_initializer=16
-org.eclipse.jdt.core.formatter.alignment_for_multiple_fields=16
-org.eclipse.jdt.core.formatter.alignment_for_parameters_in_constructor_declaration=16
-org.eclipse.jdt.core.formatter.alignment_for_parameters_in_method_declaration=16
-org.eclipse.jdt.core.formatter.alignment_for_selector_in_method_invocation=16
-org.eclipse.jdt.core.formatter.alignment_for_superclass_in_type_declaration=16
-org.eclipse.jdt.core.formatter.alignment_for_superinterfaces_in_enum_declaration=16
-org.eclipse.jdt.core.formatter.alignment_for_superinterfaces_in_type_declaration=16
-org.eclipse.jdt.core.formatter.alignment_for_throws_clause_in_constructor_declaration=16
-org.eclipse.jdt.core.formatter.alignment_for_throws_clause_in_method_declaration=16
-org.eclipse.jdt.core.formatter.blank_lines_after_imports=1
-org.eclipse.jdt.core.formatter.blank_lines_after_package=1
-org.eclipse.jdt.core.formatter.blank_lines_before_field=1
-org.eclipse.jdt.core.formatter.blank_lines_before_first_class_body_declaration=1
-org.eclipse.jdt.core.formatter.blank_lines_before_imports=1
-org.eclipse.jdt.core.formatter.blank_lines_before_member_type=1
-org.eclipse.jdt.core.formatter.blank_lines_before_method=1
-org.eclipse.jdt.core.formatter.blank_lines_before_new_chunk=1
-org.eclipse.jdt.core.formatter.blank_lines_before_package=0
-org.eclipse.jdt.core.formatter.blank_lines_between_type_declarations=1
-org.eclipse.jdt.core.formatter.brace_position_for_annotation_type_declaration=end_of_line
-org.eclipse.jdt.core.formatter.brace_position_for_anonymous_type_declaration=end_of_line
-org.eclipse.jdt.core.formatter.brace_position_for_array_initializer=end_of_line
-org.eclipse.jdt.core.formatter.brace_position_for_block=end_of_line
-org.eclipse.jdt.core.formatter.brace_position_for_block_in_case=end_of_line
-org.eclipse.jdt.core.formatter.brace_position_for_constructor_declaration=end_of_line
-org.eclipse.jdt.core.formatter.brace_position_for_enum_constant=end_of_line
-org.eclipse.jdt.core.formatter.brace_position_for_enum_declaration=end_of_line
-org.eclipse.jdt.core.formatter.brace_position_for_method_declaration=end_of_line
-org.eclipse.jdt.core.formatter.brace_position_for_switch=end_of_line
-org.eclipse.jdt.core.formatter.brace_position_for_type_declaration=end_of_line
-org.eclipse.jdt.core.formatter.comment.format_header=false
-org.eclipse.jdt.core.formatter.comment.format_html=true
-org.eclipse.jdt.core.formatter.comment.format_source_code=true
-org.eclipse.jdt.core.formatter.comment.indent_parameter_description=true
-org.eclipse.jdt.core.formatter.comment.indent_root_tags=true
-org.eclipse.jdt.core.formatter.comment.insert_new_line_before_root_tags=insert
-org.eclipse.jdt.core.formatter.comment.insert_new_line_for_parameter=insert
-org.eclipse.jdt.core.formatter.comment.line_length=150
-org.eclipse.jdt.core.formatter.compact_else_if=true
-org.eclipse.jdt.core.formatter.continuation_indentation=2
-org.eclipse.jdt.core.formatter.continuation_indentation_for_array_initializer=2
-org.eclipse.jdt.core.formatter.format_guardian_clause_on_one_line=true
-org.eclipse.jdt.core.formatter.indent_body_declarations_compare_to_annotation_declaration_header=true
-org.eclipse.jdt.core.formatter.indent_body_declarations_compare_to_enum_constant_header=true
-org.eclipse.jdt.core.formatter.indent_body_declarations_compare_to_enum_declaration_header=true
-org.eclipse.jdt.core.formatter.indent_body_declarations_compare_to_type_header=true
-org.eclipse.jdt.core.formatter.indent_breaks_compare_to_cases=true
-org.eclipse.jdt.core.formatter.indent_empty_lines=false
-org.eclipse.jdt.core.formatter.indent_statements_compare_to_block=true
-org.eclipse.jdt.core.formatter.indent_statements_compare_to_body=true
-org.eclipse.jdt.core.formatter.indent_switchstatements_compare_to_cases=true
-org.eclipse.jdt.core.formatter.indent_switchstatements_compare_to_switch=true
-org.eclipse.jdt.core.formatter.indentation.size=4
-org.eclipse.jdt.core.formatter.insert_new_line_after_annotation=insert
-org.eclipse.jdt.core.formatter.insert_new_line_after_opening_brace_in_array_initializer=do not insert
-org.eclipse.jdt.core.formatter.insert_new_line_at_end_of_file_if_missing=do not insert
-org.eclipse.jdt.core.formatter.insert_new_line_before_catch_in_try_statement=do not insert
-org.eclipse.jdt.core.formatter.insert_new_line_before_closing_brace_in_array_initializer=do not insert
-org.eclipse.jdt.core.formatter.insert_new_line_before_else_in_if_statement=do not insert
-org.eclipse.jdt.core.formatter.insert_new_line_before_finally_in_try_statement=do not insert
-org.eclipse.jdt.core.formatter.insert_new_line_before_while_in_do_statement=do not insert
-org.eclipse.jdt.core.formatter.insert_new_line_in_empty_annotation_declaration=insert
-org.eclipse.jdt.core.formatter.insert_new_line_in_empty_anonymous_type_declaration=insert
-org.eclipse.jdt.core.formatter.insert_new_line_in_empty_block=insert
-org.eclipse.jdt.core.formatter.insert_new_line_in_empty_enum_constant=insert
-org.eclipse.jdt.core.formatter.insert_new_line_in_empty_enum_declaration=insert
-org.eclipse.jdt.core.formatter.insert_new_line_in_empty_method_body=insert
-org.eclipse.jdt.core.formatter.insert_new_line_in_empty_type_declaration=insert
-org.eclipse.jdt.core.formatter.insert_space_after_and_in_type_parameter=insert
-org.eclipse.jdt.core.formatter.insert_space_after_assignment_operator=insert
-org.eclipse.jdt.core.formatter.insert_space_after_at_in_annotation=do not insert
-org.eclipse.jdt.core.formatter.insert_space_after_at_in_annotation_type_declaration=do not insert
-org.eclipse.jdt.core.formatter.insert_space_after_binary_operator=insert
-org.eclipse.jdt.core.formatter.insert_space_after_closing_angle_bracket_in_type_arguments=insert
-org.eclipse.jdt.core.formatter.insert_space_after_closing_angle_bracket_in_type_parameters=insert
-org.eclipse.jdt.core.formatter.insert_space_after_closing_brace_in_block=insert
-org.eclipse.jdt.core.formatter.insert_space_after_closing_paren_in_cast=insert
-org.eclipse.jdt.core.formatter.insert_space_after_colon_in_assert=insert
-org.eclipse.jdt.core.formatter.insert_space_after_colon_in_case=insert
-org.eclipse.jdt.core.formatter.insert_space_after_colon_in_conditional=insert
-org.eclipse.jdt.core.formatter.insert_space_after_colon_in_for=insert
-org.eclipse.jdt.core.formatter.insert_space_after_colon_in_labeled_statement=insert
-org.eclipse.jdt.core.formatter.insert_space_after_comma_in_allocation_expression=insert
-org.eclipse.jdt.core.formatter.insert_space_after_comma_in_annotation=insert
-org.eclipse.jdt.core.formatter.insert_space_after_comma_in_array_initializer=insert
-org.eclipse.jdt.core.formatter.insert_space_after_comma_in_constructor_declaration_parameters=insert
-org.eclipse.jdt.core.formatter.insert_space_after_comma_in_constructor_declaration_throws=insert
-org.eclipse.jdt.core.formatter.insert_space_after_comma_in_enum_constant_arguments=insert
-org.eclipse.jdt.core.formatter.insert_space_after_comma_in_enum_declarations=insert
-org.eclipse.jdt.core.formatter.insert_space_after_comma_in_explicitconstructorcall_arguments=insert
-org.eclipse.jdt.core.formatter.insert_space_after_comma_in_for_increments=insert
-org.eclipse.jdt.core.formatter.insert_space_after_comma_in_for_inits=insert
-org.eclipse.jdt.core.formatter.insert_space_after_comma_in_method_declaration_parameters=insert
-org.eclipse.jdt.core.formatter.insert_space_after_comma_in_method_declaration_throws=insert
-org.eclipse.jdt.core.formatter.insert_space_after_comma_in_method_invocation_arguments=insert
-org.eclipse.jdt.core.formatter.insert_space_after_comma_in_multiple_field_declarations=insert
-org.eclipse.jdt.core.formatter.insert_space_after_comma_in_multiple_local_declarations=insert
-org.eclipse.jdt.core.formatter.insert_space_after_comma_in_parameterized_type_reference=insert
-org.eclipse.jdt.core.formatter.insert_space_after_comma_in_superinterfaces=insert
-org.eclipse.jdt.core.formatter.insert_space_after_comma_in_type_arguments=insert
-org.eclipse.jdt.core.formatter.insert_space_after_comma_in_type_parameters=insert
-org.eclipse.jdt.core.formatter.insert_space_after_ellipsis=insert
-org.eclipse.jdt.core.formatter.insert_space_after_opening_angle_bracket_in_parameterized_type_reference=do not insert
-org.eclipse.jdt.core.formatter.insert_space_after_opening_angle_bracket_in_type_arguments=do not insert
-org.eclipse.jdt.core.formatter.insert_space_after_opening_angle_bracket_in_type_parameters=do not insert
-org.eclipse.jdt.core.formatter.insert_space_after_opening_brace_in_array_initializer=insert
-org.eclipse.jdt.core.formatter.insert_space_after_opening_bracket_in_array_allocation_expression=do not insert
-org.eclipse.jdt.core.formatter.insert_space_after_opening_bracket_in_array_reference=do not insert
-org.eclipse.jdt.core.formatter.insert_space_after_opening_paren_in_annotation=do not insert
-org.eclipse.jdt.core.formatter.insert_space_after_opening_paren_in_cast=do not insert
-org.eclipse.jdt.core.formatter.insert_space_after_opening_paren_in_catch=do not insert
-org.eclipse.jdt.core.formatter.insert_space_after_opening_paren_in_constructor_declaration=do not insert
-org.eclipse.jdt.core.formatter.insert_space_after_opening_paren_in_enum_constant=do not insert
-org.eclipse.jdt.core.formatter.insert_space_after_opening_paren_in_for=do not insert
-org.eclipse.jdt.core.formatter.insert_space_after_opening_paren_in_if=do not insert
-org.eclipse.jdt.core.formatter.insert_space_after_opening_paren_in_method_declaration=do not insert
-org.eclipse.jdt.core.formatter.insert_space_after_opening_paren_in_method_invocation=do not insert
-org.eclipse.jdt.core.formatter.insert_space_after_opening_paren_in_parenthesized_expression=do not insert
-org.eclipse.jdt.core.formatter.insert_space_after_opening_paren_in_switch=do not insert
-org.eclipse.jdt.core.formatter.insert_space_after_opening_paren_in_synchronized=do not insert
-org.eclipse.jdt.core.formatter.insert_space_after_opening_paren_in_while=do not insert
-org.eclipse.jdt.core.formatter.insert_space_after_postfix_operator=do not insert
-org.eclipse.jdt.core.formatter.insert_space_after_prefix_operator=do not insert
-org.eclipse.jdt.core.formatter.insert_space_after_question_in_conditional=insert
-org.eclipse.jdt.core.formatter.insert_space_after_question_in_wildcard=do not insert
-org.eclipse.jdt.core.formatter.insert_space_after_semicolon_in_for=insert
-org.eclipse.jdt.core.formatter.insert_space_after_unary_operator=do not insert
-org.eclipse.jdt.core.formatter.insert_space_before_and_in_type_parameter=insert
-org.eclipse.jdt.core.formatter.insert_space_before_assignment_operator=insert
-org.eclipse.jdt.core.formatter.insert_space_before_at_in_annotation_type_declaration=insert
-org.eclipse.jdt.core.formatter.insert_space_before_binary_operator=insert
-org.eclipse.jdt.core.formatter.insert_space_before_closing_angle_bracket_in_parameterized_type_reference=do not insert
-org.eclipse.jdt.core.formatter.insert_space_before_closing_angle_bracket_in_type_arguments=do not insert
-org.eclipse.jdt.core.formatter.insert_space_before_closing_angle_bracket_in_type_parameters=do not insert
-org.eclipse.jdt.core.formatter.insert_space_before_closing_brace_in_array_initializer=do not insert
-org.eclipse.jdt.core.formatter.insert_space_before_closing_bracket_in_array_allocation_expression=do not insert
-org.eclipse.jdt.core.formatter.insert_space_before_closing_bracket_in_array_reference=do not insert
-org.eclipse.jdt.core.formatter.insert_space_before_closing_paren_in_annotation=do not insert
-org.eclipse.jdt.core.formatter.insert_space_before_closing_paren_in_cast=do not insert
-org.eclipse.jdt.core.formatter.insert_space_before_closing_paren_in_catch=do not insert
-org.eclipse.jdt.core.formatter.insert_space_before_closing_paren_in_constructor_declaration=do not insert
-org.eclipse.jdt.core.formatter.insert_space_before_closing_paren_in_enum_constant=do not insert
-org.eclipse.jdt.core.formatter.insert_space_before_closing_paren_in_for=do not insert
-org.eclipse.jdt.core.formatter.insert_space_before_closing_paren_in_if=do not insert
-org.eclipse.jdt.core.formatter.insert_space_before_closing_paren_in_method_declaration=do not insert
-org.eclipse.jdt.core.formatter.insert_space_before_closing_paren_in_method_invocation=do not insert
-org.eclipse.jdt.core.formatter.insert_space_before_closing_paren_in_parenthesized_expression=do not insert
-org.eclipse.jdt.core.formatter.insert_space_before_closing_paren_in_switch=do not insert
-org.eclipse.jdt.core.formatter.insert_space_before_closing_paren_in_synchronized=do not insert
-org.eclipse.jdt.core.formatter.insert_space_before_closing_paren_in_while=do not insert
-org.eclipse.jdt.core.formatter.insert_space_before_colon_in_assert=insert
-org.eclipse.jdt.core.formatter.insert_space_before_colon_in_case=do not insert
-org.eclipse.jdt.core.formatter.insert_space_before_colon_in_conditional=insert
-org.eclipse.jdt.core.formatter.insert_space_before_colon_in_default=do not insert
-org.eclipse.jdt.core.formatter.insert_space_before_colon_in_for=insert
-org.eclipse.jdt.core.formatter.insert_space_before_colon_in_labeled_statement=do not insert
-org.eclipse.jdt.core.formatter.insert_space_before_comma_in_allocation_expression=do not insert
-org.eclipse.jdt.core.formatter.insert_space_before_comma_in_annotation=do not insert
-org.eclipse.jdt.core.formatter.insert_space_before_comma_in_array_initializer=do not insert
-org.eclipse.jdt.core.formatter.insert_space_before_comma_in_constructor_declaration_parameters=do not insert
-org.eclipse.jdt.core.formatter.insert_space_before_comma_in_constructor_declaration_throws=do not insert
-org.eclipse.jdt.core.formatter.insert_space_before_comma_in_enum_constant_arguments=do not insert
-org.eclipse.jdt.core.formatter.insert_space_before_comma_in_enum_declarations=do not insert
-org.eclipse.jdt.core.formatter.insert_space_before_comma_in_explicitconstructorcall_arguments=do not insert
-org.eclipse.jdt.core.formatter.insert_space_before_comma_in_for_increments=do not insert
-org.eclipse.jdt.core.formatter.insert_space_before_comma_in_for_inits=do not insert
-org.eclipse.jdt.core.formatter.insert_space_before_comma_in_method_declaration_parameters=do not insert
-org.eclipse.jdt.core.formatter.insert_space_before_comma_in_method_declaration_throws=do not insert
-org.eclipse.jdt.core.formatter.insert_space_before_comma_in_method_invocation_arguments=do not insert
-org.eclipse.jdt.core.formatter.insert_space_before_comma_in_multiple_field_declarations=do not insert
-org.eclipse.jdt.core.formatter.insert_space_before_comma_in_multiple_local_declarations=do not insert
-org.eclipse.jdt.core.formatter.insert_space_before_comma_in_parameterized_type_reference=do not insert
-org.eclipse.jdt.core.formatter.insert_space_before_comma_in_superinterfaces=do not insert
-org.eclipse.jdt.core.formatter.insert_space_before_comma_in_type_arguments=do not insert
-org.eclipse.jdt.core.formatter.insert_space_before_comma_in_type_parameters=do not insert
-org.eclipse.jdt.core.formatter.insert_space_before_ellipsis=do not insert
-org.eclipse.jdt.core.formatter.insert_space_before_opening_angle_bracket_in_parameterized_type_reference=do not insert
-org.eclipse.jdt.core.formatter.insert_space_before_opening_angle_bracket_in_type_arguments=do not insert
-org.eclipse.jdt.core.formatter.insert_space_before_opening_angle_bracket_in_type_parameters=do not insert
-org.eclipse.jdt.core.formatter.insert_space_before_opening_brace_in_annotation_type_declaration=insert
-org.eclipse.jdt.core.formatter.insert_space_before_opening_brace_in_anonymous_type_declaration=insert
-org.eclipse.jdt.core.formatter.insert_space_before_opening_brace_in_array_initializer=insert
-org.eclipse.jdt.core.formatter.insert_space_before_opening_brace_in_block=insert
-org.eclipse.jdt.core.formatter.insert_space_before_opening_brace_in_constructor_declaration=insert
-org.eclipse.jdt.core.formatter.insert_space_before_opening_brace_in_enum_constant=insert
-org.eclipse.jdt.core.formatter.insert_space_before_opening_brace_in_enum_declaration=insert
-org.eclipse.jdt.core.formatter.insert_space_before_opening_brace_in_method_declaration=insert
-org.eclipse.jdt.core.formatter.insert_space_before_opening_brace_in_switch=insert
-org.eclipse.jdt.core.formatter.insert_space_before_opening_brace_in_type_declaration=insert
-org.eclipse.jdt.core.formatter.insert_space_before_opening_bracket_in_array_allocation_expression=do not insert
-org.eclipse.jdt.core.formatter.insert_space_before_opening_bracket_in_array_reference=do not insert
-org.eclipse.jdt.core.formatter.insert_space_before_opening_bracket_in_array_type_reference=do not insert
-org.eclipse.jdt.core.formatter.insert_space_before_opening_paren_in_annotation=do not insert
-org.eclipse.jdt.core.formatter.insert_space_before_opening_paren_in_annotation_type_member_declaration=do not insert
-org.eclipse.jdt.core.formatter.insert_space_before_opening_paren_in_catch=insert
-org.eclipse.jdt.core.formatter.insert_space_before_opening_paren_in_constructor_declaration=do not insert
-org.eclipse.jdt.core.formatter.insert_space_before_opening_paren_in_enum_constant=do not insert
-org.eclipse.jdt.core.formatter.insert_space_before_opening_paren_in_for=insert
-org.eclipse.jdt.core.formatter.insert_space_before_opening_paren_in_if=insert
-org.eclipse.jdt.core.formatter.insert_space_before_opening_paren_in_method_declaration=do not insert
-org.eclipse.jdt.core.formatter.insert_space_before_opening_paren_in_method_invocation=do not insert
-org.eclipse.jdt.core.formatter.insert_space_before_opening_paren_in_parenthesized_expression=do not insert
-org.eclipse.jdt.core.formatter.insert_space_before_opening_paren_in_switch=insert
-org.eclipse.jdt.core.formatter.insert_space_before_opening_paren_in_synchronized=insert
-org.eclipse.jdt.core.formatter.insert_space_before_opening_paren_in_while=insert
-org.eclipse.jdt.core.formatter.insert_space_before_parenthesized_expression_in_return=insert
-org.eclipse.jdt.core.formatter.insert_space_before_postfix_operator=do not insert
-org.eclipse.jdt.core.formatter.insert_space_before_prefix_operator=do not insert
-org.eclipse.jdt.core.formatter.insert_space_before_question_in_conditional=insert
-org.eclipse.jdt.core.formatter.insert_space_before_question_in_wildcard=do not insert
-org.eclipse.jdt.core.formatter.insert_space_before_semicolon=do not insert
-org.eclipse.jdt.core.formatter.insert_space_before_semicolon_in_for=do not insert
-org.eclipse.jdt.core.formatter.insert_space_before_unary_operator=do not insert
-org.eclipse.jdt.core.formatter.insert_space_between_brackets_in_array_type_reference=do not insert
-org.eclipse.jdt.core.formatter.insert_space_between_empty_braces_in_array_initializer=do not insert
-org.eclipse.jdt.core.formatter.insert_space_between_empty_brackets_in_array_allocation_expression=do not insert
-org.eclipse.jdt.core.formatter.insert_space_between_empty_parens_in_annotation_type_member_declaration=do not insert
-org.eclipse.jdt.core.formatter.insert_space_between_empty_parens_in_constructor_declaration=do not insert
-org.eclipse.jdt.core.formatter.insert_space_between_empty_parens_in_enum_constant=do not insert
-org.eclipse.jdt.core.formatter.insert_space_between_empty_parens_in_method_declaration=do not insert
-org.eclipse.jdt.core.formatter.insert_space_between_empty_parens_in_method_invocation=do not insert
-org.eclipse.jdt.core.formatter.keep_else_statement_on_same_line=false
-org.eclipse.jdt.core.formatter.keep_empty_array_initializer_on_one_line=false
-org.eclipse.jdt.core.formatter.keep_imple_if_on_one_line=false
-org.eclipse.jdt.core.formatter.keep_then_statement_on_same_line=false
-org.eclipse.jdt.core.formatter.lineSplit=150
-org.eclipse.jdt.core.formatter.number_of_blank_lines_at_beginning_of_method_body=0
-org.eclipse.jdt.core.formatter.number_of_empty_lines_to_preserve=1
-org.eclipse.jdt.core.formatter.put_empty_statement_on_new_line=true
-org.eclipse.jdt.core.formatter.tabulation.char=tab
-org.eclipse.jdt.core.formatter.tabulation.size=4
-org.eclipse.jdt.core.formatter.use_tabs_only_for_leading_indentations=false
diff --git a/plugins/org.eclipse.jem.workbench/.settings/org.eclipse.jdt.ui.prefs b/plugins/org.eclipse.jem.workbench/.settings/org.eclipse.jdt.ui.prefs
deleted file mode 100644
index 6c8e1bc..0000000
--- a/plugins/org.eclipse.jem.workbench/.settings/org.eclipse.jdt.ui.prefs
+++ /dev/null
@@ -1,8 +0,0 @@
-#Tue Feb 21 10:09:19 EST 2006
-eclipse.preferences.version=1
-formatter_profile=_jve
-formatter_settings_version=10
-org.eclipse.jdt.ui.ignorelowercasenames=true
-org.eclipse.jdt.ui.importorder=java;javax;org;org.eclipse.wtp;org.eclipse.jem;org.eclipse.ve.internal.cdm;org.eclipse.ve.internal.cde;org.eclipse.ve.internal.jcm;org.eclipse.ve.internal.java;org.eclipse.ve;com;
-org.eclipse.jdt.ui.ondemandthreshold=3
-org.eclipse.jdt.ui.text.custom_code_templates=<?xml version\="1.0" encoding\="UTF-8"?><templates/>
diff --git a/plugins/org.eclipse.jem.workbench/META-INF/MANIFEST.MF b/plugins/org.eclipse.jem.workbench/META-INF/MANIFEST.MF
deleted file mode 100644
index d3df811..0000000
--- a/plugins/org.eclipse.jem.workbench/META-INF/MANIFEST.MF
+++ /dev/null
@@ -1,19 +0,0 @@
-Manifest-Version: 1.0
-Bundle-ManifestVersion: 2
-Bundle-Name: %pluginName
-Bundle-SymbolicName: org.eclipse.jem.workbench; singleton:=true
-Bundle-Version: 2.0.300.qualifier
-Bundle-Activator: org.eclipse.jem.internal.plugin.JavaPlugin
-Bundle-Vendor: %providerName
-Bundle-Localization: plugin
-Export-Package: org.eclipse.jem.internal.adapters.jdom;x-friends:="org.eclipse.jem.beaninfo,org.eclipse.jem.tests",
- org.eclipse.jem.internal.plugin;x-friends:="org.eclipse.jem.beaninfo",
- org.eclipse.jem.workbench.utility
-Require-Bundle: org.eclipse.jem;bundle-version="[2.0.0,3.0.0)",
- org.eclipse.jdt.core;bundle-version="[3.2.0,4.0.0)",
- org.eclipse.core.resources;bundle-version="[3.2.0,4.0.0)",
- org.eclipse.emf.ecore.xmi;bundle-version="[2.2.0,3.0.0)",
- org.eclipse.core.runtime;bundle-version="[3.2.0,4.0.0)",
- org.eclipse.jem.util;bundle-version="[2.0.0,3.0.0)"
-Eclipse-LazyStart: true
-Bundle-RequiredExecutionEnvironment: J2SE-1.4
diff --git a/plugins/org.eclipse.jem.workbench/about.html b/plugins/org.eclipse.jem.workbench/about.html
deleted file mode 100644
index 5acea59..0000000
--- a/plugins/org.eclipse.jem.workbench/about.html
+++ /dev/null
@@ -1,25 +0,0 @@
-<!DOCTYPE HTML PUBLIC "-//W3C//DTD HTML 4.0//EN">
-<html><head><title>About</title>
-
-
-
-<meta http-equiv="Content-Type" content="text/html; charset=ISO-8859-1"></head><body lang="EN-US">
-<h2>About This Content</h2>
-
-<P>June, 2008</P>
-<h3>License</h3>
-
-<p>The Eclipse Foundation makes available all content in this plug-in ("Content"). Unless otherwise
-indicated below, the Content is provided to you under the terms and conditions of the
-Eclipse Public License Version 1.0 ("EPL"). A copy of the EPL is available
-at <a href="http://www.eclipse.org/legal/epl-v10.html">http://www.eclipse.org/legal/epl-v10.html</a>.
-For purposes of the EPL, "Program" will mean the Content.</p>
-
-<p>If you did not receive this Content directly from the Eclipse Foundation, the Content is
-being redistributed by another party ("Redistributor") and different terms and conditions may
-apply to your use of any object code in the Content. Check the Redistributor's license that was
-provided with the Content. If no such license exists, contact the Redistributor. Unless otherwise
-indicated below, the terms and conditions of the EPL still apply to any source code in the Content
-and such source code may be obtained at <a href="http://www.eclipse.org/">http://www.eclipse.org</a>.</p>
-
-</body></html>
\ No newline at end of file
diff --git a/plugins/org.eclipse.jem.workbench/build.properties b/plugins/org.eclipse.jem.workbench/build.properties
deleted file mode 100644
index 11e482e..0000000
--- a/plugins/org.eclipse.jem.workbench/build.properties
+++ /dev/null
@@ -1,20 +0,0 @@
-###############################################################################
-# Copyright (c) 2003, 2005 IBM Corporation and others.
-# All rights reserved. This program and the accompanying materials
-# are made available under the terms of the Eclipse Public License v1.0
-# which accompanies this distribution, and is available at
-# http://www.eclipse.org/legal/epl-v10.html
-#
-# Contributors:
-# IBM Corporation - initial API and implementation
-###############################################################################
-bin.includes = plugin.xml,\
- plugin.properties,\
- about.html,\
- META-INF/,\
- .
-src.includes = about.html
-
-source.. = workbench/
-output.. = bin/
-jars.compile.order = .
diff --git a/plugins/org.eclipse.jem.workbench/plugin.properties b/plugins/org.eclipse.jem.workbench/plugin.properties
deleted file mode 100644
index ee32234..0000000
--- a/plugins/org.eclipse.jem.workbench/plugin.properties
+++ /dev/null
@@ -1,20 +0,0 @@
-###############################################################################
-# Copyright (c) 2003, 2005 IBM Corporation and others.
-# All rights reserved. This program and the accompanying materials
-# are made available under the terms of the Eclipse Public License v1.0
-# which accompanies this distribution, and is available at
-# http://www.eclipse.org/legal/epl-v10.html
-#
-# Contributors:
-# IBM Corporation - initial API and implementation
-###############################################################################
-#
-# $Source: /cvsroot/webtools/jeetools.move/webtools.javaee.git/plugins/org.eclipse.jem.workbench/plugin.properties,v $
-# $Revision: 1.5 $ $Date: 2005/08/24 21:13:53 $
-#
-
-
-pluginName=Java EMF Model Workbench Support
-providerName = Eclipse.org
-
-JavaEMFNatureName=JavaEMFNature Properties
diff --git a/plugins/org.eclipse.jem.workbench/plugin.xml b/plugins/org.eclipse.jem.workbench/plugin.xml
deleted file mode 100644
index 1508905..0000000
--- a/plugins/org.eclipse.jem.workbench/plugin.xml
+++ /dev/null
@@ -1,23 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<?eclipse version="3.0"?>
-<plugin>
-
- <extension
- id="JavaEMFNature"
- name="%JavaEMFNatureName"
- point="org.eclipse.core.resources.natures">
- <runtime>
- <run
- class="org.eclipse.jem.internal.plugin.JavaEMFNature">
- </run>
- </runtime>
- </extension>
-
- <extension
- point="org.eclipse.jem.util.nature_registration">
- <nature
- id="org.eclipse.jem.workbench.JavaEMFNature">
- </nature>
- </extension>
-
-</plugin>
diff --git a/plugins/org.eclipse.jem.workbench/workbench/org/eclipse/jem/internal/adapters/jdom/JDOMAdaptor.java b/plugins/org.eclipse.jem.workbench/workbench/org/eclipse/jem/internal/adapters/jdom/JDOMAdaptor.java
deleted file mode 100644
index 62edf20..0000000
--- a/plugins/org.eclipse.jem.workbench/workbench/org/eclipse/jem/internal/adapters/jdom/JDOMAdaptor.java
+++ /dev/null
@@ -1,358 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2001, 2005 IBM Corporation and others.
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
- *
- * Contributors:
- * IBM Corporation - initial API and implementation
- *******************************************************************************/
-package org.eclipse.jem.internal.adapters.jdom;
-/*
-
-
- */
-
-import java.io.File;
-import java.util.Map;
-
-import org.eclipse.core.runtime.IPath;
-import org.eclipse.core.runtime.Path;
-import org.eclipse.emf.common.notify.Notification;
-import org.eclipse.emf.common.notify.Notifier;
-import org.eclipse.emf.ecore.EObject;
-import org.eclipse.emf.ecore.resource.Resource;
-import org.eclipse.emf.ecore.xmi.XMIResource;
-import org.eclipse.jdt.core.*;
-import org.eclipse.jem.java.*;
-import org.eclipse.jem.internal.java.adapters.JavaReflectionAdaptor;
-import org.eclipse.jem.internal.java.adapters.nls.ResourceHandler;
-import org.eclipse.jem.java.internal.impl.JavaRefFactoryImpl;
-/**
- * Insert the type's description here.
- * Creation date: (6/6/2000 4:42:50 PM)
- * @author: Administrator
- */
-public abstract class JDOMAdaptor extends JavaReflectionAdaptor {
-
- protected final static JavaRefPackage JAVA_PACK = JavaRefFactoryImpl.getPackage();
- protected IJavaProject sourceProject;
- final public static int INVALID_LINENO = -1;
- final protected Integer fLINENOLock = new Integer(INVALID_LINENO);
- // This object is not static, as it is used as synchronization element.
- private int fResolvedLineNo = INVALID_LINENO; // Line offset in source file
- private int fResolvedColNo = INVALID_LINENO; // Column offset in source file
- public JDOMAdaptor(Notifier target, IJavaProject workingProject) {
- super(target);
- setSourceProject(workingProject);
- }
- protected void clearSource() {
- // To be overidden if needed.
- }
-
- /**
- * Called by subclasses in canReflect(). If the target is not in a resource, or the
- * resource is not loaded, then it can't reflect. Mustn't reflect if the target
- * has been unloaded.
- *
- * @return
- */
- protected boolean isResourceLoaded() {
- Resource res = ((EObject) getTarget()).eResource();
- return res != null && res.isLoaded();
- }
-
- /**
- * Scan for CRs and LFs within a character buffer
- * Creation date: (8/17/2001 2:14:13 PM)
- * @return int LineNo at charOffset
- * @param charOffset int
- * @param buffer org.eclipse.jdt.core.IBuffer
- */
- private void computeLineOffset(int charOffset, IBuffer buffer) {
-
- fResolvedColNo = fResolvedLineNo = INVALID_LINENO;
-
- if (buffer == null)
- return;
-
- char[] charBuff = buffer.getCharacters();
-
- if (charBuff == null)
- return;
-
- int LineCount = 0;
- int ColNo = 0;
- for (int i = 0; i <= charOffset; i++) {
- ColNo++;
- if (charBuff[i] == '\r') {
- LineCount++;
- ColNo = 0;
- if (charBuff[i + 1] == '\n')
- i++; // skip LineFeed followed a CR
- } else if (charBuff[i] == '\n') {
- LineCount++;
- ColNo = 0;
- }
-
- }
- fResolvedColNo = ColNo;
- fResolvedLineNo = LineCount;
- }
- /**
- * computeMethodID - generate the unique ID to be used to identify a method.
- * Similar to a Signature, but hopefully more readable.
- * The name format will be:
- * simpleTypeName.methodName(my.package.Parm_Type1,parmType2
- * Note: This implementation is tightly coupled with ReflectionAdapter.getTypeNamesFromMethodID().
- */
- public static String computeMethodID(IMethod jdomMethod) {
- return computeMethodID(jdomMethod, jdomMethod.getDeclaringType(), null);
- }
- /**
- * computeMethodID - generate the unique ID to be used to identify a method.
- * Similar to a Signature, but hopefully more readable.
- * The name format will be:
- * simpleTypeName.methodName(my.package.Parm_Type1,parmType2
- * Note: This implementation is tightly coupled with ReflectionAdapter.getTypeNamesFromMethodID().
- */
- public static String computeMethodID(IMethod jdomMethod, IType type, Map typeCache) {
- StringBuffer out = new StringBuffer();
- out.append(type.getTypeQualifiedName());
- out.append(C_CLASS_MEMBER_DELIMITER);
- out.append(jdomMethod.getElementName());
- out.append(C_METHOD_PARM_DELIMITER);
- String[] parmTypeNames = jdomMethod.getParameterTypes();
- String parmName;
- for (int i = 0; i < parmTypeNames.length; i++) {
- parmName = convertJDOMtypeName(parmTypeNames[i]);
- parmName = JDOMSearchHelper.getResolvedTypeName(parmName, type, typeCache);
- out.append(parmName);
- if (i < (parmTypeNames.length - 1))
- out.append(C_PARM_PARM_DELIMITER);
- }
- try {
- if (jdomMethod.isConstructor())
- out.append(S_CONSTRUCTOR_TOKEN);
- } catch (JavaModelException e) {
- }
- return out.toString();
- }
- /**
- * computeMethodName - generate the name to be used to identify a method.
- * For the moment, names are simple, and UUID's are complex.
- */
- public static String computeMethodName(IMethod jdomMethod) {
- return jdomMethod.getElementName();
- }
- /**
- * Java content has changed, but no structural changes that require
- * to reflectValues(); e.g., the body of a method has changed.
- * Creation date: (8/17/2001 10:47:58 AM)
- */
- public void contentChanged() {
- synchronized (fLINENOLock) {
- fResolvedLineNo = INVALID_LINENO;
- fResolvedColNo = INVALID_LINENO;
- }
- }
- /**
- * computeMethodID - generate the unique ID to be used to identify a method.
- * Similar to a Signature, but hopefully more readable.
- * The name format will be:
- * methodName_parmType1_parmType2
- */
- public static String convertJDOMtypeName(String jdomTypeName) {
- return signatureToString(jdomTypeName);
- }
- /**
- * createJavaField - instantiate a Java Field based on the passed Java Model IField
- * We are deferring field contents assuming that its adaptor will reflect its details.
- */
- public Field createJavaField(IField jdomField, XMIResource resource) {
- String name = jdomField.getElementName();
- Field newField = getJavaFactory().createField();
- newField.setName(name);
- resource.setID(newField, ((JavaClass) getTarget()).getName() + C_CLASS_MEMBER_DELIMITER + name);
- return newField;
- }
- /**
- * createJavaMethod - instantiate a Java Method based on the passed Java Model IMethod
- * We are deferring method contents assuming that its adaptor will reflect its details.
- * We need to store enough info in the empty Method to find its Java source.
- * The UUID will eventually hold enough info to identify the source, so we use it.
- */
- public Method createJavaMethod(IMethod jdomMethod, XMIResource resource) {
- Method newMethod = getJavaFactory().createMethod();
- // We use a simple name, but a complex ID
- newMethod.setName(computeMethodName(jdomMethod));
- resource.setID(newMethod, computeMethodID(jdomMethod, getType(), getTypeResolutionCache()));
- return newMethod;
- }
- protected IPath getBinaryPathFromQualifiedName(String qualifiedName) {
- return new Path(qualifiedName.replace('.', File.separatorChar) + ".class"); //$NON-NLS-1$
- }
- public IType getBinaryType(String qualifiedName) {
- try {
- if (getSourceProject() != null) {
- IJavaElement found = getSourceProject().findElement(getBinaryPathFromQualifiedName(qualifiedName));
- if (found != null)
- return ((IClassFile) found).getType();
- }
- } catch (JavaModelException jme) {
- System.out.println(ResourceHandler.getString("Error_Looking_Up_Type_ERROR_", (new Object[] { qualifiedName, jme.getMessage()}))); //$NON-NLS-1$ = "Error looking up type: "
- }
- return null;
- }
- /**
- * Compute a column number from the ISourceRange offset
- * Cache the line number thereafter. Source change will
- * Invoke the contentChanged() method.
- * Creation date: (8/17/2001 11:16:51 AM)
- * @return int
- */
- public int getColNo() {
-
- synchronized (fLINENOLock) {
- if (fResolvedColNo == INVALID_LINENO)
- resolveLineColNo();
- }
- return fResolvedColNo;
- }
- /**
- * Compute a line number from the ISourceRange offset
- * Cache the line number thereafter. Source change will
- * Invoke the contentChanged() method.
- * Creation date: (8/17/2001 11:16:51 AM)
- * @return int
- */
- public int getLineNo() {
-
- synchronized (fLINENOLock) {
- if (fResolvedLineNo == INVALID_LINENO)
- resolveLineColNo();
- }
- return fResolvedLineNo;
- }
- /**
- * Insert the method's description here.
- * Creation date: (8/17/2001 1:18:29 PM)
- */
- public abstract Object getReflectionSource();
- /*
- * Resolve a type name in the context of a Type.
- * (Borrowed from org.eclipse.jdt.ui.codemanipulation.StubUtility.getResolvedTypeName())
- * The input is a simple or qualified name, NOT a signature
- * The output will be a qualified name, NOT a signature
- */
- public static String getResolvedTypeName(String typeName, IType declaringType) {
- String name = typeName;
- try {
- name = JDOMSearchHelper.resolveSimpleTypeName(declaringType, typeName);
- } catch (JavaModelException e) {
- // ignore
- }
- return name;
- }
-
- protected IJavaProject getSourceProject() {
- return sourceProject;
- }
- protected abstract IType getType();
- protected abstract Map getTypeResolutionCache();
-
- public void releaseSourceType() {
- flushReflectedValuesIfNecessary(true); // induce clients to get Notified.
- }
-
- public Notification releaseSourceTypeNoNotification() {
- return flushReflectedValuesIfNecessaryNoNotification(true); // induce clients to get Notified.
- }
- /**
- * Insert the method's description here.
- * Creation date: (8/21/2001 8:09:34 AM)
- */
- private void resolveLineColNo() {
-
- IMember rs = (IMember) getReflectionSource();
- if (rs != null) {
- int offset = INVALID_LINENO;
- try {
- ISourceRange sr = rs.getNameRange();
- if (sr.getLength() <= 0)
- return;
- offset = sr.getOffset();
- } catch (JavaModelException je) {
- return;
- }
- ICompilationUnit cu = rs.getCompilationUnit();
- if (cu != null) {
- try {
- IBuffer buffer = cu.getBuffer();
- computeLineOffset(offset, buffer);
- } catch (JavaModelException je) {
- }
- }
- }
- }
- protected void setSourceProject(IJavaProject workingProject) {
- sourceProject = workingProject;
- }
- /**
- * Converts a type signature to a readable string.
- *
- * Uses Signature.toString(), then tries to undo bad replacement for inner classes.
- *
- * Bug: 166226 [https://bugs.eclipse.org/bugs/show_bug.cgi?id=166226]
- * Update to use the erasure type from the signature in order to
- * tolerate JDK 5 generics.
- *
- */
- public static String signatureToString(String signature) throws IllegalArgumentException {
- boolean hasDollar = (signature.indexOf(Signature.C_DOLLAR) != -1);
- //begin 166226 fix
- String result = Signature.getTypeErasure(signature);
- result = Signature.toString(result);
- //end 166226 fix
- if (hasDollar) {
- int newPos = result.lastIndexOf("."); //$NON-NLS-1$
- if (newPos != -1) {
- result = result.substring(0, newPos) + "$" + result.substring(newPos + 1); //$NON-NLS-1$
- }
- }
- return result;
- }
- /**
- * setType - set our type here
- */
- protected String typeNameFromSignature(String sig) {
- return typeNameFromSignature(sig, getType());
- }
- /**
- * setType - set our type here
- */
- protected String typeNameFromSignature(String sig, IType parent) {
- return typeNameFromSignature(sig, parent, getTypeResolutionCache());
- }
- /**
- * setType - set our type here
- */
- public static String typeNameFromSignature(String sig, IType parent, Map typeCache) {
- String result;
- String componentSignature = Signature.getElementType(sig);
- int arrayDimensions = Signature.getArrayCount(sig);
- result = JDOMSearchHelper.getResolvedTypeName(signatureToString(componentSignature), parent, typeCache);
- for (int i = 0; i < arrayDimensions; i++) {
- result = result + "[]"; //$NON-NLS-1$
- }
- return result;
- }
- /**
- * @deprecated
- * @see org.eclipse.jem.internal.adapters.jdom.JDOMSearchHelper#findType(String, boolean, IJavaProject, JDOMAdaptor)
- */
- public IType getType(String qualifiedName) {
- return JDOMSearchHelper.findType(qualifiedName, false, getSourceProject(), this);
- }
-}
diff --git a/plugins/org.eclipse.jem.workbench/workbench/org/eclipse/jem/internal/adapters/jdom/JDOMClassFinder.java b/plugins/org.eclipse.jem.workbench/workbench/org/eclipse/jem/internal/adapters/jdom/JDOMClassFinder.java
deleted file mode 100644
index 713699a..0000000
--- a/plugins/org.eclipse.jem.workbench/workbench/org/eclipse/jem/internal/adapters/jdom/JDOMClassFinder.java
+++ /dev/null
@@ -1,88 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2001, 2005 IBM Corporation and others.
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
- *
- * Contributors:
- * IBM Corporation - initial API and implementation
- *******************************************************************************/
-package org.eclipse.jem.internal.adapters.jdom;
-/*
-
-
- */
-
-import java.io.File;
-
-import org.eclipse.core.runtime.IPath;
-import org.eclipse.core.runtime.Path;
-import org.eclipse.jdt.core.*;
-import org.eclipse.jem.internal.java.adapters.nls.ResourceHandler;
-/**
- * Insert the type's description here.
- * Creation date: (8/16/2000 11:06:46 PM)
- * @author: Administrator
- */
-public class JDOMClassFinder {
-
- private static JDOMClassFinder instance;
-/**
- * JDOMClassFinder constructor comment.
- */
-public JDOMClassFinder() {
- super();
-}
-protected IPath getBinaryPathFromQualifiedName(String qualifiedName) {
- return new Path(qualifiedName.replace('.', File.separatorChar) + ".class");//$NON-NLS-1$
-}
-public IType getBinaryType(String qualifiedName) {
-
- IJavaElement found = getJavaElement(qualifiedName);
- if (found != null)
- return ((IClassFile) found).getType();
- return null;
-}
-public IJavaElement getJavaElement(String qualifiedName) {
- try {
- if (getSourceProject() != null)
- return getSourceProject().findElement(getPathFromQualifiedName(qualifiedName));
- } catch (JavaModelException jme) {
- System.out.println(ResourceHandler.getString("Error_Looking_Up_Type_ERROR_", (new Object[] {qualifiedName, jme.getMessage()}))); //$NON-NLS-1$ = "Error looking up type: "
- }
- return null;
-}
-protected IPath getPathFromQualifiedName(String qualifiedName) {
- return new Path(qualifiedName.replace('.', File.separatorChar) + ".java");//$NON-NLS-1$
-}
-protected IJavaProject getSourceProject() {
- //return (IJavaProject) ((JavaRefPackage)EPackage.Registry.INSTANCE.getEPackage(JavaRefPackage.eNS_URI)).getJavaRefFactory().getJavaContext();
- return null;
-}
-public IType getType(String qualifiedName) {
- IJavaElement found = getJavaElement(qualifiedName);
- if (found != null)
- if (found instanceof IClassFile)
- return ((IClassFile) found).getType();
- else
- if (found instanceof ICompilationUnit) {
- ICompilationUnit foundCU = (ICompilationUnit) found;
- // strip the ".java", lifted from CompilationUnit.getMainTypeName()
- String cuMainTypeName = foundCU.getElementName();
- cuMainTypeName = cuMainTypeName.substring(0, cuMainTypeName.length() - 5);
- return foundCU.getType(cuMainTypeName);
- }
- return null;
-}
-/**
- * Insert the method's description here.
- * Creation date: (8/16/2000 11:19:48 PM)
- * @return com.ibm.etools.java.adapters.JDOMClassFinder
- */
-public static JDOMClassFinder instance() {
- if (instance == null)
- instance = new JDOMClassFinder();
- return instance;
-}
-}
diff --git a/plugins/org.eclipse.jem.workbench/workbench/org/eclipse/jem/internal/adapters/jdom/JDOMSearchHelper.java b/plugins/org.eclipse.jem.workbench/workbench/org/eclipse/jem/internal/adapters/jdom/JDOMSearchHelper.java
deleted file mode 100644
index 38e6965..0000000
--- a/plugins/org.eclipse.jem.workbench/workbench/org/eclipse/jem/internal/adapters/jdom/JDOMSearchHelper.java
+++ /dev/null
@@ -1,377 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2001, 2006 IBM Corporation and others.
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
- *
- * Contributors:
- * IBM Corporation - initial API and implementation
- *******************************************************************************/
-package org.eclipse.jem.internal.adapters.jdom;
-/*
-
-
- */
-
-import java.io.File;
-import java.util.*;
-
-import org.eclipse.core.runtime.IPath;
-import org.eclipse.core.runtime.Path;
-import org.eclipse.jdt.core.*;
-
-import org.eclipse.jem.internal.java.adapters.nls.ResourceHandler;
-/**
- * Insert the type's description here.
- * Creation date: (9/26/2001 11:09:30 AM)
- * @author: Administrator
- */
-public class JDOMSearchHelper {
-
- private static final String RESOLVED_NAME = " :: RESOLVED_NAME :: "; //$NON-NLS-1$
- private static final String PERIOD = "."; //$NON-NLS-1$
- private static final String BOOLEAN = "boolean"; //$NON-NLS-1$
- private static final String BYTE = "byte"; //$NON-NLS-1$
- private static final String CHAR = "char"; //$NON-NLS-1$
- private static final String SHORT = "short"; //$NON-NLS-1$
- private static final String INT = "int"; //$NON-NLS-1$
- private static final String LONG = "long"; //$NON-NLS-1$
- private static final String FLOAT = "float"; //$NON-NLS-1$
- private static final String DOUBLE = "double"; //$NON-NLS-1$
- private static final String VOID = "void"; //$NON-NLS-1$
- /**
- * JDOMSearchHelper constructor comment.
- */
- public JDOMSearchHelper() {
- super();
- }
- /**
- * If the @simpleName is an inner class, we need to resolve only the declaring class.
- */
- private static String[][] getTypeNameInfo(IType type, String simpleName, boolean isForReflection) throws JavaModelException {
- String[][] result = null;
- String declaringName, typeName;
- typeName = simpleName;
- if (type != null) {
- if (isForReflection)
- typeName = typeName.replace('.', '$');
- int index = typeName.indexOf("$"); //$NON-NLS-1$
- if (index > 0) {
- declaringName = typeName.substring(0, index);
- result = type.resolveType(declaringName);
- if (result != null) {
- if (isForReflection)
- result[0][1] = result[0][1].replace('.', '$');
- result[0][1] += typeName.substring(index, typeName.length());
- }
- } else {
- index = typeName.indexOf("["); //$NON-NLS-1$
- if (index > 0) {
- declaringName = typeName.substring(0, index);
- result = type.resolveType(declaringName);
- if (result != null)
- result[0][1] = result[0][1] + typeName.substring(index);
- } else
- result = type.resolveType(typeName);
- }
- }
- return result;
- }
- /**
- * Returns true if the type is a primitive.
- */
- public final static boolean isPrimitive(String type) {
- return (BOOLEAN.equals(type) || INT.equals(type) || CHAR.equals(type) || SHORT.equals(type) || LONG.equals(type) || FLOAT.equals(type) || DOUBLE.equals(type) || BYTE.equals(type));
- }
- /**
- * Returns true if the type is a primitive.
- */
- public final static boolean isPrimitiveOrVoid(String type) {
- return isPrimitive(type) || isVoid(type);
- }
- /**
- * Returns true if the type is a primitive.
- */
- public final static boolean isVoid(String type) {
- return VOID.equals(type);
- }
- /**
- * Returns true if the two signatures match within the scope of the specified type.
- */
- public static boolean matchTypeSignatures(IType type, String signature1, String signature2) throws JavaModelException {
- return matchTypeSignatures(type, signature1, signature2, null);
- }
- /**
- * Returns true if the two signatures match within the scope of the specified type.
- */
- public static boolean matchTypeSignatures(IType type, String signature1, String signature2, Map resolvedNameCache) throws JavaModelException {
- boolean result = false;
- String sig1 = signature1;
- String sig2 = signature2;
- // First check array count.
- if (Signature.getArrayCount(sig1) == Signature.getArrayCount(sig2)) {
- // We have the same array count, get the element types for consideration.
- sig1 = Signature.getElementType(sig1);
- sig2 = Signature.getElementType(sig2);
-
- // There are three cases:
- // 1) Both are unqualified (both being primitive will fall into this),
- // 2) Both are qualified, and
- // 3) One is qualified and the other is not (one could be primitive).
-
- // For the first two cases a compare of the readable names will always do.
- if (!((sig1.indexOf('.') == -1) ^ (sig2.indexOf('.') == -1))) {
- result = Signature.toString(sig1).equals(Signature.toString(sig2));
- } else {
- // This is case 3.
- // First root out one being primitive.
- if (((sig1.charAt(0) == 'Q') || (sig1.charAt(0) == 'L')) && ((sig2.charAt(0) == 'Q') || (sig2.charAt(0) == 'L'))) {
- // Get the readable name of the qualified signature
- // and the simple name of the other.
- String qualifiedName = null;
- String simpleName = null;
- if (sig1.indexOf('.') == -1) {
- qualifiedName = Signature.toString(sig2);
- simpleName = Signature.toString(sig1);
- } else {
- qualifiedName = Signature.toString(sig1);
- simpleName = Signature.toString(sig2);
- }
-
- // If the simple name resolves to the qualified name, we have a match.
- result = qualifiedName.equals(resolveSimpleTypeName(type, simpleName, resolvedNameCache));
- }
- }
- }
-
- return result;
- }
- private static boolean needsToResolveName(IType type, String simpleName, boolean isForReflection) {
- return !(type.isBinary() || (!isForReflection && simpleName.indexOf(PERIOD) > -1) || isPrimitiveOrVoid(simpleName));
- }
- /**
- * Returns the qualified name for the simple name within the scope of the type.
- * Returns null if the name can not be resolved.
- */
- public static String resolveSimpleTypeName(IType type, String simpleName) throws JavaModelException {
- return resolveSimpleTypeName(type, simpleName, null);
- }
- /**
- * Returns the qualified name for the simple name within the scope of the type.
- * Returns null if the name can not be resolved.
- */
- public static String resolveSimpleTypeName(IType type, String simpleName, Map resolvedNameCache) throws JavaModelException {
- return resolveSimpleTypeName(type, simpleName, resolvedNameCache, false);
- }
-
- /**
- * Returns the qualified name for the simple name within the scope of the type.
- * Returns null if the name can not be resolved.
- */
- public static String resolveSimpleTypeName(IType type, String simpleName, Map resolvedNameCache, boolean isForReflection) throws JavaModelException {
- if (!needsToResolveName(type, simpleName, isForReflection))
- return simpleName;
- String key = null, qualifiedName = null;
- if (resolvedNameCache != null) {
- key = type.getFullyQualifiedName() + RESOLVED_NAME + simpleName;
- qualifiedName = (String) resolvedNameCache.get(key);
- }
- if (qualifiedName == null) {
- String[][] result = getTypeNameInfo(type, simpleName, isForReflection);
- if (result != null) {
- String packName = result[0][0];
- if (packName.length() == 0) {
- qualifiedName = result[0][1];
- if (isForReflection)
- qualifiedName = qualifiedName.replace('.', '$');
- } else {
- StringBuffer b = new StringBuffer();
- b.append(result[0][0]).append(PERIOD);
- String typeName = result[0][1];
- if (isForReflection)
- typeName = typeName.replace('.', '$');
- b.append(typeName);
- qualifiedName = b.toString();
- }
- } else {
- qualifiedName = simpleName;
- }
- if (resolvedNameCache != null)
- resolvedNameCache.put(key, qualifiedName);
- }
- return qualifiedName;
- }
- /**
- * Searches for a matching method and sets it in the
- * descriptor if found.
- */
- public static IMethod searchForMatchingMethod(IType type, String methodName, String[] parmSigs) throws JavaModelException {
- return searchForMatchingMethod(type, methodName, parmSigs, null);
- }
- /**
- * Searches for a matching method and sets it in the
- * descriptor if found.
- */
- public static IMethod searchForMatchingMethod(IType type, String methodName, String[] parmSigs, Map resolvedNameCache) throws JavaModelException {
-
- // First get all the methods by this name and with this many parms.
- IMethod[] allMethods = type.getMethods();
- List candidateMethods = new ArrayList();
- for (int i = 0; i < allMethods.length; i++) {
- int parmSigsLength = (parmSigs != null ? parmSigs.length : 0);
- if ((allMethods[i].getElementName().equals(methodName)) && (allMethods[i].getNumberOfParameters() == parmSigsLength))
- candidateMethods.add(allMethods[i]);
- }
-
- // For each candidate consider each parm for a match.
- // Take the first one that matches on all parms.
- IMethod next = null;
- String[] nextParmSigs = null;
- boolean found = false;
- Iterator candidateIter = candidateMethods.iterator();
- while (!found && (candidateIter.hasNext())) {
- next = (IMethod) candidateIter.next();
- nextParmSigs = next.getParameterTypes();
- found = true;
- for (int i = 0;(found && (i < nextParmSigs.length)); i++)
- found &= matchTypeSignatures(type, parmSigs[i], nextParmSigs[i], resolvedNameCache);
- }
- return found ? next : null;
- }
-
- /**
- * The returned Object[] will contain two entries. The
- * first will be the IJavaElement that was found and the
- * second will be the qualifiedName used to find it.
- */
- protected static Object[] findActualJavaElement(String qualifiedName, IJavaProject javaProject, JDOMAdaptor adaptor) {
- Object[] result = new Object[2];
- if (adaptor == null)
- result[1] = qualifiedName;
- else
- //Ensure the name is qualified
- result[1] = getResolvedTypeName(qualifiedName, adaptor.getType(), adaptor.getTypeResolutionCache());
-
- result[0] = findJavaElement((String) result[1], javaProject, adaptor);
- if (result[0] == null)
- findInnerJavaElement(result, javaProject, adaptor);
- return result;
- }
-
- /**
- * The returned Object[] will contain two entries. The
- * first will be the IJavaElement that was found and the
- * second will be the qualifiedName used to find it.
- */
- protected static void findInnerJavaElement(Object[] info, IJavaProject javaProject, JDOMAdaptor adaptor) {
- String qualifiedName, innerName;
- qualifiedName = (String) info[1];
- int index = qualifiedName.lastIndexOf("."); //$NON-NLS-1$
- if (index > 0) {
- innerName = qualifiedName.substring(0, index);
- String pkgName = innerName;
- innerName += "$"; //$NON-NLS-1$
- innerName += qualifiedName.substring(index + 1, qualifiedName.length());
- if (adaptor != null) {
- //Ensure the name is qualified which it may not be if an inner class
- innerName = getResolvedTypeName(innerName, adaptor.getType(), adaptor.getTypeResolutionCache());
- if (qualifiedName.equals(innerName)) {
- return;
- }
- }
- info[1] = innerName;
- info[0] = findJavaElement(innerName, javaProject, adaptor);
- if (javaProject.getProject().isAccessible()&& info[0] == null) {
- index = innerName.lastIndexOf("."); //$NON-NLS-1$
- if (index > 0 && innerName.substring(0, index).equals(pkgName)) {
- return;
- }
- findInnerJavaElement(info, javaProject, adaptor);
- }
- }
- }
-
- protected static IJavaElement findJavaElement(String qualifiedName, IJavaProject javaProject, JDOMAdaptor adaptor) {
- try {
- if (javaProject != null) {
- return javaProject.findType(qualifiedName);
- }
- } catch (JavaModelException jme) {
- System.out.println(ResourceHandler.getString("Error_Looking_Up_Type_ERROR_", (new Object[] { qualifiedName, jme.getMessage()}))); //$NON-NLS-1$ = "Error looking up type: "
- }
- return null;
- }
-
- protected static IPath getPathFromQualifiedName(String qualifiedName) {
- return new Path(qualifiedName.replace('.', File.separatorChar) + ".java"); //$NON-NLS-1$
- }
- /*
- * Resolve a type name in the context of a Type.
- * (Borrowed from org.eclipse.jdt.ui.codemanipulation.StubUtility.getResolvedTypeName())
- * The input is a simple or qualified name, NOT a signature
- * The output will be a qualified name, NOT a signature
- */
- public static String getResolvedTypeName(String typeName, IType declaringType, Map typeCache) {
- String name = typeName;
- try {
- name = JDOMSearchHelper.resolveSimpleTypeName(declaringType, typeName, typeCache, true);
- } catch (JavaModelException e) {
- // ignore
- }
- return name;
- }
-
- public static IType findType(String qualifiedName, boolean useAdvancedForInners, IJavaProject javaProject, JDOMAdaptor adaptor) {
-
- IJavaElement found = null;
- String resolvedName = qualifiedName;
- if (useAdvancedForInners) {
- Object[] result = findActualJavaElement(qualifiedName, javaProject, adaptor);
- found = (IJavaElement) result[0];
- resolvedName = (String) result[1];
- } else
- found = findJavaElement(qualifiedName, javaProject, adaptor);
- if (found != null)
- if (found instanceof IClassFile)
- return ((IClassFile) found).getType();
- else if (found instanceof ICompilationUnit) {
- ICompilationUnit foundCU = (ICompilationUnit) found;
- // strip the ".java", lifted from CompilationUnit.getMainTypeName()
- String cuMainTypeName = foundCU.getElementName();
- cuMainTypeName = cuMainTypeName.substring(0, cuMainTypeName.length() - 5);
- return foundCU.getType(cuMainTypeName);
- } else if (found instanceof IType) {
- IType type = ((IType) found);
- if (!type.getFullyQualifiedName('$').equals(resolvedName)) {
- // I don't know why this is here. Sometime in the past for an inner class, the
- // IType returned was for the outer class, so you would need to search again
- // for the inner class against the outer class. I don't know how this now can
- // happen. The code followed above is extremelly complicated, especially when
- // it is an inner class that isn't fully-qualified that is inside a source file.
- // It goes through some gyrations for that. I don't know what it would
- // return in that case. But just in case, the test is here to be safe.
- int index = resolvedName.lastIndexOf('$'); //$NON-NLS-1$
- if (index > -1)
- return type.getType(resolvedName.substring(index + 1, resolvedName.length()));
- else
- return type;
- } else
- return type;
- }
-
- return null;
- }
-
- public static IType findType(String packageName, String qualifiedTypeName, IJavaProject javaProject) {
- try {
- if (javaProject != null) {
- return javaProject.findType(packageName, qualifiedTypeName.replace('$', '.'));
- }
- } catch (JavaModelException jme) {
- System.out.println(ResourceHandler.getString("Error_Looking_Up_Type_ERROR_", (new Object[] { packageName + "." + qualifiedTypeName, jme.getMessage()}))); //$NON-NLS-1$ //$NON-NLS-2$ = "Error looking up type: "
- }
- return null;
- }
-
-}
diff --git a/plugins/org.eclipse.jem.workbench/workbench/org/eclipse/jem/internal/adapters/jdom/JavaClassJDOMAdaptor.java b/plugins/org.eclipse.jem.workbench/workbench/org/eclipse/jem/internal/adapters/jdom/JavaClassJDOMAdaptor.java
deleted file mode 100644
index 4d9ffb3..0000000
--- a/plugins/org.eclipse.jem.workbench/workbench/org/eclipse/jem/internal/adapters/jdom/JavaClassJDOMAdaptor.java
+++ /dev/null
@@ -1,735 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2001, 2006 IBM Corporation and others.
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
- *
- * Contributors:
- * IBM Corporation - initial API and implementation
- *******************************************************************************/
-package org.eclipse.jem.internal.adapters.jdom;
-/*
-
-
- */
-
-import java.util.*;
-import java.util.logging.Level;
-
-import org.eclipse.core.resources.IResource;
-import org.eclipse.emf.common.notify.Notification;
-import org.eclipse.emf.common.notify.Notifier;
-import org.eclipse.emf.common.util.BasicEList;
-import org.eclipse.emf.common.util.URI;
-import org.eclipse.emf.ecore.EObject;
-import org.eclipse.emf.ecore.InternalEObject;
-import org.eclipse.emf.ecore.resource.ResourceSet;
-import org.eclipse.emf.ecore.util.EcoreUtil;
-import org.eclipse.emf.ecore.xmi.XMIResource;
-import org.eclipse.jdt.core.*;
-
-
-import org.eclipse.jem.internal.java.adapters.*;
-import org.eclipse.jem.internal.java.adapters.nls.ResourceHandler;
-import org.eclipse.jem.internal.plugin.JavaPlugin;
-import org.eclipse.jem.java.*;
-import org.eclipse.jem.java.internal.impl.JavaClassImpl;
-import org.eclipse.jem.util.TimerTests;
-import org.eclipse.jem.util.UIContextDetermination;
-import org.eclipse.jem.util.logger.proxy.Logger;
-
-
-public class JavaClassJDOMAdaptor extends JDOMAdaptor implements IJavaClassAdaptor {
- private static final String OBJECT_TYPE_NAME = "java.lang.Object"; //$NON-NLS-1$
-
- /*
- * Step ids used for TimerTests of performance testing.
- */
- public static final String REFLECT_CLASS = "Reflect JDOM Class"; //$NON-NLS-1$
- public static final String REFLECT_METHODS = "Reflect all JDOM methods for a class"; //$NON-NLS-1$
- public static final String REFLECT_FIELDS = "Reflect all JDOM fields for a class"; //$NON-NLS-1$
-
-
- protected IType sourceType = null;
- protected JavaReflectionAdapterFactory adapterFactory;
- private Map typeResolutionCache = new HashMap(25);
- private boolean hasReflectedFields, isReflectingFields;
- private boolean hasReflectedMethods, isReflectingMethods;
-
- public JavaClassJDOMAdaptor(Notifier target, IJavaProject workingProject, JavaReflectionAdapterFactory inFactory) {
- super(target, workingProject);
- setAdapterFactory(inFactory);
- }
-
- private Map existingFields = new HashMap();
- /*
- * addFields - reflect our fields
- */
- protected boolean addFields() {
-
- // The algorithm we will use is:
- // 1) Pass through the IField's of this class
- // a) If it is in existingFields, then add to newExisting the entry from
- // oldExisting (deleting from oldExisting at the same time), and flush the field. This is so next we re-get any changed parts of it.
- // b) else not existing, then create new field and add to the new fields list.
- // 2) Remove from the fields list any still left in oldExisting. These are ones that no longer exist.
- // 3) Add all of the news ones to the fields.
- //
- IField[] fields = null;
- try {
- fields = getSourceType().getFields();
- } catch (JavaModelException e) {
- Logger.getLogger().log(e, Level.WARNING);
- return false;
- }
- XMIResource resource = (XMIResource) getJavaClassTarget().eResource();
- Field field = null;
- JavaFieldJDOMAdaptor adapter = null;
- Map newExisting = new HashMap(fields.length);
- List newFields = new ArrayList();
- for (int i = 0; i < fields.length; i++) {
- IField ifield = fields[i];
- field = (Field) existingFields.remove(ifield); // Get the existing field (which is the value) from the collection keyed by IField.
- if (field != null) {
- // It is an existing method. So just put over to newExisting. Then flush it.
- newExisting.put(ifield, field);
- // Since this is a new method, it is not attached to a resource, so we need to explicitly create the adapter.
- adapter = (JavaFieldJDOMAdaptor) EcoreUtil.getExistingAdapter(field, ReadAdaptor.TYPE_KEY);
- if (adapter == null)
- adapter = (JavaFieldJDOMAdaptor) getAdapterFactory().adaptNew(field, ReadAdaptor.TYPE_KEY);
- else
- adapter.flushReflectedValuesIfNecessaryNoNotification(true);
- adapter.setSourceField(ifield); // Give it this new IField
- } else {
- // It is a new method. Create the new method, add to newExisting, and add to newMethods list.
- field = createJavaField(ifield, resource);
- newExisting.put(ifield, field);
- newFields.add(field);
- adapter = (JavaFieldJDOMAdaptor) getAdapterFactory().adaptNew(field, ReadAdaptor.TYPE_KEY);
- if (adapter != null)
- adapter.setSourceField(ifield);
- }
- }
-
- BasicEList fieldsList = (BasicEList) getJavaClassTarget().getFieldsGen();
- if (!existingFields.isEmpty()) {
- // Now any still left in old existing are deleted. So we make them proxies and then remove them from fields list.
- URI baseURI = resource.getURI();
- Collection toDelete = existingFields.values();
- for (Iterator itr = toDelete.iterator(); itr.hasNext();) {
- InternalEObject m = (InternalEObject) itr.next();
- String id = resource.getID(m);
- if (id != null)
- m.eSetProxyURI(baseURI.appendFragment(id));
- }
- fieldsList.removeAll(toDelete);
- }
-
- if (!newFields.isEmpty()) {
- // Now add in the news ones
- fieldsList.addAllUnique(newFields);
- }
-
- // Finally set current existing to the new map we created.
- existingFields = newExisting;
- return true;
- }
-
- private Map existingMethods = new HashMap();
- /*
- * addMethods - reflect our methods. Merge in with the previous.
- */
- protected boolean addMethods() {
- // The algorithm we will use is:
- // 1) Pass through the IMethod's of this class
- // a) If it is in existingMethods, then add to newExisting the entry from
- // oldExisting (deleting from oldExisting at the same time), and flush the method. This is so next we re-get any changed parts of it.
- // b) else not existing, then create new method and add to the new methods list.
- // 2) Remove from the methods list any still left in oldExisting. These are ones that no longer exist.
- // 3) Add all of the news ones to the methods.
- //
- IMethod[] methods = null;
- try {
- methods = getSourceType().getMethods();
- } catch (JavaModelException e) {
- Logger.getLogger().log(e, Level.WARNING);
- return false;
- }
- XMIResource resource = (XMIResource) getJavaClassTarget().eResource();
- Method method = null;
- JavaMethodJDOMAdaptor adapter = null;
- Map newExisting = new HashMap(methods.length);
- List newMethods = new ArrayList();
- for (int i = 0; i < methods.length; i++) {
- IMethod im = methods[i];
- method = (Method) existingMethods.remove(im); // Get the existing method (which is the value) from the collection keyed by IMethod.
- if (method != null) {
- // It is an existing method. So just put over to newExisting. Then flush it.
- newExisting.put(im, method);
- adapter = (JavaMethodJDOMAdaptor) retrieveAdaptorFrom(method);
- if (adapter != null) {
- adapter.flushReflectedValuesIfNecessaryNoNotification(true);
- adapter.setSourceMethod(im); // Give it this new IMethod
- }
- } else {
- // It is a new method. Create the new method, add to newExisting, and add to newMethods list.
- method = createJavaMethod(im, resource);
- newExisting.put(im, method);
- newMethods.add(method);
- // Since this is a new method, it is not attached to a resource, so we need to explicitly create the adapter.
- adapter = (JavaMethodJDOMAdaptor) getAdapterFactory().adaptNew(method, ReadAdaptor.TYPE_KEY);
- if (adapter != null)
- adapter.setSourceMethod(methods[i]);
- }
- }
-
- BasicEList methodsList = (BasicEList) getJavaClassTarget().getMethodsGen();
- if (!existingMethods.isEmpty()) {
- // Now any still left in old existing are deleted. So we make them proxies and then remove them from methods list.
- URI baseURI = resource.getURI();
- Collection toDelete = existingMethods.values();
- for (Iterator itr = toDelete.iterator(); itr.hasNext();) {
- InternalEObject m = (InternalEObject) itr.next();
- String id = resource.getID(m);
- if (id != null)
- m.eSetProxyURI(baseURI.appendFragment(id));
- }
- methodsList.removeAll(toDelete);
- }
-
- if (!newMethods.isEmpty()) {
- // Now add in the news ones
- methodsList.addAllUnique(newMethods);
- }
-
- // Finally set current existing to the new map we created.
- existingMethods = newExisting;
- return true;
- }
- /**
- * Clear source Type ;
- */
- protected void clearSource() {
- sourceType = null;
- }
-
- /**
- * Clear the reflected fields list.
- */
- protected boolean flushFields() {
- // First turn them all into proxies so that any holders will re-resolve to maybe the new one if class comes back.
- existingFields.clear();
- XMIResource res = (XMIResource) getJavaClassTarget().eResource();
- URI baseURI = res.getURI();
- List fields = getJavaClassTarget().getFieldsGen();
- int msize = fields.size();
- for (int i = 0; i < msize; i++) {
- InternalEObject f = (InternalEObject) fields.get(i);
- String id = res.getID(f);
- if (id != null)
- f.eSetProxyURI(baseURI.appendFragment(id));
- }
- fields.clear(); // Now we can clear it.
- return true;
- }
- /**
- * Clear the implements list.
- */
- protected boolean flushImplements() {
- getJavaClassTarget().getImplementsInterfacesGen().clear();
- return true;
- }
- /**
- * Clear the reflected methods list.
- */
- protected boolean flushMethods() {
- // First turn them all into proxies so that any holders will re-resolve to maybe the new one if class comes back.
- existingMethods.clear();
- XMIResource res = (XMIResource) getJavaClassTarget().eResource();
- URI baseURI = res.getURI();
- List methods = getJavaClassTarget().getMethodsGen();
- int msize = methods.size();
- for (int i = 0; i < msize; i++) {
- InternalEObject m = (InternalEObject) methods.get(i);
- String id = res.getID(m);
- if (id != null)
- m.eSetProxyURI(baseURI.appendFragment(id));
- }
- methods.clear(); // Now we can clear it.
- return true;
- }
- protected boolean flushModifiers() {
- JavaClass javaClassTarget = (JavaClass) getTarget();
- javaClassTarget.setAbstract(false);
- javaClassTarget.setFinal(false);
- javaClassTarget.setPublic(false);
- javaClassTarget.setKind(TypeKind.UNDEFINED_LITERAL);
- return true;
- }
- protected boolean flushInnerClasses() {
- getJavaClassTarget().getDeclaredClassesGen().clear();
- return true;
- }
-
- protected boolean flushAndClearCachedModelObject;
-
- /**
- * Clear the reflected values.
- */
- protected boolean flushReflectedValues(boolean clearCachedModelObject) {
- flushAndClearCachedModelObject = clearCachedModelObject;
- return true;
- }
-
- /*
- * This is called before a reflect if a real flush is needed.
- */
- private void flushNow() {
- if (flushAndClearCachedModelObject)
- setSourceType(null);
- typeResolutionCache.clear();
- flushModifiers();
- flushSuper();
- flushImplements();
- if (flushAndClearCachedModelObject) {
- // Don't flush these yet. We will try to reuse them on the next reflush. If clear model too, then flush them. This usually means class has been deleted, so why keep them around.
- flushMethods();
- flushFields();
- }
- // Even if we didn't flush the fields/methods, we do need to mark as not reflected so on next usage we will merge in the changes.
- hasReflectedMethods = false;
- hasReflectedFields = false;
-
- flushInnerClasses();
- flushAndClearCachedModelObject = false;
- }
-
-
- /**
- * @see com.ibm.etools.java.adapters.JavaReflectionAdaptor#postFlushReflectedValuesIfNecessary()
- */
- protected void postFlushReflectedValuesIfNecessary(boolean isExisting) {
- getJavaClassTarget().setReflected(false);
- super.postFlushReflectedValuesIfNecessary(isExisting);
- }
-
- /**
- * Set the supertype to be null.
- */
- protected boolean flushSuper() {
- List targetSupers = getJavaClassTarget().primGetESuperTypes();
- targetSupers.clear();
- return true;
- }
- protected JavaReflectionAdapterFactory getAdapterFactory() {
- return adapterFactory;
- }
- /**
- * getBinaryType - return the IType which describes our existing Java class file
- */
- protected IType getBinaryType() {
- return this.getBinaryType(((JavaClass) getTarget()).getQualifiedName());
- }
- /**
- * Return the target typed to a JavaClass.
- */
- protected JavaClassImpl getJavaClassTarget() {
- return (JavaClassImpl) getTarget();
- }
- public Object getReflectionSource() {
- return getSourceType();
- }
-
- /* (non-Javadoc)
- * @see org.eclipse.jem.internal.java.adapters.JavaReflectionAdaptor#hasReflectionSource()
- */
- public boolean hasCachedReflectionSource() {
- return sourceType != null;
- }
- /**
- * getSourceType - return the IType which describes our existing Java class or source file
- */
- public IType getSourceType() {
- if (sourceType == null || flushAndClearCachedModelObject) {
- JavaClassImpl javaClass = (JavaClassImpl) getTarget();
- sourceType = JDOMSearchHelper.findType(javaClass.getJavaPackage().getName(), javaClass.primGetName(), getSourceProject());
- /*
- * If the sourceType was found and we are not in the middle of
- * reflecting it is necessary to ensure that the hasReflected
- * is set back to false. If this is not done then the system
- * assumes that the content in the target model object has been
- * reflected from this found sourceType which is not the case.
- */
- if (hasValidReflection())
- flushReflectedValuesIfNecessaryNoNotification(false);
- }
- return sourceType;
- }
- /**
- * getSourceType - return the IType which describes our existing Java class or source file
- */
- protected IType getType() {
- return getSourceType();
- }
- protected Map getTypeResolutionCache() {
- return typeResolutionCache;
- }
- /**
- * getValueIn method comment.
- */
- public Object getValueIn(EObject object, EObject attribute) {
- // At this point, this adapter does not dynamically compute any values,
- // all values are pushed back into the target on the initial call.
- return super.getValueIn(object, attribute);
- }
- /**
- * Return true if the sourceType is null or if
- * it is a binary type.
- */
- public boolean isSourceTypeFromBinary() {
- if (getSourceType() == null)
- return false; //must be new?
- return getSourceType().isBinary();
- }
-
-
- protected JavaClass reflectJavaClass(String qualifiedName) {
- IType type = JDOMSearchHelper.findType(qualifiedName, true, getSourceProject(), this);
- if (type != null)
- return reflectJavaClass(type);
- else
- return createJavaClassRef(qualifiedName);
- }
- protected JavaClass reflectJavaClass(IType aType) {
- if (aType != null) {
- JavaClass javaClass = (JavaClass) JavaRefFactory.eINSTANCE.reflectType(aType.getFullyQualifiedName(), (EObject) getTarget());
- if (javaClass != null) {
- JavaClassJDOMAdaptor adaptor = (JavaClassJDOMAdaptor) EcoreUtil.getAdapter(javaClass.eAdapters(), ReadAdaptor.TYPE_KEY);
- if (adaptor != null)
- adaptor.setSourceType(aType);
- }
- return javaClass;
- }
- return null;
- }
- /**
- * reflectValues - template method, subclasses override to pump values into target.
- * on entry: name, containing package (and qualified name), and document must be set.
- * Return true always and the JavaReflectionSynchronizer will flush with the type can
- * be found again. In headless mode, return true only if the type is found. This is
- * needed becauce most headless tasks are done under one operation and the JavaReflectionSynchronizer
- * may not have a chance to flush a bad reflection before the real type needs to be found and can be found.
- * JavaClass adaptor:
- * - set modifiers
- * - set name
- * - set reference to super
- * - create methods
- * - create fields
- * - add imports
- */
- public boolean reflectValues() {
- if (hasFlushed) {
- // We flush sometime in the past since last reflect. So now do the actual flush.
- flushNow();
- }
- super.reflectValues();
- boolean isHeadless = UIContextDetermination.getCurrentContext() == UIContextDetermination.HEADLESS_CONTEXT;
- if (canReflect()) {
- TimerTests.basicTest.startCumulativeStep(REFLECT_CLASS);
- try {
- ICompilationUnit cu = getSourceType().getCompilationUnit();
- boolean isWC = cu != null ? cu.isWorkingCopy() : false;
- IResource res = isWC ? getSourceType().getResource() : null;
- // We are only interested in physical classes. If still just in working copy and not yet put out to
- // disk, we don't should treat as not exist. Anything else is considered existing because we got past
- // getSourceType.exists. This will return the truth for non-wc. But for wc types it will return true,
- // even though not physically on disk (such as just creating it and hadn't saved it yet). So for wc types
- // we need to test the actual resource.
- // Test is OK if not wc, or if wc, then there is a res. and it is accessible.
- if (!isWC || (res != null && res.isAccessible())) {
- setModifiers();
- setNaming();
- try {
- setSuper();
- } catch (InheritanceCycleException e) {
- JavaPlugin.getDefault().getLogger().log(e);
- }
- setImplements();
- reflectInnerClasses();
- setDeclaringClass();
- //addImports();
- if (isHeadless) {
- registerWithFactory();
- return true;
- }
- }
- } finally {
- TimerTests.basicTest.stopCumulativeStep(REFLECT_CLASS);
- }
- }
- if (isHeadless)
- return false;
- else {
- registerWithFactory();
- return true;
- }
- }
-
- protected void setDeclaringClass() {
- IType declaringType = getSourceType().getDeclaringType();
- if (declaringType != null) {
- // Need to get it and reflect it so that the declared type of this target is set correctly. We can just
- // set it ourselves directly because ECore would try to add it to the list of inner classes of the declaring type. This
- // would cause it to be added twice, once from the reflection caused by the inverse setting, and once from our doing
- // the inverse setting itself.
- ResourceSet set = getTargetResource().getResourceSet();
- String packageName = declaringType.getPackageFragment().getElementName();
- JavaClassImpl declaringClass = (JavaClassImpl) JavaRefFactory.eINSTANCE.reflectType(packageName, declaringType.getTypeQualifiedName(), set);
- declaringClass.getDeclaredClasses(); // This will cause it to put us into its list and also set our declaring class to this declaring type.
- }
- }
-
-
- /**
- * @return
- */
- private boolean canReflect() {
- return isResourceLoaded() && getSourceProject() != null && getSourceType() != null && getSourceType().exists();
- }
- public synchronized boolean reflectFieldsIfNecessary() {
- if (reflectValuesIfNecessary() && canReflect()) {
- if (!hasReflectedFields && !isReflectingFields) {
- isReflectingFields = true;
- try {
- TimerTests.basicTest.startCumulativeStep(REFLECT_FIELDS);
- addFields();
- hasReflectedFields = true;
- } catch (Exception e) {
- hasReflectedFields = false;
- Logger logger = Logger.getLogger();
- if (logger.isLoggingLevel(Level.WARNING)) {
- logger.log(ResourceHandler.getString("Failed_reflecting_values_ERROR_"), Level.WARNING); //$NON-NLS-1$ = "Failed reflecting values!!!"
- logger.logWarning(e);
- }
- } finally {
- isReflectingFields = false;
- TimerTests.basicTest.stopCumulativeStep(REFLECT_FIELDS);
- }
- }
- return hasReflectedFields;
- } else
- return false; // Couldn't reflect the base values, so couldn't do fields either
- }
- public synchronized boolean reflectMethodsIfNecessary() {
- if (reflectValuesIfNecessary() && canReflect()) {
- if (!hasReflectedMethods && !isReflectingMethods) {
- isReflectingMethods = true;
- try {
- TimerTests.basicTest.startCumulativeStep(REFLECT_METHODS);
- hasReflectedMethods = addMethods();
- } catch (Exception e) {
- hasReflectedMethods = false;
- Logger logger = Logger.getLogger();
- if (logger.isLoggingLevel(Level.WARNING)) {
- logger.log(ResourceHandler.getString("Failed_reflecting_values_ERROR_"), Level.WARNING); //$NON-NLS-1$ = "Failed reflecting values!!!"
- logger.logWarning(e);
- }
- } finally {
- isReflectingMethods = false;
- if (!hasReflected)
- flushMethods(); // Something bad happened, so we will do a complete flush to be on safe side.
- TimerTests.basicTest.stopCumulativeStep(REFLECT_METHODS);
- }
- }
- return hasReflectedMethods;
- } else
- return false; // Couldn't reflect the base values, so couldn't do fields either
- }
-
- private void registerWithFactory() {
- getAdapterFactory().registerReflection(getJavaClassTarget().getQualifiedNameForReflection(), this);
- }
-
- /**
- * @see com.ibm.etools.java.adapters.ReflectionAdaptor#notifyChanged(new ENotificationImpl((InternalEObject)Notifier, int,(EStructuralFeature) EObject, Object, Object, int))
- */
- public void notifyChanged(Notification notification) {
- if (notification.getEventType() == Notification.REMOVING_ADAPTER
- && notification.getOldValue() == this
- && notification.getNotifier() == getTarget())
- getAdapterFactory().unregisterReflection(getJavaClassTarget().getQualifiedNameForReflection());
-
- }
-
- protected void setAdapterFactory(JavaReflectionAdapterFactory inFactory) {
- adapterFactory = inFactory;
- }
- /**
- * setImplements - set our implemented/super interfaces here
- * For an interface, these are superclasses.
- * For a class, these are implemented interfaces.
- */
- protected void setImplements() {
- try {
- String[] interfaceNames = getSourceType().getSuperInterfaceNames();
- JavaClass ref;
- // needs work, the names above will be simple names if we are relfecting from a source file
- List list = getJavaClassTarget().getImplementsInterfacesGen();
- for (int i = 0; i < interfaceNames.length; i++) {
- String name = interfaceNames[i];
- // if a class implements an interface that is actually an inner interface, the inner interface
- // package is not resolved correctly without getting the fully qualified name. For example,
- // public class TestBean implements SomeOtherSimpleClass.SomeInterface
- // without getting the fully qualified name, we are using SomeOtherSimpleClass as the
- // package name which is incorrect.
- String innertypeName = JDOMSearchHelper.getResolvedTypeName(name, getType(), getTypeResolutionCache());
- if (innertypeName != null) {
- name = innertypeName;
- }
- ref = reflectJavaClass(name);
- list.add(ref);
- }
- } catch (JavaModelException npe) {
- // name stays null and we carry on
- }
- }
- /**
- * setModifiers - set the attribute values related to modifiers here
- */
- protected void setModifiers() {
- JavaClass javaClassTarget = (JavaClass) getTarget();
- try {
- javaClassTarget.setAbstract(Flags.isAbstract(getSourceType().getFlags()));
- javaClassTarget.setFinal(Flags.isFinal(getSourceType().getFlags()));
- javaClassTarget.setPublic(Flags.isPublic(getSourceType().getFlags()));
- // Set type to class or interface, not yet handling EXCEPTION
- if (getSourceType().isClass())
- javaClassTarget.setKind(TypeKind.CLASS_LITERAL);
- else
- javaClassTarget.setKind(TypeKind.INTERFACE_LITERAL);
- } catch (JavaModelException npe) {
- Logger logger = JavaPlugin.getDefault().getLogger();
- if (logger.isLoggingLevel(Level.WARNING))
- logger.log(ResourceHandler.getString("Error_Introspecting_Flags_ERROR_", new Object[] { javaClassTarget.getQualifiedName(), npe.getMessage()}), Level.WARNING); //$NON-NLS-1$ = "error introspecting flags on {0}"
- }
- }
- /**
- * setNaming - set the naming values here
- * - qualified name (package name + name) must be set first, that is the path to the real Java class
- * - ID - simple name, identity within a package document
- * - null UUID
- */
- protected void setNaming() {
- /* Naming has been provided by the JavaReflectionKey
- JavaClass javaClassTarget = (JavaClass) getTarget();
- String packageName = getSourceType().getPackageFragment().getElementName();
- javaClassTarget.refSetUUID((String)null);
- ((XMIResource)javaClassTarget.eResource()).setID(javaClassTarget,getSourceType().getElementName());
- */
- }
- protected void setSourceType(IType aType) {
- sourceType = aType;
- }
- /**
- * setSuper - set our supertype here, implemented interface are handled separately
- */
- protected void setSuper() throws InheritanceCycleException {
- String superName = null;
- IType superType = null;
- try {
- if (!getSourceType().isInterface()) {
- superName = getSourceType().getSuperclassName();
- // binary types will always have fully-qualified super names, so no need to do any searching.
- if (!getSourceType().isBinary() && superName != null && isTargetInner()) {
- IType declaringType = getSourceType().getDeclaringType();
- if (declaringType != null) {
- //Get all parent InnerTypes
- IType[] inners = declaringType.getTypes();
- for (int i = 0; i < inners.length; i++) {
- IType type = inners[i];
- if (superName.equals(type.getElementName())) {
- superName = declaringType.getElementName() + '.' + superName;
- reflectInnerClasses(declaringType);
- superType = type;
- break;
- }
- }
- }
- }
-
- //Source files return null if extends does not exist.
- if (superName == null && !getSourceType().getFullyQualifiedName().equals(OBJECT_TYPE_NAME))
- superName = OBJECT_TYPE_NAME;
- if (superName != null) {
- JavaClass javaClassTarget = (JavaClass) getTarget();
- if (superType != null)
- javaClassTarget.setSupertype(reflectJavaClass(superType));
- else
- javaClassTarget.setSupertype(reflectJavaClass(superName));
- }
- }
- } catch (JavaModelException npe) {
- }
- }
- private boolean isTargetInner() {
- JavaClassImpl javaClass = (JavaClassImpl) getTarget();
- return (javaClass.getName().indexOf('$') != -1);
- }
- /**
- * Return true if the sourceType can be found.
- */
- public boolean sourceTypeExists() {
- return getSourceType() != null;
- }
- protected void reflectInnerClasses() {
- IType[] innerClasses = null;
- try {
- innerClasses = getSourceType().getTypes();
- } catch (JavaModelException e) {
- }
- if (innerClasses != null && innerClasses.length != 0) {
- List declaredClasses = getJavaClassTarget().getDeclaredClassesGen();
- JavaClass inner;
- ResourceSet set = getTargetResource().getResourceSet();
- String packageName = getSourceType().getPackageFragment().getElementName();
- for (int i = 0; i < innerClasses.length; i++) {
- inner = (JavaClass) JavaRefFactory.eINSTANCE.reflectType(packageName, innerClasses[i].getTypeQualifiedName(), set);
- declaredClasses.add(inner);
- }
- }
- }
- protected void reflectInnerClasses(IType aType) {
- IType[] innerClasses = null;
- try {
- innerClasses = aType.getTypes();
- } catch (JavaModelException e) {
- }
- if (innerClasses != null && innerClasses.length != 0) {
- ResourceSet set = getTargetResource().getResourceSet();
- String packageName = aType.getPackageFragment().getElementName();
- JavaClassImpl parentType = (JavaClassImpl) JavaRefFactory.eINSTANCE.reflectType(packageName, aType.getTypeQualifiedName(), set);
- List declaredClasses = parentType.getDeclaredClassesGen();
- JavaClass inner;
-
-
- for (int i = 0; i < innerClasses.length; i++) {
- inner = (JavaClass) JavaRefFactory.eINSTANCE.reflectType(packageName, innerClasses[i].getTypeQualifiedName(), set);
- declaredClasses.add(inner);
- }
- }
- }
-
- /**
- * Test if we have a valid source and has been reflected. This is to only
- * to be used by this adapter and by the JDOM adapter factory. It has a
- * very specific meaning and may change as needed. It should not be used
- * for any other purpose. It is not an API.
- * @return
- *
- * @since 1.2.0
- */
- synchronized boolean hasValidReflection() {
- return sourceType != null && hasReflected && !isReflecting;
- }
-}
diff --git a/plugins/org.eclipse.jem.workbench/workbench/org/eclipse/jem/internal/adapters/jdom/JavaFieldJDOMAdaptor.java b/plugins/org.eclipse.jem.workbench/workbench/org/eclipse/jem/internal/adapters/jdom/JavaFieldJDOMAdaptor.java
deleted file mode 100644
index 9b01df8..0000000
--- a/plugins/org.eclipse.jem.workbench/workbench/org/eclipse/jem/internal/adapters/jdom/JavaFieldJDOMAdaptor.java
+++ /dev/null
@@ -1,291 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2001, 2005 IBM Corporation and others.
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
- *
- * Contributors:
- * IBM Corporation - initial API and implementation
- *******************************************************************************/
-package org.eclipse.jem.internal.adapters.jdom;
-/*
-
-
- */
-import java.util.Map;
-
-import org.eclipse.emf.common.notify.Notifier;
-import org.eclipse.emf.ecore.EObject;
-import org.eclipse.emf.ecore.util.EcoreUtil;
-import org.eclipse.emf.ecore.xmi.XMIResource;
-import org.eclipse.jdt.core.*;
-
-import org.eclipse.jem.internal.java.adapters.ReadAdaptor;
-import org.eclipse.jem.internal.java.adapters.nls.ResourceHandler;
-import org.eclipse.jem.java.*;
-import org.eclipse.jem.java.internal.impl.FieldImpl;
-/**
- * Insert the type's description here.
- * Creation date: (6/6/2000 4:42:50 PM)
- * @author: Administrator
- */
-public class JavaFieldJDOMAdaptor extends JDOMAdaptor {
- private static final String BEGIN_COMMENT = "/*"; //$NON-NLS-1$
- private static final String END_COMMENT = "*/"; //$NON-NLS-1$
- protected IField sourceField = null;
- protected IType parentType = null;
- public JavaFieldJDOMAdaptor(Notifier target, IJavaProject workingProject) {
- super(target, workingProject);
- }
- protected void clearSource() {
- sourceField = null;
- }
-
- protected boolean flushReflectedValues(boolean clearCachedModelObject) {
- if (clearCachedModelObject)
- clearSource();
- FieldImpl field = getTargetField();
- field.setInitializer(null);
- field.setFinal(false);
- field.setStatic(false);
- field.setTransient(false);
- field.setVolatile(false);
- field.setJavaVisibility(JavaVisibilityKind.PUBLIC_LITERAL);
- field.setEType(null);
- return true;
- }
-
- protected void postFlushReflectedValuesIfNecessary(boolean isExisting) {
- getTargetField().setReflected(false);
- super.postFlushReflectedValuesIfNecessary(isExisting);
- }
- /**
- * Return a String for the source starting after the field's name to the end of
- * the source range. This will be the source after the name which could include comments.
- */
- protected String getFieldInitializerSource() {
- IOpenable openable = getSourceField().getOpenable();
- try {
- ISourceRange nameRange, sourceRange;
- int start = -1, length = 0;
- IBuffer buffer = openable.getBuffer();
- if (buffer == null) {
- return ""; //$NON-NLS-1$
- }
- nameRange = getSourceField().getNameRange();
- start = nameRange.getOffset() + nameRange.getLength();
- if (start != -1) {
- sourceRange = getSourceField().getSourceRange();
- if (sourceRange.getOffset() != -1)
- length = sourceRange.getOffset() + sourceRange.getLength() - start;
- return buffer.getText(start, length);
- }
- return null;
- } catch (JavaModelException e) {
- return ""; //$NON-NLS-1$
- }
- }
- /**
- * Return the field source string without comments
- */
- protected String getFieldInitializerSourceWithoutComments() {
- String s = getFieldInitializerSource();
- int start = 0;
- int startComment = -1;
- int endComment = -1;
- while (start < s.length()) {
- startComment = s.indexOf(BEGIN_COMMENT, start);
- if (startComment > 0) {
- String newString;
- endComment = s.indexOf(END_COMMENT, start);
- newString = s.substring(start, startComment);
- s = newString + s.substring(endComment + END_COMMENT.length(), s.length());
- start = 0;
- startComment = -1;
- endComment = -1;
- } else {
- start = s.length();
- }
- }
- return s;
- }
- /**
- * getFieldInitializerString - parse the source for our source field
- * and return the initialization string.
- * Return null if no initialization string or constant value is present.
- * i.e. - public String foo = "foo default"; should return "foo default" (including quotes)
- */
- protected String getFieldInitializerString() {
- String result = null;
- try {
- if (!getParentType().isBinary()) {
- String source = getFieldInitializerSourceWithoutComments();
- if (source != null && source.length() != 0) {
- int equalsPos = source.indexOf('=');//$NON-NLS-1$
- int endPos = source.indexOf(',');//$NON-NLS-1$
- if (endPos == -1)
- endPos = source.length() - 1;
- if (equalsPos != -1 && equalsPos < endPos) {
- // Copy from after "=" to before ";" or ","
- result = source.substring(equalsPos + 1, endPos);
- result = result.trim();
- }
- }
- } else {
- // Binary type, see if we can use the constant
- // it's not clear from the API's, but this is probably only
- // available for statics.
- Object constantValue = getSourceField().getConstant();
- // Need to convert the constant to a String
- if (constantValue != null) {
- result = constantValue.toString();
- if (constantValue instanceof String) {
- result = "\"" + result + "\""; //$NON-NLS-2$//$NON-NLS-1$
- }
- }
- }
- } catch (JavaModelException e) {
- // punt
- }
- return result;
- }
- /**
- * getParentType - return the IType which corresponds to our parent JavaClass
- * we're going to do this a lot, so cache it.
- */
- protected IType getParentType() {
- if (parentType == null) {
- Field targetField = (Field) getTarget();
- JavaClass parentJavaClass = targetField.getJavaClass();
- if (parentJavaClass != null) {
- JavaClassJDOMAdaptor pa = (JavaClassJDOMAdaptor) EcoreUtil.getAdapter(parentJavaClass.eAdapters(), ReadAdaptor.TYPE_KEY);
- if (pa != null)
- parentType = pa.getSourceType();
- }
- }
- return parentType;
- }
- public Object getReflectionSource() {
- return getSourceField();
- }
-
- /* (non-Javadoc)
- * @see org.eclipse.jem.internal.java.adapters.JavaReflectionAdaptor#hasReflectionSource()
- */
- public boolean hasCachedReflectionSource() {
- return sourceField != null;
- }
-
- /*
- * Used by Java Class JDOM adapter to create and set with a source field
- */
- public void setSourceField(IField field) {
- sourceField = field;
- }
- /**
- * getSourceField - return the IField which describes our implementing field
- */
- protected IField getSourceField() {
- if (sourceField == null || !sourceField.exists()) {
- IType parent = this.getParentType();
- if (parent != null)
- sourceField = parent.getField(((Field) getTarget()).getName());
- }
- return sourceField;
- }
- public FieldImpl getTargetField() {
- return (FieldImpl) getTarget();
- }
- protected IType getType() {
- return getParentType();
- }
- protected Map getTypeResolutionCache() {
- Field field = getTargetField();
- if (field != null) {
- JavaClass javaClass = field.getJavaClass();
- if (javaClass != null) {
- JDOMAdaptor classAdaptor = (JDOMAdaptor) retrieveAdaptorFrom(javaClass);
- if (classAdaptor != null)
- return classAdaptor.getTypeResolutionCache();
- }
- }
- return null;
- }
- /**
- * getValueIn method comment.
- */
- public Object getValueIn(EObject object, EObject attribute) {
- // At this point, this adapter does not dynamically compute any values,
- // all values are pushed back into the target on the initial call.
- return super.getValueIn(object, attribute);
- }
- /**
- * reflectValues - template method, subclasses override to pump values into target.
- * on entry: name, containing package (and qualified name), and document must be set.
- * JavaClass adaptor:
- * - set modifiers
- * - set name
- * - set type
- */
- public boolean reflectValues() {
- super.reflectValues();
- if (isResourceLoaded() && getSourceProject() != null && getSourceField() != null) {
- setModifiers();
- // setNaming();
- setType();
- return true;
- }
- return false;
- }
- /**
- * setModifiers - set the attribute values related to modifiers here
- */
- protected void setModifiers() {
- Field javaFieldTarget = (Field) getTarget();
- try {
- String initializer = getFieldInitializerString();
- if (initializer != null)
- javaFieldTarget.setInitializer(createBlock(javaFieldTarget.getName(), initializer));
- int flags = getSourceField().getFlags();
- javaFieldTarget.setFinal(Flags.isFinal(flags));
- javaFieldTarget.setStatic(Flags.isStatic(flags));
- javaFieldTarget.setTransient(Flags.isTransient(flags));
- javaFieldTarget.setVolatile(Flags.isVolatile(flags));
- // Set visibility
- if (Flags.isPublic(flags))
- javaFieldTarget.setJavaVisibility(JavaVisibilityKind.PUBLIC_LITERAL);
- else if (Flags.isPrivate(flags))
- javaFieldTarget.setJavaVisibility(JavaVisibilityKind.PRIVATE_LITERAL);
- else if (Flags.isProtected(flags))
- javaFieldTarget.setJavaVisibility(JavaVisibilityKind.PROTECTED_LITERAL);
- else
- javaFieldTarget.setJavaVisibility(JavaVisibilityKind.PACKAGE_LITERAL);
- } catch (JavaModelException npe) {
- System.out.println(ResourceHandler.getString("Error_Introspecting_Flags_ERROR_", new Object[] {((XMIResource) javaFieldTarget.eResource()).getID(javaFieldTarget), npe.getMessage()})); //$NON-NLS-1$ = "error introspecting flags on {0}"
- }
- }
- /**
- * setNaming - set the naming values here
- * - qualified name must be set first, that is the path to the real Java class
- * - ID
- * - null UUID
- */
- protected void setNaming() {
- Field javaFieldTarget = (Field) getTarget();
- JavaClass parent = javaFieldTarget.getContainingJavaClass();
- ((XMIResource) javaFieldTarget.eResource()).setID(javaFieldTarget, parent.getName() + "_" + javaFieldTarget.getName()); //$NON-NLS-1$
- }
- /**
- * setType - set our type here
- */
- protected void setType() {
- String typeName = null;
- try {
- typeName = typeNameFromSignature(getSourceField().getTypeSignature());
- } catch (JavaModelException npe) {
- // name stays null and we carry on
- }
- setFieldType(getTargetField(), typeName);
- }
-}
diff --git a/plugins/org.eclipse.jem.workbench/workbench/org/eclipse/jem/internal/adapters/jdom/JavaJDOMAdapterFactory.java b/plugins/org.eclipse.jem.workbench/workbench/org/eclipse/jem/internal/adapters/jdom/JavaJDOMAdapterFactory.java
deleted file mode 100644
index 93574db..0000000
--- a/plugins/org.eclipse.jem.workbench/workbench/org/eclipse/jem/internal/adapters/jdom/JavaJDOMAdapterFactory.java
+++ /dev/null
@@ -1,238 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2001, 2005 IBM Corporation and others.
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
- *
- * Contributors:
- * IBM Corporation - initial API and implementation
- *******************************************************************************/
-package org.eclipse.jem.internal.adapters.jdom;
-/*
-
-
- */
-import java.util.*;
-
-import org.eclipse.emf.common.notify.*;
-import org.eclipse.emf.common.notify.Notification;
-import org.eclipse.emf.common.notify.Notifier;
-import org.eclipse.jdt.core.*;
-import org.eclipse.jem.internal.java.adapters.*;
-import org.eclipse.jem.internal.java.adapters.JavaReflectionAdapterFactory;
-import org.eclipse.jem.internal.java.adapters.ReflectionAdaptor;
-/**
- * Insert the type's description here.
- * Creation date: (6/13/2000 1:20:31 PM)
- * @author: Administrator
- */
-public class JavaJDOMAdapterFactory extends JavaReflectionAdapterFactory {
-
- protected JavaReflectionSynchronizer synchronizer;
- protected IJavaProject javaProject;
-/**
- * JavaJDOMAdapterFactory constructor comment.
- */
-public JavaJDOMAdapterFactory() {
- super();
-}
-/**
- * JavaJDOMAdapterFactory constructor comment.
- */
-public JavaJDOMAdapterFactory(IJavaProject aJavaProject) {
- this();
- setJavaProject(aJavaProject);
-}
-protected ReflectionAdaptor createJavaClassAdaptor(Notifier target) {
- return new JavaClassJDOMAdaptor(target, getJavaProject(), this);
-}
-protected ReflectionAdaptor createJavaFieldAdaptor(Notifier target) {
- return new JavaFieldJDOMAdaptor(target, getJavaProject());
-}
-protected ReflectionAdaptor createJavaMethodAdaptor(Notifier target) {
- return new JavaMethodJDOMAdaptor(target, getJavaProject());
-}
-/**
- * Flush ALL adapters, worst case
- * We also want to ensure that the source types are also cleared
- * in this worst case scenario.
- */
-public void flushAll() {
- doFlush(reflected.values(),true, true);
-}
-
-public List flushAllNoNotification() {
- return doFlush(reflected.values(),true, false);
-}
-
-public void flushPackage(String packageName, boolean noFlushIfSourceFound) {
- List adaptors = getReflectedForPackage(packageName, noFlushIfSourceFound);
- doFlush(adaptors, true, true);
-}
-public List flushPackageNoNotification(String packageName, boolean noFlushIfSourceFound) {
- List adaptors = getReflectedForPackage(packageName, noFlushIfSourceFound);
- return doFlush(adaptors, true, false);
-}
-/**
- * Return a List of reflection adaptors that belong to
- * the packageName.
- * @param packageName
- * @return
- */
-private List getReflectedForPackage(String packageName, boolean filterFoundTypes) {
- if (packageName != null && !reflected.isEmpty()) {
- isBusyIteratingReflected = true;
- List result = null;
- try {
- Iterator it = reflected.entrySet().iterator();
- Map.Entry entry;
- String key;
- JavaClassJDOMAdaptor adaptor;
- while (it.hasNext()) {
- entry = (Map.Entry) it.next();
- adaptor = (JavaClassJDOMAdaptor) entry.getValue();
- /*
- * Ensure that the the adaptor is only filtered out if it has
- * actually reflected the content. It is not good enough just
- * to test for the sourceType.
- */
- if (filterFoundTypes && adaptor.hasValidReflection())
- continue;
- key = (String) entry.getKey();
- if (key.startsWith(packageName) && key.indexOf('.', packageName.length() + 1) < 0) {
- if (result == null)
- result = new ArrayList();
- result.add(entry.getValue());
- }
- }
- } finally {
- finishedIteratingReflected();
- }
- if (result != null)
- return result;
- }
- return Collections.EMPTY_LIST;
-}
-private List doFlush(Collection adaptors, boolean clearSourceType, boolean doNotify) {
- if (!adaptors.isEmpty()) {
- isBusyIteratingReflected = true;
- List notifications = doNotify ? null : new ArrayList(adaptors.size());
- try {
- Notification notification;
- Iterator i = adaptors.iterator();
- JDOMAdaptor adaptor;
- while (i.hasNext()) {
- adaptor = (JDOMAdaptor) i.next();
- if (doNotify)
- adaptor.flushReflectedValuesIfNecessary(clearSourceType);
- else {
- notification = adaptor.flushReflectedValuesIfNecessaryNoNotification(clearSourceType);
- if (notification != null)
- notifications.add(notification);
- }
- }
- } finally {
- finishedIteratingReflected();
- }
- return notifications;
- }
- return Collections.EMPTY_LIST;
-}
-// Flush the adapter for a source object
-public void flushReflection(String source) {
- JDOMAdaptor a = (JDOMAdaptor) reflected.get(source);
- if (a != null)
- a.flushReflectedValuesIfNecessary();
-}
-public Notification flushReflectionNoNotification(String source) {
- JDOMAdaptor a = (JDOMAdaptor) reflected.get(source);
- if (a != null)
- return a.flushReflectedValuesIfNecessaryNoNotification(false);
- return null;
-}
-
-public Notification flushReflectionPlusInnerNoNotification(String source) {
- isBusyIteratingReflected = true;
- Notification notification = null;
- try {
- String innerName = source + '$';
- Iterator it = reflected.entrySet().iterator();
- Map.Entry entry;
- String key;
- JavaReflectionAdaptor adaptor;
- while (it.hasNext()) {
- entry = (Map.Entry) it.next();
- key = (String) entry.getKey();
- if (key.equals(source) || key.startsWith(innerName)) {
- adaptor = (JavaReflectionAdaptor) reflected.get(key);
- if (adaptor != null) {
- if (notification == null)
- notification = adaptor.flushReflectedValuesIfNecessaryNoNotification(false);
- else
- ((NotificationChain) notification).add(adaptor.flushReflectedValuesIfNecessaryNoNotification(false));
- }
- }
- }
- } finally {
- finishedIteratingReflected();
- }
- return notification;
-
-}
-/**
- * Insert the method's description here.
- * Creation date: (11/2/2000 3:02:31 PM)
- * @return org.eclipse.jdt.core.api.IJavaProject
- */
-public IJavaProject getJavaProject() {
- return javaProject;
-}
-/**
- * Create a Java Model listener which will flush invalidated adaptors.
- * This will cause those adapters to re-reflect their target object's contents.
- */
-protected void initializeSynchronizer() {
- synchronizer = new JavaReflectionSynchronizer(this);
-}
-/**
- * Notify all JDOMAdapters which use the same target ICompilationUnit
- * Creation date: (8/17/2001 4:45:43 PM)
- */
-public void notifyContentChanged(ICompilationUnit targetCU) {
-
- if (targetCU == null || reflected.values()==null) return ;
- isBusyIteratingReflected = true;
- try {
- Iterator i = reflected.values().iterator();
- while (i.hasNext()) {
- Object a = i.next() ;
- if (a instanceof JDOMAdaptor) {
- JDOMAdaptor adaptor = (JDOMAdaptor) a;
- IMember reflectionSource = (IMember) adaptor.getReflectionSource();
- ICompilationUnit adapterCU = null ;
- if (reflectionSource != null) {
- try {
- adapterCU = reflectionSource.getCompilationUnit();
- } catch (Exception e) {}
- }
- if (adapterCU != null && targetCU.equals(adapterCU)) {
- adaptor.contentChanged();
- }
- }
- }
- } finally {
- finishedIteratingReflected();
- }
-}
-/**
- * Insert the method's description here.
- * Creation date: (11/2/2000 3:02:31 PM)
- * @param newJavaProject org.eclipse.jdt.core.IJavaProject
- */
-public void setJavaProject(IJavaProject newJavaProject) {
- javaProject = newJavaProject;
- if (newJavaProject != null && synchronizer == null)
- initializeSynchronizer();
-}
-}
diff --git a/plugins/org.eclipse.jem.workbench/workbench/org/eclipse/jem/internal/adapters/jdom/JavaMethodJDOMAdaptor.java b/plugins/org.eclipse.jem.workbench/workbench/org/eclipse/jem/internal/adapters/jdom/JavaMethodJDOMAdaptor.java
deleted file mode 100644
index 07eca0e..0000000
--- a/plugins/org.eclipse.jem.workbench/workbench/org/eclipse/jem/internal/adapters/jdom/JavaMethodJDOMAdaptor.java
+++ /dev/null
@@ -1,471 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2001, 2005 IBM Corporation and others.
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
- *
- * Contributors:
- * IBM Corporation - initial API and implementation
- *******************************************************************************/
-/*
-
-
- */
-package org.eclipse.jem.internal.adapters.jdom;
-
-import java.util.List;
-import java.util.Map;
-
-import org.eclipse.emf.common.notify.Notifier;
-import org.eclipse.emf.ecore.EObject;
-import org.eclipse.emf.ecore.util.EcoreUtil;
-import org.eclipse.emf.ecore.xmi.XMIResource;
-import org.eclipse.jdt.core.*;
-
-import org.eclipse.jem.internal.java.adapters.IJavaMethodAdapter;
-import org.eclipse.jem.internal.java.adapters.ReadAdaptor;
-import org.eclipse.jem.internal.java.adapters.nls.ResourceHandler;
-import org.eclipse.jem.java.*;
-import org.eclipse.jem.java.internal.impl.MethodImpl;
-import org.eclipse.jem.util.TimerTests;
-import org.eclipse.jem.internal.plugin.JavaPlugin;
-
-/**
- * Java Method Reflection Adapter for JDOM (i.e. JDT model)
- * Creation date: (6/6/2000 4:42:50 PM)
- * @author: Administrator
- */
-public class JavaMethodJDOMAdaptor extends JDOMAdaptor implements IJavaMethodAdapter {
-
- /*
- * Step ids used for TimerTests of performance testing.
- */
- public static final String REFLECT_METHOD = "Reflect JDOM Method"; //$NON-NLS-1$
-
- protected IMethod sourceMethod = null;
-
- protected IType parentType = null;
-
- public JavaMethodJDOMAdaptor(Notifier target, IJavaProject workingProject) {
- super(target, workingProject);
- }
-
-
- protected boolean flushReflectedValues(boolean clearCachedModelObject) {
- if (clearCachedModelObject)
- clearSource();
- MethodImpl method = (MethodImpl) getTarget();
- method.setIsGenerated(false);
- method.setFinal(false);
- method.setNative(false);
- method.setStatic(false);
- method.setSynchronized(false);
- method.setConstructor(false);
- method.setAbstract(false);
- method.setJavaVisibility(JavaVisibilityKind.PUBLIC_LITERAL);
- method.setEType(null);
- method.getParametersGen().clear();
- method.getJavaExceptionsGen().clear();
- parentType = null;
- return true;
- }
-
- protected void postFlushReflectedValuesIfNecessary(boolean isExisting) {
- ((MethodImpl) getTarget()).setReflected(false);
- super.postFlushReflectedValuesIfNecessary(isExisting);
- }
- /**
- * addExceptions - reflect our exception list
- */
- protected void addExceptions() {
- try {
- IMethod sourceMethod = getSourceMethod();
- String[] exceptionNames = sourceMethod.getExceptionTypes();
- List exceptions = ((MethodImpl) getTarget()).getJavaExceptionsGen();
- for (int i = 0; i < exceptionNames.length; i++) {
- exceptions.add(createJavaClassRef(typeNameFromSignature(exceptionNames[i])));
- }
- } catch (JavaModelException npe) {
- // name stays null and we carry on
- }
- }
-
-
- protected String[] getParameterNames() {
- String[] parmNames = new String[0], parmTypeNames = getSourceMethod().getParameterTypes();
- try {
- parmNames = getSourceMethod().getParameterNames();
- } catch (JavaModelException npe) {
- // name stays null and we carry on
- }
- // Temp hack to work around a JavaModel bug, above call on a Binary method may return null
- if (parmNames == null || parmNames.length == 0) {
- parmNames = new String[parmTypeNames.length];
- for (int i = 0; i < parmTypeNames.length; i++) {
- parmNames[i] = "arg" + i;//$NON-NLS-1$
- }
- }
- return parmNames;
- }
-
- /**
- * addParameters - reflect our parms
- */
- protected void addParameters() {
- String[] parmTypeNames = getSourceMethod().getParameterTypes();
- MethodImpl javaMethodTarget = (MethodImpl) getTarget();
- List params = javaMethodTarget.getParametersGen();
- for (int i = 0; i < parmTypeNames.length; i++) {
- params.add(createJavaParameter(javaMethodTarget, null, typeNameFromSignature(parmTypeNames[i])));
- }
- }
-
- protected void clearSource() {
- sourceMethod = null;
- }
-
- protected JavaClass getContainingJavaClass() {
- return ((Method) getTarget()).getContainingJavaClass();
- }
-
- /**
- * getParentType - return the IType which corresponds to our parent JavaClass we're going to do this a lot, so cache it.
- */
- protected IType getParentType() {
- if (parentType == null) {
- Method targetMethod = (Method) getTarget();
- if(targetMethod != null){
- JavaClass parentJavaClass = targetMethod.getContainingJavaClass();
- JavaClassJDOMAdaptor pa = (JavaClassJDOMAdaptor) EcoreUtil.getAdapter(parentJavaClass.eAdapters(), ReadAdaptor.TYPE_KEY);
- if (pa != null)
- parentType = pa.getSourceType();
- }
- }
- return parentType;
- }
-
- /**
- * getParmTypeSignatures - return an array of Strings (in Signature format) for our parameter types For reflection purposes, we can only rely on
- * our UUID, since our parms may not yet be known. see org.eclipse.jdt.core.SourceMapper.convertTypeNamesToSigs()
- */
- protected String[] getParmTypeSignatures() {
- Method javaMethodTarget = (Method) getTarget();
- String[] typeNames = getTypeNamesFromMethodID(((XMIResource) javaMethodTarget.eResource()).getID(javaMethodTarget));
- if (typeNames == null)
- return emptyStringArray;
- int n = typeNames.length;
- if (n == 0)
- return emptyStringArray;
- String[] typeSigs = new String[n];
- try {
- for (int i = 0; i < n; ++i) {
- typeSigs[i] = Signature.createTypeSignature(new String(typeNames[i]), getParentType().isBinary());
- }
- } catch (IllegalArgumentException e) {
- JavaPlugin.logError(e);
- }
- return typeSigs;
- }
-
- public Object getReflectionSource() {
- return getSourceMethod();
- }
-
- /* (non-Javadoc)
- * @see org.eclipse.jem.internal.java.adapters.JavaReflectionAdaptor#hasReflectionSource()
- */
- public boolean hasCachedReflectionSource() {
- return sourceMethod != null;
- }
-
- /*
- * Used by Java Class JDOM adapter to create and set with a source method/
- */
- public void primSetMethod(IMethod method) {
- sourceMethod = method;
- }
- /**
- * getsourceMethod - return the IMethod which describes our implementing method
- */
- public IMethod getSourceMethod() {
- if ((sourceMethod == null) || (!sourceMethod.exists())) {
- try {
- IType parent = this.getParentType();
- if (parent != null) {
- String[] parmNames = this.getParmTypeSignatures();
- sourceMethod = JDOMSearchHelper.searchForMatchingMethod(parent, ((Method) getTarget()).getName(), parmNames);
- }
- } catch (JavaModelException e) {
- //do nothing
- }
- }
- return sourceMethod;
- }
-
- protected IType getType() {
- return getParentType();
- }
-
- protected Map getTypeResolutionCache() {
- Method method = (Method) getTarget();
- if (method != null) {
- JavaClass javaClass = method.getJavaClass();
- if (javaClass != null) {
- JDOMAdaptor classAdaptor = (JDOMAdaptor) retrieveAdaptorFrom(javaClass);
- if (classAdaptor != null)
- return classAdaptor.getTypeResolutionCache();
- }
- }
- return null;
- }
-
- /**
- * getValueIn method comment.
- */
- public Object getValueIn(EObject object, EObject attribute) {
- // At this point, this adapter does not dynamically compute any values,
- // all values are pushed back into the target on the initial call.
- return super.getValueIn(object, attribute);
- }
-
- /**
- * reflectValues - template method, subclasses override to pump values into target. on entry: UUID, name, containing package (and qualified name),
- * and document must be set. Method adaptor: - set modifiers - set name - set return type - add parameters - add exceptions
- */
- public boolean reflectValues() {
- super.reflectValues();
- try {
- TimerTests.basicTest.startCumulativeStep(REFLECT_METHOD);
- if (isResourceLoaded() && getSourceProject() != null && getSourceMethod() != null && sourceMethod.exists()) {
- setModifiers();
- setNaming();
- setReturnType();
- addParameters();
- addExceptions();
- return true;
- }
- } finally {
- TimerTests.basicTest.stopCumulativeStep(REFLECT_METHOD);
- }
- return false;
- }
-
- /**
- * Set the generated flag if @generated is found in the source.
- */
- protected void setGeneratedFlag() {
- Method methodTarget = (Method) getTarget();
- try {
- String source = getSourceMethod().getSource();
- if (source != null) {
- int index = source.indexOf(Method.GENERATED_COMMENT_TAG);
- if (index > 0)
- methodTarget.setIsGenerated(true);
- }
- } catch (JavaModelException npe) {
- //System.out.println(ResourceHandler.getString("Error_Setting_GenFlag_ERROR_", new Object[]
- // {((XMIResource)methodTarget.eResource()).getID(methodTarget), npe.getMessage()})); //$NON-NLS-1$ = "error setting the generated flag on
- // {0}, exception: {1}"
- }
- }
-
-
- /* (non-Javadoc)
- * @see org.eclipse.jem.internal.java.adapters.IJavaMethodAdapter#reflectGeneratedIfNecessary()
- */
- public boolean reflectGeneratedIfNecessary() {
- if (reflectValuesIfNecessary()) {
- setGeneratedFlag();
- return true;
- }
- return false;
- }
-
- public boolean reflectParamNamesIfNecessary() {
- if (reflectValuesIfNecessary()) {
- String [] paramNames = getParameterNames();
- List param = ((MethodImpl)getTarget()).getParameters();
- for (int i = 0; i < paramNames.length; i++) {
- ((JavaParameter)param.get(i)).setName(paramNames[i]);
- }
- return true;
- }
- return false;
- }
- /**
- * setModifiers - set the attribute values related to modifiers here
- */
- protected void setModifiers() {
- Method methodTarget = (Method) getTarget();
- try {
- methodTarget.setFinal(Flags.isFinal(getSourceMethod().getFlags()));
- methodTarget.setNative(Flags.isNative(getSourceMethod().getFlags()));
- methodTarget.setStatic(Flags.isStatic(getSourceMethod().getFlags()));
- methodTarget.setSynchronized(Flags.isSynchronized(getSourceMethod().getFlags()));
- methodTarget.setConstructor(getSourceMethod().isConstructor());
-
- JavaClass javaClass = getContainingJavaClass();
- //Set abstract
- if (javaClass.getKind().getValue() == TypeKind.INTERFACE)
- methodTarget.setAbstract(true);
- else
- methodTarget.setAbstract(Flags.isAbstract(getSourceMethod().getFlags()));
- // Set visibility
- if (javaClass.getKind().getValue() == TypeKind.INTERFACE || Flags.isPublic(getSourceMethod().getFlags()))
- methodTarget.setJavaVisibility(JavaVisibilityKind.PUBLIC_LITERAL);
- else if (Flags.isPrivate(getSourceMethod().getFlags()))
- methodTarget.setJavaVisibility(JavaVisibilityKind.PRIVATE_LITERAL);
- else if (Flags.isProtected(getSourceMethod().getFlags()))
- methodTarget.setJavaVisibility(JavaVisibilityKind.PROTECTED_LITERAL);
- else
- //Visibility must be package
- methodTarget.setJavaVisibility(JavaVisibilityKind.PACKAGE_LITERAL);
- } catch (JavaModelException npe) {
- System.out
- .println(ResourceHandler
- .getString(
- "Error_Introspecting_Flags_ERROR_", (new Object[] { ((XMIResource) methodTarget.eResource()).getID(methodTarget), npe.getMessage()}))); //$NON-NLS-1$ = "error introspecting flags on {0}, exception: {1}"
- }
- }
-
- /**
- * setNaming - set the naming values here - qualified name must be set first, that is the path to the real Java class - ID - name-based UUID
- */
- protected void setNaming() {
- //
- // naming is currently a no-op since the name and UUID must be set prior to reflection
- // ...and ID is redundant with UUID.
- // javaFieldTarget.setID(parent.getQualifiedName() + "_" + javaFieldTarget.getName());
- }
-
- /**
- * setType - set our return type here
- */
- protected void setReturnType() {
- String typeName = null;
- try {
- typeName = typeNameFromSignature(getSourceMethod().getReturnType());
- } catch (JavaModelException npe) {
- // name stays null and we carry on
- }
- if (typeName != null) {
- Method javaMethodTarget = (Method) getTarget();
- javaMethodTarget.setEType(createJavaClassRef(typeName));
- }
- }
-
- /**
- * Insert the method's description here. Creation date: (10/3/2001 10:08:34 AM)
- *
- * @param newSourceMethod
- * org.eclipse.jdt.core.IMethod
- */
- public void setSourceMethod(org.eclipse.jdt.core.IMethod newSourceMethod) {
- sourceMethod = newSourceMethod;
- }
-
- /*
- * Override to tolerate JDK 5 variable types.
- * @see org.eclipse.jem.internal.adapters.jdom.JDOMAdaptor#typeNameFromSignature(java.lang.String)
- */
- protected String typeNameFromSignature(String typeSignature) {
- String erasure = null;
- try {
- erasure = Signature.getTypeErasure(typeSignature);
- } catch (IllegalArgumentException e) {
- //The signature is not the correct format for a variable.
- }
- if (erasure != null) {
- String variableName = null;
- String resolvedVariable = null;
-
- int arrayCount = Signature.getArrayCount(erasure);
- if (arrayCount > 0) {
- //We have an array. Check if the element type is a variable.
- String elementTypeName = Signature.getElementType(erasure);
- variableName = Signature.toString(elementTypeName);
- resolvedVariable = resolveVariableName(erasure, variableName);
- if (resolvedVariable != null) {
- //Add array info.
- StringBuffer b = new StringBuffer(resolvedVariable);
- for (int i = 0; i < arrayCount; i++) {
- b.append("[]"); //$NON-NLS-1$
- }
- resolvedVariable = b.toString();
- }
- } else {
- variableName = Signature.toString(erasure);
- //Need to resolve the variable.
- resolvedVariable = resolveVariableName(erasure, variableName);
- }
- if (resolvedVariable == null) {
- return super.typeNameFromSignature(erasure);
- } else {
- return resolvedVariable;
- }
- }
- return super.typeNameFromSignature(typeSignature);
- }
-
-
- private String resolveVariableName(String erasure, String variableName) {
- IMethod method = getSourceMethod();
- ITypeParameter[] typeParameters = null;
- try {
- typeParameters = method.getTypeParameters();
- } catch (JavaModelException e1) {
- //Failed to retrieve type parameters for any number of reasons.
- }
- ITypeParameter typeParam = null;
- if (typeParameters != null && typeParameters.length > 0) {
- for (int i = 0; i < typeParameters.length; i++) {
- if (typeParameters[i].exists() && variableName.equals(typeParameters[i].getElementName())) {
- typeParam = typeParameters[i];
- break;
- }
- }
- if (typeParam != null) {
- String[] bounds = null;
- try {
- bounds = typeParam.getBounds();
- } catch (JavaModelException e) {}
- if (bounds != null && bounds.length > 0) {
- return JDOMSearchHelper.getResolvedTypeName(bounds[0], getType(), getTypeResolutionCache());
- } else {
- return "java.lang.Object";
- }
- }
- }
-
- IJavaElement parent = method.getParent();
- if (parent instanceof IType)
- {
- try {
- typeParameters = ((IType)parent).getTypeParameters();
- } catch (JavaModelException e1) {
- //Failed to retrieve type parameters for any number of reasons.
- }
- }
- if (typeParameters != null && typeParameters.length > 0) {
- for (int i = 0; i < typeParameters.length; i++) {
- if (typeParameters[i].exists() && variableName.equals(typeParameters[i].getElementName())) {
- typeParam = typeParameters[i];
- break;
- }
- }
- if (typeParam != null) {
- String[] bounds = null;
- try {
- bounds = typeParam.getBounds();
- } catch (JavaModelException e) {}
- if (bounds != null && bounds.length > 0) {
- return JDOMSearchHelper.getResolvedTypeName(bounds[0], getType(), getTypeResolutionCache());
- } else {
- return "java.lang.Object";
- }
- }
- }
- return null;
- }
-}
diff --git a/plugins/org.eclipse.jem.workbench/workbench/org/eclipse/jem/internal/adapters/jdom/JavaModelListener.java b/plugins/org.eclipse.jem.workbench/workbench/org/eclipse/jem/internal/adapters/jdom/JavaModelListener.java
deleted file mode 100644
index f3508c9..0000000
--- a/plugins/org.eclipse.jem.workbench/workbench/org/eclipse/jem/internal/adapters/jdom/JavaModelListener.java
+++ /dev/null
@@ -1,44 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2001, 2006 IBM Corporation and others.
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
- *
- * Contributors:
- * IBM Corporation - initial API and implementation
- *******************************************************************************/
-package org.eclipse.jem.internal.adapters.jdom;
-/*
-
-
- */
-
-
-/**
- * Insert the type's description here.
- * Creation date: (10/31/2000 1:13:12 PM)
- * @author: Administrator
- * @deprecated Use {@link org.eclipse.jem.workbench.utility.JavaModelListener} instead.
- */
-public abstract class JavaModelListener extends org.eclipse.jem.workbench.utility.JavaModelListener {
-
- /**
- *
- *
- * @since 1.2.0
- */
- public JavaModelListener() {
- super();
- }
-
- /**
- * @param eventsToListen
- *
- * @since 1.2.0
- */
- public JavaModelListener(int eventsToListen) {
- super(eventsToListen);
- }
-
-}
diff --git a/plugins/org.eclipse.jem.workbench/workbench/org/eclipse/jem/internal/adapters/jdom/JavaReflectionSynchronizer.java b/plugins/org.eclipse.jem.workbench/workbench/org/eclipse/jem/internal/adapters/jdom/JavaReflectionSynchronizer.java
deleted file mode 100644
index d5ad5b7..0000000
--- a/plugins/org.eclipse.jem.workbench/workbench/org/eclipse/jem/internal/adapters/jdom/JavaReflectionSynchronizer.java
+++ /dev/null
@@ -1,343 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2001, 2006 IBM Corporation and others.
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
- *
- * Contributors:
- * IBM Corporation - initial API and implementation
- *******************************************************************************/
-package org.eclipse.jem.internal.adapters.jdom;
-/*
-
-
- */
-
-import java.util.ArrayList;
-import java.util.List;
-import java.util.logging.Level;
-
-import org.eclipse.emf.common.notify.Notification;
-import org.eclipse.emf.common.notify.Notifier;
-import org.eclipse.jdt.core.*;
-
-import org.eclipse.jem.internal.plugin.JavaPlugin;
-import org.eclipse.jem.util.logger.proxy.Logger;
-import org.eclipse.jem.workbench.utility.JavaModelListener;
-
-/**
- * Insert the type's description here.
- * Creation date: (11/1/2000 11:42:05 AM)
- * @author: Administrator
- */
-public class JavaReflectionSynchronizer extends JavaModelListener {
-
- protected JavaJDOMAdapterFactory fAdapterFactory;
-
- protected boolean flushedAll = false;
- protected List flushTypes = new ArrayList();
- protected List flushTypePlusInner = new ArrayList();
- protected List notifications = new ArrayList();
- /**
- * JavaReflectionSynchronizer constructor comment.
- */
- public JavaReflectionSynchronizer(JavaJDOMAdapterFactory synchronizee) {
- super();
- fAdapterFactory = synchronizee;
- }
- /* (non-Javadoc)
- * @see org.eclipse.jem.internal.adapters.jdom.JavaModelListener#getJavaProject()
- */
- protected IJavaProject getJavaProject() {
- return getAdapterFactory().getJavaProject();
- }
- /**
- * Tell the reflection factory to flush the passed IType
- */
- protected Notification doFlush(IType element) {
- return getAdapterFactory().flushReflectionNoNotification(element.getFullyQualifiedName());
- }
-
- /*
- * Flush the compilation unit and any inner classes since we don't if they may or may not of changed.
- */
- protected Notification doFlush(ICompilationUnit element) {
- return getAdapterFactory().flushReflectionPlusInnerNoNotification(getFullNameFromElement(element));
- }
-
- protected void flush(IType element) {
- if (!flushTypes.contains(element))
- flushTypes.add(element);
- }
- /*
- * flush the compilation unit. Since we don't know if inner classes may also
- * of been affected, they to will be flushed.
- */
- protected void flush(ICompilationUnit element) {
- if (!flushTypePlusInner.contains(element))
- flushTypePlusInner.add(element);
- }
- protected void flushPackage(String packageName, boolean noFlushIfSourceFound) {
- notifications.addAll(getAdapterFactory().flushPackageNoNotification(packageName, noFlushIfSourceFound));
- }
- protected JavaJDOMAdapterFactory getAdapterFactory() {
- return fAdapterFactory;
- }
-
- /**
- * Handle the change for a single element, children will be handled separately.
- *
- */
- protected void processJavaElementChanged(ICompilationUnit element, IJavaElementDelta delta) {
- switch (delta.getKind()) {
- case IJavaElementDelta.CHANGED : {
- // A file save had occurred. It doesn't matter if currently working copy or not.
- // It means something has changed to the file on disk, but don't know what.
- if ((delta.getFlags() & IJavaElementDelta.F_PRIMARY_RESOURCE) != 0) {
- flush(element); // Flush everything, including inner classes.
- } else if ((delta.getFlags() & IJavaElementDelta.F_CONTENT) == 0 &&
- (delta.getFlags() & IJavaElementDelta.F_CHILDREN) != 0) //A type may have been added or removed.
- processChildren(element, delta);
- break;
- }
- case IJavaElementDelta.REMOVED :
- case IJavaElementDelta.ADDED :
- if (!element.isWorkingCopy())
- disAssociateSourcePlusInner(getFullNameFromElement(element));
- break;
- }
- }
-
- /**
- * Handle the change for a single element, children will be handled separately.
- *
- */
- protected void processJavaElementChanged(IJavaProject element, IJavaElementDelta delta) {
- if (isInClasspath(element)) {
- if (delta.getKind() == IJavaElementDelta.REMOVED || (delta.getKind() == IJavaElementDelta.CHANGED && (delta.getFlags() & IJavaElementDelta.F_CLOSED) != 0)) {
- if (element.equals(getAdapterFactory().getJavaProject()))
- stopSynchronizer();
- else
- flushAll(); //another dependent project has changed so flush all to be safe
- return;
- } else if (delta.getKind() == IJavaElementDelta.ADDED || isClasspathResourceChange(delta)) {
- flushAll();
- return;
- }
- processChildren(element, delta);
- }
- }
- /**
- * Handle the change for a single element, children will be handled separately.
- */
- protected void processJavaElementChanged(IClassFile element, IJavaElementDelta delta) {
- int kind = delta.getKind();
- if (kind == IJavaElementDelta.REMOVED || kind == IJavaElementDelta.ADDED) {
- // It doesn't matter if totally removed or just moved somewhere else, we will clear out and remove the
- // adapter because there could be a rename which would be a different class.
- // Currently the element is already deleted and there is no way to find the types in the unit to remove.
- // So instead we ask factory to remove all it any that start with it plus for inner classes.
- disAssociateSourcePlusInner(getFullNameFromElement(element));
- return; // Since the classfile was removed we don't need to process the children (actually the children list will be empty
- }
- IJavaElementDelta[] children = delta.getAffectedChildren();
- for (int ii = 0; ii < children.length; ii++) {
- processDelta(children[ii]);
- }
- }
- /**
- * Handle the change for a single element, children will be handled separately.
- *
- */
- protected void processJavaElementChanged(IPackageFragmentRoot element, IJavaElementDelta delta) {
- if (flushedAll)
- return;
- if (isClassPathChange(delta))
- flushAll();
- else
- super.processJavaElementChanged(element, delta);
- }
-
- /*
- * We will force the flushing of all adaptors for the given package name.
- * This is necessary if a type was reflected prior to the package existing or
- * if the package is deleted.
- * @see org.eclipse.jem.internal.adapters.jdom.JavaModelListener#processJavaElementChanged(org.eclipse.jdt.core.IPackageFragment, org.eclipse.jdt.core.IJavaElementDelta)
- */
- protected void processJavaElementChanged(IPackageFragment element, IJavaElementDelta delta) {
- switch (delta.getKind()) {
- case IJavaElementDelta.ADDED :
- // Even though added there is possibility that package exists in other root but this
- // one may now take priority, so we will clear the package anyway.
- flushPackage(delta.getElement().getElementName(), false);
- break;
- case IJavaElementDelta.REMOVED :
- getAdapterFactory().flushPackage(delta.getElement().getElementName(), false);
- break;
- default :
- super.processJavaElementChanged(element, delta);
- }
- }
-
- /**
- * Handle the change for a single element, children will be handled separately.
- *
- */
- protected void processJavaElementChanged(IType element, IJavaElementDelta delta) {
- int kind = delta.getKind();
- if (kind == IJavaElementDelta.REMOVED || kind == IJavaElementDelta.ADDED) {
- disAssociateSourcePlusInner(element.getFullyQualifiedName());
- } else {
- flush(element);
- processChildren(element, delta);
- // Note, if a method element or a field was changed, there may be delta.getAffectedChildren()
- // that will have to be processed if we are to update the JavaMethod/JavaField JDOMAdaptor s.
- }
- }
- /**
- * Given that an IType does not exists anymore, assume
- * that the type's name is package.filename (without the .java)
- * If we are wrong (if, then a rare case), we will flush.
- * Next access will induce a reflection attempt.
- * @deprecated This doesn't look like it is ever called. It someone else calls it, please contact development to see if right method to be called.
- */
- protected void processRemoveOrAdd(ICompilationUnit element) {
- disAssociateSource(getFullNameFromElement(element));
- }
-
- protected String getFullNameFromElement(ICompilationUnit cu) {
- IType primary = cu.findPrimaryType();
- if (primary != null)
- return primary.getFullyQualifiedName();
- else {
- String filename = cu.getElementName();
- // Just strip off extension. There is actually a more complicated test for "java like extenstions" but JDT has that hidden\
- // so we will just guess and take off the extension.
- int idx = filename.lastIndexOf('.');
- if (idx != -1)
- filename = filename.substring(0, idx);
- return ((IPackageFragment) cu.getParent()).getElementName()+'.'+filename;
- }
- }
-
- protected String getFullNameFromElement(IClassFile cf) {
-
- return cf.getType().getFullyQualifiedName();
-
- }
-
- protected String getFullNameFromElement(IJavaElement element) {
- String name = element.getElementName();
- if (element == null || name.length() <= 5 || !name.substring(name.length() - 5).equals(".java")) { //$NON-NLS-1$
- // Should not be here,
- Logger logger = JavaPlugin.getDefault().getLogger();
- if (logger.isLoggingLevel(Level.FINE))
- logger.log("Invalid .java file: " + name, Level.FINE); //$NON-NLS-1$
- // Make a guess, at worst case, nothing will come out of this.
- int index = name.lastIndexOf("."); //$NON-NLS-1$
- if (index >= 0)
- name = name.substring(0, index) + ".java"; // rename the extension to .java //$NON-NLS-1$
- else
- name = name + ".java"; //$NON-NLS-1$
- }
- if (element.getParent().getElementName() == null || element.getParent().getElementName().length() == 0)
- return name.substring(0, name.length() - 5);
- else
- return element.getParent().getElementName() + "." + name.substring(0, name.length() - 5); //$NON-NLS-1$
- }
- /**
- * Stop the synchronizer from listening to any more changes.
- */
- public void stopSynchronizer() {
- JavaCore.removeElementChangedListener(this);
- }
- /**
- * @see org.eclipse.jem.internal.adapters.jdom.JavaModelListener#elementChanged(ElementChangedEvent)
- */
- public void elementChanged(ElementChangedEvent event) {
- try {
- flushTypes.clear();
- flushTypePlusInner.clear();
- notifications.clear();
- super.elementChanged(event);
- flushTypes();
- processNotifications();
- } finally {
- flushedAll = false;
- flushTypes.clear();
- flushTypePlusInner.clear();
- notifications.clear();
- }
- }
- /**
- *
- */
- private void flushTypes() {
- if (!flushTypes.isEmpty()) {
- IType type = null;
- Notification not;
- for (int i = 0; i < flushTypes.size(); i++) {
- type = (IType) flushTypes.get(i);
- not = doFlush(type);
- if (not != null)
- notifications.add(not);
- }
- }
- if (!flushTypePlusInner.isEmpty()) {
- ICompilationUnit unit = null;
- Notification not;
- for (int i = 0; i < flushTypePlusInner.size(); i++) {
- unit = (ICompilationUnit) flushTypePlusInner.get(i);
- not = doFlush(unit);
- if (not != null)
- notifications.add(not);
- }
- }
- }
- /**
- * @param notifications
- */
- private void processNotifications() {
- Notifier notifier;
- Notification not;
- for (int i = 0; i < notifications.size(); i++) {
- not = (Notification) notifications.get(i);
- notifier = (Notifier) not.getNotifier();
- if (notifier != null)
- try {
- notifier.eNotify(not);
- } catch (Exception e) {
- JavaPlugin.getDefault().getLogger().log(e); //catch exceptions so all notifications are processed
- }
- }
- }
- protected void disAssociateSource(String qualifiedName) {
- Notification not = getAdapterFactory().disAssociateSource(qualifiedName, false);
- if (not != null)
- notifications.add(not);
- }
- protected void disAssociateSourcePlusInner(String qualifiedName) {
- Notification not = getAdapterFactory().disAssociateSourcePlusInner(qualifiedName, false);
- if (not != null)
- notifications.add(not);
- }
- protected void flushAll() {
- notifications.addAll(getAdapterFactory().flushAllNoNotification());
- flushedAll = true;
- }
- /**
- * @see org.eclipse.jem.internal.adapters.jdom.JavaModelListener#processChildren(IJavaElement, IJavaElementDelta)
- */
- protected void processChildren(IJavaElement element, IJavaElementDelta delta) {
- if (!flushedAll)
- super.processChildren(element, delta);
- }
- /**
- * @see org.eclipse.jem.internal.adapters.jdom.JavaModelListener#processDelta(IJavaElementDelta)
- */
- public void processDelta(IJavaElementDelta delta) {
- if (!flushedAll)
- super.processDelta(delta);
- }
-}
diff --git a/plugins/org.eclipse.jem.workbench/workbench/org/eclipse/jem/internal/plugin/IJavaProjectInfo.java b/plugins/org.eclipse.jem.workbench/workbench/org/eclipse/jem/internal/plugin/IJavaProjectInfo.java
deleted file mode 100644
index 7ca3108..0000000
--- a/plugins/org.eclipse.jem.workbench/workbench/org/eclipse/jem/internal/plugin/IJavaProjectInfo.java
+++ /dev/null
@@ -1,20 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2001, 2005 IBM Corporation and others.
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
- *
- * Contributors:
- * IBM Corporation - initial API and implementation
- *******************************************************************************/
-package org.eclipse.jem.internal.plugin;
-
-/**
- * Insert the type's description here.
- * Creation date: (05/07/01 10:06:28 PM)
- * @author: Administrator
- */
-public interface IJavaProjectInfo {
-public String getSourcePath();
-}
diff --git a/plugins/org.eclipse.jem.workbench/workbench/org/eclipse/jem/internal/plugin/JavaEMFNature.java b/plugins/org.eclipse.jem.workbench/workbench/org/eclipse/jem/internal/plugin/JavaEMFNature.java
deleted file mode 100644
index f66bc9c..0000000
--- a/plugins/org.eclipse.jem.workbench/workbench/org/eclipse/jem/internal/plugin/JavaEMFNature.java
+++ /dev/null
@@ -1,191 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2001, 2005 IBM Corporation and others.
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
- *
- * Contributors:
- * IBM Corporation - initial API and implementation
- *******************************************************************************/
-package org.eclipse.jem.internal.plugin;
-/*
- * $RCSfile: JavaEMFNature.java,v $ $Revision: 1.17 $ $Date: 2006/09/14 18:31:08 $
- */
-
-import java.util.List;
-
-import org.eclipse.core.resources.IProject;
-import org.eclipse.core.runtime.CoreException;
-import org.eclipse.emf.common.notify.AdapterFactory;
-import org.eclipse.emf.ecore.resource.ResourceSet;
-import org.eclipse.emf.ecore.util.EcoreUtil;
-import org.eclipse.jdt.core.JavaCore;
-
-import org.eclipse.jem.internal.adapters.jdom.JavaJDOMAdapterFactory;
-import org.eclipse.jem.internal.java.adapters.*;
-import org.eclipse.jem.java.adapters.JavaXMIFactory;
-import org.eclipse.jem.util.emf.workbench.EMFWorkbenchContextBase;
-import org.eclipse.jem.util.emf.workbench.WorkbenchURIConverter;
-import org.eclipse.jem.util.emf.workbench.nature.EMFNature;
-import org.eclipse.jem.workbench.utility.IJavaEMFNature;
-import org.eclipse.jem.workbench.utility.JemProjectUtilities;
-
-public class JavaEMFNature extends EMFNature implements IJavaEMFNature {
-/**
- * JavaMOFNatureRuntime constructor comment.
- */
-public JavaEMFNature() {
- super();
-}
-/**
- * Get a IJavaMOFNatureRuntime that corresponds to the supplied project.
- * @return IJavaMOFNatureRuntime
- * @param project com.ibm.itp.core.api.resources.IProject
- */
-public static JavaEMFNature createRuntime(IProject project) throws CoreException {
- if(!hasRuntime(project))
- if (JavaCore.create(project).exists())
- addNatureToProject(project, IJavaEMFNature.NATURE_ID);
- else
- return null;
-
- return getRuntime(project);
-}
-
-/**
- * Return the nature's ID.
- */
-public java.lang.String getNatureID() {
- return IJavaEMFNature.NATURE_ID;
-}
-/**
- * Return the ID of the plugin that this nature is contained within.
- */
-protected java.lang.String getPluginID() {
- return JavaPlugin.getDefault().getBundle().getSymbolicName();
-}
-/**
- * Get a IJavaMOFNatureRuntime that corresponds to the supplied project.
- * First check for registered natures.
- * @return IJavaMOFNatureRuntime
- * @param project com.ibm.itp.core.api.resources.IProject
- */
-public static JavaEMFNature getRuntime(IProject project) {
- JavaEMFNature nature = null;
- List runtimes = EMFNature.getRegisteredRuntimes(project);
- for (int i=0; i<runtimes.size(); i++) {
- if (runtimes.get(i) instanceof JavaEMFNature)
- nature = (JavaEMFNature) runtimes.get(i);
- }
- if (nature == null)
- nature = primGetRuntime(project);
- return nature;
-}
-/**
- * Return whether or not the project has a runtime created on it.
- * Check for registered natures first.
- * @return boolean
- * @param project com.ibm.itp.core.api.resources.IProject
- */
-public static boolean hasRuntime(IProject project) {
- JavaEMFNature nature = null;
- List runtimes = EMFNature.getRegisteredRuntimes(project);
- for (int i=0; i<runtimes.size(); i++) {
- if (runtimes.get(i) instanceof JavaEMFNature)
- nature = (JavaEMFNature) runtimes.get(i);
- }
- if (nature == null)
- return primHasRuntime(project);
- else
- return true;
-
-}
-/**
- * Get a IJavaMOFNatureRuntime that corresponds to the supplied project.
- * Do not check for other registered types.
- * @return IJavaMOFNatureRuntime
- * @param project com.ibm.itp.core.api.resources.IProject
- */
-public static JavaEMFNature primGetRuntime(IProject project) {
- try {
- return (JavaEMFNature) project.getNature(IJavaEMFNature.NATURE_ID);
- } catch (CoreException e) {
- return null;
- }
-}
-/**
- * Return whether or not the project has a runtime created on it.
- * Do not check for registered nature ids.
- * @return boolean
- * @param project com.ibm.itp.core.api.resources.IProject
- */
-public static boolean primHasRuntime(IProject project) {
- try {
- return project.hasNature(IJavaEMFNature.NATURE_ID);
- } catch (CoreException e) {
- return false;
- }
-}
-
-/**
- * primary contribute to context
- */
-public void primaryContributeToContext(EMFWorkbenchContextBase aNature) {
- if (emfContext == aNature) return;
- emfContext = aNature;
- ResourceSet set = aNature.getResourceSet();
- set.getResourceFactoryRegistry().getProtocolToFactoryMap().put(JavaXMIFactory.SCHEME, JavaXMIFactory.INSTANCE);
- WorkbenchURIConverter conv = (WorkbenchURIConverter) set.getURIConverter();
- configureURIConverter(conv);
- addAdapterFactories(set);
-}
-
-/**
- * secondary contribute to context
- */
-public void secondaryContributeToContext(EMFWorkbenchContextBase aNature) {
- primaryContributeToContext(aNature);
-}
-
-/**
- * Remove the project as a container from the converter and add
- * the source folder.
- */
-protected void configureURIConverter(WorkbenchURIConverter conv) {
- conv.removeInputContainer(getProject());
- conv.addInputContainer(getEMFRoot());
-}
-
-/**
- * Add Adaptor factories to aContext which is now
- * being used for this nature.
- */
-protected void addAdapterFactories(ResourceSet aSet) {
- addJavaReflectionAdapterFactories(aSet);
-}
-
-protected void addJavaReflectionAdapterFactories(ResourceSet aSet) {
- List factories = aSet.getAdapterFactories();
- // The context may already have a JavaReflection adaptor factory, so remove it
- // This should maybe be considered a logic error, but we can recover easily
- if (!factories.isEmpty()) {
- AdapterFactory factory = EcoreUtil.getAdapterFactory(factories, ReadAdaptor.TYPE_KEY);
- if (factory != null)
- factories.remove(factory);
- }
-
- factories.add(adapterFactory);
-}
-
-private JavaJDOMAdapterFactory adapterFactory;
-
-/* (non-Javadoc)
- * @see org.eclipse.jem.util.emf.workbench.nature.EMFNature#setProject(org.eclipse.core.resources.IProject)
- */
-public void setProject(IProject newProject) {
- super.setProject(newProject);
- adapterFactory = new JavaJDOMAdapterFactory(JemProjectUtilities.getJavaProject(project));
-}
-
-}
diff --git a/plugins/org.eclipse.jem.workbench/workbench/org/eclipse/jem/internal/plugin/JavaPlugin.java b/plugins/org.eclipse.jem.workbench/workbench/org/eclipse/jem/internal/plugin/JavaPlugin.java
deleted file mode 100644
index ed84b40..0000000
--- a/plugins/org.eclipse.jem.workbench/workbench/org/eclipse/jem/internal/plugin/JavaPlugin.java
+++ /dev/null
@@ -1,90 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2001, 2006 IBM Corporation and others.
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
- *
- * Contributors:
- * IBM Corporation - initial API and implementation
- *******************************************************************************/
-package org.eclipse.jem.internal.plugin;
-/*
- * $RCSfile: JavaPlugin.java,v $ $Revision: 1.14 $ $Date: 2009/07/09 20:12:32 $
- */
-
-import org.eclipse.core.runtime.Plugin;
-import org.osgi.framework.BundleContext;
-
-import org.eclipse.jem.internal.adapters.jdom.JavaJDOMAdapterFactory;
-import org.eclipse.jem.internal.java.adapters.jdk.JavaJDKAdapterFactory;
-import org.eclipse.jem.java.util.JavaContext;
-import org.eclipse.jem.util.logger.proxy.Logger;
-import org.eclipse.jem.util.logger.proxyrender.EclipseLogger;
-import org.eclipse.jem.util.plugin.JEMUtilPlugin;
-import org.eclipse.core.runtime.Status;
-import org.eclipse.core.runtime.IStatus;
-import org.eclipse.core.runtime.Platform;
-import java.lang.Throwable;
-import org.eclipse.core.runtime.CoreException;
-
-/**
- * This is a top-level class of the java plugin tool.
- *
- * @see AbstractUIPlugin for additional information on UI plugins
- */
-
-public class JavaPlugin extends Plugin {
-
- //the ID for this plugin (added automatically by logging quickfix)
- public static final String PLUGIN_ID = "org.eclipse.jem.workbench"; //$NON-NLS-1$
- private static JavaPlugin INSTANCE;
- private Logger logger;
-
- /**
- * Create the Java plugin and cache its default instance
- */
- public JavaPlugin() {
- INSTANCE = this;
- }
-
- public Logger getLogger() {
- if (logger == null)
- logger = EclipseLogger.getEclipseLogger(this);
- return logger;
- }
-
- /**
- * Get the plugin singleton.
- */
- static public JavaPlugin getDefault() {
- return INSTANCE;
- }
-
- /* (non-Javadoc)
- * @see org.osgi.framework.BundleActivator#start(org.osgi.framework.BundleContext)
- */
- public void start(BundleContext context) throws Exception {
- super.start(context);
- INSTANCE = this;
- JavaContext.setReflectionAdapterFactoryClass(JavaJDOMAdapterFactory.class);
- JEMUtilPlugin.getPluginResourceSet().getAdapterFactories().add(new JavaJDKAdapterFactory());
- }
-
- public static IStatus createStatus(int severity, String message, Throwable exception) {
- return new Status(severity, PLUGIN_ID, message, exception);
- }
-
- public static IStatus createStatus(int severity, String message) {
- return createStatus(severity, message, null);
- }
-
- public static void logError(Throwable exception) {
- Platform.getLog(Platform.getBundle(PLUGIN_ID)).log( createStatus(IStatus.ERROR, exception.getMessage(), exception));
- }
-
- public static void logError(CoreException exception) {
- Platform.getLog(Platform.getBundle(PLUGIN_ID)).log( exception.getStatus() );
- }
-
-}
diff --git a/plugins/org.eclipse.jem.workbench/workbench/org/eclipse/jem/internal/plugin/JavaProjectInfo.java b/plugins/org.eclipse.jem.workbench/workbench/org/eclipse/jem/internal/plugin/JavaProjectInfo.java
deleted file mode 100644
index 216e576..0000000
--- a/plugins/org.eclipse.jem.workbench/workbench/org/eclipse/jem/internal/plugin/JavaProjectInfo.java
+++ /dev/null
@@ -1,50 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2001, 2005 IBM Corporation and others.
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
- *
- * Contributors:
- * IBM Corporation - initial API and implementation
- *******************************************************************************/
-package org.eclipse.jem.internal.plugin;
-/*
-
-
- */
-/**
- * Insert the type's description here.
- * Creation date: (05/07/01 10:09:26 PM)
- * @author: Administrator
- */
-public class JavaProjectInfo implements IJavaProjectInfo {
-
- public final static String DEFAULT_JAVA_OUTPUT_PATH = "bin";//$NON-NLS-1$
- public final static String DEFAULT_SOURCE_PATH = "source";//$NON-NLS-1$
- protected String sourcePath;
-/**
- * JavaProjectInfo constructor comment.
- */
-public JavaProjectInfo() {
- super();
-}
-/**
- * Subclasses should override as necessary
- */
-protected String getDefaultSourcePath() {
- return DEFAULT_SOURCE_PATH;
-}
-/**
- * Get the class path for the reciever. By default ask the template
- * @return java.lang.String
- */
-public String getSourcePath() {
- if (sourcePath == null)
- sourcePath = getDefaultSourcePath();
- return sourcePath;
-}
-public void setSourcePath(String path) {
- sourcePath = path;
-}
-}
diff --git a/plugins/org.eclipse.jem.workbench/workbench/org/eclipse/jem/workbench/utility/ASTBoundResolver.java b/plugins/org.eclipse.jem.workbench/workbench/org/eclipse/jem/workbench/utility/ASTBoundResolver.java
deleted file mode 100644
index 83ff4e2..0000000
--- a/plugins/org.eclipse.jem.workbench/workbench/org/eclipse/jem/workbench/utility/ASTBoundResolver.java
+++ /dev/null
@@ -1,117 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2004, 2005 IBM Corporation and others.
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
- *
- * Contributors:
- * IBM Corporation - initial API and implementation
- *******************************************************************************/
-/*
-
-
- */
-package org.eclipse.jem.workbench.utility;
-
-import java.text.MessageFormat;
-
-import org.eclipse.jdt.core.dom.*;
-
-import org.eclipse.jem.internal.instantiation.*;
-import org.eclipse.jem.workbench.utility.ParseTreeCreationFromAST.InvalidExpressionException;
-
-/**
- * This works on resolved AST nodes. If the nodes had not been resolved, this will return noting.
- *
- * @since 1.0.0
- */
-public class ASTBoundResolver extends ParseTreeCreationFromAST.Resolver {
-
- /* (non-Javadoc)
- * @see org.eclipse.jem.workbench.utility.ParseTreeCreationFromAST.IResolver#resolveName(org.eclipse.jdt.core.dom.Name)
- */
- public PTExpression resolveName(Name name) {
- IBinding binding = name.resolveBinding();
- if (binding == null)
- return null;
-
- switch (binding.getKind()) {
- case IBinding.TYPE:
- String typename = getTypeName((ITypeBinding) binding);
- PTName ptname = InstantiationFactory.eINSTANCE.createPTName();
- ptname.setName(typename);
- return ptname;
- case IBinding.VARIABLE:
- IVariableBinding variableBinding = (IVariableBinding) binding;
- if (variableBinding.isField()) {
- if (Modifier.isStatic(variableBinding.getModifiers())) {
- PTFieldAccess fa = InstantiationFactory.eINSTANCE.createPTFieldAccess();
- // If just a simple name, then it is like this.field, so no receiver. Not sure how to handle this yet.
- if (name.isQualifiedName()) {
- // There are parts before this one. Get them as an expression (either a name, or another field access)
- fa.setReceiver(resolveName(((QualifiedName) name).getQualifier()));
- }
- fa.setField(variableBinding.getName());
- return fa;
- } else {
- throwInvalidExpressionException(MessageFormat.format(WorkbenchUtilityMessages.ASTBoundResolver_CannotHandleLocalField_EXC_, new Object[]{variableBinding.getName()}));
-// push(new PushFieldVariable(variableId, getTypeSignature(declaringTypeBinding), fCounter));
-// push(new PushThis(getEnclosingLevel(node, declaringTypeBinding)));
-// storeInstruction();
- }
- } else {
- throwInvalidExpressionException(MessageFormat.format(WorkbenchUtilityMessages.ASTBoundResolver_CannotHandleLocalVariable_EXC_, new Object[]{variableBinding.getName()}));
-// push(new PushLocalVariable(variableId));
- }
- }
- return null;
- }
-
- /* (non-Javadoc)
- * @see org.eclipse.jem.workbench.utility.IResolver#resolveType(org.eclipse.jdt.core.dom.Type)
- */
- public String resolveType(Type type) {
- ITypeBinding binding = type.resolveBinding();
- return (binding != null) ? getTypeName(binding) : null;
- }
-
- /* (non-Javadoc)
- * @see org.eclipse.jem.workbench.utility.ParseTreeCreationFromAST.Resolver#resolveType(org.eclipse.jdt.core.dom.Name)
- */
- public String resolveType(Name name) throws InvalidExpressionException {
- ITypeBinding binding = name.resolveTypeBinding();
- return (binding != null) ? getTypeName(binding) : null;
- }
-
- protected String getTypeName(ITypeBinding typeBinding) {
- StringBuffer name;
- if (typeBinding.isArray()) {
- name= new StringBuffer(getTypeName(typeBinding.getElementType()));
- int dimensions= typeBinding.getDimensions();
- for (int i= 0; i < dimensions; i++) {
- name.append("[]"); //$NON-NLS-1$
- }
- return name.toString();
- }
- name= new StringBuffer(typeBinding.getName());
- IPackageBinding packageBinding= typeBinding.getPackage();
- typeBinding= typeBinding.getDeclaringClass();
- while(typeBinding != null) {
- name.insert(0, '$').insert(0, typeBinding.getName());
- typeBinding= typeBinding.getDeclaringClass();
- }
- if (packageBinding != null && !packageBinding.isUnnamed()) {
- name.insert(0, '.').insert(0, packageBinding.getName());
- }
- return name.toString();
- }
-
-
- /* (non-Javadoc)
- * @see org.eclipse.jem.workbench.utility.ParseTreeCreationFromAST.Resolver#resolveThis()
- */
- public PTExpression resolveThis() throws InvalidExpressionException {
- return InstantiationFactory.eINSTANCE.createPTThisLiteral();
- }
-}
diff --git a/plugins/org.eclipse.jem.workbench/workbench/org/eclipse/jem/workbench/utility/IJavaEMFNature.java b/plugins/org.eclipse.jem.workbench/workbench/org/eclipse/jem/workbench/utility/IJavaEMFNature.java
deleted file mode 100644
index 888853d..0000000
--- a/plugins/org.eclipse.jem.workbench/workbench/org/eclipse/jem/workbench/utility/IJavaEMFNature.java
+++ /dev/null
@@ -1,26 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2005 IBM Corporation and others.
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
- *
- * Contributors:
- * IBM Corporation - initial API and implementation
- *******************************************************************************/
-/*
-
-
- */
-package org.eclipse.jem.workbench.utility;
-
-/**
- * Interface for Java EMF Nature constants.
- *
- * @since 1.2.0
- */
-public interface IJavaEMFNature {
-
- public static final String NATURE_ID = "org.eclipse.jem.workbench.JavaEMFNature"; //$NON-NLS-1$
-
-}
diff --git a/plugins/org.eclipse.jem.workbench/workbench/org/eclipse/jem/workbench/utility/JavaModelListener.java b/plugins/org.eclipse.jem.workbench/workbench/org/eclipse/jem/workbench/utility/JavaModelListener.java
deleted file mode 100644
index aec729a..0000000
--- a/plugins/org.eclipse.jem.workbench/workbench/org/eclipse/jem/workbench/utility/JavaModelListener.java
+++ /dev/null
@@ -1,440 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2001, 2006 IBM Corporation and others.
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
- *
- * Contributors:
- * IBM Corporation - initial API and implementation
- *******************************************************************************/
-package org.eclipse.jem.workbench.utility;
-
-/*
- * $RCSfile: JavaModelListener.java,v $ $Revision: 1.7 $ $Date: 2008/06/30 21:06:41 $
- */
-
-import java.util.*;
-
-import org.eclipse.core.resources.*;
-import org.eclipse.core.runtime.IPath;
-import org.eclipse.jdt.core.*;
-
-import org.eclipse.jem.internal.core.JEMPlugin;
-
-/**
- * An element change listener to listen for Java Model changes. It breaks the notification up into individual method calls to make it easier to walk
- * the notification tree.
- *
- * @since 1.2.0
- */
-public abstract class JavaModelListener implements IElementChangedListener {
-
- /**
- * Construct with listening only for {@link ElementChangedEvent#POST_CHANGE} events.
- *
- *
- * @since 1.2.0
- */
- private HashMap resolvedContainers = new HashMap();
- public JavaModelListener() {
- this(ElementChangedEvent.POST_CHANGE);
- }
-
- /**
- * Construct with supplying the type of events to listen for.
- *
- * @param eventsToListen
- * or'd together event listening types. See {@link ElementChangedEvent} for the types.
- *
- * @since 1.2.0
- */
- public JavaModelListener(int eventsToListen) {
- JavaCore.addElementChangedListener(this, eventsToListen);
- }
-
- /*
- * (non-Javadoc)
- *
- * @see org.eclipse.jdt.core.IElementChangedListener#elementChanged(org.eclipse.jdt.core.ElementChangedEvent)
- */
- public void elementChanged(ElementChangedEvent event) {
-
- processDelta((IJavaElementDelta) event.getSource());
-
- }
-
- /**
- * Generally dispatch the children of the delta. Normally this method should not be overridden.
- *
- * @param element
- * @param delta
- *
- * @since 1.2.0
- */
- protected void processChildren(IJavaElement element, IJavaElementDelta delta) {
- IJavaElementDelta[] children = delta.getAffectedChildren();
- for (int i = 0; i < children.length; i++) {
- processDelta(children[i]);
- }
- }
-
- /**
- * Source content has changed. The default is to do nothing. Subclasses may override to perform own functions.
- *
- * @param delta
- *
- * @since 1.2.0
- */
- protected void processContentChanged(IJavaElementDelta delta) {
- }
-
- /**
- * Dispatch the java element delta. This method should normally not be overridden. One
- * usage would be to add delta types that are to be processed and dispatched by the
- * subclasses. For example also dispatch on {@link IJavaElement#IMPORT_CONTAINER}. Subclasses
- * should call <code>super.processDelta(IJavaElementDelta)</code> if it is not one they
- * are interested in.
- *
- * @param delta
- *
- * @since 1.2.0
- */
- public void processDelta(IJavaElementDelta delta) {
- IJavaElement element = delta.getElement();
- // if the class path has changed we refresh the resolved container cache
- int flags= delta.getFlags();
- if (((flags & IJavaElementDelta.F_RESOLVED_CLASSPATH_CHANGED) != 0) && !resolvedContainers.isEmpty()){
- resolvedContainers.clear();
- }
-
- switch (element.getElementType()) {
- case IJavaElement.JAVA_MODEL:
- processJavaElementChanged((IJavaModel) element, delta);
- break;
- case IJavaElement.JAVA_PROJECT:
- processJavaElementChanged((IJavaProject) element, delta);
- break;
- case IJavaElement.PACKAGE_FRAGMENT_ROOT:
- processJavaElementChanged((IPackageFragmentRoot) element, delta);
- break;
- case IJavaElement.PACKAGE_FRAGMENT:
- processJavaElementChanged((IPackageFragment) element, delta);
- break;
- case IJavaElement.COMPILATION_UNIT:
- processJavaElementChanged((ICompilationUnit) element, delta);
- processContentChanged(delta);
- break;
- case IJavaElement.CLASS_FILE:
- processJavaElementChanged((IClassFile) element, delta);
- break;
- case IJavaElement.TYPE:
- processJavaElementChanged((IType) element, delta);
- break;
- // Note: if we are to update the Method/Field adapters, we should process the
- // IJavaElement.METHOD and IJavaElement.FIELD
- }
- }
-
- /**
- * Process the classfile changed event. The default is to do nothing. It will not walk any children of the delta either. Subclasses may override
- * to perform their own functions.
- *
- * @param element
- * @param delta
- *
- * @since 1.2.0
- */
- protected void processJavaElementChanged(IClassFile element, IJavaElementDelta delta) {
- }
-
- /**
- * Process the compilation unit changed event. The default is to process the children of the delta. Subclasses may override to perform their own
- * functions. If they wish to walk the children they should then also call
- * <code>super.processJavaElementChanged(ICompilationUnit, IJavaElementDelta)</code>.
- *
- * @param element
- * @param delta
- *
- * @since 1.2.0
- */
- protected void processJavaElementChanged(ICompilationUnit element, IJavaElementDelta delta) {
- processChildren(element, delta);
- }
-
- /**
- * Process the java model changed event. The default is to process the children of the delta. Subclasses may override to perform their own
- * functions. If they wish to walk the children they should then also call
- * <code>super.processJavaElementChanged(IJavaModel, IJavaElementDelta)</code>.
- *
- * @param element
- * @param delta
- *
- * @since 1.2.0
- */
- protected void processJavaElementChanged(IJavaModel element, IJavaElementDelta delta) {
- processChildren(element, delta);
- }
-
- /**
- * Process the java project changed event. The default is to process the children of the delta. Subclasses may override to perform their own
- * functions. If they wish to walk the children they should then also call
- * <code>super.processJavaElementChanged(IJavaProject, IJavaElementDelta)</code>.
- *
- * @param element
- * @param delta
- *
- * @since 1.2.0
- */
- protected void processJavaElementChanged(IJavaProject element, IJavaElementDelta delta) {
- processChildren(element, delta);
- }
-
- /**
- * Process the package fragment changed event. The default is to process the children of the delta. Subclasses may override to perform their own
- * functions. If they wish to walk the children they should then also call
- * <code>super.processJavaElementChanged(IPackageFragment, IJavaElementDelta)</code>.
- *
- * @param element
- * @param delta
- *
- * @since 1.2.0
- */
- protected void processJavaElementChanged(IPackageFragment element, IJavaElementDelta delta) {
- processChildren(element, delta);
- }
-
- /**
- * Process the package fragment root changed event. The default is to process the children of the delta. Subclasses may override to perform their
- * own functions. If they wish to walk the children they should then also call
- * <code>super.processJavaElementChanged(IPackageFragmentRoot, IJavaElementDelta)</code>.
- *
- * @param element
- * @param delta
- *
- * @since 1.2.0
- */
- protected void processJavaElementChanged(IPackageFragmentRoot element, IJavaElementDelta delta) {
- processChildren(element, delta);
- }
-
- /**
- * Process the IType changed event. The default is to do nothing. It will not walk any children of the delta either. Subclasses may override to
- * perform their own functions.
- *
- * @param element
- * @param delta
- *
- * @since 1.2.0
- */
- protected void processJavaElementChanged(IType element, IJavaElementDelta delta) {
- }
-
- /**
- * Answers whether this element delta is a classpath change. I.e. something added/removed/moved around for the classpath. This should only be
- * called for a delta that is for an {@link IPackageFragmentRoot}. Should be called from an override of
- * {@link #processJavaElementChanged(IPackageFragmentRoot, IJavaElementDelta)}
- *
- * @param delta
- * @return <code>true</code> if it is classpath change or <code>false</code> if not.
- *
- * @since 1.2.0
- */
- protected boolean isClassPathChange(IJavaElementDelta delta) {
- int flags = delta.getFlags();
- return (delta.getKind() == IJavaElementDelta.CHANGED && ((flags & IJavaElementDelta.F_ADDED_TO_CLASSPATH) != 0)
- || ((flags & IJavaElementDelta.F_REMOVED_FROM_CLASSPATH) != 0) || ((flags & IJavaElementDelta.F_REORDER) != 0));
- }
-
- /**
- * Answer whether the change is this is a raw classpath change, or if a file that is in the root of the project was changed that also can mean a
- * raw classpath change. This must only be called for a delta that is for an {@link IJavaProject}.
- * <p>
- * See {@link IJavaElementDelta.#F_CLASSPATH_CHANGED} and {@link #isAlsoClasspathChange(IPath)} for details.
- *
- * @param delta
- * @return
- *
- * @since 1.2.0
- */
- protected boolean isClasspathResourceChange(IJavaElementDelta delta) {
- if ((delta.getFlags() & IJavaElementDelta.F_CLASSPATH_CHANGED) != 0)
- return true;
- IResourceDelta[] resources = delta.getResourceDeltas();
- if (resources == null)
- return false;
- IPath path = null;
- for (int i = 0; i < resources.length; i++) {
- if (resources[i].getKind() == IResourceDelta.CHANGED) {
- path = resources[i].getProjectRelativePath();
- if (isAlsoClasspathChange(path))
- return true;
- }
- }
- return false;
- }
-
- /**
- * Answers whether the file specified by the path is one that when changed can result in a classpath change. This is called from
- * {@link #isClasspathResourceChange(IJavaElementDelta)}. The file must be in the root of the project. The default is <code>false</code>.
- * Subclasses may override.
- *
- * @param path
- * @return <code>true</code> if this file being changed would result in a classpath change, <code>false</code> if not.
- *
- * @since 1.2.0
- */
- protected boolean isAlsoClasspathChange(IPath path) {
- return false;
- }
-
- /**
- * Answers whether the given java project is in the classpath (including recursive). This currently will not walk through containers (such as the
- * PDE container). Only through the direct and recursive project references. The java project is determined by subclasses, see
- * {@link #getJavaProject()}.
- *
- * @param javaProject
- * @return <code>true</code> if project is in classpath or <code>false</code> if not.
- *
- * @since 1.2.0
- */
- protected boolean isInClasspath(IJavaProject javaProject) {
- IJavaProject listenerJavaProject = getJavaProject();
- if (javaProject.equals(listenerJavaProject))
- return true;
- return isInClasspath(javaProject, listenerJavaProject, true, new HashSet());
- }
-
- /**
- * The java project for this listener. Subclasses must provide a java project.
- *
- * @return the java project. <code>null</code> is not valid.
- *
- * @since 1.2.0
- */
- protected abstract IJavaProject getJavaProject();
-
- /*
- * test to see if the testProject is in the classpath (including from any referenced projects) of the target project. Keep track of those already
- * visited so as not to visit again. Too late to make private. But it should not be overridden.
- */
- protected boolean isInClasspath(IJavaProject testProject, IJavaProject targetProject, boolean isFirstLevel, Set visited) {
- if (visited.contains(targetProject))
- return false;
- visited.add(targetProject);
- IClasspathEntry[] entries = null;
- try {
- entries = targetProject.getRawClasspath();
- } catch (JavaModelException e) {
- return false;
- }
- List projects = null;
- for (int i = 0; i < entries.length; i++) {
- IClasspathEntry entry;
- entry = entries[i];
- switch (entry.getEntryKind()) {
- case IClasspathEntry.CPE_PROJECT:
- IJavaProject entryProject = getVisibleJavaProject(entry, isFirstLevel);
- if (entryProject != null) {
- if (entryProject.equals(testProject)) {
- return true;
- } else {
- if (projects == null) {
- projects = new ArrayList();
- }
- projects.add(entryProject);
- }
- }
- break;
- //A container may contain references to projects.
- case IClasspathEntry.CPE_CONTAINER :
- IClasspathContainer container = null;
- try {
- container = JavaCore.getClasspathContainer(entry.getPath(), targetProject);
- } catch (JavaModelException e) {
- JEMPlugin.getPlugin().getLogger().logError(e);
- }
- if (container == null || container.getKind() != IClasspathContainer.K_APPLICATION)
- break;
- //First see if we already resolved
- IClasspathEntry[] containerEntries = null;
- containerEntries = (IClasspathEntry[])resolvedContainers.get(container);
- if (containerEntries == null) {
- containerEntries = container.getClasspathEntries();
- resolvedContainers.put(container, containerEntries);
- }
- for (int j = 0; j < containerEntries.length; j++) {
- if (containerEntries[j].getEntryKind() == IClasspathEntry.CPE_PROJECT) {
- IJavaProject conEntryProject = getVisibleJavaProject(containerEntries[j], isFirstLevel);
- if (conEntryProject != null) {
- if (conEntryProject.equals(testProject)) {
- return true;
- } else {
- if (projects == null) {
- projects = new ArrayList();
- }
- projects.add(conEntryProject);
- }
- }
- }
- }
- break;
- }
- }
- return isInClasspath(testProject, projects, false, visited);
- }
-
- /*
- * This method is used to return an IJavaProject that is resolved from the entry
- * if it is currently visible to downstream projects.
- */
- private IJavaProject getVisibleJavaProject(IClasspathEntry entry, boolean isFirstLevel) {
- if (isFirstLevel || entry.isExported()) {
- IClasspathEntry resEntry = JavaCore.getResolvedClasspathEntry(entry);
- return getJavaProject(resEntry);
- }
- return null;
- }
-
- /*
- * See if the testProject is in the classpath of any of the list of projects or in any project that an entry in the list may of visited. Too late
- * to make private. But it should not be overridden.
- */
- protected boolean isInClasspath(IJavaProject testProject, List someJavaProjects, boolean isFirstLevel, Set visited) {
- if (someJavaProjects == null)
- return false;
- int size = someJavaProjects.size();
- IJavaProject javaProj = null;
- for (int i = 0; i < size; i++) {
- javaProj = (IJavaProject) someJavaProjects.get(i);
- return isInClasspath(testProject, javaProj, isFirstLevel, visited);
- }
- return false;
- }
-
- /**
- * Get the java project that classpath entry is for. This should only be called on classpath entries of type {@link IClasspathEntry#CPE_PROJECT}
- *
- * @param entry
- * classpath entry of type {@link IClasspathEntry#CPE_PROJECT}.
- * @return the java project for this entry. The project might not actually exist. That is not verified.
- *
- * @since 1.2.0
- */
- protected IJavaProject getJavaProject(IClasspathEntry entry) {
- IProject proj = getWorkspaceRoot().getProject(entry.getPath().segment(0));
- if (proj != null)
- return JavaCore.create(proj);
- return null;
- }
-
- /**
- * Get the workspace root. A utility method.
- * @return the workspace root.
- *
- * @since 1.2.0
- */
- protected IWorkspaceRoot getWorkspaceRoot() {
- return ResourcesPlugin.getWorkspace().getRoot();
- }
-}
diff --git a/plugins/org.eclipse.jem.workbench/workbench/org/eclipse/jem/workbench/utility/JemProjectUtilities.java b/plugins/org.eclipse.jem.workbench/workbench/org/eclipse/jem/workbench/utility/JemProjectUtilities.java
deleted file mode 100644
index 76c910d..0000000
--- a/plugins/org.eclipse.jem.workbench/workbench/org/eclipse/jem/workbench/utility/JemProjectUtilities.java
+++ /dev/null
@@ -1,750 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2001, 2005 IBM Corporation and others.
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
- *
- * Contributors:
- * IBM Corporation - initial API and implementation
- *******************************************************************************/
-package org.eclipse.jem.workbench.utility;
-/*
- * $RCSfile: JemProjectUtilities.java,v $ $Revision: 1.14 $ $Date: 2009/10/22 15:45:58 $
- */
-
-import java.net.URL;
-import java.util.*;
-
-import org.eclipse.core.resources.*;
-import org.eclipse.core.runtime.*;
-import org.eclipse.jdt.core.*;
-
-import org.eclipse.jem.internal.plugin.JavaEMFNature;
-import org.eclipse.jem.java.JavaClass;
-import org.eclipse.jem.java.JavaRefFactory;
-import org.eclipse.jem.util.emf.workbench.ProjectUtilities;
-import org.eclipse.jem.util.emf.workbench.WorkbenchResourceHelperBase;
-import org.eclipse.jem.util.emf.workbench.nature.EMFNature;
-import org.eclipse.jem.util.plugin.JEMUtilPlugin;
-
-/**
- * Project Utilities for JEM and Java.
- *
- * @since 1.1.0
- */
-public class JemProjectUtilities extends ProjectUtilities {
-
- private JemProjectUtilities(){
- }
-
- /**
- * The nature id for JEM Nature.
- *
- * @since 1.1.0
- */
- public static final String JEM_EMF_NatureID = IJavaEMFNature.NATURE_ID;
-
- /**
- * Get the EMF nature for JEM for the project.
- * @param project
- * @param addNature <code>true</code> if add the nature to the project if not set. <code>false</code> if don't add nature if not already on project.
- * @return the EMFNature or <code>null</code> if not found and addNature was <code>false</code> or it was not a java project.
- * @throws CoreException
- *
- * @since 1.1.0
- */
- public static EMFNature getJEM_EMF_Nature(IProject project, boolean addNature) throws CoreException {
- return addNature ? JavaEMFNature.createRuntime(project) : JavaEMFNature.getRuntime(project);
- }
-
- /**
- * Get the JavaClass from an IFile.
- * @param aFile
- * @return
- *
- * @since 1.1.0
- */
- public static JavaClass getJavaClass(IFile aFile) {
- if (aFile == null)
- return null;
- IProject project = aFile.getProject();
- List folders = getSourceContainers(project);
- folders.addAll(getLibraryContainers(project));
- IContainer folder = null;
- IPath folderPath, filePath, javaPath;
- filePath = aFile.getProjectRelativePath();
- if (folders != null) {
- for (int i = 0; i < folders.size(); i++) {
- folder = (IContainer) folders.get(i);
- folderPath = folder.getProjectRelativePath();
- int segments = filePath.matchingFirstSegments(folderPath);
- if (segments > 0) {
- javaPath = filePath.removeFirstSegments(segments);
- javaPath = javaPath.removeFileExtension();
- String qualifiedName = javaPath.toString().replace('/', '.');
- return (JavaClass) JavaRefFactory.eINSTANCE.reflectType(qualifiedName, WorkbenchResourceHelperBase.getResourceSet(project));
- }
- }
- }
- return null;
- }
-
- /**
- * Get source containers for the project.
- *
- * @param p
- * project
- * @return list of source containers.
- *
- * @since 1.0.0
- */
- public static List getSourceContainers(IProject p) {
- try {
- List sourceContainers = new ArrayList();
- List sourcePaths = getSourcePaths(p);
- if (sourcePaths != null && !sourcePaths.isEmpty()) {
- for (int i = 0; i < sourcePaths.size(); i++) {
- IPath path = (IPath) sourcePaths.get(i);
- if (path.isEmpty())
- sourceContainers.add(p);
- else
- sourceContainers.add(p.getFolder(path));
- }
- }
- return sourceContainers;
- } catch (IllegalArgumentException ex) {
- return Collections.EMPTY_LIST;
- }
- }
-
- protected static List getSourcePaths(IProject p) {
- IJavaProject javaProj = getJavaProject(p);
- if (javaProj == null)
- return null;
- IClasspathEntry[] cp = null;
- try {
- cp = javaProj.getRawClasspath();
- } catch (JavaModelException ex) {
- JEMUtilPlugin.getLogger().logError(ex);
- return null;
- }
- List sourcePaths = new ArrayList();
- for (int i = 0; i < cp.length; i++) {
- if (cp[i].getEntryKind() == IClasspathEntry.CPE_SOURCE) {
- sourcePaths.add(cp[i].getPath().removeFirstSegments(1));
- }
- }
- return sourcePaths;
- }
-
- /**
- * Return list of IContainers that are Libraries in the classpath.
- *
- * @param p
- * project
- * @return list of library IContainers.
- *
- * @since 1.0.0
- */
- public static List getLibraryContainers(IProject p) {
- try {
- List libraryContainers = new ArrayList();
- List libraryPaths = getlibraryPaths(p);
- if (libraryPaths != null && !libraryPaths.isEmpty()) {
- for (int i = 0; i < libraryPaths.size(); i++) {
- IPath path = (IPath) libraryPaths.get(i);
- if (path.isEmpty())
- libraryContainers.add(p);
- else
- libraryContainers.add(p.getFolder(path));
- }
- }
- return libraryContainers;
- } catch (IllegalArgumentException ex) {
- return Collections.EMPTY_LIST;
- }
- }
-
-
- protected static List getlibraryPaths(IProject p) {
- IJavaProject javaProj = getJavaProject(p);
- if (javaProj == null)
- return null;
- IClasspathEntry[] cp = null;
- try {
- cp = javaProj.getRawClasspath();
- } catch (JavaModelException ex) {
- JEMUtilPlugin.getLogger().logError(ex);
- return null;
- }
- List libraryPaths = new ArrayList();
- for (int i = 0; i < cp.length; i++) {
- if (cp[i].getEntryKind() == IClasspathEntry.CPE_LIBRARY) {
- libraryPaths.add(cp[i].getPath().removeFirstSegments(1));
- }
- }
- return libraryPaths;
- }
-
- /**
- * Get the java project nature for the given project.
- *
- * @param p
- * project
- * @return the java project nature for the project or <code>null</code> if not a java project.
- *
- * @since 1.0.0
- */
- public static IJavaProject getJavaProject(IProject p) {
- if (p != null)
- {
- try {
- return (IJavaProject) p.getNature(JavaCore.NATURE_ID);
- } catch (CoreException ignore) {
- return null;
- }
- }
- return null;
- }
-
- /**
- * Touch classpath. It simply takes the classpath and sets it back in.
- *
- * @param javaProject
- * @throws JavaModelException
- *
- * @since 1.0.0
- */
- public static void updateClasspath(IJavaProject javaProject) throws JavaModelException {
- if (javaProject != null)
- javaProject.setRawClasspath(javaProject.getRawClasspath(), new NullProgressMonitor());
- }
-
- /**
- * Return the location of the binary output files for the JavaProject.
- *
- * @param p
- * project
- * @return path to binary output folder or <code>null</code> if not java project or other problem.
- *
- * @since 1.0.0
- */
- public static IPath getJavaProjectOutputLocation(IProject p) {
- try {
- IJavaProject javaProj = getJavaProject(p);
- if (javaProj == null)
- return null;
- if (!javaProj.isOpen())
- javaProj.open(null);
- return javaProj.readOutputLocation();
- } catch (JavaModelException e) {
- return null;
- }
- }
-
- /**
- * Get the project's binary output container.
- *
- * @param p
- * project
- * @return project's output container or <code>null</code> if not java project or some other error.
- *
- * @since 1.0.0
- */
- public static IContainer getJavaProjectOutputContainer(IProject p) {
- IPath path = getJavaProjectOutputLocation(p);
- if (path == null)
- return null;
- if (path.segmentCount() == 1)
- return p;
- return p.getFolder(path.removeFirstSegments(1));
- }
-
- /**
- * Get the binary output absolute (local file system) path.
- *
- * @param p
- * project
- * @return project's output path or <code>null</code> if not java project or some other error.
- *
- * @since 1.0.0
- */
- public static IPath getJavaProjectOutputAbsoluteLocation(IProject p) {
- IContainer container = getJavaProjectOutputContainer(p);
- if (container != null)
- return container.getLocation();
- return null;
- }
-
- /**
- * Get the JDT JavaModel.
- *
- * @return JDT's JavaModel
- *
- * @since 1.0.0
- */
- public static IJavaModel getJavaModel() {
- return JavaCore.create(ResourcesPlugin.getWorkspace().getRoot());
- }
-
- /**
- * Get all source package fragment roots.
- *
- * @param javaProj
- * @return source package fragment roots
- * @throws JavaModelException
- *
- * @since 1.0.0
- */
- public static List getSourcePackageFragmentRoots(IJavaProject javaProj) throws JavaModelException {
- List result = new ArrayList();
- IPackageFragmentRoot[] roots = javaProj.getPackageFragmentRoots();
- for (int i = 0; i < roots.length; i++) {
- IPackageFragmentRoot root = roots[i];
- if (root.getKind() == IPackageFragmentRoot.K_SOURCE)
- result.add(root);
- }
- return result;
- }
-
- /**
- * Remove the resource from the classpath
- *
- * @param p
- * project
- * @param res
- * resource
- * @throws JavaModelException
- *
- * @since 1.0.0
- */
- public static void removeFromJavaClassPath(IProject p, IResource res) throws JavaModelException {
- IClasspathEntry entry = JavaCore.newLibraryEntry(res.getFullPath(), null, null);
- removeFromJavaClassPath(p, entry);
- }
-
- /**
- * Remove the path from the classpath
- *
- * @param p
- * project
- * @param path
- * path to remove
- * @throws JavaModelException
- *
- * @since 1.0.0
- */
- public static void removeFromJavaClassPath(IProject p, IPath path) throws JavaModelException {
- org.eclipse.core.resources.IFile f = p.getFile(path);
- removeFromJavaClassPath(p, f);
- }
-
- /**
- * Remove the classpath entry from the project's classpath.
- *
- * @param p
- * @param entry
- * @throws JavaModelException
- *
- * @since 1.0.0
- */
- public static void removeFromJavaClassPath(IProject p, IClasspathEntry entry) throws JavaModelException {
- IJavaProject javaProject = null;
- try {
- javaProject = (IJavaProject) p.getNature(JavaCore.NATURE_ID);
- } catch (CoreException ignore) {
- }
- if (javaProject != null) {
- IClasspathEntry[] classpath = javaProject.getRawClasspath();
- javaProject.setRawClasspath(primRemoveFromJavaClassPath(classpath, entry), new NullProgressMonitor());
- }
- }
-
- /**
- * Remove the list of entries from the classpath of the project.
- *
- * @param p
- * project
- * @param entries
- * list of IClassPathEntry's
- * @throws JavaModelException
- *
- * @since 1.0.0
- */
- public static void removeFromJavaClassPath(IProject p, List entries) throws JavaModelException {
- IJavaProject javaProject = null;
- try {
- javaProject = (IJavaProject) p.getNature(JavaCore.NATURE_ID);
- } catch (CoreException ignore) {
- }
- if (javaProject != null) {
- IClasspathEntry[] classpath = javaProject.getRawClasspath();
- javaProject.setRawClasspath(primRemoveFromJavaClassPath(classpath, entries), new NullProgressMonitor());
- }
- }
-
- protected static IClasspathEntry[] primRemoveFromJavaClassPath(IClasspathEntry[] classpath, IClasspathEntry entry) throws JavaModelException {
- List result = new ArrayList();
- boolean didRemove = false;
- for (int i = 0; i < classpath.length; i++) {
- IClasspathEntry cpEntry = classpath[i];
- if (!entry.getPath().equals(classpath[i].getPath()))
- result.add(cpEntry);
- else
- didRemove = true;
- }
- if (!didRemove)
- return classpath;
- return (IClasspathEntry[]) result.toArray(new IClasspathEntry[result.size()]);
- }
-
- protected static IClasspathEntry[] primRemoveFromJavaClassPath(IClasspathEntry[] classpath, List entries) throws JavaModelException {
- List arrayList = Arrays.asList(classpath);
- List removeable = new ArrayList(arrayList);
- IClasspathEntry entry;
- boolean didRemove = false;
- int size = entries.size();
- for (int i = 0; i < size; i++) {
- entry = (IClasspathEntry) entries.get(i);
- for (int j = 0; j < classpath.length; j++) {
- IClasspathEntry cpEntry = classpath[j];
- if (entry.getPath().equals(classpath[j].getPath())) {
- if (removeable.remove(cpEntry))
- didRemove = true;
- }
- }
- }
- if (!didRemove)
- return classpath;
- return (IClasspathEntry[]) removeable.toArray(new IClasspathEntry[removeable.size()]);
- }
-
- /**
- * Get the classpath as an array or URL's.
- *
- * @param javaProject
- * @return array of URL's or <code>null</code> if javaProject was <code>null</code>.
- *
- * @since 1.0.0
- */
- public static URL[] getClasspathAsURLArray(IJavaProject javaProject) {
- if (javaProject == null)
- return null;
- Set visited = new HashSet();
- List urls = new ArrayList(20);
- collectClasspathURLs(javaProject, urls, visited, true);
- URL[] result = new URL[urls.size()];
- urls.toArray(result);
- return result;
- }
-
- private static void collectClasspathURLs(IJavaProject javaProject, List urls, Set visited, boolean isFirstProject) {
- if (visited.contains(javaProject))
- return;
- visited.add(javaProject);
- IPath outPath = getJavaProjectOutputAbsoluteLocation(javaProject.getProject());
- outPath = outPath.addTrailingSeparator();
- URL out = ProjectUtilities.createFileURL(outPath);
- urls.add(out);
- IClasspathEntry[] entries = null;
- try {
- entries = javaProject.getResolvedClasspath(true);
- } catch (JavaModelException e) {
- return;
- }
- IClasspathEntry entry;
- for (int i = 0; i < entries.length; i++) {
- entry = entries[i];
- switch (entry.getEntryKind()) {
- case IClasspathEntry.CPE_LIBRARY:
- case IClasspathEntry.CPE_CONTAINER:
- case IClasspathEntry.CPE_VARIABLE:
- collectClasspathEntryURL(entry, urls);
- break;
- case IClasspathEntry.CPE_PROJECT: {
- if (isFirstProject || entry.isExported())
- collectClasspathURLs(getJavaProject(entry), urls, visited, false);
- break;
- }
- }
- }
- }
-
- private static void collectClasspathEntryURL(IClasspathEntry entry, List urls) {
- IPath path = entry.getPath();
- if (null == path.getDevice()) {
- // workspace resource - is the IPath a file, folder, or a class folder whose location is the project root?
- if(path.segmentCount() == 1) {
- // It's a class folder whose location is the project root
- path = ResourcesPlugin.getWorkspace().getRoot().getProject(path.lastSegment()).getLocation();
- }
- else {
- // It's a file or folder - capture it's absolute location
- IFile jarFile = ResourcesPlugin.getWorkspace().getRoot().getFile(path);
- if(jarFile.exists()){
- path = jarFile.getLocation();
- }
- }
- }
-
- URL url = ProjectUtilities.createFileURL(path);
- if (url != null)
- urls.add(url);
- }
-
-
- private static IJavaProject getJavaProject(IClasspathEntry entry) {
- IProject proj = ResourcesPlugin.getWorkspace().getRoot().getProject(entry.getPath().segment(0));
- if (proj != null)
- return getJavaProject(proj);
- return null;
- }
-
- /**
- * Is this project a binary project.
- * <p>
- * Typically a Java project is considered binary if it does not have a source entry in the classpath.
- *
- * @param project
- * Project to test
- * @return <code>true</code> if project is a binary project.
- */
- public static boolean isBinaryProject(IProject aProject) {
-
- IJavaProject javaProj = getJavaProject(aProject);
- if (javaProj == null)
- return false;
- IClasspathEntry[] entries = null;
- entries = javaProj.readRawClasspath();
- for (int i = 0; i < entries.length; i++) {
- IClasspathEntry entry = entries[i];
- if (entry.getEntryKind() == IClasspathEntry.CPE_SOURCE)
- return false;
- }
- return true;
- }
-
- /**
- * Append to java class path.
- * <p>
- * Append a list of IClasspathEntry's to the build path of the passed project. Updated to remove existing occurrences of the passed entries before
- * appending.
- * </p>
- *
- * @param p
- * project
- * @param appendClasspathEntries
- * list of entries
- * @throws JavaModelException
- *
- * @since 1.0.0
- */
- public static void appendJavaClassPath(IProject p, List appendClasspathEntries) throws JavaModelException {
- IJavaProject javaProject = null;
- try {
- javaProject = (IJavaProject) p.getNature(JavaCore.NATURE_ID);
- } catch (CoreException ignore) {
- }
- if (javaProject != null) {
- IClasspathEntry[] classpath = javaProject.getRawClasspath();
- List newPathList = new ArrayList(classpath.length);
- for (int i = 0; i < classpath.length; i++) {
- IClasspathEntry entry = classpath[i];
- // Skip entries which are in the append list
- if (appendClasspathEntries.indexOf(entry) < 0)
- newPathList.add(entry);
- }
- newPathList.addAll(appendClasspathEntries);
- IClasspathEntry[] newClasspath = (IClasspathEntry[]) newPathList.toArray(new IClasspathEntry[newPathList.size()]);
- javaProject.setRawClasspath(newClasspath, new NullProgressMonitor());
- }
- }
-
- /**
- * Append classpath entry.
- * <p>
- * Append one IClasspathEntry to the build path of the passed project. If a classpath entry having the same path as the parameter already exists,
- * then does nothing.
- * </p>
- *
- * @param p
- * Project
- * @param newEntry
- * Entry
- * @throws JavaModelException
- *
- * @since 1.0.0
- */
- public static void appendJavaClassPath(IProject p, IClasspathEntry newEntry) throws JavaModelException {
- IJavaProject javaProject = getJavaProject(p);
- if (javaProject == null)
- return;
- IClasspathEntry[] classpath = javaProject.getRawClasspath();
- List newPathList = new ArrayList(classpath.length);
- for (int i = 0; i < classpath.length; i++) {
- IClasspathEntry entry = classpath[i];
- // fix dup class path entry for .JETEmitter project
- // Skip the entry to be added if it already exists
- if (Platform.getOS().equals(Platform.OS_WIN32)) {
- if (!entry.getPath().toString().equalsIgnoreCase(newEntry.getPath().toString()))
- newPathList.add(entry);
- else
- return;
- } else {
- if (!entry.getPath().equals(newEntry.getPath()))
- newPathList.add(entry);
- else
- return;
- }
- }
- newPathList.add(newEntry);
- IClasspathEntry[] newClasspath = (IClasspathEntry[]) newPathList.toArray(new IClasspathEntry[newPathList.size()]);
- javaProject.setRawClasspath(newClasspath, new NullProgressMonitor());
- }
-
- /**
- * Return the source path matching the parameter; if the parameter is null, or if the source folder is not on the classpath, return the first
- * source path on the classpath
- *
- * @param p
- * project
- * @param defaultSourceName
- * source folder to find if on classpath, or if <code>null</code> the first folder
- * @return path searched for or <code>null</code> if not java project or some other problem.
- *
- * @since 1.0.0
- */
- public static IPath getSourcePathOrFirst(IProject p, String defaultSourceName) {
- IJavaProject javaProj = getJavaProject(p);
- if (javaProj == null)
- return null;
- IClasspathEntry[] cp = null;
- try {
- cp = javaProj.getRawClasspath();
- } catch (JavaModelException ex) {
- JEMUtilPlugin.getLogger().logError(ex);
- return null;
- }
- IClasspathEntry firstSource = null;
- IPath defaultSourcePath = null;
- if (defaultSourceName != null)
- defaultSourcePath = ProjectUtilities.createPath(p, defaultSourceName);
- for (int i = 0; i < cp.length; i++) {
- if (cp[i].getEntryKind() == IClasspathEntry.CPE_SOURCE) {
- if (firstSource == null) {
- firstSource = cp[i];
- if (defaultSourcePath == null)
- break;
- }
- if (cp[i].getPath().equals(defaultSourcePath))
- return defaultSourcePath.removeFirstSegments(1);
- }
- }
- if (firstSource == null)
- return null;
- if (firstSource.getPath().segment(0).equals(p.getName()))
- return firstSource.getPath().removeFirstSegments(1);
- return null;
- }
-
- /**
- * Hack to force a reload of the .classpath file
- *
- * @param project
- * project to reload
- * @since 1.0.0
- */
- public static void forceClasspathReload(IProject project) throws JavaModelException {
- IJavaProject javaProj = getJavaProject(project);
- if (javaProj != null) {
- IClasspathEntry[] entries = javaProj.readRawClasspath();
- if (entries != null) {
- IPath output = javaProj.readOutputLocation();
- if (output != null)
- javaProj.setRawClasspath(entries, output, null);
- }
- }
- }
-
- /**
- * Get the paths of all of the local jars in the classpath for the project. It does not recurse into referenced projects.
- *
- * @param proj
- * project to search (should be a java project).
- * @return A list of IPath, where each entry is a project relative path to a JAR contained in the project.
- */
- public static List getLocalJARPathsFromClasspath(IProject proj) {
- IJavaProject javaProj = getJavaProject(proj);
- if (javaProj == null)
- return null;
- IPath projectPath = proj.getFullPath();
- List result = new ArrayList();
- IClasspathEntry[] entries = javaProj.readRawClasspath();
- for (int i = 0; i < entries.length; i++) {
- IClasspathEntry entry = entries[i];
- if (entry.getEntryKind() == IClasspathEntry.CPE_LIBRARY) {
- IPath path = entry.getPath();
- int segments = path.matchingFirstSegments(projectPath);
- if (segments > 0)
- result.add(path.removeFirstSegments(segments));
- }
- }
- return result;
- }
-
-
- /**
- * Return the source folder matching the parameter; if the parameter is null, or if the source folder is not on the classpath, return the first
- * source folder on the classpath
- *
- * @param p
- * project
- * @param defaultSourceName
- * source folder to find if on classpath, or if <code>null</code> the first folder
- * @return container searched for or <code>null</code> if not java project or some other problem.
- *
- * @since 1.0.0
- */
- public static IContainer getSourceFolderOrFirst(IProject p, String defaultSourceName) {
- try {
- IPath sourcePath = getSourcePathOrFirst(p, defaultSourceName);
- if (sourcePath == null)
- return null;
- else if (sourcePath.isEmpty())
- return p;
- else
- return p.getFolder(sourcePath);
- } catch (IllegalArgumentException ex) {
- return null;
- }
- }
-
- /**
- * Returns a list of IFolder that represents each source folder in a java project
- *
- * @deprecated Use {@link #getSourceContainers(IProject)}because the project itself might be a source container
- *
- * @param p
- * project
- * @return
- *
- * @since 1.0.0
- */
- public static List getSourceFolders(IProject p) {
- try {
- List sourceFolders = new ArrayList();
- List sourcePaths = getSourcePaths(p);
- if (sourcePaths != null && !sourcePaths.isEmpty()) {
- for (int i = 0; i < sourcePaths.size(); i++) {
- IPath path = (IPath) sourcePaths.get(i);
- if (!path.isEmpty())
- sourceFolders.add(p.getFolder(path));
- }
- }
- return sourceFolders;
- } catch (IllegalArgumentException ex) {
- return Collections.EMPTY_LIST;
- }
- }
-}
diff --git a/plugins/org.eclipse.jem.workbench/workbench/org/eclipse/jem/workbench/utility/NoASTResolver.java b/plugins/org.eclipse.jem.workbench/workbench/org/eclipse/jem/workbench/utility/NoASTResolver.java
deleted file mode 100644
index 3628523..0000000
--- a/plugins/org.eclipse.jem.workbench/workbench/org/eclipse/jem/workbench/utility/NoASTResolver.java
+++ /dev/null
@@ -1,51 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2004, 2005 IBM Corporation and others.
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
- *
- * Contributors:
- * IBM Corporation - initial API and implementation
- *******************************************************************************/
-/*
-
-
- */
-package org.eclipse.jem.workbench.utility;
-
-import org.eclipse.jdt.core.dom.Name;
-import org.eclipse.jdt.core.dom.Type;
-
-import org.eclipse.jem.internal.instantiation.InstantiationFactory;
-import org.eclipse.jem.internal.instantiation.PTExpression;
-import org.eclipse.jem.workbench.utility.ParseTreeCreationFromAST.InvalidExpressionException;
-
-
-/**
- * This is used for AST Resolution, but it simply turns Name into PTName. Useful when
- * just creating a parse tree where we know the names are ok and just types.
- * @since 1.0.0
- */
-public class NoASTResolver extends ASTBoundResolver {
-
- /* (non-Javadoc)
- * @see org.eclipse.jem.workbench.utility.ParseTreeCreationFromAST.Resolver#resolveName(org.eclipse.jdt.core.dom.Name)
- */
- public PTExpression resolveName(Name name) throws InvalidExpressionException {
- return InstantiationFactory.eINSTANCE.createPTName(name.toString());
- }
-
- /* (non-Javadoc)
- * @see org.eclipse.jem.workbench.utility.ParseTreeCreationFromAST.Resolver#resolveType(org.eclipse.jdt.core.dom.Type)
- */
- public String resolveType(Type type) {
- return type.toString();
- }
- /* (non-Javadoc)
- * @see org.eclipse.jem.workbench.utility.ParseTreeCreationFromAST.Resolver#resolveType(org.eclipse.jdt.core.dom.Name)
- */
- public String resolveType(Name name) throws InvalidExpressionException {
- return name.toString();
- }
-}
diff --git a/plugins/org.eclipse.jem.workbench/workbench/org/eclipse/jem/workbench/utility/ParseTreeCreationFromAST.java b/plugins/org.eclipse.jem.workbench/workbench/org/eclipse/jem/workbench/utility/ParseTreeCreationFromAST.java
deleted file mode 100644
index c7e58a9..0000000
--- a/plugins/org.eclipse.jem.workbench/workbench/org/eclipse/jem/workbench/utility/ParseTreeCreationFromAST.java
+++ /dev/null
@@ -1,587 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2004, 2006 IBM Corporation and others.
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
- *
- * Contributors:
- * IBM Corporation - initial API and implementation
- *******************************************************************************/
-/*
-
-
- */
-package org.eclipse.jem.workbench.utility;
-
-import java.text.MessageFormat;
-import java.util.HashMap;
-import java.util.List;
-
-import org.eclipse.jdt.core.dom.*;
-
-import org.eclipse.jem.internal.instantiation.*;
-
-/**
- * Create a parse tree from an AST node.
- * @since 1.0.0
- */
-public class ParseTreeCreationFromAST extends ASTVisitor {
- protected final Resolver resolver;
- protected PTExpression expression; // Each visit (or endvisit) will put into expression the result of the visit if it produced an expression.
-
- /**
- * This is the abstract base class used by ParseTreeCreationFromAST to resolve the types to the appropriate
- * types (e.g. "String" to "java.lang.String").
- *
- * @see org.eclipse.jem.workbench.utility.ParseTreeCreationFromAST
- * @since 1.0.0
- */
- public static abstract class Resolver {
-
- /**
- * Resolve the Name. It can return either a PTName if it is just a classname,
- * or a PTFieldAccess if it resolves to a PTFieldAccess. The PTFieldAccess should
- * be complete. e.g we have class like:
- * <code>
- * package xyz;
- * public class AClass {
- * public java.awt.Rectangle rect;
- * }
- * </code>
- * Then a Name like <code>AClass.rect.x</code> should resolve to:
- *
- * PTFieldAccess:
- * receiver:
- * PTFieldAccess
- * receiver: xyz.AClass
- * field: "rect"
- * field: "x"
- *
- * Actually it can return any valid expression that has a value (i.e. it cannot be a method invocation with a <code>void</code> return type).
- *
- * @param name
- * @return Either a fully-qualified name (as a PTName) or a PTFieldAccess, any other type of expression.
- *
- * @since 1.0.0
- */
- public abstract PTExpression resolveName(Name name) throws InvalidExpressionException;
-
- /**
- * Resolve the type. If it is an array type return it in format "type[][]".
- *
- * @param type
- * @return The type name, including brackets if array type.
- *
- * @since 1.0.0
- */
- public abstract String resolveType(Type type) throws InvalidExpressionException;
-
- /**
- * This is for resolving "this" literal. It should either return a PTThisLiteral, if it
- * can't do resolve, or some PTExpression that can resolve to "this" for evaluation.
- *
- * @return If resolvable, a PTExpression, else a PTThisLiteral if not resolvable.
- * @throws InvalidExpressionException
- *
- * @since 1.0.0
- */
- public abstract PTExpression resolveThis() throws InvalidExpressionException;
-
- /**
- * Resolve the type specified as a Name. It may be a simple name or it may be
- * a qualified name. This is used when we have Name that we know must be a
- * type. This is so that there is no confusion with it possibly being a field or variable
- * that has the same case and spelling as a type name.
- * @param name
- * @return the type name.
- * @throws InvalidExpressionException
- *
- * @since 1.0.0
- */
- public abstract String resolveType(Name name) throws InvalidExpressionException;
-
- /**
- * This is used by the resolver if it can't resolve for some reason. This will throw
- * an invalid expression exception which will be handled by the ParseTreeCreationFromAST.
- *
- * @param msg Message to be put into the exception.
- * @throws InvalidExpressionException
- *
- * @since 1.0.0
- */
- protected final void throwInvalidExpressionException(String msg) throws InvalidExpressionException {
- throw new InvalidExpressionException(msg);
- }
- }
-
- /*
- * When an invalid expression has been found this exception should be thrown. It will
- * be caught at the top and converted into an InvalidExpression and the rest of the parse tree will be
- * thrown away.
- *
- * The message will be a message as to why it is invalid.
- *
- * @since 1.0.0
- */
- protected static class InvalidExpressionException extends IllegalArgumentException {
-
- /**
- * Comment for <code>serialVersionUID</code>
- *
- * @since 1.1.0
- */
- private static final long serialVersionUID = 2429845631915206678L;
-
- /**
- * @param s The message to be used in the final invalid expression.
- *
- * @since 1.0.0
- */
- public InvalidExpressionException(String s) {
- super(s);
- }
- }
-
- /**
- * Construct with the given resolver.
- *
- * @param resolver
- *
- * @since 1.0.0
- */
- public ParseTreeCreationFromAST(Resolver resolver) {
- this.resolver = resolver;
- }
-
- /**
- * Process the AST Expression and return a PTExpression. If any part was invalid, then
- * only an PTInvalidExpression will be returned.
- *
- * @param astExpression
- * @return The PTExpression.
- *
- * @since 1.0.0
- */
- public final PTExpression createExpression(Expression astExpression) {
- try {
- return perform(astExpression);
- } catch (InvalidExpressionException e) {
- // Create a msg that is formed of the exception message and the full init string.
- String msg = MessageFormat.format(WorkbenchUtilityMessages.ParseTreeCreationFromAST_0, new Object[] {e.getLocalizedMessage(), astExpression.toString()});
- PTInvalidExpression exp = InstantiationFactory.eINSTANCE.createPTInvalidExpression();
- exp.setMessage(msg);
- return exp;
- }
- }
-
- /*
- * Visit the AST expression and get the ParseTree Expression.
- * This is used by the individual visits when parsing a tree.
- * It passes to the top method (createExpression), which can
- * handle the InvalidExpressionException.
- *
- * If any visit doesn't return an expression, then an invalid
- * expression exception will be thrown to indicate this. If the
- * incoming expression is <code>null</code>, then return of <code>null</code> is ok because
- * this would be for an optional expression which didn't exist.
- *
- * @return The new ParseTree Expression or <code>null</code> if incoming expression was null.
- *
- * @see createExpression(org.eclipse.jdt.core.dom.Expression)
- * @exception InvalidExpressionException
- * @since 1.0.0
- */
- protected final PTExpression perform(Expression astExpression) {
- if (astExpression != null) {
- expression = null;
- astExpression.accept(this);
- if (expression == null)
- throw new InvalidExpressionException(MessageFormat.format(WorkbenchUtilityMessages.ParseTreeCreationFromAST_ExpressionTooComplicated_EXC_, new Object[] {astExpression.toString()}));
- return expression;
- } else
- return null; // This is ok. It means an optional expression was being processed and the expression didn't exist.
- }
-
- /* (non-Javadoc)
- * @see org.eclipse.jdt.core.dom.ASTVisitor#visit(org.eclipse.jdt.core.dom.ArrayAccess)
- */
- public boolean visit(ArrayAccess node) {
- PTArrayAccess aa = InstantiationFactory.eINSTANCE.createPTArrayAccess();
- List indexes = aa.getIndexes();
- Expression arrayExp = node;
- while (arrayExp.getNodeType() == ASTNode.ARRAY_ACCESS) {
- // Visit the index to get the index expression.
- ArrayAccess array = (ArrayAccess) arrayExp;
- indexes.add(0, perform(array.getIndex())); // We're trying to create the final expression from inside out, the indexes are created in reverse order.
- arrayExp = array.getArray();
- }
- aa.setArray(perform(arrayExp)); // Final arrayExp is the true expression.
- expression = aa; // Set the return expression for this visit.
- return false;
- }
-
- /* (non-Javadoc)
- * @see org.eclipse.jdt.core.dom.ASTVisitor#visit(org.eclipse.jdt.core.dom.ArrayCreation)
- */
- public boolean visit(ArrayCreation node) {
- PTArrayCreation ac = InstantiationFactory.eINSTANCE.createPTArrayCreation();
- ac.setType(resolver.resolveType(node.getType()));
- List acDims = ac.getDimensions();
- List nDims = node.dimensions();
- int nsize = nDims.size();
- for (int i = 0; i < nsize; i++) {
- acDims.add(perform((Expression) nDims.get(i)));
- }
- ac.setInitializer((PTArrayInitializer) perform(node.getInitializer()));
- expression = ac;
- return false;
- }
-
- /* (non-Javadoc)
- * @see org.eclipse.jdt.core.dom.ASTVisitor#visit(org.eclipse.jdt.core.dom.ArrayInitializer)
- */
- public boolean visit(ArrayInitializer node) {
- PTArrayInitializer ai = InstantiationFactory.eINSTANCE.createPTArrayInitializer();
- List exps = node.expressions();
- List aiexps = ai.getExpressions();
- int nexp = exps.size();
- for (int i = 0; i < nexp; i++) {
- aiexps.add(perform((Expression) exps.get(i)));
- }
- expression = ai;
- return false;
- }
-
- /* (non-Javadoc)
- * @see org.eclipse.jdt.core.dom.ASTVisitor#visit(org.eclipse.jdt.core.dom.Assignment)
- */
- public boolean visit(Assignment node) {
- return false; // We can't handle assignment.
- }
-
- /* (non-Javadoc)
- * @see org.eclipse.jdt.core.dom.ASTVisitor#visit(org.eclipse.jdt.core.dom.BooleanLiteral)
- */
- public boolean visit(BooleanLiteral node) {
- PTBooleanLiteral bl = InstantiationFactory.eINSTANCE.createPTBooleanLiteral();
- bl.setBooleanValue(node.booleanValue());
- expression = bl;
- return false;
- }
-
- /* (non-Javadoc)
- * @see org.eclipse.jdt.core.dom.ASTVisitor#visit(org.eclipse.jdt.core.dom.CastExpression)
- */
- public boolean visit(CastExpression node) {
- PTCastExpression ct = InstantiationFactory.eINSTANCE.createPTCastExpression();
- ct.setType(resolver.resolveType(node.getType()));
- ct.setExpression(perform(node.getExpression()));
- expression = ct;
- return false;
- }
-
- /* (non-Javadoc)
- * @see org.eclipse.jdt.core.dom.ASTVisitor#visit(org.eclipse.jdt.core.dom.CharacterLiteral)
- */
- public boolean visit(CharacterLiteral node) {
- PTCharacterLiteral cl = InstantiationFactory.eINSTANCE.createPTCharacterLiteral();
- cl.setEscapedValue(node.getEscapedValue());
- cl.setCharValue(node.charValue());
- expression = cl;
- return false;
- }
-
- /* (non-Javadoc)
- * @see org.eclipse.jdt.core.dom.ASTVisitor#visit(org.eclipse.jdt.core.dom.ClassInstanceCreation)
- */
- public boolean visit(ClassInstanceCreation node) {
- if (node.getAnonymousClassDeclaration() != null) {
- PTAnonymousClassDeclaration adecl = InstantiationFactory.eINSTANCE.createPTAnonymousClassDeclaration();
- adecl.setDeclaration(node.toString());
- expression = adecl;
- } else {
- PTClassInstanceCreation cic = InstantiationFactory.eINSTANCE.createPTClassInstanceCreation();
- // If ast level = 2, then you must use getName, but the name needs to be turned into a type
- // so that it can be resolved. If ast level > 2, then it will return a type to be resolved.
- // Note: can't just use resolve name on the name because if a field and a class were spelled
- // the same then the codegen resolver would return an instance ref to the field instead.
- String type = node.getAST().apiLevel() == AST.JLS2 ? resolver.resolveType(node.getName()) : resolver.resolveType(node.getType());
- if (type == null) {
- type = node.getAST().apiLevel() == AST.JLS2 ? node.getName().getFullyQualifiedName() : node.getType().toString();
- }
- cic.setType(type);
- List args = cic.getArguments();
- List nargs = node.arguments();
- int nsize = nargs.size();
- for (int i = 0; i < nsize; i++) {
- args.add(perform((Expression) nargs.get(i)));
- }
- expression = cic;
- }
- return false;
-
- }
-
- /*
- * (non-Javadoc)
- *
- * @see org.eclipse.jdt.core.dom.ASTVisitor#visit(org.eclipse.jdt.core.dom.ConditionalExpression)
- */
- public boolean visit(ConditionalExpression node) {
- PTConditionalExpression ce = InstantiationFactory.eINSTANCE.createPTConditionalExpression();
- ce.setCondition(perform(node.getExpression()));
- ce.setTrue(perform(node.getThenExpression()));
- ce.setFalse(perform(node.getElseExpression()));
- expression = ce;
- return false;
- }
-
- /* (non-Javadoc)
- * @see org.eclipse.jdt.core.dom.ASTVisitor#visit(org.eclipse.jdt.core.dom.FieldAccess)
- */
- public boolean visit(FieldAccess node) {
- expression = createFieldAccess(node.getName().getIdentifier(), perform(node.getExpression()));
- return false;
- }
-
- protected PTExpression createFieldAccess(String name, PTExpression receiver) {
- PTFieldAccess fa = InstantiationFactory.eINSTANCE.createPTFieldAccess();
- fa.setReceiver(receiver);
- fa.setField(name);
- return fa;
- }
-
- private static HashMap infixOperToParseOper;
- private final PTInfixOperator getParseInfix(InfixExpression.Operator operator) {
- if (prefixOperToParseOper == null) {
- infixOperToParseOper = new HashMap(5);
- infixOperToParseOper.put(InfixExpression.Operator.AND, PTInfixOperator.AND_LITERAL);
- infixOperToParseOper.put(InfixExpression.Operator.CONDITIONAL_AND, PTInfixOperator.CONDITIONAL_AND_LITERAL);
- infixOperToParseOper.put(InfixExpression.Operator.CONDITIONAL_OR, PTInfixOperator.CONDITIONAL_OR_LITERAL);
- infixOperToParseOper.put(InfixExpression.Operator.DIVIDE, PTInfixOperator.DIVIDE_LITERAL);
- infixOperToParseOper.put(InfixExpression.Operator.EQUALS, PTInfixOperator.EQUALS_LITERAL);
- infixOperToParseOper.put(InfixExpression.Operator.GREATER_EQUALS, PTInfixOperator.GREATER_EQUALS_LITERAL);
- infixOperToParseOper.put(InfixExpression.Operator.GREATER, PTInfixOperator.GREATER_LITERAL);
- infixOperToParseOper.put(InfixExpression.Operator.LEFT_SHIFT, PTInfixOperator.LEFT_SHIFT_LITERAL);
- infixOperToParseOper.put(InfixExpression.Operator.LESS_EQUALS, PTInfixOperator.LESS_EQUALS_LITERAL);
- infixOperToParseOper.put(InfixExpression.Operator.LESS, PTInfixOperator.LESS_LITERAL);
- infixOperToParseOper.put(InfixExpression.Operator.MINUS, PTInfixOperator.MINUS_LITERAL);
- infixOperToParseOper.put(InfixExpression.Operator.NOT_EQUALS, PTInfixOperator.NOT_EQUALS_LITERAL);
- infixOperToParseOper.put(InfixExpression.Operator.OR, PTInfixOperator.OR_LITERAL);
- infixOperToParseOper.put(InfixExpression.Operator.PLUS, PTInfixOperator.PLUS_LITERAL);
- infixOperToParseOper.put(InfixExpression.Operator.REMAINDER, PTInfixOperator.REMAINDER_LITERAL);
- infixOperToParseOper.put(InfixExpression.Operator.RIGHT_SHIFT_SIGNED, PTInfixOperator.RIGHT_SHIFT_SIGNED_LITERAL);
- infixOperToParseOper.put(InfixExpression.Operator.RIGHT_SHIFT_UNSIGNED, PTInfixOperator.RIGHT_SHIFT_UNSIGNED_LITERAL);
- infixOperToParseOper.put(InfixExpression.Operator.TIMES, PTInfixOperator.TIMES_LITERAL);
- infixOperToParseOper.put(InfixExpression.Operator.XOR, PTInfixOperator.XOR_LITERAL);
- }
- return (PTInfixOperator) infixOperToParseOper.get(operator);
- }
-
- /* (non-Javadoc)
- * @see org.eclipse.jdt.core.dom.ASTVisitor#visit(org.eclipse.jdt.core.dom.InfixExpression)
- */
- public boolean visit(InfixExpression node) {
- PTInfixExpression inf = InstantiationFactory.eINSTANCE.createPTInfixExpression();
- inf.setLeftOperand(perform(node.getLeftOperand()));
- PTInfixOperator inoper = getParseInfix(node.getOperator());
- if (inoper == null) {
- // It is not one we can handle.
- throw new InvalidExpressionException(
- MessageFormat.format(WorkbenchUtilityMessages.ParseTreeCreationFromAST_OperatorTooComplicatedToHandle_EXC_, new Object[] { node.getOperator().toString() }));
- }
- inf.setOperator(inoper);
- inf.setRightOperand(perform(node.getRightOperand()));
- List eops = inf.getExtendedOperands();
- List neops = node.extendedOperands();
- int nsize = neops.size();
- for (int i = 0; i < nsize; i++) {
- eops.add(perform((Expression) neops.get(i)));
- }
- expression = inf;
- return false;
- }
-
- /* (non-Javadoc)
- * @see org.eclipse.jdt.core.dom.ASTVisitor#visit(org.eclipse.jdt.core.dom.InstanceofExpression)
- */
- public boolean visit(InstanceofExpression node) {
- PTInstanceof inof = InstantiationFactory.eINSTANCE.createPTInstanceof();
- inof.setOperand(perform(node.getLeftOperand()));
- inof.setType(resolver.resolveType(node.getRightOperand()));
- expression = inof;
- return false;
- }
-
- /* (non-Javadoc)
- * @see org.eclipse.jdt.core.dom.ASTVisitor#visit(org.eclipse.jdt.core.dom.PostfixExpression)
- */
- public boolean visit(PostfixExpression node) {
- return false; // We can't handle post fix.
- }
-
- /* (non-Javadoc)
- * @see org.eclipse.jdt.core.dom.ASTVisitor#visit(org.eclipse.jdt.core.dom.MethodInvocation)
- */
- public boolean visit(MethodInvocation node) {
- expression = createMethodInvocation(node.getName().getIdentifier(), perform(node.getExpression()), node.arguments());
- return false;
- }
-
- /**
- * Create a method invocation using the giving receiver, name, args.
- * @param node
- * @return
- *
- * @since 1.2.0
- */
- protected PTMethodInvocation createMethodInvocation(String name, PTExpression receiver, List argExpressions) {
- PTMethodInvocation mi = InstantiationFactory.eINSTANCE.createPTMethodInvocation();
- mi.setReceiver(receiver);
- mi.setName(name);
- List args = mi.getArguments();
- int nsize = argExpressions.size();
- for (int i = 0; i < nsize; i++) {
- args.add(perform((Expression) argExpressions.get(i)));
- }
- return mi;
- }
-
-
-
- /* (non-Javadoc)
- * @see org.eclipse.jdt.core.dom.ASTVisitor#visit(org.eclipse.jdt.core.dom.NullLiteral)
- */
- public boolean visit(NullLiteral node) {
- expression = InstantiationFactory.eINSTANCE.createPTNullLiteral();
- return false;
- }
-
- /* (non-Javadoc)
- * @see org.eclipse.jdt.core.dom.ASTVisitor#visit(org.eclipse.jdt.core.dom.NumberLiteral)
- */
- public boolean visit(NumberLiteral node) {
- PTNumberLiteral nl = InstantiationFactory.eINSTANCE.createPTNumberLiteral();
- nl.setToken(node.getToken());
- expression = nl;
- return false;
- }
-
- /* (non-Javadoc)
- * @see org.eclipse.jdt.core.dom.ASTVisitor#visit(org.eclipse.jdt.core.dom.ParenthesizedExpression)
- */
- public boolean visit(ParenthesizedExpression node) {
- PTParenthesizedExpression pe = InstantiationFactory.eINSTANCE.createPTParenthesizedExpression();
- pe.setExpression(perform(node.getExpression()));
- expression = pe;
- return false;
- }
-
- private static HashMap prefixOperToParseOper;
- private final PTPrefixOperator getParsePrefix(PrefixExpression.Operator operator) {
- if (prefixOperToParseOper == null) {
- prefixOperToParseOper = new HashMap(5);
- prefixOperToParseOper.put(PrefixExpression.Operator.COMPLEMENT, PTPrefixOperator.COMPLEMENT_LITERAL);
- prefixOperToParseOper.put(PrefixExpression.Operator.MINUS, PTPrefixOperator.MINUS_LITERAL);
- prefixOperToParseOper.put(PrefixExpression.Operator.NOT, PTPrefixOperator.NOT_LITERAL);
- prefixOperToParseOper.put(PrefixExpression.Operator.PLUS, PTPrefixOperator.PLUS_LITERAL);
- }
- return (PTPrefixOperator) prefixOperToParseOper.get(operator);
- }
-
- /* (non-Javadoc)
- * @see org.eclipse.jdt.core.dom.ASTVisitor#visit(org.eclipse.jdt.core.dom.PrefixExpression)
- */
- public boolean visit(PrefixExpression node) {
- if (node.getOperand().getNodeType() == ASTNode.NUMBER_LITERAL) {
- // For number literals we see if it is a "+" or "-" prefix, and if it is, we simply
- // create a PTNumberLiteral with the operator already in it. It is a simplification.
- // Any other operator we've left alone since those won't be decoded simply by the
- // Number decoder.
- // If not a number literal, then leave alone since needs to be handled as a prefix
- // operation.
- PrefixExpression.Operator operator = node.getOperator();
- if (operator == PrefixExpression.Operator.PLUS || operator == PrefixExpression.Operator.MINUS) {
- PTNumberLiteral nm = InstantiationFactory.eINSTANCE.createPTNumberLiteral();
- nm.setToken(operator.toString() + ((NumberLiteral) node.getOperand()).getToken());
- expression = nm;
- return false;
- }
- }
-
- PTPrefixExpression pe = InstantiationFactory.eINSTANCE.createPTPrefixExpression();
- PTPrefixOperator ptoper = getParsePrefix(node.getOperator());
- if (ptoper == null) {
- // It is not one we can handle.
- throw new InvalidExpressionException(
- MessageFormat.format(WorkbenchUtilityMessages.ParseTreeCreationFromAST_OperatorTooComplicatedToHandle_EXC_, new Object[] { node.getOperator().toString() }));
- }
- pe.setOperator(ptoper);
- pe.setExpression(perform(node.getOperand()));
- expression = pe;
- return false;
- }
-
- /* (non-Javadoc)
- * @see org.eclipse.jdt.core.dom.ASTVisitor#visit(org.eclipse.jdt.core.dom.QualifiedName)
- */
- public boolean visit(QualifiedName node) {
- expression = resolver.resolveName(node);
- return false;
- }
-
- /* (non-Javadoc)
- * @see org.eclipse.jdt.core.dom.ASTVisitor#visit(org.eclipse.jdt.core.dom.SimpleName)
- */
- public boolean visit(SimpleName node) {
- expression = resolver.resolveName(node);
- return false;
- }
-
- /* (non-Javadoc)
- * @see org.eclipse.jdt.core.dom.ASTVisitor#visit(org.eclipse.jdt.core.dom.StringLiteral)
- */
- public boolean visit(StringLiteral node) {
- PTStringLiteral sl = InstantiationFactory.eINSTANCE.createPTStringLiteral();
- sl.setEscapedValue(node.getEscapedValue());
- sl.setLiteralValue(node.getLiteralValue());
- expression = sl;
- return false;
- }
-
- /* (non-Javadoc)
- * @see org.eclipse.jdt.core.dom.ASTVisitor#visit(org.eclipse.jdt.core.dom.SuperFieldAccess)
- */
- public boolean visit(SuperFieldAccess node) {
- expression = createFieldAccess(node.getName().getIdentifier(), resolver.resolveThis());
- return false;
- }
-
- /* (non-Javadoc)
- * @see org.eclipse.jdt.core.dom.ASTVisitor#visit(org.eclipse.jdt.core.dom.SuperMethodInvocation)
- */
- public boolean visit(SuperMethodInvocation node) {
- expression = createMethodInvocation(node.getName().getIdentifier(), resolver.resolveThis(), node.arguments());
- return false;
- }
-
- /* (non-Javadoc)
- * @see org.eclipse.jdt.core.dom.ASTVisitor#visit(org.eclipse.jdt.core.dom.ThisExpression)
- */
- public boolean visit(ThisExpression node) {
- expression = resolver.resolveThis();
- return false;
- }
-
- /* (non-Javadoc)
- * @see org.eclipse.jdt.core.dom.ASTVisitor#visit(org.eclipse.jdt.core.dom.TypeLiteral)
- */
- public boolean visit(TypeLiteral node) {
- PTTypeLiteral ptl = InstantiationFactory.eINSTANCE.createPTTypeLiteral();
- ptl.setType(resolver.resolveType(node.getType()));
- expression = ptl;
- return false;
- }
-
-}
diff --git a/plugins/org.eclipse.jem.workbench/workbench/org/eclipse/jem/workbench/utility/WorkbenchUtilityMessages.java b/plugins/org.eclipse.jem.workbench/workbench/org/eclipse/jem/workbench/utility/WorkbenchUtilityMessages.java
deleted file mode 100644
index 13f09e2..0000000
--- a/plugins/org.eclipse.jem.workbench/workbench/org/eclipse/jem/workbench/utility/WorkbenchUtilityMessages.java
+++ /dev/null
@@ -1,32 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2000, 2005 IBM Corporation and others.
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
- *
- * Contributors:
- * IBM Corporation - initial API and implementation
- *******************************************************************************/
-package org.eclipse.jem.workbench.utility;
-
-import org.eclipse.osgi.util.NLS;
-
-public final class WorkbenchUtilityMessages extends NLS {
-
- private static final String BUNDLE_NAME = "org.eclipse.jem.workbench.utility.messages";//$NON-NLS-1$
-
- private WorkbenchUtilityMessages() {
- // Do not instantiate
- }
-
- public static String ParseTreeCreationFromAST_0;
- public static String ParseTreeCreationFromAST_ExpressionTooComplicated_EXC_;
- public static String ParseTreeCreationFromAST_OperatorTooComplicatedToHandle_EXC_;
- public static String ASTBoundResolver_CannotHandleLocalField_EXC_;
- public static String ASTBoundResolver_CannotHandleLocalVariable_EXC_;
-
- static {
- NLS.initializeMessages(BUNDLE_NAME, WorkbenchUtilityMessages.class);
- }
-}
\ No newline at end of file
diff --git a/plugins/org.eclipse.jem.workbench/workbench/org/eclipse/jem/workbench/utility/messages.properties b/plugins/org.eclipse.jem.workbench/workbench/org/eclipse/jem/workbench/utility/messages.properties
deleted file mode 100644
index 9917f34..0000000
--- a/plugins/org.eclipse.jem.workbench/workbench/org/eclipse/jem/workbench/utility/messages.properties
+++ /dev/null
@@ -1,15 +0,0 @@
-###############################################################################
-# Copyright (c) 2003, 2005 IBM Corporation and others.
-# All rights reserved. This program and the accompanying materials
-# are made available under the terms of the Eclipse Public License v1.0
-# which accompanies this distribution, and is available at
-# http://www.eclipse.org/legal/epl-v10.html
-#
-# Contributors:
-# IBM Corporation - initial API and implementation
-###############################################################################
-ParseTreeCreationFromAST_0 = {0} - {1}
-ParseTreeCreationFromAST_ExpressionTooComplicated_EXC_ = IWAV0177E Expression "{0}" is too complicated.
-ParseTreeCreationFromAST_OperatorTooComplicatedToHandle_EXC_ = IWAV0179E Operator "{0}" is too complicated to handle.
-ASTBoundResolver_CannotHandleLocalField_EXC_=Cannot handle local field access of "{0}"
-ASTBoundResolver_CannotHandleLocalVariable_EXC_=Cannot handle local variable access of "{0}"
diff --git a/plugins/org.eclipse.jem/.classpath b/plugins/org.eclipse.jem/.classpath
deleted file mode 100644
index 357455b..0000000
--- a/plugins/org.eclipse.jem/.classpath
+++ /dev/null
@@ -1,8 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<classpath>
- <classpathentry kind="src" path="javainst/"/>
- <classpathentry kind="src" path="mofjava/"/>
- <classpathentry kind="con" path="org.eclipse.jdt.launching.JRE_CONTAINER/org.eclipse.jdt.internal.debug.ui.launcher.StandardVMType/J2SE-1.5"/>
- <classpathentry kind="con" path="org.eclipse.pde.core.requiredPlugins"/>
- <classpathentry kind="output" path="bin"/>
-</classpath>
diff --git a/plugins/org.eclipse.jem/.cvsignore b/plugins/org.eclipse.jem/.cvsignore
deleted file mode 100644
index 7567401..0000000
--- a/plugins/org.eclipse.jem/.cvsignore
+++ /dev/null
@@ -1,5 +0,0 @@
-bin
-build.xml
-javaCompiler...args
-@dot
-org.eclipse.jem_2.0.200.200806031304.jar
diff --git a/plugins/org.eclipse.jem/.options b/plugins/org.eclipse.jem/.options
deleted file mode 100644
index 493f8d4..0000000
--- a/plugins/org.eclipse.jem/.options
+++ /dev/null
@@ -1,3 +0,0 @@
-org.eclipse.jem/debug/logtrace=default
-org.eclipse.jem/debug/logtracefile=default
-org.eclipse.jem/debug/loglevel=default
\ No newline at end of file
diff --git a/plugins/org.eclipse.jem/.project b/plugins/org.eclipse.jem/.project
deleted file mode 100644
index fc13991..0000000
--- a/plugins/org.eclipse.jem/.project
+++ /dev/null
@@ -1,24 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<projectDescription>
- <name>org.eclipse.jem</name>
- <comment></comment>
- <projects></projects>
- <buildSpec>
- <buildCommand>
- <name>org.eclipse.jdt.core.javabuilder</name>
- <arguments></arguments>
- </buildCommand>
- <buildCommand>
- <name>org.eclipse.pde.ManifestBuilder</name>
- <arguments></arguments>
- </buildCommand>
- <buildCommand>
- <name>org.eclipse.pde.SchemaBuilder</name>
- <arguments></arguments>
- </buildCommand>
- </buildSpec>
- <natures>
- <nature>org.eclipse.pde.PluginNature</nature>
- <nature>org.eclipse.jdt.core.javanature</nature>
- </natures>
-</projectDescription>
diff --git a/plugins/org.eclipse.jem/.settings/org.eclipse.core.resources.prefs b/plugins/org.eclipse.jem/.settings/org.eclipse.core.resources.prefs
deleted file mode 100644
index 5150462..0000000
--- a/plugins/org.eclipse.jem/.settings/org.eclipse.core.resources.prefs
+++ /dev/null
@@ -1,3 +0,0 @@
-#Sun Apr 15 21:14:36 EDT 2007
-eclipse.preferences.version=1
-encoding/<project>=ISO-8859-1
diff --git a/plugins/org.eclipse.jem/.settings/org.eclipse.jdt.core.prefs b/plugins/org.eclipse.jem/.settings/org.eclipse.jdt.core.prefs
deleted file mode 100644
index e802e82..0000000
--- a/plugins/org.eclipse.jem/.settings/org.eclipse.jdt.core.prefs
+++ /dev/null
@@ -1,293 +0,0 @@
-#Sat Mar 31 23:08:03 EDT 2007
-eclipse.preferences.version=1
-org.eclipse.jdt.core.compiler.codegen.targetPlatform=1.5
-org.eclipse.jdt.core.compiler.compliance=1.5
-org.eclipse.jdt.core.compiler.problem.annotationSuperInterface=warning
-org.eclipse.jdt.core.compiler.problem.assertIdentifier=error
-org.eclipse.jdt.core.compiler.problem.autoboxing=ignore
-org.eclipse.jdt.core.compiler.problem.deprecation=warning
-org.eclipse.jdt.core.compiler.problem.deprecationInDeprecatedCode=disabled
-org.eclipse.jdt.core.compiler.problem.deprecationWhenOverridingDeprecatedMethod=disabled
-org.eclipse.jdt.core.compiler.problem.emptyStatement=ignore
-org.eclipse.jdt.core.compiler.problem.enumIdentifier=error
-org.eclipse.jdt.core.compiler.problem.fieldHiding=ignore
-org.eclipse.jdt.core.compiler.problem.finalParameterBound=warning
-org.eclipse.jdt.core.compiler.problem.finallyBlockNotCompletingNormally=warning
-org.eclipse.jdt.core.compiler.problem.hiddenCatchBlock=warning
-org.eclipse.jdt.core.compiler.problem.incompatibleNonInheritedInterfaceMethod=warning
-org.eclipse.jdt.core.compiler.problem.incompleteEnumSwitch=ignore
-org.eclipse.jdt.core.compiler.problem.indirectStaticAccess=ignore
-org.eclipse.jdt.core.compiler.problem.localVariableHiding=ignore
-org.eclipse.jdt.core.compiler.problem.methodWithConstructorName=warning
-org.eclipse.jdt.core.compiler.problem.missingDeprecatedAnnotation=ignore
-org.eclipse.jdt.core.compiler.problem.missingOverrideAnnotation=ignore
-org.eclipse.jdt.core.compiler.problem.missingSerialVersion=warning
-org.eclipse.jdt.core.compiler.problem.noEffectAssignment=warning
-org.eclipse.jdt.core.compiler.problem.noImplicitStringConversion=warning
-org.eclipse.jdt.core.compiler.problem.nonExternalizedStringLiteral=ignore
-org.eclipse.jdt.core.compiler.problem.overridingPackageDefaultMethod=warning
-org.eclipse.jdt.core.compiler.problem.possibleAccidentalBooleanAssignment=ignore
-org.eclipse.jdt.core.compiler.problem.rawTypeReference=ignore
-org.eclipse.jdt.core.compiler.problem.specialParameterHidingField=disabled
-org.eclipse.jdt.core.compiler.problem.staticAccessReceiver=warning
-org.eclipse.jdt.core.compiler.problem.syntheticAccessEmulation=ignore
-org.eclipse.jdt.core.compiler.problem.typeParameterHiding=warning
-org.eclipse.jdt.core.compiler.problem.uncheckedTypeOperation=ignore
-org.eclipse.jdt.core.compiler.problem.undocumentedEmptyBlock=ignore
-org.eclipse.jdt.core.compiler.problem.unnecessaryElse=ignore
-org.eclipse.jdt.core.compiler.problem.unnecessaryTypeCheck=error
-org.eclipse.jdt.core.compiler.problem.unqualifiedFieldAccess=ignore
-org.eclipse.jdt.core.compiler.problem.unusedDeclaredThrownException=ignore
-org.eclipse.jdt.core.compiler.problem.unusedDeclaredThrownExceptionWhenOverriding=disabled
-org.eclipse.jdt.core.compiler.problem.unusedImport=error
-org.eclipse.jdt.core.compiler.problem.unusedLocal=error
-org.eclipse.jdt.core.compiler.problem.unusedParameter=ignore
-org.eclipse.jdt.core.compiler.problem.unusedParameterWhenImplementingAbstract=disabled
-org.eclipse.jdt.core.compiler.problem.unusedParameterWhenOverridingConcrete=disabled
-org.eclipse.jdt.core.compiler.problem.unusedPrivateMember=error
-org.eclipse.jdt.core.compiler.problem.varargsArgumentNeedCast=warning
-org.eclipse.jdt.core.compiler.source=1.5
-org.eclipse.jdt.core.formatter.align_type_members_on_columns=false
-org.eclipse.jdt.core.formatter.alignment_for_arguments_in_allocation_expression=16
-org.eclipse.jdt.core.formatter.alignment_for_arguments_in_enum_constant=16
-org.eclipse.jdt.core.formatter.alignment_for_arguments_in_explicit_constructor_call=16
-org.eclipse.jdt.core.formatter.alignment_for_arguments_in_method_invocation=16
-org.eclipse.jdt.core.formatter.alignment_for_arguments_in_qualified_allocation_expression=16
-org.eclipse.jdt.core.formatter.alignment_for_assignment=0
-org.eclipse.jdt.core.formatter.alignment_for_binary_expression=16
-org.eclipse.jdt.core.formatter.alignment_for_compact_if=16
-org.eclipse.jdt.core.formatter.alignment_for_conditional_expression=80
-org.eclipse.jdt.core.formatter.alignment_for_enum_constants=0
-org.eclipse.jdt.core.formatter.alignment_for_expressions_in_array_initializer=16
-org.eclipse.jdt.core.formatter.alignment_for_multiple_fields=16
-org.eclipse.jdt.core.formatter.alignment_for_parameters_in_constructor_declaration=16
-org.eclipse.jdt.core.formatter.alignment_for_parameters_in_method_declaration=16
-org.eclipse.jdt.core.formatter.alignment_for_selector_in_method_invocation=16
-org.eclipse.jdt.core.formatter.alignment_for_superclass_in_type_declaration=16
-org.eclipse.jdt.core.formatter.alignment_for_superinterfaces_in_enum_declaration=16
-org.eclipse.jdt.core.formatter.alignment_for_superinterfaces_in_type_declaration=16
-org.eclipse.jdt.core.formatter.alignment_for_throws_clause_in_constructor_declaration=16
-org.eclipse.jdt.core.formatter.alignment_for_throws_clause_in_method_declaration=16
-org.eclipse.jdt.core.formatter.blank_lines_after_imports=1
-org.eclipse.jdt.core.formatter.blank_lines_after_package=1
-org.eclipse.jdt.core.formatter.blank_lines_before_field=1
-org.eclipse.jdt.core.formatter.blank_lines_before_first_class_body_declaration=1
-org.eclipse.jdt.core.formatter.blank_lines_before_imports=1
-org.eclipse.jdt.core.formatter.blank_lines_before_member_type=1
-org.eclipse.jdt.core.formatter.blank_lines_before_method=1
-org.eclipse.jdt.core.formatter.blank_lines_before_new_chunk=1
-org.eclipse.jdt.core.formatter.blank_lines_before_package=0
-org.eclipse.jdt.core.formatter.blank_lines_between_type_declarations=1
-org.eclipse.jdt.core.formatter.brace_position_for_annotation_type_declaration=end_of_line
-org.eclipse.jdt.core.formatter.brace_position_for_anonymous_type_declaration=end_of_line
-org.eclipse.jdt.core.formatter.brace_position_for_array_initializer=end_of_line
-org.eclipse.jdt.core.formatter.brace_position_for_block=end_of_line
-org.eclipse.jdt.core.formatter.brace_position_for_block_in_case=end_of_line
-org.eclipse.jdt.core.formatter.brace_position_for_constructor_declaration=end_of_line
-org.eclipse.jdt.core.formatter.brace_position_for_enum_constant=end_of_line
-org.eclipse.jdt.core.formatter.brace_position_for_enum_declaration=end_of_line
-org.eclipse.jdt.core.formatter.brace_position_for_method_declaration=end_of_line
-org.eclipse.jdt.core.formatter.brace_position_for_switch=end_of_line
-org.eclipse.jdt.core.formatter.brace_position_for_type_declaration=end_of_line
-org.eclipse.jdt.core.formatter.comment.format_header=false
-org.eclipse.jdt.core.formatter.comment.format_html=true
-org.eclipse.jdt.core.formatter.comment.format_source_code=true
-org.eclipse.jdt.core.formatter.comment.indent_parameter_description=true
-org.eclipse.jdt.core.formatter.comment.indent_root_tags=true
-org.eclipse.jdt.core.formatter.comment.insert_new_line_before_root_tags=insert
-org.eclipse.jdt.core.formatter.comment.insert_new_line_for_parameter=insert
-org.eclipse.jdt.core.formatter.comment.line_length=150
-org.eclipse.jdt.core.formatter.compact_else_if=true
-org.eclipse.jdt.core.formatter.continuation_indentation=2
-org.eclipse.jdt.core.formatter.continuation_indentation_for_array_initializer=2
-org.eclipse.jdt.core.formatter.format_guardian_clause_on_one_line=true
-org.eclipse.jdt.core.formatter.indent_body_declarations_compare_to_annotation_declaration_header=true
-org.eclipse.jdt.core.formatter.indent_body_declarations_compare_to_enum_constant_header=true
-org.eclipse.jdt.core.formatter.indent_body_declarations_compare_to_enum_declaration_header=true
-org.eclipse.jdt.core.formatter.indent_body_declarations_compare_to_type_header=true
-org.eclipse.jdt.core.formatter.indent_breaks_compare_to_cases=true
-org.eclipse.jdt.core.formatter.indent_empty_lines=false
-org.eclipse.jdt.core.formatter.indent_statements_compare_to_block=true
-org.eclipse.jdt.core.formatter.indent_statements_compare_to_body=true
-org.eclipse.jdt.core.formatter.indent_switchstatements_compare_to_cases=true
-org.eclipse.jdt.core.formatter.indent_switchstatements_compare_to_switch=true
-org.eclipse.jdt.core.formatter.indentation.size=4
-org.eclipse.jdt.core.formatter.insert_new_line_after_annotation=insert
-org.eclipse.jdt.core.formatter.insert_new_line_after_opening_brace_in_array_initializer=do not insert
-org.eclipse.jdt.core.formatter.insert_new_line_at_end_of_file_if_missing=do not insert
-org.eclipse.jdt.core.formatter.insert_new_line_before_catch_in_try_statement=do not insert
-org.eclipse.jdt.core.formatter.insert_new_line_before_closing_brace_in_array_initializer=do not insert
-org.eclipse.jdt.core.formatter.insert_new_line_before_else_in_if_statement=do not insert
-org.eclipse.jdt.core.formatter.insert_new_line_before_finally_in_try_statement=do not insert
-org.eclipse.jdt.core.formatter.insert_new_line_before_while_in_do_statement=do not insert
-org.eclipse.jdt.core.formatter.insert_new_line_in_empty_annotation_declaration=insert
-org.eclipse.jdt.core.formatter.insert_new_line_in_empty_anonymous_type_declaration=insert
-org.eclipse.jdt.core.formatter.insert_new_line_in_empty_block=insert
-org.eclipse.jdt.core.formatter.insert_new_line_in_empty_enum_constant=insert
-org.eclipse.jdt.core.formatter.insert_new_line_in_empty_enum_declaration=insert
-org.eclipse.jdt.core.formatter.insert_new_line_in_empty_method_body=insert
-org.eclipse.jdt.core.formatter.insert_new_line_in_empty_type_declaration=insert
-org.eclipse.jdt.core.formatter.insert_space_after_and_in_type_parameter=insert
-org.eclipse.jdt.core.formatter.insert_space_after_assignment_operator=insert
-org.eclipse.jdt.core.formatter.insert_space_after_at_in_annotation=do not insert
-org.eclipse.jdt.core.formatter.insert_space_after_at_in_annotation_type_declaration=do not insert
-org.eclipse.jdt.core.formatter.insert_space_after_binary_operator=insert
-org.eclipse.jdt.core.formatter.insert_space_after_closing_angle_bracket_in_type_arguments=insert
-org.eclipse.jdt.core.formatter.insert_space_after_closing_angle_bracket_in_type_parameters=insert
-org.eclipse.jdt.core.formatter.insert_space_after_closing_brace_in_block=insert
-org.eclipse.jdt.core.formatter.insert_space_after_closing_paren_in_cast=insert
-org.eclipse.jdt.core.formatter.insert_space_after_colon_in_assert=insert
-org.eclipse.jdt.core.formatter.insert_space_after_colon_in_case=insert
-org.eclipse.jdt.core.formatter.insert_space_after_colon_in_conditional=insert
-org.eclipse.jdt.core.formatter.insert_space_after_colon_in_for=insert
-org.eclipse.jdt.core.formatter.insert_space_after_colon_in_labeled_statement=insert
-org.eclipse.jdt.core.formatter.insert_space_after_comma_in_allocation_expression=insert
-org.eclipse.jdt.core.formatter.insert_space_after_comma_in_annotation=insert
-org.eclipse.jdt.core.formatter.insert_space_after_comma_in_array_initializer=insert
-org.eclipse.jdt.core.formatter.insert_space_after_comma_in_constructor_declaration_parameters=insert
-org.eclipse.jdt.core.formatter.insert_space_after_comma_in_constructor_declaration_throws=insert
-org.eclipse.jdt.core.formatter.insert_space_after_comma_in_enum_constant_arguments=insert
-org.eclipse.jdt.core.formatter.insert_space_after_comma_in_enum_declarations=insert
-org.eclipse.jdt.core.formatter.insert_space_after_comma_in_explicitconstructorcall_arguments=insert
-org.eclipse.jdt.core.formatter.insert_space_after_comma_in_for_increments=insert
-org.eclipse.jdt.core.formatter.insert_space_after_comma_in_for_inits=insert
-org.eclipse.jdt.core.formatter.insert_space_after_comma_in_method_declaration_parameters=insert
-org.eclipse.jdt.core.formatter.insert_space_after_comma_in_method_declaration_throws=insert
-org.eclipse.jdt.core.formatter.insert_space_after_comma_in_method_invocation_arguments=insert
-org.eclipse.jdt.core.formatter.insert_space_after_comma_in_multiple_field_declarations=insert
-org.eclipse.jdt.core.formatter.insert_space_after_comma_in_multiple_local_declarations=insert
-org.eclipse.jdt.core.formatter.insert_space_after_comma_in_parameterized_type_reference=insert
-org.eclipse.jdt.core.formatter.insert_space_after_comma_in_superinterfaces=insert
-org.eclipse.jdt.core.formatter.insert_space_after_comma_in_type_arguments=insert
-org.eclipse.jdt.core.formatter.insert_space_after_comma_in_type_parameters=insert
-org.eclipse.jdt.core.formatter.insert_space_after_ellipsis=insert
-org.eclipse.jdt.core.formatter.insert_space_after_opening_angle_bracket_in_parameterized_type_reference=do not insert
-org.eclipse.jdt.core.formatter.insert_space_after_opening_angle_bracket_in_type_arguments=do not insert
-org.eclipse.jdt.core.formatter.insert_space_after_opening_angle_bracket_in_type_parameters=do not insert
-org.eclipse.jdt.core.formatter.insert_space_after_opening_brace_in_array_initializer=insert
-org.eclipse.jdt.core.formatter.insert_space_after_opening_bracket_in_array_allocation_expression=do not insert
-org.eclipse.jdt.core.formatter.insert_space_after_opening_bracket_in_array_reference=do not insert
-org.eclipse.jdt.core.formatter.insert_space_after_opening_paren_in_annotation=do not insert
-org.eclipse.jdt.core.formatter.insert_space_after_opening_paren_in_cast=do not insert
-org.eclipse.jdt.core.formatter.insert_space_after_opening_paren_in_catch=do not insert
-org.eclipse.jdt.core.formatter.insert_space_after_opening_paren_in_constructor_declaration=do not insert
-org.eclipse.jdt.core.formatter.insert_space_after_opening_paren_in_enum_constant=do not insert
-org.eclipse.jdt.core.formatter.insert_space_after_opening_paren_in_for=do not insert
-org.eclipse.jdt.core.formatter.insert_space_after_opening_paren_in_if=do not insert
-org.eclipse.jdt.core.formatter.insert_space_after_opening_paren_in_method_declaration=do not insert
-org.eclipse.jdt.core.formatter.insert_space_after_opening_paren_in_method_invocation=do not insert
-org.eclipse.jdt.core.formatter.insert_space_after_opening_paren_in_parenthesized_expression=do not insert
-org.eclipse.jdt.core.formatter.insert_space_after_opening_paren_in_switch=do not insert
-org.eclipse.jdt.core.formatter.insert_space_after_opening_paren_in_synchronized=do not insert
-org.eclipse.jdt.core.formatter.insert_space_after_opening_paren_in_while=do not insert
-org.eclipse.jdt.core.formatter.insert_space_after_postfix_operator=do not insert
-org.eclipse.jdt.core.formatter.insert_space_after_prefix_operator=do not insert
-org.eclipse.jdt.core.formatter.insert_space_after_question_in_conditional=insert
-org.eclipse.jdt.core.formatter.insert_space_after_question_in_wildcard=do not insert
-org.eclipse.jdt.core.formatter.insert_space_after_semicolon_in_for=insert
-org.eclipse.jdt.core.formatter.insert_space_after_unary_operator=do not insert
-org.eclipse.jdt.core.formatter.insert_space_before_and_in_type_parameter=insert
-org.eclipse.jdt.core.formatter.insert_space_before_assignment_operator=insert
-org.eclipse.jdt.core.formatter.insert_space_before_at_in_annotation_type_declaration=insert
-org.eclipse.jdt.core.formatter.insert_space_before_binary_operator=insert
-org.eclipse.jdt.core.formatter.insert_space_before_closing_angle_bracket_in_parameterized_type_reference=do not insert
-org.eclipse.jdt.core.formatter.insert_space_before_closing_angle_bracket_in_type_arguments=do not insert
-org.eclipse.jdt.core.formatter.insert_space_before_closing_angle_bracket_in_type_parameters=do not insert
-org.eclipse.jdt.core.formatter.insert_space_before_closing_brace_in_array_initializer=do not insert
-org.eclipse.jdt.core.formatter.insert_space_before_closing_bracket_in_array_allocation_expression=do not insert
-org.eclipse.jdt.core.formatter.insert_space_before_closing_bracket_in_array_reference=do not insert
-org.eclipse.jdt.core.formatter.insert_space_before_closing_paren_in_annotation=do not insert
-org.eclipse.jdt.core.formatter.insert_space_before_closing_paren_in_cast=do not insert
-org.eclipse.jdt.core.formatter.insert_space_before_closing_paren_in_catch=do not insert
-org.eclipse.jdt.core.formatter.insert_space_before_closing_paren_in_constructor_declaration=do not insert
-org.eclipse.jdt.core.formatter.insert_space_before_closing_paren_in_enum_constant=do not insert
-org.eclipse.jdt.core.formatter.insert_space_before_closing_paren_in_for=do not insert
-org.eclipse.jdt.core.formatter.insert_space_before_closing_paren_in_if=do not insert
-org.eclipse.jdt.core.formatter.insert_space_before_closing_paren_in_method_declaration=do not insert
-org.eclipse.jdt.core.formatter.insert_space_before_closing_paren_in_method_invocation=do not insert
-org.eclipse.jdt.core.formatter.insert_space_before_closing_paren_in_parenthesized_expression=do not insert
-org.eclipse.jdt.core.formatter.insert_space_before_closing_paren_in_switch=do not insert
-org.eclipse.jdt.core.formatter.insert_space_before_closing_paren_in_synchronized=do not insert
-org.eclipse.jdt.core.formatter.insert_space_before_closing_paren_in_while=do not insert
-org.eclipse.jdt.core.formatter.insert_space_before_colon_in_assert=insert
-org.eclipse.jdt.core.formatter.insert_space_before_colon_in_case=do not insert
-org.eclipse.jdt.core.formatter.insert_space_before_colon_in_conditional=insert
-org.eclipse.jdt.core.formatter.insert_space_before_colon_in_default=do not insert
-org.eclipse.jdt.core.formatter.insert_space_before_colon_in_for=insert
-org.eclipse.jdt.core.formatter.insert_space_before_colon_in_labeled_statement=do not insert
-org.eclipse.jdt.core.formatter.insert_space_before_comma_in_allocation_expression=do not insert
-org.eclipse.jdt.core.formatter.insert_space_before_comma_in_annotation=do not insert
-org.eclipse.jdt.core.formatter.insert_space_before_comma_in_array_initializer=do not insert
-org.eclipse.jdt.core.formatter.insert_space_before_comma_in_constructor_declaration_parameters=do not insert
-org.eclipse.jdt.core.formatter.insert_space_before_comma_in_constructor_declaration_throws=do not insert
-org.eclipse.jdt.core.formatter.insert_space_before_comma_in_enum_constant_arguments=do not insert
-org.eclipse.jdt.core.formatter.insert_space_before_comma_in_enum_declarations=do not insert
-org.eclipse.jdt.core.formatter.insert_space_before_comma_in_explicitconstructorcall_arguments=do not insert
-org.eclipse.jdt.core.formatter.insert_space_before_comma_in_for_increments=do not insert
-org.eclipse.jdt.core.formatter.insert_space_before_comma_in_for_inits=do not insert
-org.eclipse.jdt.core.formatter.insert_space_before_comma_in_method_declaration_parameters=do not insert
-org.eclipse.jdt.core.formatter.insert_space_before_comma_in_method_declaration_throws=do not insert
-org.eclipse.jdt.core.formatter.insert_space_before_comma_in_method_invocation_arguments=do not insert
-org.eclipse.jdt.core.formatter.insert_space_before_comma_in_multiple_field_declarations=do not insert
-org.eclipse.jdt.core.formatter.insert_space_before_comma_in_multiple_local_declarations=do not insert
-org.eclipse.jdt.core.formatter.insert_space_before_comma_in_parameterized_type_reference=do not insert
-org.eclipse.jdt.core.formatter.insert_space_before_comma_in_superinterfaces=do not insert
-org.eclipse.jdt.core.formatter.insert_space_before_comma_in_type_arguments=do not insert
-org.eclipse.jdt.core.formatter.insert_space_before_comma_in_type_parameters=do not insert
-org.eclipse.jdt.core.formatter.insert_space_before_ellipsis=do not insert
-org.eclipse.jdt.core.formatter.insert_space_before_opening_angle_bracket_in_parameterized_type_reference=do not insert
-org.eclipse.jdt.core.formatter.insert_space_before_opening_angle_bracket_in_type_arguments=do not insert
-org.eclipse.jdt.core.formatter.insert_space_before_opening_angle_bracket_in_type_parameters=do not insert
-org.eclipse.jdt.core.formatter.insert_space_before_opening_brace_in_annotation_type_declaration=insert
-org.eclipse.jdt.core.formatter.insert_space_before_opening_brace_in_anonymous_type_declaration=insert
-org.eclipse.jdt.core.formatter.insert_space_before_opening_brace_in_array_initializer=insert
-org.eclipse.jdt.core.formatter.insert_space_before_opening_brace_in_block=insert
-org.eclipse.jdt.core.formatter.insert_space_before_opening_brace_in_constructor_declaration=insert
-org.eclipse.jdt.core.formatter.insert_space_before_opening_brace_in_enum_constant=insert
-org.eclipse.jdt.core.formatter.insert_space_before_opening_brace_in_enum_declaration=insert
-org.eclipse.jdt.core.formatter.insert_space_before_opening_brace_in_method_declaration=insert
-org.eclipse.jdt.core.formatter.insert_space_before_opening_brace_in_switch=insert
-org.eclipse.jdt.core.formatter.insert_space_before_opening_brace_in_type_declaration=insert
-org.eclipse.jdt.core.formatter.insert_space_before_opening_bracket_in_array_allocation_expression=do not insert
-org.eclipse.jdt.core.formatter.insert_space_before_opening_bracket_in_array_reference=do not insert
-org.eclipse.jdt.core.formatter.insert_space_before_opening_bracket_in_array_type_reference=do not insert
-org.eclipse.jdt.core.formatter.insert_space_before_opening_paren_in_annotation=do not insert
-org.eclipse.jdt.core.formatter.insert_space_before_opening_paren_in_annotation_type_member_declaration=do not insert
-org.eclipse.jdt.core.formatter.insert_space_before_opening_paren_in_catch=insert
-org.eclipse.jdt.core.formatter.insert_space_before_opening_paren_in_constructor_declaration=do not insert
-org.eclipse.jdt.core.formatter.insert_space_before_opening_paren_in_enum_constant=do not insert
-org.eclipse.jdt.core.formatter.insert_space_before_opening_paren_in_for=insert
-org.eclipse.jdt.core.formatter.insert_space_before_opening_paren_in_if=insert
-org.eclipse.jdt.core.formatter.insert_space_before_opening_paren_in_method_declaration=do not insert
-org.eclipse.jdt.core.formatter.insert_space_before_opening_paren_in_method_invocation=do not insert
-org.eclipse.jdt.core.formatter.insert_space_before_opening_paren_in_parenthesized_expression=do not insert
-org.eclipse.jdt.core.formatter.insert_space_before_opening_paren_in_switch=insert
-org.eclipse.jdt.core.formatter.insert_space_before_opening_paren_in_synchronized=insert
-org.eclipse.jdt.core.formatter.insert_space_before_opening_paren_in_while=insert
-org.eclipse.jdt.core.formatter.insert_space_before_parenthesized_expression_in_return=insert
-org.eclipse.jdt.core.formatter.insert_space_before_postfix_operator=do not insert
-org.eclipse.jdt.core.formatter.insert_space_before_prefix_operator=do not insert
-org.eclipse.jdt.core.formatter.insert_space_before_question_in_conditional=insert
-org.eclipse.jdt.core.formatter.insert_space_before_question_in_wildcard=do not insert
-org.eclipse.jdt.core.formatter.insert_space_before_semicolon=do not insert
-org.eclipse.jdt.core.formatter.insert_space_before_semicolon_in_for=do not insert
-org.eclipse.jdt.core.formatter.insert_space_before_unary_operator=do not insert
-org.eclipse.jdt.core.formatter.insert_space_between_brackets_in_array_type_reference=do not insert
-org.eclipse.jdt.core.formatter.insert_space_between_empty_braces_in_array_initializer=do not insert
-org.eclipse.jdt.core.formatter.insert_space_between_empty_brackets_in_array_allocation_expression=do not insert
-org.eclipse.jdt.core.formatter.insert_space_between_empty_parens_in_annotation_type_member_declaration=do not insert
-org.eclipse.jdt.core.formatter.insert_space_between_empty_parens_in_constructor_declaration=do not insert
-org.eclipse.jdt.core.formatter.insert_space_between_empty_parens_in_enum_constant=do not insert
-org.eclipse.jdt.core.formatter.insert_space_between_empty_parens_in_method_declaration=do not insert
-org.eclipse.jdt.core.formatter.insert_space_between_empty_parens_in_method_invocation=do not insert
-org.eclipse.jdt.core.formatter.keep_else_statement_on_same_line=false
-org.eclipse.jdt.core.formatter.keep_empty_array_initializer_on_one_line=false
-org.eclipse.jdt.core.formatter.keep_imple_if_on_one_line=false
-org.eclipse.jdt.core.formatter.keep_then_statement_on_same_line=false
-org.eclipse.jdt.core.formatter.lineSplit=150
-org.eclipse.jdt.core.formatter.number_of_blank_lines_at_beginning_of_method_body=0
-org.eclipse.jdt.core.formatter.number_of_empty_lines_to_preserve=1
-org.eclipse.jdt.core.formatter.put_empty_statement_on_new_line=true
-org.eclipse.jdt.core.formatter.tabulation.char=tab
-org.eclipse.jdt.core.formatter.tabulation.size=4
-org.eclipse.jdt.core.formatter.use_tabs_only_for_leading_indentations=false
diff --git a/plugins/org.eclipse.jem/.settings/org.eclipse.jdt.ui.prefs b/plugins/org.eclipse.jem/.settings/org.eclipse.jdt.ui.prefs
deleted file mode 100644
index dab32cb..0000000
--- a/plugins/org.eclipse.jem/.settings/org.eclipse.jdt.ui.prefs
+++ /dev/null
@@ -1,8 +0,0 @@
-#Tue Feb 21 10:09:03 EST 2006
-eclipse.preferences.version=1
-formatter_profile=_jve
-formatter_settings_version=10
-org.eclipse.jdt.ui.ignorelowercasenames=true
-org.eclipse.jdt.ui.importorder=java;javax;org;org.eclipse.wtp;org.eclipse.jem;org.eclipse.ve.internal.cdm;org.eclipse.ve.internal.cde;org.eclipse.ve.internal.jcm;org.eclipse.ve.internal.java;org.eclipse.ve;com;
-org.eclipse.jdt.ui.ondemandthreshold=3
-org.eclipse.jdt.ui.text.custom_code_templates=<?xml version\="1.0" encoding\="UTF-8"?><templates/>
diff --git a/plugins/org.eclipse.jem/META-INF/MANIFEST.MF b/plugins/org.eclipse.jem/META-INF/MANIFEST.MF
deleted file mode 100644
index bca5c66..0000000
--- a/plugins/org.eclipse.jem/META-INF/MANIFEST.MF
+++ /dev/null
@@ -1,29 +0,0 @@
-Manifest-Version: 1.0
-Bundle-ManifestVersion: 2
-Bundle-Name: %pluginName
-Bundle-SymbolicName: org.eclipse.jem; singleton:=true
-Bundle-Version: 2.0.400.qualifier
-Bundle-Activator: org.eclipse.jem.internal.core.JEMPlugin
-Bundle-Vendor: %providerName
-Bundle-Localization: plugin
-Export-Package: org.eclipse.jem.internal.core;x-friends:="org.eclipse.jem.beaninfo,org.eclipse.jem.proxy,org.eclipse.jem.tests,org.eclipse.jem.ui,org.eclipse.jem.util,org.eclipse.jem.workbench",
- org.eclipse.jem.internal.instantiation,
- org.eclipse.jem.internal.instantiation.base,
- org.eclipse.jem.internal.instantiation.impl,
- org.eclipse.jem.internal.java.adapters;x-friends:="org.eclipse.jem.beaninfo,org.eclipse.jem.workbench",
- org.eclipse.jem.internal.java.adapters.jdk;x-friends:="org.eclipse.jem.workbench",
- org.eclipse.jem.internal.java.adapters.nls;x-friends:="org.eclipse.jem.workbench",
- org.eclipse.jem.internal.java.beaninfo,
- org.eclipse.jem.internal.java.init;x-friends:="org.eclipse.jem.beaninfo",
- org.eclipse.jem.internal.java.instantiation,
- org.eclipse.jem.java,
- org.eclipse.jem.java.adapters,
- org.eclipse.jem.java.impl,
- org.eclipse.jem.java.internal.impl;x-friends:="org.eclipse.jem.beaninfo,org.eclipse.jem.workbench",
- org.eclipse.jem.java.util
-Require-Bundle: org.eclipse.emf.ecore.xmi;bundle-version="[2.3.0,3.0.0)",
- org.eclipse.jem.proxy;bundle-version="[2.0.0,3.0.0)";resolution:=optional,
- org.eclipse.core.runtime;bundle-version="[3.2.0,4.0.0)",
- org.eclipse.jem.util;bundle-version="[2.0.0,3.0.0)"
-Eclipse-LazyStart: true
-Bundle-RequiredExecutionEnvironment: J2SE-1.5
diff --git "a/plugins/org.eclipse.jem/READ_ME_BEFORE_CHANGING_MANIFEST\041\041\041" "b/plugins/org.eclipse.jem/READ_ME_BEFORE_CHANGING_MANIFEST\041\041\041"
deleted file mode 100644
index 26d6b2e..0000000
--- "a/plugins/org.eclipse.jem/READ_ME_BEFORE_CHANGING_MANIFEST\041\041\041"
+++ /dev/null
@@ -1,8 +0,0 @@
-Do not include a new dependency plugin to the MANIFEST for this plugind!!!
-
-The reason for this is that this plugin is also executed outside of Eclipse framework, such IBM Websphere Application Server (c) IBM. We cannot add
-new dependencies to the plugin because the current set is considered to be API. Adding a new set without consulting those users would break
-them.
-
-The external API is anything in the mofjava folder. If it is only for a class in the other source folder(s) it may be OK since they would not be
-using that code. But it would be best to consult with them first.
\ No newline at end of file
diff --git a/plugins/org.eclipse.jem/about.html b/plugins/org.eclipse.jem/about.html
deleted file mode 100644
index 5acea59..0000000
--- a/plugins/org.eclipse.jem/about.html
+++ /dev/null
@@ -1,25 +0,0 @@
-<!DOCTYPE HTML PUBLIC "-//W3C//DTD HTML 4.0//EN">
-<html><head><title>About</title>
-
-
-
-<meta http-equiv="Content-Type" content="text/html; charset=ISO-8859-1"></head><body lang="EN-US">
-<h2>About This Content</h2>
-
-<P>June, 2008</P>
-<h3>License</h3>
-
-<p>The Eclipse Foundation makes available all content in this plug-in ("Content"). Unless otherwise
-indicated below, the Content is provided to you under the terms and conditions of the
-Eclipse Public License Version 1.0 ("EPL"). A copy of the EPL is available
-at <a href="http://www.eclipse.org/legal/epl-v10.html">http://www.eclipse.org/legal/epl-v10.html</a>.
-For purposes of the EPL, "Program" will mean the Content.</p>
-
-<p>If you did not receive this Content directly from the Eclipse Foundation, the Content is
-being redistributed by another party ("Redistributor") and different terms and conditions may
-apply to your use of any object code in the Content. Check the Redistributor's license that was
-provided with the Content. If no such license exists, contact the Redistributor. Unless otherwise
-indicated below, the terms and conditions of the EPL still apply to any source code in the Content
-and such source code may be obtained at <a href="http://www.eclipse.org/">http://www.eclipse.org</a>.</p>
-
-</body></html>
\ No newline at end of file
diff --git a/plugins/org.eclipse.jem/about.ini b/plugins/org.eclipse.jem/about.ini
deleted file mode 100644
index 1931489..0000000
--- a/plugins/org.eclipse.jem/about.ini
+++ /dev/null
@@ -1,29 +0,0 @@
-# about.ini
-# contains information about a feature
-# java.io.Properties file (ISO 8859-1 with "\" escapes)
-# "%key" are externalized strings defined in about.properties
-# This file does not need to be translated.
-
-# Property "aboutText" contains blurb for "About" dialog (translated)
-aboutText=%blurb
-
-# Property "windowImage" contains path to window icon (16x16)
-# needed for primary features only
-
-# Property "featureImage" contains path to feature image (32x32)
-featureImage=eclipse32.png
-
-# Property "aboutImage" contains path to product image (500x330 or 115x164)
-# needed for primary features only
-
-# Property "appName" contains name of the application (translated)
-# needed for primary features only
-
-# Property "welcomePage" contains path to welcome page (special XML-based format)
-# optional
-
-# Property "welcomePerspective" contains the id of the perspective in which the
-# welcome page is to be opened.
-# optional
-
-
diff --git a/plugins/org.eclipse.jem/about.mappings b/plugins/org.eclipse.jem/about.mappings
deleted file mode 100644
index bddaab4..0000000
--- a/plugins/org.eclipse.jem/about.mappings
+++ /dev/null
@@ -1,6 +0,0 @@
-# about.mappings
-# contains fill-ins for about.properties
-# java.io.Properties file (ISO 8859-1 with "\" escapes)
-# This file does not need to be translated.
-
-0=@build@
\ No newline at end of file
diff --git a/plugins/org.eclipse.jem/about.properties b/plugins/org.eclipse.jem/about.properties
deleted file mode 100644
index 93e5168..0000000
--- a/plugins/org.eclipse.jem/about.properties
+++ /dev/null
@@ -1,28 +0,0 @@
-###############################################################################
-# Copyright (c) 2003, 2005 IBM Corporation and others.
-# All rights reserved. This program and the accompanying materials
-# are made available under the terms of the Eclipse Public License v1.0
-# which accompanies this distribution, and is available at
-# http://www.eclipse.org/legal/epl-v10.html
-#
-# Contributors:
-# IBM Corporation - initial API and implementation
-###############################################################################
-#
-# $Source: /cvsroot/webtools/jeetools.move/webtools.javaee.git/plugins/org.eclipse.jem/about.properties,v $
-# $Revision: 1.8 $ $Date: 2006/05/18 19:09:58 $
-#
-
-# about.properties
-# contains externalized strings for about.ini
-# java.io.Properties file (ISO 8859-1 with "\" escapes)
-# fill-ins are supplied by about.mappings
-# This file should be translated.
-
-blurb=Java EMF Model\n\
-\n\
-Version: {featureVersion}\n\
-Build id: {0}\n\
-\n\
-(c) Copyright Eclipse contributors and others. 2000, 2006. All rights reserved.\n\
-Visit http://www.eclipse.org/vep
diff --git a/plugins/org.eclipse.jem/build.properties b/plugins/org.eclipse.jem/build.properties
deleted file mode 100644
index 449add7..0000000
--- a/plugins/org.eclipse.jem/build.properties
+++ /dev/null
@@ -1,30 +0,0 @@
-###############################################################################
-# Copyright (c) 2004, 2005 IBM Corporation and others.
-# All rights reserved. This program and the accompanying materials
-# are made available under the terms of the Eclipse Public License v1.0
-# which accompanies this distribution, and is available at
-# http://www.eclipse.org/legal/epl-v10.html
-#
-# Contributors:
-# IBM Corporation - initial API and implementation
-###############################################################################
-src.excludes = **/.cvsignore
-bin.includes = plugin.xml,\
- plugin.properties,\
- about.html,\
- about.ini,\
- about.mappings,\
- about.properties,\
- eclipse32.png,\
- overrides/,\
- .options,\
- META-INF/,\
- .,\
- model/
-jars.compile.order = .
-src.includes = about.html,\
- model/,\
- rose/
-output.. = bin/
-source.. = mofjava/,\
- javainst/
diff --git a/plugins/org.eclipse.jem/component.xml b/plugins/org.eclipse.jem/component.xml
deleted file mode 100644
index 616ebb5..0000000
--- a/plugins/org.eclipse.jem/component.xml
+++ /dev/null
@@ -1 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?><component xmlns="http://eclipse.org/wtp/releng/tools/component-model" name="org.eclipse.jem"><component-depends unrestricted="true"></component-depends><plugin id="org.eclipse.jem" fragment="false"/><plugin id="org.eclipse.jem.beaninfo" fragment="false"/><plugin id="org.eclipse.jem.proxy" fragment="false"/><plugin id="org.eclipse.jem.ui" fragment="false"/><plugin id="org.eclipse.jem.util" fragment="false"/><plugin id="org.eclipse.jem.workbench" fragment="false"/></component>
diff --git a/plugins/org.eclipse.jem/eclipse32.png b/plugins/org.eclipse.jem/eclipse32.png
deleted file mode 100644
index 568fac1..0000000
--- a/plugins/org.eclipse.jem/eclipse32.png
+++ /dev/null
Binary files differ
diff --git a/plugins/org.eclipse.jem/javainst/org/eclipse/jem/internal/instantiation/ImplicitAllocation.java b/plugins/org.eclipse.jem/javainst/org/eclipse/jem/internal/instantiation/ImplicitAllocation.java
deleted file mode 100644
index b5d04da..0000000
--- a/plugins/org.eclipse.jem/javainst/org/eclipse/jem/internal/instantiation/ImplicitAllocation.java
+++ /dev/null
@@ -1,92 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2003, 2005 IBM Corporation and others.
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
- *
- * Contributors:
- * IBM Corporation - initial API and implementation
- *******************************************************************************/
-package org.eclipse.jem.internal.instantiation;
-
-import org.eclipse.emf.ecore.EObject;
-import org.eclipse.emf.ecore.EStructuralFeature;
-
-/**
- * <!-- begin-user-doc -->
- * A representation of the model object '<em><b>Implicit Allocation</b></em>'.
- * <p>
- * This class is for an implicit allocation where the object comes from the feature of another object. It is the live Java value from the remote vm.
- * </p>
- * @since 1.0.0
- * <!-- end-user-doc -->
- *
- * <!-- begin-model-doc -->
- * This class is for an implicit allocation where the object comes from the feature of another object. It is the live Java value from the remote vm.
- * <!-- end-model-doc -->
- *
- * <p>
- * The following features are supported:
- * <ul>
- * <li>{@link org.eclipse.jem.internal.instantiation.ImplicitAllocation#getParent <em>Parent</em>}</li>
- * <li>{@link org.eclipse.jem.internal.instantiation.ImplicitAllocation#getFeature <em>Feature</em>}</li>
- * </ul>
- * </p>
- *
- * @see org.eclipse.jem.internal.instantiation.InstantiationPackage#getImplicitAllocation()
- * @model
- * @generated
- */
-public interface ImplicitAllocation extends JavaAllocation{
- /**
- * Returns the value of the '<em><b>Parent</b></em>' reference.
- * <!-- begin-user-doc -->
- * <p>
- * The parent who is to give up the value.
- * </p>
- * <!-- end-user-doc -->
- * @return the value of the '<em>Parent</em>' reference.
- * @see #setParent(EObject)
- * @see org.eclipse.jem.internal.instantiation.InstantiationPackage#getImplicitAllocation_Parent()
- * @model required="true"
- * @generated
- */
- EObject getParent();
-
- /**
- * Sets the value of the '{@link org.eclipse.jem.internal.instantiation.ImplicitAllocation#getParent <em>Parent</em>}' reference.
- * <!-- begin-user-doc -->
- * <!-- end-user-doc -->
- * @param value the new value of the '<em>Parent</em>' reference.
- * @see #getParent()
- * @generated
- */
- void setParent(EObject value);
-
- /**
- * Returns the value of the '<em><b>Feature</b></em>' reference.
- * <!-- begin-user-doc -->
- * <p>
- * The feature that will be used to query the live value.
- * </p>
- * <!-- end-user-doc -->
- * @return the value of the '<em>Feature</em>' reference.
- * @see #setFeature(EStructuralFeature)
- * @see org.eclipse.jem.internal.instantiation.InstantiationPackage#getImplicitAllocation_Feature()
- * @model required="true"
- * @generated
- */
- EStructuralFeature getFeature();
-
- /**
- * Sets the value of the '{@link org.eclipse.jem.internal.instantiation.ImplicitAllocation#getFeature <em>Feature</em>}' reference.
- * <!-- begin-user-doc -->
- * <!-- end-user-doc -->
- * @param value the new value of the '<em>Feature</em>' reference.
- * @see #getFeature()
- * @generated
- */
- void setFeature(EStructuralFeature value);
-
-} // ImplicitAllocation
diff --git a/plugins/org.eclipse.jem/javainst/org/eclipse/jem/internal/instantiation/InitStringAllocation.java b/plugins/org.eclipse.jem/javainst/org/eclipse/jem/internal/instantiation/InitStringAllocation.java
deleted file mode 100644
index 1268c5e..0000000
--- a/plugins/org.eclipse.jem/javainst/org/eclipse/jem/internal/instantiation/InitStringAllocation.java
+++ /dev/null
@@ -1,72 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2003, 2005 IBM Corporation and others.
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
- *
- * Contributors:
- * IBM Corporation - initial API and implementation
- *******************************************************************************/
-/*
-
-
- */
-package org.eclipse.jem.internal.instantiation;
-
-/**
- * <!-- begin-user-doc -->
- * A representation of the model object '<em><b>Init String Allocation</b></em>'.
- * <p>
- * This is used when the allocation string can be parsed by the remote vm. It uses the allocString.
- * </p>
- * @see org.eclipse.jem.internal.instantiation.JavaAllocation#getAllocString()
- * @since 1.0.0
- * <!-- end-user-doc -->
- *
- * <!-- begin-model-doc -->
- * This is used when the allocation string can be parsed by the remote vm. It uses the allocString.
- * <!-- end-model-doc -->
- *
- * <p>
- * The following features are supported:
- * <ul>
- * <li>{@link org.eclipse.jem.internal.instantiation.InitStringAllocation#getInitString <em>Init String</em>}</li>
- * </ul>
- * </p>
- *
- * @see org.eclipse.jem.internal.instantiation.InstantiationPackage#getInitStringAllocation()
- * @model
- * @generated
- */
-public interface InitStringAllocation extends JavaAllocation{
- /**
- * Returns the value of the '<em><b>Init String</b></em>' attribute.
- * <!-- begin-user-doc -->
- * <p>
- * If the meaning of the '<em>Init String</em>' attribute isn't clear,
- * there really should be more of a description here...
- * </p>
- * <!-- end-user-doc -->
- * <!-- begin-model-doc -->
- * This is the initialization string for this object.
- * <!-- end-model-doc -->
- * @return the value of the '<em>Init String</em>' attribute.
- * @see #setInitString(String)
- * @see org.eclipse.jem.internal.instantiation.InstantiationPackage#getInitStringAllocation_InitString()
- * @model
- * @generated
- */
- String getInitString();
-
- /**
- * Sets the value of the '{@link org.eclipse.jem.internal.instantiation.InitStringAllocation#getInitString <em>Init String</em>}' attribute.
- * <!-- begin-user-doc -->
- * <!-- end-user-doc -->
- * @param value the new value of the '<em>Init String</em>' attribute.
- * @see #getInitString()
- * @generated
- */
- void setInitString(String value);
-
-} // InitStringAllocation
diff --git a/plugins/org.eclipse.jem/javainst/org/eclipse/jem/internal/instantiation/InstantiationFactory.java b/plugins/org.eclipse.jem/javainst/org/eclipse/jem/internal/instantiation/InstantiationFactory.java
deleted file mode 100644
index ddea33b..0000000
--- a/plugins/org.eclipse.jem/javainst/org/eclipse/jem/internal/instantiation/InstantiationFactory.java
+++ /dev/null
@@ -1,520 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2003, 2005 IBM Corporation and others.
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
- *
- * Contributors:
- * IBM Corporation - initial API and implementation
- *******************************************************************************/
-package org.eclipse.jem.internal.instantiation;
-/*
-
-
- */
-
-import org.eclipse.emf.ecore.EFactory;
-
-import java.util.List;
-
-import org.eclipse.emf.ecore.*;
-
-import org.eclipse.jem.internal.instantiation.base.IJavaInstance;
-
-
-/**
- * <!-- begin-user-doc -->
- * The <b>Factory</b> for the model.
- * It provides a create method for each non-abstract class of the model.
- * <!-- end-user-doc -->
- * @see org.eclipse.jem.internal.instantiation.InstantiationPackage
- * @generated
- */
-public interface InstantiationFactory extends EFactory{
- /**
- * The singleton instance of the factory.
- * <!-- begin-user-doc -->
- * <!-- end-user-doc -->
- * @generated
- */
- InstantiationFactory eINSTANCE = new org.eclipse.jem.internal.instantiation.impl.InstantiationFactoryImpl();
-
- /**
- * Returns a new object of class '<em>Init String Allocation</em>'.
- * <!-- begin-user-doc -->
- * <!-- end-user-doc -->
- * @return a new object of class '<em>Init String Allocation</em>'.
- * @generated
- */
- InitStringAllocation createInitStringAllocation();
-
- /**
- * Returns a new object of class '<em>Implicit Allocation</em>'.
- * <!-- begin-user-doc -->
- * <!-- end-user-doc -->
- * @return a new object of class '<em>Implicit Allocation</em>'.
- * @generated
- */
- ImplicitAllocation createImplicitAllocation();
-
- /**
- * Returns a new object of class '<em>Parse Tree Allocation</em>'.
- * <!-- begin-user-doc -->
- * <!-- end-user-doc -->
- * @return a new object of class '<em>Parse Tree Allocation</em>'.
- * @generated
- */
- ParseTreeAllocation createParseTreeAllocation();
-
- /**
- * Utility to create a parse tree allocation with an expression.
- *
- * @param expression
- * @return The new parse tree allocation.
- *
- * @since 1.0.0
- */
- ParseTreeAllocation createParseTreeAllocation(PTExpression expression);
-
- /**
- * Returns a new object of class '<em>PT Array Access</em>'.
- * <!-- begin-user-doc -->
- * <!-- end-user-doc -->
- * @return a new object of class '<em>PT Array Access</em>'.
- * @generated
- */
- PTArrayAccess createPTArrayAccess();
-
- /**
- * Utility to create a new array access with the array and indexes.
- *
- * @param array
- * @param indexes list of index expressions
- * @return The new array access.
- *
- * @since 1.0.0
- */
- PTArrayAccess createPTArrayAccess(PTExpression array, List indexes);
-
- /**
- * Returns a new object of class '<em>PT Array Creation</em>'.
- * <!-- begin-user-doc -->
- * <!-- end-user-doc -->
- * @return a new object of class '<em>PT Array Creation</em>'.
- * @generated
- */
- PTArrayCreation createPTArrayCreation();
-
- /**
- * Utility to create an array creation with the type, dimensions, and initializer.
- *
- * @param type The type, e.g. <code>java.lang.String</code>.
- * @param dimensions The dimension expressions, <code>null</code> if no dimension expressions.
- * @param initializer The initializer, <code>null</code> if no initializer.
- * @return The new array creation.
- *
- * @since 1.0.0
- */
- PTArrayCreation createPTArrayCreation(String type, List dimensions, PTArrayInitializer initializer);
-
- /**
- * Returns a new object of class '<em>PT Array Initializer</em>'.
- * <!-- begin-user-doc -->
- * <!-- end-user-doc -->
- * @return a new object of class '<em>PT Array Initializer</em>'.
- * @generated
- */
- PTArrayInitializer createPTArrayInitializer();
-
- /**
- * Utility to create an array initilizer with initialize expessions.
- * @param expressions The list of expressions, <code>null</code> if empty array initializer.
- * @return The new array initializer.
- *
- * @since 1.0.0
- */
- PTArrayInitializer createPTArrayInitializer(List expressions);
-
- /**
- * Returns a new object of class '<em>PT Boolean Literal</em>'.
- * <!-- begin-user-doc -->
- * <!-- end-user-doc -->
- * @return a new object of class '<em>PT Boolean Literal</em>'.
- * @generated
- */
- PTBooleanLiteral createPTBooleanLiteral();
-
- /**
- * Utility to create a boolean literal with a given value.
- * @param booleanValue
- * @return The new boolean literal.
- *
- * @since 1.0.0
- */
- PTBooleanLiteral createPTBooleanLiteral(boolean booleanValue);
-
- /**
- * Returns a new object of class '<em>PT Cast Expression</em>'.
- * <!-- begin-user-doc -->
- * <!-- end-user-doc -->
- * @return a new object of class '<em>PT Cast Expression</em>'.
- * @generated
- */
- PTCastExpression createPTCastExpression();
-
- /**
- * Utility to create a new cast expression.
- *
- * @param type The type of the expression, e.g. <code>short</code> or <code>java.lang.String</code>
- * @param expression The expression being cast.
- * @return The new cast expression.
- *
- * @since 1.0.0
- */
- PTCastExpression createPTCastExpression(String type, PTExpression expression);
-
- /**
- * Returns a new object of class '<em>PT Character Literal</em>'.
- * <!-- begin-user-doc -->
- * <!-- end-user-doc -->
- * @return a new object of class '<em>PT Character Literal</em>'.
- * @generated
- */
- PTCharacterLiteral createPTCharacterLiteral();
-
- /**
- * Utility to create a new character literal.
- * @param escapedValue The escaped value to use.
- * @return The new character literal.
- *
- * @since 1.0.0
- */
- PTCharacterLiteral createPTCharacterLiteral(String escapedValue);
-
- /**
- * Returns a new object of class '<em>PT Class Instance Creation</em>'.
- * <!-- begin-user-doc -->
- * <!-- end-user-doc -->
- * @return a new object of class '<em>PT Class Instance Creation</em>'.
- * @generated
- */
- PTClassInstanceCreation createPTClassInstanceCreation();
-
- /**
- * Utility to create a new class instance creation.
- *
- * @param type The type of the class, e.g. <code>java.lang.String</code>.
- * @param arguments The list of expressions for arguments, or <code>null</code> for no args.
- * @return The new class instance creation.
- *
- * @since 1.0.0
- */
- PTClassInstanceCreation createPTClassInstanceCreation(String type, List arguments);
-
- /**
- * Returns a new object of class '<em>PT Conditional Expression</em>'.
- * <!-- begin-user-doc -->
- * <!-- end-user-doc -->
- * @return a new object of class '<em>PT Conditional Expression</em>'.
- * @generated
- */
- PTConditionalExpression createPTConditionalExpression();
-
- /**
- * Utility to create a new conditional expression with the condition and true/false expressions.
- *
- * @param condition
- * @param trueExpressoin
- * @param falseExpression
- * @return
- *
- * @since 1.0.0
- */
- PTConditionalExpression createPTConditionalExpression(PTExpression condition, PTExpression trueExpressoin, PTExpression falseExpression);
-
- /**
- * Returns a new object of class '<em>PT Field Access</em>'.
- * <!-- begin-user-doc -->
- * <!-- end-user-doc -->
- * @return a new object of class '<em>PT Field Access</em>'.
- * @generated
- */
- PTFieldAccess createPTFieldAccess();
-
- /**
- * Utility to create a new field access with receiver and field name.
- * @param receiver The receiver expression, or <code>null</code> if none.
- * @param field The field name.
- * @return The new field access.
- *
- * @since 1.0.0
- */
- PTFieldAccess createPTFieldAccess(PTExpression receiver, String field);
-
- /**
- * Returns a new object of class '<em>PT Infix Expression</em>'.
- * <!-- begin-user-doc -->
- * <!-- end-user-doc -->
- * @return a new object of class '<em>PT Infix Expression</em>'.
- * @generated
- */
- PTInfixExpression createPTInfixExpression();
-
- /**
- * Utility to create a new infix expression with the left/right/extended operands and the operator.
- * @param leftOperand
- * @param operator
- * @param rightOperand
- * @param extendedOperands The list of extended operands, or <code>null</code> if no extended operands.
- * @return
- *
- * @since 1.0.0
- */
- PTInfixExpression createPTInfixExpression(PTExpression leftOperand, PTInfixOperator operator, PTExpression rightOperand, List extendedOperands);
-
- /**
- * Returns a new object of class '<em>PT Instanceof</em>'.
- * <!-- begin-user-doc -->
- * <!-- end-user-doc -->
- * @return a new object of class '<em>PT Instanceof</em>'.
- * @generated
- */
- PTInstanceof createPTInstanceof();
-
- /**
- * Utility to create a new instance of with an operand and a type.
- * @param operand
- * @param type
- * @return The new instance of.
- *
- * @since 1.0.0
- */
- PTInstanceof createPTInstanceof(PTExpression operand, String type);
-
- /**
- * Returns a new object of class '<em>PT Method Invocation</em>'.
- * <!-- begin-user-doc -->
- * <!-- end-user-doc -->
- * @return a new object of class '<em>PT Method Invocation</em>'.
- * @generated
- */
- PTMethodInvocation createPTMethodInvocation();
-
- /**
- * Utility to create a new method invocation with a receiver, name, and arguments.
- *
- * @param receiver The receiver expression, or <code>null</code> if no receiver.
- * @param name The name of the method.
- * @param arguments The list of argument expressions, or <code>null</code> if no arguments.
- * @return The new method invocation.
- *
- * @since 1.0.0
- */
- PTMethodInvocation createPTMethodInvocation(PTExpression receiver, String name, List arguments);
-
- /**
- * Returns a new object of class '<em>PT Name</em>'.
- * <!-- begin-user-doc -->
- * <!-- end-user-doc -->
- * @return a new object of class '<em>PT Name</em>'.
- * @generated
- */
- PTName createPTName();
-
- /**
- * Utility to create a new name with the name.
- *
- * @param name
- * @return The new name.
- *
- * @since 1.0.0
- */
- PTName createPTName(String name);
-
- /**
- * Returns a new object of class '<em>PT Null Literal</em>'.
- * <!-- begin-user-doc -->
- * <!-- end-user-doc -->
- * @return a new object of class '<em>PT Null Literal</em>'.
- * @generated
- */
- PTNullLiteral createPTNullLiteral();
-
- /**
- * Returns a new object of class '<em>PT Number Literal</em>'.
- * <!-- begin-user-doc -->
- * <!-- end-user-doc -->
- * @return a new object of class '<em>PT Number Literal</em>'.
- * @generated
- */
- PTNumberLiteral createPTNumberLiteral();
-
- /**
- * Utility to create a new number literal with the token.
- * @param token
- * @return The new number literal.
- *
- * @since 1.0.0
- */
- PTNumberLiteral createPTNumberLiteral(String token);
-
- /**
- * Returns a new object of class '<em>PT Parenthesized Expression</em>'.
- * <!-- begin-user-doc -->
- * <!-- end-user-doc -->
- * @return a new object of class '<em>PT Parenthesized Expression</em>'.
- * @generated
- */
- PTParenthesizedExpression createPTParenthesizedExpression();
-
- /**
- * Utility to create a new parenthesized expression with the expression.
- * @param expression The expression that is in the parenthesis.
- * @return The new parenthesized expression.
- *
- * @since 1.0.0
- */
- PTParenthesizedExpression createPTParenthesizedExpression(PTExpression expression);
-
- /**
- * Returns a new object of class '<em>PT Prefix Expression</em>'.
- * <!-- begin-user-doc -->
- * <!-- end-user-doc -->
- * @return a new object of class '<em>PT Prefix Expression</em>'.
- * @generated
- */
- PTPrefixExpression createPTPrefixExpression();
-
- /**
- * Utility to create a new prefix expression given an operator and expression.
- * @param operator
- * @param expression
- * @return The new prefix expression.
- *
- * @since 1.0.0
- */
- PTPrefixExpression createPTPrefixExpression(PTPrefixOperator operator, PTExpression expression);
-
- /**
- * Returns a new object of class '<em>PT String Literal</em>'.
- * <!-- begin-user-doc -->
- * <!-- end-user-doc -->
- * @return a new object of class '<em>PT String Literal</em>'.
- * @generated
- */
- PTStringLiteral createPTStringLiteral();
-
- /**
- * Utility to create a new string literal given the escaped literal string.
- * @param escapeLiteral
- * @return The new string literal.
- *
- * @since 1.0.0
- */
- PTStringLiteral createPTStringLiteral(String escapeLiteral);
-
- /**
- * Returns a new object of class '<em>PT This Literal</em>'.
- * <!-- begin-user-doc -->
- * <!-- end-user-doc -->
- * @return a new object of class '<em>PT This Literal</em>'.
- * @generated
- */
- PTThisLiteral createPTThisLiteral();
-
- /**
- * Returns a new object of class '<em>PT Type Literal</em>'.
- * <!-- begin-user-doc -->
- * <!-- end-user-doc -->
- * @return a new object of class '<em>PT Type Literal</em>'.
- * @generated
- */
- PTTypeLiteral createPTTypeLiteral();
-
- /**
- * Utility to create a new type literal given the type.
- * @param type
- * @return The new type literal.
- *
- * @since 1.0.0
- */
- PTTypeLiteral createPTTypeLiteral(String type);
-
- /**
- * Returns a new object of class '<em>PT Invalid Expression</em>'.
- * <!-- begin-user-doc -->
- * <!-- end-user-doc -->
- * @return a new object of class '<em>PT Invalid Expression</em>'.
- * @generated
- */
- PTInvalidExpression createPTInvalidExpression();
-
- /**
- * Returns a new object of class '<em>PT Instance Reference</em>'.
- * <!-- begin-user-doc -->
- * <!-- end-user-doc -->
- * @return a new object of class '<em>PT Instance Reference</em>'.
- * @generated
- */
- PTInstanceReference createPTInstanceReference();
-
- /**
- * Returns a new object of class '<em>PT Anonymous Class Declaration</em>'.
- * <!-- begin-user-doc -->
- * <!-- end-user-doc -->
- * @return a new object of class '<em>PT Anonymous Class Declaration</em>'.
- * @generated
- */
- PTAnonymousClassDeclaration createPTAnonymousClassDeclaration();
-
- /**
- * Utility to create a new PTInstanceReference with a reference.
- *
- * @param instance
- * @return a new object of class '<em>PT Instance Reference</em>'.
- *
- * @since 1.2.0
- */
- PTInstanceReference createPTInstanceReference(IJavaInstance instance);
-
- /**
- * Utility to create a new invalid expression with a message.
- * @param message
- * @return The new invalid expression.
- *
- * @since 1.0.0
- */
- PTInvalidExpression createPTInvalidExpression(String message);
-
- /**
- * Returns a new object of class '<em>Implicit Allocation</em>' as
- * utility with a given init string.
- * @param initString - String to put into initialization.
- * @return The allocation initialized.
- *
- * @since 1.0.0
- */
- InitStringAllocation createInitStringAllocation(String initString);
-
- /**
- * Returns a new object of class '<em>Implicit Allocation</em>' as
- * utility with a given parent and feature.
- * @param parent The source to get the value from.
- * @param sf The feature on the source for the value.
- * @return The allocation initialized.
- *
- * @since 1.0.0
- */
- ImplicitAllocation createImplicitAllocation(EObject parent, EStructuralFeature sf);
-
- /**
- * Returns the package supported by this factory.
- * <!-- begin-user-doc -->
- * <!-- end-user-doc -->
- * @return the package supported by this factory.
- * @generated
- */
- InstantiationPackage getInstantiationPackage();
-
-} //InstantiationFactory
diff --git a/plugins/org.eclipse.jem/javainst/org/eclipse/jem/internal/instantiation/InstantiationPackage.java b/plugins/org.eclipse.jem/javainst/org/eclipse/jem/internal/instantiation/InstantiationPackage.java
deleted file mode 100644
index 13e7435..0000000
--- a/plugins/org.eclipse.jem/javainst/org/eclipse/jem/internal/instantiation/InstantiationPackage.java
+++ /dev/null
@@ -1,1889 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2003, 2005 IBM Corporation and others.
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
- *
- * Contributors:
- * IBM Corporation - initial API and implementation
- *******************************************************************************/
-package org.eclipse.jem.internal.instantiation;
-/*
-
-
- */
-
-import org.eclipse.emf.ecore.EAttribute;
-import org.eclipse.emf.ecore.EClass;
-import org.eclipse.emf.ecore.EEnum;
-import org.eclipse.emf.ecore.EPackage;
-
-import org.eclipse.emf.ecore.EReference;
-
-/**
- * <!-- begin-user-doc -->
- * The <b>Package</b> for the model.
- * It contains accessors for the meta objects to represent
- * <ul>
- * <li>each class,</li>
- * <li>each feature of each class,</li>
- * <li>each enum,</li>
- * <li>and each data type</li>
- * </ul>
- * <!-- end-user-doc -->
- * <!-- begin-model-doc -->
- * Java Instantiation Package
- * <!-- end-model-doc -->
- * @see org.eclipse.jem.internal.instantiation.InstantiationFactory
- * @model kind="package"
- * @generated
- */
-public interface InstantiationPackage extends EPackage{
- /**
- * The package name.
- * <!-- begin-user-doc -->
- * <!-- end-user-doc -->
- * @generated
- */
- String eNAME = "instantiation"; //$NON-NLS-1$
-
- /**
- * The package namespace URI.
- * <!-- begin-user-doc -->
- * <!-- end-user-doc -->
- * @generated
- */
- String eNS_URI = "http:///org/eclipse/jem/internal/instantiation.ecore"; //$NON-NLS-1$
-
- /**
- * The package namespace name.
- * <!-- begin-user-doc -->
- * <!-- end-user-doc -->
- * @generated
- */
- String eNS_PREFIX = "org.eclipse.jem.internal.instantiation"; //$NON-NLS-1$
-
- /**
- * The singleton instance of the package.
- * <!-- begin-user-doc -->
- * <!-- end-user-doc -->
- * @generated
- */
- InstantiationPackage eINSTANCE = org.eclipse.jem.internal.instantiation.impl.InstantiationPackageImpl.init();
-
- /**
- * The meta object id for the '{@link org.eclipse.jem.internal.instantiation.base.IJavaInstance <em>IJava Instance</em>}' class.
- * <!-- begin-user-doc -->
- * <!-- end-user-doc -->
- * @see org.eclipse.jem.internal.instantiation.base.IJavaInstance
- * @see org.eclipse.jem.internal.instantiation.impl.InstantiationPackageImpl#getIJavaInstance()
- * @generated
- */
- int IJAVA_INSTANCE = 1;
-
- /**
- * The number of structural features of the the '<em>IJava Instance</em>' class.
- * <!-- begin-user-doc -->
- * <!-- end-user-doc -->
- * @generated
- * @ordered
- */
- int IJAVA_INSTANCE_FEATURE_COUNT = 0;
-
- /**
- * The meta object id for the '{@link org.eclipse.jem.internal.instantiation.base.IJavaObjectInstance <em>IJava Object Instance</em>}' class.
- * <!-- begin-user-doc -->
- * <!-- end-user-doc -->
- * @see org.eclipse.jem.internal.instantiation.base.IJavaObjectInstance
- * @see org.eclipse.jem.internal.instantiation.impl.InstantiationPackageImpl#getIJavaObjectInstance()
- * @generated
- */
- int IJAVA_OBJECT_INSTANCE = 2;
-
- /**
- * The meta object id for the '{@link org.eclipse.jem.internal.instantiation.base.IJavaDataTypeInstance <em>IJava Data Type Instance</em>}' class.
- * <!-- begin-user-doc -->
- * <!-- end-user-doc -->
- * @see org.eclipse.jem.internal.instantiation.base.IJavaDataTypeInstance
- * @see org.eclipse.jem.internal.instantiation.impl.InstantiationPackageImpl#getIJavaDataTypeInstance()
- * @generated
- */
- int IJAVA_DATA_TYPE_INSTANCE = 0;
-
-
- /**
- * The number of structural features of the the '<em>IJava Data Type Instance</em>' class.
- * <!-- begin-user-doc -->
- * <!-- end-user-doc -->
- * @generated
- * @ordered
- */
- int IJAVA_DATA_TYPE_INSTANCE_FEATURE_COUNT = IJAVA_INSTANCE_FEATURE_COUNT + 0;
-
- /**
- * The number of structural features of the the '<em>IJava Object Instance</em>' class.
- * <!-- begin-user-doc -->
- * <!-- end-user-doc -->
- * @generated
- * @ordered
- */
- int IJAVA_OBJECT_INSTANCE_FEATURE_COUNT = IJAVA_INSTANCE_FEATURE_COUNT + 0;
-
- /**
- * The meta object id for the '{@link org.eclipse.jem.internal.instantiation.impl.JavaAllocationImpl <em>Java Allocation</em>}' class.
- * <!-- begin-user-doc -->
- * <!-- end-user-doc -->
- * @see org.eclipse.jem.internal.instantiation.impl.JavaAllocationImpl
- * @see org.eclipse.jem.internal.instantiation.impl.InstantiationPackageImpl#getJavaAllocation()
- * @generated
- */
- int JAVA_ALLOCATION = 3;
-
- /**
- * The number of structural features of the the '<em>Java Allocation</em>' class.
- * <!-- begin-user-doc -->
- * <!-- end-user-doc -->
- * @generated
- * @ordered
- */
- int JAVA_ALLOCATION_FEATURE_COUNT = 0;
-
- /**
- * The meta object id for the '{@link org.eclipse.jem.internal.instantiation.impl.InitStringAllocationImpl <em>Init String Allocation</em>}' class.
- * <!-- begin-user-doc -->
- * <!-- end-user-doc -->
- * @see org.eclipse.jem.internal.instantiation.impl.InitStringAllocationImpl
- * @see org.eclipse.jem.internal.instantiation.impl.InstantiationPackageImpl#getInitStringAllocation()
- * @generated
- */
- int INIT_STRING_ALLOCATION = 4;
-
- /**
- * The feature id for the '<em><b>Init String</b></em>' attribute.
- * <!-- begin-user-doc -->
- * <!-- end-user-doc -->
- * @generated
- * @ordered
- */
- int INIT_STRING_ALLOCATION__INIT_STRING = JAVA_ALLOCATION_FEATURE_COUNT + 0;
-
- /**
- * The number of structural features of the the '<em>Init String Allocation</em>' class.
- * <!-- begin-user-doc -->
- * <!-- end-user-doc -->
- * @generated
- * @ordered
- */
- int INIT_STRING_ALLOCATION_FEATURE_COUNT = JAVA_ALLOCATION_FEATURE_COUNT + 1;
-
- /**
- * The meta object id for the '{@link org.eclipse.jem.internal.instantiation.impl.ImplicitAllocationImpl <em>Implicit Allocation</em>}' class.
- * <!-- begin-user-doc -->
- * <!-- end-user-doc -->
- * @see org.eclipse.jem.internal.instantiation.impl.ImplicitAllocationImpl
- * @see org.eclipse.jem.internal.instantiation.impl.InstantiationPackageImpl#getImplicitAllocation()
- * @generated
- */
- int IMPLICIT_ALLOCATION = 5;
-
- /**
- * The feature id for the '<em><b>Parent</b></em>' reference.
- * <!-- begin-user-doc -->
- * <!-- end-user-doc -->
- * @generated
- * @ordered
- */
- int IMPLICIT_ALLOCATION__PARENT = JAVA_ALLOCATION_FEATURE_COUNT + 0;
-
- /**
- * The feature id for the '<em><b>Feature</b></em>' reference.
- * <!-- begin-user-doc -->
- * <!-- end-user-doc -->
- * @generated
- * @ordered
- */
- int IMPLICIT_ALLOCATION__FEATURE = JAVA_ALLOCATION_FEATURE_COUNT + 1;
-
- /**
- * The number of structural features of the the '<em>Implicit Allocation</em>' class.
- * <!-- begin-user-doc -->
- * <!-- end-user-doc -->
- * @generated
- * @ordered
- */
- int IMPLICIT_ALLOCATION_FEATURE_COUNT = JAVA_ALLOCATION_FEATURE_COUNT + 2;
-
-
- /**
- * The meta object id for the '{@link org.eclipse.jem.internal.instantiation.impl.ParseTreeAllocationImpl <em>Parse Tree Allocation</em>}' class.
- * <!-- begin-user-doc -->
- * <!-- end-user-doc -->
- * @see org.eclipse.jem.internal.instantiation.impl.ParseTreeAllocationImpl
- * @see org.eclipse.jem.internal.instantiation.impl.InstantiationPackageImpl#getParseTreeAllocation()
- * @generated
- */
- int PARSE_TREE_ALLOCATION = 6;
-
- /**
- * The feature id for the '<em><b>Expression</b></em>' containment reference.
- * <!-- begin-user-doc -->
- * <!-- end-user-doc -->
- * @generated
- * @ordered
- */
- int PARSE_TREE_ALLOCATION__EXPRESSION = JAVA_ALLOCATION_FEATURE_COUNT + 0;
-
- /**
- * The number of structural features of the the '<em>Parse Tree Allocation</em>' class.
- * <!-- begin-user-doc -->
- * <!-- end-user-doc -->
- * @generated
- * @ordered
- */
- int PARSE_TREE_ALLOCATION_FEATURE_COUNT = JAVA_ALLOCATION_FEATURE_COUNT + 1;
-
- /**
- * The meta object id for the '{@link org.eclipse.jem.internal.instantiation.impl.PTExpressionImpl <em>PT Expression</em>}' class.
- * <!-- begin-user-doc -->
- * <!-- end-user-doc -->
- * @see org.eclipse.jem.internal.instantiation.impl.PTExpressionImpl
- * @see org.eclipse.jem.internal.instantiation.impl.InstantiationPackageImpl#getPTExpression()
- * @generated
- */
- int PT_EXPRESSION = 7;
-
- /**
- * The number of structural features of the the '<em>PT Expression</em>' class.
- * <!-- begin-user-doc -->
- * <!-- end-user-doc -->
- * @generated
- * @ordered
- */
- int PT_EXPRESSION_FEATURE_COUNT = 0;
-
- /**
- * The meta object id for the '{@link org.eclipse.jem.internal.instantiation.impl.PTArrayAccessImpl <em>PT Array Access</em>}' class.
- * <!-- begin-user-doc -->
- * <!-- end-user-doc -->
- * @see org.eclipse.jem.internal.instantiation.impl.PTArrayAccessImpl
- * @see org.eclipse.jem.internal.instantiation.impl.InstantiationPackageImpl#getPTArrayAccess()
- * @generated
- */
- int PT_ARRAY_ACCESS = 8;
-
- /**
- * The feature id for the '<em><b>Array</b></em>' containment reference.
- * <!-- begin-user-doc -->
- * <!-- end-user-doc -->
- * @generated
- * @ordered
- */
- int PT_ARRAY_ACCESS__ARRAY = PT_EXPRESSION_FEATURE_COUNT + 0;
-
- /**
- * The feature id for the '<em><b>Indexes</b></em>' containment reference list.
- * <!-- begin-user-doc -->
- * <!-- end-user-doc -->
- * @generated
- * @ordered
- */
- int PT_ARRAY_ACCESS__INDEXES = PT_EXPRESSION_FEATURE_COUNT + 1;
-
- /**
- * The number of structural features of the the '<em>PT Array Access</em>' class.
- * <!-- begin-user-doc -->
- * <!-- end-user-doc -->
- * @generated
- * @ordered
- */
- int PT_ARRAY_ACCESS_FEATURE_COUNT = PT_EXPRESSION_FEATURE_COUNT + 2;
-
- /**
- * The meta object id for the '{@link org.eclipse.jem.internal.instantiation.impl.PTArrayCreationImpl <em>PT Array Creation</em>}' class.
- * <!-- begin-user-doc -->
- * <!-- end-user-doc -->
- * @see org.eclipse.jem.internal.instantiation.impl.PTArrayCreationImpl
- * @see org.eclipse.jem.internal.instantiation.impl.InstantiationPackageImpl#getPTArrayCreation()
- * @generated
- */
- int PT_ARRAY_CREATION = 9;
-
- /**
- * The feature id for the '<em><b>Type</b></em>' attribute.
- * <!-- begin-user-doc -->
- * <!-- end-user-doc -->
- * @generated
- * @ordered
- */
- int PT_ARRAY_CREATION__TYPE = PT_EXPRESSION_FEATURE_COUNT + 0;
-
- /**
- * The feature id for the '<em><b>Dimensions</b></em>' containment reference list.
- * <!-- begin-user-doc -->
- * <!-- end-user-doc -->
- * @generated
- * @ordered
- */
- int PT_ARRAY_CREATION__DIMENSIONS = PT_EXPRESSION_FEATURE_COUNT + 1;
-
- /**
- * The feature id for the '<em><b>Initializer</b></em>' containment reference.
- * <!-- begin-user-doc -->
- * <!-- end-user-doc -->
- * @generated
- * @ordered
- */
- int PT_ARRAY_CREATION__INITIALIZER = PT_EXPRESSION_FEATURE_COUNT + 2;
-
- /**
- * The number of structural features of the the '<em>PT Array Creation</em>' class.
- * <!-- begin-user-doc -->
- * <!-- end-user-doc -->
- * @generated
- * @ordered
- */
- int PT_ARRAY_CREATION_FEATURE_COUNT = PT_EXPRESSION_FEATURE_COUNT + 3;
-
- /**
- * The meta object id for the '{@link org.eclipse.jem.internal.instantiation.impl.PTArrayInitializerImpl <em>PT Array Initializer</em>}' class.
- * <!-- begin-user-doc -->
- * <!-- end-user-doc -->
- * @see org.eclipse.jem.internal.instantiation.impl.PTArrayInitializerImpl
- * @see org.eclipse.jem.internal.instantiation.impl.InstantiationPackageImpl#getPTArrayInitializer()
- * @generated
- */
- int PT_ARRAY_INITIALIZER = 10;
-
- /**
- * The feature id for the '<em><b>Expressions</b></em>' containment reference list.
- * <!-- begin-user-doc -->
- * <!-- end-user-doc -->
- * @generated
- * @ordered
- */
- int PT_ARRAY_INITIALIZER__EXPRESSIONS = PT_EXPRESSION_FEATURE_COUNT + 0;
-
- /**
- * The number of structural features of the the '<em>PT Array Initializer</em>' class.
- * <!-- begin-user-doc -->
- * <!-- end-user-doc -->
- * @generated
- * @ordered
- */
- int PT_ARRAY_INITIALIZER_FEATURE_COUNT = PT_EXPRESSION_FEATURE_COUNT + 1;
-
- /**
- * The meta object id for the '{@link org.eclipse.jem.internal.instantiation.impl.PTBooleanLiteralImpl <em>PT Boolean Literal</em>}' class.
- * <!-- begin-user-doc -->
- * <!-- end-user-doc -->
- * @see org.eclipse.jem.internal.instantiation.impl.PTBooleanLiteralImpl
- * @see org.eclipse.jem.internal.instantiation.impl.InstantiationPackageImpl#getPTBooleanLiteral()
- * @generated
- */
- int PT_BOOLEAN_LITERAL = 11;
-
- /**
- * The feature id for the '<em><b>Boolean Value</b></em>' attribute.
- * <!-- begin-user-doc -->
- * <!-- end-user-doc -->
- * @generated
- * @ordered
- */
- int PT_BOOLEAN_LITERAL__BOOLEAN_VALUE = PT_EXPRESSION_FEATURE_COUNT + 0;
-
- /**
- * The number of structural features of the the '<em>PT Boolean Literal</em>' class.
- * <!-- begin-user-doc -->
- * <!-- end-user-doc -->
- * @generated
- * @ordered
- */
- int PT_BOOLEAN_LITERAL_FEATURE_COUNT = PT_EXPRESSION_FEATURE_COUNT + 1;
-
- /**
- * The meta object id for the '{@link org.eclipse.jem.internal.instantiation.impl.PTCastExpressionImpl <em>PT Cast Expression</em>}' class.
- * <!-- begin-user-doc -->
- * <!-- end-user-doc -->
- * @see org.eclipse.jem.internal.instantiation.impl.PTCastExpressionImpl
- * @see org.eclipse.jem.internal.instantiation.impl.InstantiationPackageImpl#getPTCastExpression()
- * @generated
- */
- int PT_CAST_EXPRESSION = 12;
-
- /**
- * The feature id for the '<em><b>Type</b></em>' attribute.
- * <!-- begin-user-doc -->
- * <!-- end-user-doc -->
- * @generated
- * @ordered
- */
- int PT_CAST_EXPRESSION__TYPE = PT_EXPRESSION_FEATURE_COUNT + 0;
-
- /**
- * The feature id for the '<em><b>Expression</b></em>' containment reference.
- * <!-- begin-user-doc -->
- * <!-- end-user-doc -->
- * @generated
- * @ordered
- */
- int PT_CAST_EXPRESSION__EXPRESSION = PT_EXPRESSION_FEATURE_COUNT + 1;
-
- /**
- * The number of structural features of the the '<em>PT Cast Expression</em>' class.
- * <!-- begin-user-doc -->
- * <!-- end-user-doc -->
- * @generated
- * @ordered
- */
- int PT_CAST_EXPRESSION_FEATURE_COUNT = PT_EXPRESSION_FEATURE_COUNT + 2;
-
- /**
- * The meta object id for the '{@link org.eclipse.jem.internal.instantiation.impl.PTCharacterLiteralImpl <em>PT Character Literal</em>}' class.
- * <!-- begin-user-doc -->
- * <!-- end-user-doc -->
- * @see org.eclipse.jem.internal.instantiation.impl.PTCharacterLiteralImpl
- * @see org.eclipse.jem.internal.instantiation.impl.InstantiationPackageImpl#getPTCharacterLiteral()
- * @generated
- */
- int PT_CHARACTER_LITERAL = 13;
-
- /**
- * The feature id for the '<em><b>Escaped Value</b></em>' attribute.
- * <!-- begin-user-doc -->
- * <!-- end-user-doc -->
- * @generated
- * @ordered
- */
- int PT_CHARACTER_LITERAL__ESCAPED_VALUE = PT_EXPRESSION_FEATURE_COUNT + 0;
-
- /**
- * The feature id for the '<em><b>Char Value</b></em>' attribute.
- * <!-- begin-user-doc -->
- * <!-- end-user-doc -->
- * @generated
- * @ordered
- */
- int PT_CHARACTER_LITERAL__CHAR_VALUE = PT_EXPRESSION_FEATURE_COUNT + 1;
-
- /**
- * The number of structural features of the the '<em>PT Character Literal</em>' class.
- * <!-- begin-user-doc -->
- * <!-- end-user-doc -->
- * @generated
- * @ordered
- */
- int PT_CHARACTER_LITERAL_FEATURE_COUNT = PT_EXPRESSION_FEATURE_COUNT + 2;
-
- /**
- * The meta object id for the '{@link org.eclipse.jem.internal.instantiation.impl.PTClassInstanceCreationImpl <em>PT Class Instance Creation</em>}' class.
- * <!-- begin-user-doc -->
- * <!-- end-user-doc -->
- * @see org.eclipse.jem.internal.instantiation.impl.PTClassInstanceCreationImpl
- * @see org.eclipse.jem.internal.instantiation.impl.InstantiationPackageImpl#getPTClassInstanceCreation()
- * @generated
- */
- int PT_CLASS_INSTANCE_CREATION = 14;
-
- /**
- * The feature id for the '<em><b>Type</b></em>' attribute.
- * <!-- begin-user-doc -->
- * <!-- end-user-doc -->
- * @generated
- * @ordered
- */
- int PT_CLASS_INSTANCE_CREATION__TYPE = PT_EXPRESSION_FEATURE_COUNT + 0;
-
- /**
- * The feature id for the '<em><b>Arguments</b></em>' containment reference list.
- * <!-- begin-user-doc -->
- * <!-- end-user-doc -->
- * @generated
- * @ordered
- */
- int PT_CLASS_INSTANCE_CREATION__ARGUMENTS = PT_EXPRESSION_FEATURE_COUNT + 1;
-
- /**
- * The number of structural features of the the '<em>PT Class Instance Creation</em>' class.
- * <!-- begin-user-doc -->
- * <!-- end-user-doc -->
- * @generated
- * @ordered
- */
- int PT_CLASS_INSTANCE_CREATION_FEATURE_COUNT = PT_EXPRESSION_FEATURE_COUNT + 2;
-
- /**
- * The meta object id for the '{@link org.eclipse.jem.internal.instantiation.impl.PTConditionalExpressionImpl <em>PT Conditional Expression</em>}' class.
- * <!-- begin-user-doc -->
- * <!-- end-user-doc -->
- * @see org.eclipse.jem.internal.instantiation.impl.PTConditionalExpressionImpl
- * @see org.eclipse.jem.internal.instantiation.impl.InstantiationPackageImpl#getPTConditionalExpression()
- * @generated
- */
- int PT_CONDITIONAL_EXPRESSION = 15;
-
- /**
- * The feature id for the '<em><b>Condition</b></em>' containment reference.
- * <!-- begin-user-doc -->
- * <!-- end-user-doc -->
- * @generated
- * @ordered
- */
- int PT_CONDITIONAL_EXPRESSION__CONDITION = PT_EXPRESSION_FEATURE_COUNT + 0;
-
- /**
- * The feature id for the '<em><b>True</b></em>' containment reference.
- * <!-- begin-user-doc -->
- * <!-- end-user-doc -->
- * @generated
- * @ordered
- */
- int PT_CONDITIONAL_EXPRESSION__TRUE = PT_EXPRESSION_FEATURE_COUNT + 1;
-
- /**
- * The feature id for the '<em><b>False</b></em>' containment reference.
- * <!-- begin-user-doc -->
- * <!-- end-user-doc -->
- * @generated
- * @ordered
- */
- int PT_CONDITIONAL_EXPRESSION__FALSE = PT_EXPRESSION_FEATURE_COUNT + 2;
-
- /**
- * The number of structural features of the the '<em>PT Conditional Expression</em>' class.
- * <!-- begin-user-doc -->
- * <!-- end-user-doc -->
- * @generated
- * @ordered
- */
- int PT_CONDITIONAL_EXPRESSION_FEATURE_COUNT = PT_EXPRESSION_FEATURE_COUNT + 3;
-
- /**
- * The meta object id for the '{@link org.eclipse.jem.internal.instantiation.impl.PTFieldAccessImpl <em>PT Field Access</em>}' class.
- * <!-- begin-user-doc -->
- * <!-- end-user-doc -->
- * @see org.eclipse.jem.internal.instantiation.impl.PTFieldAccessImpl
- * @see org.eclipse.jem.internal.instantiation.impl.InstantiationPackageImpl#getPTFieldAccess()
- * @generated
- */
- int PT_FIELD_ACCESS = 16;
-
- /**
- * The feature id for the '<em><b>Receiver</b></em>' containment reference.
- * <!-- begin-user-doc -->
- * <!-- end-user-doc -->
- * @generated
- * @ordered
- */
- int PT_FIELD_ACCESS__RECEIVER = PT_EXPRESSION_FEATURE_COUNT + 0;
-
- /**
- * The feature id for the '<em><b>Field</b></em>' attribute.
- * <!-- begin-user-doc -->
- * <!-- end-user-doc -->
- * @generated
- * @ordered
- */
- int PT_FIELD_ACCESS__FIELD = PT_EXPRESSION_FEATURE_COUNT + 1;
-
- /**
- * The number of structural features of the the '<em>PT Field Access</em>' class.
- * <!-- begin-user-doc -->
- * <!-- end-user-doc -->
- * @generated
- * @ordered
- */
- int PT_FIELD_ACCESS_FEATURE_COUNT = PT_EXPRESSION_FEATURE_COUNT + 2;
-
- /**
- * The meta object id for the '{@link org.eclipse.jem.internal.instantiation.impl.PTInfixExpressionImpl <em>PT Infix Expression</em>}' class.
- * <!-- begin-user-doc -->
- * <!-- end-user-doc -->
- * @see org.eclipse.jem.internal.instantiation.impl.PTInfixExpressionImpl
- * @see org.eclipse.jem.internal.instantiation.impl.InstantiationPackageImpl#getPTInfixExpression()
- * @generated
- */
- int PT_INFIX_EXPRESSION = 17;
-
- /**
- * The feature id for the '<em><b>Left Operand</b></em>' containment reference.
- * <!-- begin-user-doc -->
- * <!-- end-user-doc -->
- * @generated
- * @ordered
- */
- int PT_INFIX_EXPRESSION__LEFT_OPERAND = PT_EXPRESSION_FEATURE_COUNT + 0;
-
- /**
- * The feature id for the '<em><b>Operator</b></em>' attribute.
- * <!-- begin-user-doc -->
- * <!-- end-user-doc -->
- * @generated
- * @ordered
- */
- int PT_INFIX_EXPRESSION__OPERATOR = PT_EXPRESSION_FEATURE_COUNT + 1;
-
- /**
- * The feature id for the '<em><b>Right Operand</b></em>' containment reference.
- * <!-- begin-user-doc -->
- * <!-- end-user-doc -->
- * @generated
- * @ordered
- */
- int PT_INFIX_EXPRESSION__RIGHT_OPERAND = PT_EXPRESSION_FEATURE_COUNT + 2;
-
- /**
- * The feature id for the '<em><b>Extended Operands</b></em>' containment reference list.
- * <!-- begin-user-doc -->
- * <!-- end-user-doc -->
- * @generated
- * @ordered
- */
- int PT_INFIX_EXPRESSION__EXTENDED_OPERANDS = PT_EXPRESSION_FEATURE_COUNT + 3;
-
- /**
- * The number of structural features of the the '<em>PT Infix Expression</em>' class.
- * <!-- begin-user-doc -->
- * <!-- end-user-doc -->
- * @generated
- * @ordered
- */
- int PT_INFIX_EXPRESSION_FEATURE_COUNT = PT_EXPRESSION_FEATURE_COUNT + 4;
-
- /**
- * The meta object id for the '{@link org.eclipse.jem.internal.instantiation.impl.PTInstanceofImpl <em>PT Instanceof</em>}' class.
- * <!-- begin-user-doc -->
- * <!-- end-user-doc -->
- * @see org.eclipse.jem.internal.instantiation.impl.PTInstanceofImpl
- * @see org.eclipse.jem.internal.instantiation.impl.InstantiationPackageImpl#getPTInstanceof()
- * @generated
- */
- int PT_INSTANCEOF = 18;
-
- /**
- * The feature id for the '<em><b>Operand</b></em>' containment reference.
- * <!-- begin-user-doc -->
- * <!-- end-user-doc -->
- * @generated
- * @ordered
- */
- int PT_INSTANCEOF__OPERAND = PT_EXPRESSION_FEATURE_COUNT + 0;
-
- /**
- * The feature id for the '<em><b>Type</b></em>' attribute.
- * <!-- begin-user-doc -->
- * <!-- end-user-doc -->
- * @generated
- * @ordered
- */
- int PT_INSTANCEOF__TYPE = PT_EXPRESSION_FEATURE_COUNT + 1;
-
- /**
- * The number of structural features of the the '<em>PT Instanceof</em>' class.
- * <!-- begin-user-doc -->
- * <!-- end-user-doc -->
- * @generated
- * @ordered
- */
- int PT_INSTANCEOF_FEATURE_COUNT = PT_EXPRESSION_FEATURE_COUNT + 2;
-
- /**
- * The meta object id for the '{@link org.eclipse.jem.internal.instantiation.impl.PTMethodInvocationImpl <em>PT Method Invocation</em>}' class.
- * <!-- begin-user-doc -->
- * <!-- end-user-doc -->
- * @see org.eclipse.jem.internal.instantiation.impl.PTMethodInvocationImpl
- * @see org.eclipse.jem.internal.instantiation.impl.InstantiationPackageImpl#getPTMethodInvocation()
- * @generated
- */
- int PT_METHOD_INVOCATION = 19;
-
- /**
- * The feature id for the '<em><b>Receiver</b></em>' containment reference.
- * <!-- begin-user-doc -->
- * <!-- end-user-doc -->
- * @generated
- * @ordered
- */
- int PT_METHOD_INVOCATION__RECEIVER = PT_EXPRESSION_FEATURE_COUNT + 0;
-
- /**
- * The feature id for the '<em><b>Name</b></em>' attribute.
- * <!-- begin-user-doc -->
- * <!-- end-user-doc -->
- * @generated
- * @ordered
- */
- int PT_METHOD_INVOCATION__NAME = PT_EXPRESSION_FEATURE_COUNT + 1;
-
- /**
- * The feature id for the '<em><b>Arguments</b></em>' containment reference list.
- * <!-- begin-user-doc -->
- * <!-- end-user-doc -->
- * @generated
- * @ordered
- */
- int PT_METHOD_INVOCATION__ARGUMENTS = PT_EXPRESSION_FEATURE_COUNT + 2;
-
- /**
- * The number of structural features of the the '<em>PT Method Invocation</em>' class.
- * <!-- begin-user-doc -->
- * <!-- end-user-doc -->
- * @generated
- * @ordered
- */
- int PT_METHOD_INVOCATION_FEATURE_COUNT = PT_EXPRESSION_FEATURE_COUNT + 3;
-
- /**
- * The meta object id for the '{@link org.eclipse.jem.internal.instantiation.impl.PTNameImpl <em>PT Name</em>}' class.
- * <!-- begin-user-doc -->
- * <!-- end-user-doc -->
- * @see org.eclipse.jem.internal.instantiation.impl.PTNameImpl
- * @see org.eclipse.jem.internal.instantiation.impl.InstantiationPackageImpl#getPTName()
- * @generated
- */
- int PT_NAME = 20;
-
- /**
- * The feature id for the '<em><b>Name</b></em>' attribute.
- * <!-- begin-user-doc -->
- * <!-- end-user-doc -->
- * @generated
- * @ordered
- */
- int PT_NAME__NAME = PT_EXPRESSION_FEATURE_COUNT + 0;
-
- /**
- * The number of structural features of the the '<em>PT Name</em>' class.
- * <!-- begin-user-doc -->
- * <!-- end-user-doc -->
- * @generated
- * @ordered
- */
- int PT_NAME_FEATURE_COUNT = PT_EXPRESSION_FEATURE_COUNT + 1;
-
- /**
- * The meta object id for the '{@link org.eclipse.jem.internal.instantiation.impl.PTNullLiteralImpl <em>PT Null Literal</em>}' class.
- * <!-- begin-user-doc -->
- * <!-- end-user-doc -->
- * @see org.eclipse.jem.internal.instantiation.impl.PTNullLiteralImpl
- * @see org.eclipse.jem.internal.instantiation.impl.InstantiationPackageImpl#getPTNullLiteral()
- * @generated
- */
- int PT_NULL_LITERAL = 21;
-
- /**
- * The number of structural features of the the '<em>PT Null Literal</em>' class.
- * <!-- begin-user-doc -->
- * <!-- end-user-doc -->
- * @generated
- * @ordered
- */
- int PT_NULL_LITERAL_FEATURE_COUNT = PT_EXPRESSION_FEATURE_COUNT + 0;
-
- /**
- * The meta object id for the '{@link org.eclipse.jem.internal.instantiation.impl.PTNumberLiteralImpl <em>PT Number Literal</em>}' class.
- * <!-- begin-user-doc -->
- * <!-- end-user-doc -->
- * @see org.eclipse.jem.internal.instantiation.impl.PTNumberLiteralImpl
- * @see org.eclipse.jem.internal.instantiation.impl.InstantiationPackageImpl#getPTNumberLiteral()
- * @generated
- */
- int PT_NUMBER_LITERAL = 22;
-
- /**
- * The feature id for the '<em><b>Token</b></em>' attribute.
- * <!-- begin-user-doc -->
- * <!-- end-user-doc -->
- * @generated
- * @ordered
- */
- int PT_NUMBER_LITERAL__TOKEN = PT_EXPRESSION_FEATURE_COUNT + 0;
-
- /**
- * The number of structural features of the the '<em>PT Number Literal</em>' class.
- * <!-- begin-user-doc -->
- * <!-- end-user-doc -->
- * @generated
- * @ordered
- */
- int PT_NUMBER_LITERAL_FEATURE_COUNT = PT_EXPRESSION_FEATURE_COUNT + 1;
-
- /**
- * The meta object id for the '{@link org.eclipse.jem.internal.instantiation.impl.PTParenthesizedExpressionImpl <em>PT Parenthesized Expression</em>}' class.
- * <!-- begin-user-doc -->
- * <!-- end-user-doc -->
- * @see org.eclipse.jem.internal.instantiation.impl.PTParenthesizedExpressionImpl
- * @see org.eclipse.jem.internal.instantiation.impl.InstantiationPackageImpl#getPTParenthesizedExpression()
- * @generated
- */
- int PT_PARENTHESIZED_EXPRESSION = 23;
-
- /**
- * The feature id for the '<em><b>Expression</b></em>' containment reference.
- * <!-- begin-user-doc -->
- * <!-- end-user-doc -->
- * @generated
- * @ordered
- */
- int PT_PARENTHESIZED_EXPRESSION__EXPRESSION = PT_EXPRESSION_FEATURE_COUNT + 0;
-
- /**
- * The number of structural features of the the '<em>PT Parenthesized Expression</em>' class.
- * <!-- begin-user-doc -->
- * <!-- end-user-doc -->
- * @generated
- * @ordered
- */
- int PT_PARENTHESIZED_EXPRESSION_FEATURE_COUNT = PT_EXPRESSION_FEATURE_COUNT + 1;
-
- /**
- * The meta object id for the '{@link org.eclipse.jem.internal.instantiation.impl.PTPrefixExpressionImpl <em>PT Prefix Expression</em>}' class.
- * <!-- begin-user-doc -->
- * <!-- end-user-doc -->
- * @see org.eclipse.jem.internal.instantiation.impl.PTPrefixExpressionImpl
- * @see org.eclipse.jem.internal.instantiation.impl.InstantiationPackageImpl#getPTPrefixExpression()
- * @generated
- */
- int PT_PREFIX_EXPRESSION = 24;
-
- /**
- * The feature id for the '<em><b>Operator</b></em>' attribute.
- * <!-- begin-user-doc -->
- * <!-- end-user-doc -->
- * @generated
- * @ordered
- */
- int PT_PREFIX_EXPRESSION__OPERATOR = PT_EXPRESSION_FEATURE_COUNT + 0;
-
- /**
- * The feature id for the '<em><b>Expression</b></em>' containment reference.
- * <!-- begin-user-doc -->
- * <!-- end-user-doc -->
- * @generated
- * @ordered
- */
- int PT_PREFIX_EXPRESSION__EXPRESSION = PT_EXPRESSION_FEATURE_COUNT + 1;
-
- /**
- * The number of structural features of the the '<em>PT Prefix Expression</em>' class.
- * <!-- begin-user-doc -->
- * <!-- end-user-doc -->
- * @generated
- * @ordered
- */
- int PT_PREFIX_EXPRESSION_FEATURE_COUNT = PT_EXPRESSION_FEATURE_COUNT + 2;
-
- /**
- * The meta object id for the '{@link org.eclipse.jem.internal.instantiation.impl.PTStringLiteralImpl <em>PT String Literal</em>}' class.
- * <!-- begin-user-doc -->
- * <!-- end-user-doc -->
- * @see org.eclipse.jem.internal.instantiation.impl.PTStringLiteralImpl
- * @see org.eclipse.jem.internal.instantiation.impl.InstantiationPackageImpl#getPTStringLiteral()
- * @generated
- */
- int PT_STRING_LITERAL = 25;
-
- /**
- * The feature id for the '<em><b>Escaped Value</b></em>' attribute.
- * <!-- begin-user-doc -->
- * <!-- end-user-doc -->
- * @generated
- * @ordered
- */
- int PT_STRING_LITERAL__ESCAPED_VALUE = PT_EXPRESSION_FEATURE_COUNT + 0;
-
- /**
- * The feature id for the '<em><b>Literal Value</b></em>' attribute.
- * <!-- begin-user-doc -->
- * <!-- end-user-doc -->
- * @generated
- * @ordered
- */
- int PT_STRING_LITERAL__LITERAL_VALUE = PT_EXPRESSION_FEATURE_COUNT + 1;
-
- /**
- * The number of structural features of the the '<em>PT String Literal</em>' class.
- * <!-- begin-user-doc -->
- * <!-- end-user-doc -->
- * @generated
- * @ordered
- */
- int PT_STRING_LITERAL_FEATURE_COUNT = PT_EXPRESSION_FEATURE_COUNT + 2;
-
- /**
- * The meta object id for the '{@link org.eclipse.jem.internal.instantiation.impl.PTThisLiteralImpl <em>PT This Literal</em>}' class.
- * <!-- begin-user-doc -->
- * <!-- end-user-doc -->
- * @see org.eclipse.jem.internal.instantiation.impl.PTThisLiteralImpl
- * @see org.eclipse.jem.internal.instantiation.impl.InstantiationPackageImpl#getPTThisLiteral()
- * @generated
- */
- int PT_THIS_LITERAL = 26;
-
- /**
- * The number of structural features of the the '<em>PT This Literal</em>' class.
- * <!-- begin-user-doc -->
- * <!-- end-user-doc -->
- * @generated
- * @ordered
- */
- int PT_THIS_LITERAL_FEATURE_COUNT = PT_EXPRESSION_FEATURE_COUNT + 0;
-
- /**
- * The meta object id for the '{@link org.eclipse.jem.internal.instantiation.impl.PTTypeLiteralImpl <em>PT Type Literal</em>}' class.
- * <!-- begin-user-doc -->
- * <!-- end-user-doc -->
- * @see org.eclipse.jem.internal.instantiation.impl.PTTypeLiteralImpl
- * @see org.eclipse.jem.internal.instantiation.impl.InstantiationPackageImpl#getPTTypeLiteral()
- * @generated
- */
- int PT_TYPE_LITERAL = 27;
-
- /**
- * The feature id for the '<em><b>Type</b></em>' attribute.
- * <!-- begin-user-doc -->
- * <!-- end-user-doc -->
- * @generated
- * @ordered
- */
- int PT_TYPE_LITERAL__TYPE = PT_EXPRESSION_FEATURE_COUNT + 0;
-
- /**
- * The number of structural features of the the '<em>PT Type Literal</em>' class.
- * <!-- begin-user-doc -->
- * <!-- end-user-doc -->
- * @generated
- * @ordered
- */
- int PT_TYPE_LITERAL_FEATURE_COUNT = PT_EXPRESSION_FEATURE_COUNT + 1;
-
- /**
- * The meta object id for the '{@link org.eclipse.jem.internal.instantiation.impl.PTInvalidExpressionImpl <em>PT Invalid Expression</em>}' class.
- * <!-- begin-user-doc -->
- * <!-- end-user-doc -->
- * @see org.eclipse.jem.internal.instantiation.impl.PTInvalidExpressionImpl
- * @see org.eclipse.jem.internal.instantiation.impl.InstantiationPackageImpl#getPTInvalidExpression()
- * @generated
- */
- int PT_INVALID_EXPRESSION = 28;
-
- /**
- * The feature id for the '<em><b>Message</b></em>' attribute.
- * <!-- begin-user-doc -->
- * <!-- end-user-doc -->
- * @generated
- * @ordered
- */
- int PT_INVALID_EXPRESSION__MESSAGE = PT_EXPRESSION_FEATURE_COUNT + 0;
-
- /**
- * The number of structural features of the the '<em>PT Invalid Expression</em>' class.
- * <!-- begin-user-doc -->
- * <!-- end-user-doc -->
- * @generated
- * @ordered
- */
- int PT_INVALID_EXPRESSION_FEATURE_COUNT = PT_EXPRESSION_FEATURE_COUNT + 1;
-
- /**
- * The meta object id for the '{@link org.eclipse.jem.internal.instantiation.impl.PTInstanceReferenceImpl <em>PT Instance Reference</em>}' class.
- * <!-- begin-user-doc -->
- * <!-- end-user-doc -->
- * @see org.eclipse.jem.internal.instantiation.impl.PTInstanceReferenceImpl
- * @see org.eclipse.jem.internal.instantiation.impl.InstantiationPackageImpl#getPTInstanceReference()
- * @generated
- */
- int PT_INSTANCE_REFERENCE = 29;
-
- /**
- * The feature id for the '<em><b>Reference</b></em>' reference.
- * <!-- begin-user-doc -->
- * <!-- end-user-doc -->
- * @generated
- * @ordered
- */
- int PT_INSTANCE_REFERENCE__REFERENCE = PT_EXPRESSION_FEATURE_COUNT + 0;
-
- /**
- * The number of structural features of the the '<em>PT Instance Reference</em>' class.
- * <!-- begin-user-doc -->
- * <!-- end-user-doc -->
- * @generated
- * @ordered
- */
- int PT_INSTANCE_REFERENCE_FEATURE_COUNT = PT_EXPRESSION_FEATURE_COUNT + 1;
-
- /**
- * The meta object id for the '{@link org.eclipse.jem.internal.instantiation.impl.PTAnonymousClassDeclarationImpl <em>PT Anonymous Class Declaration</em>}' class.
- * <!-- begin-user-doc -->
- * <!-- end-user-doc -->
- * @see org.eclipse.jem.internal.instantiation.impl.PTAnonymousClassDeclarationImpl
- * @see org.eclipse.jem.internal.instantiation.impl.InstantiationPackageImpl#getPTAnonymousClassDeclaration()
- * @generated
- */
- int PT_ANONYMOUS_CLASS_DECLARATION = 30;
-
- /**
- * The feature id for the '<em><b>Declaration</b></em>' attribute.
- * <!-- begin-user-doc -->
- * <!-- end-user-doc -->
- * @generated
- * @ordered
- */
- int PT_ANONYMOUS_CLASS_DECLARATION__DECLARATION = PT_EXPRESSION_FEATURE_COUNT + 0;
-
- /**
- * The feature id for the '<em><b>Imports</b></em>' attribute list.
- * <!-- begin-user-doc -->
- * <!-- end-user-doc -->
- * @generated
- * @ordered
- */
- int PT_ANONYMOUS_CLASS_DECLARATION__IMPORTS = PT_EXPRESSION_FEATURE_COUNT + 1;
-
- /**
- * The number of structural features of the the '<em>PT Anonymous Class Declaration</em>' class.
- * <!-- begin-user-doc -->
- * <!-- end-user-doc -->
- * @generated
- * @ordered
- */
- int PT_ANONYMOUS_CLASS_DECLARATION_FEATURE_COUNT = PT_EXPRESSION_FEATURE_COUNT + 2;
-
- /**
- * The meta object id for the '{@link org.eclipse.jem.internal.instantiation.PTInfixOperator <em>PT Infix Operator</em>}' enum.
- * <!-- begin-user-doc -->
- * <!-- end-user-doc -->
- * @see org.eclipse.jem.internal.instantiation.PTInfixOperator
- * @see org.eclipse.jem.internal.instantiation.impl.InstantiationPackageImpl#getPTInfixOperator()
- * @generated
- */
- int PT_INFIX_OPERATOR = 31;
-
- /**
- * The meta object id for the '{@link org.eclipse.jem.internal.instantiation.PTPrefixOperator <em>PT Prefix Operator</em>}' enum.
- * <!-- begin-user-doc -->
- * <!-- end-user-doc -->
- * @see org.eclipse.jem.internal.instantiation.PTPrefixOperator
- * @see org.eclipse.jem.internal.instantiation.impl.InstantiationPackageImpl#getPTPrefixOperator()
- * @generated
- */
- int PT_PREFIX_OPERATOR = 32;
-
-
- /**
- * Returns the meta object for class '{@link org.eclipse.jem.internal.instantiation.base.IJavaObjectInstance <em>IJava Object Instance</em>}'.
- * <!-- begin-user-doc -->
- * <!-- end-user-doc -->
- * @return the meta object for class '<em>IJava Object Instance</em>'.
- * @see org.eclipse.jem.internal.instantiation.base.IJavaObjectInstance
- * @model instanceClass="org.eclipse.jem.internal.instantiation.base.IJavaObjectInstance"
- * @generated
- */
- EClass getIJavaObjectInstance();
-
- /**
- * Returns the meta object for class '{@link org.eclipse.jem.internal.instantiation.JavaAllocation <em>Java Allocation</em>}'.
- * <!-- begin-user-doc -->
- * <!-- end-user-doc -->
- * @return the meta object for class '<em>Java Allocation</em>'.
- * @see org.eclipse.jem.internal.instantiation.JavaAllocation
- * @generated
- */
- EClass getJavaAllocation();
-
- /**
- * Returns the meta object for class '{@link org.eclipse.jem.internal.instantiation.InitStringAllocation <em>Init String Allocation</em>}'.
- * <!-- begin-user-doc -->
- * <!-- end-user-doc -->
- * @return the meta object for class '<em>Init String Allocation</em>'.
- * @see org.eclipse.jem.internal.instantiation.InitStringAllocation
- * @generated
- */
- EClass getInitStringAllocation();
-
- /**
- * Returns the meta object for the attribute '{@link org.eclipse.jem.internal.instantiation.InitStringAllocation#getInitString <em>Init String</em>}'.
- * <!-- begin-user-doc -->
- * <!-- end-user-doc -->
- * @return the meta object for the attribute '<em>Init String</em>'.
- * @see org.eclipse.jem.internal.instantiation.InitStringAllocation#getInitString()
- * @see #getInitStringAllocation()
- * @generated
- */
- EAttribute getInitStringAllocation_InitString();
-
- /**
- * Returns the meta object for class '{@link org.eclipse.jem.internal.instantiation.ImplicitAllocation <em>Implicit Allocation</em>}'.
- * <!-- begin-user-doc -->
- * <!-- end-user-doc -->
- * @return the meta object for class '<em>Implicit Allocation</em>'.
- * @see org.eclipse.jem.internal.instantiation.ImplicitAllocation
- * @generated
- */
- EClass getImplicitAllocation();
-
- /**
- * Returns the meta object for the reference '{@link org.eclipse.jem.internal.instantiation.ImplicitAllocation#getParent <em>Parent</em>}'.
- * <!-- begin-user-doc -->
- * <!-- end-user-doc -->
- * @return the meta object for the reference '<em>Parent</em>'.
- * @see org.eclipse.jem.internal.instantiation.ImplicitAllocation#getParent()
- * @see #getImplicitAllocation()
- * @generated
- */
- EReference getImplicitAllocation_Parent();
-
- /**
- * Returns the meta object for the reference '{@link org.eclipse.jem.internal.instantiation.ImplicitAllocation#getFeature <em>Feature</em>}'.
- * <!-- begin-user-doc -->
- * <!-- end-user-doc -->
- * @return the meta object for the reference '<em>Feature</em>'.
- * @see org.eclipse.jem.internal.instantiation.ImplicitAllocation#getFeature()
- * @see #getImplicitAllocation()
- * @generated
- */
- EReference getImplicitAllocation_Feature();
-
- /**
- * Returns the meta object for class '{@link org.eclipse.jem.internal.instantiation.ParseTreeAllocation <em>Parse Tree Allocation</em>}'.
- * <!-- begin-user-doc -->
- * <!-- end-user-doc -->
- * @return the meta object for class '<em>Parse Tree Allocation</em>'.
- * @see org.eclipse.jem.internal.instantiation.ParseTreeAllocation
- * @generated
- */
- EClass getParseTreeAllocation();
-
- /**
- * Returns the meta object for the containment reference '{@link org.eclipse.jem.internal.instantiation.ParseTreeAllocation#getExpression <em>Expression</em>}'.
- * <!-- begin-user-doc -->
- * <!-- end-user-doc -->
- * @return the meta object for the containment reference '<em>Expression</em>'.
- * @see org.eclipse.jem.internal.instantiation.ParseTreeAllocation#getExpression()
- * @see #getParseTreeAllocation()
- * @generated
- */
- EReference getParseTreeAllocation_Expression();
-
- /**
- * Returns the meta object for class '{@link org.eclipse.jem.internal.instantiation.PTExpression <em>PT Expression</em>}'.
- * <!-- begin-user-doc -->
- * <!-- end-user-doc -->
- * @return the meta object for class '<em>PT Expression</em>'.
- * @see org.eclipse.jem.internal.instantiation.PTExpression
- * @generated
- */
- EClass getPTExpression();
-
- /**
- * Returns the meta object for class '{@link org.eclipse.jem.internal.instantiation.PTArrayAccess <em>PT Array Access</em>}'.
- * <!-- begin-user-doc -->
- * <!-- end-user-doc -->
- * @return the meta object for class '<em>PT Array Access</em>'.
- * @see org.eclipse.jem.internal.instantiation.PTArrayAccess
- * @generated
- */
- EClass getPTArrayAccess();
-
- /**
- * Returns the meta object for the containment reference '{@link org.eclipse.jem.internal.instantiation.PTArrayAccess#getArray <em>Array</em>}'.
- * <!-- begin-user-doc -->
- * <!-- end-user-doc -->
- * @return the meta object for the containment reference '<em>Array</em>'.
- * @see org.eclipse.jem.internal.instantiation.PTArrayAccess#getArray()
- * @see #getPTArrayAccess()
- * @generated
- */
- EReference getPTArrayAccess_Array();
-
- /**
- * Returns the meta object for the containment reference list '{@link org.eclipse.jem.internal.instantiation.PTArrayAccess#getIndexes <em>Indexes</em>}'.
- * <!-- begin-user-doc -->
- * <!-- end-user-doc -->
- * @return the meta object for the containment reference list '<em>Indexes</em>'.
- * @see org.eclipse.jem.internal.instantiation.PTArrayAccess#getIndexes()
- * @see #getPTArrayAccess()
- * @generated
- */
- EReference getPTArrayAccess_Indexes();
-
- /**
- * Returns the meta object for class '{@link org.eclipse.jem.internal.instantiation.PTArrayCreation <em>PT Array Creation</em>}'.
- * <!-- begin-user-doc -->
- * <!-- end-user-doc -->
- * @return the meta object for class '<em>PT Array Creation</em>'.
- * @see org.eclipse.jem.internal.instantiation.PTArrayCreation
- * @generated
- */
- EClass getPTArrayCreation();
-
- /**
- * Returns the meta object for the attribute '{@link org.eclipse.jem.internal.instantiation.PTArrayCreation#getType <em>Type</em>}'.
- * <!-- begin-user-doc -->
- * <!-- end-user-doc -->
- * @return the meta object for the attribute '<em>Type</em>'.
- * @see org.eclipse.jem.internal.instantiation.PTArrayCreation#getType()
- * @see #getPTArrayCreation()
- * @generated
- */
- EAttribute getPTArrayCreation_Type();
-
- /**
- * Returns the meta object for the containment reference list '{@link org.eclipse.jem.internal.instantiation.PTArrayCreation#getDimensions <em>Dimensions</em>}'.
- * <!-- begin-user-doc -->
- * <!-- end-user-doc -->
- * @return the meta object for the containment reference list '<em>Dimensions</em>'.
- * @see org.eclipse.jem.internal.instantiation.PTArrayCreation#getDimensions()
- * @see #getPTArrayCreation()
- * @generated
- */
- EReference getPTArrayCreation_Dimensions();
-
- /**
- * Returns the meta object for the containment reference '{@link org.eclipse.jem.internal.instantiation.PTArrayCreation#getInitializer <em>Initializer</em>}'.
- * <!-- begin-user-doc -->
- * <!-- end-user-doc -->
- * @return the meta object for the containment reference '<em>Initializer</em>'.
- * @see org.eclipse.jem.internal.instantiation.PTArrayCreation#getInitializer()
- * @see #getPTArrayCreation()
- * @generated
- */
- EReference getPTArrayCreation_Initializer();
-
- /**
- * Returns the meta object for class '{@link org.eclipse.jem.internal.instantiation.PTArrayInitializer <em>PT Array Initializer</em>}'.
- * <!-- begin-user-doc -->
- * <!-- end-user-doc -->
- * @return the meta object for class '<em>PT Array Initializer</em>'.
- * @see org.eclipse.jem.internal.instantiation.PTArrayInitializer
- * @generated
- */
- EClass getPTArrayInitializer();
-
- /**
- * Returns the meta object for the containment reference list '{@link org.eclipse.jem.internal.instantiation.PTArrayInitializer#getExpressions <em>Expressions</em>}'.
- * <!-- begin-user-doc -->
- * <!-- end-user-doc -->
- * @return the meta object for the containment reference list '<em>Expressions</em>'.
- * @see org.eclipse.jem.internal.instantiation.PTArrayInitializer#getExpressions()
- * @see #getPTArrayInitializer()
- * @generated
- */
- EReference getPTArrayInitializer_Expressions();
-
- /**
- * Returns the meta object for class '{@link org.eclipse.jem.internal.instantiation.PTBooleanLiteral <em>PT Boolean Literal</em>}'.
- * <!-- begin-user-doc -->
- * <!-- end-user-doc -->
- * @return the meta object for class '<em>PT Boolean Literal</em>'.
- * @see org.eclipse.jem.internal.instantiation.PTBooleanLiteral
- * @generated
- */
- EClass getPTBooleanLiteral();
-
- /**
- * Returns the meta object for the attribute '{@link org.eclipse.jem.internal.instantiation.PTBooleanLiteral#isBooleanValue <em>Boolean Value</em>}'.
- * <!-- begin-user-doc -->
- * <!-- end-user-doc -->
- * @return the meta object for the attribute '<em>Boolean Value</em>'.
- * @see org.eclipse.jem.internal.instantiation.PTBooleanLiteral#isBooleanValue()
- * @see #getPTBooleanLiteral()
- * @generated
- */
- EAttribute getPTBooleanLiteral_BooleanValue();
-
- /**
- * Returns the meta object for class '{@link org.eclipse.jem.internal.instantiation.PTCastExpression <em>PT Cast Expression</em>}'.
- * <!-- begin-user-doc -->
- * <!-- end-user-doc -->
- * @return the meta object for class '<em>PT Cast Expression</em>'.
- * @see org.eclipse.jem.internal.instantiation.PTCastExpression
- * @generated
- */
- EClass getPTCastExpression();
-
- /**
- * Returns the meta object for the attribute '{@link org.eclipse.jem.internal.instantiation.PTCastExpression#getType <em>Type</em>}'.
- * <!-- begin-user-doc -->
- * <!-- end-user-doc -->
- * @return the meta object for the attribute '<em>Type</em>'.
- * @see org.eclipse.jem.internal.instantiation.PTCastExpression#getType()
- * @see #getPTCastExpression()
- * @generated
- */
- EAttribute getPTCastExpression_Type();
-
- /**
- * Returns the meta object for the containment reference '{@link org.eclipse.jem.internal.instantiation.PTCastExpression#getExpression <em>Expression</em>}'.
- * <!-- begin-user-doc -->
- * <!-- end-user-doc -->
- * @return the meta object for the containment reference '<em>Expression</em>'.
- * @see org.eclipse.jem.internal.instantiation.PTCastExpression#getExpression()
- * @see #getPTCastExpression()
- * @generated
- */
- EReference getPTCastExpression_Expression();
-
- /**
- * Returns the meta object for class '{@link org.eclipse.jem.internal.instantiation.PTCharacterLiteral <em>PT Character Literal</em>}'.
- * <!-- begin-user-doc -->
- * <!-- end-user-doc -->
- * @return the meta object for class '<em>PT Character Literal</em>'.
- * @see org.eclipse.jem.internal.instantiation.PTCharacterLiteral
- * @generated
- */
- EClass getPTCharacterLiteral();
-
- /**
- * Returns the meta object for the attribute '{@link org.eclipse.jem.internal.instantiation.PTCharacterLiteral#getEscapedValue <em>Escaped Value</em>}'.
- * <!-- begin-user-doc -->
- * <!-- end-user-doc -->
- * @return the meta object for the attribute '<em>Escaped Value</em>'.
- * @see org.eclipse.jem.internal.instantiation.PTCharacterLiteral#getEscapedValue()
- * @see #getPTCharacterLiteral()
- * @generated
- */
- EAttribute getPTCharacterLiteral_EscapedValue();
-
- /**
- * Returns the meta object for the attribute '{@link org.eclipse.jem.internal.instantiation.PTCharacterLiteral#getCharValue <em>Char Value</em>}'.
- * <!-- begin-user-doc -->
- * <!-- end-user-doc -->
- * @return the meta object for the attribute '<em>Char Value</em>'.
- * @see org.eclipse.jem.internal.instantiation.PTCharacterLiteral#getCharValue()
- * @see #getPTCharacterLiteral()
- * @generated
- */
- EAttribute getPTCharacterLiteral_CharValue();
-
- /**
- * Returns the meta object for class '{@link org.eclipse.jem.internal.instantiation.PTClassInstanceCreation <em>PT Class Instance Creation</em>}'.
- * <!-- begin-user-doc -->
- * <!-- end-user-doc -->
- * @return the meta object for class '<em>PT Class Instance Creation</em>'.
- * @see org.eclipse.jem.internal.instantiation.PTClassInstanceCreation
- * @generated
- */
- EClass getPTClassInstanceCreation();
-
- /**
- * Returns the meta object for the attribute '{@link org.eclipse.jem.internal.instantiation.PTClassInstanceCreation#getType <em>Type</em>}'.
- * <!-- begin-user-doc -->
- * <!-- end-user-doc -->
- * @return the meta object for the attribute '<em>Type</em>'.
- * @see org.eclipse.jem.internal.instantiation.PTClassInstanceCreation#getType()
- * @see #getPTClassInstanceCreation()
- * @generated
- */
- EAttribute getPTClassInstanceCreation_Type();
-
- /**
- * Returns the meta object for the containment reference list '{@link org.eclipse.jem.internal.instantiation.PTClassInstanceCreation#getArguments <em>Arguments</em>}'.
- * <!-- begin-user-doc -->
- * <!-- end-user-doc -->
- * @return the meta object for the containment reference list '<em>Arguments</em>'.
- * @see org.eclipse.jem.internal.instantiation.PTClassInstanceCreation#getArguments()
- * @see #getPTClassInstanceCreation()
- * @generated
- */
- EReference getPTClassInstanceCreation_Arguments();
-
- /**
- * Returns the meta object for class '{@link org.eclipse.jem.internal.instantiation.PTConditionalExpression <em>PT Conditional Expression</em>}'.
- * <!-- begin-user-doc -->
- * <!-- end-user-doc -->
- * @return the meta object for class '<em>PT Conditional Expression</em>'.
- * @see org.eclipse.jem.internal.instantiation.PTConditionalExpression
- * @generated
- */
- EClass getPTConditionalExpression();
-
- /**
- * Returns the meta object for the containment reference '{@link org.eclipse.jem.internal.instantiation.PTConditionalExpression#getCondition <em>Condition</em>}'.
- * <!-- begin-user-doc -->
- * <!-- end-user-doc -->
- * @return the meta object for the containment reference '<em>Condition</em>'.
- * @see org.eclipse.jem.internal.instantiation.PTConditionalExpression#getCondition()
- * @see #getPTConditionalExpression()
- * @generated
- */
- EReference getPTConditionalExpression_Condition();
-
- /**
- * Returns the meta object for the containment reference '{@link org.eclipse.jem.internal.instantiation.PTConditionalExpression#getTrue <em>True</em>}'.
- * <!-- begin-user-doc -->
- * <!-- end-user-doc -->
- * @return the meta object for the containment reference '<em>True</em>'.
- * @see org.eclipse.jem.internal.instantiation.PTConditionalExpression#getTrue()
- * @see #getPTConditionalExpression()
- * @generated
- */
- EReference getPTConditionalExpression_True();
-
- /**
- * Returns the meta object for the containment reference '{@link org.eclipse.jem.internal.instantiation.PTConditionalExpression#getFalse <em>False</em>}'.
- * <!-- begin-user-doc -->
- * <!-- end-user-doc -->
- * @return the meta object for the containment reference '<em>False</em>'.
- * @see org.eclipse.jem.internal.instantiation.PTConditionalExpression#getFalse()
- * @see #getPTConditionalExpression()
- * @generated
- */
- EReference getPTConditionalExpression_False();
-
- /**
- * Returns the meta object for class '{@link org.eclipse.jem.internal.instantiation.PTFieldAccess <em>PT Field Access</em>}'.
- * <!-- begin-user-doc -->
- * <!-- end-user-doc -->
- * @return the meta object for class '<em>PT Field Access</em>'.
- * @see org.eclipse.jem.internal.instantiation.PTFieldAccess
- * @generated
- */
- EClass getPTFieldAccess();
-
- /**
- * Returns the meta object for the containment reference '{@link org.eclipse.jem.internal.instantiation.PTFieldAccess#getReceiver <em>Receiver</em>}'.
- * <!-- begin-user-doc -->
- * <!-- end-user-doc -->
- * @return the meta object for the containment reference '<em>Receiver</em>'.
- * @see org.eclipse.jem.internal.instantiation.PTFieldAccess#getReceiver()
- * @see #getPTFieldAccess()
- * @generated
- */
- EReference getPTFieldAccess_Receiver();
-
- /**
- * Returns the meta object for the attribute '{@link org.eclipse.jem.internal.instantiation.PTFieldAccess#getField <em>Field</em>}'.
- * <!-- begin-user-doc -->
- * <!-- end-user-doc -->
- * @return the meta object for the attribute '<em>Field</em>'.
- * @see org.eclipse.jem.internal.instantiation.PTFieldAccess#getField()
- * @see #getPTFieldAccess()
- * @generated
- */
- EAttribute getPTFieldAccess_Field();
-
- /**
- * Returns the meta object for class '{@link org.eclipse.jem.internal.instantiation.PTInfixExpression <em>PT Infix Expression</em>}'.
- * <!-- begin-user-doc -->
- * <!-- end-user-doc -->
- * @return the meta object for class '<em>PT Infix Expression</em>'.
- * @see org.eclipse.jem.internal.instantiation.PTInfixExpression
- * @generated
- */
- EClass getPTInfixExpression();
-
- /**
- * Returns the meta object for the containment reference '{@link org.eclipse.jem.internal.instantiation.PTInfixExpression#getLeftOperand <em>Left Operand</em>}'.
- * <!-- begin-user-doc -->
- * <!-- end-user-doc -->
- * @return the meta object for the containment reference '<em>Left Operand</em>'.
- * @see org.eclipse.jem.internal.instantiation.PTInfixExpression#getLeftOperand()
- * @see #getPTInfixExpression()
- * @generated
- */
- EReference getPTInfixExpression_LeftOperand();
-
- /**
- * Returns the meta object for the attribute '{@link org.eclipse.jem.internal.instantiation.PTInfixExpression#getOperator <em>Operator</em>}'.
- * <!-- begin-user-doc -->
- * <!-- end-user-doc -->
- * @return the meta object for the attribute '<em>Operator</em>'.
- * @see org.eclipse.jem.internal.instantiation.PTInfixExpression#getOperator()
- * @see #getPTInfixExpression()
- * @generated
- */
- EAttribute getPTInfixExpression_Operator();
-
- /**
- * Returns the meta object for the containment reference '{@link org.eclipse.jem.internal.instantiation.PTInfixExpression#getRightOperand <em>Right Operand</em>}'.
- * <!-- begin-user-doc -->
- * <!-- end-user-doc -->
- * @return the meta object for the containment reference '<em>Right Operand</em>'.
- * @see org.eclipse.jem.internal.instantiation.PTInfixExpression#getRightOperand()
- * @see #getPTInfixExpression()
- * @generated
- */
- EReference getPTInfixExpression_RightOperand();
-
- /**
- * Returns the meta object for the containment reference list '{@link org.eclipse.jem.internal.instantiation.PTInfixExpression#getExtendedOperands <em>Extended Operands</em>}'.
- * <!-- begin-user-doc -->
- * <!-- end-user-doc -->
- * @return the meta object for the containment reference list '<em>Extended Operands</em>'.
- * @see org.eclipse.jem.internal.instantiation.PTInfixExpression#getExtendedOperands()
- * @see #getPTInfixExpression()
- * @generated
- */
- EReference getPTInfixExpression_ExtendedOperands();
-
- /**
- * Returns the meta object for class '{@link org.eclipse.jem.internal.instantiation.PTInstanceof <em>PT Instanceof</em>}'.
- * <!-- begin-user-doc -->
- * <!-- end-user-doc -->
- * @return the meta object for class '<em>PT Instanceof</em>'.
- * @see org.eclipse.jem.internal.instantiation.PTInstanceof
- * @generated
- */
- EClass getPTInstanceof();
-
- /**
- * Returns the meta object for the containment reference '{@link org.eclipse.jem.internal.instantiation.PTInstanceof#getOperand <em>Operand</em>}'.
- * <!-- begin-user-doc -->
- * <!-- end-user-doc -->
- * @return the meta object for the containment reference '<em>Operand</em>'.
- * @see org.eclipse.jem.internal.instantiation.PTInstanceof#getOperand()
- * @see #getPTInstanceof()
- * @generated
- */
- EReference getPTInstanceof_Operand();
-
- /**
- * Returns the meta object for the attribute '{@link org.eclipse.jem.internal.instantiation.PTInstanceof#getType <em>Type</em>}'.
- * <!-- begin-user-doc -->
- * <!-- end-user-doc -->
- * @return the meta object for the attribute '<em>Type</em>'.
- * @see org.eclipse.jem.internal.instantiation.PTInstanceof#getType()
- * @see #getPTInstanceof()
- * @generated
- */
- EAttribute getPTInstanceof_Type();
-
- /**
- * Returns the meta object for class '{@link org.eclipse.jem.internal.instantiation.PTMethodInvocation <em>PT Method Invocation</em>}'.
- * <!-- begin-user-doc -->
- * <!-- end-user-doc -->
- * @return the meta object for class '<em>PT Method Invocation</em>'.
- * @see org.eclipse.jem.internal.instantiation.PTMethodInvocation
- * @generated
- */
- EClass getPTMethodInvocation();
-
- /**
- * Returns the meta object for the containment reference '{@link org.eclipse.jem.internal.instantiation.PTMethodInvocation#getReceiver <em>Receiver</em>}'.
- * <!-- begin-user-doc -->
- * <!-- end-user-doc -->
- * @return the meta object for the containment reference '<em>Receiver</em>'.
- * @see org.eclipse.jem.internal.instantiation.PTMethodInvocation#getReceiver()
- * @see #getPTMethodInvocation()
- * @generated
- */
- EReference getPTMethodInvocation_Receiver();
-
- /**
- * Returns the meta object for the attribute '{@link org.eclipse.jem.internal.instantiation.PTMethodInvocation#getName <em>Name</em>}'.
- * <!-- begin-user-doc -->
- * <!-- end-user-doc -->
- * @return the meta object for the attribute '<em>Name</em>'.
- * @see org.eclipse.jem.internal.instantiation.PTMethodInvocation#getName()
- * @see #getPTMethodInvocation()
- * @generated
- */
- EAttribute getPTMethodInvocation_Name();
-
- /**
- * Returns the meta object for the containment reference list '{@link org.eclipse.jem.internal.instantiation.PTMethodInvocation#getArguments <em>Arguments</em>}'.
- * <!-- begin-user-doc -->
- * <!-- end-user-doc -->
- * @return the meta object for the containment reference list '<em>Arguments</em>'.
- * @see org.eclipse.jem.internal.instantiation.PTMethodInvocation#getArguments()
- * @see #getPTMethodInvocation()
- * @generated
- */
- EReference getPTMethodInvocation_Arguments();
-
- /**
- * Returns the meta object for class '{@link org.eclipse.jem.internal.instantiation.PTName <em>PT Name</em>}'.
- * <!-- begin-user-doc -->
- * <!-- end-user-doc -->
- * @return the meta object for class '<em>PT Name</em>'.
- * @see org.eclipse.jem.internal.instantiation.PTName
- * @generated
- */
- EClass getPTName();
-
- /**
- * Returns the meta object for the attribute '{@link org.eclipse.jem.internal.instantiation.PTName#getName <em>Name</em>}'.
- * <!-- begin-user-doc -->
- * <!-- end-user-doc -->
- * @return the meta object for the attribute '<em>Name</em>'.
- * @see org.eclipse.jem.internal.instantiation.PTName#getName()
- * @see #getPTName()
- * @generated
- */
- EAttribute getPTName_Name();
-
- /**
- * Returns the meta object for class '{@link org.eclipse.jem.internal.instantiation.PTNullLiteral <em>PT Null Literal</em>}'.
- * <!-- begin-user-doc -->
- * <!-- end-user-doc -->
- * @return the meta object for class '<em>PT Null Literal</em>'.
- * @see org.eclipse.jem.internal.instantiation.PTNullLiteral
- * @generated
- */
- EClass getPTNullLiteral();
-
- /**
- * Returns the meta object for class '{@link org.eclipse.jem.internal.instantiation.PTNumberLiteral <em>PT Number Literal</em>}'.
- * <!-- begin-user-doc -->
- * <!-- end-user-doc -->
- * @return the meta object for class '<em>PT Number Literal</em>'.
- * @see org.eclipse.jem.internal.instantiation.PTNumberLiteral
- * @generated
- */
- EClass getPTNumberLiteral();
-
- /**
- * Returns the meta object for the attribute '{@link org.eclipse.jem.internal.instantiation.PTNumberLiteral#getToken <em>Token</em>}'.
- * <!-- begin-user-doc -->
- * <!-- end-user-doc -->
- * @return the meta object for the attribute '<em>Token</em>'.
- * @see org.eclipse.jem.internal.instantiation.PTNumberLiteral#getToken()
- * @see #getPTNumberLiteral()
- * @generated
- */
- EAttribute getPTNumberLiteral_Token();
-
- /**
- * Returns the meta object for class '{@link org.eclipse.jem.internal.instantiation.PTParenthesizedExpression <em>PT Parenthesized Expression</em>}'.
- * <!-- begin-user-doc -->
- * <!-- end-user-doc -->
- * @return the meta object for class '<em>PT Parenthesized Expression</em>'.
- * @see org.eclipse.jem.internal.instantiation.PTParenthesizedExpression
- * @generated
- */
- EClass getPTParenthesizedExpression();
-
- /**
- * Returns the meta object for the containment reference '{@link org.eclipse.jem.internal.instantiation.PTParenthesizedExpression#getExpression <em>Expression</em>}'.
- * <!-- begin-user-doc -->
- * <!-- end-user-doc -->
- * @return the meta object for the containment reference '<em>Expression</em>'.
- * @see org.eclipse.jem.internal.instantiation.PTParenthesizedExpression#getExpression()
- * @see #getPTParenthesizedExpression()
- * @generated
- */
- EReference getPTParenthesizedExpression_Expression();
-
- /**
- * Returns the meta object for class '{@link org.eclipse.jem.internal.instantiation.PTPrefixExpression <em>PT Prefix Expression</em>}'.
- * <!-- begin-user-doc -->
- * <!-- end-user-doc -->
- * @return the meta object for class '<em>PT Prefix Expression</em>'.
- * @see org.eclipse.jem.internal.instantiation.PTPrefixExpression
- * @generated
- */
- EClass getPTPrefixExpression();
-
- /**
- * Returns the meta object for the attribute '{@link org.eclipse.jem.internal.instantiation.PTPrefixExpression#getOperator <em>Operator</em>}'.
- * <!-- begin-user-doc -->
- * <!-- end-user-doc -->
- * @return the meta object for the attribute '<em>Operator</em>'.
- * @see org.eclipse.jem.internal.instantiation.PTPrefixExpression#getOperator()
- * @see #getPTPrefixExpression()
- * @generated
- */
- EAttribute getPTPrefixExpression_Operator();
-
- /**
- * Returns the meta object for the containment reference '{@link org.eclipse.jem.internal.instantiation.PTPrefixExpression#getExpression <em>Expression</em>}'.
- * <!-- begin-user-doc -->
- * <!-- end-user-doc -->
- * @return the meta object for the containment reference '<em>Expression</em>'.
- * @see org.eclipse.jem.internal.instantiation.PTPrefixExpression#getExpression()
- * @see #getPTPrefixExpression()
- * @generated
- */
- EReference getPTPrefixExpression_Expression();
-
- /**
- * Returns the meta object for class '{@link org.eclipse.jem.internal.instantiation.PTStringLiteral <em>PT String Literal</em>}'.
- * <!-- begin-user-doc -->
- * <!-- end-user-doc -->
- * @return the meta object for class '<em>PT String Literal</em>'.
- * @see org.eclipse.jem.internal.instantiation.PTStringLiteral
- * @generated
- */
- EClass getPTStringLiteral();
-
- /**
- * Returns the meta object for the attribute '{@link org.eclipse.jem.internal.instantiation.PTStringLiteral#getEscapedValue <em>Escaped Value</em>}'.
- * <!-- begin-user-doc -->
- * <!-- end-user-doc -->
- * @return the meta object for the attribute '<em>Escaped Value</em>'.
- * @see org.eclipse.jem.internal.instantiation.PTStringLiteral#getEscapedValue()
- * @see #getPTStringLiteral()
- * @generated
- */
- EAttribute getPTStringLiteral_EscapedValue();
-
- /**
- * Returns the meta object for the attribute '{@link org.eclipse.jem.internal.instantiation.PTStringLiteral#getLiteralValue <em>Literal Value</em>}'.
- * <!-- begin-user-doc -->
- * <!-- end-user-doc -->
- * @return the meta object for the attribute '<em>Literal Value</em>'.
- * @see org.eclipse.jem.internal.instantiation.PTStringLiteral#getLiteralValue()
- * @see #getPTStringLiteral()
- * @generated
- */
- EAttribute getPTStringLiteral_LiteralValue();
-
- /**
- * Returns the meta object for class '{@link org.eclipse.jem.internal.instantiation.PTThisLiteral <em>PT This Literal</em>}'.
- * <!-- begin-user-doc -->
- * <!-- end-user-doc -->
- * @return the meta object for class '<em>PT This Literal</em>'.
- * @see org.eclipse.jem.internal.instantiation.PTThisLiteral
- * @generated
- */
- EClass getPTThisLiteral();
-
- /**
- * Returns the meta object for class '{@link org.eclipse.jem.internal.instantiation.PTTypeLiteral <em>PT Type Literal</em>}'.
- * <!-- begin-user-doc -->
- * <!-- end-user-doc -->
- * @return the meta object for class '<em>PT Type Literal</em>'.
- * @see org.eclipse.jem.internal.instantiation.PTTypeLiteral
- * @generated
- */
- EClass getPTTypeLiteral();
-
- /**
- * Returns the meta object for the attribute '{@link org.eclipse.jem.internal.instantiation.PTTypeLiteral#getType <em>Type</em>}'.
- * <!-- begin-user-doc -->
- * <!-- end-user-doc -->
- * @return the meta object for the attribute '<em>Type</em>'.
- * @see org.eclipse.jem.internal.instantiation.PTTypeLiteral#getType()
- * @see #getPTTypeLiteral()
- * @generated
- */
- EAttribute getPTTypeLiteral_Type();
-
- /**
- * Returns the meta object for class '{@link org.eclipse.jem.internal.instantiation.PTInvalidExpression <em>PT Invalid Expression</em>}'.
- * <!-- begin-user-doc -->
- * <!-- end-user-doc -->
- * @return the meta object for class '<em>PT Invalid Expression</em>'.
- * @see org.eclipse.jem.internal.instantiation.PTInvalidExpression
- * @generated
- */
- EClass getPTInvalidExpression();
-
- /**
- * Returns the meta object for the attribute '{@link org.eclipse.jem.internal.instantiation.PTInvalidExpression#getMessage <em>Message</em>}'.
- * <!-- begin-user-doc -->
- * <!-- end-user-doc -->
- * @return the meta object for the attribute '<em>Message</em>'.
- * @see org.eclipse.jem.internal.instantiation.PTInvalidExpression#getMessage()
- * @see #getPTInvalidExpression()
- * @generated
- */
- EAttribute getPTInvalidExpression_Message();
-
- /**
- * Returns the meta object for class '{@link org.eclipse.jem.internal.instantiation.PTInstanceReference <em>PT Instance Reference</em>}'.
- * <!-- begin-user-doc -->
- * <!-- end-user-doc -->
- * @return the meta object for class '<em>PT Instance Reference</em>'.
- * @see org.eclipse.jem.internal.instantiation.PTInstanceReference
- * @generated
- */
- EClass getPTInstanceReference();
-
- /**
- * Returns the meta object for the reference '{@link org.eclipse.jem.internal.instantiation.PTInstanceReference#getReference <em>Reference</em>}'.
- * <!-- begin-user-doc -->
- * <!-- end-user-doc -->
- * @return the meta object for the reference '<em>Reference</em>'.
- * @see org.eclipse.jem.internal.instantiation.PTInstanceReference#getReference()
- * @see #getPTInstanceReference()
- * @generated
- */
- EReference getPTInstanceReference_Reference();
-
- /**
- * Returns the meta object for class '{@link org.eclipse.jem.internal.instantiation.PTAnonymousClassDeclaration <em>PT Anonymous Class Declaration</em>}'.
- * <!-- begin-user-doc -->
- * <!-- end-user-doc -->
- * @return the meta object for class '<em>PT Anonymous Class Declaration</em>'.
- * @see org.eclipse.jem.internal.instantiation.PTAnonymousClassDeclaration
- * @generated
- */
- EClass getPTAnonymousClassDeclaration();
-
- /**
- * Returns the meta object for the attribute '{@link org.eclipse.jem.internal.instantiation.PTAnonymousClassDeclaration#getDeclaration <em>Declaration</em>}'.
- * <!-- begin-user-doc -->
- * <!-- end-user-doc -->
- * @return the meta object for the attribute '<em>Declaration</em>'.
- * @see org.eclipse.jem.internal.instantiation.PTAnonymousClassDeclaration#getDeclaration()
- * @see #getPTAnonymousClassDeclaration()
- * @generated
- */
- EAttribute getPTAnonymousClassDeclaration_Declaration();
-
- /**
- * Returns the meta object for the attribute list '{@link org.eclipse.jem.internal.instantiation.PTAnonymousClassDeclaration#getImports <em>Imports</em>}'.
- * <!-- begin-user-doc -->
- * <!-- end-user-doc -->
- * @return the meta object for the attribute list '<em>Imports</em>'.
- * @see org.eclipse.jem.internal.instantiation.PTAnonymousClassDeclaration#getImports()
- * @see #getPTAnonymousClassDeclaration()
- * @generated
- */
- EAttribute getPTAnonymousClassDeclaration_Imports();
-
- /**
- * Returns the meta object for enum '{@link org.eclipse.jem.internal.instantiation.PTInfixOperator <em>PT Infix Operator</em>}'.
- * <!-- begin-user-doc -->
- * <!-- end-user-doc -->
- * @return the meta object for enum '<em>PT Infix Operator</em>'.
- * @see org.eclipse.jem.internal.instantiation.PTInfixOperator
- * @generated
- */
- EEnum getPTInfixOperator();
-
- /**
- * Returns the meta object for enum '{@link org.eclipse.jem.internal.instantiation.PTPrefixOperator <em>PT Prefix Operator</em>}'.
- * <!-- begin-user-doc -->
- * <!-- end-user-doc -->
- * @return the meta object for enum '<em>PT Prefix Operator</em>'.
- * @see org.eclipse.jem.internal.instantiation.PTPrefixOperator
- * @generated
- */
- EEnum getPTPrefixOperator();
-
- /**
- * Returns the meta object for class '{@link org.eclipse.jem.internal.instantiation.base.IJavaDataTypeInstance <em>IJava Data Type Instance</em>}'.
- * <!-- begin-user-doc -->
- * <!-- end-user-doc -->
- * @return the meta object for class '<em>IJava Data Type Instance</em>'.
- * @see org.eclipse.jem.internal.instantiation.base.IJavaDataTypeInstance
- * @model instanceClass="org.eclipse.jem.internal.instantiation.base.IJavaDataTypeInstance"
- * @generated
- */
- EClass getIJavaDataTypeInstance();
-
- /**
- * Returns the meta object for class '{@link org.eclipse.jem.internal.instantiation.base.IJavaInstance <em>IJava Instance</em>}'.
- * <!-- begin-user-doc -->
- * <!-- end-user-doc -->
- * @return the meta object for class '<em>IJava Instance</em>'.
- * @see org.eclipse.jem.internal.instantiation.base.IJavaInstance
- * @model instanceClass="org.eclipse.jem.internal.instantiation.base.IJavaInstance"
- * @generated
- */
- EClass getIJavaInstance();
-
- /**
- * Returns the factory that creates the instances of the model.
- * <!-- begin-user-doc -->
- * <!-- end-user-doc -->
- * @return the factory that creates the instances of the model.
- * @generated
- */
- InstantiationFactory getInstantiationFactory();
-
-} //InstantiationPackage
diff --git a/plugins/org.eclipse.jem/javainst/org/eclipse/jem/internal/instantiation/JavaAllocation.java b/plugins/org.eclipse.jem/javainst/org/eclipse/jem/internal/instantiation/JavaAllocation.java
deleted file mode 100644
index 9ee658b..0000000
--- a/plugins/org.eclipse.jem/javainst/org/eclipse/jem/internal/instantiation/JavaAllocation.java
+++ /dev/null
@@ -1,54 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2003, 2005 IBM Corporation and others.
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
- *
- * Contributors:
- * IBM Corporation - initial API and implementation
- *******************************************************************************/
-package org.eclipse.jem.internal.instantiation;
-/*
-
-
- */
-
-import org.eclipse.emf.ecore.EObject;
-
-/**
- * <!-- begin-user-doc -->
- * A representation of the model object '<em><b>Java Allocation</b></em>'.
- * <p>
- * This class is the abstract base class of the allocation class. It is the value of the "allocation" property on a Java Object so that the actual allocation can be controlled. For example, there could be one for just init string, or one for serialized.
- * </p>
- * @since 1.0.0
- * <!-- end-user-doc -->
- *
- * <!-- begin-model-doc -->
- * This class is the abstract base class of the allocation class. It is the value of the "allocation" property on a Java Object so that the actual allocation can be controlled. For example, there could be one for just init string, or one for serialized.
- * <!-- end-model-doc -->
- *
- *
- * @see org.eclipse.jem.internal.instantiation.InstantiationPackage#getJavaAllocation()
- * @model abstract="true"
- * @generated
- */
-public interface JavaAllocation extends EObject{
-
- /**
- * Answer whether the allocation is a parse tree allocation.
- * @return <code>true</code> if parse tree allocation
- *
- * @since 1.2.0
- */
- public boolean isParseTree();
-
- /**
- * Answer whether the allocation is an implicit allocation.
- * @return <code>true</code> if implicit allocation
- *
- * @since 1.2.0
- */
- public boolean isImplicit();
-} // JavaAllocation
diff --git a/plugins/org.eclipse.jem/javainst/org/eclipse/jem/internal/instantiation/PTAnonymousClassDeclaration.java b/plugins/org.eclipse.jem/javainst/org/eclipse/jem/internal/instantiation/PTAnonymousClassDeclaration.java
deleted file mode 100644
index 2eb6b8a..0000000
--- a/plugins/org.eclipse.jem/javainst/org/eclipse/jem/internal/instantiation/PTAnonymousClassDeclaration.java
+++ /dev/null
@@ -1,75 +0,0 @@
-/**
- * <copyright>
- * </copyright>
- *
- * $Id: PTAnonymousClassDeclaration.java,v 1.1 2005/10/28 22:56:46 rkulp Exp $
- */
-package org.eclipse.jem.internal.instantiation;
-
-
-import org.eclipse.emf.common.util.EList;
-
-/**
- * <!-- begin-user-doc -->
- * A representation of the model object '<em><b>PT Anonymous Class Declaration</b></em>'.
- * <!-- end-user-doc -->
- *
- * <!-- begin-model-doc -->
- * An anonymous class declaration. Currently we only store the
- * entire declaration as a string, including the "new AClass() {...}".
- * <!-- end-model-doc -->
- *
- * <p>
- * The following features are supported:
- * <ul>
- * <li>{@link org.eclipse.jem.internal.instantiation.PTAnonymousClassDeclaration#getDeclaration <em>Declaration</em>}</li>
- * <li>{@link org.eclipse.jem.internal.instantiation.PTAnonymousClassDeclaration#getImports <em>Imports</em>}</li>
- * </ul>
- * </p>
- *
- * @see org.eclipse.jem.internal.instantiation.InstantiationPackage#getPTAnonymousClassDeclaration()
- * @model
- * @generated
- */
-public interface PTAnonymousClassDeclaration extends PTExpression{
- /**
- * Returns the value of the '<em><b>Declaration</b></em>' attribute.
- * <!-- begin-user-doc -->
- * <!-- end-user-doc -->
- * <!-- begin-model-doc -->
- * The declaration text.
- * <!-- end-model-doc -->
- * @return the value of the '<em>Declaration</em>' attribute.
- * @see #setDeclaration(String)
- * @see org.eclipse.jem.internal.instantiation.InstantiationPackage#getPTAnonymousClassDeclaration_Declaration()
- * @model
- * @generated
- */
- String getDeclaration();
-
- /**
- * Sets the value of the '{@link org.eclipse.jem.internal.instantiation.PTAnonymousClassDeclaration#getDeclaration <em>Declaration</em>}' attribute.
- * <!-- begin-user-doc -->
- * <!-- end-user-doc -->
- * @param value the new value of the '<em>Declaration</em>' attribute.
- * @see #getDeclaration()
- * @generated
- */
- void setDeclaration(String value);
-
- /**
- * Returns the value of the '<em><b>Imports</b></em>' attribute list.
- * The list contents are of type {@link java.lang.String}.
- * <!-- begin-user-doc -->
- * <!-- end-user-doc -->
- * <!-- begin-model-doc -->
- * This is the imports needed in the main class by this declaration. This is a transient attribute. It is not serialized, nor is it parsed into from existing code. Its only purpose is to help code generation on a brand new declaration to know what imports should be added to the main class.
- * <!-- end-model-doc -->
- * @return the value of the '<em>Imports</em>' attribute list.
- * @see org.eclipse.jem.internal.instantiation.InstantiationPackage#getPTAnonymousClassDeclaration_Imports()
- * @model type="java.lang.String" transient="true"
- * @generated
- */
- EList getImports();
-
-} // PTAnonymousClassDeclaration
diff --git a/plugins/org.eclipse.jem/javainst/org/eclipse/jem/internal/instantiation/PTArrayAccess.java b/plugins/org.eclipse.jem/javainst/org/eclipse/jem/internal/instantiation/PTArrayAccess.java
deleted file mode 100644
index ce272c1..0000000
--- a/plugins/org.eclipse.jem/javainst/org/eclipse/jem/internal/instantiation/PTArrayAccess.java
+++ /dev/null
@@ -1,82 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2004, 2005 IBM Corporation and others.
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
- *
- * Contributors:
- * IBM Corporation - initial API and implementation
- *******************************************************************************/
-package org.eclipse.jem.internal.instantiation;
-/*
-
-
- */
-import org.eclipse.emf.common.util.EList;
-
-/**
- * <!-- begin-user-doc -->
- * A representation of the model object '<em><b>Array Access</b></em>'.
- * <!-- end-user-doc -->
- *
- * <!-- begin-model-doc -->
- * Array access. e.g. x[3].
- *
- * Unlike AST, the entire expression of type x[3][4] will be done in one expression rather than having a separate ArrayAccess for each dimension. This is just a simplification. This can only be used if it is a simple array access where it is of the form {expression}[expression][expression].
- * <!-- end-model-doc -->
- *
- * <p>
- * The following features are supported:
- * <ul>
- * <li>{@link org.eclipse.jem.internal.instantiation.PTArrayAccess#getArray <em>Array</em>}</li>
- * <li>{@link org.eclipse.jem.internal.instantiation.PTArrayAccess#getIndexes <em>Indexes</em>}</li>
- * </ul>
- * </p>
- *
- * @see org.eclipse.jem.internal.instantiation.InstantiationPackage#getPTArrayAccess()
- * @model
- * @generated
- */
-public interface PTArrayAccess extends PTExpression{
- /**
- * Returns the value of the '<em><b>Array</b></em>' containment reference.
- * <!-- begin-user-doc -->
- * <!-- end-user-doc -->
- * <!-- begin-model-doc -->
- * The expression representing the array to access.
- * <!-- end-model-doc -->
- * @return the value of the '<em>Array</em>' containment reference.
- * @see #setArray(PTExpression)
- * @see org.eclipse.jem.internal.instantiation.InstantiationPackage#getPTArrayAccess_Array()
- * @model containment="true"
- * @generated
- */
- PTExpression getArray();
-
- /**
- * Sets the value of the '{@link org.eclipse.jem.internal.instantiation.PTArrayAccess#getArray <em>Array</em>}' containment reference.
- * <!-- begin-user-doc -->
- * <!-- end-user-doc -->
- * @param value the new value of the '<em>Array</em>' containment reference.
- * @see #getArray()
- * @generated
- */
- void setArray(PTExpression value);
-
- /**
- * Returns the value of the '<em><b>Indexes</b></em>' containment reference list.
- * The list contents are of type {@link org.eclipse.jem.internal.instantiation.PTExpression}.
- * <!-- begin-user-doc -->
- * <!-- end-user-doc -->
- * <!-- begin-model-doc -->
- * The expressions representing the indexes of the access.
- * <!-- end-model-doc -->
- * @return the value of the '<em>Indexes</em>' containment reference list.
- * @see org.eclipse.jem.internal.instantiation.InstantiationPackage#getPTArrayAccess_Indexes()
- * @model type="org.eclipse.jem.internal.instantiation.PTExpression" containment="true" required="true"
- * @generated
- */
- EList getIndexes();
-
-} // ArrayAccess
diff --git a/plugins/org.eclipse.jem/javainst/org/eclipse/jem/internal/instantiation/PTArrayCreation.java b/plugins/org.eclipse.jem/javainst/org/eclipse/jem/internal/instantiation/PTArrayCreation.java
deleted file mode 100644
index 5a8caa5..0000000
--- a/plugins/org.eclipse.jem/javainst/org/eclipse/jem/internal/instantiation/PTArrayCreation.java
+++ /dev/null
@@ -1,106 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2004, 2005 IBM Corporation and others.
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
- *
- * Contributors:
- * IBM Corporation - initial API and implementation
- *******************************************************************************/
-package org.eclipse.jem.internal.instantiation;
-/*
-
-
- */
-import org.eclipse.emf.common.util.EList;
-
-/**
- * <!-- begin-user-doc -->
- * A representation of the model object '<em><b>Array Creation</b></em>'.
- * <!-- end-user-doc -->
- *
- * <!-- begin-model-doc -->
- * Array Creation expression, e.g. new int[3] or new java.langString[][] {{"a"}, {"b"}}
- * <!-- end-model-doc -->
- *
- * <p>
- * The following features are supported:
- * <ul>
- * <li>{@link org.eclipse.jem.internal.instantiation.PTArrayCreation#getType <em>Type</em>}</li>
- * <li>{@link org.eclipse.jem.internal.instantiation.PTArrayCreation#getDimensions <em>Dimensions</em>}</li>
- * <li>{@link org.eclipse.jem.internal.instantiation.PTArrayCreation#getInitializer <em>Initializer</em>}</li>
- * </ul>
- * </p>
- *
- * @see org.eclipse.jem.internal.instantiation.InstantiationPackage#getPTArrayCreation()
- * @model
- * @generated
- */
-public interface PTArrayCreation extends PTExpression{
- /**
- * Returns the value of the '<em><b>Type</b></em>' attribute.
- * <!-- begin-user-doc -->
- * <!-- end-user-doc -->
- * <!-- begin-model-doc -->
- * The fully-qualified type, e.g. int[][] or java.lang.String[], including the number of dimension brackets.
- * <!-- end-model-doc -->
- * @return the value of the '<em>Type</em>' attribute.
- * @see #setType(String)
- * @see org.eclipse.jem.internal.instantiation.InstantiationPackage#getPTArrayCreation_Type()
- * @model
- * @generated
- */
- String getType();
-
- /**
- * Sets the value of the '{@link org.eclipse.jem.internal.instantiation.PTArrayCreation#getType <em>Type</em>}' attribute.
- * <!-- begin-user-doc -->
- * <!-- end-user-doc -->
- * @param value the new value of the '<em>Type</em>' attribute.
- * @see #getType()
- * @generated
- */
- void setType(String value);
-
- /**
- * Returns the value of the '<em><b>Dimensions</b></em>' containment reference list.
- * The list contents are of type {@link org.eclipse.jem.internal.instantiation.PTExpression}.
- * <!-- begin-user-doc -->
- * <!-- end-user-doc -->
- * <!-- begin-model-doc -->
- * The list of expressions for the dimensions. You can have [3][4][] but [][33] is invalid. So for each dimension that has an expression, there will be an entry in the list, in the correct order. When you reach the empty dimensions, the list will end too.
- * <!-- end-model-doc -->
- * @return the value of the '<em>Dimensions</em>' containment reference list.
- * @see org.eclipse.jem.internal.instantiation.InstantiationPackage#getPTArrayCreation_Dimensions()
- * @model type="org.eclipse.jem.internal.instantiation.PTExpression" containment="true"
- * @generated
- */
- EList getDimensions();
-
- /**
- * Returns the value of the '<em><b>Initializer</b></em>' containment reference.
- * <!-- begin-user-doc -->
- * <!-- end-user-doc -->
- * <!-- begin-model-doc -->
- * This is the initializer, if any, for this array. E.g. new int[] {2,3}. It is the {2,3}.
- * <!-- end-model-doc -->
- * @return the value of the '<em>Initializer</em>' containment reference.
- * @see #setInitializer(PTArrayInitializer)
- * @see org.eclipse.jem.internal.instantiation.InstantiationPackage#getPTArrayCreation_Initializer()
- * @model containment="true"
- * @generated
- */
- PTArrayInitializer getInitializer();
-
- /**
- * Sets the value of the '{@link org.eclipse.jem.internal.instantiation.PTArrayCreation#getInitializer <em>Initializer</em>}' containment reference.
- * <!-- begin-user-doc -->
- * <!-- end-user-doc -->
- * @param value the new value of the '<em>Initializer</em>' containment reference.
- * @see #getInitializer()
- * @generated
- */
- void setInitializer(PTArrayInitializer value);
-
-} // ArrayCreation
diff --git a/plugins/org.eclipse.jem/javainst/org/eclipse/jem/internal/instantiation/PTArrayInitializer.java b/plugins/org.eclipse.jem/javainst/org/eclipse/jem/internal/instantiation/PTArrayInitializer.java
deleted file mode 100644
index b36f5f4..0000000
--- a/plugins/org.eclipse.jem/javainst/org/eclipse/jem/internal/instantiation/PTArrayInitializer.java
+++ /dev/null
@@ -1,54 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2004, 2005 IBM Corporation and others.
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
- *
- * Contributors:
- * IBM Corporation - initial API and implementation
- *******************************************************************************/
-package org.eclipse.jem.internal.instantiation;
-/*
-
-
- */
-import org.eclipse.emf.common.util.EList;
-
-/**
- * <!-- begin-user-doc -->
- * A representation of the model object '<em><b>Array Initializer</b></em>'.
- * <!-- end-user-doc -->
- *
- * <!-- begin-model-doc -->
- * Array initialization expression. This is the entire expression, e.g. {2, 3}, or {{2,3}, 4}. In the second case, the {2,3} will be an ArrayInitializer contained within the expressions list for the top ArrayInitializer.
- * <!-- end-model-doc -->
- *
- * <p>
- * The following features are supported:
- * <ul>
- * <li>{@link org.eclipse.jem.internal.instantiation.PTArrayInitializer#getExpressions <em>Expressions</em>}</li>
- * </ul>
- * </p>
- *
- * @see org.eclipse.jem.internal.instantiation.InstantiationPackage#getPTArrayInitializer()
- * @model
- * @generated
- */
-public interface PTArrayInitializer extends PTExpression{
- /**
- * Returns the value of the '<em><b>Expressions</b></em>' containment reference list.
- * The list contents are of type {@link org.eclipse.jem.internal.instantiation.PTExpression}.
- * <!-- begin-user-doc -->
- * <!-- end-user-doc -->
- * <!-- begin-model-doc -->
- * This isthe list of expressions within the initializer, e.g. {2, 3}, or {{2,3}, 4}. In the first case it will be two NumberLiterals. In the second case, the {2,3} will be an ArrayInitializer, followed by a NumberLiteral.
- * <!-- end-model-doc -->
- * @return the value of the '<em>Expressions</em>' containment reference list.
- * @see org.eclipse.jem.internal.instantiation.InstantiationPackage#getPTArrayInitializer_Expressions()
- * @model type="org.eclipse.jem.internal.instantiation.PTExpression" containment="true"
- * @generated
- */
- EList getExpressions();
-
-} // ArrayInitializer
diff --git a/plugins/org.eclipse.jem/javainst/org/eclipse/jem/internal/instantiation/PTBooleanLiteral.java b/plugins/org.eclipse.jem/javainst/org/eclipse/jem/internal/instantiation/PTBooleanLiteral.java
deleted file mode 100644
index 3156dee..0000000
--- a/plugins/org.eclipse.jem/javainst/org/eclipse/jem/internal/instantiation/PTBooleanLiteral.java
+++ /dev/null
@@ -1,63 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2004, 2005 IBM Corporation and others.
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
- *
- * Contributors:
- * IBM Corporation - initial API and implementation
- *******************************************************************************/
-/*
-
-
- */
-package org.eclipse.jem.internal.instantiation;
-
-/**
- * <!-- begin-user-doc -->
- * A representation of the model object '<em><b>Boolean Literal</b></em>'.
- * <!-- end-user-doc -->
- *
- * <!-- begin-model-doc -->
- * This represents a primitive boolean literal, i.e. true or false directly in the code.
- * <!-- end-model-doc -->
- *
- * <p>
- * The following features are supported:
- * <ul>
- * <li>{@link org.eclipse.jem.internal.instantiation.PTBooleanLiteral#isBooleanValue <em>Boolean Value</em>}</li>
- * </ul>
- * </p>
- *
- * @see org.eclipse.jem.internal.instantiation.InstantiationPackage#getPTBooleanLiteral()
- * @model
- * @generated
- */
-public interface PTBooleanLiteral extends PTExpression{
- /**
- * Returns the value of the '<em><b>Boolean Value</b></em>' attribute.
- * <!-- begin-user-doc -->
- * <!-- end-user-doc -->
- * <!-- begin-model-doc -->
- * The value of the literal.
- * <!-- end-model-doc -->
- * @return the value of the '<em>Boolean Value</em>' attribute.
- * @see #setBooleanValue(boolean)
- * @see org.eclipse.jem.internal.instantiation.InstantiationPackage#getPTBooleanLiteral_BooleanValue()
- * @model
- * @generated
- */
- boolean isBooleanValue();
-
- /**
- * Sets the value of the '{@link org.eclipse.jem.internal.instantiation.PTBooleanLiteral#isBooleanValue <em>Boolean Value</em>}' attribute.
- * <!-- begin-user-doc -->
- * <!-- end-user-doc -->
- * @param value the new value of the '<em>Boolean Value</em>' attribute.
- * @see #isBooleanValue()
- * @generated
- */
- void setBooleanValue(boolean value);
-
-} // BooleanLiteral
diff --git a/plugins/org.eclipse.jem/javainst/org/eclipse/jem/internal/instantiation/PTCastExpression.java b/plugins/org.eclipse.jem/javainst/org/eclipse/jem/internal/instantiation/PTCastExpression.java
deleted file mode 100644
index a9bd20d..0000000
--- a/plugins/org.eclipse.jem/javainst/org/eclipse/jem/internal/instantiation/PTCastExpression.java
+++ /dev/null
@@ -1,89 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2004, 2005 IBM Corporation and others.
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
- *
- * Contributors:
- * IBM Corporation - initial API and implementation
- *******************************************************************************/
-/*
-
-
- */
-package org.eclipse.jem.internal.instantiation;
-
-/**
- * <!-- begin-user-doc -->
- * A representation of the model object '<em><b>Cast</b></em>'.
- * <!-- end-user-doc -->
- *
- * <!-- begin-model-doc -->
- * Cast expression, e.g. (short) 10
- * <!-- end-model-doc -->
- *
- * <p>
- * The following features are supported:
- * <ul>
- * <li>{@link org.eclipse.jem.internal.instantiation.PTCastExpression#getType <em>Type</em>}</li>
- * <li>{@link org.eclipse.jem.internal.instantiation.PTCastExpression#getExpression <em>Expression</em>}</li>
- * </ul>
- * </p>
- *
- * @see org.eclipse.jem.internal.instantiation.InstantiationPackage#getPTCastExpression()
- * @model
- * @generated
- */
-public interface PTCastExpression extends PTExpression{
- /**
- * Returns the value of the '<em><b>Type</b></em>' attribute.
- * <!-- begin-user-doc -->
- * <!-- end-user-doc -->
- * <!-- begin-model-doc -->
- * This is the fully-qualified type of the cast, e.g. int or java.lang.String
- * <!-- end-model-doc -->
- * @return the value of the '<em>Type</em>' attribute.
- * @see #setType(String)
- * @see org.eclipse.jem.internal.instantiation.InstantiationPackage#getPTCastExpression_Type()
- * @model
- * @generated
- */
- String getType();
-
- /**
- * Sets the value of the '{@link org.eclipse.jem.internal.instantiation.PTCastExpression#getType <em>Type</em>}' attribute.
- * <!-- begin-user-doc -->
- * <!-- end-user-doc -->
- * @param value the new value of the '<em>Type</em>' attribute.
- * @see #getType()
- * @generated
- */
- void setType(String value);
-
- /**
- * Returns the value of the '<em><b>Expression</b></em>' containment reference.
- * <!-- begin-user-doc -->
- * <!-- end-user-doc -->
- * <!-- begin-model-doc -->
- * The expression being casted.
- * <!-- end-model-doc -->
- * @return the value of the '<em>Expression</em>' containment reference.
- * @see #setExpression(PTExpression)
- * @see org.eclipse.jem.internal.instantiation.InstantiationPackage#getPTCastExpression_Expression()
- * @model containment="true"
- * @generated
- */
- PTExpression getExpression();
-
- /**
- * Sets the value of the '{@link org.eclipse.jem.internal.instantiation.PTCastExpression#getExpression <em>Expression</em>}' containment reference.
- * <!-- begin-user-doc -->
- * <!-- end-user-doc -->
- * @param value the new value of the '<em>Expression</em>' containment reference.
- * @see #getExpression()
- * @generated
- */
- void setExpression(PTExpression value);
-
-} // Cast
diff --git a/plugins/org.eclipse.jem/javainst/org/eclipse/jem/internal/instantiation/PTCharacterLiteral.java b/plugins/org.eclipse.jem/javainst/org/eclipse/jem/internal/instantiation/PTCharacterLiteral.java
deleted file mode 100644
index 1f21d6a..0000000
--- a/plugins/org.eclipse.jem/javainst/org/eclipse/jem/internal/instantiation/PTCharacterLiteral.java
+++ /dev/null
@@ -1,89 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2004, 2005 IBM Corporation and others.
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
- *
- * Contributors:
- * IBM Corporation - initial API and implementation
- *******************************************************************************/
-/*
-
-
- */
-package org.eclipse.jem.internal.instantiation;
-
-/**
- * <!-- begin-user-doc -->
- * A representation of the model object '<em><b>Character Literal</b></em>'.
- * <!-- end-user-doc -->
- *
- * <!-- begin-model-doc -->
- * This represents a primitive character expression, e.g. 'a' or '\r'.
- * <!-- end-model-doc -->
- *
- * <p>
- * The following features are supported:
- * <ul>
- * <li>{@link org.eclipse.jem.internal.instantiation.PTCharacterLiteral#getEscapedValue <em>Escaped Value</em>}</li>
- * <li>{@link org.eclipse.jem.internal.instantiation.PTCharacterLiteral#getCharValue <em>Char Value</em>}</li>
- * </ul>
- * </p>
- *
- * @see org.eclipse.jem.internal.instantiation.InstantiationPackage#getPTCharacterLiteral()
- * @model
- * @generated
- */
-public interface PTCharacterLiteral extends PTExpression{
- /**
- * Returns the value of the '<em><b>Escaped Value</b></em>' attribute.
- * <!-- begin-user-doc -->
- * <!-- end-user-doc -->
- * <!-- begin-model-doc -->
- * This is the escaped character. In other words the literal exactly as it is in the java file. E.g. 'a' or '\r'. Including the surrounding single quotes themselves.
- * <!-- end-model-doc -->
- * @return the value of the '<em>Escaped Value</em>' attribute.
- * @see #setEscapedValue(String)
- * @see org.eclipse.jem.internal.instantiation.InstantiationPackage#getPTCharacterLiteral_EscapedValue()
- * @model
- * @generated
- */
- String getEscapedValue();
-
- /**
- * Sets the value of the '{@link org.eclipse.jem.internal.instantiation.PTCharacterLiteral#getEscapedValue <em>Escaped Value</em>}' attribute.
- * <!-- begin-user-doc -->
- * <!-- end-user-doc -->
- * @param value the new value of the '<em>Escaped Value</em>' attribute.
- * @see #getEscapedValue()
- * @generated
- */
- void setEscapedValue(String value);
-
- /**
- * Returns the value of the '<em><b>Char Value</b></em>' attribute.
- * <!-- begin-user-doc -->
- * <!-- end-user-doc -->
- * <!-- begin-model-doc -->
- * The actual primitive character without the quotes. Escape are evaluated and turned into their character value. This is a transient field. If not set when created when queried it will create it. Typically it will be set when created from an AST node since the node already has evaluated it.
- * <!-- end-model-doc -->
- * @return the value of the '<em>Char Value</em>' attribute.
- * @see #setCharValue(char)
- * @see org.eclipse.jem.internal.instantiation.InstantiationPackage#getPTCharacterLiteral_CharValue()
- * @model transient="true"
- * @generated
- */
- char getCharValue();
-
- /**
- * Sets the value of the '{@link org.eclipse.jem.internal.instantiation.PTCharacterLiteral#getCharValue <em>Char Value</em>}' attribute.
- * <!-- begin-user-doc -->
- * <!-- end-user-doc -->
- * @param value the new value of the '<em>Char Value</em>' attribute.
- * @see #getCharValue()
- * @generated
- */
- void setCharValue(char value);
-
-} // CharacterLiteral
diff --git a/plugins/org.eclipse.jem/javainst/org/eclipse/jem/internal/instantiation/PTClassInstanceCreation.java b/plugins/org.eclipse.jem/javainst/org/eclipse/jem/internal/instantiation/PTClassInstanceCreation.java
deleted file mode 100644
index 931e313..0000000
--- a/plugins/org.eclipse.jem/javainst/org/eclipse/jem/internal/instantiation/PTClassInstanceCreation.java
+++ /dev/null
@@ -1,80 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2004, 2005 IBM Corporation and others.
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
- *
- * Contributors:
- * IBM Corporation - initial API and implementation
- *******************************************************************************/
-package org.eclipse.jem.internal.instantiation;
-/*
-
-
- */
-import org.eclipse.emf.common.util.EList;
-
-/**
- * <!-- begin-user-doc -->
- * A representation of the model object '<em><b>Class Instance Creation</b></em>'.
- * <!-- end-user-doc -->
- *
- * <!-- begin-model-doc -->
- * Class instance creation expression. E.g. new String("a")
- * <!-- end-model-doc -->
- *
- * <p>
- * The following features are supported:
- * <ul>
- * <li>{@link org.eclipse.jem.internal.instantiation.PTClassInstanceCreation#getType <em>Type</em>}</li>
- * <li>{@link org.eclipse.jem.internal.instantiation.PTClassInstanceCreation#getArguments <em>Arguments</em>}</li>
- * </ul>
- * </p>
- *
- * @see org.eclipse.jem.internal.instantiation.InstantiationPackage#getPTClassInstanceCreation()
- * @model
- * @generated
- */
-public interface PTClassInstanceCreation extends PTExpression{
- /**
- * Returns the value of the '<em><b>Type</b></em>' attribute.
- * <!-- begin-user-doc -->
- * <!-- end-user-doc -->
- * <!-- begin-model-doc -->
- * This is the type of the class. E.g. java.lang.String. This should be fully-qualified for allocation purposes. It should also be in reflection format, i.e. if X is an inner class of j.Y, then the type here should be "j.Y$X".
- * <!-- end-model-doc -->
- * @return the value of the '<em>Type</em>' attribute.
- * @see #setType(String)
- * @see org.eclipse.jem.internal.instantiation.InstantiationPackage#getPTClassInstanceCreation_Type()
- * @model
- * @generated
- */
- String getType();
-
- /**
- * Sets the value of the '{@link org.eclipse.jem.internal.instantiation.PTClassInstanceCreation#getType <em>Type</em>}' attribute.
- * <!-- begin-user-doc -->
- * <!-- end-user-doc -->
- * @param value the new value of the '<em>Type</em>' attribute.
- * @see #getType()
- * @generated
- */
- void setType(String value);
-
- /**
- * Returns the value of the '<em><b>Arguments</b></em>' containment reference list.
- * The list contents are of type {@link org.eclipse.jem.internal.instantiation.PTExpression}.
- * <!-- begin-user-doc -->
- * <!-- end-user-doc -->
- * <!-- begin-model-doc -->
- * The arguments to the constructor.
- * <!-- end-model-doc -->
- * @return the value of the '<em>Arguments</em>' containment reference list.
- * @see org.eclipse.jem.internal.instantiation.InstantiationPackage#getPTClassInstanceCreation_Arguments()
- * @model type="org.eclipse.jem.internal.instantiation.PTExpression" containment="true"
- * @generated
- */
- EList getArguments();
-
-} // ClassInstanceCreation
diff --git a/plugins/org.eclipse.jem/javainst/org/eclipse/jem/internal/instantiation/PTConditionalExpression.java b/plugins/org.eclipse.jem/javainst/org/eclipse/jem/internal/instantiation/PTConditionalExpression.java
deleted file mode 100644
index ea215ad..0000000
--- a/plugins/org.eclipse.jem/javainst/org/eclipse/jem/internal/instantiation/PTConditionalExpression.java
+++ /dev/null
@@ -1,115 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2004, 2005 IBM Corporation and others.
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
- *
- * Contributors:
- * IBM Corporation - initial API and implementation
- *******************************************************************************/
-/*
-
-
- */
-package org.eclipse.jem.internal.instantiation;
-
-/**
- * <!-- begin-user-doc -->
- * A representation of the model object '<em><b>Conditional Expression</b></em>'.
- * <!-- end-user-doc -->
- *
- * <!-- begin-model-doc -->
- * The test Expresson, e.g. (x=3) ? 1 : 2
- * <!-- end-model-doc -->
- *
- * <p>
- * The following features are supported:
- * <ul>
- * <li>{@link org.eclipse.jem.internal.instantiation.PTConditionalExpression#getCondition <em>Condition</em>}</li>
- * <li>{@link org.eclipse.jem.internal.instantiation.PTConditionalExpression#getTrue <em>True</em>}</li>
- * <li>{@link org.eclipse.jem.internal.instantiation.PTConditionalExpression#getFalse <em>False</em>}</li>
- * </ul>
- * </p>
- *
- * @see org.eclipse.jem.internal.instantiation.InstantiationPackage#getPTConditionalExpression()
- * @model
- * @generated
- */
-public interface PTConditionalExpression extends PTExpression{
- /**
- * Returns the value of the '<em><b>Condition</b></em>' containment reference.
- * <!-- begin-user-doc -->
- * <!-- end-user-doc -->
- * <!-- begin-model-doc -->
- * The condition expression.
- * <!-- end-model-doc -->
- * @return the value of the '<em>Condition</em>' containment reference.
- * @see #setCondition(PTExpression)
- * @see org.eclipse.jem.internal.instantiation.InstantiationPackage#getPTConditionalExpression_Condition()
- * @model containment="true"
- * @generated
- */
- PTExpression getCondition();
-
- /**
- * Sets the value of the '{@link org.eclipse.jem.internal.instantiation.PTConditionalExpression#getCondition <em>Condition</em>}' containment reference.
- * <!-- begin-user-doc -->
- * <!-- end-user-doc -->
- * @param value the new value of the '<em>Condition</em>' containment reference.
- * @see #getCondition()
- * @generated
- */
- void setCondition(PTExpression value);
-
- /**
- * Returns the value of the '<em><b>True</b></em>' containment reference.
- * <!-- begin-user-doc -->
- * <!-- end-user-doc -->
- * <!-- begin-model-doc -->
- * The true expression
- * <!-- end-model-doc -->
- * @return the value of the '<em>True</em>' containment reference.
- * @see #setTrue(PTExpression)
- * @see org.eclipse.jem.internal.instantiation.InstantiationPackage#getPTConditionalExpression_True()
- * @model containment="true"
- * @generated
- */
- PTExpression getTrue();
-
- /**
- * Sets the value of the '{@link org.eclipse.jem.internal.instantiation.PTConditionalExpression#getTrue <em>True</em>}' containment reference.
- * <!-- begin-user-doc -->
- * <!-- end-user-doc -->
- * @param value the new value of the '<em>True</em>' containment reference.
- * @see #getTrue()
- * @generated
- */
- void setTrue(PTExpression value);
-
- /**
- * Returns the value of the '<em><b>False</b></em>' containment reference.
- * <!-- begin-user-doc -->
- * <!-- end-user-doc -->
- * <!-- begin-model-doc -->
- * The false expression.
- * <!-- end-model-doc -->
- * @return the value of the '<em>False</em>' containment reference.
- * @see #setFalse(PTExpression)
- * @see org.eclipse.jem.internal.instantiation.InstantiationPackage#getPTConditionalExpression_False()
- * @model containment="true"
- * @generated
- */
- PTExpression getFalse();
-
- /**
- * Sets the value of the '{@link org.eclipse.jem.internal.instantiation.PTConditionalExpression#getFalse <em>False</em>}' containment reference.
- * <!-- begin-user-doc -->
- * <!-- end-user-doc -->
- * @param value the new value of the '<em>False</em>' containment reference.
- * @see #getFalse()
- * @generated
- */
- void setFalse(PTExpression value);
-
-} // ConditionalExpression
diff --git a/plugins/org.eclipse.jem/javainst/org/eclipse/jem/internal/instantiation/PTExpression.java b/plugins/org.eclipse.jem/javainst/org/eclipse/jem/internal/instantiation/PTExpression.java
deleted file mode 100644
index 9b16c29..0000000
--- a/plugins/org.eclipse.jem/javainst/org/eclipse/jem/internal/instantiation/PTExpression.java
+++ /dev/null
@@ -1,36 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2004, 2005 IBM Corporation and others.
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
- *
- * Contributors:
- * IBM Corporation - initial API and implementation
- *******************************************************************************/
-package org.eclipse.jem.internal.instantiation;
-/*
-
-
- */
-import org.eclipse.emf.ecore.EObject;
-
-/**
- * <!-- begin-user-doc -->
- * A representation of the model object '<em><b>Expression</b></em>'.
- * <!-- end-user-doc -->
- *
- *
- * @see org.eclipse.jem.internal.instantiation.InstantiationPackage#getPTExpression()
- * @model abstract="true"
- * @generated
- */
-public interface PTExpression extends EObject{
- /**
- * Accepts the given visitor on a visit of the current node.
- *
- * @param visitor the visitor object
- * @exception IllegalArgumentException if the visitor is null
- */
- public void accept(ParseVisitor visitor);
-} // Expression
diff --git a/plugins/org.eclipse.jem/javainst/org/eclipse/jem/internal/instantiation/PTFieldAccess.java b/plugins/org.eclipse.jem/javainst/org/eclipse/jem/internal/instantiation/PTFieldAccess.java
deleted file mode 100644
index d947fb5..0000000
--- a/plugins/org.eclipse.jem/javainst/org/eclipse/jem/internal/instantiation/PTFieldAccess.java
+++ /dev/null
@@ -1,89 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2004, 2005 IBM Corporation and others.
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
- *
- * Contributors:
- * IBM Corporation - initial API and implementation
- *******************************************************************************/
-/*
-
-
- */
-package org.eclipse.jem.internal.instantiation;
-
-/**
- * <!-- begin-user-doc -->
- * A representation of the model object '<em><b>Field Access</b></em>'.
- * <!-- end-user-doc -->
- *
- * <!-- begin-model-doc -->
- * Access a field expression, e.g. java.awt.Color.red
- * <!-- end-model-doc -->
- *
- * <p>
- * The following features are supported:
- * <ul>
- * <li>{@link org.eclipse.jem.internal.instantiation.PTFieldAccess#getReceiver <em>Receiver</em>}</li>
- * <li>{@link org.eclipse.jem.internal.instantiation.PTFieldAccess#getField <em>Field</em>}</li>
- * </ul>
- * </p>
- *
- * @see org.eclipse.jem.internal.instantiation.InstantiationPackage#getPTFieldAccess()
- * @model
- * @generated
- */
-public interface PTFieldAccess extends PTExpression{
- /**
- * Returns the value of the '<em><b>Receiver</b></em>' containment reference.
- * <!-- begin-user-doc -->
- * <!-- end-user-doc -->
- * <!-- begin-model-doc -->
- * The expression representing the object that the field is in, e.g. java.awt.Color.
- * <!-- end-model-doc -->
- * @return the value of the '<em>Receiver</em>' containment reference.
- * @see #setReceiver(PTExpression)
- * @see org.eclipse.jem.internal.instantiation.InstantiationPackage#getPTFieldAccess_Receiver()
- * @model containment="true"
- * @generated
- */
- PTExpression getReceiver();
-
- /**
- * Sets the value of the '{@link org.eclipse.jem.internal.instantiation.PTFieldAccess#getReceiver <em>Receiver</em>}' containment reference.
- * <!-- begin-user-doc -->
- * <!-- end-user-doc -->
- * @param value the new value of the '<em>Receiver</em>' containment reference.
- * @see #getReceiver()
- * @generated
- */
- void setReceiver(PTExpression value);
-
- /**
- * Returns the value of the '<em><b>Field</b></em>' attribute.
- * <!-- begin-user-doc -->
- * <!-- end-user-doc -->
- * <!-- begin-model-doc -->
- * The name of the field being accessed, e.g. red.
- * <!-- end-model-doc -->
- * @return the value of the '<em>Field</em>' attribute.
- * @see #setField(String)
- * @see org.eclipse.jem.internal.instantiation.InstantiationPackage#getPTFieldAccess_Field()
- * @model
- * @generated
- */
- String getField();
-
- /**
- * Sets the value of the '{@link org.eclipse.jem.internal.instantiation.PTFieldAccess#getField <em>Field</em>}' attribute.
- * <!-- begin-user-doc -->
- * <!-- end-user-doc -->
- * @param value the new value of the '<em>Field</em>' attribute.
- * @see #getField()
- * @generated
- */
- void setField(String value);
-
-} // FieldAccess
diff --git a/plugins/org.eclipse.jem/javainst/org/eclipse/jem/internal/instantiation/PTInfixExpression.java b/plugins/org.eclipse.jem/javainst/org/eclipse/jem/internal/instantiation/PTInfixExpression.java
deleted file mode 100644
index 3566c3b..0000000
--- a/plugins/org.eclipse.jem/javainst/org/eclipse/jem/internal/instantiation/PTInfixExpression.java
+++ /dev/null
@@ -1,148 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2004, 2005 IBM Corporation and others.
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
- *
- * Contributors:
- * IBM Corporation - initial API and implementation
- *******************************************************************************/
-package org.eclipse.jem.internal.instantiation;
-/*
-
-
- */
-import org.eclipse.emf.common.util.EList;
-
-/**
- * <!-- begin-user-doc -->
- * A representation of the model object '<em><b>Infix Expression</b></em>'.
- * <!-- end-user-doc -->
- *
- * <!-- begin-model-doc -->
- * An expression with an operator that has two operands, e.g. 3 + 4.
- * <!-- end-model-doc -->
- *
- * <p>
- * The following features are supported:
- * <ul>
- * <li>{@link org.eclipse.jem.internal.instantiation.PTInfixExpression#getLeftOperand <em>Left Operand</em>}</li>
- * <li>{@link org.eclipse.jem.internal.instantiation.PTInfixExpression#getOperator <em>Operator</em>}</li>
- * <li>{@link org.eclipse.jem.internal.instantiation.PTInfixExpression#getRightOperand <em>Right Operand</em>}</li>
- * <li>{@link org.eclipse.jem.internal.instantiation.PTInfixExpression#getExtendedOperands <em>Extended Operands</em>}</li>
- * </ul>
- * </p>
- *
- * @see org.eclipse.jem.internal.instantiation.InstantiationPackage#getPTInfixExpression()
- * @model
- * @generated
- */
-public interface PTInfixExpression extends PTExpression{
- /**
- * Returns the value of the '<em><b>Left Operand</b></em>' containment reference.
- * <!-- begin-user-doc -->
- * <p>
- * If the meaning of the '<em>Left Operand</em>' containment reference isn't clear,
- * there really should be more of a description here...
- * </p>
- * <!-- end-user-doc -->
- * @return the value of the '<em>Left Operand</em>' containment reference.
- * @see #setLeftOperand(PTExpression)
- * @see org.eclipse.jem.internal.instantiation.InstantiationPackage#getPTInfixExpression_LeftOperand()
- * @model containment="true"
- * @generated
- */
- PTExpression getLeftOperand();
-
- /**
- * Sets the value of the '{@link org.eclipse.jem.internal.instantiation.PTInfixExpression#getLeftOperand <em>Left Operand</em>}' containment reference.
- * <!-- begin-user-doc -->
- * <!-- end-user-doc -->
- * @param value the new value of the '<em>Left Operand</em>' containment reference.
- * @see #getLeftOperand()
- * @generated
- */
- void setLeftOperand(PTExpression value);
-
- /**
- * Returns the value of the '<em><b>Operator</b></em>' attribute.
- * The literals are from the enumeration {@link org.eclipse.jem.internal.instantiation.PTInfixOperator}.
- * <!-- begin-user-doc -->
- * <!-- end-user-doc -->
- * <!-- begin-model-doc -->
- * The operator, e.g. +
- * <!-- end-model-doc -->
- * @return the value of the '<em>Operator</em>' attribute.
- * @see org.eclipse.jem.internal.instantiation.PTInfixOperator
- * @see #setOperator(PTInfixOperator)
- * @see org.eclipse.jem.internal.instantiation.InstantiationPackage#getPTInfixExpression_Operator()
- * @model
- * @generated
- */
- PTInfixOperator getOperator();
-
- /**
- * Sets the value of the '{@link org.eclipse.jem.internal.instantiation.PTInfixExpression#getOperator <em>Operator</em>}' attribute.
- * <!-- begin-user-doc -->
- * <!-- end-user-doc -->
- * @param value the new value of the '<em>Operator</em>' attribute.
- * @see org.eclipse.jem.internal.instantiation.PTInfixOperator
- * @see #getOperator()
- * @generated
- */
- void setOperator(PTInfixOperator value);
-
- /**
- * Returns the value of the '<em><b>Right Operand</b></em>' containment reference.
- * <!-- begin-user-doc -->
- * <!-- end-user-doc -->
- * <!-- begin-model-doc -->
- * The right expression. i.e. 4 of "3 + 4"
- * <!-- end-model-doc -->
- * @return the value of the '<em>Right Operand</em>' containment reference.
- * @see #setRightOperand(PTExpression)
- * @see org.eclipse.jem.internal.instantiation.InstantiationPackage#getPTInfixExpression_RightOperand()
- * @model containment="true"
- * @generated
- */
- PTExpression getRightOperand();
-
- /**
- * Sets the value of the '{@link org.eclipse.jem.internal.instantiation.PTInfixExpression#getRightOperand <em>Right Operand</em>}' containment reference.
- * <!-- begin-user-doc -->
- * <!-- end-user-doc -->
- * @param value the new value of the '<em>Right Operand</em>' containment reference.
- * @see #getRightOperand()
- * @generated
- */
- void setRightOperand(PTExpression value);
-
- /**
- * Returns the value of the '<em><b>Extended Operands</b></em>' containment reference list.
- * The list contents are of type {@link org.eclipse.jem.internal.instantiation.PTExpression}.
- * <!-- begin-user-doc -->
- * <!-- end-user-doc -->
- * <!-- begin-model-doc -->
- * Used when there are a series of infix operations of the same operator, e.g. 1 + 2 + 3 + 4. 1 and 2 will go into left and right, while {3, 4} will go into the extended operands.
- * <!-- end-model-doc -->
- * @return the value of the '<em>Extended Operands</em>' containment reference list.
- * @see org.eclipse.jem.internal.instantiation.InstantiationPackage#getPTInfixExpression_ExtendedOperands()
- * @model type="org.eclipse.jem.internal.instantiation.PTExpression" containment="true"
- * @generated
- */
- EList getExtendedOperands();
-
- /**
- * Compress the expression
- * If there is no left operand and a right operand, or vice versa, and no extended operands
- * return the remaining single operand
- * If there is no left operand and a right and some extended ones shuffle everything along
- * so that the right becomes the left and the first extended moves into the right
- * or if no right and a left then just move the first extended into the right
- *
- * @since 1.0.0
- */
- PTExpression asCompressedExpression();
-
-} // InfixExpression
diff --git a/plugins/org.eclipse.jem/javainst/org/eclipse/jem/internal/instantiation/PTInfixOperator.java b/plugins/org.eclipse.jem/javainst/org/eclipse/jem/internal/instantiation/PTInfixOperator.java
deleted file mode 100644
index 807c149..0000000
--- a/plugins/org.eclipse.jem/javainst/org/eclipse/jem/internal/instantiation/PTInfixOperator.java
+++ /dev/null
@@ -1,619 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2004, 2005 IBM Corporation and others.
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
- *
- * Contributors:
- * IBM Corporation - initial API and implementation
- *******************************************************************************/
-package org.eclipse.jem.internal.instantiation;
-/*
-
-
- */
-import java.util.Arrays;
-import java.util.Collections;
-import java.util.List;
-
-import org.eclipse.emf.common.util.AbstractEnumerator;
-
-/**
- * <!-- begin-user-doc -->
- * A representation of the literals of the enumeration '<em><b>Infix Operator</b></em>',
- * and utility methods for working with them.
- * <!-- end-user-doc -->
- * <!-- begin-model-doc -->
- * Enumerator for the operator on an InfixExpression.
- * <!-- end-model-doc -->
- * @see org.eclipse.jem.internal.instantiation.InstantiationPackage#getPTInfixOperator()
- * @model
- * @generated
- */
-public final class PTInfixOperator extends AbstractEnumerator {
- /**
- * The '<em><b>TIMES</b></em>' literal value.
- * <!-- begin-user-doc -->
- * <!-- end-user-doc -->
- * <!-- begin-model-doc -->
- * * operator
- * <!-- end-model-doc -->
- * @see #TIMES_LITERAL
- * @model
- * @generated
- * @ordered
- */
- public static final int TIMES = 0;
-
- /**
- * The '<em><b>DIVIDE</b></em>' literal value.
- * <!-- begin-user-doc -->
- * <!-- end-user-doc -->
- * <!-- begin-model-doc -->
- * / operator
- * <!-- end-model-doc -->
- * @see #DIVIDE_LITERAL
- * @model
- * @generated
- * @ordered
- */
- public static final int DIVIDE = 1;
-
- /**
- * The '<em><b>REMAINDER</b></em>' literal value.
- * <!-- begin-user-doc -->
- * <!-- end-user-doc -->
- * <!-- begin-model-doc -->
- * % operator
- * <!-- end-model-doc -->
- * @see #REMAINDER_LITERAL
- * @model
- * @generated
- * @ordered
- */
- public static final int REMAINDER = 2;
-
- /**
- * The '<em><b>PLUS</b></em>' literal value.
- * <!-- begin-user-doc -->
- * <!-- end-user-doc -->
- * <!-- begin-model-doc -->
- * + operator
- * <!-- end-model-doc -->
- * @see #PLUS_LITERAL
- * @model
- * @generated
- * @ordered
- */
- public static final int PLUS = 3;
-
- /**
- * The '<em><b>MINUS</b></em>' literal value.
- * <!-- begin-user-doc -->
- * <!-- end-user-doc -->
- * <!-- begin-model-doc -->
- * - operator
- * <!-- end-model-doc -->
- * @see #MINUS_LITERAL
- * @model
- * @generated
- * @ordered
- */
- public static final int MINUS = 4;
-
- /**
- * The '<em><b>LEFT SHIFT</b></em>' literal value.
- * <!-- begin-user-doc -->
- * <!-- end-user-doc -->
- * <!-- begin-model-doc -->
- * << operator
- * <!-- end-model-doc -->
- * @see #LEFT_SHIFT_LITERAL
- * @model
- * @generated
- * @ordered
- */
- public static final int LEFT_SHIFT = 5;
-
- /**
- * The '<em><b>RIGHT SHIFT SIGNED</b></em>' literal value.
- * <!-- begin-user-doc -->
- * <!-- end-user-doc -->
- * <!-- begin-model-doc -->
- * >> operator
- * <!-- end-model-doc -->
- * @see #RIGHT_SHIFT_SIGNED_LITERAL
- * @model
- * @generated
- * @ordered
- */
- public static final int RIGHT_SHIFT_SIGNED = 6;
-
- /**
- * The '<em><b>RIGHT SHIFT UNSIGNED</b></em>' literal value.
- * <!-- begin-user-doc -->
- * <!-- end-user-doc -->
- * <!-- begin-model-doc -->
- * >>> operator
- * <!-- end-model-doc -->
- * @see #RIGHT_SHIFT_UNSIGNED_LITERAL
- * @model
- * @generated
- * @ordered
- */
- public static final int RIGHT_SHIFT_UNSIGNED = 7;
-
- /**
- * The '<em><b>LESS</b></em>' literal value.
- * <!-- begin-user-doc -->
- * <!-- end-user-doc -->
- * <!-- begin-model-doc -->
- * < operator
- * <!-- end-model-doc -->
- * @see #LESS_LITERAL
- * @model
- * @generated
- * @ordered
- */
- public static final int LESS = 8;
-
- /**
- * The '<em><b>GREATER</b></em>' literal value.
- * <!-- begin-user-doc -->
- * <!-- end-user-doc -->
- * <!-- begin-model-doc -->
- * > operator
- * <!-- end-model-doc -->
- * @see #GREATER_LITERAL
- * @model
- * @generated
- * @ordered
- */
- public static final int GREATER = 9;
-
- /**
- * The '<em><b>LESS EQUALS</b></em>' literal value.
- * <!-- begin-user-doc -->
- * <!-- end-user-doc -->
- * <!-- begin-model-doc -->
- * <= operator
- * <!-- end-model-doc -->
- * @see #LESS_EQUALS_LITERAL
- * @model
- * @generated
- * @ordered
- */
- public static final int LESS_EQUALS = 10;
-
- /**
- * The '<em><b>GREATER EQUALS</b></em>' literal value.
- * <!-- begin-user-doc -->
- * <!-- end-user-doc -->
- * <!-- begin-model-doc -->
- * >= operator
- * <!-- end-model-doc -->
- * @see #GREATER_EQUALS_LITERAL
- * @model
- * @generated
- * @ordered
- */
- public static final int GREATER_EQUALS = 11;
-
- /**
- * The '<em><b>EQUALS</b></em>' literal value.
- * <!-- begin-user-doc -->
- * <!-- end-user-doc -->
- * <!-- begin-model-doc -->
- * == operator
- * <!-- end-model-doc -->
- * @see #EQUALS_LITERAL
- * @model
- * @generated
- * @ordered
- */
- public static final int EQUALS = 12;
-
- /**
- * The '<em><b>NOT EQUALS</b></em>' literal value.
- * <!-- begin-user-doc -->
- * <!-- end-user-doc -->
- * <!-- begin-model-doc -->
- * != operator
- * <!-- end-model-doc -->
- * @see #NOT_EQUALS_LITERAL
- * @model
- * @generated
- * @ordered
- */
- public static final int NOT_EQUALS = 13;
-
- /**
- * The '<em><b>XOR</b></em>' literal value.
- * <!-- begin-user-doc -->
- * <!-- end-user-doc -->
- * <!-- begin-model-doc -->
- * ^ operator
- * <!-- end-model-doc -->
- * @see #XOR_LITERAL
- * @model
- * @generated
- * @ordered
- */
- public static final int XOR = 14;
-
- /**
- * The '<em><b>AND</b></em>' literal value.
- * <!-- begin-user-doc -->
- * <!-- end-user-doc -->
- * <!-- begin-model-doc -->
- * & operator
- * <!-- end-model-doc -->
- * @see #AND_LITERAL
- * @model
- * @generated
- * @ordered
- */
- public static final int AND = 15;
-
- /**
- * The '<em><b>OR</b></em>' literal value.
- * <!-- begin-user-doc -->
- * <!-- end-user-doc -->
- * <!-- begin-model-doc -->
- * | operator
- * <!-- end-model-doc -->
- * @see #OR_LITERAL
- * @model
- * @generated
- * @ordered
- */
- public static final int OR = 16;
-
- /**
- * The '<em><b>CONDITIONAL AND</b></em>' literal value.
- * <!-- begin-user-doc -->
- * <!-- end-user-doc -->
- * <!-- begin-model-doc -->
- * && operator
- * <!-- end-model-doc -->
- * @see #CONDITIONAL_AND_LITERAL
- * @model
- * @generated
- * @ordered
- */
- public static final int CONDITIONAL_AND = 17;
-
- /**
- * The '<em><b>CONDITIONAL OR</b></em>' literal value.
- * <!-- begin-user-doc -->
- * <!-- end-user-doc -->
- * <!-- begin-model-doc -->
- * || operator
- * <!-- end-model-doc -->
- * @see #CONDITIONAL_OR_LITERAL
- * @model
- * @generated
- * @ordered
- */
- public static final int CONDITIONAL_OR = 18;
-
- /**
- * The '<em><b>TIMES</b></em>' literal object.
- * <!-- begin-user-doc -->
- * <!-- end-user-doc -->
- * @see #TIMES
- * @generated
- * @ordered
- */
- public static final PTInfixOperator TIMES_LITERAL = new PTInfixOperator(TIMES, "TIMES");
-
- /**
- * The '<em><b>DIVIDE</b></em>' literal object.
- * <!-- begin-user-doc -->
- * <!-- end-user-doc -->
- * @see #DIVIDE
- * @generated
- * @ordered
- */
- public static final PTInfixOperator DIVIDE_LITERAL = new PTInfixOperator(DIVIDE, "DIVIDE");
-
- /**
- * The '<em><b>REMAINDER</b></em>' literal object.
- * <!-- begin-user-doc -->
- * <!-- end-user-doc -->
- * @see #REMAINDER
- * @generated
- * @ordered
- */
- public static final PTInfixOperator REMAINDER_LITERAL = new PTInfixOperator(REMAINDER, "REMAINDER");
-
- /**
- * The '<em><b>PLUS</b></em>' literal object.
- * <!-- begin-user-doc -->
- * <!-- end-user-doc -->
- * @see #PLUS
- * @generated
- * @ordered
- */
- public static final PTInfixOperator PLUS_LITERAL = new PTInfixOperator(PLUS, "PLUS");
-
- /**
- * The '<em><b>MINUS</b></em>' literal object.
- * <!-- begin-user-doc -->
- * <!-- end-user-doc -->
- * @see #MINUS
- * @generated
- * @ordered
- */
- public static final PTInfixOperator MINUS_LITERAL = new PTInfixOperator(MINUS, "MINUS");
-
- /**
- * The '<em><b>LEFT SHIFT</b></em>' literal object.
- * <!-- begin-user-doc -->
- * <!-- end-user-doc -->
- * @see #LEFT_SHIFT
- * @generated
- * @ordered
- */
- public static final PTInfixOperator LEFT_SHIFT_LITERAL = new PTInfixOperator(LEFT_SHIFT, "LEFT_SHIFT");
-
- /**
- * The '<em><b>RIGHT SHIFT SIGNED</b></em>' literal object.
- * <!-- begin-user-doc -->
- * <!-- end-user-doc -->
- * @see #RIGHT_SHIFT_SIGNED
- * @generated
- * @ordered
- */
- public static final PTInfixOperator RIGHT_SHIFT_SIGNED_LITERAL = new PTInfixOperator(RIGHT_SHIFT_SIGNED, "RIGHT_SHIFT_SIGNED");
-
- /**
- * The '<em><b>RIGHT SHIFT UNSIGNED</b></em>' literal object.
- * <!-- begin-user-doc -->
- * <!-- end-user-doc -->
- * @see #RIGHT_SHIFT_UNSIGNED
- * @generated
- * @ordered
- */
- public static final PTInfixOperator RIGHT_SHIFT_UNSIGNED_LITERAL = new PTInfixOperator(RIGHT_SHIFT_UNSIGNED, "RIGHT_SHIFT_UNSIGNED");
-
- /**
- * The '<em><b>LESS</b></em>' literal object.
- * <!-- begin-user-doc -->
- * <!-- end-user-doc -->
- * @see #LESS
- * @generated
- * @ordered
- */
- public static final PTInfixOperator LESS_LITERAL = new PTInfixOperator(LESS, "LESS");
-
- /**
- * The '<em><b>GREATER</b></em>' literal object.
- * <!-- begin-user-doc -->
- * <!-- end-user-doc -->
- * @see #GREATER
- * @generated
- * @ordered
- */
- public static final PTInfixOperator GREATER_LITERAL = new PTInfixOperator(GREATER, "GREATER");
-
- /**
- * The '<em><b>LESS EQUALS</b></em>' literal object.
- * <!-- begin-user-doc -->
- * <!-- end-user-doc -->
- * @see #LESS_EQUALS
- * @generated
- * @ordered
- */
- public static final PTInfixOperator LESS_EQUALS_LITERAL = new PTInfixOperator(LESS_EQUALS, "LESS_EQUALS");
-
- /**
- * The '<em><b>GREATER EQUALS</b></em>' literal object.
- * <!-- begin-user-doc -->
- * <!-- end-user-doc -->
- * @see #GREATER_EQUALS
- * @generated
- * @ordered
- */
- public static final PTInfixOperator GREATER_EQUALS_LITERAL = new PTInfixOperator(GREATER_EQUALS, "GREATER_EQUALS");
-
- /**
- * The '<em><b>EQUALS</b></em>' literal object.
- * <!-- begin-user-doc -->
- * <!-- end-user-doc -->
- * @see #EQUALS
- * @generated
- * @ordered
- */
- public static final PTInfixOperator EQUALS_LITERAL = new PTInfixOperator(EQUALS, "EQUALS");
-
- /**
- * The '<em><b>NOT EQUALS</b></em>' literal object.
- * <!-- begin-user-doc -->
- * <!-- end-user-doc -->
- * @see #NOT_EQUALS
- * @generated
- * @ordered
- */
- public static final PTInfixOperator NOT_EQUALS_LITERAL = new PTInfixOperator(NOT_EQUALS, "NOT_EQUALS");
-
- /**
- * The '<em><b>XOR</b></em>' literal object.
- * <!-- begin-user-doc -->
- * <!-- end-user-doc -->
- * @see #XOR
- * @generated
- * @ordered
- */
- public static final PTInfixOperator XOR_LITERAL = new PTInfixOperator(XOR, "XOR");
-
- /**
- * The '<em><b>AND</b></em>' literal object.
- * <!-- begin-user-doc -->
- * <!-- end-user-doc -->
- * @see #AND
- * @generated
- * @ordered
- */
- public static final PTInfixOperator AND_LITERAL = new PTInfixOperator(AND, "AND");
-
- /**
- * The '<em><b>OR</b></em>' literal object.
- * <!-- begin-user-doc -->
- * <!-- end-user-doc -->
- * @see #OR
- * @generated
- * @ordered
- */
- public static final PTInfixOperator OR_LITERAL = new PTInfixOperator(OR, "OR");
-
- /**
- * The '<em><b>CONDITIONAL AND</b></em>' literal object.
- * <!-- begin-user-doc -->
- * <!-- end-user-doc -->
- * @see #CONDITIONAL_AND
- * @generated
- * @ordered
- */
- public static final PTInfixOperator CONDITIONAL_AND_LITERAL = new PTInfixOperator(CONDITIONAL_AND, "CONDITIONAL_AND");
-
- /**
- * The '<em><b>CONDITIONAL OR</b></em>' literal object.
- * <!-- begin-user-doc -->
- * <!-- end-user-doc -->
- * @see #CONDITIONAL_OR
- * @generated
- * @ordered
- */
- public static final PTInfixOperator CONDITIONAL_OR_LITERAL = new PTInfixOperator(CONDITIONAL_OR, "CONDITIONAL_OR");
-
- /**
- * An array of all the '<em><b>PT Infix Operator</b></em>' enumerators.
- * <!-- begin-user-doc -->
- * <!-- end-user-doc -->
- * @generated
- */
- private static final PTInfixOperator[] VALUES_ARRAY =
- new PTInfixOperator[] {
- TIMES_LITERAL,
- DIVIDE_LITERAL,
- REMAINDER_LITERAL,
- PLUS_LITERAL,
- MINUS_LITERAL,
- LEFT_SHIFT_LITERAL,
- RIGHT_SHIFT_SIGNED_LITERAL,
- RIGHT_SHIFT_UNSIGNED_LITERAL,
- LESS_LITERAL,
- GREATER_LITERAL,
- LESS_EQUALS_LITERAL,
- GREATER_EQUALS_LITERAL,
- EQUALS_LITERAL,
- NOT_EQUALS_LITERAL,
- XOR_LITERAL,
- AND_LITERAL,
- OR_LITERAL,
- CONDITIONAL_AND_LITERAL,
- CONDITIONAL_OR_LITERAL,
- };
-
- private static final String[] OPERATOR_STRING;
- static {
- OPERATOR_STRING = new String[VALUES_ARRAY.length];
- OPERATOR_STRING[TIMES] = "*";
- OPERATOR_STRING[DIVIDE] = "/";
- OPERATOR_STRING[REMAINDER] = "%";
- OPERATOR_STRING[PLUS] = "+";
- OPERATOR_STRING[MINUS] = "-";
- OPERATOR_STRING[LEFT_SHIFT] = "<";
- OPERATOR_STRING[RIGHT_SHIFT_SIGNED] = ">>";
- OPERATOR_STRING[RIGHT_SHIFT_UNSIGNED] = ">>>";
- OPERATOR_STRING[LESS] = "<";
- OPERATOR_STRING[GREATER] = ">";
- OPERATOR_STRING[LESS_EQUALS] = "<=";
- OPERATOR_STRING[GREATER_EQUALS] = ">=";
- OPERATOR_STRING[EQUALS] = "==";
- OPERATOR_STRING[NOT_EQUALS] = "!=";
- OPERATOR_STRING[XOR] = "^";
- OPERATOR_STRING[AND] = "&";
- OPERATOR_STRING[OR] = "|";
- OPERATOR_STRING[CONDITIONAL_AND] = "&&";
- OPERATOR_STRING[CONDITIONAL_OR] = "||";
- }
-
- /**
- * A public read-only list of all the '<em><b>PT Infix Operator</b></em>' enumerators.
- * <!-- begin-user-doc -->
- * <!-- end-user-doc -->
- * @generated
- */
- public static final List VALUES = Collections.unmodifiableList(Arrays.asList(VALUES_ARRAY));
-
- /**
- * Returns the '<em><b>PT Infix Operator</b></em>' literal with the specified name.
- * <!-- begin-user-doc -->
- * <!-- end-user-doc -->
- * @generated
- */
- public static PTInfixOperator get(String name) {
- for (int i = 0; i < VALUES_ARRAY.length; ++i) {
- PTInfixOperator result = VALUES_ARRAY[i];
- if (result.toString().equals(name)) {
- return result;
- }
- }
- return null;
- }
-
- /**
- * Returns the '<em><b>PT Infix Operator</b></em>' literal with the specified value.
- * <!-- begin-user-doc -->
- * <!-- end-user-doc -->
- * @generated
- */
- public static PTInfixOperator get(int value) {
- switch (value) {
- case TIMES: return TIMES_LITERAL;
- case DIVIDE: return DIVIDE_LITERAL;
- case REMAINDER: return REMAINDER_LITERAL;
- case PLUS: return PLUS_LITERAL;
- case MINUS: return MINUS_LITERAL;
- case LEFT_SHIFT: return LEFT_SHIFT_LITERAL;
- case RIGHT_SHIFT_SIGNED: return RIGHT_SHIFT_SIGNED_LITERAL;
- case RIGHT_SHIFT_UNSIGNED: return RIGHT_SHIFT_UNSIGNED_LITERAL;
- case LESS: return LESS_LITERAL;
- case GREATER: return GREATER_LITERAL;
- case LESS_EQUALS: return LESS_EQUALS_LITERAL;
- case GREATER_EQUALS: return GREATER_EQUALS_LITERAL;
- case EQUALS: return EQUALS_LITERAL;
- case NOT_EQUALS: return NOT_EQUALS_LITERAL;
- case XOR: return XOR_LITERAL;
- case AND: return AND_LITERAL;
- case OR: return OR_LITERAL;
- case CONDITIONAL_AND: return CONDITIONAL_AND_LITERAL;
- case CONDITIONAL_OR: return CONDITIONAL_OR_LITERAL;
- }
- return null;
- }
-
- /**
- * Only this class can construct instances.
- * <!-- begin-user-doc -->
- * <!-- end-user-doc -->
- * @generated
- */
- private PTInfixOperator(int value, String name) {
- super(value, name);
- }
-
- /**
- * Return the operator string (i.e. for PLUS return "+").
- * @return The operator string.
- *
- * @since 1.0.0
- */
- public String getOperator() {
- return OPERATOR_STRING[getValue()];
- }
-
-} //InfixOperator
diff --git a/plugins/org.eclipse.jem/javainst/org/eclipse/jem/internal/instantiation/PTInstanceReference.java b/plugins/org.eclipse.jem/javainst/org/eclipse/jem/internal/instantiation/PTInstanceReference.java
deleted file mode 100644
index fdf516e..0000000
--- a/plugins/org.eclipse.jem/javainst/org/eclipse/jem/internal/instantiation/PTInstanceReference.java
+++ /dev/null
@@ -1,62 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2004, 2005 IBM Corporation and others.
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
- *
- * Contributors:
- * IBM Corporation - initial API and implementation
- *******************************************************************************/
-/*
-
-
- */
-package org.eclipse.jem.internal.instantiation;
-
-import org.eclipse.jem.internal.instantiation.base.IJavaInstance;
-
-/**
- * <!-- begin-user-doc -->
- * A representation of the model object '<em><b>PT Instance Reference</b></em>'.
- * <!-- end-user-doc -->
- *
- * <p>
- * The following features are supported:
- * <ul>
- * <li>{@link org.eclipse.jem.internal.instantiation.PTInstanceReference#getReference <em>Reference</em>}</li>
- * </ul>
- * </p>
- *
- * @see org.eclipse.jem.internal.instantiation.InstantiationPackage#getPTInstanceReference()
- * @model
- * @generated
- */
-public interface PTInstanceReference extends PTExpression{
- /**
- * Returns the value of the '<em><b>Reference</b></em>' reference.
- * <!-- begin-user-doc -->
- * <p>
- * If the meaning of the '<em>Reference</em>' reference isn't clear,
- * there really should be more of a description here...
- * </p>
- * <!-- end-user-doc -->
- * @return the value of the '<em>Reference</em>' reference.
- * @see #setReference(IJavaInstance)
- * @see org.eclipse.jem.internal.instantiation.InstantiationPackage#getPTInstanceReference_Reference()
- * @model required="true"
- * @generated
- */
- IJavaInstance getReference();
-
- /**
- * Sets the value of the '{@link org.eclipse.jem.internal.instantiation.PTInstanceReference#getReference <em>Reference</em>}' reference.
- * <!-- begin-user-doc -->
- * <!-- end-user-doc -->
- * @param value the new value of the '<em>Reference</em>' reference.
- * @see #getReference()
- * @generated
- */
- void setReference(IJavaInstance value);
-
-} // PTInstanceReference
diff --git a/plugins/org.eclipse.jem/javainst/org/eclipse/jem/internal/instantiation/PTInstanceof.java b/plugins/org.eclipse.jem/javainst/org/eclipse/jem/internal/instantiation/PTInstanceof.java
deleted file mode 100644
index 50c69ba..0000000
--- a/plugins/org.eclipse.jem/javainst/org/eclipse/jem/internal/instantiation/PTInstanceof.java
+++ /dev/null
@@ -1,89 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2004, 2005 IBM Corporation and others.
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
- *
- * Contributors:
- * IBM Corporation - initial API and implementation
- *******************************************************************************/
-/*
-
-
- */
-package org.eclipse.jem.internal.instantiation;
-
-/**
- * <!-- begin-user-doc -->
- * A representation of the model object '<em><b>Instanceof</b></em>'.
- * <!-- end-user-doc -->
- *
- * <!-- begin-model-doc -->
- * Instanceof expression, e.g. x instanceof java.lang.String
- * <!-- end-model-doc -->
- *
- * <p>
- * The following features are supported:
- * <ul>
- * <li>{@link org.eclipse.jem.internal.instantiation.PTInstanceof#getOperand <em>Operand</em>}</li>
- * <li>{@link org.eclipse.jem.internal.instantiation.PTInstanceof#getType <em>Type</em>}</li>
- * </ul>
- * </p>
- *
- * @see org.eclipse.jem.internal.instantiation.InstantiationPackage#getPTInstanceof()
- * @model
- * @generated
- */
-public interface PTInstanceof extends PTExpression{
- /**
- * Returns the value of the '<em><b>Operand</b></em>' containment reference.
- * <!-- begin-user-doc -->
- * <!-- end-user-doc -->
- * <!-- begin-model-doc -->
- * The value to test, e.g. x in x instanceof java.lang.String
- * <!-- end-model-doc -->
- * @return the value of the '<em>Operand</em>' containment reference.
- * @see #setOperand(PTExpression)
- * @see org.eclipse.jem.internal.instantiation.InstantiationPackage#getPTInstanceof_Operand()
- * @model containment="true"
- * @generated
- */
- PTExpression getOperand();
-
- /**
- * Sets the value of the '{@link org.eclipse.jem.internal.instantiation.PTInstanceof#getOperand <em>Operand</em>}' containment reference.
- * <!-- begin-user-doc -->
- * <!-- end-user-doc -->
- * @param value the new value of the '<em>Operand</em>' containment reference.
- * @see #getOperand()
- * @generated
- */
- void setOperand(PTExpression value);
-
- /**
- * Returns the value of the '<em><b>Type</b></em>' attribute.
- * <!-- begin-user-doc -->
- * <!-- end-user-doc -->
- * <!-- begin-model-doc -->
- * The type of the instance test, e.g. java.lang.String. It must be fully-qualified. If it is an inner class, it needs to be in reflection format, i.e. Y is inner class of j.X, then a reference to Y must be j.X$Y.
- * <!-- end-model-doc -->
- * @return the value of the '<em>Type</em>' attribute.
- * @see #setType(String)
- * @see org.eclipse.jem.internal.instantiation.InstantiationPackage#getPTInstanceof_Type()
- * @model
- * @generated
- */
- String getType();
-
- /**
- * Sets the value of the '{@link org.eclipse.jem.internal.instantiation.PTInstanceof#getType <em>Type</em>}' attribute.
- * <!-- begin-user-doc -->
- * <!-- end-user-doc -->
- * @param value the new value of the '<em>Type</em>' attribute.
- * @see #getType()
- * @generated
- */
- void setType(String value);
-
-} // Instanceof
diff --git a/plugins/org.eclipse.jem/javainst/org/eclipse/jem/internal/instantiation/PTInvalidExpression.java b/plugins/org.eclipse.jem/javainst/org/eclipse/jem/internal/instantiation/PTInvalidExpression.java
deleted file mode 100644
index 2c10984..0000000
--- a/plugins/org.eclipse.jem/javainst/org/eclipse/jem/internal/instantiation/PTInvalidExpression.java
+++ /dev/null
@@ -1,63 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2004, 2005 IBM Corporation and others.
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
- *
- * Contributors:
- * IBM Corporation - initial API and implementation
- *******************************************************************************/
-/*
-
-
- */
-package org.eclipse.jem.internal.instantiation;
-
-/**
- * <!-- begin-user-doc -->
- * A representation of the model object '<em><b>Invalid Expression</b></em>'.
- * <!-- end-user-doc -->
- *
- * <!-- begin-model-doc -->
- * This is used when we have some expression we just can't evaluate for our purposes. It allows us to tell the evaluation what is actually wrong. It should be placed as the root expression to prevent processing much of the tree and then finally fail.
- * <!-- end-model-doc -->
- *
- * <p>
- * The following features are supported:
- * <ul>
- * <li>{@link org.eclipse.jem.internal.instantiation.PTInvalidExpression#getMessage <em>Message</em>}</li>
- * </ul>
- * </p>
- *
- * @see org.eclipse.jem.internal.instantiation.InstantiationPackage#getPTInvalidExpression()
- * @model
- * @generated
- */
-public interface PTInvalidExpression extends PTExpression{
- /**
- * Returns the value of the '<em><b>Message</b></em>' attribute.
- * <!-- begin-user-doc -->
- * <!-- end-user-doc -->
- * <!-- begin-model-doc -->
- * A message as to why it is invalid.
- * <!-- end-model-doc -->
- * @return the value of the '<em>Message</em>' attribute.
- * @see #setMessage(String)
- * @see org.eclipse.jem.internal.instantiation.InstantiationPackage#getPTInvalidExpression_Message()
- * @model
- * @generated
- */
- String getMessage();
-
- /**
- * Sets the value of the '{@link org.eclipse.jem.internal.instantiation.PTInvalidExpression#getMessage <em>Message</em>}' attribute.
- * <!-- begin-user-doc -->
- * <!-- end-user-doc -->
- * @param value the new value of the '<em>Message</em>' attribute.
- * @see #getMessage()
- * @generated
- */
- void setMessage(String value);
-
-} // InvalidExpression
diff --git a/plugins/org.eclipse.jem/javainst/org/eclipse/jem/internal/instantiation/PTMethodInvocation.java b/plugins/org.eclipse.jem/javainst/org/eclipse/jem/internal/instantiation/PTMethodInvocation.java
deleted file mode 100644
index 79625b6..0000000
--- a/plugins/org.eclipse.jem/javainst/org/eclipse/jem/internal/instantiation/PTMethodInvocation.java
+++ /dev/null
@@ -1,106 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2004, 2005 IBM Corporation and others.
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
- *
- * Contributors:
- * IBM Corporation - initial API and implementation
- *******************************************************************************/
-package org.eclipse.jem.internal.instantiation;
-/*
-
-
- */
-import org.eclipse.emf.common.util.EList;
-
-/**
- * <!-- begin-user-doc -->
- * A representation of the model object '<em><b>Method Invocation</b></em>'.
- * <!-- end-user-doc -->
- *
- * <!-- begin-model-doc -->
- * MethodInvocation expression, e.g. x.getY(3)
- * <!-- end-model-doc -->
- *
- * <p>
- * The following features are supported:
- * <ul>
- * <li>{@link org.eclipse.jem.internal.instantiation.PTMethodInvocation#getReceiver <em>Receiver</em>}</li>
- * <li>{@link org.eclipse.jem.internal.instantiation.PTMethodInvocation#getName <em>Name</em>}</li>
- * <li>{@link org.eclipse.jem.internal.instantiation.PTMethodInvocation#getArguments <em>Arguments</em>}</li>
- * </ul>
- * </p>
- *
- * @see org.eclipse.jem.internal.instantiation.InstantiationPackage#getPTMethodInvocation()
- * @model
- * @generated
- */
-public interface PTMethodInvocation extends PTExpression{
- /**
- * Returns the value of the '<em><b>Receiver</b></em>' containment reference.
- * <!-- begin-user-doc -->
- * <!-- end-user-doc -->
- * <!-- begin-model-doc -->
- * Who the method is invoked against. This may be not set, which means "this". It may also be a Name, which would mean a class like "java.lang.String"
- * <!-- end-model-doc -->
- * @return the value of the '<em>Receiver</em>' containment reference.
- * @see #setReceiver(PTExpression)
- * @see org.eclipse.jem.internal.instantiation.InstantiationPackage#getPTMethodInvocation_Receiver()
- * @model containment="true"
- * @generated
- */
- PTExpression getReceiver();
-
- /**
- * Sets the value of the '{@link org.eclipse.jem.internal.instantiation.PTMethodInvocation#getReceiver <em>Receiver</em>}' containment reference.
- * <!-- begin-user-doc -->
- * <!-- end-user-doc -->
- * @param value the new value of the '<em>Receiver</em>' containment reference.
- * @see #getReceiver()
- * @generated
- */
- void setReceiver(PTExpression value);
-
- /**
- * Returns the value of the '<em><b>Name</b></em>' attribute.
- * <!-- begin-user-doc -->
- * <!-- end-user-doc -->
- * <!-- begin-model-doc -->
- * The name of the method being invoked.
- * <!-- end-model-doc -->
- * @return the value of the '<em>Name</em>' attribute.
- * @see #setName(String)
- * @see org.eclipse.jem.internal.instantiation.InstantiationPackage#getPTMethodInvocation_Name()
- * @model
- * @generated
- */
- String getName();
-
- /**
- * Sets the value of the '{@link org.eclipse.jem.internal.instantiation.PTMethodInvocation#getName <em>Name</em>}' attribute.
- * <!-- begin-user-doc -->
- * <!-- end-user-doc -->
- * @param value the new value of the '<em>Name</em>' attribute.
- * @see #getName()
- * @generated
- */
- void setName(String value);
-
- /**
- * Returns the value of the '<em><b>Arguments</b></em>' containment reference list.
- * The list contents are of type {@link org.eclipse.jem.internal.instantiation.PTExpression}.
- * <!-- begin-user-doc -->
- * <!-- end-user-doc -->
- * <!-- begin-model-doc -->
- * The list of arguments, if any, to the method.
- * <!-- end-model-doc -->
- * @return the value of the '<em>Arguments</em>' containment reference list.
- * @see org.eclipse.jem.internal.instantiation.InstantiationPackage#getPTMethodInvocation_Arguments()
- * @model type="org.eclipse.jem.internal.instantiation.PTExpression" containment="true"
- * @generated
- */
- EList getArguments();
-
-} // MethodInvocation
diff --git a/plugins/org.eclipse.jem/javainst/org/eclipse/jem/internal/instantiation/PTName.java b/plugins/org.eclipse.jem/javainst/org/eclipse/jem/internal/instantiation/PTName.java
deleted file mode 100644
index 6a7cbe9..0000000
--- a/plugins/org.eclipse.jem/javainst/org/eclipse/jem/internal/instantiation/PTName.java
+++ /dev/null
@@ -1,63 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2004, 2005 IBM Corporation and others.
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
- *
- * Contributors:
- * IBM Corporation - initial API and implementation
- *******************************************************************************/
-/*
-
-
- */
-package org.eclipse.jem.internal.instantiation;
-
-/**
- * <!-- begin-user-doc -->
- * A representation of the model object '<em><b>Name</b></em>'.
- * <!-- end-user-doc -->
- *
- * <!-- begin-model-doc -->
- * This represents a name. This can happen for the receiver of a method invocation, e.g. x.getY() or java.lang.String.valueOf(10). In these cases you would have a name of "x" or "java.lang.String".
- * <!-- end-model-doc -->
- *
- * <p>
- * The following features are supported:
- * <ul>
- * <li>{@link org.eclipse.jem.internal.instantiation.PTName#getName <em>Name</em>}</li>
- * </ul>
- * </p>
- *
- * @see org.eclipse.jem.internal.instantiation.InstantiationPackage#getPTName()
- * @model
- * @generated
- */
-public interface PTName extends PTExpression{
- /**
- * Returns the value of the '<em><b>Name</b></em>' attribute.
- * <!-- begin-user-doc -->
- * <!-- end-user-doc -->
- * <!-- begin-model-doc -->
- * The name, which can be a type or a variable. If it is a type, then it must be fully-qualified. If it is an inner class, it needs to be in reflection format, i.e. Y is inner class of j.X, then a reference to Y must be j.X$Y.
- * <!-- end-model-doc -->
- * @return the value of the '<em>Name</em>' attribute.
- * @see #setName(String)
- * @see org.eclipse.jem.internal.instantiation.InstantiationPackage#getPTName_Name()
- * @model
- * @generated
- */
- String getName();
-
- /**
- * Sets the value of the '{@link org.eclipse.jem.internal.instantiation.PTName#getName <em>Name</em>}' attribute.
- * <!-- begin-user-doc -->
- * <!-- end-user-doc -->
- * @param value the new value of the '<em>Name</em>' attribute.
- * @see #getName()
- * @generated
- */
- void setName(String value);
-
-} // Name
diff --git a/plugins/org.eclipse.jem/javainst/org/eclipse/jem/internal/instantiation/PTNullLiteral.java b/plugins/org.eclipse.jem/javainst/org/eclipse/jem/internal/instantiation/PTNullLiteral.java
deleted file mode 100644
index 96f06ab..0000000
--- a/plugins/org.eclipse.jem/javainst/org/eclipse/jem/internal/instantiation/PTNullLiteral.java
+++ /dev/null
@@ -1,32 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2004, 2005 IBM Corporation and others.
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
- *
- * Contributors:
- * IBM Corporation - initial API and implementation
- *******************************************************************************/
-/*
-
-
- */
-package org.eclipse.jem.internal.instantiation;
-
-/**
- * <!-- begin-user-doc -->
- * A representation of the model object '<em><b>Null Literal</b></em>'.
- * <!-- end-user-doc -->
- *
- * <!-- begin-model-doc -->
- * Represents the expression "null"
- * <!-- end-model-doc -->
- *
- *
- * @see org.eclipse.jem.internal.instantiation.InstantiationPackage#getPTNullLiteral()
- * @model
- * @generated
- */
-public interface PTNullLiteral extends PTExpression{
-} // NullLiteral
diff --git a/plugins/org.eclipse.jem/javainst/org/eclipse/jem/internal/instantiation/PTNumberLiteral.java b/plugins/org.eclipse.jem/javainst/org/eclipse/jem/internal/instantiation/PTNumberLiteral.java
deleted file mode 100644
index 77d423c..0000000
--- a/plugins/org.eclipse.jem/javainst/org/eclipse/jem/internal/instantiation/PTNumberLiteral.java
+++ /dev/null
@@ -1,64 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2004, 2005 IBM Corporation and others.
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
- *
- * Contributors:
- * IBM Corporation - initial API and implementation
- *******************************************************************************/
-/*
-
-
- */
-package org.eclipse.jem.internal.instantiation;
-
-
-/**
- * <!-- begin-user-doc -->
- * A representation of the model object '<em><b>Number Literal</b></em>'.
- * <!-- end-user-doc -->
- *
- * <!-- begin-model-doc -->
- * Represent a number primitive literal, e.g. 10. One optimization that will be performed is that if an expression is of the form +number or -number, it will be converted from a PrefixExpression with a NumberLiteral to just a NumberLiteral. This will simplify the model.
- * <!-- end-model-doc -->
- *
- * <p>
- * The following features are supported:
- * <ul>
- * <li>{@link org.eclipse.jem.internal.instantiation.PTNumberLiteral#getToken <em>Token</em>}</li>
- * </ul>
- * </p>
- *
- * @see org.eclipse.jem.internal.instantiation.InstantiationPackage#getPTNumberLiteral()
- * @model
- * @generated
- */
-public interface PTNumberLiteral extends PTExpression{
- /**
- * Returns the value of the '<em><b>Token</b></em>' attribute.
- * <!-- begin-user-doc -->
- * <!-- end-user-doc -->
- * <!-- begin-model-doc -->
- * The token value, e.g. 10, 10d, or -10.75
- * <!-- end-model-doc -->
- * @return the value of the '<em>Token</em>' attribute.
- * @see #setToken(String)
- * @see org.eclipse.jem.internal.instantiation.InstantiationPackage#getPTNumberLiteral_Token()
- * @model
- * @generated
- */
- String getToken();
-
- /**
- * Sets the value of the '{@link org.eclipse.jem.internal.instantiation.PTNumberLiteral#getToken <em>Token</em>}' attribute.
- * <!-- begin-user-doc -->
- * <!-- end-user-doc -->
- * @param value the new value of the '<em>Token</em>' attribute.
- * @see #getToken()
- * @generated
- */
- void setToken(String value);
-
-} // NumberLiteral
diff --git a/plugins/org.eclipse.jem/javainst/org/eclipse/jem/internal/instantiation/PTParenthesizedExpression.java b/plugins/org.eclipse.jem/javainst/org/eclipse/jem/internal/instantiation/PTParenthesizedExpression.java
deleted file mode 100644
index 01f9eb6..0000000
--- a/plugins/org.eclipse.jem/javainst/org/eclipse/jem/internal/instantiation/PTParenthesizedExpression.java
+++ /dev/null
@@ -1,63 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2004, 2005 IBM Corporation and others.
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
- *
- * Contributors:
- * IBM Corporation - initial API and implementation
- *******************************************************************************/
-/*
-
-
- */
-package org.eclipse.jem.internal.instantiation;
-
-/**
- * <!-- begin-user-doc -->
- * A representation of the model object '<em><b>Parenthesized Expression</b></em>'.
- * <!-- end-user-doc -->
- *
- * <!-- begin-model-doc -->
- * An expression within parenthesis, e.g. (x+3)
- * <!-- end-model-doc -->
- *
- * <p>
- * The following features are supported:
- * <ul>
- * <li>{@link org.eclipse.jem.internal.instantiation.PTParenthesizedExpression#getExpression <em>Expression</em>}</li>
- * </ul>
- * </p>
- *
- * @see org.eclipse.jem.internal.instantiation.InstantiationPackage#getPTParenthesizedExpression()
- * @model
- * @generated
- */
-public interface PTParenthesizedExpression extends PTExpression{
- /**
- * Returns the value of the '<em><b>Expression</b></em>' containment reference.
- * <!-- begin-user-doc -->
- * <!-- end-user-doc -->
- * <!-- begin-model-doc -->
- * The expression wrapped by the parenthesis, e.g. (x+3) then the expression is "x+3"
- * <!-- end-model-doc -->
- * @return the value of the '<em>Expression</em>' containment reference.
- * @see #setExpression(PTExpression)
- * @see org.eclipse.jem.internal.instantiation.InstantiationPackage#getPTParenthesizedExpression_Expression()
- * @model containment="true"
- * @generated
- */
- PTExpression getExpression();
-
- /**
- * Sets the value of the '{@link org.eclipse.jem.internal.instantiation.PTParenthesizedExpression#getExpression <em>Expression</em>}' containment reference.
- * <!-- begin-user-doc -->
- * <!-- end-user-doc -->
- * @param value the new value of the '<em>Expression</em>' containment reference.
- * @see #getExpression()
- * @generated
- */
- void setExpression(PTExpression value);
-
-} // ParenthesizedExpression
diff --git a/plugins/org.eclipse.jem/javainst/org/eclipse/jem/internal/instantiation/PTPrefixExpression.java b/plugins/org.eclipse.jem/javainst/org/eclipse/jem/internal/instantiation/PTPrefixExpression.java
deleted file mode 100644
index a59041b..0000000
--- a/plugins/org.eclipse.jem/javainst/org/eclipse/jem/internal/instantiation/PTPrefixExpression.java
+++ /dev/null
@@ -1,92 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2004, 2005 IBM Corporation and others.
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
- *
- * Contributors:
- * IBM Corporation - initial API and implementation
- *******************************************************************************/
-/*
-
-
- */
-package org.eclipse.jem.internal.instantiation;
-
-/**
- * <!-- begin-user-doc -->
- * A representation of the model object '<em><b>Prefix Expression</b></em>'.
- * <!-- end-user-doc -->
- *
- * <!-- begin-model-doc -->
- * A one operand operator, where the operator comes before the operand, e.g. - (x+3). In AST, even -3 is modeled as a PrefixExpression of operator "-" and expression of NumberLiteral(3). But we optimize this away and just use a NumberLiteral(-3) directly instead.
- * <!-- end-model-doc -->
- *
- * <p>
- * The following features are supported:
- * <ul>
- * <li>{@link org.eclipse.jem.internal.instantiation.PTPrefixExpression#getOperator <em>Operator</em>}</li>
- * <li>{@link org.eclipse.jem.internal.instantiation.PTPrefixExpression#getExpression <em>Expression</em>}</li>
- * </ul>
- * </p>
- *
- * @see org.eclipse.jem.internal.instantiation.InstantiationPackage#getPTPrefixExpression()
- * @model
- * @generated
- */
-public interface PTPrefixExpression extends PTExpression{
- /**
- * Returns the value of the '<em><b>Operator</b></em>' attribute.
- * The literals are from the enumeration {@link org.eclipse.jem.internal.instantiation.PTPrefixOperator}.
- * <!-- begin-user-doc -->
- * <!-- end-user-doc -->
- * <!-- begin-model-doc -->
- * The operator of this expression.
- * <!-- end-model-doc -->
- * @return the value of the '<em>Operator</em>' attribute.
- * @see org.eclipse.jem.internal.instantiation.PTPrefixOperator
- * @see #setOperator(PTPrefixOperator)
- * @see org.eclipse.jem.internal.instantiation.InstantiationPackage#getPTPrefixExpression_Operator()
- * @model
- * @generated
- */
- PTPrefixOperator getOperator();
-
- /**
- * Sets the value of the '{@link org.eclipse.jem.internal.instantiation.PTPrefixExpression#getOperator <em>Operator</em>}' attribute.
- * <!-- begin-user-doc -->
- * <!-- end-user-doc -->
- * @param value the new value of the '<em>Operator</em>' attribute.
- * @see org.eclipse.jem.internal.instantiation.PTPrefixOperator
- * @see #getOperator()
- * @generated
- */
- void setOperator(PTPrefixOperator value);
-
- /**
- * Returns the value of the '<em><b>Expression</b></em>' containment reference.
- * <!-- begin-user-doc -->
- * <!-- end-user-doc -->
- * <!-- begin-model-doc -->
- * The expression that the operator is applied to.
- * <!-- end-model-doc -->
- * @return the value of the '<em>Expression</em>' containment reference.
- * @see #setExpression(PTExpression)
- * @see org.eclipse.jem.internal.instantiation.InstantiationPackage#getPTPrefixExpression_Expression()
- * @model containment="true"
- * @generated
- */
- PTExpression getExpression();
-
- /**
- * Sets the value of the '{@link org.eclipse.jem.internal.instantiation.PTPrefixExpression#getExpression <em>Expression</em>}' containment reference.
- * <!-- begin-user-doc -->
- * <!-- end-user-doc -->
- * @param value the new value of the '<em>Expression</em>' containment reference.
- * @see #getExpression()
- * @generated
- */
- void setExpression(PTExpression value);
-
-} // PrefixExpression
diff --git a/plugins/org.eclipse.jem/javainst/org/eclipse/jem/internal/instantiation/PTPrefixOperator.java b/plugins/org.eclipse.jem/javainst/org/eclipse/jem/internal/instantiation/PTPrefixOperator.java
deleted file mode 100644
index f95d4b7..0000000
--- a/plugins/org.eclipse.jem/javainst/org/eclipse/jem/internal/instantiation/PTPrefixOperator.java
+++ /dev/null
@@ -1,213 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2004, 2005 IBM Corporation and others.
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
- *
- * Contributors:
- * IBM Corporation - initial API and implementation
- *******************************************************************************/
-package org.eclipse.jem.internal.instantiation;
-/*
-
-
- */
-import java.util.Arrays;
-import java.util.Collections;
-import java.util.List;
-
-import org.eclipse.emf.common.util.AbstractEnumerator;
-
-/**
- * <!-- begin-user-doc -->
- * A representation of the literals of the enumeration '<em><b>Prefix Operator</b></em>',
- * and utility methods for working with them.
- * <!-- end-user-doc -->
- * <!-- begin-model-doc -->
- * The prefix expression operator. We are not modeling ++ and --.
- * <!-- end-model-doc -->
- * @see org.eclipse.jem.internal.instantiation.InstantiationPackage#getPTPrefixOperator()
- * @model
- * @generated
- */
-public final class PTPrefixOperator extends AbstractEnumerator {
- /**
- * The '<em><b>PLUS</b></em>' literal value.
- * <!-- begin-user-doc -->
- * <!-- end-user-doc -->
- * <!-- begin-model-doc -->
- * + operator
- * <!-- end-model-doc -->
- * @see #PLUS_LITERAL
- * @model
- * @generated
- * @ordered
- */
- public static final int PLUS = 0;
-
- /**
- * The '<em><b>MINUS</b></em>' literal value.
- * <!-- begin-user-doc -->
- * <!-- end-user-doc -->
- * <!-- begin-model-doc -->
- * - operator
- * <!-- end-model-doc -->
- * @see #MINUS_LITERAL
- * @model
- * @generated
- * @ordered
- */
- public static final int MINUS = 1;
-
- /**
- * The '<em><b>COMPLEMENT</b></em>' literal value.
- * <!-- begin-user-doc -->
- * <!-- end-user-doc -->
- * <!-- begin-model-doc -->
- * ~ operator
- * <!-- end-model-doc -->
- * @see #COMPLEMENT_LITERAL
- * @model
- * @generated
- * @ordered
- */
- public static final int COMPLEMENT = 2;
-
- /**
- * The '<em><b>NOT</b></em>' literal value.
- * <!-- begin-user-doc -->
- * <!-- end-user-doc -->
- * <!-- begin-model-doc -->
- * ! operator
- * <!-- end-model-doc -->
- * @see #NOT_LITERAL
- * @model
- * @generated
- * @ordered
- */
- public static final int NOT = 3;
-
- /**
- * The '<em><b>PLUS</b></em>' literal object.
- * <!-- begin-user-doc -->
- * <!-- end-user-doc -->
- * @see #PLUS
- * @generated
- * @ordered
- */
- public static final PTPrefixOperator PLUS_LITERAL = new PTPrefixOperator(PLUS, "PLUS");
-
- /**
- * The '<em><b>MINUS</b></em>' literal object.
- * <!-- begin-user-doc -->
- * <!-- end-user-doc -->
- * @see #MINUS
- * @generated
- * @ordered
- */
- public static final PTPrefixOperator MINUS_LITERAL = new PTPrefixOperator(MINUS, "MINUS");
-
- /**
- * The '<em><b>COMPLEMENT</b></em>' literal object.
- * <!-- begin-user-doc -->
- * <!-- end-user-doc -->
- * @see #COMPLEMENT
- * @generated
- * @ordered
- */
- public static final PTPrefixOperator COMPLEMENT_LITERAL = new PTPrefixOperator(COMPLEMENT, "COMPLEMENT");
-
- /**
- * The '<em><b>NOT</b></em>' literal object.
- * <!-- begin-user-doc -->
- * <!-- end-user-doc -->
- * @see #NOT
- * @generated
- * @ordered
- */
- public static final PTPrefixOperator NOT_LITERAL = new PTPrefixOperator(NOT, "NOT");
-
- /**
- * An array of all the '<em><b>PT Prefix Operator</b></em>' enumerators.
- * <!-- begin-user-doc -->
- * <!-- end-user-doc -->
- * @generated
- */
- private static final PTPrefixOperator[] VALUES_ARRAY =
- new PTPrefixOperator[] {
- PLUS_LITERAL,
- MINUS_LITERAL,
- COMPLEMENT_LITERAL,
- NOT_LITERAL,
- };
-
- private static final String[] OPERATOR_STRING;
- static {
- OPERATOR_STRING = new String[VALUES_ARRAY.length];
- OPERATOR_STRING[PLUS] = "+";
- OPERATOR_STRING[MINUS] = "-";
- OPERATOR_STRING[COMPLEMENT] = "~";
- OPERATOR_STRING[NOT] = "!";
- }
-
- /**
- * A public read-only list of all the '<em><b>PT Prefix Operator</b></em>' enumerators.
- * <!-- begin-user-doc -->
- * <!-- end-user-doc -->
- * @generated
- */
- public static final List VALUES = Collections.unmodifiableList(Arrays.asList(VALUES_ARRAY));
-
- /**
- * Returns the '<em><b>PT Prefix Operator</b></em>' literal with the specified name.
- * <!-- begin-user-doc -->
- * <!-- end-user-doc -->
- * @generated
- */
- public static PTPrefixOperator get(String name) {
- for (int i = 0; i < VALUES_ARRAY.length; ++i) {
- PTPrefixOperator result = VALUES_ARRAY[i];
- if (result.toString().equals(name)) {
- return result;
- }
- }
- return null;
- }
-
- /**
- * Returns the '<em><b>PT Prefix Operator</b></em>' literal with the specified value.
- * <!-- begin-user-doc -->
- * <!-- end-user-doc -->
- * @generated
- */
- public static PTPrefixOperator get(int value) {
- switch (value) {
- case PLUS: return PLUS_LITERAL;
- case MINUS: return MINUS_LITERAL;
- case COMPLEMENT: return COMPLEMENT_LITERAL;
- case NOT: return NOT_LITERAL;
- }
- return null;
- }
-
- /**
- * Only this class can construct instances.
- * <!-- begin-user-doc -->
- * <!-- end-user-doc -->
- * @generated
- */
- private PTPrefixOperator(int value, String name) {
- super(value, name);
- }
-
- /**
- * Return the operator string (i.e. for PLUS return "+").
- * @return The operator string.
- *
- * @since 1.0.0
- */
- public String getOperator() {
- return OPERATOR_STRING[getValue()];
- }
-} //PrefixOperator
diff --git a/plugins/org.eclipse.jem/javainst/org/eclipse/jem/internal/instantiation/PTStringLiteral.java b/plugins/org.eclipse.jem/javainst/org/eclipse/jem/internal/instantiation/PTStringLiteral.java
deleted file mode 100644
index 0ba5ecb..0000000
--- a/plugins/org.eclipse.jem/javainst/org/eclipse/jem/internal/instantiation/PTStringLiteral.java
+++ /dev/null
@@ -1,89 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2004, 2005 IBM Corporation and others.
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
- *
- * Contributors:
- * IBM Corporation - initial API and implementation
- *******************************************************************************/
-/*
-
-
- */
-package org.eclipse.jem.internal.instantiation;
-
-/**
- * <!-- begin-user-doc -->
- * A representation of the model object '<em><b>String Literal</b></em>'.
- * <!-- end-user-doc -->
- *
- * <!-- begin-model-doc -->
- * Representation of a string literal, e.g. "asdf".
- * <!-- end-model-doc -->
- *
- * <p>
- * The following features are supported:
- * <ul>
- * <li>{@link org.eclipse.jem.internal.instantiation.PTStringLiteral#getEscapedValue <em>Escaped Value</em>}</li>
- * <li>{@link org.eclipse.jem.internal.instantiation.PTStringLiteral#getLiteralValue <em>Literal Value</em>}</li>
- * </ul>
- * </p>
- *
- * @see org.eclipse.jem.internal.instantiation.InstantiationPackage#getPTStringLiteral()
- * @model
- * @generated
- */
-public interface PTStringLiteral extends PTExpression{
- /**
- * Returns the value of the '<em><b>Escaped Value</b></em>' attribute.
- * <!-- begin-user-doc -->
- * <!-- end-user-doc -->
- * <!-- begin-model-doc -->
- * This is the escaped string. In other words the literal exactly as it is in the java file. E.g. "ab" or "c\r". Including the surrounding quotes themselves.
- * <!-- end-model-doc -->
- * @return the value of the '<em>Escaped Value</em>' attribute.
- * @see #setEscapedValue(String)
- * @see org.eclipse.jem.internal.instantiation.InstantiationPackage#getPTStringLiteral_EscapedValue()
- * @model
- * @generated
- */
- String getEscapedValue();
-
- /**
- * Sets the value of the '{@link org.eclipse.jem.internal.instantiation.PTStringLiteral#getEscapedValue <em>Escaped Value</em>}' attribute.
- * <!-- begin-user-doc -->
- * <!-- end-user-doc -->
- * @param value the new value of the '<em>Escaped Value</em>' attribute.
- * @see #getEscapedValue()
- * @generated
- */
- void setEscapedValue(String value);
-
- /**
- * Returns the value of the '<em><b>Literal Value</b></em>' attribute.
- * <!-- begin-user-doc -->
- * <!-- end-user-doc -->
- * <!-- begin-model-doc -->
- * The actual string without the quotes. Escape are evaluated and turned into their character value. This is a transient field. If not set when created when queried it will create it. Typically it will be set when created from an AST node since the node already has evaluated it.
- * <!-- end-model-doc -->
- * @return the value of the '<em>Literal Value</em>' attribute.
- * @see #setLiteralValue(String)
- * @see org.eclipse.jem.internal.instantiation.InstantiationPackage#getPTStringLiteral_LiteralValue()
- * @model transient="true"
- * @generated
- */
- String getLiteralValue();
-
- /**
- * Sets the value of the '{@link org.eclipse.jem.internal.instantiation.PTStringLiteral#getLiteralValue <em>Literal Value</em>}' attribute.
- * <!-- begin-user-doc -->
- * <!-- end-user-doc -->
- * @param value the new value of the '<em>Literal Value</em>' attribute.
- * @see #getLiteralValue()
- * @generated
- */
- void setLiteralValue(String value);
-
-} // StringLiteral
diff --git a/plugins/org.eclipse.jem/javainst/org/eclipse/jem/internal/instantiation/PTThisLiteral.java b/plugins/org.eclipse.jem/javainst/org/eclipse/jem/internal/instantiation/PTThisLiteral.java
deleted file mode 100644
index b239ca7..0000000
--- a/plugins/org.eclipse.jem/javainst/org/eclipse/jem/internal/instantiation/PTThisLiteral.java
+++ /dev/null
@@ -1,32 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2004, 2005 IBM Corporation and others.
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
- *
- * Contributors:
- * IBM Corporation - initial API and implementation
- *******************************************************************************/
-/*
-
-
- */
-package org.eclipse.jem.internal.instantiation;
-
-/**
- * <!-- begin-user-doc -->
- * A representation of the model object '<em><b>This Literal</b></em>'.
- * <!-- end-user-doc -->
- *
- * <!-- begin-model-doc -->
- * Represents "this", e.g. this.getX() will be a MethodInvocation with the receiver being a ThisLiteral. We can't handle the format XYZ.this because that is for inner classes and we don't support that right now.
- * <!-- end-model-doc -->
- *
- *
- * @see org.eclipse.jem.internal.instantiation.InstantiationPackage#getPTThisLiteral()
- * @model
- * @generated
- */
-public interface PTThisLiteral extends PTExpression{
-} // ThisLiteral
diff --git a/plugins/org.eclipse.jem/javainst/org/eclipse/jem/internal/instantiation/PTTypeLiteral.java b/plugins/org.eclipse.jem/javainst/org/eclipse/jem/internal/instantiation/PTTypeLiteral.java
deleted file mode 100644
index 83a917b..0000000
--- a/plugins/org.eclipse.jem/javainst/org/eclipse/jem/internal/instantiation/PTTypeLiteral.java
+++ /dev/null
@@ -1,63 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2004, 2005 IBM Corporation and others.
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
- *
- * Contributors:
- * IBM Corporation - initial API and implementation
- *******************************************************************************/
-/*
-
-
- */
-package org.eclipse.jem.internal.instantiation;
-
-/**
- * <!-- begin-user-doc -->
- * A representation of the model object '<em><b>Type Literal</b></em>'.
- * <!-- end-user-doc -->
- *
- * <!-- begin-model-doc -->
- * This represents a literal of the form j.XYZ.class. For instance in a method invocation x.getX(jXYZ.class) the argument will be a TypeLiteral.
- * <!-- end-model-doc -->
- *
- * <p>
- * The following features are supported:
- * <ul>
- * <li>{@link org.eclipse.jem.internal.instantiation.PTTypeLiteral#getType <em>Type</em>}</li>
- * </ul>
- * </p>
- *
- * @see org.eclipse.jem.internal.instantiation.InstantiationPackage#getPTTypeLiteral()
- * @model
- * @generated
- */
-public interface PTTypeLiteral extends PTExpression{
- /**
- * Returns the value of the '<em><b>Type</b></em>' attribute.
- * <!-- begin-user-doc -->
- * <!-- end-user-doc -->
- * <!-- begin-model-doc -->
- * The type of the literal. It must be fully-qualified. If it is an inner class, it needs to be in reflection format, i.e. Y is inner class of j.X, then a reference to Y must be j.X$Y.
- * <!-- end-model-doc -->
- * @return the value of the '<em>Type</em>' attribute.
- * @see #setType(String)
- * @see org.eclipse.jem.internal.instantiation.InstantiationPackage#getPTTypeLiteral_Type()
- * @model
- * @generated
- */
- String getType();
-
- /**
- * Sets the value of the '{@link org.eclipse.jem.internal.instantiation.PTTypeLiteral#getType <em>Type</em>}' attribute.
- * <!-- begin-user-doc -->
- * <!-- end-user-doc -->
- * @param value the new value of the '<em>Type</em>' attribute.
- * @see #getType()
- * @generated
- */
- void setType(String value);
-
-} // TypeLiteral
diff --git a/plugins/org.eclipse.jem/javainst/org/eclipse/jem/internal/instantiation/ParseTreeAllocation.java b/plugins/org.eclipse.jem/javainst/org/eclipse/jem/internal/instantiation/ParseTreeAllocation.java
deleted file mode 100644
index b3356b4..0000000
--- a/plugins/org.eclipse.jem/javainst/org/eclipse/jem/internal/instantiation/ParseTreeAllocation.java
+++ /dev/null
@@ -1,64 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2004, 2005 IBM Corporation and others.
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
- *
- * Contributors:
- * IBM Corporation - initial API and implementation
- *******************************************************************************/
-/*
-
-
- */
-package org.eclipse.jem.internal.instantiation;
-
-/**
- * <!-- begin-user-doc -->
- * A representation of the model object '<em><b>Parse Tree Allocation</b></em>'.
- * <!-- end-user-doc -->
- *
- * <!-- begin-model-doc -->
- * Allocations via Parse Trees.
- * <!-- end-model-doc -->
- *
- * <p>
- * The following features are supported:
- * <ul>
- * <li>{@link org.eclipse.jem.internal.instantiation.ParseTreeAllocation#getExpression <em>Expression</em>}</li>
- * </ul>
- * </p>
- *
- * @see org.eclipse.jem.internal.instantiation.InstantiationPackage#getParseTreeAllocation()
- * @model
- * @generated
- */
-public interface ParseTreeAllocation extends JavaAllocation{
- /**
- * Returns the value of the '<em><b>Expression</b></em>' containment reference.
- * <!-- begin-user-doc -->
- * <p>
- * If the meaning of the '<em>Expression</em>' containment reference list isn't clear,
- * there really should be more of a description here...
- * </p>
- * <!-- end-user-doc -->
- * @return the value of the '<em>Expression</em>' containment reference.
- * @see #setExpression(PTExpression)
- * @see org.eclipse.jem.internal.instantiation.InstantiationPackage#getParseTreeAllocation_Expression()
- * @model containment="true" required="true"
- * @generated
- */
- PTExpression getExpression();
-
- /**
- * Sets the value of the '{@link org.eclipse.jem.internal.instantiation.ParseTreeAllocation#getExpression <em>Expression</em>}' containment reference.
- * <!-- begin-user-doc -->
- * <!-- end-user-doc -->
- * @param value the new value of the '<em>Expression</em>' containment reference.
- * @see #getExpression()
- * @generated
- */
- void setExpression(PTExpression value);
-
-} // ParseTreeAllocation
diff --git a/plugins/org.eclipse.jem/javainst/org/eclipse/jem/internal/instantiation/ParseVisitor.java b/plugins/org.eclipse.jem/javainst/org/eclipse/jem/internal/instantiation/ParseVisitor.java
deleted file mode 100644
index d72a432..0000000
--- a/plugins/org.eclipse.jem/javainst/org/eclipse/jem/internal/instantiation/ParseVisitor.java
+++ /dev/null
@@ -1,294 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2004, 2005 IBM Corporation and others.
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
- *
- * Contributors:
- * IBM Corporation - initial API and implementation
- *******************************************************************************/
-/*
-
-
- */
-package org.eclipse.jem.internal.instantiation;
-
-/**
- * A visitor for abstract parse expression trees.
- * <p>
- * For each different concrete Expression node type <it>T</it> there are
- * a pair of methods:
- * <ul>
- * <li><code>public boolean visit(<it>T</it> node)</code> - Visits
- * the given node to perform some arbitrary operation. If <code>true</code>
- * is returned, the given node's child nodes will be visited next; however,
- * if <code>false</code> is returned, the given node's child nodes will
- * not be visited. The default implementation provided by this class does
- * nothing and returns <code>true</code>. Subclasses may reimplement
- * this method as needed.</li>
- * <li><code>public void endVisit(<it>T</it> node)</code> - Visits
- * the given node to perform some arbitrary operation. When used in the
- * conventional way, this method is called after all of the given node's
- * children have been visited (or immediately, if <code>visit</code> returned
- * <code>false</code>). The default implementation provided by this class does
- * nothing. Subclasses may reimplement this method as needed.</li>
- * </ul>
- * </p>
- * In addition, there are a pair of methods for visiting AST nodes in the
- * abstract, regardless of node type:
- * <ul>
- * <li><code>public void preVisit(ASTNode node)</code> - Visits
- * the given node to perform some arbitrary operation.
- * This method is invoked prior to the appropriate type-specific
- * <code>visit</code> method.
- * The default implementation of this method does nothing.
- * Subclasses may reimplement this method as needed.</li>
- * <li><code>public void postVisit(ASTNode node)</code> - Visits
- * the given node to perform some arbitrary operation.
- * This method is invoked after the appropriate type-specific
- * <code>endVisit</code> method.
- * The default implementation of this method does nothing.
- * Subclasses may reimplement this method as needed.</li>
- * </ul>
- * <p>
- * For nodes with list-valued properties, the child nodes within the list
- * are visited in order. For nodes with multiple properties, the child nodes
- * are visited in the order that most closely corresponds to the lexical
- * reading order of the source program. For instance, for a type declaration
- * node, the child ordering is: name, superclass, superinterfaces, and
- * body declarations.
- * </p>
- * <p>
- * While it is possible to modify the tree in the visitor, care is required to
- * ensure that the consequences are as expected and desirable.
- * During the course of an ordinary visit starting at a given node, every node
- * in the subtree is visited exactly twice, first with <code>visit</code> and
- * then with <code>endVisit</code>. During a traversal of a stationary tree,
- * each node is either behind (after <code>endVisit</code>), ahead (before
- * <code>visit</code>), or in progress (between <code>visit</code> and
- * the matching <code>endVisit</code>). Changes to the "behind" region of the
- * tree are of no consequence to the visit in progress. Changes to the "ahead"
- * region will be taken in stride. Changes to the "in progress" portion are
- * the more interesting cases. With a node, the various properties are arranged
- * in a linear list, with a cursor that separates the properties that have
- * been visited from the ones that are still to be visited (the cursor
- * is between the elements, rather than on an element). The cursor moves from
- * the head to the tail of this list, advancing to the next position just
- * <it>before</it> <code>visit</code> if called for that child. After the child
- * subtree has been completely visited, the visit moves on the child
- * immediately after the cursor. Removing a child while it is being visited
- * does not alter the course of the visit. But any children added at positions
- * after the cursor are considered in the "ahead" portion and will be visited.
- * </p>
- * <p>
- * Cases to watch out for:
- * <ul>
- * <li>Moving a child node further down the list. This could result in the
- * child subtree being visited multiple times; these visits are sequential.</li>
- * <li>Moving a child node up into an ancestor. If the new home for
- * the node is in the "ahead" portion, the subtree will be visited
- * a second time; again, these visits are sequential.</li>
- * <li>Moving a node down into a child. If the new home for
- * the node is in the "ahead" portion, the subtree will be visited
- * a second time; in this case, the visits will be nested. In some cases,
- * this can lead to a stack overflow or out of memory condition.</li>
- * </ul>
- * </p>
- *
- * Note: This is based upon the visit concept in org.eclipse.jdt.core.dom.ASTVisitor.
- *
- * @see Expression#accept
- *
- * @since 1.0.0
- */
-public class ParseVisitor {
-
- /**
- * Exception to throw to just stop visiting a parse visit. It doesn't mean error, it
- * just means stop visiting. ParseVisitors should throw this when they want to stop
- * visiting further without an explicit error.
- * <p>
- * If they want to indicate an error, parse visitors can throw any other RuntimeException.
- * Those will also stop visiting, but the exception will be passed on out of the
- * {@link PTExpression#accept(ParseVisitor)}. StopVisiting will not be passed on
- * but will be caught inside accept.
- *
- * @since 1.1.0.1
- */
- public static class StopVisiting extends RuntimeException {
-
- /**
- * Comment for <code>serialVersionUID</code>
- *
- * @since 1.1.0.1
- */
- private static final long serialVersionUID = -5246860806568355520L;
-
- }
- /**
- * Visits the given parse node prior to the type-specific visit. (before <code>visit</code>).
- * <p>
- * The default implementation does nothing. Subclasses may reimplement.
- * </p>
- *
- * @param node
- * the node to visit
- */
- public void preVisit(PTExpression node) {
- // default implementation: do nothing
- }
-
- /**
- * Visits the given parse node following the type-specific visit (after <code>endVisit</code>).
- * <p>
- * The default implementation does nothing. Subclasses may reimplement.
- * </p>
- *
- * @param node
- * the node to visit
- */
- public void postVisit(PTExpression node) {
- // default implementation: do nothing
- }
-
- public boolean visit(PTAnonymousClassDeclaration node) {
- return true;
- }
- public boolean visit(PTArrayAccess node) {
- return true;
- }
- public boolean visit(PTArrayCreation node) {
- return true;
- }
- public boolean visit(PTArrayInitializer node) {
- return true;
- }
- public boolean visit(PTBooleanLiteral node) {
- return true;
- }
- public boolean visit(PTCastExpression node) {
- return true;
- }
- public boolean visit(PTCharacterLiteral node) {
- return true;
- }
- public boolean visit(PTClassInstanceCreation node) {
- return true;
- }
- public boolean visit(PTConditionalExpression node) {
- return true;
- }
- public boolean visit(PTFieldAccess node) {
- return true;
- }
- public boolean visit(PTInfixExpression node) {
- return true;
- }
- public boolean visit(PTInstanceof node) {
- return true;
- }
- public boolean visit(PTInvalidExpression node) {
- return true;
- }
- public boolean visit(PTMethodInvocation node) {
- return true;
- }
- public boolean visit(PTName node) {
- return true;
- }
- public boolean visit(PTNullLiteral node) {
- return true;
- }
- public boolean visit(PTNumberLiteral node) {
- return true;
- }
- public boolean visit(PTParenthesizedExpression node) {
- return true;
- }
- public boolean visit(PTPrefixExpression node) {
- return true;
- }
- public boolean visit(PTStringLiteral node) {
- return true;
- }
- public boolean visit(PTThisLiteral node) {
- return true;
- }
- public boolean visit(PTTypeLiteral node) {
- return true;
- }
- public boolean visit(PTInstanceReference node) {
- return true;
- }
- public void endVisit(PTAnonymousClassDeclaration node) {
- // default implementation: do nothing
- }
- public void endVisit(PTArrayAccess node) {
- // default implementation: do nothing
- }
- public void endVisit(PTArrayCreation node) {
- // default implementation: do nothing
- }
- public void endVisit(PTArrayInitializer node) {
- // default implementation: do nothing
- }
- public void endVisit(PTBooleanLiteral node) {
- // default implementation: do nothing
- }
- public void endVisit(PTCastExpression node) {
- // default implementation: do nothing
- }
- public void endVisit(PTCharacterLiteral node) {
- // default implementation: do nothing
- }
- public void endVisit(PTClassInstanceCreation node) {
- // default implementation: do nothing
- }
- public void endVisit(PTConditionalExpression node) {
- // default implementation: do nothing
- }
- public void endVisit(PTFieldAccess node) {
- // default implementation: do nothing
- }
- public void endVisit(PTInfixExpression node) {
- // default implementation: do nothing
- }
- public void endVisit(PTInstanceof node) {
- // default implementation: do nothing
- }
- public void endVisit(PTInvalidExpression node) {
- // default implementation: do nothing
- }
- public void endVisit(PTMethodInvocation node) {
- // default implementation: do nothing
- }
- public void endVisit(PTName node) {
- // default implementation: do nothing
- }
- public void endVisit(PTNullLiteral node) {
- // default implementation: do nothing
- }
- public void endVisit(PTNumberLiteral node) {
- // default implementation: do nothing
- }
- public void endVisit(PTParenthesizedExpression node) {
- // default implementation: do nothing
- }
- public void endVisit(PTPrefixExpression node) {
- // default implementation: do nothing
- }
- public void endVisit(PTStringLiteral node) {
- // default implementation: do nothing
- }
- public void endVisit(PTThisLiteral node) {
- // default implementation: do nothing
- }
- public void endVisit(PTTypeLiteral node) {
- // default implementation: do nothing
- }
- public void endVisit(PTInstanceReference node) {
- // default implementation: do nothing
- }
-
-}
diff --git a/plugins/org.eclipse.jem/javainst/org/eclipse/jem/internal/instantiation/base/FeatureValueProvider.java b/plugins/org.eclipse.jem/javainst/org/eclipse/jem/internal/instantiation/base/FeatureValueProvider.java
deleted file mode 100644
index 8d96925..0000000
--- a/plugins/org.eclipse.jem/javainst/org/eclipse/jem/internal/instantiation/base/FeatureValueProvider.java
+++ /dev/null
@@ -1,136 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2001, 2005 IBM Corporation and others.
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
- *
- * Contributors:
- * IBM Corporation - initial API and implementation
- *******************************************************************************/
-package org.eclipse.jem.internal.instantiation.base;
-/*
-
-
- */
-
-import java.util.Iterator;
-
-import org.eclipse.emf.ecore.EObject;
-import org.eclipse.emf.ecore.EStructuralFeature;
-
-/**
- * Implementers of this interface (an EMF EObject subclass) provide a visiter
- * capability to the set features on the EObject. This way only the set features
- * are presented to the visitor. This can save a lot of time.
- *
- * @since 1.1.0
- */
-public interface FeatureValueProvider {
-
- /**
- * A helper class for FeatureValueProvider.
- *
- * @see FeatureValueProviderHelper#visitSetFeatures(EObject, Visitor)
- *
- * @since 1.1.0
- */
- public static class FeatureValueProviderHelper {
-
- /**
- * A helper to handle where the object may or may not be
- * implement FeatureValueProvider. This way it can be a
- * common access to do it.
- *
- * @param eobject
- * @param visitor
- * @return
- *
- * @since 1.1.0
- */
- public static Object visitSetFeatures(EObject eobject, Visitor visitor) {
- if (eobject instanceof FeatureValueProvider)
- return ((FeatureValueProvider)eobject).visitSetFeatures(visitor);
- else {
- // Not a FeatureValueProvider, so do normal.
- Iterator features = eobject.eClass().getEAllStructuralFeatures().iterator();
- while(features.hasNext()){
- EStructuralFeature sf = (EStructuralFeature)features.next();
- if(eobject.eIsSet(sf)){
- Object result = visitor.isSet(sf, eobject.eGet(sf));
- if (result != null)
- return result;
- }
- }
- return null;
- }
- }
-
- /**
- * Answers whether any feature is set or not.
- * <p>
- * <b>Note:</b> This SHOULD NOT be used as a test before deciding whether to do visitSetFeatures or not. It is more efficient to just call
- * visitSetFeatures. It should be used only to see if any features are set.
- *
- * @param eobject
- * @return
- *
- * @since 1.1.0
- */
- public static boolean isAnyFeatureSet(EObject eobject) {
- if (eobject instanceof FeatureValueProvider)
- return ((FeatureValueProvider)eobject).isAnyFeatureSet();
- else {
- // Not a FeatureValueProvider, so do normal.
- Iterator features = eobject.eClass().getEAllStructuralFeatures().iterator();
- while(features.hasNext()){
- EStructuralFeature sf = (EStructuralFeature)features.next();
- if(eobject.eIsSet(sf)){
- return true;
- }
- }
- return false;
- }
- }
-
- private FeatureValueProviderHelper() {
- }
- }
-
- /**
- * The interface for the visiter callback.
- *
- * @since 1.1.0
- */
- public interface Visitor{
- /**
- * Called for each set feature on the FeatureValueProvider.
- *
- * @param feature
- * @param value
- * @return <code>null</code> to continue to next setting, or a value to stop visiting and return that value be the real exception.
- * @since 1.1.0
- */
- Object isSet(EStructuralFeature feature, Object value);
- }
-
- /**
- * Visit the set features.
- * @param aVisitor
- * @param <code>null</code> if all settings visited, or the value returned from the visit (isSet) that returned a non-nullSe.
- * @since 1.1.0
- */
- public Object visitSetFeatures(Visitor aVisitor);
-
- /**
- * Answers whether any feature is set or not.
- * <p>
- * <b>Note:</b> This SHOULD NOT be used as a test before deciding whether to do visitSetFeatures or not. It is
- * more efficient to just call visitSetFeatures. It should be used only to see if any features are set.
- *
- * @return <code>true</code> if any features are set.
- *
- * @since 1.1.0
- */
- public boolean isAnyFeatureSet();
-}
diff --git a/plugins/org.eclipse.jem/javainst/org/eclipse/jem/internal/instantiation/base/IJavaDataTypeInstance.java b/plugins/org.eclipse.jem/javainst/org/eclipse/jem/internal/instantiation/base/IJavaDataTypeInstance.java
deleted file mode 100644
index 764f77b..0000000
--- a/plugins/org.eclipse.jem/javainst/org/eclipse/jem/internal/instantiation/base/IJavaDataTypeInstance.java
+++ /dev/null
@@ -1,23 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2001, 2005 IBM Corporation and others.
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
- *
- * Contributors:
- * IBM Corporation - initial API and implementation
- *******************************************************************************/
-package org.eclipse.jem.internal.instantiation.base;
-/*
-
-
- */
-
-/**
- * Interface for instances of java data types.
- */
-
-public interface IJavaDataTypeInstance extends IJavaInstance {
-
-}
diff --git a/plugins/org.eclipse.jem/javainst/org/eclipse/jem/internal/instantiation/base/IJavaInstance.java b/plugins/org.eclipse.jem/javainst/org/eclipse/jem/internal/instantiation/base/IJavaInstance.java
deleted file mode 100644
index e304a51..0000000
--- a/plugins/org.eclipse.jem/javainst/org/eclipse/jem/internal/instantiation/base/IJavaInstance.java
+++ /dev/null
@@ -1,68 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2001, 2005 IBM Corporation and others.
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
- *
- * Contributors:
- * IBM Corporation - initial API and implementation
- *******************************************************************************/
-package org.eclipse.jem.internal.instantiation.base;
-/*
-
-
- */
-
-import org.eclipse.emf.ecore.EObject;
-
-import org.eclipse.jem.internal.instantiation.JavaAllocation;
-import org.eclipse.jem.internal.java.instantiation.IInstantiationInstance;
-/**
- * A common interface for Java instances. It will be
- * shared by Java Objects and Java DataType instances.
- */
-public interface IJavaInstance extends EObject, FeatureValueProvider, IInstantiationInstance {
-
- /**
- * Get the allocation object.
- * @return The allocation object.
- */
- public JavaAllocation getAllocation();
-
- /**
- * Set the allocation for this object instance.
- * @param allocation
- */
- public void setAllocation(JavaAllocation allocation);
-
- /**
- * Return whether the allocation has been set or not.
- * @return <code>true</code> if set.
- */
- public boolean isSetAllocation();
-
- /**
- * Answer true if we are an instance of one of Java's primitive data types.
- * e.g. boolean, char - true otherwise, e.g. java.lang.Boolean
- */
- public boolean isPrimitive();
-
- /**
- * Answer whether this has an implicit allocation.
- * @return <code>true</code> if implicit allocation. <code>false</code> if not set or not implicit.
- *
- * @since 1.2.0
- */
- public boolean isImplicitAllocation();
-
- /**
- * Answer whether this has an parsetree allocation.
- * @return <code>true</code> if parsetree allocation. <code>false</code> if not set or not parsetree.
- *
- * @since 1.2.0
- */
- public boolean isParseTreeAllocation();
-
-
-}
diff --git a/plugins/org.eclipse.jem/javainst/org/eclipse/jem/internal/instantiation/base/IJavaObjectInstance.java b/plugins/org.eclipse.jem/javainst/org/eclipse/jem/internal/instantiation/base/IJavaObjectInstance.java
deleted file mode 100644
index 82c2773..0000000
--- a/plugins/org.eclipse.jem/javainst/org/eclipse/jem/internal/instantiation/base/IJavaObjectInstance.java
+++ /dev/null
@@ -1,23 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2001, 2005 IBM Corporation and others.
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
- *
- * Contributors:
- * IBM Corporation - initial API and implementation
- *******************************************************************************/
-package org.eclipse.jem.internal.instantiation.base;
-/*
-
-
- */
-
-
-/**
- * Interface for java object instances.
- */
-public interface IJavaObjectInstance extends IJavaInstance {
-
-}
diff --git a/plugins/org.eclipse.jem/javainst/org/eclipse/jem/internal/instantiation/base/InstantiationBaseMessages.java b/plugins/org.eclipse.jem/javainst/org/eclipse/jem/internal/instantiation/base/InstantiationBaseMessages.java
deleted file mode 100644
index f452450..0000000
--- a/plugins/org.eclipse.jem/javainst/org/eclipse/jem/internal/instantiation/base/InstantiationBaseMessages.java
+++ /dev/null
@@ -1,29 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2000, 2005 IBM Corporation and others.
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
- *
- * Contributors:
- * IBM Corporation - initial API and implementation
- *******************************************************************************/
-package org.eclipse.jem.internal.instantiation.base;
-
-import org.eclipse.osgi.util.NLS;
-
-public final class InstantiationBaseMessages extends NLS {
-
- private static final String BUNDLE_NAME = "org.eclipse.jem.internal.instantiation.base.messages";//$NON-NLS-1$
-
- private InstantiationBaseMessages() {
- // Do not instantiate
- }
-
- public static String ParseTreeAllocationInstantiationVisitor_CurrentlyThisNotSupported_EXC_;
- public static String ParseTreeAllocationInstantiationVisitor_CannotProcessAnonymousDeclarations_EXC_;
-
- static {
- NLS.initializeMessages(BUNDLE_NAME, InstantiationBaseMessages.class);
- }
-}
\ No newline at end of file
diff --git a/plugins/org.eclipse.jem/javainst/org/eclipse/jem/internal/instantiation/base/JavaDataTypeInstance.java b/plugins/org.eclipse.jem/javainst/org/eclipse/jem/internal/instantiation/base/JavaDataTypeInstance.java
deleted file mode 100644
index 884b533..0000000
--- a/plugins/org.eclipse.jem/javainst/org/eclipse/jem/internal/instantiation/base/JavaDataTypeInstance.java
+++ /dev/null
@@ -1,34 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2001, 2005 IBM Corporation and others.
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
- *
- * Contributors:
- * IBM Corporation - initial API and implementation
- *******************************************************************************/
-/*
-
-
- */
-package org.eclipse.jem.internal.instantiation.base;
-
-
-/**
- * This is the default instance of a Java Model Datatype (i.e. primitive).
- * It can be created from a string, which becomes the initialization string
- * for the instance. It's toString will be the initialization string.
- *
- * It should not be referenced directly, the IJavaDataTypeInstance interface should be
- * used instead. It is public so that it can be subclassed.
- */
-public class JavaDataTypeInstance extends JavaInstance implements IJavaDataTypeInstance {
-
- protected JavaDataTypeInstance() {
- }
-
- public boolean isPrimitive(){
- return true;
- }
-}
diff --git a/plugins/org.eclipse.jem/javainst/org/eclipse/jem/internal/instantiation/base/JavaFactoryHandler.java b/plugins/org.eclipse.jem/javainst/org/eclipse/jem/internal/instantiation/base/JavaFactoryHandler.java
deleted file mode 100644
index ed7ec33..0000000
--- a/plugins/org.eclipse.jem/javainst/org/eclipse/jem/internal/instantiation/base/JavaFactoryHandler.java
+++ /dev/null
@@ -1,60 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2003, 2005 IBM Corporation and others.
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
- *
- * Contributors:
- * IBM Corporation - initial API and implementation
- *******************************************************************************/
-package org.eclipse.jem.internal.instantiation.base;
-/*
-
-
- */
-
-import org.eclipse.emf.ecore.*;
-
-import org.eclipse.jem.java.JavaClass;
-import org.eclipse.jem.java.JavaDataType;
-import org.eclipse.jem.internal.java.instantiation.IInstantiationHandler;
-
-/**
- * Adapter on JavaFactoryImpl to do instantiation.
- */
-public class JavaFactoryHandler implements IInstantiationHandler {
-
- public final static JavaFactoryHandler INSTANCE = new JavaFactoryHandler();
-
- /**
- * Constructor for JavaFactoryAdapter.
- */
- protected JavaFactoryHandler() {
- super();
- }
-
- /* (non-Javadoc)
- * @see org.eclipse.jem.java.instantiation.IInstantiationHandler#handlesClass(org.eclipse.emf.ecore.EClass)
- */
- public boolean handlesClass(EClass type) {
- return type instanceof JavaClass || type instanceof JavaDataType;
- // During XMI loading, it can't tell the JavaDataType is different than JavaClass.
- }
-
- /* (non-Javadoc)
- * @see org.eclipse.jem.java.instantiation.IInstantiationHandler#handlesDataType(org.eclipse.jem.java.JavaDataType)
- */
- public boolean handlesDataType(JavaDataType type) {
- return true;
- }
-
- /* (non-Javadoc)
- * @see org.eclipse.jem.java.instantiation.IInstantiationHandler#create(org.eclipse.emf.ecore.EClass)
- */
- public EObject create(EClass javaClass) {
- EObject result = javaClass instanceof JavaClass ? (EObject) new JavaObjectInstance() : new JavaDataTypeInstance();
- ((InternalEObject) result).eSetClass(javaClass);
- return result;
- }
-}
diff --git a/plugins/org.eclipse.jem/javainst/org/eclipse/jem/internal/instantiation/base/JavaInstance.java b/plugins/org.eclipse.jem/javainst/org/eclipse/jem/internal/instantiation/base/JavaInstance.java
deleted file mode 100644
index f5b149b..0000000
--- a/plugins/org.eclipse.jem/javainst/org/eclipse/jem/internal/instantiation/base/JavaInstance.java
+++ /dev/null
@@ -1,290 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2001, 2006 IBM Corporation and others.
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
- *
- * Contributors:
- * IBM Corporation - initial API and implementation
- *******************************************************************************/
-package org.eclipse.jem.internal.instantiation.base;
-/*
- * $RCSfile$
- * $Revision$ $Date$
- */
-
-import java.util.List;
-
-import org.eclipse.emf.common.util.BasicEList;
-import org.eclipse.emf.common.util.EList;
-import org.eclipse.emf.ecore.*;
-import org.eclipse.emf.ecore.EStructuralFeature.Internal.DynamicValueHolder;
-import org.eclipse.emf.ecore.impl.EObjectImpl;
-import org.eclipse.emf.ecore.impl.EStructuralFeatureImpl;
-
-import org.eclipse.jem.internal.instantiation.JavaAllocation;
-import org.eclipse.jem.java.JavaHelpers;
-
-/**
- * This is the default instance for java model objects.
- * It should not be referenced directly, the IJavaObjectInstance interface should be
- * used instead. It is public so that it can be subclassed.
- */
-public abstract class JavaInstance extends EObjectImpl implements IJavaInstance {
-
- public JavaHelpers getJavaType(){
- return (JavaHelpers) eClass();
- }
-
- public JavaAllocation getAllocation() {
- return isSetAllocation() ? (JavaAllocation) eGet(JavaInstantiation.getAllocationFeature(this)) : null;
- }
-
- public boolean isImplicitAllocation() {
- return isSetAllocation() && getAllocation().isImplicit();
- }
-
- public boolean isParseTreeAllocation() {
- return isSetAllocation() && getAllocation().isParseTree();
- }
-
- /**
- * Visit the argument with all of the set features in an optimized fashion
- */
- private final static Object NIL = EStructuralFeatureImpl.InternalSettingDelegateSingle.NIL;
- public Object visitSetFeatures(Visitor aVisitor) {
- Object result = null;
- if (eHasSettings()) {
- JavaInstancePropertiesHolder settings = (JavaInstancePropertiesHolder) eSettings();
-
- Object[] setPropertyValues = settings.eSettings();
- if (setPropertyValues != null) {
- List allFeatures = settings.getAllStructuralFeatures();
- for (int i = 0; i < setPropertyValues.length; i++) {
- Object propertyValue = setPropertyValues[i];
- if (propertyValue != null) {
- // <null> is handled by the placeholder NIL. A setting of true null means not set. A setting of NIL means set to null.
- if (propertyValue == NIL)
- propertyValue = null;
- if ((result = aVisitor.isSet((EStructuralFeature) allFeatures.get(i), propertyValue)) != null)
- break;
- }
- }
- }
- }
- return result;
- }
-
- public boolean isAnyFeatureSet() {
- if (eHasSettings()) {
- JavaInstancePropertiesHolder settings = (JavaInstancePropertiesHolder) eSettings();
-
- Object[] setPropertyValues = settings.eSettings();
- if (setPropertyValues != null) {
- for (int i = 0; i < setPropertyValues.length; i++) {
- Object propertyValue = setPropertyValues[i];
- if (propertyValue != null) {
- return true;
- }
- }
- }
- }
- return false;
- }
-
- public boolean isSetAllocation() {
- EReference allocationFeature = JavaInstantiation.getAllocationFeature(this);
- return allocationFeature != null && eIsSet(allocationFeature);
- }
-
- public void setAllocation(JavaAllocation allocation) {
- EReference allocationFeature = JavaInstantiation.getAllocationFeature(this);
- if (allocationFeature != null)
- eSet(allocationFeature, allocation);
- }
-
-
- public String toString() {
- // EObject's toString is too big for us, so we do a customized one.
- StringBuffer result = new StringBuffer(getClass().getName());
- result.append('@');
- result.append(Integer.toHexString(hashCode()));
-
- if (eIsProxy())
- {
- result.append(" (eProxyURI: "); //$NON-NLS-1$
- result.append(eProxyURI());
- result.append(')');
- }
- if(getJavaType() != null){
- result.append('{');
- result.append(getJavaType().getQualifiedName());
- result.append('}');
- }
-
- try {
- JavaAllocation allocation = getAllocation();
- if (allocation != null) {
- result.append(':'); //$NON-NLS-1$
- result.append(allocation.toString());
- }
- } catch (IllegalArgumentException e) {
- } catch (NullPointerException e) {
- // This can occur because sometimes this eClass can't be constructed right and won't have an initstring feature.
- // In that case an NPE is thrown.
- }
- return result.toString();
- }
-
- protected static class JavaInstancePropertiesHolder extends EPropertiesHolderImpl {
- private EList allStructuralFeatures;
-
- public JavaInstancePropertiesHolder() {
- }
-
- public Object[] eSettings() {
- return eSettings;
- }
-
- public EList getAllStructuralFeatures() {
- return allStructuralFeatures;
- }
-
- /*
- * Clear the cache. This is due to
- * structural features have changed.
- */
- public void clearCache() {
- eSettings = null;
- setEContents(null);
- setECrossReferences(null);
- allStructuralFeatures = null;
- }
-
- /* (non-Javadoc)
- * @see org.eclipse.emf.ecore.impl.EObjectImpl.EPropertiesHolderImpl#allocateSettings(int)
- */
- public void allocateSettings(int maximumDynamicFeatureID) {
- if (allStructuralFeatures == null)
- allStructuralFeatures = getEClass().getEAllStructuralFeatures();
- super.allocateSettings(maximumDynamicFeatureID);
- }
-
-
-
- /* (non-Javadoc)
- * @see org.eclipse.emf.ecore.impl.EObjectImpl.EPropertiesHolderImpl#setEContents(org.eclipse.emf.common.util.EList)
- */
- public void setEContents(EList eContents) {
- if (allStructuralFeatures == null)
- allStructuralFeatures = getEClass().getEAllStructuralFeatures();
- super.setEContents(eContents);
- }
-
- /* (non-Javadoc)
- * @see org.eclipse.emf.ecore.impl.EObjectImpl.EPropertiesHolderImpl#setECrossReferences(org.eclipse.emf.common.util.EList)
- */
- public void setECrossReferences(EList eCrossReferences) {
- if (allStructuralFeatures == null)
- allStructuralFeatures = getEClass().getEAllStructuralFeatures();
- super.setECrossReferences(eCrossReferences);
- }
-
- }
-
- protected EPropertiesHolder eProperties()
- {
- if (eProperties == null)
- {
- eProperties = new JavaInstancePropertiesHolder();
- }
- return eProperties;
- }
-
- /**
- * @see org.eclipse.emf.ecore.InternalEObject#eSetClass(EClass)
- */
- public void eSetClass(EClass eClass) {
- super.eSetClass(eClass);
- migrate();
- }
-
- /**
- * @param newEClass New eClass set to. (null) when migrating while not setting a new EClass.
- */
- protected void migrate() {
- // Note: This is extremelly implementation dependent. It may change for any implementation of EMF.
- if (eProperties != null && (eProperties.hasSettings() || eProperties.getEContents() != null || eProperties.getECrossReferences() != null)) {
- // Maybe need to reconstruct settings or clear cache.
- JavaInstancePropertiesHolder properties = (JavaInstancePropertiesHolder) eProperties;
- EList oldAllFeatures = properties.getAllStructuralFeatures();
-
- // See if migration needed.
- if (properties.getEClass().getEAllStructuralFeatures() == oldAllFeatures)
- return; // No migration needed.
-
- Object[] oldSettings = properties.eSettings();
- properties.clearCache(); // Clear the cache so we can rebuild it.
- if (oldSettings == null) {
- return; // It was just either contents or crossrefs, and they have been appropriately cleared.
- }
-
- // It is assumed that any SF that (by identity) is in
- // both the old and the new eClass, then it doesn't have any internal changes. It simply changed position
- // in the settings list. Otherwise, need to see if compatible by same name, and if so, move it.
- eSettings(); // Create new settings
- Object[] newSettings = properties.eSettings();
- int staticFeatureCnt = eStaticFeatureCount();
- for (int oldIndex = 0; oldIndex < oldSettings.length; oldIndex++) {
- if (oldSettings[oldIndex] != null) {
- EStructuralFeature sf = (EStructuralFeature) oldAllFeatures.get(oldIndex+staticFeatureCnt);
- int newIndex = super.eDynamicFeatureID(sf); // To avoid recurse on migrate.
- if (newIndex > -1) {
- moveESetting(oldSettings, newSettings, oldIndex, sf, newIndex);
- } else {
- // See if it exists by name and is compatible.
- EStructuralFeature newSF = properties.getEClass().getEStructuralFeature(sf.getName());
- if (newSF != null && newSF.getClass().equals(sf.getClass()) &&
- newSF.isMany() == sf.isMany() && newSF.isChangeable() == sf.isChangeable()) {
- boolean compatible = newSF.isUnique() == sf.isUnique() || !newSF.isUnique(); // If new is not unique, then doesn't matter if old and new are the same
- if (newSF instanceof EReference) {
- EReference newRef = (EReference) newSF;
- EReference ref = (EReference) sf;
- compatible = newRef.isContainment() == ref.isContainment() && newRef.getEReferenceType().isSuperTypeOf(ref.getEReferenceType());
- } else
- compatible = newSF.getEType().equals(sf.getEType());
-
- if (compatible) {
- newIndex = eDynamicFeatureID(newSF);
- moveESetting(oldSettings, newSettings, oldIndex, newSF, newIndex);
- }
- }
- }
- }
- }
- }
- }
-
- private void moveESetting(Object[] oldSettings, Object[] newSettings, int oldIndex, EStructuralFeature sf, int newIndex) {
- // See if single vs many.
- if (!sf.isMany())
- newSettings[newIndex] = oldSettings[oldIndex]; // Great, we can just move it over.
- else {
- // Many is more difficult. Need to create a new dynamic list of right type, and
- // then just copy over the data from the old one. We create new one by doing a simple eGet.
- // This will construct an empty one with no notifications going out.
- // Note: This is extremelly implementation dependent. We will be throwing away the old
- // oldMany, so it is ok to reuse the actual array of data for the newMany.
- BasicEList newMany = (BasicEList) eGet(sf);
- BasicEList oldMany = (BasicEList) oldSettings[oldIndex];
- newMany.setData(oldMany.size(), oldMany.data());
- }
- }
-
- protected DynamicValueHolder eSettings() {
- migrate();
- return super.eSettings();
- }
-
-}
diff --git a/plugins/org.eclipse.jem/javainst/org/eclipse/jem/internal/instantiation/base/JavaInstantiation.java b/plugins/org.eclipse.jem/javainst/org/eclipse/jem/internal/instantiation/base/JavaInstantiation.java
deleted file mode 100644
index 8653a07..0000000
--- a/plugins/org.eclipse.jem/javainst/org/eclipse/jem/internal/instantiation/base/JavaInstantiation.java
+++ /dev/null
@@ -1,110 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2001, 2005 IBM Corporation and others.
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
- *
- * Contributors:
- * IBM Corporation - initial API and implementation
- *******************************************************************************/
-package org.eclipse.jem.internal.instantiation.base;
-/*
-
-
- */
-
-import org.eclipse.emf.common.util.URI;
-import org.eclipse.emf.ecore.EReference;
-import org.eclipse.emf.ecore.EStructuralFeature;
-import org.eclipse.emf.ecore.resource.ResourceSet;
-import org.eclipse.emf.ecore.util.EcoreUtil;
-
-import org.eclipse.jem.java.JavaClass;
-import org.eclipse.jem.internal.java.instantiation.IInstantiationHandlerFactoryAdapter;
-
-/**
- * This class is used to initialize java model instantiation code and to access dynamic features.
- */
-public class JavaInstantiation {
-
-
- public static final String ALLOCATION = "allocation"; //$NON-NLS-1$
-
- /**
- * Get a structural feature from an instance of an IJavaObjectInstance, where the feature
- * is specified by its name.
- */
- public static EStructuralFeature getSFeature(IJavaObjectInstance jobject, String featureName) {
- return jobject.eClass().getEStructuralFeature(featureName);
- }
-
- /**
- * Get a reference from an instance of an IJavaObjectInstance, where the feature
- * is specified by its name.
- */
- public static EReference getReference(IJavaObjectInstance jobject, String featureName) {
- return (EReference) getSFeature(jobject, featureName);
- }
-
- /**
- * Get a structural feature from an instance of an IJavaObjectInstance, where the feature
- * is specified by its URI (e.g. "java:/java.lang#Object/class").
- */
- public static EStructuralFeature getSFeature(IJavaObjectInstance jobject, URI sfURI) {
- return getSFeature((JavaClass) jobject.getJavaType(), sfURI);
- }
-
- /**
- * Get a structural feature from a JavaClass, where the feature
- * is specified by its URI (e.g. "java:/java.lang#Object/class").
- */
- public static EStructuralFeature getSFeature(JavaClass jclass, URI sfURI) {
- return getSFeature(jclass.eResource().getResourceSet(), sfURI);
- }
-
- /**
- * Get a structural feature from a ResourceSet, where the feature
- * is specified by its URI (e.g. "java:/java.lang#Object/class").
- */
- public static EStructuralFeature getSFeature(ResourceSet rset, URI sfURI) {
- return (EStructuralFeature) rset.getEObject(sfURI, true);
- }
-
- /**
- * Get a reference from an instance of an IJavaObjectInstance, where the feature
- * is specified by its URI (e.g. "java:/java.lang#Object/class").
- */
- public static EReference getReference(IJavaObjectInstance jobject, URI sfURI) {
- return (EReference) getSFeature((JavaClass) jobject.getJavaType(), sfURI);
- }
-
- /**
- * Get a reference from a JavaClass, where the feature
- * is specified by its URI (e.g. "java:/java.lang#Object/class").
- */
- public static EReference getReference(JavaClass jclass, URI sfURI) {
- return (EReference) getSFeature(jclass.eResource().getResourceSet(), sfURI);
- }
-
- /**
- * Get a reference from a ResourceSet, where the feature
- * is specified by its URI (e.g. "java:/java.lang#Object/class").
- */
- public static EReference getReference(ResourceSet rset, URI sfURI) {
- return (EReference) rset.getEObject(sfURI, true);
- }
-
- /**
- * Get the allocation Feature for this object. Since it depends
- * on what resource that the metaclass is defined in, we must look for it.
- */
- public static EReference getAllocationFeature(IJavaInstance jinstance) {
- return (EReference) jinstance.eClass().getEStructuralFeature(ALLOCATION);
- }
-
- public static void initialize(ResourceSet rset) {
- if (EcoreUtil.getExistingAdapter(rset, IInstantiationHandlerFactoryAdapter.ADAPTER_KEY) == null)
- rset.eAdapters().add(new JavaInstantiationHandlerFactoryAdapter());
- }
-}
diff --git a/plugins/org.eclipse.jem/javainst/org/eclipse/jem/internal/instantiation/base/JavaInstantiationHandlerFactoryAdapter.java b/plugins/org.eclipse.jem/javainst/org/eclipse/jem/internal/instantiation/base/JavaInstantiationHandlerFactoryAdapter.java
deleted file mode 100644
index ebf3ba5..0000000
--- a/plugins/org.eclipse.jem/javainst/org/eclipse/jem/internal/instantiation/base/JavaInstantiationHandlerFactoryAdapter.java
+++ /dev/null
@@ -1,50 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2003, 2005 IBM Corporation and others.
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
- *
- * Contributors:
- * IBM Corporation - initial API and implementation
- *******************************************************************************/
-package org.eclipse.jem.internal.instantiation.base;
-/*
-
-
- */
-
-import org.eclipse.emf.common.notify.impl.AdapterImpl;
-
-import org.eclipse.jem.java.internal.impl.JavaFactoryImpl;
-import org.eclipse.jem.internal.java.instantiation.IInstantiationHandler;
-import org.eclipse.jem.internal.java.instantiation.IInstantiationHandlerFactoryAdapter;
-
-/**
- * This adapter is attached to the resource set for a java model. The
- * JavaXMIFactory will ask for this adapter and ask it for the IInstantiationHandler.
- */
-public class JavaInstantiationHandlerFactoryAdapter extends AdapterImpl implements IInstantiationHandlerFactoryAdapter {
-
- /**
- * Constructor for JavaInstantiationHandlerFactoryAdapter.
- */
- public JavaInstantiationHandlerFactoryAdapter() {
- super();
- }
-
- /**
- * @see org.eclipse.jem.internal.instantiation.IInstantiationHandlerFactoryAdapter#getInstantiationHandler(JavaFactoryImpl)
- */
- public IInstantiationHandler getInstantiationHandler(JavaFactoryImpl factory) {
- return JavaFactoryHandler.INSTANCE;
- }
-
- /**
- * @see org.eclipse.emf.common.notify.Adapter#isAdapterForType(Object)
- */
- public boolean isAdapterForType(Object type) {
- return IInstantiationHandlerFactoryAdapter.ADAPTER_KEY == type;
- }
-
-}
diff --git a/plugins/org.eclipse.jem/javainst/org/eclipse/jem/internal/instantiation/base/JavaObjectInstance.java b/plugins/org.eclipse.jem/javainst/org/eclipse/jem/internal/instantiation/base/JavaObjectInstance.java
deleted file mode 100644
index e9f2b20..0000000
--- a/plugins/org.eclipse.jem/javainst/org/eclipse/jem/internal/instantiation/base/JavaObjectInstance.java
+++ /dev/null
@@ -1,31 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2005 IBM Corporation and others.
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
- *
- * Contributors:
- * IBM Corporation - initial API and implementation
- *******************************************************************************/
-/*
-
-
- */
-package org.eclipse.jem.internal.instantiation.base;
-
-
-/**
- * Java Object Instance implementation.
- * @since 1.1.0.1
- */
-public class JavaObjectInstance extends JavaInstance implements IJavaObjectInstance {
-
- /* (non-Javadoc)
- * @see org.eclipse.jem.internal.instantiation.base.IJavaInstance#isPrimitive()
- */
- public boolean isPrimitive() {
- return false;
- }
-
-}
diff --git a/plugins/org.eclipse.jem/javainst/org/eclipse/jem/internal/instantiation/base/ParseTreeAllocationInstantiationVisitor.java b/plugins/org.eclipse.jem/javainst/org/eclipse/jem/internal/instantiation/base/ParseTreeAllocationInstantiationVisitor.java
deleted file mode 100644
index a7c8344..0000000
--- a/plugins/org.eclipse.jem/javainst/org/eclipse/jem/internal/instantiation/base/ParseTreeAllocationInstantiationVisitor.java
+++ /dev/null
@@ -1,505 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2004, 2005 IBM Corporation and others.
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
- *
- * Contributors:
- * IBM Corporation - initial API and implementation
- *******************************************************************************/
-/*
-
-
- */
-package org.eclipse.jem.internal.instantiation.base;
-
-import java.text.MessageFormat;
-import java.util.List;
-
-import org.eclipse.jem.internal.instantiation.*;
-import org.eclipse.jem.internal.proxy.core.*;
-import org.eclipse.jem.internal.proxy.initParser.tree.*;
-
-/**
- * This is the standard parse visitor for instantiating a bean proxy from a java parse tree allocation.
- * It can be reused, but is not thread-safe.
- *
- * @since 1.0.0
- */
-public class ParseTreeAllocationInstantiationVisitor extends ParseVisitor {
-
- /**
- * The expression that is being created and evaluated.
- */
- private IExpression expression;
-
- /*
- * The next expression type that should be used. It is used when one expression is sending the
- * visitation to the next expression. It will set this to what that expression should be using. This
- * is necessary because the next expression doesn't know what it should be.
- */
- private ForExpression nextExpression = ForExpression.ROOTEXPRESSION;
-
- /**
- * An exception occurred during processing. It is a RuntimeException because
- * it can be thrown at any time. It wrappers another exception. That exception
- * can be retrieved from the cause of the ProcessingException.
- *
- * @see Throwable#getCause()
- * @since 1.0.0
- */
- public static class ProcessingException extends RuntimeException {
-
- /**
- * Comment for <code>serialVersionUID</code>
- *
- * @since 1.1.0
- */
- private static final long serialVersionUID = 1268624222490406643L;
-
- /**
- * @param cause
- *
- * @since 1.0.0
- */
- public ProcessingException(Throwable cause) {
- super(cause);
- }
- }
-
- static final InfixOperator[] INFIXTOPROXY;
- static {
- INFIXTOPROXY = new InfixOperator[PTInfixOperator.VALUES.size()];
- INFIXTOPROXY[PTInfixOperator.AND] = InfixOperator.IN_AND;
- INFIXTOPROXY[PTInfixOperator.CONDITIONAL_AND] = InfixOperator.IN_CONDITIONAL_AND;
- INFIXTOPROXY[PTInfixOperator.CONDITIONAL_OR] = InfixOperator.IN_CONDITIONAL_OR;
- INFIXTOPROXY[PTInfixOperator.DIVIDE] = InfixOperator.IN_DIVIDE;
- INFIXTOPROXY[PTInfixOperator.EQUALS] = InfixOperator.IN_EQUALS;
- INFIXTOPROXY[PTInfixOperator.GREATER] = InfixOperator.IN_GREATER;
- INFIXTOPROXY[PTInfixOperator.GREATER_EQUALS] = InfixOperator.IN_GREATER_EQUALS;
- INFIXTOPROXY[PTInfixOperator.LEFT_SHIFT] = InfixOperator.IN_LEFT_SHIFT;
- INFIXTOPROXY[PTInfixOperator.LESS] = InfixOperator.IN_LESS;
- INFIXTOPROXY[PTInfixOperator.LESS_EQUALS] = InfixOperator.IN_LESS_EQUALS;
- INFIXTOPROXY[PTInfixOperator.MINUS] = InfixOperator.IN_MINUS;
- INFIXTOPROXY[PTInfixOperator.NOT_EQUALS] = InfixOperator.IN_NOT_EQUALS;
- INFIXTOPROXY[PTInfixOperator.OR] = InfixOperator.IN_OR;
- INFIXTOPROXY[PTInfixOperator.PLUS] = InfixOperator.IN_PLUS;
- INFIXTOPROXY[PTInfixOperator.REMAINDER] = InfixOperator.IN_REMAINDER;
- INFIXTOPROXY[PTInfixOperator.RIGHT_SHIFT_SIGNED] = InfixOperator.IN_RIGHT_SHIFT_SIGNED;
- INFIXTOPROXY[PTInfixOperator.RIGHT_SHIFT_UNSIGNED] = InfixOperator.IN_RIGHT_SHIFT_UNSIGNED;
- INFIXTOPROXY[PTInfixOperator.TIMES] = InfixOperator.IN_TIMES;
- INFIXTOPROXY[PTInfixOperator.XOR] = InfixOperator.IN_XOR;
- }
-
- /**
- * A helper method to convert the parse tree's infix operator to the Proxy infix operator.
- *
- * @param operator
- * @return
- *
- * @since 1.0.0
- */
- public static InfixOperator convertPTInfixOperatorToProxyInfixOperator(PTInfixOperator operator) {
- return INFIXTOPROXY[operator.getValue()];
- }
-
- static final PrefixOperator[] PREFIXTOPROXY;
- static {
- PREFIXTOPROXY = new PrefixOperator[PTPrefixOperator.VALUES.size()];
- PREFIXTOPROXY[PTPrefixOperator.COMPLEMENT] = PrefixOperator.PRE_COMPLEMENT;
- PREFIXTOPROXY[PTPrefixOperator.MINUS] = PrefixOperator.PRE_MINUS;
- PREFIXTOPROXY[PTPrefixOperator.NOT] = PrefixOperator.PRE_NOT;
- PREFIXTOPROXY[PTPrefixOperator.PLUS] = PrefixOperator.PRE_PLUS;
- }
-
- /**
- * A helper method to convert the parse tree's prefix operator to the Proxy prefix operator.
- *
- * @param operator
- * @return
- *
- * @since 1.0.0
- */
- public static PrefixOperator convertPTPrefixOperatorToProxyPrefixOperator(PTPrefixOperator operator) {
- return PREFIXTOPROXY[operator.getValue()];
- }
-
- /**
- * Create the visitor with the given registry.
- *
- * @param registry
- *
- * @since 1.0.0
- */
- public ParseTreeAllocationInstantiationVisitor() {
- }
-
- /**
- * Get the current registry.
- *
- * @return
- *
- * @since 1.0.0
- */
- protected final ProxyFactoryRegistry getRegistry() {
- return expression.getRegistry();
- }
-
- /**
- * Get the current expression.
- *
- * @return
- *
- * @since 1.0.0
- */
- protected final IExpression getExpression() {
- return expression;
- }
-
- /**
- * Get the beanproxy for the given expression and registry. It will evaluate immediately.
- *
- * @param expression
- * @param registry
- * @return
- * @throws IllegalStateException
- * @throws ThrowableProxy
- * @throws NoExpressionValueException
- * @throws ProcessingException
- *
- * @since 1.0.0
- */
- public IBeanProxy getBeanProxy(PTExpression expression, ProxyFactoryRegistry registry) throws IllegalStateException, IllegalArgumentException, ThrowableProxy, NoExpressionValueException, ProcessingException {
- this.expression = registry.getBeanProxyFactory().createExpression();
- setNextExpression(ForExpression.ROOTEXPRESSION);
- try {
- expression.accept(this);
- } catch (ProcessingException e) {
- // Handle the most common that make sense to be know distinctly and throw them instead of ProcessingException.
- Throwable t = e.getCause();
- if (t instanceof NoExpressionValueException)
- throw (NoExpressionValueException) t;
- else if (t instanceof IllegalStateException)
- throw (IllegalStateException) t;
- else
- throw e;
- }
-
- return getExpression().getExpressionValue();
- }
-
- /**
- * Using the given expression processor allocate the proxy. It will not evaluate immediately, but just push onto the expression.
- * @param expression
- * @param expressionProcessor
- * @return the ExpressionProxy for the allocation.
- * @throws IllegalStateException
- * @throws IllegalArgumentException
- * @throws ProcessingException
- *
- * @since 1.1.0
- */
- public ExpressionProxy getProxy(PTExpression expression, IExpression expressionProcessor) throws IllegalStateException, IllegalArgumentException, ProcessingException {
- this.expression = expressionProcessor;
- try {
- ExpressionProxy proxy = expressionProcessor.createProxyAssignmentExpression(ForExpression.ROOTEXPRESSION);
- setNextExpression(ForExpression.ASSIGNMENT_RIGHT);
- expression.accept(this);
- return proxy;
- } catch (ProcessingException e) {
- // Handle the most common that make sense to be know distinctly and throw them instead of ProcessingException.
- Throwable t = e.getCause();
- if (t instanceof IllegalStateException)
- throw (IllegalStateException) t;
- else
- throw e;
- }
- }
-
-
- /**
- * Set the next expression type. (i.e. the <code>forExpression</code> field of most of the create expression methods.
- *
- * @param nextExpression
- *
- * @see IExpression#createInfixExpression(int, int, int)
- * @since 1.0.0
- */
- protected final void setNextExpression(ForExpression nextExpression) {
- this.nextExpression = nextExpression;
- }
-
- /**
- * Get the next expression type. (i.e. the <code>forExpression</code> field of most of the create expression methods.
- *
- * @return
- *
- * @see IExpression#createInfixExpression(int, int, int)
- * @since 1.0.0
- */
- protected final ForExpression getNextExpression() {
- return nextExpression;
- }
-
- /* (non-Javadoc)
- * @see org.eclipse.jem.internal.instantiation.ParseVisitor#visit(org.eclipse.jem.internal.instantiation.PTAnonymousClassDeclaration)
- */
- public boolean visit(PTAnonymousClassDeclaration node) {
- throw new IllegalArgumentException(MessageFormat.format(InstantiationBaseMessages.ParseTreeAllocationInstantiationVisitor_CannotProcessAnonymousDeclarations_EXC_, new Object[] {node.getDeclaration()}));
- }
-
- /* (non-Javadoc)
- * @see org.eclipse.jem.internal.instantiation.ParseVisitor#visit(org.eclipse.jem.internal.instantiation.PTArrayAccess)
- */
- public boolean visit(PTArrayAccess node) {
- getExpression().createArrayAccess(getNextExpression(), node.getIndexes().size());
- setNextExpression(ForExpression.ARRAYACCESS_ARRAY);
- node.getArray().accept(this);
- List idx = node.getIndexes();
- int s = idx.size();
- for (int i = 0; i < s; i++) {
- setNextExpression(ForExpression.ARRAYACCESS_INDEX);
- ((PTExpression) idx.get(i)).accept(this);
- }
- return false;
- }
-
- /* (non-Javadoc)
- * @see org.eclipse.jem.internal.instantiation.ParseVisitor#visit(org.eclipse.jem.internal.instantiation.PTArrayCreation)
- */
- public boolean visit(PTArrayCreation node) {
- getExpression().createArrayCreation(getNextExpression(), node.getType(), node.getDimensions().size());
- if (node.getDimensions().isEmpty()) {
- node.getInitializer().accept(this); // Array initializer doesn't require a next expression.
- } else {
- List dims = node.getDimensions();
- int s = dims.size();
- for (int i = 0; i < s; i++) {
- setNextExpression(ForExpression.ARRAYCREATION_DIMENSION);
- ((PTExpression) dims.get(i)).accept(this);
- }
- }
- return false;
- }
-
- /* (non-Javadoc)
- * @see org.eclipse.jem.internal.instantiation.ParseVisitor#visit(org.eclipse.jem.internal.instantiation.PTArrayInitializer)
- */
- public boolean visit(PTArrayInitializer node) {
- getExpression().createArrayInitializer(node.getExpressions().size());
- List exps = node.getExpressions();
- int s = exps.size();
- for (int i = 0; i < s; i++) {
- setNextExpression(ForExpression.ARRAYINITIALIZER_EXPRESSION);
- ((PTExpression) exps.get(i)).accept(this);
- }
- return false;
- }
-
- /* (non-Javadoc)
- * @see org.eclipse.jem.internal.instantiation.ParseVisitor#visit(org.eclipse.jem.internal.instantiation.PTBooleanLiteral)
- */
- public boolean visit(PTBooleanLiteral node) {
- getExpression().createPrimitiveLiteral(getNextExpression(), node.isBooleanValue());
- return false;
- }
-
- /* (non-Javadoc)
- * @see org.eclipse.jem.internal.instantiation.ParseVisitor#visit(org.eclipse.jem.internal.instantiation.PTCastExpression)
- */
- public boolean visit(PTCastExpression node) {
- getExpression().createCastExpression(getNextExpression(), node.getType());
- setNextExpression(ForExpression.CAST_EXPRESSION);
- node.getExpression().accept(this);
- return false;
- }
-
- /* (non-Javadoc)
- * @see org.eclipse.jem.internal.instantiation.ParseVisitor#visit(org.eclipse.jem.internal.instantiation.PTCharacterLiteral)
- */
- public boolean visit(PTCharacterLiteral node) {
- getExpression().createPrimitiveLiteral(getNextExpression(), node.getCharValue());
- return false;
- }
-
- /* (non-Javadoc)
- * @see org.eclipse.jem.internal.instantiation.ParseVisitor#visit(org.eclipse.jem.internal.instantiation.PTClassInstanceCreation)
- */
- public boolean visit(PTClassInstanceCreation node) {
- getExpression().createClassInstanceCreation(getNextExpression(), node.getType(), node.getArguments().size());
- List args = node.getArguments();
- int s = args.size();
- for (int i = 0; i < s; i++) {
- setNextExpression(ForExpression.CLASSINSTANCECREATION_ARGUMENT);
- ((PTExpression) args.get(i)).accept(this);
- }
- return false;
- }
-
- /* (non-Javadoc)
- * @see org.eclipse.jem.internal.instantiation.ParseVisitor#visit(org.eclipse.jem.internal.instantiation.PTConditionalExpression)
- */
- public boolean visit(PTConditionalExpression node) {
- getExpression().createConditionalExpression(getNextExpression());
- setNextExpression(ForExpression.CONDITIONAL_CONDITION);
- node.getCondition().accept(this);
- setNextExpression(ForExpression.CONDITIONAL_TRUE);
- node.getTrue().accept(this);
- setNextExpression(ForExpression.CONDITIONAL_FALSE);
- node.getFalse().accept(this);
- return false;
- }
-
- /* (non-Javadoc)
- * @see org.eclipse.jem.internal.instantiation.ParseVisitor#visit(org.eclipse.jem.internal.instantiation.PTFieldAccess)
- */
- public boolean visit(PTFieldAccess node) {
- getExpression().createFieldAccess(getNextExpression(), node.getField(), node.getReceiver() != null);
- if (node.getReceiver() != null) {
- setNextExpression(ForExpression.FIELD_RECEIVER);
- node.getReceiver().accept(this);
- }
- return false;
- }
-
- /* (non-Javadoc)
- * @see org.eclipse.jem.internal.instantiation.ParseVisitor#visit(org.eclipse.jem.internal.instantiation.PTInfixExpression)
- */
- public boolean visit(PTInfixExpression node) {
- getExpression().createInfixExpression(getNextExpression(), convertPTInfixOperatorToProxyInfixOperator(node.getOperator()), node.getExtendedOperands().size());
- setNextExpression(ForExpression.INFIX_LEFT);
- node.getLeftOperand().accept(this);
- setNextExpression(ForExpression.INFIX_RIGHT);
- node.getRightOperand().accept(this);
- List extended = node.getExtendedOperands();
- int s = extended.size();
- for (int i = 0; i < s; i++) {
- setNextExpression(ForExpression.INFIX_EXTENDED);
- ((PTExpression) extended.get(i)).accept(this);
- }
- return false;
- }
-
- /* (non-Javadoc)
- * @see org.eclipse.jem.internal.instantiation.ParseVisitor#visit(org.eclipse.jem.internal.instantiation.PTInstanceof)
- */
- public boolean visit(PTInstanceof node) {
- getExpression().createInstanceofExpression(getNextExpression(), node.getType());
- setNextExpression(ForExpression.INSTANCEOF_VALUE);
- node.getOperand().accept(this);
- return false;
- }
-
- /* (non-Javadoc)
- * @see org.eclipse.jem.internal.instantiation.ParseVisitor#visit(org.eclipse.jem.internal.instantiation.PTInvalidExpression)
- */
- public boolean visit(PTInvalidExpression node) {
- throw new IllegalArgumentException(node.getMessage());
- }
-
- /* (non-Javadoc)
- * @see org.eclipse.jem.internal.instantiation.ParseVisitor#visit(org.eclipse.jem.internal.instantiation.PTMethodInvocation)
- */
- public boolean visit(PTMethodInvocation node) {
- getExpression().createMethodInvocation(getNextExpression(), node.getName(), node.getReceiver() != null, node.getArguments().size());
- if (node.getReceiver() != null) {
- setNextExpression(ForExpression.METHOD_RECEIVER);
- node.getReceiver().accept(this);
- }
- List args = node.getArguments();
- int s = args.size();
- for (int i = 0; i < s; i++) {
- setNextExpression(ForExpression.METHOD_ARGUMENT);
- ((PTExpression) args.get(i)).accept(this);
- }
- return false;
- }
-
- /* (non-Javadoc)
- * @see org.eclipse.jem.internal.instantiation.ParseVisitor#visit(org.eclipse.jem.internal.instantiation.PTName)
- */
- public boolean visit(PTName node) {
- // This is special in the PTName can only be used as a type receiver at this time.
- getExpression().createTypeReceiver(node.getName());
- return false;
- }
-
- /* (non-Javadoc)
- * @see org.eclipse.jem.internal.instantiation.ParseVisitor#visit(org.eclipse.jem.internal.instantiation.PTNullLiteral)
- */
- public boolean visit(PTNullLiteral node) {
- // This is special in the PTName can only be used as a type receiver at this time.
- getExpression().createNull(getNextExpression());
- return false;
- }
-
- /* (non-Javadoc)
- * @see org.eclipse.jem.internal.instantiation.ParseVisitor#visit(org.eclipse.jem.internal.instantiation.PTNumberLiteral)
- */
- public boolean visit(PTNumberLiteral node) {
- // It is assumed the tokens are trimmed.
- String lit = node.getToken();
- char lastChar = lit.charAt(lit.length()-1);
- if (lastChar == 'l' || lastChar == 'L' ) {
- // It is definitely a long.
- // Using decode so that things like 0x3 will be parsed. parseLong won't recognize those.
- getExpression().createPrimitiveLiteral(getNextExpression(), Long.decode(lit.substring(0, lit.length()-1)).longValue());
- } else if (lastChar == 'F' || lastChar == 'f') {
- // It is definitely a float.
- getExpression().createPrimitiveLiteral(getNextExpression(), Float.parseFloat(lit.substring(0, lit.length()-1)));
- } else if (lastChar == 'D' || lastChar == 'd') {
- // It is definitely a double.
- getExpression().createPrimitiveLiteral(getNextExpression(), Double.parseDouble(lit.substring(0, lit.length()-1)));
- } else if (lit.indexOf('.') != -1 || lit.indexOf('e') != -1 || lit.indexOf('E') != -1) {
- // It is definitely a double. (has a period or an exponent, but does not have an 'f' on the end is always a double).
- getExpression().createPrimitiveLiteral(getNextExpression(), Double.parseDouble(lit.substring(0, lit.length())));
- } else {
- // Using decode so that things like 0x3 will be parsed. parseInt won't recognize those.
- getExpression().createPrimitiveLiteral(getNextExpression(), Integer.decode(lit).intValue());
- }
- return false;
- }
-
- /* (non-Javadoc)
- * @see org.eclipse.jem.internal.instantiation.ParseVisitor#visit(org.eclipse.jem.internal.instantiation.PTParenthesizedExpression)
- */
- public boolean visit(PTParenthesizedExpression node) {
- node.getExpression().accept(this); // For instantiation purposes, the parenthesis can be ignored.
- return false;
- }
-
- /* (non-Javadoc)
- * @see org.eclipse.jem.internal.instantiation.ParseVisitor#visit(org.eclipse.jem.internal.instantiation.PTPrefixExpression)
- */
- public boolean visit(PTPrefixExpression node) {
- getExpression().createPrefixExpression(getNextExpression(), convertPTPrefixOperatorToProxyPrefixOperator(node.getOperator()));
- setNextExpression(ForExpression.PREFIX_OPERAND);
- node.getExpression().accept(this);
- return false;
- }
-
- /* (non-Javadoc)
- * @see org.eclipse.jem.internal.instantiation.ParseVisitor#visit(org.eclipse.jem.internal.instantiation.PTStringLiteral)
- */
- public boolean visit(PTStringLiteral node) {
- getExpression().createProxyExpression(getNextExpression(), getRegistry().getBeanProxyFactory().createBeanProxyWith(node.getLiteralValue()));
- return false;
- }
-
- /* (non-Javadoc)
- * @see org.eclipse.jem.internal.instantiation.ParseVisitor#visit(org.eclipse.jem.internal.instantiation.PTThisLiteral)
- */
- public boolean visit(PTThisLiteral node) {
- throw new IllegalArgumentException(InstantiationBaseMessages.ParseTreeAllocationInstantiationVisitor_CurrentlyThisNotSupported_EXC_);
- }
-
- /* (non-Javadoc)
- * @see org.eclipse.jem.internal.instantiation.ParseVisitor#visit(org.eclipse.jem.internal.instantiation.PTTypeLiteral)
- */
- public boolean visit(PTTypeLiteral node) {
- getExpression().createTypeLiteral(getNextExpression(), node.getType());
- return false;
- }
-
-}
diff --git a/plugins/org.eclipse.jem/javainst/org/eclipse/jem/internal/instantiation/base/messages.properties b/plugins/org.eclipse.jem/javainst/org/eclipse/jem/internal/instantiation/base/messages.properties
deleted file mode 100644
index d7e1f16..0000000
--- a/plugins/org.eclipse.jem/javainst/org/eclipse/jem/internal/instantiation/base/messages.properties
+++ /dev/null
@@ -1,12 +0,0 @@
-###############################################################################
-# Copyright (c) 2003, 2005 IBM Corporation and others.
-# All rights reserved. This program and the accompanying materials
-# are made available under the terms of the Eclipse Public License v1.0
-# which accompanies this distribution, and is available at
-# http://www.eclipse.org/legal/epl-v10.html
-#
-# Contributors:
-# IBM Corporation - initial API and implementation
-###############################################################################
-ParseTreeAllocationInstantiationVisitor_CurrentlyThisNotSupported_EXC_ = IWAV0001E Currently "this" is not supported
-ParseTreeAllocationInstantiationVisitor_CannotProcessAnonymousDeclarations_EXC_ = Cannot process anonymous declarations: "{0}"
diff --git a/plugins/org.eclipse.jem/javainst/org/eclipse/jem/internal/instantiation/impl/ImplicitAllocationImpl.java b/plugins/org.eclipse.jem/javainst/org/eclipse/jem/internal/instantiation/impl/ImplicitAllocationImpl.java
deleted file mode 100644
index 763de5f..0000000
--- a/plugins/org.eclipse.jem/javainst/org/eclipse/jem/internal/instantiation/impl/ImplicitAllocationImpl.java
+++ /dev/null
@@ -1,233 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2003, 2005 IBM Corporation and others.
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
- *
- * Contributors:
- * IBM Corporation - initial API and implementation
- *******************************************************************************/
-package org.eclipse.jem.internal.instantiation.impl;
-/*
-
-
- */
-
-import org.eclipse.emf.common.notify.Notification;
-
-import org.eclipse.emf.ecore.EClass;
-import org.eclipse.emf.ecore.EObject;
-import org.eclipse.emf.ecore.EStructuralFeature;
-
-import org.eclipse.emf.ecore.InternalEObject;
-
-import org.eclipse.emf.ecore.impl.ENotificationImpl;
-
-import org.eclipse.jem.internal.instantiation.ImplicitAllocation;
-import org.eclipse.jem.internal.instantiation.InstantiationPackage;
-
-/**
- * <!-- begin-user-doc -->
- * An implementation of the model object '<em><b>Implicit Allocation</b></em>'.
- * <!-- end-user-doc -->
- * <p>
- * The following features are implemented:
- * <ul>
- * <li>{@link org.eclipse.jem.internal.instantiation.impl.ImplicitAllocationImpl#getParent <em>Parent</em>}</li>
- * <li>{@link org.eclipse.jem.internal.instantiation.impl.ImplicitAllocationImpl#getFeature <em>Feature</em>}</li>
- * </ul>
- * </p>
- *
- * @generated
- */
-public class ImplicitAllocationImpl extends JavaAllocationImpl implements ImplicitAllocation {
- /**
- * The cached value of the '{@link #getParent() <em>Parent</em>}' reference.
- * <!-- begin-user-doc -->
- * <!-- end-user-doc -->
- * @see #getParent()
- * @generated
- * @ordered
- */
- protected EObject parent = null;
-
- /**
- * The cached value of the '{@link #getFeature() <em>Feature</em>}' reference.
- * <!-- begin-user-doc -->
- * <!-- end-user-doc -->
- * @see #getFeature()
- * @generated
- * @ordered
- */
- protected EStructuralFeature feature = null;
-
- /**
- * <!-- begin-user-doc -->
- * <!-- end-user-doc -->
- * @generated
- */
- protected ImplicitAllocationImpl() {
- super();
- }
-
- /**
- * <!-- begin-user-doc -->
- * <!-- end-user-doc -->
- * @generated
- */
- protected EClass eStaticClass() {
- return InstantiationPackage.eINSTANCE.getImplicitAllocation();
- }
-
- /**
- * <!-- begin-user-doc -->
- * <!-- end-user-doc -->
- * @generated
- */
- public EObject getParent() {
- if (parent != null && parent.eIsProxy()) {
- EObject oldParent = parent;
- parent = eResolveProxy((InternalEObject)parent);
- if (parent != oldParent) {
- if (eNotificationRequired())
- eNotify(new ENotificationImpl(this, Notification.RESOLVE, InstantiationPackage.IMPLICIT_ALLOCATION__PARENT, oldParent, parent));
- }
- }
- return parent;
- }
-
- /**
- * <!-- begin-user-doc -->
- * <!-- end-user-doc -->
- * @generated
- */
- public EObject basicGetParent() {
- return parent;
- }
-
- /**
- * <!-- begin-user-doc -->
- * <!-- end-user-doc -->
- * @generated
- */
- public void setParent(EObject newParent) {
- EObject oldParent = parent;
- parent = newParent;
- if (eNotificationRequired())
- eNotify(new ENotificationImpl(this, Notification.SET, InstantiationPackage.IMPLICIT_ALLOCATION__PARENT, oldParent, parent));
- }
-
- /**
- * <!-- begin-user-doc -->
- * <!-- end-user-doc -->
- * @generated
- */
- public EStructuralFeature getFeature() {
- if (feature != null && feature.eIsProxy()) {
- EStructuralFeature oldFeature = feature;
- feature = (EStructuralFeature)eResolveProxy((InternalEObject)feature);
- if (feature != oldFeature) {
- if (eNotificationRequired())
- eNotify(new ENotificationImpl(this, Notification.RESOLVE, InstantiationPackage.IMPLICIT_ALLOCATION__FEATURE, oldFeature, feature));
- }
- }
- return feature;
- }
-
- /**
- * <!-- begin-user-doc -->
- * <!-- end-user-doc -->
- * @generated
- */
- public EStructuralFeature basicGetFeature() {
- return feature;
- }
-
- /**
- * <!-- begin-user-doc -->
- * <!-- end-user-doc -->
- * @generated
- */
- public void setFeature(EStructuralFeature newFeature) {
- EStructuralFeature oldFeature = feature;
- feature = newFeature;
- if (eNotificationRequired())
- eNotify(new ENotificationImpl(this, Notification.SET, InstantiationPackage.IMPLICIT_ALLOCATION__FEATURE, oldFeature, feature));
- }
-
- /**
- * <!-- begin-user-doc -->
- * <!-- end-user-doc -->
- * @generated
- */
- public Object eGet(EStructuralFeature eFeature, boolean resolve) {
- switch (eDerivedStructuralFeatureID(eFeature)) {
- case InstantiationPackage.IMPLICIT_ALLOCATION__PARENT:
- if (resolve) return getParent();
- return basicGetParent();
- case InstantiationPackage.IMPLICIT_ALLOCATION__FEATURE:
- if (resolve) return getFeature();
- return basicGetFeature();
- }
- return eDynamicGet(eFeature, resolve);
- }
-
- /**
- * <!-- begin-user-doc -->
- * <!-- end-user-doc -->
- * @generated
- */
- public void eSet(EStructuralFeature eFeature, Object newValue) {
- switch (eDerivedStructuralFeatureID(eFeature)) {
- case InstantiationPackage.IMPLICIT_ALLOCATION__PARENT:
- setParent((EObject)newValue);
- return;
- case InstantiationPackage.IMPLICIT_ALLOCATION__FEATURE:
- setFeature((EStructuralFeature)newValue);
- return;
- }
- eDynamicSet(eFeature, newValue);
- }
-
- /**
- * <!-- begin-user-doc -->
- * <!-- end-user-doc -->
- * @generated
- */
- public void eUnset(EStructuralFeature eFeature) {
- switch (eDerivedStructuralFeatureID(eFeature)) {
- case InstantiationPackage.IMPLICIT_ALLOCATION__PARENT:
- setParent((EObject)null);
- return;
- case InstantiationPackage.IMPLICIT_ALLOCATION__FEATURE:
- setFeature((EStructuralFeature)null);
- return;
- }
- eDynamicUnset(eFeature);
- }
-
- /**
- * <!-- begin-user-doc -->
- * <!-- end-user-doc -->
- * @generated
- */
- public boolean eIsSet(EStructuralFeature eFeature) {
- switch (eDerivedStructuralFeatureID(eFeature)) {
- case InstantiationPackage.IMPLICIT_ALLOCATION__PARENT:
- return parent != null;
- case InstantiationPackage.IMPLICIT_ALLOCATION__FEATURE:
- return feature != null;
- }
- return eDynamicIsSet(eFeature);
- }
-
- public String toString() {
- return "ImplicitAllocation(" + getParent() + "-" + getFeature();
- }
-
- public boolean isImplicit() {
- return true;
- }
-
-} //ImplicitAllocationImpl
diff --git a/plugins/org.eclipse.jem/javainst/org/eclipse/jem/internal/instantiation/impl/InitStringAllocationImpl.java b/plugins/org.eclipse.jem/javainst/org/eclipse/jem/internal/instantiation/impl/InitStringAllocationImpl.java
deleted file mode 100644
index c442aa9..0000000
--- a/plugins/org.eclipse.jem/javainst/org/eclipse/jem/internal/instantiation/impl/InitStringAllocationImpl.java
+++ /dev/null
@@ -1,163 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2003, 2005 IBM Corporation and others.
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
- *
- * Contributors:
- * IBM Corporation - initial API and implementation
- *******************************************************************************/
-package org.eclipse.jem.internal.instantiation.impl;
-/*
-
-
- */
-
-import org.eclipse.emf.common.notify.Notification;
-
-import org.eclipse.emf.ecore.EClass;
-import org.eclipse.emf.ecore.EStructuralFeature;
-
-import org.eclipse.emf.ecore.impl.ENotificationImpl;
-
-import org.eclipse.jem.internal.instantiation.InitStringAllocation;
-import org.eclipse.jem.internal.instantiation.InstantiationPackage;
-
-/**
- * <!-- begin-user-doc -->
- * An implementation of the model object '<em><b>Init String Allocation</b></em>'.
- * <!-- end-user-doc -->
- * <p>
- * The following features are implemented:
- * <ul>
- * <li>{@link org.eclipse.jem.internal.instantiation.impl.InitStringAllocationImpl#getInitString <em>Init String</em>}</li>
- * </ul>
- * </p>
- *
- * @generated
- */
-public class InitStringAllocationImpl extends JavaAllocationImpl implements InitStringAllocation {
- /**
- * The default value of the '{@link #getInitString() <em>Init String</em>}' attribute.
- * <!-- begin-user-doc -->
- * <!-- end-user-doc -->
- * @see #getInitString()
- * @generated
- * @ordered
- */
- protected static final String INIT_STRING_EDEFAULT = null;
-
- /**
- * The cached value of the '{@link #getInitString() <em>Init String</em>}' attribute.
- * <!-- begin-user-doc -->
- * <!-- end-user-doc -->
- * @see #getInitString()
- * @generated
- * @ordered
- */
- protected String initString = INIT_STRING_EDEFAULT;
-
- /**
- * <!-- begin-user-doc -->
- * <!-- end-user-doc -->
- * @generated
- */
- protected InitStringAllocationImpl() {
- super();
- }
-
- /**
- * <!-- begin-user-doc -->
- * <!-- end-user-doc -->
- * @generated
- */
- protected EClass eStaticClass() {
- return InstantiationPackage.eINSTANCE.getInitStringAllocation();
- }
-
- /**
- * <!-- begin-user-doc -->
- * <!-- end-user-doc -->
- * @generated
- */
- public String getInitString() {
- return initString;
- }
-
- /**
- * <!-- begin-user-doc -->
- * <!-- end-user-doc -->
- * @generated
- */
- public void setInitString(String newInitString) {
- String oldInitString = initString;
- initString = newInitString;
- if (eNotificationRequired())
- eNotify(new ENotificationImpl(this, Notification.SET, InstantiationPackage.INIT_STRING_ALLOCATION__INIT_STRING, oldInitString, initString));
- }
-
- /**
- * <!-- begin-user-doc -->
- * <!-- end-user-doc -->
- * @generated
- */
- public Object eGet(EStructuralFeature eFeature, boolean resolve) {
- switch (eDerivedStructuralFeatureID(eFeature)) {
- case InstantiationPackage.INIT_STRING_ALLOCATION__INIT_STRING:
- return getInitString();
- }
- return eDynamicGet(eFeature, resolve);
- }
-
- /**
- * <!-- begin-user-doc -->
- * <!-- end-user-doc -->
- * @generated
- */
- public void eSet(EStructuralFeature eFeature, Object newValue) {
- switch (eDerivedStructuralFeatureID(eFeature)) {
- case InstantiationPackage.INIT_STRING_ALLOCATION__INIT_STRING:
- setInitString((String)newValue);
- return;
- }
- eDynamicSet(eFeature, newValue);
- }
-
- /**
- * <!-- begin-user-doc -->
- * <!-- end-user-doc -->
- * @generated
- */
- public void eUnset(EStructuralFeature eFeature) {
- switch (eDerivedStructuralFeatureID(eFeature)) {
- case InstantiationPackage.INIT_STRING_ALLOCATION__INIT_STRING:
- setInitString(INIT_STRING_EDEFAULT);
- return;
- }
- eDynamicUnset(eFeature);
- }
-
- /**
- * <!-- begin-user-doc -->
- * <!-- end-user-doc -->
- * @generated
- */
- public boolean eIsSet(EStructuralFeature eFeature) {
- switch (eDerivedStructuralFeatureID(eFeature)) {
- case InstantiationPackage.INIT_STRING_ALLOCATION__INIT_STRING:
- return INIT_STRING_EDEFAULT == null ? initString != null : !INIT_STRING_EDEFAULT.equals(initString);
- }
- return eDynamicIsSet(eFeature);
- }
-
- public String toString() {
- if (eIsProxy()) return super.toString();
-
- StringBuffer result = new StringBuffer();
- result.append("InitString: ");
- result.append(initString);
- return result.toString();
- }
-
-} //InitStringAllocationImpl
diff --git a/plugins/org.eclipse.jem/javainst/org/eclipse/jem/internal/instantiation/impl/InstantiationFactoryImpl.java b/plugins/org.eclipse.jem/javainst/org/eclipse/jem/internal/instantiation/impl/InstantiationFactoryImpl.java
deleted file mode 100644
index 9ecf2e2..0000000
--- a/plugins/org.eclipse.jem/javainst/org/eclipse/jem/internal/instantiation/impl/InstantiationFactoryImpl.java
+++ /dev/null
@@ -1,633 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2003, 2005 IBM Corporation and others.
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
- *
- * Contributors:
- * IBM Corporation - initial API and implementation
- *******************************************************************************/
-package org.eclipse.jem.internal.instantiation.impl;
-/*
-
-
- */
-
-import org.eclipse.emf.ecore.EClass;
-import org.eclipse.emf.ecore.EDataType;
-import org.eclipse.emf.ecore.EObject;
-
-import java.util.List;
-
-import org.eclipse.jem.internal.instantiation.*;
-import org.eclipse.jem.internal.instantiation.base.IJavaInstance;
-
-import org.eclipse.emf.ecore.*;
-import org.eclipse.emf.ecore.impl.EFactoryImpl;
-
-/**
- * <!-- begin-user-doc -->
- * An implementation of the model <b>Factory</b>.
- * <!-- end-user-doc -->
- * @generated
- */
-public class InstantiationFactoryImpl extends EFactoryImpl implements InstantiationFactory {
- /**
- * Creates an instance of the factory.
- * <!-- begin-user-doc -->
- * <!-- end-user-doc -->
- * @generated
- */
- public InstantiationFactoryImpl() {
- super();
- }
-
- /**
- * <!-- begin-user-doc -->
- * <!-- end-user-doc -->
- * @generated
- */
- public EObject create(EClass eClass) {
- switch (eClass.getClassifierID()) {
- case InstantiationPackage.INIT_STRING_ALLOCATION: return createInitStringAllocation();
- case InstantiationPackage.IMPLICIT_ALLOCATION: return createImplicitAllocation();
- case InstantiationPackage.PARSE_TREE_ALLOCATION: return createParseTreeAllocation();
- case InstantiationPackage.PT_ARRAY_ACCESS: return createPTArrayAccess();
- case InstantiationPackage.PT_ARRAY_CREATION: return createPTArrayCreation();
- case InstantiationPackage.PT_ARRAY_INITIALIZER: return createPTArrayInitializer();
- case InstantiationPackage.PT_BOOLEAN_LITERAL: return createPTBooleanLiteral();
- case InstantiationPackage.PT_CAST_EXPRESSION: return createPTCastExpression();
- case InstantiationPackage.PT_CHARACTER_LITERAL: return createPTCharacterLiteral();
- case InstantiationPackage.PT_CLASS_INSTANCE_CREATION: return createPTClassInstanceCreation();
- case InstantiationPackage.PT_CONDITIONAL_EXPRESSION: return createPTConditionalExpression();
- case InstantiationPackage.PT_FIELD_ACCESS: return createPTFieldAccess();
- case InstantiationPackage.PT_INFIX_EXPRESSION: return createPTInfixExpression();
- case InstantiationPackage.PT_INSTANCEOF: return createPTInstanceof();
- case InstantiationPackage.PT_METHOD_INVOCATION: return createPTMethodInvocation();
- case InstantiationPackage.PT_NAME: return createPTName();
- case InstantiationPackage.PT_NULL_LITERAL: return createPTNullLiteral();
- case InstantiationPackage.PT_NUMBER_LITERAL: return createPTNumberLiteral();
- case InstantiationPackage.PT_PARENTHESIZED_EXPRESSION: return createPTParenthesizedExpression();
- case InstantiationPackage.PT_PREFIX_EXPRESSION: return createPTPrefixExpression();
- case InstantiationPackage.PT_STRING_LITERAL: return createPTStringLiteral();
- case InstantiationPackage.PT_THIS_LITERAL: return createPTThisLiteral();
- case InstantiationPackage.PT_TYPE_LITERAL: return createPTTypeLiteral();
- case InstantiationPackage.PT_INVALID_EXPRESSION: return createPTInvalidExpression();
- case InstantiationPackage.PT_INSTANCE_REFERENCE: return createPTInstanceReference();
- case InstantiationPackage.PT_ANONYMOUS_CLASS_DECLARATION: return createPTAnonymousClassDeclaration();
- default:
- throw new IllegalArgumentException("The class '" + eClass.getName() + "' is not a valid classifier");
- }
- }
-
- /**
- * <!-- begin-user-doc -->
- * <!-- end-user-doc -->
- * @generated
- */
- public Object createFromString(EDataType eDataType, String initialValue) {
- switch (eDataType.getClassifierID()) {
- case InstantiationPackage.PT_INFIX_OPERATOR: {
- PTInfixOperator result = PTInfixOperator.get(initialValue);
- if (result == null) throw new IllegalArgumentException("The value '" + initialValue + "' is not a valid enumerator of '" + eDataType.getName() + "'");
- return result;
- }
- case InstantiationPackage.PT_PREFIX_OPERATOR: {
- PTPrefixOperator result = PTPrefixOperator.get(initialValue);
- if (result == null) throw new IllegalArgumentException("The value '" + initialValue + "' is not a valid enumerator of '" + eDataType.getName() + "'");
- return result;
- }
- default:
- throw new IllegalArgumentException("The datatype '" + eDataType.getName() + "' is not a valid classifier");
- }
- }
-
- /**
- * <!-- begin-user-doc -->
- * <!-- end-user-doc -->
- * @generated
- */
- public String convertToString(EDataType eDataType, Object instanceValue) {
- switch (eDataType.getClassifierID()) {
- case InstantiationPackage.PT_INFIX_OPERATOR:
- return instanceValue == null ? null : instanceValue.toString();
- case InstantiationPackage.PT_PREFIX_OPERATOR:
- return instanceValue == null ? null : instanceValue.toString();
- default:
- throw new IllegalArgumentException("The datatype '" + eDataType.getName() + "' is not a valid classifier");
- }
- }
-
- /**
- * <!-- begin-user-doc -->
- * <!-- end-user-doc -->
- * @generated
- */
- public InitStringAllocation createInitStringAllocation() {
- InitStringAllocationImpl initStringAllocation = new InitStringAllocationImpl();
- return initStringAllocation;
- }
-
- /**
- * <!-- begin-user-doc -->
- * <!-- end-user-doc -->
- * @generated
- */
- public ImplicitAllocation createImplicitAllocation() {
- ImplicitAllocationImpl implicitAllocation = new ImplicitAllocationImpl();
- return implicitAllocation;
- }
-
- /**
- * <!-- begin-user-doc -->
- * <!-- end-user-doc -->
- * @generated
- */
- public ParseTreeAllocation createParseTreeAllocation() {
- ParseTreeAllocationImpl parseTreeAllocation = new ParseTreeAllocationImpl();
- return parseTreeAllocation;
- }
-
- /**
- * <!-- begin-user-doc -->
- * <!-- end-user-doc -->
- * @generated
- */
- public PTArrayAccess createPTArrayAccess() {
- PTArrayAccessImpl ptArrayAccess = new PTArrayAccessImpl();
- return ptArrayAccess;
- }
-
- /**
- * <!-- begin-user-doc -->
- * <!-- end-user-doc -->
- * @generated
- */
- public PTArrayCreation createPTArrayCreation() {
- PTArrayCreationImpl ptArrayCreation = new PTArrayCreationImpl();
- return ptArrayCreation;
- }
-
- /**
- * <!-- begin-user-doc -->
- * <!-- end-user-doc -->
- * @generated
- */
- public PTArrayInitializer createPTArrayInitializer() {
- PTArrayInitializerImpl ptArrayInitializer = new PTArrayInitializerImpl();
- return ptArrayInitializer;
- }
-
- /**
- * <!-- begin-user-doc -->
- * <!-- end-user-doc -->
- * @generated
- */
- public PTBooleanLiteral createPTBooleanLiteral() {
- PTBooleanLiteralImpl ptBooleanLiteral = new PTBooleanLiteralImpl();
- return ptBooleanLiteral;
- }
-
- /**
- * <!-- begin-user-doc -->
- * <!-- end-user-doc -->
- * @generated
- */
- public PTCastExpression createPTCastExpression() {
- PTCastExpressionImpl ptCastExpression = new PTCastExpressionImpl();
- return ptCastExpression;
- }
-
- /**
- * <!-- begin-user-doc -->
- * <!-- end-user-doc -->
- * @generated
- */
- public PTCharacterLiteral createPTCharacterLiteral() {
- PTCharacterLiteralImpl ptCharacterLiteral = new PTCharacterLiteralImpl();
- return ptCharacterLiteral;
- }
-
- /**
- * <!-- begin-user-doc -->
- * <!-- end-user-doc -->
- * @generated
- */
- public PTClassInstanceCreation createPTClassInstanceCreation() {
- PTClassInstanceCreationImpl ptClassInstanceCreation = new PTClassInstanceCreationImpl();
- return ptClassInstanceCreation;
- }
-
- /**
- * <!-- begin-user-doc -->
- * <!-- end-user-doc -->
- * @generated
- */
- public PTConditionalExpression createPTConditionalExpression() {
- PTConditionalExpressionImpl ptConditionalExpression = new PTConditionalExpressionImpl();
- return ptConditionalExpression;
- }
-
- /**
- * <!-- begin-user-doc -->
- * <!-- end-user-doc -->
- * @generated
- */
- public PTFieldAccess createPTFieldAccess() {
- PTFieldAccessImpl ptFieldAccess = new PTFieldAccessImpl();
- return ptFieldAccess;
- }
-
- /**
- * <!-- begin-user-doc -->
- * <!-- end-user-doc -->
- * @generated
- */
- public PTInfixExpression createPTInfixExpression() {
- PTInfixExpressionImpl ptInfixExpression = new PTInfixExpressionImpl();
- return ptInfixExpression;
- }
-
- /**
- * <!-- begin-user-doc -->
- * <!-- end-user-doc -->
- * @generated
- */
- public PTInstanceof createPTInstanceof() {
- PTInstanceofImpl ptInstanceof = new PTInstanceofImpl();
- return ptInstanceof;
- }
-
- /**
- * <!-- begin-user-doc -->
- * <!-- end-user-doc -->
- * @generated
- */
- public PTMethodInvocation createPTMethodInvocation() {
- PTMethodInvocationImpl ptMethodInvocation = new PTMethodInvocationImpl();
- return ptMethodInvocation;
- }
-
- /**
- * <!-- begin-user-doc -->
- * <!-- end-user-doc -->
- * @generated
- */
- public PTName createPTName() {
- PTNameImpl ptName = new PTNameImpl();
- return ptName;
- }
-
- /**
- * <!-- begin-user-doc -->
- * <!-- end-user-doc -->
- * @generated
- */
- public PTNullLiteral createPTNullLiteral() {
- PTNullLiteralImpl ptNullLiteral = new PTNullLiteralImpl();
- return ptNullLiteral;
- }
-
- /**
- * <!-- begin-user-doc -->
- * <!-- end-user-doc -->
- * @generated
- */
- public PTNumberLiteral createPTNumberLiteral() {
- PTNumberLiteralImpl ptNumberLiteral = new PTNumberLiteralImpl();
- return ptNumberLiteral;
- }
-
- /**
- * <!-- begin-user-doc -->
- * <!-- end-user-doc -->
- * @generated
- */
- public PTParenthesizedExpression createPTParenthesizedExpression() {
- PTParenthesizedExpressionImpl ptParenthesizedExpression = new PTParenthesizedExpressionImpl();
- return ptParenthesizedExpression;
- }
-
- /**
- * <!-- begin-user-doc -->
- * <!-- end-user-doc -->
- * @generated
- */
- public PTPrefixExpression createPTPrefixExpression() {
- PTPrefixExpressionImpl ptPrefixExpression = new PTPrefixExpressionImpl();
- return ptPrefixExpression;
- }
-
- /**
- * <!-- begin-user-doc -->
- * <!-- end-user-doc -->
- * @generated
- */
- public PTStringLiteral createPTStringLiteral() {
- PTStringLiteralImpl ptStringLiteral = new PTStringLiteralImpl();
- return ptStringLiteral;
- }
-
- /**
- * <!-- begin-user-doc -->
- * <!-- end-user-doc -->
- * @generated
- */
- public PTThisLiteral createPTThisLiteral() {
- PTThisLiteralImpl ptThisLiteral = new PTThisLiteralImpl();
- return ptThisLiteral;
- }
-
- /**
- * <!-- begin-user-doc -->
- * <!-- end-user-doc -->
- * @generated
- */
- public PTTypeLiteral createPTTypeLiteral() {
- PTTypeLiteralImpl ptTypeLiteral = new PTTypeLiteralImpl();
- return ptTypeLiteral;
- }
-
- /**
- * <!-- begin-user-doc -->
- * <!-- end-user-doc -->
- * @generated
- */
- public PTInvalidExpression createPTInvalidExpression() {
- PTInvalidExpressionImpl ptInvalidExpression = new PTInvalidExpressionImpl();
- return ptInvalidExpression;
- }
-
- /**
- * <!-- begin-user-doc -->
- * <!-- end-user-doc -->
- * @generated
- */
- public PTInstanceReference createPTInstanceReference() {
- PTInstanceReferenceImpl ptInstanceReference = new PTInstanceReferenceImpl();
- return ptInstanceReference;
- }
-
- /**
- * <!-- begin-user-doc -->
- * <!-- end-user-doc -->
- * @generated
- */
- public PTAnonymousClassDeclaration createPTAnonymousClassDeclaration() {
- PTAnonymousClassDeclarationImpl ptAnonymousClassDeclaration = new PTAnonymousClassDeclarationImpl();
- return ptAnonymousClassDeclaration;
- }
-
- public PTInstanceReference createPTInstanceReference(IJavaInstance instance) {
- PTInstanceReference ptInstanceReference = createPTInstanceReference();
- ptInstanceReference.setReference(instance);
- return ptInstanceReference;
- }
-
- /**
- * <!-- begin-user-doc -->
- * <!-- end-user-doc -->
- * @generated
- */
- public InstantiationPackage getInstantiationPackage() {
- return (InstantiationPackage)getEPackage();
- }
-
- /**
- * <!-- begin-user-doc -->
- * <!-- end-user-doc -->
- * @deprecated
- * @generated
- */
- public static InstantiationPackage getPackage() {
- return InstantiationPackage.eINSTANCE;
- }
-
- /* (non-Javadoc)
- * @see org.eclipse.jem.internal.instantiation.InstantiationFactory#createImplicitAllocation(org.eclipse.emf.ecore.EObject, org.eclipse.emf.ecore.EStructuralFeature)
- */
- public ImplicitAllocation createImplicitAllocation(EObject parent, EStructuralFeature sf) {
- ImplicitAllocation alloc = createImplicitAllocation();
- alloc.setParent(parent);
- alloc.setFeature(sf);
- return alloc;
- }
-
- /* (non-Javadoc)
- * @see org.eclipse.jem.internal.instantiation.InstantiationFactory#createInitStringAllocation(java.lang.String)
- */
- public InitStringAllocation createInitStringAllocation(String initString) {
- InitStringAllocation alloc = createInitStringAllocation();
- alloc.setInitString(initString);
- return alloc;
- }
-
- /* (non-Javadoc)
- * @see org.eclipse.jem.internal.instantiation.InstantiationFactory#createParseTreeAllocation(org.eclipse.jem.internal.instantiation.PTExpression)
- */
- public ParseTreeAllocation createParseTreeAllocation(PTExpression expression) {
- ParseTreeAllocation a = createParseTreeAllocation();
- a.setExpression(expression);
- return a;
- }
-
- /* (non-Javadoc)
- * @see org.eclipse.jem.internal.instantiation.InstantiationFactory#createPTArrayAccess(org.eclipse.jem.internal.instantiation.PTExpression, java.util.List)
- */
- public PTArrayAccess createPTArrayAccess(PTExpression array, List indexes) {
- PTArrayAccess a = createPTArrayAccess();
- a.setArray(array);
- a.getIndexes().addAll(indexes);
- return a;
- }
-
- /* (non-Javadoc)
- * @see org.eclipse.jem.internal.instantiation.InstantiationFactory#createPTArrayCreation(java.lang.String, java.util.List, org.eclipse.jem.internal.instantiation.PTArrayInitializer)
- */
- public PTArrayCreation createPTArrayCreation(String type, List dimensions, PTArrayInitializer initializer) {
- PTArrayCreation a = createPTArrayCreation();
- a.setType(type);
- if (dimensions != null)
- a.getDimensions().addAll(dimensions);
- a.setInitializer(initializer);
- return a;
- }
-
- /* (non-Javadoc)
- * @see org.eclipse.jem.internal.instantiation.InstantiationFactory#createPTArrayInitializer(java.util.List)
- */
- public PTArrayInitializer createPTArrayInitializer(List expressions) {
- PTArrayInitializer a = createPTArrayInitializer();
- if (expressions != null)
- a.getExpressions().addAll(expressions);
- return a;
- }
-
- /* (non-Javadoc)
- * @see org.eclipse.jem.internal.instantiation.InstantiationFactory#createPTBooleanLiteral(boolean)
- */
- public PTBooleanLiteral createPTBooleanLiteral(boolean booleanValue) {
- PTBooleanLiteral a = createPTBooleanLiteral();
- a.setBooleanValue(booleanValue);
- return a;
- }
-
- /* (non-Javadoc)
- * @see org.eclipse.jem.internal.instantiation.InstantiationFactory#createPTCastExpression(java.lang.String, org.eclipse.jem.internal.instantiation.PTExpression)
- */
- public PTCastExpression createPTCastExpression(String type, PTExpression expression) {
- PTCastExpression a = createPTCastExpression();
- a.setType(type);
- a.setExpression(expression);
- return a;
- }
-
- /* (non-Javadoc)
- * @see org.eclipse.jem.internal.instantiation.InstantiationFactory#createPTCharacterLiteral(java.lang.String)
- */
- public PTCharacterLiteral createPTCharacterLiteral(String escapedValue) {
- PTCharacterLiteral a = createPTCharacterLiteral();
- a.setEscapedValue(escapedValue);
- return a;
- }
-
- /* (non-Javadoc)
- * @see org.eclipse.jem.internal.instantiation.InstantiationFactory#createPTClassInstanceCreation(java.lang.String, java.util.List)
- */
- public PTClassInstanceCreation createPTClassInstanceCreation(String type, List arguments) {
- PTClassInstanceCreation a = createPTClassInstanceCreation();
- a.setType(type);
- if (arguments != null)
- a.getArguments().addAll(arguments);
- return a;
- }
-
- /* (non-Javadoc)
- * @see org.eclipse.jem.internal.instantiation.InstantiationFactory#createPTConditionalExpression(org.eclipse.jem.internal.instantiation.PTExpression, org.eclipse.jem.internal.instantiation.PTExpression, org.eclipse.jem.internal.instantiation.PTExpression)
- */
- public PTConditionalExpression createPTConditionalExpression(
- PTExpression condition,
- PTExpression trueExpressoin,
- PTExpression falseExpression) {
- PTConditionalExpression a = createPTConditionalExpression();
- a.setCondition(condition);
- a.setTrue(trueExpressoin);
- a.setFalse(falseExpression);
- return a;
- }
-
- /* (non-Javadoc)
- * @see org.eclipse.jem.internal.instantiation.InstantiationFactory#createPTFieldAccess(org.eclipse.jem.internal.instantiation.PTExpression, java.lang.String)
- */
- public PTFieldAccess createPTFieldAccess(PTExpression receiver, String field) {
- PTFieldAccess a = createPTFieldAccess();
- a.setReceiver(receiver);
- a.setField(field);
- return a;
- }
-
- /* (non-Javadoc)
- * @see org.eclipse.jem.internal.instantiation.InstantiationFactory#createPTInfixExpression(org.eclipse.jem.internal.instantiation.PTExpression, org.eclipse.jem.internal.instantiation.PTInfixOperator, org.eclipse.jem.internal.instantiation.PTExpression, java.util.List)
- */
- public PTInfixExpression createPTInfixExpression(
- PTExpression leftOperand,
- PTInfixOperator operator,
- PTExpression rightOperand,
- List extendedOperands) {
- PTInfixExpression a = createPTInfixExpression();
- a.setLeftOperand(leftOperand);
- a.setOperator(operator);
- a.setRightOperand(rightOperand);
- if (extendedOperands != null)
- a.getExtendedOperands().addAll(extendedOperands);
- return a;
- }
-
- /* (non-Javadoc)
- * @see org.eclipse.jem.internal.instantiation.InstantiationFactory#createPTInstanceof(org.eclipse.jem.internal.instantiation.PTExpression, java.lang.String)
- */
- public PTInstanceof createPTInstanceof(PTExpression operand, String type) {
- PTInstanceof a = createPTInstanceof();
- a.setOperand(operand);
- a.setType(type);
- return a;
- }
-
- /* (non-Javadoc)
- * @see org.eclipse.jem.internal.instantiation.InstantiationFactory#createPTInvalidExpression(java.lang.String)
- */
- public PTInvalidExpression createPTInvalidExpression(String message) {
- PTInvalidExpression a = createPTInvalidExpression();
- a.setMessage(message);
- return a;
- }
-
- /* (non-Javadoc)
- * @see org.eclipse.jem.internal.instantiation.InstantiationFactory#createPTMethodInvocation(org.eclipse.jem.internal.instantiation.PTExpression, java.lang.String, java.util.List)
- */
- public PTMethodInvocation createPTMethodInvocation(PTExpression receiver, String name, List arguments) {
- PTMethodInvocation a = createPTMethodInvocation();
- a.setReceiver(receiver);
- a.setName(name);
- if (arguments != null)
- a.getArguments().addAll(arguments);
- return a;
- }
-
- /* (non-Javadoc)
- * @see org.eclipse.jem.internal.instantiation.InstantiationFactory#createPTName(java.lang.String)
- */
- public PTName createPTName(String name) {
- PTName a = createPTName();
- a.setName(name);
- return a;
- }
-
- /* (non-Javadoc)
- * @see org.eclipse.jem.internal.instantiation.InstantiationFactory#createPTNumberLiteral(java.lang.String)
- */
- public PTNumberLiteral createPTNumberLiteral(String token) {
- PTNumberLiteral a = createPTNumberLiteral();
- a.setToken(token);
- return a;
- }
-
- /* (non-Javadoc)
- * @see org.eclipse.jem.internal.instantiation.InstantiationFactory#createPTParenthesizedExpression(org.eclipse.jem.internal.instantiation.PTExpression)
- */
- public PTParenthesizedExpression createPTParenthesizedExpression(PTExpression expression) {
- PTParenthesizedExpression a = createPTParenthesizedExpression();
- a.setExpression(expression);
- return a;
- }
-
- /* (non-Javadoc)
- * @see org.eclipse.jem.internal.instantiation.InstantiationFactory#createPTPrefixExpression(org.eclipse.jem.internal.instantiation.PTPrefixOperator, org.eclipse.jem.internal.instantiation.PTExpression)
- */
- public PTPrefixExpression createPTPrefixExpression(PTPrefixOperator operator, PTExpression expression) {
- PTPrefixExpression a = createPTPrefixExpression();
- a.setOperator(operator);
- a.setExpression(expression);
- return a;
- }
-
- /* (non-Javadoc)
- * @see org.eclipse.jem.internal.instantiation.InstantiationFactory#createPTStringLiteral(java.lang.String)
- */
- public PTStringLiteral createPTStringLiteral(String escapeLiteral) {
- PTStringLiteral a = createPTStringLiteral();
- a.setEscapedValue(escapeLiteral);
- return a;
- }
-
- /* (non-Javadoc)
- * @see org.eclipse.jem.internal.instantiation.InstantiationFactory#createPTTypeLiteral(java.lang.String)
- */
- public PTTypeLiteral createPTTypeLiteral(String type) {
- PTTypeLiteral a = createPTTypeLiteral();
- a.setType(type);
- return a;
- }
-
-} //InstantiationFactoryImpl
diff --git a/plugins/org.eclipse.jem/javainst/org/eclipse/jem/internal/instantiation/impl/InstantiationImplMessages.java b/plugins/org.eclipse.jem/javainst/org/eclipse/jem/internal/instantiation/impl/InstantiationImplMessages.java
deleted file mode 100644
index 8debe1f..0000000
--- a/plugins/org.eclipse.jem/javainst/org/eclipse/jem/internal/instantiation/impl/InstantiationImplMessages.java
+++ /dev/null
@@ -1,28 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2000, 2005 IBM Corporation and others.
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
- *
- * Contributors:
- * IBM Corporation - initial API and implementation
- *******************************************************************************/
-package org.eclipse.jem.internal.instantiation.impl;
-
-import org.eclipse.osgi.util.NLS;
-
-public final class InstantiationImplMessages extends NLS {
-
- private static final String BUNDLE_NAME = "org.eclipse.jem.internal.instantiation.impl.messages";//$NON-NLS-1$
-
- private InstantiationImplMessages() {
- // Do not instantiate
- }
-
- public static String NaiveExpressionFlattener_InvalidExpression;
-
- static {
- NLS.initializeMessages(BUNDLE_NAME, InstantiationImplMessages.class);
- }
-}
\ No newline at end of file
diff --git a/plugins/org.eclipse.jem/javainst/org/eclipse/jem/internal/instantiation/impl/InstantiationPackageImpl.java b/plugins/org.eclipse.jem/javainst/org/eclipse/jem/internal/instantiation/impl/InstantiationPackageImpl.java
deleted file mode 100644
index 193d78f..0000000
--- a/plugins/org.eclipse.jem/javainst/org/eclipse/jem/internal/instantiation/impl/InstantiationPackageImpl.java
+++ /dev/null
@@ -1,1392 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2003, 2005 IBM Corporation and others.
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
- *
- * Contributors:
- * IBM Corporation - initial API and implementation
- *******************************************************************************/
-package org.eclipse.jem.internal.instantiation.impl;
-/*
-
-
- */
-
-import org.eclipse.emf.ecore.EAttribute;
-import org.eclipse.emf.ecore.EClass;
-import org.eclipse.emf.ecore.EEnum;
-import org.eclipse.emf.ecore.EPackage;
-import org.eclipse.emf.ecore.EReference;
-import org.eclipse.emf.ecore.EcorePackage;
-
-import org.eclipse.emf.ecore.impl.EPackageImpl;
-
-import org.eclipse.emf.ecore.impl.EcorePackageImpl;
-
-import org.eclipse.jem.internal.instantiation.PTArrayAccess;
-import org.eclipse.jem.internal.instantiation.PTArrayCreation;
-import org.eclipse.jem.internal.instantiation.PTArrayInitializer;
-import org.eclipse.jem.internal.instantiation.PTBooleanLiteral;
-import org.eclipse.jem.internal.instantiation.PTCastExpression;
-import org.eclipse.jem.internal.instantiation.PTCharacterLiteral;
-import org.eclipse.jem.internal.instantiation.PTClassInstanceCreation;
-import org.eclipse.jem.internal.instantiation.PTConditionalExpression;
-import org.eclipse.jem.internal.instantiation.PTExpression;
-import org.eclipse.jem.internal.instantiation.PTFieldAccess;
-import org.eclipse.jem.internal.instantiation.ImplicitAllocation;
-import org.eclipse.jem.internal.instantiation.PTInfixExpression;
-import org.eclipse.jem.internal.instantiation.PTInfixOperator;
-import org.eclipse.jem.internal.instantiation.PTInstanceReference;
-import org.eclipse.jem.internal.instantiation.InitStringAllocation;
-import org.eclipse.jem.internal.instantiation.PTInstanceof;
-import org.eclipse.jem.internal.instantiation.InstantiationFactory;
-import org.eclipse.jem.internal.instantiation.InstantiationPackage;
-import org.eclipse.jem.internal.instantiation.PTInvalidExpression;
-import org.eclipse.jem.internal.instantiation.JavaAllocation;
-
-import org.eclipse.jem.internal.instantiation.PTAnonymousClassDeclaration;
-import org.eclipse.jem.internal.instantiation.PTMethodInvocation;
-import org.eclipse.jem.internal.instantiation.PTName;
-import org.eclipse.jem.internal.instantiation.PTNullLiteral;
-import org.eclipse.jem.internal.instantiation.PTNumberLiteral;
-import org.eclipse.jem.internal.instantiation.PTParenthesizedExpression;
-import org.eclipse.jem.internal.instantiation.ParseTreeAllocation;
-
-import org.eclipse.jem.internal.instantiation.PTPrefixExpression;
-import org.eclipse.jem.internal.instantiation.PTPrefixOperator;
-import org.eclipse.jem.internal.instantiation.PTStringLiteral;
-import org.eclipse.jem.internal.instantiation.PTThisLiteral;
-import org.eclipse.jem.internal.instantiation.PTTypeLiteral;
-
-import org.eclipse.jem.internal.instantiation.base.IJavaDataTypeInstance;
-import org.eclipse.jem.internal.instantiation.base.IJavaInstance;
-import org.eclipse.jem.internal.instantiation.base.IJavaObjectInstance;
-
-/**
- * <!-- begin-user-doc -->
- * An implementation of the model <b>Package</b>.
- * <!-- end-user-doc -->
- * @generated
- */
-public class InstantiationPackageImpl extends EPackageImpl implements InstantiationPackage {
- /**
- * <!-- begin-user-doc -->
- * <!-- end-user-doc -->
- * @generated
- */
- private EClass iJavaDataTypeInstanceEClass = null;
-
- /**
- * <!-- begin-user-doc -->
- * <!-- end-user-doc -->
- * @generated
- */
- private EClass iJavaObjectInstanceEClass = null;
-
- /**
- * <!-- begin-user-doc -->
- * <!-- end-user-doc -->
- * @generated
- */
- private EClass javaAllocationEClass = null;
-
- /**
- * <!-- begin-user-doc -->
- * <!-- end-user-doc -->
- * @generated
- */
- private EClass initStringAllocationEClass = null;
-
- /**
- * <!-- begin-user-doc -->
- * <!-- end-user-doc -->
- * @generated
- */
- private EClass implicitAllocationEClass = null;
-
- /**
- * <!-- begin-user-doc -->
- * <!-- end-user-doc -->
- * @generated
- */
- private EClass parseTreeAllocationEClass = null;
-
- /**
- * <!-- begin-user-doc -->
- * <!-- end-user-doc -->
- * @generated
- */
- private EClass ptExpressionEClass = null;
-
- /**
- * <!-- begin-user-doc -->
- * <!-- end-user-doc -->
- * @generated
- */
- private EClass ptArrayAccessEClass = null;
-
- /**
- * <!-- begin-user-doc -->
- * <!-- end-user-doc -->
- * @generated
- */
- private EClass ptArrayCreationEClass = null;
-
- /**
- * <!-- begin-user-doc -->
- * <!-- end-user-doc -->
- * @generated
- */
- private EClass ptArrayInitializerEClass = null;
-
- /**
- * <!-- begin-user-doc -->
- * <!-- end-user-doc -->
- * @generated
- */
- private EClass ptBooleanLiteralEClass = null;
-
- /**
- * <!-- begin-user-doc -->
- * <!-- end-user-doc -->
- * @generated
- */
- private EClass ptCastExpressionEClass = null;
-
- /**
- * <!-- begin-user-doc -->
- * <!-- end-user-doc -->
- * @generated
- */
- private EClass ptCharacterLiteralEClass = null;
-
- /**
- * <!-- begin-user-doc -->
- * <!-- end-user-doc -->
- * @generated
- */
- private EClass ptClassInstanceCreationEClass = null;
-
- /**
- * <!-- begin-user-doc -->
- * <!-- end-user-doc -->
- * @generated
- */
- private EClass ptConditionalExpressionEClass = null;
-
- /**
- * <!-- begin-user-doc -->
- * <!-- end-user-doc -->
- * @generated
- */
- private EClass ptFieldAccessEClass = null;
-
- /**
- * <!-- begin-user-doc -->
- * <!-- end-user-doc -->
- * @generated
- */
- private EClass ptInfixExpressionEClass = null;
-
- /**
- * <!-- begin-user-doc -->
- * <!-- end-user-doc -->
- * @generated
- */
- private EClass ptInstanceofEClass = null;
-
- /**
- * <!-- begin-user-doc -->
- * <!-- end-user-doc -->
- * @generated
- */
- private EClass ptMethodInvocationEClass = null;
-
- /**
- * <!-- begin-user-doc -->
- * <!-- end-user-doc -->
- * @generated
- */
- private EClass ptNameEClass = null;
-
- /**
- * <!-- begin-user-doc -->
- * <!-- end-user-doc -->
- * @generated
- */
- private EClass ptNullLiteralEClass = null;
-
- /**
- * <!-- begin-user-doc -->
- * <!-- end-user-doc -->
- * @generated
- */
- private EClass ptNumberLiteralEClass = null;
-
- /**
- * <!-- begin-user-doc -->
- * <!-- end-user-doc -->
- * @generated
- */
- private EClass ptParenthesizedExpressionEClass = null;
-
- /**
- * <!-- begin-user-doc -->
- * <!-- end-user-doc -->
- * @generated
- */
- private EClass ptPrefixExpressionEClass = null;
-
- /**
- * <!-- begin-user-doc -->
- * <!-- end-user-doc -->
- * @generated
- */
- private EClass ptStringLiteralEClass = null;
-
- /**
- * <!-- begin-user-doc -->
- * <!-- end-user-doc -->
- * @generated
- */
- private EClass ptThisLiteralEClass = null;
-
- /**
- * <!-- begin-user-doc -->
- * <!-- end-user-doc -->
- * @generated
- */
- private EClass ptTypeLiteralEClass = null;
-
- /**
- * <!-- begin-user-doc -->
- * <!-- end-user-doc -->
- * @generated
- */
- private EClass ptInvalidExpressionEClass = null;
-
- /**
- * <!-- begin-user-doc -->
- * <!-- end-user-doc -->
- * @generated
- */
- private EClass ptInstanceReferenceEClass = null;
-
- /**
- * <!-- begin-user-doc -->
- * <!-- end-user-doc -->
- * @generated
- */
- private EClass ptAnonymousClassDeclarationEClass = null;
-
- /**
- * <!-- begin-user-doc -->
- * <!-- end-user-doc -->
- * @generated
- */
- private EEnum ptInfixOperatorEEnum = null;
-
- /**
- * <!-- begin-user-doc -->
- * <!-- end-user-doc -->
- * @generated
- */
- private EEnum ptPrefixOperatorEEnum = null;
-
- /**
- * <!-- begin-user-doc -->
- * <!-- end-user-doc -->
- * @generated
- */
- private EClass iJavaInstanceEClass = null;
-
- /**
- * Creates an instance of the model <b>Package</b>, registered with
- * {@link org.eclipse.emf.ecore.EPackage.Registry EPackage.Registry} by the package
- * package URI value.
- * <p>Note: the correct way to create the package is via the static
- * factory method {@link #init init()}, which also performs
- * initialization of the package, or returns the registered package,
- * if one already exists.
- * <!-- begin-user-doc -->
- * <!-- end-user-doc -->
- * @see org.eclipse.emf.ecore.EPackage.Registry
- * @see org.eclipse.jem.internal.instantiation.InstantiationPackage#eNS_URI
- * @see #init()
- * @generated
- */
- private InstantiationPackageImpl() {
- super(eNS_URI, InstantiationFactory.eINSTANCE);
- }
-
- /**
- * <!-- begin-user-doc -->
- * <!-- end-user-doc -->
- * @generated
- */
- private static boolean isInited = false;
-
- /**
- * Creates, registers, and initializes the <b>Package</b> for this
- * model, and for any others upon which it depends. Simple
- * dependencies are satisfied by calling this method on all
- * dependent packages before doing anything else. This method drives
- * initialization for interdependent packages directly, in parallel
- * with this package, itself.
- * <p>Of this package and its interdependencies, all packages which
- * have not yet been registered by their URI values are first created
- * and registered. The packages are then initialized in two steps:
- * meta-model objects for all of the packages are created before any
- * are initialized, since one package's meta-model objects may refer to
- * those of another.
- * <p>Invocation of this method will not affect any packages that have
- * already been initialized.
- * <!-- begin-user-doc -->
- * <!-- end-user-doc -->
- * @see #eNS_URI
- * @see #createPackageContents()
- * @see #initializePackageContents()
- * @generated
- */
- public static InstantiationPackage init() {
- if (isInited) return (InstantiationPackage)EPackage.Registry.INSTANCE.getEPackage(InstantiationPackage.eNS_URI);
-
- // Obtain or create and register package
- InstantiationPackageImpl theInstantiationPackage = (InstantiationPackageImpl)(EPackage.Registry.INSTANCE.getEPackage(eNS_URI) instanceof InstantiationPackageImpl ? EPackage.Registry.INSTANCE.getEPackage(eNS_URI) : new InstantiationPackageImpl());
-
- isInited = true;
-
- // Initialize simple dependencies
- EcorePackageImpl.init();
-
- // Create package meta-data objects
- theInstantiationPackage.createPackageContents();
-
- // Initialize created meta-data
- theInstantiationPackage.initializePackageContents();
-
- // Mark meta-data to indicate it can't be changed
- theInstantiationPackage.freeze();
-
- return theInstantiationPackage;
- }
-
- /**
- * <!-- begin-user-doc -->
- * <!-- end-user-doc -->
- * @generated
- */
- public EClass getIJavaObjectInstance() {
- return iJavaObjectInstanceEClass;
- }
-
- /**
- * <!-- begin-user-doc -->
- * <!-- end-user-doc -->
- * @generated
- */
- public EClass getJavaAllocation() {
- return javaAllocationEClass;
- }
-
- /**
- * <!-- begin-user-doc -->
- * <!-- end-user-doc -->
- * @generated
- */
- public EClass getInitStringAllocation() {
- return initStringAllocationEClass;
- }
-
- /**
- * <!-- begin-user-doc -->
- * <!-- end-user-doc -->
- * @generated
- */
- public EAttribute getInitStringAllocation_InitString() {
- return (EAttribute)initStringAllocationEClass.getEStructuralFeatures().get(0);
- }
-
- /**
- * <!-- begin-user-doc -->
- * <!-- end-user-doc -->
- * @generated
- */
- public EClass getImplicitAllocation() {
- return implicitAllocationEClass;
- }
-
- /**
- * <!-- begin-user-doc -->
- * <!-- end-user-doc -->
- * @generated
- */
- public EReference getImplicitAllocation_Parent() {
- return (EReference)implicitAllocationEClass.getEStructuralFeatures().get(0);
- }
-
- /**
- * <!-- begin-user-doc -->
- * <!-- end-user-doc -->
- * @generated
- */
- public EReference getImplicitAllocation_Feature() {
- return (EReference)implicitAllocationEClass.getEStructuralFeatures().get(1);
- }
-
- /**
- * <!-- begin-user-doc -->
- * <!-- end-user-doc -->
- * @generated
- */
- public EClass getParseTreeAllocation() {
- return parseTreeAllocationEClass;
- }
-
- /**
- * <!-- begin-user-doc -->
- * <!-- end-user-doc -->
- * @generated
- */
- public EReference getParseTreeAllocation_Expression() {
- return (EReference)parseTreeAllocationEClass.getEStructuralFeatures().get(0);
- }
-
- /**
- * <!-- begin-user-doc -->
- * <!-- end-user-doc -->
- * @generated
- */
- public EClass getPTExpression() {
- return ptExpressionEClass;
- }
-
- /**
- * <!-- begin-user-doc -->
- * <!-- end-user-doc -->
- * @generated
- */
- public EClass getPTArrayAccess() {
- return ptArrayAccessEClass;
- }
-
- /**
- * <!-- begin-user-doc -->
- * <!-- end-user-doc -->
- * @generated
- */
- public EReference getPTArrayAccess_Array() {
- return (EReference)ptArrayAccessEClass.getEStructuralFeatures().get(0);
- }
-
- /**
- * <!-- begin-user-doc -->
- * <!-- end-user-doc -->
- * @generated
- */
- public EReference getPTArrayAccess_Indexes() {
- return (EReference)ptArrayAccessEClass.getEStructuralFeatures().get(1);
- }
-
- /**
- * <!-- begin-user-doc -->
- * <!-- end-user-doc -->
- * @generated
- */
- public EClass getPTArrayCreation() {
- return ptArrayCreationEClass;
- }
-
- /**
- * <!-- begin-user-doc -->
- * <!-- end-user-doc -->
- * @generated
- */
- public EAttribute getPTArrayCreation_Type() {
- return (EAttribute)ptArrayCreationEClass.getEStructuralFeatures().get(0);
- }
-
- /**
- * <!-- begin-user-doc -->
- * <!-- end-user-doc -->
- * @generated
- */
- public EReference getPTArrayCreation_Dimensions() {
- return (EReference)ptArrayCreationEClass.getEStructuralFeatures().get(1);
- }
-
- /**
- * <!-- begin-user-doc -->
- * <!-- end-user-doc -->
- * @generated
- */
- public EReference getPTArrayCreation_Initializer() {
- return (EReference)ptArrayCreationEClass.getEStructuralFeatures().get(2);
- }
-
- /**
- * <!-- begin-user-doc -->
- * <!-- end-user-doc -->
- * @generated
- */
- public EClass getPTArrayInitializer() {
- return ptArrayInitializerEClass;
- }
-
- /**
- * <!-- begin-user-doc -->
- * <!-- end-user-doc -->
- * @generated
- */
- public EReference getPTArrayInitializer_Expressions() {
- return (EReference)ptArrayInitializerEClass.getEStructuralFeatures().get(0);
- }
-
- /**
- * <!-- begin-user-doc -->
- * <!-- end-user-doc -->
- * @generated
- */
- public EClass getPTBooleanLiteral() {
- return ptBooleanLiteralEClass;
- }
-
- /**
- * <!-- begin-user-doc -->
- * <!-- end-user-doc -->
- * @generated
- */
- public EAttribute getPTBooleanLiteral_BooleanValue() {
- return (EAttribute)ptBooleanLiteralEClass.getEStructuralFeatures().get(0);
- }
-
- /**
- * <!-- begin-user-doc -->
- * <!-- end-user-doc -->
- * @generated
- */
- public EClass getPTCastExpression() {
- return ptCastExpressionEClass;
- }
-
- /**
- * <!-- begin-user-doc -->
- * <!-- end-user-doc -->
- * @generated
- */
- public EAttribute getPTCastExpression_Type() {
- return (EAttribute)ptCastExpressionEClass.getEStructuralFeatures().get(0);
- }
-
- /**
- * <!-- begin-user-doc -->
- * <!-- end-user-doc -->
- * @generated
- */
- public EReference getPTCastExpression_Expression() {
- return (EReference)ptCastExpressionEClass.getEStructuralFeatures().get(1);
- }
-
- /**
- * <!-- begin-user-doc -->
- * <!-- end-user-doc -->
- * @generated
- */
- public EClass getPTCharacterLiteral() {
- return ptCharacterLiteralEClass;
- }
-
- /**
- * <!-- begin-user-doc -->
- * <!-- end-user-doc -->
- * @generated
- */
- public EAttribute getPTCharacterLiteral_EscapedValue() {
- return (EAttribute)ptCharacterLiteralEClass.getEStructuralFeatures().get(0);
- }
-
- /**
- * <!-- begin-user-doc -->
- * <!-- end-user-doc -->
- * @generated
- */
- public EAttribute getPTCharacterLiteral_CharValue() {
- return (EAttribute)ptCharacterLiteralEClass.getEStructuralFeatures().get(1);
- }
-
- /**
- * <!-- begin-user-doc -->
- * <!-- end-user-doc -->
- * @generated
- */
- public EClass getPTClassInstanceCreation() {
- return ptClassInstanceCreationEClass;
- }
-
- /**
- * <!-- begin-user-doc -->
- * <!-- end-user-doc -->
- * @generated
- */
- public EAttribute getPTClassInstanceCreation_Type() {
- return (EAttribute)ptClassInstanceCreationEClass.getEStructuralFeatures().get(0);
- }
-
- /**
- * <!-- begin-user-doc -->
- * <!-- end-user-doc -->
- * @generated
- */
- public EReference getPTClassInstanceCreation_Arguments() {
- return (EReference)ptClassInstanceCreationEClass.getEStructuralFeatures().get(1);
- }
-
- /**
- * <!-- begin-user-doc -->
- * <!-- end-user-doc -->
- * @generated
- */
- public EClass getPTConditionalExpression() {
- return ptConditionalExpressionEClass;
- }
-
- /**
- * <!-- begin-user-doc -->
- * <!-- end-user-doc -->
- * @generated
- */
- public EReference getPTConditionalExpression_Condition() {
- return (EReference)ptConditionalExpressionEClass.getEStructuralFeatures().get(0);
- }
-
- /**
- * <!-- begin-user-doc -->
- * <!-- end-user-doc -->
- * @generated
- */
- public EReference getPTConditionalExpression_True() {
- return (EReference)ptConditionalExpressionEClass.getEStructuralFeatures().get(1);
- }
-
- /**
- * <!-- begin-user-doc -->
- * <!-- end-user-doc -->
- * @generated
- */
- public EReference getPTConditionalExpression_False() {
- return (EReference)ptConditionalExpressionEClass.getEStructuralFeatures().get(2);
- }
-
- /**
- * <!-- begin-user-doc -->
- * <!-- end-user-doc -->
- * @generated
- */
- public EClass getPTFieldAccess() {
- return ptFieldAccessEClass;
- }
-
- /**
- * <!-- begin-user-doc -->
- * <!-- end-user-doc -->
- * @generated
- */
- public EReference getPTFieldAccess_Receiver() {
- return (EReference)ptFieldAccessEClass.getEStructuralFeatures().get(0);
- }
-
- /**
- * <!-- begin-user-doc -->
- * <!-- end-user-doc -->
- * @generated
- */
- public EAttribute getPTFieldAccess_Field() {
- return (EAttribute)ptFieldAccessEClass.getEStructuralFeatures().get(1);
- }
-
- /**
- * <!-- begin-user-doc -->
- * <!-- end-user-doc -->
- * @generated
- */
- public EClass getPTInfixExpression() {
- return ptInfixExpressionEClass;
- }
-
- /**
- * <!-- begin-user-doc -->
- * <!-- end-user-doc -->
- * @generated
- */
- public EReference getPTInfixExpression_LeftOperand() {
- return (EReference)ptInfixExpressionEClass.getEStructuralFeatures().get(0);
- }
-
- /**
- * <!-- begin-user-doc -->
- * <!-- end-user-doc -->
- * @generated
- */
- public EAttribute getPTInfixExpression_Operator() {
- return (EAttribute)ptInfixExpressionEClass.getEStructuralFeatures().get(1);
- }
-
- /**
- * <!-- begin-user-doc -->
- * <!-- end-user-doc -->
- * @generated
- */
- public EReference getPTInfixExpression_RightOperand() {
- return (EReference)ptInfixExpressionEClass.getEStructuralFeatures().get(2);
- }
-
- /**
- * <!-- begin-user-doc -->
- * <!-- end-user-doc -->
- * @generated
- */
- public EReference getPTInfixExpression_ExtendedOperands() {
- return (EReference)ptInfixExpressionEClass.getEStructuralFeatures().get(3);
- }
-
- /**
- * <!-- begin-user-doc -->
- * <!-- end-user-doc -->
- * @generated
- */
- public EClass getPTInstanceof() {
- return ptInstanceofEClass;
- }
-
- /**
- * <!-- begin-user-doc -->
- * <!-- end-user-doc -->
- * @generated
- */
- public EReference getPTInstanceof_Operand() {
- return (EReference)ptInstanceofEClass.getEStructuralFeatures().get(0);
- }
-
- /**
- * <!-- begin-user-doc -->
- * <!-- end-user-doc -->
- * @generated
- */
- public EAttribute getPTInstanceof_Type() {
- return (EAttribute)ptInstanceofEClass.getEStructuralFeatures().get(1);
- }
-
- /**
- * <!-- begin-user-doc -->
- * <!-- end-user-doc -->
- * @generated
- */
- public EClass getPTMethodInvocation() {
- return ptMethodInvocationEClass;
- }
-
- /**
- * <!-- begin-user-doc -->
- * <!-- end-user-doc -->
- * @generated
- */
- public EReference getPTMethodInvocation_Receiver() {
- return (EReference)ptMethodInvocationEClass.getEStructuralFeatures().get(0);
- }
-
- /**
- * <!-- begin-user-doc -->
- * <!-- end-user-doc -->
- * @generated
- */
- public EAttribute getPTMethodInvocation_Name() {
- return (EAttribute)ptMethodInvocationEClass.getEStructuralFeatures().get(1);
- }
-
- /**
- * <!-- begin-user-doc -->
- * <!-- end-user-doc -->
- * @generated
- */
- public EReference getPTMethodInvocation_Arguments() {
- return (EReference)ptMethodInvocationEClass.getEStructuralFeatures().get(2);
- }
-
- /**
- * <!-- begin-user-doc -->
- * <!-- end-user-doc -->
- * @generated
- */
- public EClass getPTName() {
- return ptNameEClass;
- }
-
- /**
- * <!-- begin-user-doc -->
- * <!-- end-user-doc -->
- * @generated
- */
- public EAttribute getPTName_Name() {
- return (EAttribute)ptNameEClass.getEStructuralFeatures().get(0);
- }
-
- /**
- * <!-- begin-user-doc -->
- * <!-- end-user-doc -->
- * @generated
- */
- public EClass getPTNullLiteral() {
- return ptNullLiteralEClass;
- }
-
- /**
- * <!-- begin-user-doc -->
- * <!-- end-user-doc -->
- * @generated
- */
- public EClass getPTNumberLiteral() {
- return ptNumberLiteralEClass;
- }
-
- /**
- * <!-- begin-user-doc -->
- * <!-- end-user-doc -->
- * @generated
- */
- public EAttribute getPTNumberLiteral_Token() {
- return (EAttribute)ptNumberLiteralEClass.getEStructuralFeatures().get(0);
- }
-
- /**
- * <!-- begin-user-doc -->
- * <!-- end-user-doc -->
- * @generated
- */
- public EClass getPTParenthesizedExpression() {
- return ptParenthesizedExpressionEClass;
- }
-
- /**
- * <!-- begin-user-doc -->
- * <!-- end-user-doc -->
- * @generated
- */
- public EReference getPTParenthesizedExpression_Expression() {
- return (EReference)ptParenthesizedExpressionEClass.getEStructuralFeatures().get(0);
- }
-
- /**
- * <!-- begin-user-doc -->
- * <!-- end-user-doc -->
- * @generated
- */
- public EClass getPTPrefixExpression() {
- return ptPrefixExpressionEClass;
- }
-
- /**
- * <!-- begin-user-doc -->
- * <!-- end-user-doc -->
- * @generated
- */
- public EAttribute getPTPrefixExpression_Operator() {
- return (EAttribute)ptPrefixExpressionEClass.getEStructuralFeatures().get(0);
- }
-
- /**
- * <!-- begin-user-doc -->
- * <!-- end-user-doc -->
- * @generated
- */
- public EReference getPTPrefixExpression_Expression() {
- return (EReference)ptPrefixExpressionEClass.getEStructuralFeatures().get(1);
- }
-
- /**
- * <!-- begin-user-doc -->
- * <!-- end-user-doc -->
- * @generated
- */
- public EClass getPTStringLiteral() {
- return ptStringLiteralEClass;
- }
-
- /**
- * <!-- begin-user-doc -->
- * <!-- end-user-doc -->
- * @generated
- */
- public EAttribute getPTStringLiteral_EscapedValue() {
- return (EAttribute)ptStringLiteralEClass.getEStructuralFeatures().get(0);
- }
-
- /**
- * <!-- begin-user-doc -->
- * <!-- end-user-doc -->
- * @generated
- */
- public EAttribute getPTStringLiteral_LiteralValue() {
- return (EAttribute)ptStringLiteralEClass.getEStructuralFeatures().get(1);
- }
-
- /**
- * <!-- begin-user-doc -->
- * <!-- end-user-doc -->
- * @generated
- */
- public EClass getPTThisLiteral() {
- return ptThisLiteralEClass;
- }
-
- /**
- * <!-- begin-user-doc -->
- * <!-- end-user-doc -->
- * @generated
- */
- public EClass getPTTypeLiteral() {
- return ptTypeLiteralEClass;
- }
-
- /**
- * <!-- begin-user-doc -->
- * <!-- end-user-doc -->
- * @generated
- */
- public EAttribute getPTTypeLiteral_Type() {
- return (EAttribute)ptTypeLiteralEClass.getEStructuralFeatures().get(0);
- }
-
- /**
- * <!-- begin-user-doc -->
- * <!-- end-user-doc -->
- * @generated
- */
- public EClass getPTInvalidExpression() {
- return ptInvalidExpressionEClass;
- }
-
- /**
- * <!-- begin-user-doc -->
- * <!-- end-user-doc -->
- * @generated
- */
- public EAttribute getPTInvalidExpression_Message() {
- return (EAttribute)ptInvalidExpressionEClass.getEStructuralFeatures().get(0);
- }
-
- /**
- * <!-- begin-user-doc -->
- * <!-- end-user-doc -->
- * @generated
- */
- public EClass getPTInstanceReference() {
- return ptInstanceReferenceEClass;
- }
-
- /**
- * <!-- begin-user-doc -->
- * <!-- end-user-doc -->
- * @generated
- */
- public EReference getPTInstanceReference_Reference() {
- return (EReference)ptInstanceReferenceEClass.getEStructuralFeatures().get(0);
- }
-
- /**
- * <!-- begin-user-doc -->
- * <!-- end-user-doc -->
- * @generated
- */
- public EClass getPTAnonymousClassDeclaration() {
- return ptAnonymousClassDeclarationEClass;
- }
-
- /**
- * <!-- begin-user-doc -->
- * <!-- end-user-doc -->
- * @generated
- */
- public EAttribute getPTAnonymousClassDeclaration_Declaration() {
- return (EAttribute)ptAnonymousClassDeclarationEClass.getEStructuralFeatures().get(0);
- }
-
- /**
- * <!-- begin-user-doc -->
- * <!-- end-user-doc -->
- * @generated
- */
- public EAttribute getPTAnonymousClassDeclaration_Imports() {
- return (EAttribute)ptAnonymousClassDeclarationEClass.getEStructuralFeatures().get(1);
- }
-
- /**
- * <!-- begin-user-doc -->
- * <!-- end-user-doc -->
- * @generated
- */
- public EEnum getPTInfixOperator() {
- return ptInfixOperatorEEnum;
- }
-
- /**
- * <!-- begin-user-doc -->
- * <!-- end-user-doc -->
- * @generated
- */
- public EEnum getPTPrefixOperator() {
- return ptPrefixOperatorEEnum;
- }
-
- /**
- * <!-- begin-user-doc -->
- * <!-- end-user-doc -->
- * @generated
- */
- public EClass getIJavaDataTypeInstance() {
- return iJavaDataTypeInstanceEClass;
- }
-
- /**
- * <!-- begin-user-doc -->
- * <!-- end-user-doc -->
- * @generated
- */
- public EClass getIJavaInstance() {
- return iJavaInstanceEClass;
- }
-
- /**
- * <!-- begin-user-doc -->
- * <!-- end-user-doc -->
- * @generated
- */
- public InstantiationFactory getInstantiationFactory() {
- return (InstantiationFactory)getEFactoryInstance();
- }
-
- /**
- * <!-- begin-user-doc -->
- * <!-- end-user-doc -->
- * @generated
- */
- private boolean isCreated = false;
-
- /**
- * Creates the meta-model objects for the package. This method is
- * guarded to have no affect on any invocation but its first.
- * <!-- begin-user-doc -->
- * <!-- end-user-doc -->
- * @generated
- */
- public void createPackageContents() {
- if (isCreated) return;
- isCreated = true;
-
- // Create classes and their features
- iJavaDataTypeInstanceEClass = createEClass(IJAVA_DATA_TYPE_INSTANCE);
-
- iJavaInstanceEClass = createEClass(IJAVA_INSTANCE);
-
- iJavaObjectInstanceEClass = createEClass(IJAVA_OBJECT_INSTANCE);
-
- javaAllocationEClass = createEClass(JAVA_ALLOCATION);
-
- initStringAllocationEClass = createEClass(INIT_STRING_ALLOCATION);
- createEAttribute(initStringAllocationEClass, INIT_STRING_ALLOCATION__INIT_STRING);
-
- implicitAllocationEClass = createEClass(IMPLICIT_ALLOCATION);
- createEReference(implicitAllocationEClass, IMPLICIT_ALLOCATION__PARENT);
- createEReference(implicitAllocationEClass, IMPLICIT_ALLOCATION__FEATURE);
-
- parseTreeAllocationEClass = createEClass(PARSE_TREE_ALLOCATION);
- createEReference(parseTreeAllocationEClass, PARSE_TREE_ALLOCATION__EXPRESSION);
-
- ptExpressionEClass = createEClass(PT_EXPRESSION);
-
- ptArrayAccessEClass = createEClass(PT_ARRAY_ACCESS);
- createEReference(ptArrayAccessEClass, PT_ARRAY_ACCESS__ARRAY);
- createEReference(ptArrayAccessEClass, PT_ARRAY_ACCESS__INDEXES);
-
- ptArrayCreationEClass = createEClass(PT_ARRAY_CREATION);
- createEAttribute(ptArrayCreationEClass, PT_ARRAY_CREATION__TYPE);
- createEReference(ptArrayCreationEClass, PT_ARRAY_CREATION__DIMENSIONS);
- createEReference(ptArrayCreationEClass, PT_ARRAY_CREATION__INITIALIZER);
-
- ptArrayInitializerEClass = createEClass(PT_ARRAY_INITIALIZER);
- createEReference(ptArrayInitializerEClass, PT_ARRAY_INITIALIZER__EXPRESSIONS);
-
- ptBooleanLiteralEClass = createEClass(PT_BOOLEAN_LITERAL);
- createEAttribute(ptBooleanLiteralEClass, PT_BOOLEAN_LITERAL__BOOLEAN_VALUE);
-
- ptCastExpressionEClass = createEClass(PT_CAST_EXPRESSION);
- createEAttribute(ptCastExpressionEClass, PT_CAST_EXPRESSION__TYPE);
- createEReference(ptCastExpressionEClass, PT_CAST_EXPRESSION__EXPRESSION);
-
- ptCharacterLiteralEClass = createEClass(PT_CHARACTER_LITERAL);
- createEAttribute(ptCharacterLiteralEClass, PT_CHARACTER_LITERAL__ESCAPED_VALUE);
- createEAttribute(ptCharacterLiteralEClass, PT_CHARACTER_LITERAL__CHAR_VALUE);
-
- ptClassInstanceCreationEClass = createEClass(PT_CLASS_INSTANCE_CREATION);
- createEAttribute(ptClassInstanceCreationEClass, PT_CLASS_INSTANCE_CREATION__TYPE);
- createEReference(ptClassInstanceCreationEClass, PT_CLASS_INSTANCE_CREATION__ARGUMENTS);
-
- ptConditionalExpressionEClass = createEClass(PT_CONDITIONAL_EXPRESSION);
- createEReference(ptConditionalExpressionEClass, PT_CONDITIONAL_EXPRESSION__CONDITION);
- createEReference(ptConditionalExpressionEClass, PT_CONDITIONAL_EXPRESSION__TRUE);
- createEReference(ptConditionalExpressionEClass, PT_CONDITIONAL_EXPRESSION__FALSE);
-
- ptFieldAccessEClass = createEClass(PT_FIELD_ACCESS);
- createEReference(ptFieldAccessEClass, PT_FIELD_ACCESS__RECEIVER);
- createEAttribute(ptFieldAccessEClass, PT_FIELD_ACCESS__FIELD);
-
- ptInfixExpressionEClass = createEClass(PT_INFIX_EXPRESSION);
- createEReference(ptInfixExpressionEClass, PT_INFIX_EXPRESSION__LEFT_OPERAND);
- createEAttribute(ptInfixExpressionEClass, PT_INFIX_EXPRESSION__OPERATOR);
- createEReference(ptInfixExpressionEClass, PT_INFIX_EXPRESSION__RIGHT_OPERAND);
- createEReference(ptInfixExpressionEClass, PT_INFIX_EXPRESSION__EXTENDED_OPERANDS);
-
- ptInstanceofEClass = createEClass(PT_INSTANCEOF);
- createEReference(ptInstanceofEClass, PT_INSTANCEOF__OPERAND);
- createEAttribute(ptInstanceofEClass, PT_INSTANCEOF__TYPE);
-
- ptMethodInvocationEClass = createEClass(PT_METHOD_INVOCATION);
- createEReference(ptMethodInvocationEClass, PT_METHOD_INVOCATION__RECEIVER);
- createEAttribute(ptMethodInvocationEClass, PT_METHOD_INVOCATION__NAME);
- createEReference(ptMethodInvocationEClass, PT_METHOD_INVOCATION__ARGUMENTS);
-
- ptNameEClass = createEClass(PT_NAME);
- createEAttribute(ptNameEClass, PT_NAME__NAME);
-
- ptNullLiteralEClass = createEClass(PT_NULL_LITERAL);
-
- ptNumberLiteralEClass = createEClass(PT_NUMBER_LITERAL);
- createEAttribute(ptNumberLiteralEClass, PT_NUMBER_LITERAL__TOKEN);
-
- ptParenthesizedExpressionEClass = createEClass(PT_PARENTHESIZED_EXPRESSION);
- createEReference(ptParenthesizedExpressionEClass, PT_PARENTHESIZED_EXPRESSION__EXPRESSION);
-
- ptPrefixExpressionEClass = createEClass(PT_PREFIX_EXPRESSION);
- createEAttribute(ptPrefixExpressionEClass, PT_PREFIX_EXPRESSION__OPERATOR);
- createEReference(ptPrefixExpressionEClass, PT_PREFIX_EXPRESSION__EXPRESSION);
-
- ptStringLiteralEClass = createEClass(PT_STRING_LITERAL);
- createEAttribute(ptStringLiteralEClass, PT_STRING_LITERAL__ESCAPED_VALUE);
- createEAttribute(ptStringLiteralEClass, PT_STRING_LITERAL__LITERAL_VALUE);
-
- ptThisLiteralEClass = createEClass(PT_THIS_LITERAL);
-
- ptTypeLiteralEClass = createEClass(PT_TYPE_LITERAL);
- createEAttribute(ptTypeLiteralEClass, PT_TYPE_LITERAL__TYPE);
-
- ptInvalidExpressionEClass = createEClass(PT_INVALID_EXPRESSION);
- createEAttribute(ptInvalidExpressionEClass, PT_INVALID_EXPRESSION__MESSAGE);
-
- ptInstanceReferenceEClass = createEClass(PT_INSTANCE_REFERENCE);
- createEReference(ptInstanceReferenceEClass, PT_INSTANCE_REFERENCE__REFERENCE);
-
- ptAnonymousClassDeclarationEClass = createEClass(PT_ANONYMOUS_CLASS_DECLARATION);
- createEAttribute(ptAnonymousClassDeclarationEClass, PT_ANONYMOUS_CLASS_DECLARATION__DECLARATION);
- createEAttribute(ptAnonymousClassDeclarationEClass, PT_ANONYMOUS_CLASS_DECLARATION__IMPORTS);
-
- // Create enums
- ptInfixOperatorEEnum = createEEnum(PT_INFIX_OPERATOR);
- ptPrefixOperatorEEnum = createEEnum(PT_PREFIX_OPERATOR);
- }
-
- /**
- * <!-- begin-user-doc -->
- * <!-- end-user-doc -->
- * @generated
- */
- private boolean isInitialized = false;
-
- /**
- * Complete the initialization of the package and its meta-model. This
- * method is guarded to have no affect on any invocation but its first.
- * <!-- begin-user-doc -->
- * <!-- end-user-doc -->
- * @generated
- */
- public void initializePackageContents() {
- if (isInitialized) return;
- isInitialized = true;
-
- // Initialize package
- setName(eNAME);
- setNsPrefix(eNS_PREFIX);
- setNsURI(eNS_URI);
-
- // Obtain other dependent packages
- EcorePackageImpl theEcorePackage = (EcorePackageImpl)EPackage.Registry.INSTANCE.getEPackage(EcorePackage.eNS_URI);
-
- // Add supertypes to classes
- iJavaDataTypeInstanceEClass.getESuperTypes().add(this.getIJavaInstance());
- iJavaObjectInstanceEClass.getESuperTypes().add(this.getIJavaInstance());
- initStringAllocationEClass.getESuperTypes().add(this.getJavaAllocation());
- implicitAllocationEClass.getESuperTypes().add(this.getJavaAllocation());
- parseTreeAllocationEClass.getESuperTypes().add(this.getJavaAllocation());
- ptArrayAccessEClass.getESuperTypes().add(this.getPTExpression());
- ptArrayCreationEClass.getESuperTypes().add(this.getPTExpression());
- ptArrayInitializerEClass.getESuperTypes().add(this.getPTExpression());
- ptBooleanLiteralEClass.getESuperTypes().add(this.getPTExpression());
- ptCastExpressionEClass.getESuperTypes().add(this.getPTExpression());
- ptCharacterLiteralEClass.getESuperTypes().add(this.getPTExpression());
- ptClassInstanceCreationEClass.getESuperTypes().add(this.getPTExpression());
- ptConditionalExpressionEClass.getESuperTypes().add(this.getPTExpression());
- ptFieldAccessEClass.getESuperTypes().add(this.getPTExpression());
- ptInfixExpressionEClass.getESuperTypes().add(this.getPTExpression());
- ptInstanceofEClass.getESuperTypes().add(this.getPTExpression());
- ptMethodInvocationEClass.getESuperTypes().add(this.getPTExpression());
- ptNameEClass.getESuperTypes().add(this.getPTExpression());
- ptNullLiteralEClass.getESuperTypes().add(this.getPTExpression());
- ptNumberLiteralEClass.getESuperTypes().add(this.getPTExpression());
- ptParenthesizedExpressionEClass.getESuperTypes().add(this.getPTExpression());
- ptPrefixExpressionEClass.getESuperTypes().add(this.getPTExpression());
- ptStringLiteralEClass.getESuperTypes().add(this.getPTExpression());
- ptThisLiteralEClass.getESuperTypes().add(this.getPTExpression());
- ptTypeLiteralEClass.getESuperTypes().add(this.getPTExpression());
- ptInvalidExpressionEClass.getESuperTypes().add(this.getPTExpression());
- ptInstanceReferenceEClass.getESuperTypes().add(this.getPTExpression());
- ptAnonymousClassDeclarationEClass.getESuperTypes().add(this.getPTExpression());
-
- // Initialize classes and features; add operations and parameters
- initEClass(iJavaDataTypeInstanceEClass, IJavaDataTypeInstance.class, "IJavaDataTypeInstance", IS_ABSTRACT, IS_INTERFACE, !IS_GENERATED_INSTANCE_CLASS);
-
- initEClass(iJavaInstanceEClass, IJavaInstance.class, "IJavaInstance", IS_ABSTRACT, IS_INTERFACE, !IS_GENERATED_INSTANCE_CLASS);
-
- initEClass(iJavaObjectInstanceEClass, IJavaObjectInstance.class, "IJavaObjectInstance", IS_ABSTRACT, IS_INTERFACE, !IS_GENERATED_INSTANCE_CLASS);
-
- initEClass(javaAllocationEClass, JavaAllocation.class, "JavaAllocation", IS_ABSTRACT, !IS_INTERFACE, IS_GENERATED_INSTANCE_CLASS);
-
- initEClass(initStringAllocationEClass, InitStringAllocation.class, "InitStringAllocation", !IS_ABSTRACT, !IS_INTERFACE, IS_GENERATED_INSTANCE_CLASS);
- initEAttribute(getInitStringAllocation_InitString(), ecorePackage.getEString(), "initString", null, 0, 1, InitStringAllocation.class, !IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE, !IS_UNSETTABLE, !IS_ID, IS_UNIQUE, !IS_DERIVED, IS_ORDERED);
-
- initEClass(implicitAllocationEClass, ImplicitAllocation.class, "ImplicitAllocation", !IS_ABSTRACT, !IS_INTERFACE, IS_GENERATED_INSTANCE_CLASS);
- initEReference(getImplicitAllocation_Parent(), theEcorePackage.getEObject(), null, "parent", null, 1, 1, ImplicitAllocation.class, !IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE, !IS_COMPOSITE, IS_RESOLVE_PROXIES, !IS_UNSETTABLE, IS_UNIQUE, !IS_DERIVED, IS_ORDERED);
- initEReference(getImplicitAllocation_Feature(), theEcorePackage.getEStructuralFeature(), null, "feature", null, 1, 1, ImplicitAllocation.class, !IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE, !IS_COMPOSITE, IS_RESOLVE_PROXIES, !IS_UNSETTABLE, IS_UNIQUE, !IS_DERIVED, IS_ORDERED);
-
- initEClass(parseTreeAllocationEClass, ParseTreeAllocation.class, "ParseTreeAllocation", !IS_ABSTRACT, !IS_INTERFACE, IS_GENERATED_INSTANCE_CLASS);
- initEReference(getParseTreeAllocation_Expression(), this.getPTExpression(), null, "expression", null, 1, 1, ParseTreeAllocation.class, !IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE, IS_COMPOSITE, !IS_RESOLVE_PROXIES, !IS_UNSETTABLE, IS_UNIQUE, !IS_DERIVED, IS_ORDERED);
-
- initEClass(ptExpressionEClass, PTExpression.class, "PTExpression", IS_ABSTRACT, !IS_INTERFACE, IS_GENERATED_INSTANCE_CLASS);
-
- initEClass(ptArrayAccessEClass, PTArrayAccess.class, "PTArrayAccess", !IS_ABSTRACT, !IS_INTERFACE, IS_GENERATED_INSTANCE_CLASS);
- initEReference(getPTArrayAccess_Array(), this.getPTExpression(), null, "array", null, 0, 1, PTArrayAccess.class, !IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE, IS_COMPOSITE, !IS_RESOLVE_PROXIES, !IS_UNSETTABLE, IS_UNIQUE, !IS_DERIVED, IS_ORDERED);
- initEReference(getPTArrayAccess_Indexes(), this.getPTExpression(), null, "indexes", null, 1, -1, PTArrayAccess.class, !IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE, IS_COMPOSITE, !IS_RESOLVE_PROXIES, !IS_UNSETTABLE, IS_UNIQUE, !IS_DERIVED, IS_ORDERED);
-
- initEClass(ptArrayCreationEClass, PTArrayCreation.class, "PTArrayCreation", !IS_ABSTRACT, !IS_INTERFACE, IS_GENERATED_INSTANCE_CLASS);
- initEAttribute(getPTArrayCreation_Type(), ecorePackage.getEString(), "type", null, 0, 1, PTArrayCreation.class, !IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE, !IS_UNSETTABLE, !IS_ID, IS_UNIQUE, !IS_DERIVED, IS_ORDERED);
- initEReference(getPTArrayCreation_Dimensions(), this.getPTExpression(), null, "dimensions", null, 0, -1, PTArrayCreation.class, !IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE, IS_COMPOSITE, !IS_RESOLVE_PROXIES, !IS_UNSETTABLE, IS_UNIQUE, !IS_DERIVED, IS_ORDERED);
- initEReference(getPTArrayCreation_Initializer(), this.getPTArrayInitializer(), null, "initializer", null, 0, 1, PTArrayCreation.class, !IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE, IS_COMPOSITE, !IS_RESOLVE_PROXIES, !IS_UNSETTABLE, IS_UNIQUE, !IS_DERIVED, IS_ORDERED);
-
- initEClass(ptArrayInitializerEClass, PTArrayInitializer.class, "PTArrayInitializer", !IS_ABSTRACT, !IS_INTERFACE, IS_GENERATED_INSTANCE_CLASS);
- initEReference(getPTArrayInitializer_Expressions(), this.getPTExpression(), null, "expressions", null, 0, -1, PTArrayInitializer.class, !IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE, IS_COMPOSITE, !IS_RESOLVE_PROXIES, !IS_UNSETTABLE, IS_UNIQUE, !IS_DERIVED, IS_ORDERED);
-
- initEClass(ptBooleanLiteralEClass, PTBooleanLiteral.class, "PTBooleanLiteral", !IS_ABSTRACT, !IS_INTERFACE, IS_GENERATED_INSTANCE_CLASS);
- initEAttribute(getPTBooleanLiteral_BooleanValue(), ecorePackage.getEBoolean(), "booleanValue", null, 0, 1, PTBooleanLiteral.class, !IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE, !IS_UNSETTABLE, !IS_ID, IS_UNIQUE, !IS_DERIVED, IS_ORDERED);
-
- initEClass(ptCastExpressionEClass, PTCastExpression.class, "PTCastExpression", !IS_ABSTRACT, !IS_INTERFACE, IS_GENERATED_INSTANCE_CLASS);
- initEAttribute(getPTCastExpression_Type(), ecorePackage.getEString(), "type", null, 0, 1, PTCastExpression.class, !IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE, !IS_UNSETTABLE, !IS_ID, IS_UNIQUE, !IS_DERIVED, IS_ORDERED);
- initEReference(getPTCastExpression_Expression(), this.getPTExpression(), null, "expression", null, 0, 1, PTCastExpression.class, !IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE, IS_COMPOSITE, !IS_RESOLVE_PROXIES, !IS_UNSETTABLE, IS_UNIQUE, !IS_DERIVED, IS_ORDERED);
-
- initEClass(ptCharacterLiteralEClass, PTCharacterLiteral.class, "PTCharacterLiteral", !IS_ABSTRACT, !IS_INTERFACE, IS_GENERATED_INSTANCE_CLASS);
- initEAttribute(getPTCharacterLiteral_EscapedValue(), ecorePackage.getEString(), "escapedValue", null, 0, 1, PTCharacterLiteral.class, !IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE, !IS_UNSETTABLE, !IS_ID, IS_UNIQUE, !IS_DERIVED, IS_ORDERED);
- initEAttribute(getPTCharacterLiteral_CharValue(), ecorePackage.getEChar(), "charValue", null, 0, 1, PTCharacterLiteral.class, IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE, !IS_UNSETTABLE, !IS_ID, IS_UNIQUE, !IS_DERIVED, IS_ORDERED);
-
- initEClass(ptClassInstanceCreationEClass, PTClassInstanceCreation.class, "PTClassInstanceCreation", !IS_ABSTRACT, !IS_INTERFACE, IS_GENERATED_INSTANCE_CLASS);
- initEAttribute(getPTClassInstanceCreation_Type(), ecorePackage.getEString(), "type", null, 0, 1, PTClassInstanceCreation.class, !IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE, !IS_UNSETTABLE, !IS_ID, IS_UNIQUE, !IS_DERIVED, IS_ORDERED);
- initEReference(getPTClassInstanceCreation_Arguments(), this.getPTExpression(), null, "arguments", null, 0, -1, PTClassInstanceCreation.class, !IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE, IS_COMPOSITE, !IS_RESOLVE_PROXIES, !IS_UNSETTABLE, IS_UNIQUE, !IS_DERIVED, IS_ORDERED);
-
- initEClass(ptConditionalExpressionEClass, PTConditionalExpression.class, "PTConditionalExpression", !IS_ABSTRACT, !IS_INTERFACE, IS_GENERATED_INSTANCE_CLASS);
- initEReference(getPTConditionalExpression_Condition(), this.getPTExpression(), null, "condition", null, 0, 1, PTConditionalExpression.class, !IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE, IS_COMPOSITE, !IS_RESOLVE_PROXIES, !IS_UNSETTABLE, IS_UNIQUE, !IS_DERIVED, IS_ORDERED);
- initEReference(getPTConditionalExpression_True(), this.getPTExpression(), null, "true", null, 0, 1, PTConditionalExpression.class, !IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE, IS_COMPOSITE, !IS_RESOLVE_PROXIES, !IS_UNSETTABLE, IS_UNIQUE, !IS_DERIVED, IS_ORDERED);
- initEReference(getPTConditionalExpression_False(), this.getPTExpression(), null, "false", null, 0, 1, PTConditionalExpression.class, !IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE, IS_COMPOSITE, !IS_RESOLVE_PROXIES, !IS_UNSETTABLE, IS_UNIQUE, !IS_DERIVED, IS_ORDERED);
-
- initEClass(ptFieldAccessEClass, PTFieldAccess.class, "PTFieldAccess", !IS_ABSTRACT, !IS_INTERFACE, IS_GENERATED_INSTANCE_CLASS);
- initEReference(getPTFieldAccess_Receiver(), this.getPTExpression(), null, "receiver", null, 0, 1, PTFieldAccess.class, !IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE, IS_COMPOSITE, !IS_RESOLVE_PROXIES, !IS_UNSETTABLE, IS_UNIQUE, !IS_DERIVED, IS_ORDERED);
- initEAttribute(getPTFieldAccess_Field(), ecorePackage.getEString(), "field", null, 0, 1, PTFieldAccess.class, !IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE, !IS_UNSETTABLE, !IS_ID, IS_UNIQUE, !IS_DERIVED, IS_ORDERED);
-
- initEClass(ptInfixExpressionEClass, PTInfixExpression.class, "PTInfixExpression", !IS_ABSTRACT, !IS_INTERFACE, IS_GENERATED_INSTANCE_CLASS);
- initEReference(getPTInfixExpression_LeftOperand(), this.getPTExpression(), null, "leftOperand", null, 0, 1, PTInfixExpression.class, !IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE, IS_COMPOSITE, !IS_RESOLVE_PROXIES, !IS_UNSETTABLE, IS_UNIQUE, !IS_DERIVED, IS_ORDERED);
- initEAttribute(getPTInfixExpression_Operator(), this.getPTInfixOperator(), "operator", null, 0, 1, PTInfixExpression.class, !IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE, !IS_UNSETTABLE, !IS_ID, IS_UNIQUE, !IS_DERIVED, IS_ORDERED);
- initEReference(getPTInfixExpression_RightOperand(), this.getPTExpression(), null, "rightOperand", null, 0, 1, PTInfixExpression.class, !IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE, IS_COMPOSITE, !IS_RESOLVE_PROXIES, !IS_UNSETTABLE, IS_UNIQUE, !IS_DERIVED, IS_ORDERED);
- initEReference(getPTInfixExpression_ExtendedOperands(), this.getPTExpression(), null, "extendedOperands", null, 0, -1, PTInfixExpression.class, !IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE, IS_COMPOSITE, !IS_RESOLVE_PROXIES, !IS_UNSETTABLE, IS_UNIQUE, !IS_DERIVED, IS_ORDERED);
-
- initEClass(ptInstanceofEClass, PTInstanceof.class, "PTInstanceof", !IS_ABSTRACT, !IS_INTERFACE, IS_GENERATED_INSTANCE_CLASS);
- initEReference(getPTInstanceof_Operand(), this.getPTExpression(), null, "operand", null, 0, 1, PTInstanceof.class, !IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE, IS_COMPOSITE, !IS_RESOLVE_PROXIES, !IS_UNSETTABLE, IS_UNIQUE, !IS_DERIVED, IS_ORDERED);
- initEAttribute(getPTInstanceof_Type(), ecorePackage.getEString(), "type", null, 0, 1, PTInstanceof.class, !IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE, !IS_UNSETTABLE, !IS_ID, IS_UNIQUE, !IS_DERIVED, IS_ORDERED);
-
- initEClass(ptMethodInvocationEClass, PTMethodInvocation.class, "PTMethodInvocation", !IS_ABSTRACT, !IS_INTERFACE, IS_GENERATED_INSTANCE_CLASS);
- initEReference(getPTMethodInvocation_Receiver(), this.getPTExpression(), null, "receiver", null, 0, 1, PTMethodInvocation.class, !IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE, IS_COMPOSITE, !IS_RESOLVE_PROXIES, !IS_UNSETTABLE, IS_UNIQUE, !IS_DERIVED, IS_ORDERED);
- initEAttribute(getPTMethodInvocation_Name(), ecorePackage.getEString(), "name", null, 0, 1, PTMethodInvocation.class, !IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE, !IS_UNSETTABLE, !IS_ID, IS_UNIQUE, !IS_DERIVED, IS_ORDERED);
- initEReference(getPTMethodInvocation_Arguments(), this.getPTExpression(), null, "arguments", null, 0, -1, PTMethodInvocation.class, !IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE, IS_COMPOSITE, !IS_RESOLVE_PROXIES, !IS_UNSETTABLE, IS_UNIQUE, !IS_DERIVED, IS_ORDERED);
-
- initEClass(ptNameEClass, PTName.class, "PTName", !IS_ABSTRACT, !IS_INTERFACE, IS_GENERATED_INSTANCE_CLASS);
- initEAttribute(getPTName_Name(), ecorePackage.getEString(), "name", null, 0, 1, PTName.class, !IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE, !IS_UNSETTABLE, !IS_ID, IS_UNIQUE, !IS_DERIVED, IS_ORDERED);
-
- initEClass(ptNullLiteralEClass, PTNullLiteral.class, "PTNullLiteral", !IS_ABSTRACT, !IS_INTERFACE, IS_GENERATED_INSTANCE_CLASS);
-
- initEClass(ptNumberLiteralEClass, PTNumberLiteral.class, "PTNumberLiteral", !IS_ABSTRACT, !IS_INTERFACE, IS_GENERATED_INSTANCE_CLASS);
- initEAttribute(getPTNumberLiteral_Token(), ecorePackage.getEString(), "token", null, 0, 1, PTNumberLiteral.class, !IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE, !IS_UNSETTABLE, !IS_ID, IS_UNIQUE, !IS_DERIVED, IS_ORDERED);
-
- initEClass(ptParenthesizedExpressionEClass, PTParenthesizedExpression.class, "PTParenthesizedExpression", !IS_ABSTRACT, !IS_INTERFACE, IS_GENERATED_INSTANCE_CLASS);
- initEReference(getPTParenthesizedExpression_Expression(), this.getPTExpression(), null, "expression", null, 0, 1, PTParenthesizedExpression.class, !IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE, IS_COMPOSITE, !IS_RESOLVE_PROXIES, !IS_UNSETTABLE, IS_UNIQUE, !IS_DERIVED, IS_ORDERED);
-
- initEClass(ptPrefixExpressionEClass, PTPrefixExpression.class, "PTPrefixExpression", !IS_ABSTRACT, !IS_INTERFACE, IS_GENERATED_INSTANCE_CLASS);
- initEAttribute(getPTPrefixExpression_Operator(), this.getPTPrefixOperator(), "operator", null, 0, 1, PTPrefixExpression.class, !IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE, !IS_UNSETTABLE, !IS_ID, IS_UNIQUE, !IS_DERIVED, IS_ORDERED);
- initEReference(getPTPrefixExpression_Expression(), this.getPTExpression(), null, "expression", null, 0, 1, PTPrefixExpression.class, !IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE, IS_COMPOSITE, !IS_RESOLVE_PROXIES, !IS_UNSETTABLE, IS_UNIQUE, !IS_DERIVED, IS_ORDERED);
-
- initEClass(ptStringLiteralEClass, PTStringLiteral.class, "PTStringLiteral", !IS_ABSTRACT, !IS_INTERFACE, IS_GENERATED_INSTANCE_CLASS);
- initEAttribute(getPTStringLiteral_EscapedValue(), ecorePackage.getEString(), "escapedValue", null, 0, 1, PTStringLiteral.class, !IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE, !IS_UNSETTABLE, !IS_ID, IS_UNIQUE, !IS_DERIVED, IS_ORDERED);
- initEAttribute(getPTStringLiteral_LiteralValue(), ecorePackage.getEString(), "literalValue", null, 0, 1, PTStringLiteral.class, IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE, !IS_UNSETTABLE, !IS_ID, IS_UNIQUE, !IS_DERIVED, IS_ORDERED);
-
- initEClass(ptThisLiteralEClass, PTThisLiteral.class, "PTThisLiteral", !IS_ABSTRACT, !IS_INTERFACE, IS_GENERATED_INSTANCE_CLASS);
-
- initEClass(ptTypeLiteralEClass, PTTypeLiteral.class, "PTTypeLiteral", !IS_ABSTRACT, !IS_INTERFACE, IS_GENERATED_INSTANCE_CLASS);
- initEAttribute(getPTTypeLiteral_Type(), ecorePackage.getEString(), "type", null, 0, 1, PTTypeLiteral.class, !IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE, !IS_UNSETTABLE, !IS_ID, IS_UNIQUE, !IS_DERIVED, IS_ORDERED);
-
- initEClass(ptInvalidExpressionEClass, PTInvalidExpression.class, "PTInvalidExpression", !IS_ABSTRACT, !IS_INTERFACE, IS_GENERATED_INSTANCE_CLASS);
- initEAttribute(getPTInvalidExpression_Message(), ecorePackage.getEString(), "message", null, 0, 1, PTInvalidExpression.class, !IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE, !IS_UNSETTABLE, !IS_ID, IS_UNIQUE, !IS_DERIVED, IS_ORDERED);
-
- initEClass(ptInstanceReferenceEClass, PTInstanceReference.class, "PTInstanceReference", !IS_ABSTRACT, !IS_INTERFACE, IS_GENERATED_INSTANCE_CLASS);
- initEReference(getPTInstanceReference_Reference(), this.getIJavaInstance(), null, "reference", null, 1, 1, PTInstanceReference.class, !IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE, !IS_COMPOSITE, IS_RESOLVE_PROXIES, !IS_UNSETTABLE, IS_UNIQUE, !IS_DERIVED, IS_ORDERED);
-
- initEClass(ptAnonymousClassDeclarationEClass, PTAnonymousClassDeclaration.class, "PTAnonymousClassDeclaration", !IS_ABSTRACT, !IS_INTERFACE, IS_GENERATED_INSTANCE_CLASS);
- initEAttribute(getPTAnonymousClassDeclaration_Declaration(), ecorePackage.getEString(), "declaration", null, 0, 1, PTAnonymousClassDeclaration.class, !IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE, !IS_UNSETTABLE, !IS_ID, IS_UNIQUE, !IS_DERIVED, IS_ORDERED);
- initEAttribute(getPTAnonymousClassDeclaration_Imports(), ecorePackage.getEString(), "imports", null, 0, -1, PTAnonymousClassDeclaration.class, IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE, !IS_UNSETTABLE, !IS_ID, IS_UNIQUE, !IS_DERIVED, IS_ORDERED);
-
- // Initialize enums and add enum literals
- initEEnum(ptInfixOperatorEEnum, PTInfixOperator.class, "PTInfixOperator");
- addEEnumLiteral(ptInfixOperatorEEnum, PTInfixOperator.TIMES_LITERAL);
- addEEnumLiteral(ptInfixOperatorEEnum, PTInfixOperator.DIVIDE_LITERAL);
- addEEnumLiteral(ptInfixOperatorEEnum, PTInfixOperator.REMAINDER_LITERAL);
- addEEnumLiteral(ptInfixOperatorEEnum, PTInfixOperator.PLUS_LITERAL);
- addEEnumLiteral(ptInfixOperatorEEnum, PTInfixOperator.MINUS_LITERAL);
- addEEnumLiteral(ptInfixOperatorEEnum, PTInfixOperator.LEFT_SHIFT_LITERAL);
- addEEnumLiteral(ptInfixOperatorEEnum, PTInfixOperator.RIGHT_SHIFT_SIGNED_LITERAL);
- addEEnumLiteral(ptInfixOperatorEEnum, PTInfixOperator.RIGHT_SHIFT_UNSIGNED_LITERAL);
- addEEnumLiteral(ptInfixOperatorEEnum, PTInfixOperator.LESS_LITERAL);
- addEEnumLiteral(ptInfixOperatorEEnum, PTInfixOperator.GREATER_LITERAL);
- addEEnumLiteral(ptInfixOperatorEEnum, PTInfixOperator.LESS_EQUALS_LITERAL);
- addEEnumLiteral(ptInfixOperatorEEnum, PTInfixOperator.GREATER_EQUALS_LITERAL);
- addEEnumLiteral(ptInfixOperatorEEnum, PTInfixOperator.EQUALS_LITERAL);
- addEEnumLiteral(ptInfixOperatorEEnum, PTInfixOperator.NOT_EQUALS_LITERAL);
- addEEnumLiteral(ptInfixOperatorEEnum, PTInfixOperator.XOR_LITERAL);
- addEEnumLiteral(ptInfixOperatorEEnum, PTInfixOperator.AND_LITERAL);
- addEEnumLiteral(ptInfixOperatorEEnum, PTInfixOperator.OR_LITERAL);
- addEEnumLiteral(ptInfixOperatorEEnum, PTInfixOperator.CONDITIONAL_AND_LITERAL);
- addEEnumLiteral(ptInfixOperatorEEnum, PTInfixOperator.CONDITIONAL_OR_LITERAL);
-
- initEEnum(ptPrefixOperatorEEnum, PTPrefixOperator.class, "PTPrefixOperator");
- addEEnumLiteral(ptPrefixOperatorEEnum, PTPrefixOperator.PLUS_LITERAL);
- addEEnumLiteral(ptPrefixOperatorEEnum, PTPrefixOperator.MINUS_LITERAL);
- addEEnumLiteral(ptPrefixOperatorEEnum, PTPrefixOperator.COMPLEMENT_LITERAL);
- addEEnumLiteral(ptPrefixOperatorEEnum, PTPrefixOperator.NOT_LITERAL);
-
- // Create resource
- createResource(eNS_URI);
- }
-
-} //InstantiationPackageImpl
diff --git a/plugins/org.eclipse.jem/javainst/org/eclipse/jem/internal/instantiation/impl/JavaAllocationImpl.java b/plugins/org.eclipse.jem/javainst/org/eclipse/jem/internal/instantiation/impl/JavaAllocationImpl.java
deleted file mode 100644
index dd9b393..0000000
--- a/plugins/org.eclipse.jem/javainst/org/eclipse/jem/internal/instantiation/impl/JavaAllocationImpl.java
+++ /dev/null
@@ -1,61 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2003, 2005 IBM Corporation and others.
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
- *
- * Contributors:
- * IBM Corporation - initial API and implementation
- *******************************************************************************/
-package org.eclipse.jem.internal.instantiation.impl;
-/*
-
-
- */
-
-
-import org.eclipse.emf.ecore.EClass;
-
-import org.eclipse.emf.ecore.impl.EObjectImpl;
-
-import org.eclipse.jem.internal.instantiation.InstantiationPackage;
-import org.eclipse.jem.internal.instantiation.JavaAllocation;
-
-/**
- * <!-- begin-user-doc -->
- * An implementation of the model object '<em><b>Java Allocation</b></em>'.
- * <!-- end-user-doc -->
- * <p>
- * </p>
- *
- * @generated
- */
-public abstract class JavaAllocationImpl extends EObjectImpl implements JavaAllocation {
- /**
- * <!-- begin-user-doc -->
- * <!-- end-user-doc -->
- * @generated
- */
- protected JavaAllocationImpl() {
- super();
- }
-
- /**
- * <!-- begin-user-doc -->
- * <!-- end-user-doc -->
- * @generated
- */
- protected EClass eStaticClass() {
- return InstantiationPackage.eINSTANCE.getJavaAllocation();
- }
-
- public boolean isParseTree() {
- return false;
- }
-
- public boolean isImplicit() {
- return false;
- }
-
-} //JavaAllocationImpl
diff --git a/plugins/org.eclipse.jem/javainst/org/eclipse/jem/internal/instantiation/impl/NaiveExpressionFlattener.java b/plugins/org.eclipse.jem/javainst/org/eclipse/jem/internal/instantiation/impl/NaiveExpressionFlattener.java
deleted file mode 100644
index 94e1043..0000000
--- a/plugins/org.eclipse.jem/javainst/org/eclipse/jem/internal/instantiation/impl/NaiveExpressionFlattener.java
+++ /dev/null
@@ -1,331 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2004, 2005 IBM Corporation and others.
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
- *
- * Contributors:
- * IBM Corporation - initial API and implementation
- *******************************************************************************/
-/*
-
-
- */
-package org.eclipse.jem.internal.instantiation.impl;
-
-import java.text.MessageFormat;
-import java.util.List;
-
-import org.eclipse.jem.internal.instantiation.*;
-
-/**
- * This naively flattens the ParseTree. It just works with what's there.
- *
- * @since 1.0.0
- */
-public class NaiveExpressionFlattener extends ParseVisitor {
-
- private StringBuffer buffer = new StringBuffer(100);
-
- protected final StringBuffer getStringBuffer() {
- return buffer;
- }
-
- /**
- * Return the string result of the flattening.
- * @return The flattened string.
- *
- * @since 1.0.0
- */
- public String getResult() {
- return buffer.toString();
- }
-
- /**
- * Reset the result so that flattener can be used again.
- *
- * @since 1.0.0
- */
- public void reset() {
- buffer.setLength(0);
- }
-
- /* (non-Javadoc)
- * @see org.eclipse.jem.internal.instantiation.ParseVisitor#visit(org.eclipse.jem.internal.instantiation.PTAnonymousClassDeclaration)
- */
- public boolean visit(PTAnonymousClassDeclaration node) {
- buffer.append(node.getDeclaration());
- return false;
- }
-
- /* (non-Javadoc)
- * @see org.eclipse.jem.internal.instantiation.ParseVisitor#visit(org.eclipse.jem.internal.instantiation.PTArrayAccess)
- */
- public boolean visit(PTArrayAccess node) {
- node.getArray().accept(this);
- if (!node.getIndexes().isEmpty()) {
- List indexes = node.getIndexes();
- for (int i = 0; i < indexes.size(); i++) {
- buffer.append('[');
- ((PTExpression) indexes.get(i)).accept(this);
- buffer.append(']');
- }
- }
- return false;
-
- }
-
- /* (non-Javadoc)
- * @see org.eclipse.jem.internal.instantiation.ParseVisitor#visit(org.eclipse.jem.internal.instantiation.PTArrayCreation)
- */
- public boolean visit(PTArrayCreation node) {
- String arrayType = node.getType();
- int ob = arrayType.indexOf('[');
- String type = handleQualifiedName(arrayType.substring(0, ob));
- buffer.append("new "); //$NON-NLS-1$
- buffer.append(type);
- int realdims = 0;
- while (ob != -1) {
- realdims++;
- ob = arrayType.indexOf('[',ob+1);
- }
- List dims = node.getDimensions();
- for (int i = 0; i < dims.size(); i++) {
- buffer.append('[');
- ((PTExpression) dims.get(i)).accept(this);
- buffer.append(']');
- }
- for (int i=dims.size(); i < realdims; i++) {
- buffer.append("[]"); //$NON-NLS-1$
- }
-
- if (node.getInitializer() != null) {
- buffer.append(' ');
- ((PTExpression) node.getInitializer()).accept(this);
- }
-
- return false;
- }
- /* (non-Javadoc)
- * @see org.eclipse.jem.internal.instantiation.ParseVisitor#visit(org.eclipse.jem.internal.instantiation.PTArrayInitializer)
- */
- public boolean visit(PTArrayInitializer node) {
- buffer.append('{');
- List exp = node.getExpressions();
- for (int i = 0; i < exp.size(); i++) {
- if (i != 0)
- buffer.append(", "); //$NON-NLS-1$
- ((PTExpression) exp.get(i)).accept(this);
- }
- buffer.append('}');
- return false;
- }
-
- /* (non-Javadoc)
- * @see org.eclipse.jem.internal.instantiation.ParseVisitor#visit(org.eclipse.jem.internal.instantiation.PTBooleanLiteral)
- */
- public boolean visit(PTBooleanLiteral node) {
- buffer.append(node.isBooleanValue() ? "true" : "false"); //$NON-NLS-1$ //$NON-NLS-2$
- return false;
- }
-
- /* (non-Javadoc)
- * @see org.eclipse.jem.internal.instantiation.ParseVisitor#visit(org.eclipse.jem.internal.instantiation.PTCastExpression)
- */
- public boolean visit(PTCastExpression node) {
- buffer.append('(');
- buffer.append(handleQualifiedName(node.getType()));
- buffer.append(") "); //$NON-NLS-1$
- node.getExpression().accept(this);
- return false;
- }
-
- /* (non-Javadoc)
- * @see org.eclipse.jem.internal.instantiation.ParseVisitor#visit(org.eclipse.jem.internal.instantiation.PTCharacterLiteral)
- */
- public boolean visit(PTCharacterLiteral node) {
- buffer.append(node.getEscapedValue());
- return false;
- }
-
- /* (non-Javadoc)
- * @see org.eclipse.jem.internal.instantiation.ParseVisitor#visit(org.eclipse.jem.internal.instantiation.PTClassInstanceCreation)
- */
- public boolean visit(PTClassInstanceCreation node) {
- buffer.append("new "); //$NON-NLS-1$
- buffer.append(handleQualifiedName(node.getType()));
- buffer.append('(');
- List args = node.getArguments();
- for (int i = 0; i < args.size(); i++) {
- if (i != 0)
- buffer.append(", "); //$NON-NLS-1$
- ((PTExpression) args.get(i)).accept(this);
- }
- buffer.append(')');
- return false;
- }
-
- /* (non-Javadoc)
- * @see org.eclipse.jem.internal.instantiation.ParseVisitor#visit(org.eclipse.jem.internal.instantiation.PTConditionalExpression)
- */
- public boolean visit(PTConditionalExpression node) {
- node.getCondition().accept(this);
- buffer.append(" ? "); //$NON-NLS-1$
- node.getTrue().accept(this);
- buffer.append(" : "); //$NON-NLS-1$
- node.getFalse().accept(this);
- return false;
- }
-
- /* (non-Javadoc)
- * @see org.eclipse.jem.internal.instantiation.ParseVisitor#visit(org.eclipse.jem.internal.instantiation.PTFieldAccess)
- */
- public boolean visit(PTFieldAccess node) {
- node.getReceiver().accept(this);
- buffer.append('.');
- buffer.append(node.getField());
- return false;
- }
-
- /* (non-Javadoc)
- * @see org.eclipse.jem.internal.instantiation.ParseVisitor#visit(org.eclipse.jem.internal.instantiation.PTInfixExpression)
- */
- public boolean visit(PTInfixExpression node) {
- node.getLeftOperand().accept(this);
- buffer.append(' ');
- String oper = node.getOperator().getOperator();
- buffer.append(oper);
- buffer.append(' ');
- node.getRightOperand().accept(this);
- List ext = node.getExtendedOperands();
- for (int i = 0; i < ext.size(); i++) {
- buffer.append(' ');
- buffer.append(oper);
- buffer.append(' ');
- ((PTExpression) ext.get(i)).accept(this);
- }
- return false;
- }
-
- /* (non-Javadoc)
- * @see org.eclipse.jem.internal.instantiation.ParseVisitor#visit(org.eclipse.jem.internal.instantiation.PTInstanceof)
- */
- public boolean visit(PTInstanceof node) {
- node.getOperand().accept(this);
- buffer.append(" instanceof "); //$NON-NLS-1$
- buffer.append(handleQualifiedName(node.getType()));
- return false;
- }
-
- /* (non-Javadoc)
- * @see org.eclipse.jem.internal.instantiation.ParseVisitor#visit(org.eclipse.jem.internal.instantiation.PTInvalidExpression)
- */
- public boolean visit(PTInvalidExpression node) {
- buffer.append(MessageFormat.format(InstantiationImplMessages.NaiveExpressionFlattener_InvalidExpression, new Object[]{node.getMessage()}));
- return false;
- }
-
- /* (non-Javadoc)
- * @see org.eclipse.jem.internal.instantiation.ParseVisitor#visit(org.eclipse.jem.internal.instantiation.PTMethodInvocation)
- */
- public boolean visit(PTMethodInvocation node) {
- if (node.getReceiver() != null) {
- node.getReceiver().accept(this);
- buffer.append('.');
- }
-
- buffer.append(node.getName());
- buffer.append('(');
- List args = node.getArguments();
- for (int i = 0; i < args.size(); i++) {
- if (i != 0)
- buffer.append(", "); //$NON-NLS-1$
- ((PTExpression) args.get(i)).accept(this);
- }
- buffer.append(')');
- return false;
- }
-
- /* (non-Javadoc)
- * @see org.eclipse.jem.internal.instantiation.ParseVisitor#visit(org.eclipse.jem.internal.instantiation.PTName)
- */
- public boolean visit(PTName node) {
- buffer.append(handleQualifiedName(node.getName()));
- return false;
- }
-
- /* (non-Javadoc)
- * @see org.eclipse.jem.internal.instantiation.ParseVisitor#visit(org.eclipse.jem.internal.instantiation.PTNullLiteral)
- */
- public boolean visit(PTNullLiteral node) {
- buffer.append("null"); //$NON-NLS-1$
- return false;
- }
-
- /* (non-Javadoc)
- * @see org.eclipse.jem.internal.instantiation.ParseVisitor#visit(org.eclipse.jem.internal.instantiation.PTNumberLiteral)
- */
- public boolean visit(PTNumberLiteral node) {
- buffer.append(node.getToken());
- return false;
- }
-
- /* (non-Javadoc)
- * @see org.eclipse.jem.internal.instantiation.ParseVisitor#visit(org.eclipse.jem.internal.instantiation.PTParenthesizedExpression)
- */
- public boolean visit(PTParenthesizedExpression node) {
- buffer.append('(');
- node.getExpression().accept(this);
- buffer.append(')');
- return false;
- }
-
- /* (non-Javadoc)
- * @see org.eclipse.jem.internal.instantiation.ParseVisitor#visit(org.eclipse.jem.internal.instantiation.PTPrefixExpression)
- */
- public boolean visit(PTPrefixExpression node) {
- buffer.append(node.getOperator().getOperator());
- node.getExpression().accept(this);
- return false;
- }
-
- /* (non-Javadoc)
- * @see org.eclipse.jem.internal.instantiation.ParseVisitor#visit(org.eclipse.jem.internal.instantiation.PTStringLiteral)
- */
- public boolean visit(PTStringLiteral node) {
- buffer.append(node.getEscapedValue());
- return false;
- }
-
- /* (non-Javadoc)
- * @see org.eclipse.jem.internal.instantiation.ParseVisitor#visit(org.eclipse.jem.internal.instantiation.PTThisLiteral)
- */
- public boolean visit(PTThisLiteral node) {
- buffer.append("this"); //$NON-NLS-1$
- return false;
- }
-
- /* (non-Javadoc)
- * @see org.eclipse.jem.internal.instantiation.ParseVisitor#visit(org.eclipse.jem.internal.instantiation.PTTypeLiteral)
- */
- public boolean visit(PTTypeLiteral node) {
- buffer.append(handleQualifiedName(node.getType()));
- buffer.append(".class"); //$NON-NLS-1$
- return false;
- }
-
- /**
- * This method enables one to overide the handling of qualified names.
- * The default operation is to do nothing.
- *
- * Overriders may choose to use short names, relying on import statement handling.
- *
- * @param qName
- * @return Name to use for the flattened result
- */
- protected String handleQualifiedName(String qName) {
- return qName;
- }
-
-}
diff --git a/plugins/org.eclipse.jem/javainst/org/eclipse/jem/internal/instantiation/impl/PTAnonymousClassDeclarationImpl.java b/plugins/org.eclipse.jem/javainst/org/eclipse/jem/internal/instantiation/impl/PTAnonymousClassDeclarationImpl.java
deleted file mode 100644
index 839d8c4..0000000
--- a/plugins/org.eclipse.jem/javainst/org/eclipse/jem/internal/instantiation/impl/PTAnonymousClassDeclarationImpl.java
+++ /dev/null
@@ -1,217 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2005 IBM Corporation and others.
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
- *
- * Contributors:
- * IBM Corporation - initial API and implementation
- *******************************************************************************/
-package org.eclipse.jem.internal.instantiation.impl;
-/*
-
-
- */
-
-import java.util.Collection;
-
-import org.eclipse.emf.common.notify.Notification;
-
-import org.eclipse.emf.common.util.EList;
-
-import org.eclipse.emf.ecore.EClass;
-import org.eclipse.emf.ecore.EStructuralFeature;
-
-import org.eclipse.emf.ecore.impl.ENotificationImpl;
-
-import org.eclipse.emf.ecore.util.EDataTypeUniqueEList;
-
-import org.eclipse.jem.internal.instantiation.*;
-import org.eclipse.jem.internal.instantiation.InstantiationPackage;
-import org.eclipse.jem.internal.instantiation.PTAnonymousClassDeclaration;
-
-/**
- * <!-- begin-user-doc -->
- * An implementation of the model object '<em><b>PT Anonymous Class Declaration</b></em>'.
- * <!-- end-user-doc -->
- * <p>
- * The following features are implemented:
- * <ul>
- * <li>{@link org.eclipse.jem.internal.instantiation.impl.PTAnonymousClassDeclarationImpl#getDeclaration <em>Declaration</em>}</li>
- * <li>{@link org.eclipse.jem.internal.instantiation.impl.PTAnonymousClassDeclarationImpl#getImports <em>Imports</em>}</li>
- * </ul>
- * </p>
- *
- * @generated
- */
-public class PTAnonymousClassDeclarationImpl extends PTExpressionImpl implements PTAnonymousClassDeclaration {
- /**
- * The default value of the '{@link #getDeclaration() <em>Declaration</em>}' attribute.
- * <!-- begin-user-doc -->
- * <!-- end-user-doc -->
- * @see #getDeclaration()
- * @generated
- * @ordered
- */
- protected static final String DECLARATION_EDEFAULT = null;
-
- /**
- * The cached value of the '{@link #getDeclaration() <em>Declaration</em>}' attribute.
- * <!-- begin-user-doc -->
- * <!-- end-user-doc -->
- * @see #getDeclaration()
- * @generated
- * @ordered
- */
- protected String declaration = DECLARATION_EDEFAULT;
-
- /**
- * The cached value of the '{@link #getImports() <em>Imports</em>}' attribute list.
- * <!-- begin-user-doc -->
- * <!-- end-user-doc -->
- * @see #getImports()
- * @generated
- * @ordered
- */
- protected EList imports = null;
-
- /**
- * <!-- begin-user-doc -->
- * <!-- end-user-doc -->
- * @generated
- */
- protected PTAnonymousClassDeclarationImpl() {
- super();
- }
-
- /**
- * <!-- begin-user-doc -->
- * <!-- end-user-doc -->
- * @generated
- */
- protected EClass eStaticClass() {
- return InstantiationPackage.eINSTANCE.getPTAnonymousClassDeclaration();
- }
-
- /**
- * <!-- begin-user-doc -->
- * <!-- end-user-doc -->
- * @generated
- */
- public String getDeclaration() {
- return declaration;
- }
-
- /**
- * <!-- begin-user-doc -->
- * <!-- end-user-doc -->
- * @generated
- */
- public void setDeclaration(String newDeclaration) {
- String oldDeclaration = declaration;
- declaration = newDeclaration;
- if (eNotificationRequired())
- eNotify(new ENotificationImpl(this, Notification.SET, InstantiationPackage.PT_ANONYMOUS_CLASS_DECLARATION__DECLARATION, oldDeclaration, declaration));
- }
-
- /**
- * <!-- begin-user-doc -->
- * <!-- end-user-doc -->
- * @generated
- */
- public EList getImports() {
- if (imports == null) {
- imports = new EDataTypeUniqueEList(String.class, this, InstantiationPackage.PT_ANONYMOUS_CLASS_DECLARATION__IMPORTS);
- }
- return imports;
- }
-
- /**
- * <!-- begin-user-doc -->
- * <!-- end-user-doc -->
- * @generated
- */
- public Object eGet(EStructuralFeature eFeature, boolean resolve) {
- switch (eDerivedStructuralFeatureID(eFeature)) {
- case InstantiationPackage.PT_ANONYMOUS_CLASS_DECLARATION__DECLARATION:
- return getDeclaration();
- case InstantiationPackage.PT_ANONYMOUS_CLASS_DECLARATION__IMPORTS:
- return getImports();
- }
- return eDynamicGet(eFeature, resolve);
- }
-
- /**
- * <!-- begin-user-doc -->
- * <!-- end-user-doc -->
- * @generated
- */
- public void eSet(EStructuralFeature eFeature, Object newValue) {
- switch (eDerivedStructuralFeatureID(eFeature)) {
- case InstantiationPackage.PT_ANONYMOUS_CLASS_DECLARATION__DECLARATION:
- setDeclaration((String)newValue);
- return;
- case InstantiationPackage.PT_ANONYMOUS_CLASS_DECLARATION__IMPORTS:
- getImports().clear();
- getImports().addAll((Collection)newValue);
- return;
- }
- eDynamicSet(eFeature, newValue);
- }
-
- /**
- * <!-- begin-user-doc -->
- * <!-- end-user-doc -->
- * @generated
- */
- public void eUnset(EStructuralFeature eFeature) {
- switch (eDerivedStructuralFeatureID(eFeature)) {
- case InstantiationPackage.PT_ANONYMOUS_CLASS_DECLARATION__DECLARATION:
- setDeclaration(DECLARATION_EDEFAULT);
- return;
- case InstantiationPackage.PT_ANONYMOUS_CLASS_DECLARATION__IMPORTS:
- getImports().clear();
- return;
- }
- eDynamicUnset(eFeature);
- }
-
- /**
- * <!-- begin-user-doc -->
- * <!-- end-user-doc -->
- * @generated
- */
- public boolean eIsSet(EStructuralFeature eFeature) {
- switch (eDerivedStructuralFeatureID(eFeature)) {
- case InstantiationPackage.PT_ANONYMOUS_CLASS_DECLARATION__DECLARATION:
- return DECLARATION_EDEFAULT == null ? declaration != null : !DECLARATION_EDEFAULT.equals(declaration);
- case InstantiationPackage.PT_ANONYMOUS_CLASS_DECLARATION__IMPORTS:
- return imports != null && !imports.isEmpty();
- }
- return eDynamicIsSet(eFeature);
- }
-
- /**
- * <!-- begin-user-doc -->
- * <!-- end-user-doc -->
- * @generated
- */
- public String toString() {
- if (eIsProxy()) return super.toString();
-
- StringBuffer result = new StringBuffer(super.toString());
- result.append(" (declaration: ");
- result.append(declaration);
- result.append(", imports: ");
- result.append(imports);
- result.append(')');
- return result.toString();
- }
-
- protected void accept0(ParseVisitor visitor) {
- visitor.visit(this);
- visitor.endVisit(this);
- }
-
-} //PTAnonymousClassDeclarationImpl
diff --git a/plugins/org.eclipse.jem/javainst/org/eclipse/jem/internal/instantiation/impl/PTArrayAccessImpl.java b/plugins/org.eclipse.jem/javainst/org/eclipse/jem/internal/instantiation/impl/PTArrayAccessImpl.java
deleted file mode 100644
index 08b0c75..0000000
--- a/plugins/org.eclipse.jem/javainst/org/eclipse/jem/internal/instantiation/impl/PTArrayAccessImpl.java
+++ /dev/null
@@ -1,244 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2004, 2005 IBM Corporation and others.
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
- *
- * Contributors:
- * IBM Corporation - initial API and implementation
- *******************************************************************************/
-package org.eclipse.jem.internal.instantiation.impl;
-/*
-
-
- */
-import java.util.Collection;
-
-import org.eclipse.emf.common.notify.Notification;
-import org.eclipse.emf.common.notify.NotificationChain;
-
-import org.eclipse.emf.common.util.EList;
-
-import org.eclipse.emf.ecore.EClass;
-import org.eclipse.emf.ecore.EStructuralFeature;
-import org.eclipse.emf.ecore.InternalEObject;
-
-import org.eclipse.emf.ecore.impl.ENotificationImpl;
-
-import org.eclipse.emf.ecore.util.EObjectContainmentEList;
-import org.eclipse.emf.ecore.util.InternalEList;
-
-import org.eclipse.jem.internal.instantiation.*;
-import org.eclipse.jem.internal.instantiation.PTArrayAccess;
-import org.eclipse.jem.internal.instantiation.PTExpression;
-import org.eclipse.jem.internal.instantiation.InstantiationPackage;
-
-/**
- * <!-- begin-user-doc -->
- * An implementation of the model object '<em><b>Array Access</b></em>'.
- * <!-- end-user-doc -->
- * <p>
- * The following features are implemented:
- * <ul>
- * <li>{@link org.eclipse.jem.internal.instantiation.impl.PTArrayAccessImpl#getArray <em>Array</em>}</li>
- * <li>{@link org.eclipse.jem.internal.instantiation.impl.PTArrayAccessImpl#getIndexes <em>Indexes</em>}</li>
- * </ul>
- * </p>
- *
- * @generated
- */
-public class PTArrayAccessImpl extends PTExpressionImpl implements PTArrayAccess {
- /**
- * The cached value of the '{@link #getArray() <em>Array</em>}' containment reference.
- * <!-- begin-user-doc -->
- * <!-- end-user-doc -->
- * @see #getArray()
- * @generated
- * @ordered
- */
- protected PTExpression array = null;
-
- /**
- * The cached value of the '{@link #getIndexes() <em>Indexes</em>}' containment reference list.
- * <!-- begin-user-doc -->
- * <!-- end-user-doc -->
- * @see #getIndexes()
- * @generated
- * @ordered
- */
- protected EList indexes = null;
-
- /**
- * <!-- begin-user-doc -->
- * <!-- end-user-doc -->
- * @generated
- */
- protected PTArrayAccessImpl() {
- super();
- }
-
- /**
- * <!-- begin-user-doc -->
- * <!-- end-user-doc -->
- * @generated
- */
- protected EClass eStaticClass() {
- return InstantiationPackage.eINSTANCE.getPTArrayAccess();
- }
-
- /**
- * <!-- begin-user-doc -->
- * <!-- end-user-doc -->
- * @generated
- */
- public PTExpression getArray() {
- return array;
- }
-
- /**
- * <!-- begin-user-doc -->
- * <!-- end-user-doc -->
- * @generated
- */
- public NotificationChain basicSetArray(PTExpression newArray, NotificationChain msgs) {
- PTExpression oldArray = array;
- array = newArray;
- if (eNotificationRequired()) {
- ENotificationImpl notification = new ENotificationImpl(this, Notification.SET, InstantiationPackage.PT_ARRAY_ACCESS__ARRAY, oldArray, newArray);
- if (msgs == null) msgs = notification; else msgs.add(notification);
- }
- return msgs;
- }
-
- /**
- * <!-- begin-user-doc -->
- * <!-- end-user-doc -->
- * @generated
- */
- public void setArray(PTExpression newArray) {
- if (newArray != array) {
- NotificationChain msgs = null;
- if (array != null)
- msgs = ((InternalEObject)array).eInverseRemove(this, EOPPOSITE_FEATURE_BASE - InstantiationPackage.PT_ARRAY_ACCESS__ARRAY, null, msgs);
- if (newArray != null)
- msgs = ((InternalEObject)newArray).eInverseAdd(this, EOPPOSITE_FEATURE_BASE - InstantiationPackage.PT_ARRAY_ACCESS__ARRAY, null, msgs);
- msgs = basicSetArray(newArray, msgs);
- if (msgs != null) msgs.dispatch();
- }
- else if (eNotificationRequired())
- eNotify(new ENotificationImpl(this, Notification.SET, InstantiationPackage.PT_ARRAY_ACCESS__ARRAY, newArray, newArray));
- }
-
- /**
- * <!-- begin-user-doc -->
- * <!-- end-user-doc -->
- * @generated
- */
- public EList getIndexes() {
- if (indexes == null) {
- indexes = new EObjectContainmentEList(PTExpression.class, this, InstantiationPackage.PT_ARRAY_ACCESS__INDEXES);
- }
- return indexes;
- }
-
- /**
- * <!-- begin-user-doc -->
- * <!-- end-user-doc -->
- * @generated
- */
- public NotificationChain eInverseRemove(InternalEObject otherEnd, int featureID, Class baseClass, NotificationChain msgs) {
- if (featureID >= 0) {
- switch (eDerivedStructuralFeatureID(featureID, baseClass)) {
- case InstantiationPackage.PT_ARRAY_ACCESS__ARRAY:
- return basicSetArray(null, msgs);
- case InstantiationPackage.PT_ARRAY_ACCESS__INDEXES:
- return ((InternalEList)getIndexes()).basicRemove(otherEnd, msgs);
- default:
- return eDynamicInverseRemove(otherEnd, featureID, baseClass, msgs);
- }
- }
- return eBasicSetContainer(null, featureID, msgs);
- }
-
- /**
- * <!-- begin-user-doc -->
- * <!-- end-user-doc -->
- * @generated
- */
- public Object eGet(EStructuralFeature eFeature, boolean resolve) {
- switch (eDerivedStructuralFeatureID(eFeature)) {
- case InstantiationPackage.PT_ARRAY_ACCESS__ARRAY:
- return getArray();
- case InstantiationPackage.PT_ARRAY_ACCESS__INDEXES:
- return getIndexes();
- }
- return eDynamicGet(eFeature, resolve);
- }
-
- /**
- * <!-- begin-user-doc -->
- * <!-- end-user-doc -->
- * @generated
- */
- public void eSet(EStructuralFeature eFeature, Object newValue) {
- switch (eDerivedStructuralFeatureID(eFeature)) {
- case InstantiationPackage.PT_ARRAY_ACCESS__ARRAY:
- setArray((PTExpression)newValue);
- return;
- case InstantiationPackage.PT_ARRAY_ACCESS__INDEXES:
- getIndexes().clear();
- getIndexes().addAll((Collection)newValue);
- return;
- }
- eDynamicSet(eFeature, newValue);
- }
-
- /**
- * <!-- begin-user-doc -->
- * <!-- end-user-doc -->
- * @generated
- */
- public void eUnset(EStructuralFeature eFeature) {
- switch (eDerivedStructuralFeatureID(eFeature)) {
- case InstantiationPackage.PT_ARRAY_ACCESS__ARRAY:
- setArray((PTExpression)null);
- return;
- case InstantiationPackage.PT_ARRAY_ACCESS__INDEXES:
- getIndexes().clear();
- return;
- }
- eDynamicUnset(eFeature);
- }
-
- /**
- * <!-- begin-user-doc -->
- * <!-- end-user-doc -->
- * @generated
- */
- public boolean eIsSet(EStructuralFeature eFeature) {
- switch (eDerivedStructuralFeatureID(eFeature)) {
- case InstantiationPackage.PT_ARRAY_ACCESS__ARRAY:
- return array != null;
- case InstantiationPackage.PT_ARRAY_ACCESS__INDEXES:
- return indexes != null && !indexes.isEmpty();
- }
- return eDynamicIsSet(eFeature);
- }
-
- /*
- * (non-Javadoc)
- * @see org.eclipse.jem.internal.instantiation.impl.ExpressionImpl#accept0(org.eclipse.jem.internal.instantiation.ParseVisitor)
- */
- protected void accept0(ParseVisitor visitor) {
- boolean visitChildren = visitor.visit(this);
- if (visitChildren) {
- // visit children in normal left to right reading order
- acceptChild(visitor, getArray());
- if (indexes != null)
- acceptChildren(visitor, indexes);
- }
- visitor.endVisit(this);
- }
-
-} //ArrayAccessImpl
diff --git a/plugins/org.eclipse.jem/javainst/org/eclipse/jem/internal/instantiation/impl/PTArrayCreationImpl.java b/plugins/org.eclipse.jem/javainst/org/eclipse/jem/internal/instantiation/impl/PTArrayCreationImpl.java
deleted file mode 100644
index 1ba8b3c..0000000
--- a/plugins/org.eclipse.jem/javainst/org/eclipse/jem/internal/instantiation/impl/PTArrayCreationImpl.java
+++ /dev/null
@@ -1,299 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2004, 2005 IBM Corporation and others.
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
- *
- * Contributors:
- * IBM Corporation - initial API and implementation
- *******************************************************************************/
-package org.eclipse.jem.internal.instantiation.impl;
-/*
-
-
- */
-import java.util.Collection;
-
-import org.eclipse.emf.common.notify.Notification;
-import org.eclipse.emf.common.notify.NotificationChain;
-
-import org.eclipse.emf.common.util.EList;
-
-import org.eclipse.emf.ecore.EClass;
-import org.eclipse.emf.ecore.EStructuralFeature;
-import org.eclipse.emf.ecore.InternalEObject;
-
-import org.eclipse.emf.ecore.impl.ENotificationImpl;
-
-import org.eclipse.emf.ecore.util.EObjectContainmentEList;
-import org.eclipse.emf.ecore.util.InternalEList;
-
-import org.eclipse.jem.internal.instantiation.*;
-import org.eclipse.jem.internal.instantiation.PTArrayCreation;
-import org.eclipse.jem.internal.instantiation.PTArrayInitializer;
-import org.eclipse.jem.internal.instantiation.PTExpression;
-import org.eclipse.jem.internal.instantiation.InstantiationPackage;
-
-/**
- * <!-- begin-user-doc -->
- * An implementation of the model object '<em><b>Array Creation</b></em>'.
- * <!-- end-user-doc -->
- * <p>
- * The following features are implemented:
- * <ul>
- * <li>{@link org.eclipse.jem.internal.instantiation.impl.PTArrayCreationImpl#getType <em>Type</em>}</li>
- * <li>{@link org.eclipse.jem.internal.instantiation.impl.PTArrayCreationImpl#getDimensions <em>Dimensions</em>}</li>
- * <li>{@link org.eclipse.jem.internal.instantiation.impl.PTArrayCreationImpl#getInitializer <em>Initializer</em>}</li>
- * </ul>
- * </p>
- *
- * @generated
- */
-public class PTArrayCreationImpl extends PTExpressionImpl implements PTArrayCreation {
- /**
- * The default value of the '{@link #getType() <em>Type</em>}' attribute.
- * <!-- begin-user-doc -->
- * <!-- end-user-doc -->
- * @see #getType()
- * @generated
- * @ordered
- */
- protected static final String TYPE_EDEFAULT = null;
-
- /**
- * The cached value of the '{@link #getType() <em>Type</em>}' attribute.
- * <!-- begin-user-doc -->
- * <!-- end-user-doc -->
- * @see #getType()
- * @generated
- * @ordered
- */
- protected String type = TYPE_EDEFAULT;
-
- /**
- * The cached value of the '{@link #getDimensions() <em>Dimensions</em>}' containment reference list.
- * <!-- begin-user-doc -->
- * <!-- end-user-doc -->
- * @see #getDimensions()
- * @generated
- * @ordered
- */
- protected EList dimensions = null;
-
- /**
- * The cached value of the '{@link #getInitializer() <em>Initializer</em>}' containment reference.
- * <!-- begin-user-doc -->
- * <!-- end-user-doc -->
- * @see #getInitializer()
- * @generated
- * @ordered
- */
- protected PTArrayInitializer initializer = null;
-
- /**
- * <!-- begin-user-doc -->
- * <!-- end-user-doc -->
- * @generated
- */
- protected PTArrayCreationImpl() {
- super();
- }
-
- /**
- * <!-- begin-user-doc -->
- * <!-- end-user-doc -->
- * @generated
- */
- protected EClass eStaticClass() {
- return InstantiationPackage.eINSTANCE.getPTArrayCreation();
- }
-
- /**
- * <!-- begin-user-doc -->
- * <!-- end-user-doc -->
- * @generated
- */
- public String getType() {
- return type;
- }
-
- /**
- * <!-- begin-user-doc -->
- * <!-- end-user-doc -->
- * @generated
- */
- public void setType(String newType) {
- String oldType = type;
- type = newType;
- if (eNotificationRequired())
- eNotify(new ENotificationImpl(this, Notification.SET, InstantiationPackage.PT_ARRAY_CREATION__TYPE, oldType, type));
- }
-
- /**
- * <!-- begin-user-doc -->
- * <!-- end-user-doc -->
- * @generated
- */
- public EList getDimensions() {
- if (dimensions == null) {
- dimensions = new EObjectContainmentEList(PTExpression.class, this, InstantiationPackage.PT_ARRAY_CREATION__DIMENSIONS);
- }
- return dimensions;
- }
-
- /**
- * <!-- begin-user-doc -->
- * <!-- end-user-doc -->
- * @generated
- */
- public PTArrayInitializer getInitializer() {
- return initializer;
- }
-
- /**
- * <!-- begin-user-doc -->
- * <!-- end-user-doc -->
- * @generated
- */
- public NotificationChain basicSetInitializer(PTArrayInitializer newInitializer, NotificationChain msgs) {
- PTArrayInitializer oldInitializer = initializer;
- initializer = newInitializer;
- if (eNotificationRequired()) {
- ENotificationImpl notification = new ENotificationImpl(this, Notification.SET, InstantiationPackage.PT_ARRAY_CREATION__INITIALIZER, oldInitializer, newInitializer);
- if (msgs == null) msgs = notification; else msgs.add(notification);
- }
- return msgs;
- }
-
- /**
- * <!-- begin-user-doc -->
- * <!-- end-user-doc -->
- * @generated
- */
- public void setInitializer(PTArrayInitializer newInitializer) {
- if (newInitializer != initializer) {
- NotificationChain msgs = null;
- if (initializer != null)
- msgs = ((InternalEObject)initializer).eInverseRemove(this, EOPPOSITE_FEATURE_BASE - InstantiationPackage.PT_ARRAY_CREATION__INITIALIZER, null, msgs);
- if (newInitializer != null)
- msgs = ((InternalEObject)newInitializer).eInverseAdd(this, EOPPOSITE_FEATURE_BASE - InstantiationPackage.PT_ARRAY_CREATION__INITIALIZER, null, msgs);
- msgs = basicSetInitializer(newInitializer, msgs);
- if (msgs != null) msgs.dispatch();
- }
- else if (eNotificationRequired())
- eNotify(new ENotificationImpl(this, Notification.SET, InstantiationPackage.PT_ARRAY_CREATION__INITIALIZER, newInitializer, newInitializer));
- }
-
- /**
- * <!-- begin-user-doc -->
- * <!-- end-user-doc -->
- * @generated
- */
- public NotificationChain eInverseRemove(InternalEObject otherEnd, int featureID, Class baseClass, NotificationChain msgs) {
- if (featureID >= 0) {
- switch (eDerivedStructuralFeatureID(featureID, baseClass)) {
- case InstantiationPackage.PT_ARRAY_CREATION__DIMENSIONS:
- return ((InternalEList)getDimensions()).basicRemove(otherEnd, msgs);
- case InstantiationPackage.PT_ARRAY_CREATION__INITIALIZER:
- return basicSetInitializer(null, msgs);
- default:
- return eDynamicInverseRemove(otherEnd, featureID, baseClass, msgs);
- }
- }
- return eBasicSetContainer(null, featureID, msgs);
- }
-
- /**
- * <!-- begin-user-doc -->
- * <!-- end-user-doc -->
- * @generated
- */
- public Object eGet(EStructuralFeature eFeature, boolean resolve) {
- switch (eDerivedStructuralFeatureID(eFeature)) {
- case InstantiationPackage.PT_ARRAY_CREATION__TYPE:
- return getType();
- case InstantiationPackage.PT_ARRAY_CREATION__DIMENSIONS:
- return getDimensions();
- case InstantiationPackage.PT_ARRAY_CREATION__INITIALIZER:
- return getInitializer();
- }
- return eDynamicGet(eFeature, resolve);
- }
-
- /**
- * <!-- begin-user-doc -->
- * <!-- end-user-doc -->
- * @generated
- */
- public void eSet(EStructuralFeature eFeature, Object newValue) {
- switch (eDerivedStructuralFeatureID(eFeature)) {
- case InstantiationPackage.PT_ARRAY_CREATION__TYPE:
- setType((String)newValue);
- return;
- case InstantiationPackage.PT_ARRAY_CREATION__DIMENSIONS:
- getDimensions().clear();
- getDimensions().addAll((Collection)newValue);
- return;
- case InstantiationPackage.PT_ARRAY_CREATION__INITIALIZER:
- setInitializer((PTArrayInitializer)newValue);
- return;
- }
- eDynamicSet(eFeature, newValue);
- }
-
- /**
- * <!-- begin-user-doc -->
- * <!-- end-user-doc -->
- * @generated
- */
- public void eUnset(EStructuralFeature eFeature) {
- switch (eDerivedStructuralFeatureID(eFeature)) {
- case InstantiationPackage.PT_ARRAY_CREATION__TYPE:
- setType(TYPE_EDEFAULT);
- return;
- case InstantiationPackage.PT_ARRAY_CREATION__DIMENSIONS:
- getDimensions().clear();
- return;
- case InstantiationPackage.PT_ARRAY_CREATION__INITIALIZER:
- setInitializer((PTArrayInitializer)null);
- return;
- }
- eDynamicUnset(eFeature);
- }
-
- /**
- * <!-- begin-user-doc -->
- * <!-- end-user-doc -->
- * @generated
- */
- public boolean eIsSet(EStructuralFeature eFeature) {
- switch (eDerivedStructuralFeatureID(eFeature)) {
- case InstantiationPackage.PT_ARRAY_CREATION__TYPE:
- return TYPE_EDEFAULT == null ? type != null : !TYPE_EDEFAULT.equals(type);
- case InstantiationPackage.PT_ARRAY_CREATION__DIMENSIONS:
- return dimensions != null && !dimensions.isEmpty();
- case InstantiationPackage.PT_ARRAY_CREATION__INITIALIZER:
- return initializer != null;
- }
- return eDynamicIsSet(eFeature);
- }
-
- public String toString() {
- return super.toString(); // Really want toString to be final at PTExpression, but EMF doesn't allow it.
- }
-
- /*
- * (non-Javadoc)
- * @see org.eclipse.jem.internal.instantiation.impl.ExpressionImpl#accept0(org.eclipse.jem.internal.instantiation.ParseVisitor)
- */
- protected void accept0(ParseVisitor visitor) {
- boolean visitChildren = visitor.visit(this);
- if (visitChildren) {
- // visit children in normal left to right reading order
- acceptChildren(visitor, dimensions);
- acceptChild(visitor, getInitializer());
- }
- visitor.endVisit(this);
- }
-} //ArrayCreationImpl
diff --git a/plugins/org.eclipse.jem/javainst/org/eclipse/jem/internal/instantiation/impl/PTArrayInitializerImpl.java b/plugins/org.eclipse.jem/javainst/org/eclipse/jem/internal/instantiation/impl/PTArrayInitializerImpl.java
deleted file mode 100644
index ceeba94..0000000
--- a/plugins/org.eclipse.jem/javainst/org/eclipse/jem/internal/instantiation/impl/PTArrayInitializerImpl.java
+++ /dev/null
@@ -1,171 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2004, 2005 IBM Corporation and others.
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
- *
- * Contributors:
- * IBM Corporation - initial API and implementation
- *******************************************************************************/
-package org.eclipse.jem.internal.instantiation.impl;
-/*
-
-
- */
-import java.util.Collection;
-
-import org.eclipse.emf.common.notify.NotificationChain;
-
-import org.eclipse.emf.common.util.EList;
-
-import org.eclipse.emf.ecore.EClass;
-import org.eclipse.emf.ecore.EStructuralFeature;
-import org.eclipse.emf.ecore.InternalEObject;
-
-import org.eclipse.emf.ecore.util.EObjectContainmentEList;
-import org.eclipse.emf.ecore.util.InternalEList;
-
-import org.eclipse.jem.internal.instantiation.*;
-import org.eclipse.jem.internal.instantiation.PTArrayInitializer;
-import org.eclipse.jem.internal.instantiation.PTExpression;
-import org.eclipse.jem.internal.instantiation.InstantiationPackage;
-
-/**
- * <!-- begin-user-doc -->
- * An implementation of the model object '<em><b>Array Initializer</b></em>'.
- * <!-- end-user-doc -->
- * <p>
- * The following features are implemented:
- * <ul>
- * <li>{@link org.eclipse.jem.internal.instantiation.impl.PTArrayInitializerImpl#getExpressions <em>Expressions</em>}</li>
- * </ul>
- * </p>
- *
- * @generated
- */
-public class PTArrayInitializerImpl extends PTExpressionImpl implements PTArrayInitializer {
- /**
- * The cached value of the '{@link #getExpressions() <em>Expressions</em>}' containment reference list.
- * <!-- begin-user-doc -->
- * <!-- end-user-doc -->
- * @see #getExpressions()
- * @generated
- * @ordered
- */
- protected EList expressions = null;
-
- /**
- * <!-- begin-user-doc -->
- * <!-- end-user-doc -->
- * @generated
- */
- protected PTArrayInitializerImpl() {
- super();
- }
-
- /**
- * <!-- begin-user-doc -->
- * <!-- end-user-doc -->
- * @generated
- */
- protected EClass eStaticClass() {
- return InstantiationPackage.eINSTANCE.getPTArrayInitializer();
- }
-
- /**
- * <!-- begin-user-doc -->
- * <!-- end-user-doc -->
- * @generated
- */
- public EList getExpressions() {
- if (expressions == null) {
- expressions = new EObjectContainmentEList(PTExpression.class, this, InstantiationPackage.PT_ARRAY_INITIALIZER__EXPRESSIONS);
- }
- return expressions;
- }
-
- /**
- * <!-- begin-user-doc -->
- * <!-- end-user-doc -->
- * @generated
- */
- public NotificationChain eInverseRemove(InternalEObject otherEnd, int featureID, Class baseClass, NotificationChain msgs) {
- if (featureID >= 0) {
- switch (eDerivedStructuralFeatureID(featureID, baseClass)) {
- case InstantiationPackage.PT_ARRAY_INITIALIZER__EXPRESSIONS:
- return ((InternalEList)getExpressions()).basicRemove(otherEnd, msgs);
- default:
- return eDynamicInverseRemove(otherEnd, featureID, baseClass, msgs);
- }
- }
- return eBasicSetContainer(null, featureID, msgs);
- }
-
- /**
- * <!-- begin-user-doc -->
- * <!-- end-user-doc -->
- * @generated
- */
- public Object eGet(EStructuralFeature eFeature, boolean resolve) {
- switch (eDerivedStructuralFeatureID(eFeature)) {
- case InstantiationPackage.PT_ARRAY_INITIALIZER__EXPRESSIONS:
- return getExpressions();
- }
- return eDynamicGet(eFeature, resolve);
- }
-
- /**
- * <!-- begin-user-doc -->
- * <!-- end-user-doc -->
- * @generated
- */
- public void eSet(EStructuralFeature eFeature, Object newValue) {
- switch (eDerivedStructuralFeatureID(eFeature)) {
- case InstantiationPackage.PT_ARRAY_INITIALIZER__EXPRESSIONS:
- getExpressions().clear();
- getExpressions().addAll((Collection)newValue);
- return;
- }
- eDynamicSet(eFeature, newValue);
- }
-
- /**
- * <!-- begin-user-doc -->
- * <!-- end-user-doc -->
- * @generated
- */
- public void eUnset(EStructuralFeature eFeature) {
- switch (eDerivedStructuralFeatureID(eFeature)) {
- case InstantiationPackage.PT_ARRAY_INITIALIZER__EXPRESSIONS:
- getExpressions().clear();
- return;
- }
- eDynamicUnset(eFeature);
- }
-
- /**
- * <!-- begin-user-doc -->
- * <!-- end-user-doc -->
- * @generated
- */
- public boolean eIsSet(EStructuralFeature eFeature) {
- switch (eDerivedStructuralFeatureID(eFeature)) {
- case InstantiationPackage.PT_ARRAY_INITIALIZER__EXPRESSIONS:
- return expressions != null && !expressions.isEmpty();
- }
- return eDynamicIsSet(eFeature);
- }
-
- /*
- * (non-Javadoc)
- * @see org.eclipse.jem.internal.instantiation.impl.ExpressionImpl#accept0(org.eclipse.jem.internal.instantiation.ParseVisitor)
- */
- protected void accept0(ParseVisitor visitor) {
- boolean visitChildren = visitor.visit(this);
- if (visitChildren) {
- acceptChildren(visitor, expressions);
- }
- visitor.endVisit(this);
- }
-} //ArrayInitializerImpl
diff --git a/plugins/org.eclipse.jem/javainst/org/eclipse/jem/internal/instantiation/impl/PTBooleanLiteralImpl.java b/plugins/org.eclipse.jem/javainst/org/eclipse/jem/internal/instantiation/impl/PTBooleanLiteralImpl.java
deleted file mode 100644
index cbf3dcd..0000000
--- a/plugins/org.eclipse.jem/javainst/org/eclipse/jem/internal/instantiation/impl/PTBooleanLiteralImpl.java
+++ /dev/null
@@ -1,167 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2004, 2005 IBM Corporation and others.
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
- *
- * Contributors:
- * IBM Corporation - initial API and implementation
- *******************************************************************************/
-package org.eclipse.jem.internal.instantiation.impl;
-/*
-
-
- */
-import org.eclipse.emf.common.notify.Notification;
-
-import org.eclipse.emf.ecore.EClass;
-import org.eclipse.emf.ecore.EStructuralFeature;
-
-import org.eclipse.emf.ecore.impl.ENotificationImpl;
-
-import org.eclipse.jem.internal.instantiation.*;
-import org.eclipse.jem.internal.instantiation.PTBooleanLiteral;
-import org.eclipse.jem.internal.instantiation.InstantiationPackage;
-
-/**
- * <!-- begin-user-doc -->
- * An implementation of the model object '<em><b>Boolean Literal</b></em>'.
- * <!-- end-user-doc -->
- * <p>
- * The following features are implemented:
- * <ul>
- * <li>{@link org.eclipse.jem.internal.instantiation.impl.PTBooleanLiteralImpl#isBooleanValue <em>Boolean Value</em>}</li>
- * </ul>
- * </p>
- *
- * @generated
- */
-public class PTBooleanLiteralImpl extends PTExpressionImpl implements PTBooleanLiteral {
- /**
- * The default value of the '{@link #isBooleanValue() <em>Boolean Value</em>}' attribute.
- * <!-- begin-user-doc -->
- * <!-- end-user-doc -->
- * @see #isBooleanValue()
- * @generated
- * @ordered
- */
- protected static final boolean BOOLEAN_VALUE_EDEFAULT = false;
-
- /**
- * The flag representing the value of the '{@link #isBooleanValue() <em>Boolean Value</em>}' attribute.
- * <!-- begin-user-doc -->
- * <!-- end-user-doc -->
- * @see #isBooleanValue()
- * @generated
- * @ordered
- */
- protected static final int BOOLEAN_VALUE_EFLAG = 1 << 8;
-
- /**
- * <!-- begin-user-doc -->
- * <!-- end-user-doc -->
- * @generated
- */
- protected PTBooleanLiteralImpl() {
- super();
- }
-
- /**
- * <!-- begin-user-doc -->
- * <!-- end-user-doc -->
- * @generated
- */
- protected EClass eStaticClass() {
- return InstantiationPackage.eINSTANCE.getPTBooleanLiteral();
- }
-
- /**
- * <!-- begin-user-doc -->
- * <!-- end-user-doc -->
- * @generated
- */
- public boolean isBooleanValue() {
- return (eFlags & BOOLEAN_VALUE_EFLAG) != 0;
- }
-
- /**
- * <!-- begin-user-doc -->
- * <!-- end-user-doc -->
- * @generated
- */
- public void setBooleanValue(boolean newBooleanValue) {
- boolean oldBooleanValue = (eFlags & BOOLEAN_VALUE_EFLAG) != 0;
- if (newBooleanValue) eFlags |= BOOLEAN_VALUE_EFLAG; else eFlags &= ~BOOLEAN_VALUE_EFLAG;
- if (eNotificationRequired())
- eNotify(new ENotificationImpl(this, Notification.SET, InstantiationPackage.PT_BOOLEAN_LITERAL__BOOLEAN_VALUE, oldBooleanValue, newBooleanValue));
- }
-
- /**
- * <!-- begin-user-doc -->
- * <!-- end-user-doc -->
- * @generated
- */
- public Object eGet(EStructuralFeature eFeature, boolean resolve) {
- switch (eDerivedStructuralFeatureID(eFeature)) {
- case InstantiationPackage.PT_BOOLEAN_LITERAL__BOOLEAN_VALUE:
- return isBooleanValue() ? Boolean.TRUE : Boolean.FALSE;
- }
- return eDynamicGet(eFeature, resolve);
- }
-
- /**
- * <!-- begin-user-doc -->
- * <!-- end-user-doc -->
- * @generated
- */
- public void eSet(EStructuralFeature eFeature, Object newValue) {
- switch (eDerivedStructuralFeatureID(eFeature)) {
- case InstantiationPackage.PT_BOOLEAN_LITERAL__BOOLEAN_VALUE:
- setBooleanValue(((Boolean)newValue).booleanValue());
- return;
- }
- eDynamicSet(eFeature, newValue);
- }
-
- /**
- * <!-- begin-user-doc -->
- * <!-- end-user-doc -->
- * @generated
- */
- public void eUnset(EStructuralFeature eFeature) {
- switch (eDerivedStructuralFeatureID(eFeature)) {
- case InstantiationPackage.PT_BOOLEAN_LITERAL__BOOLEAN_VALUE:
- setBooleanValue(BOOLEAN_VALUE_EDEFAULT);
- return;
- }
- eDynamicUnset(eFeature);
- }
-
- /**
- * <!-- begin-user-doc -->
- * <!-- end-user-doc -->
- * @generated
- */
- public boolean eIsSet(EStructuralFeature eFeature) {
- switch (eDerivedStructuralFeatureID(eFeature)) {
- case InstantiationPackage.PT_BOOLEAN_LITERAL__BOOLEAN_VALUE:
- return ((eFlags & BOOLEAN_VALUE_EFLAG) != 0) != BOOLEAN_VALUE_EDEFAULT;
- }
- return eDynamicIsSet(eFeature);
- }
-
- public String toString() {
- return super.toString(); // Really want toString to be final at PTExpression, but EMF doesn't allow it.
- }
-
- /*
- * (non-Javadoc)
- * @see org.eclipse.jem.internal.instantiation.impl.ExpressionImpl#accept0(org.eclipse.jem.internal.instantiation.ParseVisitor)
- */
- protected void accept0(ParseVisitor visitor) {
- visitor.visit(this);
- visitor.endVisit(this);
- }
-
-} //BooleanLiteralImpl
diff --git a/plugins/org.eclipse.jem/javainst/org/eclipse/jem/internal/instantiation/impl/PTCastExpressionImpl.java b/plugins/org.eclipse.jem/javainst/org/eclipse/jem/internal/instantiation/impl/PTCastExpressionImpl.java
deleted file mode 100644
index c5134bb..0000000
--- a/plugins/org.eclipse.jem/javainst/org/eclipse/jem/internal/instantiation/impl/PTCastExpressionImpl.java
+++ /dev/null
@@ -1,254 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2004, 2005 IBM Corporation and others.
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
- *
- * Contributors:
- * IBM Corporation - initial API and implementation
- *******************************************************************************/
-package org.eclipse.jem.internal.instantiation.impl;
-/*
-
-
- */
-import org.eclipse.emf.common.notify.Notification;
-import org.eclipse.emf.common.notify.NotificationChain;
-
-import org.eclipse.emf.ecore.EClass;
-import org.eclipse.emf.ecore.EStructuralFeature;
-import org.eclipse.emf.ecore.InternalEObject;
-
-import org.eclipse.emf.ecore.impl.ENotificationImpl;
-
-import org.eclipse.jem.internal.instantiation.*;
-import org.eclipse.jem.internal.instantiation.PTCastExpression;
-import org.eclipse.jem.internal.instantiation.PTExpression;
-import org.eclipse.jem.internal.instantiation.InstantiationPackage;
-
-/**
- * <!-- begin-user-doc -->
- * An implementation of the model object '<em><b>Cast</b></em>'.
- * <!-- end-user-doc -->
- * <p>
- * The following features are implemented:
- * <ul>
- * <li>{@link org.eclipse.jem.internal.instantiation.impl.PTCastExpressionImpl#getType <em>Type</em>}</li>
- * <li>{@link org.eclipse.jem.internal.instantiation.impl.PTCastExpressionImpl#getExpression <em>Expression</em>}</li>
- * </ul>
- * </p>
- *
- * @generated
- */
-public class PTCastExpressionImpl extends PTExpressionImpl implements PTCastExpression {
- /**
- * The default value of the '{@link #getType() <em>Type</em>}' attribute.
- * <!-- begin-user-doc -->
- * <!-- end-user-doc -->
- * @see #getType()
- * @generated
- * @ordered
- */
- protected static final String TYPE_EDEFAULT = null;
-
- /**
- * The cached value of the '{@link #getType() <em>Type</em>}' attribute.
- * <!-- begin-user-doc -->
- * <!-- end-user-doc -->
- * @see #getType()
- * @generated
- * @ordered
- */
- protected String type = TYPE_EDEFAULT;
-
- /**
- * The cached value of the '{@link #getExpression() <em>Expression</em>}' containment reference.
- * <!-- begin-user-doc -->
- * <!-- end-user-doc -->
- * @see #getExpression()
- * @generated
- * @ordered
- */
- protected PTExpression expression = null;
-
- /**
- * <!-- begin-user-doc -->
- * <!-- end-user-doc -->
- * @generated
- */
- protected PTCastExpressionImpl() {
- super();
- }
-
- /**
- * <!-- begin-user-doc -->
- * <!-- end-user-doc -->
- * @generated
- */
- protected EClass eStaticClass() {
- return InstantiationPackage.eINSTANCE.getPTCastExpression();
- }
-
- /**
- * <!-- begin-user-doc -->
- * <!-- end-user-doc -->
- * @generated
- */
- public String getType() {
- return type;
- }
-
- /**
- * <!-- begin-user-doc -->
- * <!-- end-user-doc -->
- * @generated
- */
- public void setType(String newType) {
- String oldType = type;
- type = newType;
- if (eNotificationRequired())
- eNotify(new ENotificationImpl(this, Notification.SET, InstantiationPackage.PT_CAST_EXPRESSION__TYPE, oldType, type));
- }
-
- /**
- * <!-- begin-user-doc -->
- * <!-- end-user-doc -->
- * @generated
- */
- public PTExpression getExpression() {
- return expression;
- }
-
- /**
- * <!-- begin-user-doc -->
- * <!-- end-user-doc -->
- * @generated
- */
- public NotificationChain basicSetExpression(PTExpression newExpression, NotificationChain msgs) {
- PTExpression oldExpression = expression;
- expression = newExpression;
- if (eNotificationRequired()) {
- ENotificationImpl notification = new ENotificationImpl(this, Notification.SET, InstantiationPackage.PT_CAST_EXPRESSION__EXPRESSION, oldExpression, newExpression);
- if (msgs == null) msgs = notification; else msgs.add(notification);
- }
- return msgs;
- }
-
- /**
- * <!-- begin-user-doc -->
- * <!-- end-user-doc -->
- * @generated
- */
- public void setExpression(PTExpression newExpression) {
- if (newExpression != expression) {
- NotificationChain msgs = null;
- if (expression != null)
- msgs = ((InternalEObject)expression).eInverseRemove(this, EOPPOSITE_FEATURE_BASE - InstantiationPackage.PT_CAST_EXPRESSION__EXPRESSION, null, msgs);
- if (newExpression != null)
- msgs = ((InternalEObject)newExpression).eInverseAdd(this, EOPPOSITE_FEATURE_BASE - InstantiationPackage.PT_CAST_EXPRESSION__EXPRESSION, null, msgs);
- msgs = basicSetExpression(newExpression, msgs);
- if (msgs != null) msgs.dispatch();
- }
- else if (eNotificationRequired())
- eNotify(new ENotificationImpl(this, Notification.SET, InstantiationPackage.PT_CAST_EXPRESSION__EXPRESSION, newExpression, newExpression));
- }
-
- /**
- * <!-- begin-user-doc -->
- * <!-- end-user-doc -->
- * @generated
- */
- public NotificationChain eInverseRemove(InternalEObject otherEnd, int featureID, Class baseClass, NotificationChain msgs) {
- if (featureID >= 0) {
- switch (eDerivedStructuralFeatureID(featureID, baseClass)) {
- case InstantiationPackage.PT_CAST_EXPRESSION__EXPRESSION:
- return basicSetExpression(null, msgs);
- default:
- return eDynamicInverseRemove(otherEnd, featureID, baseClass, msgs);
- }
- }
- return eBasicSetContainer(null, featureID, msgs);
- }
-
- /**
- * <!-- begin-user-doc -->
- * <!-- end-user-doc -->
- * @generated
- */
- public Object eGet(EStructuralFeature eFeature, boolean resolve) {
- switch (eDerivedStructuralFeatureID(eFeature)) {
- case InstantiationPackage.PT_CAST_EXPRESSION__TYPE:
- return getType();
- case InstantiationPackage.PT_CAST_EXPRESSION__EXPRESSION:
- return getExpression();
- }
- return eDynamicGet(eFeature, resolve);
- }
-
- /**
- * <!-- begin-user-doc -->
- * <!-- end-user-doc -->
- * @generated
- */
- public void eSet(EStructuralFeature eFeature, Object newValue) {
- switch (eDerivedStructuralFeatureID(eFeature)) {
- case InstantiationPackage.PT_CAST_EXPRESSION__TYPE:
- setType((String)newValue);
- return;
- case InstantiationPackage.PT_CAST_EXPRESSION__EXPRESSION:
- setExpression((PTExpression)newValue);
- return;
- }
- eDynamicSet(eFeature, newValue);
- }
-
- /**
- * <!-- begin-user-doc -->
- * <!-- end-user-doc -->
- * @generated
- */
- public void eUnset(EStructuralFeature eFeature) {
- switch (eDerivedStructuralFeatureID(eFeature)) {
- case InstantiationPackage.PT_CAST_EXPRESSION__TYPE:
- setType(TYPE_EDEFAULT);
- return;
- case InstantiationPackage.PT_CAST_EXPRESSION__EXPRESSION:
- setExpression((PTExpression)null);
- return;
- }
- eDynamicUnset(eFeature);
- }
-
- /**
- * <!-- begin-user-doc -->
- * <!-- end-user-doc -->
- * @generated
- */
- public boolean eIsSet(EStructuralFeature eFeature) {
- switch (eDerivedStructuralFeatureID(eFeature)) {
- case InstantiationPackage.PT_CAST_EXPRESSION__TYPE:
- return TYPE_EDEFAULT == null ? type != null : !TYPE_EDEFAULT.equals(type);
- case InstantiationPackage.PT_CAST_EXPRESSION__EXPRESSION:
- return expression != null;
- }
- return eDynamicIsSet(eFeature);
- }
-
- public String toString() {
- return super.toString(); // Really want toString to be final at PTExpression, but EMF doesn't allow it.
- }
-
- /*
- * (non-Javadoc)
- * @see org.eclipse.jem.internal.instantiation.impl.ExpressionImpl#accept0(org.eclipse.jem.internal.instantiation.ParseVisitor)
- */
- protected void accept0(ParseVisitor visitor) {
- boolean visitChildren = visitor.visit(this);
- if (visitChildren) {
- // visit children in normal left to right reading order
- acceptChild(visitor, getExpression());
- }
- visitor.endVisit(this);
- }
-} //CastImpl
diff --git a/plugins/org.eclipse.jem/javainst/org/eclipse/jem/internal/instantiation/impl/PTCharacterLiteralImpl.java b/plugins/org.eclipse.jem/javainst/org/eclipse/jem/internal/instantiation/impl/PTCharacterLiteralImpl.java
deleted file mode 100644
index fca1d25..0000000
--- a/plugins/org.eclipse.jem/javainst/org/eclipse/jem/internal/instantiation/impl/PTCharacterLiteralImpl.java
+++ /dev/null
@@ -1,376 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2004, 2005 IBM Corporation and others.
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
- *
- * Contributors:
- * IBM Corporation - initial API and implementation
- *******************************************************************************/
-package org.eclipse.jem.internal.instantiation.impl;
-/*
-
-
- */
-import org.eclipse.emf.common.notify.Notification;
-
-import org.eclipse.emf.ecore.EClass;
-import org.eclipse.emf.ecore.EStructuralFeature;
-
-import org.eclipse.emf.ecore.impl.ENotificationImpl;
-
-import org.eclipse.jem.internal.instantiation.*;
-import org.eclipse.jem.internal.instantiation.PTCharacterLiteral;
-import org.eclipse.jem.internal.instantiation.InstantiationPackage;
-
-/**
- * <!-- begin-user-doc -->
- * An implementation of the model object '<em><b>Character Literal</b></em>'.
- * <!-- end-user-doc -->
- * <p>
- * The following features are implemented:
- * <ul>
- * <li>{@link org.eclipse.jem.internal.instantiation.impl.PTCharacterLiteralImpl#getEscapedValue <em>Escaped Value</em>}</li>
- * <li>{@link org.eclipse.jem.internal.instantiation.impl.PTCharacterLiteralImpl#getCharValue <em>Char Value</em>}</li>
- * </ul>
- * </p>
- *
- * @generated
- */
-public class PTCharacterLiteralImpl extends PTExpressionImpl implements PTCharacterLiteral {
- /**
- * The default value of the '{@link #getEscapedValue() <em>Escaped Value</em>}' attribute.
- * <!-- begin-user-doc -->
- * <!-- end-user-doc -->
- * @see #getEscapedValue()
- * @generated
- * @ordered
- */
- protected static final String ESCAPED_VALUE_EDEFAULT = null;
-
- /**
- * The cached value of the '{@link #getEscapedValue() <em>Escaped Value</em>}' attribute.
- * <!-- begin-user-doc -->
- * <!-- end-user-doc -->
- * @see #getEscapedValue()
- * @generated
- * @ordered
- */
- protected String escapedValue = ESCAPED_VALUE_EDEFAULT;
-
- /**
- * The default value of the '{@link #getCharValue() <em>Char Value</em>}' attribute.
- * <!-- begin-user-doc -->
- * <!-- end-user-doc -->
- * @see #getCharValue()
- * @generated
- * @ordered
- */
- protected static final char CHAR_VALUE_EDEFAULT = '\u0000';
-
- /**
- * The cached value of the '{@link #getCharValue() <em>Char Value</em>}' attribute.
- * <!-- begin-user-doc -->
- * <!-- end-user-doc -->
- * @see #getCharValue()
- * @generated
- * @ordered
- */
- protected char charValue = CHAR_VALUE_EDEFAULT;
-
- /**
- * <!-- begin-user-doc -->
- * <!-- end-user-doc -->
- * @generated
- */
- protected PTCharacterLiteralImpl() {
- super();
- }
-
- /**
- * <!-- begin-user-doc -->
- * <!-- end-user-doc -->
- * @generated
- */
- protected EClass eStaticClass() {
- return InstantiationPackage.eINSTANCE.getPTCharacterLiteral();
- }
-
- /**
- * <!-- begin-user-doc -->
- * <!-- end-user-doc -->
- * @generated
- */
- public String getEscapedValue() {
- return escapedValue;
- }
-
- public void setEscapedValue(String newEscapedValue) {
- charValueSet = false;
- setCharValueGen(CHAR_VALUE_EDEFAULT);
- setEscapedValueGen(newEscapedValue);
- }
-
- /**
- * <!-- begin-user-doc -->
- * <!-- end-user-doc -->
- * @generated
- */
- public void setEscapedValueGen(String newEscapedValue) {
- String oldEscapedValue = escapedValue;
- escapedValue = newEscapedValue;
- if (eNotificationRequired())
- eNotify(new ENotificationImpl(this, Notification.SET, InstantiationPackage.PT_CHARACTER_LITERAL__ESCAPED_VALUE, oldEscapedValue, escapedValue));
- }
-
- private boolean charValueSet;
-
- public char getCharValue() {
- if (!charValueSet && escapedValue != ESCAPED_VALUE_EDEFAULT) {
- String s = getEscapedValue();
- int len = s.length();
- if (len < 2 || s.charAt(0) != '\'' || s.charAt(len-1) != '\'' ) {
- throw new IllegalArgumentException();
- }
- char c = s.charAt(1);
- if (c == '\'') {
- throw new IllegalArgumentException();
- }
- if (c == '\\') {
- if (len == 4) {
- setCharValueGen(getCharEscaped(s.charAt(2)));
- } else if (len == 8) {
- //handle the case of unicode.
- int currentPosition = 2;
- int c1 = 0, c2 = 0, c3 = 0, c4 = 0;
- if (s.charAt(currentPosition++) == 'u') {
- if ((c1 = Character.getNumericValue(s.charAt(currentPosition++))) > 15
- || c1 < 0
- || (c2 = Character.getNumericValue(s.charAt(currentPosition++))) > 15
- || c2 < 0
- || (c3 = Character.getNumericValue(s.charAt(currentPosition++))) > 15
- || c3 < 0
- || (c4 = Character.getNumericValue(s.charAt(currentPosition++))) > 15
- || c4 < 0){
- throw new IllegalArgumentException("illegal character literal");//$NON-NLS-1$
- } else {
- setCharValueGen((char) (((c1 * 16 + c2) * 16 + c3) * 16 + c4));
- }
- } else {
- throw new IllegalArgumentException("illegal character literal");//$NON-NLS-1$
- }
- } else {
- throw new IllegalArgumentException("illegal character literal");//$NON-NLS-1$
- }
- } else
- setCharValueGen(c);
-
- charValueSet = true;
- }
- return getCharValueGen();
- }
-
- public static char getCharEscaped(char nextChar) {
- switch(nextChar) {
- case 'b' :
- return '\b';
- case 't' :
- return '\t';
- case 'n' :
- return '\n';
- case 'f' :
- return '\f';
- case 'r' :
- return '\r';
- case '\"':
- return '\"';
- case '\'':
- return '\'';
- case '\\':
- return '\\';
- case '0' :
- return '\0';
- case '1' :
- return '\1';
- case '2' :
- return '\2';
- case '3' :
- return '\3';
- case '4' :
- return '\4';
- case '5' :
- return '\5';
- case '6' :
- return '\6';
- case '7' :
- return '\7';
- default:
- throw new IllegalArgumentException("illegal character");//$NON-NLS-1$
- }
- }
-
- /**
- * <!-- begin-user-doc -->
- * <!-- end-user-doc -->
- * @generated
- */
- public char getCharValueGen() {
- return charValue;
- }
-
- public void setCharValue(char newCharValue) {
- charValueSet = true;
- setCharValueGen(newCharValue);
-
- StringBuffer b = new StringBuffer(8);
- b.append('\''); // opening delimiter
- appendCharacter(newCharValue, b);
- b.append('\''); // closing delimiter
- setEscapedValueGen(b.toString());
- }
-
- public static void appendCharacter(char character, StringBuffer b) {
- switch(character) {
- case '\b' :
- b.append("\\b"); //$NON-NLS-1$
- break;
- case '\t' :
- b.append("\\t"); //$NON-NLS-1$
- break;
- case '\n' :
- b.append("\\n"); //$NON-NLS-1$
- break;
- case '\f' :
- b.append("\\f"); //$NON-NLS-1$
- break;
- case '\r' :
- b.append("\\r"); //$NON-NLS-1$
- break;
- case '\"':
- b.append("\\\""); //$NON-NLS-1$
- break;
- case '\'':
- b.append("\\\'"); //$NON-NLS-1$
- break;
- case '\\':
- b.append("\\\\"); //$NON-NLS-1$
- break;
- case '\0' :
- b.append("\\0"); //$NON-NLS-1$
- break;
- case '\1' :
- b.append("\\1"); //$NON-NLS-1$
- break;
- case '\2' :
- b.append("\\2"); //$NON-NLS-1$
- break;
- case '\3' :
- b.append("\\3"); //$NON-NLS-1$
- break;
- case '\4' :
- b.append("\\4"); //$NON-NLS-1$
- break;
- case '\5' :
- b.append("\\5"); //$NON-NLS-1$
- break;
- case '\6' :
- b.append("\\6"); //$NON-NLS-1$
- break;
- case '\7' :
- b.append("\\7"); //$NON-NLS-1$
- break;
- default:
- b.append(character);
- }
- }
-
- /**
- * <!-- begin-user-doc -->
- * <!-- end-user-doc -->
- * @generated
- */
- public void setCharValueGen(char newCharValue) {
- char oldCharValue = charValue;
- charValue = newCharValue;
- if (eNotificationRequired())
- eNotify(new ENotificationImpl(this, Notification.SET, InstantiationPackage.PT_CHARACTER_LITERAL__CHAR_VALUE, oldCharValue, charValue));
- }
-
- /**
- * <!-- begin-user-doc -->
- * <!-- end-user-doc -->
- * @generated
- */
- public Object eGet(EStructuralFeature eFeature, boolean resolve) {
- switch (eDerivedStructuralFeatureID(eFeature)) {
- case InstantiationPackage.PT_CHARACTER_LITERAL__ESCAPED_VALUE:
- return getEscapedValue();
- case InstantiationPackage.PT_CHARACTER_LITERAL__CHAR_VALUE:
- return new Character(getCharValue());
- }
- return eDynamicGet(eFeature, resolve);
- }
-
- /**
- * <!-- begin-user-doc -->
- * <!-- end-user-doc -->
- * @generated
- */
- public void eSet(EStructuralFeature eFeature, Object newValue) {
- switch (eDerivedStructuralFeatureID(eFeature)) {
- case InstantiationPackage.PT_CHARACTER_LITERAL__ESCAPED_VALUE:
- setEscapedValue((String)newValue);
- return;
- case InstantiationPackage.PT_CHARACTER_LITERAL__CHAR_VALUE:
- setCharValue(((Character)newValue).charValue());
- return;
- }
- eDynamicSet(eFeature, newValue);
- }
-
- /**
- * <!-- begin-user-doc -->
- * <!-- end-user-doc -->
- * @generated
- */
- public void eUnset(EStructuralFeature eFeature) {
- switch (eDerivedStructuralFeatureID(eFeature)) {
- case InstantiationPackage.PT_CHARACTER_LITERAL__ESCAPED_VALUE:
- setEscapedValue(ESCAPED_VALUE_EDEFAULT);
- return;
- case InstantiationPackage.PT_CHARACTER_LITERAL__CHAR_VALUE:
- setCharValue(CHAR_VALUE_EDEFAULT);
- return;
- }
- eDynamicUnset(eFeature);
- }
-
- /**
- * <!-- begin-user-doc -->
- * <!-- end-user-doc -->
- * @generated
- */
- public boolean eIsSet(EStructuralFeature eFeature) {
- switch (eDerivedStructuralFeatureID(eFeature)) {
- case InstantiationPackage.PT_CHARACTER_LITERAL__ESCAPED_VALUE:
- return ESCAPED_VALUE_EDEFAULT == null ? escapedValue != null : !ESCAPED_VALUE_EDEFAULT.equals(escapedValue);
- case InstantiationPackage.PT_CHARACTER_LITERAL__CHAR_VALUE:
- return charValue != CHAR_VALUE_EDEFAULT;
- }
- return eDynamicIsSet(eFeature);
- }
-
- public String toString() {
- return super.toString(); // Really want toString to be final at PTExpression, but EMF doesn't allow it.
- }
-
- /*
- * (non-Javadoc)
- * @see org.eclipse.jem.internal.instantiation.impl.ExpressionImpl#accept0(org.eclipse.jem.internal.instantiation.ParseVisitor)
- */
- protected void accept0(ParseVisitor visitor) {
- visitor.visit(this);
- visitor.endVisit(this);
- }
-} //CharacterLiteralImpl
diff --git a/plugins/org.eclipse.jem/javainst/org/eclipse/jem/internal/instantiation/impl/PTClassInstanceCreationImpl.java b/plugins/org.eclipse.jem/javainst/org/eclipse/jem/internal/instantiation/impl/PTClassInstanceCreationImpl.java
deleted file mode 100644
index 2d7d4ff..0000000
--- a/plugins/org.eclipse.jem/javainst/org/eclipse/jem/internal/instantiation/impl/PTClassInstanceCreationImpl.java
+++ /dev/null
@@ -1,231 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2004, 2005 IBM Corporation and others.
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
- *
- * Contributors:
- * IBM Corporation - initial API and implementation
- *******************************************************************************/
-package org.eclipse.jem.internal.instantiation.impl;
-/*
-
-
- */
-import java.util.Collection;
-
-import org.eclipse.emf.common.notify.Notification;
-import org.eclipse.emf.common.notify.NotificationChain;
-
-import org.eclipse.emf.common.util.EList;
-
-import org.eclipse.emf.ecore.EClass;
-import org.eclipse.emf.ecore.EStructuralFeature;
-import org.eclipse.emf.ecore.InternalEObject;
-
-import org.eclipse.emf.ecore.impl.ENotificationImpl;
-
-import org.eclipse.emf.ecore.util.EObjectContainmentEList;
-import org.eclipse.emf.ecore.util.InternalEList;
-
-import org.eclipse.jem.internal.instantiation.*;
-import org.eclipse.jem.internal.instantiation.PTClassInstanceCreation;
-import org.eclipse.jem.internal.instantiation.PTExpression;
-import org.eclipse.jem.internal.instantiation.InstantiationPackage;
-
-/**
- * <!-- begin-user-doc -->
- * An implementation of the model object '<em><b>Class Instance Creation</b></em>'.
- * <!-- end-user-doc -->
- * <p>
- * The following features are implemented:
- * <ul>
- * <li>{@link org.eclipse.jem.internal.instantiation.impl.PTClassInstanceCreationImpl#getType <em>Type</em>}</li>
- * <li>{@link org.eclipse.jem.internal.instantiation.impl.PTClassInstanceCreationImpl#getArguments <em>Arguments</em>}</li>
- * </ul>
- * </p>
- *
- * @generated
- */
-public class PTClassInstanceCreationImpl extends PTExpressionImpl implements PTClassInstanceCreation {
- /**
- * The default value of the '{@link #getType() <em>Type</em>}' attribute.
- * <!-- begin-user-doc -->
- * <!-- end-user-doc -->
- * @see #getType()
- * @generated
- * @ordered
- */
- protected static final String TYPE_EDEFAULT = null;
-
- /**
- * The cached value of the '{@link #getType() <em>Type</em>}' attribute.
- * <!-- begin-user-doc -->
- * <!-- end-user-doc -->
- * @see #getType()
- * @generated
- * @ordered
- */
- protected String type = TYPE_EDEFAULT;
-
- /**
- * The cached value of the '{@link #getArguments() <em>Arguments</em>}' containment reference list.
- * <!-- begin-user-doc -->
- * <!-- end-user-doc -->
- * @see #getArguments()
- * @generated
- * @ordered
- */
- protected EList arguments = null;
-
- /**
- * <!-- begin-user-doc -->
- * <!-- end-user-doc -->
- * @generated
- */
- protected PTClassInstanceCreationImpl() {
- super();
- }
-
- /**
- * <!-- begin-user-doc -->
- * <!-- end-user-doc -->
- * @generated
- */
- protected EClass eStaticClass() {
- return InstantiationPackage.eINSTANCE.getPTClassInstanceCreation();
- }
-
- /**
- * <!-- begin-user-doc -->
- * <!-- end-user-doc -->
- * @generated
- */
- public String getType() {
- return type;
- }
-
- /**
- * <!-- begin-user-doc -->
- * <!-- end-user-doc -->
- * @generated
- */
- public void setType(String newType) {
- String oldType = type;
- type = newType;
- if (eNotificationRequired())
- eNotify(new ENotificationImpl(this, Notification.SET, InstantiationPackage.PT_CLASS_INSTANCE_CREATION__TYPE, oldType, type));
- }
-
- /**
- * <!-- begin-user-doc -->
- * <!-- end-user-doc -->
- * @generated
- */
- public EList getArguments() {
- if (arguments == null) {
- arguments = new EObjectContainmentEList(PTExpression.class, this, InstantiationPackage.PT_CLASS_INSTANCE_CREATION__ARGUMENTS);
- }
- return arguments;
- }
-
- /**
- * <!-- begin-user-doc -->
- * <!-- end-user-doc -->
- * @generated
- */
- public NotificationChain eInverseRemove(InternalEObject otherEnd, int featureID, Class baseClass, NotificationChain msgs) {
- if (featureID >= 0) {
- switch (eDerivedStructuralFeatureID(featureID, baseClass)) {
- case InstantiationPackage.PT_CLASS_INSTANCE_CREATION__ARGUMENTS:
- return ((InternalEList)getArguments()).basicRemove(otherEnd, msgs);
- default:
- return eDynamicInverseRemove(otherEnd, featureID, baseClass, msgs);
- }
- }
- return eBasicSetContainer(null, featureID, msgs);
- }
-
- /**
- * <!-- begin-user-doc -->
- * <!-- end-user-doc -->
- * @generated
- */
- public Object eGet(EStructuralFeature eFeature, boolean resolve) {
- switch (eDerivedStructuralFeatureID(eFeature)) {
- case InstantiationPackage.PT_CLASS_INSTANCE_CREATION__TYPE:
- return getType();
- case InstantiationPackage.PT_CLASS_INSTANCE_CREATION__ARGUMENTS:
- return getArguments();
- }
- return eDynamicGet(eFeature, resolve);
- }
-
- /**
- * <!-- begin-user-doc -->
- * <!-- end-user-doc -->
- * @generated
- */
- public void eSet(EStructuralFeature eFeature, Object newValue) {
- switch (eDerivedStructuralFeatureID(eFeature)) {
- case InstantiationPackage.PT_CLASS_INSTANCE_CREATION__TYPE:
- setType((String)newValue);
- return;
- case InstantiationPackage.PT_CLASS_INSTANCE_CREATION__ARGUMENTS:
- getArguments().clear();
- getArguments().addAll((Collection)newValue);
- return;
- }
- eDynamicSet(eFeature, newValue);
- }
-
- /**
- * <!-- begin-user-doc -->
- * <!-- end-user-doc -->
- * @generated
- */
- public void eUnset(EStructuralFeature eFeature) {
- switch (eDerivedStructuralFeatureID(eFeature)) {
- case InstantiationPackage.PT_CLASS_INSTANCE_CREATION__TYPE:
- setType(TYPE_EDEFAULT);
- return;
- case InstantiationPackage.PT_CLASS_INSTANCE_CREATION__ARGUMENTS:
- getArguments().clear();
- return;
- }
- eDynamicUnset(eFeature);
- }
-
- /**
- * <!-- begin-user-doc -->
- * <!-- end-user-doc -->
- * @generated
- */
- public boolean eIsSet(EStructuralFeature eFeature) {
- switch (eDerivedStructuralFeatureID(eFeature)) {
- case InstantiationPackage.PT_CLASS_INSTANCE_CREATION__TYPE:
- return TYPE_EDEFAULT == null ? type != null : !TYPE_EDEFAULT.equals(type);
- case InstantiationPackage.PT_CLASS_INSTANCE_CREATION__ARGUMENTS:
- return arguments != null && !arguments.isEmpty();
- }
- return eDynamicIsSet(eFeature);
- }
-
- public String toString() {
- return super.toString(); // Really want toString to be final at PTExpression, but EMF doesn't allow it.
- }
-
- /*
- * (non-Javadoc)
- * @see org.eclipse.jem.internal.instantiation.impl.ExpressionImpl#accept0(org.eclipse.jem.internal.instantiation.ParseVisitor)
- */
- protected void accept0(ParseVisitor visitor) {
- boolean visitChildren = visitor.visit(this);
- if (visitChildren) {
- // visit children in normal left to right reading order
- acceptChildren(visitor, arguments);
- }
- visitor.endVisit(this);
- }
-} //ClassInstanceCreationImpl
diff --git a/plugins/org.eclipse.jem/javainst/org/eclipse/jem/internal/instantiation/impl/PTConditionalExpressionImpl.java b/plugins/org.eclipse.jem/javainst/org/eclipse/jem/internal/instantiation/impl/PTConditionalExpressionImpl.java
deleted file mode 100644
index 8933186..0000000
--- a/plugins/org.eclipse.jem/javainst/org/eclipse/jem/internal/instantiation/impl/PTConditionalExpressionImpl.java
+++ /dev/null
@@ -1,333 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2004, 2005 IBM Corporation and others.
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
- *
- * Contributors:
- * IBM Corporation - initial API and implementation
- *******************************************************************************/
-package org.eclipse.jem.internal.instantiation.impl;
-/*
-
-
- */
-import org.eclipse.emf.common.notify.Notification;
-import org.eclipse.emf.common.notify.NotificationChain;
-
-import org.eclipse.emf.ecore.EClass;
-import org.eclipse.emf.ecore.EStructuralFeature;
-import org.eclipse.emf.ecore.InternalEObject;
-
-import org.eclipse.emf.ecore.impl.ENotificationImpl;
-
-import org.eclipse.jem.internal.instantiation.*;
-import org.eclipse.jem.internal.instantiation.PTConditionalExpression;
-import org.eclipse.jem.internal.instantiation.PTExpression;
-import org.eclipse.jem.internal.instantiation.InstantiationPackage;
-
-/**
- * <!-- begin-user-doc -->
- * An implementation of the model object '<em><b>Conditional Expression</b></em>'.
- * <!-- end-user-doc -->
- * <p>
- * The following features are implemented:
- * <ul>
- * <li>{@link org.eclipse.jem.internal.instantiation.impl.PTConditionalExpressionImpl#getCondition <em>Condition</em>}</li>
- * <li>{@link org.eclipse.jem.internal.instantiation.impl.PTConditionalExpressionImpl#getTrue <em>True</em>}</li>
- * <li>{@link org.eclipse.jem.internal.instantiation.impl.PTConditionalExpressionImpl#getFalse <em>False</em>}</li>
- * </ul>
- * </p>
- *
- * @generated
- */
-public class PTConditionalExpressionImpl extends PTExpressionImpl implements PTConditionalExpression {
- /**
- * The cached value of the '{@link #getCondition() <em>Condition</em>}' containment reference.
- * <!-- begin-user-doc -->
- * <!-- end-user-doc -->
- * @see #getCondition()
- * @generated
- * @ordered
- */
- protected PTExpression condition = null;
-
- /**
- * The cached value of the '{@link #getTrue() <em>True</em>}' containment reference.
- * <!-- begin-user-doc -->
- * <!-- end-user-doc -->
- * @see #getTrue()
- * @generated
- * @ordered
- */
- protected PTExpression true_ = null;
-
- /**
- * The cached value of the '{@link #getFalse() <em>False</em>}' containment reference.
- * <!-- begin-user-doc -->
- * <!-- end-user-doc -->
- * @see #getFalse()
- * @generated
- * @ordered
- */
- protected PTExpression false_ = null;
-
- /**
- * <!-- begin-user-doc -->
- * <!-- end-user-doc -->
- * @generated
- */
- protected PTConditionalExpressionImpl() {
- super();
- }
-
- /**
- * <!-- begin-user-doc -->
- * <!-- end-user-doc -->
- * @generated
- */
- protected EClass eStaticClass() {
- return InstantiationPackage.eINSTANCE.getPTConditionalExpression();
- }
-
- /**
- * <!-- begin-user-doc -->
- * <!-- end-user-doc -->
- * @generated
- */
- public PTExpression getCondition() {
- return condition;
- }
-
- /**
- * <!-- begin-user-doc -->
- * <!-- end-user-doc -->
- * @generated
- */
- public NotificationChain basicSetCondition(PTExpression newCondition, NotificationChain msgs) {
- PTExpression oldCondition = condition;
- condition = newCondition;
- if (eNotificationRequired()) {
- ENotificationImpl notification = new ENotificationImpl(this, Notification.SET, InstantiationPackage.PT_CONDITIONAL_EXPRESSION__CONDITION, oldCondition, newCondition);
- if (msgs == null) msgs = notification; else msgs.add(notification);
- }
- return msgs;
- }
-
- /**
- * <!-- begin-user-doc -->
- * <!-- end-user-doc -->
- * @generated
- */
- public void setCondition(PTExpression newCondition) {
- if (newCondition != condition) {
- NotificationChain msgs = null;
- if (condition != null)
- msgs = ((InternalEObject)condition).eInverseRemove(this, EOPPOSITE_FEATURE_BASE - InstantiationPackage.PT_CONDITIONAL_EXPRESSION__CONDITION, null, msgs);
- if (newCondition != null)
- msgs = ((InternalEObject)newCondition).eInverseAdd(this, EOPPOSITE_FEATURE_BASE - InstantiationPackage.PT_CONDITIONAL_EXPRESSION__CONDITION, null, msgs);
- msgs = basicSetCondition(newCondition, msgs);
- if (msgs != null) msgs.dispatch();
- }
- else if (eNotificationRequired())
- eNotify(new ENotificationImpl(this, Notification.SET, InstantiationPackage.PT_CONDITIONAL_EXPRESSION__CONDITION, newCondition, newCondition));
- }
-
- /**
- * <!-- begin-user-doc -->
- * <!-- end-user-doc -->
- * @generated
- */
- public PTExpression getTrue() {
- return true_;
- }
-
- /**
- * <!-- begin-user-doc -->
- * <!-- end-user-doc -->
- * @generated
- */
- public NotificationChain basicSetTrue(PTExpression newTrue, NotificationChain msgs) {
- PTExpression oldTrue = true_;
- true_ = newTrue;
- if (eNotificationRequired()) {
- ENotificationImpl notification = new ENotificationImpl(this, Notification.SET, InstantiationPackage.PT_CONDITIONAL_EXPRESSION__TRUE, oldTrue, newTrue);
- if (msgs == null) msgs = notification; else msgs.add(notification);
- }
- return msgs;
- }
-
- /**
- * <!-- begin-user-doc -->
- * <!-- end-user-doc -->
- * @generated
- */
- public void setTrue(PTExpression newTrue) {
- if (newTrue != true_) {
- NotificationChain msgs = null;
- if (true_ != null)
- msgs = ((InternalEObject)true_).eInverseRemove(this, EOPPOSITE_FEATURE_BASE - InstantiationPackage.PT_CONDITIONAL_EXPRESSION__TRUE, null, msgs);
- if (newTrue != null)
- msgs = ((InternalEObject)newTrue).eInverseAdd(this, EOPPOSITE_FEATURE_BASE - InstantiationPackage.PT_CONDITIONAL_EXPRESSION__TRUE, null, msgs);
- msgs = basicSetTrue(newTrue, msgs);
- if (msgs != null) msgs.dispatch();
- }
- else if (eNotificationRequired())
- eNotify(new ENotificationImpl(this, Notification.SET, InstantiationPackage.PT_CONDITIONAL_EXPRESSION__TRUE, newTrue, newTrue));
- }
-
- /**
- * <!-- begin-user-doc -->
- * <!-- end-user-doc -->
- * @generated
- */
- public PTExpression getFalse() {
- return false_;
- }
-
- /**
- * <!-- begin-user-doc -->
- * <!-- end-user-doc -->
- * @generated
- */
- public NotificationChain basicSetFalse(PTExpression newFalse, NotificationChain msgs) {
- PTExpression oldFalse = false_;
- false_ = newFalse;
- if (eNotificationRequired()) {
- ENotificationImpl notification = new ENotificationImpl(this, Notification.SET, InstantiationPackage.PT_CONDITIONAL_EXPRESSION__FALSE, oldFalse, newFalse);
- if (msgs == null) msgs = notification; else msgs.add(notification);
- }
- return msgs;
- }
-
- /**
- * <!-- begin-user-doc -->
- * <!-- end-user-doc -->
- * @generated
- */
- public void setFalse(PTExpression newFalse) {
- if (newFalse != false_) {
- NotificationChain msgs = null;
- if (false_ != null)
- msgs = ((InternalEObject)false_).eInverseRemove(this, EOPPOSITE_FEATURE_BASE - InstantiationPackage.PT_CONDITIONAL_EXPRESSION__FALSE, null, msgs);
- if (newFalse != null)
- msgs = ((InternalEObject)newFalse).eInverseAdd(this, EOPPOSITE_FEATURE_BASE - InstantiationPackage.PT_CONDITIONAL_EXPRESSION__FALSE, null, msgs);
- msgs = basicSetFalse(newFalse, msgs);
- if (msgs != null) msgs.dispatch();
- }
- else if (eNotificationRequired())
- eNotify(new ENotificationImpl(this, Notification.SET, InstantiationPackage.PT_CONDITIONAL_EXPRESSION__FALSE, newFalse, newFalse));
- }
-
- /**
- * <!-- begin-user-doc -->
- * <!-- end-user-doc -->
- * @generated
- */
- public NotificationChain eInverseRemove(InternalEObject otherEnd, int featureID, Class baseClass, NotificationChain msgs) {
- if (featureID >= 0) {
- switch (eDerivedStructuralFeatureID(featureID, baseClass)) {
- case InstantiationPackage.PT_CONDITIONAL_EXPRESSION__CONDITION:
- return basicSetCondition(null, msgs);
- case InstantiationPackage.PT_CONDITIONAL_EXPRESSION__TRUE:
- return basicSetTrue(null, msgs);
- case InstantiationPackage.PT_CONDITIONAL_EXPRESSION__FALSE:
- return basicSetFalse(null, msgs);
- default:
- return eDynamicInverseRemove(otherEnd, featureID, baseClass, msgs);
- }
- }
- return eBasicSetContainer(null, featureID, msgs);
- }
-
- /**
- * <!-- begin-user-doc -->
- * <!-- end-user-doc -->
- * @generated
- */
- public Object eGet(EStructuralFeature eFeature, boolean resolve) {
- switch (eDerivedStructuralFeatureID(eFeature)) {
- case InstantiationPackage.PT_CONDITIONAL_EXPRESSION__CONDITION:
- return getCondition();
- case InstantiationPackage.PT_CONDITIONAL_EXPRESSION__TRUE:
- return getTrue();
- case InstantiationPackage.PT_CONDITIONAL_EXPRESSION__FALSE:
- return getFalse();
- }
- return eDynamicGet(eFeature, resolve);
- }
-
- /**
- * <!-- begin-user-doc -->
- * <!-- end-user-doc -->
- * @generated
- */
- public void eSet(EStructuralFeature eFeature, Object newValue) {
- switch (eDerivedStructuralFeatureID(eFeature)) {
- case InstantiationPackage.PT_CONDITIONAL_EXPRESSION__CONDITION:
- setCondition((PTExpression)newValue);
- return;
- case InstantiationPackage.PT_CONDITIONAL_EXPRESSION__TRUE:
- setTrue((PTExpression)newValue);
- return;
- case InstantiationPackage.PT_CONDITIONAL_EXPRESSION__FALSE:
- setFalse((PTExpression)newValue);
- return;
- }
- eDynamicSet(eFeature, newValue);
- }
-
- /**
- * <!-- begin-user-doc -->
- * <!-- end-user-doc -->
- * @generated
- */
- public void eUnset(EStructuralFeature eFeature) {
- switch (eDerivedStructuralFeatureID(eFeature)) {
- case InstantiationPackage.PT_CONDITIONAL_EXPRESSION__CONDITION:
- setCondition((PTExpression)null);
- return;
- case InstantiationPackage.PT_CONDITIONAL_EXPRESSION__TRUE:
- setTrue((PTExpression)null);
- return;
- case InstantiationPackage.PT_CONDITIONAL_EXPRESSION__FALSE:
- setFalse((PTExpression)null);
- return;
- }
- eDynamicUnset(eFeature);
- }
-
- /**
- * <!-- begin-user-doc -->
- * <!-- end-user-doc -->
- * @generated
- */
- public boolean eIsSet(EStructuralFeature eFeature) {
- switch (eDerivedStructuralFeatureID(eFeature)) {
- case InstantiationPackage.PT_CONDITIONAL_EXPRESSION__CONDITION:
- return condition != null;
- case InstantiationPackage.PT_CONDITIONAL_EXPRESSION__TRUE:
- return true_ != null;
- case InstantiationPackage.PT_CONDITIONAL_EXPRESSION__FALSE:
- return false_ != null;
- }
- return eDynamicIsSet(eFeature);
- }
-
- /*
- * (non-Javadoc)
- * @see org.eclipse.jem.internal.instantiation.impl.ExpressionImpl#accept0(org.eclipse.jem.internal.instantiation.ParseVisitor)
- */
- protected void accept0(ParseVisitor visitor) {
- boolean visitChildren = visitor.visit(this);
- if (visitChildren) {
- // visit children in normal left to right reading order
- acceptChild(visitor, getCondition());
- acceptChild(visitor, getTrue());
- acceptChild(visitor, getFalse());
- }
- visitor.endVisit(this);
- }
-
-} //ConditionalExpressionImpl
diff --git a/plugins/org.eclipse.jem/javainst/org/eclipse/jem/internal/instantiation/impl/PTExpressionImpl.java b/plugins/org.eclipse.jem/javainst/org/eclipse/jem/internal/instantiation/impl/PTExpressionImpl.java
deleted file mode 100644
index d2b123c..0000000
--- a/plugins/org.eclipse.jem/javainst/org/eclipse/jem/internal/instantiation/impl/PTExpressionImpl.java
+++ /dev/null
@@ -1,184 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2004, 2005 IBM Corporation and others.
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
- *
- * Contributors:
- * IBM Corporation - initial API and implementation
- *******************************************************************************/
-package org.eclipse.jem.internal.instantiation.impl;
-/*
-
-
- */
-import java.util.List;
-
-import org.eclipse.emf.ecore.EClass;
-
-import org.eclipse.emf.ecore.impl.EObjectImpl;
-
-import org.eclipse.jem.internal.instantiation.*;
-import org.eclipse.jem.internal.instantiation.PTExpression;
-import org.eclipse.jem.internal.instantiation.InstantiationPackage;
-
-/**
- * <!-- begin-user-doc -->
- * An implementation of the model object '<em><b>Expression</b></em>'.
- * <!-- end-user-doc -->
- * <p>
- * </p>
- *
- * @generated
- */
-public abstract class PTExpressionImpl extends EObjectImpl implements PTExpression {
- /**
- * <!-- begin-user-doc -->
- * <!-- end-user-doc -->
- * @generated
- */
- protected PTExpressionImpl() {
- super();
- }
-
- /**
- * <!-- begin-user-doc -->
- * <!-- end-user-doc -->
- * @generated
- */
- protected EClass eStaticClass() {
- return InstantiationPackage.eINSTANCE.getPTExpression();
- }
-
- /*
- * (non-Javadoc)
- * @see org.eclipse.jem.internal.instantiation.Expression#accept(org.eclipse.jem.internal.instantiation.ParseVisitor)
- */
- public final void accept(ParseVisitor visitor) {
- try {
- childAccept0(visitor);
- } catch (ParseVisitor.StopVisiting e) {
- // Do nothing, this is a normal way to just stop visiting.
- }
- }
-
- /**
- * Accepts the given visitor on a type-specific visit of the current node.
- * This method must be implemented in all concrete Expression node types.
- * <p>
- * General template for implementation on each concrete ASTNode class:
- * <pre>
- * <code>
- * boolean visitChildren = visitor.visit(this);
- * if (visitChildren) {
- * // visit children in normal left to right reading order
- * acceptChild(visitor, getProperty1());
- * acceptChildren(visitor, rawListProperty);
- * acceptChild(visitor, getProperty2());
- * }
- * visitor.endVisit(this);
- * </code>
- * </pre>
- * Note that the caller (<code>accept</code>) take cares of invoking
- * <code>visitor.preVisit(this)</code> and <code>visitor.postVisit(this)</code>.
- * </p>
- *
- * @param visitor the visitor object
- */
- protected abstract void accept0(ParseVisitor visitor);
-
- /**
- * Accepts the given visitor on a visit of the current node.
- * <p>
- * This method should be used by the concrete implementations of
- * <code>accept0</code> to traverse optional properties. Equivalent
- * to <code>child.accept(visitor)</code> if <code>child</code>
- * is not <code>null</code>.
- * </p>
- *
- * @param visitor the visitor object
- * @param child the child Expression node to dispatch too, or <code>null</code>
- * if none. It actually must be an instance of PTExpressionImpl, but
- * it would be too difficult to put the cast in each call to acceptChild.
- */
- protected final void acceptChild(ParseVisitor visitor, PTExpression child) {
- if (child == null) {
- return;
- }
- ((PTExpressionImpl) child).childAccept0(visitor);
- }
-
- /**
- * Called ONLY by PTExpressionImpl for the child to accept the visitor, but
- * it doesn't catch StopVisiting.
- * @param visitor
- *
- * @since 1.1.0.1
- */
- protected final void childAccept0(ParseVisitor visitor) {
- if (visitor == null) {
- throw new IllegalArgumentException();
- }
- // begin with the generic pre-visit
- visitor.preVisit(this);
- // dynamic dispatch to internal method for type-specific visit/endVisit
- accept0(visitor);
- // end with the generic post-visit
- visitor.postVisit(this);
- }
-
- /**
- * Accepts the given visitor on a visit of the given live list of
- * child nodes.
- * @param visitor the visitor object
- * @param children the child Expression nodes to dispatch to, or <code>null</code> if none.
- */
- protected final void acceptChildren(ParseVisitor visitor, List children) {
- if (children != null) {
- int size = children.size();
- for (int i = 0; i < size; i++) {
- acceptChild(visitor, (PTExpression) children.get(i));
- }
- }
- }
-
- public String toString() {
- // allocate a buffer that is large enough to hold an average compilation unit
- StringBuffer buffer = new StringBuffer(6000);
- int p = buffer.length();
- try {
- appendDebugString(buffer);
- } catch (RuntimeException e) {
- // since debugger sometimes call toString methods, problems can easily happen when
- // toString is called on an instance that is being initialized
- buffer.setLength(p);
- buffer.append("!"); //$NON-NLS-1$
- buffer.append(standardToString());
- }
- // convert to a string, but lose the extra space in the string buffer by copying
- return buffer.toString();
- }
-
- protected final String standardToString() {
- return super.toString();
- }
-
- protected void appendDebugString(StringBuffer buffer) {
- // print the subtree by default
- appendPrintString(buffer);
- }
-
- /*
- * Appends a standard Java source code representation of this subtree to the given
- * string buffer.
- *
- * @param buffer the string buffer to append to
- */
- protected final void appendPrintString(StringBuffer buffer) {
- NaiveExpressionFlattener printer = new NaiveExpressionFlattener();
- this.accept(printer);
- buffer.append(printer.getResult());
- }
-
-} //ExpressionImpl
diff --git a/plugins/org.eclipse.jem/javainst/org/eclipse/jem/internal/instantiation/impl/PTFieldAccessImpl.java b/plugins/org.eclipse.jem/javainst/org/eclipse/jem/internal/instantiation/impl/PTFieldAccessImpl.java
deleted file mode 100644
index 96114e1..0000000
--- a/plugins/org.eclipse.jem/javainst/org/eclipse/jem/internal/instantiation/impl/PTFieldAccessImpl.java
+++ /dev/null
@@ -1,255 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2004, 2005 IBM Corporation and others.
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
- *
- * Contributors:
- * IBM Corporation - initial API and implementation
- *******************************************************************************/
-package org.eclipse.jem.internal.instantiation.impl;
-/*
-
-
- */
-import org.eclipse.emf.common.notify.Notification;
-import org.eclipse.emf.common.notify.NotificationChain;
-
-import org.eclipse.emf.ecore.EClass;
-import org.eclipse.emf.ecore.EStructuralFeature;
-import org.eclipse.emf.ecore.InternalEObject;
-
-import org.eclipse.emf.ecore.impl.ENotificationImpl;
-
-import org.eclipse.jem.internal.instantiation.*;
-import org.eclipse.jem.internal.instantiation.PTExpression;
-import org.eclipse.jem.internal.instantiation.PTFieldAccess;
-import org.eclipse.jem.internal.instantiation.InstantiationPackage;
-
-/**
- * <!-- begin-user-doc -->
- * An implementation of the model object '<em><b>Field Access</b></em>'.
- * <!-- end-user-doc -->
- * <p>
- * The following features are implemented:
- * <ul>
- * <li>{@link org.eclipse.jem.internal.instantiation.impl.PTFieldAccessImpl#getReceiver <em>Receiver</em>}</li>
- * <li>{@link org.eclipse.jem.internal.instantiation.impl.PTFieldAccessImpl#getField <em>Field</em>}</li>
- * </ul>
- * </p>
- *
- * @generated
- */
-public class PTFieldAccessImpl extends PTExpressionImpl implements PTFieldAccess {
- /**
- * The cached value of the '{@link #getReceiver() <em>Receiver</em>}' containment reference.
- * <!-- begin-user-doc -->
- * <!-- end-user-doc -->
- * @see #getReceiver()
- * @generated
- * @ordered
- */
- protected PTExpression receiver = null;
-
- /**
- * The default value of the '{@link #getField() <em>Field</em>}' attribute.
- * <!-- begin-user-doc -->
- * <!-- end-user-doc -->
- * @see #getField()
- * @generated
- * @ordered
- */
- protected static final String FIELD_EDEFAULT = null;
-
- /**
- * The cached value of the '{@link #getField() <em>Field</em>}' attribute.
- * <!-- begin-user-doc -->
- * <!-- end-user-doc -->
- * @see #getField()
- * @generated
- * @ordered
- */
- protected String field = FIELD_EDEFAULT;
-
- /**
- * <!-- begin-user-doc -->
- * <!-- end-user-doc -->
- * @generated
- */
- protected PTFieldAccessImpl() {
- super();
- }
-
- /**
- * <!-- begin-user-doc -->
- * <!-- end-user-doc -->
- * @generated
- */
- protected EClass eStaticClass() {
- return InstantiationPackage.eINSTANCE.getPTFieldAccess();
- }
-
- /**
- * <!-- begin-user-doc -->
- * <!-- end-user-doc -->
- * @generated
- */
- public PTExpression getReceiver() {
- return receiver;
- }
-
- /**
- * <!-- begin-user-doc -->
- * <!-- end-user-doc -->
- * @generated
- */
- public NotificationChain basicSetReceiver(PTExpression newReceiver, NotificationChain msgs) {
- PTExpression oldReceiver = receiver;
- receiver = newReceiver;
- if (eNotificationRequired()) {
- ENotificationImpl notification = new ENotificationImpl(this, Notification.SET, InstantiationPackage.PT_FIELD_ACCESS__RECEIVER, oldReceiver, newReceiver);
- if (msgs == null) msgs = notification; else msgs.add(notification);
- }
- return msgs;
- }
-
- /**
- * <!-- begin-user-doc -->
- * <!-- end-user-doc -->
- * @generated
- */
- public void setReceiver(PTExpression newReceiver) {
- if (newReceiver != receiver) {
- NotificationChain msgs = null;
- if (receiver != null)
- msgs = ((InternalEObject)receiver).eInverseRemove(this, EOPPOSITE_FEATURE_BASE - InstantiationPackage.PT_FIELD_ACCESS__RECEIVER, null, msgs);
- if (newReceiver != null)
- msgs = ((InternalEObject)newReceiver).eInverseAdd(this, EOPPOSITE_FEATURE_BASE - InstantiationPackage.PT_FIELD_ACCESS__RECEIVER, null, msgs);
- msgs = basicSetReceiver(newReceiver, msgs);
- if (msgs != null) msgs.dispatch();
- }
- else if (eNotificationRequired())
- eNotify(new ENotificationImpl(this, Notification.SET, InstantiationPackage.PT_FIELD_ACCESS__RECEIVER, newReceiver, newReceiver));
- }
-
- /**
- * <!-- begin-user-doc -->
- * <!-- end-user-doc -->
- * @generated
- */
- public String getField() {
- return field;
- }
-
- /**
- * <!-- begin-user-doc -->
- * <!-- end-user-doc -->
- * @generated
- */
- public void setField(String newField) {
- String oldField = field;
- field = newField;
- if (eNotificationRequired())
- eNotify(new ENotificationImpl(this, Notification.SET, InstantiationPackage.PT_FIELD_ACCESS__FIELD, oldField, field));
- }
-
- /**
- * <!-- begin-user-doc -->
- * <!-- end-user-doc -->
- * @generated
- */
- public NotificationChain eInverseRemove(InternalEObject otherEnd, int featureID, Class baseClass, NotificationChain msgs) {
- if (featureID >= 0) {
- switch (eDerivedStructuralFeatureID(featureID, baseClass)) {
- case InstantiationPackage.PT_FIELD_ACCESS__RECEIVER:
- return basicSetReceiver(null, msgs);
- default:
- return eDynamicInverseRemove(otherEnd, featureID, baseClass, msgs);
- }
- }
- return eBasicSetContainer(null, featureID, msgs);
- }
-
- /**
- * <!-- begin-user-doc -->
- * <!-- end-user-doc -->
- * @generated
- */
- public Object eGet(EStructuralFeature eFeature, boolean resolve) {
- switch (eDerivedStructuralFeatureID(eFeature)) {
- case InstantiationPackage.PT_FIELD_ACCESS__RECEIVER:
- return getReceiver();
- case InstantiationPackage.PT_FIELD_ACCESS__FIELD:
- return getField();
- }
- return eDynamicGet(eFeature, resolve);
- }
-
- /**
- * <!-- begin-user-doc -->
- * <!-- end-user-doc -->
- * @generated
- */
- public void eSet(EStructuralFeature eFeature, Object newValue) {
- switch (eDerivedStructuralFeatureID(eFeature)) {
- case InstantiationPackage.PT_FIELD_ACCESS__RECEIVER:
- setReceiver((PTExpression)newValue);
- return;
- case InstantiationPackage.PT_FIELD_ACCESS__FIELD:
- setField((String)newValue);
- return;
- }
- eDynamicSet(eFeature, newValue);
- }
-
- /**
- * <!-- begin-user-doc -->
- * <!-- end-user-doc -->
- * @generated
- */
- public void eUnset(EStructuralFeature eFeature) {
- switch (eDerivedStructuralFeatureID(eFeature)) {
- case InstantiationPackage.PT_FIELD_ACCESS__RECEIVER:
- setReceiver((PTExpression)null);
- return;
- case InstantiationPackage.PT_FIELD_ACCESS__FIELD:
- setField(FIELD_EDEFAULT);
- return;
- }
- eDynamicUnset(eFeature);
- }
-
- /**
- * <!-- begin-user-doc -->
- * <!-- end-user-doc -->
- * @generated
- */
- public boolean eIsSet(EStructuralFeature eFeature) {
- switch (eDerivedStructuralFeatureID(eFeature)) {
- case InstantiationPackage.PT_FIELD_ACCESS__RECEIVER:
- return receiver != null;
- case InstantiationPackage.PT_FIELD_ACCESS__FIELD:
- return FIELD_EDEFAULT == null ? field != null : !FIELD_EDEFAULT.equals(field);
- }
- return eDynamicIsSet(eFeature);
- }
-
- public String toString() {
- return super.toString(); // Really want toString to be final at PTExpression, but EMF doesn't allow it.
- }
-
- /*
- * (non-Javadoc)
- * @see org.eclipse.jem.internal.instantiation.impl.ExpressionImpl#accept0(org.eclipse.jem.internal.instantiation.ParseVisitor)
- */
- protected void accept0(ParseVisitor visitor) {
- boolean visitChildren = visitor.visit(this);
- if (visitChildren) {
- // visit children in normal left to right reading order
- acceptChild(visitor, getReceiver());
- }
- visitor.endVisit(this);
- }
-
-} //FieldAccessImpl
diff --git a/plugins/org.eclipse.jem/javainst/org/eclipse/jem/internal/instantiation/impl/PTInfixExpressionImpl.java b/plugins/org.eclipse.jem/javainst/org/eclipse/jem/internal/instantiation/impl/PTInfixExpressionImpl.java
deleted file mode 100644
index c5e6d24..0000000
--- a/plugins/org.eclipse.jem/javainst/org/eclipse/jem/internal/instantiation/impl/PTInfixExpressionImpl.java
+++ /dev/null
@@ -1,394 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2004, 2005 IBM Corporation and others.
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
- *
- * Contributors:
- * IBM Corporation - initial API and implementation
- *******************************************************************************/
-package org.eclipse.jem.internal.instantiation.impl;
-/*
-
-
- */
-import java.util.Collection;
-
-import org.eclipse.emf.common.notify.Notification;
-import org.eclipse.emf.common.notify.NotificationChain;
-
-import org.eclipse.emf.common.util.EList;
-
-import org.eclipse.emf.ecore.EClass;
-import org.eclipse.emf.ecore.EStructuralFeature;
-import org.eclipse.emf.ecore.InternalEObject;
-
-import org.eclipse.emf.ecore.impl.ENotificationImpl;
-
-import org.eclipse.emf.ecore.util.EObjectContainmentEList;
-import org.eclipse.emf.ecore.util.InternalEList;
-
-import org.eclipse.jem.internal.instantiation.*;
-import org.eclipse.jem.internal.instantiation.PTExpression;
-import org.eclipse.jem.internal.instantiation.PTInfixExpression;
-import org.eclipse.jem.internal.instantiation.PTInfixOperator;
-import org.eclipse.jem.internal.instantiation.InstantiationPackage;
-
-/**
- * <!-- begin-user-doc -->
- * An implementation of the model object '<em><b>Infix Expression</b></em>'.
- * <!-- end-user-doc -->
- * <p>
- * The following features are implemented:
- * <ul>
- * <li>{@link org.eclipse.jem.internal.instantiation.impl.PTInfixExpressionImpl#getLeftOperand <em>Left Operand</em>}</li>
- * <li>{@link org.eclipse.jem.internal.instantiation.impl.PTInfixExpressionImpl#getOperator <em>Operator</em>}</li>
- * <li>{@link org.eclipse.jem.internal.instantiation.impl.PTInfixExpressionImpl#getRightOperand <em>Right Operand</em>}</li>
- * <li>{@link org.eclipse.jem.internal.instantiation.impl.PTInfixExpressionImpl#getExtendedOperands <em>Extended Operands</em>}</li>
- * </ul>
- * </p>
- *
- * @generated
- */
-public class PTInfixExpressionImpl extends PTExpressionImpl implements PTInfixExpression {
- /**
- * The cached value of the '{@link #getLeftOperand() <em>Left Operand</em>}' containment reference.
- * <!-- begin-user-doc -->
- * <!-- end-user-doc -->
- * @see #getLeftOperand()
- * @generated
- * @ordered
- */
- protected PTExpression leftOperand = null;
-
- /**
- * The default value of the '{@link #getOperator() <em>Operator</em>}' attribute.
- * <!-- begin-user-doc -->
- * <!-- end-user-doc -->
- * @see #getOperator()
- * @generated
- * @ordered
- */
- protected static final PTInfixOperator OPERATOR_EDEFAULT = PTInfixOperator.TIMES_LITERAL;
-
- /**
- * The cached value of the '{@link #getOperator() <em>Operator</em>}' attribute.
- * <!-- begin-user-doc -->
- * <!-- end-user-doc -->
- * @see #getOperator()
- * @generated
- * @ordered
- */
- protected PTInfixOperator operator = OPERATOR_EDEFAULT;
-
- /**
- * The cached value of the '{@link #getRightOperand() <em>Right Operand</em>}' containment reference.
- * <!-- begin-user-doc -->
- * <!-- end-user-doc -->
- * @see #getRightOperand()
- * @generated
- * @ordered
- */
- protected PTExpression rightOperand = null;
-
- /**
- * The cached value of the '{@link #getExtendedOperands() <em>Extended Operands</em>}' containment reference list.
- * <!-- begin-user-doc -->
- * <!-- end-user-doc -->
- * @see #getExtendedOperands()
- * @generated
- * @ordered
- */
- protected EList extendedOperands = null;
-
- /**
- * <!-- begin-user-doc -->
- * <!-- end-user-doc -->
- * @generated
- */
- protected PTInfixExpressionImpl() {
- super();
- }
-
- /**
- * <!-- begin-user-doc -->
- * <!-- end-user-doc -->
- * @generated
- */
- protected EClass eStaticClass() {
- return InstantiationPackage.eINSTANCE.getPTInfixExpression();
- }
-
- /**
- * <!-- begin-user-doc -->
- * <!-- end-user-doc -->
- * @generated
- */
- public PTExpression getLeftOperand() {
- return leftOperand;
- }
-
- /**
- * <!-- begin-user-doc -->
- * <!-- end-user-doc -->
- * @generated
- */
- public NotificationChain basicSetLeftOperand(PTExpression newLeftOperand, NotificationChain msgs) {
- PTExpression oldLeftOperand = leftOperand;
- leftOperand = newLeftOperand;
- if (eNotificationRequired()) {
- ENotificationImpl notification = new ENotificationImpl(this, Notification.SET, InstantiationPackage.PT_INFIX_EXPRESSION__LEFT_OPERAND, oldLeftOperand, newLeftOperand);
- if (msgs == null) msgs = notification; else msgs.add(notification);
- }
- return msgs;
- }
-
- /**
- * <!-- begin-user-doc -->
- * <!-- end-user-doc -->
- * @generated
- */
- public void setLeftOperand(PTExpression newLeftOperand) {
- if (newLeftOperand != leftOperand) {
- NotificationChain msgs = null;
- if (leftOperand != null)
- msgs = ((InternalEObject)leftOperand).eInverseRemove(this, EOPPOSITE_FEATURE_BASE - InstantiationPackage.PT_INFIX_EXPRESSION__LEFT_OPERAND, null, msgs);
- if (newLeftOperand != null)
- msgs = ((InternalEObject)newLeftOperand).eInverseAdd(this, EOPPOSITE_FEATURE_BASE - InstantiationPackage.PT_INFIX_EXPRESSION__LEFT_OPERAND, null, msgs);
- msgs = basicSetLeftOperand(newLeftOperand, msgs);
- if (msgs != null) msgs.dispatch();
- }
- else if (eNotificationRequired())
- eNotify(new ENotificationImpl(this, Notification.SET, InstantiationPackage.PT_INFIX_EXPRESSION__LEFT_OPERAND, newLeftOperand, newLeftOperand));
- }
-
- /**
- * <!-- begin-user-doc -->
- * <!-- end-user-doc -->
- * @generated
- */
- public PTInfixOperator getOperator() {
- return operator;
- }
-
- /**
- * <!-- begin-user-doc -->
- * <!-- end-user-doc -->
- * @generated
- */
- public void setOperator(PTInfixOperator newOperator) {
- PTInfixOperator oldOperator = operator;
- operator = newOperator == null ? OPERATOR_EDEFAULT : newOperator;
- if (eNotificationRequired())
- eNotify(new ENotificationImpl(this, Notification.SET, InstantiationPackage.PT_INFIX_EXPRESSION__OPERATOR, oldOperator, operator));
- }
-
- /**
- * <!-- begin-user-doc -->
- * <!-- end-user-doc -->
- * @generated
- */
- public PTExpression getRightOperand() {
- return rightOperand;
- }
-
- /**
- * <!-- begin-user-doc -->
- * <!-- end-user-doc -->
- * @generated
- */
- public NotificationChain basicSetRightOperand(PTExpression newRightOperand, NotificationChain msgs) {
- PTExpression oldRightOperand = rightOperand;
- rightOperand = newRightOperand;
- if (eNotificationRequired()) {
- ENotificationImpl notification = new ENotificationImpl(this, Notification.SET, InstantiationPackage.PT_INFIX_EXPRESSION__RIGHT_OPERAND, oldRightOperand, newRightOperand);
- if (msgs == null) msgs = notification; else msgs.add(notification);
- }
- return msgs;
- }
-
- /**
- * <!-- begin-user-doc -->
- * <!-- end-user-doc -->
- * @generated
- */
- public void setRightOperand(PTExpression newRightOperand) {
- if (newRightOperand != rightOperand) {
- NotificationChain msgs = null;
- if (rightOperand != null)
- msgs = ((InternalEObject)rightOperand).eInverseRemove(this, EOPPOSITE_FEATURE_BASE - InstantiationPackage.PT_INFIX_EXPRESSION__RIGHT_OPERAND, null, msgs);
- if (newRightOperand != null)
- msgs = ((InternalEObject)newRightOperand).eInverseAdd(this, EOPPOSITE_FEATURE_BASE - InstantiationPackage.PT_INFIX_EXPRESSION__RIGHT_OPERAND, null, msgs);
- msgs = basicSetRightOperand(newRightOperand, msgs);
- if (msgs != null) msgs.dispatch();
- }
- else if (eNotificationRequired())
- eNotify(new ENotificationImpl(this, Notification.SET, InstantiationPackage.PT_INFIX_EXPRESSION__RIGHT_OPERAND, newRightOperand, newRightOperand));
- }
-
- /**
- * <!-- begin-user-doc -->
- * <!-- end-user-doc -->
- * @generated
- */
- public EList getExtendedOperands() {
- if (extendedOperands == null) {
- extendedOperands = new EObjectContainmentEList(PTExpression.class, this, InstantiationPackage.PT_INFIX_EXPRESSION__EXTENDED_OPERANDS);
- }
- return extendedOperands;
- }
-
- /**
- * <!-- begin-user-doc -->
- * <!-- end-user-doc -->
- * @generated
- */
- public NotificationChain eInverseRemove(InternalEObject otherEnd, int featureID, Class baseClass, NotificationChain msgs) {
- if (featureID >= 0) {
- switch (eDerivedStructuralFeatureID(featureID, baseClass)) {
- case InstantiationPackage.PT_INFIX_EXPRESSION__LEFT_OPERAND:
- return basicSetLeftOperand(null, msgs);
- case InstantiationPackage.PT_INFIX_EXPRESSION__RIGHT_OPERAND:
- return basicSetRightOperand(null, msgs);
- case InstantiationPackage.PT_INFIX_EXPRESSION__EXTENDED_OPERANDS:
- return ((InternalEList)getExtendedOperands()).basicRemove(otherEnd, msgs);
- default:
- return eDynamicInverseRemove(otherEnd, featureID, baseClass, msgs);
- }
- }
- return eBasicSetContainer(null, featureID, msgs);
- }
-
- /**
- * <!-- begin-user-doc -->
- * <!-- end-user-doc -->
- * @generated
- */
- public Object eGet(EStructuralFeature eFeature, boolean resolve) {
- switch (eDerivedStructuralFeatureID(eFeature)) {
- case InstantiationPackage.PT_INFIX_EXPRESSION__LEFT_OPERAND:
- return getLeftOperand();
- case InstantiationPackage.PT_INFIX_EXPRESSION__OPERATOR:
- return getOperator();
- case InstantiationPackage.PT_INFIX_EXPRESSION__RIGHT_OPERAND:
- return getRightOperand();
- case InstantiationPackage.PT_INFIX_EXPRESSION__EXTENDED_OPERANDS:
- return getExtendedOperands();
- }
- return eDynamicGet(eFeature, resolve);
- }
-
- /**
- * <!-- begin-user-doc -->
- * <!-- end-user-doc -->
- * @generated
- */
- public void eSet(EStructuralFeature eFeature, Object newValue) {
- switch (eDerivedStructuralFeatureID(eFeature)) {
- case InstantiationPackage.PT_INFIX_EXPRESSION__LEFT_OPERAND:
- setLeftOperand((PTExpression)newValue);
- return;
- case InstantiationPackage.PT_INFIX_EXPRESSION__OPERATOR:
- setOperator((PTInfixOperator)newValue);
- return;
- case InstantiationPackage.PT_INFIX_EXPRESSION__RIGHT_OPERAND:
- setRightOperand((PTExpression)newValue);
- return;
- case InstantiationPackage.PT_INFIX_EXPRESSION__EXTENDED_OPERANDS:
- getExtendedOperands().clear();
- getExtendedOperands().addAll((Collection)newValue);
- return;
- }
- eDynamicSet(eFeature, newValue);
- }
-
- /**
- * <!-- begin-user-doc -->
- * <!-- end-user-doc -->
- * @generated
- */
- public void eUnset(EStructuralFeature eFeature) {
- switch (eDerivedStructuralFeatureID(eFeature)) {
- case InstantiationPackage.PT_INFIX_EXPRESSION__LEFT_OPERAND:
- setLeftOperand((PTExpression)null);
- return;
- case InstantiationPackage.PT_INFIX_EXPRESSION__OPERATOR:
- setOperator(OPERATOR_EDEFAULT);
- return;
- case InstantiationPackage.PT_INFIX_EXPRESSION__RIGHT_OPERAND:
- setRightOperand((PTExpression)null);
- return;
- case InstantiationPackage.PT_INFIX_EXPRESSION__EXTENDED_OPERANDS:
- getExtendedOperands().clear();
- return;
- }
- eDynamicUnset(eFeature);
- }
-
- /**
- * <!-- begin-user-doc -->
- * <!-- end-user-doc -->
- * @generated
- */
- public boolean eIsSet(EStructuralFeature eFeature) {
- switch (eDerivedStructuralFeatureID(eFeature)) {
- case InstantiationPackage.PT_INFIX_EXPRESSION__LEFT_OPERAND:
- return leftOperand != null;
- case InstantiationPackage.PT_INFIX_EXPRESSION__OPERATOR:
- return operator != OPERATOR_EDEFAULT;
- case InstantiationPackage.PT_INFIX_EXPRESSION__RIGHT_OPERAND:
- return rightOperand != null;
- case InstantiationPackage.PT_INFIX_EXPRESSION__EXTENDED_OPERANDS:
- return extendedOperands != null && !extendedOperands.isEmpty();
- }
- return eDynamicIsSet(eFeature);
- }
-
- public String toString() {
- return super.toString(); // Really want toString to be final at PTExpression, but EMF doesn't allow it.
- }
-
- /*
- * (non-Javadoc)
- * @see org.eclipse.jem.internal.instantiation.impl.ExpressionImpl#accept0(org.eclipse.jem.internal.instantiation.ParseVisitor)
- */
- protected void accept0(ParseVisitor visitor) {
- boolean visitChildren = visitor.visit(this);
- if (visitChildren) {
- // visit children in normal left to right reading order
- acceptChild(visitor, getLeftOperand());
- acceptChild(visitor, getRightOperand());
- acceptChildren(visitor, extendedOperands);
- }
- visitor.endVisit(this);
- }
- /* (non-Javadoc)
- * @see org.eclipse.jem.internal.instantiation.PTInfixExpression#asCompressedExpression()
- */
- public PTExpression asCompressedExpression() {
- // If no left and no right
- if(getLeftOperand() == null && getRightOperand() != null){
- // no extends so just use the right operand
- if(getExtendedOperands().isEmpty()){
- return getRightOperand();
- } else {
- // The right becomes the new left
- setLeftOperand(getRightOperand());
- // The first operand becomes the right one
- setRightOperand((PTExpression) getExtendedOperands().remove(0));
- return this;
- }
- } else if (getRightOperand() == null && getLeftOperand() != null){
- // no extends so just use the left operand
- if(getExtendedOperands().isEmpty()){
- return getLeftOperand();
- } else {
- // The right becomes the first extended
- setRightOperand((PTExpression)getExtendedOperands().remove(0));
- return this;
- }
- }
- return this;
- }
-} //InfixExpressionImpl
diff --git a/plugins/org.eclipse.jem/javainst/org/eclipse/jem/internal/instantiation/impl/PTInstanceReferenceImpl.java b/plugins/org.eclipse.jem/javainst/org/eclipse/jem/internal/instantiation/impl/PTInstanceReferenceImpl.java
deleted file mode 100644
index 86f5d0d..0000000
--- a/plugins/org.eclipse.jem/javainst/org/eclipse/jem/internal/instantiation/impl/PTInstanceReferenceImpl.java
+++ /dev/null
@@ -1,173 +0,0 @@
-/**
- * <copyright>
- * </copyright>
- *
- * %W%
- * @version %I% %H%
- */
-package org.eclipse.jem.internal.instantiation.impl;
-
-import org.eclipse.emf.common.notify.Notification;
-
-import org.eclipse.emf.ecore.EClass;
-import org.eclipse.emf.ecore.EStructuralFeature;
-import org.eclipse.emf.ecore.InternalEObject;
-
-import org.eclipse.emf.ecore.impl.ENotificationImpl;
-
-import org.eclipse.jem.internal.instantiation.InstantiationPackage;
-import org.eclipse.jem.internal.instantiation.PTInstanceReference;
-
-import org.eclipse.jem.internal.instantiation.base.IJavaInstance;
-
-import org.eclipse.jem.internal.instantiation.*;
-
-
-/**
- * <!-- begin-user-doc -->
- * An implementation of the model object '<em><b>PT Instance Reference</b></em>'.
- * <!-- end-user-doc -->
- * <p>
- * The following features are implemented:
- * <ul>
- * <li>{@link org.eclipse.jem.internal.instantiation.impl.PTInstanceReferenceImpl#getReference <em>Reference</em>}</li>
- * </ul>
- * </p>
- *
- * @generated
- */
-public class PTInstanceReferenceImpl extends PTExpressionImpl implements PTInstanceReference {
- /**
- * The cached value of the '{@link #getReference() <em>Reference</em>}' reference.
- * <!-- begin-user-doc -->
- * <!-- end-user-doc -->
- * @see #getReference()
- * @generated
- * @ordered
- */
- protected IJavaInstance reference = null;
-
- /**
- * <!-- begin-user-doc -->
- * <!-- end-user-doc -->
- * @generated
- */
- protected PTInstanceReferenceImpl() {
- super();
- }
-
- /**
- * <!-- begin-user-doc -->
- * <!-- end-user-doc -->
- * @generated
- */
- protected EClass eStaticClass() {
- return InstantiationPackage.eINSTANCE.getPTInstanceReference();
- }
-
- /**
- * <!-- begin-user-doc -->
- * <!-- end-user-doc -->
- * @generated
- */
- public IJavaInstance getReference() {
- if (reference != null && reference.eIsProxy()) {
- IJavaInstance oldReference = reference;
- reference = (IJavaInstance)eResolveProxy((InternalEObject)reference);
- if (reference != oldReference) {
- if (eNotificationRequired())
- eNotify(new ENotificationImpl(this, Notification.RESOLVE, InstantiationPackage.PT_INSTANCE_REFERENCE__REFERENCE, oldReference, reference));
- }
- }
- return reference;
- }
-
- /**
- * <!-- begin-user-doc -->
- * <!-- end-user-doc -->
- * @generated
- */
- public IJavaInstance basicGetReference() {
- return reference;
- }
-
- /**
- * <!-- begin-user-doc -->
- * <!-- end-user-doc -->
- * @generated
- */
- public void setReference(IJavaInstance newReference) {
- IJavaInstance oldReference = reference;
- reference = newReference;
- if (eNotificationRequired())
- eNotify(new ENotificationImpl(this, Notification.SET, InstantiationPackage.PT_INSTANCE_REFERENCE__REFERENCE, oldReference, reference));
- }
-
- /**
- * <!-- begin-user-doc -->
- * <!-- end-user-doc -->
- * @generated
- */
- public Object eGet(EStructuralFeature eFeature, boolean resolve) {
- switch (eDerivedStructuralFeatureID(eFeature)) {
- case InstantiationPackage.PT_INSTANCE_REFERENCE__REFERENCE:
- if (resolve) return getReference();
- return basicGetReference();
- }
- return eDynamicGet(eFeature, resolve);
- }
-
- /**
- * <!-- begin-user-doc -->
- * <!-- end-user-doc -->
- * @generated
- */
- public void eSet(EStructuralFeature eFeature, Object newValue) {
- switch (eDerivedStructuralFeatureID(eFeature)) {
- case InstantiationPackage.PT_INSTANCE_REFERENCE__REFERENCE:
- setReference((IJavaInstance)newValue);
- return;
- }
- eDynamicSet(eFeature, newValue);
- }
-
- /**
- * <!-- begin-user-doc -->
- * <!-- end-user-doc -->
- * @generated
- */
- public void eUnset(EStructuralFeature eFeature) {
- switch (eDerivedStructuralFeatureID(eFeature)) {
- case InstantiationPackage.PT_INSTANCE_REFERENCE__REFERENCE:
- setReference((IJavaInstance)null);
- return;
- }
- eDynamicUnset(eFeature);
- }
-
- /**
- * <!-- begin-user-doc -->
- * <!-- end-user-doc -->
- * @generated
- */
- public boolean eIsSet(EStructuralFeature eFeature) {
- switch (eDerivedStructuralFeatureID(eFeature)) {
- case InstantiationPackage.PT_INSTANCE_REFERENCE__REFERENCE:
- return reference != null;
- }
- return eDynamicIsSet(eFeature);
- }
-
- /* (non-Javadoc)
- * @see org.eclipse.jem.internal.instantiation.impl.PTExpressionImpl#accept0(org.eclipse.jem.internal.instantiation.ParseVisitor)
- */
- protected void accept0(ParseVisitor visitor) {
- visitor.visit(this);
- visitor.endVisit(this);
- }
-
- public String toString() {
- return "InstanceRef{" + reference + "}";
- }
-
-} //PTInstanceReferenceImpl
diff --git a/plugins/org.eclipse.jem/javainst/org/eclipse/jem/internal/instantiation/impl/PTInstanceofImpl.java b/plugins/org.eclipse.jem/javainst/org/eclipse/jem/internal/instantiation/impl/PTInstanceofImpl.java
deleted file mode 100644
index 836f162..0000000
--- a/plugins/org.eclipse.jem/javainst/org/eclipse/jem/internal/instantiation/impl/PTInstanceofImpl.java
+++ /dev/null
@@ -1,255 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2004, 2005 IBM Corporation and others.
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
- *
- * Contributors:
- * IBM Corporation - initial API and implementation
- *******************************************************************************/
-package org.eclipse.jem.internal.instantiation.impl;
-/*
-
-
- */
-import org.eclipse.emf.common.notify.Notification;
-import org.eclipse.emf.common.notify.NotificationChain;
-
-import org.eclipse.emf.ecore.EClass;
-import org.eclipse.emf.ecore.EStructuralFeature;
-import org.eclipse.emf.ecore.InternalEObject;
-
-import org.eclipse.emf.ecore.impl.ENotificationImpl;
-
-import org.eclipse.jem.internal.instantiation.*;
-import org.eclipse.jem.internal.instantiation.PTExpression;
-import org.eclipse.jem.internal.instantiation.PTInstanceof;
-import org.eclipse.jem.internal.instantiation.InstantiationPackage;
-
-/**
- * <!-- begin-user-doc -->
- * An implementation of the model object '<em><b>Instanceof</b></em>'.
- * <!-- end-user-doc -->
- * <p>
- * The following features are implemented:
- * <ul>
- * <li>{@link org.eclipse.jem.internal.instantiation.impl.PTInstanceofImpl#getOperand <em>Operand</em>}</li>
- * <li>{@link org.eclipse.jem.internal.instantiation.impl.PTInstanceofImpl#getType <em>Type</em>}</li>
- * </ul>
- * </p>
- *
- * @generated
- */
-public class PTInstanceofImpl extends PTExpressionImpl implements PTInstanceof {
- /**
- * The cached value of the '{@link #getOperand() <em>Operand</em>}' containment reference.
- * <!-- begin-user-doc -->
- * <!-- end-user-doc -->
- * @see #getOperand()
- * @generated
- * @ordered
- */
- protected PTExpression operand = null;
-
- /**
- * The default value of the '{@link #getType() <em>Type</em>}' attribute.
- * <!-- begin-user-doc -->
- * <!-- end-user-doc -->
- * @see #getType()
- * @generated
- * @ordered
- */
- protected static final String TYPE_EDEFAULT = null;
-
- /**
- * The cached value of the '{@link #getType() <em>Type</em>}' attribute.
- * <!-- begin-user-doc -->
- * <!-- end-user-doc -->
- * @see #getType()
- * @generated
- * @ordered
- */
- protected String type = TYPE_EDEFAULT;
-
- /**
- * <!-- begin-user-doc -->
- * <!-- end-user-doc -->
- * @generated
- */
- protected PTInstanceofImpl() {
- super();
- }
-
- /**
- * <!-- begin-user-doc -->
- * <!-- end-user-doc -->
- * @generated
- */
- protected EClass eStaticClass() {
- return InstantiationPackage.eINSTANCE.getPTInstanceof();
- }
-
- /**
- * <!-- begin-user-doc -->
- * <!-- end-user-doc -->
- * @generated
- */
- public PTExpression getOperand() {
- return operand;
- }
-
- /**
- * <!-- begin-user-doc -->
- * <!-- end-user-doc -->
- * @generated
- */
- public NotificationChain basicSetOperand(PTExpression newOperand, NotificationChain msgs) {
- PTExpression oldOperand = operand;
- operand = newOperand;
- if (eNotificationRequired()) {
- ENotificationImpl notification = new ENotificationImpl(this, Notification.SET, InstantiationPackage.PT_INSTANCEOF__OPERAND, oldOperand, newOperand);
- if (msgs == null) msgs = notification; else msgs.add(notification);
- }
- return msgs;
- }
-
- /**
- * <!-- begin-user-doc -->
- * <!-- end-user-doc -->
- * @generated
- */
- public void setOperand(PTExpression newOperand) {
- if (newOperand != operand) {
- NotificationChain msgs = null;
- if (operand != null)
- msgs = ((InternalEObject)operand).eInverseRemove(this, EOPPOSITE_FEATURE_BASE - InstantiationPackage.PT_INSTANCEOF__OPERAND, null, msgs);
- if (newOperand != null)
- msgs = ((InternalEObject)newOperand).eInverseAdd(this, EOPPOSITE_FEATURE_BASE - InstantiationPackage.PT_INSTANCEOF__OPERAND, null, msgs);
- msgs = basicSetOperand(newOperand, msgs);
- if (msgs != null) msgs.dispatch();
- }
- else if (eNotificationRequired())
- eNotify(new ENotificationImpl(this, Notification.SET, InstantiationPackage.PT_INSTANCEOF__OPERAND, newOperand, newOperand));
- }
-
- /**
- * <!-- begin-user-doc -->
- * <!-- end-user-doc -->
- * @generated
- */
- public String getType() {
- return type;
- }
-
- /**
- * <!-- begin-user-doc -->
- * <!-- end-user-doc -->
- * @generated
- */
- public void setType(String newType) {
- String oldType = type;
- type = newType;
- if (eNotificationRequired())
- eNotify(new ENotificationImpl(this, Notification.SET, InstantiationPackage.PT_INSTANCEOF__TYPE, oldType, type));
- }
-
- /**
- * <!-- begin-user-doc -->
- * <!-- end-user-doc -->
- * @generated
- */
- public NotificationChain eInverseRemove(InternalEObject otherEnd, int featureID, Class baseClass, NotificationChain msgs) {
- if (featureID >= 0) {
- switch (eDerivedStructuralFeatureID(featureID, baseClass)) {
- case InstantiationPackage.PT_INSTANCEOF__OPERAND:
- return basicSetOperand(null, msgs);
- default:
- return eDynamicInverseRemove(otherEnd, featureID, baseClass, msgs);
- }
- }
- return eBasicSetContainer(null, featureID, msgs);
- }
-
- /**
- * <!-- begin-user-doc -->
- * <!-- end-user-doc -->
- * @generated
- */
- public Object eGet(EStructuralFeature eFeature, boolean resolve) {
- switch (eDerivedStructuralFeatureID(eFeature)) {
- case InstantiationPackage.PT_INSTANCEOF__OPERAND:
- return getOperand();
- case InstantiationPackage.PT_INSTANCEOF__TYPE:
- return getType();
- }
- return eDynamicGet(eFeature, resolve);
- }
-
- /**
- * <!-- begin-user-doc -->
- * <!-- end-user-doc -->
- * @generated
- */
- public void eSet(EStructuralFeature eFeature, Object newValue) {
- switch (eDerivedStructuralFeatureID(eFeature)) {
- case InstantiationPackage.PT_INSTANCEOF__OPERAND:
- setOperand((PTExpression)newValue);
- return;
- case InstantiationPackage.PT_INSTANCEOF__TYPE:
- setType((String)newValue);
- return;
- }
- eDynamicSet(eFeature, newValue);
- }
-
- /**
- * <!-- begin-user-doc -->
- * <!-- end-user-doc -->
- * @generated
- */
- public void eUnset(EStructuralFeature eFeature) {
- switch (eDerivedStructuralFeatureID(eFeature)) {
- case InstantiationPackage.PT_INSTANCEOF__OPERAND:
- setOperand((PTExpression)null);
- return;
- case InstantiationPackage.PT_INSTANCEOF__TYPE:
- setType(TYPE_EDEFAULT);
- return;
- }
- eDynamicUnset(eFeature);
- }
-
- /**
- * <!-- begin-user-doc -->
- * <!-- end-user-doc -->
- * @generated
- */
- public boolean eIsSet(EStructuralFeature eFeature) {
- switch (eDerivedStructuralFeatureID(eFeature)) {
- case InstantiationPackage.PT_INSTANCEOF__OPERAND:
- return operand != null;
- case InstantiationPackage.PT_INSTANCEOF__TYPE:
- return TYPE_EDEFAULT == null ? type != null : !TYPE_EDEFAULT.equals(type);
- }
- return eDynamicIsSet(eFeature);
- }
-
- public String toString() {
- return super.toString(); // Really want toString to be final at PTExpression, but EMF doesn't allow it.
- }
-
- /*
- * (non-Javadoc)
- * @see org.eclipse.jem.internal.instantiation.impl.ExpressionImpl#accept0(org.eclipse.jem.internal.instantiation.ParseVisitor)
- */
- protected void accept0(ParseVisitor visitor) {
- boolean visitChildren = visitor.visit(this);
- if (visitChildren) {
- // visit children in normal left to right reading order
- acceptChild(visitor, getOperand());
- }
- visitor.endVisit(this);
- }
-
-} //InstanceofImpl
diff --git a/plugins/org.eclipse.jem/javainst/org/eclipse/jem/internal/instantiation/impl/PTInvalidExpressionImpl.java b/plugins/org.eclipse.jem/javainst/org/eclipse/jem/internal/instantiation/impl/PTInvalidExpressionImpl.java
deleted file mode 100644
index b38c541..0000000
--- a/plugins/org.eclipse.jem/javainst/org/eclipse/jem/internal/instantiation/impl/PTInvalidExpressionImpl.java
+++ /dev/null
@@ -1,166 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2004, 2005 IBM Corporation and others.
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
- *
- * Contributors:
- * IBM Corporation - initial API and implementation
- *******************************************************************************/
-package org.eclipse.jem.internal.instantiation.impl;
-/*
-
-
- */
-import org.eclipse.emf.common.notify.Notification;
-
-import org.eclipse.emf.ecore.EClass;
-import org.eclipse.emf.ecore.EStructuralFeature;
-
-import org.eclipse.emf.ecore.impl.ENotificationImpl;
-
-import org.eclipse.jem.internal.instantiation.*;
-import org.eclipse.jem.internal.instantiation.InstantiationPackage;
-import org.eclipse.jem.internal.instantiation.PTInvalidExpression;
-
-/**
- * <!-- begin-user-doc -->
- * An implementation of the model object '<em><b>Invalid Expression</b></em>'.
- * <!-- end-user-doc -->
- * <p>
- * The following features are implemented:
- * <ul>
- * <li>{@link org.eclipse.jem.internal.instantiation.impl.PTInvalidExpressionImpl#getMessage <em>Message</em>}</li>
- * </ul>
- * </p>
- *
- * @generated
- */
-public class PTInvalidExpressionImpl extends PTExpressionImpl implements PTInvalidExpression {
- /**
- * The default value of the '{@link #getMessage() <em>Message</em>}' attribute.
- * <!-- begin-user-doc -->
- * <!-- end-user-doc -->
- * @see #getMessage()
- * @generated
- * @ordered
- */
- protected static final String MESSAGE_EDEFAULT = null;
-
- /**
- * The cached value of the '{@link #getMessage() <em>Message</em>}' attribute.
- * <!-- begin-user-doc -->
- * <!-- end-user-doc -->
- * @see #getMessage()
- * @generated
- * @ordered
- */
- protected String message = MESSAGE_EDEFAULT;
-
- /**
- * <!-- begin-user-doc -->
- * <!-- end-user-doc -->
- * @generated
- */
- protected PTInvalidExpressionImpl() {
- super();
- }
-
- /**
- * <!-- begin-user-doc -->
- * <!-- end-user-doc -->
- * @generated
- */
- protected EClass eStaticClass() {
- return InstantiationPackage.eINSTANCE.getPTInvalidExpression();
- }
-
- /**
- * <!-- begin-user-doc -->
- * <!-- end-user-doc -->
- * @generated
- */
- public String getMessage() {
- return message;
- }
-
- /**
- * <!-- begin-user-doc -->
- * <!-- end-user-doc -->
- * @generated
- */
- public void setMessage(String newMessage) {
- String oldMessage = message;
- message = newMessage;
- if (eNotificationRequired())
- eNotify(new ENotificationImpl(this, Notification.SET, InstantiationPackage.PT_INVALID_EXPRESSION__MESSAGE, oldMessage, message));
- }
-
- /**
- * <!-- begin-user-doc -->
- * <!-- end-user-doc -->
- * @generated
- */
- public Object eGet(EStructuralFeature eFeature, boolean resolve) {
- switch (eDerivedStructuralFeatureID(eFeature)) {
- case InstantiationPackage.PT_INVALID_EXPRESSION__MESSAGE:
- return getMessage();
- }
- return eDynamicGet(eFeature, resolve);
- }
-
- /**
- * <!-- begin-user-doc -->
- * <!-- end-user-doc -->
- * @generated
- */
- public void eSet(EStructuralFeature eFeature, Object newValue) {
- switch (eDerivedStructuralFeatureID(eFeature)) {
- case InstantiationPackage.PT_INVALID_EXPRESSION__MESSAGE:
- setMessage((String)newValue);
- return;
- }
- eDynamicSet(eFeature, newValue);
- }
-
- /**
- * <!-- begin-user-doc -->
- * <!-- end-user-doc -->
- * @generated
- */
- public void eUnset(EStructuralFeature eFeature) {
- switch (eDerivedStructuralFeatureID(eFeature)) {
- case InstantiationPackage.PT_INVALID_EXPRESSION__MESSAGE:
- setMessage(MESSAGE_EDEFAULT);
- return;
- }
- eDynamicUnset(eFeature);
- }
-
- /**
- * <!-- begin-user-doc -->
- * <!-- end-user-doc -->
- * @generated
- */
- public boolean eIsSet(EStructuralFeature eFeature) {
- switch (eDerivedStructuralFeatureID(eFeature)) {
- case InstantiationPackage.PT_INVALID_EXPRESSION__MESSAGE:
- return MESSAGE_EDEFAULT == null ? message != null : !MESSAGE_EDEFAULT.equals(message);
- }
- return eDynamicIsSet(eFeature);
- }
-
- public String toString() {
- return super.toString(); // Really want toString to be final at PTExpression, but EMF doesn't allow it.
- }
-
- /* (non-Javadoc)
- * @see org.eclipse.jem.internal.instantiation.impl.ExpressionImpl#accept0(org.eclipse.jem.internal.instantiation.ParseVisitor)
- */
- protected void accept0(ParseVisitor visitor) {
- visitor.visit(this);
- visitor.endVisit(this);
- }
-
-} //InvalidExpressionImpl
diff --git a/plugins/org.eclipse.jem/javainst/org/eclipse/jem/internal/instantiation/impl/PTMethodInvocationImpl.java b/plugins/org.eclipse.jem/javainst/org/eclipse/jem/internal/instantiation/impl/PTMethodInvocationImpl.java
deleted file mode 100644
index 2b7a60a..0000000
--- a/plugins/org.eclipse.jem/javainst/org/eclipse/jem/internal/instantiation/impl/PTMethodInvocationImpl.java
+++ /dev/null
@@ -1,298 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2004, 2005 IBM Corporation and others.
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
- *
- * Contributors:
- * IBM Corporation - initial API and implementation
- *******************************************************************************/
-package org.eclipse.jem.internal.instantiation.impl;
-/*
-
-
- */
-import java.util.Collection;
-
-import org.eclipse.emf.common.notify.Notification;
-import org.eclipse.emf.common.notify.NotificationChain;
-
-import org.eclipse.emf.common.util.EList;
-
-import org.eclipse.emf.ecore.EClass;
-import org.eclipse.emf.ecore.EStructuralFeature;
-import org.eclipse.emf.ecore.InternalEObject;
-
-import org.eclipse.emf.ecore.impl.ENotificationImpl;
-
-import org.eclipse.emf.ecore.util.EObjectContainmentEList;
-import org.eclipse.emf.ecore.util.InternalEList;
-
-import org.eclipse.jem.internal.instantiation.*;
-import org.eclipse.jem.internal.instantiation.PTExpression;
-import org.eclipse.jem.internal.instantiation.InstantiationPackage;
-import org.eclipse.jem.internal.instantiation.PTMethodInvocation;
-
-/**
- * <!-- begin-user-doc -->
- * An implementation of the model object '<em><b>Method Invocation</b></em>'.
- * <!-- end-user-doc -->
- * <p>
- * The following features are implemented:
- * <ul>
- * <li>{@link org.eclipse.jem.internal.instantiation.impl.PTMethodInvocationImpl#getReceiver <em>Receiver</em>}</li>
- * <li>{@link org.eclipse.jem.internal.instantiation.impl.PTMethodInvocationImpl#getName <em>Name</em>}</li>
- * <li>{@link org.eclipse.jem.internal.instantiation.impl.PTMethodInvocationImpl#getArguments <em>Arguments</em>}</li>
- * </ul>
- * </p>
- *
- * @generated
- */
-public class PTMethodInvocationImpl extends PTExpressionImpl implements PTMethodInvocation {
- /**
- * The cached value of the '{@link #getReceiver() <em>Receiver</em>}' containment reference.
- * <!-- begin-user-doc -->
- * <!-- end-user-doc -->
- * @see #getReceiver()
- * @generated
- * @ordered
- */
- protected PTExpression receiver = null;
-
- /**
- * The default value of the '{@link #getName() <em>Name</em>}' attribute.
- * <!-- begin-user-doc -->
- * <!-- end-user-doc -->
- * @see #getName()
- * @generated
- * @ordered
- */
- protected static final String NAME_EDEFAULT = null;
-
- /**
- * The cached value of the '{@link #getName() <em>Name</em>}' attribute.
- * <!-- begin-user-doc -->
- * <!-- end-user-doc -->
- * @see #getName()
- * @generated
- * @ordered
- */
- protected String name = NAME_EDEFAULT;
-
- /**
- * The cached value of the '{@link #getArguments() <em>Arguments</em>}' containment reference list.
- * <!-- begin-user-doc -->
- * <!-- end-user-doc -->
- * @see #getArguments()
- * @generated
- * @ordered
- */
- protected EList arguments = null;
-
- /**
- * <!-- begin-user-doc -->
- * <!-- end-user-doc -->
- * @generated
- */
- protected PTMethodInvocationImpl() {
- super();
- }
-
- /**
- * <!-- begin-user-doc -->
- * <!-- end-user-doc -->
- * @generated
- */
- protected EClass eStaticClass() {
- return InstantiationPackage.eINSTANCE.getPTMethodInvocation();
- }
-
- /**
- * <!-- begin-user-doc -->
- * <!-- end-user-doc -->
- * @generated
- */
- public PTExpression getReceiver() {
- return receiver;
- }
-
- /**
- * <!-- begin-user-doc -->
- * <!-- end-user-doc -->
- * @generated
- */
- public NotificationChain basicSetReceiver(PTExpression newReceiver, NotificationChain msgs) {
- PTExpression oldReceiver = receiver;
- receiver = newReceiver;
- if (eNotificationRequired()) {
- ENotificationImpl notification = new ENotificationImpl(this, Notification.SET, InstantiationPackage.PT_METHOD_INVOCATION__RECEIVER, oldReceiver, newReceiver);
- if (msgs == null) msgs = notification; else msgs.add(notification);
- }
- return msgs;
- }
-
- /**
- * <!-- begin-user-doc -->
- * <!-- end-user-doc -->
- * @generated
- */
- public void setReceiver(PTExpression newReceiver) {
- if (newReceiver != receiver) {
- NotificationChain msgs = null;
- if (receiver != null)
- msgs = ((InternalEObject)receiver).eInverseRemove(this, EOPPOSITE_FEATURE_BASE - InstantiationPackage.PT_METHOD_INVOCATION__RECEIVER, null, msgs);
- if (newReceiver != null)
- msgs = ((InternalEObject)newReceiver).eInverseAdd(this, EOPPOSITE_FEATURE_BASE - InstantiationPackage.PT_METHOD_INVOCATION__RECEIVER, null, msgs);
- msgs = basicSetReceiver(newReceiver, msgs);
- if (msgs != null) msgs.dispatch();
- }
- else if (eNotificationRequired())
- eNotify(new ENotificationImpl(this, Notification.SET, InstantiationPackage.PT_METHOD_INVOCATION__RECEIVER, newReceiver, newReceiver));
- }
-
- /**
- * <!-- begin-user-doc -->
- * <!-- end-user-doc -->
- * @generated
- */
- public String getName() {
- return name;
- }
-
- /**
- * <!-- begin-user-doc -->
- * <!-- end-user-doc -->
- * @generated
- */
- public void setName(String newName) {
- String oldName = name;
- name = newName;
- if (eNotificationRequired())
- eNotify(new ENotificationImpl(this, Notification.SET, InstantiationPackage.PT_METHOD_INVOCATION__NAME, oldName, name));
- }
-
- /**
- * <!-- begin-user-doc -->
- * <!-- end-user-doc -->
- * @generated
- */
- public EList getArguments() {
- if (arguments == null) {
- arguments = new EObjectContainmentEList(PTExpression.class, this, InstantiationPackage.PT_METHOD_INVOCATION__ARGUMENTS);
- }
- return arguments;
- }
-
- /**
- * <!-- begin-user-doc -->
- * <!-- end-user-doc -->
- * @generated
- */
- public NotificationChain eInverseRemove(InternalEObject otherEnd, int featureID, Class baseClass, NotificationChain msgs) {
- if (featureID >= 0) {
- switch (eDerivedStructuralFeatureID(featureID, baseClass)) {
- case InstantiationPackage.PT_METHOD_INVOCATION__RECEIVER:
- return basicSetReceiver(null, msgs);
- case InstantiationPackage.PT_METHOD_INVOCATION__ARGUMENTS:
- return ((InternalEList)getArguments()).basicRemove(otherEnd, msgs);
- default:
- return eDynamicInverseRemove(otherEnd, featureID, baseClass, msgs);
- }
- }
- return eBasicSetContainer(null, featureID, msgs);
- }
-
- /**
- * <!-- begin-user-doc -->
- * <!-- end-user-doc -->
- * @generated
- */
- public Object eGet(EStructuralFeature eFeature, boolean resolve) {
- switch (eDerivedStructuralFeatureID(eFeature)) {
- case InstantiationPackage.PT_METHOD_INVOCATION__RECEIVER:
- return getReceiver();
- case InstantiationPackage.PT_METHOD_INVOCATION__NAME:
- return getName();
- case InstantiationPackage.PT_METHOD_INVOCATION__ARGUMENTS:
- return getArguments();
- }
- return eDynamicGet(eFeature, resolve);
- }
-
- /**
- * <!-- begin-user-doc -->
- * <!-- end-user-doc -->
- * @generated
- */
- public void eSet(EStructuralFeature eFeature, Object newValue) {
- switch (eDerivedStructuralFeatureID(eFeature)) {
- case InstantiationPackage.PT_METHOD_INVOCATION__RECEIVER:
- setReceiver((PTExpression)newValue);
- return;
- case InstantiationPackage.PT_METHOD_INVOCATION__NAME:
- setName((String)newValue);
- return;
- case InstantiationPackage.PT_METHOD_INVOCATION__ARGUMENTS:
- getArguments().clear();
- getArguments().addAll((Collection)newValue);
- return;
- }
- eDynamicSet(eFeature, newValue);
- }
-
- /**
- * <!-- begin-user-doc -->
- * <!-- end-user-doc -->
- * @generated
- */
- public void eUnset(EStructuralFeature eFeature) {
- switch (eDerivedStructuralFeatureID(eFeature)) {
- case InstantiationPackage.PT_METHOD_INVOCATION__RECEIVER:
- setReceiver((PTExpression)null);
- return;
- case InstantiationPackage.PT_METHOD_INVOCATION__NAME:
- setName(NAME_EDEFAULT);
- return;
- case InstantiationPackage.PT_METHOD_INVOCATION__ARGUMENTS:
- getArguments().clear();
- return;
- }
- eDynamicUnset(eFeature);
- }
-
- /**
- * <!-- begin-user-doc -->
- * <!-- end-user-doc -->
- * @generated
- */
- public boolean eIsSet(EStructuralFeature eFeature) {
- switch (eDerivedStructuralFeatureID(eFeature)) {
- case InstantiationPackage.PT_METHOD_INVOCATION__RECEIVER:
- return receiver != null;
- case InstantiationPackage.PT_METHOD_INVOCATION__NAME:
- return NAME_EDEFAULT == null ? name != null : !NAME_EDEFAULT.equals(name);
- case InstantiationPackage.PT_METHOD_INVOCATION__ARGUMENTS:
- return arguments != null && !arguments.isEmpty();
- }
- return eDynamicIsSet(eFeature);
- }
-
- public String toString() {
- return super.toString(); // Really want toString to be final at PTExpression, but EMF doesn't allow it.
- }
-
- /*
- * (non-Javadoc)
- * @see org.eclipse.jem.internal.instantiation.impl.ExpressionImpl#accept0(org.eclipse.jem.internal.instantiation.ParseVisitor)
- */
- protected void accept0(ParseVisitor visitor) {
- boolean visitChildren = visitor.visit(this);
- if (visitChildren) {
- // visit children in normal left to right reading order
- acceptChild(visitor, getReceiver());
- acceptChildren(visitor, arguments);
- }
- visitor.endVisit(this);
- }
-} //MethodInvocationImpl
diff --git a/plugins/org.eclipse.jem/javainst/org/eclipse/jem/internal/instantiation/impl/PTNameImpl.java b/plugins/org.eclipse.jem/javainst/org/eclipse/jem/internal/instantiation/impl/PTNameImpl.java
deleted file mode 100644
index 9af5789..0000000
--- a/plugins/org.eclipse.jem/javainst/org/eclipse/jem/internal/instantiation/impl/PTNameImpl.java
+++ /dev/null
@@ -1,167 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2004, 2005 IBM Corporation and others.
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
- *
- * Contributors:
- * IBM Corporation - initial API and implementation
- *******************************************************************************/
-package org.eclipse.jem.internal.instantiation.impl;
-/*
-
-
- */
-import org.eclipse.emf.common.notify.Notification;
-
-import org.eclipse.emf.ecore.EClass;
-
-import org.eclipse.emf.ecore.EStructuralFeature;
-
-import org.eclipse.emf.ecore.impl.ENotificationImpl;
-
-import org.eclipse.jem.internal.instantiation.*;
-import org.eclipse.jem.internal.instantiation.InstantiationPackage;
-import org.eclipse.jem.internal.instantiation.PTName;
-
-/**
- * <!-- begin-user-doc -->
- * An implementation of the model object '<em><b>Name</b></em>'.
- * <!-- end-user-doc -->
- * <p>
- * The following features are implemented:
- * <ul>
- * <li>{@link org.eclipse.jem.internal.instantiation.impl.PTNameImpl#getName <em>Name</em>}</li>
- * </ul>
- * </p>
- *
- * @generated
- */
-public class PTNameImpl extends PTExpressionImpl implements PTName {
- /**
- * The default value of the '{@link #getName() <em>Name</em>}' attribute.
- * <!-- begin-user-doc -->
- * <!-- end-user-doc -->
- * @see #getName()
- * @generated
- * @ordered
- */
- protected static final String NAME_EDEFAULT = null;
-
- /**
- * The cached value of the '{@link #getName() <em>Name</em>}' attribute.
- * <!-- begin-user-doc -->
- * <!-- end-user-doc -->
- * @see #getName()
- * @generated
- * @ordered
- */
- protected String name = NAME_EDEFAULT;
-
- /**
- * <!-- begin-user-doc -->
- * <!-- end-user-doc -->
- * @generated
- */
- protected PTNameImpl() {
- super();
- }
-
- /**
- * <!-- begin-user-doc -->
- * <!-- end-user-doc -->
- * @generated
- */
- protected EClass eStaticClass() {
- return InstantiationPackage.eINSTANCE.getPTName();
- }
-
- /**
- * <!-- begin-user-doc -->
- * <!-- end-user-doc -->
- * @generated
- */
- public String getName() {
- return name;
- }
-
- /**
- * <!-- begin-user-doc -->
- * <!-- end-user-doc -->
- * @generated
- */
- public void setName(String newName) {
- String oldName = name;
- name = newName;
- if (eNotificationRequired())
- eNotify(new ENotificationImpl(this, Notification.SET, InstantiationPackage.PT_NAME__NAME, oldName, name));
- }
-
- /**
- * <!-- begin-user-doc -->
- * <!-- end-user-doc -->
- * @generated
- */
- public Object eGet(EStructuralFeature eFeature, boolean resolve) {
- switch (eDerivedStructuralFeatureID(eFeature)) {
- case InstantiationPackage.PT_NAME__NAME:
- return getName();
- }
- return eDynamicGet(eFeature, resolve);
- }
-
- /**
- * <!-- begin-user-doc -->
- * <!-- end-user-doc -->
- * @generated
- */
- public void eSet(EStructuralFeature eFeature, Object newValue) {
- switch (eDerivedStructuralFeatureID(eFeature)) {
- case InstantiationPackage.PT_NAME__NAME:
- setName((String)newValue);
- return;
- }
- eDynamicSet(eFeature, newValue);
- }
-
- /**
- * <!-- begin-user-doc -->
- * <!-- end-user-doc -->
- * @generated
- */
- public void eUnset(EStructuralFeature eFeature) {
- switch (eDerivedStructuralFeatureID(eFeature)) {
- case InstantiationPackage.PT_NAME__NAME:
- setName(NAME_EDEFAULT);
- return;
- }
- eDynamicUnset(eFeature);
- }
-
- /**
- * <!-- begin-user-doc -->
- * <!-- end-user-doc -->
- * @generated
- */
- public boolean eIsSet(EStructuralFeature eFeature) {
- switch (eDerivedStructuralFeatureID(eFeature)) {
- case InstantiationPackage.PT_NAME__NAME:
- return NAME_EDEFAULT == null ? name != null : !NAME_EDEFAULT.equals(name);
- }
- return eDynamicIsSet(eFeature);
- }
-
- public String toString() {
- return super.toString(); // Really want toString to be final at PTExpression, but EMF doesn't allow it.
- }
-
- /* (non-Javadoc)
- * @see org.eclipse.jem.internal.instantiation.impl.ExpressionImpl#accept0(org.eclipse.jem.internal.instantiation.ParseVisitor)
- */
- protected void accept0(ParseVisitor visitor) {
- visitor.visit(this);
- visitor.endVisit(this);
- }
-
-} //NameImpl
diff --git a/plugins/org.eclipse.jem/javainst/org/eclipse/jem/internal/instantiation/impl/PTNullLiteralImpl.java b/plugins/org.eclipse.jem/javainst/org/eclipse/jem/internal/instantiation/impl/PTNullLiteralImpl.java
deleted file mode 100644
index f4a8668..0000000
--- a/plugins/org.eclipse.jem/javainst/org/eclipse/jem/internal/instantiation/impl/PTNullLiteralImpl.java
+++ /dev/null
@@ -1,58 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2004, 2005 IBM Corporation and others.
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
- *
- * Contributors:
- * IBM Corporation - initial API and implementation
- *******************************************************************************/
-package org.eclipse.jem.internal.instantiation.impl;
-/*
-
-
- */
-import org.eclipse.emf.ecore.EClass;
-
-import org.eclipse.jem.internal.instantiation.*;
-import org.eclipse.jem.internal.instantiation.InstantiationPackage;
-import org.eclipse.jem.internal.instantiation.PTNullLiteral;
-
-/**
- * <!-- begin-user-doc -->
- * An implementation of the model object '<em><b>Null Literal</b></em>'.
- * <!-- end-user-doc -->
- * <p>
- * </p>
- *
- * @generated
- */
-public class PTNullLiteralImpl extends PTExpressionImpl implements PTNullLiteral {
- /**
- * <!-- begin-user-doc -->
- * <!-- end-user-doc -->
- * @generated
- */
- protected PTNullLiteralImpl() {
- super();
- }
-
- /**
- * <!-- begin-user-doc -->
- * <!-- end-user-doc -->
- * @generated
- */
- protected EClass eStaticClass() {
- return InstantiationPackage.eINSTANCE.getPTNullLiteral();
- }
-
- /* (non-Javadoc)
- * @see org.eclipse.jem.internal.instantiation.impl.ExpressionImpl#accept0(org.eclipse.jem.internal.instantiation.ParseVisitor)
- */
- protected void accept0(ParseVisitor visitor) {
- visitor.visit(this);
- visitor.endVisit(this);
- }
-
-} //NullLiteralImpl
diff --git a/plugins/org.eclipse.jem/javainst/org/eclipse/jem/internal/instantiation/impl/PTNumberLiteralImpl.java b/plugins/org.eclipse.jem/javainst/org/eclipse/jem/internal/instantiation/impl/PTNumberLiteralImpl.java
deleted file mode 100644
index 1119a64..0000000
--- a/plugins/org.eclipse.jem/javainst/org/eclipse/jem/internal/instantiation/impl/PTNumberLiteralImpl.java
+++ /dev/null
@@ -1,176 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2004, 2005 IBM Corporation and others.
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
- *
- * Contributors:
- * IBM Corporation - initial API and implementation
- *******************************************************************************/
-package org.eclipse.jem.internal.instantiation.impl;
-/*
-
-
- */
-import org.eclipse.emf.common.notify.Notification;
-
-import org.eclipse.emf.ecore.EClass;
-import org.eclipse.emf.ecore.EStructuralFeature;
-
-import org.eclipse.emf.ecore.impl.ENotificationImpl;
-
-import org.eclipse.jem.internal.instantiation.*;
-import org.eclipse.jem.internal.instantiation.InstantiationPackage;
-import org.eclipse.jem.internal.instantiation.PTNumberLiteral;
-
-/**
- * <!-- begin-user-doc -->
- * An implementation of the model object '<em><b>Number Literal</b></em>'.
- * <!-- end-user-doc -->
- * <p>
- * The following features are implemented:
- * <ul>
- * <li>{@link org.eclipse.jem.internal.instantiation.impl.PTNumberLiteralImpl#getToken <em>Token</em>}</li>
- * </ul>
- * </p>
- *
- * @generated
- */
-public class PTNumberLiteralImpl extends PTExpressionImpl implements PTNumberLiteral {
- /**
- * The default value of the '{@link #getToken() <em>Token</em>}' attribute.
- * <!-- begin-user-doc -->
- * <!-- end-user-doc -->
- * @see #getToken()
- * @generated
- * @ordered
- */
- protected static final String TOKEN_EDEFAULT = null;
-
- /**
- * The cached value of the '{@link #getToken() <em>Token</em>}' attribute.
- * <!-- begin-user-doc -->
- * <!-- end-user-doc -->
- * @see #getToken()
- * @generated
- * @ordered
- */
- protected String token = TOKEN_EDEFAULT;
-
- /**
- * <!-- begin-user-doc -->
- * <!-- end-user-doc -->
- * @generated
- */
- protected PTNumberLiteralImpl() {
- super();
- }
-
- /**
- * <!-- begin-user-doc -->
- * <!-- end-user-doc -->
- * @generated
- */
- protected EClass eStaticClass() {
- return InstantiationPackage.eINSTANCE.getPTNumberLiteral();
- }
-
- /**
- * <!-- begin-user-doc -->
- * <!-- end-user-doc -->
- * @generated
- */
- public String getToken() {
- return token;
- }
-
- /**
- * <!-- begin-user-doc -->
- * <!-- end-user-doc -->
- * @generated
- */
- public void setToken(String newToken) {
- String oldToken = token;
- token = newToken;
- if (eNotificationRequired())
- eNotify(new ENotificationImpl(this, Notification.SET, InstantiationPackage.PT_NUMBER_LITERAL__TOKEN, oldToken, token));
- }
-
- /**
- * <!-- begin-user-doc -->
- * <!-- end-user-doc -->
- * @generated
- */
- public Object eGet(EStructuralFeature eFeature, boolean resolve) {
- switch (eDerivedStructuralFeatureID(eFeature)) {
- case InstantiationPackage.PT_NUMBER_LITERAL__TOKEN:
- return getToken();
- }
- return eDynamicGet(eFeature, resolve);
- }
-
- /**
- * <!-- begin-user-doc -->
- * <!-- end-user-doc -->
- * @generated
- */
- public void eSet(EStructuralFeature eFeature, Object newValue) {
- switch (eDerivedStructuralFeatureID(eFeature)) {
- case InstantiationPackage.PT_NUMBER_LITERAL__TOKEN:
- setToken((String)newValue);
- return;
- }
- eDynamicSet(eFeature, newValue);
- }
-
- /**
- * <!-- begin-user-doc -->
- * <!-- end-user-doc -->
- * @generated
- */
- public void eUnset(EStructuralFeature eFeature) {
- switch (eDerivedStructuralFeatureID(eFeature)) {
- case InstantiationPackage.PT_NUMBER_LITERAL__TOKEN:
- setToken(TOKEN_EDEFAULT);
- return;
- }
- eDynamicUnset(eFeature);
- }
-
- /**
- * <!-- begin-user-doc -->
- * <!-- end-user-doc -->
- * @generated
- */
- public boolean eIsSet(EStructuralFeature eFeature) {
- switch (eDerivedStructuralFeatureID(eFeature)) {
- case InstantiationPackage.PT_NUMBER_LITERAL__TOKEN:
- return TOKEN_EDEFAULT == null ? token != null : !TOKEN_EDEFAULT.equals(token);
- }
- return eDynamicIsSet(eFeature);
- }
-
- /**
- * <!-- begin-user-doc -->
- * <!-- end-user-doc -->
- * @generated
- */
- public String toString() {
- if (eIsProxy()) return super.toString();
-
- StringBuffer result = new StringBuffer(super.toString());
- result.append(" (token: ");
- result.append(token);
- result.append(')');
- return result.toString();
- }
-
- /* (non-Javadoc)
- * @see org.eclipse.jem.internal.instantiation.impl.ExpressionImpl#accept0(org.eclipse.jem.internal.instantiation.ParseVisitor)
- */
- protected void accept0(ParseVisitor visitor) {
- visitor.visit(this);
- visitor.endVisit(this);
- }
-} //NumberLiteralImpl
diff --git a/plugins/org.eclipse.jem/javainst/org/eclipse/jem/internal/instantiation/impl/PTParenthesizedExpressionImpl.java b/plugins/org.eclipse.jem/javainst/org/eclipse/jem/internal/instantiation/impl/PTParenthesizedExpressionImpl.java
deleted file mode 100644
index a6c2851..0000000
--- a/plugins/org.eclipse.jem/javainst/org/eclipse/jem/internal/instantiation/impl/PTParenthesizedExpressionImpl.java
+++ /dev/null
@@ -1,198 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2004, 2005 IBM Corporation and others.
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
- *
- * Contributors:
- * IBM Corporation - initial API and implementation
- *******************************************************************************/
-package org.eclipse.jem.internal.instantiation.impl;
-/*
-
-
- */
-import org.eclipse.emf.common.notify.Notification;
-import org.eclipse.emf.common.notify.NotificationChain;
-
-import org.eclipse.emf.ecore.EClass;
-import org.eclipse.emf.ecore.EStructuralFeature;
-import org.eclipse.emf.ecore.InternalEObject;
-
-import org.eclipse.emf.ecore.impl.ENotificationImpl;
-
-import org.eclipse.jem.internal.instantiation.*;
-import org.eclipse.jem.internal.instantiation.PTExpression;
-import org.eclipse.jem.internal.instantiation.InstantiationPackage;
-import org.eclipse.jem.internal.instantiation.PTParenthesizedExpression;
-
-/**
- * <!-- begin-user-doc -->
- * An implementation of the model object '<em><b>Parenthesized Expression</b></em>'.
- * <!-- end-user-doc -->
- * <p>
- * The following features are implemented:
- * <ul>
- * <li>{@link org.eclipse.jem.internal.instantiation.impl.PTParenthesizedExpressionImpl#getExpression <em>Expression</em>}</li>
- * </ul>
- * </p>
- *
- * @generated
- */
-public class PTParenthesizedExpressionImpl extends PTExpressionImpl implements PTParenthesizedExpression {
- /**
- * The cached value of the '{@link #getExpression() <em>Expression</em>}' containment reference.
- * <!-- begin-user-doc -->
- * <!-- end-user-doc -->
- * @see #getExpression()
- * @generated
- * @ordered
- */
- protected PTExpression expression = null;
-
- /**
- * <!-- begin-user-doc -->
- * <!-- end-user-doc -->
- * @generated
- */
- protected PTParenthesizedExpressionImpl() {
- super();
- }
-
- /**
- * <!-- begin-user-doc -->
- * <!-- end-user-doc -->
- * @generated
- */
- protected EClass eStaticClass() {
- return InstantiationPackage.eINSTANCE.getPTParenthesizedExpression();
- }
-
- /**
- * <!-- begin-user-doc -->
- * <!-- end-user-doc -->
- * @generated
- */
- public PTExpression getExpression() {
- return expression;
- }
-
- /**
- * <!-- begin-user-doc -->
- * <!-- end-user-doc -->
- * @generated
- */
- public NotificationChain basicSetExpression(PTExpression newExpression, NotificationChain msgs) {
- PTExpression oldExpression = expression;
- expression = newExpression;
- if (eNotificationRequired()) {
- ENotificationImpl notification = new ENotificationImpl(this, Notification.SET, InstantiationPackage.PT_PARENTHESIZED_EXPRESSION__EXPRESSION, oldExpression, newExpression);
- if (msgs == null) msgs = notification; else msgs.add(notification);
- }
- return msgs;
- }
-
- /**
- * <!-- begin-user-doc -->
- * <!-- end-user-doc -->
- * @generated
- */
- public void setExpression(PTExpression newExpression) {
- if (newExpression != expression) {
- NotificationChain msgs = null;
- if (expression != null)
- msgs = ((InternalEObject)expression).eInverseRemove(this, EOPPOSITE_FEATURE_BASE - InstantiationPackage.PT_PARENTHESIZED_EXPRESSION__EXPRESSION, null, msgs);
- if (newExpression != null)
- msgs = ((InternalEObject)newExpression).eInverseAdd(this, EOPPOSITE_FEATURE_BASE - InstantiationPackage.PT_PARENTHESIZED_EXPRESSION__EXPRESSION, null, msgs);
- msgs = basicSetExpression(newExpression, msgs);
- if (msgs != null) msgs.dispatch();
- }
- else if (eNotificationRequired())
- eNotify(new ENotificationImpl(this, Notification.SET, InstantiationPackage.PT_PARENTHESIZED_EXPRESSION__EXPRESSION, newExpression, newExpression));
- }
-
- /**
- * <!-- begin-user-doc -->
- * <!-- end-user-doc -->
- * @generated
- */
- public NotificationChain eInverseRemove(InternalEObject otherEnd, int featureID, Class baseClass, NotificationChain msgs) {
- if (featureID >= 0) {
- switch (eDerivedStructuralFeatureID(featureID, baseClass)) {
- case InstantiationPackage.PT_PARENTHESIZED_EXPRESSION__EXPRESSION:
- return basicSetExpression(null, msgs);
- default:
- return eDynamicInverseRemove(otherEnd, featureID, baseClass, msgs);
- }
- }
- return eBasicSetContainer(null, featureID, msgs);
- }
-
- /**
- * <!-- begin-user-doc -->
- * <!-- end-user-doc -->
- * @generated
- */
- public Object eGet(EStructuralFeature eFeature, boolean resolve) {
- switch (eDerivedStructuralFeatureID(eFeature)) {
- case InstantiationPackage.PT_PARENTHESIZED_EXPRESSION__EXPRESSION:
- return getExpression();
- }
- return eDynamicGet(eFeature, resolve);
- }
-
- /**
- * <!-- begin-user-doc -->
- * <!-- end-user-doc -->
- * @generated
- */
- public void eSet(EStructuralFeature eFeature, Object newValue) {
- switch (eDerivedStructuralFeatureID(eFeature)) {
- case InstantiationPackage.PT_PARENTHESIZED_EXPRESSION__EXPRESSION:
- setExpression((PTExpression)newValue);
- return;
- }
- eDynamicSet(eFeature, newValue);
- }
-
- /**
- * <!-- begin-user-doc -->
- * <!-- end-user-doc -->
- * @generated
- */
- public void eUnset(EStructuralFeature eFeature) {
- switch (eDerivedStructuralFeatureID(eFeature)) {
- case InstantiationPackage.PT_PARENTHESIZED_EXPRESSION__EXPRESSION:
- setExpression((PTExpression)null);
- return;
- }
- eDynamicUnset(eFeature);
- }
-
- /**
- * <!-- begin-user-doc -->
- * <!-- end-user-doc -->
- * @generated
- */
- public boolean eIsSet(EStructuralFeature eFeature) {
- switch (eDerivedStructuralFeatureID(eFeature)) {
- case InstantiationPackage.PT_PARENTHESIZED_EXPRESSION__EXPRESSION:
- return expression != null;
- }
- return eDynamicIsSet(eFeature);
- }
-
- /*
- * (non-Javadoc)
- * @see org.eclipse.jem.internal.instantiation.impl.ExpressionImpl#accept0(org.eclipse.jem.internal.instantiation.ParseVisitor)
- */
- protected void accept0(ParseVisitor visitor) {
- boolean visitChildren = visitor.visit(this);
- if (visitChildren) {
- acceptChild(visitor, getExpression());
- }
- visitor.endVisit(this);
- }
-
-} //ParenthesizedExpressionImpl
diff --git a/plugins/org.eclipse.jem/javainst/org/eclipse/jem/internal/instantiation/impl/PTPrefixExpressionImpl.java b/plugins/org.eclipse.jem/javainst/org/eclipse/jem/internal/instantiation/impl/PTPrefixExpressionImpl.java
deleted file mode 100644
index 5d68aef..0000000
--- a/plugins/org.eclipse.jem/javainst/org/eclipse/jem/internal/instantiation/impl/PTPrefixExpressionImpl.java
+++ /dev/null
@@ -1,256 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2004, 2005 IBM Corporation and others.
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
- *
- * Contributors:
- * IBM Corporation - initial API and implementation
- *******************************************************************************/
-package org.eclipse.jem.internal.instantiation.impl;
-/*
-
-
- */
-import org.eclipse.emf.common.notify.Notification;
-import org.eclipse.emf.common.notify.NotificationChain;
-
-import org.eclipse.emf.ecore.EClass;
-import org.eclipse.emf.ecore.EStructuralFeature;
-import org.eclipse.emf.ecore.InternalEObject;
-
-import org.eclipse.emf.ecore.impl.ENotificationImpl;
-
-import org.eclipse.jem.internal.instantiation.*;
-import org.eclipse.jem.internal.instantiation.PTExpression;
-import org.eclipse.jem.internal.instantiation.InstantiationPackage;
-import org.eclipse.jem.internal.instantiation.PTPrefixExpression;
-import org.eclipse.jem.internal.instantiation.PTPrefixOperator;
-
-/**
- * <!-- begin-user-doc -->
- * An implementation of the model object '<em><b>Prefix Expression</b></em>'.
- * <!-- end-user-doc -->
- * <p>
- * The following features are implemented:
- * <ul>
- * <li>{@link org.eclipse.jem.internal.instantiation.impl.PTPrefixExpressionImpl#getOperator <em>Operator</em>}</li>
- * <li>{@link org.eclipse.jem.internal.instantiation.impl.PTPrefixExpressionImpl#getExpression <em>Expression</em>}</li>
- * </ul>
- * </p>
- *
- * @generated
- */
-public class PTPrefixExpressionImpl extends PTExpressionImpl implements PTPrefixExpression {
- /**
- * The default value of the '{@link #getOperator() <em>Operator</em>}' attribute.
- * <!-- begin-user-doc -->
- * <!-- end-user-doc -->
- * @see #getOperator()
- * @generated
- * @ordered
- */
- protected static final PTPrefixOperator OPERATOR_EDEFAULT = PTPrefixOperator.PLUS_LITERAL;
-
- /**
- * The cached value of the '{@link #getOperator() <em>Operator</em>}' attribute.
- * <!-- begin-user-doc -->
- * <!-- end-user-doc -->
- * @see #getOperator()
- * @generated
- * @ordered
- */
- protected PTPrefixOperator operator = OPERATOR_EDEFAULT;
-
- /**
- * The cached value of the '{@link #getExpression() <em>Expression</em>}' containment reference.
- * <!-- begin-user-doc -->
- * <!-- end-user-doc -->
- * @see #getExpression()
- * @generated
- * @ordered
- */
- protected PTExpression expression = null;
-
- /**
- * <!-- begin-user-doc -->
- * <!-- end-user-doc -->
- * @generated
- */
- protected PTPrefixExpressionImpl() {
- super();
- }
-
- /**
- * <!-- begin-user-doc -->
- * <!-- end-user-doc -->
- * @generated
- */
- protected EClass eStaticClass() {
- return InstantiationPackage.eINSTANCE.getPTPrefixExpression();
- }
-
- /**
- * <!-- begin-user-doc -->
- * <!-- end-user-doc -->
- * @generated
- */
- public PTPrefixOperator getOperator() {
- return operator;
- }
-
- /**
- * <!-- begin-user-doc -->
- * <!-- end-user-doc -->
- * @generated
- */
- public void setOperator(PTPrefixOperator newOperator) {
- PTPrefixOperator oldOperator = operator;
- operator = newOperator == null ? OPERATOR_EDEFAULT : newOperator;
- if (eNotificationRequired())
- eNotify(new ENotificationImpl(this, Notification.SET, InstantiationPackage.PT_PREFIX_EXPRESSION__OPERATOR, oldOperator, operator));
- }
-
- /**
- * <!-- begin-user-doc -->
- * <!-- end-user-doc -->
- * @generated
- */
- public PTExpression getExpression() {
- return expression;
- }
-
- /**
- * <!-- begin-user-doc -->
- * <!-- end-user-doc -->
- * @generated
- */
- public NotificationChain basicSetExpression(PTExpression newExpression, NotificationChain msgs) {
- PTExpression oldExpression = expression;
- expression = newExpression;
- if (eNotificationRequired()) {
- ENotificationImpl notification = new ENotificationImpl(this, Notification.SET, InstantiationPackage.PT_PREFIX_EXPRESSION__EXPRESSION, oldExpression, newExpression);
- if (msgs == null) msgs = notification; else msgs.add(notification);
- }
- return msgs;
- }
-
- /**
- * <!-- begin-user-doc -->
- * <!-- end-user-doc -->
- * @generated
- */
- public void setExpression(PTExpression newExpression) {
- if (newExpression != expression) {
- NotificationChain msgs = null;
- if (expression != null)
- msgs = ((InternalEObject)expression).eInverseRemove(this, EOPPOSITE_FEATURE_BASE - InstantiationPackage.PT_PREFIX_EXPRESSION__EXPRESSION, null, msgs);
- if (newExpression != null)
- msgs = ((InternalEObject)newExpression).eInverseAdd(this, EOPPOSITE_FEATURE_BASE - InstantiationPackage.PT_PREFIX_EXPRESSION__EXPRESSION, null, msgs);
- msgs = basicSetExpression(newExpression, msgs);
- if (msgs != null) msgs.dispatch();
- }
- else if (eNotificationRequired())
- eNotify(new ENotificationImpl(this, Notification.SET, InstantiationPackage.PT_PREFIX_EXPRESSION__EXPRESSION, newExpression, newExpression));
- }
-
- /**
- * <!-- begin-user-doc -->
- * <!-- end-user-doc -->
- * @generated
- */
- public NotificationChain eInverseRemove(InternalEObject otherEnd, int featureID, Class baseClass, NotificationChain msgs) {
- if (featureID >= 0) {
- switch (eDerivedStructuralFeatureID(featureID, baseClass)) {
- case InstantiationPackage.PT_PREFIX_EXPRESSION__EXPRESSION:
- return basicSetExpression(null, msgs);
- default:
- return eDynamicInverseRemove(otherEnd, featureID, baseClass, msgs);
- }
- }
- return eBasicSetContainer(null, featureID, msgs);
- }
-
- /**
- * <!-- begin-user-doc -->
- * <!-- end-user-doc -->
- * @generated
- */
- public Object eGet(EStructuralFeature eFeature, boolean resolve) {
- switch (eDerivedStructuralFeatureID(eFeature)) {
- case InstantiationPackage.PT_PREFIX_EXPRESSION__OPERATOR:
- return getOperator();
- case InstantiationPackage.PT_PREFIX_EXPRESSION__EXPRESSION:
- return getExpression();
- }
- return eDynamicGet(eFeature, resolve);
- }
-
- /**
- * <!-- begin-user-doc -->
- * <!-- end-user-doc -->
- * @generated
- */
- public void eSet(EStructuralFeature eFeature, Object newValue) {
- switch (eDerivedStructuralFeatureID(eFeature)) {
- case InstantiationPackage.PT_PREFIX_EXPRESSION__OPERATOR:
- setOperator((PTPrefixOperator)newValue);
- return;
- case InstantiationPackage.PT_PREFIX_EXPRESSION__EXPRESSION:
- setExpression((PTExpression)newValue);
- return;
- }
- eDynamicSet(eFeature, newValue);
- }
-
- /**
- * <!-- begin-user-doc -->
- * <!-- end-user-doc -->
- * @generated
- */
- public void eUnset(EStructuralFeature eFeature) {
- switch (eDerivedStructuralFeatureID(eFeature)) {
- case InstantiationPackage.PT_PREFIX_EXPRESSION__OPERATOR:
- setOperator(OPERATOR_EDEFAULT);
- return;
- case InstantiationPackage.PT_PREFIX_EXPRESSION__EXPRESSION:
- setExpression((PTExpression)null);
- return;
- }
- eDynamicUnset(eFeature);
- }
-
- /**
- * <!-- begin-user-doc -->
- * <!-- end-user-doc -->
- * @generated
- */
- public boolean eIsSet(EStructuralFeature eFeature) {
- switch (eDerivedStructuralFeatureID(eFeature)) {
- case InstantiationPackage.PT_PREFIX_EXPRESSION__OPERATOR:
- return operator != OPERATOR_EDEFAULT;
- case InstantiationPackage.PT_PREFIX_EXPRESSION__EXPRESSION:
- return expression != null;
- }
- return eDynamicIsSet(eFeature);
- }
-
- public String toString() {
- return super.toString(); // Really want toString to be final at PTExpression, but EMF doesn't allow it.
- }
-
- /*
- * (non-Javadoc)
- * @see org.eclipse.jem.internal.instantiation.impl.ExpressionImpl#accept0(org.eclipse.jem.internal.instantiation.ParseVisitor)
- */
- protected void accept0(ParseVisitor visitor) {
- boolean visitChildren = visitor.visit(this);
- if (visitChildren) {
- // visit children in normal left to right reading order
- acceptChild(visitor, getExpression());
- }
- visitor.endVisit(this);
- }
-
-} //PrefixExpressionImpl
diff --git a/plugins/org.eclipse.jem/javainst/org/eclipse/jem/internal/instantiation/impl/PTStringLiteralImpl.java b/plugins/org.eclipse.jem/javainst/org/eclipse/jem/internal/instantiation/impl/PTStringLiteralImpl.java
deleted file mode 100644
index 51b171f..0000000
--- a/plugins/org.eclipse.jem/javainst/org/eclipse/jem/internal/instantiation/impl/PTStringLiteralImpl.java
+++ /dev/null
@@ -1,286 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2004, 2005 IBM Corporation and others.
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
- *
- * Contributors:
- * IBM Corporation - initial API and implementation
- *******************************************************************************/
-package org.eclipse.jem.internal.instantiation.impl;
-/*
-
-
- */
-import org.eclipse.emf.common.notify.Notification;
-
-import org.eclipse.emf.ecore.EClass;
-import org.eclipse.emf.ecore.EStructuralFeature;
-
-import org.eclipse.emf.ecore.impl.ENotificationImpl;
-
-import org.eclipse.jem.internal.instantiation.*;
-import org.eclipse.jem.internal.instantiation.InstantiationPackage;
-import org.eclipse.jem.internal.instantiation.PTStringLiteral;
-
-/**
- * <!-- begin-user-doc -->
- * An implementation of the model object '<em><b>String Literal</b></em>'.
- * <!-- end-user-doc -->
- * <p>
- * The following features are implemented:
- * <ul>
- * <li>{@link org.eclipse.jem.internal.instantiation.impl.PTStringLiteralImpl#getEscapedValue <em>Escaped Value</em>}</li>
- * <li>{@link org.eclipse.jem.internal.instantiation.impl.PTStringLiteralImpl#getLiteralValue <em>Literal Value</em>}</li>
- * </ul>
- * </p>
- *
- * @generated
- */
-public class PTStringLiteralImpl extends PTExpressionImpl implements PTStringLiteral {
- /**
- * The default value of the '{@link #getEscapedValue() <em>Escaped Value</em>}' attribute.
- * <!-- begin-user-doc -->
- * <!-- end-user-doc -->
- * @see #getEscapedValue()
- * @generated
- * @ordered
- */
- protected static final String ESCAPED_VALUE_EDEFAULT = null;
-
- /**
- * The cached value of the '{@link #getEscapedValue() <em>Escaped Value</em>}' attribute.
- * <!-- begin-user-doc -->
- * <!-- end-user-doc -->
- * @see #getEscapedValue()
- * @generated
- * @ordered
- */
- protected String escapedValue = ESCAPED_VALUE_EDEFAULT;
-
- /**
- * The default value of the '{@link #getLiteralValue() <em>Literal Value</em>}' attribute.
- * <!-- begin-user-doc -->
- * <!-- end-user-doc -->
- * @see #getLiteralValue()
- * @generated
- * @ordered
- */
- protected static final String LITERAL_VALUE_EDEFAULT = null;
-
- /**
- * The cached value of the '{@link #getLiteralValue() <em>Literal Value</em>}' attribute.
- * <!-- begin-user-doc -->
- * <!-- end-user-doc -->
- * @see #getLiteralValue()
- * @generated
- * @ordered
- */
- protected String literalValue = LITERAL_VALUE_EDEFAULT;
-
- /**
- * <!-- begin-user-doc -->
- * <!-- end-user-doc -->
- * @generated
- */
- protected PTStringLiteralImpl() {
- super();
- }
-
- /**
- * <!-- begin-user-doc -->
- * <!-- end-user-doc -->
- * @generated
- */
- protected EClass eStaticClass() {
- return InstantiationPackage.eINSTANCE.getPTStringLiteral();
- }
-
- /**
- * <!-- begin-user-doc -->
- * <!-- end-user-doc -->
- * @generated
- */
- public String getEscapedValue() {
- return escapedValue;
- }
-
- public void setEscapedValue(String newEscapedValue) {
- stringLiteralSet = false;
- setLiteralValueGen(LITERAL_VALUE_EDEFAULT);
- setEscapedValueGen(newEscapedValue);
- }
-
- /**
- * <!-- begin-user-doc -->
- * <!-- end-user-doc -->
- * @generated
- */
- public void setEscapedValueGen(String newEscapedValue) {
- String oldEscapedValue = escapedValue;
- escapedValue = newEscapedValue;
- if (eNotificationRequired())
- eNotify(new ENotificationImpl(this, Notification.SET, InstantiationPackage.PT_STRING_LITERAL__ESCAPED_VALUE, oldEscapedValue, escapedValue));
- }
-
- private boolean stringLiteralSet;
-
- public String getLiteralValue() {
- if (!stringLiteralSet && escapedValue != ESCAPED_VALUE_EDEFAULT) {
- String s = getEscapedValue();
- int len = s.length();
- if (len < 2 || s.charAt(0) != '\"' || s.charAt(len-1) != '\"' ) {
- throw new IllegalArgumentException();
- }
-
- StringBuffer buffer = new StringBuffer(len);
- int stop = len-1;
- for (int i = 1; i < stop; i++) {
- char ati = s.charAt(i);
- if (ati == '\\') {
- if (++i < stop) {
- ati = s.charAt(i);
- if (ati == 'u') {
- int c1 = 0, c2 = 0, c3 = 0, c4 = 0;
- if (i+4 >= stop
- || (c1 = Character.getNumericValue(s.charAt(++i))) > 15
- || c1 < 0
- || (c2 = Character.getNumericValue(s.charAt(++i))) > 15
- || c2 < 0
- || (c3 = Character.getNumericValue(s.charAt(++i))) > 15
- || c3 < 0
- || (c4 = Character.getNumericValue(s.charAt(++i))) > 15
- || c4 < 0){
- throw new IllegalArgumentException("illegal string literal");//$NON-NLS-1$
- } else
- buffer.append((char) (((c1 * 16 + c2) * 16 + c3) * 16 + c4));
- } else
- buffer.append(PTCharacterLiteralImpl.getCharEscaped(ati));
- } else
- throw new IllegalArgumentException("illegal string literal");//$NON-NLS-1$
- } else
- buffer.append(ati);
- }
-
- stringLiteralSet = true;
- setLiteralValueGen(buffer.toString());
- }
-
- return getLiteralValueGen();
- }
-
- /**
- * <!-- begin-user-doc -->
- * <!-- end-user-doc -->
- * @generated
- */
- public String getLiteralValueGen() {
- return literalValue;
- }
-
- public void setLiteralValue(String newLiteralValue) {
- stringLiteralSet = true;
- setLiteralValueGen(newLiteralValue);
-
- StringBuffer b = new StringBuffer(newLiteralValue.length()+2);
- b.append('\"'); // opening delimiter
- int stop = newLiteralValue.length();
- for (int i = 0; i < stop; i++) {
- PTCharacterLiteralImpl.appendCharacter(newLiteralValue.charAt(i), b);
- }
- b.append('\"'); // closing delimiter
- setEscapedValueGen(b.toString());
-
- }
-
- /**
- * <!-- begin-user-doc -->
- * <!-- end-user-doc -->
- * @generated
- */
- public void setLiteralValueGen(String newLiteralValue) {
- String oldLiteralValue = literalValue;
- literalValue = newLiteralValue;
- if (eNotificationRequired())
- eNotify(new ENotificationImpl(this, Notification.SET, InstantiationPackage.PT_STRING_LITERAL__LITERAL_VALUE, oldLiteralValue, literalValue));
- }
-
- /**
- * <!-- begin-user-doc -->
- * <!-- end-user-doc -->
- * @generated
- */
- public Object eGet(EStructuralFeature eFeature, boolean resolve) {
- switch (eDerivedStructuralFeatureID(eFeature)) {
- case InstantiationPackage.PT_STRING_LITERAL__ESCAPED_VALUE:
- return getEscapedValue();
- case InstantiationPackage.PT_STRING_LITERAL__LITERAL_VALUE:
- return getLiteralValue();
- }
- return eDynamicGet(eFeature, resolve);
- }
-
- /**
- * <!-- begin-user-doc -->
- * <!-- end-user-doc -->
- * @generated
- */
- public void eSet(EStructuralFeature eFeature, Object newValue) {
- switch (eDerivedStructuralFeatureID(eFeature)) {
- case InstantiationPackage.PT_STRING_LITERAL__ESCAPED_VALUE:
- setEscapedValue((String)newValue);
- return;
- case InstantiationPackage.PT_STRING_LITERAL__LITERAL_VALUE:
- setLiteralValue((String)newValue);
- return;
- }
- eDynamicSet(eFeature, newValue);
- }
-
- /**
- * <!-- begin-user-doc -->
- * <!-- end-user-doc -->
- * @generated
- */
- public void eUnset(EStructuralFeature eFeature) {
- switch (eDerivedStructuralFeatureID(eFeature)) {
- case InstantiationPackage.PT_STRING_LITERAL__ESCAPED_VALUE:
- setEscapedValue(ESCAPED_VALUE_EDEFAULT);
- return;
- case InstantiationPackage.PT_STRING_LITERAL__LITERAL_VALUE:
- setLiteralValue(LITERAL_VALUE_EDEFAULT);
- return;
- }
- eDynamicUnset(eFeature);
- }
-
- /**
- * <!-- begin-user-doc -->
- * <!-- end-user-doc -->
- * @generated
- */
- public boolean eIsSet(EStructuralFeature eFeature) {
- switch (eDerivedStructuralFeatureID(eFeature)) {
- case InstantiationPackage.PT_STRING_LITERAL__ESCAPED_VALUE:
- return ESCAPED_VALUE_EDEFAULT == null ? escapedValue != null : !ESCAPED_VALUE_EDEFAULT.equals(escapedValue);
- case InstantiationPackage.PT_STRING_LITERAL__LITERAL_VALUE:
- return LITERAL_VALUE_EDEFAULT == null ? literalValue != null : !LITERAL_VALUE_EDEFAULT.equals(literalValue);
- }
- return eDynamicIsSet(eFeature);
- }
-
- public String toString() {
- return super.toString(); // Really want toString to be final at PTExpression, but EMF doesn't allow it.
- }
-
- /*
- * (non-Javadoc)
- * @see org.eclipse.jem.internal.instantiation.impl.ExpressionImpl#accept0(org.eclipse.jem.internal.instantiation.ParseVisitor)
- */
- protected void accept0(ParseVisitor visitor) {
- visitor.visit(this);
- visitor.endVisit(this);
- }
-
-} //StringLiteralImpl
diff --git a/plugins/org.eclipse.jem/javainst/org/eclipse/jem/internal/instantiation/impl/PTThisLiteralImpl.java b/plugins/org.eclipse.jem/javainst/org/eclipse/jem/internal/instantiation/impl/PTThisLiteralImpl.java
deleted file mode 100644
index 9453705..0000000
--- a/plugins/org.eclipse.jem/javainst/org/eclipse/jem/internal/instantiation/impl/PTThisLiteralImpl.java
+++ /dev/null
@@ -1,59 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2004, 2005 IBM Corporation and others.
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
- *
- * Contributors:
- * IBM Corporation - initial API and implementation
- *******************************************************************************/
-package org.eclipse.jem.internal.instantiation.impl;
-/*
-
-
- */
-import org.eclipse.emf.ecore.EClass;
-
-import org.eclipse.jem.internal.instantiation.*;
-import org.eclipse.jem.internal.instantiation.InstantiationPackage;
-import org.eclipse.jem.internal.instantiation.PTThisLiteral;
-
-/**
- * <!-- begin-user-doc -->
- * An implementation of the model object '<em><b>This Literal</b></em>'.
- * <!-- end-user-doc -->
- * <p>
- * </p>
- *
- * @generated
- */
-public class PTThisLiteralImpl extends PTExpressionImpl implements PTThisLiteral {
- /**
- * <!-- begin-user-doc -->
- * <!-- end-user-doc -->
- * @generated
- */
- protected PTThisLiteralImpl() {
- super();
- }
-
- /**
- * <!-- begin-user-doc -->
- * <!-- end-user-doc -->
- * @generated
- */
- protected EClass eStaticClass() {
- return InstantiationPackage.eINSTANCE.getPTThisLiteral();
- }
-
- /*
- * (non-Javadoc)
- * @see org.eclipse.jem.internal.instantiation.impl.ExpressionImpl#accept0(org.eclipse.jem.internal.instantiation.ParseVisitor)
- */
- protected void accept0(ParseVisitor visitor) {
- visitor.visit(this);
- visitor.endVisit(this);
- }
-
-} //ThisLiteralImpl
diff --git a/plugins/org.eclipse.jem/javainst/org/eclipse/jem/internal/instantiation/impl/PTTypeLiteralImpl.java b/plugins/org.eclipse.jem/javainst/org/eclipse/jem/internal/instantiation/impl/PTTypeLiteralImpl.java
deleted file mode 100644
index 3dd5b7e..0000000
--- a/plugins/org.eclipse.jem/javainst/org/eclipse/jem/internal/instantiation/impl/PTTypeLiteralImpl.java
+++ /dev/null
@@ -1,166 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2004, 2005 IBM Corporation and others.
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
- *
- * Contributors:
- * IBM Corporation - initial API and implementation
- *******************************************************************************/
-package org.eclipse.jem.internal.instantiation.impl;
-/*
-
-
- */
-import org.eclipse.emf.common.notify.Notification;
-
-import org.eclipse.emf.ecore.EClass;
-import org.eclipse.emf.ecore.EStructuralFeature;
-
-import org.eclipse.emf.ecore.impl.ENotificationImpl;
-
-import org.eclipse.jem.internal.instantiation.*;
-import org.eclipse.jem.internal.instantiation.InstantiationPackage;
-import org.eclipse.jem.internal.instantiation.PTTypeLiteral;
-
-/**
- * <!-- begin-user-doc -->
- * An implementation of the model object '<em><b>Type Literal</b></em>'.
- * <!-- end-user-doc -->
- * <p>
- * The following features are implemented:
- * <ul>
- * <li>{@link org.eclipse.jem.internal.instantiation.impl.PTTypeLiteralImpl#getType <em>Type</em>}</li>
- * </ul>
- * </p>
- *
- * @generated
- */
-public class PTTypeLiteralImpl extends PTExpressionImpl implements PTTypeLiteral {
- /**
- * The default value of the '{@link #getType() <em>Type</em>}' attribute.
- * <!-- begin-user-doc -->
- * <!-- end-user-doc -->
- * @see #getType()
- * @generated
- * @ordered
- */
- protected static final String TYPE_EDEFAULT = null;
-
- /**
- * The cached value of the '{@link #getType() <em>Type</em>}' attribute.
- * <!-- begin-user-doc -->
- * <!-- end-user-doc -->
- * @see #getType()
- * @generated
- * @ordered
- */
- protected String type = TYPE_EDEFAULT;
-
- /**
- * <!-- begin-user-doc -->
- * <!-- end-user-doc -->
- * @generated
- */
- protected PTTypeLiteralImpl() {
- super();
- }
-
- /**
- * <!-- begin-user-doc -->
- * <!-- end-user-doc -->
- * @generated
- */
- protected EClass eStaticClass() {
- return InstantiationPackage.eINSTANCE.getPTTypeLiteral();
- }
-
- /**
- * <!-- begin-user-doc -->
- * <!-- end-user-doc -->
- * @generated
- */
- public String getType() {
- return type;
- }
-
- /**
- * <!-- begin-user-doc -->
- * <!-- end-user-doc -->
- * @generated
- */
- public void setType(String newType) {
- String oldType = type;
- type = newType;
- if (eNotificationRequired())
- eNotify(new ENotificationImpl(this, Notification.SET, InstantiationPackage.PT_TYPE_LITERAL__TYPE, oldType, type));
- }
-
- /**
- * <!-- begin-user-doc -->
- * <!-- end-user-doc -->
- * @generated
- */
- public Object eGet(EStructuralFeature eFeature, boolean resolve) {
- switch (eDerivedStructuralFeatureID(eFeature)) {
- case InstantiationPackage.PT_TYPE_LITERAL__TYPE:
- return getType();
- }
- return eDynamicGet(eFeature, resolve);
- }
-
- /**
- * <!-- begin-user-doc -->
- * <!-- end-user-doc -->
- * @generated
- */
- public void eSet(EStructuralFeature eFeature, Object newValue) {
- switch (eDerivedStructuralFeatureID(eFeature)) {
- case InstantiationPackage.PT_TYPE_LITERAL__TYPE:
- setType((String)newValue);
- return;
- }
- eDynamicSet(eFeature, newValue);
- }
-
- /**
- * <!-- begin-user-doc -->
- * <!-- end-user-doc -->
- * @generated
- */
- public void eUnset(EStructuralFeature eFeature) {
- switch (eDerivedStructuralFeatureID(eFeature)) {
- case InstantiationPackage.PT_TYPE_LITERAL__TYPE:
- setType(TYPE_EDEFAULT);
- return;
- }
- eDynamicUnset(eFeature);
- }
-
- /**
- * <!-- begin-user-doc -->
- * <!-- end-user-doc -->
- * @generated
- */
- public boolean eIsSet(EStructuralFeature eFeature) {
- switch (eDerivedStructuralFeatureID(eFeature)) {
- case InstantiationPackage.PT_TYPE_LITERAL__TYPE:
- return TYPE_EDEFAULT == null ? type != null : !TYPE_EDEFAULT.equals(type);
- }
- return eDynamicIsSet(eFeature);
- }
-
- public String toString() {
- return super.toString(); // Really want toString to be final at PTExpression, but EMF doesn't allow it.
- }
-
- /*
- * (non-Javadoc)
- * @see org.eclipse.jem.internal.instantiation.impl.ExpressionImpl#accept0(org.eclipse.jem.internal.instantiation.ParseVisitor)
- */
- protected void accept0(ParseVisitor visitor) {
- visitor.visit(this);
- visitor.endVisit(this);
- }
-} //TypeLiteralImpl
diff --git a/plugins/org.eclipse.jem/javainst/org/eclipse/jem/internal/instantiation/impl/ParseTreeAllocationImpl.java b/plugins/org.eclipse.jem/javainst/org/eclipse/jem/internal/instantiation/impl/ParseTreeAllocationImpl.java
deleted file mode 100644
index dfb5cc7..0000000
--- a/plugins/org.eclipse.jem/javainst/org/eclipse/jem/internal/instantiation/impl/ParseTreeAllocationImpl.java
+++ /dev/null
@@ -1,197 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2004, 2005 IBM Corporation and others.
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
- *
- * Contributors:
- * IBM Corporation - initial API and implementation
- *******************************************************************************/
-package org.eclipse.jem.internal.instantiation.impl;
-/*
-
-
- */
-import org.eclipse.emf.common.notify.Notification;
-
-import org.eclipse.emf.common.notify.NotificationChain;
-
-import org.eclipse.emf.ecore.EClass;
-import org.eclipse.emf.ecore.EStructuralFeature;
-import org.eclipse.emf.ecore.InternalEObject;
-
-import org.eclipse.emf.ecore.impl.ENotificationImpl;
-
-import org.eclipse.jem.internal.instantiation.PTExpression;
-import org.eclipse.jem.internal.instantiation.InstantiationPackage;
-import org.eclipse.jem.internal.instantiation.ParseTreeAllocation;
-
-/**
- * <!-- begin-user-doc -->
- * An implementation of the model object '<em><b>Parse Tree Allocation</b></em>'.
- * <!-- end-user-doc -->
- * <p>
- * The following features are implemented:
- * <ul>
- * <li>{@link org.eclipse.jem.internal.instantiation.impl.ParseTreeAllocationImpl#getExpression <em>Expression</em>}</li>
- * </ul>
- * </p>
- *
- * @generated
- */
-public class ParseTreeAllocationImpl extends JavaAllocationImpl implements ParseTreeAllocation {
- /**
- * The cached value of the '{@link #getExpression() <em>Expression</em>}' containment reference.
- * <!-- begin-user-doc -->
- * <!-- end-user-doc -->
- * @see #getExpression()
- * @generated
- * @ordered
- */
- protected PTExpression expression = null;
-
- /**
- * <!-- begin-user-doc -->
- * <!-- end-user-doc -->
- * @generated
- */
- protected ParseTreeAllocationImpl() {
- super();
- }
-
- /**
- * <!-- begin-user-doc -->
- * <!-- end-user-doc -->
- * @generated
- */
- protected EClass eStaticClass() {
- return InstantiationPackage.eINSTANCE.getParseTreeAllocation();
- }
-
- /**
- * <!-- begin-user-doc -->
- * <!-- end-user-doc -->
- * @generated
- */
- public PTExpression getExpression() {
- return expression;
- }
-
- /**
- * <!-- begin-user-doc -->
- * <!-- end-user-doc -->
- * @generated
- */
- public NotificationChain basicSetExpression(PTExpression newExpression, NotificationChain msgs) {
- PTExpression oldExpression = expression;
- expression = newExpression;
- if (eNotificationRequired()) {
- ENotificationImpl notification = new ENotificationImpl(this, Notification.SET, InstantiationPackage.PARSE_TREE_ALLOCATION__EXPRESSION, oldExpression, newExpression);
- if (msgs == null) msgs = notification; else msgs.add(notification);
- }
- return msgs;
- }
-
- /**
- * <!-- begin-user-doc -->
- * <!-- end-user-doc -->
- * @generated
- */
- public void setExpression(PTExpression newExpression) {
- if (newExpression != expression) {
- NotificationChain msgs = null;
- if (expression != null)
- msgs = ((InternalEObject)expression).eInverseRemove(this, EOPPOSITE_FEATURE_BASE - InstantiationPackage.PARSE_TREE_ALLOCATION__EXPRESSION, null, msgs);
- if (newExpression != null)
- msgs = ((InternalEObject)newExpression).eInverseAdd(this, EOPPOSITE_FEATURE_BASE - InstantiationPackage.PARSE_TREE_ALLOCATION__EXPRESSION, null, msgs);
- msgs = basicSetExpression(newExpression, msgs);
- if (msgs != null) msgs.dispatch();
- }
- else if (eNotificationRequired())
- eNotify(new ENotificationImpl(this, Notification.SET, InstantiationPackage.PARSE_TREE_ALLOCATION__EXPRESSION, newExpression, newExpression));
- }
-
- /**
- * <!-- begin-user-doc -->
- * <!-- end-user-doc -->
- * @generated
- */
- public NotificationChain eInverseRemove(InternalEObject otherEnd, int featureID, Class baseClass, NotificationChain msgs) {
- if (featureID >= 0) {
- switch (eDerivedStructuralFeatureID(featureID, baseClass)) {
- case InstantiationPackage.PARSE_TREE_ALLOCATION__EXPRESSION:
- return basicSetExpression(null, msgs);
- default:
- return eDynamicInverseRemove(otherEnd, featureID, baseClass, msgs);
- }
- }
- return eBasicSetContainer(null, featureID, msgs);
- }
-
- /**
- * <!-- begin-user-doc -->
- * <!-- end-user-doc -->
- * @generated
- */
- public Object eGet(EStructuralFeature eFeature, boolean resolve) {
- switch (eDerivedStructuralFeatureID(eFeature)) {
- case InstantiationPackage.PARSE_TREE_ALLOCATION__EXPRESSION:
- return getExpression();
- }
- return eDynamicGet(eFeature, resolve);
- }
-
- /**
- * <!-- begin-user-doc -->
- * <!-- end-user-doc -->
- * @generated
- */
- public void eSet(EStructuralFeature eFeature, Object newValue) {
- switch (eDerivedStructuralFeatureID(eFeature)) {
- case InstantiationPackage.PARSE_TREE_ALLOCATION__EXPRESSION:
- setExpression((PTExpression)newValue);
- return;
- }
- eDynamicSet(eFeature, newValue);
- }
-
- /**
- * <!-- begin-user-doc -->
- * <!-- end-user-doc -->
- * @generated
- */
- public void eUnset(EStructuralFeature eFeature) {
- switch (eDerivedStructuralFeatureID(eFeature)) {
- case InstantiationPackage.PARSE_TREE_ALLOCATION__EXPRESSION:
- setExpression((PTExpression)null);
- return;
- }
- eDynamicUnset(eFeature);
- }
-
- /**
- * <!-- begin-user-doc -->
- * <!-- end-user-doc -->
- * @generated
- */
- public boolean eIsSet(EStructuralFeature eFeature) {
- switch (eDerivedStructuralFeatureID(eFeature)) {
- case InstantiationPackage.PARSE_TREE_ALLOCATION__EXPRESSION:
- return expression != null;
- }
- return eDynamicIsSet(eFeature);
- }
-
- /* (non-Javadoc)
- * @see java.lang.Object#toString()
- */
- public String toString() {
- return getExpression() != null ? getExpression().toString() : super.toString();
- }
-
- public boolean isParseTree() {
- return true;
- }
-
-} //ParseTreeAllocationImpl
diff --git a/plugins/org.eclipse.jem/javainst/org/eclipse/jem/internal/instantiation/impl/messages.properties b/plugins/org.eclipse.jem/javainst/org/eclipse/jem/internal/instantiation/impl/messages.properties
deleted file mode 100644
index 43b44ad..0000000
--- a/plugins/org.eclipse.jem/javainst/org/eclipse/jem/internal/instantiation/impl/messages.properties
+++ /dev/null
@@ -1,11 +0,0 @@
-###############################################################################
-# Copyright (c) 2003, 2005 IBM Corporation and others.
-# All rights reserved. This program and the accompanying materials
-# are made available under the terms of the Eclipse Public License v1.0
-# which accompanies this distribution, and is available at
-# http://www.eclipse.org/legal/epl-v10.html
-#
-# Contributors:
-# IBM Corporation - initial API and implementation
-###############################################################################
-NaiveExpressionFlattener_InvalidExpression= invalid: "{0}"
diff --git a/plugins/org.eclipse.jem/model/instance.ecore b/plugins/org.eclipse.jem/model/instance.ecore
deleted file mode 100644
index 6a4ff9f..0000000
--- a/plugins/org.eclipse.jem/model/instance.ecore
+++ /dev/null
@@ -1,498 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<ecore:EPackage xmi:version="2.0"
- xmlns:xmi="http://www.omg.org/XMI" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
- xmlns:ecore="http://www.eclipse.org/emf/2002/Ecore" name="instantiation"
- nsURI="http:///org/eclipse/jem/internal/instantiation.ecore" nsPrefix="org.eclipse.jem.internal.instantiation">
- <eAnnotations source="http://www.eclipse.org/emf/2002/GenModel">
- <details key="documentation" value="Java Instantiation Package"/>
- </eAnnotations>
- <eClassifiers xsi:type="ecore:EClass" name="IJavaDataTypeInstance" instanceClassName="org.eclipse.jem.internal.instantiation.base.IJavaDataTypeInstance"
- abstract="true" interface="true" eSuperTypes="#//IJavaInstance"/>
- <eClassifiers xsi:type="ecore:EClass" name="IJavaInstance" instanceClassName="org.eclipse.jem.internal.instantiation.base.IJavaInstance"
- abstract="true" interface="true"/>
- <eClassifiers xsi:type="ecore:EClass" name="IJavaObjectInstance" instanceClassName="org.eclipse.jem.internal.instantiation.base.IJavaObjectInstance"
- abstract="true" interface="true" eSuperTypes="#//IJavaInstance">
- <eAnnotations source="http://www.eclipse.org/emf/2002/GenModel">
- <details key="documentation" value="This interface is the instance of an java object in the java model."/>
- </eAnnotations>
- </eClassifiers>
- <eClassifiers xsi:type="ecore:EClass" name="JavaAllocation" abstract="true">
- <eAnnotations source="http://www.eclipse.org/emf/2002/GenModel">
- <details key="documentation" value="This class is the abstract base class of the allocation class. It is the value of the "allocation" property on a Java Object so that the actual allocation can be controlled. For example, there could be one for just init string, or one for serialized."/>
- </eAnnotations>
- </eClassifiers>
- <eClassifiers xsi:type="ecore:EClass" name="InitStringAllocation" eSuperTypes="#//JavaAllocation">
- <eAnnotations source="http://www.eclipse.org/emf/2002/GenModel">
- <details key="documentation" value="This is used when the allocation string can be parsed by the remote vm. It uses the allocString."/>
- </eAnnotations>
- <eStructuralFeatures xsi:type="ecore:EAttribute" name="initString" eType="ecore:EDataType http://www.eclipse.org/emf/2002/Ecore#//EString">
- <eAnnotations source="http://www.eclipse.org/emf/2002/GenModel">
- <details key="documentation" value="This is the initialization string for this object."/>
- </eAnnotations>
- </eStructuralFeatures>
- </eClassifiers>
- <eClassifiers xsi:type="ecore:EClass" name="ImplicitAllocation" eSuperTypes="#//JavaAllocation">
- <eAnnotations source="http://www.eclipse.org/emf/2002/GenModel">
- <details key="documentation" value="This class is for an implicit allocation where the object comes from the feature of another object. It is the live Java value from the remote vm."/>
- </eAnnotations>
- <eStructuralFeatures xsi:type="ecore:EReference" name="parent" lowerBound="1"
- eType="ecore:EClass ../../org.eclipse.emf.ecore/model/Ecore.ecore#//EObject"/>
- <eStructuralFeatures xsi:type="ecore:EReference" name="feature" lowerBound="1"
- eType="ecore:EClass ../../org.eclipse.emf.ecore/model/Ecore.ecore#//EStructuralFeature"/>
- </eClassifiers>
- <eClassifiers xsi:type="ecore:EClass" name="ParseTreeAllocation" eSuperTypes="#//JavaAllocation">
- <eAnnotations source="http://www.eclipse.org/emf/2002/GenModel">
- <details key="documentation" value="Allocations via Parse Trees."/>
- </eAnnotations>
- <eStructuralFeatures xsi:type="ecore:EReference" name="expression" lowerBound="1"
- eType="#//PTExpression" containment="true"/>
- </eClassifiers>
- <eClassifiers xsi:type="ecore:EClass" name="PTExpression" abstract="true"/>
- <eClassifiers xsi:type="ecore:EClass" name="PTArrayAccess" eSuperTypes="#//PTExpression">
- <eAnnotations source="http://www.eclipse.org/emf/2002/GenModel">
- <details key="documentation" value="Array access. e.g. x[3]. 

Unlike AST, the entire expression of type x[3][4] will be done in one expression rather than having a separate ArrayAccess for each dimension. This is just a simplification. This can only be used if it is a simple array access where it is of the form {expression}[expression][expression]."/>
- </eAnnotations>
- <eStructuralFeatures xsi:type="ecore:EReference" name="array" eType="#//PTExpression"
- containment="true">
- <eAnnotations source="http://www.eclipse.org/emf/2002/GenModel">
- <details key="documentation" value="The expression representing the array to access."/>
- </eAnnotations>
- </eStructuralFeatures>
- <eStructuralFeatures xsi:type="ecore:EReference" name="indexes" lowerBound="1"
- upperBound="-1" eType="#//PTExpression" containment="true">
- <eAnnotations source="http://www.eclipse.org/emf/2002/GenModel">
- <details key="documentation" value="The expressions representing the indexes of the access."/>
- </eAnnotations>
- </eStructuralFeatures>
- </eClassifiers>
- <eClassifiers xsi:type="ecore:EClass" name="PTArrayCreation" eSuperTypes="#//PTExpression">
- <eAnnotations source="http://www.eclipse.org/emf/2002/GenModel">
- <details key="documentation" value="Array Creation expression, e.g. new int[3] or new java.langString[][] {{"a"}, {"b"}}"/>
- </eAnnotations>
- <eStructuralFeatures xsi:type="ecore:EAttribute" name="type" eType="ecore:EDataType http://www.eclipse.org/emf/2002/Ecore#//EString">
- <eAnnotations source="http://www.eclipse.org/emf/2002/GenModel">
- <details key="documentation" value="The fully-qualified type, e.g. int[][] or java.lang.String[], including the number of dimension brackets."/>
- </eAnnotations>
- </eStructuralFeatures>
- <eStructuralFeatures xsi:type="ecore:EReference" name="dimensions" upperBound="-1"
- eType="#//PTExpression" containment="true">
- <eAnnotations source="http://www.eclipse.org/emf/2002/GenModel">
- <details key="documentation" value="The list of expressions for the dimensions. You can have [3][4][] but [][33] is invalid. So for each dimension that has an expression, there will be an entry in the list, in the correct order. When you reach the empty dimensions, the list will end too. "/>
- </eAnnotations>
- </eStructuralFeatures>
- <eStructuralFeatures xsi:type="ecore:EReference" name="initializer" eType="#//PTArrayInitializer"
- containment="true">
- <eAnnotations source="http://www.eclipse.org/emf/2002/GenModel">
- <details key="documentation" value="This is the initializer, if any, for this array. E.g. new int[] {2,3}. It is the {2,3}."/>
- </eAnnotations>
- </eStructuralFeatures>
- </eClassifiers>
- <eClassifiers xsi:type="ecore:EClass" name="PTArrayInitializer" eSuperTypes="#//PTExpression">
- <eAnnotations source="http://www.eclipse.org/emf/2002/GenModel">
- <details key="documentation" value="Array initialization expression. This is the entire expression, e.g. {2, 3}, or {{2,3}, 4}. In the second case, the {2,3} will be an ArrayInitializer contained within the expressions list for the top ArrayInitializer."/>
- </eAnnotations>
- <eStructuralFeatures xsi:type="ecore:EReference" name="expressions" upperBound="-1"
- eType="#//PTExpression" containment="true">
- <eAnnotations source="http://www.eclipse.org/emf/2002/GenModel">
- <details key="documentation" value="This isthe list of expressions within the initializer, e.g. {2, 3}, or {{2,3}, 4}. In the first case it will be two NumberLiterals. In the second case, the {2,3} will be an ArrayInitializer, followed by a NumberLiteral."/>
- </eAnnotations>
- </eStructuralFeatures>
- </eClassifiers>
- <eClassifiers xsi:type="ecore:EClass" name="PTBooleanLiteral" eSuperTypes="#//PTExpression">
- <eAnnotations source="http://www.eclipse.org/emf/2002/GenModel">
- <details key="documentation" value="This represents a primitive boolean literal, i.e. true or false directly in the code."/>
- </eAnnotations>
- <eStructuralFeatures xsi:type="ecore:EAttribute" name="booleanValue" eType="ecore:EDataType http://www.eclipse.org/emf/2002/Ecore#//EBoolean">
- <eAnnotations source="http://www.eclipse.org/emf/2002/GenModel">
- <details key="documentation" value="The value of the literal."/>
- </eAnnotations>
- </eStructuralFeatures>
- </eClassifiers>
- <eClassifiers xsi:type="ecore:EClass" name="PTCastExpression" eSuperTypes="#//PTExpression">
- <eAnnotations source="http://www.eclipse.org/emf/2002/GenModel">
- <details key="documentation" value="Cast expression, e.g. (short) 10"/>
- </eAnnotations>
- <eStructuralFeatures xsi:type="ecore:EAttribute" name="type" eType="ecore:EDataType http://www.eclipse.org/emf/2002/Ecore#//EString">
- <eAnnotations source="http://www.eclipse.org/emf/2002/GenModel">
- <details key="documentation" value="This is the fully-qualified type of the cast, e.g. int or java.lang.String"/>
- </eAnnotations>
- </eStructuralFeatures>
- <eStructuralFeatures xsi:type="ecore:EReference" name="expression" eType="#//PTExpression"
- containment="true">
- <eAnnotations source="http://www.eclipse.org/emf/2002/GenModel">
- <details key="documentation" value="The expression being casted."/>
- </eAnnotations>
- </eStructuralFeatures>
- </eClassifiers>
- <eClassifiers xsi:type="ecore:EClass" name="PTCharacterLiteral" eSuperTypes="#//PTExpression">
- <eAnnotations source="http://www.eclipse.org/emf/2002/GenModel">
- <details key="documentation" value="This represents a primitive character expression, e.g. 'a' or '\r'."/>
- </eAnnotations>
- <eStructuralFeatures xsi:type="ecore:EAttribute" name="escapedValue" eType="ecore:EDataType http://www.eclipse.org/emf/2002/Ecore#//EString">
- <eAnnotations source="http://www.eclipse.org/emf/2002/GenModel">
- <details key="documentation" value="This is the escaped character. In other words the literal exactly as it is in the java file. E.g. 'a' or '\r'. Including the surrounding single quotes themselves."/>
- </eAnnotations>
- </eStructuralFeatures>
- <eStructuralFeatures xsi:type="ecore:EAttribute" name="charValue" eType="ecore:EDataType http://www.eclipse.org/emf/2002/Ecore#//EChar"
- transient="true">
- <eAnnotations source="http://www.eclipse.org/emf/2002/GenModel">
- <details key="documentation" value="The actual primitive character without the quotes. Escape are evaluated and turned into their character value. This is a transient field. If not set when created when queried it will create it. Typically it will be set when created from an AST node since the node already has evaluated it."/>
- </eAnnotations>
- </eStructuralFeatures>
- </eClassifiers>
- <eClassifiers xsi:type="ecore:EClass" name="PTClassInstanceCreation" eSuperTypes="#//PTExpression">
- <eAnnotations source="http://www.eclipse.org/emf/2002/GenModel">
- <details key="documentation" value="Class instance creation expression. E.g. new String("a")"/>
- </eAnnotations>
- <eStructuralFeatures xsi:type="ecore:EAttribute" name="type" eType="ecore:EDataType http://www.eclipse.org/emf/2002/Ecore#//EString">
- <eAnnotations source="http://www.eclipse.org/emf/2002/GenModel">
- <details key="documentation" value="This is the type of the class. E.g. java.lang.String. This should be fully-qualified for allocation purposes. It should also be in reflection format, i.e. if X is an inner class of j.Y, then the type here should be "j.Y$X". "/>
- </eAnnotations>
- </eStructuralFeatures>
- <eStructuralFeatures xsi:type="ecore:EReference" name="arguments" upperBound="-1"
- eType="#//PTExpression" containment="true">
- <eAnnotations source="http://www.eclipse.org/emf/2002/GenModel">
- <details key="documentation" value="The arguments to the constructor."/>
- </eAnnotations>
- </eStructuralFeatures>
- </eClassifiers>
- <eClassifiers xsi:type="ecore:EClass" name="PTConditionalExpression" eSuperTypes="#//PTExpression">
- <eAnnotations source="http://www.eclipse.org/emf/2002/GenModel">
- <details key="documentation" value="The test Expresson, e.g. (x=3) ? 1 : 2"/>
- </eAnnotations>
- <eStructuralFeatures xsi:type="ecore:EReference" name="condition" eType="#//PTExpression"
- containment="true">
- <eAnnotations source="http://www.eclipse.org/emf/2002/GenModel">
- <details key="documentation" value="The condition expression."/>
- </eAnnotations>
- </eStructuralFeatures>
- <eStructuralFeatures xsi:type="ecore:EReference" name="true" eType="#//PTExpression"
- containment="true">
- <eAnnotations source="http://www.eclipse.org/emf/2002/GenModel">
- <details key="documentation" value="The true expression"/>
- </eAnnotations>
- </eStructuralFeatures>
- <eStructuralFeatures xsi:type="ecore:EReference" name="false" eType="#//PTExpression"
- containment="true">
- <eAnnotations source="http://www.eclipse.org/emf/2002/GenModel">
- <details key="documentation" value="The false expression."/>
- </eAnnotations>
- </eStructuralFeatures>
- </eClassifiers>
- <eClassifiers xsi:type="ecore:EClass" name="PTFieldAccess" eSuperTypes="#//PTExpression">
- <eAnnotations source="http://www.eclipse.org/emf/2002/GenModel">
- <details key="documentation" value="Access a field expression, e.g. java.awt.Color.red"/>
- </eAnnotations>
- <eStructuralFeatures xsi:type="ecore:EReference" name="receiver" eType="#//PTExpression"
- containment="true">
- <eAnnotations source="http://www.eclipse.org/emf/2002/GenModel">
- <details key="documentation" value="The expression representing the object that the field is in, e.g. java.awt.Color."/>
- </eAnnotations>
- </eStructuralFeatures>
- <eStructuralFeatures xsi:type="ecore:EAttribute" name="field" eType="ecore:EDataType http://www.eclipse.org/emf/2002/Ecore#//EString">
- <eAnnotations source="http://www.eclipse.org/emf/2002/GenModel">
- <details key="documentation" value="The name of the field being accessed, e.g. red."/>
- </eAnnotations>
- </eStructuralFeatures>
- </eClassifiers>
- <eClassifiers xsi:type="ecore:EClass" name="PTInfixExpression" eSuperTypes="#//PTExpression">
- <eAnnotations source="http://www.eclipse.org/emf/2002/GenModel">
- <details key="documentation" value="An expression with an operator that has two operands, e.g. 3 + 4."/>
- </eAnnotations>
- <eStructuralFeatures xsi:type="ecore:EReference" name="leftOperand" eType="#//PTExpression"
- containment="true"/>
- <eStructuralFeatures xsi:type="ecore:EAttribute" name="operator" eType="#//PTInfixOperator">
- <eAnnotations source="http://www.eclipse.org/emf/2002/GenModel">
- <details key="documentation" value="The operator, e.g. +"/>
- </eAnnotations>
- </eStructuralFeatures>
- <eStructuralFeatures xsi:type="ecore:EReference" name="rightOperand" eType="#//PTExpression"
- containment="true">
- <eAnnotations source="http://www.eclipse.org/emf/2002/GenModel">
- <details key="documentation" value="The right expression. i.e. 4 of "3 + 4""/>
- </eAnnotations>
- </eStructuralFeatures>
- <eStructuralFeatures xsi:type="ecore:EReference" name="extendedOperands" upperBound="-1"
- eType="#//PTExpression" containment="true">
- <eAnnotations source="http://www.eclipse.org/emf/2002/GenModel">
- <details key="documentation" value="Used when there are a series of infix operations of the same operator, e.g. 1 + 2 + 3 + 4. 1 and 2 will go into left and right, while {3, 4} will go into the extended operands. "/>
- </eAnnotations>
- </eStructuralFeatures>
- </eClassifiers>
- <eClassifiers xsi:type="ecore:EEnum" name="PTInfixOperator">
- <eAnnotations source="http://www.eclipse.org/emf/2002/GenModel">
- <details key="documentation" value="Enumerator for the operator on an InfixExpression."/>
- </eAnnotations>
- <eLiterals name="TIMES">
- <eAnnotations source="http://www.eclipse.org/emf/2002/GenModel">
- <details key="documentation" value="* operator"/>
- </eAnnotations>
- </eLiterals>
- <eLiterals name="DIVIDE" value="1">
- <eAnnotations source="http://www.eclipse.org/emf/2002/GenModel">
- <details key="documentation" value="/ operator"/>
- </eAnnotations>
- </eLiterals>
- <eLiterals name="REMAINDER" value="2">
- <eAnnotations source="http://www.eclipse.org/emf/2002/GenModel">
- <details key="documentation" value="% operator"/>
- </eAnnotations>
- </eLiterals>
- <eLiterals name="PLUS" value="3">
- <eAnnotations source="http://www.eclipse.org/emf/2002/GenModel">
- <details key="documentation" value="+ operator"/>
- </eAnnotations>
- </eLiterals>
- <eLiterals name="MINUS" value="4">
- <eAnnotations source="http://www.eclipse.org/emf/2002/GenModel">
- <details key="documentation" value="- operator"/>
- </eAnnotations>
- </eLiterals>
- <eLiterals name="LEFT_SHIFT" value="5">
- <eAnnotations source="http://www.eclipse.org/emf/2002/GenModel">
- <details key="documentation" value="<< operator"/>
- </eAnnotations>
- </eLiterals>
- <eLiterals name="RIGHT_SHIFT_SIGNED" value="6">
- <eAnnotations source="http://www.eclipse.org/emf/2002/GenModel">
- <details key="documentation" value=">> operator"/>
- </eAnnotations>
- </eLiterals>
- <eLiterals name="RIGHT_SHIFT_UNSIGNED" value="7">
- <eAnnotations source="http://www.eclipse.org/emf/2002/GenModel">
- <details key="documentation" value=">>> operator"/>
- </eAnnotations>
- </eLiterals>
- <eLiterals name="LESS" value="8">
- <eAnnotations source="http://www.eclipse.org/emf/2002/GenModel">
- <details key="documentation" value="< operator"/>
- </eAnnotations>
- </eLiterals>
- <eLiterals name="GREATER" value="9">
- <eAnnotations source="http://www.eclipse.org/emf/2002/GenModel">
- <details key="documentation" value="> operator"/>
- </eAnnotations>
- </eLiterals>
- <eLiterals name="LESS_EQUALS" value="10">
- <eAnnotations source="http://www.eclipse.org/emf/2002/GenModel">
- <details key="documentation" value="<= operator"/>
- </eAnnotations>
- </eLiterals>
- <eLiterals name="GREATER_EQUALS" value="11">
- <eAnnotations source="http://www.eclipse.org/emf/2002/GenModel">
- <details key="documentation" value=">= operator"/>
- </eAnnotations>
- </eLiterals>
- <eLiterals name="EQUALS" value="12">
- <eAnnotations source="http://www.eclipse.org/emf/2002/GenModel">
- <details key="documentation" value="== operator"/>
- </eAnnotations>
- </eLiterals>
- <eLiterals name="NOT_EQUALS" value="13">
- <eAnnotations source="http://www.eclipse.org/emf/2002/GenModel">
- <details key="documentation" value="!= operator"/>
- </eAnnotations>
- </eLiterals>
- <eLiterals name="XOR" value="14">
- <eAnnotations source="http://www.eclipse.org/emf/2002/GenModel">
- <details key="documentation" value="^ operator"/>
- </eAnnotations>
- </eLiterals>
- <eLiterals name="AND" value="15">
- <eAnnotations source="http://www.eclipse.org/emf/2002/GenModel">
- <details key="documentation" value="& operator"/>
- </eAnnotations>
- </eLiterals>
- <eLiterals name="OR" value="16">
- <eAnnotations source="http://www.eclipse.org/emf/2002/GenModel">
- <details key="documentation" value="| operator"/>
- </eAnnotations>
- </eLiterals>
- <eLiterals name="CONDITIONAL_AND" value="17">
- <eAnnotations source="http://www.eclipse.org/emf/2002/GenModel">
- <details key="documentation" value="&& operator"/>
- </eAnnotations>
- </eLiterals>
- <eLiterals name="CONDITIONAL_OR" value="18">
- <eAnnotations source="http://www.eclipse.org/emf/2002/GenModel">
- <details key="documentation" value="|| operator"/>
- </eAnnotations>
- </eLiterals>
- </eClassifiers>
- <eClassifiers xsi:type="ecore:EClass" name="PTInstanceof" eSuperTypes="#//PTExpression">
- <eAnnotations source="http://www.eclipse.org/emf/2002/GenModel">
- <details key="documentation" value="Instanceof expression, e.g. x instanceof java.lang.String"/>
- </eAnnotations>
- <eStructuralFeatures xsi:type="ecore:EReference" name="operand" eType="#//PTExpression"
- containment="true">
- <eAnnotations source="http://www.eclipse.org/emf/2002/GenModel">
- <details key="documentation" value="The value to test, e.g. x in x instanceof java.lang.String"/>
- </eAnnotations>
- </eStructuralFeatures>
- <eStructuralFeatures xsi:type="ecore:EAttribute" name="type" eType="ecore:EDataType http://www.eclipse.org/emf/2002/Ecore#//EString">
- <eAnnotations source="http://www.eclipse.org/emf/2002/GenModel">
- <details key="documentation" value="The type of the instance test, e.g. java.lang.String. It must be fully-qualified. If it is an inner class, it needs to be in reflection format, i.e. Y is inner class of j.X, then a reference to Y must be j.X$Y."/>
- </eAnnotations>
- </eStructuralFeatures>
- </eClassifiers>
- <eClassifiers xsi:type="ecore:EClass" name="PTMethodInvocation" eSuperTypes="#//PTExpression">
- <eAnnotations source="http://www.eclipse.org/emf/2002/GenModel">
- <details key="documentation" value="MethodInvocation expression, e.g. x.getY(3)"/>
- </eAnnotations>
- <eStructuralFeatures xsi:type="ecore:EReference" name="receiver" eType="#//PTExpression"
- containment="true">
- <eAnnotations source="http://www.eclipse.org/emf/2002/GenModel">
- <details key="documentation" value="Who the method is invoked against. This may be not set, which means "this". It may also be a Name, which would mean a class like "java.lang.String""/>
- </eAnnotations>
- </eStructuralFeatures>
- <eStructuralFeatures xsi:type="ecore:EAttribute" name="name" eType="ecore:EDataType http://www.eclipse.org/emf/2002/Ecore#//EString">
- <eAnnotations source="http://www.eclipse.org/emf/2002/GenModel">
- <details key="documentation" value="The name of the method being invoked."/>
- </eAnnotations>
- </eStructuralFeatures>
- <eStructuralFeatures xsi:type="ecore:EReference" name="arguments" upperBound="-1"
- eType="#//PTExpression" containment="true">
- <eAnnotations source="http://www.eclipse.org/emf/2002/GenModel">
- <details key="documentation" value="The list of arguments, if any, to the method."/>
- </eAnnotations>
- </eStructuralFeatures>
- </eClassifiers>
- <eClassifiers xsi:type="ecore:EClass" name="PTName" eSuperTypes="#//PTExpression">
- <eAnnotations source="http://www.eclipse.org/emf/2002/GenModel">
- <details key="documentation" value="This represents a name. This can happen for the receiver of a method invocation, e.g. x.getY() or java.lang.String.valueOf(10). In these cases you would have a name of "x" or "java.lang.String"."/>
- </eAnnotations>
- <eStructuralFeatures xsi:type="ecore:EAttribute" name="name" eType="ecore:EDataType http://www.eclipse.org/emf/2002/Ecore#//EString">
- <eAnnotations source="http://www.eclipse.org/emf/2002/GenModel">
- <details key="documentation" value="The name, which can be a type or a variable. If it is a type, then it must be fully-qualified. If it is an inner class, it needs to be in reflection format, i.e. Y is inner class of j.X, then a reference to Y must be j.X$Y."/>
- </eAnnotations>
- </eStructuralFeatures>
- </eClassifiers>
- <eClassifiers xsi:type="ecore:EClass" name="PTNullLiteral" eSuperTypes="#//PTExpression">
- <eAnnotations source="http://www.eclipse.org/emf/2002/GenModel">
- <details key="documentation" value="Represents the expression "null""/>
- </eAnnotations>
- </eClassifiers>
- <eClassifiers xsi:type="ecore:EClass" name="PTNumberLiteral" eSuperTypes="#//PTExpression">
- <eAnnotations source="http://www.eclipse.org/emf/2002/GenModel">
- <details key="documentation" value="Represent a number primitive literal, e.g. 10. One optimization that will be performed is that if an expression is of the form +number or -number, it will be converted from a PrefixExpression with a NumberLiteral to just a NumberLiteral. This will simplify the model."/>
- </eAnnotations>
- <eStructuralFeatures xsi:type="ecore:EAttribute" name="token" eType="ecore:EDataType http://www.eclipse.org/emf/2002/Ecore#//EString">
- <eAnnotations source="http://www.eclipse.org/emf/2002/GenModel">
- <details key="documentation" value="The token value, e.g. 10, 10d, or -10.75"/>
- </eAnnotations>
- </eStructuralFeatures>
- </eClassifiers>
- <eClassifiers xsi:type="ecore:EClass" name="PTParenthesizedExpression" eSuperTypes="#//PTExpression">
- <eAnnotations source="http://www.eclipse.org/emf/2002/GenModel">
- <details key="documentation" value="An expression within parenthesis, e.g. (x+3)"/>
- </eAnnotations>
- <eStructuralFeatures xsi:type="ecore:EReference" name="expression" eType="#//PTExpression"
- containment="true">
- <eAnnotations source="http://www.eclipse.org/emf/2002/GenModel">
- <details key="documentation" value="The expression wrapped by the parenthesis, e.g. (x+3) then the expression is "x+3""/>
- </eAnnotations>
- </eStructuralFeatures>
- </eClassifiers>
- <eClassifiers xsi:type="ecore:EClass" name="PTPrefixExpression" eSuperTypes="#//PTExpression">
- <eAnnotations source="http://www.eclipse.org/emf/2002/GenModel">
- <details key="documentation" value="A one operand operator, where the operator comes before the operand, e.g. - (x+3). In AST, even -3 is modeled as a PrefixExpression of operator "-" and expression of NumberLiteral(3). But we optimize this away and just use a NumberLiteral(-3) directly instead."/>
- </eAnnotations>
- <eStructuralFeatures xsi:type="ecore:EAttribute" name="operator" eType="#//PTPrefixOperator">
- <eAnnotations source="http://www.eclipse.org/emf/2002/GenModel">
- <details key="documentation" value="The operator of this expression."/>
- </eAnnotations>
- </eStructuralFeatures>
- <eStructuralFeatures xsi:type="ecore:EReference" name="expression" eType="#//PTExpression"
- containment="true">
- <eAnnotations source="http://www.eclipse.org/emf/2002/GenModel">
- <details key="documentation" value="The expression that the operator is applied to."/>
- </eAnnotations>
- </eStructuralFeatures>
- </eClassifiers>
- <eClassifiers xsi:type="ecore:EEnum" name="PTPrefixOperator">
- <eAnnotations source="http://www.eclipse.org/emf/2002/GenModel">
- <details key="documentation" value="The prefix expression operator. We are not modeling ++ and --."/>
- </eAnnotations>
- <eLiterals name="PLUS">
- <eAnnotations source="http://www.eclipse.org/emf/2002/GenModel">
- <details key="documentation" value="+ operator"/>
- </eAnnotations>
- </eLiterals>
- <eLiterals name="MINUS" value="1">
- <eAnnotations source="http://www.eclipse.org/emf/2002/GenModel">
- <details key="documentation" value="- operator"/>
- </eAnnotations>
- </eLiterals>
- <eLiterals name="COMPLEMENT" value="2">
- <eAnnotations source="http://www.eclipse.org/emf/2002/GenModel">
- <details key="documentation" value="~ operator"/>
- </eAnnotations>
- </eLiterals>
- <eLiterals name="NOT" value="3">
- <eAnnotations source="http://www.eclipse.org/emf/2002/GenModel">
- <details key="documentation" value="! operator"/>
- </eAnnotations>
- </eLiterals>
- </eClassifiers>
- <eClassifiers xsi:type="ecore:EClass" name="PTStringLiteral" eSuperTypes="#//PTExpression">
- <eAnnotations source="http://www.eclipse.org/emf/2002/GenModel">
- <details key="documentation" value="Representation of a string literal, e.g. "asdf"."/>
- </eAnnotations>
- <eStructuralFeatures xsi:type="ecore:EAttribute" name="escapedValue" eType="ecore:EDataType http://www.eclipse.org/emf/2002/Ecore#//EString">
- <eAnnotations source="http://www.eclipse.org/emf/2002/GenModel">
- <details key="documentation" value="This is the escaped string. In other words the literal exactly as it is in the java file. E.g. "ab" or "c\r". Including the surrounding quotes themselves."/>
- </eAnnotations>
- </eStructuralFeatures>
- <eStructuralFeatures xsi:type="ecore:EAttribute" name="literalValue" eType="ecore:EDataType http://www.eclipse.org/emf/2002/Ecore#//EString"
- transient="true">
- <eAnnotations source="http://www.eclipse.org/emf/2002/GenModel">
- <details key="documentation" value="The actual string without the quotes. Escape are evaluated and turned into their character value. This is a transient field. If not set when created when queried it will create it. Typically it will be set when created from an AST node since the node already has evaluated it."/>
- </eAnnotations>
- </eStructuralFeatures>
- </eClassifiers>
- <eClassifiers xsi:type="ecore:EClass" name="PTThisLiteral" eSuperTypes="#//PTExpression">
- <eAnnotations source="http://www.eclipse.org/emf/2002/GenModel">
- <details key="documentation" value="Represents "this", e.g. this.getX() will be a MethodInvocation with the receiver being a ThisLiteral. We can't handle the format XYZ.this because that is for inner classes and we don't support that right now."/>
- </eAnnotations>
- </eClassifiers>
- <eClassifiers xsi:type="ecore:EClass" name="PTTypeLiteral" eSuperTypes="#//PTExpression">
- <eAnnotations source="http://www.eclipse.org/emf/2002/GenModel">
- <details key="documentation" value="This represents a literal of the form j.XYZ.class. For instance in a method invocation x.getX(jXYZ.class) the argument will be a TypeLiteral."/>
- </eAnnotations>
- <eStructuralFeatures xsi:type="ecore:EAttribute" name="type" eType="ecore:EDataType http://www.eclipse.org/emf/2002/Ecore#//EString">
- <eAnnotations source="http://www.eclipse.org/emf/2002/GenModel">
- <details key="documentation" value="The type of the literal. It must be fully-qualified. If it is an inner class, it needs to be in reflection format, i.e. Y is inner class of j.X, then a reference to Y must be j.X$Y."/>
- </eAnnotations>
- </eStructuralFeatures>
- </eClassifiers>
- <eClassifiers xsi:type="ecore:EClass" name="PTInvalidExpression" eSuperTypes="#//PTExpression">
- <eAnnotations source="http://www.eclipse.org/emf/2002/GenModel">
- <details key="documentation" value="This is used when we have some expression we just can't evaluate for our purposes. It allows us to tell the evaluation what is actually wrong. It should be placed as the root expression to prevent processing much of the tree and then finally fail."/>
- </eAnnotations>
- <eStructuralFeatures xsi:type="ecore:EAttribute" name="message" eType="ecore:EDataType http://www.eclipse.org/emf/2002/Ecore#//EString">
- <eAnnotations source="http://www.eclipse.org/emf/2002/GenModel">
- <details key="documentation" value="A message as to why it is invalid."/>
- </eAnnotations>
- </eStructuralFeatures>
- </eClassifiers>
- <eClassifiers xsi:type="ecore:EClass" name="PTInstanceReference" eSuperTypes="#//PTExpression">
- <eStructuralFeatures xsi:type="ecore:EReference" name="reference" lowerBound="1"
- eType="#//IJavaInstance"/>
- </eClassifiers>
- <eClassifiers xsi:type="ecore:EClass" name="PTAnonymousClassDeclaration" eSuperTypes="#//PTExpression">
- <eAnnotations source="http://www.eclipse.org/emf/2002/GenModel">
- <details key="documentation" value="An anonymous class declaration. Currently we only store the 
entire declaration as a string, including the "new AClass() {...}"."/>
- </eAnnotations>
- <eStructuralFeatures xsi:type="ecore:EAttribute" name="declaration" eType="ecore:EDataType http://www.eclipse.org/emf/2002/Ecore#//EString">
- <eAnnotations source="http://www.eclipse.org/emf/2002/GenModel">
- <details key="documentation" value="The declaration text."/>
- </eAnnotations>
- </eStructuralFeatures>
- <eStructuralFeatures xsi:type="ecore:EAttribute" name="imports" upperBound="-1"
- eType="ecore:EDataType http://www.eclipse.org/emf/2002/Ecore#//EString" transient="true">
- <eAnnotations source="http://www.eclipse.org/emf/2002/GenModel">
- <details key="documentation" value="This is the imports needed in the main class by this declaration. This is a transient attribute. It is not serialized, nor is it parsed into from existing code. Its only purpose is to help code generation on a brand new declaration to know what imports should be added to the main class."/>
- </eAnnotations>
- </eStructuralFeatures>
- </eClassifiers>
-</ecore:EPackage>
diff --git a/plugins/org.eclipse.jem/model/instance.genmodel b/plugins/org.eclipse.jem/model/instance.genmodel
deleted file mode 100644
index e1c764a..0000000
--- a/plugins/org.eclipse.jem/model/instance.genmodel
+++ /dev/null
@@ -1,141 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<genmodel:GenModel xmi:version="2.0"
- xmlns:xmi="http://www.omg.org/XMI" xmlns:ecore="http://www.eclipse.org/emf/2002/Ecore"
- xmlns:genmodel="http://www.eclipse.org/emf/2002/GenModel" modelDirectory="/org.eclipse.jem/javainst"
- editDirectory="/org.eclipse.jem.edit/src" editorDirectory="/org.eclipse.jem.editor/src"
- modelPluginID="" modelName="instance" editPluginClass="org.eclipse.jem.internal.instantiation.provider.instanceEditPlugin"
- editorPluginClass="org.eclipse.jem.internal.instantiation.presentation.instanceEditorPlugin"
- updateClasspath="false" booleanFlagsField="eFlags" booleanFlagsReservedBits="8"
- importerID="org.eclipse.emf.importer.rose" usedGenPackages="../../org.eclipse.emf.ecore/model/Ecore.genmodel#//ecore">
- <foreignModel>..\rose\instance.mdl</foreignModel>
- <foreignModel>WorkspaceRoot</foreignModel>
- <foreignModel>../..</foreignModel>
- <genPackages prefix="Instantiation" basePackage="org.eclipse.jem.internal" adapterFactory="false"
- ecorePackage="instance.ecore#/">
- <genEnums ecoreEnum="instance.ecore#//PTInfixOperator">
- <genEnumLiterals ecoreEnumLiteral="instance.ecore#//PTInfixOperator/TIMES"/>
- <genEnumLiterals ecoreEnumLiteral="instance.ecore#//PTInfixOperator/DIVIDE"/>
- <genEnumLiterals ecoreEnumLiteral="instance.ecore#//PTInfixOperator/REMAINDER"/>
- <genEnumLiterals ecoreEnumLiteral="instance.ecore#//PTInfixOperator/PLUS"/>
- <genEnumLiterals ecoreEnumLiteral="instance.ecore#//PTInfixOperator/MINUS"/>
- <genEnumLiterals ecoreEnumLiteral="instance.ecore#//PTInfixOperator/LEFT_SHIFT"/>
- <genEnumLiterals ecoreEnumLiteral="instance.ecore#//PTInfixOperator/RIGHT_SHIFT_SIGNED"/>
- <genEnumLiterals ecoreEnumLiteral="instance.ecore#//PTInfixOperator/RIGHT_SHIFT_UNSIGNED"/>
- <genEnumLiterals ecoreEnumLiteral="instance.ecore#//PTInfixOperator/LESS"/>
- <genEnumLiterals ecoreEnumLiteral="instance.ecore#//PTInfixOperator/GREATER"/>
- <genEnumLiterals ecoreEnumLiteral="instance.ecore#//PTInfixOperator/LESS_EQUALS"/>
- <genEnumLiterals ecoreEnumLiteral="instance.ecore#//PTInfixOperator/GREATER_EQUALS"/>
- <genEnumLiterals ecoreEnumLiteral="instance.ecore#//PTInfixOperator/EQUALS"/>
- <genEnumLiterals ecoreEnumLiteral="instance.ecore#//PTInfixOperator/NOT_EQUALS"/>
- <genEnumLiterals ecoreEnumLiteral="instance.ecore#//PTInfixOperator/XOR"/>
- <genEnumLiterals ecoreEnumLiteral="instance.ecore#//PTInfixOperator/AND"/>
- <genEnumLiterals ecoreEnumLiteral="instance.ecore#//PTInfixOperator/OR"/>
- <genEnumLiterals ecoreEnumLiteral="instance.ecore#//PTInfixOperator/CONDITIONAL_AND"/>
- <genEnumLiterals ecoreEnumLiteral="instance.ecore#//PTInfixOperator/CONDITIONAL_OR"/>
- </genEnums>
- <genEnums ecoreEnum="instance.ecore#//PTPrefixOperator">
- <genEnumLiterals ecoreEnumLiteral="instance.ecore#//PTPrefixOperator/PLUS"/>
- <genEnumLiterals ecoreEnumLiteral="instance.ecore#//PTPrefixOperator/MINUS"/>
- <genEnumLiterals ecoreEnumLiteral="instance.ecore#//PTPrefixOperator/COMPLEMENT"/>
- <genEnumLiterals ecoreEnumLiteral="instance.ecore#//PTPrefixOperator/NOT"/>
- </genEnums>
- <genClasses ecoreClass="instance.ecore#//IJavaDataTypeInstance"/>
- <genClasses ecoreClass="instance.ecore#//IJavaInstance"/>
- <genClasses ecoreClass="instance.ecore#//IJavaObjectInstance"/>
- <genClasses ecoreClass="instance.ecore#//JavaAllocation"/>
- <genClasses ecoreClass="instance.ecore#//InitStringAllocation">
- <genFeatures createChild="false" ecoreFeature="ecore:EAttribute instance.ecore#//InitStringAllocation/initString"/>
- </genClasses>
- <genClasses ecoreClass="instance.ecore#//ImplicitAllocation">
- <genFeatures notify="false" createChild="false" ecoreFeature="ecore:EReference instance.ecore#//ImplicitAllocation/parent"/>
- <genFeatures notify="false" createChild="false" ecoreFeature="ecore:EReference instance.ecore#//ImplicitAllocation/feature"/>
- </genClasses>
- <genClasses ecoreClass="instance.ecore#//ParseTreeAllocation">
- <genFeatures property="None" children="true" createChild="true" ecoreFeature="ecore:EReference instance.ecore#//ParseTreeAllocation/expression"/>
- </genClasses>
- <genClasses ecoreClass="instance.ecore#//PTExpression"/>
- <genClasses ecoreClass="instance.ecore#//PTArrayAccess">
- <genFeatures property="None" children="true" createChild="true" ecoreFeature="ecore:EReference instance.ecore#//PTArrayAccess/array"/>
- <genFeatures property="None" children="true" createChild="true" ecoreFeature="ecore:EReference instance.ecore#//PTArrayAccess/indexes"/>
- </genClasses>
- <genClasses ecoreClass="instance.ecore#//PTArrayCreation">
- <genFeatures createChild="false" ecoreFeature="ecore:EAttribute instance.ecore#//PTArrayCreation/type"/>
- <genFeatures property="None" children="true" createChild="true" ecoreFeature="ecore:EReference instance.ecore#//PTArrayCreation/dimensions"/>
- <genFeatures property="None" children="true" createChild="true" ecoreFeature="ecore:EReference instance.ecore#//PTArrayCreation/initializer"/>
- </genClasses>
- <genClasses ecoreClass="instance.ecore#//PTArrayInitializer">
- <genFeatures property="None" children="true" createChild="true" ecoreFeature="ecore:EReference instance.ecore#//PTArrayInitializer/expressions"/>
- </genClasses>
- <genClasses ecoreClass="instance.ecore#//PTBooleanLiteral">
- <genFeatures createChild="false" ecoreFeature="ecore:EAttribute instance.ecore#//PTBooleanLiteral/booleanValue"/>
- </genClasses>
- <genClasses ecoreClass="instance.ecore#//PTCastExpression">
- <genFeatures createChild="false" ecoreFeature="ecore:EAttribute instance.ecore#//PTCastExpression/type"/>
- <genFeatures property="None" children="true" createChild="true" ecoreFeature="ecore:EReference instance.ecore#//PTCastExpression/expression"/>
- </genClasses>
- <genClasses ecoreClass="instance.ecore#//PTCharacterLiteral">
- <genFeatures createChild="false" ecoreFeature="ecore:EAttribute instance.ecore#//PTCharacterLiteral/escapedValue"/>
- <genFeatures createChild="false" ecoreFeature="ecore:EAttribute instance.ecore#//PTCharacterLiteral/charValue"/>
- </genClasses>
- <genClasses ecoreClass="instance.ecore#//PTClassInstanceCreation">
- <genFeatures createChild="false" ecoreFeature="ecore:EAttribute instance.ecore#//PTClassInstanceCreation/type"/>
- <genFeatures property="None" children="true" createChild="true" ecoreFeature="ecore:EReference instance.ecore#//PTClassInstanceCreation/arguments"/>
- </genClasses>
- <genClasses ecoreClass="instance.ecore#//PTConditionalExpression">
- <genFeatures property="None" children="true" createChild="true" ecoreFeature="ecore:EReference instance.ecore#//PTConditionalExpression/condition"/>
- <genFeatures property="None" children="true" createChild="true" ecoreFeature="ecore:EReference instance.ecore#//PTConditionalExpression/true"/>
- <genFeatures property="None" children="true" createChild="true" ecoreFeature="ecore:EReference instance.ecore#//PTConditionalExpression/false"/>
- </genClasses>
- <genClasses ecoreClass="instance.ecore#//PTFieldAccess">
- <genFeatures property="None" children="true" createChild="true" ecoreFeature="ecore:EReference instance.ecore#//PTFieldAccess/receiver"/>
- <genFeatures createChild="false" ecoreFeature="ecore:EAttribute instance.ecore#//PTFieldAccess/field"/>
- </genClasses>
- <genClasses ecoreClass="instance.ecore#//PTInfixExpression">
- <genFeatures property="None" children="true" createChild="true" ecoreFeature="ecore:EReference instance.ecore#//PTInfixExpression/leftOperand"/>
- <genFeatures createChild="false" ecoreFeature="ecore:EAttribute instance.ecore#//PTInfixExpression/operator"/>
- <genFeatures property="None" children="true" createChild="true" ecoreFeature="ecore:EReference instance.ecore#//PTInfixExpression/rightOperand"/>
- <genFeatures property="None" children="true" createChild="true" ecoreFeature="ecore:EReference instance.ecore#//PTInfixExpression/extendedOperands"/>
- </genClasses>
- <genClasses ecoreClass="instance.ecore#//PTInstanceof">
- <genFeatures property="None" children="true" createChild="true" ecoreFeature="ecore:EReference instance.ecore#//PTInstanceof/operand"/>
- <genFeatures createChild="false" ecoreFeature="ecore:EAttribute instance.ecore#//PTInstanceof/type"/>
- </genClasses>
- <genClasses ecoreClass="instance.ecore#//PTMethodInvocation">
- <genFeatures property="None" children="true" createChild="true" ecoreFeature="ecore:EReference instance.ecore#//PTMethodInvocation/receiver"/>
- <genFeatures createChild="false" ecoreFeature="ecore:EAttribute instance.ecore#//PTMethodInvocation/name"/>
- <genFeatures property="None" children="true" createChild="true" ecoreFeature="ecore:EReference instance.ecore#//PTMethodInvocation/arguments"/>
- </genClasses>
- <genClasses ecoreClass="instance.ecore#//PTName">
- <genFeatures createChild="false" ecoreFeature="ecore:EAttribute instance.ecore#//PTName/name"/>
- </genClasses>
- <genClasses ecoreClass="instance.ecore#//PTNullLiteral"/>
- <genClasses ecoreClass="instance.ecore#//PTNumberLiteral">
- <genFeatures createChild="false" ecoreFeature="ecore:EAttribute instance.ecore#//PTNumberLiteral/token"/>
- </genClasses>
- <genClasses ecoreClass="instance.ecore#//PTParenthesizedExpression">
- <genFeatures property="None" children="true" createChild="true" ecoreFeature="ecore:EReference instance.ecore#//PTParenthesizedExpression/expression"/>
- </genClasses>
- <genClasses ecoreClass="instance.ecore#//PTPrefixExpression">
- <genFeatures createChild="false" ecoreFeature="ecore:EAttribute instance.ecore#//PTPrefixExpression/operator"/>
- <genFeatures property="None" children="true" createChild="true" ecoreFeature="ecore:EReference instance.ecore#//PTPrefixExpression/expression"/>
- </genClasses>
- <genClasses ecoreClass="instance.ecore#//PTStringLiteral">
- <genFeatures createChild="false" ecoreFeature="ecore:EAttribute instance.ecore#//PTStringLiteral/escapedValue"/>
- <genFeatures createChild="false" ecoreFeature="ecore:EAttribute instance.ecore#//PTStringLiteral/literalValue"/>
- </genClasses>
- <genClasses ecoreClass="instance.ecore#//PTThisLiteral"/>
- <genClasses ecoreClass="instance.ecore#//PTTypeLiteral">
- <genFeatures createChild="false" ecoreFeature="ecore:EAttribute instance.ecore#//PTTypeLiteral/type"/>
- </genClasses>
- <genClasses ecoreClass="instance.ecore#//PTInvalidExpression">
- <genFeatures createChild="false" ecoreFeature="ecore:EAttribute instance.ecore#//PTInvalidExpression/message"/>
- </genClasses>
- <genClasses ecoreClass="instance.ecore#//PTInstanceReference">
- <genFeatures notify="false" createChild="false" ecoreFeature="ecore:EReference instance.ecore#//PTInstanceReference/reference"/>
- </genClasses>
- <genClasses ecoreClass="instance.ecore#//PTAnonymousClassDeclaration">
- <genFeatures createChild="false" ecoreFeature="ecore:EAttribute instance.ecore#//PTAnonymousClassDeclaration/declaration"/>
- <genFeatures createChild="false" ecoreFeature="ecore:EAttribute instance.ecore#//PTAnonymousClassDeclaration/imports"/>
- </genClasses>
- </genPackages>
-</genmodel:GenModel>
diff --git a/plugins/org.eclipse.jem/model/java.ecore b/plugins/org.eclipse.jem/model/java.ecore
deleted file mode 100644
index 2f8aa37..0000000
--- a/plugins/org.eclipse.jem/model/java.ecore
+++ /dev/null
@@ -1,353 +0,0 @@
-<?xml version="1.0" encoding="ASCII"?>
-<ecore:EPackage xmi:version="2.0"
- xmlns:xmi="http://www.omg.org/XMI" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
- xmlns:ecore="http://www.eclipse.org/emf/2002/Ecore" name="java"
- nsURI="java.xmi" nsPrefix="org.eclipse.jem.java">
- <eAnnotations source="http://www.eclipse.org/emf/2002/GenModel">
- <details key="documentation" value="Changes to synch up with Java3e:
- deleted JavaElement, BodyElement which didn't add anything useful
- deleted NestedClass and the association which described nesting, contents can be used instead
- deleted extends/extendedBy which is replaced with MOF subtype/supertype
- deleted the clumsy main diagram
- moved the MOF inheritance details to the MOF binding diagram
- deleted "final" on JavaParameter, don't know what that was supposed to be
- deleted the Category junk
- changed the Block-typed attributes on Field, Method, Initializer to be associations to Block

Outstanding questions/issues:
- JavaParameterKind should go away if we get the base Parameter kind fixed up
"/>
- </eAnnotations>
- <eClassifiers xsi:type="ecore:EClass" name="JavaClass" eSuperTypes="../../org.eclipse.emf.ecore/model/Ecore.ecore#//EClass">
- <eOperations name="isNested" eType="ecore:EDataType http://www.eclipse.org/emf/2002/Ecore#//EBoolean"/>
- <eOperations name="getField" eType="#//Field">
- <eAnnotations source="http://www.eclipse.org/emf/2002/GenModel">
- <details key="documentation" value="Return an Field with the passed name, or null."/>
- </eAnnotations>
- <eParameters name="fieldName" eType="ecore:EDataType http://www.eclipse.org/emf/2002/Ecore#//EString"/>
- </eOperations>
- <eOperations name="getFieldExtended" eType="#//Field">
- <eAnnotations source="http://www.eclipse.org/emf/2002/GenModel">
- <details key="documentation" value=" Return an Field with the passed name from this JavaClass or any supertypes.

Return null if a Field named fieldName is not found."/>
- </eAnnotations>
- <eParameters name="fieldName" eType="ecore:EDataType http://www.eclipse.org/emf/2002/Ecore#//EString"/>
- </eOperations>
- <eOperations name="getFieldNamed" eType="#//Field">
- <eAnnotations source="http://www.eclipse.org/emf/2002/GenModel">
- <details key="documentation" value="Return an Field with the passed name, or null."/>
- </eAnnotations>
- <eParameters name="fieldName" eType="ecore:EDataType http://www.eclipse.org/emf/2002/Ecore#//EString"/>
- </eOperations>
- <eOperations name="getFieldsExtended" eType="#//JTypeList">
- <eAnnotations source="http://www.eclipse.org/emf/2002/GenModel">
- <details key="documentation" value="Return all fields, including those from supertypes."/>
- </eAnnotations>
- </eOperations>
- <eOperations name="getMethod" eType="#//Method">
- <eAnnotations source="http://www.eclipse.org/emf/2002/GenModel">
- <details key="documentation" value="Get the method of this name and these parameters. It will not look up the supertype hierarchy."/>
- </eAnnotations>
- <eParameters name="methodName" eType="ecore:EDataType http://www.eclipse.org/emf/2002/Ecore#//EString"/>
- <eParameters name="parameterTypes" eType="#//JTypeList">
- <eAnnotations source="http://www.eclipse.org/emf/2002/GenModel">
- <details key="documentation" value="List of parameter types."/>
- </eAnnotations>
- </eParameters>
- </eOperations>
- <eOperations name="getMethodElementSignatures" eType="#//JTypeList">
- <eAnnotations source="http://www.eclipse.org/emf/2002/GenModel">
- <details key="documentation" value="Return a List of Strings that represent MethodElement signatures from most general to most specific."/>
- </eAnnotations>
- </eOperations>
- <eOperations name="getMethodExtended" eType="#//Method">
- <eAnnotations source="http://www.eclipse.org/emf/2002/GenModel">
- <details key="documentation" value="Get the method of this name and these parameters. It will look up the supertype hierarchy."/>
- </eAnnotations>
- <eParameters name="methodName" eType="ecore:EDataType http://www.eclipse.org/emf/2002/Ecore#//EString"/>
- <eParameters name="parameterTypes" eType="#//JTypeList">
- <eAnnotations source="http://www.eclipse.org/emf/2002/GenModel">
- <details key="documentation" value="List of parameter types."/>
- </eAnnotations>
- </eParameters>
- </eOperations>
- <eOperations name="getMethodsExtended" eType="#//JTypeList">
- <eAnnotations source="http://www.eclipse.org/emf/2002/GenModel">
- <details key="documentation" value="Return all methods, including those from supertypes."/>
- </eAnnotations>
- </eOperations>
- <eOperations name="getOnlySpecificMethods" eType="#//JTypeList">
- <eAnnotations source="http://www.eclipse.org/emf/2002/GenModel">
- <details key="documentation" value="Return a List of Methods that begins with @aMethodNamePrefix and is not included in the @excludedNames list. If @aMethodNamePrefix is null, all methods will be returned.
"/>
- </eAnnotations>
- <eParameters name="aMethodNamePrefix" eType="ecore:EDataType http://www.eclipse.org/emf/2002/Ecore#//EString"/>
- <eParameters name="excludedNames" eType="#//JTypeList"/>
- </eOperations>
- <eOperations name="getPublicMethod" eType="#//Method">
- <eAnnotations source="http://www.eclipse.org/emf/2002/GenModel">
- <details key="documentation" value="Return a method matching the name, and non-return parameters with fully qualified types matching all the types in the list, if it exists. It will not look up the supertype hierarchy."/>
- </eAnnotations>
- <eParameters name="methodName" eType="ecore:EDataType http://www.eclipse.org/emf/2002/Ecore#//EString"/>
- <eParameters name="parameterTypes" eType="#//JTypeList">
- <eAnnotations source="http://www.eclipse.org/emf/2002/GenModel">
- <details key="documentation" value="List of parameter types."/>
- </eAnnotations>
- </eParameters>
- </eOperations>
- <eOperations name="getPublicMethods" eType="#//JTypeList">
- <eAnnotations source="http://www.eclipse.org/emf/2002/GenModel">
- <details key="documentation" value="Return all methods, it will not go up the supertype hierarchy."/>
- </eAnnotations>
- </eOperations>
- <eOperations name="getPublicMethodsExtended" eType="#//JTypeList">
- <eAnnotations source="http://www.eclipse.org/emf/2002/GenModel">
- <details key="documentation" value="Return all public methods, including those from supertypes."/>
- </eAnnotations>
- </eOperations>
- <eOperations name="getPublicMethodsNamed" eType="#//JTypeList">
- <eAnnotations source="http://www.eclipse.org/emf/2002/GenModel">
- <details key="documentation" value="Returns a filtered list on the methods of this class, having a name equal to that of the parameter."/>
- </eAnnotations>
- <eParameters name="name" eType="ecore:EDataType http://www.eclipse.org/emf/2002/Ecore#//EString"/>
- </eOperations>
- <eOperations name="getSupertype" eType="#//JavaClass"/>
- <eOperations name="implementsInterface" eType="ecore:EDataType http://www.eclipse.org/emf/2002/Ecore#//EBoolean">
- <eAnnotations source="http://www.eclipse.org/emf/2002/GenModel">
- <details key="documentation" value="Test whether the receiver implements the passed interface (or one of its supertypes)."/>
- </eAnnotations>
- <eParameters name="interfaceType" eType="#//JavaClass"/>
- </eOperations>
- <eOperations name="infoString" eType="ecore:EDataType http://www.eclipse.org/emf/2002/Ecore#//EString">
- <eAnnotations source="http://www.eclipse.org/emf/2002/GenModel">
- <details key="documentation" value="Return a string showing our details."/>
- </eAnnotations>
- </eOperations>
- <eOperations name="inheritsFrom" eType="ecore:EDataType http://www.eclipse.org/emf/2002/Ecore#//EBoolean">
- <eAnnotations source="http://www.eclipse.org/emf/2002/GenModel">
- <details key="documentation" value="Tests whether this class inherits from the passed in class."/>
- </eAnnotations>
- <eParameters name="javaClass" eType="#//JavaClass"/>
- </eOperations>
- <eOperations name="isExistingType" eType="ecore:EDataType http://www.eclipse.org/emf/2002/Ecore#//EBoolean">
- <eAnnotations source="http://www.eclipse.org/emf/2002/GenModel">
- <details key="documentation" value="Does this type exist."/>
- </eAnnotations>
- </eOperations>
- <eOperations name="isInterface" eType="ecore:EDataType http://www.eclipse.org/emf/2002/Ecore#//EBoolean">
- <eAnnotations source="http://www.eclipse.org/emf/2002/GenModel">
- <details key="documentation" value="Is this an interface."/>
- </eAnnotations>
- </eOperations>
- <eOperations name="setSupertype">
- <eAnnotations source="http://www.eclipse.org/emf/2002/GenModel">
- <details key="documentation" value="Set the supertype."/>
- </eAnnotations>
- <eParameters name="javaclass" eType="#//JavaClass"/>
- </eOperations>
- <eStructuralFeatures xsi:type="ecore:EAttribute" name="kind" eType="#//TypeKind"/>
- <eStructuralFeatures xsi:type="ecore:EAttribute" name="public" eType="ecore:EDataType http://www.eclipse.org/emf/2002/Ecore#//EBoolean"/>
- <eStructuralFeatures xsi:type="ecore:EAttribute" name="final" eType="ecore:EDataType http://www.eclipse.org/emf/2002/Ecore#//EBoolean"/>
- <eStructuralFeatures xsi:type="ecore:EReference" name="implementsInterfaces" upperBound="-1"
- eType="#//JavaClass"/>
- <eStructuralFeatures xsi:type="ecore:EReference" name="classImport" upperBound="-1"
- eType="#//JavaClass"/>
- <eStructuralFeatures xsi:type="ecore:EReference" name="packageImports" upperBound="-1"
- eType="#//JavaPackage"/>
- <eStructuralFeatures xsi:type="ecore:EReference" name="fields" upperBound="-1"
- eType="#//Field" containment="true" eOpposite="#//Field/javaClass"/>
- <eStructuralFeatures xsi:type="ecore:EReference" name="methods" upperBound="-1"
- eType="#//Method" containment="true" eOpposite="#//Method/javaClass"/>
- <eStructuralFeatures xsi:type="ecore:EReference" name="initializers" upperBound="-1"
- eType="#//Initializer" containment="true" eOpposite="#//Initializer/javaClass"/>
- <eStructuralFeatures xsi:type="ecore:EReference" name="declaredClasses" upperBound="-1"
- eType="#//JavaClass" eOpposite="#//JavaClass/declaringClass"/>
- <eStructuralFeatures xsi:type="ecore:EReference" name="declaringClass" eType="#//JavaClass"
- eOpposite="#//JavaClass/declaredClasses"/>
- <eStructuralFeatures xsi:type="ecore:EReference" name="javaPackage" eType="#//JavaPackage"
- changeable="false" volatile="true" transient="true" eOpposite="#//JavaPackage/javaClasses"/>
- <eStructuralFeatures xsi:type="ecore:EReference" name="events" upperBound="-1"
- eType="#//JavaEvent" containment="true"/>
- <eStructuralFeatures xsi:type="ecore:EReference" name="allEvents" upperBound="-1"
- eType="#//JavaEvent" volatile="true" transient="true"/>
- </eClassifiers>
- <eClassifiers xsi:type="ecore:EClass" name="Initializer">
- <eStructuralFeatures xsi:type="ecore:EAttribute" name="isStatic" eType="ecore:EDataType http://www.eclipse.org/emf/2002/Ecore#//EBooleanObject"/>
- <eStructuralFeatures xsi:type="ecore:EReference" name="javaClass" eType="#//JavaClass"
- transient="true" eOpposite="#//JavaClass/initializers"/>
- <eStructuralFeatures xsi:type="ecore:EReference" name="source" eType="#//Block"/>
- </eClassifiers>
- <eClassifiers xsi:type="ecore:EClass" name="JavaParameter" eSuperTypes="../../org.eclipse.emf.ecore/model/Ecore.ecore#//EParameter">
- <eOperations name="isArray" eType="ecore:EDataType http://www.eclipse.org/emf/2002/Ecore#//EBoolean">
- <eAnnotations source="http://www.eclipse.org/emf/2002/GenModel">
- <details key="documentation" value="Is this parameter type an array type."/>
- </eAnnotations>
- </eOperations>
- <eOperations name="isReturn" eType="ecore:EDataType http://www.eclipse.org/emf/2002/Ecore#//EBoolean">
- <eAnnotations source="http://www.eclipse.org/emf/2002/GenModel">
- <details key="documentation" value="Is this a return parameter."/>
- </eAnnotations>
- </eOperations>
- <eOperations name="getJavaType" eType="#//JTypeJavaHelpers"/>
- <eOperations name="getQualifiedName" eType="ecore:EDataType http://www.eclipse.org/emf/2002/Ecore#//EString"/>
- <eStructuralFeatures xsi:type="ecore:EAttribute" name="final" eType="ecore:EDataType http://www.eclipse.org/emf/2002/Ecore#//EBoolean"/>
- <eStructuralFeatures xsi:type="ecore:EAttribute" name="parameterKind" eType="#//JavaParameterKind"/>
- </eClassifiers>
- <eClassifiers xsi:type="ecore:EClass" name="Method" eSuperTypes="../../org.eclipse.emf.ecore/model/Ecore.ecore#//EOperation">
- <eOperations name="getContainingJavaClass" eType="#//JavaClass">
- <eAnnotations source="http://www.eclipse.org/emf/2002/GenModel">
- <details key="documentation" value="Return the java class that this method is defined in."/>
- </eAnnotations>
- </eOperations>
- <eOperations name="getMethodElementSignature" eType="ecore:EDataType http://www.eclipse.org/emf/2002/Ecore#//EString">
- <eAnnotations source="http://www.eclipse.org/emf/2002/GenModel">
- <details key="documentation" value="Return a String with the the method name and its parameters. e.g. <code> setFirstName(java.lang.String) </code> .
 "/>
- </eAnnotations>
- </eOperations>
- <eOperations name="getParameter" eType="#//JavaParameter">
- <eAnnotations source="http://www.eclipse.org/emf/2002/GenModel">
- <details key="documentation" value="Return a Parameter with the passed name, or null."/>
- </eAnnotations>
- <eParameters name="parameterName" eType="ecore:EDataType http://www.eclipse.org/emf/2002/Ecore#//EString"/>
- </eOperations>
- <eOperations name="getReturnType" eType="#//JTypeJavaHelpers">
- <eAnnotations source="http://www.eclipse.org/emf/2002/GenModel">
- <details key="documentation" value="Get the return type."/>
- </eAnnotations>
- </eOperations>
- <eOperations name="setReturnType">
- <eAnnotations source="http://www.eclipse.org/emf/2002/GenModel">
- <details key="documentation" value="Set the return type"/>
- </eAnnotations>
- <eParameters name="type" eType="#//JTypeJavaHelpers"/>
- </eOperations>
- <eOperations name="getSignature" eType="ecore:EDataType http://www.eclipse.org/emf/2002/Ecore#//EString">
- <eAnnotations source="http://www.eclipse.org/emf/2002/GenModel">
- <details key="documentation" value="Replicate the functionality of java.lang.reflect.Method.toString().

Returns a string describing this Method. The string is formatted as the method access modifiers, if any, followed by the method return type, followed by a space, followed by the class declaring the method, followed by a period, followed by the method name, followed by a parenthesized, comma-separated list of the method's formal parameter types. If the method throws checked exceptions, the parameter list is followed by a space, followed by the word throws followed by a comma-separated list of the thrown exception types.

For example:

 public boolean java.lang.Object.equals(java.lang.Object)

The access modifiers are placed in canonical order as specified by "The Java Language Specification". This is public, <tt>protected</tt> or <tt>private</tt> first, and then other modifiers in the following order: <tt>abstract</tt>, <tt>static</tt>, <tt>final</tt>, <tt>synchronized</tt> <tt>native</tt>.
"/>
- </eAnnotations>
- </eOperations>
- <eOperations name="isGenerated" eType="ecore:EDataType http://www.eclipse.org/emf/2002/Ecore#//EBoolean">
- <eAnnotations source="http://www.eclipse.org/emf/2002/GenModel">
- <details key="documentation" value="Returns true if the method is system generated.
This is usually determined by the @generated tag in the comment."/>
- </eAnnotations>
- </eOperations>
- <eOperations name="setIsGenerated">
- <eAnnotations source="http://www.eclipse.org/emf/2002/GenModel">
- <details key="documentation" value="Set the isGenerated flag."/>
- </eAnnotations>
- <eParameters name="generated" eType="ecore:EDataType http://www.eclipse.org/emf/2002/Ecore#//EBoolean"/>
- </eOperations>
- <eOperations name="isVoid" eType="ecore:EDataType http://www.eclipse.org/emf/2002/Ecore#//EBoolean">
- <eAnnotations source="http://www.eclipse.org/emf/2002/GenModel">
- <details key="documentation" value="Is this a void return type method."/>
- </eAnnotations>
- </eOperations>
- <eStructuralFeatures xsi:type="ecore:EAttribute" name="abstract" eType="ecore:EDataType http://www.eclipse.org/emf/2002/Ecore#//EBoolean"/>
- <eStructuralFeatures xsi:type="ecore:EAttribute" name="native" eType="ecore:EDataType http://www.eclipse.org/emf/2002/Ecore#//EBoolean"/>
- <eStructuralFeatures xsi:type="ecore:EAttribute" name="synchronized" eType="ecore:EDataType http://www.eclipse.org/emf/2002/Ecore#//EBoolean"/>
- <eStructuralFeatures xsi:type="ecore:EAttribute" name="final" eType="ecore:EDataType http://www.eclipse.org/emf/2002/Ecore#//EBoolean"/>
- <eStructuralFeatures xsi:type="ecore:EAttribute" name="constructor" eType="ecore:EDataType http://www.eclipse.org/emf/2002/Ecore#//EBoolean"/>
- <eStructuralFeatures xsi:type="ecore:EAttribute" name="static" eType="ecore:EDataType http://www.eclipse.org/emf/2002/Ecore#//EBoolean"/>
- <eStructuralFeatures xsi:type="ecore:EAttribute" name="javaVisibility" eType="#//JavaVisibilityKind"/>
- <eStructuralFeatures xsi:type="ecore:EReference" name="parameters" upperBound="-1"
- eType="#//JavaParameter" containment="true"/>
- <eStructuralFeatures xsi:type="ecore:EReference" name="javaExceptions" upperBound="-1"
- eType="#//JavaClass"/>
- <eStructuralFeatures xsi:type="ecore:EReference" name="javaClass" eType="#//JavaClass"
- transient="true" eOpposite="#//JavaClass/methods"/>
- <eStructuralFeatures xsi:type="ecore:EReference" name="source" eType="#//Block"/>
- </eClassifiers>
- <eClassifiers xsi:type="ecore:EClass" name="Field" eSuperTypes="../../org.eclipse.emf.ecore/model/Ecore.ecore#//ETypedElement">
- <eOperations name="getContainingJavaClass" eType="#//JavaClass">
- <eAnnotations source="http://www.eclipse.org/emf/2002/GenModel">
- <details key="documentation" value="Get the class that this field is within."/>
- </eAnnotations>
- </eOperations>
- <eOperations name="isArray" eType="ecore:EDataType http://www.eclipse.org/emf/2002/Ecore#//EBoolean">
- <eAnnotations source="http://www.eclipse.org/emf/2002/GenModel">
- <details key="documentation" value="Is this field an array type."/>
- </eAnnotations>
- </eOperations>
- <eStructuralFeatures xsi:type="ecore:EAttribute" name="final" eType="ecore:EDataType http://www.eclipse.org/emf/2002/Ecore#//EBoolean"/>
- <eStructuralFeatures xsi:type="ecore:EAttribute" name="static" eType="ecore:EDataType http://www.eclipse.org/emf/2002/Ecore#//EBoolean"/>
- <eStructuralFeatures xsi:type="ecore:EAttribute" name="javaVisibility" eType="#//JavaVisibilityKind"/>
- <eStructuralFeatures xsi:type="ecore:EAttribute" name="transient" eType="ecore:EDataType http://www.eclipse.org/emf/2002/Ecore#//EBoolean"/>
- <eStructuralFeatures xsi:type="ecore:EAttribute" name="volatile" eType="ecore:EDataType http://www.eclipse.org/emf/2002/Ecore#//EBoolean"/>
- <eStructuralFeatures xsi:type="ecore:EReference" name="javaClass" eType="#//JavaClass"
- transient="true" eOpposite="#//JavaClass/fields"/>
- <eStructuralFeatures xsi:type="ecore:EReference" name="initializer" eType="#//Block"
- containment="true"/>
- </eClassifiers>
- <eClassifiers xsi:type="ecore:EEnum" name="TypeKind">
- <eAnnotations source="http://www.eclipse.org/emf/2002/GenModel">
- <details key="documentation" value="UNDEFINED=1 CLASS=2 INTERFACE=3 EXCEPTION=4"/>
- </eAnnotations>
- <eLiterals name="UNDEFINED"/>
- <eLiterals name="CLASS" value="1"/>
- <eLiterals name="INTERFACE" value="2"/>
- <eLiterals name="EXCEPTION" value="3"/>
- </eClassifiers>
- <eClassifiers xsi:type="ecore:EClass" name="Block">
- <eStructuralFeatures xsi:type="ecore:EAttribute" name="source" eType="ecore:EDataType http://www.eclipse.org/emf/2002/Ecore#//EString"/>
- <eStructuralFeatures xsi:type="ecore:EAttribute" name="name" eType="ecore:EDataType http://www.eclipse.org/emf/2002/Ecore#//EString"/>
- <eStructuralFeatures xsi:type="ecore:EReference" name="contents" upperBound="-1"
- eType="#//Block" containment="true"/>
- </eClassifiers>
- <eClassifiers xsi:type="ecore:EClass" name="Comment" eSuperTypes="#//Block"/>
- <eClassifiers xsi:type="ecore:EClass" name="Statement" eSuperTypes="#//Block"/>
- <eClassifiers xsi:type="ecore:EClass" name="JavaPackage" eSuperTypes="../../org.eclipse.emf.ecore/model/Ecore.ecore#//EPackage">
- <eStructuralFeatures xsi:type="ecore:EReference" name="javaClasses" upperBound="-1"
- eType="#//JavaClass" changeable="false" volatile="true" transient="true" eOpposite="#//JavaClass/javaPackage"/>
- </eClassifiers>
- <eClassifiers xsi:type="ecore:EEnum" name="JavaVisibilityKind">
- <eAnnotations source="http://www.eclipse.org/emf/2002/GenModel">
- <details key="documentation" value="PACKAGE=1
PUBLIC=2
PRIVATE=3
PROTECTED=4"/>
- </eAnnotations>
- <eLiterals name="PUBLIC"/>
- <eLiterals name="PRIVATE" value="1"/>
- <eLiterals name="PROTECTED" value="2"/>
- <eLiterals name="PACKAGE" value="3"/>
- </eClassifiers>
- <eClassifiers xsi:type="ecore:EEnum" name="JavaParameterKind">
- <eAnnotations source="http://www.eclipse.org/emf/2002/GenModel">
- <details key="documentation" value="IN=0
OUT=1
INOUT=2
RETURN=3"/>
- </eAnnotations>
- <eLiterals name="IN"/>
- <eLiterals name="OUT" value="1"/>
- <eLiterals name="INOUT" value="2"/>
- <eLiterals name="RETURN" value="3"/>
- </eClassifiers>
- <eClassifiers xsi:type="ecore:EClass" name="JavaDataType" eSuperTypes="../../org.eclipse.emf.ecore/model/Ecore.ecore#//EClass">
- <eOperations name="getDefaultValueString" eType="ecore:EDataType http://www.eclipse.org/emf/2002/Ecore#//EString">
- <eAnnotations source="http://www.eclipse.org/emf/2002/GenModel">
- <details key="documentation" value="Return the default string representing the default value of the primitive."/>
- </eAnnotations>
- </eOperations>
- </eClassifiers>
- <eClassifiers xsi:type="ecore:EClass" name="ArrayType" eSuperTypes="#//JavaClass">
- <eAnnotations source="http://www.eclipse.org/emf/2002/GenModel">
- <details key="documentation" value="Describes a Java Array type
 For multi-dimensional arrays, it is unlikely that the component type will be
 specified directly. This would require instantiating a chain of component types
 such as String[][][][]->String[][][]->String[][]->String[]->String.

 The component type relationship will be computed if the finalComponentType
 and array dimensions is specified.
 
 For this reason, the preferred way to create is through the JavaRefFactory factory method:
 createArrayType(JavaClass finalComponentType, int dimensions)"/>
- </eAnnotations>
- <eOperations name="getFinalComponentType" eType="#//JTypeJavaHelpers">
- <eAnnotations source="http://www.eclipse.org/emf/2002/GenModel">
- <details key="documentation" value="Get the final component type for this Array Type.

In order to ensure a unique instance, we will resolve this type using reflection. It turns out to be most efficient to just do this by trimming the name."/>
- </eAnnotations>
- </eOperations>
- <eOperations name="getComponentTypeAsHelper" eType="#//JTypeJavaHelpers">
- <eAnnotations source="http://www.eclipse.org/emf/2002/GenModel">
- <details key="documentation" value="Get the component type of this array. 

If this is a multi-dimensional array, the component type will be the nested array type."/>
- </eAnnotations>
- </eOperations>
- <eOperations name="isPrimitiveArray" eType="ecore:EDataType http://www.eclipse.org/emf/2002/Ecore#//EBoolean">
- <eAnnotations source="http://www.eclipse.org/emf/2002/GenModel">
- <details key="documentation" value="Is this an array of java primitives"/>
- </eAnnotations>
- </eOperations>
- <eOperations name="setComponentType">
- <eAnnotations source="http://www.eclipse.org/emf/2002/GenModel">
- <details key="documentation" value="Set the component type."/>
- </eAnnotations>
- <eParameters name="helperComponentType" eType="#//JTypeJavaHelpers"/>
- </eOperations>
- <eStructuralFeatures xsi:type="ecore:EAttribute" name="arrayDimensions" eType="ecore:EDataType http://www.eclipse.org/emf/2002/Ecore#//EInt"/>
- <eStructuralFeatures xsi:type="ecore:EReference" name="componentType" lowerBound="1"
- eType="ecore:EClass ../../org.eclipse.emf.ecore/model/Ecore.ecore#//EClassifier"/>
- </eClassifiers>
- <eClassifiers xsi:type="ecore:EDataType" name="JTypeJavaHelpers" instanceClassName="org.eclipse.jem.java.JavaHelpers">
- <eAnnotations source="http://www.eclipse.org/emf/2002/GenModel">
- <details key="documentation" value="This interface is a common interface between JavaClass and JavaDataType plus some common helper methods."/>
- </eAnnotations>
- </eClassifiers>
- <eClassifiers xsi:type="ecore:EDataType" name="JTypeList" instanceClassName="java.util.List">
- <eAnnotations source="http://www.eclipse.org/emf/2002/GenModel">
- <details key="documentation" value="java.util.List type"/>
- </eAnnotations>
- </eClassifiers>
- <eClassifiers xsi:type="ecore:EClass" name="JavaEvent" abstract="true" eSuperTypes="../../org.eclipse.emf.ecore/model/Ecore.ecore#//EStructuralFeature"/>
-</ecore:EPackage>
diff --git a/plugins/org.eclipse.jem/model/javaModel.genmodel b/plugins/org.eclipse.jem/model/javaModel.genmodel
deleted file mode 100644
index c94fd6a..0000000
--- a/plugins/org.eclipse.jem/model/javaModel.genmodel
+++ /dev/null
@@ -1,174 +0,0 @@
-<?xml version="1.0" encoding="ASCII"?>
-<genmodel:GenModel xmi:version="2.0"
- xmlns:xmi="http://www.omg.org/XMI" xmlns:ecore="http://www.eclipse.org/emf/2002/Ecore"
- xmlns:genmodel="http://www.eclipse.org/emf/2002/GenModel" modelDirectory="/org.eclipse.jem/mofjava"
- editDirectory="/org.eclipse.jem.edit/src" editorDirectory="/org.eclipse.jem.editor/src"
- modelPluginID="" modelName="Java" modelPluginClass="" editPluginClass="java.provider.JavaEditPlugin"
- editorPluginClass="java.presentation.JavaEditorPlugin" updateClasspath="false"
- booleanFlagsField="eFlags" booleanFlagsReservedBits="8" usedGenPackages="../../org.eclipse.emf.ecore/model/Ecore.genmodel#//ecore">
- <foreignModel>..\rose\javaModel.mdl</foreignModel>
- <foreignModel>WorkspaceRoot</foreignModel>
- <foreignModel>../..</foreignModel>
- <genPackages prefix="JavaRef" basePackage="org.eclipse.jem" classPackageSuffix="internal.impl"
- ecorePackage="java.ecore#/">
- <genEnums ecoreEnum="java.ecore#//TypeKind">
- <genEnumLiterals ecoreEnumLiteral="java.ecore#//TypeKind/UNDEFINED"/>
- <genEnumLiterals ecoreEnumLiteral="java.ecore#//TypeKind/CLASS"/>
- <genEnumLiterals ecoreEnumLiteral="java.ecore#//TypeKind/INTERFACE"/>
- <genEnumLiterals ecoreEnumLiteral="java.ecore#//TypeKind/EXCEPTION"/>
- </genEnums>
- <genEnums ecoreEnum="java.ecore#//JavaVisibilityKind">
- <genEnumLiterals ecoreEnumLiteral="java.ecore#//JavaVisibilityKind/PUBLIC"/>
- <genEnumLiterals ecoreEnumLiteral="java.ecore#//JavaVisibilityKind/PRIVATE"/>
- <genEnumLiterals ecoreEnumLiteral="java.ecore#//JavaVisibilityKind/PROTECTED"/>
- <genEnumLiterals ecoreEnumLiteral="java.ecore#//JavaVisibilityKind/PACKAGE"/>
- </genEnums>
- <genEnums ecoreEnum="java.ecore#//JavaParameterKind">
- <genEnumLiterals ecoreEnumLiteral="java.ecore#//JavaParameterKind/IN"/>
- <genEnumLiterals ecoreEnumLiteral="java.ecore#//JavaParameterKind/OUT"/>
- <genEnumLiterals ecoreEnumLiteral="java.ecore#//JavaParameterKind/INOUT"/>
- <genEnumLiterals ecoreEnumLiteral="java.ecore#//JavaParameterKind/RETURN"/>
- </genEnums>
- <genDataTypes ecoreDataType="java.ecore#//JTypeJavaHelpers"/>
- <genDataTypes ecoreDataType="java.ecore#//JTypeList"/>
- <genClasses ecoreClass="java.ecore#//JavaClass">
- <genFeatures createChild="false" ecoreFeature="ecore:EAttribute java.ecore#//JavaClass/kind"/>
- <genFeatures createChild="false" ecoreFeature="ecore:EAttribute java.ecore#//JavaClass/public"/>
- <genFeatures createChild="false" ecoreFeature="ecore:EAttribute java.ecore#//JavaClass/final"/>
- <genFeatures property="None" notify="false" createChild="false" ecoreFeature="ecore:EReference java.ecore#//JavaClass/implementsInterfaces"/>
- <genFeatures property="None" notify="false" createChild="false" ecoreFeature="ecore:EReference java.ecore#//JavaClass/classImport"/>
- <genFeatures property="None" notify="false" createChild="false" ecoreFeature="ecore:EReference java.ecore#//JavaClass/packageImports"/>
- <genFeatures property="None" children="true" createChild="true" ecoreFeature="ecore:EReference java.ecore#//JavaClass/fields"/>
- <genFeatures property="None" children="true" createChild="true" ecoreFeature="ecore:EReference java.ecore#//JavaClass/methods"/>
- <genFeatures property="None" children="true" createChild="true" ecoreFeature="ecore:EReference java.ecore#//JavaClass/initializers"/>
- <genFeatures property="None" createChild="false" ecoreFeature="ecore:EReference java.ecore#//JavaClass/declaredClasses"/>
- <genFeatures property="None" notify="false" createChild="false" ecoreFeature="ecore:EReference java.ecore#//JavaClass/declaringClass"/>
- <genFeatures property="Readonly" createChild="false" ecoreFeature="ecore:EReference java.ecore#//JavaClass/javaPackage"/>
- <genFeatures property="None" children="true" createChild="true" ecoreFeature="ecore:EReference java.ecore#//JavaClass/events"/>
- <genFeatures property="None" notify="false" createChild="false" ecoreFeature="ecore:EReference java.ecore#//JavaClass/allEvents"/>
- <genOperations ecoreOperation="java.ecore#//JavaClass/isNested"/>
- <genOperations ecoreOperation="java.ecore#//JavaClass/getField">
- <genParameters ecoreParameter="java.ecore#//JavaClass/getField/fieldName"/>
- </genOperations>
- <genOperations ecoreOperation="java.ecore#//JavaClass/getFieldExtended">
- <genParameters ecoreParameter="java.ecore#//JavaClass/getFieldExtended/fieldName"/>
- </genOperations>
- <genOperations ecoreOperation="java.ecore#//JavaClass/getFieldNamed">
- <genParameters ecoreParameter="java.ecore#//JavaClass/getFieldNamed/fieldName"/>
- </genOperations>
- <genOperations ecoreOperation="java.ecore#//JavaClass/getFieldsExtended"/>
- <genOperations ecoreOperation="java.ecore#//JavaClass/getMethod">
- <genParameters ecoreParameter="java.ecore#//JavaClass/getMethod/methodName"/>
- <genParameters ecoreParameter="java.ecore#//JavaClass/getMethod/parameterTypes"/>
- </genOperations>
- <genOperations ecoreOperation="java.ecore#//JavaClass/getMethodElementSignatures"/>
- <genOperations ecoreOperation="java.ecore#//JavaClass/getMethodExtended">
- <genParameters ecoreParameter="java.ecore#//JavaClass/getMethodExtended/methodName"/>
- <genParameters ecoreParameter="java.ecore#//JavaClass/getMethodExtended/parameterTypes"/>
- </genOperations>
- <genOperations ecoreOperation="java.ecore#//JavaClass/getMethodsExtended"/>
- <genOperations ecoreOperation="java.ecore#//JavaClass/getOnlySpecificMethods">
- <genParameters ecoreParameter="java.ecore#//JavaClass/getOnlySpecificMethods/aMethodNamePrefix"/>
- <genParameters ecoreParameter="java.ecore#//JavaClass/getOnlySpecificMethods/excludedNames"/>
- </genOperations>
- <genOperations ecoreOperation="java.ecore#//JavaClass/getPublicMethod">
- <genParameters ecoreParameter="java.ecore#//JavaClass/getPublicMethod/methodName"/>
- <genParameters ecoreParameter="java.ecore#//JavaClass/getPublicMethod/parameterTypes"/>
- </genOperations>
- <genOperations ecoreOperation="java.ecore#//JavaClass/getPublicMethods"/>
- <genOperations ecoreOperation="java.ecore#//JavaClass/getPublicMethodsExtended"/>
- <genOperations ecoreOperation="java.ecore#//JavaClass/getPublicMethodsNamed">
- <genParameters ecoreParameter="java.ecore#//JavaClass/getPublicMethodsNamed/name"/>
- </genOperations>
- <genOperations ecoreOperation="java.ecore#//JavaClass/getSupertype"/>
- <genOperations ecoreOperation="java.ecore#//JavaClass/implementsInterface">
- <genParameters ecoreParameter="java.ecore#//JavaClass/implementsInterface/interfaceType"/>
- </genOperations>
- <genOperations ecoreOperation="java.ecore#//JavaClass/infoString"/>
- <genOperations ecoreOperation="java.ecore#//JavaClass/inheritsFrom">
- <genParameters ecoreParameter="java.ecore#//JavaClass/inheritsFrom/javaClass"/>
- </genOperations>
- <genOperations ecoreOperation="java.ecore#//JavaClass/isExistingType"/>
- <genOperations ecoreOperation="java.ecore#//JavaClass/isInterface"/>
- <genOperations ecoreOperation="java.ecore#//JavaClass/setSupertype">
- <genParameters ecoreParameter="java.ecore#//JavaClass/setSupertype/javaclass"/>
- </genOperations>
- </genClasses>
- <genClasses ecoreClass="java.ecore#//Initializer">
- <genFeatures createChild="false" ecoreFeature="ecore:EAttribute java.ecore#//Initializer/isStatic"/>
- <genFeatures property="None" notify="false" createChild="false" ecoreFeature="ecore:EReference java.ecore#//Initializer/javaClass"/>
- <genFeatures property="Readonly" createChild="false" ecoreFeature="ecore:EReference java.ecore#//Initializer/source"/>
- </genClasses>
- <genClasses ecoreClass="java.ecore#//JavaParameter">
- <genFeatures createChild="false" ecoreFeature="ecore:EAttribute java.ecore#//JavaParameter/final"/>
- <genFeatures createChild="false" ecoreFeature="ecore:EAttribute java.ecore#//JavaParameter/parameterKind"/>
- <genOperations ecoreOperation="java.ecore#//JavaParameter/isArray"/>
- <genOperations ecoreOperation="java.ecore#//JavaParameter/isReturn"/>
- <genOperations ecoreOperation="java.ecore#//JavaParameter/getJavaType"/>
- <genOperations ecoreOperation="java.ecore#//JavaParameter/getQualifiedName"/>
- </genClasses>
- <genClasses ecoreClass="java.ecore#//Method">
- <genFeatures createChild="false" ecoreFeature="ecore:EAttribute java.ecore#//Method/abstract"/>
- <genFeatures createChild="false" ecoreFeature="ecore:EAttribute java.ecore#//Method/native"/>
- <genFeatures createChild="false" ecoreFeature="ecore:EAttribute java.ecore#//Method/synchronized"/>
- <genFeatures createChild="false" ecoreFeature="ecore:EAttribute java.ecore#//Method/final"/>
- <genFeatures createChild="false" ecoreFeature="ecore:EAttribute java.ecore#//Method/constructor"/>
- <genFeatures createChild="false" ecoreFeature="ecore:EAttribute java.ecore#//Method/static"/>
- <genFeatures createChild="false" ecoreFeature="ecore:EAttribute java.ecore#//Method/javaVisibility"/>
- <genFeatures property="None" children="true" createChild="true" ecoreFeature="ecore:EReference java.ecore#//Method/parameters"/>
- <genFeatures property="None" notify="false" createChild="false" ecoreFeature="ecore:EReference java.ecore#//Method/javaExceptions"/>
- <genFeatures property="None" notify="false" createChild="false" ecoreFeature="ecore:EReference java.ecore#//Method/javaClass"/>
- <genFeatures property="Readonly" createChild="false" ecoreFeature="ecore:EReference java.ecore#//Method/source"/>
- <genOperations ecoreOperation="java.ecore#//Method/getContainingJavaClass"/>
- <genOperations ecoreOperation="java.ecore#//Method/getMethodElementSignature"/>
- <genOperations ecoreOperation="java.ecore#//Method/getParameter">
- <genParameters ecoreParameter="java.ecore#//Method/getParameter/parameterName"/>
- </genOperations>
- <genOperations ecoreOperation="java.ecore#//Method/getReturnType"/>
- <genOperations ecoreOperation="java.ecore#//Method/setReturnType">
- <genParameters ecoreParameter="java.ecore#//Method/setReturnType/type"/>
- </genOperations>
- <genOperations ecoreOperation="java.ecore#//Method/getSignature"/>
- <genOperations ecoreOperation="java.ecore#//Method/isGenerated"/>
- <genOperations ecoreOperation="java.ecore#//Method/setIsGenerated">
- <genParameters ecoreParameter="java.ecore#//Method/setIsGenerated/generated"/>
- </genOperations>
- <genOperations ecoreOperation="java.ecore#//Method/isVoid"/>
- </genClasses>
- <genClasses ecoreClass="java.ecore#//Field">
- <genFeatures createChild="false" ecoreFeature="ecore:EAttribute java.ecore#//Field/final"/>
- <genFeatures createChild="false" ecoreFeature="ecore:EAttribute java.ecore#//Field/static"/>
- <genFeatures createChild="false" ecoreFeature="ecore:EAttribute java.ecore#//Field/javaVisibility"/>
- <genFeatures createChild="false" ecoreFeature="ecore:EAttribute java.ecore#//Field/transient"/>
- <genFeatures createChild="false" ecoreFeature="ecore:EAttribute java.ecore#//Field/volatile"/>
- <genFeatures property="None" notify="false" createChild="false" ecoreFeature="ecore:EReference java.ecore#//Field/javaClass"/>
- <genFeatures property="None" children="true" createChild="true" ecoreFeature="ecore:EReference java.ecore#//Field/initializer"/>
- <genOperations ecoreOperation="java.ecore#//Field/getContainingJavaClass"/>
- <genOperations ecoreOperation="java.ecore#//Field/isArray"/>
- </genClasses>
- <genClasses ecoreClass="java.ecore#//Block">
- <genFeatures createChild="false" ecoreFeature="ecore:EAttribute java.ecore#//Block/source"/>
- <genFeatures createChild="false" ecoreFeature="ecore:EAttribute java.ecore#//Block/name"/>
- <genFeatures property="None" children="true" createChild="true" ecoreFeature="ecore:EReference java.ecore#//Block/contents"/>
- </genClasses>
- <genClasses ecoreClass="java.ecore#//Comment"/>
- <genClasses ecoreClass="java.ecore#//Statement"/>
- <genClasses ecoreClass="java.ecore#//JavaPackage">
- <genFeatures property="None" notify="false" createChild="false" ecoreFeature="ecore:EReference java.ecore#//JavaPackage/javaClasses"/>
- </genClasses>
- <genClasses ecoreClass="java.ecore#//JavaDataType">
- <genOperations ecoreOperation="java.ecore#//JavaDataType/getDefaultValueString"/>
- </genClasses>
- <genClasses ecoreClass="java.ecore#//ArrayType">
- <genFeatures createChild="false" ecoreFeature="ecore:EAttribute java.ecore#//ArrayType/arrayDimensions"/>
- <genFeatures property="Readonly" createChild="false" ecoreFeature="ecore:EReference java.ecore#//ArrayType/componentType"/>
- <genOperations ecoreOperation="java.ecore#//ArrayType/getFinalComponentType"/>
- <genOperations ecoreOperation="java.ecore#//ArrayType/getComponentTypeAsHelper"/>
- <genOperations ecoreOperation="java.ecore#//ArrayType/isPrimitiveArray"/>
- <genOperations ecoreOperation="java.ecore#//ArrayType/setComponentType">
- <genParameters ecoreParameter="java.ecore#//ArrayType/setComponentType/helperComponentType"/>
- </genOperations>
- </genClasses>
- <genClasses ecoreClass="java.ecore#//JavaEvent"/>
- </genPackages>
-</genmodel:GenModel>
diff --git a/plugins/org.eclipse.jem/mofjava/javaadapters.properties b/plugins/org.eclipse.jem/mofjava/javaadapters.properties
deleted file mode 100644
index 7b51b56..0000000
--- a/plugins/org.eclipse.jem/mofjava/javaadapters.properties
+++ /dev/null
@@ -1,26 +0,0 @@
-###############################################################################
-# Copyright (c) 2003, 2005 IBM Corporation and others.
-# All rights reserved. This program and the accompanying materials
-# are made available under the terms of the Eclipse Public License v1.0
-# which accompanies this distribution, and is available at
-# http://www.eclipse.org/legal/epl-v10.html
-#
-# Contributors:
-# IBM Corporation - initial API and implementation
-###############################################################################
-#
-# $Source: /cvsroot/webtools/jeetools.move/webtools.javaee.git/plugins/org.eclipse.jem/mofjava/javaadapters.properties,v $
-# $Revision: 1.6 $ $Date: 2008/03/25 13:12:52 $
-#
-
-Failed_reflecting_values_ERROR_ = IWAV0002E Failed reflecting values. Check classpath.
-Could_Not_Reflect_Methods_ERROR_ = IWAV0003E Could not reflect methods for {0} because one of the methods references a type that could not be loaded. Exception: {1} Check classpath.
-Could_Not_Reflect_Constructors_ERROR_ = IWAV0142E Could not reflect constructors for {0} because one of the methods references a type that could not be loaded. Exception: {1} Check classpath.
-Could_Not_Reflect_Fields_ERROR_ = IWAV0143E Could not reflect fields for {0} because one of the fields is a type that could not be loaded. Exception: {1} Check classpath.
-Error_Looking_Up_Type_ERROR_ = IWAV0144E Error looking up type {0}. Exception: {1} Check classpath.
-Error_Introspecting_Flags_ERROR_ = IWAV0145E Error introspecting flags on {0}. Exception: {1}
-Error_Setting_GenFlag_ERROR_ = IWAV0153E Error setting the generated flag on {0}. Exception: {1}
-Java_Inh_Cycle_ERROR_ = IWAV0154E Detected an inheritance cycle when {0} trys to extend {1}.
-
-
-
diff --git a/plugins/org.eclipse.jem/mofjava/org/eclipse/jem/internal/core/JEMPlugin.java b/plugins/org.eclipse.jem/mofjava/org/eclipse/jem/internal/core/JEMPlugin.java
deleted file mode 100644
index 05ce6cf..0000000
--- a/plugins/org.eclipse.jem/mofjava/org/eclipse/jem/internal/core/JEMPlugin.java
+++ /dev/null
@@ -1,74 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2001, 2005 IBM Corporation and others.
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
- *
- * Contributors:
- * IBM Corporation - initial API and implementation
- *******************************************************************************/
-/*
-
-
- */
-package org.eclipse.jem.internal.core;
-
-import org.eclipse.core.runtime.Plugin;
-import org.eclipse.core.runtime.IStatus;
-import org.eclipse.core.runtime.Status;
-import org.eclipse.core.runtime.Platform;
-import org.osgi.framework.BundleContext;
-
-import org.eclipse.jem.util.logger.proxy.Logger;
-import org.eclipse.jem.util.logger.proxyrender.EclipseLogger;
-
-
-/**
- * org.eclipse.jem plugin
- */
-public class JEMPlugin extends Plugin {
-
- private static JEMPlugin PLUGIN;
- private Logger logger;
- private static final String PLUGIN_ID = "org.eclipse.jem"; //$NON-NLS-1$
-
- public JEMPlugin() {
- PLUGIN = this;
- }
-
- public static JEMPlugin getPlugin() {
- return PLUGIN;
- }
-
-
- /* (non-Javadoc)
- * @see org.osgi.framework.BundleActivator#start(org.osgi.framework.BundleContext)
- */
- public void start(BundleContext context) throws Exception {
- super.start(context);
- logger = EclipseLogger.getEclipseLogger(this);
- }
-
- public Logger getLogger() {
- return logger;
- }
-
- public String getPluginID() {
- return PLUGIN_ID;
- }
-
- public static IStatus createStatus(int severity, String message, Throwable exception) {
- return new Status(severity, PLUGIN_ID, severity, message, exception);
- }
-
- public static void logWarning(String message, Throwable exception) {
- Platform.getLog(Platform.getBundle(PLUGIN_ID)).log( createStatus(IStatus.WARNING, message , exception));
- }
-
- public static void logError(String message, Throwable exception) {
- Platform.getLog(Platform.getBundle(PLUGIN_ID)).log( createStatus(IStatus.ERROR, message , exception));
- }
-
-
-}
diff --git a/plugins/org.eclipse.jem/mofjava/org/eclipse/jem/internal/java/adapters/IJavaClassAdaptor.java b/plugins/org.eclipse.jem/mofjava/org/eclipse/jem/internal/java/adapters/IJavaClassAdaptor.java
deleted file mode 100644
index 5406678..0000000
--- a/plugins/org.eclipse.jem/mofjava/org/eclipse/jem/internal/java/adapters/IJavaClassAdaptor.java
+++ /dev/null
@@ -1,51 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2001, 2005 IBM Corporation and others.
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
- *
- * Contributors:
- * IBM Corporation - initial API and implementation
- *******************************************************************************/
-package org.eclipse.jem.internal.java.adapters;
-/*
-
-
- */
-/**
- * Insert the type's description here.
- * Creation date: (8/27/2001 1:17:46 PM)
- * @author: Administrator
- */
-public interface IJavaClassAdaptor {
-/**
- * Return true if the sourceType is null or if
- * it is a binary type.
- */
-boolean isSourceTypeFromBinary() ;
-/**
- * Return true if the sourceType can be found.
- */
-boolean sourceTypeExists() ;
-
-/**
- * Reflect the fields
- * @return <code>true</code> if reflection occurred.
- *
- * @since 1.0.0
- */
-boolean reflectFieldsIfNecessary();
-
-/**
- * Reflect the methods.
- * @return <code>true</code> if reflection occurred.
- *
- * @since 1.0.0
- */
-boolean reflectMethodsIfNecessary();
-}
-
-
-
-
diff --git a/plugins/org.eclipse.jem/mofjava/org/eclipse/jem/internal/java/adapters/IJavaMethodAdapter.java b/plugins/org.eclipse.jem/mofjava/org/eclipse/jem/internal/java/adapters/IJavaMethodAdapter.java
deleted file mode 100644
index 68db003..0000000
--- a/plugins/org.eclipse.jem/mofjava/org/eclipse/jem/internal/java/adapters/IJavaMethodAdapter.java
+++ /dev/null
@@ -1,39 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2004, 2005 IBM Corporation and others.
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
- *
- * Contributors:
- * IBM Corporation - initial API and implementation
- *******************************************************************************/
-/*
-
-
- */
-package org.eclipse.jem.internal.java.adapters;
-
-
-/**
- * Used to reflect methods
- * @since 1.0.0
- */
-public interface IJavaMethodAdapter {
-
- /**
- * Reflect the generated if necessary.
- * @return <code>true</code> if reflection occurred.
- *
- * @since 1.0.0
- */
- public boolean reflectGeneratedIfNecessary();
-
- /**
- * Reflect the names of the method parameters if necessary.
- * @return <code>true</code> if reflection occurred.
- *
- * @since 1.0.0
- */
- public boolean reflectParamNamesIfNecessary();
-}
diff --git a/plugins/org.eclipse.jem/mofjava/org/eclipse/jem/internal/java/adapters/InternalReadAdaptable.java b/plugins/org.eclipse.jem/mofjava/org/eclipse/jem/internal/java/adapters/InternalReadAdaptable.java
deleted file mode 100644
index f7c474d..0000000
--- a/plugins/org.eclipse.jem/mofjava/org/eclipse/jem/internal/java/adapters/InternalReadAdaptable.java
+++ /dev/null
@@ -1,34 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2001, 2005 IBM Corporation and others.
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
- *
- * Contributors:
- * IBM Corporation - initial API and implementation
- *******************************************************************************/
-package org.eclipse.jem.internal.java.adapters;
-/*
-
-
- */
-
-public interface InternalReadAdaptable extends org.eclipse.emf.common.notify.Notifier {
-/**
- * Implementers of this interface need to contain the following method
- * implementations:
- * public Object primRefValue(EObject a) {
- * return super.getValue(a);
- * }
- * public Object getValue(EObject a) {
- * return ReflectionAdaptor.getValue(this, a);
- * }
- */
-//public Object primRefValue(EObject a);
-void setReflected(boolean aBoolean);
-}
-
-
-
-
diff --git a/plugins/org.eclipse.jem/mofjava/org/eclipse/jem/internal/java/adapters/JavaArrayTypeReflectionAdapter.java b/plugins/org.eclipse.jem/mofjava/org/eclipse/jem/internal/java/adapters/JavaArrayTypeReflectionAdapter.java
deleted file mode 100644
index d8e1a66..0000000
--- a/plugins/org.eclipse.jem/mofjava/org/eclipse/jem/internal/java/adapters/JavaArrayTypeReflectionAdapter.java
+++ /dev/null
@@ -1,138 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2004, 2005 IBM Corporation and others.
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
- *
- * Contributors:
- * IBM Corporation - initial API and implementation
- *******************************************************************************/
-/*
-
-
- */
-package org.eclipse.jem.internal.java.adapters;
-
-import java.util.List;
-
-import org.eclipse.emf.common.notify.Notifier;
-import org.eclipse.emf.ecore.EObject;
-import org.eclipse.emf.ecore.util.EcoreUtil;
-import org.eclipse.jem.java.ArrayType;
-import org.eclipse.jem.java.InheritanceCycleException;
-import org.eclipse.jem.java.JavaClass;
-import org.eclipse.jem.java.JavaHelpers;
-import org.eclipse.jem.java.JavaRefFactory;
-import org.eclipse.jem.java.internal.impl.ArrayTypeImpl;
-
-/**
- * Array type reflection adapter. Since arrays are very constant we don't need any fancy reflection to the source type (class object). It really
- * doesn't do anything. It is just here so that it exists. Everything is constant or depends on the final component type.
- *
- * @since 1.0.0
- */
-public class JavaArrayTypeReflectionAdapter extends JavaReflectionAdaptor implements IJavaClassAdaptor {
-
- public JavaArrayTypeReflectionAdapter(Notifier target) {
- super(target);
- }
-
- /*
- * (non-Javadoc)
- *
- * @see org.eclipse.jem.internal.java.adapters.JavaReflectionAdaptor#getReflectionSource()
- */
- public Object getReflectionSource() {
- return null; // There isn't any for arrays.
- }
-
- /*
- * (non-Javadoc)
- *
- * @see org.eclipse.jem.internal.java.adapters.JavaReflectionAdaptor#hasReflectionSource()
- */
- public boolean hasReflectionSource() {
- // This method is used to determine if valid, so we pass on to use the final component.
- ArrayType jh = (ArrayType) getTarget();
- JavaHelpers fc = jh.getFinalComponentType();
- return (fc.isPrimitive() || ((JavaClass) fc).isExistingType());
- }
-
- public boolean hasCachedReflectionSource() {
- ArrayType jh = (ArrayType) getTarget();
- JavaHelpers fc = jh.getFinalComponentType();
- if(fc.isPrimitive())
- return true;
- else {
- JavaReflectionAdaptor reflectionAdaptor = (JavaReflectionAdaptor) EcoreUtil.getExistingAdapter(fc, ReflectionAdaptor.TYPE_KEY);
- return (reflectionAdaptor != null) ? reflectionAdaptor.hasCachedReflectionSource() : false;
- }
- }
-
- /*
- * (non-Javadoc)
- *
- * @see org.eclipse.jem.internal.java.adapters.ReflectionAdaptor#reflectValues()
- */
- public boolean reflectValues() {
- ArrayTypeImpl at = (ArrayTypeImpl) getTarget();
-
- // Arrays are always:
- // final
- // Supertype of java.lang.Object
- // implements java.lang.Cloneable, java.io.Serializable
- at.setFinal(true);
- try {
- at.setSupertype((JavaClass) JavaRefFactory.eINSTANCE.reflectType("java.lang.Object", (EObject) getTarget())); //$NON-NLS-1$
- } catch (InheritanceCycleException e) {
- }
- List list = at.getImplementsInterfacesGen();
- list.add(JavaRefFactory.eINSTANCE.createClassRef("java.lang.Cloneable")); //$NON-NLS-1$
- list.add(JavaRefFactory.eINSTANCE.createClassRef("java.io.Serializable")); //$NON-NLS-1$
- return super.reflectValues();
- }
-
- /*
- * (non-Javadoc)
- *
- * @see org.eclipse.jem.internal.java.adapters.JavaReflectionAdaptor#flushReflectedValues(boolean)
- */
- protected boolean flushReflectedValues(boolean clearCachedModelObject) {
- ArrayTypeImpl at = (ArrayTypeImpl) getTarget();
- at.getImplementsInterfacesGen().clear();
- return true;
- }
-
- /*
- * (non-Javadoc)
- * @see org.eclipse.jem.internal.java.adapters.IJavaClassAdaptor#isSourceTypeFromBinary()
- */
- public boolean isSourceTypeFromBinary() {
- return false;
- }
-
- /*
- * (non-Javadoc)
- * @see org.eclipse.jem.internal.java.adapters.IJavaClassAdaptor#reflectFieldsIfNecessary()
- */
- public synchronized boolean reflectFieldsIfNecessary() {
- return reflectValuesIfNecessary();
- }
-
- /*
- * (non-Javadoc)
- * @see org.eclipse.jem.internal.java.adapters.IJavaClassAdaptor#reflectMethodsIfNecessary()
- */
- public synchronized boolean reflectMethodsIfNecessary() {
- return reflectValuesIfNecessary();
- }
-
- /*
- * (non-Javadoc)
- * @see org.eclipse.jem.internal.java.adapters.IJavaClassAdaptor#sourceTypeExists()
- */
- public boolean sourceTypeExists() {
- return hasReflectionSource();
- }
-}
diff --git a/plugins/org.eclipse.jem/mofjava/org/eclipse/jem/internal/java/adapters/JavaReflectionAdapterFactory.java b/plugins/org.eclipse.jem/mofjava/org/eclipse/jem/internal/java/adapters/JavaReflectionAdapterFactory.java
deleted file mode 100644
index 381376b..0000000
--- a/plugins/org.eclipse.jem/mofjava/org/eclipse/jem/internal/java/adapters/JavaReflectionAdapterFactory.java
+++ /dev/null
@@ -1,172 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2001, 2005 IBM Corporation and others.
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
- *
- * Contributors:
- * IBM Corporation - initial API and implementation
- *******************************************************************************/
-package org.eclipse.jem.internal.java.adapters;
-/*
-
-
- */
-import java.util.ArrayList;
-import java.util.HashMap;
-import java.util.Iterator;
-import java.util.List;
-import java.util.Map;
-
-import org.eclipse.emf.common.notify.Adapter;
-import org.eclipse.emf.common.notify.Notification;
-import org.eclipse.emf.common.notify.Notifier;
-import org.eclipse.emf.common.notify.impl.AdapterFactoryImpl;
-import org.eclipse.emf.ecore.EObject;
-import org.eclipse.emf.ecore.EPackage;
-
-import org.eclipse.jem.java.JavaRefPackage;
-public abstract class JavaReflectionAdapterFactory extends AdapterFactoryImpl {
- // Maintain a mapping of the source objects to the adaptors which have
- // relfected from them. This allows a flush operation to force those
- // adapters to re-reflect.
- protected HashMap reflected = new HashMap();
- /**
- * Key for the type of adapters that this factory creates. (Used in isFactoryForType()).
- */
- public static final String TYPE_KEY = ReadAdaptor.TYPE_KEY;
- protected boolean isBusyIteratingReflected = false;
- protected Map registerQueue;
- protected List unregisterQueue;
-/**
- * JavaReflectionAdapterFactory constructor comment.
- */
-public JavaReflectionAdapterFactory() {
- super();
-}
-public Adapter createAdapter(Notifier target) {
- ReflectionAdaptor adapter = null;
- EObject object = (EObject) target;
- JavaRefPackage pack = getJavaRefPackage();
- if (object.eClass() == pack.getJavaClass())
- adapter = createJavaClassAdaptor(target);
- else
- if (object.eClass() == pack.getArrayType())
- adapter = createArrayTypeAdaptor(target);
- else
- if (object.eClass() == pack.getMethod())
- adapter = createJavaMethodAdaptor(target);
- else
- if (object.eClass() == pack.getField())
- adapter = createJavaFieldAdaptor(target);
- return adapter;
-}
-
-protected ReflectionAdaptor createArrayTypeAdaptor(Notifier target) {
- return new JavaArrayTypeReflectionAdapter(target);
-}
-
-protected abstract ReflectionAdaptor createJavaClassAdaptor(Notifier target) ;
-protected abstract ReflectionAdaptor createJavaFieldAdaptor(Notifier target) ;
-protected abstract ReflectionAdaptor createJavaMethodAdaptor(Notifier target) ;
-// Flush the adapter for a source object
-public Notification disAssociateSource(String source) {
- return disAssociateSource(source, true);
-}
-
-public Notification disAssociateSource(String source, boolean doNotify) {
- JavaReflectionAdaptor a = (JavaReflectionAdaptor) reflected.get(source);
- Notification notification = null;
- if (a != null) {
- if (doNotify)
- a.releaseSourceType();
- else
- notification = a.releaseSourceTypeNoNotification();
- }
- return notification;
-}
-public void flushAll() {}
-// Flush the adapter for a source object
-public void flushReflection(String source) {}
-protected JavaRefPackage getJavaRefPackage() {
- return (JavaRefPackage) EPackage.Registry.INSTANCE.getEPackage(JavaRefPackage.eNS_URI);
-}
-public void registerReflection(String source, ReflectionAdaptor adapter) {
- if (isBusyIteratingReflected) {
- if (registerQueue == null)
- registerQueue = new HashMap();
- registerQueue.put(source, adapter);
- } else
- reflected.put(source, adapter);
-}
-public void unregisterReflection(String source) {
- if (isBusyIteratingReflected) {
- if (unregisterQueue == null)
- unregisterQueue = new ArrayList();
- unregisterQueue.add(source);
- } else
- reflected.remove(source);
-}
-public void disAssociateSourcePlusInner(String source) {
- disAssociateSourcePlusInner(source, true);
-}
-
-public Notification disAssociateSourcePlusInner(String source, boolean doNotify) {
- isBusyIteratingReflected = true;
- Notification notification = null;
- try {
- String innerName = source + '$';
- Iterator it = reflected.entrySet().iterator();
- Map.Entry entry;
- String key;
- JavaReflectionAdaptor adaptor;
- while (it.hasNext()) {
- entry = (Map.Entry) it.next();
- key = (String) entry.getKey();
- if (key.equals(source) || key.startsWith(innerName)) {
- adaptor = (JavaReflectionAdaptor) reflected.get(key);
- if (adaptor != null) {
- if (doNotify)
- adaptor.releaseSourceType();
- else
- notification = adaptor.releaseSourceTypeNoNotification();
- }
- }
- }
- } finally {
- finishedIteratingReflected();
- }
- return notification;
-}
-
-protected void finishedIteratingReflected() {
- isBusyIteratingReflected = false;
- if (unregisterQueue != null && !unregisterQueue.isEmpty()) {
- for (int i = 0; i < unregisterQueue.size(); i++) {
- reflected.remove(unregisterQueue.get(i));
- }
- unregisterQueue.clear();
- }
- if (registerQueue != null && !registerQueue.isEmpty()) {
- Iterator it = registerQueue.entrySet().iterator();
- Map.Entry entry;
- while (it.hasNext()) {
- entry = (Map.Entry) it.next();
- reflected.put(entry.getKey(), entry.getValue());
- }
- registerQueue.clear();
- }
-}
-public boolean isFactoryForType(Object type) {
- return TYPE_KEY.equals(type);
-}
-}
-
-
-
-
-
-
-
-
diff --git a/plugins/org.eclipse.jem/mofjava/org/eclipse/jem/internal/java/adapters/JavaReflectionAdaptor.java b/plugins/org.eclipse.jem/mofjava/org/eclipse/jem/internal/java/adapters/JavaReflectionAdaptor.java
deleted file mode 100644
index 1a1f7cd..0000000
--- a/plugins/org.eclipse.jem/mofjava/org/eclipse/jem/internal/java/adapters/JavaReflectionAdaptor.java
+++ /dev/null
@@ -1,274 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2001, 2006 IBM Corporation and others.
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
- *
- * Contributors:
- * IBM Corporation - initial API and implementation
- *******************************************************************************/
-package org.eclipse.jem.internal.java.adapters;
-/*
-
-
- */
-import java.util.List;
-
-import org.eclipse.emf.common.notify.Notification;
-import org.eclipse.emf.ecore.*;
-import org.eclipse.emf.ecore.impl.ENotificationImpl;
-
-import org.eclipse.jem.java.*;
-import org.eclipse.jem.util.logger.proxy.Logger;
-
-/**
- *
- */
-public abstract class JavaReflectionAdaptor extends ReflectionAdaptor {
- private static final String C_METHOD_DEFAULT_CTOR = String.valueOf(C_METHOD_PARM_DELIMITER) + S_CONSTRUCTOR_TOKEN;
- protected static final String LEFT_BRACKET = "[";//$NON-NLS-1$
-
- /**
- * Special notification event type. This is sent against a JavaClass (as the target) whenever flush of the reflection occurs. It will be
- * sent under the notification event type of REFLECTION_EVENT.
- * @since 1.1.0
- */
- public static final EAttribute FLUSH_REFLECTION_EVENT = EcorePackage.eINSTANCE.getEcoreFactory().createEAttribute();
-
- /**
- * Special notification event type. This is sent against a JavaClass (as the target) whenever flush of a new class (i.e.
- * no source was found) of the reflection occurs. It will be
- * sent under the notification event type of REFLECTION_EVENT.
- * @since 1.1.0
- */
- public static final EAttribute FLUSH_NEW_REFLECTION_EVENT = EcorePackage.eINSTANCE.getEcoreFactory().createEAttribute();
-
- /*
- * Fill in the name. Not really needed but it would be nice.
- */
- static {
- FLUSH_REFLECTION_EVENT.setName("flushReflectedValues"); //$NON-NLS-1$
- FLUSH_NEW_REFLECTION_EVENT.setName("flushNewReflectedValues"); //$NON-NLS-1$
- }
- protected boolean hasFlushed = false;
- protected boolean isFlushing = false;
-/**
- * JavaReflectionAdapter constructor comment.
- */
-public JavaReflectionAdaptor() {
- super();
-}
-/**
- * JavaReflectionAdapter constructor comment.
- * @param target org.eclipse.emf.common.notify.Notifier
- */
-public JavaReflectionAdaptor(org.eclipse.emf.common.notify.Notifier target) {
- super(target);
-}
-/**
- * createBlock - instantiate a Block containing the passed source
- */
-public Block createBlock(String name, String sourceString) {
- Block newBlock = getJavaFactory().createBlock();
- newBlock.setName(name + "_" + "block");//$NON-NLS-2$//$NON-NLS-1$
- newBlock.setSource(sourceString);
- return newBlock;
-}
-/**
- * setSuper - set our supertype here, implemented interface are handled separately
- */
-public JavaClass createJavaClassRef(String targetName) {
- return JavaRefFactory.eINSTANCE.createClassRef(targetName);
-}
-/**
- * createJavaParameter - instantiate a Java Parameter based on the passed name and type name (a simple name, NOT A SIGNATURE!!!)
- * The id for a parameter has to be complex in order to be parsable into class, method, and parm.
- * It is created by appending the parm name to the method id, with a known separator.
- * It will look something like "Foo.doSomething(java.lang.Integer-arg0"
- */
-public JavaParameter createJavaParameter(Method parentMethod, String parmName, String parmTypeName) {
- JavaParameter newParm = getJavaFactory().createJavaParameter();
- if (parmName!=null)
- newParm.setName(parmName);
-// ((InternalEObject)newParm).eSetID(parentMethod.eID() + C_METHODID_PARMID_DELIMITER + parmName);
- String classRefString = parmTypeName;
- newParm.setEType(createJavaClassRef(classRefString));
- return newParm;
-}
-/**
- * This method will return a List of dimensions for a typeName.
- * For example "foo[][]" would return a List of Integers
- * 1, 1. At some point we may want to actually capture the size
- * for Fields but we would need the initializer source to determine that.
- */
-public List getArrayDimensions(String typeName) {
- List dimensions = new java.util.ArrayList();
- if (typeName != null) {
- int begin = 0;
- int index = -1;
- while (begin < typeName.length()) {
- index = typeName.indexOf(LEFT_BRACKET, begin);
- if (index > -1) {
- dimensions.add(new Integer(1));
- begin = index + 1;
- } else {
- begin = typeName.length();
- }
- }
- }
- return dimensions;
-}
-/* Get the Java Factory
- */
-protected static JavaRefFactory getJavaFactory() {
- return ((org.eclipse.jem.java.JavaRefPackage)EPackage.Registry.INSTANCE.getEPackage(org.eclipse.jem.java.JavaRefPackage.eNS_URI)).getJavaRefFactory();
-}
-public abstract Object getReflectionSource();
-/**
- * getTypeNamesFromMethodUUID - Pull the parm type names out of a method ID
- * It will be in the form: "simpleclass.methodName(com.fronk.Parm1_type,parm2type"
- */
-protected static String[] getTypeNamesFromMethodID(String methodID) {
- if (methodID.charAt(methodID.length()-1) == C_METHOD_PARM_DELIMITER || methodID.endsWith(C_METHOD_DEFAULT_CTOR))
- return emptyStringArray;
-
- // Count the parms first. The number of parms is the number of occurrences of ',' + 1
- int numParms = 1;
- int pos = -1;
- // Skip the '.' after classname
- pos = methodID.indexOf(C_CLASS_MEMBER_DELIMITER, ++pos);
- // Look for the start of the parms
- int parmPos = methodID.indexOf(C_METHOD_PARM_DELIMITER, ++pos);
- pos = parmPos;
- while ((pos = methodID.indexOf(C_PARM_PARM_DELIMITER, ++pos)) != -1)
- numParms++;
- String[] parmTypeNames = new String[numParms];
- // now collect the parm names
- // skip the method name
- pos = parmPos;
- int i = 0, end;
- do {
- end = methodID.indexOf(C_PARM_PARM_DELIMITER, pos + 1);
- // This is the last parameter, we may need to strip a trailing &V for a constructor
- if (end == -1)
- end = methodID.indexOf(S_CONSTRUCTOR_TOKEN, pos + 1);
- // otherwise take the rest of the ID
- if (end == -1)
- end = methodID.length();
- parmTypeNames[i++] = methodID.substring(pos + 1, end);
- } while ((pos = methodID.indexOf(C_PARM_PARM_DELIMITER, ++pos)) != -1);
- return parmTypeNames;
-}
-public abstract boolean hasCachedReflectionSource();
-
-public boolean hasReflectionSource() {
- return getReflectionSource() != null;
-}
-
-/**
- * Subclasses should override.
- *
- */
-public void releaseSourceType(){
-}
-
-/**
- * Subclasses should override.
- * @return
- */
-public Notification releaseSourceTypeNoNotification() {
- return null;
-}
-
-public static void releaseSourceType(JavaClass javaClass) {
- if (javaClass == null)
- return;
-
- JavaReflectionAdaptor existing = (JavaReflectionAdaptor) retrieveAdaptorFrom(javaClass);
- if (existing != null)
- existing.releaseSourceType();
-}
-/*
- * This method is called by a Field Adaptor to set the type of aField
- * to be aTypeName. aTypeName may contain array brackets which need
- * to be detected in order to set the array dimensions on aField.
- */
-protected void setFieldType(Field aField, String aTypeName) {
- if (aField != null && aTypeName != null) {
- String classRefString = aTypeName;
- aField.setEType(createJavaClassRef(classRefString));
- }
-}
-public final boolean flushReflectedValuesIfNecessary() {
- return flushReflectedValuesIfNecessary(false);
-}
-public final boolean flushReflectedValuesIfNecessary(boolean clearCachedModelObject) {
- Notification not = flushReflectedValuesIfNecessaryNoNotification(clearCachedModelObject);
- if (not != null)
- getTarget().eNotify(not);
- return hasFlushed;
-}
-
-public synchronized Notification flushReflectedValuesIfNecessaryNoNotification(boolean clearCachedModelObject) {
- if (!hasFlushed && !isFlushing) {
- boolean isExisting = hasCachedReflectionSource();
- try {
- isFlushing = true;
- hasReflected = false;
- hasFlushed = flushReflectedValues(clearCachedModelObject);
- } catch (Throwable e) {
- hasFlushed = false;
- Logger.getLogger().log(e);
- if (e instanceof RuntimeException)
- throw (RuntimeException) e;
- else if (e instanceof Error)
- throw (Error) e;
- else
- throw new RuntimeException(e.getMessage());
- } finally {
- isFlushing = false;
- postFlushReflectedValuesIfNecessary(isExisting);
- }
- return createFlushNotification(isExisting);
- }
- return null;
-}
-
-/**
- * @param isExisting
- * @return
- */
-protected Notification createFlushNotification(boolean isExisting) {
- EStructuralFeature feature = isExisting ? FLUSH_REFLECTION_EVENT : FLUSH_NEW_REFLECTION_EVENT;
- return new ENotificationImpl((InternalEObject)getTarget(),EVENT, feature, null, null);
-}
-protected void postFlushReflectedValuesIfNecessary(boolean isExisting) {
-}
-/**
- * Subclasses should override to perform the actual clearing of the values.
- */
-protected boolean flushReflectedValues(boolean clearCachedModelObject) {
- return true;
-}
-/**
- * Return a boolean indicating whether reflection had occurred.
- */
-public boolean reflectValuesIfNecessary() {
- if (isFlushing)
- return false;
- return super.reflectValuesIfNecessary();
-}
-
-/**
- * reflectValues - template method, subclasses override to pump values into target
- */
-public boolean reflectValues() {
- hasFlushed = false;
- return true;
-}
-}
-
-
-
-
diff --git a/plugins/org.eclipse.jem/mofjava/org/eclipse/jem/internal/java/adapters/JavaReflectionKey.java b/plugins/org.eclipse.jem/mofjava/org/eclipse/jem/internal/java/adapters/JavaReflectionKey.java
deleted file mode 100644
index 25c482e..0000000
--- a/plugins/org.eclipse.jem/mofjava/org/eclipse/jem/internal/java/adapters/JavaReflectionKey.java
+++ /dev/null
@@ -1,398 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2001, 2006 IBM Corporation and others.
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
- *
- * Contributors:
- * IBM Corporation - initial API and implementation
- *******************************************************************************/
-package org.eclipse.jem.internal.java.adapters;
-/*
-
-
- */
-import java.util.*;
-
-import org.eclipse.emf.ecore.*;
-import org.eclipse.emf.ecore.util.EcoreUtil;
-
-import org.eclipse.jem.java.*;
-import org.eclipse.jem.java.adapters.IJavaReflectionKey;
-import org.eclipse.jem.java.adapters.IJavaReflectionKeyExtension;
-import org.eclipse.jem.util.CharacterUtil;
-import org.eclipse.jem.util.CharacterUtil.StringIterator;
-
-/**
- * This key handles Java Reflection. It creates the appropriate type of entries if
- * they are not already in the resource. There is an extension mechanism for other
- * types of ids that are not recognized by this key. They are registered with the
- * JavaXMIFactory that is used to create these keys, and the factory will pass in
- * a List of these registered extension processers (IJavaReflectionKeyExtension).
- *
- * Creation date: (10/4/2000 8:24:36 AM)
- * @author: Administrator
- */
-public class JavaReflectionKey implements IJavaReflectionKey {
- private static final Collection PRIMITIVES = new ArrayList(8);
-
- static { initializePrimitivesCollection(); }
-
- protected JavaXMIFactoryImpl.JavaXMIResource resource; //FB
- protected List extensions;
-
-public JavaReflectionKey(List extensions, JavaXMIFactoryImpl.JavaXMIResource resource) {
- this.extensions = extensions;
- this.resource = resource;
-}
-//FB END
-
-/*
- * Create an ArrayType instance in the current document
- * Handles the push and pop of the current document.
- */
-/* (non-Javadoc)
- * @see org.eclipse.jem.internal.java.adapters.IJavaReflectionKey#createArrayType()
- */
-public ArrayType createArrayType() {
- return getJavaFactory().createArrayType();
-}
-/*
- * Create a JavaClass instance in the current document
- * Handles the push and pop of the current document.
- */
-/* (non-Javadoc)
- * @see org.eclipse.jem.internal.java.adapters.IJavaReflectionKey#createJavaClass()
- */
-public JavaClass createJavaClass() {
- return getJavaFactory().createJavaClass();
-}
-/**
- * Create a data type and put it in the primitives resource
- */
-protected EClassifier getJavaDataType(String typeName) {
- JavaDataType result = getJavaFactory().createJavaDataType();
- result.setName(typeName);
- // ((InternalEObject)result).eSetID(typeName);
- //result.eSetUUID((UUID) null);
- //result.setEPackage(getPackage());
- getPackage().getEClassifiers().add(result);
- resource.setID(result, typeName);
- return result;
-}
-/*
- * Create a Field instance in the current document
- * Handles the push and pop of the current document.
- */
-/* (non-Javadoc)
- * @see org.eclipse.jem.internal.java.adapters.IJavaReflectionKey#createJavaField()
- */
-public Field createJavaField() {
- return getJavaFactory().createField();
-}
-/*
- * Create a Method instance in the current document
- * Handles the push and pop of the current document.
- */
-/* (non-Javadoc)
- * @see org.eclipse.jem.internal.java.adapters.IJavaReflectionKey#createJavaMethod()
- */
-public Method createJavaMethod() {
- return getJavaFactory().createMethod();
-}
-/*
- * Create a JavaParameter instance in the current document
- */
-/* (non-Javadoc)
- * @see org.eclipse.jem.internal.java.adapters.IJavaReflectionKey#createJavaParameter()
- */
-public JavaParameter createJavaParameter() {
- return getJavaFactory().createJavaParameter();
-}
-//FB/**
-//FB * Override to try to introspect objects
-//FB * that aren't found using the default mechanism.
-//FB */
-//FBpublic Object get(Object key) {
-//FB Object javaObject = super.get(key);
-//FB if (javaObject == null) {
-//FB javaObject = getObjectFromExtensions((String) key);
-//FB if (javaObject == null)
-//FB javaObject = getJavaObject((String) key);
-//FB }
-//FB return javaObject;
-//FB}
-
-//FB ADDED
-/* (non-Javadoc)
- * @see org.eclipse.jem.internal.java.adapters.IJavaReflectionKey#get(java.lang.String)
- */
-public Object get(String key) {
- Object javaObject = getObjectFromExtensions(key);
- if (javaObject == null)
- javaObject = getJavaObject(key);
- return javaObject;
-}
-//FB END
-
-/*
- * Instantiate the named class.
- * If we make it to this point, the class has not yet been instantiated or reflected.
- */
-/* (non-Javadoc)
- * @see org.eclipse.jem.internal.java.adapters.IJavaReflectionKey#getArrayType(java.lang.String)
- */
-public EClassifier getArrayType(String typeName) {
- ArrayType arrayType = this.createArrayType();
- arrayType.setName(typeName);
- // ((InternalEObject)arrayType).eSetID(typeName);
- //arrayType.eSetUUID((UUID) null);
- int pos = -1, braces = 0;
- do {
- pos = typeName.indexOf("[", pos+1);//$NON-NLS-1$
- if (pos != -1)
- braces++;
- } while (pos != -1);
- arrayType.setArrayDimensions(braces);
- //arrayType.setEPackage(getPackage());
- getPackage().getEClassifiers().add(arrayType);
- resource.setID(arrayType, typeName);
- return arrayType;
-}
-/*
- * Instantiate the named class.
- * If we make it to this point, teh class has not yet been instantiated or reflected.
- */
-/* (non-Javadoc)
- * @see org.eclipse.jem.internal.java.adapters.IJavaReflectionKey#getJavaClass(java.lang.String)
- */
-public EClassifier getJavaClass(String typeName) {
- JavaClass javaClass = this.createJavaClass();
- javaClass.setName(typeName);
- // ((InternalEObject)javaClass).eSetID(javaClass.getName());
- //javaClass.eSetUUID((UUID) null);
- // javaClass.setEPackage(getPackage());
- getPackage().getEClassifiers().add(javaClass);
- resource.setID(javaClass, typeName);
- return javaClass;
-}
-/* Get the Java Factory
- */
-protected static JavaRefFactory getJavaFactory() {
- return JavaRefFactory.eINSTANCE;
-}
-/**
- * This allows for the direct retrieval of fields with the following notation:
- * field: java:/com.ibm.foo#Test.foo
- *
- */
-protected Field getJavaField(String keyValue) {
- Field result = null;
- String className, memberName;
- int memberDelimiter = keyValue.indexOf(ReflectionAdaptor.C_CLASS_MEMBER_DELIMITER);
- className = keyValue.substring(0, memberDelimiter);
- memberName = keyValue.substring(memberDelimiter + 1);
- EClassifier javaClass = (EClassifier) primGet(className);
- // if we haven't already instantiated the containing class, then go do it.
- if (javaClass == null)
- javaClass = getJavaType(className);
- if ((javaClass != null) && !((JavaHelpers) javaClass).isPrimitive()) {
- // We have a class. Now we need to force reflection, this will cause
- // the JavaReflectionKey to be updated and have the member added to the
- // list.
- ((JavaClass) javaClass).getFields();
- //FB result = (Field) super.get(keyValue); // It should now be registered.
- result = (Field) primGet(keyValue); // It should now be registered.
-
- if (result == null) {
- Field tempField = createJavaField();
- tempField.setName(memberName);
- // ((InternalEObject)tempField).eSetID(keyValue);
- //tempField.eSetUUID((UUID) null);
- ((JavaClass) javaClass).getFields().add(tempField);
- result = tempField;
- }
- }
- return result;
-}
-/**
- * This allows for the retrieval of methods with the following notation:
- * method: java:/com.ibm.foo#Test.foofoo(
- *
- */
-protected Method getJavaMethod(String keyValue) {
- Method result = null;
- String className, memberName;
- int memberDelimiter = keyValue.indexOf(ReflectionAdaptor.C_CLASS_MEMBER_DELIMITER);
- className = keyValue.substring(0, memberDelimiter);
- int parmDelimiter = keyValue.indexOf(ReflectionAdaptor.C_METHOD_PARM_DELIMITER, memberDelimiter);
- memberName = keyValue.substring(memberDelimiter + 1, parmDelimiter);
- EClassifier javaClass = (EClassifier) primGet(className);
- // if we haven't already instantiated the containing class, then go do it.
- if (javaClass == null)
- javaClass = getJavaType(className);
- if ((javaClass != null) && !((JavaHelpers) javaClass).isPrimitive()) {
- // We have a class. Now we need to force reflection, this will cause
- // the JavaReflectionKey to be updated and have the member added to the
- // list.
- ((JavaClass) javaClass).getMethods();
- result = (Method) primGet(keyValue); // It should now be registered.
-
- if (result == null) {
- Method tempMethod = createJavaMethod();
- tempMethod.setName(memberName);
- resource.setID(tempMethod, keyValue);
- ((JavaClass) javaClass).getMethods().add(tempMethod);
- result = tempMethod;
- }
- }
- return result;
-}
-/* (non-Javadoc)
- * @see org.eclipse.jem.internal.java.adapters.IJavaReflectionKey#getJavaObject(java.lang.String)
- */
-public EObject getJavaObject(String keyValue) {
- EObject result = null;
- int index = keyValue.indexOf(ReflectionAdaptor.C_CLASS_MEMBER_DELIMITER);
- if (index > 0) {
- // The reference is to a member: field, method, or parameter.
- // Take the most specific case first, a parameter.
- // Only a parameter should contain the methodID to parmID delimiter.
- boolean isParameter = (keyValue.indexOf(ReflectionAdaptor.C_METHODID_PARMID_DELIMITER, index) != -1);
- if (isParameter) {
- result = getJavaParameter(keyValue);
- } else {
- // The target is a field or method. If it has a "(", then it is a method.
- // If it is not found, then we will create a temporary object.
- int parmStart = keyValue.indexOf(ReflectionAdaptor.C_METHOD_PARM_DELIMITER, index);
- boolean isField = parmStart == -1;
- if (isField) {
- result = getJavaField(keyValue);
- } else {
- result = getJavaMethod(keyValue);
- }
- }
- } else {
- result = getJavaType(keyValue);
- }
- return result;
-}
-
-/**
- * See if the extensions can resolve this first.
- */
-protected Object getObjectFromExtensions(String keyValue) {
- if (extensions != null) {
- for (Iterator iter = extensions.iterator(); iter.hasNext();) {
- IJavaReflectionKeyExtension extension = (IJavaReflectionKeyExtension) iter.next();
- Object obj = extension.getObject(keyValue, this);
- if (obj != null)
- return obj;
- }
- }
-
- return null;
-}
-/**
- * This allows for the retrieval of parameters with the following notation:
- * parameter: java:/com.ibm.foo#Test.foofoo(-arg0
- *
- */
-protected JavaParameter getJavaParameter(String keyValue) {
- JavaParameter result = null;
- String parmName;
- int memberDelimiter = keyValue.indexOf(ReflectionAdaptor.C_CLASS_MEMBER_DELIMITER);
- int parmDelimiter = keyValue.indexOf(ReflectionAdaptor.C_METHODID_PARMID_DELIMITER, memberDelimiter);
- parmName = keyValue.substring(parmDelimiter + 1);
- // getMethod() will find or create a method
- Method method = this.getJavaMethod(keyValue.substring(parmDelimiter));
- if (method != null) {
- result = method.getParameter(parmName);
- if (result == null) {
- JavaParameter tempParameter = createJavaParameter();
- tempParameter.setName(parmName);
- // ((InternalEObject)tempParameter).eSetID(keyValue);
- // tempParameter.eSetUUID((UUID) null);
- method.getParameters().add(tempParameter);
- result = tempParameter;
- }
- }
- return result;
-}
-/* (non-Javadoc)
- * @see org.eclipse.jem.internal.java.adapters.IJavaReflectionKey#getJavaType(java.lang.String)
- */
-public EClassifier getJavaType(String typeName) {
- if (isPrimitive(typeName))
- return getJavaDataType(typeName);
- else if (isArray(typeName))
- return getArrayType(typeName);
- else if (isValidJavaIdentifier(typeName))
- return getJavaClass(typeName);
- return null;
-}
-
-protected boolean isValidJavaIdentifier(String typeName) {
- if (typeName.length() > 0) {
- StringIterator charIter = new StringIterator(typeName);
- if (CharacterUtil.isJavaIdentifierStart(charIter.next())) {
- // Starts with a valid java identifier character.
- // Now see if the rest are valid.
- while (charIter.hasNext()) {
- if (!CharacterUtil.isJavaIdentifierPart(charIter.next()))
- return false; // Not valid
- }
- return true;
- }
- }
- return false;
-}
-
-/* (non-Javadoc)
- * @see org.eclipse.jem.internal.java.adapters.IJavaReflectionKey#primGet(java.lang.String)
- */
-public Object primGet(String key) {
- return resource.primGetEObject(key);
-}
-protected EPackage getPackage() {
- //FB return (EPackage) super.get(JavaPackage.PACKAGE_ID);
- // return (EPackage) resource.getEObject(JavaPackage.PACKAGE_ID); //FB
- //return (EPackage) resource.getEObject(JavaPackage.PACKAGE_ID); //FB
- return (EPackage)EcoreUtil.getObjectByType(resource.getContents(), EcorePackage.eINSTANCE.getEPackage());
-}
-/**
- * Insert the method's description here.
- * Creation date: (10/4/2000 9:56:53 AM)
- */
-private static void initializePrimitivesCollection() {
- PRIMITIVES.add(N_VOID);
- PRIMITIVES.add(N_BOOLEAN);
- PRIMITIVES.add(N_BYTE);
- PRIMITIVES.add(N_CHAR);
- PRIMITIVES.add(N_DOUBLE);
- PRIMITIVES.add(N_FLOAT);
- PRIMITIVES.add(N_INT);
- PRIMITIVES.add(N_LONG);
- PRIMITIVES.add(N_SHORT);
-}
-/* (non-Javadoc)
- * @see org.eclipse.jem.internal.java.adapters.IJavaReflectionKey#isArray(java.lang.String)
- */
-public boolean isArray(String typeName) {
- return typeName.endsWith("[]");//$NON-NLS-1$
-}
-/**
- * Insert the method's description here.
- * Creation date: (10/4/2000 9:54:23 AM)
- * @return boolean
- * @param typeName java.lang.String
- */
-private boolean isPrimitive(String typeName) {
- return PRIMITIVES.contains(typeName);
-}
-}
-
-
-
-
diff --git a/plugins/org.eclipse.jem/mofjava/org/eclipse/jem/internal/java/adapters/JavaXMIFactoryImpl.java b/plugins/org.eclipse.jem/mofjava/org/eclipse/jem/internal/java/adapters/JavaXMIFactoryImpl.java
deleted file mode 100644
index b06e9a7..0000000
--- a/plugins/org.eclipse.jem/mofjava/org/eclipse/jem/internal/java/adapters/JavaXMIFactoryImpl.java
+++ /dev/null
@@ -1,155 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2001, 2005 IBM Corporation and others.
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
- *
- * Contributors:
- * IBM Corporation - initial API and implementation
- *******************************************************************************/
-package org.eclipse.jem.internal.java.adapters;
-/*
-
-
- */
-import java.io.IOException;
-import java.util.*;
-
-import org.eclipse.emf.common.util.URI;
-import org.eclipse.emf.ecore.EObject;
-import org.eclipse.emf.ecore.resource.Resource;
-import org.eclipse.emf.ecore.xmi.XMIResource;
-import org.eclipse.emf.ecore.xmi.impl.XMIResourceFactoryImpl;
-import org.eclipse.emf.ecore.xmi.impl.XMIResourceImpl;
-import org.eclipse.jem.java.JavaPackage;
-import org.eclipse.jem.java.JavaRefFactory;
-import org.eclipse.jem.java.adapters.*;
-import org.eclipse.jem.java.internal.impl.JavaFactoryImpl;
-
-/**
- * Factory to create the Resource for the Java protocol.
- *
- * It allows extensions to the reflection key to be registered with it.
- *
- * Creation date: (10/4/2000 8:22:23 AM)
- * @author: Administrator
- */
-public class JavaXMIFactoryImpl extends XMIResourceFactoryImpl implements JavaXMIFactory {
- private static final String SCHEMA_SEPERATOR = ":/"; //$NON-NLS-1$
- protected List extensions = new ArrayList();
-
- /**
- * JavaXMIFactoryImpl constructor comment.
- */
- public JavaXMIFactoryImpl() {
- super();
- }
-
-
- public void registerReflectionKeyExtension(IJavaReflectionKeyExtension extension) {
- extensions.add(extension);
- }
-
-
- public void deregisterReflectionKeyExtension(IJavaReflectionKeyExtension extension) {
- extensions.remove(extension);
- }
-
- protected void createJavaPackage(String packageName, String xmiuri, Resource resource) {
- // changed to allow a zero-length package name
- // for the special case of "java:/#int", etc.
- JavaRefFactory jfac = JavaRefFactory.eINSTANCE;
- JavaPackage pack = jfac.createJavaPackage();
- // Need to create and add special JavaFactory for instantiation to work.
- JavaFactoryImpl fact = new JavaFactoryImpl();
- pack.setEFactoryInstance(fact);
- if (packageName.length() > 0) {
- // Standard Java package
- pack.setNsPrefix(packageName);
- pack.setName(packageName);
- } else {
- // Primitive package
- pack.setNsPrefix(JavaPackage.PRIMITIVE_PACKAGE_NAME);
- pack.setName(JavaPackage.PRIMITIVE_PACKAGE_NAME);
- }
-
- pack.setNsURI(xmiuri);
- resource.getContents().add(pack);
- ((XMIResource) pack.eResource()).setID(pack, JavaPackage.PACKAGE_ID);
- }
- public static class JavaXMIResource extends XMIResourceImpl {
- protected IJavaReflectionKey reflectionKey;
-
- public JavaXMIResource(URI uri) {
- super(uri);
- }
-
- public void setReflectionKey(IJavaReflectionKey key) {
- reflectionKey = key;
- }
-
- public void load(Map options) throws IOException {
- try {
- super.load(options);
- } catch (Exception exception) {
- }
- }
-
- public EObject getEObject(String uriFragment) {
- EObject result = super.getEObject(uriFragment);
- if (result == null && reflectionKey != null) {
- result = (EObject) reflectionKey.get(uriFragment);
- }
- return result;
- }
-
- /**
- * Used by JavaReflectionKey to look directly into ID table to bypass an infinite loop. It will
- * call here because it may not of first been found, but then added, so now is found.
- *
- * @param uriFragment
- * @return
- *
- * @since 1.1.0
- */
- EObject primGetEObject(String uriFragment) {
- return super.getEObject(uriFragment);
- }
-
- /* (non-Javadoc)
- * @see org.eclipse.emf.ecore.xmi.impl.XMLResourceImpl#useIDAttributes()
- */
- protected boolean useIDAttributes() {
- return false;
- }
-
- }
-
- public Resource createResource(URI uri) {
- JavaXMIResource resource = new JavaXMIResource(uri);
- resource.setReflectionKey(new JavaReflectionKey(extensions, resource));
-
- String uriString = uri.toString();
- createJavaPackage(stripScheme(uriString), uriString, resource);
-
- return resource;
- }
-
- public static void register() {
- Resource.Factory.Registry.INSTANCE.getProtocolToFactoryMap().put(JavaXMIFactory.SCHEME, JavaXMIFactory.INSTANCE);
- }
-
- /**
- * Strip the trailing identifier, if any, from the uri. An identifier
- * begins with # or |.
- */
- private String stripScheme(String uri) {
- int index = uri.indexOf(SCHEMA_SEPERATOR);
- if (index != -1)
- return uri.substring(index + SCHEMA_SEPERATOR.length(), uri.length());
- else
- return uri;
- }
-
-}
diff --git a/plugins/org.eclipse.jem/mofjava/org/eclipse/jem/internal/java/adapters/ReadAdaptor.java b/plugins/org.eclipse.jem/mofjava/org/eclipse/jem/internal/java/adapters/ReadAdaptor.java
deleted file mode 100644
index d73dafc..0000000
--- a/plugins/org.eclipse.jem/mofjava/org/eclipse/jem/internal/java/adapters/ReadAdaptor.java
+++ /dev/null
@@ -1,32 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2001, 2005 IBM Corporation and others.
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
- *
- * Contributors:
- * IBM Corporation - initial API and implementation
- *******************************************************************************/
-package org.eclipse.jem.internal.java.adapters;
-/*
-
-
- */
-
-import org.eclipse.emf.ecore.EObject;
-/**
- * Extended Adaptor interface which adds support for an adapter
- * providing default values for attributes.
- * Creation date: (6/6/2000 4:41:19 PM)
- * @author: Scott Rich
- */
-public interface ReadAdaptor extends org.eclipse.emf.common.notify.Adapter {
- public static final String TYPE_KEY = "JavaReflection"; //$NON-NLS-1$
- public Object getValueIn(EObject object, EObject attribute);
- public boolean reflectValuesIfNecessary(); //FB
-}
-
-
-
-
diff --git a/plugins/org.eclipse.jem/mofjava/org/eclipse/jem/internal/java/adapters/ReflectionAdaptor.java b/plugins/org.eclipse.jem/mofjava/org/eclipse/jem/internal/java/adapters/ReflectionAdaptor.java
deleted file mode 100644
index 6c89ca3..0000000
--- a/plugins/org.eclipse.jem/mofjava/org/eclipse/jem/internal/java/adapters/ReflectionAdaptor.java
+++ /dev/null
@@ -1,170 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2001, 2006 IBM Corporation and others.
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
- *
- * Contributors:
- * IBM Corporation - initial API and implementation
- *******************************************************************************/
-package org.eclipse.jem.internal.java.adapters;
-/*
-
-
- */
-import java.util.logging.Level;
-
-import org.eclipse.emf.common.notify.Notification;
-import org.eclipse.emf.common.notify.Notifier;
-import org.eclipse.emf.ecore.*;
-import org.eclipse.emf.ecore.impl.ENotificationImpl;
-import org.eclipse.emf.ecore.resource.Resource;
-import org.eclipse.emf.ecore.util.EcoreUtil;
-
-import org.eclipse.jem.internal.core.JEMPlugin;
-import org.eclipse.jem.internal.java.adapters.nls.ResourceHandler;
-import org.eclipse.jem.util.logger.proxy.Logger;
-/**
- * ReflectionAdaptor - a read adaptor base implementation which does a bulk
- * load of relflected values on the first request.
- * Subclasses can optimize to defer some properties.
- * Properties may also be deferred by setting their values with proxy references,
- * for example, for supertype and other referenced types.
- * Creation date: (6/6/2000 4:42:50 PM)
- * @author: Administrator
- */
-public abstract class ReflectionAdaptor extends org.eclipse.emf.common.notify.impl.AdapterImpl implements ReadAdaptor {
- public static final char C_CLASS_MEMBER_DELIMITER = '.';
- public static final char C_METHOD_PARM_DELIMITER = '(';
- public static final char C_METHODID_PARMID_DELIMITER = '-';
- public static final char C_PARM_PARM_DELIMITER = ',';
- public static final char PATH_DELIMITER = '/';
- // SW id contains & in xml file casues exception throw during load
- // public static final String S_CONSTRUCTOR_TOKEN = "&V";//$NON-NLS-1$
- public static final String S_CONSTRUCTOR_TOKEN = "_V";//$NON-NLS-1$ // SW
- // cache a static empty String[] for no parm methods
- protected static String[] emptyStringArray = new String[0];
-
-
- /**
- * Notification event type for special Reflection notifications. This will be the event type for the special ones, like REFLECTION_EVENT.
- * The listener should listen for this event type, and then check the feature for the type of special event (like REFLECTION_EVENT).
- * @since 1.1.0
- */
- public static final int EVENT = -3456; // Using a funny number to try to eliminate confliction with any other specials that may of occur from other code on the JavaClass.
-
- /**
- * Special notification event type. This is sent against a JavaClass (as the target) whenever reflection occurs. It will be
- * sent under the notification event type of REFLECTION_EVENT.
- * @since 1.1.0
- */
- public static final EAttribute REFLECTION_EVENT = EcoreFactory.eINSTANCE.createEAttribute();
-
- /*
- * Fill in the name. Not really needed but it would be nice.
- */
- static {REFLECTION_EVENT.setName("reflectValues");} //$NON-NLS-1$
-
- protected boolean hasReflected = false;
- protected boolean isReflecting = false;
-public ReflectionAdaptor() {
- super();
-}
-public ReflectionAdaptor(Notifier target) {
- super();
- setTarget(target);
-}
-/**
- * Helper method to ensure full initialization of the target. Required
- * for serialization.
- */
-public static void forceDeferredReadFor(EObject target) {
- ReflectionAdaptor adaptor = retrieveAdaptorFrom(target);
- if (adaptor != null) {
- adaptor.reflectValuesIfNecessary();
- }
-}
-protected Resource getTargetResource() {
- if (getTarget() != null)
- return ((org.eclipse.emf.ecore.EObject) getTarget()).eResource();
- return null;
-}
-/**
- * Helper method to fetch the adaptor from the object, and if it exists, get the adapted
- * value for the attribute. Overloaded for many-sided attributes where the return value would
- * otherwise be an enumeration; in this case will return an Array instead.
- */
-public static Object getValue(EObject object, EReference attribute) {
-//FB ReflectionAdaptor adaptor = retrieveAdaptorFrom(object);
-//FB if (adaptor != null)
-//FB return adaptor.getValueIn(object, attribute);
-//FB return ((IReadAdaptable) object).primRefValue(attribute);
- return object.eGet(attribute); //FB
-
-}
-/*Helper method to fetch the adaptor from the object, and if it exists, get the adapted
- *value for the attribute.
- */
-public static Object getValue(EObject object, EObject attribute) {
-//FB ReflectionAdaptor adaptor = retrieveAdaptorFrom(object);
-//FB if (adaptor != null)
-//FB return adaptor.getValueIn(object, attribute);
-//FB return ((IReadAdaptable) object).primRefValue(attribute);
- return object.eGet((EStructuralFeature)attribute); //FB
-}
-/**
- * getValueIn method comment.
- */
-public Object getValueIn(EObject object, EObject attribute) {
-//FB reflectValuesIfNecessary();
-//FB return ((IReadAdaptable) object).primRefValue(attribute);
- return object.eGet((EStructuralFeature)attribute); //FB
-}
-/**
- * isAdaptorForType method comment.
- */
-public boolean isAdapterForType(Object type) {
- return (type == ReadAdaptor.TYPE_KEY);
-}
-/**
- * reflectValues - template method, subclasses override to pump values into target
- */
-public abstract boolean reflectValues();
-/**
- * Return a boolean indicating whether reflection had occurred.
- */
-public synchronized boolean reflectValuesIfNecessary() {
- if (!hasReflected && !isReflecting) {
- try {
- isReflecting = true;
- EObject etarget = (EObject)getTarget();
- if (!etarget.eIsProxy() && etarget.eResource() != null && etarget.eResource().getResourceSet() != null)
- hasReflected = reflectValues();
- else
- hasReflected = false; // AS long we are a proxy or is not in a valid resource or set, we won't reflect.
- } catch (Exception e) {
- hasReflected = false;
- Logger logger = Logger.getLogger();
- if (logger.isLoggingLevel(Level.WARNING)) {
- logger.log(ResourceHandler.getString("Failed_reflecting_values_ERROR_"), Level.WARNING); //$NON-NLS-1$ = "Failed reflecting values!!!"
- logger.logWarning(e);
- JEMPlugin.logWarning(ResourceHandler.getString("Failed_reflecting_values_ERROR_"), e);
- }
- } finally {
- isReflecting = false;
- getTarget().eNotify(new ENotificationImpl((InternalEObject)getTarget(), EVENT, REFLECTION_EVENT, null, null, Notification.NO_INDEX));
- }
- }
- return hasReflected;
-}
-public static ReflectionAdaptor retrieveAdaptorFrom(EObject object) {
- synchronized (object) {
- return (ReflectionAdaptor)EcoreUtil.getRegisteredAdapter(object, ReadAdaptor.TYPE_KEY);
- }
-}
-}
-
-
-
-
diff --git a/plugins/org.eclipse.jem/mofjava/org/eclipse/jem/internal/java/adapters/jdk/JDKAdaptor.java b/plugins/org.eclipse.jem/mofjava/org/eclipse/jem/internal/java/adapters/jdk/JDKAdaptor.java
deleted file mode 100644
index cfc16e6..0000000
--- a/plugins/org.eclipse.jem/mofjava/org/eclipse/jem/internal/java/adapters/jdk/JDKAdaptor.java
+++ /dev/null
@@ -1,320 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2003, 2005 IBM Corporation and others.
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
- *
- * Contributors:
- * IBM Corporation - initial API and implementation
- *******************************************************************************/
-package org.eclipse.jem.internal.java.adapters.jdk;
-/*
-
-
- */
-
-import java.lang.reflect.Array;
-
-import org.eclipse.emf.common.notify.Notifier;
-import org.eclipse.emf.ecore.xmi.XMIResource;
-import org.eclipse.jem.java.*;
-import org.eclipse.jem.internal.java.adapters.JavaReflectionAdaptor;
-/**
- * Insert the type's description here.
- * Creation date: (6/6/2000 4:42:50 PM)
- * @author: Administrator
- */
-public abstract class JDKAdaptor extends JavaReflectionAdaptor {
- public JavaJDKAdapterFactory adapterFactory;
- public JDKAdaptor(Notifier target, JavaJDKAdapterFactory anAdapterFactory) {
- super(target);
- setAdapterFactory(anAdapterFactory);
- }
- /**
- * computeMethodID - generate the unique ID to be used to identify a constructor.
- * Similar to a Signature, but hopefully more readable.
- * The name format will be:
- * simpleClassName.simpleClassName(com.fronk.ParmType1_parmType2&V
- * Note: This implementation is tightly coupled with ReflectionAdapter.getTypeNamesFromMethodID().
- *
- * It has to be done separately for JDK because Constructors and Methods are different classes.
- * However, in the Java Model they are both just Methods with a flag indicating Constructor.
- */
- public static String computeMethodID(java.lang.reflect.Constructor jdkConstructor) {
- StringBuffer out = new StringBuffer();
- String className = getSimpleName(jdkConstructor.getDeclaringClass().getName());
- out.append(className);
- out.append(C_CLASS_MEMBER_DELIMITER);
- out.append(computeMethodName(jdkConstructor));
- out.append(C_METHOD_PARM_DELIMITER);
- Class[] parmTypes = jdkConstructor.getParameterTypes();
- for (int i = 0; i < parmTypes.length; i++) {
- out.append(parmTypes[i].getName());
- if (i < parmTypes.length - 1)
- out.append(C_PARM_PARM_DELIMITER);
- }
- out.append(S_CONSTRUCTOR_TOKEN); //It's a constructor
- return out.toString();
- }
- /**
- * computeMethodID - generate the unique ID to be used to identify a method.
- * Similar to a Signature, but hopefully more readable.
- * If there are no parms, it will end with a "(" so that it can be distictive from a field.
- * The name format will be:
- * simpleClassName.methodName(com.fronk.ParmType1_parmType2
- * Note: This implementation is tightly coupled with ReflectionAdapter.getTypeNamesFromMethodID().
- */
- public static String computeMethodID(java.lang.reflect.Method jdkMethod) {
- StringBuffer out = new StringBuffer();
- String className = getSimpleName(jdkMethod.getDeclaringClass().getName());
- out.append(className);
- out.append(C_CLASS_MEMBER_DELIMITER);
- out.append(computeMethodName(jdkMethod));
- out.append(C_METHOD_PARM_DELIMITER);
- Class[] parmTypes = jdkMethod.getParameterTypes();
- for (int i = 0; i < parmTypes.length; i++) {
- out.append(parmTypes[i].getName());
- if (i < parmTypes.length - 1)
- out.append(C_PARM_PARM_DELIMITER);
- }
- if (jdkMethod.getDeclaringClass().getName().equals(jdkMethod.getName()))
- out.append(S_CONSTRUCTOR_TOKEN); //It's a constructor
- return out.toString();
- }
- /**
- * computeMethodName - generate the name to be used to identify a constructor.
- * For the moment, names are simple, and UUID's are complex.
- *
- * It has to be done separately for JDK because Constructors and Methods are different classes.
- * However, in the Java Model they are both just Methods with a flag indicating Constructor.
- */
- public static String computeMethodName(java.lang.reflect.Constructor jdkConstructor) {
- return getSimpleName(jdkConstructor.getName()); // CTOR names come back fully-qualified with package.
- }
- /**
- * computeMethodName - generate the name to be used to identify a method.
- * For the moment, names are simple, and UUID's are complex.
- */
- public static String computeMethodName(java.lang.reflect.Method jdkMethod) {
- return jdkMethod.getName();
- }
- /**
- * createJavaField - instantiate a Java Field based on the passed Field
- * We are deferring field contents assuming that its adaptor will reflect its details.
- */
- public Field createJavaField(java.lang.reflect.Field reflectedField, XMIResource resource) {
- Field newField = getJavaFactory().createField();
- newField.setName(reflectedField.getName());
- String className = getSimpleName(reflectedField.getDeclaringClass().getName());
- resource.setID(newField, className + C_CLASS_MEMBER_DELIMITER + reflectedField.getName());
- return newField;
- }
- /**
- * createJavaMethod - instantiate a Java Method based on the passed Java Reflection Constructor
- * We are deferring method contents assuming that its adaptor will reflect its details.
- * We need to store enough info in the empty Method to find its Java source.
- * The ID will eventually hold enough info to identify the source, so we use it.
- */
- public Method createJavaMethod(java.lang.reflect.Constructor jdkConstructor, XMIResource resource) {
- Method newMethod = getJavaFactory().createMethod();
- // We use a simple name, but a complex ID
- newMethod.setName(computeMethodName(jdkConstructor));
- resource.setID(newMethod, computeMethodID(jdkConstructor));
- return newMethod;
- }
- /**
- * createJavaMethod - instantiate a Java Method based on the passed Java Reflection Method
- * We are deferring method contents assuming that its adaptor will reflect its details.
- * We need to store enough info in the empty Method to find its Java source.
- * The ID will eventually hold enough info to identify the source, so we use it.
- */
- public Method createJavaMethod(java.lang.reflect.Method jdkMethod, XMIResource resource) {
- Method newMethod = getJavaFactory().createMethod();
- // We use a simple name, but a complex ID
- newMethod.setName(computeMethodName(jdkMethod));
- resource.setID(newMethod, computeMethodID(jdkMethod));
- return newMethod;
- }
- /**
- * Insert the method's description here.
- * Creation date: (11/07/00 3:43:55 PM)
- * @return org.eclipse.jem.java.adapters.JavaJDKAdapterFactory
- */
- public JavaJDKAdapterFactory getAdapterFactory() {
- return adapterFactory;
- }
- public ClassLoader getAlternateClassLoader() {
- return getAdapterFactory().getContextClassLoader();
- }
- /*****************************************************************************
- * Method to convert the textual form of a primitive type into its Class object
- *
- * @param type The primitive type's textual representation
- */
- public static Class getPrimitiveType(String type) {
- Class c = null;
-
- if (type.equals(byte.class.getName())) {
- c = byte.class;
- } else if (type.equals(short.class.getName())) {
- c = short.class;
- } else if (type.equals(int.class.getName())) {
- c = int.class;
- } else if (type.equals(long.class.getName())) {
- c = long.class;
- } else if (type.equals(float.class.getName())) {
- c = float.class;
- } else if (type.equals(double.class.getName())) {
- c = double.class;
- } else if (type.equals(boolean.class.getName())) {
- c = boolean.class;
- } else if (type.equals(char.class.getName())) {
- c = char.class;
- } else if (type.equals(void.class.getName())) {
- c = void.class;
- }
-
- return c;
- }
- /**
- * Returns the last segment of a '.'-separated qualified name.
- * Returns the given name if it is not qualified.
- * For example:
- * <pre>
- * getSimpleName("java.lang.Object") -> "Object"
- * </pre>
- */
- public static String getSimpleName(String name) {
- int lastDot = name.lastIndexOf('.');
- if (lastDot == -1)
- return name;
- return name.substring(lastDot + 1);
- }
- public Class getType(JavaHelpers modelClass) {
- Class result = null;
- if (modelClass.isArray()) {
- ArrayType arrayType = (ArrayType) modelClass;
- Class componentClass = getType(arrayType.getFinalComponentType());
- result = (Array.newInstance(componentClass, new int[arrayType.getArrayDimensions()])).getClass();
- } else if (modelClass.isPrimitive()) {
- result = getType(modelClass.getQualifiedName());
- } else {
- result = getType(((JavaClass) modelClass).getQualifiedNameForReflection());
- }
- return result;
- }
- public Class getType(String qualifiedName) {
- // Try for a primitive type ("int","char",etc.) first
- Class primType = getPrimitiveType(qualifiedName);
- if (primType == null) {
- // Changed for defect #212147 botp@ausaix19.austin.ibm.com@7630 system.
- //
- // Search only one of the following classloaders (the first one that exists) in this order. If not found
- // in a classloader, it will not roll-over to another class loader. This is to avoid problems where a
- // class may exist in more than one classloader. You get errors when this happens due to one class that
- // was found in only one classloader that refers to another class that was found in both classloaders.
- // They don't match when trying to reflect later.
- // 1) Alternate classloader (if exists)
- // 2) Thread context classloader (if exists)
- // 3) System classloader (if exists)
- // 4) Class.forName().
- if (getAlternateClassLoader() != null) {
- try {
- return getAlternateClassLoader().loadClass(qualifiedName);
- } catch (ClassNotFoundException cnf2) {
- return null;
- }
- }
-
- ClassLoader contextClassLoader = Thread.currentThread().getContextClassLoader();
- if (contextClassLoader != null) {
- try {
- return contextClassLoader.loadClass(qualifiedName);
- } catch (ClassNotFoundException e) {
- return null;
- }
- }
-
- ClassLoader systemClassLoader = ClassLoader.getSystemClassLoader();
- if (systemClassLoader != null) {
- try {
- return systemClassLoader.loadClass(qualifiedName);
- } catch (ClassNotFoundException e) {
- return null;
- }
- }
-
- try {
- return Class.forName(qualifiedName);
- } catch (ClassNotFoundException e) {
- return null;
- }
- } else
- return primType;
- }
- /*
- * Utility routine to paper over array type names
- * Borrowed from a package-visibility helper on java.lang.reflect.Field
- */
- static String getTypeName(Class type) {
- if (type.isArray()) {
- try {
- Class cl = type;
- int dimensions = 0;
- while (cl.isArray()) {
- dimensions++;
- cl = cl.getComponentType();
- }
- StringBuffer sb = new StringBuffer();
- sb.append(cl.getName());
- for (int i = 0; i < dimensions; i++) {
- sb.append("[]"); //$NON-NLS-1$
- }
- return sb.toString();
- } catch (Exception e) { /*FALLTHRU*/
- }
- }
- return type.getName();
- }
-
- /*****************************************************************************
- * Method to convert the textual form of a primitive type into its Class object
- *
- * @param type The primitive type's textual representation
- */
- public static Class primitiveForName(String type) {
- Class c = null;
-
- if (type.equals(byte.class.getName())) {
- c = byte.class;
- } else if (type.equals(short.class.getName())) {
- c = short.class;
- } else if (type.equals(int.class.getName())) {
- c = int.class;
- } else if (type.equals(long.class.getName())) {
- c = long.class;
- } else if (type.equals(float.class.getName())) {
- c = float.class;
- } else if (type.equals(double.class.getName())) {
- c = double.class;
- } else if (type.equals(boolean.class.getName())) {
- c = boolean.class;
- } else if (type.equals(char.class.getName())) {
- c = char.class;
- } else if (type.equals(void.class.getName())) {
- c = void.class;
- }
-
- return c;
- }
-
- /**
- * Insert the method's description here.
- * Creation date: (11/07/00 3:43:55 PM)
- * @param newAdapterFactory org.eclipse.jem.java.adapters.JavaJDKAdapterFactory
- */
- public void setAdapterFactory(JavaJDKAdapterFactory newAdapterFactory) {
- adapterFactory = newAdapterFactory;
- }
-}
diff --git a/plugins/org.eclipse.jem/mofjava/org/eclipse/jem/internal/java/adapters/jdk/JavaClassJDKAdaptor.java b/plugins/org.eclipse.jem/mofjava/org/eclipse/jem/internal/java/adapters/jdk/JavaClassJDKAdaptor.java
deleted file mode 100644
index 6d6f991..0000000
--- a/plugins/org.eclipse.jem/mofjava/org/eclipse/jem/internal/java/adapters/jdk/JavaClassJDKAdaptor.java
+++ /dev/null
@@ -1,354 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2001, 2005 IBM Corporation and others.
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
- *
- * Contributors:
- * IBM Corporation - initial API and implementation
- *******************************************************************************/
-/*
-
-
- */
-
-package org.eclipse.jem.internal.java.adapters.jdk;
-
-import java.util.List;
-import java.util.logging.Level;
-
-import org.eclipse.emf.common.notify.Notifier;
-import org.eclipse.emf.ecore.EObject;
-import org.eclipse.emf.ecore.resource.ResourceSet;
-import org.eclipse.emf.ecore.xmi.XMIResource;
-
-import org.eclipse.jem.internal.java.adapters.IJavaClassAdaptor;
-import org.eclipse.jem.internal.java.adapters.nls.ResourceHandler;
-import org.eclipse.jem.java.*;
-import org.eclipse.jem.java.internal.impl.JavaClassImpl;
-import org.eclipse.jem.util.logger.proxy.Logger;
-
-/**
- * Reflect the class using standard java.reflect methods.
- * Creation date: (6/6/2000 4:42:50 PM)
- * @author: Administrator
- */
-public class JavaClassJDKAdaptor extends JDKAdaptor implements IJavaClassAdaptor {
-
- protected Class sourceType = null;
-
- public JavaClassJDKAdaptor(Notifier target, JavaJDKAdapterFactory anAdapterFactory) {
- super(target, anAdapterFactory);
- }
-
- /**
- * addFields - reflect our fields
- */
- protected void addFields() {
- XMIResource resource = (XMIResource) getJavaClassTarget().eResource();
- List targetFields = getJavaClassTarget().getFieldsGen();
- targetFields.clear();
- java.lang.reflect.Field[] fields = {};
- try {
- fields = getSourceType().getDeclaredFields();
- } catch (NoClassDefFoundError error) {
- System.out.println(ResourceHandler.getString(
- "Could_Not_Reflect_Fields_ERROR_", new Object[] { getJavaClassTarget().getQualifiedName(), error.getMessage()})); //$NON-NLS-1$
- }
- for (int i = 0; i < fields.length; i++) {
- targetFields.add(createJavaField(fields[i], resource));
- }
- }
-
- /**
- * addMethods - reflect our methods
- */
- protected void addMethods() {
- // We need to first do methods and then do constructors because the JDK treats them as two
- // different objects, which the Java Model treats them as both Method's.
- XMIResource resource = (XMIResource) getJavaClassTarget().eResource();
- List targetMethods = getJavaClassTarget().getMethodsGen();
- targetMethods.clear();
- java.lang.reflect.Method[] methods = {};
- try {
- methods = getSourceType().getDeclaredMethods();
- } catch (NoClassDefFoundError error) {
- Logger logger = Logger.getLogger();
- if (logger.isLoggingLevel(Level.WARNING)) {
- logger
- .log(
- ResourceHandler
- .getString(
- "Could_Not_Reflect_Methods_ERROR_", new Object[] { getJavaClassTarget().getQualifiedName(), error.toString()}), Level.WARNING); //$NON-NLS-1$
- }
- }
- for (int i = 0; i < methods.length; i++) {
- targetMethods.add(createJavaMethod(methods[i], resource));
- }
-
- // Now do the constructors
- java.lang.reflect.Constructor[] ctors = {};
- try {
- ctors = getSourceType().getDeclaredConstructors();
- } catch (NoClassDefFoundError error) {
- Logger logger = Logger.getLogger();
- if (logger.isLoggingLevel(Level.WARNING)) {
- logger
- .log(
- ResourceHandler
- .getString(
- "Could_Not_Reflect_Constructors_ERROR_", new Object[] { getJavaClassTarget().getQualifiedName(), error.getMessage()}), Level.WARNING); //$NON-NLS-1$
- }
- }
- for (int i = 0; i < ctors.length; i++) {
- targetMethods.add(createJavaMethod(ctors[i], resource));
- }
-
- }
-
- /**
- * Clear the reflected fields list.
- */
- protected boolean flushFields() {
- getJavaClassTarget().getFieldsGen().clear();
- return true;
- }
-
- /**
- * Clear the implements list.
- */
- protected boolean flushImplements() {
- getJavaClassTarget().getImplementsInterfacesGen().clear();
- return true;
- }
-
- /**
- * Clear the reflected methods list.
- */
- protected boolean flushMethods() {
- getJavaClassTarget().getMethodsGen().clear();
- return true;
- }
-
- protected boolean flushInnerClasses() {
- getJavaClassTarget().getDeclaredClassesGen().clear();
- return true;
- }
-
- protected boolean flushModifiers() {
- JavaClass javaClassTarget = (JavaClass) getTarget();
- javaClassTarget.setAbstract(false);
- javaClassTarget.setFinal(false);
- javaClassTarget.setPublic(false);
- javaClassTarget.setKind(TypeKind.UNDEFINED_LITERAL);
- return true;
- }
-
- /**
- * @see org.eclipse.jem.java.adapters.JavaReflectionAdaptor#flushReflectedValues(boolean)
- */
- protected boolean flushReflectedValues(boolean clearCachedModelObject) {
- boolean result = flushModifiers();
- result &= flushSuper();
- result &= flushImplements();
- result &= flushMethods();
- result &= flushFields();
- result &= flushInnerClasses();
- return result;
- }
-
- /**
- * @see org.eclipse.jem.java.adapters.JavaReflectionAdaptor#postFlushReflectedValuesIfNecessary()
- */
- protected void postFlushReflectedValuesIfNecessary(boolean isExisting) {
- getJavaClassTarget().setReflected(false);
- super.postFlushReflectedValuesIfNecessary(isExisting);
- }
-
- /**
- * Set the supertype to be null.
- */
- protected boolean flushSuper() {
- List targetSupers = getJavaClassTarget().primGetESuperTypes();
- targetSupers.clear();
- return true;
- }
-
- /**
- * Return the target typed to a JavaClass.
- */
- protected JavaClassImpl getJavaClassTarget() {
- return (JavaClassImpl) getTarget();
- }
-
- public Object getReflectionSource() {
- return getSourceType();
- }
- /* (non-Javadoc)
- * @see org.eclipse.jem.internal.java.adapters.JavaReflectionAdaptor#hasReflectionSource()
- */
- public boolean hasCachedReflectionSource() {
- return sourceType != null;
- }
-
- /**
- * getSourceType - return the java.lang.Class which describes our existing Java class
- */
- protected Class getSourceType() {
- if (sourceType == null) {
- sourceType = getType((JavaClass) getTarget());
- }
- return sourceType;
- }
-
- /**
- * getValueIn method comment.
- */
- public Object getValueIn(EObject object, EObject attribute) {
- // At this point, this adapter does not dynamically compute any values,
- // all values are pushed back into the target on the initial call.
- return super.getValueIn(object, attribute);
- }
-
- /**
- * Return true if the sourceType is null or if it is a binary type. Reflection from the JDK is always from binary.
- */
- public boolean isSourceTypeFromBinary() {
- return true;
- }
-
- /**
- * reflectValues - template method, subclasses override to pump values into target. on entry: name, containing package (and qualified name), and
- * document must be set. Return true if successful JavaClass adaptor: - set modifiers - set name - set reference to super - create methods -
- * create fields - add imports
- */
- public boolean reflectValues() {
- super.reflectValues();
- try {
- if (getSourceType() != null) {
- setModifiers();
- setNaming();
- try {
- setSuper();
- } catch (InheritanceCycleException e) {
- Logger.getLogger().log(e);
- }
- setImplements();
- addMethods();
- addFields();
- reflectInnerClasses();
- setDeclaringClass();
- getAdapterFactory().registerReflection(getSourceType().getName(), this);
- // addImports();
- return true;
- }
- return false;
- } finally {
- //Don't cache the class beyond the operation of reflect values;
- //this enables dynamic swapping of the alternate class loader
- //for java reflection, as well as avoids potential memory leakage
- sourceType = null;
- }
- }
-
- protected void setDeclaringClass() {
- Class declaringType = getSourceType().getDeclaringClass();
- if (declaringType != null) {
- // Need to get it and reflect it so that the declared type of this target is set correctly. We can just
- // set it ourselves directly because ECore would try to add it to the list of inner classes of the declaring type. This
- // would cause it to be added twice, once from the reflection caused by the inverse setting, and once from our doing
- // the inverse setting itself.
- ResourceSet set = getTargetResource().getResourceSet();
- JavaClassImpl declaringClass = (JavaClassImpl) JavaRefFactory.eINSTANCE.reflectType(declaringType.getName(), set);
- declaringClass.getDeclaredClasses(); // This will cause it to put us into its list and also set our declaring class to this declaring type.
- }
- }
-
- /**
- *
- */
- protected void reflectInnerClasses() {
- Class[] innerClasses = getSourceType().getClasses();
- if (innerClasses.length != 0) {
- List declaredClasses = getJavaClassTarget().getDeclaredClassesGen();
- JavaClass inner;
- ResourceSet set = getTargetResource().getResourceSet();
- for (int i = 0; i < innerClasses.length; i++) {
- inner = (JavaClass) JavaRefFactory.eINSTANCE.reflectType(innerClasses[i].getName(), set);
- declaredClasses.add(inner);
- }
- }
-
- }
-
- /**
- * setImplements - set our implemented/super interfaces here For an interface, these are superclasses. For a class, these are implemented
- * interfaces.
- */
- protected void setImplements() {
- Class[] interfaces = getSourceType().getInterfaces();
- // needs work, the names above will be simple names if we are relfecting from a source file
- JavaClassImpl javaClassTarget = (JavaClassImpl) getTarget();
- JavaClass ref;
- List intList = javaClassTarget.getImplementsInterfacesGen();
- intList.clear();
- for (int i = 0; i < interfaces.length; i++) {
- ref = createJavaClassRef(interfaces[i].getName());
- intList.add(ref);
- }
- }
-
- /**
- * setModifiers - set the attribute values related to modifiers here
- */
- protected void setModifiers() {
- JavaClass javaClassTarget = (JavaClass) getTarget();
- javaClassTarget.setAbstract(java.lang.reflect.Modifier.isAbstract(getSourceType().getModifiers()));
- javaClassTarget.setFinal(java.lang.reflect.Modifier.isFinal(getSourceType().getModifiers()));
- javaClassTarget.setPublic(java.lang.reflect.Modifier.isPublic(getSourceType().getModifiers()));
- // Set type to class or interface, not yet handling EXCEPTION
- if (getSourceType().isInterface())
- javaClassTarget.setKind(TypeKind.INTERFACE_LITERAL);
- else
- javaClassTarget.setKind(TypeKind.CLASS_LITERAL);
- }
-
- /**
- * setNaming - set the naming values here - qualified name (package name + name) must be set first, that is the path to the real Java class - ID -
- * simple name, identity within a package document - NO UUID!!!
- */
- protected void setNaming() {
- // JavaClass javaClassTarget = (JavaClass) getTarget();
- // javaClassTarget.refSetUUID((String) null);
- // ((XMIResource)javaClassTarget.eResource()).setID(javaClassTarget,getSimpleName(getSourceType().getName()));
- }
-
- /**
- * setSuper - set our supertype here, implemented interface are handled separately
- */
- protected void setSuper() throws InheritanceCycleException {
- Class superClass = null;
- superClass = getSourceType().getSuperclass();
- if (superClass != null) {
- JavaClass javaClassTarget = (JavaClass) getTarget();
- javaClassTarget.setSupertype(createJavaClassRef(superClass.getName()));
- }
- }
-
- /**
- * Return true if the sourceType can be found.
- */
- public boolean sourceTypeExists() {
- return getSourceType() != null;
- }
-
- public boolean reflectFieldsIfNecessary() {
- return reflectValuesIfNecessary();
- }
-
- public boolean reflectMethodsIfNecessary() {
- return reflectValuesIfNecessary();
- }
-}
-
diff --git a/plugins/org.eclipse.jem/mofjava/org/eclipse/jem/internal/java/adapters/jdk/JavaFieldJDKAdaptor.java b/plugins/org.eclipse.jem/mofjava/org/eclipse/jem/internal/java/adapters/jdk/JavaFieldJDKAdaptor.java
deleted file mode 100644
index 7846917..0000000
--- a/plugins/org.eclipse.jem/mofjava/org/eclipse/jem/internal/java/adapters/jdk/JavaFieldJDKAdaptor.java
+++ /dev/null
@@ -1,150 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2003, 2005 IBM Corporation and others.
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
- *
- * Contributors:
- * IBM Corporation - initial API and implementation
- *******************************************************************************/
-package org.eclipse.jem.internal.java.adapters.jdk;
-/*
-
-
- */
-import org.eclipse.emf.common.notify.Notifier;
-import org.eclipse.emf.ecore.EObject;
-import org.eclipse.emf.ecore.util.EcoreUtil;
-import org.eclipse.jem.java.*;
-import org.eclipse.jem.internal.java.adapters.ReadAdaptor;
-/**
- * Insert the type's description here.
- * Creation date: (6/6/2000 4:42:50 PM)
- * @author: Administrator
- */
-public class JavaFieldJDKAdaptor extends JDKAdaptor {
- protected java.lang.reflect.Field sourceField = null;
- protected Class parentType = null;
- public JavaFieldJDKAdaptor(Notifier target, JavaJDKAdapterFactory anAdapterFactory) {
- super(target, anAdapterFactory);
- }
- /**
- * getParentType - return the Class which corresponds to our parent JavaClass
- * we're going to do this a lot, so cache it.
- */
- protected Class getParentType() {
- if (parentType == null) {
- Field targetField = (Field) getTarget();
- JavaClass parentJavaClass = targetField.getJavaClass();
- JavaClassJDKAdaptor pa = (JavaClassJDKAdaptor) EcoreUtil.getAdapter(parentJavaClass.eAdapters(), ReadAdaptor.TYPE_KEY);
- if (pa != null)
- parentType = pa.getSourceType();
- }
- return parentType;
- }
- public Object getReflectionSource() {
- return getSourceField();
- }
-
- /* (non-Javadoc)
- * @see org.eclipse.jem.internal.java.adapters.JavaReflectionAdaptor#hasReflectionSource()
- */
- public boolean hasCachedReflectionSource() {
- return sourceField != null;
- }
- /**
- * getSourceField - return the java.lang.reflect.Field which describes our implementing field
- */
- protected java.lang.reflect.Field getSourceField() {
- if (sourceField == null) {
- Class parent = this.getParentType();
- if (parent != null) {
- try {
- sourceField = parent.getDeclaredField(((Field) getTarget()).getName());
- } catch (NoSuchFieldException e) {
- // OK, carry on
- }
- }
- }
- return sourceField;
- }
- public Field getTargetField() {
- return (Field) getTarget();
- }
- /**
- * getValueIn method comment.
- */
- public Object getValueIn(EObject object, EObject attribute) {
- // At this point, this adapter does not dynamically compute any values,
- // all values are pushed back into the target on the initial call.
- return super.getValueIn(object, attribute);
- }
- /**
- * reflectValues - template method, subclasses override to pump values into target.
- * on entry: name, containing package (and qualified name), and document must be set.
- * JavaClass adaptor:
- * - set modifiers
- * - set name
- * - set type
- */
- public boolean reflectValues() {
- if (getSourceField() != null) {
- setModifiers();
- setType();
- setInitializerIfPossible();
- return true;
- }
- return false;
- }
- /**
- * Used for the very narrow case of final static Strings
- */
- protected void setInitializerIfPossible() {
- if (!(getTargetField().isStatic() && getTargetField().isFinal() && "java.lang.String".equals(((JavaHelpers) getTargetField().getEType()).getQualifiedName()))) //$NON-NLS-1$
- return;
-
- String value = null;
- try {
- value = (String) getSourceField().get(null);
- } catch (IllegalAccessException ex) {
- return;
- }
-
- if (value == null)
- return;
- else
- value = "\"".concat(value).concat("\""); //$NON-NLS-2$//$NON-NLS-1$
-
- Block aBlock = createBlock(getTargetField().getName(), value);
- getTargetField().setInitializer(aBlock);
- }
- /**
- * setModifiers - set the attribute values related to modifiers here
- */
- protected void setModifiers() {
- Field javaFieldTarget = (Field) getTarget();
- // For JDK reflection, I don't think we can set the initializer
- int modifiers = getSourceField().getModifiers();
- javaFieldTarget.setStatic(java.lang.reflect.Modifier.isStatic(modifiers));
- javaFieldTarget.setTransient(java.lang.reflect.Modifier.isTransient(modifiers));
- javaFieldTarget.setVolatile(java.lang.reflect.Modifier.isVolatile(modifiers));
- javaFieldTarget.setFinal(java.lang.reflect.Modifier.isFinal(modifiers));
- // Set visibility
- if (java.lang.reflect.Modifier.isPublic(modifiers))
- javaFieldTarget.setJavaVisibility(JavaVisibilityKind.PUBLIC_LITERAL);
- else if (java.lang.reflect.Modifier.isPrivate(modifiers))
- javaFieldTarget.setJavaVisibility(JavaVisibilityKind.PRIVATE_LITERAL);
- else if (java.lang.reflect.Modifier.isProtected(modifiers))
- javaFieldTarget.setJavaVisibility(JavaVisibilityKind.PROTECTED_LITERAL);
- else
- javaFieldTarget.setJavaVisibility(JavaVisibilityKind.PACKAGE_LITERAL);
- }
- /**
- * setType - set our type here
- */
- protected void setType() {
- String typeName = getTypeName(getSourceField().getType());
- setFieldType(getTargetField(), typeName);
- }
-}
diff --git a/plugins/org.eclipse.jem/mofjava/org/eclipse/jem/internal/java/adapters/jdk/JavaJDKAdapterFactory.java b/plugins/org.eclipse.jem/mofjava/org/eclipse/jem/internal/java/adapters/jdk/JavaJDKAdapterFactory.java
deleted file mode 100644
index f494eb6..0000000
--- a/plugins/org.eclipse.jem/mofjava/org/eclipse/jem/internal/java/adapters/jdk/JavaJDKAdapterFactory.java
+++ /dev/null
@@ -1,84 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2003, 2005 IBM Corporation and others.
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
- *
- * Contributors:
- * IBM Corporation - initial API and implementation
- *******************************************************************************/
-package org.eclipse.jem.internal.java.adapters.jdk;
-/*
-
-
- */
-import java.util.Iterator;
-
-import org.eclipse.emf.common.notify.Notifier;
-import org.eclipse.jem.internal.java.adapters.JavaReflectionAdapterFactory;
-import org.eclipse.jem.internal.java.adapters.ReflectionAdaptor;
-/**
- * Insert the type's description here.
- * Creation date: (6/13/2000 1:20:31 PM)
- * @author: Administrator
- */
-public class JavaJDKAdapterFactory extends JavaReflectionAdapterFactory {
- protected ClassLoader contextClassLoader;
- /**
- * JavaJDOMAdapterFactory constructor comment.
- */
- public JavaJDKAdapterFactory() {
- super();
- //adapterKey = TYPE_NAME;
- }
- /**
- * JavaJDOMAdapterFactory constructor comment.
- */
- public JavaJDKAdapterFactory(ClassLoader aClassLoader) {
- this();
- setContextClassLoader(aClassLoader);
- }
- protected ReflectionAdaptor createJavaClassAdaptor(Notifier target) {
- return new JavaClassJDKAdaptor(target, this);
- }
- protected ReflectionAdaptor createJavaFieldAdaptor(Notifier target) {
- return new JavaFieldJDKAdaptor(target, this);
- }
- protected ReflectionAdaptor createJavaMethodAdaptor(Notifier target) {
- return new JavaMethodJDKAdaptor(target, this);
- }
- // Flush ALL adapters, worst case
- public void flushAll() {
- isBusyIteratingReflected = true;
- try {
- Iterator i = reflected.values().iterator();
- while (i.hasNext())
- ((JavaClassJDKAdaptor) i.next()).flushReflectedValuesIfNecessary();
- } finally {
- finishedIteratingReflected();
- }
- }
- // Flush the adapter for a source object
- public void flushReflection(String source) {
- JavaClassJDKAdaptor a = (JavaClassJDKAdaptor) reflected.get(source);
- if (a != null)
- a.flushReflectedValuesIfNecessary();
- }
- /**
- * Insert the method's description here.
- * Creation date: (11/07/00 3:38:12 PM)
- * @return java.lang.ClassLoader
- */
- public java.lang.ClassLoader getContextClassLoader() {
- return contextClassLoader;
- }
- /**
- * Insert the method's description here.
- * Creation date: (11/07/00 3:38:12 PM)
- * @param newContextClassLoader java.lang.ClassLoader
- */
- public void setContextClassLoader(java.lang.ClassLoader newContextClassLoader) {
- contextClassLoader = newContextClassLoader;
- }
-}
diff --git a/plugins/org.eclipse.jem/mofjava/org/eclipse/jem/internal/java/adapters/jdk/JavaMethodJDKAdaptor.java b/plugins/org.eclipse.jem/mofjava/org/eclipse/jem/internal/java/adapters/jdk/JavaMethodJDKAdaptor.java
deleted file mode 100644
index 0e735cd..0000000
--- a/plugins/org.eclipse.jem/mofjava/org/eclipse/jem/internal/java/adapters/jdk/JavaMethodJDKAdaptor.java
+++ /dev/null
@@ -1,245 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2003, 2005 IBM Corporation and others.
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
- *
- * Contributors:
- * IBM Corporation - initial API and implementation
- *******************************************************************************/
-package org.eclipse.jem.internal.java.adapters.jdk;
-/*
-
-
- */
-
-import java.util.List;
-
-import org.eclipse.emf.common.notify.Notifier;
-import org.eclipse.emf.ecore.EObject;
-import org.eclipse.emf.ecore.util.EcoreUtil;
-import org.eclipse.emf.ecore.xmi.XMIResource;
-import org.eclipse.jem.java.*;
-import org.eclipse.jem.internal.java.adapters.IJavaMethodAdapter;
-import org.eclipse.jem.internal.java.adapters.ReadAdaptor;
-import org.eclipse.jem.java.internal.impl.MethodImpl;
-/**
- * Insert the type's description here.
- * Creation date: (6/6/2000 4:42:50 PM)
- * @author: Administrator
- */
-public class JavaMethodJDKAdaptor extends JDKAdaptor implements IJavaMethodAdapter {
- protected java.lang.reflect.AccessibleObject sourceAccessible = null; // Could be method or ctor.
- protected Class parentType = null;
- // cache a static empty Class[] for no parm methods
- protected static Class[] emptyClassArray = new Class[0];
- // cache a static empty String[], too
- protected static String[] emptyStringArray = new String[0];
- public JavaMethodJDKAdaptor(Notifier target, JavaJDKAdapterFactory anAdapterFactory) {
- super(target, anAdapterFactory);
- }
- /**
- * addExceptions - reflect our exception list
- */
- protected void addExceptions() {
- Class[] exceptions =
- (getSourceAccessible() instanceof java.lang.reflect.Method)
- ? ((java.lang.reflect.Method) getSourceAccessible()).getExceptionTypes()
- : ((java.lang.reflect.Constructor) getSourceAccessible()).getExceptionTypes();
- // EList exList = (EList) javaMethodTarget.primRefValue(JavaRefPackage.eINSTANCE.getMethod_JavaExceptions());
- List exList = getMethodTarget().getJavaExceptionsGen();
- for (int i = 0; i < exceptions.length; i++) {
- exList.add(createJavaClassRef(exceptions[i].getName()));
- }
- }
-
- protected MethodImpl getMethodTarget() {
- return (MethodImpl) getTarget();
- }
- /**
- * addParameters - reflect our parms
- */
- protected void addParameters() {
- Class[] parmTypes =
- (getSourceAccessible() instanceof java.lang.reflect.Method)
- ? ((java.lang.reflect.Method) getSourceAccessible()).getParameterTypes()
- : ((java.lang.reflect.Constructor) getSourceAccessible()).getParameterTypes();
- MethodImpl javaMethodTarget = getMethodTarget();
- // List pList = (List) javaMethodTarget.primRefValue(JavaRefPackage.eINSTANCE.getMethod_Parameters());
- List pList = javaMethodTarget.getParametersGen();
- for (int i = 0; i < parmTypes.length; i++) {
- pList.add(createJavaParameter(javaMethodTarget, "arg" + i, getTypeName(parmTypes[i]))); //$NON-NLS-1$
- }
- }
- protected JavaClass getContainingJavaClass() {
- return ((Method) getTarget()).getContainingJavaClass();
- }
- /**
- * getParentType - return the Class which corresponds to our parent JavaClass
- * we're going to do this a lot, so cache it.
- */
- protected Class getParentType() {
- if (parentType == null) {
- Method targetMethod = (Method) getTarget();
- JavaClass parentJavaClass = targetMethod.getContainingJavaClass();
- JavaClassJDKAdaptor pa = (JavaClassJDKAdaptor) EcoreUtil.getAdapter(parentJavaClass.eAdapters(), ReadAdaptor.TYPE_KEY);
- if (pa != null)
- parentType = pa.getSourceType();
- }
- return parentType;
- }
- /**
- * getParmTypeSignatures - return an array of Classes for our parameter types
- * For reflection purposes, we can only rely on our ID, since our parms may
- * not yet be known.
- */
- protected Class[] getParmTypes() {
- Method javaMethodTarget = (Method) getTarget();
- String id = ((XMIResource) javaMethodTarget.eResource()).getID(javaMethodTarget);
- String[] typeNames = getTypeNamesFromMethodID(id);
- if (typeNames == null)
- return emptyClassArray;
- int n = typeNames.length;
- if (n == 0)
- return emptyClassArray;
- Class[] types = new Class[n];
- for (int i = 0; i < n; ++i) {
- types[i] = getType(typeNames[i]);
- }
- return types;
- }
- public Object getReflectionSource() {
- return getSourceAccessible();
- }
-
- /* (non-Javadoc)
- * @see org.eclipse.jem.internal.java.adapters.JavaReflectionAdaptor#hasReflectionSource()
- */
- public boolean hasCachedReflectionSource() {
- return sourceAccessible != null;
- }
- /**
- * getsourceMethod - return the java.lang.reflect.Method which describes our implementing method
- */
- protected java.lang.reflect.AccessibleObject getSourceAccessible() {
- if (sourceAccessible == null) {
- Class parent = this.getParentType();
- if (parent != null) {
- Class[] parmTypes = this.getParmTypes();
- try {
- sourceAccessible = parent.getDeclaredMethod(((Method) getTarget()).getName(), parmTypes);
- } catch (NoSuchMethodException e) {
- // OK, can't reflect it
- }
-
- if (sourceAccessible == null) {
- // It wasn't a method, try for constructor.
- try {
- sourceAccessible = parent.getDeclaredConstructor(parmTypes);
- } catch (NoSuchMethodException e) {
- // OK, can't reflect it
- }
- }
- }
- }
- return sourceAccessible;
- }
- /**
- * getValueIn method comment.
- */
- public Object getValueIn(EObject object, EObject attribute) {
- // At this point, this adapter does not dynamically compute any values,
- // all values are pushed back into the target on the initial call.
- return super.getValueIn(object, attribute);
- }
- /**
- * reflectValues - template method, subclasses override to pump values into target.
- * on entry: UUID, name, containing package (and qualified name), and document must be set.
- * Method adaptor:
- * - set modifiers
- * - set name
- * - set return type
- * - add parameters
- * - add exceptions
- */
- public boolean reflectValues() {
- if (getSourceAccessible() != null) {
- ((Method) getTarget()).setIsGenerated(false);
- setModifiers();
- setNaming();
- setReturnType();
- addParameters();
- addExceptions();
- return true;
- }
- return false;
- }
-
-
- /* (non-Javadoc)
- * @see org.eclipse.jem.internal.java.adapters.IJavaMethodAdapter#reflectGeneratedIfNecessary()
- */
- public boolean reflectGeneratedIfNecessary() {
- return reflectValuesIfNecessary();
- }
-
- public boolean reflectParamNamesIfNecessary() {
- return reflectValuesIfNecessary();
- }
-
- /**
- * setModifiers - set the attribute values related to modifiers here
- */
- protected void setModifiers() {
- Method methodTarget = (Method) getTarget();
- int modifiers =
- (getSourceAccessible() instanceof java.lang.reflect.Method)
- ? ((java.lang.reflect.Method) getSourceAccessible()).getModifiers()
- : ((java.lang.reflect.Constructor) getSourceAccessible()).getModifiers();
- methodTarget.setAbstract(java.lang.reflect.Modifier.isAbstract(modifiers));
- methodTarget.setFinal(java.lang.reflect.Modifier.isFinal(modifiers));
- methodTarget.setNative(java.lang.reflect.Modifier.isNative(modifiers));
- methodTarget.setStatic(java.lang.reflect.Modifier.isStatic(modifiers));
- methodTarget.setSynchronized(java.lang.reflect.Modifier.isSynchronized(modifiers));
- methodTarget.setConstructor(getSourceAccessible() instanceof java.lang.reflect.Constructor);
- // Set visibility
- JavaClass javaClass = getContainingJavaClass();
- if ((javaClass.getKind() == TypeKind.INTERFACE_LITERAL) || (java.lang.reflect.Modifier.isPublic(modifiers)))
- methodTarget.setJavaVisibility(JavaVisibilityKind.PUBLIC_LITERAL);
- else if (java.lang.reflect.Modifier.isPrivate(modifiers))
- methodTarget.setJavaVisibility(JavaVisibilityKind.PRIVATE_LITERAL);
- else if (java.lang.reflect.Modifier.isProtected(modifiers))
- methodTarget.setJavaVisibility(JavaVisibilityKind.PROTECTED_LITERAL);
- else
- //Visibility must be package
- methodTarget.setJavaVisibility(JavaVisibilityKind.PACKAGE_LITERAL);
- }
- /**
- * setNaming - set the naming values here
- * - qualified name must be set first, that is the path to the real Java class
- * - ID
- * - name-based UUID
- */
- protected void setNaming() {
- //
- // naming is currently a no-op since the name and UUID must be set prior to reflection
- // ...and ID is redundant with UUID.
- // javaFieldTarget.setID(parent.getQualifiedName() + "_" + javaFieldTarget.getName());
- }
- /**
- * setType - set our return type here
- */
- protected void setReturnType() {
- if (getSourceAccessible() instanceof java.lang.reflect.Method) {
- Class type = ((java.lang.reflect.Method) getSourceAccessible()).getReturnType();
- Method javaMethodTarget = (Method) getTarget();
- /*
- JavaParameter newParameter = createJavaParameter(javaMethodTarget, "result", getTypeName(type));//$NON-NLS-1$
- newParameter.setParameterKind(MetaJavaParameterKind.RETURN);
- javaMethodTarget.getParameters().add(newParameter);
- */
- javaMethodTarget.setEType(createJavaClassRef(getTypeName(type)));
- }
- }
-}
diff --git a/plugins/org.eclipse.jem/mofjava/org/eclipse/jem/internal/java/adapters/nls/ResourceHandler.java b/plugins/org.eclipse.jem/mofjava/org/eclipse/jem/internal/java/adapters/nls/ResourceHandler.java
deleted file mode 100644
index eefe29e..0000000
--- a/plugins/org.eclipse.jem/mofjava/org/eclipse/jem/internal/java/adapters/nls/ResourceHandler.java
+++ /dev/null
@@ -1,62 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2001, 2005 IBM Corporation and others.
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
- *
- * Contributors:
- * IBM Corporation - initial API and implementation
- *******************************************************************************/
-package org.eclipse.jem.internal.java.adapters.nls;
-/*
-
-
- */
-import java.util.MissingResourceException;
-import java.util.ResourceBundle;
-import java.text.MessageFormat;
-
-public class ResourceHandler {
-
- private static ResourceBundle fgResourceBundle;
-
- /**
- * Returns the resource bundle used by all classes in this Project
- */
- public static ResourceBundle getResourceBundle() {
- try {
- return ResourceBundle.getBundle("javaadapters");//$NON-NLS-1$
- } catch (MissingResourceException e) {
- // does nothing - this method will return null and
- // getString(String, String) will return the key
- // it was called with
- }
- return null;
- }
- public static String getString(String key) {
- if (fgResourceBundle == null) {
- fgResourceBundle= getResourceBundle();
- }
-
- if (fgResourceBundle != null) {
- try {
- return fgResourceBundle.getString(key);
- } catch (MissingResourceException e) {
- return "!" + key + "!";//$NON-NLS-2$//$NON-NLS-1$
- }
- } else {
- return "!" + key + "!";//$NON-NLS-2$//$NON-NLS-1$
- }
- }
-public static String getString(String key, Object[] args) {
-
- try {return MessageFormat.format(getString(key), args);}
- catch (IllegalArgumentException e) {return getString(key);}
-
-}
-}
-
-
-
-
diff --git a/plugins/org.eclipse.jem/mofjava/org/eclipse/jem/internal/java/beaninfo/IIntrospectionAdapter.java b/plugins/org.eclipse.jem/mofjava/org/eclipse/jem/internal/java/beaninfo/IIntrospectionAdapter.java
deleted file mode 100644
index d42f95a..0000000
--- a/plugins/org.eclipse.jem/mofjava/org/eclipse/jem/internal/java/beaninfo/IIntrospectionAdapter.java
+++ /dev/null
@@ -1,38 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2001, 2005 IBM Corporation and others.
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
- *
- * Contributors:
- * IBM Corporation - initial API and implementation
- *******************************************************************************/
-package org.eclipse.jem.internal.java.beaninfo;
-/*
-
-
- */
-import org.eclipse.emf.common.util.BasicEList;
-import org.eclipse.emf.common.util.EList;
-
-
-/**
- * The interface for the Beaninfo adapter. The actual implementation
- * is in a separate project so that beaninfo code will not be loaded
- * unless it needs to be.
- */
-
-public interface IIntrospectionAdapter extends org.eclipse.emf.common.notify.Adapter {
- public static final Class ADAPTER_KEY = IIntrospectionAdapter.class;
- public void introspectIfNecessary();
- public boolean isStale();
- public EList getEStructuralFeatures();
- public EList getEOperations();
- public BasicEList getEAllOperations();
- public EList getEvents();
- public EList getAllEvents();
- public EList getAllProperties();
-}
-
-
diff --git a/plugins/org.eclipse.jem/mofjava/org/eclipse/jem/internal/java/init/JavaInit.java b/plugins/org.eclipse.jem/mofjava/org/eclipse/jem/internal/java/init/JavaInit.java
deleted file mode 100644
index 8b6f1c8..0000000
--- a/plugins/org.eclipse.jem/mofjava/org/eclipse/jem/internal/java/init/JavaInit.java
+++ /dev/null
@@ -1,63 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2001, 2005 IBM Corporation and others.
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
- *
- * Contributors:
- * IBM Corporation - initial API and implementation
- *******************************************************************************/
-package org.eclipse.jem.internal.java.init;
-import org.eclipse.emf.ecore.EPackage;
-import org.eclipse.emf.ecore.EcorePackage;
-import org.eclipse.emf.ecore.resource.Resource;
-import org.eclipse.emf.ecore.xmi.impl.XMIResourceFactoryImpl;
-import org.eclipse.jem.java.JavaRefPackage;
-import org.eclipse.jem.internal.java.adapters.JavaXMIFactoryImpl;
-
-/**
- * Initialize the Java Reflection mechanisms.
- */
-public class JavaInit {
- protected static boolean initialized = false;
- protected static boolean plugin_initialized = false;
-
- public static void init() {
- init(true);
- }
-
- public static void init(boolean shouldPreRegisterPackages) {
- if (!initialized) {
- initialized = true;
- if (shouldPreRegisterPackages) {
- preRegisterPackages();
- setDefaultResourceFactory();
- }
- //Register resource factory
- JavaXMIFactoryImpl.register();
- }
- }
-
- private static void preRegisterPackages() {
- //ecore
- if (!EPackage.Registry.INSTANCE.containsKey("ecore.xmi")) //$NON-NLS-1$
- EPackage.Registry.INSTANCE.put("ecore.xmi", EcorePackage.eINSTANCE); //$NON-NLS-1$
- //java
- if (!EPackage.Registry.INSTANCE.containsKey("java.xmi")) //$NON-NLS-1$
- EPackage.Registry.INSTANCE.put("java.xmi", JavaRefPackage.eINSTANCE); //$NON-NLS-1$
- }
- protected static void setDefaultResourceFactory() {
- //This is not done outside of Eclipse
- if (Resource.Factory.Registry.INSTANCE.getExtensionToFactoryMap().get(Resource.Factory.Registry.DEFAULT_EXTENSION) == null)
- Resource.Factory.Registry.INSTANCE.getExtensionToFactoryMap().put(
- Resource.Factory.Registry.DEFAULT_EXTENSION,
- new XMIResourceFactoryImpl());
- }
-
- public static void setPluginInit(boolean bPluginInit) {
- // Here's where the configuration file would be read.
- plugin_initialized = bPluginInit;
- }
-
-}
diff --git a/plugins/org.eclipse.jem/mofjava/org/eclipse/jem/internal/java/instantiation/IInstantiationHandler.java b/plugins/org.eclipse.jem/mofjava/org/eclipse/jem/internal/java/instantiation/IInstantiationHandler.java
deleted file mode 100644
index 0548958..0000000
--- a/plugins/org.eclipse.jem/mofjava/org/eclipse/jem/internal/java/instantiation/IInstantiationHandler.java
+++ /dev/null
@@ -1,47 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2001, 2005 IBM Corporation and others.
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
- *
- * Contributors:
- * IBM Corporation - initial API and implementation
- *******************************************************************************/
-package org.eclipse.jem.internal.java.instantiation;
-/*
-
-
- */
-import org.eclipse.emf.ecore.*;
-
-import org.eclipse.jem.java.JavaDataType;
-
-/**
- * The interface for the Instantiation handler. The actual implementation
- * is in a separate project so that instantiation code will not be loaded
- * unless it needs to be.
- */
-
-public interface IInstantiationHandler {
- /**
- * Answers whether the adapter handles the datatype
- * or whether the standard EFactory does.
- */
- public boolean handlesDataType(JavaDataType type);
-
- /**
- * Answers whether the adapter handles the EClass or the
- * standard EFactory does.
- */
- public boolean handlesClass(EClass type);
-
- /**
- * If adapterHandlesInstance returns true, then
- * this method will be called to create the instance.
- */
- public EObject create(EClass javaClass);
-
-}
-
-
diff --git a/plugins/org.eclipse.jem/mofjava/org/eclipse/jem/internal/java/instantiation/IInstantiationHandlerFactoryAdapter.java b/plugins/org.eclipse.jem/mofjava/org/eclipse/jem/internal/java/instantiation/IInstantiationHandlerFactoryAdapter.java
deleted file mode 100644
index de4e5d3..0000000
--- a/plugins/org.eclipse.jem/mofjava/org/eclipse/jem/internal/java/instantiation/IInstantiationHandlerFactoryAdapter.java
+++ /dev/null
@@ -1,35 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2001, 2005 IBM Corporation and others.
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
- *
- * Contributors:
- * IBM Corporation - initial API and implementation
- *******************************************************************************/
-package org.eclipse.jem.internal.java.instantiation;
-/*
-
-
- */
-import org.eclipse.emf.common.notify.Adapter;
-
-import org.eclipse.jem.java.internal.impl.JavaFactoryImpl;
-
-/**
- * This adapter is a factory for IInstantiationHandler's. It is attached as
- * an adapter on the ResourceSet that contains the java model. JavaXMIFactory
- * will use it to retrieve its IInstantiationHandler. If the adapter is not
- * found, then no instantiation handler exists.
- */
-public interface IInstantiationHandlerFactoryAdapter extends Adapter {
-
- public final static Class ADAPTER_KEY = IInstantiationHandlerFactoryAdapter.class;
-
- /**
- * Return an IInstantiationHandler.
- */
- public IInstantiationHandler getInstantiationHandler(JavaFactoryImpl factory);
-
-}
diff --git a/plugins/org.eclipse.jem/mofjava/org/eclipse/jem/internal/java/instantiation/IInstantiationInstance.java b/plugins/org.eclipse.jem/mofjava/org/eclipse/jem/internal/java/instantiation/IInstantiationInstance.java
deleted file mode 100644
index dde9562..0000000
--- a/plugins/org.eclipse.jem/mofjava/org/eclipse/jem/internal/java/instantiation/IInstantiationInstance.java
+++ /dev/null
@@ -1,29 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2001, 2005 IBM Corporation and others.
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
- *
- * Contributors:
- * IBM Corporation - initial API and implementation
- *******************************************************************************/
-package org.eclipse.jem.internal.java.instantiation;
-/*
-
-
- */
-import org.eclipse.jem.java.JavaHelpers;
-
-/**
- * The interface for an instance. The actual implementation
- * is in a separate project so that instantiation code will not be loaded
- * unless it needs to be.
- */
-public interface IInstantiationInstance {
- /**
- * @return The JavaHelpers for the java type of the instance.
- */
- public JavaHelpers getJavaType();
-
-}
diff --git a/plugins/org.eclipse.jem/mofjava/org/eclipse/jem/java/ArrayType.java b/plugins/org.eclipse.jem/mofjava/org/eclipse/jem/java/ArrayType.java
deleted file mode 100644
index 285f691..0000000
--- a/plugins/org.eclipse.jem/mofjava/org/eclipse/jem/java/ArrayType.java
+++ /dev/null
@@ -1,97 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2001, 2005 IBM Corporation and others.
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
- *
- * Contributors:
- * IBM Corporation - initial API and implementation
- *******************************************************************************/
-package org.eclipse.jem.java;
-
-/*
-
-
- */
-
-import org.eclipse.emf.ecore.EClassifier;
-/**
- * Describes a Java Array type
- * For multi-dimensional arrays, it is unlikely that the component type will be
- * specified directly. This would require instantiating a chain of component types
- * such as String[][][][]->String[][][]->String[][]->String[]->String.
- *
- * The component type relationship will be computed if the finalComponentType
- * and array dimensions is specified.
- *
- * For this reason, the preferred way to create is through the JavaRefFactory factory method:
- * createArrayType(JavaClass finalComponentType, int dimensions)
- */
-public interface ArrayType extends JavaClass{
-
- /**
- * @generated This field/method will be replaced during code generation
- * @return The value of the ArrayDimensions attribute
- */
- int getArrayDimensions();
-
- /**
- * @generated This field/method will be replaced during code generation
- * @param value The new value of the ArrayDimensions attribute
- */
- void setArrayDimensions(int value);
-
- /**
- * @generated This field/method will be replaced during code generation
- * @return The ComponentType reference
- */
- EClassifier getComponentType();
-
- /**
- * Sets the value of the '{@link org.eclipse.jem.java.ArrayType#getComponentType <em>Component Type</em>}' reference.
- * <!-- begin-user-doc -->
- * <!-- end-user-doc -->
- * @param value the new value of the '<em>Component Type</em>' reference.
- * @see #getComponentType()
- * @generated
- */
- void setComponentType(EClassifier value);
-
- /**
- * @generated This field/method will be replaced during code generation
- * Get the final component type for this Array Type.
- *
- * In order to ensure a unique instance, we will resolve this type using
- * reflection. It turns out to be most efficient to just do this by trimming the
- * name.
- */
- JavaHelpers getFinalComponentType();
-
- /**
- * @generated This field/method will be replaced during code generation
- * Get the component type of this array.
- *
- * If this is a multi-dimensional array, the component type will be the nested
- * array type.
- */
- JavaHelpers getComponentTypeAsHelper();
-
- /**
- * @generated This field/method will be replaced during code generation
- * Is this an array of java primitives
- */
- boolean isPrimitiveArray();
-
- /**
- * @generated This field/method will be replaced during code generation
- * Set the component type.
- */
- void setComponentType(JavaHelpers helperComponentType);
-
-}
-
-
-
-
-
diff --git a/plugins/org.eclipse.jem/mofjava/org/eclipse/jem/java/Block.java b/plugins/org.eclipse.jem/mofjava/org/eclipse/jem/java/Block.java
deleted file mode 100644
index 52f89a3..0000000
--- a/plugins/org.eclipse.jem/mofjava/org/eclipse/jem/java/Block.java
+++ /dev/null
@@ -1,60 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2001, 2005 IBM Corporation and others.
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
- *
- * Contributors:
- * IBM Corporation - initial API and implementation
- *******************************************************************************/
-package org.eclipse.jem.java;
-
-/*
-
-
- */
-
-import org.eclipse.emf.common.util.EList;
-import org.eclipse.emf.ecore.EObject;
-/**
- * @generated
- */
-public interface Block extends EObject{
-
- /**
- * @generated This field/method will be replaced during code generation
- * @return The value of the Source attribute
- */
- String getSource();
-
- /**
- * @generated This field/method will be replaced during code generation
- * @param value The new value of the Source attribute
- */
- void setSource(String value);
-
- /**
- * @generated This field/method will be replaced during code generation
- * @return The value of the Name attribute
- */
- String getName();
-
- /**
- * @generated This field/method will be replaced during code generation
- * @param value The new value of the Name attribute
- */
- void setName(String value);
-
- /**
- * @generated This field/method will be replaced during code generation
- * @return The list of Contents references
- */
- EList getContents();
-
-}
-
-
-
-
-
diff --git a/plugins/org.eclipse.jem/mofjava/org/eclipse/jem/java/Comment.java b/plugins/org.eclipse.jem/mofjava/org/eclipse/jem/java/Comment.java
deleted file mode 100644
index 186771a..0000000
--- a/plugins/org.eclipse.jem/mofjava/org/eclipse/jem/java/Comment.java
+++ /dev/null
@@ -1,28 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2001, 2005 IBM Corporation and others.
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
- *
- * Contributors:
- * IBM Corporation - initial API and implementation
- *******************************************************************************/
-/*
-
-
- */
-package org.eclipse.jem.java;
-
-
-/**
- * @generated
- */
-public interface Comment extends Block {
-
-}
-
-
-
-
-
diff --git a/plugins/org.eclipse.jem/mofjava/org/eclipse/jem/java/Field.java b/plugins/org.eclipse.jem/mofjava/org/eclipse/jem/java/Field.java
deleted file mode 100644
index b3da854..0000000
--- a/plugins/org.eclipse.jem/mofjava/org/eclipse/jem/java/Field.java
+++ /dev/null
@@ -1,174 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2001, 2005 IBM Corporation and others.
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
- *
- * Contributors:
- * IBM Corporation - initial API and implementation
- *******************************************************************************/
-package org.eclipse.jem.java;
-
-/*
-
-
- */
-import org.eclipse.emf.ecore.ETypedElement;
-
-/**
- * @generated
- */
-public interface Field extends ETypedElement{
-
- /**
- * @generated This field/method will be replaced during code generation
- * @return The value of the IsFinal attribute
- */
- boolean isFinal();
-
- /**
- * Sets the value of the '{@link org.eclipse.jem.java.Field#isFinal <em>Final</em>}' attribute.
- * <!-- begin-user-doc -->
- * <!-- end-user-doc -->
- * @param value the new value of the '<em>Final</em>' attribute.
- * @see #isFinal()
- * @generated
- */
- void setFinal(boolean value);
-
- /**
- * @generated This field/method will be replaced during code generation
- * @return The value of the IsStatic attribute
- */
- boolean isStatic();
-
- /**
- * Sets the value of the '{@link org.eclipse.jem.java.Field#isStatic <em>Static</em>}' attribute.
- * <!-- begin-user-doc -->
- * <!-- end-user-doc -->
- * @param value the new value of the '<em>Static</em>' attribute.
- * @see #isStatic()
- * @generated
- */
- void setStatic(boolean value);
-
- /**
- * @generated This field/method will be replaced during code generation
- * @return The value of the JavaVisibility attribute
- */
- JavaVisibilityKind getJavaVisibility();
-
- /**
- * Sets the value of the '{@link org.eclipse.jem.java.Field#getJavaVisibility <em>Java Visibility</em>}' attribute.
- * <!-- begin-user-doc -->
- * <!-- end-user-doc -->
- * @param value the new value of the '<em>Java Visibility</em>' attribute.
- * @see org.eclipse.jem.java.JavaVisibilityKind
- * @see #getJavaVisibility()
- * @generated
- */
- void setJavaVisibility(JavaVisibilityKind value);
-
- /**
- * Returns the value of the '<em><b>Transient</b></em>' attribute.
- * <!-- begin-user-doc -->
- * <p>
- * If the meaning of the '<em>Transient</em>' attribute isn't clear,
- * there really should be more of a description here...
- * </p>
- * <!-- end-user-doc -->
- * @return the value of the '<em>Transient</em>' attribute.
- * @see #setTransient(boolean)
- * @see org.eclipse.jem.java.JavaRefPackage#getField_Transient()
- * @model
- * @generated
- */
- boolean isTransient();
-
- /**
- * Sets the value of the '{@link org.eclipse.jem.java.Field#isTransient <em>Transient</em>}' attribute.
- * <!-- begin-user-doc -->
- * <!-- end-user-doc -->
- * @param value the new value of the '<em>Transient</em>' attribute.
- * @see #isTransient()
- * @generated
- */
- void setTransient(boolean value);
-
- /**
- * Returns the value of the '<em><b>Volatile</b></em>' attribute.
- * <!-- begin-user-doc -->
- * <p>
- * If the meaning of the '<em>Volatile</em>' attribute isn't clear,
- * there really should be more of a description here...
- * </p>
- * <!-- end-user-doc -->
- * @return the value of the '<em>Volatile</em>' attribute.
- * @see #setVolatile(boolean)
- * @see org.eclipse.jem.java.JavaRefPackage#getField_Volatile()
- * @model
- * @generated
- */
- boolean isVolatile();
-
- /**
- * Sets the value of the '{@link org.eclipse.jem.java.Field#isVolatile <em>Volatile</em>}' attribute.
- * <!-- begin-user-doc -->
- * <!-- end-user-doc -->
- * @param value the new value of the '<em>Volatile</em>' attribute.
- * @see #isVolatile()
- * @generated
- */
- void setVolatile(boolean value);
-
- /**
- * @generated This field/method will be replaced during code generation
- * @return The JavaClass reference
- */
- JavaClass getJavaClass();
-
- /**
- * Sets the value of the '{@link org.eclipse.jem.java.Field#getJavaClass <em>Java Class</em>}' container reference.
- * <!-- begin-user-doc -->
- * <!-- end-user-doc -->
- * @param value the new value of the '<em>Java Class</em>' container reference.
- * @see #getJavaClass()
- * @generated
- */
- void setJavaClass(JavaClass value);
-
- /**
- * @generated This field/method will be replaced during code generation
- * @return The Initializer reference
- */
- Block getInitializer();
-
- /**
- * Sets the value of the '{@link org.eclipse.jem.java.Field#getInitializer <em>Initializer</em>}' containment reference.
- * <!-- begin-user-doc -->
- * <!-- end-user-doc -->
- * @param value the new value of the '<em>Initializer</em>' containment reference.
- * @see #getInitializer()
- * @generated
- */
- void setInitializer(Block value);
-
- /**
- * @generated This field/method will be replaced during code generation
- * Get the class that this field is within.
- */
- JavaClass getContainingJavaClass();
-
- /**
- * @generated This field/method will be replaced during code generation
- * Is this field an array type.
- */
- boolean isArray();
-
-}
-
-
-
-
-
diff --git a/plugins/org.eclipse.jem/mofjava/org/eclipse/jem/java/InheritanceCycleException.java b/plugins/org.eclipse.jem/mofjava/org/eclipse/jem/java/InheritanceCycleException.java
deleted file mode 100644
index 24b2fe8..0000000
--- a/plugins/org.eclipse.jem/mofjava/org/eclipse/jem/java/InheritanceCycleException.java
+++ /dev/null
@@ -1,49 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2001, 2005 IBM Corporation and others.
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
- *
- * Contributors:
- * IBM Corporation - initial API and implementation
- *******************************************************************************/
-package org.eclipse.jem.java;
-/*
-
-
- */
-import java.text.MessageFormat;
-
-import org.eclipse.jem.internal.java.adapters.nls.ResourceHandler;
-
-/**
- * @author DABERG
- *
- * To change the template for this generated type comment go to
- * Window>Preferences>Java>Code Generation>Code and Comments
- */
-public class InheritanceCycleException extends Exception {
- /**
- * Comment for <code>serialVersionUID</code>
- *
- * @since 1.1.0
- */
- private static final long serialVersionUID = -2385690847427897656L;
- private static String MSG_PATTERN = ResourceHandler.getString("Java_Inh_Cycle_ERROR_");//$NON-NLS-1$
-
- /**
- *
- */
- public InheritanceCycleException(JavaClass aSubclass, JavaClass aSuperclass) {
- this(MessageFormat.format(MSG_PATTERN, new Object[]{aSubclass.getQualifiedName(), aSuperclass.getQualifiedName()}));
- }
-
- /**
- * @param s
- */
- public InheritanceCycleException(String s) {
- super(s);
- }
-
-}
diff --git a/plugins/org.eclipse.jem/mofjava/org/eclipse/jem/java/Initializer.java b/plugins/org.eclipse.jem/mofjava/org/eclipse/jem/java/Initializer.java
deleted file mode 100644
index 99e8898..0000000
--- a/plugins/org.eclipse.jem/mofjava/org/eclipse/jem/java/Initializer.java
+++ /dev/null
@@ -1,72 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2001, 2005 IBM Corporation and others.
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
- *
- * Contributors:
- * IBM Corporation - initial API and implementation
- *******************************************************************************/
-package org.eclipse.jem.java;
-
-/*
-
-
- */
-import org.eclipse.emf.ecore.EObject;
-/**
- * @generated
- */
-public interface Initializer extends EObject{
-
- /**
- * @generated This field/method will be replaced during code generation
- * @return The value of the IsStatic attribute
- */
- Boolean getIsStatic();
-
- /**
- * @generated This field/method will be replaced during code generation
- * @param value The new value of the IsStatic attribute
- */
- void setIsStatic(Boolean value);
-
- /**
- * @generated This field/method will be replaced during code generation
- * @return The JavaClass reference
- */
- JavaClass getJavaClass();
-
- /**
- * Sets the value of the '{@link org.eclipse.jem.java.Initializer#getJavaClass <em>Java Class</em>}' container reference.
- * <!-- begin-user-doc -->
- * <!-- end-user-doc -->
- * @param value the new value of the '<em>Java Class</em>' container reference.
- * @see #getJavaClass()
- * @generated
- */
- void setJavaClass(JavaClass value);
-
- /**
- * @generated This field/method will be replaced during code generation
- * @return The Source reference
- */
- Block getSource();
-
- /**
- * Sets the value of the '{@link org.eclipse.jem.java.Initializer#getSource <em>Source</em>}' reference.
- * <!-- begin-user-doc -->
- * <!-- end-user-doc -->
- * @param value the new value of the '<em>Source</em>' reference.
- * @see #getSource()
- * @generated
- */
- void setSource(Block value);
-
-}
-
-
-
-
-
diff --git a/plugins/org.eclipse.jem/mofjava/org/eclipse/jem/java/JavaClass.java b/plugins/org.eclipse.jem/mofjava/org/eclipse/jem/java/JavaClass.java
deleted file mode 100644
index 8327ad1..0000000
--- a/plugins/org.eclipse.jem/mofjava/org/eclipse/jem/java/JavaClass.java
+++ /dev/null
@@ -1,420 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2001, 2005 IBM Corporation and others.
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
- *
- * Contributors:
- * IBM Corporation - initial API and implementation
- *******************************************************************************/
-package org.eclipse.jem.java;
-/*
-
-
- */
-import java.util.List;
-
-import org.eclipse.emf.common.util.EList;
-import org.eclipse.emf.ecore.EClass;
-/**
- * <!-- begin-user-doc -->
- * @extends JavaHelpers
- * <!-- end-user-doc -->
- *
- * <p>
- * The following features are supported:
- * <ul>
- * <li>{@link org.eclipse.jem.java.JavaClass#getKind <em>Kind</em>}</li>
- * <li>{@link org.eclipse.jem.java.JavaClass#isPublic <em>Public</em>}</li>
- * <li>{@link org.eclipse.jem.java.JavaClass#isFinal <em>Final</em>}</li>
- * <li>{@link org.eclipse.jem.java.JavaClass#getImplementsInterfaces <em>Implements Interfaces</em>}</li>
- * <li>{@link org.eclipse.jem.java.JavaClass#getClassImport <em>Class Import</em>}</li>
- * <li>{@link org.eclipse.jem.java.JavaClass#getPackageImports <em>Package Imports</em>}</li>
- * <li>{@link org.eclipse.jem.java.JavaClass#getFields <em>Fields</em>}</li>
- * <li>{@link org.eclipse.jem.java.JavaClass#getMethods <em>Methods</em>}</li>
- * <li>{@link org.eclipse.jem.java.JavaClass#getInitializers <em>Initializers</em>}</li>
- * <li>{@link org.eclipse.jem.java.JavaClass#getDeclaredClasses <em>Declared Classes</em>}</li>
- * <li>{@link org.eclipse.jem.java.JavaClass#getDeclaringClass <em>Declaring Class</em>}</li>
- * <li>{@link org.eclipse.jem.java.JavaClass#getJavaPackage <em>Java Package</em>}</li>
- * <li>{@link org.eclipse.jem.java.JavaClass#getEvents <em>Events</em>}</li>
- * <li>{@link org.eclipse.jem.java.JavaClass#getAllEvents <em>All Events</em>}</li>
- * </ul>
- * </p>
- *
- * @see org.eclipse.jem.java.JavaRefPackage#getJavaClass()
- * @model
- * @generated
- */
-public interface JavaClass extends EClass, JavaHelpers{
-
- public static final String DEFAULT_METHOD_NAME = "*";
- /**
- * Return a method matching the name, and non-return parameters with fully qualified types matching all the types in the list, if it exists. It will not look up the supertype hierarchy.
- */
- public Method getPublicMethodExtended(String methodName, List parameterTypes) ;
- /**
- * Returns a filtered list on the methods of this class, having a name equal to that of the parameter.
- */
- public List getPublicMethodsExtendedNamed(String name);
-
- /**
- * Return an array listing our Fields, including inherited fields.
- * The field relationship is derived from contents.
- */
- public Field[] listFieldExtended();
- /**
- * Return an array listing our Methods, including inherited methods.
- * The method relationship is derived from contents.
- */
- public Method[] listMethodExtended();
-//FB /**
-//FB * This is required for internal reflection. Do not use.
-//FB */
-//FB Object primRefValue(EObject feature);
- /**
- * @generated This field/method will be replaced during code generation
- * @return The value of the Kind attribute
- */
- TypeKind getKind();
-
- /**
- * Sets the value of the '{@link org.eclipse.jem.java.JavaClass#getKind <em>Kind</em>}' attribute.
- * <!-- begin-user-doc -->
- * <!-- end-user-doc -->
- * @param value the new value of the '<em>Kind</em>' attribute.
- * @see org.eclipse.jem.java.TypeKind
- * @see #getKind()
- * @generated
- */
- void setKind(TypeKind value);
-
- /**
- * @generated This field/method will be replaced during code generation
- * @return The value of the IsPublic attribute
- */
- boolean isPublic();
-
- /**
- * Sets the value of the '{@link org.eclipse.jem.java.JavaClass#isPublic <em>Public</em>}' attribute.
- * <!-- begin-user-doc -->
- * <!-- end-user-doc -->
- * @param value the new value of the '<em>Public</em>' attribute.
- * @see #isPublic()
- * @generated
- */
- void setPublic(boolean value);
-
- /**
- * @generated This field/method will be replaced during code generation
- * @return The value of the IsFinal attribute
- */
- boolean isFinal();
-
- /**
- * Sets the value of the '{@link org.eclipse.jem.java.JavaClass#isFinal <em>Final</em>}' attribute.
- * <!-- begin-user-doc -->
- * <!-- end-user-doc -->
- * @param value the new value of the '<em>Final</em>' attribute.
- * @see #isFinal()
- * @generated
- */
- void setFinal(boolean value);
-
- /**
- * @generated This field/method will be replaced during code generation
- * @return The list of ImplementsInterfaces references
- */
- EList getImplementsInterfaces();
-
- /**
- * @generated This field/method will be replaced during code generation
- * @return The list of ClassImport references
- */
- EList getClassImport();
-
- /**
- * @generated This field/method will be replaced during code generation
- * @return The list of PackageImports references
- */
- EList getPackageImports();
-
- /**
- * @generated This field/method will be replaced during code generation
- * @return The list of Fields references
- */
- EList getFields();
-
- /**
- * @generated This field/method will be replaced during code generation
- * @return The list of Methods references
- */
- EList getMethods();
-
- /**
- * @generated This field/method will be replaced during code generation
- * @return The list of Initializers references
- */
- EList getInitializers();
-
- /**
- * @generated This field/method will be replaced during code generation
- * @return The DeclaringClass reference
- */
- JavaClass getDeclaringClass();
-
- /**
- * Sets the value of the '{@link org.eclipse.jem.java.JavaClass#getDeclaringClass <em>Declaring Class</em>}' reference.
- * <!-- begin-user-doc -->
- * <!-- end-user-doc -->
- * @param value the new value of the '<em>Declaring Class</em>' reference.
- * @see #getDeclaringClass()
- * @generated
- */
- void setDeclaringClass(JavaClass value);
-
- /**
- * @generated This field/method will be replaced during code generation
- * @return The list of DeclaredClasses references
- */
- EList getDeclaredClasses();
-
- /**
- * @generated This field/method will be replaced during code generation
- * @return The JavaPackage reference
- */
- JavaPackage getJavaPackage();
-
- /**
- * @generated This field/method will be replaced during code generation
- * @return The list of Events references
- */
- EList getEvents();
-
- /**
- * Returns the value of the '<em><b>All Events</b></em>' reference list.
- * The list contents are of type {@link org.eclipse.jem.java.JavaEvent}.
- * <!-- begin-user-doc -->
- * <p>
- * If the meaning of the '<em>All Events</em>' reference list isn't clear,
- * there really should be more of a description here...
- * </p>
- * <!-- end-user-doc -->
- * @return the value of the '<em>All Events</em>' reference list.
- * @see org.eclipse.jem.java.JavaRefPackage#getJavaClass_AllEvents()
- * @model type="org.eclipse.jem.java.JavaEvent" transient="true" volatile="true"
- * @generated
- */
- EList getAllEvents();
-
- /**
- * @generated This field/method will be replaced during code generation
- */
- boolean isNested();
-
- /**
- * @generated This field/method will be replaced during code generation
- * Return an Field with the passed name, or null.
- */
- Field getField(String fieldName);
-
- /**
- * @generated This field/method will be replaced during code generation
- * Return an Field with the passed name from this JavaClass or any supertypes.
- *
- * Return null if a Field named fieldName is not found.
- */
- Field getFieldExtended(String fieldName);
-
- /**
- * @generated This field/method will be replaced during code generation
- * Return an Field with the passed name, or null.
- */
- Field getFieldNamed(String fieldName);
-
- /**
- * @generated This field/method will be replaced during code generation
- * Return all fields, including those from supertypes.
- */
- List getFieldsExtended();
-
- /**
- * @generated This field/method will be replaced during code generation
- * Get the method of this name and these parameters. It will not look up the
- * supertype hierarchy.
- */
- Method getMethod(String methodName, List parameterTypes);
-
- /**
- * @generated This field/method will be replaced during code generation
- * Return a List of Strings that represent MethodElement signatures from most
- * general to most specific.
- */
- List getMethodElementSignatures();
-
- /**
- * @generated This field/method will be replaced during code generation
- * Get the method of this name and these parameters. It will look up the supertype
- * hierarchy.
- */
- Method getMethodExtended(String methodName, List parameterTypes);
-
- /**
- * @generated This field/method will be replaced during code generation
- * Return all methods, including those from supertypes.
- */
- List getMethodsExtended();
-
- /**
- * Return all methods, including those from supertypes excluding particular classes and methods.
- * @param excludedClasses - A list of JavaClass instances to be ignored.
- * @param excludedMethods - A list of Method instances to be ignored.
- */
- List getMethodsExtendedWithFilters(List excludedClasses, List excludedMethods) ;
-
- /**
- * @generated This field/method will be replaced during code generation
- * Return a List of Methods that begins with @aMethodNamePrefix and is not
- * included in the @excludedNames list. If @aMethodNamePrefix is null, all methods
- * will be returned.
-
- */
- List getOnlySpecificMethods(String aMethodNamePrefix, List excludedNames);
-
- /**
- * @generated This field/method will be replaced during code generation
- * Return a method matching the name, and non-return parameters with fully
- * qualified types matching all the types in the list, if it exists. It will not
- * look up the supertype hierarchy.
- */
- Method getPublicMethod(String methodName, List parameterTypes);
-
- /**
- * @generated This field/method will be replaced during code generation
- * Return all methods, it will not go up the supertype hierarchy.
- */
- List getPublicMethods();
-
- /**
- * @generated This field/method will be replaced during code generation
- * Return all public methods, including those from supertypes.
- */
- List getPublicMethodsExtended();
-
- /**
- * @generated This field/method will be replaced during code generation
- * Returns a filtered list on the methods of this class, having a name equal to
- * that of the parameter.
- */
- List getPublicMethodsNamed(String name);
-
- /**
- * @generated This field/method will be replaced during code generation
- */
- JavaClass getSupertype();
-
- /**
- * @generated This field/method will be replaced during code generation
- * Test whether the receiver implements the passed interface (or one of its
- * supertypes).
- */
- boolean implementsInterface(JavaClass interfaceType);
-
- /**
- * @generated This field/method will be replaced during code generation
- * Return a string showing our details.
- */
- String infoString();
-
- /**
- * @generated This field/method will be replaced during code generation
- * Tests whether this class inherits from the passed in class.
- */
- boolean inheritsFrom(JavaClass javaClass);
-
- /**
- * @generated This field/method will be replaced during code generation
- * Does this type exist.
- */
- boolean isExistingType();
-
- /**
- * <!-- begin-user-doc -->
- * <!-- end-user-doc -->
- * <!-- begin-model-doc -->
- * Is this an interface.
- * <!-- end-model-doc -->
- * @model kind="operation"
- * @generated
- */
- boolean isInterface();
-
- /**
- * @generated This field/method will be replaced during code generation
- * Set the supertype.
- */
- void setSupertype(JavaClass javaclass) throws InheritanceCycleException;
-
- /**
- * Return true if the passed JavaClass can be set as the supertype
- * of this JavaClass. This method will test to see if aJavaClass will
- * create a cycle in the inheritance structure. Return true if no
- * inheritance cycle will be created.
- */
- public boolean isValidSupertype(JavaClass aJavaClass) ;
-
- /**
- * Get the EStructuralFeatures that represent the BeanInfo properties for
- * just this Java class, not including inherited. It will return any EStructuralFeature
- * that was specified as being at this class either through the XMI override document or
- * through the BeanInfo. Structural features through the XMI may not be bean properties,
- * but they are part of the features available at this class only.
- *
- * This is a combination of getEAttributes() and getEReferences().
- *
- * To retrieve only the Bean Properties, then use Beaninfo
- * Utilities.getPropertiesIterator(javaclass.getProperties()) and this will iterate over
- * the Bean PropertyDecorators, and filter out the non-bean features.
- *
- * @return The list of properties (as EStructuralFeature's) for this java class. This list is
- * not modifiable.
- */
- EList getProperties();
-
- /**
- * Get all of the EStructuralFeatures that represent the BeanInfo properties for
- * just this Java class, including inherited. It will return any EStructuralFeature
- * that was specified through the XMI override document or
- * through the BeanInfo. Structural features through the XMI may not be bean properties,
- * but they are part of the features available.
- *
- * The is like getEAllStructuralFeatures() except that if BeanInfo hides any bean properties
- * from the super class, this list will also hide them, while getEAllStructuralFeatures
- * will not.
- *
- * To retrieve only the Bean Properties, then use Beaninfo
- * Utilities.getPropertiesIterator(javaclass.getAllProperties()) and this will iterate over
- * the Bean PropertyDecorators, and filter out the non-bean features.
- *
- * @return The list of all properties, including inherited, (as EStructuralFeature's) for this class. This list is
- * not modifiable.
- */
- EList getAllProperties();
-
-
- /**
- * Return the reflection type, if it exists, for this class. If running within Eclipse this
- * will be an {@link org.eclipse.jdt.core.IType}, or running outside of Eclipse it will be a {@link java.lang.Class}.
- *
- * @return IType if in Eclipse, Class if outside Eclipse, or <code>null</code> if type not found.
- *
- * @since 1.1.0
- */
- Object getReflectionType();
-
-}
-
-
-
-
-
diff --git a/plugins/org.eclipse.jem/mofjava/org/eclipse/jem/java/JavaDataType.java b/plugins/org.eclipse.jem/mofjava/org/eclipse/jem/java/JavaDataType.java
deleted file mode 100644
index b5c0b5c..0000000
--- a/plugins/org.eclipse.jem/mofjava/org/eclipse/jem/java/JavaDataType.java
+++ /dev/null
@@ -1,42 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2001, 2005 IBM Corporation and others.
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
- *
- * Contributors:
- * IBM Corporation - initial API and implementation
- *******************************************************************************/
-package org.eclipse.jem.java;
-
-/*
-
-
- */
-import org.eclipse.emf.ecore.EClass;
-
-/**
- * <!-- begin-user-doc -->
- * @extends JavaHelpers
- * <!-- end-user-doc -->
- *
- *
- * @see org.eclipse.jem.java.JavaRefPackage#getJavaDataType()
- * @model
- * @generated
- */
-public interface JavaDataType extends EClass, JavaHelpers{
-
- /**
- * @generated This field/method will be replaced during code generation
- * Return the default string representing the default value of the primitive.
- */
- String getDefaultValueString();
-
-}
-
-
-
-
-
diff --git a/plugins/org.eclipse.jem/mofjava/org/eclipse/jem/java/JavaEvent.java b/plugins/org.eclipse.jem/mofjava/org/eclipse/jem/java/JavaEvent.java
deleted file mode 100644
index e55e95d..0000000
--- a/plugins/org.eclipse.jem/mofjava/org/eclipse/jem/java/JavaEvent.java
+++ /dev/null
@@ -1,29 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2001, 2005 IBM Corporation and others.
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
- *
- * Contributors:
- * IBM Corporation - initial API and implementation
- *******************************************************************************/
-package org.eclipse.jem.java;
-/*
-
-
- */
-import org.eclipse.emf.ecore.EStructuralFeature;
-
-/**
- * <!-- begin-user-doc -->
- * A representation of the model object '<em><b>Java Event</b></em>'.
- * <!-- end-user-doc -->
- *
- *
- * @see org.eclipse.jem.java.JavaRefPackage#getJavaEvent()
- * @model abstract="true"
- * @generated
- */
-public interface JavaEvent extends EStructuralFeature{
-}
diff --git a/plugins/org.eclipse.jem/mofjava/org/eclipse/jem/java/JavaHelpers.java b/plugins/org.eclipse.jem/mofjava/org/eclipse/jem/java/JavaHelpers.java
deleted file mode 100644
index cb2ff14..0000000
--- a/plugins/org.eclipse.jem/mofjava/org/eclipse/jem/java/JavaHelpers.java
+++ /dev/null
@@ -1,120 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2001, 2005 IBM Corporation and others.
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
- *
- * Contributors:
- * IBM Corporation - initial API and implementation
- *******************************************************************************/
-package org.eclipse.jem.java;
-
-/*
-
-
- */
-import org.eclipse.emf.ecore.EClass;
-import org.eclipse.emf.ecore.EClassifier;
-
-/**
- * Insert the type's description here.
- * Creation date: (6/27/2000 4:42:04 PM)
- * @author: Administrator
- */
-public interface JavaHelpers extends EClass {
- static final String BOOLEAN_NAME = "java.lang.Boolean"; //$NON-NLS-1$
- static final String CHARACTER_NAME = "java.lang.Character"; //$NON-NLS-1$
- static final String BYTE_NAME = "java.lang.Byte"; //$NON-NLS-1$
- static final String DOUBLE_NAME = "java.lang.Double"; //$NON-NLS-1$
- static final String FLOAT_NAME = "java.lang.Float"; //$NON-NLS-1$
- static final String INTEGER_NAME = "java.lang.Integer"; //$NON-NLS-1$
- static final String LONG_NAME = "java.lang.Long"; //$NON-NLS-1$
- static final String SHORT_NAME = "java.lang.Short"; //$NON-NLS-1$
- static final String PRIM_BOOLEAN_NAME = "boolean"; //$NON-NLS-1$
- static final String PRIM_CHARACTER_NAME = "char"; //$NON-NLS-1$
- static final String PRIM_BYTE_NAME = "byte"; //$NON-NLS-1$
- static final String PRIM_DOUBLE_NAME = "double"; //$NON-NLS-1$
- static final String PRIM_FLOAT_NAME = "float"; //$NON-NLS-1$
- static final String PRIM_INTEGER_NAME = "int"; //$NON-NLS-1$
- static final String PRIM_LONG_NAME = "long"; //$NON-NLS-1$
- static final String PRIM_SHORT_NAME = "short"; //$NON-NLS-1$
-
- static final int PRIM_NOT_ID = 0;
- static final int PRIM_BOOLEAN_ID = 1;
- static final int PRIM_CHARACTER_ID = 2;
- static final int PRIM_BYTE_ID = 3;
- static final int PRIM_DOUBLE_ID = 4;
- static final int PRIM_FLOAT_ID = 5;
- static final int PRIM_INTEGER_ID = 6;
- static final int PRIM_LONG_ID = 7;
- static final int PRIM_SHORT_ID = 8;
-
- /**
- * Get the qualified name (with using '.' for inner classes). Will return the name if primitive too (e.g. "boolean")
- * Note: This should of been get the simple name and not the qualifed name, but it is too late and has been established
- * as the API. Use <code>getSimpleName()</code> instead if you want the name not qualified.
- * @return the qualified name of the type.
- * @see JavaHelpers#getSimpleName()
- * @since 1.0.0
- */
- public String getJavaName();
- /**
- * Get the simple name. This is the name of the primitive, or if a class, the name without the package. And if it is an
- * inner class, it will use '.' instead of '$'. If you want the simple name for reflection (i.e. with '$') use <code>getName()</code>.
- * @return the simple name (no package) of the type.
- *
- * @since 1.0.0
- */
- public String getSimpleName();
-
- /**
- * Get the primitive type that this helper wrappers or is (e.g. "java.lang.Integer" and "int" types return "int" type). If not a primitive
- * or a wrapper for a primitive, then return null.
- * @return
- *
- * @since 1.0.0
- */
- public JavaDataType getPrimitive();
-
- /**
- * Get the primitive id that this helper wrappers or is (e.g. "java.lang.Integer" and "int" will return {@link JavaHelpers#PRIM_INTEGER_ID}). If
- * not a wrapper for a primitive then return {@link JavaHelpers#PRIM_NOT_ID}.
- * @return
- *
- * @since 1.1.0
- */
- public int getPrimitiveID();
- /**
- * To be used by people that need to get the qualified name. This would use '.' for inner classes
- * and include the package name.
- * @return the qualified name, including package.
- *
- * @since 1.0.0
- */
- public String getQualifiedName();
- public JavaClass getWrapper();
- public boolean isArray();
- /**
- * Can an object of the passed in class be assigned to an
- * object of this class? In other words is this class a
- * supertype of the passed in class, or is it superinterface
- * of it? Or in the case of primitives, are they the same.
- * @param aClass
- * @return <code>true</code> if assignable from the given class.
- *
- * @since 1.0.0
- */
- public boolean isAssignableFrom(EClassifier aClass);
- public boolean isPrimitive();
-
- /**
- * To be used by people that need to get the qualified name used for reflection. This would use '$' instead of '.' for inner classes
- * and include the package name.
- * Typically bean info would need to use something like this.
- * @return the qualified name, use '$' for inner classes
- *
- * @since 1.0.0
- */
- public String getQualifiedNameForReflection() ;
-}
diff --git a/plugins/org.eclipse.jem/mofjava/org/eclipse/jem/java/JavaPackage.java b/plugins/org.eclipse.jem/mofjava/org/eclipse/jem/java/JavaPackage.java
deleted file mode 100644
index 8d7c374..0000000
--- a/plugins/org.eclipse.jem/mofjava/org/eclipse/jem/java/JavaPackage.java
+++ /dev/null
@@ -1,41 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2001, 2005 IBM Corporation and others.
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
- *
- * Contributors:
- * IBM Corporation - initial API and implementation
- *******************************************************************************/
-package org.eclipse.jem.java;
-/*
-
-
- */
-
-import org.eclipse.emf.common.util.EList;
-import org.eclipse.emf.ecore.EPackage;
-
-public interface JavaPackage extends EPackage{
-
- public static final String PACKAGE_ID = "*package"; // The id (the part that goes after the '#' for a java package.) //$NON-NLS-1$
- // There will only be one package per java resource so it
- // can be unique. No java types, methods, fields ids can
- // start with an asterick so will be unique.
-
- public static final String PRIMITIVE_PACKAGE_NAME = "_-javaprim"; //$NON-NLS-1$
- /**
- * @generated This field/method will be replaced during code generation
- * @return The list of JavaClasses references
- */
- EList getJavaClasses();
-
- public String getPackageName() ;
-
-} //JavaPackage
-
-
-
-
-
diff --git a/plugins/org.eclipse.jem/mofjava/org/eclipse/jem/java/JavaParameter.java b/plugins/org.eclipse.jem/mofjava/org/eclipse/jem/java/JavaParameter.java
deleted file mode 100644
index 27f42dc..0000000
--- a/plugins/org.eclipse.jem/mofjava/org/eclipse/jem/java/JavaParameter.java
+++ /dev/null
@@ -1,85 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2001, 2005 IBM Corporation and others.
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
- *
- * Contributors:
- * IBM Corporation - initial API and implementation
- *******************************************************************************/
-package org.eclipse.jem.java;
-
-/*
-
-
- */
-
-import org.eclipse.emf.ecore.EParameter;
-
-/**
- * @generated
- */
-public interface JavaParameter extends EParameter {
-
- /**
- * @generated This field/method will be replaced during code generation
- * @return The value of the IsFinal attribute
- */
- boolean isFinal();
-
- /**
- * Sets the value of the '{@link org.eclipse.jem.java.JavaParameter#isFinal <em>Final</em>}' attribute.
- * <!-- begin-user-doc -->
- * <!-- end-user-doc -->
- * @param value the new value of the '<em>Final</em>' attribute.
- * @see #isFinal()
- * @generated
- */
- void setFinal(boolean value);
-
- /**
- * @generated This field/method will be replaced during code generation
- * @return The value of the ParameterKind attribute
- */
- JavaParameterKind getParameterKind();
-
- /**
- * Sets the value of the '{@link org.eclipse.jem.java.JavaParameter#getParameterKind <em>Parameter Kind</em>}' attribute.
- * <!-- begin-user-doc -->
- * <!-- end-user-doc -->
- * @param value the new value of the '<em>Parameter Kind</em>' attribute.
- * @see org.eclipse.jem.java.JavaParameterKind
- * @see #getParameterKind()
- * @generated
- */
- void setParameterKind(JavaParameterKind value);
-
- /**
- * @generated This field/method will be replaced during code generation
- * Is this parameter type an array type.
- */
- boolean isArray();
-
- /**
- * @generated This field/method will be replaced during code generation
- * Is this a return parameter.
- */
- boolean isReturn();
-
- /**
- * @generated This field/method will be replaced during code generation
- */
- JavaHelpers getJavaType();
-
- /**
- * @generated This field/method will be replaced during code generation
- */
- String getQualifiedName();
-
-}
-
-
-
-
-
diff --git a/plugins/org.eclipse.jem/mofjava/org/eclipse/jem/java/JavaParameterKind.java b/plugins/org.eclipse.jem/mofjava/org/eclipse/jem/java/JavaParameterKind.java
deleted file mode 100644
index e3c24e9..0000000
--- a/plugins/org.eclipse.jem/mofjava/org/eclipse/jem/java/JavaParameterKind.java
+++ /dev/null
@@ -1,218 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2001, 2005 IBM Corporation and others.
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
- *
- * Contributors:
- * IBM Corporation - initial API and implementation
- *******************************************************************************/
-package org.eclipse.jem.java;
-
-/*
-
-
- */
-import java.util.Arrays;
-import java.util.Collections;
-import java.util.List;
-
-import org.eclipse.emf.common.util.AbstractEnumerator;
-
-/**
- * <!-- begin-user-doc -->
- * A representation of the literals of the enumeration '<em><b>Java Parameter Kind</b></em>',
- * and utility methods for working with them.
- * <!-- end-user-doc -->
- * <!-- begin-model-doc -->
- * IN=0
- * OUT=1
- * INOUT=2
- * RETURN=3
- * <!-- end-model-doc -->
- * @see org.eclipse.jem.java.JavaRefPackage#getJavaParameterKind()
- * @model
- * @generated
- */
-public final class JavaParameterKind extends AbstractEnumerator
-{
- /**
- * The '<em><b>IN</b></em>' literal value.
- * <!-- begin-user-doc -->
- * <!-- end-user-doc -->
- * @see #IN_LITERAL
- * @model
- * @generated
- * @ordered
- */
- public static final int IN = 0;
- /**
- * The '<em><b>OUT</b></em>' literal value.
- * <!-- begin-user-doc -->
- * <!-- end-user-doc -->
- * @see #OUT_LITERAL
- * @model
- * @generated
- * @ordered
- */
- public static final int OUT = 1;
- /**
- * The '<em><b>INOUT</b></em>' literal value.
- * <!-- begin-user-doc -->
- * <!-- end-user-doc -->
- * @see #INOUT_LITERAL
- * @model
- * @generated
- * @ordered
- */
- public static final int INOUT = 2;
- /**
- * The '<em><b>RETURN</b></em>' literal value.
- * <!-- begin-user-doc -->
- * <!-- end-user-doc -->
- * @see #RETURN_LITERAL
- * @model
- * @generated
- * @ordered
- */
- public static final int RETURN = 3;
- /**
- * The '<em><b>IN</b></em>' literal object.
- * <!-- begin-user-doc -->
- * <p>
- * If the meaning of '<em><b>IN</b></em>' literal object isn't clear,
- * there really should be more of a description here...
- * </p>
- * <!-- end-user-doc -->
- * @see #IN
- * @generated
- * @ordered
- */
- public static final JavaParameterKind IN_LITERAL = new JavaParameterKind(IN, "IN", "IN");
-
- /**
- * The '<em><b>OUT</b></em>' literal object.
- * <!-- begin-user-doc -->
- * <p>
- * If the meaning of '<em><b>OUT</b></em>' literal object isn't clear,
- * there really should be more of a description here...
- * </p>
- * <!-- end-user-doc -->
- * @see #OUT
- * @generated
- * @ordered
- */
- public static final JavaParameterKind OUT_LITERAL = new JavaParameterKind(OUT, "OUT", "OUT");
-
- /**
- * The '<em><b>INOUT</b></em>' literal object.
- * <!-- begin-user-doc -->
- * <p>
- * If the meaning of '<em><b>INOUT</b></em>' literal object isn't clear,
- * there really should be more of a description here...
- * </p>
- * <!-- end-user-doc -->
- * @see #INOUT
- * @generated
- * @ordered
- */
- public static final JavaParameterKind INOUT_LITERAL = new JavaParameterKind(INOUT, "INOUT", "INOUT");
-
- /**
- * The '<em><b>RETURN</b></em>' literal object.
- * <!-- begin-user-doc -->
- * <p>
- * If the meaning of '<em><b>RETURN</b></em>' literal object isn't clear,
- * there really should be more of a description here...
- * </p>
- * <!-- end-user-doc -->
- * @see #RETURN
- * @generated
- * @ordered
- */
- public static final JavaParameterKind RETURN_LITERAL = new JavaParameterKind(RETURN, "RETURN", "RETURN");
-
- /**
- * An array of all the '<em><b>Java Parameter Kind</b></em>' enumerators.
- * <!-- begin-user-doc -->
- * <!-- end-user-doc -->
- * @generated
- */
- private static final JavaParameterKind[] VALUES_ARRAY =
- new JavaParameterKind[] {
- IN_LITERAL,
- OUT_LITERAL,
- INOUT_LITERAL,
- RETURN_LITERAL,
- };
-
- /**
- * A public read-only list of all the '<em><b>Java Parameter Kind</b></em>' enumerators.
- * <!-- begin-user-doc -->
- * <!-- end-user-doc -->
- * @generated
- */
- public static final List VALUES = Collections.unmodifiableList(Arrays.asList(VALUES_ARRAY));
-
- /**
- * Returns the '<em><b>Java Parameter Kind</b></em>' literal with the specified literal value.
- * <!-- begin-user-doc -->
- * <!-- end-user-doc -->
- * @generated
- */
- public static JavaParameterKind get(String literal) {
- for (int i = 0; i < VALUES_ARRAY.length; ++i) {
- JavaParameterKind result = VALUES_ARRAY[i];
- if (result.toString().equals(literal)) {
- return result;
- }
- }
- return null;
- }
-
- /**
- * Returns the '<em><b>Java Parameter Kind</b></em>' literal with the specified name.
- * <!-- begin-user-doc -->
- * <!-- end-user-doc -->
- * @generated
- */
- public static JavaParameterKind getByName(String name) {
- for (int i = 0; i < VALUES_ARRAY.length; ++i) {
- JavaParameterKind result = VALUES_ARRAY[i];
- if (result.getName().equals(name)) {
- return result;
- }
- }
- return null;
- }
-
- /**
- * Returns the '<em><b>Java Parameter Kind</b></em>' literal with the specified integer value.
- * <!-- begin-user-doc -->
- * <!-- end-user-doc -->
- * @generated
- */
- public static JavaParameterKind get(int value) {
- switch (value) {
- case IN: return IN_LITERAL;
- case OUT: return OUT_LITERAL;
- case INOUT: return INOUT_LITERAL;
- case RETURN: return RETURN_LITERAL;
- }
- return null;
- }
-
- /**
- * Only this class can construct instances.
- * <!-- begin-user-doc -->
- * <!-- end-user-doc -->
- * @generated
- */
- private JavaParameterKind(int value, String name, String literal) {
- super(value, name, literal);
- }
-
-} //JavaParameterKind
-
-
diff --git a/plugins/org.eclipse.jem/mofjava/org/eclipse/jem/java/JavaRefFactory.java b/plugins/org.eclipse.jem/mofjava/org/eclipse/jem/java/JavaRefFactory.java
deleted file mode 100644
index b561b32..0000000
--- a/plugins/org.eclipse.jem/mofjava/org/eclipse/jem/java/JavaRefFactory.java
+++ /dev/null
@@ -1,274 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2001, 2006 IBM Corporation and others.
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
- *
- * Contributors:
- * IBM Corporation - initial API and implementation
- *******************************************************************************/
-package org.eclipse.jem.java;
-
-/*
-
-
- */
-
-import org.eclipse.emf.common.util.URI;
-import org.eclipse.emf.ecore.EFactory;
-import org.eclipse.emf.ecore.EObject;
-import org.eclipse.emf.ecore.resource.ResourceSet;
-/**
- * @generated
- */
-public interface JavaRefFactory extends EFactory {
-
- /**
- * The singleton instance of the factory.
- * <!-- begin-user-doc -->
- * <!-- end-user-doc -->
- * @generated
- */
- JavaRefFactory eINSTANCE = org.eclipse.jem.java.internal.impl.JavaRefFactoryImpl.init();
-
-
- /**
- * Create a proxy reference to the class name.
- * @param targetName Classname to create a proxy reference to. This must be fully-qualified.
- * @return A proxy reference
- *
- * @since 1.0.0
- */
- public JavaClass createClassRef(String targetName);
-
- /**
- * reflect - reflect a java type (class or primitive) for a given qualified name.
- * <p>If the package or type does not exist, one will be created through
- * the reflection mechanism.
- * <p>Lookup the JavaClass in the context of the passed object, handling some error cases.
- * @param aQualifiedName Fully qualified name of class or primitive (e.g. <code>java.lang.Object</code> or <code>int</code>
- * @param relatedObject EObject that it will be related too (it will look through the resource set's project of the EObject)
- * @return The type. <code>null</code> if name is not of correct format, relatedObject is not contained by a resource set, or resource set is not associated with a project.
- *
- * @since 1.0.0
- */
- public JavaHelpers reflectType(String aQualifiedName, EObject relatedObject);
-
-
- /**
- * reflect - reflect a java type (class or primitive) for a given qualified name.
- * <p>If the package or class does not exist, one will be created through
- * the reflection mechanism.
- * @param aQualifiedName Fully qualified name of class or primitive (e.g. <code>java.lang.Object</code> or <code>int</code>.
- * @param set Resource set to use. Its project will be used to find the type.
- * @return The type. <code>null</code> if name is not of correct format, or resource set is not associated with a project.
- *
- * @since 1.0.0
- */
- public JavaHelpers reflectType(String aQualifiedName, ResourceSet set);
-
-
- /**
- * reflect - reflect a type for a given package name and class name.
- * <p>If the package or class does not exist, one will be created through
- * the reflection mechanism.
- * @param aPackageName Package name
- * @param aTypeName Type name
- * @param set Resource set to use. Its project will be used to find the type.
- * @return The type. <code>null</code> if name is not of correct format, or resource set is not associated with a project.
- *
- * @since 1.0.0
- */
- public JavaHelpers reflectType(String aPackageName, String aTypeName, ResourceSet set);
-
- /**
- * reflect - reflect a Java package for a given package name.
- * <p>If the package does not exist, one will be created through
- * the reflection mechanism.
- * @param packageName Name of package
- * @param set Resource set to use. Its project will be used to find the package.
- * @return The package. <code>null</code> if name is not of correct format, or resource set is not associated with a project.
- *
- * @since 1.0.0
- */
- public JavaPackage reflectPackage(String packageName, ResourceSet set);
-
- /**
- * The scheme for a java URI.
- *
- * @since 1.2.0
- */
- public static final String JAVA_PROTOCOL_URI_SCHEME = "java"; //$NON-NLS-1$
-
- /**
- * Create the URI for accessing a type through {@link ResourceSet#getEObject(URI, boolean)}.
- * @param aQualifiedName
- * @return
- *
- * @since 1.2.0
- */
- public URI createTypeURI(String aQualifiedName);
-
- /**
- * Create the URI for accessing a type through {@link ResourceSet#getEObject(URI, boolean)}.
- * @param packageName package name (may be <code>null</code> or <code>""</code> for primitives or default package)
- * @param typeName type name
- * @return
- *
- * @since 1.2.0
- */
- public URI createTypeURI(String packageName, String typeName);
-
- /**
- * Create the URI for accessing a package through {@link ResourceSet#getEObject(URI, boolean)}.
- * @param packageName package name (may be <code>null</code> or <code>""</code> for primitives or default package)
- * @return
- *
- * @since 1.2.0
- */
- public URI createPackageURI(String packageName);
-
- /**
- * Get just the type name without the package name.
- * @param typeURI
- * @return the type name or <code>""</code> if not a valid type URI
- *
- * @throws IllegalArgumentException if not a valid type URI
- * @since 1.2.0
- */
- public String getTypeName(URI typeURI);
-
- /**
- * Get just the package name.
- * @param javaURI either a type or a package URI.
- * @return package name or <code>""</code> if default package or primitive.
- *
- * @throws IllegalArgumentException if not a valid package or type URI
- * @since 1.2.0
- */
- public String getPackageName(URI javaURI);
-
- /**
- * Get the fully qualified type name.
- * @param typeURI
- * @return fully qualified name or <code>""</code> if not a valid type URI
- *
- * @throws IllegalArgumentException if not a valid type URI
- * @since 1.2.0
- */
- public String getFullTypeName(URI typeURI);
-
- /**
- * Is this a valid java uri.
- * @param uri
- * @return
- *
- * @since 1.2.0
- */
- public boolean isJavaURI(URI uri);
-
- /**
- * Is this a valid type uri.
- * @param uri
- * @return
- *
- * @since 1.2.0
- */
- public boolean isTypeURI(URI uri);
-
- /**
- * Is this a valid package uri.
- * @param uri
- * @return
- *
- * @since 1.2.0
- */
- public boolean isPackageURI(URI uri);
-
- /**
- * @return ArrayType value with an array of the component type
- */
- public ArrayType createArrayType(JavaHelpers componentType);
- /**
- * @return ArrayType value with an array of the specified dimensions and final component type.
- */
- public ArrayType createArrayType(JavaHelpers finalComponentType, int dimensions);
- /**
- * @generated This field/method will be replaced during code generation
- * @return Method value
- */
- Method createMethod();
-
- /**
- * @generated This field/method will be replaced during code generation
- * @return JavaClass value
- */
- JavaClass createJavaClass();
-
- /**
- * @generated This field/method will be replaced during code generation
- * @return Field value
- */
- Field createField();
-
- /**
- * @generated This field/method will be replaced during code generation
- * @return Block value
- */
- Block createBlock();
-
- /**
- * @generated This field/method will be replaced during code generation
- * @return Comment value
- */
- Comment createComment();
-
- /**
- * @generated This field/method will be replaced during code generation
- * @return Statement value
- */
- Statement createStatement();
-
- /**
- * @generated This field/method will be replaced during code generation
- * @return Initializer value
- */
- Initializer createInitializer();
-
- /**
- * @generated This field/method will be replaced during code generation
- * @return JavaParameter value
- */
- JavaParameter createJavaParameter();
-
- /**
- * @generated This field/method will be replaced during code generation
- * @return ArrayType value
- */
- ArrayType createArrayType();
-
- /**
- * @generated This field/method will be replaced during code generation
- * @return JavaDataType value
- */
- JavaDataType createJavaDataType();
-
- /**
- * @generated This field/method will be replaced during code generation
- * @return JavaPackage value
- */
- JavaPackage createJavaPackage();
-
- /**
- * @generated This field/method will be replaced during code generation.
- */
- JavaRefPackage getJavaRefPackage();
-
-}
-
-
-
-
-
-
diff --git a/plugins/org.eclipse.jem/mofjava/org/eclipse/jem/java/JavaRefPackage.java b/plugins/org.eclipse.jem/mofjava/org/eclipse/jem/java/JavaRefPackage.java
deleted file mode 100644
index 2a3af4b..0000000
--- a/plugins/org.eclipse.jem/mofjava/org/eclipse/jem/java/JavaRefPackage.java
+++ /dev/null
@@ -1,2663 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2001, 2005 IBM Corporation and others.
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
- *
- * Contributors:
- * IBM Corporation - initial API and implementation
- *******************************************************************************/
-package org.eclipse.jem.java;
-/*
-
-
- */
-import org.eclipse.emf.ecore.EAttribute;
-import org.eclipse.emf.ecore.EClass;
-import org.eclipse.emf.ecore.EDataType;
-import org.eclipse.emf.ecore.EEnum;
-import org.eclipse.emf.ecore.EPackage;
-import org.eclipse.emf.ecore.EReference;
-import org.eclipse.emf.ecore.EcorePackage;
-
-
-/**
- * @lastgen interface JavaRefPackage extends EPackage {}
- */
-public interface JavaRefPackage extends EPackage {
- /**
- * The package name.
- * <!-- begin-user-doc -->
- * <!-- end-user-doc -->
- * @generated
- */
- String eNAME = "java";
-
- /**
- * @generated This field/method will be replaced during code generation.
- */
- int JAVA_CLASS = 0;
- /**
- * The feature id for the '<em><b>EAnnotations</b></em>' containment reference list.
- * <!-- begin-user-doc -->
- * <!-- end-user-doc -->
- * @generated
- * @ordered
- */
- int JAVA_CLASS__EANNOTATIONS = EcorePackage.ECLASS__EANNOTATIONS;
-
- /**
- * @generated This field/method will be replaced during code generation.
- */
- int JAVA_CLASS__NAME = EcorePackage.ECLASS__NAME;
- /**
- * The feature id for the '<em><b>Instance Class Name</b></em>' attribute.
- * <!-- begin-user-doc -->
- * <!-- end-user-doc -->
- * @generated
- * @ordered
- */
- int JAVA_CLASS__INSTANCE_CLASS_NAME = EcorePackage.ECLASS__INSTANCE_CLASS_NAME;
-
- /**
- * @generated This field/method will be replaced during code generation.
- */
- int JAVA_CLASS__INSTANCE_CLASS = EcorePackage.ECLASS__INSTANCE_CLASS;
- /**
- * The feature id for the '<em><b>Default Value</b></em>' attribute.
- * <!-- begin-user-doc -->
- * <!-- end-user-doc -->
- * @generated
- * @ordered
- */
- int JAVA_CLASS__DEFAULT_VALUE = EcorePackage.ECLASS__DEFAULT_VALUE;
-
- /**
- * The feature id for the '<em><b>Instance Type Name</b></em>' attribute.
- * <!-- begin-user-doc -->
- * <!-- end-user-doc -->
- * @generated
- * @ordered
- */
- int JAVA_CLASS__INSTANCE_TYPE_NAME = EcorePackage.ECLASS__INSTANCE_TYPE_NAME;
-
- /**
- * The feature id for the '<em><b>EPackage</b></em>' container reference.
- * <!-- begin-user-doc -->
- * <!-- end-user-doc -->
- * @generated
- * @ordered
- */
- int JAVA_CLASS__EPACKAGE = EcorePackage.ECLASS__EPACKAGE;
-
- /**
- * The feature id for the '<em><b>EType Parameters</b></em>' containment reference list.
- * <!-- begin-user-doc -->
- * <!-- end-user-doc -->
- * @generated
- * @ordered
- */
- int JAVA_CLASS__ETYPE_PARAMETERS = EcorePackage.ECLASS__ETYPE_PARAMETERS;
-
- /**
- * The feature id for the '<em><b>Abstract</b></em>' attribute.
- * <!-- begin-user-doc -->
- * <!-- end-user-doc -->
- * @generated
- * @ordered
- */
- int JAVA_CLASS__ABSTRACT = EcorePackage.ECLASS__ABSTRACT;
-
- /**
- * The feature id for the '<em><b>Interface</b></em>' attribute.
- * <!-- begin-user-doc -->
- * <!-- end-user-doc -->
- * @generated
- * @ordered
- */
- int JAVA_CLASS__INTERFACE = EcorePackage.ECLASS__INTERFACE;
-
- /**
- * The feature id for the '<em><b>ESuper Types</b></em>' reference list.
- * <!-- begin-user-doc -->
- * <!-- end-user-doc -->
- * @generated
- * @ordered
- */
- int JAVA_CLASS__ESUPER_TYPES = EcorePackage.ECLASS__ESUPER_TYPES;
-
- /**
- * The feature id for the '<em><b>EOperations</b></em>' containment reference list.
- * <!-- begin-user-doc -->
- * <!-- end-user-doc -->
- * @generated
- * @ordered
- */
- int JAVA_CLASS__EOPERATIONS = EcorePackage.ECLASS__EOPERATIONS;
-
- /**
- * The feature id for the '<em><b>EAll Attributes</b></em>' reference list.
- * <!-- begin-user-doc -->
- * <!-- end-user-doc -->
- * @generated
- * @ordered
- */
- int JAVA_CLASS__EALL_ATTRIBUTES = EcorePackage.ECLASS__EALL_ATTRIBUTES;
-
- /**
- * The feature id for the '<em><b>EAll References</b></em>' reference list.
- * <!-- begin-user-doc -->
- * <!-- end-user-doc -->
- * @generated
- * @ordered
- */
- int JAVA_CLASS__EALL_REFERENCES = EcorePackage.ECLASS__EALL_REFERENCES;
-
- /**
- * The feature id for the '<em><b>EReferences</b></em>' reference list.
- * <!-- begin-user-doc -->
- * <!-- end-user-doc -->
- * @generated
- * @ordered
- */
- int JAVA_CLASS__EREFERENCES = EcorePackage.ECLASS__EREFERENCES;
-
- /**
- * The feature id for the '<em><b>EAttributes</b></em>' reference list.
- * <!-- begin-user-doc -->
- * <!-- end-user-doc -->
- * @generated
- * @ordered
- */
- int JAVA_CLASS__EATTRIBUTES = EcorePackage.ECLASS__EATTRIBUTES;
-
- /**
- * The feature id for the '<em><b>EAll Containments</b></em>' reference list.
- * <!-- begin-user-doc -->
- * <!-- end-user-doc -->
- * @generated
- * @ordered
- */
- int JAVA_CLASS__EALL_CONTAINMENTS = EcorePackage.ECLASS__EALL_CONTAINMENTS;
-
- /**
- * The feature id for the '<em><b>EAll Operations</b></em>' reference list.
- * <!-- begin-user-doc -->
- * <!-- end-user-doc -->
- * @generated
- * @ordered
- */
- int JAVA_CLASS__EALL_OPERATIONS = EcorePackage.ECLASS__EALL_OPERATIONS;
-
- /**
- * The feature id for the '<em><b>EAll Structural Features</b></em>' reference list.
- * <!-- begin-user-doc -->
- * <!-- end-user-doc -->
- * @generated
- * @ordered
- */
- int JAVA_CLASS__EALL_STRUCTURAL_FEATURES = EcorePackage.ECLASS__EALL_STRUCTURAL_FEATURES;
-
- /**
- * The feature id for the '<em><b>EAll Super Types</b></em>' reference list.
- * <!-- begin-user-doc -->
- * <!-- end-user-doc -->
- * @generated
- * @ordered
- */
- int JAVA_CLASS__EALL_SUPER_TYPES = EcorePackage.ECLASS__EALL_SUPER_TYPES;
-
- /**
- * The feature id for the '<em><b>EID Attribute</b></em>' reference.
- * <!-- begin-user-doc -->
- * <!-- end-user-doc -->
- * @generated
- * @ordered
- */
- int JAVA_CLASS__EID_ATTRIBUTE = EcorePackage.ECLASS__EID_ATTRIBUTE;
-
- /**
- * The feature id for the '<em><b>EStructural Features</b></em>' containment reference list.
- * <!-- begin-user-doc -->
- * <!-- end-user-doc -->
- * @generated
- * @ordered
- */
- int JAVA_CLASS__ESTRUCTURAL_FEATURES = EcorePackage.ECLASS__ESTRUCTURAL_FEATURES;
-
- /**
- * The feature id for the '<em><b>EGeneric Super Types</b></em>' containment reference list.
- * <!-- begin-user-doc -->
- * <!-- end-user-doc -->
- * @generated
- * @ordered
- */
- int JAVA_CLASS__EGENERIC_SUPER_TYPES = EcorePackage.ECLASS__EGENERIC_SUPER_TYPES;
-
- /**
- * The feature id for the '<em><b>EAll Generic Super Types</b></em>' reference list.
- * <!-- begin-user-doc -->
- * <!-- end-user-doc -->
- * @generated
- * @ordered
- */
- int JAVA_CLASS__EALL_GENERIC_SUPER_TYPES = EcorePackage.ECLASS__EALL_GENERIC_SUPER_TYPES;
-
- /**
- * @generated This field/method will be replaced during code generation.
- */
- int JAVA_CLASS__KIND = EcorePackage.ECLASS_FEATURE_COUNT + 0;
- /**
- * The feature id for the '<em><b>Public</b></em>' attribute.
- * <!-- begin-user-doc -->
- * <!-- end-user-doc -->
- * @generated
- * @ordered
- */
- int JAVA_CLASS__PUBLIC = EcorePackage.ECLASS_FEATURE_COUNT + 1;
-
- /**
- * The feature id for the '<em><b>Final</b></em>' attribute.
- * <!-- begin-user-doc -->
- * <!-- end-user-doc -->
- * @generated
- * @ordered
- */
- int JAVA_CLASS__FINAL = EcorePackage.ECLASS_FEATURE_COUNT + 2;
-
- /**
- * @generated This field/method will be replaced during code generation.
- */
- int JAVA_CLASS__IMPLEMENTS_INTERFACES = EcorePackage.ECLASS_FEATURE_COUNT + 3;
- /**
- * @generated This field/method will be replaced during code generation.
- */
- int JAVA_CLASS__CLASS_IMPORT = EcorePackage.ECLASS_FEATURE_COUNT + 4;
- /**
- * @generated This field/method will be replaced during code generation.
- */
- int JAVA_CLASS__PACKAGE_IMPORTS = EcorePackage.ECLASS_FEATURE_COUNT + 5;
- /**
- * @generated This field/method will be replaced during code generation.
- */
- int JAVA_CLASS__FIELDS = EcorePackage.ECLASS_FEATURE_COUNT + 6;
- /**
- * @generated This field/method will be replaced during code generation.
- */
- int JAVA_CLASS__METHODS = EcorePackage.ECLASS_FEATURE_COUNT + 7;
- /**
- * @generated This field/method will be replaced during code generation.
- */
- int JAVA_CLASS__INITIALIZERS = EcorePackage.ECLASS_FEATURE_COUNT + 8;
- /**
- * @generated This field/method will be replaced during code generation.
- */
- int JAVA_CLASS__DECLARED_CLASSES = EcorePackage.ECLASS_FEATURE_COUNT + 9;
- /**
- * @generated This field/method will be replaced during code generation.
- */
- int JAVA_CLASS__DECLARING_CLASS = EcorePackage.ECLASS_FEATURE_COUNT + 10;
- /**
- * @generated This field/method will be replaced during code generation.
- */
- int JAVA_CLASS__JAVA_PACKAGE = EcorePackage.ECLASS_FEATURE_COUNT + 11;
- /**
- * @generated This field/method will be replaced during code generation.
- */
- int JAVA_CLASS__EVENTS = EcorePackage.ECLASS_FEATURE_COUNT + 12;
- /**
- * @generated This field/method will be replaced during code generation.
- */
- int JAVA_CLASS__ALL_EVENTS = EcorePackage.ECLASS_FEATURE_COUNT + 13;
- /**
- * The number of structural features of the '<em>Java Class</em>' class.
- * <!-- begin-user-doc -->
- * <!-- end-user-doc -->
- * @generated
- * @ordered
- */
- int JAVA_CLASS_FEATURE_COUNT = EcorePackage.ECLASS_FEATURE_COUNT + 14;
-
- /**
- * @generated This field/method will be replaced during code generation.
- */
- int FIELD = 4;
- /**
- * @generated This field/method will be replaced during code generation.
- */
- int METHOD = 3;
- /**
- * @generated This field/method will be replaced during code generation.
- */
- int JAVA_PARAMETER = 2;
- /**
- * @generated This field/method will be replaced during code generation.
- */
-
-
- /**
- * @generated This field/method will be replaced during code generation.
- */
- int ARRAY_TYPE = 10;
- /**
- * @generated This field/method will be replaced during code generation.
- */
- int JAVA_DATA_TYPE = 9;
- /**
- * @generated This field/method will be replaced during code generation.
- */
- int JAVA_EVENT = 11;
- /**
- * @generated This field/method will be replaced during code generation.
- */
- int JAVA_PACKAGE = 8;
- /**
- * @generated This field/method will be replaced during code generation.
- */
- int BLOCK = 5;
- /**
- * @generated This field/method will be replaced during code generation.
- */
- int COMMENT = 6;
- /**
- * @generated This field/method will be replaced during code generation.
- */
- int STATEMENT = 7;
- /**
- * @generated This field/method will be replaced during code generation.
- */
- int INITIALIZER = 1;
- /**
- * @generated This field/method will be replaced during code generation.
- */
- int INITIALIZER__IS_STATIC = 0;
- /**
- * @generated This field/method will be replaced during code generation.
- */
- int INITIALIZER__JAVA_CLASS = 1;
- /**
- * @generated This field/method will be replaced during code generation.
- */
- int INITIALIZER__SOURCE = 2;
-
- /**
- * The number of structural features of the '<em>Initializer</em>' class.
- * <!-- begin-user-doc -->
- * <!-- end-user-doc -->
- * @generated
- * @ordered
- */
- int INITIALIZER_FEATURE_COUNT = 3;
-
- /**
- * The feature id for the '<em><b>EAnnotations</b></em>' containment reference list.
- * <!-- begin-user-doc -->
- * <!-- end-user-doc -->
- * @generated
- * @ordered
- */
- int JAVA_PARAMETER__EANNOTATIONS = EcorePackage.EPARAMETER__EANNOTATIONS;
-
- /**
- * @generated This field/method will be replaced during code generation.
- */
- int JAVA_PARAMETER__NAME = EcorePackage.EPARAMETER__NAME;
- /**
- * The feature id for the '<em><b>Ordered</b></em>' attribute.
- * <!-- begin-user-doc -->
- * <!-- end-user-doc -->
- * @generated
- * @ordered
- */
- int JAVA_PARAMETER__ORDERED = EcorePackage.EPARAMETER__ORDERED;
-
- /**
- * The feature id for the '<em><b>Unique</b></em>' attribute.
- * <!-- begin-user-doc -->
- * <!-- end-user-doc -->
- * @generated
- * @ordered
- */
- int JAVA_PARAMETER__UNIQUE = EcorePackage.EPARAMETER__UNIQUE;
-
- /**
- * The feature id for the '<em><b>Lower Bound</b></em>' attribute.
- * <!-- begin-user-doc -->
- * <!-- end-user-doc -->
- * @generated
- * @ordered
- */
- int JAVA_PARAMETER__LOWER_BOUND = EcorePackage.EPARAMETER__LOWER_BOUND;
-
- /**
- * The feature id for the '<em><b>Upper Bound</b></em>' attribute.
- * <!-- begin-user-doc -->
- * <!-- end-user-doc -->
- * @generated
- * @ordered
- */
- int JAVA_PARAMETER__UPPER_BOUND = EcorePackage.EPARAMETER__UPPER_BOUND;
-
- /**
- * The feature id for the '<em><b>Many</b></em>' attribute.
- * <!-- begin-user-doc -->
- * <!-- end-user-doc -->
- * @generated
- * @ordered
- */
- int JAVA_PARAMETER__MANY = EcorePackage.EPARAMETER__MANY;
-
- /**
- * The feature id for the '<em><b>Required</b></em>' attribute.
- * <!-- begin-user-doc -->
- * <!-- end-user-doc -->
- * @generated
- * @ordered
- */
- int JAVA_PARAMETER__REQUIRED = EcorePackage.EPARAMETER__REQUIRED;
-
- /**
- * The feature id for the '<em><b>EType</b></em>' reference.
- * <!-- begin-user-doc -->
- * <!-- end-user-doc -->
- * @generated
- * @ordered
- */
- int JAVA_PARAMETER__ETYPE = EcorePackage.EPARAMETER__ETYPE;
-
- /**
- * The feature id for the '<em><b>EGeneric Type</b></em>' containment reference.
- * <!-- begin-user-doc -->
- * <!-- end-user-doc -->
- * @generated
- * @ordered
- */
- int JAVA_PARAMETER__EGENERIC_TYPE = EcorePackage.EPARAMETER__EGENERIC_TYPE;
-
- /**
- * The feature id for the '<em><b>EOperation</b></em>' container reference.
- * <!-- begin-user-doc -->
- * <!-- end-user-doc -->
- * @generated
- * @ordered
- */
- int JAVA_PARAMETER__EOPERATION = EcorePackage.EPARAMETER__EOPERATION;
-
- /**
- * The feature id for the '<em><b>Final</b></em>' attribute.
- * <!-- begin-user-doc -->
- * <!-- end-user-doc -->
- * @generated
- * @ordered
- */
- int JAVA_PARAMETER__FINAL = EcorePackage.EPARAMETER_FEATURE_COUNT + 0;
-
- /**
- * @generated This field/method will be replaced during code generation.
- */
- int JAVA_PARAMETER__PARAMETER_KIND = EcorePackage.EPARAMETER_FEATURE_COUNT + 1;
- /**
- * The number of structural features of the '<em>Java Parameter</em>' class.
- * <!-- begin-user-doc -->
- * <!-- end-user-doc -->
- * @generated
- * @ordered
- */
- int JAVA_PARAMETER_FEATURE_COUNT = EcorePackage.EPARAMETER_FEATURE_COUNT + 2;
-
- /**
- * The feature id for the '<em><b>EAnnotations</b></em>' containment reference list.
- * <!-- begin-user-doc -->
- * <!-- end-user-doc -->
- * @generated
- * @ordered
- */
- int METHOD__EANNOTATIONS = EcorePackage.EOPERATION__EANNOTATIONS;
-
- /**
- * @generated This field/method will be replaced during code generation.
- */
- int METHOD__NAME = EcorePackage.EOPERATION__NAME;
- /**
- * The feature id for the '<em><b>Ordered</b></em>' attribute.
- * <!-- begin-user-doc -->
- * <!-- end-user-doc -->
- * @generated
- * @ordered
- */
- int METHOD__ORDERED = EcorePackage.EOPERATION__ORDERED;
-
- /**
- * The feature id for the '<em><b>Unique</b></em>' attribute.
- * <!-- begin-user-doc -->
- * <!-- end-user-doc -->
- * @generated
- * @ordered
- */
- int METHOD__UNIQUE = EcorePackage.EOPERATION__UNIQUE;
-
- /**
- * The feature id for the '<em><b>Lower Bound</b></em>' attribute.
- * <!-- begin-user-doc -->
- * <!-- end-user-doc -->
- * @generated
- * @ordered
- */
- int METHOD__LOWER_BOUND = EcorePackage.EOPERATION__LOWER_BOUND;
-
- /**
- * The feature id for the '<em><b>Upper Bound</b></em>' attribute.
- * <!-- begin-user-doc -->
- * <!-- end-user-doc -->
- * @generated
- * @ordered
- */
- int METHOD__UPPER_BOUND = EcorePackage.EOPERATION__UPPER_BOUND;
-
- /**
- * The feature id for the '<em><b>Many</b></em>' attribute.
- * <!-- begin-user-doc -->
- * <!-- end-user-doc -->
- * @generated
- * @ordered
- */
- int METHOD__MANY = EcorePackage.EOPERATION__MANY;
-
- /**
- * The feature id for the '<em><b>Required</b></em>' attribute.
- * <!-- begin-user-doc -->
- * <!-- end-user-doc -->
- * @generated
- * @ordered
- */
- int METHOD__REQUIRED = EcorePackage.EOPERATION__REQUIRED;
-
- /**
- * The feature id for the '<em><b>EType</b></em>' reference.
- * <!-- begin-user-doc -->
- * <!-- end-user-doc -->
- * @generated
- * @ordered
- */
- int METHOD__ETYPE = EcorePackage.EOPERATION__ETYPE;
-
- /**
- * The feature id for the '<em><b>EGeneric Type</b></em>' containment reference.
- * <!-- begin-user-doc -->
- * <!-- end-user-doc -->
- * @generated
- * @ordered
- */
- int METHOD__EGENERIC_TYPE = EcorePackage.EOPERATION__EGENERIC_TYPE;
-
- /**
- * The feature id for the '<em><b>EContaining Class</b></em>' container reference.
- * <!-- begin-user-doc -->
- * <!-- end-user-doc -->
- * @generated
- * @ordered
- */
- int METHOD__ECONTAINING_CLASS = EcorePackage.EOPERATION__ECONTAINING_CLASS;
-
- /**
- * The feature id for the '<em><b>EType Parameters</b></em>' containment reference list.
- * <!-- begin-user-doc -->
- * <!-- end-user-doc -->
- * @generated
- * @ordered
- */
- int METHOD__ETYPE_PARAMETERS = EcorePackage.EOPERATION__ETYPE_PARAMETERS;
-
- /**
- * The feature id for the '<em><b>EParameters</b></em>' containment reference list.
- * <!-- begin-user-doc -->
- * <!-- end-user-doc -->
- * @generated
- * @ordered
- */
- int METHOD__EPARAMETERS = EcorePackage.EOPERATION__EPARAMETERS;
-
- /**
- * The feature id for the '<em><b>EExceptions</b></em>' reference list.
- * <!-- begin-user-doc -->
- * <!-- end-user-doc -->
- * @generated
- * @ordered
- */
- int METHOD__EEXCEPTIONS = EcorePackage.EOPERATION__EEXCEPTIONS;
-
- /**
- * The feature id for the '<em><b>EGeneric Exceptions</b></em>' containment reference list.
- * <!-- begin-user-doc -->
- * <!-- end-user-doc -->
- * @generated
- * @ordered
- */
- int METHOD__EGENERIC_EXCEPTIONS = EcorePackage.EOPERATION__EGENERIC_EXCEPTIONS;
-
- /**
- * The feature id for the '<em><b>Abstract</b></em>' attribute.
- * <!-- begin-user-doc -->
- * <!-- end-user-doc -->
- * @generated
- * @ordered
- */
- int METHOD__ABSTRACT = EcorePackage.EOPERATION_FEATURE_COUNT + 0;
-
- /**
- * The feature id for the '<em><b>Native</b></em>' attribute.
- * <!-- begin-user-doc -->
- * <!-- end-user-doc -->
- * @generated
- * @ordered
- */
- int METHOD__NATIVE = EcorePackage.EOPERATION_FEATURE_COUNT + 1;
-
- /**
- * The feature id for the '<em><b>Synchronized</b></em>' attribute.
- * <!-- begin-user-doc -->
- * <!-- end-user-doc -->
- * @generated
- * @ordered
- */
- int METHOD__SYNCHRONIZED = EcorePackage.EOPERATION_FEATURE_COUNT + 2;
-
- /**
- * The feature id for the '<em><b>Final</b></em>' attribute.
- * <!-- begin-user-doc -->
- * <!-- end-user-doc -->
- * @generated
- * @ordered
- */
- int METHOD__FINAL = EcorePackage.EOPERATION_FEATURE_COUNT + 3;
-
- /**
- * The feature id for the '<em><b>Constructor</b></em>' attribute.
- * <!-- begin-user-doc -->
- * <!-- end-user-doc -->
- * @generated
- * @ordered
- */
- int METHOD__CONSTRUCTOR = EcorePackage.EOPERATION_FEATURE_COUNT + 4;
-
- /**
- * The feature id for the '<em><b>Static</b></em>' attribute.
- * <!-- begin-user-doc -->
- * <!-- end-user-doc -->
- * @generated
- * @ordered
- */
- int METHOD__STATIC = EcorePackage.EOPERATION_FEATURE_COUNT + 5;
-
- /**
- * @generated This field/method will be replaced during code generation.
- */
- int METHOD__JAVA_VISIBILITY = EcorePackage.EOPERATION_FEATURE_COUNT + 6;
- /**
- * @generated This field/method will be replaced during code generation.
- */
- int METHOD__PARAMETERS = EcorePackage.EOPERATION_FEATURE_COUNT + 7;
- /**
- * @generated This field/method will be replaced during code generation.
- */
- int METHOD__JAVA_EXCEPTIONS = EcorePackage.EOPERATION_FEATURE_COUNT + 8;
- /**
- * @generated This field/method will be replaced during code generation.
- */
- int METHOD__JAVA_CLASS = EcorePackage.EOPERATION_FEATURE_COUNT + 9;
- /**
- * @generated This field/method will be replaced during code generation.
- */
- int METHOD__SOURCE = EcorePackage.EOPERATION_FEATURE_COUNT + 10;
- /**
- * The number of structural features of the '<em>Method</em>' class.
- * <!-- begin-user-doc -->
- * <!-- end-user-doc -->
- * @generated
- * @ordered
- */
- int METHOD_FEATURE_COUNT = EcorePackage.EOPERATION_FEATURE_COUNT + 11;
-
- /**
- * The feature id for the '<em><b>EAnnotations</b></em>' containment reference list.
- * <!-- begin-user-doc -->
- * <!-- end-user-doc -->
- * @generated
- * @ordered
- */
- int FIELD__EANNOTATIONS = EcorePackage.ETYPED_ELEMENT__EANNOTATIONS;
-
- /**
- * @generated This field/method will be replaced during code generation.
- */
- int FIELD__NAME = EcorePackage.ETYPED_ELEMENT__NAME;
- /**
- * The feature id for the '<em><b>Ordered</b></em>' attribute.
- * <!-- begin-user-doc -->
- * <!-- end-user-doc -->
- * @generated
- * @ordered
- */
- int FIELD__ORDERED = EcorePackage.ETYPED_ELEMENT__ORDERED;
-
- /**
- * The feature id for the '<em><b>Unique</b></em>' attribute.
- * <!-- begin-user-doc -->
- * <!-- end-user-doc -->
- * @generated
- * @ordered
- */
- int FIELD__UNIQUE = EcorePackage.ETYPED_ELEMENT__UNIQUE;
-
- /**
- * The feature id for the '<em><b>Lower Bound</b></em>' attribute.
- * <!-- begin-user-doc -->
- * <!-- end-user-doc -->
- * @generated
- * @ordered
- */
- int FIELD__LOWER_BOUND = EcorePackage.ETYPED_ELEMENT__LOWER_BOUND;
-
- /**
- * The feature id for the '<em><b>Upper Bound</b></em>' attribute.
- * <!-- begin-user-doc -->
- * <!-- end-user-doc -->
- * @generated
- * @ordered
- */
- int FIELD__UPPER_BOUND = EcorePackage.ETYPED_ELEMENT__UPPER_BOUND;
-
- /**
- * The feature id for the '<em><b>Many</b></em>' attribute.
- * <!-- begin-user-doc -->
- * <!-- end-user-doc -->
- * @generated
- * @ordered
- */
- int FIELD__MANY = EcorePackage.ETYPED_ELEMENT__MANY;
-
- /**
- * The feature id for the '<em><b>Required</b></em>' attribute.
- * <!-- begin-user-doc -->
- * <!-- end-user-doc -->
- * @generated
- * @ordered
- */
- int FIELD__REQUIRED = EcorePackage.ETYPED_ELEMENT__REQUIRED;
-
- /**
- * The feature id for the '<em><b>EType</b></em>' reference.
- * <!-- begin-user-doc -->
- * <!-- end-user-doc -->
- * @generated
- * @ordered
- */
- int FIELD__ETYPE = EcorePackage.ETYPED_ELEMENT__ETYPE;
-
- /**
- * The feature id for the '<em><b>EGeneric Type</b></em>' containment reference.
- * <!-- begin-user-doc -->
- * <!-- end-user-doc -->
- * @generated
- * @ordered
- */
- int FIELD__EGENERIC_TYPE = EcorePackage.ETYPED_ELEMENT__EGENERIC_TYPE;
-
- /**
- * The feature id for the '<em><b>Final</b></em>' attribute.
- * <!-- begin-user-doc -->
- * <!-- end-user-doc -->
- * @generated
- * @ordered
- */
- int FIELD__FINAL = EcorePackage.ETYPED_ELEMENT_FEATURE_COUNT + 0;
-
- /**
- * The feature id for the '<em><b>Static</b></em>' attribute.
- * <!-- begin-user-doc -->
- * <!-- end-user-doc -->
- * @generated
- * @ordered
- */
- int FIELD__STATIC = EcorePackage.ETYPED_ELEMENT_FEATURE_COUNT + 1;
-
- /**
- * @generated This field/method will be replaced during code generation.
- */
- int FIELD__JAVA_VISIBILITY = EcorePackage.ETYPED_ELEMENT_FEATURE_COUNT + 2;
- /**
- * The feature id for the '<em><b>Transient</b></em>' attribute.
- * <!-- begin-user-doc -->
- * <!-- end-user-doc -->
- * @generated
- * @ordered
- */
- int FIELD__TRANSIENT = EcorePackage.ETYPED_ELEMENT_FEATURE_COUNT + 3;
-
- /**
- * The feature id for the '<em><b>Volatile</b></em>' attribute.
- * <!-- begin-user-doc -->
- * <!-- end-user-doc -->
- * @generated
- * @ordered
- */
- int FIELD__VOLATILE = EcorePackage.ETYPED_ELEMENT_FEATURE_COUNT + 4;
-
- /**
- * @generated This field/method will be replaced during code generation.
- */
- int FIELD__JAVA_CLASS = EcorePackage.ETYPED_ELEMENT_FEATURE_COUNT + 5;
- /**
- * @generated This field/method will be replaced during code generation.
- */
- int FIELD__INITIALIZER = EcorePackage.ETYPED_ELEMENT_FEATURE_COUNT + 6;
- /**
- * The number of structural features of the '<em>Field</em>' class.
- * <!-- begin-user-doc -->
- * <!-- end-user-doc -->
- * @generated
- * @ordered
- */
- int FIELD_FEATURE_COUNT = EcorePackage.ETYPED_ELEMENT_FEATURE_COUNT + 7;
-
- /**
- * @generated This field/method will be replaced during code generation.
- */
- int BLOCK__SOURCE = 0;
- /**
- * @generated This field/method will be replaced during code generation.
- */
- int BLOCK__NAME = 1;
- /**
- * @generated This field/method will be replaced during code generation.
- */
- int BLOCK__CONTENTS = 2;
-
- /**
- * The number of structural features of the '<em>Block</em>' class.
- * <!-- begin-user-doc -->
- * <!-- end-user-doc -->
- * @generated
- * @ordered
- */
- int BLOCK_FEATURE_COUNT = 3;
-
- /**
- * @generated This field/method will be replaced during code generation.
- */
- int COMMENT__SOURCE = BLOCK__SOURCE;
- /**
- * @generated This field/method will be replaced during code generation.
- */
- int COMMENT__NAME = BLOCK__NAME;
- /**
- * @generated This field/method will be replaced during code generation.
- */
- int COMMENT__CONTENTS = BLOCK__CONTENTS;
-
- /**
- * The number of structural features of the '<em>Comment</em>' class.
- * <!-- begin-user-doc -->
- * <!-- end-user-doc -->
- * @generated
- * @ordered
- */
- int COMMENT_FEATURE_COUNT = BLOCK_FEATURE_COUNT + 0;
-
- /**
- * @generated This field/method will be replaced during code generation.
- */
- int STATEMENT__SOURCE = BLOCK__SOURCE;
- /**
- * @generated This field/method will be replaced during code generation.
- */
- int STATEMENT__NAME = BLOCK__NAME;
- /**
- * @generated This field/method will be replaced during code generation.
- */
- int STATEMENT__CONTENTS = BLOCK__CONTENTS;
-
- /**
- * The number of structural features of the '<em>Statement</em>' class.
- * <!-- begin-user-doc -->
- * <!-- end-user-doc -->
- * @generated
- * @ordered
- */
- int STATEMENT_FEATURE_COUNT = BLOCK_FEATURE_COUNT + 0;
-
- /**
- * The feature id for the '<em><b>EAnnotations</b></em>' containment reference list.
- * <!-- begin-user-doc -->
- * <!-- end-user-doc -->
- * @generated
- * @ordered
- */
- int JAVA_PACKAGE__EANNOTATIONS = EcorePackage.EPACKAGE__EANNOTATIONS;
-
- /**
- * @generated This field/method will be replaced during code generation.
- */
- int JAVA_PACKAGE__NAME = EcorePackage.EPACKAGE__NAME;
- /**
- * @generated This field/method will be replaced during code generation.
- */
- int JAVA_PACKAGE__NS_URI = EcorePackage.EPACKAGE__NS_URI;
- /**
- * The feature id for the '<em><b>Ns Prefix</b></em>' attribute.
- * <!-- begin-user-doc -->
- * <!-- end-user-doc -->
- * @generated
- * @ordered
- */
- int JAVA_PACKAGE__NS_PREFIX = EcorePackage.EPACKAGE__NS_PREFIX;
-
- /**
- * The feature id for the '<em><b>EFactory Instance</b></em>' reference.
- * <!-- begin-user-doc -->
- * <!-- end-user-doc -->
- * @generated
- * @ordered
- */
- int JAVA_PACKAGE__EFACTORY_INSTANCE = EcorePackage.EPACKAGE__EFACTORY_INSTANCE;
-
- /**
- * The feature id for the '<em><b>EClassifiers</b></em>' containment reference list.
- * <!-- begin-user-doc -->
- * <!-- end-user-doc -->
- * @generated
- * @ordered
- */
- int JAVA_PACKAGE__ECLASSIFIERS = EcorePackage.EPACKAGE__ECLASSIFIERS;
-
- /**
- * The feature id for the '<em><b>ESubpackages</b></em>' containment reference list.
- * <!-- begin-user-doc -->
- * <!-- end-user-doc -->
- * @generated
- * @ordered
- */
- int JAVA_PACKAGE__ESUBPACKAGES = EcorePackage.EPACKAGE__ESUBPACKAGES;
-
- /**
- * The feature id for the '<em><b>ESuper Package</b></em>' container reference.
- * <!-- begin-user-doc -->
- * <!-- end-user-doc -->
- * @generated
- * @ordered
- */
- int JAVA_PACKAGE__ESUPER_PACKAGE = EcorePackage.EPACKAGE__ESUPER_PACKAGE;
-
- /**
- * @generated This field/method will be replaced during code generation.
- */
- int JAVA_PACKAGE__JAVA_CLASSES = EcorePackage.EPACKAGE_FEATURE_COUNT + 0;
- /**
- * The number of structural features of the '<em>Java Package</em>' class.
- * <!-- begin-user-doc -->
- * <!-- end-user-doc -->
- * @generated
- * @ordered
- */
- int JAVA_PACKAGE_FEATURE_COUNT = EcorePackage.EPACKAGE_FEATURE_COUNT + 1;
-
- /**
- * The feature id for the '<em><b>EAnnotations</b></em>' containment reference list.
- * <!-- begin-user-doc -->
- * <!-- end-user-doc -->
- * @generated
- * @ordered
- */
- int JAVA_DATA_TYPE__EANNOTATIONS = EcorePackage.ECLASS__EANNOTATIONS;
-
- /**
- * @generated This field/method will be replaced during code generation.
- */
- int JAVA_DATA_TYPE__NAME = EcorePackage.ECLASS__NAME;
- /**
- * The feature id for the '<em><b>Instance Class Name</b></em>' attribute.
- * <!-- begin-user-doc -->
- * <!-- end-user-doc -->
- * @generated
- * @ordered
- */
- int JAVA_DATA_TYPE__INSTANCE_CLASS_NAME = EcorePackage.ECLASS__INSTANCE_CLASS_NAME;
-
- /**
- * @generated This field/method will be replaced during code generation.
- */
- int JAVA_DATA_TYPE__INSTANCE_CLASS = EcorePackage.ECLASS__INSTANCE_CLASS;
- /**
- * The feature id for the '<em><b>Default Value</b></em>' attribute.
- * <!-- begin-user-doc -->
- * <!-- end-user-doc -->
- * @generated
- * @ordered
- */
- int JAVA_DATA_TYPE__DEFAULT_VALUE = EcorePackage.ECLASS__DEFAULT_VALUE;
-
- /**
- * The feature id for the '<em><b>Instance Type Name</b></em>' attribute.
- * <!-- begin-user-doc -->
- * <!-- end-user-doc -->
- * @generated
- * @ordered
- */
- int JAVA_DATA_TYPE__INSTANCE_TYPE_NAME = EcorePackage.ECLASS__INSTANCE_TYPE_NAME;
-
- /**
- * The feature id for the '<em><b>EPackage</b></em>' container reference.
- * <!-- begin-user-doc -->
- * <!-- end-user-doc -->
- * @generated
- * @ordered
- */
- int JAVA_DATA_TYPE__EPACKAGE = EcorePackage.ECLASS__EPACKAGE;
-
- /**
- * The feature id for the '<em><b>EType Parameters</b></em>' containment reference list.
- * <!-- begin-user-doc -->
- * <!-- end-user-doc -->
- * @generated
- * @ordered
- */
- int JAVA_DATA_TYPE__ETYPE_PARAMETERS = EcorePackage.ECLASS__ETYPE_PARAMETERS;
-
- /**
- * The feature id for the '<em><b>Abstract</b></em>' attribute.
- * <!-- begin-user-doc -->
- * <!-- end-user-doc -->
- * @generated
- * @ordered
- */
- int JAVA_DATA_TYPE__ABSTRACT = EcorePackage.ECLASS__ABSTRACT;
-
- /**
- * The feature id for the '<em><b>Interface</b></em>' attribute.
- * <!-- begin-user-doc -->
- * <!-- end-user-doc -->
- * @generated
- * @ordered
- */
- int JAVA_DATA_TYPE__INTERFACE = EcorePackage.ECLASS__INTERFACE;
-
- /**
- * The feature id for the '<em><b>ESuper Types</b></em>' reference list.
- * <!-- begin-user-doc -->
- * <!-- end-user-doc -->
- * @generated
- * @ordered
- */
- int JAVA_DATA_TYPE__ESUPER_TYPES = EcorePackage.ECLASS__ESUPER_TYPES;
-
- /**
- * The feature id for the '<em><b>EOperations</b></em>' containment reference list.
- * <!-- begin-user-doc -->
- * <!-- end-user-doc -->
- * @generated
- * @ordered
- */
- int JAVA_DATA_TYPE__EOPERATIONS = EcorePackage.ECLASS__EOPERATIONS;
-
- /**
- * The feature id for the '<em><b>EAll Attributes</b></em>' reference list.
- * <!-- begin-user-doc -->
- * <!-- end-user-doc -->
- * @generated
- * @ordered
- */
- int JAVA_DATA_TYPE__EALL_ATTRIBUTES = EcorePackage.ECLASS__EALL_ATTRIBUTES;
-
- /**
- * The feature id for the '<em><b>EAll References</b></em>' reference list.
- * <!-- begin-user-doc -->
- * <!-- end-user-doc -->
- * @generated
- * @ordered
- */
- int JAVA_DATA_TYPE__EALL_REFERENCES = EcorePackage.ECLASS__EALL_REFERENCES;
-
- /**
- * The feature id for the '<em><b>EReferences</b></em>' reference list.
- * <!-- begin-user-doc -->
- * <!-- end-user-doc -->
- * @generated
- * @ordered
- */
- int JAVA_DATA_TYPE__EREFERENCES = EcorePackage.ECLASS__EREFERENCES;
-
- /**
- * The feature id for the '<em><b>EAttributes</b></em>' reference list.
- * <!-- begin-user-doc -->
- * <!-- end-user-doc -->
- * @generated
- * @ordered
- */
- int JAVA_DATA_TYPE__EATTRIBUTES = EcorePackage.ECLASS__EATTRIBUTES;
-
- /**
- * The feature id for the '<em><b>EAll Containments</b></em>' reference list.
- * <!-- begin-user-doc -->
- * <!-- end-user-doc -->
- * @generated
- * @ordered
- */
- int JAVA_DATA_TYPE__EALL_CONTAINMENTS = EcorePackage.ECLASS__EALL_CONTAINMENTS;
-
- /**
- * The feature id for the '<em><b>EAll Operations</b></em>' reference list.
- * <!-- begin-user-doc -->
- * <!-- end-user-doc -->
- * @generated
- * @ordered
- */
- int JAVA_DATA_TYPE__EALL_OPERATIONS = EcorePackage.ECLASS__EALL_OPERATIONS;
-
- /**
- * The feature id for the '<em><b>EAll Structural Features</b></em>' reference list.
- * <!-- begin-user-doc -->
- * <!-- end-user-doc -->
- * @generated
- * @ordered
- */
- int JAVA_DATA_TYPE__EALL_STRUCTURAL_FEATURES = EcorePackage.ECLASS__EALL_STRUCTURAL_FEATURES;
-
- /**
- * The feature id for the '<em><b>EAll Super Types</b></em>' reference list.
- * <!-- begin-user-doc -->
- * <!-- end-user-doc -->
- * @generated
- * @ordered
- */
- int JAVA_DATA_TYPE__EALL_SUPER_TYPES = EcorePackage.ECLASS__EALL_SUPER_TYPES;
-
- /**
- * The feature id for the '<em><b>EID Attribute</b></em>' reference.
- * <!-- begin-user-doc -->
- * <!-- end-user-doc -->
- * @generated
- * @ordered
- */
- int JAVA_DATA_TYPE__EID_ATTRIBUTE = EcorePackage.ECLASS__EID_ATTRIBUTE;
-
- /**
- * The feature id for the '<em><b>EStructural Features</b></em>' containment reference list.
- * <!-- begin-user-doc -->
- * <!-- end-user-doc -->
- * @generated
- * @ordered
- */
- int JAVA_DATA_TYPE__ESTRUCTURAL_FEATURES = EcorePackage.ECLASS__ESTRUCTURAL_FEATURES;
-
- /**
- * The feature id for the '<em><b>EGeneric Super Types</b></em>' containment reference list.
- * <!-- begin-user-doc -->
- * <!-- end-user-doc -->
- * @generated
- * @ordered
- */
- int JAVA_DATA_TYPE__EGENERIC_SUPER_TYPES = EcorePackage.ECLASS__EGENERIC_SUPER_TYPES;
-
- /**
- * The feature id for the '<em><b>EAll Generic Super Types</b></em>' reference list.
- * <!-- begin-user-doc -->
- * <!-- end-user-doc -->
- * @generated
- * @ordered
- */
- int JAVA_DATA_TYPE__EALL_GENERIC_SUPER_TYPES = EcorePackage.ECLASS__EALL_GENERIC_SUPER_TYPES;
-
- /**
- * The number of structural features of the '<em>Java Data Type</em>' class.
- * <!-- begin-user-doc -->
- * <!-- end-user-doc -->
- * @generated
- * @ordered
- */
- int JAVA_DATA_TYPE_FEATURE_COUNT = EcorePackage.ECLASS_FEATURE_COUNT + 0;
-
- /**
- * The feature id for the '<em><b>EAnnotations</b></em>' containment reference list.
- * <!-- begin-user-doc -->
- * <!-- end-user-doc -->
- * @generated
- * @ordered
- */
- int ARRAY_TYPE__EANNOTATIONS = JAVA_CLASS__EANNOTATIONS;
-
- /**
- * @generated This field/method will be replaced during code generation.
- */
- int ARRAY_TYPE__NAME = JAVA_CLASS__NAME;
- /**
- * The feature id for the '<em><b>Instance Class Name</b></em>' attribute.
- * <!-- begin-user-doc -->
- * <!-- end-user-doc -->
- * @generated
- * @ordered
- */
- int ARRAY_TYPE__INSTANCE_CLASS_NAME = JAVA_CLASS__INSTANCE_CLASS_NAME;
-
- /**
- * @generated This field/method will be replaced during code generation.
- */
- int ARRAY_TYPE__INSTANCE_CLASS = JAVA_CLASS__INSTANCE_CLASS;
- /**
- * The feature id for the '<em><b>Default Value</b></em>' attribute.
- * <!-- begin-user-doc -->
- * <!-- end-user-doc -->
- * @generated
- * @ordered
- */
- int ARRAY_TYPE__DEFAULT_VALUE = JAVA_CLASS__DEFAULT_VALUE;
-
- /**
- * The feature id for the '<em><b>Instance Type Name</b></em>' attribute.
- * <!-- begin-user-doc -->
- * <!-- end-user-doc -->
- * @generated
- * @ordered
- */
- int ARRAY_TYPE__INSTANCE_TYPE_NAME = JAVA_CLASS__INSTANCE_TYPE_NAME;
-
- /**
- * The feature id for the '<em><b>EPackage</b></em>' container reference.
- * <!-- begin-user-doc -->
- * <!-- end-user-doc -->
- * @generated
- * @ordered
- */
- int ARRAY_TYPE__EPACKAGE = JAVA_CLASS__EPACKAGE;
-
- /**
- * The feature id for the '<em><b>EType Parameters</b></em>' containment reference list.
- * <!-- begin-user-doc -->
- * <!-- end-user-doc -->
- * @generated
- * @ordered
- */
- int ARRAY_TYPE__ETYPE_PARAMETERS = JAVA_CLASS__ETYPE_PARAMETERS;
-
- /**
- * The feature id for the '<em><b>Abstract</b></em>' attribute.
- * <!-- begin-user-doc -->
- * <!-- end-user-doc -->
- * @generated
- * @ordered
- */
- int ARRAY_TYPE__ABSTRACT = JAVA_CLASS__ABSTRACT;
-
- /**
- * The feature id for the '<em><b>Interface</b></em>' attribute.
- * <!-- begin-user-doc -->
- * <!-- end-user-doc -->
- * @generated
- * @ordered
- */
- int ARRAY_TYPE__INTERFACE = JAVA_CLASS__INTERFACE;
-
- /**
- * The feature id for the '<em><b>ESuper Types</b></em>' reference list.
- * <!-- begin-user-doc -->
- * <!-- end-user-doc -->
- * @generated
- * @ordered
- */
- int ARRAY_TYPE__ESUPER_TYPES = JAVA_CLASS__ESUPER_TYPES;
-
- /**
- * The feature id for the '<em><b>EOperations</b></em>' containment reference list.
- * <!-- begin-user-doc -->
- * <!-- end-user-doc -->
- * @generated
- * @ordered
- */
- int ARRAY_TYPE__EOPERATIONS = JAVA_CLASS__EOPERATIONS;
-
- /**
- * The feature id for the '<em><b>EAll Attributes</b></em>' reference list.
- * <!-- begin-user-doc -->
- * <!-- end-user-doc -->
- * @generated
- * @ordered
- */
- int ARRAY_TYPE__EALL_ATTRIBUTES = JAVA_CLASS__EALL_ATTRIBUTES;
-
- /**
- * The feature id for the '<em><b>EAll References</b></em>' reference list.
- * <!-- begin-user-doc -->
- * <!-- end-user-doc -->
- * @generated
- * @ordered
- */
- int ARRAY_TYPE__EALL_REFERENCES = JAVA_CLASS__EALL_REFERENCES;
-
- /**
- * The feature id for the '<em><b>EReferences</b></em>' reference list.
- * <!-- begin-user-doc -->
- * <!-- end-user-doc -->
- * @generated
- * @ordered
- */
- int ARRAY_TYPE__EREFERENCES = JAVA_CLASS__EREFERENCES;
-
- /**
- * The feature id for the '<em><b>EAttributes</b></em>' reference list.
- * <!-- begin-user-doc -->
- * <!-- end-user-doc -->
- * @generated
- * @ordered
- */
- int ARRAY_TYPE__EATTRIBUTES = JAVA_CLASS__EATTRIBUTES;
-
- /**
- * The feature id for the '<em><b>EAll Containments</b></em>' reference list.
- * <!-- begin-user-doc -->
- * <!-- end-user-doc -->
- * @generated
- * @ordered
- */
- int ARRAY_TYPE__EALL_CONTAINMENTS = JAVA_CLASS__EALL_CONTAINMENTS;
-
- /**
- * The feature id for the '<em><b>EAll Operations</b></em>' reference list.
- * <!-- begin-user-doc -->
- * <!-- end-user-doc -->
- * @generated
- * @ordered
- */
- int ARRAY_TYPE__EALL_OPERATIONS = JAVA_CLASS__EALL_OPERATIONS;
-
- /**
- * The feature id for the '<em><b>EAll Structural Features</b></em>' reference list.
- * <!-- begin-user-doc -->
- * <!-- end-user-doc -->
- * @generated
- * @ordered
- */
- int ARRAY_TYPE__EALL_STRUCTURAL_FEATURES = JAVA_CLASS__EALL_STRUCTURAL_FEATURES;
-
- /**
- * The feature id for the '<em><b>EAll Super Types</b></em>' reference list.
- * <!-- begin-user-doc -->
- * <!-- end-user-doc -->
- * @generated
- * @ordered
- */
- int ARRAY_TYPE__EALL_SUPER_TYPES = JAVA_CLASS__EALL_SUPER_TYPES;
-
- /**
- * The feature id for the '<em><b>EID Attribute</b></em>' reference.
- * <!-- begin-user-doc -->
- * <!-- end-user-doc -->
- * @generated
- * @ordered
- */
- int ARRAY_TYPE__EID_ATTRIBUTE = JAVA_CLASS__EID_ATTRIBUTE;
-
- /**
- * The feature id for the '<em><b>EStructural Features</b></em>' containment reference list.
- * <!-- begin-user-doc -->
- * <!-- end-user-doc -->
- * @generated
- * @ordered
- */
- int ARRAY_TYPE__ESTRUCTURAL_FEATURES = JAVA_CLASS__ESTRUCTURAL_FEATURES;
-
- /**
- * The feature id for the '<em><b>EGeneric Super Types</b></em>' containment reference list.
- * <!-- begin-user-doc -->
- * <!-- end-user-doc -->
- * @generated
- * @ordered
- */
- int ARRAY_TYPE__EGENERIC_SUPER_TYPES = JAVA_CLASS__EGENERIC_SUPER_TYPES;
-
- /**
- * The feature id for the '<em><b>EAll Generic Super Types</b></em>' reference list.
- * <!-- begin-user-doc -->
- * <!-- end-user-doc -->
- * @generated
- * @ordered
- */
- int ARRAY_TYPE__EALL_GENERIC_SUPER_TYPES = JAVA_CLASS__EALL_GENERIC_SUPER_TYPES;
-
- /**
- * @generated This field/method will be replaced during code generation.
- */
- int ARRAY_TYPE__KIND = JAVA_CLASS__KIND;
- /**
- * The feature id for the '<em><b>Public</b></em>' attribute.
- * <!-- begin-user-doc -->
- * <!-- end-user-doc -->
- * @generated
- * @ordered
- */
- int ARRAY_TYPE__PUBLIC = JAVA_CLASS__PUBLIC;
-
- /**
- * The feature id for the '<em><b>Final</b></em>' attribute.
- * <!-- begin-user-doc -->
- * <!-- end-user-doc -->
- * @generated
- * @ordered
- */
- int ARRAY_TYPE__FINAL = JAVA_CLASS__FINAL;
-
- /**
- * @generated This field/method will be replaced during code generation.
- */
- int ARRAY_TYPE__IMPLEMENTS_INTERFACES = JAVA_CLASS__IMPLEMENTS_INTERFACES;
- /**
- * @generated This field/method will be replaced during code generation.
- */
- int ARRAY_TYPE__CLASS_IMPORT = JAVA_CLASS__CLASS_IMPORT;
- /**
- * @generated This field/method will be replaced during code generation.
- */
- int ARRAY_TYPE__PACKAGE_IMPORTS = JAVA_CLASS__PACKAGE_IMPORTS;
- /**
- * @generated This field/method will be replaced during code generation.
- */
- int ARRAY_TYPE__FIELDS = JAVA_CLASS__FIELDS;
- /**
- * @generated This field/method will be replaced during code generation.
- */
- int ARRAY_TYPE__METHODS = JAVA_CLASS__METHODS;
- /**
- * @generated This field/method will be replaced during code generation.
- */
- int ARRAY_TYPE__INITIALIZERS = JAVA_CLASS__INITIALIZERS;
- /**
- * @generated This field/method will be replaced during code generation.
- */
- int ARRAY_TYPE__DECLARED_CLASSES = JAVA_CLASS__DECLARED_CLASSES;
- /**
- * @generated This field/method will be replaced during code generation.
- */
- int ARRAY_TYPE__DECLARING_CLASS = JAVA_CLASS__DECLARING_CLASS;
- /**
- * @generated This field/method will be replaced during code generation.
- */
- int ARRAY_TYPE__JAVA_PACKAGE = JAVA_CLASS__JAVA_PACKAGE;
- /**
- * @generated This field/method will be replaced during code generation.
- */
- int ARRAY_TYPE__EVENTS = JAVA_CLASS__EVENTS;
- /**
- * @generated This field/method will be replaced during code generation.
- */
- int ARRAY_TYPE__ALL_EVENTS = JAVA_CLASS__ALL_EVENTS;
- /**
- * @generated This field/method will be replaced during code generation.
- */
- int ARRAY_TYPE__ARRAY_DIMENSIONS = JAVA_CLASS_FEATURE_COUNT + 0;
- /**
- * @generated This field/method will be replaced during code generation.
- */
- int ARRAY_TYPE__COMPONENT_TYPE = JAVA_CLASS_FEATURE_COUNT + 1;
- /**
- * The number of structural features of the '<em>Array Type</em>' class.
- * <!-- begin-user-doc -->
- * <!-- end-user-doc -->
- * @generated
- * @ordered
- */
- int ARRAY_TYPE_FEATURE_COUNT = JAVA_CLASS_FEATURE_COUNT + 2;
-
- /**
- * The feature id for the '<em><b>EAnnotations</b></em>' containment reference list.
- * <!-- begin-user-doc -->
- * <!-- end-user-doc -->
- * @generated
- * @ordered
- */
- int JAVA_EVENT__EANNOTATIONS = EcorePackage.ESTRUCTURAL_FEATURE__EANNOTATIONS;
-
- /**
- * @generated This field/method will be replaced during code generation.
- */
- int JAVA_EVENT__NAME = EcorePackage.ESTRUCTURAL_FEATURE__NAME;
- /**
- * The feature id for the '<em><b>Ordered</b></em>' attribute.
- * <!-- begin-user-doc -->
- * <!-- end-user-doc -->
- * @generated
- * @ordered
- */
- int JAVA_EVENT__ORDERED = EcorePackage.ESTRUCTURAL_FEATURE__ORDERED;
-
- /**
- * The feature id for the '<em><b>Unique</b></em>' attribute.
- * <!-- begin-user-doc -->
- * <!-- end-user-doc -->
- * @generated
- * @ordered
- */
- int JAVA_EVENT__UNIQUE = EcorePackage.ESTRUCTURAL_FEATURE__UNIQUE;
-
- /**
- * The feature id for the '<em><b>Lower Bound</b></em>' attribute.
- * <!-- begin-user-doc -->
- * <!-- end-user-doc -->
- * @generated
- * @ordered
- */
- int JAVA_EVENT__LOWER_BOUND = EcorePackage.ESTRUCTURAL_FEATURE__LOWER_BOUND;
-
- /**
- * The feature id for the '<em><b>Upper Bound</b></em>' attribute.
- * <!-- begin-user-doc -->
- * <!-- end-user-doc -->
- * @generated
- * @ordered
- */
- int JAVA_EVENT__UPPER_BOUND = EcorePackage.ESTRUCTURAL_FEATURE__UPPER_BOUND;
-
- /**
- * The feature id for the '<em><b>Many</b></em>' attribute.
- * <!-- begin-user-doc -->
- * <!-- end-user-doc -->
- * @generated
- * @ordered
- */
- int JAVA_EVENT__MANY = EcorePackage.ESTRUCTURAL_FEATURE__MANY;
-
- /**
- * The feature id for the '<em><b>Required</b></em>' attribute.
- * <!-- begin-user-doc -->
- * <!-- end-user-doc -->
- * @generated
- * @ordered
- */
- int JAVA_EVENT__REQUIRED = EcorePackage.ESTRUCTURAL_FEATURE__REQUIRED;
-
- /**
- * The feature id for the '<em><b>EType</b></em>' reference.
- * <!-- begin-user-doc -->
- * <!-- end-user-doc -->
- * @generated
- * @ordered
- */
- int JAVA_EVENT__ETYPE = EcorePackage.ESTRUCTURAL_FEATURE__ETYPE;
-
- /**
- * The feature id for the '<em><b>EGeneric Type</b></em>' containment reference.
- * <!-- begin-user-doc -->
- * <!-- end-user-doc -->
- * @generated
- * @ordered
- */
- int JAVA_EVENT__EGENERIC_TYPE = EcorePackage.ESTRUCTURAL_FEATURE__EGENERIC_TYPE;
-
- /**
- * The feature id for the '<em><b>Changeable</b></em>' attribute.
- * <!-- begin-user-doc -->
- * <!-- end-user-doc -->
- * @generated
- * @ordered
- */
- int JAVA_EVENT__CHANGEABLE = EcorePackage.ESTRUCTURAL_FEATURE__CHANGEABLE;
-
- /**
- * The feature id for the '<em><b>Volatile</b></em>' attribute.
- * <!-- begin-user-doc -->
- * <!-- end-user-doc -->
- * @generated
- * @ordered
- */
- int JAVA_EVENT__VOLATILE = EcorePackage.ESTRUCTURAL_FEATURE__VOLATILE;
-
- /**
- * The feature id for the '<em><b>Transient</b></em>' attribute.
- * <!-- begin-user-doc -->
- * <!-- end-user-doc -->
- * @generated
- * @ordered
- */
- int JAVA_EVENT__TRANSIENT = EcorePackage.ESTRUCTURAL_FEATURE__TRANSIENT;
-
- /**
- * The feature id for the '<em><b>Default Value Literal</b></em>' attribute.
- * <!-- begin-user-doc -->
- * <!-- end-user-doc -->
- * @generated
- * @ordered
- */
- int JAVA_EVENT__DEFAULT_VALUE_LITERAL = EcorePackage.ESTRUCTURAL_FEATURE__DEFAULT_VALUE_LITERAL;
-
- /**
- * The feature id for the '<em><b>Default Value</b></em>' attribute.
- * <!-- begin-user-doc -->
- * <!-- end-user-doc -->
- * @generated
- * @ordered
- */
- int JAVA_EVENT__DEFAULT_VALUE = EcorePackage.ESTRUCTURAL_FEATURE__DEFAULT_VALUE;
-
- /**
- * The feature id for the '<em><b>Unsettable</b></em>' attribute.
- * <!-- begin-user-doc -->
- * <!-- end-user-doc -->
- * @generated
- * @ordered
- */
- int JAVA_EVENT__UNSETTABLE = EcorePackage.ESTRUCTURAL_FEATURE__UNSETTABLE;
-
- /**
- * The feature id for the '<em><b>Derived</b></em>' attribute.
- * <!-- begin-user-doc -->
- * <!-- end-user-doc -->
- * @generated
- * @ordered
- */
- int JAVA_EVENT__DERIVED = EcorePackage.ESTRUCTURAL_FEATURE__DERIVED;
-
- /**
- * The feature id for the '<em><b>EContaining Class</b></em>' container reference.
- * <!-- begin-user-doc -->
- * <!-- end-user-doc -->
- * @generated
- * @ordered
- */
- int JAVA_EVENT__ECONTAINING_CLASS = EcorePackage.ESTRUCTURAL_FEATURE__ECONTAINING_CLASS;
-
- /**
- * The number of structural features of the '<em>Java Event</em>' class.
- * <!-- begin-user-doc -->
- * <!-- end-user-doc -->
- * @generated
- * @ordered
- */
- int JAVA_EVENT_FEATURE_COUNT = EcorePackage.ESTRUCTURAL_FEATURE_FEATURE_COUNT + 0;
-
- /**
- * @generated This field/method will be replaced during code generation.
- */
- int JAVA_VISIBILITY_KIND = 13;
- /**
- * @generated This field/method will be replaced during code generation.
- */
- int JAVA_PARAMETER_KIND = 14;
- /**
- * The meta object id for the '<em>JType Java Helpers</em>' data type.
- * <!-- begin-user-doc -->
- * <!-- end-user-doc -->
- * @see org.eclipse.jem.java.JavaHelpers
- * @see org.eclipse.jem.java.internal.impl.JavaRefPackageImpl#getJTypeJavaHelpers()
- * @generated
- */
- int JTYPE_JAVA_HELPERS = 15;
-
- /**
- * The meta object id for the '<em>JType List</em>' data type.
- * <!-- begin-user-doc -->
- * <!-- end-user-doc -->
- * @see java.util.List
- * @see org.eclipse.jem.java.internal.impl.JavaRefPackageImpl#getJTypeList()
- * @generated
- */
- int JTYPE_LIST = 16;
-
-
- /**
- * @generated This field/method will be replaced during code generation.
- */
- int TYPE_KIND = 12;
- /**
- * @generated This field/method will be replaced during code generation.
- */
- String eNS_URI = "java.xmi";
- /**
- * The package namespace name.
- * <!-- begin-user-doc -->
- * <!-- end-user-doc -->
- * @generated
- */
- String eNS_PREFIX = "org.eclipse.jem.java";
-
- /**
- * The singleton instance of the package.
- * <!-- begin-user-doc -->
- * <!-- end-user-doc -->
- * @generated
- */
- JavaRefPackage eINSTANCE = org.eclipse.jem.java.internal.impl.JavaRefPackageImpl.init();
-
- /**
- * @generated This field/method will be replaced during code generation
- * @return JavaClass object
- */
- EClass getJavaClass();
-
- /**
- * @generated This field/method will be replaced during code generation.
- */
- EAttribute getJavaClass_Kind();
-
- /**
- * Returns the meta object for the attribute '{@link org.eclipse.jem.java.JavaClass#isPublic <em>Public</em>}'.
- * <!-- begin-user-doc -->
- * <!-- end-user-doc -->
- * @return the meta object for the attribute '<em>Public</em>'.
- * @see org.eclipse.jem.java.JavaClass#isPublic()
- * @see #getJavaClass()
- * @generated
- */
- EAttribute getJavaClass_Public();
-
- /**
- * Returns the meta object for the attribute '{@link org.eclipse.jem.java.JavaClass#isFinal <em>Final</em>}'.
- * <!-- begin-user-doc -->
- * <!-- end-user-doc -->
- * @return the meta object for the attribute '<em>Final</em>'.
- * @see org.eclipse.jem.java.JavaClass#isFinal()
- * @see #getJavaClass()
- * @generated
- */
- EAttribute getJavaClass_Final();
-
- /**
- * @generated This field/method will be replaced during code generation.
- */
- EReference getJavaClass_ImplementsInterfaces();
-
- /**
- * @generated This field/method will be replaced during code generation.
- */
- EReference getJavaClass_ClassImport();
-
- /**
- * @generated This field/method will be replaced during code generation.
- */
- EReference getJavaClass_PackageImports();
-
- /**
- * @generated This field/method will be replaced during code generation.
- */
- EReference getJavaClass_Fields();
-
- /**
- * @generated This field/method will be replaced during code generation.
- */
- EReference getJavaClass_Methods();
-
- /**
- * @generated This field/method will be replaced during code generation.
- */
- EReference getJavaClass_Initializers();
-
- /**
- * @generated This field/method will be replaced during code generation.
- */
- EReference getJavaClass_DeclaringClass();
-
- /**
- * @generated This field/method will be replaced during code generation.
- */
- EReference getJavaClass_DeclaredClasses();
-
- /**
- * @generated This field/method will be replaced during code generation.
- */
- EReference getJavaClass_JavaPackage();
-
- /**
- * @generated This field/method will be replaced during code generation.
- */
- EReference getJavaClass_Events();
-
- /**
- * @generated This field/method will be replaced during code generation.
- */
- EReference getJavaClass_AllEvents();
-
- /**
- * @generated This field/method will be replaced during code generation
- * @return Field object
- */
- EClass getField();
-
- /**
- * Returns the meta object for the attribute '{@link org.eclipse.jem.java.Field#isFinal <em>Final</em>}'.
- * <!-- begin-user-doc -->
- * <!-- end-user-doc -->
- * @return the meta object for the attribute '<em>Final</em>'.
- * @see org.eclipse.jem.java.Field#isFinal()
- * @see #getField()
- * @generated
- */
- EAttribute getField_Final();
-
- /**
- * Returns the meta object for the attribute '{@link org.eclipse.jem.java.Field#isStatic <em>Static</em>}'.
- * <!-- begin-user-doc -->
- * <!-- end-user-doc -->
- * @return the meta object for the attribute '<em>Static</em>'.
- * @see org.eclipse.jem.java.Field#isStatic()
- * @see #getField()
- * @generated
- */
- EAttribute getField_Static();
-
- /**
- * @generated This field/method will be replaced during code generation.
- */
- EAttribute getField_JavaVisibility();
-
- /**
- * Returns the meta object for the attribute '{@link org.eclipse.jem.java.Field#isTransient <em>Transient</em>}'.
- * <!-- begin-user-doc -->
- * <!-- end-user-doc -->
- * @return the meta object for the attribute '<em>Transient</em>'.
- * @see org.eclipse.jem.java.Field#isTransient()
- * @see #getField()
- * @generated
- */
- EAttribute getField_Transient();
-
- /**
- * Returns the meta object for the attribute '{@link org.eclipse.jem.java.Field#isVolatile <em>Volatile</em>}'.
- * <!-- begin-user-doc -->
- * <!-- end-user-doc -->
- * @return the meta object for the attribute '<em>Volatile</em>'.
- * @see org.eclipse.jem.java.Field#isVolatile()
- * @see #getField()
- * @generated
- */
- EAttribute getField_Volatile();
-
- /**
- * @generated This field/method will be replaced during code generation.
- */
- EReference getField_JavaClass();
-
- /**
- * @generated This field/method will be replaced during code generation.
- */
- EReference getField_Initializer();
-
- /**
- * @generated This field/method will be replaced during code generation
- * @return Method object
- */
- EClass getMethod();
-
- /**
- * Returns the meta object for the attribute '{@link org.eclipse.jem.java.Method#isAbstract <em>Abstract</em>}'.
- * <!-- begin-user-doc -->
- * <!-- end-user-doc -->
- * @return the meta object for the attribute '<em>Abstract</em>'.
- * @see org.eclipse.jem.java.Method#isAbstract()
- * @see #getMethod()
- * @generated
- */
- EAttribute getMethod_Abstract();
-
- /**
- * Returns the meta object for the attribute '{@link org.eclipse.jem.java.Method#isNative <em>Native</em>}'.
- * <!-- begin-user-doc -->
- * <!-- end-user-doc -->
- * @return the meta object for the attribute '<em>Native</em>'.
- * @see org.eclipse.jem.java.Method#isNative()
- * @see #getMethod()
- * @generated
- */
- EAttribute getMethod_Native();
-
- /**
- * Returns the meta object for the attribute '{@link org.eclipse.jem.java.Method#isSynchronized <em>Synchronized</em>}'.
- * <!-- begin-user-doc -->
- * <!-- end-user-doc -->
- * @return the meta object for the attribute '<em>Synchronized</em>'.
- * @see org.eclipse.jem.java.Method#isSynchronized()
- * @see #getMethod()
- * @generated
- */
- EAttribute getMethod_Synchronized();
-
- /**
- * Returns the meta object for the attribute '{@link org.eclipse.jem.java.Method#isFinal <em>Final</em>}'.
- * <!-- begin-user-doc -->
- * <!-- end-user-doc -->
- * @return the meta object for the attribute '<em>Final</em>'.
- * @see org.eclipse.jem.java.Method#isFinal()
- * @see #getMethod()
- * @generated
- */
- EAttribute getMethod_Final();
-
- /**
- * Returns the meta object for the attribute '{@link org.eclipse.jem.java.Method#isConstructor <em>Constructor</em>}'.
- * <!-- begin-user-doc -->
- * <!-- end-user-doc -->
- * @return the meta object for the attribute '<em>Constructor</em>'.
- * @see org.eclipse.jem.java.Method#isConstructor()
- * @see #getMethod()
- * @generated
- */
- EAttribute getMethod_Constructor();
-
- /**
- * Returns the meta object for the attribute '{@link org.eclipse.jem.java.Method#isStatic <em>Static</em>}'.
- * <!-- begin-user-doc -->
- * <!-- end-user-doc -->
- * @return the meta object for the attribute '<em>Static</em>'.
- * @see org.eclipse.jem.java.Method#isStatic()
- * @see #getMethod()
- * @generated
- */
- EAttribute getMethod_Static();
-
- /**
- * @generated This field/method will be replaced during code generation.
- */
- EAttribute getMethod_JavaVisibility();
-
- /**
- * @generated This field/method will be replaced during code generation.
- */
- EReference getMethod_Parameters();
-
- /**
- * @generated This field/method will be replaced during code generation.
- */
- EReference getMethod_JavaExceptions();
-
- /**
- * @generated This field/method will be replaced during code generation.
- */
- EReference getMethod_JavaClass();
-
- /**
- * @generated This field/method will be replaced during code generation.
- */
- EReference getMethod_Source();
-
- /**
- * @generated This field/method will be replaced during code generation
- * @return JavaParameter object
- */
- EClass getJavaParameter();
-
- /**
- * Returns the meta object for the attribute '{@link org.eclipse.jem.java.JavaParameter#isFinal <em>Final</em>}'.
- * <!-- begin-user-doc -->
- * <!-- end-user-doc -->
- * @return the meta object for the attribute '<em>Final</em>'.
- * @see org.eclipse.jem.java.JavaParameter#isFinal()
- * @see #getJavaParameter()
- * @generated
- */
- EAttribute getJavaParameter_Final();
-
- /**
- * @generated This field/method will be replaced during code generation.
- */
- EAttribute getJavaParameter_ParameterKind();
-
- /**
- * @generated This field/method will be replaced during code generation
- * @return ArrayType object
- */
- EClass getArrayType();
-
- /**
- * @generated This field/method will be replaced during code generation.
- */
- EAttribute getArrayType_ArrayDimensions();
-
- /**
- * @generated This field/method will be replaced during code generation.
- */
- EReference getArrayType_ComponentType();
-
- /**
- * @generated This field/method will be replaced during code generation
- * @return JavaDataType object
- */
- EClass getJavaDataType();
-
- /**
- * @generated This field/method will be replaced during code generation
- * @return JavaEvent object
- */
- EClass getJavaEvent();
-
- /**
- * @generated This field/method will be replaced during code generation
- * @return JavaPackage object
- */
- EClass getJavaPackage();
-
- /**
- * @generated This field/method will be replaced during code generation.
- */
- EReference getJavaPackage_JavaClasses();
-
- /**
- * @generated This field/method will be replaced during code generation
- * @return Block object
- */
- EClass getBlock();
-
- /**
- * @generated This field/method will be replaced during code generation.
- */
- EAttribute getBlock_Source();
-
- /**
- * @generated This field/method will be replaced during code generation.
- */
- EAttribute getBlock_Name();
-
- /**
- * @generated This field/method will be replaced during code generation.
- */
- EReference getBlock_Contents();
-
- /**
- * @generated This field/method will be replaced during code generation
- * @return Comment object
- */
- EClass getComment();
-
- /**
- * @generated This field/method will be replaced during code generation
- * @return Statement object
- */
- EClass getStatement();
-
- /**
- * @generated This field/method will be replaced during code generation
- * @return Initializer object
- */
- EClass getInitializer();
-
- /**
- * @generated This field/method will be replaced during code generation.
- */
- EAttribute getInitializer_IsStatic();
-
- /**
- * @generated This field/method will be replaced during code generation.
- */
- EReference getInitializer_JavaClass();
-
- /**
- * @generated This field/method will be replaced during code generation.
- */
- EReference getInitializer_Source();
-
- /**
- * @generated This field/method will be replaced during code generation
- * @return JavaVisibilityKind object
- */
- EEnum getJavaVisibilityKind();
-
- /**
- * @generated This field/method will be replaced during code generation
- * @return JavaParameterKind object
- */
- EEnum getJavaParameterKind();
-
- /**
- * @generated This field/method will be replaced during code generation
- * @return TypeKind object
- */
- EEnum getTypeKind();
-
- /**
- * @generated This field/method will be replaced during code generation
- * @return JTypeList object
- */
- EDataType getJTypeList();
-
- /**
- * @generated This field/method will be replaced during code generation
- * @return JTypeJavaHelpers object
- */
- EDataType getJTypeJavaHelpers();
-
- /**
- * @generated This field/method will be replaced during code generation.
- */
- JavaRefFactory getJavaRefFactory();
-
- /**
- * <!-- begin-user-doc -->
- * Defines literals for the meta objects that represent
- * <ul>
- * <li>each class,</li>
- * <li>each feature of each class,</li>
- * <li>each enum,</li>
- * <li>and each data type</li>
- * </ul>
- * <!-- end-user-doc -->
- * @generated
- */
- interface Literals {
- /**
- * The meta object literal for the '{@link org.eclipse.jem.java.internal.impl.JavaClassImpl <em>Java Class</em>}' class.
- * <!-- begin-user-doc -->
- * <!-- end-user-doc -->
- * @see org.eclipse.jem.java.internal.impl.JavaClassImpl
- * @see org.eclipse.jem.java.internal.impl.JavaRefPackageImpl#getJavaClass()
- * @generated
- */
- EClass JAVA_CLASS = eINSTANCE.getJavaClass();
-
- /**
- * The meta object literal for the '<em><b>Kind</b></em>' attribute feature.
- * <!-- begin-user-doc -->
- * <!-- end-user-doc -->
- * @generated
- */
- EAttribute JAVA_CLASS__KIND = eINSTANCE.getJavaClass_Kind();
-
- /**
- * The meta object literal for the '<em><b>Public</b></em>' attribute feature.
- * <!-- begin-user-doc -->
- * <!-- end-user-doc -->
- * @generated
- */
- EAttribute JAVA_CLASS__PUBLIC = eINSTANCE.getJavaClass_Public();
-
- /**
- * The meta object literal for the '<em><b>Final</b></em>' attribute feature.
- * <!-- begin-user-doc -->
- * <!-- end-user-doc -->
- * @generated
- */
- EAttribute JAVA_CLASS__FINAL = eINSTANCE.getJavaClass_Final();
-
- /**
- * The meta object literal for the '<em><b>Implements Interfaces</b></em>' reference list feature.
- * <!-- begin-user-doc -->
- * <!-- end-user-doc -->
- * @generated
- */
- EReference JAVA_CLASS__IMPLEMENTS_INTERFACES = eINSTANCE.getJavaClass_ImplementsInterfaces();
-
- /**
- * The meta object literal for the '<em><b>Class Import</b></em>' reference list feature.
- * <!-- begin-user-doc -->
- * <!-- end-user-doc -->
- * @generated
- */
- EReference JAVA_CLASS__CLASS_IMPORT = eINSTANCE.getJavaClass_ClassImport();
-
- /**
- * The meta object literal for the '<em><b>Package Imports</b></em>' reference list feature.
- * <!-- begin-user-doc -->
- * <!-- end-user-doc -->
- * @generated
- */
- EReference JAVA_CLASS__PACKAGE_IMPORTS = eINSTANCE.getJavaClass_PackageImports();
-
- /**
- * The meta object literal for the '<em><b>Fields</b></em>' containment reference list feature.
- * <!-- begin-user-doc -->
- * <!-- end-user-doc -->
- * @generated
- */
- EReference JAVA_CLASS__FIELDS = eINSTANCE.getJavaClass_Fields();
-
- /**
- * The meta object literal for the '<em><b>Methods</b></em>' containment reference list feature.
- * <!-- begin-user-doc -->
- * <!-- end-user-doc -->
- * @generated
- */
- EReference JAVA_CLASS__METHODS = eINSTANCE.getJavaClass_Methods();
-
- /**
- * The meta object literal for the '<em><b>Initializers</b></em>' containment reference list feature.
- * <!-- begin-user-doc -->
- * <!-- end-user-doc -->
- * @generated
- */
- EReference JAVA_CLASS__INITIALIZERS = eINSTANCE.getJavaClass_Initializers();
-
- /**
- * The meta object literal for the '<em><b>Declared Classes</b></em>' reference list feature.
- * <!-- begin-user-doc -->
- * <!-- end-user-doc -->
- * @generated
- */
- EReference JAVA_CLASS__DECLARED_CLASSES = eINSTANCE.getJavaClass_DeclaredClasses();
-
- /**
- * The meta object literal for the '<em><b>Declaring Class</b></em>' reference feature.
- * <!-- begin-user-doc -->
- * <!-- end-user-doc -->
- * @generated
- */
- EReference JAVA_CLASS__DECLARING_CLASS = eINSTANCE.getJavaClass_DeclaringClass();
-
- /**
- * The meta object literal for the '<em><b>Java Package</b></em>' reference feature.
- * <!-- begin-user-doc -->
- * <!-- end-user-doc -->
- * @generated
- */
- EReference JAVA_CLASS__JAVA_PACKAGE = eINSTANCE.getJavaClass_JavaPackage();
-
- /**
- * The meta object literal for the '<em><b>Events</b></em>' containment reference list feature.
- * <!-- begin-user-doc -->
- * <!-- end-user-doc -->
- * @generated
- */
- EReference JAVA_CLASS__EVENTS = eINSTANCE.getJavaClass_Events();
-
- /**
- * The meta object literal for the '<em><b>All Events</b></em>' reference list feature.
- * <!-- begin-user-doc -->
- * <!-- end-user-doc -->
- * @generated
- */
- EReference JAVA_CLASS__ALL_EVENTS = eINSTANCE.getJavaClass_AllEvents();
-
- /**
- * The meta object literal for the '{@link org.eclipse.jem.java.internal.impl.InitializerImpl <em>Initializer</em>}' class.
- * <!-- begin-user-doc -->
- * <!-- end-user-doc -->
- * @see org.eclipse.jem.java.internal.impl.InitializerImpl
- * @see org.eclipse.jem.java.internal.impl.JavaRefPackageImpl#getInitializer()
- * @generated
- */
- EClass INITIALIZER = eINSTANCE.getInitializer();
-
- /**
- * The meta object literal for the '<em><b>Is Static</b></em>' attribute feature.
- * <!-- begin-user-doc -->
- * <!-- end-user-doc -->
- * @generated
- */
- EAttribute INITIALIZER__IS_STATIC = eINSTANCE.getInitializer_IsStatic();
-
- /**
- * The meta object literal for the '<em><b>Java Class</b></em>' container reference feature.
- * <!-- begin-user-doc -->
- * <!-- end-user-doc -->
- * @generated
- */
- EReference INITIALIZER__JAVA_CLASS = eINSTANCE.getInitializer_JavaClass();
-
- /**
- * The meta object literal for the '<em><b>Source</b></em>' reference feature.
- * <!-- begin-user-doc -->
- * <!-- end-user-doc -->
- * @generated
- */
- EReference INITIALIZER__SOURCE = eINSTANCE.getInitializer_Source();
-
- /**
- * The meta object literal for the '{@link org.eclipse.jem.java.internal.impl.JavaParameterImpl <em>Java Parameter</em>}' class.
- * <!-- begin-user-doc -->
- * <!-- end-user-doc -->
- * @see org.eclipse.jem.java.internal.impl.JavaParameterImpl
- * @see org.eclipse.jem.java.internal.impl.JavaRefPackageImpl#getJavaParameter()
- * @generated
- */
- EClass JAVA_PARAMETER = eINSTANCE.getJavaParameter();
-
- /**
- * The meta object literal for the '<em><b>Final</b></em>' attribute feature.
- * <!-- begin-user-doc -->
- * <!-- end-user-doc -->
- * @generated
- */
- EAttribute JAVA_PARAMETER__FINAL = eINSTANCE.getJavaParameter_Final();
-
- /**
- * The meta object literal for the '<em><b>Parameter Kind</b></em>' attribute feature.
- * <!-- begin-user-doc -->
- * <!-- end-user-doc -->
- * @generated
- */
- EAttribute JAVA_PARAMETER__PARAMETER_KIND = eINSTANCE.getJavaParameter_ParameterKind();
-
- /**
- * The meta object literal for the '{@link org.eclipse.jem.java.internal.impl.MethodImpl <em>Method</em>}' class.
- * <!-- begin-user-doc -->
- * <!-- end-user-doc -->
- * @see org.eclipse.jem.java.internal.impl.MethodImpl
- * @see org.eclipse.jem.java.internal.impl.JavaRefPackageImpl#getMethod()
- * @generated
- */
- EClass METHOD = eINSTANCE.getMethod();
-
- /**
- * The meta object literal for the '<em><b>Abstract</b></em>' attribute feature.
- * <!-- begin-user-doc -->
- * <!-- end-user-doc -->
- * @generated
- */
- EAttribute METHOD__ABSTRACT = eINSTANCE.getMethod_Abstract();
-
- /**
- * The meta object literal for the '<em><b>Native</b></em>' attribute feature.
- * <!-- begin-user-doc -->
- * <!-- end-user-doc -->
- * @generated
- */
- EAttribute METHOD__NATIVE = eINSTANCE.getMethod_Native();
-
- /**
- * The meta object literal for the '<em><b>Synchronized</b></em>' attribute feature.
- * <!-- begin-user-doc -->
- * <!-- end-user-doc -->
- * @generated
- */
- EAttribute METHOD__SYNCHRONIZED = eINSTANCE.getMethod_Synchronized();
-
- /**
- * The meta object literal for the '<em><b>Final</b></em>' attribute feature.
- * <!-- begin-user-doc -->
- * <!-- end-user-doc -->
- * @generated
- */
- EAttribute METHOD__FINAL = eINSTANCE.getMethod_Final();
-
- /**
- * The meta object literal for the '<em><b>Constructor</b></em>' attribute feature.
- * <!-- begin-user-doc -->
- * <!-- end-user-doc -->
- * @generated
- */
- EAttribute METHOD__CONSTRUCTOR = eINSTANCE.getMethod_Constructor();
-
- /**
- * The meta object literal for the '<em><b>Static</b></em>' attribute feature.
- * <!-- begin-user-doc -->
- * <!-- end-user-doc -->
- * @generated
- */
- EAttribute METHOD__STATIC = eINSTANCE.getMethod_Static();
-
- /**
- * The meta object literal for the '<em><b>Java Visibility</b></em>' attribute feature.
- * <!-- begin-user-doc -->
- * <!-- end-user-doc -->
- * @generated
- */
- EAttribute METHOD__JAVA_VISIBILITY = eINSTANCE.getMethod_JavaVisibility();
-
- /**
- * The meta object literal for the '<em><b>Parameters</b></em>' containment reference list feature.
- * <!-- begin-user-doc -->
- * <!-- end-user-doc -->
- * @generated
- */
- EReference METHOD__PARAMETERS = eINSTANCE.getMethod_Parameters();
-
- /**
- * The meta object literal for the '<em><b>Java Exceptions</b></em>' reference list feature.
- * <!-- begin-user-doc -->
- * <!-- end-user-doc -->
- * @generated
- */
- EReference METHOD__JAVA_EXCEPTIONS = eINSTANCE.getMethod_JavaExceptions();
-
- /**
- * The meta object literal for the '<em><b>Java Class</b></em>' container reference feature.
- * <!-- begin-user-doc -->
- * <!-- end-user-doc -->
- * @generated
- */
- EReference METHOD__JAVA_CLASS = eINSTANCE.getMethod_JavaClass();
-
- /**
- * The meta object literal for the '<em><b>Source</b></em>' reference feature.
- * <!-- begin-user-doc -->
- * <!-- end-user-doc -->
- * @generated
- */
- EReference METHOD__SOURCE = eINSTANCE.getMethod_Source();
-
- /**
- * The meta object literal for the '{@link org.eclipse.jem.java.internal.impl.FieldImpl <em>Field</em>}' class.
- * <!-- begin-user-doc -->
- * <!-- end-user-doc -->
- * @see org.eclipse.jem.java.internal.impl.FieldImpl
- * @see org.eclipse.jem.java.internal.impl.JavaRefPackageImpl#getField()
- * @generated
- */
- EClass FIELD = eINSTANCE.getField();
-
- /**
- * The meta object literal for the '<em><b>Final</b></em>' attribute feature.
- * <!-- begin-user-doc -->
- * <!-- end-user-doc -->
- * @generated
- */
- EAttribute FIELD__FINAL = eINSTANCE.getField_Final();
-
- /**
- * The meta object literal for the '<em><b>Static</b></em>' attribute feature.
- * <!-- begin-user-doc -->
- * <!-- end-user-doc -->
- * @generated
- */
- EAttribute FIELD__STATIC = eINSTANCE.getField_Static();
-
- /**
- * The meta object literal for the '<em><b>Java Visibility</b></em>' attribute feature.
- * <!-- begin-user-doc -->
- * <!-- end-user-doc -->
- * @generated
- */
- EAttribute FIELD__JAVA_VISIBILITY = eINSTANCE.getField_JavaVisibility();
-
- /**
- * The meta object literal for the '<em><b>Transient</b></em>' attribute feature.
- * <!-- begin-user-doc -->
- * <!-- end-user-doc -->
- * @generated
- */
- EAttribute FIELD__TRANSIENT = eINSTANCE.getField_Transient();
-
- /**
- * The meta object literal for the '<em><b>Volatile</b></em>' attribute feature.
- * <!-- begin-user-doc -->
- * <!-- end-user-doc -->
- * @generated
- */
- EAttribute FIELD__VOLATILE = eINSTANCE.getField_Volatile();
-
- /**
- * The meta object literal for the '<em><b>Java Class</b></em>' container reference feature.
- * <!-- begin-user-doc -->
- * <!-- end-user-doc -->
- * @generated
- */
- EReference FIELD__JAVA_CLASS = eINSTANCE.getField_JavaClass();
-
- /**
- * The meta object literal for the '<em><b>Initializer</b></em>' containment reference feature.
- * <!-- begin-user-doc -->
- * <!-- end-user-doc -->
- * @generated
- */
- EReference FIELD__INITIALIZER = eINSTANCE.getField_Initializer();
-
- /**
- * The meta object literal for the '{@link org.eclipse.jem.java.internal.impl.BlockImpl <em>Block</em>}' class.
- * <!-- begin-user-doc -->
- * <!-- end-user-doc -->
- * @see org.eclipse.jem.java.internal.impl.BlockImpl
- * @see org.eclipse.jem.java.internal.impl.JavaRefPackageImpl#getBlock()
- * @generated
- */
- EClass BLOCK = eINSTANCE.getBlock();
-
- /**
- * The meta object literal for the '<em><b>Source</b></em>' attribute feature.
- * <!-- begin-user-doc -->
- * <!-- end-user-doc -->
- * @generated
- */
- EAttribute BLOCK__SOURCE = eINSTANCE.getBlock_Source();
-
- /**
- * The meta object literal for the '<em><b>Name</b></em>' attribute feature.
- * <!-- begin-user-doc -->
- * <!-- end-user-doc -->
- * @generated
- */
- EAttribute BLOCK__NAME = eINSTANCE.getBlock_Name();
-
- /**
- * The meta object literal for the '<em><b>Contents</b></em>' containment reference list feature.
- * <!-- begin-user-doc -->
- * <!-- end-user-doc -->
- * @generated
- */
- EReference BLOCK__CONTENTS = eINSTANCE.getBlock_Contents();
-
- /**
- * The meta object literal for the '{@link org.eclipse.jem.java.internal.impl.CommentImpl <em>Comment</em>}' class.
- * <!-- begin-user-doc -->
- * <!-- end-user-doc -->
- * @see org.eclipse.jem.java.internal.impl.CommentImpl
- * @see org.eclipse.jem.java.internal.impl.JavaRefPackageImpl#getComment()
- * @generated
- */
- EClass COMMENT = eINSTANCE.getComment();
-
- /**
- * The meta object literal for the '{@link org.eclipse.jem.java.internal.impl.StatementImpl <em>Statement</em>}' class.
- * <!-- begin-user-doc -->
- * <!-- end-user-doc -->
- * @see org.eclipse.jem.java.internal.impl.StatementImpl
- * @see org.eclipse.jem.java.internal.impl.JavaRefPackageImpl#getStatement()
- * @generated
- */
- EClass STATEMENT = eINSTANCE.getStatement();
-
- /**
- * The meta object literal for the '{@link org.eclipse.jem.java.internal.impl.JavaPackageImpl <em>Java Package</em>}' class.
- * <!-- begin-user-doc -->
- * <!-- end-user-doc -->
- * @see org.eclipse.jem.java.internal.impl.JavaPackageImpl
- * @see org.eclipse.jem.java.internal.impl.JavaRefPackageImpl#getJavaPackage()
- * @generated
- */
- EClass JAVA_PACKAGE = eINSTANCE.getJavaPackage();
-
- /**
- * The meta object literal for the '<em><b>Java Classes</b></em>' reference list feature.
- * <!-- begin-user-doc -->
- * <!-- end-user-doc -->
- * @generated
- */
- EReference JAVA_PACKAGE__JAVA_CLASSES = eINSTANCE.getJavaPackage_JavaClasses();
-
- /**
- * The meta object literal for the '{@link org.eclipse.jem.java.internal.impl.JavaDataTypeImpl <em>Java Data Type</em>}' class.
- * <!-- begin-user-doc -->
- * <!-- end-user-doc -->
- * @see org.eclipse.jem.java.internal.impl.JavaDataTypeImpl
- * @see org.eclipse.jem.java.internal.impl.JavaRefPackageImpl#getJavaDataType()
- * @generated
- */
- EClass JAVA_DATA_TYPE = eINSTANCE.getJavaDataType();
-
- /**
- * The meta object literal for the '{@link org.eclipse.jem.java.internal.impl.ArrayTypeImpl <em>Array Type</em>}' class.
- * <!-- begin-user-doc -->
- * <!-- end-user-doc -->
- * @see org.eclipse.jem.java.internal.impl.ArrayTypeImpl
- * @see org.eclipse.jem.java.internal.impl.JavaRefPackageImpl#getArrayType()
- * @generated
- */
- EClass ARRAY_TYPE = eINSTANCE.getArrayType();
-
- /**
- * The meta object literal for the '<em><b>Array Dimensions</b></em>' attribute feature.
- * <!-- begin-user-doc -->
- * <!-- end-user-doc -->
- * @generated
- */
- EAttribute ARRAY_TYPE__ARRAY_DIMENSIONS = eINSTANCE.getArrayType_ArrayDimensions();
-
- /**
- * The meta object literal for the '<em><b>Component Type</b></em>' reference feature.
- * <!-- begin-user-doc -->
- * <!-- end-user-doc -->
- * @generated
- */
- EReference ARRAY_TYPE__COMPONENT_TYPE = eINSTANCE.getArrayType_ComponentType();
-
- /**
- * The meta object literal for the '{@link org.eclipse.jem.java.internal.impl.JavaEventImpl <em>Java Event</em>}' class.
- * <!-- begin-user-doc -->
- * <!-- end-user-doc -->
- * @see org.eclipse.jem.java.internal.impl.JavaEventImpl
- * @see org.eclipse.jem.java.internal.impl.JavaRefPackageImpl#getJavaEvent()
- * @generated
- */
- EClass JAVA_EVENT = eINSTANCE.getJavaEvent();
-
- /**
- * The meta object literal for the '{@link org.eclipse.jem.java.TypeKind <em>Type Kind</em>}' enum.
- * <!-- begin-user-doc -->
- * <!-- end-user-doc -->
- * @see org.eclipse.jem.java.TypeKind
- * @see org.eclipse.jem.java.internal.impl.JavaRefPackageImpl#getTypeKind()
- * @generated
- */
- EEnum TYPE_KIND = eINSTANCE.getTypeKind();
-
- /**
- * The meta object literal for the '{@link org.eclipse.jem.java.JavaVisibilityKind <em>Java Visibility Kind</em>}' enum.
- * <!-- begin-user-doc -->
- * <!-- end-user-doc -->
- * @see org.eclipse.jem.java.JavaVisibilityKind
- * @see org.eclipse.jem.java.internal.impl.JavaRefPackageImpl#getJavaVisibilityKind()
- * @generated
- */
- EEnum JAVA_VISIBILITY_KIND = eINSTANCE.getJavaVisibilityKind();
-
- /**
- * The meta object literal for the '{@link org.eclipse.jem.java.JavaParameterKind <em>Java Parameter Kind</em>}' enum.
- * <!-- begin-user-doc -->
- * <!-- end-user-doc -->
- * @see org.eclipse.jem.java.JavaParameterKind
- * @see org.eclipse.jem.java.internal.impl.JavaRefPackageImpl#getJavaParameterKind()
- * @generated
- */
- EEnum JAVA_PARAMETER_KIND = eINSTANCE.getJavaParameterKind();
-
- /**
- * The meta object literal for the '<em>JType Java Helpers</em>' data type.
- * <!-- begin-user-doc -->
- * <!-- end-user-doc -->
- * @see org.eclipse.jem.java.JavaHelpers
- * @see org.eclipse.jem.java.internal.impl.JavaRefPackageImpl#getJTypeJavaHelpers()
- * @generated
- */
- EDataType JTYPE_JAVA_HELPERS = eINSTANCE.getJTypeJavaHelpers();
-
- /**
- * The meta object literal for the '<em>JType List</em>' data type.
- * <!-- begin-user-doc -->
- * <!-- end-user-doc -->
- * @see java.util.List
- * @see org.eclipse.jem.java.internal.impl.JavaRefPackageImpl#getJTypeList()
- * @generated
- */
- EDataType JTYPE_LIST = eINSTANCE.getJTypeList();
-
- }
-
-} //JavaRefPackage
-
-
-
-
-
-
diff --git a/plugins/org.eclipse.jem/mofjava/org/eclipse/jem/java/JavaURL.java b/plugins/org.eclipse.jem/mofjava/org/eclipse/jem/java/JavaURL.java
deleted file mode 100644
index 6ac1209..0000000
--- a/plugins/org.eclipse.jem/mofjava/org/eclipse/jem/java/JavaURL.java
+++ /dev/null
@@ -1,123 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2001, 2006 IBM Corporation and others.
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
- *
- * Contributors:
- * IBM Corporation - initial API and implementation
- *******************************************************************************/
-package org.eclipse.jem.java;
-/*
-
-
- */
-
-
-/**
- * @deprecated Use the appropriate {@link JavaRefFactory} URI methods instead.
- *
- * @since 1.2.0
- */
-public class JavaURL extends org.eclipse.jem.java.internal.impl.URL {
- public static final String JAVA_PROTOCOL_URI_PREFIX = "java:/"; //$NON-NLS-1$
- /**
- * JavaURL constructor comment.
- * @param urlString java.lang.String
- *
- * @deprecated Use {@link JavaRefFactory#createTypeURI(String)} or {@link JavaRefFactory#createPackageURI(String)}
- */
- public JavaURL(String urlString) {
- super(urlString);
- }
- /**
- * JavaURL constructor comment.
- * @param nameSpaceName java.lang.String
- * @param iD java.lang.String
- * @deprecated Use {@link JavaRefFactory#createTypeURI(String, String)}
- *
- */
- public JavaURL(String nameSpaceName, String iD) {
- super(null, null);
- initializeNamespaceString(nameSpaceName);
- this.ID = iD;
- }
-
- /**
- *
- * @return
- * @deprecated Use {@link JavaRefFactory#getTypeName(org.eclipse.emf.common.util.URI)}
- */
- public String getClassName() {
- return ID;
- }
-
- /**
- * This method was created in VisualAge.
- * @return java.lang.String
- *
- * @deprecated Use {@link JavaRefFactory#getFullTypeName(org.eclipse.emf.common.util.URI)}
- */
- public String getFullString() {
- StringBuffer buf = new StringBuffer();
- if (namespaceName != null) {
- buf.append(namespaceName);
- if (ID != null)
- buf.append("#"); //$NON-NLS-1$
- }
- if (ID != null)
- buf.append(ID);
- return buf.toString();
- }
-
- /**
- *
- * @return
- * @deprecated Use {@link JavaRefFactory#getPackageName(org.eclipse.emf.common.util.URI)}
- * @since 1.2.0
- */
- public String getPackageName() {
- String internalName = namespaceName.substring(JAVA_PROTOCOL_URI_PREFIX.length(), namespaceName.length());
- return JavaPackage.PRIMITIVE_PACKAGE_NAME.equals(internalName) ? "" : internalName; //$NON-NLS-1$
- }
- /* If we don't have a # sign to delimit the start of the java package us the inherited behavior
- */
- public void initializeFromString(String url) {
- if (url.indexOf("#") != -1) //$NON-NLS-1$
- super.initializeFromString(url);
- else {
- int endOfPackageName = url.lastIndexOf('.');
- if (endOfPackageName == -1)
- initializeNamespaceString(null);
- else
- initializeNamespaceString(url.substring(0, endOfPackageName));
- ID = url.substring(endOfPackageName + 1);
- }
-
- }
- /*
- */
- public void initializeNamespaceString(String aNamespaceName) {
- if (aNamespaceName == null)
- namespaceName = JAVA_PROTOCOL_URI_PREFIX;
- else
- namespaceName = JAVA_PROTOCOL_URI_PREFIX + aNamespaceName;
- }
-
- /**
- *
- * @param aUrlString
- * @return
- * @deprecated Use {@link JavaRefFactory#isJavaURI(org.eclipse.emf.common.util.URI)}
- */
- public static boolean isJavaURL(String aUrlString) {
- if (aUrlString == null)
- return false;
- return aUrlString.startsWith(JAVA_PROTOCOL_URI_PREFIX);
- }
-
- public String toString() {
- return "URL(" + getFullString() + ")"; //$NON-NLS-1$ //$NON-NLS-2$
- }
-}
diff --git a/plugins/org.eclipse.jem/mofjava/org/eclipse/jem/java/JavaVisibilityKind.java b/plugins/org.eclipse.jem/mofjava/org/eclipse/jem/java/JavaVisibilityKind.java
deleted file mode 100644
index 9fc63c3..0000000
--- a/plugins/org.eclipse.jem/mofjava/org/eclipse/jem/java/JavaVisibilityKind.java
+++ /dev/null
@@ -1,219 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2001, 2005 IBM Corporation and others.
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
- *
- * Contributors:
- * IBM Corporation - initial API and implementation
- *******************************************************************************/
-package org.eclipse.jem.java;
-/*
-
-
- */
-import java.util.Arrays;
-import java.util.Collections;
-import java.util.List;
-
-import org.eclipse.emf.common.util.AbstractEnumerator;
-
-/**
- * <!-- begin-user-doc -->
- * A representation of the literals of the enumeration '<em><b>Java Visibility Kind</b></em>',
- * and utility methods for working with them.
- * <!-- end-user-doc -->
- * <!-- begin-model-doc -->
- * PACKAGE=1
- * PUBLIC=2
- * PRIVATE=3
- * PROTECTED=4
- * <!-- end-model-doc -->
- * @see org.eclipse.jem.java.JavaRefPackage#getJavaVisibilityKind()
- * @model
- * @generated
- */
-public final class JavaVisibilityKind extends AbstractEnumerator
-{
- /**
- * The '<em><b>PUBLIC</b></em>' literal value.
- * <!-- begin-user-doc -->
- * <!-- end-user-doc -->
- * @see #PUBLIC_LITERAL
- * @model
- * @generated
- * @ordered
- */
- public static final int PUBLIC = 0;
-
- /**
- * The '<em><b>PRIVATE</b></em>' literal value.
- * <!-- begin-user-doc -->
- * <!-- end-user-doc -->
- * @see #PRIVATE_LITERAL
- * @model
- * @generated
- * @ordered
- */
- public static final int PRIVATE = 1;
-
- /**
- * The '<em><b>PROTECTED</b></em>' literal value.
- * <!-- begin-user-doc -->
- * <!-- end-user-doc -->
- * @see #PROTECTED_LITERAL
- * @model
- * @generated
- * @ordered
- */
- public static final int PROTECTED = 2;
-
- /**
- * The '<em><b>PACKAGE</b></em>' literal value.
- * <!-- begin-user-doc -->
- * <!-- end-user-doc -->
- * @see #PACKAGE_LITERAL
- * @model
- * @generated
- * @ordered
- */
- public static final int PACKAGE = 3;
-
- /**
- * The '<em><b>PUBLIC</b></em>' literal object.
- * <!-- begin-user-doc -->
- * <p>
- * If the meaning of '<em><b>PUBLIC</b></em>' literal object isn't clear,
- * there really should be more of a description here...
- * </p>
- * <!-- end-user-doc -->
- * @see #PUBLIC
- * @generated
- * @ordered
- */
- public static final JavaVisibilityKind PUBLIC_LITERAL = new JavaVisibilityKind(PUBLIC, "PUBLIC", "PUBLIC");
-
- /**
- * The '<em><b>PRIVATE</b></em>' literal object.
- * <!-- begin-user-doc -->
- * <p>
- * If the meaning of '<em><b>PRIVATE</b></em>' literal object isn't clear,
- * there really should be more of a description here...
- * </p>
- * <!-- end-user-doc -->
- * @see #PRIVATE
- * @generated
- * @ordered
- */
- public static final JavaVisibilityKind PRIVATE_LITERAL = new JavaVisibilityKind(PRIVATE, "PRIVATE", "PRIVATE");
-
- /**
- * The '<em><b>PROTECTED</b></em>' literal object.
- * <!-- begin-user-doc -->
- * <p>
- * If the meaning of '<em><b>PROTECTED</b></em>' literal object isn't clear,
- * there really should be more of a description here...
- * </p>
- * <!-- end-user-doc -->
- * @see #PROTECTED
- * @generated
- * @ordered
- */
- public static final JavaVisibilityKind PROTECTED_LITERAL = new JavaVisibilityKind(PROTECTED, "PROTECTED", "PROTECTED");
-
- /**
- * The '<em><b>PACKAGE</b></em>' literal object.
- * <!-- begin-user-doc -->
- * <p>
- * If the meaning of '<em><b>PACKAGE</b></em>' literal object isn't clear,
- * there really should be more of a description here...
- * </p>
- * <!-- end-user-doc -->
- * @see #PACKAGE
- * @generated
- * @ordered
- */
- public static final JavaVisibilityKind PACKAGE_LITERAL = new JavaVisibilityKind(PACKAGE, "PACKAGE", "PACKAGE");
-
- /**
- * An array of all the '<em><b>Java Visibility Kind</b></em>' enumerators.
- * <!-- begin-user-doc -->
- * <!-- end-user-doc -->
- * @generated
- */
- private static final JavaVisibilityKind[] VALUES_ARRAY =
- new JavaVisibilityKind[] {
- PUBLIC_LITERAL,
- PRIVATE_LITERAL,
- PROTECTED_LITERAL,
- PACKAGE_LITERAL,
- };
-
- /**
- * A public read-only list of all the '<em><b>Java Visibility Kind</b></em>' enumerators.
- * <!-- begin-user-doc -->
- * <!-- end-user-doc -->
- * @generated
- */
- public static final List VALUES = Collections.unmodifiableList(Arrays.asList(VALUES_ARRAY));
-
- /**
- * Returns the '<em><b>Java Visibility Kind</b></em>' literal with the specified literal value.
- * <!-- begin-user-doc -->
- * <!-- end-user-doc -->
- * @generated
- */
- public static JavaVisibilityKind get(String literal) {
- for (int i = 0; i < VALUES_ARRAY.length; ++i) {
- JavaVisibilityKind result = VALUES_ARRAY[i];
- if (result.toString().equals(literal)) {
- return result;
- }
- }
- return null;
- }
-
- /**
- * Returns the '<em><b>Java Visibility Kind</b></em>' literal with the specified name.
- * <!-- begin-user-doc -->
- * <!-- end-user-doc -->
- * @generated
- */
- public static JavaVisibilityKind getByName(String name) {
- for (int i = 0; i < VALUES_ARRAY.length; ++i) {
- JavaVisibilityKind result = VALUES_ARRAY[i];
- if (result.getName().equals(name)) {
- return result;
- }
- }
- return null;
- }
-
- /**
- * Returns the '<em><b>Java Visibility Kind</b></em>' literal with the specified integer value.
- * <!-- begin-user-doc -->
- * <!-- end-user-doc -->
- * @generated
- */
- public static JavaVisibilityKind get(int value) {
- switch (value) {
- case PUBLIC: return PUBLIC_LITERAL;
- case PRIVATE: return PRIVATE_LITERAL;
- case PROTECTED: return PROTECTED_LITERAL;
- case PACKAGE: return PACKAGE_LITERAL;
- }
- return null;
- }
-
- /**
- * Only this class can construct instances.
- * <!-- begin-user-doc -->
- * <!-- end-user-doc -->
- * @generated
- */
- private JavaVisibilityKind(int value, String name, String literal) {
- super(value, name, literal);
- }
-
-} //JavaVisibilityKind
diff --git a/plugins/org.eclipse.jem/mofjava/org/eclipse/jem/java/Method.java b/plugins/org.eclipse.jem/mofjava/org/eclipse/jem/java/Method.java
deleted file mode 100644
index 77ca5c3..0000000
--- a/plugins/org.eclipse.jem/mofjava/org/eclipse/jem/java/Method.java
+++ /dev/null
@@ -1,279 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2001, 2005 IBM Corporation and others.
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
- *
- * Contributors:
- * IBM Corporation - initial API and implementation
- *******************************************************************************/
-package org.eclipse.jem.java;
-
-/*
-
-
- */
-import org.eclipse.emf.common.util.EList;
-import org.eclipse.emf.ecore.EOperation;
-
-/**
- * @generated
- */
-public interface Method extends EOperation{
-
- public static final String GENERATED_COMMENT_TAG = "@generated";
- /**
- * Lists all the parameters, excluding the return type
- */
- public JavaParameter[] listParametersWithoutReturn();
-
- /**
- * @generated This field/method will be replaced during code generation
- * @return The value of the IsAbstract attribute
- */
- boolean isAbstract();
-
- /**
- * Sets the value of the '{@link org.eclipse.jem.java.Method#isAbstract <em>Abstract</em>}' attribute.
- * <!-- begin-user-doc -->
- * <!-- end-user-doc -->
- * @param value the new value of the '<em>Abstract</em>' attribute.
- * @see #isAbstract()
- * @generated
- */
- void setAbstract(boolean value);
-
- /**
- * @generated This field/method will be replaced during code generation
- * @return The value of the IsNative attribute
- */
- boolean isNative();
-
- /**
- * Sets the value of the '{@link org.eclipse.jem.java.Method#isNative <em>Native</em>}' attribute.
- * <!-- begin-user-doc -->
- * <!-- end-user-doc -->
- * @param value the new value of the '<em>Native</em>' attribute.
- * @see #isNative()
- * @generated
- */
- void setNative(boolean value);
-
- /**
- * @generated This field/method will be replaced during code generation
- * @return The value of the IsSynchronized attribute
- */
- boolean isSynchronized();
-
- /**
- * Sets the value of the '{@link org.eclipse.jem.java.Method#isSynchronized <em>Synchronized</em>}' attribute.
- * <!-- begin-user-doc -->
- * <!-- end-user-doc -->
- * @param value the new value of the '<em>Synchronized</em>' attribute.
- * @see #isSynchronized()
- * @generated
- */
- void setSynchronized(boolean value);
-
- /**
- * @generated This field/method will be replaced during code generation
- * @return The value of the IsFinal attribute
- */
- boolean isFinal();
-
- /**
- * Sets the value of the '{@link org.eclipse.jem.java.Method#isFinal <em>Final</em>}' attribute.
- * <!-- begin-user-doc -->
- * <!-- end-user-doc -->
- * @param value the new value of the '<em>Final</em>' attribute.
- * @see #isFinal()
- * @generated
- */
- void setFinal(boolean value);
-
- /**
- * @generated This field/method will be replaced during code generation
- * @return The value of the IsConstructor attribute
- */
- boolean isConstructor();
-
- /**
- * Sets the value of the '{@link org.eclipse.jem.java.Method#isConstructor <em>Constructor</em>}' attribute.
- * <!-- begin-user-doc -->
- * <!-- end-user-doc -->
- * @param value the new value of the '<em>Constructor</em>' attribute.
- * @see #isConstructor()
- * @generated
- */
- void setConstructor(boolean value);
-
- /**
- * @generated This field/method will be replaced during code generation
- * @return The value of the IsStatic attribute
- */
- boolean isStatic();
-
- /**
- * Sets the value of the '{@link org.eclipse.jem.java.Method#isStatic <em>Static</em>}' attribute.
- * <!-- begin-user-doc -->
- * <!-- end-user-doc -->
- * @param value the new value of the '<em>Static</em>' attribute.
- * @see #isStatic()
- * @generated
- */
- void setStatic(boolean value);
-
- /**
- * @generated This field/method will be replaced during code generation
- * @return The value of the JavaVisibility attribute
- */
- JavaVisibilityKind getJavaVisibility();
-
- /**
- * Sets the value of the '{@link org.eclipse.jem.java.Method#getJavaVisibility <em>Java Visibility</em>}' attribute.
- * <!-- begin-user-doc -->
- * <!-- end-user-doc -->
- * @param value the new value of the '<em>Java Visibility</em>' attribute.
- * @see org.eclipse.jem.java.JavaVisibilityKind
- * @see #getJavaVisibility()
- * @generated
- */
- void setJavaVisibility(JavaVisibilityKind value);
-
- /**
- * @generated This field/method will be replaced during code generation
- * @return The list of Parameters references
- */
- EList getParameters();
-
- /**
- * @generated This field/method will be replaced during code generation
- * @return The list of JavaExceptions references
- */
- EList getJavaExceptions();
-
- /**
- * @generated This field/method will be replaced during code generation
- * @return The JavaClass reference
- */
- JavaClass getJavaClass();
-
- /**
- * Sets the value of the '{@link org.eclipse.jem.java.Method#getJavaClass <em>Java Class</em>}' container reference.
- * <!-- begin-user-doc -->
- * <!-- end-user-doc -->
- * @param value the new value of the '<em>Java Class</em>' container reference.
- * @see #getJavaClass()
- * @generated
- */
- void setJavaClass(JavaClass value);
-
- /**
- * @generated This field/method will be replaced during code generation
- * @return The Source reference
- */
- Block getSource();
-
- /**
- * Sets the value of the '{@link org.eclipse.jem.java.Method#getSource <em>Source</em>}' reference.
- * <!-- begin-user-doc -->
- * <!-- end-user-doc -->
- * @param value the new value of the '<em>Source</em>' reference.
- * @see #getSource()
- * @generated
- */
- void setSource(Block value);
-
- /**
- * @generated This field/method will be replaced during code generation
- * Return the java class that this method is defined in.
- */
- JavaClass getContainingJavaClass();
-
- /**
- * @generated This field/method will be replaced during code generation
- * Return a String with the the method name and its parameters. e.g. <code>
- * setFirstName(java.lang.String) <//code> .
- *
- */
- String getMethodElementSignature();
-
- /**
- * @generated This field/method will be replaced during code generation
- * Return a Parameter with the passed name, or null.
- */
- JavaParameter getParameter(String parameterName);
-
- /**
- * @generated This field/method will be replaced during code generation
- * Get the return type.
- */
- JavaHelpers getReturnType();
-
- /**
- * <!-- begin-user-doc -->
- * <!-- end-user-doc -->
- * <!-- begin-model-doc -->
- * Set the return type
- * <!-- end-model-doc -->
- * @model typeDataType="org.eclipse.jem.java.JTypeJavaHelpers"
- * @generated
- */
- void setReturnType(JavaHelpers type);
-
- /**
- * @generated This field/method will be replaced during code generation
- * Replicate the functionality of java.lang.reflect.Method.toString().
- *
- * Returns a string describing this Method. The string is formatted as the method
- * access modifiers, if any, followed by the method return type, followed by a
- * space, followed by the class declaring the method, followed by a period,
- * followed by the method name, followed by a parenthesized, comma-separated list
- * of the method's formal parameter types. If the method throws checked
- * exceptions, the parameter list is followed by a space, followed by the word
- * throws followed by a comma-separated list of the thrown exception types.
- *
- * For example:
- *
- * public boolean java.lang.Object.equals(java.lang.Object)
- *
- * The access modifiers are placed in canonical order as specified by "The Java
- * Language Specification". This is public, <tt>protected<//tt> or
- * <tt>private<//tt> first, and then other modifiers in the following order:
- * <tt>abstract<//tt>, <tt>static<//tt>, <tt>final<//tt>, <tt>synchronized<//tt>
- * <tt>native<//tt>.
-
- */
- String getSignature();
-
- /**
- * @generated This field/method will be replaced during code generation
- * Returns true if the method is system generated.
- * This is usually determined by the @generated tag in the comment.
- */
- boolean isGenerated();
-
- /**
- * <!-- begin-user-doc -->
- * <!-- end-user-doc -->
- * <!-- begin-model-doc -->
- * Set the isGenerated flag.
- * <!-- end-model-doc -->
- * @model
- * @generated
- */
- void setIsGenerated(boolean generated);
-
- /**
- * @generated This field/method will be replaced during code generation
- * Is this a void return type method.
- */
- boolean isVoid();
-
-}
-
-
-
-
-
diff --git a/plugins/org.eclipse.jem/mofjava/org/eclipse/jem/java/Statement.java b/plugins/org.eclipse.jem/mofjava/org/eclipse/jem/java/Statement.java
deleted file mode 100644
index 5d62de9..0000000
--- a/plugins/org.eclipse.jem/mofjava/org/eclipse/jem/java/Statement.java
+++ /dev/null
@@ -1,27 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2001, 2005 IBM Corporation and others.
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
- *
- * Contributors:
- * IBM Corporation - initial API and implementation
- *******************************************************************************/
-/*
-
-
- */
-package org.eclipse.jem.java;
-
-/**
- * @generated
- */
-public interface Statement extends Block {
-
-}
-
-
-
-
-
diff --git a/plugins/org.eclipse.jem/mofjava/org/eclipse/jem/java/TypeKind.java b/plugins/org.eclipse.jem/mofjava/org/eclipse/jem/java/TypeKind.java
deleted file mode 100644
index d5133c2..0000000
--- a/plugins/org.eclipse.jem/mofjava/org/eclipse/jem/java/TypeKind.java
+++ /dev/null
@@ -1,216 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2001, 2005 IBM Corporation and others.
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
- *
- * Contributors:
- * IBM Corporation - initial API and implementation
- *******************************************************************************/
-package org.eclipse.jem.java;
-/*
-
-
- */
-import java.util.Arrays;
-import java.util.Collections;
-import java.util.List;
-
-import org.eclipse.emf.common.util.AbstractEnumerator;
-
-/**
- * <!-- begin-user-doc -->
- * A representation of the literals of the enumeration '<em><b>Type Kind</b></em>',
- * and utility methods for working with them.
- * <!-- end-user-doc -->
- * <!-- begin-model-doc -->
- * UNDEFINED=1 CLASS=2 INTERFACE=3 EXCEPTION=4
- * <!-- end-model-doc -->
- * @see org.eclipse.jem.java.JavaRefPackage#getTypeKind()
- * @model
- * @generated
- */
-public final class TypeKind extends AbstractEnumerator
-{
- /**
- * The '<em><b>UNDEFINED</b></em>' literal value.
- * <!-- begin-user-doc -->
- * <!-- end-user-doc -->
- * @see #UNDEFINED_LITERAL
- * @model
- * @generated
- * @ordered
- */
- public static final int UNDEFINED = 0;
-
- /**
- * The '<em><b>CLASS</b></em>' literal value.
- * <!-- begin-user-doc -->
- * <!-- end-user-doc -->
- * @see #CLASS_LITERAL
- * @model
- * @generated
- * @ordered
- */
- public static final int CLASS = 1;
-
- /**
- * The '<em><b>INTERFACE</b></em>' literal value.
- * <!-- begin-user-doc -->
- * <!-- end-user-doc -->
- * @see #INTERFACE_LITERAL
- * @model
- * @generated
- * @ordered
- */
- public static final int INTERFACE = 2;
-
- /**
- * The '<em><b>EXCEPTION</b></em>' literal value.
- * <!-- begin-user-doc -->
- * <!-- end-user-doc -->
- * @see #EXCEPTION_LITERAL
- * @model
- * @generated
- * @ordered
- */
- public static final int EXCEPTION = 3;
-
- /**
- * The '<em><b>UNDEFINED</b></em>' literal object.
- * <!-- begin-user-doc -->
- * <p>
- * If the meaning of '<em><b>UNDEFINED</b></em>' literal object isn't clear,
- * there really should be more of a description here...
- * </p>
- * <!-- end-user-doc -->
- * @see #UNDEFINED
- * @generated
- * @ordered
- */
- public static final TypeKind UNDEFINED_LITERAL = new TypeKind(UNDEFINED, "UNDEFINED", "UNDEFINED");
-
- /**
- * The '<em><b>CLASS</b></em>' literal object.
- * <!-- begin-user-doc -->
- * <p>
- * If the meaning of '<em><b>CLASS</b></em>' literal object isn't clear,
- * there really should be more of a description here...
- * </p>
- * <!-- end-user-doc -->
- * @see #CLASS
- * @generated
- * @ordered
- */
- public static final TypeKind CLASS_LITERAL = new TypeKind(CLASS, "CLASS", "CLASS");
-
- /**
- * The '<em><b>INTERFACE</b></em>' literal object.
- * <!-- begin-user-doc -->
- * <p>
- * If the meaning of '<em><b>INTERFACE</b></em>' literal object isn't clear,
- * there really should be more of a description here...
- * </p>
- * <!-- end-user-doc -->
- * @see #INTERFACE
- * @generated
- * @ordered
- */
- public static final TypeKind INTERFACE_LITERAL = new TypeKind(INTERFACE, "INTERFACE", "INTERFACE");
-
- /**
- * The '<em><b>EXCEPTION</b></em>' literal object.
- * <!-- begin-user-doc -->
- * <p>
- * If the meaning of '<em><b>EXCEPTION</b></em>' literal object isn't clear,
- * there really should be more of a description here...
- * </p>
- * <!-- end-user-doc -->
- * @see #EXCEPTION
- * @generated
- * @ordered
- */
- public static final TypeKind EXCEPTION_LITERAL = new TypeKind(EXCEPTION, "EXCEPTION", "EXCEPTION");
-
- /**
- * An array of all the '<em><b>Type Kind</b></em>' enumerators.
- * <!-- begin-user-doc -->
- * <!-- end-user-doc -->
- * @generated
- */
- private static final TypeKind[] VALUES_ARRAY =
- new TypeKind[] {
- UNDEFINED_LITERAL,
- CLASS_LITERAL,
- INTERFACE_LITERAL,
- EXCEPTION_LITERAL,
- };
-
- /**
- * A public read-only list of all the '<em><b>Type Kind</b></em>' enumerators.
- * <!-- begin-user-doc -->
- * <!-- end-user-doc -->
- * @generated
- */
- public static final List VALUES = Collections.unmodifiableList(Arrays.asList(VALUES_ARRAY));
-
- /**
- * Returns the '<em><b>Type Kind</b></em>' literal with the specified literal value.
- * <!-- begin-user-doc -->
- * <!-- end-user-doc -->
- * @generated
- */
- public static TypeKind get(String literal) {
- for (int i = 0; i < VALUES_ARRAY.length; ++i) {
- TypeKind result = VALUES_ARRAY[i];
- if (result.toString().equals(literal)) {
- return result;
- }
- }
- return null;
- }
-
- /**
- * Returns the '<em><b>Type Kind</b></em>' literal with the specified name.
- * <!-- begin-user-doc -->
- * <!-- end-user-doc -->
- * @generated
- */
- public static TypeKind getByName(String name) {
- for (int i = 0; i < VALUES_ARRAY.length; ++i) {
- TypeKind result = VALUES_ARRAY[i];
- if (result.getName().equals(name)) {
- return result;
- }
- }
- return null;
- }
-
- /**
- * Returns the '<em><b>Type Kind</b></em>' literal with the specified integer value.
- * <!-- begin-user-doc -->
- * <!-- end-user-doc -->
- * @generated
- */
- public static TypeKind get(int value) {
- switch (value) {
- case UNDEFINED: return UNDEFINED_LITERAL;
- case CLASS: return CLASS_LITERAL;
- case INTERFACE: return INTERFACE_LITERAL;
- case EXCEPTION: return EXCEPTION_LITERAL;
- }
- return null;
- }
-
- /**
- * Only this class can construct instances.
- * <!-- begin-user-doc -->
- * <!-- end-user-doc -->
- * @generated
- */
- private TypeKind(int value, String name, String literal) {
- super(value, name, literal);
- }
-
-} //TypeKind
diff --git a/plugins/org.eclipse.jem/mofjava/org/eclipse/jem/java/adapters/IJavaReflectionKey.java b/plugins/org.eclipse.jem/mofjava/org/eclipse/jem/java/adapters/IJavaReflectionKey.java
deleted file mode 100644
index d6fe81c..0000000
--- a/plugins/org.eclipse.jem/mofjava/org/eclipse/jem/java/adapters/IJavaReflectionKey.java
+++ /dev/null
@@ -1,129 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2005 IBM Corporation and others.
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
- *
- * Contributors:
- * IBM Corporation - initial API and implementation
- *******************************************************************************/
-/*
-
-
- */
-package org.eclipse.jem.java.adapters;
-
-import org.eclipse.emf.ecore.EClassifier;
-import org.eclipse.emf.ecore.EObject;
-
-import org.eclipse.jem.java.*;
-
-public interface IJavaReflectionKey {
-
- /* Constants for the primitive type names
- * These are the values which are used to refer to a primitive type,
- * i.e. new JavaURL("int") or new URL("java://#int")
- * These types are cached by pre-loading documents for the primitives,
- * in "java://", and for the java.lang (Object and String) classes
- */
- static final public String N_VOID = "void"; //$NON-NLS-1$
- static final public String N_INT = "int";//$NON-NLS-1$
- static final public String N_BOOLEAN = "boolean";//$NON-NLS-1$
- static final public String N_CHAR = "char";//$NON-NLS-1$
- static final public String N_BYTE = "byte";//$NON-NLS-1$
- static final public String N_LONG = "long";//$NON-NLS-1$
- static final public String N_FLOAT = "float";//$NON-NLS-1$
- static final public String N_DOUBLE = "double";//$NON-NLS-1$
- static final public String N_SHORT = "short";//$NON-NLS-1$
-
- /*
- * Create an ArrayType instance in the current document
- * Handles the push and pop of the current document.
- */
- public abstract ArrayType createArrayType();
-
- /*
- * Create a JavaClass instance in the current document
- * Handles the push and pop of the current document.
- */
- public abstract JavaClass createJavaClass();
-
- /*
- * Create a Field instance in the current document
- * Handles the push and pop of the current document.
- */
- public abstract Field createJavaField();
-
- /*
- * Create a Method instance in the current document
- * Handles the push and pop of the current document.
- */
- public abstract Method createJavaMethod();
-
- /*
- * Create a JavaParameter instance in the current document
- */
- public abstract JavaParameter createJavaParameter();
-
- //FB/**
- //FB * Override to try to introspect objects
- //FB * that aren't found using the default mechanism.
- //FB */
- //FBpublic Object get(Object key) {
- //FB Object javaObject = super.get(key);
- //FB if (javaObject == null) {
- //FB javaObject = getObjectFromExtensions((String) key);
- //FB if (javaObject == null)
- //FB javaObject = getJavaObject((String) key);
- //FB }
- //FB return javaObject;
- //FB}
-
- //FB ADDED
- public abstract Object get(String key);
-
- //FB END
-
- /*
- * Instantiate the named class.
- * If we make it to this point, the class has not yet been instantiated or reflected.
- */
- public abstract EClassifier getArrayType(String typeName);
-
- /*
- * Instantiate the named class.
- * If we make it to this point, teh class has not yet been instantiated or reflected.
- */
- public abstract EClassifier getJavaClass(String typeName);
-
- /**
- * This allows for the retrieval of attributes/methods with the following notation:
- * field: java:/com.ibm.foo#Test.foo
- * method: java:/com.ibm.foo#Test.foofoo(
- * parameter: java:/com.ibm.foo#Test.foofoo(-arg0
- *
- */
- public abstract EObject getJavaObject(String keyValue);
-
- /**
- * Insert the method's description here.
- * Creation date: (10/4/2000 9:52:28 AM)
- * @return org.eclipse.emf.ecore.EClassifier
- * @param typeName java.lang.String
- */
- public abstract EClassifier getJavaType(String typeName);
-
- /**
- * Get the object from the key but don't do any
- * tries at creation of the key if not found.
- * The Key must be an ID for it to be found.
- */
- public abstract Object primGet(String key);
-
- /**
- * Return true if the passed type represents a Java Array type
- */
- public abstract boolean isArray(String typeName);
-
-}
\ No newline at end of file
diff --git a/plugins/org.eclipse.jem/mofjava/org/eclipse/jem/java/adapters/IJavaReflectionKeyExtension.java b/plugins/org.eclipse.jem/mofjava/org/eclipse/jem/java/adapters/IJavaReflectionKeyExtension.java
deleted file mode 100644
index 9097fc9..0000000
--- a/plugins/org.eclipse.jem/mofjava/org/eclipse/jem/java/adapters/IJavaReflectionKeyExtension.java
+++ /dev/null
@@ -1,38 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2001, 2005 IBM Corporation and others.
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
- *
- * Contributors:
- * IBM Corporation - initial API and implementation
- *******************************************************************************/
-/*
-
-
- */
-package org.eclipse.jem.java.adapters;
-
-/**
- * Extension interface to add an additional reflection key in to handle
- * other types of key's not specifically handled.
- *
- * @since 1.0.0
- */
-public interface IJavaReflectionKeyExtension {
-
- /**
- * Get the object from the given id.
- * @param id
- * @param reflectionKey
- * @return the object (it should add the id with object to the resource's id table before returning it) or <code>null</code> if not one it handles.
- *
- * @since 1.0.0
- */
- public Object getObject(String id, IJavaReflectionKey reflectionKey);
-
-}
-
-
-
diff --git a/plugins/org.eclipse.jem/mofjava/org/eclipse/jem/java/adapters/JavaXMIFactory.java b/plugins/org.eclipse.jem/mofjava/org/eclipse/jem/java/adapters/JavaXMIFactory.java
deleted file mode 100644
index 0abfae6..0000000
--- a/plugins/org.eclipse.jem/mofjava/org/eclipse/jem/java/adapters/JavaXMIFactory.java
+++ /dev/null
@@ -1,48 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2005 IBM Corporation and others.
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
- *
- * Contributors:
- * IBM Corporation - initial API and implementation
- *******************************************************************************/
-/*
-
-
- */
-package org.eclipse.jem.java.adapters;
-
-import org.eclipse.jem.internal.java.adapters.JavaXMIFactoryImpl;
-
-
-/**
- * Factory for Java XMI Resources.
- * @since 1.2.0
- */
-public interface JavaXMIFactory {
-
- /**
- * Scheme used in URI's for jem elements.
- * @since 1.2.0
- */
- public static final String SCHEME = "java"; //$NON-NLS-1$
- public static final JavaXMIFactory INSTANCE = new JavaXMIFactoryImpl();
-
- /**
- * Register the reflection key extension.
- * @param extension
- *
- * @since 1.2.0
- */
- public void registerReflectionKeyExtension(IJavaReflectionKeyExtension extension);
-
- /**
- * Deregister the reflection key extension.
- * @param extension
- *
- * @since 1.2.0
- */
- public void deregisterReflectionKeyExtension(IJavaReflectionKeyExtension extension);
-}
diff --git a/plugins/org.eclipse.jem/mofjava/org/eclipse/jem/java/impl/JavaRefPackageImpl.java b/plugins/org.eclipse.jem/mofjava/org/eclipse/jem/java/impl/JavaRefPackageImpl.java
deleted file mode 100644
index 1b09045..0000000
--- a/plugins/org.eclipse.jem/mofjava/org/eclipse/jem/java/impl/JavaRefPackageImpl.java
+++ /dev/null
@@ -1,43 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2006 IBM Corporation and others.
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
- *
- * Contributors:
- * IBM Corporation - initial API and implementation
- *******************************************************************************/
-/*
-
-
- */
-package org.eclipse.jem.java.impl;
-
-import org.eclipse.jem.java.JavaRefPackage;
-
-
-
-/**
- *
- * Do not use. This is here only for the older pre-EMF 2.2 generated code that accesses the package directly instead of through the interface.
- * This is kind of API and must not go away, but new clients should not reference this class.
- * @since 1.2.0
- */
-public class JavaRefPackageImpl extends org.eclipse.jem.java.internal.impl.JavaRefPackageImpl {
-
- public JavaRefPackageImpl() {
- super(true);
- }
-
- /**
- * Do not use. This is here only for the older pre-EMF 2.2 generated code that accesses the package directly instead of through the interface.
- * @return
- * @deprecated Do not use. This is here only for the older pre-EMF 2.2 generated code that accesses the package directly instead of through the interface.
- * @since 1.2.0
- */
- public static JavaRefPackage init() {
- return org.eclipse.jem.java.internal.impl.JavaRefPackageImpl.init();
- }
-
-}
diff --git a/plugins/org.eclipse.jem/mofjava/org/eclipse/jem/java/internal/impl/ArrayTypeImpl.java b/plugins/org.eclipse.jem/mofjava/org/eclipse/jem/java/internal/impl/ArrayTypeImpl.java
deleted file mode 100644
index 8098b8f..0000000
--- a/plugins/org.eclipse.jem/mofjava/org/eclipse/jem/java/internal/impl/ArrayTypeImpl.java
+++ /dev/null
@@ -1,312 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2001, 2005 IBM Corporation and others.
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
- *
- * Contributors:
- * IBM Corporation - initial API and implementation
- *******************************************************************************/
-package org.eclipse.jem.java.internal.impl;
-/*
-
-
- */
-
-import org.eclipse.emf.common.notify.Notification;
-import org.eclipse.emf.ecore.*;
-import org.eclipse.emf.ecore.impl.ENotificationImpl;
-
-import org.eclipse.jem.java.*;
-
-/**
- * Describes a Java Array type
- * For multi-dimensional arrays, it is unlikely that the component type will be
- * specified directly. This would require instantiating a chain of component types
- * such as String[][][][]->String[][][]->String[][]->String[]->String.
- *
- * The component type relationship will be computed if the finalComponentType
- * and array dimensions is specified.
- *
- * For this reason, the preferred way to create is through the JavaRefFactory factory method:
- * createArrayType(JavaClass finalComponentType, int dimensions)
- */
-public class ArrayTypeImpl extends JavaClassImpl implements ArrayType, JavaClass {
-
- /**
- * The default value of the '{@link #getArrayDimensions() <em>Array Dimensions</em>}' attribute.
- * <!-- begin-user-doc -->
- * <!-- end-user-doc -->
- * @see #getArrayDimensions()
- * @generated
- * @ordered
- */
- protected static final int ARRAY_DIMENSIONS_EDEFAULT = 0;
-
-
- /**
- * @generated This field/method will be replaced during code generation.
- */
- /**
- * @generated This field/method will be replaced during code generation.
- */
- protected int arrayDimensions = ARRAY_DIMENSIONS_EDEFAULT;
- /**
- * The cached value of the '{@link #getComponentType() <em>Component Type</em>}' reference.
- * <!-- begin-user-doc -->
- * <!-- end-user-doc -->
- * @see #getComponentType()
- * @generated
- * @ordered
- */
- protected EClassifier componentType = null;
-
- protected JavaHelpers finalComponentType = null;
-
- protected ArrayTypeImpl() {
- super();
- }
- /**
- * <!-- begin-user-doc -->
- * <!-- end-user-doc -->
- * @generated
- */
- protected EClass eStaticClass() {
- return JavaRefPackage.Literals.ARRAY_TYPE;
- }
-
- /**
- * Compute the component type for this array type from our type name.
- * The component type of this array type is essentially: new ArrayTypeImpl(finalComponentType, arrayDimensions-1)
- * unless our array dimension is 1, in which case it is only our final component type.
- *
- * In order to ensure a unique instance, we will resolve this type using reflection.
- * "java.lang.String[][]" component type is "java.lang.String[]"
- *
- */
- public JavaHelpers computeComponentType() {
- String componentName = getQualifiedNameForReflection();
- // Strip the last [] form my name to get my component type's name
- componentName = componentName.substring(0, componentName.length() - 2);
- return JavaRefFactory.eINSTANCE.reflectType(componentName, this);
- }
- /**
- * Override to perform some lazy initialization
- */
- public EClassifier getComponentType() {
- // If we do not have a component type set, but we have a name (which contains our component type name)
- // we can compute the component type.
- if ((this.getComponentTypeGen() == null) && (this.getName() != null)) {
- componentType = computeComponentType();
- }
- return getComponentTypeGen();
- }
- /**
- * Get the component type of this array.
- *
- * If this is a multi-dimensional array, the component type will be the nested array type.
- */
- public JavaHelpers getComponentTypeAsHelper() {
- return (JavaHelpers) getComponentType();
- }
- /**
- * Get the final component type for this Array Type.
- *
- * In order to ensure a unique instance, we will resolve this type using reflection. It turns out to be most efficient to just do this by trimming the name.
- */
- public JavaHelpers getFinalComponentType() {
- if (finalComponentType == null) {
- String componentName = getQualifiedNameForReflection();
- // Strip all the [] from my name to get my FINAL component type's name
- componentName = componentName.substring(0, componentName.indexOf("["));
- finalComponentType = JavaRefFactory.eINSTANCE.reflectType(componentName, this);
- }
- return finalComponentType;
- }
- /**
- * (JavaHelpers)isArray - ArrayTypes are arrays
- * Override from JavaClass.
- */
- public boolean isArray() {
- return true;
- }
- /**
- * Is this an array of java primitives
- */
- public boolean isPrimitiveArray() {
- return getFinalComponentType().isPrimitive();
- }
- /**
- * Set the component type.
- */
- public void setComponentType(JavaHelpers helperComponentType) {
- setComponentType((EClassifier) helperComponentType);
- }
- /**
- * <!-- begin-user-doc -->
- * <!-- end-user-doc -->
- * @generated
- */
- public Object eGet(int featureID, boolean resolve, boolean coreType) {
- switch (featureID) {
- case JavaRefPackage.ARRAY_TYPE__ARRAY_DIMENSIONS:
- return new Integer(getArrayDimensions());
- case JavaRefPackage.ARRAY_TYPE__COMPONENT_TYPE:
- if (resolve) return getComponentType();
- return basicGetComponentType();
- }
- return super.eGet(featureID, resolve, coreType);
- }
-
- /**
- * <!-- begin-user-doc -->
- * <!-- end-user-doc -->
- * @generated
- */
- public void eSet(int featureID, Object newValue) {
- switch (featureID) {
- case JavaRefPackage.ARRAY_TYPE__ARRAY_DIMENSIONS:
- setArrayDimensions(((Integer)newValue).intValue());
- return;
- case JavaRefPackage.ARRAY_TYPE__COMPONENT_TYPE:
- setComponentType((EClassifier)newValue);
- return;
- }
- super.eSet(featureID, newValue);
- }
-
- /**
- * <!-- begin-user-doc -->
- * <!-- end-user-doc -->
- * @generated
- */
- public void eUnset(int featureID) {
- switch (featureID) {
- case JavaRefPackage.ARRAY_TYPE__ARRAY_DIMENSIONS:
- setArrayDimensions(ARRAY_DIMENSIONS_EDEFAULT);
- return;
- case JavaRefPackage.ARRAY_TYPE__COMPONENT_TYPE:
- setComponentType((EClassifier)null);
- return;
- }
- super.eUnset(featureID);
- }
-
- /**
- * <!-- begin-user-doc -->
- * <!-- end-user-doc -->
- * @generated
- */
- public boolean eIsSet(int featureID) {
- switch (featureID) {
- case JavaRefPackage.ARRAY_TYPE__ARRAY_DIMENSIONS:
- return arrayDimensions != ARRAY_DIMENSIONS_EDEFAULT;
- case JavaRefPackage.ARRAY_TYPE__COMPONENT_TYPE:
- return componentType != null;
- }
- return super.eIsSet(featureID);
- }
-
- /**
- * @generated This field/method will be replaced during code generation
- */
- public int getArrayDimensions() {
- return arrayDimensions;
- }
-
- /**
- * @generated This field/method will be replaced during code generation.
- */
- public void setArrayDimensions(int newArrayDimensions) {
- int oldArrayDimensions = arrayDimensions;
- arrayDimensions = newArrayDimensions;
- if (eNotificationRequired())
- eNotify(new ENotificationImpl(this, Notification.SET, JavaRefPackage.ARRAY_TYPE__ARRAY_DIMENSIONS, oldArrayDimensions, arrayDimensions));
- }
-
- /**
- * @generated This field/method will be replaced during code generation.
- */
- public String toString() {
- if (eIsProxy()) return super.toString();
-
- StringBuffer result = new StringBuffer(super.toString());
- result.append(" (arrayDimensions: ");
- result.append(arrayDimensions);
- result.append(')');
- return result.toString();
- }
-
- /**
- * @generated This field/method will be replaced during code generation
- */
- public EClassifier getComponentTypeGen() {
- if (componentType != null && componentType.eIsProxy()) {
- InternalEObject oldComponentType = (InternalEObject)componentType;
- componentType = (EClassifier)eResolveProxy(oldComponentType);
- if (componentType != oldComponentType) {
- if (eNotificationRequired())
- eNotify(new ENotificationImpl(this, Notification.RESOLVE, JavaRefPackage.ARRAY_TYPE__COMPONENT_TYPE, oldComponentType, componentType));
- }
- }
- return componentType;
- }
-
- /**
- * <!-- begin-user-doc -->
- * <!-- end-user-doc -->
- * @generated
- */
- public EClassifier basicGetComponentType() {
- return componentType;
- }
-
- public void setComponentType(EClassifier newComponentType) {
- finalComponentType = null;
- setComponentTypeGen(newComponentType);
- }
-
- /**
- * <!-- begin-user-doc -->
- * <!-- end-user-doc -->
- * @generated
- */
- public void setComponentTypeGen(EClassifier newComponentType) {
- EClassifier oldComponentType = componentType;
- componentType = newComponentType;
- if (eNotificationRequired())
- eNotify(new ENotificationImpl(this, Notification.SET, JavaRefPackage.ARRAY_TYPE__COMPONENT_TYPE, oldComponentType, componentType));
- }
-
- /* (non-Javadoc)
- * @see org.eclipse.jem.java.JavaClass#getKind()
- */
- public TypeKind getKind() {
- // Override to always return the class if final type is valid.
- JavaHelpers ft = getFinalComponentType();
- if (!ft.isPrimitive()) {
- TypeKind ftKind = ((JavaClass) ft).getKind();
- return ftKind != TypeKind.UNDEFINED_LITERAL ? TypeKind.CLASS_LITERAL : TypeKind.UNDEFINED_LITERAL;
- } else
- return TypeKind.CLASS_LITERAL;
- }
-
-
- /* (non-Javadoc)
- * @see org.eclipse.jem.java.JavaClass#isPublic()
- */
- public boolean isPublic() {
- // Override to return the kind of the final component, because that determines it.
- JavaHelpers ft = getFinalComponentType();
- if (!ft.isPrimitive()) {
- return ((JavaClass) ft).isPublic();
- } else
- return true;
- }
-}
-
-
-
-
-
diff --git a/plugins/org.eclipse.jem/mofjava/org/eclipse/jem/java/internal/impl/BlockImpl.java b/plugins/org.eclipse.jem/mofjava/org/eclipse/jem/java/internal/impl/BlockImpl.java
deleted file mode 100644
index eb33422..0000000
--- a/plugins/org.eclipse.jem/mofjava/org/eclipse/jem/java/internal/impl/BlockImpl.java
+++ /dev/null
@@ -1,244 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2001, 2005 IBM Corporation and others.
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
- *
- * Contributors:
- * IBM Corporation - initial API and implementation
- *******************************************************************************/
-package org.eclipse.jem.java.internal.impl;
-
-/*
-
-
- */
-
-import java.util.Collection;
-
-import org.eclipse.emf.common.notify.Notification;
-import org.eclipse.emf.common.notify.NotificationChain;
-import org.eclipse.emf.common.util.EList;
-import org.eclipse.emf.ecore.EClass;
-import org.eclipse.emf.ecore.InternalEObject;
-import org.eclipse.emf.ecore.impl.ENotificationImpl;
-import org.eclipse.emf.ecore.impl.EObjectImpl;
-import org.eclipse.emf.ecore.util.EObjectContainmentEList;
-import org.eclipse.emf.ecore.util.InternalEList;
-
-import org.eclipse.jem.java.Block;
-import org.eclipse.jem.java.JavaRefPackage;
-
-/**
- * @generated
- */
-public class BlockImpl extends EObjectImpl implements Block {
-
- /**
- * The default value of the '{@link #getSource() <em>Source</em>}' attribute.
- * <!-- begin-user-doc -->
- * <!-- end-user-doc -->
- * @see #getSource()
- * @generated
- * @ordered
- */
- protected static final String SOURCE_EDEFAULT = null;
-
-
- /**
- * @generated This field/method will be replaced during code generation.
- */
- /**
- * @generated This field/method will be replaced during code generation.
- */
- protected String source = SOURCE_EDEFAULT;
- /**
- * The default value of the '{@link #getName() <em>Name</em>}' attribute.
- * <!-- begin-user-doc -->
- * <!-- end-user-doc -->
- * @see #getName()
- * @generated
- * @ordered
- */
- protected static final String NAME_EDEFAULT = null;
-
- /**
- * @generated This field/method will be replaced during code generation.
- */
- protected String name = NAME_EDEFAULT;
- /**
- * The cached value of the '{@link #getContents() <em>Contents</em>}' containment reference list.
- * <!-- begin-user-doc -->
- * <!-- end-user-doc -->
- * @see #getContents()
- * @generated
- * @ordered
- */
- protected EList contents = null;
-
- protected BlockImpl() {
- super();
- }
- /**
- * <!-- begin-user-doc -->
- * <!-- end-user-doc -->
- * @generated
- */
- protected EClass eStaticClass() {
- return JavaRefPackage.Literals.BLOCK;
- }
-
- /**
- * @generated This field/method will be replaced during code generation
- */
- public String getSource() {
- return source;
- }
-
- /**
- * @generated This field/method will be replaced during code generation.
- */
- public void setSource(String newSource) {
- String oldSource = source;
- source = newSource;
- if (eNotificationRequired())
- eNotify(new ENotificationImpl(this, Notification.SET, JavaRefPackage.BLOCK__SOURCE, oldSource, source));
- }
-
- /**
- * @generated This field/method will be replaced during code generation
- */
- public String getName() {
- return name;
- }
-
- /**
- * @generated This field/method will be replaced during code generation.
- */
- public void setName(String newName) {
- String oldName = name;
- name = newName;
- if (eNotificationRequired())
- eNotify(new ENotificationImpl(this, Notification.SET, JavaRefPackage.BLOCK__NAME, oldName, name));
- }
-
- /**
- * @generated This field/method will be replaced during code generation
- */
- public EList getContents() {
- if (contents == null) {
- contents = new EObjectContainmentEList(Block.class, this, JavaRefPackage.BLOCK__CONTENTS);
- }
- return contents;
- }
-
- /**
- * <!-- begin-user-doc -->
- * <!-- end-user-doc -->
- * @generated
- */
- public NotificationChain eInverseRemove(InternalEObject otherEnd, int featureID, NotificationChain msgs) {
- switch (featureID) {
- case JavaRefPackage.BLOCK__CONTENTS:
- return ((InternalEList)getContents()).basicRemove(otherEnd, msgs);
- }
- return super.eInverseRemove(otherEnd, featureID, msgs);
- }
-
- /**
- * <!-- begin-user-doc -->
- * <!-- end-user-doc -->
- * @generated
- */
- public Object eGet(int featureID, boolean resolve, boolean coreType) {
- switch (featureID) {
- case JavaRefPackage.BLOCK__SOURCE:
- return getSource();
- case JavaRefPackage.BLOCK__NAME:
- return getName();
- case JavaRefPackage.BLOCK__CONTENTS:
- return getContents();
- }
- return super.eGet(featureID, resolve, coreType);
- }
-
- /**
- * <!-- begin-user-doc -->
- * <!-- end-user-doc -->
- * @generated
- */
- public void eSet(int featureID, Object newValue) {
- switch (featureID) {
- case JavaRefPackage.BLOCK__SOURCE:
- setSource((String)newValue);
- return;
- case JavaRefPackage.BLOCK__NAME:
- setName((String)newValue);
- return;
- case JavaRefPackage.BLOCK__CONTENTS:
- getContents().clear();
- getContents().addAll((Collection)newValue);
- return;
- }
- super.eSet(featureID, newValue);
- }
-
- /**
- * <!-- begin-user-doc -->
- * <!-- end-user-doc -->
- * @generated
- */
- public void eUnset(int featureID) {
- switch (featureID) {
- case JavaRefPackage.BLOCK__SOURCE:
- setSource(SOURCE_EDEFAULT);
- return;
- case JavaRefPackage.BLOCK__NAME:
- setName(NAME_EDEFAULT);
- return;
- case JavaRefPackage.BLOCK__CONTENTS:
- getContents().clear();
- return;
- }
- super.eUnset(featureID);
- }
-
- /**
- * <!-- begin-user-doc -->
- * <!-- end-user-doc -->
- * @generated
- */
- public boolean eIsSet(int featureID) {
- switch (featureID) {
- case JavaRefPackage.BLOCK__SOURCE:
- return SOURCE_EDEFAULT == null ? source != null : !SOURCE_EDEFAULT.equals(source);
- case JavaRefPackage.BLOCK__NAME:
- return NAME_EDEFAULT == null ? name != null : !NAME_EDEFAULT.equals(name);
- case JavaRefPackage.BLOCK__CONTENTS:
- return contents != null && !contents.isEmpty();
- }
- return super.eIsSet(featureID);
- }
-
- /**
- * @generated This field/method will be replaced during code generation.
- */
- public String toString() {
- if (eIsProxy()) return super.toString();
-
- StringBuffer result = new StringBuffer(super.toString());
- result.append(" (source: ");
- result.append(source);
- result.append(", name: ");
- result.append(name);
- result.append(')');
- return result.toString();
- }
-
-}
-
-
-
-
-
diff --git a/plugins/org.eclipse.jem/mofjava/org/eclipse/jem/java/internal/impl/CommentImpl.java b/plugins/org.eclipse.jem/mofjava/org/eclipse/jem/java/internal/impl/CommentImpl.java
deleted file mode 100644
index 1eb67df..0000000
--- a/plugins/org.eclipse.jem/mofjava/org/eclipse/jem/java/internal/impl/CommentImpl.java
+++ /dev/null
@@ -1,45 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2001, 2005 IBM Corporation and others.
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
- *
- * Contributors:
- * IBM Corporation - initial API and implementation
- *******************************************************************************/
-package org.eclipse.jem.java.internal.impl;
-
-/*
-
-
- */
-
-import org.eclipse.emf.ecore.EClass;
-
-import org.eclipse.jem.java.Comment;
-import org.eclipse.jem.java.JavaRefPackage;
-/**
- * @generated
- */
-public class CommentImpl extends BlockImpl implements Comment {
-
-
- protected CommentImpl() {
- super();
- }
- /**
- * <!-- begin-user-doc -->
- * <!-- end-user-doc -->
- * @generated
- */
- protected EClass eStaticClass() {
- return JavaRefPackage.Literals.COMMENT;
- }
-
-}
-
-
-
-
-
diff --git a/plugins/org.eclipse.jem/mofjava/org/eclipse/jem/java/internal/impl/FieldImpl.java b/plugins/org.eclipse.jem/mofjava/org/eclipse/jem/java/internal/impl/FieldImpl.java
deleted file mode 100644
index b57dabf..0000000
--- a/plugins/org.eclipse.jem/mofjava/org/eclipse/jem/java/internal/impl/FieldImpl.java
+++ /dev/null
@@ -1,651 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2001, 2006 IBM Corporation and others.
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
- *
- * Contributors:
- * IBM Corporation - initial API and implementation
- *******************************************************************************/
-/*
-
-
- */
-package org.eclipse.jem.java.internal.impl;
-
-import org.eclipse.emf.common.notify.Notification;
-import org.eclipse.emf.common.notify.NotificationChain;
-import org.eclipse.emf.common.util.*;
-import org.eclipse.emf.ecore.*;
-import org.eclipse.emf.ecore.impl.ENotificationImpl;
-import org.eclipse.emf.ecore.impl.ETypedElementImpl;
-import org.eclipse.emf.ecore.util.ECrossReferenceEList;
-import org.eclipse.emf.ecore.util.EcoreUtil;
-
-import org.eclipse.jem.internal.java.adapters.ReadAdaptor;
-import org.eclipse.jem.internal.java.adapters.ReflectionAdaptor;
-import org.eclipse.jem.java.*;
-
-/**
- * @generated
- */
-public class FieldImpl extends ETypedElementImpl implements Field {
-
- /**
- * The default value of the '{@link #isFinal() <em>Final</em>}' attribute.
- * <!-- begin-user-doc -->
- * <!-- end-user-doc -->
- * @see #isFinal()
- * @generated
- * @ordered
- */
- protected static final boolean FINAL_EDEFAULT = false;
-
- /**
- * The flag representing the value of the '{@link #isFinal() <em>Final</em>}' attribute.
- * <!-- begin-user-doc -->
- * <!-- end-user-doc -->
- * @see #isFinal()
- * @generated
- * @ordered
- */
- protected static final int FINAL_EFLAG = 1 << 10;
-
- /**
- * The default value of the '{@link #isStatic() <em>Static</em>}' attribute.
- * <!-- begin-user-doc -->
- * <!-- end-user-doc -->
- * @see #isStatic()
- * @generated
- * @ordered
- */
- protected static final boolean STATIC_EDEFAULT = false;
-
- /**
- * The flag representing the value of the '{@link #isStatic() <em>Static</em>}' attribute.
- * <!-- begin-user-doc -->
- * <!-- end-user-doc -->
- * @see #isStatic()
- * @generated
- * @ordered
- */
- protected static final int STATIC_EFLAG = 1 << 11;
-
- /**
- * The default value of the '{@link #getJavaVisibility() <em>Java Visibility</em>}' attribute.
- * <!-- begin-user-doc -->
- * <!-- end-user-doc -->
- * @see #getJavaVisibility()
- * @generated
- * @ordered
- */
- protected static final JavaVisibilityKind JAVA_VISIBILITY_EDEFAULT = JavaVisibilityKind.PUBLIC_LITERAL;
-
- /**
- * @generated This field/method will be replaced during code generation.
- */
- protected JavaVisibilityKind javaVisibility = JAVA_VISIBILITY_EDEFAULT;
-
- /**
- * The default value of the '{@link #isTransient() <em>Transient</em>}' attribute.
- * <!-- begin-user-doc -->
- * <!-- end-user-doc -->
- * @see #isTransient()
- * @generated
- * @ordered
- */
- protected static final boolean TRANSIENT_EDEFAULT = false;
-
- /**
- * The flag representing the value of the '{@link #isTransient() <em>Transient</em>}' attribute.
- * <!-- begin-user-doc -->
- * <!-- end-user-doc -->
- * @see #isTransient()
- * @generated
- * @ordered
- */
- protected static final int TRANSIENT_EFLAG = 1 << 12;
-
- /**
- * The default value of the '{@link #isVolatile() <em>Volatile</em>}' attribute.
- * <!-- begin-user-doc -->
- * <!-- end-user-doc -->
- * @see #isVolatile()
- * @generated
- * @ordered
- */
- protected static final boolean VOLATILE_EDEFAULT = false;
-
- /**
- * The flag representing the value of the '{@link #isVolatile() <em>Volatile</em>}' attribute.
- * <!-- begin-user-doc -->
- * <!-- end-user-doc -->
- * @see #isVolatile()
- * @generated
- * @ordered
- */
- protected static final int VOLATILE_EFLAG = 1 << 13;
-
- /**
- * The cached value of the '{@link #getInitializer() <em>Initializer</em>}' containment reference.
- * <!-- begin-user-doc -->
- * <!-- end-user-doc -->
- * @see #getInitializer()
- * @generated
- * @ordered
- */
- protected Block initializer = null;
-
- protected FieldImpl() {
- super();
- }
-
- /**
- * <!-- begin-user-doc -->
- * <!-- end-user-doc -->
- * @generated
- */
- protected EClass eStaticClass() {
- return JavaRefPackage.Literals.FIELD;
- }
-
- /**
- * createFieldRef - return a JavaURL reference to the named field in the named Java class in the form "package.class_field"
- * @deprecated no replacement at this time.
- */
- public static Field createFieldRef(String className, String fieldName) {
- Field ref = JavaRefFactory.eINSTANCE.createField();
- URI classURI = JavaRefFactory.eINSTANCE.createTypeURI(className);
- ((InternalEObject) ref).eSetProxyURI(URI.createURI(classURI.toString()+ReflectionAdaptor.C_CLASS_MEMBER_DELIMITER+fieldName));
- return ref;
- }
-
- /**
- * Get the class that this field is within.
- */
- public JavaClass getContainingJavaClass() {
- return this.getJavaClass();
- }
-
- /**
- * Overrides to perform lazy initializations/reflection.
- */
- public EClassifier getEType() {
- reflectValues();
- return super.getEType();
- }
-
- public Block getInitializer() {
- reflectValues();
- return getInitializerGen();
- }
-
- public boolean isFinal() {
- reflectValues();
- return isFinalGen();
- }
-
- public boolean isStatic() {
- reflectValues();
- return isStaticGen();
- }
-
- public boolean isTransient() {
- reflectValues();
- return isTransientGen();
- }
-
- public boolean isVolatile() {
- reflectValues();
- return isVolatileGen();
- }
-
- public JavaHelpers getJavaType() {
- return (JavaHelpers) getEType();
- }
-
- public JavaVisibilityKind getJavaVisibility() {
- reflectValues();
- return getJavaVisibilityGen();
- }
-
- protected synchronized ReadAdaptor getReadAdapter() {
- return (ReadAdaptor) EcoreUtil.getRegisteredAdapter(this, ReadAdaptor.TYPE_KEY);
- }
-
- protected boolean hasReflected = false;
-
- protected void reflectValues() {
- // We only want the testing of the hasReflected and get readadapter to be sync(this) so that
- // it is short and no deadlock possibility (this is because the the method reflection adapter may go
- // back to the containing java class to get its reflection adapter, which would lock on itself. So
- // we need to keep the sections that are sync(this) to not be deadlockable by not doing significant work
- // during the sync.
- ReadAdaptor readAdaptor = null;
- synchronized (this) {
- if (!hasReflected) {
- readAdaptor = getReadAdapter();
- }
- }
- if (readAdaptor != null) {
- boolean setReflected = readAdaptor.reflectValuesIfNecessary();
- synchronized (this) {
- // Don't want to set it false. That is job of reflection adapter. Otherwise we could have a race.
- if (setReflected)
- hasReflected = setReflected;
- }
- }
- }
-
- /*
- * Used by reflection adapter to clear the reflection. This not intended to be used by others.
- */
- public synchronized void setReflected(boolean reflected) {
- hasReflected = reflected;
- }
-
- /**
- * Is this field an array type.
- */
- public boolean isArray() {
- return getJavaType().isArray();
- }
-
- /**
- * <!-- begin-user-doc -->
- * <!-- end-user-doc -->
- * @generated
- */
- public NotificationChain eInverseAdd(InternalEObject otherEnd, int featureID, NotificationChain msgs) {
- switch (featureID) {
- case JavaRefPackage.FIELD__JAVA_CLASS:
- if (eInternalContainer() != null)
- msgs = eBasicRemoveFromContainer(msgs);
- return basicSetJavaClass((JavaClass)otherEnd, msgs);
- }
- return super.eInverseAdd(otherEnd, featureID, msgs);
- }
-
- /**
- * <!-- begin-user-doc -->
- * <!-- end-user-doc -->
- * @generated
- */
- public NotificationChain eInverseRemove(InternalEObject otherEnd, int featureID, NotificationChain msgs) {
- switch (featureID) {
- case JavaRefPackage.FIELD__JAVA_CLASS:
- return basicSetJavaClass(null, msgs);
- case JavaRefPackage.FIELD__INITIALIZER:
- return basicSetInitializer(null, msgs);
- }
- return super.eInverseRemove(otherEnd, featureID, msgs);
- }
-
- /**
- * <!-- begin-user-doc -->
- * <!-- end-user-doc -->
- * @generated
- */
- public NotificationChain eBasicRemoveFromContainerFeature(NotificationChain msgs) {
- switch (eContainerFeatureID()) {
- case JavaRefPackage.FIELD__JAVA_CLASS:
- return eInternalContainer().eInverseRemove(this, JavaRefPackage.JAVA_CLASS__FIELDS, JavaClass.class, msgs);
- }
- return super.eBasicRemoveFromContainerFeature(msgs);
- }
-
- /**
- * <!-- begin-user-doc -->
- * <!-- end-user-doc -->
- * @generated
- */
- public Object eGet(int featureID, boolean resolve, boolean coreType) {
- switch (featureID) {
- case JavaRefPackage.FIELD__FINAL:
- return isFinal() ? Boolean.TRUE : Boolean.FALSE;
- case JavaRefPackage.FIELD__STATIC:
- return isStatic() ? Boolean.TRUE : Boolean.FALSE;
- case JavaRefPackage.FIELD__JAVA_VISIBILITY:
- return getJavaVisibility();
- case JavaRefPackage.FIELD__TRANSIENT:
- return isTransient() ? Boolean.TRUE : Boolean.FALSE;
- case JavaRefPackage.FIELD__VOLATILE:
- return isVolatile() ? Boolean.TRUE : Boolean.FALSE;
- case JavaRefPackage.FIELD__JAVA_CLASS:
- return getJavaClass();
- case JavaRefPackage.FIELD__INITIALIZER:
- return getInitializer();
- }
- return super.eGet(featureID, resolve, coreType);
- }
-
- /**
- * <!-- begin-user-doc -->
- * <!-- end-user-doc -->
- * @generated
- */
- public void eSet(int featureID, Object newValue) {
- switch (featureID) {
- case JavaRefPackage.FIELD__FINAL:
- setFinal(((Boolean)newValue).booleanValue());
- return;
- case JavaRefPackage.FIELD__STATIC:
- setStatic(((Boolean)newValue).booleanValue());
- return;
- case JavaRefPackage.FIELD__JAVA_VISIBILITY:
- setJavaVisibility((JavaVisibilityKind)newValue);
- return;
- case JavaRefPackage.FIELD__TRANSIENT:
- setTransient(((Boolean)newValue).booleanValue());
- return;
- case JavaRefPackage.FIELD__VOLATILE:
- setVolatile(((Boolean)newValue).booleanValue());
- return;
- case JavaRefPackage.FIELD__JAVA_CLASS:
- setJavaClass((JavaClass)newValue);
- return;
- case JavaRefPackage.FIELD__INITIALIZER:
- setInitializer((Block)newValue);
- return;
- }
- super.eSet(featureID, newValue);
- }
-
- /**
- * <!-- begin-user-doc -->
- * <!-- end-user-doc -->
- * @generated
- */
- public void eUnset(int featureID) {
- switch (featureID) {
- case JavaRefPackage.FIELD__FINAL:
- setFinal(FINAL_EDEFAULT);
- return;
- case JavaRefPackage.FIELD__STATIC:
- setStatic(STATIC_EDEFAULT);
- return;
- case JavaRefPackage.FIELD__JAVA_VISIBILITY:
- setJavaVisibility(JAVA_VISIBILITY_EDEFAULT);
- return;
- case JavaRefPackage.FIELD__TRANSIENT:
- setTransient(TRANSIENT_EDEFAULT);
- return;
- case JavaRefPackage.FIELD__VOLATILE:
- setVolatile(VOLATILE_EDEFAULT);
- return;
- case JavaRefPackage.FIELD__JAVA_CLASS:
- setJavaClass((JavaClass)null);
- return;
- case JavaRefPackage.FIELD__INITIALIZER:
- setInitializer((Block)null);
- return;
- }
- super.eUnset(featureID);
- }
-
- /**
- * <!-- begin-user-doc -->
- * <!-- end-user-doc -->
- * @generated
- */
- public boolean eIsSet(int featureID) {
- switch (featureID) {
- case JavaRefPackage.FIELD__FINAL:
- return ((eFlags & FINAL_EFLAG) != 0) != FINAL_EDEFAULT;
- case JavaRefPackage.FIELD__STATIC:
- return ((eFlags & STATIC_EFLAG) != 0) != STATIC_EDEFAULT;
- case JavaRefPackage.FIELD__JAVA_VISIBILITY:
- return javaVisibility != JAVA_VISIBILITY_EDEFAULT;
- case JavaRefPackage.FIELD__TRANSIENT:
- return ((eFlags & TRANSIENT_EFLAG) != 0) != TRANSIENT_EDEFAULT;
- case JavaRefPackage.FIELD__VOLATILE:
- return ((eFlags & VOLATILE_EFLAG) != 0) != VOLATILE_EDEFAULT;
- case JavaRefPackage.FIELD__JAVA_CLASS:
- return getJavaClass() != null;
- case JavaRefPackage.FIELD__INITIALIZER:
- return initializer != null;
- }
- return super.eIsSet(featureID);
- }
-
- /**
- * Overridden to prevent the reflection of the class.
- */
- public EList eContents() {
- EList results = new BasicEList();
- //FB
- //FB EList containments = eClass().getEAllContainments();
- //FB if (containments != null) {
- //FB Iterator i = containments.iterator();
- //FB while (i.hasNext()) {
- //FB EStructuralFeature sf = (EStructuralFeature) i.next();
- //FB //Change from super to primRefValue
- //FB Object value = primRefValue(sf);
- //FB //EndChange
- //FB if (value != null)
- //FB if (sf.isMany())
- //FB results.addAll((Collection) value);
- //FB else
- //FB results.add(value);
- //FB }
- //FB }
- if (getInitializerGen() != null)
- results.add(getInitializerGen()); //FB
- return results;
- }
-
- public String toString() {
- return getClass().getName() + " " + "(" + getName() + ")";
- }
-
- /**
- * <!-- begin-user-doc -->
- * <!-- end-user-doc -->
- * @generated
- */
- public JavaVisibilityKind getJavaVisibilityGen() {
- return javaVisibility;
- }
-
- /**
- * @generated This field/method will be replaced during code generation
- */
- public boolean isFinalGen() {
- return (eFlags & FINAL_EFLAG) != 0;
- }
-
- /**
- * <!-- begin-user-doc -->
- * <!-- end-user-doc -->
- * @generated
- */
- public void setFinal(boolean newFinal) {
- boolean oldFinal = (eFlags & FINAL_EFLAG) != 0;
- if (newFinal) eFlags |= FINAL_EFLAG; else eFlags &= ~FINAL_EFLAG;
- if (eNotificationRequired())
- eNotify(new ENotificationImpl(this, Notification.SET, JavaRefPackage.FIELD__FINAL, oldFinal, newFinal));
- }
-
- /**
- * @generated This field/method will be replaced during code generation
- */
- public boolean isStaticGen() {
- return (eFlags & STATIC_EFLAG) != 0;
- }
-
- /**
- * <!-- begin-user-doc -->
- * <!-- end-user-doc -->
- * @generated
- */
- public void setStatic(boolean newStatic) {
- boolean oldStatic = (eFlags & STATIC_EFLAG) != 0;
- if (newStatic) eFlags |= STATIC_EFLAG; else eFlags &= ~STATIC_EFLAG;
- if (eNotificationRequired())
- eNotify(new ENotificationImpl(this, Notification.SET, JavaRefPackage.FIELD__STATIC, oldStatic, newStatic));
- }
-
- /**
- * <!-- begin-user-doc -->
- * <!-- end-user-doc -->
- * @generated
- */
- public void setJavaVisibility(JavaVisibilityKind newJavaVisibility) {
- JavaVisibilityKind oldJavaVisibility = javaVisibility;
- javaVisibility = newJavaVisibility == null ? JAVA_VISIBILITY_EDEFAULT : newJavaVisibility;
- if (eNotificationRequired())
- eNotify(new ENotificationImpl(this, Notification.SET, JavaRefPackage.FIELD__JAVA_VISIBILITY, oldJavaVisibility, javaVisibility));
- }
-
- /**
- * <!-- begin-user-doc -->
- * <!-- end-user-doc -->
- * @generated
- */
- public boolean isTransientGen() {
- return (eFlags & TRANSIENT_EFLAG) != 0;
- }
-
- /**
- * <!-- begin-user-doc -->
- * <!-- end-user-doc -->
- * @generated
- */
- public void setTransient(boolean newTransient) {
- boolean oldTransient = (eFlags & TRANSIENT_EFLAG) != 0;
- if (newTransient) eFlags |= TRANSIENT_EFLAG; else eFlags &= ~TRANSIENT_EFLAG;
- if (eNotificationRequired())
- eNotify(new ENotificationImpl(this, Notification.SET, JavaRefPackage.FIELD__TRANSIENT, oldTransient, newTransient));
- }
-
- /**
- * <!-- begin-user-doc -->
- * <!-- end-user-doc -->
- * @generated
- */
- public boolean isVolatileGen() {
- return (eFlags & VOLATILE_EFLAG) != 0;
- }
-
- /**
- * <!-- begin-user-doc -->
- * <!-- end-user-doc -->
- * @generated
- */
- public void setVolatile(boolean newVolatile) {
- boolean oldVolatile = (eFlags & VOLATILE_EFLAG) != 0;
- if (newVolatile) eFlags |= VOLATILE_EFLAG; else eFlags &= ~VOLATILE_EFLAG;
- if (eNotificationRequired())
- eNotify(new ENotificationImpl(this, Notification.SET, JavaRefPackage.FIELD__VOLATILE, oldVolatile, newVolatile));
- }
-
- /**
- * @generated This field/method will be replaced during code generation
- */
- public JavaClass getJavaClass() {
- if (eContainerFeatureID() != JavaRefPackage.FIELD__JAVA_CLASS) return null;
- return (JavaClass)eContainer();
- }
-
- /**
- * <!-- begin-user-doc -->
- * <!-- end-user-doc -->
- * @generated
- */
- public NotificationChain basicSetJavaClass(JavaClass newJavaClass, NotificationChain msgs) {
- msgs = eBasicSetContainer((InternalEObject)newJavaClass, JavaRefPackage.FIELD__JAVA_CLASS, msgs);
- return msgs;
- }
-
- /**
- * <!-- begin-user-doc -->
- * <!-- end-user-doc -->
- * @generated
- */
- public void setJavaClass(JavaClass newJavaClass) {
- if (newJavaClass != eInternalContainer() || (eContainerFeatureID() != JavaRefPackage.FIELD__JAVA_CLASS && newJavaClass != null)) {
- if (EcoreUtil.isAncestor(this, newJavaClass))
- throw new IllegalArgumentException("Recursive containment not allowed for " + toString());
- NotificationChain msgs = null;
- if (eInternalContainer() != null)
- msgs = eBasicRemoveFromContainer(msgs);
- if (newJavaClass != null)
- msgs = ((InternalEObject)newJavaClass).eInverseAdd(this, JavaRefPackage.JAVA_CLASS__FIELDS, JavaClass.class, msgs);
- msgs = basicSetJavaClass(newJavaClass, msgs);
- if (msgs != null) msgs.dispatch();
- }
- else if (eNotificationRequired())
- eNotify(new ENotificationImpl(this, Notification.SET, JavaRefPackage.FIELD__JAVA_CLASS, newJavaClass, newJavaClass));
- }
-
- /**
- * @generated This field/method will be replaced during code generation
- */
- public Block getInitializerGen() {
- return initializer;
- }
-
- /**
- * <!-- begin-user-doc -->
- * <!-- end-user-doc -->
- * @generated
- */
- public NotificationChain basicSetInitializer(Block newInitializer, NotificationChain msgs) {
- Block oldInitializer = initializer;
- initializer = newInitializer;
- if (eNotificationRequired()) {
- ENotificationImpl notification = new ENotificationImpl(this, Notification.SET, JavaRefPackage.FIELD__INITIALIZER, oldInitializer, newInitializer);
- if (msgs == null) msgs = notification; else msgs.add(notification);
- }
- return msgs;
- }
-
- /**
- * <!-- begin-user-doc -->
- * <!-- end-user-doc -->
- * @generated
- */
- public void setInitializer(Block newInitializer) {
- if (newInitializer != initializer) {
- NotificationChain msgs = null;
- if (initializer != null)
- msgs = ((InternalEObject)initializer).eInverseRemove(this, EOPPOSITE_FEATURE_BASE - JavaRefPackage.FIELD__INITIALIZER, null, msgs);
- if (newInitializer != null)
- msgs = ((InternalEObject)newInitializer).eInverseAdd(this, EOPPOSITE_FEATURE_BASE - JavaRefPackage.FIELD__INITIALIZER, null, msgs);
- msgs = basicSetInitializer(newInitializer, msgs);
- if (msgs != null) msgs.dispatch();
- }
- else if (eNotificationRequired())
- eNotify(new ENotificationImpl(this, Notification.SET, JavaRefPackage.FIELD__INITIALIZER, newInitializer, newInitializer));
- }
-
- /**
- * @generated This field/method will be replaced during code generation.
- */
- public String toStringGen() {
- if (eIsProxy()) return super.toString();
-
- StringBuffer result = new StringBuffer(super.toString());
- result.append(" (final: ");
- result.append((eFlags & FINAL_EFLAG) != 0);
- result.append(", static: ");
- result.append((eFlags & STATIC_EFLAG) != 0);
- result.append(", javaVisibility: ");
- result.append(javaVisibility);
- result.append(", transient: ");
- result.append((eFlags & TRANSIENT_EFLAG) != 0);
- result.append(", volatile: ");
- result.append((eFlags & VOLATILE_EFLAG) != 0);
- result.append(')');
- return result.toString();
- }
-
- @Override
- public EList<EObject> eCrossReferences()
- {
- return ECrossReferenceEList.createECrossReferenceEList(this);
- }
-
-}
-
diff --git a/plugins/org.eclipse.jem/mofjava/org/eclipse/jem/java/internal/impl/InitializerImpl.java b/plugins/org.eclipse.jem/mofjava/org/eclipse/jem/java/internal/impl/InitializerImpl.java
deleted file mode 100644
index a82424b..0000000
--- a/plugins/org.eclipse.jem/mofjava/org/eclipse/jem/java/internal/impl/InitializerImpl.java
+++ /dev/null
@@ -1,295 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2001, 2005 IBM Corporation and others.
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
- *
- * Contributors:
- * IBM Corporation - initial API and implementation
- *******************************************************************************/
-package org.eclipse.jem.java.internal.impl;
-/*
-
-
- */
-import org.eclipse.emf.common.notify.Notification;
-import org.eclipse.emf.common.notify.NotificationChain;
-import org.eclipse.emf.ecore.EClass;
-import org.eclipse.emf.ecore.InternalEObject;
-import org.eclipse.emf.ecore.impl.ENotificationImpl;
-import org.eclipse.emf.ecore.impl.EObjectImpl;
-import org.eclipse.emf.ecore.util.EcoreUtil;
-
-import org.eclipse.jem.java.*;
-/**
- * @generated
- */
-public class InitializerImpl extends EObjectImpl implements Initializer {
-
- /**
- * The default value of the '{@link #getIsStatic() <em>Is Static</em>}' attribute.
- * <!-- begin-user-doc -->
- * <!-- end-user-doc -->
- * @see #getIsStatic()
- * @generated
- * @ordered
- */
- protected static final Boolean IS_STATIC_EDEFAULT = null;
-
- /**
- * @generated This field/method will be replaced during code generation.
- */
- /**
- * @generated This field/method will be replaced during code generation.
- */
- protected Boolean isStatic = IS_STATIC_EDEFAULT;
- /**
- * The cached value of the '{@link #getSource() <em>Source</em>}' reference.
- * <!-- begin-user-doc -->
- * <!-- end-user-doc -->
- * @see #getSource()
- * @generated
- * @ordered
- */
- protected Block source = null;
-
- protected InitializerImpl() {
- super();
- }
- /**
- * <!-- begin-user-doc -->
- * <!-- end-user-doc -->
- * @generated
- */
- protected EClass eStaticClass() {
- return JavaRefPackage.Literals.INITIALIZER;
- }
-
- /**
- * @generated This field/method will be replaced during code generation
- */
- public Boolean getIsStatic() {
- return isStatic;
- }
-
- /**
- * @generated This field/method will be replaced during code generation.
- */
- public void setIsStatic(Boolean newIsStatic) {
- Boolean oldIsStatic = isStatic;
- isStatic = newIsStatic;
- if (eNotificationRequired())
- eNotify(new ENotificationImpl(this, Notification.SET, JavaRefPackage.INITIALIZER__IS_STATIC, oldIsStatic, isStatic));
- }
-
- /**
- * @generated This field/method will be replaced during code generation
- */
- public JavaClass getJavaClass() {
- if (eContainerFeatureID != JavaRefPackage.INITIALIZER__JAVA_CLASS) return null;
- return (JavaClass)eContainer();
- }
-
- /**
- * <!-- begin-user-doc -->
- * <!-- end-user-doc -->
- * @generated
- */
- public NotificationChain basicSetJavaClass(JavaClass newJavaClass, NotificationChain msgs) {
- msgs = eBasicSetContainer((InternalEObject)newJavaClass, JavaRefPackage.INITIALIZER__JAVA_CLASS, msgs);
- return msgs;
- }
-
- /**
- * <!-- begin-user-doc -->
- * <!-- end-user-doc -->
- * @generated
- */
- public void setJavaClass(JavaClass newJavaClass) {
- if (newJavaClass != eInternalContainer() || (eContainerFeatureID != JavaRefPackage.INITIALIZER__JAVA_CLASS && newJavaClass != null)) {
- if (EcoreUtil.isAncestor(this, newJavaClass))
- throw new IllegalArgumentException("Recursive containment not allowed for " + toString());
- NotificationChain msgs = null;
- if (eInternalContainer() != null)
- msgs = eBasicRemoveFromContainer(msgs);
- if (newJavaClass != null)
- msgs = ((InternalEObject)newJavaClass).eInverseAdd(this, JavaRefPackage.JAVA_CLASS__INITIALIZERS, JavaClass.class, msgs);
- msgs = basicSetJavaClass(newJavaClass, msgs);
- if (msgs != null) msgs.dispatch();
- }
- else if (eNotificationRequired())
- eNotify(new ENotificationImpl(this, Notification.SET, JavaRefPackage.INITIALIZER__JAVA_CLASS, newJavaClass, newJavaClass));
- }
-
- /**
- * @generated This field/method will be replaced during code generation
- */
- public Block getSource() {
- if (source != null && source.eIsProxy()) {
- InternalEObject oldSource = (InternalEObject)source;
- source = (Block)eResolveProxy(oldSource);
- if (source != oldSource) {
- if (eNotificationRequired())
- eNotify(new ENotificationImpl(this, Notification.RESOLVE, JavaRefPackage.INITIALIZER__SOURCE, oldSource, source));
- }
- }
- return source;
- }
-
- /**
- * <!-- begin-user-doc -->
- * <!-- end-user-doc -->
- * @generated
- */
- public Block basicGetSource() {
- return source;
- }
-
- /**
- * <!-- begin-user-doc -->
- * <!-- end-user-doc -->
- * @generated
- */
- public void setSource(Block newSource) {
- Block oldSource = source;
- source = newSource;
- if (eNotificationRequired())
- eNotify(new ENotificationImpl(this, Notification.SET, JavaRefPackage.INITIALIZER__SOURCE, oldSource, source));
- }
-
- /**
- * <!-- begin-user-doc -->
- * <!-- end-user-doc -->
- * @generated
- */
- public NotificationChain eInverseAdd(InternalEObject otherEnd, int featureID, NotificationChain msgs) {
- switch (featureID) {
- case JavaRefPackage.INITIALIZER__JAVA_CLASS:
- if (eInternalContainer() != null)
- msgs = eBasicRemoveFromContainer(msgs);
- return basicSetJavaClass((JavaClass)otherEnd, msgs);
- }
- return super.eInverseAdd(otherEnd, featureID, msgs);
- }
-
- /**
- * <!-- begin-user-doc -->
- * <!-- end-user-doc -->
- * @generated
- */
- public NotificationChain eInverseRemove(InternalEObject otherEnd, int featureID, NotificationChain msgs) {
- switch (featureID) {
- case JavaRefPackage.INITIALIZER__JAVA_CLASS:
- return basicSetJavaClass(null, msgs);
- }
- return super.eInverseRemove(otherEnd, featureID, msgs);
- }
-
- /**
- * <!-- begin-user-doc -->
- * <!-- end-user-doc -->
- * @generated
- */
- public NotificationChain eBasicRemoveFromContainerFeature(NotificationChain msgs) {
- switch (eContainerFeatureID) {
- case JavaRefPackage.INITIALIZER__JAVA_CLASS:
- return eInternalContainer().eInverseRemove(this, JavaRefPackage.JAVA_CLASS__INITIALIZERS, JavaClass.class, msgs);
- }
- return super.eBasicRemoveFromContainerFeature(msgs);
- }
-
- /**
- * <!-- begin-user-doc -->
- * <!-- end-user-doc -->
- * @generated
- */
- public Object eGet(int featureID, boolean resolve, boolean coreType) {
- switch (featureID) {
- case JavaRefPackage.INITIALIZER__IS_STATIC:
- return getIsStatic();
- case JavaRefPackage.INITIALIZER__JAVA_CLASS:
- return getJavaClass();
- case JavaRefPackage.INITIALIZER__SOURCE:
- if (resolve) return getSource();
- return basicGetSource();
- }
- return super.eGet(featureID, resolve, coreType);
- }
-
- /**
- * <!-- begin-user-doc -->
- * <!-- end-user-doc -->
- * @generated
- */
- public void eSet(int featureID, Object newValue) {
- switch (featureID) {
- case JavaRefPackage.INITIALIZER__IS_STATIC:
- setIsStatic((Boolean)newValue);
- return;
- case JavaRefPackage.INITIALIZER__JAVA_CLASS:
- setJavaClass((JavaClass)newValue);
- return;
- case JavaRefPackage.INITIALIZER__SOURCE:
- setSource((Block)newValue);
- return;
- }
- super.eSet(featureID, newValue);
- }
-
- /**
- * <!-- begin-user-doc -->
- * <!-- end-user-doc -->
- * @generated
- */
- public void eUnset(int featureID) {
- switch (featureID) {
- case JavaRefPackage.INITIALIZER__IS_STATIC:
- setIsStatic(IS_STATIC_EDEFAULT);
- return;
- case JavaRefPackage.INITIALIZER__JAVA_CLASS:
- setJavaClass((JavaClass)null);
- return;
- case JavaRefPackage.INITIALIZER__SOURCE:
- setSource((Block)null);
- return;
- }
- super.eUnset(featureID);
- }
-
- /**
- * <!-- begin-user-doc -->
- * <!-- end-user-doc -->
- * @generated
- */
- public boolean eIsSet(int featureID) {
- switch (featureID) {
- case JavaRefPackage.INITIALIZER__IS_STATIC:
- return IS_STATIC_EDEFAULT == null ? isStatic != null : !IS_STATIC_EDEFAULT.equals(isStatic);
- case JavaRefPackage.INITIALIZER__JAVA_CLASS:
- return getJavaClass() != null;
- case JavaRefPackage.INITIALIZER__SOURCE:
- return source != null;
- }
- return super.eIsSet(featureID);
- }
-
- /**
- * @generated This field/method will be replaced during code generation.
- */
- public String toString() {
- if (eIsProxy()) return super.toString();
-
- StringBuffer result = new StringBuffer(super.toString());
- result.append(" (isStatic: ");
- result.append(isStatic);
- result.append(')');
- return result.toString();
- }
-
-}
-
-
-
-
-
diff --git a/plugins/org.eclipse.jem/mofjava/org/eclipse/jem/java/internal/impl/JavaClassImpl.java b/plugins/org.eclipse.jem/mofjava/org/eclipse/jem/java/internal/impl/JavaClassImpl.java
deleted file mode 100644
index 2953187..0000000
--- a/plugins/org.eclipse.jem/mofjava/org/eclipse/jem/java/internal/impl/JavaClassImpl.java
+++ /dev/null
@@ -1,1789 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2001, 2006 IBM Corporation and others.
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
- *
- * Contributors:
- * IBM Corporation - initial API and implementation
- *******************************************************************************/
-/*
-
-
- */
-package org.eclipse.jem.java.internal.impl;
-
-import java.util.*;
-
-import org.eclipse.emf.common.notify.Notification;
-import org.eclipse.emf.common.notify.NotificationChain;
-import org.eclipse.emf.common.util.ECollections;
-import org.eclipse.emf.common.util.EList;
-import org.eclipse.emf.ecore.*;
-import org.eclipse.emf.ecore.impl.EClassImpl;
-import org.eclipse.emf.ecore.impl.ENotificationImpl;
-import org.eclipse.emf.ecore.resource.Resource;
-import org.eclipse.emf.ecore.resource.ResourceSet;
-import org.eclipse.emf.ecore.util.*;
-
-import org.eclipse.jem.internal.java.adapters.*;
-import org.eclipse.jem.internal.java.beaninfo.IIntrospectionAdapter;
-import org.eclipse.jem.internal.java.instantiation.IInstantiationInstance;
-import org.eclipse.jem.java.*;
-
-/**
- * <!-- begin-user-doc -->
- *
- * <!-- end-user-doc -->
- * <p>
- * The following features are implemented:
- * <ul>
- * <li>{@link org.eclipse.jem.java.internal.impl.JavaClassImpl#getKind <em>Kind</em>}</li>
- * <li>{@link org.eclipse.jem.java.internal.impl.JavaClassImpl#isPublic <em>Public</em>}</li>
- * <li>{@link org.eclipse.jem.java.internal.impl.JavaClassImpl#isFinal <em>Final</em>}</li>
- * <li>{@link org.eclipse.jem.java.internal.impl.JavaClassImpl#getImplementsInterfaces <em>Implements Interfaces</em>}</li>
- * <li>{@link org.eclipse.jem.java.internal.impl.JavaClassImpl#getClassImport <em>Class Import</em>}</li>
- * <li>{@link org.eclipse.jem.java.internal.impl.JavaClassImpl#getPackageImports <em>Package Imports</em>}</li>
- * <li>{@link org.eclipse.jem.java.internal.impl.JavaClassImpl#getFields <em>Fields</em>}</li>
- * <li>{@link org.eclipse.jem.java.internal.impl.JavaClassImpl#getMethods <em>Methods</em>}</li>
- * <li>{@link org.eclipse.jem.java.internal.impl.JavaClassImpl#getInitializers <em>Initializers</em>}</li>
- * <li>{@link org.eclipse.jem.java.internal.impl.JavaClassImpl#getDeclaredClasses <em>Declared Classes</em>}</li>
- * <li>{@link org.eclipse.jem.java.internal.impl.JavaClassImpl#getDeclaringClass <em>Declaring Class</em>}</li>
- * <li>{@link org.eclipse.jem.java.internal.impl.JavaClassImpl#getJavaPackage <em>Java Package</em>}</li>
- * <li>{@link org.eclipse.jem.java.internal.impl.JavaClassImpl#getEvents <em>Events</em>}</li>
- * <li>{@link org.eclipse.jem.java.internal.impl.JavaClassImpl#getAllEvents <em>All Events</em>}</li>
- * </ul>
- * </p>
- *
- * @generated
- */
-public class JavaClassImpl extends EClassImpl implements JavaClass {
-
- /**
- * The default value of the '{@link #getKind() <em>Kind</em>}' attribute.
- * <!-- begin-user-doc -->
- * <!-- end-user-doc -->
- * @see #getKind()
- * @generated
- * @ordered
- */
- protected static final TypeKind KIND_EDEFAULT = TypeKind.UNDEFINED_LITERAL;
-
- /**
- * @generated This field/method will be replaced during code generation.
- */
- /**
- * @generated This field/method will be replaced during code generation.
- */
- protected TypeKind kind = KIND_EDEFAULT;
-
- /**
- * The default value of the '{@link #isPublic() <em>Public</em>}' attribute.
- * <!-- begin-user-doc -->
- * <!-- end-user-doc -->
- * @see #isPublic()
- * @generated
- * @ordered
- */
- protected static final boolean PUBLIC_EDEFAULT = false;
-
- /**
- * The flag representing the value of the '{@link #isPublic() <em>Public</em>}' attribute.
- * <!-- begin-user-doc -->
- * <!-- end-user-doc -->
- * @see #isPublic()
- * @generated
- * @ordered
- */
- protected static final int PUBLIC_EFLAG = 1 << 10;
-
- /**
- * The default value of the '{@link #isFinal() <em>Final</em>}' attribute.
- * <!-- begin-user-doc -->
- * <!-- end-user-doc -->
- * @see #isFinal()
- * @generated
- * @ordered
- */
- protected static final boolean FINAL_EDEFAULT = false;
-
- /**
- * The flag representing the value of the '{@link #isFinal() <em>Final</em>}' attribute.
- * <!-- begin-user-doc -->
- * <!-- end-user-doc -->
- * @see #isFinal()
- * @generated
- * @ordered
- */
- protected static final int FINAL_EFLAG = 1 << 11;
-
- /**
- * The cached value of the '{@link #getImplementsInterfaces() <em>Implements Interfaces</em>}' reference list.
- * <!-- begin-user-doc -->
- * <!-- end-user-doc -->
- * @see #getImplementsInterfaces()
- * @generated
- * @ordered
- */
- protected EList implementsInterfaces = null;
-
- /**
- * The cached value of the '{@link #getClassImport() <em>Class Import</em>}' reference list.
- * <!-- begin-user-doc -->
- * <!-- end-user-doc -->
- * @see #getClassImport()
- * @generated
- * @ordered
- */
- protected EList classImport = null;
-
- /**
- * The cached value of the '{@link #getPackageImports() <em>Package Imports</em>}' reference list.
- * <!-- begin-user-doc -->
- * <!-- end-user-doc -->
- * @see #getPackageImports()
- * @generated
- * @ordered
- */
- protected EList packageImports = null;
-
- /**
- * The cached value of the '{@link #getFields() <em>Fields</em>}' containment reference list.
- * <!-- begin-user-doc -->
- * <!-- end-user-doc -->
- * @see #getFields()
- * @generated
- * @ordered
- */
- protected EList fields = null;
-
- /**
- * The cached value of the '{@link #getMethods() <em>Methods</em>}' containment reference list.
- * <!-- begin-user-doc -->
- * <!-- end-user-doc -->
- * @see #getMethods()
- * @generated
- * @ordered
- */
- protected EList methods = null;
-
- /**
- * The cached value of the '{@link #getInitializers() <em>Initializers</em>}' containment reference list.
- * <!-- begin-user-doc -->
- * <!-- end-user-doc -->
- * @see #getInitializers()
- * @generated
- * @ordered
- */
- protected EList initializers = null;
-
- /**
- * The cached value of the '{@link #getDeclaredClasses() <em>Declared Classes</em>}' reference list.
- * <!-- begin-user-doc -->
- * <!-- end-user-doc -->
- * @see #getDeclaredClasses()
- * @generated
- * @ordered
- */
- protected EList declaredClasses = null;
-
- /**
- * The cached value of the '{@link #getDeclaringClass() <em>Declaring Class</em>}' reference.
- * <!-- begin-user-doc -->
- * <!-- end-user-doc -->
- * @see #getDeclaringClass()
- * @generated
- * @ordered
- */
- protected JavaClass declaringClass = null;
-
- /**
- * The cached value of the '{@link #getEvents() <em>Events</em>}' containment reference list.
- * <!-- begin-user-doc -->
- * <!-- end-user-doc -->
- * @see #getEvents()
- * @generated
- * @ordered
- */
- protected EList events = null;
-
- protected JavaClassImpl() {
- super();
- }
-
- public EList getEAnnotationsInternal() {
- return super.getEAnnotations();
- }
-
- /**
- * <!-- begin-user-doc -->
- * <!-- end-user-doc -->
- * @generated
- */
- protected EClass eStaticClass() {
- return JavaRefPackage.Literals.JAVA_CLASS;
- }
-
- /**
- * Protected helper methods.
- */
- protected void collectFieldsExtended(List fields) {
- fields.addAll(getFields());
- Iterator it;
- it = getExtendedLookupIterator();
- while (it.hasNext())
- ((JavaClassImpl) it.next()).collectFieldsExtended(fields);
- }
-
- protected void collectMethodsExtended(Map methods, boolean onlyPublic, List excludedClasses, List excludedMethods) {
- Iterator it1, it2;
- it2 = getExtendedLookupIterator();
- JavaClassImpl javaClass;
- while (it2.hasNext()) {
- javaClass = (JavaClassImpl) it2.next();
- if (!excludedClasses.contains(javaClass))
- javaClass.collectMethodsExtended(methods, onlyPublic, excludedClasses, excludedMethods);
- }
-
- List allMethods = null;
- if(onlyPublic){
- allMethods = getPublicMethods();
- } else{
- allMethods = new ArrayList();
- synchronized(getMethods()){
- allMethods.addAll(getMethods());
- }
- }
- it1 = allMethods.iterator();
- Method nextMethod;
- while (it1.hasNext()) {
- nextMethod = (Method) it1.next();
- if (!excludedMethods.contains(nextMethod))
- methods.put(nextMethod.getMethodElementSignature(), nextMethod);
- }
- }
-
- /**
- * createClassRef - return a JavaURL reference to the named Java class
- *
- * @deprecated @see org.eclipse.jem.java.JavaRefFactory#createClassRef(java.lang.String)
- */
- public static JavaClass createClassRef(String targetName) {
- return JavaRefFactory.eINSTANCE.createClassRef(targetName);
- }
-
- /**
- * Get the method of this name and these parameters. It will look up the supertype hierarchy.
- */
- protected Method findClassMethodExtended(String methodName, List parameterTypes) {
- Method method = getMethod(methodName, parameterTypes);
- if (method != null)
- return method;
- else {
- JavaClassImpl mySuper;
- mySuper = (JavaClassImpl) getSupertype();
- if (mySuper != null)
- return mySuper.findClassMethodExtended(methodName, parameterTypes);
- }
- return null;
- }
-
- /**
- * Get the method of this name and these parameters. It will look up the supertype hierarchy.
- */
- protected Method findInterfaceMethodExtended(String methodName, List parameterTypes) {
- Method method = getMethod(methodName, parameterTypes);
- if (method != null)
- return method;
- else {
- JavaClassImpl superInterface;
- List list = getImplementsInterfaces();
- for (int i = 0; i < list.size(); i++) {
- superInterface = (JavaClassImpl) list.get(i);
- method = superInterface.findInterfaceMethodExtended(methodName, parameterTypes);
- if (method != null)
- return method;
- }
- }
- return null;
- }
-
- /**
- *
- * @return
- * @deprecated If anyone is referencing this, please use getEAllSuperTypes() instead. This was placed here and misspelled by mistake.
- */
- public EList getAllSupertypes() {
- getESuperTypes(); //Force reflection, if needed, before getting all supertypes.
- return super.getEAllSuperTypes();
- }
-
- /**
- * Overrides to perform reflection if necessary
- */
- public EList getClassImport() {
- reflectBase();
- return getClassImportGen();
- }
-
- public EList getEAllOperations() {
- IIntrospectionAdapter ia = getIntrospectionAdapter();
- if (ia == null)
- return super.getEAllOperations(); // No introspection, do normal.
- if (eAllOperations == null)
- eAllOperations = ia.getEAllOperations();
- return eAllOperations;
- }
-
- /**
- * This is not meant to be used by others. It is here so that BeanInfo adapter can access
- * un-introspected all operations.
- * @return
- *
- * @since 1.1.0
- */
- public EList primGetEAllOperations() {
- return super.getEAllOperations();
- }
-
- public EList getEOperations() {
- IIntrospectionAdapter adapter = getIntrospectionAdapter();
- if (adapter != null)
- return adapter.getEOperations();
- return super.getEOperations();
- }
-
- /**
- * This method is not meant to be used by others. It is here so that BeanInfo adapters can go to
- * the non-introspected operations.
- * @return
- *
- * @since 1.1.0
- */
- public EList getEOperationsInternal() {
- // An internal method for returning actual wo fluffing up.
- return super.getEOperations();
- }
-
- public EList getEAnnotations() {
- IIntrospectionAdapter adapter = getIntrospectionAdapter();
- if (adapter != null)
- adapter.introspectIfNecessary(); // To cause introspection so the appropriate decorator is added.
- return super.getEAnnotations();
- }
-
- public EList getEStructuralFeatures() {
- IIntrospectionAdapter adapter = getIntrospectionAdapter();
- if (adapter != null)
- return adapter.getEStructuralFeatures();
- return super.getEStructuralFeatures();
- }
-
- public EList getEStructuralFeaturesInternal() {
- // An internal method for returning actual wo fluffing up.
- return super.getEStructuralFeatures();
- }
-
- /**
- * Return an Iterator on the implemntsInferface List if this is an interface class or on the super List if it is a class.
- */
- protected Iterator getExtendedLookupIterator() {
- if (isInterface())
- return getImplementsInterfaces().iterator();
- else
- return getESuperTypes().iterator();
- }
-
- /**
- * Return an Field with the passed name, or null.
- */
- public Field getField(String fieldName) {
- java.util.List fields = getFields();
- Field field;
- for (int i = 0; i < fields.size(); i++) {
- field = (Field) fields.get(i);
- if (field.getName().equals(fieldName))
- return field;
- }
- return null;
- }
-
- /**
- * Return an Field with the passed name from this JavaClass or any supertypes.
- *
- * Return null if a Field named fieldName is not found.
- */
- public Field getFieldExtended(String fieldName) {
- Field field = getFieldNamed(fieldName);
- if (field != null)
- return field;
- Iterator it = getExtendedLookupIterator();
- while (it.hasNext()) {
- Field result = ((JavaClass) it.next()).getFieldExtended(fieldName);
- if (result != null)
- return result;
- }
- return null;
- }
-
- /**
- * Return an Field with the passed name, or null.
- */
- public Field getFieldNamed(String fieldName) {
- return getField(fieldName);
- }
-
- public EList getFields() {
- reflectFields();
- return getFieldsGen();
- }
-
- /**
- * Return all fields, including those from supertypes.
- */
- public List getFieldsExtended() {
- List fields = new ArrayList();
- collectFieldsExtended(fields);
- return fields;
- }
-
- public EList getImplementsInterfaces() {
- reflectBase();
- return getImplementsInterfacesGen();
- }
-
- /**
- * Return an IntrospectionAdaptor which can introspect our Java properties
- */
- protected synchronized IIntrospectionAdapter getIntrospectionAdapter() {
- // Need to sync this because we are now in multi-thread env.
- return (IIntrospectionAdapter) EcoreUtil.getRegisteredAdapter(this, IIntrospectionAdapter.ADAPTER_KEY);
- }
-
- public String getJavaName() {
- return getQualifiedName();
- }
-
- /*
- * (non-Javadoc)
- * @see org.eclipse.jem.java.JavaHelpers#getSimpleName()
- */
- public String getSimpleName() {
- return primGetName().replace('$', '.');
- }
- /**
- * getJavaPackage. This is a derived relationship, so we must implement it here to get the EPackage that this object is contained in.
- */
- public JavaPackage getJavaPackage() {
- return (JavaPackage) getEPackage();
- }
-
- /**
- * Get the method of this name and these parameters. It will not look up the supertype hierarchy.
- */
- public Method getMethod(String methodName, List parameterTypes) {
- return getMethod(methodName, parameterTypes, getMethods());
- }
-
- protected Method getMethod(String name, List parameterTypes, List methodList) {
- boolean found = false;
- Method method;
- for (int i = 0; i < methodList.size(); i++) {
- method = (Method) methodList.get(i);
- JavaParameter[] params;
- if (method.getName().equals(name)) {
- params = method.listParametersWithoutReturn();
- if (params.length == parameterTypes.size()) {
- found = true; //Maybe; we need more info
- for (int j = 0; j < params.length; j++) {
- //if any one of the parameters doesn't match then flip back to false
- JavaHelpers jh = (JavaHelpers) params[j].getEType();
- if (!jh.getQualifiedName().equals(parameterTypes.get(j))) {
- found = false;
- break;
- } // end if params equal
- } // end compare all params
- if (found) //short circuit out of this loop and return the winner
- return method;
- } // end compare lengths
- } // end compare names
- } // end loop through all methodList
- return null;
- }
-
- /**
- * Return a List of Strings that represent MethodElement signatures from most general to most specific.
- */
- public List getMethodElementSignatures() {
- List methods, signatures, sameNames;
- methods = getMethodsExtended();
- sameNames = new ArrayList();
- signatures = new ArrayList(methods.size() + 1);
- signatures.add(DEFAULT_METHOD_NAME);
- Iterator it = methods.iterator();
- Method aMethod;
- String methodName;
- String signature;
- while (it.hasNext()) {
- aMethod = (Method) it.next();
- methodName = aMethod.getName();
- signature = aMethod.getMethodElementSignature();
- if (sameNames.contains(methodName)) {
- if (!signatures.contains(signature))
- signatures.add(signature);
- } else {
- sameNames.add(methodName);
- signatures.add(signature);
- }
- }
- Collections.sort(signatures);
- return signatures;
- }
-
- /**
- * Get the method of this name and these parameters. It will look up the supertype hierarchy.
- */
- public Method getMethodExtended(String methodName, List parameterTypes) {
- if (isInterface())
- return findInterfaceMethodExtended(methodName, parameterTypes);
- else
- return findClassMethodExtended(methodName, parameterTypes);
- }
-
- public EList getMethods() {
- reflectMethods();
- return getMethodsGen();
- }
-
- /**
- * Return all methods, including those from supertypes.
- */
- public List getMethodsExtended() {
- Map methods = new HashMap();
- collectMethodsExtended(methods, false, Collections.EMPTY_LIST, Collections.EMPTY_LIST);
- return new ArrayList(methods.values());
- }
-
- /*
- * @see getMethodsExtendedWithFilters(List, List) on JavaClass.
- */
- public List getMethodsExtendedWithFilters(List excludedClasses, List excludedMethods) {
- Map methods = new HashMap();
- collectMethodsExtended(methods, false, excludedClasses, excludedMethods);
- return new ArrayList(methods.values());
- }
-
- public String getName() {
- String result = this.primGetName();
- if (result == null && eIsProxy()) {
- return JavaRefFactory.eINSTANCE.getTypeName(eProxyURI());
- }
- return result;
- }
-
- /**
- * Return a List of Methods that begins with @aMethodNamePrefix and is not included in the @excludedNames list. If @aMethodNamePrefix is null, all methods will be returned.
-
- */
- public List getOnlySpecificMethods(String aMethodNamePrefix, List excludedNames) {
- List methods, specific;
- methods = getMethodsExtended();
- specific = new ArrayList(methods.size());
- Iterator it = methods.iterator();
- Method aMethod;
- String methodName;
- while (it.hasNext()) {
- aMethod = (Method) it.next();
- methodName = aMethod.getName();
- if (aMethodNamePrefix != null && methodName.startsWith(aMethodNamePrefix) && excludedNames != null && !excludedNames.contains(methodName))
- specific.add(aMethod);
- }
- return specific;
- }
-
- public EList getPackageImports() {
- reflectBase();
- return getPackageImportsGen();
- }
-
- /**
- * getPrimitive method comment.
- */
- public JavaDataType getPrimitive() {
- String primitiveName = getPrimitiveName();
- if (primitiveName != null) {
- Resource res = eResource();
- return (JavaDataType) JavaClassImpl.reflect(primitiveName, res.getResourceSet());
- }
- return null;
- }
-
-
- /* (non-Javadoc)
- * @see org.eclipse.jem.java.JavaHelpers#getPrimitiveID()
- */
- public int getPrimitiveID() {
- String myName = getQualifiedName();
- if (myName.equals(INTEGER_NAME))
- return PRIM_INTEGER_ID;
- if (myName.equals(BOOLEAN_NAME))
- return PRIM_BOOLEAN_ID;
- if (myName.equals(BYTE_NAME))
- return PRIM_BYTE_ID;
- if (myName.equals(SHORT_NAME))
- return PRIM_SHORT_ID;
- if (myName.equals(LONG_NAME))
- return PRIM_LONG_ID;
- if (myName.equals(FLOAT_NAME))
- return PRIM_FLOAT_ID;
- if (myName.equals(DOUBLE_NAME))
- return PRIM_DOUBLE_ID;
- if (myName.equals(CHARACTER_NAME))
- return PRIM_CHARACTER_ID;
- return PRIM_NOT_ID;
- }
-
- /**
- * Return the primitive name for this type if one exists.
- */
- protected String getPrimitiveName() {
- String myName = getQualifiedName();
- if (myName.equals(INTEGER_NAME))
- return PRIM_INTEGER_NAME;
- if (myName.equals(BOOLEAN_NAME))
- return PRIM_BOOLEAN_NAME;
- if (myName.equals(BYTE_NAME))
- return PRIM_BYTE_NAME;
- if (myName.equals(SHORT_NAME))
- return PRIM_SHORT_NAME;
- if (myName.equals(LONG_NAME))
- return PRIM_LONG_NAME;
- if (myName.equals(FLOAT_NAME))
- return PRIM_FLOAT_NAME;
- if (myName.equals(DOUBLE_NAME))
- return PRIM_DOUBLE_NAME;
- if (myName.equals(CHARACTER_NAME))
- return PRIM_CHARACTER_NAME;
- return null;
- }
-
- /**
- * Return a method matching the name, and non-return parameters with fully qualified types matching all the types in the list, if it exists. It
- * will not look up the supertype hierarchy.
- */
- public Method getPublicMethod(String methodName, List parameterTypes) {
- return getMethod(methodName, parameterTypes, getPublicMethods());
- }
-
- /**
- * Return a method matching the name, and non-return parameters with fully qualified types matching all the types in the list, if it exists. It
- * will not look up the supertype hierarchy.
- */
- public Method getPublicMethodExtended(String methodName, List parameterTypes) {
- return getMethod(methodName, parameterTypes, getPublicMethodsExtended());
- }
-
- /**
- * Return all methods, it will not go up the supertype hierarchy.
- */
- public List getPublicMethods() {
- List publicMethods = new ArrayList();
- List theMethods = getMethods();
- for (int i = 0; i < theMethods.size(); i++) {
- Method m = (Method) theMethods.get(i);
- if (JavaVisibilityKind.PUBLIC_LITERAL == m.getJavaVisibility())
- publicMethods.add(m);
- }
- return publicMethods;
- }
-
- /**
- * Return all public methods, including those from supertypes.
- */
- public List getPublicMethodsExtended() {
- Map methods = new HashMap();
- collectMethodsExtended(methods, true, Collections.EMPTY_LIST, Collections.EMPTY_LIST);
- return new ArrayList(methods.values());
- }
-
- /**
- * Returns a filtered list on the methods of this class, having a name equal to that of the parameter.
- */
- public List getPublicMethodsExtendedNamed(String name) {
- List publicMethods = new ArrayList();
- List theMethods = getPublicMethodsExtended();
- for (int i = 0; i < theMethods.size(); i++) {
- Method m = (Method) theMethods.get(i);
- if (m.getName().equals(name))
- publicMethods.add(m);
- }
- return publicMethods;
- }
-
- /**
- * Returns a filtered list on the methods of this class, having a name equal to that of the parameter.
- */
- public List getPublicMethodsNamed(String name) {
- List publicMethods = new ArrayList();
- List theMethods = getPublicMethods();
- for (int i = 0; i < theMethods.size(); i++) {
- Method m = (Method) theMethods.get(i);
- if (m.getName().equals(name))
- publicMethods.add(m);
- }
- return publicMethods;
- }
-
- public String getQualifiedName() {
- String result = null;
- if (eIsProxy()) {
- result = JavaRefFactory.eINSTANCE.getFullTypeName(eProxyURI());
- } else {
- result = primGetQualifiedName();
- }
- if (result != null)
- result = result.replace('$', '.');
- return result;
- }
-
- /**
- * To be used by people that need to get the qualified name used for reflection. Typically bean info would need to use something like this.
- */
- public String getQualifiedNameForReflection() {
- return primGetQualifiedName();
- }
-
- /**
- * Return a ReadAdaptor which can reflect our Java properties
- */
- protected synchronized ReadAdaptor getReadAdapter() {
- // Need to sync because now in a multi-thread env.
- return (ReadAdaptor) EcoreUtil.getRegisteredAdapter(this, ReadAdaptor.TYPE_KEY);
- }
-
- private static final int NOT_REFLECTED = 0x0, REFLECTED_BASE = 0x1, REFLECTED_METHODS = 0x2, REFLECTED_FIELDS = 0x4;
-
- protected int reflectionStatus = NOT_REFLECTED;
-
- protected void reflectBase() {
- // We only want the testing of the hasReflected and get readadapter to be sync(this) so that
- // it is short and no deadlock possibility (this is because the the method reflection adapter may go
- // back to the containing java class to get its reflection adapter, which would lock on itself. So
- // we need to keep the sections that are sync(this) to not be deadlockable by not doing significant work
- // during the sync.
- ReadAdaptor readAdaptor = null;
- synchronized (this) {
- if ((reflectionStatus & REFLECTED_BASE) == 0) {
- readAdaptor = getReadAdapter();
- }
- }
- if (readAdaptor != null) {
- boolean setReflected = readAdaptor.reflectValuesIfNecessary();
- synchronized (this) {
- // Don't want to set it false. That is job of reflection adapter. Otherwise we could have a race.
- if (setReflected)
- reflectionStatus |= REFLECTED_BASE;
- }
- }
- }
-
- protected void reflectFields() {
- // We only want the testing of the hasReflected and get readadapter to be sync(this) so that
- // it is short and no deadlock possibility (this is because the the method reflection adapter may go
- // back to the containing java class to get its reflection adapter, which would lock on itself. So
- // we need to keep the sections that are sync(this) to not be deadlockable by not doing significant work
- // during the sync.
- ReadAdaptor readAdaptor = null;
- synchronized (this) {
- if ((reflectionStatus & REFLECTED_FIELDS) == 0) {
- readAdaptor = getReadAdapter();
- }
- }
- if (readAdaptor != null) {
- boolean setReflected = ((IJavaClassAdaptor) readAdaptor).reflectFieldsIfNecessary();
- synchronized (this) {
- // Don't want to set it false. That is job of reflection adapter. Otherwise we could have a race.
- if (setReflected)
- reflectionStatus |= (REFLECTED_FIELDS | REFLECTED_BASE); // We can be certain base will be done by reflect fields if not already
- // done.
- }
- }
- }
-
- protected void reflectMethods() {
- // We only want the testing of the hasReflected and get readadapter to be sync(this) so that
- // it is short and no deadlock possibility (this is because the the method reflection adapter may go
- // back to the containing java class to get its reflection adapter, which would lock on itself. So
- // we need to keep the sections that are sync(this) to not be deadlockable by not doing significant work
- // during the sync.
- ReadAdaptor readAdaptor = null;
- synchronized (this) {
- if ((reflectionStatus & REFLECTED_METHODS) == 0) {
- readAdaptor = getReadAdapter();
- }
- }
- if (readAdaptor != null) {
- boolean setReflected = ((IJavaClassAdaptor) readAdaptor).reflectMethodsIfNecessary();
- synchronized (this) {
- // Don't want to set it false. That is job of reflection adapter. Otherwise we could have a race.
- if (setReflected)
- reflectionStatus |= (REFLECTED_METHODS | REFLECTED_BASE); // We can be certain base will be done by reflect fields if not already
- // done.
- }
- }
- }
-
- public JavaClass getSupertype() {
- // If this is an interface, there is no supertype. However, the eSuperTypes IS filled in with any interface that this extends.
- if (isInterface())
- return null;
- List list = getESuperTypes();
- return (!list.isEmpty()) ? (JavaClass) list.get(0) : null;
- }
-
- public JavaClass getWrapper() {
- return this;
- }
-
- /**
- * Test whether the receiver implements the passed interface (or one of its supertypes).
- */
- public boolean implementsInterface(JavaClass interfaceType) {
- if (this == interfaceType)
- return true;
- EList implemented = getImplementsInterfaces();
- JavaClass anInterface;
- for (int i = 0; i < implemented.size(); i++) {
- anInterface = (JavaClass) implemented.get(i);
- if (anInterface.implementsInterface(interfaceType))
- return true;
- }
- if (getSupertype() != null)
- return getSupertype().implementsInterface(interfaceType);
- else
- return false;
- }
-
- /**
- * Return a string showing our details.
- */
- public String infoString() {
- StringBuffer out = new StringBuffer();
- // trip class reflection
- //FB this.eGet(JavaRefPackage.eINSTANCE.getJavaClass_Public());
- reflectBase(); //FB
- out.append("Java class: " + getQualifiedName() + "\n");
- out.append(" superclass: " + this.getSupertype() + "\n");
- EList fields = getFields();
- Field field;
- if (fields.size() > 0) {
- out.append(" Fields:\n");
- for (int i = 0; i < fields.size(); i++) {
- field = (Field) fields.get(i);
- out.append(" " + ((JavaHelpers) field.getEType()).getJavaName() + " " + field.getName() + "\n");
- }
- }
- EList methods = getMethods();
- Method method;
- if (methods.size() > 0) {
- out.append(" Methods:\n");
- for (int i = 0; i < methods.size(); i++) {
- method = (Method) methods.get(i);
- // trip method reflection
- method.isStatic();
- if (method.getReturnType() != null)
- out.append(" " + method.getReturnType().getJavaName() + " ");
- else
- out.append(" void ");
- out.append(method.getName() + "(");
- EList parms = method.getParameters();
- JavaParameter parm;
- if (parms.size() > 0) {
- for (int ii = 0; ii < parms.size(); ii++) {
- parm = (JavaParameter) parms.get(ii);
- //FB if (!parm.isReturn()) {
- out.append(((JavaHelpers) parm.getEType()).getJavaName() + " " + parm.getName());
- if (ii < parms.size() - 1)
- out.append(", ");
- //FB }
- }
- }
- out.append(")\n");
- }
- }
- return out.toString();
- }
-
- /**
- * Tests whether this class inherits from the passed in class.
- */
- public boolean inheritsFrom(JavaClass javaClass) {
- if (this == javaClass)
- return true;
- else if (getSupertype() != null)
- return getSupertype().inheritsFrom(javaClass);
- else
- return false;
- }
-
- public boolean isArray() {
- return false;
- }
-
- /**
- * Can an object of the passed in class be assigned to an object of this class. In other words is this class a supertype of the passed in class,
- * or is it superinterface of it.
- */
- public boolean isAssignableFrom(EClassifier aClass) {
- if (aClass instanceof JavaClass) {
- JavaClass theClass = (JavaClass) aClass;
- // If either this class or aClass kind is unknown then it isn't assignableFrom.
- if (getKind() == TypeKind.UNDEFINED_LITERAL || theClass.getKind() == TypeKind.UNDEFINED_LITERAL)
- return false;
- // If the "aClass" is not a JavaClass (i.e. it is either a JavaDatatype or
- // some other kind of MOF classifier), then it cannot be
- // assigned to something of this class.
- if (getKind() != TypeKind.INTERFACE_LITERAL)
- if (theClass.getKind() != TypeKind.INTERFACE_LITERAL)
- return theClass.inheritsFrom(this);
- else {
- // aClass is an interface, so it is assignable only if
- // "this" is "java.lang.Object".
- return getQualifiedName().equals("java.lang.Object");
- }
- else
- return theClass.implementsInterface(this);
- }
- return false;
- }
-
- /**
- * Does this type exist.
- */
- public boolean isExistingType() {
- // TODO: Temporary, inefficient implementation
- JavaReflectionAdaptor adapter = (JavaReflectionAdaptor) getReadAdapter();
- if (adapter != null)
- return (adapter).hasReflectionSource();
- else
- return false;
- }
-
- /**
- * See if this is valid object of this type.
- */
- public boolean isInstance(Object o) {
- return o instanceof IInstantiationInstance ? isAssignableFrom(((IInstantiationInstance) o).getJavaType()) : false;
- }
-
- /**
- * Is this an interface.
- */
- public boolean isInterface() {
- return getKind() == TypeKind.INTERFACE_LITERAL;
- }
-
- public boolean isNested() {
- return getDeclaringClass() != null;
- }
-
- public boolean isPrimitive() {
- return false;
- }
-
- /**
- * Return an array listing our fields, including inherited fields. The field relationship is derived from contents. This implementation depends on
- * the assumption that supertypes above JavaClass will hold Attributes rather than Fields.
- */
- public Field[] listFieldExtended() {
- List fields = getFieldsExtended();
- Field[] result = new Field[fields.size()];
- fields.toArray(result);
- return result;
- }
-
- /**
- * Return an array listing our Methods, including inherited methods. The method relationship is derived from contents. This implementation depends
- * on the assumption that supertypes above JavaClass will hold Operations rather than Methods.
- */
- public Method[] listMethodExtended() {
- java.util.List methods = getMethodsExtended();
- Method[] result = new Method[methods.size()];
- methods.toArray(result);
- return result;
- }
-
- /**
- * This is required for internal reflection do not use.
- */
- public String primGetName() {
- return super.getName();
- }
-
- /**
- * This is required for internal reflection do not use.
- */
- public String primGetQualifiedName() {
- String result = "";
- if (eIsProxy()) {
- result = JavaRefFactory.eINSTANCE.getFullTypeName(eProxyURI());
- } else {
- JavaPackage pack = getJavaPackage();
- if (pack != null && pack.getPackageName().length() != 0)
- result = pack.getPackageName() + "." + ((JavaRefFactoryImpl) JavaRefFactory.eINSTANCE).primGetTypeName(this.primGetName());
- else
- result = this.getName();
- }
- return result;
- }
-
- /**
- * reflect - reflect a JavaClass for a given qualified name. If the package or class does not exist, one will be created through the reflection
- * mechanism. Lookup the JavaClass in the context of the passed object, handling some error cases.
- *
- * @deprecated @see org.eclipse.jem.java.JavaRefFactory#reflectType(java.lang.String, org.eclipse.emf.ecore.EObject)
- *
- */
- public static JavaHelpers reflect(String aQualifiedName, EObject relatedObject) {
- return JavaRefFactory.eINSTANCE.reflectType(aQualifiedName, relatedObject);
- }
-
- /**
- * reflect - reflect a JavaClass for a given qualified name. If the package or class does not exist, one will be created through the reflection
- * mechanism.
- *
- * @deprecated @see org.eclipse.jem.java.JavaRefFactory#reflectType(java.lang.String, org.eclipse.emf.ecore.resource.ResourceSet)
- */
- public static JavaHelpers reflect(String aQualifiedName, ResourceSet set) {
- return JavaRefFactory.eINSTANCE.reflectType(aQualifiedName, set);
- }
-
- /**
- * reflect - reflect a JavaClass for a given package name or class name. If the package or class does not exist, one will be created through the
- * reflection mechanism.
- *
- * @deprecated @see org.eclipse.jem.java.JavaRefFactory#reflectType(java.lang.String, java.lang.String,
- * org.eclipse.emf.ecore.resource.ResourceSet)
- */
- public static JavaHelpers reflect(String aPackageName, String aClassName, ResourceSet set) {
- return JavaRefFactory.eINSTANCE.reflectType(aPackageName, aClassName, set);
- }
-
- public void setSupertype(JavaClass aJavaClass) throws InheritanceCycleException {
- validateSupertype(aJavaClass);
- List s = super.getESuperTypes();
- s.clear();
- if (aJavaClass != null)
- s.add(aJavaClass);
- }
-
- /**
- * <!-- begin-user-doc -->
- * <!-- end-user-doc -->
- * @generated
- */
- public NotificationChain eInverseAdd(InternalEObject otherEnd, int featureID, NotificationChain msgs) {
- switch (featureID) {
- case JavaRefPackage.JAVA_CLASS__FIELDS:
- return ((InternalEList)getFields()).basicAdd(otherEnd, msgs);
- case JavaRefPackage.JAVA_CLASS__METHODS:
- return ((InternalEList)getMethods()).basicAdd(otherEnd, msgs);
- case JavaRefPackage.JAVA_CLASS__INITIALIZERS:
- return ((InternalEList)getInitializers()).basicAdd(otherEnd, msgs);
- case JavaRefPackage.JAVA_CLASS__DECLARED_CLASSES:
- return ((InternalEList)getDeclaredClasses()).basicAdd(otherEnd, msgs);
- case JavaRefPackage.JAVA_CLASS__DECLARING_CLASS:
- if (declaringClass != null)
- msgs = ((InternalEObject)declaringClass).eInverseRemove(this, JavaRefPackage.JAVA_CLASS__DECLARED_CLASSES, JavaClass.class, msgs);
- return basicSetDeclaringClass((JavaClass)otherEnd, msgs);
- }
- return super.eInverseAdd(otherEnd, featureID, msgs);
- }
-
- /**
- * <!-- begin-user-doc -->
- * <!-- end-user-doc -->
- * @generated
- */
- public NotificationChain eInverseRemove(InternalEObject otherEnd, int featureID, NotificationChain msgs) {
- switch (featureID) {
- case JavaRefPackage.JAVA_CLASS__FIELDS:
- return ((InternalEList)getFields()).basicRemove(otherEnd, msgs);
- case JavaRefPackage.JAVA_CLASS__METHODS:
- return ((InternalEList)getMethods()).basicRemove(otherEnd, msgs);
- case JavaRefPackage.JAVA_CLASS__INITIALIZERS:
- return ((InternalEList)getInitializers()).basicRemove(otherEnd, msgs);
- case JavaRefPackage.JAVA_CLASS__DECLARED_CLASSES:
- return ((InternalEList)getDeclaredClasses()).basicRemove(otherEnd, msgs);
- case JavaRefPackage.JAVA_CLASS__DECLARING_CLASS:
- return basicSetDeclaringClass(null, msgs);
- case JavaRefPackage.JAVA_CLASS__EVENTS:
- return ((InternalEList)getEvents()).basicRemove(otherEnd, msgs);
- }
- return super.eInverseRemove(otherEnd, featureID, msgs);
- }
-
- /**
- * <!-- begin-user-doc -->
- * <!-- end-user-doc -->
- * @generated
- */
- public Object eGet(int featureID, boolean resolve, boolean coreType) {
- switch (featureID) {
- case JavaRefPackage.JAVA_CLASS__KIND:
- return getKind();
- case JavaRefPackage.JAVA_CLASS__PUBLIC:
- return isPublic() ? Boolean.TRUE : Boolean.FALSE;
- case JavaRefPackage.JAVA_CLASS__FINAL:
- return isFinal() ? Boolean.TRUE : Boolean.FALSE;
- case JavaRefPackage.JAVA_CLASS__IMPLEMENTS_INTERFACES:
- return getImplementsInterfaces();
- case JavaRefPackage.JAVA_CLASS__CLASS_IMPORT:
- return getClassImport();
- case JavaRefPackage.JAVA_CLASS__PACKAGE_IMPORTS:
- return getPackageImports();
- case JavaRefPackage.JAVA_CLASS__FIELDS:
- return getFields();
- case JavaRefPackage.JAVA_CLASS__METHODS:
- return getMethods();
- case JavaRefPackage.JAVA_CLASS__INITIALIZERS:
- return getInitializers();
- case JavaRefPackage.JAVA_CLASS__DECLARED_CLASSES:
- return getDeclaredClasses();
- case JavaRefPackage.JAVA_CLASS__DECLARING_CLASS:
- if (resolve) return getDeclaringClass();
- return basicGetDeclaringClass();
- case JavaRefPackage.JAVA_CLASS__JAVA_PACKAGE:
- if (resolve) return getJavaPackage();
- return basicGetJavaPackage();
- case JavaRefPackage.JAVA_CLASS__EVENTS:
- return getEvents();
- case JavaRefPackage.JAVA_CLASS__ALL_EVENTS:
- return getAllEvents();
- }
- return super.eGet(featureID, resolve, coreType);
- }
-
- /**
- * <!-- begin-user-doc -->
- * <!-- end-user-doc -->
- * @generated
- */
- public void eSet(int featureID, Object newValue) {
- switch (featureID) {
- case JavaRefPackage.JAVA_CLASS__KIND:
- setKind((TypeKind)newValue);
- return;
- case JavaRefPackage.JAVA_CLASS__PUBLIC:
- setPublic(((Boolean)newValue).booleanValue());
- return;
- case JavaRefPackage.JAVA_CLASS__FINAL:
- setFinal(((Boolean)newValue).booleanValue());
- return;
- case JavaRefPackage.JAVA_CLASS__IMPLEMENTS_INTERFACES:
- getImplementsInterfaces().clear();
- getImplementsInterfaces().addAll((Collection)newValue);
- return;
- case JavaRefPackage.JAVA_CLASS__CLASS_IMPORT:
- getClassImport().clear();
- getClassImport().addAll((Collection)newValue);
- return;
- case JavaRefPackage.JAVA_CLASS__PACKAGE_IMPORTS:
- getPackageImports().clear();
- getPackageImports().addAll((Collection)newValue);
- return;
- case JavaRefPackage.JAVA_CLASS__FIELDS:
- getFields().clear();
- getFields().addAll((Collection)newValue);
- return;
- case JavaRefPackage.JAVA_CLASS__METHODS:
- getMethods().clear();
- getMethods().addAll((Collection)newValue);
- return;
- case JavaRefPackage.JAVA_CLASS__INITIALIZERS:
- getInitializers().clear();
- getInitializers().addAll((Collection)newValue);
- return;
- case JavaRefPackage.JAVA_CLASS__DECLARED_CLASSES:
- getDeclaredClasses().clear();
- getDeclaredClasses().addAll((Collection)newValue);
- return;
- case JavaRefPackage.JAVA_CLASS__DECLARING_CLASS:
- setDeclaringClass((JavaClass)newValue);
- return;
- case JavaRefPackage.JAVA_CLASS__EVENTS:
- getEvents().clear();
- getEvents().addAll((Collection)newValue);
- return;
- case JavaRefPackage.JAVA_CLASS__ALL_EVENTS:
- getAllEvents().clear();
- getAllEvents().addAll((Collection)newValue);
- return;
- }
- super.eSet(featureID, newValue);
- }
-
- /**
- * <!-- begin-user-doc -->
- * <!-- end-user-doc -->
- * @generated
- */
- public void eUnset(int featureID) {
- switch (featureID) {
- case JavaRefPackage.JAVA_CLASS__KIND:
- setKind(KIND_EDEFAULT);
- return;
- case JavaRefPackage.JAVA_CLASS__PUBLIC:
- setPublic(PUBLIC_EDEFAULT);
- return;
- case JavaRefPackage.JAVA_CLASS__FINAL:
- setFinal(FINAL_EDEFAULT);
- return;
- case JavaRefPackage.JAVA_CLASS__IMPLEMENTS_INTERFACES:
- getImplementsInterfaces().clear();
- return;
- case JavaRefPackage.JAVA_CLASS__CLASS_IMPORT:
- getClassImport().clear();
- return;
- case JavaRefPackage.JAVA_CLASS__PACKAGE_IMPORTS:
- getPackageImports().clear();
- return;
- case JavaRefPackage.JAVA_CLASS__FIELDS:
- getFields().clear();
- return;
- case JavaRefPackage.JAVA_CLASS__METHODS:
- getMethods().clear();
- return;
- case JavaRefPackage.JAVA_CLASS__INITIALIZERS:
- getInitializers().clear();
- return;
- case JavaRefPackage.JAVA_CLASS__DECLARED_CLASSES:
- getDeclaredClasses().clear();
- return;
- case JavaRefPackage.JAVA_CLASS__DECLARING_CLASS:
- setDeclaringClass((JavaClass)null);
- return;
- case JavaRefPackage.JAVA_CLASS__EVENTS:
- getEvents().clear();
- return;
- case JavaRefPackage.JAVA_CLASS__ALL_EVENTS:
- getAllEvents().clear();
- return;
- }
- super.eUnset(featureID);
- }
-
- /**
- * <!-- begin-user-doc -->
- * <!-- end-user-doc -->
- * @generated
- */
- public boolean eIsSet(int featureID) {
- switch (featureID) {
- case JavaRefPackage.JAVA_CLASS__KIND:
- return kind != KIND_EDEFAULT;
- case JavaRefPackage.JAVA_CLASS__PUBLIC:
- return ((eFlags & PUBLIC_EFLAG) != 0) != PUBLIC_EDEFAULT;
- case JavaRefPackage.JAVA_CLASS__FINAL:
- return ((eFlags & FINAL_EFLAG) != 0) != FINAL_EDEFAULT;
- case JavaRefPackage.JAVA_CLASS__IMPLEMENTS_INTERFACES:
- return implementsInterfaces != null && !implementsInterfaces.isEmpty();
- case JavaRefPackage.JAVA_CLASS__CLASS_IMPORT:
- return classImport != null && !classImport.isEmpty();
- case JavaRefPackage.JAVA_CLASS__PACKAGE_IMPORTS:
- return packageImports != null && !packageImports.isEmpty();
- case JavaRefPackage.JAVA_CLASS__FIELDS:
- return fields != null && !fields.isEmpty();
- case JavaRefPackage.JAVA_CLASS__METHODS:
- return methods != null && !methods.isEmpty();
- case JavaRefPackage.JAVA_CLASS__INITIALIZERS:
- return initializers != null && !initializers.isEmpty();
- case JavaRefPackage.JAVA_CLASS__DECLARED_CLASSES:
- return declaredClasses != null && !declaredClasses.isEmpty();
- case JavaRefPackage.JAVA_CLASS__DECLARING_CLASS:
- return declaringClass != null;
- case JavaRefPackage.JAVA_CLASS__JAVA_PACKAGE:
- return basicGetJavaPackage() != null;
- case JavaRefPackage.JAVA_CLASS__EVENTS:
- return events != null && !events.isEmpty();
- case JavaRefPackage.JAVA_CLASS__ALL_EVENTS:
- return !getAllEvents().isEmpty();
- }
- return super.eIsSet(featureID);
- }
-
- /**
- * Check to make sure that the passed JavaClass is a valid super class (i.e., it does not create any cycles in the inheritance.
- *
- * @param aJavaClass
- */
- protected void validateSupertype(JavaClass aJavaClass) throws InheritanceCycleException {
- if (!isValidSupertype(aJavaClass))
- throw new InheritanceCycleException(this, aJavaClass);
- }
-
- public boolean isValidSupertype(JavaClass aJavaClass) {
- if (aJavaClass != null) {
- if (this.equals(aJavaClass))
- return false;
- return extendedIsValidSupertype(getSubtypes(), aJavaClass);
- }
- return true;
- }
-
- /**
- * @param subtypes
- * @param aJavaClass
- */
- private boolean extendedIsValidSupertype(List subtypes, JavaClass aJavaClass) {
- if (!basicIsValidSupertype(subtypes, aJavaClass))
- return false;
- JavaClass subtype;
- for (int i = 0; i < subtypes.size(); i++) {
- subtype = (JavaClass) subtypes.get(i);
- if (!subtype.isValidSupertype(aJavaClass))
- return false;
- }
- return true;
- }
-
- private boolean basicIsValidSupertype(List subtypes, JavaClass aJavaClass) {
- JavaClass subtype;
- for (int i = 0; i < subtypes.size(); i++) {
- subtype = (JavaClass) subtypes.get(i);
- if (subtype.equals(aJavaClass))
- return false;
- }
- return true;
- }
-
- protected List getSubtypes() {
- return getESuperAdapter().getSubclasses();
- }
-
- public String toString() {
- return getClass().getName() + "(" + getQualifiedName() + ")";
- }
-
- public TypeKind getKind() {
- reflectBase();
- return getKindGen();
- }
-
- /**
- * <!-- begin-user-doc -->
- * <!-- end-user-doc -->
- * @generated
- */
- public void setKind(TypeKind newKind) {
- TypeKind oldKind = kind;
- kind = newKind == null ? KIND_EDEFAULT : newKind;
- if (eNotificationRequired())
- eNotify(new ENotificationImpl(this, Notification.SET, JavaRefPackage.JAVA_CLASS__KIND, oldKind, kind));
- }
-
- public boolean isPublic() {
- reflectBase();
- return isPublicGen();
- }
-
- /**
- * <!-- begin-user-doc -->
- * <!-- end-user-doc -->
- * @generated
- */
- public void setPublic(boolean newPublic) {
- boolean oldPublic = (eFlags & PUBLIC_EFLAG) != 0;
- if (newPublic) eFlags |= PUBLIC_EFLAG; else eFlags &= ~PUBLIC_EFLAG;
- if (eNotificationRequired())
- eNotify(new ENotificationImpl(this, Notification.SET, JavaRefPackage.JAVA_CLASS__PUBLIC, oldPublic, newPublic));
- }
-
- public boolean isFinal() {
- reflectBase();
- return isFinalGen();
- }
-
- /**
- * <!-- begin-user-doc -->
- * <!-- end-user-doc -->
- * @generated
- */
- public void setFinal(boolean newFinal) {
- boolean oldFinal = (eFlags & FINAL_EFLAG) != 0;
- if (newFinal) eFlags |= FINAL_EFLAG; else eFlags &= ~FINAL_EFLAG;
- if (eNotificationRequired())
- eNotify(new ENotificationImpl(this, Notification.SET, JavaRefPackage.JAVA_CLASS__FINAL, oldFinal, newFinal));
- }
-
- /**
- * <!-- begin-user-doc -->
- * <!-- end-user-doc -->
- * @generated
- */
- public TypeKind getKindGen() {
- return kind;
- }
-
- /**
- * <!-- begin-user-doc -->
- * <!-- end-user-doc -->
- * @generated
- */
- public boolean isPublicGen() {
- return (eFlags & PUBLIC_EFLAG) != 0;
- }
-
- /**
- * <!-- begin-user-doc -->
- * <!-- end-user-doc -->
- * @generated
- */
- public boolean isFinalGen() {
- return (eFlags & FINAL_EFLAG) != 0;
- }
-
- public EList getInitializers() {
- if (initializers == null) {
- initializers = new EObjectContainmentWithInverseEList(Initializer.class, this, JavaRefPackage.JAVA_CLASS__INITIALIZERS,
- JavaRefPackage.INITIALIZER__JAVA_CLASS);
- }
- return initializers;
- }
-
- /**
- * <!-- begin-user-doc -->
- * <!-- end-user-doc -->
- * @generated
- */
- public void setDeclaringClass(JavaClass newDeclaringClass) {
- if (newDeclaringClass != declaringClass) {
- NotificationChain msgs = null;
- if (declaringClass != null)
- msgs = ((InternalEObject)declaringClass).eInverseRemove(this, JavaRefPackage.JAVA_CLASS__DECLARED_CLASSES, JavaClass.class, msgs);
- if (newDeclaringClass != null)
- msgs = ((InternalEObject)newDeclaringClass).eInverseAdd(this, JavaRefPackage.JAVA_CLASS__DECLARED_CLASSES, JavaClass.class, msgs);
- msgs = basicSetDeclaringClass(newDeclaringClass, msgs);
- if (msgs != null) msgs.dispatch();
- }
- else if (eNotificationRequired())
- eNotify(new ENotificationImpl(this, Notification.SET, JavaRefPackage.JAVA_CLASS__DECLARING_CLASS, newDeclaringClass, newDeclaringClass));
- }
-
- /**
- * <!-- begin-user-doc -->
- * <!-- end-user-doc -->
- * @generated
- */
- public JavaClass getDeclaringClass() {
- if (declaringClass != null && declaringClass.eIsProxy()) {
- InternalEObject oldDeclaringClass = (InternalEObject)declaringClass;
- declaringClass = (JavaClass)eResolveProxy(oldDeclaringClass);
- if (declaringClass != oldDeclaringClass) {
- if (eNotificationRequired())
- eNotify(new ENotificationImpl(this, Notification.RESOLVE, JavaRefPackage.JAVA_CLASS__DECLARING_CLASS, oldDeclaringClass, declaringClass));
- }
- }
- return declaringClass;
- }
-
- /**
- * <!-- begin-user-doc -->
- * <!-- end-user-doc -->
- * @generated
- */
- public JavaClass basicGetDeclaringClass() {
- return declaringClass;
- }
-
- /**
- * <!-- begin-user-doc -->
- * <!-- end-user-doc -->
- * @generated
- */
- public NotificationChain basicSetDeclaringClass(JavaClass newDeclaringClass, NotificationChain msgs) {
- JavaClass oldDeclaringClass = declaringClass;
- declaringClass = newDeclaringClass;
- if (eNotificationRequired()) {
- ENotificationImpl notification = new ENotificationImpl(this, Notification.SET, JavaRefPackage.JAVA_CLASS__DECLARING_CLASS, oldDeclaringClass, newDeclaringClass);
- if (msgs == null) msgs = notification; else msgs.add(notification);
- }
- return msgs;
- }
-
- public EList getDeclaredClasses() {
- reflectBase();
- return getDeclaredClassesGen();
- }
-
- /**
- * <!-- begin-user-doc -->
- * <!-- end-user-doc -->
- * @generated
- */
- public EList getDeclaredClassesGen() {
- if (declaredClasses == null) {
- declaredClasses = new EObjectWithInverseResolvingEList(JavaClass.class, this, JavaRefPackage.JAVA_CLASS__DECLARED_CLASSES, JavaRefPackage.JAVA_CLASS__DECLARING_CLASS);
- }
- return declaredClasses;
- }
-
- public EList getProperties() {
- return getEStructuralFeatures(); // As of EMF 2.0, local properties are the local features. Used to be a merge of eattributes and ereferences.
- }
-
- public EList getEvents() {
- IIntrospectionAdapter adapter = getIntrospectionAdapter();
- if (adapter != null)
- return adapter.getEvents();
- return getEventsGen();
- }
-
- /**
- * <!-- begin-user-doc -->
- * <!-- end-user-doc -->
- * @generated
- */
- public EList getEventsGen() {
- if (events == null) {
- events = new EObjectContainmentEList(JavaEvent.class, this, JavaRefPackage.JAVA_CLASS__EVENTS);
- }
- return events;
- }
-
- private EList allEvents;
-
- public EList getAllEvents() {
- IIntrospectionAdapter ia = getIntrospectionAdapter();
- if (ia == null)
- return ECollections.EMPTY_ELIST; // No introspection, do normal.
- return allEvents = ia.getAllEvents();
- }
-
- public EList getAllEventsGen() {
- return allEvents;
- }
-
- private EList allProperties;
-
- public EList getAllProperties() {
- IIntrospectionAdapter ia = getIntrospectionAdapter();
- if (ia == null)
- return ECollections.EMPTY_ELIST; // No introspection, do normal.
- return allProperties = ia.getAllProperties();
- }
-
- public EList getAllPropertiesGen() {
- return allProperties;
- }
-
- /**
- * <!-- begin-user-doc --> <!-- end-user-doc -->
- *
- */
- public EList getImplementsInterfacesGen() {
- if (implementsInterfaces == null) {
- implementsInterfaces = new EObjectResolvingEList(JavaClass.class, this, JavaRefPackage.JAVA_CLASS__IMPLEMENTS_INTERFACES) {
-
- /**
- * Comment for <code>serialVersionUID</code>
- *
- * @since 1.1.0
- */
- private static final long serialVersionUID = 1L;
-
- public Object get(int index) {
- if (isInterface())
- getInterfaceSuperTypes().get(index); //force resolution so the ESuperAdapter will be updated correctly
- return super.get(index);
- }
-
- public void clear() {
- super.clear();
- if (isInterface())
- getInterfaceSuperTypes().clear();
- }
-
- public Object remove(int index) {
- Object result = super.remove(index);
- if (isInterface())
- getInterfaceSuperTypes().remove(index);
- return result;
-
- }
-
- public boolean removeAll(Collection collection) {
- boolean result = super.removeAll(collection);
- if (isInterface())
- getInterfaceSuperTypes().removeAll(collection);
- return result;
- }
-
- public void add(int index, Object object) {
- super.add(index, object);
- if (isInterface())
- getInterfaceSuperTypes().add(index, object);
- }
-
- public boolean add(Object object) {
- boolean result = super.add(object);
- if (isInterface())
- getInterfaceSuperTypes().add(object);
- return result;
- }
-
- public boolean addAll(Collection collection) {
- boolean result = super.addAll(collection);
- if (isInterface())
- getInterfaceSuperTypes().addAll(collection);
- return result;
- }
-
- public boolean addAll(int index, Collection collection) {
- boolean result = super.addAll(index, collection);
- if (isInterface())
- getInterfaceSuperTypes().addAll(index, collection);
- return result;
- }
- };
- }
- return implementsInterfaces;
- }
-
- private EList getInterfaceSuperTypes() {
- return super.getESuperTypes();
- }
-
- /**
- * <!-- begin-user-doc -->
- * <!-- end-user-doc -->
- * @generated
- */
- public EList getClassImportGen() {
- if (classImport == null) {
- classImport = new EObjectResolvingEList(JavaClass.class, this, JavaRefPackage.JAVA_CLASS__CLASS_IMPORT);
- }
- return classImport;
- }
-
- public EList getEAllSuperTypes() {
- reflectBase();//Force reflection, if needed, before getting all supertypes.
- return super.getEAllSuperTypes();
- }
-
- public EList getESuperTypes() {
- reflectBase();
- return super.getESuperTypes();
- }
-
- /**
- * This method is not meant to be used by others. It is here so that the reflection
- * adapters can reference the unreflected supertypes.
- *
- * @return
- *
- * @since 1.1.0
- */
- public EList primGetESuperTypes() {
- return super.getESuperTypes();
- }
-
- /**
- * <!-- begin-user-doc -->
- * <!-- end-user-doc -->
- * @generated
- */
- public EList getPackageImportsGen() {
- if (packageImports == null) {
- packageImports = new EObjectResolvingEList(JavaPackage.class, this, JavaRefPackage.JAVA_CLASS__PACKAGE_IMPORTS);
- }
- return packageImports;
- }
-
- /**
- * <!-- begin-user-doc -->
- * <!-- end-user-doc -->
- * @generated
- */
- public EList getFieldsGen() {
- if (fields == null) {
- fields = new EObjectContainmentWithInverseEList(Field.class, this, JavaRefPackage.JAVA_CLASS__FIELDS, JavaRefPackage.FIELD__JAVA_CLASS);
- }
- return fields;
- }
-
- /**
- * <!-- begin-user-doc -->
- * <!-- end-user-doc -->
- * @generated
- */
- public EList getMethodsGen() {
- if (methods == null) {
- methods = new EObjectContainmentWithInverseEList(Method.class, this, JavaRefPackage.JAVA_CLASS__METHODS, JavaRefPackage.METHOD__JAVA_CLASS);
- }
- return methods;
- }
-
- /**
- * @generated This field/method will be replaced during code generation
- */
- public JavaPackage getJavaPackageGen() {
- JavaPackage javaPackage = basicGetJavaPackage();
- return javaPackage != null && javaPackage.eIsProxy() ? (JavaPackage)eResolveProxy((InternalEObject)javaPackage) : javaPackage;
- }
-
- /*
- * <!-- begin-user-doc --> <!-- end-user-doc -->
- */
- public JavaPackage basicGetJavaPackage() {
- return getJavaPackage();
- }
-
- /**
- * @generated This field/method will be replaced during code generation.
- */
- public String toStringGen() {
- if (eIsProxy()) return super.toString();
-
- StringBuffer result = new StringBuffer(super.toString());
- result.append(" (kind: ");
- result.append(kind);
- result.append(", public: ");
- result.append((eFlags & PUBLIC_EFLAG) != 0);
- result.append(", final: ");
- result.append((eFlags & FINAL_EFLAG) != 0);
- result.append(')');
- return result.toString();
- }
-
- /*
- * This should never be called with true. It is basically only for reset of reflection, not to set a particular state. But InternalReadAdaptable
- * may be used by someone that shouldn't so to be be safe we keep it. TODO Remove InternalReadAdaptable in next version. Need to wait because we
- * need time to notify everyone.
- *
- * @see org.eclipse.jem.java.adapters.InternalReadAdaptable#setReflected(boolean)
- */
- public synchronized void setReflected(boolean aBoolean) {
- if (!aBoolean)
- reflectionStatus = NOT_REFLECTED;
- }
- /* (non-Javadoc)
- * @see org.eclipse.jem.java.JavaClass#getReflectionType()
- */
- public Object getReflectionType() {
- JavaReflectionAdaptor ja = ((JavaReflectionAdaptor) getReadAdapter());
- return ja != null ? ja.getReflectionSource() : null;
- }
- @Override
- public EList<EObject> eContents()
- {
- return EContentsEList.createEContentsEList(this);
- }
-
- @Override
- public EList<EObject> eCrossReferences()
- {
- return ECrossReferenceEList.createECrossReferenceEList(this);
- }
-}
diff --git a/plugins/org.eclipse.jem/mofjava/org/eclipse/jem/java/internal/impl/JavaDataTypeImpl.java b/plugins/org.eclipse.jem/mofjava/org/eclipse/jem/java/internal/impl/JavaDataTypeImpl.java
deleted file mode 100644
index 71def6c..0000000
--- a/plugins/org.eclipse.jem/mofjava/org/eclipse/jem/java/internal/impl/JavaDataTypeImpl.java
+++ /dev/null
@@ -1,185 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2001, 2005 IBM Corporation and others.
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
- *
- * Contributors:
- * IBM Corporation - initial API and implementation
- *******************************************************************************/
-package org.eclipse.jem.java.internal.impl;
-/*
-
-
- */
-
-import org.eclipse.emf.common.util.EList;
-import org.eclipse.emf.ecore.*;
-import org.eclipse.emf.ecore.impl.EClassImpl;
-import org.eclipse.emf.ecore.util.EContentsEList;
-import org.eclipse.emf.ecore.util.ECrossReferenceEList;
-
-import org.eclipse.jem.internal.java.instantiation.IInstantiationInstance;
-import org.eclipse.jem.java.*;
-/**
- * @generated
- */
-public class JavaDataTypeImpl extends EClassImpl implements JavaDataType {
-
-
- static final String FALSE = "false";
- static final String DOUBLE_ZERO = "0.0";
- static final String FLOAT_ZERO = "0.0f";
- static final String CHAR_ZERO = "'0'";
- static final String ZERO = "0";
-
- private int primitive_type = PRIM_NOT_ID;
-
- protected JavaDataTypeImpl() {
- super();
- }
-
- /**
- * <!-- begin-user-doc -->
- * <!-- end-user-doc -->
- * @generated
- */
- protected EClass eStaticClass() {
- return JavaRefPackage.Literals.JAVA_DATA_TYPE;
- }
-
- /**
- * Return the default string representing the default value of the primitive.
- */
- public String getDefaultValueString() {
- String typeName = getJavaName();
- if (typeName.equals(PRIM_BOOLEAN_NAME))
- return FALSE;
- if (typeName.equals(PRIM_DOUBLE_NAME))
- return DOUBLE_ZERO;
- if (typeName.equals(PRIM_FLOAT_NAME))
- return FLOAT_ZERO;
- if (typeName.equals(PRIM_CHARACTER_NAME))
- return CHAR_ZERO;
- return ZERO;
- }
- public String getJavaName() {
- return getName();
- }
- public JavaDataType getPrimitive() {
- return this;
- }
-
-
- /* (non-Javadoc)
- * @see org.eclipse.jem.java.JavaHelpers#getPrimitiveID()
- */
- public int getPrimitiveID() {
- if (primitive_type == PRIM_NOT_ID) {
- String name = getName();
- if (name.equals(PRIM_BOOLEAN_NAME))
- primitive_type = PRIM_BOOLEAN_ID;
- if (name.equals(PRIM_CHARACTER_NAME))
- primitive_type = PRIM_CHARACTER_ID;
- if (name.equals(PRIM_BYTE_NAME))
- primitive_type = PRIM_BYTE_ID;
- if (name.equals(PRIM_SHORT_NAME))
- primitive_type = PRIM_SHORT_ID;
- if (name.equals(PRIM_INTEGER_NAME))
- primitive_type = PRIM_INTEGER_ID;
- if (name.equals(PRIM_LONG_NAME))
- primitive_type = PRIM_LONG_ID;
- if (name.equals(PRIM_FLOAT_NAME))
- primitive_type = PRIM_FLOAT_ID;
- if (name.equals(PRIM_DOUBLE_NAME))
- primitive_type = PRIM_DOUBLE_ID;
- }
- return primitive_type;
- }
-
- public String getSimpleName() {
- return getName();
- }
- public String getQualifiedName() {
- return getJavaName();
- }
- public JavaClass getWrapper() {
- String wrapperName = getWrapperQualifiedName();
- if (wrapperName != null) {
- return (JavaClass) JavaRefFactory.eINSTANCE.reflectType(wrapperName, this);
- }
- return null;
- }
- /**
- * getWrapper method comment.
- */
- protected String getWrapperQualifiedName() {
- switch (getPrimitiveID()) {
- case PRIM_INTEGER_ID:
- return INTEGER_NAME;
- case PRIM_CHARACTER_ID:
- return CHARACTER_NAME;
- case PRIM_BOOLEAN_ID:
- return BOOLEAN_NAME;
- case PRIM_BYTE_ID:
- return BYTE_NAME;
- case PRIM_SHORT_ID:
- return SHORT_NAME;
- case PRIM_LONG_ID:
- return LONG_NAME;
- case PRIM_FLOAT_ID:
- return FLOAT_NAME;
- case PRIM_DOUBLE_ID:
- return DOUBLE_NAME;
- default:
- return null;
- }
- }
- /*
- * JavaHelpers.isArray() - array types are always JavaClasses, even if their component type is
- * a primitive data type. Return false.
- */
- public boolean isArray() {
- return false;
- }
- /**
- * Can an object of the passed in class be assigned to an
- * object of this class? In the case of primitives, are they the same.
- */
- public boolean isAssignableFrom(EClassifier aClass) {
- return this == aClass;
- }
- /**
- * See if this is valid object of this type.
- */
- public boolean isInstance(Object o) {
- return o instanceof IInstantiationInstance ? isAssignableFrom(((IInstantiationInstance) o).getJavaType()) : false;
- }
- public boolean isPrimitive() {
- return true;
- }
- /* (non-Javadoc)
- * @see org.eclipse.jem.java.JavaHelpers#getQualifiedNameForReflection()
- */
- public String getQualifiedNameForReflection() {
- return getJavaName();
- }
- @Override
- public EList<EObject> eContents()
- {
- return EContentsEList.createEContentsEList(this);
- }
-
- @Override
- public EList<EObject> eCrossReferences()
- {
- return ECrossReferenceEList.createECrossReferenceEList(this);
- }
-
-}
-
-
-
-
-
diff --git a/plugins/org.eclipse.jem/mofjava/org/eclipse/jem/java/internal/impl/JavaEventImpl.java b/plugins/org.eclipse.jem/mofjava/org/eclipse/jem/java/internal/impl/JavaEventImpl.java
deleted file mode 100644
index da7a5ce..0000000
--- a/plugins/org.eclipse.jem/mofjava/org/eclipse/jem/java/internal/impl/JavaEventImpl.java
+++ /dev/null
@@ -1,50 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2001, 2005 IBM Corporation and others.
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
- *
- * Contributors:
- * IBM Corporation - initial API and implementation
- *******************************************************************************/
-package org.eclipse.jem.java.internal.impl;
-/*
-
-
- */
-import org.eclipse.emf.ecore.EClass;
-import org.eclipse.emf.ecore.impl.EStructuralFeatureImpl;
-
-import org.eclipse.jem.java.JavaEvent;
-import org.eclipse.jem.java.JavaRefPackage;
-
-/**
- * <!-- begin-user-doc -->
- * An implementation of the model object '<em><b>Java Event</b></em>'.
- * <!-- end-user-doc -->
- * <p>
- * </p>
- *
- * @generated
- */
-public abstract class JavaEventImpl extends EStructuralFeatureImpl implements JavaEvent {
- /**
- * <!-- begin-user-doc -->
- * <!-- end-user-doc -->
- * @generated
- */
- protected JavaEventImpl() {
- super();
- }
-
- /**
- * <!-- begin-user-doc -->
- * <!-- end-user-doc -->
- * @generated
- */
- protected EClass eStaticClass() {
- return JavaRefPackage.Literals.JAVA_EVENT;
- }
-
-}
diff --git a/plugins/org.eclipse.jem/mofjava/org/eclipse/jem/java/internal/impl/JavaFactoryImpl.java b/plugins/org.eclipse.jem/mofjava/org/eclipse/jem/java/internal/impl/JavaFactoryImpl.java
deleted file mode 100644
index 8d6faba..0000000
--- a/plugins/org.eclipse.jem/mofjava/org/eclipse/jem/java/internal/impl/JavaFactoryImpl.java
+++ /dev/null
@@ -1,68 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2001, 2005 IBM Corporation and others.
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
- *
- * Contributors:
- * IBM Corporation - initial API and implementation
- *******************************************************************************/
-package org.eclipse.jem.java.internal.impl;
-/*
-
-
- */
-import org.eclipse.emf.ecore.EClass;
-import org.eclipse.emf.ecore.EObject;
-import org.eclipse.emf.ecore.impl.EFactoryImpl;
-import org.eclipse.emf.ecore.resource.ResourceSet;
-import org.eclipse.emf.ecore.util.EcoreUtil;
-
-import org.eclipse.jem.internal.java.instantiation.IInstantiationHandler;
-import org.eclipse.jem.internal.java.instantiation.IInstantiationHandlerFactoryAdapter;
-
-/**
- * The factory to use JavaRef packages. It will use the
- * IInstantiationHandler, if there is one, to do the
- * factory requests. Else it will let the superclass handle it.
- */
-public class JavaFactoryImpl extends EFactoryImpl {
-
- private IInstantiationHandler instantiationHandler;
- private boolean retrievedHandler;
-
- /**
- * Constructor for JavaFactoryImpl.
- */
- public JavaFactoryImpl() {
- super();
- }
-
- protected IInstantiationHandler getInstantiationHandler() {
- if (!retrievedHandler) {
- // Need to retrieve handler lazily because when factory is created it does not yet know what ResourceSet it is in.
- // Can't know that until the first time we need a handler.
- ResourceSet rset = getEPackage().eResource().getResourceSet();
- if (rset != null) {
- retrievedHandler = true;
- IInstantiationHandlerFactoryAdapter factory = (IInstantiationHandlerFactoryAdapter) EcoreUtil.getExistingAdapter(rset, IInstantiationHandlerFactoryAdapter.ADAPTER_KEY);
- if (factory != null)
- instantiationHandler = factory.getInstantiationHandler(this);
- }
- }
- return instantiationHandler;
- }
-
- /**
- * @see org.eclipse.emf.ecore.EFactory#create(EClass)
- */
- public EObject create(EClass eClass) {
- IInstantiationHandler ia = getInstantiationHandler();
- if (ia == null || !ia.handlesClass(eClass))
- return super.create(eClass);
- else
- return ia.create(eClass);
- }
-
-}
diff --git a/plugins/org.eclipse.jem/mofjava/org/eclipse/jem/java/internal/impl/JavaPackageImpl.java b/plugins/org.eclipse.jem/mofjava/org/eclipse/jem/java/internal/impl/JavaPackageImpl.java
deleted file mode 100644
index c7e14a5..0000000
--- a/plugins/org.eclipse.jem/mofjava/org/eclipse/jem/java/internal/impl/JavaPackageImpl.java
+++ /dev/null
@@ -1,147 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2001, 2005 IBM Corporation and others.
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
- *
- * Contributors:
- * IBM Corporation - initial API and implementation
- *******************************************************************************/
-package org.eclipse.jem.java.internal.impl;
-/*
-
-
- */
-
-import org.eclipse.emf.common.util.ECollections;
-import org.eclipse.emf.common.util.EList;
-import org.eclipse.emf.ecore.*;
-import org.eclipse.emf.ecore.impl.EPackageImpl;
-import org.eclipse.emf.ecore.resource.ResourceSet;
-import org.eclipse.emf.ecore.util.EContentsEList;
-import org.eclipse.emf.ecore.util.ECrossReferenceEList;
-
-import org.eclipse.jem.java.*;
-
-public class JavaPackageImpl extends EPackageImpl implements JavaPackage, EPackage {
- /**
- * @generated This field/method will be replaced during code generation.
- */
- protected JavaPackageImpl() {
- super();
- }
-
- /**
- * <!-- begin-user-doc -->
- * <!-- end-user-doc -->
- * @generated
- */
- protected EClass eStaticClass() {
- return JavaRefPackage.Literals.JAVA_PACKAGE;
- }
-
- /**
- * Get the list of classes that this package contains.
- * Since this is a derived relationship, we need to implement
- * it here. It will get the metaobjects list. These are the
- * java classes this package contains.
- *
- * If this is the primitives package, then it must return
- * an empty list because it doesn't contain any classes.
- */
- public EList getJavaClasses() {
- return !PRIMITIVE_PACKAGE_NAME.equals(getName()) ?
- ECollections.unmodifiableEList(getEClassifiers()) :
- ECollections.EMPTY_ELIST;
- }
- /**
- * <!-- begin-user-doc -->
- * <!-- end-user-doc -->
- * @generated
- */
- public Object eGet(int featureID, boolean resolve, boolean coreType) {
- switch (featureID) {
- case JavaRefPackage.JAVA_PACKAGE__JAVA_CLASSES:
- return getJavaClasses();
- }
- return super.eGet(featureID, resolve, coreType);
- }
-
- /**
- * <!-- begin-user-doc -->
- * <!-- end-user-doc -->
- * @generated
- */
- public boolean eIsSet(int featureID) {
- switch (featureID) {
- case JavaRefPackage.JAVA_PACKAGE__JAVA_CLASSES:
- return !getJavaClasses().isEmpty();
- }
- return super.eIsSet(featureID);
- }
-
-/**
- * Return the name for this package.
- * We do not want to expose the .javaprim package
- * since this is the name of the default package.
- */
-public String getName() {
- if (isDefault())
- return "";
- else
- return super.getName();
-}
- public String getPackageName() {
-
- String internalName = super.getName() ;
- return JavaPackage.PRIMITIVE_PACKAGE_NAME.equals(internalName) ? "" : internalName ;
-}
-protected boolean isDefault() {
- return JavaPackage.PRIMITIVE_PACKAGE_NAME.equals(super.getName());
-}
- /**
- * Since classes are loaded dynamically and not from a schema, a
- * class could be asked for through this method, and if not yet reflected,
- * it wouldn't be found. We need to make sure that any class asked for
- * in this package is found (i.e. poofed up). Otherwise loading an instance
- * document that refers to java class through namespaces won't be found.
- */
- public EClassifier getEClassifier(String className) {
- // Try to get the class from the resource that this package is in.
- // This will create it if not found. This works because the
- // structure is there is one java package per resource, and
- // the id of the class is the class name without the package
- // portion, which is what className above is.
- Object result = eResource().getEObject(className);
- return (result instanceof EClassifier) ? (EClassifier) result : null;
- }
-
- /**
- * reflect - reflect a Java package for a given package name.
- * If the package does not exist, one will be created through
- * the reflection mechanism.
- * @deprecated
- * @see org.eclipse.jem.java.JavaRefFactory#reflectPackage(java.lang.String, org.eclipse.emf.ecore.resource.ResourceSet)
- */
- public static JavaPackage reflect(String packageName, ResourceSet set) {
- return JavaRefFactory.eINSTANCE.reflectPackage(packageName, set);
- }
- @Override
- public EList<EObject> eContents()
- {
- return EContentsEList.createEContentsEList(this);
- }
-
- @Override
- public EList<EObject> eCrossReferences()
- {
- return ECrossReferenceEList.createECrossReferenceEList(this);
- }
-
-} //JavaPackageImpl
-
-
-
-
-
diff --git a/plugins/org.eclipse.jem/mofjava/org/eclipse/jem/java/internal/impl/JavaParameterImpl.java b/plugins/org.eclipse.jem/mofjava/org/eclipse/jem/java/internal/impl/JavaParameterImpl.java
deleted file mode 100644
index e95f046..0000000
--- a/plugins/org.eclipse.jem/mofjava/org/eclipse/jem/java/internal/impl/JavaParameterImpl.java
+++ /dev/null
@@ -1,280 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2001, 2005 IBM Corporation and others.
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
- *
- * Contributors:
- * IBM Corporation - initial API and implementation
- *******************************************************************************/
-package org.eclipse.jem.java.internal.impl;
-
-/*
-
-
- */
-import org.eclipse.emf.common.notify.Notification;
-import org.eclipse.emf.common.util.EList;
-import org.eclipse.emf.ecore.EClass;
-import org.eclipse.emf.ecore.EObject;
-import org.eclipse.emf.ecore.impl.ENotificationImpl;
-import org.eclipse.emf.ecore.impl.EParameterImpl;
-import org.eclipse.emf.ecore.util.*;
-
-import org.eclipse.jem.internal.java.adapters.IJavaMethodAdapter;
-import org.eclipse.jem.internal.java.adapters.ReadAdaptor;
-import org.eclipse.jem.java.*;
-
-/**
- * @generated
- */
-public class JavaParameterImpl extends EParameterImpl implements JavaParameter {
-
- /**
- * The default value of the '{@link #isFinal() <em>Final</em>}' attribute.
- * <!-- begin-user-doc -->
- * <!-- end-user-doc -->
- * @see #isFinal()
- * @generated
- * @ordered
- */
- protected static final boolean FINAL_EDEFAULT = false;
-
- /**
- * The flag representing the value of the '{@link #isFinal() <em>Final</em>}' attribute.
- * <!-- begin-user-doc -->
- * <!-- end-user-doc -->
- * @see #isFinal()
- * @generated
- * @ordered
- */
- protected static final int FINAL_EFLAG = 1 << 10;
-
- /**
- * The default value of the '{@link #getParameterKind() <em>Parameter Kind</em>}' attribute.
- * <!-- begin-user-doc -->
- * <!-- end-user-doc -->
- * @see #getParameterKind()
- * @generated
- * @ordered
- */
- protected static final JavaParameterKind PARAMETER_KIND_EDEFAULT = JavaParameterKind.IN_LITERAL;
-
- /**
- * @generated This field/method will be replaced during code generation.
- */
- protected JavaParameterKind parameterKind = PARAMETER_KIND_EDEFAULT;
- protected JavaParameterImpl() {
- super();
- }
- /**
- * <!-- begin-user-doc -->
- * <!-- end-user-doc -->
- * @generated
- */
- protected EClass eStaticClass() {
- return JavaRefPackage.Literals.JAVA_PARAMETER;
- }
-
- public JavaHelpers getJavaType() {
- return (JavaHelpers)getEType();
- }
- public String getQualifiedName() {
- return (eContainer() instanceof Method) ? ((Method)eContainer()).getName() + "." + this.getName() : this.getName();
- }
- /**
- * <!-- begin-user-doc -->
- * <!-- end-user-doc -->
- * @generated
- */
- public Object eGet(int featureID, boolean resolve, boolean coreType) {
- switch (featureID) {
- case JavaRefPackage.JAVA_PARAMETER__FINAL:
- return isFinal() ? Boolean.TRUE : Boolean.FALSE;
- case JavaRefPackage.JAVA_PARAMETER__PARAMETER_KIND:
- return getParameterKind();
- }
- return super.eGet(featureID, resolve, coreType);
- }
-
- /**
- * <!-- begin-user-doc -->
- * <!-- end-user-doc -->
- * @generated
- */
- public void eSet(int featureID, Object newValue) {
- switch (featureID) {
- case JavaRefPackage.JAVA_PARAMETER__FINAL:
- setFinal(((Boolean)newValue).booleanValue());
- return;
- case JavaRefPackage.JAVA_PARAMETER__PARAMETER_KIND:
- setParameterKind((JavaParameterKind)newValue);
- return;
- }
- super.eSet(featureID, newValue);
- }
-
- /**
- * <!-- begin-user-doc -->
- * <!-- end-user-doc -->
- * @generated
- */
- public void eUnset(int featureID) {
- switch (featureID) {
- case JavaRefPackage.JAVA_PARAMETER__FINAL:
- setFinal(FINAL_EDEFAULT);
- return;
- case JavaRefPackage.JAVA_PARAMETER__PARAMETER_KIND:
- setParameterKind(PARAMETER_KIND_EDEFAULT);
- return;
- }
- super.eUnset(featureID);
- }
-
- /**
- * <!-- begin-user-doc -->
- * <!-- end-user-doc -->
- * @generated
- */
- public boolean eIsSet(int featureID) {
- switch (featureID) {
- case JavaRefPackage.JAVA_PARAMETER__FINAL:
- return ((eFlags & FINAL_EFLAG) != 0) != FINAL_EDEFAULT;
- case JavaRefPackage.JAVA_PARAMETER__PARAMETER_KIND:
- return parameterKind != PARAMETER_KIND_EDEFAULT;
- }
- return super.eIsSet(featureID);
- }
-
- /**
- * Is this parameter type an array type.
- */
- public boolean isArray() {
- return getJavaType().isArray();
- }
- /**
- * Is this a return parameter.
- */
- public boolean isReturn() {
- return JavaParameterKind.RETURN == getParameterKind().getValue();
- }
- /**
- * @generated This field/method will be replaced during code generation
- */
- public boolean isFinal() {
- return (eFlags & FINAL_EFLAG) != 0;
- }
-
- /**
- * <!-- begin-user-doc -->
- * <!-- end-user-doc -->
- * @generated
- */
- public void setFinal(boolean newFinal) {
- boolean oldFinal = (eFlags & FINAL_EFLAG) != 0;
- if (newFinal) eFlags |= FINAL_EFLAG; else eFlags &= ~FINAL_EFLAG;
- if (eNotificationRequired())
- eNotify(new ENotificationImpl(this, Notification.SET, JavaRefPackage.JAVA_PARAMETER__FINAL, oldFinal, newFinal));
- }
-
- /**
- * @generated This field/method will be replaced during code generation
- */
- public JavaParameterKind getParameterKind() {
- return parameterKind;
- }
-
- /**
- * <!-- begin-user-doc -->
- * <!-- end-user-doc -->
- * @generated
- */
- public void setParameterKind(JavaParameterKind newParameterKind) {
- JavaParameterKind oldParameterKind = parameterKind;
- parameterKind = newParameterKind == null ? PARAMETER_KIND_EDEFAULT : newParameterKind;
- if (eNotificationRequired())
- eNotify(new ENotificationImpl(this, Notification.SET, JavaRefPackage.JAVA_PARAMETER__PARAMETER_KIND, oldParameterKind, parameterKind));
- }
-
- /*
- * This is not meant to be used outside of the reflection adapters.
- */
- public synchronized ReadAdaptor getReadAdapter() {
- return (ReadAdaptor) EcoreUtil.getRegisteredAdapter(eContainer(), ReadAdaptor.TYPE_KEY);
- }
-
- private static final int REFLECTED_BASE = 0x1, REFLECTED_PARAM_NAME = 0x2;
-
- protected int reflectionStatus = REFLECTED_BASE; // At this time base reflection
- // is performed at creation.
-
- protected void reflectParamName() {
- // We only want the testing of the hasReflected and get readadapter to be sync(this) so that
- // it is short and no deadlock possibility (this is because the the method reflection adapter may go
- // back to the containing java class to get its reflection adapter, which would lock on itself. So
- // we need to keep the sections that are sync(this) to not be deadlockable by not doing significant work
- // during the sync.
- ReadAdaptor readAdaptor = null;
- synchronized (this) {
- if ((reflectionStatus & REFLECTED_PARAM_NAME) == 0) {
- readAdaptor = getReadAdapter();
- }
- }
- if (readAdaptor != null) {
- boolean setReflected = ((IJavaMethodAdapter) readAdaptor).reflectParamNamesIfNecessary();
- synchronized (this) {
- // Don't want to set it false. That is job of reflection adapter. Otherwise we could have a race.
- // Normally we wouldn't need to set this because it would be set during the reflectParamNamesIfNecessary, but
- // in case there was a problem we mark it still reflected so we don't try again.
- if (setReflected)
- reflectionStatus |= (REFLECTED_BASE | REFLECTED_PARAM_NAME); // We can be certain base will be done by reflect generated if not already
- // done.
- }
- }
- }
-
- public String getName() {
- reflectParamName();
- return super.getName();
- }
-
- public void setName(String name) {
- super.setName(name);
- synchronized (this) {
- reflectionStatus |= (REFLECTED_PARAM_NAME);
- }
- }
-
- /**
- * @generated This field/method will be replaced during code generation.
- */
- public String toString() {
- if (eIsProxy()) return super.toString();
-
- StringBuffer result = new StringBuffer(super.toString());
- result.append(" (final: ");
- result.append((eFlags & FINAL_EFLAG) != 0);
- result.append(", parameterKind: ");
- result.append(parameterKind);
- result.append(')');
- return result.toString();
- }
- @Override
- public EList<EObject> eContents()
- {
- return EContentsEList.createEContentsEList(this);
- }
-
- @Override
- public EList<EObject> eCrossReferences()
- {
- return ECrossReferenceEList.createECrossReferenceEList(this);
- }
-
-}
-
-
-
-
-
diff --git a/plugins/org.eclipse.jem/mofjava/org/eclipse/jem/java/internal/impl/JavaRefFactoryImpl.java b/plugins/org.eclipse.jem/mofjava/org/eclipse/jem/java/internal/impl/JavaRefFactoryImpl.java
deleted file mode 100644
index d48d3f3..0000000
--- a/plugins/org.eclipse.jem/mofjava/org/eclipse/jem/java/internal/impl/JavaRefFactoryImpl.java
+++ /dev/null
@@ -1,670 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2001, 2006 IBM Corporation and others.
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
- *
- * Contributors:
- * IBM Corporation - initial API and implementation
- *******************************************************************************/
-package org.eclipse.jem.java.internal.impl;
-import java.util.List;
-
-import org.eclipse.emf.common.util.URI;
-import org.eclipse.emf.ecore.*;
-import org.eclipse.emf.ecore.impl.EFactoryImpl;
-import org.eclipse.emf.ecore.plugin.EcorePlugin;
-import org.eclipse.emf.ecore.resource.Resource;
-import org.eclipse.emf.ecore.resource.ResourceSet;
-
-import org.eclipse.jem.internal.java.adapters.ReflectionAdaptor;
-import org.eclipse.jem.java.*;
-import org.eclipse.jem.java.util.JavaContext;
-
-
-
-/**
- * @generated
- */
-public class JavaRefFactoryImpl extends EFactoryImpl implements JavaRefFactory {
-
- /**
- * Creates the default factory implementation.
- * <!-- begin-user-doc -->
- * <!-- end-user-doc -->
- * @generated
- */
- public static JavaRefFactory init() {
- try {
- JavaRefFactory theJavaRefFactory = (JavaRefFactory)EPackage.Registry.INSTANCE.getEFactory("java.xmi");
- if (theJavaRefFactory != null) {
- return theJavaRefFactory;
- }
- }
- catch (Exception exception) {
- EcorePlugin.INSTANCE.log(exception);
- }
- return new JavaRefFactoryImpl();
- }
-
- /**
- * Notes about Type URI's.
- * <p>
- * The format of a type uri is: "java:/package#classname". "package" is either the package name,
- * with '.' for package separator (e.g. "java:/a.b#XYZ"). Or for primitive (e.g. "java:/#int") or
- * for default package (e.g. "java:/#XYZ").
- * <p>
- * The classname has some special changes. First it must use reflection format which means
- * that any inner class must use the '$' format, i.e. "A.B" must be "A$B".
- * <p>
- * Next if there is
- * a generic involved then it must be changed in the following way: "A<? extends a.B>" will
- * be changed to "A{? extends a!B}". The reason for this is first that '<' and '>' are
- * invalid in a fragment (id) of a URI. So we replace them with '{}'. Next because we use
- * the fragment "A.field" or "A.method(" to mean a field or method id, we can't have the
- * '.' in the generic portion. If it was there we couldn't quickly find the appropriate nesting
- * of the generic's '{}' because there could be another generic within the generic, and then
- * say to find the '.' after that nested set.
- */
-
-
- /**
- * Comment for <code>GENERIC_ID_SEPARATOR</code>
- *
- * @since 1.2.0
- */
- private static final char GENERIC_ID_SEPARATOR = '!';
- /**
- * Comment for <code>GENERIC_SEPARATOR</code>
- *
- * @since 1.2.0
- */
- private static final char GENERIC_SEPARATOR = '.';
- /**
- * Comment for <code>GENERIC_ID_END</code>
- *
- * @since 1.2.0
- */
- private static final char GENERIC_ID_END = '}';
- /**
- * Comment for <code>GENERIC_END</code>
- *
- * @since 1.2.0
- */
- private static final char GENERIC_END = '>';
- /**
- * Comment for <code>GENERIC_ID_START</code>
- *
- * @since 1.2.0
- */
- private static final char GENERIC_ID_START = '{';
- /**
- * Comment for <code>GENERIC_START</code>
- *
- * @since 1.2.0
- */
- private static final char GENERIC_START = '<';
-
-
- public JavaRefFactoryImpl() {
- super();
- }
- /**
- * <!-- begin-user-doc -->
- * <!-- end-user-doc -->
- * @generated
- */
- public EObject create(EClass eClass) {
- switch (eClass.getClassifierID()) {
- case JavaRefPackage.JAVA_CLASS: return createJavaClass();
- case JavaRefPackage.INITIALIZER: return createInitializer();
- case JavaRefPackage.JAVA_PARAMETER: return createJavaParameter();
- case JavaRefPackage.METHOD: return createMethod();
- case JavaRefPackage.FIELD: return createField();
- case JavaRefPackage.BLOCK: return createBlock();
- case JavaRefPackage.COMMENT: return createComment();
- case JavaRefPackage.STATEMENT: return createStatement();
- case JavaRefPackage.JAVA_PACKAGE: return createJavaPackage();
- case JavaRefPackage.JAVA_DATA_TYPE: return createJavaDataType();
- case JavaRefPackage.ARRAY_TYPE: return createArrayType();
- default:
- throw new IllegalArgumentException("The class '" + eClass.getName() + "' is not a valid classifier");
- }
- }
-
- /**
- * <!-- begin-user-doc -->
- * <!-- end-user-doc -->
- * @generated
- */
- public Object createFromString(EDataType eDataType, String initialValue) {
- switch (eDataType.getClassifierID()) {
- case JavaRefPackage.TYPE_KIND:
- return createTypeKindFromString(eDataType, initialValue);
- case JavaRefPackage.JAVA_VISIBILITY_KIND:
- return createJavaVisibilityKindFromString(eDataType, initialValue);
- case JavaRefPackage.JAVA_PARAMETER_KIND:
- return createJavaParameterKindFromString(eDataType, initialValue);
- case JavaRefPackage.JTYPE_JAVA_HELPERS:
- return createJTypeJavaHelpersFromString(eDataType, initialValue);
- case JavaRefPackage.JTYPE_LIST:
- return createJTypeListFromString(eDataType, initialValue);
- default:
- throw new IllegalArgumentException("The datatype '" + eDataType.getName() + "' is not a valid classifier");
- }
- }
-
- /**
- * <!-- begin-user-doc -->
- * <!-- end-user-doc -->
- * @generated
- */
- public String convertToString(EDataType eDataType, Object instanceValue) {
- switch (eDataType.getClassifierID()) {
- case JavaRefPackage.TYPE_KIND:
- return convertTypeKindToString(eDataType, instanceValue);
- case JavaRefPackage.JAVA_VISIBILITY_KIND:
- return convertJavaVisibilityKindToString(eDataType, instanceValue);
- case JavaRefPackage.JAVA_PARAMETER_KIND:
- return convertJavaParameterKindToString(eDataType, instanceValue);
- case JavaRefPackage.JTYPE_JAVA_HELPERS:
- return convertJTypeJavaHelpersToString(eDataType, instanceValue);
- case JavaRefPackage.JTYPE_LIST:
- return convertJTypeListToString(eDataType, instanceValue);
- default:
- throw new IllegalArgumentException("The datatype '" + eDataType.getName() + "' is not a valid classifier");
- }
- }
-
- public ArrayType createArrayType(JavaHelpers componentType) {
- ArrayType at = createArrayType();
-
- String computedName = componentType.getQualifiedName() + "[]";
- at.setName(computedName);
- return at;
- }
- public ArrayType createArrayType(JavaHelpers finalComponentType, int dimensions) {
- ArrayType at = createArrayType();
-
- String computedName = finalComponentType.getQualifiedName();
- for (int i = 0; i < dimensions; i++){
- computedName = computedName + "[]";
- }
- at.setName(computedName);
- return at;
- }
-
- /**
- * Get the java context
- * @return
- *
- * @deprecated Use the API {@link JavaContext#createJavaContext()} instead.
- * @since 1.2.0
- */
- public static ResourceSet createJavaContext() {
- return JavaContext.createJavaContext();
- }
- /**
- * Return the Class for the Java refection adapter factory.
- * @deprecated Use the API {@link JavaContext#getReflectionAdapterFactoryClass()} instead.
- */
- public static Class getReflectionAdapterFactoryClass() {
- return JavaContext.getReflectionAdapterFactoryClass();
- }
-
- /**
- * Set the Class for the Java refection adapter factory.
- *
- * @deprecated Use the API {@link JavaContext#setReflectionAdapterFactoryClass(Class)} instead.
- */
- public static void setReflectionAdapterFactoryClass(Class javaReflectionFactoryClass) {
- JavaContext.setReflectionAdapterFactoryClass(javaReflectionFactoryClass);
- }
-
- /**
- * @generated This field/method will be replaced during code generation.
- */
- public Method createMethod() {
- MethodImpl method = new MethodImpl();
- return method;
- }
-
- /**
- * @generated This field/method will be replaced during code generation.
- */
- public JavaClass createJavaClass() {
- JavaClassImpl javaClass = new JavaClassImpl();
- return javaClass;
- }
-
- /**
- * @generated This field/method will be replaced during code generation.
- */
- public Field createField() {
- FieldImpl field = new FieldImpl();
- return field;
- }
-
- /**
- * @generated This field/method will be replaced during code generation.
- */
- public Block createBlock() {
- BlockImpl block = new BlockImpl();
- return block;
- }
-
- /**
- * @generated This field/method will be replaced during code generation.
- */
- public Comment createComment() {
- CommentImpl comment = new CommentImpl();
- return comment;
- }
-
- /**
- * @generated This field/method will be replaced during code generation.
- */
- public Statement createStatement() {
- StatementImpl statement = new StatementImpl();
- return statement;
- }
-
- /**
- * @generated This field/method will be replaced during code generation.
- */
- public Initializer createInitializer() {
- InitializerImpl initializer = new InitializerImpl();
- return initializer;
- }
-
- /**
- * @generated This field/method will be replaced during code generation.
- */
- public JavaParameter createJavaParameter() {
- JavaParameterImpl javaParameter = new JavaParameterImpl();
- return javaParameter;
- }
-
- /**
- * @generated This field/method will be replaced during code generation.
- */
- public ArrayType createArrayType() {
- ArrayTypeImpl arrayType = new ArrayTypeImpl();
- return arrayType;
- }
-
- /**
- * <!-- begin-user-doc -->
- * <!-- end-user-doc -->
- * @generated
- */
- public TypeKind createTypeKindFromString(EDataType eDataType, String initialValue) {
- TypeKind result = TypeKind.get(initialValue);
- if (result == null) throw new IllegalArgumentException("The value '" + initialValue + "' is not a valid enumerator of '" + eDataType.getName() + "'");
- return result;
- }
-
- /**
- * <!-- begin-user-doc -->
- * <!-- end-user-doc -->
- * @generated
- */
- public String convertTypeKindToString(EDataType eDataType, Object instanceValue) {
- return instanceValue == null ? null : instanceValue.toString();
- }
-
- /**
- * <!-- begin-user-doc -->
- * <!-- end-user-doc -->
- * @generated
- */
- public JavaVisibilityKind createJavaVisibilityKindFromString(EDataType eDataType, String initialValue) {
- JavaVisibilityKind result = JavaVisibilityKind.get(initialValue);
- if (result == null) throw new IllegalArgumentException("The value '" + initialValue + "' is not a valid enumerator of '" + eDataType.getName() + "'");
- return result;
- }
-
- /**
- * <!-- begin-user-doc -->
- * <!-- end-user-doc -->
- * @generated
- */
- public String convertJavaVisibilityKindToString(EDataType eDataType, Object instanceValue) {
- return instanceValue == null ? null : instanceValue.toString();
- }
-
- /**
- * <!-- begin-user-doc -->
- * <!-- end-user-doc -->
- * @generated
- */
- public JavaParameterKind createJavaParameterKindFromString(EDataType eDataType, String initialValue) {
- JavaParameterKind result = JavaParameterKind.get(initialValue);
- if (result == null) throw new IllegalArgumentException("The value '" + initialValue + "' is not a valid enumerator of '" + eDataType.getName() + "'");
- return result;
- }
-
- /**
- * <!-- begin-user-doc -->
- * <!-- end-user-doc -->
- * @generated
- */
- public String convertJavaParameterKindToString(EDataType eDataType, Object instanceValue) {
- return instanceValue == null ? null : instanceValue.toString();
- }
-
- /**
- * <!-- begin-user-doc -->
- * <!-- end-user-doc -->
- * @generated
- */
- public JavaHelpers createJTypeJavaHelpersFromString(EDataType eDataType, String initialValue) {
- return (JavaHelpers)super.createFromString(eDataType, initialValue);
- }
-
- /**
- * <!-- begin-user-doc -->
- * <!-- end-user-doc -->
- * @generated
- */
- public String convertJTypeJavaHelpersToString(EDataType eDataType, Object instanceValue) {
- return super.convertToString(eDataType, instanceValue);
- }
-
- /**
- * <!-- begin-user-doc -->
- * <!-- end-user-doc -->
- * @generated
- */
- public List createJTypeListFromString(EDataType eDataType, String initialValue) {
- return (List)super.createFromString(eDataType, initialValue);
- }
-
- /**
- * <!-- begin-user-doc -->
- * <!-- end-user-doc -->
- * @generated
- */
- public String convertJTypeListToString(EDataType eDataType, Object instanceValue) {
- return super.convertToString(eDataType, instanceValue);
- }
-
- /**
- * @generated This field/method will be replaced during code generation.
- */
- public JavaDataType createJavaDataType() {
- JavaDataTypeImpl javaDataType = new JavaDataTypeImpl();
- return javaDataType;
- }
-
- /**
- * @generated This field/method will be replaced during code generation.
- */
- public JavaPackage createJavaPackage() {
- JavaPackageImpl javaPackage = new JavaPackageImpl();
- return javaPackage;
- }
-
- /**
- * @generated This field/method will be replaced during code generation.
- */
- public JavaRefPackage getJavaRefPackage() {
- return (JavaRefPackage)getEPackage();
- }
-
- /**
- * @generated This field/method will be replaced during code generation.
- */
- public static JavaRefPackage getPackage() {
- return JavaRefPackage.eINSTANCE;
- }
-
- public static JavaRefFactory getActiveFactory() {
- return JavaRefFactory.eINSTANCE;
- }
-
- /*
- * (non-Javadoc)
- *
- * @see org.eclipse.jem.java.JavaRefFactory#createClassRef(java.lang.String)
- */
- public JavaClass createClassRef(String targetName) {
- JavaClass ref = createJavaClass();
- ((InternalEObject) ref).eSetProxyURI(createTypeURI(targetName));
- return ref;
- }
-
- /* (non-Javadoc)
- * @see org.eclipse.jem.java.JavaRefFactory#reflectType(java.lang.String, org.eclipse.emf.ecore.EObject)
- */
- public JavaHelpers reflectType(String aQualifiedName, EObject relatedObject) {
- Resource r = relatedObject.eResource();
- if (r != null) {
- ResourceSet rs = r.getResourceSet();
- if (rs != null) {
- return reflectType(aQualifiedName, rs);
- }
- }
- return null;
- }
-
- /* (non-Javadoc)
- * @see org.eclipse.jem.java.JavaRefFactory#reflectType(java.lang.String, org.eclipse.emf.ecore.resource.ResourceSet)
- */
- public JavaHelpers reflectType(String aQualifiedName, ResourceSet set) {
- if (aQualifiedName != null) {
- int index = aQualifiedName.lastIndexOf(".");
- if (index > 0)
- return reflectType(aQualifiedName.substring(0, index), aQualifiedName.substring(index + 1, aQualifiedName.length()), set);
- else
- return reflectType("", aQualifiedName, set);
- }
- return null;
- }
-
- /* (non-Javadoc)
- * @see org.eclipse.jem.java.JavaRefFactory#reflectType(java.lang.String, java.lang.String, org.eclipse.emf.ecore.resource.ResourceSet)
- */
- public JavaHelpers reflectType(String aPackageName, String aTypeName, ResourceSet set) {
- if (aTypeName != null && aPackageName != null) {
- org.eclipse.jem.internal.java.init.JavaInit.init();
- return (JavaHelpers) set.getEObject(createTypeURI(aPackageName, aTypeName), true);
- }
- return null;
- }
-
- /* (non-Javadoc)
- * @see org.eclipse.jem.java.JavaRefFactory#reflectPackage(java.lang.String, org.eclipse.emf.ecore.resource.ResourceSet)
- */
- public JavaPackage reflectPackage(String packageName, ResourceSet set) {
- if (packageName != null) {
- org.eclipse.jem.internal.java.init.JavaInit.init();
- return (JavaPackage) set.getEObject(createPackageURI(packageName), true);
- }
- return null;
- }
-
- /* (non-Javadoc)
- * @see org.eclipse.jem.java.JavaRefFactory#createTypeURI(java.lang.String)
- */
- public URI createTypeURI(String aQualifiedName) {
- // for need to just tolerate generics (i.e. "<...>". Fully support later.
- //In this case tolerate means ignore the parameter types.
- int genNdx = aQualifiedName.indexOf(GENERIC_START);
- int pkgNdx = genNdx == -1 ? aQualifiedName.lastIndexOf('.') : aQualifiedName.lastIndexOf('.', genNdx);
- if (pkgNdx > -1)
- return createTypeURI(aQualifiedName.substring(0, pkgNdx), genNdx == -1 ? aQualifiedName.substring(pkgNdx+1) : aQualifiedName.substring(pkgNdx+1, genNdx));
- else
- return createTypeURI(null, aQualifiedName);
- }
-
- /* (non-Javadoc)
- * @see org.eclipse.jem.java.JavaRefFactory#createTypeURI(java.lang.String, java.lang.String)
- */
- public URI createTypeURI(String packageName, String typeName) {
- String[] pkgname = null;
- if (packageName != null && packageName.length() > 0)
- pkgname = new String[] {packageName};
- return URI.createHierarchicalURI(JAVA_PROTOCOL_URI_SCHEME, null, null, pkgname, null, createTypeName(typeName));
- }
-
- /**
- * Create a URI'd type name from a regular typename.
- * <p>
- * This should only be used by friends of the Impl package.
- * @param typeName type name, no package allowed, and must be in form for reflection (i.e. '$' not '.' to separate outer and inner classes).
- * @return
- *
- * @since 1.2.0
- */
- public String createTypeName(String typeName) {
-
- int genStart = typeName.indexOf(GENERIC_START);
- if (genStart > -1) {
- char[] chName = new char[typeName.length()];
- typeName.getChars(0, chName.length, chName, 0);
- for (int i = 0; i < chName.length; i++) {
- switch (chName[i]) {
- case GENERIC_START:
- chName[i] = GENERIC_ID_START;
- break;
- case GENERIC_END:
- chName[i] = GENERIC_ID_END;
- break;
- case GENERIC_SEPARATOR:
- chName[i] = GENERIC_ID_SEPARATOR;
- break;
- default:
- break;
- }
- }
- typeName = new String(chName);
- }
- return typeName;
- }
-
- /* (non-Javadoc)
- * @see org.eclipse.jem.java.JavaRefFactory#getTypeName(org.eclipse.emf.common.util.URI)
- */
- public String getTypeName(URI typeURI) {
- if (isTypeURI(typeURI)) {
- return primGetTypeName(typeURI.fragment());
- } else
- throw new IllegalArgumentException(typeURI.toString());
- }
-
- /**
- * Get type name from URI'd typename.
- * <p>
- * This should only be used by friends of the Impl package.
- * @param type uri fragment value for type name.
- * @return
- *
- * @since 1.2.0
- */
- public String primGetTypeName(String typeName) {
- int genStart = typeName.indexOf(GENERIC_ID_START);
- if (genStart > -1) {
- char[] chName = new char[typeName.length()];
- typeName.getChars(0, chName.length, chName, 0);
- for (int i = 0; i < chName.length; i++) {
- switch (chName[i]) {
- case GENERIC_ID_START:
- chName[i] = GENERIC_START;
- break;
- case GENERIC_ID_END:
- chName[i] = GENERIC_END;
- break;
- case GENERIC_ID_SEPARATOR:
- chName[i] = GENERIC_SEPARATOR;
- break;
- default:
- break;
- }
- }
- typeName = new String(chName);
- }
- return typeName;
- }
-
- /* (non-Javadoc)
- * @see org.eclipse.jem.java.JavaRefFactory#getPackageName(org.eclipse.emf.common.util.URI)
- */
- public String getPackageName(URI javaURI) {
- if (isTypeURI(javaURI) || isPackageURI(javaURI)) {
- if (javaURI.segmentCount() == 1) {
- return javaURI.segment(0);
- } else if (javaURI.segmentCount() == 0)
- return ""; //$NON-NLS-1$
- else
- throw new IllegalArgumentException(javaURI.toString());
- } else
- throw new IllegalArgumentException(javaURI.toString());
- }
-
- /* (non-Javadoc)
- * @see org.eclipse.jem.java.JavaRefFactory#getFullTypeName(org.eclipse.emf.common.util.URI)
- */
- public String getFullTypeName(URI typeURI) {
- String pkgName = getPackageName(typeURI);
- if (!isTypeURI(typeURI))
- throw new IllegalArgumentException(typeURI.toString());
-
- if (pkgName.length() > 0)
- return pkgName+'.'+getTypeName(typeURI);
- else
- return typeURI.fragment();
- }
-
- /* (non-Javadoc)
- * @see org.eclipse.jem.java.JavaRefFactory#createPackageURI(java.lang.String)
- */
- public URI createPackageURI(String packageName) {
- String[] pkgname = null;
- if (packageName != null && packageName.length() > 0)
- pkgname = new String[] {packageName};
- return URI.createHierarchicalURI(JAVA_PROTOCOL_URI_SCHEME, null, null, pkgname, null, JavaPackage.PACKAGE_ID);
- }
- /* (non-Javadoc)
- * @see org.eclipse.jem.java.JavaRefFactory#isJavaURI(org.eclipse.emf.common.util.URI)
- */
- public boolean isJavaURI(URI uri) {
- return JAVA_PROTOCOL_URI_SCHEME.equals(uri.scheme());
- }
-
- /* (non-Javadoc)
- * @see org.eclipse.jem.java.JavaRefFactory#isTypeURI(org.eclipse.emf.common.util.URI)
- */
- public boolean isTypeURI(URI uri) {
- if (isJavaURI(uri)) {
- String frag = uri.fragment();
- if (frag != null && !JavaPackage.PACKAGE_ID.equals(frag)) {
- int delimNdx = frag.indexOf(ReflectionAdaptor.C_CLASS_MEMBER_DELIMITER);
- if (delimNdx != -1)
- return false;
- delimNdx = frag.indexOf('/'); // From beaninfo for property.
- if (delimNdx != -1)
- return false;
- else
- return true;
- } else
- return false;
- } else
- return false;
- }
-
- /* (non-Javadoc)
- * @see org.eclipse.jem.java.JavaRefFactory#isPackageURI(org.eclipse.emf.common.util.URI)
- */
- public boolean isPackageURI(URI uri) {
- return isJavaURI(uri) && JavaPackage.PACKAGE_ID.equals(uri.fragment());
- }
-
-}
-
-
-
-
-
-
diff --git a/plugins/org.eclipse.jem/mofjava/org/eclipse/jem/java/internal/impl/JavaRefPackageImpl.java b/plugins/org.eclipse.jem/mofjava/org/eclipse/jem/java/internal/impl/JavaRefPackageImpl.java
deleted file mode 100644
index a04d514..0000000
--- a/plugins/org.eclipse.jem/mofjava/org/eclipse/jem/java/internal/impl/JavaRefPackageImpl.java
+++ /dev/null
@@ -1,1003 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2001, 2006 IBM Corporation and others.
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
- *
- * Contributors:
- * IBM Corporation - initial API and implementation
- *******************************************************************************/
-package org.eclipse.jem.java.internal.impl;
-/*
-
-
- */
-import java.util.List;
-
-import org.eclipse.emf.ecore.*;
-import org.eclipse.emf.ecore.impl.EPackageImpl;
-
-import org.eclipse.jem.java.*;
-
-
-/**
- * @lastgen class JavaRefPackageImpl extends EPackageImpl implements JavaRefPackage, EPackage {}
- */
-public class JavaRefPackageImpl extends EPackageImpl implements JavaRefPackage {
- /**
- * <!-- begin-user-doc -->
- * <!-- end-user-doc -->
- * @generated
- */
- private EClass javaClassEClass = null;
-
- /**
- * <!-- begin-user-doc -->
- * <!-- end-user-doc -->
- * @generated
- */
- private EClass initializerEClass = null;
-
- /**
- * <!-- begin-user-doc -->
- * <!-- end-user-doc -->
- * @generated
- */
- private EClass javaParameterEClass = null;
-
- /**
- * <!-- begin-user-doc -->
- * <!-- end-user-doc -->
- * @generated
- */
- private EClass methodEClass = null;
-
- /**
- * <!-- begin-user-doc -->
- * <!-- end-user-doc -->
- * @generated
- */
- private EClass fieldEClass = null;
-
- /**
- * <!-- begin-user-doc -->
- * <!-- end-user-doc -->
- * @generated
- */
- private EClass blockEClass = null;
-
- /**
- * <!-- begin-user-doc -->
- * <!-- end-user-doc -->
- * @generated
- */
- private EClass commentEClass = null;
-
- /**
- * <!-- begin-user-doc -->
- * <!-- end-user-doc -->
- * @generated
- */
- private EClass statementEClass = null;
-
- /**
- * <!-- begin-user-doc -->
- * <!-- end-user-doc -->
- * @generated
- */
- private EClass javaPackageEClass = null;
-
- /**
- * <!-- begin-user-doc -->
- * <!-- end-user-doc -->
- * @generated
- */
- private EClass javaDataTypeEClass = null;
-
- /**
- * <!-- begin-user-doc -->
- * <!-- end-user-doc -->
- * @generated
- */
- private EClass arrayTypeEClass = null;
-
- /**
- * <!-- begin-user-doc -->
- * <!-- end-user-doc -->
- * @generated
- */
- private EClass javaEventEClass = null;
-
- /**
- * <!-- begin-user-doc -->
- * <!-- end-user-doc -->
- * @generated
- */
- private EEnum typeKindEEnum = null;
-
- /**
- * <!-- begin-user-doc -->
- * <!-- end-user-doc -->
- * @generated
- */
- private EEnum javaVisibilityKindEEnum = null;
-
- /**
- * <!-- begin-user-doc -->
- * <!-- end-user-doc -->
- * @generated
- */
- private EEnum javaParameterKindEEnum = null;
-
- /**
- * <!-- begin-user-doc -->
- * <!-- end-user-doc -->
- * @generated
- */
- private EDataType jTypeJavaHelpersEDataType = null;
-
- /**
- * <!-- begin-user-doc -->
- * <!-- end-user-doc -->
- * @generated
- */
- private EDataType jTypeListEDataType = null;
-
- /**
- * @generated This field/method will be replaced during code generation.
- */
- private JavaRefPackageImpl() {
- super(eNS_URI, JavaRefFactory.eINSTANCE);
- }
-
- /**
- * Do not use. This is here only for the use of the older deprecated org.eclipse.jem.java.impl.JavaRefPackageImpl.
- * @param b
- *
- *
- * @since 1.2.0
- */
- protected JavaRefPackageImpl(boolean b) {
- this();
- }
-
- /**
- * <!-- begin-user-doc -->
- * <!-- end-user-doc -->
- * @generated
- */
- private static boolean isInited = false;
-
- /**
- * This is here only for older pre-EMF 2.2 generated code that accesses the package directly instead of through the interface. New
- * code should not use this directly.
- * @return
- * @since 1.2.0
- */
- public static JavaRefPackage init() {
- if (isInited) return (JavaRefPackage)EPackage.Registry.INSTANCE.getEPackage(JavaRefPackage.eNS_URI);
-
- // Note: Need to be careful here. If EMF ever changes how it generates the init method and assigns the
- // package in a different way then this will need to change too.
- if (!(EPackage.Registry.INSTANCE.getEPackage(eNS_URI) instanceof org.eclipse.jem.java.impl.JavaRefPackageImpl))
- new org.eclipse.jem.java.impl.JavaRefPackageImpl();
- return initGen();
- }
-
- /**
- * @generated This field/method will be replaced during code generation.
- */
- public static JavaRefPackage initGen() {
- if (isInited) return (JavaRefPackage)EPackage.Registry.INSTANCE.getEPackage(JavaRefPackage.eNS_URI);
-
- // Obtain or create and register package
- JavaRefPackageImpl theJavaRefPackage = (JavaRefPackageImpl)(EPackage.Registry.INSTANCE.getEPackage(eNS_URI) instanceof JavaRefPackageImpl ? EPackage.Registry.INSTANCE.getEPackage(eNS_URI) : new JavaRefPackageImpl());
-
- isInited = true;
-
- // Initialize simple dependencies
- EcorePackage.eINSTANCE.eClass();
-
- // Create package meta-data objects
- theJavaRefPackage.createPackageContents();
-
- // Initialize created meta-data
- theJavaRefPackage.initializePackageContents();
-
- // Mark meta-data to indicate it can't be changed
- theJavaRefPackage.freeze();
-
- return theJavaRefPackage;
- }
-
- /**
- * @generated This field/method will be replaced during code generation.
- */
- public EClass getJavaClass() {
- return javaClassEClass;
- }
-
- /**
- * @generated This field/method will be replaced during code generation.
- */
- public EAttribute getJavaClass_Kind() {
- return (EAttribute)javaClassEClass.getEStructuralFeatures().get(0);
- }
-
- /**
- * <!-- begin-user-doc -->
- * <!-- end-user-doc -->
- * @generated
- */
- public EAttribute getJavaClass_Public() {
- return (EAttribute)javaClassEClass.getEStructuralFeatures().get(1);
- }
-
- /**
- * <!-- begin-user-doc -->
- * <!-- end-user-doc -->
- * @generated
- */
- public EAttribute getJavaClass_Final() {
- return (EAttribute)javaClassEClass.getEStructuralFeatures().get(2);
- }
-
- /**
- * @generated This field/method will be replaced during code generation.
- */
- public EReference getJavaClass_ImplementsInterfaces() {
- return (EReference)javaClassEClass.getEStructuralFeatures().get(3);
- }
-
- /**
- * @generated This field/method will be replaced during code generation.
- */
- public EReference getJavaClass_ClassImport() {
- return (EReference)javaClassEClass.getEStructuralFeatures().get(4);
- }
-
- /**
- * @generated This field/method will be replaced during code generation.
- */
- public EReference getJavaClass_PackageImports() {
- return (EReference)javaClassEClass.getEStructuralFeatures().get(5);
- }
-
- /**
- * @generated This field/method will be replaced during code generation.
- */
- public EReference getJavaClass_Fields() {
- return (EReference)javaClassEClass.getEStructuralFeatures().get(6);
- }
-
- /**
- * @generated This field/method will be replaced during code generation.
- */
- public EReference getJavaClass_Methods() {
- return (EReference)javaClassEClass.getEStructuralFeatures().get(7);
- }
-
- /**
- * @generated This field/method will be replaced during code generation.
- */
- public EReference getJavaClass_Initializers() {
- return (EReference)javaClassEClass.getEStructuralFeatures().get(8);
- }
-
- /**
- * @generated This field/method will be replaced during code generation.
- */
- public EReference getJavaClass_DeclaringClass() {
- return (EReference)javaClassEClass.getEStructuralFeatures().get(10);
- }
-
- /**
- * @generated This field/method will be replaced during code generation.
- */
- public EReference getJavaClass_DeclaredClasses() {
- return (EReference)javaClassEClass.getEStructuralFeatures().get(9);
- }
-
- /**
- * @generated This field/method will be replaced during code generation.
- */
- public EReference getJavaClass_JavaPackage() {
- return (EReference)javaClassEClass.getEStructuralFeatures().get(11);
- }
-
- /**
- * @generated This field/method will be replaced during code generation.
- */
- public EReference getJavaClass_Events() {
- return (EReference)javaClassEClass.getEStructuralFeatures().get(12);
- }
-
- /**
- * @generated This field/method will be replaced during code generation.
- */
- public EReference getJavaClass_AllEvents() {
- return (EReference)javaClassEClass.getEStructuralFeatures().get(13);
- }
-
- /**
- * @generated This field/method will be replaced during code generation.
- */
- public EClass getField() {
- return fieldEClass;
- }
-
- /**
- * <!-- begin-user-doc -->
- * <!-- end-user-doc -->
- * @generated
- */
- public EAttribute getField_Final() {
- return (EAttribute)fieldEClass.getEStructuralFeatures().get(0);
- }
-
- /**
- * <!-- begin-user-doc -->
- * <!-- end-user-doc -->
- * @generated
- */
- public EAttribute getField_Static() {
- return (EAttribute)fieldEClass.getEStructuralFeatures().get(1);
- }
-
- /**
- * @generated This field/method will be replaced during code generation.
- */
- public EAttribute getField_JavaVisibility() {
- return (EAttribute)fieldEClass.getEStructuralFeatures().get(2);
- }
-
- /**
- * <!-- begin-user-doc -->
- * <!-- end-user-doc -->
- * @generated
- */
- public EAttribute getField_Transient() {
- return (EAttribute)fieldEClass.getEStructuralFeatures().get(3);
- }
-
- /**
- * <!-- begin-user-doc -->
- * <!-- end-user-doc -->
- * @generated
- */
- public EAttribute getField_Volatile() {
- return (EAttribute)fieldEClass.getEStructuralFeatures().get(4);
- }
-
- /**
- * @generated This field/method will be replaced during code generation.
- */
- public EReference getField_JavaClass() {
- return (EReference)fieldEClass.getEStructuralFeatures().get(5);
- }
-
- /**
- * @generated This field/method will be replaced during code generation.
- */
- public EReference getField_Initializer() {
- return (EReference)fieldEClass.getEStructuralFeatures().get(6);
- }
-
- /**
- * @generated This field/method will be replaced during code generation.
- */
- public EClass getMethod() {
- return methodEClass;
- }
-
- /**
- * <!-- begin-user-doc -->
- * <!-- end-user-doc -->
- * @generated
- */
- public EAttribute getMethod_Abstract() {
- return (EAttribute)methodEClass.getEStructuralFeatures().get(0);
- }
-
- /**
- * <!-- begin-user-doc -->
- * <!-- end-user-doc -->
- * @generated
- */
- public EAttribute getMethod_Native() {
- return (EAttribute)methodEClass.getEStructuralFeatures().get(1);
- }
-
- /**
- * <!-- begin-user-doc -->
- * <!-- end-user-doc -->
- * @generated
- */
- public EAttribute getMethod_Synchronized() {
- return (EAttribute)methodEClass.getEStructuralFeatures().get(2);
- }
-
- /**
- * <!-- begin-user-doc -->
- * <!-- end-user-doc -->
- * @generated
- */
- public EAttribute getMethod_Final() {
- return (EAttribute)methodEClass.getEStructuralFeatures().get(3);
- }
-
- /**
- * <!-- begin-user-doc -->
- * <!-- end-user-doc -->
- * @generated
- */
- public EAttribute getMethod_Constructor() {
- return (EAttribute)methodEClass.getEStructuralFeatures().get(4);
- }
-
- /**
- * <!-- begin-user-doc -->
- * <!-- end-user-doc -->
- * @generated
- */
- public EAttribute getMethod_Static() {
- return (EAttribute)methodEClass.getEStructuralFeatures().get(5);
- }
-
- /**
- * @generated This field/method will be replaced during code generation.
- */
- public EAttribute getMethod_JavaVisibility() {
- return (EAttribute)methodEClass.getEStructuralFeatures().get(6);
- }
-
- /**
- * @generated This field/method will be replaced during code generation.
- */
- public EReference getMethod_Parameters() {
- return (EReference)methodEClass.getEStructuralFeatures().get(7);
- }
-
- /**
- * @generated This field/method will be replaced during code generation.
- */
- public EReference getMethod_JavaExceptions() {
- return (EReference)methodEClass.getEStructuralFeatures().get(8);
- }
-
- /**
- * @generated This field/method will be replaced during code generation.
- */
- public EReference getMethod_JavaClass() {
- return (EReference)methodEClass.getEStructuralFeatures().get(9);
- }
-
- /**
- * @generated This field/method will be replaced during code generation.
- */
- public EReference getMethod_Source() {
- return (EReference)methodEClass.getEStructuralFeatures().get(10);
- }
-
- /**
- * @generated This field/method will be replaced during code generation.
- */
- public EClass getJavaParameter() {
- return javaParameterEClass;
- }
-
- /**
- * <!-- begin-user-doc -->
- * <!-- end-user-doc -->
- * @generated
- */
- public EAttribute getJavaParameter_Final() {
- return (EAttribute)javaParameterEClass.getEStructuralFeatures().get(0);
- }
-
- /**
- * @generated This field/method will be replaced during code generation.
- */
- public EAttribute getJavaParameter_ParameterKind() {
- return (EAttribute)javaParameterEClass.getEStructuralFeatures().get(1);
- }
-
- /**
- * @generated This field/method will be replaced during code generation.
- */
- public EClass getArrayType() {
- return arrayTypeEClass;
- }
-
- /**
- * @generated This field/method will be replaced during code generation.
- */
- public EAttribute getArrayType_ArrayDimensions() {
- return (EAttribute)arrayTypeEClass.getEStructuralFeatures().get(0);
- }
-
- /**
- * @generated This field/method will be replaced during code generation.
- */
- public EReference getArrayType_ComponentType() {
- return (EReference)arrayTypeEClass.getEStructuralFeatures().get(1);
- }
-
- /**
- * @generated This field/method will be replaced during code generation.
- */
- public EClass getJavaDataType() {
- return javaDataTypeEClass;
- }
-
- /**
- * @generated This field/method will be replaced during code generation.
- */
- public EClass getJavaEvent() {
- return javaEventEClass;
- }
-
- /**
- * @generated This field/method will be replaced during code generation.
- */
- public EClass getJavaPackage() {
- return javaPackageEClass;
- }
-
- /**
- * @generated This field/method will be replaced during code generation.
- */
- public EReference getJavaPackage_JavaClasses() {
- return (EReference)javaPackageEClass.getEStructuralFeatures().get(0);
- }
-
- /**
- * @generated This field/method will be replaced during code generation.
- */
- public EClass getBlock() {
- return blockEClass;
- }
-
- /**
- * @generated This field/method will be replaced during code generation.
- */
- public EAttribute getBlock_Source() {
- return (EAttribute)blockEClass.getEStructuralFeatures().get(0);
- }
-
- /**
- * @generated This field/method will be replaced during code generation.
- */
- public EAttribute getBlock_Name() {
- return (EAttribute)blockEClass.getEStructuralFeatures().get(1);
- }
-
- /**
- * @generated This field/method will be replaced during code generation.
- */
- public EReference getBlock_Contents() {
- return (EReference)blockEClass.getEStructuralFeatures().get(2);
- }
-
- /**
- * @generated This field/method will be replaced during code generation.
- */
- public EClass getComment() {
- return commentEClass;
- }
-
- /**
- * @generated This field/method will be replaced during code generation.
- */
- public EClass getStatement() {
- return statementEClass;
- }
-
- /**
- * @generated This field/method will be replaced during code generation.
- */
- public EClass getInitializer() {
- return initializerEClass;
- }
-
- /**
- * @generated This field/method will be replaced during code generation.
- */
- public EAttribute getInitializer_IsStatic() {
- return (EAttribute)initializerEClass.getEStructuralFeatures().get(0);
- }
-
- /**
- * @generated This field/method will be replaced during code generation.
- */
- public EReference getInitializer_JavaClass() {
- return (EReference)initializerEClass.getEStructuralFeatures().get(1);
- }
-
- /**
- * @generated This field/method will be replaced during code generation.
- */
- public EReference getInitializer_Source() {
- return (EReference)initializerEClass.getEStructuralFeatures().get(2);
- }
-
- /**
- * @generated This field/method will be replaced during code generation.
- */
- public EEnum getJavaVisibilityKind() {
- return javaVisibilityKindEEnum;
- }
-
- /**
- * @generated This field/method will be replaced during code generation.
- */
- public EEnum getJavaParameterKind() {
- return javaParameterKindEEnum;
- }
-
- /**
- * @generated This field/method will be replaced during code generation.
- */
- public EEnum getTypeKind() {
- return typeKindEEnum;
- }
-
- /**
- * @generated This field/method will be replaced during code generation.
- */
- public EDataType getJTypeList() {
- return jTypeListEDataType;
- }
-
- /**
- * @generated This field/method will be replaced during code generation.
- */
- public EDataType getJTypeJavaHelpers() {
- return jTypeJavaHelpersEDataType;
- }
-
- /**
- * @generated This field/method will be replaced during code generation.
- */
- public JavaRefFactory getJavaRefFactory() {
- return (JavaRefFactory)getEFactoryInstance();
- }
-
- /**
- * <!-- begin-user-doc -->
- * <!-- end-user-doc -->
- * @generated
- */
- private boolean isCreated = false;
-
- /**
- * Creates the meta-model objects for the package. This method is
- * guarded to have no affect on any invocation but its first.
- * <!-- begin-user-doc -->
- * <!-- end-user-doc -->
- * @generated
- */
- public void createPackageContents() {
- if (isCreated) return;
- isCreated = true;
-
- // Create classes and their features
- javaClassEClass = createEClass(JAVA_CLASS);
- createEAttribute(javaClassEClass, JAVA_CLASS__KIND);
- createEAttribute(javaClassEClass, JAVA_CLASS__PUBLIC);
- createEAttribute(javaClassEClass, JAVA_CLASS__FINAL);
- createEReference(javaClassEClass, JAVA_CLASS__IMPLEMENTS_INTERFACES);
- createEReference(javaClassEClass, JAVA_CLASS__CLASS_IMPORT);
- createEReference(javaClassEClass, JAVA_CLASS__PACKAGE_IMPORTS);
- createEReference(javaClassEClass, JAVA_CLASS__FIELDS);
- createEReference(javaClassEClass, JAVA_CLASS__METHODS);
- createEReference(javaClassEClass, JAVA_CLASS__INITIALIZERS);
- createEReference(javaClassEClass, JAVA_CLASS__DECLARED_CLASSES);
- createEReference(javaClassEClass, JAVA_CLASS__DECLARING_CLASS);
- createEReference(javaClassEClass, JAVA_CLASS__JAVA_PACKAGE);
- createEReference(javaClassEClass, JAVA_CLASS__EVENTS);
- createEReference(javaClassEClass, JAVA_CLASS__ALL_EVENTS);
-
- initializerEClass = createEClass(INITIALIZER);
- createEAttribute(initializerEClass, INITIALIZER__IS_STATIC);
- createEReference(initializerEClass, INITIALIZER__JAVA_CLASS);
- createEReference(initializerEClass, INITIALIZER__SOURCE);
-
- javaParameterEClass = createEClass(JAVA_PARAMETER);
- createEAttribute(javaParameterEClass, JAVA_PARAMETER__FINAL);
- createEAttribute(javaParameterEClass, JAVA_PARAMETER__PARAMETER_KIND);
-
- methodEClass = createEClass(METHOD);
- createEAttribute(methodEClass, METHOD__ABSTRACT);
- createEAttribute(methodEClass, METHOD__NATIVE);
- createEAttribute(methodEClass, METHOD__SYNCHRONIZED);
- createEAttribute(methodEClass, METHOD__FINAL);
- createEAttribute(methodEClass, METHOD__CONSTRUCTOR);
- createEAttribute(methodEClass, METHOD__STATIC);
- createEAttribute(methodEClass, METHOD__JAVA_VISIBILITY);
- createEReference(methodEClass, METHOD__PARAMETERS);
- createEReference(methodEClass, METHOD__JAVA_EXCEPTIONS);
- createEReference(methodEClass, METHOD__JAVA_CLASS);
- createEReference(methodEClass, METHOD__SOURCE);
-
- fieldEClass = createEClass(FIELD);
- createEAttribute(fieldEClass, FIELD__FINAL);
- createEAttribute(fieldEClass, FIELD__STATIC);
- createEAttribute(fieldEClass, FIELD__JAVA_VISIBILITY);
- createEAttribute(fieldEClass, FIELD__TRANSIENT);
- createEAttribute(fieldEClass, FIELD__VOLATILE);
- createEReference(fieldEClass, FIELD__JAVA_CLASS);
- createEReference(fieldEClass, FIELD__INITIALIZER);
-
- blockEClass = createEClass(BLOCK);
- createEAttribute(blockEClass, BLOCK__SOURCE);
- createEAttribute(blockEClass, BLOCK__NAME);
- createEReference(blockEClass, BLOCK__CONTENTS);
-
- commentEClass = createEClass(COMMENT);
-
- statementEClass = createEClass(STATEMENT);
-
- javaPackageEClass = createEClass(JAVA_PACKAGE);
- createEReference(javaPackageEClass, JAVA_PACKAGE__JAVA_CLASSES);
-
- javaDataTypeEClass = createEClass(JAVA_DATA_TYPE);
-
- arrayTypeEClass = createEClass(ARRAY_TYPE);
- createEAttribute(arrayTypeEClass, ARRAY_TYPE__ARRAY_DIMENSIONS);
- createEReference(arrayTypeEClass, ARRAY_TYPE__COMPONENT_TYPE);
-
- javaEventEClass = createEClass(JAVA_EVENT);
-
- // Create enums
- typeKindEEnum = createEEnum(TYPE_KIND);
- javaVisibilityKindEEnum = createEEnum(JAVA_VISIBILITY_KIND);
- javaParameterKindEEnum = createEEnum(JAVA_PARAMETER_KIND);
-
- // Create data types
- jTypeJavaHelpersEDataType = createEDataType(JTYPE_JAVA_HELPERS);
- jTypeListEDataType = createEDataType(JTYPE_LIST);
- }
-
- /**
- * <!-- begin-user-doc -->
- * <!-- end-user-doc -->
- * @generated
- */
- private boolean isInitialized = false;
-
- /**
- * Complete the initialization of the package and its meta-model. This
- * method is guarded to have no affect on any invocation but its first.
- * <!-- begin-user-doc -->
- * <!-- end-user-doc -->
- * @generated
- */
- public void initializePackageContents() {
- if (isInitialized) return;
- isInitialized = true;
-
- // Initialize package
- setName(eNAME);
- setNsPrefix(eNS_PREFIX);
- setNsURI(eNS_URI);
-
- // Obtain other dependent packages
- EcorePackage theEcorePackage = (EcorePackage)EPackage.Registry.INSTANCE.getEPackage(EcorePackage.eNS_URI);
-
- // Add supertypes to classes
- javaClassEClass.getESuperTypes().add(theEcorePackage.getEClass());
- javaParameterEClass.getESuperTypes().add(theEcorePackage.getEParameter());
- methodEClass.getESuperTypes().add(theEcorePackage.getEOperation());
- fieldEClass.getESuperTypes().add(theEcorePackage.getETypedElement());
- commentEClass.getESuperTypes().add(this.getBlock());
- statementEClass.getESuperTypes().add(this.getBlock());
- javaPackageEClass.getESuperTypes().add(theEcorePackage.getEPackage());
- javaDataTypeEClass.getESuperTypes().add(theEcorePackage.getEClass());
- arrayTypeEClass.getESuperTypes().add(this.getJavaClass());
- javaEventEClass.getESuperTypes().add(theEcorePackage.getEStructuralFeature());
-
- // Initialize classes and features; add operations and parameters
- initEClass(javaClassEClass, JavaClass.class, "JavaClass", !IS_ABSTRACT, !IS_INTERFACE, IS_GENERATED_INSTANCE_CLASS);
- initEAttribute(getJavaClass_Kind(), this.getTypeKind(), "kind", null, 0, 1, JavaClass.class, !IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE, !IS_UNSETTABLE, !IS_ID, IS_UNIQUE, !IS_DERIVED, IS_ORDERED);
- initEAttribute(getJavaClass_Public(), ecorePackage.getEBoolean(), "public", null, 0, 1, JavaClass.class, !IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE, !IS_UNSETTABLE, !IS_ID, IS_UNIQUE, !IS_DERIVED, IS_ORDERED);
- initEAttribute(getJavaClass_Final(), ecorePackage.getEBoolean(), "final", null, 0, 1, JavaClass.class, !IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE, !IS_UNSETTABLE, !IS_ID, IS_UNIQUE, !IS_DERIVED, IS_ORDERED);
- initEReference(getJavaClass_ImplementsInterfaces(), this.getJavaClass(), null, "implementsInterfaces", null, 0, -1, JavaClass.class, !IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE, !IS_COMPOSITE, IS_RESOLVE_PROXIES, !IS_UNSETTABLE, IS_UNIQUE, !IS_DERIVED, IS_ORDERED);
- initEReference(getJavaClass_ClassImport(), this.getJavaClass(), null, "classImport", null, 0, -1, JavaClass.class, !IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE, !IS_COMPOSITE, IS_RESOLVE_PROXIES, !IS_UNSETTABLE, IS_UNIQUE, !IS_DERIVED, IS_ORDERED);
- initEReference(getJavaClass_PackageImports(), this.getJavaPackage(), null, "packageImports", null, 0, -1, JavaClass.class, !IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE, !IS_COMPOSITE, IS_RESOLVE_PROXIES, !IS_UNSETTABLE, IS_UNIQUE, !IS_DERIVED, IS_ORDERED);
- initEReference(getJavaClass_Fields(), this.getField(), this.getField_JavaClass(), "fields", null, 0, -1, JavaClass.class, !IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE, IS_COMPOSITE, !IS_RESOLVE_PROXIES, !IS_UNSETTABLE, IS_UNIQUE, !IS_DERIVED, IS_ORDERED);
- initEReference(getJavaClass_Methods(), this.getMethod(), this.getMethod_JavaClass(), "methods", null, 0, -1, JavaClass.class, !IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE, IS_COMPOSITE, !IS_RESOLVE_PROXIES, !IS_UNSETTABLE, IS_UNIQUE, !IS_DERIVED, IS_ORDERED);
- initEReference(getJavaClass_Initializers(), this.getInitializer(), this.getInitializer_JavaClass(), "initializers", null, 0, -1, JavaClass.class, !IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE, IS_COMPOSITE, !IS_RESOLVE_PROXIES, !IS_UNSETTABLE, IS_UNIQUE, !IS_DERIVED, IS_ORDERED);
- initEReference(getJavaClass_DeclaredClasses(), this.getJavaClass(), this.getJavaClass_DeclaringClass(), "declaredClasses", null, 0, -1, JavaClass.class, !IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE, !IS_COMPOSITE, IS_RESOLVE_PROXIES, !IS_UNSETTABLE, IS_UNIQUE, !IS_DERIVED, IS_ORDERED);
- initEReference(getJavaClass_DeclaringClass(), this.getJavaClass(), this.getJavaClass_DeclaredClasses(), "declaringClass", null, 0, 1, JavaClass.class, !IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE, !IS_COMPOSITE, IS_RESOLVE_PROXIES, !IS_UNSETTABLE, IS_UNIQUE, !IS_DERIVED, IS_ORDERED);
- initEReference(getJavaClass_JavaPackage(), this.getJavaPackage(), this.getJavaPackage_JavaClasses(), "javaPackage", null, 0, 1, JavaClass.class, IS_TRANSIENT, IS_VOLATILE, !IS_CHANGEABLE, !IS_COMPOSITE, IS_RESOLVE_PROXIES, !IS_UNSETTABLE, IS_UNIQUE, !IS_DERIVED, IS_ORDERED);
- initEReference(getJavaClass_Events(), this.getJavaEvent(), null, "events", null, 0, -1, JavaClass.class, !IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE, IS_COMPOSITE, !IS_RESOLVE_PROXIES, !IS_UNSETTABLE, IS_UNIQUE, !IS_DERIVED, IS_ORDERED);
- initEReference(getJavaClass_AllEvents(), this.getJavaEvent(), null, "allEvents", null, 0, -1, JavaClass.class, IS_TRANSIENT, IS_VOLATILE, IS_CHANGEABLE, !IS_COMPOSITE, IS_RESOLVE_PROXIES, !IS_UNSETTABLE, IS_UNIQUE, !IS_DERIVED, IS_ORDERED);
-
- EOperation op = addEOperation(javaClassEClass, ecorePackage.getEBoolean(), "isNested", 0, 1);
-
- op = addEOperation(javaClassEClass, this.getField(), "getField", 0, 1);
- addEParameter(op, ecorePackage.getEString(), "fieldName", 0, 1);
-
- op = addEOperation(javaClassEClass, this.getField(), "getFieldExtended", 0, 1);
- addEParameter(op, ecorePackage.getEString(), "fieldName", 0, 1);
-
- op = addEOperation(javaClassEClass, this.getField(), "getFieldNamed", 0, 1);
- addEParameter(op, ecorePackage.getEString(), "fieldName", 0, 1);
-
- op = addEOperation(javaClassEClass, this.getJTypeList(), "getFieldsExtended", 0, 1);
-
- op = addEOperation(javaClassEClass, this.getMethod(), "getMethod", 0, 1);
- addEParameter(op, ecorePackage.getEString(), "methodName", 0, 1);
- addEParameter(op, this.getJTypeList(), "parameterTypes", 0, 1);
-
- op = addEOperation(javaClassEClass, this.getJTypeList(), "getMethodElementSignatures", 0, 1);
-
- op = addEOperation(javaClassEClass, this.getMethod(), "getMethodExtended", 0, 1);
- addEParameter(op, ecorePackage.getEString(), "methodName", 0, 1);
- addEParameter(op, this.getJTypeList(), "parameterTypes", 0, 1);
-
- op = addEOperation(javaClassEClass, this.getJTypeList(), "getMethodsExtended", 0, 1);
-
- op = addEOperation(javaClassEClass, this.getJTypeList(), "getOnlySpecificMethods", 0, 1);
- addEParameter(op, ecorePackage.getEString(), "aMethodNamePrefix", 0, 1);
- addEParameter(op, this.getJTypeList(), "excludedNames", 0, 1);
-
- op = addEOperation(javaClassEClass, this.getMethod(), "getPublicMethod", 0, 1);
- addEParameter(op, ecorePackage.getEString(), "methodName", 0, 1);
- addEParameter(op, this.getJTypeList(), "parameterTypes", 0, 1);
-
- op = addEOperation(javaClassEClass, this.getJTypeList(), "getPublicMethods", 0, 1);
-
- op = addEOperation(javaClassEClass, this.getJTypeList(), "getPublicMethodsExtended", 0, 1);
-
- op = addEOperation(javaClassEClass, this.getJTypeList(), "getPublicMethodsNamed", 0, 1);
- addEParameter(op, ecorePackage.getEString(), "name", 0, 1);
-
- op = addEOperation(javaClassEClass, this.getJavaClass(), "getSupertype", 0, 1);
-
- op = addEOperation(javaClassEClass, ecorePackage.getEBoolean(), "implementsInterface", 0, 1);
- addEParameter(op, this.getJavaClass(), "interfaceType", 0, 1);
-
- op = addEOperation(javaClassEClass, ecorePackage.getEString(), "infoString", 0, 1);
-
- op = addEOperation(javaClassEClass, ecorePackage.getEBoolean(), "inheritsFrom", 0, 1);
- addEParameter(op, this.getJavaClass(), "javaClass", 0, 1);
-
- op = addEOperation(javaClassEClass, ecorePackage.getEBoolean(), "isExistingType", 0, 1);
-
- op = addEOperation(javaClassEClass, ecorePackage.getEBoolean(), "isInterface", 0, 1);
-
- op = addEOperation(javaClassEClass, null, "setSupertype");
- addEParameter(op, this.getJavaClass(), "javaclass", 0, 1);
-
- initEClass(initializerEClass, Initializer.class, "Initializer", !IS_ABSTRACT, !IS_INTERFACE, IS_GENERATED_INSTANCE_CLASS);
- initEAttribute(getInitializer_IsStatic(), ecorePackage.getEBooleanObject(), "isStatic", null, 0, 1, Initializer.class, !IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE, !IS_UNSETTABLE, !IS_ID, IS_UNIQUE, !IS_DERIVED, IS_ORDERED);
- initEReference(getInitializer_JavaClass(), this.getJavaClass(), this.getJavaClass_Initializers(), "javaClass", null, 0, 1, Initializer.class, IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE, !IS_COMPOSITE, !IS_RESOLVE_PROXIES, !IS_UNSETTABLE, IS_UNIQUE, !IS_DERIVED, IS_ORDERED);
- initEReference(getInitializer_Source(), this.getBlock(), null, "source", null, 0, 1, Initializer.class, !IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE, !IS_COMPOSITE, IS_RESOLVE_PROXIES, !IS_UNSETTABLE, IS_UNIQUE, !IS_DERIVED, IS_ORDERED);
-
- initEClass(javaParameterEClass, JavaParameter.class, "JavaParameter", !IS_ABSTRACT, !IS_INTERFACE, IS_GENERATED_INSTANCE_CLASS);
- initEAttribute(getJavaParameter_Final(), ecorePackage.getEBoolean(), "final", null, 0, 1, JavaParameter.class, !IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE, !IS_UNSETTABLE, !IS_ID, IS_UNIQUE, !IS_DERIVED, IS_ORDERED);
- initEAttribute(getJavaParameter_ParameterKind(), this.getJavaParameterKind(), "parameterKind", null, 0, 1, JavaParameter.class, !IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE, !IS_UNSETTABLE, !IS_ID, IS_UNIQUE, !IS_DERIVED, IS_ORDERED);
-
- op = addEOperation(javaParameterEClass, ecorePackage.getEBoolean(), "isArray", 0, 1);
-
- op = addEOperation(javaParameterEClass, ecorePackage.getEBoolean(), "isReturn", 0, 1);
-
- op = addEOperation(javaParameterEClass, this.getJTypeJavaHelpers(), "getJavaType", 0, 1);
-
- op = addEOperation(javaParameterEClass, ecorePackage.getEString(), "getQualifiedName", 0, 1);
-
- initEClass(methodEClass, Method.class, "Method", !IS_ABSTRACT, !IS_INTERFACE, IS_GENERATED_INSTANCE_CLASS);
- initEAttribute(getMethod_Abstract(), ecorePackage.getEBoolean(), "abstract", null, 0, 1, Method.class, !IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE, !IS_UNSETTABLE, !IS_ID, IS_UNIQUE, !IS_DERIVED, IS_ORDERED);
- initEAttribute(getMethod_Native(), ecorePackage.getEBoolean(), "native", null, 0, 1, Method.class, !IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE, !IS_UNSETTABLE, !IS_ID, IS_UNIQUE, !IS_DERIVED, IS_ORDERED);
- initEAttribute(getMethod_Synchronized(), ecorePackage.getEBoolean(), "synchronized", null, 0, 1, Method.class, !IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE, !IS_UNSETTABLE, !IS_ID, IS_UNIQUE, !IS_DERIVED, IS_ORDERED);
- initEAttribute(getMethod_Final(), ecorePackage.getEBoolean(), "final", null, 0, 1, Method.class, !IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE, !IS_UNSETTABLE, !IS_ID, IS_UNIQUE, !IS_DERIVED, IS_ORDERED);
- initEAttribute(getMethod_Constructor(), ecorePackage.getEBoolean(), "constructor", null, 0, 1, Method.class, !IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE, !IS_UNSETTABLE, !IS_ID, IS_UNIQUE, !IS_DERIVED, IS_ORDERED);
- initEAttribute(getMethod_Static(), ecorePackage.getEBoolean(), "static", null, 0, 1, Method.class, !IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE, !IS_UNSETTABLE, !IS_ID, IS_UNIQUE, !IS_DERIVED, IS_ORDERED);
- initEAttribute(getMethod_JavaVisibility(), this.getJavaVisibilityKind(), "javaVisibility", null, 0, 1, Method.class, !IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE, !IS_UNSETTABLE, !IS_ID, IS_UNIQUE, !IS_DERIVED, IS_ORDERED);
- initEReference(getMethod_Parameters(), this.getJavaParameter(), null, "parameters", null, 0, -1, Method.class, !IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE, IS_COMPOSITE, !IS_RESOLVE_PROXIES, !IS_UNSETTABLE, IS_UNIQUE, !IS_DERIVED, IS_ORDERED);
- initEReference(getMethod_JavaExceptions(), this.getJavaClass(), null, "javaExceptions", null, 0, -1, Method.class, !IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE, !IS_COMPOSITE, IS_RESOLVE_PROXIES, !IS_UNSETTABLE, IS_UNIQUE, !IS_DERIVED, IS_ORDERED);
- initEReference(getMethod_JavaClass(), this.getJavaClass(), this.getJavaClass_Methods(), "javaClass", null, 0, 1, Method.class, IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE, !IS_COMPOSITE, !IS_RESOLVE_PROXIES, !IS_UNSETTABLE, IS_UNIQUE, !IS_DERIVED, IS_ORDERED);
- initEReference(getMethod_Source(), this.getBlock(), null, "source", null, 0, 1, Method.class, !IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE, !IS_COMPOSITE, IS_RESOLVE_PROXIES, !IS_UNSETTABLE, IS_UNIQUE, !IS_DERIVED, IS_ORDERED);
-
- op = addEOperation(methodEClass, this.getJavaClass(), "getContainingJavaClass", 0, 1);
-
- op = addEOperation(methodEClass, ecorePackage.getEString(), "getMethodElementSignature", 0, 1);
-
- op = addEOperation(methodEClass, this.getJavaParameter(), "getParameter", 0, 1);
- addEParameter(op, ecorePackage.getEString(), "parameterName", 0, 1);
-
- op = addEOperation(methodEClass, this.getJTypeJavaHelpers(), "getReturnType", 0, 1);
-
- op = addEOperation(methodEClass, null, "setReturnType");
- addEParameter(op, this.getJTypeJavaHelpers(), "type", 0, 1);
-
- op = addEOperation(methodEClass, ecorePackage.getEString(), "getSignature", 0, 1);
-
- op = addEOperation(methodEClass, ecorePackage.getEBoolean(), "isGenerated", 0, 1);
-
- op = addEOperation(methodEClass, null, "setIsGenerated");
- addEParameter(op, ecorePackage.getEBoolean(), "generated", 0, 1);
-
- op = addEOperation(methodEClass, ecorePackage.getEBoolean(), "isVoid", 0, 1);
-
- initEClass(fieldEClass, Field.class, "Field", !IS_ABSTRACT, !IS_INTERFACE, IS_GENERATED_INSTANCE_CLASS);
- initEAttribute(getField_Final(), ecorePackage.getEBoolean(), "final", null, 0, 1, Field.class, !IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE, !IS_UNSETTABLE, !IS_ID, IS_UNIQUE, !IS_DERIVED, IS_ORDERED);
- initEAttribute(getField_Static(), ecorePackage.getEBoolean(), "static", null, 0, 1, Field.class, !IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE, !IS_UNSETTABLE, !IS_ID, IS_UNIQUE, !IS_DERIVED, IS_ORDERED);
- initEAttribute(getField_JavaVisibility(), this.getJavaVisibilityKind(), "javaVisibility", null, 0, 1, Field.class, !IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE, !IS_UNSETTABLE, !IS_ID, IS_UNIQUE, !IS_DERIVED, IS_ORDERED);
- initEAttribute(getField_Transient(), ecorePackage.getEBoolean(), "transient", null, 0, 1, Field.class, !IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE, !IS_UNSETTABLE, !IS_ID, IS_UNIQUE, !IS_DERIVED, IS_ORDERED);
- initEAttribute(getField_Volatile(), ecorePackage.getEBoolean(), "volatile", null, 0, 1, Field.class, !IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE, !IS_UNSETTABLE, !IS_ID, IS_UNIQUE, !IS_DERIVED, IS_ORDERED);
- initEReference(getField_JavaClass(), this.getJavaClass(), this.getJavaClass_Fields(), "javaClass", null, 0, 1, Field.class, IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE, !IS_COMPOSITE, !IS_RESOLVE_PROXIES, !IS_UNSETTABLE, IS_UNIQUE, !IS_DERIVED, IS_ORDERED);
- initEReference(getField_Initializer(), this.getBlock(), null, "initializer", null, 0, 1, Field.class, !IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE, IS_COMPOSITE, !IS_RESOLVE_PROXIES, !IS_UNSETTABLE, IS_UNIQUE, !IS_DERIVED, IS_ORDERED);
-
- op = addEOperation(fieldEClass, this.getJavaClass(), "getContainingJavaClass", 0, 1);
-
- op = addEOperation(fieldEClass, ecorePackage.getEBoolean(), "isArray", 0, 1);
-
- initEClass(blockEClass, Block.class, "Block", !IS_ABSTRACT, !IS_INTERFACE, IS_GENERATED_INSTANCE_CLASS);
- initEAttribute(getBlock_Source(), ecorePackage.getEString(), "source", null, 0, 1, Block.class, !IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE, !IS_UNSETTABLE, !IS_ID, IS_UNIQUE, !IS_DERIVED, IS_ORDERED);
- initEAttribute(getBlock_Name(), ecorePackage.getEString(), "name", null, 0, 1, Block.class, !IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE, !IS_UNSETTABLE, !IS_ID, IS_UNIQUE, !IS_DERIVED, IS_ORDERED);
- initEReference(getBlock_Contents(), this.getBlock(), null, "contents", null, 0, -1, Block.class, !IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE, IS_COMPOSITE, !IS_RESOLVE_PROXIES, !IS_UNSETTABLE, IS_UNIQUE, !IS_DERIVED, IS_ORDERED);
-
- initEClass(commentEClass, Comment.class, "Comment", !IS_ABSTRACT, !IS_INTERFACE, IS_GENERATED_INSTANCE_CLASS);
-
- initEClass(statementEClass, Statement.class, "Statement", !IS_ABSTRACT, !IS_INTERFACE, IS_GENERATED_INSTANCE_CLASS);
-
- initEClass(javaPackageEClass, JavaPackage.class, "JavaPackage", !IS_ABSTRACT, !IS_INTERFACE, IS_GENERATED_INSTANCE_CLASS);
- initEReference(getJavaPackage_JavaClasses(), this.getJavaClass(), this.getJavaClass_JavaPackage(), "javaClasses", null, 0, -1, JavaPackage.class, IS_TRANSIENT, IS_VOLATILE, !IS_CHANGEABLE, !IS_COMPOSITE, IS_RESOLVE_PROXIES, !IS_UNSETTABLE, IS_UNIQUE, !IS_DERIVED, IS_ORDERED);
-
- initEClass(javaDataTypeEClass, JavaDataType.class, "JavaDataType", !IS_ABSTRACT, !IS_INTERFACE, IS_GENERATED_INSTANCE_CLASS);
-
- op = addEOperation(javaDataTypeEClass, ecorePackage.getEString(), "getDefaultValueString", 0, 1);
-
- initEClass(arrayTypeEClass, ArrayType.class, "ArrayType", !IS_ABSTRACT, !IS_INTERFACE, IS_GENERATED_INSTANCE_CLASS);
- initEAttribute(getArrayType_ArrayDimensions(), ecorePackage.getEInt(), "arrayDimensions", null, 0, 1, ArrayType.class, !IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE, !IS_UNSETTABLE, !IS_ID, IS_UNIQUE, !IS_DERIVED, IS_ORDERED);
- initEReference(getArrayType_ComponentType(), theEcorePackage.getEClassifier(), null, "componentType", null, 1, 1, ArrayType.class, !IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE, !IS_COMPOSITE, IS_RESOLVE_PROXIES, !IS_UNSETTABLE, IS_UNIQUE, !IS_DERIVED, IS_ORDERED);
-
- op = addEOperation(arrayTypeEClass, this.getJTypeJavaHelpers(), "getFinalComponentType", 0, 1);
-
- op = addEOperation(arrayTypeEClass, this.getJTypeJavaHelpers(), "getComponentTypeAsHelper", 0, 1);
-
- op = addEOperation(arrayTypeEClass, ecorePackage.getEBoolean(), "isPrimitiveArray", 0, 1);
-
- op = addEOperation(arrayTypeEClass, null, "setComponentType");
- addEParameter(op, this.getJTypeJavaHelpers(), "helperComponentType", 0, 1);
-
- initEClass(javaEventEClass, JavaEvent.class, "JavaEvent", IS_ABSTRACT, !IS_INTERFACE, IS_GENERATED_INSTANCE_CLASS);
-
- // Initialize enums and add enum literals
- initEEnum(typeKindEEnum, TypeKind.class, "TypeKind");
- addEEnumLiteral(typeKindEEnum, TypeKind.UNDEFINED_LITERAL);
- addEEnumLiteral(typeKindEEnum, TypeKind.CLASS_LITERAL);
- addEEnumLiteral(typeKindEEnum, TypeKind.INTERFACE_LITERAL);
- addEEnumLiteral(typeKindEEnum, TypeKind.EXCEPTION_LITERAL);
-
- initEEnum(javaVisibilityKindEEnum, JavaVisibilityKind.class, "JavaVisibilityKind");
- addEEnumLiteral(javaVisibilityKindEEnum, JavaVisibilityKind.PUBLIC_LITERAL);
- addEEnumLiteral(javaVisibilityKindEEnum, JavaVisibilityKind.PRIVATE_LITERAL);
- addEEnumLiteral(javaVisibilityKindEEnum, JavaVisibilityKind.PROTECTED_LITERAL);
- addEEnumLiteral(javaVisibilityKindEEnum, JavaVisibilityKind.PACKAGE_LITERAL);
-
- initEEnum(javaParameterKindEEnum, JavaParameterKind.class, "JavaParameterKind");
- addEEnumLiteral(javaParameterKindEEnum, JavaParameterKind.IN_LITERAL);
- addEEnumLiteral(javaParameterKindEEnum, JavaParameterKind.OUT_LITERAL);
- addEEnumLiteral(javaParameterKindEEnum, JavaParameterKind.INOUT_LITERAL);
- addEEnumLiteral(javaParameterKindEEnum, JavaParameterKind.RETURN_LITERAL);
-
- // Initialize data types
- initEDataType(jTypeJavaHelpersEDataType, JavaHelpers.class, "JTypeJavaHelpers", IS_SERIALIZABLE, !IS_GENERATED_INSTANCE_CLASS);
- initEDataType(jTypeListEDataType, List.class, "JTypeList", IS_SERIALIZABLE, !IS_GENERATED_INSTANCE_CLASS);
-
- // Create resource
- createResource(eNS_URI);
- }
-
-}
-
-
-
-
-
-
diff --git a/plugins/org.eclipse.jem/mofjava/org/eclipse/jem/java/internal/impl/MethodImpl.java b/plugins/org.eclipse.jem/mofjava/org/eclipse/jem/java/internal/impl/MethodImpl.java
deleted file mode 100644
index 9c46762..0000000
--- a/plugins/org.eclipse.jem/mofjava/org/eclipse/jem/java/internal/impl/MethodImpl.java
+++ /dev/null
@@ -1,1003 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2001, 2005 IBM Corporation and others.
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
- *
- * Contributors:
- * IBM Corporation - initial API and implementation
- *******************************************************************************/
-package org.eclipse.jem.java.internal.impl;
-
-/*
-
-
- */
-
-import java.util.Collection;
-import java.util.List;
-
-import org.eclipse.emf.common.notify.Notification;
-import org.eclipse.emf.common.notify.NotificationChain;
-import org.eclipse.emf.common.util.BasicEList;
-import org.eclipse.emf.common.util.EList;
-import org.eclipse.emf.ecore.*;
-import org.eclipse.emf.ecore.impl.ENotificationImpl;
-import org.eclipse.emf.ecore.impl.EOperationImpl;
-import org.eclipse.emf.ecore.util.*;
-
-import org.eclipse.jem.internal.java.adapters.IJavaMethodAdapter;
-import org.eclipse.jem.internal.java.adapters.ReadAdaptor;
-import org.eclipse.jem.java.*;
-
-/**
- * @generated
- */
-public class MethodImpl extends EOperationImpl implements Method {
-
- protected String signature;
-
- /**
- * The default value of the '{@link #isAbstract() <em>Abstract</em>}' attribute.
- * <!-- begin-user-doc -->
- * <!-- end-user-doc -->
- * @see #isAbstract()
- * @generated
- * @ordered
- */
- protected static final boolean ABSTRACT_EDEFAULT = false;
-
- /**
- * The flag representing the value of the '{@link #isAbstract() <em>Abstract</em>}' attribute.
- * <!-- begin-user-doc -->
- * <!-- end-user-doc -->
- * @see #isAbstract()
- * @generated
- * @ordered
- */
- protected static final int ABSTRACT_EFLAG = 1 << 10;
-
- /**
- * The default value of the '{@link #isNative() <em>Native</em>}' attribute.
- * <!-- begin-user-doc -->
- * <!-- end-user-doc -->
- * @see #isNative()
- * @generated
- * @ordered
- */
- protected static final boolean NATIVE_EDEFAULT = false;
-
- /**
- * The flag representing the value of the '{@link #isNative() <em>Native</em>}' attribute.
- * <!-- begin-user-doc -->
- * <!-- end-user-doc -->
- * @see #isNative()
- * @generated
- * @ordered
- */
- protected static final int NATIVE_EFLAG = 1 << 11;
-
- /**
- * The default value of the '{@link #isSynchronized() <em>Synchronized</em>}' attribute.
- * <!-- begin-user-doc -->
- * <!-- end-user-doc -->
- * @see #isSynchronized()
- * @generated
- * @ordered
- */
- protected static final boolean SYNCHRONIZED_EDEFAULT = false;
-
- /**
- * The flag representing the value of the '{@link #isSynchronized() <em>Synchronized</em>}' attribute.
- * <!-- begin-user-doc -->
- * <!-- end-user-doc -->
- * @see #isSynchronized()
- * @generated
- * @ordered
- */
- protected static final int SYNCHRONIZED_EFLAG = 1 << 12;
-
- /**
- * The default value of the '{@link #isFinal() <em>Final</em>}' attribute.
- * <!-- begin-user-doc -->
- * <!-- end-user-doc -->
- * @see #isFinal()
- * @generated
- * @ordered
- */
- protected static final boolean FINAL_EDEFAULT = false;
-
- /**
- * The flag representing the value of the '{@link #isFinal() <em>Final</em>}' attribute.
- * <!-- begin-user-doc -->
- * <!-- end-user-doc -->
- * @see #isFinal()
- * @generated
- * @ordered
- */
- protected static final int FINAL_EFLAG = 1 << 13;
-
- /**
- * The default value of the '{@link #isConstructor() <em>Constructor</em>}' attribute.
- * <!-- begin-user-doc -->
- * <!-- end-user-doc -->
- * @see #isConstructor()
- * @generated
- * @ordered
- */
- protected static final boolean CONSTRUCTOR_EDEFAULT = false;
-
- /**
- * The flag representing the value of the '{@link #isConstructor() <em>Constructor</em>}' attribute.
- * <!-- begin-user-doc -->
- * <!-- end-user-doc -->
- * @see #isConstructor()
- * @generated
- * @ordered
- */
- protected static final int CONSTRUCTOR_EFLAG = 1 << 14;
-
- /**
- * The default value of the '{@link #isStatic() <em>Static</em>}' attribute.
- * <!-- begin-user-doc -->
- * <!-- end-user-doc -->
- * @see #isStatic()
- * @generated
- * @ordered
- */
- protected static final boolean STATIC_EDEFAULT = false;
-
- /**
- * The flag representing the value of the '{@link #isStatic() <em>Static</em>}' attribute.
- * <!-- begin-user-doc -->
- * <!-- end-user-doc -->
- * @see #isStatic()
- * @generated
- * @ordered
- */
- protected static final int STATIC_EFLAG = 1 << 15;
-
- /**
- * The default value of the '{@link #getJavaVisibility() <em>Java Visibility</em>}' attribute.
- * <!-- begin-user-doc -->
- * <!-- end-user-doc -->
- * @see #getJavaVisibility()
- * @generated
- * @ordered
- */
- protected static final JavaVisibilityKind JAVA_VISIBILITY_EDEFAULT = JavaVisibilityKind.PUBLIC_LITERAL;
-
- private transient boolean isGenerated = false;
-
- /**
- * @generated This field/method will be replaced during code generation.
- */
- protected JavaVisibilityKind javaVisibility = JAVA_VISIBILITY_EDEFAULT;
-
- /**
- * The cached value of the '{@link #getParameters() <em>Parameters</em>}' containment reference list.
- * <!-- begin-user-doc -->
- * <!-- end-user-doc -->
- * @see #getParameters()
- * @generated
- * @ordered
- */
- protected EList parameters = null;
-
- /**
- * The cached value of the '{@link #getJavaExceptions() <em>Java Exceptions</em>}' reference list.
- * <!-- begin-user-doc -->
- * <!-- end-user-doc -->
- * @see #getJavaExceptions()
- * @generated
- * @ordered
- */
- protected EList javaExceptions = null;
-
- /**
- * The cached value of the '{@link #getSource() <em>Source</em>}' reference.
- * <!-- begin-user-doc -->
- * <!-- end-user-doc -->
- * @see #getSource()
- * @generated
- * @ordered
- */
- protected Block source = null;
-
- protected MethodImpl() {
- super();
- }
-
- /**
- * <!-- begin-user-doc -->
- * <!-- end-user-doc -->
- * @generated
- */
- protected EClass eStaticClass() {
- return JavaRefPackage.Literals.METHOD;
- }
-
- /**
- * <!-- begin-user-doc -->
- * <!-- end-user-doc -->
- * @generated
- */
- public boolean isAbstractGen() {
- return (eFlags & ABSTRACT_EFLAG) != 0;
- }
-
- /**
- * <!-- begin-user-doc -->
- * <!-- end-user-doc -->
- * @generated
- */
- public void setAbstract(boolean newAbstract) {
- boolean oldAbstract = (eFlags & ABSTRACT_EFLAG) != 0;
- if (newAbstract) eFlags |= ABSTRACT_EFLAG; else eFlags &= ~ABSTRACT_EFLAG;
- if (eNotificationRequired())
- eNotify(new ENotificationImpl(this, Notification.SET, JavaRefPackage.METHOD__ABSTRACT, oldAbstract, newAbstract));
- }
-
- /**
- * <!-- begin-user-doc -->
- * <!-- end-user-doc -->
- * @generated
- */
- public boolean isNativeGen() {
- return (eFlags & NATIVE_EFLAG) != 0;
- }
-
- /**
- * <!-- begin-user-doc -->
- * <!-- end-user-doc -->
- * @generated
- */
- public void setNative(boolean newNative) {
- boolean oldNative = (eFlags & NATIVE_EFLAG) != 0;
- if (newNative) eFlags |= NATIVE_EFLAG; else eFlags &= ~NATIVE_EFLAG;
- if (eNotificationRequired())
- eNotify(new ENotificationImpl(this, Notification.SET, JavaRefPackage.METHOD__NATIVE, oldNative, newNative));
- }
-
- /**
- * <!-- begin-user-doc -->
- * <!-- end-user-doc -->
- * @generated
- */
- public boolean isSynchronizedGen() {
- return (eFlags & SYNCHRONIZED_EFLAG) != 0;
- }
-
- /**
- * <!-- begin-user-doc -->
- * <!-- end-user-doc -->
- * @generated
- */
- public void setSynchronized(boolean newSynchronized) {
- boolean oldSynchronized = (eFlags & SYNCHRONIZED_EFLAG) != 0;
- if (newSynchronized) eFlags |= SYNCHRONIZED_EFLAG; else eFlags &= ~SYNCHRONIZED_EFLAG;
- if (eNotificationRequired())
- eNotify(new ENotificationImpl(this, Notification.SET, JavaRefPackage.METHOD__SYNCHRONIZED, oldSynchronized, newSynchronized));
- }
-
- /**
- * <!-- begin-user-doc -->
- * <!-- end-user-doc -->
- * @generated
- */
- public boolean isFinalGen() {
- return (eFlags & FINAL_EFLAG) != 0;
- }
-
- /**
- * <!-- begin-user-doc -->
- * <!-- end-user-doc -->
- * @generated
- */
- public void setFinal(boolean newFinal) {
- boolean oldFinal = (eFlags & FINAL_EFLAG) != 0;
- if (newFinal) eFlags |= FINAL_EFLAG; else eFlags &= ~FINAL_EFLAG;
- if (eNotificationRequired())
- eNotify(new ENotificationImpl(this, Notification.SET, JavaRefPackage.METHOD__FINAL, oldFinal, newFinal));
- }
-
- /**
- * <!-- begin-user-doc -->
- * <!-- end-user-doc -->
- * @generated
- */
- public boolean isConstructorGen() {
- return (eFlags & CONSTRUCTOR_EFLAG) != 0;
- }
-
- /**
- * <!-- begin-user-doc -->
- * <!-- end-user-doc -->
- * @generated
- */
- public void setConstructor(boolean newConstructor) {
- boolean oldConstructor = (eFlags & CONSTRUCTOR_EFLAG) != 0;
- if (newConstructor) eFlags |= CONSTRUCTOR_EFLAG; else eFlags &= ~CONSTRUCTOR_EFLAG;
- if (eNotificationRequired())
- eNotify(new ENotificationImpl(this, Notification.SET, JavaRefPackage.METHOD__CONSTRUCTOR, oldConstructor, newConstructor));
- }
-
- /**
- * <!-- begin-user-doc -->
- * <!-- end-user-doc -->
- * @generated
- */
- public boolean isStaticGen() {
- return (eFlags & STATIC_EFLAG) != 0;
- }
-
- /**
- * <!-- begin-user-doc -->
- * <!-- end-user-doc -->
- * @generated
- */
- public void setStatic(boolean newStatic) {
- boolean oldStatic = (eFlags & STATIC_EFLAG) != 0;
- if (newStatic) eFlags |= STATIC_EFLAG; else eFlags &= ~STATIC_EFLAG;
- if (eNotificationRequired())
- eNotify(new ENotificationImpl(this, Notification.SET, JavaRefPackage.METHOD__STATIC, oldStatic, newStatic));
- }
-
- /**
- * Return the java class that this method is defined in.
- */
- public JavaClass getContainingJavaClass() {
- return this.getJavaClass();
- }
-
- /**
- * Overrides to ensure reflection is done.
- */
- public boolean isAbstract() {
- reflectValues();
- return isAbstractGen();
- }
-
- public boolean isConstructor() {
- reflectValues();
- return isConstructorGen();
- }
-
- public boolean isFinal() {
- reflectValues();
- return isFinalGen();
- }
-
- public boolean isNative() {
- reflectValues();
- return isNativeGen();
- }
-
- public boolean isStatic() {
- reflectValues();
- return isStaticGen();
- }
-
- public boolean isSynchronized() {
- reflectValues();
- return isSynchronizedGen();
- }
-
- public EList getJavaExceptions() {
- reflectValues();
- return getJavaExceptionsGen();
- }
-
- public JavaVisibilityKind getJavaVisibility() {
- reflectValues();
- return getJavaVisibilityGen();
- }
-
- public EList getParameters() {
- reflectValues();
- return getParametersGen();
- }
-
- /**
- * @see org.eclipse.emf.ecore.ETypedElement#getEType()
- */
- public EClassifier getEType() {
- reflectValues();
- return super.getEType();
- }
-
- /**
- * Return a String with the the method name and its parameters. e.g. <code> setFirstName(java.lang.String) <//code> .
- *
- */
- public String getMethodElementSignature() {
- StringBuffer sb = new StringBuffer(75);
- sb.append(getName());
- sb.append("(");
- List params = getParameters();
- JavaParameter param;
- int parmSize = params.size();
- int commaTest = 0;
- for (int j = 0; j < parmSize; j++) {
- if (j > commaTest) {
- sb.append(",");
- }
- param = (JavaParameter) params.get(j);
- //FB if (param.isReturn()) {
- //FB commaTest ++;
- //FB continue;
- //FB }
- sb.append(((JavaHelpers) param.getEType()).getQualifiedName());
- }
- sb.append(")");
- return sb.toString();
- }
-
- /**
- * Return a Parameter with the passed name, or null.
- */
- public JavaParameter getParameter(String parameterName) {
- List parms = getParameters();
- JavaParameter parm;
- int parmSize = parms.size();
- for (int j = 0; j < parmSize; j++) {
- parm = (JavaParameter) parms.get(j);
- if (parm.getName().equals(parameterName))
- return parm;
- }
- return null;
- }
-
- private static final int NOT_REFLECTED = 0x0, REFLECTED_BASE = 0x1, REFLECTED_GENERATED = 0x2;
-
- protected int reflectionStatus = NOT_REFLECTED;
-
- protected void reflectValues() {
- // We only want the testing of the hasReflected and get readadapter to be sync(this) so that
- // it is short and no deadlock possibility (this is because the the method reflection adapter may go
- // back to the containing java class to get its reflection adapter, which would lock on itself. So
- // we need to keep the sections that are sync(this) to not be deadlockable by not doing significant work
- // during the sync.
- ReadAdaptor readAdaptor = null;
- synchronized (this) {
- if ((reflectionStatus & REFLECTED_BASE) == 0) {
- readAdaptor = getReadAdapter();
- }
- }
- if (readAdaptor != null) {
- boolean setReflected = readAdaptor.reflectValuesIfNecessary();
- synchronized (this) {
- // Don't want to set it false. That is job of reflection adapter. Otherwise we could have a race.
- if (setReflected)
- reflectionStatus |= REFLECTED_BASE;
- }
- }
- }
-
- /*
- * This is not meant to be used outside of the reflection adapters.
- */
- public synchronized ReadAdaptor getReadAdapter() {
- return (ReadAdaptor) EcoreUtil.getRegisteredAdapter(this, ReadAdaptor.TYPE_KEY);
- }
-
- /*
- * Used by reflection adapter to clear the reflection. This not intended to be used by others.
- */
- public synchronized void setReflected(boolean reflected) {
- if (!reflected)
- reflectionStatus = NOT_REFLECTED;
- }
-
- /**
- * Get the return type.
- */
- public JavaHelpers getReturnType() {
- return (JavaHelpers) getEType();
- }
-
- public String getSignature() {
- if (signature == null)
- signature = doGetSignature();
- return signature;
- }
-
- /**
- * Replicate the functionality of java.lang.reflect.Method.toString().
- *
- * Returns a string describing this Method. The string is formatted as the method access modifiers, if any, followed by the method return type,
- * followed by a space, followed by the class declaring the method, followed by a period, followed by the method name, followed by a
- * parenthesized, comma-separated list of the method's formal parameter types. If the method throws checked exceptions, the parameter list is
- * followed by a space, followed by the word throws followed by a comma-separated list of the thrown exception types.
- *
- * For example:
- *
- * public boolean java.lang.Object.equals(java.lang.Object)
- *
- * The access modifiers are placed in canonical order as specified by "The Java Language Specification". This is public,
- * <tt>protected<//tt> or <tt>private<//tt> first, and then other modifiers in the following order: <tt>abstract<//tt>, <tt>static<//tt>, <tt>final<//tt>, <tt>synchronized<//tt> <tt>native<//tt>.
-
- */
- protected String doGetSignature() {
- StringBuffer sb = new StringBuffer();
- switch (getJavaVisibility().getValue()) {
- case JavaVisibilityKind.PUBLIC:
- sb.append("Public ");
- break;
- case JavaVisibilityKind.PROTECTED:
- sb.append("Protected ");
- break;
- case JavaVisibilityKind.PRIVATE:
- sb.append("Private ");
- break;
- case JavaVisibilityKind.PACKAGE:
- sb.append("Package ");
- break;
- }
- if (isAbstract())
- sb.append("abstract ");
- if (isStatic())
- sb.append("static ");
- if (isFinal())
- sb.append("final ");
- if (isSynchronized())
- sb.append("synchronized ");
- if (isNative())
- sb.append("native ");
- if (isVoid())
- sb.append("void ");
- else
- sb.append(getReturnType().getQualifiedName() + " ");
- sb.append(getContainingJavaClass().getJavaName() + ".");
- sb.append(getName() + "(");
- List params = getParameters();
- JavaParameter param;
- int parmSize = params.size();
- for (int j = 0; j < parmSize; j++) {
- param = (JavaParameter) params.get(j);
- //FB if (param.isReturn())
- //FB continue; // listParameters() includes return type in array
- sb.append(((JavaHelpers) param.getEType()).getQualifiedName());
- if (j < (params.size() - 1)) {
- sb.append(",");
- }
- }
- sb.append(")");
- List exceptions = getJavaExceptions();
- JavaClass exception;
- if (exceptions.size() > 0) {
- sb.append(" throws ");
- for (int k = 0; k < exceptions.size(); k++) {
- exception = (JavaClass) exceptions.get(k);
- sb.append(exception.getJavaName());
- if (k < (exceptions.size() - 1)) {
- sb.append(",");
- }
- }
- }
- return sb.toString();
- }
-
- protected void reflectGenerated() {
- // We only want the testing of the hasReflected and get readadapter to be sync(this) so that
- // it is short and no deadlock possibility (this is because the the method reflection adapter may go
- // back to the containing java class to get its reflection adapter, which would lock on itself. So
- // we need to keep the sections that are sync(this) to not be deadlockable by not doing significant work
- // during the sync.
- ReadAdaptor readAdaptor = null;
- synchronized (this) {
- if ((reflectionStatus & REFLECTED_GENERATED) == 0) {
- readAdaptor = getReadAdapter();
- }
- }
- if (readAdaptor != null) {
- boolean setReflected = ((IJavaMethodAdapter) readAdaptor).reflectGeneratedIfNecessary();
- synchronized (this) {
- // Don't want to set it false. That is job of reflection adapter. Otherwise we could have a race.
- if (setReflected)
- reflectionStatus |= (REFLECTED_GENERATED | REFLECTED_BASE); // We can be certain base will be done by reflect generated if not already
- // done.
- }
- }
- }
-
- /**
- * Returns true if the method is system generated. This is usually determined by the "generated" tag in the comment.
- */
- public boolean isGenerated() {
- reflectGenerated();
- return isGenerated;
- }
-
- /**
- * <!-- begin-user-doc -->
- * <!-- end-user-doc -->
- */
- public boolean isGeneratedGen() {
- // Ensure that you remove @generated or mark it @generated NOT
- throw new UnsupportedOperationException();
- }
-
- /**
- * Is this a void return type method.
- */
- public boolean isVoid() {
- //FB return (getReturnParameter() == null || "void".equals(getReturnType().getName()));
- return (getReturnType() == null || "void".equals(getReturnType().getName()));
- }
-
- /**
- * <!-- begin-user-doc -->
- * <!-- end-user-doc -->
- * @generated
- */
- public NotificationChain eInverseAdd(InternalEObject otherEnd, int featureID, NotificationChain msgs) {
- switch (featureID) {
- case JavaRefPackage.METHOD__JAVA_CLASS:
- if (eInternalContainer() != null)
- msgs = eBasicRemoveFromContainer(msgs);
- return basicSetJavaClass((JavaClass)otherEnd, msgs);
- }
- return super.eInverseAdd(otherEnd, featureID, msgs);
- }
-
- /**
- * <!-- begin-user-doc -->
- * <!-- end-user-doc -->
- * @generated
- */
- public NotificationChain eInverseRemove(InternalEObject otherEnd, int featureID, NotificationChain msgs) {
- switch (featureID) {
- case JavaRefPackage.METHOD__PARAMETERS:
- return ((InternalEList)getParameters()).basicRemove(otherEnd, msgs);
- case JavaRefPackage.METHOD__JAVA_CLASS:
- return basicSetJavaClass(null, msgs);
- }
- return super.eInverseRemove(otherEnd, featureID, msgs);
- }
-
- /**
- * <!-- begin-user-doc -->
- * <!-- end-user-doc -->
- * @generated
- */
- public NotificationChain eBasicRemoveFromContainerFeature(NotificationChain msgs) {
- switch (eContainerFeatureID()) {
- case JavaRefPackage.METHOD__JAVA_CLASS:
- return eInternalContainer().eInverseRemove(this, JavaRefPackage.JAVA_CLASS__METHODS, JavaClass.class, msgs);
- }
- return super.eBasicRemoveFromContainerFeature(msgs);
- }
-
- /**
- * <!-- begin-user-doc -->
- * <!-- end-user-doc -->
- * @generated
- */
- public Object eGet(int featureID, boolean resolve, boolean coreType) {
- switch (featureID) {
- case JavaRefPackage.METHOD__ABSTRACT:
- return isAbstract() ? Boolean.TRUE : Boolean.FALSE;
- case JavaRefPackage.METHOD__NATIVE:
- return isNative() ? Boolean.TRUE : Boolean.FALSE;
- case JavaRefPackage.METHOD__SYNCHRONIZED:
- return isSynchronized() ? Boolean.TRUE : Boolean.FALSE;
- case JavaRefPackage.METHOD__FINAL:
- return isFinal() ? Boolean.TRUE : Boolean.FALSE;
- case JavaRefPackage.METHOD__CONSTRUCTOR:
- return isConstructor() ? Boolean.TRUE : Boolean.FALSE;
- case JavaRefPackage.METHOD__STATIC:
- return isStatic() ? Boolean.TRUE : Boolean.FALSE;
- case JavaRefPackage.METHOD__JAVA_VISIBILITY:
- return getJavaVisibility();
- case JavaRefPackage.METHOD__PARAMETERS:
- return getParameters();
- case JavaRefPackage.METHOD__JAVA_EXCEPTIONS:
- return getJavaExceptions();
- case JavaRefPackage.METHOD__JAVA_CLASS:
- return getJavaClass();
- case JavaRefPackage.METHOD__SOURCE:
- if (resolve) return getSource();
- return basicGetSource();
- }
- return super.eGet(featureID, resolve, coreType);
- }
-
- /**
- * <!-- begin-user-doc -->
- * <!-- end-user-doc -->
- * @generated
- */
- public void eSet(int featureID, Object newValue) {
- switch (featureID) {
- case JavaRefPackage.METHOD__ABSTRACT:
- setAbstract(((Boolean)newValue).booleanValue());
- return;
- case JavaRefPackage.METHOD__NATIVE:
- setNative(((Boolean)newValue).booleanValue());
- return;
- case JavaRefPackage.METHOD__SYNCHRONIZED:
- setSynchronized(((Boolean)newValue).booleanValue());
- return;
- case JavaRefPackage.METHOD__FINAL:
- setFinal(((Boolean)newValue).booleanValue());
- return;
- case JavaRefPackage.METHOD__CONSTRUCTOR:
- setConstructor(((Boolean)newValue).booleanValue());
- return;
- case JavaRefPackage.METHOD__STATIC:
- setStatic(((Boolean)newValue).booleanValue());
- return;
- case JavaRefPackage.METHOD__JAVA_VISIBILITY:
- setJavaVisibility((JavaVisibilityKind)newValue);
- return;
- case JavaRefPackage.METHOD__PARAMETERS:
- getParameters().clear();
- getParameters().addAll((Collection)newValue);
- return;
- case JavaRefPackage.METHOD__JAVA_EXCEPTIONS:
- getJavaExceptions().clear();
- getJavaExceptions().addAll((Collection)newValue);
- return;
- case JavaRefPackage.METHOD__JAVA_CLASS:
- setJavaClass((JavaClass)newValue);
- return;
- case JavaRefPackage.METHOD__SOURCE:
- setSource((Block)newValue);
- return;
- }
- super.eSet(featureID, newValue);
- }
-
- /**
- * <!-- begin-user-doc -->
- * <!-- end-user-doc -->
- * @generated
- */
- public void eUnset(int featureID) {
- switch (featureID) {
- case JavaRefPackage.METHOD__ABSTRACT:
- setAbstract(ABSTRACT_EDEFAULT);
- return;
- case JavaRefPackage.METHOD__NATIVE:
- setNative(NATIVE_EDEFAULT);
- return;
- case JavaRefPackage.METHOD__SYNCHRONIZED:
- setSynchronized(SYNCHRONIZED_EDEFAULT);
- return;
- case JavaRefPackage.METHOD__FINAL:
- setFinal(FINAL_EDEFAULT);
- return;
- case JavaRefPackage.METHOD__CONSTRUCTOR:
- setConstructor(CONSTRUCTOR_EDEFAULT);
- return;
- case JavaRefPackage.METHOD__STATIC:
- setStatic(STATIC_EDEFAULT);
- return;
- case JavaRefPackage.METHOD__JAVA_VISIBILITY:
- setJavaVisibility(JAVA_VISIBILITY_EDEFAULT);
- return;
- case JavaRefPackage.METHOD__PARAMETERS:
- getParameters().clear();
- return;
- case JavaRefPackage.METHOD__JAVA_EXCEPTIONS:
- getJavaExceptions().clear();
- return;
- case JavaRefPackage.METHOD__JAVA_CLASS:
- setJavaClass((JavaClass)null);
- return;
- case JavaRefPackage.METHOD__SOURCE:
- setSource((Block)null);
- return;
- }
- super.eUnset(featureID);
- }
-
- /**
- * <!-- begin-user-doc -->
- * <!-- end-user-doc -->
- * @generated
- */
- public boolean eIsSet(int featureID) {
- switch (featureID) {
- case JavaRefPackage.METHOD__ABSTRACT:
- return ((eFlags & ABSTRACT_EFLAG) != 0) != ABSTRACT_EDEFAULT;
- case JavaRefPackage.METHOD__NATIVE:
- return ((eFlags & NATIVE_EFLAG) != 0) != NATIVE_EDEFAULT;
- case JavaRefPackage.METHOD__SYNCHRONIZED:
- return ((eFlags & SYNCHRONIZED_EFLAG) != 0) != SYNCHRONIZED_EDEFAULT;
- case JavaRefPackage.METHOD__FINAL:
- return ((eFlags & FINAL_EFLAG) != 0) != FINAL_EDEFAULT;
- case JavaRefPackage.METHOD__CONSTRUCTOR:
- return ((eFlags & CONSTRUCTOR_EFLAG) != 0) != CONSTRUCTOR_EDEFAULT;
- case JavaRefPackage.METHOD__STATIC:
- return ((eFlags & STATIC_EFLAG) != 0) != STATIC_EDEFAULT;
- case JavaRefPackage.METHOD__JAVA_VISIBILITY:
- return javaVisibility != JAVA_VISIBILITY_EDEFAULT;
- case JavaRefPackage.METHOD__PARAMETERS:
- return parameters != null && !parameters.isEmpty();
- case JavaRefPackage.METHOD__JAVA_EXCEPTIONS:
- return javaExceptions != null && !javaExceptions.isEmpty();
- case JavaRefPackage.METHOD__JAVA_CLASS:
- return getJavaClass() != null;
- case JavaRefPackage.METHOD__SOURCE:
- return source != null;
- }
- return super.eIsSet(featureID);
- }
-
- public JavaParameter[] listParametersWithoutReturn() {
- Collection v = getParameters();
- JavaParameter[] result = new JavaParameter[v.size()];
- v.toArray(result);
- return result;
- }
-
- public EList eContents() {
- EList results = new BasicEList();
- results.addAll(getParametersGen()); //FB
- return results;
- }
-
- /**
- * Set the isGenerated flag.
- */
- public void setIsGenerated(boolean generated) {
- isGenerated = generated;
- }
-
- /**
- * Set the return type
- */
- public void setReturnType(JavaHelpers type) {
- this.setEType(type);
- }
-
- /**
- * @generated This field/method will be replaced during code generation
- */
- public JavaVisibilityKind getJavaVisibilityGen() {
- return javaVisibility;
- }
-
- /**
- * <!-- begin-user-doc -->
- * <!-- end-user-doc -->
- * @generated
- */
- public void setJavaVisibility(JavaVisibilityKind newJavaVisibility) {
- JavaVisibilityKind oldJavaVisibility = javaVisibility;
- javaVisibility = newJavaVisibility == null ? JAVA_VISIBILITY_EDEFAULT : newJavaVisibility;
- if (eNotificationRequired())
- eNotify(new ENotificationImpl(this, Notification.SET, JavaRefPackage.METHOD__JAVA_VISIBILITY, oldJavaVisibility, javaVisibility));
- }
-
- /**
- * @generated This field/method will be replaced during code generation
- */
- public JavaClass getJavaClass() {
- if (eContainerFeatureID() != JavaRefPackage.METHOD__JAVA_CLASS) return null;
- return (JavaClass)eContainer();
- }
-
- /**
- * <!-- begin-user-doc -->
- * <!-- end-user-doc -->
- * @generated
- */
- public NotificationChain basicSetJavaClass(JavaClass newJavaClass, NotificationChain msgs) {
- msgs = eBasicSetContainer((InternalEObject)newJavaClass, JavaRefPackage.METHOD__JAVA_CLASS, msgs);
- return msgs;
- }
-
- /**
- * <!-- begin-user-doc -->
- * <!-- end-user-doc -->
- * @generated
- */
- public void setJavaClass(JavaClass newJavaClass) {
- if (newJavaClass != eInternalContainer() || (eContainerFeatureID() != JavaRefPackage.METHOD__JAVA_CLASS && newJavaClass != null)) {
- if (EcoreUtil.isAncestor(this, newJavaClass))
- throw new IllegalArgumentException("Recursive containment not allowed for " + toString());
- NotificationChain msgs = null;
- if (eInternalContainer() != null)
- msgs = eBasicRemoveFromContainer(msgs);
- if (newJavaClass != null)
- msgs = ((InternalEObject)newJavaClass).eInverseAdd(this, JavaRefPackage.JAVA_CLASS__METHODS, JavaClass.class, msgs);
- msgs = basicSetJavaClass(newJavaClass, msgs);
- if (msgs != null) msgs.dispatch();
- }
- else if (eNotificationRequired())
- eNotify(new ENotificationImpl(this, Notification.SET, JavaRefPackage.METHOD__JAVA_CLASS, newJavaClass, newJavaClass));
- }
-
- /**
- * @generated This field/method will be replaced during code generation
- */
- public Block getSource() {
- if (source != null && source.eIsProxy()) {
- InternalEObject oldSource = (InternalEObject)source;
- source = (Block)eResolveProxy(oldSource);
- if (source != oldSource) {
- if (eNotificationRequired())
- eNotify(new ENotificationImpl(this, Notification.RESOLVE, JavaRefPackage.METHOD__SOURCE, oldSource, source));
- }
- }
- return source;
- }
-
- /**
- * <!-- begin-user-doc -->
- * <!-- end-user-doc -->
- * @generated
- */
- public Block basicGetSource() {
- return source;
- }
-
- /**
- * <!-- begin-user-doc -->
- * <!-- end-user-doc -->
- * @generated
- */
- public void setSource(Block newSource) {
- Block oldSource = source;
- source = newSource;
- if (eNotificationRequired())
- eNotify(new ENotificationImpl(this, Notification.SET, JavaRefPackage.METHOD__SOURCE, oldSource, source));
- }
-
- /**
- * @generated This field/method will be replaced during code generation.
- */
- public String toString() {
- if (eIsProxy()) return super.toString();
-
- StringBuffer result = new StringBuffer(super.toString());
- result.append(" (abstract: ");
- result.append((eFlags & ABSTRACT_EFLAG) != 0);
- result.append(", native: ");
- result.append((eFlags & NATIVE_EFLAG) != 0);
- result.append(", synchronized: ");
- result.append((eFlags & SYNCHRONIZED_EFLAG) != 0);
- result.append(", final: ");
- result.append((eFlags & FINAL_EFLAG) != 0);
- result.append(", constructor: ");
- result.append((eFlags & CONSTRUCTOR_EFLAG) != 0);
- result.append(", static: ");
- result.append((eFlags & STATIC_EFLAG) != 0);
- result.append(", javaVisibility: ");
- result.append(javaVisibility);
- result.append(')');
- return result.toString();
- }
-
- /**
- * @generated This field/method will be replaced during code generation
- */
- public EList getParametersGen() {
- if (parameters == null) {
- parameters = new EObjectContainmentEList(JavaParameter.class, this, JavaRefPackage.METHOD__PARAMETERS);
- }
- return parameters;
- }
-
- /**
- * @generated This field/method will be replaced during code generation
- */
- public EList getJavaExceptionsGen() {
- if (javaExceptions == null) {
- javaExceptions = new EObjectResolvingEList(JavaClass.class, this, JavaRefPackage.METHOD__JAVA_EXCEPTIONS);
- }
- return javaExceptions;
- }
-
- @Override
- public EList<EObject> eCrossReferences()
- {
- return ECrossReferenceEList.createECrossReferenceEList(this);
- }
-
-}
-
diff --git a/plugins/org.eclipse.jem/mofjava/org/eclipse/jem/java/internal/impl/StatementImpl.java b/plugins/org.eclipse.jem/mofjava/org/eclipse/jem/java/internal/impl/StatementImpl.java
deleted file mode 100644
index e3bfe7c..0000000
--- a/plugins/org.eclipse.jem/mofjava/org/eclipse/jem/java/internal/impl/StatementImpl.java
+++ /dev/null
@@ -1,42 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2001, 2005 IBM Corporation and others.
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
- *
- * Contributors:
- * IBM Corporation - initial API and implementation
- *******************************************************************************/
-package org.eclipse.jem.java.internal.impl;
-/*
-
-
- */
-import org.eclipse.emf.ecore.EClass;
-
-import org.eclipse.jem.java.JavaRefPackage;
-import org.eclipse.jem.java.Statement;
-/**
- * @generated
- */
-public class StatementImpl extends BlockImpl implements Statement {
-
- protected StatementImpl() {
- super();
- }
- /**
- * <!-- begin-user-doc -->
- * <!-- end-user-doc -->
- * @generated
- */
- protected EClass eStaticClass() {
- return JavaRefPackage.Literals.STATEMENT;
- }
-
-}
-
-
-
-
-
diff --git a/plugins/org.eclipse.jem/mofjava/org/eclipse/jem/java/internal/impl/URL.java b/plugins/org.eclipse.jem/mofjava/org/eclipse/jem/java/internal/impl/URL.java
deleted file mode 100644
index 44fd317..0000000
--- a/plugins/org.eclipse.jem/mofjava/org/eclipse/jem/java/internal/impl/URL.java
+++ /dev/null
@@ -1,76 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2001, 2005 IBM Corporation and others.
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
- *
- * Contributors:
- * IBM Corporation - initial API and implementation
- *******************************************************************************/
-package org.eclipse.jem.java.internal.impl;
-/*
-
-
- */
-import java.util.ArrayList;
-import java.util.List;
-
-public class URL {
- public String namespaceName;
- public String ID;
- List attributeNames;
-/**
- * URL constructor comment.
- */
-public URL(String urlString) {
- initializeFromString(urlString);
-}
-/**
- * URL constructor comment.
- */
-public URL(String nameSpaceName, String anID) {
- this.namespaceName = nameSpaceName;
- this.ID = anID;
-}
-public List getAttributeNames() {
- return attributeNames;
-}
-public void initializeFromString(String urlString) {
- int poundInx = urlString.lastIndexOf('#');
- if (poundInx > -1) {
- namespaceName = urlString.substring(0, poundInx);
- urlString = urlString.substring(poundInx + 1);
- int dotIndex = urlString.indexOf("->"); //$NON-NLS-1$
- if (dotIndex > -1) {
- ID = urlString.substring(0, dotIndex);
- String attributeNameString = urlString.substring(dotIndex + 2);
- attributeNames = new ArrayList();
- do {
- dotIndex = attributeNameString.indexOf("->"); //$NON-NLS-1$
- if (dotIndex > -1) {
- attributeNames.add(attributeNameString.substring(0, dotIndex));
- attributeNameString = attributeNameString.substring(dotIndex + 2);
- } else
- attributeNames.add(attributeNameString);
- } while (dotIndex > -1);
- } else {
- ID = urlString;
- }
- } else {
- // assume that any URL string that ends with .xmi is a namespace.
- if (urlString.endsWith(".xmi")){ //$NON-NLS-1$
- namespaceName = urlString;
- ID = null;
- } else {
- namespaceName = "?defaultURL?"; //$NON-NLS-1$
- ID = urlString;
- }
- }
-}
-public String toString() {
- return "URL(" + ((namespaceName == null) ? "" : namespaceName + "#") + ((ID == null) ? "" : ID) + ")"; //$NON-NLS-1$ //$NON-NLS-2$ //$NON-NLS-3$ //$NON-NLS-4$ //$NON-NLS-5$
-}
-}
-
-
diff --git a/plugins/org.eclipse.jem/mofjava/org/eclipse/jem/java/util/JavaContext.java b/plugins/org.eclipse.jem/mofjava/org/eclipse/jem/java/util/JavaContext.java
deleted file mode 100644
index 4c386f3..0000000
--- a/plugins/org.eclipse.jem/mofjava/org/eclipse/jem/java/util/JavaContext.java
+++ /dev/null
@@ -1,90 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2006 IBM Corporation and others.
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
- *
- * Contributors:
- * IBM Corporation - initial API and implementation
- *******************************************************************************/
-/*
-
-
- */
-package org.eclipse.jem.java.util;
-
-import org.eclipse.emf.common.notify.AdapterFactory;
-import org.eclipse.emf.ecore.resource.ResourceSet;
-import org.eclipse.emf.ecore.resource.impl.ResourceSetImpl;
-
-import org.eclipse.jem.internal.java.adapters.jdk.JavaJDKAdapterFactory;
-
-/**
- * Static helper class to handle the java context. The java context is a resource set
- * that has the appropriate reflection adapter attached, either for java reflection or
- * for JDT reflection. The default is for java reflection. When running in Eclipse it
- * will be the JDT reflection.
- * <p>
- * <b>Note:</b>This should only be used by customers that are not doing normal Eclipse JDT JEM
- * reflection. Normal JEM should be using the JEM EMF nature access instead.
- * @since 1.2.0
- */
-public class JavaContext {
-
- private static Class ReflectionFactoryClass = JavaJDKAdapterFactory.class;
-
- private JavaContext() {
-
- }
-
- /**
- * Create the java context. To be used outside of Eclipse.
- * Within normal Eclipse JEM usage the JEM EMF nature should be used instead.
- * @return
- *
- * @since 1.2.0
- */
- public static ResourceSet createJavaContext() {
- org.eclipse.jem.internal.java.init.JavaInit.init();
- ResourceSet set = new ResourceSetImpl();
- set.getAdapterFactories().add(createJavaReflectionAdapterFactory());
- return set;
- }
-
- private static AdapterFactory createJavaReflectionAdapterFactory() {
- AdapterFactory factoryInstance = null;
- try {
- if (getReflectionAdapterFactoryClass() != null)
- factoryInstance = (AdapterFactory) getReflectionAdapterFactoryClass().newInstance();
- } catch (Exception e) {
- // Reflection or instantiation problems.
- // OK, can't do Java Model reflection
- }
- return factoryInstance;
- }
-
- /**
- * Return the Class for the Java refection adapter factory.
- * @return
- *
- * @since 1.2.0
- */
- public static Class getReflectionAdapterFactoryClass() {
- return ReflectionFactoryClass;
- }
-
- /**
- * Set the Class for the Java refection adapter factory. Within Eclipse this should not
- * be set by customers.
- *
- * @param javaReflectionFactoryClass
- *
- * @since 1.2.0
- */
- public static void setReflectionAdapterFactoryClass(Class javaReflectionFactoryClass) {
- ReflectionFactoryClass = javaReflectionFactoryClass;
- }
-
-
-}
diff --git a/plugins/org.eclipse.jem/mofjava/org/eclipse/jem/java/util/JavaRefAdapterFactory.java b/plugins/org.eclipse.jem/mofjava/org/eclipse/jem/java/util/JavaRefAdapterFactory.java
deleted file mode 100644
index 81c6e76..0000000
--- a/plugins/org.eclipse.jem/mofjava/org/eclipse/jem/java/util/JavaRefAdapterFactory.java
+++ /dev/null
@@ -1,478 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2003, 2005 IBM Corporation and others.
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
- *
- * Contributors:
- * IBM Corporation - initial API and implementation
- *******************************************************************************/
-package org.eclipse.jem.java.util;
-/*
-
-
- */
-import org.eclipse.emf.common.notify.Adapter;
-import org.eclipse.emf.common.notify.Notifier;
-
-import org.eclipse.emf.common.notify.impl.AdapterFactoryImpl;
-
-import org.eclipse.emf.ecore.EClass;
-import org.eclipse.emf.ecore.EClassifier;
-import org.eclipse.emf.ecore.EModelElement;
-import org.eclipse.emf.ecore.ENamedElement;
-import org.eclipse.emf.ecore.EObject;
-import org.eclipse.emf.ecore.EOperation;
-import org.eclipse.emf.ecore.EPackage;
-import org.eclipse.emf.ecore.EParameter;
-import org.eclipse.emf.ecore.EStructuralFeature;
-import org.eclipse.emf.ecore.ETypedElement;
-
-import org.eclipse.jem.java.*;
-
-
-/**
- * <!-- begin-user-doc -->
- * The <b>Adapter Factory</b> for the model.
- * It provides an adapter <code>createXXX</code> method for each class of the model.
- * <!-- end-user-doc -->
- * @see org.eclipse.jem.java.JavaRefPackage
- * @generated
- */
-public class JavaRefAdapterFactory extends AdapterFactoryImpl
-{
- /**
- * The cached model package.
- * <!-- begin-user-doc -->
- * <!-- end-user-doc -->
- * @generated
- */
- protected static JavaRefPackage modelPackage;
-
- /**
- * Creates an instance of the adapter factory.
- * <!-- begin-user-doc -->
- * <!-- end-user-doc -->
- * @generated
- */
- public JavaRefAdapterFactory() {
- if (modelPackage == null) {
- modelPackage = JavaRefPackage.eINSTANCE;
- }
- }
-
- /**
- * Returns whether this factory is applicable for the type of the object.
- * <!-- begin-user-doc -->
- * This implementation returns <code>true</code> if the object is either the model's package or is an instance object of the model.
- * <!-- end-user-doc -->
- * @return whether this factory is applicable for the type of the object.
- * @generated
- */
- public boolean isFactoryForType(Object object) {
- if (object == modelPackage) {
- return true;
- }
- if (object instanceof EObject) {
- return ((EObject)object).eClass().getEPackage() == modelPackage;
- }
- return false;
- }
-
- /**
- * The switch the delegates to the <code>createXXX</code> methods.
- * <!-- begin-user-doc -->
- * <!-- end-user-doc -->
- * @generated
- */
- protected JavaRefSwitch modelSwitch =
- new JavaRefSwitch() {
- public Object caseJavaClass(JavaClass object) {
- return createJavaClassAdapter();
- }
- public Object caseInitializer(Initializer object) {
- return createInitializerAdapter();
- }
- public Object caseJavaParameter(JavaParameter object) {
- return createJavaParameterAdapter();
- }
- public Object caseMethod(Method object) {
- return createMethodAdapter();
- }
- public Object caseField(Field object) {
- return createFieldAdapter();
- }
- public Object caseBlock(Block object) {
- return createBlockAdapter();
- }
- public Object caseComment(Comment object) {
- return createCommentAdapter();
- }
- public Object caseStatement(Statement object) {
- return createStatementAdapter();
- }
- public Object caseJavaPackage(JavaPackage object) {
- return createJavaPackageAdapter();
- }
- public Object caseJavaDataType(JavaDataType object) {
- return createJavaDataTypeAdapter();
- }
- public Object caseArrayType(ArrayType object) {
- return createArrayTypeAdapter();
- }
- public Object caseJavaEvent(JavaEvent object) {
- return createJavaEventAdapter();
- }
- public Object caseEModelElement(EModelElement object) {
- return createEModelElementAdapter();
- }
- public Object caseENamedElement(ENamedElement object) {
- return createENamedElementAdapter();
- }
- public Object caseEClassifier(EClassifier object) {
- return createEClassifierAdapter();
- }
- public Object caseEClass(EClass object) {
- return createEClassAdapter();
- }
- public Object caseETypedElement(ETypedElement object) {
- return createETypedElementAdapter();
- }
- public Object caseEParameter(EParameter object) {
- return createEParameterAdapter();
- }
- public Object caseEOperation(EOperation object) {
- return createEOperationAdapter();
- }
- public Object caseEPackage(EPackage object) {
- return createEPackageAdapter();
- }
- public Object caseEStructuralFeature(EStructuralFeature object) {
- return createEStructuralFeatureAdapter();
- }
- public Object defaultCase(EObject object) {
- return createEObjectAdapter();
- }
- };
-
- /**
- * Creates an adapter for the <code>target</code>.
- * <!-- begin-user-doc -->
- * <!-- end-user-doc -->
- * @param target the object to adapt.
- * @return the adapter for the <code>target</code>.
- * @generated
- */
- public Adapter createAdapter(Notifier target) {
- return (Adapter)modelSwitch.doSwitch((EObject)target);
- }
-
-
- /**
- * Creates a new adapter for an object of class '{@link org.eclipse.jem.java.JavaClass <em>Java Class</em>}'.
- * <!-- begin-user-doc -->
- * This default implementation returns null so that we can easily ignore cases;
- * it's useful to ignore a case when inheritance will catch all the cases anyway.
- * <!-- end-user-doc -->
- * @return the new adapter.
- * @see org.eclipse.jem.java.JavaClass
- * @generated
- */
- public Adapter createJavaClassAdapter() {
- return null;
- }
-
- /**
- * Creates a new adapter for an object of class '{@link org.eclipse.jem.java.Initializer <em>Initializer</em>}'.
- * <!-- begin-user-doc -->
- * This default implementation returns null so that we can easily ignore cases;
- * it's useful to ignore a case when inheritance will catch all the cases anyway.
- * <!-- end-user-doc -->
- * @return the new adapter.
- * @see org.eclipse.jem.java.Initializer
- * @generated
- */
- public Adapter createInitializerAdapter() {
- return null;
- }
-
- /**
- * Creates a new adapter for an object of class '{@link org.eclipse.jem.java.JavaParameter <em>Java Parameter</em>}'.
- * <!-- begin-user-doc -->
- * This default implementation returns null so that we can easily ignore cases;
- * it's useful to ignore a case when inheritance will catch all the cases anyway.
- * <!-- end-user-doc -->
- * @return the new adapter.
- * @see org.eclipse.jem.java.JavaParameter
- * @generated
- */
- public Adapter createJavaParameterAdapter() {
- return null;
- }
-
- /**
- * Creates a new adapter for an object of class '{@link org.eclipse.jem.java.Method <em>Method</em>}'.
- * <!-- begin-user-doc -->
- * This default implementation returns null so that we can easily ignore cases;
- * it's useful to ignore a case when inheritance will catch all the cases anyway.
- * <!-- end-user-doc -->
- * @return the new adapter.
- * @see org.eclipse.jem.java.Method
- * @generated
- */
- public Adapter createMethodAdapter() {
- return null;
- }
-
- /**
- * Creates a new adapter for an object of class '{@link org.eclipse.jem.java.Field <em>Field</em>}'.
- * <!-- begin-user-doc -->
- * This default implementation returns null so that we can easily ignore cases;
- * it's useful to ignore a case when inheritance will catch all the cases anyway.
- * <!-- end-user-doc -->
- * @return the new adapter.
- * @see org.eclipse.jem.java.Field
- * @generated
- */
- public Adapter createFieldAdapter() {
- return null;
- }
-
- /**
- * Creates a new adapter for an object of class '{@link org.eclipse.jem.java.Block <em>Block</em>}'.
- * <!-- begin-user-doc -->
- * This default implementation returns null so that we can easily ignore cases;
- * it's useful to ignore a case when inheritance will catch all the cases anyway.
- * <!-- end-user-doc -->
- * @return the new adapter.
- * @see org.eclipse.jem.java.Block
- * @generated
- */
- public Adapter createBlockAdapter() {
- return null;
- }
-
- /**
- * Creates a new adapter for an object of class '{@link org.eclipse.jem.java.Comment <em>Comment</em>}'.
- * <!-- begin-user-doc -->
- * This default implementation returns null so that we can easily ignore cases;
- * it's useful to ignore a case when inheritance will catch all the cases anyway.
- * <!-- end-user-doc -->
- * @return the new adapter.
- * @see org.eclipse.jem.java.Comment
- * @generated
- */
- public Adapter createCommentAdapter() {
- return null;
- }
-
- /**
- * Creates a new adapter for an object of class '{@link org.eclipse.jem.java.Statement <em>Statement</em>}'.
- * <!-- begin-user-doc -->
- * This default implementation returns null so that we can easily ignore cases;
- * it's useful to ignore a case when inheritance will catch all the cases anyway.
- * <!-- end-user-doc -->
- * @return the new adapter.
- * @see org.eclipse.jem.java.Statement
- * @generated
- */
- public Adapter createStatementAdapter() {
- return null;
- }
-
- /**
- * Creates a new adapter for an object of class '{@link org.eclipse.jem.java.JavaPackage <em>Java Package</em>}'.
- * <!-- begin-user-doc -->
- * This default implementation returns null so that we can easily ignore cases;
- * it's useful to ignore a case when inheritance will catch all the cases anyway.
- * <!-- end-user-doc -->
- * @return the new adapter.
- * @see org.eclipse.jem.java.JavaPackage
- * @generated
- */
- public Adapter createJavaPackageAdapter() {
- return null;
- }
-
- /**
- * Creates a new adapter for an object of class '{@link org.eclipse.jem.java.JavaDataType <em>Java Data Type</em>}'.
- * <!-- begin-user-doc -->
- * This default implementation returns null so that we can easily ignore cases;
- * it's useful to ignore a case when inheritance will catch all the cases anyway.
- * <!-- end-user-doc -->
- * @return the new adapter.
- * @see org.eclipse.jem.java.JavaDataType
- * @generated
- */
- public Adapter createJavaDataTypeAdapter() {
- return null;
- }
-
- /**
- * Creates a new adapter for an object of class '{@link org.eclipse.jem.java.ArrayType <em>Array Type</em>}'.
- * <!-- begin-user-doc -->
- * This default implementation returns null so that we can easily ignore cases;
- * it's useful to ignore a case when inheritance will catch all the cases anyway.
- * <!-- end-user-doc -->
- * @return the new adapter.
- * @see org.eclipse.jem.java.ArrayType
- * @generated
- */
- public Adapter createArrayTypeAdapter() {
- return null;
- }
-
- /**
- * Creates a new adapter for an object of class '{@link org.eclipse.jem.java.JavaEvent <em>Java Event</em>}'.
- * <!-- begin-user-doc -->
- * This default implementation returns null so that we can easily ignore cases;
- * it's useful to ignore a case when inheritance will catch all the cases anyway.
- * <!-- end-user-doc -->
- * @return the new adapter.
- * @see org.eclipse.jem.java.JavaEvent
- * @generated
- */
- public Adapter createJavaEventAdapter() {
- return null;
- }
-
- /**
- * Creates a new adapter for an object of class '{@link org.eclipse.emf.ecore.EModelElement <em>EModel Element</em>}'.
- * <!-- begin-user-doc -->
- * This default implementation returns null so that we can easily ignore cases;
- * it's useful to ignore a case when inheritance will catch all the cases anyway.
- * <!-- end-user-doc -->
- * @return the new adapter.
- * @see org.eclipse.emf.ecore.EModelElement
- * @generated
- */
- public Adapter createEModelElementAdapter() {
- return null;
- }
-
- /**
- * Creates a new adapter for an object of class '{@link org.eclipse.emf.ecore.ENamedElement <em>ENamed Element</em>}'.
- * <!-- begin-user-doc -->
- * This default implementation returns null so that we can easily ignore cases;
- * it's useful to ignore a case when inheritance will catch all the cases anyway.
- * <!-- end-user-doc -->
- * @return the new adapter.
- * @see org.eclipse.emf.ecore.ENamedElement
- * @generated
- */
- public Adapter createENamedElementAdapter() {
- return null;
- }
-
- /**
- * Creates a new adapter for an object of class '{@link org.eclipse.emf.ecore.EClassifier <em>EClassifier</em>}'.
- * <!-- begin-user-doc -->
- * This default implementation returns null so that we can easily ignore cases;
- * it's useful to ignore a case when inheritance will catch all the cases anyway.
- * <!-- end-user-doc -->
- * @return the new adapter.
- * @see org.eclipse.emf.ecore.EClassifier
- * @generated
- */
- public Adapter createEClassifierAdapter() {
- return null;
- }
-
- /**
- * Creates a new adapter for an object of class '{@link org.eclipse.emf.ecore.EClass <em>EClass</em>}'.
- * <!-- begin-user-doc -->
- * This default implementation returns null so that we can easily ignore cases;
- * it's useful to ignore a case when inheritance will catch all the cases anyway.
- * <!-- end-user-doc -->
- * @return the new adapter.
- * @see org.eclipse.emf.ecore.EClass
- * @generated
- */
- public Adapter createEClassAdapter() {
- return null;
- }
-
- /**
- * Creates a new adapter for an object of class '{@link org.eclipse.emf.ecore.ETypedElement <em>ETyped Element</em>}'.
- * <!-- begin-user-doc -->
- * This default implementation returns null so that we can easily ignore cases;
- * it's useful to ignore a case when inheritance will catch all the cases anyway.
- * <!-- end-user-doc -->
- * @return the new adapter.
- * @see org.eclipse.emf.ecore.ETypedElement
- * @generated
- */
- public Adapter createETypedElementAdapter() {
- return null;
- }
-
- /**
- * Creates a new adapter for an object of class '{@link org.eclipse.emf.ecore.EParameter <em>EParameter</em>}'.
- * <!-- begin-user-doc -->
- * This default implementation returns null so that we can easily ignore cases;
- * it's useful to ignore a case when inheritance will catch all the cases anyway.
- * <!-- end-user-doc -->
- * @return the new adapter.
- * @see org.eclipse.emf.ecore.EParameter
- * @generated
- */
- public Adapter createEParameterAdapter() {
- return null;
- }
-
- /**
- * Creates a new adapter for an object of class '{@link org.eclipse.emf.ecore.EOperation <em>EOperation</em>}'.
- * <!-- begin-user-doc -->
- * This default implementation returns null so that we can easily ignore cases;
- * it's useful to ignore a case when inheritance will catch all the cases anyway.
- * <!-- end-user-doc -->
- * @return the new adapter.
- * @see org.eclipse.emf.ecore.EOperation
- * @generated
- */
- public Adapter createEOperationAdapter() {
- return null;
- }
-
- /**
- * Creates a new adapter for an object of class '{@link org.eclipse.emf.ecore.EStructuralFeature <em>EStructural Feature</em>}'.
- * <!-- begin-user-doc -->
- * This default implementation returns null so that we can easily ignore cases;
- * it's useful to ignore a case when inheritance will catch all the cases anyway.
- * <!-- end-user-doc -->
- * @return the new adapter.
- * @see org.eclipse.emf.ecore.EStructuralFeature
- * @generated
- */
- public Adapter createEStructuralFeatureAdapter() {
- return null;
- }
-
- /**
- * Creates a new adapter for an object of class '{@link org.eclipse.emf.ecore.EPackage <em>EPackage</em>}'.
- * <!-- begin-user-doc -->
- * This default implementation returns null so that we can easily ignore cases;
- * it's useful to ignore a case when inheritance will catch all the cases anyway.
- * <!-- end-user-doc -->
- * @return the new adapter.
- * @see org.eclipse.emf.ecore.EPackage
- * @generated
- */
- public Adapter createEPackageAdapter() {
- return null;
- }
-
- /**
- * Creates a new adapter for the default case.
- * <!-- begin-user-doc -->
- * This default implementation returns null.
- * <!-- end-user-doc -->
- * @return the new adapter.
- * @generated
- */
- public Adapter createEObjectAdapter() {
- return null;
- }
-
-} //JavaRefAdapterFactory
diff --git a/plugins/org.eclipse.jem/mofjava/org/eclipse/jem/java/util/JavaRefSwitch.java b/plugins/org.eclipse.jem/mofjava/org/eclipse/jem/java/util/JavaRefSwitch.java
deleted file mode 100644
index d2f4280..0000000
--- a/plugins/org.eclipse.jem/mofjava/org/eclipse/jem/java/util/JavaRefSwitch.java
+++ /dev/null
@@ -1,547 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2003, 2005 IBM Corporation and others.
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
- *
- * Contributors:
- * IBM Corporation - initial API and implementation
- *******************************************************************************/
-package org.eclipse.jem.java.util;
-
-/*
-
-
- */
-import java.util.List;
-
-import org.eclipse.emf.ecore.EClass;
-import org.eclipse.emf.ecore.EClassifier;
-import org.eclipse.emf.ecore.EModelElement;
-import org.eclipse.emf.ecore.ENamedElement;
-import org.eclipse.emf.ecore.EObject;
-import org.eclipse.emf.ecore.EOperation;
-import org.eclipse.emf.ecore.EPackage;
-import org.eclipse.emf.ecore.EParameter;
-import org.eclipse.emf.ecore.EStructuralFeature;
-import org.eclipse.emf.ecore.ETypedElement;
-
-import org.eclipse.jem.java.*;
-
-
-
-/**
- * <!-- begin-user-doc -->
- * The <b>Switch</b> for the model's inheritance hierarchy.
- * It supports the call {@link #doSwitch doSwitch(object)}
- * to invoke the <code>caseXXX</code> method for each class of the model,
- * starting with the actual class of the object
- * and proceeding up the inheritance hierarchy
- * until a non-null result is returned,
- * which is the result of the switch.
- * <!-- end-user-doc -->
- * @see org.eclipse.jem.java.JavaRefPackage
- * @generated
- */
-public class JavaRefSwitch {
- /**
- * The cached model package
- * <!-- begin-user-doc -->
- * <!-- end-user-doc -->
- * @generated
- */
- protected static JavaRefPackage modelPackage;
-
- /**
- * Creates an instance of the switch.
- * <!-- begin-user-doc -->
- * <!-- end-user-doc -->
- * @generated
- */
- public JavaRefSwitch() {
- if (modelPackage == null) {
- modelPackage = JavaRefPackage.eINSTANCE;
- }
- }
-
- /**
- * Calls <code>caseXXX</code> for each class of the model until one returns a non null result; it yields that result.
- * <!-- begin-user-doc -->
- * <!-- end-user-doc -->
- * @return the first non-null result returned by a <code>caseXXX</code> call.
- * @generated
- */
- public Object doSwitch(EObject theEObject) {
- return doSwitch(theEObject.eClass(), theEObject);
- }
-
- /**
- * Calls <code>caseXXX</code> for each class of the model until one returns a non null result; it yields that result.
- * <!-- begin-user-doc -->
- * <!-- end-user-doc -->
- * @return the first non-null result returned by a <code>caseXXX</code> call.
- * @generated
- */
- protected Object doSwitch(EClass theEClass, EObject theEObject) {
- if (theEClass.eContainer() == modelPackage) {
- return doSwitch(theEClass.getClassifierID(), theEObject);
- }
- else {
- List eSuperTypes = theEClass.getESuperTypes();
- return
- eSuperTypes.isEmpty() ?
- defaultCase(theEObject) :
- doSwitch((EClass)eSuperTypes.get(0), theEObject);
- }
- }
-
- /**
- * Calls <code>caseXXX</code> for each class of the model until one returns a non null result; it yields that result.
- * <!-- begin-user-doc -->
- * <!-- end-user-doc -->
- * @return the first non-null result returned by a <code>caseXXX</code> call.
- * @generated
- */
- protected Object doSwitch(int classifierID, EObject theEObject) {
- switch (classifierID) {
- case JavaRefPackage.JAVA_CLASS: {
- JavaClass javaClass = (JavaClass)theEObject;
- Object result = caseJavaClass(javaClass);
- if (result == null) result = caseEClass(javaClass);
- if (result == null) result = caseEClassifier(javaClass);
- if (result == null) result = caseENamedElement(javaClass);
- if (result == null) result = caseEModelElement(javaClass);
- if (result == null) result = defaultCase(theEObject);
- return result;
- }
- case JavaRefPackage.INITIALIZER: {
- Initializer initializer = (Initializer)theEObject;
- Object result = caseInitializer(initializer);
- if (result == null) result = defaultCase(theEObject);
- return result;
- }
- case JavaRefPackage.JAVA_PARAMETER: {
- JavaParameter javaParameter = (JavaParameter)theEObject;
- Object result = caseJavaParameter(javaParameter);
- if (result == null) result = caseEParameter(javaParameter);
- if (result == null) result = caseETypedElement(javaParameter);
- if (result == null) result = caseENamedElement(javaParameter);
- if (result == null) result = caseEModelElement(javaParameter);
- if (result == null) result = defaultCase(theEObject);
- return result;
- }
- case JavaRefPackage.METHOD: {
- Method method = (Method)theEObject;
- Object result = caseMethod(method);
- if (result == null) result = caseEOperation(method);
- if (result == null) result = caseETypedElement(method);
- if (result == null) result = caseENamedElement(method);
- if (result == null) result = caseEModelElement(method);
- if (result == null) result = defaultCase(theEObject);
- return result;
- }
- case JavaRefPackage.FIELD: {
- Field field = (Field)theEObject;
- Object result = caseField(field);
- if (result == null) result = caseETypedElement(field);
- if (result == null) result = caseENamedElement(field);
- if (result == null) result = caseEModelElement(field);
- if (result == null) result = defaultCase(theEObject);
- return result;
- }
- case JavaRefPackage.BLOCK: {
- Block block = (Block)theEObject;
- Object result = caseBlock(block);
- if (result == null) result = defaultCase(theEObject);
- return result;
- }
- case JavaRefPackage.COMMENT: {
- Comment comment = (Comment)theEObject;
- Object result = caseComment(comment);
- if (result == null) result = caseBlock(comment);
- if (result == null) result = defaultCase(theEObject);
- return result;
- }
- case JavaRefPackage.STATEMENT: {
- Statement statement = (Statement)theEObject;
- Object result = caseStatement(statement);
- if (result == null) result = caseBlock(statement);
- if (result == null) result = defaultCase(theEObject);
- return result;
- }
- case JavaRefPackage.JAVA_PACKAGE: {
- JavaPackage javaPackage = (JavaPackage)theEObject;
- Object result = caseJavaPackage(javaPackage);
- if (result == null) result = caseEPackage(javaPackage);
- if (result == null) result = caseENamedElement(javaPackage);
- if (result == null) result = caseEModelElement(javaPackage);
- if (result == null) result = defaultCase(theEObject);
- return result;
- }
- case JavaRefPackage.JAVA_DATA_TYPE: {
- JavaDataType javaDataType = (JavaDataType)theEObject;
- Object result = caseJavaDataType(javaDataType);
- if (result == null) result = caseEClass(javaDataType);
- if (result == null) result = caseEClassifier(javaDataType);
- if (result == null) result = caseENamedElement(javaDataType);
- if (result == null) result = caseEModelElement(javaDataType);
- if (result == null) result = defaultCase(theEObject);
- return result;
- }
- case JavaRefPackage.ARRAY_TYPE: {
- ArrayType arrayType = (ArrayType)theEObject;
- Object result = caseArrayType(arrayType);
- if (result == null) result = caseJavaClass(arrayType);
- if (result == null) result = caseEClass(arrayType);
- if (result == null) result = caseEClassifier(arrayType);
- if (result == null) result = caseENamedElement(arrayType);
- if (result == null) result = caseEModelElement(arrayType);
- if (result == null) result = defaultCase(theEObject);
- return result;
- }
- case JavaRefPackage.JAVA_EVENT: {
- JavaEvent javaEvent = (JavaEvent)theEObject;
- Object result = caseJavaEvent(javaEvent);
- if (result == null) result = caseEStructuralFeature(javaEvent);
- if (result == null) result = caseETypedElement(javaEvent);
- if (result == null) result = caseENamedElement(javaEvent);
- if (result == null) result = caseEModelElement(javaEvent);
- if (result == null) result = defaultCase(theEObject);
- return result;
- }
- default: return defaultCase(theEObject);
- }
- }
-
- /**
- * Returns the result of interpretting the object as an instance of '<em>Java Class</em>'.
- * <!-- begin-user-doc -->
- * This implementation returns null;
- * returning a non-null result will terminate the switch.
- * <!-- end-user-doc -->
- * @param object the target of the switch.
- * @return the result of interpretting the object as an instance of '<em>Java Class</em>'.
- * @see #doSwitch(org.eclipse.emf.ecore.EObject) doSwitch(EObject)
- * @generated
- */
- public Object caseJavaClass(JavaClass object) {
- return null;
- }
-
- /**
- * Returns the result of interpretting the object as an instance of '<em>Initializer</em>'.
- * <!-- begin-user-doc -->
- * This implementation returns null;
- * returning a non-null result will terminate the switch.
- * <!-- end-user-doc -->
- * @param object the target of the switch.
- * @return the result of interpretting the object as an instance of '<em>Initializer</em>'.
- * @see #doSwitch(org.eclipse.emf.ecore.EObject) doSwitch(EObject)
- * @generated
- */
- public Object caseInitializer(Initializer object) {
- return null;
- }
-
- /**
- * Returns the result of interpretting the object as an instance of '<em>Java Parameter</em>'.
- * <!-- begin-user-doc -->
- * This implementation returns null;
- * returning a non-null result will terminate the switch.
- * <!-- end-user-doc -->
- * @param object the target of the switch.
- * @return the result of interpretting the object as an instance of '<em>Java Parameter</em>'.
- * @see #doSwitch(org.eclipse.emf.ecore.EObject) doSwitch(EObject)
- * @generated
- */
- public Object caseJavaParameter(JavaParameter object) {
- return null;
- }
-
- /**
- * Returns the result of interpretting the object as an instance of '<em>Method</em>'.
- * <!-- begin-user-doc -->
- * This implementation returns null;
- * returning a non-null result will terminate the switch.
- * <!-- end-user-doc -->
- * @param object the target of the switch.
- * @return the result of interpretting the object as an instance of '<em>Method</em>'.
- * @see #doSwitch(org.eclipse.emf.ecore.EObject) doSwitch(EObject)
- * @generated
- */
- public Object caseMethod(Method object) {
- return null;
- }
-
- /**
- * Returns the result of interpretting the object as an instance of '<em>Field</em>'.
- * <!-- begin-user-doc -->
- * This implementation returns null;
- * returning a non-null result will terminate the switch.
- * <!-- end-user-doc -->
- * @param object the target of the switch.
- * @return the result of interpretting the object as an instance of '<em>Field</em>'.
- * @see #doSwitch(org.eclipse.emf.ecore.EObject) doSwitch(EObject)
- * @generated
- */
- public Object caseField(Field object) {
- return null;
- }
-
- /**
- * Returns the result of interpretting the object as an instance of '<em>Block</em>'.
- * <!-- begin-user-doc -->
- * This implementation returns null;
- * returning a non-null result will terminate the switch.
- * <!-- end-user-doc -->
- * @param object the target of the switch.
- * @return the result of interpretting the object as an instance of '<em>Block</em>'.
- * @see #doSwitch(org.eclipse.emf.ecore.EObject) doSwitch(EObject)
- * @generated
- */
- public Object caseBlock(Block object) {
- return null;
- }
-
- /**
- * Returns the result of interpretting the object as an instance of '<em>Comment</em>'.
- * <!-- begin-user-doc -->
- * This implementation returns null;
- * returning a non-null result will terminate the switch.
- * <!-- end-user-doc -->
- * @param object the target of the switch.
- * @return the result of interpretting the object as an instance of '<em>Comment</em>'.
- * @see #doSwitch(org.eclipse.emf.ecore.EObject) doSwitch(EObject)
- * @generated
- */
- public Object caseComment(Comment object) {
- return null;
- }
-
- /**
- * Returns the result of interpretting the object as an instance of '<em>Statement</em>'.
- * <!-- begin-user-doc -->
- * This implementation returns null;
- * returning a non-null result will terminate the switch.
- * <!-- end-user-doc -->
- * @param object the target of the switch.
- * @return the result of interpretting the object as an instance of '<em>Statement</em>'.
- * @see #doSwitch(org.eclipse.emf.ecore.EObject) doSwitch(EObject)
- * @generated
- */
- public Object caseStatement(Statement object) {
- return null;
- }
-
- /**
- * Returns the result of interpretting the object as an instance of '<em>Java Package</em>'.
- * <!-- begin-user-doc -->
- * This implementation returns null;
- * returning a non-null result will terminate the switch.
- * <!-- end-user-doc -->
- * @param object the target of the switch.
- * @return the result of interpretting the object as an instance of '<em>Java Package</em>'.
- * @see #doSwitch(org.eclipse.emf.ecore.EObject) doSwitch(EObject)
- * @generated
- */
- public Object caseJavaPackage(JavaPackage object) {
- return null;
- }
-
- /**
- * Returns the result of interpretting the object as an instance of '<em>Java Data Type</em>'.
- * <!-- begin-user-doc -->
- * This implementation returns null;
- * returning a non-null result will terminate the switch.
- * <!-- end-user-doc -->
- * @param object the target of the switch.
- * @return the result of interpretting the object as an instance of '<em>Java Data Type</em>'.
- * @see #doSwitch(org.eclipse.emf.ecore.EObject) doSwitch(EObject)
- * @generated
- */
- public Object caseJavaDataType(JavaDataType object) {
- return null;
- }
-
- /**
- * Returns the result of interpretting the object as an instance of '<em>Array Type</em>'.
- * <!-- begin-user-doc -->
- * This implementation returns null;
- * returning a non-null result will terminate the switch.
- * <!-- end-user-doc -->
- * @param object the target of the switch.
- * @return the result of interpretting the object as an instance of '<em>Array Type</em>'.
- * @see #doSwitch(org.eclipse.emf.ecore.EObject) doSwitch(EObject)
- * @generated
- */
- public Object caseArrayType(ArrayType object) {
- return null;
- }
-
- /**
- * Returns the result of interpretting the object as an instance of '<em>Java Event</em>'.
- * <!-- begin-user-doc -->
- * This implementation returns null;
- * returning a non-null result will terminate the switch.
- * <!-- end-user-doc -->
- * @param object the target of the switch.
- * @return the result of interpretting the object as an instance of '<em>Java Event</em>'.
- * @see #doSwitch(org.eclipse.emf.ecore.EObject) doSwitch(EObject)
- * @generated
- */
- public Object caseJavaEvent(JavaEvent object) {
- return null;
- }
-
- /**
- * Returns the result of interpretting the object as an instance of '<em>EModel Element</em>'.
- * <!-- begin-user-doc -->
- * This implementation returns null;
- * returning a non-null result will terminate the switch.
- * <!-- end-user-doc -->
- * @param object the target of the switch.
- * @return the result of interpretting the object as an instance of '<em>EModel Element</em>'.
- * @see #doSwitch(org.eclipse.emf.ecore.EObject) doSwitch(EObject)
- * @generated
- */
- public Object caseEModelElement(EModelElement object) {
- return null;
- }
-
- /**
- * Returns the result of interpretting the object as an instance of '<em>ENamed Element</em>'.
- * <!-- begin-user-doc -->
- * This implementation returns null;
- * returning a non-null result will terminate the switch.
- * <!-- end-user-doc -->
- * @param object the target of the switch.
- * @return the result of interpretting the object as an instance of '<em>ENamed Element</em>'.
- * @see #doSwitch(org.eclipse.emf.ecore.EObject) doSwitch(EObject)
- * @generated
- */
- public Object caseENamedElement(ENamedElement object) {
- return null;
- }
-
- /**
- * Returns the result of interpretting the object as an instance of '<em>EClassifier</em>'.
- * <!-- begin-user-doc -->
- * This implementation returns null;
- * returning a non-null result will terminate the switch.
- * <!-- end-user-doc -->
- * @param object the target of the switch.
- * @return the result of interpretting the object as an instance of '<em>EClassifier</em>'.
- * @see #doSwitch(org.eclipse.emf.ecore.EObject) doSwitch(EObject)
- * @generated
- */
- public Object caseEClassifier(EClassifier object) {
- return null;
- }
-
- /**
- * Returns the result of interpretting the object as an instance of '<em>EClass</em>'.
- * <!-- begin-user-doc -->
- * This implementation returns null;
- * returning a non-null result will terminate the switch.
- * <!-- end-user-doc -->
- * @param object the target of the switch.
- * @return the result of interpretting the object as an instance of '<em>EClass</em>'.
- * @see #doSwitch(org.eclipse.emf.ecore.EObject) doSwitch(EObject)
- * @generated
- */
- public Object caseEClass(EClass object) {
- return null;
- }
-
- /**
- * Returns the result of interpretting the object as an instance of '<em>ETyped Element</em>'.
- * <!-- begin-user-doc -->
- * This implementation returns null;
- * returning a non-null result will terminate the switch.
- * <!-- end-user-doc -->
- * @param object the target of the switch.
- * @return the result of interpretting the object as an instance of '<em>ETyped Element</em>'.
- * @see #doSwitch(org.eclipse.emf.ecore.EObject) doSwitch(EObject)
- * @generated
- */
- public Object caseETypedElement(ETypedElement object) {
- return null;
- }
-
- /**
- * Returns the result of interpretting the object as an instance of '<em>EParameter</em>'.
- * <!-- begin-user-doc -->
- * This implementation returns null;
- * returning a non-null result will terminate the switch.
- * <!-- end-user-doc -->
- * @param object the target of the switch.
- * @return the result of interpretting the object as an instance of '<em>EParameter</em>'.
- * @see #doSwitch(org.eclipse.emf.ecore.EObject) doSwitch(EObject)
- * @generated
- */
- public Object caseEParameter(EParameter object) {
- return null;
- }
-
- /**
- * Returns the result of interpretting the object as an instance of '<em>EOperation</em>'.
- * <!-- begin-user-doc -->
- * This implementation returns null;
- * returning a non-null result will terminate the switch.
- * <!-- end-user-doc -->
- * @param object the target of the switch.
- * @return the result of interpretting the object as an instance of '<em>EOperation</em>'.
- * @see #doSwitch(org.eclipse.emf.ecore.EObject) doSwitch(EObject)
- * @generated
- */
- public Object caseEOperation(EOperation object) {
- return null;
- }
-
- /**
- * Returns the result of interpretting the object as an instance of '<em>EStructural Feature</em>'.
- * <!-- begin-user-doc -->
- * This implementation returns null;
- * returning a non-null result will terminate the switch.
- * <!-- end-user-doc -->
- * @param object the target of the switch.
- * @return the result of interpretting the object as an instance of '<em>EStructural Feature</em>'.
- * @see #doSwitch(org.eclipse.emf.ecore.EObject) doSwitch(EObject)
- * @generated
- */
- public Object caseEStructuralFeature(EStructuralFeature object) {
- return null;
- }
-
- /**
- * Returns the result of interpretting the object as an instance of '<em>EPackage</em>'.
- * <!-- begin-user-doc -->
- * This implementation returns null;
- * returning a non-null result will terminate the switch.
- * <!-- end-user-doc -->
- * @param object the target of the switch.
- * @return the result of interpretting the object as an instance of '<em>EPackage</em>'.
- * @see #doSwitch(org.eclipse.emf.ecore.EObject) doSwitch(EObject)
- * @generated
- */
- public Object caseEPackage(EPackage object) {
- return null;
- }
-
- /**
- * Returns the result of interpretting the object as an instance of '<em>EObject</em>'.
- * <!-- begin-user-doc -->
- * This implementation returns null;
- * returning a non-null result will terminate the switch, but this is the last case anyway.
- * <!-- end-user-doc -->
- * @param object the target of the switch.
- * @return the result of interpretting the object as an instance of '<em>EObject</em>'.
- * @see #doSwitch(org.eclipse.emf.ecore.EObject)
- * @generated
- */
- public Object defaultCase(EObject object) {
- return null;
- }
-
-} //JavaRefSwitch
diff --git a/plugins/org.eclipse.jem/mofjava/org/eclipse/jem/java/util/NotificationUtil.java b/plugins/org.eclipse.jem/mofjava/org/eclipse/jem/java/util/NotificationUtil.java
deleted file mode 100644
index 1092611..0000000
--- a/plugins/org.eclipse.jem/mofjava/org/eclipse/jem/java/util/NotificationUtil.java
+++ /dev/null
@@ -1,73 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2005 IBM Corporation and others.
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
- *
- * Contributors:
- * IBM Corporation - initial API and implementation
- *******************************************************************************/
-/*
-
-
- */
-package org.eclipse.jem.java.util;
-
-import org.eclipse.emf.common.notify.Notification;
-
-import org.eclipse.jem.internal.java.adapters.JavaReflectionAdaptor;
-import org.eclipse.jem.internal.java.adapters.ReflectionAdaptor;
-
-
-/**
- * This is a utility class of static methods for handling special JEM notifications.
- *
- * @since 1.1.0
- */
-public class NotificationUtil {
- /*
- * Not meant to be constructed.
- */
- private NotificationUtil() {
-
- }
-
- /**
- * Answer whether this notification is a reflection notification. If it is, then it means that the JavaClass has
- * just had reflection performed on it.
- * @param msg
- * @return <code>true</code> if this is a reflection event.
- *
- * @since 1.1.0
- */
- public static boolean isReflectionEvent(Notification msg) {
- return msg.getEventType() == ReflectionAdaptor.EVENT && msg.getFeature() == ReflectionAdaptor.REFLECTION_EVENT;
- }
-
- /**
- * Answer whether this notification is a reflection flush event of a JavaClass with existing code. If it is, then it means that the
- * JavaClass has just had the reflection results flushed, AND this was a class that had either source or binary code on it..
- * @param msg
- * @return <code>true</code> if this is a flush event.
- *
- * @since 1.1.0
- */
- public static boolean isFlushEvent(Notification msg) {
- return msg.getEventType() == ReflectionAdaptor.EVENT && msg.getFeature() == JavaReflectionAdaptor.FLUSH_REFLECTION_EVENT;
- }
-
- /**
- * Answer whether this notification is a reflection flush event of a JavaClass that is new and doesn't have existing code.
- * If it is, then it means that the JavaClass has just had the reflection results flushed, AND this was a class that was new and
- * had no code behind it.
- * @param msg
- * @return <code>true</code> if this is a flush event of new class.
- *
- * @since 1.1.0
- */
- public static boolean isFlushNewEvent(Notification msg) {
- return msg.getEventType() == ReflectionAdaptor.EVENT && msg.getFeature() == JavaReflectionAdaptor.FLUSH_NEW_REFLECTION_EVENT;
- }
-
-}
diff --git a/plugins/org.eclipse.jem/overrides/..ROOT...override b/plugins/org.eclipse.jem/overrides/..ROOT...override
deleted file mode 100644
index afa4ad9..0000000
--- a/plugins/org.eclipse.jem/overrides/..ROOT...override
+++ /dev/null
@@ -1,13 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<change:ChangeDescription xmlns:ecore="http://www.eclipse.org/emf/2002/Ecore" xmlns:xmi="http://www.omg.org/XMI" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xmlns:change="http://www.eclipse.org/emf/2003/Change" xmi:version="2.0">
- <objectChanges key="X:ROOT#//@root">
- <value featureName="eStructuralFeatures">
- <listChanges referenceValues="_eStructuralFeatures"/>
- <!-- too remind us that these are need to be done yet in the new allocation scheme.
- <addedEObjects xsi:type="ecore:EAttribute" name="instantiateUsing" eType="ecore:EDataType http://www.eclipse.org/emf/2002/Ecore#//EString"/>
- <addedEObjects xsi:type="ecore:EAttribute" name="serializeData" eType="ecore:EDataType http://www.eclipse.org/emf/2002/Ecore#//EString"/>
--->
- </value>
- </objectChanges>
- <objectsToAttach containment="true" resolveProxies="false" eType="ecore:EClass http:///org/eclipse/jem/internal/instantiation.ecore#//JavaAllocation" name="allocation" xmi:id="_eStructuralFeatures" xsi:type="ecore:EReference"/>
-</change:ChangeDescription>
diff --git a/plugins/org.eclipse.jem/overrides/java/lang/Object.override b/plugins/org.eclipse.jem/overrides/java/lang/Object.override
deleted file mode 100644
index a5892fa..0000000
--- a/plugins/org.eclipse.jem/overrides/java/lang/Object.override
+++ /dev/null
@@ -1,69 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<change:ChangeDescription xmlns:ecore="http://www.eclipse.org/emf/2002/Ecore" xmlns:org.eclipse.jem.internal.beaninfo.beaninfo="http:///org/eclipse/jem/internal/beaninfo/beaninfo.ecore" xmlns:xmi="http://www.omg.org/XMI" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xmlns:change="http://www.eclipse.org/emf/2003/Change" xmi:version="2.0">
- <objectChanges key="X:ROOT#//@root">
- <value featureName="eStructuralFeatures">
- <listChanges referenceValues="_eStructuralFeatures"/>
- </value>
- </objectChanges>
- <!-- Turn class property to a hidden and not introspected property. This is because we don't handle Java 1.5 templates
- yet as valid JavaClasses and it causes XMI serialization errors because it includes the "<" in the serialization of the class name
- for the standard java class which is: "java:/java.lang#Class<? extends Class>". this is invalid in the serialization. -->
-
- <objectsToAttach name="class" xmi:id="_eStructuralFeatures" xsi:type="ecore:EReference" eType="ecore:EClass http://www.eclipse.org/emf/2002/Ecore#//EObject">
- <eAnnotations hidden="true" mergeIntrospection="false" xsi:type="org.eclipse.jem.internal.beaninfo.beaninfo:PropertyDecorator"/>
- </objectsToAttach>
-
- <!--
- This is kind of cheat, but datatypes are never introspected, so we can't get these attributes
- added to them in a normal way. By doing it here, when java.lang.Object is introspected, these
- will be done at the same time. And since Object needs to be introspected before anything else
- can be done, these will be done before anything needs them. -->
- <objectChanges key="java:/#boolean">
- <value featureName="eStructuralFeatures">
- <listChanges referenceValues="boolean_eStructuralFeatures"/>
- </value>
- </objectChanges>
- <objectsToAttach containment="true" resolveProxies="false" eType="ecore:EClass http:///org/eclipse/jem/internal/instantiation.ecore#//JavaAllocation" name="allocation" xmi:id="boolean_eStructuralFeatures" xsi:type="ecore:EReference"/>
- <objectChanges key="java:/#char">
- <value featureName="eStructuralFeatures">
- <listChanges referenceValues="char_eStructuralFeatures"/>
- </value>
- </objectChanges>
- <objectsToAttach containment="true" resolveProxies="false" eType="ecore:EClass http:///org/eclipse/jem/internal/instantiation.ecore#//JavaAllocation" name="allocation" xmi:id="char_eStructuralFeatures" xsi:type="ecore:EReference"/>
- <objectChanges key="java:/#int">
- <value featureName="eStructuralFeatures">
- <listChanges referenceValues="int_eStructuralFeatures"/>
- </value>
- </objectChanges>
- <objectsToAttach containment="true" resolveProxies="false" eType="ecore:EClass http:///org/eclipse/jem/internal/instantiation.ecore#//JavaAllocation" name="allocation" xmi:id="int_eStructuralFeatures" xsi:type="ecore:EReference"/>
- <objectChanges key="java:/#float">
- <value featureName="eStructuralFeatures">
- <listChanges referenceValues="float_eStructuralFeatures"/>
- </value>
- </objectChanges>
- <objectsToAttach containment="true" resolveProxies="false" eType="ecore:EClass http:///org/eclipse/jem/internal/instantiation.ecore#//JavaAllocation" name="allocation" xmi:id="float_eStructuralFeatures" xsi:type="ecore:EReference"/>
- <objectChanges key="java:/#short">
- <value featureName="eStructuralFeatures">
- <listChanges referenceValues="short_eStructuralFeatures"/>
- </value>
- </objectChanges>
- <objectsToAttach containment="true" resolveProxies="false" eType="ecore:EClass http:///org/eclipse/jem/internal/instantiation.ecore#//JavaAllocation" name="allocation" xmi:id="short_eStructuralFeatures" xsi:type="ecore:EReference"/>
- <objectChanges key="java:/#long">
- <value featureName="eStructuralFeatures">
- <listChanges referenceValues="long_eStructuralFeatures"/>
- </value>
- </objectChanges>
- <objectsToAttach containment="true" resolveProxies="false" eType="ecore:EClass http:///org/eclipse/jem/internal/instantiation.ecore#//JavaAllocation" name="allocation" xmi:id="long_eStructuralFeatures" xsi:type="ecore:EReference"/>
- <objectChanges key="java:/#double">
- <value featureName="eStructuralFeatures">
- <listChanges referenceValues="double_eStructuralFeatures"/>
- </value>
- </objectChanges>
- <objectsToAttach containment="true" resolveProxies="false" eType="ecore:EClass http:///org/eclipse/jem/internal/instantiation.ecore#//JavaAllocation" name="allocation" xmi:id="double_eStructuralFeatures" xsi:type="ecore:EReference"/>
- <objectChanges key="java:/#byte">
- <value featureName="eStructuralFeatures">
- <listChanges referenceValues="byte_eStructuralFeatures"/>
- </value>
- </objectChanges>
- <objectsToAttach containment="true" resolveProxies="false" eType="ecore:EClass http:///org/eclipse/jem/internal/instantiation.ecore#//JavaAllocation" name="allocation" xmi:id="byte_eStructuralFeatures" xsi:type="ecore:EReference"/>
-</change:ChangeDescription>
diff --git a/plugins/org.eclipse.jem/plugin.properties b/plugins/org.eclipse.jem/plugin.properties
deleted file mode 100644
index 50bea86..0000000
--- a/plugins/org.eclipse.jem/plugin.properties
+++ /dev/null
@@ -1,18 +0,0 @@
-###############################################################################
-# Copyright (c) 2003, 2005 IBM Corporation and others.
-# All rights reserved. This program and the accompanying materials
-# are made available under the terms of the Eclipse Public License v1.0
-# which accompanies this distribution, and is available at
-# http://www.eclipse.org/legal/epl-v10.html
-#
-# Contributors:
-# IBM Corporation - initial API and implementation
-###############################################################################
-#
-# $Source: /cvsroot/webtools/jeetools.move/webtools.javaee.git/plugins/org.eclipse.jem/plugin.properties,v $
-# $Revision: 1.3 $ $Date: 2005/08/24 20:20:25 $
-#
-
-
-pluginName = Java EMF Model
-providerName = Eclipse.org
diff --git a/plugins/org.eclipse.jem/plugin.xml b/plugins/org.eclipse.jem/plugin.xml
deleted file mode 100644
index 7573458..0000000
--- a/plugins/org.eclipse.jem/plugin.xml
+++ /dev/null
@@ -1,32 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<?eclipse version="3.0"?>
-<plugin>
-
- <extension
- point="org.eclipse.emf.ecore.generated_package">
- <package
- class="org.eclipse.jem.internal.instantiation.InstantiationPackage"
- genModel="model/instance.genmodel"
- uri="http:///org/eclipse/jem/internal/instantiation.ecore">
- </package>
- <package
- class="org.eclipse.jem.java.JavaRefPackage"
- genModel="model/javaModel.genmodel"
- uri="java.xmi">
- </package>
- </extension>
- <extension
- point="org.eclipse.jem.beaninfo.registrations">
- <registration container="org.eclipse.jdt.launching.JRE_CONTAINER">
- <override
- package="java.lang"
- path="overrides/java/lang">
- </override>
- <override
- package="..ROOT.."
- path="overrides">
- </override>
- </registration>
- </extension>
-
-</plugin>
diff --git a/plugins/org.eclipse.jem/rose/.cvsignore b/plugins/org.eclipse.jem/rose/.cvsignore
deleted file mode 100644
index 1be3a37..0000000
--- a/plugins/org.eclipse.jem/rose/.cvsignore
+++ /dev/null
@@ -1,2 +0,0 @@
-*.md~
-*.ca~
\ No newline at end of file
diff --git a/plugins/org.eclipse.jem/rose/edocjava2.cat b/plugins/org.eclipse.jem/rose/edocjava2.cat
deleted file mode 100644
index 25b1eec..0000000
--- a/plugins/org.eclipse.jem/rose/edocjava2.cat
+++ /dev/null
@@ -1,5613 +0,0 @@
-
-(object Petal
- version 47
- _written "Rose 8.0.0303.1400"
- charSet 0)
-
-(object Class_Category "java"
- is_unit TRUE
- is_loaded TRUE
- attributes (list Attribute_Set
- (object Attribute
- tool "IDL"
- name "uuid"
- value (value Text "DCE:c74525a0-8826-11e1-0000-005d9e6adec4:1"))
- (object Attribute
- tool "Ecore"
- name "basePackage"
- value (value Text "org.eclipse.jem"))
- (object Attribute
- tool "Ecore"
- name "prefix"
- value (value Text "JavaRef"))
- (object Attribute
- tool "Ecore"
- name "nsURI"
- value (value Text "java.xmi")))
- quid "36549F2C004E"
- documentation
-|Changes to synch up with Java3e:
-|- deleted JavaElement, BodyElement which didn't add anything useful
-|- deleted NestedClass and the association which described nesting, contents can be used instead
-|- deleted extends/extendedBy which is replaced with MOF subtype/supertype
-|- deleted the clumsy main diagram
-|- moved the MOF inheritance details to the MOF binding diagram
-|- deleted "final" on JavaParameter, don't know what that was supposed to be
-|- deleted the Category junk
-|- changed the Block-typed attributes on Field, Method, Initializer to be associations to Block
-|
-|Outstanding questions/issues:
-|- JavaParameterKind should go away if we get the base Parameter kind fixed up
-|
-
- stereotype "metamodel"
- visible_categories (list visibility_relationship_list
- (object Visibility_Relationship
- attributes (list Attribute_Set
- (object Attribute
- tool "IDL"
- name "uuid"
- value (value Text "DCE:c74525a0-8826-11e1-0001-005d9e6adec4:1")))
- quid "381DDF470271"
- supplier "Logical View::mof"
- quidu "374AA8F9028E")
- (object Visibility_Relationship
- attributes (list Attribute_Set
- (object Attribute
- tool "IDL"
- name "uuid"
- value (value Text "DCE:c74525a0-8826-11e1-0002-005d9e6adec4:1")))
- quid "39BD366000FE"
- supplier "Logical View::ecore"
- quidu "39A5ED04004E"))
- exportControl "Public"
- logical_models (list unit_reference_list
- (object Class "JavaClass"
- attributes (list Attribute_Set
- (object Attribute
- tool "IDL"
- name "uuid"
- value (value Text "DCE:c74525a0-8826-11e1-0003-005d9e6adec4:1")))
- quid "36549FCC00FA"
- superclasses (list inheritance_relationship_list
- (object Inheritance_Relationship
- attributes (list Attribute_Set
- (object Attribute
- tool "IDL"
- name "uuid"
- value (value Text "DCE:c74525a0-8826-11e1-0004-005d9e6adec4:1")))
- quid "3990950000B3"
- supplier "Logical View::ecore::EClass"
- quidu "3903D5BF000A"))
- operations (list Operations
- (object Operation "isNested"
- quid "3A9D7C2101D6"
- result "boolean"
- concurrency "Sequential"
- opExportControl "Public"
- uid 0)
- (object Operation "getField"
- quid "3B65B5B30044"
- documentation "Return an Field with the passed name, or null."
- parameters (list Parameters
- (object Parameter "fieldName"
- quid "3C62FAB901AA"
- type "String"))
- result "Field"
- concurrency "Sequential"
- opExportControl "Public"
- uid 0
- quidu "3654AF8F0280")
- (object Operation "getFieldExtended"
- quid "3B65B625011A"
- documentation
-| Return an Field with the passed name from this JavaClass or any supertypes.
-|
-|Return null if a Field named fieldName is not found.
-
- parameters (list Parameters
- (object Parameter "fieldName"
- quid "3C62FAB901AC"
- type "String"))
- result "Field"
- concurrency "Sequential"
- opExportControl "Public"
- uid 0
- quidu "3654AF8F0280")
- (object Operation "getFieldNamed"
- quid "3B65B6670255"
- documentation "Return an Field with the passed name, or null."
- parameters (list Parameters
- (object Parameter "fieldName"
- quid "3C62FAB901AE"
- type "String"))
- result "Field"
- concurrency "Sequential"
- opExportControl "Public"
- uid 0
- quidu "3654AF8F0280")
- (object Operation "getFieldsExtended"
- quid "3B65B68A0328"
- documentation "Return all fields, including those from supertypes."
- result "JTypeList"
- concurrency "Sequential"
- opExportControl "Public"
- uid 0
- quidu "3B65B87602C1")
- (object Operation "getMethod"
- quid "3B65B911021A"
- documentation "Get the method of this name and these parameters. It will not look up the supertype hierarchy."
- parameters (list Parameters
- (object Parameter "methodName"
- quid "3C62FAB901B1"
- type "String")
- (object Parameter "parameterTypes"
- quid "3C62FAB901B2"
- documentation "List of parameter types."
- type "JTypeList"
- quidu "3B65B87602C1"))
- result "Method"
- concurrency "Sequential"
- opExportControl "Public"
- uid 0
- quidu "3654AE910271")
- (object Operation "getMethodElementSignatures"
- quid "3B65B9EA03CA"
- documentation "Return a List of Strings that represent MethodElement signatures from most general to most specific."
- result "JTypeList"
- concurrency "Sequential"
- opExportControl "Public"
- uid 0
- quidu "3B65B87602C1")
- (object Operation "getMethodExtended"
- quid "3B65BA510115"
- documentation "Get the method of this name and these parameters. It will look up the supertype hierarchy."
- parameters (list Parameters
- (object Parameter "methodName"
- quid "3C62FAB901B5"
- type "String")
- (object Parameter "parameterTypes"
- quid "3C62FAB901B6"
- documentation "List of parameter types."
- type "JTypeList"
- quidu "3B65B87602C1"))
- result "Method"
- concurrency "Sequential"
- opExportControl "Public"
- uid 0
- quidu "3654AE910271")
- (object Operation "getMethodsExtended"
- quid "3B65BA7D0354"
- documentation "Return all methods, including those from supertypes."
- result "JTypeList"
- concurrency "Sequential"
- opExportControl "Public"
- uid 0
- quidu "3B65B87602C1")
- (object Operation "getOnlySpecificMethods"
- quid "3B65BAC3021E"
- documentation
-|Return a List of Methods that begins with @aMethodNamePrefix and is not included in the @excludedNames list. If @aMethodNamePrefix is null, all methods will be returned.
-|
-
- parameters (list Parameters
- (object Parameter "aMethodNamePrefix"
- quid "3C62FAB901B9"
- type "String")
- (object Parameter "excludedNames"
- quid "3C62FAB901BA"
- type "JTypeList"
- quidu "3B65B87602C1"))
- result "JTypeList"
- concurrency "Sequential"
- opExportControl "Public"
- uid 0
- quidu "3B65B87602C1")
- (object Operation "getPublicMethod"
- quid "3B65BBC90383"
- documentation "Return a method matching the name, and non-return parameters with fully qualified types matching all the types in the list, if it exists. It will not look up the supertype hierarchy."
- parameters (list Parameters
- (object Parameter "methodName"
- quid "3C62FAB901BC"
- type "String")
- (object Parameter "parameterTypes"
- quid "3C62FAB901BD"
- documentation "List of parameter types."
- type "JTypeList"
- quidu "3B65B87602C1"))
- result "Method"
- concurrency "Sequential"
- opExportControl "Public"
- uid 0
- quidu "3654AE910271")
- (object Operation "getPublicMethods"
- quid "3B65BC3D034E"
- documentation "Return all methods, it will not go up the supertype hierarchy."
- result "JTypeList"
- concurrency "Sequential"
- opExportControl "Public"
- uid 0
- quidu "3B65B87602C1")
- (object Operation "getPublicMethodsExtended"
- quid "3B65BC630320"
- documentation "Return all public methods, including those from supertypes."
- result "JTypeList"
- concurrency "Sequential"
- opExportControl "Public"
- uid 0
- quidu "3B65B87602C1")
- (object Operation "getPublicMethodsNamed"
- quid "3B65BCAA005B"
- documentation "Returns a filtered list on the methods of this class, having a name equal to that of the parameter."
- parameters (list Parameters
- (object Parameter "name"
- quid "3C62FAB901C1"
- type "String"))
- result "JTypeList"
- concurrency "Sequential"
- opExportControl "Public"
- uid 0
- quidu "3B65B87602C1")
- (object Operation "getSupertype"
- quid "3B65BCF900CD"
- result "JavaClass"
- concurrency "Sequential"
- opExportControl "Public"
- uid 0
- quidu "36549FCC00FA")
- (object Operation "implementsInterface"
- quid "3B65BD39009D"
- documentation "Test whether the receiver implements the passed interface (or one of its supertypes)."
- parameters (list Parameters
- (object Parameter "interfaceType"
- quid "3C62FAB901C4"
- type "JavaClass"
- quidu "36549FCC00FA"))
- result "boolean"
- concurrency "Sequential"
- opExportControl "Public"
- uid 0)
- (object Operation "infoString"
- quid "3B65BD8202D3"
- documentation "Return a string showing our details."
- result "String"
- concurrency "Sequential"
- opExportControl "Public"
- uid 0)
- (object Operation "inheritsFrom"
- quid "3B65BD9E02E7"
- documentation "Tests whether this class inherits from the passed in class."
- parameters (list Parameters
- (object Parameter "javaClass"
- quid "3C62FAB901C7"
- type "JavaClass"
- quidu "36549FCC00FA"))
- result "boolean"
- concurrency "Sequential"
- opExportControl "Public"
- uid 0)
- (object Operation "isExistingType"
- quid "3B65BE110120"
- documentation "Does this type exist."
- result "boolean"
- concurrency "Sequential"
- opExportControl "Public"
- uid 0)
- (object Operation "isInterface"
- quid "3B65BE2F0137"
- documentation "Is this an interface."
- result "boolean"
- concurrency "Sequential"
- opExportControl "Public"
- uid 0)
- (object Operation "setSupertype"
- quid "3B65BE7B00A0"
- documentation "Set the supertype."
- parameters (list Parameters
- (object Parameter "javaclass"
- quid "3C62FAB901CB"
- type "JavaClass"
- quidu "36549FCC00FA"))
- result "void"
- concurrency "Sequential"
- opExportControl "Public"
- uid 0))
- class_attributes (list class_attribute_list
- (object ClassAttribute "kind"
- attributes (list Attribute_Set
- (object Attribute
- tool "IDL"
- name "uuid"
- value (value Text "DCE:c74525a0-8826-11e1-0005-005d9e6adec4:1")))
- quid "3654A45E0232"
- type "TypeKind"
- quidu "3654B46002BF"
- exportControl "Public")
- (object ClassAttribute "public"
- attributes (list Attribute_Set
- (object Attribute
- tool "IDL"
- name "uuid"
- value (value Text "DCE:c74525a0-8826-11e1-0006-005d9e6adec4:1")))
- quid "380F8CE8020C"
- type "boolean"
- exportControl "Public")
- (object ClassAttribute "final"
- attributes (list Attribute_Set
- (object Attribute
- tool "IDL"
- name "uuid"
- value (value Text "DCE:c74525a0-8826-11e1-0008-005d9e6adec4:1")))
- quid "380F8F9C02D7"
- type "boolean"
- exportControl "Public"))
- language "none")
- (object Class "Initializer"
- attributes (list Attribute_Set
- (object Attribute
- tool "IDL"
- name "uuid"
- value (value Text "DCE:c74525a0-8826-11e1-0009-005d9e6adec4:1")))
- quid "3654A5DC00BB"
- class_attributes (list class_attribute_list
- (object ClassAttribute "isStatic"
- attributes (list Attribute_Set
- (object Attribute
- tool "IDL"
- name "uuid"
- value (value Text "DCE:c74525a0-8826-11e1-000a-005d9e6adec4:1")))
- quid "3654A865000F"
- type "Boolean"
- exportControl "Public"))
- language "none")
- (object Class "JavaParameter"
- attributes (list Attribute_Set
- (object Attribute
- tool "IDL"
- name "uuid"
- value (value Text "DCE:c74525a0-8826-11e1-000b-005d9e6adec4:1")))
- quid "3654AD780280"
- superclasses (list inheritance_relationship_list
- (object Inheritance_Relationship
- quid "3B7818B00186"
- supplier "Logical View::ecore::EParameter"
- quidu "3903E6150104"))
- operations (list Operations
- (object Operation "isArray"
- quid "3B65BFD4034F"
- documentation "Is this parameter type an array type."
- result "boolean"
- concurrency "Sequential"
- opExportControl "Public"
- uid 0)
- (object Operation "isReturn"
- quid "3B65BFEF0005"
- documentation "Is this a return parameter."
- result "boolean"
- concurrency "Sequential"
- opExportControl "Public"
- uid 0)
- (object Operation "getJavaType"
- quid "3B65C8E7001A"
- result "JTypeJavaHelpers"
- concurrency "Sequential"
- opExportControl "Public"
- uid 0
- quidu "3B65ADE403A6")
- (object Operation "getQualifiedName"
- quid "3B65C926002F"
- result "String"
- concurrency "Sequential"
- opExportControl "Public"
- uid 0))
- class_attributes (list class_attribute_list
- (object ClassAttribute "final"
- attributes (list Attribute_Set
- (object Attribute
- tool "IDL"
- name "uuid"
- value (value Text "DCE:c74525a0-8826-11e1-000c-005d9e6adec4:1")))
- quid "3654B64702AF"
- type "boolean"
- exportControl "Public")
- (object ClassAttribute "parameterKind"
- attributes (list Attribute_Set
- (object Attribute
- tool "IDL"
- name "uuid"
- value (value Text "DCE:c74525a0-8826-11e1-000e-005d9e6adec4:1")))
- quid "391C1EB400C2"
- type "JavaParameterKind"
- quidu "391C1E8F0123"
- exportControl "Public"))
- language "none")
- (object Class "Method"
- attributes (list Attribute_Set
- (object Attribute
- tool "IDL"
- name "uuid"
- value (value Text "DCE:c74525a0-8826-11e1-000f-005d9e6adec4:1")))
- quid "3654AE910271"
- superclasses (list inheritance_relationship_list
- (object Inheritance_Relationship
- attributes (list Attribute_Set
- (object Attribute
- tool "IDL"
- name "uuid"
- value (value Text "DCE:c74525a0-8826-11e1-0010-005d9e6adec4:1")))
- quid "3990953803AD"
- supplier "Logical View::ecore::EOperation"
- quidu "3904DAA200A0"))
- operations (list Operations
- (object Operation "getContainingJavaClass"
- quid "3B65C04202A3"
- documentation "Return the java class that this method is defined in."
- result "JavaClass"
- concurrency "Sequential"
- opExportControl "Public"
- uid 0
- quidu "36549FCC00FA")
- (object Operation "getMethodElementSignature"
- quid "3B65C076013F"
- documentation
-|Return a String with the the method name and its parameters. e.g. <code> setFirstName(java.lang.String) </code> .
-|
-
- result "String"
- concurrency "Sequential"
- opExportControl "Public"
- uid 0)
- (object Operation "getParameter"
- quid "3B65C0B8011C"
- documentation "Return a Parameter with the passed name, or null."
- parameters (list Parameters
- (object Parameter "parameterName"
- quid "3C62FAB901E3"
- type "String"))
- result "JavaParameter"
- concurrency "Sequential"
- opExportControl "Public"
- uid 0
- quidu "3654AD780280")
- (object Operation "getReturnType"
- quid "3B65C1470013"
- documentation "Get the return type."
- result "JTypeJavaHelpers"
- concurrency "Sequential"
- opExportControl "Public"
- uid 0
- quidu "3B65ADE403A6")
- (object Operation "setReturnType"
- quid "3B65C27403CE"
- documentation "Set the return type"
- parameters (list Parameters
- (object Parameter "type"
- quid "3C62FAB901E8"
- type "JTypeJavaHelpers"
- quidu "3B65ADE403A6"))
- result "void"
- concurrency "Sequential"
- opExportControl "Public"
- uid 0)
- (object Operation "getSignature"
- quid "3B65C17D0043"
- documentation
-|Replicate the functionality of java.lang.reflect.Method.toString().
-|
-|Returns a string describing this Method. The string is formatted as the method access modifiers, if any, followed by the method return type, followed by a space, followed by the class declaring the method, followed by a period, followed by the method name, followed by a parenthesized, comma-separated list of the method's formal parameter types. If the method throws checked exceptions, the parameter list is followed by a space, followed by the word throws followed by a comma-separated list of the thrown exception types.
-|
-|For example:
-|
-| public boolean java.lang.Object.equals(java.lang.Object)
-|
-|The access modifiers are placed in canonical order as specified by "The Java Language Specification". This is public, <tt>protected</tt> or <tt>private</tt> first, and then other modifiers in the following order: <tt>abstract</tt>, <tt>static</tt>, <tt>final</tt>, <tt>synchronized</tt> <tt>native</tt>.
-|
-
- result "String"
- concurrency "Sequential"
- opExportControl "Public"
- uid 0)
- (object Operation "isGenerated"
- quid "3B65C1FC006E"
- documentation
-|Returns true if the method is system generated.
-|This is usually determined by the @generated tag in the comment.
-
- result "boolean"
- concurrency "Sequential"
- opExportControl "Public"
- uid 0)
- (object Operation "setIsGenerated"
- quid "3B65C244037F"
- documentation "Set the isGenerated flag."
- parameters (list Parameters
- (object Parameter "generated"
- quid "3C62FAB901EC"
- type "boolean"))
- result "void"
- concurrency "Sequential"
- opExportControl "Public"
- uid 0)
- (object Operation "isVoid"
- quid "3B65C218038F"
- documentation "Is this a void return type method."
- result "boolean"
- concurrency "Sequential"
- opExportControl "Public"
- uid 0))
- class_attributes (list class_attribute_list
- (object ClassAttribute "abstract"
- attributes (list Attribute_Set
- (object Attribute
- tool "IDL"
- name "uuid"
- value (value Text "DCE:c74525a0-8826-11e1-0011-005d9e6adec4:1")))
- quid "380F90BC022B"
- type "boolean"
- exportControl "Public")
- (object ClassAttribute "native"
- attributes (list Attribute_Set
- (object Attribute
- tool "IDL"
- name "uuid"
- value (value Text "DCE:c74525a0-8826-11e1-0012-005d9e6adec4:1")))
- quid "380F90D10364"
- type "boolean"
- exportControl "Public")
- (object ClassAttribute "synchronized"
- attributes (list Attribute_Set
- (object Attribute
- tool "IDL"
- name "uuid"
- value (value Text "DCE:c74525a0-8826-11e1-0013-005d9e6adec4:1")))
- quid "380F90DB03C1"
- type "boolean"
- exportControl "Public")
- (object ClassAttribute "final"
- attributes (list Attribute_Set
- (object Attribute
- tool "IDL"
- name "uuid"
- value (value Text "DCE:c74525a0-8826-11e1-0014-005d9e6adec4:1")))
- quid "3829C6E00033"
- type "boolean"
- exportControl "Public")
- (object ClassAttribute "constructor"
- attributes (list Attribute_Set
- (object Attribute
- tool "IDL"
- name "uuid"
- value (value Text "DCE:c74525a0-8826-11e1-0015-005d9e6adec4:1")))
- quid "391ADD280245"
- type "boolean"
- exportControl "Public")
- (object ClassAttribute "static"
- attributes (list Attribute_Set
- (object Attribute
- tool "IDL"
- name "uuid"
- value (value Text "DCE:c74525a0-8826-11e1-0016-005d9e6adec4:1")))
- quid "3829C6E40350"
- type "boolean"
- exportControl "Public")
- (object ClassAttribute "javaVisibility"
- attributes (list Attribute_Set
- (object Attribute
- tool "IDL"
- name "uuid"
- value (value Text "DCE:c74525a0-8826-11e1-0017-005d9e6adec4:1")))
- quid "3829C6EB0397"
- type "JavaVisibilityKind"
- quidu "382333BE032E"
- exportControl "Public"))
- language "none")
- (object Class "Field"
- attributes (list Attribute_Set
- (object Attribute
- tool "IDL"
- name "uuid"
- value (value Text "DCE:c74525a0-8826-11e1-0018-005d9e6adec4:1")))
- quid "3654AF8F0280"
- superclasses (list inheritance_relationship_list
- (object Inheritance_Relationship
- quid "400487F90334"
- supplier "Logical View::ecore::ETypedElement"
- quidu "3903D4F60398"))
- operations (list Operations
- (object Operation "getContainingJavaClass"
- quid "3B65B5120024"
- documentation "Get the class that this field is within."
- result "JavaClass"
- concurrency "Sequential"
- opExportControl "Public"
- uid 0
- quidu "36549FCC00FA")
- (object Operation "isArray"
- quid "3B65B55F01E7"
- documentation "Is this field an array type."
- result "boolean"
- concurrency "Sequential"
- opExportControl "Public"
- uid 0))
- class_attributes (list class_attribute_list
- (object ClassAttribute "final"
- attributes (list Attribute_Set
- (object Attribute
- tool "IDL"
- name "uuid"
- value (value Text "DCE:c74525a0-8826-11e1-001d-005d9e6adec4:1")))
- quid "3829C6BE026F"
- type "boolean"
- exportControl "Public")
- (object ClassAttribute "static"
- attributes (list Attribute_Set
- (object Attribute
- tool "IDL"
- name "uuid"
- value (value Text "DCE:c74525a0-8826-11e1-001e-005d9e6adec4:1")))
- quid "3829C6C202ED"
- type "boolean"
- exportControl "Public")
- (object ClassAttribute "javaVisibility"
- attributes (list Attribute_Set
- (object Attribute
- tool "IDL"
- name "uuid"
- value (value Text "DCE:c74525a0-8826-11e1-001f-005d9e6adec4:1")))
- quid "3829C6C7034F"
- type "JavaVisibilityKind"
- quidu "382333BE032E"
- exportControl "Public")
- (object ClassAttribute "transient"
- quid "4004880103B8"
- type "boolean"
- exportControl "Public")
- (object ClassAttribute "volatile"
- quid "40048808012D"
- type "boolean"
- exportControl "Public"))
- language "none")
- (object Class "TypeKind"
- attributes (list Attribute_Set
- (object Attribute
- tool "IDL"
- name "uuid"
- value (value Text "DCE:c74525a0-8826-11e1-0020-005d9e6adec4:1")))
- quid "3654B46002BF"
- documentation "UNDEFINED=1 CLASS=2 INTERFACE=3 EXCEPTION=4"
- stereotype "enumeration"
- class_attributes (list class_attribute_list
- (object ClassAttribute "UNDEFINED"
- attributes (list Attribute_Set
- (object Attribute
- tool "IDL"
- name "uuid"
- value (value Text "DCE:c74525a0-8826-11e1-0021-005d9e6adec4:1")))
- quid "380B9E3601A1"
- exportControl "Public")
- (object ClassAttribute "CLASS"
- attributes (list Attribute_Set
- (object Attribute
- tool "IDL"
- name "uuid"
- value (value Text "DCE:c74525a0-8826-11e1-0022-005d9e6adec4:1")))
- quid "380B9E44025D"
- exportControl "Public")
- (object ClassAttribute "INTERFACE"
- attributes (list Attribute_Set
- (object Attribute
- tool "IDL"
- name "uuid"
- value (value Text "DCE:c74525a0-8826-11e1-0023-005d9e6adec4:1")))
- quid "380B9E560124"
- exportControl "Public")
- (object ClassAttribute "EXCEPTION"
- attributes (list Attribute_Set
- (object Attribute
- tool "IDL"
- name "uuid"
- value (value Text "DCE:c74525a0-8826-11e1-0024-005d9e6adec4:1")))
- quid "380B9E6501A1"
- exportControl "Public"))
- language "none")
- (object Class "Block"
- attributes (list Attribute_Set
- (object Attribute
- tool "IDL"
- name "uuid"
- value (value Text "DCE:c74525a0-8826-11e1-0025-005d9e6adec4:1")))
- quid "380F88370150"
- class_attributes (list class_attribute_list
- (object ClassAttribute "source"
- attributes (list Attribute_Set
- (object Attribute
- tool "IDL"
- name "uuid"
- value (value Text "DCE:c74525a0-8826-11e1-0026-005d9e6adec4:1")))
- quid "3810E7FC0239"
- type "String"
- exportControl "Public")
- (object ClassAttribute "name"
- quid "3A6C53E10029"
- type "String"
- exportControl "Public")))
- (object Class "Comment"
- attributes (list Attribute_Set
- (object Attribute
- tool "IDL"
- name "uuid"
- value (value Text "DCE:c74525a0-8826-11e1-0027-005d9e6adec4:1")))
- quid "380F889B02B8"
- superclasses (list inheritance_relationship_list
- (object Inheritance_Relationship
- attributes (list Attribute_Set
- (object Attribute
- tool "IDL"
- name "uuid"
- value (value Text "DCE:c74525a0-8826-11e1-0028-005d9e6adec4:1")))
- quid "380F88D600A5"
- supplier "Logical View::java::Block"
- quidu "380F88370150")))
- (object Class "Statement"
- attributes (list Attribute_Set
- (object Attribute
- tool "IDL"
- name "uuid"
- value (value Text "DCE:c74525a0-8826-11e1-0029-005d9e6adec4:1")))
- quid "380F88B9025A"
- superclasses (list inheritance_relationship_list
- (object Inheritance_Relationship
- attributes (list Attribute_Set
- (object Attribute
- tool "IDL"
- name "uuid"
- value (value Text "DCE:c74525a0-8826-11e1-002a-005d9e6adec4:1")))
- quid "380F88DA0056"
- supplier "Logical View::java::Block"
- quidu "380F88370150")))
- (object Class "JavaPackage"
- attributes (list Attribute_Set
- (object Attribute
- tool "IDL"
- name "uuid"
- value (value Text "DCE:c74525a0-8826-11e1-002b-005d9e6adec4:1")))
- quid "38108E0301D2"
- superclasses (list inheritance_relationship_list
- (object Inheritance_Relationship
- attributes (list Attribute_Set
- (object Attribute
- tool "IDL"
- name "uuid"
- value (value Text "DCE:c74525a0-8826-11e1-002c-005d9e6adec4:1")))
- quid "399094D70046"
- supplier "Logical View::ecore::EPackage"
- quidu "3905C3F7000A"))
- language "Java")
- (object Class "JavaVisibilityKind"
- attributes (list Attribute_Set
- (object Attribute
- tool "IDL"
- name "uuid"
- value (value Text "DCE:c74525a0-8826-11e1-0030-005d9e6adec4:1")))
- quid "382333BE032E"
- documentation
-|PACKAGE=1
-|PUBLIC=2
-|PRIVATE=3
-|PROTECTED=4
-
- stereotype "enumeration"
- class_attributes (list class_attribute_list
- (object ClassAttribute "PUBLIC"
- attributes (list Attribute_Set
- (object Attribute
- tool "IDL"
- name "uuid"
- value (value Text "DCE:c74525a0-8826-11e1-0031-005d9e6adec4:1")))
- quid "382333E2022C"
- exportControl "Public")
- (object ClassAttribute "PRIVATE"
- attributes (list Attribute_Set
- (object Attribute
- tool "IDL"
- name "uuid"
- value (value Text "DCE:c74525a0-8826-11e1-0032-005d9e6adec4:1")))
- quid "382333E7003E"
- exportControl "Public")
- (object ClassAttribute "PROTECTED"
- attributes (list Attribute_Set
- (object Attribute
- tool "IDL"
- name "uuid"
- value (value Text "DCE:c74525a0-8826-11e1-0033-005d9e6adec4:1")))
- quid "382333E80389"
- exportControl "Public")
- (object ClassAttribute "PACKAGE"
- attributes (list Attribute_Set
- (object Attribute
- tool "IDL"
- name "uuid"
- value (value Text "DCE:c74525a0-8826-11e1-0034-005d9e6adec4:1")))
- quid "382333EA038C"
- exportControl "Public")))
- (object Class "JavaParameterKind"
- attributes (list Attribute_Set
- (object Attribute
- tool "IDL"
- name "uuid"
- value (value Text "DCE:c74525a0-8826-11e1-0035-005d9e6adec4:1")))
- quid "391C1E8F0123"
- documentation
-|IN=0
-|OUT=1
-|INOUT=2
-|RETURN=3
-
- stereotype "enumeration"
- class_attributes (list class_attribute_list
- (object ClassAttribute "IN"
- attributes (list Attribute_Set
- (object Attribute
- tool "IDL"
- name "uuid"
- value (value Text "DCE:c74525a0-8826-11e1-0036-005d9e6adec4:1")))
- quid "391C1EFC02EC"
- exportControl "Public")
- (object ClassAttribute "OUT"
- attributes (list Attribute_Set
- (object Attribute
- tool "IDL"
- name "uuid"
- value (value Text "DCE:c74525a0-8826-11e1-0037-005d9e6adec4:1")))
- quid "391C1EFF016A"
- exportControl "Public")
- (object ClassAttribute "INOUT"
- attributes (list Attribute_Set
- (object Attribute
- tool "IDL"
- name "uuid"
- value (value Text "DCE:c74525a0-8826-11e1-0038-005d9e6adec4:1")))
- quid "391C1F010040"
- exportControl "Public")
- (object ClassAttribute "RETURN"
- attributes (list Attribute_Set
- (object Attribute
- tool "IDL"
- name "uuid"
- value (value Text "DCE:c74525a0-8826-11e1-0039-005d9e6adec4:1")))
- quid "391C21940387"
- exportControl "Public")))
- (object Class "JavaDataType"
- attributes (list Attribute_Set
- (object Attribute
- tool "IDL"
- name "uuid"
- value (value Text "DCE:c74525a0-8826-11e1-003a-005d9e6adec4:1")))
- quid "395913340316"
- superclasses (list inheritance_relationship_list
- (object Inheritance_Relationship
- quid "3E5268E201B1"
- supplier "Logical View::ecore::EClass"
- quidu "3903D5BF000A"))
- operations (list Operations
- (object Operation "getDefaultValueString"
- quid "3B65BF910303"
- documentation "Return the default string representing the default value of the primitive."
- result "String"
- concurrency "Sequential"
- opExportControl "Public"
- uid 0)))
- (object Class "ArrayType"
- quid "3A9D79ED01DF"
- documentation
-|Describes a Java Array type
-| For multi-dimensional arrays, it is unlikely that the component type will be
-| specified directly. This would require instantiating a chain of component types
-| such as String[][][][]->String[][][]->String[][]->String[]->String.
-|
-| The component type relationship will be computed if the finalComponentType
-| and array dimensions is specified.
-|
-| For this reason, the preferred way to create is through the JavaRefFactory factory method:
-| createArrayType(JavaClass finalComponentType, int dimensions)
-
- superclasses (list inheritance_relationship_list
- (object Inheritance_Relationship
- quid "3A9D79FD010F"
- supplier "Logical View::java::JavaClass"
- quidu "36549FCC00FA"))
- operations (list Operations
- (object Operation "getFinalComponentType"
- quid "3A9D7A820193"
- documentation
-|Get the final component type for this Array Type.
-|
-|In order to ensure a unique instance, we will resolve this type using reflection. It turns out to be most efficient to just do this by trimming the name.
-
- result "JTypeJavaHelpers"
- concurrency "Sequential"
- opExportControl "Public"
- uid 0
- quidu "3B65ADE403A6")
- (object Operation "getComponentTypeAsHelper"
- quid "3B65AF980136"
- documentation
-|Get the component type of this array.
-|
-|If this is a multi-dimensional array, the component type will be the nested array type.
-
- result "JTypeJavaHelpers"
- concurrency "Sequential"
- opExportControl "Public"
- uid 0
- quidu "3B65ADE403A6")
- (object Operation "isPrimitiveArray"
- quid "3B65B41702B8"
- documentation "Is this an array of java primitives"
- result "boolean"
- concurrency "Sequential"
- opExportControl "Public"
- uid 0)
- (object Operation "setComponentType"
- quid "3B65B45503BC"
- documentation "Set the component type."
- parameters (list Parameters
- (object Parameter "helperComponentType"
- quid "3C62FAB90226"
- type "JTypeJavaHelpers"
- quidu "3B65ADE403A6"))
- concurrency "Sequential"
- opExportControl "Public"
- uid 0))
- class_attributes (list class_attribute_list
- (object ClassAttribute "arrayDimensions"
- attributes (list Attribute_Set
- (object Attribute
- tool "Java"
- name "Final"
- value FALSE)
- (object Attribute
- tool "Java"
- name "Volatile"
- value FALSE)
- (object Attribute
- tool "Java"
- name "Transient"
- value FALSE)
- (object Attribute
- tool "Java"
- name "IndividualChangeMgt"
- value FALSE)
- (object Attribute
- tool "Java"
- name "PropertyType"
- value ("BeanProperty_Set" 71))
- (object Attribute
- tool "Java"
- name "Read/Write"
- value ("Read/Write_Set" 81)))
- quid "3A9D7AC80284"
- type "int"
- exportControl "Public"))
- language "Java")
- (object Class "JTypeJavaHelpers"
- quid "3B65ADE403A6"
- documentation "This interface is a common interface between JavaClass and JavaDataType plus some common helper methods."
- stereotype "datatype"
- class_attributes (list class_attribute_list
- (object ClassAttribute "org.eclipse.jem.java.JavaHelpers"
- quid "3B65AE170269"
- stereotype "javaclass"
- exportControl "Public")))
- (object Class "JTypeList"
- quid "3B65B87602C1"
- documentation "java.util.List type"
- stereotype "datatype"
- class_attributes (list class_attribute_list
- (object ClassAttribute "java.util.List"
- quid "3B65B88F0399"
- stereotype "javaclass"
- exportControl "Public")))
- (object Class "JavaEvent"
- quid "3C62FAF103C8"
- superclasses (list inheritance_relationship_list
- (object Inheritance_Relationship
- quid "3DF4CE830390"
- supplier "Logical View::ecore::EStructuralFeature"
- quidu "3903D59D0230"))
- abstract TRUE)
- (object Association "Implements"
- attributes (list Attribute_Set
- (object Attribute
- tool "IDL"
- name "uuid"
- value (value Text "DCE:c74525a0-8826-11e1-003c-005d9e6adec4:1")))
- quid "3654A0D70242"
- documentation "Constraint - Source of implements is of TypeKind CLASSTYPE and target is INTERFACETYPE"
- roles (list role_list
- (object Role "implementsInterfaces"
- attributes (list Attribute_Set
- (object Attribute
- tool "IDL"
- name "uuid"
- value (value Text "DCE:c74525a0-8826-11e1-003d-005d9e6adec4:1")))
- quid "3654A0DA0109"
- label "implementsInterfaces"
- supplier "Logical View::java::JavaClass"
- quidu "36549FCC00FA"
- client_cardinality (value cardinality "0..n")
- is_navigable TRUE)
- (object Role "implementedBy"
- attributes (list Attribute_Set
- (object Attribute
- tool "IDL"
- name "uuid"
- value (value Text "DCE:c74525a0-8826-11e1-003e-005d9e6adec4:1")))
- quid "3654A0DA0138"
- label "implementedBy"
- supplier "Logical View::java::JavaClass"
- quidu "36549FCC00FA"
- client_cardinality (value cardinality "0..n"))))
- (object Association "MethodHas"
- attributes (list Attribute_Set
- (object Attribute
- tool "IDL"
- name "uuid"
- value (value Text "DCE:c74525a0-8826-11e1-003f-005d9e6adec4:1")))
- quid "3654AF0302CE"
- roles (list role_list
- (object Role "parameters"
- attributes (list Attribute_Set
- (object Attribute
- tool "IDL"
- name "uuid"
- value (value Text "DCE:c74525a0-8826-11e1-0040-005d9e6adec4:1")))
- quid "3654AF080196"
- label "parameters"
- supplier "Logical View::java::JavaParameter"
- quidu "3654AD780280"
- client_cardinality (value cardinality "0..n")
- Constraints "ordered"
- Containment "By Value"
- is_navigable TRUE)
- (object Role "method"
- attributes (list Attribute_Set
- (object Attribute
- tool "IDL"
- name "uuid"
- value (value Text "DCE:c74525a0-8826-11e1-0041-005d9e6adec4:1")))
- quid "3654AF080197"
- label "method"
- supplier "Logical View::java::Method"
- quidu "3654AE910271"
- client_cardinality (value cardinality "0..1")
- is_aggregate TRUE)))
- (object Association "$UNNAMED$0"
- attributes (list Attribute_Set
- (object Attribute
- tool "IDL"
- name "uuid"
- value (value Text "DCE:c74525a0-8826-11e1-0042-005d9e6adec4:1")))
- quid "3654B08801A5"
- roles (list role_list
- (object Role "/type"
- attributes (list Attribute_Set
- (object Attribute
- tool "IDL"
- name "uuid"
- value (value Text "DCE:c74525a0-8826-11e1-0043-005d9e6adec4:1")))
- quid "3654B091007D"
- label "/type"
- supplier "Logical View::java::JavaClass"
- quidu "36549FCC00FA"
- is_navigable TRUE)
- (object Role "/typedElement"
- attributes (list Attribute_Set
- (object Attribute
- tool "IDL"
- name "uuid"
- value (value Text "DCE:c74525a0-8826-11e1-0044-005d9e6adec4:1")))
- quid "3654B091008C"
- label "/typedElement"
- supplier "Logical View::java::JavaParameter"
- quidu "3654AD780280"
- client_cardinality (value cardinality "1"))))
- (object Association "MethodThrows"
- attributes (list Attribute_Set
- (object Attribute
- tool "IDL"
- name "uuid"
- value (value Text "DCE:c74525a0-8826-11e1-0045-005d9e6adec4:1")))
- quid "3810B61B0178"
- documentation "Target must be of kind EXCEPTIONTYPE"
- roles (list role_list
- (object Role "javaExceptions"
- attributes (list Attribute_Set
- (object Attribute
- tool "IDL"
- name "uuid"
- value (value Text "DCE:c74525a0-8826-11e1-0046-005d9e6adec4:1")))
- quid "3810B61E01C3"
- label "javaExceptions"
- supplier "Logical View::java::JavaClass"
- quidu "36549FCC00FA"
- client_cardinality (value cardinality "0..n")
- is_navigable TRUE)
- (object Role "method"
- attributes (list Attribute_Set
- (object Attribute
- tool "IDL"
- name "uuid"
- value (value Text "DCE:c74525a0-8826-11e1-0047-005d9e6adec4:1")))
- quid "3810B61E0227"
- label "method"
- supplier "Logical View::java::Method"
- quidu "3654AE910271")))
- (object Association "Contents"
- attributes (list Attribute_Set
- (object Attribute
- tool "IDL"
- name "uuid"
- value (value Text "DCE:c74525a0-8826-11e1-0048-005d9e6adec4:1")))
- quid "3810E6080268"
- roles (list role_list
- (object Role "containedBy"
- attributes (list Attribute_Set
- (object Attribute
- tool "IDL"
- name "uuid"
- value (value Text "DCE:c74525a0-8826-11e1-0049-005d9e6adec4:1")))
- quid "3810E60E0144"
- label "containedBy"
- supplier "Logical View::java::Block"
- quidu "380F88370150"
- client_cardinality (value cardinality "0..1")
- is_aggregate TRUE)
- (object Role "contents"
- attributes (list Attribute_Set
- (object Attribute
- tool "IDL"
- name "uuid"
- value (value Text "DCE:c74525a0-8826-11e1-004a-005d9e6adec4:1")))
- quid "3810E60E0162"
- label "contents"
- supplier "Logical View::java::Block"
- quidu "380F88370150"
- client_cardinality (value cardinality "0..n")
- Containment "By Value"
- is_navigable TRUE)))
- (object Association "ClassImports"
- attributes (list Attribute_Set
- (object Attribute
- tool "IDL"
- name "uuid"
- value (value Text "DCE:c74525a0-8826-11e1-004b-005d9e6adec4:1")))
- quid "3829C4BF000D"
- roles (list role_list
- (object Role "classImport"
- attributes (list Attribute_Set
- (object Attribute
- tool "IDL"
- name "uuid"
- value (value Text "DCE:c74525a0-8826-11e1-004c-005d9e6adec4:1")))
- quid "3829C4BF000E"
- label "classImport"
- supplier "Logical View::java::JavaClass"
- quidu "36549FCC00FA"
- client_cardinality (value cardinality "0..n")
- Constraints "ordered"
- is_navigable TRUE)
- (object Role "importedBy"
- attributes (list Attribute_Set
- (object Attribute
- tool "IDL"
- name "uuid"
- value (value Text "DCE:c74525a0-8826-11e1-004d-005d9e6adec4:1")))
- quid "3829C4BF000F"
- label "importedBy"
- supplier "Logical View::java::JavaClass"
- quidu "36549FCC00FA"
- client_cardinality (value cardinality "0..n"))))
- (object Association "PackageImports"
- attributes (list Attribute_Set
- (object Attribute
- tool "IDL"
- name "uuid"
- value (value Text "DCE:c74525a0-8826-11e1-004e-005d9e6adec4:1")))
- quid "3829C4EC0207"
- roles (list role_list
- (object Role "packageImports"
- attributes (list Attribute_Set
- (object Attribute
- tool "IDL"
- name "uuid"
- value (value Text "DCE:c74525a0-8826-11e1-004f-005d9e6adec4:1")))
- quid "3829C4EE00FB"
- label "packageImports"
- supplier "Logical View::java::JavaPackage"
- quidu "38108E0301D2"
- client_cardinality (value cardinality "0..n")
- Constraints "ordered"
- is_navigable TRUE)
- (object Role "importedBy"
- attributes (list Attribute_Set
- (object Attribute
- tool "IDL"
- name "uuid"
- value (value Text "DCE:c74525a0-8826-11e1-0050-005d9e6adec4:1")))
- quid "3829C4EE0105"
- label "importedBy"
- supplier "Logical View::java::JavaClass"
- quidu "36549FCC00FA"
- client_cardinality (value cardinality "0..n"))))
- (object Association "$UNNAMED$1"
- attributes (list Attribute_Set
- (object Attribute
- tool "IDL"
- name "uuid"
- value (value Text "DCE:c74525a0-8826-11e1-0051-005d9e6adec4:1")))
- quid "382A29BD0219"
- roles (list role_list
- (object Role "fields"
- attributes (list Attribute_Set
- (object Attribute
- tool "IDL"
- name "uuid"
- value (value Text "DCE:c74525a0-8826-11e1-0052-005d9e6adec4:1")))
- quid "382A29BE0350"
- label "fields"
- supplier "Logical View::java::Field"
- quidu "3654AF8F0280"
- client_cardinality (value cardinality "0..n")
- Containment "By Value"
- is_navigable TRUE)
- (object Role "javaClass"
- attributes (list Attribute_Set
- (object Attribute
- tool "IDL"
- name "uuid"
- value (value Text "DCE:c74525a0-8826-11e1-0053-005d9e6adec4:1")))
- quid "382A29BE03BF"
- label "javaClass"
- supplier "Logical View::java::JavaClass"
- quidu "36549FCC00FA"
- is_navigable TRUE
- is_aggregate TRUE)))
- (object Association "$UNNAMED$2"
- attributes (list Attribute_Set
- (object Attribute
- tool "IDL"
- name "uuid"
- value (value Text "DCE:c74525a0-8826-11e1-0054-005d9e6adec4:1")))
- quid "382A29C0017D"
- roles (list role_list
- (object Role "methods"
- attributes (list Attribute_Set
- (object Attribute
- tool "IDL"
- name "uuid"
- value (value Text "DCE:c74525a0-8826-11e1-0055-005d9e6adec4:1")))
- quid "382A29C10174"
- label "methods"
- supplier "Logical View::java::Method"
- quidu "3654AE910271"
- client_cardinality (value cardinality "0..n")
- Containment "By Value"
- is_navigable TRUE)
- (object Role "javaClass"
- attributes (list Attribute_Set
- (object Attribute
- tool "IDL"
- name "uuid"
- value (value Text "DCE:c74525a0-8826-11e1-0056-005d9e6adec4:1")))
- quid "382A29C1020A"
- label "javaClass"
- supplier "Logical View::java::JavaClass"
- quidu "36549FCC00FA"
- is_navigable TRUE
- is_aggregate TRUE)))
- (object Association "$UNNAMED$3"
- attributes (list Attribute_Set
- (object Attribute
- tool "IDL"
- name "uuid"
- value (value Text "DCE:c74525a0-8826-11e1-0057-005d9e6adec4:1")))
- quid "392A9EB403C6"
- roles (list role_list
- (object Role "/supertype"
- attributes (list Attribute_Set
- (object Attribute
- tool "IDL"
- name "uuid"
- value (value Text "DCE:c74525a0-8826-11e1-0058-005d9e6adec4:1")))
- quid "392A9EB803B7"
- label "/supertype"
- supplier "Logical View::java::JavaClass"
- quidu "36549FCC00FA"
- client_cardinality (value cardinality "1")
- is_navigable TRUE)
- (object Role "/subtype"
- attributes (list Attribute_Set
- (object Attribute
- tool "IDL"
- name "uuid"
- value (value Text "DCE:c74525a0-8826-11e1-0059-005d9e6adec4:1")))
- quid "392A9EB90098"
- label "/subtype"
- supplier "Logical View::java::JavaClass"
- quidu "36549FCC00FA"
- client_cardinality (value cardinality "0..n"))))
- (object Association "$UNNAMED$4"
- attributes (list Attribute_Set
- (object Attribute
- tool "IDL"
- name "uuid"
- value (value Text "DCE:c74525a0-8826-11e1-005a-005d9e6adec4:1")))
- quid "392A9F0301AC"
- roles (list role_list
- (object Role "/supertype"
- attributes (list Attribute_Set
- (object Attribute
- tool "IDL"
- name "uuid"
- value (value Text "DCE:c74525a0-8826-11e1-005b-005d9e6adec4:1")))
- quid "392A9F090328"
- label "/supertype"
- supplier "Logical View::java::JavaClass"
- quidu "36549FCC00FA"
- client_cardinality (value cardinality "0..n")
- is_navigable TRUE)
- (object Role "/subtype"
- attributes (list Attribute_Set
- (object Attribute
- tool "IDL"
- name "uuid"
- value (value Text "DCE:c74525a0-8826-11e1-005c-005d9e6adec4:1")))
- quid "392A9F0A001C"
- label "/subtype"
- supplier "Logical View::java::JavaClass"
- quidu "36549FCC00FA"
- client_cardinality (value cardinality "0..n")
- is_navigable TRUE)))
- (object Association "$UNNAMED$5"
- attributes (list Attribute_Set
- (object Attribute
- tool "IDL"
- name "uuid"
- value (value Text "DCE:c74525a0-8826-11e1-005d-005d9e6adec4:1")))
- quid "392AA09503E5"
- roles (list role_list
- (object Role "initializers"
- attributes (list Attribute_Set
- (object Attribute
- tool "IDL"
- name "uuid"
- value (value Text "DCE:c74525a0-8826-11e1-005e-005d9e6adec4:1")))
- quid "392AA0970153"
- label "initializers"
- supplier "Logical View::java::Initializer"
- quidu "3654A5DC00BB"
- client_cardinality (value cardinality "0..n")
- Containment "By Value"
- is_navigable TRUE)
- (object Role "javaClass"
- attributes (list Attribute_Set
- (object Attribute
- tool "IDL"
- name "uuid"
- value (value Text "DCE:c74525a0-8826-11e1-005f-005d9e6adec4:1")))
- quid "392AA097015D"
- label "javaClass"
- supplier "Logical View::java::JavaClass"
- quidu "36549FCC00FA"
- is_navigable TRUE
- is_aggregate TRUE)))
- (object Association "$UNNAMED$6"
- attributes (list Attribute_Set
- (object Attribute
- tool "IDL"
- name "uuid"
- value (value Text "DCE:c74525a0-8826-11e1-0060-005d9e6adec4:1")))
- quid "392AA21200C2"
- roles (list role_list
- (object Role "declaredClasses"
- attributes (list Attribute_Set
- (object Attribute
- tool "IDL"
- name "uuid"
- value (value Text "DCE:c74525a0-8826-11e1-0061-005d9e6adec4:1")))
- quid "392AA21701D8"
- label "declaredClasses"
- supplier "Logical View::java::JavaClass"
- quidu "36549FCC00FA"
- client_cardinality (value cardinality "0..n")
- is_navigable TRUE)
- (object Role "declaringClass"
- attributes (list Attribute_Set
- (object Attribute
- tool "IDL"
- name "uuid"
- value (value Text "DCE:c74525a0-8826-11e1-0062-005d9e6adec4:1")))
- quid "392AA21702DC"
- label "declaringClass"
- supplier "Logical View::java::JavaClass"
- quidu "36549FCC00FA"
- client_cardinality (value cardinality "0..1")
- is_navigable TRUE
- is_aggregate TRUE)))
- (object Association "$UNNAMED$7"
- attributes (list Attribute_Set
- (object Attribute
- tool "IDL"
- name "uuid"
- value (value Text "DCE:c74525a0-8826-11e1-0063-005d9e6adec4:1")))
- quid "392AA2A701C1"
- stereotype "derived"
- roles (list role_list
- (object Role "javaClasses"
- attributes (list Attribute_Set
- (object Attribute
- tool "IDL"
- name "uuid"
- value (value Text "DCE:c74525a0-8826-11e1-0064-005d9e6adec4:1"))
- (object Attribute
- tool "Ecore"
- name "isTransient"
- value TRUE)
- (object Attribute
- tool "Ecore"
- name "isVolatile"
- value TRUE)
- (object Attribute
- tool "Ecore"
- name "isChangeable"
- value FALSE))
- quid "392AA2A80367"
- label "javaClasses"
- supplier "Logical View::java::JavaClass"
- quidu "36549FCC00FA"
- client_cardinality (value cardinality "0..n")
- is_navigable TRUE)
- (object Role "javaPackage"
- attributes (list Attribute_Set
- (object Attribute
- tool "IDL"
- name "uuid"
- value (value Text "DCE:c74525a0-8826-11e1-0065-005d9e6adec4:1"))
- (object Attribute
- tool "Ecore"
- name "isTransient"
- value TRUE)
- (object Attribute
- tool "Ecore"
- name "isVolatile"
- value TRUE)
- (object Attribute
- tool "Ecore"
- name "isChangeable"
- value FALSE))
- quid "392AA2A90083"
- label "javaPackage"
- supplier "Logical View::java::JavaPackage"
- quidu "38108E0301D2"
- client_cardinality (value cardinality "0..1")
- is_navigable TRUE
- is_aggregate TRUE)))
- (object Association "$UNNAMED$8"
- attributes (list Attribute_Set
- (object Attribute
- tool "IDL"
- name "uuid"
- value (value Text "DCE:c74525a0-8826-11e1-0066-005d9e6adec4:1")))
- quid "392AAC33036A"
- roles (list role_list
- (object Role "source"
- attributes (list Attribute_Set
- (object Attribute
- tool "IDL"
- name "uuid"
- value (value Text "DCE:c74525a0-8826-11e1-0067-005d9e6adec4:1")))
- quid "392AAC380140"
- label "source"
- supplier "Logical View::java::Block"
- quidu "380F88370150"
- client_cardinality (value cardinality "0..1")
- is_navigable TRUE)
- (object Role "initializer"
- attributes (list Attribute_Set
- (object Attribute
- tool "IDL"
- name "uuid"
- value (value Text "DCE:c74525a0-8826-11e1-0068-005d9e6adec4:1")))
- quid "392AAC380168"
- label "initializer"
- supplier "Logical View::java::Initializer"
- quidu "3654A5DC00BB")))
- (object Association "$UNNAMED$9"
- attributes (list Attribute_Set
- (object Attribute
- tool "IDL"
- name "uuid"
- value (value Text "DCE:c74525a0-8826-11e1-0069-005d9e6adec4:1")))
- quid "392AAC5602A2"
- roles (list role_list
- (object Role "initializer"
- attributes (list Attribute_Set
- (object Attribute
- tool "IDL"
- name "uuid"
- value (value Text "DCE:c74525a0-8826-11e1-006a-005d9e6adec4:1")))
- quid "392AAC5702DF"
- label "initializer"
- supplier "Logical View::java::Block"
- quidu "380F88370150"
- client_cardinality (value cardinality "0..1")
- Containment "By Value"
- is_navigable TRUE)
- (object Role "field"
- attributes (list Attribute_Set
- (object Attribute
- tool "IDL"
- name "uuid"
- value (value Text "DCE:c74525a0-8826-11e1-006b-005d9e6adec4:1")))
- quid "392AAC570307"
- label "field"
- supplier "Logical View::java::Field"
- quidu "3654AF8F0280"
- is_aggregate TRUE)))
- (object Association "$UNNAMED$10"
- attributes (list Attribute_Set
- (object Attribute
- tool "IDL"
- name "uuid"
- value (value Text "DCE:c74525a0-8826-11e1-006c-005d9e6adec4:1")))
- quid "392AACA501E7"
- roles (list role_list
- (object Role "source"
- attributes (list Attribute_Set
- (object Attribute
- tool "IDL"
- name "uuid"
- value (value Text "DCE:c746ac40-8826-11e1-0000-005d9e6adec4:1")))
- quid "392AACA7017C"
- label "source"
- supplier "Logical View::java::Block"
- quidu "380F88370150"
- client_cardinality (value cardinality "0..1")
- is_navigable TRUE)
- (object Role "method"
- attributes (list Attribute_Set
- (object Attribute
- tool "IDL"
- name "uuid"
- value (value Text "DCE:c746ac40-8826-11e1-0001-005d9e6adec4:1")))
- quid "392AACA701B8"
- label "method"
- supplier "Logical View::java::Method"
- quidu "3654AE910271")))
- (object Association "$UNNAMED$11"
- quid "3C62FBE00168"
- roles (list role_list
- (object Role "events"
- quid "3C62FBE2008F"
- label "events"
- supplier "Logical View::java::JavaEvent"
- quidu "3C62FAF103C8"
- client_cardinality (value cardinality "0..n")
- Containment "By Value"
- is_navigable TRUE)
- (object Role "$UNNAMED$12"
- quid "3C62FBE20091"
- supplier "Logical View::java::JavaClass"
- quidu "36549FCC00FA"
- is_aggregate TRUE)))
- (object Association "$UNNAMED$13"
- quid "3C8938770253"
- roles (list role_list
- (object Role "allEvents"
- attributes (list Attribute_Set
- (object Attribute
- tool "Ecore"
- name "isTransient"
- value TRUE)
- (object Attribute
- tool "Ecore"
- name "isVolatile"
- value TRUE))
- quid "3C89387802CC"
- label "allEvents"
- supplier "Logical View::java::JavaEvent"
- quidu "3C62FAF103C8"
- client_cardinality (value cardinality "0..n")
- Containment "By Reference"
- is_navigable TRUE)
- (object Role "$UNNAMED$14"
- quid "3C89387802CE"
- supplier "Logical View::java::JavaClass"
- quidu "36549FCC00FA"
- is_aggregate TRUE)))
- (object Association "$UNNAMED$15"
- quid "3DF4CAAD01A3"
- roles (list role_list
- (object Role "componentType"
- quid "3DF4CAAE01EB"
- label "componentType"
- supplier "Logical View::ecore::EClassifier"
- quidu "3ACE4FEE0371"
- client_cardinality (value cardinality "1")
- is_navigable TRUE)
- (object Role "$UNNAMED$16"
- quid "3DF4CAAE01F5"
- supplier "Logical View::java::ArrayType"
- quidu "3A9D79ED01DF"))))
- logical_presentations (list unit_reference_list
- (object ClassDiagram "Ecore binding"
- quid "38109C0F009B"
- title "Ecore binding"
- zoom 100
- max_height 28350
- max_width 21600
- origin_x 0
- origin_y 4094
- items (list diagram_item_list
- (object ClassView "Class" "Logical View::java::Field" @1
- ShowCompartmentStereotypes TRUE
- IncludeAttribute TRUE
- IncludeOperation TRUE
- ShowOperationSignature TRUE
- location (1104, 576)
- font (object Font
- size 10
- face "Arial"
- bold FALSE
- italics FALSE
- underline FALSE
- strike FALSE
- color 0
- default_color TRUE)
- label (object ItemLabel
- Parent_View @1
- location (689, 368)
- fill_color 13434879
- nlines 1
- max_width 830
- justify 0
- label "Field")
- icon_style "Icon"
- line_color 3342489
- fill_color 13434879
- quidu "3654AF8F0280"
- compartment (object Compartment
- Parent_View @1
- location (689, 424)
- font (object Font
- size 10
- face "Arial"
- bold FALSE
- italics FALSE
- underline FALSE
- strike FALSE
- color 0
- default_color TRUE)
- icon_style "Icon"
- fill_color 16777215
- anchor 2
- nlines 8
- max_width 709)
- width 848
- height 438
- annotation 8
- autoResize TRUE)
- (object ClassView "Class" "Logical View::java::JavaPackage" @2
- ShowCompartmentStereotypes TRUE
- IncludeOperation TRUE
- location (192, 480)
- font (object Font
- size 10
- face "Arial"
- bold FALSE
- italics FALSE
- underline FALSE
- strike FALSE
- color 0
- default_color TRUE)
- label (object ItemLabel
- Parent_View @2
- location (31, 434)
- fill_color 13434879
- nlines 1
- max_width 322
- justify 0
- label "JavaPackage")
- icon_style "Label"
- line_color 3342489
- fill_color 13434879
- quidu "38108E0301D2"
- width 340
- height 114
- annotation 8
- autoResize TRUE)
- (object ClassView "Class" "Logical View::ecore::EPackage" @3
- ShowCompartmentStereotypes TRUE
- location (192, 144)
- font (object Font
- size 10
- face "Arial"
- bold FALSE
- italics FALSE
- underline FALSE
- strike FALSE
- color 0
- default_color TRUE)
- label (object ItemLabel
- Parent_View @3
- location (103, 45)
- nlines 2
- max_width 178
- justify 0
- label "EPackage")
- icon_style "Label"
- line_color 3342489
- fill_color 16777215
- quidu "3905C3F7000A"
- width 196
- height 222
- annotation 8
- autoResize TRUE)
- (object InheritView "" @4
- stereotype TRUE
- line_color 3342489
- quidu "399094D70046"
- client @2
- supplier @3
- line_style 0)
- (object ClassView "Class" "Logical View::ecore::EClass" @5
- ShowCompartmentStereotypes TRUE
- IncludeAttribute TRUE
- IncludeOperation TRUE
- location (1728, 1824)
- font (object Font
- size 10
- face "Arial"
- bold FALSE
- italics FALSE
- underline FALSE
- strike FALSE
- color 0
- default_color TRUE)
- label (object ItemLabel
- Parent_View @5
- location (1465, 1615)
- nlines 2
- max_width 526
- justify 0
- label "EClass")
- icon_style "Label"
- line_color 3342489
- fill_color 16777215
- quidu "3903D5BF000A"
- compartment (object Compartment
- Parent_View @5
- location (1465, 1715)
- font (object Font
- size 10
- face "Arial"
- bold FALSE
- italics FALSE
- underline FALSE
- strike FALSE
- color 0
- default_color TRUE)
- icon_style "Icon"
- anchor 2
- nlines 6
- max_width 452)
- width 544
- height 440
- annotation 8
- autoResize TRUE)
- (object ClassView "Class" "Logical View::ecore::EOperation" @6
- ShowCompartmentStereotypes TRUE
- IncludeAttribute TRUE
- IncludeOperation TRUE
- location (2320, 144)
- font (object Font
- size 10
- face "Arial"
- bold FALSE
- italics FALSE
- underline FALSE
- strike FALSE
- color 0
- default_color TRUE)
- label (object ItemLabel
- Parent_View @6
- location (2231, 45)
- nlines 2
- max_width 178
- justify 0
- label "EOperation")
- icon_style "Label"
- line_color 3342489
- fill_color 16777215
- quidu "3904DAA200A0"
- width 196
- height 222
- annotation 8
- autoResize TRUE)
- (object ClassView "Class" "Logical View::java::JavaDataType" @7
- ShowCompartmentStereotypes TRUE
- IncludeAttribute TRUE
- IncludeOperation TRUE
- ShowOperationSignature TRUE
- location (352, 1216)
- font (object Font
- size 10
- face "Arial"
- bold FALSE
- italics FALSE
- underline FALSE
- strike FALSE
- color 0
- default_color TRUE)
- label (object ItemLabel
- Parent_View @7
- location (11, 1143)
- fill_color 13434879
- nlines 1
- max_width 682
- justify 0
- label "JavaDataType")
- icon_style "Label"
- line_color 3342489
- fill_color 13434879
- quidu "395913340316"
- compartment (object Compartment
- Parent_View @7
- location (11, 1199)
- font (object Font
- size 10
- face "Arial"
- bold FALSE
- italics FALSE
- underline FALSE
- strike FALSE
- color 0
- default_color TRUE)
- icon_style "Icon"
- fill_color 16777215
- anchor 2
- nlines 2
- max_width 585)
- width 700
- height 168
- annotation 8
- autoResize TRUE)
- (object ClassView "Class" "Logical View::java::Method" @8
- ShowCompartmentStereotypes TRUE
- IncludeAttribute TRUE
- IncludeOperation TRUE
- ShowOperationSignature TRUE
- location (2336, 768)
- font (object Font
- size 10
- face "Arial"
- bold FALSE
- italics FALSE
- underline FALSE
- strike FALSE
- color 0
- default_color TRUE)
- label (object ItemLabel
- Parent_View @8
- location (1736, 357)
- fill_color 13434879
- nlines 1
- max_width 1200
- justify 0
- label "Method")
- icon_style "Icon"
- line_color 3342489
- fill_color 13434879
- quidu "3654AE910271"
- compartment (object Compartment
- Parent_View @8
- location (1736, 413)
- font (object Font
- size 10
- face "Arial"
- bold FALSE
- italics FALSE
- underline FALSE
- strike FALSE
- color 0
- default_color TRUE)
- icon_style "Icon"
- fill_color 16777215
- anchor 2
- nlines 17
- max_width 1027)
- width 1218
- height 844
- annotation 8
- autoResize TRUE)
- (object InheritView "" @9
- stereotype TRUE
- line_color 3342489
- quidu "3990953803AD"
- client @8
- supplier @6
- line_style 3
- origin_attachment (2376, 346)
- terminal_attachment (2376, 255))
- (object ClassView "Class" "Logical View::java::JavaClass" @10
- ShowCompartmentStereotypes TRUE
- IncludeAttribute TRUE
- IncludeOperation TRUE
- ShowOperationSignature TRUE
- location (1312, 2864)
- font (object Font
- size 10
- face "Arial"
- bold FALSE
- italics FALSE
- underline FALSE
- strike FALSE
- color 0
- default_color TRUE)
- label (object ItemLabel
- Parent_View @10
- location (330, 2273)
- fill_color 13434879
- nlines 1
- max_width 1964
- justify 0
- label "JavaClass")
- icon_style "Label"
- line_color 3342489
- fill_color 13434879
- quidu "36549FCC00FA"
- compartment (object Compartment
- Parent_View @10
- location (330, 2329)
- font (object Font
- size 10
- face "Arial"
- bold FALSE
- italics FALSE
- underline FALSE
- strike FALSE
- color 0
- default_color TRUE)
- icon_style "Icon"
- fill_color 16777215
- anchor 2
- nlines 25
- max_width 1680)
- width 1982
- height 1204
- annotation 8
- autoResize TRUE)
- (object InheritView "" @11
- font (object Font
- size 10
- face "Arial"
- bold FALSE
- italics FALSE
- underline FALSE
- strike FALSE
- color 0
- default_color TRUE)
- stereotype TRUE
- line_color 3342489
- quidu "3990950000B3"
- client @10
- supplier @5
- line_style 3
- origin_attachment (1594, 2262)
- terminal_attachment (1594, 2044))
- (object ClassView "Class" "Logical View::java::JavaParameter" @12
- ShowCompartmentStereotypes TRUE
- IncludeAttribute TRUE
- IncludeOperation TRUE
- ShowOperationSignature TRUE
- location (1008, 1472)
- font (object Font
- size 10
- face "Arial"
- bold FALSE
- italics FALSE
- underline FALSE
- strike FALSE
- color 0
- default_color TRUE)
- label (object ItemLabel
- Parent_View @12
- location (608, 1286)
- fill_color 13434879
- nlines 1
- max_width 800
- justify 0
- label "JavaParameter")
- icon_style "Label"
- line_color 3342489
- fill_color 13434879
- quidu "3654AD780280"
- compartment (object Compartment
- Parent_View @12
- location (608, 1342)
- font (object Font
- size 10
- face "Arial"
- bold FALSE
- italics FALSE
- underline FALSE
- strike FALSE
- color 0
- default_color TRUE)
- icon_style "Icon"
- fill_color 16777215
- anchor 2
- nlines 7
- max_width 685)
- width 818
- height 394
- annotation 8
- autoResize TRUE)
- (object ClassView "Class" "Logical View::ecore::EParameter" @13
- ShowCompartmentStereotypes TRUE
- IncludeAttribute TRUE
- IncludeOperation TRUE
- location (1008, 960)
- font (object Font
- size 10
- face "Arial"
- bold FALSE
- italics FALSE
- underline FALSE
- strike FALSE
- color 0
- default_color TRUE)
- label (object ItemLabel
- Parent_View @13
- location (919, 861)
- nlines 2
- max_width 178
- justify 0
- label "EParameter")
- icon_style "Icon"
- line_color 3342489
- fill_color 16777215
- quidu "3903E6150104"
- width 196
- height 222
- annotation 8
- autoResize TRUE)
- (object InheritView "" @14
- stereotype TRUE
- line_color 3342489
- quidu "3B7818B00186"
- client @12
- supplier @13
- line_style 0)
- (object ClassView "Class" "Logical View::ecore::EClass" @15
- ShowCompartmentStereotypes TRUE
- IncludeAttribute TRUE
- IncludeOperation TRUE
- location (320, 816)
- font (object Font
- size 10
- face "Arial"
- bold FALSE
- italics FALSE
- underline FALSE
- strike FALSE
- color 0
- default_color TRUE)
- label (object ItemLabel
- Parent_View @15
- location (56, 630)
- nlines 1
- max_width 528
- justify 0
- label "EClass")
- icon_style "Icon"
- line_color 3342489
- fill_color 16777215
- quidu "3903D5BF000A"
- compartment (object Compartment
- Parent_View @15
- location (56, 730)
- font (object Font
- size 10
- face "Arial"
- bold FALSE
- italics FALSE
- underline FALSE
- strike FALSE
- color 0
- default_color TRUE)
- icon_style "Icon"
- anchor 2
- nlines 6
- max_width 452)
- width 546
- height 394
- annotation 8
- autoResize TRUE)
- (object InheritView "" @16
- stereotype TRUE
- line_color 3342489
- quidu "3E5268E201B1"
- client @7
- supplier @15
- line_style 0)
- (object ClassView "Class" "Logical View::ecore::ETypedElement" @17
- ShowCompartmentStereotypes TRUE
- IncludeOperation TRUE
- location (1104, 112)
- font (object Font
- size 10
- face "Arial"
- bold FALSE
- italics TRUE
- underline FALSE
- strike FALSE
- color 0
- default_color TRUE)
- label (object ItemLabel
- Parent_View @17
- location (916, 41)
- nlines 1
- max_width 376
- justify 0
- label "ETypedElement")
- icon_style "Icon"
- line_color 3342489
- fill_color 16777215
- quidu "3903D4F60398"
- width 394
- height 164
- annotation 8
- autoResize TRUE)
- (object InheritView "" @18
- stereotype TRUE
- line_color 3342489
- quidu "400487F90334"
- client @1
- supplier @17
- line_style 0)))
- (object ClassDiagram "Polymorphism"
- quid "38109D000373"
- title "Polymorphism"
- zoom 100
- max_height 28350
- max_width 21600
- origin_x 0
- origin_y 0
- items (list diagram_item_list
- (object ClassView "Class" "Logical View::java::JavaClass" @19
- ShowCompartmentStereotypes TRUE
- location (496, 576)
- font (object Font
- size 10
- face "Arial"
- bold FALSE
- italics FALSE
- underline FALSE
- strike FALSE
- color 0
- default_color TRUE)
- label (object ItemLabel
- Parent_View @19
- location (365, 530)
- fill_color 13434879
- nlines 1
- max_width 262
- justify 0
- label "JavaClass")
- icon_style "Icon"
- line_color 3342489
- fill_color 13434879
- quidu "36549FCC00FA"
- width 280
- height 114
- annotation 8
- autoResize TRUE)
- (object AssociationViewNew "$UNNAMED$3" @20
- location (166, 537)
- stereotype TRUE
- line_color 3342489
- quidu "392A9EB403C6"
- roleview_list (list RoleViews
- (object RoleView "/supertype" @21
- Parent_View @20
- location (-330, 217)
- font (object Font
- size 10
- face "Arial"
- bold FALSE
- italics FALSE
- underline FALSE
- strike FALSE
- color 0
- default_color TRUE)
- label (object SegLabel @22
- Parent_View @21
- location (234, 480)
- font (object Font
- size 10
- face "Arial"
- bold FALSE
- italics FALSE
- underline FALSE
- strike FALSE
- color 0
- default_color TRUE)
- anchor 1
- anchor_loc 1
- nlines 1
- max_width 226
- justify 0
- label "+/supertype"
- pctDist 0.419192
- height 38
- orientation 0)
- stereotype TRUE
- line_color 3342489
- quidu "392A9EB803B7"
- client @20
- supplier @19
- vertices (list Points
- (166, 537)
- (166, 517)
- (356, 517))
- line_style 3
- origin_attachment (166, 537)
- terminal_attachment (356, 517)
- label (object SegLabel @23
- Parent_View @21
- location (334, 464)
- font (object Font
- size 10
- face "Arial"
- bold FALSE
- italics FALSE
- underline FALSE
- strike FALSE
- color 0
- default_color TRUE)
- anchor 2
- anchor_loc 1
- nlines 1
- max_width 15
- justify 0
- label "1"
- pctDist 0.900000
- height 54
- orientation 0))
- (object RoleView "/subtype" @24
- Parent_View @20
- location (-330, 217)
- font (object Font
- size 10
- face "Arial"
- bold FALSE
- italics FALSE
- underline FALSE
- strike FALSE
- color 0
- default_color TRUE)
- label (object SegLabel @25
- Parent_View @24
- location (257, 582)
- font (object Font
- size 10
- face "Arial"
- bold FALSE
- italics FALSE
- underline FALSE
- strike FALSE
- color 0
- default_color TRUE)
- anchor 1
- anchor_loc 1
- nlines 1
- max_width 188
- justify 0
- label "+/subtype"
- pctDist 0.532468
- height 24
- orientation 1)
- stereotype TRUE
- line_color 3342489
- quidu "392A9EB90098"
- client @20
- supplier @19
- vertices (list Points
- (166, 537)
- (166, 558)
- (356, 558))
- line_style 3
- origin_attachment (166, 537)
- terminal_attachment (356, 558)
- label (object SegLabel @26
- Parent_View @24
- location (334, 612)
- font (object Font
- size 10
- face "Arial"
- bold FALSE
- italics FALSE
- underline FALSE
- strike FALSE
- color 0
- default_color TRUE)
- anchor 2
- anchor_loc 1
- nlines 1
- max_width 15
- justify 0
- label "0..n"
- pctDist 0.900000
- height 54
- orientation 1))))
- (object ClassView "Class" "Logical View::java::JavaClass" @27
- ShowCompartmentStereotypes TRUE
- location (1392, 576)
- font (object Font
- size 10
- face "Arial"
- bold FALSE
- italics FALSE
- underline FALSE
- strike FALSE
- color 0
- default_color TRUE)
- label (object ItemLabel
- Parent_View @27
- location (1261, 530)
- fill_color 13434879
- nlines 1
- max_width 262
- justify 0
- label "JavaClass")
- icon_style "Label"
- line_color 3342489
- fill_color 13434879
- quidu "36549FCC00FA"
- width 280
- height 114
- annotation 8
- autoResize TRUE)
- (object AssociationViewNew "Implements" @28
- location (944, 521)
- stereotype TRUE
- line_color 3342489
- quidu "3654A0D70242"
- roleview_list (list RoleViews
- (object RoleView "implementsInterfaces" @29
- Parent_View @28
- location (430, -54)
- font (object Font
- size 10
- face "Arial"
- bold FALSE
- italics FALSE
- underline FALSE
- strike FALSE
- color 0
- default_color TRUE)
- label (object SegLabel @30
- Parent_View @29
- location (839, 488)
- font (object Font
- size 10
- face "Arial"
- bold FALSE
- italics FALSE
- underline FALSE
- strike FALSE
- color 0
- default_color TRUE)
- anchor 1
- anchor_loc 1
- nlines 1
- max_width 407
- justify 0
- label "+implementsInterfaces"
- pctDist -0.343558
- height 34
- orientation 0)
- stereotype TRUE
- line_color 3342489
- quidu "3654A0DA0109"
- client @28
- supplier @27
- line_style 3
- origin_attachment (944, 521)
- terminal_attachment (1252, 521)
- label (object SegLabel @31
- Parent_View @29
- location (1181, 485)
- font (object Font
- size 10
- face "Arial"
- bold FALSE
- italics FALSE
- underline FALSE
- strike FALSE
- color 0
- default_color TRUE)
- anchor 2
- anchor_loc 1
- nlines 1
- max_width 15
- justify 0
- label "0..n"
- pctDist 0.773006
- height 37
- orientation 0))
- (object RoleView "implementedBy" @32
- Parent_View @28
- location (430, -54)
- font (object Font
- size 10
- face "Arial"
- bold FALSE
- italics FALSE
- underline FALSE
- strike FALSE
- color 0
- default_color TRUE)
- label (object SegLabel @33
- Parent_View @32
- location (1087, 575)
- font (object Font
- size 10
- face "Arial"
- bold FALSE
- italics FALSE
- underline FALSE
- strike FALSE
- color 0
- default_color TRUE)
- anchor 1
- anchor_loc 1
- nlines 1
- max_width 312
- justify 0
- label "+implementedBy"
- pctDist -0.470769
- height 54
- orientation 0)
- stereotype TRUE
- line_color 3342489
- quidu "3654A0DA0138"
- client @28
- supplier @19
- line_style 3
- origin_attachment (944, 521)
- terminal_attachment (636, 521)
- label (object SegLabel @34
- Parent_View @32
- location (684, 564)
- font (object Font
- size 10
- face "Arial"
- bold FALSE
- italics FALSE
- underline FALSE
- strike FALSE
- color 0
- default_color TRUE)
- anchor 2
- anchor_loc 1
- nlines 1
- max_width 15
- justify 0
- label "0..n"
- pctDist 0.843230
- height 43
- orientation 0))))
- (object AssociationViewNew "$UNNAMED$4" @35
- location (1750, 601)
- stereotype TRUE
- line_color 3342489
- quidu "392A9F0301AC"
- roleview_list (list RoleViews
- (object RoleView "/supertype" @36
- Parent_View @35
- location (358, 265)
- font (object Font
- size 10
- face "Arial"
- bold FALSE
- italics FALSE
- underline FALSE
- strike FALSE
- color 0
- default_color TRUE)
- label (object SegLabel @37
- Parent_View @36
- location (1721, 640)
- font (object Font
- size 10
- face "Arial"
- bold FALSE
- italics FALSE
- underline FALSE
- strike FALSE
- color 0
- default_color TRUE)
- anchor 1
- anchor_loc 1
- nlines 1
- max_width 226
- justify 0
- label "+/supertype"
- pctDist 0.227273
- height 13
- orientation 0)
- stereotype TRUE
- line_color 3342489
- quidu "392A9F090328"
- client @35
- supplier @27
- vertices (list Points
- (1750, 601)
- (1750, 627)
- (1532, 627))
- line_style 3
- origin_attachment (1750, 601)
- terminal_attachment (1532, 627)
- label (object SegLabel @38
- Parent_View @36
- location (1557, 574)
- font (object Font
- size 10
- face "Arial"
- bold FALSE
- italics FALSE
- underline FALSE
- strike FALSE
- color 0
- default_color TRUE)
- anchor 2
- anchor_loc 1
- nlines 1
- max_width 15
- justify 0
- label "0..n"
- pctDist 0.900000
- height 54
- orientation 1))
- (object RoleView "/subtype" @39
- Parent_View @35
- location (358, 265)
- font (object Font
- size 10
- face "Arial"
- bold FALSE
- italics FALSE
- underline FALSE
- strike FALSE
- color 0
- default_color TRUE)
- label (object SegLabel @40
- Parent_View @39
- location (1626, 553)
- font (object Font
- size 10
- face "Arial"
- bold FALSE
- italics FALSE
- underline FALSE
- strike FALSE
- color 0
- default_color TRUE)
- anchor 1
- anchor_loc 1
- nlines 1
- max_width 188
- justify 0
- label "+/subtype"
- pctDist 0.615970
- height 24
- orientation 1)
- stereotype TRUE
- line_color 3342489
- quidu "392A9F0A001C"
- client @35
- supplier @27
- vertices (list Points
- (1750, 601)
- (1750, 576)
- (1532, 576))
- line_style 3
- origin_attachment (1750, 601)
- terminal_attachment (1532, 576)
- label (object SegLabel @41
- Parent_View @39
- location (1557, 630)
- font (object Font
- size 10
- face "Arial"
- bold FALSE
- italics FALSE
- underline FALSE
- strike FALSE
- color 0
- default_color TRUE)
- anchor 2
- anchor_loc 1
- nlines 1
- max_width 15
- justify 0
- label "0..n"
- pctDist 0.900000
- height 54
- orientation 0))))))
- (object ClassDiagram "Main"
- quid "38109F92000B"
- title "Main"
- zoom 100
- max_height 28350
- max_width 21600
- origin_x 0
- origin_y 2760
- items (list diagram_item_list
- (object NoteView @42
- location (848, 1840)
- font (object Font
- size 10
- face "Arial"
- bold FALSE
- italics FALSE
- underline FALSE
- strike FALSE
- color 0
- default_color TRUE)
- label (object ItemLabel
- Parent_View @42
- location (551, 1718)
- fill_color 13434879
- nlines 4
- max_width 559
- label "This should really be JavaClass and JavaDataType, eClassifier is their closest common ancestor.")
- line_color 3342489
- fill_color 8421631
- width 619
- height 256)
- (object NoteView @43
- location (272, 320)
- font (object Font
- size 10
- face "Arial"
- bold FALSE
- italics FALSE
- underline FALSE
- strike FALSE
- color 0
- default_color TRUE)
- label (object ItemLabel
- Parent_View @43
- location (107, 166)
- fill_color 13434879
- nlines 6
- max_width 295
- label "The classes will be contained by the standard EPackage metaObjects relationship.")
- line_color 3342489
- fill_color 13434879
- width 355
- height 320)
- (object ClassView "Class" "Logical View::java::Field" @44
- ShowCompartmentStereotypes TRUE
- location (1776, 480)
- font (object Font
- size 10
- face "Arial"
- bold FALSE
- italics FALSE
- underline FALSE
- strike FALSE
- color 0
- default_color TRUE)
- label (object ItemLabel
- Parent_View @44
- location (1680, 434)
- fill_color 13434879
- nlines 1
- max_width 192
- justify 0
- label "Field")
- icon_style "Icon"
- line_color 3342489
- fill_color 13434879
- quidu "3654AF8F0280"
- width 210
- height 114
- annotation 8
- autoResize TRUE)
- (object ClassView "Class" "Logical View::java::Initializer" @45
- ShowCompartmentStereotypes TRUE
- IncludeAttribute TRUE
- IncludeOperation TRUE
- location (1568, 224)
- font (object Font
- size 10
- face "Arial"
- bold FALSE
- italics FALSE
- underline FALSE
- strike FALSE
- color 0
- default_color TRUE)
- label (object ItemLabel
- Parent_View @45
- location (1363, 151)
- fill_color 13434879
- nlines 1
- max_width 410
- justify 0
- label "Initializer")
- icon_style "Icon"
- line_color 3342489
- fill_color 13434879
- quidu "3654A5DC00BB"
- compartment (object Compartment
- Parent_View @45
- location (1363, 207)
- font (object Font
- size 10
- face "Arial"
- bold FALSE
- italics FALSE
- underline FALSE
- strike FALSE
- color 0
- default_color TRUE)
- icon_style "Icon"
- fill_color 16777215
- anchor 2
- nlines 2
- max_width 345)
- width 428
- height 168
- annotation 8
- autoResize TRUE)
- (object ClassView "Class" "Logical View::java::JavaPackage" @46
- ShowCompartmentStereotypes TRUE
- IncludeOperation TRUE
- location (608, 96)
- font (object Font
- size 10
- face "Arial"
- bold FALSE
- italics FALSE
- underline FALSE
- strike FALSE
- color 0
- default_color TRUE)
- label (object ItemLabel
- Parent_View @46
- location (447, 50)
- fill_color 13434879
- nlines 1
- max_width 322
- justify 0
- label "JavaPackage")
- icon_style "Label"
- line_color 3342489
- fill_color 13434879
- quidu "38108E0301D2"
- width 340
- height 114
- annotation 8
- autoResize TRUE)
- (object ClassView "Class" "Logical View::java::JavaParameter" @47
- ShowCompartmentStereotypes TRUE
- IncludeAttribute TRUE
- location (1744, 1584)
- font (object Font
- size 10
- face "Arial"
- bold FALSE
- italics FALSE
- underline FALSE
- strike FALSE
- color 0
- default_color TRUE)
- label (object ItemLabel
- Parent_View @47
- location (1344, 1488)
- fill_color 13434879
- nlines 1
- max_width 800
- justify 0
- label "JavaParameter")
- icon_style "Label"
- line_color 3342489
- fill_color 13434879
- quidu "3654AD780280"
- compartment (object Compartment
- Parent_View @47
- location (1344, 1544)
- font (object Font
- size 10
- face "Arial"
- bold FALSE
- italics FALSE
- underline FALSE
- strike FALSE
- color 0
- default_color TRUE)
- icon_style "Icon"
- fill_color 16777215
- anchor 2
- nlines 3
- max_width 678)
- width 818
- height 214
- annotation 8
- autoResize TRUE)
- (object ClassView "Class" "Logical View::java::Method" @48
- ShowCompartmentStereotypes TRUE
- location (1712, 992)
- font (object Font
- size 10
- face "Arial"
- bold FALSE
- italics FALSE
- underline FALSE
- strike FALSE
- color 0
- default_color TRUE)
- label (object ItemLabel
- Parent_View @48
- location (1613, 946)
- fill_color 13434879
- nlines 1
- max_width 198
- justify 0
- label "Method")
- icon_style "Icon"
- line_color 3342489
- fill_color 13434879
- quidu "3654AE910271"
- width 216
- height 114
- annotation 8
- autoResize TRUE)
- (object AssociationViewNew "MethodHas" @49
- location (1700, 1262)
- stereotype TRUE
- line_color 3342489
- quidu "3654AF0302CE"
- roleview_list (list RoleViews
- (object RoleView "method" @50
- Parent_View @49
- location (308, 238)
- font (object Font
- size 10
- face "Arial"
- bold FALSE
- italics FALSE
- underline FALSE
- strike FALSE
- color 0
- default_color TRUE)
- stereotype TRUE
- line_color 3342489
- quidu "3654AF080197"
- client @49
- supplier @48
- line_style 3
- origin_attachment (1700, 1262)
- terminal_attachment (1700, 1049)
- label (object SegLabel @51
- Parent_View @50
- location (1633, 1097)
- font (object Font
- size 10
- face "Arial"
- bold FALSE
- italics FALSE
- underline FALSE
- strike FALSE
- color 0
- default_color TRUE)
- anchor 2
- anchor_loc 1
- nlines 1
- max_width 15
- justify 0
- label "0..1"
- pctDist 0.781659
- height 68
- orientation 0))
- (object RoleView "parameters" @52
- Parent_View @49
- location (308, 238)
- font (object Font
- size 10
- face "Arial"
- bold FALSE
- italics FALSE
- underline FALSE
- strike FALSE
- color 0
- default_color TRUE)
- label (object SegLabel @53
- Parent_View @52
- location (1837, 1433)
- font (object Font
- size 10
- face "Arial"
- bold FALSE
- italics FALSE
- underline FALSE
- strike FALSE
- color 0
- default_color TRUE)
- anchor 1
- anchor_loc 1
- nlines 1
- max_width 235
- justify 0
- label "+parameters"
- pctDist 0.803565
- height 137
- orientation 0)
- stereotype TRUE
- line_color 3342489
- quidu "3654AF080196"
- client @49
- supplier @47
- line_style 3
- origin_attachment (1700, 1262)
- terminal_attachment (1700, 1476)
- label (object SegLabel @54
- Parent_View @52
- location (1636, 1456)
- font (object Font
- size 10
- face "Arial"
- bold FALSE
- italics FALSE
- underline FALSE
- strike FALSE
- color 0
- default_color TRUE)
- anchor 2
- anchor_loc 1
- nlines 1
- max_width 15
- justify 0
- label "0..n"
- pctDist 0.905128
- height 65
- orientation 1)
- label (object SegLabel @55
- Parent_View @52
- location (1592, 1397)
- font (object Font
- size 10
- face "Arial"
- bold FALSE
- italics FALSE
- underline FALSE
- strike FALSE
- color 0
- default_color TRUE)
- anchor 3
- anchor_loc 1
- nlines 1
- max_width 159
- justify 0
- label "{ordered}"
- pctDist 0.628821
- height 109
- orientation 1))))
- (object ClassView "Class" "Logical View::java::JavaEvent" @56
- ShowCompartmentStereotypes TRUE
- IncludeOperation TRUE
- ShowOperationSignature TRUE
- location (2192, 656)
- font (object Font
- size 10
- face "Arial"
- bold FALSE
- italics TRUE
- underline FALSE
- strike FALSE
- color 0
- default_color TRUE)
- label (object ItemLabel
- Parent_View @56
- location (2064, 607)
- fill_color 13434879
- nlines 1
- max_width 256
- justify 0
- label "JavaEvent")
- icon_style "Icon"
- line_color 3342489
- fill_color 13434879
- quidu "3C62FAF103C8"
- width 274
- height 122
- annotation 8
- autoResize TRUE)
- (object ClassView "Class" "Logical View::java::JavaClass" @57
- ShowCompartmentStereotypes TRUE
- IncludeAttribute TRUE
- location (560, 672)
- font (object Font
- size 10
- face "Arial"
- bold FALSE
- italics FALSE
- underline FALSE
- strike FALSE
- color 0
- default_color TRUE)
- label (object ItemLabel
- Parent_View @57
- location (374, 554)
- fill_color 13434879
- nlines 1
- max_width 372
- justify 0
- label "JavaClass")
- icon_style "Icon"
- line_color 3342489
- fill_color 13434879
- quidu "36549FCC00FA"
- compartment (object Compartment
- Parent_View @57
- location (374, 610)
- font (object Font
- size 10
- face "Arial"
- bold FALSE
- italics FALSE
- underline FALSE
- strike FALSE
- color 0
- default_color TRUE)
- icon_style "Icon"
- fill_color 16777215
- anchor 2
- nlines 4
- max_width 313)
- width 390
- height 258
- annotation 8
- autoResize TRUE)
- (object AssociationViewNew "$UNNAMED$1" @58
- location (1213, 538)
- stereotype TRUE
- line_color 3342489
- quidu "382A29BD0219"
- roleview_list (list RoleViews
- (object RoleView "fields" @59
- Parent_View @58
- location (733, 282)
- font (object Font
- size 10
- face "Arial"
- bold FALSE
- italics FALSE
- underline FALSE
- strike FALSE
- color 0
- default_color TRUE)
- label (object SegLabel @60
- Parent_View @59
- location (1511, 513)
- font (object Font
- size 10
- face "Arial"
- bold FALSE
- italics FALSE
- underline FALSE
- strike FALSE
- color 0
- default_color TRUE)
- anchor 1
- anchor_loc 1
- nlines 1
- max_width 192
- justify 0
- label "+fields"
- pctDist 0.653017
- height 26
- orientation 0)
- stereotype TRUE
- line_color 3342489
- quidu "382A29BE0350"
- client @58
- supplier @44
- line_style 3
- origin_attachment (1213, 538)
- terminal_attachment (1671, 538)
- label (object SegLabel @61
- Parent_View @59
- location (1624, 485)
- font (object Font
- size 10
- face "Arial"
- bold FALSE
- italics FALSE
- underline FALSE
- strike FALSE
- color 0
- default_color TRUE)
- anchor 2
- anchor_loc 1
- nlines 1
- max_width 15
- justify 0
- label "0..n"
- pctDist 0.900000
- height 54
- orientation 0))
- (object RoleView "javaClass" @62
- Parent_View @58
- location (733, 282)
- stereotype TRUE
- line_color 3342489
- quidu "382A29BE03BF"
- client @58
- supplier @57
- line_style 3
- origin_attachment (1213, 538)
- terminal_attachment (755, 538))))
- (object AssociationViewNew "$UNNAMED$5" @63
- location (916, 307)
- stereotype TRUE
- line_color 3342489
- quidu "392AA09503E5"
- roleview_list (list RoleViews
- (object RoleView "initializers" @64
- Parent_View @63
- location (276, 99)
- font (object Font
- size 10
- face "Arial"
- bold FALSE
- italics FALSE
- underline FALSE
- strike FALSE
- color 0
- default_color TRUE)
- label (object SegLabel @65
- Parent_View @64
- location (1096, 216)
- font (object Font
- size 10
- face "Arial"
- bold FALSE
- italics FALSE
- underline FALSE
- strike FALSE
- color 0
- default_color TRUE)
- anchor 1
- anchor_loc 1
- nlines 1
- max_width 212
- justify 0
- label "+initializers"
- pctDist 0.410719
- height 92
- orientation 0)
- stereotype TRUE
- line_color 3342489
- quidu "392AA0970153"
- client @63
- supplier @45
- line_style 3
- origin_attachment (916, 307)
- terminal_attachment (1354, 307)
- label (object SegLabel @66
- Parent_View @64
- location (1345, 368)
- font (object Font
- size 10
- face "Arial"
- bold FALSE
- italics FALSE
- underline FALSE
- strike FALSE
- color 0
- default_color TRUE)
- anchor 2
- anchor_loc 1
- nlines 1
- max_width 15
- justify 0
- label "0..n"
- pctDist 0.979687
- height 61
- orientation 1))
- (object RoleView "javaClass" @67
- Parent_View @63
- location (276, 99)
- stereotype TRUE
- line_color 3342489
- quidu "392AA097015D"
- client @63
- supplier @57
- vertices (list Points
- (916, 307)
- (713, 307)
- (713, 543))
- line_style 3
- origin_attachment (916, 307)
- terminal_attachment (713, 543))))
- (object AssociationViewNew "$UNNAMED$6" @68
- location (206, 642)
- stereotype TRUE
- line_color 3342489
- quidu "392AA21200C2"
- roleview_list (list RoleViews
- (object RoleView "declaredClasses" @69
- Parent_View @68
- location (-578, 274)
- font (object Font
- size 10
- face "Arial"
- bold FALSE
- italics FALSE
- underline FALSE
- strike FALSE
- color 0
- default_color TRUE)
- label (object SegLabel @70
- Parent_View @69
- location (240, 582)
- font (object Font
- size 10
- face "Arial"
- bold FALSE
- italics FALSE
- underline FALSE
- strike FALSE
- color 0
- default_color TRUE)
- anchor 1
- anchor_loc 1
- nlines 1
- max_width 325
- justify 0
- label "+declaredClasses"
- pctDist 0.343195
- height 31
- orientation 0)
- stereotype TRUE
- line_color 3342489
- quidu "392AA21701D8"
- client @68
- supplier @57
- vertices (list Points
- (206, 642)
- (206, 612)
- (365, 612))
- line_style 3
- origin_attachment (206, 642)
- terminal_attachment (365, 612)
- label (object SegLabel @71
- Parent_View @69
- location (347, 556)
- font (object Font
- size 10
- face "Arial"
- bold FALSE
- italics FALSE
- underline FALSE
- strike FALSE
- color 0
- default_color TRUE)
- anchor 2
- anchor_loc 1
- nlines 1
- max_width 15
- justify 0
- label "0..n"
- pctDist 0.902367
- height 57
- orientation 0))
- (object RoleView "declaringClass" @72
- Parent_View @68
- location (-578, 274)
- font (object Font
- size 10
- face "Arial"
- bold FALSE
- italics FALSE
- underline FALSE
- strike FALSE
- color 0
- default_color TRUE)
- label (object SegLabel @73
- Parent_View @72
- location (258, 675)
- font (object Font
- size 10
- face "Arial"
- bold FALSE
- italics FALSE
- underline FALSE
- strike FALSE
- color 0
- default_color TRUE)
- anchor 1
- anchor_loc 1
- nlines 1
- max_width 298
- justify 0
- label "+declaringClass"
- pctDist 0.434286
- height 3
- orientation 1)
- stereotype TRUE
- line_color 3342489
- quidu "392AA21702DC"
- client @68
- supplier @57
- vertices (list Points
- (206, 642)
- (206, 672)
- (365, 672))
- line_style 3
- origin_attachment (206, 642)
- terminal_attachment (365, 672)
- label (object SegLabel @74
- Parent_View @72
- location (345, 726)
- font (object Font
- size 10
- face "Arial"
- bold FALSE
- italics FALSE
- underline FALSE
- strike FALSE
- color 0
- default_color TRUE)
- anchor 2
- anchor_loc 1
- nlines 1
- max_width 15
- justify 0
- label "0..1"
- pctDist 0.900000
- height 54
- orientation 1))))
- (object AssociationViewNew "$UNNAMED$7" @75
- location (603, 347)
- font (object Font
- size 10
- face "Arial"
- bold FALSE
- italics FALSE
- underline FALSE
- strike FALSE
- color 0
- default_color TRUE)
- stereotype (object SegLabel @76
- Parent_View @75
- location (603, 228)
- font (object Font
- size 10
- face "Arial"
- bold FALSE
- italics FALSE
- underline FALSE
- strike FALSE
- color 0
- default_color TRUE)
- anchor 10
- anchor_loc 1
- nlines 1
- max_width 450
- justify 0
- label "<<derived>>"
- pctDist 0.500000
- height 120
- orientation 0)
- line_color 3342489
- quidu "392AA2A701C1"
- roleview_list (list RoleViews
- (object RoleView "javaClasses" @77
- Parent_View @75
- location (27, 219)
- font (object Font
- size 10
- face "Arial"
- bold FALSE
- italics FALSE
- underline FALSE
- strike FALSE
- color 0
- default_color TRUE)
- label (object SegLabel @78
- Parent_View @77
- location (720, 419)
- font (object Font
- size 10
- face "Arial"
- bold FALSE
- italics FALSE
- underline FALSE
- strike FALSE
- color 0
- default_color TRUE)
- anchor 1
- anchor_loc 1
- nlines 1
- max_width 248
- justify 0
- label "+javaClasses"
- pctDist 0.367521
- height 117
- orientation 0)
- stereotype TRUE
- line_color 3342489
- quidu "392AA2A80367"
- client @75
- supplier @57
- line_style 3
- origin_attachment (603, 347)
- terminal_attachment (603, 543)
- label (object SegLabel @79
- Parent_View @77
- location (657, 522)
- font (object Font
- size 10
- face "Arial"
- bold FALSE
- italics FALSE
- underline FALSE
- strike FALSE
- color 0
- default_color TRUE)
- anchor 2
- anchor_loc 1
- nlines 1
- max_width 15
- justify 0
- label "0..n"
- pctDist 0.900000
- height 54
- orientation 0))
- (object RoleView "javaPackage" @80
- Parent_View @75
- location (27, 219)
- font (object Font
- size 10
- face "Arial"
- bold FALSE
- italics FALSE
- underline FALSE
- strike FALSE
- color 0
- default_color TRUE)
- label (object SegLabel @81
- Parent_View @80
- location (482, 179)
- font (object Font
- size 10
- face "Arial"
- bold FALSE
- italics FALSE
- underline FALSE
- strike FALSE
- color 0
- default_color TRUE)
- anchor 1
- anchor_loc 1
- nlines 1
- max_width 263
- justify 0
- label "+javaPackage"
- pctDist 0.862903
- height 122
- orientation 0)
- stereotype TRUE
- line_color 3342489
- quidu "392AA2A90083"
- client @75
- supplier @46
- line_style 3
- origin_attachment (603, 347)
- terminal_attachment (603, 152)
- label (object SegLabel @82
- Parent_View @80
- location (657, 172)
- font (object Font
- size 10
- face "Arial"
- bold FALSE
- italics FALSE
- underline FALSE
- strike FALSE
- color 0
- default_color TRUE)
- anchor 2
- anchor_loc 1
- nlines 1
- max_width 15
- justify 0
- label "0..1"
- pctDist 0.900000
- height 54
- orientation 1))))
- (object AttachView "" @83
- stereotype TRUE
- line_color 3342489
- client @43
- supplier @75
- line_style 0)
- (object AssociationViewNew "$UNNAMED$0" @84
- location (616, 1524)
- font (object Font
- size 10
- face "Arial"
- bold FALSE
- italics FALSE
- underline FALSE
- strike FALSE
- color 0
- default_color TRUE)
- label (object SegLabel @85
- Parent_View @84
- location (616, 1465)
- font (object Font
- size 10
- face "Arial"
- bold FALSE
- italics TRUE
- underline FALSE
- strike FALSE
- color 0
- default_color TRUE)
- hidden TRUE
- anchor 1
- anchor_loc 1
- nlines 1
- max_width 600
- justify 0
- label ""
- pctDist 0.500000
- height 60
- orientation 0)
- stereotype TRUE
- line_color 3342489
- quidu "3654B08801A5"
- roleview_list (list RoleViews
- (object RoleView "/typedElement" @86
- Parent_View @84
- location (56, 948)
- font (object Font
- size 10
- face "Arial"
- bold FALSE
- italics FALSE
- underline FALSE
- strike FALSE
- color 0
- default_color TRUE)
- stereotype TRUE
- line_color 3342489
- quidu "3654B091008C"
- client @84
- supplier @47
- vertices (list Points
- (616, 1524)
- (616, 1584)
- (1335, 1584))
- line_style 3
- origin_attachment (616, 1524)
- terminal_attachment (1335, 1584)
- label (object SegLabel @87
- Parent_View @86
- location (1256, 1531)
- font (object Font
- size 10
- face "Arial"
- bold FALSE
- italics FALSE
- underline FALSE
- strike FALSE
- color 0
- default_color TRUE)
- anchor 2
- anchor_loc 1
- nlines 1
- max_width 15
- justify 0
- label "1"
- pctDist 0.900000
- height 54
- orientation 0))
- (object RoleView "/type" @88
- Parent_View @84
- location (56, 948)
- font (object Font
- size 10
- face "Arial"
- bold FALSE
- italics FALSE
- underline FALSE
- strike FALSE
- color 0
- default_color TRUE)
- label (object SegLabel @89
- Parent_View @88
- location (697, 1099)
- font (object Font
- size 10
- face "Arial"
- bold FALSE
- italics FALSE
- underline FALSE
- strike FALSE
- color 0
- default_color TRUE)
- anchor 1
- anchor_loc 1
- nlines 1
- max_width 116
- justify 0
- label "+/type"
- pctDist 0.588161
- height 81
- orientation 1)
- stereotype TRUE
- line_color 3342489
- quidu "3654B091007D"
- client @84
- supplier @57
- line_style 3
- origin_attachment (616, 1524)
- terminal_attachment (616, 801))))
- (object AssociationViewNew "$UNNAMED$2" @90
- location (1088, 961)
- stereotype TRUE
- line_color 3342489
- quidu "382A29C0017D"
- roleview_list (list RoleViews
- (object RoleView "methods" @91
- Parent_View @90
- location (608, 705)
- font (object Font
- size 10
- face "Arial"
- bold FALSE
- italics FALSE
- underline FALSE
- strike FALSE
- color 0
- default_color TRUE)
- label (object SegLabel @92
- Parent_View @91
- location (1409, 889)
- font (object Font
- size 10
- face "Arial"
- bold FALSE
- italics FALSE
- underline FALSE
- strike FALSE
- color 0
- default_color TRUE)
- anchor 1
- anchor_loc 1
- nlines 1
- max_width 192
- justify 0
- label "+methods"
- pctDist 0.624023
- height 73
- orientation 0)
- stereotype TRUE
- line_color 3342489
- quidu "382A29C10174"
- client @90
- supplier @48
- line_style 3
- origin_attachment (1088, 961)
- terminal_attachment (1604, 961)
- label (object SegLabel @93
- Parent_View @91
- location (1483, 1017)
- font (object Font
- size 10
- face "Arial"
- bold FALSE
- italics FALSE
- underline FALSE
- strike FALSE
- color 0
- default_color TRUE)
- anchor 2
- anchor_loc 1
- nlines 1
- max_width 15
- justify 0
- label "0..n"
- pctDist 0.766040
- height 56
- orientation 1))
- (object RoleView "javaClass" @94
- Parent_View @90
- location (608, 705)
- stereotype TRUE
- line_color 3342489
- quidu "382A29C1020A"
- client @90
- supplier @57
- vertices (list Points
- (1088, 961)
- (732, 961)
- (732, 801))
- line_style 3
- origin_attachment (1088, 961)
- terminal_attachment (732, 801))))
- (object AssociationViewNew "MethodThrows" @95
- location (1047, 981)
- stereotype TRUE
- line_color 3342489
- quidu "3810B61B0178"
- roleview_list (list RoleViews
- (object RoleView "method" @96
- Parent_View @95
- location (487, 405)
- stereotype TRUE
- line_color 3342489
- quidu "3810B61E0227"
- client @95
- supplier @48
- line_style 3
- origin_attachment (1047, 981)
- terminal_attachment (1604, 981))
- (object RoleView "javaExceptions" @97
- Parent_View @95
- location (487, 405)
- font (object Font
- size 10
- face "Arial"
- bold FALSE
- italics FALSE
- underline FALSE
- strike FALSE
- color 0
- default_color TRUE)
- label (object SegLabel @98
- Parent_View @97
- location (733, 945)
- font (object Font
- size 10
- face "Arial"
- bold FALSE
- italics FALSE
- underline FALSE
- strike FALSE
- color 0
- default_color TRUE)
- anchor 1
- anchor_loc 1
- nlines 1
- max_width 312
- justify 0
- label "+javaExceptions"
- pctDist 0.563664
- height 37
- orientation 1)
- stereotype TRUE
- line_color 3342489
- quidu "3810B61E01C3"
- client @95
- supplier @57
- vertices (list Points
- (1047, 981)
- (669, 981)
- (669, 801))
- line_style 3
- origin_attachment (1047, 981)
- terminal_attachment (669, 801)
- label (object SegLabel @99
- Parent_View @97
- location (723, 857)
- font (object Font
- size 10
- face "Arial"
- bold FALSE
- italics FALSE
- underline FALSE
- strike FALSE
- color 0
- default_color TRUE)
- anchor 2
- anchor_loc 1
- nlines 1
- max_width 15
- justify 0
- label "0..n"
- pctDist 0.900000
- height 54
- orientation 1))))
- (object AssociationViewNew "$UNNAMED$11" @100
- location (1541, 806)
- font (object Font
- size 10
- face "Arial"
- bold FALSE
- italics FALSE
- underline FALSE
- strike FALSE
- color 0
- default_color TRUE)
- stereotype TRUE
- line_color 3342489
- quidu "3C62FBE00168"
- roleview_list (list RoleViews
- (object RoleView "events" @101
- Parent_View @100
- location (981, 134)
- font (object Font
- size 10
- face "Arial"
- bold FALSE
- italics FALSE
- underline FALSE
- strike FALSE
- color 0
- default_color TRUE)
- label (object SegLabel @102
- Parent_View @101
- location (2169, 765)
- font (object Font
- size 10
- face "Arial"
- bold FALSE
- italics FALSE
- underline FALSE
- strike FALSE
- color 0
- default_color TRUE)
- anchor 1
- anchor_loc 1
- nlines 1
- max_width 144
- justify 0
- label "+events"
- pctDist 0.800000
- height 42
- orientation 0)
- stereotype TRUE
- line_color 3342489
- quidu "3C62FBE2008F"
- client @100
- supplier @56
- vertices (list Points
- (1541, 806)
- (2238, 806)
- (2238, 717))
- line_style 3
- origin_attachment (1541, 806)
- terminal_attachment (2238, 717)
- label (object SegLabel @103
- Parent_View @101
- location (2292, 796)
- font (object Font
- size 10
- face "Arial"
- bold FALSE
- italics FALSE
- underline FALSE
- strike FALSE
- color 0
- default_color TRUE)
- anchor 2
- anchor_loc 1
- nlines 1
- max_width 15
- justify 0
- label "0..n"
- pctDist 0.900000
- height 54
- orientation 1))
- (object RoleView "$UNNAMED$12" @104
- Parent_View @100
- location (981, 134)
- stereotype TRUE
- line_color 3342489
- quidu "3C62FBE20091"
- client @100
- supplier @57
- line_style 3
- origin_attachment (1541, 806)
- terminal_attachment (755, 806))))
- (object AssociationViewNew "$UNNAMED$13" @105
- location (1405, 663)
- font (object Font
- size 10
- face "Arial"
- bold FALSE
- italics FALSE
- underline FALSE
- strike FALSE
- color 0
- default_color TRUE)
- stereotype TRUE
- line_color 3342489
- quidu "3C8938770253"
- roleview_list (list RoleViews
- (object RoleView "allEvents" @106
- Parent_View @105
- location (845, -9)
- font (object Font
- size 10
- face "Arial"
- bold FALSE
- italics FALSE
- underline FALSE
- strike FALSE
- color 0
- default_color TRUE)
- label (object SegLabel @107
- Parent_View @106
- location (1925, 622)
- font (object Font
- size 10
- face "Arial"
- bold FALSE
- italics FALSE
- underline FALSE
- strike FALSE
- color 0
- default_color TRUE)
- anchor 1
- anchor_loc 1
- nlines 1
- max_width 193
- justify 0
- label "+allEvents"
- pctDist 0.800000
- height 42
- orientation 0)
- stereotype TRUE
- line_color 3342489
- quidu "3C89387802CC"
- client @105
- supplier @56
- line_style 3
- origin_attachment (1405, 663)
- terminal_attachment (2055, 663)
- label (object SegLabel @108
- Parent_View @106
- location (1975, 702)
- font (object Font
- size 10
- face "Arial"
- bold FALSE
- italics FALSE
- underline FALSE
- strike FALSE
- color 0
- default_color TRUE)
- anchor 2
- anchor_loc 1
- nlines 1
- max_width 15
- justify 0
- label "0..n"
- pctDist 0.876336
- height 39
- orientation 1))
- (object RoleView "$UNNAMED$14" @109
- Parent_View @105
- location (845, -9)
- stereotype TRUE
- line_color 3342489
- quidu "3C89387802CE"
- client @105
- supplier @57
- line_style 3
- origin_attachment (1405, 663)
- terminal_attachment (755, 663))))
- (object ClassView "Class" "Logical View::ecore::EClassifier" @110
- ShowCompartmentStereotypes TRUE
- IncludeAttribute TRUE
- IncludeOperation TRUE
- location (448, 2256)
- font (object Font
- size 10
- face "Arial"
- bold FALSE
- italics TRUE
- underline FALSE
- strike FALSE
- color 0
- default_color TRUE)
- label (object ItemLabel
- Parent_View @110
- location (130, 2059)
- nlines 1
- max_width 636
- justify 0
- label "EClassifier")
- icon_style "Icon"
- line_color 3342489
- fill_color 16777215
- quidu "3ACE4FEE0371"
- compartment (object Compartment
- Parent_View @110
- location (130, 2162)
- font (object Font
- size 10
- face "Arial"
- bold FALSE
- italics TRUE
- underline FALSE
- strike FALSE
- color 0
- default_color TRUE)
- icon_style "Icon"
- anchor 2
- nlines 6
- max_width 538)
- width 654
- height 418
- annotation 8
- autoResize TRUE)
- (object ClassView "Class" "Logical View::java::ArrayType" @111
- ShowCompartmentStereotypes TRUE
- IncludeAttribute TRUE
- location (352, 1328)
- font (object Font
- size 10
- face "Arial"
- bold FALSE
- italics FALSE
- underline FALSE
- strike FALSE
- color 0
- default_color TRUE)
- label (object ItemLabel
- Parent_View @111
- location (112, 1255)
- fill_color 13434879
- nlines 1
- max_width 480
- justify 0
- label "ArrayType")
- icon_style "Label"
- line_color 3342489
- fill_color 13434879
- quidu "3A9D79ED01DF"
- compartment (object Compartment
- Parent_View @111
- location (112, 1311)
- font (object Font
- size 10
- face "Arial"
- bold FALSE
- italics FALSE
- underline FALSE
- strike FALSE
- color 0
- default_color TRUE)
- icon_style "Icon"
- fill_color 16777215
- anchor 2
- nlines 2
- max_width 405)
- width 498
- height 168
- annotation 8
- autoResize TRUE)
- (object InheritView "" @112
- stereotype TRUE
- line_color 3342489
- quidu "3A9D79FD010F"
- client @111
- supplier @57
- line_style 3
- origin_attachment (431, 1243)
- terminal_attachment (431, 801))
- (object AssociationViewNew "$UNNAMED$15" @113
- location (393, 1729)
- font (object Font
- size 10
- face "Arial"
- bold FALSE
- italics FALSE
- underline FALSE
- strike FALSE
- color 0
- default_color TRUE)
- stereotype TRUE
- line_color 3342489
- quidu "3DF4CAAD01A3"
- roleview_list (list RoleViews
- (object RoleView "componentType" @114
- Parent_View @113
- location (-55, 385)
- font (object Font
- size 10
- face "Arial"
- bold FALSE
- italics FALSE
- underline FALSE
- strike FALSE
- color 0
- default_color TRUE)
- label (object SegLabel @115
- Parent_View @114
- location (378, 1986)
- font (object Font
- size 10
- face "Arial"
- bold FALSE
- italics FALSE
- underline FALSE
- strike FALSE
- color 0
- default_color TRUE)
- anchor 1
- anchor_loc 1
- nlines 1
- max_width 328
- justify 0
- label "+componentType"
- pctDist 0.800000
- height 42
- orientation 1)
- stereotype TRUE
- line_color 3342489
- quidu "3DF4CAAE01EB"
- client @113
- supplier @110
- line_style 0
- label (object SegLabel @116
- Parent_View @114
- location (477, 2008)
- font (object Font
- size 10
- face "Arial"
- bold FALSE
- italics FALSE
- underline FALSE
- strike FALSE
- color 0
- default_color TRUE)
- anchor 2
- anchor_loc 1
- nlines 1
- max_width 15
- justify 0
- label "1"
- pctDist 0.900000
- height 54
- orientation 0))
- (object RoleView "$UNNAMED$16" @117
- Parent_View @113
- location (-55, 385)
- stereotype TRUE
- line_color 3342489
- quidu "3DF4CAAE01F5"
- client @113
- supplier @111
- line_style 0)))
- (object ClassView "Class" "Logical View::ecore::EStructuralFeature" @118
- ShowCompartmentStereotypes TRUE
- location (2224, 224)
- font (object Font
- size 10
- face "Arial"
- bold FALSE
- italics TRUE
- underline FALSE
- strike FALSE
- color 0
- default_color TRUE)
- label (object ItemLabel
- Parent_View @118
- location (2033, 145)
- nlines 1
- max_width 382
- justify 0
- label "EStructuralFeature")
- icon_style "Icon"
- line_color 3342489
- fill_color 16777215
- quidu "3903D59D0230"
- width 400
- height 182
- annotation 8
- autoResize TRUE)
- (object InheritView "" @119
- stereotype TRUE
- line_color 3342489
- quidu "3DF4CE830390"
- client @56
- supplier @118
- line_style 0)))
- (object ClassDiagram "Imports"
- quid "3810A0DC015D"
- title "Imports"
- zoom 100
- max_height 28350
- max_width 21600
- origin_x 0
- origin_y 0
- items (list diagram_item_list
- (object ClassView "Class" "Logical View::java::JavaClass" @120
- ShowCompartmentStereotypes TRUE
- location (320, 672)
- font (object Font
- size 10
- face "Arial"
- bold FALSE
- italics FALSE
- underline FALSE
- strike FALSE
- color 0
- default_color TRUE)
- label (object ItemLabel
- Parent_View @120
- location (189, 626)
- fill_color 13434879
- nlines 1
- max_width 262
- justify 0
- label "JavaClass")
- icon_style "Icon"
- line_color 3342489
- fill_color 13434879
- quidu "36549FCC00FA"
- width 280
- height 114
- annotation 8
- autoResize TRUE)
- (object AssociationViewNew "ClassImports" @121
- location (643, 1115)
- font (object Font
- size 10
- face "Arial"
- bold FALSE
- italics FALSE
- underline FALSE
- strike FALSE
- color 0
- default_color TRUE)
- label (object SegLabel @122
- Parent_View @121
- location (677, 1040)
- font (object Font
- size 10
- face "Arial"
- bold FALSE
- italics TRUE
- underline FALSE
- strike FALSE
- color 0
- default_color TRUE)
- anchor 1
- anchor_loc 1
- nlines 1
- max_width 600
- justify 0
- label "ClassImports"
- pctDist 1.066667
- height 76
- orientation 0)
- stereotype TRUE
- line_color 3342489
- quidu "3829C4BF000D"
- roleview_list (list RoleViews
- (object RoleView "classImport" @123
- Parent_View @121
- location (227, 331)
- font (object Font
- size 10
- face "Arial"
- bold FALSE
- italics FALSE
- underline FALSE
- strike FALSE
- color 0
- default_color TRUE)
- label (object SegLabel @124
- Parent_View @123
- location (665, 671)
- font (object Font
- size 10
- face "Arial"
- bold FALSE
- italics FALSE
- underline FALSE
- strike FALSE
- color 0
- default_color TRUE)
- anchor 1
- anchor_loc 1
- nlines 1
- max_width 240
- justify 0
- label "+classImport"
- pctDist 0.727154
- height 2
- orientation 1)
- stereotype TRUE
- line_color 3342489
- quidu "3829C4BF000E"
- client @121
- supplier @120
- vertices (list Points
- (643, 1115)
- (703, 1115)
- (703, 672)
- (460, 672))
- line_style 3
- origin_attachment (643, 1115)
- terminal_attachment (460, 672)
- label (object SegLabel @125
- Parent_View @123
- location (525, 723)
- font (object Font
- size 10
- face "Arial"
- bold FALSE
- italics FALSE
- underline FALSE
- strike FALSE
- color 0
- default_color TRUE)
- anchor 2
- anchor_loc 1
- nlines 1
- max_width 15
- justify 0
- label "0..n"
- pctDist 0.914676
- height 51
- orientation 0)
- label (object SegLabel @126
- Parent_View @123
- location (742, 737)
- font (object Font
- size 10
- face "Arial"
- bold FALSE
- italics FALSE
- underline FALSE
- strike FALSE
- color 0
- default_color TRUE)
- anchor 3
- anchor_loc 1
- nlines 1
- max_width 159
- justify 0
- label "{ordered}"
- pctDist 0.587467
- height 39
- orientation 1))
- (object RoleView "importedBy" @127
- Parent_View @121
- location (227, 331)
- font (object Font
- size 10
- face "Arial"
- bold FALSE
- italics FALSE
- underline FALSE
- strike FALSE
- color 0
- default_color TRUE)
- label (object SegLabel @128
- Parent_View @127
- location (330, 936)
- font (object Font
- size 10
- face "Arial"
- bold FALSE
- italics FALSE
- underline FALSE
- strike FALSE
- color 0
- default_color TRUE)
- anchor 1
- anchor_loc 1
- nlines 1
- max_width 240
- justify 0
- label "+importedBy"
- pctDist 0.708040
- height 10
- orientation 1)
- stereotype TRUE
- line_color 3342489
- quidu "3829C4BF000F"
- client @121
- supplier @120
- vertices (list Points
- (643, 1115)
- (320, 1115)
- (320, 729))
- line_style 3
- origin_attachment (643, 1115)
- terminal_attachment (320, 729)
- label (object SegLabel @129
- Parent_View @127
- location (280, 802)
- font (object Font
- size 10
- face "Arial"
- bold FALSE
- italics FALSE
- underline FALSE
- strike FALSE
- color 0
- default_color TRUE)
- anchor 2
- anchor_loc 1
- nlines 1
- max_width 15
- justify 0
- label "0..n"
- pctDist 0.897611
- height 41
- orientation 0))))
- (object ClassView "Class" "Logical View::java::JavaPackage" @130
- ShowCompartmentStereotypes TRUE
- IncludeAttribute TRUE
- IncludeOperation TRUE
- location (1408, 224)
- font (object Font
- size 10
- face "Arial"
- bold FALSE
- italics FALSE
- underline FALSE
- strike FALSE
- color 0
- default_color TRUE)
- label (object ItemLabel
- Parent_View @130
- location (1247, 178)
- fill_color 13434879
- nlines 1
- max_width 322
- justify 0
- label "JavaPackage")
- icon_style "Icon"
- line_color 3342489
- fill_color 13434879
- quidu "38108E0301D2"
- width 340
- height 114
- annotation 8
- autoResize TRUE)
- (object AssociationViewNew "PackageImports" @131
- location (1023, 382)
- font (object Font
- size 10
- face "Arial"
- bold FALSE
- italics FALSE
- underline FALSE
- strike FALSE
- color 0
- default_color TRUE)
- label (object SegLabel @132
- Parent_View @131
- location (1038, 419)
- font (object Font
- size 10
- face "Arial"
- bold FALSE
- italics TRUE
- underline FALSE
- strike FALSE
- color 0
- default_color TRUE)
- anchor 1
- anchor_loc 1
- nlines 1
- max_width 600
- justify 0
- label "PackageImports"
- pctDist 0.750000
- height 37
- orientation 1)
- stereotype TRUE
- line_color 3342489
- quidu "3829C4EC0207"
- roleview_list (list RoleViews
- (object RoleView "importedBy" @133
- Parent_View @131
- location (-417, -306)
- font (object Font
- size 10
- face "Arial"
- bold FALSE
- italics FALSE
- underline FALSE
- strike FALSE
- color 0
- default_color TRUE)
- label (object SegLabel @134
- Parent_View @133
- location (648, 430)
- font (object Font
- size 10
- face "Arial"
- bold FALSE
- italics FALSE
- underline FALSE
- strike FALSE
- color 0
- default_color TRUE)
- anchor 1
- anchor_loc 1
- nlines 1
- max_width 240
- justify 0
- label "+importedBy"
- pctDist 0.646526
- height 41
- orientation 1)
- stereotype TRUE
- line_color 3342489
- quidu "3829C4EE0105"
- client @131
- supplier @120
- vertices (list Points
- (1023, 382)
- (1023, 255)
- (413, 614))
- line_style 0
- label (object SegLabel @135
- Parent_View @133
- location (512, 618)
- font (object Font
- size 10
- face "Arial"
- bold FALSE
- italics FALSE
- underline FALSE
- strike FALSE
- color 0
- default_color TRUE)
- anchor 2
- anchor_loc 1
- nlines 1
- max_width 15
- justify 0
- label "0..n"
- pctDist 0.900000
- height 54
- orientation 0))
- (object RoleView "packageImports" @136
- Parent_View @131
- location (-417, -306)
- font (object Font
- size 10
- face "Arial"
- bold FALSE
- italics FALSE
- underline FALSE
- strike FALSE
- color 0
- default_color TRUE)
- label (object SegLabel @137
- Parent_View @136
- location (1223, 579)
- font (object Font
- size 10
- face "Arial"
- bold FALSE
- italics FALSE
- underline FALSE
- strike FALSE
- color 0
- default_color TRUE)
- anchor 1
- anchor_loc 1
- nlines 1
- max_width 312
- justify 0
- label "+packageImports"
- pctDist 0.522472
- height 40
- orientation 0)
- stereotype TRUE
- line_color 3342489
- quidu "3829C4EE00FB"
- client @131
- supplier @130
- vertices (list Points
- (1023, 382)
- (1023, 618)
- (1265, 618)
- (1386, 281))
- line_style 0
- label (object SegLabel @138
- Parent_View @136
- location (1409, 378)
- font (object Font
- size 10
- face "Arial"
- bold FALSE
- italics FALSE
- underline FALSE
- strike FALSE
- color 0
- default_color TRUE)
- anchor 2
- anchor_loc 1
- nlines 1
- max_width 15
- justify 0
- label "0..n"
- pctDist 0.900000
- height 54
- orientation 1)
- label (object SegLabel @139
- Parent_View @136
- location (1424, 500)
- font (object Font
- size 10
- face "Arial"
- bold FALSE
- italics FALSE
- underline FALSE
- strike FALSE
- color 0
- default_color TRUE)
- anchor 3
- anchor_loc 1
- nlines 1
- max_width 159
- justify 0
- label "{ordered}"
- pctDist 0.769663
- height 109
- orientation 1))))))
- (object ClassDiagram "Source code"
- quid "3810A13B0159"
- title "Source code"
- zoom 100
- max_height 28350
- max_width 21600
- origin_x 0
- origin_y 0
- items (list diagram_item_list
- (object ClassView "Class" "Logical View::java::Comment" @140
- ShowCompartmentStereotypes TRUE
- IncludeAttribute TRUE
- IncludeOperation TRUE
- location (592, 688)
- font (object Font
- size 10
- face "Arial"
- bold FALSE
- italics FALSE
- underline FALSE
- strike FALSE
- color 0
- default_color TRUE)
- label (object ItemLabel
- Parent_View @140
- location (475, 642)
- fill_color 13434879
- nlines 1
- max_width 234
- justify 0
- label "Comment")
- icon_style "Icon"
- line_color 3342489
- fill_color 13434879
- quidu "380F889B02B8"
- width 252
- height 114
- annotation 8
- autoResize TRUE)
- (object ClassView "Class" "Logical View::java::Statement" @141
- ShowCompartmentStereotypes TRUE
- IncludeAttribute TRUE
- IncludeOperation TRUE
- location (1104, 688)
- font (object Font
- size 10
- face "Arial"
- bold FALSE
- italics FALSE
- underline FALSE
- strike FALSE
- color 0
- default_color TRUE)
- label (object ItemLabel
- Parent_View @141
- location (983, 642)
- fill_color 13434879
- nlines 1
- max_width 242
- justify 0
- label "Statement")
- icon_style "Icon"
- line_color 3342489
- fill_color 13434879
- quidu "380F88B9025A"
- width 260
- height 114
- annotation 8
- autoResize TRUE)
- (object ClassView "Class" "Logical View::java::Initializer" @142
- ShowCompartmentStereotypes TRUE
- IncludeOperation TRUE
- location (144, 288)
- font (object Font
- size 10
- face "Arial"
- bold FALSE
- italics FALSE
- underline FALSE
- strike FALSE
- color 0
- default_color TRUE)
- label (object ItemLabel
- Parent_View @142
- location (33, 242)
- fill_color 13434879
- nlines 1
- max_width 222
- justify 0
- label "Initializer")
- icon_style "Label"
- line_color 3342489
- fill_color 13434879
- quidu "3654A5DC00BB"
- width 240
- height 114
- annotation 8
- autoResize TRUE)
- (object ClassView "Class" "Logical View::java::Field" @143
- ShowCompartmentStereotypes TRUE
- location (256, 112)
- font (object Font
- size 10
- face "Arial"
- bold FALSE
- italics FALSE
- underline FALSE
- strike FALSE
- color 0
- default_color TRUE)
- label (object ItemLabel
- Parent_View @143
- location (160, 66)
- fill_color 13434879
- nlines 1
- max_width 192
- justify 0
- label "Field")
- icon_style "Label"
- line_color 3342489
- fill_color 13434879
- quidu "3654AF8F0280"
- width 210
- height 114
- annotation 8
- autoResize TRUE)
- (object ClassView "Class" "Logical View::java::Block" @144
- ShowCompartmentStereotypes TRUE
- IncludeAttribute TRUE
- IncludeOperation TRUE
- location (864, 352)
- font (object Font
- size 10
- face "Arial"
- bold FALSE
- italics FALSE
- underline FALSE
- strike FALSE
- color 0
- default_color TRUE)
- label (object ItemLabel
- Parent_View @144
- location (692, 256)
- fill_color 13434879
- nlines 1
- max_width 344
- justify 0
- label "Block")
- icon_style "Icon"
- line_color 3342489
- fill_color 13434879
- quidu "380F88370150"
- compartment (object Compartment
- Parent_View @144
- location (692, 312)
- font (object Font
- size 10
- face "Arial"
- bold FALSE
- italics FALSE
- underline FALSE
- strike FALSE
- color 0
- default_color TRUE)
- icon_style "Icon"
- fill_color 16777215
- anchor 2
- nlines 3
- max_width 290)
- width 362
- height 214
- annotation 8
- autoResize TRUE)
- (object InheritTreeView "" @145
- location (864, 580)
- line_color 3342489
- fill_color 13434879
- supplier @144
- vertices (list Points
- (864, 580)
- (864, 459)))
- (object InheritView "" @146
- stereotype TRUE
- line_color 3342489
- quidu "380F88D600A5"
- client @140
- supplier @144
- line_style 3
- origin_attachment (581, 631)
- terminal_attachment (581, 580)
- drawSupplier @145)
- (object InheritView "" @147
- stereotype TRUE
- line_color 3342489
- quidu "380F88DA0056"
- client @141
- supplier @144
- line_style 3
- origin_attachment (1121, 630)
- terminal_attachment (1121, 580)
- drawSupplier @145)
- (object AssociationViewNew "$UNNAMED$8" @148
- location (473, 300)
- stereotype TRUE
- line_color 3342489
- quidu "392AAC33036A"
- roleview_list (list RoleViews
- (object RoleView "source" @149
- Parent_View @148
- location (153, -388)
- font (object Font
- size 10
- face "Arial"
- bold FALSE
- italics FALSE
- underline FALSE
- strike FALSE
- color 0
- default_color TRUE)
- label (object SegLabel @150
- Parent_View @149
- location (599, 267)
- font (object Font
- size 10
- face "Arial"
- bold FALSE
- italics FALSE
- underline FALSE
- strike FALSE
- color 0
- default_color TRUE)
- anchor 1
- anchor_loc 1
- nlines 1
- max_width 145
- justify 0
- label "+source"
- pctDist 0.599393
- height 34
- orientation 0)
- stereotype TRUE
- line_color 3342489
- quidu "392AAC380140"
- client @148
- supplier @144
- line_style 3
- origin_attachment (473, 300)
- terminal_attachment (683, 300)
- label (object SegLabel @151
- Parent_View @149
- location (605, 334)
- font (object Font
- size 10
- face "Arial"
- bold FALSE
- italics FALSE
- underline FALSE
- strike FALSE
- color 0
- default_color TRUE)
- anchor 2
- anchor_loc 1
- nlines 1
- max_width 15
- justify 0
- label "0..1"
- pctDist 0.635266
- height 34
- orientation 1))
- (object RoleView "initializer" @152
- Parent_View @148
- location (153, -388)
- stereotype TRUE
- line_color 3342489
- quidu "392AAC380168"
- client @148
- supplier @142
- line_style 3
- origin_attachment (473, 300)
- terminal_attachment (264, 300))))
- (object AssociationViewNew "$UNNAMED$9" @153
- location (671, 114)
- font (object Font
- size 10
- face "Arial"
- bold FALSE
- italics FALSE
- underline FALSE
- strike FALSE
- color 0
- default_color TRUE)
- label (object SegLabel @154
- Parent_View @153
- location (671, 55)
- font (object Font
- size 10
- face "Arial"
- bold FALSE
- italics TRUE
- underline FALSE
- strike FALSE
- color 0
- default_color TRUE)
- hidden TRUE
- anchor 1
- anchor_loc 1
- nlines 1
- max_width 60
- justify 0
- label ""
- pctDist 0.500000
- height 60
- orientation 0)
- stereotype TRUE
- line_color 3342489
- quidu "392AAC5602A2"
- roleview_list (list RoleViews
- (object RoleView "initializer" @155
- Parent_View @153
- location (319, -334)
- font (object Font
- size 10
- face "Arial"
- bold FALSE
- italics FALSE
- underline FALSE
- strike FALSE
- color 0
- default_color TRUE)
- label (object SegLabel @156
- Parent_View @155
- location (954, 210)
- font (object Font
- size 10
- face "Arial"
- bold FALSE
- italics FALSE
- underline FALSE
- strike FALSE
- color 0
- default_color TRUE)
- anchor 1
- anchor_loc 1
- nlines 1
- max_width 195
- justify 0
- label "+initializer"
- pctDist 0.891827
- height 104
- orientation 0)
- stereotype TRUE
- line_color 3342489
- quidu "392AAC5702DF"
- client @153
- supplier @144
- vertices (list Points
- (671, 114)
- (850, 114)
- (850, 245))
- line_style 3
- origin_attachment (671, 114)
- terminal_attachment (850, 245)
- label (object SegLabel @157
- Parent_View @155
- location (790, 218)
- font (object Font
- size 10
- face "Arial"
- bold FALSE
- italics FALSE
- underline FALSE
- strike FALSE
- color 0
- default_color TRUE)
- anchor 2
- anchor_loc 1
- nlines 1
- max_width 15
- justify 0
- label "0..1"
- pctDist 0.913462
- height 61
- orientation 1))
- (object RoleView "field" @158
- Parent_View @153
- location (319, -334)
- stereotype TRUE
- line_color 3342489
- quidu "392AAC570307"
- client @153
- supplier @143
- line_style 3
- origin_attachment (671, 114)
- terminal_attachment (361, 114))))
- (object ClassView "Class" "Logical View::java::Method" @159
- ShowCompartmentStereotypes TRUE
- location (288, 496)
- font (object Font
- size 10
- face "Arial"
- bold FALSE
- italics FALSE
- underline FALSE
- strike FALSE
- color 0
- default_color TRUE)
- label (object ItemLabel
- Parent_View @159
- location (190, 450)
- fill_color 13434879
- nlines 1
- max_width 196
- justify 0
- label "Method")
- icon_style "Label"
- line_color 3342489
- fill_color 13434879
- quidu "3654AE910271"
- width 214
- height 114
- annotation 8
- autoResize TRUE)
- (object AssociationViewNew "$UNNAMED$10" @160
- location (596, 496)
- stereotype TRUE
- line_color 3342489
- quidu "392AACA501E7"
- roleview_list (list RoleViews
- (object RoleView "source" @161
- Parent_View @160
- location (276, -448)
- font (object Font
- size 10
- face "Arial"
- bold FALSE
- italics FALSE
- underline FALSE
- strike FALSE
- color 0
- default_color TRUE)
- label (object SegLabel @162
- Parent_View @161
- location (690, 463)
- font (object Font
- size 10
- face "Arial"
- bold FALSE
- italics FALSE
- underline FALSE
- strike FALSE
- color 0
- default_color TRUE)
- anchor 1
- anchor_loc 1
- nlines 1
- max_width 145
- justify 0
- label "+source"
- pctDist 0.474777
- height 34
- orientation 0)
- stereotype TRUE
- line_color 3342489
- quidu "392AACA7017C"
- client @160
- supplier @144
- vertices (list Points
- (596, 496)
- (759, 496)
- (759, 459))
- line_style 3
- origin_attachment (596, 496)
- terminal_attachment (759, 459)
- label (object SegLabel @163
- Parent_View @161
- location (817, 477)
- font (object Font
- size 10
- face "Arial"
- bold FALSE
- italics FALSE
- underline FALSE
- strike FALSE
- color 0
- default_color TRUE)
- anchor 2
- anchor_loc 1
- nlines 1
- max_width 15
- justify 0
- label "0..1"
- pctDist 0.915367
- height 58
- orientation 1))
- (object RoleView "method" @164
- Parent_View @160
- location (276, -448)
- stereotype TRUE
- line_color 3342489
- quidu "392AACA701B8"
- client @160
- supplier @159
- line_style 3
- origin_attachment (596, 496)
- terminal_attachment (395, 496))))))
- (object ClassDiagram "Data Types"
- quid "3810A1CE02EB"
- title "Data Types"
- zoom 100
- max_height 28350
- max_width 21600
- origin_x 0
- origin_y 0
- items (list diagram_item_list
- (object ClassView "Class" "Logical View::java::TypeKind" @165
- ShowCompartmentStereotypes TRUE
- IncludeAttribute TRUE
- IncludeOperation TRUE
- location (240, 224)
- font (object Font
- size 10
- face "Arial"
- bold FALSE
- italics FALSE
- underline FALSE
- strike FALSE
- color 0
- default_color TRUE)
- label (object ItemLabel
- Parent_View @165
- location (77, 84)
- fill_color 13434879
- nlines 1
- max_width 326
- justify 0
- label "TypeKind")
- stereotype (object ItemLabel
- Parent_View @165
- location (77, 39)
- fill_color 13434879
- anchor 10
- nlines 1
- max_width 326
- justify 0
- label "<<enumeration>>")
- icon_style "Icon"
- line_color 3342489
- fill_color 13434879
- quidu "3654B46002BF"
- compartment (object Compartment
- Parent_View @165
- location (77, 140)
- font (object Font
- size 10
- face "Arial"
- bold FALSE
- italics FALSE
- underline FALSE
- strike FALSE
- color 0
- default_color TRUE)
- icon_style "Icon"
- fill_color 16777215
- anchor 2
- nlines 5
- max_width 277)
- width 344
- height 392
- annotation 8
- autoResize TRUE)
- (object ClassView "Class" "Logical View::java::JavaVisibilityKind" @166
- ShowCompartmentStereotypes TRUE
- IncludeAttribute TRUE
- IncludeOperation TRUE
- location (240, 640)
- font (object Font
- size 10
- face "Arial"
- bold FALSE
- italics FALSE
- underline FALSE
- strike FALSE
- color 0
- default_color TRUE)
- label (object ItemLabel
- Parent_View @166
- location (68, 500)
- fill_color 13434879
- nlines 1
- max_width 344
- justify 0
- label "JavaVisibilityKind")
- stereotype (object ItemLabel
- Parent_View @166
- location (68, 455)
- fill_color 13434879
- anchor 10
- nlines 1
- max_width 344
- justify 0
- label "<<enumeration>>")
- icon_style "Icon"
- line_color 3342489
- fill_color 13434879
- quidu "382333BE032E"
- compartment (object Compartment
- Parent_View @166
- location (68, 556)
- font (object Font
- size 10
- face "Arial"
- bold FALSE
- italics FALSE
- underline FALSE
- strike FALSE
- color 0
- default_color TRUE)
- icon_style "Icon"
- fill_color 16777215
- anchor 2
- nlines 5
- max_width 292)
- width 362
- height 392
- annotation 8
- autoResize TRUE)
- (object NoteView @167
- location (1296, 208)
- font (object Font
- size 10
- face "Arial"
- bold FALSE
- italics FALSE
- underline FALSE
- strike FALSE
- color 0
- default_color TRUE)
- label (object ItemLabel
- Parent_View @167
- location (887, 52)
- fill_color 13434879
- nlines 6
- max_width 783
- label
-|The Java primitive types are instances of JavaDataType. The common parent class with JavaClass is Classifier. The primitive types can be obtained via a JavaURL("int"), which resolves to a reference like: "java:/#int"
- )
- line_color 3342489
- fill_color 13434879
- width 843
- height 325)
- (object ClassView "Class" "Logical View::java::JavaParameterKind" @168
- ShowCompartmentStereotypes TRUE
- IncludeAttribute TRUE
- IncludeOperation TRUE
- location (256, 1088)
- font (object Font
- size 10
- face "Arial"
- bold FALSE
- italics FALSE
- underline FALSE
- strike FALSE
- color 0
- default_color TRUE)
- label (object ItemLabel
- Parent_View @168
- location (63, 948)
- fill_color 13434879
- nlines 1
- max_width 386
- justify 0
- label "JavaParameterKind")
- stereotype (object ItemLabel
- Parent_View @168
- location (63, 903)
- fill_color 13434879
- anchor 10
- nlines 1
- max_width 386
- justify 0
- label "<<enumeration>>")
- icon_style "Label"
- line_color 3342489
- fill_color 13434879
- quidu "391C1E8F0123"
- compartment (object Compartment
- Parent_View @168
- location (63, 1004)
- font (object Font
- size 10
- face "Arial"
- bold FALSE
- italics FALSE
- underline FALSE
- strike FALSE
- color 0
- default_color TRUE)
- icon_style "Icon"
- fill_color 16777215
- anchor 2
- nlines 5
- max_width 207)
- width 404
- height 392
- annotation 8
- autoResize TRUE)
- (object NoteView @169
- location (768, 1120)
- font (object Font
- size 10
- face "Arial"
- bold FALSE
- italics FALSE
- underline FALSE
- strike FALSE
- color 0
- default_color TRUE)
- label (object ItemLabel
- Parent_View @169
- location (574, 1017)
- fill_color 13434879
- nlines 4
- max_width 352
- label "Temporary enum for Java parameter kind until we get the base sorted out")
- line_color 3342489
- fill_color 13434879
- width 412
- height 219)
- (object ClassView "Class" "Logical View::java::JavaDataType" @170
- ShowCompartmentStereotypes TRUE
- IncludeAttribute TRUE
- ShowOperationSignature TRUE
- location (1168, 1408)
- font (object Font
- size 10
- face "Arial"
- bold FALSE
- italics FALSE
- underline FALSE
- strike FALSE
- color 0
- default_color TRUE)
- label (object ItemLabel
- Parent_View @170
- location (999, 1362)
- fill_color 13434879
- nlines 1
- max_width 338
- justify 0
- label "JavaDataType")
- icon_style "Label"
- line_color 3342489
- fill_color 13434879
- quidu "395913340316"
- width 356
- height 114
- annotation 8
- autoResize TRUE)
- (object ClassView "Class" "Logical View::ecore::EDataType" @171
- ShowCompartmentStereotypes TRUE
- IncludeAttribute TRUE
- IncludeOperation TRUE
- location (1088, 640)
- font (object Font
- size 10
- face "Arial"
- bold FALSE
- italics FALSE
- underline FALSE
- strike FALSE
- color 0
- default_color TRUE)
- label (object ItemLabel
- Parent_View @171
- location (812, 511)
- nlines 2
- max_width 552
- justify 0
- label "EDataType")
- icon_style "Label"
- line_color 3342489
- fill_color 16777215
- quidu "3903D525033E"
- compartment (object Compartment
- Parent_View @171
- location (812, 611)
- font (object Font
- size 10
- face "Arial"
- bold FALSE
- italics FALSE
- underline FALSE
- strike FALSE
- color 0
- default_color TRUE)
- icon_style "Icon"
- anchor 2
- nlines 2
- max_width 522)
- width 570
- height 282
- annotation 8
- autoResize TRUE)
- (object AttachView "" @172
- stereotype TRUE
- line_color 3342489
- client @169
- supplier @168
- line_style 0)))
- (object ClassDiagram "Java Types"
- quid "3B65B823020D"
- title "Java Types"
- documentation "This class diagram contains the Java Types that are not EMF classes but are referenced in this diagram."
- zoom 100
- max_height 28350
- max_width 21600
- origin_x 478
- origin_y 35
- items (list diagram_item_list
- (object ClassView "Class" "Logical View::java::JTypeJavaHelpers" @173
- ShowCompartmentStereotypes TRUE
- IncludeAttribute TRUE
- IncludeOperation TRUE
- location (912, 208)
- font (object Font
- size 10
- face "Arial"
- bold FALSE
- italics FALSE
- underline FALSE
- strike FALSE
- color 0
- default_color TRUE)
- label (object ItemLabel
- Parent_View @173
- location (398, 154)
- fill_color 13434879
- nlines 1
- max_width 1028
- justify 0
- label "JTypeJavaHelpers")
- stereotype (object ItemLabel
- Parent_View @173
- location (398, 109)
- fill_color 13434879
- anchor 10
- nlines 1
- max_width 1028
- justify 0
- label "<<datatype>>")
- icon_style "Icon"
- line_color 3342489
- fill_color 13434879
- quidu "3B65ADE403A6"
- compartment (object Compartment
- Parent_View @173
- location (398, 210)
- font (object Font
- size 10
- face "Arial"
- bold FALSE
- italics FALSE
- underline FALSE
- strike FALSE
- color 0
- default_color TRUE)
- icon_style "Icon"
- fill_color 16777215
- anchor 2
- nlines 2
- max_width 873)
- width 1046
- height 220
- annotation 8
- autoResize TRUE)
- (object ClassView "Class" "Logical View::java::JTypeList" @174
- ShowCompartmentStereotypes TRUE
- IncludeAttribute TRUE
- IncludeOperation TRUE
- location (880, 576)
- font (object Font
- size 10
- face "Arial"
- bold FALSE
- italics FALSE
- underline FALSE
- strike FALSE
- color 0
- default_color TRUE)
- label (object ItemLabel
- Parent_View @174
- location (628, 523)
- fill_color 13434879
- nlines 1
- max_width 504
- justify 0
- label "JTypeList")
- stereotype (object ItemLabel
- Parent_View @174
- location (628, 478)
- fill_color 13434879
- anchor 10
- nlines 1
- max_width 504
- justify 0
- label "<<datatype>>")
- icon_style "Icon"
- line_color 3342489
- fill_color 13434879
- quidu "3B65B87602C1"
- compartment (object Compartment
- Parent_View @174
- location (628, 579)
- font (object Font
- size 10
- face "Arial"
- bold FALSE
- italics FALSE
- underline FALSE
- strike FALSE
- color 0
- default_color TRUE)
- icon_style "Icon"
- fill_color 16777215
- anchor 2
- nlines 2
- max_width 507)
- width 522
- height 218
- annotation 8
- autoResize TRUE)))))
diff --git a/plugins/org.eclipse.jem/rose/instance.mdl b/plugins/org.eclipse.jem/rose/instance.mdl
deleted file mode 100644
index a9007e5..0000000
--- a/plugins/org.eclipse.jem/rose/instance.mdl
+++ /dev/null
@@ -1,8669 +0,0 @@
-
-(object Petal
- version 47
- _written "Rose 8.0.0303.1400"
- charSet 0)
-
-(object Design "Logical View"
- is_unit TRUE
- is_loaded TRUE
- attributes (list Attribute_Set
- (object Attribute
- tool "Java"
- name "IDE"
- value "Internal Editor")
- (object Attribute
- tool "Java"
- name "UserDefineTagName1"
- value "")
- (object Attribute
- tool "Java"
- name "UserDefineTagText1"
- value "")
- (object Attribute
- tool "Java"
- name "UserDefineTagApply1"
- value "")
- (object Attribute
- tool "Java"
- name "UserDefineTagName2"
- value "")
- (object Attribute
- tool "Java"
- name "UserDefineTagText2"
- value "")
- (object Attribute
- tool "Java"
- name "UserDefineTagApply2"
- value "")
- (object Attribute
- tool "Java"
- name "UserDefineTagName3"
- value "")
- (object Attribute
- tool "Java"
- name "UserDefineTagText3"
- value "")
- (object Attribute
- tool "Java"
- name "UserDefineTagApply3"
- value ""))
- quid "3A79EBA50331"
- defaults (object defaults
- rightMargin 0.250000
- leftMargin 0.250000
- topMargin 0.250000
- bottomMargin 0.500000
- pageOverlap 0.250000
- clipIconLabels TRUE
- autoResize TRUE
- snapToGrid FALSE
- gridX 16
- gridY 16
- defaultFont (object Font
- size 10
- face "Arial"
- bold FALSE
- italics FALSE
- underline FALSE
- strike FALSE
- color 0
- default_color TRUE)
- showMessageNum 1
- showClassOfObject TRUE
- notation "Unified")
- root_usecase_package (object Class_Category "Use Case View"
- quid "3A7999AD0297"
- exportControl "Public"
- global TRUE
- logical_models (list unit_reference_list)
- logical_presentations (list unit_reference_list
- (object UseCaseDiagram "Main"
- quid "3A7999B702F6"
- title "Main"
- zoom 100
- max_height 28350
- max_width 21600
- origin_x 0
- origin_y 0
- items (list diagram_item_list))))
- root_category (object Class_Category "Logical View"
- quid "3A7999AD028E"
- exportControl "Public"
- global TRUE
- subsystem "Component View"
- quidu "3B86F172016F"
- logical_models (list unit_reference_list
- (object Class_Category "instantiation"
- is_unit TRUE
- is_loaded FALSE
- file_name "$WorkspaceRoot\\org.eclipse.jem\\rose\\instantiation.cat"
- quid "3B86F1720180")
- (object Class_Category "ecore"
- is_unit TRUE
- is_loaded FALSE
- file_name "$WorkspaceRoot\\org.eclipse.emf.ecore\\model\\org.eclipse.emf.Ecore.cat"
- quid "39A5ED04004E"))
- logical_presentations (list unit_reference_list
- (object ClassDiagram "Main"
- quid "3B86F1720173"
- title "Main"
- zoom 100
- max_height 28350
- max_width 21600
- origin_x 0
- origin_y 0
- items (list diagram_item_list
- (object CategoryView "Logical View::instantiation" @1
- location (334, 240)
- font (object Font
- size 10
- face "Arial"
- bold FALSE
- italics FALSE
- underline FALSE
- strike FALSE
- color 0
- default_color TRUE)
- label (object ItemLabel
- Parent_View @1
- location (190, 156)
- fill_color 13434879
- nlines 2
- max_width 288
- justify 0
- label "instantiation")
- icon_style "Icon"
- line_color 3342489
- fill_color 13434879
- quidu "3B86F1720180"
- width 300
- height 180)))
- (object ClassDiagram "Dependencies (Don't edit)"
- quid "3B86F31F0281"
- title "Dependencies (Don't edit)"
- zoom 100
- max_height 28350
- max_width 21600
- origin_x 0
- origin_y 0
- items (list diagram_item_list
- (object NoteView @2
- location (753, 685)
- font (object Font
- size 10
- face "Arial"
- bold FALSE
- italics FALSE
- underline FALSE
- strike FALSE
- color 0
- default_color TRUE)
- label (object ItemLabel
- Parent_View @2
- location (305, 539)
- fill_color 13434879
- nlines 6
- max_width 860
- label "These are the dependencies. They are not to be edited. They must only be edited by their owner models.")
- line_color 3342489
- fill_color 8421631
- width 920
- height 305)
- (object CategoryView "Logical View::ecore" @3
- location (263, 185)
- font (object Font
- size 10
- face "Arial"
- bold FALSE
- italics FALSE
- underline FALSE
- strike FALSE
- color 0
- default_color TRUE)
- label (object ItemLabel
- Parent_View @3
- location (119, 101)
- fill_color 13434879
- nlines 2
- max_width 288
- justify 0
- label "ecore")
- icon_style "Icon"
- line_color 3342489
- fill_color 13434879
- quidu "39A5ED04004E"
- width 300
- height 180)))))
- root_subsystem (object SubSystem "Component View"
- quid "3B86F172016F"
- physical_models (list unit_reference_list)
- physical_presentations (list unit_reference_list
- (object Module_Diagram "Main"
- quid "3B86F1720176"
- title "Main"
- zoom 100
- max_height 28350
- max_width 21600
- origin_x 0
- origin_y 0
- items (list diagram_item_list))))
- process_structure (object Processes
- quid "3B86F1720170"
- ProcsNDevs (list
- (object Process_Diagram "Deployment View"
- quid "3B86F1720172"
- title "Deployment View"
- zoom 100
- max_height 28350
- max_width 21600
- origin_x 0
- origin_y 0
- items (list diagram_item_list))))
- properties (object Properties
- attributes (list Attribute_Set
- (object Attribute
- tool "Cplusplus"
- name "propertyId"
- value "809135966")
- (object Attribute
- tool "Cplusplus"
- name "default__Role"
- value (list Attribute_Set
- (object Attribute
- tool "Cplusplus"
- name "Synchronize"
- value TRUE)
- (object Attribute
- tool "Cplusplus"
- name "CodeName"
- value "")
- (object Attribute
- tool "Cplusplus"
- name "Const"
- value FALSE)
- (object Attribute
- tool "Cplusplus"
- name "InitialValue"
- value "")))
- (object Attribute
- tool "Cplusplus"
- name "default__Inherit"
- value (list Attribute_Set
- (object Attribute
- tool "Cplusplus"
- name "Synchronize"
- value TRUE)))
- (object Attribute
- tool "Cplusplus"
- name "default__Module-Spec"
- value (list Attribute_Set
- (object Attribute
- tool "Cplusplus"
- name "Synchronize"
- value TRUE)
- (object Attribute
- tool "Cplusplus"
- name "Copyright"
- value (value Text ""))
- (object Attribute
- tool "Cplusplus"
- name "RootPackage"
- value "C++ Reverse Engineered")
- (object Attribute
- tool "Cplusplus"
- name "InitialHeaderIncludes"
- value (value Text ""))
- (object Attribute
- tool "Cplusplus"
- name "InitialBodyIncludes"
- value (value Text ""))
- (object Attribute
- tool "Cplusplus"
- name "RevEngRootDirectory"
- value "")
- (object Attribute
- tool "Cplusplus"
- name "RevEngDirectoriesAsPackages"
- value FALSE)
- (object Attribute
- tool "Cplusplus"
- name "HeaderFileExtension"
- value ".h")
- (object Attribute
- tool "Cplusplus"
- name "ImplementationFileExtension"
- value ".cpp")
- (object Attribute
- tool "Cplusplus"
- name "NewHeaderFileDirectory"
- value "")
- (object Attribute
- tool "Cplusplus"
- name "NewImplementationFileDirectory"
- value "")
- (object Attribute
- tool "Cplusplus"
- name "FileCapitalization"
- value ("FileCapitalizationSet" 0))
- (object Attribute
- tool "Cplusplus"
- name "CodeGenExtraDirectories"
- value ("CodeGenExtraDirectoriesSet" 0))
- (object Attribute
- tool "Cplusplus"
- name "StripClassPrefix"
- value "")
- (object Attribute
- tool "Cplusplus"
- name "UseTabs"
- value FALSE)
- (object Attribute
- tool "Cplusplus"
- name "TabWidth"
- value 8)
- (object Attribute
- tool "Cplusplus"
- name "IndentWidth"
- value 4)
- (object Attribute
- tool "Cplusplus"
- name "AccessIndentation"
- value -2)
- (object Attribute
- tool "Cplusplus"
- name "ModelIdCommentRules"
- value ("ModelIdCommentRulesSet" 1))
- (object Attribute
- tool "Cplusplus"
- name "PageWidth"
- value 80)
- (object Attribute
- tool "Cplusplus"
- name "ClassMemberOrder"
- value ("MemberOrderSet" 1))
- (object Attribute
- tool "Cplusplus"
- name "OneParameterPerLine"
- value FALSE)
- (object Attribute
- tool "Cplusplus"
- name "NamespaceBraceStyle"
- value ("BraceStyleSet" 2))
- (object Attribute
- tool "Cplusplus"
- name "ClassBraceStyle"
- value ("BraceStyleSet" 2))
- (object Attribute
- tool "Cplusplus"
- name "FunctionBraceStyle"
- value ("BraceStyleSet" 2))
- (object Attribute
- tool "Cplusplus"
- name "CodeGenExtraDirectoriesSet"
- value (list Attribute_Set
- (object Attribute
- tool "Cplusplus"
- name "None"
- value 0)
- (object Attribute
- tool "Cplusplus"
- name "Namespaces"
- value 1)
- (object Attribute
- tool "Cplusplus"
- name "Packages"
- value 2)))
- (object Attribute
- tool "Cplusplus"
- name "FileCapitalizationSet"
- value (list Attribute_Set
- (object Attribute
- tool "Cplusplus"
- name "Same as model"
- value 0)
- (object Attribute
- tool "Cplusplus"
- name "Lower case"
- value 1)
- (object Attribute
- tool "Cplusplus"
- name "Upper case"
- value 2)
- (object Attribute
- tool "Cplusplus"
- name "Lower case with underscores"
- value 3)))
- (object Attribute
- tool "Cplusplus"
- name "BraceStyleSet"
- value (list Attribute_Set
- (object Attribute
- tool "Cplusplus"
- name "B1"
- value 1)
- (object Attribute
- tool "Cplusplus"
- name "B2"
- value 2)
- (object Attribute
- tool "Cplusplus"
- name "B3"
- value 3)
- (object Attribute
- tool "Cplusplus"
- name "B4"
- value 4)
- (object Attribute
- tool "Cplusplus"
- name "B5"
- value 5)))
- (object Attribute
- tool "Cplusplus"
- name "MemberOrderSet"
- value (list Attribute_Set
- (object Attribute
- tool "Cplusplus"
- name "Public First"
- value 1)
- (object Attribute
- tool "Cplusplus"
- name "Private First"
- value 2)
- (object Attribute
- tool "Cplusplus"
- name "Order by kind"
- value 3)
- (object Attribute
- tool "Cplusplus"
- name "Unordered"
- value 4)))
- (object Attribute
- tool "Cplusplus"
- name "ModelIdCommentRulesSet"
- value (list Attribute_Set
- (object Attribute
- tool "Cplusplus"
- name "Code generation only"
- value 1)
- (object Attribute
- tool "Cplusplus"
- name "Code generation and reverse engineering"
- value 2)
- (object Attribute
- tool "Cplusplus"
- name "Never generate model IDs"
- value 3)))))
- (object Attribute
- tool "Cplusplus"
- name "default__Param"
- value (list Attribute_Set
- (object Attribute
- tool "Cplusplus"
- name "CodeName"
- value "")))
- (object Attribute
- tool "Cplusplus"
- name "default__Attribute"
- value (list Attribute_Set
- (object Attribute
- tool "Cplusplus"
- name "Synchronize"
- value TRUE)
- (object Attribute
- tool "Cplusplus"
- name "CodeName"
- value "")))
- (object Attribute
- tool "Cplusplus"
- name "default__Operation"
- value (list Attribute_Set
- (object Attribute
- tool "Cplusplus"
- name "Synchronize"
- value TRUE)
- (object Attribute
- tool "Cplusplus"
- name "CodeName"
- value "")
- (object Attribute
- tool "Cplusplus"
- name "InitialCodeBody"
- value "")
- (object Attribute
- tool "Cplusplus"
- name "Inline"
- value FALSE)
- (object Attribute
- tool "Cplusplus"
- name "GenerateFunctionBody"
- value ("GenerateFunctionBodySet" 2))
- (object Attribute
- tool "Cplusplus"
- name "GenerateFunctionBodySet"
- value (list Attribute_Set
- (object Attribute
- tool "Cplusplus"
- name "Default"
- value 2)
- (object Attribute
- tool "Cplusplus"
- name "True"
- value 1)
- (object Attribute
- tool "Cplusplus"
- name "False"
- value 0)))))
- (object Attribute
- tool "Cplusplus"
- name "default__Class"
- value (list Attribute_Set
- (object Attribute
- tool "Cplusplus"
- name "Synchronize"
- value TRUE)
- (object Attribute
- tool "Cplusplus"
- name "CodeName"
- value "")
- (object Attribute
- tool "Cplusplus"
- name "ImplementationType"
- value "")
- (object Attribute
- tool "Cplusplus"
- name "HeaderSourceFile"
- value "")
- (object Attribute
- tool "Cplusplus"
- name "BodySourceFile"
- value "")))
- (object Attribute
- tool "Cplusplus"
- name "default__Category"
- value (list Attribute_Set
- (object Attribute
- tool "Cplusplus"
- name "CodeName"
- value "")
- (object Attribute
- tool "Cplusplus"
- name "IsNamespace"
- value FALSE)))
- (object Attribute
- tool "Cplusplus"
- name "HiddenTool"
- value FALSE)
- (object Attribute
- tool "ANSI C++ Event Watcher"
- name "HiddenTool"
- value FALSE)
- (object Attribute
- tool "ANSIConvert"
- name "HiddenTool"
- value FALSE)
- (object Attribute
- tool "Ada83"
- name "propertyId"
- value "838326200")
- (object Attribute
- tool "Ada83"
- name "default__Project"
- value (list Attribute_Set
- (object Attribute
- tool "Ada83"
- name "SpecFileExtension"
- value "1.ada")
- (object Attribute
- tool "Ada83"
- name "SpecFileBackupExtension"
- value "1.ad~")
- (object Attribute
- tool "Ada83"
- name "SpecFileTemporaryExtension"
- value "1.ad#")
- (object Attribute
- tool "Ada83"
- name "BodyFileExtension"
- value "2.ada")
- (object Attribute
- tool "Ada83"
- name "BodyFileBackupExtension"
- value "2.ad~")
- (object Attribute
- tool "Ada83"
- name "BodyFileTemporaryExtension"
- value "2.ad#")
- (object Attribute
- tool "Ada83"
- name "CreateMissingDirectories"
- value TRUE)
- (object Attribute
- tool "Ada83"
- name "GenerateBodies"
- value TRUE)
- (object Attribute
- tool "Ada83"
- name "GenerateAccessorOperations"
- value TRUE)
- (object Attribute
- tool "Ada83"
- name "GenerateStandardOperations"
- value TRUE)
- (object Attribute
- tool "Ada83"
- name "DefaultCodeBody"
- value "[statement]")
- (object Attribute
- tool "Ada83"
- name "ImplicitParameter"
- value TRUE)
- (object Attribute
- tool "Ada83"
- name "CommentWidth"
- value 60)
- (object Attribute
- tool "Ada83"
- name "StopOnError"
- value FALSE)
- (object Attribute
- tool "Ada83"
- name "ErrorLimit"
- value 30)
- (object Attribute
- tool "Ada83"
- name "UseFileName"
- value FALSE)
- (object Attribute
- tool "Ada83"
- name "Directory"
- value "$ROSEADA83_SOURCE")))
- (object Attribute
- tool "Ada83"
- name "default__Class"
- value (list Attribute_Set
- (object Attribute
- tool "Ada83"
- name "CodeName"
- value "")
- (object Attribute
- tool "Ada83"
- name "ClassName"
- value "Object")
- (object Attribute
- tool "Ada83"
- name "ClassAccess"
- value ("ImplementationSet" 43))
- (object Attribute
- tool "Ada83"
- name "ImplementationType"
- value (value Text ""))
- (object Attribute
- tool "Ada83"
- name "IsSubtype"
- value FALSE)
- (object Attribute
- tool "Ada83"
- name "PolymorphicUnit"
- value FALSE)
- (object Attribute
- tool "Ada83"
- name "HandleName"
- value "Handle")
- (object Attribute
- tool "Ada83"
- name "HandleAccess"
- value ("ImplementationSet" 45))
- (object Attribute
- tool "Ada83"
- name "Discriminant"
- value "")
- (object Attribute
- tool "Ada83"
- name "Variant"
- value "")
- (object Attribute
- tool "Ada83"
- name "EnumerationLiteralPrefix"
- value "A_")
- (object Attribute
- tool "Ada83"
- name "RecordFieldPrefix"
- value "The_")
- (object Attribute
- tool "Ada83"
- name "GenerateAccessorOperations"
- value TRUE)
- (object Attribute
- tool "Ada83"
- name "GenerateStandardOperations"
- value TRUE)
- (object Attribute
- tool "Ada83"
- name "ImplicitParameter"
- value TRUE)
- (object Attribute
- tool "Ada83"
- name "ClassParameterName"
- value "This")
- (object Attribute
- tool "Ada83"
- name "DefaultConstructorKind"
- value ("ConstructorKindSet" 199))
- (object Attribute
- tool "Ada83"
- name "DefaultConstructorName"
- value "Create")
- (object Attribute
- tool "Ada83"
- name "InlineDefaultConstructor"
- value FALSE)
- (object Attribute
- tool "Ada83"
- name "CopyConstructorKind"
- value ("ConstructorKindSet" 199))
- (object Attribute
- tool "Ada83"
- name "CopyConstructorName"
- value "Copy")
- (object Attribute
- tool "Ada83"
- name "InlineCopyConstructor"
- value FALSE)
- (object Attribute
- tool "Ada83"
- name "DestructorName"
- value "Free")
- (object Attribute
- tool "Ada83"
- name "InlineDestructor"
- value FALSE)
- (object Attribute
- tool "Ada83"
- name "ClassEqualityOperation"
- value "")
- (object Attribute
- tool "Ada83"
- name "HandleEqualityOperation"
- value "")
- (object Attribute
- tool "Ada83"
- name "InlineEquality"
- value FALSE)
- (object Attribute
- tool "Ada83"
- name "IsTask"
- value FALSE)
- (object Attribute
- tool "Ada83"
- name "Representation"
- value (value Text ""))
- (object Attribute
- tool "Ada83"
- name "ImplementationSet"
- value (list Attribute_Set
- (object Attribute
- tool "Ada83"
- name "Public"
- value 45)
- (object Attribute
- tool "Ada83"
- name "Private"
- value 43)
- (object Attribute
- tool "Ada83"
- name "LimitedPrivate"
- value 200)
- (object Attribute
- tool "Ada83"
- name "DoNotCreate"
- value 201)))
- (object Attribute
- tool "Ada83"
- name "ConstructorKindSet"
- value (list Attribute_Set
- (object Attribute
- tool "Ada83"
- name "Procedure"
- value 202)
- (object Attribute
- tool "Ada83"
- name "Function"
- value 199)
- (object Attribute
- tool "Ada83"
- name "DoNotCreate"
- value 201)))))
- (object Attribute
- tool "Ada83"
- name "default__Module-Spec"
- value (list Attribute_Set
- (object Attribute
- tool "Ada83"
- name "Generate"
- value TRUE)
- (object Attribute
- tool "Ada83"
- name "CopyrightNotice"
- value (value Text ""))
- (object Attribute
- tool "Ada83"
- name "FileName"
- value "")
- (object Attribute
- tool "Ada83"
- name "ReturnType"
- value "")
- (object Attribute
- tool "Ada83"
- name "GenericFormalParameters"
- value (value Text ""))
- (object Attribute
- tool "Ada83"
- name "AdditionalWiths"
- value (value Text ""))))
- (object Attribute
- tool "Ada83"
- name "default__Module-Body"
- value (list Attribute_Set
- (object Attribute
- tool "Ada83"
- name "Generate"
- value TRUE)
- (object Attribute
- tool "Ada83"
- name "CopyrightNotice"
- value (value Text ""))
- (object Attribute
- tool "Ada83"
- name "FileName"
- value "")
- (object Attribute
- tool "Ada83"
- name "ReturnType"
- value "")
- (object Attribute
- tool "Ada83"
- name "AdditionalWiths"
- value (value Text ""))
- (object Attribute
- tool "Ada83"
- name "IsSubunit"
- value FALSE)))
- (object Attribute
- tool "Ada83"
- name "default__Operation"
- value (list Attribute_Set
- (object Attribute
- tool "Ada83"
- name "CodeName"
- value "")
- (object Attribute
- tool "Ada83"
- name "SubprogramImplementation"
- value ("SubprogramImplementationSet" 2))
- (object Attribute
- tool "Ada83"
- name "Renames"
- value "")
- (object Attribute
- tool "Ada83"
- name "ClassParameterMode"
- value ("ParameterModeSet" 203))
- (object Attribute
- tool "Ada83"
- name "Inline"
- value FALSE)
- (object Attribute
- tool "Ada83"
- name "EntryCode"
- value (value Text ""))
- (object Attribute
- tool "Ada83"
- name "ExitCode"
- value (value Text ""))
- (object Attribute
- tool "Ada83"
- name "InitialCodeBody"
- value "${default}")
- (object Attribute
- tool "Ada83"
- name "Representation"
- value (value Text ""))
- (object Attribute
- tool "Ada83"
- name "SubprogramImplementationSet"
- value (list Attribute_Set
- (object Attribute
- tool "Ada83"
- name "Spec"
- value 224)
- (object Attribute
- tool "Ada83"
- name "Body"
- value 2)
- (object Attribute
- tool "Ada83"
- name "Renaming"
- value 222)
- (object Attribute
- tool "Ada83"
- name "Separate"
- value 223)))
- (object Attribute
- tool "Ada83"
- name "ParameterModeSet"
- value (list Attribute_Set
- (object Attribute
- tool "Ada83"
- name "In"
- value 204)
- (object Attribute
- tool "Ada83"
- name "Out"
- value 205)
- (object Attribute
- tool "Ada83"
- name "InOut"
- value 203)
- (object Attribute
- tool "Ada83"
- name "FunctionReturn"
- value 206)
- (object Attribute
- tool "Ada83"
- name "DoNotCreate"
- value 201)))))
- (object Attribute
- tool "Ada83"
- name "default__Has"
- value (list Attribute_Set
- (object Attribute
- tool "Ada83"
- name "CodeName"
- value "")
- (object Attribute
- tool "Ada83"
- name "NameIfUnlabeled"
- value "The_${supplier}")
- (object Attribute
- tool "Ada83"
- name "DataMemberName"
- value "${relationship}")
- (object Attribute
- tool "Ada83"
- name "GetName"
- value "Get_${relationship}")
- (object Attribute
- tool "Ada83"
- name "InlineGet"
- value TRUE)
- (object Attribute
- tool "Ada83"
- name "SetName"
- value "Set_${relationship}")
- (object Attribute
- tool "Ada83"
- name "InlineSet"
- value TRUE)
- (object Attribute
- tool "Ada83"
- name "IsConstant"
- value FALSE)
- (object Attribute
- tool "Ada83"
- name "InitialValue"
- value "")
- (object Attribute
- tool "Ada83"
- name "Variant"
- value "")
- (object Attribute
- tool "Ada83"
- name "ContainerGeneric"
- value "List")
- (object Attribute
- tool "Ada83"
- name "ContainerType"
- value "")
- (object Attribute
- tool "Ada83"
- name "ContainerDeclarations"
- value (value Text ""))
- (object Attribute
- tool "Ada83"
- name "SelectorName"
- value "")
- (object Attribute
- tool "Ada83"
- name "SelectorType"
- value "")))
- (object Attribute
- tool "Ada83"
- name "default__Attribute"
- value (list Attribute_Set
- (object Attribute
- tool "Ada83"
- name "CodeName"
- value "")
- (object Attribute
- tool "Ada83"
- name "DataMemberName"
- value "${attribute}")
- (object Attribute
- tool "Ada83"
- name "GetName"
- value "Get_${attribute}")
- (object Attribute
- tool "Ada83"
- name "InlineGet"
- value TRUE)
- (object Attribute
- tool "Ada83"
- name "SetName"
- value "Set_${attribute}")
- (object Attribute
- tool "Ada83"
- name "InlineSet"
- value TRUE)
- (object Attribute
- tool "Ada83"
- name "IsConstant"
- value FALSE)
- (object Attribute
- tool "Ada83"
- name "InitialValue"
- value "")
- (object Attribute
- tool "Ada83"
- name "Variant"
- value "")
- (object Attribute
- tool "Ada83"
- name "Representation"
- value (value Text ""))))
- (object Attribute
- tool "Ada83"
- name "default__Association"
- value (list Attribute_Set
- (object Attribute
- tool "Ada83"
- name "NameIfUnlabeled"
- value "The_${targetClass}")
- (object Attribute
- tool "Ada83"
- name "GetName"
- value "Get_${association}")
- (object Attribute
- tool "Ada83"
- name "InlineGet"
- value FALSE)
- (object Attribute
- tool "Ada83"
- name "SetName"
- value "Set_${association}")
- (object Attribute
- tool "Ada83"
- name "InlineSet"
- value FALSE)
- (object Attribute
- tool "Ada83"
- name "GenerateAssociate"
- value ("ProcedureKindSet" 202))
- (object Attribute
- tool "Ada83"
- name "AssociateName"
- value "Associate")
- (object Attribute
- tool "Ada83"
- name "InlineAssociate"
- value FALSE)
- (object Attribute
- tool "Ada83"
- name "GenerateDissociate"
- value ("ProcedureKindSet" 202))
- (object Attribute
- tool "Ada83"
- name "DissociateName"
- value "Dissociate")
- (object Attribute
- tool "Ada83"
- name "InlineDissociate"
- value FALSE)
- (object Attribute
- tool "Ada83"
- name "ProcedureKindSet"
- value (list Attribute_Set
- (object Attribute
- tool "Ada83"
- name "Procedure"
- value 202)
- (object Attribute
- tool "Ada83"
- name "DoNotCreate"
- value 201)))
- (object Attribute
- tool "Ada83"
- name "FunctionKindSet"
- value (list Attribute_Set
- (object Attribute
- tool "Ada83"
- name "Function"
- value 199)
- (object Attribute
- tool "Ada83"
- name "DoNotCreate"
- value 201)))))
- (object Attribute
- tool "Ada83"
- name "default__Role"
- value (list Attribute_Set
- (object Attribute
- tool "Ada83"
- name "CodeName"
- value "")
- (object Attribute
- tool "Ada83"
- name "NameIfUnlabeled"
- value "The_${targetClass}")
- (object Attribute
- tool "Ada83"
- name "DataMemberName"
- value "${target}")
- (object Attribute
- tool "Ada83"
- name "GetName"
- value "Get_${target}")
- (object Attribute
- tool "Ada83"
- name "InlineGet"
- value TRUE)
- (object Attribute
- tool "Ada83"
- name "SetName"
- value "Set_${target}")
- (object Attribute
- tool "Ada83"
- name "InlineSet"
- value TRUE)
- (object Attribute
- tool "Ada83"
- name "IsConstant"
- value FALSE)
- (object Attribute
- tool "Ada83"
- name "InitialValue"
- value "")
- (object Attribute
- tool "Ada83"
- name "ContainerGeneric"
- value "List")
- (object Attribute
- tool "Ada83"
- name "ContainerType"
- value "")
- (object Attribute
- tool "Ada83"
- name "ContainerDeclarations"
- value (value Text ""))
- (object Attribute
- tool "Ada83"
- name "SelectorName"
- value "")
- (object Attribute
- tool "Ada83"
- name "SelectorType"
- value "")
- (object Attribute
- tool "Ada83"
- name "ProcedureKindSet"
- value (list Attribute_Set
- (object Attribute
- tool "Ada83"
- name "Procedure"
- value 202)
- (object Attribute
- tool "Ada83"
- name "DoNotCreate"
- value 201)))))
- (object Attribute
- tool "Ada83"
- name "default__Subsystem"
- value (list Attribute_Set
- (object Attribute
- tool "Ada83"
- name "Directory"
- value "AUTO GENERATE")))
- (object Attribute
- tool "Ada83"
- name "HiddenTool"
- value FALSE)
- (object Attribute
- tool "Ada95"
- name "propertyId"
- value "838326200")
- (object Attribute
- tool "Ada95"
- name "default__Project"
- value (list Attribute_Set
- (object Attribute
- tool "Ada95"
- name "SpecFileExtension"
- value "1.ada")
- (object Attribute
- tool "Ada95"
- name "SpecFileBackupExtension"
- value "1.ad~")
- (object Attribute
- tool "Ada95"
- name "SpecFileTemporaryExtension"
- value "1.ad#")
- (object Attribute
- tool "Ada95"
- name "BodyFileExtension"
- value "2.ada")
- (object Attribute
- tool "Ada95"
- name "BodyFileBackupExtension"
- value "2.ad~")
- (object Attribute
- tool "Ada95"
- name "BodyFileTemporaryExtension"
- value "2.ad#")
- (object Attribute
- tool "Ada95"
- name "CreateMissingDirectories"
- value TRUE)
- (object Attribute
- tool "Ada95"
- name "UseColonNotation"
- value TRUE)
- (object Attribute
- tool "Ada95"
- name "GenerateBodies"
- value TRUE)
- (object Attribute
- tool "Ada95"
- name "GenerateAccessorOperations"
- value TRUE)
- (object Attribute
- tool "Ada95"
- name "GenerateStandardOperations"
- value TRUE)
- (object Attribute
- tool "Ada95"
- name "DefaultCodeBody"
- value "[statement]")
- (object Attribute
- tool "Ada95"
- name "ImplicitParameter"
- value TRUE)
- (object Attribute
- tool "Ada95"
- name "CommentWidth"
- value 60)
- (object Attribute
- tool "Ada95"
- name "StopOnError"
- value FALSE)
- (object Attribute
- tool "Ada95"
- name "ErrorLimit"
- value 30)
- (object Attribute
- tool "Ada95"
- name "UseFileName"
- value FALSE)
- (object Attribute
- tool "Ada95"
- name "Directory"
- value "$ROSEADA95_SOURCE")))
- (object Attribute
- tool "Ada95"
- name "default__Class"
- value (list Attribute_Set
- (object Attribute
- tool "Ada95"
- name "CodeName"
- value "")
- (object Attribute
- tool "Ada95"
- name "TypeName"
- value "Object")
- (object Attribute
- tool "Ada95"
- name "TypeVisibility"
- value ("TypeVisibilitySet" 43))
- (object Attribute
- tool "Ada95"
- name "TypeImplementation"
- value ("TypeImplementationSet" 208))
- (object Attribute
- tool "Ada95"
- name "TypeControl"
- value ("TypeControlSet" 225))
- (object Attribute
- tool "Ada95"
- name "TypeControlName"
- value "Controlled_${type}")
- (object Attribute
- tool "Ada95"
- name "TypeDefinition"
- value (value Text ""))
- (object Attribute
- tool "Ada95"
- name "RecordImplementation"
- value ("RecordImplementationSet" 209))
- (object Attribute
- tool "Ada95"
- name "RecordKindPackageName"
- value "${class}_Record_Kinds")
- (object Attribute
- tool "Ada95"
- name "IsLimited"
- value FALSE)
- (object Attribute
- tool "Ada95"
- name "IsSubtype"
- value FALSE)
- (object Attribute
- tool "Ada95"
- name "GenerateAccessType"
- value ("GenerateAccessTypeSet" 230))
- (object Attribute
- tool "Ada95"
- name "AccessTypeName"
- value "Handle")
- (object Attribute
- tool "Ada95"
- name "AccessTypeVisibility"
- value ("TypeVisibilitySet" 45))
- (object Attribute
- tool "Ada95"
- name "AccessTypeDefinition"
- value (value Text ""))
- (object Attribute
- tool "Ada95"
- name "AccessClassWide"
- value TRUE)
- (object Attribute
- tool "Ada95"
- name "MaybeAliased"
- value FALSE)
- (object Attribute
- tool "Ada95"
- name "ParameterizedImplementation"
- value ("ParameterizedImplementationSet" 11))
- (object Attribute
- tool "Ada95"
- name "ParentClassName"
- value "Superclass")
- (object Attribute
- tool "Ada95"
- name "EnumerationLiteralPrefix"
- value "A_")
- (object Attribute
- tool "Ada95"
- name "RecordFieldPrefix"
- value "The_")
- (object Attribute
- tool "Ada95"
- name "ArrayOfTypeName"
- value "Array_Of_${type}")
- (object Attribute
- tool "Ada95"
- name "AccessArrayOfTypeName"
- value "Access_Array_Of_${type}")
- (object Attribute
- tool "Ada95"
- name "ArrayOfAccessTypeName"
- value "Array_Of_${access_type}")
- (object Attribute
- tool "Ada95"
- name "AccessArrayOfAccessTypeName"
- value "Access_Array_Of_${access_type}")
- (object Attribute
- tool "Ada95"
- name "ArrayIndexDefinition"
- value "Positive range <>")
- (object Attribute
- tool "Ada95"
- name "GenerateAccessorOperations"
- value TRUE)
- (object Attribute
- tool "Ada95"
- name "GenerateStandardOperations"
- value TRUE)
- (object Attribute
- tool "Ada95"
- name "ImplicitParameter"
- value TRUE)
- (object Attribute
- tool "Ada95"
- name "ImplicitParameterName"
- value "This")
- (object Attribute
- tool "Ada95"
- name "GenerateDefaultConstructor"
- value ("SubprogramKindSet" 199))
- (object Attribute
- tool "Ada95"
- name "DefaultConstructorName"
- value "Create")
- (object Attribute
- tool "Ada95"
- name "InlineDefaultConstructor"
- value FALSE)
- (object Attribute
- tool "Ada95"
- name "GenerateCopyConstructor"
- value ("SubprogramKindSet" 199))
- (object Attribute
- tool "Ada95"
- name "CopyConstructorName"
- value "Copy")
- (object Attribute
- tool "Ada95"
- name "InlineCopyConstructor"
- value FALSE)
- (object Attribute
- tool "Ada95"
- name "GenerateDestructor"
- value ("ProcedureKindSet" 202))
- (object Attribute
- tool "Ada95"
- name "DestructorName"
- value "Free")
- (object Attribute
- tool "Ada95"
- name "InlineDestructor"
- value FALSE)
- (object Attribute
- tool "Ada95"
- name "GenerateTypeEquality"
- value ("FunctionKindSet" 201))
- (object Attribute
- tool "Ada95"
- name "TypeEqualityName"
- value "${quote}=${quote}")
- (object Attribute
- tool "Ada95"
- name "InlineEquality"
- value FALSE)
- (object Attribute
- tool "Ada95"
- name "Representation"
- value (value Text ""))
- (object Attribute
- tool "Ada95"
- name "TypeImplementationSet"
- value (list Attribute_Set
- (object Attribute
- tool "Ada95"
- name "Tagged"
- value 208)
- (object Attribute
- tool "Ada95"
- name "Record"
- value 210)
- (object Attribute
- tool "Ada95"
- name "Mixin"
- value 211)
- (object Attribute
- tool "Ada95"
- name "Protected"
- value 44)
- (object Attribute
- tool "Ada95"
- name "Task"
- value 212)))
- (object Attribute
- tool "Ada95"
- name "RecordImplementationSet"
- value (list Attribute_Set
- (object Attribute
- tool "Ada95"
- name "SingleType"
- value 209)
- (object Attribute
- tool "Ada95"
- name "MultipleTypes"
- value 213)))
- (object Attribute
- tool "Ada95"
- name "ParameterizedImplementationSet"
- value (list Attribute_Set
- (object Attribute
- tool "Ada95"
- name "Generic"
- value 11)
- (object Attribute
- tool "Ada95"
- name "Unconstrained"
- value 214)))
- (object Attribute
- tool "Ada95"
- name "TypeVisibilitySet"
- value (list Attribute_Set
- (object Attribute
- tool "Ada95"
- name "Public"
- value 45)
- (object Attribute
- tool "Ada95"
- name "Private"
- value 43)))
- (object Attribute
- tool "Ada95"
- name "SubprogramKindSet"
- value (list Attribute_Set
- (object Attribute
- tool "Ada95"
- name "Procedure"
- value 202)
- (object Attribute
- tool "Ada95"
- name "Function"
- value 199)
- (object Attribute
- tool "Ada95"
- name "DoNotCreate"
- value 201)))
- (object Attribute
- tool "Ada95"
- name "ProcedureKindSet"
- value (list Attribute_Set
- (object Attribute
- tool "Ada95"
- name "Procedure"
- value 202)
- (object Attribute
- tool "Ada95"
- name "DoNotCreate"
- value 201)))
- (object Attribute
- tool "Ada95"
- name "FunctionKindSet"
- value (list Attribute_Set
- (object Attribute
- tool "Ada95"
- name "Function"
- value 199)
- (object Attribute
- tool "Ada95"
- name "DoNotCreate"
- value 201)))
- (object Attribute
- tool "Ada95"
- name "TypeControlSet"
- value (list Attribute_Set
- (object Attribute
- tool "Ada95"
- name "None"
- value 225)
- (object Attribute
- tool "Ada95"
- name "InitializationOnly"
- value 226)
- (object Attribute
- tool "Ada95"
- name "AssignmentFinalizationOnly"
- value 227)
- (object Attribute
- tool "Ada95"
- name "All"
- value 228)))
- (object Attribute
- tool "Ada95"
- name "GenerateAccessTypeSet"
- value (list Attribute_Set
- (object Attribute
- tool "Ada95"
- name "Always"
- value 229)
- (object Attribute
- tool "Ada95"
- name "Auto"
- value 230)))))
- (object Attribute
- tool "Ada95"
- name "default__Module-Spec"
- value (list Attribute_Set
- (object Attribute
- tool "Ada95"
- name "Generate"
- value TRUE)
- (object Attribute
- tool "Ada95"
- name "CopyrightNotice"
- value (value Text ""))
- (object Attribute
- tool "Ada95"
- name "FileName"
- value "")
- (object Attribute
- tool "Ada95"
- name "ReturnType"
- value "")
- (object Attribute
- tool "Ada95"
- name "GenericFormalParameters"
- value (value Text ""))
- (object Attribute
- tool "Ada95"
- name "AdditionalWiths"
- value (value Text ""))
- (object Attribute
- tool "Ada95"
- name "IsPrivate"
- value FALSE)))
- (object Attribute
- tool "Ada95"
- name "default__Module-Body"
- value (list Attribute_Set
- (object Attribute
- tool "Ada95"
- name "Generate"
- value TRUE)
- (object Attribute
- tool "Ada95"
- name "CopyrightNotice"
- value (value Text ""))
- (object Attribute
- tool "Ada95"
- name "FileName"
- value "")
- (object Attribute
- tool "Ada95"
- name "ReturnType"
- value "")
- (object Attribute
- tool "Ada95"
- name "AdditionalWiths"
- value (value Text ""))
- (object Attribute
- tool "Ada95"
- name "IsSubunit"
- value FALSE)))
- (object Attribute
- tool "Ada95"
- name "default__Operation"
- value (list Attribute_Set
- (object Attribute
- tool "Ada95"
- name "CodeName"
- value "")
- (object Attribute
- tool "Ada95"
- name "SubprogramImplementation"
- value ("SubprogramImplementationSet" 2))
- (object Attribute
- tool "Ada95"
- name "Renames"
- value "")
- (object Attribute
- tool "Ada95"
- name "GenerateOverriding"
- value TRUE)
- (object Attribute
- tool "Ada95"
- name "ImplicitParameterMode"
- value ("ParameterModeSet" 203))
- (object Attribute
- tool "Ada95"
- name "ImplicitParameterClassWide"
- value FALSE)
- (object Attribute
- tool "Ada95"
- name "GenerateAccessOperation"
- value FALSE)
- (object Attribute
- tool "Ada95"
- name "Inline"
- value FALSE)
- (object Attribute
- tool "Ada95"
- name "EntryCode"
- value (value Text ""))
- (object Attribute
- tool "Ada95"
- name "ExitCode"
- value (value Text ""))
- (object Attribute
- tool "Ada95"
- name "InitialCodeBody"
- value "${default}")
- (object Attribute
- tool "Ada95"
- name "EntryBarrierCondition"
- value "True")
- (object Attribute
- tool "Ada95"
- name "Representation"
- value (value Text ""))
- (object Attribute
- tool "Ada95"
- name "SubprogramImplementationSet"
- value (list Attribute_Set
- (object Attribute
- tool "Ada95"
- name "Spec"
- value 224)
- (object Attribute
- tool "Ada95"
- name "Body"
- value 2)
- (object Attribute
- tool "Ada95"
- name "Abstract"
- value 221)
- (object Attribute
- tool "Ada95"
- name "Renaming"
- value 222)
- (object Attribute
- tool "Ada95"
- name "RenamingAsBody"
- value 231)
- (object Attribute
- tool "Ada95"
- name "Separate"
- value 223)))
- (object Attribute
- tool "Ada95"
- name "ParameterModeSet"
- value (list Attribute_Set
- (object Attribute
- tool "Ada95"
- name "In"
- value 204)
- (object Attribute
- tool "Ada95"
- name "Out"
- value 205)
- (object Attribute
- tool "Ada95"
- name "InOut"
- value 203)
- (object Attribute
- tool "Ada95"
- name "Access"
- value 220)
- (object Attribute
- tool "Ada95"
- name "DoNotCreate"
- value 201)))))
- (object Attribute
- tool "Ada95"
- name "default__Has"
- value (list Attribute_Set
- (object Attribute
- tool "Ada95"
- name "CodeName"
- value "")
- (object Attribute
- tool "Ada95"
- name "NameIfUnlabeled"
- value "The_${supplier}")
- (object Attribute
- tool "Ada95"
- name "RecordFieldImplementation"
- value ("RecordFieldImplementationSet" 216))
- (object Attribute
- tool "Ada95"
- name "RecordFieldName"
- value "${relationship}")
- (object Attribute
- tool "Ada95"
- name "GenerateGet"
- value ("FunctionKindSet" 199))
- (object Attribute
- tool "Ada95"
- name "GenerateAccessGet"
- value ("FunctionKindSet" 201))
- (object Attribute
- tool "Ada95"
- name "GetName"
- value "Get_${relationship}")
- (object Attribute
- tool "Ada95"
- name "InlineGet"
- value TRUE)
- (object Attribute
- tool "Ada95"
- name "GenerateSet"
- value ("ProcedureKindSet" 202))
- (object Attribute
- tool "Ada95"
- name "GenerateAccessSet"
- value ("ProcedureKindSet" 201))
- (object Attribute
- tool "Ada95"
- name "SetName"
- value "Set_${relationship}")
- (object Attribute
- tool "Ada95"
- name "InlineSet"
- value TRUE)
- (object Attribute
- tool "Ada95"
- name "IsAliased"
- value FALSE)
- (object Attribute
- tool "Ada95"
- name "IsConstant"
- value FALSE)
- (object Attribute
- tool "Ada95"
- name "InitialValue"
- value "")
- (object Attribute
- tool "Ada95"
- name "ContainerImplementation"
- value ("ContainerImplementationSet" 217))
- (object Attribute
- tool "Ada95"
- name "ContainerGeneric"
- value "List")
- (object Attribute
- tool "Ada95"
- name "ContainerType"
- value "")
- (object Attribute
- tool "Ada95"
- name "ContainerDeclarations"
- value (value Text ""))
- (object Attribute
- tool "Ada95"
- name "SelectorName"
- value "")
- (object Attribute
- tool "Ada95"
- name "SelectorType"
- value "")
- (object Attribute
- tool "Ada95"
- name "RecordFieldImplementationSet"
- value (list Attribute_Set
- (object Attribute
- tool "Ada95"
- name "Component"
- value 216)
- (object Attribute
- tool "Ada95"
- name "Discriminant"
- value 218)
- (object Attribute
- tool "Ada95"
- name "AccessDiscriminant"
- value 219)))
- (object Attribute
- tool "Ada95"
- name "ContainerImplementationSet"
- value (list Attribute_Set
- (object Attribute
- tool "Ada95"
- name "Array"
- value 217)
- (object Attribute
- tool "Ada95"
- name "Generic"
- value 11)))
- (object Attribute
- tool "Ada95"
- name "ProcedureKindSet"
- value (list Attribute_Set
- (object Attribute
- tool "Ada95"
- name "Procedure"
- value 202)
- (object Attribute
- tool "Ada95"
- name "DoNotCreate"
- value 201)))
- (object Attribute
- tool "Ada95"
- name "FunctionKindSet"
- value (list Attribute_Set
- (object Attribute
- tool "Ada95"
- name "Function"
- value 199)
- (object Attribute
- tool "Ada95"
- name "DoNotCreate"
- value 201)))))
- (object Attribute
- tool "Ada95"
- name "default__Attribute"
- value (list Attribute_Set
- (object Attribute
- tool "Ada95"
- name "CodeName"
- value "")
- (object Attribute
- tool "Ada95"
- name "RecordFieldImplementation"
- value ("RecordFieldImplementationSet" 216))
- (object Attribute
- tool "Ada95"
- name "RecordFieldName"
- value "${attribute}")
- (object Attribute
- tool "Ada95"
- name "GenerateGet"
- value ("FunctionKindSet" 199))
- (object Attribute
- tool "Ada95"
- name "GenerateAccessGet"
- value ("FunctionKindSet" 201))
- (object Attribute
- tool "Ada95"
- name "GetName"
- value "Get_${attribute}")
- (object Attribute
- tool "Ada95"
- name "InlineGet"
- value TRUE)
- (object Attribute
- tool "Ada95"
- name "GenerateSet"
- value ("ProcedureKindSet" 202))
- (object Attribute
- tool "Ada95"
- name "GenerateAccessSet"
- value ("ProcedureKindSet" 201))
- (object Attribute
- tool "Ada95"
- name "SetName"
- value "Set_${attribute}")
- (object Attribute
- tool "Ada95"
- name "InlineSet"
- value TRUE)
- (object Attribute
- tool "Ada95"
- name "IsAliased"
- value FALSE)
- (object Attribute
- tool "Ada95"
- name "IsConstant"
- value FALSE)
- (object Attribute
- tool "Ada95"
- name "InitialValue"
- value "")
- (object Attribute
- tool "Ada95"
- name "Representation"
- value (value Text ""))
- (object Attribute
- tool "Ada95"
- name "RecordFieldImplementationSet"
- value (list Attribute_Set
- (object Attribute
- tool "Ada95"
- name "Component"
- value 216)
- (object Attribute
- tool "Ada95"
- name "Discriminant"
- value 218)
- (object Attribute
- tool "Ada95"
- name "AccessDiscriminant"
- value 219)))
- (object Attribute
- tool "Ada95"
- name "ProcedureKindSet"
- value (list Attribute_Set
- (object Attribute
- tool "Ada95"
- name "Procedure"
- value 202)
- (object Attribute
- tool "Ada95"
- name "DoNotCreate"
- value 201)))
- (object Attribute
- tool "Ada95"
- name "FunctionKindSet"
- value (list Attribute_Set
- (object Attribute
- tool "Ada95"
- name "Function"
- value 199)
- (object Attribute
- tool "Ada95"
- name "DoNotCreate"
- value 201)))))
- (object Attribute
- tool "Ada95"
- name "default__Association"
- value (list Attribute_Set
- (object Attribute
- tool "Ada95"
- name "NameIfUnlabeled"
- value "The_${targetClass}")
- (object Attribute
- tool "Ada95"
- name "GenerateGet"
- value ("FunctionKindSet" 199))
- (object Attribute
- tool "Ada95"
- name "GetName"
- value "Get_${association}")
- (object Attribute
- tool "Ada95"
- name "InlineGet"
- value FALSE)
- (object Attribute
- tool "Ada95"
- name "GenerateSet"
- value ("ProcedureKindSet" 202))
- (object Attribute
- tool "Ada95"
- name "SetName"
- value "Set_${association}")
- (object Attribute
- tool "Ada95"
- name "InlineSet"
- value FALSE)
- (object Attribute
- tool "Ada95"
- name "GenerateAssociate"
- value ("ProcedureKindSet" 202))
- (object Attribute
- tool "Ada95"
- name "AssociateName"
- value "Associate")
- (object Attribute
- tool "Ada95"
- name "InlineAssociate"
- value FALSE)
- (object Attribute
- tool "Ada95"
- name "GenerateDissociate"
- value ("ProcedureKindSet" 202))
- (object Attribute
- tool "Ada95"
- name "DissociateName"
- value "Dissociate")
- (object Attribute
- tool "Ada95"
- name "InlineDissociate"
- value FALSE)
- (object Attribute
- tool "Ada95"
- name "ProcedureKindSet"
- value (list Attribute_Set
- (object Attribute
- tool "Ada95"
- name "Procedure"
- value 202)
- (object Attribute
- tool "Ada95"
- name "DoNotCreate"
- value 201)))
- (object Attribute
- tool "Ada95"
- name "FunctionKindSet"
- value (list Attribute_Set
- (object Attribute
- tool "Ada95"
- name "Function"
- value 199)
- (object Attribute
- tool "Ada95"
- name "DoNotCreate"
- value 201)))))
- (object Attribute
- tool "Ada95"
- name "default__Role"
- value (list Attribute_Set
- (object Attribute
- tool "Ada95"
- name "CodeName"
- value "")
- (object Attribute
- tool "Ada95"
- name "NameIfUnlabeled"
- value "The_${targetClass}")
- (object Attribute
- tool "Ada95"
- name "RecordFieldImplementation"
- value ("RecordFieldImplementationSet" 216))
- (object Attribute
- tool "Ada95"
- name "RecordFieldName"
- value "${target}")
- (object Attribute
- tool "Ada95"
- name "GenerateGet"
- value ("FunctionKindSet" 199))
- (object Attribute
- tool "Ada95"
- name "GenerateAccessGet"
- value ("FunctionKindSet" 201))
- (object Attribute
- tool "Ada95"
- name "GetName"
- value "Get_${target}")
- (object Attribute
- tool "Ada95"
- name "InlineGet"
- value TRUE)
- (object Attribute
- tool "Ada95"
- name "GenerateSet"
- value ("ProcedureKindSet" 202))
- (object Attribute
- tool "Ada95"
- name "GenerateAccessSet"
- value ("ProcedureKindSet" 201))
- (object Attribute
- tool "Ada95"
- name "SetName"
- value "Set_${target}")
- (object Attribute
- tool "Ada95"
- name "InlineSet"
- value TRUE)
- (object Attribute
- tool "Ada95"
- name "IsAliased"
- value FALSE)
- (object Attribute
- tool "Ada95"
- name "IsConstant"
- value FALSE)
- (object Attribute
- tool "Ada95"
- name "InitialValue"
- value "")
- (object Attribute
- tool "Ada95"
- name "ContainerImplementation"
- value ("ContainerImplementationSet" 217))
- (object Attribute
- tool "Ada95"
- name "ContainerGeneric"
- value "List")
- (object Attribute
- tool "Ada95"
- name "ContainerType"
- value "")
- (object Attribute
- tool "Ada95"
- name "ContainerDeclarations"
- value (value Text ""))
- (object Attribute
- tool "Ada95"
- name "SelectorName"
- value "")
- (object Attribute
- tool "Ada95"
- name "SelectorType"
- value "")
- (object Attribute
- tool "Ada95"
- name "ProcedureKindSet"
- value (list Attribute_Set
- (object Attribute
- tool "Ada95"
- name "Procedure"
- value 202)
- (object Attribute
- tool "Ada95"
- name "DoNotCreate"
- value 201)))
- (object Attribute
- tool "Ada95"
- name "RecordFieldImplementationSet"
- value (list Attribute_Set
- (object Attribute
- tool "Ada95"
- name "Component"
- value 216)
- (object Attribute
- tool "Ada95"
- name "Discriminant"
- value 218)
- (object Attribute
- tool "Ada95"
- name "AccessDiscriminant"
- value 219)))
- (object Attribute
- tool "Ada95"
- name "ContainerImplementationSet"
- value (list Attribute_Set
- (object Attribute
- tool "Ada95"
- name "Array"
- value 217)
- (object Attribute
- tool "Ada95"
- name "Generic"
- value 11)))
- (object Attribute
- tool "Ada95"
- name "FunctionKindSet"
- value (list Attribute_Set
- (object Attribute
- tool "Ada95"
- name "Function"
- value 199)
- (object Attribute
- tool "Ada95"
- name "DoNotCreate"
- value 201)))))
- (object Attribute
- tool "Ada95"
- name "default__Subsystem"
- value (list Attribute_Set
- (object Attribute
- tool "Ada95"
- name "Directory"
- value "AUTO GENERATE")))
- (object Attribute
- tool "Ada95"
- name "HiddenTool"
- value FALSE)
- (object Attribute
- tool "CORBA"
- name "propertyId"
- value "809135966")
- (object Attribute
- tool "CORBA"
- name "default__Project"
- value (list Attribute_Set
- (object Attribute
- tool "CORBA"
- name "CreateMissingDirectories"
- value TRUE)
- (object Attribute
- tool "CORBA"
- name "Editor"
- value ("EditorType" 100))
- (object Attribute
- tool "CORBA"
- name "IncludePath"
- value "")
- (object Attribute
- tool "CORBA"
- name "StopOnError"
- value TRUE)
- (object Attribute
- tool "CORBA"
- name "EditorType"
- value (list Attribute_Set
- (object Attribute
- tool "CORBA"
- name "BuiltIn"
- value 100)
- (object Attribute
- tool "CORBA"
- name "WindowsShell"
- value 101)))
- (object Attribute
- tool "CORBA"
- name "PathSeparator"
- value "")))
- (object Attribute
- tool "CORBA"
- name "default__Class"
- value (list Attribute_Set
- (object Attribute
- tool "CORBA"
- name "ArrayDimensions"
- value "")
- (object Attribute
- tool "CORBA"
- name "ConstValue"
- value "")
- (object Attribute
- tool "CORBA"
- name "ImplementationType"
- value "")))
- (object Attribute
- tool "CORBA"
- name "default__Module-Spec"
- value (list Attribute_Set
- (object Attribute
- tool "CORBA"
- name "AdditionalIncludes"
- value (value Text ""))
- (object Attribute
- tool "CORBA"
- name "CmIdentification"
- value (value Text " %X% %Q% %Z% %W%"))
- (object Attribute
- tool "CORBA"
- name "CopyrightNotice"
- value (value Text ""))
- (object Attribute
- tool "CORBA"
- name "InclusionProtectionSymbol"
- value "AUTO GENERATE")))
- (object Attribute
- tool "CORBA"
- name "default__Module-Body"
- value (list Attribute_Set
- (object Attribute
- tool "CORBA"
- name "AdditionalIncludes"
- value (value Text ""))
- (object Attribute
- tool "CORBA"
- name "CmIdentification"
- value (value Text " %X% %Q% %Z% %W%"))
- (object Attribute
- tool "CORBA"
- name "CopyrightNotice"
- value (value Text ""))
- (object Attribute
- tool "CORBA"
- name "InclusionProtectionSymbol"
- value "AUTO GENERATE")))
- (object Attribute
- tool "CORBA"
- name "default__Operation"
- value (list Attribute_Set
- (object Attribute
- tool "CORBA"
- name "Context"
- value "")
- (object Attribute
- tool "CORBA"
- name "OperationIsOneWay"
- value FALSE)))
- (object Attribute
- tool "CORBA"
- name "default__Attribute"
- value (list Attribute_Set
- (object Attribute
- tool "CORBA"
- name "ArrayDimensions"
- value "")
- (object Attribute
- tool "CORBA"
- name "CaseSpecifier"
- value "")
- (object Attribute
- tool "CORBA"
- name "IsReadOnly"
- value FALSE)
- (object Attribute
- tool "CORBA"
- name "Order"
- value "")))
- (object Attribute
- tool "CORBA"
- name "default__Role"
- value (list Attribute_Set
- (object Attribute
- tool "CORBA"
- name "ArrayDimensions"
- value "")
- (object Attribute
- tool "CORBA"
- name "CaseSpecifier"
- value "")
- (object Attribute
- tool "CORBA"
- name "GenerateForwardReference"
- value FALSE)
- (object Attribute
- tool "CORBA"
- name "IsReadOnly"
- value FALSE)
- (object Attribute
- tool "CORBA"
- name "Order"
- value "")
- (object Attribute
- tool "CORBA"
- name "BoundedRoleType"
- value ("AssocTypeSet" 47))
- (object Attribute
- tool "CORBA"
- name "AssocTypeSet"
- value (list Attribute_Set
- (object Attribute
- tool "CORBA"
- name "Array"
- value 24)
- (object Attribute
- tool "CORBA"
- name "Sequence"
- value 47)))))
- (object Attribute
- tool "CORBA"
- name "default__Uses"
- value (list Attribute_Set
- (object Attribute
- tool "CORBA"
- name "GenerateForwardReference"
- value FALSE)))
- (object Attribute
- tool "CORBA"
- name "HiddenTool"
- value FALSE)
- (object Attribute
- tool "ClearCase"
- name "HiddenTool"
- value FALSE)
- (object Attribute
- tool "Data Modeler"
- name "propertyId"
- value "809135966")
- (object Attribute
- tool "Data Modeler"
- name "default__Project"
- value (list Attribute_Set
- (object Attribute
- tool "Data Modeler"
- name "project"
- value "")
- (object Attribute
- tool "Data Modeler"
- name "TableCounter"
- value 0)
- (object Attribute
- tool "Data Modeler"
- name "ViewCounter"
- value 0)
- (object Attribute
- tool "Data Modeler"
- name "DomainCounter"
- value 0)
- (object Attribute
- tool "Data Modeler"
- name "SPPackageCounter"
- value 0)
- (object Attribute
- tool "Data Modeler"
- name "TriggerCounter"
- value 0)
- (object Attribute
- tool "Data Modeler"
- name "IndexCounter"
- value 0)
- (object Attribute
- tool "Data Modeler"
- name "ConstraintCounter"
- value 0)
- (object Attribute
- tool "Data Modeler"
- name "StoreProcedureCounter"
- value 0)
- (object Attribute
- tool "Data Modeler"
- name "PrimaryKeyCounter"
- value 0)
- (object Attribute
- tool "Data Modeler"
- name "ForeignKeyCounter"
- value 0)
- (object Attribute
- tool "Data Modeler"
- name "JoinCounter"
- value 0)
- (object Attribute
- tool "Data Modeler"
- name "TableSpaceCounter"
- value 0)
- (object Attribute
- tool "Data Modeler"
- name "cONTAINERCounter"
- value 0)
- (object Attribute
- tool "Data Modeler"
- name "TablePrefix"
- value "")
- (object Attribute
- tool "Data Modeler"
- name "ViewPrefix"
- value "")
- (object Attribute
- tool "Data Modeler"
- name "DomainPrefix"
- value "")
- (object Attribute
- tool "Data Modeler"
- name "TriggerPrefix"
- value "")
- (object Attribute
- tool "Data Modeler"
- name "IndexPrefix"
- value "")
- (object Attribute
- tool "Data Modeler"
- name "ConstraintPrefix"
- value "")
- (object Attribute
- tool "Data Modeler"
- name "StoreProcedurePrefix"
- value "")
- (object Attribute
- tool "Data Modeler"
- name "PrimaryKeyPrefix"
- value "")
- (object Attribute
- tool "Data Modeler"
- name "ForeignKeyPrefix"
- value "")
- (object Attribute
- tool "Data Modeler"
- name "TableSpacePrefix"
- value "")))
- (object Attribute
- tool "Data Modeler"
- name "default__Module-Spec"
- value (list Attribute_Set
- (object Attribute
- tool "Data Modeler"
- name "dmItem"
- value FALSE)
- (object Attribute
- tool "Data Modeler"
- name "DMName"
- value "")
- (object Attribute
- tool "Data Modeler"
- name "IsDatabase"
- value FALSE)
- (object Attribute
- tool "Data Modeler"
- name "TargetDatabase"
- value "")
- (object Attribute
- tool "Data Modeler"
- name "Location"
- value "")
- (object Attribute
- tool "Data Modeler"
- name "IsTableSpace"
- value FALSE)
- (object Attribute
- tool "Data Modeler"
- name "TableSpaceType"
- value "")
- (object Attribute
- tool "Data Modeler"
- name "IsDeault"
- value FALSE)
- (object Attribute
- tool "Data Modeler"
- name "BufferPool"
- value "")
- (object Attribute
- tool "Data Modeler"
- name "ExtentSize"
- value 1)
- (object Attribute
- tool "Data Modeler"
- name "PrefetchSize"
- value 1)
- (object Attribute
- tool "Data Modeler"
- name "PageSize"
- value 4)
- (object Attribute
- tool "Data Modeler"
- name "ManagedBy"
- value "")
- (object Attribute
- tool "Data Modeler"
- name "ContainerList"
- value "")))
- (object Attribute
- tool "Data Modeler"
- name "default__Category"
- value (list Attribute_Set
- (object Attribute
- tool "Data Modeler"
- name "dmItem"
- value FALSE)
- (object Attribute
- tool "Data Modeler"
- name "DMName"
- value "")
- (object Attribute
- tool "Data Modeler"
- name "dmSchema"
- value "")
- (object Attribute
- tool "Data Modeler"
- name "dmDomainPackage"
- value "")
- (object Attribute
- tool "Data Modeler"
- name "IsSchema"
- value FALSE)
- (object Attribute
- tool "Data Modeler"
- name "IsDomainPackage"
- value FALSE)
- (object Attribute
- tool "Data Modeler"
- name "IsRootSchema"
- value FALSE)
- (object Attribute
- tool "Data Modeler"
- name "IsRootDomainPackage"
- value FALSE)
- (object Attribute
- tool "Data Modeler"
- name "IsSchemaPackage"
- value FALSE)
- (object Attribute
- tool "Data Modeler"
- name "DatabaseID"
- value "")
- (object Attribute
- tool "Data Modeler"
- name "DBMS"
- value "")))
- (object Attribute
- tool "Data Modeler"
- name "default__Class"
- value (list Attribute_Set
- (object Attribute
- tool "Data Modeler"
- name "dmItem"
- value FALSE)
- (object Attribute
- tool "Data Modeler"
- name "DMName"
- value "")
- (object Attribute
- tool "Data Modeler"
- name "IsTable"
- value FALSE)
- (object Attribute
- tool "Data Modeler"
- name "IsView"
- value FALSE)
- (object Attribute
- tool "Data Modeler"
- name "IsDomain"
- value FALSE)
- (object Attribute
- tool "Data Modeler"
- name "IsSPPackage"
- value FALSE)
- (object Attribute
- tool "Data Modeler"
- name "Synonymns"
- value "")
- (object Attribute
- tool "Data Modeler"
- name "TableSpaceID"
- value "")
- (object Attribute
- tool "Data Modeler"
- name "SourceId"
- value "")
- (object Attribute
- tool "Data Modeler"
- name "SourceType"
- value "")
- (object Attribute
- tool "Data Modeler"
- name "CorrelationName"
- value "")
- (object Attribute
- tool "Data Modeler"
- name "SelectClause"
- value "")
- (object Attribute
- tool "Data Modeler"
- name "IsUpdateable"
- value TRUE)
- (object Attribute
- tool "Data Modeler"
- name "CheckOption"
- value "None")
- (object Attribute
- tool "Data Modeler"
- name "IsSnapShot"
- value FALSE)
- (object Attribute
- tool "Data Modeler"
- name "IsDistinct"
- value FALSE)
- (object Attribute
- tool "Data Modeler"
- name "PersistToServer"
- value "")
- (object Attribute
- tool "Data Modeler"
- name "IsPackage"
- value FALSE)))
- (object Attribute
- tool "Data Modeler"
- name "default__Attribute"
- value (list Attribute_Set
- (object Attribute
- tool "Data Modeler"
- name "dmItem"
- value FALSE)
- (object Attribute
- tool "Data Modeler"
- name "DMName"
- value "")
- (object Attribute
- tool "Data Modeler"
- name "Ordinal"
- value 0)
- (object Attribute
- tool "Data Modeler"
- name "IsIdentity"
- value FALSE)
- (object Attribute
- tool "Data Modeler"
- name "IsUnique"
- value FALSE)
- (object Attribute
- tool "Data Modeler"
- name "NullsAllowed"
- value FALSE)
- (object Attribute
- tool "Data Modeler"
- name "Length"
- value 0)
- (object Attribute
- tool "Data Modeler"
- name "Scale"
- value 0)
- (object Attribute
- tool "Data Modeler"
- name "ColumnType"
- value "Native")
- (object Attribute
- tool "Data Modeler"
- name "ForBitData"
- value FALSE)
- (object Attribute
- tool "Data Modeler"
- name "DefaultValueType"
- value "")
- (object Attribute
- tool "Data Modeler"
- name "DefaultValue"
- value "")
- (object Attribute
- tool "Data Modeler"
- name "SourceId"
- value "")
- (object Attribute
- tool "Data Modeler"
- name "SourceType"
- value "")
- (object Attribute
- tool "Data Modeler"
- name "OID"
- value FALSE)))
- (object Attribute
- tool "Data Modeler"
- name "default__Association"
- value (list Attribute_Set
- (object Attribute
- tool "Data Modeler"
- name "dmItem"
- value FALSE)
- (object Attribute
- tool "Data Modeler"
- name "DMName"
- value "")
- (object Attribute
- tool "Data Modeler"
- name "IsRelationship"
- value FALSE)
- (object Attribute
- tool "Data Modeler"
- name "SourceId"
- value "")
- (object Attribute
- tool "Data Modeler"
- name "SourceType"
- value "")
- (object Attribute
- tool "Data Modeler"
- name "RIMethod"
- value "")
- (object Attribute
- tool "Data Modeler"
- name "ParentUpdateRule"
- value "")
- (object Attribute
- tool "Data Modeler"
- name "ParentUpdateRuleName"
- value "")
- (object Attribute
- tool "Data Modeler"
- name "ParentDeleteRule"
- value "")
- (object Attribute
- tool "Data Modeler"
- name "ParentDeleteRuleName"
- value "")
- (object Attribute
- tool "Data Modeler"
- name "ChildInsertRestrict"
- value FALSE)
- (object Attribute
- tool "Data Modeler"
- name "ChildInsertRestrictName"
- value "")
- (object Attribute
- tool "Data Modeler"
- name "ChildMultiplicity"
- value FALSE)
- (object Attribute
- tool "Data Modeler"
- name "ChildMultiplicityName"
- value "")))
- (object Attribute
- tool "Data Modeler"
- name "default__Role"
- value (list Attribute_Set
- (object Attribute
- tool "Data Modeler"
- name "dmItem"
- value FALSE)
- (object Attribute
- tool "Data Modeler"
- name "DMName"
- value "")
- (object Attribute
- tool "Data Modeler"
- name "ConstraintName"
- value "")))
- (object Attribute
- tool "Data Modeler"
- name "default__Operation"
- value (list Attribute_Set
- (object Attribute
- tool "Data Modeler"
- name "dmItem"
- value FALSE)
- (object Attribute
- tool "Data Modeler"
- name "DMName"
- value "")
- (object Attribute
- tool "Data Modeler"
- name "IsConstraint"
- value FALSE)
- (object Attribute
- tool "Data Modeler"
- name "ConstraintType"
- value "")
- (object Attribute
- tool "Data Modeler"
- name "IsIndex"
- value FALSE)
- (object Attribute
- tool "Data Modeler"
- name "IsTrigger"
- value FALSE)
- (object Attribute
- tool "Data Modeler"
- name "IsStoredProcedure"
- value FALSE)
- (object Attribute
- tool "Data Modeler"
- name "IsCluster"
- value FALSE)
- (object Attribute
- tool "Data Modeler"
- name "TableSpace"
- value "")
- (object Attribute
- tool "Data Modeler"
- name "FillFactor"
- value 0)
- (object Attribute
- tool "Data Modeler"
- name "KeyList"
- value "")
- (object Attribute
- tool "Data Modeler"
- name "CheckPredicate"
- value "")
- (object Attribute
- tool "Data Modeler"
- name "IsUnique"
- value FALSE)
- (object Attribute
- tool "Data Modeler"
- name "DeferalMode"
- value "")
- (object Attribute
- tool "Data Modeler"
- name "InitialCheckTime"
- value "")
- (object Attribute
- tool "Data Modeler"
- name "TriggerType"
- value "")
- (object Attribute
- tool "Data Modeler"
- name "IsInsertEvent"
- value FALSE)
- (object Attribute
- tool "Data Modeler"
- name "IsUpdateEvent"
- value FALSE)
- (object Attribute
- tool "Data Modeler"
- name "IsDeleteEvent"
- value FALSE)
- (object Attribute
- tool "Data Modeler"
- name "RefOldTable"
- value "")
- (object Attribute
- tool "Data Modeler"
- name "RefNewTable"
- value "")
- (object Attribute
- tool "Data Modeler"
- name "RefOldRow"
- value "")
- (object Attribute
- tool "Data Modeler"
- name "RefNewRow"
- value "")
- (object Attribute
- tool "Data Modeler"
- name "IsRow"
- value FALSE)
- (object Attribute
- tool "Data Modeler"
- name "WhenClause"
- value "")
- (object Attribute
- tool "Data Modeler"
- name "Language"
- value "SQL")
- (object Attribute
- tool "Data Modeler"
- name "ProcType"
- value "Procedure")
- (object Attribute
- tool "Data Modeler"
- name "IsDeterministic"
- value FALSE)
- (object Attribute
- tool "Data Modeler"
- name "ParameterStyle"
- value "")
- (object Attribute
- tool "Data Modeler"
- name "ReturnedNull"
- value FALSE)
- (object Attribute
- tool "Data Modeler"
- name "ExternalName"
- value "")
- (object Attribute
- tool "Data Modeler"
- name "Length"
- value "")
- (object Attribute
- tool "Data Modeler"
- name "Scale"
- value "")
- (object Attribute
- tool "Data Modeler"
- name "ForBitData"
- value FALSE)
- (object Attribute
- tool "Data Modeler"
- name "DefaultValue"
- value "")
- (object Attribute
- tool "Data Modeler"
- name "DefaultValueType"
- value "")))
- (object Attribute
- tool "Data Modeler"
- name "default__Parameter"
- value (list Attribute_Set
- (object Attribute
- tool "Data Modeler"
- name "dmItem"
- value FALSE)
- (object Attribute
- tool "Data Modeler"
- name "DMName"
- value "")
- (object Attribute
- tool "Data Modeler"
- name "IsInParameter"
- value TRUE)
- (object Attribute
- tool "Data Modeler"
- name "IsOutParameter"
- value FALSE)
- (object Attribute
- tool "Data Modeler"
- name "Ordinal"
- value "")
- (object Attribute
- tool "Data Modeler"
- name "Length"
- value "")
- (object Attribute
- tool "Data Modeler"
- name "Scale"
- value "")
- (object Attribute
- tool "Data Modeler"
- name "ForBitData"
- value FALSE)
- (object Attribute
- tool "Data Modeler"
- name "DefaultValueType"
- value "")
- (object Attribute
- tool "Data Modeler"
- name "DefaultValue"
- value "")
- (object Attribute
- tool "Data Modeler"
- name "OperationID"
- value "")))
- (object Attribute
- tool "Data Modeler"
- name "HiddenTool"
- value FALSE)
- (object Attribute
- tool "Data Modeler Communicator"
- name "HiddenTool"
- value FALSE)
- (object Attribute
- tool "framework"
- name "HiddenTool"
- value FALSE)
- (object Attribute
- tool "Java"
- name "propertyId"
- value "809135966")
- (object Attribute
- tool "Java"
- name "default__Project"
- value (list Attribute_Set
- (object Attribute
- tool "Java"
- name "RootDir"
- value "")
- (object Attribute
- tool "Java"
- name "CreateMissingDirectories"
- value TRUE)
- (object Attribute
- tool "Java"
- name "StopOnError"
- value FALSE)
- (object Attribute
- tool "Java"
- name "UsePrefixes"
- value FALSE)
- (object Attribute
- tool "Java"
- name "AutoSync"
- value FALSE)
- (object Attribute
- tool "Java"
- name "NotShowRoseIDDlg"
- value FALSE)
- (object Attribute
- tool "Java"
- name "ShowCodegenDlg"
- value FALSE)
- (object Attribute
- tool "Java"
- name "GenerateRoseID"
- value TRUE)
- (object Attribute
- tool "Java"
- name "GenerateDefaultReturnLine"
- value TRUE)
- (object Attribute
- tool "Java"
- name "JavadocDefaultAuthor"
- value "")
- (object Attribute
- tool "Java"
- name "JavadocDefaultVersion"
- value "")
- (object Attribute
- tool "Java"
- name "JavadocDefaultSince"
- value "")
- (object Attribute
- tool "Java"
- name "UserDefineTagName1"
- value "")
- (object Attribute
- tool "Java"
- name "UserDefineTagApply1"
- value "")
- (object Attribute
- tool "Java"
- name "UserDefineTagText1"
- value "")
- (object Attribute
- tool "Java"
- name "UserDefineTagName2"
- value "")
- (object Attribute
- tool "Java"
- name "UserDefineTagApply2"
- value "")
- (object Attribute
- tool "Java"
- name "UserDefineTagText2"
- value "")
- (object Attribute
- tool "Java"
- name "UserDefineTagName3"
- value "")
- (object Attribute
- tool "Java"
- name "UserDefineTagApply3"
- value "")
- (object Attribute
- tool "Java"
- name "UserDefineTagText3"
- value "")
- (object Attribute
- tool "Java"
- name "JavadocNumAsterisks"
- value 0)
- (object Attribute
- tool "Java"
- name "MaxNumChars"
- value 80)
- (object Attribute
- tool "Java"
- name "Editor"
- value ("EditorType" 100))
- (object Attribute
- tool "Java"
- name "VM"
- value ("VMType" 200))
- (object Attribute
- tool "Java"
- name "ClassPath"
- value ";D:\\Program Files\\Sun\\jdk1.4.2_02\\jre\\lib\\charsets.jar;D:\\Program Files\\Sun\\jdk1.4.2_02\\jre\\lib\\jce.jar;D:\\Program Files\\Sun\\jdk1.4.2_02\\jre\\lib\\jsse.jar;D:\\Program Files\\Sun\\jdk1.4.2_02\\jre\\lib\\rt.jar;D:\\Program Files\\Sun\\jdk1.4.2_02\\jre\\lib\\sunrsasign.jar;D:\\Program Files\\Sun\\jdk1.4.2_02\\jre\\lib\\ext\\dnsns.jar;D:\\Program Files\\Sun\\jdk1.4.2_02\\jre\\lib\\ext\\ldapsec.jar;D:\\Program Files\\Sun\\jdk1.4.2_02\\jre\\lib\\ext\\localedata.jar;D:\\Program Files\\Sun\\jdk1.4.2_02\\jre\\lib\\ext\\sunjce_provider.jar;D:\\Program Files\\Sun\\jdk1.4.2_02\\jre\\lib\\security\\local_policy.jar;D:\\Program Files\\Sun\\jdk1.4.2_02\\jre\\lib\\security\\US_export_policy.jar;D:\\Program Files\\Sun\\jdk1.4.2_02\\lib\\dt.jar;D:\\Program Files\\Sun\\jdk1.4.2_02\\lib\\htmlconverter.jar;D:\\Program Files\\Sun\\jdk1.4.2_02\\lib\\tools.jar")
- (object Attribute
- tool "Java"
- name "ReferenceClasspath"
- value "")
- (object Attribute
- tool "Java"
- name "EditorType"
- value (list Attribute_Set
- (object Attribute
- tool "Java"
- name "BuiltIn"
- value 100)
- (object Attribute
- tool "Java"
- name "WindowsShell"
- value 101)))
- (object Attribute
- tool "Java"
- name "VMType"
- value (list Attribute_Set
- (object Attribute
- tool "Java"
- name "Sun"
- value 200)))
- (object Attribute
- tool "Java"
- name "VAJavaWorkingFolder"
- value "")
- (object Attribute
- tool "Java"
- name "InstanceVariablePrefix"
- value "")
- (object Attribute
- tool "Java"
- name "ClassVariablePrefix"
- value "")
- (object Attribute
- tool "Java"
- name "DefaultAttributeDataType"
- value "int")
- (object Attribute
- tool "Java"
- name "DefaultOperationReturnType"
- value "void")
- (object Attribute
- tool "Java"
- name "NoClassCustomDlg"
- value FALSE)
- (object Attribute
- tool "Java"
- name "GlobalImports"
- value (value Text ""))
- (object Attribute
- tool "Java"
- name "OpenBraceClassStyle"
- value TRUE)
- (object Attribute
- tool "Java"
- name "OpenBraceMethodStyle"
- value TRUE)
- (object Attribute
- tool "Java"
- name "UseTabs"
- value FALSE)
- (object Attribute
- tool "Java"
- name "UseSpaces"
- value TRUE)
- (object Attribute
- tool "Java"
- name "SpacingItems"
- value 3)
- (object Attribute
- tool "Java"
- name "RoseDefaultCommentStyle"
- value TRUE)
- (object Attribute
- tool "Java"
- name "AsteriskCommentStyle"
- value TRUE)
- (object Attribute
- tool "Java"
- name "JavaCommentStyle"
- value TRUE)
- (object Attribute
- tool "Java"
- name "JavadocAuthor"
- value FALSE)
- (object Attribute
- tool "Java"
- name "JavadocSince"
- value FALSE)
- (object Attribute
- tool "Java"
- name "JavadocVersion"
- value FALSE)
- (object Attribute
- tool "Java"
- name "BeanPrefix"
- value "")
- (object Attribute
- tool "Java"
- name "BeanSuffix"
- value "")
- (object Attribute
- tool "Java"
- name "RemotePrefix"
- value "")
- (object Attribute
- tool "Java"
- name "RemoteSuffix"
- value "")
- (object Attribute
- tool "Java"
- name "HomePrefix"
- value "")
- (object Attribute
- tool "Java"
- name "HomeSuffix"
- value "")
- (object Attribute
- tool "Java"
- name "PrimaryKeyPrefix"
- value "")
- (object Attribute
- tool "Java"
- name "PrimaryKeySuffix"
- value "")
- (object Attribute
- tool "Java"
- name "EJBDTDLocation"
- value "")
- (object Attribute
- tool "Java"
- name "ServletDTDLocation"
- value "")
- (object Attribute
- tool "Java"
- name "DefaultEJBVersion"
- value "")
- (object Attribute
- tool "Java"
- name "DefaultServletVersion"
- value "")
- (object Attribute
- tool "Java"
- name "GenerateDefaultJ2EEJavadoc"
- value TRUE)
- (object Attribute
- tool "Java"
- name "UserDefineJavaDocTags"
- value "")
- (object Attribute
- tool "Java"
- name "LocalPrefix"
- value "")
- (object Attribute
- tool "Java"
- name "LocalSuffix"
- value "")
- (object Attribute
- tool "Java"
- name "LocalHomePrefix"
- value "")
- (object Attribute
- tool "Java"
- name "LocalHomeSuffix"
- value "")
- (object Attribute
- tool "Java"
- name "SourceControl"
- value FALSE)
- (object Attribute
- tool "Java"
- name "SCCSelected"
- value FALSE)
- (object Attribute
- tool "Java"
- name "SCCProjectSourceRoot"
- value "")
- (object Attribute
- tool "Java"
- name "SCCProjectName"
- value "")
- (object Attribute
- tool "Java"
- name "SCCComment"
- value FALSE)))
- (object Attribute
- tool "Java"
- name "default__Class"
- value (list Attribute_Set
- (object Attribute
- tool "Java"
- name "Final"
- value FALSE)
- (object Attribute
- tool "Java"
- name "Static"
- value FALSE)
- (object Attribute
- tool "Java"
- name "GenerateDefaultConstructor"
- value TRUE)
- (object Attribute
- tool "Java"
- name "ConstructorIs"
- value ("Ctor_Set" 62))
- (object Attribute
- tool "Java"
- name "Ctor_Set"
- value (list Attribute_Set
- (object Attribute
- tool "Java"
- name "public"
- value 62)
- (object Attribute
- tool "Java"
- name "protected"
- value 63)
- (object Attribute
- tool "Java"
- name "private"
- value 64)
- (object Attribute
- tool "Java"
- name "package"
- value 65)))
- (object Attribute
- tool "Java"
- name "GenerateFinalizer"
- value FALSE)
- (object Attribute
- tool "Java"
- name "GenerateStaticInitializer"
- value FALSE)
- (object Attribute
- tool "Java"
- name "GenerateInstanceInitializer"
- value FALSE)
- (object Attribute
- tool "Java"
- name "GenerateCode"
- value TRUE)
- (object Attribute
- tool "Java"
- name "DisableAutoSync"
- value FALSE)
- (object Attribute
- tool "Java"
- name "ReadOnly"
- value FALSE)
- (object Attribute
- tool "Java"
- name "Strictfp"
- value FALSE)
- (object Attribute
- tool "Java"
- name "ServletName"
- value "")
- (object Attribute
- tool "Java"
- name "ServletContextRef"
- value FALSE)
- (object Attribute
- tool "Java"
- name "IsSingleThread"
- value FALSE)
- (object Attribute
- tool "Java"
- name "ServletInitParameter"
- value "")
- (object Attribute
- tool "Java"
- name "ServletInitParameterNames"
- value FALSE)
- (object Attribute
- tool "Java"
- name "ServletIsSecure"
- value FALSE)
- (object Attribute
- tool "Java"
- name "ServletRequestDispatcher"
- value FALSE)
- (object Attribute
- tool "Java"
- name "ServletRequestDispatcherPath"
- value "")
- (object Attribute
- tool "Java"
- name "DispatcherInclude"
- value FALSE)
- (object Attribute
- tool "Java"
- name "DispatcherForward"
- value FALSE)
- (object Attribute
- tool "Java"
- name "ServletSecurityRoles"
- value "")
- (object Attribute
- tool "Java"
- name "ServletgetInfo"
- value "")
- (object Attribute
- tool "Java"
- name "ServletXMLFilePath"
- value "")
- (object Attribute
- tool "Java"
- name "ServletRequestAttribute"
- value "")
- (object Attribute
- tool "Java"
- name "ServletRequestAttributesNames"
- value FALSE)
- (object Attribute
- tool "Java"
- name "MethodForRequestAttributes"
- value "")
- (object Attribute
- tool "Java"
- name "ServletRequestParameter"
- value "")
- (object Attribute
- tool "Java"
- name "ServletRequestParameterNames"
- value FALSE)
- (object Attribute
- tool "Java"
- name "MethodForRequestParameters"
- value "")
- (object Attribute
- tool "Java"
- name "ServletHeader"
- value "")
- (object Attribute
- tool "Java"
- name "ServletHeaderNames"
- value FALSE)
- (object Attribute
- tool "Java"
- name "MethodForHeaders"
- value "")
- (object Attribute
- tool "Java"
- name "ServletIntHeader"
- value FALSE)
- (object Attribute
- tool "Java"
- name "ServletDateHeader"
- value FALSE)
- (object Attribute
- tool "Java"
- name "ServletCookie"
- value FALSE)
- (object Attribute
- tool "Java"
- name "MethodForCookie"
- value "")
- (object Attribute
- tool "Java"
- name "ServletContentType"
- value "")
- (object Attribute
- tool "Java"
- name "GenerateHTML"
- value FALSE)
- (object Attribute
- tool "Java"
- name "Generate_XML_DD"
- value TRUE)
- (object Attribute
- tool "Java"
- name "EJBCmpField"
- value "")
- (object Attribute
- tool "Java"
- name "EJBEnvironmentProperties"
- value "")
- (object Attribute
- tool "Java"
- name "EJBCnxFactory"
- value "")
- (object Attribute
- tool "Java"
- name "EJBReferences"
- value "")
- (object Attribute
- tool "Java"
- name "EJBSecurityRoles"
- value "")
- (object Attribute
- tool "Java"
- name "EJBNameInJAR"
- value "")
- (object Attribute
- tool "Java"
- name "EJBSessionType"
- value ("EJBSessionType_Set" 200))
- (object Attribute
- tool "Java"
- name "EJBSessionType_Set"
- value (list Attribute_Set
- (object Attribute
- tool "Java"
- name ""
- value 200)
- (object Attribute
- tool "Java"
- name "Stateless"
- value 201)
- (object Attribute
- tool "Java"
- name "Stateful"
- value 202)))
- (object Attribute
- tool "Java"
- name "EJBTransactionType"
- value ("EJBTransactionType_Set" 211))
- (object Attribute
- tool "Java"
- name "EJBTransactionType_Set"
- value (list Attribute_Set
- (object Attribute
- tool "Java"
- name "Container"
- value 211)
- (object Attribute
- tool "Java"
- name "Bean"
- value 212)))
- (object Attribute
- tool "Java"
- name "EJBPersistenceType"
- value ("EJBPersistenceType_Set" 220))
- (object Attribute
- tool "Java"
- name "EJBPersistenceType_Set"
- value (list Attribute_Set
- (object Attribute
- tool "Java"
- name ""
- value 220)
- (object Attribute
- tool "Java"
- name "Bean"
- value 221)
- (object Attribute
- tool "Java"
- name "Container"
- value 222)))
- (object Attribute
- tool "Java"
- name "EJBReentrant"
- value FALSE)
- (object Attribute
- tool "Java"
- name "EJBSessionSync"
- value FALSE)
- (object Attribute
- tool "Java"
- name "EJBVersion"
- value ("EJBVersion_Set" 230))
- (object Attribute
- tool "Java"
- name "EJBVersion_Set"
- value (list Attribute_Set
- (object Attribute
- tool "Java"
- name "2.0"
- value 230)
- (object Attribute
- tool "Java"
- name "1.x"
- value 231)))
- (object Attribute
- tool "Java"
- name "EJBXMLFilePath"
- value "")))
- (object Attribute
- tool "Java"
- name "Default_Servlet__Class"
- value (list Attribute_Set
- (object Attribute
- tool "Java"
- name "ServletName"
- value "")
- (object Attribute
- tool "Java"
- name "ServletContextRef"
- value FALSE)
- (object Attribute
- tool "Java"
- name "IsSingleThread"
- value FALSE)
- (object Attribute
- tool "Java"
- name "ServletInitParameter"
- value "")
- (object Attribute
- tool "Java"
- name "ServletInitParameterNames"
- value FALSE)
- (object Attribute
- tool "Java"
- name "ServletIsSecure"
- value FALSE)
- (object Attribute
- tool "Java"
- name "ServletRequestDispatcher"
- value FALSE)
- (object Attribute
- tool "Java"
- name "ServletRequestDispatcherPath"
- value "")
- (object Attribute
- tool "Java"
- name "DispatcherInclude"
- value FALSE)
- (object Attribute
- tool "Java"
- name "DispatcherForward"
- value FALSE)
- (object Attribute
- tool "Java"
- name "ServletSecurityRoles"
- value "")
- (object Attribute
- tool "Java"
- name "ServletgetInfo"
- value "")
- (object Attribute
- tool "Java"
- name "ServletXMLFilePath"
- value "")
- (object Attribute
- tool "Java"
- name "Final"
- value FALSE)
- (object Attribute
- tool "Java"
- name "Static"
- value FALSE)
- (object Attribute
- tool "Java"
- name "GenerateDefaultConstructor"
- value TRUE)
- (object Attribute
- tool "Java"
- name "ConstructorIs"
- value ("Ctor_Set" 62))
- (object Attribute
- tool "Java"
- name "Ctor_Set"
- value (list Attribute_Set
- (object Attribute
- tool "Java"
- name "public"
- value 62)
- (object Attribute
- tool "Java"
- name "protected"
- value 63)
- (object Attribute
- tool "Java"
- name "private"
- value 64)
- (object Attribute
- tool "Java"
- name "package"
- value 65)))
- (object Attribute
- tool "Java"
- name "GenerateFinalizer"
- value FALSE)
- (object Attribute
- tool "Java"
- name "GenerateStaticInitializer"
- value FALSE)
- (object Attribute
- tool "Java"
- name "GenerateInstanceInitializer"
- value FALSE)
- (object Attribute
- tool "Java"
- name "GenerateCode"
- value TRUE)
- (object Attribute
- tool "Java"
- name "DisableAutoSync"
- value FALSE)
- (object Attribute
- tool "Java"
- name "ReadOnly"
- value FALSE)
- (object Attribute
- tool "Java"
- name "Strictfp"
- value FALSE)
- (object Attribute
- tool "Java"
- name "ServletRequestAttribute"
- value "")
- (object Attribute
- tool "Java"
- name "ServletRequestAttributesNames"
- value FALSE)
- (object Attribute
- tool "Java"
- name "MethodForRequestAttributes"
- value "")
- (object Attribute
- tool "Java"
- name "ServletRequestParameter"
- value "")
- (object Attribute
- tool "Java"
- name "ServletRequestParameterNames"
- value FALSE)
- (object Attribute
- tool "Java"
- name "MethodForRequestParameters"
- value "")
- (object Attribute
- tool "Java"
- name "ServletHeader"
- value "")
- (object Attribute
- tool "Java"
- name "ServletHeaderNames"
- value FALSE)
- (object Attribute
- tool "Java"
- name "MethodForHeaders"
- value "")
- (object Attribute
- tool "Java"
- name "ServletIntHeader"
- value FALSE)
- (object Attribute
- tool "Java"
- name "ServletDateHeader"
- value FALSE)
- (object Attribute
- tool "Java"
- name "ServletCookie"
- value FALSE)
- (object Attribute
- tool "Java"
- name "MethodForCookie"
- value "")
- (object Attribute
- tool "Java"
- name "ServletContentType"
- value "")
- (object Attribute
- tool "Java"
- name "GenerateHTML"
- value FALSE)
- (object Attribute
- tool "Java"
- name "Generate_XML_DD"
- value TRUE)
- (object Attribute
- tool "Java"
- name "EJBCmpField"
- value "")
- (object Attribute
- tool "Java"
- name "EJBEnvironmentProperties"
- value "")
- (object Attribute
- tool "Java"
- name "EJBCnxFactory"
- value "")
- (object Attribute
- tool "Java"
- name "EJBReferences"
- value "")
- (object Attribute
- tool "Java"
- name "EJBSecurityRoles"
- value "")
- (object Attribute
- tool "Java"
- name "EJBNameInJAR"
- value "")
- (object Attribute
- tool "Java"
- name "EJBSessionType"
- value ("EJBSessionType_Set" 200))
- (object Attribute
- tool "Java"
- name "EJBSessionType_Set"
- value (list Attribute_Set
- (object Attribute
- tool "Java"
- name ""
- value 200)
- (object Attribute
- tool "Java"
- name "Stateless"
- value 201)
- (object Attribute
- tool "Java"
- name "Stateful"
- value 202)))
- (object Attribute
- tool "Java"
- name "EJBTransactionType"
- value ("EJBTransactionType_Set" 211))
- (object Attribute
- tool "Java"
- name "EJBTransactionType_Set"
- value (list Attribute_Set
- (object Attribute
- tool "Java"
- name "Container"
- value 211)
- (object Attribute
- tool "Java"
- name "Bean"
- value 212)))
- (object Attribute
- tool "Java"
- name "EJBPersistenceType"
- value ("EJBPersistenceType_Set" 220))
- (object Attribute
- tool "Java"
- name "EJBPersistenceType_Set"
- value (list Attribute_Set
- (object Attribute
- tool "Java"
- name ""
- value 220)
- (object Attribute
- tool "Java"
- name "Bean"
- value 221)
- (object Attribute
- tool "Java"
- name "Container"
- value 222)))
- (object Attribute
- tool "Java"
- name "EJBReentrant"
- value FALSE)
- (object Attribute
- tool "Java"
- name "EJBSessionSync"
- value FALSE)
- (object Attribute
- tool "Java"
- name "EJBVersion"
- value ("EJBVersion_Set" 230))
- (object Attribute
- tool "Java"
- name "EJBVersion_Set"
- value (list Attribute_Set
- (object Attribute
- tool "Java"
- name "2.0"
- value 230)
- (object Attribute
- tool "Java"
- name "1.x"
- value 231)))
- (object Attribute
- tool "Java"
- name "EJBXMLFilePath"
- value "")))
- (object Attribute
- tool "Java"
- name "Http_Servlet__Class"
- value (list Attribute_Set
- (object Attribute
- tool "Java"
- name "ServletRequestAttribute"
- value "")
- (object Attribute
- tool "Java"
- name "ServletRequestAttributesNames"
- value FALSE)
- (object Attribute
- tool "Java"
- name "MethodForRequestAttributes"
- value "")
- (object Attribute
- tool "Java"
- name "ServletRequestParameter"
- value "")
- (object Attribute
- tool "Java"
- name "ServletRequestParameterNames"
- value FALSE)
- (object Attribute
- tool "Java"
- name "MethodForRequestParameters"
- value "")
- (object Attribute
- tool "Java"
- name "ServletHeader"
- value "")
- (object Attribute
- tool "Java"
- name "ServletHeaderNames"
- value FALSE)
- (object Attribute
- tool "Java"
- name "MethodForHeaders"
- value "")
- (object Attribute
- tool "Java"
- name "ServletIntHeader"
- value FALSE)
- (object Attribute
- tool "Java"
- name "ServletDateHeader"
- value FALSE)
- (object Attribute
- tool "Java"
- name "ServletCookie"
- value FALSE)
- (object Attribute
- tool "Java"
- name "MethodForCookie"
- value "")
- (object Attribute
- tool "Java"
- name "ServletContentType"
- value "")
- (object Attribute
- tool "Java"
- name "GenerateHTML"
- value FALSE)
- (object Attribute
- tool "Java"
- name "Final"
- value FALSE)
- (object Attribute
- tool "Java"
- name "Static"
- value FALSE)
- (object Attribute
- tool "Java"
- name "GenerateDefaultConstructor"
- value TRUE)
- (object Attribute
- tool "Java"
- name "ConstructorIs"
- value ("Ctor_Set" 62))
- (object Attribute
- tool "Java"
- name "Ctor_Set"
- value (list Attribute_Set
- (object Attribute
- tool "Java"
- name "public"
- value 62)
- (object Attribute
- tool "Java"
- name "protected"
- value 63)
- (object Attribute
- tool "Java"
- name "private"
- value 64)
- (object Attribute
- tool "Java"
- name "package"
- value 65)))
- (object Attribute
- tool "Java"
- name "GenerateFinalizer"
- value FALSE)
- (object Attribute
- tool "Java"
- name "GenerateStaticInitializer"
- value FALSE)
- (object Attribute
- tool "Java"
- name "GenerateInstanceInitializer"
- value FALSE)
- (object Attribute
- tool "Java"
- name "GenerateCode"
- value TRUE)
- (object Attribute
- tool "Java"
- name "DisableAutoSync"
- value FALSE)
- (object Attribute
- tool "Java"
- name "ReadOnly"
- value FALSE)
- (object Attribute
- tool "Java"
- name "Strictfp"
- value FALSE)
- (object Attribute
- tool "Java"
- name "ServletName"
- value "")
- (object Attribute
- tool "Java"
- name "ServletContextRef"
- value FALSE)
- (object Attribute
- tool "Java"
- name "IsSingleThread"
- value FALSE)
- (object Attribute
- tool "Java"
- name "ServletInitParameter"
- value "")
- (object Attribute
- tool "Java"
- name "ServletInitParameterNames"
- value FALSE)
- (object Attribute
- tool "Java"
- name "ServletIsSecure"
- value FALSE)
- (object Attribute
- tool "Java"
- name "ServletRequestDispatcher"
- value FALSE)
- (object Attribute
- tool "Java"
- name "ServletRequestDispatcherPath"
- value "")
- (object Attribute
- tool "Java"
- name "DispatcherInclude"
- value FALSE)
- (object Attribute
- tool "Java"
- name "DispatcherForward"
- value FALSE)
- (object Attribute
- tool "Java"
- name "ServletSecurityRoles"
- value "")
- (object Attribute
- tool "Java"
- name "ServletgetInfo"
- value "")
- (object Attribute
- tool "Java"
- name "ServletXMLFilePath"
- value "")
- (object Attribute
- tool "Java"
- name "Generate_XML_DD"
- value TRUE)
- (object Attribute
- tool "Java"
- name "EJBCmpField"
- value "")
- (object Attribute
- tool "Java"
- name "EJBEnvironmentProperties"
- value "")
- (object Attribute
- tool "Java"
- name "EJBCnxFactory"
- value "")
- (object Attribute
- tool "Java"
- name "EJBReferences"
- value "")
- (object Attribute
- tool "Java"
- name "EJBSecurityRoles"
- value "")
- (object Attribute
- tool "Java"
- name "EJBNameInJAR"
- value "")
- (object Attribute
- tool "Java"
- name "EJBSessionType"
- value ("EJBSessionType_Set" 200))
- (object Attribute
- tool "Java"
- name "EJBSessionType_Set"
- value (list Attribute_Set
- (object Attribute
- tool "Java"
- name ""
- value 200)
- (object Attribute
- tool "Java"
- name "Stateless"
- value 201)
- (object Attribute
- tool "Java"
- name "Stateful"
- value 202)))
- (object Attribute
- tool "Java"
- name "EJBTransactionType"
- value ("EJBTransactionType_Set" 211))
- (object Attribute
- tool "Java"
- name "EJBTransactionType_Set"
- value (list Attribute_Set
- (object Attribute
- tool "Java"
- name "Container"
- value 211)
- (object Attribute
- tool "Java"
- name "Bean"
- value 212)))
- (object Attribute
- tool "Java"
- name "EJBPersistenceType"
- value ("EJBPersistenceType_Set" 220))
- (object Attribute
- tool "Java"
- name "EJBPersistenceType_Set"
- value (list Attribute_Set
- (object Attribute
- tool "Java"
- name ""
- value 220)
- (object Attribute
- tool "Java"
- name "Bean"
- value 221)
- (object Attribute
- tool "Java"
- name "Container"
- value 222)))
- (object Attribute
- tool "Java"
- name "EJBReentrant"
- value FALSE)
- (object Attribute
- tool "Java"
- name "EJBSessionSync"
- value FALSE)
- (object Attribute
- tool "Java"
- name "EJBVersion"
- value ("EJBVersion_Set" 230))
- (object Attribute
- tool "Java"
- name "EJBVersion_Set"
- value (list Attribute_Set
- (object Attribute
- tool "Java"
- name "2.0"
- value 230)
- (object Attribute
- tool "Java"
- name "1.x"
- value 231)))
- (object Attribute
- tool "Java"
- name "EJBXMLFilePath"
- value "")))
- (object Attribute
- tool "Java"
- name "Default_EJB__Class"
- value (list Attribute_Set
- (object Attribute
- tool "Java"
- name "Generate_XML_DD"
- value TRUE)
- (object Attribute
- tool "Java"
- name "EJBCmpField"
- value "")
- (object Attribute
- tool "Java"
- name "EJBEnvironmentProperties"
- value "")
- (object Attribute
- tool "Java"
- name "EJBCnxFactory"
- value "")
- (object Attribute
- tool "Java"
- name "EJBReferences"
- value "")
- (object Attribute
- tool "Java"
- name "EJBSecurityRoles"
- value "")
- (object Attribute
- tool "Java"
- name "EJBNameInJAR"
- value "")
- (object Attribute
- tool "Java"
- name "EJBSessionType"
- value ("EJBSessionType_Set" 200))
- (object Attribute
- tool "Java"
- name "EJBSessionType_Set"
- value (list Attribute_Set
- (object Attribute
- tool "Java"
- name ""
- value 200)
- (object Attribute
- tool "Java"
- name "Stateless"
- value 201)
- (object Attribute
- tool "Java"
- name "Stateful"
- value 202)))
- (object Attribute
- tool "Java"
- name "EJBTransactionType"
- value ("EJBTransactionType_Set" 211))
- (object Attribute
- tool "Java"
- name "EJBTransactionType_Set"
- value (list Attribute_Set
- (object Attribute
- tool "Java"
- name "Container"
- value 211)
- (object Attribute
- tool "Java"
- name "Bean"
- value 212)))
- (object Attribute
- tool "Java"
- name "EJBPersistenceType"
- value ("EJBPersistenceType_Set" 220))
- (object Attribute
- tool "Java"
- name "EJBPersistenceType_Set"
- value (list Attribute_Set
- (object Attribute
- tool "Java"
- name ""
- value 220)
- (object Attribute
- tool "Java"
- name "Bean"
- value 221)
- (object Attribute
- tool "Java"
- name "Container"
- value 222)))
- (object Attribute
- tool "Java"
- name "EJBReentrant"
- value FALSE)
- (object Attribute
- tool "Java"
- name "EJBSessionSync"
- value FALSE)
- (object Attribute
- tool "Java"
- name "EJBVersion"
- value ("EJBVersion_Set" 230))
- (object Attribute
- tool "Java"
- name "EJBVersion_Set"
- value (list Attribute_Set
- (object Attribute
- tool "Java"
- name "2.0"
- value 230)
- (object Attribute
- tool "Java"
- name "1.x"
- value 231)))
- (object Attribute
- tool "Java"
- name "EJBXMLFilePath"
- value "")
- (object Attribute
- tool "Java"
- name "Final"
- value FALSE)
- (object Attribute
- tool "Java"
- name "Static"
- value FALSE)
- (object Attribute
- tool "Java"
- name "GenerateDefaultConstructor"
- value TRUE)
- (object Attribute
- tool "Java"
- name "ConstructorIs"
- value ("Ctor_Set" 62))
- (object Attribute
- tool "Java"
- name "Ctor_Set"
- value (list Attribute_Set
- (object Attribute
- tool "Java"
- name "public"
- value 62)
- (object Attribute
- tool "Java"
- name "protected"
- value 63)
- (object Attribute
- tool "Java"
- name "private"
- value 64)
- (object Attribute
- tool "Java"
- name "package"
- value 65)))
- (object Attribute
- tool "Java"
- name "GenerateFinalizer"
- value FALSE)
- (object Attribute
- tool "Java"
- name "GenerateStaticInitializer"
- value FALSE)
- (object Attribute
- tool "Java"
- name "GenerateInstanceInitializer"
- value FALSE)
- (object Attribute
- tool "Java"
- name "GenerateCode"
- value TRUE)
- (object Attribute
- tool "Java"
- name "DisableAutoSync"
- value FALSE)
- (object Attribute
- tool "Java"
- name "ReadOnly"
- value FALSE)
- (object Attribute
- tool "Java"
- name "Strictfp"
- value FALSE)
- (object Attribute
- tool "Java"
- name "ServletName"
- value "")
- (object Attribute
- tool "Java"
- name "ServletContextRef"
- value FALSE)
- (object Attribute
- tool "Java"
- name "IsSingleThread"
- value FALSE)
- (object Attribute
- tool "Java"
- name "ServletInitParameter"
- value "")
- (object Attribute
- tool "Java"
- name "ServletInitParameterNames"
- value FALSE)
- (object Attribute
- tool "Java"
- name "ServletIsSecure"
- value FALSE)
- (object Attribute
- tool "Java"
- name "ServletRequestDispatcher"
- value FALSE)
- (object Attribute
- tool "Java"
- name "ServletRequestDispatcherPath"
- value "")
- (object Attribute
- tool "Java"
- name "DispatcherInclude"
- value FALSE)
- (object Attribute
- tool "Java"
- name "DispatcherForward"
- value FALSE)
- (object Attribute
- tool "Java"
- name "ServletSecurityRoles"
- value "")
- (object Attribute
- tool "Java"
- name "ServletgetInfo"
- value "")
- (object Attribute
- tool "Java"
- name "ServletXMLFilePath"
- value "")
- (object Attribute
- tool "Java"
- name "ServletRequestAttribute"
- value "")
- (object Attribute
- tool "Java"
- name "ServletRequestAttributesNames"
- value FALSE)
- (object Attribute
- tool "Java"
- name "MethodForRequestAttributes"
- value "")
- (object Attribute
- tool "Java"
- name "ServletRequestParameter"
- value "")
- (object Attribute
- tool "Java"
- name "ServletRequestParameterNames"
- value FALSE)
- (object Attribute
- tool "Java"
- name "MethodForRequestParameters"
- value "")
- (object Attribute
- tool "Java"
- name "ServletHeader"
- value "")
- (object Attribute
- tool "Java"
- name "ServletHeaderNames"
- value FALSE)
- (object Attribute
- tool "Java"
- name "MethodForHeaders"
- value "")
- (object Attribute
- tool "Java"
- name "ServletIntHeader"
- value FALSE)
- (object Attribute
- tool "Java"
- name "ServletDateHeader"
- value FALSE)
- (object Attribute
- tool "Java"
- name "ServletCookie"
- value FALSE)
- (object Attribute
- tool "Java"
- name "MethodForCookie"
- value "")
- (object Attribute
- tool "Java"
- name "ServletContentType"
- value "")
- (object Attribute
- tool "Java"
- name "GenerateHTML"
- value FALSE)))
- (object Attribute
- tool "Java"
- name "default__Module-Spec"
- value (list Attribute_Set
- (object Attribute
- tool "Java"
- name "CmIdentification"
- value (value Text ""))
- (object Attribute
- tool "Java"
- name "CopyrightNotice"
- value (value Text ""))))
- (object Attribute
- tool "Java"
- name "default__Module-Body"
- value (list Attribute_Set
- (object Attribute
- tool "Java"
- name "CmIdentification"
- value (value Text ""))
- (object Attribute
- tool "Java"
- name "CopyrightNotice"
- value (value Text ""))))
- (object Attribute
- tool "Java"
- name "default__Operation"
- value (list Attribute_Set
- (object Attribute
- tool "Java"
- name "Abstract"
- value FALSE)
- (object Attribute
- tool "Java"
- name "Static"
- value FALSE)
- (object Attribute
- tool "Java"
- name "Final"
- value FALSE)
- (object Attribute
- tool "Java"
- name "Native"
- value FALSE)
- (object Attribute
- tool "Java"
- name "Synchronized"
- value FALSE)
- (object Attribute
- tool "Java"
- name "GenerateFullyQualifiedReturn"
- value FALSE)
- (object Attribute
- tool "Java"
- name "ReplaceExistingCode"
- value TRUE)
- (object Attribute
- tool "Java"
- name "Strictfp"
- value FALSE)))
- (object Attribute
- tool "Java"
- name "default__Attribute"
- value (list Attribute_Set
- (object Attribute
- tool "Java"
- name "Final"
- value FALSE)
- (object Attribute
- tool "Java"
- name "Transient"
- value FALSE)
- (object Attribute
- tool "Java"
- name "Volatile"
- value FALSE)
- (object Attribute
- tool "Java"
- name "PropertyType"
- value ("BeanProperty_Set" 71))
- (object Attribute
- tool "Java"
- name "BeanProperty_Set"
- value (list Attribute_Set
- (object Attribute
- tool "Java"
- name "Not A Property"
- value 71)
- (object Attribute
- tool "Java"
- name "Simple"
- value 72)
- (object Attribute
- tool "Java"
- name "Bound"
- value 73)
- (object Attribute
- tool "Java"
- name "Constrained"
- value 74)))
- (object Attribute
- tool "Java"
- name "IndividualChangeMgt"
- value FALSE)
- (object Attribute
- tool "Java"
- name "Read/Write"
- value ("Read/Write_Set" 81))
- (object Attribute
- tool "Java"
- name "Read/Write_Set"
- value (list Attribute_Set
- (object Attribute
- tool "Java"
- name "Read & Write"
- value 81)
- (object Attribute
- tool "Java"
- name "Read Only"
- value 82)
- (object Attribute
- tool "Java"
- name "Write Only"
- value 83)))
- (object Attribute
- tool "Java"
- name "GenerateFullyQualifiedTypes"
- value FALSE)))
- (object Attribute
- tool "Java"
- name "default__Role"
- value (list Attribute_Set
- (object Attribute
- tool "Java"
- name "ContainerClass"
- value "")
- (object Attribute
- tool "Java"
- name "InitialValue"
- value "")
- (object Attribute
- tool "Java"
- name "Final"
- value FALSE)
- (object Attribute
- tool "Java"
- name "Transient"
- value FALSE)
- (object Attribute
- tool "Java"
- name "Volatile"
- value FALSE)
- (object Attribute
- tool "Java"
- name "PropertyType"
- value ("BeanProperty_Set" 71))
- (object Attribute
- tool "Java"
- name "BeanProperty_Set"
- value (list Attribute_Set
- (object Attribute
- tool "Java"
- name "Not A Property"
- value 71)
- (object Attribute
- tool "Java"
- name "Simple"
- value 72)
- (object Attribute
- tool "Java"
- name "Bound"
- value 73)
- (object Attribute
- tool "Java"
- name "Constrained"
- value 74)))
- (object Attribute
- tool "Java"
- name "IndividualChangeMgt"
- value FALSE)
- (object Attribute
- tool "Java"
- name "Read/Write"
- value ("Read/Write_Set" 81))
- (object Attribute
- tool "Java"
- name "Read/Write_Set"
- value (list Attribute_Set
- (object Attribute
- tool "Java"
- name "Read & Write"
- value 81)
- (object Attribute
- tool "Java"
- name "Read Only"
- value 82)
- (object Attribute
- tool "Java"
- name "Write Only"
- value 83)))
- (object Attribute
- tool "Java"
- name "GenerateFullyQualifiedTypes"
- value FALSE)
- (object Attribute
- tool "Java"
- name "IsNavigable"
- value TRUE)))
- (object Attribute
- tool "Java"
- name "HiddenTool"
- value FALSE)
- (object Attribute
- tool "Oracle8"
- name "propertyId"
- value "360000002")
- (object Attribute
- tool "Oracle8"
- name "default__Project"
- value (list Attribute_Set
- (object Attribute
- tool "Oracle8"
- name "DDLScriptFilename"
- value "DDL1.SQL")
- (object Attribute
- tool "Oracle8"
- name "DropClause"
- value FALSE)
- (object Attribute
- tool "Oracle8"
- name "PrimaryKeyColumnName"
- value "_ID")
- (object Attribute
- tool "Oracle8"
- name "PrimaryKeyColumnType"
- value "NUMBER(5,0)")
- (object Attribute
- tool "Oracle8"
- name "SchemaNamePrefix"
- value "")
- (object Attribute
- tool "Oracle8"
- name "SchemaNameSuffix"
- value "")
- (object Attribute
- tool "Oracle8"
- name "TableNamePrefix"
- value "")
- (object Attribute
- tool "Oracle8"
- name "TableNameSuffix"
- value "")
- (object Attribute
- tool "Oracle8"
- name "TypeNamePrefix"
- value "")
- (object Attribute
- tool "Oracle8"
- name "TypeNameSuffix"
- value "")
- (object Attribute
- tool "Oracle8"
- name "ViewNamePrefix"
- value "")
- (object Attribute
- tool "Oracle8"
- name "ViewNameSuffix"
- value "")
- (object Attribute
- tool "Oracle8"
- name "VarrayNamePrefix"
- value "")
- (object Attribute
- tool "Oracle8"
- name "VarrayNameSuffix"
- value "")
- (object Attribute
- tool "Oracle8"
- name "NestedTableNamePrefix"
- value "")
- (object Attribute
- tool "Oracle8"
- name "NestedTableNameSuffix"
- value "")
- (object Attribute
- tool "Oracle8"
- name "ObjectTableNamePrefix"
- value "")
- (object Attribute
- tool "Oracle8"
- name "ObjectTableNameSuffix"
- value "")))
- (object Attribute
- tool "Oracle8"
- name "default__Module-Spec"
- value (list Attribute_Set
- (object Attribute
- tool "Oracle8"
- name "IsSchema"
- value FALSE)))
- (object Attribute
- tool "Oracle8"
- name "default__Class"
- value (list Attribute_Set
- (object Attribute
- tool "Oracle8"
- name "OID"
- value "")
- (object Attribute
- tool "Oracle8"
- name "WhereClause"
- value "")
- (object Attribute
- tool "Oracle8"
- name "CheckConstraint"
- value "")
- (object Attribute
- tool "Oracle8"
- name "CollectionTypeLength"
- value "")
- (object Attribute
- tool "Oracle8"
- name "CollectionTypePrecision"
- value "")
- (object Attribute
- tool "Oracle8"
- name "CollectionTypeScale"
- value "")
- (object Attribute
- tool "Oracle8"
- name "CollectionOfREFS"
- value FALSE)))
- (object Attribute
- tool "Oracle8"
- name "default__Operation"
- value (list Attribute_Set
- (object Attribute
- tool "Oracle8"
- name "MethodKind"
- value ("MethodKindSet" 1903))
- (object Attribute
- tool "Oracle8"
- name "OverloadID"
- value "")
- (object Attribute
- tool "Oracle8"
- name "OrderNumber"
- value "")
- (object Attribute
- tool "Oracle8"
- name "IsReadNoDataState"
- value FALSE)
- (object Attribute
- tool "Oracle8"
- name "IsReadNoProcessState"
- value FALSE)
- (object Attribute
- tool "Oracle8"
- name "IsWriteNoDataState"
- value FALSE)
- (object Attribute
- tool "Oracle8"
- name "IsWriteNoProcessState"
- value FALSE)
- (object Attribute
- tool "Oracle8"
- name "IsSelfish"
- value FALSE)
- (object Attribute
- tool "Oracle8"
- name "TriggerType"
- value ("TriggerTypeSet" 1801))
- (object Attribute
- tool "Oracle8"
- name "TriggerEvent"
- value ("TriggerEventSet" 1601))
- (object Attribute
- tool "Oracle8"
- name "TriggerText"
- value "")
- (object Attribute
- tool "Oracle8"
- name "TriggerReferencingNames"
- value "")
- (object Attribute
- tool "Oracle8"
- name "TriggerForEach"
- value ("TriggerForEachSet" 1701))
- (object Attribute
- tool "Oracle8"
- name "TriggerWhenClause"
- value "")
- (object Attribute
- tool "Oracle8"
- name "MethodKindSet"
- value (list Attribute_Set
- (object Attribute
- tool "Oracle8"
- name "MapMethod"
- value 1901)
- (object Attribute
- tool "Oracle8"
- name "OrderMethod"
- value 1902)
- (object Attribute
- tool "Oracle8"
- name "Function"
- value 1903)
- (object Attribute
- tool "Oracle8"
- name "Procedure"
- value 1904)
- (object Attribute
- tool "Oracle8"
- name "Operator"
- value 1905)
- (object Attribute
- tool "Oracle8"
- name "Constructor"
- value 1906)
- (object Attribute
- tool "Oracle8"
- name "Destructor"
- value 1907)
- (object Attribute
- tool "Oracle8"
- name "Trigger"
- value 1908)
- (object Attribute
- tool "Oracle8"
- name "Calculated"
- value 1909)))
- (object Attribute
- tool "Oracle8"
- name "TriggerTypeSet"
- value (list Attribute_Set
- (object Attribute
- tool "Oracle8"
- name "AFTER"
- value 1801)
- (object Attribute
- tool "Oracle8"
- name "BEFORE"
- value 1802)
- (object Attribute
- tool "Oracle8"
- name "INSTEAD OF"
- value 1803)))
- (object Attribute
- tool "Oracle8"
- name "TriggerForEachSet"
- value (list Attribute_Set
- (object Attribute
- tool "Oracle8"
- name "ROW"
- value 1701)
- (object Attribute
- tool "Oracle8"
- name "STATEMENT"
- value 1702)))
- (object Attribute
- tool "Oracle8"
- name "TriggerEventSet"
- value (list Attribute_Set
- (object Attribute
- tool "Oracle8"
- name "INSERT"
- value 1601)
- (object Attribute
- tool "Oracle8"
- name "UPDATE"
- value 1602)
- (object Attribute
- tool "Oracle8"
- name "DELETE"
- value 1603)
- (object Attribute
- tool "Oracle8"
- name "INSERT OR UPDATE"
- value 1604)
- (object Attribute
- tool "Oracle8"
- name "INSERT OR DELETE"
- value 1605)
- (object Attribute
- tool "Oracle8"
- name "UPDATE OR DELETE"
- value 1606)
- (object Attribute
- tool "Oracle8"
- name "INSERT OR UPDATE OR DELETE"
- value 1607)))))
- (object Attribute
- tool "Oracle8"
- name "default__Role"
- value (list Attribute_Set
- (object Attribute
- tool "Oracle8"
- name "OrderNumber"
- value "")))
- (object Attribute
- tool "Oracle8"
- name "default__Attribute"
- value (list Attribute_Set
- (object Attribute
- tool "Oracle8"
- name "OrderNumber"
- value "")
- (object Attribute
- tool "Oracle8"
- name "IsUnique"
- value FALSE)
- (object Attribute
- tool "Oracle8"
- name "NullsAllowed"
- value TRUE)
- (object Attribute
- tool "Oracle8"
- name "Length"
- value "")
- (object Attribute
- tool "Oracle8"
- name "Precision"
- value "2")
- (object Attribute
- tool "Oracle8"
- name "Scale"
- value "6")
- (object Attribute
- tool "Oracle8"
- name "IsIndex"
- value FALSE)
- (object Attribute
- tool "Oracle8"
- name "IsPrimaryKey"
- value FALSE)
- (object Attribute
- tool "Oracle8"
- name "CompositeUnique"
- value FALSE)
- (object Attribute
- tool "Oracle8"
- name "CheckConstraint"
- value "")))
- (object Attribute
- tool "Oracle8"
- name "HiddenTool"
- value FALSE)
- (object Attribute
- tool "ComponentTest"
- name "HiddenTool"
- value FALSE)
- (object Attribute
- tool "RequisitePro"
- name "HiddenTool"
- value FALSE)
- (object Attribute
- tool "cg"
- name "propertyId"
- value "809135966")
- (object Attribute
- tool "cg"
- name "default__Project"
- value (list Attribute_Set
- (object Attribute
- tool "cg"
- name "AllowGenerateOverNewerAnnotations"
- value FALSE)
- (object Attribute
- tool "cg"
- name "AllowGenerateOverNewerVersion"
- value FALSE)
- (object Attribute
- tool "cg"
- name "UseMSVC"
- value FALSE)
- (object Attribute
- tool "cg"
- name "HeaderFileExtension"
- value "h")
- (object Attribute
- tool "cg"
- name "HeaderFileBackupExtension"
- value "h~")
- (object Attribute
- tool "cg"
- name "HeaderFileTemporaryExtension"
- value "h#")
- (object Attribute
- tool "cg"
- name "CodeFileExtension"
- value "cpp")
- (object Attribute
- tool "cg"
- name "CodeFileBackupExtension"
- value "cp~")
- (object Attribute
- tool "cg"
- name "CodeFileTemporaryExtension"
- value "cp#")
- (object Attribute
- tool "cg"
- name "CreateMissingDirectories"
- value TRUE)
- (object Attribute
- tool "cg"
- name "StopOnError"
- value FALSE)
- (object Attribute
- tool "cg"
- name "ErrorLimit"
- value 30)
- (object Attribute
- tool "cg"
- name "Directory"
- value "$ROSECPP_SOURCE")
- (object Attribute
- tool "cg"
- name "PathSeparator"
- value "")
- (object Attribute
- tool "cg"
- name "FileNameFormat"
- value "128vx_b")
- (object Attribute
- tool "cg"
- name "BooleanType"
- value "int")
- (object Attribute
- tool "cg"
- name "AllowTemplates"
- value TRUE)
- (object Attribute
- tool "cg"
- name "AllowExplicitInstantiations"
- value FALSE)
- (object Attribute
- tool "cg"
- name "AllowProtectedInheritance"
- value TRUE)
- (object Attribute
- tool "cg"
- name "CommentWidth"
- value 60)
- (object Attribute
- tool "cg"
- name "OneByValueContainer"
- value "$targetClass")
- (object Attribute
- tool "cg"
- name "OneByReferenceContainer"
- value "$targetClass *")
- (object Attribute
- tool "cg"
- name "OptionalByValueContainer"
- value "OptionalByValue<$targetClass>")
- (object Attribute
- tool "cg"
- name "OptionalByReferenceContainer"
- value "$targetClass *")
- (object Attribute
- tool "cg"
- name "FixedByValueContainer"
- value "$targetClass[$limit]")
- (object Attribute
- tool "cg"
- name "UnorderedFixedByValueContainer"
- value "$targetClass[$limit]")
- (object Attribute
- tool "cg"
- name "FixedByReferenceContainer"
- value "$targetClass *[$limit]")
- (object Attribute
- tool "cg"
- name "UnorderedFixedByReferenceContainer"
- value "$targetClass *[$limit]")
- (object Attribute
- tool "cg"
- name "BoundedByValueContainer"
- value "BoundedListByValue<$targetClass,$limit>")
- (object Attribute
- tool "cg"
- name "UnorderedBoundedByValueContainer"
- value "BoundedSetByValue<$targetClass,$limit>")
- (object Attribute
- tool "cg"
- name "BoundedByReferenceContainer"
- value "BoundedListByReference<$targetClass,$limit>")
- (object Attribute
- tool "cg"
- name "UnorderedBoundedByReferenceContainer"
- value "BoundedSetByReference<$targetClass,$limit>")
- (object Attribute
- tool "cg"
- name "UnboundedByValueContainer"
- value "UnboundedListByValue<$targetClass>")
- (object Attribute
- tool "cg"
- name "UnorderedUnboundedByValueContainer"
- value "UnboundedSetByValue<$targetClass>")
- (object Attribute
- tool "cg"
- name "UnboundedByReferenceContainer"
- value "UnboundedListByReference<$targetClass>")
- (object Attribute
- tool "cg"
- name "UnorderedUnboundedByReferenceContainer"
- value "UnboundedSetByReference<$targetClass>")
- (object Attribute
- tool "cg"
- name "QualifiedByValueContainer"
- value "AssociationByValue<$qualtype, $qualcont>")
- (object Attribute
- tool "cg"
- name "UnorderedQualifiedByValueContainer"
- value "DictionaryByValue<$qualtype, $qualcont>")
- (object Attribute
- tool "cg"
- name "QualifiedByReferenceContainer"
- value "AssociationByReference<$qualtype, $qualcont>")
- (object Attribute
- tool "cg"
- name "UnorderedQualifiedByReferenceContainer"
- value "DictionaryByReference<$qualtype, $qualcont>")
- (object Attribute
- tool "cg"
- name "AlwaysKeepOrphanedCode"
- value FALSE)))
- (object Attribute
- tool "cg"
- name "compiler2.1__Project"
- value (list Attribute_Set
- (object Attribute
- tool "cg"
- name "AllowGenerateOverNewerAnnotations"
- value FALSE)
- (object Attribute
- tool "cg"
- name "AllowGenerateOverNewerVersion"
- value FALSE)
- (object Attribute
- tool "cg"
- name "HeaderFileExtension"
- value "h")
- (object Attribute
- tool "cg"
- name "HeaderFileBackupExtension"
- value "h~")
- (object Attribute
- tool "cg"
- name "HeaderFileTemporaryExtension"
- value "h#")
- (object Attribute
- tool "cg"
- name "CodeFileExtension"
- value "cpp")
- (object Attribute
- tool "cg"
- name "CodeFileBackupExtension"
- value "cp~")
- (object Attribute
- tool "cg"
- name "CodeFileTemporaryExtension"
- value "cp#")
- (object Attribute
- tool "cg"
- name "CreateMissingDirectories"
- value TRUE)
- (object Attribute
- tool "cg"
- name "StopOnError"
- value FALSE)
- (object Attribute
- tool "cg"
- name "ErrorLimit"
- value 30)
- (object Attribute
- tool "cg"
- name "Directory"
- value "$ROSECPP_SOURCE")
- (object Attribute
- tool "cg"
- name "BooleanType"
- value "int")
- (object Attribute
- tool "cg"
- name "AllowTemplates"
- value FALSE)
- (object Attribute
- tool "cg"
- name "AllowExplicitInstantiations"
- value FALSE)
- (object Attribute
- tool "cg"
- name "AllowProtectedInheritance"
- value FALSE)
- (object Attribute
- tool "cg"
- name "OneByValueContainer"
- value "$targetClass")
- (object Attribute
- tool "cg"
- name "OneByReferenceContainer"
- value "$targetClass *")
- (object Attribute
- tool "cg"
- name "OptionalByValueContainer"
- value "OptionalByValue(sizeof($targetClass))")
- (object Attribute
- tool "cg"
- name "OptionalByReferenceContainer"
- value "$targetClass *")
- (object Attribute
- tool "cg"
- name "FixedByValueContainer"
- value "$targetClass[$limit]")
- (object Attribute
- tool "cg"
- name "UnorderedFixedByValueContainer"
- value "$targetClass[$limit]")
- (object Attribute
- tool "cg"
- name "FixedByReferenceContainer"
- value "$targetClass *[$limit]")
- (object Attribute
- tool "cg"
- name "UnorderedFixedByReferenceContainer"
- value "$targetClass *[$limit]")
- (object Attribute
- tool "cg"
- name "BoundedByValueContainer"
- value "BoundedListByValue(sizeof($targetClass),$limit)")
- (object Attribute
- tool "cg"
- name "UnorderedBoundedByValueContainer"
- value "BoundedSetByValue(sizeof($targetClass),$limit)")
- (object Attribute
- tool "cg"
- name "BoundedByReferenceContainer"
- value "BoundedListByReference($limit)")
- (object Attribute
- tool "cg"
- name "UnorderedBoundedByReferenceContainer"
- value "BoundedSetByReference($limit)")
- (object Attribute
- tool "cg"
- name "UnboundedByValueContainer"
- value "UnboundedListByValue(sizeof($targetClass))")
- (object Attribute
- tool "cg"
- name "UnorderedUnboundedByValueContainer"
- value "UnboundedSetByValue(sizeof($targetClass))")
- (object Attribute
- tool "cg"
- name "UnboundedByReferenceContainer"
- value "UnboundedListByReference")
- (object Attribute
- tool "cg"
- name "UnorderedUnboundedByReferenceContainer"
- value "UnboundedSetByReference")
- (object Attribute
- tool "cg"
- name "QualifiedByValueContainer"
- value "AssociationByValue(sizeof($qualtype), sizeof($qualcont))")
- (object Attribute
- tool "cg"
- name "UnorderedQualifiedByValueContainer"
- value "DictionaryByValue(sizeof($qualtype), sizeof($qualcont))")
- (object Attribute
- tool "cg"
- name "QualifiedByReferenceContainer"
- value "AssociationByReference(sizeof($qualtype), sizeof($qualcont))")
- (object Attribute
- tool "cg"
- name "UnorderedQualifiedByReferenceContainer"
- value "DictionaryByReference(sizeof($qualtype), sizeof($qualcont))")
- (object Attribute
- tool "cg"
- name "PathSeparator"
- value "")
- (object Attribute
- tool "cg"
- name "FileNameFormat"
- value "128vx_b")
- (object Attribute
- tool "cg"
- name "AlwaysKeepOrphanedCode"
- value FALSE)))
- (object Attribute
- tool "cg"
- name "compiler3.0__Project"
- value (list Attribute_Set
- (object Attribute
- tool "cg"
- name "AllowGenerateOverNewerAnnotations"
- value FALSE)
- (object Attribute
- tool "cg"
- name "AllowGenerateOverNewerVersion"
- value FALSE)
- (object Attribute
- tool "cg"
- name "HeaderFileExtension"
- value "h")
- (object Attribute
- tool "cg"
- name "HeaderFileBackupExtension"
- value "h~")
- (object Attribute
- tool "cg"
- name "HeaderFileTemporaryExtension"
- value "h#")
- (object Attribute
- tool "cg"
- name "CodeFileExtension"
- value "cpp")
- (object Attribute
- tool "cg"
- name "CodeFileBackupExtension"
- value "cp~")
- (object Attribute
- tool "cg"
- name "CodeFileTemporaryExtension"
- value "cp#")
- (object Attribute
- tool "cg"
- name "CreateMissingDirectories"
- value TRUE)
- (object Attribute
- tool "cg"
- name "StopOnError"
- value FALSE)
- (object Attribute
- tool "cg"
- name "ErrorLimit"
- value 30)
- (object Attribute
- tool "cg"
- name "Directory"
- value "$ROSECPP_SOURCE")
- (object Attribute
- tool "cg"
- name "BooleanType"
- value "int")
- (object Attribute
- tool "cg"
- name "AllowTemplates"
- value TRUE)
- (object Attribute
- tool "cg"
- name "AllowExplicitInstantiations"
- value FALSE)
- (object Attribute
- tool "cg"
- name "AllowProtectedInheritance"
- value TRUE)
- (object Attribute
- tool "cg"
- name "OneByValueContainer"
- value "$targetClass")
- (object Attribute
- tool "cg"
- name "OneByReferenceContainer"
- value "$targetClass *")
- (object Attribute
- tool "cg"
- name "OptionalByValueContainer"
- value "OptionalByValue<$targetClass>")
- (object Attribute
- tool "cg"
- name "OptionalByReferenceContainer"
- value "$targetClass *")
- (object Attribute
- tool "cg"
- name "FixedByValueContainer"
- value "$targetClass[$limit]")
- (object Attribute
- tool "cg"
- name "UnorderedFixedByValueContainer"
- value "$targetClass[$limit]")
- (object Attribute
- tool "cg"
- name "FixedByReferenceContainer"
- value "$targetClass *[$limit]")
- (object Attribute
- tool "cg"
- name "UnorderedFixedByReferenceContainer"
- value "$targetClass *[$limit]")
- (object Attribute
- tool "cg"
- name "BoundedByValueContainer"
- value "BoundedListByValue<$targetClass,$limit>")
- (object Attribute
- tool "cg"
- name "UnorderedBoundedByValueContainer"
- value "BoundedSetByValue<$targetClass,$limit>")
- (object Attribute
- tool "cg"
- name "BoundedByReferenceContainer"
- value "BoundedListByReference<$targetClass,$limit>")
- (object Attribute
- tool "cg"
- name "UnorderedBoundedByReferenceContainer"
- value "BoundedSetByReference<$targetClass,$limit>")
- (object Attribute
- tool "cg"
- name "UnboundedByValueContainer"
- value "UnboundedListByValue<$targetClass>")
- (object Attribute
- tool "cg"
- name "UnorderedUnboundedByValueContainer"
- value "UnboundedSetByValue<$targetClass>")
- (object Attribute
- tool "cg"
- name "UnboundedByReferenceContainer"
- value "UnboundedListByReference<$targetClass>")
- (object Attribute
- tool "cg"
- name "UnorderedUnboundedByReferenceContainer"
- value "UnboundedSetByReference<$targetClass>")
- (object Attribute
- tool "cg"
- name "QualifiedByValueContainer"
- value "AssociationByValue<$qualtype, $qualcont>")
- (object Attribute
- tool "cg"
- name "UnorderedQualifiedByValueContainer"
- value "DictionaryByValue<$qualtype, $qualcont>")
- (object Attribute
- tool "cg"
- name "QualifiedByReferenceContainer"
- value "AssociationByReference<$qualtype, $qualcont>")
- (object Attribute
- tool "cg"
- name "UnorderedQualifiedByReferenceContainer"
- value "DictionaryByReference<$qualtype, $qualcont>")
- (object Attribute
- tool "cg"
- name "PathSeparator"
- value "")
- (object Attribute
- tool "cg"
- name "FileNameFormat"
- value "128vx_b")
- (object Attribute
- tool "cg"
- name "AlwaysKeepOrphanedCode"
- value FALSE)))
- (object Attribute
- tool "cg"
- name "default__Class"
- value (list Attribute_Set
- (object Attribute
- tool "cg"
- name "CodeName"
- value "")
- (object Attribute
- tool "cg"
- name "ImplementationType"
- value "")
- (object Attribute
- tool "cg"
- name "ClassKey"
- value "class")
- (object Attribute
- tool "cg"
- name "GenerateEmptyRegions"
- value ("GenerateEmptyRegionSet" 3))
- (object Attribute
- tool "cg"
- name "GenerateEmptyRegionSet"
- value (list Attribute_Set
- (object Attribute
- tool "cg"
- name "None"
- value 0)
- (object Attribute
- tool "cg"
- name "Preserved"
- value 1)
- (object Attribute
- tool "cg"
- name "Unpreserved"
- value 2)
- (object Attribute
- tool "cg"
- name "All"
- value 3)))
- (object Attribute
- tool "cg"
- name "PutBodiesInSpec"
- value FALSE)
- (object Attribute
- tool "cg"
- name "GenerateDefaultConstructor"
- value ("GenerateSet" 199))
- (object Attribute
- tool "cg"
- name "DefaultConstructorVisibility"
- value ("VisibilitySet" 45))
- (object Attribute
- tool "cg"
- name "InlineDefaultConstructor"
- value FALSE)
- (object Attribute
- tool "cg"
- name "ExplicitDefaultConstructor"
- value FALSE)
- (object Attribute
- tool "cg"
- name "GenerateCopyConstructor"
- value ("GenerateSet" 199))
- (object Attribute
- tool "cg"
- name "CopyConstructorVisibility"
- value ("VisibilitySet" 45))
- (object Attribute
- tool "cg"
- name "InlineCopyConstructor"
- value FALSE)
- (object Attribute
- tool "cg"
- name "ExplicitCopyConstructor"
- value FALSE)
- (object Attribute
- tool "cg"
- name "GenerateDestructor"
- value TRUE)
- (object Attribute
- tool "cg"
- name "DestructorVisibility"
- value ("VisibilitySet" 45))
- (object Attribute
- tool "cg"
- name "DestructorKind"
- value ("ThreeKindSet" 200))
- (object Attribute
- tool "cg"
- name "InlineDestructor"
- value FALSE)
- (object Attribute
- tool "cg"
- name "GenerateAssignmentOperation"
- value ("GenerateSet" 199))
- (object Attribute
- tool "cg"
- name "AssignmentVisibility"
- value ("VisibilitySet" 45))
- (object Attribute
- tool "cg"
- name "AssignmentKind"
- value ("ThreeKindSet" 200))
- (object Attribute
- tool "cg"
- name "InlineAssignmentOperation"
- value FALSE)
- (object Attribute
- tool "cg"
- name "GenerateEqualityOperations"
- value ("GenerateSet" 199))
- (object Attribute
- tool "cg"
- name "EqualityVisibility"
- value ("VisibilitySet" 45))
- (object Attribute
- tool "cg"
- name "EqualityKind"
- value ("FriendKindSet" 200))
- (object Attribute
- tool "cg"
- name "InlineEqualityOperations"
- value FALSE)
- (object Attribute
- tool "cg"
- name "GenerateRelationalOperations"
- value FALSE)
- (object Attribute
- tool "cg"
- name "RelationalVisibility"
- value ("VisibilitySet" 45))
- (object Attribute
- tool "cg"
- name "RelationalKind"
- value ("FriendKindSet" 200))
- (object Attribute
- tool "cg"
- name "InlineRelationalOperations"
- value FALSE)
- (object Attribute
- tool "cg"
- name "GenerateStorageMgmtOperations"
- value FALSE)
- (object Attribute
- tool "cg"
- name "StorageMgmtVisibility"
- value ("VisibilitySet" 45))
- (object Attribute
- tool "cg"
- name "InlineStorageMgmtOperations"
- value FALSE)
- (object Attribute
- tool "cg"
- name "GenerateSubscriptOperation"
- value FALSE)
- (object Attribute
- tool "cg"
- name "SubscriptVisibility"
- value ("VisibilitySet" 45))
- (object Attribute
- tool "cg"
- name "SubscriptKind"
- value ("ThreeKindSet" 200))
- (object Attribute
- tool "cg"
- name "SubscriptResultType"
- value "")
- (object Attribute
- tool "cg"
- name "InlineSubscriptOperation"
- value FALSE)
- (object Attribute
- tool "cg"
- name "GenerateDereferenceOperation"
- value FALSE)
- (object Attribute
- tool "cg"
- name "DereferenceVisibility"
- value ("VisibilitySet" 45))
- (object Attribute
- tool "cg"
- name "DereferenceKind"
- value ("ThreeKindSet" 200))
- (object Attribute
- tool "cg"
- name "DereferenceResultType"
- value "")
- (object Attribute
- tool "cg"
- name "InlineDereferenceOperation"
- value FALSE)
- (object Attribute
- tool "cg"
- name "GenerateIndirectionOperation"
- value FALSE)
- (object Attribute
- tool "cg"
- name "IndirectionVisibility"
- value ("VisibilitySet" 45))
- (object Attribute
- tool "cg"
- name "IndirectionKind"
- value ("ThreeKindSet" 200))
- (object Attribute
- tool "cg"
- name "IndirectionResultType"
- value "")
- (object Attribute
- tool "cg"
- name "InlineIndirectionOperation"
- value FALSE)
- (object Attribute
- tool "cg"
- name "GenerateStreamOperations"
- value FALSE)
- (object Attribute
- tool "cg"
- name "StreamVisibility"
- value ("VisibilitySet" 45))
- (object Attribute
- tool "cg"
- name "InlineStreamOperations"
- value FALSE)
- (object Attribute
- tool "cg"
- name "ThreeKindSet"
- value (list Attribute_Set
- (object Attribute
- tool "cg"
- name "Common"
- value 200)
- (object Attribute
- tool "cg"
- name "Virtual"
- value 201)
- (object Attribute
- tool "cg"
- name "Abstract"
- value 202)))
- (object Attribute
- tool "cg"
- name "KindSet"
- value (list Attribute_Set
- (object Attribute
- tool "cg"
- name "Common"
- value 200)
- (object Attribute
- tool "cg"
- name "Virtual"
- value 201)
- (object Attribute
- tool "cg"
- name "Abstract"
- value 202)
- (object Attribute
- tool "cg"
- name "Static"
- value 203)))
- (object Attribute
- tool "cg"
- name "FriendKindSet"
- value (list Attribute_Set
- (object Attribute
- tool "cg"
- name "Common"
- value 200)
- (object Attribute
- tool "cg"
- name "Virtual"
- value 201)
- (object Attribute
- tool "cg"
- name "Abstract"
- value 202)
- (object Attribute
- tool "cg"
- name "Friend"
- value 204)))
- (object Attribute
- tool "cg"
- name "GenerateSet"
- value (list Attribute_Set
- (object Attribute
- tool "cg"
- name "DeclareAndDefine"
- value 199)
- (object Attribute
- tool "cg"
- name "DeclareOnly"
- value 205)
- (object Attribute
- tool "cg"
- name "DoNotDeclare"
- value 206)))
- (object Attribute
- tool "cg"
- name "VisibilitySet"
- value (list Attribute_Set
- (object Attribute
- tool "cg"
- name "Public"
- value 45)
- (object Attribute
- tool "cg"
- name "Protected"
- value 44)
- (object Attribute
- tool "cg"
- name "Private"
- value 43)
- (object Attribute
- tool "cg"
- name "Implementation"
- value 14)))))
- (object Attribute
- tool "cg"
- name "default__Module-Spec"
- value (list Attribute_Set
- (object Attribute
- tool "cg"
- name "Generate"
- value TRUE)
- (object Attribute
- tool "cg"
- name "GenerateEmptyRegions"
- value ("GenerateEmptyRegionSet" 3))
- (object Attribute
- tool "cg"
- name "GenerateEmptyRegionSet"
- value (list Attribute_Set
- (object Attribute
- tool "cg"
- name "None"
- value 0)
- (object Attribute
- tool "cg"
- name "Preserved"
- value 1)
- (object Attribute
- tool "cg"
- name "Unpreserved"
- value 2)
- (object Attribute
- tool "cg"
- name "All"
- value 3)))
- (object Attribute
- tool "cg"
- name "CmIdentification"
- value (value Text " %X% %Q% %Z% %W%"))
- (object Attribute
- tool "cg"
- name "CopyrightNotice"
- value (value Text ""))
- (object Attribute
- tool "cg"
- name "FileName"
- value "AUTO GENERATE")
- (object Attribute
- tool "cg"
- name "AllowExtensionlessFileName"
- value FALSE)
- (object Attribute
- tool "cg"
- name "InclusionProtectionSymbol"
- value "AUTO GENERATE")
- (object Attribute
- tool "cg"
- name "IncludeFormat"
- value (value Text
-|// $package
-|#include "$file"
-|
- ))
- (object Attribute
- tool "cg"
- name "IncludeBySimpleName"
- value FALSE)
- (object Attribute
- tool "cg"
- name "IncludePrecompiledHeader"
- value FALSE)
- (object Attribute
- tool "cg"
- name "IncludeOrder"
- value "AMIR")
- (object Attribute
- tool "cg"
- name "AdditionalIncludes"
- value (value Text ""))
- (object Attribute
- tool "cg"
- name "InliningStyle"
- value ("InliningStyleSet" 207))
- (object Attribute
- tool "cg"
- name "InliningStyleSet"
- value (list Attribute_Set
- (object Attribute
- tool "cg"
- name "InClassDeclaration"
- value 208)
- (object Attribute
- tool "cg"
- name "FollowingClassDeclaration"
- value 207)))
- (object Attribute
- tool "cg"
- name "TypesDefined"
- value (value Text ""))
- (object Attribute
- tool "cg"
- name "IncludeClosure"
- value (value Text ""))))
- (object Attribute
- tool "cg"
- name "default__Module-Body"
- value (list Attribute_Set
- (object Attribute
- tool "cg"
- name "Generate"
- value TRUE)
- (object Attribute
- tool "cg"
- name "GenerateEmptyRegions"
- value ("GenerateEmptyRegionSet" 3))
- (object Attribute
- tool "cg"
- name "GenerateEmptyRegionSet"
- value (list Attribute_Set
- (object Attribute
- tool "cg"
- name "None"
- value 0)
- (object Attribute
- tool "cg"
- name "Preserved"
- value 1)
- (object Attribute
- tool "cg"
- name "Unpreserved"
- value 2)
- (object Attribute
- tool "cg"
- name "All"
- value 3)))
- (object Attribute
- tool "cg"
- name "CmIdentification"
- value (value Text " %X% %Q% %Z% %W%"))
- (object Attribute
- tool "cg"
- name "CopyrightNotice"
- value (value Text ""))
- (object Attribute
- tool "cg"
- name "FileName"
- value "AUTO GENERATE")
- (object Attribute
- tool "cg"
- name "AllowExtensionlessFileName"
- value FALSE)
- (object Attribute
- tool "cg"
- name "IncludeFormat"
- value (value Text
-|// $package
-|#include "$file"
-|
- ))
- (object Attribute
- tool "cg"
- name "IncludeBySimpleName"
- value FALSE)
- (object Attribute
- tool "cg"
- name "IncludePrecompiledHeader"
- value TRUE)
- (object Attribute
- tool "cg"
- name "IncludeOrder"
- value "AMIR")
- (object Attribute
- tool "cg"
- name "AdditionalIncludes"
- value (value Text ""))
- (object Attribute
- tool "cg"
- name "InliningStyle"
- value ("InliningStyleSet" 207))
- (object Attribute
- tool "cg"
- name "InliningStyleSet"
- value (list Attribute_Set
- (object Attribute
- tool "cg"
- name "InClassDeclaration"
- value 208)
- (object Attribute
- tool "cg"
- name "FollowingClassDeclaration"
- value 207)))
- (object Attribute
- tool "cg"
- name "TypesDefined"
- value (value Text ""))
- (object Attribute
- tool "cg"
- name "IncludeClosure"
- value (value Text ""))))
- (object Attribute
- tool "cg"
- name "default__Operation"
- value (list Attribute_Set
- (object Attribute
- tool "cg"
- name "CodeName"
- value "")
- (object Attribute
- tool "cg"
- name "OperationKind"
- value ("OperationKindSet" 200))
- (object Attribute
- tool "cg"
- name "OperationKindSet"
- value (list Attribute_Set
- (object Attribute
- tool "cg"
- name "Common"
- value 200)
- (object Attribute
- tool "cg"
- name "Virtual"
- value 201)
- (object Attribute
- tool "cg"
- name "Abstract"
- value 202)
- (object Attribute
- tool "cg"
- name "Static"
- value 203)
- (object Attribute
- tool "cg"
- name "Friend"
- value 204)))
- (object Attribute
- tool "cg"
- name "GenerateAbstractBody"
- value FALSE)
- (object Attribute
- tool "cg"
- name "GenerateFriendBody"
- value FALSE)
- (object Attribute
- tool "cg"
- name "GenerateFriendDecl"
- value FALSE)
- (object Attribute
- tool "cg"
- name "SpecialDeclReturnType"
- value "")
- (object Attribute
- tool "cg"
- name "OperationIsConst"
- value FALSE)
- (object Attribute
- tool "cg"
- name "OperationIsExplicit"
- value FALSE)
- (object Attribute
- tool "cg"
- name "Inline"
- value FALSE)
- (object Attribute
- tool "cg"
- name "EntryCode"
- value (value Text ""))
- (object Attribute
- tool "cg"
- name "ExitCode"
- value (value Text ""))
- (object Attribute
- tool "cg"
- name "CCRegion"
- value "")
- (object Attribute
- tool "cg"
- name "GenerateEmptyRegions"
- value ("GenerateEmptyRegionSet" 3))
- (object Attribute
- tool "cg"
- name "GenerateEmptyRegionSet"
- value (list Attribute_Set
- (object Attribute
- tool "cg"
- name "None"
- value 0)
- (object Attribute
- tool "cg"
- name "Preserved"
- value 1)
- (object Attribute
- tool "cg"
- name "Unpreserved"
- value 2)
- (object Attribute
- tool "cg"
- name "All"
- value 3)))
- (object Attribute
- tool "cg"
- name "BodyAnnotations"
- value "")))
- (object Attribute
- tool "cg"
- name "default__Has"
- value (list Attribute_Set
- (object Attribute
- tool "cg"
- name "CodeName"
- value "")
- (object Attribute
- tool "cg"
- name "Ordered"
- value TRUE)
- (object Attribute
- tool "cg"
- name "NameIfUnlabeled"
- value "the_$supplier")
- (object Attribute
- tool "cg"
- name "GenerateDataMember"
- value TRUE)
- (object Attribute
- tool "cg"
- name "DataMemberName"
- value "$relationship")
- (object Attribute
- tool "cg"
- name "DataMemberVisibility"
- value ("DataMemberVisibilitySet" 14))
- (object Attribute
- tool "cg"
- name "DataMemberVisibilitySet"
- value (list Attribute_Set
- (object Attribute
- tool "cg"
- name "Public"
- value 45)
- (object Attribute
- tool "cg"
- name "Protected"
- value 44)
- (object Attribute
- tool "cg"
- name "Private"
- value 43)
- (object Attribute
- tool "cg"
- name "Implementation"
- value 14)
- (object Attribute
- tool "cg"
- name "AtRelationshipVisibility"
- value 210)))
- (object Attribute
- tool "cg"
- name "DataMemberMutability"
- value ("DataMemberMutabilitySet" 0))
- (object Attribute
- tool "cg"
- name "DataMemberMutabilitySet"
- value (list Attribute_Set
- (object Attribute
- tool "cg"
- name "Unrestricted"
- value 0)
- (object Attribute
- tool "cg"
- name "Mutable"
- value 1)
- (object Attribute
- tool "cg"
- name "Const"
- value 2)))
- (object Attribute
- tool "cg"
- name "DataMemberIsVolatile"
- value FALSE)
- (object Attribute
- tool "cg"
- name "DataMemberFieldSize"
- value "")
- (object Attribute
- tool "cg"
- name "InitialValue"
- value (value Text ""))
- (object Attribute
- tool "cg"
- name "GenerateGetOperation"
- value TRUE)
- (object Attribute
- tool "cg"
- name "GenerateSetOperation"
- value TRUE)
- (object Attribute
- tool "cg"
- name "GetName"
- value "get_$relationship")
- (object Attribute
- tool "cg"
- name "SetName"
- value "set_$relationship")
- (object Attribute
- tool "cg"
- name "GetSetKinds"
- value ("GetSetKindsSet" 200))
- (object Attribute
- tool "cg"
- name "GetSetKindsSet"
- value (list Attribute_Set
- (object Attribute
- tool "cg"
- name "Common"
- value 200)
- (object Attribute
- tool "cg"
- name "Virtual"
- value 201)
- (object Attribute
- tool "cg"
- name "Abstract"
- value 202)
- (object Attribute
- tool "cg"
- name "Static"
- value 203)
- (object Attribute
- tool "cg"
- name "Friend"
- value 204)))
- (object Attribute
- tool "cg"
- name "ContainerClass"
- value "")
- (object Attribute
- tool "cg"
- name "SelectorName"
- value "")
- (object Attribute
- tool "cg"
- name "SelectorType"
- value "")
- (object Attribute
- tool "cg"
- name "GetIsConst"
- value TRUE)
- (object Attribute
- tool "cg"
- name "GetResultIsConst"
- value ("GetResultIsConstSet" 2))
- (object Attribute
- tool "cg"
- name "GetResultIsConstSet"
- value (list Attribute_Set
- (object Attribute
- tool "cg"
- name "False"
- value 0)
- (object Attribute
- tool "cg"
- name "True"
- value 1)
- (object Attribute
- tool "cg"
- name "Same_As_Function"
- value 2)))
- (object Attribute
- tool "cg"
- name "GetSetByReference"
- value FALSE)
- (object Attribute
- tool "cg"
- name "InlineGet"
- value TRUE)
- (object Attribute
- tool "cg"
- name "SetReturnsValue"
- value FALSE)
- (object Attribute
- tool "cg"
- name "InlineSet"
- value TRUE)
- (object Attribute
- tool "cg"
- name "ForwardReferenceOnly"
- value FALSE)
- (object Attribute
- tool "cg"
- name "HasRelTypeSet"
- value (list Attribute_Set
- (object Attribute
- tool "cg"
- name "Array"
- value 24)
- (object Attribute
- tool "cg"
- name "Sequence"
- value 47)))))
- (object Attribute
- tool "cg"
- name "default__Association"
- value (list Attribute_Set
- (object Attribute
- tool "cg"
- name "NameIfUnlabeled"
- value "the_$targetClass")))
- (object Attribute
- tool "cg"
- name "default__Inherit"
- value (list Attribute_Set
- (object Attribute
- tool "cg"
- name "InstanceArguments"
- value "")))
- (object Attribute
- tool "cg"
- name "default__Role"
- value (list Attribute_Set
- (object Attribute
- tool "cg"
- name "CodeName"
- value "")
- (object Attribute
- tool "cg"
- name "ForwardReferenceOnly"
- value FALSE)
- (object Attribute
- tool "cg"
- name "NameIfUnlabeled"
- value "the_$targetClass")
- (object Attribute
- tool "cg"
- name "GenerateDataMember"
- value TRUE)
- (object Attribute
- tool "cg"
- name "DataMemberName"
- value "$target")
- (object Attribute
- tool "cg"
- name "DataMemberVisibility"
- value ("DataMemberVisibilitySet" 14))
- (object Attribute
- tool "cg"
- name "DataMemberVisibilitySet"
- value (list Attribute_Set
- (object Attribute
- tool "cg"
- name "Public"
- value 45)
- (object Attribute
- tool "cg"
- name "Protected"
- value 44)
- (object Attribute
- tool "cg"
- name "Private"
- value 43)
- (object Attribute
- tool "cg"
- name "Implementation"
- value 14)
- (object Attribute
- tool "cg"
- name "AtRelationshipVisibility"
- value 210)))
- (object Attribute
- tool "cg"
- name "DataMemberMutability"
- value ("DataMemberMutabilitySet" 0))
- (object Attribute
- tool "cg"
- name "DataMemberMutabilitySet"
- value (list Attribute_Set
- (object Attribute
- tool "cg"
- name "Unrestricted"
- value 0)
- (object Attribute
- tool "cg"
- name "Mutable"
- value 1)
- (object Attribute
- tool "cg"
- name "Const"
- value 2)))
- (object Attribute
- tool "cg"
- name "DataMemberIsVolatile"
- value FALSE)
- (object Attribute
- tool "cg"
- name "DataMemberFieldSize"
- value "")
- (object Attribute
- tool "cg"
- name "InitialValue"
- value (value Text ""))
- (object Attribute
- tool "cg"
- name "ContainerClass"
- value "")
- (object Attribute
- tool "cg"
- name "ContainerGet"
- value "$data.get($keys)")
- (object Attribute
- tool "cg"
- name "ContainerSet"
- value "$data.set($keys,$value)")
- (object Attribute
- tool "cg"
- name "QualifiedContainer"
- value "")
- (object Attribute
- tool "cg"
- name "AssocClassContainer"
- value "$supplier *")
- (object Attribute
- tool "cg"
- name "AssocClassInitialValue"
- value (value Text ""))
- (object Attribute
- tool "cg"
- name "GetSetKinds"
- value ("GetSetKindsSet" 200))
- (object Attribute
- tool "cg"
- name "GetSetKindsSet"
- value (list Attribute_Set
- (object Attribute
- tool "cg"
- name "Common"
- value 200)
- (object Attribute
- tool "cg"
- name "Virtual"
- value 201)
- (object Attribute
- tool "cg"
- name "Abstract"
- value 202)
- (object Attribute
- tool "cg"
- name "Static"
- value 203)
- (object Attribute
- tool "cg"
- name "Friend"
- value 204)))
- (object Attribute
- tool "cg"
- name "GetSetByReference"
- value FALSE)
- (object Attribute
- tool "cg"
- name "GenerateGetOperation"
- value TRUE)
- (object Attribute
- tool "cg"
- name "GetName"
- value "get_$target")
- (object Attribute
- tool "cg"
- name "GetIsConst"
- value TRUE)
- (object Attribute
- tool "cg"
- name "GetResultIsConst"
- value ("GetResultIsConstSet" 2))
- (object Attribute
- tool "cg"
- name "GetResultIsConstSet"
- value (list Attribute_Set
- (object Attribute
- tool "cg"
- name "False"
- value 0)
- (object Attribute
- tool "cg"
- name "True"
- value 1)
- (object Attribute
- tool "cg"
- name "Same_As_Function"
- value 2)))
- (object Attribute
- tool "cg"
- name "InlineGet"
- value TRUE)
- (object Attribute
- tool "cg"
- name "GenerateSetOperation"
- value TRUE)
- (object Attribute
- tool "cg"
- name "SetName"
- value "set_$target")
- (object Attribute
- tool "cg"
- name "SetReturnsValue"
- value FALSE)
- (object Attribute
- tool "cg"
- name "InlineSet"
- value TRUE)
- (object Attribute
- tool "cg"
- name "QualifiedGetSetByReference"
- value ("QualifiedGetSetByReferenceSet" 2))
- (object Attribute
- tool "cg"
- name "QualifiedGetSetByReferenceSet"
- value (list Attribute_Set
- (object Attribute
- tool "cg"
- name "False"
- value 0)
- (object Attribute
- tool "cg"
- name "True"
- value 1)
- (object Attribute
- tool "cg"
- name "Same_As_GetSetByReference"
- value 2)))
- (object Attribute
- tool "cg"
- name "GenerateQualifiedGetOperation"
- value TRUE)
- (object Attribute
- tool "cg"
- name "QualifiedGetName"
- value "get_$target")
- (object Attribute
- tool "cg"
- name "QualifiedGetIsConst"
- value TRUE)
- (object Attribute
- tool "cg"
- name "QualifiedGetResultIsConst"
- value ("GetResultIsConstSet" 2))
- (object Attribute
- tool "cg"
- name "InlineQualifiedGet"
- value TRUE)
- (object Attribute
- tool "cg"
- name "GenerateQualifiedSetOperation"
- value TRUE)
- (object Attribute
- tool "cg"
- name "QualifiedSetName"
- value "set_$target")
- (object Attribute
- tool "cg"
- name "QualifiedSetReturnsValue"
- value FALSE)
- (object Attribute
- tool "cg"
- name "InlineQualifiedSet"
- value TRUE)
- (object Attribute
- tool "cg"
- name "GenerateAssocClassDataMember"
- value TRUE)
- (object Attribute
- tool "cg"
- name "AssocClassDataMemberName"
- value "$target")
- (object Attribute
- tool "cg"
- name "AssocClassDataMemberVisibility"
- value ("DataMemberVisibilitySet" 14))
- (object Attribute
- tool "cg"
- name "DataMemberVisibilitySet"
- value (list Attribute_Set
- (object Attribute
- tool "cg"
- name "Public"
- value 45)
- (object Attribute
- tool "cg"
- name "Protected"
- value 44)
- (object Attribute
- tool "cg"
- name "Private"
- value 43)
- (object Attribute
- tool "cg"
- name "Implementation"
- value 14)
- (object Attribute
- tool "cg"
- name "AtRelationshipVisibility"
- value 210)))
- (object Attribute
- tool "cg"
- name "AssocClassDataMemberMutability"
- value ("DataMemberMutabilitySet" 0))
- (object Attribute
- tool "cg"
- name "DataMemberMutabilitySet"
- value (list Attribute_Set
- (object Attribute
- tool "cg"
- name "Unrestricted"
- value 0)
- (object Attribute
- tool "cg"
- name "Mutable"
- value 1)
- (object Attribute
- tool "cg"
- name "Const"
- value 2)))
- (object Attribute
- tool "cg"
- name "AssocClassDataMemberIsVolatile"
- value FALSE)
- (object Attribute
- tool "cg"
- name "AssocClassGetSetKinds"
- value ("GetSetKindsSet" 200))
- (object Attribute
- tool "cg"
- name "GenerateAssocClassGetOperation"
- value TRUE)
- (object Attribute
- tool "cg"
- name "AssocClassGetName"
- value "get_$target")
- (object Attribute
- tool "cg"
- name "AssocClassGetIsConst"
- value TRUE)
- (object Attribute
- tool "cg"
- name "AssocClassGetResultIsConst"
- value ("GetResultIsConstSet" 2))
- (object Attribute
- tool "cg"
- name "InlineAssocClassGet"
- value TRUE)
- (object Attribute
- tool "cg"
- name "GenerateAssocClassSetOperation"
- value TRUE)
- (object Attribute
- tool "cg"
- name "AssocClassSetName"
- value "set_$target")
- (object Attribute
- tool "cg"
- name "AssocClassSetReturnsValue"
- value FALSE)
- (object Attribute
- tool "cg"
- name "InlineAssocClassSet"
- value TRUE)
- (object Attribute
- tool "cg"
- name "AssocClassForwardReferenceOnly"
- value TRUE)
- (object Attribute
- tool "cg"
- name "AssocTypeSet"
- value (list Attribute_Set
- (object Attribute
- tool "cg"
- name "Array"
- value 24)
- (object Attribute
- tool "cg"
- name "Sequence"
- value 47)))))
- (object Attribute
- tool "cg"
- name "default__Attribute"
- value (list Attribute_Set
- (object Attribute
- tool "cg"
- name "CodeName"
- value "")
- (object Attribute
- tool "cg"
- name "GenerateDataMember"
- value TRUE)
- (object Attribute
- tool "cg"
- name "DataMemberName"
- value "$attribute")
- (object Attribute
- tool "cg"
- name "DataMemberVisibility"
- value ("DataMemberVisibilitySet" 14))
- (object Attribute
- tool "cg"
- name "DataMemberVisibilitySet"
- value (list Attribute_Set
- (object Attribute
- tool "cg"
- name "Public"
- value 45)
- (object Attribute
- tool "cg"
- name "Protected"
- value 44)
- (object Attribute
- tool "cg"
- name "Private"
- value 43)
- (object Attribute
- tool "cg"
- name "Implementation"
- value 14)
- (object Attribute
- tool "cg"
- name "AtAttributeVisibility"
- value 211)))
- (object Attribute
- tool "cg"
- name "DataMemberMutability"
- value ("DataMemberMutabilitySet" 0))
- (object Attribute
- tool "cg"
- name "DataMemberMutabilitySet"
- value (list Attribute_Set
- (object Attribute
- tool "cg"
- name "Unrestricted"
- value 0)
- (object Attribute
- tool "cg"
- name "Mutable"
- value 1)
- (object Attribute
- tool "cg"
- name "Const"
- value 2)))
- (object Attribute
- tool "cg"
- name "DataMemberIsVolatile"
- value FALSE)
- (object Attribute
- tool "cg"
- name "DataMemberFieldSize"
- value "")
- (object Attribute
- tool "cg"
- name "GenerateGetOperation"
- value TRUE)
- (object Attribute
- tool "cg"
- name "GenerateSetOperation"
- value TRUE)
- (object Attribute
- tool "cg"
- name "GetName"
- value "get_$attribute")
- (object Attribute
- tool "cg"
- name "SetName"
- value "set_$attribute")
- (object Attribute
- tool "cg"
- name "GetSetKinds"
- value ("GetSetKindsSet" 200))
- (object Attribute
- tool "cg"
- name "GetSetKindsSet"
- value (list Attribute_Set
- (object Attribute
- tool "cg"
- name "Common"
- value 200)
- (object Attribute
- tool "cg"
- name "Virtual"
- value 201)
- (object Attribute
- tool "cg"
- name "Abstract"
- value 202)
- (object Attribute
- tool "cg"
- name "Static"
- value 203)
- (object Attribute
- tool "cg"
- name "Friend"
- value 204)))
- (object Attribute
- tool "cg"
- name "GetIsConst"
- value TRUE)
- (object Attribute
- tool "cg"
- name "GetResultIsConst"
- value ("GetResultIsConstSet" 2))
- (object Attribute
- tool "cg"
- name "GetResultIsConstSet"
- value (list Attribute_Set
- (object Attribute
- tool "cg"
- name "False"
- value 0)
- (object Attribute
- tool "cg"
- name "True"
- value 1)
- (object Attribute
- tool "cg"
- name "Same_As_Function"
- value 2)))
- (object Attribute
- tool "cg"
- name "GetSetByReference"
- value FALSE)
- (object Attribute
- tool "cg"
- name "InlineGet"
- value TRUE)
- (object Attribute
- tool "cg"
- name "SetReturnsValue"
- value FALSE)
- (object Attribute
- tool "cg"
- name "InlineSet"
- value TRUE)
- (object Attribute
- tool "cg"
- name "CCRegion"
- value "")))
- (object Attribute
- tool "cg"
- name "default__Uses"
- value (list Attribute_Set
- (object Attribute
- tool "cg"
- name "ForwardReferenceOnly"
- value FALSE)
- (object Attribute
- tool "cg"
- name "BodyReferenceOnly"
- value FALSE)))
- (object Attribute
- tool "cg"
- name "default__Subsystem"
- value (list Attribute_Set
- (object Attribute
- tool "cg"
- name "Directory"
- value "AUTO GENERATE")
- (object Attribute
- tool "cg"
- name "DirectoryIsOnSearchList"
- value FALSE)
- (object Attribute
- tool "cg"
- name "PrecompiledHeader"
- value "")))
- (object Attribute
- tool "cg"
- name "default__Category"
- value (list Attribute_Set
- (object Attribute
- tool "cg"
- name "IsNamespace"
- value FALSE)
- (object Attribute
- tool "cg"
- name "Indent"
- value 2)
- (object Attribute
- tool "cg"
- name "CodeName"
- value "")
- (object Attribute
- tool "cg"
- name "GenerateEmptyRegions"
- value ("GenerateEmptyRegionSet" 3))
- (object Attribute
- tool "cg"
- name "GenerateEmptyRegionSet"
- value (list Attribute_Set
- (object Attribute
- tool "cg"
- name "None"
- value 0)
- (object Attribute
- tool "cg"
- name "Preserved"
- value 1)
- (object Attribute
- tool "cg"
- name "Unpreserved"
- value 2)
- (object Attribute
- tool "cg"
- name "All"
- value 3)))))
- (object Attribute
- tool "MSVC"
- name "propertyId"
- value "809135966")
- (object Attribute
- tool "MSVC"
- name "default__Project"
- value (list Attribute_Set
- (object Attribute
- tool "MSVC"
- name "Version"
- value "5.0")))
- (object Attribute
- tool "MSVC"
- name "default__Class"
- value (list Attribute_Set
- (object Attribute
- tool "MSVC"
- name "Type"
- value ("MSVCClassTypeSet" 0))
- (object Attribute
- tool "MSVC"
- name "MSVCClassTypeSet"
- value (list Attribute_Set
- (object Attribute
- tool "MSVC"
- name "Normal"
- value 0)
- (object Attribute
- tool "MSVC"
- name "Interface_Part"
- value 1)
- (object Attribute
- tool "MSVC"
- name "Connection_Part"
- value 2)
- (object Attribute
- tool "MSVC"
- name "Class_Factory"
- value 3)))
- (object Attribute
- tool "MSVC"
- name "CObjectFunctionality"
- value ("CObjectFunctionalitySet" 0))
- (object Attribute
- tool "MSVC"
- name "CObjectFunctionalitySet"
- value (list Attribute_Set
- (object Attribute
- tool "MSVC"
- name "None"
- value 0)
- (object Attribute
- tool "MSVC"
- name "Dynamic"
- value 1)
- (object Attribute
- tool "MSVC"
- name "Dyncreate"
- value 2)
- (object Attribute
- tool "MSVC"
- name "Serial"
- value 3)))
- (object Attribute
- tool "MSVC"
- name "GenerateOverrideGroup"
- value FALSE)
- (object Attribute
- tool "MSVC"
- name "GenerateDataGroup"
- value FALSE)
- (object Attribute
- tool "MSVC"
- name "AFX_DATA_Entries"
- value (value Text ""))
- (object Attribute
- tool "MSVC"
- name "GenerateFieldGroup"
- value FALSE)
- (object Attribute
- tool "MSVC"
- name "AFX_FIELD_Entries"
- value (value Text ""))
- (object Attribute
- tool "MSVC"
- name "GenerateMessageGroup"
- value FALSE)
- (object Attribute
- tool "MSVC"
- name "GenerateMessageMap"
- value FALSE)
- (object Attribute
- tool "MSVC"
- name "AFX_MSG_MAP_Entries"
- value (value Text ""))
- (object Attribute
- tool "MSVC"
- name "MESSAGE_MAP_Entries"
- value (value Text ""))
- (object Attribute
- tool "MSVC"
- name "OLEFactory"
- value ("OLEFactorySet" 0))
- (object Attribute
- tool "MSVC"
- name "OLEFactorySet"
- value (list Attribute_Set
- (object Attribute
- tool "MSVC"
- name "None"
- value 0)
- (object Attribute
- tool "MSVC"
- name "Built_in"
- value 1)
- (object Attribute
- tool "MSVC"
- name "Simple"
- value 2)
- (object Attribute
- tool "MSVC"
- name "Licensed"
- value 3)))
- (object Attribute
- tool "MSVC"
- name "OLEName"
- value "")
- (object Attribute
- tool "MSVC"
- name "OLEClassID"
- value "")
- (object Attribute
- tool "MSVC"
- name "GenerateOLECtlType"
- value FALSE)
- (object Attribute
- tool "MSVC"
- name "OLECtlType"
- value "")
- (object Attribute
- tool "MSVC"
- name "GenerateOLETypeLib"
- value FALSE)
- (object Attribute
- tool "MSVC"
- name "OLETypeLibID"
- value "")
- (object Attribute
- tool "MSVC"
- name "OLETypeLibMajor"
- value "")
- (object Attribute
- tool "MSVC"
- name "OLETypeLibMinor"
- value "")
- (object Attribute
- tool "MSVC"
- name "GeneratePropPageIDs"
- value FALSE)
- (object Attribute
- tool "MSVC"
- name "OLEPropPageIDs"
- value (value Text ""))
- (object Attribute
- tool "MSVC"
- name "GenerateDispatchMap"
- value FALSE)
- (object Attribute
- tool "MSVC"
- name "AFX_DISPATCH_Entries"
- value (value Text ""))
- (object Attribute
- tool "MSVC"
- name "AFX_DISPATCH_MAP_Entries"
- value (value Text ""))
- (object Attribute
- tool "MSVC"
- name "DISPATCH_MAP_Entries"
- value (value Text ""))
- (object Attribute
- tool "MSVC"
- name "StockProperties"
- value (value Text ""))
- (object Attribute
- tool "MSVC"
- name "StockFunctions"
- value (value Text ""))
- (object Attribute
- tool "MSVC"
- name "DispatchDefValue"
- value "")
- (object Attribute
- tool "MSVC"
- name "GenerateDispIdEnum"
- value FALSE)
- (object Attribute
- tool "MSVC"
- name "AFX_DISP_ID_Entries"
- value (value Text ""))
- (object Attribute
- tool "MSVC"
- name "GenerateInterfaceMap"
- value FALSE)
- (object Attribute
- tool "MSVC"
- name "INTERFACE_MAP_Entries"
- value (value Text ""))
- (object Attribute
- tool "MSVC"
- name "InitInterface"
- value "")
- (object Attribute
- tool "MSVC"
- name "GenerateEventMap"
- value FALSE)
- (object Attribute
- tool "MSVC"
- name "AFX_EVENT_Entries"
- value (value Text ""))
- (object Attribute
- tool "MSVC"
- name "AFX_EVENT_MAP_Entries"
- value (value Text ""))
- (object Attribute
- tool "MSVC"
- name "EVENT_MAP_Entries"
- value (value Text ""))
- (object Attribute
- tool "MSVC"
- name "StockEvents"
- value (value Text ""))
- (object Attribute
- tool "MSVC"
- name "GenerateEventSinkMap"
- value FALSE)
- (object Attribute
- tool "MSVC"
- name "AFX_EVENTSINK_Entries"
- value (value Text ""))
- (object Attribute
- tool "MSVC"
- name "AFX_EVENTSINK_MAP_Entries"
- value (value Text ""))
- (object Attribute
- tool "MSVC"
- name "EVENTSINK_MAP_Entries"
- value (value Text ""))
- (object Attribute
- tool "MSVC"
- name "PropNotifySinks"
- value (value Text ""))
- (object Attribute
- tool "MSVC"
- name "GenerateConnectionMap"
- value FALSE)
- (object Attribute
- tool "MSVC"
- name "CONNECTION_MAP_Entries"
- value (value Text ""))
- (object Attribute
- tool "MSVC"
- name "ConnectionPointIID"
- value "")
- (object Attribute
- tool "MSVC"
- name "InheritanceType"
- value "")
- (object Attribute
- tool "MSVC"
- name "DeclSpec"
- value "")
- (object Attribute
- tool "MSVC"
- name "OLECommands"
- value (value Text ""))
- (object Attribute
- tool "MSVC"
- name "MFCDeclares"
- value (value Text ""))
- (object Attribute
- tool "MSVC"
- name "MFCImplements"
- value (value Text ""))
- (object Attribute
- tool "MSVC"
- name "ATL_Declares"
- value (value Text ""))
- (object Attribute
- tool "MSVC"
- name "GenerateCOMMap"
- value FALSE)
- (object Attribute
- tool "MSVC"
- name "COM_MAP_Entries"
- value (value Text ""))
- (object Attribute
- tool "MSVC"
- name "GenerateConnectionPointMap"
- value FALSE)
- (object Attribute
- tool "MSVC"
- name "CONNECTION_POINT_MAP_Entries"
- value (value Text ""))
- (object Attribute
- tool "MSVC"
- name "GenerateMsgMap"
- value FALSE)
- (object Attribute
- tool "MSVC"
- name "MSG_MAP_Entries"
- value (value Text ""))
- (object Attribute
- tool "MSVC"
- name "GeneratePropertyMap"
- value FALSE)
- (object Attribute
- tool "MSVC"
- name "PROPERTY_MAP_Entries"
- value (value Text ""))))
- (object Attribute
- tool "MSVC"
- name "default__Operation"
- value (list Attribute_Set
- (object Attribute
- tool "MSVC"
- name "Type"
- value ("MSVCOperationTypeSet" 0))
- (object Attribute
- tool "MSVC"
- name "MSVCOperationTypeSet"
- value (list Attribute_Set
- (object Attribute
- tool "MSVC"
- name "Normal"
- value 0)
- (object Attribute
- tool "MSVC"
- name "Virtual_Override"
- value 1)
- (object Attribute
- tool "MSVC"
- name "Message_Handler"
- value 2)
- (object Attribute
- tool "MSVC"
- name "Dispatch_Handler"
- value 3)
- (object Attribute
- tool "MSVC"
- name "Event_Firing_Function"
- value 4)
- (object Attribute
- tool "MSVC"
- name "Event_Sink_Handler"
- value 5)
- (object Attribute
- tool "MSVC"
- name "Std_OLE_Method"
- value 6)
- (object Attribute
- tool "MSVC"
- name "Command_Parser"
- value 7)
- (object Attribute
- tool "MSVC"
- name "Property_Get_Function"
- value 8)
- (object Attribute
- tool "MSVC"
- name "Property_Set_Function"
- value 9)
- (object Attribute
- tool "MSVC"
- name "Property_Notify_Function"
- value 10)
- (object Attribute
- tool "MSVC"
- name "Macro_Generated_Function"
- value 11)))
- (object Attribute
- tool "MSVC"
- name "AFX_MSG_MAP_Entries"
- value (value Text ""))
- (object Attribute
- tool "MSVC"
- name "MESSAGE_MAP_Entries"
- value (value Text ""))
- (object Attribute
- tool "MSVC"
- name "AFX_DISPATCH_MAP_Entries"
- value (value Text ""))
- (object Attribute
- tool "MSVC"
- name "DISPATCH_MAP_Entries"
- value (value Text ""))
- (object Attribute
- tool "MSVC"
- name "AFX_EVENT_MAP_Entries"
- value (value Text ""))
- (object Attribute
- tool "MSVC"
- name "EVENT_MAP_Entries"
- value (value Text ""))
- (object Attribute
- tool "MSVC"
- name "AFX_EVENTSINK_MAP_Entries"
- value (value Text ""))
- (object Attribute
- tool "MSVC"
- name "EVENTSINK_MAP_Entries"
- value (value Text ""))
- (object Attribute
- tool "MSVC"
- name "CallType"
- value "")
- (object Attribute
- tool "MSVC"
- name "DeclSpec"
- value "")
- (object Attribute
- tool "MSVC"
- name "BodyImage"
- value (value Text ""))))
- (object Attribute
- tool "MSVC"
- name "default__Role"
- value (list Attribute_Set
- (object Attribute
- tool "MSVC"
- name "Type"
- value ("MSVCAttributeTypeSet" 0))
- (object Attribute
- tool "MSVC"
- name "MSVCAttributeTypeSet"
- value (list Attribute_Set
- (object Attribute
- tool "MSVC"
- name "Normal"
- value 0)
- (object Attribute
- tool "MSVC"
- name "Member_Property"
- value 1)
- (object Attribute
- tool "MSVC"
- name "Get_Set_Property"
- value 2)
- (object Attribute
- tool "MSVC"
- name "Dialog_Data"
- value 3)
- (object Attribute
- tool "MSVC"
- name "Field_Data"
- value 4)
- (object Attribute
- tool "MSVC"
- name "Stock_Property"
- value 5)))
- (object Attribute
- tool "MSVC"
- name "AFX_DISPATCH_MAP_Entries"
- value (value Text ""))
- (object Attribute
- tool "MSVC"
- name "DISPATCH_MAP_Entries"
- value (value Text ""))
- (object Attribute
- tool "MSVC"
- name "DeclSpec"
- value "")
- (object Attribute
- tool "MSVC"
- name "PointerBase"
- value "")
- (object Attribute
- tool "MSVC"
- name "CallType"
- value "")
- (object Attribute
- tool "MSVC"
- name "StockPropertyImplementation"
- value "")))
- (object Attribute
- tool "MSVC"
- name "default__Has"
- value (list Attribute_Set
- (object Attribute
- tool "MSVC"
- name "Type"
- value ("MSVCAttributeTypeSet" 0))
- (object Attribute
- tool "MSVC"
- name "MSVCAttributeTypeSet"
- value (list Attribute_Set
- (object Attribute
- tool "MSVC"
- name "Normal"
- value 0)
- (object Attribute
- tool "MSVC"
- name "Member_Property"
- value 1)
- (object Attribute
- tool "MSVC"
- name "Get_Set_Property"
- value 2)
- (object Attribute
- tool "MSVC"
- name "Dialog_Data"
- value 3)
- (object Attribute
- tool "MSVC"
- name "Field_Data"
- value 4)
- (object Attribute
- tool "MSVC"
- name "Stock_Property"
- value 5)))
- (object Attribute
- tool "MSVC"
- name "AFX_DISPATCH_MAP_Entries"
- value (value Text ""))
- (object Attribute
- tool "MSVC"
- name "DISPATCH_MAP_Entries"
- value (value Text ""))
- (object Attribute
- tool "MSVC"
- name "DeclSpec"
- value "")
- (object Attribute
- tool "MSVC"
- name "PointerBase"
- value "")
- (object Attribute
- tool "MSVC"
- name "CallType"
- value "")
- (object Attribute
- tool "MSVC"
- name "StockPropertyImplementation"
- value "")))
- (object Attribute
- tool "MSVC"
- name "default__Attribute"
- value (list Attribute_Set
- (object Attribute
- tool "MSVC"
- name "Type"
- value ("MSVCAttributeTypeSet" 0))
- (object Attribute
- tool "MSVC"
- name "MSVCAttributeTypeSet"
- value (list Attribute_Set
- (object Attribute
- tool "MSVC"
- name "Normal"
- value 0)
- (object Attribute
- tool "MSVC"
- name "Member_Property"
- value 1)
- (object Attribute
- tool "MSVC"
- name "Get_Set_Property"
- value 2)
- (object Attribute
- tool "MSVC"
- name "Dialog_Data"
- value 3)
- (object Attribute
- tool "MSVC"
- name "Field_Data"
- value 4)
- (object Attribute
- tool "MSVC"
- name "Stock_Property"
- value 5)))
- (object Attribute
- tool "MSVC"
- name "AFX_DISPATCH_MAP_Entries"
- value (value Text ""))
- (object Attribute
- tool "MSVC"
- name "DISPATCH_MAP_Entries"
- value (value Text ""))
- (object Attribute
- tool "MSVC"
- name "DeclSpec"
- value "")
- (object Attribute
- tool "MSVC"
- name "PointerBase"
- value "")
- (object Attribute
- tool "MSVC"
- name "CallType"
- value "")
- (object Attribute
- tool "MSVC"
- name "StockPropertyImplementation"
- value "")))
- (object Attribute
- tool "MSVC"
- name "default__Module-Spec"
- value (list Attribute_Set
- (object Attribute
- tool "MSVC"
- name "GenerateIncludesGroup"
- value FALSE)
- (object Attribute
- tool "MSVC"
- name "AFX_INCLUDES_Entries"
- value (value Text ""))
- (object Attribute
- tool "MSVC"
- name "GenerateInsertLocation"
- value FALSE)))
- (object Attribute
- tool "MSVC"
- name "default__Module-Body"
- value (list Attribute_Set
- (object Attribute
- tool "MSVC"
- name "GenerateIncludesGroup"
- value FALSE)
- (object Attribute
- tool "MSVC"
- name "AFX_INCLUDES_Entries"
- value (value Text ""))
- (object Attribute
- tool "MSVC"
- name "GenerateInsertLocation"
- value FALSE)))
- (object Attribute
- tool "cg"
- name "HiddenTool"
- value FALSE)
- (object Attribute
- tool "Rose Model Integrator"
- name "HiddenTool"
- value FALSE)
- (object Attribute
- tool "Rose Web Publisher"
- name "HiddenTool"
- value FALSE)
- (object Attribute
- tool "SoDA"
- name "HiddenTool"
- value FALSE)
- (object Attribute
- tool "TopLink"
- name "HiddenTool"
- value FALSE)
- (object Attribute
- tool "COM"
- name "propertyId"
- value "783606378")
- (object Attribute
- tool "COM"
- name "default__Class"
- value (list Attribute_Set
- (object Attribute
- tool "COM"
- name "TypeKinds"
- value (list Attribute_Set
- (object Attribute
- tool "COM"
- name "enum"
- value 100)
- (object Attribute
- tool "COM"
- name "record"
- value 101)
- (object Attribute
- tool "COM"
- name "module"
- value 102)
- (object Attribute
- tool "COM"
- name "interface"
- value 103)
- (object Attribute
- tool "COM"
- name "dispinterface"
- value 104)
- (object Attribute
- tool "COM"
- name "coclass"
- value 105)
- (object Attribute
- tool "COM"
- name "alias"
- value 106)
- (object Attribute
- tool "COM"
- name "union"
- value 107)
- (object Attribute
- tool "COM"
- name "max"
- value 108)
- (object Attribute
- tool "COM"
- name "(none)"
- value 109)))
- (object Attribute
- tool "COM"
- name "Generate"
- value TRUE)
- (object Attribute
- tool "COM"
- name "kind"
- value ("TypeKinds" 109))
- (object Attribute
- tool "COM"
- name "uuid"
- value "")
- (object Attribute
- tool "COM"
- name "version"
- value "")
- (object Attribute
- tool "COM"
- name "helpstring"
- value "")
- (object Attribute
- tool "COM"
- name "helpcontext"
- value "")
- (object Attribute
- tool "COM"
- name "attributes"
- value "")
- (object Attribute
- tool "COM"
- name "dllname"
- value "")
- (object Attribute
- tool "COM"
- name "alias"
- value "")))
- (object Attribute
- tool "COM"
- name "default__Operation"
- value (list Attribute_Set
- (object Attribute
- tool "COM"
- name "Generate"
- value TRUE)
- (object Attribute
- tool "COM"
- name "id"
- value "")
- (object Attribute
- tool "COM"
- name "helpstring"
- value "")
- (object Attribute
- tool "COM"
- name "attributes"
- value "")))
- (object Attribute
- tool "COM"
- name "default__Attribute"
- value (list Attribute_Set
- (object Attribute
- tool "COM"
- name "Generate"
- value TRUE)
- (object Attribute
- tool "COM"
- name "id"
- value "")
- (object Attribute
- tool "COM"
- name "helpstring"
- value "")
- (object Attribute
- tool "COM"
- name "attributes"
- value "")))
- (object Attribute
- tool "COM"
- name "default__Module-Spec"
- value (list Attribute_Set
- (object Attribute
- tool "COM"
- name "Generate"
- value TRUE)
- (object Attribute
- tool "COM"
- name "filename"
- value "")
- (object Attribute
- tool "COM"
- name "library"
- value "")
- (object Attribute
- tool "COM"
- name "uuid"
- value "")
- (object Attribute
- tool "COM"
- name "version"
- value "")
- (object Attribute
- tool "COM"
- name "helpstring"
- value "")
- (object Attribute
- tool "COM"
- name "helpfile"
- value "")
- (object Attribute
- tool "COM"
- name "helpcontext"
- value "")
- (object Attribute
- tool "COM"
- name "lcid"
- value "")
- (object Attribute
- tool "COM"
- name "attributes"
- value "")))
- (object Attribute
- tool "COM"
- name "default__Param"
- value (list Attribute_Set
- (object Attribute
- tool "COM"
- name "attributes"
- value "")))
- (object Attribute
- tool "COM"
- name "HiddenTool"
- value FALSE)
- (object Attribute
- tool "Visual Basic"
- name "propertyId"
- value "783606378")
- (object Attribute
- tool "Visual Basic"
- name "default__Class"
- value (list Attribute_Set
- (object Attribute
- tool "Visual Basic"
- name "UpdateCode"
- value TRUE)
- (object Attribute
- tool "Visual Basic"
- name "UpdateModel"
- value TRUE)
- (object Attribute
- tool "Visual Basic"
- name "InstancingSet"
- value (list Attribute_Set
- (object Attribute
- tool "Visual Basic"
- name "Private"
- value 221)
- (object Attribute
- tool "Visual Basic"
- name "PublicNotCreatable"
- value 213)
- (object Attribute
- tool "Visual Basic"
- name "SingleUse"
- value 214)
- (object Attribute
- tool "Visual Basic"
- name "GlobalSingleUse"
- value 215)
- (object Attribute
- tool "Visual Basic"
- name "MultiUse"
- value 219)
- (object Attribute
- tool "Visual Basic"
- name "GlobalMultiUse"
- value 220)))
- (object Attribute
- tool "Visual Basic"
- name "BaseSet"
- value (list Attribute_Set
- (object Attribute
- tool "Visual Basic"
- name "(none)"
- value 222)
- (object Attribute
- tool "Visual Basic"
- name "0"
- value 223)
- (object Attribute
- tool "Visual Basic"
- name "1"
- value 224)))
- (object Attribute
- tool "Visual Basic"
- name "OptionBase"
- value ("BaseSet" 222))
- (object Attribute
- tool "Visual Basic"
- name "OptionExplicit"
- value TRUE)
- (object Attribute
- tool "Visual Basic"
- name "OptionCompare"
- value ("CompareSet" 202))
- (object Attribute
- tool "Visual Basic"
- name "Instancing"
- value ("InstancingSet" 219))
- (object Attribute
- tool "Visual Basic"
- name "CompareSet"
- value (list Attribute_Set
- (object Attribute
- tool "Visual Basic"
- name "(none)"
- value 202)
- (object Attribute
- tool "Visual Basic"
- name "Binary"
- value 203)
- (object Attribute
- tool "Visual Basic"
- name "Text"
- value 204)))))
- (object Attribute
- tool "Visual Basic"
- name "default__Operation"
- value (list Attribute_Set
- (object Attribute
- tool "Visual Basic"
- name "LibraryName"
- value "")
- (object Attribute
- tool "Visual Basic"
- name "AliasName"
- value "")
- (object Attribute
- tool "Visual Basic"
- name "IsStatic"
- value FALSE)
- (object Attribute
- tool "Visual Basic"
- name "ProcedureID"
- value "")
- (object Attribute
- tool "Visual Basic"
- name "ReplaceExistingBody"
- value FALSE)
- (object Attribute
- tool "Visual Basic"
- name "DefaultBody"
- value (value Text ""))))
- (object Attribute
- tool "Visual Basic"
- name "default__Attribute"
- value (list Attribute_Set
- (object Attribute
- tool "Visual Basic"
- name "New"
- value FALSE)
- (object Attribute
- tool "Visual Basic"
- name "WithEvents"
- value FALSE)
- (object Attribute
- tool "Visual Basic"
- name "ProcedureID"
- value "")
- (object Attribute
- tool "Visual Basic"
- name "PropertyName"
- value "")
- (object Attribute
- tool "Visual Basic"
- name "Subscript"
- value "")))
- (object Attribute
- tool "Visual Basic"
- name "default__Role"
- value (list Attribute_Set
- (object Attribute
- tool "Visual Basic"
- name "UpdateCode"
- value TRUE)
- (object Attribute
- tool "Visual Basic"
- name "New"
- value FALSE)
- (object Attribute
- tool "Visual Basic"
- name "WithEvents"
- value FALSE)
- (object Attribute
- tool "Visual Basic"
- name "FullName"
- value FALSE)
- (object Attribute
- tool "Visual Basic"
- name "ProcedureID"
- value "")
- (object Attribute
- tool "Visual Basic"
- name "PropertyName"
- value "")
- (object Attribute
- tool "Visual Basic"
- name "Subscript"
- value "")))
- (object Attribute
- tool "Visual Basic"
- name "default__Inherit"
- value (list Attribute_Set
- (object Attribute
- tool "Visual Basic"
- name "ImplementsDelegation"
- value TRUE)
- (object Attribute
- tool "Visual Basic"
- name "FullName"
- value FALSE)))
- (object Attribute
- tool "Visual Basic"
- name "default__Param"
- value (list Attribute_Set
- (object Attribute
- tool "Visual Basic"
- name "ByVal"
- value FALSE)
- (object Attribute
- tool "Visual Basic"
- name "ByRef"
- value FALSE)
- (object Attribute
- tool "Visual Basic"
- name "Optional"
- value FALSE)
- (object Attribute
- tool "Visual Basic"
- name "ParamArray"
- value FALSE)))
- (object Attribute
- tool "Visual Basic"
- name "default__Module-Spec"
- value (list Attribute_Set
- (object Attribute
- tool "Visual Basic"
- name "ProjectFile"
- value "")
- (object Attribute
- tool "Visual Basic"
- name "UpdateCode"
- value TRUE)
- (object Attribute
- tool "Visual Basic"
- name "UpdateModel"
- value TRUE)
- (object Attribute
- tool "Visual Basic"
- name "ImportReferences"
- value TRUE)
- (object Attribute
- tool "Visual Basic"
- name "QuickImport"
- value TRUE)
- (object Attribute
- tool "Visual Basic"
- name "ImportBinary"
- value FALSE)))
- (object Attribute
- tool "Visual Basic"
- name "HiddenTool"
- value FALSE)
- (object Attribute
- tool "VisualStudio"
- name "HiddenTool"
- value FALSE)
- (object Attribute
- tool "Web Modeler"
- name "HiddenTool"
- value FALSE)
- (object Attribute
- tool "XML_DTD"
- name "propertyId"
- value "809135966")
- (object Attribute
- tool "XML_DTD"
- name "default__Project"
- value (list Attribute_Set
- (object Attribute
- tool "XML_DTD"
- name "CreateMissingDirectories"
- value TRUE)
- (object Attribute
- tool "XML_DTD"
- name "Editor"
- value ("EditorType" 100))
- (object Attribute
- tool "XML_DTD"
- name "StopOnError"
- value TRUE)
- (object Attribute
- tool "XML_DTD"
- name "EditorType"
- value (list Attribute_Set
- (object Attribute
- tool "XML_DTD"
- name "BuiltIn"
- value 100)
- (object Attribute
- tool "XML_DTD"
- name "WindowsShell"
- value 101)))))
- (object Attribute
- tool "XML_DTD"
- name "default__Class"
- value (list Attribute_Set
- (object Attribute
- tool "XML_DTD"
- name "Entity_SystemID"
- value "")
- (object Attribute
- tool "XML_DTD"
- name "Entity_PublicID"
- value "")
- (object Attribute
- tool "XML_DTD"
- name "NotationValue"
- value "")
- (object Attribute
- tool "XML_DTD"
- name "InternalValue"
- value "")
- (object Attribute
- tool "XML_DTD"
- name "ParameterEntity"
- value FALSE)
- (object Attribute
- tool "XML_DTD"
- name "ExternalEntity"
- value FALSE)
- (object Attribute
- tool "XML_DTD"
- name "Notation_SystemID"
- value "")
- (object Attribute
- tool "XML_DTD"
- name "Notation_PublicID"
- value "")))
- (object Attribute
- tool "XML_DTD"
- name "default__Attribute"
- value (list Attribute_Set
- (object Attribute
- tool "XML_DTD"
- name "DefaultDeclType"
- value "")))
- (object Attribute
- tool "XML_DTD"
- name "default__Module-Spec"
- value (list Attribute_Set
- (object Attribute
- tool "XML_DTD"
- name "Assign All"
- value FALSE)
- (object Attribute
- tool "XML_DTD"
- name "ComponentPath"
- value "")))
- (object Attribute
- tool "XML_DTD"
- name "HiddenTool"
- value FALSE)
- (object Attribute
- tool "Cplusplus"
- name "default__Module-Body"
- value (list Attribute_Set
- (object Attribute
- tool "Cplusplus"
- name "Synchronize"
- value TRUE)
- (object Attribute
- tool "Cplusplus"
- name "RevEngRootDirectory"
- value "")
- (object Attribute
- tool "Cplusplus"
- name "RootPackage"
- value "C++ Reverse Engineered")
- (object Attribute
- tool "Cplusplus"
- name "RevEngDirectoriesAsPackages"
- value FALSE)
- (object Attribute
- tool "Cplusplus"
- name "HeaderFileExtension"
- value ".h")
- (object Attribute
- tool "Cplusplus"
- name "ImplementationFileExtension"
- value ".cpp")
- (object Attribute
- tool "Cplusplus"
- name "NewHeaderFileDirectory"
- value "")
- (object Attribute
- tool "Cplusplus"
- name "NewImplementationFileDirectory"
- value "")
- (object Attribute
- tool "Cplusplus"
- name "FileCapitalization"
- value ("FileCapitalizationSet" 0))
- (object Attribute
- tool "Cplusplus"
- name "CodeGenExtraDirectories"
- value ("CodeGenExtraDirectoriesSet" 0))
- (object Attribute
- tool "Cplusplus"
- name "StripClassPrefix"
- value "")
- (object Attribute
- tool "Cplusplus"
- name "UseTabs"
- value FALSE)
- (object Attribute
- tool "Cplusplus"
- name "TabWidth"
- value 8)
- (object Attribute
- tool "Cplusplus"
- name "IndentWidth"
- value 4)
- (object Attribute
- tool "Cplusplus"
- name "AccessIndentation"
- value -2)
- (object Attribute
- tool "Cplusplus"
- name "ModelIdCommentRules"
- value ("ModelIdCommentRulesSet" 1))
- (object Attribute
- tool "Cplusplus"
- name "PageWidth"
- value 80)
- (object Attribute
- tool "Cplusplus"
- name "ClassMemberOrder"
- value ("MemberOrderSet" 1))
- (object Attribute
- tool "Cplusplus"
- name "OneParameterPerLine"
- value FALSE)
- (object Attribute
- tool "Cplusplus"
- name "NamespaceBraceStyle"
- value ("BraceStyleSet" 2))
- (object Attribute
- tool "Cplusplus"
- name "ClassBraceStyle"
- value ("BraceStyleSet" 2))
- (object Attribute
- tool "Cplusplus"
- name "FunctionBraceStyle"
- value ("BraceStyleSet" 2))
- (object Attribute
- tool "Cplusplus"
- name "Copyright"
- value (value Text ""))
- (object Attribute
- tool "Cplusplus"
- name "InitialHeaderIncludes"
- value (value Text ""))
- (object Attribute
- tool "Cplusplus"
- name "InitialBodyIncludes"
- value (value Text ""))
- (object Attribute
- tool "Cplusplus"
- name "CodeGenExtraDirectoriesSet"
- value (list Attribute_Set
- (object Attribute
- tool "Cplusplus"
- name "None"
- value 0)
- (object Attribute
- tool "Cplusplus"
- name "Namespaces"
- value 1)
- (object Attribute
- tool "Cplusplus"
- name "Packages"
- value 2)))
- (object Attribute
- tool "Cplusplus"
- name "FileCapitalizationSet"
- value (list Attribute_Set
- (object Attribute
- tool "Cplusplus"
- name "Same as model"
- value 0)
- (object Attribute
- tool "Cplusplus"
- name "Lower case"
- value 1)
- (object Attribute
- tool "Cplusplus"
- name "Upper case"
- value 2)
- (object Attribute
- tool "Cplusplus"
- name "Lower case with underscores"
- value 3)))
- (object Attribute
- tool "Cplusplus"
- name "BraceStyleSet"
- value (list Attribute_Set
- (object Attribute
- tool "Cplusplus"
- name "B1"
- value 1)
- (object Attribute
- tool "Cplusplus"
- name "B2"
- value 2)
- (object Attribute
- tool "Cplusplus"
- name "B3"
- value 3)
- (object Attribute
- tool "Cplusplus"
- name "B4"
- value 4)
- (object Attribute
- tool "Cplusplus"
- name "B5"
- value 5)))
- (object Attribute
- tool "Cplusplus"
- name "MemberOrderSet"
- value (list Attribute_Set
- (object Attribute
- tool "Cplusplus"
- name "Public First"
- value 1)
- (object Attribute
- tool "Cplusplus"
- name "Private First"
- value 2)
- (object Attribute
- tool "Cplusplus"
- name "Order by kind"
- value 3)
- (object Attribute
- tool "Cplusplus"
- name "Unordered"
- value 4)))
- (object Attribute
- tool "Cplusplus"
- name "ModelIdCommentRulesSet"
- value (list Attribute_Set
- (object Attribute
- tool "Cplusplus"
- name "Code generation only"
- value 1)
- (object Attribute
- tool "Cplusplus"
- name "Code generation and reverse engineering"
- value 2)
- (object Attribute
- tool "Cplusplus"
- name "Never generate model IDs"
- value 3)))))
- (object Attribute
- tool "Deploy"
- name "HiddenTool"
- value FALSE)
- (object Attribute
- tool "Version Control"
- name "HiddenTool"
- value FALSE)
- (object Attribute
- tool "Ecore"
- name "default__Category"
- value (list Attribute_Set
- (object Attribute
- tool "Ecore"
- name "packageName"
- value "")
- (object Attribute
- tool "Ecore"
- name "nsPrefix"
- value "")
- (object Attribute
- tool "Ecore"
- name "nsURI"
- value "")
- (object Attribute
- tool "Ecore"
- name "basePackage"
- value "")
- (object Attribute
- tool "Ecore"
- name "prefix"
- value "")
- (object Attribute
- tool "Ecore"
- name "annotation"
- value "")))
- (object Attribute
- tool "Ecore"
- name "default__Class"
- value (list Attribute_Set
- (object Attribute
- tool "Ecore"
- name "classifierName"
- value "")
- (object Attribute
- tool "Ecore"
- name "constraints"
- value "")
- (object Attribute
- tool "Ecore"
- name "xmlName"
- value "")
- (object Attribute
- tool "Ecore"
- name "xmlContentKind"
- value ("ContentKind" 0))
- (object Attribute
- tool "Ecore"
- name "ContentKind"
- value (list Attribute_Set
- (object Attribute
- tool "Ecore"
- name "Unspecified"
- value 0)
- (object Attribute
- tool "Ecore"
- name "Empty"
- value 1)
- (object Attribute
- tool "Ecore"
- name "Simple"
- value 2)
- (object Attribute
- tool "Ecore"
- name "Mixed"
- value 3)
- (object Attribute
- tool "Ecore"
- name "ElementOnly"
- value 4)))
- (object Attribute
- tool "Ecore"
- name "annotation"
- value "")))
- (object Attribute
- tool "Ecore"
- name "default__Operation"
- value (list Attribute_Set
- (object Attribute
- tool "Ecore"
- name "operationName"
- value "")
- (object Attribute
- tool "Ecore"
- name "isUnique"
- value TRUE)
- (object Attribute
- tool "Ecore"
- name "annotation"
- value "")))
- (object Attribute
- tool "Ecore"
- name "default__Attribute"
- value (list Attribute_Set
- (object Attribute
- tool "Ecore"
- name "attributeName"
- value "")
- (object Attribute
- tool "Ecore"
- name "isTransient"
- value FALSE)
- (object Attribute
- tool "Ecore"
- name "isVolatile"
- value FALSE)
- (object Attribute
- tool "Ecore"
- name "isChangeable"
- value TRUE)
- (object Attribute
- tool "Ecore"
- name "isUnsettable"
- value FALSE)
- (object Attribute
- tool "Ecore"
- name "isUnique"
- value TRUE)
- (object Attribute
- tool "Ecore"
- name "isID"
- value FALSE)
- (object Attribute
- tool "Ecore"
- name "visibility"
- value ("VisibilityKind" 0))
- (object Attribute
- tool "Ecore"
- name "VisibilityKind"
- value (list Attribute_Set
- (object Attribute
- tool "Ecore"
- name "Unspecified"
- value 0)
- (object Attribute
- tool "Ecore"
- name "None"
- value 1)
- (object Attribute
- tool "Ecore"
- name "Read-only"
- value 2)
- (object Attribute
- tool "Ecore"
- name "Read-write"
- value 3)
- (object Attribute
- tool "Ecore"
- name "Read-only unsettable"
- value 4)
- (object Attribute
- tool "Ecore"
- name "Read-write unsettable"
- value 5)))
- (object Attribute
- tool "Ecore"
- name "xmlName"
- value "")
- (object Attribute
- tool "Ecore"
- name "xmlNamespace"
- value "")
- (object Attribute
- tool "Ecore"
- name "xmlFeatureKind"
- value ("FeatureKind" 0))
- (object Attribute
- tool "Ecore"
- name "FeatureKind"
- value (list Attribute_Set
- (object Attribute
- tool "Ecore"
- name "Unspecified"
- value 0)
- (object Attribute
- tool "Ecore"
- name "Simple"
- value 1)
- (object Attribute
- tool "Ecore"
- name "Attribute"
- value 2)
- (object Attribute
- tool "Ecore"
- name "Element"
- value 4)))
- (object Attribute
- tool "Ecore"
- name "annotation"
- value "")))
- (object Attribute
- tool "Ecore"
- name "default__Role"
- value (list Attribute_Set
- (object Attribute
- tool "Ecore"
- name "referenceName"
- value "")
- (object Attribute
- tool "Ecore"
- name "isTransient"
- value FALSE)
- (object Attribute
- tool "Ecore"
- name "isVolatile"
- value FALSE)
- (object Attribute
- tool "Ecore"
- name "isChangeable"
- value TRUE)
- (object Attribute
- tool "Ecore"
- name "isUnsettable"
- value FALSE)
- (object Attribute
- tool "Ecore"
- name "isResolveProxies"
- value TRUE)
- (object Attribute
- tool "Ecore"
- name "visibility"
- value ("VisibilityKind" 0))
- (object Attribute
- tool "Ecore"
- name "VisibilityKind"
- value (list Attribute_Set
- (object Attribute
- tool "Ecore"
- name "Unspecified"
- value 0)
- (object Attribute
- tool "Ecore"
- name "None"
- value 1)
- (object Attribute
- tool "Ecore"
- name "Read-only"
- value 2)
- (object Attribute
- tool "Ecore"
- name "Read-write"
- value 3)
- (object Attribute
- tool "Ecore"
- name "Read-only unsettable"
- value 4)
- (object Attribute
- tool "Ecore"
- name "Read-write unsettable"
- value 5)))
- (object Attribute
- tool "Ecore"
- name "xmlName"
- value "")
- (object Attribute
- tool "Ecore"
- name "xmlNamespace"
- value "")
- (object Attribute
- tool "Ecore"
- name "xmlFeatureKind"
- value ("FeatureKind" 0))
- (object Attribute
- tool "Ecore"
- name "FeatureKind"
- value (list Attribute_Set
- (object Attribute
- tool "Ecore"
- name "Unspecified"
- value 0)
- (object Attribute
- tool "Ecore"
- name "Simple"
- value 1)
- (object Attribute
- tool "Ecore"
- name "Attribute"
- value 2)
- (object Attribute
- tool "Ecore"
- name "Element"
- value 4)))
- (object Attribute
- tool "Ecore"
- name "annotation"
- value "")))
- (object Attribute
- tool "Ecore"
- name "propertyId"
- value "809135969"))
- quid "3B86F1720171"))
diff --git a/plugins/org.eclipse.jem/rose/instantiation.cat b/plugins/org.eclipse.jem/rose/instantiation.cat
deleted file mode 100644
index 00ad0d2..0000000
--- a/plugins/org.eclipse.jem/rose/instantiation.cat
+++ /dev/null
@@ -1,2953 +0,0 @@
-
-(object Petal
- version 47
- _written "Rose 8.0.0303.1400"
- charSet 0)
-
-(object Class_Category "instantiation"
- is_unit TRUE
- is_loaded TRUE
- attributes (list Attribute_Set
- (object Attribute
- tool "Ecore"
- name "basePackage"
- value (value Text "org.eclipse.jem.internal")))
- quid "3B86F1720180"
- documentation "Java Instantiation Package"
- exportControl "Public"
- logical_models (list unit_reference_list
- (object Class "IJavaDataTypeInstance"
- quid "3B8AB17802B1"
- stereotype "Interface"
- superclasses (list inheritance_relationship_list
- (object Inheritance_Relationship
- quid "3E529562014E"
- supplier "Logical View::instantiation::IJavaInstance"
- quidu "3E51575A02D4"))
- class_attributes (list class_attribute_list
- (object ClassAttribute "org.eclipse.jem.internal.instantiation.base.IJavaDataTypeInstance"
- quid "3B8AB19100C2"
- stereotype "javaclass")))
- (object Class "IJavaInstance"
- quid "3E51575A02D4"
- stereotype "Interface"
- class_attributes (list class_attribute_list
- (object ClassAttribute "org.eclipse.jem.internal.instantiation.base.IJavaInstance"
- quid "3E51577802B9"
- stereotype "javaclass")))
- (object Class "IJavaObjectInstance"
- quid "3B782D790296"
- documentation "This interface is the instance of an java object in the java model."
- stereotype "Interface"
- superclasses (list inheritance_relationship_list
- (object Inheritance_Relationship
- quid "3E5157DA03DD"
- supplier "Logical View::instantiation::IJavaInstance"
- quidu "3E51575A02D4"))
- class_attributes (list class_attribute_list
- (object ClassAttribute "org.eclipse.jem.internal.instantiation.base.IJavaObjectInstance"
- quid "3B78301801C9"
- stereotype "javaclass")))
- (object Class "JavaAllocation"
- quid "3FD9E6900061"
- documentation
-|This class is the abstract base class of the allocation class. It is the value of the "allocation" property on a Java Object so that the actual allocation can be controlled. For example, there could be one for just init string, or one for serialized.
-
- abstract TRUE)
- (object Class "InitStringAllocation"
- quid "3FD9EAF9001E"
- documentation "This is used when the allocation string can be parsed by the remote vm. It uses the allocString."
- superclasses (list inheritance_relationship_list
- (object Inheritance_Relationship
- quid "3FD9EB7502DA"
- supplier "Logical View::instantiation::JavaAllocation"
- quidu "3FD9E6900061"))
- class_attributes (list class_attribute_list
- (object ClassAttribute "initString"
- quid "3FFDE1DE032E"
- documentation "This is the initialization string for this object."
- type "String"
- exportControl "Public")))
- (object Class "ImplicitAllocation"
- quid "3FD9EC140242"
- documentation "This class is for an implicit allocation where the object comes from the feature of another object. It is the live Java value from the remote vm."
- superclasses (list inheritance_relationship_list
- (object Inheritance_Relationship
- quid "3FD9EC4700E7"
- supplier "Logical View::instantiation::JavaAllocation"
- quidu "3FD9E6900061")))
- (object Class "ParseTreeAllocation"
- quid "40082C910005"
- documentation "Allocations via Parse Trees."
- superclasses (list inheritance_relationship_list
- (object Inheritance_Relationship
- quid "40082CB701D6"
- supplier "Logical View::instantiation::JavaAllocation"
- quidu "3FD9E6900061")))
- (object Class "PTExpression"
- quid "40082D0A01CB"
- abstract TRUE)
- (object Class "PTArrayAccess"
- quid "40082E140250"
- documentation
-|Array access. e.g. x[3].
-|
-|Unlike AST, the entire expression of type x[3][4] will be done in one expression rather than having a separate ArrayAccess for each dimension. This is just a simplification. This can only be used if it is a simple array access where it is of the form {expression}[expression][expression].
-
- superclasses (list inheritance_relationship_list
- (object Inheritance_Relationship
- quid "40082E6F01F7"
- supplier "Logical View::instantiation::PTExpression"
- quidu "40082D0A01CB"))
- class_attributes (list class_attribute_list
- (object ClassAttribute "array"
- quid "40082E8E0237"
- documentation "The expression representing the array to access."
- type "PTExpression"
- quidu "40082D0A01CB"
- exportControl "Public")
- (object ClassAttribute "indexes"
- quid "40082E9B007D"
- documentation "The expressions representing the indexes of the access."
- stereotype "1..*"
- type "PTExpression"
- quidu "40082D0A01CB"
- exportControl "Public")))
- (object Class "PTArrayCreation"
- quid "40083712025A"
- documentation
-|Array Creation expression, e.g. new int[3] or new java.langString[][] {{"a"}, {"b"}}
-
- superclasses (list inheritance_relationship_list
- (object Inheritance_Relationship
- quid "400837210049"
- supplier "Logical View::instantiation::PTExpression"
- quidu "40082D0A01CB"))
- class_attributes (list class_attribute_list
- (object ClassAttribute "type"
- quid "400837E902BD"
- documentation "The fully-qualified type, e.g. int[][] or java.lang.String[], including the number of dimension brackets."
- type "String"
- exportControl "Public")
- (object ClassAttribute "dimensions"
- quid "4008389501E8"
- documentation "The list of expressions for the dimensions. You can have [3][4][] but [][33] is invalid. So for each dimension that has an expression, there will be an entry in the list, in the correct order. When you reach the empty dimensions, the list will end too. "
- stereotype "0..*"
- type "PTExpression"
- quidu "40082D0A01CB"
- exportControl "Public")
- (object ClassAttribute "initializer"
- quid "4008397C0231"
- documentation "This is the initializer, if any, for this array. E.g. new int[] {2,3}. It is the {2,3}."
- type "PTArrayInitializer"
- quidu "40083968014C"
- exportControl "Public")))
- (object Class "PTArrayInitializer"
- quid "40083968014C"
- documentation "Array initialization expression. This is the entire expression, e.g. {2, 3}, or {{2,3}, 4}. In the second case, the {2,3} will be an ArrayInitializer contained within the expressions list for the top ArrayInitializer."
- superclasses (list inheritance_relationship_list
- (object Inheritance_Relationship
- quid "400839790038"
- supplier "Logical View::instantiation::PTExpression"
- quidu "40082D0A01CB"))
- class_attributes (list class_attribute_list
- (object ClassAttribute "expressions"
- quid "40083A5700EB"
- documentation "This isthe list of expressions within the initializer, e.g. {2, 3}, or {{2,3}, 4}. In the first case it will be two NumberLiterals. In the second case, the {2,3} will be an ArrayInitializer, followed by a NumberLiteral."
- stereotype "0..*"
- type "PTExpression"
- quidu "40082D0A01CB"
- exportControl "Public")))
- (object Class "PTBooleanLiteral"
- quid "40083AE70247"
- documentation "This represents a primitive boolean literal, i.e. true or false directly in the code."
- superclasses (list inheritance_relationship_list
- (object Inheritance_Relationship
- quid "40083B1D0000"
- supplier "Logical View::instantiation::PTExpression"
- quidu "40082D0A01CB"))
- class_attributes (list class_attribute_list
- (object ClassAttribute "booleanValue"
- quid "40083B3D001A"
- documentation "The value of the literal."
- type "boolean"
- exportControl "Public")))
- (object Class "PTCastExpression"
- quid "40083B6F0058"
- documentation "Cast expression, e.g. (short) 10"
- superclasses (list inheritance_relationship_list
- (object Inheritance_Relationship
- quid "40083BD60309"
- supplier "Logical View::instantiation::PTExpression"
- quidu "40082D0A01CB"))
- class_attributes (list class_attribute_list
- (object ClassAttribute "type"
- quid "40083B9600F4"
- documentation "This is the fully-qualified type of the cast, e.g. int or java.lang.String"
- type "String"
- exportControl "Public")
- (object ClassAttribute "expression"
- quid "40083BB6033F"
- documentation "The expression being casted."
- type "PTExpression"
- quidu "40082D0A01CB"
- exportControl "Public")))
- (object Class "PTCharacterLiteral"
- quid "40084DF10277"
- documentation "This represents a primitive character expression, e.g. 'a' or '\\r'."
- superclasses (list inheritance_relationship_list
- (object Inheritance_Relationship
- quid "40084E1301EA"
- supplier "Logical View::instantiation::PTExpression"
- quidu "40082D0A01CB"))
- class_attributes (list class_attribute_list
- (object ClassAttribute "escapedValue"
- quid "40084E39014E"
- documentation "This is the escaped character. In other words the literal exactly as it is in the java file. E.g. 'a' or '\\r'. Including the surrounding single quotes themselves."
- type "String"
- exportControl "Public")
- (object ClassAttribute "charValue"
- attributes (list Attribute_Set
- (object Attribute
- tool "Ecore"
- name "isTransient"
- value TRUE))
- quid "40084EB702CC"
- documentation "The actual primitive character without the quotes. Escape are evaluated and turned into their character value. This is a transient field. If not set when created when queried it will create it. Typically it will be set when created from an AST node since the node already has evaluated it."
- type "char"
- exportControl "Public")))
- (object Class "PTClassInstanceCreation"
- quid "40084F40026F"
- documentation
-|Class instance creation expression. E.g. new String("a")
-
- superclasses (list inheritance_relationship_list
- (object Inheritance_Relationship
- quid "40084F4C02F8"
- supplier "Logical View::instantiation::PTExpression"
- quidu "40082D0A01CB"))
- class_attributes (list class_attribute_list
- (object ClassAttribute "type"
- quid "40084FAD0294"
- documentation
-|This is the type of the class. E.g. java.lang.String. This should be fully-qualified for allocation purposes. It should also be in reflection format, i.e. if X is an inner class of j.Y, then the type here should be "j.Y$X".
-
- type "String"
- exportControl "Public")
- (object ClassAttribute "arguments"
- quid "4008515E0138"
- documentation "The arguments to the constructor."
- stereotype "0..*"
- type "PTExpression"
- quidu "40082D0A01CB"
- exportControl "Public")))
- (object Class "PTConditionalExpression"
- quid "400851FB026A"
- documentation "The test Expresson, e.g. (x=3) ? 1 : 2"
- superclasses (list inheritance_relationship_list
- (object Inheritance_Relationship
- quid "40085274012E"
- supplier "Logical View::instantiation::PTExpression"
- quidu "40082D0A01CB"))
- class_attributes (list class_attribute_list
- (object ClassAttribute "condition"
- quid "4008521D02AF"
- documentation "The condition expression."
- type "PTExpression"
- quidu "40082D0A01CB"
- exportControl "Public")
- (object ClassAttribute "true"
- quid "400852410333"
- documentation "The true expression"
- type "PTExpression"
- quidu "40082D0A01CB"
- exportControl "Public")
- (object ClassAttribute "false"
- quid "4008525F0296"
- documentation "The false expression."
- type "PTExpression"
- quidu "40082D0A01CB"
- exportControl "Public")))
- (object Class "PTFieldAccess"
- quid "400852DF0204"
- documentation "Access a field expression, e.g. java.awt.Color.red"
- superclasses (list inheritance_relationship_list
- (object Inheritance_Relationship
- quid "4008535D0241"
- supplier "Logical View::instantiation::PTExpression"
- quidu "40082D0A01CB"))
- class_attributes (list class_attribute_list
- (object ClassAttribute "receiver"
- quid "40085313012C"
- documentation "The expression representing the object that the field is in, e.g. java.awt.Color."
- type "PTExpression"
- quidu "40082D0A01CB"
- exportControl "Public")
- (object ClassAttribute "field"
- quid "4008534500AC"
- documentation "The name of the field being accessed, e.g. red."
- type "String"
- exportControl "Public")))
- (object Class "PTInfixExpression"
- quid "4008538B0143"
- documentation "An expression with an operator that has two operands, e.g. 3 + 4."
- superclasses (list inheritance_relationship_list
- (object Inheritance_Relationship
- quid "400855700032"
- supplier "Logical View::instantiation::PTExpression"
- quidu "40082D0A01CB"))
- class_attributes (list class_attribute_list
- (object ClassAttribute "leftOperand"
- quid "400853AC0000"
- type "PTExpression"
- quidu "40082D0A01CB"
- exportControl "Public")
- (object ClassAttribute "operator"
- quid "400853B600D7"
- documentation "The operator, e.g. +"
- type "PTInfixOperator"
- quidu "400853E10359"
- exportControl "Public")
- (object ClassAttribute "rightOperand"
- quid "4008540D0186"
- documentation
-|The right expression. i.e. 4 of "3 + 4"
-
- type "PTExpression"
- quidu "40082D0A01CB"
- exportControl "Public")
- (object ClassAttribute "extendedOperands"
- quid "40085511039C"
- documentation "Used when there are a series of infix operations of the same operator, e.g. 1 + 2 + 3 + 4. 1 and 2 will go into left and right, while {3, 4} will go into the extended operands. "
- stereotype "0..*"
- type "PTExpression"
- quidu "40082D0A01CB"
- exportControl "Public")))
- (object Class "PTInfixOperator"
- quid "400853E10359"
- documentation "Enumerator for the operator on an InfixExpression."
- stereotype "enumeration"
- class_attributes (list class_attribute_list
- (object ClassAttribute "TIMES"
- quid "400856830240"
- documentation "* operator"
- exportControl "Public")
- (object ClassAttribute "DIVIDE"
- quid "4008568E01E2"
- documentation "/ operator"
- exportControl "Public")
- (object ClassAttribute "REMAINDER"
- quid "4008569202BA"
- documentation "% operator"
- exportControl "Public")
- (object ClassAttribute "PLUS"
- quid "40085697039D"
- documentation "+ operator"
- exportControl "Public")
- (object ClassAttribute "MINUS"
- quid "4008569C01D8"
- documentation "- operator"
- exportControl "Public")
- (object ClassAttribute "LEFT_SHIFT"
- quid "400856B50274"
- documentation "<< operator"
- exportControl "Public")
- (object ClassAttribute "RIGHT_SHIFT_SIGNED"
- quid "400856BA00CD"
- documentation ">> operator"
- exportControl "Public")
- (object ClassAttribute "RIGHT_SHIFT_UNSIGNED"
- quid "400856C3038D"
- documentation ">>> operator"
- exportControl "Public")
- (object ClassAttribute "LESS"
- quid "400856CC03CC"
- documentation "< operator"
- exportControl "Public")
- (object ClassAttribute "GREATER"
- quid "400856D9001D"
- documentation "> operator"
- exportControl "Public")
- (object ClassAttribute "LESS_EQUALS"
- quid "400856DD004B"
- documentation "<= operator"
- exportControl "Public")
- (object ClassAttribute "GREATER_EQUALS"
- quid "400856E5029B"
- documentation ">= operator"
- exportControl "Public")
- (object ClassAttribute "EQUALS"
- quid "400856EC0273"
- documentation "== operator"
- exportControl "Public")
- (object ClassAttribute "NOT_EQUALS"
- quid "400856F9039E"
- documentation "!= operator"
- exportControl "Public")
- (object ClassAttribute "XOR"
- quid "400857010328"
- documentation "^ operator"
- exportControl "Public")
- (object ClassAttribute "AND"
- quid "40085712034A"
- documentation "& operator"
- exportControl "Public")
- (object ClassAttribute "OR"
- quid "4008570402FA"
- documentation "| operator"
- exportControl "Public")
- (object ClassAttribute "CONDITIONAL_AND"
- quid "400857160075"
- documentation "&& operator"
- exportControl "Public")
- (object ClassAttribute "CONDITIONAL_OR"
- quid "4008572602BD"
- documentation "|| operator"
- exportControl "Public")))
- (object Class "PTInstanceof"
- quid "400857D303A2"
- documentation "Instanceof expression, e.g. x instanceof java.lang.String"
- superclasses (list inheritance_relationship_list
- (object Inheritance_Relationship
- quid "4008589103AF"
- supplier "Logical View::instantiation::PTExpression"
- quidu "40082D0A01CB"))
- class_attributes (list class_attribute_list
- (object ClassAttribute "operand"
- quid "400858070234"
- documentation "The value to test, e.g. x in x instanceof java.lang.String"
- type "PTExpression"
- quidu "40082D0A01CB"
- exportControl "Public")
- (object ClassAttribute "type"
- quid "4008582A0220"
- documentation "The type of the instance test, e.g. java.lang.String. It must be fully-qualified. If it is an inner class, it needs to be in reflection format, i.e. Y is inner class of j.X, then a reference to Y must be j.X$Y."
- type "String"
- exportControl "Public")))
- (object Class "PTMethodInvocation"
- quid "400858B6018B"
- documentation "MethodInvocation expression, e.g. x.getY(3)"
- superclasses (list inheritance_relationship_list
- (object Inheritance_Relationship
- quid "40085B9D0067"
- supplier "Logical View::instantiation::PTExpression"
- quidu "40082D0A01CB"))
- class_attributes (list class_attribute_list
- (object ClassAttribute "receiver"
- quid "40085B0A01EC"
- documentation
-|Who the method is invoked against. This may be not set, which means "this". It may also be a Name, which would mean a class like "java.lang.String"
-
- type "PTExpression"
- quidu "40082D0A01CB"
- exportControl "Public")
- (object ClassAttribute "name"
- quid "40085B6100D9"
- documentation "The name of the method being invoked."
- type "String"
- exportControl "Public")
- (object ClassAttribute "arguments"
- quid "40085B6902ED"
- documentation "The list of arguments, if any, to the method."
- stereotype "0..*"
- type "PTExpression"
- quidu "40082D0A01CB"
- exportControl "Public")))
- (object Class "PTName"
- quid "400858EA0280"
- documentation
-|This represents a name. This can happen for the receiver of a method invocation, e.g. x.getY() or java.lang.String.valueOf(10). In these cases you would have a name of "x" or "java.lang.String".
-
- superclasses (list inheritance_relationship_list
- (object Inheritance_Relationship
- quid "40085BA100DB"
- supplier "Logical View::instantiation::PTExpression"
- quidu "40082D0A01CB"))
- class_attributes (list class_attribute_list
- (object ClassAttribute "name"
- quid "400C110401BE"
- documentation "The name, which can be a type or a variable. If it is a type, then it must be fully-qualified. If it is an inner class, it needs to be in reflection format, i.e. Y is inner class of j.X, then a reference to Y must be j.X$Y."
- type "String"
- exportControl "Public")))
- (object Class "PTNullLiteral"
- quid "40085BBF0020"
- documentation
-|Represents the expression "null"
-
- superclasses (list inheritance_relationship_list
- (object Inheritance_Relationship
- quid "40085BD402F1"
- supplier "Logical View::instantiation::PTExpression"
- quidu "40082D0A01CB")))
- (object Class "PTNumberLiteral"
- quid "40085C40035B"
- documentation "Represent a number primitive literal, e.g. 10. One optimization that will be performed is that if an expression is of the form +number or -number, it will be converted from a PrefixExpression with a NumberLiteral to just a NumberLiteral. This will simplify the model."
- superclasses (list inheritance_relationship_list
- (object Inheritance_Relationship
- quid "40085CEF0244"
- supplier "Logical View::instantiation::PTExpression"
- quidu "40082D0A01CB"))
- class_attributes (list class_attribute_list
- (object ClassAttribute "token"
- quid "40085CAA024F"
- documentation "The token value, e.g. 10, 10d, or -10.75"
- type "String"
- exportControl "Public")))
- (object Class "PTParenthesizedExpression"
- quid "40085CF9007C"
- documentation "An expression within parenthesis, e.g. (x+3)"
- superclasses (list inheritance_relationship_list
- (object Inheritance_Relationship
- quid "40085F4E03E1"
- supplier "Logical View::instantiation::PTExpression"
- quidu "40082D0A01CB"))
- class_attributes (list class_attribute_list
- (object ClassAttribute "expression"
- quid "40085F22012B"
- documentation
-|The expression wrapped by the parenthesis, e.g. (x+3) then the expression is "x+3"
-
- type "PTExpression"
- quidu "40082D0A01CB"
- exportControl "Public")))
- (object Class "PTPrefixExpression"
- quid "40085FAD008B"
- documentation
-|A one operand operator, where the operator comes before the operand, e.g. - (x+3). In AST, even -3 is modeled as a PrefixExpression of operator "-" and expression of NumberLiteral(3). But we optimize this away and just use a NumberLiteral(-3) directly instead.
-
- superclasses (list inheritance_relationship_list
- (object Inheritance_Relationship
- quid "400862DC01D7"
- supplier "Logical View::instantiation::PTExpression"
- quidu "40082D0A01CB"))
- class_attributes (list class_attribute_list
- (object ClassAttribute "operator"
- quid "400860BC0199"
- documentation "The operator of this expression."
- type "PTPrefixOperator"
- quidu "4008602400D2"
- exportControl "Public")
- (object ClassAttribute "expression"
- quid "400860C50065"
- documentation "The expression that the operator is applied to."
- type "PTExpression"
- quidu "40082D0A01CB"
- exportControl "Public")))
- (object Class "PTPrefixOperator"
- quid "4008602400D2"
- documentation "The prefix expression operator. We are not modeling ++ and --."
- stereotype "enumeration"
- class_attributes (list class_attribute_list
- (object ClassAttribute "PLUS"
- quid "4008606F01B6"
- documentation "+ operator"
- exportControl "Public")
- (object ClassAttribute "MINUS"
- quid "4008607203B9"
- documentation "- operator"
- exportControl "Public")
- (object ClassAttribute "COMPLEMENT"
- quid "4008607800AB"
- documentation "~ operator"
- exportControl "Public")
- (object ClassAttribute "NOT"
- quid "4008607D0148"
- documentation "! operator"
- exportControl "Public")))
- (object Class "PTStringLiteral"
- quid "400861E2000B"
- documentation
-|Representation of a string literal, e.g. "asdf".
-
- superclasses (list inheritance_relationship_list
- (object Inheritance_Relationship
- quid "400862D70338"
- supplier "Logical View::instantiation::PTExpression"
- quidu "40082D0A01CB"))
- class_attributes (list class_attribute_list
- (object ClassAttribute "escapedValue"
- quid "400861FC01CB"
- documentation
-|This is the escaped string. In other words the literal exactly as it is in the java file. E.g. "ab" or "c\r". Including the surrounding quotes themselves.
-
- type "String"
- exportControl "Public")
- (object ClassAttribute "literalValue"
- attributes (list Attribute_Set
- (object Attribute
- tool "Ecore"
- name "isTransient"
- value TRUE))
- quid "4008620A00BD"
- documentation "The actual string without the quotes. Escape are evaluated and turned into their character value. This is a transient field. If not set when created when queried it will create it. Typically it will be set when created from an AST node since the node already has evaluated it."
- type "String"
- exportControl "Public")))
- (object Class "PTThisLiteral"
- quid "400863A700CB"
- documentation
-|Represents "this", e.g. this.getX() will be a MethodInvocation with the receiver being a ThisLiteral. We can't handle the format XYZ.this because that is for inner classes and we don't support that right now.
-
- superclasses (list inheritance_relationship_list
- (object Inheritance_Relationship
- quid "40086418019F"
- supplier "Logical View::instantiation::PTExpression"
- quidu "40082D0A01CB")))
- (object Class "PTTypeLiteral"
- quid "400864950181"
- documentation "This represents a literal of the form j.XYZ.class. For instance in a method invocation x.getX(jXYZ.class) the argument will be a TypeLiteral."
- superclasses (list inheritance_relationship_list
- (object Inheritance_Relationship
- quid "4008654C0008"
- supplier "Logical View::instantiation::PTExpression"
- quidu "40082D0A01CB"))
- class_attributes (list class_attribute_list
- (object ClassAttribute "type"
- quid "400864D7037B"
- documentation "The type of the literal. It must be fully-qualified. If it is an inner class, it needs to be in reflection format, i.e. Y is inner class of j.X, then a reference to Y must be j.X$Y."
- type "String"
- exportControl "Public")))
- (object Class "PTInvalidExpression"
- quid "400865AF0209"
- documentation "This is used when we have some expression we just can't evaluate for our purposes. It allows us to tell the evaluation what is actually wrong. It should be placed as the root expression to prevent processing much of the tree and then finally fail."
- superclasses (list inheritance_relationship_list
- (object Inheritance_Relationship
- quid "400866F50258"
- supplier "Logical View::instantiation::PTExpression"
- quidu "40082D0A01CB"))
- class_attributes (list class_attribute_list
- (object ClassAttribute "message"
- quid "400866E40299"
- documentation "A message as to why it is invalid."
- type "String"
- exportControl "Public")))
- (object Class "PTInstanceReference"
- quid "4017DB1802B3"
- superclasses (list inheritance_relationship_list
- (object Inheritance_Relationship
- quid "4017DB4A0341"
- supplier "Logical View::instantiation::PTExpression"
- quidu "40082D0A01CB")))
- (object Class "PTAnonymousClassDeclaration"
- quid "43627C140396"
- documentation
-|An anonymous class declaration. Currently we only store the
-|entire declaration as a string, including the "new AClass() {...}".
-
- superclasses (list inheritance_relationship_list
- (object Inheritance_Relationship
- quid "43627D4E00D0"
- supplier "Logical View::instantiation::PTExpression"
- quidu "40082D0A01CB"))
- class_attributes (list class_attribute_list
- (object ClassAttribute "declaration"
- quid "43627D690147"
- documentation "The declaration text."
- type "String"
- exportControl "Public")
- (object ClassAttribute "imports"
- attributes (list Attribute_Set
- (object Attribute
- tool "Ecore"
- name "isTransient"
- value TRUE))
- quid "436289E5034B"
- documentation "This is the imports needed in the main class by this declaration. This is a transient attribute. It is not serialized, nor is it parsed into from existing code. Its only purpose is to help code generation on a brand new declaration to know what imports should be added to the main class."
- stereotype "0..*"
- type "String"
- exportControl "Implementation")))
- (object Association "$UNNAMED$0"
- quid "3FD9ED7103D5"
- documentation "The parent who is to give up the value."
- roles (list role_list
- (object Role "parent"
- quid "3FD9ED720390"
- label "parent"
- supplier "Logical View::ecore::EObject"
- quidu "3C4F1C860123"
- client_cardinality (value cardinality "1")
- Containment "By Reference"
- is_navigable TRUE)
- (object Role "$UNNAMED$1"
- quid "3FD9ED72039A"
- supplier "Logical View::instantiation::ImplicitAllocation"
- quidu "3FD9EC140242")))
- (object Association "$UNNAMED$2"
- quid "3FD9EDD00088"
- documentation "The feature that will be used to query the live value."
- roles (list role_list
- (object Role "feature"
- quid "3FD9EDD10148"
- label "feature"
- supplier "Logical View::ecore::EStructuralFeature"
- quidu "3903D59D0230"
- client_cardinality (value cardinality "1")
- Containment "By Reference"
- is_navigable TRUE)
- (object Role "$UNNAMED$3"
- quid "3FD9EDD10152"
- supplier "Logical View::instantiation::ImplicitAllocation"
- quidu "3FD9EC140242")))
- (object Association "$UNNAMED$4"
- quid "400834CE001B"
- documentation "The root expression of the parse tree. The result of it is the allocation."
- roles (list role_list
- (object Role "expression"
- quid "400834CF02E4"
- label "expression"
- supplier "Logical View::instantiation::PTExpression"
- quidu "40082D0A01CB"
- client_cardinality (value cardinality "1")
- Containment "By Value"
- is_navigable TRUE)
- (object Role "$UNNAMED$5"
- quid "400834CF02E6"
- supplier "Logical View::instantiation::ParseTreeAllocation"
- quidu "40082C910005"
- Containment "By Value"
- is_aggregate TRUE)))
- (object Association "$UNNAMED$6"
- quid "4017DBE30138"
- roles (list role_list
- (object Role "reference"
- quid "4017DBE60006"
- label "reference"
- supplier "Logical View::instantiation::IJavaInstance"
- quidu "3E51575A02D4"
- client_cardinality (value cardinality "1")
- is_navigable TRUE)
- (object Role "$UNNAMED$7"
- quid "4017DBE60164"
- supplier "Logical View::instantiation::PTInstanceReference"
- quidu "4017DB1802B3"
- Containment "By Reference"))))
- logical_presentations (list unit_reference_list
- (object ClassDiagram "Main"
- quid "3B782D1B034F"
- title "Main"
- zoom 100
- max_height 28350
- max_width 21600
- origin_x 0
- origin_y 0
- items (list diagram_item_list
- (object NoteView @1
- location (747, 1008)
- font (object Font
- size 10
- face "Arial"
- bold FALSE
- italics FALSE
- underline FALSE
- strike FALSE
- color 0
- default_color TRUE)
- label (object ItemLabel
- Parent_View @1
- location (342, 854)
- fill_color 13434879
- nlines 6
- max_width 775
- label "This is used as the EClassifier when you want a code-generated class to point to an instance of a IJavaObjectInstance implementer. (Which is an instance of a java model java object).")
- line_color 3342489
- fill_color 13434879
- width 835
- height 320)
- (object ClassView "Class" "Logical View::instantiation::IJavaDataTypeInstance" @2
- ShowCompartmentStereotypes TRUE
- IncludeAttribute TRUE
- IncludeOperation TRUE
- location (2659, 664)
- font (object Font
- size 10
- face "Arial"
- bold FALSE
- italics FALSE
- underline FALSE
- strike FALSE
- color 0
- default_color TRUE)
- label (object ItemLabel
- Parent_View @2
- location (1777, 605)
- fill_color 13434879
- nlines 1
- max_width 1764
- justify 0
- label "IJavaDataTypeInstance")
- stereotype (object ItemLabel
- Parent_View @2
- location (1777, 555)
- fill_color 13434879
- anchor 10
- nlines 1
- max_width 1764
- justify 0
- label "<<Interface>>")
- icon "Interface"
- icon_style "Label"
- line_color 3342489
- fill_color 13434879
- quidu "3B8AB17802B1"
- compartment (object Compartment
- Parent_View @2
- location (1777, 666)
- font (object Font
- size 10
- face "Arial"
- bold FALSE
- italics FALSE
- underline FALSE
- strike FALSE
- color 0
- default_color TRUE)
- icon_style "Icon"
- fill_color 16777215
- anchor 2
- nlines 2
- max_width 1512)
- width 1782
- height 242
- annotation 8
- autoResize TRUE)
- (object NoteView @3
- location (2378, 1053)
- font (object Font
- size 10
- face "Arial"
- bold FALSE
- italics FALSE
- underline FALSE
- strike FALSE
- color 0
- default_color TRUE)
- label (object ItemLabel
- Parent_View @3
- location (1970, 889)
- fill_color 13434879
- nlines 7
- max_width 780
- label "This is used as the EClassifier when you want a code-generated class to point to an instance of an IJavaDataTypeInstance implementer. (Which is an instance of a java model java primitive).")
- line_color 3342489
- fill_color 13434879
- width 840
- height 340)
- (object AttachView "" @4
- stereotype TRUE
- line_color 3342489
- client @2
- supplier @3
- line_style 0)
- (object ClassView "Class" "Logical View::instantiation::IJavaInstance" @5
- ShowCompartmentStereotypes TRUE
- IncludeAttribute TRUE
- IncludeOperation TRUE
- location (1584, 166)
- font (object Font
- size 10
- face "Arial"
- bold FALSE
- italics FALSE
- underline FALSE
- strike FALSE
- color 0
- default_color TRUE)
- label (object ItemLabel
- Parent_View @5
- location (804, 85)
- fill_color 13434879
- nlines 1
- max_width 1560
- justify 0
- label "IJavaInstance")
- icon "Interface"
- icon_style "None"
- line_color 3342489
- fill_color 13434879
- quidu "3E51575A02D4"
- compartment (object Compartment
- Parent_View @5
- location (804, 146)
- font (object Font
- size 10
- face "Arial"
- bold FALSE
- italics FALSE
- underline FALSE
- strike FALSE
- color 0
- default_color TRUE)
- icon_style "Icon"
- fill_color 16777215
- anchor 2
- nlines 2
- max_width 1340)
- width 1578
- height 186
- annotation 8
- autoResize TRUE)
- (object InheritTreeView "" @6
- location (1584, 455)
- line_color 3342489
- fill_color 13434879
- supplier @5
- vertices (list Points
- (1584, 455)
- (1584, 259)))
- (object ClassView "Class" "Logical View::instantiation::IJavaObjectInstance" @7
- ShowCompartmentStereotypes TRUE
- IncludeAttribute TRUE
- IncludeOperation TRUE
- ShowOperationSignature TRUE
- location (858, 666)
- font (object Font
- size 10
- face "Arial"
- bold FALSE
- italics FALSE
- underline FALSE
- strike FALSE
- color 0
- default_color TRUE)
- label (object ItemLabel
- Parent_View @7
- location (627, 614)
- fill_color 13434879
- nlines 1
- max_width 480
- justify 0
- label "IJavaObjectInstance")
- stereotype (object ItemLabel
- Parent_View @7
- location (627, 564)
- fill_color 13434879
- anchor 10
- nlines 1
- max_width 462
- justify 0
- label "<<Interface>>")
- icon "Interface"
- icon_style "Label"
- line_color 3342489
- fill_color 13434879
- quidu "3B782D790296"
- compartment (object Compartment
- Parent_View @7
- location (627, 675)
- font (object Font
- size 10
- face "Arial"
- bold FALSE
- italics FALSE
- underline FALSE
- strike FALSE
- color 0
- default_color TRUE)
- icon_style "Icon"
- fill_color 16777215
- anchor 2
- nlines 2
- max_width 1459)
- width 480
- height 228
- annotation 8
- autoResize TRUE)
- (object AttachView "" @8
- stereotype TRUE
- line_color 3342489
- client @1
- supplier @7
- line_style 0)
- (object InheritView "" @9
- stereotype TRUE
- line_color 3342489
- quidu "3E5157DA03DD"
- client @7
- supplier @5
- line_style 3
- origin_attachment (795, 552)
- terminal_attachment (795, 455)
- drawSupplier @6)
- (object InheritView "" @10
- stereotype TRUE
- line_color 3342489
- quidu "3E529562014E"
- client @2
- supplier @5
- line_style 3
- origin_attachment (2659, 543)
- terminal_attachment (2659, 455)
- drawSupplier @6)))
- (object ClassDiagram "Java Constructors"
- quid "3FD9E66D007F"
- title "Java Constructors"
- zoom 100
- max_height 28350
- max_width 21600
- origin_x 0
- origin_y 0
- items (list diagram_item_list
- (object ClassView "Class" "Logical View::instantiation::JavaAllocation" @11
- ShowCompartmentStereotypes TRUE
- IncludeAttribute TRUE
- IncludeOperation TRUE
- location (1073, 120)
- font (object Font
- size 10
- face "Arial"
- bold FALSE
- italics TRUE
- underline FALSE
- strike FALSE
- color 0
- default_color TRUE)
- label (object ItemLabel
- Parent_View @11
- location (902, 69)
- fill_color 13434879
- nlines 1
- max_width 342
- justify 0
- label "JavaAllocation")
- icon_style "Icon"
- line_color 3342489
- fill_color 13434879
- quidu "3FD9E6900061"
- width 360
- height 126
- annotation 8
- autoResize TRUE)
- (object ClassView "Class" "Logical View::instantiation::InitStringAllocation" @12
- ShowCompartmentStereotypes TRUE
- IncludeAttribute TRUE
- IncludeOperation TRUE
- location (553, 495)
- font (object Font
- size 10
- face "Arial"
- bold FALSE
- italics FALSE
- underline FALSE
- strike FALSE
- color 0
- default_color TRUE)
- label (object ItemLabel
- Parent_View @12
- location (329, 414)
- fill_color 13434879
- nlines 1
- max_width 448
- justify 0
- label "InitStringAllocation")
- icon_style "Icon"
- line_color 3342489
- fill_color 13434879
- quidu "3FD9EAF9001E"
- width 466
- height 186
- annotation 8
- autoResize TRUE)
- (object InheritTreeView "" @13
- location (1073, 323)
- line_color 3342489
- fill_color 13434879
- supplier @11
- vertices (list Points
- (1073, 323)
- (1073, 183)))
- (object InheritView "" @14
- stereotype TRUE
- line_color 3342489
- quidu "3FD9EB7502DA"
- client @12
- supplier @11
- line_style 3
- origin_attachment (668, 401)
- terminal_attachment (668, 323)
- drawSupplier @13)
- (object ClassView "Class" "Logical View::ecore::EObject" @15
- ShowCompartmentStereotypes TRUE
- location (1751, 942)
- font (object Font
- size 10
- face "Arial"
- bold FALSE
- italics FALSE
- underline FALSE
- strike FALSE
- color 0
- default_color TRUE)
- label (object ItemLabel
- Parent_View @15
- location (1645, 896)
- fill_color 13434879
- nlines 1
- max_width 212
- justify 0
- label "EObject")
- icon_style "Icon"
- line_color 3342489
- fill_color 16776960
- quidu "3C4F1C860123"
- width 230
- height 117
- annotation 8
- autoResize TRUE)
- (object ClassView "Class" "Logical View::ecore::EStructuralFeature" @16
- ShowCompartmentStereotypes TRUE
- location (2142, 927)
- font (object Font
- size 10
- face "Arial"
- bold FALSE
- italics TRUE
- underline FALSE
- strike FALSE
- color 0
- default_color TRUE)
- label (object ItemLabel
- Parent_View @16
- location (1918, 881)
- fill_color 13434879
- nlines 1
- max_width 448
- justify 0
- label "EStructuralFeature")
- icon_style "Icon"
- line_color 3342489
- fill_color 16776960
- quidu "3903D59D0230"
- width 466
- height 117
- annotation 8
- autoResize TRUE)
- (object ClassView "Class" "Logical View::instantiation::ImplicitAllocation" @17
- ShowCompartmentStereotypes TRUE
- IncludeAttribute TRUE
- IncludeOperation TRUE
- location (2018, 510)
- font (object Font
- size 10
- face "Arial"
- bold FALSE
- italics FALSE
- underline FALSE
- strike FALSE
- color 0
- default_color TRUE)
- label (object ItemLabel
- Parent_View @17
- location (1819, 458)
- fill_color 13434879
- nlines 1
- max_width 398
- justify 0
- label "ImplicitAllocation")
- icon_style "Icon"
- line_color 3342489
- fill_color 13434879
- quidu "3FD9EC140242"
- width 416
- height 128
- annotation 8
- autoResize TRUE)
- (object InheritView "" @18
- stereotype TRUE
- line_color 3342489
- quidu "3FD9EC4700E7"
- client @17
- supplier @11
- line_style 3
- origin_attachment (2023, 446)
- terminal_attachment (2023, 323)
- drawSupplier @13)
- (object AssociationViewNew "$UNNAMED$0" @19
- location (1881, 728)
- font (object Font
- size 10
- face "Arial"
- bold FALSE
- italics FALSE
- underline FALSE
- strike FALSE
- color 0
- default_color TRUE)
- stereotype TRUE
- line_color 3342489
- quidu "3FD9ED7103D5"
- roleview_list (list RoleViews
- (object RoleView "parent" @20
- Parent_View @19
- location (716, 228)
- font (object Font
- size 10
- face "Arial"
- bold FALSE
- italics FALSE
- underline FALSE
- strike FALSE
- color 0
- default_color TRUE)
- label (object SegLabel @21
- Parent_View @20
- location (1727, 844)
- font (object Font
- size 10
- face "Arial"
- bold FALSE
- italics FALSE
- underline FALSE
- strike FALSE
- color 0
- default_color TRUE)
- anchor 1
- anchor_loc 1
- nlines 1
- max_width 137
- justify 0
- label "+parent"
- pctDist 0.991224
- height 72
- orientation 1)
- stereotype TRUE
- line_color 3342489
- quidu "3FD9ED720390"
- client @19
- supplier @15
- line_style 0
- label (object SegLabel @22
- Parent_View @20
- location (1871, 794)
- font (object Font
- size 10
- face "Arial"
- bold FALSE
- italics FALSE
- underline FALSE
- strike FALSE
- color 0
- default_color TRUE)
- anchor 2
- anchor_loc 1
- nlines 1
- max_width 15
- justify 0
- label "1"
- pctDist 0.337817
- height 26
- orientation 0))
- (object RoleView "$UNNAMED$1" @23
- Parent_View @19
- location (716, 228)
- stereotype TRUE
- line_color 3342489
- quidu "3FD9ED72039A"
- client @19
- supplier @17
- line_style 0)))
- (object AssociationViewNew "$UNNAMED$2" @24
- location (2080, 721)
- font (object Font
- size 10
- face "Arial"
- bold FALSE
- italics FALSE
- underline FALSE
- strike FALSE
- color 0
- default_color TRUE)
- stereotype TRUE
- line_color 3342489
- quidu "3FD9EDD00088"
- roleview_list (list RoleViews
- (object RoleView "feature" @25
- Parent_View @24
- location (915, 221)
- font (object Font
- size 10
- face "Arial"
- bold FALSE
- italics FALSE
- underline FALSE
- strike FALSE
- color 0
- default_color TRUE)
- label (object SegLabel @26
- Parent_View @25
- location (2028, 766)
- font (object Font
- size 10
- face "Arial"
- bold FALSE
- italics FALSE
- underline FALSE
- strike FALSE
- color 0
- default_color TRUE)
- anchor 1
- anchor_loc 1
- nlines 1
- max_width 159
- justify 0
- label "+feature"
- pctDist 0.181346
- height 64
- orientation 1)
- stereotype TRUE
- line_color 3342489
- quidu "3FD9EDD10148"
- client @24
- supplier @16
- line_style 0
- label (object SegLabel @27
- Parent_View @25
- location (2172, 839)
- font (object Font
- size 10
- face "Arial"
- bold FALSE
- italics FALSE
- underline FALSE
- strike FALSE
- color 0
- default_color TRUE)
- anchor 2
- anchor_loc 1
- nlines 1
- max_width 15
- justify 0
- label "1"
- pctDist 0.900000
- height 54
- orientation 0))
- (object RoleView "$UNNAMED$3" @28
- Parent_View @24
- location (915, 221)
- stereotype TRUE
- line_color 3342489
- quidu "3FD9EDD10152"
- client @24
- supplier @17
- line_style 0)))
- (object ClassView "Class" "Logical View::instantiation::PTExpression" @29
- ShowCompartmentStereotypes TRUE
- IncludeAttribute TRUE
- IncludeOperation TRUE
- location (1264, 776)
- font (object Font
- size 10
- face "Arial"
- bold FALSE
- italics TRUE
- underline FALSE
- strike FALSE
- color 0
- default_color TRUE)
- label (object ItemLabel
- Parent_View @29
- location (1095, 725)
- fill_color 13434879
- nlines 1
- max_width 338
- justify 0
- label "PTExpression")
- icon_style "Icon"
- line_color 3342489
- fill_color 12615935
- quidu "40082D0A01CB"
- width 356
- height 126
- annotation 8
- autoResize TRUE)
- (object ClassView "Class" "Logical View::instantiation::ParseTreeAllocation" @30
- ShowCompartmentStereotypes TRUE
- IncludeAttribute TRUE
- IncludeOperation TRUE
- location (1265, 495)
- font (object Font
- size 10
- face "Arial"
- bold FALSE
- italics FALSE
- underline FALSE
- strike FALSE
- color 0
- default_color TRUE)
- label (object ItemLabel
- Parent_View @30
- location (1032, 443)
- fill_color 13434879
- nlines 1
- max_width 466
- justify 0
- label "ParseTreeAllocation")
- icon_style "Icon"
- line_color 3342489
- fill_color 13434879
- quidu "40082C910005"
- width 484
- height 128
- annotation 8
- autoResize TRUE)
- (object InheritView "" @31
- stereotype TRUE
- line_color 3342489
- quidu "40082CB701D6"
- client @30
- supplier @11
- line_style 3
- origin_attachment (1265, 431)
- terminal_attachment (1265, 323)
- drawSupplier @13)
- (object AssociationViewNew "$UNNAMED$4" @32
- location (1264, 635)
- font (object Font
- size 10
- face "Arial"
- bold FALSE
- italics FALSE
- underline FALSE
- strike FALSE
- color 0
- default_color TRUE)
- stereotype TRUE
- line_color 3342489
- quidu "400834CE001B"
- roleview_list (list RoleViews
- (object RoleView "expression" @33
- Parent_View @32
- location (-1, 140)
- font (object Font
- size 10
- face "Arial"
- bold FALSE
- italics FALSE
- underline FALSE
- strike FALSE
- color 0
- default_color TRUE)
- label (object SegLabel @34
- Parent_View @33
- location (1111, 672)
- font (object Font
- size 10
- face "Arial"
- bold FALSE
- italics FALSE
- underline FALSE
- strike FALSE
- color 0
- default_color TRUE)
- anchor 1
- anchor_loc 1
- nlines 1
- max_width 220
- justify 0
- label "+expression"
- pctDist 0.492537
- height 154
- orientation 1)
- stereotype TRUE
- line_color 3342489
- quidu "400834CF02E4"
- client @32
- supplier @29
- line_style 0
- label (object SegLabel @35
- Parent_View @33
- location (1307, 679)
- font (object Font
- size 10
- face "Arial"
- bold FALSE
- italics FALSE
- underline FALSE
- strike FALSE
- color 0
- default_color TRUE)
- anchor 2
- anchor_loc 1
- nlines 1
- max_width 15
- justify 0
- label "1"
- pctDist 0.567164
- height 43
- orientation 0))
- (object RoleView "$UNNAMED$5" @36
- Parent_View @32
- location (-1, 140)
- stereotype TRUE
- line_color 3342489
- quidu "400834CF02E6"
- client @32
- supplier @30
- line_style 0)))))
- (object ClassDiagram "Parse Tree Expressions"
- quid "40082CC20146"
- title "Parse Tree Expressions"
- zoom 100
- max_height 28350
- max_width 21600
- origin_x 25
- origin_y 5768
- items (list diagram_item_list
- (object ClassView "Class" "Logical View::instantiation::PTExpression" @37
- ShowCompartmentStereotypes TRUE
- IncludeAttribute TRUE
- IncludeOperation TRUE
- location (1348, 124)
- font (object Font
- size 10
- face "Arial"
- bold FALSE
- italics TRUE
- underline FALSE
- strike FALSE
- color 0
- default_color TRUE)
- label (object ItemLabel
- Parent_View @37
- location (1179, 73)
- fill_color 13434879
- nlines 1
- max_width 338
- justify 0
- label "PTExpression")
- icon_style "Icon"
- line_color 3342489
- fill_color 13434879
- quidu "40082D0A01CB"
- width 356
- height 126
- annotation 8
- autoResize TRUE)
- (object ClassView "Class" "Logical View::instantiation::PTArrayAccess" @38
- ShowCompartmentStereotypes TRUE
- IncludeAttribute TRUE
- IncludeOperation TRUE
- location (2235, 544)
- font (object Font
- size 10
- face "Arial"
- bold FALSE
- italics FALSE
- underline FALSE
- strike FALSE
- color 0
- default_color TRUE)
- label (object ItemLabel
- Parent_View @38
- location (1848, 413)
- fill_color 13434879
- nlines 2
- max_width 774
- justify 0
- label "PTArrayAccess")
- icon_style "Icon"
- line_color 3342489
- fill_color 13434879
- quidu "40082E140250"
- width 792
- height 286
- annotation 8
- autoResize TRUE)
- (object ClassView "Class" "Logical View::instantiation::PTArrayCreation" @39
- ShowCompartmentStereotypes TRUE
- IncludeAttribute TRUE
- IncludeOperation TRUE
- location (434, 519)
- font (object Font
- size 10
- face "Arial"
- bold FALSE
- italics FALSE
- underline FALSE
- strike FALSE
- color 0
- default_color TRUE)
- label (object ItemLabel
- Parent_View @39
- location (9, 363)
- fill_color 13434879
- nlines 2
- max_width 850
- justify 0
- label "PTArrayCreation")
- icon_style "Icon"
- line_color 3342489
- fill_color 13434879
- quidu "40083712025A"
- width 868
- height 336
- annotation 8
- autoResize TRUE)
- (object ClassView "Class" "Logical View::instantiation::PTArrayInitializer" @40
- ShowCompartmentStereotypes TRUE
- IncludeAttribute TRUE
- IncludeOperation TRUE
- location (1361, 519)
- font (object Font
- size 10
- face "Arial"
- bold FALSE
- italics FALSE
- underline FALSE
- strike FALSE
- color 0
- default_color TRUE)
- label (object ItemLabel
- Parent_View @40
- location (929, 438)
- fill_color 13434879
- nlines 1
- max_width 864
- justify 0
- label "PTArrayInitializer")
- icon_style "Icon"
- line_color 3342489
- fill_color 13434879
- quidu "40083968014C"
- width 882
- height 186
- annotation 8
- autoResize TRUE)
- (object ClassView "Class" "Logical View::instantiation::PTBooleanLiteral" @41
- ShowCompartmentStereotypes TRUE
- IncludeAttribute TRUE
- IncludeOperation TRUE
- location (997, 870)
- font (object Font
- size 10
- face "Arial"
- bold FALSE
- italics FALSE
- underline FALSE
- strike FALSE
- color 0
- default_color TRUE)
- label (object ItemLabel
- Parent_View @41
- location (719, 790)
- fill_color 13434879
- nlines 1
- max_width 556
- justify 0
- label "PTBooleanLiteral")
- icon_style "Icon"
- line_color 3342489
- fill_color 13434879
- quidu "40083AE70247"
- width 574
- height 184
- annotation 8
- autoResize TRUE)
- (object ClassView "Class" "Logical View::instantiation::PTCastExpression" @42
- ShowCompartmentStereotypes TRUE
- IncludeAttribute TRUE
- IncludeOperation TRUE
- location (1791, 889)
- font (object Font
- size 10
- face "Arial"
- bold FALSE
- italics FALSE
- underline FALSE
- strike FALSE
- color 0
- default_color TRUE)
- label (object ItemLabel
- Parent_View @42
- location (1474, 758)
- fill_color 13434879
- nlines 2
- max_width 634
- justify 0
- label "PTCastExpression")
- icon_style "Icon"
- line_color 3342489
- fill_color 13434879
- quidu "40083B6F0058"
- width 652
- height 286
- annotation 8
- autoResize TRUE)
- (object InheritTreeView "" @43
- location (1348, 330)
- line_color 3342489
- fill_color 13434879
- supplier @37
- vertices (list Points
- (1348, 330)
- (1348, 187)))
- (object InheritView "" @44
- stereotype TRUE
- line_color 3342489
- quidu "400839790038"
- client @40
- supplier @37
- line_style 3
- origin_attachment (1381, 425)
- terminal_attachment (1381, 330)
- drawSupplier @43)
- (object InheritView "" @45
- stereotype TRUE
- line_color 3342489
- quidu "40083B1D0000"
- client @41
- supplier @37
- line_style 3
- origin_attachment (918, 778)
- terminal_attachment (918, 330)
- drawSupplier @43)
- (object InheritView "" @46
- stereotype TRUE
- line_color 3342489
- quidu "40083BD60309"
- client @42
- supplier @37
- line_style 3
- origin_attachment (1791, 746)
- terminal_attachment (1791, 330)
- drawSupplier @43)
- (object InheritView "" @47
- stereotype TRUE
- line_color 3342489
- quidu "40082E6F01F7"
- client @38
- supplier @37
- line_style 3
- origin_attachment (2235, 401)
- terminal_attachment (2235, 330)
- drawSupplier @43)
- (object ClassView "Class" "Logical View::instantiation::PTExpression" @48
- ShowCompartmentStereotypes TRUE
- IncludeAttribute TRUE
- IncludeOperation TRUE
- location (1372, 1095)
- font (object Font
- size 10
- face "Arial"
- bold FALSE
- italics TRUE
- underline FALSE
- strike FALSE
- color 0
- default_color TRUE)
- label (object ItemLabel
- Parent_View @48
- location (1203, 1044)
- fill_color 13434879
- nlines 1
- max_width 338
- justify 0
- label "PTExpression")
- icon_style "Icon"
- line_color 3342489
- fill_color 12615935
- quidu "40082D0A01CB"
- width 356
- height 126
- annotation 8
- autoResize TRUE)
- (object ClassView "Class" "Logical View::instantiation::PTCharacterLiteral" @49
- ShowCompartmentStereotypes TRUE
- IncludeAttribute TRUE
- IncludeOperation TRUE
- location (430, 1438)
- font (object Font
- size 10
- face "Arial"
- bold FALSE
- italics FALSE
- underline FALSE
- strike FALSE
- color 0
- default_color TRUE)
- label (object ItemLabel
- Parent_View @49
- location (164, 1332)
- fill_color 13434879
- nlines 1
- max_width 532
- justify 0
- label "PTCharacterLiteral")
- icon_style "Icon"
- line_color 3342489
- fill_color 13434879
- quidu "40084DF10277"
- width 550
- height 236
- annotation 8
- autoResize TRUE)
- (object InheritView "" @50
- stereotype TRUE
- line_color 3342489
- quidu "400837210049"
- client @39
- supplier @37
- line_style 3
- origin_attachment (561, 351)
- terminal_attachment (561, 330)
- drawSupplier @43)
- (object ClassView "Class" "Logical View::instantiation::PTClassInstanceCreation" @51
- ShowCompartmentStereotypes TRUE
- IncludeAttribute TRUE
- IncludeOperation TRUE
- location (1346, 1464)
- font (object Font
- size 10
- face "Arial"
- bold FALSE
- italics FALSE
- underline FALSE
- strike FALSE
- color 0
- default_color TRUE)
- label (object ItemLabel
- Parent_View @51
- location (930, 1333)
- fill_color 13434879
- nlines 2
- max_width 832
- justify 0
- label "PTClassInstanceCreation")
- icon_style "Icon"
- line_color 3342489
- fill_color 13434879
- quidu "40084F40026F"
- width 850
- height 286
- annotation 8
- autoResize TRUE)
- (object InheritTreeView "" @52
- location (1372, 1260)
- line_color 3342489
- fill_color 13434879
- supplier @48
- vertices (list Points
- (1372, 1260)
- (1372, 1158)))
- (object InheritView "" @53
- stereotype TRUE
- line_color 3342489
- quidu "40084E1301EA"
- client @49
- supplier @48
- line_style 3
- origin_attachment (564, 1319)
- terminal_attachment (564, 1260)
- drawSupplier @52)
- (object InheritView "" @54
- stereotype TRUE
- line_color 3342489
- quidu "40084F4C02F8"
- client @51
- supplier @48
- line_style 3
- origin_attachment (1267, 1320)
- terminal_attachment (1267, 1260)
- drawSupplier @52)
- (object ClassView "Class" "Logical View::instantiation::PTConditionalExpression" @55
- ShowCompartmentStereotypes TRUE
- IncludeAttribute TRUE
- IncludeOperation TRUE
- location (2169, 1481)
- font (object Font
- size 10
- face "Arial"
- bold FALSE
- italics FALSE
- underline FALSE
- strike FALSE
- color 0
- default_color TRUE)
- label (object ItemLabel
- Parent_View @55
- location (1872, 1325)
- fill_color 13434879
- nlines 2
- max_width 594
- justify 0
- label "PTConditionalExpression")
- icon_style "Icon"
- line_color 3342489
- fill_color 13434879
- quidu "400851FB026A"
- width 612
- height 336
- annotation 8
- autoResize TRUE)
- (object InheritView "" @56
- stereotype TRUE
- line_color 3342489
- quidu "40085274012E"
- client @55
- supplier @48
- line_style 3
- origin_attachment (2168, 1313)
- terminal_attachment (2168, 1260)
- drawSupplier @52)
- (object ClassView "Class" "Logical View::instantiation::PTFieldAccess" @57
- ShowCompartmentStereotypes TRUE
- IncludeAttribute TRUE
- IncludeOperation TRUE
- location (761, 1794)
- font (object Font
- size 10
- face "Arial"
- bold FALSE
- italics FALSE
- underline FALSE
- strike FALSE
- color 0
- default_color TRUE)
- label (object ItemLabel
- Parent_View @57
- location (479, 1663)
- fill_color 13434879
- nlines 2
- max_width 564
- justify 0
- label "PTFieldAccess")
- icon_style "Icon"
- line_color 3342489
- fill_color 13434879
- quidu "400852DF0204"
- width 582
- height 286
- annotation 8
- autoResize TRUE)
- (object InheritView "" @58
- stereotype TRUE
- line_color 3342489
- quidu "4008535D0241"
- client @57
- supplier @48
- line_style 3
- origin_attachment (760, 1651)
- terminal_attachment (760, 1260)
- drawSupplier @52)
- (object ClassView "Class" "Logical View::instantiation::PTInfixExpression" @59
- ShowCompartmentStereotypes TRUE
- IncludeAttribute TRUE
- IncludeOperation TRUE
- location (1790, 1845)
- font (object Font
- size 10
- face "Arial"
- bold FALSE
- italics FALSE
- underline FALSE
- strike FALSE
- color 0
- default_color TRUE)
- label (object ItemLabel
- Parent_View @59
- location (1286, 1664)
- fill_color 13434879
- nlines 2
- max_width 1008
- justify 0
- label "PTInfixExpression")
- icon_style "Icon"
- line_color 3342489
- fill_color 13434879
- quidu "4008538B0143"
- width 1026
- height 386
- annotation 8
- autoResize TRUE)
- (object ClassView "Class" "Logical View::instantiation::PTInfixOperator" @60
- ShowCompartmentStereotypes TRUE
- IncludeAttribute TRUE
- IncludeOperation TRUE
- location (2660, 2207)
- font (object Font
- size 10
- face "Arial"
- bold FALSE
- italics FALSE
- underline FALSE
- strike FALSE
- color 0
- default_color TRUE)
- label (object ItemLabel
- Parent_View @60
- location (2345, 1699)
- fill_color 13434879
- nlines 1
- max_width 630
- justify 0
- label "PTInfixOperator")
- stereotype (object ItemLabel
- Parent_View @60
- location (2345, 1649)
- fill_color 13434879
- anchor 10
- nlines 1
- max_width 630
- justify 0
- label "<<enumeration>>")
- icon_style "Icon"
- line_color 3342489
- fill_color 13434879
- quidu "400853E10359"
- width 648
- height 1140
- annotation 8
- autoResize TRUE)
- (object InheritView "" @61
- stereotype TRUE
- line_color 3342489
- quidu "400855700032"
- client @59
- supplier @48
- line_style 3
- origin_attachment (1789, 1652)
- terminal_attachment (1789, 1260)
- drawSupplier @52)
- (object ClassView "Class" "Logical View::instantiation::PTExpression" @62
- ShowCompartmentStereotypes TRUE
- IncludeAttribute TRUE
- IncludeOperation TRUE
- location (1272, 2853)
- font (object Font
- size 10
- face "Arial"
- bold FALSE
- italics TRUE
- underline FALSE
- strike FALSE
- color 0
- default_color TRUE)
- label (object ItemLabel
- Parent_View @62
- location (1103, 2802)
- fill_color 13434879
- nlines 1
- max_width 338
- justify 0
- label "PTExpression")
- icon_style "Icon"
- line_color 3342489
- fill_color 12615935
- quidu "40082D0A01CB"
- width 356
- height 126
- annotation 8
- autoResize TRUE)
- (object ClassView "Class" "Logical View::instantiation::PTInstanceof" @63
- ShowCompartmentStereotypes TRUE
- IncludeAttribute TRUE
- IncludeOperation TRUE
- location (371, 3255)
- font (object Font
- size 10
- face "Arial"
- bold FALSE
- italics FALSE
- underline FALSE
- strike FALSE
- color 0
- default_color TRUE)
- label (object ItemLabel
- Parent_View @63
- location (85, 3124)
- fill_color 13434879
- nlines 2
- max_width 572
- justify 0
- label "PTInstanceof")
- icon_style "Icon"
- line_color 3342489
- fill_color 13434879
- quidu "400857D303A2"
- compartment (object Compartment
- Parent_View @63
- location (85, 3185)
- font (object Font
- size 10
- face "Arial"
- bold FALSE
- italics FALSE
- underline FALSE
- strike FALSE
- color 0
- default_color TRUE)
- icon_style "Icon"
- fill_color 16777215
- anchor 2
- nlines 3
- max_width 493)
- width 590
- height 286
- annotation 8
- autoResize TRUE)
- (object ClassView "Class" "Logical View::instantiation::PTMethodInvocation" @64
- ShowCompartmentStereotypes TRUE
- IncludeAttribute TRUE
- IncludeOperation TRUE
- location (1246, 3258)
- font (object Font
- size 10
- face "Arial"
- bold FALSE
- italics FALSE
- underline FALSE
- strike FALSE
- color 0
- default_color TRUE)
- label (object ItemLabel
- Parent_View @64
- location (860, 3117)
- fill_color 13434879
- nlines 2
- max_width 772
- justify 0
- label "PTMethodInvocation")
- icon_style "Icon"
- line_color 3342489
- fill_color 13434879
- quidu "400858B6018B"
- compartment (object Compartment
- Parent_View @64
- location (860, 3178)
- font (object Font
- size 10
- face "Arial"
- bold FALSE
- italics FALSE
- underline FALSE
- strike FALSE
- color 0
- default_color TRUE)
- icon_style "Icon"
- fill_color 13434879
- anchor 2
- nlines 4
- max_width 715)
- width 790
- height 304
- annotation 8
- autoResize TRUE)
- (object ClassView "Class" "Logical View::instantiation::PTName" @65
- ShowCompartmentStereotypes TRUE
- IncludeAttribute TRUE
- IncludeOperation TRUE
- location (1962, 3212)
- font (object Font
- size 10
- face "Arial"
- bold FALSE
- italics FALSE
- underline FALSE
- strike FALSE
- color 0
- default_color TRUE)
- label (object ItemLabel
- Parent_View @65
- location (1809, 3121)
- fill_color 13434879
- nlines 1
- max_width 307
- justify 0
- label "PTName")
- icon_style "Icon"
- line_color 3342489
- fill_color 13434879
- quidu "400858EA0280"
- compartment (object Compartment
- Parent_View @65
- location (1809, 3182)
- font (object Font
- size 10
- face "Arial"
- bold FALSE
- italics FALSE
- underline FALSE
- strike FALSE
- color 0
- default_color TRUE)
- icon_style "Icon"
- fill_color 16777215
- anchor 2
- nlines 2
- max_width 303)
- width 325
- height 205
- annotation 8
- autoResize TRUE)
- (object InheritTreeView "" @66
- location (1272, 3061)
- line_color 3342489
- fill_color 13434879
- supplier @62
- vertices (list Points
- (1272, 3061)
- (1272, 2916)))
- (object InheritView "" @67
- stereotype TRUE
- line_color 3342489
- quidu "4008589103AF"
- client @63
- supplier @62
- line_style 3
- origin_attachment (474, 3112)
- terminal_attachment (474, 3061)
- drawSupplier @66)
- (object InheritView "" @68
- stereotype TRUE
- line_color 3342489
- quidu "40085B9D0067"
- client @64
- supplier @62
- line_style 3
- origin_attachment (1245, 3106)
- terminal_attachment (1245, 3061)
- drawSupplier @66)
- (object InheritView "" @69
- stereotype TRUE
- line_color 3342489
- quidu "40085BA100DB"
- client @65
- supplier @62
- line_style 3
- origin_attachment (1905, 3110)
- terminal_attachment (1905, 3061)
- drawSupplier @66)
- (object ClassView "Class" "Logical View::instantiation::PTNullLiteral" @70
- ShowCompartmentStereotypes TRUE
- IncludeAttribute TRUE
- IncludeOperation TRUE
- location (2328, 3195)
- font (object Font
- size 10
- face "Arial"
- bold FALSE
- italics FALSE
- underline FALSE
- strike FALSE
- color 0
- default_color TRUE)
- label (object ItemLabel
- Parent_View @70
- location (2170, 3143)
- fill_color 13434879
- nlines 1
- max_width 316
- justify 0
- label "PTNullLiteral")
- icon_style "Icon"
- line_color 3342489
- fill_color 13434879
- quidu "40085BBF0020"
- width 334
- height 128
- annotation 8
- autoResize TRUE)
- (object InheritView "" @71
- stereotype TRUE
- line_color 3342489
- quidu "40085BD402F1"
- client @70
- supplier @62
- line_style 3
- origin_attachment (2297, 3131)
- terminal_attachment (2297, 3061)
- drawSupplier @66)
- (object ClassView "Class" "Logical View::instantiation::PTExpression" @72
- ShowCompartmentStereotypes TRUE
- IncludeAttribute TRUE
- IncludeOperation TRUE
- location (1243, 3867)
- font (object Font
- size 10
- face "Arial"
- bold FALSE
- italics TRUE
- underline FALSE
- strike FALSE
- color 0
- default_color TRUE)
- label (object ItemLabel
- Parent_View @72
- location (1074, 3816)
- fill_color 13434879
- nlines 1
- max_width 338
- justify 0
- label "PTExpression")
- icon_style "Icon"
- line_color 3342489
- fill_color 12615935
- quidu "40082D0A01CB"
- width 356
- height 126
- annotation 8
- autoResize TRUE)
- (object ClassView "Class" "Logical View::instantiation::PTNumberLiteral" @73
- ShowCompartmentStereotypes TRUE
- IncludeAttribute TRUE
- IncludeOperation TRUE
- location (802, 3583)
- font (object Font
- size 10
- face "Arial"
- bold FALSE
- italics FALSE
- underline FALSE
- strike FALSE
- color 0
- default_color TRUE)
- label (object ItemLabel
- Parent_View @73
- location (619, 3489)
- fill_color 13434879
- nlines 1
- max_width 367
- justify 0
- label "PTNumberLiteral")
- icon_style "Icon"
- line_color 3342489
- fill_color 13434879
- quidu "40085C40035B"
- compartment (object Compartment
- Parent_View @73
- location (619, 3550)
- font (object Font
- size 10
- face "Arial"
- bold FALSE
- italics FALSE
- underline FALSE
- strike FALSE
- color 0
- default_color TRUE)
- icon_style "Icon"
- fill_color 13434879
- anchor 2
- nlines 2
- max_width 303)
- width 385
- height 210
- annotation 8
- autoResize TRUE)
- (object InheritView "" @74
- stereotype TRUE
- line_color 3342489
- quidu "40085CEF0244"
- client @73
- supplier @62
- line_style 3
- origin_attachment (730, 3478)
- terminal_attachment (730, 3061)
- drawSupplier @66)
- (object ClassView "Class" "Logical View::instantiation::PTParenthesizedExpression" @75
- ShowCompartmentStereotypes TRUE
- IncludeAttribute TRUE
- IncludeOperation TRUE
- location (1679, 3609)
- font (object Font
- size 10
- face "Arial"
- bold FALSE
- italics FALSE
- underline FALSE
- strike FALSE
- color 0
- default_color TRUE)
- label (object ItemLabel
- Parent_View @75
- location (1381, 3513)
- fill_color 13434879
- nlines 2
- max_width 596
- justify 0
- label "PTParenthesizedExpression")
- icon_style "Icon"
- line_color 3342489
- fill_color 13434879
- quidu "40085CF9007C"
- compartment (object Compartment
- Parent_View @75
- location (1381, 3574)
- font (object Font
- size 10
- face "Arial"
- bold FALSE
- italics FALSE
- underline FALSE
- strike FALSE
- color 0
- default_color TRUE)
- icon_style "Icon"
- fill_color 13434879
- anchor 2
- nlines 2
- max_width 546)
- width 614
- height 214
- annotation 8
- autoResize TRUE)
- (object InheritView "" @76
- stereotype TRUE
- line_color 3342489
- quidu "40085F4E03E1"
- client @75
- supplier @62
- line_style 3
- origin_attachment (1677, 3502)
- terminal_attachment (1677, 3061)
- drawSupplier @66)
- (object ClassView "Class" "Logical View::instantiation::PTPrefixExpression" @77
- ShowCompartmentStereotypes TRUE
- IncludeAttribute TRUE
- IncludeOperation TRUE
- location (330, 4221)
- font (object Font
- size 10
- face "Arial"
- bold FALSE
- italics FALSE
- underline FALSE
- strike FALSE
- color 0
- default_color TRUE)
- label (object ItemLabel
- Parent_View @77
- location (9, 4090)
- fill_color 13434879
- nlines 2
- max_width 642
- justify 0
- label "PTPrefixExpression")
- icon_style "Icon"
- line_color 3342489
- fill_color 13434879
- quidu "40085FAD008B"
- compartment (object Compartment
- Parent_View @77
- location (9, 4151)
- font (object Font
- size 10
- face "Arial"
- bold FALSE
- italics FALSE
- underline FALSE
- strike FALSE
- color 0
- default_color TRUE)
- icon_style "Icon"
- fill_color 16777215
- anchor 2
- nlines 3
- max_width 553)
- width 660
- height 286
- annotation 8
- autoResize TRUE)
- (object ClassView "Class" "Logical View::instantiation::PTPrefixOperator" @78
- ShowCompartmentStereotypes TRUE
- IncludeAttribute TRUE
- IncludeOperation TRUE
- location (233, 4602)
- font (object Font
- size 10
- face "Arial"
- bold FALSE
- italics FALSE
- underline FALSE
- strike FALSE
- color 0
- default_color TRUE)
- label (object ItemLabel
- Parent_View @78
- location (34, 4468)
- fill_color 13434879
- nlines 1
- max_width 398
- justify 0
- label "PTPrefixOperator")
- stereotype (object ItemLabel
- Parent_View @78
- location (34, 4418)
- fill_color 13434879
- anchor 10
- nlines 1
- max_width 398
- justify 0
- label "<<enumeration>>")
- icon_style "Icon"
- line_color 3342489
- fill_color 13434879
- quidu "4008602400D2"
- compartment (object Compartment
- Parent_View @78
- location (34, 4529)
- font (object Font
- size 10
- face "Arial"
- bold FALSE
- italics FALSE
- underline FALSE
- strike FALSE
- color 0
- default_color TRUE)
- icon_style "Icon"
- fill_color 16777215
- anchor 2
- nlines 5
- max_width 343)
- width 416
- height 392
- annotation 8
- autoResize TRUE)
- (object ClassView "Class" "Logical View::instantiation::PTStringLiteral" @79
- ShowCompartmentStereotypes TRUE
- IncludeAttribute TRUE
- IncludeOperation TRUE
- location (1025, 4196)
- font (object Font
- size 10
- face "Arial"
- bold FALSE
- italics FALSE
- underline FALSE
- strike FALSE
- color 0
- default_color TRUE)
- label (object ItemLabel
- Parent_View @79
- location (849, 4092)
- fill_color 13434879
- nlines 1
- max_width 352
- justify 0
- label "PTStringLiteral")
- icon_style "Icon"
- line_color 3342489
- fill_color 13434879
- quidu "400861E2000B"
- compartment (object Compartment
- Parent_View @79
- location (849, 4153)
- font (object Font
- size 10
- face "Arial"
- bold FALSE
- italics FALSE
- underline FALSE
- strike FALSE
- color 0
- default_color TRUE)
- icon_style "Icon"
- fill_color 13434879
- anchor 2
- nlines 3
- max_width 459)
- width 370
- height 230
- annotation 8
- autoResize TRUE)
- (object InheritTreeView "" @80
- location (1243, 4020)
- line_color 3342489
- fill_color 13434879
- supplier @72
- vertices (list Points
- (1243, 4020)
- (1243, 3930)))
- (object InheritView "" @81
- stereotype TRUE
- line_color 3342489
- quidu "400862D70338"
- client @79
- supplier @72
- line_style 3
- origin_attachment (1008, 4081)
- terminal_attachment (1008, 4020)
- drawSupplier @80)
- (object InheritView "" @82
- stereotype TRUE
- line_color 3342489
- quidu "400862DC01D7"
- client @77
- supplier @72
- line_style 3
- origin_attachment (297, 4078)
- terminal_attachment (297, 4020)
- drawSupplier @80)
- (object ClassView "Class" "Logical View::instantiation::PTThisLiteral" @83
- ShowCompartmentStereotypes TRUE
- IncludeAttribute TRUE
- IncludeOperation TRUE
- location (1655, 4180)
- font (object Font
- size 10
- face "Arial"
- bold FALSE
- italics FALSE
- underline FALSE
- strike FALSE
- color 0
- default_color TRUE)
- label (object ItemLabel
- Parent_View @83
- location (1494, 4129)
- fill_color 13434879
- nlines 1
- max_width 322
- justify 0
- label "PTThisLiteral")
- icon_style "Icon"
- line_color 3342489
- fill_color 13434879
- quidu "400863A700CB"
- width 340
- height 126
- annotation 8
- autoResize TRUE)
- (object InheritView "" @84
- stereotype TRUE
- line_color 3342489
- quidu "40086418019F"
- client @83
- supplier @72
- line_style 3
- origin_attachment (1627, 4117)
- terminal_attachment (1627, 4020)
- drawSupplier @80)
- (object ClassView "Class" "Logical View::instantiation::PTTypeLiteral" @85
- ShowCompartmentStereotypes TRUE
- IncludeAttribute TRUE
- IncludeOperation TRUE
- location (2256, 4201)
- font (object Font
- size 10
- face "Arial"
- bold FALSE
- italics FALSE
- underline FALSE
- strike FALSE
- color 0
- default_color TRUE)
- label (object ItemLabel
- Parent_View @85
- location (2093, 4106)
- fill_color 13434879
- nlines 1
- max_width 327
- justify 0
- label "PTTypeLiteral")
- icon_style "Icon"
- line_color 3342489
- fill_color 13434879
- quidu "400864950181"
- compartment (object Compartment
- Parent_View @85
- location (2093, 4167)
- font (object Font
- size 10
- face "Arial"
- bold FALSE
- italics FALSE
- underline FALSE
- strike FALSE
- color 0
- default_color TRUE)
- icon_style "Icon"
- fill_color 13434879
- anchor 2
- nlines 2
- max_width 281)
- width 345
- height 215
- annotation 8
- autoResize TRUE)
- (object InheritView "" @86
- stereotype TRUE
- line_color 3342489
- quidu "4008654C0008"
- client @85
- supplier @72
- line_style 3
- origin_attachment (2197, 4093)
- terminal_attachment (2197, 4020)
- drawSupplier @80)
- (object ClassView "Class" "Logical View::instantiation::PTInvalidExpression" @87
- ShowCompartmentStereotypes TRUE
- IncludeAttribute TRUE
- IncludeOperation TRUE
- location (1457, 4545)
- font (object Font
- size 10
- face "Arial"
- bold FALSE
- italics FALSE
- underline FALSE
- strike FALSE
- color 0
- default_color TRUE)
- label (object ItemLabel
- Parent_View @87
- location (1279, 4449)
- fill_color 13434879
- nlines 1
- max_width 357
- justify 0
- label "PTInvalidExpression")
- icon_style "Icon"
- line_color 3342489
- fill_color 13434879
- quidu "400865AF0209"
- compartment (object Compartment
- Parent_View @87
- location (1279, 4510)
- font (object Font
- size 10
- face "Arial"
- bold FALSE
- italics FALSE
- underline FALSE
- strike FALSE
- color 0
- default_color TRUE)
- icon_style "Icon"
- fill_color 13434879
- anchor 2
- nlines 2
- max_width 368)
- width 375
- height 215
- annotation 8
- autoResize TRUE)
- (object InheritView "" @88
- stereotype TRUE
- line_color 3342489
- quidu "400866F50258"
- client @87
- supplier @72
- line_style 3
- origin_attachment (1413, 4438)
- terminal_attachment (1413, 4020)
- drawSupplier @80)
- (object ClassView "Class" "Logical View::instantiation::IJavaInstance" @89
- ShowCompartmentStereotypes TRUE
- IncludeOperation TRUE
- location (2301, 4917)
- font (object Font
- size 10
- face "Arial"
- bold FALSE
- italics FALSE
- underline FALSE
- strike FALSE
- color 0
- default_color TRUE)
- label (object ItemLabel
- Parent_View @89
- location (2137, 4887)
- fill_color 13434879
- nlines 1
- max_width 328
- justify 0
- label "IJavaInstance")
- stereotype (object ItemLabel
- Parent_View @89
- location (2137, 4837)
- fill_color 13434879
- anchor 10
- nlines 1
- max_width 328
- justify 0
- label "<<Interface>>")
- icon "Interface"
- icon_style "Label"
- line_color 3342489
- fill_color 13434879
- quidu "3E51575A02D4"
- width 346
- height 184
- annotation 8
- autoResize TRUE)
- (object ClassView "Class" "Logical View::instantiation::PTInstanceReference" @90
- ShowCompartmentStereotypes TRUE
- IncludeAttribute TRUE
- IncludeOperation TRUE
- location (2005, 4509)
- font (object Font
- size 10
- face "Arial"
- bold FALSE
- italics FALSE
- underline FALSE
- strike FALSE
- color 0
- default_color TRUE)
- label (object ItemLabel
- Parent_View @90
- location (1805, 4393)
- fill_color 13434879
- nlines 1
- max_width 401
- justify 0
- label "PTInstanceReference")
- icon_style "Icon"
- line_color 3342489
- fill_color 13434879
- quidu "4017DB1802B3"
- width 419
- height 257
- annotation 8
- autoResize TRUE)
- (object InheritView "" @91
- stereotype TRUE
- line_color 3342489
- quidu "4017DB4A0341"
- client @90
- supplier @72
- line_style 3
- origin_attachment (1943, 4381)
- terminal_attachment (1943, 4020)
- drawSupplier @80)
- (object AssociationViewNew "$UNNAMED$6" @92
- location (2165, 4730)
- font (object Font
- size 10
- face "Arial"
- bold FALSE
- italics FALSE
- underline FALSE
- strike FALSE
- color 0
- default_color TRUE)
- stereotype TRUE
- line_color 3342489
- quidu "4017DBE30138"
- roleview_list (list RoleViews
- (object RoleView "reference" @93
- Parent_View @92
- location (227, 259)
- font (object Font
- size 10
- face "Arial"
- bold FALSE
- italics FALSE
- underline FALSE
- strike FALSE
- color 0
- default_color TRUE)
- label (object SegLabel @94
- Parent_View @93
- location (2120, 4797)
- font (object Font
- size 10
- face "Arial"
- bold FALSE
- italics FALSE
- underline FALSE
- strike FALSE
- color 0
- default_color TRUE)
- anchor 1
- anchor_loc 1
- nlines 1
- max_width 189
- justify 0
- label "+reference"
- pctDist 0.231960
- height 77
- orientation 1)
- stereotype TRUE
- line_color 3342489
- quidu "4017DBE60006"
- client @92
- supplier @89
- line_style 0
- label (object SegLabel @95
- Parent_View @93
- location (2270, 4783)
- font (object Font
- size 10
- face "Arial"
- bold FALSE
- italics FALSE
- underline FALSE
- strike FALSE
- color 0
- default_color TRUE)
- anchor 2
- anchor_loc 1
- nlines 1
- max_width 15
- justify 0
- label "1"
- pctDist 0.900000
- height 54
- orientation 0))
- (object RoleView "$UNNAMED$7" @96
- Parent_View @92
- location (227, 259)
- stereotype TRUE
- line_color 3342489
- quidu "4017DBE60164"
- client @92
- supplier @90
- line_style 0)))
- (object ClassView "Class" "Logical View::instantiation::PTAnonymousClassDeclaration" @97
- ShowCompartmentStereotypes TRUE
- IncludeAttribute TRUE
- IncludeOperation TRUE
- location (852, 4577)
- font (object Font
- size 10
- face "Arial"
- bold FALSE
- italics FALSE
- underline FALSE
- strike FALSE
- color 0
- default_color TRUE)
- label (object ItemLabel
- Parent_View @97
- location (495, 4471)
- fill_color 13434879
- nlines 1
- max_width 714
- justify 0
- label "PTAnonymousClassDeclaration")
- icon_style "Icon"
- line_color 3342489
- fill_color 13434879
- quidu "43627C140396"
- compartment (object Compartment
- Parent_View @97
- location (495, 4532)
- font (object Font
- size 10
- face "Arial"
- bold FALSE
- italics FALSE
- underline FALSE
- strike FALSE
- color 0
- default_color TRUE)
- icon_style "Icon"
- fill_color 13434879
- anchor 2
- nlines 3
- max_width 503)
- width 732
- height 236
- annotation 8
- autoResize TRUE)
- (object InheritView "" @98
- stereotype TRUE
- line_color 3342489
- quidu "43627D4E00D0"
- client @97
- supplier @72
- line_style 3
- origin_attachment (677, 4459)
- terminal_attachment (677, 4020)
- drawSupplier @80)))))
diff --git a/plugins/org.eclipse.jem/rose/javaModel.mdl b/plugins/org.eclipse.jem/rose/javaModel.mdl
deleted file mode 100644
index 5efb92d..0000000
--- a/plugins/org.eclipse.jem/rose/javaModel.mdl
+++ /dev/null
@@ -1,8819 +0,0 @@
-
-(object Petal
- version 47
- _written "Rose 8.0.0303.1400"
- charSet 0)
-
-(object Design "Logical View"
- is_unit TRUE
- is_loaded TRUE
- attributes (list Attribute_Set
- (object Attribute
- tool "Java"
- name "IDE"
- value "Internal Editor")
- (object Attribute
- tool "Java"
- name "UserDefineTagName1"
- value "")
- (object Attribute
- tool "Java"
- name "UserDefineTagText1"
- value "")
- (object Attribute
- tool "Java"
- name "UserDefineTagApply1"
- value "")
- (object Attribute
- tool "Java"
- name "UserDefineTagName2"
- value "")
- (object Attribute
- tool "Java"
- name "UserDefineTagText2"
- value "")
- (object Attribute
- tool "Java"
- name "UserDefineTagApply2"
- value "")
- (object Attribute
- tool "Java"
- name "UserDefineTagName3"
- value "")
- (object Attribute
- tool "Java"
- name "UserDefineTagText3"
- value "")
- (object Attribute
- tool "Java"
- name "UserDefineTagApply3"
- value ""))
- quid "39EDFBE003B4"
- defaults (object defaults
- rightMargin 0.250000
- leftMargin 0.250000
- topMargin 0.250000
- bottomMargin 0.500000
- pageOverlap 0.250000
- clipIconLabels TRUE
- autoResize TRUE
- snapToGrid TRUE
- gridX 16
- gridY 16
- defaultFont (object Font
- size 10
- face "Arial"
- bold FALSE
- italics FALSE
- underline FALSE
- strike FALSE
- color 0
- default_color TRUE)
- showMessageNum 1
- showClassOfObject TRUE
- notation "Unified")
- root_usecase_package (object Class_Category "Use Case View"
- quid "39EDFBE003B6"
- exportControl "Public"
- global TRUE
- logical_models (list unit_reference_list)
- logical_presentations (list unit_reference_list
- (object UseCaseDiagram "Main"
- quid "39EDFBE2008D"
- title "Main"
- zoom 100
- max_height 28350
- max_width 21600
- origin_x 0
- origin_y 0
- items (list diagram_item_list))))
- root_category (object Class_Category "Logical View"
- quid "39EDFBE003B5"
- exportControl "Public"
- global TRUE
- subsystem "Component View"
- quidu "39EDFBE003B7"
- logical_models (list unit_reference_list
- (object Class_Category "java"
- is_unit TRUE
- is_loaded FALSE
- file_name "$WorkspaceRoot\\org.eclipse.jem\\rose\\edocjava2.cat"
- quid "36549F2C004E")
- (object Class_Category "ecore"
- is_unit TRUE
- is_loaded FALSE
- file_name "$WorkspaceRoot\\org.eclipse.emf.ecore\\model\\org.eclipse.emf.Ecore.cat"
- quid "39A5ED04004E"))
- logical_presentations (list unit_reference_list
- (object ClassDiagram "Main"
- quid "39EDFBE2008E"
- title "Main"
- zoom 100
- max_height 28350
- max_width 21600
- origin_x 0
- origin_y 0
- items (list diagram_item_list
- (object CategoryView "Logical View::java" @1
- location (784, 528)
- font (object Font
- size 10
- face "Arial"
- bold FALSE
- italics FALSE
- underline FALSE
- strike FALSE
- color 0
- default_color TRUE)
- label (object ItemLabel
- Parent_View @1
- location (630, 493)
- fill_color 13434879
- nlines 2
- max_width 308
- justify 0
- label "java")
- stereotype (object ItemLabel
- Parent_View @1
- location (630, 443)
- fill_color 13434879
- anchor 10
- nlines 1
- max_width 308
- justify 0
- label "<<metamodel>>")
- icon_style "Icon"
- line_color 3342489
- fill_color 13434879
- quidu "36549F2C004E"
- width 320
- height 182)
- (object CategoryView "Logical View::ecore" @2
- location (304, 544)
- font (object Font
- size 10
- face "Arial"
- bold FALSE
- italics FALSE
- underline FALSE
- strike FALSE
- color 0
- default_color TRUE)
- label (object ItemLabel
- Parent_View @2
- location (160, 460)
- fill_color 13434879
- nlines 2
- max_width 288
- justify 0
- label "ecore")
- icon_style "Icon"
- line_color 3342489
- fill_color 13434879
- quidu "39A5ED04004E"
- width 300
- height 180)))))
- root_subsystem (object SubSystem "Component View"
- quid "39EDFBE003B7"
- physical_models (list unit_reference_list)
- physical_presentations (list unit_reference_list
- (object Module_Diagram "Main"
- quid "39EDFBE2008C"
- title "Main"
- zoom 100
- max_height 28350
- max_width 21600
- origin_x 0
- origin_y 0
- items (list diagram_item_list))))
- process_structure (object Processes
- quid "39EDFBE003B8"
- ProcsNDevs (list
- (object Process_Diagram "Deployment View"
- quid "39EDFBE003BA"
- title "Deployment View"
- zoom 100
- max_height 28350
- max_width 21600
- origin_x 0
- origin_y 0
- items (list diagram_item_list))))
- properties (object Properties
- attributes (list Attribute_Set
- (object Attribute
- tool "Ecore"
- name "roseId"
- value "753117540")
- (object Attribute
- tool "Ecore"
- name "propertyId"
- value "809135969")
- (object Attribute
- tool "Ecore"
- name "default__Category"
- value (list Attribute_Set
- (object Attribute
- tool "Ecore"
- name "prefix"
- value "")
- (object Attribute
- tool "Ecore"
- name "packageName"
- value "")
- (object Attribute
- tool "Ecore"
- name "basePackage"
- value "")
- (object Attribute
- tool "Ecore"
- name "nsName"
- value "")
- (object Attribute
- tool "Ecore"
- name "nsURI"
- value "")
- (object Attribute
- tool "Ecore"
- name "nsPrefix"
- value "")
- (object Attribute
- tool "Ecore"
- name "annotation"
- value "")))
- (object Attribute
- tool "Ecore"
- name "default__Category"
- value (list Attribute_Set
- (object Attribute
- tool "Ecore"
- name "packageName"
- value "")
- (object Attribute
- tool "Ecore"
- name "prefix"
- value "")
- (object Attribute
- tool "Ecore"
- name "basePackage"
- value "")
- (object Attribute
- tool "Ecore"
- name "nsName"
- value "")
- (object Attribute
- tool "Ecore"
- name "nsURI"
- value "")
- (object Attribute
- tool "Ecore"
- name "nsPrefix"
- value "")
- (object Attribute
- tool "Ecore"
- name "annotation"
- value "")))
- (object Attribute
- tool "Ecore"
- name "default__Category"
- value (list Attribute_Set
- (object Attribute
- tool "Ecore"
- name "basePackage"
- value "")
- (object Attribute
- tool "Ecore"
- name "prefix"
- value "")
- (object Attribute
- tool "Ecore"
- name "packageName"
- value "")
- (object Attribute
- tool "Ecore"
- name "nsName"
- value "")
- (object Attribute
- tool "Ecore"
- name "nsURI"
- value "")
- (object Attribute
- tool "Ecore"
- name "nsPrefix"
- value "")
- (object Attribute
- tool "Ecore"
- name "annotation"
- value "")))
- (object Attribute
- tool "Ecore"
- name "default__Category"
- value (list Attribute_Set
- (object Attribute
- tool "Ecore"
- name "nsName"
- value "")
- (object Attribute
- tool "Ecore"
- name "prefix"
- value "")
- (object Attribute
- tool "Ecore"
- name "packageName"
- value "")
- (object Attribute
- tool "Ecore"
- name "basePackage"
- value "")
- (object Attribute
- tool "Ecore"
- name "nsURI"
- value "")
- (object Attribute
- tool "Ecore"
- name "nsPrefix"
- value "")
- (object Attribute
- tool "Ecore"
- name "annotation"
- value "")))
- (object Attribute
- tool "Ecore"
- name "default__Category"
- value (list Attribute_Set
- (object Attribute
- tool "Ecore"
- name "nsURI"
- value "")
- (object Attribute
- tool "Ecore"
- name "prefix"
- value "")
- (object Attribute
- tool "Ecore"
- name "packageName"
- value "")
- (object Attribute
- tool "Ecore"
- name "basePackage"
- value "")
- (object Attribute
- tool "Ecore"
- name "nsName"
- value "")
- (object Attribute
- tool "Ecore"
- name "nsPrefix"
- value "")
- (object Attribute
- tool "Ecore"
- name "annotation"
- value "")))
- (object Attribute
- tool "Ecore"
- name "default__Attribute"
- value (list Attribute_Set
- (object Attribute
- tool "Ecore"
- name "isTransient"
- value FALSE)
- (object Attribute
- tool "Ecore"
- name "isVolatile"
- value FALSE)
- (object Attribute
- tool "Ecore"
- name "isChangeable"
- value TRUE)
- (object Attribute
- tool "Ecore"
- name "isUnsettable"
- value FALSE)
- (object Attribute
- tool "Ecore"
- name "isUnique"
- value TRUE)
- (object Attribute
- tool "Ecore"
- name "attributeName"
- value "")
- (object Attribute
- tool "Ecore"
- name "isID"
- value FALSE)
- (object Attribute
- tool "Ecore"
- name "visibility"
- value ("VisibilityKind" 0))
- (object Attribute
- tool "Ecore"
- name "VisibilityKind"
- value (list Attribute_Set
- (object Attribute
- tool "Ecore"
- name "Unspecified"
- value 0)
- (object Attribute
- tool "Ecore"
- name "None"
- value 1)
- (object Attribute
- tool "Ecore"
- name "Read-only"
- value 2)
- (object Attribute
- tool "Ecore"
- name "Read-write"
- value 3)
- (object Attribute
- tool "Ecore"
- name "Read-only unsettable"
- value 4)
- (object Attribute
- tool "Ecore"
- name "Read-write unsettable"
- value 5)))
- (object Attribute
- tool "Ecore"
- name "xmlName"
- value "")
- (object Attribute
- tool "Ecore"
- name "xmlNamespace"
- value "")
- (object Attribute
- tool "Ecore"
- name "xmlFeatureKind"
- value ("FeatureKind" 0))
- (object Attribute
- tool "Ecore"
- name "FeatureKind"
- value (list Attribute_Set
- (object Attribute
- tool "Ecore"
- name "Unspecified"
- value 0)
- (object Attribute
- tool "Ecore"
- name "Simple"
- value 1)
- (object Attribute
- tool "Ecore"
- name "Attribute"
- value 2)
- (object Attribute
- tool "Ecore"
- name "Element"
- value 4)))
- (object Attribute
- tool "Ecore"
- name "annotation"
- value "")))
- (object Attribute
- tool "Ecore"
- name "default__Role"
- value (list Attribute_Set
- (object Attribute
- tool "Ecore"
- name "isTransient"
- value FALSE)
- (object Attribute
- tool "Ecore"
- name "isVolatile"
- value FALSE)
- (object Attribute
- tool "Ecore"
- name "isChangeable"
- value TRUE)
- (object Attribute
- tool "Ecore"
- name "isUnsettable"
- value FALSE)
- (object Attribute
- tool "Ecore"
- name "isResolveProxies"
- value TRUE)
- (object Attribute
- tool "Ecore"
- name "referenceName"
- value "")
- (object Attribute
- tool "Ecore"
- name "visibility"
- value ("VisibilityKind" 0))
- (object Attribute
- tool "Ecore"
- name "VisibilityKind"
- value (list Attribute_Set
- (object Attribute
- tool "Ecore"
- name "Unspecified"
- value 0)
- (object Attribute
- tool "Ecore"
- name "None"
- value 1)
- (object Attribute
- tool "Ecore"
- name "Read-only"
- value 2)
- (object Attribute
- tool "Ecore"
- name "Read-write"
- value 3)
- (object Attribute
- tool "Ecore"
- name "Read-only unsettable"
- value 4)
- (object Attribute
- tool "Ecore"
- name "Read-write unsettable"
- value 5)))
- (object Attribute
- tool "Ecore"
- name "xmlName"
- value "")
- (object Attribute
- tool "Ecore"
- name "xmlNamespace"
- value "")
- (object Attribute
- tool "Ecore"
- name "xmlFeatureKind"
- value ("FeatureKind" 0))
- (object Attribute
- tool "Ecore"
- name "FeatureKind"
- value (list Attribute_Set
- (object Attribute
- tool "Ecore"
- name "Unspecified"
- value 0)
- (object Attribute
- tool "Ecore"
- name "Simple"
- value 1)
- (object Attribute
- tool "Ecore"
- name "Attribute"
- value 2)
- (object Attribute
- tool "Ecore"
- name "Element"
- value 4)))
- (object Attribute
- tool "Ecore"
- name "annotation"
- value "")))
- (object Attribute
- tool "Cplusplus"
- name "propertyId"
- value "809135966")
- (object Attribute
- tool "Cplusplus"
- name "default__Role"
- value (list Attribute_Set
- (object Attribute
- tool "Cplusplus"
- name "Synchronize"
- value TRUE)
- (object Attribute
- tool "Cplusplus"
- name "CodeName"
- value "")
- (object Attribute
- tool "Cplusplus"
- name "Const"
- value FALSE)
- (object Attribute
- tool "Cplusplus"
- name "InitialValue"
- value "")))
- (object Attribute
- tool "Cplusplus"
- name "default__Inherit"
- value (list Attribute_Set
- (object Attribute
- tool "Cplusplus"
- name "Synchronize"
- value TRUE)))
- (object Attribute
- tool "Cplusplus"
- name "default__Module-Spec"
- value (list Attribute_Set
- (object Attribute
- tool "Cplusplus"
- name "Synchronize"
- value TRUE)
- (object Attribute
- tool "Cplusplus"
- name "Copyright"
- value (value Text ""))
- (object Attribute
- tool "Cplusplus"
- name "RootPackage"
- value "C++ Reverse Engineered")
- (object Attribute
- tool "Cplusplus"
- name "InitialHeaderIncludes"
- value (value Text ""))
- (object Attribute
- tool "Cplusplus"
- name "InitialBodyIncludes"
- value (value Text ""))
- (object Attribute
- tool "Cplusplus"
- name "RevEngRootDirectory"
- value "")
- (object Attribute
- tool "Cplusplus"
- name "RevEngDirectoriesAsPackages"
- value FALSE)
- (object Attribute
- tool "Cplusplus"
- name "HeaderFileExtension"
- value ".h")
- (object Attribute
- tool "Cplusplus"
- name "ImplementationFileExtension"
- value ".cpp")
- (object Attribute
- tool "Cplusplus"
- name "NewHeaderFileDirectory"
- value "")
- (object Attribute
- tool "Cplusplus"
- name "NewImplementationFileDirectory"
- value "")
- (object Attribute
- tool "Cplusplus"
- name "FileCapitalization"
- value ("FileCapitalizationSet" 0))
- (object Attribute
- tool "Cplusplus"
- name "CodeGenExtraDirectories"
- value ("CodeGenExtraDirectoriesSet" 0))
- (object Attribute
- tool "Cplusplus"
- name "StripClassPrefix"
- value "")
- (object Attribute
- tool "Cplusplus"
- name "UseTabs"
- value FALSE)
- (object Attribute
- tool "Cplusplus"
- name "TabWidth"
- value 8)
- (object Attribute
- tool "Cplusplus"
- name "IndentWidth"
- value 4)
- (object Attribute
- tool "Cplusplus"
- name "AccessIndentation"
- value -2)
- (object Attribute
- tool "Cplusplus"
- name "ModelIdCommentRules"
- value ("ModelIdCommentRulesSet" 1))
- (object Attribute
- tool "Cplusplus"
- name "PageWidth"
- value 80)
- (object Attribute
- tool "Cplusplus"
- name "ClassMemberOrder"
- value ("MemberOrderSet" 1))
- (object Attribute
- tool "Cplusplus"
- name "OneParameterPerLine"
- value FALSE)
- (object Attribute
- tool "Cplusplus"
- name "NamespaceBraceStyle"
- value ("BraceStyleSet" 2))
- (object Attribute
- tool "Cplusplus"
- name "ClassBraceStyle"
- value ("BraceStyleSet" 2))
- (object Attribute
- tool "Cplusplus"
- name "FunctionBraceStyle"
- value ("BraceStyleSet" 2))
- (object Attribute
- tool "Cplusplus"
- name "CodeGenExtraDirectoriesSet"
- value (list Attribute_Set
- (object Attribute
- tool "Cplusplus"
- name "None"
- value 0)
- (object Attribute
- tool "Cplusplus"
- name "Namespaces"
- value 1)
- (object Attribute
- tool "Cplusplus"
- name "Packages"
- value 2)))
- (object Attribute
- tool "Cplusplus"
- name "FileCapitalizationSet"
- value (list Attribute_Set
- (object Attribute
- tool "Cplusplus"
- name "Same as model"
- value 0)
- (object Attribute
- tool "Cplusplus"
- name "Lower case"
- value 1)
- (object Attribute
- tool "Cplusplus"
- name "Upper case"
- value 2)
- (object Attribute
- tool "Cplusplus"
- name "Lower case with underscores"
- value 3)))
- (object Attribute
- tool "Cplusplus"
- name "BraceStyleSet"
- value (list Attribute_Set
- (object Attribute
- tool "Cplusplus"
- name "B1"
- value 1)
- (object Attribute
- tool "Cplusplus"
- name "B2"
- value 2)
- (object Attribute
- tool "Cplusplus"
- name "B3"
- value 3)
- (object Attribute
- tool "Cplusplus"
- name "B4"
- value 4)
- (object Attribute
- tool "Cplusplus"
- name "B5"
- value 5)))
- (object Attribute
- tool "Cplusplus"
- name "MemberOrderSet"
- value (list Attribute_Set
- (object Attribute
- tool "Cplusplus"
- name "Public First"
- value 1)
- (object Attribute
- tool "Cplusplus"
- name "Private First"
- value 2)
- (object Attribute
- tool "Cplusplus"
- name "Order by kind"
- value 3)
- (object Attribute
- tool "Cplusplus"
- name "Unordered"
- value 4)))
- (object Attribute
- tool "Cplusplus"
- name "ModelIdCommentRulesSet"
- value (list Attribute_Set
- (object Attribute
- tool "Cplusplus"
- name "Code generation only"
- value 1)
- (object Attribute
- tool "Cplusplus"
- name "Code generation and reverse engineering"
- value 2)
- (object Attribute
- tool "Cplusplus"
- name "Never generate model IDs"
- value 3)))))
- (object Attribute
- tool "Cplusplus"
- name "default__Param"
- value (list Attribute_Set
- (object Attribute
- tool "Cplusplus"
- name "CodeName"
- value "")))
- (object Attribute
- tool "Cplusplus"
- name "default__Attribute"
- value (list Attribute_Set
- (object Attribute
- tool "Cplusplus"
- name "Synchronize"
- value TRUE)
- (object Attribute
- tool "Cplusplus"
- name "CodeName"
- value "")))
- (object Attribute
- tool "Cplusplus"
- name "default__Operation"
- value (list Attribute_Set
- (object Attribute
- tool "Cplusplus"
- name "Synchronize"
- value TRUE)
- (object Attribute
- tool "Cplusplus"
- name "CodeName"
- value "")
- (object Attribute
- tool "Cplusplus"
- name "InitialCodeBody"
- value "")
- (object Attribute
- tool "Cplusplus"
- name "Inline"
- value FALSE)
- (object Attribute
- tool "Cplusplus"
- name "GenerateFunctionBody"
- value ("GenerateFunctionBodySet" 2))
- (object Attribute
- tool "Cplusplus"
- name "GenerateFunctionBodySet"
- value (list Attribute_Set
- (object Attribute
- tool "Cplusplus"
- name "Default"
- value 2)
- (object Attribute
- tool "Cplusplus"
- name "True"
- value 1)
- (object Attribute
- tool "Cplusplus"
- name "False"
- value 0)))))
- (object Attribute
- tool "Cplusplus"
- name "default__Class"
- value (list Attribute_Set
- (object Attribute
- tool "Cplusplus"
- name "Synchronize"
- value TRUE)
- (object Attribute
- tool "Cplusplus"
- name "CodeName"
- value "")
- (object Attribute
- tool "Cplusplus"
- name "ImplementationType"
- value "")
- (object Attribute
- tool "Cplusplus"
- name "HeaderSourceFile"
- value "")
- (object Attribute
- tool "Cplusplus"
- name "BodySourceFile"
- value "")))
- (object Attribute
- tool "Cplusplus"
- name "default__Category"
- value (list Attribute_Set
- (object Attribute
- tool "Cplusplus"
- name "CodeName"
- value "")
- (object Attribute
- tool "Cplusplus"
- name "IsNamespace"
- value FALSE)))
- (object Attribute
- tool "Cplusplus"
- name "HiddenTool"
- value FALSE)
- (object Attribute
- tool "ANSI C++ Event Watcher"
- name "HiddenTool"
- value FALSE)
- (object Attribute
- tool "ANSIConvert"
- name "HiddenTool"
- value FALSE)
- (object Attribute
- tool "Ada83"
- name "propertyId"
- value "838326200")
- (object Attribute
- tool "Ada83"
- name "default__Project"
- value (list Attribute_Set
- (object Attribute
- tool "Ada83"
- name "SpecFileExtension"
- value "1.ada")
- (object Attribute
- tool "Ada83"
- name "SpecFileBackupExtension"
- value "1.ad~")
- (object Attribute
- tool "Ada83"
- name "SpecFileTemporaryExtension"
- value "1.ad#")
- (object Attribute
- tool "Ada83"
- name "BodyFileExtension"
- value "2.ada")
- (object Attribute
- tool "Ada83"
- name "BodyFileBackupExtension"
- value "2.ad~")
- (object Attribute
- tool "Ada83"
- name "BodyFileTemporaryExtension"
- value "2.ad#")
- (object Attribute
- tool "Ada83"
- name "CreateMissingDirectories"
- value TRUE)
- (object Attribute
- tool "Ada83"
- name "GenerateBodies"
- value TRUE)
- (object Attribute
- tool "Ada83"
- name "GenerateAccessorOperations"
- value TRUE)
- (object Attribute
- tool "Ada83"
- name "GenerateStandardOperations"
- value TRUE)
- (object Attribute
- tool "Ada83"
- name "DefaultCodeBody"
- value "[statement]")
- (object Attribute
- tool "Ada83"
- name "ImplicitParameter"
- value TRUE)
- (object Attribute
- tool "Ada83"
- name "CommentWidth"
- value 60)
- (object Attribute
- tool "Ada83"
- name "StopOnError"
- value FALSE)
- (object Attribute
- tool "Ada83"
- name "ErrorLimit"
- value 30)
- (object Attribute
- tool "Ada83"
- name "UseFileName"
- value FALSE)
- (object Attribute
- tool "Ada83"
- name "Directory"
- value "$ROSEADA83_SOURCE")))
- (object Attribute
- tool "Ada83"
- name "default__Class"
- value (list Attribute_Set
- (object Attribute
- tool "Ada83"
- name "CodeName"
- value "")
- (object Attribute
- tool "Ada83"
- name "ClassName"
- value "Object")
- (object Attribute
- tool "Ada83"
- name "ClassAccess"
- value ("ImplementationSet" 43))
- (object Attribute
- tool "Ada83"
- name "ImplementationType"
- value (value Text ""))
- (object Attribute
- tool "Ada83"
- name "IsSubtype"
- value FALSE)
- (object Attribute
- tool "Ada83"
- name "PolymorphicUnit"
- value FALSE)
- (object Attribute
- tool "Ada83"
- name "HandleName"
- value "Handle")
- (object Attribute
- tool "Ada83"
- name "HandleAccess"
- value ("ImplementationSet" 45))
- (object Attribute
- tool "Ada83"
- name "Discriminant"
- value "")
- (object Attribute
- tool "Ada83"
- name "Variant"
- value "")
- (object Attribute
- tool "Ada83"
- name "EnumerationLiteralPrefix"
- value "A_")
- (object Attribute
- tool "Ada83"
- name "RecordFieldPrefix"
- value "The_")
- (object Attribute
- tool "Ada83"
- name "GenerateAccessorOperations"
- value TRUE)
- (object Attribute
- tool "Ada83"
- name "GenerateStandardOperations"
- value TRUE)
- (object Attribute
- tool "Ada83"
- name "ImplicitParameter"
- value TRUE)
- (object Attribute
- tool "Ada83"
- name "ClassParameterName"
- value "This")
- (object Attribute
- tool "Ada83"
- name "DefaultConstructorKind"
- value ("ConstructorKindSet" 199))
- (object Attribute
- tool "Ada83"
- name "DefaultConstructorName"
- value "Create")
- (object Attribute
- tool "Ada83"
- name "InlineDefaultConstructor"
- value FALSE)
- (object Attribute
- tool "Ada83"
- name "CopyConstructorKind"
- value ("ConstructorKindSet" 199))
- (object Attribute
- tool "Ada83"
- name "CopyConstructorName"
- value "Copy")
- (object Attribute
- tool "Ada83"
- name "InlineCopyConstructor"
- value FALSE)
- (object Attribute
- tool "Ada83"
- name "DestructorName"
- value "Free")
- (object Attribute
- tool "Ada83"
- name "InlineDestructor"
- value FALSE)
- (object Attribute
- tool "Ada83"
- name "ClassEqualityOperation"
- value "")
- (object Attribute
- tool "Ada83"
- name "HandleEqualityOperation"
- value "")
- (object Attribute
- tool "Ada83"
- name "InlineEquality"
- value FALSE)
- (object Attribute
- tool "Ada83"
- name "IsTask"
- value FALSE)
- (object Attribute
- tool "Ada83"
- name "Representation"
- value (value Text ""))
- (object Attribute
- tool "Ada83"
- name "ImplementationSet"
- value (list Attribute_Set
- (object Attribute
- tool "Ada83"
- name "Public"
- value 45)
- (object Attribute
- tool "Ada83"
- name "Private"
- value 43)
- (object Attribute
- tool "Ada83"
- name "LimitedPrivate"
- value 200)
- (object Attribute
- tool "Ada83"
- name "DoNotCreate"
- value 201)))
- (object Attribute
- tool "Ada83"
- name "ConstructorKindSet"
- value (list Attribute_Set
- (object Attribute
- tool "Ada83"
- name "Procedure"
- value 202)
- (object Attribute
- tool "Ada83"
- name "Function"
- value 199)
- (object Attribute
- tool "Ada83"
- name "DoNotCreate"
- value 201)))))
- (object Attribute
- tool "Ada83"
- name "default__Module-Spec"
- value (list Attribute_Set
- (object Attribute
- tool "Ada83"
- name "Generate"
- value TRUE)
- (object Attribute
- tool "Ada83"
- name "CopyrightNotice"
- value (value Text ""))
- (object Attribute
- tool "Ada83"
- name "FileName"
- value "")
- (object Attribute
- tool "Ada83"
- name "ReturnType"
- value "")
- (object Attribute
- tool "Ada83"
- name "GenericFormalParameters"
- value (value Text ""))
- (object Attribute
- tool "Ada83"
- name "AdditionalWiths"
- value (value Text ""))))
- (object Attribute
- tool "Ada83"
- name "default__Module-Body"
- value (list Attribute_Set
- (object Attribute
- tool "Ada83"
- name "Generate"
- value TRUE)
- (object Attribute
- tool "Ada83"
- name "CopyrightNotice"
- value (value Text ""))
- (object Attribute
- tool "Ada83"
- name "FileName"
- value "")
- (object Attribute
- tool "Ada83"
- name "ReturnType"
- value "")
- (object Attribute
- tool "Ada83"
- name "AdditionalWiths"
- value (value Text ""))
- (object Attribute
- tool "Ada83"
- name "IsSubunit"
- value FALSE)))
- (object Attribute
- tool "Ada83"
- name "default__Operation"
- value (list Attribute_Set
- (object Attribute
- tool "Ada83"
- name "CodeName"
- value "")
- (object Attribute
- tool "Ada83"
- name "SubprogramImplementation"
- value ("SubprogramImplementationSet" 2))
- (object Attribute
- tool "Ada83"
- name "Renames"
- value "")
- (object Attribute
- tool "Ada83"
- name "ClassParameterMode"
- value ("ParameterModeSet" 203))
- (object Attribute
- tool "Ada83"
- name "Inline"
- value FALSE)
- (object Attribute
- tool "Ada83"
- name "EntryCode"
- value (value Text ""))
- (object Attribute
- tool "Ada83"
- name "ExitCode"
- value (value Text ""))
- (object Attribute
- tool "Ada83"
- name "InitialCodeBody"
- value "${default}")
- (object Attribute
- tool "Ada83"
- name "Representation"
- value (value Text ""))
- (object Attribute
- tool "Ada83"
- name "SubprogramImplementationSet"
- value (list Attribute_Set
- (object Attribute
- tool "Ada83"
- name "Spec"
- value 224)
- (object Attribute
- tool "Ada83"
- name "Body"
- value 2)
- (object Attribute
- tool "Ada83"
- name "Renaming"
- value 222)
- (object Attribute
- tool "Ada83"
- name "Separate"
- value 223)))
- (object Attribute
- tool "Ada83"
- name "ParameterModeSet"
- value (list Attribute_Set
- (object Attribute
- tool "Ada83"
- name "In"
- value 204)
- (object Attribute
- tool "Ada83"
- name "Out"
- value 205)
- (object Attribute
- tool "Ada83"
- name "InOut"
- value 203)
- (object Attribute
- tool "Ada83"
- name "FunctionReturn"
- value 206)
- (object Attribute
- tool "Ada83"
- name "DoNotCreate"
- value 201)))))
- (object Attribute
- tool "Ada83"
- name "default__Has"
- value (list Attribute_Set
- (object Attribute
- tool "Ada83"
- name "CodeName"
- value "")
- (object Attribute
- tool "Ada83"
- name "NameIfUnlabeled"
- value "The_${supplier}")
- (object Attribute
- tool "Ada83"
- name "DataMemberName"
- value "${relationship}")
- (object Attribute
- tool "Ada83"
- name "GetName"
- value "Get_${relationship}")
- (object Attribute
- tool "Ada83"
- name "InlineGet"
- value TRUE)
- (object Attribute
- tool "Ada83"
- name "SetName"
- value "Set_${relationship}")
- (object Attribute
- tool "Ada83"
- name "InlineSet"
- value TRUE)
- (object Attribute
- tool "Ada83"
- name "IsConstant"
- value FALSE)
- (object Attribute
- tool "Ada83"
- name "InitialValue"
- value "")
- (object Attribute
- tool "Ada83"
- name "Variant"
- value "")
- (object Attribute
- tool "Ada83"
- name "ContainerGeneric"
- value "List")
- (object Attribute
- tool "Ada83"
- name "ContainerType"
- value "")
- (object Attribute
- tool "Ada83"
- name "ContainerDeclarations"
- value (value Text ""))
- (object Attribute
- tool "Ada83"
- name "SelectorName"
- value "")
- (object Attribute
- tool "Ada83"
- name "SelectorType"
- value "")))
- (object Attribute
- tool "Ada83"
- name "default__Attribute"
- value (list Attribute_Set
- (object Attribute
- tool "Ada83"
- name "CodeName"
- value "")
- (object Attribute
- tool "Ada83"
- name "DataMemberName"
- value "${attribute}")
- (object Attribute
- tool "Ada83"
- name "GetName"
- value "Get_${attribute}")
- (object Attribute
- tool "Ada83"
- name "InlineGet"
- value TRUE)
- (object Attribute
- tool "Ada83"
- name "SetName"
- value "Set_${attribute}")
- (object Attribute
- tool "Ada83"
- name "InlineSet"
- value TRUE)
- (object Attribute
- tool "Ada83"
- name "IsConstant"
- value FALSE)
- (object Attribute
- tool "Ada83"
- name "InitialValue"
- value "")
- (object Attribute
- tool "Ada83"
- name "Variant"
- value "")
- (object Attribute
- tool "Ada83"
- name "Representation"
- value (value Text ""))))
- (object Attribute
- tool "Ada83"
- name "default__Association"
- value (list Attribute_Set
- (object Attribute
- tool "Ada83"
- name "NameIfUnlabeled"
- value "The_${targetClass}")
- (object Attribute
- tool "Ada83"
- name "GetName"
- value "Get_${association}")
- (object Attribute
- tool "Ada83"
- name "InlineGet"
- value FALSE)
- (object Attribute
- tool "Ada83"
- name "SetName"
- value "Set_${association}")
- (object Attribute
- tool "Ada83"
- name "InlineSet"
- value FALSE)
- (object Attribute
- tool "Ada83"
- name "GenerateAssociate"
- value ("ProcedureKindSet" 202))
- (object Attribute
- tool "Ada83"
- name "AssociateName"
- value "Associate")
- (object Attribute
- tool "Ada83"
- name "InlineAssociate"
- value FALSE)
- (object Attribute
- tool "Ada83"
- name "GenerateDissociate"
- value ("ProcedureKindSet" 202))
- (object Attribute
- tool "Ada83"
- name "DissociateName"
- value "Dissociate")
- (object Attribute
- tool "Ada83"
- name "InlineDissociate"
- value FALSE)
- (object Attribute
- tool "Ada83"
- name "ProcedureKindSet"
- value (list Attribute_Set
- (object Attribute
- tool "Ada83"
- name "Procedure"
- value 202)
- (object Attribute
- tool "Ada83"
- name "DoNotCreate"
- value 201)))
- (object Attribute
- tool "Ada83"
- name "FunctionKindSet"
- value (list Attribute_Set
- (object Attribute
- tool "Ada83"
- name "Function"
- value 199)
- (object Attribute
- tool "Ada83"
- name "DoNotCreate"
- value 201)))))
- (object Attribute
- tool "Ada83"
- name "default__Role"
- value (list Attribute_Set
- (object Attribute
- tool "Ada83"
- name "CodeName"
- value "")
- (object Attribute
- tool "Ada83"
- name "NameIfUnlabeled"
- value "The_${targetClass}")
- (object Attribute
- tool "Ada83"
- name "DataMemberName"
- value "${target}")
- (object Attribute
- tool "Ada83"
- name "GetName"
- value "Get_${target}")
- (object Attribute
- tool "Ada83"
- name "InlineGet"
- value TRUE)
- (object Attribute
- tool "Ada83"
- name "SetName"
- value "Set_${target}")
- (object Attribute
- tool "Ada83"
- name "InlineSet"
- value TRUE)
- (object Attribute
- tool "Ada83"
- name "IsConstant"
- value FALSE)
- (object Attribute
- tool "Ada83"
- name "InitialValue"
- value "")
- (object Attribute
- tool "Ada83"
- name "ContainerGeneric"
- value "List")
- (object Attribute
- tool "Ada83"
- name "ContainerType"
- value "")
- (object Attribute
- tool "Ada83"
- name "ContainerDeclarations"
- value (value Text ""))
- (object Attribute
- tool "Ada83"
- name "SelectorName"
- value "")
- (object Attribute
- tool "Ada83"
- name "SelectorType"
- value "")
- (object Attribute
- tool "Ada83"
- name "ProcedureKindSet"
- value (list Attribute_Set
- (object Attribute
- tool "Ada83"
- name "Procedure"
- value 202)
- (object Attribute
- tool "Ada83"
- name "DoNotCreate"
- value 201)))))
- (object Attribute
- tool "Ada83"
- name "default__Subsystem"
- value (list Attribute_Set
- (object Attribute
- tool "Ada83"
- name "Directory"
- value "AUTO GENERATE")))
- (object Attribute
- tool "Ada83"
- name "HiddenTool"
- value FALSE)
- (object Attribute
- tool "Ada95"
- name "propertyId"
- value "838326200")
- (object Attribute
- tool "Ada95"
- name "default__Project"
- value (list Attribute_Set
- (object Attribute
- tool "Ada95"
- name "SpecFileExtension"
- value "1.ada")
- (object Attribute
- tool "Ada95"
- name "SpecFileBackupExtension"
- value "1.ad~")
- (object Attribute
- tool "Ada95"
- name "SpecFileTemporaryExtension"
- value "1.ad#")
- (object Attribute
- tool "Ada95"
- name "BodyFileExtension"
- value "2.ada")
- (object Attribute
- tool "Ada95"
- name "BodyFileBackupExtension"
- value "2.ad~")
- (object Attribute
- tool "Ada95"
- name "BodyFileTemporaryExtension"
- value "2.ad#")
- (object Attribute
- tool "Ada95"
- name "CreateMissingDirectories"
- value TRUE)
- (object Attribute
- tool "Ada95"
- name "UseColonNotation"
- value TRUE)
- (object Attribute
- tool "Ada95"
- name "GenerateBodies"
- value TRUE)
- (object Attribute
- tool "Ada95"
- name "GenerateAccessorOperations"
- value TRUE)
- (object Attribute
- tool "Ada95"
- name "GenerateStandardOperations"
- value TRUE)
- (object Attribute
- tool "Ada95"
- name "DefaultCodeBody"
- value "[statement]")
- (object Attribute
- tool "Ada95"
- name "ImplicitParameter"
- value TRUE)
- (object Attribute
- tool "Ada95"
- name "CommentWidth"
- value 60)
- (object Attribute
- tool "Ada95"
- name "StopOnError"
- value FALSE)
- (object Attribute
- tool "Ada95"
- name "ErrorLimit"
- value 30)
- (object Attribute
- tool "Ada95"
- name "UseFileName"
- value FALSE)
- (object Attribute
- tool "Ada95"
- name "Directory"
- value "$ROSEADA95_SOURCE")))
- (object Attribute
- tool "Ada95"
- name "default__Class"
- value (list Attribute_Set
- (object Attribute
- tool "Ada95"
- name "CodeName"
- value "")
- (object Attribute
- tool "Ada95"
- name "TypeName"
- value "Object")
- (object Attribute
- tool "Ada95"
- name "TypeVisibility"
- value ("TypeVisibilitySet" 43))
- (object Attribute
- tool "Ada95"
- name "TypeImplementation"
- value ("TypeImplementationSet" 208))
- (object Attribute
- tool "Ada95"
- name "TypeControl"
- value ("TypeControlSet" 225))
- (object Attribute
- tool "Ada95"
- name "TypeControlName"
- value "Controlled_${type}")
- (object Attribute
- tool "Ada95"
- name "TypeDefinition"
- value (value Text ""))
- (object Attribute
- tool "Ada95"
- name "RecordImplementation"
- value ("RecordImplementationSet" 209))
- (object Attribute
- tool "Ada95"
- name "RecordKindPackageName"
- value "${class}_Record_Kinds")
- (object Attribute
- tool "Ada95"
- name "IsLimited"
- value FALSE)
- (object Attribute
- tool "Ada95"
- name "IsSubtype"
- value FALSE)
- (object Attribute
- tool "Ada95"
- name "GenerateAccessType"
- value ("GenerateAccessTypeSet" 230))
- (object Attribute
- tool "Ada95"
- name "AccessTypeName"
- value "Handle")
- (object Attribute
- tool "Ada95"
- name "AccessTypeVisibility"
- value ("TypeVisibilitySet" 45))
- (object Attribute
- tool "Ada95"
- name "AccessTypeDefinition"
- value (value Text ""))
- (object Attribute
- tool "Ada95"
- name "AccessClassWide"
- value TRUE)
- (object Attribute
- tool "Ada95"
- name "MaybeAliased"
- value FALSE)
- (object Attribute
- tool "Ada95"
- name "ParameterizedImplementation"
- value ("ParameterizedImplementationSet" 11))
- (object Attribute
- tool "Ada95"
- name "ParentClassName"
- value "Superclass")
- (object Attribute
- tool "Ada95"
- name "EnumerationLiteralPrefix"
- value "A_")
- (object Attribute
- tool "Ada95"
- name "RecordFieldPrefix"
- value "The_")
- (object Attribute
- tool "Ada95"
- name "ArrayOfTypeName"
- value "Array_Of_${type}")
- (object Attribute
- tool "Ada95"
- name "AccessArrayOfTypeName"
- value "Access_Array_Of_${type}")
- (object Attribute
- tool "Ada95"
- name "ArrayOfAccessTypeName"
- value "Array_Of_${access_type}")
- (object Attribute
- tool "Ada95"
- name "AccessArrayOfAccessTypeName"
- value "Access_Array_Of_${access_type}")
- (object Attribute
- tool "Ada95"
- name "ArrayIndexDefinition"
- value "Positive range <>")
- (object Attribute
- tool "Ada95"
- name "GenerateAccessorOperations"
- value TRUE)
- (object Attribute
- tool "Ada95"
- name "GenerateStandardOperations"
- value TRUE)
- (object Attribute
- tool "Ada95"
- name "ImplicitParameter"
- value TRUE)
- (object Attribute
- tool "Ada95"
- name "ImplicitParameterName"
- value "This")
- (object Attribute
- tool "Ada95"
- name "GenerateDefaultConstructor"
- value ("SubprogramKindSet" 199))
- (object Attribute
- tool "Ada95"
- name "DefaultConstructorName"
- value "Create")
- (object Attribute
- tool "Ada95"
- name "InlineDefaultConstructor"
- value FALSE)
- (object Attribute
- tool "Ada95"
- name "GenerateCopyConstructor"
- value ("SubprogramKindSet" 199))
- (object Attribute
- tool "Ada95"
- name "CopyConstructorName"
- value "Copy")
- (object Attribute
- tool "Ada95"
- name "InlineCopyConstructor"
- value FALSE)
- (object Attribute
- tool "Ada95"
- name "GenerateDestructor"
- value ("ProcedureKindSet" 202))
- (object Attribute
- tool "Ada95"
- name "DestructorName"
- value "Free")
- (object Attribute
- tool "Ada95"
- name "InlineDestructor"
- value FALSE)
- (object Attribute
- tool "Ada95"
- name "GenerateTypeEquality"
- value ("FunctionKindSet" 201))
- (object Attribute
- tool "Ada95"
- name "TypeEqualityName"
- value "${quote}=${quote}")
- (object Attribute
- tool "Ada95"
- name "InlineEquality"
- value FALSE)
- (object Attribute
- tool "Ada95"
- name "Representation"
- value (value Text ""))
- (object Attribute
- tool "Ada95"
- name "TypeImplementationSet"
- value (list Attribute_Set
- (object Attribute
- tool "Ada95"
- name "Tagged"
- value 208)
- (object Attribute
- tool "Ada95"
- name "Record"
- value 210)
- (object Attribute
- tool "Ada95"
- name "Mixin"
- value 211)
- (object Attribute
- tool "Ada95"
- name "Protected"
- value 44)
- (object Attribute
- tool "Ada95"
- name "Task"
- value 212)))
- (object Attribute
- tool "Ada95"
- name "RecordImplementationSet"
- value (list Attribute_Set
- (object Attribute
- tool "Ada95"
- name "SingleType"
- value 209)
- (object Attribute
- tool "Ada95"
- name "MultipleTypes"
- value 213)))
- (object Attribute
- tool "Ada95"
- name "ParameterizedImplementationSet"
- value (list Attribute_Set
- (object Attribute
- tool "Ada95"
- name "Generic"
- value 11)
- (object Attribute
- tool "Ada95"
- name "Unconstrained"
- value 214)))
- (object Attribute
- tool "Ada95"
- name "TypeVisibilitySet"
- value (list Attribute_Set
- (object Attribute
- tool "Ada95"
- name "Public"
- value 45)
- (object Attribute
- tool "Ada95"
- name "Private"
- value 43)))
- (object Attribute
- tool "Ada95"
- name "SubprogramKindSet"
- value (list Attribute_Set
- (object Attribute
- tool "Ada95"
- name "Procedure"
- value 202)
- (object Attribute
- tool "Ada95"
- name "Function"
- value 199)
- (object Attribute
- tool "Ada95"
- name "DoNotCreate"
- value 201)))
- (object Attribute
- tool "Ada95"
- name "ProcedureKindSet"
- value (list Attribute_Set
- (object Attribute
- tool "Ada95"
- name "Procedure"
- value 202)
- (object Attribute
- tool "Ada95"
- name "DoNotCreate"
- value 201)))
- (object Attribute
- tool "Ada95"
- name "FunctionKindSet"
- value (list Attribute_Set
- (object Attribute
- tool "Ada95"
- name "Function"
- value 199)
- (object Attribute
- tool "Ada95"
- name "DoNotCreate"
- value 201)))
- (object Attribute
- tool "Ada95"
- name "TypeControlSet"
- value (list Attribute_Set
- (object Attribute
- tool "Ada95"
- name "None"
- value 225)
- (object Attribute
- tool "Ada95"
- name "InitializationOnly"
- value 226)
- (object Attribute
- tool "Ada95"
- name "AssignmentFinalizationOnly"
- value 227)
- (object Attribute
- tool "Ada95"
- name "All"
- value 228)))
- (object Attribute
- tool "Ada95"
- name "GenerateAccessTypeSet"
- value (list Attribute_Set
- (object Attribute
- tool "Ada95"
- name "Always"
- value 229)
- (object Attribute
- tool "Ada95"
- name "Auto"
- value 230)))))
- (object Attribute
- tool "Ada95"
- name "default__Module-Spec"
- value (list Attribute_Set
- (object Attribute
- tool "Ada95"
- name "Generate"
- value TRUE)
- (object Attribute
- tool "Ada95"
- name "CopyrightNotice"
- value (value Text ""))
- (object Attribute
- tool "Ada95"
- name "FileName"
- value "")
- (object Attribute
- tool "Ada95"
- name "ReturnType"
- value "")
- (object Attribute
- tool "Ada95"
- name "GenericFormalParameters"
- value (value Text ""))
- (object Attribute
- tool "Ada95"
- name "AdditionalWiths"
- value (value Text ""))
- (object Attribute
- tool "Ada95"
- name "IsPrivate"
- value FALSE)))
- (object Attribute
- tool "Ada95"
- name "default__Module-Body"
- value (list Attribute_Set
- (object Attribute
- tool "Ada95"
- name "Generate"
- value TRUE)
- (object Attribute
- tool "Ada95"
- name "CopyrightNotice"
- value (value Text ""))
- (object Attribute
- tool "Ada95"
- name "FileName"
- value "")
- (object Attribute
- tool "Ada95"
- name "ReturnType"
- value "")
- (object Attribute
- tool "Ada95"
- name "AdditionalWiths"
- value (value Text ""))
- (object Attribute
- tool "Ada95"
- name "IsSubunit"
- value FALSE)))
- (object Attribute
- tool "Ada95"
- name "default__Operation"
- value (list Attribute_Set
- (object Attribute
- tool "Ada95"
- name "CodeName"
- value "")
- (object Attribute
- tool "Ada95"
- name "SubprogramImplementation"
- value ("SubprogramImplementationSet" 2))
- (object Attribute
- tool "Ada95"
- name "Renames"
- value "")
- (object Attribute
- tool "Ada95"
- name "GenerateOverriding"
- value TRUE)
- (object Attribute
- tool "Ada95"
- name "ImplicitParameterMode"
- value ("ParameterModeSet" 203))
- (object Attribute
- tool "Ada95"
- name "ImplicitParameterClassWide"
- value FALSE)
- (object Attribute
- tool "Ada95"
- name "GenerateAccessOperation"
- value FALSE)
- (object Attribute
- tool "Ada95"
- name "Inline"
- value FALSE)
- (object Attribute
- tool "Ada95"
- name "EntryCode"
- value (value Text ""))
- (object Attribute
- tool "Ada95"
- name "ExitCode"
- value (value Text ""))
- (object Attribute
- tool "Ada95"
- name "InitialCodeBody"
- value "${default}")
- (object Attribute
- tool "Ada95"
- name "EntryBarrierCondition"
- value "True")
- (object Attribute
- tool "Ada95"
- name "Representation"
- value (value Text ""))
- (object Attribute
- tool "Ada95"
- name "SubprogramImplementationSet"
- value (list Attribute_Set
- (object Attribute
- tool "Ada95"
- name "Spec"
- value 224)
- (object Attribute
- tool "Ada95"
- name "Body"
- value 2)
- (object Attribute
- tool "Ada95"
- name "Abstract"
- value 221)
- (object Attribute
- tool "Ada95"
- name "Renaming"
- value 222)
- (object Attribute
- tool "Ada95"
- name "RenamingAsBody"
- value 231)
- (object Attribute
- tool "Ada95"
- name "Separate"
- value 223)))
- (object Attribute
- tool "Ada95"
- name "ParameterModeSet"
- value (list Attribute_Set
- (object Attribute
- tool "Ada95"
- name "In"
- value 204)
- (object Attribute
- tool "Ada95"
- name "Out"
- value 205)
- (object Attribute
- tool "Ada95"
- name "InOut"
- value 203)
- (object Attribute
- tool "Ada95"
- name "Access"
- value 220)
- (object Attribute
- tool "Ada95"
- name "DoNotCreate"
- value 201)))))
- (object Attribute
- tool "Ada95"
- name "default__Has"
- value (list Attribute_Set
- (object Attribute
- tool "Ada95"
- name "CodeName"
- value "")
- (object Attribute
- tool "Ada95"
- name "NameIfUnlabeled"
- value "The_${supplier}")
- (object Attribute
- tool "Ada95"
- name "RecordFieldImplementation"
- value ("RecordFieldImplementationSet" 216))
- (object Attribute
- tool "Ada95"
- name "RecordFieldName"
- value "${relationship}")
- (object Attribute
- tool "Ada95"
- name "GenerateGet"
- value ("FunctionKindSet" 199))
- (object Attribute
- tool "Ada95"
- name "GenerateAccessGet"
- value ("FunctionKindSet" 201))
- (object Attribute
- tool "Ada95"
- name "GetName"
- value "Get_${relationship}")
- (object Attribute
- tool "Ada95"
- name "InlineGet"
- value TRUE)
- (object Attribute
- tool "Ada95"
- name "GenerateSet"
- value ("ProcedureKindSet" 202))
- (object Attribute
- tool "Ada95"
- name "GenerateAccessSet"
- value ("ProcedureKindSet" 201))
- (object Attribute
- tool "Ada95"
- name "SetName"
- value "Set_${relationship}")
- (object Attribute
- tool "Ada95"
- name "InlineSet"
- value TRUE)
- (object Attribute
- tool "Ada95"
- name "IsAliased"
- value FALSE)
- (object Attribute
- tool "Ada95"
- name "IsConstant"
- value FALSE)
- (object Attribute
- tool "Ada95"
- name "InitialValue"
- value "")
- (object Attribute
- tool "Ada95"
- name "ContainerImplementation"
- value ("ContainerImplementationSet" 217))
- (object Attribute
- tool "Ada95"
- name "ContainerGeneric"
- value "List")
- (object Attribute
- tool "Ada95"
- name "ContainerType"
- value "")
- (object Attribute
- tool "Ada95"
- name "ContainerDeclarations"
- value (value Text ""))
- (object Attribute
- tool "Ada95"
- name "SelectorName"
- value "")
- (object Attribute
- tool "Ada95"
- name "SelectorType"
- value "")
- (object Attribute
- tool "Ada95"
- name "RecordFieldImplementationSet"
- value (list Attribute_Set
- (object Attribute
- tool "Ada95"
- name "Component"
- value 216)
- (object Attribute
- tool "Ada95"
- name "Discriminant"
- value 218)
- (object Attribute
- tool "Ada95"
- name "AccessDiscriminant"
- value 219)))
- (object Attribute
- tool "Ada95"
- name "ContainerImplementationSet"
- value (list Attribute_Set
- (object Attribute
- tool "Ada95"
- name "Array"
- value 217)
- (object Attribute
- tool "Ada95"
- name "Generic"
- value 11)))
- (object Attribute
- tool "Ada95"
- name "ProcedureKindSet"
- value (list Attribute_Set
- (object Attribute
- tool "Ada95"
- name "Procedure"
- value 202)
- (object Attribute
- tool "Ada95"
- name "DoNotCreate"
- value 201)))
- (object Attribute
- tool "Ada95"
- name "FunctionKindSet"
- value (list Attribute_Set
- (object Attribute
- tool "Ada95"
- name "Function"
- value 199)
- (object Attribute
- tool "Ada95"
- name "DoNotCreate"
- value 201)))))
- (object Attribute
- tool "Ada95"
- name "default__Attribute"
- value (list Attribute_Set
- (object Attribute
- tool "Ada95"
- name "CodeName"
- value "")
- (object Attribute
- tool "Ada95"
- name "RecordFieldImplementation"
- value ("RecordFieldImplementationSet" 216))
- (object Attribute
- tool "Ada95"
- name "RecordFieldName"
- value "${attribute}")
- (object Attribute
- tool "Ada95"
- name "GenerateGet"
- value ("FunctionKindSet" 199))
- (object Attribute
- tool "Ada95"
- name "GenerateAccessGet"
- value ("FunctionKindSet" 201))
- (object Attribute
- tool "Ada95"
- name "GetName"
- value "Get_${attribute}")
- (object Attribute
- tool "Ada95"
- name "InlineGet"
- value TRUE)
- (object Attribute
- tool "Ada95"
- name "GenerateSet"
- value ("ProcedureKindSet" 202))
- (object Attribute
- tool "Ada95"
- name "GenerateAccessSet"
- value ("ProcedureKindSet" 201))
- (object Attribute
- tool "Ada95"
- name "SetName"
- value "Set_${attribute}")
- (object Attribute
- tool "Ada95"
- name "InlineSet"
- value TRUE)
- (object Attribute
- tool "Ada95"
- name "IsAliased"
- value FALSE)
- (object Attribute
- tool "Ada95"
- name "IsConstant"
- value FALSE)
- (object Attribute
- tool "Ada95"
- name "InitialValue"
- value "")
- (object Attribute
- tool "Ada95"
- name "Representation"
- value (value Text ""))
- (object Attribute
- tool "Ada95"
- name "RecordFieldImplementationSet"
- value (list Attribute_Set
- (object Attribute
- tool "Ada95"
- name "Component"
- value 216)
- (object Attribute
- tool "Ada95"
- name "Discriminant"
- value 218)
- (object Attribute
- tool "Ada95"
- name "AccessDiscriminant"
- value 219)))
- (object Attribute
- tool "Ada95"
- name "ProcedureKindSet"
- value (list Attribute_Set
- (object Attribute
- tool "Ada95"
- name "Procedure"
- value 202)
- (object Attribute
- tool "Ada95"
- name "DoNotCreate"
- value 201)))
- (object Attribute
- tool "Ada95"
- name "FunctionKindSet"
- value (list Attribute_Set
- (object Attribute
- tool "Ada95"
- name "Function"
- value 199)
- (object Attribute
- tool "Ada95"
- name "DoNotCreate"
- value 201)))))
- (object Attribute
- tool "Ada95"
- name "default__Association"
- value (list Attribute_Set
- (object Attribute
- tool "Ada95"
- name "NameIfUnlabeled"
- value "The_${targetClass}")
- (object Attribute
- tool "Ada95"
- name "GenerateGet"
- value ("FunctionKindSet" 199))
- (object Attribute
- tool "Ada95"
- name "GetName"
- value "Get_${association}")
- (object Attribute
- tool "Ada95"
- name "InlineGet"
- value FALSE)
- (object Attribute
- tool "Ada95"
- name "GenerateSet"
- value ("ProcedureKindSet" 202))
- (object Attribute
- tool "Ada95"
- name "SetName"
- value "Set_${association}")
- (object Attribute
- tool "Ada95"
- name "InlineSet"
- value FALSE)
- (object Attribute
- tool "Ada95"
- name "GenerateAssociate"
- value ("ProcedureKindSet" 202))
- (object Attribute
- tool "Ada95"
- name "AssociateName"
- value "Associate")
- (object Attribute
- tool "Ada95"
- name "InlineAssociate"
- value FALSE)
- (object Attribute
- tool "Ada95"
- name "GenerateDissociate"
- value ("ProcedureKindSet" 202))
- (object Attribute
- tool "Ada95"
- name "DissociateName"
- value "Dissociate")
- (object Attribute
- tool "Ada95"
- name "InlineDissociate"
- value FALSE)
- (object Attribute
- tool "Ada95"
- name "ProcedureKindSet"
- value (list Attribute_Set
- (object Attribute
- tool "Ada95"
- name "Procedure"
- value 202)
- (object Attribute
- tool "Ada95"
- name "DoNotCreate"
- value 201)))
- (object Attribute
- tool "Ada95"
- name "FunctionKindSet"
- value (list Attribute_Set
- (object Attribute
- tool "Ada95"
- name "Function"
- value 199)
- (object Attribute
- tool "Ada95"
- name "DoNotCreate"
- value 201)))))
- (object Attribute
- tool "Ada95"
- name "default__Role"
- value (list Attribute_Set
- (object Attribute
- tool "Ada95"
- name "CodeName"
- value "")
- (object Attribute
- tool "Ada95"
- name "NameIfUnlabeled"
- value "The_${targetClass}")
- (object Attribute
- tool "Ada95"
- name "RecordFieldImplementation"
- value ("RecordFieldImplementationSet" 216))
- (object Attribute
- tool "Ada95"
- name "RecordFieldName"
- value "${target}")
- (object Attribute
- tool "Ada95"
- name "GenerateGet"
- value ("FunctionKindSet" 199))
- (object Attribute
- tool "Ada95"
- name "GenerateAccessGet"
- value ("FunctionKindSet" 201))
- (object Attribute
- tool "Ada95"
- name "GetName"
- value "Get_${target}")
- (object Attribute
- tool "Ada95"
- name "InlineGet"
- value TRUE)
- (object Attribute
- tool "Ada95"
- name "GenerateSet"
- value ("ProcedureKindSet" 202))
- (object Attribute
- tool "Ada95"
- name "GenerateAccessSet"
- value ("ProcedureKindSet" 201))
- (object Attribute
- tool "Ada95"
- name "SetName"
- value "Set_${target}")
- (object Attribute
- tool "Ada95"
- name "InlineSet"
- value TRUE)
- (object Attribute
- tool "Ada95"
- name "IsAliased"
- value FALSE)
- (object Attribute
- tool "Ada95"
- name "IsConstant"
- value FALSE)
- (object Attribute
- tool "Ada95"
- name "InitialValue"
- value "")
- (object Attribute
- tool "Ada95"
- name "ContainerImplementation"
- value ("ContainerImplementationSet" 217))
- (object Attribute
- tool "Ada95"
- name "ContainerGeneric"
- value "List")
- (object Attribute
- tool "Ada95"
- name "ContainerType"
- value "")
- (object Attribute
- tool "Ada95"
- name "ContainerDeclarations"
- value (value Text ""))
- (object Attribute
- tool "Ada95"
- name "SelectorName"
- value "")
- (object Attribute
- tool "Ada95"
- name "SelectorType"
- value "")
- (object Attribute
- tool "Ada95"
- name "ProcedureKindSet"
- value (list Attribute_Set
- (object Attribute
- tool "Ada95"
- name "Procedure"
- value 202)
- (object Attribute
- tool "Ada95"
- name "DoNotCreate"
- value 201)))
- (object Attribute
- tool "Ada95"
- name "RecordFieldImplementationSet"
- value (list Attribute_Set
- (object Attribute
- tool "Ada95"
- name "Component"
- value 216)
- (object Attribute
- tool "Ada95"
- name "Discriminant"
- value 218)
- (object Attribute
- tool "Ada95"
- name "AccessDiscriminant"
- value 219)))
- (object Attribute
- tool "Ada95"
- name "ContainerImplementationSet"
- value (list Attribute_Set
- (object Attribute
- tool "Ada95"
- name "Array"
- value 217)
- (object Attribute
- tool "Ada95"
- name "Generic"
- value 11)))
- (object Attribute
- tool "Ada95"
- name "FunctionKindSet"
- value (list Attribute_Set
- (object Attribute
- tool "Ada95"
- name "Function"
- value 199)
- (object Attribute
- tool "Ada95"
- name "DoNotCreate"
- value 201)))))
- (object Attribute
- tool "Ada95"
- name "default__Subsystem"
- value (list Attribute_Set
- (object Attribute
- tool "Ada95"
- name "Directory"
- value "AUTO GENERATE")))
- (object Attribute
- tool "Ada95"
- name "HiddenTool"
- value FALSE)
- (object Attribute
- tool "CORBA"
- name "propertyId"
- value "809135966")
- (object Attribute
- tool "CORBA"
- name "default__Project"
- value (list Attribute_Set
- (object Attribute
- tool "CORBA"
- name "CreateMissingDirectories"
- value TRUE)
- (object Attribute
- tool "CORBA"
- name "Editor"
- value ("EditorType" 100))
- (object Attribute
- tool "CORBA"
- name "IncludePath"
- value "")
- (object Attribute
- tool "CORBA"
- name "StopOnError"
- value TRUE)
- (object Attribute
- tool "CORBA"
- name "EditorType"
- value (list Attribute_Set
- (object Attribute
- tool "CORBA"
- name "BuiltIn"
- value 100)
- (object Attribute
- tool "CORBA"
- name "WindowsShell"
- value 101)))
- (object Attribute
- tool "CORBA"
- name "PathSeparator"
- value "")))
- (object Attribute
- tool "CORBA"
- name "default__Class"
- value (list Attribute_Set
- (object Attribute
- tool "CORBA"
- name "ArrayDimensions"
- value "")
- (object Attribute
- tool "CORBA"
- name "ConstValue"
- value "")
- (object Attribute
- tool "CORBA"
- name "ImplementationType"
- value "")))
- (object Attribute
- tool "CORBA"
- name "default__Module-Spec"
- value (list Attribute_Set
- (object Attribute
- tool "CORBA"
- name "AdditionalIncludes"
- value (value Text ""))
- (object Attribute
- tool "CORBA"
- name "CmIdentification"
- value (value Text " %X% %Q% %Z% %W%"))
- (object Attribute
- tool "CORBA"
- name "CopyrightNotice"
- value (value Text ""))
- (object Attribute
- tool "CORBA"
- name "InclusionProtectionSymbol"
- value "AUTO GENERATE")))
- (object Attribute
- tool "CORBA"
- name "default__Module-Body"
- value (list Attribute_Set
- (object Attribute
- tool "CORBA"
- name "AdditionalIncludes"
- value (value Text ""))
- (object Attribute
- tool "CORBA"
- name "CmIdentification"
- value (value Text " %X% %Q% %Z% %W%"))
- (object Attribute
- tool "CORBA"
- name "CopyrightNotice"
- value (value Text ""))
- (object Attribute
- tool "CORBA"
- name "InclusionProtectionSymbol"
- value "AUTO GENERATE")))
- (object Attribute
- tool "CORBA"
- name "default__Operation"
- value (list Attribute_Set
- (object Attribute
- tool "CORBA"
- name "Context"
- value "")
- (object Attribute
- tool "CORBA"
- name "OperationIsOneWay"
- value FALSE)))
- (object Attribute
- tool "CORBA"
- name "default__Attribute"
- value (list Attribute_Set
- (object Attribute
- tool "CORBA"
- name "ArrayDimensions"
- value "")
- (object Attribute
- tool "CORBA"
- name "CaseSpecifier"
- value "")
- (object Attribute
- tool "CORBA"
- name "IsReadOnly"
- value FALSE)
- (object Attribute
- tool "CORBA"
- name "Order"
- value "")))
- (object Attribute
- tool "CORBA"
- name "default__Role"
- value (list Attribute_Set
- (object Attribute
- tool "CORBA"
- name "ArrayDimensions"
- value "")
- (object Attribute
- tool "CORBA"
- name "CaseSpecifier"
- value "")
- (object Attribute
- tool "CORBA"
- name "GenerateForwardReference"
- value FALSE)
- (object Attribute
- tool "CORBA"
- name "IsReadOnly"
- value FALSE)
- (object Attribute
- tool "CORBA"
- name "Order"
- value "")
- (object Attribute
- tool "CORBA"
- name "BoundedRoleType"
- value ("AssocTypeSet" 47))
- (object Attribute
- tool "CORBA"
- name "AssocTypeSet"
- value (list Attribute_Set
- (object Attribute
- tool "CORBA"
- name "Array"
- value 24)
- (object Attribute
- tool "CORBA"
- name "Sequence"
- value 47)))))
- (object Attribute
- tool "CORBA"
- name "default__Uses"
- value (list Attribute_Set
- (object Attribute
- tool "CORBA"
- name "GenerateForwardReference"
- value FALSE)))
- (object Attribute
- tool "CORBA"
- name "HiddenTool"
- value FALSE)
- (object Attribute
- tool "ClearCase"
- name "HiddenTool"
- value FALSE)
- (object Attribute
- tool "Data Modeler"
- name "propertyId"
- value "809135966")
- (object Attribute
- tool "Data Modeler"
- name "default__Project"
- value (list Attribute_Set
- (object Attribute
- tool "Data Modeler"
- name "project"
- value "")
- (object Attribute
- tool "Data Modeler"
- name "TableCounter"
- value 0)
- (object Attribute
- tool "Data Modeler"
- name "ViewCounter"
- value 0)
- (object Attribute
- tool "Data Modeler"
- name "DomainCounter"
- value 0)
- (object Attribute
- tool "Data Modeler"
- name "SPPackageCounter"
- value 0)
- (object Attribute
- tool "Data Modeler"
- name "TriggerCounter"
- value 0)
- (object Attribute
- tool "Data Modeler"
- name "IndexCounter"
- value 0)
- (object Attribute
- tool "Data Modeler"
- name "ConstraintCounter"
- value 0)
- (object Attribute
- tool "Data Modeler"
- name "StoreProcedureCounter"
- value 0)
- (object Attribute
- tool "Data Modeler"
- name "PrimaryKeyCounter"
- value 0)
- (object Attribute
- tool "Data Modeler"
- name "ForeignKeyCounter"
- value 0)
- (object Attribute
- tool "Data Modeler"
- name "JoinCounter"
- value 0)
- (object Attribute
- tool "Data Modeler"
- name "TableSpaceCounter"
- value 0)
- (object Attribute
- tool "Data Modeler"
- name "cONTAINERCounter"
- value 0)
- (object Attribute
- tool "Data Modeler"
- name "TablePrefix"
- value "")
- (object Attribute
- tool "Data Modeler"
- name "ViewPrefix"
- value "")
- (object Attribute
- tool "Data Modeler"
- name "DomainPrefix"
- value "")
- (object Attribute
- tool "Data Modeler"
- name "TriggerPrefix"
- value "")
- (object Attribute
- tool "Data Modeler"
- name "IndexPrefix"
- value "")
- (object Attribute
- tool "Data Modeler"
- name "ConstraintPrefix"
- value "")
- (object Attribute
- tool "Data Modeler"
- name "StoreProcedurePrefix"
- value "")
- (object Attribute
- tool "Data Modeler"
- name "PrimaryKeyPrefix"
- value "")
- (object Attribute
- tool "Data Modeler"
- name "ForeignKeyPrefix"
- value "")
- (object Attribute
- tool "Data Modeler"
- name "TableSpacePrefix"
- value "")))
- (object Attribute
- tool "Data Modeler"
- name "default__Module-Spec"
- value (list Attribute_Set
- (object Attribute
- tool "Data Modeler"
- name "dmItem"
- value FALSE)
- (object Attribute
- tool "Data Modeler"
- name "DMName"
- value "")
- (object Attribute
- tool "Data Modeler"
- name "IsDatabase"
- value FALSE)
- (object Attribute
- tool "Data Modeler"
- name "TargetDatabase"
- value "")
- (object Attribute
- tool "Data Modeler"
- name "Location"
- value "")
- (object Attribute
- tool "Data Modeler"
- name "IsTableSpace"
- value FALSE)
- (object Attribute
- tool "Data Modeler"
- name "TableSpaceType"
- value "")
- (object Attribute
- tool "Data Modeler"
- name "IsDeault"
- value FALSE)
- (object Attribute
- tool "Data Modeler"
- name "BufferPool"
- value "")
- (object Attribute
- tool "Data Modeler"
- name "ExtentSize"
- value 1)
- (object Attribute
- tool "Data Modeler"
- name "PrefetchSize"
- value 1)
- (object Attribute
- tool "Data Modeler"
- name "PageSize"
- value 4)
- (object Attribute
- tool "Data Modeler"
- name "ManagedBy"
- value "")
- (object Attribute
- tool "Data Modeler"
- name "ContainerList"
- value "")))
- (object Attribute
- tool "Data Modeler"
- name "default__Category"
- value (list Attribute_Set
- (object Attribute
- tool "Data Modeler"
- name "dmItem"
- value FALSE)
- (object Attribute
- tool "Data Modeler"
- name "DMName"
- value "")
- (object Attribute
- tool "Data Modeler"
- name "dmSchema"
- value "")
- (object Attribute
- tool "Data Modeler"
- name "dmDomainPackage"
- value "")
- (object Attribute
- tool "Data Modeler"
- name "IsSchema"
- value FALSE)
- (object Attribute
- tool "Data Modeler"
- name "IsDomainPackage"
- value FALSE)
- (object Attribute
- tool "Data Modeler"
- name "IsRootSchema"
- value FALSE)
- (object Attribute
- tool "Data Modeler"
- name "IsRootDomainPackage"
- value FALSE)
- (object Attribute
- tool "Data Modeler"
- name "IsSchemaPackage"
- value FALSE)
- (object Attribute
- tool "Data Modeler"
- name "DatabaseID"
- value "")
- (object Attribute
- tool "Data Modeler"
- name "DBMS"
- value "")))
- (object Attribute
- tool "Data Modeler"
- name "default__Class"
- value (list Attribute_Set
- (object Attribute
- tool "Data Modeler"
- name "dmItem"
- value FALSE)
- (object Attribute
- tool "Data Modeler"
- name "DMName"
- value "")
- (object Attribute
- tool "Data Modeler"
- name "IsTable"
- value FALSE)
- (object Attribute
- tool "Data Modeler"
- name "IsView"
- value FALSE)
- (object Attribute
- tool "Data Modeler"
- name "IsDomain"
- value FALSE)
- (object Attribute
- tool "Data Modeler"
- name "IsSPPackage"
- value FALSE)
- (object Attribute
- tool "Data Modeler"
- name "Synonymns"
- value "")
- (object Attribute
- tool "Data Modeler"
- name "TableSpaceID"
- value "")
- (object Attribute
- tool "Data Modeler"
- name "SourceId"
- value "")
- (object Attribute
- tool "Data Modeler"
- name "SourceType"
- value "")
- (object Attribute
- tool "Data Modeler"
- name "CorrelationName"
- value "")
- (object Attribute
- tool "Data Modeler"
- name "SelectClause"
- value "")
- (object Attribute
- tool "Data Modeler"
- name "IsUpdateable"
- value TRUE)
- (object Attribute
- tool "Data Modeler"
- name "CheckOption"
- value 0)
- (object Attribute
- tool "Data Modeler"
- name "IsSnapShot"
- value FALSE)
- (object Attribute
- tool "Data Modeler"
- name "IsDistinct"
- value FALSE)
- (object Attribute
- tool "Data Modeler"
- name "PersistToServer"
- value "")
- (object Attribute
- tool "Data Modeler"
- name "IsPackage"
- value FALSE)
- (object Attribute
- tool "Data Modeler"
- name "TableSpace"
- value "")
- (object Attribute
- tool "Data Modeler"
- name "IsUpdatable"
- value FALSE)))
- (object Attribute
- tool "Data Modeler"
- name "default__Attribute"
- value (list Attribute_Set
- (object Attribute
- tool "Data Modeler"
- name "dmItem"
- value FALSE)
- (object Attribute
- tool "Data Modeler"
- name "DMName"
- value "")
- (object Attribute
- tool "Data Modeler"
- name "Ordinal"
- value 0)
- (object Attribute
- tool "Data Modeler"
- name "IsIdentity"
- value FALSE)
- (object Attribute
- tool "Data Modeler"
- name "IsUnique"
- value FALSE)
- (object Attribute
- tool "Data Modeler"
- name "NullsAllowed"
- value FALSE)
- (object Attribute
- tool "Data Modeler"
- name "Length"
- value 0)
- (object Attribute
- tool "Data Modeler"
- name "Scale"
- value 0)
- (object Attribute
- tool "Data Modeler"
- name "ColumnType"
- value "Native")
- (object Attribute
- tool "Data Modeler"
- name "ForBitData"
- value FALSE)
- (object Attribute
- tool "Data Modeler"
- name "DefaultValueType"
- value "")
- (object Attribute
- tool "Data Modeler"
- name "DefaultValue"
- value "")
- (object Attribute
- tool "Data Modeler"
- name "SourceId"
- value "")
- (object Attribute
- tool "Data Modeler"
- name "SourceType"
- value "")
- (object Attribute
- tool "Data Modeler"
- name "OID"
- value FALSE)))
- (object Attribute
- tool "Data Modeler"
- name "default__Association"
- value (list Attribute_Set
- (object Attribute
- tool "Data Modeler"
- name "dmItem"
- value FALSE)
- (object Attribute
- tool "Data Modeler"
- name "DMName"
- value "")
- (object Attribute
- tool "Data Modeler"
- name "IsRelationship"
- value FALSE)
- (object Attribute
- tool "Data Modeler"
- name "SourceId"
- value "")
- (object Attribute
- tool "Data Modeler"
- name "SourceType"
- value "")
- (object Attribute
- tool "Data Modeler"
- name "RIMethod"
- value "")
- (object Attribute
- tool "Data Modeler"
- name "ParentUpdateRule"
- value "")
- (object Attribute
- tool "Data Modeler"
- name "ParentUpdateRuleName"
- value "")
- (object Attribute
- tool "Data Modeler"
- name "ParentDeleteRule"
- value "")
- (object Attribute
- tool "Data Modeler"
- name "ParentDeleteRuleName"
- value "")
- (object Attribute
- tool "Data Modeler"
- name "ChildInsertRestrict"
- value FALSE)
- (object Attribute
- tool "Data Modeler"
- name "ChildInsertRestrictName"
- value "")
- (object Attribute
- tool "Data Modeler"
- name "ChildMultiplicity"
- value FALSE)
- (object Attribute
- tool "Data Modeler"
- name "ChildMultiplicityName"
- value "")))
- (object Attribute
- tool "Data Modeler"
- name "default__Role"
- value (list Attribute_Set
- (object Attribute
- tool "Data Modeler"
- name "dmItem"
- value FALSE)
- (object Attribute
- tool "Data Modeler"
- name "DMName"
- value "")
- (object Attribute
- tool "Data Modeler"
- name "ConstraintName"
- value "")))
- (object Attribute
- tool "Data Modeler"
- name "default__Operation"
- value (list Attribute_Set
- (object Attribute
- tool "Data Modeler"
- name "dmItem"
- value FALSE)
- (object Attribute
- tool "Data Modeler"
- name "DMName"
- value "")
- (object Attribute
- tool "Data Modeler"
- name "IsConstraint"
- value FALSE)
- (object Attribute
- tool "Data Modeler"
- name "ConstraintType"
- value "")
- (object Attribute
- tool "Data Modeler"
- name "IsIndex"
- value FALSE)
- (object Attribute
- tool "Data Modeler"
- name "IsTrigger"
- value FALSE)
- (object Attribute
- tool "Data Modeler"
- name "IsStoredProcedure"
- value FALSE)
- (object Attribute
- tool "Data Modeler"
- name "IsCluster"
- value FALSE)
- (object Attribute
- tool "Data Modeler"
- name "TableSpace"
- value "")
- (object Attribute
- tool "Data Modeler"
- name "FillFactor"
- value 0)
- (object Attribute
- tool "Data Modeler"
- name "KeyList"
- value "")
- (object Attribute
- tool "Data Modeler"
- name "CheckPredicate"
- value "")
- (object Attribute
- tool "Data Modeler"
- name "IsUnique"
- value FALSE)
- (object Attribute
- tool "Data Modeler"
- name "DeferalMode"
- value "")
- (object Attribute
- tool "Data Modeler"
- name "InitialCheckTime"
- value "")
- (object Attribute
- tool "Data Modeler"
- name "TriggerType"
- value "")
- (object Attribute
- tool "Data Modeler"
- name "IsInsertEvent"
- value FALSE)
- (object Attribute
- tool "Data Modeler"
- name "IsUpdateEvent"
- value FALSE)
- (object Attribute
- tool "Data Modeler"
- name "IsDeleteEvent"
- value FALSE)
- (object Attribute
- tool "Data Modeler"
- name "RefOldTable"
- value "")
- (object Attribute
- tool "Data Modeler"
- name "RefNewTable"
- value "")
- (object Attribute
- tool "Data Modeler"
- name "RefOldRow"
- value "")
- (object Attribute
- tool "Data Modeler"
- name "RefNewRow"
- value "")
- (object Attribute
- tool "Data Modeler"
- name "IsRow"
- value FALSE)
- (object Attribute
- tool "Data Modeler"
- name "WhenClause"
- value "")
- (object Attribute
- tool "Data Modeler"
- name "Language"
- value "SQL")
- (object Attribute
- tool "Data Modeler"
- name "ProcType"
- value "Procedure")
- (object Attribute
- tool "Data Modeler"
- name "IsDeterministic"
- value FALSE)
- (object Attribute
- tool "Data Modeler"
- name "ParameterStyle"
- value "")
- (object Attribute
- tool "Data Modeler"
- name "ReturnedNull"
- value FALSE)
- (object Attribute
- tool "Data Modeler"
- name "ExternalName"
- value "")
- (object Attribute
- tool "Data Modeler"
- name "Length"
- value "")
- (object Attribute
- tool "Data Modeler"
- name "Scale"
- value "")
- (object Attribute
- tool "Data Modeler"
- name "ForBitData"
- value FALSE)
- (object Attribute
- tool "Data Modeler"
- name "DefaultValue"
- value "")
- (object Attribute
- tool "Data Modeler"
- name "DefaultValueType"
- value "")))
- (object Attribute
- tool "Data Modeler"
- name "default__Parameter"
- value (list Attribute_Set
- (object Attribute
- tool "Data Modeler"
- name "dmItem"
- value FALSE)
- (object Attribute
- tool "Data Modeler"
- name "DMName"
- value "")
- (object Attribute
- tool "Data Modeler"
- name "IsInParameter"
- value TRUE)
- (object Attribute
- tool "Data Modeler"
- name "IsOutParameter"
- value FALSE)
- (object Attribute
- tool "Data Modeler"
- name "Ordinal"
- value "")
- (object Attribute
- tool "Data Modeler"
- name "Length"
- value "")
- (object Attribute
- tool "Data Modeler"
- name "Scale"
- value "")
- (object Attribute
- tool "Data Modeler"
- name "ForBitData"
- value FALSE)
- (object Attribute
- tool "Data Modeler"
- name "DefaultValueType"
- value "")
- (object Attribute
- tool "Data Modeler"
- name "DefaultValue"
- value "")
- (object Attribute
- tool "Data Modeler"
- name "OperationID"
- value "")))
- (object Attribute
- tool "Data Modeler"
- name "HiddenTool"
- value FALSE)
- (object Attribute
- tool "Data Modeler Communicator"
- name "HiddenTool"
- value FALSE)
- (object Attribute
- tool "Java"
- name "propertyId"
- value "809135966")
- (object Attribute
- tool "Java"
- name "default__Project"
- value (list Attribute_Set
- (object Attribute
- tool "Java"
- name "RootDir"
- value "")
- (object Attribute
- tool "Java"
- name "CreateMissingDirectories"
- value TRUE)
- (object Attribute
- tool "Java"
- name "StopOnError"
- value FALSE)
- (object Attribute
- tool "Java"
- name "UsePrefixes"
- value FALSE)
- (object Attribute
- tool "Java"
- name "AutoSync"
- value FALSE)
- (object Attribute
- tool "Java"
- name "NotShowRoseIDDlg"
- value FALSE)
- (object Attribute
- tool "Java"
- name "ShowCodegenDlg"
- value FALSE)
- (object Attribute
- tool "Java"
- name "GenerateRoseID"
- value TRUE)
- (object Attribute
- tool "Java"
- name "GenerateDefaultReturnLine"
- value TRUE)
- (object Attribute
- tool "Java"
- name "JavadocDefaultAuthor"
- value "")
- (object Attribute
- tool "Java"
- name "JavadocDefaultVersion"
- value "")
- (object Attribute
- tool "Java"
- name "JavadocDefaultSince"
- value "")
- (object Attribute
- tool "Java"
- name "UserDefineTagName1"
- value "")
- (object Attribute
- tool "Java"
- name "UserDefineTagApply1"
- value "")
- (object Attribute
- tool "Java"
- name "UserDefineTagText1"
- value "")
- (object Attribute
- tool "Java"
- name "UserDefineTagName2"
- value "")
- (object Attribute
- tool "Java"
- name "UserDefineTagApply2"
- value "")
- (object Attribute
- tool "Java"
- name "UserDefineTagText2"
- value "")
- (object Attribute
- tool "Java"
- name "UserDefineTagName3"
- value "")
- (object Attribute
- tool "Java"
- name "UserDefineTagApply3"
- value "")
- (object Attribute
- tool "Java"
- name "UserDefineTagText3"
- value "")
- (object Attribute
- tool "Java"
- name "JavadocNumAsterisks"
- value 0)
- (object Attribute
- tool "Java"
- name "MaxNumChars"
- value 80)
- (object Attribute
- tool "Java"
- name "Editor"
- value ("EditorType" 100))
- (object Attribute
- tool "Java"
- name "VM"
- value ("VMType" 200))
- (object Attribute
- tool "Java"
- name "ClassPath"
- value ";D:\\Program Files\\Sun\\jdk1.4.2_02\\jre\\lib\\charsets.jar;D:\\Program Files\\Sun\\jdk1.4.2_02\\jre\\lib\\jce.jar;D:\\Program Files\\Sun\\jdk1.4.2_02\\jre\\lib\\jsse.jar;D:\\Program Files\\Sun\\jdk1.4.2_02\\jre\\lib\\rt.jar;D:\\Program Files\\Sun\\jdk1.4.2_02\\jre\\lib\\sunrsasign.jar;D:\\Program Files\\Sun\\jdk1.4.2_02\\jre\\lib\\ext\\dnsns.jar;D:\\Program Files\\Sun\\jdk1.4.2_02\\jre\\lib\\ext\\ldapsec.jar;D:\\Program Files\\Sun\\jdk1.4.2_02\\jre\\lib\\ext\\localedata.jar;D:\\Program Files\\Sun\\jdk1.4.2_02\\jre\\lib\\ext\\sunjce_provider.jar;D:\\Program Files\\Sun\\jdk1.4.2_02\\jre\\lib\\security\\local_policy.jar;D:\\Program Files\\Sun\\jdk1.4.2_02\\jre\\lib\\security\\US_export_policy.jar;D:\\Program Files\\Sun\\jdk1.4.2_02\\lib\\dt.jar;D:\\Program Files\\Sun\\jdk1.4.2_02\\lib\\htmlconverter.jar;D:\\Program Files\\Sun\\jdk1.4.2_02\\lib\\tools.jar")
- (object Attribute
- tool "Java"
- name "ReferenceClasspath"
- value "")
- (object Attribute
- tool "Java"
- name "EditorType"
- value (list Attribute_Set
- (object Attribute
- tool "Java"
- name "BuiltIn"
- value 100)
- (object Attribute
- tool "Java"
- name "WindowsShell"
- value 101)))
- (object Attribute
- tool "Java"
- name "VMType"
- value (list Attribute_Set
- (object Attribute
- tool "Java"
- name "Sun"
- value 200)
- (object Attribute
- tool "Java"
- name "Microsoft"
- value 201)
- (object Attribute
- tool "Java"
- name "IBM"
- value 202)))
- (object Attribute
- tool "Java"
- name "VAJavaWorkingFolder"
- value "")
- (object Attribute
- tool "Java"
- name "InstanceVariablePrefix"
- value "m_")
- (object Attribute
- tool "Java"
- name "ClassVariablePrefix"
- value "s_")
- (object Attribute
- tool "Java"
- name "DefaultAttributeDataType"
- value "int")
- (object Attribute
- tool "Java"
- name "DefaultOperationReturnType"
- value "void")
- (object Attribute
- tool "Java"
- name "NoClassCustomDlg"
- value FALSE)
- (object Attribute
- tool "Java"
- name "GlobalImports"
- value (value Text ""))
- (object Attribute
- tool "Java"
- name "OpenBraceClassStyle"
- value TRUE)
- (object Attribute
- tool "Java"
- name "OpenBraceMethodStyle"
- value TRUE)
- (object Attribute
- tool "Java"
- name "UseTabs"
- value FALSE)
- (object Attribute
- tool "Java"
- name "UseSpaces"
- value TRUE)
- (object Attribute
- tool "Java"
- name "SpacingItems"
- value 3)
- (object Attribute
- tool "Java"
- name "RoseDefaultCommentStyle"
- value TRUE)
- (object Attribute
- tool "Java"
- name "AsteriskCommentStyle"
- value FALSE)
- (object Attribute
- tool "Java"
- name "JavaCommentStyle"
- value FALSE)
- (object Attribute
- tool "Java"
- name "JavadocAuthor"
- value FALSE)
- (object Attribute
- tool "Java"
- name "JavadocSince"
- value FALSE)
- (object Attribute
- tool "Java"
- name "JavadocVersion"
- value FALSE)
- (object Attribute
- tool "Java"
- name "BeanPrefix"
- value "")
- (object Attribute
- tool "Java"
- name "BeanSuffix"
- value "")
- (object Attribute
- tool "Java"
- name "RemotePrefix"
- value "")
- (object Attribute
- tool "Java"
- name "RemoteSuffix"
- value "")
- (object Attribute
- tool "Java"
- name "HomePrefix"
- value "")
- (object Attribute
- tool "Java"
- name "HomeSuffix"
- value "")
- (object Attribute
- tool "Java"
- name "PrimaryKeyPrefix"
- value "")
- (object Attribute
- tool "Java"
- name "PrimaryKeySuffix"
- value "")
- (object Attribute
- tool "Java"
- name "EJBDTDLocation"
- value "")
- (object Attribute
- tool "Java"
- name "ServletDTDLocation"
- value "")
- (object Attribute
- tool "Java"
- name "DefaultEJBVersion"
- value "")
- (object Attribute
- tool "Java"
- name "DefaultServletVersion"
- value "")
- (object Attribute
- tool "Java"
- name "GenerateDefaultJ2EEJavadoc"
- value TRUE)
- (object Attribute
- tool "Java"
- name "UserDefineJavaDocTags"
- value "")
- (object Attribute
- tool "Java"
- name "LocalPrefix"
- value "")
- (object Attribute
- tool "Java"
- name "LocalSuffix"
- value "")
- (object Attribute
- tool "Java"
- name "LocalHomePrefix"
- value "")
- (object Attribute
- tool "Java"
- name "LocalHomeSuffix"
- value "")
- (object Attribute
- tool "Java"
- name "SourceControl"
- value FALSE)
- (object Attribute
- tool "Java"
- name "SCCSelected"
- value FALSE)
- (object Attribute
- tool "Java"
- name "SCCProjectSourceRoot"
- value "")
- (object Attribute
- tool "Java"
- name "SCCProjectName"
- value "")
- (object Attribute
- tool "Java"
- name "SCCComment"
- value FALSE)))
- (object Attribute
- tool "Java"
- name "default__Class"
- value (list Attribute_Set
- (object Attribute
- tool "Java"
- name "Final"
- value FALSE)
- (object Attribute
- tool "Java"
- name "Static"
- value FALSE)
- (object Attribute
- tool "Java"
- name "GenerateDefaultConstructor"
- value TRUE)
- (object Attribute
- tool "Java"
- name "ConstructorIs"
- value ("Ctor_Set" 62))
- (object Attribute
- tool "Java"
- name "Ctor_Set"
- value (list Attribute_Set
- (object Attribute
- tool "Java"
- name "public"
- value 62)
- (object Attribute
- tool "Java"
- name "protected"
- value 63)
- (object Attribute
- tool "Java"
- name "private"
- value 64)
- (object Attribute
- tool "Java"
- name "package"
- value 65)))
- (object Attribute
- tool "Java"
- name "GenerateFinalizer"
- value FALSE)
- (object Attribute
- tool "Java"
- name "GenerateStaticInitializer"
- value FALSE)
- (object Attribute
- tool "Java"
- name "GenerateInstanceInitializer"
- value FALSE)
- (object Attribute
- tool "Java"
- name "GenerateCode"
- value TRUE)
- (object Attribute
- tool "Java"
- name "DisableAutoSync"
- value FALSE)
- (object Attribute
- tool "Java"
- name "ReadOnly"
- value FALSE)
- (object Attribute
- tool "Java"
- name "ServletName"
- value "")
- (object Attribute
- tool "Java"
- name "ServletContextRef"
- value FALSE)
- (object Attribute
- tool "Java"
- name "IsSingleThread"
- value FALSE)
- (object Attribute
- tool "Java"
- name "ServletInitParameter"
- value "")
- (object Attribute
- tool "Java"
- name "ServletInitParameterNames"
- value FALSE)
- (object Attribute
- tool "Java"
- name "ServletIsSecure"
- value FALSE)
- (object Attribute
- tool "Java"
- name "ServletRequestDispatcher"
- value FALSE)
- (object Attribute
- tool "Java"
- name "ServletRequestDispatcherPath"
- value "")
- (object Attribute
- tool "Java"
- name "DispatcherInclude"
- value FALSE)
- (object Attribute
- tool "Java"
- name "DispatcherForward"
- value FALSE)
- (object Attribute
- tool "Java"
- name "ServletSecurityRoles"
- value "")
- (object Attribute
- tool "Java"
- name "ServletgetInfo"
- value "")
- (object Attribute
- tool "Java"
- name "ServletRequestAttribute"
- value "")
- (object Attribute
- tool "Java"
- name "ServletRequestAttributesNames"
- value FALSE)
- (object Attribute
- tool "Java"
- name "MethodForRequestAttributes"
- value "")
- (object Attribute
- tool "Java"
- name "ServletRequestParameter"
- value "")
- (object Attribute
- tool "Java"
- name "ServletRequestParameterNames"
- value FALSE)
- (object Attribute
- tool "Java"
- name "MethodForRequestParameters"
- value "")
- (object Attribute
- tool "Java"
- name "ServletHeader"
- value "")
- (object Attribute
- tool "Java"
- name "ServletHeaderNames"
- value FALSE)
- (object Attribute
- tool "Java"
- name "MethodForHeaders"
- value "")
- (object Attribute
- tool "Java"
- name "ServletIntHeader"
- value FALSE)
- (object Attribute
- tool "Java"
- name "ServletDateHeader"
- value FALSE)
- (object Attribute
- tool "Java"
- name "ServletCookie"
- value FALSE)
- (object Attribute
- tool "Java"
- name "MethodForCookie"
- value "")
- (object Attribute
- tool "Java"
- name "ServletContentType"
- value "")
- (object Attribute
- tool "Java"
- name "GenerateHTML"
- value FALSE)
- (object Attribute
- tool "Java"
- name "Generate_XML_DD"
- value TRUE)
- (object Attribute
- tool "Java"
- name "EJBCmpField"
- value "")
- (object Attribute
- tool "Java"
- name "EJBEnvironmentProperties"
- value "")
- (object Attribute
- tool "Java"
- name "EJBCnxFactory"
- value "")
- (object Attribute
- tool "Java"
- name "EJBReferences"
- value "")
- (object Attribute
- tool "Java"
- name "EJBSecurityRoles"
- value "")
- (object Attribute
- tool "Java"
- name "EJBNameInJAR"
- value "")
- (object Attribute
- tool "Java"
- name "EJBSessionType"
- value ("EJBSessionType_Set" 200))
- (object Attribute
- tool "Java"
- name "EJBSessionType_Set"
- value (list Attribute_Set
- (object Attribute
- tool "Java"
- name ""
- value 200)
- (object Attribute
- tool "Java"
- name "Stateless"
- value 201)
- (object Attribute
- tool "Java"
- name "Stateful"
- value 202)))
- (object Attribute
- tool "Java"
- name "EJBTransactionType"
- value ("EJBTransactionType_Set" 211))
- (object Attribute
- tool "Java"
- name "EJBTransactionType_Set"
- value (list Attribute_Set
- (object Attribute
- tool "Java"
- name "Container"
- value 211)
- (object Attribute
- tool "Java"
- name "Bean"
- value 212)))
- (object Attribute
- tool "Java"
- name "EJBPersistenceType"
- value ("EJBPersistenceType_Set" 220))
- (object Attribute
- tool "Java"
- name "EJBPersistenceType_Set"
- value (list Attribute_Set
- (object Attribute
- tool "Java"
- name ""
- value 220)
- (object Attribute
- tool "Java"
- name "Bean"
- value 221)
- (object Attribute
- tool "Java"
- name "Container"
- value 222)))
- (object Attribute
- tool "Java"
- name "EJBReentrant"
- value FALSE)
- (object Attribute
- tool "Java"
- name "BMP_Extend_CMP"
- value FALSE)
- (object Attribute
- tool "Java"
- name "Strictfp"
- value FALSE)
- (object Attribute
- tool "Java"
- name "ServletXMLFilePath"
- value "")
- (object Attribute
- tool "Java"
- name "EJBSessionSync"
- value FALSE)
- (object Attribute
- tool "Java"
- name "EJBVersion"
- value ("EJBVersion_Set" 230))
- (object Attribute
- tool "Java"
- name "EJBVersion_Set"
- value (list Attribute_Set
- (object Attribute
- tool "Java"
- name "2.0"
- value 230)
- (object Attribute
- tool "Java"
- name "1.x"
- value 231)))
- (object Attribute
- tool "Java"
- name "EJBXMLFilePath"
- value "")))
- (object Attribute
- tool "Java"
- name "Default_Servlet__Class"
- value (list Attribute_Set
- (object Attribute
- tool "Java"
- name "ServletName"
- value "")
- (object Attribute
- tool "Java"
- name "ServletContextRef"
- value FALSE)
- (object Attribute
- tool "Java"
- name "IsSingleThread"
- value FALSE)
- (object Attribute
- tool "Java"
- name "ServletInitParameter"
- value "")
- (object Attribute
- tool "Java"
- name "ServletInitParameterNames"
- value FALSE)
- (object Attribute
- tool "Java"
- name "ServletIsSecure"
- value FALSE)
- (object Attribute
- tool "Java"
- name "ServletRequestDispatcher"
- value FALSE)
- (object Attribute
- tool "Java"
- name "ServletRequestDispatcherPath"
- value "")
- (object Attribute
- tool "Java"
- name "DispatcherInclude"
- value FALSE)
- (object Attribute
- tool "Java"
- name "DispatcherForward"
- value FALSE)
- (object Attribute
- tool "Java"
- name "ServletSecurityRoles"
- value "")
- (object Attribute
- tool "Java"
- name "ServletgetInfo"
- value "")
- (object Attribute
- tool "Java"
- name "ServletXMLFilePath"
- value "")
- (object Attribute
- tool "Java"
- name "Final"
- value FALSE)
- (object Attribute
- tool "Java"
- name "Static"
- value FALSE)
- (object Attribute
- tool "Java"
- name "GenerateDefaultConstructor"
- value TRUE)
- (object Attribute
- tool "Java"
- name "ConstructorIs"
- value ("Ctor_Set" 62))
- (object Attribute
- tool "Java"
- name "Ctor_Set"
- value (list Attribute_Set
- (object Attribute
- tool "Java"
- name "public"
- value 62)
- (object Attribute
- tool "Java"
- name "protected"
- value 63)
- (object Attribute
- tool "Java"
- name "private"
- value 64)
- (object Attribute
- tool "Java"
- name "package"
- value 65)))
- (object Attribute
- tool "Java"
- name "GenerateFinalizer"
- value FALSE)
- (object Attribute
- tool "Java"
- name "GenerateStaticInitializer"
- value FALSE)
- (object Attribute
- tool "Java"
- name "GenerateInstanceInitializer"
- value FALSE)
- (object Attribute
- tool "Java"
- name "GenerateCode"
- value TRUE)
- (object Attribute
- tool "Java"
- name "DisableAutoSync"
- value FALSE)
- (object Attribute
- tool "Java"
- name "ServletRequestAttribute"
- value "")
- (object Attribute
- tool "Java"
- name "ServletRequestAttributesNames"
- value FALSE)
- (object Attribute
- tool "Java"
- name "MethodForRequestAttributes"
- value "")
- (object Attribute
- tool "Java"
- name "ServletRequestParameter"
- value "")
- (object Attribute
- tool "Java"
- name "ServletRequestParameterNames"
- value FALSE)
- (object Attribute
- tool "Java"
- name "MethodForRequestParameters"
- value "")
- (object Attribute
- tool "Java"
- name "ServletHeader"
- value "")
- (object Attribute
- tool "Java"
- name "ServletHeaderNames"
- value FALSE)
- (object Attribute
- tool "Java"
- name "MethodForHeaders"
- value "")
- (object Attribute
- tool "Java"
- name "ServletIntHeader"
- value FALSE)
- (object Attribute
- tool "Java"
- name "ServletDateHeader"
- value FALSE)
- (object Attribute
- tool "Java"
- name "ServletCookie"
- value FALSE)
- (object Attribute
- tool "Java"
- name "MethodForCookie"
- value "")
- (object Attribute
- tool "Java"
- name "ServletContentType"
- value "")
- (object Attribute
- tool "Java"
- name "GenerateHTML"
- value FALSE)
- (object Attribute
- tool "Java"
- name "Generate_XML_DD"
- value TRUE)
- (object Attribute
- tool "Java"
- name "EJBCmpField"
- value "")
- (object Attribute
- tool "Java"
- name "EJBEnvironmentProperties"
- value "")
- (object Attribute
- tool "Java"
- name "EJBCnxFactory"
- value "")
- (object Attribute
- tool "Java"
- name "EJBReferences"
- value "")
- (object Attribute
- tool "Java"
- name "EJBSecurityRoles"
- value "")
- (object Attribute
- tool "Java"
- name "EJBNameInJAR"
- value "")
- (object Attribute
- tool "Java"
- name "EJBSessionType"
- value ("EJBSessionType_Set" 200))
- (object Attribute
- tool "Java"
- name "EJBSessionType_Set"
- value (list Attribute_Set
- (object Attribute
- tool "Java"
- name ""
- value 200)
- (object Attribute
- tool "Java"
- name "Stateless"
- value 201)
- (object Attribute
- tool "Java"
- name "Stateful"
- value 202)))
- (object Attribute
- tool "Java"
- name "EJBTransactionType"
- value ("EJBTransactionType_Set" 211))
- (object Attribute
- tool "Java"
- name "EJBTransactionType_Set"
- value (list Attribute_Set
- (object Attribute
- tool "Java"
- name "Container"
- value 211)
- (object Attribute
- tool "Java"
- name "Bean"
- value 212)))
- (object Attribute
- tool "Java"
- name "EJBPersistenceType"
- value ("EJBPersistenceType_Set" 220))
- (object Attribute
- tool "Java"
- name "EJBPersistenceType_Set"
- value (list Attribute_Set
- (object Attribute
- tool "Java"
- name ""
- value 220)
- (object Attribute
- tool "Java"
- name "Bean"
- value 221)
- (object Attribute
- tool "Java"
- name "Container"
- value 222)))
- (object Attribute
- tool "Java"
- name "EJBReentrant"
- value FALSE)
- (object Attribute
- tool "Java"
- name "BMP_Extend_CMP"
- value FALSE)
- (object Attribute
- tool "Java"
- name "ReadOnly"
- value FALSE)
- (object Attribute
- tool "Java"
- name "Strictfp"
- value FALSE)
- (object Attribute
- tool "Java"
- name "EJBSessionSync"
- value FALSE)
- (object Attribute
- tool "Java"
- name "EJBVersion"
- value ("EJBVersion_Set" 230))
- (object Attribute
- tool "Java"
- name "EJBVersion_Set"
- value (list Attribute_Set
- (object Attribute
- tool "Java"
- name "2.0"
- value 230)
- (object Attribute
- tool "Java"
- name "1.x"
- value 231)))
- (object Attribute
- tool "Java"
- name "EJBXMLFilePath"
- value "")))
- (object Attribute
- tool "Java"
- name "Http_Servlet__Class"
- value (list Attribute_Set
- (object Attribute
- tool "Java"
- name "ServletRequestAttribute"
- value "")
- (object Attribute
- tool "Java"
- name "ServletRequestAttributesNames"
- value FALSE)
- (object Attribute
- tool "Java"
- name "MethodForRequestAttributes"
- value "")
- (object Attribute
- tool "Java"
- name "ServletRequestParameter"
- value "")
- (object Attribute
- tool "Java"
- name "ServletRequestParameterNames"
- value FALSE)
- (object Attribute
- tool "Java"
- name "MethodForRequestParameters"
- value "")
- (object Attribute
- tool "Java"
- name "ServletHeader"
- value "")
- (object Attribute
- tool "Java"
- name "ServletHeaderNames"
- value FALSE)
- (object Attribute
- tool "Java"
- name "MethodForHeaders"
- value "")
- (object Attribute
- tool "Java"
- name "ServletIntHeader"
- value FALSE)
- (object Attribute
- tool "Java"
- name "ServletDateHeader"
- value FALSE)
- (object Attribute
- tool "Java"
- name "ServletCookie"
- value FALSE)
- (object Attribute
- tool "Java"
- name "MethodForCookie"
- value "")
- (object Attribute
- tool "Java"
- name "ServletContentType"
- value "")
- (object Attribute
- tool "Java"
- name "GenerateHTML"
- value FALSE)
- (object Attribute
- tool "Java"
- name "Final"
- value FALSE)
- (object Attribute
- tool "Java"
- name "Static"
- value FALSE)
- (object Attribute
- tool "Java"
- name "GenerateDefaultConstructor"
- value TRUE)
- (object Attribute
- tool "Java"
- name "ConstructorIs"
- value ("Ctor_Set" 62))
- (object Attribute
- tool "Java"
- name "Ctor_Set"
- value (list Attribute_Set
- (object Attribute
- tool "Java"
- name "public"
- value 62)
- (object Attribute
- tool "Java"
- name "protected"
- value 63)
- (object Attribute
- tool "Java"
- name "private"
- value 64)
- (object Attribute
- tool "Java"
- name "package"
- value 65)))
- (object Attribute
- tool "Java"
- name "GenerateFinalizer"
- value FALSE)
- (object Attribute
- tool "Java"
- name "GenerateStaticInitializer"
- value FALSE)
- (object Attribute
- tool "Java"
- name "GenerateInstanceInitializer"
- value FALSE)
- (object Attribute
- tool "Java"
- name "GenerateCode"
- value TRUE)
- (object Attribute
- tool "Java"
- name "DisableAutoSync"
- value FALSE)
- (object Attribute
- tool "Java"
- name "ServletName"
- value "")
- (object Attribute
- tool "Java"
- name "ServletContextRef"
- value FALSE)
- (object Attribute
- tool "Java"
- name "IsSingleThread"
- value FALSE)
- (object Attribute
- tool "Java"
- name "ServletInitParameter"
- value "")
- (object Attribute
- tool "Java"
- name "ServletInitParameterNames"
- value FALSE)
- (object Attribute
- tool "Java"
- name "ServletIsSecure"
- value FALSE)
- (object Attribute
- tool "Java"
- name "ServletRequestDispatcher"
- value FALSE)
- (object Attribute
- tool "Java"
- name "ServletRequestDispatcherPath"
- value "")
- (object Attribute
- tool "Java"
- name "DispatcherInclude"
- value FALSE)
- (object Attribute
- tool "Java"
- name "DispatcherForward"
- value FALSE)
- (object Attribute
- tool "Java"
- name "ServletSecurityRoles"
- value "")
- (object Attribute
- tool "Java"
- name "ServletgetInfo"
- value "")
- (object Attribute
- tool "Java"
- name "Generate_XML_DD"
- value TRUE)
- (object Attribute
- tool "Java"
- name "EJBCmpField"
- value "")
- (object Attribute
- tool "Java"
- name "EJBEnvironmentProperties"
- value "")
- (object Attribute
- tool "Java"
- name "EJBCnxFactory"
- value "")
- (object Attribute
- tool "Java"
- name "EJBReferences"
- value "")
- (object Attribute
- tool "Java"
- name "EJBSecurityRoles"
- value "")
- (object Attribute
- tool "Java"
- name "EJBNameInJAR"
- value "")
- (object Attribute
- tool "Java"
- name "EJBSessionType"
- value ("EJBSessionType_Set" 200))
- (object Attribute
- tool "Java"
- name "EJBSessionType_Set"
- value (list Attribute_Set
- (object Attribute
- tool "Java"
- name ""
- value 200)
- (object Attribute
- tool "Java"
- name "Stateless"
- value 201)
- (object Attribute
- tool "Java"
- name "Stateful"
- value 202)))
- (object Attribute
- tool "Java"
- name "EJBTransactionType"
- value ("EJBTransactionType_Set" 211))
- (object Attribute
- tool "Java"
- name "EJBTransactionType_Set"
- value (list Attribute_Set
- (object Attribute
- tool "Java"
- name "Container"
- value 211)
- (object Attribute
- tool "Java"
- name "Bean"
- value 212)))
- (object Attribute
- tool "Java"
- name "EJBPersistenceType"
- value ("EJBPersistenceType_Set" 220))
- (object Attribute
- tool "Java"
- name "EJBPersistenceType_Set"
- value (list Attribute_Set
- (object Attribute
- tool "Java"
- name ""
- value 220)
- (object Attribute
- tool "Java"
- name "Bean"
- value 221)
- (object Attribute
- tool "Java"
- name "Container"
- value 222)))
- (object Attribute
- tool "Java"
- name "EJBReentrant"
- value FALSE)
- (object Attribute
- tool "Java"
- name "BMP_Extend_CMP"
- value FALSE)
- (object Attribute
- tool "Java"
- name "ReadOnly"
- value FALSE)
- (object Attribute
- tool "Java"
- name "Strictfp"
- value FALSE)
- (object Attribute
- tool "Java"
- name "ServletXMLFilePath"
- value "")
- (object Attribute
- tool "Java"
- name "EJBSessionSync"
- value FALSE)
- (object Attribute
- tool "Java"
- name "EJBVersion"
- value ("EJBVersion_Set" 230))
- (object Attribute
- tool "Java"
- name "EJBVersion_Set"
- value (list Attribute_Set
- (object Attribute
- tool "Java"
- name "2.0"
- value 230)
- (object Attribute
- tool "Java"
- name "1.x"
- value 231)))
- (object Attribute
- tool "Java"
- name "EJBXMLFilePath"
- value "")))
- (object Attribute
- tool "Java"
- name "Default_EJB__Class"
- value (list Attribute_Set
- (object Attribute
- tool "Java"
- name "Generate_XML_DD"
- value TRUE)
- (object Attribute
- tool "Java"
- name "EJBCmpField"
- value "")
- (object Attribute
- tool "Java"
- name "EJBEnvironmentProperties"
- value "")
- (object Attribute
- tool "Java"
- name "EJBCnxFactory"
- value "")
- (object Attribute
- tool "Java"
- name "EJBReferences"
- value "")
- (object Attribute
- tool "Java"
- name "EJBSecurityRoles"
- value "")
- (object Attribute
- tool "Java"
- name "EJBNameInJAR"
- value "")
- (object Attribute
- tool "Java"
- name "EJBSessionType"
- value ("EJBSessionType_Set" 200))
- (object Attribute
- tool "Java"
- name "EJBSessionType_Set"
- value (list Attribute_Set
- (object Attribute
- tool "Java"
- name ""
- value 200)
- (object Attribute
- tool "Java"
- name "Stateless"
- value 201)
- (object Attribute
- tool "Java"
- name "Stateful"
- value 202)))
- (object Attribute
- tool "Java"
- name "EJBTransactionType"
- value ("EJBTransactionType_Set" 211))
- (object Attribute
- tool "Java"
- name "EJBTransactionType_Set"
- value (list Attribute_Set
- (object Attribute
- tool "Java"
- name "Container"
- value 211)
- (object Attribute
- tool "Java"
- name "Bean"
- value 212)))
- (object Attribute
- tool "Java"
- name "EJBPersistenceType"
- value ("EJBPersistenceType_Set" 220))
- (object Attribute
- tool "Java"
- name "EJBPersistenceType_Set"
- value (list Attribute_Set
- (object Attribute
- tool "Java"
- name ""
- value 220)
- (object Attribute
- tool "Java"
- name "Bean"
- value 221)
- (object Attribute
- tool "Java"
- name "Container"
- value 222)))
- (object Attribute
- tool "Java"
- name "EJBReentrant"
- value FALSE)
- (object Attribute
- tool "Java"
- name "EJBSessionSync"
- value FALSE)
- (object Attribute
- tool "Java"
- name "EJBVersion"
- value ("EJBVersion_Set" 230))
- (object Attribute
- tool "Java"
- name "EJBVersion_Set"
- value (list Attribute_Set
- (object Attribute
- tool "Java"
- name "2.0"
- value 230)
- (object Attribute
- tool "Java"
- name "1.x"
- value 231)))
- (object Attribute
- tool "Java"
- name "EJBXMLFilePath"
- value "")
- (object Attribute
- tool "Java"
- name "Final"
- value FALSE)
- (object Attribute
- tool "Java"
- name "Static"
- value FALSE)
- (object Attribute
- tool "Java"
- name "GenerateDefaultConstructor"
- value TRUE)
- (object Attribute
- tool "Java"
- name "ConstructorIs"
- value ("Ctor_Set" 62))
- (object Attribute
- tool "Java"
- name "Ctor_Set"
- value (list Attribute_Set
- (object Attribute
- tool "Java"
- name "public"
- value 62)
- (object Attribute
- tool "Java"
- name "protected"
- value 63)
- (object Attribute
- tool "Java"
- name "private"
- value 64)
- (object Attribute
- tool "Java"
- name "package"
- value 65)))
- (object Attribute
- tool "Java"
- name "GenerateFinalizer"
- value FALSE)
- (object Attribute
- tool "Java"
- name "GenerateStaticInitializer"
- value FALSE)
- (object Attribute
- tool "Java"
- name "GenerateInstanceInitializer"
- value FALSE)
- (object Attribute
- tool "Java"
- name "GenerateCode"
- value TRUE)
- (object Attribute
- tool "Java"
- name "DisableAutoSync"
- value FALSE)
- (object Attribute
- tool "Java"
- name "ServletName"
- value "")
- (object Attribute
- tool "Java"
- name "ServletContextRef"
- value FALSE)
- (object Attribute
- tool "Java"
- name "IsSingleThread"
- value FALSE)
- (object Attribute
- tool "Java"
- name "ServletInitParameter"
- value "")
- (object Attribute
- tool "Java"
- name "ServletInitParameterNames"
- value FALSE)
- (object Attribute
- tool "Java"
- name "ServletIsSecure"
- value FALSE)
- (object Attribute
- tool "Java"
- name "ServletRequestDispatcher"
- value FALSE)
- (object Attribute
- tool "Java"
- name "ServletRequestDispatcherPath"
- value "")
- (object Attribute
- tool "Java"
- name "DispatcherInclude"
- value FALSE)
- (object Attribute
- tool "Java"
- name "DispatcherForward"
- value FALSE)
- (object Attribute
- tool "Java"
- name "ServletSecurityRoles"
- value "")
- (object Attribute
- tool "Java"
- name "ServletgetInfo"
- value "")
- (object Attribute
- tool "Java"
- name "ServletRequestAttribute"
- value "")
- (object Attribute
- tool "Java"
- name "ServletRequestAttributesNames"
- value FALSE)
- (object Attribute
- tool "Java"
- name "MethodForRequestAttributes"
- value "")
- (object Attribute
- tool "Java"
- name "ServletRequestParameter"
- value "")
- (object Attribute
- tool "Java"
- name "ServletRequestParameterNames"
- value FALSE)
- (object Attribute
- tool "Java"
- name "MethodForRequestParameters"
- value "")
- (object Attribute
- tool "Java"
- name "ServletHeader"
- value "")
- (object Attribute
- tool "Java"
- name "ServletHeaderNames"
- value FALSE)
- (object Attribute
- tool "Java"
- name "MethodForHeaders"
- value "")
- (object Attribute
- tool "Java"
- name "ServletIntHeader"
- value FALSE)
- (object Attribute
- tool "Java"
- name "ServletDateHeader"
- value FALSE)
- (object Attribute
- tool "Java"
- name "ServletCookie"
- value FALSE)
- (object Attribute
- tool "Java"
- name "MethodForCookie"
- value "")
- (object Attribute
- tool "Java"
- name "ServletContentType"
- value "")
- (object Attribute
- tool "Java"
- name "GenerateHTML"
- value FALSE)
- (object Attribute
- tool "Java"
- name "BMP_Extend_CMP"
- value FALSE)
- (object Attribute
- tool "Java"
- name "ReadOnly"
- value FALSE)
- (object Attribute
- tool "Java"
- name "Strictfp"
- value FALSE)
- (object Attribute
- tool "Java"
- name "ServletXMLFilePath"
- value "")))
- (object Attribute
- tool "Java"
- name "default__Module-Spec"
- value (list Attribute_Set
- (object Attribute
- tool "Java"
- name "CmIdentification"
- value (value Text ""))
- (object Attribute
- tool "Java"
- name "CopyrightNotice"
- value (value Text ""))))
- (object Attribute
- tool "Java"
- name "default__Module-Body"
- value (list Attribute_Set
- (object Attribute
- tool "Java"
- name "CmIdentification"
- value (value Text ""))
- (object Attribute
- tool "Java"
- name "CopyrightNotice"
- value (value Text ""))))
- (object Attribute
- tool "Java"
- name "default__Operation"
- value (list Attribute_Set
- (object Attribute
- tool "Java"
- name "Abstract"
- value FALSE)
- (object Attribute
- tool "Java"
- name "Static"
- value FALSE)
- (object Attribute
- tool "Java"
- name "Final"
- value FALSE)
- (object Attribute
- tool "Java"
- name "Native"
- value FALSE)
- (object Attribute
- tool "Java"
- name "Synchronized"
- value FALSE)
- (object Attribute
- tool "Java"
- name "GenerateFullyQualifiedReturn"
- value FALSE)
- (object Attribute
- tool "Java"
- name "ReplaceExistingCode"
- value TRUE)
- (object Attribute
- tool "Java"
- name "Strictfp"
- value FALSE)))
- (object Attribute
- tool "Java"
- name "default__Attribute"
- value (list Attribute_Set
- (object Attribute
- tool "Java"
- name "Final"
- value FALSE)
- (object Attribute
- tool "Java"
- name "Transient"
- value FALSE)
- (object Attribute
- tool "Java"
- name "Volatile"
- value FALSE)
- (object Attribute
- tool "Java"
- name "PropertyType"
- value ("BeanProperty_Set" 71))
- (object Attribute
- tool "Java"
- name "BeanProperty_Set"
- value (list Attribute_Set
- (object Attribute
- tool "Java"
- name "Not A Property"
- value 71)
- (object Attribute
- tool "Java"
- name "Simple"
- value 72)
- (object Attribute
- tool "Java"
- name "Bound"
- value 73)
- (object Attribute
- tool "Java"
- name "Constrained"
- value 74)))
- (object Attribute
- tool "Java"
- name "IndividualChangeMgt"
- value FALSE)
- (object Attribute
- tool "Java"
- name "Read/Write"
- value ("Read/Write_Set" 81))
- (object Attribute
- tool "Java"
- name "Read/Write_Set"
- value (list Attribute_Set
- (object Attribute
- tool "Java"
- name "Read & Write"
- value 81)
- (object Attribute
- tool "Java"
- name "Read Only"
- value 82)
- (object Attribute
- tool "Java"
- name "Write Only"
- value 83)))
- (object Attribute
- tool "Java"
- name "GenerateFullyQualifiedTypes"
- value FALSE)))
- (object Attribute
- tool "Java"
- name "default__Role"
- value (list Attribute_Set
- (object Attribute
- tool "Java"
- name "ContainerClass"
- value "")
- (object Attribute
- tool "Java"
- name "InitialValue"
- value "")
- (object Attribute
- tool "Java"
- name "Final"
- value FALSE)
- (object Attribute
- tool "Java"
- name "Transient"
- value FALSE)
- (object Attribute
- tool "Java"
- name "Volatile"
- value FALSE)
- (object Attribute
- tool "Java"
- name "PropertyType"
- value ("BeanProperty_Set" 71))
- (object Attribute
- tool "Java"
- name "BeanProperty_Set"
- value (list Attribute_Set
- (object Attribute
- tool "Java"
- name "Not A Property"
- value 71)
- (object Attribute
- tool "Java"
- name "Simple"
- value 72)
- (object Attribute
- tool "Java"
- name "Bound"
- value 73)
- (object Attribute
- tool "Java"
- name "Constrained"
- value 74)))
- (object Attribute
- tool "Java"
- name "IndividualChangeMgt"
- value FALSE)
- (object Attribute
- tool "Java"
- name "Read/Write"
- value ("Read/Write_Set" 81))
- (object Attribute
- tool "Java"
- name "Read/Write_Set"
- value (list Attribute_Set
- (object Attribute
- tool "Java"
- name "Read & Write"
- value 81)
- (object Attribute
- tool "Java"
- name "Read Only"
- value 82)
- (object Attribute
- tool "Java"
- name "Write Only"
- value 83)))
- (object Attribute
- tool "Java"
- name "GenerateFullyQualifiedTypes"
- value FALSE)
- (object Attribute
- tool "Java"
- name "IsNavigable"
- value TRUE)))
- (object Attribute
- tool "Java"
- name "HiddenTool"
- value FALSE)
- (object Attribute
- tool "Oracle8"
- name "propertyId"
- value "360000002")
- (object Attribute
- tool "Oracle8"
- name "default__Project"
- value (list Attribute_Set
- (object Attribute
- tool "Oracle8"
- name "DDLScriptFilename"
- value "DDL1.SQL")
- (object Attribute
- tool "Oracle8"
- name "DropClause"
- value FALSE)
- (object Attribute
- tool "Oracle8"
- name "PrimaryKeyColumnName"
- value "_ID")
- (object Attribute
- tool "Oracle8"
- name "PrimaryKeyColumnType"
- value "NUMBER(5,0)")
- (object Attribute
- tool "Oracle8"
- name "SchemaNamePrefix"
- value "")
- (object Attribute
- tool "Oracle8"
- name "SchemaNameSuffix"
- value "")
- (object Attribute
- tool "Oracle8"
- name "TableNamePrefix"
- value "")
- (object Attribute
- tool "Oracle8"
- name "TableNameSuffix"
- value "")
- (object Attribute
- tool "Oracle8"
- name "TypeNamePrefix"
- value "")
- (object Attribute
- tool "Oracle8"
- name "TypeNameSuffix"
- value "")
- (object Attribute
- tool "Oracle8"
- name "ViewNamePrefix"
- value "")
- (object Attribute
- tool "Oracle8"
- name "ViewNameSuffix"
- value "")
- (object Attribute
- tool "Oracle8"
- name "VarrayNamePrefix"
- value "")
- (object Attribute
- tool "Oracle8"
- name "VarrayNameSuffix"
- value "")
- (object Attribute
- tool "Oracle8"
- name "NestedTableNamePrefix"
- value "")
- (object Attribute
- tool "Oracle8"
- name "NestedTableNameSuffix"
- value "")
- (object Attribute
- tool "Oracle8"
- name "ObjectTableNamePrefix"
- value "")
- (object Attribute
- tool "Oracle8"
- name "ObjectTableNameSuffix"
- value "")))
- (object Attribute
- tool "Oracle8"
- name "default__Module-Spec"
- value (list Attribute_Set
- (object Attribute
- tool "Oracle8"
- name "IsSchema"
- value FALSE)))
- (object Attribute
- tool "Oracle8"
- name "default__Class"
- value (list Attribute_Set
- (object Attribute
- tool "Oracle8"
- name "OID"
- value "")
- (object Attribute
- tool "Oracle8"
- name "WhereClause"
- value "")
- (object Attribute
- tool "Oracle8"
- name "CheckConstraint"
- value "")
- (object Attribute
- tool "Oracle8"
- name "CollectionTypeLength"
- value "")
- (object Attribute
- tool "Oracle8"
- name "CollectionTypePrecision"
- value "")
- (object Attribute
- tool "Oracle8"
- name "CollectionTypeScale"
- value "")
- (object Attribute
- tool "Oracle8"
- name "CollectionOfREFS"
- value FALSE)))
- (object Attribute
- tool "Oracle8"
- name "default__Operation"
- value (list Attribute_Set
- (object Attribute
- tool "Oracle8"
- name "MethodKind"
- value ("MethodKindSet" 1903))
- (object Attribute
- tool "Oracle8"
- name "OverloadID"
- value "")
- (object Attribute
- tool "Oracle8"
- name "OrderNumber"
- value "")
- (object Attribute
- tool "Oracle8"
- name "IsReadNoDataState"
- value FALSE)
- (object Attribute
- tool "Oracle8"
- name "IsReadNoProcessState"
- value FALSE)
- (object Attribute
- tool "Oracle8"
- name "IsWriteNoDataState"
- value FALSE)
- (object Attribute
- tool "Oracle8"
- name "IsWriteNoProcessState"
- value FALSE)
- (object Attribute
- tool "Oracle8"
- name "IsSelfish"
- value FALSE)
- (object Attribute
- tool "Oracle8"
- name "TriggerType"
- value ("TriggerTypeSet" 1801))
- (object Attribute
- tool "Oracle8"
- name "TriggerEvent"
- value ("TriggerEventSet" 1601))
- (object Attribute
- tool "Oracle8"
- name "TriggerText"
- value "")
- (object Attribute
- tool "Oracle8"
- name "TriggerReferencingNames"
- value "")
- (object Attribute
- tool "Oracle8"
- name "TriggerForEach"
- value ("TriggerForEachSet" 1701))
- (object Attribute
- tool "Oracle8"
- name "TriggerWhenClause"
- value "")
- (object Attribute
- tool "Oracle8"
- name "MethodKindSet"
- value (list Attribute_Set
- (object Attribute
- tool "Oracle8"
- name "MapMethod"
- value 1901)
- (object Attribute
- tool "Oracle8"
- name "OrderMethod"
- value 1902)
- (object Attribute
- tool "Oracle8"
- name "Function"
- value 1903)
- (object Attribute
- tool "Oracle8"
- name "Procedure"
- value 1904)
- (object Attribute
- tool "Oracle8"
- name "Operator"
- value 1905)
- (object Attribute
- tool "Oracle8"
- name "Constructor"
- value 1906)
- (object Attribute
- tool "Oracle8"
- name "Destructor"
- value 1907)
- (object Attribute
- tool "Oracle8"
- name "Trigger"
- value 1908)
- (object Attribute
- tool "Oracle8"
- name "Calculated"
- value 1909)))
- (object Attribute
- tool "Oracle8"
- name "TriggerTypeSet"
- value (list Attribute_Set
- (object Attribute
- tool "Oracle8"
- name "AFTER"
- value 1801)
- (object Attribute
- tool "Oracle8"
- name "BEFORE"
- value 1802)
- (object Attribute
- tool "Oracle8"
- name "INSTEAD OF"
- value 1803)))
- (object Attribute
- tool "Oracle8"
- name "TriggerForEachSet"
- value (list Attribute_Set
- (object Attribute
- tool "Oracle8"
- name "ROW"
- value 1701)
- (object Attribute
- tool "Oracle8"
- name "STATEMENT"
- value 1702)))
- (object Attribute
- tool "Oracle8"
- name "TriggerEventSet"
- value (list Attribute_Set
- (object Attribute
- tool "Oracle8"
- name "INSERT"
- value 1601)
- (object Attribute
- tool "Oracle8"
- name "UPDATE"
- value 1602)
- (object Attribute
- tool "Oracle8"
- name "DELETE"
- value 1603)
- (object Attribute
- tool "Oracle8"
- name "INSERT OR UPDATE"
- value 1604)
- (object Attribute
- tool "Oracle8"
- name "INSERT OR DELETE"
- value 1605)
- (object Attribute
- tool "Oracle8"
- name "UPDATE OR DELETE"
- value 1606)
- (object Attribute
- tool "Oracle8"
- name "INSERT OR UPDATE OR DELETE"
- value 1607)))))
- (object Attribute
- tool "Oracle8"
- name "default__Role"
- value (list Attribute_Set
- (object Attribute
- tool "Oracle8"
- name "OrderNumber"
- value "")))
- (object Attribute
- tool "Oracle8"
- name "default__Attribute"
- value (list Attribute_Set
- (object Attribute
- tool "Oracle8"
- name "OrderNumber"
- value "")
- (object Attribute
- tool "Oracle8"
- name "IsUnique"
- value FALSE)
- (object Attribute
- tool "Oracle8"
- name "NullsAllowed"
- value TRUE)
- (object Attribute
- tool "Oracle8"
- name "Length"
- value "")
- (object Attribute
- tool "Oracle8"
- name "Precision"
- value "2")
- (object Attribute
- tool "Oracle8"
- name "Scale"
- value "6")
- (object Attribute
- tool "Oracle8"
- name "IsIndex"
- value FALSE)
- (object Attribute
- tool "Oracle8"
- name "IsPrimaryKey"
- value FALSE)
- (object Attribute
- tool "Oracle8"
- name "CompositeUnique"
- value FALSE)
- (object Attribute
- tool "Oracle8"
- name "CheckConstraint"
- value "")))
- (object Attribute
- tool "Oracle8"
- name "HiddenTool"
- value FALSE)
- (object Attribute
- tool "ComponentTest"
- name "HiddenTool"
- value FALSE)
- (object Attribute
- tool "RequisitePro"
- name "HiddenTool"
- value FALSE)
- (object Attribute
- tool "cg"
- name "propertyId"
- value "809135966")
- (object Attribute
- tool "cg"
- name "default__Project"
- value (list Attribute_Set
- (object Attribute
- tool "cg"
- name "AllowGenerateOverNewerAnnotations"
- value FALSE)
- (object Attribute
- tool "cg"
- name "AllowGenerateOverNewerVersion"
- value FALSE)
- (object Attribute
- tool "cg"
- name "UseMSVC"
- value FALSE)
- (object Attribute
- tool "cg"
- name "HeaderFileExtension"
- value "h")
- (object Attribute
- tool "cg"
- name "HeaderFileBackupExtension"
- value "h~")
- (object Attribute
- tool "cg"
- name "HeaderFileTemporaryExtension"
- value "h#")
- (object Attribute
- tool "cg"
- name "CodeFileExtension"
- value "cpp")
- (object Attribute
- tool "cg"
- name "CodeFileBackupExtension"
- value "cp~")
- (object Attribute
- tool "cg"
- name "CodeFileTemporaryExtension"
- value "cp#")
- (object Attribute
- tool "cg"
- name "CreateMissingDirectories"
- value TRUE)
- (object Attribute
- tool "cg"
- name "StopOnError"
- value FALSE)
- (object Attribute
- tool "cg"
- name "ErrorLimit"
- value 30)
- (object Attribute
- tool "cg"
- name "Directory"
- value "$ROSECPP_SOURCE")
- (object Attribute
- tool "cg"
- name "PathSeparator"
- value "")
- (object Attribute
- tool "cg"
- name "FileNameFormat"
- value "128vx_b")
- (object Attribute
- tool "cg"
- name "BooleanType"
- value "int")
- (object Attribute
- tool "cg"
- name "AllowTemplates"
- value TRUE)
- (object Attribute
- tool "cg"
- name "AllowExplicitInstantiations"
- value FALSE)
- (object Attribute
- tool "cg"
- name "AllowProtectedInheritance"
- value TRUE)
- (object Attribute
- tool "cg"
- name "CommentWidth"
- value 60)
- (object Attribute
- tool "cg"
- name "OneByValueContainer"
- value "$targetClass")
- (object Attribute
- tool "cg"
- name "OneByReferenceContainer"
- value "$targetClass *")
- (object Attribute
- tool "cg"
- name "OptionalByValueContainer"
- value "OptionalByValue<$targetClass>")
- (object Attribute
- tool "cg"
- name "OptionalByReferenceContainer"
- value "$targetClass *")
- (object Attribute
- tool "cg"
- name "FixedByValueContainer"
- value "$targetClass[$limit]")
- (object Attribute
- tool "cg"
- name "UnorderedFixedByValueContainer"
- value "$targetClass[$limit]")
- (object Attribute
- tool "cg"
- name "FixedByReferenceContainer"
- value "$targetClass *[$limit]")
- (object Attribute
- tool "cg"
- name "UnorderedFixedByReferenceContainer"
- value "$targetClass *[$limit]")
- (object Attribute
- tool "cg"
- name "BoundedByValueContainer"
- value "BoundedListByValue<$targetClass,$limit>")
- (object Attribute
- tool "cg"
- name "UnorderedBoundedByValueContainer"
- value "BoundedSetByValue<$targetClass,$limit>")
- (object Attribute
- tool "cg"
- name "BoundedByReferenceContainer"
- value "BoundedListByReference<$targetClass,$limit>")
- (object Attribute
- tool "cg"
- name "UnorderedBoundedByReferenceContainer"
- value "BoundedSetByReference<$targetClass,$limit>")
- (object Attribute
- tool "cg"
- name "UnboundedByValueContainer"
- value "UnboundedListByValue<$targetClass>")
- (object Attribute
- tool "cg"
- name "UnorderedUnboundedByValueContainer"
- value "UnboundedSetByValue<$targetClass>")
- (object Attribute
- tool "cg"
- name "UnboundedByReferenceContainer"
- value "UnboundedListByReference<$targetClass>")
- (object Attribute
- tool "cg"
- name "UnorderedUnboundedByReferenceContainer"
- value "UnboundedSetByReference<$targetClass>")
- (object Attribute
- tool "cg"
- name "QualifiedByValueContainer"
- value "AssociationByValue<$qualtype, $qualcont>")
- (object Attribute
- tool "cg"
- name "UnorderedQualifiedByValueContainer"
- value "DictionaryByValue<$qualtype, $qualcont>")
- (object Attribute
- tool "cg"
- name "QualifiedByReferenceContainer"
- value "AssociationByReference<$qualtype, $qualcont>")
- (object Attribute
- tool "cg"
- name "UnorderedQualifiedByReferenceContainer"
- value "DictionaryByReference<$qualtype, $qualcont>")
- (object Attribute
- tool "cg"
- name "AlwaysKeepOrphanedCode"
- value FALSE)))
- (object Attribute
- tool "cg"
- name "compiler2.1__Project"
- value (list Attribute_Set
- (object Attribute
- tool "cg"
- name "AllowGenerateOverNewerAnnotations"
- value FALSE)
- (object Attribute
- tool "cg"
- name "AllowGenerateOverNewerVersion"
- value FALSE)
- (object Attribute
- tool "cg"
- name "HeaderFileExtension"
- value "h")
- (object Attribute
- tool "cg"
- name "HeaderFileBackupExtension"
- value "h~")
- (object Attribute
- tool "cg"
- name "HeaderFileTemporaryExtension"
- value "h#")
- (object Attribute
- tool "cg"
- name "CodeFileExtension"
- value "cpp")
- (object Attribute
- tool "cg"
- name "CodeFileBackupExtension"
- value "cp~")
- (object Attribute
- tool "cg"
- name "CodeFileTemporaryExtension"
- value "cp#")
- (object Attribute
- tool "cg"
- name "CreateMissingDirectories"
- value TRUE)
- (object Attribute
- tool "cg"
- name "StopOnError"
- value FALSE)
- (object Attribute
- tool "cg"
- name "ErrorLimit"
- value 30)
- (object Attribute
- tool "cg"
- name "Directory"
- value "$ROSECPP_SOURCE")
- (object Attribute
- tool "cg"
- name "BooleanType"
- value "int")
- (object Attribute
- tool "cg"
- name "AllowTemplates"
- value FALSE)
- (object Attribute
- tool "cg"
- name "AllowExplicitInstantiations"
- value FALSE)
- (object Attribute
- tool "cg"
- name "AllowProtectedInheritance"
- value FALSE)
- (object Attribute
- tool "cg"
- name "OneByValueContainer"
- value "$targetClass")
- (object Attribute
- tool "cg"
- name "OneByReferenceContainer"
- value "$targetClass *")
- (object Attribute
- tool "cg"
- name "OptionalByValueContainer"
- value "OptionalByValue(sizeof($targetClass))")
- (object Attribute
- tool "cg"
- name "OptionalByReferenceContainer"
- value "$targetClass *")
- (object Attribute
- tool "cg"
- name "FixedByValueContainer"
- value "$targetClass[$limit]")
- (object Attribute
- tool "cg"
- name "UnorderedFixedByValueContainer"
- value "$targetClass[$limit]")
- (object Attribute
- tool "cg"
- name "FixedByReferenceContainer"
- value "$targetClass *[$limit]")
- (object Attribute
- tool "cg"
- name "UnorderedFixedByReferenceContainer"
- value "$targetClass *[$limit]")
- (object Attribute
- tool "cg"
- name "BoundedByValueContainer"
- value "BoundedListByValue(sizeof($targetClass),$limit)")
- (object Attribute
- tool "cg"
- name "UnorderedBoundedByValueContainer"
- value "BoundedSetByValue(sizeof($targetClass),$limit)")
- (object Attribute
- tool "cg"
- name "BoundedByReferenceContainer"
- value "BoundedListByReference($limit)")
- (object Attribute
- tool "cg"
- name "UnorderedBoundedByReferenceContainer"
- value "BoundedSetByReference($limit)")
- (object Attribute
- tool "cg"
- name "UnboundedByValueContainer"
- value "UnboundedListByValue(sizeof($targetClass))")
- (object Attribute
- tool "cg"
- name "UnorderedUnboundedByValueContainer"
- value "UnboundedSetByValue(sizeof($targetClass))")
- (object Attribute
- tool "cg"
- name "UnboundedByReferenceContainer"
- value "UnboundedListByReference")
- (object Attribute
- tool "cg"
- name "UnorderedUnboundedByReferenceContainer"
- value "UnboundedSetByReference")
- (object Attribute
- tool "cg"
- name "QualifiedByValueContainer"
- value "AssociationByValue(sizeof($qualtype), sizeof($qualcont))")
- (object Attribute
- tool "cg"
- name "UnorderedQualifiedByValueContainer"
- value "DictionaryByValue(sizeof($qualtype), sizeof($qualcont))")
- (object Attribute
- tool "cg"
- name "QualifiedByReferenceContainer"
- value "AssociationByReference(sizeof($qualtype), sizeof($qualcont))")
- (object Attribute
- tool "cg"
- name "UnorderedQualifiedByReferenceContainer"
- value "DictionaryByReference(sizeof($qualtype), sizeof($qualcont))")
- (object Attribute
- tool "cg"
- name "PathSeparator"
- value "")
- (object Attribute
- tool "cg"
- name "FileNameFormat"
- value "128vx_b")
- (object Attribute
- tool "cg"
- name "AlwaysKeepOrphanedCode"
- value FALSE)))
- (object Attribute
- tool "cg"
- name "compiler3.0__Project"
- value (list Attribute_Set
- (object Attribute
- tool "cg"
- name "AllowGenerateOverNewerAnnotations"
- value FALSE)
- (object Attribute
- tool "cg"
- name "AllowGenerateOverNewerVersion"
- value FALSE)
- (object Attribute
- tool "cg"
- name "HeaderFileExtension"
- value "h")
- (object Attribute
- tool "cg"
- name "HeaderFileBackupExtension"
- value "h~")
- (object Attribute
- tool "cg"
- name "HeaderFileTemporaryExtension"
- value "h#")
- (object Attribute
- tool "cg"
- name "CodeFileExtension"
- value "cpp")
- (object Attribute
- tool "cg"
- name "CodeFileBackupExtension"
- value "cp~")
- (object Attribute
- tool "cg"
- name "CodeFileTemporaryExtension"
- value "cp#")
- (object Attribute
- tool "cg"
- name "CreateMissingDirectories"
- value TRUE)
- (object Attribute
- tool "cg"
- name "StopOnError"
- value FALSE)
- (object Attribute
- tool "cg"
- name "ErrorLimit"
- value 30)
- (object Attribute
- tool "cg"
- name "Directory"
- value "$ROSECPP_SOURCE")
- (object Attribute
- tool "cg"
- name "BooleanType"
- value "int")
- (object Attribute
- tool "cg"
- name "AllowTemplates"
- value TRUE)
- (object Attribute
- tool "cg"
- name "AllowExplicitInstantiations"
- value FALSE)
- (object Attribute
- tool "cg"
- name "AllowProtectedInheritance"
- value TRUE)
- (object Attribute
- tool "cg"
- name "OneByValueContainer"
- value "$targetClass")
- (object Attribute
- tool "cg"
- name "OneByReferenceContainer"
- value "$targetClass *")
- (object Attribute
- tool "cg"
- name "OptionalByValueContainer"
- value "OptionalByValue<$targetClass>")
- (object Attribute
- tool "cg"
- name "OptionalByReferenceContainer"
- value "$targetClass *")
- (object Attribute
- tool "cg"
- name "FixedByValueContainer"
- value "$targetClass[$limit]")
- (object Attribute
- tool "cg"
- name "UnorderedFixedByValueContainer"
- value "$targetClass[$limit]")
- (object Attribute
- tool "cg"
- name "FixedByReferenceContainer"
- value "$targetClass *[$limit]")
- (object Attribute
- tool "cg"
- name "UnorderedFixedByReferenceContainer"
- value "$targetClass *[$limit]")
- (object Attribute
- tool "cg"
- name "BoundedByValueContainer"
- value "BoundedListByValue<$targetClass,$limit>")
- (object Attribute
- tool "cg"
- name "UnorderedBoundedByValueContainer"
- value "BoundedSetByValue<$targetClass,$limit>")
- (object Attribute
- tool "cg"
- name "BoundedByReferenceContainer"
- value "BoundedListByReference<$targetClass,$limit>")
- (object Attribute
- tool "cg"
- name "UnorderedBoundedByReferenceContainer"
- value "BoundedSetByReference<$targetClass,$limit>")
- (object Attribute
- tool "cg"
- name "UnboundedByValueContainer"
- value "UnboundedListByValue<$targetClass>")
- (object Attribute
- tool "cg"
- name "UnorderedUnboundedByValueContainer"
- value "UnboundedSetByValue<$targetClass>")
- (object Attribute
- tool "cg"
- name "UnboundedByReferenceContainer"
- value "UnboundedListByReference<$targetClass>")
- (object Attribute
- tool "cg"
- name "UnorderedUnboundedByReferenceContainer"
- value "UnboundedSetByReference<$targetClass>")
- (object Attribute
- tool "cg"
- name "QualifiedByValueContainer"
- value "AssociationByValue<$qualtype, $qualcont>")
- (object Attribute
- tool "cg"
- name "UnorderedQualifiedByValueContainer"
- value "DictionaryByValue<$qualtype, $qualcont>")
- (object Attribute
- tool "cg"
- name "QualifiedByReferenceContainer"
- value "AssociationByReference<$qualtype, $qualcont>")
- (object Attribute
- tool "cg"
- name "UnorderedQualifiedByReferenceContainer"
- value "DictionaryByReference<$qualtype, $qualcont>")
- (object Attribute
- tool "cg"
- name "PathSeparator"
- value "")
- (object Attribute
- tool "cg"
- name "FileNameFormat"
- value "128vx_b")
- (object Attribute
- tool "cg"
- name "AlwaysKeepOrphanedCode"
- value FALSE)))
- (object Attribute
- tool "cg"
- name "default__Class"
- value (list Attribute_Set
- (object Attribute
- tool "cg"
- name "CodeName"
- value "")
- (object Attribute
- tool "cg"
- name "ImplementationType"
- value "")
- (object Attribute
- tool "cg"
- name "ClassKey"
- value "class")
- (object Attribute
- tool "cg"
- name "GenerateEmptyRegions"
- value ("GenerateEmptyRegionSet" 3))
- (object Attribute
- tool "cg"
- name "GenerateEmptyRegionSet"
- value (list Attribute_Set
- (object Attribute
- tool "cg"
- name "None"
- value 0)
- (object Attribute
- tool "cg"
- name "Preserved"
- value 1)
- (object Attribute
- tool "cg"
- name "Unpreserved"
- value 2)
- (object Attribute
- tool "cg"
- name "All"
- value 3)))
- (object Attribute
- tool "cg"
- name "PutBodiesInSpec"
- value FALSE)
- (object Attribute
- tool "cg"
- name "GenerateDefaultConstructor"
- value ("GenerateSet" 199))
- (object Attribute
- tool "cg"
- name "DefaultConstructorVisibility"
- value ("VisibilitySet" 45))
- (object Attribute
- tool "cg"
- name "InlineDefaultConstructor"
- value FALSE)
- (object Attribute
- tool "cg"
- name "ExplicitDefaultConstructor"
- value FALSE)
- (object Attribute
- tool "cg"
- name "GenerateCopyConstructor"
- value ("GenerateSet" 199))
- (object Attribute
- tool "cg"
- name "CopyConstructorVisibility"
- value ("VisibilitySet" 45))
- (object Attribute
- tool "cg"
- name "InlineCopyConstructor"
- value FALSE)
- (object Attribute
- tool "cg"
- name "ExplicitCopyConstructor"
- value FALSE)
- (object Attribute
- tool "cg"
- name "GenerateDestructor"
- value TRUE)
- (object Attribute
- tool "cg"
- name "DestructorVisibility"
- value ("VisibilitySet" 45))
- (object Attribute
- tool "cg"
- name "DestructorKind"
- value ("ThreeKindSet" 200))
- (object Attribute
- tool "cg"
- name "InlineDestructor"
- value FALSE)
- (object Attribute
- tool "cg"
- name "GenerateAssignmentOperation"
- value ("GenerateSet" 199))
- (object Attribute
- tool "cg"
- name "AssignmentVisibility"
- value ("VisibilitySet" 45))
- (object Attribute
- tool "cg"
- name "AssignmentKind"
- value ("ThreeKindSet" 200))
- (object Attribute
- tool "cg"
- name "InlineAssignmentOperation"
- value FALSE)
- (object Attribute
- tool "cg"
- name "GenerateEqualityOperations"
- value ("GenerateSet" 199))
- (object Attribute
- tool "cg"
- name "EqualityVisibility"
- value ("VisibilitySet" 45))
- (object Attribute
- tool "cg"
- name "EqualityKind"
- value ("FriendKindSet" 200))
- (object Attribute
- tool "cg"
- name "InlineEqualityOperations"
- value FALSE)
- (object Attribute
- tool "cg"
- name "GenerateRelationalOperations"
- value FALSE)
- (object Attribute
- tool "cg"
- name "RelationalVisibility"
- value ("VisibilitySet" 45))
- (object Attribute
- tool "cg"
- name "RelationalKind"
- value ("FriendKindSet" 200))
- (object Attribute
- tool "cg"
- name "InlineRelationalOperations"
- value FALSE)
- (object Attribute
- tool "cg"
- name "GenerateStorageMgmtOperations"
- value FALSE)
- (object Attribute
- tool "cg"
- name "StorageMgmtVisibility"
- value ("VisibilitySet" 45))
- (object Attribute
- tool "cg"
- name "InlineStorageMgmtOperations"
- value FALSE)
- (object Attribute
- tool "cg"
- name "GenerateSubscriptOperation"
- value FALSE)
- (object Attribute
- tool "cg"
- name "SubscriptVisibility"
- value ("VisibilitySet" 45))
- (object Attribute
- tool "cg"
- name "SubscriptKind"
- value ("ThreeKindSet" 200))
- (object Attribute
- tool "cg"
- name "SubscriptResultType"
- value "")
- (object Attribute
- tool "cg"
- name "InlineSubscriptOperation"
- value FALSE)
- (object Attribute
- tool "cg"
- name "GenerateDereferenceOperation"
- value FALSE)
- (object Attribute
- tool "cg"
- name "DereferenceVisibility"
- value ("VisibilitySet" 45))
- (object Attribute
- tool "cg"
- name "DereferenceKind"
- value ("ThreeKindSet" 200))
- (object Attribute
- tool "cg"
- name "DereferenceResultType"
- value "")
- (object Attribute
- tool "cg"
- name "InlineDereferenceOperation"
- value FALSE)
- (object Attribute
- tool "cg"
- name "GenerateIndirectionOperation"
- value FALSE)
- (object Attribute
- tool "cg"
- name "IndirectionVisibility"
- value ("VisibilitySet" 45))
- (object Attribute
- tool "cg"
- name "IndirectionKind"
- value ("ThreeKindSet" 200))
- (object Attribute
- tool "cg"
- name "IndirectionResultType"
- value "")
- (object Attribute
- tool "cg"
- name "InlineIndirectionOperation"
- value FALSE)
- (object Attribute
- tool "cg"
- name "GenerateStreamOperations"
- value FALSE)
- (object Attribute
- tool "cg"
- name "StreamVisibility"
- value ("VisibilitySet" 45))
- (object Attribute
- tool "cg"
- name "InlineStreamOperations"
- value FALSE)
- (object Attribute
- tool "cg"
- name "ThreeKindSet"
- value (list Attribute_Set
- (object Attribute
- tool "cg"
- name "Common"
- value 200)
- (object Attribute
- tool "cg"
- name "Virtual"
- value 201)
- (object Attribute
- tool "cg"
- name "Abstract"
- value 202)))
- (object Attribute
- tool "cg"
- name "KindSet"
- value (list Attribute_Set
- (object Attribute
- tool "cg"
- name "Common"
- value 200)
- (object Attribute
- tool "cg"
- name "Virtual"
- value 201)
- (object Attribute
- tool "cg"
- name "Abstract"
- value 202)
- (object Attribute
- tool "cg"
- name "Static"
- value 203)))
- (object Attribute
- tool "cg"
- name "FriendKindSet"
- value (list Attribute_Set
- (object Attribute
- tool "cg"
- name "Common"
- value 200)
- (object Attribute
- tool "cg"
- name "Virtual"
- value 201)
- (object Attribute
- tool "cg"
- name "Abstract"
- value 202)
- (object Attribute
- tool "cg"
- name "Friend"
- value 204)))
- (object Attribute
- tool "cg"
- name "GenerateSet"
- value (list Attribute_Set
- (object Attribute
- tool "cg"
- name "DeclareAndDefine"
- value 199)
- (object Attribute
- tool "cg"
- name "DeclareOnly"
- value 205)
- (object Attribute
- tool "cg"
- name "DoNotDeclare"
- value 206)))
- (object Attribute
- tool "cg"
- name "VisibilitySet"
- value (list Attribute_Set
- (object Attribute
- tool "cg"
- name "Public"
- value 45)
- (object Attribute
- tool "cg"
- name "Protected"
- value 44)
- (object Attribute
- tool "cg"
- name "Private"
- value 43)
- (object Attribute
- tool "cg"
- name "Implementation"
- value 14)))))
- (object Attribute
- tool "cg"
- name "default__Module-Spec"
- value (list Attribute_Set
- (object Attribute
- tool "cg"
- name "Generate"
- value TRUE)
- (object Attribute
- tool "cg"
- name "GenerateEmptyRegions"
- value ("GenerateEmptyRegionSet" 3))
- (object Attribute
- tool "cg"
- name "GenerateEmptyRegionSet"
- value (list Attribute_Set
- (object Attribute
- tool "cg"
- name "None"
- value 0)
- (object Attribute
- tool "cg"
- name "Preserved"
- value 1)
- (object Attribute
- tool "cg"
- name "Unpreserved"
- value 2)
- (object Attribute
- tool "cg"
- name "All"
- value 3)))
- (object Attribute
- tool "cg"
- name "CmIdentification"
- value (value Text " %X% %Q% %Z% %W%"))
- (object Attribute
- tool "cg"
- name "CopyrightNotice"
- value (value Text ""))
- (object Attribute
- tool "cg"
- name "FileName"
- value "AUTO GENERATE")
- (object Attribute
- tool "cg"
- name "AllowExtensionlessFileName"
- value FALSE)
- (object Attribute
- tool "cg"
- name "InclusionProtectionSymbol"
- value "AUTO GENERATE")
- (object Attribute
- tool "cg"
- name "IncludeFormat"
- value (value Text
-|// $package
-|#include "$file"
-|
- ))
- (object Attribute
- tool "cg"
- name "IncludeBySimpleName"
- value FALSE)
- (object Attribute
- tool "cg"
- name "IncludePrecompiledHeader"
- value FALSE)
- (object Attribute
- tool "cg"
- name "IncludeOrder"
- value "AMIR")
- (object Attribute
- tool "cg"
- name "AdditionalIncludes"
- value (value Text ""))
- (object Attribute
- tool "cg"
- name "InliningStyle"
- value ("InliningStyleSet" 207))
- (object Attribute
- tool "cg"
- name "InliningStyleSet"
- value (list Attribute_Set
- (object Attribute
- tool "cg"
- name "InClassDeclaration"
- value 208)
- (object Attribute
- tool "cg"
- name "FollowingClassDeclaration"
- value 207)))
- (object Attribute
- tool "cg"
- name "TypesDefined"
- value (value Text ""))
- (object Attribute
- tool "cg"
- name "IncludeClosure"
- value (value Text ""))))
- (object Attribute
- tool "cg"
- name "default__Module-Body"
- value (list Attribute_Set
- (object Attribute
- tool "cg"
- name "Generate"
- value TRUE)
- (object Attribute
- tool "cg"
- name "GenerateEmptyRegions"
- value ("GenerateEmptyRegionSet" 3))
- (object Attribute
- tool "cg"
- name "GenerateEmptyRegionSet"
- value (list Attribute_Set
- (object Attribute
- tool "cg"
- name "None"
- value 0)
- (object Attribute
- tool "cg"
- name "Preserved"
- value 1)
- (object Attribute
- tool "cg"
- name "Unpreserved"
- value 2)
- (object Attribute
- tool "cg"
- name "All"
- value 3)))
- (object Attribute
- tool "cg"
- name "CmIdentification"
- value (value Text " %X% %Q% %Z% %W%"))
- (object Attribute
- tool "cg"
- name "CopyrightNotice"
- value (value Text ""))
- (object Attribute
- tool "cg"
- name "FileName"
- value "AUTO GENERATE")
- (object Attribute
- tool "cg"
- name "AllowExtensionlessFileName"
- value FALSE)
- (object Attribute
- tool "cg"
- name "IncludeFormat"
- value (value Text
-|// $package
-|#include "$file"
-|
- ))
- (object Attribute
- tool "cg"
- name "IncludeBySimpleName"
- value FALSE)
- (object Attribute
- tool "cg"
- name "IncludePrecompiledHeader"
- value TRUE)
- (object Attribute
- tool "cg"
- name "IncludeOrder"
- value "AMIR")
- (object Attribute
- tool "cg"
- name "AdditionalIncludes"
- value (value Text ""))
- (object Attribute
- tool "cg"
- name "InliningStyle"
- value ("InliningStyleSet" 207))
- (object Attribute
- tool "cg"
- name "InliningStyleSet"
- value (list Attribute_Set
- (object Attribute
- tool "cg"
- name "InClassDeclaration"
- value 208)
- (object Attribute
- tool "cg"
- name "FollowingClassDeclaration"
- value 207)))
- (object Attribute
- tool "cg"
- name "TypesDefined"
- value (value Text ""))
- (object Attribute
- tool "cg"
- name "IncludeClosure"
- value (value Text ""))))
- (object Attribute
- tool "cg"
- name "default__Operation"
- value (list Attribute_Set
- (object Attribute
- tool "cg"
- name "CodeName"
- value "")
- (object Attribute
- tool "cg"
- name "OperationKind"
- value ("OperationKindSet" 200))
- (object Attribute
- tool "cg"
- name "OperationKindSet"
- value (list Attribute_Set
- (object Attribute
- tool "cg"
- name "Common"
- value 200)
- (object Attribute
- tool "cg"
- name "Virtual"
- value 201)
- (object Attribute
- tool "cg"
- name "Abstract"
- value 202)
- (object Attribute
- tool "cg"
- name "Static"
- value 203)
- (object Attribute
- tool "cg"
- name "Friend"
- value 204)))
- (object Attribute
- tool "cg"
- name "GenerateAbstractBody"
- value FALSE)
- (object Attribute
- tool "cg"
- name "GenerateFriendBody"
- value FALSE)
- (object Attribute
- tool "cg"
- name "GenerateFriendDecl"
- value FALSE)
- (object Attribute
- tool "cg"
- name "SpecialDeclReturnType"
- value "")
- (object Attribute
- tool "cg"
- name "OperationIsConst"
- value FALSE)
- (object Attribute
- tool "cg"
- name "OperationIsExplicit"
- value FALSE)
- (object Attribute
- tool "cg"
- name "Inline"
- value FALSE)
- (object Attribute
- tool "cg"
- name "EntryCode"
- value (value Text ""))
- (object Attribute
- tool "cg"
- name "ExitCode"
- value (value Text ""))
- (object Attribute
- tool "cg"
- name "CCRegion"
- value "")
- (object Attribute
- tool "cg"
- name "GenerateEmptyRegions"
- value ("GenerateEmptyRegionSet" 3))
- (object Attribute
- tool "cg"
- name "GenerateEmptyRegionSet"
- value (list Attribute_Set
- (object Attribute
- tool "cg"
- name "None"
- value 0)
- (object Attribute
- tool "cg"
- name "Preserved"
- value 1)
- (object Attribute
- tool "cg"
- name "Unpreserved"
- value 2)
- (object Attribute
- tool "cg"
- name "All"
- value 3)))
- (object Attribute
- tool "cg"
- name "BodyAnnotations"
- value "")))
- (object Attribute
- tool "cg"
- name "default__Has"
- value (list Attribute_Set
- (object Attribute
- tool "cg"
- name "CodeName"
- value "")
- (object Attribute
- tool "cg"
- name "Ordered"
- value TRUE)
- (object Attribute
- tool "cg"
- name "NameIfUnlabeled"
- value "the_$supplier")
- (object Attribute
- tool "cg"
- name "GenerateDataMember"
- value TRUE)
- (object Attribute
- tool "cg"
- name "DataMemberName"
- value "$relationship")
- (object Attribute
- tool "cg"
- name "DataMemberVisibility"
- value ("DataMemberVisibilitySet" 14))
- (object Attribute
- tool "cg"
- name "DataMemberVisibilitySet"
- value (list Attribute_Set
- (object Attribute
- tool "cg"
- name "Public"
- value 45)
- (object Attribute
- tool "cg"
- name "Protected"
- value 44)
- (object Attribute
- tool "cg"
- name "Private"
- value 43)
- (object Attribute
- tool "cg"
- name "Implementation"
- value 14)
- (object Attribute
- tool "cg"
- name "AtRelationshipVisibility"
- value 210)))
- (object Attribute
- tool "cg"
- name "DataMemberMutability"
- value ("DataMemberMutabilitySet" 0))
- (object Attribute
- tool "cg"
- name "DataMemberMutabilitySet"
- value (list Attribute_Set
- (object Attribute
- tool "cg"
- name "Unrestricted"
- value 0)
- (object Attribute
- tool "cg"
- name "Mutable"
- value 1)
- (object Attribute
- tool "cg"
- name "Const"
- value 2)))
- (object Attribute
- tool "cg"
- name "DataMemberIsVolatile"
- value FALSE)
- (object Attribute
- tool "cg"
- name "DataMemberFieldSize"
- value "")
- (object Attribute
- tool "cg"
- name "InitialValue"
- value (value Text ""))
- (object Attribute
- tool "cg"
- name "GenerateGetOperation"
- value TRUE)
- (object Attribute
- tool "cg"
- name "GenerateSetOperation"
- value TRUE)
- (object Attribute
- tool "cg"
- name "GetName"
- value "get_$relationship")
- (object Attribute
- tool "cg"
- name "SetName"
- value "set_$relationship")
- (object Attribute
- tool "cg"
- name "GetSetKinds"
- value ("GetSetKindsSet" 200))
- (object Attribute
- tool "cg"
- name "GetSetKindsSet"
- value (list Attribute_Set
- (object Attribute
- tool "cg"
- name "Common"
- value 200)
- (object Attribute
- tool "cg"
- name "Virtual"
- value 201)
- (object Attribute
- tool "cg"
- name "Abstract"
- value 202)
- (object Attribute
- tool "cg"
- name "Static"
- value 203)
- (object Attribute
- tool "cg"
- name "Friend"
- value 204)))
- (object Attribute
- tool "cg"
- name "ContainerClass"
- value "")
- (object Attribute
- tool "cg"
- name "SelectorName"
- value "")
- (object Attribute
- tool "cg"
- name "SelectorType"
- value "")
- (object Attribute
- tool "cg"
- name "GetIsConst"
- value TRUE)
- (object Attribute
- tool "cg"
- name "GetResultIsConst"
- value ("GetResultIsConstSet" 2))
- (object Attribute
- tool "cg"
- name "GetResultIsConstSet"
- value (list Attribute_Set
- (object Attribute
- tool "cg"
- name "False"
- value 0)
- (object Attribute
- tool "cg"
- name "True"
- value 1)
- (object Attribute
- tool "cg"
- name "Same_As_Function"
- value 2)))
- (object Attribute
- tool "cg"
- name "GetSetByReference"
- value FALSE)
- (object Attribute
- tool "cg"
- name "InlineGet"
- value TRUE)
- (object Attribute
- tool "cg"
- name "SetReturnsValue"
- value FALSE)
- (object Attribute
- tool "cg"
- name "InlineSet"
- value TRUE)
- (object Attribute
- tool "cg"
- name "ForwardReferenceOnly"
- value FALSE)
- (object Attribute
- tool "cg"
- name "HasRelTypeSet"
- value (list Attribute_Set
- (object Attribute
- tool "cg"
- name "Array"
- value 24)
- (object Attribute
- tool "cg"
- name "Sequence"
- value 47)))))
- (object Attribute
- tool "cg"
- name "default__Association"
- value (list Attribute_Set
- (object Attribute
- tool "cg"
- name "NameIfUnlabeled"
- value "the_$targetClass")))
- (object Attribute
- tool "cg"
- name "default__Inherit"
- value (list Attribute_Set
- (object Attribute
- tool "cg"
- name "InstanceArguments"
- value "")))
- (object Attribute
- tool "cg"
- name "default__Role"
- value (list Attribute_Set
- (object Attribute
- tool "cg"
- name "CodeName"
- value "")
- (object Attribute
- tool "cg"
- name "ForwardReferenceOnly"
- value FALSE)
- (object Attribute
- tool "cg"
- name "NameIfUnlabeled"
- value "the_$targetClass")
- (object Attribute
- tool "cg"
- name "GenerateDataMember"
- value TRUE)
- (object Attribute
- tool "cg"
- name "DataMemberName"
- value "$target")
- (object Attribute
- tool "cg"
- name "DataMemberVisibility"
- value ("DataMemberVisibilitySet" 14))
- (object Attribute
- tool "cg"
- name "DataMemberVisibilitySet"
- value (list Attribute_Set
- (object Attribute
- tool "cg"
- name "Public"
- value 45)
- (object Attribute
- tool "cg"
- name "Protected"
- value 44)
- (object Attribute
- tool "cg"
- name "Private"
- value 43)
- (object Attribute
- tool "cg"
- name "Implementation"
- value 14)
- (object Attribute
- tool "cg"
- name "AtRelationshipVisibility"
- value 210)))
- (object Attribute
- tool "cg"
- name "DataMemberMutability"
- value ("DataMemberMutabilitySet" 0))
- (object Attribute
- tool "cg"
- name "DataMemberMutabilitySet"
- value (list Attribute_Set
- (object Attribute
- tool "cg"
- name "Unrestricted"
- value 0)
- (object Attribute
- tool "cg"
- name "Mutable"
- value 1)
- (object Attribute
- tool "cg"
- name "Const"
- value 2)))
- (object Attribute
- tool "cg"
- name "DataMemberIsVolatile"
- value FALSE)
- (object Attribute
- tool "cg"
- name "DataMemberFieldSize"
- value "")
- (object Attribute
- tool "cg"
- name "InitialValue"
- value (value Text ""))
- (object Attribute
- tool "cg"
- name "ContainerClass"
- value "")
- (object Attribute
- tool "cg"
- name "ContainerGet"
- value "$data.get($keys)")
- (object Attribute
- tool "cg"
- name "ContainerSet"
- value "$data.set($keys,$value)")
- (object Attribute
- tool "cg"
- name "QualifiedContainer"
- value "")
- (object Attribute
- tool "cg"
- name "AssocClassContainer"
- value "$supplier *")
- (object Attribute
- tool "cg"
- name "AssocClassInitialValue"
- value (value Text ""))
- (object Attribute
- tool "cg"
- name "GetSetKinds"
- value ("GetSetKindsSet" 200))
- (object Attribute
- tool "cg"
- name "GetSetKindsSet"
- value (list Attribute_Set
- (object Attribute
- tool "cg"
- name "Common"
- value 200)
- (object Attribute
- tool "cg"
- name "Virtual"
- value 201)
- (object Attribute
- tool "cg"
- name "Abstract"
- value 202)
- (object Attribute
- tool "cg"
- name "Static"
- value 203)
- (object Attribute
- tool "cg"
- name "Friend"
- value 204)))
- (object Attribute
- tool "cg"
- name "GetSetByReference"
- value FALSE)
- (object Attribute
- tool "cg"
- name "GenerateGetOperation"
- value TRUE)
- (object Attribute
- tool "cg"
- name "GetName"
- value "get_$target")
- (object Attribute
- tool "cg"
- name "GetIsConst"
- value TRUE)
- (object Attribute
- tool "cg"
- name "GetResultIsConst"
- value ("GetResultIsConstSet" 2))
- (object Attribute
- tool "cg"
- name "GetResultIsConstSet"
- value (list Attribute_Set
- (object Attribute
- tool "cg"
- name "False"
- value 0)
- (object Attribute
- tool "cg"
- name "True"
- value 1)
- (object Attribute
- tool "cg"
- name "Same_As_Function"
- value 2)))
- (object Attribute
- tool "cg"
- name "InlineGet"
- value TRUE)
- (object Attribute
- tool "cg"
- name "GenerateSetOperation"
- value TRUE)
- (object Attribute
- tool "cg"
- name "SetName"
- value "set_$target")
- (object Attribute
- tool "cg"
- name "SetReturnsValue"
- value FALSE)
- (object Attribute
- tool "cg"
- name "InlineSet"
- value TRUE)
- (object Attribute
- tool "cg"
- name "QualifiedGetSetByReference"
- value ("QualifiedGetSetByReferenceSet" 2))
- (object Attribute
- tool "cg"
- name "QualifiedGetSetByReferenceSet"
- value (list Attribute_Set
- (object Attribute
- tool "cg"
- name "False"
- value 0)
- (object Attribute
- tool "cg"
- name "True"
- value 1)
- (object Attribute
- tool "cg"
- name "Same_As_GetSetByReference"
- value 2)))
- (object Attribute
- tool "cg"
- name "GenerateQualifiedGetOperation"
- value TRUE)
- (object Attribute
- tool "cg"
- name "QualifiedGetName"
- value "get_$target")
- (object Attribute
- tool "cg"
- name "QualifiedGetIsConst"
- value TRUE)
- (object Attribute
- tool "cg"
- name "QualifiedGetResultIsConst"
- value ("GetResultIsConstSet" 2))
- (object Attribute
- tool "cg"
- name "InlineQualifiedGet"
- value TRUE)
- (object Attribute
- tool "cg"
- name "GenerateQualifiedSetOperation"
- value TRUE)
- (object Attribute
- tool "cg"
- name "QualifiedSetName"
- value "set_$target")
- (object Attribute
- tool "cg"
- name "QualifiedSetReturnsValue"
- value FALSE)
- (object Attribute
- tool "cg"
- name "InlineQualifiedSet"
- value TRUE)
- (object Attribute
- tool "cg"
- name "GenerateAssocClassDataMember"
- value TRUE)
- (object Attribute
- tool "cg"
- name "AssocClassDataMemberName"
- value "$target")
- (object Attribute
- tool "cg"
- name "AssocClassDataMemberVisibility"
- value ("DataMemberVisibilitySet" 14))
- (object Attribute
- tool "cg"
- name "DataMemberVisibilitySet"
- value (list Attribute_Set
- (object Attribute
- tool "cg"
- name "Public"
- value 45)
- (object Attribute
- tool "cg"
- name "Protected"
- value 44)
- (object Attribute
- tool "cg"
- name "Private"
- value 43)
- (object Attribute
- tool "cg"
- name "Implementation"
- value 14)
- (object Attribute
- tool "cg"
- name "AtRelationshipVisibility"
- value 210)))
- (object Attribute
- tool "cg"
- name "AssocClassDataMemberMutability"
- value ("DataMemberMutabilitySet" 0))
- (object Attribute
- tool "cg"
- name "DataMemberMutabilitySet"
- value (list Attribute_Set
- (object Attribute
- tool "cg"
- name "Unrestricted"
- value 0)
- (object Attribute
- tool "cg"
- name "Mutable"
- value 1)
- (object Attribute
- tool "cg"
- name "Const"
- value 2)))
- (object Attribute
- tool "cg"
- name "AssocClassDataMemberIsVolatile"
- value FALSE)
- (object Attribute
- tool "cg"
- name "AssocClassGetSetKinds"
- value ("GetSetKindsSet" 200))
- (object Attribute
- tool "cg"
- name "GenerateAssocClassGetOperation"
- value TRUE)
- (object Attribute
- tool "cg"
- name "AssocClassGetName"
- value "get_$target")
- (object Attribute
- tool "cg"
- name "AssocClassGetIsConst"
- value TRUE)
- (object Attribute
- tool "cg"
- name "AssocClassGetResultIsConst"
- value ("GetResultIsConstSet" 2))
- (object Attribute
- tool "cg"
- name "InlineAssocClassGet"
- value TRUE)
- (object Attribute
- tool "cg"
- name "GenerateAssocClassSetOperation"
- value TRUE)
- (object Attribute
- tool "cg"
- name "AssocClassSetName"
- value "set_$target")
- (object Attribute
- tool "cg"
- name "AssocClassSetReturnsValue"
- value FALSE)
- (object Attribute
- tool "cg"
- name "InlineAssocClassSet"
- value TRUE)
- (object Attribute
- tool "cg"
- name "AssocClassForwardReferenceOnly"
- value TRUE)
- (object Attribute
- tool "cg"
- name "AssocTypeSet"
- value (list Attribute_Set
- (object Attribute
- tool "cg"
- name "Array"
- value 24)
- (object Attribute
- tool "cg"
- name "Sequence"
- value 47)))))
- (object Attribute
- tool "cg"
- name "default__Attribute"
- value (list Attribute_Set
- (object Attribute
- tool "cg"
- name "CodeName"
- value "")
- (object Attribute
- tool "cg"
- name "GenerateDataMember"
- value TRUE)
- (object Attribute
- tool "cg"
- name "DataMemberName"
- value "$attribute")
- (object Attribute
- tool "cg"
- name "DataMemberVisibility"
- value ("DataMemberVisibilitySet" 14))
- (object Attribute
- tool "cg"
- name "DataMemberVisibilitySet"
- value (list Attribute_Set
- (object Attribute
- tool "cg"
- name "Public"
- value 45)
- (object Attribute
- tool "cg"
- name "Protected"
- value 44)
- (object Attribute
- tool "cg"
- name "Private"
- value 43)
- (object Attribute
- tool "cg"
- name "Implementation"
- value 14)
- (object Attribute
- tool "cg"
- name "AtAttributeVisibility"
- value 211)))
- (object Attribute
- tool "cg"
- name "DataMemberMutability"
- value ("DataMemberMutabilitySet" 0))
- (object Attribute
- tool "cg"
- name "DataMemberMutabilitySet"
- value (list Attribute_Set
- (object Attribute
- tool "cg"
- name "Unrestricted"
- value 0)
- (object Attribute
- tool "cg"
- name "Mutable"
- value 1)
- (object Attribute
- tool "cg"
- name "Const"
- value 2)))
- (object Attribute
- tool "cg"
- name "DataMemberIsVolatile"
- value FALSE)
- (object Attribute
- tool "cg"
- name "DataMemberFieldSize"
- value "")
- (object Attribute
- tool "cg"
- name "GenerateGetOperation"
- value TRUE)
- (object Attribute
- tool "cg"
- name "GenerateSetOperation"
- value TRUE)
- (object Attribute
- tool "cg"
- name "GetName"
- value "get_$attribute")
- (object Attribute
- tool "cg"
- name "SetName"
- value "set_$attribute")
- (object Attribute
- tool "cg"
- name "GetSetKinds"
- value ("GetSetKindsSet" 200))
- (object Attribute
- tool "cg"
- name "GetSetKindsSet"
- value (list Attribute_Set
- (object Attribute
- tool "cg"
- name "Common"
- value 200)
- (object Attribute
- tool "cg"
- name "Virtual"
- value 201)
- (object Attribute
- tool "cg"
- name "Abstract"
- value 202)
- (object Attribute
- tool "cg"
- name "Static"
- value 203)
- (object Attribute
- tool "cg"
- name "Friend"
- value 204)))
- (object Attribute
- tool "cg"
- name "GetIsConst"
- value TRUE)
- (object Attribute
- tool "cg"
- name "GetResultIsConst"
- value ("GetResultIsConstSet" 2))
- (object Attribute
- tool "cg"
- name "GetResultIsConstSet"
- value (list Attribute_Set
- (object Attribute
- tool "cg"
- name "False"
- value 0)
- (object Attribute
- tool "cg"
- name "True"
- value 1)
- (object Attribute
- tool "cg"
- name "Same_As_Function"
- value 2)))
- (object Attribute
- tool "cg"
- name "GetSetByReference"
- value FALSE)
- (object Attribute
- tool "cg"
- name "InlineGet"
- value TRUE)
- (object Attribute
- tool "cg"
- name "SetReturnsValue"
- value FALSE)
- (object Attribute
- tool "cg"
- name "InlineSet"
- value TRUE)
- (object Attribute
- tool "cg"
- name "CCRegion"
- value "")))
- (object Attribute
- tool "cg"
- name "default__Uses"
- value (list Attribute_Set
- (object Attribute
- tool "cg"
- name "ForwardReferenceOnly"
- value FALSE)
- (object Attribute
- tool "cg"
- name "BodyReferenceOnly"
- value FALSE)))
- (object Attribute
- tool "cg"
- name "default__Subsystem"
- value (list Attribute_Set
- (object Attribute
- tool "cg"
- name "Directory"
- value "AUTO GENERATE")
- (object Attribute
- tool "cg"
- name "DirectoryIsOnSearchList"
- value FALSE)
- (object Attribute
- tool "cg"
- name "PrecompiledHeader"
- value "")))
- (object Attribute
- tool "cg"
- name "default__Category"
- value (list Attribute_Set
- (object Attribute
- tool "cg"
- name "IsNamespace"
- value FALSE)
- (object Attribute
- tool "cg"
- name "Indent"
- value 2)
- (object Attribute
- tool "cg"
- name "CodeName"
- value "")
- (object Attribute
- tool "cg"
- name "GenerateEmptyRegions"
- value ("GenerateEmptyRegionSet" 3))
- (object Attribute
- tool "cg"
- name "GenerateEmptyRegionSet"
- value (list Attribute_Set
- (object Attribute
- tool "cg"
- name "None"
- value 0)
- (object Attribute
- tool "cg"
- name "Preserved"
- value 1)
- (object Attribute
- tool "cg"
- name "Unpreserved"
- value 2)
- (object Attribute
- tool "cg"
- name "All"
- value 3)))))
- (object Attribute
- tool "MSVC"
- name "propertyId"
- value "809135966")
- (object Attribute
- tool "MSVC"
- name "default__Project"
- value (list Attribute_Set
- (object Attribute
- tool "MSVC"
- name "Version"
- value "5.0")))
- (object Attribute
- tool "MSVC"
- name "default__Class"
- value (list Attribute_Set
- (object Attribute
- tool "MSVC"
- name "Type"
- value ("MSVCClassTypeSet" 0))
- (object Attribute
- tool "MSVC"
- name "MSVCClassTypeSet"
- value (list Attribute_Set
- (object Attribute
- tool "MSVC"
- name "Normal"
- value 0)
- (object Attribute
- tool "MSVC"
- name "Interface_Part"
- value 1)
- (object Attribute
- tool "MSVC"
- name "Connection_Part"
- value 2)
- (object Attribute
- tool "MSVC"
- name "Class_Factory"
- value 3)))
- (object Attribute
- tool "MSVC"
- name "CObjectFunctionality"
- value ("CObjectFunctionalitySet" 0))
- (object Attribute
- tool "MSVC"
- name "CObjectFunctionalitySet"
- value (list Attribute_Set
- (object Attribute
- tool "MSVC"
- name "None"
- value 0)
- (object Attribute
- tool "MSVC"
- name "Dynamic"
- value 1)
- (object Attribute
- tool "MSVC"
- name "Dyncreate"
- value 2)
- (object Attribute
- tool "MSVC"
- name "Serial"
- value 3)))
- (object Attribute
- tool "MSVC"
- name "GenerateOverrideGroup"
- value FALSE)
- (object Attribute
- tool "MSVC"
- name "GenerateDataGroup"
- value FALSE)
- (object Attribute
- tool "MSVC"
- name "AFX_DATA_Entries"
- value (value Text ""))
- (object Attribute
- tool "MSVC"
- name "GenerateFieldGroup"
- value FALSE)
- (object Attribute
- tool "MSVC"
- name "AFX_FIELD_Entries"
- value (value Text ""))
- (object Attribute
- tool "MSVC"
- name "GenerateMessageGroup"
- value FALSE)
- (object Attribute
- tool "MSVC"
- name "GenerateMessageMap"
- value FALSE)
- (object Attribute
- tool "MSVC"
- name "AFX_MSG_MAP_Entries"
- value (value Text ""))
- (object Attribute
- tool "MSVC"
- name "MESSAGE_MAP_Entries"
- value (value Text ""))
- (object Attribute
- tool "MSVC"
- name "OLEFactory"
- value ("OLEFactorySet" 0))
- (object Attribute
- tool "MSVC"
- name "OLEFactorySet"
- value (list Attribute_Set
- (object Attribute
- tool "MSVC"
- name "None"
- value 0)
- (object Attribute
- tool "MSVC"
- name "Built_in"
- value 1)
- (object Attribute
- tool "MSVC"
- name "Simple"
- value 2)
- (object Attribute
- tool "MSVC"
- name "Licensed"
- value 3)))
- (object Attribute
- tool "MSVC"
- name "OLEName"
- value "")
- (object Attribute
- tool "MSVC"
- name "OLEClassID"
- value "")
- (object Attribute
- tool "MSVC"
- name "GenerateOLECtlType"
- value FALSE)
- (object Attribute
- tool "MSVC"
- name "OLECtlType"
- value "")
- (object Attribute
- tool "MSVC"
- name "GenerateOLETypeLib"
- value FALSE)
- (object Attribute
- tool "MSVC"
- name "OLETypeLibID"
- value "")
- (object Attribute
- tool "MSVC"
- name "OLETypeLibMajor"
- value "")
- (object Attribute
- tool "MSVC"
- name "OLETypeLibMinor"
- value "")
- (object Attribute
- tool "MSVC"
- name "GeneratePropPageIDs"
- value FALSE)
- (object Attribute
- tool "MSVC"
- name "OLEPropPageIDs"
- value (value Text ""))
- (object Attribute
- tool "MSVC"
- name "GenerateDispatchMap"
- value FALSE)
- (object Attribute
- tool "MSVC"
- name "AFX_DISPATCH_Entries"
- value (value Text ""))
- (object Attribute
- tool "MSVC"
- name "AFX_DISPATCH_MAP_Entries"
- value (value Text ""))
- (object Attribute
- tool "MSVC"
- name "DISPATCH_MAP_Entries"
- value (value Text ""))
- (object Attribute
- tool "MSVC"
- name "StockProperties"
- value (value Text ""))
- (object Attribute
- tool "MSVC"
- name "StockFunctions"
- value (value Text ""))
- (object Attribute
- tool "MSVC"
- name "DispatchDefValue"
- value "")
- (object Attribute
- tool "MSVC"
- name "GenerateDispIdEnum"
- value FALSE)
- (object Attribute
- tool "MSVC"
- name "AFX_DISP_ID_Entries"
- value (value Text ""))
- (object Attribute
- tool "MSVC"
- name "GenerateInterfaceMap"
- value FALSE)
- (object Attribute
- tool "MSVC"
- name "INTERFACE_MAP_Entries"
- value (value Text ""))
- (object Attribute
- tool "MSVC"
- name "InitInterface"
- value "")
- (object Attribute
- tool "MSVC"
- name "GenerateEventMap"
- value FALSE)
- (object Attribute
- tool "MSVC"
- name "AFX_EVENT_Entries"
- value (value Text ""))
- (object Attribute
- tool "MSVC"
- name "AFX_EVENT_MAP_Entries"
- value (value Text ""))
- (object Attribute
- tool "MSVC"
- name "EVENT_MAP_Entries"
- value (value Text ""))
- (object Attribute
- tool "MSVC"
- name "StockEvents"
- value (value Text ""))
- (object Attribute
- tool "MSVC"
- name "GenerateEventSinkMap"
- value FALSE)
- (object Attribute
- tool "MSVC"
- name "AFX_EVENTSINK_Entries"
- value (value Text ""))
- (object Attribute
- tool "MSVC"
- name "AFX_EVENTSINK_MAP_Entries"
- value (value Text ""))
- (object Attribute
- tool "MSVC"
- name "EVENTSINK_MAP_Entries"
- value (value Text ""))
- (object Attribute
- tool "MSVC"
- name "PropNotifySinks"
- value (value Text ""))
- (object Attribute
- tool "MSVC"
- name "GenerateConnectionMap"
- value FALSE)
- (object Attribute
- tool "MSVC"
- name "CONNECTION_MAP_Entries"
- value (value Text ""))
- (object Attribute
- tool "MSVC"
- name "ConnectionPointIID"
- value "")
- (object Attribute
- tool "MSVC"
- name "InheritanceType"
- value "")
- (object Attribute
- tool "MSVC"
- name "DeclSpec"
- value "")
- (object Attribute
- tool "MSVC"
- name "OLECommands"
- value (value Text ""))
- (object Attribute
- tool "MSVC"
- name "MFCDeclares"
- value (value Text ""))
- (object Attribute
- tool "MSVC"
- name "MFCImplements"
- value (value Text ""))
- (object Attribute
- tool "MSVC"
- name "ATL_Declares"
- value (value Text ""))
- (object Attribute
- tool "MSVC"
- name "GenerateCOMMap"
- value FALSE)
- (object Attribute
- tool "MSVC"
- name "COM_MAP_Entries"
- value (value Text ""))
- (object Attribute
- tool "MSVC"
- name "GenerateConnectionPointMap"
- value FALSE)
- (object Attribute
- tool "MSVC"
- name "CONNECTION_POINT_MAP_Entries"
- value (value Text ""))
- (object Attribute
- tool "MSVC"
- name "GenerateMsgMap"
- value FALSE)
- (object Attribute
- tool "MSVC"
- name "MSG_MAP_Entries"
- value (value Text ""))
- (object Attribute
- tool "MSVC"
- name "GeneratePropertyMap"
- value FALSE)
- (object Attribute
- tool "MSVC"
- name "PROPERTY_MAP_Entries"
- value (value Text ""))))
- (object Attribute
- tool "MSVC"
- name "default__Operation"
- value (list Attribute_Set
- (object Attribute
- tool "MSVC"
- name "Type"
- value ("MSVCOperationTypeSet" 0))
- (object Attribute
- tool "MSVC"
- name "MSVCOperationTypeSet"
- value (list Attribute_Set
- (object Attribute
- tool "MSVC"
- name "Normal"
- value 0)
- (object Attribute
- tool "MSVC"
- name "Virtual_Override"
- value 1)
- (object Attribute
- tool "MSVC"
- name "Message_Handler"
- value 2)
- (object Attribute
- tool "MSVC"
- name "Dispatch_Handler"
- value 3)
- (object Attribute
- tool "MSVC"
- name "Event_Firing_Function"
- value 4)
- (object Attribute
- tool "MSVC"
- name "Event_Sink_Handler"
- value 5)
- (object Attribute
- tool "MSVC"
- name "Std_OLE_Method"
- value 6)
- (object Attribute
- tool "MSVC"
- name "Command_Parser"
- value 7)
- (object Attribute
- tool "MSVC"
- name "Property_Get_Function"
- value 8)
- (object Attribute
- tool "MSVC"
- name "Property_Set_Function"
- value 9)
- (object Attribute
- tool "MSVC"
- name "Property_Notify_Function"
- value 10)
- (object Attribute
- tool "MSVC"
- name "Macro_Generated_Function"
- value 11)))
- (object Attribute
- tool "MSVC"
- name "AFX_MSG_MAP_Entries"
- value (value Text ""))
- (object Attribute
- tool "MSVC"
- name "MESSAGE_MAP_Entries"
- value (value Text ""))
- (object Attribute
- tool "MSVC"
- name "AFX_DISPATCH_MAP_Entries"
- value (value Text ""))
- (object Attribute
- tool "MSVC"
- name "DISPATCH_MAP_Entries"
- value (value Text ""))
- (object Attribute
- tool "MSVC"
- name "AFX_EVENT_MAP_Entries"
- value (value Text ""))
- (object Attribute
- tool "MSVC"
- name "EVENT_MAP_Entries"
- value (value Text ""))
- (object Attribute
- tool "MSVC"
- name "AFX_EVENTSINK_MAP_Entries"
- value (value Text ""))
- (object Attribute
- tool "MSVC"
- name "EVENTSINK_MAP_Entries"
- value (value Text ""))
- (object Attribute
- tool "MSVC"
- name "CallType"
- value "")
- (object Attribute
- tool "MSVC"
- name "DeclSpec"
- value "")
- (object Attribute
- tool "MSVC"
- name "BodyImage"
- value (value Text ""))))
- (object Attribute
- tool "MSVC"
- name "default__Role"
- value (list Attribute_Set
- (object Attribute
- tool "MSVC"
- name "Type"
- value ("MSVCAttributeTypeSet" 0))
- (object Attribute
- tool "MSVC"
- name "MSVCAttributeTypeSet"
- value (list Attribute_Set
- (object Attribute
- tool "MSVC"
- name "Normal"
- value 0)
- (object Attribute
- tool "MSVC"
- name "Member_Property"
- value 1)
- (object Attribute
- tool "MSVC"
- name "Get_Set_Property"
- value 2)
- (object Attribute
- tool "MSVC"
- name "Dialog_Data"
- value 3)
- (object Attribute
- tool "MSVC"
- name "Field_Data"
- value 4)
- (object Attribute
- tool "MSVC"
- name "Stock_Property"
- value 5)))
- (object Attribute
- tool "MSVC"
- name "AFX_DISPATCH_MAP_Entries"
- value (value Text ""))
- (object Attribute
- tool "MSVC"
- name "DISPATCH_MAP_Entries"
- value (value Text ""))
- (object Attribute
- tool "MSVC"
- name "DeclSpec"
- value "")
- (object Attribute
- tool "MSVC"
- name "PointerBase"
- value "")
- (object Attribute
- tool "MSVC"
- name "CallType"
- value "")
- (object Attribute
- tool "MSVC"
- name "StockPropertyImplementation"
- value "")))
- (object Attribute
- tool "MSVC"
- name "default__Has"
- value (list Attribute_Set
- (object Attribute
- tool "MSVC"
- name "Type"
- value ("MSVCAttributeTypeSet" 0))
- (object Attribute
- tool "MSVC"
- name "MSVCAttributeTypeSet"
- value (list Attribute_Set
- (object Attribute
- tool "MSVC"
- name "Normal"
- value 0)
- (object Attribute
- tool "MSVC"
- name "Member_Property"
- value 1)
- (object Attribute
- tool "MSVC"
- name "Get_Set_Property"
- value 2)
- (object Attribute
- tool "MSVC"
- name "Dialog_Data"
- value 3)
- (object Attribute
- tool "MSVC"
- name "Field_Data"
- value 4)
- (object Attribute
- tool "MSVC"
- name "Stock_Property"
- value 5)))
- (object Attribute
- tool "MSVC"
- name "AFX_DISPATCH_MAP_Entries"
- value (value Text ""))
- (object Attribute
- tool "MSVC"
- name "DISPATCH_MAP_Entries"
- value (value Text ""))
- (object Attribute
- tool "MSVC"
- name "DeclSpec"
- value "")
- (object Attribute
- tool "MSVC"
- name "PointerBase"
- value "")
- (object Attribute
- tool "MSVC"
- name "CallType"
- value "")
- (object Attribute
- tool "MSVC"
- name "StockPropertyImplementation"
- value "")))
- (object Attribute
- tool "MSVC"
- name "default__Attribute"
- value (list Attribute_Set
- (object Attribute
- tool "MSVC"
- name "Type"
- value ("MSVCAttributeTypeSet" 0))
- (object Attribute
- tool "MSVC"
- name "MSVCAttributeTypeSet"
- value (list Attribute_Set
- (object Attribute
- tool "MSVC"
- name "Normal"
- value 0)
- (object Attribute
- tool "MSVC"
- name "Member_Property"
- value 1)
- (object Attribute
- tool "MSVC"
- name "Get_Set_Property"
- value 2)
- (object Attribute
- tool "MSVC"
- name "Dialog_Data"
- value 3)
- (object Attribute
- tool "MSVC"
- name "Field_Data"
- value 4)
- (object Attribute
- tool "MSVC"
- name "Stock_Property"
- value 5)))
- (object Attribute
- tool "MSVC"
- name "AFX_DISPATCH_MAP_Entries"
- value (value Text ""))
- (object Attribute
- tool "MSVC"
- name "DISPATCH_MAP_Entries"
- value (value Text ""))
- (object Attribute
- tool "MSVC"
- name "DeclSpec"
- value "")
- (object Attribute
- tool "MSVC"
- name "PointerBase"
- value "")
- (object Attribute
- tool "MSVC"
- name "CallType"
- value "")
- (object Attribute
- tool "MSVC"
- name "StockPropertyImplementation"
- value "")))
- (object Attribute
- tool "MSVC"
- name "default__Module-Spec"
- value (list Attribute_Set
- (object Attribute
- tool "MSVC"
- name "GenerateIncludesGroup"
- value FALSE)
- (object Attribute
- tool "MSVC"
- name "AFX_INCLUDES_Entries"
- value (value Text ""))
- (object Attribute
- tool "MSVC"
- name "GenerateInsertLocation"
- value FALSE)))
- (object Attribute
- tool "MSVC"
- name "default__Module-Body"
- value (list Attribute_Set
- (object Attribute
- tool "MSVC"
- name "GenerateIncludesGroup"
- value FALSE)
- (object Attribute
- tool "MSVC"
- name "AFX_INCLUDES_Entries"
- value (value Text ""))
- (object Attribute
- tool "MSVC"
- name "GenerateInsertLocation"
- value FALSE)))
- (object Attribute
- tool "cg"
- name "HiddenTool"
- value FALSE)
- (object Attribute
- tool "Rose Model Integrator"
- name "HiddenTool"
- value FALSE)
- (object Attribute
- tool "Rose Web Publisher"
- name "HiddenTool"
- value FALSE)
- (object Attribute
- tool "SoDA"
- name "HiddenTool"
- value FALSE)
- (object Attribute
- tool "TopLink"
- name "HiddenTool"
- value FALSE)
- (object Attribute
- tool "COM"
- name "propertyId"
- value "783606378")
- (object Attribute
- tool "COM"
- name "default__Class"
- value (list Attribute_Set
- (object Attribute
- tool "COM"
- name "TypeKinds"
- value (list Attribute_Set
- (object Attribute
- tool "COM"
- name "enum"
- value 100)
- (object Attribute
- tool "COM"
- name "record"
- value 101)
- (object Attribute
- tool "COM"
- name "module"
- value 102)
- (object Attribute
- tool "COM"
- name "interface"
- value 103)
- (object Attribute
- tool "COM"
- name "dispinterface"
- value 104)
- (object Attribute
- tool "COM"
- name "coclass"
- value 105)
- (object Attribute
- tool "COM"
- name "alias"
- value 106)
- (object Attribute
- tool "COM"
- name "union"
- value 107)
- (object Attribute
- tool "COM"
- name "max"
- value 108)
- (object Attribute
- tool "COM"
- name "(none)"
- value 109)))
- (object Attribute
- tool "COM"
- name "Generate"
- value TRUE)
- (object Attribute
- tool "COM"
- name "kind"
- value ("TypeKinds" 109))
- (object Attribute
- tool "COM"
- name "uuid"
- value "")
- (object Attribute
- tool "COM"
- name "version"
- value "")
- (object Attribute
- tool "COM"
- name "helpstring"
- value "")
- (object Attribute
- tool "COM"
- name "helpcontext"
- value "")
- (object Attribute
- tool "COM"
- name "attributes"
- value "")
- (object Attribute
- tool "COM"
- name "dllname"
- value "")
- (object Attribute
- tool "COM"
- name "alias"
- value "")))
- (object Attribute
- tool "COM"
- name "default__Operation"
- value (list Attribute_Set
- (object Attribute
- tool "COM"
- name "Generate"
- value TRUE)
- (object Attribute
- tool "COM"
- name "id"
- value "")
- (object Attribute
- tool "COM"
- name "helpstring"
- value "")
- (object Attribute
- tool "COM"
- name "attributes"
- value "")))
- (object Attribute
- tool "COM"
- name "default__Attribute"
- value (list Attribute_Set
- (object Attribute
- tool "COM"
- name "Generate"
- value TRUE)
- (object Attribute
- tool "COM"
- name "id"
- value "")
- (object Attribute
- tool "COM"
- name "helpstring"
- value "")
- (object Attribute
- tool "COM"
- name "attributes"
- value "")))
- (object Attribute
- tool "COM"
- name "default__Module-Spec"
- value (list Attribute_Set
- (object Attribute
- tool "COM"
- name "Generate"
- value TRUE)
- (object Attribute
- tool "COM"
- name "filename"
- value "")
- (object Attribute
- tool "COM"
- name "library"
- value "")
- (object Attribute
- tool "COM"
- name "uuid"
- value "")
- (object Attribute
- tool "COM"
- name "version"
- value "")
- (object Attribute
- tool "COM"
- name "helpstring"
- value "")
- (object Attribute
- tool "COM"
- name "helpfile"
- value "")
- (object Attribute
- tool "COM"
- name "helpcontext"
- value "")
- (object Attribute
- tool "COM"
- name "lcid"
- value "")
- (object Attribute
- tool "COM"
- name "attributes"
- value "")))
- (object Attribute
- tool "COM"
- name "default__Param"
- value (list Attribute_Set
- (object Attribute
- tool "COM"
- name "attributes"
- value "")))
- (object Attribute
- tool "COM"
- name "HiddenTool"
- value FALSE)
- (object Attribute
- tool "Visual Basic"
- name "propertyId"
- value "783606378")
- (object Attribute
- tool "Visual Basic"
- name "default__Class"
- value (list Attribute_Set
- (object Attribute
- tool "Visual Basic"
- name "UpdateCode"
- value TRUE)
- (object Attribute
- tool "Visual Basic"
- name "UpdateModel"
- value TRUE)
- (object Attribute
- tool "Visual Basic"
- name "InstancingSet"
- value (list Attribute_Set
- (object Attribute
- tool "Visual Basic"
- name "Private"
- value 221)
- (object Attribute
- tool "Visual Basic"
- name "PublicNotCreatable"
- value 213)
- (object Attribute
- tool "Visual Basic"
- name "SingleUse"
- value 214)
- (object Attribute
- tool "Visual Basic"
- name "GlobalSingleUse"
- value 215)
- (object Attribute
- tool "Visual Basic"
- name "MultiUse"
- value 219)
- (object Attribute
- tool "Visual Basic"
- name "GlobalMultiUse"
- value 220)))
- (object Attribute
- tool "Visual Basic"
- name "BaseSet"
- value (list Attribute_Set
- (object Attribute
- tool "Visual Basic"
- name "(none)"
- value 222)
- (object Attribute
- tool "Visual Basic"
- name "0"
- value 223)
- (object Attribute
- tool "Visual Basic"
- name "1"
- value 224)))
- (object Attribute
- tool "Visual Basic"
- name "OptionBase"
- value ("BaseSet" 222))
- (object Attribute
- tool "Visual Basic"
- name "OptionExplicit"
- value TRUE)
- (object Attribute
- tool "Visual Basic"
- name "OptionCompare"
- value ("CompareSet" 202))
- (object Attribute
- tool "Visual Basic"
- name "Instancing"
- value ("InstancingSet" 219))
- (object Attribute
- tool "Visual Basic"
- name "CompareSet"
- value (list Attribute_Set
- (object Attribute
- tool "Visual Basic"
- name "(none)"
- value 202)
- (object Attribute
- tool "Visual Basic"
- name "Binary"
- value 203)
- (object Attribute
- tool "Visual Basic"
- name "Text"
- value 204)))))
- (object Attribute
- tool "Visual Basic"
- name "default__Operation"
- value (list Attribute_Set
- (object Attribute
- tool "Visual Basic"
- name "LibraryName"
- value "")
- (object Attribute
- tool "Visual Basic"
- name "AliasName"
- value "")
- (object Attribute
- tool "Visual Basic"
- name "IsStatic"
- value FALSE)
- (object Attribute
- tool "Visual Basic"
- name "ProcedureID"
- value "")
- (object Attribute
- tool "Visual Basic"
- name "ReplaceExistingBody"
- value FALSE)
- (object Attribute
- tool "Visual Basic"
- name "DefaultBody"
- value (value Text ""))))
- (object Attribute
- tool "Visual Basic"
- name "default__Attribute"
- value (list Attribute_Set
- (object Attribute
- tool "Visual Basic"
- name "New"
- value FALSE)
- (object Attribute
- tool "Visual Basic"
- name "WithEvents"
- value FALSE)
- (object Attribute
- tool "Visual Basic"
- name "ProcedureID"
- value "")
- (object Attribute
- tool "Visual Basic"
- name "PropertyName"
- value "")
- (object Attribute
- tool "Visual Basic"
- name "Subscript"
- value "")))
- (object Attribute
- tool "Visual Basic"
- name "default__Role"
- value (list Attribute_Set
- (object Attribute
- tool "Visual Basic"
- name "UpdateCode"
- value TRUE)
- (object Attribute
- tool "Visual Basic"
- name "New"
- value FALSE)
- (object Attribute
- tool "Visual Basic"
- name "WithEvents"
- value FALSE)
- (object Attribute
- tool "Visual Basic"
- name "FullName"
- value FALSE)
- (object Attribute
- tool "Visual Basic"
- name "ProcedureID"
- value "")
- (object Attribute
- tool "Visual Basic"
- name "PropertyName"
- value "")
- (object Attribute
- tool "Visual Basic"
- name "Subscript"
- value "")))
- (object Attribute
- tool "Visual Basic"
- name "default__Inherit"
- value (list Attribute_Set
- (object Attribute
- tool "Visual Basic"
- name "ImplementsDelegation"
- value TRUE)
- (object Attribute
- tool "Visual Basic"
- name "FullName"
- value FALSE)))
- (object Attribute
- tool "Visual Basic"
- name "default__Param"
- value (list Attribute_Set
- (object Attribute
- tool "Visual Basic"
- name "ByVal"
- value FALSE)
- (object Attribute
- tool "Visual Basic"
- name "ByRef"
- value FALSE)
- (object Attribute
- tool "Visual Basic"
- name "Optional"
- value FALSE)
- (object Attribute
- tool "Visual Basic"
- name "ParamArray"
- value FALSE)))
- (object Attribute
- tool "Visual Basic"
- name "default__Module-Spec"
- value (list Attribute_Set
- (object Attribute
- tool "Visual Basic"
- name "ProjectFile"
- value "")
- (object Attribute
- tool "Visual Basic"
- name "UpdateCode"
- value TRUE)
- (object Attribute
- tool "Visual Basic"
- name "UpdateModel"
- value TRUE)
- (object Attribute
- tool "Visual Basic"
- name "ImportReferences"
- value TRUE)
- (object Attribute
- tool "Visual Basic"
- name "QuickImport"
- value TRUE)
- (object Attribute
- tool "Visual Basic"
- name "ImportBinary"
- value FALSE)))
- (object Attribute
- tool "Visual Basic"
- name "HiddenTool"
- value FALSE)
- (object Attribute
- tool "VisualStudio"
- name "HiddenTool"
- value FALSE)
- (object Attribute
- tool "Web Modeler"
- name "HiddenTool"
- value FALSE)
- (object Attribute
- tool "XML_DTD"
- name "propertyId"
- value "809135966")
- (object Attribute
- tool "XML_DTD"
- name "default__Project"
- value (list Attribute_Set
- (object Attribute
- tool "XML_DTD"
- name "CreateMissingDirectories"
- value TRUE)
- (object Attribute
- tool "XML_DTD"
- name "Editor"
- value ("EditorType" 100))
- (object Attribute
- tool "XML_DTD"
- name "StopOnError"
- value TRUE)
- (object Attribute
- tool "XML_DTD"
- name "EditorType"
- value (list Attribute_Set
- (object Attribute
- tool "XML_DTD"
- name "BuiltIn"
- value 100)
- (object Attribute
- tool "XML_DTD"
- name "WindowsShell"
- value 101)))))
- (object Attribute
- tool "XML_DTD"
- name "default__Class"
- value (list Attribute_Set
- (object Attribute
- tool "XML_DTD"
- name "Entity_SystemID"
- value "")
- (object Attribute
- tool "XML_DTD"
- name "Entity_PublicID"
- value "")
- (object Attribute
- tool "XML_DTD"
- name "NotationValue"
- value "")
- (object Attribute
- tool "XML_DTD"
- name "InternalValue"
- value "")
- (object Attribute
- tool "XML_DTD"
- name "ParameterEntity"
- value FALSE)
- (object Attribute
- tool "XML_DTD"
- name "ExternalEntity"
- value FALSE)
- (object Attribute
- tool "XML_DTD"
- name "Notation_SystemID"
- value "")
- (object Attribute
- tool "XML_DTD"
- name "Notation_PublicID"
- value "")))
- (object Attribute
- tool "XML_DTD"
- name "default__Attribute"
- value (list Attribute_Set
- (object Attribute
- tool "XML_DTD"
- name "DefaultDeclType"
- value "")))
- (object Attribute
- tool "XML_DTD"
- name "default__Module-Spec"
- value (list Attribute_Set
- (object Attribute
- tool "XML_DTD"
- name "Assign All"
- value FALSE)
- (object Attribute
- tool "XML_DTD"
- name "ComponentPath"
- value "")))
- (object Attribute
- tool "XML_DTD"
- name "HiddenTool"
- value FALSE)
- (object Attribute
- tool "framework"
- name "HiddenTool"
- value FALSE)
- (object Attribute
- tool "R2Editor"
- name "HiddenTool"
- value FALSE)
- (object Attribute
- tool "Version Control"
- name "HiddenTool"
- value FALSE)
- (object Attribute
- tool "Cplusplus"
- name "default__Module-Body"
- value (list Attribute_Set
- (object Attribute
- tool "Cplusplus"
- name "Synchronize"
- value TRUE)
- (object Attribute
- tool "Cplusplus"
- name "RevEngRootDirectory"
- value "")
- (object Attribute
- tool "Cplusplus"
- name "RootPackage"
- value "C++ Reverse Engineered")
- (object Attribute
- tool "Cplusplus"
- name "RevEngDirectoriesAsPackages"
- value FALSE)
- (object Attribute
- tool "Cplusplus"
- name "HeaderFileExtension"
- value ".h")
- (object Attribute
- tool "Cplusplus"
- name "ImplementationFileExtension"
- value ".cpp")
- (object Attribute
- tool "Cplusplus"
- name "NewHeaderFileDirectory"
- value "")
- (object Attribute
- tool "Cplusplus"
- name "NewImplementationFileDirectory"
- value "")
- (object Attribute
- tool "Cplusplus"
- name "FileCapitalization"
- value ("FileCapitalizationSet" 0))
- (object Attribute
- tool "Cplusplus"
- name "CodeGenExtraDirectories"
- value ("CodeGenExtraDirectoriesSet" 0))
- (object Attribute
- tool "Cplusplus"
- name "StripClassPrefix"
- value "")
- (object Attribute
- tool "Cplusplus"
- name "UseTabs"
- value FALSE)
- (object Attribute
- tool "Cplusplus"
- name "TabWidth"
- value 8)
- (object Attribute
- tool "Cplusplus"
- name "IndentWidth"
- value 4)
- (object Attribute
- tool "Cplusplus"
- name "AccessIndentation"
- value -2)
- (object Attribute
- tool "Cplusplus"
- name "ModelIdCommentRules"
- value ("ModelIdCommentRulesSet" 1))
- (object Attribute
- tool "Cplusplus"
- name "PageWidth"
- value 80)
- (object Attribute
- tool "Cplusplus"
- name "ClassMemberOrder"
- value ("MemberOrderSet" 1))
- (object Attribute
- tool "Cplusplus"
- name "OneParameterPerLine"
- value FALSE)
- (object Attribute
- tool "Cplusplus"
- name "NamespaceBraceStyle"
- value ("BraceStyleSet" 2))
- (object Attribute
- tool "Cplusplus"
- name "ClassBraceStyle"
- value ("BraceStyleSet" 2))
- (object Attribute
- tool "Cplusplus"
- name "FunctionBraceStyle"
- value ("BraceStyleSet" 2))
- (object Attribute
- tool "Cplusplus"
- name "Copyright"
- value (value Text ""))
- (object Attribute
- tool "Cplusplus"
- name "InitialHeaderIncludes"
- value (value Text ""))
- (object Attribute
- tool "Cplusplus"
- name "InitialBodyIncludes"
- value (value Text ""))
- (object Attribute
- tool "Cplusplus"
- name "CodeGenExtraDirectoriesSet"
- value (list Attribute_Set
- (object Attribute
- tool "Cplusplus"
- name "None"
- value 0)
- (object Attribute
- tool "Cplusplus"
- name "Namespaces"
- value 1)
- (object Attribute
- tool "Cplusplus"
- name "Packages"
- value 2)))
- (object Attribute
- tool "Cplusplus"
- name "FileCapitalizationSet"
- value (list Attribute_Set
- (object Attribute
- tool "Cplusplus"
- name "Same as model"
- value 0)
- (object Attribute
- tool "Cplusplus"
- name "Lower case"
- value 1)
- (object Attribute
- tool "Cplusplus"
- name "Upper case"
- value 2)
- (object Attribute
- tool "Cplusplus"
- name "Lower case with underscores"
- value 3)))
- (object Attribute
- tool "Cplusplus"
- name "BraceStyleSet"
- value (list Attribute_Set
- (object Attribute
- tool "Cplusplus"
- name "B1"
- value 1)
- (object Attribute
- tool "Cplusplus"
- name "B2"
- value 2)
- (object Attribute
- tool "Cplusplus"
- name "B3"
- value 3)
- (object Attribute
- tool "Cplusplus"
- name "B4"
- value 4)
- (object Attribute
- tool "Cplusplus"
- name "B5"
- value 5)))
- (object Attribute
- tool "Cplusplus"
- name "MemberOrderSet"
- value (list Attribute_Set
- (object Attribute
- tool "Cplusplus"
- name "Public First"
- value 1)
- (object Attribute
- tool "Cplusplus"
- name "Private First"
- value 2)
- (object Attribute
- tool "Cplusplus"
- name "Order by kind"
- value 3)
- (object Attribute
- tool "Cplusplus"
- name "Unordered"
- value 4)))
- (object Attribute
- tool "Cplusplus"
- name "ModelIdCommentRulesSet"
- value (list Attribute_Set
- (object Attribute
- tool "Cplusplus"
- name "Code generation only"
- value 1)
- (object Attribute
- tool "Cplusplus"
- name "Code generation and reverse engineering"
- value 2)
- (object Attribute
- tool "Cplusplus"
- name "Never generate model IDs"
- value 3)))))
- (object Attribute
- tool "Deploy"
- name "HiddenTool"
- value FALSE)
- (object Attribute
- tool "Ecore"
- name "default__Class"
- value (list Attribute_Set
- (object Attribute
- tool "Ecore"
- name "classifierName"
- value "")
- (object Attribute
- tool "Ecore"
- name "constraints"
- value "")
- (object Attribute
- tool "Ecore"
- name "xmlName"
- value "")
- (object Attribute
- tool "Ecore"
- name "xmlContentKind"
- value ("ContentKind" 0))
- (object Attribute
- tool "Ecore"
- name "ContentKind"
- value (list Attribute_Set
- (object Attribute
- tool "Ecore"
- name "Unspecified"
- value 0)
- (object Attribute
- tool "Ecore"
- name "Empty"
- value 1)
- (object Attribute
- tool "Ecore"
- name "Simple"
- value 2)
- (object Attribute
- tool "Ecore"
- name "Mixed"
- value 3)
- (object Attribute
- tool "Ecore"
- name "ElementOnly"
- value 4)))
- (object Attribute
- tool "Ecore"
- name "annotation"
- value "")))
- (object Attribute
- tool "Ecore"
- name "default__Operation"
- value (list Attribute_Set
- (object Attribute
- tool "Ecore"
- name "operationName"
- value "")
- (object Attribute
- tool "Ecore"
- name "isUnique"
- value TRUE)
- (object Attribute
- tool "Ecore"
- name "annotation"
- value ""))))
- quid "39EDFBE003B9"))
diff --git a/plugins/org.eclipse.jst.common.annotations.controller/.classpath b/plugins/org.eclipse.jst.common.annotations.controller/.classpath
deleted file mode 100644
index a350a5f..0000000
--- a/plugins/org.eclipse.jst.common.annotations.controller/.classpath
+++ /dev/null
@@ -1,13 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<classpath>
- <classpathentry kind="src" path="controller"/>
- <classpathentry kind="src" path="property_files"/>
- <classpathentry kind="con" path="org.eclipse.jdt.launching.JRE_CONTAINER/org.eclipse.jdt.internal.debug.ui.launcher.StandardVMType/J2SE-1.5"/>
- <classpathentry kind="con" path="org.eclipse.pde.core.requiredPlugins">
- <accessrules>
- <accessrule kind="accessible" pattern="org/eclipse/wst/common/**"/>
- <accessrule kind="accessible" pattern="org/eclipse/jst/common/**"/>
- </accessrules>
- </classpathentry>
- <classpathentry kind="output" path="bin"/>
-</classpath>
diff --git a/plugins/org.eclipse.jst.common.annotations.controller/.cvsignore b/plugins/org.eclipse.jst.common.annotations.controller/.cvsignore
deleted file mode 100644
index a432273..0000000
--- a/plugins/org.eclipse.jst.common.annotations.controller/.cvsignore
+++ /dev/null
@@ -1,7 +0,0 @@
-bin
-temp.folder
-build.xml
-controller.jar
-@dot
-src.zip
-javaCompiler...args
diff --git a/plugins/org.eclipse.jst.common.annotations.controller/.project b/plugins/org.eclipse.jst.common.annotations.controller/.project
deleted file mode 100644
index 8cc7f22..0000000
--- a/plugins/org.eclipse.jst.common.annotations.controller/.project
+++ /dev/null
@@ -1,28 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<projectDescription>
- <name>org.eclipse.jst.common.annotations.controller</name>
- <comment></comment>
- <projects>
- </projects>
- <buildSpec>
- <buildCommand>
- <name>org.eclipse.jdt.core.javabuilder</name>
- <arguments>
- </arguments>
- </buildCommand>
- <buildCommand>
- <name>org.eclipse.pde.ManifestBuilder</name>
- <arguments>
- </arguments>
- </buildCommand>
- <buildCommand>
- <name>org.eclipse.pde.SchemaBuilder</name>
- <arguments>
- </arguments>
- </buildCommand>
- </buildSpec>
- <natures>
- <nature>org.eclipse.jdt.core.javanature</nature>
- <nature>org.eclipse.pde.PluginNature</nature>
- </natures>
-</projectDescription>
diff --git a/plugins/org.eclipse.jst.common.annotations.controller/.settings/org.eclipse.core.resources.prefs b/plugins/org.eclipse.jst.common.annotations.controller/.settings/org.eclipse.core.resources.prefs
deleted file mode 100644
index cf88a9a..0000000
--- a/plugins/org.eclipse.jst.common.annotations.controller/.settings/org.eclipse.core.resources.prefs
+++ /dev/null
@@ -1,3 +0,0 @@
-#Tue Apr 04 12:52:32 EDT 2006
-eclipse.preferences.version=1
-encoding/<project>=ISO-8859-1
diff --git a/plugins/org.eclipse.jst.common.annotations.controller/.settings/org.eclipse.jdt.core.prefs b/plugins/org.eclipse.jst.common.annotations.controller/.settings/org.eclipse.jdt.core.prefs
deleted file mode 100644
index 037a4e5..0000000
--- a/plugins/org.eclipse.jst.common.annotations.controller/.settings/org.eclipse.jdt.core.prefs
+++ /dev/null
@@ -1,95 +0,0 @@
-#Mon Jun 08 15:35:45 EDT 2009
-org.eclipse.jdt.core.compiler.problem.unusedParameterWhenImplementingAbstract=disabled
-org.eclipse.jdt.core.compiler.problem.comparingIdentical=error
-org.eclipse.jdt.core.compiler.problem.unnecessaryElse=error
-org.eclipse.jdt.core.compiler.problem.redundantSuperinterface=error
-org.eclipse.jdt.core.compiler.problem.unusedLocal=error
-org.eclipse.jdt.core.compiler.problem.emptyStatement=error
-org.eclipse.jdt.core.compiler.problem.unusedLabel=error
-org.eclipse.jdt.core.compiler.problem.unusedParameter=warning
-org.eclipse.jdt.core.compiler.problem.rawTypeReference=warning
-org.eclipse.jdt.core.incompatibleJDKLevel=ignore
-org.eclipse.jdt.core.compiler.problem.incompatibleNonInheritedInterfaceMethod=error
-org.eclipse.jdt.core.compiler.debug.lineNumber=generate
-org.eclipse.jdt.core.compiler.problem.unusedDeclaredThrownException=warning
-org.eclipse.jdt.core.builder.cleanOutputFolder=clean
-org.eclipse.jdt.core.compiler.problem.unusedWarningToken=warning
-org.eclipse.jdt.core.compiler.problem.noImplicitStringConversion=error
-org.eclipse.jdt.core.compiler.problem.deprecationInDeprecatedCode=enabled
-org.eclipse.jdt.core.compiler.problem.deprecation=warning
-org.eclipse.jdt.core.compiler.problem.unusedParameterWhenOverridingConcrete=disabled
-org.eclipse.jdt.core.compiler.problem.missingSynchronizedOnInheritedMethod=error
-org.eclipse.jdt.core.compiler.problem.deprecationWhenOverridingDeprecatedMethod=enabled
-org.eclipse.jdt.core.compiler.problem.redundantNullCheck=error
-org.eclipse.jdt.core.compiler.problem.unusedImport=error
-org.eclipse.jdt.core.builder.recreateModifiedClassFileInOutputFolder=ignore
-org.eclipse.jdt.core.builder.resourceCopyExclusionFilter=*.launch
-org.eclipse.jdt.core.classpath.multipleOutputLocations=enabled
-org.eclipse.jdt.core.compiler.problem.suppressWarnings=enabled
-org.eclipse.jdt.core.compiler.problem.typeParameterHiding=error
-org.eclipse.jdt.core.builder.invalidClasspath=abort
-org.eclipse.jdt.core.compiler.problem.localVariableHiding=warning
-org.eclipse.jdt.core.compiler.problem.possibleAccidentalBooleanAssignment=error
-org.eclipse.jdt.core.compiler.problem.missingHashCodeMethod=error
-org.eclipse.jdt.core.codeComplete.argumentSuffixes=
-org.eclipse.jdt.core.codeComplete.argumentPrefixes=
-org.eclipse.jdt.core.compiler.problem.indirectStaticAccess=ignore
-org.eclipse.jdt.core.compiler.problem.potentialNullReference=error
-org.eclipse.jdt.core.compiler.codegen.inlineJsrBytecode=enabled
-org.eclipse.jdt.core.compiler.problem.finalParameterBound=warning
-org.eclipse.jdt.core.compiler.problem.missingSerialVersion=error
-org.eclipse.jdt.core.compiler.problem.nullReference=error
-org.eclipse.jdt.core.compiler.source=1.5
-org.eclipse.jdt.core.compiler.problem.enumIdentifier=error
-org.eclipse.jdt.core.compiler.problem.syntheticAccessEmulation=ignore
-org.eclipse.jdt.core.builder.duplicateResourceTask=warning
-org.eclipse.jdt.core.compiler.problem.fieldHiding=error
-org.eclipse.jdt.core.compiler.problem.unusedDeclaredThrownExceptionExemptExceptionAndThrowable=enabled
-org.eclipse.jdt.core.compiler.problem.missingOverrideAnnotation=error
-org.eclipse.jdt.core.compiler.problem.hiddenCatchBlock=error
-org.eclipse.jdt.core.compiler.problem.overridingPackageDefaultMethod=error
-org.eclipse.jdt.core.compiler.problem.finallyBlockNotCompletingNormally=error
-org.eclipse.jdt.core.compiler.problem.undocumentedEmptyBlock=warning
-org.eclipse.jdt.core.classpath.exclusionPatterns=enabled
-org.eclipse.jdt.core.compiler.problem.methodWithConstructorName=error
-org.eclipse.jdt.core.compiler.problem.discouragedReference=warning
-org.eclipse.jdt.core.compiler.problem.unqualifiedFieldAccess=ignore
-org.eclipse.jdt.core.compiler.problem.incompleteEnumSwitch=error
-eclipse.preferences.version=1
-org.eclipse.jdt.core.incompleteClasspath=error
-org.eclipse.jdt.core.compiler.problem.unnecessaryTypeCheck=error
-org.eclipse.jdt.core.compiler.problem.deadCode=error
-org.eclipse.jdt.core.compiler.problem.specialParameterHidingField=enabled
-org.eclipse.jdt.core.compiler.problem.fatalOptionalError=enabled
-org.eclipse.jdt.core.compiler.problem.noEffectAssignment=error
-org.eclipse.jdt.core.compiler.debug.sourceFile=generate
-org.eclipse.jdt.core.compiler.problem.unusedDeclaredThrownExceptionIncludeUncheckedExceptions=disabled
-org.eclipse.jdt.core.compiler.problem.missingDeprecatedAnnotation=warning
-org.eclipse.jdt.core.codeComplete.fieldPrefixes=
-org.eclipse.jdt.core.compiler.problem.fallthroughCase=error
-org.eclipse.jdt.core.compiler.codegen.targetPlatform=1.5
-org.eclipse.jdt.core.compiler.problem.unusedPrivateMember=error
-org.eclipse.jdt.core.compiler.problem.autoboxing=warning
-org.eclipse.jdt.core.circularClasspath=error
-org.eclipse.jdt.core.compiler.problem.annotationSuperInterface=warning
-org.eclipse.jdt.core.compiler.problem.nonExternalizedStringLiteral=error
-org.eclipse.jdt.core.codeComplete.fieldSuffixes=
-org.eclipse.jdt.core.codeComplete.localSuffixes=
-org.eclipse.jdt.core.compiler.problem.parameterAssignment=error
-org.eclipse.jdt.core.compiler.problem.staticAccessReceiver=error
-org.eclipse.jdt.core.codeComplete.localPrefixes=
-org.eclipse.jdt.core.compiler.problem.unusedDeclaredThrownExceptionIncludeDocCommentReference=enabled
-org.eclipse.jdt.core.compiler.maxProblemPerUnit=100
-org.eclipse.jdt.core.compiler.problem.varargsArgumentNeedCast=error
-org.eclipse.jdt.core.compiler.problem.assertIdentifier=error
-org.eclipse.jdt.core.compiler.compliance=1.5
-org.eclipse.jdt.core.compiler.problem.unusedParameterIncludeDocCommentReference=enabled
-org.eclipse.jdt.core.codeComplete.staticFieldPrefixes=
-org.eclipse.jdt.core.compiler.debug.localVariable=generate
-org.eclipse.jdt.core.compiler.problem.unhandledWarningToken=warning
-instance/org.eclipse.core.net/org.eclipse.core.net.hasMigrated=true
-org.eclipse.jdt.core.compiler.problem.forbiddenReference=error
-org.eclipse.jdt.core.compiler.codegen.unusedLocal=preserve
-org.eclipse.jdt.core.compiler.problem.uncheckedTypeOperation=warning
-org.eclipse.jdt.core.compiler.problem.unusedDeclaredThrownExceptionWhenOverriding=disabled
-org.eclipse.jdt.core.codeComplete.staticFieldSuffixes=
diff --git a/plugins/org.eclipse.jst.common.annotations.controller/.settings/org.eclipse.pde.prefs b/plugins/org.eclipse.jst.common.annotations.controller/.settings/org.eclipse.pde.prefs
deleted file mode 100644
index 1ef7c37..0000000
--- a/plugins/org.eclipse.jst.common.annotations.controller/.settings/org.eclipse.pde.prefs
+++ /dev/null
@@ -1,13 +0,0 @@
-#Tue Apr 04 12:52:48 EDT 2006
-compilers.p.build=0
-compilers.p.deprecated=1
-compilers.p.no-required-att=0
-compilers.p.not-externalized-att=2
-compilers.p.unknown-attribute=1
-compilers.p.unknown-class=1
-compilers.p.unknown-element=1
-compilers.p.unknown-resource=1
-compilers.p.unresolved-ex-points=0
-compilers.p.unresolved-import=0
-compilers.use-project=true
-eclipse.preferences.version=1
diff --git a/plugins/org.eclipse.jst.common.annotations.controller/META-INF/MANIFEST.MF b/plugins/org.eclipse.jst.common.annotations.controller/META-INF/MANIFEST.MF
deleted file mode 100644
index e837b47..0000000
--- a/plugins/org.eclipse.jst.common.annotations.controller/META-INF/MANIFEST.MF
+++ /dev/null
@@ -1,19 +0,0 @@
-Manifest-Version: 1.0
-Bundle-ManifestVersion: 2
-Bundle-Name: Annotation Controller Plug-in
-Bundle-SymbolicName: org.eclipse.jst.common.annotations.controller; singleton:=true
-Bundle-Version: 1.1.300.qualifier
-Bundle-Vendor: Eclipse.org
-Bundle-Localization: plugin
-Export-Package: org.eclipse.jst.common.internal.annotations.controller;x-internal:=true,
- org.eclipse.jst.common.internal.annotations.registry;x-internal:=true
-Require-Bundle: org.eclipse.core.runtime;bundle-version="[3.2.0,4.0.0)",
- org.eclipse.core.resources;bundle-version="[3.2.0,4.0.0)",
- org.eclipse.emf.ecore;bundle-version="[2.2.0,3.0.0)",
- org.eclipse.wst.common.frameworks;bundle-version="[1.2.0,2.0.0)",
- org.eclipse.jdt.core;bundle-version="[3.2.0,4.0.0)",
- org.eclipse.wst.common.emf;bundle-version="[1.2.0,2.0.0)",
- org.eclipse.jem.util;bundle-version="[2.0.0,3.0.0)",
- org.eclipse.jem.workbench;bundle-version="[2.0.0,3.0.0)",
- org.eclipse.jst.common.annotations.core;bundle-version="[1.1.0,1.2.0)"
-Bundle-RequiredExecutionEnvironment: J2SE-1.5
diff --git a/plugins/org.eclipse.jst.common.annotations.controller/about.html b/plugins/org.eclipse.jst.common.annotations.controller/about.html
deleted file mode 100644
index 2199df3..0000000
--- a/plugins/org.eclipse.jst.common.annotations.controller/about.html
+++ /dev/null
@@ -1,34 +0,0 @@
-<!DOCTYPE HTML PUBLIC "-//W3C//DTD HTML 4.0//EN">
-<HTML>
-
-<head>
-<title>About</title>
-<meta http-equiv=Content-Type content="text/html; charset=ISO-8859-1">
-</head>
-
-<BODY lang="EN-US">
-
-<H3>About This Content</H3>
-
-<P>June, 2008</P>
-
-<H3>License</H3>
-
-<P>The Eclipse Foundation makes available all content in this plug-in
-("Content"). Unless otherwise indicated below, the Content is provided to you
-under the terms and conditions of the Eclipse Public License Version 1.0
-("EPL"). A copy of the EPL is available at
-<A href="http://www.eclipse.org/org/documents/epl-v10.php">http://www.eclipse.org/org/documents/epl-v10.php</A>.
-For purposes of the EPL, "Program" will mean the Content.</P>
-
-<P>If you did not receive this Content directly from the Eclipse Foundation, the
-Content is being redistributed by another party ("Redistributor") and different
-terms and conditions may apply to your use of any object code in the Content.
-Check the Redistributors license that was provided with the Content. If no such
-license exists, contact the Redistributor. Unless otherwise indicated below, the
-terms and conditions of the EPL still apply to any source code in the Content
-and such source code may be obtained at
-<A href="http://www.eclipse.org/">http://www.eclipse.org/</A>.</P>
-
-</BODY>
-</HTML>
diff --git a/plugins/org.eclipse.jst.common.annotations.controller/build.properties b/plugins/org.eclipse.jst.common.annotations.controller/build.properties
deleted file mode 100644
index 3185103..0000000
--- a/plugins/org.eclipse.jst.common.annotations.controller/build.properties
+++ /dev/null
@@ -1,21 +0,0 @@
-###############################################################################
-# Copyright (c) 2003, 2004 IBM Corporation and others.
-# All rights reserved. This program and the accompanying materials
-# are made available under the terms of the Eclipse Public License v1.0
-# which accompanies this distribution, and is available at
-# http://www.eclipse.org/legal/epl-v10.html
-#
-# Contributors:
-# IBM Corporation - initial API and implementation
-###############################################################################
-bin.includes = plugin.xml,\
- schema/,\
- META-INF/,\
- about.html,\
- plugin.properties,\
- .
-jars.compile.order = .
-src.includes = schema/
-output.. = bin/
-source.. = controller/,\
- property_files/
diff --git a/plugins/org.eclipse.jst.common.annotations.controller/controller/org/eclipse/jst/common/internal/annotations/controller/AnnotationsController.java b/plugins/org.eclipse.jst.common.annotations.controller/controller/org/eclipse/jst/common/internal/annotations/controller/AnnotationsController.java
deleted file mode 100644
index 31a30cd..0000000
--- a/plugins/org.eclipse.jst.common.annotations.controller/controller/org/eclipse/jst/common/internal/annotations/controller/AnnotationsController.java
+++ /dev/null
@@ -1,86 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2003, 2004 IBM Corporation and others.
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
- *
- * Contributors:
- * IBM Corporation - initial API and implementation
- *******************************************************************************/
-/*
- * Created on Mar 25, 2004
- */
-package org.eclipse.jst.common.internal.annotations.controller;
-
-import org.eclipse.core.resources.IFile;
-import org.eclipse.core.resources.IProject;
-import org.eclipse.core.resources.IResource;
-import org.eclipse.core.runtime.CoreException;
-import org.eclipse.core.runtime.IStatus;
-import org.eclipse.emf.ecore.EObject;
-
-/**
- * Annotations Controller interface used for communicating with emitters and determining available
- * tag sets
- */
-public interface AnnotationsController {
-
- /**
- * Determines if a tag handler is installed for the specified tag
- *
- * @param tagset
- * the name of a tagset (e.g. "ejb")
- * @return true only if the given tagset is available and enabled
- */
- public boolean isTagHandlerInstalled(String tagset);
-
- /**
- * Disables annotation processing for the specified resource
- *
- * @param modelObject
- * The Annotated EMF Object
- * @param tagset
- * The name of the annotations tagset to disable on the object
- * @return an IStatus representing success or failure
- */
- public IStatus disableAnnotations(EObject modelObject, String tagset);
-
- /**
- * Returns the associated annotated file if the specified model object was generated via
- * annotations from a parent resource and is enabled
- *
- * @param modelObject
- * The Annotated EMF Object
- * @return the annotated source file associated with the given modelObject
- */
- public IFile getEnabledAnnotationFile(EObject modelObject);
-
- /**
- * Process the annotations on the given resource during creation
- *
- * @return all files touched by the annotations processing
- * @throws CoreException
- * if a problem occurs while processing
- */
- public IFile[] process(IResource res) throws CoreException;
-
- /**
- * Process the annotations on the given resource array
- *
- * @return all files touched by the annotations processing
- * @throws CoreException
- * if a problem occurs while processing
- */
- public IFile[] process(IResource[] res) throws CoreException;
-
- /**
- * Provides the annotation processor an opportunity to initialize
- */
- public void initialize(IProject project);
-
- /**
- * Provides the annotation processor an opportunity to dispose and cleanup
- */
- public void dispose();
-}
\ No newline at end of file
diff --git a/plugins/org.eclipse.jst.common.annotations.controller/controller/org/eclipse/jst/common/internal/annotations/controller/AnnotationsControllerHelper.java b/plugins/org.eclipse.jst.common.annotations.controller/controller/org/eclipse/jst/common/internal/annotations/controller/AnnotationsControllerHelper.java
deleted file mode 100644
index 7f35d5e..0000000
--- a/plugins/org.eclipse.jst.common.annotations.controller/controller/org/eclipse/jst/common/internal/annotations/controller/AnnotationsControllerHelper.java
+++ /dev/null
@@ -1,235 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2003, 2004 IBM Corporation and others.
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
- *
- * Contributors:
- * IBM Corporation - initial API and implementation
- *******************************************************************************/
-package org.eclipse.jst.common.internal.annotations.controller;
-
-import java.util.List;
-
-import org.eclipse.core.resources.IProject;
-import org.eclipse.emf.ecore.EObject;
-import org.eclipse.jdt.core.ICompilationUnit;
-import org.eclipse.jdt.core.IJavaProject;
-import org.eclipse.jdt.core.IType;
-import org.eclipse.jdt.core.JavaModelException;
-import org.eclipse.jem.util.emf.workbench.ProjectUtilities;
-import org.eclipse.jem.util.logger.proxy.Logger;
-import org.eclipse.jem.workbench.utility.JemProjectUtilities;
-import org.eclipse.jst.common.internal.annotations.core.AnnotationsAdapter;
-import org.eclipse.jst.common.internal.annotations.core.AnnotationsProviderManager;
-import org.eclipse.jst.common.internal.annotations.core.IAnnotationsProvider;
-
-/**
- * @author mdelder
- *
- */
-public class AnnotationsControllerHelper {
- public static final AnnotationsControllerHelper INSTANCE = new AnnotationsControllerHelper();
-
- protected AnnotationsControllerHelper() {
- super();
- }
-
- /**
- *
- * @param eObject the annotated model object
- * @return true only if the object has annotations
- */
- public boolean isAnnotated(EObject eObject) {
- if (AnnotationsAdapter.getAnnotations(eObject, AnnotationsAdapter.GENERATED) != null)
- return true;
- List annotationsProviders = AnnotationsProviderManager.INSTANCE.getAnnotationsProviders();
- for (int i=0; i<annotationsProviders.size(); i++) {
- IAnnotationsProvider provider = (IAnnotationsProvider) annotationsProviders.get(i);
- if (provider!=null && provider.isAnnotated(eObject))
- return true;
- }
- return false;
- }
-
- /**
- * A convenience method to tag a model object as annotated
- *
- * @param eObject
- * @param value
- */
- public void setAnnotated(EObject eObject, String value) {
- AnnotationsAdapter.addAnnotations(eObject, AnnotationsAdapter.GENERATED, value);
- }
-
- /**
- * A convenience method to tag a model object as annotated Annotations Adapters can hold extra
- * information.
- *
- * @param eObject
- * @param name
- * A string key
- * @param value
- * A String value
- */
- public void addAnnotations(EObject eObject, String name, Object value) {
- AnnotationsAdapter.addAnnotations(eObject, name, value);
- }
-
- /**
- * A convenience method to tag a model object as annotated Annotations Adapters can hold extra
- * information.
- *
- * @param eObject
- * @param name
- * A string key
- * @param value
- * A String value
- */
- public Object getAnnotations(EObject eObject, String name) {
- return AnnotationsAdapter.getAnnotations(eObject, name);
- }
-
- /**
- * Acquires the generated annotation comment and parses the Fragment URL of the following form
- * to return the tagset name:
- *
- * com.acme.ejbs.MyEJB# <tagset>/ <fragment>. <fragment-pointer>
- *
- * @param eObject
- * The annotated object
- * @return the value of <tagset>in the URL example
- */
- public String getTagset(EObject eObject) {
- String tagset = getTagsetFromProviders(eObject);
- if (tagset == null) {
- tagset = getTagsetFromFragment(eObject);
- }
- return tagset;
- }
-
- /**
- * Acquires the generated annotation comment and parses the Fragment URL of the following form
- * to return the tagset name:
- *
- * com.acme.ejbs.MyEJB# <tagset>/ <fragment>. <fragment-pointer>
- *
- * @param eObject
- * The annotated object
- * @return the value of <tagset>in the URL example
- */
- private String getTagsetFromFragment(EObject eObject) {
-
- String generatedComment = (String) AnnotationsAdapter.getAnnotations(eObject, AnnotationsAdapter.GENERATED);
- if (generatedComment == null || generatedComment.length() == 0)
- return null;
- int poundit = generatedComment.indexOf('#');
- int slash = generatedComment.indexOf('/');
- if (poundit < 0 || slash < 0 || poundit >= slash)
- return null;
- return generatedComment.substring(poundit + 1, slash);
-
- }
-
- /**
- * Detect the primary tagset used to create an eObject using the providers.
- *
- * @since 1.0.2
- * @param eObject - An {@link EObject} that may be annotated.
- * @return a String array of the used tagset names.
- */
- private String getTagsetFromProviders(EObject eObject) {
- String tagset = null;
- List annotationProviders = AnnotationsProviderManager.INSTANCE.getAnnotationsProviders();
- int size = annotationProviders.size();
- for (int i=0; i < size && tagset == null; i++) {
- IAnnotationsProvider provider = (IAnnotationsProvider) annotationProviders.get(i);
- tagset = provider != null ? provider.getPrimaryTagset(eObject) : null;
- }
- return tagset;
- }
-
- /**
- * Returns the CompilationUnit associated with the given model object
- *
- * @param eObject
- * an Annotated model Object
- * @return The compilation unit which was responsible for the generation of the model object
- */
- public ICompilationUnit getAnnotatedCU(EObject eObject) {
- ICompilationUnit cu = getAnnotatedCUFromProvider(eObject);
- if (cu == null) {
- cu = getAnnotatedCUFromFragment(eObject);
- }
- return cu;
- }
-
- /**
- * Returns the CompilationUnit associated with the given model object
- *
- * @param eObject
- * an Annotated model Object
- * @return The compilation unit which was responsible for the generation of the model object
- */
- private ICompilationUnit getAnnotatedCUFromFragment(EObject eObject) {
- String fragmentString = (String) AnnotationsAdapter.getAnnotations(eObject, AnnotationsAdapter.GENERATED);
- if (fragmentString == null)
- return null;
-
- String typeString = fragmentString;
- if (fragmentString.indexOf('#')>0)
- typeString = fragmentString.substring(0, fragmentString.indexOf('#'));
- IType itype;
-
- if (typeString != null && (itype = findType(typeString, eObject)) != null) {
- return itype.getCompilationUnit();
- }
- return null;
- }
-
- /**
- * Need to delegate the retrieval of the annotated {@link ICompilationUnit} for
- * the passed eObject. There could be multiple but in this case the first will be returned.
- *
- * <p>
- * This API would need to be revisited in the future if there is a requirement to show
- * all {@link ICompilationUnit} elements that contribute to the eObject via annotations.
- * </p>
- *
- * @param eObject - an instance of an {@link EObject} that may be annotated.
- * @since 1.0.2
- */
- private ICompilationUnit getAnnotatedCUFromProvider(EObject eObject) {
- ICompilationUnit primaryCU = null;
- List annotationProviders = AnnotationsProviderManager.INSTANCE.getAnnotationsProviders();
- int size = annotationProviders.size();
- for (int i=0; i < size && primaryCU == null; i++) {
- IAnnotationsProvider provider = (IAnnotationsProvider) annotationProviders.get(i);
- primaryCU = provider != null ? provider.getPrimaryAnnotatedCompilationUnit(eObject) : null;
- }
- return primaryCU;
- }
-
- protected IType findType(String type, EObject eObject) {
- IType result = null;
- IProject project = ProjectUtilities.getProject(eObject);
- IJavaProject javaProject = JemProjectUtilities.getJavaProject(project);
- if (javaProject != null)
- try {
- result = javaProject.findType(type);
- } catch (JavaModelException e) {
- Logger.getLogger().logError(e);
- }
- return result;
- }
-
- /**
- * Return true if <code>project</code> has annotation support enabled on it.
- *
- * @return
- */
- public boolean hasAnnotationSupport(IProject project) {
- return AnnotationsControllerManager.INSTANCE.hasAnnotationsBuilder(project);
- }
-}
\ No newline at end of file
diff --git a/plugins/org.eclipse.jst.common.annotations.controller/controller/org/eclipse/jst/common/internal/annotations/controller/AnnotationsControllerManager.java b/plugins/org.eclipse.jst.common.annotations.controller/controller/org/eclipse/jst/common/internal/annotations/controller/AnnotationsControllerManager.java
deleted file mode 100644
index b4099a4..0000000
--- a/plugins/org.eclipse.jst.common.annotations.controller/controller/org/eclipse/jst/common/internal/annotations/controller/AnnotationsControllerManager.java
+++ /dev/null
@@ -1,221 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2003, 2004 IBM Corporation and others.
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
- *
- * Contributors:
- * IBM Corporation - initial API and implementation
- *******************************************************************************/
-/*
- * Created on Mar 25, 2004
- */
-package org.eclipse.jst.common.internal.annotations.controller;
-
-import java.util.Iterator;
-import java.util.Map;
-import java.util.SortedSet;
-import java.util.TreeSet;
-import java.util.WeakHashMap;
-
-import org.eclipse.core.resources.ICommand;
-import org.eclipse.core.resources.IProject;
-import org.eclipse.core.runtime.CoreException;
-import org.eclipse.core.runtime.IConfigurationElement;
-import org.eclipse.jem.util.RegistryReader;
-import org.eclipse.jem.util.logger.proxy.Logger;
-import org.eclipse.jst.common.internal.annotations.registry.AnnotationsControllerResources;
-import org.eclipse.wst.common.frameworks.internal.enablement.EnablementIdentifier;
-import org.eclipse.wst.common.frameworks.internal.enablement.EnablementIdentifierEvent;
-import org.eclipse.wst.common.frameworks.internal.enablement.EnablementManager;
-import org.eclipse.wst.common.frameworks.internal.enablement.IEnablementIdentifier;
-import org.eclipse.wst.common.frameworks.internal.enablement.IEnablementIdentifierListener;
-import org.eclipse.wst.common.frameworks.internal.enablement.Identifiable;
-import org.eclipse.wst.common.frameworks.internal.enablement.IdentifiableComparator;
-import org.eclipse.wst.common.internal.emf.utilities.Assert;
-
-
-/**
- * AnnotationsControllerRegistry for reading annotations controller extensions
- */
-public class AnnotationsControllerManager extends RegistryReader implements IEnablementIdentifierListener {
-
- public static final AnnotationsControllerManager INSTANCE = new AnnotationsControllerManager();
-
- static {
- INSTANCE.readRegistry();
- }
-
- private SortedSet descriptors;
-
- private Map annotationsControllers;
-
- public static class Descriptor implements Identifiable {
-
- public static final String ANNOTATIONS_CONTROLLER = "annotationsController"; //$NON-NLS-1$
-
- public static final String ATT_ID = "id"; //$NON-NLS-1$
-
- public static final String CLASS = "class"; //$NON-NLS-1$
-
- public static final String BUILDER_ID = "builderID"; //$NON-NLS-1$
-
- private final IConfigurationElement configElement;
- private final String ID;
- private String builderID;
- private final int loadOrder;
- private static int loadOrderCounter = 0;
-
- public Descriptor(IConfigurationElement aConfigElement) {
- super();
- Assert.isLegal(ANNOTATIONS_CONTROLLER.equals(aConfigElement.getName()), AnnotationsControllerResources.AnnotationsControllerManager_ERROR_0);
- configElement = aConfigElement;
- ID = configElement.getAttribute(ATT_ID);
- builderID = configElement.getAttribute(BUILDER_ID);
- loadOrder = loadOrderCounter++;
- }
-
- /*
- * (non-Javadoc)
- *
- * @see org.eclipse.wst.common.frameworks.internal.enablement.Identifiable#getID()
- */
- public String getID() {
- return ID;
- }
-
- public String getBuilderID() {
- return builderID;
- }
-
- /*
- * (non-Javadoc)
- *
- * @see org.eclipse.wst.common.frameworks.internal.enablement.Identifiable#getLoadOrder()
- */
- public int getLoadOrder() {
- return loadOrder;
- }
-
- public AnnotationsController createInstance() {
- AnnotationsController instance = null;
- try {
- instance = (AnnotationsController) configElement.createExecutableExtension(CLASS);
- } catch (CoreException e) {
- Logger.getLogger().logError(e);
- }
- return instance;
- }
- }
-
- /**
- * Default constructor
- */
- public AnnotationsControllerManager() {
- super("org.eclipse.jst.common.annotations.controller", "annotationsController"); //$NON-NLS-1$ //$NON-NLS-2$
- }
-
- /**
- * read extension element
- */
- @Override
- public boolean readElement(IConfigurationElement element) {
- if (!element.getName().equals(Descriptor.ANNOTATIONS_CONTROLLER))
- return false;
- addAnnotationController(new Descriptor(element));
- return true;
- }
-
- /**
- * @param descriptor
- */
- protected void addAnnotationController(Descriptor descriptor) {
- EnablementManager.INSTANCE.getIdentifier(descriptor.getID(), null).addIdentifierListener(this);
- getDescriptors().add(descriptor);
- }
-
- /**
- * @return Returns the annotationControllers.
- */
- protected SortedSet getDescriptors() {
- if (descriptors == null)
- descriptors = new TreeSet(IdentifiableComparator.getInstance());
- return descriptors;
- }
-
- public Descriptor getDescriptor(IProject project) {
- for (Iterator iter = getDescriptors().iterator(); iter.hasNext();) {
- Descriptor descriptor = (Descriptor) iter.next();
- IEnablementIdentifier identifier = EnablementManager.INSTANCE.getIdentifier(descriptor.getID(), project);
- if (identifier.isEnabled())
- return descriptor;
- }
- return null;
- }
-
- /**
- * Determine if any annotations are supported
- */
- public boolean isAnyAnnotationsSupported() {
- return getDescriptors().size() > 0;
- }
-
- /*
- * (non-Javadoc)
- *
- * @see org.eclipse.wst.common.frameworks.internal.enablement.IEnablementIdentifierListener#identifierChanged(org.eclipse.wst.common.frameworks.internal.enablement.EnablementIdentifierEvent)
- */
- public void identifierChanged(EnablementIdentifierEvent identifierEvent) {
- IProject project = ((EnablementIdentifier) identifierEvent.getIdentifier()).getProject();
- getAnnotationsControllers().remove(project);
- }
-
- /**
- * Return the annotations controller for the specified project
- */
- public AnnotationsController getAnnotationsController(IProject project) {
- AnnotationsController controller = (AnnotationsController) getAnnotationsControllers().get(project);
- if (controller == null) {
- if (!hasAnnotationsBuilder(project))
- return null;
- Descriptor descriptor = getDescriptor(project);
- if (descriptor != null)
- getAnnotationsControllers().put(project, (controller = descriptor.createInstance()));
- }
-
- return controller;
- }
-
- /**
- * @return Returns the annotationControllers.
- */
- public Map getAnnotationsControllers() {
- if (annotationsControllers == null)
- annotationsControllers = new WeakHashMap();
- return annotationsControllers;
- }
-
- public boolean hasAnnotationsBuilder(IProject project) {
- Descriptor annotationsDescriptor = getDescriptor(project);
- if (annotationsDescriptor==null)
- return false;
- return hasBuilder(project, annotationsDescriptor.getBuilderID());
- }
-
- public boolean hasBuilder(IProject project, String builderName) {
- try {
- ICommand[] builders = project.getDescription().getBuildSpec();
- for (int i = 0; i < builders.length; i++) {
- ICommand builder = builders[i];
- if (builder != null) {
- if (builder.getBuilderName().equals(builderName))
- return true;
- }
- }
- } catch (Exception e) {
- // Do nothing
- }
- return false;
- }
-}
\ No newline at end of file
diff --git a/plugins/org.eclipse.jst.common.annotations.controller/controller/org/eclipse/jst/common/internal/annotations/registry/AnnotationTagDynamicInitializer.java b/plugins/org.eclipse.jst.common.annotations.controller/controller/org/eclipse/jst/common/internal/annotations/registry/AnnotationTagDynamicInitializer.java
deleted file mode 100644
index 122209c..0000000
--- a/plugins/org.eclipse.jst.common.annotations.controller/controller/org/eclipse/jst/common/internal/annotations/registry/AnnotationTagDynamicInitializer.java
+++ /dev/null
@@ -1,23 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2003, 2004 IBM Corporation and others.
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
- *
- * Contributors:
- * IBM Corporation - initial API and implementation
- *******************************************************************************/
-package org.eclipse.jst.common.internal.annotations.registry;
-
-/**
- * This method will be called by the AnnotationTagRegistry
- * when it is time to register the tags for a given
- * TagSet. An AnnotationTagDynamicInitializer defined
- * using the annotationTagDynamicInitializer.
- *
- * @see com.ibm.wtp.annotations.registry.AnnotationTagRegistry
- */
-public interface AnnotationTagDynamicInitializer {
- void registerTags();
-}
\ No newline at end of file
diff --git a/plugins/org.eclipse.jst.common.annotations.controller/controller/org/eclipse/jst/common/internal/annotations/registry/AnnotationTagRegistry.java b/plugins/org.eclipse.jst.common.annotations.controller/controller/org/eclipse/jst/common/internal/annotations/registry/AnnotationTagRegistry.java
deleted file mode 100644
index 39e1e5c..0000000
--- a/plugins/org.eclipse.jst.common.annotations.controller/controller/org/eclipse/jst/common/internal/annotations/registry/AnnotationTagRegistry.java
+++ /dev/null
@@ -1,526 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2003, 2004 IBM Corporation and others.
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
- *
- * Contributors:
- * IBM Corporation - initial API and implementation
- *******************************************************************************/
-/*
- * Created on Aug 22, 2003
- *
- * To change the template for this generated file go to
- * Window>Preferences>Java>Code Generation>Code and Comments
- */
-package org.eclipse.jst.common.internal.annotations.registry;
-
-import java.util.ArrayList;
-import java.util.Collection;
-import java.util.HashMap;
-import java.util.Hashtable;
-import java.util.Iterator;
-import java.util.List;
-import java.util.Map;
-
-import org.eclipse.core.runtime.CoreException;
-import org.eclipse.core.runtime.IConfigurationElement;
-import org.eclipse.core.runtime.IExtension;
-import org.eclipse.core.runtime.IExtensionPoint;
-import org.eclipse.core.runtime.IExtensionRegistry;
-import org.eclipse.core.runtime.Platform;
-import org.eclipse.jem.util.logger.proxy.Logger;
-import org.eclipse.osgi.util.NLS;
-import org.osgi.framework.Bundle;
-
-/**
- * @author kelleyp
- *
- * Singleton that parses the annotation tag information from the annotation-taghandler extension
- * point, and provides an interface for accessing it for other classes. Largely taken from the
- * AnnotationProcessor builder.
- */
-
-public class AnnotationTagRegistry {
-
- /**
- * Set to true once we've read in the annotation tag information from the plugin registry.
- */
- private static boolean initialized = false;
- private static final String ANNOTATION_TAG_INFO = "org.eclipse.jst.common.annotations.controller.AnnotationTagInfo"; //$NON-NLS-1$
-
- /**
- * List of tag specs for all of the tags.
- */
- private static ArrayList allTagSpecs = new ArrayList() {
- final private static long serialVersionUID = 8683452581122892190L;
-
- private void scopeAll(Collection c, boolean forAdd) {
- Iterator iter = c.iterator();
- while (iter.hasNext()) {
- TagSpec ts = (TagSpec) iter.next();
- if (forAdd)
- addScope(ts);
- else
- removeScope(ts);
- }
- }
-
- private void addScope(TagSpec ts) {
- if (ts == null)
- return;
- switch (ts.getScope()) {
- case TagSpec.FIELD :
- fieldTags.put(ts.getTagName(), ts);
- break;
- case TagSpec.METHOD :
- methodTags.put(ts.getTagName(), ts);
- break;
- case TagSpec.TYPE :
- typeTags.put(ts.getTagName(), ts);
- break;
- }
- }
-
- private void removeScope(TagSpec ts) {
- if (ts == null)
- return;
- switch (ts.getScope()) {
- case TagSpec.FIELD :
- fieldTags.remove(ts.getTagName());
- break;
- case TagSpec.METHOD :
- methodTags.remove(ts.getTagName());
- break;
- case TagSpec.TYPE :
- typeTags.remove(ts.getTagName());
- break;
- }
- }
-
- @Override
- public void add(int index, Object element) {
- super.add(index, element);
- addScope((TagSpec)element);
- }
-
- @Override
- public boolean add(Object o) {
- TagSpec newTagSpec = (TagSpec)o;
- // search for already existing tag spec with same name and same tag set name
- for (int i=0; i<this.size(); i++) {
- TagSpec tagSpec = (TagSpec) get(i);
- if (tagSpec.getTagName().equals(newTagSpec.getTagName()) && tagSpec.getScope() == newTagSpec.getScope()) {
- remove(tagSpec);
- removeScope(tagSpec);
- }
- }
- // add the new tag spec
- addScope(newTagSpec);
- return super.add(newTagSpec);
- }
-
- @Override
- public boolean addAll(Collection c) {
- scopeAll(c, true);
- return super.addAll(c);
- }
-
- @Override
- public boolean addAll(int index, Collection c) {
- scopeAll(c, true);
- return super.addAll(index, c);
- }
-
- @Override
- public Object remove(int index) {
- Object result = super.remove(index);
- removeScope((TagSpec) result);
- return result;
- }
-
- @Override
- public boolean remove(Object o) {
- removeScope((TagSpec) o);
- return super.remove(o);
- }
-
- @Override
- public boolean removeAll(Collection c) {
- scopeAll(c, false);
- return super.removeAll(c);
- }
-
- @Override
- public boolean retainAll(Collection c) {
- Iterator iter = this.iterator();
- while (iter.hasNext()) {
- TagSpec ts = (TagSpec) iter.next();
- if (!c.contains(ts))
- removeScope(ts);
- }
- return super.retainAll(c);
- }
- };
-
- /**
- * Map from a tag name to a InitTagInfo. Only live during up to the end of the init() method.
- */
- private static Hashtable tagAttribs = new Hashtable();
-
- /**
- * Division of tag names between allowed scopes.
- */
- private static Map methodTags = new HashMap();
-
- private static Map typeTags = new HashMap();
-
- private static Map fieldTags = new HashMap();
-
- private static final String CLASS_PROP = "class"; //$NON-NLS-1$
- private static final String DYNAMIC_INITIALIZER_EX_PT = "annotationTagDynamicInitializer"; //$NON-NLS-1$
- private static final String ANNOTATIONS_CONTROLLER_NAMESPACE = "org.eclipse.jst.common.annotations.controller"; //$NON-NLS-1$
-
- /**
- * Helper for init, parse the tag attributes for a AnnotationTagInfo tag.
- *
- * @param elems
- * Array of "attrib" configuration elements.
- * @param tagName
- * Lowercased name of the tag these attributes are associated with.
- */
- private static InitTagInfo parseTagAttribs(IConfigurationElement[] elems, String tagName, String scope) {
- int i;
- ArrayList attribList = new ArrayList();
-
- InitTagInfo tagInf = new InitTagInfo(tagName, scope, attribList);
-
- for (i = 0; i < elems.length; i++) {
- IConfigurationElement elem = elems[i];
-
- if (elem.getName().equalsIgnoreCase("attrib")) { //$NON-NLS-1$
- TagAttribSpec tas = new TagAttribSpec(elem.getAttribute("name"), elem.getAttribute("description")); //$NON-NLS-1$ //$NON-NLS-2$
- String use = elem.getAttribute("use"); //$NON-NLS-1$
-
- tas.setType(elem.getAttribute("type")); //$NON-NLS-1$
-
- // add valid values
- if ("enum".equals(elem.getAttribute("type"))) { //$NON-NLS-1$ //$NON-NLS-2$
- IConfigurationElement[] validValues = elem.getChildren("enumValues"); //$NON-NLS-1$
- List valuesList = new ArrayList();
- for (int j = 0; j < validValues.length; j++) {
- String value = validValues[j].getAttribute("value"); //$NON-NLS-1$
- valuesList.add(value);
- }
- String[] validValuesArray = new String[valuesList.size()];
- validValuesArray = (String[]) valuesList.toArray(validValuesArray);
-
- tas.setValidValues(validValuesArray);
- }
-
- if (use == null) {
- tas.clearRequired();
- } else if (use.equalsIgnoreCase("required")) { //$NON-NLS-1$
- tas.setRequired();
- } else if (use.equalsIgnoreCase("optional")) { //$NON-NLS-1$
- tas.clearRequired();
- } else {
- // Unlikely, unless annotation extension spec changes
- // without changes here.
- System.err.println(AnnotationsControllerResources.AnnotationTagRegistry_9 + use);
- return null;
- }
-
- IConfigurationElement[] elemUniqueArray = elem.getChildren("unique"); //$NON-NLS-1$
- if (elemUniqueArray.length > 0) {
- tas.setUnique();
- if (elemUniqueArray[0].getAttribute("scope") != null) //$NON-NLS-1$
- tas.getUnique().setScope(TagAttribSpec.uniqueScopeFromString(elemUniqueArray[0].getAttribute("scope"))); //$NON-NLS-1$
- if (elemUniqueArray.length > 1) {
- Logger.getLogger().logError(AnnotationsControllerResources.TagAttribSpec_2 + elemUniqueArray.length);
- }
- } else {
- tas.clearUnique();
- }
-
- attribList.add(tas);
- }
- }
- return tagInf;
- }
-
- /**
- * Return the tag set name from a full tag name.
- *
- * @param name
- * Full tag name (without the '@' at the beginning)
- * @return
- */
- public static String tagSetFromTagName(String name) {
- if (name == null)
- return null;
- int idx = name.lastIndexOf('.');
-
- if (idx != -1)
- return name.substring(0, idx);
- return ""; //$NON-NLS-1$
- }
-
- /**
- * Return the short name from a full tag name.
- *
- * @param name
- * Full tag name (without the '@' at the beginning)
- * @return
- */
- public static String tagFromTagName(String name) {
- if (name == null)
- return null;
- int idx = name.indexOf('.');
-
- if (idx != -1) {
- return name.substring(idx + 1);
- }
- // Default to the whole name being the tagset.
- return name;
- }
-
- /**
- * Reads in all of the tag attribute information from all annotation-tag-info extensions defined
- * in the system, and initializes the tagAttribs hashtable with them.
- *
- * @param registry
- */
- private static void readAllAttributeInfo(IExtensionPoint xp) {
-
- if (xp == null) {
- return;
- }
-
- IExtension[] exts = xp.getExtensions();
- Bundle bundle = null;
- for (int i = 0; i < exts.length; i++) {
- IConfigurationElement[] elems = exts[i].getConfigurationElements();
- bundle = Platform.getBundle(exts[i].getNamespace());
- String identifier = exts[i].getUniqueIdentifier();
-
- IConfigurationElement elem = null;
- String tagName = null;
- String scope = null;
- String tagSet = null;
- String fullTagName = null;
- for (int j = 0; j < elems.length; j++) {
- elem = elems[j];
- if (!elem.getName().equalsIgnoreCase("AnnotationTagInfo")) { //$NON-NLS-1$
- continue;
- }
- tagSet = elem.getAttribute("tagSet"); //$NON-NLS-1$
- tagName = elem.getAttribute("tagName"); //$NON-NLS-1$
- scope = elem.getAttribute("scope"); //$NON-NLS-1$
- if (isNullOrEmpty(tagSet) || isNullOrEmpty(tagName) || isNullOrEmpty(scope)) {
- Logger.getLogger().log(NLS.bind(AnnotationsControllerResources.AnnotationTagRegistry_10, new Object[]{identifier}));
- continue;
- }
- fullTagName = tagSet + "." + tagName; //$NON-NLS-1$
-
- InitTagInfo tagInf = parseTagAttribs(elem.getChildren(), fullTagName.toLowerCase(), scope);
- String key = (fullTagName + "#" + scope).toLowerCase(); //$NON-NLS-1$
- /*
- * There should only ever be one AnnotationTagInfo tag for any one annotation tag.
- */
- if (tagAttribs.containsKey(key)) {
- Logger.getLogger().log(AnnotationsControllerResources.AnnotationTagRegistry_0 + tagName + "'."); //$NON-NLS-1$
- } else {
- tagInf.bundle = bundle;
- tagAttribs.put(key, tagInf);
- }
- }
- }
- }
-
- private static boolean isNullOrEmpty(String aString) {
- return aString == null || aString.length() == 0;
- }
-
- /**
- * Reads tagSpec information in from the plugin registry. Taken from AnnotationProcessor.
- *
- * @return True if initialization completed successfully.
- * @throws CoreException
- * If there were problems reading the registry.
- */
- private static/* synchronized */boolean init() throws CoreException {
-
- /* Prevent multiple initialization */
- if (initialized) {
- return true;
- }
- initializeStaticTagDefinitions();
- initiaizeDynamicTagDefinitions();
- initialized = true;
-
- /* Don't need this anymore */
- tagAttribs = null;
-
- return true;
- }
-
- private static void initializeStaticTagDefinitions() throws CoreException {
- IExtensionRegistry registry = Platform.getExtensionRegistry();
-
- // TODO: Not even checking the tagset extension point yet.
- IExtensionPoint xp = registry.getExtensionPoint(ANNOTATION_TAG_INFO);
-
- if (xp == null)
- return;
-
- IExtension[] x = xp.getExtensions();
-
- /* Get all tag attribute information */
- readAllAttributeInfo(xp);
- for (int j = 0; j < x.length; j++) {
- IConfigurationElement[] tagSpecs = x[j].getConfigurationElements();
- for (int i = 0; i < tagSpecs.length; i++) {
- IConfigurationElement tagSpec = tagSpecs[i];
- String tagName = tagSpec.getAttribute("tagSet") + "." + tagSpec.getAttribute("tagName"); //$NON-NLS-1$ //$NON-NLS-2$ //$NON-NLS-3$
- String scope = tagSpec.getAttribute("scope"); //$NON-NLS-1$
- String multiplicity = tagSpec.getAttribute("multiplicity"); //$NON-NLS-1$
- TagSpec ts = null;
- if (multiplicity != null)
- ts = new TagSpec(tagName, TagSpec.scopeFromString(scope), TagSpec.multiplicityFromString(multiplicity));
- else
- ts = new TagSpec(tagName, TagSpec.scopeFromString(scope), TagSpec.Multiplicity.ONE);
- String key = (tagName + "#" + scope).toLowerCase(); //$NON-NLS-1$
- InitTagInfo tagInf = (InitTagInfo) tagAttribs.get(key);
-
- allTagSpecs.add(ts);
-
- if (tagInf != null) {
- ts.setAttributes(tagInf.attributes);
- ts.setBundle(tagInf.bundle);
- }
- }
- }
- }
-
- private static void initiaizeDynamicTagDefinitions() {
- IExtensionPoint xp = Platform.getExtensionRegistry().getExtensionPoint(ANNOTATIONS_CONTROLLER_NAMESPACE, DYNAMIC_INITIALIZER_EX_PT);
- if (xp == null)
- return;
- IExtension[] extensions = xp.getExtensions();
- for (int i = 0; i < extensions.length; i++) {
- IExtension extension = extensions[i];
- IConfigurationElement[] elements = extension.getConfigurationElements();
- for (int j = 0; j < elements.length; j++) {
- try {
- AnnotationTagDynamicInitializer initializer = (AnnotationTagDynamicInitializer) elements[j].createExecutableExtension(CLASS_PROP);
- initializer.registerTags();
- } catch (CoreException e) {
- Logger.getLogger().logError(e);
- }
- }
- }
- }
-
- /**
- *
- * @return List of AnnotationTagRegistry.TagSpecs for all tags.
- * @throws CoreException
- * If there were problems reading the initialization data from the plugin registry.
- */
- public static synchronized List getAllTagSpecs() {
- return allTagSpecs;
- }
-
- public static synchronized boolean isMethodTag(String tagName) {
- return methodTags.containsKey(tagName);
- }
-
- public static synchronized boolean isFieldTag(String tagName) {
- return fieldTags.containsKey(tagName);
- }
-
- public static synchronized boolean isTypeTag(String tagName) {
- return typeTags.containsKey(tagName);
- }
-
- /**
- * Answers the tagspec for the specified method tag name.
- *
- * @param tagName
- * Full name for a tag.
- * @return a TagSpec for the tag name, or null if no tag with that name is registered.
- */
- public static synchronized TagSpec getMethodTag(String tagName) {
- return (TagSpec) methodTags.get(tagName);
- }
-
- /**
- * Answers the tagspec for the specified field tag name.
- *
- * @param tagName
- * Full name for a tag.
- * @return a TagSpec for the tag name, or null if no tag with that name is registered.
- */
- public static synchronized TagSpec getFieldTag(String tagName) {
- return (TagSpec) fieldTags.get(tagName);
- }
-
- /**
- * Answers the tagspec for the specified type tag name.
- *
- * @param tagName
- * Full name for a tag.
- * @return a TagSpec for the tag name, or null if no tag with that name is registered.
- */
- public static synchronized TagSpec getTypeTag(String tagName) {
- return (TagSpec) typeTags.get(tagName);
- }
-
- private static class InitTagInfo {
- private String name;
-
- private List attributes;
-
- private Bundle bundle;
-
- private String scope;
-
- public InitTagInfo(String name, String scope, List att) {
- attributes = att;
- this.name = name;
- this.scope = scope;
- }
-
- /*
- * (non-Javadoc)
- *
- * @see java.lang.Object#equals(java.lang.Object)
- */
- @Override
- public boolean equals(Object obj) {
- if (this == obj)
- return true;
- else if (!(obj instanceof InitTagInfo))
- return false;
-
- return name.equals(((InitTagInfo) obj).name) || (scope.equals(((InitTagInfo) obj).name));
-
- }
-
- @Override
- public int hashCode() {
- return super.hashCode() + name.hashCode();
- }
- }
-
- static {
- try {
- AnnotationTagRegistry.init();
- } catch (CoreException e) {
- Logger.getLogger().logError(AnnotationsControllerResources.AnnotationTagRegistry_ERROR_1);
- Logger.getLogger().logError(e);
- }
- }
-}
\ No newline at end of file
diff --git a/plugins/org.eclipse.jst.common.annotations.controller/controller/org/eclipse/jst/common/internal/annotations/registry/AnnotationTagsetRegistry.java b/plugins/org.eclipse.jst.common.annotations.controller/controller/org/eclipse/jst/common/internal/annotations/registry/AnnotationTagsetRegistry.java
deleted file mode 100644
index 770f748..0000000
--- a/plugins/org.eclipse.jst.common.annotations.controller/controller/org/eclipse/jst/common/internal/annotations/registry/AnnotationTagsetRegistry.java
+++ /dev/null
@@ -1,106 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2003, 2004 IBM Corporation and others.
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
- *
- * Contributors:
- * IBM Corporation - initial API and implementation
- *******************************************************************************/
-/*
- * Created on Apr 7, 2004
- *
- * To change the template for this generated file go to
- * Window - Preferences - Java - Code Generation - Code and Comments
- */
-package org.eclipse.jst.common.internal.annotations.registry;
-
-import java.util.ArrayList;
-import java.util.HashMap;
-import java.util.Iterator;
-import java.util.List;
-import java.util.Map;
-
-import org.eclipse.core.runtime.IConfigurationElement;
-import org.eclipse.jem.util.RegistryReader;
-
-/**
- * @author mdelder
- *
- * To change the template for this generated type comment go to Window - Preferences - Java - Code
- * Generation - Code and Comments
- */
-public class AnnotationTagsetRegistry extends RegistryReader {
-
- public static final AnnotationTagsetRegistry INSTANCE = new AnnotationTagsetRegistry();
-
- private Map index;
-
- protected AnnotationTagsetRegistry() {
- super("org.eclipse.wst.common.internal.annotations.controller", TagsetDescriptor.TAGSET); //$NON-NLS-1$
- readRegistry();
- }
-
- private List descriptors;
-
- /*
- * (non-Javadoc)
- *
- * @see org.eclipse.wst.common.frameworks.internal.RegistryReader#readElement(org.eclipse.core.runtime.IConfigurationElement)
- */
- @Override
- public boolean readElement(IConfigurationElement element) {
- if (TagsetDescriptor.TAGSET.equals(element.getName())) {
- getDescriptors().add(new TagsetDescriptor(element));
- return true;
- }
- return false;
- }
-
- public TagsetDescriptor getDescriptor(String name) {
- if (name != null && name.length() > 0) {
-
- /* Index descriptors to avoid unnecessary searching */
- TagsetDescriptor descriptor = (TagsetDescriptor) getIndex().get(name);
- if (descriptor != null)
- return descriptor;
-
- for (Iterator itr = AnnotationTagsetRegistry.INSTANCE.getDescriptors().iterator(); itr.hasNext();) {
- descriptor = (TagsetDescriptor) itr.next();
- if (name.equals(descriptor.getName())) {
- getIndex().put(descriptor.getName(), descriptor);
- return descriptor;
-
- }
- }
- }
- return null;
- }
-
- /**
- * @return Returns the descriptors.
- */
- protected List getDescriptors() {
- if (descriptors == null)
- descriptors = new ArrayList();
- return descriptors;
- }
-
- /**
- * @return Returns the index.
- */
- protected Map getIndex() {
- if (index == null)
- index = new HashMap();
- return index;
- }
-
- /**
- * @param descriptor
- */
- public void registerTagset(TagsetDescriptor descriptor) {
- if (descriptor != null && getDescriptor(descriptor.getName()) == null)
- getDescriptors().add(descriptor);
- }
-}
\ No newline at end of file
diff --git a/plugins/org.eclipse.jst.common.annotations.controller/controller/org/eclipse/jst/common/internal/annotations/registry/AnnotationsControllerResources.java b/plugins/org.eclipse.jst.common.annotations.controller/controller/org/eclipse/jst/common/internal/annotations/registry/AnnotationsControllerResources.java
deleted file mode 100644
index a143c59..0000000
--- a/plugins/org.eclipse.jst.common.annotations.controller/controller/org/eclipse/jst/common/internal/annotations/registry/AnnotationsControllerResources.java
+++ /dev/null
@@ -1,47 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2003, 2004 IBM Corporation and others.
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
- *
- * Contributors:
- * IBM Corporation - initial API and implementation
- *******************************************************************************/
-/*
- * Created on Mar 8, 2004
- *
- * To change the template for this generated file go to
- * Window - Preferences - Java - Code Generation - Code and Comments
- */
-
-package org.eclipse.jst.common.internal.annotations.registry;
-
-import org.eclipse.osgi.util.NLS;
-
-public class AnnotationsControllerResources extends NLS {
- private static final String BUNDLE_NAME = "annotationcontroller";//$NON-NLS-1$
-
- private AnnotationsControllerResources() {
- // Do not instantiate
- }
-
- public static String TagSpec_3;
- public static String TagSpec_4;
- public static String TagSpec_5;
- public static String TagSpec_6;
- public static String TagAttribSpec_1;
- public static String TagAttribSpec_2;
- public static String AnnotationTagParser_0;
- public static String AnnotationTagParser_1;
- public static String AnnotationTagRegistry_0;
- public static String AnnotationTagRegistry_9;
- public static String AnnotationTagRegistry_10;
- public static String AnnotationTagRegistry_11;
- public static String AnnotationsControllerManager_ERROR_0;
- public static String AnnotationTagRegistry_ERROR_1;
-
- static {
- NLS.initializeMessages(BUNDLE_NAME, AnnotationsControllerResources.class);
- }
-}
\ No newline at end of file
diff --git a/plugins/org.eclipse.jst.common.annotations.controller/controller/org/eclipse/jst/common/internal/annotations/registry/AttributeValueProposalHelper.java b/plugins/org.eclipse.jst.common.annotations.controller/controller/org/eclipse/jst/common/internal/annotations/registry/AttributeValueProposalHelper.java
deleted file mode 100644
index be5670b..0000000
--- a/plugins/org.eclipse.jst.common.annotations.controller/controller/org/eclipse/jst/common/internal/annotations/registry/AttributeValueProposalHelper.java
+++ /dev/null
@@ -1,79 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2003, 2004 IBM Corporation and others.
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
- *
- * Contributors:
- * IBM Corporation - initial API and implementation
- *******************************************************************************/
-package org.eclipse.jst.common.internal.annotations.registry;
-
-/**
- * @author DABERG
- *
- */
-public class AttributeValueProposalHelper {
- private String replacementString;
- private int valueOffset = 0;
- private int replacementLength = 0;
- private String valueDisplayString;
- private boolean ensureBeginQuote = true;
- private boolean ensureEndQuote = true;
-
- public AttributeValueProposalHelper(String replacementString, int valueOffset, int replacementLength, String valueDisplayString) {
- this.replacementString = replacementString;
- this.valueOffset = valueOffset;
- this.replacementLength = replacementLength;
- this.valueDisplayString = valueDisplayString;
- }
-
- public int getReplacementLength() {
- return replacementLength;
- }
-
- public void setReplacementLength(int replacementLength) {
- this.replacementLength = replacementLength;
- }
-
- public String getReplacementString() {
- return replacementString;
- }
-
- public void setReplacementString(String replacementString) {
- this.replacementString = replacementString;
- }
-
- public String getValueDisplayString() {
- return valueDisplayString;
- }
-
- public void setValueDisplayString(String valueDisplayString) {
- this.valueDisplayString = valueDisplayString;
- }
-
- public int getValueOffset() {
- return valueOffset;
- }
-
- public void setValueOffset(int valueOffset) {
- this.valueOffset = valueOffset;
- }
-
- public boolean ensureBeginQuote() {
- return ensureBeginQuote;
- }
-
- public void setEnsureBeginQuote(boolean ensureBeginQuote) {
- this.ensureBeginQuote = ensureBeginQuote;
- }
-
- public boolean ensureEndQuote() {
- return ensureEndQuote;
- }
-
- public void setEnsureEndQuote(boolean ensureEndQuote) {
- this.ensureEndQuote = ensureEndQuote;
- }
-}
\ No newline at end of file
diff --git a/plugins/org.eclipse.jst.common.annotations.controller/controller/org/eclipse/jst/common/internal/annotations/registry/AttributeValuesHelper.java b/plugins/org.eclipse.jst.common.annotations.controller/controller/org/eclipse/jst/common/internal/annotations/registry/AttributeValuesHelper.java
deleted file mode 100644
index 76c0a8f..0000000
--- a/plugins/org.eclipse.jst.common.annotations.controller/controller/org/eclipse/jst/common/internal/annotations/registry/AttributeValuesHelper.java
+++ /dev/null
@@ -1,48 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2003, 2004 IBM Corporation and others.
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
- *
- * Contributors:
- * IBM Corporation - initial API and implementation
- *******************************************************************************/
-/*
- * Created on Jul 1, 2004
- */
-package org.eclipse.jst.common.internal.annotations.registry;
-
-import org.eclipse.jdt.core.IJavaElement;
-
-/**
- * @author jlanuti
- */
-public interface AttributeValuesHelper {
- static final String[] EMPTY_VALUES = new String[0];
- static final AttributeValueProposalHelper[] EMPTY_PROPOSAL_HELPERS = new AttributeValueProposalHelper[0];
-
- /**
- * Return a simple String array containing the valid values for the given
- * {@link TagAttributeSpec}and {@link IJavaElement}.
- *
- * @param tas
- * @param javaElement
- * @return
- */
- public String[] getValidValues(TagAttribSpec tas, IJavaElement javaElement);
-
- /**
- * This is a more advanced api for returning valid values for a given {@link TagAttribSpec}.
- * This api provides you with more flexibility to control the replacement string that is used
- * for the completion.
- *
- * @param tas
- * @param partialValue
- * @param valueOffset
- * @param javaElement
- * @return
- */
- public AttributeValueProposalHelper[] getAttributeValueProposalHelpers(TagAttribSpec tas, String partialValue, int valueOffset, IJavaElement javaElement);
-
-}
\ No newline at end of file
diff --git a/plugins/org.eclipse.jst.common.annotations.controller/controller/org/eclipse/jst/common/internal/annotations/registry/TagAttribSpec.java b/plugins/org.eclipse.jst.common.annotations.controller/controller/org/eclipse/jst/common/internal/annotations/registry/TagAttribSpec.java
deleted file mode 100644
index 37dad5f..0000000
--- a/plugins/org.eclipse.jst.common.annotations.controller/controller/org/eclipse/jst/common/internal/annotations/registry/TagAttribSpec.java
+++ /dev/null
@@ -1,350 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2003, 2004 IBM Corporation and others.
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
- *
- * Contributors:
- * IBM Corporation - initial API and implementation
- *******************************************************************************/
-/*
- * Created on Aug 25, 2003
- *
- * To change the template for this generated file go to
- * Window>Preferences>Java>Code Generation>Code and Comments
- */
-package org.eclipse.jst.common.internal.annotations.registry;
-
-import java.util.MissingResourceException;
-import java.util.ResourceBundle;
-
-import org.eclipse.jem.util.logger.proxy.Logger;
-import org.eclipse.jst.common.internal.annotations.core.AnnotationsCoreResources;
-
-/**
- * @author kelleyp Information on a single parameter for a tag. Parameters have names, and can be
- * marked as being required. (ie, not optional)
- */
-public class TagAttribSpec {
- private String attribName;
- private int flags;
- private String helpKey;
- private int type = Type.TEXT;
- private static final int FLG_REQUIRED = 1;
- private String[] validValues;
- private TagSpec tagSpec;
-
- /* Enum for type */
- public interface Type {
- public static final int TEXT = 0;
- public static final int BOOLEAN = 1;
- public static final int JAVATYPE = 2;
- public static final int ENUM = 3;
- }
-
- public class Unique {
- public static final int MODULE = 0;
- public static final int FILE = 1;
- public static final int TYPE = 2;
- public static final int METHOD = 3;
- public static final int FIELD = 4;
-
- private int scope = MODULE;
-
- public int getScope() {
- return scope;
- }
-
- public void setScope(int in) {
- scope = in;
- }
- }
-
- private Unique unique;
-
- public Unique getUnique() {
- return unique;
- }
-
- public boolean isUnique() {
- return unique != null;
- }
-
- public void setUnique() {
- unique = new Unique();
- }
-
- public void clearUnique() {
- unique = null;
- }
-
- /**
- * Converts a string representation of a tag attribute type to the integer representation.
- *
- * @param name
- * @return Integer type, defaults to TEXT if the type name is not recognized.
- */
- public static int typeNameToType(String name) {
- //TODO add enum
- if (name != null) {
- if (name.equalsIgnoreCase("text") || name.equalsIgnoreCase("string")) { //$NON-NLS-1$ //$NON-NLS-2$
- return Type.TEXT;
- } else if (name.equalsIgnoreCase("boolean") || name.equalsIgnoreCase("bool")) { //$NON-NLS-1$ //$NON-NLS-2$
- return Type.BOOLEAN;
- } else if (name.equalsIgnoreCase("javaType")) { //$NON-NLS-1$
- return Type.JAVATYPE;
- }
- }
- return Type.TEXT;
- }
-
- /**
- * Converts a type enum to a type string.
- *
- * @param ty
- * @return
- */
- public static String typeToTypeName(int ty) {
- switch (ty) {
- case Type.TEXT :
- return "string"; //$NON-NLS-1$
- case Type.BOOLEAN :
- return "bool"; //$NON-NLS-1$
- case Type.JAVATYPE :
- return "javaType"; //$NON-NLS-1$
- default :
- return "string"; //$NON-NLS-1$
- }
- }
-
- /**
- * Constructs a TagAttribSpec with <code>name</code> as the attribute name.
- *
- * @param name
- * Name for the attribute. Must not be null.
- * @throws IllegalArgumentException
- * if name is null.
- */
- public TagAttribSpec(String name) throws IllegalArgumentException {
- this(name, null);
- }
-
- public TagAttribSpec(String name, String hlpKey) {
- setAttribName(name);
- setHelpKey(hlpKey);
- }
-
- /**
- * Sets the type of this attribute.
- *
- * @param t
- * TEXT | BOOLEAN
- */
- public void setType(int t) {
- type = t;
- }
-
- /**
- * Sets the type of this attribute.
- *
- * @param typename
- * String representation, should be text or boolean.
- */
- public void setType(String typename) {
- type = typeNameToType(typename);
- }
-
- public int getType() {
- return type;
- }
-
- public boolean valueIsJavaType() {
- return type == Type.JAVATYPE;
- }
-
- public boolean valueIsText() {
- return type == Type.TEXT;
- }
-
- public boolean valueIsBool() {
- return type == Type.BOOLEAN;
- }
-
- /**
- * @return Name of the attribute.
- */
- public String getAttribName() {
- return attribName;
- }
-
- /**
- * Sets the attribute name. This can not be null.
- *
- * @param name
- * New name for the attribute.
- * @throws IllegalArgumentException
- * if the name is null.
- */
- public void setAttribName(String name) throws IllegalArgumentException {
- if (name == null) {
- throw new IllegalArgumentException(AnnotationsCoreResources.TagAttribSpec_6);
- }
- attribName = name;
- }
-
- /**
- *
- * @return true if this is a required attribute.
- */
- public boolean isRequired() {
- return (flags & FLG_REQUIRED) != 0;
- }
-
- /**
- * Sets the required flag for this attribute.
- */
- public void setRequired() {
- flags |= FLG_REQUIRED;
- }
-
- /**
- * Clears the required flag for this attribute.
- *
- */
- public void clearRequired() {
- flags &= (~FLG_REQUIRED);
- }
-
- /**
- *
- * @return The help key for this tag attribute. Should never return null.
- */
- public String getTextKey(int aType) {
- if (aType != TagSpec.HELP_TEXT) {
- return null;
- }
-
- if (helpKey == null) {
- helpKey = defaultHelpKey();
- }
- return helpKey;
- }
-
- /**
- * Formats the help text so it includes type and use information.
- */
- public String transformLocalizedText(String txt) {
- if (txt == null)
- return txt;
- StringBuffer buf = new StringBuffer(txt.length() + 50);
-
- buf.append("<b>Type: "); //$NON-NLS-1$
- buf.append(typeToTypeName(type));
- buf.append(", Use: "); //$NON-NLS-1$
- if (this.isRequired()) {
- buf.append("required"); //$NON-NLS-1$
- } else {
- buf.append("optional"); //$NON-NLS-1$
- }
- if (this.isUnique()) {
- buf.append(", unique:scope: "); //$NON-NLS-1$
- buf.append(TagAttribSpec.uniqueScopeToString(this.getUnique().getScope()));
- }
- buf.append("</b><p>"); //$NON-NLS-1$
- buf.append(txt);
- buf.append("</p>"); //$NON-NLS-1$
- return buf.toString();
-
- }
-
- /**
- *
- * @return The help key for this tag attribute. Should never return null.
- */
- public String getHelpKey() {
- return getTextKey(TagSpec.HELP_TEXT);
- }
-
- /**
- * Sets the help key. Setting this to null resets the help key to the default help key.
- *
- * @param key
- */
- public void setHelpKey(String key) {
- helpKey = key;
- }
-
- /**
- * @return the default help key name for this tag.
- *
- */
- private String defaultHelpKey() {
- return "ath." + attribName; //$NON-NLS-1$
- }
-
- public static int uniqueScopeFromString(String scopeStr) {
- if (scopeStr != null) {
- if (scopeStr.equalsIgnoreCase("module"))return TagAttribSpec.Unique.MODULE; //$NON-NLS-1$
- if (scopeStr.equalsIgnoreCase("file"))return TagAttribSpec.Unique.FILE; //$NON-NLS-1$
- if (scopeStr.equalsIgnoreCase("type"))return TagAttribSpec.Unique.TYPE; //$NON-NLS-1$
- if (scopeStr.equalsIgnoreCase("method"))return TagAttribSpec.Unique.METHOD; //$NON-NLS-1$
- if (scopeStr.equalsIgnoreCase("field"))return TagAttribSpec.Unique.FIELD; //$NON-NLS-1$
- }
- Logger.getLogger().logError(AnnotationsControllerResources.TagAttribSpec_1 + scopeStr);
- return TagAttribSpec.Unique.MODULE;
- }
-
- public static String uniqueScopeToString(int scope) {
- switch (scope) {
- case TagAttribSpec.Unique.MODULE :
- return "module"; //$NON-NLS-1$
- case TagAttribSpec.Unique.FILE :
- return "file"; //$NON-NLS-1$
- case TagAttribSpec.Unique.TYPE :
- return "type"; //$NON-NLS-1$
- case TagAttribSpec.Unique.METHOD :
- return "method"; //$NON-NLS-1$
- case TagAttribSpec.Unique.FIELD :
- return "field"; //$NON-NLS-1$
- default :
- Logger.getLogger().logError(AnnotationsControllerResources.TagAttribSpec_1 + scope);
- return "unknown value"; //$NON-NLS-1$
-
- }
- }
-
- /**
- * @return Returns the validValues.
- */
- public String[] getValidValues() {
- return validValues;
- }
-
- /**
- * @param validValues
- * The validValues to set.
- */
- public void setValidValues(String[] validValues) {
- this.validValues = validValues;
- }
-
- public TagSpec getTagSpec() {
- return tagSpec;
- }
-
- void setTagSpec(TagSpec tagSpec) {
- this.tagSpec = tagSpec;
- }
-
- public String lookupTagHelp() throws MissingResourceException {
- ResourceBundle b = getTagSpec().getResourceBundle();
- if (b == null)
- return null;
- String key = getHelpKey();
- String val = b.getString(getHelpKey());
- if (val == key)
- val = null;
- return transformLocalizedText(val);
- }
-}
\ No newline at end of file
diff --git a/plugins/org.eclipse.jst.common.annotations.controller/controller/org/eclipse/jst/common/internal/annotations/registry/TagSpec.java b/plugins/org.eclipse.jst.common.annotations.controller/controller/org/eclipse/jst/common/internal/annotations/registry/TagSpec.java
deleted file mode 100644
index 70ef208..0000000
--- a/plugins/org.eclipse.jst.common.annotations.controller/controller/org/eclipse/jst/common/internal/annotations/registry/TagSpec.java
+++ /dev/null
@@ -1,331 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2003, 2004 IBM Corporation and others.
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
- *
- * Contributors:
- * IBM Corporation - initial API and implementation
- *******************************************************************************/
-/*
- * Created on Aug 22, 2003
- *
- * To change the template for this generated file go to
- * Window>Preferences>Java>Code Generation>Code and Comments
- */
-package org.eclipse.jst.common.internal.annotations.registry;
-
-import java.util.ArrayList;
-import java.util.Iterator;
-import java.util.List;
-import java.util.MissingResourceException;
-import java.util.ResourceBundle;
-
-import org.eclipse.core.runtime.CoreException;
-import org.eclipse.core.runtime.IStatus;
-import org.eclipse.core.runtime.Platform;
-import org.eclipse.core.runtime.Status;
-import org.osgi.framework.Bundle;
-
-/**
- * All of the information in a single tagSpec tag, including the enclosing handler.
- */
-public class TagSpec {
-
- /**
- * Handle to the descriptor of the plugin that declared the completion information for this tag,
- * if any.
- */
- Bundle bundle;
-
- protected ResourceBundle resourceBundle;
-
- private boolean attemptedToFindResourceBundle = false;
-
- private AttributeValuesHelper validValuesHelper;
- private TagsetDescriptor tagsetDescriptor;
-
- /**
- * Name of the tag.
- */
- private String tagName;
-
- /**
- * Scope of the tag: METHOD | FIELD | TYPE
- */
- private int scope;
-
- /**
- * Multiplicity of the tag: ONE | MANY
- */
- private int multiplicity;
-
- /**
- * Attributes that can be set for this tag. (Instances of TagAttribSpec)
- */
- private List attributes = new ArrayList();
-
- private String helpKey;
-
- /**
- * Text type for use with localized text container.
- */
- public static final int HELP_TEXT = 0;
-
- public static final int METHOD = 0;
-
- public static final int TYPE = 1;
-
- public static final int FIELD = 2;
-
- public interface Multiplicity {
- public static final int ONE = 1;
-
- public static final int MANY = 2;
- }
-
- public TagSpec(String aName, int aScope, int aMultiplicity) {
- tagName = aName;
- scope = aScope;
- multiplicity = aMultiplicity;
- }
-
- public static int scopeFromString(String s) throws CoreException {
- if (s != null) {
- if (s.equalsIgnoreCase("type")) { //$NON-NLS-1$
- return TagSpec.TYPE;
- } else if (s.equalsIgnoreCase("field")) { //$NON-NLS-1$
- return TagSpec.FIELD;
- } else if (s.equalsIgnoreCase("method")) { //$NON-NLS-1$
- return TagSpec.METHOD;
- } else {
- // Should be impossible unless the annotation-taghandler.exsd or
- // calling code changes.
- //TODO: Logging
- throw new CoreException(new Status(IStatus.ERROR, "org.eclipse.wst.common.internal.annotations.controller", IStatus.OK, AnnotationsControllerResources.TagSpec_3 + s, null)); //$NON-NLS-1$
- }
- }
- throw new CoreException(new Status(IStatus.ERROR, "org.eclipse.wst.common.internal.annotations.controller", IStatus.OK, AnnotationsControllerResources.TagSpec_4, null)); //$NON-NLS-1$
-
- }
-
- public static int multiplicityFromString(String s) throws CoreException {
- if (s != null) {
- if (s.equalsIgnoreCase("1")) { //$NON-NLS-1$
- return TagSpec.Multiplicity.ONE;
- } else if (s.equalsIgnoreCase("*")) { //$NON-NLS-1$
- return TagSpec.Multiplicity.MANY;
- }
- throw new CoreException(new Status(IStatus.ERROR, "org.eclipse.wst.common.internal.annotations.controller", IStatus.OK, AnnotationsControllerResources.TagSpec_4, null)); //$NON-NLS-1$
- }
- //Return default
- return TagSpec.Multiplicity.ONE;
- }
-
- /**
- * @return Scope for tag, METHOD | TYPE | FIELD
- */
- public int getScope() {
- return scope;
- }
-
- /**
- * @return multiplicity for tag, ONE | MANY
- */
- public int getMultiplicity() {
- return multiplicity;
- }
-
- /**
- * @return Name of the tag
- */
- public String getTagName() {
- return tagName;
- }
-
- public TagsetDescriptor getTagSetDescriptor() {
- if (tagsetDescriptor == null) {
- String tagSetName = getTagName();
- int index = tagSetName.lastIndexOf('.');
- if (index == -1)
- tagSetName = ""; //$NON-NLS-1$
- else
- tagSetName = tagSetName.substring(index + 1);
- tagsetDescriptor = AnnotationTagsetRegistry.INSTANCE.getDescriptor(tagSetName);
- }
- return tagsetDescriptor;
- }
-
- /**
- * Sets the scope of this tag.
- *
- * @param i
- * METHOD | TYPE | FIELD
- */
- public void setScope(int i) {
- scope = i;
- }
-
- /**
- * Sets the multiplicity of this tag.
- *
- * @param i
- * ONE | MANY
- */
- public void setMultiplicity(int i) {
- multiplicity = i;
- }
-
- /**
- * Sets the name of the tag
- *
- * @param string
- * Name for the tag.
- */
- public void setTagName(String string) {
- tagName = string;
- }
-
- /**
- *
- * @return List of attributes for this tag.
- */
- public List getAttributes() {
- return attributes;
- }
-
- /**
- * Adds an attribute to the list of attributes for this tag.
- *
- * @param att
- * A TagAttribSpec
- */
- public void addAttribute(TagAttribSpec att) {
- if (att == null)
- return;
- attributes.add(att);
- att.setTagSpec(this);
- }
-
- /**
- * Sets the list of attributes for this tag.
- *
- * @param lst
- * An array list of TagAttribSpecs
- */
- public void setAttributes(List lst) {
- if (lst == null)
- attributes.clear();
- else {
- attributes = lst;
- for (int i = 0; i < lst.size(); i++) {
- TagAttribSpec tas = (TagAttribSpec) lst.get(i);
- tas.setTagSpec(this);
- }
- }
- }
-
- /**
- * Looks for attribute named <code>attName</code>. Case insensitive.
- *
- * @param attName
- * Name to look for
- * @return A TagAttribSpec, or null if none was found.
- */
- public TagAttribSpec attributeNamed(String attName) {
- Iterator i = getAttributes().iterator();
-
- while (i.hasNext()) {
- TagAttribSpec tas = (TagAttribSpec) i.next();
-
- if (attName.equalsIgnoreCase(tas.getAttribName())) {
- return tas;
- }
- }
- return null;
-
- }
-
- /**
- * @return Returns the declaringPlugin.
- */
- public Bundle getBundle() {
- return bundle;
- }
-
- /**
- * @param declaringPlugin
- * The declaringPlugin to set.
- */
- protected void setBundle(Bundle bundle) {
- this.bundle = bundle;
- }
-
- /**
- * @return Returns the resourceBundle.
- */
- public ResourceBundle getResourceBundle() {
- if (resourceBundle == null && !attemptedToFindResourceBundle) {
- attemptedToFindResourceBundle = true;
- Bundle aBundle = getBundle();
- if (aBundle != null)
- resourceBundle = Platform.getResourceBundle(bundle);
- }
- return resourceBundle;
- }
-
- /**
- * @param resourceBundle
- * The resourceBundle to set.
- */
- public void setResourceBundle(ResourceBundle resourceBundle) {
- attemptedToFindResourceBundle = false;
- this.resourceBundle = resourceBundle;
- }
-
- /**
- * @return Returns the validValuesHelper.
- */
- public AttributeValuesHelper getValidValuesHelper() {
- if (validValuesHelper == null && getTagSetDescriptor() != null)
- setValidValuesHelper(getTagSetDescriptor().getValidValuesHelper());
- return validValuesHelper;
- }
-
- /**
- * @param validValuesHelper
- * The validValuesHelper to set.
- */
- public void setValidValuesHelper(AttributeValuesHelper validValuesHelper) {
- this.validValuesHelper = validValuesHelper;
- }
-
- public String getHelpKey() {
- if (helpKey == null)
- helpKey = computeHelpKey();
- return helpKey;
- }
-
- /**
- * @return
- */
- protected String computeHelpKey() {
- return "tagh." + getTagName(); //$NON-NLS-1$
- }
-
- public void setHelpKey(String helpKey) {
- this.helpKey = helpKey;
- }
-
- public String lookupTagHelp() throws MissingResourceException {
- ResourceBundle b = getResourceBundle();
- if (b == null)
- return null;
- String key = getHelpKey();
- String val = b.getString(getHelpKey());
- if (val == key)
- val = null;
- return val;
- }
-}
\ No newline at end of file
diff --git a/plugins/org.eclipse.jst.common.annotations.controller/controller/org/eclipse/jst/common/internal/annotations/registry/TagsetDescriptor.java b/plugins/org.eclipse.jst.common.annotations.controller/controller/org/eclipse/jst/common/internal/annotations/registry/TagsetDescriptor.java
deleted file mode 100644
index 8e4c4da..0000000
--- a/plugins/org.eclipse.jst.common.annotations.controller/controller/org/eclipse/jst/common/internal/annotations/registry/TagsetDescriptor.java
+++ /dev/null
@@ -1,146 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2003, 2004 IBM Corporation and others.
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
- *
- * Contributors:
- * IBM Corporation - initial API and implementation
- *******************************************************************************/
-/*
- * Created on Apr 7, 2004
- *
- * To change the template for this generated file go to
- * Window - Preferences - Java - Code Generation - Code and Comments
- */
-package org.eclipse.jst.common.internal.annotations.registry;
-
-import java.util.ArrayList;
-import java.util.Iterator;
-import java.util.List;
-
-import org.eclipse.core.runtime.IConfigurationElement;
-
-
-/**
- * @author mdelder
- *
- * To change the template for this generated type comment go to Window - Preferences - Java - Code
- * Generation - Code and Comments
- */
-public class TagsetDescriptor {
-
- public static final String TAGSET = "AnnotationTagSet"; //$NON-NLS-1$
- public static final String ATT_NAME = "name"; //$NON-NLS-1$
- public static final String ATT_DISPLAY_NAME = "displayName"; //$NON-NLS-1$
- public static final String ATT_DESCRIPTION = "description"; //$NON-NLS-1$
- public static final String ATT_PARENT_TAGSET = "parentTagset"; //$NON-NLS-1$
- public static final String ATT_VALID_VALUES_HELPER = "validValuesHelper"; //$NON-NLS-1$
-
- private final IConfigurationElement element;
-
- protected String name;
- protected String displayName;
- protected String description;
- protected String parentTagset;
- protected AttributeValuesHelper validValuesHelper;
-
- protected TagsetDescriptor() {
- element = null;
- }
-
- public TagsetDescriptor(IConfigurationElement element) {
- this.element = element;
- init();
- }
-
- /**
- *
- */
- private void init() {
- this.name = this.element.getAttribute(ATT_NAME);
- this.displayName = this.element.getAttribute(ATT_DISPLAY_NAME);
- this.description = this.element.getAttribute(ATT_DESCRIPTION);
- this.parentTagset = this.element.getAttribute(ATT_PARENT_TAGSET);
- // set the valid values helper if there is one
- try {
- String validValuesHelperName = this.element.getAttribute(ATT_VALID_VALUES_HELPER);
- if (validValuesHelperName != null) {
- Class loaded = Class.forName(validValuesHelperName);
- this.validValuesHelper = (AttributeValuesHelper) loaded.newInstance();
- }
- } catch (Exception e) {
- // Do nothing
- }
- }
-
- /**
- * @return Returns the description.
- */
- public String getDescription() {
- return description;
- }
-
- /**
- * @return Returns the displayName.
- */
- public String getDisplayName() {
- return displayName;
- }
-
- /**
- * @return Returns the element.
- */
- public IConfigurationElement getElement() {
- return element;
- }
-
- /**
- * @return Returns the name.
- */
- public String getName() {
- return name;
- }
-
- /**
- * @return Returns the parentTagset.
- */
- public String getParentTagset() {
- return parentTagset;
- }
-
- public TagsetDescriptor[] getDirectDependents() {
-
- if (getName() == null || getName().equals("")) //$NON-NLS-1$
- return new TagsetDescriptor[0];
-
- List dependents = new ArrayList();
-
- TagsetDescriptor descriptor = null;
- for (Iterator itr = AnnotationTagsetRegistry.INSTANCE.getDescriptors().iterator(); itr.hasNext();) {
- descriptor = (TagsetDescriptor) itr.next();
- if (getName().equals(descriptor.getParentTagset()))
- dependents.add(descriptor);
- }
-
- TagsetDescriptor[] descriptors = new TagsetDescriptor[dependents.size()];
- dependents.toArray(descriptors);
- return descriptors;
- }
-
- /**
- * @return Returns the validValuesHelper.
- */
- public AttributeValuesHelper getValidValuesHelper() {
- return validValuesHelper;
- }
-
- /**
- * @param validValuesHelper
- * The validValuesHelper to set.
- */
- public void setValidValuesHelper(AttributeValuesHelper validValuesHelper) {
- this.validValuesHelper = validValuesHelper;
- }
-}
\ No newline at end of file
diff --git a/plugins/org.eclipse.jst.common.annotations.controller/plugin.properties b/plugins/org.eclipse.jst.common.annotations.controller/plugin.properties
deleted file mode 100644
index 475ed7e..0000000
--- a/plugins/org.eclipse.jst.common.annotations.controller/plugin.properties
+++ /dev/null
@@ -1,4 +0,0 @@
-Annotations_Controller=Annotations Controller
-annotation_tag_info=annotation tag info
-annotation_tagset=annotation tagset
-annotationTagDynamicInitializer=annotationTagDynamicInitializer
\ No newline at end of file
diff --git a/plugins/org.eclipse.jst.common.annotations.controller/plugin.xml b/plugins/org.eclipse.jst.common.annotations.controller/plugin.xml
deleted file mode 100644
index 990fda0..0000000
--- a/plugins/org.eclipse.jst.common.annotations.controller/plugin.xml
+++ /dev/null
@@ -1,9 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<?eclipse version="3.0"?>
-<plugin>
-
- <extension-point id="annotationsController" name="%Annotations_Controller" schema="schema/annotationsController.exsd"/>
- <extension-point id="AnnotationTagInfo" name="%annotation_tag_info" schema="schema/annotation-tag-info.exsd"/>
- <extension-point id="AnnotationTagSet" name="%annotation_tagset" schema="schema/annotation.tagset.exsd"/>
- <extension-point id="annotationTagDynamicInitializer" name="%annotationTagDynamicInitializer" schema="schema/annotationTagDynamicInitializer.exsd"/>
-</plugin>
diff --git a/plugins/org.eclipse.jst.common.annotations.controller/prepareforpii.xml b/plugins/org.eclipse.jst.common.annotations.controller/prepareforpii.xml
deleted file mode 100644
index 833fffa..0000000
--- a/plugins/org.eclipse.jst.common.annotations.controller/prepareforpii.xml
+++ /dev/null
@@ -1,36 +0,0 @@
-<project name="PrepareForPII" default="main" basedir=".">
-
- <!-- Setup temp variables -->
- <target name="init">
- <property name="nlsDir" value="d:/NLS/Corona/0526"/>
- <property name="plugin" value="com.ibm.wtp.annotations.controller"/>
- <property name="plugindir" value="d:/workspaceCorona/${plugin}"/>
- <property name="outputDir" value="${nlsDir}/${plugin}"/>
-
-
- </target>
-
- <!-- Create the destination dir -->
- <target name="nlsDir" depends="init">
- <mkdir dir="${nlsDir}"/>
- </target>
-
- <!-- Create the destination dir -->
- <target name="plugindir" depends="nlsDir">
- <delete dir="${outputDir}"/>
- <mkdir dir="${outputDir}"/>
- </target>
-
- <!-- Move the files to the correct locations in the workspace. -->
- <target name="main" depends="plugindir">
-
- <messageIdGen folderPath = "${plugindir}" componentId = "E" />
-
- <copy todir = "${outputDir}/property_files" >
- <fileset dir="${plugindir}/property_files">
- <include name="**/*.properties"/>
- </fileset>
- </copy>
-
- </target>
-</project>
diff --git a/plugins/org.eclipse.jst.common.annotations.controller/property_files/annotationcontroller.properties b/plugins/org.eclipse.jst.common.annotations.controller/property_files/annotationcontroller.properties
deleted file mode 100644
index a2631de..0000000
--- a/plugins/org.eclipse.jst.common.annotations.controller/property_files/annotationcontroller.properties
+++ /dev/null
@@ -1,24 +0,0 @@
-###############################################################################
-# Copyright (c) 2003, 2004 IBM Corporation and others.
-# All rights reserved. This program and the accompanying materials
-# are made available under the terms of the Eclipse Public License v1.0
-# which accompanies this distribution, and is available at
-# http://www.eclipse.org/legal/epl-v10.html
-#
-# Contributors:
-# IBM Corporation - initial API and implementation
-###############################################################################
-TagSpec_3=Unknown tag scope:
-TagSpec_4=Null tag scope.
-TagSpec_5=Unknown tag multiplicity:
-TagSpec_6=Null tag multiplicity.
-TagAttribSpec_1=Unknown 'unique' scope value:
-TagAttribSpec_2=More than one 'unique' tag defined:
-AnnotationTagParser_0=Null event handler.
-AnnotationTagParser_1=
-AnnotationTagRegistry_0=More than one 'AnnotationTagInfo' tag for the tag '
-AnnotationTagRegistry_9=parseTagAttribs: unknown 'use' value:
-AnnotationTagRegistry_10=Incomplete element AnnotationTagInfo in plugin {0}
-AnnotationTagRegistry_11=parseTagAttribs: unknown 'isJavaTypeIdentifier' value:
-AnnotationsControllerManager_ERROR_0=IWAE0001E Invalid IConfigurationElement used to create AnnotationsControllerRegistry.Descriptor.
-AnnotationTagRegistry_ERROR_1=
\ No newline at end of file
diff --git a/plugins/org.eclipse.jst.common.annotations.controller/schema/annotation-tag-info.exsd b/plugins/org.eclipse.jst.common.annotations.controller/schema/annotation-tag-info.exsd
deleted file mode 100644
index 37f2397..0000000
--- a/plugins/org.eclipse.jst.common.annotations.controller/schema/annotation-tag-info.exsd
+++ /dev/null
@@ -1,255 +0,0 @@
-<?xml version='1.0' encoding='UTF-8'?>
-<!-- Schema file written by PDE -->
-<schema targetNamespace="org.eclipse.jst.common.annotations.controller">
-<annotation>
- <appInfo>
- <meta.schema plugin="org.eclipse.jst.common.annotations.controller" id="AnnotationTagInfo" name="Annotation Tag Info"/>
- </appInfo>
- <documentation>
- Describes the tags contained by a tag set and the tag's attributes.
- </documentation>
- </annotation>
-
- <element name="extension">
- <complexType>
- <sequence>
- <element ref="AnnotationTagInfo" minOccurs="1" maxOccurs="unbounded"/>
- </sequence>
- <attribute name="point" type="string" use="required">
- <annotation>
- <documentation>
- a fully qualified identifier of the target extension point
- </documentation>
- </annotation>
- </attribute>
- <attribute name="id" type="string">
- <annotation>
- <documentation>
- an optional identifier of the extension instance
- </documentation>
- </annotation>
- </attribute>
- <attribute name="name" type="string">
- <annotation>
- <documentation>
- an optional name of the extension instance
- </documentation>
- </annotation>
- </attribute>
- </complexType>
- </element>
-
- <element name="AnnotationTagInfo">
- <complexType>
- <sequence>
- <element ref="attrib" minOccurs="0" maxOccurs="unbounded"/>
- </sequence>
- <attribute name="tagSet" type="string" use="required">
- <annotation>
- <documentation>
- Name of the tag set this tag comes underneath. ( for instance, if we're defining the <code>@ejb.bean</code>
-tag, then the tag set would be <code>ejb</code>. ) The tag set must have been defined using the annotation.tagset extension point.
- </documentation>
- </annotation>
- </attribute>
- <attribute name="tagName" type="string" use="required">
- <annotation>
- <documentation>
- Name of the tag. ( if we're defining the <code>@ejb.bean</code> tag, then the tagName would be <code>bean</code> ).
- </documentation>
- </annotation>
- </attribute>
- <attribute name="scope" use="required">
- <annotation>
- <documentation>
- Scope of the bean. Must be <code>type</code>,<code>method</code>, or <code>field</code>.
- </documentation>
- </annotation>
- <simpleType>
- <restriction base="string">
- <enumeration value="type">
- </enumeration>
- <enumeration value="method">
- </enumeration>
- <enumeration value="field">
- </enumeration>
- </restriction>
- </simpleType>
- </attribute>
- <attribute name="multiplicity" use="default" value="1">
- <annotation>
- <documentation>
- Multiplicity of the tagset. Must be <code>1</code> or<code>*</code>. The default value is 1, if not specified.
- </documentation>
- </annotation>
- <simpleType>
- <restriction base="string">
- <enumeration value="1">
- </enumeration>
- <enumeration value="*">
- </enumeration>
- </restriction>
- </simpleType>
- </attribute>
- <attribute name="description" type="string">
- <annotation>
- <documentation>
- Optional description. May be a description string, or a
-key to localized text for the description in the declaring plugin's resource bundle. No default if this is
-not specified.
- </documentation>
- </annotation>
- </attribute>
- </complexType>
- </element>
-
- <element name="attrib">
- <complexType>
- <sequence>
- <element ref="unique" minOccurs="0" maxOccurs="1"/>
- <element ref="enumValues" minOccurs="0" maxOccurs="unbounded"/>
- </sequence>
- <attribute name="name" type="string" use="required">
- <annotation>
- <documentation>
- Name of the attribute.
- </documentation>
- </annotation>
- </attribute>
- <attribute name="description" type="string">
- <annotation>
- <documentation>
- Description text for the attribute, or key pointing to the localized description text inside of the declaring plugin's resource bundle. If not specified, defaults to <code>ath.ATTRIBUTE_NAME</code>.
- </documentation>
- </annotation>
- </attribute>
- <attribute name="use" use="default" value="optional">
- <annotation>
- <documentation>
- Sets whether this tag is <code>optional</code> or <code>required</code>. The default is <code>optional</code>.
- </documentation>
- </annotation>
- <simpleType>
- <restriction base="string">
- <enumeration value="optional">
- </enumeration>
- <enumeration value="required">
- </enumeration>
- </restriction>
- </simpleType>
- </attribute>
- <attribute name="type" use="default" value="string">
- <annotation>
- <documentation>
- Type of the attribute, <code>string|boolean|javaType</code>. Defaults to <code>string</code> if not specified.
- </documentation>
- </annotation>
- <simpleType>
- <restriction base="string">
- <enumeration value="string">
- </enumeration>
- <enumeration value="bool">
- </enumeration>
- <enumeration value="javaType">
- </enumeration>
- <enumeration value="enum">
- </enumeration>
- </restriction>
- </simpleType>
- </attribute>
- </complexType>
- </element>
-
- <element name="unique">
- <annotation>
- <documentation>
- Specifies that the attribute value is unique within the specified scope.
- </documentation>
- </annotation>
- <complexType>
- <attribute name="scope" use="default" value="module">
- <annotation>
- <documentation>
- The scope of the uniqueness for the attribute value. It is one of the <code>module</code>, <code>file</code>, <code>type</code>, <code>method</code>,or <code>field</code>. The default value is 'module'.
- </documentation>
- </annotation>
- <simpleType>
- <restriction base="string">
- <enumeration value="module">
- </enumeration>
- <enumeration value="file">
- </enumeration>
- <enumeration value="type">
- </enumeration>
- <enumeration value="method">
- </enumeration>
- <enumeration value="field">
- </enumeration>
- </restriction>
- </simpleType>
- </attribute>
- </complexType>
- </element>
-
- <element name="enumValues">
- <complexType>
- <attribute name="value" type="string" use="required">
- <annotation>
- <documentation>
- This can be used to supply the user a drop down choice of values for a specific attribute selection. Each one of these "values" is an entry in that drop down for the selected attribute.
- </documentation>
- </annotation>
- </attribute>
- </complexType>
- </element>
-
- <annotation>
- <appInfo>
- <meta.section type="since"/>
- </appInfo>
- <documentation>
- <b>This extension point is part of an interim API that is still under development and expected to change significantly before reaching stability. It is being made available at this early stage to solicit feedback from pioneering adopters on the understanding that any code that uses this API will almost certainly be broken (repeatedly) as the API evolves.</b>
- </documentation>
- </annotation>
-
- <annotation>
- <appInfo>
- <meta.section type="examples"/>
- </appInfo>
- <documentation>
-
- </documentation>
- </annotation>
-
- <annotation>
- <appInfo>
- <meta.section type="apiInfo"/>
- </appInfo>
- <documentation>
-
- </documentation>
- </annotation>
-
- <annotation>
- <appInfo>
- <meta.section type="implementation"/>
- </appInfo>
- <documentation>
-
- </documentation>
- </annotation>
-
- <annotation>
- <appInfo>
- <meta.section type="copyright"/>
- </appInfo>
- <documentation>
- Copyright (c) 2005 IBM Corporation and others.<br>
-All rights reserved. This program and the accompanying materials are made
-available under the terms of the Eclipse Public License v1.0 which accompanies
-this distribution, and is available at <a
-href="http://www.eclipse.org/legal/epl-v10.html">http://www.eclipse.org/legal/epl-v10.html</a>
- </documentation>
- </annotation>
-
-</schema>
diff --git a/plugins/org.eclipse.jst.common.annotations.controller/schema/annotation.tagset.exsd b/plugins/org.eclipse.jst.common.annotations.controller/schema/annotation.tagset.exsd
deleted file mode 100644
index e113ef5..0000000
--- a/plugins/org.eclipse.jst.common.annotations.controller/schema/annotation.tagset.exsd
+++ /dev/null
@@ -1,138 +0,0 @@
-<?xml version='1.0' encoding='UTF-8'?>
-<!-- Schema file written by PDE -->
-<schema targetNamespace="org.eclipse.jst.common.annotations.controller">
-<annotation>
- <appInfo>
- <meta.schema plugin="org.eclipse.jst.common.annotations.controller" id="AnnotationTagSet" name="Annotations Tag Set"/>
- </appInfo>
- <documentation>
- Allows clients to define a tag set for an annotation
-tag. A tag set named X would contain all of the tags that
-look like <code>@X.tag</code>. So the <code>ejb</code>
-tag set would contain the <code>@ejb.bean</code> tag,
-the <code>@ejb.persistence</code> tag, the <code>@ejb.pk</code> tag, etc...
- </documentation>
- </annotation>
-
- <element name="extension">
- <complexType>
- <sequence>
- <element ref="AnnotationTagSet" minOccurs="1" maxOccurs="unbounded"/>
- </sequence>
- <attribute name="point" type="string" use="required">
- <annotation>
- <documentation>
- a fully qualified identifier of the target extension point
- </documentation>
- </annotation>
- </attribute>
- <attribute name="id" type="string">
- <annotation>
- <documentation>
- an optional identifier of the extension instance
- </documentation>
- </annotation>
- </attribute>
- <attribute name="name" type="string">
- <annotation>
- <documentation>
- an optional name of the extension instance
- </documentation>
- </annotation>
- </attribute>
- </complexType>
- </element>
-
- <element name="AnnotationTagSet">
- <complexType>
- <attribute name="name" type="string" use="required">
- <annotation>
- <documentation>
- Name of the tagset. The name for the tagset that contains the <code>@ejb.bean</code> tag would be <code>ejb</code>.
- </documentation>
- </annotation>
- </attribute>
- <attribute name="displayName" type="string">
- <annotation>
- <documentation>
- The text of the display name for the tag, or a resource
-key pointing to the localized display name inside of the
-declaring plugin's resource bundle.
- </documentation>
- </annotation>
- </attribute>
- <attribute name="description" type="string">
- <annotation>
- <documentation>
- A description of the tag set. Can be the text of the
-description, or a key for the declaring plugin's resource bundle that points to the localized text for the tag set description.
- </documentation>
- </annotation>
- </attribute>
- <attribute name="parentTagset" type="string">
- <annotation>
- <documentation>
- This can be used optionally to set a tagset as a parent to this one, which will enforce the parent as a prerequisite tag set which will be handled first.
- </documentation>
- </annotation>
- </attribute>
- <attribute name="validValuesHelper" type="string">
- <annotation>
- <documentation>
- This can be used optionally to add a programmatic dynamic helper to supply the user with a set of valid values for attributes in this tag set, depending on attribute selection.
- </documentation>
- </annotation>
- </attribute>
- </complexType>
- </element>
-
- <annotation>
- <appInfo>
- <meta.section type="since"/>
- </appInfo>
- <documentation>
- <b>This extension point is part of an interim API that is still under development and expected to change significantly before reaching stability. It is being made available at this early stage to solicit feedback from pioneering adopters on the understanding that any code that uses this API will almost certainly be broken (repeatedly) as the API evolves.</b>
- </documentation>
- </annotation>
-
- <annotation>
- <appInfo>
- <meta.section type="examples"/>
- </appInfo>
- <documentation>
-
- </documentation>
- </annotation>
-
- <annotation>
- <appInfo>
- <meta.section type="apiInfo"/>
- </appInfo>
- <documentation>
-
- </documentation>
- </annotation>
-
- <annotation>
- <appInfo>
- <meta.section type="implementation"/>
- </appInfo>
- <documentation>
-
- </documentation>
- </annotation>
-
- <annotation>
- <appInfo>
- <meta.section type="copyright"/>
- </appInfo>
- <documentation>
- Copyright (c) 2005 IBM Corporation and others.<br>
-All rights reserved. This program and the accompanying materials are made
-available under the terms of the Eclipse Public License v1.0 which accompanies
-this distribution, and is available at <a
-href="http://www.eclipse.org/legal/epl-v10.html">http://www.eclipse.org/legal/epl-v10.html</a>
- </documentation>
- </annotation>
-
-</schema>
diff --git a/plugins/org.eclipse.jst.common.annotations.controller/schema/annotationTagDynamicInitializer.exsd b/plugins/org.eclipse.jst.common.annotations.controller/schema/annotationTagDynamicInitializer.exsd
deleted file mode 100644
index 3eab09e..0000000
--- a/plugins/org.eclipse.jst.common.annotations.controller/schema/annotationTagDynamicInitializer.exsd
+++ /dev/null
@@ -1,106 +0,0 @@
-<?xml version='1.0' encoding='UTF-8'?>
-<!-- Schema file written by PDE -->
-<schema targetNamespace="org.eclipse.jst.common.annotations.controller">
-<annotation>
- <appInfo>
- <meta.schema plugin="org.eclipse.jst.common.annotations.controller" id="annotationTagDynamicInitializer" name="Annotation Tag Dynamic Initializer"/>
- </appInfo>
- <documentation>
- This extension point is used to allow for clients to define their annotation tags dynamically. This means that it is not necessary to statically define annotation tags using the tag-info extension point. The extensions for this point will be called just after initializing the static annotation tags from the tag-info extension point.
- </documentation>
- </annotation>
-
- <element name="extension">
- <complexType>
- <sequence>
- <element ref="initializer"/>
- </sequence>
- <attribute name="id" type="string">
- <annotation>
- <documentation>
- an optional identifier of the extension instance
- </documentation>
- </annotation>
- </attribute>
- <attribute name="point" type="string" use="required">
- <annotation>
- <documentation>
- a fully qualified identifier of the target extension point
- </documentation>
- </annotation>
- </attribute>
- <attribute name="name" type="string">
- <annotation>
- <documentation>
- an optional name of the extension instance
- </documentation>
- <appInfo>
- <meta.attribute translatable="true"/>
- </appInfo>
- </annotation>
- </attribute>
- </complexType>
- </element>
-
- <element name="initializer">
- <complexType>
- <attribute name="class" type="string" use="required">
- <annotation>
- <documentation>
- Set the qualified name of a class that implements the com.ibm.wtp.annotations.registry.AnnotationTagDynamicInitializer interface. This class must have a default constructor.
- </documentation>
- </annotation>
- </attribute>
- </complexType>
- </element>
-
- <annotation>
- <appInfo>
- <meta.section type="since"/>
- </appInfo>
- <documentation>
- <b>This extension point is part of an interim API that is still under development and expected to change significantly before reaching stability. It is being made available at this early stage to solicit feedback from pioneering adopters on the understanding that any code that uses this API will almost certainly be broken (repeatedly) as the API evolves.</b>
- </documentation>
- </annotation>
-
- <annotation>
- <appInfo>
- <meta.section type="examples"/>
- </appInfo>
- <documentation>
-
- </documentation>
- </annotation>
-
- <annotation>
- <appInfo>
- <meta.section type="apiInfo"/>
- </appInfo>
- <documentation>
-
- </documentation>
- </annotation>
-
- <annotation>
- <appInfo>
- <meta.section type="implementation"/>
- </appInfo>
- <documentation>
-
- </documentation>
- </annotation>
-
- <annotation>
- <appInfo>
- <meta.section type="copyright"/>
- </appInfo>
- <documentation>
- Copyright (c) 2005 IBM Corporation and others.<br>
-All rights reserved. This program and the accompanying materials are made
-available under the terms of the Eclipse Public License v1.0 which accompanies
-this distribution, and is available at <a
-href="http://www.eclipse.org/legal/epl-v10.html">http://www.eclipse.org/legal/epl-v10.html</a>
- </documentation>
- </annotation>
-
-</schema>
diff --git a/plugins/org.eclipse.jst.common.annotations.controller/schema/annotationsController.exsd b/plugins/org.eclipse.jst.common.annotations.controller/schema/annotationsController.exsd
deleted file mode 100644
index a7c5daa..0000000
--- a/plugins/org.eclipse.jst.common.annotations.controller/schema/annotationsController.exsd
+++ /dev/null
@@ -1,117 +0,0 @@
-<?xml version='1.0' encoding='UTF-8'?>
-<!-- Schema file written by PDE -->
-<schema targetNamespace="org.eclipse.jst.common.annotations.controller">
-<annotation>
- <appInfo>
- <meta.schema plugin="org.eclipse.jst.common.annotations.controller" id="annotationsController" name="Annotations Controller"/>
- </appInfo>
- <documentation>
- The annotationsController is used in generating annotated beans.
- </documentation>
- </annotation>
-
- <element name="extension">
- <complexType>
- <sequence>
- <element ref="annotationsController" minOccurs="1" maxOccurs="unbounded"/>
- </sequence>
- <attribute name="point" type="string" use="required">
- <annotation>
- <documentation>
- a fully qualified identifier of the target extension point
- </documentation>
- </annotation>
- </attribute>
- <attribute name="id" type="string">
- <annotation>
- <documentation>
- an optional identifier of the extension instance
- </documentation>
- </annotation>
- </attribute>
- <attribute name="name" type="string">
- <annotation>
- <documentation>
- an optional name of the extension instance
- </documentation>
- </annotation>
- </attribute>
- </complexType>
- </element>
-
- <element name="annotationsController">
- <complexType>
- <attribute name="id" type="string" use="required">
- <annotation>
- <documentation>
- The id is used to coordinate precedence using function groups so this must be consistent with the function group bindings.
- </documentation>
- </annotation>
- </attribute>
- <attribute name="class" type="string" use="required">
- <annotation>
- <documentation>
- This is the name of the extension class defined by the extension
- </documentation>
- </annotation>
- </attribute>
- <attribute name="builderID" type="string" use="required">
- <annotation>
- <documentation>
- This is the ID of the annotations builder to be used by this annotations controller.
- </documentation>
- </annotation>
- </attribute>
- </complexType>
- </element>
-
- <annotation>
- <appInfo>
- <meta.section type="since"/>
- </appInfo>
- <documentation>
- <b>This extension point is part of an interim API that is still under development and expected to change significantly before reaching stability. It is being made available at this early stage to solicit feedback from pioneering adopters on the understanding that any code that uses this API will almost certainly be broken (repeatedly) as the API evolves.</b>
- </documentation>
- </annotation>
-
- <annotation>
- <appInfo>
- <meta.section type="examples"/>
- </appInfo>
- <documentation>
-
- </documentation>
- </annotation>
-
- <annotation>
- <appInfo>
- <meta.section type="apiInfo"/>
- </appInfo>
- <documentation>
-
- </documentation>
- </annotation>
-
- <annotation>
- <appInfo>
- <meta.section type="implementation"/>
- </appInfo>
- <documentation>
-
- </documentation>
- </annotation>
-
- <annotation>
- <appInfo>
- <meta.section type="copyright"/>
- </appInfo>
- <documentation>
- Copyright (c) 2005 IBM Corporation and others.<br>
-All rights reserved. This program and the accompanying materials are made
-available under the terms of the Eclipse Public License v1.0 which accompanies
-this distribution, and is available at <a
-href="http://www.eclipse.org/legal/epl-v10.html">http://www.eclipse.org/legal/epl-v10.html</a>
- </documentation>
- </annotation>
-
-</schema>
diff --git a/plugins/org.eclipse.jst.common.annotations.core/.classpath b/plugins/org.eclipse.jst.common.annotations.core/.classpath
deleted file mode 100644
index 83a4f32..0000000
--- a/plugins/org.eclipse.jst.common.annotations.core/.classpath
+++ /dev/null
@@ -1,12 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<classpath>
- <classpathentry kind="src" path="src"/>
- <classpathentry kind="src" path="property_files"/>
- <classpathentry kind="con" path="org.eclipse.jdt.launching.JRE_CONTAINER/org.eclipse.jdt.internal.debug.ui.launcher.StandardVMType/J2SE-1.5"/>
- <classpathentry kind="con" path="org.eclipse.pde.core.requiredPlugins">
- <accessrules>
- <accessrule kind="accessible" pattern="org/eclipse/wst/common/**"/>
- </accessrules>
- </classpathentry>
- <classpathentry kind="output" path="bin"/>
-</classpath>
diff --git a/plugins/org.eclipse.jst.common.annotations.core/.cvsignore b/plugins/org.eclipse.jst.common.annotations.core/.cvsignore
deleted file mode 100644
index 7bc35c8..0000000
--- a/plugins/org.eclipse.jst.common.annotations.core/.cvsignore
+++ /dev/null
@@ -1,7 +0,0 @@
-bin
-temp.folder
-annotations-core.jar
-build.xml
-@dot
-src.zip
-javaCompiler...args
diff --git a/plugins/org.eclipse.jst.common.annotations.core/.project b/plugins/org.eclipse.jst.common.annotations.core/.project
deleted file mode 100644
index 51f02e3..0000000
--- a/plugins/org.eclipse.jst.common.annotations.core/.project
+++ /dev/null
@@ -1,28 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<projectDescription>
- <name>org.eclipse.jst.common.annotations.core</name>
- <comment></comment>
- <projects>
- </projects>
- <buildSpec>
- <buildCommand>
- <name>org.eclipse.jdt.core.javabuilder</name>
- <arguments>
- </arguments>
- </buildCommand>
- <buildCommand>
- <name>org.eclipse.pde.ManifestBuilder</name>
- <arguments>
- </arguments>
- </buildCommand>
- <buildCommand>
- <name>org.eclipse.pde.SchemaBuilder</name>
- <arguments>
- </arguments>
- </buildCommand>
- </buildSpec>
- <natures>
- <nature>org.eclipse.pde.PluginNature</nature>
- <nature>org.eclipse.jdt.core.javanature</nature>
- </natures>
-</projectDescription>
diff --git a/plugins/org.eclipse.jst.common.annotations.core/.settings/org.eclipse.core.resources.prefs b/plugins/org.eclipse.jst.common.annotations.core/.settings/org.eclipse.core.resources.prefs
deleted file mode 100644
index 6447921..0000000
--- a/plugins/org.eclipse.jst.common.annotations.core/.settings/org.eclipse.core.resources.prefs
+++ /dev/null
@@ -1,3 +0,0 @@
-#Sun Apr 16 17:15:11 EDT 2006
-eclipse.preferences.version=1
-encoding/<project>=ISO-8859-1
diff --git a/plugins/org.eclipse.jst.common.annotations.core/.settings/org.eclipse.jdt.core.prefs b/plugins/org.eclipse.jst.common.annotations.core/.settings/org.eclipse.jdt.core.prefs
deleted file mode 100644
index 037a4e5..0000000
--- a/plugins/org.eclipse.jst.common.annotations.core/.settings/org.eclipse.jdt.core.prefs
+++ /dev/null
@@ -1,95 +0,0 @@
-#Mon Jun 08 15:35:45 EDT 2009
-org.eclipse.jdt.core.compiler.problem.unusedParameterWhenImplementingAbstract=disabled
-org.eclipse.jdt.core.compiler.problem.comparingIdentical=error
-org.eclipse.jdt.core.compiler.problem.unnecessaryElse=error
-org.eclipse.jdt.core.compiler.problem.redundantSuperinterface=error
-org.eclipse.jdt.core.compiler.problem.unusedLocal=error
-org.eclipse.jdt.core.compiler.problem.emptyStatement=error
-org.eclipse.jdt.core.compiler.problem.unusedLabel=error
-org.eclipse.jdt.core.compiler.problem.unusedParameter=warning
-org.eclipse.jdt.core.compiler.problem.rawTypeReference=warning
-org.eclipse.jdt.core.incompatibleJDKLevel=ignore
-org.eclipse.jdt.core.compiler.problem.incompatibleNonInheritedInterfaceMethod=error
-org.eclipse.jdt.core.compiler.debug.lineNumber=generate
-org.eclipse.jdt.core.compiler.problem.unusedDeclaredThrownException=warning
-org.eclipse.jdt.core.builder.cleanOutputFolder=clean
-org.eclipse.jdt.core.compiler.problem.unusedWarningToken=warning
-org.eclipse.jdt.core.compiler.problem.noImplicitStringConversion=error
-org.eclipse.jdt.core.compiler.problem.deprecationInDeprecatedCode=enabled
-org.eclipse.jdt.core.compiler.problem.deprecation=warning
-org.eclipse.jdt.core.compiler.problem.unusedParameterWhenOverridingConcrete=disabled
-org.eclipse.jdt.core.compiler.problem.missingSynchronizedOnInheritedMethod=error
-org.eclipse.jdt.core.compiler.problem.deprecationWhenOverridingDeprecatedMethod=enabled
-org.eclipse.jdt.core.compiler.problem.redundantNullCheck=error
-org.eclipse.jdt.core.compiler.problem.unusedImport=error
-org.eclipse.jdt.core.builder.recreateModifiedClassFileInOutputFolder=ignore
-org.eclipse.jdt.core.builder.resourceCopyExclusionFilter=*.launch
-org.eclipse.jdt.core.classpath.multipleOutputLocations=enabled
-org.eclipse.jdt.core.compiler.problem.suppressWarnings=enabled
-org.eclipse.jdt.core.compiler.problem.typeParameterHiding=error
-org.eclipse.jdt.core.builder.invalidClasspath=abort
-org.eclipse.jdt.core.compiler.problem.localVariableHiding=warning
-org.eclipse.jdt.core.compiler.problem.possibleAccidentalBooleanAssignment=error
-org.eclipse.jdt.core.compiler.problem.missingHashCodeMethod=error
-org.eclipse.jdt.core.codeComplete.argumentSuffixes=
-org.eclipse.jdt.core.codeComplete.argumentPrefixes=
-org.eclipse.jdt.core.compiler.problem.indirectStaticAccess=ignore
-org.eclipse.jdt.core.compiler.problem.potentialNullReference=error
-org.eclipse.jdt.core.compiler.codegen.inlineJsrBytecode=enabled
-org.eclipse.jdt.core.compiler.problem.finalParameterBound=warning
-org.eclipse.jdt.core.compiler.problem.missingSerialVersion=error
-org.eclipse.jdt.core.compiler.problem.nullReference=error
-org.eclipse.jdt.core.compiler.source=1.5
-org.eclipse.jdt.core.compiler.problem.enumIdentifier=error
-org.eclipse.jdt.core.compiler.problem.syntheticAccessEmulation=ignore
-org.eclipse.jdt.core.builder.duplicateResourceTask=warning
-org.eclipse.jdt.core.compiler.problem.fieldHiding=error
-org.eclipse.jdt.core.compiler.problem.unusedDeclaredThrownExceptionExemptExceptionAndThrowable=enabled
-org.eclipse.jdt.core.compiler.problem.missingOverrideAnnotation=error
-org.eclipse.jdt.core.compiler.problem.hiddenCatchBlock=error
-org.eclipse.jdt.core.compiler.problem.overridingPackageDefaultMethod=error
-org.eclipse.jdt.core.compiler.problem.finallyBlockNotCompletingNormally=error
-org.eclipse.jdt.core.compiler.problem.undocumentedEmptyBlock=warning
-org.eclipse.jdt.core.classpath.exclusionPatterns=enabled
-org.eclipse.jdt.core.compiler.problem.methodWithConstructorName=error
-org.eclipse.jdt.core.compiler.problem.discouragedReference=warning
-org.eclipse.jdt.core.compiler.problem.unqualifiedFieldAccess=ignore
-org.eclipse.jdt.core.compiler.problem.incompleteEnumSwitch=error
-eclipse.preferences.version=1
-org.eclipse.jdt.core.incompleteClasspath=error
-org.eclipse.jdt.core.compiler.problem.unnecessaryTypeCheck=error
-org.eclipse.jdt.core.compiler.problem.deadCode=error
-org.eclipse.jdt.core.compiler.problem.specialParameterHidingField=enabled
-org.eclipse.jdt.core.compiler.problem.fatalOptionalError=enabled
-org.eclipse.jdt.core.compiler.problem.noEffectAssignment=error
-org.eclipse.jdt.core.compiler.debug.sourceFile=generate
-org.eclipse.jdt.core.compiler.problem.unusedDeclaredThrownExceptionIncludeUncheckedExceptions=disabled
-org.eclipse.jdt.core.compiler.problem.missingDeprecatedAnnotation=warning
-org.eclipse.jdt.core.codeComplete.fieldPrefixes=
-org.eclipse.jdt.core.compiler.problem.fallthroughCase=error
-org.eclipse.jdt.core.compiler.codegen.targetPlatform=1.5
-org.eclipse.jdt.core.compiler.problem.unusedPrivateMember=error
-org.eclipse.jdt.core.compiler.problem.autoboxing=warning
-org.eclipse.jdt.core.circularClasspath=error
-org.eclipse.jdt.core.compiler.problem.annotationSuperInterface=warning
-org.eclipse.jdt.core.compiler.problem.nonExternalizedStringLiteral=error
-org.eclipse.jdt.core.codeComplete.fieldSuffixes=
-org.eclipse.jdt.core.codeComplete.localSuffixes=
-org.eclipse.jdt.core.compiler.problem.parameterAssignment=error
-org.eclipse.jdt.core.compiler.problem.staticAccessReceiver=error
-org.eclipse.jdt.core.codeComplete.localPrefixes=
-org.eclipse.jdt.core.compiler.problem.unusedDeclaredThrownExceptionIncludeDocCommentReference=enabled
-org.eclipse.jdt.core.compiler.maxProblemPerUnit=100
-org.eclipse.jdt.core.compiler.problem.varargsArgumentNeedCast=error
-org.eclipse.jdt.core.compiler.problem.assertIdentifier=error
-org.eclipse.jdt.core.compiler.compliance=1.5
-org.eclipse.jdt.core.compiler.problem.unusedParameterIncludeDocCommentReference=enabled
-org.eclipse.jdt.core.codeComplete.staticFieldPrefixes=
-org.eclipse.jdt.core.compiler.debug.localVariable=generate
-org.eclipse.jdt.core.compiler.problem.unhandledWarningToken=warning
-instance/org.eclipse.core.net/org.eclipse.core.net.hasMigrated=true
-org.eclipse.jdt.core.compiler.problem.forbiddenReference=error
-org.eclipse.jdt.core.compiler.codegen.unusedLocal=preserve
-org.eclipse.jdt.core.compiler.problem.uncheckedTypeOperation=warning
-org.eclipse.jdt.core.compiler.problem.unusedDeclaredThrownExceptionWhenOverriding=disabled
-org.eclipse.jdt.core.codeComplete.staticFieldSuffixes=
diff --git a/plugins/org.eclipse.jst.common.annotations.core/.settings/org.eclipse.pde.prefs b/plugins/org.eclipse.jst.common.annotations.core/.settings/org.eclipse.pde.prefs
deleted file mode 100644
index fcbd764..0000000
--- a/plugins/org.eclipse.jst.common.annotations.core/.settings/org.eclipse.pde.prefs
+++ /dev/null
@@ -1,13 +0,0 @@
-#Sun Apr 16 17:14:52 EDT 2006
-compilers.p.build=0
-compilers.p.deprecated=0
-compilers.p.no-required-att=0
-compilers.p.not-externalized-att=0
-compilers.p.unknown-attribute=0
-compilers.p.unknown-class=0
-compilers.p.unknown-element=0
-compilers.p.unknown-resource=0
-compilers.p.unresolved-ex-points=0
-compilers.p.unresolved-import=0
-compilers.use-project=true
-eclipse.preferences.version=1
diff --git a/plugins/org.eclipse.jst.common.annotations.core/META-INF/MANIFEST.MF b/plugins/org.eclipse.jst.common.annotations.core/META-INF/MANIFEST.MF
deleted file mode 100644
index e6e2039..0000000
--- a/plugins/org.eclipse.jst.common.annotations.core/META-INF/MANIFEST.MF
+++ /dev/null
@@ -1,14 +0,0 @@
-Manifest-Version: 1.0
-Bundle-ManifestVersion: 2
-Bundle-Name: %Bundle-Name.0
-Bundle-SymbolicName: org.eclipse.jst.common.annotations.core;singleton:=true
-Bundle-Version: 1.1.300.qualifier
-Bundle-Vendor: %Bundle-Vendor.0
-Bundle-Localization: plugin
-Export-Package: org.eclipse.jst.common.internal.annotations.core;x-internal:=true
-Require-Bundle: org.eclipse.emf.ecore;bundle-version="[2.2.0,3.0.0)",
- org.eclipse.wst.common.emf;bundle-version="[1.2.0,2.0.0)",
- org.eclipse.core.runtime;bundle-version="[3.2.0,4.0.0)",
- org.eclipse.jem.util;bundle-version="[2.0.0,3.0.0)",
- org.eclipse.jdt.core;bundle-version="[3.2.0,4.0.0)"
-Bundle-RequiredExecutionEnvironment: J2SE-1.5
diff --git a/plugins/org.eclipse.jst.common.annotations.core/about.html b/plugins/org.eclipse.jst.common.annotations.core/about.html
deleted file mode 100644
index 2199df3..0000000
--- a/plugins/org.eclipse.jst.common.annotations.core/about.html
+++ /dev/null
@@ -1,34 +0,0 @@
-<!DOCTYPE HTML PUBLIC "-//W3C//DTD HTML 4.0//EN">
-<HTML>
-
-<head>
-<title>About</title>
-<meta http-equiv=Content-Type content="text/html; charset=ISO-8859-1">
-</head>
-
-<BODY lang="EN-US">
-
-<H3>About This Content</H3>
-
-<P>June, 2008</P>
-
-<H3>License</H3>
-
-<P>The Eclipse Foundation makes available all content in this plug-in
-("Content"). Unless otherwise indicated below, the Content is provided to you
-under the terms and conditions of the Eclipse Public License Version 1.0
-("EPL"). A copy of the EPL is available at
-<A href="http://www.eclipse.org/org/documents/epl-v10.php">http://www.eclipse.org/org/documents/epl-v10.php</A>.
-For purposes of the EPL, "Program" will mean the Content.</P>
-
-<P>If you did not receive this Content directly from the Eclipse Foundation, the
-Content is being redistributed by another party ("Redistributor") and different
-terms and conditions may apply to your use of any object code in the Content.
-Check the Redistributors license that was provided with the Content. If no such
-license exists, contact the Redistributor. Unless otherwise indicated below, the
-terms and conditions of the EPL still apply to any source code in the Content
-and such source code may be obtained at
-<A href="http://www.eclipse.org/">http://www.eclipse.org/</A>.</P>
-
-</BODY>
-</HTML>
diff --git a/plugins/org.eclipse.jst.common.annotations.core/build.properties b/plugins/org.eclipse.jst.common.annotations.core/build.properties
deleted file mode 100644
index 3e0c003..0000000
--- a/plugins/org.eclipse.jst.common.annotations.core/build.properties
+++ /dev/null
@@ -1,21 +0,0 @@
-###############################################################################
-# Copyright (c) 2003, 2004 IBM Corporation and others.
-# All rights reserved. This program and the accompanying materials
-# are made available under the terms of the Eclipse Public License v1.0
-# which accompanies this distribution, and is available at
-# http://www.eclipse.org/legal/epl-v10.html
-#
-# Contributors:
-# IBM Corporation - initial API and implementation
-###############################################################################
-bin.includes = plugin.xml,\
- META-INF/,\
- about.html,\
- .,\
- schema/,\
- plugin.properties,\
- property_files/
-jars.compile.order = .
-output.. = bin/
-source.. = src/,\
- property_files/
diff --git a/plugins/org.eclipse.jst.common.annotations.core/plugin.properties b/plugins/org.eclipse.jst.common.annotations.core/plugin.properties
deleted file mode 100644
index 0e660ea..0000000
--- a/plugins/org.eclipse.jst.common.annotations.core/plugin.properties
+++ /dev/null
@@ -1,4 +0,0 @@
-# properties file for org.eclipse.jst.common.annotations.core
-Bundle-Name.0 = Annotation Core Plug-in
-Bundle-Vendor.0 = Eclipse Web Tools Platform
-extension-point.name.0 = Annotations Provider
\ No newline at end of file
diff --git a/plugins/org.eclipse.jst.common.annotations.core/plugin.xml b/plugins/org.eclipse.jst.common.annotations.core/plugin.xml
deleted file mode 100644
index c543d62..0000000
--- a/plugins/org.eclipse.jst.common.annotations.core/plugin.xml
+++ /dev/null
@@ -1,14 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<?eclipse version="3.0"?>
-<plugin>
-
- <extension-point id="annotationsProvider" name="%extension-point.name.0" schema="schema/annotationsProvider.exsd"/>
- <extension
- id="AnnotationsTranslator"
- point="org.eclipse.wst.common.emf.translatorExtension">
- <translator
- className="org.eclipse.jst.common.internal.annotations.core.AnnotationsTranslator">
- </translator>
- </extension>
-
-</plugin>
diff --git a/plugins/org.eclipse.jst.common.annotations.core/prepareforpii.xml b/plugins/org.eclipse.jst.common.annotations.core/prepareforpii.xml
deleted file mode 100644
index 87718a6..0000000
--- a/plugins/org.eclipse.jst.common.annotations.core/prepareforpii.xml
+++ /dev/null
@@ -1,36 +0,0 @@
-<project name="PrepareForPII" default="main" basedir=".">
-
- <!-- Setup temp variables -->
- <target name="init">
- <property name="nlsDir" value="d:/NLS/Corona/0526"/>
- <property name="plugin" value="com.ibm.wtp.annotations.core"/>
- <property name="plugindir" value="d:/workspaceCorona/${plugin}"/>
- <property name="outputDir" value="${nlsDir}/${plugin}"/>
-
-
- </target>
-
- <!-- Create the destination dir -->
- <target name="nlsDir" depends="init">
- <mkdir dir="${nlsDir}"/>
- </target>
-
- <!-- Create the destination dir -->
- <target name="plugindir" depends="nlsDir">
- <delete dir="${outputDir}"/>
- <mkdir dir="${outputDir}"/>
- </target>
-
- <!-- Move the files to the correct locations in the workspace. -->
- <target name="main" depends="plugindir">
-
- <messageIdGen folderPath = "${plugindir}" componentId = "E" />
-
- <copy todir = "${outputDir}/property_files" >
- <fileset dir="${plugindir}/property_files">
- <include name="**/*.properties"/>
- </fileset>
- </copy>
-
- </target>
-</project>
diff --git a/plugins/org.eclipse.jst.common.annotations.core/property_files/annotationcore.properties b/plugins/org.eclipse.jst.common.annotations.core/property_files/annotationcore.properties
deleted file mode 100644
index 19a34cc..0000000
--- a/plugins/org.eclipse.jst.common.annotations.core/property_files/annotationcore.properties
+++ /dev/null
@@ -1,17 +0,0 @@
-###############################################################################
-# Copyright (c) 2003, 2004 IBM Corporation and others.
-# All rights reserved. This program and the accompanying materials
-# are made available under the terms of the Eclipse Public License v1.0
-# which accompanies this distribution, and is available at
-# http://www.eclipse.org/legal/epl-v10.html
-#
-# Contributors:
-# IBM Corporation - initial API and implementation
-###############################################################################
-TagSpec_3=Unknown tag scope:
-TagSpec_4=Null tag scope.
-TagAttribSpec_6=
-AnnotationTagParser_0=Null event handler.
-AnnotationTagParser_1=
-AnnotationTagRegistry_0=More than one 'AnnotationTagInfo' tag for the tag '
-AnnotationTagRegistry_9=parseTagAttribs: unknown 'use' value:
diff --git a/plugins/org.eclipse.jst.common.annotations.core/schema/annotationsProvider.exsd b/plugins/org.eclipse.jst.common.annotations.core/schema/annotationsProvider.exsd
deleted file mode 100644
index 960dce2..0000000
--- a/plugins/org.eclipse.jst.common.annotations.core/schema/annotationsProvider.exsd
+++ /dev/null
@@ -1,102 +0,0 @@
-<?xml version='1.0' encoding='UTF-8'?>
-<!-- Schema file written by PDE -->
-<schema targetNamespace="org.eclipse.jst.common.annotations.core">
-<annotation>
- <appInfo>
- <meta.schema plugin="org.eclipse.jst.common.annotations.core" id="annotationsProvider" name="Annotations Provider"/>
- </appInfo>
- <documentation>
- [This extension point is used by clients to allow their own annotation provider to detail information on whether or not a given EObject is annotated for one of their tag sets.]
- </documentation>
- </annotation>
-
- <element name="extension">
- <complexType>
- <sequence>
- <element ref="annotationsProvider" minOccurs="1" maxOccurs="unbounded"/>
- </sequence>
- <attribute name="point" type="string" use="required">
- <annotation>
- <documentation>
-
- </documentation>
- </annotation>
- </attribute>
- <attribute name="id" type="string">
- <annotation>
- <documentation>
-
- </documentation>
- </annotation>
- </attribute>
- <attribute name="name" type="string">
- <annotation>
- <documentation>
-
- </documentation>
- <appInfo>
- <meta.attribute translatable="true"/>
- </appInfo>
- </annotation>
- </attribute>
- </complexType>
- </element>
-
- <element name="annotationsProvider">
- <complexType>
- <attribute name="className" type="string" use="required">
- <annotation>
- <documentation>
- A fully qualified class name for a class which implments the IAnnotationsProvider interface.
- </documentation>
- </annotation>
- </attribute>
- </complexType>
- </element>
-
- <annotation>
- <appInfo>
- <meta.section type="since"/>
- </appInfo>
- <documentation>
- [1.0.2]
- </documentation>
- </annotation>
-
- <annotation>
- <appInfo>
- <meta.section type="examples"/>
- </appInfo>
- <documentation>
- [Enter extension point usage example here.]
- </documentation>
- </annotation>
-
- <annotation>
- <appInfo>
- <meta.section type="apiInfo"/>
- </appInfo>
- <documentation>
- [This is for internal use only.]
- </documentation>
- </annotation>
-
- <annotation>
- <appInfo>
- <meta.section type="implementation"/>
- </appInfo>
- <documentation>
- [Enter information about supplied implementation of this extension point.]
- </documentation>
- </annotation>
-
- <annotation>
- <appInfo>
- <meta.section type="copyright"/>
- </appInfo>
- <documentation>
-
- </documentation>
- </annotation>
-
-</schema>
diff --git a/plugins/org.eclipse.jst.common.annotations.core/src/org/eclipse/jst/common/internal/annotations/core/AnnotatedCommentHandler.java b/plugins/org.eclipse.jst.common.annotations.core/src/org/eclipse/jst/common/internal/annotations/core/AnnotatedCommentHandler.java
deleted file mode 100644
index 47767e3..0000000
--- a/plugins/org.eclipse.jst.common.annotations.core/src/org/eclipse/jst/common/internal/annotations/core/AnnotatedCommentHandler.java
+++ /dev/null
@@ -1,74 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2003, 2004 IBM Corporation and others.
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
- *
- * Contributors:
- * IBM Corporation - initial API and implementation
- *******************************************************************************/
-package org.eclipse.jst.common.internal.annotations.core;
-
-import java.util.HashMap;
-import java.util.Map;
-
-
-
-/**
- * @author mdelder
- *
- */
-public class AnnotatedCommentHandler implements TagParseEventHandler {
-
- private Map annotations;
-
- private Token annotationToken;
-
- /**
- *
- */
- public AnnotatedCommentHandler() {
- super();
- }
-
- /*
- * (non-Javadoc)
- *
- * @see org.eclipse.wst.common.internal.annotations.core.TagParseEventHandler#annotationTag(org.eclipse.wst.common.internal.annotations.core.Token)
- */
- public void annotationTag(Token tag) {
- this.annotationToken = tag;
- }
-
- /*
- * (non-Javadoc)
- *
- * @see org.eclipse.wst.common.internal.annotations.core.TagParseEventHandler#endOfTag(int)
- */
- public void endOfTag(int pos) {
- // Do nothing
- }
-
- /*
- * (non-Javadoc)
- *
- * @see org.eclipse.wst.common.internal.annotations.core.TagParseEventHandler#attribute(org.eclipse.wst.common.internal.annotations.core.Token,
- * int, org.eclipse.wst.common.internal.annotations.core.Token)
- */
- public void attribute(Token name, int equalsPosition, Token value) {
- if (value.getText() == null || value.getText().length() == 0)
- getAnnotations().put(this.annotationToken.getText(), name.getText());
- else
- getAnnotations().put(name.getText(), value.getText());
- }
-
- /**
- * @return Returns the annotations.
- */
- public Map getAnnotations() {
- if (annotations == null)
- annotations = new HashMap();
- return annotations;
- }
-}
\ No newline at end of file
diff --git a/plugins/org.eclipse.jst.common.annotations.core/src/org/eclipse/jst/common/internal/annotations/core/AnnotationTagParser.java b/plugins/org.eclipse.jst.common.annotations.core/src/org/eclipse/jst/common/internal/annotations/core/AnnotationTagParser.java
deleted file mode 100644
index 3c720f4..0000000
--- a/plugins/org.eclipse.jst.common.annotations.core/src/org/eclipse/jst/common/internal/annotations/core/AnnotationTagParser.java
+++ /dev/null
@@ -1,272 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2003, 2004 IBM Corporation and others.
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
- *
- * Contributors:
- * IBM Corporation - initial API and implementation
- *******************************************************************************/
-/*
- * Created on Nov 11, 2003
- *
- * To change the template for this generated file go to
- * Window>Preferences>Java>Code Generation>Code and Comments
- */
-package org.eclipse.jst.common.internal.annotations.core;
-
-/**
- * @author Pat Kelley
- *
- * To change the template for this generated type comment go to
- * Window>Preferences>Java>Code Generation>Code and Comments
- */
-public class AnnotationTagParser {
-
- private TagParseEventHandler handler;
-
- private char[] input;
-
- int pos;
-
- int endOfLastGoodAttParse;
-
- private Object annotationLock = new Object();
-
- public AnnotationTagParser(TagParseEventHandler tp) {
- if (tp == null) {
- throw new IllegalArgumentException(AnnotationsCoreResources.AnnotationTagParser_0);
- }
- handler = tp;
- }
-
- private boolean eos() {
- return pos >= input.length;
- }
-
- private boolean isWS(char c) {
- return c == ' ' || c == '\n' || c == '\r' || c == '\t';
- }
-
- private void skipWS() {
- while (pos < input.length && (isWS(input[pos]) || input[pos] == '*')) {
- pos++;
- }
- }
-
- // Caller is expected to make sure the eos has not been reached.
- private char peek() {
- return input[pos];
- }
-
- // Caller is expected to check for EOS.
- private char nextChar() {
- return input[pos++];
- }
-
- private boolean isNextChar(char c) {
- if (eos())
- return false;
- return peek() == c;
- }
-
- private boolean isIDChar(char c) {
- return !isWS(c) && c != '=' && c != '@' && c != '\"';
- }
-
- private Token collectID() {
- StringBuffer b = new StringBuffer(16);
- Token t = new Token();
-
- t.setBeginning(pos);
- while (!eos() && isIDChar(peek())) {
- b.append(nextChar());
- }
- t.setEnd(pos - 1);
- t.setText(b.toString());
- return t;
- }
-
- private Token expectAttribName() {
- if (eos()) {
- return null;
- }
- int save = pos;
-
- Token retval = collectID();
- if (retval.length() == 0) {
- pos = save;
- return null;
- }
- return retval;
- }
-
- private Token expectTag() {
- if (eos()) {
- return null;
- }
- int savePos = pos;
-
- if (nextChar() != '@') {
- return null;
- }
-
- if (eos() || isWS(peek())) {
- return null;
- }
-
- Token retval = expectAttribName();
-
- if (retval.length() == 0) {
- pos = savePos + 1;
- }
- retval.setBeginning(savePos);
-
- // Save end of parse so we can pass it as the end of the parsed tag.
- endOfLastGoodAttParse = pos;
- return retval;
- }
-
- private Token expectQuotedValue() {
- skipWS();
- if (eos()) {
- return null;
- }
-
- Token tok = new Token();
-
- tok.setBeginning(pos);
- if (peek() != '\"') {
- return null;
- }
- nextChar();
-
- if (eos()) {
- return null;
- }
-
- StringBuffer b = new StringBuffer(64);
-
- while (!eos() && peek() != '\"') {
- b.append(nextChar());
- }
- if (!eos()) {
- nextChar();
- }
-
- tok.setEnd(pos - 1);
- tok.setText(b.toString());
- return tok;
- }
-
- private boolean expectAssign() {
- if (eos()) {
- return false;
- }
-
- if (nextChar() == '=') {
- return true;
- }
- pos--;
- return false;
- }
-
- private Token mkNullToken() {
- Token retval = new Token();
-
- retval.setBeginning(pos);
- retval.setEnd(pos - 1);
- retval.setText(""); //$NON-NLS-1$
- return retval;
- }
-
- private boolean parseNextAttribute() {
- skipWS();
- if (eos()) {
- return false;
- }
- Token key = collectID();
-
- if (key == null || key.length() == 0) {
- return false;
- }
-
- skipWS();
- if (eos()) {
- // Go ahead and report it, even though it is a partial attribute. (
- // we still fail here )
- handler.attribute(key, -1, mkNullToken());
- return false;
- }
-
- int eqPos = pos;
-
- if (!expectAssign()) {
- // Even though we won't parse this as a full attribute, go ahead and
- // call the handler with it. Some clients want to see partial
- // attributes.
- handler.attribute(key, -1, mkNullToken());
- return false;
- }
- skipWS();
-
- if (eos()) {
- // Same here - we fail on it, but we report it anyway
- handler.attribute(key, eqPos, mkNullToken());
- return false;
- }
- Token value = expectQuotedValue();
-
- if (value == null) {
- value = collectID();
- if (isNextChar('=')) {
- pos = value.getBeginning();
- value = mkNullToken();
- }
- }
- endOfLastGoodAttParse = pos;
- handler.attribute(key, eqPos, value);
- return true;
- }
-
- private void parseAttributes() {
- while (!eos() && parseNextAttribute()) {
- // loop while not end of string
- }
- }
-
- private void skipToTagChar() {
- while (!eos() && peek() != '@') {
- nextChar();
- }
- }
-
- public void setParserInput(char[] text) {
- synchronized(annotationLock) {
- input = text;
- pos = 0;
- endOfLastGoodAttParse = 0;
- }
- }
-
- public void setParserInput(String text) {
- setParserInput(text.toCharArray());
- }
-
- public void parse() {
- synchronized (annotationLock) {
- while (!eos()) {
- skipToTagChar();
- Token tag = expectTag();
- if (tag == null) {
- break;
- }
- handler.annotationTag(tag);
- parseAttributes();
- handler.endOfTag(endOfLastGoodAttParse);
- }
- }
- }
-
-}
\ No newline at end of file
diff --git a/plugins/org.eclipse.jst.common.annotations.core/src/org/eclipse/jst/common/internal/annotations/core/AnnotationsAdapter.java b/plugins/org.eclipse.jst.common.annotations.core/src/org/eclipse/jst/common/internal/annotations/core/AnnotationsAdapter.java
deleted file mode 100644
index df3d0ae..0000000
--- a/plugins/org.eclipse.jst.common.annotations.core/src/org/eclipse/jst/common/internal/annotations/core/AnnotationsAdapter.java
+++ /dev/null
@@ -1,163 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2003, 2004 IBM Corporation and others.
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
- *
- * Contributors:
- * IBM Corporation - initial API and implementation
- *******************************************************************************/
-package org.eclipse.jst.common.internal.annotations.core;
-
-import java.util.HashMap;
-import java.util.Map;
-
-import org.eclipse.emf.common.notify.impl.AdapterImpl;
-import org.eclipse.emf.ecore.EObject;
-import org.eclipse.emf.ecore.EStructuralFeature;
-import org.eclipse.emf.ecore.impl.EStructuralFeatureImpl;
-import org.eclipse.emf.ecore.util.EcoreUtil;
-import org.eclipse.wst.common.internal.emf.utilities.CloneablePublic;
-
-
-
-/**
- * @author mdelder
- *
- */
-public class AnnotationsAdapter extends AdapterImpl implements CloneablePublic {
-
- public static final String GENERATED = "generated"; //$NON-NLS-1$
-
- protected final static String ADAPTER_TYPE = AnnotationsAdapter.class.getName();
-
- public final static EStructuralFeature NOTIFICATION_FEATURE = new EStructuralFeatureImpl() {
- // anonymous inner class
- };
-
- private Map annotationsMap;
-
- /**
- *
- */
- public AnnotationsAdapter() {
- super();
- }
-
- /*
- * (non-Javadoc)
- *
- * @see java.lang.Object#clone()
- */
- @Override
- public Object clone() { // throws CloneNotSupportedException {
- //return super.clone();
- return null;
- }
-
- /**
- * @param emfObject
- * @param string
- */
- public static void addAnnotations(EObject emfObject, String name, Object value) {
- if (emfObject == null)
- return;
- AnnotationsAdapter adapter = getAdapter(emfObject);
- adapter.addAnnotations(name, value);
- }
-
-
- /**
- * @param emfObject
- * @param string
- */
- public static Object getAnnotations(EObject emfObject, String name) {
- if (emfObject == null)
- return null;
- return internalGetAnnotations(emfObject, name);
- }
-
- protected static Object internalGetAnnotations(EObject emfObject, String name) {
- if (emfObject == null)
- return null;
- AnnotationsAdapter adapter = getAdapter(emfObject);
- return (adapter == null) ? internalGetAnnotations(emfObject.eContainer(), name) : adapter.getAnnotations(name);
- }
-
-
- /**
- * @param emfObject
- * @param string
- */
- public static Object removeAnnotations(EObject emfObject, String name) {
- if (emfObject == null)
- return null;
- AnnotationsAdapter adapter = getAdapter(emfObject);
- return adapter.removeAnnotations(name);
- }
-
- /**
- * @param name
- * @param value
- */
- protected void addAnnotations(String name, Object value) {
- getAnnnotations().put(name, value);
- }
-
- protected Object getAnnotations(String name) {
- return getAnnnotations().get(name);
- }
-
- protected Object removeAnnotations(String name) {
- return getAnnnotations().remove(name);
- }
-
- /**
- * @return
- */
- protected Map getAnnnotations() {
- if (annotationsMap == null)
- annotationsMap = new HashMap();
- return annotationsMap;
- }
-
- /**
- * @param emfObject
- * @return
- */
- protected static AnnotationsAdapter getAdapter(EObject emfObject) {
- AnnotationsAdapter adapter = retrieveExistingAdapter(emfObject);
- return adapter == null ? createAdapter(emfObject) : adapter;
- }
-
- /**
- * @param emfObject
- * @return
- */
- protected static AnnotationsAdapter createAdapter(EObject emfObject) {
- AnnotationsAdapter adapter = new AnnotationsAdapter();
- adapter.setTarget(emfObject);
- emfObject.eAdapters().add(adapter);
- return adapter;
- }
-
- /**
- * @param emfObject
- * @return
- */
- protected static AnnotationsAdapter retrieveExistingAdapter(EObject emfObject) {
- return (AnnotationsAdapter) EcoreUtil.getExistingAdapter(emfObject, ADAPTER_TYPE);
- }
-
- /*
- * (non-Javadoc)
- *
- * @see org.eclipse.emf.common.notify.impl.AdapterImpl#isAdapterForType(java.lang.Object)
- */
- @Override
- public boolean isAdapterForType(Object type) {
- return ADAPTER_TYPE.equals(type);
- }
-
-}
\ No newline at end of file
diff --git a/plugins/org.eclipse.jst.common.annotations.core/src/org/eclipse/jst/common/internal/annotations/core/AnnotationsCoreResources.java b/plugins/org.eclipse.jst.common.annotations.core/src/org/eclipse/jst/common/internal/annotations/core/AnnotationsCoreResources.java
deleted file mode 100644
index 81b8276..0000000
--- a/plugins/org.eclipse.jst.common.annotations.core/src/org/eclipse/jst/common/internal/annotations/core/AnnotationsCoreResources.java
+++ /dev/null
@@ -1,34 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2000, 2005 IBM Corporation and others.
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
- *
- * Contributors:
- * IBM Corporation - initial API and implementation
- *******************************************************************************/
-package org.eclipse.jst.common.internal.annotations.core;
-
-import org.eclipse.osgi.util.NLS;
-
-public final class AnnotationsCoreResources extends NLS {
-
- private static final String BUNDLE_NAME = "annotationcore";//$NON-NLS-1$
-
- private AnnotationsCoreResources() {
- // Do not instantiate
- }
-
- public static String TagSpec_3;
- public static String TagSpec_4;
- public static String TagAttribSpec_6;
- public static String AnnotationTagParser_0;
- public static String AnnotationTagParser_1;
- public static String AnnotationTagRegistry_0;
- public static String AnnotationTagRegistry_9;
-
- static {
- NLS.initializeMessages(BUNDLE_NAME, AnnotationsCoreResources.class);
- }
-}
\ No newline at end of file
diff --git a/plugins/org.eclipse.jst.common.annotations.core/src/org/eclipse/jst/common/internal/annotations/core/AnnotationsProviderManager.java b/plugins/org.eclipse.jst.common.annotations.core/src/org/eclipse/jst/common/internal/annotations/core/AnnotationsProviderManager.java
deleted file mode 100644
index fd9f62b..0000000
--- a/plugins/org.eclipse.jst.common.annotations.core/src/org/eclipse/jst/common/internal/annotations/core/AnnotationsProviderManager.java
+++ /dev/null
@@ -1,78 +0,0 @@
-package org.eclipse.jst.common.internal.annotations.core;
-
-import java.util.ArrayList;
-import java.util.List;
-
-import org.eclipse.core.runtime.CoreException;
-import org.eclipse.core.runtime.IConfigurationElement;
-import org.eclipse.jem.util.RegistryReader;
-import org.eclipse.jem.util.logger.proxy.Logger;
-
-public class AnnotationsProviderManager extends RegistryReader {
-
- public static final AnnotationsProviderManager INSTANCE = new AnnotationsProviderManager();
-
- static {
- INSTANCE.readRegistry();
- }
-
- public static class Descriptor {
-
- public static final String EXTENSION_PT_PLUGIN = "org.eclipse.jst.common.annotations.core"; //$NON-NLS-1$
- public static final String ANNOTATIONS_PROVIDER = "annotationsProvider"; //$NON-NLS-1$
- public static final String CLASSNAME = "className"; //$NON-NLS-1$
-
- private final IConfigurationElement configElement;
-
- public Descriptor(IConfigurationElement aConfigElement) {
- super();
- configElement = aConfigElement;
- }
-
- public IAnnotationsProvider createInstance() {
- IAnnotationsProvider instance = null;
- try {
- instance = (IAnnotationsProvider) configElement.createExecutableExtension(CLASSNAME);
- } catch (CoreException e) {
- Logger.getLogger().logError(e);
- }
- return instance;
- }
- }
-
- private List annotationsProviders;
-
- /**
- * Default constructor
- */
- public AnnotationsProviderManager() {
- super(Descriptor.EXTENSION_PT_PLUGIN, Descriptor.ANNOTATIONS_PROVIDER);
- }
-
- @Override
- public boolean readElement(IConfigurationElement element) {
- if (!element.getName().equals(Descriptor.ANNOTATIONS_PROVIDER))
- return false;
- addAnnotationsProvider(new Descriptor(element));
- return true;
- }
-
- /**
- * @param descriptor
- */
- protected void addAnnotationsProvider(Descriptor descriptor) {
- IAnnotationsProvider provider = descriptor.createInstance();
- if (provider != null)
- getAnnotationsProviders().add(provider);
- }
-
- /**
- * @return Returns the annotationsProviders.
- */
- public List getAnnotationsProviders() {
- if (annotationsProviders == null)
- annotationsProviders = new ArrayList();
- return annotationsProviders;
- }
-
-}
diff --git a/plugins/org.eclipse.jst.common.annotations.core/src/org/eclipse/jst/common/internal/annotations/core/AnnotationsTranslator.java b/plugins/org.eclipse.jst.common.annotations.core/src/org/eclipse/jst/common/internal/annotations/core/AnnotationsTranslator.java
deleted file mode 100644
index 71e3614..0000000
--- a/plugins/org.eclipse.jst.common.annotations.core/src/org/eclipse/jst/common/internal/annotations/core/AnnotationsTranslator.java
+++ /dev/null
@@ -1,157 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2003, 2004 IBM Corporation and others.
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
- *
- * Contributors:
- * IBM Corporation - initial API and implementation
- *******************************************************************************/
-package org.eclipse.jst.common.internal.annotations.core;
-
-import java.util.Iterator;
-import java.util.Map;
-
-import org.eclipse.emf.ecore.EObject;
-import org.eclipse.wst.common.internal.emf.resource.Translator;
-
-
-
-/**
- * @author mdelder
- *
- */
-public class AnnotationsTranslator extends Translator {
-
- private AnnotatedCommentHandler handler;
-
- private AnnotationTagParser parser;
-
- public static final AnnotationsTranslator INSTANCE = new AnnotationsTranslator();
-
- /**
- * @param domNameAndPath
- * @param aFeature
- */
- public AnnotationsTranslator() {
- super("#comment", AnnotationsAdapter.NOTIFICATION_FEATURE, Translator.COMMENT_FEATURE); //$NON-NLS-1$
- }
-
- /**
- * @param domNameAndPath
- * @param aFeature
- */
- public AnnotationsTranslator(String domNameAndPath) {
- super(domNameAndPath, AnnotationsAdapter.NOTIFICATION_FEATURE, Translator.COMMENT_FEATURE);
- }
-
- /**
- * @param domNameAndPath
- * @param aFeature
- * @param style
- */
- public AnnotationsTranslator(String domNameAndPath, int style) {
- super(domNameAndPath, AnnotationsAdapter.NOTIFICATION_FEATURE, style | Translator.COMMENT_FEATURE);
- }
-
- /*
- * (non-Javadoc)
- *
- * @see com.ibm.wtp.emf.xml.Translator#setMOFValue(org.eclipse.emf.ecore.EObject,
- * java.lang.Object)
- */
- @Override
- public void setMOFValue(EObject emfObject, Object value) {
- if (value == null)
- return;
- getHandler().getAnnotations().clear();
- getParser().setParserInput(value.toString());
- getParser().parse();
- String name;
- Map annotations = getHandler().getAnnotations();
- for (Iterator keys = annotations.keySet().iterator(); keys.hasNext();) {
- name = (String) keys.next();
- AnnotationsAdapter.addAnnotations(emfObject, name, annotations.get(name));
- }
- }
-
- /*
- * (non-Javadoc)
- *
- * @see com.ibm.etools.emf2xml.impl.Translator#isSetMOFValue(org.eclipse.emf.ecore.EObject)
- */
- @Override
- public boolean isSetMOFValue(EObject emfObject) {
- return getMOFValue(emfObject) != null;
- }
-
- /*
- * (non-Javadoc)
- *
- * @see com.ibm.etools.emf2xml.impl.Translator#getMOFValue(org.eclipse.emf.ecore.EObject)
- */
- @Override
- public Object getMOFValue(EObject emfObject) {
- return AnnotationsAdapter.getAnnotations(emfObject, AnnotationsAdapter.GENERATED);
- }
-
- /*
- * (non-Javadoc)
- *
- * @see com.ibm.etools.emf2xml.impl.Translator#unSetMOFValue(org.eclipse.emf.ecore.EObject)
- */
- @Override
- public void unSetMOFValue(EObject emfObject) {
- AnnotationsAdapter.removeAnnotations(emfObject, AnnotationsAdapter.GENERATED);
- }
-
- /*
- * (non-Javadoc)
- *
- * @see com.ibm.etools.emf2xml.impl.Translator#featureExists(org.eclipse.emf.ecore.EObject)
- */
- @Override
- public boolean featureExists(EObject emfObject) {
- return true;
- }
-
- /*
- * (non-Javadoc)
- *
- * @see com.ibm.etools.emf2xml.impl.Translator#isDataType()
- */
- @Override
- public boolean isDataType() {
- return true;
- }
-
- /*
- * (non-Javadoc)
- *
- * @see com.ibm.etools.emf2xml.impl.Translator#isMapFor(java.lang.Object, java.lang.Object,
- * java.lang.Object)
- */
- @Override
- public boolean isMapFor(Object aFeature, Object oldValue, Object newValue) {
- return (aFeature == feature);
- }
-
- /**
- * @return Returns the handler.
- */
- protected AnnotatedCommentHandler getHandler() {
- if (handler == null)
- handler = new AnnotatedCommentHandler();
- return handler;
- }
-
- /**
- * @return Returns the parser.
- */
- protected AnnotationTagParser getParser() {
- if (parser == null)
- parser = new AnnotationTagParser(getHandler());
- return parser;
- }
-}
\ No newline at end of file
diff --git a/plugins/org.eclipse.jst.common.annotations.core/src/org/eclipse/jst/common/internal/annotations/core/IAnnotationsProvider.java b/plugins/org.eclipse.jst.common.annotations.core/src/org/eclipse/jst/common/internal/annotations/core/IAnnotationsProvider.java
deleted file mode 100644
index 1d1f3b1..0000000
--- a/plugins/org.eclipse.jst.common.annotations.core/src/org/eclipse/jst/common/internal/annotations/core/IAnnotationsProvider.java
+++ /dev/null
@@ -1,48 +0,0 @@
-package org.eclipse.jst.common.internal.annotations.core;
-
-import org.eclipse.emf.ecore.EObject;
-import org.eclipse.jdt.core.ICompilationUnit;
-
-/**
- * This interface is used by clients to allow their own annotation provider to detail information
- * on whether or not a given EObject is annotated for one of their tag sets.
- *
- * @author jlanuti
- * @planned for 2.0
- */
-public interface IAnnotationsProvider {
-
- /**
- * Return whether or not the passed EObject is annotated by your annotation provider
- *
- * @planned for 2.0
- * @param eObject
- * @return boolean value of isAnnotated
- */
- public boolean isAnnotated(EObject eObject);
-
- /**
- * The passed eObject may have been annoted. If true, it is desired to
- * determine which {@link ICompilationUnit} has the tag or tags that created
- * this object.
- *
- * @planned for 2.0
- * @param eObject - An {@link EObject} that may be annotated.
- * @return the {@link ICompilationUnit} that has the tag that created this eObject.
- *
- * @see #getPrimaryTagset(EObject)
- */
- public ICompilationUnit getPrimaryAnnotatedCompilationUnit(EObject eObject);
-
- /**
- * It is desired to obtain the tagset name which is used to create the passed
- * eObject.
- *
- * @planned for 2.0
- * @param eObject An {@link EObject} which may be annotated.
- * @return The name of the tagset which creates the passed eObject.
- *
- * @see #getPrimaryAnnotatedCompilationUnit(EObject)
- */
- public String getPrimaryTagset(EObject eObject);
-}
diff --git a/plugins/org.eclipse.jst.common.annotations.core/src/org/eclipse/jst/common/internal/annotations/core/TagParseEventHandler.java b/plugins/org.eclipse.jst.common.annotations.core/src/org/eclipse/jst/common/internal/annotations/core/TagParseEventHandler.java
deleted file mode 100644
index f979415..0000000
--- a/plugins/org.eclipse.jst.common.annotations.core/src/org/eclipse/jst/common/internal/annotations/core/TagParseEventHandler.java
+++ /dev/null
@@ -1,55 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2003, 2004 IBM Corporation and others.
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
- *
- * Contributors:
- * IBM Corporation - initial API and implementation
- *******************************************************************************/
-/*
- * Created on Nov 11, 2003
- *
- * To change the template for this generated file go to
- * Window>Preferences>Java>Code Generation>Code and Comments
- */
-package org.eclipse.jst.common.internal.annotations.core;
-
-
-/**
- * Parser and interface for objects that want to receive parsing events. When parsing is started
- * through the <code>parse()</code> method, event methods are called for interesting features in
- * the parse. ( like a SAX ContentHandler )
- *
- * @author Pat Kelley
- */
-public interface TagParseEventHandler {
-
- /**
- * Called when the annotation tag is encountered. This will always be the first piece of content
- * encountered. Followed by a endOfTag( ) call when the end of the tag is reached.
- */
- public void annotationTag(Token tag);
-
- /**
- * Called when the entire annotation for a single tag has been parsed.
- *
- * @param pos
- * Position in the stream of the end of the annotation.
- */
- public void endOfTag(int pos);
-
- /**
- * Called for every attribute setting encountered for an annotation tag.
- *
- * @param name
- * Name of the attribute.
- * @param equalsPosition
- * Source position of the equals sign, or -1 if no equals sign was found.
- * @param value
- * Value of the attribute, with any quotes stripped off. Will be zero length token if
- * no attribute was found.
- */
- public void attribute(Token name, int equalsPosition, Token value);
-}
\ No newline at end of file
diff --git a/plugins/org.eclipse.jst.common.annotations.core/src/org/eclipse/jst/common/internal/annotations/core/Token.java b/plugins/org.eclipse.jst.common.annotations.core/src/org/eclipse/jst/common/internal/annotations/core/Token.java
deleted file mode 100644
index 9d03102..0000000
--- a/plugins/org.eclipse.jst.common.annotations.core/src/org/eclipse/jst/common/internal/annotations/core/Token.java
+++ /dev/null
@@ -1,103 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2003, 2004 IBM Corporation and others.
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
- *
- * Contributors:
- * IBM Corporation - initial API and implementation
- *******************************************************************************/
-/*
- * Created on Nov 11, 2003
- *
- * To change the template for this generated file go to
- * Window>Preferences>Java>Code Generation>Code and Comments
- */
-package org.eclipse.jst.common.internal.annotations.core;
-
-/**
- * A string, and the range it was taken from in the source file. The range is inclusive. (ie, with
- * source "ABCD", the beginning and end for the Token "BC" would be (1,2) )
- *
- * @author Pat Kelley
- *
- * To change the template for this generated type comment go to
- * Window>Preferences>Java>Code Generation>Code and Comments
- */
-public class Token {
- private String text;
- private int beginning;
- private int end;
-
-
-
- /**
- * @return Position in original source of the first character of this token.
- */
- public int getBeginning() {
- return beginning;
- }
-
- /**
- * @return Position in the original source of the last character of this token.
- */
- public int getEnd() {
- return end;
- }
-
- /**
- * @return The token string.
- */
- public String getText() {
- return text;
- }
-
- /**
- * @param i
- * A source position
- */
- public void setBeginning(int i) {
- beginning = i;
- }
-
- /**
- * @param i
- * A source position.
- */
- public void setEnd(int i) {
- end = i;
- }
-
- /**
- * @param string
- */
- public void setText(String string) {
- text = string;
- }
-
- public int length() {
- return text.length();
- }
-
- /**
- * Tests whether <code>srcPos</code> comes immediately after the last character in this token.
- *
- * @param srcPos
- * A position in the original source the token came from.
- * @return true if srcPos comes immediately after this token.
- */
- public boolean immediatelyPrecedes(int srcPos) {
- return end + 1 == srcPos;
- }
-
- /**
- * Tests whether srcPos is within the original source range range of the token.
- *
- * @param srcPos
- * @return
- */
- public boolean contains(int srcPos) {
- return srcPos >= beginning && srcPos <= end;
- }
-}
\ No newline at end of file
diff --git a/plugins/org.eclipse.jst.common.annotations.ui/.classpath b/plugins/org.eclipse.jst.common.annotations.ui/.classpath
deleted file mode 100644
index 8bad5c7..0000000
--- a/plugins/org.eclipse.jst.common.annotations.ui/.classpath
+++ /dev/null
@@ -1,13 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<classpath>
- <classpathentry kind="src" path="src"/>
- <classpathentry kind="src" path="property_files"/>
- <classpathentry kind="con" path="org.eclipse.jdt.launching.JRE_CONTAINER/org.eclipse.jdt.internal.debug.ui.launcher.StandardVMType/J2SE-1.5"/>
- <classpathentry kind="con" path="org.eclipse.pde.core.requiredPlugins">
- <accessrules>
- <accessrule kind="accessible" pattern="org/eclipse/wst/common/**"/>
- <accessrule kind="accessible" pattern="org/eclipse/jst/common/**"/>
- </accessrules>
- </classpathentry>
- <classpathentry kind="output" path="bin"/>
-</classpath>
diff --git a/plugins/org.eclipse.jst.common.annotations.ui/.cvsignore b/plugins/org.eclipse.jst.common.annotations.ui/.cvsignore
deleted file mode 100644
index 8e60346..0000000
--- a/plugins/org.eclipse.jst.common.annotations.ui/.cvsignore
+++ /dev/null
@@ -1,7 +0,0 @@
-bin
-temp.folder
-build.xml
-ui.jar
-@dot
-src.zip
-javaCompiler...args
diff --git a/plugins/org.eclipse.jst.common.annotations.ui/.project b/plugins/org.eclipse.jst.common.annotations.ui/.project
deleted file mode 100644
index 04b8576..0000000
--- a/plugins/org.eclipse.jst.common.annotations.ui/.project
+++ /dev/null
@@ -1,28 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<projectDescription>
- <name>org.eclipse.jst.common.annotations.ui</name>
- <comment></comment>
- <projects>
- </projects>
- <buildSpec>
- <buildCommand>
- <name>org.eclipse.jdt.core.javabuilder</name>
- <arguments>
- </arguments>
- </buildCommand>
- <buildCommand>
- <name>org.eclipse.pde.ManifestBuilder</name>
- <arguments>
- </arguments>
- </buildCommand>
- <buildCommand>
- <name>org.eclipse.pde.SchemaBuilder</name>
- <arguments>
- </arguments>
- </buildCommand>
- </buildSpec>
- <natures>
- <nature>org.eclipse.pde.PluginNature</nature>
- <nature>org.eclipse.jdt.core.javanature</nature>
- </natures>
-</projectDescription>
diff --git a/plugins/org.eclipse.jst.common.annotations.ui/.settings/org.eclipse.core.resources.prefs b/plugins/org.eclipse.jst.common.annotations.ui/.settings/org.eclipse.core.resources.prefs
deleted file mode 100644
index 6447921..0000000
--- a/plugins/org.eclipse.jst.common.annotations.ui/.settings/org.eclipse.core.resources.prefs
+++ /dev/null
@@ -1,3 +0,0 @@
-#Sun Apr 16 17:15:11 EDT 2006
-eclipse.preferences.version=1
-encoding/<project>=ISO-8859-1
diff --git a/plugins/org.eclipse.jst.common.annotations.ui/.settings/org.eclipse.jdt.core.prefs b/plugins/org.eclipse.jst.common.annotations.ui/.settings/org.eclipse.jdt.core.prefs
deleted file mode 100644
index 037a4e5..0000000
--- a/plugins/org.eclipse.jst.common.annotations.ui/.settings/org.eclipse.jdt.core.prefs
+++ /dev/null
@@ -1,95 +0,0 @@
-#Mon Jun 08 15:35:45 EDT 2009
-org.eclipse.jdt.core.compiler.problem.unusedParameterWhenImplementingAbstract=disabled
-org.eclipse.jdt.core.compiler.problem.comparingIdentical=error
-org.eclipse.jdt.core.compiler.problem.unnecessaryElse=error
-org.eclipse.jdt.core.compiler.problem.redundantSuperinterface=error
-org.eclipse.jdt.core.compiler.problem.unusedLocal=error
-org.eclipse.jdt.core.compiler.problem.emptyStatement=error
-org.eclipse.jdt.core.compiler.problem.unusedLabel=error
-org.eclipse.jdt.core.compiler.problem.unusedParameter=warning
-org.eclipse.jdt.core.compiler.problem.rawTypeReference=warning
-org.eclipse.jdt.core.incompatibleJDKLevel=ignore
-org.eclipse.jdt.core.compiler.problem.incompatibleNonInheritedInterfaceMethod=error
-org.eclipse.jdt.core.compiler.debug.lineNumber=generate
-org.eclipse.jdt.core.compiler.problem.unusedDeclaredThrownException=warning
-org.eclipse.jdt.core.builder.cleanOutputFolder=clean
-org.eclipse.jdt.core.compiler.problem.unusedWarningToken=warning
-org.eclipse.jdt.core.compiler.problem.noImplicitStringConversion=error
-org.eclipse.jdt.core.compiler.problem.deprecationInDeprecatedCode=enabled
-org.eclipse.jdt.core.compiler.problem.deprecation=warning
-org.eclipse.jdt.core.compiler.problem.unusedParameterWhenOverridingConcrete=disabled
-org.eclipse.jdt.core.compiler.problem.missingSynchronizedOnInheritedMethod=error
-org.eclipse.jdt.core.compiler.problem.deprecationWhenOverridingDeprecatedMethod=enabled
-org.eclipse.jdt.core.compiler.problem.redundantNullCheck=error
-org.eclipse.jdt.core.compiler.problem.unusedImport=error
-org.eclipse.jdt.core.builder.recreateModifiedClassFileInOutputFolder=ignore
-org.eclipse.jdt.core.builder.resourceCopyExclusionFilter=*.launch
-org.eclipse.jdt.core.classpath.multipleOutputLocations=enabled
-org.eclipse.jdt.core.compiler.problem.suppressWarnings=enabled
-org.eclipse.jdt.core.compiler.problem.typeParameterHiding=error
-org.eclipse.jdt.core.builder.invalidClasspath=abort
-org.eclipse.jdt.core.compiler.problem.localVariableHiding=warning
-org.eclipse.jdt.core.compiler.problem.possibleAccidentalBooleanAssignment=error
-org.eclipse.jdt.core.compiler.problem.missingHashCodeMethod=error
-org.eclipse.jdt.core.codeComplete.argumentSuffixes=
-org.eclipse.jdt.core.codeComplete.argumentPrefixes=
-org.eclipse.jdt.core.compiler.problem.indirectStaticAccess=ignore
-org.eclipse.jdt.core.compiler.problem.potentialNullReference=error
-org.eclipse.jdt.core.compiler.codegen.inlineJsrBytecode=enabled
-org.eclipse.jdt.core.compiler.problem.finalParameterBound=warning
-org.eclipse.jdt.core.compiler.problem.missingSerialVersion=error
-org.eclipse.jdt.core.compiler.problem.nullReference=error
-org.eclipse.jdt.core.compiler.source=1.5
-org.eclipse.jdt.core.compiler.problem.enumIdentifier=error
-org.eclipse.jdt.core.compiler.problem.syntheticAccessEmulation=ignore
-org.eclipse.jdt.core.builder.duplicateResourceTask=warning
-org.eclipse.jdt.core.compiler.problem.fieldHiding=error
-org.eclipse.jdt.core.compiler.problem.unusedDeclaredThrownExceptionExemptExceptionAndThrowable=enabled
-org.eclipse.jdt.core.compiler.problem.missingOverrideAnnotation=error
-org.eclipse.jdt.core.compiler.problem.hiddenCatchBlock=error
-org.eclipse.jdt.core.compiler.problem.overridingPackageDefaultMethod=error
-org.eclipse.jdt.core.compiler.problem.finallyBlockNotCompletingNormally=error
-org.eclipse.jdt.core.compiler.problem.undocumentedEmptyBlock=warning
-org.eclipse.jdt.core.classpath.exclusionPatterns=enabled
-org.eclipse.jdt.core.compiler.problem.methodWithConstructorName=error
-org.eclipse.jdt.core.compiler.problem.discouragedReference=warning
-org.eclipse.jdt.core.compiler.problem.unqualifiedFieldAccess=ignore
-org.eclipse.jdt.core.compiler.problem.incompleteEnumSwitch=error
-eclipse.preferences.version=1
-org.eclipse.jdt.core.incompleteClasspath=error
-org.eclipse.jdt.core.compiler.problem.unnecessaryTypeCheck=error
-org.eclipse.jdt.core.compiler.problem.deadCode=error
-org.eclipse.jdt.core.compiler.problem.specialParameterHidingField=enabled
-org.eclipse.jdt.core.compiler.problem.fatalOptionalError=enabled
-org.eclipse.jdt.core.compiler.problem.noEffectAssignment=error
-org.eclipse.jdt.core.compiler.debug.sourceFile=generate
-org.eclipse.jdt.core.compiler.problem.unusedDeclaredThrownExceptionIncludeUncheckedExceptions=disabled
-org.eclipse.jdt.core.compiler.problem.missingDeprecatedAnnotation=warning
-org.eclipse.jdt.core.codeComplete.fieldPrefixes=
-org.eclipse.jdt.core.compiler.problem.fallthroughCase=error
-org.eclipse.jdt.core.compiler.codegen.targetPlatform=1.5
-org.eclipse.jdt.core.compiler.problem.unusedPrivateMember=error
-org.eclipse.jdt.core.compiler.problem.autoboxing=warning
-org.eclipse.jdt.core.circularClasspath=error
-org.eclipse.jdt.core.compiler.problem.annotationSuperInterface=warning
-org.eclipse.jdt.core.compiler.problem.nonExternalizedStringLiteral=error
-org.eclipse.jdt.core.codeComplete.fieldSuffixes=
-org.eclipse.jdt.core.codeComplete.localSuffixes=
-org.eclipse.jdt.core.compiler.problem.parameterAssignment=error
-org.eclipse.jdt.core.compiler.problem.staticAccessReceiver=error
-org.eclipse.jdt.core.codeComplete.localPrefixes=
-org.eclipse.jdt.core.compiler.problem.unusedDeclaredThrownExceptionIncludeDocCommentReference=enabled
-org.eclipse.jdt.core.compiler.maxProblemPerUnit=100
-org.eclipse.jdt.core.compiler.problem.varargsArgumentNeedCast=error
-org.eclipse.jdt.core.compiler.problem.assertIdentifier=error
-org.eclipse.jdt.core.compiler.compliance=1.5
-org.eclipse.jdt.core.compiler.problem.unusedParameterIncludeDocCommentReference=enabled
-org.eclipse.jdt.core.codeComplete.staticFieldPrefixes=
-org.eclipse.jdt.core.compiler.debug.localVariable=generate
-org.eclipse.jdt.core.compiler.problem.unhandledWarningToken=warning
-instance/org.eclipse.core.net/org.eclipse.core.net.hasMigrated=true
-org.eclipse.jdt.core.compiler.problem.forbiddenReference=error
-org.eclipse.jdt.core.compiler.codegen.unusedLocal=preserve
-org.eclipse.jdt.core.compiler.problem.uncheckedTypeOperation=warning
-org.eclipse.jdt.core.compiler.problem.unusedDeclaredThrownExceptionWhenOverriding=disabled
-org.eclipse.jdt.core.codeComplete.staticFieldSuffixes=
diff --git a/plugins/org.eclipse.jst.common.annotations.ui/.settings/org.eclipse.ltk.core.refactoring.prefs b/plugins/org.eclipse.jst.common.annotations.ui/.settings/org.eclipse.ltk.core.refactoring.prefs
deleted file mode 100644
index b543eb3..0000000
--- a/plugins/org.eclipse.jst.common.annotations.ui/.settings/org.eclipse.ltk.core.refactoring.prefs
+++ /dev/null
@@ -1,3 +0,0 @@
-#Sun Aug 20 16:07:35 EDT 2006
-eclipse.preferences.version=1
-org.eclipse.ltk.core.refactoring.enable.project.refactoring.history=false
diff --git a/plugins/org.eclipse.jst.common.annotations.ui/.settings/org.eclipse.pde.prefs b/plugins/org.eclipse.jst.common.annotations.ui/.settings/org.eclipse.pde.prefs
deleted file mode 100644
index 371402a..0000000
--- a/plugins/org.eclipse.jst.common.annotations.ui/.settings/org.eclipse.pde.prefs
+++ /dev/null
@@ -1,14 +0,0 @@
-#Sun Aug 20 04:30:51 EDT 2006
-compilers.incompatible-environment=1
-compilers.p.build=0
-compilers.p.deprecated=1
-compilers.p.no-required-att=0
-compilers.p.not-externalized-att=0
-compilers.p.unknown-attribute=0
-compilers.p.unknown-class=0
-compilers.p.unknown-element=0
-compilers.p.unknown-resource=0
-compilers.p.unresolved-ex-points=0
-compilers.p.unresolved-import=0
-compilers.use-project=true
-eclipse.preferences.version=1
diff --git a/plugins/org.eclipse.jst.common.annotations.ui/.settings/org.eclipse.wst.validation.prefs b/plugins/org.eclipse.jst.common.annotations.ui/.settings/org.eclipse.wst.validation.prefs
deleted file mode 100644
index ca43670..0000000
--- a/plugins/org.eclipse.jst.common.annotations.ui/.settings/org.eclipse.wst.validation.prefs
+++ /dev/null
@@ -1,6 +0,0 @@
-#Sun Aug 20 16:07:35 EDT 2006
-DELEGATES_PREFERENCE=delegateValidatorListorg.eclipse.wst.wsdl.validation.internal.eclipse.WSDLDelegatingValidator\=org.eclipse.wst.wsdl.validation.internal.eclipse.Validator;org.eclipse.wst.xsd.core.internal.validation.eclipse.XSDDelegatingValidator\=org.eclipse.wst.xsd.core.internal.validation.eclipse.Validator;
-USER_BUILD_PREFERENCE=enabledBuildValidatorListorg.eclipse.wst.wsi.ui.internal.WSIMessageValidator;org.eclipse.wst.xml.core.internal.validation.eclipse.Validator;org.eclipse.jst.jsp.core.internal.validation.JSPDirectiveValidator;org.eclipse.wst.html.internal.validation.HTMLValidator;org.eclipse.jst.jsp.core.internal.validation.JSPJavaValidator;org.eclipse.wst.xsd.core.internal.validation.eclipse.XSDDelegatingValidator;org.eclipse.jst.jsp.core.internal.validation.JSPELValidator;org.eclipse.wst.dtd.core.internal.validation.eclipse.Validator;org.eclipse.wst.wsdl.validation.internal.eclipse.WSDLDelegatingValidator;
-USER_MANUAL_PREFERENCE=enabledManualValidatorListorg.eclipse.wst.wsi.ui.internal.WSIMessageValidator;org.eclipse.wst.xml.core.internal.validation.eclipse.Validator;org.eclipse.jst.jsp.core.internal.validation.JSPDirectiveValidator;org.eclipse.wst.html.internal.validation.HTMLValidator;org.eclipse.jst.jsp.core.internal.validation.JSPJavaValidator;org.eclipse.wst.xsd.core.internal.validation.eclipse.XSDDelegatingValidator;org.eclipse.jst.jsp.core.internal.validation.JSPELValidator;org.eclipse.wst.dtd.core.internal.validation.eclipse.Validator;org.eclipse.wst.wsdl.validation.internal.eclipse.WSDLDelegatingValidator;
-USER_PREFERENCE=overrideGlobalPreferencesfalse
-eclipse.preferences.version=1
diff --git a/plugins/org.eclipse.jst.common.annotations.ui/META-INF/MANIFEST.MF b/plugins/org.eclipse.jst.common.annotations.ui/META-INF/MANIFEST.MF
deleted file mode 100644
index 47247cf..0000000
--- a/plugins/org.eclipse.jst.common.annotations.ui/META-INF/MANIFEST.MF
+++ /dev/null
@@ -1,26 +0,0 @@
-Manifest-Version: 1.0
-Bundle-ManifestVersion: 2
-Bundle-Name: %Annotations_UI_
-Bundle-SymbolicName: org.eclipse.jst.common.annotations.ui; singleton:=true
-Bundle-Version: 1.1.300.qualifier
-Bundle-Activator: org.eclipse.jst.common.internal.annotations.ui.UiPlugin
-Bundle-Vendor: %Eclipse_UI_
-Bundle-Localization: plugin
-Export-Package: org.eclipse.jst.common.internal.annotations.ui;x-internal:=true
-Require-Bundle: org.eclipse.ui.views;bundle-version="[3.2.0,4.0.0)",
- org.eclipse.ui.editors;bundle-version="[3.2.0,4.0.0)",
- org.eclipse.core.resources;bundle-version="[3.2.0,4.0.0)",
- org.eclipse.ui;bundle-version="[3.2.0,4.0.0)",
- org.eclipse.jdt.ui;bundle-version="[3.2.0,4.0.0)",
- org.eclipse.jdt.core;bundle-version="[3.2.0,4.0.0)",
- org.eclipse.jface.text;bundle-version="[3.2.0,4.0.0)",
- org.eclipse.ui.workbench.texteditor;bundle-version="[3.2.0,4.0.0)",
- org.eclipse.ui.ide;bundle-version="[3.2.0,4.0.0)",
- org.eclipse.swt;bundle-version="[3.2.0,4.0.0)",
- org.eclipse.core.runtime;bundle-version="[3.2.0,4.0.0)",
- org.eclipse.core.runtime;bundle-version="[3.2.0,4.0.0)",
- org.eclipse.jst.common.annotations.controller;bundle-version="[1.1.0,1.2.0)",
- org.eclipse.wst.common.emf;bundle-version="[1.2.0,2.0.0)",
- org.eclipse.jst.common.annotations.core;bundle-version="[1.1.0,1.2.0)"
-Eclipse-LazyStart: true
-Bundle-RequiredExecutionEnvironment: J2SE-1.5
diff --git a/plugins/org.eclipse.jst.common.annotations.ui/about.html b/plugins/org.eclipse.jst.common.annotations.ui/about.html
deleted file mode 100644
index 2199df3..0000000
--- a/plugins/org.eclipse.jst.common.annotations.ui/about.html
+++ /dev/null
@@ -1,34 +0,0 @@
-<!DOCTYPE HTML PUBLIC "-//W3C//DTD HTML 4.0//EN">
-<HTML>
-
-<head>
-<title>About</title>
-<meta http-equiv=Content-Type content="text/html; charset=ISO-8859-1">
-</head>
-
-<BODY lang="EN-US">
-
-<H3>About This Content</H3>
-
-<P>June, 2008</P>
-
-<H3>License</H3>
-
-<P>The Eclipse Foundation makes available all content in this plug-in
-("Content"). Unless otherwise indicated below, the Content is provided to you
-under the terms and conditions of the Eclipse Public License Version 1.0
-("EPL"). A copy of the EPL is available at
-<A href="http://www.eclipse.org/org/documents/epl-v10.php">http://www.eclipse.org/org/documents/epl-v10.php</A>.
-For purposes of the EPL, "Program" will mean the Content.</P>
-
-<P>If you did not receive this Content directly from the Eclipse Foundation, the
-Content is being redistributed by another party ("Redistributor") and different
-terms and conditions may apply to your use of any object code in the Content.
-Check the Redistributors license that was provided with the Content. If no such
-license exists, contact the Redistributor. Unless otherwise indicated below, the
-terms and conditions of the EPL still apply to any source code in the Content
-and such source code may be obtained at
-<A href="http://www.eclipse.org/">http://www.eclipse.org/</A>.</P>
-
-</BODY>
-</HTML>
diff --git a/plugins/org.eclipse.jst.common.annotations.ui/build.properties b/plugins/org.eclipse.jst.common.annotations.ui/build.properties
deleted file mode 100644
index a21afc6..0000000
--- a/plugins/org.eclipse.jst.common.annotations.ui/build.properties
+++ /dev/null
@@ -1,20 +0,0 @@
-###############################################################################
-# Copyright (c) 2003, 2004 IBM Corporation and others.
-# All rights reserved. This program and the accompanying materials
-# are made available under the terms of the Eclipse Public License v1.0
-# which accompanies this distribution, and is available at
-# http://www.eclipse.org/legal/epl-v10.html
-#
-# Contributors:
-# IBM Corporation - initial API and implementation
-###############################################################################
-bin.includes = plugin.xml,\
- META-INF/,\
- about.html,\
- plugin.properties,\
- .
-src.includes=schema/
-jars.compile.order = .
-output.. = bin/
-source.. = src/,\
- property_files/
diff --git a/plugins/org.eclipse.jst.common.annotations.ui/plugin.properties b/plugins/org.eclipse.jst.common.annotations.ui/plugin.properties
deleted file mode 100644
index beb1409..0000000
--- a/plugins/org.eclipse.jst.common.annotations.ui/plugin.properties
+++ /dev/null
@@ -1,3 +0,0 @@
-AnnotationsCompletionProcessor=AnnotationsCompletionProcessor
-Annotations_UI_=Annotations UI Plug-in
-Eclipse_UI_=Eclipse.org
\ No newline at end of file
diff --git a/plugins/org.eclipse.jst.common.annotations.ui/plugin.xml b/plugins/org.eclipse.jst.common.annotations.ui/plugin.xml
deleted file mode 100644
index efa96ed..0000000
--- a/plugins/org.eclipse.jst.common.annotations.ui/plugin.xml
+++ /dev/null
@@ -1,14 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<?eclipse version="3.0"?>
-<plugin>
-
- <extension
- point="org.eclipse.jdt.ui.javadocCompletionProcessor">
- <javadocCompletionProcessor
- name="%AnnotationsCompletionProcessor"
- class="org.eclipse.jst.common.internal.annotations.ui.AnnotationTagCompletionProc"
- id="AnnotationsCompletionProcessor">
- </javadocCompletionProcessor>
- </extension>
-
-</plugin>
diff --git a/plugins/org.eclipse.jst.common.annotations.ui/prepareforpii.xml b/plugins/org.eclipse.jst.common.annotations.ui/prepareforpii.xml
deleted file mode 100644
index 9a4918e..0000000
--- a/plugins/org.eclipse.jst.common.annotations.ui/prepareforpii.xml
+++ /dev/null
@@ -1,36 +0,0 @@
-<project name="PrepareForPII" default="main" basedir=".">
-
- <!-- Setup temp variables -->
- <target name="init">
- <property name="nlsDir" value="d:/NLS/Corona/0526"/>
- <property name="plugin" value="com.ibm.wtp.annotations.ui"/>
- <property name="plugindir" value="d:/workspaceCorona/${plugin}"/>
- <property name="outputDir" value="${nlsDir}/${plugin}"/>
-
-
- </target>
-
- <!-- Create the destination dir -->
- <target name="nlsDir" depends="init">
- <mkdir dir="${nlsDir}"/>
- </target>
-
- <!-- Create the destination dir -->
- <target name="plugindir" depends="nlsDir">
- <delete dir="${outputDir}"/>
- <mkdir dir="${outputDir}"/>
- </target>
-
- <!-- Move the files to the correct locations in the workspace. -->
- <target name="main" depends="plugindir">
-
- <messageIdGen folderPath = "${plugindir}" componentId = "E" />
-
- <copy todir = "${outputDir}/property_files" >
- <fileset dir="${plugindir}/property_files">
- <include name="**/*.properties"/>
- </fileset>
- </copy>
-
- </target>
-</project>
diff --git a/plugins/org.eclipse.jst.common.annotations.ui/property_files/taghandlerui.properties b/plugins/org.eclipse.jst.common.annotations.ui/property_files/taghandlerui.properties
deleted file mode 100644
index 2d29099..0000000
--- a/plugins/org.eclipse.jst.common.annotations.ui/property_files/taghandlerui.properties
+++ /dev/null
@@ -1,12 +0,0 @@
-###############################################################################
-# Copyright (c) 2003, 2004 IBM Corporation and others.
-# All rights reserved. This program and the accompanying materials
-# are made available under the terms of the Eclipse Public License v1.0
-# which accompanies this distribution, and is available at
-# http://www.eclipse.org/legal/epl-v10.html
-#
-# Contributors:
-# IBM Corporation - initial API and implementation
-###############################################################################
-J2EEAnnotationsCompletionProcessor_3=Error parsing attributes - was expecing a '=' but found '
-J2EEAnnotationsCompletionProcessor_4=' instead.
diff --git a/plugins/org.eclipse.jst.common.annotations.ui/schema/AnnotationUI.exsd b/plugins/org.eclipse.jst.common.annotations.ui/schema/AnnotationUI.exsd
deleted file mode 100644
index b3af9ec..0000000
--- a/plugins/org.eclipse.jst.common.annotations.ui/schema/AnnotationUI.exsd
+++ /dev/null
@@ -1,104 +0,0 @@
-<?xml version='1.0' encoding='UTF-8'?>
-<!-- Schema file written by PDE -->
-<schema targetNamespace="org.eclipse.jst.common.annotations.ui">
-<annotation>
- <appInfo>
- <meta.schema plugin="org.eclipse.jst.common.annotations.ui" id="AnnotationUI" name="AnnotationUI"/>
- </appInfo>
- <documentation>
- Extension point for enabling content assist for an existing tag set.
- </documentation>
- </annotation>
-
- <element name="extension">
- <complexType>
- <sequence>
- <element ref="AutoCompleteData" minOccurs="0" maxOccurs="unbounded"/>
- </sequence>
- <attribute name="point" type="string" use="required">
- <annotation>
- <documentation>
-
- </documentation>
- </annotation>
- </attribute>
- <attribute name="id" type="string">
- <annotation>
- <documentation>
-
- </documentation>
- </annotation>
- </attribute>
- <attribute name="name" type="string">
- <annotation>
- <documentation>
-
- </documentation>
- </annotation>
- </attribute>
- </complexType>
- </element>
-
- <element name="AutoCompleteData">
- <annotation>
- <documentation>
- Enables content assist for a single tag set.
- </documentation>
- </annotation>
- <complexType>
- <attribute name="tagSet" type="string" use="required">
- <annotation>
- <documentation>
- Name of the tag set code assist should be enabled for.
- </documentation>
- </annotation>
- </attribute>
- </complexType>
- </element>
-
- <annotation>
- <appInfo>
- <meta.section type="since"/>
- </appInfo>
- <documentation>
- [Enter the first release in which this extension point appears.]
- </documentation>
- </annotation>
-
- <annotation>
- <appInfo>
- <meta.section type="examples"/>
- </appInfo>
- <documentation>
- [Enter extension point usage example here.]
- </documentation>
- </annotation>
-
- <annotation>
- <appInfo>
- <meta.section type="apiInfo"/>
- </appInfo>
- <documentation>
- [Enter API information here.]
- </documentation>
- </annotation>
-
- <annotation>
- <appInfo>
- <meta.section type="implementation"/>
- </appInfo>
- <documentation>
- [Enter information about supplied implementation of this extension point.]
- </documentation>
- </annotation>
-
- <annotation>
- <appInfo>
- <meta.section type="copyright"/>
- </appInfo>
- <documentation>
-
- </documentation>
- </annotation>
-
-</schema>
diff --git a/plugins/org.eclipse.jst.common.annotations.ui/src/org/eclipse/jst/common/internal/annotations/ui/AbstractAnnotationTagProposal.java b/plugins/org.eclipse.jst.common.annotations.ui/src/org/eclipse/jst/common/internal/annotations/ui/AbstractAnnotationTagProposal.java
deleted file mode 100644
index 6806232..0000000
--- a/plugins/org.eclipse.jst.common.annotations.ui/src/org/eclipse/jst/common/internal/annotations/ui/AbstractAnnotationTagProposal.java
+++ /dev/null
@@ -1,925 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2005, 2006 IBM Corporation and others.
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
- *
- * Contributors:
- * IBM Corporation - initial API and implementation
- *******************************************************************************/
-package org.eclipse.jst.common.internal.annotations.ui;
-
-import java.io.IOException;
-import java.net.URL;
-
-import org.eclipse.core.runtime.FileLocator;
-import org.eclipse.core.runtime.IProgressMonitor;
-import org.eclipse.core.runtime.Platform;
-import org.eclipse.jdt.core.IJavaElement;
-import org.eclipse.jdt.core.IJavaProject;
-import org.eclipse.jdt.core.JavaCore;
-import org.eclipse.jdt.core.compiler.CharOperation;
-import org.eclipse.jdt.ui.JavaUI;
-import org.eclipse.jdt.ui.PreferenceConstants;
-import org.eclipse.jface.preference.IPreferenceStore;
-import org.eclipse.jface.preference.PreferenceConverter;
-import org.eclipse.jface.text.Assert;
-import org.eclipse.jface.text.BadLocationException;
-import org.eclipse.jface.text.BadPositionCategoryException;
-import org.eclipse.jface.text.DefaultPositionUpdater;
-import org.eclipse.jface.text.DocumentCommand;
-import org.eclipse.jface.text.DocumentEvent;
-import org.eclipse.jface.text.IDocument;
-import org.eclipse.jface.text.IInformationControlCreator;
-import org.eclipse.jface.text.IPositionUpdater;
-import org.eclipse.jface.text.IRegion;
-import org.eclipse.jface.text.ITextViewer;
-import org.eclipse.jface.text.ITextViewerExtension2;
-import org.eclipse.jface.text.ITextViewerExtension5;
-import org.eclipse.jface.text.Position;
-import org.eclipse.jface.text.Region;
-import org.eclipse.jface.text.contentassist.IContextInformation;
-import org.eclipse.jface.text.link.ILinkedModeListener;
-import org.eclipse.jface.text.link.LinkedModeModel;
-import org.eclipse.jface.text.link.LinkedModeUI;
-import org.eclipse.jface.text.link.LinkedPosition;
-import org.eclipse.jface.text.link.LinkedPositionGroup;
-import org.eclipse.jface.text.link.LinkedModeUI.ExitFlags;
-import org.eclipse.jface.text.link.LinkedModeUI.IExitPolicy;
-import org.eclipse.swt.SWT;
-import org.eclipse.swt.custom.StyleRange;
-import org.eclipse.swt.custom.StyledText;
-import org.eclipse.swt.events.VerifyEvent;
-import org.eclipse.swt.graphics.Color;
-import org.eclipse.swt.graphics.Image;
-import org.eclipse.swt.graphics.Point;
-import org.eclipse.swt.graphics.RGB;
-import org.eclipse.ui.texteditor.link.EditorLinkedModeUI;
-import org.osgi.framework.Bundle;
-import org.eclipse.jst.common.internal.annotations.ui.UiPlugin;
-
-/**
- *
- * @since 3.2
- */
-public abstract class AbstractAnnotationTagProposal {
- /**
- * A class to simplify tracking a reference position in a document.
- */
- static final class ReferenceTracker {
-
- /** The reference position category name. */
- private static final String CATEGORY= "reference_position"; //$NON-NLS-1$
- /** The position updater of the reference position. */
- private final IPositionUpdater fPositionUpdater= new DefaultPositionUpdater(CATEGORY);
- /** The reference position. */
- private final Position fPosition= new Position(0);
-
- /**
- * Called before document changes occur. It must be followed by a call to postReplace().
- *
- * @param document the document on which to track the reference position.
- *
- */
- public void preReplace(IDocument document, int offset) throws BadLocationException {
- fPosition.setOffset(offset);
- try {
- document.addPositionCategory(CATEGORY);
- document.addPositionUpdater(fPositionUpdater);
- document.addPosition(CATEGORY, fPosition);
-
- } catch (BadPositionCategoryException e) {
- // should not happen
- UiPlugin.logError(e);
- }
- }
-
- /**
- * Called after the document changed occurred. It must be preceded by a call to preReplace().
- *
- * @param document the document on which to track the reference position.
- */
- public int postReplace(IDocument document) {
- try {
- document.removePosition(CATEGORY, fPosition);
- document.removePositionUpdater(fPositionUpdater);
- document.removePositionCategory(CATEGORY);
-
- } catch (BadPositionCategoryException e) {
- // should not happen
- UiPlugin.logError(e);
- }
- return fPosition.getOffset();
- }
- }
-
- protected static final class ExitPolicy implements IExitPolicy {
-
- final char fExitCharacter;
- private final IDocument fDocument;
-
- public ExitPolicy(char exitCharacter, IDocument document) {
- fExitCharacter= exitCharacter;
- fDocument= document;
- }
-
- /*
- * @see org.eclipse.jdt.internal.ui.text.link.LinkedPositionUI.ExitPolicy#doExit(org.eclipse.jdt.internal.ui.text.link.LinkedPositionManager, org.eclipse.swt.events.VerifyEvent, int, int)
- */
- public ExitFlags doExit(LinkedModeModel environment, VerifyEvent event, int offset, int length) {
-
- if (event.character == fExitCharacter) {
- if (environment.anyPositionContains(offset))
- return new ExitFlags(ILinkedModeListener.UPDATE_CARET, false);
- return new ExitFlags(ILinkedModeListener.UPDATE_CARET, true);
- }
-
- switch (event.character) {
- case ';':
- return new ExitFlags(ILinkedModeListener.NONE, true);
- case SWT.CR:
- // when entering an anonymous class as a parameter, we don't want
- // to jump after the parenthesis when return is pressed
- if (offset > 0) {
- try {
- if (fDocument.getChar(offset - 1) == '{')
- return new ExitFlags(ILinkedModeListener.EXIT_ALL, true);
- } catch (BadLocationException e) {
- }
- }
- }
- return null;
- }
-
- }
-
- private String fDisplayString;
- private String fReplacementString;
- private int fReplacementOffset;
- private int fReplacementLength;
- private int fCursorPosition;
- private Image fImage;
- private IContextInformation fContextInformation;
- //private ProposalInfo fProposalInfo;
- private char[] fTriggerCharacters;
- private String fSortString;
- private int fRelevance;
- private boolean fIsInJavadoc;
-
- private StyleRange fRememberedStyleRange;
- private boolean fToggleEating;
- private ITextViewer fTextViewer;
-
- /**
- * The URL of the style sheet (css).
- * @since 3.2
- */
- private URL fStyleSheetURL;
-
- protected AbstractAnnotationTagProposal() {
- }
-
- /*
- * @see ICompletionProposalExtension#getTriggerCharacters()
- */
- public char[] getTriggerCharacters() {
- return fTriggerCharacters;
- }
-
- /**
- * Sets the trigger characters.
- *
- * @param triggerCharacters The set of characters which can trigger the application of this
- * completion proposal
- */
- public void setTriggerCharacters(char[] triggerCharacters) {
- fTriggerCharacters= triggerCharacters;
- }
-
- /**
- * Sets the proposal info.
- *
- * @param proposalInfo The additional information associated with this proposal or
- * <code>null</code>
- */
-// public void setProposalInfo(ProposalInfo proposalInfo) {
-// fProposalInfo= proposalInfo;
-// }
-
- /**
- * Returns the additional proposal info, or <code>null</code> if none exists.
- *
- * @return the additional proposal info, or <code>null</code> if none exists
- */
-// protected ProposalInfo getProposalInfo() {
-// return fProposalInfo;
-// }
-
- /**
- * Sets the cursor position relative to the insertion offset. By default this is the length of
- * the completion string (Cursor positioned after the completion)
- *
- * @param cursorPosition The cursorPosition to set
- */
- public void setCursorPosition(int cursorPosition) {
- Assert.isTrue(cursorPosition >= 0);
- fCursorPosition= cursorPosition;
- }
-
- protected int getCursorPosition() {
- return fCursorPosition;
- }
-
- /*
- * @see ICompletionProposal#apply
- */
- public final void apply(IDocument document) {
- // not used any longer
- apply(document, (char) 0, getReplacementOffset() + getReplacementLength());
- }
-
- /*
- * @see org.eclipse.jface.text.contentassist.ICompletionProposalExtension#apply(org.eclipse.jface.text.IDocument, char, int)
- */
- public void apply(IDocument document, char trigger, int offset) {
- try {
- // patch replacement length
- int delta= offset - (getReplacementOffset() + getReplacementLength());
- if (delta > 0)
- setReplacementLength(getReplacementLength() + delta);
-
- boolean isSmartTrigger= isSmartTrigger(trigger);
-
- String replacement;
- if (isSmartTrigger || trigger == (char) 0) {
- replacement= getReplacementString();
- } else {
- StringBuffer buffer= new StringBuffer(getReplacementString());
-
- // fix for PR #5533. Assumes that no eating takes place.
- if ((getCursorPosition() > 0 && getCursorPosition() <= buffer.length() && buffer.charAt(getCursorPosition() - 1) != trigger)) {
- buffer.insert(getCursorPosition(), trigger);
- setCursorPosition(getCursorPosition() + 1);
- }
-
- replacement= buffer.toString();
- setReplacementString(replacement);
- }
-
- // reference position just at the end of the document change.
- int referenceOffset= getReplacementOffset() + getReplacementLength();
- final ReferenceTracker referenceTracker= new ReferenceTracker();
- referenceTracker.preReplace(document, referenceOffset);
-
- replace(document, getReplacementOffset(), getReplacementLength(), replacement);
-
- referenceOffset= referenceTracker.postReplace(document);
- setReplacementOffset(referenceOffset - (replacement == null ? 0 : replacement.length()));
-
- // PR 47097
- if (isSmartTrigger)
- handleSmartTrigger(document, trigger, referenceOffset);
-
- } catch (BadLocationException x) {
- // ignore
- }
- }
-
- private boolean isSmartTrigger(char trigger) {
- return trigger == ';' && getBooleanPreference(PreferenceConstants.EDITOR_SMART_SEMICOLON)
- || trigger == '{' && getBooleanPreference(PreferenceConstants.EDITOR_SMART_OPENING_BRACE);
- }
-
- private boolean getBooleanPreference(String preferenceKey) {
- String value = PreferenceConstants.getPreference(preferenceKey, getProject());
- if (value != null)
- return Boolean.valueOf(value).booleanValue();
- return false;
- }
-
- private void handleSmartTrigger(IDocument document, char trigger, int referenceOffset) throws BadLocationException {
- DocumentCommand cmd= new DocumentCommand() {
- };
-
- cmd.offset= referenceOffset;
- cmd.length= 0;
- cmd.text= Character.toString(trigger);
- cmd.doit= true;
- cmd.shiftsCaret= true;
- cmd.caretOffset= getReplacementOffset() + getCursorPosition();
-
-// SmartSemicolonAutoEditStrategy strategy= new SmartSemicolonAutoEditStrategy(IJavaPartitions.JAVA_PARTITIONING);
-// strategy.customizeDocumentCommand(document, cmd);
-
- replace(document, cmd.offset, cmd.length, cmd.text);
- setCursorPosition(cmd.caretOffset - getReplacementOffset() + cmd.text.length());
- }
-
- protected final void replace(IDocument document, int offset, int length, String string) throws BadLocationException {
- if (!document.get(offset, length).equals(string))
- document.replace(offset, length, string);
- }
-
- /*
- * @see org.eclipse.jface.text.contentassist.ICompletionProposalExtension1#apply(org.eclipse.jface.text.ITextViewer, char, int, int)
- */
- public void apply(ITextViewer viewer, char trigger, int stateMask, int offset) {
-
- IDocument document= viewer.getDocument();
- if (fTextViewer == null)
- fTextViewer= viewer;
-
- // see https://bugs.eclipse.org/bugs/show_bug.cgi?id=96059
- // don't apply the proposal if for some reason we're not valid any longer
- if (!isInJavadoc() && !validate(document, offset, null)) {
- setCursorPosition(offset - getReplacementOffset());
- if (trigger != '\0') {
- try {
- document.replace(offset, 0, String.valueOf(trigger));
- setCursorPosition(getCursorPosition() + 1);
- if (trigger == '(' && autocloseBrackets()) {
- document.replace(getReplacementOffset() + getCursorPosition(), 0, ")"); //$NON-NLS-1$
- setUpLinkedMode(document, ')');
- }
- } catch (BadLocationException x) {
- // ignore
- }
- }
- return;
- }
-
- // don't eat if not in preferences, XOR with modifier key 1 (Ctrl)
- // but: if there is a selection, replace it!
- Point selection= viewer.getSelectedRange();
- fToggleEating= (stateMask & SWT.MOD1) != 0;
- int newLength= selection.x + selection.y - getReplacementOffset();
- if ((insertCompletion() ^ fToggleEating) && newLength >= 0)
- setReplacementLength(newLength);
-
- apply(document, trigger, offset);
- fToggleEating= false;
- }
-
- /**
- * Returns <code>true</code> if the proposal is within javadoc, <code>false</code>
- * otherwise.
- *
- * @return <code>true</code> if the proposal is within javadoc, <code>false</code> otherwise
- */
- protected boolean isInJavadoc(){
- return fIsInJavadoc;
- }
-
- /**
- * Sets the javadoc attribute.
- *
- * @param isInJavadoc <code>true</code> if the proposal is within javadoc
- */
- protected void setInJavadoc(boolean isInJavadoc) {
- fIsInJavadoc= isInJavadoc;
- }
-
- /*
- * @see ICompletionProposal#getSelection
- */
- public Point getSelection(IDocument document) {
- return new Point(getReplacementOffset() + getCursorPosition(), 0);
- }
-
- /*
- * @see ICompletionProposal#getContextInformation()
- */
- public IContextInformation getContextInformation() {
- return fContextInformation;
- }
-
- /**
- * Sets the context information.
- * @param contextInformation The context information associated with this proposal
- */
- public void setContextInformation(IContextInformation contextInformation) {
- fContextInformation= contextInformation;
- }
-
- /*
- * @see ICompletionProposal#getDisplayString()
- */
- public String getDisplayString() {
- return fDisplayString;
- }
-
- /*
- * @see ICompletionProposal#getAdditionalProposalInfo()
- */
- public String getAdditionalProposalInfo() {
-// if (getProposalInfo() != null) {
-// String info= getProposalInfo().getInfo(null);
-// if (info != null && info.length() > 0) {
-// StringBuffer buffer= new StringBuffer();
-// HTMLPrinter.insertPageProlog(buffer, 0, getStyleSheetURL());
-// buffer.append(info);
-// HTMLPrinter.addPageEpilog(buffer);
-// info= buffer.toString();
-// }
-// return info;
-// }
- return null;
- }
-
- /*
- * @see org.eclipse.jface.text.contentassist.ICompletionProposalExtension5#getAdditionalProposalInfo(org.eclipse.core.runtime.IProgressMonitor)
- */
- public Object getAdditionalProposalInfo(IProgressMonitor monitor) {
-// if (getProposalInfo() != null) {
-// String info= getProposalInfo().getInfo(monitor);
-// if (info != null && info.length() > 0) {
-// StringBuffer buffer= new StringBuffer();
-// HTMLPrinter.insertPageProlog(buffer, 0, getStyleSheetURL());
-// buffer.append(info);
-// HTMLPrinter.addPageEpilog(buffer);
-// info= buffer.toString();
-// }
-// return info;
-// }
- return null;
- }
-
- /**
- * Returns the style sheet URL.
- *
- * @since 3.1
- */
- protected URL getStyleSheetURL() {
- if (fStyleSheetURL == null) {
-
- Bundle bundle= Platform.getBundle(JavaUI.ID_PLUGIN);
- fStyleSheetURL= bundle.getEntry("/JavadocHoverStyleSheet.css"); //$NON-NLS-1$
- if (fStyleSheetURL != null) {
- try {
- fStyleSheetURL= FileLocator.toFileURL(fStyleSheetURL);
- } catch (IOException ex) {
- UiPlugin.logError(ex);
- }
- }
- }
- return fStyleSheetURL;
- }
-
- /*
- * @see ICompletionProposalExtension#getContextInformationPosition()
- */
- public int getContextInformationPosition() {
- if (getContextInformation() == null)
- return getReplacementOffset() - 1;
- return getReplacementOffset() + getCursorPosition();
- }
-
- /**
- * Gets the replacement offset.
- * @return Returns a int
- */
- public int getReplacementOffset() {
- return fReplacementOffset;
- }
-
- /**
- * Sets the replacement offset.
- * @param replacementOffset The replacement offset to set
- */
- public void setReplacementOffset(int replacementOffset) {
- Assert.isTrue(replacementOffset >= 0);
- fReplacementOffset= replacementOffset;
- }
-
- /*
- * @see org.eclipse.jface.text.contentassist.ICompletionProposalExtension3#getCompletionOffset()
- */
- public int getPrefixCompletionStart(IDocument document, int completionOffset) {
- return getReplacementOffset();
- }
-
- /**
- * Gets the replacement length.
- * @return Returns a int
- */
- public int getReplacementLength() {
- return fReplacementLength;
- }
-
- /**
- * Sets the replacement length.
- * @param replacementLength The replacementLength to set
- */
- public void setReplacementLength(int replacementLength) {
- Assert.isTrue(replacementLength >= 0);
- fReplacementLength= replacementLength;
- }
-
- /**
- * Gets the replacement string.
- * @return Returns a String
- */
- public String getReplacementString() {
- return fReplacementString;
- }
-
- /**
- * Sets the replacement string.
- * @param replacementString The replacement string to set
- */
- public void setReplacementString(String replacementString) {
- Assert.isNotNull(replacementString);
- fReplacementString= replacementString;
- }
-
- /*
- * @see org.eclipse.jface.text.contentassist.ICompletionProposalExtension3#getReplacementText()
- */
- public CharSequence getPrefixCompletionText(IDocument document, int completionOffset) {
- if (!isCamelCaseMatching())
- return getReplacementString();
-
- String prefix= getPrefix(document, completionOffset);
- return getCamelCaseCompound(prefix, getReplacementString());
- }
-
- /*
- * @see ICompletionProposal#getImage()
- */
- public Image getImage() {
- return fImage;
- }
-
- /**
- * Sets the image.
- * @param image The image to set
- */
- public void setImage(Image image) {
- fImage= image;
- }
-
- /*
- * @see ICompletionProposalExtension#isValidFor(IDocument, int)
- */
- public boolean isValidFor(IDocument document, int offset) {
- return validate(document, offset, null);
- }
-
- /*
- * @see org.eclipse.jface.text.contentassist.ICompletionProposalExtension2#validate(org.eclipse.jface.text.IDocument, int, org.eclipse.jface.text.DocumentEvent)
- */
- public boolean validate(IDocument document, int offset, DocumentEvent event) {
-
- if (offset < getReplacementOffset())
- return false;
-
- boolean validated= isValidPrefix(getPrefix(document, offset));
-
- if (validated && event != null) {
- // adapt replacement range to document change
- int delta= (event.fText == null ? 0 : event.fText.length()) - event.fLength;
- final int newLength= Math.max(getReplacementLength() + delta, 0);
- setReplacementLength(newLength);
- }
-
- return validated;
- }
-
- /**
- * Checks whether <code>prefix</code> is a valid prefix for this proposal. Usually, while code
- * completion is in progress, the user types and edits the prefix in the document in order to
- * filter the proposal list. From {@link #validate(IDocument, int, DocumentEvent) }, the
- * current prefix in the document is extracted and this method is called to find out whether the
- * proposal is still valid.
- * <p>
- * The default implementation checks if <code>prefix</code> is a prefix of the proposal's
- * {@link #getDisplayString() display string} using the {@link #isPrefix(String, String) }
- * method.
- * </p>
- *
- * @param prefix the current prefix in the document
- * @return <code>true</code> if <code>prefix</code> is a valid prefix of this proposal
- */
- protected boolean isValidPrefix(String prefix) {
- /*
- * See http://dev.eclipse.org/bugs/show_bug.cgi?id=17667
- * why we do not use the replacement string.
- * String word= fReplacementString;
- */
- return isPrefix(prefix, getDisplayString());
- }
-
- /**
- * Gets the proposal's relevance.
- * @return Returns a int
- */
- public int getRelevance() {
- return fRelevance;
- }
-
- /**
- * Sets the proposal's relevance.
- * @param relevance The relevance to set
- */
- public void setRelevance(int relevance) {
- fRelevance= relevance;
- }
-
- /**
- * Returns the text in <code>document</code> from {@link #getReplacementOffset()} to
- * <code>offset</code>. Returns the empty string if <code>offset</code> is before the
- * replacement offset or if an exception occurs when accessing the document.
- *
- * @since 3.2
- */
- protected String getPrefix(IDocument document, int offset) {
- try {
- int length= offset - getReplacementOffset();
- if (length > 0)
- return document.get(getReplacementOffset(), length);
- } catch (BadLocationException x) {
- }
- return ""; //$NON-NLS-1$
- }
-
- /**
- * Case insensitive comparison of <code>prefix</code> with the start of <code>string</code>.
- * Returns <code>false</code> if <code>prefix</code> is longer than <code>string</code>
- *
- * @since 3.2
- */
- protected boolean isPrefix(String prefix, String string) {
- if (prefix == null || string ==null || prefix.length() > string.length())
- return false;
- String start= string.substring(0, prefix.length());
- return start.equalsIgnoreCase(prefix) || isCamelCaseMatching() && CharOperation.camelCaseMatch(prefix.toCharArray(), string.toCharArray());
- }
-
- /**
- * Matches <code>prefix</code> against <code>string</code> and replaces the matched region
- * by prefix. Case is preserved as much as possible. This method returns <code>string</code> if camel case completion
- * is disabled. Examples when camel case completion is enabled:
- * <ul>
- * <li>getCamelCompound("NuPo", "NullPointerException") -> "NuPointerException"</li>
- * <li>getCamelCompound("NuPoE", "NullPointerException") -> "NuPoException"</li>
- * <li>getCamelCompound("hasCod", "hashCode") -> "hasCode"</li>
- * </ul>
- *
- * @param prefix the prefix to match against
- * @param string the string to match
- * @return a compound of prefix and any postfix taken from <code>string</code>
- * @since 3.2
- */
- protected final String getCamelCaseCompound(String prefix, String string) {
- if (prefix.length() > string.length())
- return string;
-
- // a normal prefix - no camel case logic at all
- String start= string.substring(0, prefix.length());
- if (start.equalsIgnoreCase(prefix))
- return string;
-
- final char[] patternChars= prefix.toCharArray();
- final char[] stringChars= string.toCharArray();
-
- for (int i= 1; i <= stringChars.length; i++)
- if (CharOperation.camelCaseMatch(patternChars, 0, patternChars.length, stringChars, 0, i))
- return prefix + string.substring(i);
-
- // Not a camel case match at all.
- // This should not happen -> stay with the default behavior
- return string;
- }
-
- /**
- * Returns true if camel case matching is enabled.
- *
- * @since 3.2
- */
- protected boolean isCamelCaseMatching() {
- IJavaProject project= getProject();
- String value;
- if (project == null)
- value= JavaCore.getOption(JavaCore.CODEASSIST_CAMEL_CASE_MATCH);
- else
- value= project.getOption(JavaCore.CODEASSIST_CAMEL_CASE_MATCH, true);
-
- return JavaCore.ENABLED.equals(value);
- }
-
- private IJavaProject getProject() {
- return null;
- }
-
-
- private static boolean insertCompletion() {
- IPreferenceStore preference= PreferenceConstants.getPreferenceStore();
- return preference.getBoolean(PreferenceConstants.CODEASSIST_INSERT_COMPLETION);
- }
-
- private static Color getForegroundColor(StyledText text) {
-
- IPreferenceStore preference= PreferenceConstants.getPreferenceStore();
- RGB rgb= PreferenceConverter.getColor(preference, PreferenceConstants.CODEASSIST_REPLACEMENT_FOREGROUND);
- return JavaUI.getColorManager().getColor(rgb);
- }
-
- private static Color getBackgroundColor(StyledText text) {
-
- IPreferenceStore preference= PreferenceConstants.getPreferenceStore();
- RGB rgb= PreferenceConverter.getColor(preference, PreferenceConstants.CODEASSIST_REPLACEMENT_BACKGROUND);
- return JavaUI.getColorManager().getColor(rgb);
- }
-
- private void repairPresentation(ITextViewer viewer) {
- if (fRememberedStyleRange != null) {
- if (viewer instanceof ITextViewerExtension2) {
- // attempts to reduce the redraw area
- ITextViewerExtension2 viewer2= (ITextViewerExtension2) viewer;
-
- if (viewer instanceof ITextViewerExtension5) {
-
- ITextViewerExtension5 extension= (ITextViewerExtension5) viewer;
- IRegion modelRange= extension.widgetRange2ModelRange(new Region(fRememberedStyleRange.start, fRememberedStyleRange.length));
- if (modelRange != null)
- viewer2.invalidateTextPresentation(modelRange.getOffset(), modelRange.getLength());
-
- } else {
- viewer2.invalidateTextPresentation(fRememberedStyleRange.start + viewer.getVisibleRegion().getOffset(), fRememberedStyleRange.length);
- }
-
- } else
- viewer.invalidateTextPresentation();
- }
- }
-
- private void updateStyle(ITextViewer viewer) {
-
- StyledText text= viewer.getTextWidget();
- if (text == null || text.isDisposed())
- return;
-
- int widgetCaret= text.getCaretOffset();
-
- int modelCaret= 0;
- if (viewer instanceof ITextViewerExtension5) {
- ITextViewerExtension5 extension= (ITextViewerExtension5) viewer;
- modelCaret= extension.widgetOffset2ModelOffset(widgetCaret);
- } else {
- IRegion visibleRegion= viewer.getVisibleRegion();
- modelCaret= widgetCaret + visibleRegion.getOffset();
- }
-
- if (modelCaret >= getReplacementOffset() + getReplacementLength()) {
- repairPresentation(viewer);
- return;
- }
-
- int offset= widgetCaret;
- int length= getReplacementOffset() + getReplacementLength() - modelCaret;
-
- Color foreground= getForegroundColor(text);
- Color background= getBackgroundColor(text);
-
- StyleRange range= text.getStyleRangeAtOffset(offset);
- int fontStyle= range != null ? range.fontStyle : SWT.NORMAL;
-
- repairPresentation(viewer);
- fRememberedStyleRange= new StyleRange(offset, length, foreground, background, fontStyle);
- if (range != null) {
- fRememberedStyleRange.strikeout= range.strikeout;
- fRememberedStyleRange.underline= range.underline;
- }
-
- // http://dev.eclipse.org/bugs/show_bug.cgi?id=34754
- try {
- text.setStyleRange(fRememberedStyleRange);
- } catch (IllegalArgumentException x) {
- // catching exception as offset + length might be outside of the text widget
- fRememberedStyleRange= null;
- }
- }
-
- /*
- * @see org.eclipse.jface.text.contentassist.ICompletionProposalExtension2#selected(ITextViewer, boolean)
- */
- public void selected(ITextViewer viewer, boolean smartToggle) {
- if (!insertCompletion() ^ smartToggle)
- updateStyle(viewer);
- else {
- repairPresentation(viewer);
- fRememberedStyleRange= null;
- }
- }
-
- /*
- * @see org.eclipse.jface.text.contentassist.ICompletionProposalExtension2#unselected(ITextViewer)
- */
- public void unselected(ITextViewer viewer) {
- repairPresentation(viewer);
- fRememberedStyleRange= null;
- }
-
- /*
- * @see org.eclipse.jface.text.contentassist.ICompletionProposalExtension3#getInformationControlCreator()
- */
- public IInformationControlCreator getInformationControlCreator() {
-// if (!BrowserInformationControl.isAvailable(null))
-// return null;
-//
-// if (fCreator == null) {
-// fCreator= new AbstractReusableInformationControlCreator() {
-//
-// /*
-// * @see org.eclipse.jdt.internal.ui.text.java.hover.AbstractReusableInformationControlCreator#doCreateInformationControl(org.eclipse.swt.widgets.Shell)
-// */
-// public IInformationControl doCreateInformationControl(Shell parent) {
-// return new BrowserInformationControl(parent, SWT.NO_TRIM | SWT.TOOL, SWT.NONE, null);
-// }
-// };
-// }
-// return fCreator;
- return null;
- }
-
- public String getSortString() {
- return fSortString;
- }
-
- protected void setSortString(String string) {
- fSortString= string;
- }
-
- protected ITextViewer getTextViewer() {
- return fTextViewer;
- }
-
- protected boolean isToggleEating() {
- return fToggleEating;
- }
-
- /**
- * Sets up a simple linked mode at {@link #getCursorPosition()} and an exit policy that will
- * exit the mode when <code>closingCharacter</code> is typed and an exit position at
- * <code>getCursorPosition() + 1</code>.
- *
- * @param document the document
- * @param closingCharacter the exit character
- */
- protected void setUpLinkedMode(IDocument document, char closingCharacter) {
- if (getTextViewer() != null && autocloseBrackets()) {
- int offset= getReplacementOffset() + getCursorPosition();
- int exit= getReplacementOffset() + getReplacementString().length();
- try {
- LinkedPositionGroup group= new LinkedPositionGroup();
- group.addPosition(new LinkedPosition(document, offset, 0, LinkedPositionGroup.NO_STOP));
-
- LinkedModeModel model= new LinkedModeModel();
- model.addGroup(group);
- model.forceInstall();
-
- LinkedModeUI ui= new EditorLinkedModeUI(model, getTextViewer());
- ui.setSimpleMode(true);
- ui.setExitPolicy(new ExitPolicy(closingCharacter, document));
- ui.setExitPosition(getTextViewer(), exit, 0, Integer.MAX_VALUE);
- ui.setCyclingMode(LinkedModeUI.CYCLE_NEVER);
- ui.enter();
- } catch (BadLocationException x) {
- UiPlugin.logError(x);
- }
- }
- }
-
- protected boolean autocloseBrackets() {
- IPreferenceStore preferenceStore= PreferenceConstants.getPreferenceStore();
- return preferenceStore.getBoolean(PreferenceConstants.EDITOR_CLOSE_BRACKETS);
- }
-
- protected void setDisplayString(String string) {
- fDisplayString= string;
- }
-
- /*
- * @see java.lang.Object#toString()
- */
- @Override
- public String toString() {
- return getDisplayString();
- }
-
- /**
- * Returns the java element proposed by the receiver, possibly <code>null</code>.
- *
- * @return the java element proposed by the receiver, possibly <code>null</code>
- */
- public IJavaElement getJavaElement() {
-// if (getProposalInfo() != null)
-// try {
-// return getProposalInfo().getJavaElement();
-// } catch (JavaModelException x) {
-// JavaPlugin.log(x);
-// }
- return null;
- }
-}
diff --git a/plugins/org.eclipse.jst.common.annotations.ui/src/org/eclipse/jst/common/internal/annotations/ui/AnnotationTagCompletionProc.java b/plugins/org.eclipse.jst.common.annotations.ui/src/org/eclipse/jst/common/internal/annotations/ui/AnnotationTagCompletionProc.java
deleted file mode 100644
index 5006208..0000000
--- a/plugins/org.eclipse.jst.common.annotations.ui/src/org/eclipse/jst/common/internal/annotations/ui/AnnotationTagCompletionProc.java
+++ /dev/null
@@ -1,724 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2003, 2004 IBM Corporation and others.
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
- *
- * Contributors:
- * IBM Corporation - initial API and implementation
- *******************************************************************************/
-/*
- * Created on Mar 9, 2004
- *
- * To change the template for this generated file go to
- * Window - Preferences - Java - Code Generation - Code and Comments
- */
-package org.eclipse.jst.common.internal.annotations.ui;
-
-import java.util.ArrayList;
-import java.util.Iterator;
-import java.util.List;
-import java.util.MissingResourceException;
-import java.util.Set;
-import java.util.TreeSet;
-
-import org.eclipse.core.resources.IFile;
-import org.eclipse.jdt.core.ICompilationUnit;
-import org.eclipse.jdt.core.IField;
-import org.eclipse.jdt.core.IJavaElement;
-import org.eclipse.jdt.core.IMethod;
-import org.eclipse.jdt.core.IType;
-import org.eclipse.jdt.core.JavaModelException;
-import org.eclipse.jdt.ui.JavaUI;
-import org.eclipse.jdt.ui.text.java.IJavaCompletionProposal;
-import org.eclipse.jdt.ui.text.java.IJavadocCompletionProcessor;
-import org.eclipse.jface.text.BadLocationException;
-import org.eclipse.jface.text.IDocument;
-import org.eclipse.jface.text.contentassist.IContextInformation;
-import org.eclipse.jst.common.internal.annotations.core.AnnotationTagParser;
-import org.eclipse.jst.common.internal.annotations.core.TagParseEventHandler;
-import org.eclipse.jst.common.internal.annotations.core.Token;
-import org.eclipse.jst.common.internal.annotations.registry.AnnotationTagRegistry;
-import org.eclipse.jst.common.internal.annotations.registry.AttributeValueProposalHelper;
-import org.eclipse.jst.common.internal.annotations.registry.AttributeValuesHelper;
-import org.eclipse.jst.common.internal.annotations.registry.TagAttribSpec;
-import org.eclipse.jst.common.internal.annotations.registry.TagSpec;
-import org.eclipse.ui.IEditorInput;
-import org.eclipse.ui.part.FileEditorInput;
-
-
-/**
- * @author Pat Kelley
- *
- * To change the template for this generated type comment go to Window - Preferences - Java - Code
- * Generation - Code and Comments
- */
-public class AnnotationTagCompletionProc implements IJavadocCompletionProcessor, TagParseEventHandler {
- private static final String[] BOOLEAN_VALID_VALUES = new String[]{"false", "true"}; //$NON-NLS-1$ //$NON-NLS-2$
- ICompilationUnit m_icu;
-
- IDocument m_doc;
-
- List m_tags;
-
- // Instance variables active when maybeCompleteAttribute is live.
- Token m_tagName;
-
- /**
- * Set of all attributes names encountered. Only live when maybeCompleteAttribute is live.
- */
- Set m_attSet = new TreeSet();
-
- /**
- * List of Attribute. Only live when maybeCompleAttribute is live.
- */
- List m_attributes = new ArrayList();
-
- AnnotationTagParser m_parser = new AnnotationTagParser(this);
-
- /**
- * Scope of the tag. TagSpec.TYPE | TagSpec.METHOD | TagSpec.FIELD. Not valid until
- * getAnnotationArea has been called for a completions request, and only then if
- * getAnnotationArea() did not return null.
- */
- int m_tagScope;
-
- public AnnotationTagCompletionProc() {
- initTagInfo();
- }
-
- private void initTagInfo() {
- if (m_tags == null)
- m_tags = AnnotationTagRegistry.getAllTagSpecs();
- }
-
- /*
- * (non-Javadoc)
- *
- * @see org.eclipse.jdt.ui.text.java.IJavadocCompletionProcessor#computeContextInformation(org.eclipse.jdt.core.ICompilationUnit,
- * int)
- */
- public IContextInformation[] computeContextInformation(ICompilationUnit cu, int offset) {
- return null;
- }
-
- /*
- * (non-Javadoc)
- *
- * @see org.eclipse.jdt.ui.text.java.IJavadocCompletionProcessor#computeCompletionProposals(org.eclipse.jdt.core.ICompilationUnit,
- * int, int, int)
- */
- public IJavaCompletionProposal[] computeCompletionProposals(ICompilationUnit cu, int offset, int length, int flags) {
- if (cu == null) //bug 262362
- return null;
- IEditorInput editorInput = new FileEditorInput((IFile) cu.getResource());
-
- // Set up completion processor state.
- m_doc = JavaUI.getDocumentProvider().getDocument(editorInput);
- m_icu = cu;
-
- try {
- AnnotationArea area = getAnnotationArea(offset);
-
- if (area == null) {
- return null;
- }
-
- // Check for tag completion first. ( the easier case )
- String tsf = getTagSoFarIfNotCompleted(area.beginOffset, offset);
-
- if (tsf != null) {
- return getTagCompletionsFor(tsf, area, length);
- }
-
- // Ach, have to try the harder case now, where we parse the
- // annotation
- return maybeCompleteAttribute(area, offset);
-
- } catch (JavaModelException e) {
- // Silently fail.
- return null;
- } catch (BadLocationException ex) {
- return null;
- }
- }
-
- private IJavaCompletionProposal[] maybeCompleteAttribute(AnnotationArea area, int cursorPos) throws BadLocationException {
- m_attSet.clear();
- m_attributes.clear();
-
- m_parser.setParserInput(m_doc.get(area.beginOffset, area.length()));
- m_parser.parse();
-
- TagSpec ts = null;
- if (m_tagName!=null)
- ts = getTagSpecForTagName(m_tagName.getText());
-
- // Do we even recognize this tag?
- if (ts == null) {
- return null;
- }
-
- // Loop through and determine whether the cursor is within a attribute
- // assignment, or between assignements.
- Attribute target = null;
- Attribute last = null;
- Attribute before = null;
- Attribute a = null;
- boolean between = false;
- int rCurPos = area.relativeCursorPos(cursorPos);
- Iterator i = m_attributes.iterator();
- while (i.hasNext()) {
- a = (Attribute) i.next();
-
- if (a.contains(rCurPos)) {
- target = a;
- break;
- } else if (last != null) {
- // See if the cursor is between, but not directly adjacent to
- // the last two attributes.
- if (rCurPos > last.maxExtent() + 1 && rCurPos < a.minExtent() - 1) {
- between = true;
- break;
- } else if (a.immediatelyPrecedes(rCurPos)) {
- before = a;
- break;
- }
- }
- last = a;
- }
-
- if (target == null) {
- if (between) {
- // If we're between attributes, suggest all possible attributes.
- return attributeCompletionsFor(ts, cursorPos, 0, "", true); //$NON-NLS-1$
- } else if (before != null) {
- // We're right after the attribute named in 'before', so set the
- // target to it, and fall
- // through to the target handling code.
- target = before;
- } else {
- // not between and not immediately after an attribute. We are
- // past the end of the parsed annotation.
- // Only offer suggestions if it looks like the last annotation
- // attribute is valid.
- if (a == null) {
- // No annotations attributes, suggest everything.
- return attributeCompletionsFor(ts, cursorPos, 0, "", true); //$NON-NLS-1$
- } else if (rCurPos > a.maxExtent()) {
- if (a.hasAssignment() && a.hasValue()) {
- // Last annotation was good, and we're past it, so do
- // completions for anything
- return attributeCompletionsFor(ts, cursorPos, 0, "", true); //$NON-NLS-1$
- } else if (a.hasAssignment())
- return attributeValidValuesFor(ts, a, area, cursorPos);
- else
- return attributeCompletionsFor(ts, cursorPos - a.name.length(), 0, a.name.getText(), true);
- } else {
- // Didn't match anything, not past the end - we're probably
- // the first attribute
- // being added to the tag.
- return attributeCompletionsFor(ts, cursorPos, 0, "", true); //$NON-NLS-1$
- }
- }
- }
-
- // Completion for a partial attribute name?
- if (target.name.immediatelyPrecedes(rCurPos)) {
- return attributeCompletionsFor(ts, area.relativeToAbs(target.name.getBeginning()), target.name.length(), target.name.getText(), !target.hasAssignment());
- }
-
- // Are we in the middle of a name?
- if (target.name.contains(rCurPos)) {
- // We've opted to replace the entire name for this case, which seems
- // to make the most sense.
- return attributeCompletionsFor(ts, area.relativeToAbs(target.name.getBeginning()), target.name.length(), target.name.getText().substring(0, rCurPos - target.name.getBeginning()), !target.hasAssignment());
- }
-
- // If we got this far, we're either in a value, or really confused.
- // try and return valid values or bail?
- if (a!= null && a.value != null && (a.value.contains(rCurPos) || (target.hasAssignment() && area.relativeCursorPos(cursorPos) > a.name.getBeginning())))
- return attributeValidValuesFor(ts, a, area, cursorPos);
- return attributeCompletionsFor(ts, cursorPos, 0, "", true); //$NON-NLS-1$
- }
-
- /**
- * @return valid values for the attribute
- */
- private IJavaCompletionProposal[] attributeValidValuesFor(TagSpec ts, Attribute a, AnnotationArea area, int cursorPos) {
- TagAttribSpec tas = ts.attributeNamed(a.name.getText());
- if (tas == null)
- return null;
- String[] validValues = getValidValues(tas, a, area);
- String partialValue = calculatePartialValue(a, area, cursorPos);
- int valueOffset = calculateValueOffset(a, area, cursorPos);
- if (validValues == null || validValues.length == 0)
- return createCustomAttributeCompletionProposals(ts, tas, partialValue, valueOffset, a.value.getText(), area.javaElement);
- return createAttributeCompletionProposals(partialValue, valueOffset, validValues);
- }
-
- /**
- * @param ts
- * @param tas
- * @param partialValue
- * @param valueOffset
- * @param value
- * @param javaElement
- * @return
- */
- private IJavaCompletionProposal[] createCustomAttributeCompletionProposals(TagSpec ts, TagAttribSpec tas, String partialValue, int valueOffset, String value, IJavaElement javaElement) {
- AttributeValuesHelper helper = ts.getValidValuesHelper();
- if (helper == null)
- return null;
- AttributeValueProposalHelper[] proposalHelpers = helper.getAttributeValueProposalHelpers(tas, partialValue, valueOffset, javaElement);
- if (proposalHelpers == null || proposalHelpers.length == 0)
- return null;
- IJavaCompletionProposal[] proposals = new IJavaCompletionProposal[proposalHelpers.length];
- AnnotationTagProposal proposal;
- for (int i = 0; i < proposalHelpers.length; i++) {
- proposal = new AnnotationTagProposal(proposalHelpers[i]);
- //proposal.setPartialValueString(partialValue);
- proposals[i] = proposal;
- }
- return proposals;
- }
-
- private IJavaCompletionProposal[] createAttributeCompletionProposals(String partialValue, int valueOffset, String[] validValues) {
- List resultingValues = new ArrayList();
- for (int i = 0; i < validValues.length; i++) {
- String rplString = validValues[i];
- if (partialValue != null && !rplString.startsWith(partialValue))
- continue;
- AnnotationTagProposal prop = new AnnotationTagProposal(rplString, valueOffset, 0, null, rplString, 90);
- prop.setEnsureQuoted(true);
- //prop.setPartialValueString(partialValue);
- resultingValues.add(prop);
- }
- if (resultingValues.isEmpty())
- return null;
- return (IJavaCompletionProposal[]) resultingValues.toArray(new IJavaCompletionProposal[resultingValues.size()]);
- }
-
- private String[] getValidValues(TagAttribSpec tas, Attribute a, AnnotationArea area) {
- String[] validValues = tas.getValidValues();
- if (validValues == null || validValues.length == 0) {
- AttributeValuesHelper helper = tas.getTagSpec().getValidValuesHelper();
- if (helper == null)
- return null;
- validValues = helper.getValidValues(tas, area.javaElement);
- if ((validValues == null || validValues.length == 0) && tas.valueIsBool())
- validValues = BOOLEAN_VALID_VALUES;
- }
- return validValues;
- }
-
- /**
- * @param a
- * @param area
- * @param cursorPos
- * @return
- */
- private int calculateValueOffset(Attribute a, AnnotationArea area, int cursorPos) {
- if (a.value == null)
- return cursorPos;
- int nameEnd = a.name.getEnd();
- int valBeg = a.value.getBeginning();
- if (valBeg > nameEnd + 2)
- return area.relativeToAbs(nameEnd + 2); //Value too far away to be correct.
- return area.relativeToAbs(valBeg);
- }
-
- /**
- * @param a
- * @param area
- * @param cursorPos
- * @return
- */
- private String calculatePartialValue(Attribute a, AnnotationArea area, int cursorPos) {
- if (a.value == null)
- return null;
- int nameEnd = a.name.getEnd();
- int valueBeg = a.value.getBeginning();
- if (valueBeg > nameEnd + 2)
- return null; //Value is too far away so it must not be part of this attribute.
- int relativePos = area.relativeCursorPos(cursorPos);
- if (a.value.contains(relativePos)) {
- boolean hasBeginQuote = valueBeg - nameEnd == 2;
- String value = a.value.getText();
- int end = relativePos - valueBeg;
- if (hasBeginQuote)
- end--;
- if (end > -1) {
- int length = value.length();
- if (end < length)
- return value.substring(0, end);
- else if (end == length)
- return value;
- }
- }
- return null;
- }
-
- /**
- * @param tagName
- * @return
- */
- private TagSpec getTagSpecForTagName(String tagName) {
- String simpleName = tagName;
- if (tagName != null && tagName.length() > 0 && tagName.charAt(0) == '@')
- simpleName = tagName.length() == 2 ? "" : tagName.substring(1); //$NON-NLS-1$
- switch (m_tagScope) {
- case TagSpec.TYPE :
- return AnnotationTagRegistry.getTypeTag(simpleName);
- case TagSpec.METHOD :
- return AnnotationTagRegistry.getMethodTag(simpleName);
- case TagSpec.FIELD :
- return AnnotationTagRegistry.getFieldTag(simpleName);
- }
- return null;
- }
-
- private IJavaCompletionProposal[] attributeCompletionsFor(TagSpec ts, int replaceOffset, int replaceLength, String partialAttributeName, boolean appendEquals) {
- Iterator i = ts.getAttributes().iterator();
- List props = new ArrayList();
- while (i.hasNext()) {
- TagAttribSpec tas = (TagAttribSpec) i.next();
- String aname = tas.getAttribName();
-
- // Don't suggest attributes that have already been specified.
- if (!m_attSet.contains(aname)) {
- if (aname.startsWith(partialAttributeName)) {
- String rtxt = appendEquals ? aname + '=' : aname;
- AnnotationTagProposal prop = new AnnotationTagProposal(rtxt, replaceOffset, replaceLength, null, aname, 90);
- prop.setHelpText(lookupAttHelp(tas));
- props.add(prop);
- }
- }
- }
- if (props.isEmpty()) {
- return null;
- }
- return (IJavaCompletionProposal[]) props.toArray(new IJavaCompletionProposal[props.size()]);
- }
-
- /*
- * (non-Javadoc)
- *
- * @see com.ibm.ws.rd.annotations.TagParseEventHandler#annotationTag(com.ibm.ws.rd.annotations.Token)
- */
- public void annotationTag(Token tag) {
- m_tagName = tag;
- }
-
- /*
- * (non-Javadoc)
- *
- * @see com.ibm.ws.rd.annotations.TagParseEventHandler#endOfTag(int)
- */
- public void endOfTag(int pos) {
- // Do nothing
- }
-
- /*
- * (non-Javadoc)
- *
- * @see com.ibm.ws.rd.annotations.TagParseEventHandler#attribute(com.ibm.ws.rd.annotations.Token,
- * int, com.ibm.ws.rd.annotations.Token)
- */
- public void attribute(Token name, int equalsPosition, Token value) {
- m_attributes.add(new Attribute(name, equalsPosition, value));
- m_attSet.add(name.getText());
- }
-
- private String getReplacementForTag(TagSpec ts, int beginIndex) {
- StringBuffer bud = new StringBuffer(32);
-
- bud.append('@');
- bud.append(ts.getTagName());
-
- String prefix = getArrayPrefixForMultipleAttribs(beginIndex);
- List attributes = ts.getAttributes();
-
- for (int i = 0; i < attributes.size(); i++) {
- TagAttribSpec tas = (TagAttribSpec) attributes.get(i);
-
- if (tas.isRequired()) {
- bud.append(prefix);
- bud.append(tas.getAttribName());
- bud.append('=');
- }
- }
- return bud.toString();
- }
-
- private String getArrayPrefixForMultipleAttribs(int beginIndex) {
- String result = null;
- String source = null;
- // Get source from compilation unit
- try {
- source = m_icu.getSource();
- if (source == null || beginIndex < 0)
- return result;
- // trim off everything after our begin index
- source = source.substring(0, beginIndex + 1);
- int newLineIndex = source.lastIndexOf('\n');
- //if we are on first line...
- if (newLineIndex == -1)
- newLineIndex = 0;
- // Get the current line
- String currentLine = source.substring(newLineIndex, beginIndex + 1);
- // Currently we have to have the '@' sign to show our menu
- int annotationIndex = currentLine.lastIndexOf('@');
- result = currentLine.substring(0, annotationIndex);
- result = result + " "; //$NON-NLS-1$
- } catch (Exception e) {
- // Do nothing
- }
-
- return result;
- }
-
- private IJavaCompletionProposal[] getTagCompletionsFor(String partialTagName, AnnotationArea area, int selectLength) {
- List found = new ArrayList();
-
- for (int i = 0; i < m_tags.size(); i++) {
- TagSpec ts = (TagSpec) m_tags.get(i);
- String tname = ts.getTagName();
-
- if (ts.getScope() == m_tagScope && tname.startsWith(partialTagName)) {
- String rtxt = getReplacementForTag(ts, area.beginOffset);
- String labl = '@' + tname;
- AnnotationTagProposal prop = new AnnotationTagProposal(rtxt, area.beginOffset, Math.max(selectLength, rtxt.length()), null, labl, 90);
- prop.setHelpText(lookupTagHelp(ts));
- found.add(prop);
- }
- }
-
- if (!found.isEmpty()) {
- return (IJavaCompletionProposal[]) found.toArray(new IJavaCompletionProposal[found.size()]);
- }
- return null;
- }
-
- /*
- * (non-Javadoc)
- *
- * @see org.eclipse.jdt.ui.text.java.IJavadocCompletionProcessor#getErrorMessage()
- */
- public String getErrorMessage() {
- return null;
- }
-
- private static boolean isWS1(char c) {
- return c == ' ' || c == '\t' || c == '*' || c == '\r' || c == '\n';
- }
-
- private String getTagSoFarIfNotCompleted(int startingAt, int cursorAt) throws BadLocationException {
- if (m_doc.getChar(startingAt) != '@') {
- return null;
- }
-
- int firstChar = startingAt + 1;
-
- if (firstChar == cursorAt) {
- return ""; //$NON-NLS-1$
- }
-
- for (int i = firstChar; i < cursorAt; i++) {
- char c = m_doc.getChar(i);
-
- if (isWS1(c)) {
- return null;
- }
- }
-
- return m_doc.get(firstChar, cursorAt - firstChar);
- }
-
- /**
- * Calculates the the area of the annotation we're trying to complete. Also initializes
- * m_tagScope.
- *
- * @param fromOffset
- * @return
- * @throws JavaModelException
- */
- private AnnotationArea getAnnotationArea(int fromOffset) throws JavaModelException {
- // First, roughly calculate the end of the comment.
- IJavaElement el = m_icu.getElementAt(fromOffset);
- int absmax, absmin;
- if (el == null)
- return null;
- int ty = el.getElementType();
-
- switch (ty) {
- case IJavaElement.FIELD :
- IField f = (IField) el;
- absmax = f.getNameRange().getOffset();
- absmin = f.getSourceRange().getOffset();
- m_tagScope = TagSpec.FIELD;
- break;
-
- case IJavaElement.TYPE :
- IType t = (IType) el;
- absmax = t.getNameRange().getOffset();
- absmin = t.getSourceRange().getOffset();
- m_tagScope = TagSpec.TYPE;
- break;
-
- case IJavaElement.METHOD :
- IMethod m = (IMethod) el;
- absmax = m.getNameRange().getOffset();
- absmin = m.getSourceRange().getOffset();
- m_tagScope = TagSpec.METHOD;
- break;
-
- default :
- m_tagScope = -1;
- return null;
- }
-
- // Make sure we're not after the name for the member.
- if (absmax < fromOffset) {
- return null;
- }
-
- int min = 0, max = 0;
- try {
- // Search backwards for the starting '@'.
- boolean found = false;
- for (min = fromOffset; min >= absmin; min--) {
- if (m_doc.getChar(min) == '@') {
- found = true;
- break;
- }
- }
- if (!found) {
- return null;
- }
-
- // Search forwards for the next '@', or the end of the comment.
- for (max = fromOffset + 1; max < absmax; max++) {
- if (m_doc.getChar(max) == '@') {
- break;
- }
- }
- } catch (BadLocationException e) {
- return null;
- }
-
- return new AnnotationArea(el, min, Math.min(absmax, max));
- }
-
- private String lookupTagHelp(TagSpec ts) {
- if (ts != null)
- try {
- return ts.lookupTagHelp();
- } catch (MissingResourceException e) {
- // Do nothing, return null
- }
- return null;
- }
-
- private String lookupAttHelp(TagAttribSpec tas) {
- if (tas != null)
- try {
- return tas.lookupTagHelp();
- } catch (MissingResourceException e) {
- // Do nothing, return null
- }
- return null;
- }
-
- /**
- * A range that goes from the beginning position up to, but not including, the end position.
- */
- private static class AnnotationArea {
- /**
- * Document offset of the beginning of the javadoc annotation.
- */
- int beginOffset;
-
- /**
- * Document offset of the end of the area that could contain an annotation.
- */
- int endOffset;
- /**
- * The Java element that this annotation is assigned.
- *
- * @param beg
- * @param end
- */
- IJavaElement javaElement;
-
- public AnnotationArea(IJavaElement javaElement, int beg, int end) {
- this.javaElement = javaElement;
- beginOffset = beg;
- endOffset = end;
- }
-
- public int length() {
- return endOffset - beginOffset;
- }
-
- /**
- * Returns the cursor position relative to the area. Only valid if
- * <code>this.contains( absCursorPos )</code>
- *
- * @param absCursorPos
- * @return
- */
- public int relativeCursorPos(int absCursorPos) {
- return absCursorPos - beginOffset;
- }
-
- public int relativeToAbs(int relPos) {
- return beginOffset + relPos;
- }
- }
-
- private static class Attribute {
- Token name;
-
- Token value;
-
- int equalsPos;
-
- Attribute(Token n, int ep, Token v) {
- name = n;
- value = v;
- equalsPos = ep;
- }
-
- public boolean hasAssignment() {
- return equalsPos != -1;
- }
-
- public boolean hasValue() {
- return value.length() != 0;
- }
-
- public boolean contains(int srcPos) {
- return srcPos >= minExtent() && srcPos <= maxExtent();
- }
-
- public int minExtent() {
- return name.getBeginning();
- }
-
- public int maxExtent() {
- if (hasAssignment()) {
- if (hasValue())
- return value.getEnd();
- return equalsPos;
- }
- return name.getEnd();
- }
-
- public boolean immediatelyPrecedes(int pos) {
- return maxExtent() + 1 == pos;
- }
- }
-
-}
\ No newline at end of file
diff --git a/plugins/org.eclipse.jst.common.annotations.ui/src/org/eclipse/jst/common/internal/annotations/ui/AnnotationTagProposal.java b/plugins/org.eclipse.jst.common.annotations.ui/src/org/eclipse/jst/common/internal/annotations/ui/AnnotationTagProposal.java
deleted file mode 100644
index fb1223d..0000000
--- a/plugins/org.eclipse.jst.common.annotations.ui/src/org/eclipse/jst/common/internal/annotations/ui/AnnotationTagProposal.java
+++ /dev/null
@@ -1,209 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2003, 2004 IBM Corporation and others.
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
- *
- * Contributors:
- * IBM Corporation - initial API and implementation
- *******************************************************************************/
-/*
- * Created on Sep 4, 2003
- *
- * To change the template for this generated file go to
- * Window>Preferences>Java>Code Generation>Code and Comments
- */
-package org.eclipse.jst.common.internal.annotations.ui;
-
-import org.eclipse.core.runtime.Assert;
-import org.eclipse.jdt.ui.text.java.IJavaCompletionProposal;
-import org.eclipse.jface.text.BadLocationException;
-import org.eclipse.jface.text.IDocument;
-import org.eclipse.jface.text.contentassist.ICompletionProposalExtension;
-import org.eclipse.jface.text.contentassist.ICompletionProposalExtension2;
-import org.eclipse.jst.common.internal.annotations.registry.AttributeValueProposalHelper;
-import org.eclipse.swt.graphics.Image;
-
-
-/**
- * @author kelleyp
- *
- * A completion proposal especially for Annotation tag completions. This problem this class was
- * created to solve was the problem of attaching help text to a proposal. The mechanism inside of
- * JavaCompletionProposal was useless to us, since it was tied to the idea that the proposal would
- * be for an actual java element, that has javadoc attached to it, etc... So here we subclass
- * JavaCompletionProposal and override <code>getAdditionalProposalInfo</code> for a more suitable
- * way of associating help text with a proposal.
- */
-public class AnnotationTagProposal extends AbstractAnnotationTagProposal implements IJavaCompletionProposal, ICompletionProposalExtension, ICompletionProposalExtension2 {
- private static final char QUOTE = '"';
- private boolean ensureBeginQuote = false;
- private boolean ensureEndQuote = false;
- private String localString;
- //String used to validate the prefix.
- private String fValidationString;
-
- /**
- * Localized help text.
- */
- private String locText;
-
- /**
- *
- * @param replacementString
- * @param replacementOffset
- * @param replacementLength
- * @param image
- * @param displayString
- * @param relevance
- */
- public AnnotationTagProposal(String replacementString, int replacementOffset, int replacementLength, Image image, String displayString, int relevance) {
- Assert.isNotNull(replacementString);
- Assert.isTrue(replacementOffset >= 0);
- Assert.isTrue(replacementLength >= 0);
-
- setReplacementString(replacementString);
- setReplacementOffset(replacementOffset);
- setReplacementLength(replacementLength);
- setImage(image);
- setDisplayString(displayString == null ? replacementString : displayString);
- setRelevance(relevance);
- setCursorPosition(replacementString.length());
- setSortString(displayString == null ? replacementString : displayString);
- this.localString = replacementString;
- }
-
- /**
- * @see org.eclipse.jdt.internal.ui.text.java.JavaCompletionProposal#JavaCompletionProposal(java.lang.String, int, int,
- * org.eclipse.swt.graphics.Image, java.lang.String, int,
- * org.eclipse.jface.text.ITextViewer)
- * @param replacementString
- * @param replacementOffset
- * @param replacementLength
- * @param image
- * @param displayString
- * @param relevance
- */
-
- public AnnotationTagProposal(AttributeValueProposalHelper proposalHelper) {
- this(proposalHelper.getReplacementString(), proposalHelper.getValueOffset(), proposalHelper.getReplacementLength(), null, proposalHelper.getValueDisplayString(), 90);
- if (proposalHelper instanceof UIAttributeValueProposalHelper)
- setImage(((UIAttributeValueProposalHelper) proposalHelper).getImage());
- setEnsureBeginQuote(proposalHelper.ensureBeginQuote());
- setEnsureEndQuote(proposalHelper.ensureEndQuote());
- }
-
- public AnnotationTagProposal(UIAttributeValueProposalHelper proposalHelper) {
- this(proposalHelper.getReplacementString(), proposalHelper.getValueOffset(), proposalHelper.getReplacementLength(), proposalHelper.getImage(), proposalHelper.getValueDisplayString(), 90);
- setEnsureBeginQuote(proposalHelper.ensureBeginQuote());
- setEnsureEndQuote(proposalHelper.ensureEndQuote());
- }
-
- /**
- * Our override that uses <code>textHolder</code> to provide the help text.
- */
- @Override
- public String getAdditionalProposalInfo() {
- return locText;
- }
-
- /**
- * Sets the holder of the help text that can be displayed with this proposal.
- *
- * @param hld
- * an LocalizedTextContainer
- */
- public void setHelpText(String s) {
- locText = s;
- }
-
- /*
- * (non-Javadoc)
- *
- * @see org.eclipse.jdt.internal.ui.text.java.JavaCompletionProposal#apply(org.eclipse.jface.text.IDocument,
- * char, int)
- */
- @Override
- public void apply(IDocument document, char trigger, int offset) {
- ensureQuotedIfNecessary(document, offset);
- super.apply(document, trigger, offset);
- }
-
- /**
- * @param document
- * @param offset
- */
- private void ensureQuotedIfNecessary(IDocument document, int offset) {
- if (ensureBeginQuote || ensureEndQuote) {
- try {
- char begin = document.getChar(getReplacementOffset() - 1);
- char end = document.getChar(offset);
- if (ensureBeginQuote && ensureEndQuote && begin != QUOTE && end != QUOTE) {
- StringBuffer b = new StringBuffer();
- b.append(QUOTE).append(localString).append(QUOTE);
- localString = b.toString();
- } else if (ensureBeginQuote && begin != QUOTE)
- localString = QUOTE + localString;
- else if (ensureEndQuote && end != QUOTE)
- localString = localString + QUOTE;
- setReplacementString(localString);
- setCursorPosition(localString.length());
- } catch (BadLocationException e) {
- // Do nothing
- }
- }
- }
-
- public void setEnsureQuoted(boolean ensureQuoted) {
- setEnsureBeginQuote(ensureQuoted);
- setEnsureEndQuote(ensureQuoted);
- }
-
- //public void setPartialValueString(String partialValueString) {
- // this.partialValueString = partialValueString;
- //}
- public void setEnsureBeginQuote(boolean ensureBeginQuote) {
- this.ensureBeginQuote = ensureBeginQuote;
- }
-
- public void setEnsureEndQuote(boolean ensureEndQuote) {
- this.ensureEndQuote = ensureEndQuote;
- }
-
- @Override
- protected boolean isValidPrefix(String prefix) {
- if (getReplacementString().startsWith(getDisplayString())) {
- return super.isValidPrefix(prefix);
- }
- return super.isPrefix(trim(prefix), getValidationString());
- }
-
- private String getValidationString() {
- if (fValidationString == null) {
- fValidationString = trim(getReplacementString());
- }
- return fValidationString;
- }
-
-
- /*
- * It is possible that the replacement string is complex and larger than the prefix.
- * In this case we want to trim the prefix to the last whitespace character. This
- * will provide us with a prefix to use when matching the display string.
- */
- private String trim(String aString) {
- if (aString == null || aString.length() == 0)
- return aString;
- StringBuffer buffer = new StringBuffer();
- char[] chars = aString.toCharArray();
- for (int i = chars.length - 1; i > -1; i--) {
- if (Character.isWhitespace(chars[i])) {
- break;
- }
- buffer.append(chars[i]);
- }
- buffer = buffer.reverse();
- return buffer.toString();
- }
-}
\ No newline at end of file
diff --git a/plugins/org.eclipse.jst.common.annotations.ui/src/org/eclipse/jst/common/internal/annotations/ui/IWRDResources.java b/plugins/org.eclipse.jst.common.annotations.ui/src/org/eclipse/jst/common/internal/annotations/ui/IWRDResources.java
deleted file mode 100644
index 6ef86fa..0000000
--- a/plugins/org.eclipse.jst.common.annotations.ui/src/org/eclipse/jst/common/internal/annotations/ui/IWRDResources.java
+++ /dev/null
@@ -1,29 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2000, 2005 IBM Corporation and others.
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
- *
- * Contributors:
- * IBM Corporation - initial API and implementation
- *******************************************************************************/
-package org.eclipse.jst.common.internal.annotations.ui;
-
-import org.eclipse.osgi.util.NLS;
-
-public final class IWRDResources extends NLS {
-
- private static final String BUNDLE_NAME = "org.eclipse.jst.common.internal.annotations.ui.taghandlerui";//$NON-NLS-1$
-
- private IWRDResources() {
- // Do not instantiate
- }
-
- public static String J2EEAnnotationsCompletionProcessor_3;
- public static String J2EEAnnotationsCompletionProcessor_4;
-
- static {
- NLS.initializeMessages(BUNDLE_NAME, IWRDResources.class);
- }
-}
\ No newline at end of file
diff --git a/plugins/org.eclipse.jst.common.annotations.ui/src/org/eclipse/jst/common/internal/annotations/ui/UIAttributeValueProposalHelper.java b/plugins/org.eclipse.jst.common.annotations.ui/src/org/eclipse/jst/common/internal/annotations/ui/UIAttributeValueProposalHelper.java
deleted file mode 100644
index d595384..0000000
--- a/plugins/org.eclipse.jst.common.annotations.ui/src/org/eclipse/jst/common/internal/annotations/ui/UIAttributeValueProposalHelper.java
+++ /dev/null
@@ -1,41 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2003, 2004 IBM Corporation and others.
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
- *
- * Contributors:
- * IBM Corporation - initial API and implementation
- *******************************************************************************/
-package org.eclipse.jst.common.internal.annotations.ui;
-
-import org.eclipse.jst.common.internal.annotations.registry.AttributeValueProposalHelper;
-import org.eclipse.swt.graphics.Image;
-
-
-/**
- * @author DABERG
- *
- */
-public class UIAttributeValueProposalHelper extends AttributeValueProposalHelper {
- private Image image;
-
- /**
- * @param replacementString
- * @param valueOffset
- * @param replacementLength
- * @param valueDisplayString
- */
- public UIAttributeValueProposalHelper(String replacementString, int valueOffset, int replacementLength, String valueDisplayString) {
- super(replacementString, valueOffset, replacementLength, valueDisplayString);
- }
-
- public Image getImage() {
- return image;
- }
-
- public void setImage(Image image) {
- this.image = image;
- }
-}
\ No newline at end of file
diff --git a/plugins/org.eclipse.jst.common.annotations.ui/src/org/eclipse/jst/common/internal/annotations/ui/UiPlugin.java b/plugins/org.eclipse.jst.common.annotations.ui/src/org/eclipse/jst/common/internal/annotations/ui/UiPlugin.java
deleted file mode 100644
index 7587aaf..0000000
--- a/plugins/org.eclipse.jst.common.annotations.ui/src/org/eclipse/jst/common/internal/annotations/ui/UiPlugin.java
+++ /dev/null
@@ -1,88 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2003, 2004 IBM Corporation and others.
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
- *
- * Contributors:
- * IBM Corporation - initial API and implementation
- *******************************************************************************/
-package org.eclipse.jst.common.internal.annotations.ui;
-
-import java.util.MissingResourceException;
-import java.util.ResourceBundle;
-
-import org.eclipse.ui.plugin.AbstractUIPlugin;
-import org.eclipse.core.runtime.Status;
-import org.eclipse.core.runtime.IStatus;
-import org.eclipse.core.runtime.Platform;
-import java.lang.Throwable;
-import org.eclipse.core.runtime.CoreException;
-
-/**
- * The main plugin class to be used in the desktop.
- */
-public class UiPlugin extends AbstractUIPlugin {
- //the ID for this plugin (added automatically by logging quickfix)
- public static final String PLUGIN_ID = "org.eclipse.jst.common.annotations.ui"; //$NON-NLS-1$
- //The shared instance.
- private static UiPlugin plugin;
- //Resource bundle.
- private ResourceBundle resourceBundle;
-
- /**
- * The constructor.
- */
- public UiPlugin() {
- super();
- plugin = this;
- try {
- resourceBundle = ResourceBundle.getBundle("org.eclipse.wst.common.internal.annotations.ui.UiPluginResources"); //$NON-NLS-1$
- } catch (MissingResourceException x) {
- resourceBundle = null;
- }
- }
-
- /**
- * Returns the shared instance.
- */
- public static UiPlugin getDefault() {
- return plugin;
- }
-
- /**
- * Returns the string from the plugin's resource bundle, or 'key' if not found.
- */
- public static String getResourceString(String key) {
- ResourceBundle bundle = UiPlugin.getDefault().getResourceBundle();
- try {
- return (bundle != null) ? bundle.getString(key) : key;
- } catch (MissingResourceException e) {
- return key;
- }
- }
-
- /**
- * Returns the plugin's resource bundle,
- */
- public ResourceBundle getResourceBundle() {
- return resourceBundle;
- }
-
- public static IStatus createStatus(int severity, String message, Throwable exception) {
- return new Status(severity, PLUGIN_ID, message, exception);
- }
-
- public static IStatus createStatus(int severity, String message) {
- return createStatus(severity, message, null);
- }
-
- public static void logError(Throwable exception) {
- Platform.getLog(Platform.getBundle(PLUGIN_ID)).log( createStatus(IStatus.ERROR, exception.getMessage(), exception));
- }
-
- public static void logError(CoreException exception) {
- Platform.getLog(Platform.getBundle(PLUGIN_ID)).log( exception.getStatus() );
- }
-}
\ No newline at end of file
diff --git a/plugins/org.eclipse.jst.common.frameworks/.classpath b/plugins/org.eclipse.jst.common.frameworks/.classpath
deleted file mode 100644
index 146c1a8..0000000
--- a/plugins/org.eclipse.jst.common.frameworks/.classpath
+++ /dev/null
@@ -1,12 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<classpath>
- <classpathentry kind="src" path="src"/>
- <classpathentry kind="con" path="org.eclipse.jdt.launching.JRE_CONTAINER/org.eclipse.jdt.internal.debug.ui.launcher.StandardVMType/J2SE-1.5"/>
- <classpathentry kind="con" path="org.eclipse.pde.core.requiredPlugins">
- <accessrules>
- <accessrule kind="accessible" pattern="org/eclipse/wst/common/**"/>
- <accessrule kind="accessible" pattern="org/eclipse/wst/validation/**"/>
- </accessrules>
- </classpathentry>
- <classpathentry kind="output" path="bin"/>
-</classpath>
diff --git a/plugins/org.eclipse.jst.common.frameworks/.cvsignore b/plugins/org.eclipse.jst.common.frameworks/.cvsignore
deleted file mode 100644
index 2bd29c0..0000000
--- a/plugins/org.eclipse.jst.common.frameworks/.cvsignore
+++ /dev/null
@@ -1,7 +0,0 @@
-bin
-temp.folder
-build.xml
-jdt_integration.jar
-@dot
-src.zip
-javaCompiler...args
diff --git a/plugins/org.eclipse.jst.common.frameworks/.project b/plugins/org.eclipse.jst.common.frameworks/.project
deleted file mode 100644
index 22c0bcb..0000000
--- a/plugins/org.eclipse.jst.common.frameworks/.project
+++ /dev/null
@@ -1,28 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<projectDescription>
- <name>org.eclipse.jst.common.frameworks</name>
- <comment></comment>
- <projects>
- </projects>
- <buildSpec>
- <buildCommand>
- <name>org.eclipse.jdt.core.javabuilder</name>
- <arguments>
- </arguments>
- </buildCommand>
- <buildCommand>
- <name>org.eclipse.pde.ManifestBuilder</name>
- <arguments>
- </arguments>
- </buildCommand>
- <buildCommand>
- <name>org.eclipse.pde.SchemaBuilder</name>
- <arguments>
- </arguments>
- </buildCommand>
- </buildSpec>
- <natures>
- <nature>org.eclipse.pde.PluginNature</nature>
- <nature>org.eclipse.jdt.core.javanature</nature>
- </natures>
-</projectDescription>
diff --git a/plugins/org.eclipse.jst.common.frameworks/.settings/org.eclipse.jdt.core.prefs b/plugins/org.eclipse.jst.common.frameworks/.settings/org.eclipse.jdt.core.prefs
deleted file mode 100644
index 037a4e5..0000000
--- a/plugins/org.eclipse.jst.common.frameworks/.settings/org.eclipse.jdt.core.prefs
+++ /dev/null
@@ -1,95 +0,0 @@
-#Mon Jun 08 15:35:45 EDT 2009
-org.eclipse.jdt.core.compiler.problem.unusedParameterWhenImplementingAbstract=disabled
-org.eclipse.jdt.core.compiler.problem.comparingIdentical=error
-org.eclipse.jdt.core.compiler.problem.unnecessaryElse=error
-org.eclipse.jdt.core.compiler.problem.redundantSuperinterface=error
-org.eclipse.jdt.core.compiler.problem.unusedLocal=error
-org.eclipse.jdt.core.compiler.problem.emptyStatement=error
-org.eclipse.jdt.core.compiler.problem.unusedLabel=error
-org.eclipse.jdt.core.compiler.problem.unusedParameter=warning
-org.eclipse.jdt.core.compiler.problem.rawTypeReference=warning
-org.eclipse.jdt.core.incompatibleJDKLevel=ignore
-org.eclipse.jdt.core.compiler.problem.incompatibleNonInheritedInterfaceMethod=error
-org.eclipse.jdt.core.compiler.debug.lineNumber=generate
-org.eclipse.jdt.core.compiler.problem.unusedDeclaredThrownException=warning
-org.eclipse.jdt.core.builder.cleanOutputFolder=clean
-org.eclipse.jdt.core.compiler.problem.unusedWarningToken=warning
-org.eclipse.jdt.core.compiler.problem.noImplicitStringConversion=error
-org.eclipse.jdt.core.compiler.problem.deprecationInDeprecatedCode=enabled
-org.eclipse.jdt.core.compiler.problem.deprecation=warning
-org.eclipse.jdt.core.compiler.problem.unusedParameterWhenOverridingConcrete=disabled
-org.eclipse.jdt.core.compiler.problem.missingSynchronizedOnInheritedMethod=error
-org.eclipse.jdt.core.compiler.problem.deprecationWhenOverridingDeprecatedMethod=enabled
-org.eclipse.jdt.core.compiler.problem.redundantNullCheck=error
-org.eclipse.jdt.core.compiler.problem.unusedImport=error
-org.eclipse.jdt.core.builder.recreateModifiedClassFileInOutputFolder=ignore
-org.eclipse.jdt.core.builder.resourceCopyExclusionFilter=*.launch
-org.eclipse.jdt.core.classpath.multipleOutputLocations=enabled
-org.eclipse.jdt.core.compiler.problem.suppressWarnings=enabled
-org.eclipse.jdt.core.compiler.problem.typeParameterHiding=error
-org.eclipse.jdt.core.builder.invalidClasspath=abort
-org.eclipse.jdt.core.compiler.problem.localVariableHiding=warning
-org.eclipse.jdt.core.compiler.problem.possibleAccidentalBooleanAssignment=error
-org.eclipse.jdt.core.compiler.problem.missingHashCodeMethod=error
-org.eclipse.jdt.core.codeComplete.argumentSuffixes=
-org.eclipse.jdt.core.codeComplete.argumentPrefixes=
-org.eclipse.jdt.core.compiler.problem.indirectStaticAccess=ignore
-org.eclipse.jdt.core.compiler.problem.potentialNullReference=error
-org.eclipse.jdt.core.compiler.codegen.inlineJsrBytecode=enabled
-org.eclipse.jdt.core.compiler.problem.finalParameterBound=warning
-org.eclipse.jdt.core.compiler.problem.missingSerialVersion=error
-org.eclipse.jdt.core.compiler.problem.nullReference=error
-org.eclipse.jdt.core.compiler.source=1.5
-org.eclipse.jdt.core.compiler.problem.enumIdentifier=error
-org.eclipse.jdt.core.compiler.problem.syntheticAccessEmulation=ignore
-org.eclipse.jdt.core.builder.duplicateResourceTask=warning
-org.eclipse.jdt.core.compiler.problem.fieldHiding=error
-org.eclipse.jdt.core.compiler.problem.unusedDeclaredThrownExceptionExemptExceptionAndThrowable=enabled
-org.eclipse.jdt.core.compiler.problem.missingOverrideAnnotation=error
-org.eclipse.jdt.core.compiler.problem.hiddenCatchBlock=error
-org.eclipse.jdt.core.compiler.problem.overridingPackageDefaultMethod=error
-org.eclipse.jdt.core.compiler.problem.finallyBlockNotCompletingNormally=error
-org.eclipse.jdt.core.compiler.problem.undocumentedEmptyBlock=warning
-org.eclipse.jdt.core.classpath.exclusionPatterns=enabled
-org.eclipse.jdt.core.compiler.problem.methodWithConstructorName=error
-org.eclipse.jdt.core.compiler.problem.discouragedReference=warning
-org.eclipse.jdt.core.compiler.problem.unqualifiedFieldAccess=ignore
-org.eclipse.jdt.core.compiler.problem.incompleteEnumSwitch=error
-eclipse.preferences.version=1
-org.eclipse.jdt.core.incompleteClasspath=error
-org.eclipse.jdt.core.compiler.problem.unnecessaryTypeCheck=error
-org.eclipse.jdt.core.compiler.problem.deadCode=error
-org.eclipse.jdt.core.compiler.problem.specialParameterHidingField=enabled
-org.eclipse.jdt.core.compiler.problem.fatalOptionalError=enabled
-org.eclipse.jdt.core.compiler.problem.noEffectAssignment=error
-org.eclipse.jdt.core.compiler.debug.sourceFile=generate
-org.eclipse.jdt.core.compiler.problem.unusedDeclaredThrownExceptionIncludeUncheckedExceptions=disabled
-org.eclipse.jdt.core.compiler.problem.missingDeprecatedAnnotation=warning
-org.eclipse.jdt.core.codeComplete.fieldPrefixes=
-org.eclipse.jdt.core.compiler.problem.fallthroughCase=error
-org.eclipse.jdt.core.compiler.codegen.targetPlatform=1.5
-org.eclipse.jdt.core.compiler.problem.unusedPrivateMember=error
-org.eclipse.jdt.core.compiler.problem.autoboxing=warning
-org.eclipse.jdt.core.circularClasspath=error
-org.eclipse.jdt.core.compiler.problem.annotationSuperInterface=warning
-org.eclipse.jdt.core.compiler.problem.nonExternalizedStringLiteral=error
-org.eclipse.jdt.core.codeComplete.fieldSuffixes=
-org.eclipse.jdt.core.codeComplete.localSuffixes=
-org.eclipse.jdt.core.compiler.problem.parameterAssignment=error
-org.eclipse.jdt.core.compiler.problem.staticAccessReceiver=error
-org.eclipse.jdt.core.codeComplete.localPrefixes=
-org.eclipse.jdt.core.compiler.problem.unusedDeclaredThrownExceptionIncludeDocCommentReference=enabled
-org.eclipse.jdt.core.compiler.maxProblemPerUnit=100
-org.eclipse.jdt.core.compiler.problem.varargsArgumentNeedCast=error
-org.eclipse.jdt.core.compiler.problem.assertIdentifier=error
-org.eclipse.jdt.core.compiler.compliance=1.5
-org.eclipse.jdt.core.compiler.problem.unusedParameterIncludeDocCommentReference=enabled
-org.eclipse.jdt.core.codeComplete.staticFieldPrefixes=
-org.eclipse.jdt.core.compiler.debug.localVariable=generate
-org.eclipse.jdt.core.compiler.problem.unhandledWarningToken=warning
-instance/org.eclipse.core.net/org.eclipse.core.net.hasMigrated=true
-org.eclipse.jdt.core.compiler.problem.forbiddenReference=error
-org.eclipse.jdt.core.compiler.codegen.unusedLocal=preserve
-org.eclipse.jdt.core.compiler.problem.uncheckedTypeOperation=warning
-org.eclipse.jdt.core.compiler.problem.unusedDeclaredThrownExceptionWhenOverriding=disabled
-org.eclipse.jdt.core.codeComplete.staticFieldSuffixes=
diff --git a/plugins/org.eclipse.jst.common.frameworks/META-INF/MANIFEST.MF b/plugins/org.eclipse.jst.common.frameworks/META-INF/MANIFEST.MF
deleted file mode 100644
index a84da88..0000000
--- a/plugins/org.eclipse.jst.common.frameworks/META-INF/MANIFEST.MF
+++ /dev/null
@@ -1,34 +0,0 @@
-Manifest-Version: 1.0
-Bundle-ManifestVersion: 2
-Bundle-Name: %pluginName
-Bundle-SymbolicName: org.eclipse.jst.common.frameworks; singleton:=true
-Bundle-Version: 1.1.403.qualifier
-Bundle-Vendor: %pluginVendor
-Bundle-Localization: plugin
-Export-Package:
- org.eclipse.jst.common.frameworks,
- org.eclipse.jst.common.internal.modulecore;x-internal:=true,
- org.eclipse.jst.common.internal.modulecore.util;x-internal:=true,
- org.eclipse.jst.common.jdt.internal.classpath;x-internal:=true,
- org.eclipse.jst.common.jdt.internal.integration;x-internal:=true,
- org.eclipse.jst.common.jdt.internal.javalite,
- org.eclipse.jst.common.project.facet
-Require-Bundle: org.eclipse.core.runtime;bundle-version="[3.2.0,4.0.0)",
- org.eclipse.jdt.core;bundle-version="[3.2.0,4.0.0)",
- org.eclipse.jdt.launching;bundle-version="[3.2.0,4.0.0)",
- org.eclipse.emf.ecore;bundle-version="[2.2.0,3.0.0)",
- org.eclipse.emf.ecore.xmi;bundle-version="[2.2.0,3.0.0)",
- org.eclipse.wst.common.frameworks;bundle-version="[1.2.0,2.0.0)",
- org.eclipse.wst.common.modulecore;bundle-version="[1.2.0,2.0.0)",
- org.eclipse.jem.util;bundle-version="[2.0.0,3.0.0)",
- org.eclipse.core.resources;bundle-version="[3.2.0,4.0.0)",
- org.eclipse.wst.common.emf;bundle-version="[1.2.0,2.0.0)",
- org.eclipse.core.commands;bundle-version="[3.2.0,4.0.0)",
- org.eclipse.wst.common.emfworkbench.integration;bundle-version="[1.2.0,2.0.0)",
- org.eclipse.wst.validation;bundle-version="[1.2.0,2.0.0)",
- org.eclipse.wst.common.project.facet.core;bundle-version="[1.3.0,2.0.0)",
- org.eclipse.jst.common.project.facet.core;bundle-version="[1.3.0,2.0.0)",
- com.ibm.icu;bundle-version="3.8.1"
-Bundle-Activator: org.eclipse.jst.common.frameworks.CommonFrameworksPlugin
-Eclipse-LazyStart: true
-Bundle-RequiredExecutionEnvironment: J2SE-1.5
diff --git a/plugins/org.eclipse.jst.common.frameworks/about.html b/plugins/org.eclipse.jst.common.frameworks/about.html
deleted file mode 100644
index 2199df3..0000000
--- a/plugins/org.eclipse.jst.common.frameworks/about.html
+++ /dev/null
@@ -1,34 +0,0 @@
-<!DOCTYPE HTML PUBLIC "-//W3C//DTD HTML 4.0//EN">
-<HTML>
-
-<head>
-<title>About</title>
-<meta http-equiv=Content-Type content="text/html; charset=ISO-8859-1">
-</head>
-
-<BODY lang="EN-US">
-
-<H3>About This Content</H3>
-
-<P>June, 2008</P>
-
-<H3>License</H3>
-
-<P>The Eclipse Foundation makes available all content in this plug-in
-("Content"). Unless otherwise indicated below, the Content is provided to you
-under the terms and conditions of the Eclipse Public License Version 1.0
-("EPL"). A copy of the EPL is available at
-<A href="http://www.eclipse.org/org/documents/epl-v10.php">http://www.eclipse.org/org/documents/epl-v10.php</A>.
-For purposes of the EPL, "Program" will mean the Content.</P>
-
-<P>If you did not receive this Content directly from the Eclipse Foundation, the
-Content is being redistributed by another party ("Redistributor") and different
-terms and conditions may apply to your use of any object code in the Content.
-Check the Redistributors license that was provided with the Content. If no such
-license exists, contact the Redistributor. Unless otherwise indicated below, the
-terms and conditions of the EPL still apply to any source code in the Content
-and such source code may be obtained at
-<A href="http://www.eclipse.org/">http://www.eclipse.org/</A>.</P>
-
-</BODY>
-</HTML>
diff --git a/plugins/org.eclipse.jst.common.frameworks/build.properties b/plugins/org.eclipse.jst.common.frameworks/build.properties
deleted file mode 100644
index 90edf39..0000000
--- a/plugins/org.eclipse.jst.common.frameworks/build.properties
+++ /dev/null
@@ -1,18 +0,0 @@
-###############################################################################
-# Copyright (c) 2003, 2006 IBM Corporation and others.
-# All rights reserved. This program and the accompanying materials
-# are made available under the terms of the Eclipse Public License v1.0
-# which accompanies this distribution, and is available at
-# http://www.eclipse.org/legal/epl-v10.html
-#
-# Contributors:
-# IBM Corporation - initial API and implementation
-###############################################################################
-source.. = src/
-output.. = bin/
-bin.includes = plugin.xml,\
- .,\
- META-INF/,\
- about.html,\
- plugin.properties
-src.includes = component.xml
diff --git a/plugins/org.eclipse.jst.common.frameworks/component.xml b/plugins/org.eclipse.jst.common.frameworks/component.xml
deleted file mode 100644
index 56c979d..0000000
--- a/plugins/org.eclipse.jst.common.frameworks/component.xml
+++ /dev/null
@@ -1,11 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<component xmlns="http://eclipse.org/wtp/releng/tools/component-model"
- name="org.eclipse.jst.common.frameworks">
- <component-depends unrestricted="true"></component-depends>
- <plugin id="org.eclipse.jst.common.frameworks" fragment="false" />
- <plugin id="org.eclipse.jst.common.annotations.controller"
- fragment="false" />
- <plugin id="org.eclipse.jst.common.annotations.core"
- fragment="false" />
- <plugin id="org.eclipse.jst.common.annotations.ui" fragment="false" />
-</component>
\ No newline at end of file
diff --git a/plugins/org.eclipse.jst.common.frameworks/plugin.properties b/plugins/org.eclipse.jst.common.frameworks/plugin.properties
deleted file mode 100644
index b9b475d..0000000
--- a/plugins/org.eclipse.jst.common.frameworks/plugin.properties
+++ /dev/null
@@ -1,12 +0,0 @@
-###############################################################################
-# Copyright (c) 2005, 2006 IBM Corporation and others.
-# All rights reserved. This program and the accompanying materials
-# are made available under the terms of the Eclipse Public License v1.0
-# which accompanies this distribution, and is available at
-# http://www.eclipse.org/legal/epl-v10.html
-#
-# Contributors:
-# IBM Corporation - initial API and implementation
-###############################################################################
-pluginName=Integration Plug-in
-pluginVendor=Eclipse Web Tools Platform
\ No newline at end of file
diff --git a/plugins/org.eclipse.jst.common.frameworks/plugin.xml b/plugins/org.eclipse.jst.common.frameworks/plugin.xml
deleted file mode 100644
index ce08db6..0000000
--- a/plugins/org.eclipse.jst.common.frameworks/plugin.xml
+++ /dev/null
@@ -1,56 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<?eclipse version="3.0"?>
-<plugin>
- <extension-point id="JavaComponentDiscerner" name="JavaComponentDiscerner" schema="schema/JavaComponentDiscerner.exsd"/>
-
- <extension
- id="context.Sensitive.Class.workingCopyManager"
- name="Working Copy Manager - Headless Context Class"
- point="org.eclipse.jem.util.uiContextSensitiveClass">
- <uiContextSensitiveClass
- key="workingCopyManager"
- context="Headless"
- className="org.eclipse.jst.common.jdt.internal.integration.WTPWorkingCopyManager">
- </uiContextSensitiveClass>
- </extension>
-
- <extension
- id="javaProjectValidationHandler"
- name="javaProjectValidationHandler"
- point="org.eclipse.wst.validation.validationSelectionHandler">
- <validationSelectionHandler
- id="javaProjectValidationHandler"
- handlerClass="org.eclipse.jst.common.jdt.internal.integration.JavaProjectValidationHandler"
- selectionType="org.eclipse.jdt.core.IJavaProject"/>
- </extension>
- <extension
- point="org.eclipse.wst.common.emfworkbench.integration.editModel">
- <editModel
- editModelID="jst.utility"
- factoryClass="org.eclipse.jst.common.jdt.internal.integration.JavaArtifactEditModelFactory">
- </editModel>
- </extension>
-
- <extension point="org.eclipse.core.runtime.adapters">
- <factory
- class="org.eclipse.jst.common.project.facet.internal.JavaFacetInstallConfigToDataModelAdapter"
- adaptableType="org.eclipse.jst.common.project.facet.core.JavaFacetInstallConfig">
- <adapter type="org.eclipse.wst.common.frameworks.datamodel.IDataModel"/>
- </factory>
- </extension>
-
- <extension point="org.eclipse.core.runtime.adapters">
- <factory
- class="org.eclipse.jst.common.project.facet.internal.DataModelToJavaFacetInstallConfigAdapter"
- adaptableType="org.eclipse.wst.common.frameworks.datamodel.IDataModel">
- <adapter type="org.eclipse.jst.common.project.facet.core.JavaFacetInstallConfig"/>
- </factory>
- </extension>
- <extension
- point="org.eclipse.wst.common.modulecore.referenceResolver">
- <resolver
- class="org.eclipse.jst.common.internal.modulecore.ClasspathContainerReferenceResolver"
- id="org.eclipse.jst.common.frameworks.classpathContainerResolver">
- </resolver>
- </extension>
-</plugin>
diff --git a/plugins/org.eclipse.jst.common.frameworks/schema/JavaComponentDiscerner.exsd b/plugins/org.eclipse.jst.common.frameworks/schema/JavaComponentDiscerner.exsd
deleted file mode 100644
index 519860f..0000000
--- a/plugins/org.eclipse.jst.common.frameworks/schema/JavaComponentDiscerner.exsd
+++ /dev/null
@@ -1,102 +0,0 @@
-<?xml version='1.0' encoding='UTF-8'?>
-<!-- Schema file written by PDE -->
-<schema targetNamespace="org.eclipse.jst.common.frameworks" xmlns="http://www.w3.org/2001/XMLSchema">
-<annotation>
- <appInfo>
- <meta.schema plugin="org.eclipse.jst.common.frameworks" id="JavaComponentDiscerner" name="JavaComponentDiscerner"/>
- </appInfo>
- <documentation>
- [Enter description of this extension point.]
- </documentation>
- </annotation>
-
- <element name="extension">
- <annotation>
- <appInfo>
- <meta.element internal="true" />
- </appInfo>
- </annotation>
- <complexType>
- <sequence minOccurs="1" maxOccurs="unbounded">
- <element ref="discerner"/>
- </sequence>
- <attribute name="point" type="string" use="required">
- <annotation>
- <documentation>
-
- </documentation>
- </annotation>
- </attribute>
- <attribute name="id" type="string">
- <annotation>
- <documentation>
-
- </documentation>
- </annotation>
- </attribute>
- <attribute name="name" type="string">
- <annotation>
- <documentation>
-
- </documentation>
- <appInfo>
- <meta.attribute translatable="true"/>
- </appInfo>
- </annotation>
- </attribute>
- </complexType>
- </element>
-
- <element name="discerner">
- <complexType>
- <attribute name="class" type="string" use="required">
- <annotation>
- <documentation>
-
- </documentation>
- <appInfo>
- <meta.attribute kind="java" basedOn=":org.eclipse.jst.common.internal.modulecore.util.PossibleManifestEntryUtil$ManifestEntryDiscerner"/>
- </appInfo>
- </annotation>
- </attribute>
- </complexType>
- </element>
-
- <annotation>
- <appInfo>
- <meta.section type="since"/>
- </appInfo>
- <documentation>
- [Enter the first release in which this extension point appears.]
- </documentation>
- </annotation>
-
- <annotation>
- <appInfo>
- <meta.section type="examples"/>
- </appInfo>
- <documentation>
- [Enter extension point usage example here.]
- </documentation>
- </annotation>
-
- <annotation>
- <appInfo>
- <meta.section type="apiinfo"/>
- </appInfo>
- <documentation>
- [Enter API information here.]
- </documentation>
- </annotation>
-
- <annotation>
- <appInfo>
- <meta.section type="implementation"/>
- </appInfo>
- <documentation>
- [Enter information about supplied implementation of this extension point.]
- </documentation>
- </annotation>
-
-
-</schema>
diff --git a/plugins/org.eclipse.jst.common.frameworks/src/org/eclipse/jst/common/frameworks/CommonFrameworksPlugin.java b/plugins/org.eclipse.jst.common.frameworks/src/org/eclipse/jst/common/frameworks/CommonFrameworksPlugin.java
deleted file mode 100644
index d2890b1..0000000
--- a/plugins/org.eclipse.jst.common.frameworks/src/org/eclipse/jst/common/frameworks/CommonFrameworksPlugin.java
+++ /dev/null
@@ -1,77 +0,0 @@
-/******************************************************************************
- * Copyright (c) 2005 BEA Systems, Inc.
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
- *
- * Contributors:
- * Konstantin Komissarchik - initial API and implementation
- ******************************************************************************/
-
-package org.eclipse.jst.common.frameworks;
-
-import org.eclipse.core.runtime.ILog;
-import org.eclipse.core.runtime.IStatus;
-import org.eclipse.core.runtime.Status;
-import org.eclipse.wst.common.frameworks.internal.WTPPlugin;
-import org.eclipse.core.runtime.Platform;
-import java.lang.Throwable;
-import org.eclipse.core.runtime.CoreException;
-
-public final class CommonFrameworksPlugin
-
- extends WTPPlugin
-
-{
- public static final String PLUGIN_ID = "org.eclipse.jst.common.frameworks"; //$NON-NLS-1$
- public static final String DEFAULT_SOURCE_FOLDER = "defaultSource"; //$NON-NLS-1$
- public static final String OUTPUT_FOLDER = "outputFolder"; //$NON-NLS-1$
-
- private static CommonFrameworksPlugin inst;
-
- /**
- * Get the plugin singleton.
- */
-
- public static CommonFrameworksPlugin getDefault()
- {
- return inst;
- }
-
- public CommonFrameworksPlugin() {
- super();
- if (inst == null)
- inst = this;
- }
- @Override
- public String getPluginID()
- {
- return PLUGIN_ID;
- }
-
- public static void log( final Exception e )
- {
- final ILog log = CommonFrameworksPlugin.getDefault().getLog();
- final String msg = "Encountered an unexpected exception."; //$NON-NLS-1$
-
- log.log( new Status( IStatus.ERROR, PLUGIN_ID, IStatus.OK, msg, e ) );
- }
-
- public static IStatus createStatus(int severity, String message, Throwable exception) {
- return new Status(severity, PLUGIN_ID, message, exception);
- }
-
- public static IStatus createStatus(int severity, String message) {
- return createStatus(severity, message, null);
- }
-
- public static void logError(Throwable exception) {
- Platform.getLog(Platform.getBundle(PLUGIN_ID)).log( createStatus(IStatus.ERROR, exception.getMessage(), exception));
- }
-
- public static void logError(CoreException exception) {
- Platform.getLog(Platform.getBundle(PLUGIN_ID)).log( exception.getStatus() );
- }
-
-}
diff --git a/plugins/org.eclipse.jst.common.frameworks/src/org/eclipse/jst/common/internal/modulecore/AddClasspathFoldersParticipant.java b/plugins/org.eclipse.jst.common.frameworks/src/org/eclipse/jst/common/internal/modulecore/AddClasspathFoldersParticipant.java
deleted file mode 100644
index 6322313..0000000
--- a/plugins/org.eclipse.jst.common.frameworks/src/org/eclipse/jst/common/internal/modulecore/AddClasspathFoldersParticipant.java
+++ /dev/null
@@ -1,81 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2009 Red Hat and others.
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
- *
- * Contributors:
- * Red Hat - Initial API and implementation
- *******************************************************************************/
-package org.eclipse.jst.common.internal.modulecore;
-
-import java.util.List;
-
-import org.eclipse.core.resources.IContainer;
-import org.eclipse.core.runtime.CoreException;
-import org.eclipse.core.runtime.IPath;
-import org.eclipse.wst.common.componentcore.internal.flat.AbstractFlattenParticipant;
-import org.eclipse.wst.common.componentcore.internal.flat.IFlatResource;
-import org.eclipse.wst.common.componentcore.internal.flat.VirtualComponentFlattenUtility;
-import org.eclipse.wst.common.componentcore.internal.flat.FlatVirtualComponent.FlatComponentTaskModel;
-import org.eclipse.wst.common.componentcore.resources.IVirtualComponent;
-import org.eclipse.wst.common.componentcore.resources.IVirtualReference;
-
-/**
- * Add classpath folder references. This is necessary because
- * these classpath folder references are not exactly stored as
- * IVirtualReference objects persisted in the component.xml, but rather
- * pulled in from another model.
- *
- * @author rob.stryker@jboss.com
- *
- */
-public class AddClasspathFoldersParticipant extends AbstractFlattenParticipant {
- private List<IFlatResource> list;
-
- @Override
- public boolean shouldIgnoreReference(IVirtualComponent rootComponent,
- IVirtualReference referenced, FlatComponentTaskModel dataModel) {
- if( (rootComponent instanceof IClasspathDependencyProvider) &&
- (referenced.getReferencedComponent() instanceof IClasspathDependencyComponent) &&
- ((IClasspathDependencyComponent)referenced.getReferencedComponent()).isClassFolder())
- return true;
- return false;
- }
-
-
- @Override
- public void finalize(IVirtualComponent component,
- FlatComponentTaskModel dataModel, List<IFlatResource> resources) {
- this.list = resources;
- if( !(component instanceof IClasspathDependencyProvider ))
- return;
- // Add all Java output folders that have publish/export attributes
- try {
- addClassFolderDependencies((IClasspathDependencyProvider)component);
- } catch( CoreException ce ) {
- // Ignore
- }
- }
-
- private void addClassFolderDependencies(final IClasspathDependencyProvider component) throws CoreException {
- if (!component.isBinary()) {
- final IVirtualReference[] cpRefs = component.getJavaClasspathReferences();
- for (int i = 0; i < cpRefs.length; i++) {
- final IVirtualReference cpRef = cpRefs[i];
- final IPath runtimePath = cpRef.getRuntimePath();
- final IVirtualComponent comp = cpRef.getReferencedComponent();
- if (comp instanceof IClasspathDependencyComponent) {
- final IClasspathDependencyComponent cpComp = (IClasspathDependencyComponent) comp;
- if (cpComp.isClassFolder() && cpComp.getClassFolder() != null) {
- IPath targetPath = null;
- targetPath = runtimePath.makeRelative();
- final IContainer container = cpComp.getClassFolder();
- new VirtualComponentFlattenUtility(list, null).addContainer(container, targetPath);
- }
- }
- }
- }
- }
-}
diff --git a/plugins/org.eclipse.jst.common.frameworks/src/org/eclipse/jst/common/internal/modulecore/AddClasspathLibReferencesParticipant.java b/plugins/org.eclipse.jst.common.frameworks/src/org/eclipse/jst/common/internal/modulecore/AddClasspathLibReferencesParticipant.java
deleted file mode 100644
index 359a472..0000000
--- a/plugins/org.eclipse.jst.common.frameworks/src/org/eclipse/jst/common/internal/modulecore/AddClasspathLibReferencesParticipant.java
+++ /dev/null
@@ -1,101 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2009 Red Hat and others.
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
- *
- * Contributors:
- * Red Hat - Initial API and implementation
- *******************************************************************************/
-package org.eclipse.jst.common.internal.modulecore;
-
-import java.util.List;
-
-import org.eclipse.core.runtime.IPath;
-import org.eclipse.wst.common.componentcore.internal.flat.AbstractFlattenParticipant;
-import org.eclipse.wst.common.componentcore.internal.flat.IFlatResource;
-import org.eclipse.wst.common.componentcore.internal.flat.VirtualComponentFlattenUtility;
-import org.eclipse.wst.common.componentcore.internal.flat.FlatVirtualComponent.FlatComponentTaskModel;
-import org.eclipse.wst.common.componentcore.resources.IVirtualComponent;
-import org.eclipse.wst.common.componentcore.resources.IVirtualReference;
-
-/**
- * Copy the classpath LIB references from a child with
- * a ../ runtime path into a receiving parent.
- *
- * @author rob
- *
- */
-public class AddClasspathLibReferencesParticipant extends AbstractFlattenParticipant {
- private List<IFlatResource> list;
- @Override
- public boolean shouldIgnoreReference(IVirtualComponent rootComponent,
- IVirtualReference referenced, FlatComponentTaskModel dataModel) {
- if (referenced.getRuntimePath().toString().startsWith(IClasspathDependencyReceiver.RUNTIME_MAPPING_INTO_CONTAINER))
- return true;
- return false;
- }
-
-
- @Override
- public void finalize(IVirtualComponent component,
- FlatComponentTaskModel dataModel, List<IFlatResource> resources) {
- this.list = resources;
- if( !(component instanceof IClasspathDependencyReceiver ))
- return;
- if( ((IClasspathDependencyReceiver)component).canReceiveClasspathDependencies())
- addReferencedComponentClasspathDependencies((IClasspathDependencyReceiver)component);
- }
-
- private void addReferencedComponentClasspathDependencies(final IClasspathDependencyReceiver component) {
- final IVirtualReference[] refs = component.getReferences();
- for (int i = 0; i < refs.length; i++) {
- final IVirtualReference reference = refs[i];
- final IPath runtimePath = reference.getRuntimePath();
- final IVirtualComponent referencedComponent = reference.getReferencedComponent();
-
- // if the reference cannot export dependencies, skip
- if( !(referencedComponent instanceof IClasspathDependencyProvider) )
- continue;
-
- if (!referencedComponent.isBinary() && referencedComponent instanceof IClasspathDependencyProvider) {
- final IVirtualReference[] cpRefs = ((IClasspathDependencyProvider) referencedComponent).getJavaClasspathReferences();
- for (int j = 0; j < cpRefs.length; j++) {
- final IVirtualReference cpRef = cpRefs[j];
- IPath cpRefRuntimePath = cpRef.getRuntimePath();
-
- if (cpRef.getReferencedComponent() instanceof IClasspathDependencyComponent) {
- // want to avoid adding dups
- IClasspathDependencyComponent cpComp = (IClasspathDependencyComponent) cpRef.getReferencedComponent();
- // don't want to process class folder refs here
- if (cpComp.isClassFolder())
- continue;
-
- //if path isn't ../, it shouldn't be added here [bug 247090]
- if (!cpRefRuntimePath.toString().startsWith(IClasspathDependencyReceiver.RUNTIME_MAPPING_INTO_CONTAINER))
- continue;
-
- // TODO: verify this cpRefRuntimePath is acceptable?
- //if( !runtimePath.equals(component.getClasspathFolderPath(cpComp))) continue;
-
- cpRefRuntimePath = runtimePath.append(cpRefRuntimePath.removeFirstSegments(1));
- new VirtualComponentFlattenUtility(list, null).addFile(cpComp, cpRefRuntimePath, cpComp);
- }
- }
- }
- }
- }
-
-// private boolean canExportClasspathComponentDependencies(IVirtualComponent component) {
-// final IProject project = component.getProject();
-// // check for valid project type
-// if (JavaEEProjectUtilities.isEJBProject(project)
-// || JavaEEProjectUtilities.isDynamicWebProject(project)
-// || JavaEEProjectUtilities.isJCAProject(project)
-// || JavaEEProjectUtilities.isUtilityProject(project)) {
-// return true;
-// }
-// return false;
-// }
-}
diff --git a/plugins/org.eclipse.jst.common.frameworks/src/org/eclipse/jst/common/internal/modulecore/AddClasspathLibRefsProviderParticipant.java b/plugins/org.eclipse.jst.common.frameworks/src/org/eclipse/jst/common/internal/modulecore/AddClasspathLibRefsProviderParticipant.java
deleted file mode 100644
index 867946f..0000000
--- a/plugins/org.eclipse.jst.common.frameworks/src/org/eclipse/jst/common/internal/modulecore/AddClasspathLibRefsProviderParticipant.java
+++ /dev/null
@@ -1,64 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2010 IBM Corporation and others.
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
- *
- * Contributors:
- * IBM Corporation - Initial API and implementation
- *******************************************************************************/
-package org.eclipse.jst.common.internal.modulecore;
-
-import java.util.List;
-
-import org.eclipse.core.runtime.IPath;
-import org.eclipse.wst.common.componentcore.internal.flat.AbstractFlattenParticipant;
-import org.eclipse.wst.common.componentcore.internal.flat.IFlatResource;
-import org.eclipse.wst.common.componentcore.internal.flat.VirtualComponentFlattenUtility;
-import org.eclipse.wst.common.componentcore.internal.flat.FlatVirtualComponent.FlatComponentTaskModel;
-import org.eclipse.wst.common.componentcore.resources.IVirtualComponent;
-import org.eclipse.wst.common.componentcore.resources.IVirtualReference;
-
-/**
- * Collect the classpath LIB references from a dependency provider
- * and add to the members list.
- *
- */
-public class AddClasspathLibRefsProviderParticipant extends AbstractFlattenParticipant {
- private List<IFlatResource> list;
-
-
- @Override
- public void finalize(IVirtualComponent component,
- FlatComponentTaskModel dataModel, List<IFlatResource> resources) {
- this.list = resources;
-
- if (!(component instanceof IClasspathDependencyProvider))
- return;
-
- addReferencedComponentClasspathDependencies((IClasspathDependencyProvider)component);
- }
-
- private void addReferencedComponentClasspathDependencies(final IClasspathDependencyProvider component) {
- final IVirtualReference[] cpRefs = component.getJavaClasspathReferences();
- for (int j = 0; j < cpRefs.length; j++) {
- final IVirtualReference cpRef = cpRefs[j];
- IPath cpRefRuntimePath = cpRef.getRuntimePath();
-
- if (cpRef.getReferencedComponent() instanceof IClasspathDependencyComponent) {
- // want to avoid adding dups
- IClasspathDependencyComponent cpComp = (IClasspathDependencyComponent) cpRef.getReferencedComponent();
- // don't want to process class folder refs here
- if (cpComp.isClassFolder())
- continue;
-
- if (cpRefRuntimePath.toString().startsWith(IClasspathDependencyReceiver.RUNTIME_MAPPING_INTO_CONTAINER))
- continue;
-
- new VirtualComponentFlattenUtility(list, null).addFile(cpComp, cpRefRuntimePath, cpComp);
- }
- }
- }
-
-}
diff --git a/plugins/org.eclipse.jst.common.frameworks/src/org/eclipse/jst/common/internal/modulecore/AddMappedOutputFoldersParticipant.java b/plugins/org.eclipse.jst.common.frameworks/src/org/eclipse/jst/common/internal/modulecore/AddMappedOutputFoldersParticipant.java
deleted file mode 100644
index bb614ad..0000000
--- a/plugins/org.eclipse.jst.common.frameworks/src/org/eclipse/jst/common/internal/modulecore/AddMappedOutputFoldersParticipant.java
+++ /dev/null
@@ -1,158 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2009 Red Hat and others.
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
- *
- * Contributors:
- * Red Hat - Initial API and implementation
- *******************************************************************************/
-package org.eclipse.jst.common.internal.modulecore;
-
-import java.util.HashMap;
-import java.util.Iterator;
-import java.util.List;
-
-import org.eclipse.core.resources.IContainer;
-import org.eclipse.core.resources.IFile;
-import org.eclipse.core.resources.IProject;
-import org.eclipse.core.runtime.CoreException;
-import org.eclipse.core.runtime.IPath;
-import org.eclipse.core.runtime.Path;
-import org.eclipse.jdt.core.IClasspathEntry;
-import org.eclipse.jdt.internal.core.JavaProject;
-import org.eclipse.jst.common.jdt.internal.javalite.IJavaProjectLite;
-import org.eclipse.jst.common.jdt.internal.javalite.JavaCoreLite;
-import org.eclipse.jst.common.jdt.internal.javalite.JavaLiteUtilities;
-import org.eclipse.wst.common.componentcore.internal.ComponentResource;
-import org.eclipse.wst.common.componentcore.internal.StructureEdit;
-import org.eclipse.wst.common.componentcore.internal.WorkbenchComponent;
-import org.eclipse.wst.common.componentcore.internal.flat.AbstractFlattenParticipant;
-import org.eclipse.wst.common.componentcore.internal.flat.FilterResourceParticipant;
-import org.eclipse.wst.common.componentcore.internal.flat.FlatVirtualComponent.FlatComponentTaskModel;
-import org.eclipse.wst.common.componentcore.internal.flat.IFlatFile;
-import org.eclipse.wst.common.componentcore.internal.flat.IFlatResource;
-import org.eclipse.wst.common.componentcore.internal.flat.IFlattenParticipant;
-import org.eclipse.wst.common.componentcore.internal.flat.VirtualComponentFlattenUtility;
-import org.eclipse.wst.common.componentcore.internal.flat.VirtualComponentFlattenUtility.ShouldIncludeUtilityCallback;
-import org.eclipse.wst.common.componentcore.resources.IVirtualComponent;
-
-public class AddMappedOutputFoldersParticipant extends AbstractFlattenParticipant implements ShouldIncludeUtilityCallback {
- private List<IFlatResource> list;
- private String[] filteredSuffixes = new String[]{};
-
- public AddMappedOutputFoldersParticipant() {
- // intentionally blank
- }
-
- public AddMappedOutputFoldersParticipant(String[] filtered) {
- this.filteredSuffixes = filtered;
- }
-
- public boolean shouldAddComponentFile(IVirtualComponent component, IFlatFile file) {
- IFlattenParticipant[] delegates = getDelegateParticipants();
- for( int i = 0; i < delegates.length; i++ ) {
- if(!delegates[i].shouldAddExportableFile(null, component, null, file))
- return false;
- }
- return true;
- }
-
- public IFlattenParticipant[] getDelegateParticipants() {
- return new IFlattenParticipant[] {
- FilterResourceParticipant.createSuffixFilterParticipant(filteredSuffixes)
- };
- }
-
- @Override
- public void finalize(IVirtualComponent component,
- FlatComponentTaskModel dataModel, List<IFlatResource> resources) {
- this.list = resources;
- list.getClass();
- if( !isApprovedComponent(component))
- return;
-
- HashMap<IContainer, IPath> mapped = getMappedJavaOutputContainers(component.getProject());
- Iterator<IContainer> i = mapped.keySet().iterator();
- while(i.hasNext()) {
- IContainer next = i.next();
- try {
- new VirtualComponentFlattenUtility(list, this).addContainer(next, mapped.get(next));
- } catch( CoreException ce) {}
- }
- }
-
- protected boolean isApprovedComponent(IVirtualComponent vc) {
- // TODO
- return true;
- }
-
- public final static HashMap<IContainer, IPath> getMappedJavaOutputContainers(IProject project) {
- ComponentResourceProxy[] proxies = findAllMappingProxies(project);
- IJavaProjectLite javaProjectLite = JavaCoreLite.create(project);
-
- HashMap<IContainer, IPath> map = new HashMap<IContainer, IPath>();
- IFile classpathFile = project.getFile(JavaProject.CLASSPATH_FILENAME);
- if( javaProjectLite.exists() && classpathFile.exists()) {
- IClasspathEntry[] entries = javaProjectLite.readRawClasspath();
- for (IClasspathEntry entry : entries) {
- if (entry.getEntryKind() == IClasspathEntry.CPE_SOURCE) {
- IPath cpePath = entry.getPath();
- for( int i = 0; i < proxies.length; i++ ) {
- if( cpePath.equals(new Path(project.getName()).append(proxies[i].source).makeAbsolute())) {
- IContainer outputContainer = JavaLiteUtilities.getJavaOutputContainer(javaProjectLite, entry);
- if (!map.containsKey(outputContainer)) {
- map.put(outputContainer, proxies[i].runtimePath);
- }
- }
- // TODO
- }
- }
- }
- }
- return map;
- }
-
- /*
- * This code below is also duplicated in common.ui in the generic page
- * to handle module assembly
- */
-
- public static ComponentResourceProxy[] findAllMappingProxies(IProject project) {
- ComponentResource[] allMappings = findAllMappings(project);
- ComponentResourceProxy[] proxies = new ComponentResourceProxy[allMappings.length];
- for( int i = 0; i < allMappings.length; i++ ) {
- proxies[i] = new ComponentResourceProxy(
- allMappings[i].getSourcePath(),
- allMappings[i].getRuntimePath());
- }
- return proxies;
- }
-
- protected static ComponentResource[] findAllMappings(IProject project) {
- StructureEdit structureEdit = null;
- try {
- structureEdit = StructureEdit.getStructureEditForRead(project);
- WorkbenchComponent component = structureEdit.getComponent();
- Object[] arr = component.getResources().toArray();
- ComponentResource[] result = new ComponentResource[arr.length];
- for( int i = 0; i < arr.length; i++ )
- result[i] = (ComponentResource)arr[i];
- return result;
- } catch(Exception e) {
- } finally {
- if( structureEdit != null )
- structureEdit.dispose();
- }
- return new ComponentResource[]{};
- }
-
- public static class ComponentResourceProxy {
- public IPath source, runtimePath;
- public ComponentResourceProxy(IPath source, IPath runtimePath) {
- this.source = source;
- this.runtimePath = runtimePath;
- }
- }
-}
\ No newline at end of file
diff --git a/plugins/org.eclipse.jst.common.frameworks/src/org/eclipse/jst/common/internal/modulecore/ClasspathContainerReferenceResolver.java b/plugins/org.eclipse.jst.common.frameworks/src/org/eclipse/jst/common/internal/modulecore/ClasspathContainerReferenceResolver.java
deleted file mode 100644
index c942e13..0000000
--- a/plugins/org.eclipse.jst.common.frameworks/src/org/eclipse/jst/common/internal/modulecore/ClasspathContainerReferenceResolver.java
+++ /dev/null
@@ -1,68 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2009 Red Hat and others.
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
- *
- * Contributors:
- * Red Hat - Initial API and implementation
- *******************************************************************************/
-package org.eclipse.jst.common.internal.modulecore;
-
-import org.eclipse.core.runtime.IPath;
-import org.eclipse.emf.common.util.URI;
-import org.eclipse.wst.common.componentcore.internal.ComponentcorePackage;
-import org.eclipse.wst.common.componentcore.internal.DependencyType;
-import org.eclipse.wst.common.componentcore.internal.ReferencedComponent;
-import org.eclipse.wst.common.componentcore.internal.impl.PlatformURLModuleConnection;
-import org.eclipse.wst.common.componentcore.internal.resources.VirtualReference;
-import org.eclipse.wst.common.componentcore.resolvers.IReferenceResolver;
-import org.eclipse.wst.common.componentcore.resources.IVirtualComponent;
-import org.eclipse.wst.common.componentcore.resources.IVirtualReference;
-
-public class ClasspathContainerReferenceResolver implements IReferenceResolver {
- public static final String PROTOCOL = PlatformURLModuleConnection.MODULE_PROTOCOL
- +IPath.SEPARATOR + ClasspathContainerVirtualComponent.CLASSPATH_CON + IPath.SEPARATOR;
- public boolean canResolve(IVirtualComponent context,
- ReferencedComponent referencedComponent) {
- URI uri = referencedComponent.getHandle();
- if( uri.segmentCount() > 2 && uri.segment(0).equals(ClasspathContainerVirtualComponent.CLASSPATH)
- && uri.segment(1).equals(ClasspathContainerVirtualComponent.CON))
- return true;
- return false;
- }
-
- public IVirtualReference resolve(IVirtualComponent context,
- ReferencedComponent referencedComponent) {
- URI uri = referencedComponent.getHandle();
- if( uri.segmentCount() > 2 && uri.segment(0).equals(ClasspathContainerVirtualComponent.CLASSPATH)
- && uri.segment(1).equals(ClasspathContainerVirtualComponent.CON)) {
- String path = uri.toString().substring(PROTOCOL.length());
- IVirtualReference ref = new VirtualReference(context,
- new ClasspathContainerVirtualComponent(context.getProject(), context, path));
- ref.setArchiveName(referencedComponent.getArchiveName());
- ref.setRuntimePath(referencedComponent.getRuntimePath());
- ref.setDependencyType(referencedComponent.getDependencyType().getValue());
- return ref;
- }
- return null;
- }
-
- public boolean canResolve(IVirtualReference reference) {
- if( reference.getReferencedComponent() instanceof ClasspathContainerVirtualComponent )
- return true;
- return false;
- }
-
- public ReferencedComponent resolve(IVirtualReference reference) {
- ClasspathContainerVirtualComponent vc = (ClasspathContainerVirtualComponent)reference.getReferencedComponent();
- ReferencedComponent rc = ComponentcorePackage.eINSTANCE.getComponentcoreFactory().createReferencedComponent();
- rc.setArchiveName(reference.getArchiveName());
- rc.setRuntimePath(reference.getRuntimePath());
- rc.setHandle(URI.createURI(PROTOCOL + vc.getClasspathContainerPath()));
- rc.setDependencyType(DependencyType.CONSUMES_LITERAL);
- return rc;
- }
-
-}
diff --git a/plugins/org.eclipse.jst.common.frameworks/src/org/eclipse/jst/common/internal/modulecore/ClasspathContainerVirtualComponent.java b/plugins/org.eclipse.jst.common.frameworks/src/org/eclipse/jst/common/internal/modulecore/ClasspathContainerVirtualComponent.java
deleted file mode 100644
index 93b5ca5..0000000
--- a/plugins/org.eclipse.jst.common.frameworks/src/org/eclipse/jst/common/internal/modulecore/ClasspathContainerVirtualComponent.java
+++ /dev/null
@@ -1,172 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2009 Red Hat and others.
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
- *
- * Contributors:
- * Red Hat - Initial API and implementation
- *******************************************************************************/
-package org.eclipse.jst.common.internal.modulecore;
-
-import java.io.File;
-import java.util.ArrayList;
-
-import org.eclipse.core.resources.IContainer;
-import org.eclipse.core.resources.IProject;
-import org.eclipse.core.resources.IResource;
-import org.eclipse.core.runtime.CoreException;
-import org.eclipse.core.runtime.IPath;
-import org.eclipse.core.runtime.Path;
-import org.eclipse.jdt.core.IClasspathContainer;
-import org.eclipse.jdt.core.IClasspathEntry;
-import org.eclipse.jdt.core.JavaCore;
-import org.eclipse.jdt.core.JavaModelException;
-import org.eclipse.wst.common.componentcore.internal.resources.AbstractResourceListVirtualComponent;
-import org.eclipse.wst.common.componentcore.internal.resources.VirtualFile;
-import org.eclipse.wst.common.componentcore.internal.resources.VirtualFolder;
-import org.eclipse.wst.common.componentcore.resources.IVirtualComponent;
-import org.eclipse.wst.common.componentcore.resources.IVirtualFile;
-import org.eclipse.wst.common.componentcore.resources.IVirtualFolder;
-import org.eclipse.wst.common.componentcore.resources.IVirtualResource;
-
-public class ClasspathContainerVirtualComponent extends
- AbstractResourceListVirtualComponent {
- public static final String CLASSPATH = "classpath"; //$NON-NLS-1$
- public static final String CON = "con"; //$NON-NLS-1$
- public static final String CLASSPATH_CON = CLASSPATH + Path.SEPARATOR + CON;
- private String containerPath;
- private IClasspathEntry[] containerEntries;
- private IClasspathContainer container;
- private boolean initialized = false;
- private Object initLock = new Object();
- public ClasspathContainerVirtualComponent(IProject p,
- IVirtualComponent referencingComponent, String containerPath) {
- super(p, referencingComponent);
- this.containerPath = containerPath;
- }
-
- private void init() {
- synchronized (initLock) {
- if (initialized) {
- return;
- }
- }
- try {
- IClasspathContainer localContainer = JavaCore.getClasspathContainer(new Path(containerPath), JavaCore.create(project));
- IClasspathEntry[] localcontainerEntries = null;
- if (localContainer != null) {
- localcontainerEntries = localContainer.getClasspathEntries();
- } else {
- localcontainerEntries = new IClasspathEntry[] {};
- }
- synchronized (initLock) {
- if(initialized){
- return;
- }
- container = localContainer;
- containerEntries = localcontainerEntries;
- }
- } catch (JavaModelException jme) {
- // eat it
- } finally {
- synchronized (initLock) {
- initialized = true;
- }
- }
- }
-
- @Override
- public boolean equals(Object o) {
- if(this == o){
- return true;
- }
-
- if(!super.equals(o)){
- return false;
- }
- ClasspathContainerVirtualComponent other = (ClasspathContainerVirtualComponent) o;
- return containerPath == null ? other.containerPath == null : containerPath.equals(other.containerPath);
- }
-
- @Override
- public int hashCode() {
- return super.hashCode() + (containerPath == null ? 0 : containerPath.hashCode());
- }
-
- public String getContainerPath() {
- return containerPath;
- }
-
- @Override
- public String getId() {
- return CLASSPATH_CON + Path.SEPARATOR + containerPath;
- }
-
- @Override
- protected String getFirstIdSegment() {
- // Do not call
- return null;
- }
-
- public IClasspathContainer getClasspathContainer(){
- init();
- return container;
- }
-
- private IClasspathEntry[] getEntries() {
- init();
- return containerEntries;
- }
-
- public String getClasspathContainerPath() {
- return containerPath;
- }
-
- @Override
- public IVirtualFolder getRootFolder() {
- IVirtualFolder folder = new VirtualFolder(project, new Path("/")) { //$NON-NLS-1$
- @Override
- public IVirtualResource[] members(int memberFlags) throws CoreException {
- IClasspathEntry[] entries = getEntries();
- ArrayList<IVirtualFile> jars = new ArrayList<IVirtualFile>();
- for(IClasspathEntry entry: entries) {
- if( entry.getEntryKind() == IClasspathEntry.CPE_LIBRARY) {
- File f = entry.getPath().toFile();
- jars.add(new AbsoluteVirtualFile(getProject(), new Path("/"), f)); //$NON-NLS-1$
- }
- }
- return jars.toArray(new IVirtualFile[jars.size()]);
- }
- };
- return folder;
- }
-
- protected class AbsoluteVirtualFile extends VirtualFile {
- private File file;
- public AbsoluteVirtualFile(IProject aComponentProject,
- IPath aRuntimePath, File absoluteFile) {
- super(aComponentProject, aRuntimePath, null);
- this.file = absoluteFile;
- }
- @Override
- public Object getAdapter(Class adapter) {
- if( File.class.equals(adapter))
- return file;
- return null;
- }
- }
-
- @Override
- protected IContainer[] getUnderlyingContainers() {
- // do not implement, overriding key method members(int)
- return new IContainer[]{};
- }
-
- @Override
- protected IResource[] getLooseResources() {
- // do not implement, overriding key method members(int)
- return new IResource[]{};
- }
-}
diff --git a/plugins/org.eclipse.jst.common.frameworks/src/org/eclipse/jst/common/internal/modulecore/IClasspathDependencyComponent.java b/plugins/org.eclipse.jst.common.frameworks/src/org/eclipse/jst/common/internal/modulecore/IClasspathDependencyComponent.java
deleted file mode 100644
index f4b044e..0000000
--- a/plugins/org.eclipse.jst.common.frameworks/src/org/eclipse/jst/common/internal/modulecore/IClasspathDependencyComponent.java
+++ /dev/null
@@ -1,22 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2009 Red Hat and others.
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
- *
- * Contributors:
- * Red Hat - Initial API and implementation
- *******************************************************************************/
-package org.eclipse.jst.common.internal.modulecore;
-
-import org.eclipse.core.resources.IContainer;
-import org.eclipse.wst.common.componentcore.resources.IVirtualComponent;
-import org.eclipse.wst.common.componentcore.resources.IVirtualReference;
-
-public interface IClasspathDependencyComponent extends IVirtualComponent {
- public boolean isClassFolder();
- public IContainer getClassFolder();
- public IVirtualReference[] getReferences();
- public String[] getManifestClasspath();
-}
diff --git a/plugins/org.eclipse.jst.common.frameworks/src/org/eclipse/jst/common/internal/modulecore/IClasspathDependencyProvider.java b/plugins/org.eclipse.jst.common.frameworks/src/org/eclipse/jst/common/internal/modulecore/IClasspathDependencyProvider.java
deleted file mode 100644
index 37fcd44..0000000
--- a/plugins/org.eclipse.jst.common.frameworks/src/org/eclipse/jst/common/internal/modulecore/IClasspathDependencyProvider.java
+++ /dev/null
@@ -1,32 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2009 Red Hat and others.
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
- *
- * Contributors:
- * Red Hat - Initial API and implementation
- *******************************************************************************/
-package org.eclipse.jst.common.internal.modulecore;
-
-import org.eclipse.wst.common.componentcore.resources.IVirtualComponent;
-import org.eclipse.wst.common.componentcore.resources.IVirtualReference;
-
-/**
- * This class is meant to mark a virtual component as
- * a type of virtual component which can provide
- * classpath dependencies to be included in a parent component
- *
- * @author rob.stryker@redhat.com
- *
- */
-public interface IClasspathDependencyProvider extends IVirtualComponent {
- /**
- * Return a list of references which should be exported into a
- * parent module's appropriate folder for classpath entities.
- *
- * @return
- */
- public IVirtualReference[] getJavaClasspathReferences();
-}
diff --git a/plugins/org.eclipse.jst.common.frameworks/src/org/eclipse/jst/common/internal/modulecore/IClasspathDependencyReceiver.java b/plugins/org.eclipse.jst.common.frameworks/src/org/eclipse/jst/common/internal/modulecore/IClasspathDependencyReceiver.java
deleted file mode 100644
index eb26725..0000000
--- a/plugins/org.eclipse.jst.common.frameworks/src/org/eclipse/jst/common/internal/modulecore/IClasspathDependencyReceiver.java
+++ /dev/null
@@ -1,54 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2009 Red Hat and others.
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
- *
- * Contributors:
- * Red Hat - Initial API and implementation
- *******************************************************************************/
-package org.eclipse.jst.common.internal.modulecore;
-
-import org.eclipse.core.runtime.IPath;
-import org.eclipse.core.runtime.Path;
-import org.eclipse.wst.common.componentcore.resources.IVirtualComponent;
-
-/**
- * This class is meant to mark a virtual component as
- * a type of virtual component which can receive and handle
- * classpath dependencies from child references
- *
- * @author rob.stryker@redhat.com
- *
- */
-public interface IClasspathDependencyReceiver extends IVirtualComponent {
- /**
- * Runtime path used to indicate that the resolved contributions from a classpath entry should be
- * mapped into the exported/deployed structure of the parent module at the same location that the target module
- * is mapped.
- */
- public static final String RUNTIME_MAPPING_INTO_CONTAINER = "../"; //$NON-NLS-1$
-
- /**
- * IPath value of RUNTIME_MAPPING_INTO_CONTAINER.
- */
- public static final IPath RUNTIME_MAPPING_INTO_CONTAINER_PATH = new Path(RUNTIME_MAPPING_INTO_CONTAINER);
-
-
- /**
- * Returns whether this virtual component can accept
- * classpath references from children.
- *
- * @return
- */
- public boolean canReceiveClasspathDependencies();
-
- /**
- * Return the preferred folder to place child classpath
- * dependencies, or null if they can go wherever the reference directs
- *
- * @return
- */
- public IPath getClasspathFolderPath(IClasspathDependencyComponent component);
-}
diff --git a/plugins/org.eclipse.jst.common.frameworks/src/org/eclipse/jst/common/internal/modulecore/ISingleRootStatus.java b/plugins/org.eclipse.jst.common.frameworks/src/org/eclipse/jst/common/internal/modulecore/ISingleRootStatus.java
deleted file mode 100644
index aeb87a4..0000000
--- a/plugins/org.eclipse.jst.common.frameworks/src/org/eclipse/jst/common/internal/modulecore/ISingleRootStatus.java
+++ /dev/null
@@ -1,55 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2009 IBM Corporation and others.
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
- *
- * Contributors:
- * IBM Corporation - initial API and implementation
- *******************************************************************************/
-package org.eclipse.jst.common.internal.modulecore;
-
-import org.eclipse.core.resources.IContainer;
-import org.eclipse.core.runtime.IPath;
-import org.eclipse.core.runtime.IStatus;
-
-public interface ISingleRootStatus extends IStatus {
-
- // Information [0-32]
- public static final int SINGLE_ROOT_CONTAINER_FOUND = 1;
- public static final int SINGLE_ROOT_FORCED = 2;
- //DO NOT ADD ANY OTHER CONSTANTS TO THE INFORMATION SECTION
-
- // Warnings [33-127]
- public static final int SOURCE_PATH_NOT_FOUND = 33;
-
- // Errors [128-512]
- public static final int NO_COMPONENT_FOUND = 129;
- public static final int EXPLICITLY_DISABLED = 130;
- public static final int CONSUMABLE_REFERENCES_FOUND = 131;
- public static final int LINKED_RESOURCES_FOUND = 132;
- public static final int NO_RESOURCE_MAPS_FOUND = 133;
- public static final int JAVA_OUTPUT_NOT_A_CONTENT_ROOT = 134;
- public static final int JAVA_OUTPUT_GREATER_THAN_1 = 135;
- public static final int RUNTIME_PATH_NOT_ROOT = 136;
- public static final int SOURCE_NOT_JAVA_CONTAINER = 137;
- public static final int BINARY_COMPONENT_FOUND = 138;
-
- // callback-contributed errors: 512 and up
-
- /**
- * Returns the path with which the status is associated.
- *
- * @return the path with which the status is associated.
- */
- public IPath getPath();
-
- /**
- * Will return the IContainer that is used as the "single-root".
- * If a "single-root" structure is not found this method will return null.
- *
- * @return the "single-root" container
- */
- public IContainer getSingleRoot();
-}
diff --git a/plugins/org.eclipse.jst.common.frameworks/src/org/eclipse/jst/common/internal/modulecore/IgnoreJavaInSourceFolderParticipant.java b/plugins/org.eclipse.jst.common.frameworks/src/org/eclipse/jst/common/internal/modulecore/IgnoreJavaInSourceFolderParticipant.java
deleted file mode 100644
index bb8ee41..0000000
--- a/plugins/org.eclipse.jst.common.frameworks/src/org/eclipse/jst/common/internal/modulecore/IgnoreJavaInSourceFolderParticipant.java
+++ /dev/null
@@ -1,83 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2009 Red Hat and others.
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
- *
- * Contributors:
- * Red Hat - Initial API and implementation
- *******************************************************************************/
-package org.eclipse.jst.common.internal.modulecore;
-
-import java.util.ArrayList;
-import java.util.Iterator;
-import java.util.List;
-
-import org.eclipse.core.resources.IContainer;
-import org.eclipse.core.resources.IFile;
-import org.eclipse.core.runtime.CoreException;
-import org.eclipse.core.runtime.IPath;
-import org.eclipse.jst.common.jdt.internal.javalite.IJavaProjectLite;
-import org.eclipse.jst.common.jdt.internal.javalite.JavaCoreLite;
-import org.eclipse.jst.common.jdt.internal.javalite.JavaLiteUtilities;
-import org.eclipse.wst.common.componentcore.internal.flat.AbstractFlattenParticipant;
-import org.eclipse.wst.common.componentcore.internal.flat.IFlatFile;
-import org.eclipse.wst.common.componentcore.internal.flat.IFlatResource;
-import org.eclipse.wst.common.componentcore.internal.flat.FlatVirtualComponent.FlatComponentTaskModel;
-import org.eclipse.wst.common.componentcore.resources.IVirtualComponent;
-
-public class IgnoreJavaInSourceFolderParticipant extends AbstractFlattenParticipant {
- IJavaProjectLite liteProj = null;
- List<IPath> containers = new ArrayList<IPath>();
-
- @Override
- public void initialize(IVirtualComponent component,
- FlatComponentTaskModel dataModel, List<IFlatResource> resources) {
- if( hasJava(component) ) {
- liteProj = JavaCoreLite.create(component.getProject());
- if( liteProj != null && JavaLiteUtilities.getJavaOutputContainers(liteProj).size() > 0) {
- List<IContainer> temp = JavaLiteUtilities.getJavaSourceContainers(liteProj);
- Iterator<IContainer> i = temp.iterator();
- while(i.hasNext()) {
- containers.add(i.next().getFullPath());
- }
- }
- }
- }
-
- @Override
- public boolean shouldAddExportableFile(IVirtualComponent rootComponent,
- IVirtualComponent currentComponent,
- FlatComponentTaskModel dataModel, IFlatFile file) {
- if( rootComponent == currentComponent ) {
- if( hasJava(rootComponent) ) {
- /*
- * Only ignore when given an ear, war, etc, and not
- * one of it's consumed children, which may be a fileset,
- * or some other unknown type of contributor
- */
- IFile t = (IFile)file.getAdapter(IFile.class);
- if( t != null ) {
- Iterator<IPath> i = containers.iterator();
- while(i.hasNext()) {
- if( i.next().isPrefixOf(t.getFullPath()) && t.getName().endsWith(".java")) { //$NON-NLS-1$
- return false;
- }
- }
- }
- }
- }
- return true;
- }
-
- protected boolean hasJava(IVirtualComponent component) {
- try {
- return component.getProject().isNatureEnabled("org.eclipse.jdt.core.javanature"); //$NON-NLS-1$
- } catch( CoreException ce) {
- // ignore
- }
- return false;
- }
-
-}
diff --git a/plugins/org.eclipse.jst.common.frameworks/src/org/eclipse/jst/common/internal/modulecore/ReplaceManifestExportParticipant.java b/plugins/org.eclipse.jst.common.frameworks/src/org/eclipse/jst/common/internal/modulecore/ReplaceManifestExportParticipant.java
deleted file mode 100644
index 257f197..0000000
--- a/plugins/org.eclipse.jst.common.frameworks/src/org/eclipse/jst/common/internal/modulecore/ReplaceManifestExportParticipant.java
+++ /dev/null
@@ -1,124 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2009 Red Hat and others.
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
- *
- * Contributors:
- * Red Hat - Initial API and implementation
- *******************************************************************************/
-package org.eclipse.jst.common.internal.modulecore;
-
-import java.io.File;
-import java.io.FileNotFoundException;
-import java.io.IOException;
-import java.util.ArrayList;
-import java.util.List;
-
-import org.eclipse.core.resources.IFile;
-import org.eclipse.core.resources.IProject;
-import org.eclipse.core.runtime.IPath;
-import org.eclipse.jst.common.frameworks.CommonFrameworksPlugin;
-import org.eclipse.jst.common.internal.modulecore.util.ManifestUtilities;
-import org.eclipse.wst.common.componentcore.internal.flat.AbstractFlattenParticipant;
-import org.eclipse.wst.common.componentcore.internal.flat.FlatFile;
-import org.eclipse.wst.common.componentcore.internal.flat.IFlatFolder;
-import org.eclipse.wst.common.componentcore.internal.flat.IFlatResource;
-import org.eclipse.wst.common.componentcore.internal.flat.VirtualComponentFlattenUtility;
-import org.eclipse.wst.common.componentcore.internal.flat.FlatVirtualComponent.FlatComponentTaskModel;
-import org.eclipse.wst.common.componentcore.resources.IVirtualComponent;
-import org.eclipse.wst.common.componentcore.resources.IVirtualReference;
-
-/**
- * This class is solely responsible for replacing manifest.mf files
- * which require updating before being exported
- *
- * @author rob
- *
- */
-public class ReplaceManifestExportParticipant extends AbstractFlattenParticipant {
- //protected static final IPath MANIFEST_PATH = new Path(J2EEConstants.MANIFEST_URI);
- private IPath manifestPath;
-
- public ReplaceManifestExportParticipant(IPath manifestPath) {
- this.manifestPath = manifestPath;
- }
-
- @Override
- public void finalize(IVirtualComponent component,
- FlatComponentTaskModel dataModel, List<IFlatResource> resources) {
- forceUpdate(component, dataModel, resources);
- }
-
- public void forceUpdate(IVirtualComponent component,
- FlatComponentTaskModel dataModel, List<IFlatResource> resources) {
- List<String> javaClasspathURIs = getClasspathURIs(component);
- if( !javaClasspathURIs.isEmpty()) {
- // find the old manifest
- IFlatFolder parent = (IFlatFolder)VirtualComponentFlattenUtility.getExistingModuleResource(resources, manifestPath.removeLastSegments(1));
- if( parent != null ) {
- IFlatResource[] children = parent.members();
- IFile original = null;
- int originalIndex = 0;
- for( int i = 0; i < children.length; i++) {
- if( children[i].getName().equals(manifestPath.lastSegment())) {
- original = (IFile)children[i].getAdapter(IFile.class);
- originalIndex = i;
- File newManifest = getNewManifest(component.getProject(), original, javaClasspathURIs);
- FlatFile newManifestExportable = new FlatFile(newManifest, newManifest.getName(), manifestPath.removeLastSegments(1));
- children[originalIndex] = newManifestExportable;
- parent.setMembers(children);
- return;
- }
- }
- }
- }
- }
-
- /**
- * Return whichever File is the new one, even if it's the same as the old one
- * @return
- */
- public File getNewManifest(IProject project, IFile originalManifest, List<String> javaClasspathURIs) {
- final IPath workingLocation = project.getWorkingLocation(CommonFrameworksPlugin.PLUGIN_ID);
- // create path to temp MANIFEST.MF
- final IPath tempManifestPath = workingLocation.append(manifestPath);
- final File tempFile = tempManifestPath.toFile();
- if (!tempFile.exists()) {
- // create parent dirs for temp MANIFEST.MF
- final File parent = tempFile.getParentFile();
- if (!parent.exists()) {
- if (!parent.mkdirs()) {
- return originalManifest != null ? originalManifest.getLocation().toFile() : null;
- }
- }
- }
- try {
- ManifestUtilities.updateManifestClasspath(originalManifest, javaClasspathURIs, tempFile);
- } catch (FileNotFoundException e) {
- } catch (IOException e) {
- }
- return tempFile.exists() ? tempFile :
- originalManifest != null ? originalManifest.getLocation().toFile() : null;
- }
-
- public static List<String> getClasspathURIs(IVirtualComponent component) {
- ArrayList<String> uris = new ArrayList<String>();
- uris = new ArrayList<String>();
- if (component instanceof IClasspathDependencyProvider) {
- final IClasspathDependencyProvider j2eeComp = (IClasspathDependencyProvider) component;
- final IVirtualReference[] refs = j2eeComp.getJavaClasspathReferences();
- if (refs != null) {
- for (int i = 0; i < refs.length; i++) {
- if (refs[i].getRuntimePath().toString().startsWith(IClasspathDependencyReceiver.RUNTIME_MAPPING_INTO_CONTAINER)) {
- uris.add(refs[i].getRuntimePath().removeFirstSegments(1).append(refs[i].getArchiveName()).toString());
- }
- }
- }
- }
- return uris;
- }
-
-
-}
diff --git a/plugins/org.eclipse.jst.common.frameworks/src/org/eclipse/jst/common/internal/modulecore/SingleRootExportParticipant.java b/plugins/org.eclipse.jst.common.frameworks/src/org/eclipse/jst/common/internal/modulecore/SingleRootExportParticipant.java
deleted file mode 100644
index 0e9059d..0000000
--- a/plugins/org.eclipse.jst.common.frameworks/src/org/eclipse/jst/common/internal/modulecore/SingleRootExportParticipant.java
+++ /dev/null
@@ -1,203 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2009 Red Hat and others.
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
- *
- * Contributors:
- * Red Hat - Initial API and implementation
- *******************************************************************************/
-package org.eclipse.jst.common.internal.modulecore;
-
-import java.util.ArrayList;
-import java.util.HashMap;
-import java.util.List;
-import java.util.Map;
-
-import org.eclipse.core.resources.IContainer;
-import org.eclipse.core.resources.IFile;
-import org.eclipse.core.resources.IResource;
-import org.eclipse.core.runtime.CoreException;
-import org.eclipse.core.runtime.IPath;
-import org.eclipse.core.runtime.Path;
-import org.eclipse.jst.common.internal.modulecore.SingleRootUtil.SingleRootCallback;
-import org.eclipse.wst.common.componentcore.internal.DependencyType;
-import org.eclipse.wst.common.componentcore.internal.flat.AbstractFlattenParticipant;
-import org.eclipse.wst.common.componentcore.internal.flat.ChildModuleReference;
-import org.eclipse.wst.common.componentcore.internal.flat.FlatFolder;
-import org.eclipse.wst.common.componentcore.internal.flat.FlatResource;
-import org.eclipse.wst.common.componentcore.internal.flat.IChildModuleReference;
-import org.eclipse.wst.common.componentcore.internal.flat.IFlatFile;
-import org.eclipse.wst.common.componentcore.internal.flat.IFlatFolder;
-import org.eclipse.wst.common.componentcore.internal.flat.IFlatResource;
-import org.eclipse.wst.common.componentcore.internal.flat.IFlattenParticipant;
-import org.eclipse.wst.common.componentcore.internal.flat.VirtualComponentFlattenUtility;
-import org.eclipse.wst.common.componentcore.internal.flat.FlatVirtualComponent.FlatComponentTaskModel;
-import org.eclipse.wst.common.componentcore.resources.IVirtualComponent;
-import org.eclipse.wst.common.componentcore.resources.IVirtualReference;
-
-/**
- * Single root optimization.
- * @author rob
- */
-public class SingleRootExportParticipant extends AbstractFlattenParticipant {
- private SingleRootParticipantCallback callbackHandler;
- private IVirtualComponent rootComponent;
- private FlatComponentTaskModel dataModel;
- private IFlattenParticipant[] delegates;
- private List<IChildModuleReference> children;
-
- public interface SingleRootParticipantCallback extends SingleRootCallback {
- public IFlattenParticipant[] getDelegateParticipants();
- }
-
- public SingleRootExportParticipant() {
- super();
- callbackHandler = null;
- }
- public SingleRootExportParticipant(SingleRootParticipantCallback handler) {
- this();
- callbackHandler = handler;
- }
-
- @Override
- public void initialize(IVirtualComponent component,
- FlatComponentTaskModel dataModel, List<IFlatResource> resources) {
- this.rootComponent = component;
- this.dataModel = dataModel;
- }
-
-
- private void initializeDelegates() {
- if (callbackHandler != null) {
- delegates = callbackHandler.getDelegateParticipants();
- }
- else {
- delegates = new IFlattenParticipant[] {};
- }
- }
-
- @Override
- public boolean canOptimize(IVirtualComponent component,
- FlatComponentTaskModel dataModel) {
- return new SingleRootUtil(component, callbackHandler).isSingleRoot();
- }
-
- @Override
- public void optimize(IVirtualComponent component, FlatComponentTaskModel dataModel,
- List<IFlatResource> resources, List<IChildModuleReference> childModules) {
- try {
- resources.clear(); // We want complete control
- childModules.clear();
- children = childModules;
- initializeDelegates();
-
- IContainer container = new SingleRootUtil(component, callbackHandler).getSingleRoot();
- IFlatResource[] mr = getMembers(resources, container, new Path("")); //$NON-NLS-1$
- int size = mr.length;
- for (int j = 0; j < size; j++) {
- resources.add(mr[j]);
- }
-
- addChildModules(component);
-
- // run finalizers
- for (int i = 0; i < delegates.length; i++) {
- delegates[i].finalize(component, dataModel, resources);
- }
- } catch( CoreException ce ) {
- // TODO
- }
- }
-
- protected IFlatResource[] getMembers(List<IFlatResource> members,
- IContainer cont, IPath path) throws CoreException {
- IResource[] res = cont.members();
- int size2 = res.length;
- List list = new ArrayList(size2);
- for (int j = 0; j < size2; j++) {
- if (res[j] instanceof IContainer) {
- IContainer cc = (IContainer) res[j];
- // Retrieve already existing module folder if applicable
- IFlatFolder mf = (FlatFolder) VirtualComponentFlattenUtility.getExistingModuleResource(members,path.append(new Path(cc.getName()).makeRelative()));
- if (mf == null) {
- mf = new FlatFolder(cc, cc.getName(), path);
- IFlatFolder parent = (FlatFolder) VirtualComponentFlattenUtility.getExistingModuleResource(members, path);
- if (path.isEmpty() || path.equals(new Path("/"))) //$NON-NLS-1$
- members.add(mf);
- else {
- if (parent == null)
- parent = VirtualComponentFlattenUtility.ensureParentExists(members, path, cc);
- VirtualComponentFlattenUtility.addMembersToModuleFolder(parent, new IFlatResource[] {mf});
- }
- }
- IFlatResource[] mr = getMembers(members, cc, path.append(cc.getName()));
- VirtualComponentFlattenUtility.addMembersToModuleFolder(mf, mr);
- } else {
- IFile f = (IFile) res[j];
- IFlatFile mf = VirtualComponentFlattenUtility.createModuleFile(f, path);
- if (shouldAddComponentFile(rootComponent, mf))
- list.add(mf);
- }
- }
- FlatResource[] mr = new FlatResource[list.size()];
- list.toArray(mr);
- return mr;
- }
-
- protected void addChildModules(IVirtualComponent vc) throws CoreException {
- Map<String, Object> options = new HashMap<String, Object>();
- options.put(IVirtualComponent.REQUESTED_REFERENCE_TYPE, IVirtualComponent.FLATTENABLE_REFERENCES);
- IVirtualReference[] allReferences = vc.getReferences(options);
- for (int i = 0; i < allReferences.length; i++) {
- IVirtualReference reference = allReferences[i];
- if (reference.getDependencyType() == DependencyType.USES ) {
- if (shouldIgnoreReference(vc, reference))
- continue;
-
- if (isChildModule(vc, reference)) {
- ChildModuleReference cm = new ChildModuleReference(reference, new Path("")); //$NON-NLS-1$
- List<IChildModuleReference> duplicates = new ArrayList();
- for (IChildModuleReference tmp : children) {
- if (tmp.getRelativeURI().equals(cm.getRelativeURI()))
- duplicates.add(tmp);
- }
- children.removeAll(duplicates);
- children.add(cm);
- }
- }
- }
- }
-
- protected boolean isChildModule(IVirtualComponent component, IVirtualReference referencedComponent) {
- for (int i = 0; i < delegates.length; i++) {
- if (delegates[i].isChildModule(component, referencedComponent, dataModel))
- return true;
- }
- return false;
- }
-
- protected boolean shouldIgnoreReference(IVirtualComponent component, IVirtualReference referencedComponent) {
- for (int i = 0; i < delegates.length; i++ ) {
- if (delegates[i].shouldIgnoreReference(component, referencedComponent, dataModel))
- return true;
- }
- return false;
- }
-
-
- public boolean shouldAddComponentFile(IVirtualComponent component, IFlatFile file) {
- for (int i = 0; i < delegates.length; i++) {
- if (delegates[i].isChildModule(component, dataModel, file)) {
- ChildModuleReference child = new ChildModuleReference(component.getProject(), file);
- children.add(child);
- return false;
- } else if (!delegates[i].shouldAddExportableFile(component, component, dataModel, file))
- return false;
- }
- return true;
- }
-
-
-}
diff --git a/plugins/org.eclipse.jst.common.frameworks/src/org/eclipse/jst/common/internal/modulecore/SingleRootStatus.java b/plugins/org.eclipse.jst.common.frameworks/src/org/eclipse/jst/common/internal/modulecore/SingleRootStatus.java
deleted file mode 100644
index b78535f..0000000
--- a/plugins/org.eclipse.jst.common.frameworks/src/org/eclipse/jst/common/internal/modulecore/SingleRootStatus.java
+++ /dev/null
@@ -1,48 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2009 IBM Corporation and others.
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
- *
- * Contributors:
- * IBM Corporation - initial API and implementation
- *******************************************************************************/
-package org.eclipse.jst.common.internal.modulecore;
-
-import org.eclipse.core.resources.IContainer;
-import org.eclipse.core.runtime.IPath;
-import org.eclipse.core.runtime.IStatus;
-import org.eclipse.core.runtime.Status;
-import org.eclipse.jst.common.frameworks.CommonFrameworksPlugin;
-
-public class SingleRootStatus extends Status implements ISingleRootStatus {
-
- IPath path;
- IContainer container;
-
- public SingleRootStatus(int type, int code, IPath resourcePath, IContainer containerPath, String message, Throwable exception) {
- super(type, CommonFrameworksPlugin.PLUGIN_ID, code, message, exception);
- path = resourcePath;
- container = containerPath;
- }
-
- public SingleRootStatus(int code, IPath resourcePath, IContainer containerPath) {
- this(getSeverity(code), code, resourcePath, containerPath, null, null);
- }
-
- public IPath getPath() {
- return path;
- }
-
- public IContainer getSingleRoot() {
- return container;
- }
-
- protected static int getSeverity(int code) {
- if( code < 33 ) return IStatus.INFO;
- if( code < 128 ) return IStatus.WARNING;
- return IStatus.ERROR;
- }
-
-}
diff --git a/plugins/org.eclipse.jst.common.frameworks/src/org/eclipse/jst/common/internal/modulecore/SingleRootUtil.java b/plugins/org.eclipse.jst.common.frameworks/src/org/eclipse/jst/common/internal/modulecore/SingleRootUtil.java
deleted file mode 100644
index 0a5f438..0000000
--- a/plugins/org.eclipse.jst.common.frameworks/src/org/eclipse/jst/common/internal/modulecore/SingleRootUtil.java
+++ /dev/null
@@ -1,445 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2009 IBM Corporation and others.
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
- *
- * Contributors:
- * IBM Corporation - initial API and implementation
- *******************************************************************************/
-package org.eclipse.jst.common.internal.modulecore;
-
-import java.util.Collections;
-import java.util.Iterator;
-import java.util.List;
-
-import org.eclipse.core.resources.IContainer;
-import org.eclipse.core.resources.IFolder;
-import org.eclipse.core.resources.IProject;
-import org.eclipse.core.resources.IResource;
-import org.eclipse.core.runtime.CoreException;
-import org.eclipse.core.runtime.IPath;
-import org.eclipse.core.runtime.IStatus;
-import org.eclipse.core.runtime.MultiStatus;
-import org.eclipse.core.runtime.Path;
-import org.eclipse.core.runtime.Status;
-import org.eclipse.jst.common.frameworks.CommonFrameworksPlugin;
-import org.eclipse.jst.common.jdt.internal.javalite.JavaLiteUtilities;
-import org.eclipse.wst.common.componentcore.internal.ComponentResource;
-import org.eclipse.wst.common.componentcore.internal.Property;
-import org.eclipse.wst.common.componentcore.internal.StructureEdit;
-import org.eclipse.wst.common.componentcore.internal.WorkbenchComponent;
-import org.eclipse.wst.common.componentcore.resources.IVirtualComponent;
-import org.eclipse.wst.common.componentcore.resources.IVirtualReference;
-
-public class SingleRootUtil {
- public interface SingleRootCallback {
- public boolean canValidate(IVirtualComponent vc);
- public void validate(SingleRootUtil util, IVirtualComponent vc, IProject project, List resourceMaps);
- }
-
- /**
- * Used to return immediately after the first error code is found.
- */
- public static final int INCLUDE_FIRST_ERROR = 0x08;
- /**
- * Used to capture all status codes (error, warning, info)
- */
- public static final int INCLUDE_ALL = 0x07;
- /**
- * Used to capture all error and warning status codes only.
- */
- public static final int INCLUDE_ERRORS_AND_WARNINGS = 0x06;
- /**
- * Used to capture all error status codes only.
- */
- public static final int INCLUDE_ERRORS = 0x04;
-
- private static final int WARNINGS = 0x02;
- private static final int INFO = 0x01;
- private static final int CANCEL = 0x0;
- private static final int GET_SINGLE_ROOT_CONTAINER = 0x09;
- private static String USE_SINGLE_ROOT_PROPERTY = "useSingleRoot"; //$NON-NLS-1$
- private IVirtualComponent aComponent;
- private SingleRootCallback callback;
- private List<IContainer> cachedSourceContainers;
- private IContainer[] cachedOutputContainers;
- private MultiStatus wrapperStatus;
- private int VALIDATE_FLAG;
-
- public SingleRootUtil(IVirtualComponent component) {
- this(component, null);
- }
-
- public SingleRootUtil(IVirtualComponent component, SingleRootCallback callback) {
- this.aComponent = component;
- this.callback = callback;
- }
-
-
- /**
- * Returns true if this module has a simple structure based on a
- * single-root folder, and false otherwise.
- *
- * In a single-root structure, all files that are contained within the root folder
- * are part of the module, and are already in the correct module structure. No
- * module resources exist outside of this single folder.
- *
- * @return true if this module has a single-root structure, and
- * false otherwise
- */
- public boolean isSingleRoot() {
- return validateSingleRoot(INCLUDE_FIRST_ERROR).getSeverity() != IStatus.ERROR;
- }
-
- /**
- * Will attempt to return the IContainer that counts as the "single-root".
- * If this module does not qualify as a "single-root" module, this
- * method will return null. Otherwise it will return an IContainer
- * that may be used as the single-root container.
- *
- * @return IContainer representing single-root container
- */
- public IContainer getSingleRoot() {
- IStatus status = validateSingleRoot(GET_SINGLE_ROOT_CONTAINER);
- if (status.getSeverity() == IStatus.INFO) {
- IStatus[] children = ((MultiStatus) status).getChildren();
- ISingleRootStatus rootStatus = (ISingleRootStatus) children[0];
- return rootStatus.getSingleRoot();
- }
- return null;
- }
-
- /**
- * Validates whether the component module has a single-root structure.
- * An IStatus with a severity of OK is returned for a valid single-root
- * structure. A MultiStatus containing children of type ISingleRootStatus
- * is returned if any status codes were captured during the validation.
- * A MultiStatus with a severity of INFO or WARNING is returned for a valid
- * single-root structure containing status codes with no severities of ERROR.
- * A MultiStatus with a severity of ERROR means the component does not have a
- * valid single-root structure.
- *
- * @param flag - indicates the status codes (by severity) to capture during
- * the validation. The INLCUDE_ALL flag will also capture the
- * single-root container if a single-root structure was found.
- * Valid flags are:
- * INCLUDE_ALL
- * INCLUDE_ERRORS_AND_WARNINGS
- * INCLUDE_ERRORS
- * INCLUDE_FIRST_ERROR
- *
- * @return IStatus
- */
- public IStatus validateSingleRoot(int flag) {
- VALIDATE_FLAG = flag;
- wrapperStatus = null;
- StructureEdit edit = null;
- try {
- edit = StructureEdit.getStructureEditForRead(getProject());
- if (edit == null || edit.getComponent() == null) {
- reportStatus(ISingleRootStatus.NO_COMPONENT_FOUND);
- return getStatus();
- }
-
- if (aComponent.isBinary()) {
- reportStatus(ISingleRootStatus.BINARY_COMPONENT_FOUND);
- return getStatus();
- }
-
- // 229650 - check to see if the property 'useSingleRoot' is defined.
- Boolean useSingleRoot = getUseSingleRootProperty(edit);
- if (useSingleRoot != null) {
- //check if it was set to false
- if (!useSingleRoot.booleanValue()) {
- reportStatus(ISingleRootStatus.EXPLICITLY_DISABLED);
- }
- else {
- reportStatus(ISingleRootStatus.SINGLE_ROOT_FORCED, aComponent.getRootFolder().getUnderlyingFolder());
- }
- return getStatus();
- }
-
- // if there are any consumed references, this is not single-root
- if (hasConsumableReferences(aComponent)) {
- reportStatus(ISingleRootStatus.CONSUMABLE_REFERENCES_FOUND);
- if (VALIDATE_FLAG == CANCEL)
- return getStatus();
- }
-
- // if there are any linked resources then this is not a single-root module
- if (rootFoldersHaveLinkedContent()) {
- reportStatus(ISingleRootStatus.LINKED_RESOURCES_FOUND);
- if (VALIDATE_FLAG == CANCEL)
- return getStatus();
- }
-
- List resourceMaps = edit.getComponent().getResources();
-
- // If the list is empty, return false
- if (resourceMaps.size() < 1) {
- reportStatus(ISingleRootStatus.NO_RESOURCE_MAPS_FOUND);
- return getStatus();
- }
-
- if (callback != null && callback.canValidate(aComponent)) {
- callback.validate(this, aComponent, getProject(), resourceMaps);
- }
- if (VALIDATE_FLAG != CANCEL) {
- validateProject(resourceMaps);
- }
- return getStatus();
- } finally {
- cachedOutputContainers = null;
- cachedSourceContainers = null;
- if (edit != null)
- edit.dispose();
- }
- }
-
- protected Boolean getUseSingleRootProperty(StructureEdit edit) {
- WorkbenchComponent wbComp = edit.getComponent();
- final List componentProperties = wbComp.getProperties();
- if (componentProperties != null) {
- final Iterator componentPropertiesIterator = componentProperties.iterator();
- while (componentPropertiesIterator.hasNext()) {
- Property wbProperty = (Property) componentPropertiesIterator.next();
- if (USE_SINGLE_ROOT_PROPERTY.equals(wbProperty.getName())) {
- return Boolean.valueOf(wbProperty.getValue());
- }
- }
- }
- return null;
- }
-
- protected boolean hasConsumableReferences(IVirtualComponent vc) {
- IVirtualReference[] refComponents = vc.getReferences();
- for (int i = 0; i < refComponents.length; i++) {
- IVirtualReference reference = refComponents[i];
- if (reference != null && reference.getDependencyType()==IVirtualReference.DEPENDENCY_TYPE_CONSUMES) {
- return true;
- }
- }
- return false;
- }
-
- private void validateProject(List resourceMaps) {
- // Ensure there are only source folder component resource mappings to the root content folder
- if (isRootResourceMapping(resourceMaps)) {
- IContainer[] javaOutputFolders = getJavaOutputFolders();
- // Verify only one java outputfolder
- if (javaOutputFolders.length == 1) {
- // By the time we get here we know: for any folders defined as source in the
- // .component file that they are also java source folders.
- if (!isSourceContainer(javaOutputFolders[0])) {
- // The single output folder is NOT a source folder so this is single-rooted. Since the
- // output folder (something like classes or bin) is not a source folder, JDT copies all files
- // (including non Java files) to this folder, so every resource needed at runtime is located
- // in a single directory.
- reportStatus(ISingleRootStatus.SINGLE_ROOT_CONTAINER_FOUND, javaOutputFolders[0]);
- return;
- }
- // Verify the java output folder is the same as one of the content roots
- IPath javaOutputPath = getJavaOutputFolders()[0].getProjectRelativePath();
- IContainer[] rootFolders = aComponent.getRootFolder().getUnderlyingFolders();
- for (int i=0; i < rootFolders.length; i++) {
- IPath compRootPath = rootFolders[i].getProjectRelativePath();
- if (javaOutputPath.equals(compRootPath)) {
- reportStatus(ISingleRootStatus.SINGLE_ROOT_CONTAINER_FOUND, aComponent.getRootFolder().getUnderlyingFolder());
- return;
- }
- }
- reportStatus(ISingleRootStatus.JAVA_OUTPUT_NOT_A_CONTENT_ROOT);
- }
- else {
- reportStatus(ISingleRootStatus.JAVA_OUTPUT_GREATER_THAN_1);
- }
- }
- }
-
- public IContainer[] getJavaOutputFolders() {
- if (cachedOutputContainers == null)
- cachedOutputContainers = getJavaOutputFolders(aComponent);
- return cachedOutputContainers;
- }
-
- public static IContainer[] getJavaOutputFolders(IVirtualComponent component) {
- if (component == null)
- return new IContainer[0];
-
- List<IContainer> l = JavaLiteUtilities.getJavaOutputContainers(component);
- return l.toArray(new IContainer[l.size()]);
- }
-
- /**
- * Checks if the path argument is to a source container for the project.
- *
- * @param a workspace relative full path
- * @return is path a source container?
- */
- public boolean isSourceContainer(IContainer sourceContainer) {
- if (cachedSourceContainers == null) {
- cachedSourceContainers = getSourceContainers(aComponent);
- }
- return cachedSourceContainers.contains(sourceContainer);
- }
-
- public static List<IContainer> getSourceContainers(IVirtualComponent component) {
- if (component == null)
- Collections.emptyList();
- return JavaLiteUtilities.getJavaSourceContainers(component);
- }
-
- /*
- * This method returns true if the root folders of this component have any linked resources (folder or file);
- * Otherwise false is returned.
- */
- private boolean rootFoldersHaveLinkedContent() {
- if (this.aComponent != null) {
- final IContainer[] rootFolders = this.aComponent.getRootFolder().getUnderlyingFolders();
- for (int i = 0; i < rootFolders.length; i++) {
- try {
- boolean hasLinkedContent = this.hasLinkedContent(rootFolders[i]);
- if (hasLinkedContent) {
- return true;
- }
- }
- catch (CoreException coreEx) {
- CommonFrameworksPlugin.logError(coreEx);
- }
- }
- }
- return false;
- }
-
- /*
- * If the resource to check is a file then this method will return true if the file is linked. If the resource to
- * check is a folder then this method will return true if it, any of its sub directories, or any file contained
- * with-in this directory of any of it's sub directories are linked. Otherwise false is returned.
- */
- private boolean hasLinkedContent(final IResource resourceToCheck) throws CoreException {
- if ((resourceToCheck != null) && resourceToCheck.isAccessible()) {
- // skip non-accessible files
- if (resourceToCheck.isLinked()) {
- return true;
- }
- switch (resourceToCheck.getType()) {
- case IResource.FOLDER:
- // recursively check sub directory contents
- final IResource[] subDirContents = ((IFolder) resourceToCheck).members();
- for (int i = 0; i < subDirContents.length; i++) {
- if (hasLinkedContent(subDirContents[i])) {
- return true;
- }
- }
- break;
- case IResource.FILE:
- return resourceToCheck.isLinked();
- default:
- // skip as we only care about files and folders
- break;
- }
- }
- return false;
- }
-
- /**
- * Ensure that any component resource mappings are for source folders and
- * that they map to the root content folder
- *
- * @param resourceMaps
- * @return boolean
- */
- private boolean isRootResourceMapping(List resourceMaps) {
- for (int i=0; i < resourceMaps.size(); i++) {
- ComponentResource resourceMap = (ComponentResource) resourceMaps.get(i);
- // Verify it maps to "/" for the content root
- if (!isRootMapping(resourceMap)) {
- reportStatus(ISingleRootStatus.RUNTIME_PATH_NOT_ROOT, resourceMap.getRuntimePath());
- if (VALIDATE_FLAG == CANCEL) return false;
- }
-
- // verify it is also a src container
- IPath sourcePath = resourceMap.getSourcePath();
- IResource sourceResource = getProject().findMember(sourcePath);
- if (sourceResource != null && sourceResource.exists()) {
- if (sourceResource instanceof IContainer && !isSourceContainer((IContainer) sourceResource)) {
- reportStatus(ISingleRootStatus.SOURCE_NOT_JAVA_CONTAINER, sourcePath);
- }
- }
- else {
- reportStatus(ISingleRootStatus.SOURCE_PATH_NOT_FOUND, sourcePath);
- }
- if (VALIDATE_FLAG == CANCEL) return false;
- }
- return true;
- }
-
- public boolean isRootMapping(ComponentResource map) {
- // Verify it maps to "/" for the content root
- if (map.getRuntimePath().equals(Path.ROOT))
- return true;
- return false;
- }
-
- public IProject getProject() {
- return aComponent.getProject();
- }
-
- public void reportStatus(int code) {
- reportStatus(code, null, null);
- }
-
- public void reportStatus(int code, IContainer container) {
- reportStatus(code, null, container);
- }
-
- public void reportStatus(int code, IPath path) {
- reportStatus(code, path, null);
- }
-
- public void reportStatus(int code, IPath path, IContainer container) {
- ISingleRootStatus status = new SingleRootStatus(code, path, container);
- if (status.getSeverity() == IStatus.ERROR) {
- if ((VALIDATE_FLAG & INCLUDE_FIRST_ERROR) != 0) {
- VALIDATE_FLAG = CANCEL;
- addStatus(status);
- }
- else if ((VALIDATE_FLAG & INCLUDE_ERRORS) != 0) {
- addStatus(status);
- }
- }
- else if (status.getSeverity() == IStatus.WARNING && (VALIDATE_FLAG & WARNINGS) != 0) {
- addStatus(status);
- }
- else if (status.getSeverity() == IStatus.INFO && (VALIDATE_FLAG & INFO) != 0) {
- VALIDATE_FLAG = CANCEL;
- addStatus(status);
- }
- }
-
- public int getValidateFlag() {
- return VALIDATE_FLAG;
- }
-
- public void setValidateFlag(int validateFlag) {
- VALIDATE_FLAG = validateFlag;
- }
-
- public IStatus getStatus() {
- if (wrapperStatus != null) {
- return wrapperStatus;
- }
- return Status.OK_STATUS;
- }
-
- private void addStatus(ISingleRootStatus status) {
- if (wrapperStatus == null) {
- wrapperStatus = new MultiStatus(CommonFrameworksPlugin.PLUGIN_ID, 0, new IStatus[] { status }, null, null);
- } else {
- wrapperStatus.add(status);
- }
- }
-
-}
diff --git a/plugins/org.eclipse.jst.common.frameworks/src/org/eclipse/jst/common/internal/modulecore/util/AbstractJavaComponentDiscerner.java b/plugins/org.eclipse.jst.common.frameworks/src/org/eclipse/jst/common/internal/modulecore/util/AbstractJavaComponentDiscerner.java
deleted file mode 100644
index 2a93e0f..0000000
--- a/plugins/org.eclipse.jst.common.frameworks/src/org/eclipse/jst/common/internal/modulecore/util/AbstractJavaComponentDiscerner.java
+++ /dev/null
@@ -1,37 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2009 Red Hat and others.
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
- *
- * Contributors:
- * Red Hat - Initial API and implementation
- *******************************************************************************/
-package org.eclipse.jst.common.internal.modulecore.util;
-
-import org.eclipse.core.resources.IProject;
-import org.eclipse.wst.common.componentcore.resources.IVirtualReference;
-
-public class AbstractJavaComponentDiscerner implements IJavaComponentDiscerner {
-
- public IProject[] findParentProjects(IProject child) {
- return new IProject[]{};
- }
-
- public IVirtualReference[] findPossibleManifestEntries(
- IProject parentProject, IProject childProject) {
- return new IVirtualReference[]{};
- }
-
- public IVirtualReference[] findPossibleManifestEntries(
- IProject parentProject, IProject childProject,
- IVirtualReference[] currentEntries) {
- return new IVirtualReference[]{};
- }
-
- public IVirtualReference[] findCurrentManifestEntries(
- IProject parentProject, IProject childProject) {
- return new IVirtualReference[]{};
- }
-}
diff --git a/plugins/org.eclipse.jst.common.frameworks/src/org/eclipse/jst/common/internal/modulecore/util/ArchiveManifest.java b/plugins/org.eclipse.jst.common.frameworks/src/org/eclipse/jst/common/internal/modulecore/util/ArchiveManifest.java
deleted file mode 100644
index db2dd0e..0000000
--- a/plugins/org.eclipse.jst.common.frameworks/src/org/eclipse/jst/common/internal/modulecore/util/ArchiveManifest.java
+++ /dev/null
@@ -1,124 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2001, 2005 IBM Corporation and others.
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
- *
- * Contributors:
- * IBM Corporation - initial API and implementation
- *******************************************************************************/
-package org.eclipse.jst.common.internal.modulecore.util;
-
-
-
-import java.io.IOException;
-import java.io.InputStream;
-import java.io.OutputStream;
-import java.util.Map;
-import java.util.jar.Attributes;
-
-/**
- * Contains the API of
- *
- * @link java.util.jar.Manifest, along with added helpers
- */
-public interface ArchiveManifest {
- /**
- * Creates a new manifest entry (attributes) for the given name
- */
- public void addEntry(String entryName);
-
- public void addEntry(String entryName, Attributes attr);
-
- /**
- * Adds the key/value pair to the attributes for the given entry name; if the entry does not
- * exist, creates a new attributes
- */
- public void addEntryAttribute(String entryName, String key, String value);
-
- /**
- * Defaults the version to "1.0" if not already set
- */
- public void addVersionIfNecessary();
-
- public void appendClassPath(String extension);
-
- /**
- * @see java.util.jar.Manifest#clear
- */
- public void clear();
-
- /**
- * @see java.util.jar.Manifest#getAttributes
- */
- public Attributes getAttributes(String name);
-
- public String getClassPath();
-
- public String[] getClassPathTokenized();
-
- /**
- * @see java.util.jar.Manifest#getEntries
- */
- public Map getEntries();
-
- public String getEntryAttribute(String entryName, String key);
-
- /**
- * @see java.util.jar.Manifest#getAttributes
- */
- public Attributes getMainAttributes();
-
- public String getMainClass();
-
- /**
- * Return the value iff the entry exists in a case-sensitive manner; manifest version is
- * required for the manifest to save correctly
- */
- public String getManifestVersion();
-
- /**
- * Return the value iff the entry exists in a case-sensitive manner; implementation version is
- * optional in the manifest
- * */
- public String getImplementationVersion();
-
- /**
- * Add all the entries not already contained in the class path of this manifest
- */
- public void mergeClassPath(String[] classPathEntries);
-
- /**
- * @see java.util.jar.Manifest#read
- */
- public void read(InputStream is) throws IOException;
-
- public void removeEntry(String entryName);
-
- public void removeEntryAttribute(String entryName, Object key);
-
- public void setClassPath(String aSpaceDelimitedPath);
-
- public void setMainClass(String className);
-
- public void setManifestVersion(java.lang.String version);
-
- public void setImplemenationVersion(java.lang.String version);
-
- /**
- * @see java.util.jar.Manifest#write
- */
- public void write(OutputStream out) throws IOException;
-
- /**
- * Writes the Manifest to the specified OutputStream, splitting each classpath entry on a line
- * by itself.
- *
- * @param out
- * the output stream
- * @exception IOException
- * if an I/O error has occurred
- */
- public void writeSplittingClasspath(OutputStream out) throws IOException;
-}
diff --git a/plugins/org.eclipse.jst.common.frameworks/src/org/eclipse/jst/common/internal/modulecore/util/ArchiveManifestImpl.java b/plugins/org.eclipse.jst.common.frameworks/src/org/eclipse/jst/common/internal/modulecore/util/ArchiveManifestImpl.java
deleted file mode 100644
index 166b6de..0000000
--- a/plugins/org.eclipse.jst.common.frameworks/src/org/eclipse/jst/common/internal/modulecore/util/ArchiveManifestImpl.java
+++ /dev/null
@@ -1,357 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2001, 2006 IBM Corporation and others.
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
- *
- * Contributors:
- * IBM Corporation - initial API and implementation
- *******************************************************************************/
-package org.eclipse.jst.common.internal.modulecore.util;
-
-
-
-import java.io.DataOutputStream;
-import java.io.IOException;
-import java.io.OutputStream;
-import java.util.Iterator;
-import java.util.Map;
-import java.util.jar.Attributes;
-
-import com.ibm.icu.util.StringTokenizer;
-
-
-/**
- * Helper class for manifest files
- */
-public class ArchiveManifestImpl extends java.util.jar.Manifest implements ArchiveManifest {
- /**
- * ArchiveManifest constructor comment.
- */
- public ArchiveManifestImpl() {
- super();
- }
-
- /**
- * ArchiveManifest constructor comment.
- *
- * @param is
- * java.io.InputStream
- * @throws java.io.IOException
- * The exception description.
- */
- public ArchiveManifestImpl(java.io.InputStream is) throws java.io.IOException {
- try {
- read(is);
- } catch(Exception e){
- IOException ioe = new IOException(e.toString());
- ioe.initCause(e);
- throw ioe;
- }
- }
-
- /**
- * ArchiveManifest constructor comment.
- *
- * @param man
- * java.util.jar.Manifest
- */
- public ArchiveManifestImpl(java.util.jar.Manifest man) {
- super(man);
- }
-
- /**
- * Creates a new manifest entry (attributes) for the given name
- */
- public void addEntry(String entryName) {
- Attributes attr = new Attributes();
- addEntry(entryName, attr);
- }
-
- public void addEntry(String entryName, Attributes attr) {
- getEntries().put(entryName, attr);
- }
-
- /**
- * Adds the key/value pair to the attributes for the given entry name; if the entry does not
- * exist, creates a new attributes
- */
- public void addEntryAttribute(String entryName, String key, String value) {
- Attributes attr = getAttributes(entryName);
- if (attr == null)
- addEntry(entryName);
- attr = getAttributes(entryName);
- attr.putValue(key, value);
- }
-
- public void addVersionIfNecessary() {
- //This is a hack because of the fact that the manifest does not serialize correctly if
- //The version is not set. In addition to saves, the serialization is used for copy
- if (getManifestVersion() == null || getManifestVersion().equals(""))//$NON-NLS-1$
- setManifestVersion("1.0");//$NON-NLS-1$
- }
-
- /**
- * @see org.eclipse.jst.j2ee.commonarchivecore.internal.helpers.ArchiveManifest
- */
- public void appendClassPath(java.lang.String extension) {
- String classPath = getClassPath();
- if (classPath != null)
- setClassPath(classPath + " " + extension);//$NON-NLS-1$
- else
- setClassPath(extension);
- }
-
- /**
- * @see org.eclipse.jst.j2ee.commonarchivecore.internal.helpers.ArchiveManifest
- */
- public java.lang.String getClassPath() {
- return ManifestUtilities.getValueIgnoreKeyCase(Attributes.Name.CLASS_PATH.toString(), getMainAttributes());
- }
-
- /**
- * @see org.eclipse.jst.j2ee.commonarchivecore.internal.helpers.ArchiveManifest
- */
- public java.lang.String[] getClassPathTokenized() {
- String classPath = getClassPath();
- if (classPath == null)
- return new String[0];
- return ManifestUtilities.getTokens(classPath);
- }
-
- public String getEntryAttribute(String entryName, String key) {
- Attributes attr = getAttributes(entryName);
- if (attr == null)
- return null;
- return attr.getValue(key);
- }
-
- public String getMainClass() {
- return ManifestUtilities.getValueIgnoreKeyCase(Attributes.Name.MAIN_CLASS.toString(), getMainAttributes());
- }
-
- public String getManifestVersion() {
- return getMainAttributes().getValue(Attributes.Name.MANIFEST_VERSION);
- }
-
- /**
- * @see org.eclipse.jst.j2ee.commonarchivecore.internal.helpers.ArchiveManifest
- */
- public void mergeClassPath(java.lang.String[] classPathEntries) {
- StringBuffer sb = new StringBuffer();
- java.util.List existing = java.util.Arrays.asList(getClassPathTokenized());
- String cp = getClassPath();
- if (cp != null)
- sb.append(cp);
- boolean empty = cp == null || "".equals(cp); //$NON-NLS-1$
- for (int i = 0; i < classPathEntries.length; i++) {
- if (!existing.contains(classPathEntries[i])) {
- if (!empty)
- sb.append(" "); //$NON-NLS-1$
- else
- empty = false;
- sb.append(classPathEntries[i]);
- }
- }
- setClassPath(sb.toString());
- }
-
- public void removeEntry(String entryName) {
- getEntries().remove(entryName);
- }
-
- public void removeEntryAttribute(String entryName, Object key) {
- Attributes attr = getAttributes(entryName);
- if (attr != null)
- attr.remove(key);
- }
-
- /**
- * @see org.eclipse.jst.j2ee.commonarchivecore.internal.helpers.ArchiveManifest
- */
- public void setClassPath(java.lang.String aSpaceDelimitedPath) {
- Attributes attributes = getMainAttributes();
- if (aSpaceDelimitedPath == null)
- attributes.remove(Attributes.Name.CLASS_PATH);
- else
- attributes.putValue(Attributes.Name.CLASS_PATH.toString(), aSpaceDelimitedPath);
- }
-
- /**
- * @see org.eclipse.jst.j2ee.commonarchivecore.internal.helpers.ArchiveManifest
- */
- public void setMainClass(java.lang.String className) {
- Attributes attributes = getMainAttributes();
- if (className == null)
- attributes.remove(Attributes.Name.MAIN_CLASS);
- else
- attributes.putValue(Attributes.Name.MAIN_CLASS.toString(), className);
- }
-
- /**
- * @see org.eclipse.jst.j2ee.commonarchivecore.internal.helpers.ArchiveManifest
- */
- public void setManifestVersion(java.lang.String version) {
- Attributes attributes = getMainAttributes();
- attributes.putValue(Attributes.Name.MANIFEST_VERSION.toString(), version);
- }
-
- /**
- * Writes the Manifest to the specified OutputStream, splitting each classpath entry on a line
- * by itself.
- *
- * @param out
- * the output stream
- * @exception IOException
- * if an I/O error has occurred
- */
- public void writeSplittingClasspath(OutputStream out) throws IOException {
- DataOutputStream dos = new DataOutputStream(out);
- // Write out the main attributes for the manifest
- writeMainSplittingClasspath(getMainAttributes(), dos);
- // Now write out the pre-entry attributes
- Iterator it = getEntries().entrySet().iterator();
- while (it.hasNext()) {
- Map.Entry e = (Map.Entry) it.next();
- StringBuffer buffer = new StringBuffer("Name: "); //$NON-NLS-1$
- buffer.append((String) e.getKey());
- buffer.append("\r\n"); //$NON-NLS-1$
- localMake72Safe(buffer);
- dos.writeBytes(buffer.toString());
- write((Attributes) e.getValue(), dos);
- }
- dos.flush();
- }
-
- /*
- * Writes the current attributes to the specified data output stream. XXX Need to handle UTF8
- * values and break up lines longer than 72 bytes
- *
- * @see Attributes#write
- */
- protected void write(Attributes attributes, DataOutputStream os) throws IOException {
- Iterator it = attributes.entrySet().iterator();
- while (it.hasNext()) {
- Map.Entry e = (Map.Entry) it.next();
- StringBuffer buffer = new StringBuffer(((Attributes.Name) e.getKey()).toString());
- buffer.append(": "); //$NON-NLS-1$
- buffer.append(toUtf8((String) e.getValue()));
- buffer.append("\r\n"); //$NON-NLS-1$
- localMake72Safe(buffer);
- os.writeBytes(buffer.toString());
- }
- os.writeBytes("\r\n"); //$NON-NLS-1$
- }
-
- /*
- * Writes the current attributes to the specified data output stream, make sure to write out the
- * MANIFEST_VERSION or SIGNATURE_VERSION attributes first.
- *
- * @see Attributes#writeMain
- */
- protected void writeMainSplittingClasspath(Attributes attributes, DataOutputStream out) throws IOException {
- // write out the *-Version header first, if it exists
- String vername = Attributes.Name.MANIFEST_VERSION.toString();
- String version = toUtf8(attributes.getValue(vername));
- if (version == null) {
- vername = Attributes.Name.SIGNATURE_VERSION.toString();
- version = toUtf8(attributes.getValue(vername));
- }
-
- if (version != null) {
- out.writeBytes(vername + ": " + version + "\r\n"); //$NON-NLS-1$ //$NON-NLS-2$
- }
-
- // write out all attributes except for the version
- // we wrote out earlier
- Iterator it = attributes.entrySet().iterator();
- while (it.hasNext()) {
- Map.Entry e = (Map.Entry) it.next();
- String name = ((Attributes.Name) e.getKey()).toString();
- if ((version != null) && !(name.equalsIgnoreCase(vername))) {
- if (name.equalsIgnoreCase(Attributes.Name.CLASS_PATH.toString())) {
- writeSplit(out, name, toUtf8((String) e.getValue()));
- continue;
- }
- StringBuffer buffer = new StringBuffer(name);
- buffer.append(": "); //$NON-NLS-1$
- buffer.append(toUtf8((String) e.getValue()));
- buffer.append("\r\n"); //$NON-NLS-1$
- localMake72Safe(buffer);
- out.writeBytes(buffer.toString());
- }
- }
- out.writeBytes("\r\n"); //$NON-NLS-1$
- }
-
- protected void writeSplit(DataOutputStream out, String name, String value) throws IOException {
- StringTokenizer tok = new StringTokenizer(value);
- int inc = 0;
- while (tok.hasMoreTokens()) {
- StringBuffer buffer = null;
- if (inc == 0) {
- buffer = new StringBuffer(name);
- buffer.append(": "); //$NON-NLS-1$
- } else {
- buffer = new StringBuffer();
- buffer.append(' ');
- }
- buffer.append(tok.nextToken());
- if (tok.countTokens() > 0)
- buffer.append(" \r\n"); //$NON-NLS-1$
- else
- buffer.append("\r\n"); //$NON-NLS-1$
- localMake72Safe(buffer);
- out.writeBytes(buffer.toString());
- inc++;
- }
- }
-
- /**
- * Adds line breaks to enforce a maximum 72 bytes per line.
- */
- protected static void localMake72Safe(StringBuffer line) {
- int length = line.length();
- if (length > 72) {
- int index = 70;
- // bug 233801 - we are splitting every 72 bytes, but adding two bytes to the end of,
- // and one space at the beginning of every line after the first
- while (index - 1 < length) {
- if (line.charAt(index) == ' ')
- {
- index--;
- }
- line.insert(index, "\r\n "); //$NON-NLS-1$
- index += 72;
- length += 3;
- }
- }
- return;
- }
-
- public String getImplementationVersion() {
- return getMainAttributes().getValue(Attributes.Name.IMPLEMENTATION_VERSION);
- }
-
- public void setImplemenationVersion(String version) {
- Attributes attributes = getMainAttributes();
- attributes.putValue(Attributes.Name.IMPLEMENTATION_VERSION.toString(), version);
- }
-
- /**
- * Encodes a double-byte string into UTF8 form. Every character in the
- * returned string represents one byte of the UTF8 encoding.
- */
-
- private String toUtf8( final String str ) throws IOException
- {
- if( str == null )
- {
- return null;
- }
- final byte[] utf8 = str.getBytes( "UTF-8" ); //$NON-NLS-1$
- return new String( utf8, 0, 0, utf8.length );
- }
-
-}
diff --git a/plugins/org.eclipse.jst.common.frameworks/src/org/eclipse/jst/common/internal/modulecore/util/IJavaComponentDiscerner.java b/plugins/org.eclipse.jst.common.frameworks/src/org/eclipse/jst/common/internal/modulecore/util/IJavaComponentDiscerner.java
deleted file mode 100644
index 55f6c02..0000000
--- a/plugins/org.eclipse.jst.common.frameworks/src/org/eclipse/jst/common/internal/modulecore/util/IJavaComponentDiscerner.java
+++ /dev/null
@@ -1,86 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2009 Red Hat and others.
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
- *
- * Contributors:
- * Red Hat - Initial API and implementation
- *******************************************************************************/
-package org.eclipse.jst.common.internal.modulecore.util;
-
-import org.eclipse.core.resources.IProject;
-import org.eclipse.wst.common.componentcore.resources.IVirtualReference;
-
-/**
- * This is internal. Please don't use it unless you're prepared
- * for it to change drastically at any random time.
- *
- * This interface represents a utility to help discover the heirarchy
- * of java-related components, and assist in manifest management.
- */
-public interface IJavaComponentDiscerner {
- /**
- * Return a list of parent projects, projects which already *do* have
- * a project reference to this child project
- * @param child
- * @return
- */
- public IProject[] findParentProjects(IProject child);
-
- /**
- * All returned manifest entries should have a runtime path and archiveName
- * which, when combined, will be suitable for export to a child's
- * manifest file. If a reference is in a folder that does not
- * require it to be present in the manifest.mf classpath, it
- * should *NOT* be returned here.
- *
- * All references should have a getRuntimePath() + getArchiveName() that
- * resolves to the value that should be in the manifest.mf classpath section.
- *
- * Any reference *already* in the manifest should *not* be returned here
- *
- * @param parentProject
- * @param childProject
- * @return
- */
- public IVirtualReference[] findPossibleManifestEntries(IProject parentProject, IProject childProject);
-
- /**
- * All returned manifest entries should have a runtime path and archiveName
- * which, when combined, will be suitable for export to a child's
- * manifest file. If a reference is in a folder that does not
- * require it to be present in the manifest.mf classpath, it
- * should *NOT* be returned here.
- *
- * All references should have a getRuntimePath() + getArchiveName() that
- * resolves to the value that should be in the manifest.mf classpath section.
- *
- * Any reference equivilant to the ones in currentEntries should not be returned
- *
- * @param parentProject
- * @param childProject
- * @return
- */
- public IVirtualReference[] findPossibleManifestEntries(IProject parentProject, IProject childProject, IVirtualReference[] currentEntries);
-
-
- /**
- * All returned manifest entries should have a runtime path and archiveName
- * which, when combined, will be suitable for export to a child's
- * manifest file. If a reference is in a folder that does not
- * require it to be present in the manifest.mf classpath, it
- * should *NOT* be returned here.
- *
- * All references should have a getRuntimePath() + getArchiveName() that
- * resolves to the value that should be in the manifest.mf classpath section.
- *
- * Any reference *not* in the manifest should *not* be returned here
- *
- * @param parentProject
- * @param childProject
- * @return
- */
- public IVirtualReference[] findCurrentManifestEntries(IProject parentProject, IProject childProject);
-}
\ No newline at end of file
diff --git a/plugins/org.eclipse.jst.common.frameworks/src/org/eclipse/jst/common/internal/modulecore/util/JavaModuleComponentUtility.java b/plugins/org.eclipse.jst.common.frameworks/src/org/eclipse/jst/common/internal/modulecore/util/JavaModuleComponentUtility.java
deleted file mode 100644
index 48d9567..0000000
--- a/plugins/org.eclipse.jst.common.frameworks/src/org/eclipse/jst/common/internal/modulecore/util/JavaModuleComponentUtility.java
+++ /dev/null
@@ -1,87 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2009 Red Hat and others.
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
- *
- * Contributors:
- * Red Hat - Initial API and implementation
- *******************************************************************************/
-package org.eclipse.jst.common.internal.modulecore.util;
-
-import java.util.ArrayList;
-import java.util.Arrays;
-
-import org.eclipse.core.resources.IProject;
-import org.eclipse.core.runtime.CoreException;
-import org.eclipse.core.runtime.IConfigurationElement;
-import org.eclipse.core.runtime.IExtensionRegistry;
-import org.eclipse.core.runtime.Platform;
-import org.eclipse.jst.common.frameworks.CommonFrameworksPlugin;
-import org.eclipse.wst.common.componentcore.resources.IVirtualReference;
-
-/**
- * A Utility class to help find current and possible manifest entries
- */
-public class JavaModuleComponentUtility {
-
- private static IJavaComponentDiscerner[] discerners;
- protected static IJavaComponentDiscerner[] getDiscerners() {
- if( discerners == null ) {
- discerners = loadDiscerners();
- }
- return discerners == null ? new IJavaComponentDiscerner[]{} : discerners;
- }
-
- private static IJavaComponentDiscerner[] loadDiscerners() {
- ArrayList<IJavaComponentDiscerner> list = new ArrayList<IJavaComponentDiscerner>();
- IExtensionRegistry registry = Platform.getExtensionRegistry();
- IConfigurationElement[] cf = registry.getConfigurationElementsFor(
- CommonFrameworksPlugin.PLUGIN_ID, "JavaComponentDiscerner"); //$NON-NLS-1$
- for( int i = 0; i < cf.length; i++ ) {
- try {
- list.add((IJavaComponentDiscerner)cf[i].createExecutableExtension("class")); //$NON-NLS-1$
- } catch( CoreException ce ) {
- // TODO log
- }
- }
- return list.toArray(new IJavaComponentDiscerner[list.size()]);
- }
-
- public static IProject[] findParentProjects(IProject child) {
- IJavaComponentDiscerner[] extensions = getDiscerners();
- ArrayList<IProject> list = new ArrayList<IProject>();
- for( int i = 0; i < extensions.length; i++ ) {
- list.addAll(Arrays.asList(extensions[i].findParentProjects(child)));
- }
- return list.toArray(new IProject[list.size()]);
- }
-
- public static IVirtualReference[] findPossibleManifestEntries(IProject parentProject, IProject childProject) {
- IJavaComponentDiscerner[] extensions = getDiscerners();
- ArrayList<IVirtualReference> list = new ArrayList<IVirtualReference>();
- for( int i = 0; i < extensions.length; i++ ) {
- list.addAll(Arrays.asList(extensions[i].findPossibleManifestEntries(parentProject, childProject)));
- }
- return list.toArray(new IVirtualReference[list.size()]);
- }
-
- public static IVirtualReference[] findPossibleManifestEntries(IProject parentProject, IProject childProject, IVirtualReference[] current) {
- IJavaComponentDiscerner[] extensions = getDiscerners();
- ArrayList<IVirtualReference> list = new ArrayList<IVirtualReference>();
- for( int i = 0; i < extensions.length; i++ ) {
- list.addAll(Arrays.asList(extensions[i].findPossibleManifestEntries(parentProject, childProject, current)));
- }
- return list.toArray(new IVirtualReference[list.size()]);
- }
-
- public static IVirtualReference[] findCurrentManifestEntries(IProject parentProject, IProject childProject) {
- IJavaComponentDiscerner[] extensions = getDiscerners();
- ArrayList<IVirtualReference> list = new ArrayList<IVirtualReference>();
- for( int i = 0; i < extensions.length; i++ ) {
- list.addAll(Arrays.asList(extensions[i].findCurrentManifestEntries(parentProject, childProject)));
- }
- return list.toArray(new IVirtualReference[list.size()]);
- }
-}
diff --git a/plugins/org.eclipse.jst.common.frameworks/src/org/eclipse/jst/common/internal/modulecore/util/ManifestUtilities.java b/plugins/org.eclipse.jst.common.frameworks/src/org/eclipse/jst/common/internal/modulecore/util/ManifestUtilities.java
deleted file mode 100644
index 6c98551..0000000
--- a/plugins/org.eclipse.jst.common.frameworks/src/org/eclipse/jst/common/internal/modulecore/util/ManifestUtilities.java
+++ /dev/null
@@ -1,437 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2001, 2010 IBM Corporation, Red Hat, and others.
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
- *
- * Contributors:
- * IBM Corporation - initial API and implementation
- *******************************************************************************/
-package org.eclipse.jst.common.internal.modulecore.util;
-
-import java.io.File;
-import java.io.FileInputStream;
-import java.io.FileNotFoundException;
-import java.io.FileOutputStream;
-import java.io.IOException;
-import java.io.InputStream;
-import java.io.OutputStream;
-import java.util.ArrayList;
-import java.util.Collection;
-import java.util.Iterator;
-import java.util.List;
-import java.util.Map;
-import java.util.concurrent.ConcurrentHashMap;
-import java.util.zip.ZipEntry;
-import java.util.zip.ZipException;
-import java.util.zip.ZipFile;
-
-import org.eclipse.core.resources.IFile;
-import org.eclipse.core.runtime.CoreException;
-import org.eclipse.core.runtime.IPath;
-import org.eclipse.jem.util.emf.workbench.WorkbenchByteArrayOutputStream;
-import org.eclipse.wst.common.componentcore.resources.IVirtualComponent;
-import org.eclipse.wst.common.componentcore.resources.IVirtualFile;
-
-import com.ibm.icu.util.StringTokenizer;
-
-public class ManifestUtilities {
- public static final String MANIFEST_HEADER = "Manifest-Version: 1.0\r\nClass-Path: \r\n\r\n"; //$NON-NLS-1$
- public static void createManifestFile(IFile file) throws CoreException, IOException {
- try {
- WorkbenchByteArrayOutputStream out = new WorkbenchByteArrayOutputStream(file);
- out.write(MANIFEST_HEADER.getBytes());
- out.close();
- } catch (IOException ioe) {
- throw ioe;
- }
- }
-
- public static String[] getTokens(String aString) {
- return getTokens(aString, null);
- }
-
- public static String[] getTokens(String aString, String delimiter) {
- StringTokenizer tok = (delimiter == null) ? new StringTokenizer(aString) : new StringTokenizer(aString, delimiter);
- int size = tok.countTokens();
- String[] tokens = new String[size];
- for (int i = 0; i < size && tok.hasMoreTokens(); i++) {
- tokens[i] = tok.nextToken();
- }
- return tokens;
- }
-
- /**
- * getValueIgnoreKeyCase method comment.
- */
- public static java.lang.String getValueIgnoreKeyCase(java.lang.String key, java.util.jar.Attributes attr) {
- Iterator keysAndValues = attr.entrySet().iterator();
- while (keysAndValues.hasNext()) {
- Map.Entry entry = (Map.Entry) keysAndValues.next();
- String entryKey = entry.getKey().toString();
- if (entryKey.equalsIgnoreCase(key))
- return entry.getValue() == null ? null : entry.getValue().toString();
- }
- return null;
- }
-
- public static ArchiveManifest getManifest(IVirtualComponent component, IPath manifestPath) {
- if( !component.isBinary() )
- return getNonBinaryComponentManifest(component, manifestPath);
- return getBinaryComponentManifest(component, manifestPath);
- }
-
- public static ArchiveManifest getBinaryComponentManifest(IVirtualComponent component, IPath manifestPath) {
- java.io.File file = (File)component.getAdapter(File.class);
- if( file != null && file.exists()) {
- ArchiveManifest manifest = readBinaryManifest(file, manifestPath);
- return manifest;
- }
- return null;
- }
-
- public static ArchiveManifest getManifest(IFile f) {
- File f2 = f.getLocation().toFile();
- return getManifest(f2);
- }
-
- public static ArchiveManifest getManifest(File f) {
- if( f != null && f.exists()) {
- InputStream in;
- try {
- in = new FileInputStream(f);
- ArchiveManifest manifest = new ArchiveManifestImpl(in);
- return manifest;
- } catch (FileNotFoundException e) {
- } catch (IOException e) {
- }
- }
- return null;
- }
-
- public static void writeManifest(IFile aFile, ArchiveManifest manifest) throws java.io.IOException {
- OutputStream out = new WorkbenchByteArrayOutputStream(aFile);
- manifest.writeSplittingClasspath(out);
- out.close();
- }
-
-
- public static ArchiveManifest getNonBinaryComponentManifest(IVirtualComponent component, IPath manifestPath) {
- try {
- if(!component.isBinary()){
- IVirtualFile vManifest = component.getRootFolder().getFile(manifestPath);
- if (vManifest.exists()) {
- IFile manifestFile = vManifest.getUnderlyingFile();
- InputStream in = null;
- try {
- in = manifestFile.getContents();
- ArchiveManifest manifest = new ArchiveManifestImpl(in);
- return manifest;
- } finally {
- if (in != null) {
- in.close();
- in = null;
- }
- }
- }
- }
- } catch( IOException ioe ) {
- } catch(CoreException ce) {
- }
- return null;
- }
-
-
- public static String[] getManifestClasspath(IVirtualComponent component, IPath manifestPath) {
- ArchiveManifest mf = getManifest(component, manifestPath);
- if( mf != null )
- return mf.getClassPathTokenized();
- return new String[]{};
- }
-
- public static ArchiveManifest readBinaryManifest(File file, IPath manifestPath) {
- ArchiveManifest manifest = null;
- ZipFile zipFile = null;
- if( file != null ) {
- try {
- zipFile = ManifestUtilities.newZipFile(file);
- ZipEntry entry = zipFile.getEntry(manifestPath.toString());
- if( entry != null ) {
- InputStream entryStream = getInputstreamForZipEntry(zipFile, manifestPath.toString());
- manifest = new ArchiveManifestImpl(entryStream);
- zipFile.close();
- }
- } catch( IOException ioe) {
- if( zipFile != null ) {
- try {
- zipFile.close();
- } catch( IOException ioe2) {}
- }
- }
- }
- return manifest;
- }
-
- public static InputStream getInputstreamForZipEntry(ZipFile zipFile, String uri) throws IOException {
- try {
- ZipEntry entry = zipFile.getEntry(uri);
- if (entry == null) {
- // this is a hack, but zip files are sensitive to the difference
- // between '/' and '\\'
- // so the hack is to try all combinations to see if any exist
- char[] chars = uri.toCharArray();
- int[] slashIndices = new int[chars.length];
- int slashCount = 0;
- for (int i = 0; i < uri.length(); i++) {
- if (chars[i] == '/' || chars[i] == '\\') {
- slashIndices[slashCount] = i;
- slashCount++;
- }
- }
- int slashPow = (int) Math.pow(2, slashCount);
- boolean foundIt = false;
- for (int i = 0; i < slashPow && !foundIt; i++) {
- for (int j = 0; j < slashCount; j++) {
- if ((i >> j & 1) == 1) {
- chars[slashIndices[j]] = '/';
- } else {
- chars[slashIndices[j]] = '\\';
- }
- }
- entry = zipFile.getEntry(new String(chars));
- if (entry != null) {
- foundIt = true;
- }
- }
- if (entry == null) {
- Exception del = new FileNotFoundException(uri);
- throw new IOException(del.toString());
- }
- }
- return new java.io.BufferedInputStream(zipFile.getInputStream(entry));
- } catch (IllegalStateException zipClosed) {
- throw new IOException(zipClosed.toString());
- }
- }
-
- public static String[] getNonBinaryComponentManifestClasspath(IVirtualComponent component, IPath manifestPath)
- throws IOException, CoreException {
- String[] manifestClasspath = null;
- if(!component.isBinary()){
- IVirtualFile vManifest = component.getRootFolder().getFile(manifestPath);
- if (vManifest.exists()) {
- IFile manifestFile = vManifest.getUnderlyingFile();
- InputStream in = null;
- try {
- in = manifestFile.getContents();
- ArchiveManifest manifest = new ArchiveManifestImpl(in);
- manifestClasspath = manifest.getClassPathTokenized();
- } finally {
- if (in != null) {
- in.close();
- in = null;
- }
- }
- }
- }
- return manifestClasspath;
- }
-
- public static ZipFile newZipFile(String fileName)throws ZipException, IOException {
- return ManifestUtilities.newZipFile(new File(fileName), ZipFile.OPEN_READ);
- }
- public static ZipFile newZipFile(File aFile)throws ZipException, IOException {
- return ManifestUtilities.newZipFile(aFile, ZipFile.OPEN_READ);
- }
-
- /**
- * Utility to create ZipFiles which avoid memory leaks
- * because closing them fails to close open inputstreams.
- * There is a SUN bug open for this: http://bugs.sun.com/bugdatabase/view_bug.do?bug_id=6735255
- * but it looks like the "fix" will be to change the Javadoc :-(
- * @param aFile mode
- * @return
- * @throws ZipException
- * @throws IOException
- */
- public static ZipFile newZipFile(File aFile, int mode) throws ZipException, IOException {
- return new ZipFile(aFile, mode){
- Collection <InputStream> openStreams = null;
-
- @Override
- public InputStream getInputStream(ZipEntry entry) throws IOException {
- InputStream in = super.getInputStream(entry);
- if(in != null){
- if(openStreams == null){
- openStreams = new ArrayList<InputStream>();
- }
- openStreams.add(in);
- }
- return in;
- }
-
- @Override
- public void close() throws IOException {
- closeOpenStreams();
- super.close();
- }
-
- private void closeOpenStreams() {
- if(openStreams != null){
- for (Iterator iterator = openStreams.iterator(); iterator.hasNext();) {
- InputStream in = (InputStream) iterator.next();
- try {
- in.close();
- } catch (IOException e) {
- org.eclipse.jem.util.logger.proxy.Logger.getLogger().logWarning(e);
- }
- iterator.remove();
- }
- }
- }
- };
- }
-
- public static ArchiveManifest readManifest(IFile aFile) {
- InputStream in = null;
- try {
- if (aFile == null || !aFile.exists())
- return null;
- in = aFile.getContents();
- return new ArchiveManifestImpl(in);
- } catch (Exception ex) {
- // TODO J2EEPlugin.logError(ex);
- return null;
- } finally {
- if (in != null) {
- try {
- in.close();
- } catch (IOException weTried) {
- }
- }
- }
- }
-
- private static ConcurrentHashMap<String, String> manifestClasspaths = new ConcurrentHashMap<String, String>();
-
- /**
- * Generates new MANIFEST.MF with a dynamically updated classpath that is written to the specified
- * output stream.
- * @param manifestFile The current MANIFEST.MF file.
- * @param dynamicURIs Is List of URIs to dynamically add to the manifest classpath.
- * @param outputStream Stream to which the modified entry should be written.
- * @throws IOException
- * @throws FileNotFoundException
- */
- public static void updateManifestClasspath(final IFile manifestFile, final List dynamicURIs, final OutputStream outputStream) throws IOException, FileNotFoundException {
- updateManifestClasspathImpl(manifestFile, dynamicURIs, null, outputStream);
- }
-
- /**
- * Generates new MANIFEST.MF with a dynamically updated classpath that is written to the specified
- * output stream.
- * @param manifestFile The current MANIFEST.MF file.
- * @param dynamicURIs Is List of URIs to dynamically add to the manifest classpath.
- * @param outputFile File to which the modified entry should be written.
- * @throws IOException
- * @throws FileNotFoundException
- */
- public static void updateManifestClasspath(final IFile manifestFile, final List dynamicURIs, final File outputFile) throws IOException, FileNotFoundException {
- updateManifestClasspathImpl(manifestFile, dynamicURIs, outputFile, null);
- }
-
- /**
- * Generates new MANIFEST.MF with a dynamically updated classpath that is written to the specified
- * file or output stream, with the stream taking precedence.
- * @param manifestFile The current MANIFEST.MF file.
- * @param dynamicURIs Is List of URIs to dynamically add to the manifest classpath.
- * @param outputFile File to which the modified entry should be written.
- * @param OutputStream stream Stream to which the modified entry should be written. If not null,
- * the stream will be written and the outputFile ignored.
- * @throws IOException
- * @throws FileNotFoundException
- */
- private static void updateManifestClasspathImpl(final IFile manifestFile, final List dynamicURIs, final File outputFile, final OutputStream stream) throws IOException, FileNotFoundException {
-
- OutputStream outputStream = stream;
- try {
- InputStream in = null;
- ArchiveManifest manifest = null;
- try {
- in = manifestFile.getContents();
- manifest = new ArchiveManifestImpl(in);
- } catch (CoreException ce) {
- throw new IOException(ce.getLocalizedMessage());
- } finally {
- if (in != null) {
- try {
- in.close();
- in = null;
- } catch (IOException e) {
- org.eclipse.jem.util.logger.proxy.Logger.getLogger().logWarning(e);
- }
- }
- }
- final String[] manifestClasspath = manifest.getClassPathTokenized();
- final List updatedCP = new ArrayList();
- for (int i = 0; i < manifestClasspath.length; i++) {
- updatedCP.add(manifestClasspath[i]);
- }
- // update manifest classpath to include dynamic entries
- for (int j = 0; j < dynamicURIs.size(); j++) {
- final String containerURI = (String) dynamicURIs.get(j);
- // need to check existing entries to ensure it doesn't are exist on the classpath
- boolean exists = false;
- for (int i = 0; i < manifestClasspath.length; i++) {
- if (manifestClasspath[i].equals(containerURI)) {
- exists = true;
- break;
- }
- }
- if (!exists) {
- updatedCP.add(containerURI);
- }
- }
- final StringBuffer cpBuffer = new StringBuffer();
- boolean first = true;
- for (int j = 0; j < updatedCP.size(); j++) {
- if (!first) {
- cpBuffer.append(" "); //$NON-NLS-1$
- } else {
- first = false;
- }
- cpBuffer.append((String) updatedCP.get(j));
- }
- String cp = cpBuffer.toString();
- // If we have an output stream, always write to the stream
- if (outputStream != null) {
- manifest.setClassPath(cp);
- manifest.write(outputStream);
- outputStream.flush();
- }
- // Else, without an output stream, conditionally update the specified file
- else {
- // To avoid making the internally generated manifest file appear to projects
- // as a perpetually modified resource, check if the file needs to change.
- // This checking helps with the usefulness of "delta" deployment with
- // utility projects.
- String manifestPath = manifestFile.getFullPath().toString();
- String priorClasspath = manifestClasspaths.get(manifestPath);
- if (priorClasspath == null || !priorClasspath.equals(cp) || !outputFile.exists()) {
- manifestClasspaths.put(manifestPath, cp);
- manifest.setClassPath(cp);
- outputStream = new FileOutputStream(outputFile);
- manifest.write(outputStream);
- outputStream.flush();
- }
- }
- } finally {
- if (outputStream != null) {
- outputStream.close();
- }
- }
- }
-
-
-}
diff --git a/plugins/org.eclipse.jst.common.frameworks/src/org/eclipse/jst/common/internal/modulecore/util/UpdateManifestDataModelProperties.java b/plugins/org.eclipse.jst.common.frameworks/src/org/eclipse/jst/common/internal/modulecore/util/UpdateManifestDataModelProperties.java
deleted file mode 100644
index a62e843..0000000
--- a/plugins/org.eclipse.jst.common.frameworks/src/org/eclipse/jst/common/internal/modulecore/util/UpdateManifestDataModelProperties.java
+++ /dev/null
@@ -1,46 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2005 IBM Corporation and others.
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
- *
- * Contributors:
- * IBM Corporation - initial API and implementation
- *******************************************************************************/
-package org.eclipse.jst.common.internal.modulecore.util;
-
-public interface UpdateManifestDataModelProperties {
- /**
- * Project name with manifest to update, type String required.
- */
- public static final String PROJECT_NAME = "UpdateManifestDataModel.PROJECT_NAME"; //$NON-NLS-1$
-
- /**
- * java.util.List of Strings
- */
- public static final String JAR_LIST = "UpdateManifestDataModel.CLASSPATH_LIST"; //$NON-NLS-1$
-
- /**
- * String. This is build from the JAR_LIST property. Never set this property.
- */
- public static final String JAR_LIST_TEXT_UI = "UpdateManifestDataModel.CLASSPATH_LIST_TEXT_UI"; //$NON-NLS-1$
-
- /**
- * Boolean, true merges, false replaces, default is true
- */
- public static final String MERGE = "UpdateManifestDataModel.MERGE"; //$NON-NLS-1$
-
- /**
- * String, no default.
- */
- public static final String MAIN_CLASS = "UpdateManifestDataModel.MAIN_CLASS"; //$NON-NLS-1$
-
-
- /**
- * String, no default.
- */
- public static final String MANIFEST_FILE = "UpdateManifestDataModel.MANIFEST_FILE"; //$NON-NLS-1$
-
-
-}
diff --git a/plugins/org.eclipse.jst.common.frameworks/src/org/eclipse/jst/common/internal/modulecore/util/UpdateManifestDataModelProvider.java b/plugins/org.eclipse.jst.common.frameworks/src/org/eclipse/jst/common/internal/modulecore/util/UpdateManifestDataModelProvider.java
deleted file mode 100644
index 7ac8714..0000000
--- a/plugins/org.eclipse.jst.common.frameworks/src/org/eclipse/jst/common/internal/modulecore/util/UpdateManifestDataModelProvider.java
+++ /dev/null
@@ -1,100 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2003, 2006 IBM Corporation and others.
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
- *
- * Contributors:
- * IBM Corporation - initial API and implementation
- *******************************************************************************/
-/*
- * Created on Nov 13, 2003
- *
- * To change the template for this generated file go to
- * Window>Preferences>Java>Code Generation>Code and Comments
- */
-package org.eclipse.jst.common.internal.modulecore.util;
-
-import java.util.ArrayList;
-import java.util.List;
-import java.util.Set;
-import com.ibm.icu.util.StringTokenizer;
-
-import org.eclipse.core.resources.IProject;
-import org.eclipse.core.resources.ResourcesPlugin;
-import org.eclipse.wst.common.frameworks.datamodel.AbstractDataModelProvider;
-import org.eclipse.wst.common.frameworks.datamodel.IDataModelOperation;
-
-/**
- * @author jsholl
- *
- * To change the template for this generated type comment go to
- * Window>Preferences>Java>Code Generation>Code and Comments
- */
-public class UpdateManifestDataModelProvider extends AbstractDataModelProvider implements UpdateManifestDataModelProperties {
-
- @Override
- public Set getPropertyNames() {
- Set propertyNames = super.getPropertyNames();
- propertyNames.add(PROJECT_NAME);
- propertyNames.add(JAR_LIST);
- propertyNames.add(JAR_LIST_TEXT_UI);
- propertyNames.add(MERGE);
- propertyNames.add(MAIN_CLASS);
- propertyNames.add(MANIFEST_FILE);
- return propertyNames;
- }
-
- @Override
- public Object getDefaultProperty(String propertyName) {
- if (propertyName.equals(MERGE)) {
- return Boolean.TRUE;
- } else if (propertyName.equals(JAR_LIST)) {
- return new ArrayList();
- } else if (propertyName.equals(JAR_LIST_TEXT_UI)) {
- return getClasspathAsString();
- }
- return super.getDefaultProperty(propertyName);
- }
-
- @Override
- public boolean propertySet(String propertyName, Object propertyValue) {
- boolean set = super.propertySet(propertyName, propertyValue);
- if (propertyName.equals(JAR_LIST) && isPropertySet(JAR_LIST_TEXT_UI))
- setProperty(JAR_LIST_TEXT_UI, getClasspathAsString());
- return set;
- }
-
- public IProject getProject() {
- String projectName = (String) getProperty(PROJECT_NAME);
- return ResourcesPlugin.getWorkspace().getRoot().getProject(projectName);
- }
-
- public String getClasspathAsString() {
- List classpathList = (List) getProperty(JAR_LIST);
- return convertClasspathListToString(classpathList);
- }
-
- public static String convertClasspathListToString(List list) {
- String classpathString = ""; //$NON-NLS-1$
- for (int i = 0; i < list.size(); i++) {
- classpathString += ((String) list.get(i)) + " "; //$NON-NLS-1$
- }
- return classpathString.trim();
- }
-
- public static List convertClasspathStringToList(String string) {
- List list = new ArrayList();
- StringTokenizer tokenizer = new StringTokenizer(string, " "); //$NON-NLS-1$
- while (tokenizer.hasMoreTokens()) {
- list.add(tokenizer.nextToken());
- }
- return list;
- }
-
- @Override
- public IDataModelOperation getDefaultOperation() {
- return new UpdateManifestOperation(model);
- }
-}
diff --git a/plugins/org.eclipse.jst.common.frameworks/src/org/eclipse/jst/common/internal/modulecore/util/UpdateManifestOperation.java b/plugins/org.eclipse.jst.common.frameworks/src/org/eclipse/jst/common/internal/modulecore/util/UpdateManifestOperation.java
deleted file mode 100644
index ad255e4..0000000
--- a/plugins/org.eclipse.jst.common.frameworks/src/org/eclipse/jst/common/internal/modulecore/util/UpdateManifestOperation.java
+++ /dev/null
@@ -1,78 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2003, 2005 IBM Corporation and others.
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
- *
- * Contributors:
- * IBM Corporation - initial API and implementation
- *******************************************************************************/
-/*
- * Created on Nov 13, 2003
- *
- * To change the template for this generated file go to
- * Window>Preferences>Java>Code Generation>Code and Comments
- */
-package org.eclipse.jst.common.internal.modulecore.util;
-
-import org.eclipse.core.commands.ExecutionException;
-import org.eclipse.core.resources.IFile;
-import org.eclipse.core.runtime.IAdaptable;
-import org.eclipse.core.runtime.IProgressMonitor;
-import org.eclipse.core.runtime.IStatus;
-import org.eclipse.wst.common.frameworks.datamodel.AbstractDataModelOperation;
-import org.eclipse.wst.common.frameworks.datamodel.IDataModel;
-
-
-/**
- * @author jsholl
- *
- * To change the template for this generated type comment go to
- * Window>Preferences>Java>Code Generation>Code and Comments
- */
-public class UpdateManifestOperation extends AbstractDataModelOperation {
-
- public UpdateManifestOperation(IDataModel dataModel) {
- super(dataModel);
- }
-
- @Override
- public IStatus execute(IProgressMonitor monitor, IAdaptable adaptable) throws ExecutionException {
- IFile file = (IFile)model.getProperty(UpdateManifestDataModelProperties.MANIFEST_FILE);
-
- String classPathValue = model.getStringProperty(UpdateManifestDataModelProperties.JAR_LIST_TEXT_UI);
- try {
- if(file != null && file.exists()) {
- ArchiveManifest mf = ManifestUtilities.readManifest(file);
-
- if (mf == null)
- mf = new ArchiveManifestImpl();
- mf.addVersionIfNecessary();
- if (model.getBooleanProperty(UpdateManifestDataModelProperties.MERGE)) {
- mf.mergeClassPath(ManifestUtilities.getTokens(classPathValue));
- } else {
- mf.setClassPath(classPathValue);
- }
- if (model.isPropertySet(UpdateManifestDataModelProperties.MAIN_CLASS)) {
- mf.setMainClass(model.getStringProperty(UpdateManifestDataModelProperties.MAIN_CLASS));
- }
-
- ManifestUtilities.writeManifest(file, mf);
- }
- } catch (java.io.IOException ex) {
- throw new ExecutionException(ex.getMessage(),ex);
- }
- return OK_STATUS;
- }
-
- @Override
- public IStatus redo(IProgressMonitor monitor, IAdaptable info) throws ExecutionException {
- return null;
- }
-
- @Override
- public IStatus undo(IProgressMonitor monitor, IAdaptable info) throws ExecutionException {
- return null;
- }
-}
diff --git a/plugins/org.eclipse.jst.common.frameworks/src/org/eclipse/jst/common/jdt/internal/classpath/ClasspathDecorations.java b/plugins/org.eclipse.jst.common.frameworks/src/org/eclipse/jst/common/jdt/internal/classpath/ClasspathDecorations.java
deleted file mode 100644
index 4e4cb5f..0000000
--- a/plugins/org.eclipse.jst.common.frameworks/src/org/eclipse/jst/common/jdt/internal/classpath/ClasspathDecorations.java
+++ /dev/null
@@ -1,75 +0,0 @@
-/******************************************************************************
- * Copyright (c) 2005 BEA Systems, Inc.
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
- *
- * Contributors:
- * Konstantin Komissarchik - initial API and implementation
- ******************************************************************************/
-
-package org.eclipse.jst.common.jdt.internal.classpath;
-
-import java.util.ArrayList;
-
-import org.eclipse.core.runtime.IPath;
-import org.eclipse.jdt.core.IClasspathAttribute;
-import org.eclipse.jdt.core.JavaCore;
-
-/**
- * @author <a href="mailto:kosta@bea.com">Konstantin Komissarchik</a>
- */
-
-public final class ClasspathDecorations
-{
- private IPath sourceAttachmentPath;
- private IPath sourceAttachmentRootPath;
- private ArrayList extraAttributes = new ArrayList();
-
- public IPath getSourceAttachmentPath()
- {
- return this.sourceAttachmentPath;
- }
-
- public void setSourceAttachmentPath( final IPath sourceAttachmentPath )
- {
- this.sourceAttachmentPath = sourceAttachmentPath;
- }
-
- public IPath getSourceAttachmentRootPath()
- {
- return this.sourceAttachmentRootPath;
- }
-
- public void setSourceAttachmentRootPath( final IPath sourceAttachmentRootPath )
- {
- this.sourceAttachmentRootPath = sourceAttachmentRootPath;
- }
-
- public IClasspathAttribute[] getExtraAttributes()
- {
- final IClasspathAttribute[] array
- = new IClasspathAttribute[ this.extraAttributes.size() ];
-
- return (IClasspathAttribute[]) this.extraAttributes.toArray( array );
- }
-
- public void setExtraAttributes( final IClasspathAttribute[] attrs )
- {
- for( int i = 0; i < attrs.length; i++ )
- {
- this.extraAttributes.add( attrs[ i ] );
- }
- }
-
- public void addExtraAttribute( final String name,
- final String value )
- {
- final IClasspathAttribute attr
- = JavaCore.newClasspathAttribute( name, value );
-
- this.extraAttributes.add( attr );
- }
-
-}
diff --git a/plugins/org.eclipse.jst.common.frameworks/src/org/eclipse/jst/common/jdt/internal/classpath/ClasspathDecorationsManager.java b/plugins/org.eclipse.jst.common.frameworks/src/org/eclipse/jst/common/jdt/internal/classpath/ClasspathDecorationsManager.java
deleted file mode 100644
index ece1d18..0000000
--- a/plugins/org.eclipse.jst.common.frameworks/src/org/eclipse/jst/common/jdt/internal/classpath/ClasspathDecorationsManager.java
+++ /dev/null
@@ -1,375 +0,0 @@
-/******************************************************************************
- * Copyright (c) 2005 BEA Systems, Inc.
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
- *
- * Contributors:
- * Konstantin Komissarchik - initial API and implementation
- ******************************************************************************/
-
-package org.eclipse.jst.common.jdt.internal.classpath;
-
-import java.io.BufferedReader;
-import java.io.BufferedWriter;
-import java.io.File;
-import java.io.FileInputStream;
-import java.io.FileOutputStream;
-import java.io.IOException;
-import java.io.InputStreamReader;
-import java.io.OutputStreamWriter;
-import java.io.PrintWriter;
-import java.util.HashMap;
-import java.util.Iterator;
-import java.util.Map;
-import java.util.NoSuchElementException;
-
-import javax.xml.parsers.DocumentBuilder;
-import javax.xml.parsers.DocumentBuilderFactory;
-
-import org.eclipse.core.resources.IWorkspace;
-import org.eclipse.core.resources.ResourcesPlugin;
-import org.eclipse.core.runtime.Path;
-import org.eclipse.jdt.core.IClasspathAttribute;
-import org.eclipse.jst.common.frameworks.CommonFrameworksPlugin;
-import org.w3c.dom.Element;
-import org.w3c.dom.Node;
-import org.w3c.dom.NodeList;
-import org.xml.sax.InputSource;
-
-/**
- * @author <a href="mailto:kosta@bea.com">Konstantin Komissarchik</a>
- */
-
-public final class ClasspathDecorationsManager
-{
- private final File f;
- private final HashMap decorations;
-
- public ClasspathDecorationsManager( final String plugin )
- {
- final IWorkspace ws = ResourcesPlugin.getWorkspace();
- final File wsdir = ws.getRoot().getLocation().toFile();
- final File wsmdroot = new File( wsdir, ".metadata/.plugins" ); //$NON-NLS-1$
- final File pmdroot = new File( wsmdroot, plugin );
-
- this.f = new File( pmdroot, "classpath.decorations.xml" ); //$NON-NLS-1$
- this.decorations = read();
- }
-
- public ClasspathDecorations getDecorations( final String key,
- final String entry )
- {
- final HashMap submap = (HashMap) this.decorations.get( key );
-
- if( submap == null )
- {
- return null;
- }
-
- return (ClasspathDecorations) submap.get( entry );
- }
-
- public void setDecorations( final String key,
- final String entry,
- final ClasspathDecorations dec )
- {
- HashMap submap = (HashMap) this.decorations.get( key );
-
- if( submap == null )
- {
- submap = new HashMap();
- this.decorations.put( key, submap );
- }
-
- submap.put( entry, dec );
- }
-
- public void clearAllDecorations( final String key )
- {
- this.decorations.remove( key );
- }
-
- public void save()
- {
- final File folder = this.f.getParentFile();
-
- if( ! folder.exists() && ! folder.mkdirs() )
- {
- return;
- }
-
- PrintWriter w = null;
-
- try
- {
- w = new PrintWriter( new BufferedWriter( new OutputStreamWriter( new FileOutputStream( this.f ), "UTF-8" ) ) ); //$NON-NLS-1$
-
- w.println( "<classpath>" ); //$NON-NLS-1$
-
- for( Iterator itr1 = decorations.entrySet().iterator();
- itr1.hasNext(); )
- {
- final Map.Entry entry1 = (Map.Entry) itr1.next();
- final Map submap = (Map) entry1.getValue();
-
- w.print( " <container id=\"" ); //$NON-NLS-1$
- w.print( (String) entry1.getKey() );
- w.println( "\">" ); //$NON-NLS-1$
-
- for( Iterator itr2 = submap.entrySet().iterator();
- itr2.hasNext(); )
- {
- final Map.Entry entry2 = (Map.Entry) itr2.next();
-
- final ClasspathDecorations dec
- = (ClasspathDecorations) entry2.getValue();
-
- w.print( " <entry id=\"" ); //$NON-NLS-1$
- w.print( (String) entry2.getKey() );
- w.println( "\">" ); //$NON-NLS-1$
-
- if( dec.getSourceAttachmentPath() != null )
- {
- w.print( " <source-attachment-path>" ); //$NON-NLS-1$
- w.print( dec.getSourceAttachmentPath().toString() );
- w.println( "</source-attachment-path>" ); //$NON-NLS-1$
- }
-
- if( dec.getSourceAttachmentRootPath() != null )
- {
- w.print( " <source-attachment-root-path>" ); //$NON-NLS-1$
- w.print( dec.getSourceAttachmentRootPath().toString() );
- w.println( "</source-attachment-root-path>" ); //$NON-NLS-1$
- }
-
- final IClasspathAttribute[] attrs
- = dec.getExtraAttributes();
-
- for( int i = 0; i < attrs.length; i++ )
- {
- final IClasspathAttribute attr = attrs[ i ];
-
- w.print( " <attribute name=\"" ); //$NON-NLS-1$
- w.print( attr.getName() );
- w.print( "\">" ); //$NON-NLS-1$
- w.print( attr.getValue() );
- w.println( "</attribute>" ); //$NON-NLS-1$
- }
-
- w.println( " </entry>" ); //$NON-NLS-1$
- }
-
- w.println( " </container>" ); //$NON-NLS-1$
- }
-
- w.println( "</classpath>" ); //$NON-NLS-1$
- }
- catch( IOException e )
- {
- CommonFrameworksPlugin.log( e );
- }
- finally
- {
- if(null != w){
- w.close();
- }
- }
- }
-
- private HashMap read()
- {
- final HashMap map = new HashMap();
- if( ! this.f.exists() ) return map;
-
- BufferedReader in = null;
- Element root = null;
-
- try
- {
- final DocumentBuilderFactory factory
- = DocumentBuilderFactory.newInstance();
-
- final DocumentBuilder docbuilder = factory.newDocumentBuilder();
-
- in = new BufferedReader(new InputStreamReader( new FileInputStream( f.getPath()),"UTF-8")); //$NON-NLS-1$
- root = docbuilder.parse( new InputSource(in)).getDocumentElement();
- }
- catch( Exception e )
- {
- CommonFrameworksPlugin.log( e );
- return map;
- }
- finally
- {
- if( in != null )
- {
- try
- {
- in.close();
- }
- catch( IOException e ) {}
- }
- }
-
- for( Iterator itr1 = elements( root, "container" ); itr1.hasNext(); ) //$NON-NLS-1$
- {
- final Element e1 = (Element) itr1.next();
- final String cid = e1.getAttribute( "id" ); //$NON-NLS-1$
-
- final HashMap submap = new HashMap();
- map.put( cid, submap );
-
- for( Iterator itr2 = elements( e1, "entry" ); itr2.hasNext(); ) //$NON-NLS-1$
- {
- final Element e2 = (Element) itr2.next();
- final String eid = e2.getAttribute( "id" ); //$NON-NLS-1$
- final ClasspathDecorations dec = new ClasspathDecorations();
-
- submap.put( eid, dec );
-
- for( Iterator itr3 = elements( e2 ); itr3.hasNext(); )
- {
- final Element e3 = (Element) itr3.next();
- final String n = e3.getNodeName();
-
- if( n.equals( "source-attachment-path" ) ) //$NON-NLS-1$
- {
- dec.setSourceAttachmentPath( new Path( text( e3 ) ) );
- }
- else if( n.equals( "source-attachment-root-path" ) ) //$NON-NLS-1$
- {
- dec.setSourceAttachmentRootPath( new Path( text( e3 ) ) );
- }
- else if( n.equals( "attribute" ) ) //$NON-NLS-1$
- {
- final String name = e3.getAttribute( "name" ); //$NON-NLS-1$
- dec.addExtraAttribute( name, text( e3 ) );
- }
- }
- }
- }
-
- return map;
- }
-
- private static String text( final Element el )
- {
- final NodeList nodes = el.getChildNodes();
-
- String str = null;
- StringBuffer buf = null;
-
- for( int i = 0, n = nodes.getLength(); i < n; i++ )
- {
- final Node node = nodes.item( i );
-
- if( node.getNodeType() == Node.TEXT_NODE )
- {
- final String val = node.getNodeValue();
-
- if( buf != null )
- {
- buf.append( val );
- }
- else if( str != null )
- {
- buf = new StringBuffer();
- buf.append( str );
- buf.append( val );
-
- str = null;
- }
- else
- {
- str = val;
- }
- }
- }
-
- if( buf != null )
- {
- return buf.toString();
- }
- return str;
- }
-
- private static Iterator elements( final Element el,
- final String name )
- {
- return new ElementsIterator( el, name );
- }
-
- private static Iterator elements( final Element el )
- {
- return new ElementsIterator( el, null );
- }
-
- private static final class ElementsIterator
-
- implements Iterator
-
- {
- private final NodeList nodes;
- private final int length;
- private final String name;
- private int position;
- private Element element;
-
- public ElementsIterator( final Element parent,
- final String name )
- {
- this.nodes = parent.getChildNodes();
- this.length = nodes.getLength();
- this.position = -1;
- this.name = name;
-
- advance();
- }
-
- private void advance()
- {
- this.element = null;
- this.position++;
-
- for( ; this.position < this.length && this.element == null;
- this.position++ )
- {
- final Node node = this.nodes.item( this.position );
-
- if( node.getNodeType() == Node.ELEMENT_NODE &&
- ( this.name == null ||
- node.getNodeName().equals( this.name ) ) )
- {
- this.element = (Element) node;
- }
- }
- }
-
- public boolean hasNext()
- {
- return ( this.element != null );
- }
-
- public Object next()
- {
- final Element el = this.element;
-
- if( el == null )
- {
- throw new NoSuchElementException();
- }
-
- advance();
-
- return el;
- }
-
- public void remove()
- {
- throw new UnsupportedOperationException();
- }
- }
-
-}
diff --git a/plugins/org.eclipse.jst.common.frameworks/src/org/eclipse/jst/common/jdt/internal/classpath/ClasspathUtil.java b/plugins/org.eclipse.jst.common.frameworks/src/org/eclipse/jst/common/jdt/internal/classpath/ClasspathUtil.java
deleted file mode 100644
index c4161f4..0000000
--- a/plugins/org.eclipse.jst.common.frameworks/src/org/eclipse/jst/common/jdt/internal/classpath/ClasspathUtil.java
+++ /dev/null
@@ -1,113 +0,0 @@
-/******************************************************************************
- * Copyright (c) 2006 BEA Systems, Inc.
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
- *
- * Contributors:
- * Konstantin Komissarchik - initial API and implementation
- ******************************************************************************/
-
-package org.eclipse.jst.common.jdt.internal.classpath;
-
-import java.util.Collections;
-import java.util.HashSet;
-import java.util.Set;
-
-import org.eclipse.core.runtime.IPath;
-import org.eclipse.jdt.core.IClasspathContainer;
-import org.eclipse.jdt.core.IClasspathEntry;
-import org.eclipse.jdt.core.IJavaProject;
-import org.eclipse.jdt.core.JavaCore;
-import org.eclipse.jdt.core.JavaModelException;
-import org.eclipse.jem.util.logger.proxy.Logger;
-
-/**
- * @author <a href="mailto:kosta@bea.com">Konstantin Komissarchik</a>
- */
-
-public final class ClasspathUtil
-{
- private ClasspathUtil() {}
-
- public static Set getResolvedClasspath( final IJavaProject jproj,
- final IPath entryToIgnore )
- {
- return getResolvedClasspath( jproj, Collections.singleton( entryToIgnore ) );
- }
-
- public static Set getResolvedClasspath( final IJavaProject jproj,
- final Set entriesToIgnore )
- {
- final Set resolved = new HashSet();
-
- try
- {
- final IClasspathEntry[] entries = jproj.getRawClasspath();
-
- for( int i = 0; i < entries.length; i++ )
- {
- IClasspathEntry entry = entries[ i ];
-
- if( entriesToIgnore.contains( entry.getPath() ) )
- {
- continue;
- }
-
- switch( entry.getEntryKind() )
- {
- case IClasspathEntry.CPE_LIBRARY:
- case IClasspathEntry.CPE_PROJECT:
- {
- resolved.add( entry.getPath() );
- break;
- }
- case IClasspathEntry.CPE_VARIABLE:
- {
- entry = JavaCore.getResolvedClasspathEntry( entry );
-
- if( entry != null )
- {
- resolved.add( entry.getPath() );
- }
-
- break;
- }
- case IClasspathEntry.CPE_CONTAINER:
- {
- final IClasspathContainer container;
-
- try
- {
- container = JavaCore.getClasspathContainer( entry.getPath(), jproj );
- }
- catch( JavaModelException e )
- {
- Logger.getLogger().logError( e );
- continue;
- }
-
- if( container != null )
- {
- final IClasspathEntry[] containerEntries
- = container.getClasspathEntries();
-
- for( int j = 0; j < containerEntries.length; j++ )
- {
- resolved.add( containerEntries[ j ].getPath() );
- }
- }
- }
- }
- }
- }
- catch( JavaModelException e )
- {
- Logger.getLogger().logError( e );
- }
-
- return resolved;
- }
-
-}
diff --git a/plugins/org.eclipse.jst.common.frameworks/src/org/eclipse/jst/common/jdt/internal/classpath/FlexibleProjectContainer.java b/plugins/org.eclipse.jst.common.frameworks/src/org/eclipse/jst/common/jdt/internal/classpath/FlexibleProjectContainer.java
deleted file mode 100644
index fadb620..0000000
--- a/plugins/org.eclipse.jst.common.frameworks/src/org/eclipse/jst/common/jdt/internal/classpath/FlexibleProjectContainer.java
+++ /dev/null
@@ -1,562 +0,0 @@
-/******************************************************************************
- * Copyright (c) 2005, 2006 BEA Systems, Inc.
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
- *
- * Contributors:
- * Konstantin Komissarchik - initial API and implementation
- ******************************************************************************/
-
-package org.eclipse.jst.common.jdt.internal.classpath;
-
-import java.util.ArrayList;
-import java.util.Collections;
-import java.util.HashSet;
-import java.util.List;
-import java.util.Set;
-
-import org.eclipse.core.resources.IContainer;
-import org.eclipse.core.resources.IProject;
-import org.eclipse.core.resources.IResource;
-import org.eclipse.core.resources.IResourceChangeEvent;
-import org.eclipse.core.resources.IResourceChangeListener;
-import org.eclipse.core.resources.IResourceDelta;
-import org.eclipse.core.resources.IResourceDeltaVisitor;
-import org.eclipse.core.resources.IWorkspace;
-import org.eclipse.core.resources.ResourcesPlugin;
-import org.eclipse.core.runtime.CoreException;
-import org.eclipse.core.runtime.IPath;
-import org.eclipse.jdt.core.IAccessRule;
-import org.eclipse.jdt.core.IClasspathAttribute;
-import org.eclipse.jdt.core.IClasspathContainer;
-import org.eclipse.jdt.core.IClasspathEntry;
-import org.eclipse.jdt.core.IJavaProject;
-import org.eclipse.jdt.core.JavaCore;
-import org.eclipse.jdt.core.JavaModelException;
-import org.eclipse.jst.common.frameworks.CommonFrameworksPlugin;
-import org.eclipse.jst.common.internal.modulecore.IClasspathDependencyComponent;
-import org.eclipse.wst.common.componentcore.ComponentCore;
-import org.eclipse.wst.common.componentcore.ModuleCoreNature;
-import org.eclipse.wst.common.componentcore.internal.util.IModuleConstants;
-import org.eclipse.wst.common.componentcore.resources.IVirtualComponent;
-import org.eclipse.wst.common.componentcore.resources.IVirtualFolder;
-import org.eclipse.wst.common.componentcore.resources.IVirtualReference;
-import org.eclipse.wst.common.componentcore.resources.IVirtualResource;
-
-/**
- * @author <a href="mailto:kosta@bea.com">Konstantin Komissarchik</a>
- */
-
-public abstract class FlexibleProjectContainer
-
- implements IClasspathContainer
-
-{
- protected static final class PathType
- {
- public static final PathType
- LIB_DIRECTORY = new PathType(),
- CLASSES_DIRECTORY = new PathType();
- }
-
- private static ClasspathDecorationsManager decorations;
-
- static
- {
- // Register the resource listener that will listen for changes to
- // resources relevant to flexible project containers across the
- // workspace and refresh them as necessary.
-
- Listener.register();
-
- // Read the decorations from the workspace metadata.
-
- final String plugin = CommonFrameworksPlugin.PLUGIN_ID;
- decorations = new ClasspathDecorationsManager( plugin );
- }
-
- private static final String SEPARATOR = "!"; //$NON-NLS-1$
-
- public static String getDecorationManagerKey(IProject project, String container){
- return project.getName() + SEPARATOR + container;
- }
-
- protected final IPath path;
- protected final IJavaProject owner;
- protected final IProject project;
- private final IPath[] paths;
- private final PathType[] pathTypes;
- protected final List entries;
- private final IClasspathEntry[] cpentries;
- private static final Set containerTypes = new HashSet();
-
- public FlexibleProjectContainer( final IPath path,
- final IJavaProject owner,
- final IProject project,
- final IPath[] paths,
- final PathType[] types )
- {
- this.path = path;
- this.owner = owner;
- this.project = project;
- this.paths = paths;
- this.pathTypes = types;
-
- if( ! isFlexibleProject( this.project ) )
- {
- // Silently noop if the referenced project is not a flexible
- // project. Should I be doing something else here?
-
- this.entries = Collections.EMPTY_LIST;
- this.cpentries = new IClasspathEntry[ 0 ];
-
- return;
- }
-
- addFlexibleProjectContainerType( path.segment( 0 ) );
-
- this.entries = computeClasspathEntries();
- this.cpentries = new IClasspathEntry[ this.entries.size() ];
-
- for( int i = 0, n = this.entries.size(); i < n; i++ )
- {
- IPath entryPath = (IPath) this.entries.get( i );
- IResource resource =ResourcesPlugin.getWorkspace().getRoot().findMember(entryPath);
- if(null != resource && resource.getType() == IResource.PROJECT)
- this.cpentries[ i ] = JavaCore.newProjectEntry(entryPath, false);
- else
- this.cpentries[ i ] = newLibraryEntry( entryPath );
- }
- }
-
- public int getKind()
- {
- return K_APPLICATION;
- }
-
- public IPath getPath()
- {
- return this.path;
- }
-
- public IClasspathEntry[] getClasspathEntries()
- {
- return this.cpentries;
- }
-
- public boolean isOutOfDate( final IResourceDelta delta )
- {
- if( delta == null )
- {
- return false;
- }
- return isOutOfDate();
- }
-
- public boolean isOutOfDate() {
- final List currentEntries = computeClasspathEntries();
- return ! this.entries.equals( currentEntries );
- }
-
- public abstract void refresh();
-
- /**
- * If forceUpdate is <code>false</code> then a refresh is made only if
- * {@link #isOutOfDate()} returns <code>true</code>. If forceUpdate is
- * <code>true</code> then a refresh is immediately made without checking
- * {@link #isOutOfDate()}.
- *
- * @param forceUpdate
- */
- public void refresh(boolean forceUpdate){
- if(forceUpdate || isOutOfDate()){
- refresh();
- }
- }
-
- static ClasspathDecorationsManager getDecorationsManager()
- {
- return decorations;
- }
-
- protected IVirtualReference [] computeReferences(IVirtualComponent vc){
- return vc.getReferences();
- }
-
- protected List computeClasspathEntries()
- {
- final List entries = new ArrayList();
-
- final IVirtualComponent vc
- = ComponentCore.createComponent( this.project );
-
- if( vc == null )
- {
- return entries;
- }
-
- IVirtualReference[] refs = computeReferences(vc);
- IVirtualComponent comp = null;
- Set jarsHandled = new HashSet();
- String jarName = null;
- for (int i = 0; i < refs.length; i++) {
- comp = refs[i].getReferencedComponent();
- if (!refs[i].getRuntimePath().equals(paths[0].makeAbsolute()))
- continue;
- jarName = refs[i].getArchiveName();
- if(null != jarName){
- jarsHandled.add(jarName);
- }
- IPath newPath = null;
- if (comp.isBinary()) {
- if( comp instanceof IClasspathDependencyComponent )
- continue;
- newPath = (IPath)comp.getAdapter(IPath.class);
- } else
- newPath = comp.getProject().getFullPath();
-
- if( newPath != null && !entries.contains(newPath))
- entries.add( newPath );
- }
-
- for( int i = 0; i < this.paths.length; i++ )
- {
- final IVirtualFolder rootFolder = vc.getRootFolder();
- final IVirtualFolder vf = rootFolder.getFolder( paths[ i ] );
-
- if( this.pathTypes[ i ] == PathType.LIB_DIRECTORY )
- {
- final IVirtualResource[] contents;
-
- try
- {
- contents = members( vf );
- }
- catch( CoreException e )
- {
- CommonFrameworksPlugin.log( e );
- continue;
- }
-
- for( int j = 0; j < contents.length; j++ )
- {
- final IResource r = contents[ j ].getUnderlyingResource();
- final IPath p = r.getLocation();
-
- if(!jarsHandled.contains(p.lastSegment()) && isJarFile( r ) )
- {
- jarsHandled.add(p.lastSegment());
- entries.add( p );
- }
- }
- }
- else
- {
- final IContainer[] uf = vf.getUnderlyingFolders();
-
- for( int j = 0; j < uf.length; j++ )
- {
- final IPath p = uf[ j ].getFullPath();
-
- if( ! jarsHandled.contains( p.lastSegment() ) &&
- ! isSourceOrOutputDirectory( p ) )
- {
- jarsHandled.add(p.lastSegment());
- entries.add( p );
- }
- }
- }
- }
-
- return entries;
- }
-
- // TODO: This method was created to provide a safe last-minute workaround
- // for the issue described in https://bugs.eclipse.org/bugs/show_bug.cgi?id=162974.
- // This code needs to be revisited in a future release to find a more
- // permanent solution.
-
- protected IVirtualResource[] members( final IVirtualFolder vf )
-
- throws CoreException
-
- {
- return vf.members();
- }
-
- private IClasspathEntry newLibraryEntry( final IPath p )
- {
- IPath srcpath = null;
- IPath srcrootpath = null;
- IClasspathAttribute[] attrs = {};
- IAccessRule[] access = {};
-
- final ClasspathDecorations dec
- = decorations.getDecorations( getDecorationManagerKey(project, getPath().toString()), p.toString() );
-
- if( dec != null )
- {
- srcpath = dec.getSourceAttachmentPath();
- srcrootpath = dec.getSourceAttachmentRootPath();
- attrs = dec.getExtraAttributes();
- }
-
- return JavaCore.newLibraryEntry( p, srcpath, srcrootpath, access, attrs,
- false );
-
- }
-
- private boolean isSourceOrOutputDirectory( final IPath aPath )
- {
- if( isJavaProject( this.project ) )
- {
- try
- {
- final IJavaProject jproject = JavaCore.create( this.project );
- final IClasspathEntry[] cp = jproject.getRawClasspath();
-
- for( int i = 0; i < cp.length; i++ )
- {
- final IClasspathEntry cpe = cp[ i ];
-
- if( cpe.getEntryKind() == IClasspathEntry.CPE_SOURCE )
- {
- final IPath src = cpe.getPath();
- final IPath output = cpe.getOutputLocation();
-
- if( src.equals( aPath ) ||
- output != null && output.equals( aPath ) )
- {
- return true;
- }
- }
- }
-
- if( jproject.getOutputLocation().equals( aPath ) )
- {
- return true;
- }
- }
- catch( JavaModelException e )
- {
- CommonFrameworksPlugin.log( e );
- }
- }
-
- return false;
- }
-
- private static boolean isJavaProject( final IProject pj )
- {
- try
- {
- return pj.getNature( JavaCore.NATURE_ID ) != null;
- }
- catch( CoreException e )
- {
- return false;
- }
- }
-
- private static boolean isFlexibleProject( final IProject pj )
- {
- try
- {
- return pj.getNature( IModuleConstants.MODULE_NATURE_ID ) != null;
- }
- catch( CoreException e )
- {
- return false;
- }
- }
-
- private static boolean isJarFile( final IResource f )
- {
- if( f.getType() == IResource.FILE )
- {
- final String fname = f.getName();
-
- if( fname.endsWith( ".jar" ) || fname.endsWith( ".zip" ) ) //$NON-NLS-1$ //$NON-NLS-2$
- {
- return true;
- }
- }
-
- return false;
- }
-
- private static boolean isMetadataFile( final IResource f )
- {
- if( f.getType() == IResource.FILE )
- {
- final String fname = f.getName();
-
- if( fname.equals( ".component" ) || //$NON-NLS-1$
- fname.equals( "org.eclipse.wst.common.component" ) || //$NON-NLS-1$
- fname.equals( ".classpath")) //$NON-NLS-1$
- {
- return true;
- }
- }
-
- return false;
- }
-
- private static boolean isFlexibleProjectContainer( final IPath path )
- {
- synchronized( containerTypes )
- {
- return containerTypes.contains( path.segment( 0 ) );
- }
- }
-
- private static void addFlexibleProjectContainerType( final String type )
- {
- synchronized( containerTypes )
- {
- containerTypes.add( type );
- }
- }
-
- private static final class Listener
-
- implements IResourceChangeListener
-
- {
- public static void register()
- {
- final Listener listener = new Listener();
- final IWorkspace ws = ResourcesPlugin.getWorkspace();
- ws.addResourceChangeListener( listener, IResourceChangeEvent.PRE_BUILD );
- }
-
- public void resourceChanged( final IResourceChangeEvent event )
- {
- // Screen the delta before going any further.
-
- if( ! isInterestingEvent( event ) )
- {
- return;
- }
-
- // Locate all of the flexible project containers.
-
- final ArrayList containers = new ArrayList();
-
- final IProject[] projects
- = ResourcesPlugin.getWorkspace().getRoot().getProjects();
-
- for( int i = 0; i < projects.length; i++ )
- {
- final IProject project = projects[ i ];
-
- try
- {
- if( isJavaProject( project ) )
- {
- final IJavaProject jproj = JavaCore.create( project );
- final IClasspathEntry[] cpes = jproj.getRawClasspath();
-
- for( int j = 0; j < cpes.length; j++ )
- {
- final IClasspathEntry cpe = cpes[ j ];
- final IPath path = cpe.getPath();
-
- if( cpe.getEntryKind() == IClasspathEntry.CPE_CONTAINER &&
- isFlexibleProjectContainer( path ) )
- {
- final IClasspathContainer cont
- = JavaCore.getClasspathContainer( path, jproj );
-
- containers.add( cont );
- }
- }
- }
- }
- catch( JavaModelException e )
- {
- CommonFrameworksPlugin.log( e );
- }
- }
-
- // Refresh the containers that are out of date.
-
- final IResourceDelta delta = event.getDelta();
-
- for( int i = 0, n = containers.size(); i < n; i++ )
- {
- final FlexibleProjectContainer c
- = (FlexibleProjectContainer) containers.get( i );
-
- if( c.isOutOfDate( delta ) )
- {
- c.refresh();
- }
- }
- }
-
- private static boolean isInterestingEvent( final IResourceChangeEvent event )
- {
- final boolean[] result = new boolean[ 1 ];
-
- final IResourceDeltaVisitor visitor = new IResourceDeltaVisitor()
- {
- public boolean visit( final IResourceDelta delta )
- {
- final IResource r = delta.getResource();
-
- switch( r.getType() )
- {
- case IResource.ROOT:
- {
- return true;
- }
- case IResource.PROJECT:
- {
- return ModuleCoreNature.isFlexibleProject( (IProject) r );
- }
- case IResource.FOLDER:
- {
- final int kind = delta.getKind();
-
- if( kind == IResourceDelta.ADDED ||
- kind == IResourceDelta.REMOVED )
- {
- result[ 0 ] = true;
- return false;
- }
- return true;
- }
- case IResource.FILE:
- {
- if( isJarFile( r ) || isMetadataFile( r ) )
- {
- result[ 0 ] = true;
- }
-
- return false;
- }
- default:
- {
- return false;
- }
- }
- }
- };
-
- try
- {
- event.getDelta().accept( visitor, false );
- }
- catch( CoreException e )
- {
- CommonFrameworksPlugin.log( e );
- }
-
- return result[ 0 ];
- }
- }
-
-}
\ No newline at end of file
diff --git a/plugins/org.eclipse.jst.common.frameworks/src/org/eclipse/jst/common/jdt/internal/classpath/FlexibleProjectContainerInitializer.java b/plugins/org.eclipse.jst.common.frameworks/src/org/eclipse/jst/common/jdt/internal/classpath/FlexibleProjectContainerInitializer.java
deleted file mode 100644
index 16eb12a..0000000
--- a/plugins/org.eclipse.jst.common.frameworks/src/org/eclipse/jst/common/jdt/internal/classpath/FlexibleProjectContainerInitializer.java
+++ /dev/null
@@ -1,85 +0,0 @@
-/******************************************************************************
- * Copyright (c) 2005, 2006 BEA Systems, Inc.
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
- *
- * Contributors:
- * Konstantin Komissarchik - initial API and implementation
- ******************************************************************************/
-
-package org.eclipse.jst.common.jdt.internal.classpath;
-
-import org.eclipse.core.runtime.CoreException;
-import org.eclipse.core.runtime.IPath;
-import org.eclipse.jdt.core.ClasspathContainerInitializer;
-import org.eclipse.jdt.core.IClasspathAttribute;
-import org.eclipse.jdt.core.IClasspathContainer;
-import org.eclipse.jdt.core.IClasspathEntry;
-import org.eclipse.jdt.core.IJavaProject;
-import org.eclipse.jdt.core.JavaCore;
-
-/**
- * @author <a href="mailto:kosta@bea.com">Konstantin Komissarchik</a>
- */
-
-public abstract class FlexibleProjectContainerInitializer
-
- extends ClasspathContainerInitializer
-
-{
- private static final ClasspathDecorationsManager decorations
- = FlexibleProjectContainer.getDecorationsManager();
-
- @Override
- public boolean canUpdateClasspathContainer( final IPath containerPath,
- final IJavaProject project)
- {
- return true;
- }
-
- @Override
- public void requestClasspathContainerUpdate( final IPath containerPath,
- final IJavaProject project,
- final IClasspathContainer sg )
-
- throws CoreException
-
- {
- final String key = FlexibleProjectContainer.getDecorationManagerKey(project.getProject(), containerPath.toString());
-
- final IClasspathEntry[] entries = sg.getClasspathEntries();
-
- decorations.clearAllDecorations( key );
-
- for( int i = 0; i < entries.length; i++ )
- {
- final IClasspathEntry entry = entries[ i ];
-
- final IPath srcpath = entry.getSourceAttachmentPath();
- final IPath srcrootpath = entry.getSourceAttachmentRootPath();
- final IClasspathAttribute[] attrs = entry.getExtraAttributes();
-
- if( srcpath != null || attrs.length > 0 )
- {
- final String eid = entry.getPath().toString();
- final ClasspathDecorations dec = new ClasspathDecorations();
-
- dec.setSourceAttachmentPath( srcpath );
- dec.setSourceAttachmentRootPath( srcrootpath );
- dec.setExtraAttributes( attrs );
-
- decorations.setDecorations( key, eid, dec );
- }
- }
-
- decorations.save();
-
- final IClasspathContainer container
- = JavaCore.getClasspathContainer( containerPath, project );
-
- ( (FlexibleProjectContainer) container ).refresh();
- }
-
-}
diff --git a/plugins/org.eclipse.jst.common.frameworks/src/org/eclipse/jst/common/jdt/internal/integration/JavaArtifactEditModel.java b/plugins/org.eclipse.jst.common.frameworks/src/org/eclipse/jst/common/jdt/internal/integration/JavaArtifactEditModel.java
deleted file mode 100644
index 21ee651..0000000
--- a/plugins/org.eclipse.jst.common.frameworks/src/org/eclipse/jst/common/jdt/internal/integration/JavaArtifactEditModel.java
+++ /dev/null
@@ -1,237 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2003, 2006 IBM Corporation and others.
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
- *
- * Contributors:
- * IBM Corporation - initial API and implementation
- *******************************************************************************/
-package org.eclipse.jst.common.jdt.internal.integration;
-
-import java.util.Set;
-
-import org.eclipse.core.resources.IWorkspace;
-import org.eclipse.core.resources.IWorkspaceRunnable;
-import org.eclipse.core.resources.ResourcesPlugin;
-import org.eclipse.core.runtime.CoreException;
-import org.eclipse.core.runtime.IProgressMonitor;
-import org.eclipse.emf.common.util.URI;
-import org.eclipse.emf.ecore.resource.Resource;
-import org.eclipse.jdt.core.ICompilationUnit;
-import org.eclipse.wst.common.componentcore.internal.ArtifactEditModel;
-import org.eclipse.wst.common.frameworks.internal.SaveFailedException;
-import org.eclipse.wst.common.internal.emf.resource.CompatibilityXMIResource;
-import org.eclipse.wst.common.internal.emf.resource.ReferencedResource;
-import org.eclipse.wst.common.internal.emf.resource.TranslatorResource;
-import org.eclipse.wst.common.internal.emfworkbench.EMFWorkbenchContext;
-
-public class JavaArtifactEditModel extends ArtifactEditModel implements WorkingCopyProvider {
-
- private WorkingCopyManager workingCopyManager = null;
-
- public JavaArtifactEditModel(String anEditModelId, EMFWorkbenchContext context, boolean toMakeReadOnly,
- boolean toAccessUnknownResourcesAsReadOnly, URI moduleURI, URI rootURI, String rootContentType) {
- super(anEditModelId, context, toMakeReadOnly, toAccessUnknownResourcesAsReadOnly, moduleURI, rootURI, rootContentType);
- }
-
- public JavaArtifactEditModel(String editModelID, EMFWorkbenchContext context, boolean toMakeReadOnly, URI moduleURI, URI rootURI,
- String rootContentType) {
- super(editModelID, context, toMakeReadOnly, moduleURI, rootURI, rootContentType);
- }
-
- /**
- * @param anEditModelId
- * @param aContext
- * @param toMakeReadOnly
- * @param toAccessUnknownResourcesAsReadOnly
- * @param aModuleURI
- */
- public JavaArtifactEditModel(String anEditModelId, EMFWorkbenchContext aContext, boolean toMakeReadOnly, boolean toAccessUnknownResourcesAsReadOnly, URI aModuleURI) {
- super(anEditModelId, aContext, toMakeReadOnly,
- toAccessUnknownResourcesAsReadOnly, aModuleURI);
- }
-
- /**
- * @param anEditModelId
- * @param aContext
- * @param toMakeReadOnly
- * @param aModuleURI
- */
- public JavaArtifactEditModel(String anEditModelId, EMFWorkbenchContext aContext, boolean toMakeReadOnly, URI aModuleURI) {
- super(anEditModelId, aContext, toMakeReadOnly, aModuleURI);
- }
-
- /**
- * This will delete
- *
- * @cu from the workbench and fix the internal references for this working copy manager.
- */
- public void delete(org.eclipse.jdt.core.ICompilationUnit cu, org.eclipse.core.runtime.IProgressMonitor monitor) {
- getWorkingCopyManager().delete(cu, monitor);
- }
-
- /**
- * This method should only be called by the J2EENature.
- */
- @Override
- protected void doDispose() {
- super.doDispose();
- resetWorkingCopyManager();
- }
-
- @Override
- public Set getAffectedFiles() {
- java.util.Set affected = super.getAffectedFiles();
- if (getWorkingCopyManager() != null)
- affected.addAll(getWorkingCopyManager().getAffectedFiles());
-
- return affected;
- }
-
- /**
- * Returns the working copy remembered for the compilation unit encoded in the given editor
- * input. Does not connect the edit model to the working copy.
- *
- * @param input
- * ICompilationUnit
- * @return the working copy of the compilation unit, or <code>null</code> if the input does
- * not encode an editor input, or if there is no remembered working copy for this
- * compilation unit
- */
- public org.eclipse.jdt.core.ICompilationUnit getExistingWorkingCopy(org.eclipse.jdt.core.ICompilationUnit cu) throws org.eclipse.core.runtime.CoreException {
- return getWorkingCopyManager().getExistingWorkingCopy(cu);
- }
-
- /**
- * Returns the working copy remembered for the compilation unit.
- *
- * @param input
- * ICompilationUnit
- * @return the working copy of the compilation unit, or <code>null</code> if there is no
- * remembered working copy for this compilation unit
- */
- public org.eclipse.jdt.core.ICompilationUnit getWorkingCopy(ICompilationUnit cu, boolean forNewCU) throws CoreException {
- return getWorkingCopyManager().getWorkingCopy(cu, forNewCU);
- }
-
- /**
- * Save the new compilation units only.
- */
- @Override
- protected void handleSaveIfNecessaryDidNotSave(IProgressMonitor monitor) {
- getWorkingCopyManager().saveOnlyNewCompilationUnits(monitor);
- }
-
- /**
- * @see org.eclipse.jst.j2ee.internal.internal.workbench.J2EEEditModel#isDirty()
- */
- @Override
- public boolean isDirty() {
- boolean dirtyBool = super.isDirty();
- if (!dirtyBool && getWorkingCopyManager() != null)
- dirtyBool = getWorkingCopyManager().hasWorkingCopies();
- return dirtyBool;
- }
-
- /**
- * This will force all of the referenced Resources to be saved.
- */
- @Override
- public void primSave(IProgressMonitor monitor) {
- saveCompilationUnits(monitor);
- if (monitor == null || !monitor.isCanceled())
- super.primSave(monitor);
- }
- @Override
- protected void runSaveOperation(IWorkspaceRunnable runnable, IProgressMonitor monitor) throws SaveFailedException {
- try {
- ResourcesPlugin.getWorkspace().run(runnable, null,IWorkspace.AVOID_UPDATE,monitor);
- } catch (CoreException e) {
- throw new SaveFailedException(e);
- }
- }
-
- /**
- * Insert the method's description here. Creation date: (4/11/2001 4:14:26 PM)
- *
- * @return java.util.Set
- */
- @Override
- public void processResource(Resource aResource) {
- if (aResource != null && !getResources().contains(aResource)) {
- if (aResource instanceof ReferencedResource) {
- access((ReferencedResource) aResource);
- //We need a better way to pass this through the save options instead.
- //We also need to make this dynamic based on the project target
- ((ReferencedResource) aResource).setFormat(CompatibilityXMIResource.FORMAT_MOF5);
- } else if (!isReadOnly())
- aResource.setTrackingModification(true);
- addResource(aResource);
- }
- }
-
- /**
- * Release each of the referenced resources.
- */
- @Override
- protected void release(Resource aResource) {
-
- removeResource(aResource);
- if (aResource != null) {
- boolean isRefRes = aResource instanceof ReferencedResource;
- if (isRefRes)
- release((ReferencedResource) aResource);
- else if (!isReadOnly())
- aResource.setTrackingModification(false);
- if (!isDisposing())
- resetWorkingCopyManager();
- }
- }
-
- /*
- * (non-Javadoc)
- *
- * @see org.eclipse.jst.j2ee.internal.internal.workbench.J2EEEditModel#resourceIsLoadedChanged(org.eclipse.emf.ecore.resource.Resource,
- * boolean, boolean)
- */
- @Override
- protected void resourceIsLoadedChanged(Resource aResource, boolean oldValue, boolean newValue) {
- if (!isReverting && !disposing && !isReadOnly() && oldValue && !newValue && aResource instanceof TranslatorResource)
- resetWorkingCopyManager();
- super.resourceIsLoadedChanged(aResource, oldValue, newValue);
- }
-
- @Override
- protected void reverted(ReferencedResource revertedResource) {
- if (getWorkingCopyManager() != null)
- getWorkingCopyManager().revert();
- revertAllResources();
- }
-
- /**
- * This will save all of the referenced CompilationUnits to be saved.
- */
- public void saveCompilationUnits(IProgressMonitor monitor) {
- getWorkingCopyManager().saveCompilationUnits(monitor);
- }
-
- public WorkingCopyManager getWorkingCopyManager() {
- if (workingCopyManager == null)
- workingCopyManager = WorkingCopyManagerFactory.newRegisteredInstance();
- return workingCopyManager;
- }
-
- /**
- * Reset the working copy manager because the ejb-jar.xml was removed without disposing.
- */
- protected void resetWorkingCopyManager() {
- if (workingCopyManager != null) {
- workingCopyManager.dispose();
- workingCopyManager = null;
- }
- }
-
-
-}
diff --git a/plugins/org.eclipse.jst.common.frameworks/src/org/eclipse/jst/common/jdt/internal/integration/JavaArtifactEditModelFactory.java b/plugins/org.eclipse.jst.common.frameworks/src/org/eclipse/jst/common/jdt/internal/integration/JavaArtifactEditModelFactory.java
deleted file mode 100644
index 27640f5..0000000
--- a/plugins/org.eclipse.jst.common.frameworks/src/org/eclipse/jst/common/jdt/internal/integration/JavaArtifactEditModelFactory.java
+++ /dev/null
@@ -1,74 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2003, 2005 IBM Corporation and others.
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
- *
- * Contributors:
- * IBM Corporation - initial API and implementation
- *******************************************************************************/
-package org.eclipse.jst.common.jdt.internal.integration;
-
-import java.util.Map;
-
-import org.eclipse.emf.common.util.URI;
-import org.eclipse.wst.common.internal.emfworkbench.EMFWorkbenchContext;
-import org.eclipse.wst.common.internal.emfworkbench.integration.EditModel;
-import org.eclipse.wst.common.internal.emfworkbench.integration.EditModelFactory;
-
-/**
- * <p>
- * The following class is experimental until fully documented.
- * </p>
- */
-public class JavaArtifactEditModelFactory extends EditModelFactory {
-
- public static final String MODULE_EDIT_MODEL_ID = "org.eclipse.jst.modulecore.editModel"; //$NON-NLS-1$
-
- public static final String PARAM_MODULE_URI = "MODULE_URI"; //$NON-NLS-1$
-
- public static final String PARAM_ROOT_URI = "ROOT_URI"; //$NON-NLS-1$
-
- public static final String PARAM_ROOT_CONTENT_TYPE = "ROOT_CONTENT_TYPE"; //$NON-NLS-1$
-
- /* (non-Javadoc)
- * @see org.eclipse.wst.common.internal.emfworkbench.integration.EditModelFactory#createEditModelForRead(java.lang.String, org.eclipse.wst.common.internal.emfworkbench.EMFWorkbenchContext, java.util.Map)
- */
- @Override
- public EditModel createEditModelForRead(String editModelID, EMFWorkbenchContext context, Map params) {
- URI moduleURI = (URI) ((params != null) ? params.get(PARAM_MODULE_URI) : null);
- URI rootURI = (URI) ((params != null) ? params.get(PARAM_ROOT_URI) : null);
- String rootContentType = (String) ((params != null) ? params.get(PARAM_ROOT_CONTENT_TYPE) : null);
- if(moduleURI == null)
- throw new IllegalStateException("A Module URI must be provided"); //$NON-NLS-1$
-
- return new JavaArtifactEditModel(editModelID, context, true, moduleURI,rootURI,rootContentType);
- }
-
- /* (non-Javadoc)
- * @see org.eclipse.wst.common.internal.emfworkbench.integration.EditModelFactory#createEditModelForWrite(java.lang.String, org.eclipse.wst.common.internal.emfworkbench.EMFWorkbenchContext, java.util.Map)
- */
- @Override
- public EditModel createEditModelForWrite(String editModelID, EMFWorkbenchContext context, Map params) {
- URI moduleURI = (URI) ((params != null) ? params.get(PARAM_MODULE_URI) : null);
- URI rootURI = (URI) ((params != null) ? params.get(PARAM_ROOT_URI) : null);
- String rootContentType = (String) ((params != null) ? params.get(PARAM_ROOT_CONTENT_TYPE) : null);
- if(moduleURI == null)
- throw new IllegalStateException("A Module URI must be provided"); //$NON-NLS-1$
- return new JavaArtifactEditModel(editModelID, context, false,false, moduleURI,rootURI,rootContentType);
- }
-
- /* (non-Javadoc)
- * @see org.eclipse.wst.common.internal.emfworkbench.integration.EditModelFactory#getCacheID(java.lang.String, java.util.Map)
- */
- @Override
- public String getCacheID(String editModelID, Map params) {
- URI moduleURI = (URI)params.get(PARAM_MODULE_URI);
- if(moduleURI != null)
- return editModelID+":"+moduleURI.toString(); //$NON-NLS-1$
- return editModelID+":NOURI"; //$NON-NLS-1$
- }
-
-
-}
diff --git a/plugins/org.eclipse.jst.common.frameworks/src/org/eclipse/jst/common/jdt/internal/integration/JavaProjectValidationHandler.java b/plugins/org.eclipse.jst.common.frameworks/src/org/eclipse/jst/common/jdt/internal/integration/JavaProjectValidationHandler.java
deleted file mode 100644
index ece9912..0000000
--- a/plugins/org.eclipse.jst.common.frameworks/src/org/eclipse/jst/common/jdt/internal/integration/JavaProjectValidationHandler.java
+++ /dev/null
@@ -1,56 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2003, 2005 IBM Corporation and others.
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
- *
- * Contributors:
- * IBM Corporation - initial API and implementation
- *******************************************************************************/
-
-package org.eclipse.jst.common.jdt.internal.integration;
-
-import org.eclipse.core.resources.IResource;
-import org.eclipse.jdt.core.IJavaProject;
-import org.eclipse.wst.validation.internal.IValidationSelectionHandler;
-
-
-/**
- * Java Project validation
- */
-public class JavaProjectValidationHandler implements IValidationSelectionHandler {
-
- private String validationType = null;
-
- /**
- * Default constructor
- */
- public JavaProjectValidationHandler() {
- super();
- }
-
- /* (non-Javadoc)
- * @see org.eclipse.wst.common.frameworks.internal.IValidationSelectionHandler#getBaseValidationType(java.lang.Object)
- */
- public IResource getBaseValidationType(Object selection) {
- if (selection instanceof IJavaProject)
- return ((IJavaProject)selection).getProject();
- return null;
- }
-
- /* (non-Javadoc)
- * @see org.eclipse.wst.common.frameworks.internal.IValidationSelectionHandler#getValidationTypeString()
- */
- public String getValidationTypeString() {
- return validationType;
- }
-
- /* (non-Javadoc)
- * @see org.eclipse.wst.common.frameworks.internal.IValidationSelectionHandler#setValidationTypeString(java.lang.String)
- */
- public void setValidationTypeString(String validationType) {
- this.validationType = validationType;
- }
-
-}
diff --git a/plugins/org.eclipse.jst.common.frameworks/src/org/eclipse/jst/common/jdt/internal/integration/WTPWorkingCopyManager.java b/plugins/org.eclipse.jst.common.frameworks/src/org/eclipse/jst/common/jdt/internal/integration/WTPWorkingCopyManager.java
deleted file mode 100644
index c43d15d..0000000
--- a/plugins/org.eclipse.jst.common.frameworks/src/org/eclipse/jst/common/jdt/internal/integration/WTPWorkingCopyManager.java
+++ /dev/null
@@ -1,545 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2003, 2006 IBM Corporation and others.
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
- *
- * Contributors:
- * IBM Corporation - initial API and implementation
- *******************************************************************************/
-package org.eclipse.jst.common.jdt.internal.integration;
-
-
-
-import java.util.ArrayList;
-import java.util.Collections;
-import java.util.HashMap;
-import java.util.Iterator;
-import java.util.List;
-import java.util.Map;
-import java.util.Set;
-
-import org.eclipse.core.resources.IFile;
-import org.eclipse.core.resources.IResource;
-import org.eclipse.core.resources.IWorkspace;
-import org.eclipse.core.resources.IWorkspaceRunnable;
-import org.eclipse.core.runtime.CoreException;
-import org.eclipse.core.runtime.IProgressMonitor;
-import org.eclipse.jdt.core.ICompilationUnit;
-import org.eclipse.jdt.core.IJavaElement;
-import org.eclipse.jdt.core.IPackageFragment;
-import org.eclipse.jdt.core.JavaModelException;
-import org.eclipse.jem.util.logger.proxy.Logger;
-import org.eclipse.jst.common.frameworks.CommonFrameworksPlugin;
-import org.eclipse.wst.common.frameworks.internal.ISaveHandler;
-import org.eclipse.wst.common.frameworks.internal.SaveFailedException;
-import org.eclipse.wst.common.frameworks.internal.SaveHandlerHeadless;
-import org.eclipse.wst.common.frameworks.internal.SaveHandlerRegister;
-import org.eclipse.wst.common.frameworks.internal.plugin.WTPCommonPlugin;
-
-/**
- * Insert the type's description here. Creation date: (4/27/2001 4:14:30 PM)
- *
- * @author: Administrator
- */
-public class WTPWorkingCopyManager implements WorkingCopyManager {
-
- //New CUs that will need to be deleted upon dispose
- private List originalNewCompilationUnits;
- //New CUs that were created that need saved immediately (after each gen)
- private List needsSavingCompilationUnits;
- //A complete list of new CUs that is only cleared on save and dispose
- private List newCompilationUnits;
- private HashMap deletedCompilationUnits;
- protected static final Class IRESOURCE_CLASS = IResource.class;
-
- /**
- * WTPWorkingCopyManager constructor comment.
- */
- public WTPWorkingCopyManager() {
- super();
- }
-
- protected void addDeletedCompilationUnit(ICompilationUnit cu) {
- getNeedsSavingCompilationUnits().remove(cu);
- if (!getOriginalNewCompilationUnits().contains(cu) && !getDeletedCompilationUnits().containsKey(cu))
- primAddDeletedCompilationUnit(cu);
- getOriginalNewCompilationUnits().remove(cu);
- }
-
- protected void addNewCompilationUnit(ICompilationUnit cu, ICompilationUnit workingCopy) {
- getNewCompilationUnits().add(cu);
- getNeedsSavingCompilationUnits().add(workingCopy);
- if (!getDeletedCompilationUnits().containsKey(cu))
- getOriginalNewCompilationUnits().add(cu);
- }
-
- /**
- * This will save all of the new CompilationUnits to be saved.
- */
- protected void commitWorkingCopy(ICompilationUnit wc, IProgressMonitor monitor) {
- try {
- try {
- wc.commitWorkingCopy(false, monitor);
- } catch (JavaModelException e) {
- if (isFailedWriteFileFailure(e) && shouldSaveReadOnly(wc))
- wc.commitWorkingCopy(false, monitor);
- else
- throw e;
- }
- } catch (JavaModelException e) {
- org.eclipse.jem.util.logger.proxy.Logger.getLogger().logError(e);
- throw new SaveFailedException(e);
- } finally {
- try {
- wc.discardWorkingCopy();
- } catch (JavaModelException e1) {
- org.eclipse.jem.util.logger.proxy.Logger.getLogger().logError(e1);
- throw new SaveFailedException(e1);
- }
- }
- }
-
- /**
- * This will delete
- *
- * @cu from the workbench and fix the internal references for this working copy manager.
- */
- public void delete(final ICompilationUnit cu, final IProgressMonitor monitor) {
- ICompilationUnit localCU = cu;
- if (localCU.isWorkingCopy())
- localCU = localCU.getPrimary();
- addDeletedCompilationUnit(localCU);
- try {
- localCU.delete(false, monitor);
- } catch (JavaModelException e) {
- if (e.getStatus().getCode() != org.eclipse.jdt.core.IJavaModelStatusConstants.ELEMENT_DOES_NOT_EXIST)
- org.eclipse.jem.util.logger.proxy.Logger.getLogger().logError(e);
- }
- }
-
- protected void discardOriginalNewCompilationUnits() {
- if (getOriginalNewCompilationUnits().isEmpty())
- return;
- List cus = getOriginalNewCompilationUnits();
- ICompilationUnit cu;
- ICompilationUnit wc = null;
- for (int i = 0; i < cus.size(); i++) {
- cu = (ICompilationUnit) cus.get(i);
- if (cu.isWorkingCopy()) {
- wc = cu;
- cu = wc.getPrimary();
- }
- primDelete(cu);
- if (wc != null)
- try {
- wc.discardWorkingCopy();
- } catch (JavaModelException e) {
- Logger.getLogger().logError(e);
- }
- }
- }
-
- public void dispose() {
- IWorkspaceRunnable runnable = new IWorkspaceRunnable() {
- public void run(IProgressMonitor aMonitor) {
- primDispose();
- }
- };
- try {
- if (!WTPCommonPlugin.getWorkspace().isTreeLocked()) {
- WTPCommonPlugin.getWorkspace().run(runnable,null, IWorkspace.AVOID_UPDATE,null);
- } else {
- runnable.run(null);
- }
- } catch (CoreException e) {
- CommonFrameworksPlugin.logError(e);
- }
- }
-
- public void revert() {
- IWorkspaceRunnable runnable = new IWorkspaceRunnable() {
- public void run(IProgressMonitor aMonitor) {
- primRevert();
- }
- };
- runOperation(runnable, null, true);
- }
-
- public Set getAffectedFiles() {
- return Collections.EMPTY_SET;
- }
-
- /**
- * Insert the method's description here. Creation date: (7/11/2001 6:43:37 PM)
- *
- * @return java.util.HashMap
- */
- protected HashMap getDeletedCompilationUnits() {
- if (deletedCompilationUnits == null)
- deletedCompilationUnits = new HashMap();
- return deletedCompilationUnits;
- }
-
- /**
- * Returns the working copy remembered for the compilation unit encoded in the given editor
- * input. Does not connect the edit model to the working copy.
- *
- * @param input
- * ICompilationUnit
- * @return the working copy of the compilation unit, or <code>null</code> if the input does
- * not encode an editor input, or if there is no remembered working copy for this
- * compilation unit
- */
- public org.eclipse.jdt.core.ICompilationUnit getExistingWorkingCopy(ICompilationUnit cu) throws CoreException {
- ICompilationUnit newCU = getNewCompilationUnitWorkingCopy(cu);
- if (newCU != null)
- return newCU;
- return null;
- }
-
- /**
- * Insert the method's description here. Creation date: (7/19/2001 11:00:19 AM)
- *
- * @return java.util.List
- */
- protected java.util.List getNeedsSavingCompilationUnits() {
- if (needsSavingCompilationUnits == null)
- needsSavingCompilationUnits = new ArrayList();
- return needsSavingCompilationUnits;
- }
-
- /**
- * Insert the method's description here. Creation date: (4/26/2001 3:49:05 PM)
- *
- * @return java.util.List
- */
- protected java.util.List getNewCompilationUnits() {
- if (newCompilationUnits == null)
- newCompilationUnits = new ArrayList();
- return newCompilationUnits;
- }
-
- /**
- * It is possible that we have already created this CompilationUnit and its working copy. If
- * this is the case, return our new working copy and do not create a new one.
- */
- protected ICompilationUnit getNewCompilationUnitWorkingCopy(ICompilationUnit cu) {
- if (hasNewCompilationUnit(cu)) {
- List list = getNeedsSavingCompilationUnits();
- ICompilationUnit copy;
- for (int i = 0; i < list.size(); i++) {
- copy = (ICompilationUnit) list.get(i);
- if (cu.equals(copy.getPrimary()))
- return copy;
- }
- }
- return null;
- }
-
- /**
- * Insert the method's description here. Creation date: (4/26/2001 3:49:05 PM)
- *
- * @return java.util.List
- */
- protected java.util.List getOriginalNewCompilationUnits() {
- if (originalNewCompilationUnits == null)
- originalNewCompilationUnits = new ArrayList();
- return originalNewCompilationUnits;
- }
-
- /**
- * Return the IPackageFragment for the given ICompilationUnit.
- */
- protected IPackageFragment getPackageFragment(ICompilationUnit cu) {
- if (cu == null)
- return null;
- IJavaElement parent = cu;
- int elementType = cu.getElementType();
- while (parent != null && elementType != IJavaElement.PACKAGE_FRAGMENT) {
- parent = parent.getParent();
- if (parent != null)
- elementType = parent.getElementType();
- else
- elementType = -1;
- }
- return (IPackageFragment) parent;
- }
-
- protected ISaveHandler getSaveHandler() {
- return SaveHandlerRegister.getSaveHandler();
- }
-
- /**
- * Returns the working copy remembered for the compilation unit.
- *
- * @param input
- * ICompilationUnit
- * @return the working copy of the compilation unit, or <code>null</code> if there is no
- * remembered working copy for this compilation unit
- */
- public ICompilationUnit getWorkingCopy(ICompilationUnit cu, boolean forNewCU) throws org.eclipse.core.runtime.CoreException {
- if (cu == null || cu.isWorkingCopy())
- return cu;
- ICompilationUnit newCU = getNewCompilationUnitWorkingCopy(cu);
- if (newCU != null)
- return newCU;
- ICompilationUnit workingCopy = cu.getWorkingCopy(null);
- addNewCompilationUnit(cu, workingCopy);
- return workingCopy;
- }
-
- /**
- * Has a new compilation unit already been created.
- */
- protected boolean hasNewCompilationUnit(ICompilationUnit cu) {
- return getNewCompilationUnits().contains(cu);
- }
-
- protected boolean isFailedWriteFileFailure(Exception ex) {
- return SaveHandlerHeadless.isFailedWriteFileFailure(ex);
- }
-
- protected void primAddDeletedCompilationUnit(ICompilationUnit cu) {
- if (cu == null)
- return;
- Object[] info = new Object[2];
- info[0] = getPackageFragment(cu);
- try {
- info[1] = cu.getSource();
- } catch (JavaModelException e) {
- info[1] = null;
- }
- getDeletedCompilationUnits().put(cu, info);
- }
-
- // This is an internal delete call.
- protected void primDelete(ICompilationUnit cu) {
- try {
- if (cu.exists())
- cu.delete(true, new org.eclipse.core.runtime.NullProgressMonitor());
- } catch (JavaModelException e) {
- org.eclipse.jem.util.logger.proxy.Logger.getLogger().logError(e);
- //What to do here?
- }
- }
-
- protected void primDispose() {
- discardOriginalNewCompilationUnits();
- reviveDeletedCompilationUnits();
- newCompilationUnits = null;
- needsSavingCompilationUnits = null;
- originalNewCompilationUnits = null;
- deletedCompilationUnits = null;
- }
-
- protected void primRevert() {
- discardOriginalNewCompilationUnits();
- reviveDeletedCompilationUnits();
- newCompilationUnits = null;
- needsSavingCompilationUnits = null;
- originalNewCompilationUnits = null;
- deletedCompilationUnits = null;
- }
-
- /**
- * Returns the working copy remembered for the compilation unit encoded in the given editor
- * input.
- *
- * @param input
- * ICompilationUnit
- * @return the working copy of the compilation unit, or <code>null</code> if the input does
- * not encode an editor input, or if there is no remembered working copy for this
- * compilation unit
- */
- protected ICompilationUnit primGetWorkingCopy(ICompilationUnit cu) throws CoreException {
- return null;
- }
-
- /**
- * This will save all of the referenced CompilationUnits to be saved.
- */
- protected void primSaveCompilationUnits(org.eclipse.core.runtime.IProgressMonitor monitor) {
- saveNewCompilationUnits(monitor);
- getDeletedCompilationUnits().clear();
- }
-
- /**
- * This will save all of the new CompilationUnits to be saved.
- */
- protected void primSaveOnlyNewCompilationUnits(org.eclipse.core.runtime.IProgressMonitor monitor) {
- List cus = getNeedsSavingCompilationUnits();
- ICompilationUnit wc;
- for (int i = 0; i < cus.size(); i++) {
- wc = (ICompilationUnit) cus.get(i);
- commitWorkingCopy(wc, monitor);
- }
- cus.clear();
- }
-
- protected void removeDeletedCompilationUnit(ICompilationUnit cu) {
- if (getDeletedCompilationUnits().remove(cu) != null) {
- if (cu.isWorkingCopy()) {
- ICompilationUnit original, nextCU, testCU;
- original = cu.getPrimary();
- Set cus = getDeletedCompilationUnits().keySet();
- Iterator it = cus.iterator();
- while (it.hasNext()) {
- nextCU = (ICompilationUnit) it.next();
- testCU = nextCU.isWorkingCopy() ? (ICompilationUnit) nextCU.getPrimary() : nextCU;
- if (testCU.equals(original)) {
- cus.remove(nextCU);
- return;
- }
- }
- }
- }
- }
-
- protected void reviveDeletedCompilationUnit(ICompilationUnit cu, Object[] info, IProgressMonitor pm) {
- if(cu.getJavaProject().isOpen()) {
- if (info[0] != null && info[1] != null) {
- String typeName = cu.getElementName();
- IPackageFragment pack = (IPackageFragment) info[0];
- String source = (String) info[1];
- try {
- ICompilationUnit existingCU = pack.getCompilationUnit(typeName);
- if (existingCU.exists() && getNewCompilationUnits().contains(existingCU))
- existingCU.delete(false, pm);
- pack.createCompilationUnit(typeName, source, false, pm);
- } catch (JavaModelException e) {
- org.eclipse.jem.util.logger.proxy.Logger.getLogger().logError(e);
- }
- }
- }
- }
-
- protected void reviveDeletedCompilationUnits() {
- if (getDeletedCompilationUnits().isEmpty())
- return;
-
- IProgressMonitor pm = new org.eclipse.core.runtime.NullProgressMonitor();
- Iterator it = getDeletedCompilationUnits().entrySet().iterator();
- Map.Entry entry;
- ICompilationUnit cu;
- Object[] info;
- while (it.hasNext()) {
- entry = (Map.Entry) it.next();
- cu = (ICompilationUnit) entry.getKey();
- info = (Object[]) entry.getValue();
- reviveDeletedCompilationUnit(cu, info, pm);
- }
-
- }
-
- protected void runOperation(IWorkspaceRunnable aRunnable, IProgressMonitor monitor, boolean validate) {
- primRunOperation(aRunnable, monitor);
-
- // TODO Break the validator depedency
- // if (validate)
- // primRunOperation(aRunnable, monitor);
- // else {
- // IProject proj = getValidationProject();
- //
- // ValidatorManager mgr = ValidatorManager.getManager();
- // boolean disableValidators = proj != null;
- // boolean wasSuspended = false;
- // if (disableValidators) {
- // wasSuspended = mgr.isSuspended(proj);
- // if (!wasSuspended)
- // mgr.suspendValidation(proj, true);
- // }
- // try {
- // primRunOperation(aRunnable, monitor);
- // } finally {
- // if (disableValidators && !wasSuspended)
- // mgr.suspendValidation(proj, false);
- // }
- // }
- }
-
- protected void primRunOperation(IWorkspaceRunnable aRunnable, IProgressMonitor monitor) {
-
- if (aRunnable != null) {
- //if (workspace.isTreeLocked())
- //Logger.getLogger().logTrace(ResourceHandler.getString("Cannot_run_J2EEUIWorkingCo_ERROR_"));
- // //$NON-NLS-1$ = "Cannot run J2EEUIWorkingCopyManager operation because the Workspace
- // tree is locked."
- //else {
- if (!WTPCommonPlugin.getWorkspace().isTreeLocked()) {
- try {
- WTPCommonPlugin.getWorkspace().run(aRunnable, monitor);
- } catch (CoreException e) {
- throw new SaveFailedException(e);
- }
- }
- }
- }
-
- /**
- * This will save all of the referenced CompilationUnits to be saved.
- */
- public void saveCompilationUnits(org.eclipse.core.runtime.IProgressMonitor monitor) {
- getSaveHandler().access();
- try {
- IWorkspaceRunnable runnable = new IWorkspaceRunnable() {
- public void run(IProgressMonitor aMonitor) {
- primSaveCompilationUnits(aMonitor);
- }
- };
- runOperation(runnable, monitor, true);
- } catch (SaveFailedException ex) {
- getSaveHandler().handleSaveFailed(ex, monitor);
- } finally {
- getSaveHandler().release();
- }
- }
-
- /**
- * This will save all of the referenced CompilationUnits to be saved.
- */
- protected void saveNewCompilationUnits(IProgressMonitor monitor) {
- primSaveOnlyNewCompilationUnits(monitor);
- getOriginalNewCompilationUnits().clear();
- getNewCompilationUnits().clear();
- }
-
- /**
- * This will save all of the new CompilationUnits to be saved.
- */
- public void saveOnlyNewCompilationUnits(org.eclipse.core.runtime.IProgressMonitor monitor) {
- getSaveHandler().access();
- try {
- IWorkspaceRunnable runnable = new IWorkspaceRunnable() {
- public void run(IProgressMonitor aMonitor) {
- primSaveOnlyNewCompilationUnits(aMonitor);
- }
- };
- runOperation(runnable, monitor, false);
- } catch (SaveFailedException ex) {
- getSaveHandler().handleSaveFailed(ex, monitor);
- } finally {
- getSaveHandler().release();
- }
- }
-
- protected boolean shouldSaveReadOnly(ICompilationUnit wc) {
- IResource resource = null;
-
- resource = (IResource) wc.getPrimary().getAdapter(IRESOURCE_CLASS);
-
- if (resource == null || resource.getType() != IResource.FILE || !resource.getResourceAttributes().isReadOnly())
- return false;
-
- return getSaveHandler().shouldContinueAndMakeFileEditable((IFile) resource);
- }
-
- /**
- * @see com.ibm.etools.j2ee.workbench.IJ2EEWorkingCopyManager#hasWorkingCopies()
- */
- public boolean hasWorkingCopies() {
- return (deletedCompilationUnits != null && !deletedCompilationUnits.isEmpty()) || (needsSavingCompilationUnits != null && !needsSavingCompilationUnits.isEmpty()) || (newCompilationUnits != null && !newCompilationUnits.isEmpty());
- }
-
-}
diff --git a/plugins/org.eclipse.jst.common.frameworks/src/org/eclipse/jst/common/jdt/internal/integration/WorkingCopyManager.java b/plugins/org.eclipse.jst.common.frameworks/src/org/eclipse/jst/common/jdt/internal/integration/WorkingCopyManager.java
deleted file mode 100644
index 35ccc89..0000000
--- a/plugins/org.eclipse.jst.common.frameworks/src/org/eclipse/jst/common/jdt/internal/integration/WorkingCopyManager.java
+++ /dev/null
@@ -1,49 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2003, 2004 IBM Corporation and others.
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
- *
- * Contributors:
- * IBM Corporation - initial API and implementation
- *******************************************************************************/
-package org.eclipse.jst.common.jdt.internal.integration;
-
-import org.eclipse.core.runtime.IProgressMonitor;
-
-
-/**
- * @author Administrator
- *
- *
- */
-public interface WorkingCopyManager extends WorkingCopyProvider {
-
- void dispose();
-
- java.util.Set getAffectedFiles();
-
- /**
- * This will save all of the referenced CompilationUnits to be saved.
- */
- void saveCompilationUnits(IProgressMonitor monitor);
-
- /**
- * This will save all of the new CompilationUnits to be saved.
- */
- void saveOnlyNewCompilationUnits(IProgressMonitor monitor);
-
- /**
- * Method hasWorkingCopies.
- *
- * @return boolean
- */
- boolean hasWorkingCopies();
-
- /**
- * Revert all working copies.
- */
- void revert();
-
-}
\ No newline at end of file
diff --git a/plugins/org.eclipse.jst.common.frameworks/src/org/eclipse/jst/common/jdt/internal/integration/WorkingCopyManagerFactory.java b/plugins/org.eclipse.jst.common.frameworks/src/org/eclipse/jst/common/jdt/internal/integration/WorkingCopyManagerFactory.java
deleted file mode 100644
index 9153f9e..0000000
--- a/plugins/org.eclipse.jst.common.frameworks/src/org/eclipse/jst/common/jdt/internal/integration/WorkingCopyManagerFactory.java
+++ /dev/null
@@ -1,57 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2003, 2005 IBM Corporation and others.
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
- *
- * Contributors:
- * IBM Corporation - initial API and implementation
- *******************************************************************************/
-package org.eclipse.jst.common.jdt.internal.integration;
-
-import org.eclipse.jem.util.UIContextDetermination;
-
-
-/**
- * @author mdelder
- *
- *
- */
-public class WorkingCopyManagerFactory {
-
- // protected static Class workingCopyManagerClass;
-
- public static WorkingCopyManager newRegisteredInstance() {
- return (WorkingCopyManager) UIContextDetermination.createInstance("workingCopyManager"); //$NON-NLS-1$
- }
-
- // public static IWorkingCopyManager createWorkingCopyManager() {
- // if (getWorkingCopyManagerClass() != null)
- // try {
- // return (IWorkingCopyManager) getWorkingCopyManagerClass().newInstance();
- // } catch (InstantiationException e1) {
- // } catch (IllegalAccessException e2) {
- // }
- // return null;
- // }
- //
- // /**
- // * Insert the method's description here.
- // * Creation date: (4/26/2001 7:53:15 AM)
- // * @return java.lang.Class
- // */
- // public static java.lang.Class getWorkingCopyManagerClass() {
- // return workingCopyManagerClass;
- // }
- //
- // /**
- // * Insert the method's description here.
- // * Creation date: (4/26/2001 7:53:15 AM)
- // * @param newWorkingCopyManagerClass java.lang.Class
- // */
- // public static void setWorkingCopyManagerClass(java.lang.Class newWorkingCopyManagerClass) {
- // workingCopyManagerClass = newWorkingCopyManagerClass;
- // }
-
-}
diff --git a/plugins/org.eclipse.jst.common.frameworks/src/org/eclipse/jst/common/jdt/internal/integration/WorkingCopyProvider.java b/plugins/org.eclipse.jst.common.frameworks/src/org/eclipse/jst/common/jdt/internal/integration/WorkingCopyProvider.java
deleted file mode 100644
index 2696f5c..0000000
--- a/plugins/org.eclipse.jst.common.frameworks/src/org/eclipse/jst/common/jdt/internal/integration/WorkingCopyProvider.java
+++ /dev/null
@@ -1,60 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2003, 2004 IBM Corporation and others.
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
- *
- * Contributors:
- * IBM Corporation - initial API and implementation
- *******************************************************************************/
-package org.eclipse.jst.common.jdt.internal.integration;
-
-import org.eclipse.core.runtime.CoreException;
-import org.eclipse.core.runtime.IProgressMonitor;
-import org.eclipse.jdt.core.ICompilationUnit;
-
-
-/**
- * The user of the Java code generation framework must supply an implementation of this interface.
- * The framework will obtain compilation working copies from this interface. The supplier of the
- * implementation is responsible for committing the working copies when appropriate for the user's
- * edit model.
- */
-public interface WorkingCopyProvider {
-
- /**
- * This will delete compilation unit from the workbench and fix the internal references for this
- * working copy manager.
- *
- * @param cu
- * the compilation unit to delete
- * @param monitor
- * the progress monitor to use for the delete
- */
- void delete(ICompilationUnit cu, IProgressMonitor monitor);
-
- /**
- * Returns the working copy remembered for the compilation unit. That is, the manager already
- * has a working copy for this unit, it does not create a new working copy. Does not connect the
- * edit model to the working copy.
- *
- * @param input
- * the compilation unit
- * @return the working copy of the compilation unit, or <code>null</code> it there is no
- * remembered working copy for this compilation unit
- */
- ICompilationUnit getExistingWorkingCopy(ICompilationUnit cu) throws CoreException;
-
- /**
- * Returns the working copy remembered for the compilation unit or creates a new working copy
- * for the compilation unit and returns it. If a working copy is passed in, it is returned.
- *
- * @param input
- * the compilation unit
- * @return the working copy of the compilation unit
- * @exception CoreException
- * if the working copy can not be created
- */
- ICompilationUnit getWorkingCopy(ICompilationUnit cu, boolean forNewCU) throws CoreException;
-}
\ No newline at end of file
diff --git a/plugins/org.eclipse.jst.common.frameworks/src/org/eclipse/jst/common/jdt/internal/javalite/IJavaProjectLite.java b/plugins/org.eclipse.jst.common.frameworks/src/org/eclipse/jst/common/jdt/internal/javalite/IJavaProjectLite.java
deleted file mode 100644
index ced0aec..0000000
--- a/plugins/org.eclipse.jst.common.frameworks/src/org/eclipse/jst/common/jdt/internal/javalite/IJavaProjectLite.java
+++ /dev/null
@@ -1,75 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2009 IBM Corporation and others.
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
- *
- * Contributors:
- * IBM Corporation - initial API and implementation
- *******************************************************************************/
-package org.eclipse.jst.common.jdt.internal.javalite;
-
-import org.eclipse.core.resources.IProject;
-import org.eclipse.core.runtime.IPath;
-import org.eclipse.jdt.core.IClasspathEntry;
-import org.eclipse.jdt.core.IJavaModel;
-import org.eclipse.jdt.core.IJavaProject;
-import org.eclipse.jdt.core.JavaCore;
-
-/**
- * <p>
- * Represents a scaled down version of an {@link IJavaProject}. This subset of
- * methods is guaranteed to not force a load of the underlying
- * {@link IJavaModel}. This enables safe access to a limited set of
- * {@link IJavaProject} API for multi-threaded clients to call during times of
- * extreme concurrency, e.g. workbench startup.
- * </p>
- * <p>
- * An instance of one of these handles can be created via
- * <code>JavaCoreLite.create(project)</code>.
- * </p>
- *
- * @see JavaCore#create(org.eclipse.core.resources.IProject)
- * @see IJavaProject
- * @see IClasspathEntry
- */
-public interface IJavaProjectLite {
- /**
- * @see IJavaProject#readRawClasspath()
- *
- * @return
- */
- IClasspathEntry[] readRawClasspath();
-
- /**
- * @see IJavaProject#readOutputLocation()
- *
- * @return
- */
- IPath readOutputLocation();
-
- /**
- * @see IJavaProject#getProject()
- *
- * @return
- */
- IProject getProject();
-
- /**
- * @see IJavaProject#exists()
- */
- boolean exists();
-
- /**
- * @see IJavaProject#isOpen()
- * @return
- */
- boolean isOpen();
-
- /**
- * @see IJavaProject#hasBuildState()
- * @return
- */
- public boolean hasBuildState();
-}
diff --git a/plugins/org.eclipse.jst.common.frameworks/src/org/eclipse/jst/common/jdt/internal/javalite/JavaCoreLite.java b/plugins/org.eclipse.jst.common.frameworks/src/org/eclipse/jst/common/jdt/internal/javalite/JavaCoreLite.java
deleted file mode 100644
index b79aa6b..0000000
--- a/plugins/org.eclipse.jst.common.frameworks/src/org/eclipse/jst/common/jdt/internal/javalite/JavaCoreLite.java
+++ /dev/null
@@ -1,211 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2009 IBM Corporation and others.
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
- *
- * Contributors:
- * IBM Corporation - initial API and implementation
- *******************************************************************************/
-package org.eclipse.jst.common.jdt.internal.javalite;
-
-import java.util.HashMap;
-import java.util.HashSet;
-import java.util.Map;
-import java.util.Set;
-
-import org.eclipse.core.resources.IProject;
-import org.eclipse.core.resources.IResource;
-import org.eclipse.core.resources.IResourceChangeEvent;
-import org.eclipse.core.resources.IResourceChangeListener;
-import org.eclipse.core.resources.ResourcesPlugin;
-import org.eclipse.core.runtime.IPath;
-import org.eclipse.jdt.core.ClasspathContainerInitializer;
-import org.eclipse.jdt.core.ElementChangedEvent;
-import org.eclipse.jdt.core.IAccessRule;
-import org.eclipse.jdt.core.IClasspathAttribute;
-import org.eclipse.jdt.core.IClasspathEntry;
-import org.eclipse.jdt.core.IElementChangedListener;
-import org.eclipse.jdt.core.IJavaElement;
-import org.eclipse.jdt.core.IJavaElementDelta;
-import org.eclipse.jdt.core.IJavaProject;
-import org.eclipse.jdt.core.JavaCore;
-import org.eclipse.jdt.internal.core.JavaModelManager;
-
-public final class JavaCoreLite {
-
- public static String NATURE_ID = JavaCore.NATURE_ID;
-
- private static Object lock = new Object();
-
- private static JavaCoreLite INSTANCE = null;
-
- private class JavaCoreLiteListener implements IElementChangedListener, IResourceChangeListener {
- public void elementChanged(ElementChangedEvent event) {
- IJavaElementDelta delta = event.getDelta();
- IJavaElementDelta[] children = delta.getAffectedChildren();
- for (int i = 0; i < children.length; i++) {
- processDelta(children[i]);
- }
- }
-
- private void processDelta(IJavaElementDelta delta) {
- int flags = delta.getFlags();
- if ((flags & IJavaElementDelta.F_CLOSED) != 0) {
- IJavaElement element = delta.getElement();
- IJavaProject javaProject = (IJavaProject) element;
- IProject project = javaProject.getProject();
- synchronized (lock) {
- initializedJavaProjects.remove(project);
- javaProjectLiteCache.remove(project);
- }
- } else if ((flags & IJavaElementDelta.F_CLASSPATH_CHANGED) != 0) {
- IJavaElement element = delta.getElement();
- if (element.getElementType() == IJavaElement.JAVA_PROJECT) {
- IJavaProject javaProject = (IJavaProject) element;
- IProject project = javaProject.getProject();
- synchronized (lock) {
- if (!initializedJavaProjects.contains(project) && javaProjectLiteCache.containsKey(project)) {
- JavaProjectLite javaProjectLite = javaProjectLiteCache.get(project);
- javaProjectLite.flushClasspath();
- }
- }
- }
- } else if ((flags & IJavaElementDelta.F_RESOLVED_CLASSPATH_CHANGED) != 0) {
- IJavaElement element = delta.getElement();
- if (element.getElementType() == IJavaElement.JAVA_PROJECT) {
- IJavaProject javaProject = (IJavaProject) element;
- IProject project = javaProject.getProject();
- synchronized (lock) {
- if (!initializedJavaProjects.contains(project)) {
- initializedJavaProjects.add(project);
- if (javaProjectLiteCache.containsKey(project)) {
- JavaProjectLite javaProjectLite = javaProjectLiteCache.get(project);
- javaProjectLite.markJavaProjectInitialized();
- }
- }
- }
- }
- }
- }
-
- public void resourceChanged(IResourceChangeEvent event) {
- switch (event.getType()) {
- case IResourceChangeEvent.PRE_CLOSE:
- case IResourceChangeEvent.PRE_DELETE:
- IResource resource = event.getResource();
- if (resource.getType() == IResource.PROJECT) {
- IProject project = (IProject) resource;
- synchronized (lock) {
- initializedJavaProjects.remove(project);
- javaProjectLiteCache.remove(project);
- }
- }
- }
- }
- }
-
- private Set<IProject> initializedJavaProjects = new HashSet<IProject>();
- private Map<IProject, JavaProjectLite> javaProjectLiteCache = new HashMap<IProject, JavaProjectLite>();
- private JavaCoreLiteListener listener = null;
-
- private static JavaCoreLite getInstance() {
- synchronized (lock) {
- if (INSTANCE == null) {
- INSTANCE = new JavaCoreLite();
- }
- }
- return INSTANCE;
- }
-
- private JavaCoreLite() {
- listener = new JavaCoreLiteListener();
- JavaCore.addElementChangedListener(listener);
- ResourcesPlugin.getWorkspace().addResourceChangeListener(listener, IResourceChangeEvent.PRE_CLOSE | IResourceChangeEvent.PRE_DELETE);
- }
-
- private IJavaProjectLite createImpl(IProject project) {
- synchronized (lock) {
- if (javaProjectLiteCache.containsKey(project)) {
- return javaProjectLiteCache.get(project);
- }
- }
-
- IJavaProject javaProject = JavaCore.create(project);
- if (javaProject != null) {
- boolean javaProjectInitialized = false;
- synchronized (lock) {
- javaProjectInitialized = initializedJavaProjects.contains(project);
- }
- if (!javaProjectInitialized) {
- if (isInitialized(javaProject)) {
- synchronized (lock) {
- initializedJavaProjects.add(project);
- }
- javaProjectInitialized = true;
- }
- }
- JavaProjectLite javaProjectLite = new JavaProjectLite(javaProject, javaProjectInitialized);
- synchronized (lock) {
- javaProjectLiteCache.put(project, javaProjectLite);
- }
- return javaProjectLite;
- }
- return null;
- }
-
- static boolean isInitialized(IJavaProject javaProject) {
- if (javaProject.isOpen()) {
- JavaModelManager.PerProjectInfo projectInfo = JavaModelManager.getJavaModelManager().getPerProjectInfo(javaProject.getProject(), false);
- if (projectInfo != null) {
- if (projectInfo.getResolvedClasspath() != null) {
- return true;
- }
- }
- }
- return false;
- }
-
- public static final IJavaProjectLite create(IProject project) {
- if (project == null) {
- throw new NullPointerException();
- }
- return getInstance().createImpl(project);
- }
-
- public static final IJavaProjectLite create(IJavaProject javaProject) {
- if (javaProject == null) {
- throw new NullPointerException();
- }
- return create(javaProject.getProject());
- }
-
- public static ClasspathContainerInitializer getClasspathContainerInitializer(String containerID) {
- return JavaCore.getClasspathContainerInitializer(containerID);
- }
-
- public static IClasspathEntry newProjectEntry(IPath path) {
- return JavaCore.newProjectEntry(path);
- }
-
- public static IClasspathEntry newProjectEntry(IPath path, boolean isExported) {
- return JavaCore.newProjectEntry(path, isExported);
- }
-
- public static IClasspathEntry newProjectEntry(IPath path, IAccessRule[] accessRules, boolean combineAccessRules, IClasspathAttribute[] extraAttributes, boolean isExported) {
- return JavaCore.newProjectEntry(path, accessRules, combineAccessRules, extraAttributes, isExported);
- }
-
- public static IClasspathEntry newLibraryEntry(IPath path, IPath sourceAttachmentPath, IPath sourceAttachmentRootPath) {
- return JavaCore.newLibraryEntry(path, sourceAttachmentPath, sourceAttachmentRootPath);
- }
-
- public static IClasspathEntry newLibraryEntry(IPath path, IPath sourceAttachmentPath, IPath sourceAttachmentRootPath, boolean isExported) {
- return JavaCore.newLibraryEntry(path, sourceAttachmentPath, sourceAttachmentRootPath, isExported);
- }
-
- public static IClasspathEntry newLibraryEntry(IPath path, IPath sourceAttachmentPath, IPath sourceAttachmentRootPath, IAccessRule[] accessRules, IClasspathAttribute[] extraAttributes, boolean isExported) {
- return JavaCore.newLibraryEntry(path, sourceAttachmentPath, sourceAttachmentRootPath, accessRules, extraAttributes, isExported);
- }
-}
diff --git a/plugins/org.eclipse.jst.common.frameworks/src/org/eclipse/jst/common/jdt/internal/javalite/JavaLiteUtilities.java b/plugins/org.eclipse.jst.common.frameworks/src/org/eclipse/jst/common/jdt/internal/javalite/JavaLiteUtilities.java
deleted file mode 100644
index f61edbc..0000000
--- a/plugins/org.eclipse.jst.common.frameworks/src/org/eclipse/jst/common/jdt/internal/javalite/JavaLiteUtilities.java
+++ /dev/null
@@ -1,192 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2009 IBM Corporation and others.
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
- *
- * Contributors:
- * IBM Corporation - initial API and implementation
- *******************************************************************************/
-package org.eclipse.jst.common.jdt.internal.javalite;
-
-import java.util.ArrayList;
-import java.util.Collections;
-import java.util.List;
-
-import org.eclipse.core.resources.IContainer;
-import org.eclipse.core.resources.IProject;
-import org.eclipse.core.resources.ResourcesPlugin;
-import org.eclipse.core.runtime.CoreException;
-import org.eclipse.core.runtime.IPath;
-import org.eclipse.jdt.core.IClasspathEntry;
-import org.eclipse.jst.common.frameworks.CommonFrameworksPlugin;
-import org.eclipse.wst.common.componentcore.ComponentCore;
-import org.eclipse.wst.common.componentcore.resources.IVirtualComponent;
-import org.eclipse.wst.common.componentcore.resources.IVirtualResource;
-
-public final class JavaLiteUtilities {
-
- /**
- * Returns the Java source (i.e. where the .java files are) IContainers for
- * the specified IJavaProjectLite
- *
- * @param javaProjectLite
- * @return
- */
- public final static List<IContainer> getJavaSourceContainers(final IJavaProjectLite javaProjectLite) {
- IClasspathEntry[] entries = javaProjectLite.readRawClasspath();
- List<IContainer> containers = new ArrayList<IContainer>();
- for (IClasspathEntry entry : entries) {
- if (entry.getEntryKind() == IClasspathEntry.CPE_SOURCE && entry.getPath().segmentCount() > 0) {
- IContainer container = null;
- if( entry.getPath().segmentCount() == 1 )
- container = ResourcesPlugin.getWorkspace().getRoot().getProject(entry.getPath().segment(0));
- else
- container = ResourcesPlugin.getWorkspace().getRoot().getFolder(entry.getPath());
- if( !containers.contains(container))
- containers.add(container);
- }
- }
- return containers;
- }
-
- /**
- * Returns the Java source (i.e. where the compiled .class files are) IContainers for
- * the specified IJavaProjectLite
- *
- * @param javaProjectLite
- * @return
- */
- public final static List<IContainer> getJavaOutputContainers(final IJavaProjectLite javaProjectLite) {
- List<IContainer> containers = new ArrayList<IContainer>();
- IContainer defaultOutputContainer = getDefaultJavaOutputContainer(javaProjectLite);
- containers.add(defaultOutputContainer);
- IClasspathEntry[] entries = javaProjectLite.readRawClasspath();
- for (IClasspathEntry entry : entries) {
- if (entry.getEntryKind() == IClasspathEntry.CPE_SOURCE) {
- IContainer outputContainer = getJavaOutputContainer(javaProjectLite, entry);
- if (!containers.contains(outputContainer)) {
- containers.add(outputContainer);
- }
- }
- }
- return containers;
- }
-
- private static enum JavaContainerType {
- SOURCE, OUTPUT
- }
-
- /**
- * Returns all Java output (i.e. where the compiled .class files are)
- * IContainers whose source is explicitly mapped by the specified component,
- * or if the output container itself is explicitly mapped.
- *
- * @param virtualComponent
- * @return
- */
- public static List<IContainer> getJavaOutputContainers(IVirtualComponent virtualComponent) {
- return getJavaContainers(virtualComponent, JavaContainerType.OUTPUT);
- }
-
- /**
- * Returns all Java source (i.e. where the .java files are) IContainers
- * explicitly mapped by the specified component.
- *
- * @param virtualComponent
- * @return
- */
- public static List<IContainer> getJavaSourceContainers(IVirtualComponent virtualComponent) {
- return getJavaContainers(virtualComponent, JavaContainerType.SOURCE);
- }
-
- private static List<IContainer> getJavaContainers(IVirtualComponent virtualComponent, JavaContainerType javaContainerType) {
- if (virtualComponent.isBinary()) {
- return Collections.emptyList();
- }
- IProject project = virtualComponent.getProject();
- try {
- if (!project.hasNature(JavaCoreLite.NATURE_ID)) {
- return Collections.emptyList();
- }
- } catch (CoreException e) {
- CommonFrameworksPlugin.logError(e);
- return Collections.emptyList();
- }
-
- IJavaProjectLite javaProjectLite = JavaCoreLite.create(project);
- List<IContainer> containers = new ArrayList<IContainer>();
- if (javaContainerType == JavaContainerType.OUTPUT) {
- IContainer defaultOutputContainer = getDefaultJavaOutputContainer(javaProjectLite);
- IVirtualResource[] virtualResources = ComponentCore.createResources(defaultOutputContainer);
- for (IVirtualResource virtualResource : virtualResources) {
- if (virtualResource.getComponent().equals(virtualComponent)) {
- containers.add(defaultOutputContainer);
- break;
- }
- }
- }
- IClasspathEntry[] entries = javaProjectLite.readRawClasspath();
- for (IClasspathEntry entry : entries) {
- if (entry.getEntryKind() == IClasspathEntry.CPE_SOURCE) {
- IPath sourcePath = entry.getPath().removeFirstSegments(1); // remove the project from the path
- IContainer sourceContainer = sourcePath.segmentCount() == 0 ? project : project.getFolder(sourcePath);
- if (sourceContainer != null) {
- IVirtualResource[] virtualResources = ComponentCore.createResources(sourceContainer);
- for (IVirtualResource virtualResource : virtualResources) {
- if (virtualResource.getComponent().equals(virtualComponent)) {
- switch (javaContainerType) {
- case SOURCE:
- if (!containers.contains(sourceContainer)) {
- containers.add(sourceContainer);
- }
- break;
- case OUTPUT:
- IContainer outputContainer = getJavaOutputContainer(javaProjectLite, entry);
- if (!containers.contains(outputContainer)) {
- containers.add(outputContainer);
- }
- break;
- }
- }
- }
- }
- }
- }
- return containers;
- }
-
- /**
- * Returns the default Java output IContainer (i.e. where the compiled
- * .class files go)
- *
- * @param javaProjectLite
- * @return
- */
- public static IContainer getDefaultJavaOutputContainer(IJavaProjectLite javaProjectLite) {
- IProject project = javaProjectLite.getProject();
- IPath defaultOutputPath = javaProjectLite.readOutputLocation();
- if (defaultOutputPath.segmentCount() == 1) {
- return project;
- }
- return project.getFolder(defaultOutputPath.removeFirstSegments(1));
- }
-
- /**
- * Returns the Java output (i.e. where the compiled .class files go)
- * IContainer for the specified IClasspathEntry
- *
- * @param javaProjectLite
- * @param entry
- * @return
- */
- public static IContainer getJavaOutputContainer(IJavaProjectLite javaProjectLite, IClasspathEntry entry) {
- IProject project = javaProjectLite.getProject();
- IPath outputPath = entry.getOutputLocation();
- if (outputPath != null) {
- return project.getFolder(outputPath.removeFirstSegments(1));
- }
- return getDefaultJavaOutputContainer(javaProjectLite);
- }
-}
diff --git a/plugins/org.eclipse.jst.common.frameworks/src/org/eclipse/jst/common/jdt/internal/javalite/JavaProjectLite.java b/plugins/org.eclipse.jst.common.frameworks/src/org/eclipse/jst/common/jdt/internal/javalite/JavaProjectLite.java
deleted file mode 100644
index f8141e5..0000000
--- a/plugins/org.eclipse.jst.common.frameworks/src/org/eclipse/jst/common/jdt/internal/javalite/JavaProjectLite.java
+++ /dev/null
@@ -1,186 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2009 IBM Corporation and others.
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
- *
- * Contributors:
- * IBM Corporation - initial API and implementation
- *******************************************************************************/
-package org.eclipse.jst.common.jdt.internal.javalite;
-
-import org.eclipse.core.resources.IFile;
-import org.eclipse.core.resources.IProject;
-import org.eclipse.core.runtime.IPath;
-import org.eclipse.jdt.core.IClasspathEntry;
-import org.eclipse.jdt.core.IJavaProject;
-import org.eclipse.jdt.core.JavaModelException;
-import org.eclipse.jst.common.frameworks.CommonFrameworksPlugin;
-
-/**
- * @see IJavaProjectLite
- */
-public final class JavaProjectLite implements IJavaProjectLite {
- private final IJavaProject _javaProject;
-
- private Object lock = new Object();
- private boolean _javaProjectInitialized = false;
- private boolean _rawClasspathRead = false;
- private IClasspathEntry[] _rawClasspath;
- private boolean _rawOutputLocationRead = false;
- private IPath _rawOutputLocation;
- private long _dotClasspathModificationStamp = IFile.NULL_STAMP;
-
- JavaProjectLite(IJavaProject javaProject, boolean javaProjectInitialized) {
- this._javaProject = javaProject;
- this._javaProjectInitialized = javaProjectInitialized;
- }
-
- void markJavaProjectInitialized() {
- synchronized (lock) {
- if (!_javaProjectInitialized) {
- _javaProjectInitialized = true;
- flushClasspath();
- }
- }
- }
-
- private boolean isJavaProjectInitialized() {
- synchronized (lock) {
- return _javaProjectInitialized;
- }
- }
-
- void flushClasspath() {
- synchronized (lock) {
- _rawClasspathRead = false;
- _rawClasspath = null;
- _rawOutputLocationRead = false;
- _rawOutputLocation = null;
- _dotClasspathModificationStamp = IFile.NULL_STAMP;
- }
- }
-
- private void verifyDotClasspathModificationStamp() {
- long modificationStamp = IFile.NULL_STAMP;
- synchronized (lock) {
- modificationStamp = _dotClasspathModificationStamp;
- }
- if (modificationStamp == IFile.NULL_STAMP) {
- flushClasspath();
- return;
- }
- IFile dotClasspath = _javaProject.getProject().getFile(".classpath"); //$NON-NLS-1$
- if (!dotClasspath.exists()) {
- flushClasspath();
- return;
- }
- if (modificationStamp != dotClasspath.getModificationStamp()) {
- flushClasspath();
- return;
- }
- }
-
- private void updateDotClasspathModificationStamp() {
- IFile dotClasspath = _javaProject.getProject().getFile(".classpath"); //$NON-NLS-1$
- long modificationStamp = dotClasspath.getModificationStamp();
- synchronized (lock) {
- _dotClasspathModificationStamp = modificationStamp;
- }
- }
-
- public final IClasspathEntry[] readRawClasspath() {
- if (!isJavaProjectInitialized()) {
- if (JavaCoreLite.isInitialized(_javaProject)) {
- markJavaProjectInitialized();
- }
- }
-
- if (isJavaProjectInitialized()) {
- try {
- return _javaProject.getRawClasspath();
- } catch (JavaModelException e) {
- CommonFrameworksPlugin.log(e);
- }
- }
-
- verifyDotClasspathModificationStamp();
-
- boolean dataRead = false;
- synchronized (lock) {
- dataRead = _rawClasspathRead;
- }
- if (!dataRead) {
- updateDotClasspathModificationStamp();
- IClasspathEntry[] rawClasspath = _javaProject.readRawClasspath();
- synchronized (lock) {
- _rawClasspathRead = true;
- _rawClasspath = rawClasspath;
- }
- }
- return _rawClasspath;
- }
-
- public final IPath readOutputLocation() {
- if (!isJavaProjectInitialized()) {
- if (JavaCoreLite.isInitialized(_javaProject)) {
- markJavaProjectInitialized();
- }
- }
-
- if (isJavaProjectInitialized()) {
- try {
- return _javaProject.getOutputLocation();
- } catch (JavaModelException e) {
- CommonFrameworksPlugin.log(e);
- }
- }
-
- verifyDotClasspathModificationStamp();
-
- boolean dataRead = false;
- synchronized (lock) {
- dataRead = _rawOutputLocationRead;
- }
- if (!dataRead) {
- updateDotClasspathModificationStamp();
- IPath rawOutputLocation = _javaProject.readOutputLocation();
- if (rawOutputLocation == null) {
- // borrowed from JavaProject.getDefaultOutputLocation()
- rawOutputLocation = _javaProject.getProject().getFullPath().append("bin"); //$NON-NLS-1$
- }
- synchronized (lock) {
- _rawOutputLocationRead = true;
- _rawOutputLocation = rawOutputLocation;
- }
- }
- return _rawOutputLocation;
- }
-
- /**
- * @see IJavaProjectLite#getProject()
- */
- public final IProject getProject() {
- return _javaProject.getProject();
- }
-
- public final boolean exists() {
- return _javaProject.exists();
- }
-
- /**
- * @see IJavaProjectLite#isOpen()
- */
- public final boolean isOpen() {
- return _javaProject.isOpen();
- }
-
- /**
- * @see IJavaProjectLite#hasBuildState()
- */
- public final boolean hasBuildState() {
- return _javaProject.hasBuildState();
- }
-
-}
\ No newline at end of file
diff --git a/plugins/org.eclipse.jst.common.frameworks/src/org/eclipse/jst/common/project/facet/IJavaFacetInstallDataModelProperties.java b/plugins/org.eclipse.jst.common.frameworks/src/org/eclipse/jst/common/project/facet/IJavaFacetInstallDataModelProperties.java
deleted file mode 100644
index 10daa48..0000000
--- a/plugins/org.eclipse.jst.common.frameworks/src/org/eclipse/jst/common/project/facet/IJavaFacetInstallDataModelProperties.java
+++ /dev/null
@@ -1,20 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2003, 2007 IBM Corporation and others.
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
- *
- * Contributors:
- * IBM Corporation - initial API and implementation
- *******************************************************************************/
-package org.eclipse.jst.common.project.facet;
-
-import org.eclipse.wst.common.frameworks.datamodel.IDataModelProperties;
-
-public interface IJavaFacetInstallDataModelProperties extends IDataModelProperties {
-
- public static final String SOURCE_FOLDER_NAME = "IJavaFacetInstallDataModelProperties.SOURCE_FOLDER_NAME"; //$NON-NLS-1$
- public static final String DEFAULT_OUTPUT_FOLDER_NAME = "IJavaFacetInstallDataModelProperties.DEFAULT_OUTPUT_FOLDER_NAME"; //$NON-NLS-1$
- public static final String JAVA_FACET_INSTALL_CONFIG = "IJavaFacetInstallDataModelProperties.JAVA_FACET_INSTALL_CONFIG"; //$NON-NLS-1$
-}
diff --git a/plugins/org.eclipse.jst.common.frameworks/src/org/eclipse/jst/common/project/facet/JavaFacetInstallDataModelProvider.java b/plugins/org.eclipse.jst.common.frameworks/src/org/eclipse/jst/common/project/facet/JavaFacetInstallDataModelProvider.java
deleted file mode 100644
index 31791b2..0000000
--- a/plugins/org.eclipse.jst.common.frameworks/src/org/eclipse/jst/common/project/facet/JavaFacetInstallDataModelProvider.java
+++ /dev/null
@@ -1,139 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2003, 2007 IBM Corporation and others.
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
- *
- * Contributors:
- * IBM Corporation - initial API and implementation
- *******************************************************************************/
-package org.eclipse.jst.common.project.facet;
-
-import java.util.Collections;
-import java.util.List;
-import java.util.Set;
-
-import org.eclipse.core.runtime.IPath;
-import org.eclipse.core.runtime.Path;
-import org.eclipse.jst.common.project.facet.core.JavaFacet;
-import org.eclipse.jst.common.project.facet.core.JavaFacetInstallConfig;
-import org.eclipse.jst.common.project.facet.core.JavaFacetInstallConfig.ChangeEvent;
-import org.eclipse.wst.common.componentcore.datamodel.FacetInstallDataModelProvider;
-import org.eclipse.wst.common.frameworks.datamodel.IDataModel;
-import org.eclipse.wst.common.project.facet.core.util.IEventListener;
-
-public class JavaFacetInstallDataModelProvider extends FacetInstallDataModelProvider implements IJavaFacetInstallDataModelProperties {
-
- private final JavaFacetInstallConfig installConfig;
-
- public JavaFacetInstallDataModelProvider()
- {
- this( new JavaFacetInstallConfig() );
- }
-
- public JavaFacetInstallDataModelProvider( final JavaFacetInstallConfig installConfig )
- {
- this.installConfig = installConfig;
- }
-
- @Override
- public Set getPropertyNames()
- {
- Set propertyNames = super.getPropertyNames();
- propertyNames.add(JAVA_FACET_INSTALL_CONFIG);
- propertyNames.add(SOURCE_FOLDER_NAME);
- propertyNames.add(DEFAULT_OUTPUT_FOLDER_NAME);
- return propertyNames;
- }
-
- @Override
- public void init()
- {
- super.init();
-
- final IDataModel dm = getDataModel();
-
- dm.setProperty( FACET_ID, JavaFacet.ID );
- dm.setProperty( JAVA_FACET_INSTALL_CONFIG, this.installConfig );
-
- String sourceFolderName = null;
-
- if( ! this.installConfig.getSourceFolders().isEmpty() )
- {
- sourceFolderName = this.installConfig.getSourceFolders().get( 0 ).toPortableString();
- }
-
- dm.setProperty( SOURCE_FOLDER_NAME, sourceFolderName );
-
- String defaultOutputFolderName = null;
-
- if( this.installConfig.getDefaultOutputFolder() != null )
- {
- defaultOutputFolderName = this.installConfig.getDefaultOutputFolder().toPortableString();
- }
-
- dm.setProperty( DEFAULT_OUTPUT_FOLDER_NAME, defaultOutputFolderName );
-
- final IEventListener<JavaFacetInstallConfig.ChangeEvent> listener
- = new IEventListener<JavaFacetInstallConfig.ChangeEvent>()
- {
- public void handleEvent( final ChangeEvent event )
- {
- if( event.getType() == JavaFacetInstallConfig.ChangeEvent.Type.SOURCE_FOLDERS_CHANGED )
- {
- String val = null;
-
- if( installConfig.getSourceFolders().size() > 0 )
- {
- val = installConfig.getSourceFolders().get( 0 ).toPortableString();
- }
-
- dm.setProperty( SOURCE_FOLDER_NAME, val );
- }
- else if( event.getType() == JavaFacetInstallConfig.ChangeEvent.Type.DEFAULT_OUTPUT_FOLDER_CHANGED )
- {
- final String val = installConfig.getDefaultOutputFolder().toPortableString();
- dm.setProperty( DEFAULT_OUTPUT_FOLDER_NAME, val );
- }
- }
- };
-
- this.installConfig.addListener( listener );
- }
-
- @Override
- public boolean propertySet( final String propertyName,
- final Object propertyValue )
- {
- if( propertyName.equals( SOURCE_FOLDER_NAME ) )
- {
- final List<IPath> sourceFolders;
-
- if( propertyValue == null )
- {
- sourceFolders = Collections.emptyList();
- }
- else
- {
- sourceFolders = Collections.<IPath>singletonList( new Path( (String) propertyValue ) );
- }
-
- this.installConfig.setSourceFolders( sourceFolders );
-
- return true;
- }
- else if( propertyName.equals( DEFAULT_OUTPUT_FOLDER_NAME ) )
- {
- this.installConfig.setDefaultOutputFolder( new Path( (String) propertyValue ) );
- return true;
- }
- else if( propertyName.equals( JAVA_FACET_INSTALL_CONFIG ) )
- {
- return false;
- }
-
- return super.propertySet( propertyName, propertyValue );
- }
-
-}
diff --git a/plugins/org.eclipse.jst.common.frameworks/src/org/eclipse/jst/common/project/facet/JavaFacetUtils.java b/plugins/org.eclipse.jst.common.frameworks/src/org/eclipse/jst/common/project/facet/JavaFacetUtils.java
deleted file mode 100644
index e2312ab..0000000
--- a/plugins/org.eclipse.jst.common.frameworks/src/org/eclipse/jst/common/project/facet/JavaFacetUtils.java
+++ /dev/null
@@ -1,90 +0,0 @@
-/******************************************************************************
- * Copyright (c) 2005, 2006 BEA Systems, Inc.
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
- *
- * Contributors:
- * Konstantin Komissarchik - initial API and implementation
- ******************************************************************************/
-
-package org.eclipse.jst.common.project.facet;
-
-import org.eclipse.core.resources.IProject;
-import org.eclipse.core.runtime.CoreException;
-import org.eclipse.jst.common.project.facet.core.JavaFacet;
-import org.eclipse.jst.common.project.facet.core.internal.JavaFacetUtil;
-import org.eclipse.wst.common.project.facet.core.IProjectFacet;
-import org.eclipse.wst.common.project.facet.core.IProjectFacetVersion;
-
-/**
- * This class is deprecated. JavaFacet class should be used instead.
- *
- * @author <a href="mailto:kosta@bea.com">Konstantin Komissarchik</a>
- */
-
-@Deprecated
-
-public final class JavaFacetUtils
-{
- public static final IProjectFacet JAVA_FACET = JavaFacet.FACET;
- public static final IProjectFacetVersion JAVA_13 = JavaFacet.VERSION_1_3;
- public static final IProjectFacetVersion JAVA_14 = JavaFacet.VERSION_1_4;
- public static final IProjectFacetVersion JAVA_50 = JavaFacet.VERSION_1_5;
- public static final IProjectFacetVersion JAVA_60 = JavaFacet.VERSION_1_6;
-
- public static String getCompilerLevel()
- {
- return JavaFacetUtil.getCompilerLevel();
- }
-
- public static String getCompilerLevel( final IProject project )
- {
- return JavaFacetUtil.getCompilerLevel( project );
- }
-
- public static void setCompilerLevel( final IProject project,
- final IProjectFacetVersion fv )
-
- throws CoreException
-
- {
- JavaFacetUtil.setCompilerLevel( project, fv );
- }
-
- public static void setCompilerLevel( final IProject project,
- final String level )
-
- throws CoreException
-
- {
- JavaFacetUtil.setCompilerLevel( project, level );
- }
-
- public static void scheduleFullBuild( final IProject project )
- {
- JavaFacetUtil.scheduleFullBuild( project );
- }
-
- public static void resetClasspath( final IProject project,
- final IProjectFacetVersion oldver,
- final IProjectFacetVersion newver )
-
- throws CoreException
-
- {
- JavaFacetUtil.resetClasspath( project, oldver, newver );
- }
-
- public static IProjectFacetVersion compilerLevelToFacet( final String ver )
- {
- return JavaFacet.FACET.getVersion( ver );
- }
-
- public static String facetToCompilerLevel( final IProjectFacetVersion fv )
- {
- return fv.getVersionString();
- }
-
-}
diff --git a/plugins/org.eclipse.jst.common.frameworks/src/org/eclipse/jst/common/project/facet/JavaProjectFacetCreationDataModelProvider.java b/plugins/org.eclipse.jst.common.frameworks/src/org/eclipse/jst/common/project/facet/JavaProjectFacetCreationDataModelProvider.java
deleted file mode 100644
index 88ad597..0000000
--- a/plugins/org.eclipse.jst.common.frameworks/src/org/eclipse/jst/common/project/facet/JavaProjectFacetCreationDataModelProvider.java
+++ /dev/null
@@ -1,34 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2003, 2006 IBM Corporation and others.
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
- *
- * Contributors:
- * IBM Corporation - initial API and implementation
- *******************************************************************************/
-package org.eclipse.jst.common.project.facet;
-
-import java.util.ArrayList;
-import java.util.Collection;
-
-import org.eclipse.jst.common.project.facet.core.JavaFacet;
-import org.eclipse.wst.common.componentcore.datamodel.FacetProjectCreationDataModelProvider;
-
-public class JavaProjectFacetCreationDataModelProvider extends FacetProjectCreationDataModelProvider {
-
- public JavaProjectFacetCreationDataModelProvider() {
- super();
- }
-
- @Override
- public void init() {
- super.init();
-
- Collection requiredFacets = new ArrayList();
- requiredFacets.add(JavaFacet.FACET);
- setProperty(REQUIRED_FACETS_COLLECTION, requiredFacets);
- }
-
-}
diff --git a/plugins/org.eclipse.jst.common.frameworks/src/org/eclipse/jst/common/project/facet/WtpUtils.java b/plugins/org.eclipse.jst.common.frameworks/src/org/eclipse/jst/common/project/facet/WtpUtils.java
deleted file mode 100644
index b82d7d2..0000000
--- a/plugins/org.eclipse.jst.common.frameworks/src/org/eclipse/jst/common/project/facet/WtpUtils.java
+++ /dev/null
@@ -1,69 +0,0 @@
-/******************************************************************************
- * Copyright (c) 2005 BEA Systems, Inc.
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
- *
- * Contributors:
- * Konstantin Komissarchik - initial API and implementation
- ******************************************************************************/
-
-package org.eclipse.jst.common.project.facet;
-
-import org.eclipse.core.resources.IProject;
-import org.eclipse.core.resources.IProjectDescription;
-import org.eclipse.core.runtime.CoreException;
-import org.eclipse.jem.util.emf.workbench.ProjectUtilities;
-
-/**
- * @author <a href="mailto:kosta@bea.com">Konstantin Komissarchik</a>
- */
-
-public final class WtpUtils
-{
- private WtpUtils() {}
-
- private static final String WTP_NATURE
- = "org.eclipse.wst.common.modulecore.ModuleCoreNature"; //$NON-NLS-1$
-
- private static final String JEM_NATURE
- = "org.eclipse.jem.workbench.JavaEMFNature"; //$NON-NLS-1$
-
- private static final String[] NATURES = {WTP_NATURE, JEM_NATURE};
-
- public static void addNatures( final IProject project )
-
- throws CoreException
-
- {
- for (int i = 0; i < NATURES.length; i++) {
- if (!project.hasNature(NATURES[i])) {
- ProjectUtilities.addNatureToProject(project, NATURES[i]);
- }
- }
- }
-
- public static void addNaturestoEAR( final IProject project )
-
- throws CoreException
-
- {
- final IProjectDescription desc = project.getDescription();
- final String[] current = desc.getNatureIds();
- final String[] replacement = new String[ current.length + 1 ];
- System.arraycopy( current, 0, replacement, 0, current.length );
- replacement[ current.length ] = WTP_NATURE;
- desc.setNatureIds( replacement );
- project.setDescription( desc, null );
- }
-
- public static void removeNatures( final IProject project )
-
- throws CoreException
-
- {
- ProjectUtilities.removeNatureFromProject( project, WTP_NATURE );
- ProjectUtilities.removeNatureFromProject( project, JEM_NATURE );
- }
-}
diff --git a/plugins/org.eclipse.jst.common.frameworks/src/org/eclipse/jst/common/project/facet/internal/DataModelToJavaFacetInstallConfigAdapter.java b/plugins/org.eclipse.jst.common.frameworks/src/org/eclipse/jst/common/project/facet/internal/DataModelToJavaFacetInstallConfigAdapter.java
deleted file mode 100644
index aaee1bd..0000000
--- a/plugins/org.eclipse.jst.common.frameworks/src/org/eclipse/jst/common/project/facet/internal/DataModelToJavaFacetInstallConfigAdapter.java
+++ /dev/null
@@ -1,48 +0,0 @@
-/******************************************************************************
- * Copyright (c) 2008 BEA Systems, Inc.
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
- *
- * Contributors:
- * Konstantin Komissarchik
- ******************************************************************************/
-
-package org.eclipse.jst.common.project.facet.internal;
-
-import org.eclipse.core.runtime.IAdapterFactory;
-import org.eclipse.jst.common.project.facet.IJavaFacetInstallDataModelProperties;
-import org.eclipse.jst.common.project.facet.core.JavaFacetInstallConfig;
-import org.eclipse.wst.common.frameworks.datamodel.IDataModel;
-
-/**
- * @author <a href="mailto:kosta@bea.com">Konstantin Komissarchik</a>
- */
-
-public final class DataModelToJavaFacetInstallConfigAdapter
-
- implements IAdapterFactory
-
-{
- private static final Class[] ADAPTER_TYPES = { JavaFacetInstallConfig.class };
-
- public Object getAdapter( final Object adaptable,
- final Class adapterType )
- {
- if( adapterType == JavaFacetInstallConfig.class )
- {
- final IDataModel dm = (IDataModel) adaptable;
-
- return dm.getProperty( IJavaFacetInstallDataModelProperties.JAVA_FACET_INSTALL_CONFIG );
- }
-
- return null;
- }
-
- public Class[] getAdapterList()
- {
- return ADAPTER_TYPES;
- }
-
-}
diff --git a/plugins/org.eclipse.jst.common.frameworks/src/org/eclipse/jst/common/project/facet/internal/JavaFacetInstallConfigToDataModelAdapter.java b/plugins/org.eclipse.jst.common.frameworks/src/org/eclipse/jst/common/project/facet/internal/JavaFacetInstallConfigToDataModelAdapter.java
deleted file mode 100644
index f42c4c5..0000000
--- a/plugins/org.eclipse.jst.common.frameworks/src/org/eclipse/jst/common/project/facet/internal/JavaFacetInstallConfigToDataModelAdapter.java
+++ /dev/null
@@ -1,50 +0,0 @@
-/******************************************************************************
- * Copyright (c) 2008 BEA Systems, Inc.
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
- *
- * Contributors:
- * Konstantin Komissarchik
- ******************************************************************************/
-
-package org.eclipse.jst.common.project.facet.internal;
-
-import org.eclipse.core.runtime.IAdapterFactory;
-import org.eclipse.jst.common.project.facet.JavaFacetInstallDataModelProvider;
-import org.eclipse.jst.common.project.facet.core.JavaFacetInstallConfig;
-import org.eclipse.wst.common.frameworks.datamodel.DataModelFactory;
-import org.eclipse.wst.common.frameworks.datamodel.IDataModel;
-
-/**
- * @author <a href="mailto:kosta@bea.com">Konstantin Komissarchik</a>
- */
-
-public final class JavaFacetInstallConfigToDataModelAdapter
-
- implements IAdapterFactory
-
-{
- private static final Class[] ADAPTER_TYPES = { IDataModel.class };
-
- public Object getAdapter( final Object adaptable,
- final Class adapterType )
- {
- if( adapterType == IDataModel.class )
- {
- final JavaFacetInstallDataModelProvider provider
- = new JavaFacetInstallDataModelProvider( (JavaFacetInstallConfig) adaptable );
-
- return DataModelFactory.createDataModel( provider );
- }
-
- return null;
- }
-
- public Class[] getAdapterList()
- {
- return ADAPTER_TYPES;
- }
-
-}
diff --git a/plugins/org.eclipse.jst.j2ee.jca.ui/.classpath b/plugins/org.eclipse.jst.j2ee.jca.ui/.classpath
deleted file mode 100644
index 9c5071b..0000000
--- a/plugins/org.eclipse.jst.j2ee.jca.ui/.classpath
+++ /dev/null
@@ -1,8 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<classpath>
- <classpathentry kind="src" path="jca_ui"/>
- <classpathentry kind="src" path="property_files"/>
- <classpathentry kind="con" path="org.eclipse.jdt.launching.JRE_CONTAINER/org.eclipse.jdt.internal.debug.ui.launcher.StandardVMType/J2SE-1.5"/>
- <classpathentry kind="con" path="org.eclipse.pde.core.requiredPlugins"/>
- <classpathentry kind="output" path="bin"/>
-</classpath>
diff --git a/plugins/org.eclipse.jst.j2ee.jca.ui/.cvsignore b/plugins/org.eclipse.jst.j2ee.jca.ui/.cvsignore
deleted file mode 100644
index b90d680..0000000
--- a/plugins/org.eclipse.jst.j2ee.jca.ui/.cvsignore
+++ /dev/null
@@ -1,7 +0,0 @@
-bin
-build.xml
-jcaui.jar
-temp.folder
-@dot
-src.zip
-javaCompiler...args
diff --git a/plugins/org.eclipse.jst.j2ee.jca.ui/.project b/plugins/org.eclipse.jst.j2ee.jca.ui/.project
deleted file mode 100644
index 56ec9d2..0000000
--- a/plugins/org.eclipse.jst.j2ee.jca.ui/.project
+++ /dev/null
@@ -1,29 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<projectDescription>
- <name>org.eclipse.jst.j2ee.jca.ui</name>
- <comment></comment>
- <projects>
- </projects>
- <buildSpec>
- <buildCommand>
- <name>org.eclipse.jdt.core.javabuilder</name>
- <arguments>
- </arguments>
- </buildCommand>
- <buildCommand>
- <name>org.eclipse.pde.ManifestBuilder</name>
- <arguments>
- </arguments>
- </buildCommand>
- <buildCommand>
- <name>org.eclipse.pde.SchemaBuilder</name>
- <arguments>
- </arguments>
- </buildCommand>
- </buildSpec>
- <natures>
- <nature>org.eclipse.pde.PluginNature</nature>
- <nature>org.eclipse.jdt.core.javanature</nature>
- <nature>com.ibm.etools.ctc.javaprojectnature</nature>
- </natures>
-</projectDescription>
diff --git a/plugins/org.eclipse.jst.j2ee.jca.ui/.settings/org.eclipse.jdt.core.prefs b/plugins/org.eclipse.jst.j2ee.jca.ui/.settings/org.eclipse.jdt.core.prefs
deleted file mode 100644
index 037a4e5..0000000
--- a/plugins/org.eclipse.jst.j2ee.jca.ui/.settings/org.eclipse.jdt.core.prefs
+++ /dev/null
@@ -1,95 +0,0 @@
-#Mon Jun 08 15:35:45 EDT 2009
-org.eclipse.jdt.core.compiler.problem.unusedParameterWhenImplementingAbstract=disabled
-org.eclipse.jdt.core.compiler.problem.comparingIdentical=error
-org.eclipse.jdt.core.compiler.problem.unnecessaryElse=error
-org.eclipse.jdt.core.compiler.problem.redundantSuperinterface=error
-org.eclipse.jdt.core.compiler.problem.unusedLocal=error
-org.eclipse.jdt.core.compiler.problem.emptyStatement=error
-org.eclipse.jdt.core.compiler.problem.unusedLabel=error
-org.eclipse.jdt.core.compiler.problem.unusedParameter=warning
-org.eclipse.jdt.core.compiler.problem.rawTypeReference=warning
-org.eclipse.jdt.core.incompatibleJDKLevel=ignore
-org.eclipse.jdt.core.compiler.problem.incompatibleNonInheritedInterfaceMethod=error
-org.eclipse.jdt.core.compiler.debug.lineNumber=generate
-org.eclipse.jdt.core.compiler.problem.unusedDeclaredThrownException=warning
-org.eclipse.jdt.core.builder.cleanOutputFolder=clean
-org.eclipse.jdt.core.compiler.problem.unusedWarningToken=warning
-org.eclipse.jdt.core.compiler.problem.noImplicitStringConversion=error
-org.eclipse.jdt.core.compiler.problem.deprecationInDeprecatedCode=enabled
-org.eclipse.jdt.core.compiler.problem.deprecation=warning
-org.eclipse.jdt.core.compiler.problem.unusedParameterWhenOverridingConcrete=disabled
-org.eclipse.jdt.core.compiler.problem.missingSynchronizedOnInheritedMethod=error
-org.eclipse.jdt.core.compiler.problem.deprecationWhenOverridingDeprecatedMethod=enabled
-org.eclipse.jdt.core.compiler.problem.redundantNullCheck=error
-org.eclipse.jdt.core.compiler.problem.unusedImport=error
-org.eclipse.jdt.core.builder.recreateModifiedClassFileInOutputFolder=ignore
-org.eclipse.jdt.core.builder.resourceCopyExclusionFilter=*.launch
-org.eclipse.jdt.core.classpath.multipleOutputLocations=enabled
-org.eclipse.jdt.core.compiler.problem.suppressWarnings=enabled
-org.eclipse.jdt.core.compiler.problem.typeParameterHiding=error
-org.eclipse.jdt.core.builder.invalidClasspath=abort
-org.eclipse.jdt.core.compiler.problem.localVariableHiding=warning
-org.eclipse.jdt.core.compiler.problem.possibleAccidentalBooleanAssignment=error
-org.eclipse.jdt.core.compiler.problem.missingHashCodeMethod=error
-org.eclipse.jdt.core.codeComplete.argumentSuffixes=
-org.eclipse.jdt.core.codeComplete.argumentPrefixes=
-org.eclipse.jdt.core.compiler.problem.indirectStaticAccess=ignore
-org.eclipse.jdt.core.compiler.problem.potentialNullReference=error
-org.eclipse.jdt.core.compiler.codegen.inlineJsrBytecode=enabled
-org.eclipse.jdt.core.compiler.problem.finalParameterBound=warning
-org.eclipse.jdt.core.compiler.problem.missingSerialVersion=error
-org.eclipse.jdt.core.compiler.problem.nullReference=error
-org.eclipse.jdt.core.compiler.source=1.5
-org.eclipse.jdt.core.compiler.problem.enumIdentifier=error
-org.eclipse.jdt.core.compiler.problem.syntheticAccessEmulation=ignore
-org.eclipse.jdt.core.builder.duplicateResourceTask=warning
-org.eclipse.jdt.core.compiler.problem.fieldHiding=error
-org.eclipse.jdt.core.compiler.problem.unusedDeclaredThrownExceptionExemptExceptionAndThrowable=enabled
-org.eclipse.jdt.core.compiler.problem.missingOverrideAnnotation=error
-org.eclipse.jdt.core.compiler.problem.hiddenCatchBlock=error
-org.eclipse.jdt.core.compiler.problem.overridingPackageDefaultMethod=error
-org.eclipse.jdt.core.compiler.problem.finallyBlockNotCompletingNormally=error
-org.eclipse.jdt.core.compiler.problem.undocumentedEmptyBlock=warning
-org.eclipse.jdt.core.classpath.exclusionPatterns=enabled
-org.eclipse.jdt.core.compiler.problem.methodWithConstructorName=error
-org.eclipse.jdt.core.compiler.problem.discouragedReference=warning
-org.eclipse.jdt.core.compiler.problem.unqualifiedFieldAccess=ignore
-org.eclipse.jdt.core.compiler.problem.incompleteEnumSwitch=error
-eclipse.preferences.version=1
-org.eclipse.jdt.core.incompleteClasspath=error
-org.eclipse.jdt.core.compiler.problem.unnecessaryTypeCheck=error
-org.eclipse.jdt.core.compiler.problem.deadCode=error
-org.eclipse.jdt.core.compiler.problem.specialParameterHidingField=enabled
-org.eclipse.jdt.core.compiler.problem.fatalOptionalError=enabled
-org.eclipse.jdt.core.compiler.problem.noEffectAssignment=error
-org.eclipse.jdt.core.compiler.debug.sourceFile=generate
-org.eclipse.jdt.core.compiler.problem.unusedDeclaredThrownExceptionIncludeUncheckedExceptions=disabled
-org.eclipse.jdt.core.compiler.problem.missingDeprecatedAnnotation=warning
-org.eclipse.jdt.core.codeComplete.fieldPrefixes=
-org.eclipse.jdt.core.compiler.problem.fallthroughCase=error
-org.eclipse.jdt.core.compiler.codegen.targetPlatform=1.5
-org.eclipse.jdt.core.compiler.problem.unusedPrivateMember=error
-org.eclipse.jdt.core.compiler.problem.autoboxing=warning
-org.eclipse.jdt.core.circularClasspath=error
-org.eclipse.jdt.core.compiler.problem.annotationSuperInterface=warning
-org.eclipse.jdt.core.compiler.problem.nonExternalizedStringLiteral=error
-org.eclipse.jdt.core.codeComplete.fieldSuffixes=
-org.eclipse.jdt.core.codeComplete.localSuffixes=
-org.eclipse.jdt.core.compiler.problem.parameterAssignment=error
-org.eclipse.jdt.core.compiler.problem.staticAccessReceiver=error
-org.eclipse.jdt.core.codeComplete.localPrefixes=
-org.eclipse.jdt.core.compiler.problem.unusedDeclaredThrownExceptionIncludeDocCommentReference=enabled
-org.eclipse.jdt.core.compiler.maxProblemPerUnit=100
-org.eclipse.jdt.core.compiler.problem.varargsArgumentNeedCast=error
-org.eclipse.jdt.core.compiler.problem.assertIdentifier=error
-org.eclipse.jdt.core.compiler.compliance=1.5
-org.eclipse.jdt.core.compiler.problem.unusedParameterIncludeDocCommentReference=enabled
-org.eclipse.jdt.core.codeComplete.staticFieldPrefixes=
-org.eclipse.jdt.core.compiler.debug.localVariable=generate
-org.eclipse.jdt.core.compiler.problem.unhandledWarningToken=warning
-instance/org.eclipse.core.net/org.eclipse.core.net.hasMigrated=true
-org.eclipse.jdt.core.compiler.problem.forbiddenReference=error
-org.eclipse.jdt.core.compiler.codegen.unusedLocal=preserve
-org.eclipse.jdt.core.compiler.problem.uncheckedTypeOperation=warning
-org.eclipse.jdt.core.compiler.problem.unusedDeclaredThrownExceptionWhenOverriding=disabled
-org.eclipse.jdt.core.codeComplete.staticFieldSuffixes=
diff --git a/plugins/org.eclipse.jst.j2ee.jca.ui/META-INF/MANIFEST.MF b/plugins/org.eclipse.jst.j2ee.jca.ui/META-INF/MANIFEST.MF
deleted file mode 100644
index 5fea366..0000000
--- a/plugins/org.eclipse.jst.j2ee.jca.ui/META-INF/MANIFEST.MF
+++ /dev/null
@@ -1,30 +0,0 @@
-Manifest-Version: 1.0
-Bundle-ManifestVersion: 2
-Bundle-Name: %pluginName
-Bundle-SymbolicName: org.eclipse.jst.j2ee.jca.ui; singleton:=true
-Bundle-Version: 1.1.400.qualifier
-Bundle-Activator: org.eclipse.jst.j2ee.jca.ui.internal.plugin.JCAUIPlugin
-Bundle-Vendor: %providerName
-Bundle-Localization: plugin
-Export-Package: org.eclipse.jst.j2ee.jca.ui.internal.actions;x-internal:=true,
- org.eclipse.jst.j2ee.jca.ui.internal.plugin;x-internal:=true,
- org.eclipse.jst.j2ee.jca.ui.internal.util;x-internal:=true,
- org.eclipse.jst.j2ee.jca.ui.internal.wizard;x-internal:=true
-Require-Bundle: org.eclipse.jst.j2ee.ui;bundle-version="[1.1.0,1.2.0)",
- org.eclipse.wst.common.frameworks.ui;bundle-version="[1.2.0,2.0.0)",
- org.eclipse.jface;bundle-version="[3.2.0,4.0.0)",
- org.eclipse.ui.workbench;bundle-version="[3.2.0,4.0.0)",
- org.eclipse.core.runtime;bundle-version="[3.2.0,4.0.0)",
- org.eclipse.wst.common.frameworks;bundle-version="[1.2.0,2.0.0)",
- org.eclipse.jst.j2ee;bundle-version="[1.1.0,1.2.0)",
- org.eclipse.jst.j2ee.jca;bundle-version="[1.1.0,1.2.0)",
- org.eclipse.jst.j2ee.core;bundle-version="[1.1.0,2.0.0)",
- org.eclipse.core.resources;bundle-version="[3.2.0,4.0.0)",
- org.eclipse.wst.common.project.facet.core;bundle-version="[1.3.0,2.0.0)",
- org.eclipse.wst.common.project.facet.ui;bundle-version="[1.3.0,2.0.0)",
- org.eclipse.wst.web.ui;bundle-version="[1.1.0,1.2.0)",
- org.eclipse.ui.navigator.resources;bundle-version="[3.2.0,4.0.0)",
- org.eclipse.wst.web;bundle-version="[1.1.0,1.2.0)",
- org.eclipse.jst.common.project.facet.core;bundle-version="[1.3.0,2.0.0)"
-Eclipse-LazyStart: true
-Bundle-RequiredExecutionEnvironment: J2SE-1.5
diff --git a/plugins/org.eclipse.jst.j2ee.jca.ui/about.html b/plugins/org.eclipse.jst.j2ee.jca.ui/about.html
deleted file mode 100644
index 2199df3..0000000
--- a/plugins/org.eclipse.jst.j2ee.jca.ui/about.html
+++ /dev/null
@@ -1,34 +0,0 @@
-<!DOCTYPE HTML PUBLIC "-//W3C//DTD HTML 4.0//EN">
-<HTML>
-
-<head>
-<title>About</title>
-<meta http-equiv=Content-Type content="text/html; charset=ISO-8859-1">
-</head>
-
-<BODY lang="EN-US">
-
-<H3>About This Content</H3>
-
-<P>June, 2008</P>
-
-<H3>License</H3>
-
-<P>The Eclipse Foundation makes available all content in this plug-in
-("Content"). Unless otherwise indicated below, the Content is provided to you
-under the terms and conditions of the Eclipse Public License Version 1.0
-("EPL"). A copy of the EPL is available at
-<A href="http://www.eclipse.org/org/documents/epl-v10.php">http://www.eclipse.org/org/documents/epl-v10.php</A>.
-For purposes of the EPL, "Program" will mean the Content.</P>
-
-<P>If you did not receive this Content directly from the Eclipse Foundation, the
-Content is being redistributed by another party ("Redistributor") and different
-terms and conditions may apply to your use of any object code in the Content.
-Check the Redistributors license that was provided with the Content. If no such
-license exists, contact the Redistributor. Unless otherwise indicated below, the
-terms and conditions of the EPL still apply to any source code in the Content
-and such source code may be obtained at
-<A href="http://www.eclipse.org/">http://www.eclipse.org/</A>.</P>
-
-</BODY>
-</HTML>
diff --git a/plugins/org.eclipse.jst.j2ee.jca.ui/build.properties b/plugins/org.eclipse.jst.j2ee.jca.ui/build.properties
deleted file mode 100644
index 3976adf..0000000
--- a/plugins/org.eclipse.jst.j2ee.jca.ui/build.properties
+++ /dev/null
@@ -1,19 +0,0 @@
-###############################################################################
-# Copyright (c) 2005 IBM Corporation and others.
-# All rights reserved. This program and the accompanying materials
-# are made available under the terms of the Eclipse Public License v1.0
-# which accompanies this distribution, and is available at
-# http://www.eclipse.org/legal/epl-v10.html
-#
-# Contributors:
-# IBM Corporation - initial API and implementation
-###############################################################################
-source.. = jca_ui/,\
- property_files/
-output.. = bin/
-bin.includes = plugin.xml,\
- .,\
- plugin.properties,\
- icons/,\
- META-INF/,\
- about.html
diff --git a/plugins/org.eclipse.jst.j2ee.jca.ui/icons/full/ctool16/export_rar.gif b/plugins/org.eclipse.jst.j2ee.jca.ui/icons/full/ctool16/export_rar.gif
deleted file mode 100644
index befb3d4..0000000
--- a/plugins/org.eclipse.jst.j2ee.jca.ui/icons/full/ctool16/export_rar.gif
+++ /dev/null
Binary files differ
diff --git a/plugins/org.eclipse.jst.j2ee.jca.ui/icons/full/ctool16/import_rar.gif b/plugins/org.eclipse.jst.j2ee.jca.ui/icons/full/ctool16/import_rar.gif
deleted file mode 100644
index 50f25a2..0000000
--- a/plugins/org.eclipse.jst.j2ee.jca.ui/icons/full/ctool16/import_rar.gif
+++ /dev/null
Binary files differ
diff --git a/plugins/org.eclipse.jst.j2ee.jca.ui/icons/full/ctool16/newconnectionprj_wiz.gif b/plugins/org.eclipse.jst.j2ee.jca.ui/icons/full/ctool16/newconnectionprj_wiz.gif
deleted file mode 100644
index 1bec6ba..0000000
--- a/plugins/org.eclipse.jst.j2ee.jca.ui/icons/full/ctool16/newconnectionprj_wiz.gif
+++ /dev/null
Binary files differ
diff --git a/plugins/org.eclipse.jst.j2ee.jca.ui/jca_ui/org/eclipse/jst/j2ee/jca/ui/internal/actions/ExportRARAction.java b/plugins/org.eclipse.jst.j2ee.jca.ui/jca_ui/org/eclipse/jst/j2ee/jca/ui/internal/actions/ExportRARAction.java
deleted file mode 100644
index cb957b4..0000000
--- a/plugins/org.eclipse.jst.j2ee.jca.ui/jca_ui/org/eclipse/jst/j2ee/jca/ui/internal/actions/ExportRARAction.java
+++ /dev/null
@@ -1,60 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2003, 2005 IBM Corporation and others.
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
- *
- * Contributors:
- * IBM Corporation - initial API and implementation
- *******************************************************************************/
-/*
- * Created on Mar 27, 2003
- *
- * To change this generated comment go to
- * Window>Preferences>Java>Code Generation>Code and Comments
- */
-package org.eclipse.jst.j2ee.jca.ui.internal.actions;
-
-import org.eclipse.jface.wizard.WizardDialog;
-import org.eclipse.jst.j2ee.internal.actions.BaseAction;
-import org.eclipse.jst.j2ee.internal.plugin.J2EEUIPlugin;
-import org.eclipse.jst.j2ee.jca.ui.internal.util.JCAUIMessages;
-import org.eclipse.jst.j2ee.jca.ui.internal.wizard.ConnectorComponentExportWizard;
-import org.eclipse.swt.widgets.Shell;
-
-
-/**
- * @author jsholl
- *
- * To change this generated comment go to Window>Preferences>Java>Code Generation>Code and Comments
- */
-public class ExportRARAction extends BaseAction {
-
- private String label = JCAUIMessages.connector_export_action_label_ui_;
- private static final String ICON = "export_rar_wiz"; //$NON-NLS-1$
-
- public ExportRARAction() {
- super();
- setText(label);
- setImageDescriptor(J2EEUIPlugin.getDefault().getImageDescriptor(ICON));
- }
-
- /*
- * (non-Javadoc)
- *
- * @see org.eclipse.jst.j2ee.internal.internal.common.actions.BaseAction#primRun(org.eclipse.swt.widgets.Shell)
- */
- @Override
- protected void primRun(Shell shell) {
- ConnectorComponentExportWizard wizard = new ConnectorComponentExportWizard();
- J2EEUIPlugin plugin = J2EEUIPlugin.getDefault();
- wizard.init(plugin.getWorkbench(), selection);
- wizard.setDialogSettings(plugin.getDialogSettings());
-
- WizardDialog dialog = new WizardDialog(shell, wizard);
- dialog.create();
- dialog.open();
- }
-
-}
diff --git a/plugins/org.eclipse.jst.j2ee.jca.ui/jca_ui/org/eclipse/jst/j2ee/jca/ui/internal/actions/IConnectorArchiveConstants.java b/plugins/org.eclipse.jst.j2ee.jca.ui/jca_ui/org/eclipse/jst/j2ee/jca/ui/internal/actions/IConnectorArchiveConstants.java
deleted file mode 100644
index b2c5fc5..0000000
--- a/plugins/org.eclipse.jst.j2ee.jca.ui/jca_ui/org/eclipse/jst/j2ee/jca/ui/internal/actions/IConnectorArchiveConstants.java
+++ /dev/null
@@ -1,64 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2003, 2004 IBM Corporation and others.
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
- *
- * Contributors:
- * IBM Corporation - initial API and implementation
- *******************************************************************************/
-package org.eclipse.jst.j2ee.jca.ui.internal.actions;
-
-import org.eclipse.jst.j2ee.internal.plugin.J2EEUIPlugin;
-
-
-/**
- * Defines constants for Connector Archive operations.
- */
-public interface IConnectorArchiveConstants {
-
- //Actions
- public static final String CONNECTOR_EXPORT_ACTION_LABEL = "%connector.export.action.label_ui_"; //$NON-NLS-1$
-
- //General
- public static final String CONNECTOR_PROJECT_UI_ = RARArchiveUIResourceHandler.getString("Connector_Project_UI_"); //$NON-NLS-1$
- public static final String CONNECTOR_FILE_UI_ = RARArchiveUIResourceHandler.getString("Connector_File_UI_"); //$NON-NLS-1$
- public static final String STORE_CONNECTOR_FILE_NAMES_ID = "EJBImportWizardPage1.STORE_CONNECTOR_FILE_NAMES_ID"; //$NON-NLS-1$
- public static final String STORE_CONNECTOR_EXPORT_FILE_NAMES = "ConenctorExportWizardPage1.STORE_CONNECTOR_EXPORT_FILE_NAMES"; //$NON-NLS-1$
- public static final String WIZ_IMAGE = "connector_import_wiz"; //$NON-NLS-1$
- public static final String ID = "id"; //$NON-NLS-1$
- public static final String RAR_BROWSE_BUTTON_FILTER = "*.rar"; //$NON-NLS-1$
- public static final String TARGET_EXTENSION = "rar"; //$NON-NLS-1$
- public static final String YES_UI_ = RARArchiveUIResourceHandler.getString("Yes_UI_"); //$NON-NLS-1$
- public static final String NO_UI_ = RARArchiveUIResourceHandler.getString("No_UI_"); //$NON-NLS-1$
- public static final String QUESTION_UI_ = RARArchiveUIResourceHandler.getString("Question_UI_"); //$NON-NLS-1$
- public static final String RESOURCE__UI_ = "Resource_{0}_already_exists.__Would_you_like_to_overwrite_it_UI_"; //$NON-NLS-1$
- //Import
- public static final String IMPORT_UI_ = RARArchiveUIResourceHandler.getString("Import_UI_"); //$NON-NLS-1$
- public static final String IMPORT_A_CONNECTOR_UI_ = RARArchiveUIResourceHandler.getString("Import_a_Connector_project_from_the_file_system_UI_"); //$NON-NLS-1$
- public static final String IMPORT_INTO_NEW_OR_EXISTING_UI_ = RARArchiveUIResourceHandler.getString("Import_into_new_or_existing_Enterprise_Application_project_UI_"); //$NON-NLS-1$
- public static final String CONNECTOR_IMPORT_ID_ = "ConnectorProjectImportPage1"; //$NON-NLS-1$
- public static final String CONNECTOR_IMPORT_UI_ = RARArchiveUIResourceHandler.getString("Connector_Import_UI_"); //$NON-NLS-1$
- public static final String IRAR1000 = J2EEUIPlugin.PLUGIN_ID + ".irar1000"; //$NON-NLS-1$
-
- //Export
- public static final String CONNECTOR_EXPORT_UI_ = RARArchiveUIResourceHandler.getString("Connector_Export_UI_"); //$NON-NLS-1$
- public static final String EXPORT_CONNECTOR__UI_ = RARArchiveUIResourceHandler.getString("Export_Connector_Project_to_the_local_file_system_UI_"); //$NON-NLS-1$
- public static final String WORKBENCH_ID = "ConnectorExportPage1"; //$NON-NLS-1$
- public static final String EXPORT_UI_ = RARArchiveUIResourceHandler.getString("Export_UI_"); //$NON-NLS-1$
- public static final String EX_WIZ_IMAGE = "connector_export_wiz"; //$NON-NLS-1$
- public static final String ERAR1000 = J2EEUIPlugin.PLUGIN_ID + ".erar1000"; //$NON-NLS-1$
-
- //Errors
- public static final String UNABLE_TO_COMPLETE_THE_OPEN_ERROR_ = RARArchiveUIResourceHandler.getString("Unable_to_complete_the_operationdump_caused_by_this_UI_"); //$NON-NLS-1$
- public static final String IMPORT_PROBLEMS_UI_ = RARArchiveUIResourceHandler.getString("Import_Problems_UI_"); //$NON-NLS-1$
- public static final String CONNECTOR_IMPORT__UI_ = RARArchiveUIResourceHandler.getString("Connector_Import_Error_UI_"); //$NON-NLS-1$
- public static final String IMPORT_ERROR_UI_ = RARArchiveUIResourceHandler.getString("Import_Error_UI_"); //$NON-NLS-1$
- public static final String THE_JAR_FILE_DOES_NOT_EXIST_UI_ = RARArchiveUIResourceHandler.getString("The_jar_file_does_not_exist_or_cannot_be_opened,_UI_") + //$NON-NLS-1$
- RARArchiveUIResourceHandler.getString("Click_browse_to_select_a_valid_jar_or_enter_a_valid_jar_UI_"); //$NON-NLS-1$
- public static final String CONNECTOR_EXPORT_ERROR_UI_ = RARArchiveUIResourceHandler.getString("Connector_Export_Error_UI_"); //$NON-NLS-1$
- public static final String CANNOT_EXPORT_CLOSED_PROJECT_UI_ = RARArchiveUIResourceHandler.getString("Cannot_export_closed_projects_UI_"); //$NON-NLS-1$
- public static final String Rar_File_Name_Needed_UI_ = RARArchiveUIResourceHandler.getString("Rar_File_Name_Needed_UI_"); //$NON-NLS-1$
-
-}// IConnectorArchiveConstants
diff --git a/plugins/org.eclipse.jst.j2ee.jca.ui/jca_ui/org/eclipse/jst/j2ee/jca/ui/internal/actions/ImportRARAction.java b/plugins/org.eclipse.jst.j2ee.jca.ui/jca_ui/org/eclipse/jst/j2ee/jca/ui/internal/actions/ImportRARAction.java
deleted file mode 100644
index e66ab9e..0000000
--- a/plugins/org.eclipse.jst.j2ee.jca.ui/jca_ui/org/eclipse/jst/j2ee/jca/ui/internal/actions/ImportRARAction.java
+++ /dev/null
@@ -1,60 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2003, 2005 IBM Corporation and others.
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
- *
- * Contributors:
- * IBM Corporation - initial API and implementation
- *******************************************************************************/
-/*
- * Created on Mar 27, 2003
- *
- * To change this generated comment go to
- * Window>Preferences>Java>Code Generation>Code and Comments
- */
-package org.eclipse.jst.j2ee.jca.ui.internal.actions;
-
-import org.eclipse.jface.viewers.StructuredSelection;
-import org.eclipse.jface.wizard.WizardDialog;
-import org.eclipse.jst.j2ee.internal.actions.BaseAction;
-import org.eclipse.jst.j2ee.internal.plugin.J2EEUIPlugin;
-import org.eclipse.jst.j2ee.jca.ui.internal.wizard.ConnectorComponentImportWizard;
-import org.eclipse.swt.widgets.Shell;
-
-
-/**
- * @author jsholl
- *
- * To change this generated comment go to Window>Preferences>Java>Code Generation>Code and Comments
- */
-public class ImportRARAction extends BaseAction {
- public static String LABEL = RARArchiveUIResourceHandler.getString("Import_RAR"); //$NON-NLS-1$
- private static final String ICON = "import_rar_wiz"; //$NON-NLS-1$
-
- public ImportRARAction() {
- super();
- setText(LABEL);
- setImageDescriptor(J2EEUIPlugin.getDefault().getImageDescriptor(ICON));
- }
-
- /*
- * (non-Javadoc)
- *
- * @see org.eclipse.jst.j2ee.internal.internal.common.actions.BaseAction#primRun(org.eclipse.swt.widgets.Shell)
- */
- @Override
- protected void primRun(Shell shell) {
-
- ConnectorComponentImportWizard wizard = new ConnectorComponentImportWizard();
-
- J2EEUIPlugin plugin = J2EEUIPlugin.getDefault();
-
- wizard.init(plugin.getWorkbench(), StructuredSelection.EMPTY);
-
- WizardDialog dialog = new WizardDialog(shell, wizard);
- dialog.create();
- dialog.open();
- }
-}
diff --git a/plugins/org.eclipse.jst.j2ee.jca.ui/jca_ui/org/eclipse/jst/j2ee/jca/ui/internal/actions/NewConnectorComponentAction.java b/plugins/org.eclipse.jst.j2ee.jca.ui/jca_ui/org/eclipse/jst/j2ee/jca/ui/internal/actions/NewConnectorComponentAction.java
deleted file mode 100644
index 63dc483..0000000
--- a/plugins/org.eclipse.jst.j2ee.jca.ui/jca_ui/org/eclipse/jst/j2ee/jca/ui/internal/actions/NewConnectorComponentAction.java
+++ /dev/null
@@ -1,80 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2003, 2005 IBM Corporation and others.
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
- *
- * Contributors:
- * IBM Corporation - initial API and implementation
- *******************************************************************************/
-package org.eclipse.jst.j2ee.jca.ui.internal.actions;
-
-
-import org.eclipse.jface.wizard.Wizard;
-import org.eclipse.jst.j2ee.internal.actions.AbstractOpenWizardWorkbenchAction;
-import org.eclipse.jst.j2ee.internal.plugin.J2EEUIPlugin;
-import org.eclipse.jst.j2ee.jca.ui.internal.util.JCAUIMessages;
-import org.eclipse.jst.j2ee.jca.ui.internal.wizard.ConnectorProjectWizard;
-import org.eclipse.ui.IWorkbench;
-
-
-
-/**
- * Creates an action for the Connector project
- */
-public class NewConnectorComponentAction extends AbstractOpenWizardWorkbenchAction {
-
- // TODO MDE 02-28 Find correct label
- public static String LABEL = JCAUIMessages.JCA_MODULE_WIZ_TITLE;
- private static final String ICON = "newear_wiz"; //$NON-NLS-1$
-
- /**
- * Default constructor
- */
- public NewConnectorComponentAction() {
- setText(LABEL);
- setImageDescriptor(J2EEUIPlugin.getDefault().getImageDescriptor(ICON));
- }// NewConnectorProjectAction
-
- /**
- * Constructor initialization.
- *
- * @param IWorkbench
- * workbench - Workbench to add to this wizard too.
- * @param String
- * label - Label for project.
- * @param Class[]
- * acceptedTypes - List of accepted types for this wizard
- */
- public NewConnectorComponentAction(IWorkbench workbench, String label, Class[] acceptedTypes) {
- super(workbench, label, acceptedTypes, false);
- setImageDescriptor(J2EEUIPlugin.getDefault().getImageDescriptor(ICON));
- }// NewConnectorProjectAction
-
- /**
- * Creates the wizard
- *
- * @return Wizard
- */
- @Override
- protected Wizard createWizard() {
- return new ConnectorProjectWizard();
- }// createWizard
-
- /**
- * shouldAcceptElement - Always true
- *
- * @param Object
- * obj
- */
- @Override
- protected boolean shouldAcceptElement(Object obj) {
- return true; /* NewGroup.isOnBuildPath(obj) && !NewGroup.isInArchive(obj); */
- }// shouldAcceptElement
-
- @Override
- protected String getDialogText() {
- return null;
- }
-}// NewConnectorProjectAction
diff --git a/plugins/org.eclipse.jst.j2ee.jca.ui/jca_ui/org/eclipse/jst/j2ee/jca/ui/internal/actions/RARArchiveUIResourceHandler.java b/plugins/org.eclipse.jst.j2ee.jca.ui/jca_ui/org/eclipse/jst/j2ee/jca/ui/internal/actions/RARArchiveUIResourceHandler.java
deleted file mode 100644
index 61a7967..0000000
--- a/plugins/org.eclipse.jst.j2ee.jca.ui/jca_ui/org/eclipse/jst/j2ee/jca/ui/internal/actions/RARArchiveUIResourceHandler.java
+++ /dev/null
@@ -1,64 +0,0 @@
-/***************************************************************************************************
- * Copyright (c) 2003, 2004 IBM Corporation and others. All rights reserved. This program and the
- * accompanying materials are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
- *
- * Contributors: IBM Corporation - initial API and implementation
- **************************************************************************************************/
-package org.eclipse.jst.j2ee.jca.ui.internal.actions;
-
-
-
-import java.text.MessageFormat;
-import java.util.MissingResourceException;
-import java.util.ResourceBundle;
-
-public class RARArchiveUIResourceHandler {
-
- private static ResourceBundle fgResourceBundle;
-
- /**
- * Returns the resource bundle used by all classes in this Project
- */
- public static ResourceBundle getResourceBundle() {
- try {
- return ResourceBundle.getBundle("rararchiveui");//$NON-NLS-1$
- } catch (MissingResourceException e) {
- // does nothing - this method will return null and
- // getString(String, String) will return the key
- // it was called with
- }
- return null;
- }
-
- public static String getString(String key) {
- if (fgResourceBundle == null) {
- fgResourceBundle = getResourceBundle();
- }
-
- if (fgResourceBundle != null) {
- try {
- return fgResourceBundle.getString(key);
- } catch (MissingResourceException e) {
- return "!" + key + "!";//$NON-NLS-2$//$NON-NLS-1$
- }
- }
- return "!" + key + "!";//$NON-NLS-2$//$NON-NLS-1$
- }
-
- public static String getString(String key, Object[] args) {
-
- try {
- return MessageFormat.format(getString(key), args);
- } catch (IllegalArgumentException e) {
- return getString(key);
- }
-
- }
-
- public static String getString(String key, Object[] args, int x) {
-
- return getString(key);
- }
-}
\ No newline at end of file
diff --git a/plugins/org.eclipse.jst.j2ee.jca.ui/jca_ui/org/eclipse/jst/j2ee/jca/ui/internal/plugin/JCAUIPlugin.java b/plugins/org.eclipse.jst.j2ee.jca.ui/jca_ui/org/eclipse/jst/j2ee/jca/ui/internal/plugin/JCAUIPlugin.java
deleted file mode 100644
index d038375..0000000
--- a/plugins/org.eclipse.jst.j2ee.jca.ui/jca_ui/org/eclipse/jst/j2ee/jca/ui/internal/plugin/JCAUIPlugin.java
+++ /dev/null
@@ -1,52 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2005 IBM Corporation and others.
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
- *
- * Contributors:
- * IBM Corporation - initial API and implementation
- *******************************************************************************/
-/*
- * Created on Nov 15, 2004
- */
-package org.eclipse.jst.j2ee.jca.ui.internal.plugin;
-
-import org.eclipse.core.resources.IWorkspace;
-import org.eclipse.core.resources.ResourcesPlugin;
-import org.eclipse.ui.plugin.AbstractUIPlugin;
-
-/**
- * @author jlanuti
- */
-public class JCAUIPlugin extends AbstractUIPlugin {
-
- public static final String PLUGIN_ID = "org.eclipse.jst.j2ee.jca.ui"; //$NON-NLS-1$
-
-
- // The shared instance.
- private static JCAUIPlugin plugin;
-
- /**
- * The constructor.
- */
- public JCAUIPlugin() {
- super();
- plugin = this;
- }
-
- /**
- * Returns the shared instance.
- */
- public static JCAUIPlugin getDefault() {
- return plugin;
- }
-
- /**
- * Returns the workspace instance.
- */
- public static IWorkspace getWorkspace() {
- return ResourcesPlugin.getWorkspace();
- }
-}
diff --git a/plugins/org.eclipse.jst.j2ee.jca.ui/jca_ui/org/eclipse/jst/j2ee/jca/ui/internal/util/JCAUIMessages.java b/plugins/org.eclipse.jst.j2ee.jca.ui/jca_ui/org/eclipse/jst/j2ee/jca/ui/internal/util/JCAUIMessages.java
deleted file mode 100644
index c21ec45..0000000
--- a/plugins/org.eclipse.jst.j2ee.jca.ui/jca_ui/org/eclipse/jst/j2ee/jca/ui/internal/util/JCAUIMessages.java
+++ /dev/null
@@ -1,56 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2003, 2005 IBM Corporation and others.
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
- *
- * Contributors:
- * IBM Corporation - initial API and implementation
- *******************************************************************************/
-package org.eclipse.jst.j2ee.jca.ui.internal.util;
-
-import org.eclipse.osgi.util.NLS;
-
-
-public class JCAUIMessages extends NLS {
-
- private static final String BUNDLE_NAME = "jca_ui";//$NON-NLS-1$
-
- private JCAUIMessages() {
- // Do not instantiate
- }
-
- public static String connector_export_action_label_ui_;
- public static String _9;
- public static String _8;
- public static String _7;
- public static String _6;
- public static String _5;
- public static String _4;
- public static String _3;
- public static String _2;
- public static String _10;
- public static String _1;
- public static String _0;
- public static String _11;
- public static String CONNECTOR_SETTINGS;
-
- static {
- NLS.initializeMessages(BUNDLE_NAME, JCAUIMessages.class);
- }
-
- public static final String IMAGE_LOAD_ERROR = _0;
- public static final String JCA_MODULE_WIZ_TITLE = _1;
- public static final String JCA_VERSION_LBL = _2;
- public static final String JCA_MODULE_MAIN_PG_TITLE = _3;
- public static final String JCA_MODULE_MAIN_PG_DESC = _4;
- public static final String JCA_IMPORT_MAIN_PG_DESC = _5;
- public static final String JCA_IMPORT_MAIN_PG_TITLE = _6;
- public static final String JCA_FILE_LBL = _7;
- public static final String JCA_MODULE_LBL = _8;
- public static final String JCA_EXPORT_MAIN_PG_TITLE = _9;
- public static final String JCA_EXPORT_MAIN_PG_DESC = _10;
- public static final String JCA_FACET_CONFIGURATION= _11;
-
-}
diff --git a/plugins/org.eclipse.jst.j2ee.jca.ui/jca_ui/org/eclipse/jst/j2ee/jca/ui/internal/wizard/ConnectorComponentExportWizard.java b/plugins/org.eclipse.jst.j2ee.jca.ui/jca_ui/org/eclipse/jst/j2ee/jca/ui/internal/wizard/ConnectorComponentExportWizard.java
deleted file mode 100644
index 84bafa9..0000000
--- a/plugins/org.eclipse.jst.j2ee.jca.ui/jca_ui/org/eclipse/jst/j2ee/jca/ui/internal/wizard/ConnectorComponentExportWizard.java
+++ /dev/null
@@ -1,80 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2003, 2005 IBM Corporation and others.
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
- *
- * Contributors:
- * IBM Corporation - initial API and implementation
- *******************************************************************************/
-package org.eclipse.jst.j2ee.jca.ui.internal.wizard;
-
-import org.eclipse.jst.j2ee.internal.jca.operations.ConnectorComponentExportDataModelProvider;
-import org.eclipse.jst.j2ee.internal.plugin.J2EEUIPlugin;
-import org.eclipse.jst.j2ee.internal.plugin.J2EEUIPluginIcons;
-import org.eclipse.jst.j2ee.internal.wizard.J2EEArtifactExportWizard;
-import org.eclipse.ui.IExportWizard;
-import org.eclipse.wst.common.frameworks.datamodel.IDataModel;
-import org.eclipse.wst.common.frameworks.datamodel.IDataModelProvider;
-
-/**
- * <p>
- * Wizard used to export J2EE Connector module structures
- * from the Eclipse Workbench to a deployable Connector
- * Archive *.rar file.
- * </p>
- */
-public final class ConnectorComponentExportWizard extends J2EEArtifactExportWizard implements IExportWizard {
-
- /**
- * <p>
- * The default constructor. Creates a wizard with no selection,
- * no model instance, and no operation instance. The model and
- * operation will be created as needed.
- * </p>
- */
- public ConnectorComponentExportWizard() {
- super();
- }
-
- /**
- * <p>
- * The model is used to prepopulate the wizard controls
- * and interface with the operation.
- * </p>
- * @param model The model parameter is used to pre-populate wizard controls and interface with the operation
- */
- public ConnectorComponentExportWizard(IDataModel model) {
- super(model);
- }
-
- @Override
- protected IDataModelProvider getDefaultProvider() {
- return new ConnectorComponentExportDataModelProvider();
- }
- /**
- * <p>
- * Adds the following pages:
- * <ul>
- * <li> {@link RARExportPage} as the main wizard page ({@link #MAIN_PG})
- * </ul>
- * </p>
- */
- @Override
- public void doAddPages() {
- addPage(new RARExportPage(getDataModel(), MAIN_PG, getSelection()));
- }
-
- /**
- * {@inheritDoc}
- *
- * <p>
- * Sets up the default wizard page image.
- * </p>
- */
- @Override
- protected void doInit() {
- setDefaultPageImageDescriptor(J2EEUIPlugin.getDefault().getImageDescriptor(J2EEUIPluginIcons.JCA_EXPORT_WIZARD_BANNER));
- }
-}
diff --git a/plugins/org.eclipse.jst.j2ee.jca.ui/jca_ui/org/eclipse/jst/j2ee/jca/ui/internal/wizard/ConnectorComponentImportPage.java b/plugins/org.eclipse.jst.j2ee.jca.ui/jca_ui/org/eclipse/jst/j2ee/jca/ui/internal/wizard/ConnectorComponentImportPage.java
deleted file mode 100644
index dd2cee5..0000000
--- a/plugins/org.eclipse.jst.j2ee.jca.ui/jca_ui/org/eclipse/jst/j2ee/jca/ui/internal/wizard/ConnectorComponentImportPage.java
+++ /dev/null
@@ -1,65 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2003, 2007 IBM Corporation and others.
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
- *
- * Contributors:
- * IBM Corporation - initial API and implementation
- *******************************************************************************/
-package org.eclipse.jst.j2ee.jca.ui.internal.wizard;
-
-import org.eclipse.jst.j2ee.internal.actions.IJ2EEUIContextIds;
-import org.eclipse.jst.j2ee.internal.plugin.J2EEUIPlugin;
-import org.eclipse.jst.j2ee.internal.plugin.J2EEUIPluginIcons;
-import org.eclipse.jst.j2ee.internal.wizard.J2EEModuleImportPage;
-import org.eclipse.jst.j2ee.jca.ui.internal.util.JCAUIMessages;
-import org.eclipse.jst.j2ee.project.facet.IJ2EEFacetConstants;
-import org.eclipse.swt.widgets.Composite;
-import org.eclipse.wst.common.frameworks.datamodel.IDataModel;
-
-public class ConnectorComponentImportPage extends J2EEModuleImportPage {
-
- public ConnectorComponentImportPage(IDataModel model, String pageName) {
- super(model, pageName);
- setTitle(JCAUIMessages.JCA_IMPORT_MAIN_PG_TITLE);
- setDescription(JCAUIMessages.JCA_IMPORT_MAIN_PG_DESC);
- setImageDescriptor(J2EEUIPlugin.getDefault().getImageDescriptor(J2EEUIPluginIcons.JCA_IMPORT_WIZARD_BANNER));
- }
-
- @Override
- protected String getFileImportLabel() {
- return JCAUIMessages.JCA_FILE_LBL;
- }
-
- @Override
- protected String[] getFilterExpression() {
- return new String[]{"*.rar"}; //$NON-NLS-1$
- }
-
- @Override
- protected String getFileNamesStoreID() {
- return "RAR";//$NON-NLS-1$
- }
-
- @Override
- protected String getProjectImportLabel() {
- return JCAUIMessages.JCA_MODULE_LBL;
- }
-
- @Override
- protected Composite createTopLevelComposite(Composite parent) {
- return super.createTopLevelComposite(parent);
- }
-
- @Override
- protected String getInfopopID() {
- return IJ2EEUIContextIds.IMPORT_RAR_WIZARD_PAGE;
- }
-
- @Override
- protected String getModuleFacetID(){
- return IJ2EEFacetConstants.JCA;
- }
-}
diff --git a/plugins/org.eclipse.jst.j2ee.jca.ui/jca_ui/org/eclipse/jst/j2ee/jca/ui/internal/wizard/ConnectorComponentImportWizard.java b/plugins/org.eclipse.jst.j2ee.jca.ui/jca_ui/org/eclipse/jst/j2ee/jca/ui/internal/wizard/ConnectorComponentImportWizard.java
deleted file mode 100644
index 202e0d9..0000000
--- a/plugins/org.eclipse.jst.j2ee.jca.ui/jca_ui/org/eclipse/jst/j2ee/jca/ui/internal/wizard/ConnectorComponentImportWizard.java
+++ /dev/null
@@ -1,93 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2003, 2006 IBM Corporation and others.
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
- *
- * Contributors:
- * IBM Corporation - initial API and implementation
- *******************************************************************************/
-package org.eclipse.jst.j2ee.jca.ui.internal.wizard;
-
-import org.eclipse.jst.j2ee.internal.jca.operations.ConnectorComponentImportDataModelProvider;
-import org.eclipse.jst.j2ee.internal.plugin.J2EEUIMessages;
-import org.eclipse.jst.j2ee.internal.plugin.J2EEUIPlugin;
-import org.eclipse.jst.j2ee.internal.plugin.J2EEUIPluginIcons;
-import org.eclipse.jst.j2ee.internal.wizard.J2EEComponentImportWizard;
-import org.eclipse.wst.common.frameworks.datamodel.IDataModel;
-import org.eclipse.wst.common.frameworks.datamodel.IDataModelProvider;
-import org.eclipse.wst.project.facet.IProductConstants;
-import org.eclipse.wst.project.facet.ProductManager;
-
-/**
- * <p>
- * Wizard used to import J2EE Connector module structures into the Eclipse Workbench from an
- * existing Connector *.rar file.
- * </p>
- */
-public final class ConnectorComponentImportWizard extends J2EEComponentImportWizard {
-
- /**
- * <p>
- * The default constructor. Creates a wizard with no selection, no model instance, and no
- * operation instance. The model and operation will be created as needed.
- * </p>
- */
- public ConnectorComponentImportWizard() {
- super();
- }
-
- /**
- * <p>
- * The model is used to prepopulate the wizard controls and interface with the operation.
- * </p>
- *
- * @param model
- * The model parameter is used to pre-populate wizard controls and interface with the
- * operation
- */
- public ConnectorComponentImportWizard(IDataModel model) {
- super(model);
- }
-
- /**
- * <p>
- * Adds an {@link RARImportPage} as the main wizard page ({@link #MAIN_PG}).
- * </p>
- */
- @Override
- public void doAddPages() {
- addPage(new ConnectorComponentImportPage(getDataModel(), MAIN_PG));
- }
-
- /**
- * {@inheritDoc}
- *
- * <p>
- * Sets up the dialog window title and default wizard page image.
- * </p>
- */
- @Override
- public final void doInit() {
- setWindowTitle(J2EEUIMessages.getResourceString(J2EEUIMessages.IMPORT_WIZ_TITLE));
- setDefaultPageImageDescriptor(J2EEUIPlugin.getDefault().getImageDescriptor(J2EEUIPluginIcons.JCA_IMPORT_WIZARD_BANNER));
- // updateEARToModelFromSelection(getSpecificDataModel());
- }
-
- @Override
- protected String[] getModuleValidatorStrings() {
- return new String[]{"org.eclipse.jst.j2ee.internal.jca.validation.UIConnectorValidator"}; //$NON-NLS-1$
- }
-
- @Override
- protected IDataModelProvider getDefaultProvider() {
- return new ConnectorComponentImportDataModelProvider();
- }
-
- @Override
- protected String getFinalPerspectiveID() {
- return ProductManager.getProperty(IProductConstants.FINAL_PERSPECTIVE_JCA);
- }
-
-}
diff --git a/plugins/org.eclipse.jst.j2ee.jca.ui/jca_ui/org/eclipse/jst/j2ee/jca/ui/internal/wizard/ConnectorFacetInstallPage.java b/plugins/org.eclipse.jst.j2ee.jca.ui/jca_ui/org/eclipse/jst/j2ee/jca/ui/internal/wizard/ConnectorFacetInstallPage.java
deleted file mode 100644
index 8fc2da3..0000000
--- a/plugins/org.eclipse.jst.j2ee.jca.ui/jca_ui/org/eclipse/jst/j2ee/jca/ui/internal/wizard/ConnectorFacetInstallPage.java
+++ /dev/null
@@ -1,79 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2009 IBM Corporation and others.
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
- *
- * Contributors:
- * IBM Corporation - initial API and implementation
- *******************************************************************************/
-package org.eclipse.jst.j2ee.jca.ui.internal.wizard;
-
-import org.eclipse.jface.dialogs.Dialog;
-import org.eclipse.jst.j2ee.internal.J2EEConstants;
-import org.eclipse.jst.j2ee.internal.J2EEVersionConstants;
-import org.eclipse.jst.j2ee.internal.actions.IJ2EEUIContextIds;
-import org.eclipse.jst.j2ee.internal.common.J2EEVersionUtil;
-import org.eclipse.jst.j2ee.internal.wizard.J2EEModuleFacetInstallPage;
-import org.eclipse.jst.j2ee.jca.ui.internal.util.JCAUIMessages;
-import org.eclipse.swt.SWT;
-import org.eclipse.swt.layout.GridLayout;
-import org.eclipse.swt.widgets.Composite;
-import org.eclipse.wst.common.project.facet.core.IProjectFacetVersion;
-
-public class ConnectorFacetInstallPage extends J2EEModuleFacetInstallPage {
-
-
-
- public ConnectorFacetInstallPage() {
- super("connector.facet.install.page"); //$NON-NLS-1$
- setTitle(JCAUIMessages.JCA_MODULE_MAIN_PG_TITLE);
- setDescription(JCAUIMessages.CONNECTOR_SETTINGS);
- }
-
-
- @Override
- protected Composite createTopLevelComposite(Composite parent) {
- setInfopopID(IJ2EEUIContextIds.NEW_CONNECTOR_WIZARD_P3);
- final Composite composite = new Composite(parent, SWT.NONE);
- composite.setLayout(new GridLayout(1, false));
-
-
- createGenerateDescriptorControl(composite, J2EEConstants.RAR_SHORT_NAME);
- registerFacetVersionChangeListener();
-
- Dialog.applyDialogFont(parent);
- return composite;
- }
-
- @Override
- protected void handleFacetVersionChangedEvent()
- {
- final IProjectFacetVersion fv = (IProjectFacetVersion) this.model.getProperty( FACET_VERSION );
- boolean isJEE6OrGreater = J2EEVersionUtil.convertVersionStringToInt(fv.getVersionString()) >= J2EEVersionConstants.JCA_1_6_ID;
- this.addDD.setVisible(isJEE6OrGreater);
- }
-
-
- @Override
- protected String[] getValidationPropertyNames() {
- // TODO Auto-generated method stub
- return null;
- }
-
- @Override
- protected void enter() {
- super.enter();
- final IProjectFacetVersion fv = (IProjectFacetVersion) this.model.getProperty( FACET_VERSION );
- boolean isJEE6OrGreater = J2EEVersionUtil.convertVersionStringToInt(fv.getVersionString()) >= J2EEVersionConstants.JCA_1_6_ID;
- if( isJEE6OrGreater ){
- this.addDD.setVisible(isJEE6OrGreater);
- this.addDD.setEnabled(isJEE6OrGreater);
- }
- else{
- this.addDD.setVisible(true);
- this.addDD.setEnabled(isJEE6OrGreater);
- }
- }
-}
diff --git a/plugins/org.eclipse.jst.j2ee.jca.ui/jca_ui/org/eclipse/jst/j2ee/jca/ui/internal/wizard/ConnectorProjectFirstPage.java b/plugins/org.eclipse.jst.j2ee.jca.ui/jca_ui/org/eclipse/jst/j2ee/jca/ui/internal/wizard/ConnectorProjectFirstPage.java
deleted file mode 100644
index e6d7f46..0000000
--- a/plugins/org.eclipse.jst.j2ee.jca.ui/jca_ui/org/eclipse/jst/j2ee/jca/ui/internal/wizard/ConnectorProjectFirstPage.java
+++ /dev/null
@@ -1,71 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2005, 2007 IBM Corporation and others.
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
- *
- * Contributors:
- * IBM Corporation - initial API and implementation
- *******************************************************************************/
-package org.eclipse.jst.j2ee.jca.ui.internal.wizard;
-
-import java.util.Collections;
-import java.util.HashSet;
-import java.util.Set;
-
-import org.eclipse.jst.common.project.facet.core.JavaFacet;
-import org.eclipse.jst.j2ee.internal.actions.IJ2EEUIContextIds;
-import org.eclipse.jst.j2ee.internal.plugin.J2EEUIPlugin;
-import org.eclipse.jst.j2ee.internal.plugin.J2EEUIPluginIcons;
-import org.eclipse.jst.j2ee.internal.wizard.J2EEComponentFacetCreationWizardPage;
-import org.eclipse.jst.j2ee.jca.ui.internal.util.JCAUIMessages;
-import org.eclipse.jst.j2ee.project.facet.IJ2EEFacetConstants;
-import org.eclipse.wst.common.componentcore.datamodel.properties.IFacetProjectCreationDataModelProperties;
-import org.eclipse.wst.common.frameworks.datamodel.IDataModel;
-import org.eclipse.wst.common.project.facet.core.IProjectFacetVersion;
-import org.eclipse.wst.common.project.facet.core.runtime.IRuntime;
-
-public class ConnectorProjectFirstPage extends J2EEComponentFacetCreationWizardPage {
-
- public ConnectorProjectFirstPage(IDataModel dataModel, String pageName) {
- super(dataModel, pageName);
- setTitle(JCAUIMessages.JCA_MODULE_MAIN_PG_TITLE);
- setDescription(JCAUIMessages.JCA_MODULE_MAIN_PG_DESC);
- setImageDescriptor(J2EEUIPlugin.getDefault().getImageDescriptor(J2EEUIPluginIcons.JCA_PROJECT_WIZARD_BANNER));
- setInfopopID(IJ2EEUIContextIds.NEW_CONNECTOR_WIZARD_P1);
- }
-
- @Override
- protected String getModuleFacetID() {
- return IJ2EEFacetConstants.JCA;
- }
-
- @Override
- protected Set<IProjectFacetVersion> getFacetConfiguration( final IProjectFacetVersion primaryFacetVersion )
- {
- IRuntime runtime = (IRuntime)model.getProperty(IFacetProjectCreationDataModelProperties.FACET_RUNTIME);
- final Set<IProjectFacetVersion> facets = new HashSet<IProjectFacetVersion>( 2 );
-
- if(runtime != null) {
- facets.addAll(super.getFacetConfiguration(primaryFacetVersion));
- }
- else {
- facets.add(primaryFacetVersion);
-
- if( primaryFacetVersion == IJ2EEFacetConstants.JCA_16)
- {
- facets.add(JavaFacet.VERSION_1_6);
- }
- else if(primaryFacetVersion == IJ2EEFacetConstants.JCA_15)
- {
- facets.add(JavaFacet.VERSION_1_4);
- }
- else if( primaryFacetVersion == IJ2EEFacetConstants.JCA_10)
- {
- facets.add(JavaFacet.VERSION_1_3);
- }
- }
- return Collections.unmodifiableSet( facets );
- }
-}
diff --git a/plugins/org.eclipse.jst.j2ee.jca.ui/jca_ui/org/eclipse/jst/j2ee/jca/ui/internal/wizard/ConnectorProjectWizard.java b/plugins/org.eclipse.jst.j2ee.jca.ui/jca_ui/org/eclipse/jst/j2ee/jca/ui/internal/wizard/ConnectorProjectWizard.java
deleted file mode 100644
index 32bc93a..0000000
--- a/plugins/org.eclipse.jst.j2ee.jca.ui/jca_ui/org/eclipse/jst/j2ee/jca/ui/internal/wizard/ConnectorProjectWizard.java
+++ /dev/null
@@ -1,68 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2005, 2006 IBM Corporation and others.
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
- *
- * Contributors:
- * IBM Corporation - initial API and implementation
- *******************************************************************************/
-package org.eclipse.jst.j2ee.jca.ui.internal.wizard;
-
-import java.net.URL;
-
-import org.eclipse.core.runtime.Platform;
-import org.eclipse.jface.resource.ImageDescriptor;
-import org.eclipse.jface.wizard.IWizardPage;
-import org.eclipse.jst.j2ee.internal.plugin.J2EEUIPlugin;
-import org.eclipse.jst.j2ee.jca.project.facet.ConnectorFacetProjectCreationDataModelProvider;
-import org.eclipse.jst.j2ee.jca.ui.internal.util.JCAUIMessages;
-import org.eclipse.wst.common.frameworks.datamodel.DataModelFactory;
-import org.eclipse.wst.common.frameworks.datamodel.IDataModel;
-import org.eclipse.wst.common.project.facet.core.IFacetedProjectTemplate;
-import org.eclipse.wst.common.project.facet.core.ProjectFacetsManager;
-import org.eclipse.wst.project.facet.IProductConstants;
-import org.eclipse.wst.project.facet.ProductManager;
-import org.eclipse.wst.web.ui.internal.wizards.NewProjectDataModelFacetWizard;
-import org.osgi.framework.Bundle;
-
-public class ConnectorProjectWizard extends NewProjectDataModelFacetWizard {
-
- public ConnectorProjectWizard(IDataModel model) {
- super(model);
- setWindowTitle(JCAUIMessages.JCA_MODULE_WIZ_TITLE);
- }
-
- public ConnectorProjectWizard() {
- super();
- setWindowTitle(JCAUIMessages.JCA_MODULE_WIZ_TITLE);
- }
-
- @Override
- protected IDataModel createDataModel() {
- return DataModelFactory.createDataModel(new ConnectorFacetProjectCreationDataModelProvider());
- }
-
- @Override
- protected ImageDescriptor getDefaultPageImageDescriptor() {
- final Bundle bundle = Platform.getBundle(J2EEUIPlugin.PLUGIN_ID);
- final URL url = bundle.getEntry("icons/full/wizban/connector_wiz.gif"); //$NON-NLS-1$
- return ImageDescriptor.createFromURL(url);
- }
-
- @Override
- protected IFacetedProjectTemplate getTemplate() {
- return ProjectFacetsManager.getTemplate("template.jst.connector"); //$NON-NLS-1$
- }
-
- @Override
- protected IWizardPage createFirstPage() {
- return new ConnectorProjectFirstPage(model, "first.page"); //$NON-NLS-1$
- }
-
- @Override
- protected String getFinalPerspectiveID() {
- return ProductManager.getProperty(IProductConstants.FINAL_PERSPECTIVE_JCA);
- }
-}
diff --git a/plugins/org.eclipse.jst.j2ee.jca.ui/jca_ui/org/eclipse/jst/j2ee/jca/ui/internal/wizard/RARExportPage.java b/plugins/org.eclipse.jst.j2ee.jca.ui/jca_ui/org/eclipse/jst/j2ee/jca/ui/internal/wizard/RARExportPage.java
deleted file mode 100644
index 8dd81b9..0000000
--- a/plugins/org.eclipse.jst.j2ee.jca.ui/jca_ui/org/eclipse/jst/j2ee/jca/ui/internal/wizard/RARExportPage.java
+++ /dev/null
@@ -1,92 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2003, 2006 IBM Corporation and others.
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
- *
- * Contributors:
- * IBM Corporation - initial API and implementation
- *******************************************************************************/
-/*
- * Created on Dec 3, 2003
- *
- * To change the template for this generated file go to
- * Window>Preferences>Java>Code Generation>Code and Comments
- */
-package org.eclipse.jst.j2ee.jca.ui.internal.wizard;
-
-import org.eclipse.jface.viewers.IStructuredSelection;
-import org.eclipse.jst.j2ee.internal.actions.IJ2EEUIContextIds;
-import org.eclipse.jst.j2ee.internal.plugin.J2EEUIMessages;
-import org.eclipse.jst.j2ee.internal.plugin.J2EEUIPlugin;
-import org.eclipse.jst.j2ee.internal.plugin.J2EEUIPluginIcons;
-import org.eclipse.jst.j2ee.internal.wizard.J2EEModuleExportPage;
-import org.eclipse.jst.j2ee.jca.Connector;
-import org.eclipse.jst.j2ee.jca.ui.internal.util.JCAUIMessages;
-import org.eclipse.wst.common.frameworks.datamodel.IDataModel;
-
-/**
- * @author cbridgha
- *
- * To change the template for this generated type comment go to Window>Preferences>Java>Code
- * Generation>Code and Comments
- */
-public class RARExportPage extends J2EEModuleExportPage {
- /**
- * @param model
- * @param pageName
- */
- public RARExportPage(IDataModel model, String pageName, IStructuredSelection selection) {
- super(model, pageName, selection);
- setTitle(JCAUIMessages.JCA_EXPORT_MAIN_PG_TITLE);
- setDescription(JCAUIMessages.JCA_EXPORT_MAIN_PG_DESC);
- setImageDescriptor(J2EEUIPlugin.getDefault().getImageDescriptor(J2EEUIPluginIcons.JCA_EXPORT_WIZARD_BANNER));
-
- }
-
- /*
- * (non-Javadoc)
- *
- * @see org.eclipse.jst.j2ee.internal.internal.internal.ui.wizard.J2EEImportPage#getProjectImportLabel()
- */
- @Override
- protected String getComponentLabel() {
- return J2EEUIMessages.getResourceString(J2EEUIMessages.JCA_PROJ_LBL);
- }
-
- /*
- * (non-Javadoc)
- *
- * @see org.eclipse.jst.j2ee.internal.internal.internal.ui.wizard.J2EEImportPage#getFilterExpression()
- */
- @Override
- protected String[] getFilterExpression() {
- return new String[]{"*.rar"}; //$NON-NLS-1$
- }
-
- /*
- * (non-Javadoc)
- *
- * @see org.eclipse.jst.j2ee.internal.internal.internal.ui.wizard.J2EEExportPage#isMetaTypeSupported(java.lang.Object)
- */
- @Override
- protected boolean isMetaTypeSupported(Object o) {
- return o instanceof Connector;
- }
-
- /*
- * (non-Javadoc)
- *
- * @see org.eclipse.wst.common.frameworks.internal.ui.wizard.WTPWizardPage#getInfopopID()
- */
- @Override
- protected String getInfopopID() {
- return IJ2EEUIContextIds.EXPORT_RAR_WIZARD_PAGE;
- }
-
- @Override
- protected String getComponentID() {
- return "JST_CONNECTOR"; //$NON-NLS-1$
- }
-}
diff --git a/plugins/org.eclipse.jst.j2ee.jca.ui/plugin.properties b/plugins/org.eclipse.jst.j2ee.jca.ui/plugin.properties
deleted file mode 100644
index 6724670..0000000
--- a/plugins/org.eclipse.jst.j2ee.jca.ui/plugin.properties
+++ /dev/null
@@ -1,23 +0,0 @@
-###############################################################################
-# Copyright (c) 2003, 2006 IBM Corporation and others.
-# All rights reserved. This program and the accompanying materials
-# are made available under the terms of the Eclipse Public License v1.0
-# which accompanies this distribution, and is available at
-# http://www.eclipse.org/legal/epl-v10.html
-#
-# Contributors:
-# IBM Corporation - initial API and implementation
-###############################################################################
-providerName=Eclipse.org
-pluginName=WTP JCA UI Plug-in
-jca.module_ui_=Connector Module
-new.jca.module.description_ui_=Create a Connector module
-connector.import.description_ui_=Import an external Connector RAR file into a Connector project
-connector.export.description_ui_=Export a Connector project into a Connector RAR file
-connector.jar.file_ui_=RAR file
-connector.module_ui_=Connector Module
-new.connector.module.description_ui_=Create a Connector project
-connector.import.action.label_ui_=Import RAR File...
-connector.export.action.label_ui_=Export RAR File...
-connector_module_ui_=Connector Project
-connectors.actionSet=JCA
\ No newline at end of file
diff --git a/plugins/org.eclipse.jst.j2ee.jca.ui/plugin.xml b/plugins/org.eclipse.jst.j2ee.jca.ui/plugin.xml
deleted file mode 100644
index 6c60170..0000000
--- a/plugins/org.eclipse.jst.j2ee.jca.ui/plugin.xml
+++ /dev/null
@@ -1,68 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<?eclipse version="3.0"?>
-<plugin>
- <!-- Connector Module Wizard -->
- <extension
- id="J2EEUIProjectWizards"
- point="org.eclipse.ui.newWizards">
- <wizard
- name="%connector_module_ui_"
- icon="icons/full/ctool16/newconnectionprj_wiz.gif"
- category="org.eclipse.jst.j2ee.internal"
- project="true"
- finalPerspective="org.eclipse.jst.j2ee.J2EEPerspective"
- id="org.eclipse.jst.j2ee.jca.ui.internal.wizard.ConnectorProjectWizard">
- <class class="org.eclipse.jst.j2ee.jca.ui.internal.wizard.ConnectorProjectWizard">
- <parameter name="javaeeproject" value="true"/>
- <parameter name="menuIndex" value="50" />
- </class>
- <description>
- %new.connector.module.description_ui_
- </description>
- <selection
- class="org.eclipse.core.resources.IResource" />
- </wizard>
- </extension>
-<!-- JCA Import Wizard -->
- <extension
- point="org.eclipse.ui.importWizards">
- <wizard
- category="org.eclipse.jst.j2ee.internal"
- class="org.eclipse.jst.j2ee.jca.ui.internal.wizard.ConnectorComponentImportWizard"
- icon="icons/full/ctool16/import_rar.gif"
- id="org.eclipse.jst.j2ee.jca.ui.internal.wizard.ConnectorComponentImportWizard"
- name="%connector.jar.file_ui_">
- <description>
- %connector.import.description_ui_
- </description>
- <selection
- class="org.eclipse.core.resources.IResource">
- </selection>
- </wizard>
- </extension>
-
-<!-- JCA Export Wizard -->
- <extension
- point="org.eclipse.ui.exportWizards">
- <wizard
- category="org.eclipse.jst.j2ee.internal"
- class="org.eclipse.jst.j2ee.jca.ui.internal.wizard.ConnectorComponentExportWizard"
- icon="icons/full/ctool16/export_rar.gif"
- id="org.eclipse.jst.j2ee.jca.ui.internal.wizard.ConnectorComponentExportWizard"
- name="%connector.jar.file_ui_">
- <description>
- %connector.export.description_ui_
- </description>
- <selection
- class="org.eclipse.core.resources.IResource">
- </selection>
- </wizard>
- </extension>
-
- <extension point="org.eclipse.wst.common.project.facet.ui.wizardPages">
- <wizard-pages action="jst.connector.install">
- <page class="org.eclipse.jst.j2ee.jca.ui.internal.wizard.ConnectorFacetInstallPage"/>
- </wizard-pages>
- </extension>
-
-</plugin>
diff --git a/plugins/org.eclipse.jst.j2ee.jca.ui/property_files/jca_ui.properties b/plugins/org.eclipse.jst.j2ee.jca.ui/property_files/jca_ui.properties
deleted file mode 100644
index 3c54aa0..0000000
--- a/plugins/org.eclipse.jst.j2ee.jca.ui/property_files/jca_ui.properties
+++ /dev/null
@@ -1,24 +0,0 @@
-###############################################################################
-# Copyright (c) 2003, 2005 IBM Corporation and others.
-# All rights reserved. This program and the accompanying materials
-# are made available under the terms of the Eclipse Public License v1.0
-# which accompanies this distribution, and is available at
-# http://www.eclipse.org/legal/epl-v10.html
-#
-# Contributors:
-# IBM Corporation - initial API and implementation
-###############################################################################
-_0=Failed to find the image "{0}".
-_1=New Connector Project
-_2=JCA version:
-_3=Connector Project
-_4=Create a standalone Connector module or add it to a new or existing Enterprise Application project.
-_5=Import a Connector module from the file system
-_6=Connector Import
-_7=Connector fi&le:
-_8=Connector pro&ject:
-_9=Connector Export
-_10=Export Connector module to the local file system.
-_11=Configure Connector module settings.
-connector_export_action_label_ui_=Export RAR File...
-CONNECTOR_SETTINGS=Configure Connector module settings.
diff --git a/plugins/org.eclipse.jst.j2ee.jca/.classpath b/plugins/org.eclipse.jst.j2ee.jca/.classpath
deleted file mode 100644
index 5aeb836..0000000
--- a/plugins/org.eclipse.jst.j2ee.jca/.classpath
+++ /dev/null
@@ -1,11 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<classpath>
- <classpathentry kind="src" path="jca/"/>
- <classpathentry kind="src" path="rarproject/"/>
- <classpathentry kind="src" path="jcaedit/"/>
- <classpathentry kind="src" path="jca-validation/"/>
- <classpathentry kind="src" path="property_files"/>
- <classpathentry kind="con" path="org.eclipse.jdt.launching.JRE_CONTAINER/org.eclipse.jdt.internal.debug.ui.launcher.StandardVMType/J2SE-1.5"/>
- <classpathentry kind="con" path="org.eclipse.pde.core.requiredPlugins"/>
- <classpathentry kind="output" path="bin"/>
-</classpath>
diff --git a/plugins/org.eclipse.jst.j2ee.jca/.cvsignore b/plugins/org.eclipse.jst.j2ee.jca/.cvsignore
deleted file mode 100644
index 9b9b366..0000000
--- a/plugins/org.eclipse.jst.j2ee.jca/.cvsignore
+++ /dev/null
@@ -1,7 +0,0 @@
-bin
-build.xml
-runtime
-temp.folder
-@dot
-src.zip
-javaCompiler...args
diff --git a/plugins/org.eclipse.jst.j2ee.jca/.project b/plugins/org.eclipse.jst.j2ee.jca/.project
deleted file mode 100644
index 7185aae..0000000
--- a/plugins/org.eclipse.jst.j2ee.jca/.project
+++ /dev/null
@@ -1,28 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<projectDescription>
- <name>org.eclipse.jst.j2ee.jca</name>
- <comment></comment>
- <projects>
- </projects>
- <buildSpec>
- <buildCommand>
- <name>org.eclipse.jdt.core.javabuilder</name>
- <arguments>
- </arguments>
- </buildCommand>
- <buildCommand>
- <name>org.eclipse.pde.ManifestBuilder</name>
- <arguments>
- </arguments>
- </buildCommand>
- <buildCommand>
- <name>org.eclipse.pde.SchemaBuilder</name>
- <arguments>
- </arguments>
- </buildCommand>
- </buildSpec>
- <natures>
- <nature>org.eclipse.pde.PluginNature</nature>
- <nature>org.eclipse.jdt.core.javanature</nature>
- </natures>
-</projectDescription>
diff --git a/plugins/org.eclipse.jst.j2ee.jca/.settings/org.eclipse.jdt.core.prefs b/plugins/org.eclipse.jst.j2ee.jca/.settings/org.eclipse.jdt.core.prefs
deleted file mode 100644
index 8ab6d8c..0000000
--- a/plugins/org.eclipse.jst.j2ee.jca/.settings/org.eclipse.jdt.core.prefs
+++ /dev/null
@@ -1,95 +0,0 @@
-#Wed Jun 10 17:08:21 EDT 2009
-org.eclipse.jdt.core.compiler.problem.unusedParameterWhenImplementingAbstract=disabled
-org.eclipse.jdt.core.compiler.problem.comparingIdentical=error
-org.eclipse.jdt.core.compiler.problem.unnecessaryElse=error
-org.eclipse.jdt.core.compiler.problem.redundantSuperinterface=error
-org.eclipse.jdt.core.compiler.problem.unusedLocal=error
-org.eclipse.jdt.core.compiler.problem.emptyStatement=error
-org.eclipse.jdt.core.compiler.problem.unusedLabel=error
-org.eclipse.jdt.core.compiler.problem.unusedParameter=warning
-org.eclipse.jdt.core.compiler.problem.rawTypeReference=warning
-org.eclipse.jdt.core.incompatibleJDKLevel=ignore
-org.eclipse.jdt.core.compiler.problem.incompatibleNonInheritedInterfaceMethod=error
-org.eclipse.jdt.core.compiler.debug.lineNumber=generate
-org.eclipse.jdt.core.compiler.problem.unusedDeclaredThrownException=warning
-org.eclipse.jdt.core.builder.cleanOutputFolder=clean
-org.eclipse.jdt.core.compiler.problem.unusedWarningToken=warning
-org.eclipse.jdt.core.compiler.problem.noImplicitStringConversion=error
-org.eclipse.jdt.core.compiler.problem.deprecationInDeprecatedCode=enabled
-org.eclipse.jdt.core.compiler.problem.deprecation=warning
-org.eclipse.jdt.core.compiler.problem.unusedParameterWhenOverridingConcrete=disabled
-org.eclipse.jdt.core.compiler.problem.missingSynchronizedOnInheritedMethod=error
-org.eclipse.jdt.core.compiler.problem.deprecationWhenOverridingDeprecatedMethod=enabled
-org.eclipse.jdt.core.compiler.problem.redundantNullCheck=error
-org.eclipse.jdt.core.compiler.problem.unusedImport=error
-org.eclipse.jdt.core.builder.recreateModifiedClassFileInOutputFolder=ignore
-org.eclipse.jdt.core.builder.resourceCopyExclusionFilter=*.launch
-org.eclipse.jdt.core.classpath.multipleOutputLocations=enabled
-org.eclipse.jdt.core.compiler.problem.suppressWarnings=enabled
-org.eclipse.jdt.core.compiler.problem.typeParameterHiding=error
-org.eclipse.jdt.core.builder.invalidClasspath=abort
-org.eclipse.jdt.core.compiler.problem.localVariableHiding=warning
-org.eclipse.jdt.core.compiler.problem.possibleAccidentalBooleanAssignment=error
-org.eclipse.jdt.core.compiler.problem.missingHashCodeMethod=error
-org.eclipse.jdt.core.codeComplete.argumentSuffixes=
-org.eclipse.jdt.core.codeComplete.argumentPrefixes=
-org.eclipse.jdt.core.compiler.problem.indirectStaticAccess=ignore
-org.eclipse.jdt.core.compiler.problem.potentialNullReference=error
-org.eclipse.jdt.core.compiler.codegen.inlineJsrBytecode=enabled
-org.eclipse.jdt.core.compiler.problem.finalParameterBound=warning
-org.eclipse.jdt.core.compiler.problem.missingSerialVersion=error
-org.eclipse.jdt.core.compiler.problem.nullReference=error
-org.eclipse.jdt.core.compiler.source=1.5
-org.eclipse.jdt.core.compiler.problem.enumIdentifier=error
-org.eclipse.jdt.core.compiler.problem.syntheticAccessEmulation=ignore
-org.eclipse.jdt.core.builder.duplicateResourceTask=warning
-org.eclipse.jdt.core.compiler.problem.fieldHiding=warning
-org.eclipse.jdt.core.compiler.problem.unusedDeclaredThrownExceptionExemptExceptionAndThrowable=enabled
-org.eclipse.jdt.core.compiler.problem.missingOverrideAnnotation=error
-org.eclipse.jdt.core.compiler.problem.hiddenCatchBlock=error
-org.eclipse.jdt.core.compiler.problem.overridingPackageDefaultMethod=error
-org.eclipse.jdt.core.compiler.problem.finallyBlockNotCompletingNormally=error
-org.eclipse.jdt.core.compiler.problem.undocumentedEmptyBlock=warning
-org.eclipse.jdt.core.classpath.exclusionPatterns=enabled
-org.eclipse.jdt.core.compiler.problem.methodWithConstructorName=error
-org.eclipse.jdt.core.compiler.problem.discouragedReference=warning
-org.eclipse.jdt.core.compiler.problem.unqualifiedFieldAccess=ignore
-org.eclipse.jdt.core.compiler.problem.incompleteEnumSwitch=error
-eclipse.preferences.version=1
-org.eclipse.jdt.core.incompleteClasspath=error
-org.eclipse.jdt.core.compiler.problem.unnecessaryTypeCheck=error
-org.eclipse.jdt.core.compiler.problem.deadCode=error
-org.eclipse.jdt.core.compiler.problem.specialParameterHidingField=enabled
-org.eclipse.jdt.core.compiler.problem.fatalOptionalError=enabled
-org.eclipse.jdt.core.compiler.problem.noEffectAssignment=error
-org.eclipse.jdt.core.compiler.debug.sourceFile=generate
-org.eclipse.jdt.core.compiler.problem.unusedDeclaredThrownExceptionIncludeUncheckedExceptions=disabled
-org.eclipse.jdt.core.compiler.problem.missingDeprecatedAnnotation=warning
-org.eclipse.jdt.core.codeComplete.fieldPrefixes=
-org.eclipse.jdt.core.compiler.problem.fallthroughCase=error
-org.eclipse.jdt.core.compiler.codegen.targetPlatform=1.5
-org.eclipse.jdt.core.compiler.problem.unusedPrivateMember=error
-org.eclipse.jdt.core.compiler.problem.autoboxing=warning
-org.eclipse.jdt.core.circularClasspath=error
-org.eclipse.jdt.core.compiler.problem.annotationSuperInterface=warning
-org.eclipse.jdt.core.compiler.problem.nonExternalizedStringLiteral=error
-org.eclipse.jdt.core.codeComplete.fieldSuffixes=
-org.eclipse.jdt.core.codeComplete.localSuffixes=
-org.eclipse.jdt.core.compiler.problem.parameterAssignment=error
-org.eclipse.jdt.core.compiler.problem.staticAccessReceiver=error
-org.eclipse.jdt.core.codeComplete.localPrefixes=
-org.eclipse.jdt.core.compiler.problem.unusedDeclaredThrownExceptionIncludeDocCommentReference=enabled
-org.eclipse.jdt.core.compiler.maxProblemPerUnit=100
-org.eclipse.jdt.core.compiler.problem.varargsArgumentNeedCast=error
-org.eclipse.jdt.core.compiler.problem.assertIdentifier=error
-org.eclipse.jdt.core.compiler.compliance=1.5
-org.eclipse.jdt.core.compiler.problem.unusedParameterIncludeDocCommentReference=enabled
-org.eclipse.jdt.core.codeComplete.staticFieldPrefixes=
-org.eclipse.jdt.core.compiler.debug.localVariable=generate
-org.eclipse.jdt.core.compiler.problem.unhandledWarningToken=warning
-instance/org.eclipse.core.net/org.eclipse.core.net.hasMigrated=true
-org.eclipse.jdt.core.compiler.problem.forbiddenReference=error
-org.eclipse.jdt.core.compiler.codegen.unusedLocal=preserve
-org.eclipse.jdt.core.compiler.problem.uncheckedTypeOperation=warning
-org.eclipse.jdt.core.compiler.problem.unusedDeclaredThrownExceptionWhenOverriding=disabled
-org.eclipse.jdt.core.codeComplete.staticFieldSuffixes=
diff --git a/plugins/org.eclipse.jst.j2ee.jca/META-INF/MANIFEST.MF b/plugins/org.eclipse.jst.j2ee.jca/META-INF/MANIFEST.MF
deleted file mode 100644
index 000c12e..0000000
--- a/plugins/org.eclipse.jst.j2ee.jca/META-INF/MANIFEST.MF
+++ /dev/null
@@ -1,40 +0,0 @@
-Manifest-Version: 1.0
-Bundle-ManifestVersion: 2
-Bundle-Name: %pluginName
-Bundle-SymbolicName: org.eclipse.jst.j2ee.jca; singleton:=true
-Bundle-Version: 1.1.400.qualifier
-Bundle-Activator: org.eclipse.jst.j2ee.jca.internal.plugin.JcaPlugin
-Bundle-Vendor: %pluginVendor
-Bundle-Localization: plugin
-Export-Package: org.eclipse.jst.j2ee.internal.jca.archive.operations;x-internal:=true,
- org.eclipse.jst.j2ee.internal.jca.operations;x-internal:=true,
- org.eclipse.jst.j2ee.internal.jca.providers;x-internal:=true,
- org.eclipse.jst.j2ee.internal.jca.validation;x-internal:=true,
- org.eclipse.jst.j2ee.jca.internal.module.util;x-internal:=true,
- org.eclipse.jst.j2ee.jca.internal.plugin;x-internal:=true,
- org.eclipse.jst.j2ee.jca.modulecore.util,
- org.eclipse.jst.j2ee.jca.project.facet
-Require-Bundle: org.eclipse.jst.j2ee;bundle-version="[1.1.0,1.2.0)",
- org.eclipse.jem.workbench;bundle-version="[2.0.0,3.0.0)",
- org.eclipse.wst.common.emfworkbench.integration;bundle-version="[1.2.0,2.0.0)",
- org.eclipse.wst.server.core;bundle-version="[1.0.102,2.0.0)",
- org.eclipse.jst.server.core;bundle-version="[1.0.102,2.0.0)",
- org.eclipse.core.resources;bundle-version="[3.2.0,4.0.0)",
- org.eclipse.wst.common.frameworks;bundle-version="[1.2.0,2.0.0)",
- org.eclipse.jst.j2ee.core;bundle-version="[1.1.0,2.0.0)",
- org.eclipse.jdt.core;bundle-version="[3.2.0,4.0.0)",
- org.eclipse.wst.common.emf;bundle-version="[1.2.0,2.0.0)",
- org.eclipse.emf.ecore.xmi;bundle-version="[2.2.0,3.0.0)",
- org.eclipse.wst.validation;bundle-version="[1.2.0,2.0.0)",
- org.eclipse.emf.edit;bundle-version="[2.2.0,3.0.0)",
- org.eclipse.core.runtime;bundle-version="[3.2.0,4.0.0)",
- org.eclipse.jst.common.frameworks;bundle-version="[1.1.0,1.2.0)",
- org.eclipse.wst.common.modulecore;bundle-version="[1.2.0,2.0.0)",
- org.eclipse.core.commands;bundle-version="[3.2.0,4.0.0)",
- org.eclipse.jem.util;bundle-version="[2.0.0,3.0.0)",
- org.eclipse.wst.common.project.facet.core;bundle-version="[1.3.0,2.0.0)",
- org.eclipse.jst.common.project.facet.core;bundle-version="[1.3.0,2.0.0)",
- org.eclipse.wst.common.environment;bundle-version="[1.0.100,1.1.0)",
- org.eclipse.wst.web;bundle-version="[1.1.0,1.2.0)"
-Eclipse-LazyStart: true
-Bundle-RequiredExecutionEnvironment: J2SE-1.5
diff --git a/plugins/org.eclipse.jst.j2ee.jca/about.html b/plugins/org.eclipse.jst.j2ee.jca/about.html
deleted file mode 100644
index 2199df3..0000000
--- a/plugins/org.eclipse.jst.j2ee.jca/about.html
+++ /dev/null
@@ -1,34 +0,0 @@
-<!DOCTYPE HTML PUBLIC "-//W3C//DTD HTML 4.0//EN">
-<HTML>
-
-<head>
-<title>About</title>
-<meta http-equiv=Content-Type content="text/html; charset=ISO-8859-1">
-</head>
-
-<BODY lang="EN-US">
-
-<H3>About This Content</H3>
-
-<P>June, 2008</P>
-
-<H3>License</H3>
-
-<P>The Eclipse Foundation makes available all content in this plug-in
-("Content"). Unless otherwise indicated below, the Content is provided to you
-under the terms and conditions of the Eclipse Public License Version 1.0
-("EPL"). A copy of the EPL is available at
-<A href="http://www.eclipse.org/org/documents/epl-v10.php">http://www.eclipse.org/org/documents/epl-v10.php</A>.
-For purposes of the EPL, "Program" will mean the Content.</P>
-
-<P>If you did not receive this Content directly from the Eclipse Foundation, the
-Content is being redistributed by another party ("Redistributor") and different
-terms and conditions may apply to your use of any object code in the Content.
-Check the Redistributors license that was provided with the Content. If no such
-license exists, contact the Redistributor. Unless otherwise indicated below, the
-terms and conditions of the EPL still apply to any source code in the Content
-and such source code may be obtained at
-<A href="http://www.eclipse.org/">http://www.eclipse.org/</A>.</P>
-
-</BODY>
-</HTML>
diff --git a/plugins/org.eclipse.jst.j2ee.jca/build.properties b/plugins/org.eclipse.jst.j2ee.jca/build.properties
deleted file mode 100644
index cdbdb39..0000000
--- a/plugins/org.eclipse.jst.j2ee.jca/build.properties
+++ /dev/null
@@ -1,24 +0,0 @@
-###############################################################################
-# Copyright (c) 2003, 2005 IBM Corporation and others.
-# All rights reserved. This program and the accompanying materials
-# are made available under the terms of the Eclipse Public License v1.0
-# which accompanies this distribution, and is available at
-# http://www.eclipse.org/legal/epl-v10.html
-#
-# Contributors:
-# IBM Corporation - initial API and implementation
-###############################################################################
-source.. = jca/,\
- rarproject/,\
- jcaedit/,\
- jca-validation/,\
- property_files/
-bin.includes = plugin.xml,\
- plugin.properties,\
- icons/,\
- .,\
- META-INF/,\
- about.html
-jars.compile.order = .
-output.. = bin/
-src.includes = component.xml
diff --git a/plugins/org.eclipse.jst.j2ee.jca/build/buildcontrol.properties b/plugins/org.eclipse.jst.j2ee.jca/build/buildcontrol.properties
deleted file mode 100644
index 3270ed0..0000000
--- a/plugins/org.eclipse.jst.j2ee.jca/build/buildcontrol.properties
+++ /dev/null
@@ -1,16 +0,0 @@
-###############################################################################
-# Copyright (c) 2003, 2004 IBM Corporation and others.
-# All rights reserved. This program and the accompanying materials
-# are made available under the terms of the Eclipse Public License v1.0
-# which accompanies this distribution, and is available at
-# http://www.eclipse.org/legal/epl-v10.html
-#
-# Contributors:
-# IBM Corporation - initial API and implementation
-###############################################################################
-CONTACT=danberg@us.ibm.com
-ComponentShortName=ejb
-ComponentFullName=EJB
-ComponentCompetency=EMF
-JavaCompile.1=srcjar
-BuildVerification.1=dir
diff --git a/plugins/org.eclipse.jst.j2ee.jca/build/package.xml b/plugins/org.eclipse.jst.j2ee.jca/build/package.xml
deleted file mode 100644
index 154d2fa..0000000
--- a/plugins/org.eclipse.jst.j2ee.jca/build/package.xml
+++ /dev/null
@@ -1,17 +0,0 @@
-<project name="com.ibm.etools.emf.workbench" default="packagingPlugin" basedir="./..">
- <target name="init">
- <property name="packageDir" value=""/>
- <property name="plugin.directory" value="${basedir}"/>
- <property name="plugin.id" value="com.ibm.etools.ejb"/>
- <property name="plugin.version" value=""/>
- </target>
- <target name="packagingPlugin" depends="init">
- <echo message="${plugin.id}"/>
- <copy todir="${packageDir}/plugins/${plugin.id}_${plugin.version}">
- <fileset dir="${plugin.directory}">
- <include name="plugin.xml"/>
- <include name="runtime/ejb.jar"/>
- </fileset>
- </copy>
- </target>
-</project>
diff --git a/plugins/org.eclipse.jst.j2ee.jca/build/wsBuild.xml b/plugins/org.eclipse.jst.j2ee.jca/build/wsBuild.xml
deleted file mode 100644
index 77c0b82..0000000
--- a/plugins/org.eclipse.jst.j2ee.jca/build/wsBuild.xml
+++ /dev/null
@@ -1,17 +0,0 @@
-<?xml version="1.0"?>
-<!DOCTYPE project [
- <!ENTITY baseBuild SYSTEM "file:../../wsBuildDef.xml">
-]>
-
-<project name="buildPlugin" default="build" basedir="./..">
-
-<!-- include the common xml build file -->
-&baseBuild;
-
-<target name="build" depends="prepare" if="plugin.id">
- <antcall target="buildjar">
- <param name="jarname" value="${defaultjarname}"/>
- <param name="jarclasspath" value="${plugin.classpath}"/>
- </antcall>
-</target>
-</project>
diff --git a/plugins/org.eclipse.jst.j2ee.jca/component.xml b/plugins/org.eclipse.jst.j2ee.jca/component.xml
deleted file mode 100644
index 073e1d1..0000000
--- a/plugins/org.eclipse.jst.j2ee.jca/component.xml
+++ /dev/null
@@ -1 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?><component xmlns="http://eclipse.org/wtp/releng/tools/component-model" name="org.eclipse.jst.j2ee.jca"><component-depends unrestricted="true"></component-depends><plugin id="org.eclipse.jst.j2ee.jca" fragment="false"/><plugin id="org.eclipse.jst.j2ee.jca.ui" fragment="false"/></component>
\ No newline at end of file
diff --git a/plugins/org.eclipse.jst.j2ee.jca/icons/full/ctool16/CreateActivationSpec_requiredConfigProperties_RequiredConfigPropertyType.gif b/plugins/org.eclipse.jst.j2ee.jca/icons/full/ctool16/CreateActivationSpec_requiredConfigProperties_RequiredConfigPropertyType.gif
deleted file mode 100644
index 06f1433..0000000
--- a/plugins/org.eclipse.jst.j2ee.jca/icons/full/ctool16/CreateActivationSpec_requiredConfigProperties_RequiredConfigPropertyType.gif
+++ /dev/null
Binary files differ
diff --git a/plugins/org.eclipse.jst.j2ee.jca/icons/full/ctool16/CreateAdminObject_configProperties_ConfigProperty.gif b/plugins/org.eclipse.jst.j2ee.jca/icons/full/ctool16/CreateAdminObject_configProperties_ConfigProperty.gif
deleted file mode 100644
index 2987b60..0000000
--- a/plugins/org.eclipse.jst.j2ee.jca/icons/full/ctool16/CreateAdminObject_configProperties_ConfigProperty.gif
+++ /dev/null
Binary files differ
diff --git a/plugins/org.eclipse.jst.j2ee.jca/icons/full/ctool16/CreateAuthenticationMechanism_descriptions_Description.gif b/plugins/org.eclipse.jst.j2ee.jca/icons/full/ctool16/CreateAuthenticationMechanism_descriptions_Description.gif
deleted file mode 100644
index 2b2b1ed..0000000
--- a/plugins/org.eclipse.jst.j2ee.jca/icons/full/ctool16/CreateAuthenticationMechanism_descriptions_Description.gif
+++ /dev/null
Binary files differ
diff --git a/plugins/org.eclipse.jst.j2ee.jca/icons/full/ctool16/CreateAuthenticationMechanism_descriptions_DescriptionType.gif b/plugins/org.eclipse.jst.j2ee.jca/icons/full/ctool16/CreateAuthenticationMechanism_descriptions_DescriptionType.gif
deleted file mode 100644
index e67f4f0..0000000
--- a/plugins/org.eclipse.jst.j2ee.jca/icons/full/ctool16/CreateAuthenticationMechanism_descriptions_DescriptionType.gif
+++ /dev/null
Binary files differ
diff --git a/plugins/org.eclipse.jst.j2ee.jca/icons/full/ctool16/CreateConfigProperty_descriptions_Description.gif b/plugins/org.eclipse.jst.j2ee.jca/icons/full/ctool16/CreateConfigProperty_descriptions_Description.gif
deleted file mode 100644
index 867e052..0000000
--- a/plugins/org.eclipse.jst.j2ee.jca/icons/full/ctool16/CreateConfigProperty_descriptions_Description.gif
+++ /dev/null
Binary files differ
diff --git a/plugins/org.eclipse.jst.j2ee.jca/icons/full/ctool16/CreateConfigProperty_descriptions_DescriptionType.gif b/plugins/org.eclipse.jst.j2ee.jca/icons/full/ctool16/CreateConfigProperty_descriptions_DescriptionType.gif
deleted file mode 100644
index 42fdffa..0000000
--- a/plugins/org.eclipse.jst.j2ee.jca/icons/full/ctool16/CreateConfigProperty_descriptions_DescriptionType.gif
+++ /dev/null
Binary files differ
diff --git a/plugins/org.eclipse.jst.j2ee.jca/icons/full/ctool16/CreateConnectionDefinition_configProperties_ConfigProperty.gif b/plugins/org.eclipse.jst.j2ee.jca/icons/full/ctool16/CreateConnectionDefinition_configProperties_ConfigProperty.gif
deleted file mode 100644
index 927efe4..0000000
--- a/plugins/org.eclipse.jst.j2ee.jca/icons/full/ctool16/CreateConnectionDefinition_configProperties_ConfigProperty.gif
+++ /dev/null
Binary files differ
diff --git a/plugins/org.eclipse.jst.j2ee.jca/icons/full/ctool16/CreateConnector_license_License.gif b/plugins/org.eclipse.jst.j2ee.jca/icons/full/ctool16/CreateConnector_license_License.gif
deleted file mode 100644
index 2dff485..0000000
--- a/plugins/org.eclipse.jst.j2ee.jca/icons/full/ctool16/CreateConnector_license_License.gif
+++ /dev/null
Binary files differ
diff --git a/plugins/org.eclipse.jst.j2ee.jca/icons/full/ctool16/CreateConnector_resourceAdapter_ResourceAdapter.gif b/plugins/org.eclipse.jst.j2ee.jca/icons/full/ctool16/CreateConnector_resourceAdapter_ResourceAdapter.gif
deleted file mode 100644
index 98bbc52..0000000
--- a/plugins/org.eclipse.jst.j2ee.jca/icons/full/ctool16/CreateConnector_resourceAdapter_ResourceAdapter.gif
+++ /dev/null
Binary files differ
diff --git a/plugins/org.eclipse.jst.j2ee.jca/icons/full/ctool16/CreateDescriptionGroup_descriptions_Description.gif b/plugins/org.eclipse.jst.j2ee.jca/icons/full/ctool16/CreateDescriptionGroup_descriptions_Description.gif
deleted file mode 100644
index a1338ff..0000000
--- a/plugins/org.eclipse.jst.j2ee.jca/icons/full/ctool16/CreateDescriptionGroup_descriptions_Description.gif
+++ /dev/null
Binary files differ
diff --git a/plugins/org.eclipse.jst.j2ee.jca/icons/full/ctool16/CreateDescriptionGroup_descriptions_DescriptionType.gif b/plugins/org.eclipse.jst.j2ee.jca/icons/full/ctool16/CreateDescriptionGroup_descriptions_DescriptionType.gif
deleted file mode 100644
index 5e33d45..0000000
--- a/plugins/org.eclipse.jst.j2ee.jca/icons/full/ctool16/CreateDescriptionGroup_descriptions_DescriptionType.gif
+++ /dev/null
Binary files differ
diff --git a/plugins/org.eclipse.jst.j2ee.jca/icons/full/ctool16/CreateDescriptionGroup_displayNames_DisplayName.gif b/plugins/org.eclipse.jst.j2ee.jca/icons/full/ctool16/CreateDescriptionGroup_displayNames_DisplayName.gif
deleted file mode 100644
index 1b51ca0..0000000
--- a/plugins/org.eclipse.jst.j2ee.jca/icons/full/ctool16/CreateDescriptionGroup_displayNames_DisplayName.gif
+++ /dev/null
Binary files differ
diff --git a/plugins/org.eclipse.jst.j2ee.jca/icons/full/ctool16/CreateDescriptionGroup_displayNames_DisplayNameType.gif b/plugins/org.eclipse.jst.j2ee.jca/icons/full/ctool16/CreateDescriptionGroup_displayNames_DisplayNameType.gif
deleted file mode 100644
index 2730bbf..0000000
--- a/plugins/org.eclipse.jst.j2ee.jca/icons/full/ctool16/CreateDescriptionGroup_displayNames_DisplayNameType.gif
+++ /dev/null
Binary files differ
diff --git a/plugins/org.eclipse.jst.j2ee.jca/icons/full/ctool16/CreateDescriptionGroup_icons_IconType.gif b/plugins/org.eclipse.jst.j2ee.jca/icons/full/ctool16/CreateDescriptionGroup_icons_IconType.gif
deleted file mode 100644
index bae88bd..0000000
--- a/plugins/org.eclipse.jst.j2ee.jca/icons/full/ctool16/CreateDescriptionGroup_icons_IconType.gif
+++ /dev/null
Binary files differ
diff --git a/plugins/org.eclipse.jst.j2ee.jca/icons/full/ctool16/CreateInboundResourceAdapter_messageAdapter_MessageAdapter.gif b/plugins/org.eclipse.jst.j2ee.jca/icons/full/ctool16/CreateInboundResourceAdapter_messageAdapter_MessageAdapter.gif
deleted file mode 100644
index 6c01e2f..0000000
--- a/plugins/org.eclipse.jst.j2ee.jca/icons/full/ctool16/CreateInboundResourceAdapter_messageAdapter_MessageAdapter.gif
+++ /dev/null
Binary files differ
diff --git a/plugins/org.eclipse.jst.j2ee.jca/icons/full/ctool16/CreateLicense_descriptions_Description.gif b/plugins/org.eclipse.jst.j2ee.jca/icons/full/ctool16/CreateLicense_descriptions_Description.gif
deleted file mode 100644
index db7eee0..0000000
--- a/plugins/org.eclipse.jst.j2ee.jca/icons/full/ctool16/CreateLicense_descriptions_Description.gif
+++ /dev/null
Binary files differ
diff --git a/plugins/org.eclipse.jst.j2ee.jca/icons/full/ctool16/CreateLicense_descriptions_DescriptionType.gif b/plugins/org.eclipse.jst.j2ee.jca/icons/full/ctool16/CreateLicense_descriptions_DescriptionType.gif
deleted file mode 100644
index b8d1884..0000000
--- a/plugins/org.eclipse.jst.j2ee.jca/icons/full/ctool16/CreateLicense_descriptions_DescriptionType.gif
+++ /dev/null
Binary files differ
diff --git a/plugins/org.eclipse.jst.j2ee.jca/icons/full/ctool16/CreateMessageAdapter_messageListeners_MessageListener.gif b/plugins/org.eclipse.jst.j2ee.jca/icons/full/ctool16/CreateMessageAdapter_messageListeners_MessageListener.gif
deleted file mode 100644
index ae50504..0000000
--- a/plugins/org.eclipse.jst.j2ee.jca/icons/full/ctool16/CreateMessageAdapter_messageListeners_MessageListener.gif
+++ /dev/null
Binary files differ
diff --git a/plugins/org.eclipse.jst.j2ee.jca/icons/full/ctool16/CreateMessageListener_activationSpec_ActivationSpec.gif b/plugins/org.eclipse.jst.j2ee.jca/icons/full/ctool16/CreateMessageListener_activationSpec_ActivationSpec.gif
deleted file mode 100644
index acf3043..0000000
--- a/plugins/org.eclipse.jst.j2ee.jca/icons/full/ctool16/CreateMessageListener_activationSpec_ActivationSpec.gif
+++ /dev/null
Binary files differ
diff --git a/plugins/org.eclipse.jst.j2ee.jca/icons/full/ctool16/CreateOutboundResourceAdapter_authenticationMechanisms_AuthenticationMechanism.gif b/plugins/org.eclipse.jst.j2ee.jca/icons/full/ctool16/CreateOutboundResourceAdapter_authenticationMechanisms_AuthenticationMechanism.gif
deleted file mode 100644
index 3c4caa5..0000000
--- a/plugins/org.eclipse.jst.j2ee.jca/icons/full/ctool16/CreateOutboundResourceAdapter_authenticationMechanisms_AuthenticationMechanism.gif
+++ /dev/null
Binary files differ
diff --git a/plugins/org.eclipse.jst.j2ee.jca/icons/full/ctool16/CreateOutboundResourceAdapter_connectionDefinitions_ConnectionDefinition.gif b/plugins/org.eclipse.jst.j2ee.jca/icons/full/ctool16/CreateOutboundResourceAdapter_connectionDefinitions_ConnectionDefinition.gif
deleted file mode 100644
index f3d6138..0000000
--- a/plugins/org.eclipse.jst.j2ee.jca/icons/full/ctool16/CreateOutboundResourceAdapter_connectionDefinitions_ConnectionDefinition.gif
+++ /dev/null
Binary files differ
diff --git a/plugins/org.eclipse.jst.j2ee.jca/icons/full/ctool16/CreateRequiredConfigPropertyType_descriptions_Description.gif b/plugins/org.eclipse.jst.j2ee.jca/icons/full/ctool16/CreateRequiredConfigPropertyType_descriptions_Description.gif
deleted file mode 100644
index db7eee0..0000000
--- a/plugins/org.eclipse.jst.j2ee.jca/icons/full/ctool16/CreateRequiredConfigPropertyType_descriptions_Description.gif
+++ /dev/null
Binary files differ
diff --git a/plugins/org.eclipse.jst.j2ee.jca/icons/full/ctool16/CreateRequiredConfigPropertyType_descriptions_DescriptionType.gif b/plugins/org.eclipse.jst.j2ee.jca/icons/full/ctool16/CreateRequiredConfigPropertyType_descriptions_DescriptionType.gif
deleted file mode 100644
index b8d1884..0000000
--- a/plugins/org.eclipse.jst.j2ee.jca/icons/full/ctool16/CreateRequiredConfigPropertyType_descriptions_DescriptionType.gif
+++ /dev/null
Binary files differ
diff --git a/plugins/org.eclipse.jst.j2ee.jca/icons/full/ctool16/CreateResourceAdapter_adminObjects_AdminObject.gif b/plugins/org.eclipse.jst.j2ee.jca/icons/full/ctool16/CreateResourceAdapter_adminObjects_AdminObject.gif
deleted file mode 100644
index eb192b4..0000000
--- a/plugins/org.eclipse.jst.j2ee.jca/icons/full/ctool16/CreateResourceAdapter_adminObjects_AdminObject.gif
+++ /dev/null
Binary files differ
diff --git a/plugins/org.eclipse.jst.j2ee.jca/icons/full/ctool16/CreateResourceAdapter_authenticationMechanisms_AuthenticationMechanism.gif b/plugins/org.eclipse.jst.j2ee.jca/icons/full/ctool16/CreateResourceAdapter_authenticationMechanisms_AuthenticationMechanism.gif
deleted file mode 100644
index 28e4676..0000000
--- a/plugins/org.eclipse.jst.j2ee.jca/icons/full/ctool16/CreateResourceAdapter_authenticationMechanisms_AuthenticationMechanism.gif
+++ /dev/null
Binary files differ
diff --git a/plugins/org.eclipse.jst.j2ee.jca/icons/full/ctool16/CreateResourceAdapter_configProperties_ConfigProperty.gif b/plugins/org.eclipse.jst.j2ee.jca/icons/full/ctool16/CreateResourceAdapter_configProperties_ConfigProperty.gif
deleted file mode 100644
index 46a149b..0000000
--- a/plugins/org.eclipse.jst.j2ee.jca/icons/full/ctool16/CreateResourceAdapter_configProperties_ConfigProperty.gif
+++ /dev/null
Binary files differ
diff --git a/plugins/org.eclipse.jst.j2ee.jca/icons/full/ctool16/CreateResourceAdapter_inboundResourceAdapter_InboundResourceAdapter.gif b/plugins/org.eclipse.jst.j2ee.jca/icons/full/ctool16/CreateResourceAdapter_inboundResourceAdapter_InboundResourceAdapter.gif
deleted file mode 100644
index 3857de1..0000000
--- a/plugins/org.eclipse.jst.j2ee.jca/icons/full/ctool16/CreateResourceAdapter_inboundResourceAdapter_InboundResourceAdapter.gif
+++ /dev/null
Binary files differ
diff --git a/plugins/org.eclipse.jst.j2ee.jca/icons/full/ctool16/CreateResourceAdapter_outboundResourceAdapter_OutboundResourceAdapter.gif b/plugins/org.eclipse.jst.j2ee.jca/icons/full/ctool16/CreateResourceAdapter_outboundResourceAdapter_OutboundResourceAdapter.gif
deleted file mode 100644
index 204a12c..0000000
--- a/plugins/org.eclipse.jst.j2ee.jca/icons/full/ctool16/CreateResourceAdapter_outboundResourceAdapter_OutboundResourceAdapter.gif
+++ /dev/null
Binary files differ
diff --git a/plugins/org.eclipse.jst.j2ee.jca/icons/full/ctool16/CreateResourceAdapter_securityPermissions_SecurityPermission.gif b/plugins/org.eclipse.jst.j2ee.jca/icons/full/ctool16/CreateResourceAdapter_securityPermissions_SecurityPermission.gif
deleted file mode 100644
index ce94aff..0000000
--- a/plugins/org.eclipse.jst.j2ee.jca/icons/full/ctool16/CreateResourceAdapter_securityPermissions_SecurityPermission.gif
+++ /dev/null
Binary files differ
diff --git a/plugins/org.eclipse.jst.j2ee.jca/icons/full/ctool16/CreateSecurityPermission_descriptions_Description.gif b/plugins/org.eclipse.jst.j2ee.jca/icons/full/ctool16/CreateSecurityPermission_descriptions_Description.gif
deleted file mode 100644
index ba25bed..0000000
--- a/plugins/org.eclipse.jst.j2ee.jca/icons/full/ctool16/CreateSecurityPermission_descriptions_Description.gif
+++ /dev/null
Binary files differ
diff --git a/plugins/org.eclipse.jst.j2ee.jca/icons/full/ctool16/CreateSecurityPermission_descriptions_DescriptionType.gif b/plugins/org.eclipse.jst.j2ee.jca/icons/full/ctool16/CreateSecurityPermission_descriptions_DescriptionType.gif
deleted file mode 100644
index 7828f47..0000000
--- a/plugins/org.eclipse.jst.j2ee.jca/icons/full/ctool16/CreateSecurityPermission_descriptions_DescriptionType.gif
+++ /dev/null
Binary files differ
diff --git a/plugins/org.eclipse.jst.j2ee.jca/icons/full/obj16/ActivationSpec.gif b/plugins/org.eclipse.jst.j2ee.jca/icons/full/obj16/ActivationSpec.gif
deleted file mode 100644
index 739ebbf..0000000
--- a/plugins/org.eclipse.jst.j2ee.jca/icons/full/obj16/ActivationSpec.gif
+++ /dev/null
Binary files differ
diff --git a/plugins/org.eclipse.jst.j2ee.jca/icons/full/obj16/AdminObject.gif b/plugins/org.eclipse.jst.j2ee.jca/icons/full/obj16/AdminObject.gif
deleted file mode 100644
index b3643da..0000000
--- a/plugins/org.eclipse.jst.j2ee.jca/icons/full/obj16/AdminObject.gif
+++ /dev/null
Binary files differ
diff --git a/plugins/org.eclipse.jst.j2ee.jca/icons/full/obj16/AuthenticationMechanism.gif b/plugins/org.eclipse.jst.j2ee.jca/icons/full/obj16/AuthenticationMechanism.gif
deleted file mode 100644
index 106881e..0000000
--- a/plugins/org.eclipse.jst.j2ee.jca/icons/full/obj16/AuthenticationMechanism.gif
+++ /dev/null
Binary files differ
diff --git a/plugins/org.eclipse.jst.j2ee.jca/icons/full/obj16/ConfigProperty.gif b/plugins/org.eclipse.jst.j2ee.jca/icons/full/obj16/ConfigProperty.gif
deleted file mode 100644
index 48e3cf2..0000000
--- a/plugins/org.eclipse.jst.j2ee.jca/icons/full/obj16/ConfigProperty.gif
+++ /dev/null
Binary files differ
diff --git a/plugins/org.eclipse.jst.j2ee.jca/icons/full/obj16/ConnectionDefinition.gif b/plugins/org.eclipse.jst.j2ee.jca/icons/full/obj16/ConnectionDefinition.gif
deleted file mode 100644
index be22463..0000000
--- a/plugins/org.eclipse.jst.j2ee.jca/icons/full/obj16/ConnectionDefinition.gif
+++ /dev/null
Binary files differ
diff --git a/plugins/org.eclipse.jst.j2ee.jca/icons/full/obj16/Connector.gif b/plugins/org.eclipse.jst.j2ee.jca/icons/full/obj16/Connector.gif
deleted file mode 100644
index ed87474..0000000
--- a/plugins/org.eclipse.jst.j2ee.jca/icons/full/obj16/Connector.gif
+++ /dev/null
Binary files differ
diff --git a/plugins/org.eclipse.jst.j2ee.jca/icons/full/obj16/InboundResourceAdapter.gif b/plugins/org.eclipse.jst.j2ee.jca/icons/full/obj16/InboundResourceAdapter.gif
deleted file mode 100644
index 338fb8d..0000000
--- a/plugins/org.eclipse.jst.j2ee.jca/icons/full/obj16/InboundResourceAdapter.gif
+++ /dev/null
Binary files differ
diff --git a/plugins/org.eclipse.jst.j2ee.jca/icons/full/obj16/License.gif b/plugins/org.eclipse.jst.j2ee.jca/icons/full/obj16/License.gif
deleted file mode 100644
index c414fe9..0000000
--- a/plugins/org.eclipse.jst.j2ee.jca/icons/full/obj16/License.gif
+++ /dev/null
Binary files differ
diff --git a/plugins/org.eclipse.jst.j2ee.jca/icons/full/obj16/MessageAdapter.gif b/plugins/org.eclipse.jst.j2ee.jca/icons/full/obj16/MessageAdapter.gif
deleted file mode 100644
index 134551b..0000000
--- a/plugins/org.eclipse.jst.j2ee.jca/icons/full/obj16/MessageAdapter.gif
+++ /dev/null
Binary files differ
diff --git a/plugins/org.eclipse.jst.j2ee.jca/icons/full/obj16/MessageListener.gif b/plugins/org.eclipse.jst.j2ee.jca/icons/full/obj16/MessageListener.gif
deleted file mode 100644
index be22463..0000000
--- a/plugins/org.eclipse.jst.j2ee.jca/icons/full/obj16/MessageListener.gif
+++ /dev/null
Binary files differ
diff --git a/plugins/org.eclipse.jst.j2ee.jca/icons/full/obj16/OutboundResourceAdapter.gif b/plugins/org.eclipse.jst.j2ee.jca/icons/full/obj16/OutboundResourceAdapter.gif
deleted file mode 100644
index afb82ea..0000000
--- a/plugins/org.eclipse.jst.j2ee.jca/icons/full/obj16/OutboundResourceAdapter.gif
+++ /dev/null
Binary files differ
diff --git a/plugins/org.eclipse.jst.j2ee.jca/icons/full/obj16/RequiredConfigPropertyType.gif b/plugins/org.eclipse.jst.j2ee.jca/icons/full/obj16/RequiredConfigPropertyType.gif
deleted file mode 100644
index c414fe9..0000000
--- a/plugins/org.eclipse.jst.j2ee.jca/icons/full/obj16/RequiredConfigPropertyType.gif
+++ /dev/null
Binary files differ
diff --git a/plugins/org.eclipse.jst.j2ee.jca/icons/full/obj16/ResourceAdapter.gif b/plugins/org.eclipse.jst.j2ee.jca/icons/full/obj16/ResourceAdapter.gif
deleted file mode 100644
index 2124f3e..0000000
--- a/plugins/org.eclipse.jst.j2ee.jca/icons/full/obj16/ResourceAdapter.gif
+++ /dev/null
Binary files differ
diff --git a/plugins/org.eclipse.jst.j2ee.jca/icons/full/obj16/SecurityPermission.gif b/plugins/org.eclipse.jst.j2ee.jca/icons/full/obj16/SecurityPermission.gif
deleted file mode 100644
index 136e3b2..0000000
--- a/plugins/org.eclipse.jst.j2ee.jca/icons/full/obj16/SecurityPermission.gif
+++ /dev/null
Binary files differ
diff --git a/plugins/org.eclipse.jst.j2ee.jca/icons/full/obj16/connection_obj.gif b/plugins/org.eclipse.jst.j2ee.jca/icons/full/obj16/connection_obj.gif
deleted file mode 100644
index e8efe69..0000000
--- a/plugins/org.eclipse.jst.j2ee.jca/icons/full/obj16/connection_obj.gif
+++ /dev/null
Binary files differ
diff --git a/plugins/org.eclipse.jst.j2ee.jca/jca-validation/org/eclipse/jst/j2ee/internal/jca/validation/ConnectorHelper.java b/plugins/org.eclipse.jst.j2ee.jca/jca-validation/org/eclipse/jst/j2ee/internal/jca/validation/ConnectorHelper.java
deleted file mode 100644
index 65f54dc..0000000
--- a/plugins/org.eclipse.jst.j2ee.jca/jca-validation/org/eclipse/jst/j2ee/internal/jca/validation/ConnectorHelper.java
+++ /dev/null
@@ -1,93 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2003, 2006 IBM Corporation and others.
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
- *
- * Contributors:
- * IBM Corporation - initial API and implementation
- *******************************************************************************/
-/*
- * Created on Jan 22, 2004
- *
- * To change the template for this generated file go to Window - Preferences -
- * Java - Code Generation - Code and Comments
- */
-package org.eclipse.jst.j2ee.internal.jca.validation;
-
-import org.eclipse.core.resources.IFile;
-import org.eclipse.core.resources.IResource;
-import org.eclipse.emf.ecore.EObject;
-import org.eclipse.jem.util.logger.proxy.Logger;
-import org.eclipse.jst.j2ee.commonarchivecore.internal.RARFile;
-import org.eclipse.jst.j2ee.commonarchivecore.internal.exception.OpenFailureException;
-import org.eclipse.jst.j2ee.internal.validation.J2EEValidationHelper;
-import org.eclipse.jst.j2ee.jca.modulecore.util.ConnectorArtifactEdit;
-import org.eclipse.jst.j2ee.model.internal.validation.ConnectorMessageConstants;
-import org.eclipse.wst.common.componentcore.ArtifactEdit;
-import org.eclipse.wst.common.componentcore.ComponentCore;
-import org.eclipse.wst.common.componentcore.internal.util.ComponentUtilities;
-import org.eclipse.wst.common.componentcore.resources.IVirtualComponent;
-import org.eclipse.wst.validation.internal.operations.WorkbenchReporter;
-
-
-/**
- * @author vijayb
- *
- * To change the template for this generated type comment go to Window - Preferences - Java - Code
- * Generation - Code and Comments
- */
-public class ConnectorHelper extends J2EEValidationHelper {
- protected RARFile rarFile;
-
- /**
- *
- */
- public ConnectorHelper() {
- super();
- registerModel(ConnectorMessageConstants.CONNECTOR_MODEL_NAME, "loadRarFile"); //$NON-NLS-1$
- }
-
- /**
- * Get the Rar file for validation
- */
- public EObject loadRarFile() {
-
- IVirtualComponent comp = ComponentCore.createComponent(getProject());
- ArtifactEdit edit = ComponentUtilities.getArtifactEditForRead(comp);
-
- try {
- rarFile = (RARFile)((ConnectorArtifactEdit) edit).asArchive(false);
- return rarFile;
- } catch (OpenFailureException e1) {
- Logger.getLogger().log(e1);
- }finally {
- if (edit != null) {
- edit.dispose();
- }
- }
- return null;
- }
- /**
- * Given a resource, return its non-eclipse-specific location. If this resource, or type of
- * resource, isn't handled by this helper, return null.
- */
- @Override
- public String getPortableName(IResource resource) {
- if (!(resource instanceof IFile)) {
- return null;
- }
- return "rar.xml"; //$NON-NLS-1$
- }
- @Override
- public void cleanup(WorkbenchReporter reporter) {
- if(rarFile != null){
- rarFile.close();
- rarFile = null;
- }
-
- super.cleanup(reporter);
- }
-
-}
diff --git a/plugins/org.eclipse.jst.j2ee.jca/jca-validation/org/eclipse/jst/j2ee/internal/jca/validation/UIConnectorValidator.java b/plugins/org.eclipse.jst.j2ee.jca/jca-validation/org/eclipse/jst/j2ee/internal/jca/validation/UIConnectorValidator.java
deleted file mode 100644
index a7ed8b3..0000000
--- a/plugins/org.eclipse.jst.j2ee.jca/jca-validation/org/eclipse/jst/j2ee/internal/jca/validation/UIConnectorValidator.java
+++ /dev/null
@@ -1,95 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2003, 2006 IBM Corporation and others.
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
- *
- * Contributors:
- * IBM Corporation - initial API and implementation
- *******************************************************************************/
-/*
- * Created on Jan 22, 2004
- *
- * To change the template for this generated file go to
- * Window - Preferences - Java - Code Generation - Code and Comments
- */
-package org.eclipse.jst.j2ee.internal.jca.validation;
-
-import org.eclipse.core.resources.IProject;
-import org.eclipse.core.runtime.IStatus;
-import org.eclipse.jst.j2ee.internal.J2EEConstants;
-import org.eclipse.jst.j2ee.model.internal.validation.ConnectorValidator;
-import org.eclipse.jst.j2ee.project.JavaEEProjectUtilities;
-import org.eclipse.wst.common.componentcore.ComponentCore;
-import org.eclipse.wst.common.componentcore.resources.IVirtualComponent;
-import org.eclipse.wst.common.componentcore.resources.IVirtualFile;
-import org.eclipse.wst.common.frameworks.internal.plugin.WTPCommonPlugin;
-import org.eclipse.wst.validation.internal.core.Message;
-import org.eclipse.wst.validation.internal.core.ValidationException;
-import org.eclipse.wst.validation.internal.operations.IWorkbenchContext;
-import org.eclipse.wst.validation.internal.provisional.core.IMessage;
-import org.eclipse.wst.validation.internal.provisional.core.IReporter;
-import org.eclipse.wst.validation.internal.provisional.core.IValidationContext;
-
-
-/**
- * @author vijayb
- *
- * To change the template for this generated type comment go to Window - Preferences - Java - Code
- * Generation - Code and Comments
- */
-public class UIConnectorValidator extends ConnectorValidator {
- /**
- *
- */
- public UIConnectorValidator() {
- super();
- }
-
- /**
- * Does the validation.
- */
- @Override
- public IStatus validateInJob(IValidationContext helper, IReporter reporter) throws ValidationException{
-
- IProject proj = ((IWorkbenchContext) helper).getProject();
- IVirtualComponent wbModule = ComponentCore.createComponent(proj);
-
- if(JavaEEProjectUtilities.isJCAProject(proj)) {
- IVirtualFile rarDD = wbModule.getRootFolder().getFile(J2EEConstants.RAR_DD_URI);
- if( rarDD.exists()) {
- status = super.validateInJob(helper, reporter);
- }else{
- IMessage errorMsg = new Message(getBaseName(), IMessage.HIGH_SEVERITY, ERROR_INVALID_CONNECTOR_FILE);
- status = WTPCommonPlugin.createErrorStatus( errorMsg.getText( getClass().getClassLoader()));
- throw new ValidationException(errorMsg);
- }
- //validateJ2EE14DocType(helper, editModel);
- }
- return status;
- }
-
-
- /**
- * Checks if the nature is consistent with doc type.
- */
-// protected void validateJ2EE14DocType(ConnectorHelper helper, ConnectorEditModel editModel) {
-//
-// if (editModel.getConnectorNature().getJ2EEVersion() == J2EEVersionConstants.J2EE_1_4_ID && getConnectorDD().getVersionID() < J2EEVersionConstants.JCA_1_5_ID) {
-// String[] params = new String[3];
-// params[0] = DOCTYPE_1_4;
-// params[1] = helper.getProject().getName();
-// params[2] = DOCTYPE_1_3;
-// addError(getBaseName(), CONNECTOR_INVALID_DOC_TYPE_ERROR_, params);
-// } else if (editModel.getConnectorNature().getJ2EEVersion() == J2EEVersionConstants.J2EE_1_3_ID && getConnectorDD().getVersionID() != J2EEVersionConstants.JCA_1_0_ID) {
-// String[] params = new String[3];
-// params[0] = DOCTYPE_1_3;
-// params[1] = helper.getProject().getName();
-// params[2] = DOCTYPE_1_4;
-// addError(getBaseName(), CONNECTOR_INVALID_DOC_TYPE_ERROR_, params);
-// }// if
-// }// validateDocTypeVsNature
-
-
-}
diff --git a/plugins/org.eclipse.jst.j2ee.jca/jca/org/eclipse/jst/j2ee/internal/jca/project/facet/ConnectorFacetInstallDataModelProvider.java b/plugins/org.eclipse.jst.j2ee.jca/jca/org/eclipse/jst/j2ee/internal/jca/project/facet/ConnectorFacetInstallDataModelProvider.java
deleted file mode 100644
index f883537..0000000
--- a/plugins/org.eclipse.jst.j2ee.jca/jca/org/eclipse/jst/j2ee/internal/jca/project/facet/ConnectorFacetInstallDataModelProvider.java
+++ /dev/null
@@ -1,66 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2005, 2007 IBM Corporation and others.
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
- *
- * Contributors:
- * IBM Corporation - initial API and implementation
- *******************************************************************************/
-package org.eclipse.jst.j2ee.internal.jca.project.facet;
-
-import org.eclipse.core.runtime.IPath;
-import org.eclipse.core.runtime.Path;
-import org.eclipse.jst.j2ee.internal.J2EEVersionConstants;
-import org.eclipse.jst.j2ee.internal.common.J2EEVersionUtil;
-import org.eclipse.jst.j2ee.internal.plugin.IJ2EEModuleConstants;
-import org.eclipse.jst.j2ee.internal.plugin.J2EEPlugin;
-import org.eclipse.jst.j2ee.internal.plugin.J2EEPreferences;
-import org.eclipse.jst.j2ee.jca.project.facet.IConnectorFacetInstallDataModelProperties;
-import org.eclipse.jst.j2ee.project.facet.J2EEModuleFacetInstallDataModelProvider;
-import org.eclipse.wst.common.project.facet.core.IProjectFacetVersion;
-
-public class ConnectorFacetInstallDataModelProvider extends J2EEModuleFacetInstallDataModelProvider implements IConnectorFacetInstallDataModelProperties {
-
- @Override
- public Object getDefaultProperty(String propertyName) {
- if (propertyName.equals(FACET_ID)) {
- return JCA;
- } else if (propertyName.equals(CONFIG_FOLDER)) {
- return J2EEPlugin.getDefault().getJ2EEPreferences().getString(J2EEPreferences.Keys.JCA_CONTENT_FOLDER);
- } else if (propertyName.equals(MODULE_URI)) {
- String projectName = model.getStringProperty(FACET_PROJECT_NAME).replace(' ','_');
- return projectName + IJ2EEModuleConstants.RAR_EXT;
- } else if(propertyName.equals(GENERATE_DD)){
- String facetVersion = getStringProperty(FACET_VERSION_STR);
- if(J2EEVersionConstants.VERSION_1_6_TEXT.equals(facetVersion)) {
- return Boolean.valueOf(J2EEPlugin.getDefault().getJ2EEPreferences().getBoolean(J2EEPreferences.Keys.EE6_CONNECTOR_GENERATE_DD));
- }
- return Boolean.TRUE;
- }
- return super.getDefaultProperty(propertyName);
- }
-
- @Override
- protected int convertFacetVersionToJ2EEVersion(IProjectFacetVersion version) {
- return J2EEVersionUtil.convertConnectorVersionStringToJ2EEVersionID(version.getVersionString());
- }
-
- @Override
- public boolean propertySet(String propertyName, Object propertyValue) {
- if (propertyName.equals(CONFIG_FOLDER))
- {
- if( this.javaFacetInstallConfig != null )
- {
- final IPath sourceFolder
- = propertyValue == null ? null : new Path( (String) propertyValue );
-
- this.javaFacetInstallConfig.setSourceFolder( sourceFolder );
- }
- }
-
- return super.propertySet(propertyName, propertyValue);
- }
-
-}
diff --git a/plugins/org.eclipse.jst.j2ee.jca/jca/org/eclipse/jst/j2ee/jca/internal/plugin/JCAResourceHandler.java b/plugins/org.eclipse.jst.j2ee.jca/jca/org/eclipse/jst/j2ee/jca/internal/plugin/JCAResourceHandler.java
deleted file mode 100644
index 98429cf..0000000
--- a/plugins/org.eclipse.jst.j2ee.jca/jca/org/eclipse/jst/j2ee/jca/internal/plugin/JCAResourceHandler.java
+++ /dev/null
@@ -1,39 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2000, 2005 IBM Corporation and others.
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
- *
- * Contributors:
- * IBM Corporation - initial API and implementation
- *******************************************************************************/
-package org.eclipse.jst.j2ee.jca.internal.plugin;
-
-import org.eclipse.osgi.util.NLS;
-
-public final class JCAResourceHandler extends NLS {
-
- private static final String BUNDLE_NAME = "rar";//$NON-NLS-1$
-
- private JCAResourceHandler() {
- // Do not instantiate
- }
-
- public static String LicenseItemProvider_UI_0;
- public static String SecurityPermissionItemProvider_UI_0;
- public static String ConfigPropertyItemProvider_UI_0;
- public static String _UI_ResourceAdapter_type;
- public static String _UI_OutboundResourceAdapter_type;
- public static String _UI_ConnectionDefinition_type;
- public static String _UI_InboundResourceAdapter_type;
- public static String _UI_MessageAdapter_type;
- public static String _UI_MessageListener_type;
- public static String _UI_ActivationSpec_type;
- public static String _UI_RequiredConfigPropertyType_type;
- public static String _UI_AdminObject_type;
-
- static {
- NLS.initializeMessages(BUNDLE_NAME, JCAResourceHandler.class);
- }
-}
\ No newline at end of file
diff --git a/plugins/org.eclipse.jst.j2ee.jca/jca/org/eclipse/jst/j2ee/jca/internal/plugin/JcaModuleExtensionImpl.java b/plugins/org.eclipse.jst.j2ee.jca/jca/org/eclipse/jst/j2ee/jca/internal/plugin/JcaModuleExtensionImpl.java
deleted file mode 100644
index 27df270..0000000
--- a/plugins/org.eclipse.jst.j2ee.jca/jca/org/eclipse/jst/j2ee/jca/internal/plugin/JcaModuleExtensionImpl.java
+++ /dev/null
@@ -1,75 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2003, 2005 IBM Corporation and others.
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
- *
- * Contributors:
- * IBM Corporation - initial API and implementation
- *******************************************************************************/
-/*
- * Created on Sep 29, 2003
- *
- * To change the template for this generated file go to Window>Preferences>Java>Code
- * Generation>Code and Comments
- */
-package org.eclipse.jst.j2ee.jca.internal.plugin;
-
-
-import org.eclipse.jst.j2ee.internal.jca.operations.ConnectorComponentImportDataModelProvider;
-import org.eclipse.jst.j2ee.internal.moduleextension.EarModuleExtensionImpl;
-import org.eclipse.jst.j2ee.internal.moduleextension.JcaModuleExtension;
-import org.eclipse.jst.j2ee.jca.project.facet.ConnectorFacetProjectCreationDataModelProvider;
-import org.eclipse.wst.common.frameworks.datamodel.DataModelFactory;
-import org.eclipse.wst.common.frameworks.datamodel.IDataModel;
-
-
-public class JcaModuleExtensionImpl extends EarModuleExtensionImpl implements JcaModuleExtension {
-
- /**
- *
- */
- public JcaModuleExtensionImpl() {
- super();
- }
-
-
-
- /*
- * (non-Javadoc)
- *
- * @see org.eclipse.jst.j2ee.internal.internal.moduleextension.JcaModuleExtension#createProjectInfo()
- */
- // public J2EEJavaProjectInfo createProjectInfo() {
- // return new ConnectorProjectInfo();
- // }
- /*
- * (non-Javadoc)
- *
- * @see org.eclipse.jst.j2ee.internal.internal.moduleextension.JcaModuleExtension#createImportOperation(org.eclipse.core.resources.IProject,
- * org.eclipse.jst.j2ee.internal.internal.commonarchivecore.RARFile)
- */
- // public J2EEImportOperation createImportOperation(IProject proj, RARFile rarFile){
- // return new RARImportOperation(proj, rarFile);
- // }
-
-
- /*
- * (non-Javadoc)
- *
- * @see org.eclipse.jst.j2ee.internal.internal.moduleextension.EarModuleExtension#createProjectDataModel()
- */
- public IDataModel createProjectDataModel() {
- return DataModelFactory.createDataModel(new ConnectorFacetProjectCreationDataModelProvider());
- }
-
- /*
- * (non-Javadoc)
- *
- * @see org.eclipse.jst.j2ee.internal.internal.moduleextension.EarModuleExtension#createImportDataModel()
- */
- public IDataModel createImportDataModel() {
- return DataModelFactory.createDataModel(new ConnectorComponentImportDataModelProvider());
- }
-}
diff --git a/plugins/org.eclipse.jst.j2ee.jca/jca/org/eclipse/jst/j2ee/jca/internal/plugin/JcaPlugin.java b/plugins/org.eclipse.jst.j2ee.jca/jca/org/eclipse/jst/j2ee/jca/internal/plugin/JcaPlugin.java
deleted file mode 100644
index 94d3eda..0000000
--- a/plugins/org.eclipse.jst.j2ee.jca/jca/org/eclipse/jst/j2ee/jca/internal/plugin/JcaPlugin.java
+++ /dev/null
@@ -1,183 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2003, 2007 IBM Corporation and others.
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
- *
- * Contributors:
- * IBM Corporation - initial API and implementation
- *******************************************************************************/
-package org.eclipse.jst.j2ee.jca.internal.plugin;
-
-
-import java.io.IOException;
-import java.net.URL;
-import java.text.MessageFormat;
-
-import org.eclipse.core.runtime.IPath;
-import org.eclipse.core.runtime.Path;
-import org.eclipse.core.runtime.Platform;
-import org.eclipse.emf.common.util.ResourceLocator;
-import org.eclipse.jst.j2ee.internal.plugin.J2EEPlugin;
-import org.eclipse.jst.j2ee.jca.internal.impl.ConnectorResourceFactory;
-import org.eclipse.wst.common.componentcore.internal.impl.WTPResourceFactoryRegistry;
-import org.eclipse.wst.common.frameworks.internal.WTPPlugin;
-import org.osgi.framework.Bundle;
-import org.osgi.framework.BundleContext;
-import org.eclipse.core.runtime.Status;
-import org.eclipse.core.runtime.IStatus;
-import java.lang.Throwable;
-import org.eclipse.core.runtime.CoreException;
-import org.eclipse.core.runtime.MultiStatus;
-
-
-/**
- * This is a top-level class of the j2ee plugin.
- *
- * @see AbstractUIPlugin for additional information on UI plugins
- */
-
-public class JcaPlugin extends WTPPlugin implements ResourceLocator {
- // Default instance of the receiver
- private static JcaPlugin inst;
- protected final IPath iconsFolder = new Path(Platform.getBundle(PLUGIN_ID).getEntry("icons").getPath()); //$NON-NLS-1$
-
- public static final String PLUGIN_ID = "org.eclipse.jst.j2ee.jca"; //$NON-NLS-1$
- // Validation part of the plugin
- //Global ResourceSet (somewhat global)
-
- public static final String[] ICON_DIRS = new String[]{"icons/full/obj16", //$NON-NLS-1$
- "icons/full/cview16", //$NON-NLS-1$
- "icons/full/ctool16", //$NON-NLS-1$
- "icons/full/clcl16", //$NON-NLS-1$
- "icons/full/ovr16", //$NON-NLS-1$
- "icons/full/extra", //$NON-NLS-1$
- "icons/full/wizban", //$NON-NLS-1$
- "icons", //$NON-NLS-1$
- ""}; //$NON-NLS-1$
-
- /**
- * Create the J2EE plugin and cache its default instance
- */
- public JcaPlugin() {
- super();
- if (inst == null)
- inst = this;
- }
-
-
- /**
- * Get the plugin singleton.
- */
- static public JcaPlugin getDefault() {
- return inst;
- }
-
- /*
- * Javadoc copied from interface.
- */
- public URL getBaseURL() {
- return getBundle().getEntry("/"); //$NON-NLS-1$
- }
-
- /**
- * This gets a .gif from the icons folder.
- */
- public Object getImage(String key) {
- return J2EEPlugin.getImageURL(key, getBundle());
- }
-
-
- public static URL getInstallURL() {
- return getDefault().getBundle().getEntry("/"); //$NON-NLS-1$
- }
-
- /**
- * Get the singleton instance.
- */
- public static JcaPlugin getPlugin() {
- return inst;
- }
-
- /**
- * Return the plugin directory location- the directory that all the plugins are located in (i.e.
- * d:\installdir\plugin)
- */
- public static IPath getPluginLocation(String pluginId) {
-// IExtensionRegistry registry = Platform.getExtensionRegistry();
- Bundle bundle = Platform.getBundle(pluginId);
- if (bundle != null) {
- try {
- IPath installPath = new Path(bundle.getEntry("/").toExternalForm()).removeTrailingSeparator(); //$NON-NLS-1$
- String installStr = Platform.asLocalURL(new URL(installPath.toString())).getFile();
- return new Path(installStr);
- } catch (IOException e) {
- //Ignore
- }
- }
- return null;
- }
-
- /*
- * Javadoc copied from interface.
- */
- public String getString(String key) {
- return Platform.getResourceString(getBundle(), key);
- }
-
- /*
- * Javadoc copied from interface.
- */
- public String getString(String key, Object[] substitutions) {
- return MessageFormat.format(getString(key), substitutions);
- }
-
-
- /*
- * (non-Javadoc)
- *
- * @see org.eclipse.wst.common.frameworks.internal.WTPPlugin#getPluginID()
- */
- @Override
- public String getPluginID() {
- return PLUGIN_ID;
- }
-
- @Override
- public void start(BundleContext context) throws Exception {
- super.start(context);
- ConnectorResourceFactory.register(WTPResourceFactoryRegistry.INSTANCE);
- }
- public String getString(String key, boolean translate) {
- // TODO For now... translate not supported
- return getString(key);
- }
-
- public String getString(String key, Object[] substitutions, boolean translate) {
- // TODO For now... translate not supported
- return getString(key,substitutions);
- }
-
-
- public static IStatus createStatus(int severity, String message, Throwable exception) {
- return new Status(severity, PLUGIN_ID, message, exception);
- }
-
-
- public static IStatus createStatus(int severity, String message) {
- return createStatus(severity, message, null);
- }
-
-
- public static void logError(String message, Throwable exception) {
- Platform.getLog(Platform.getBundle(PLUGIN_ID)).log( createStatus(IStatus.ERROR, message, exception));
- }
-
-
- public static void logError(String message, CoreException exception) {
- MultiStatus status = new MultiStatus(PLUGIN_ID,IStatus.ERROR,new IStatus[]{exception.getStatus()},message,exception);
- Platform.getLog(Platform.getBundle(PLUGIN_ID)).log( status );
- }
-
-}
diff --git a/plugins/org.eclipse.jst.j2ee.jca/jca/org/eclipse/jst/j2ee/jca/project/facet/ConnectorFacetInstallDataModelProvider.java b/plugins/org.eclipse.jst.j2ee.jca/jca/org/eclipse/jst/j2ee/jca/project/facet/ConnectorFacetInstallDataModelProvider.java
deleted file mode 100644
index 2352b15..0000000
--- a/plugins/org.eclipse.jst.j2ee.jca/jca/org/eclipse/jst/j2ee/jca/project/facet/ConnectorFacetInstallDataModelProvider.java
+++ /dev/null
@@ -1,25 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2005, 2007 IBM Corporation and others.
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
- *
- * Contributors:
- * IBM Corporation - initial API and implementation
- *******************************************************************************/
-package org.eclipse.jst.j2ee.jca.project.facet;
-
-/**
- * This class was not intended to be public API. Please use {@link org.eclipse.jst.j2ee.jca.project.facet.IConnectorFacetInstallDataModelProperties}
- *
- * @deprecated
- * @see org.eclipse.jst.j2ee.internal.jca.project.facet.ConnectorFacetInstallDataModelProvider
- */
-public class ConnectorFacetInstallDataModelProvider extends org.eclipse.jst.j2ee.internal.jca.project.facet.ConnectorFacetInstallDataModelProvider {
- public ConnectorFacetInstallDataModelProvider()
- {
- super();
- }
-
-}
diff --git a/plugins/org.eclipse.jst.j2ee.jca/jca/org/eclipse/jst/j2ee/jca/project/facet/ConnectorFacetInstallDelegate.java b/plugins/org.eclipse.jst.j2ee.jca/jca/org/eclipse/jst/j2ee/jca/project/facet/ConnectorFacetInstallDelegate.java
deleted file mode 100644
index 3c1a1a6..0000000
--- a/plugins/org.eclipse.jst.j2ee.jca/jca/org/eclipse/jst/j2ee/jca/project/facet/ConnectorFacetInstallDelegate.java
+++ /dev/null
@@ -1,252 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2005, 2009 IBM Corporation and others.
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
- *
- * Contributors:
- * IBM Corporation - initial API and implementation
- *******************************************************************************/
-package org.eclipse.jst.j2ee.jca.project.facet;
-
-import java.io.IOException;
-import java.io.InputStream;
-import java.io.OutputStream;
-import java.lang.reflect.InvocationTargetException;
-
-import org.eclipse.core.commands.ExecutionException;
-import org.eclipse.core.resources.IFile;
-import org.eclipse.core.resources.IFolder;
-import org.eclipse.core.resources.IProject;
-import org.eclipse.core.resources.IResource;
-import org.eclipse.core.resources.IWorkspace;
-import org.eclipse.core.resources.ResourcesPlugin;
-import org.eclipse.core.runtime.CoreException;
-import org.eclipse.core.runtime.IPath;
-import org.eclipse.core.runtime.IProgressMonitor;
-import org.eclipse.core.runtime.Path;
-import org.eclipse.core.runtime.SubProgressMonitor;
-import org.eclipse.jdt.core.IClasspathEntry;
-import org.eclipse.jdt.core.IJavaProject;
-import org.eclipse.jdt.core.JavaCore;
-import org.eclipse.jem.util.emf.workbench.WorkbenchByteArrayOutputStream;
-import org.eclipse.jem.util.logger.proxy.Logger;
-import org.eclipse.jst.common.project.facet.WtpUtils;
-import org.eclipse.jst.common.project.facet.core.ClasspathHelper;
-import org.eclipse.jst.j2ee.commonarchivecore.internal.util.ArchiveUtil;
-import org.eclipse.jst.j2ee.internal.J2EEConstants;
-import org.eclipse.jst.j2ee.internal.J2EEVersionConstants;
-import org.eclipse.jst.j2ee.internal.common.J2EEVersionUtil;
-import org.eclipse.jst.j2ee.internal.common.classpath.J2EEComponentClasspathContainer;
-import org.eclipse.jst.j2ee.internal.plugin.J2EEPlugin;
-import org.eclipse.jst.j2ee.jca.modulecore.util.ConnectorArtifactEdit;
-import org.eclipse.jst.j2ee.model.IModelProvider;
-import org.eclipse.jst.j2ee.model.ModelProviderManager;
-import org.eclipse.jst.j2ee.project.facet.IJ2EEFacetConstants;
-import org.eclipse.jst.j2ee.project.facet.IJ2EEFacetInstallDataModelProperties;
-import org.eclipse.jst.j2ee.project.facet.IJ2EEModuleFacetInstallDataModelProperties;
-import org.eclipse.jst.j2ee.project.facet.J2EEFacetInstallDelegate;
-import org.eclipse.jst.javaee.core.DisplayName;
-import org.eclipse.jst.javaee.core.JavaeeFactory;
-import org.eclipse.jst.javaee.jca.Connector;
-import org.eclipse.wst.common.componentcore.ComponentCore;
-import org.eclipse.wst.common.componentcore.datamodel.FacetDataModelProvider;
-import org.eclipse.wst.common.componentcore.datamodel.properties.IFacetDataModelProperties;
-import org.eclipse.wst.common.componentcore.resources.IVirtualComponent;
-import org.eclipse.wst.common.componentcore.resources.IVirtualFile;
-import org.eclipse.wst.common.componentcore.resources.IVirtualFolder;
-import org.eclipse.wst.common.frameworks.datamodel.IDataModel;
-import org.eclipse.wst.common.frameworks.datamodel.IDataModelOperation;
-import org.eclipse.wst.common.project.facet.core.IDelegate;
-import org.eclipse.wst.common.project.facet.core.IProjectFacetVersion;
-
-public class ConnectorFacetInstallDelegate extends J2EEFacetInstallDelegate implements IDelegate {
-
- public static final String CONNECTOR_XML_TEMPLATE_10 = "rartp10.xml"; //$NON-NLS-1$
- public static final String CONNECTOR_XML_TEMPLATE_15 = "rartp15.xml"; //$NON-NLS-1$
- public static final String CONNECTOR_XML_TEMPLATE_16 = "rartp16.xml"; //$NON-NLS-1$
-
- public void execute(IProject project, IProjectFacetVersion fv, Object config, IProgressMonitor monitor) throws CoreException {
- if (monitor != null) {
- monitor.beginTask("", 1); //$NON-NLS-1$
- }
-
- try {
- IDataModel model = (IDataModel) config;
-
- final IJavaProject jproj = JavaCore.create(project);
-
- // Add WTP natures.
-
- WtpUtils.addNatures(project);
-
- // Create the directory structure.
-
- final IWorkspace ws = ResourcesPlugin.getWorkspace();
- final IPath pjpath = project.getFullPath();
-
- // Setup the flexible project structure.
-
- final IVirtualComponent c = ComponentCore.createComponent(project, false);
-
- c.create(0, null);
- setOutputFolder(model, c);
-
- final IVirtualFolder root = c.getRootFolder();
- IFolder sourceFolder = null;
- String configFolder = null;
- configFolder = model.getStringProperty(IJ2EEModuleFacetInstallDataModelProperties.CONFIG_FOLDER);
- root.createLink(new Path("/" + configFolder), 0, null); //$NON-NLS-1$
- String configFolderName = model.getStringProperty(IJ2EEModuleFacetInstallDataModelProperties.CONFIG_FOLDER);
- IPath configFolderpath = pjpath.append(configFolderName);
- sourceFolder = ws.getRoot().getFolder(configFolderpath);
-
- if( fv == IJ2EEFacetConstants.JCA_16)
- {
- if(model.getBooleanProperty(IJ2EEFacetInstallDataModelProperties.GENERATE_DD)){
- // Create the deployment descriptor (ra.xml) if one doesn't exist
- IFile rarFile = sourceFolder.getFile(new Path(J2EEConstants.RAR_DD_URI));
- if (!rarFile.exists()) {
- try {
- if(!rarFile.getParent().exists()
- && (rarFile.getParent().getType() == IResource.FOLDER)){
- ((IFolder)rarFile.getParent()).create(true, true, monitor);
- }
- InputStream in = getClass().getResourceAsStream(CONNECTOR_XML_TEMPLATE_16);
- rarFile.create(in, true, monitor);
- populateDefaultContent(project, fv);
- } catch (CoreException e) {
- J2EEPlugin.logError(e);
- }
- }
- }
- }
- else if (!sourceFolder.getFile(J2EEConstants.RAR_DD_URI).exists()) {
- String ver = model.getStringProperty(IFacetDataModelProperties.FACET_VERSION_STR);
- int nVer = J2EEVersionUtil.convertVersionStringToInt(ver);
-
- IFile aFile = sourceFolder.getFile(new Path(J2EEConstants.RAR_DD_URI));
- OutputStream out = new WorkbenchByteArrayOutputStream(aFile);
-
- String template = null;
- if(nVer == J2EEVersionConstants.JCA_1_0_ID) {
- template = CONNECTOR_XML_TEMPLATE_10;
- }
- else if (nVer == J2EEVersionConstants.JCA_1_5_ID) {
- template = CONNECTOR_XML_TEMPLATE_15;
- }
-// JCA 1.6 handled separately
-// else {
-// template = CONNECTOR_XML_TEMPLATE_16;
-// }
-
- InputStream in = getClass().getResourceAsStream(template);
- if (in != null) {
- try {
- ArchiveUtil.copy(in, out);
- } catch (IOException ioe) {
- Logger.getLogger().logError(ioe);
- } finally{
- try{
- out.close();
- }catch (IOException ioe) {
- Logger.getLogger().logError(ioe);
- } finally{
- try{
- in.close();
- }catch (IOException ioe) {
- Logger.getLogger().logError(ioe);
- }
- }
- }
-
- ConnectorArtifactEdit edit = null;
- try{
- edit = new ConnectorArtifactEdit(project, false, true);
- org.eclipse.jst.j2ee.jca.Connector connector = edit.getConnector();
- connector.setDisplayName(project.getName());
- // TODO: investigate setting the version and the impact on adopters
- //connector.setVersion(ver);
- edit.saveIfNecessary(new SubProgressMonitor(monitor,1));
- }finally{
- if( edit != null ){
- edit.dispose();
- }
- }
- } else {
- //without a template
- ConnectorArtifactEdit.createDeploymentDescriptor(project, nVer);
- } // if
- }
-
- // add source folder maps
- final IClasspathEntry[] cp = jproj.getRawClasspath();
- for (int i = 0; i < cp.length; i++) {
- final IClasspathEntry cpe = cp[i];
- if (cpe.getEntryKind() == IClasspathEntry.CPE_SOURCE) {
- root.createLink(cpe.getPath().removeFirstSegments(1), 0, null);
- }
- }
-
- IVirtualFile vf = c.getRootFolder().getFile(new Path(J2EEConstants.MANIFEST_URI));
- IFile manifestmf = vf.getUnderlyingFile();
- if (manifestmf == null || !manifestmf.exists()) {
- try {
- createManifest(project, c.getRootFolder().getUnderlyingFolder(), monitor);
- } catch (InvocationTargetException e) {
- Logger.getLogger().logError(e);
- } catch (InterruptedException e) {
- Logger.getLogger().logError(e);
- }
- }
-
- // Setup the classpath.
- ClasspathHelper.removeClasspathEntries(project, fv);
-
- if (!ClasspathHelper.addClasspathEntries(project, fv)) {
- // TODO: Support the no runtime case.
- // ClasspathHelper.addClasspathEntries( project, fv, <something> );
- }
-
- if( model.getBooleanProperty(IJ2EEModuleFacetInstallDataModelProperties.INSTALL_EAR_LIBRARY)){
- final IPath earLibContainer = new Path(J2EEComponentClasspathContainer.CONTAINER_ID);
- addToClasspath(jproj, JavaCore.newContainerEntry(earLibContainer));
- }
-
- try {
- ((IDataModelOperation) model.getProperty(FacetDataModelProvider.NOTIFICATION_OPERATION)).execute(monitor, null);
- } catch (ExecutionException e) {
- Logger.getLogger().logError(e);
- }
-
- if (monitor != null) {
- monitor.worked(1);
- }
- }
-
- finally {
- if (monitor != null) {
- monitor.done();
- }
- }
-
- }
-
- private void populateDefaultContent(final IProject project,
- final IProjectFacetVersion fv) {
- final IModelProvider provider = ModelProviderManager.getModelProvider(project, fv);
- Runnable runnable = new Runnable(){
-
- public void run() {
- Connector connector = (Connector) provider.getModelObject();
-
- // Add the display-name tag
- DisplayName displayName = JavaeeFactory.eINSTANCE.createDisplayName();
- displayName.setValue(project.getName());
- connector.getDisplayNames().add(displayName);
- }
- };
- provider.modify(runnable, null);
- }
-}
diff --git a/plugins/org.eclipse.jst.j2ee.jca/jca/org/eclipse/jst/j2ee/jca/project/facet/ConnectorFacetPostInstallDelegate.java b/plugins/org.eclipse.jst.j2ee.jca/jca/org/eclipse/jst/j2ee/jca/project/facet/ConnectorFacetPostInstallDelegate.java
deleted file mode 100644
index 06619cf..0000000
--- a/plugins/org.eclipse.jst.j2ee.jca/jca/org/eclipse/jst/j2ee/jca/project/facet/ConnectorFacetPostInstallDelegate.java
+++ /dev/null
@@ -1,79 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2005, 2007 IBM Corporation and others.
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
- *
- * Contributors:
- * IBM Corporation - initial API and implementation
- *******************************************************************************/
-package org.eclipse.jst.j2ee.jca.project.facet;
-
-import static org.eclipse.wst.common.componentcore.datamodel.properties.IFacetDataModelProperties.FACETED_PROJECT_WORKING_COPY;
-
-import org.eclipse.core.resources.IProject;
-import org.eclipse.core.runtime.CoreException;
-import org.eclipse.core.runtime.IProgressMonitor;
-import org.eclipse.jst.j2ee.internal.common.J2EEVersionUtil;
-import org.eclipse.jst.j2ee.project.facet.IJ2EEModuleFacetInstallDataModelProperties;
-import org.eclipse.jst.j2ee.project.facet.J2EEFacetInstallDelegate;
-import org.eclipse.wst.common.frameworks.datamodel.IDataModel;
-import org.eclipse.wst.common.project.facet.core.IDelegate;
-import org.eclipse.wst.common.project.facet.core.IFacetedProjectWorkingCopy;
-import org.eclipse.wst.common.project.facet.core.IProjectFacetVersion;
-
-public class ConnectorFacetPostInstallDelegate extends J2EEFacetInstallDelegate implements IDelegate {
-
- public static final String CONNECTOR_XML_TEMPLATE_10 = "rartp10.xml"; //$NON-NLS-1$
- public static final String CONNECTOR_XML_TEMPLATE_15 = "rartp15.xml"; //$NON-NLS-1$
- public static final String CONNECTOR_XML_TEMPLATE_16 = "rartp16.xml"; //$NON-NLS-1$
-
- public void execute(IProject project, IProjectFacetVersion fv, Object config, IProgressMonitor monitor) throws CoreException {
- if (monitor != null) {
- monitor.beginTask("", 1); //$NON-NLS-1$
- }
-
- try {
- IDataModel model = (IDataModel) config;
-
- // Associate with an EAR, if necessary.
-
- final String earProjectName = (String) model.getProperty(IJ2EEModuleFacetInstallDataModelProperties.EAR_PROJECT_NAME);
- if (model.getBooleanProperty(IJ2EEModuleFacetInstallDataModelProperties.ADD_TO_EAR)) {
- if (earProjectName != null && !earProjectName.equals("")) { //$NON-NLS-1$
-
- String ver = fv.getVersionString();
- String j2eeVersionText = J2EEVersionUtil.convertVersionIntToString
- (J2EEVersionUtil.convertConnectorVersionStringToJ2EEVersionID(ver));
-
- final String moduleURI = model.getStringProperty(IJ2EEModuleFacetInstallDataModelProperties.MODULE_URI);
-
- final IFacetedProjectWorkingCopy fpjwc
- = (IFacetedProjectWorkingCopy) model.getProperty( FACETED_PROJECT_WORKING_COPY );
-
- installAndAddModuletoEAR( j2eeVersionText,
- earProjectName,
- fpjwc.getPrimaryRuntime(),
- project,
- moduleURI,
- monitor );
-
-
- }
- }
-
- if (monitor != null) {
- monitor.worked(1);
- }
- }
-
- finally {
- if (monitor != null) {
- monitor.done();
- }
- }
-
- }
-
-}
diff --git a/plugins/org.eclipse.jst.j2ee.jca/jca/org/eclipse/jst/j2ee/jca/project/facet/ConnectorFacetProjectCreationDataModelProvider.java b/plugins/org.eclipse.jst.j2ee.jca/jca/org/eclipse/jst/j2ee/jca/project/facet/ConnectorFacetProjectCreationDataModelProvider.java
deleted file mode 100644
index bd3a226..0000000
--- a/plugins/org.eclipse.jst.j2ee.jca/jca/org/eclipse/jst/j2ee/jca/project/facet/ConnectorFacetProjectCreationDataModelProvider.java
+++ /dev/null
@@ -1,74 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2005, 2007 IBM Corporation and others.
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
- *
- * Contributors:
- * IBM Corporation - initial API and implementation
- *******************************************************************************/
-package org.eclipse.jst.j2ee.jca.project.facet;
-
-import java.util.ArrayList;
-import java.util.Collection;
-
-import org.eclipse.jst.common.project.facet.IJavaFacetInstallDataModelProperties;
-import org.eclipse.jst.common.project.facet.JavaFacetUtils;
-import org.eclipse.jst.j2ee.internal.plugin.J2EEPlugin;
-import org.eclipse.jst.j2ee.internal.plugin.J2EEPreferences.Keys;
-import org.eclipse.jst.j2ee.project.facet.IJ2EEFacetConstants;
-import org.eclipse.jst.j2ee.project.facet.IJ2EEModuleFacetInstallDataModelProperties;
-import org.eclipse.jst.j2ee.project.facet.J2EEFacetProjectCreationDataModelProvider;
-import org.eclipse.wst.common.frameworks.datamodel.DataModelEvent;
-import org.eclipse.wst.common.frameworks.datamodel.IDataModel;
-import org.eclipse.wst.common.frameworks.datamodel.IDataModelListener;
-import org.eclipse.wst.common.project.facet.core.IProjectFacet;
-
-public class ConnectorFacetProjectCreationDataModelProvider extends J2EEFacetProjectCreationDataModelProvider {
-
- public ConnectorFacetProjectCreationDataModelProvider() {
- super();
- }
-
- @Override
- public void init() {
- super.init();
-
- Collection<IProjectFacet> requiredFacets = new ArrayList<IProjectFacet>();
- requiredFacets.add(JavaFacetUtils.JAVA_FACET);
- requiredFacets.add(IJ2EEFacetConstants.JCA_FACET);
- setProperty(REQUIRED_FACETS_COLLECTION, requiredFacets);
-
- FacetDataModelMap map = (FacetDataModelMap) getProperty(FACET_DM_MAP);
- IDataModel javaFacet = map.getFacetDataModel(JavaFacetUtils.JAVA_FACET.getId());
- IDataModel jcaFacet = map.getFacetDataModel(IJ2EEFacetConstants.JCA_FACET.getId());
- String jcaRoot = jcaFacet.getStringProperty(IConnectorFacetInstallDataModelProperties.CONFIG_FOLDER);
- javaFacet.setProperty(IJavaFacetInstallDataModelProperties.SOURCE_FOLDER_NAME, jcaRoot);
- javaFacet.setProperty(IJavaFacetInstallDataModelProperties.DEFAULT_OUTPUT_FOLDER_NAME,
- J2EEPlugin.getDefault().getJ2EEPreferences().getString(Keys.JCA_OUTPUT_FOLDER) );
-
- jcaFacet.addListener(new IDataModelListener() {
- public void propertyChanged(DataModelEvent event) {
- if (IJ2EEModuleFacetInstallDataModelProperties.EAR_PROJECT_NAME.equals(event.getPropertyName())) {
- if (isPropertySet(EAR_PROJECT_NAME))
- setProperty(EAR_PROJECT_NAME, event.getProperty());
- else
- model.notifyPropertyChange(EAR_PROJECT_NAME, IDataModel.DEFAULT_CHG);
- }else if (IJ2EEModuleFacetInstallDataModelProperties.ADD_TO_EAR.equals(event.getPropertyName())) {
- setProperty(ADD_TO_EAR, event.getProperty());
- }
- }
- });
- }
-
- @Override
- public boolean propertySet(String propertyName, Object propertyValue) {
- if( propertyName.equals( MODULE_URI )){
- FacetDataModelMap map = (FacetDataModelMap) getProperty(FACET_DM_MAP);
- IDataModel rarFacet = map.getFacetDataModel( IJ2EEFacetConstants.JCA );
- rarFacet.setProperty( IJ2EEModuleFacetInstallDataModelProperties.MODULE_URI, propertyValue );
- }
- return super.propertySet(propertyName, propertyValue);
- }
-}
diff --git a/plugins/org.eclipse.jst.j2ee.jca/jca/org/eclipse/jst/j2ee/jca/project/facet/IConnectorFacetInstallDataModelProperties.java b/plugins/org.eclipse.jst.j2ee.jca/jca/org/eclipse/jst/j2ee/jca/project/facet/IConnectorFacetInstallDataModelProperties.java
deleted file mode 100644
index c201407..0000000
--- a/plugins/org.eclipse.jst.j2ee.jca/jca/org/eclipse/jst/j2ee/jca/project/facet/IConnectorFacetInstallDataModelProperties.java
+++ /dev/null
@@ -1,22 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2005, 2007 IBM Corporation and others.
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
- *
- * Contributors:
- * IBM Corporation - initial API and implementation
- *******************************************************************************/
-package org.eclipse.jst.j2ee.jca.project.facet;
-
-import org.eclipse.jst.j2ee.project.facet.IJ2EEModuleFacetInstallDataModelProperties;
-
-public interface IConnectorFacetInstallDataModelProperties
- extends IJ2EEModuleFacetInstallDataModelProperties{
-
- /**
- * This field should not be used. It is not part of the API and may be modified in the future.
- */
- public static Class _provider_class = ConnectorFacetProjectCreationDataModelProvider.class;
-}
diff --git a/plugins/org.eclipse.jst.j2ee.jca/jca/org/eclipse/jst/j2ee/jca/project/facet/rartp10.xml b/plugins/org.eclipse.jst.j2ee.jca/jca/org/eclipse/jst/j2ee/jca/project/facet/rartp10.xml
deleted file mode 100644
index 6d5bc9c..0000000
--- a/plugins/org.eclipse.jst.j2ee.jca/jca/org/eclipse/jst/j2ee/jca/project/facet/rartp10.xml
+++ /dev/null
@@ -1,39 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE connector PUBLIC "-//Sun Microsystems, Inc.//DTD Connector 1.0//EN" "http://java.sun.com/dtd/connector_1_0.dtd">
-<connector>
- <display-name></display-name>
- <description></description>
- <vendor-name></vendor-name>
- <spec-version></spec-version>
- <eis-type></eis-type>
- <version></version>
- <license>
- <description></description>
- <license-required>false</license-required>
- </license>
- <resourceadapter>
- <managedconnectionfactory-class></managedconnectionfactory-class>
- <connectionfactory-interface></connectionfactory-interface>
- <connectionfactory-impl-class></connectionfactory-impl-class>
- <connection-interface></connection-interface>
- <connection-impl-class></connection-impl-class>
- <transaction-support></transaction-support>
- <config-property>
- <description></description>
- <config-property-name></config-property-name>
- <config-property-type></config-property-type>
- <config-property-value></config-property-value>
- </config-property>
- <authentication-mechanism>
- <description></description>
- <authentication-mechanism-type></authentication-mechanism-type>
- <credential-interface></credential-interface>
- </authentication-mechanism>
- <reauthentication-support>false</reauthentication-support>
- <security-permission>
- <description></description>
- <security-permission-spec>
- </security-permission-spec>
- </security-permission>
- </resourceadapter>
-</connector>
diff --git a/plugins/org.eclipse.jst.j2ee.jca/jca/org/eclipse/jst/j2ee/jca/project/facet/rartp15.xml b/plugins/org.eclipse.jst.j2ee.jca/jca/org/eclipse/jst/j2ee/jca/project/facet/rartp15.xml
deleted file mode 100644
index 029561d..0000000
--- a/plugins/org.eclipse.jst.j2ee.jca/jca/org/eclipse/jst/j2ee/jca/project/facet/rartp15.xml
+++ /dev/null
@@ -1,10 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<connector id="Connector_ID" version="1.5" xmlns="http://java.sun.com/xml/ns/j2ee" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="http://java.sun.com/xml/ns/j2ee http://java.sun.com/xml/ns/j2ee/connector_1_5.xsd">
- <description></description>
- <display-name></display-name>
- <vendor-name></vendor-name>
- <eis-type></eis-type>
- <resourceadapter-version></resourceadapter-version>
- <resourceadapter>
- </resourceadapter>
-</connector>
diff --git a/plugins/org.eclipse.jst.j2ee.jca/jca/org/eclipse/jst/j2ee/jca/project/facet/rartp16.xml b/plugins/org.eclipse.jst.j2ee.jca/jca/org/eclipse/jst/j2ee/jca/project/facet/rartp16.xml
deleted file mode 100644
index d6ecb13..0000000
--- a/plugins/org.eclipse.jst.j2ee.jca/jca/org/eclipse/jst/j2ee/jca/project/facet/rartp16.xml
+++ /dev/null
@@ -1,9 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<connector id="Connector_ID" version="1.6" xmlns="http://java.sun.com/xml/ns/javaee" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="http://java.sun.com/xml/ns/javaee http://java.sun.com/xml/ns/javaee/connector_1_6.xsd">
- <description></description>
- <vendor-name></vendor-name>
- <eis-type></eis-type>
- <resourceadapter-version></resourceadapter-version>
- <resourceadapter>
- </resourceadapter>
-</connector>
diff --git a/plugins/org.eclipse.jst.j2ee.jca/jcaedit/org/eclipse/jst/j2ee/internal/jca/archive/operations/ConnectorComponentExportOperation.java b/plugins/org.eclipse.jst.j2ee.jca/jcaedit/org/eclipse/jst/j2ee/internal/jca/archive/operations/ConnectorComponentExportOperation.java
deleted file mode 100644
index f281812..0000000
--- a/plugins/org.eclipse.jst.j2ee.jca/jcaedit/org/eclipse/jst/j2ee/internal/jca/archive/operations/ConnectorComponentExportOperation.java
+++ /dev/null
@@ -1,29 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2003, 2006 IBM Corporation and others.
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
- *
- * Contributors:
- * IBM Corporation - initial API and implementation
- *******************************************************************************/
-package org.eclipse.jst.j2ee.internal.jca.archive.operations;
-
-import org.eclipse.jst.j2ee.internal.archive.operations.J2EEArtifactExportOperation;
-import org.eclipse.wst.common.frameworks.datamodel.IDataModel;
-
-/**
- * @deprecated use org.eclipse.jst.j2ee.internal.archive.operations.JavaEEComponentExportOperation instead
- */
-public class ConnectorComponentExportOperation extends J2EEArtifactExportOperation {
-
- public ConnectorComponentExportOperation() {
- super();
- }
-
- public ConnectorComponentExportOperation(IDataModel model) {
- super(model);
- }
-
-}
diff --git a/plugins/org.eclipse.jst.j2ee.jca/jcaedit/org/eclipse/jst/j2ee/internal/jca/archive/operations/ConnectorComponentLoadStrategyImpl.java b/plugins/org.eclipse.jst.j2ee.jca/jcaedit/org/eclipse/jst/j2ee/internal/jca/archive/operations/ConnectorComponentLoadStrategyImpl.java
deleted file mode 100644
index 09e53d4..0000000
--- a/plugins/org.eclipse.jst.j2ee.jca/jcaedit/org/eclipse/jst/j2ee/internal/jca/archive/operations/ConnectorComponentLoadStrategyImpl.java
+++ /dev/null
@@ -1,320 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2003, 2007 IBM Corporation and others.
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
- *
- * Contributors:
- * IBM Corporation - initial API and implementation
- *******************************************************************************/
-package org.eclipse.jst.j2ee.internal.jca.archive.operations;
-
-import java.util.ArrayList;
-import java.util.Collection;
-import java.util.Collections;
-import java.util.HashMap;
-import java.util.HashSet;
-import java.util.Iterator;
-import java.util.List;
-import java.util.Map;
-import java.util.Set;
-
-import org.eclipse.core.resources.IContainer;
-import org.eclipse.core.resources.IFile;
-import org.eclipse.core.resources.IFolder;
-import org.eclipse.core.resources.IProject;
-import org.eclipse.core.resources.IResource;
-import org.eclipse.core.resources.ResourcesPlugin;
-import org.eclipse.core.runtime.CoreException;
-import org.eclipse.core.runtime.IPath;
-import org.eclipse.jdt.core.IJavaProject;
-import org.eclipse.jdt.core.IPackageFragmentRoot;
-import org.eclipse.jdt.core.JavaCore;
-import org.eclipse.jdt.core.JavaModelException;
-import org.eclipse.jem.util.logger.proxy.Logger;
-import org.eclipse.jst.j2ee.commonarchivecore.internal.Archive;
-import org.eclipse.jst.j2ee.commonarchivecore.internal.File;
-import org.eclipse.jst.j2ee.commonarchivecore.internal.exception.ArchiveRuntimeException;
-import org.eclipse.jst.j2ee.commonarchivecore.internal.exception.OpenFailureException;
-import org.eclipse.jst.j2ee.commonarchivecore.internal.helpers.ArchiveOptions;
-import org.eclipse.jst.j2ee.commonarchivecore.internal.util.ArchiveUtil;
-import org.eclipse.jst.j2ee.internal.J2EEConstants;
-import org.eclipse.jst.j2ee.internal.archive.operations.ComponentLoadStrategyImpl;
-import org.eclipse.jst.j2ee.internal.plugin.IJ2EEModuleConstants;
-import org.eclipse.jst.j2ee.internal.project.J2EEProjectUtilities;
-import org.eclipse.jst.j2ee.jca.modulecore.util.ConnectorArtifactEdit;
-import org.eclipse.wst.common.componentcore.ArtifactEdit;
-import org.eclipse.wst.common.componentcore.resources.IVirtualComponent;
-import org.eclipse.wst.common.componentcore.resources.IVirtualContainer;
-
-public class ConnectorComponentLoadStrategyImpl extends ComponentLoadStrategyImpl {
-
- private int dotJavaLength = ArchiveUtil.DOT_JAVA.length();
- private List alreadyIndexed = new ArrayList();
- private Map classesMap;
- private IFile knownDD;
-
- public static String[] knownLibExtensions = {IJ2EEModuleConstants.JAR_EXT,
- ".zip", //$NON-NLS-1$
- ".so", //$NON-NLS-1$
- ".o", //$NON-NLS-1$
- ".sl", //$NON-NLS-1$
- ".dll", //$NON-NLS-1$
- };
-
- public ConnectorComponentLoadStrategyImpl(IVirtualComponent vComponent) {
- this(vComponent, true);
- }
-
- public ConnectorComponentLoadStrategyImpl(IVirtualComponent vComponent, boolean includeClasspathComponents) {
- super(vComponent, includeClasspathComponents);
- knownDD = vComponent.getRootFolder().getFile(J2EEConstants.RAR_DD_URI).getUnderlyingFile();
- }
-
- @Override
- public List getFiles() {
- addNestedJARsFromSourceRoots();
- aggregateSourceFiles();
- return filesHolder.getFiles();
- }
-
- private void addNestedJARsFromSourceRoots() {
- IPackageFragmentRoot[] sourceRoots = J2EEProjectUtilities.getSourceContainers(vComponent.getProject());
- for (int i = 0; i < sourceRoots.length; i++) {
- File aFile;
- try {
- aFile = getNestedJar(sourceRoots[i]);
- if (null != aFile) {
- filesHolder.addFile(aFile);
- }
- } catch (JavaModelException e) {
- Logger.getLogger().logError(e);
- }
- }
- }
-
-
-
- private File getNestedJar(IPackageFragmentRoot sourceRoot) throws JavaModelException {
- IPath outputPath = sourceRoot.getRawClasspathEntry().getOutputLocation();
- if (outputPath == null) {
- IProject project = vComponent.getProject();
- try {
- if (project.hasNature(JavaCore.NATURE_ID)) {
- IJavaProject javaProject = JavaCore.create(project);
- outputPath = javaProject.getOutputLocation();
- }
- } catch (CoreException e) {
- Logger.getLogger().logError(e);
- }
- if (outputPath == null) {
- return null;
- }
- }
-
- IFolder javaOutputFolder = ResourcesPlugin.getWorkspace().getRoot().getFolder(outputPath);
- indexClassesForOutputFolder(javaOutputFolder);
- IContainer sourceContainer = (IContainer) sourceRoot.getResource();
-
- int sourceContainerSegmentCount = sourceContainer.getProjectRelativePath().segmentCount();
- boolean isModuleRoot = knownDD.getProjectRelativePath().toString().startsWith(sourceContainer.getProjectRelativePath().toString());
- Set iFilesSet = new HashSet();
- boolean foundJava = gatherFilesForJAR(iFilesSet, sourceContainer, isModuleRoot, false, sourceContainerSegmentCount);
- if (!isModuleRoot || foundJava) {
- List iFilesList = Collections.list(Collections.enumeration(iFilesSet));
- for (int i = 0; i < iFilesList.size(); i++) {
- filesHolder.removeIFile((IFile) iFilesList.get(i));
- }
- File nestedArchive = createNestedArchive(iFilesList, sourceContainer, javaOutputFolder);
- return nestedArchive;
- }
- return null;
- }
-
- private boolean gatherFilesForJAR(Collection iFiles, IContainer current, boolean isModuleRoot, boolean foundJava, int sourceContainerSegmentCount) {
- IResource[] members;
- try {
- members = current.members();
- } catch (CoreException core) {
- throw new ArchiveRuntimeException(core);
- }
-
- IContainer ddFolder = vComponent.getRootFolder().getFolder(J2EEConstants.META_INF).getUnderlyingFolder();
-
- boolean localFoundJava = foundJava;
- for (int i = 0; i < members.length; i++) {
- IResource res = members[i];
- if (res.getType() == IResource.FOLDER) {
- if (!ddFolder.equals(res)) {//if it's not the dd folder
- localFoundJava = gatherFilesForJAR(iFiles, (IFolder) res, isModuleRoot, localFoundJava, sourceContainerSegmentCount) || localFoundJava;
- }
- } else {// it must be a file
- IFile srcFile = (IFile) res;
- if (belongsInNestedJAR(srcFile, isModuleRoot)) {
- if (isJava(srcFile)) {
- if (exportSource) {
- iFiles.add(srcFile); //don't need to check duplicates here
- }
- String className = srcFile.getProjectRelativePath().removeFirstSegments(sourceContainerSegmentCount).toString();
- className = className.substring(0, className.length() - dotJavaLength);
- List classes = retrieveClasses(className);
- if (null != classes) {
- Iterator iterator = classes.iterator();
- while (iterator.hasNext()) {
- IFile clazz = (IFile) iterator.next();
- if(!iFiles.contains(clazz)){
- //.class need to check for duplicates
- iFiles.add(clazz);
- }
- }
- }
- } else {
- if(!iFiles.contains(srcFile)){
- //if it's not src, then it could be .class and need to check for duplicates
- iFiles.add(srcFile);
- }
- }
- if (isModuleRoot)
- localFoundJava = localFoundJava || isJava(srcFile) || isClass(srcFile);
- }
- }
- }
- return localFoundJava;
- }
-
- private File createNestedArchive(List files, IContainer sourceContainer, IFolder javaOutputFolder) {
- ConnectorComponentNestedJARLoadStrategyImpl loader = new ConnectorComponentNestedJARLoadStrategyImpl(files, sourceContainer, javaOutputFolder);
- ArchiveOptions options = ((Archive) getContainer()).getOptions().cloneWith(loader);
- String uri = computeUniqueArchiveURI(sourceContainer);
- try {
- return getArchiveFactory().primOpenArchive(options, uri);
- } catch (OpenFailureException ex) {
- throw new ArchiveRuntimeException(ex);
- }
- }
-
- private String computeUniqueArchiveURI(IResource resource) {
- int increment = 0;
- String name = resource.getName();
- StringBuffer sb = null;
- do {
- sb = new StringBuffer(name.length() + 5);
- sb.append('_');
- sb.append(name);
- if (increment > 0)
- sb.append(increment);
- sb.append(IJ2EEModuleConstants.JAR_EXT);
- increment++;
- } while (filesHolder.contains(sb.toString()));
- return sb.toString();
- }
-
- private boolean belongsInNestedJAR(IFile iFile, boolean isModuleRoot) {
- if (isModuleRoot && isDeploymentDescriptor(iFile)) {
- return false;
- }
- for (int i = 0; i < knownLibExtensions.length; i++) {
- if (hasExtension(iFile, knownLibExtensions[i]))
- return false;
- }
- return true;
- }
- @Override
- protected synchronized ArtifactEdit getArtifactEditForRead() {
- if(artifactEdit == null){
- artifactEdit = ConnectorArtifactEdit.getConnectorArtifactEditForRead(vComponent);
- }
- return artifactEdit;
- }
-
- @Override
- protected boolean shouldInclude(IVirtualContainer vContainer) {
- boolean isDDFolder = vComponent.getRootFolder().getFolder(J2EEConstants.META_INF).equals(vContainer);
- return isDDFolder || !inJavaSrc(vContainer);
- }
-
- @Override
- protected boolean shouldInclude(String uri) {
- return !hasExtension(uri, ArchiveUtil.DOT_CLASS) && !hasExtension(uri, ArchiveUtil.DOT_JAVA);
- }
-
- /**
- * Find all the .class files and index them so inner classes can be located.
- */
- private void indexClassesForOutputFolder(IFolder javaOutputFolder) {
- if (null == javaOutputFolder || alreadyIndexed.contains(javaOutputFolder)) {
- return;
- }
- alreadyIndexed.add(javaOutputFolder);
- int segmentCount = javaOutputFolder.getProjectRelativePath().segmentCount();
- indexClasses(javaOutputFolder, segmentCount);
- }
-
- private void indexClasses(IResource resource, int javaOutputSegmentCount) {
- switch (resource.getType()) {
- case IResource.FILE :
- indexClass((IFile) resource, javaOutputSegmentCount);
- break;
- case IResource.FOLDER :
- try {
- IResource[] members = ((IFolder) resource).members();
- for (int i = 0; i < members.length; i++) {
- indexClasses(members[i], javaOutputSegmentCount);
- }
- } catch (CoreException e) {
- Logger.getLogger().logError(e);
- }
- break;
- }
- }
-
- private void indexClass(IFile iFile, int javaOutputSegmentCount) {
- if (!isClass(iFile))
- return;
- if (classesMap == null)
- classesMap = new HashMap();
- String name = iFile.getName();
- IPath relPath = iFile.getProjectRelativePath().removeFirstSegments(javaOutputSegmentCount);
- String key = relPath.toString();
- if (name.indexOf('$') != -1) {
- key = key.substring(0, key.indexOf('$'));
- } else {
- key = key.substring(0, key.indexOf('.'));
- }
- List inners = (List) classesMap.get(key);
- if (inners == null) {
- inners = new ArrayList(1);
- classesMap.put(key, inners);
- }
- inners.add(iFile);
- }
-
- public List retrieveClasses(String key) {
- if (classesMap == null)
- return null;
- return (List) classesMap.get(key);
- }
-
- public static boolean isJava(IFile iFile) {
- return hasExtension(iFile, ArchiveUtil.DOT_JAVA);
- }
-
- public static boolean isClass(IFile iFile) {
- return hasExtension(iFile, ArchiveUtil.DOT_CLASS);
- }
-
- private static boolean hasExtension(IFile iFile, String ext) {
- String name = iFile.getName();
- return hasExtension(name, ext);
- }
-
- private static boolean hasExtension(String name, String ext) {
- int offset = ext.length();
- return name.regionMatches(true, name.length() - offset, ext, 0, offset);
- }
-
- private boolean isDeploymentDescriptor(IFile iFile) {
- return knownDD.equals(iFile);
- }
-}
diff --git a/plugins/org.eclipse.jst.j2ee.jca/jcaedit/org/eclipse/jst/j2ee/internal/jca/archive/operations/ConnectorComponentNestedJARLoadStrategyImpl.java b/plugins/org.eclipse.jst.j2ee.jca/jcaedit/org/eclipse/jst/j2ee/internal/jca/archive/operations/ConnectorComponentNestedJARLoadStrategyImpl.java
deleted file mode 100644
index f973814..0000000
--- a/plugins/org.eclipse.jst.j2ee.jca/jcaedit/org/eclipse/jst/j2ee/internal/jca/archive/operations/ConnectorComponentNestedJARLoadStrategyImpl.java
+++ /dev/null
@@ -1,118 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2003, 2005 IBM Corporation and others.
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
- *
- * Contributors:
- * IBM Corporation - initial API and implementation
- *******************************************************************************/
-package org.eclipse.jst.j2ee.internal.jca.archive.operations;
-
-import java.io.FileNotFoundException;
-import java.io.IOException;
-import java.io.InputStream;
-import java.util.ArrayList;
-import java.util.HashMap;
-import java.util.List;
-import java.util.Map;
-
-import org.eclipse.core.resources.IContainer;
-import org.eclipse.core.resources.IFile;
-import org.eclipse.core.resources.IFolder;
-import org.eclipse.core.resources.IResource;
-import org.eclipse.core.runtime.CoreException;
-import org.eclipse.core.runtime.IPath;
-import org.eclipse.jst.j2ee.commonarchivecore.internal.File;
-import org.eclipse.jst.j2ee.commonarchivecore.internal.exception.ArchiveRuntimeException;
-import org.eclipse.jst.j2ee.commonarchivecore.internal.strategy.LoadStrategyImpl;
-
-
-public class ConnectorComponentNestedJARLoadStrategyImpl extends LoadStrategyImpl {
-
- private List files;
- private int sourceSegmentCount;
- private int outputSegmentCount;
- private Map urisToIFiles;
-
- /**
- * Constructor for NestedJARLoadStrategyImpl.
- */
- public ConnectorComponentNestedJARLoadStrategyImpl(List files, IContainer sourceContainer, IFolder javaOutputFolder) {
- super();
- this.files = files;
- sourceSegmentCount = sourceContainer.getProjectRelativePath().segmentCount();
- outputSegmentCount = javaOutputFolder.getProjectRelativePath().segmentCount();
- }
-
- /**
- * @see com.ibm.etools.archive.impl.LoadStrategyImpl#primContains(String)
- */
- @Override
- protected boolean primContains(String uri) {
- // Should only be used by discriminators, and we don't discriminate these archives
- return true;
- }
-
- /**
- * @see com.ibm.etools.archive.impl.LoadStrategyImpl#getFiles()
- */
- @Override
- public List getFiles() {
- urisToIFiles = new HashMap();
- List result = new ArrayList();
- int size = files.size();
- for (int i = 0; i < size; i++) {
- IFile iFile = (IFile) files.get(i);
- IPath relPath;
- if(ConnectorComponentLoadStrategyImpl.isClass(iFile)){
- relPath = getRelativePath(iFile, outputSegmentCount);
- } else {
- relPath = getRelativePath(iFile, sourceSegmentCount);
- }
- addFile(iFile, relPath, result);
- }
- return result;
- }
-
- protected void addFile(IFile iFile, IPath relPath, List result) {
- File cFile = createFile(iFile, relPath);
- result.add(cFile);
- urisToIFiles.put(cFile.getURI(), iFile);
- }
-
- protected long getLastModified(IResource aResource) {
- return aResource.getLocation().toFile().lastModified();
- }
-
- private File createFile(IFile iFile, IPath relPath) {
- File cFile = createFile(relPath.toString());
- cFile.setLastModified(getLastModified(iFile));
- return cFile;
- }
-
- private IPath getRelativePath(IFile file, int parentSegmentCount) {
- return file.getProjectRelativePath().removeFirstSegments(parentSegmentCount);
- }
-
- /**
- * @see com.ibm.etools.archive.LoadStrategy#getInputStream(String)
- */
- @Override
- public InputStream getInputStream(String uri) throws IOException, FileNotFoundException {
- if (null == urisToIFiles) {
- getFiles();
- }
- IFile file = (IFile) urisToIFiles.get(uri);
- if (file != null) {
- try {
- return file.getContents();
- } catch (CoreException core) {
- throw new ArchiveRuntimeException(uri, core);
- }
- }
- throw new FileNotFoundException(uri);
- }
-
-}
diff --git a/plugins/org.eclipse.jst.j2ee.jca/jcaedit/org/eclipse/jst/j2ee/internal/jca/providers/ActivationSpecItemProvider.java b/plugins/org.eclipse.jst.j2ee.jca/jcaedit/org/eclipse/jst/j2ee/internal/jca/providers/ActivationSpecItemProvider.java
deleted file mode 100644
index 661af54..0000000
--- a/plugins/org.eclipse.jst.j2ee.jca/jcaedit/org/eclipse/jst/j2ee/internal/jca/providers/ActivationSpecItemProvider.java
+++ /dev/null
@@ -1,162 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2003, 2006 IBM Corporation and others.
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
- *
- * Contributors:
- * IBM Corporation - initial API and implementation
- *******************************************************************************/
-package org.eclipse.jst.j2ee.internal.jca.providers;
-
-
-import java.util.Collection;
-import java.util.List;
-
-import org.eclipse.emf.common.notify.AdapterFactory;
-import org.eclipse.emf.common.notify.Notification;
-import org.eclipse.emf.common.util.ResourceLocator;
-import org.eclipse.emf.edit.provider.ComposeableAdapterFactory;
-import org.eclipse.emf.edit.provider.IEditingDomainItemProvider;
-import org.eclipse.emf.edit.provider.IItemLabelProvider;
-import org.eclipse.emf.edit.provider.IItemPropertySource;
-import org.eclipse.emf.edit.provider.ITreeItemContentProvider;
-import org.eclipse.emf.edit.provider.ItemPropertyDescriptor;
-import org.eclipse.emf.edit.provider.ItemProviderAdapter;
-import org.eclipse.jst.j2ee.jca.ActivationSpec;
-import org.eclipse.jst.j2ee.jca.JcaFactory;
-import org.eclipse.jst.j2ee.jca.JcaPackage;
-import org.eclipse.jst.j2ee.jca.internal.plugin.JCAResourceHandler;
-import org.eclipse.jst.j2ee.jca.internal.plugin.JcaPlugin;
-
-/**
- * This is the item provider adpater for a {@link com.ibm.etools.jca.ActivationSpec}object. <!--
- * begin-user-doc --> <!-- end-user-doc -->
- *
- * @generated
- */
-public class ActivationSpecItemProvider extends ItemProviderAdapter implements IEditingDomainItemProvider, ITreeItemContentProvider, IItemLabelProvider, IItemPropertySource {
- /**
- * This constructs an instance from a factory and a notifier. <!-- begin-user-doc --> <!--
- * end-user-doc -->
- *
- * @generated
- */
- public ActivationSpecItemProvider(AdapterFactory adapterFactory) {
- super(adapterFactory);
- }
-
- /**
- * This returns the property descriptors for the adapted class. <!-- begin-user-doc --> <!--
- * end-user-doc -->
- *
- * @generated
- */
- @Override
- public List getPropertyDescriptors(Object object) {
- if (itemPropertyDescriptors == null) {
- super.getPropertyDescriptors(object);
-
- addActivationSpecClassPropertyDescriptor(object);
- }
- return itemPropertyDescriptors;
- }
-
- /**
- * This adds a property descriptor for the Activation Spec Class feature. <!-- begin-user-doc
- * --> <!-- end-user-doc -->
- *
- * @generated
- */
- protected void addActivationSpecClassPropertyDescriptor(Object object) {
- itemPropertyDescriptors.add(new ItemPropertyDescriptor(((ComposeableAdapterFactory) adapterFactory).getRootAdapterFactory(), getString("_UI_ActivationSpec_activationSpecClass_feature"), //$NON-NLS-1$
- getString("_UI_PropertyDescriptor_description", "_UI_ActivationSpec_activationSpecClass_feature", "_UI_ActivationSpec_type"), //$NON-NLS-1$ //$NON-NLS-2$ //$NON-NLS-3$
- JcaPackage.eINSTANCE.getActivationSpec_ActivationSpecClass(), true, ItemPropertyDescriptor.GENERIC_VALUE_IMAGE));
- }
-
- /**
- * This specifies how to implement {@link #getChildren}and
- * {@link org.eclipse.emf.edit.command.AddCommand}and
- * {@link org.eclipse.emf.edit.command.RemoveCommand}support in {@link #createCommand}. <!--
- * begin-user-doc --> <!-- end-user-doc -->
- *
- * @generated
- */
- @Override
- public Collection getChildrenReferences(Object object) {
- if (childrenReferences == null) {
- super.getChildrenReferences(object);
- childrenReferences.add(JcaPackage.eINSTANCE.getActivationSpec_RequiredConfigProperties());
- }
- return childrenReferences;
- }
-
-
- /**
- * This returns ActivationSpec.gif. <!-- begin-user-doc --> <!-- end-user-doc -->
- *
- * @generated
- */
- @Override
- public Object getImage(Object object) {
- return getResourceLocator().getImage("full/obj16/ActivationSpec"); //$NON-NLS-1$
- }
-
- /**
- * This returns the label text for the adapted class. <!-- begin-user-doc --> <!-- end-user-doc
- * -->
- *
- * @generated
- */
- @Override
- public String getText(Object object) {
- String label = ((ActivationSpec) object).getActivationSpecClass();
- return label == null || label.length() == 0 ? JCAResourceHandler._UI_ActivationSpec_type :
- JCAResourceHandler._UI_ActivationSpec_type + " " + label; //$NON-NLS-1$
- }
-
- /**
- * This handles notification by calling {@link #fireNotifyChanged fireNotifyChanged}. <!--
- * begin-user-doc --> <!-- end-user-doc -->
- *
- * @generated
- */
- @Override
- public void notifyChanged(Notification notification) {
- switch (notification.getFeatureID(ActivationSpec.class)) {
- case JcaPackage.ACTIVATION_SPEC__ACTIVATION_SPEC_CLASS :
- case JcaPackage.ACTIVATION_SPEC__REQUIRED_CONFIG_PROPERTIES : {
- fireNotifyChanged(notification);
- return;
- }
- }
- super.notifyChanged(notification);
- }
-
- /**
- * This adds to the collection of {@link org.eclipse.emf.edit.command.CommandParameter}s
- * describing all of the children that can be created under this object. <!-- begin-user-doc -->
- * <!-- end-user-doc -->
- *
- * @generated
- */
- @Override
- protected void collectNewChildDescriptors(Collection newChildDescriptors, Object object) {
- super.collectNewChildDescriptors(newChildDescriptors, object);
-
- newChildDescriptors.add(createChildParameter(JcaPackage.eINSTANCE.getActivationSpec_RequiredConfigProperties(), JcaFactory.eINSTANCE.createRequiredConfigPropertyType()));
- }
-
- /**
- * Return the resource locator for this item provider's resources. <!-- begin-user-doc --> <!--
- * end-user-doc -->
- *
- * @generated
- */
- @Override
- public ResourceLocator getResourceLocator() {
- //return J2EEPlugin.getDefault();
- return JcaPlugin.getPlugin();
- }
-}
diff --git a/plugins/org.eclipse.jst.j2ee.jca/jcaedit/org/eclipse/jst/j2ee/internal/jca/providers/AdminObjectItemProvider.java b/plugins/org.eclipse.jst.j2ee.jca/jcaedit/org/eclipse/jst/j2ee/internal/jca/providers/AdminObjectItemProvider.java
deleted file mode 100644
index 24ff1c8..0000000
--- a/plugins/org.eclipse.jst.j2ee.jca/jcaedit/org/eclipse/jst/j2ee/internal/jca/providers/AdminObjectItemProvider.java
+++ /dev/null
@@ -1,176 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2003, 2006 IBM Corporation and others.
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
- *
- * Contributors:
- * IBM Corporation - initial API and implementation
- *******************************************************************************/
-package org.eclipse.jst.j2ee.internal.jca.providers;
-
-
-import java.util.Collection;
-import java.util.List;
-
-import org.eclipse.emf.common.notify.AdapterFactory;
-import org.eclipse.emf.common.notify.Notification;
-import org.eclipse.emf.common.util.ResourceLocator;
-import org.eclipse.emf.edit.provider.ComposeableAdapterFactory;
-import org.eclipse.emf.edit.provider.IEditingDomainItemProvider;
-import org.eclipse.emf.edit.provider.IItemLabelProvider;
-import org.eclipse.emf.edit.provider.IItemPropertySource;
-import org.eclipse.emf.edit.provider.ITreeItemContentProvider;
-import org.eclipse.emf.edit.provider.ItemPropertyDescriptor;
-import org.eclipse.emf.edit.provider.ItemProviderAdapter;
-import org.eclipse.jst.j2ee.jca.AdminObject;
-import org.eclipse.jst.j2ee.jca.JcaFactory;
-import org.eclipse.jst.j2ee.jca.JcaPackage;
-import org.eclipse.jst.j2ee.jca.internal.plugin.JCAResourceHandler;
-import org.eclipse.jst.j2ee.jca.internal.plugin.JcaPlugin;
-
-/**
- * This is the item provider adpater for a {@link com.ibm.etools.jca.AdminObject}object. <!--
- * begin-user-doc --> <!-- end-user-doc -->
- *
- * @generated
- */
-public class AdminObjectItemProvider extends ItemProviderAdapter implements IEditingDomainItemProvider, ITreeItemContentProvider, IItemLabelProvider, IItemPropertySource {
- /**
- * This constructs an instance from a factory and a notifier. <!-- begin-user-doc --> <!--
- * end-user-doc -->
- *
- * @generated
- */
- public AdminObjectItemProvider(AdapterFactory adapterFactory) {
- super(adapterFactory);
- }
-
- /**
- * This returns the property descriptors for the adapted class. <!-- begin-user-doc --> <!--
- * end-user-doc -->
- *
- * @generated
- */
- @Override
- public List getPropertyDescriptors(Object object) {
- if (itemPropertyDescriptors == null) {
- super.getPropertyDescriptors(object);
-
- addAdminObjectInterfacePropertyDescriptor(object);
- addAdminObjectClassPropertyDescriptor(object);
- }
- return itemPropertyDescriptors;
- }
-
- /**
- * This adds a property descriptor for the Admin Object Interface feature. <!-- begin-user-doc
- * --> <!-- end-user-doc -->
- *
- * @generated
- */
- protected void addAdminObjectInterfacePropertyDescriptor(Object object) {
- itemPropertyDescriptors.add(new ItemPropertyDescriptor(((ComposeableAdapterFactory) adapterFactory).getRootAdapterFactory(), getString("_UI_AdminObject_adminObjectInterface_feature"), //$NON-NLS-1$
- getString("_UI_PropertyDescriptor_description", "_UI_AdminObject_adminObjectInterface_feature", "_UI_AdminObject_type"), //$NON-NLS-1$ //$NON-NLS-2$ //$NON-NLS-3$
- JcaPackage.eINSTANCE.getAdminObject_AdminObjectInterface(), true, ItemPropertyDescriptor.GENERIC_VALUE_IMAGE));
- }
-
- /**
- * This adds a property descriptor for the Admin Object Class feature. <!-- begin-user-doc -->
- * <!-- end-user-doc -->
- *
- * @generated
- */
- protected void addAdminObjectClassPropertyDescriptor(Object object) {
- itemPropertyDescriptors.add(new ItemPropertyDescriptor(((ComposeableAdapterFactory) adapterFactory).getRootAdapterFactory(), getString("_UI_AdminObject_adminObjectClass_feature"), //$NON-NLS-1$
- getString("_UI_PropertyDescriptor_description", "_UI_AdminObject_adminObjectClass_feature", "_UI_AdminObject_type"), //$NON-NLS-1$ //$NON-NLS-2$ //$NON-NLS-3$
- JcaPackage.eINSTANCE.getAdminObject_AdminObjectClass(), true, ItemPropertyDescriptor.GENERIC_VALUE_IMAGE));
- }
-
- /**
- * This specifies how to implement {@link #getChildren}and
- * {@link org.eclipse.emf.edit.command.AddCommand}and
- * {@link org.eclipse.emf.edit.command.RemoveCommand}support in {@link #createCommand}. <!--
- * begin-user-doc --> <!-- end-user-doc -->
- *
- * @generated
- */
- @Override
- public Collection getChildrenReferences(Object object) {
- if (childrenReferences == null) {
- super.getChildrenReferences(object);
- childrenReferences.add(JcaPackage.eINSTANCE.getAdminObject_ConfigProperties());
- }
- return childrenReferences;
- }
-
-
- /**
- * This returns AdminObject.gif. <!-- begin-user-doc --> <!-- end-user-doc -->
- *
- * @generated
- */
- @Override
- public Object getImage(Object object) {
- return getResourceLocator().getImage("full/obj16/AdminObject"); //$NON-NLS-1$
- }
-
- /**
- * This returns the label text for the adapted class. <!-- begin-user-doc --> <!-- end-user-doc
- * -->
- *
- * @generated
- */
- @Override
- public String getText(Object object) {
- String label = ((AdminObject) object).getAdminObjectInterface();
- return label == null || label.length() == 0 ? JCAResourceHandler._UI_AdminObject_type :
- JCAResourceHandler._UI_AdminObject_type + " " + label; //$NON-NLS-1$
- }
-
- /**
- * This handles notification by calling {@link #fireNotifyChanged fireNotifyChanged}. <!--
- * begin-user-doc --> <!-- end-user-doc -->
- *
- * @generated
- */
- @Override
- public void notifyChanged(Notification notification) {
- switch (notification.getFeatureID(AdminObject.class)) {
- case JcaPackage.ADMIN_OBJECT__ADMIN_OBJECT_INTERFACE :
- case JcaPackage.ADMIN_OBJECT__ADMIN_OBJECT_CLASS :
- case JcaPackage.ADMIN_OBJECT__CONFIG_PROPERTIES : {
- fireNotifyChanged(notification);
- return;
- }
- }
- super.notifyChanged(notification);
- }
-
- /**
- * This adds to the collection of {@link org.eclipse.emf.edit.command.CommandParameter}s
- * describing all of the children that can be created under this object. <!-- begin-user-doc -->
- * <!-- end-user-doc -->
- *
- * @generated
- */
- @Override
- protected void collectNewChildDescriptors(Collection newChildDescriptors, Object object) {
- super.collectNewChildDescriptors(newChildDescriptors, object);
-
- newChildDescriptors.add(createChildParameter(JcaPackage.eINSTANCE.getAdminObject_ConfigProperties(), JcaFactory.eINSTANCE.createConfigProperty()));
- }
-
- /**
- * Return the resource locator for this item provider's resources. <!-- begin-user-doc --> <!--
- * end-user-doc -->
- *
- * @generated
- */
- @Override
- public ResourceLocator getResourceLocator() {
- //return J2EEPlugin.getDefault();
- return JcaPlugin.getPlugin();
- }
-}
diff --git a/plugins/org.eclipse.jst.j2ee.jca/jcaedit/org/eclipse/jst/j2ee/internal/jca/providers/AuthenticationMechanismItemProvider.java b/plugins/org.eclipse.jst.j2ee.jca/jcaedit/org/eclipse/jst/j2ee/internal/jca/providers/AuthenticationMechanismItemProvider.java
deleted file mode 100644
index 6e04af1..0000000
--- a/plugins/org.eclipse.jst.j2ee.jca/jcaedit/org/eclipse/jst/j2ee/internal/jca/providers/AuthenticationMechanismItemProvider.java
+++ /dev/null
@@ -1,292 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2003, 2005 IBM Corporation and others.
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
- *
- * Contributors:
- * IBM Corporation - initial API and implementation
- *******************************************************************************/
-package org.eclipse.jst.j2ee.internal.jca.providers;
-
-
-import java.util.Collection;
-import java.util.List;
-
-import org.eclipse.emf.common.notify.AdapterFactory;
-import org.eclipse.emf.common.notify.Notification;
-import org.eclipse.emf.common.notify.Notifier;
-import org.eclipse.emf.common.util.ResourceLocator;
-import org.eclipse.emf.ecore.EObject;
-import org.eclipse.emf.ecore.InternalEObject;
-import org.eclipse.emf.ecore.impl.ENotificationImpl;
-import org.eclipse.emf.edit.provider.ComposeableAdapterFactory;
-import org.eclipse.emf.edit.provider.IEditingDomainItemProvider;
-import org.eclipse.emf.edit.provider.IItemLabelProvider;
-import org.eclipse.emf.edit.provider.IItemPropertySource;
-import org.eclipse.emf.edit.provider.ITreeItemContentProvider;
-import org.eclipse.emf.edit.provider.ItemPropertyDescriptor;
-import org.eclipse.jst.j2ee.common.CommonFactory;
-import org.eclipse.jst.j2ee.internal.plugin.J2EEPlugin;
-import org.eclipse.jst.j2ee.jca.AuthenticationMechanism;
-import org.eclipse.jst.j2ee.jca.JcaPackage;
-import org.eclipse.jst.j2ee.webservice.wscommon.WscommonFactory;
-
-
-/**
- * This is the item provider adpater for the AuthenticationMechanism for connector proejcts.
- */
-public class AuthenticationMechanismItemProvider extends JcaItemProviderAdapter implements IEditingDomainItemProvider, ITreeItemContentProvider, IItemLabelProvider, IItemPropertySource {
- /**
- * This constructs an instance from a factory and a notifier.
- *
- * @param AdapterFactory
- * adapterFactory - Adapter factory to create.
- */
- public AuthenticationMechanismItemProvider(AdapterFactory adapterFactory) {
- super(adapterFactory);
- }// AuthenticationMechanismItemProvider
-
- /**
- * This returns the property descriptors for the adapted class. <!-- begin-user-doc --> <!--
- * end-user-doc -->
- *
- * @generated
- */
- @Override
- public List getPropertyDescriptors(Object object) {
- if (itemPropertyDescriptors == null) {
- super.getPropertyDescriptors(object);
-
- addDescriptionPropertyDescriptor(object);
- addAuthenticationMechanismPropertyDescriptor(object);
- addAuthenticationMechanismTypePropertyDescriptor(object);
- addCredentialInterfacePropertyDescriptor(object);
- addCustomAuthMechTypePropertyDescriptor(object);
- }
- return itemPropertyDescriptors;
- }
-
- /**
- * This adds a property descriptor for the Description feature. <!-- begin-user-doc --> <!--
- * end-user-doc -->
- *
- * @generated
- */
- protected void addDescriptionPropertyDescriptor(Object object) {
- itemPropertyDescriptors.add(new ItemPropertyDescriptor(((ComposeableAdapterFactory) adapterFactory).getRootAdapterFactory(), getString("_UI_AuthenticationMechanism_description_feature"), //$NON-NLS-1$
- getString("_UI_PropertyDescriptor_description", "_UI_AuthenticationMechanism_description_feature", "_UI_AuthenticationMechanism_type"), //$NON-NLS-1$ //$NON-NLS-2$ //$NON-NLS-3$
- JcaPackage.eINSTANCE.getAuthenticationMechanism_Description(), true, ItemPropertyDescriptor.GENERIC_VALUE_IMAGE));
- }
-
- /**
- * This adds a property descriptor for the Authentication Mechanism feature. <!-- begin-user-doc
- * --> <!-- end-user-doc -->
- *
- * @generated
- */
- protected void addAuthenticationMechanismPropertyDescriptor(Object object) {
- itemPropertyDescriptors.add(new ItemPropertyDescriptor(((ComposeableAdapterFactory) adapterFactory).getRootAdapterFactory(), getString("_UI_AuthenticationMechanism_authenticationMechanism_feature"), //$NON-NLS-1$
- getString("_UI_PropertyDescriptor_description", "_UI_AuthenticationMechanism_authenticationMechanism_feature", "_UI_AuthenticationMechanism_type"), //$NON-NLS-1$ //$NON-NLS-2$ //$NON-NLS-3$
- JcaPackage.eINSTANCE.getAuthenticationMechanism_AuthenticationMechanism(), true, ItemPropertyDescriptor.GENERIC_VALUE_IMAGE));
- }
-
- /**
- * This adds a property descriptor for the Authentication Mechanism Type feature. <!--
- * begin-user-doc --> <!-- end-user-doc -->
- *
- * @generated
- */
- protected void addAuthenticationMechanismTypePropertyDescriptor(Object object) {
- itemPropertyDescriptors.add(new ItemPropertyDescriptor(((ComposeableAdapterFactory) adapterFactory).getRootAdapterFactory(), getString("_UI_AuthenticationMechanism_authenticationMechanismType_feature"), //$NON-NLS-1$
- getString("_UI_PropertyDescriptor_description", "_UI_AuthenticationMechanism_authenticationMechanismType_feature", "_UI_AuthenticationMechanism_type"), //$NON-NLS-1$ //$NON-NLS-2$ //$NON-NLS-3$
- JcaPackage.eINSTANCE.getAuthenticationMechanism_AuthenticationMechanismType(), true, ItemPropertyDescriptor.GENERIC_VALUE_IMAGE));
- }
-
- /**
- * This adds a property descriptor for the Credential Interface feature. <!-- begin-user-doc -->
- * <!-- end-user-doc -->
- *
- * @generated
- */
- protected void addCredentialInterfacePropertyDescriptor(Object object) {
- itemPropertyDescriptors.add(new ItemPropertyDescriptor(((ComposeableAdapterFactory) adapterFactory).getRootAdapterFactory(), getString("_UI_AuthenticationMechanism_credentialInterface_feature"), //$NON-NLS-1$
- getString("_UI_PropertyDescriptor_description", "_UI_AuthenticationMechanism_credentialInterface_feature", "_UI_AuthenticationMechanism_type"), //$NON-NLS-1$ //$NON-NLS-2$ //$NON-NLS-3$
- JcaPackage.eINSTANCE.getAuthenticationMechanism_CredentialInterface(), true, ItemPropertyDescriptor.GENERIC_VALUE_IMAGE));
- }
-
- /**
- * This adds a property descriptor for the Custom Auth Mech Type feature. <!-- begin-user-doc
- * --> <!-- end-user-doc -->
- *
- * @generated
- */
- protected void addCustomAuthMechTypePropertyDescriptor(Object object) {
- itemPropertyDescriptors.add(new ItemPropertyDescriptor(((ComposeableAdapterFactory) adapterFactory).getRootAdapterFactory(), getString("_UI_AuthenticationMechanism_customAuthMechType_feature"), //$NON-NLS-1$
- getString("_UI_PropertyDescriptor_description", "_UI_AuthenticationMechanism_customAuthMechType_feature", "_UI_AuthenticationMechanism_type"), //$NON-NLS-1$ //$NON-NLS-2$ //$NON-NLS-3$
- JcaPackage.eINSTANCE.getAuthenticationMechanism_CustomAuthMechType(), true, ItemPropertyDescriptor.GENERIC_VALUE_IMAGE));
- }
-
- /**
- * This specifies how to implement {@link #getChildren}and
- * {@link org.eclipse.emf.edit.command.AddCommand}and
- * {@link org.eclipse.emf.edit.command.RemoveCommand}support in {@link #createCommand}. <!--
- * begin-user-doc --> <!-- end-user-doc -->
- *
- * @generated
- */
- @Override
- public Collection getChildrenReferences(Object object) {
- if (childrenReferences == null) {
- super.getChildrenReferences(object);
- childrenReferences.add(JcaPackage.eINSTANCE.getAuthenticationMechanism_Descriptions());
- }
- return childrenReferences;
- }
-
-
- /**
- * This returns the property descriptors for the adapted class.
- *
- * @param Object
- * object - The adapted class.
- * @return List
- */
- /*
- * public List getPropertyDescriptors(Object object) { if (itemPropertyDescriptors == null) {
- * super.getPropertyDescriptors(object);
- *
- * AuthenticationMechanism f_authenticationMechanism = ((AuthenticationMechanism)object);
- * JcaPackage pkg = JcaPackage.eINSTANCE;; // This is for the description feature. //
- * itemPropertyDescriptors.add (new ItemPropertyDescriptor
- * (((ComposeableAdapterFactory)adapterFactory).getRootAdapterFactory(), "Description", "The
- * description property of the authentication mechanism",
- * pkg.getAuthenticationMechanism_Description(), true,
- * ItemPropertyDescriptor.TEXT_VALUE_IMAGE)); // This is for the authenticationMechanismType
- * feature. // itemPropertyDescriptors.add (new ItemPropertyDescriptor
- * (((ComposeableAdapterFactory)adapterFactory).getRootAdapterFactory(), "Authentication
- * Mechanism Type", "The authentication mechanism type property of the authentication
- * mechanism", pkg.getAuthenticationMechanism_AuthenticationMechanismType(), true,
- * ItemPropertyDescriptor.GENERIC_VALUE_IMAGE)); // This is for the credentialInterface feature. //
- * itemPropertyDescriptors.add (new ItemPropertyDescriptor
- * (((ComposeableAdapterFactory)adapterFactory).getRootAdapterFactory(), "Credential Interface",
- * "The credential interface property of the authentication mechanism",
- * pkg.getAuthenticationMechanism_CredentialInterface(), true,
- * ItemPropertyDescriptor.TEXT_VALUE_IMAGE));
- *
- * }// if return itemPropertyDescriptors; }// getPropertyDescriptors
- */
- /**
- * This returns the parent of the AuthenticationMechanism.
- *
- * @param Object
- * object - The adapted class.
- * @return Object
- */
- @Override
- public Object getParent(Object object) {
- return ((EObject) object).eContainer();
- }// getParent
-
- /**
- * This returns AuthenticationMechanism.gif.
- *
- * @param Object
- * object - The adapted class.
- * @return Object
- */
- @Override
- public Object getImage(Object object) {
- return J2EEPlugin.getPlugin().getImage("full/obj16/auth_mechanism_obj"); //$NON-NLS-1$
- }// getImage
-
- /**
- * Returns the display name.
- *
- * @param Object
- * object - The adapted class.
- * @return String
- */
- @Override
- public String getText(Object object) {
- AuthenticationMechanism authenticationMechanism = ((AuthenticationMechanism) object);
- return "AuthenticationMechanism " + authenticationMechanism.getDescription(); //$NON-NLS-1$
- }// getText
-
- /**
- * This handles notification by calling {@link #fireNotifyChanged fireNotifyChanged}. <!--
- * begin-user-doc --> <!-- end-user-doc -->
- *
- * @generated
- */
- @Override
- public void notifyChanged(Notification notification) {
- switch (notification.getFeatureID(AuthenticationMechanism.class)) {
- case JcaPackage.AUTHENTICATION_MECHANISM__DESCRIPTION :
- case JcaPackage.AUTHENTICATION_MECHANISM__AUTHENTICATION_MECHANISM :
- case JcaPackage.AUTHENTICATION_MECHANISM__AUTHENTICATION_MECHANISM_TYPE :
- case JcaPackage.AUTHENTICATION_MECHANISM__CREDENTIAL_INTERFACE :
- case JcaPackage.AUTHENTICATION_MECHANISM__CUSTOM_AUTH_MECH_TYPE :
- case JcaPackage.AUTHENTICATION_MECHANISM__DESCRIPTIONS : {
- fireNotifyChanged(notification);
- return;
- }
- }
- super.notifyChanged(notification);
- }
-
- /**
- * This adds to the collection of {@link org.eclipse.emf.edit.command.CommandParameter}s
- * describing all of the children that can be created under this object. <!-- begin-user-doc -->
- * <!-- end-user-doc -->
- *
- * @generated
- */
- @Override
- protected void collectNewChildDescriptors(Collection newChildDescriptors, Object object) {
- super.collectNewChildDescriptors(newChildDescriptors, object);
-
- newChildDescriptors.add(createChildParameter(JcaPackage.eINSTANCE.getAuthenticationMechanism_Descriptions(), CommonFactory.eINSTANCE.createDescription()));
-
- newChildDescriptors.add(createChildParameter(JcaPackage.eINSTANCE.getAuthenticationMechanism_Descriptions(), WscommonFactory.eINSTANCE.createDescriptionType()));
- }
-
- /**
- * Return the resource locator for this item provider's resources. <!-- begin-user-doc --> <!--
- * end-user-doc -->
- *
- * @generated
- */
- @Override
- public ResourceLocator getResourceLocator() {
- return J2EEPlugin.getDefault();
- }
-
- /**
- * This handles notification.
- *
- * @param Notifier
- * notifier - Notifies of change.
- * @param int
- * eventType - The event type.
- * @param EObject
- * feature - The reference object.
- * @param Object
- * oldValue - The old object reference.
- * @param Object
- * newValue - The new object reference.
- * @param int
- * index - The current of the object.
- */
- public void notifyChanged(Notifier notifier, int eventType, EObject feature, Object oldValue, Object newValue, int index) {
- JcaPackage pkg = JcaPackage.eINSTANCE;
- Notification msg = new ENotificationImpl((InternalEObject) notifier, eventType, feature.eContainmentFeature(), oldValue, newValue, index);
- if (feature == pkg.getAuthenticationMechanism_Description() || feature == pkg.getAuthenticationMechanism_AuthenticationMechanismType() || feature == pkg.getAuthenticationMechanism_CredentialInterface()) {
- fireNotifyChanged(msg);
- return;
- }// if
- super.notifyChanged(msg);
- }// notifyChanged
-
-}// AuthenticationMechanismItemProvider
diff --git a/plugins/org.eclipse.jst.j2ee.jca/jcaedit/org/eclipse/jst/j2ee/internal/jca/providers/ConfigPropertyItemProvider.java b/plugins/org.eclipse.jst.j2ee.jca/jcaedit/org/eclipse/jst/j2ee/internal/jca/providers/ConfigPropertyItemProvider.java
deleted file mode 100644
index 6d668fc..0000000
--- a/plugins/org.eclipse.jst.j2ee.jca/jcaedit/org/eclipse/jst/j2ee/internal/jca/providers/ConfigPropertyItemProvider.java
+++ /dev/null
@@ -1,282 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2003, 2005 IBM Corporation and others.
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
- *
- * Contributors:
- * IBM Corporation - initial API and implementation
- *******************************************************************************/
-package org.eclipse.jst.j2ee.internal.jca.providers;
-
-
-import java.util.Collection;
-import java.util.List;
-
-import org.eclipse.emf.common.notify.AdapterFactory;
-import org.eclipse.emf.common.notify.Notification;
-import org.eclipse.emf.common.notify.Notifier;
-import org.eclipse.emf.common.util.ResourceLocator;
-import org.eclipse.emf.ecore.EObject;
-import org.eclipse.emf.ecore.InternalEObject;
-import org.eclipse.emf.ecore.impl.ENotificationImpl;
-import org.eclipse.emf.edit.provider.ComposeableAdapterFactory;
-import org.eclipse.emf.edit.provider.IEditingDomainItemProvider;
-import org.eclipse.emf.edit.provider.IItemLabelProvider;
-import org.eclipse.emf.edit.provider.IItemPropertySource;
-import org.eclipse.emf.edit.provider.ITreeItemContentProvider;
-import org.eclipse.emf.edit.provider.ItemPropertyDescriptor;
-import org.eclipse.jst.j2ee.common.CommonFactory;
-import org.eclipse.jst.j2ee.internal.plugin.J2EEPlugin;
-import org.eclipse.jst.j2ee.jca.ConfigProperty;
-import org.eclipse.jst.j2ee.jca.JcaPackage;
-import org.eclipse.jst.j2ee.jca.internal.plugin.JCAResourceHandler;
-import org.eclipse.jst.j2ee.webservice.wscommon.WscommonFactory;
-
-/**
- * This is the item provider adpater for a Config property object.
- */
-public class ConfigPropertyItemProvider extends JcaItemProviderAdapter implements IEditingDomainItemProvider, ITreeItemContentProvider, IItemLabelProvider, IItemPropertySource {
-
- /**
- * This constructs an instance from a factory and a notifier.
- *
- * @param AdapterFactory
- * adapterFactory - Adapt factory
- */
- public ConfigPropertyItemProvider(AdapterFactory adapterFactory) {
- super(adapterFactory);
- }// ConfigPropertyItemProvider
-
- /**
- * This returns the property descriptors for the adapted class. <!-- begin-user-doc --> <!--
- * end-user-doc -->
- *
- * @generated
- */
- @Override
- public List getPropertyDescriptors(Object object) {
- if (itemPropertyDescriptors == null) {
- super.getPropertyDescriptors(object);
-
- addDescriptionPropertyDescriptor(object);
- addNamePropertyDescriptor(object);
- addTypePropertyDescriptor(object);
- addValuePropertyDescriptor(object);
- }
- return itemPropertyDescriptors;
- }
-
- /**
- * This adds a property descriptor for the Description feature. <!-- begin-user-doc --> <!--
- * end-user-doc -->
- *
- * @generated
- */
- protected void addDescriptionPropertyDescriptor(Object object) {
- itemPropertyDescriptors.add(new ItemPropertyDescriptor(((ComposeableAdapterFactory) adapterFactory).getRootAdapterFactory(), getString("_UI_ConfigProperty_description_feature"), //$NON-NLS-1$
- getString("_UI_PropertyDescriptor_description", "_UI_ConfigProperty_description_feature", "_UI_ConfigProperty_type"), //$NON-NLS-1$ //$NON-NLS-2$ //$NON-NLS-3$
- JcaPackage.eINSTANCE.getConfigProperty_Description(), true, ItemPropertyDescriptor.GENERIC_VALUE_IMAGE));
- }
-
- /**
- * This adds a property descriptor for the Name feature. <!-- begin-user-doc --> <!--
- * end-user-doc -->
- *
- * @generated
- */
- protected void addNamePropertyDescriptor(Object object) {
- itemPropertyDescriptors.add(new ItemPropertyDescriptor(((ComposeableAdapterFactory) adapterFactory).getRootAdapterFactory(), getString("_UI_ConfigProperty_name_feature"), //$NON-NLS-1$
- getString("_UI_PropertyDescriptor_description", "_UI_ConfigProperty_name_feature", "_UI_ConfigProperty_type"), //$NON-NLS-1$ //$NON-NLS-2$ //$NON-NLS-3$
- JcaPackage.eINSTANCE.getConfigProperty_Name(), true, ItemPropertyDescriptor.GENERIC_VALUE_IMAGE));
- }
-
- /**
- * This adds a property descriptor for the Type feature. <!-- begin-user-doc --> <!--
- * end-user-doc -->
- *
- * @generated
- */
- protected void addTypePropertyDescriptor(Object object) {
- itemPropertyDescriptors.add(new ItemPropertyDescriptor(((ComposeableAdapterFactory) adapterFactory).getRootAdapterFactory(), getString("_UI_ConfigProperty_type_feature"), //$NON-NLS-1$
- getString("_UI_PropertyDescriptor_description", "_UI_ConfigProperty_type_feature", "_UI_ConfigProperty_type"), //$NON-NLS-1$ //$NON-NLS-2$ //$NON-NLS-3$
- JcaPackage.eINSTANCE.getConfigProperty_Type(), true, ItemPropertyDescriptor.GENERIC_VALUE_IMAGE));
- }
-
- /**
- * This adds a property descriptor for the Value feature. <!-- begin-user-doc --> <!--
- * end-user-doc -->
- *
- * @generated
- */
- protected void addValuePropertyDescriptor(Object object) {
- itemPropertyDescriptors.add(new ItemPropertyDescriptor(((ComposeableAdapterFactory) adapterFactory).getRootAdapterFactory(), getString("_UI_ConfigProperty_value_feature"), //$NON-NLS-1$
- getString("_UI_PropertyDescriptor_description", "_UI_ConfigProperty_value_feature", "_UI_ConfigProperty_type"), //$NON-NLS-1$ //$NON-NLS-2$ //$NON-NLS-3$
- JcaPackage.eINSTANCE.getConfigProperty_Value(), true, ItemPropertyDescriptor.GENERIC_VALUE_IMAGE));
- }
-
- /**
- * This specifies how to implement {@link #getChildren}and
- * {@link org.eclipse.emf.edit.command.AddCommand}and
- * {@link org.eclipse.emf.edit.command.RemoveCommand}support in {@link #createCommand}. <!--
- * begin-user-doc --> <!-- end-user-doc -->
- *
- * @generated
- */
- @Override
- public Collection getChildrenReferences(Object object) {
- if (childrenReferences == null) {
- super.getChildrenReferences(object);
- }
- return childrenReferences;
- }
-
-
- /**
- * This returns the property descriptors for the adapted class.
- *
- * @param Object
- * object - The adapted class.
- * @return List
- */
- /*
- * public List getPropertyDescriptors(Object object) { if (itemPropertyDescriptors == null) {
- * super.getPropertyDescriptors(object);
- *
- * ConfigProperty f_configProperty = ((ConfigProperty)object); JcaPackage pkg =
- * JcaPackage.eINSTANCE;; // This is for the description feature. // itemPropertyDescriptors.add
- * (new ItemPropertyDescriptor
- * (((ComposeableAdapterFactory)adapterFactory).getRootAdapterFactory(), "Description", "The
- * description property of the config property", pkg.getConfigProperty_Description(), true,
- * ItemPropertyDescriptor.TEXT_VALUE_IMAGE)); // This is for the name feature. //
- * itemPropertyDescriptors.add (new ItemPropertyDescriptor
- * (((ComposeableAdapterFactory)adapterFactory).getRootAdapterFactory(), "Name", "The name
- * property of the config property", pkg.getConfigProperty_Name(), true,
- * ItemPropertyDescriptor.TEXT_VALUE_IMAGE)); // This is for the type feature. //
- * itemPropertyDescriptors.add (new ItemPropertyDescriptor
- * (((ComposeableAdapterFactory)adapterFactory).getRootAdapterFactory(), "Type", "The type
- * property of the config property", pkg.getConfigProperty_Type(), true,
- * ItemPropertyDescriptor.TEXT_VALUE_IMAGE)); // This is for the value feature. //
- * itemPropertyDescriptors.add (new ItemPropertyDescriptor
- * (((ComposeableAdapterFactory)adapterFactory).getRootAdapterFactory(), "Value", "The value
- * property of the config property", pkg.getConfigProperty_Value(), true,
- * ItemPropertyDescriptor.TEXT_VALUE_IMAGE));
- *
- * }// if return itemPropertyDescriptors; }// getPropertyDescriptors
- */
- /**
- * This returns the parent of the ConfigProperty.
- *
- * @param Object
- * object - The adapt class.
- * @return object
- */
- @Override
- public Object getParent(Object object) {
- return ((EObject) object).eContainer();
- }// getParent
-
- /**
- * This returns ConfigProperty.gif.
- *
- * @param Object
- * object - The adapt class.
- * @return object
- */
- @Override
- public Object getImage(Object object) {
- return J2EEPlugin.getPlugin().getImage("full/obj16/config_prop_obj"); //$NON-NLS-1$
- }// getImage
-
- /**
- * This returns text base on the object.
- *
- * @param Object
- * object - The adapt class.
- * @return object
- */
- @Override
- public String getText(Object object) {
- ConfigProperty configProperty = ((ConfigProperty) object);
- if (configProperty.getName() == null)
- return JCAResourceHandler.ConfigPropertyItemProvider_UI_0;
- return "ConfigProperty: " + configProperty.getName(); //$NON-NLS-1$
- }// getText
-
- /**
- * This handles notification by calling {@link #fireNotifyChanged fireNotifyChanged}. <!--
- * begin-user-doc --> <!-- end-user-doc -->
- *
- * @generated
- */
- @Override
- public void notifyChanged(Notification notification) {
- switch (notification.getFeatureID(ConfigProperty.class)) {
- case JcaPackage.CONFIG_PROPERTY__DESCRIPTION :
- case JcaPackage.CONFIG_PROPERTY__NAME :
- case JcaPackage.CONFIG_PROPERTY__TYPE :
- case JcaPackage.CONFIG_PROPERTY__VALUE :
- case JcaPackage.CONFIG_PROPERTY__DESCRIPTIONS : {
- fireNotifyChanged(notification);
- return;
- }
- }
- super.notifyChanged(notification);
- }
-
- /**
- * This adds to the collection of {@link org.eclipse.emf.edit.command.CommandParameter}s
- * describing all of the children that can be created under this object. <!-- begin-user-doc -->
- * <!-- end-user-doc -->
- *
- * @generated
- */
- @Override
- protected void collectNewChildDescriptors(Collection newChildDescriptors, Object object) {
- super.collectNewChildDescriptors(newChildDescriptors, object);
-
- newChildDescriptors.add(createChildParameter(JcaPackage.eINSTANCE.getConfigProperty_Descriptions(), CommonFactory.eINSTANCE.createDescription()));
-
- newChildDescriptors.add(createChildParameter(JcaPackage.eINSTANCE.getConfigProperty_Descriptions(), WscommonFactory.eINSTANCE.createDescriptionType()));
- }
-
- /**
- * Return the resource locator for this item provider's resources. <!-- begin-user-doc --> <!--
- * end-user-doc -->
- *
- * @generated
- */
- @Override
- public ResourceLocator getResourceLocator() {
- return J2EEPlugin.getDefault();
- }
-
- /**
- * This handles notification.
- *
- * @param Notifier
- * notifier - Notifies of change.
- * @param int
- * eventType - The event type.
- * @param EObject
- * feature - The reference object.
- * @param Object
- * oldValue - The old object reference.
- * @param Object
- * newValue - The new object reference.
- * @param int
- * index - The current of the object.
- */
- public void notifyChanged(Notifier notifier, int eventType, EObject feature, Object oldValue, Object newValue, int index) {
- JcaPackage pkg = JcaPackage.eINSTANCE;
- Notification msg = new ENotificationImpl((InternalEObject) notifier, eventType, feature.eContainmentFeature(), oldValue, newValue, index);
- if (feature == pkg.getConfigProperty_Description() || feature == pkg.getConfigProperty_Name() || feature == pkg.getConfigProperty_Type() || feature == pkg.getConfigProperty_Value()) {
-
- fireNotifyChanged(msg);
- return;
- }// if
- super.notifyChanged(msg);
- }// notifyChanged
-
-}// ConfigPropertyItemProvider
diff --git a/plugins/org.eclipse.jst.j2ee.jca/jcaedit/org/eclipse/jst/j2ee/internal/jca/providers/ConnectionDefinitionItemProvider.java b/plugins/org.eclipse.jst.j2ee.jca/jcaedit/org/eclipse/jst/j2ee/internal/jca/providers/ConnectionDefinitionItemProvider.java
deleted file mode 100644
index 7ea966a..0000000
--- a/plugins/org.eclipse.jst.j2ee.jca/jcaedit/org/eclipse/jst/j2ee/internal/jca/providers/ConnectionDefinitionItemProvider.java
+++ /dev/null
@@ -1,220 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2003, 2006 IBM Corporation and others.
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
- *
- * Contributors:
- * IBM Corporation - initial API and implementation
- *******************************************************************************/
-package org.eclipse.jst.j2ee.internal.jca.providers;
-
-
-import java.util.Collection;
-import java.util.List;
-
-import org.eclipse.emf.common.notify.AdapterFactory;
-import org.eclipse.emf.common.notify.Notification;
-import org.eclipse.emf.common.util.ResourceLocator;
-import org.eclipse.emf.edit.provider.ComposeableAdapterFactory;
-import org.eclipse.emf.edit.provider.IEditingDomainItemProvider;
-import org.eclipse.emf.edit.provider.IItemLabelProvider;
-import org.eclipse.emf.edit.provider.IItemPropertySource;
-import org.eclipse.emf.edit.provider.ITreeItemContentProvider;
-import org.eclipse.emf.edit.provider.ItemPropertyDescriptor;
-import org.eclipse.emf.edit.provider.ItemProviderAdapter;
-import org.eclipse.jst.j2ee.jca.ConnectionDefinition;
-import org.eclipse.jst.j2ee.jca.JcaFactory;
-import org.eclipse.jst.j2ee.jca.JcaPackage;
-import org.eclipse.jst.j2ee.jca.internal.plugin.JCAResourceHandler;
-import org.eclipse.jst.j2ee.jca.internal.plugin.JcaPlugin;
-
-/**
- * This is the item provider adpater for a {@link com.ibm.etools.jca.ConnectionDefinition}object.
- * <!-- begin-user-doc --> <!-- end-user-doc -->
- *
- * @generated
- */
-public class ConnectionDefinitionItemProvider extends ItemProviderAdapter implements IEditingDomainItemProvider, ITreeItemContentProvider, IItemLabelProvider, IItemPropertySource {
- /**
- * This constructs an instance from a factory and a notifier. <!-- begin-user-doc --> <!--
- * end-user-doc -->
- *
- * @generated
- */
- public ConnectionDefinitionItemProvider(AdapterFactory adapterFactory) {
- super(adapterFactory);
- }
-
- /**
- * This returns the property descriptors for the adapted class. <!-- begin-user-doc --> <!--
- * end-user-doc -->
- *
- * @generated
- */
- @Override
- public List getPropertyDescriptors(Object object) {
- if (itemPropertyDescriptors == null) {
- super.getPropertyDescriptors(object);
-
- addManagedConnectionFactoryClassPropertyDescriptor(object);
- addConnectionFactoryInterfacePropertyDescriptor(object);
- addConnectionFactoryImplClassPropertyDescriptor(object);
- addConnectionInterfacePropertyDescriptor(object);
- addConnectionImplClassPropertyDescriptor(object);
- }
- return itemPropertyDescriptors;
- }
-
- /**
- * This adds a property descriptor for the Managed Connection Factory Class feature. <!--
- * begin-user-doc --> <!-- end-user-doc -->
- *
- * @generated
- */
- protected void addManagedConnectionFactoryClassPropertyDescriptor(Object object) {
- itemPropertyDescriptors.add(new ItemPropertyDescriptor(((ComposeableAdapterFactory) adapterFactory).getRootAdapterFactory(), getString("_UI_ConnectionDefinition_managedConnectionFactoryClass_feature"), //$NON-NLS-1$
- getString("_UI_PropertyDescriptor_description", "_UI_ConnectionDefinition_managedConnectionFactoryClass_feature", "_UI_ConnectionDefinition_type"), //$NON-NLS-1$ //$NON-NLS-2$ //$NON-NLS-3$
- JcaPackage.eINSTANCE.getConnectionDefinition_ManagedConnectionFactoryClass(), true, ItemPropertyDescriptor.GENERIC_VALUE_IMAGE));
- }
-
- /**
- * This adds a property descriptor for the Connection Factory Interface feature. <!--
- * begin-user-doc --> <!-- end-user-doc -->
- *
- * @generated
- */
- protected void addConnectionFactoryInterfacePropertyDescriptor(Object object) {
- itemPropertyDescriptors.add(new ItemPropertyDescriptor(((ComposeableAdapterFactory) adapterFactory).getRootAdapterFactory(), getString("_UI_ConnectionDefinition_connectionFactoryInterface_feature"), //$NON-NLS-1$
- getString("_UI_PropertyDescriptor_description", "_UI_ConnectionDefinition_connectionFactoryInterface_feature", "_UI_ConnectionDefinition_type"), //$NON-NLS-1$ //$NON-NLS-2$ //$NON-NLS-3$
- JcaPackage.eINSTANCE.getConnectionDefinition_ConnectionFactoryInterface(), true, ItemPropertyDescriptor.GENERIC_VALUE_IMAGE));
- }
-
- /**
- * This adds a property descriptor for the Connection Factory Impl Class feature. <!--
- * begin-user-doc --> <!-- end-user-doc -->
- *
- * @generated
- */
- protected void addConnectionFactoryImplClassPropertyDescriptor(Object object) {
- itemPropertyDescriptors.add(new ItemPropertyDescriptor(((ComposeableAdapterFactory) adapterFactory).getRootAdapterFactory(), getString("_UI_ConnectionDefinition_connectionFactoryImplClass_feature"), //$NON-NLS-1$
- getString("_UI_PropertyDescriptor_description", "_UI_ConnectionDefinition_connectionFactoryImplClass_feature", "_UI_ConnectionDefinition_type"), //$NON-NLS-1$ //$NON-NLS-2$ //$NON-NLS-3$
- JcaPackage.eINSTANCE.getConnectionDefinition_ConnectionFactoryImplClass(), true, ItemPropertyDescriptor.GENERIC_VALUE_IMAGE));
- }
-
- /**
- * This adds a property descriptor for the Connection Interface feature. <!-- begin-user-doc -->
- * <!-- end-user-doc -->
- *
- * @generated
- */
- protected void addConnectionInterfacePropertyDescriptor(Object object) {
- itemPropertyDescriptors.add(new ItemPropertyDescriptor(((ComposeableAdapterFactory) adapterFactory).getRootAdapterFactory(), getString("_UI_ConnectionDefinition_connectionInterface_feature"), //$NON-NLS-1$
- getString("_UI_PropertyDescriptor_description", "_UI_ConnectionDefinition_connectionInterface_feature", "_UI_ConnectionDefinition_type"), //$NON-NLS-1$ //$NON-NLS-2$ //$NON-NLS-3$
- JcaPackage.eINSTANCE.getConnectionDefinition_ConnectionInterface(), true, ItemPropertyDescriptor.GENERIC_VALUE_IMAGE));
- }
-
- /**
- * This adds a property descriptor for the Connection Impl Class feature. <!-- begin-user-doc
- * --> <!-- end-user-doc -->
- *
- * @generated
- */
- protected void addConnectionImplClassPropertyDescriptor(Object object) {
- itemPropertyDescriptors.add(new ItemPropertyDescriptor(((ComposeableAdapterFactory) adapterFactory).getRootAdapterFactory(), getString("_UI_ConnectionDefinition_connectionImplClass_feature"), //$NON-NLS-1$
- getString("_UI_PropertyDescriptor_description", "_UI_ConnectionDefinition_connectionImplClass_feature", "_UI_ConnectionDefinition_type"), //$NON-NLS-1$ //$NON-NLS-2$ //$NON-NLS-3$
- JcaPackage.eINSTANCE.getConnectionDefinition_ConnectionImplClass(), true, ItemPropertyDescriptor.GENERIC_VALUE_IMAGE));
- }
-
- /**
- * This specifies how to implement {@link #getChildren}and
- * {@link org.eclipse.emf.edit.command.AddCommand}and
- * {@link org.eclipse.emf.edit.command.RemoveCommand}support in {@link #createCommand}. <!--
- * begin-user-doc --> <!-- end-user-doc -->
- *
- * @generated
- */
- @Override
- public Collection getChildrenReferences(Object object) {
- if (childrenReferences == null) {
- super.getChildrenReferences(object);
- childrenReferences.add(JcaPackage.eINSTANCE.getConnectionDefinition_ConfigProperties());
- }
- return childrenReferences;
- }
-
-
- /**
- * This returns ConnectionDefinition.gif. <!-- begin-user-doc --> <!-- end-user-doc -->
- *
- * @generated
- */
- @Override
- public Object getImage(Object object) {
- return getResourceLocator().getImage("full/obj16/ConnectionDefinition"); //$NON-NLS-1$
- }
-
- /**
- * This returns the label text for the adapted class. <!-- begin-user-doc --> <!-- end-user-doc
- * -->
- *
- * @generated
- */
-
-
- @Override
- public String getText(Object object) {
- String label = ((ConnectionDefinition) object).getManagedConnectionFactoryClass();
- return label == null || label.length() == 0 ? JCAResourceHandler._UI_ConnectionDefinition_type :
- JCAResourceHandler._UI_ConnectionDefinition_type + " " + label; //$NON-NLS-1$
- }
-
- /**
- * This handles notification by calling {@link #fireNotifyChanged fireNotifyChanged}. <!--
- * begin-user-doc --> <!-- end-user-doc -->
- *
- * @generated
- */
- @Override
- public void notifyChanged(Notification notification) {
- switch (notification.getFeatureID(ConnectionDefinition.class)) {
- case JcaPackage.CONNECTION_DEFINITION__MANAGED_CONNECTION_FACTORY_CLASS :
- case JcaPackage.CONNECTION_DEFINITION__CONNECTION_FACTORY_INTERFACE :
- case JcaPackage.CONNECTION_DEFINITION__CONNECTION_FACTORY_IMPL_CLASS :
- case JcaPackage.CONNECTION_DEFINITION__CONNECTION_INTERFACE :
- case JcaPackage.CONNECTION_DEFINITION__CONNECTION_IMPL_CLASS :
- case JcaPackage.CONNECTION_DEFINITION__CONFIG_PROPERTIES : {
- fireNotifyChanged(notification);
- return;
- }
- }
- super.notifyChanged(notification);
- }
-
- /**
- * This adds to the collection of {@link org.eclipse.emf.edit.command.CommandParameter}s
- * describing all of the children that can be created under this object. <!-- begin-user-doc -->
- * <!-- end-user-doc -->
- *
- * @generated
- */
- @Override
- protected void collectNewChildDescriptors(Collection newChildDescriptors, Object object) {
- super.collectNewChildDescriptors(newChildDescriptors, object);
-
- newChildDescriptors.add(createChildParameter(JcaPackage.eINSTANCE.getConnectionDefinition_ConfigProperties(), JcaFactory.eINSTANCE.createConfigProperty()));
- }
-
- /**
- * Return the resource locator for this item provider's resources. <!-- begin-user-doc --> <!--
- * end-user-doc -->
- *
- * @generated
- */
- @Override
- public ResourceLocator getResourceLocator() {
- //return J2EEPlugin.getDefault();
- return JcaPlugin.getPlugin();
- }
-}
diff --git a/plugins/org.eclipse.jst.j2ee.jca/jcaedit/org/eclipse/jst/j2ee/internal/jca/providers/ConnectorItemProvider.java b/plugins/org.eclipse.jst.j2ee.jca/jcaedit/org/eclipse/jst/j2ee/internal/jca/providers/ConnectorItemProvider.java
deleted file mode 100644
index 8b60cf5..0000000
--- a/plugins/org.eclipse.jst.j2ee.jca/jcaedit/org/eclipse/jst/j2ee/internal/jca/providers/ConnectorItemProvider.java
+++ /dev/null
@@ -1,284 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2003, 2005 IBM Corporation and others.
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
- *
- * Contributors:
- * IBM Corporation - initial API and implementation
- *******************************************************************************/
-package org.eclipse.jst.j2ee.internal.jca.providers;
-
-
-
-import java.util.Collection;
-import java.util.List;
-
-import org.eclipse.emf.common.notify.AdapterFactory;
-import org.eclipse.emf.common.notify.Notification;
-import org.eclipse.emf.common.util.ResourceLocator;
-import org.eclipse.emf.ecore.EObject;
-import org.eclipse.emf.ecore.EReference;
-import org.eclipse.emf.edit.provider.ComposeableAdapterFactory;
-import org.eclipse.emf.edit.provider.ItemPropertyDescriptor;
-import org.eclipse.jst.j2ee.common.internal.provider.CompatibilityDescriptionGroupItemProvider;
-import org.eclipse.jst.j2ee.internal.plugin.J2EEPlugin;
-import org.eclipse.jst.j2ee.jca.Connector;
-import org.eclipse.jst.j2ee.jca.JcaFactory;
-import org.eclipse.jst.j2ee.jca.JcaPackage;
-
-
-/**
- * This is the item provider adpater for a Conenctor projects
- */
-public class ConnectorItemProvider extends CompatibilityDescriptionGroupItemProvider {
-
- /**
- * This constructs an instance from a factory and a notifier.
- *
- * @param AdapterFactory
- * adapterFactory - An adapter factory.
- */
- public ConnectorItemProvider(AdapterFactory adapterFactory) {
- super(adapterFactory);
- }// ConnectorItemProvider
-
- /**
- * This returns the property descriptors for the adapted class. <!-- begin-user-doc --> <!--
- * end-user-doc -->
- *
- * @generated
- */
- @Override
- public List getPropertyDescriptors(Object object) {
- if (itemPropertyDescriptors == null) {
- super.getPropertyDescriptors(object);
-
- addVendorNamePropertyDescriptor(object);
- addSpecVersionPropertyDescriptor(object);
- addEisTypePropertyDescriptor(object);
- addVersionPropertyDescriptor(object);
- }
- return itemPropertyDescriptors;
- }
-
- /**
- * This adds a property descriptor for the Vendor Name feature. <!-- begin-user-doc --> <!--
- * end-user-doc -->
- *
- * @generated
- */
- protected void addVendorNamePropertyDescriptor(Object object) {
- itemPropertyDescriptors.add(new ItemPropertyDescriptor(((ComposeableAdapterFactory) adapterFactory).getRootAdapterFactory(), getString("_UI_Connector_vendorName_feature"), //$NON-NLS-1$
- getString("_UI_PropertyDescriptor_description", "_UI_Connector_vendorName_feature", "_UI_Connector_type"), //$NON-NLS-1$ //$NON-NLS-2$ //$NON-NLS-3$
- JcaPackage.eINSTANCE.getConnector_VendorName(), true, ItemPropertyDescriptor.GENERIC_VALUE_IMAGE));
- }
-
- /**
- * This adds a property descriptor for the Spec Version feature. <!-- begin-user-doc --> <!--
- * end-user-doc -->
- *
- * @generated
- */
- protected void addSpecVersionPropertyDescriptor(Object object) {
- itemPropertyDescriptors.add(new ItemPropertyDescriptor(((ComposeableAdapterFactory) adapterFactory).getRootAdapterFactory(), getString("_UI_Connector_specVersion_feature"), //$NON-NLS-1$
- getString("_UI_PropertyDescriptor_description", "_UI_Connector_specVersion_feature", "_UI_Connector_type"), //$NON-NLS-1$ //$NON-NLS-2$ //$NON-NLS-3$
- JcaPackage.eINSTANCE.getConnector_SpecVersion(), true, ItemPropertyDescriptor.GENERIC_VALUE_IMAGE));
- }
-
- /**
- * This adds a property descriptor for the Eis Type feature. <!-- begin-user-doc --> <!--
- * end-user-doc -->
- *
- * @generated
- */
- protected void addEisTypePropertyDescriptor(Object object) {
- itemPropertyDescriptors.add(new ItemPropertyDescriptor(((ComposeableAdapterFactory) adapterFactory).getRootAdapterFactory(), getString("_UI_Connector_eisType_feature"), //$NON-NLS-1$
- getString("_UI_PropertyDescriptor_description", "_UI_Connector_eisType_feature", "_UI_Connector_type"), //$NON-NLS-1$ //$NON-NLS-2$ //$NON-NLS-3$
- JcaPackage.eINSTANCE.getConnector_EisType(), true, ItemPropertyDescriptor.GENERIC_VALUE_IMAGE));
- }
-
- /**
- * This adds a property descriptor for the Version feature. <!-- begin-user-doc --> <!--
- * end-user-doc -->
- *
- * @generated
- */
- protected void addVersionPropertyDescriptor(Object object) {
- itemPropertyDescriptors.add(new ItemPropertyDescriptor(((ComposeableAdapterFactory) adapterFactory).getRootAdapterFactory(), getString("_UI_Connector_version_feature"), //$NON-NLS-1$
- getString("_UI_PropertyDescriptor_description", "_UI_Connector_version_feature", "_UI_Connector_type"), //$NON-NLS-1$ //$NON-NLS-2$ //$NON-NLS-3$
- JcaPackage.eINSTANCE.getConnector_Version(), true, ItemPropertyDescriptor.GENERIC_VALUE_IMAGE));
- }
-
- /**
- * This returns the property descriptors for the adapted class.
- *
- * @param Object
- * object - The current property
- * @return List
- */
- /*
- * public List getPropertyDescriptors(Object object) {
- *
- * if(itemPropertyDescriptors == null) { super.getPropertyDescriptors(object);
- *
- * Connector f_connector = ((Connector)object); JcaPackage pkg = JcaPackage.eINSTANCE;; // This
- * is for the displayName feature. // itemPropertyDescriptors.add (new ItemPropertyDescriptor
- * (((ComposeableAdapterFactory)adapterFactory).getRootAdapterFactory(), "Display Name", "The
- * display name property of the connector", pkg.getConnector_DisplayName(), true,
- * ItemPropertyDescriptor.TEXT_VALUE_IMAGE)); // This is for the description feature. //
- * itemPropertyDescriptors.add (new ItemPropertyDescriptor
- * (((ComposeableAdapterFactory)adapterFactory).getRootAdapterFactory(), "Description", "The
- * description property of the connector", pkg.getConnector_Description(), true,
- * ItemPropertyDescriptor.TEXT_VALUE_IMAGE)); // This is for the smallIcon feature. //
- * itemPropertyDescriptors.add (new ItemPropertyDescriptor
- * (((ComposeableAdapterFactory)adapterFactory).getRootAdapterFactory(), "Small Icon", "The
- * small icon property of the connector", pkg.getConnector_SmallIcon(), true,
- * ItemPropertyDescriptor.TEXT_VALUE_IMAGE)); // This is for the largeIcon feature. //
- * itemPropertyDescriptors.add (new ItemPropertyDescriptor
- * (((ComposeableAdapterFactory)adapterFactory).getRootAdapterFactory(), "Large Icon", "The
- * large icon property of the connector", pkg.getConnector_LargeIcon(), true,
- * ItemPropertyDescriptor.TEXT_VALUE_IMAGE)); // This is for the vendorName feature. //
- * itemPropertyDescriptors.add (new ItemPropertyDescriptor
- * (((ComposeableAdapterFactory)adapterFactory).getRootAdapterFactory(), "Vendor Name", "The
- * vendor name property of the connector", pkg.getConnector_VendorName(), true,
- * ItemPropertyDescriptor.TEXT_VALUE_IMAGE)); // This is for the specVersion feature. //
- * itemPropertyDescriptors.add (new ItemPropertyDescriptor
- * (((ComposeableAdapterFactory)adapterFactory).getRootAdapterFactory(), "Spec Version", "The
- * spec version property of the connector", pkg.getConnector_SpecVersion(), true,
- * ItemPropertyDescriptor.TEXT_VALUE_IMAGE)); // This is for the eisType feature. //
- * itemPropertyDescriptors.add (new ItemPropertyDescriptor
- * (((ComposeableAdapterFactory)adapterFactory).getRootAdapterFactory(), "Eis Type", "The eis
- * type property of the connector", pkg.getConnector_EisType(), true,
- * ItemPropertyDescriptor.TEXT_VALUE_IMAGE)); // This is for the version feature. //
- * itemPropertyDescriptors.add (new ItemPropertyDescriptor
- * (((ComposeableAdapterFactory)adapterFactory).getRootAdapterFactory(), "Version", "The version
- * property of the connector", pkg.getConnector_Version(), true,
- * ItemPropertyDescriptor.TEXT_VALUE_IMAGE)); // This is for the license feature. //
- * itemPropertyDescriptors.add (new ItemPropertyDescriptor
- * (((ComposeableAdapterFactory)adapterFactory).getRootAdapterFactory(), "License", "The license
- * of the connector", pkg.getConnector_License(), false)); // This is for the resourceAdapter
- * feature. // itemPropertyDescriptors.add (new ItemPropertyDescriptor
- * (((ComposeableAdapterFactory)adapterFactory).getRootAdapterFactory(), "Resource Adapter",
- * "The resource adapter of the connector", pkg.getConnector_ResourceAdapter(), false)); }
- * return itemPropertyDescriptors; }// getPropertyDescriptors
- */
- /**
- * Returns a collection of children references.
- *
- * @param Object
- * object - Object to get children references of.
- * @return Colelction
- */
- @Override
- public Collection getChildrenReferences(Object object) {
- if (childrenReferences == null) {
- super.getChildrenReferences(object);
- childrenReferences.add(JcaPackage.eINSTANCE.getConnector_License());
- childrenReferences.add(JcaPackage.eINSTANCE.getConnector_ResourceAdapter());
- }// if
- return childrenReferences;
- }// getChildrenReferences
-
- /**
- * <!-- begin-user-doc --> <!-- end-user-doc -->
- *
- * @generated
- */
- @Override
- protected EReference getChildReference(Object object, Object child) {
- // Check the type of the specified child object and return the proper feature to use for
- // adding (see {@link AddCommand}) it as a child.
-
- return super.getChildReference(object, child);
- }
-
-
- /**
- * This returns the parent of the Connector.
- *
- * @param Object
- * object - Object to return the parent of.
- * @return Object
- */
- @Override
- public Object getParent(Object object) {
- return ((EObject) object).eContainer();
- }// getParent
-
- /**
- * This returns Connector.gif.
- *
- * @param Object -
- * The object to get the image for.
- * @return Object
- */
- @Override
- public Object getImage(Object object) {
- return J2EEPlugin.getPlugin().getImage("full/obj16/connection_obj"); //$NON-NLS-1$
- }// getImage
-
- /**
- * Get the display name.
- *
- * @param Object
- * object - The object to get the name for.
- * @return String
- */
- @Override
- public String getText(Object object) {
- Connector connector = ((Connector) object);
- return "Connector " + connector.getDisplayName(); //$NON-NLS-1$
- }// getText
-
- /**
- * This handles notification by calling {@link #fireNotifyChanged fireNotifyChanged}. <!--
- * begin-user-doc --> <!-- end-user-doc -->
- *
- * @generated
- */
- @Override
- public void notifyChanged(Notification notification) {
- switch (notification.getFeatureID(Connector.class)) {
- case JcaPackage.CONNECTOR__VENDOR_NAME :
- case JcaPackage.CONNECTOR__SPEC_VERSION :
- case JcaPackage.CONNECTOR__EIS_TYPE :
- case JcaPackage.CONNECTOR__VERSION :
- case JcaPackage.CONNECTOR__LICENSE :
- case JcaPackage.CONNECTOR__RESOURCE_ADAPTER : {
- fireNotifyChanged(notification);
- return;
- }
- }
- super.notifyChanged(notification);
- }
-
- /**
- * This adds to the collection of {@link org.eclipse.emf.edit.command.CommandParameter}s
- * describing all of the children that can be created under this object. <!-- begin-user-doc -->
- * <!-- end-user-doc -->
- *
- * @generated
- */
- @Override
- protected void collectNewChildDescriptors(Collection newChildDescriptors, Object object) {
- super.collectNewChildDescriptors(newChildDescriptors, object);
-
- newChildDescriptors.add(createChildParameter(JcaPackage.eINSTANCE.getConnector_License(), JcaFactory.eINSTANCE.createLicense()));
-
- newChildDescriptors.add(createChildParameter(JcaPackage.eINSTANCE.getConnector_ResourceAdapter(), JcaFactory.eINSTANCE.createResourceAdapter()));
- }
-
- /**
- * Return the resource locator for this item provider's resources. <!-- begin-user-doc --> <!--
- * end-user-doc -->
- *
- * @generated
- */
- @Override
- public ResourceLocator getResourceLocator() {
- return J2EEPlugin.getDefault();
- }
-
-}// ConenctorItemProvider
diff --git a/plugins/org.eclipse.jst.j2ee.jca/jcaedit/org/eclipse/jst/j2ee/internal/jca/providers/InboundResourceAdapterItemProvider.java b/plugins/org.eclipse.jst.j2ee.jca/jcaedit/org/eclipse/jst/j2ee/internal/jca/providers/InboundResourceAdapterItemProvider.java
deleted file mode 100644
index 0da4b2c..0000000
--- a/plugins/org.eclipse.jst.j2ee.jca/jcaedit/org/eclipse/jst/j2ee/internal/jca/providers/InboundResourceAdapterItemProvider.java
+++ /dev/null
@@ -1,145 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2003, 2005 IBM Corporation and others.
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
- *
- * Contributors:
- * IBM Corporation - initial API and implementation
- *******************************************************************************/
-package org.eclipse.jst.j2ee.internal.jca.providers;
-
-
-import java.util.Collection;
-import java.util.List;
-
-import org.eclipse.emf.common.notify.AdapterFactory;
-import org.eclipse.emf.common.notify.Notification;
-import org.eclipse.emf.common.util.ResourceLocator;
-import org.eclipse.emf.edit.provider.IEditingDomainItemProvider;
-import org.eclipse.emf.edit.provider.IItemLabelProvider;
-import org.eclipse.emf.edit.provider.IItemPropertySource;
-import org.eclipse.emf.edit.provider.ITreeItemContentProvider;
-import org.eclipse.emf.edit.provider.ItemProviderAdapter;
-import org.eclipse.jst.j2ee.jca.InboundResourceAdapter;
-import org.eclipse.jst.j2ee.jca.JcaFactory;
-import org.eclipse.jst.j2ee.jca.JcaPackage;
-import org.eclipse.jst.j2ee.jca.internal.plugin.JCAResourceHandler;
-import org.eclipse.jst.j2ee.jca.internal.plugin.JcaPlugin;
-
-/**
- * This is the item provider adpater for a {@link com.ibm.etools.jca.InboundResourceAdapter}object.
- * <!-- begin-user-doc --> <!-- end-user-doc -->
- *
- * @generated
- */
-public class InboundResourceAdapterItemProvider extends ItemProviderAdapter implements IEditingDomainItemProvider, ITreeItemContentProvider, IItemLabelProvider, IItemPropertySource {
- /**
- * This constructs an instance from a factory and a notifier. <!-- begin-user-doc --> <!--
- * end-user-doc -->
- *
- * @generated
- */
- public InboundResourceAdapterItemProvider(AdapterFactory adapterFactory) {
- super(adapterFactory);
- }
-
- /**
- * This returns the property descriptors for the adapted class. <!-- begin-user-doc --> <!--
- * end-user-doc -->
- *
- * @generated
- */
- @Override
- public List getPropertyDescriptors(Object object) {
- if (itemPropertyDescriptors == null) {
- super.getPropertyDescriptors(object);
-
- }
- return itemPropertyDescriptors;
- }
-
- /**
- * This specifies how to implement {@link #getChildren}and
- * {@link org.eclipse.emf.edit.command.AddCommand}and
- * {@link org.eclipse.emf.edit.command.RemoveCommand}support in {@link #createCommand}. <!--
- * begin-user-doc --> <!-- end-user-doc -->
- *
- * @generated
- */
- @Override
- public Collection getChildrenReferences(Object object) {
- if (childrenReferences == null) {
- super.getChildrenReferences(object);
- childrenReferences.add(JcaPackage.eINSTANCE.getInboundResourceAdapter_MessageAdapter());
- }
- return childrenReferences;
- }
-
-
- /**
- * This returns InboundResourceAdapter.gif. <!-- begin-user-doc --> <!-- end-user-doc -->
- *
- * @generated
- */
- @Override
- public Object getImage(Object object) {
- return getResourceLocator().getImage("full/obj16/InboundResourceAdapter"); //$NON-NLS-1$
- }
-
- /**
- * This returns the label text for the adapted class. <!-- begin-user-doc --> <!-- end-user-doc
- * -->
- *
- * @generated
- */
- @Override
- public String getText(Object object) {
- return JCAResourceHandler._UI_InboundResourceAdapter_type;
- //return getString("_UI_InboundResourceAdapter_type"); //$NON-NLS-1$
- }
-
- /**
- * This handles notification by calling {@link #fireNotifyChanged fireNotifyChanged}. <!--
- * begin-user-doc --> <!-- end-user-doc -->
- *
- * @generated
- */
- @Override
- public void notifyChanged(Notification notification) {
- switch (notification.getFeatureID(InboundResourceAdapter.class)) {
- case JcaPackage.INBOUND_RESOURCE_ADAPTER__MESSAGE_ADAPTER : {
- fireNotifyChanged(notification);
- return;
- }
- }
- super.notifyChanged(notification);
- }
-
- /**
- * This adds to the collection of {@link org.eclipse.emf.edit.command.CommandParameter}s
- * describing all of the children that can be created under this object. <!-- begin-user-doc -->
- * <!-- end-user-doc -->
- *
- * @generated
- */
- @Override
- protected void collectNewChildDescriptors(Collection newChildDescriptors, Object object) {
- super.collectNewChildDescriptors(newChildDescriptors, object);
-
- newChildDescriptors.add(createChildParameter(JcaPackage.eINSTANCE.getInboundResourceAdapter_MessageAdapter(), JcaFactory.eINSTANCE.createMessageAdapter()));
- }
-
- /**
- * Return the resource locator for this item provider's resources. <!-- begin-user-doc --> <!--
- * end-user-doc -->
- *
- * @generated
- */
- @Override
- public ResourceLocator getResourceLocator() {
- return JcaPlugin.getPlugin();
- //return J2EEPlugin.getDefault();
- }
-}
diff --git a/plugins/org.eclipse.jst.j2ee.jca/jcaedit/org/eclipse/jst/j2ee/internal/jca/providers/JcaEditPlugin.java b/plugins/org.eclipse.jst.j2ee.jca/jcaedit/org/eclipse/jst/j2ee/internal/jca/providers/JcaEditPlugin.java
deleted file mode 100644
index 872528e..0000000
--- a/plugins/org.eclipse.jst.j2ee.jca/jcaedit/org/eclipse/jst/j2ee/internal/jca/providers/JcaEditPlugin.java
+++ /dev/null
@@ -1,123 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2003, 2005 IBM Corporation and others.
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
- *
- * Contributors:
- * IBM Corporation - initial API and implementation
- *******************************************************************************/
-package org.eclipse.jst.j2ee.internal.jca.providers;
-
-
-
-import java.net.MalformedURLException;
-import java.net.URL;
-import java.text.MessageFormat;
-
-import org.eclipse.core.runtime.CoreException;
-import org.eclipse.core.runtime.IPluginDescriptor;
-import org.eclipse.core.runtime.Plugin;
-import org.eclipse.jst.j2ee.jca.JcaFactory;
-import org.eclipse.jst.j2ee.jca.JcaPackage;
-import org.eclipse.jst.j2ee.jca.internal.impl.JcaFactoryImpl;
-import org.eclipse.jst.j2ee.jca.internal.plugin.JcaPlugin;
-
-
-/**
- * This is the central singleton for the jca plugin.
- */
-public class JcaEditPlugin extends Plugin {
- /**
- * Keep track of the singleton.
- */
- protected static JcaEditPlugin plugin;
-
- /**
- * Keep track of the jca package.
- */
- protected JcaPackage jcaPackage;
-
- /**
- * Create the instance.
- */
- public JcaEditPlugin(IPluginDescriptor descriptor) {
- super(descriptor);
-
- // Remember the static instance.
- //
- plugin = this;
- }
-
- /**
- * Get the one jca package.
- */
- public JcaPackage getJcaPackage() {
- return jcaPackage;
- }
-
- /**
- * Get the one jca factory.
- */
- public JcaFactory getJcaFactory() {
- return (JcaFactory) jcaPackage.getEFactoryInstance();
- }
-
- /**
- * Do initialization stuff here.
- */
- @Override
- public void startup() throws CoreException {
- super.startup();
- jcaPackage = JcaFactoryImpl.getPackage();
- }
-
- /**
- * Get the singleton instance.
- */
- public static JcaEditPlugin getPlugin() {
- return plugin;
- }
-
- /**
- * Get a .gif from the icons folder.
- */
- public Object getImage(String key) {
- try {
- return new URL(getDescriptor().getInstallURL(), "icons/" + key + ".gif"); //$NON-NLS-1$ //$NON-NLS-2$
- } catch (MalformedURLException c) {
- JcaPlugin.logError("Failed to load image for '" + key + "'", c);//$NON-NLS-1$ //$NON-NLS-2$
- }
-
- return null;
- }
-
- /**
- * Get a translated string from the resource bundle.
- */
- public String getString(String key) {
- return getDescriptor().getResourceBundle().getString(key);
- }
-
- /**
- * Get a translated string from the resource bundle, with an object substitution.
- */
- public String getString(String key, Object s1) {
- return MessageFormat.format(getString(key), new Object[]{s1});
- }
-
- /**
- * Get a translated string from the resource bundle, with two object substitutions.
- */
- public String getString(String key, Object s1, Object s2) {
- return MessageFormat.format(getString(key), new Object[]{s1, s2});
- }
-
- /**
- * Get a translated string from the resource bundle, with three object substitutions.
- */
- public String getString(String key, Object s1, Object s2, Object s3) {
- return MessageFormat.format(getString(key), new Object[]{s1, s2, s3});
- }
-}
diff --git a/plugins/org.eclipse.jst.j2ee.jca/jcaedit/org/eclipse/jst/j2ee/internal/jca/providers/JcaItemProviderAdapter.java b/plugins/org.eclipse.jst.j2ee.jca/jcaedit/org/eclipse/jst/j2ee/internal/jca/providers/JcaItemProviderAdapter.java
deleted file mode 100644
index e5f4bcd..0000000
--- a/plugins/org.eclipse.jst.j2ee.jca/jcaedit/org/eclipse/jst/j2ee/internal/jca/providers/JcaItemProviderAdapter.java
+++ /dev/null
@@ -1,70 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2003, 2005 IBM Corporation and others.
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
- *
- * Contributors:
- * IBM Corporation - initial API and implementation
- *******************************************************************************/
-package org.eclipse.jst.j2ee.internal.jca.providers;
-
-
-
-import org.eclipse.emf.common.command.Command;
-import org.eclipse.emf.common.notify.AdapterFactory;
-import org.eclipse.emf.ecore.EPackage;
-import org.eclipse.emf.edit.command.CommandParameter;
-import org.eclipse.emf.edit.domain.EditingDomain;
-import org.eclipse.emf.edit.provider.ItemProviderAdapter;
-import org.eclipse.jst.j2ee.jca.JcaFactory;
-import org.eclipse.jst.j2ee.jca.JcaPackage;
-
-
-/**
- * This extended item provider supports the following commands:
- * <ul>
- * <li>{@link CreateChildCommand}
- * </ul>
- * <p>
- * The commands are implemented uniformly on all our item adapters using this common base class.
- */
-public class JcaItemProviderAdapter extends ItemProviderAdapter {
-
- /**
- * This is the package for the jca model.
- */
- protected static final JcaPackage jcaPackage = (JcaPackage) EPackage.Registry.INSTANCE.getEPackage(JcaPackage.eNS_URI);
-
- /**
- * This is the factory for the jca model.
- */
- protected static final JcaFactory jcaFactory = jcaPackage.getJcaFactory();
-
- /**
- * This creates an instance from an adapter factory and a domain notifier.
- */
- protected JcaItemProviderAdapter(AdapterFactory adapterFactory) {
- super(adapterFactory);
- }// JcaItemProviderAdapter
-
- /**
- * This creates the supported commands.
- *
- * @param Object
- * object - The adapted class.
- * @param EditingDomain -
- * The current editing domain.
- * @param commandClass -
- * The current command class.
- * @param commandParameter -
- * The current commandParameter.
- * @return Command
- */
- @Override
- public Command createCommand(Object object, EditingDomain editingDomain, Class commandClass, CommandParameter commandParameter) {
- return super.createCommand(object, editingDomain, commandClass, commandParameter);
- }// createCommand
-
-}// JcaItemProviderAdapter
diff --git a/plugins/org.eclipse.jst.j2ee.jca/jcaedit/org/eclipse/jst/j2ee/internal/jca/providers/JcaItemProviderAdapterFactory.java b/plugins/org.eclipse.jst.j2ee.jca/jcaedit/org/eclipse/jst/j2ee/internal/jca/providers/JcaItemProviderAdapterFactory.java
deleted file mode 100644
index 572b6da..0000000
--- a/plugins/org.eclipse.jst.j2ee.jca/jcaedit/org/eclipse/jst/j2ee/internal/jca/providers/JcaItemProviderAdapterFactory.java
+++ /dev/null
@@ -1,485 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2003, 2005 IBM Corporation and others.
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
- *
- * Contributors:
- * IBM Corporation - initial API and implementation
- *******************************************************************************/
-package org.eclipse.jst.j2ee.internal.jca.providers;
-
-
-
-import java.util.ArrayList;
-import java.util.Collection;
-
-import org.eclipse.emf.common.notify.Adapter;
-import org.eclipse.emf.common.notify.Notification;
-import org.eclipse.emf.common.notify.Notifier;
-import org.eclipse.emf.ecore.EObject;
-import org.eclipse.emf.edit.provider.ChangeNotifier;
-import org.eclipse.emf.edit.provider.ComposeableAdapterFactory;
-import org.eclipse.emf.edit.provider.ComposedAdapterFactory;
-import org.eclipse.emf.edit.provider.IChangeNotifier;
-import org.eclipse.emf.edit.provider.IEditingDomainItemProvider;
-import org.eclipse.emf.edit.provider.IItemLabelProvider;
-import org.eclipse.emf.edit.provider.IItemPropertySource;
-import org.eclipse.emf.edit.provider.INotifyChangedListener;
-import org.eclipse.emf.edit.provider.IStructuredItemContentProvider;
-import org.eclipse.emf.edit.provider.ITableItemLabelProvider;
-import org.eclipse.emf.edit.provider.ITreeItemContentProvider;
-import org.eclipse.jst.j2ee.jca.internal.util.JcaAdapterFactory;
-
-
-/**
- * This is the factory that is used to provide the interfaces needed to support
- * {@link org.eclipse.jface.viewers.Viewer}s. The adapters generated by this factory convert EMF
- * adapter notifications into calls to {@link #fireNotifyChanged fireNotifyChanged}. The adapters
- * also support property sheets, see {@link org.eclipse.ui.views.properties}. Note that most of the
- * adapters are shared among multiple instances.
- */
-public class JcaItemProviderAdapterFactory extends JcaAdapterFactory implements ComposeableAdapterFactory, IChangeNotifier {
-
- /**
- * This keeps track of the root adapter factory that delegates to this adapter factory.
- */
- protected ComposedAdapterFactory parentAdapterFactory;
-
- /**
- * This is used to implement IChangeNotifier.
- */
- protected IChangeNotifier changeNotifier = new ChangeNotifier();
-
- /**
- * This keeps track of all the supported types checked by isFactoryForType
- */
- protected Collection supportedTypes = new ArrayList();
-
- /**
- * This constructs an instance.
- */
- public JcaItemProviderAdapterFactory() {
- supportedTypes.add(IStructuredItemContentProvider.class);
- supportedTypes.add(ITreeItemContentProvider.class);
- supportedTypes.add(IItemPropertySource.class);
- supportedTypes.add(IEditingDomainItemProvider.class);
- supportedTypes.add(IItemLabelProvider.class);
- supportedTypes.add(ITableItemLabelProvider.class);
- }// JcaItemProviderAdapterFactory
-
- /**
- * This keeps track of the one adapter used for all Connector instances.
- */
- protected ConnectorItemProvider connectorItemProvider;
-
- /**
- * This creates an adapter for a Connector.
- *
- * @return Adapter
- */
- @Override
- public Adapter createConnectorAdapter() {
- if (connectorItemProvider == null) {
- connectorItemProvider = new ConnectorItemProvider(this);
- }// if
-
- return connectorItemProvider;
- }// createConnectorAdapter
-
- /**
- * This keeps track of the one adapter used for all License instances.
- */
- protected LicenseItemProvider licenseItemProvider;
-
- /**
- * This creates an adapter for a License.
- *
- * @return Adapter
- */
- @Override
- public Adapter createLicenseAdapter() {
- if (licenseItemProvider == null) {
- licenseItemProvider = new LicenseItemProvider(this);
- }// if
-
- return licenseItemProvider;
- }// createLicenseAdapter
-
- /**
- * This keeps track of the one adapter used for all
- * {@link com.ibm.etools.jca.InboundResourceAdapter}instances. <!-- begin-user-doc --> <!--
- * end-user-doc -->
- *
- * @generated
- */
- protected InboundResourceAdapterItemProvider inboundResourceAdapterItemProvider;
-
- /**
- * This creates an adapter for a {@link com.ibm.etools.jca.InboundResourceAdapter}. <!--
- * begin-user-doc --> <!-- end-user-doc -->
- *
- * @generated
- */
- @Override
- public Adapter createInboundResourceAdapterAdapter() {
- if (inboundResourceAdapterItemProvider == null) {
- inboundResourceAdapterItemProvider = new InboundResourceAdapterItemProvider(this);
- }
-
- return inboundResourceAdapterItemProvider;
- }
-
- /**
- * This keeps track of the one adapter used for all
- * {@link com.ibm.etools.jca.OutboundResourceAdapter}instances. <!-- begin-user-doc --> <!--
- * end-user-doc -->
- *
- * @generated
- */
- protected OutboundResourceAdapterItemProvider outboundResourceAdapterItemProvider;
-
- /**
- * This creates an adapter for a {@link com.ibm.etools.jca.OutboundResourceAdapter}. <!--
- * begin-user-doc --> <!-- end-user-doc -->
- *
- * @generated
- */
- @Override
- public Adapter createOutboundResourceAdapterAdapter() {
- if (outboundResourceAdapterItemProvider == null) {
- outboundResourceAdapterItemProvider = new OutboundResourceAdapterItemProvider(this);
- }
-
- return outboundResourceAdapterItemProvider;
- }
-
- /**
- * This keeps track of the one adapter used for all {@link com.ibm.etools.jca.MessageAdapter}
- * instances. <!-- begin-user-doc --> <!-- end-user-doc -->
- *
- * @generated
- */
- protected MessageAdapterItemProvider messageAdapterItemProvider;
-
- /**
- * This creates an adapter for a {@link com.ibm.etools.jca.MessageAdapter}. <!-- begin-user-doc
- * --> <!-- end-user-doc -->
- *
- * @generated
- */
- @Override
- public Adapter createMessageAdapterAdapter() {
- if (messageAdapterItemProvider == null) {
- messageAdapterItemProvider = new MessageAdapterItemProvider(this);
- }
-
- return messageAdapterItemProvider;
- }
-
- /**
- * This keeps track of the one adapter used for all
- * {@link com.ibm.etools.jca.ConnectionDefinition}instances. <!-- begin-user-doc --> <!--
- * end-user-doc -->
- *
- * @generated
- */
- protected ConnectionDefinitionItemProvider connectionDefinitionItemProvider;
-
- /**
- * This creates an adapter for a {@link com.ibm.etools.jca.ConnectionDefinition}. <!--
- * begin-user-doc --> <!-- end-user-doc -->
- *
- * @generated
- */
- @Override
- public Adapter createConnectionDefinitionAdapter() {
- if (connectionDefinitionItemProvider == null) {
- connectionDefinitionItemProvider = new ConnectionDefinitionItemProvider(this);
- }
-
- return connectionDefinitionItemProvider;
- }
-
- /**
- * This keeps track of the one adapter used for all {@link com.ibm.etools.jca.AdminObject}
- * instances. <!-- begin-user-doc --> <!-- end-user-doc -->
- *
- * @generated
- */
- protected AdminObjectItemProvider adminObjectItemProvider;
-
- /**
- * This creates an adapter for a {@link com.ibm.etools.jca.AdminObject}. <!-- begin-user-doc
- * --> <!-- end-user-doc -->
- *
- * @generated
- */
- @Override
- public Adapter createAdminObjectAdapter() {
- if (adminObjectItemProvider == null) {
- adminObjectItemProvider = new AdminObjectItemProvider(this);
- }
-
- return adminObjectItemProvider;
- }
-
- /**
- * This keeps track of the one adapter used for all {@link com.ibm.etools.jca.MessageListener}
- * instances. <!-- begin-user-doc --> <!-- end-user-doc -->
- *
- * @generated
- */
- protected MessageListenerItemProvider messageListenerItemProvider;
-
- /**
- * This creates an adapter for a {@link com.ibm.etools.jca.MessageListener}. <!--
- * begin-user-doc --> <!-- end-user-doc -->
- *
- * @generated
- */
- @Override
- public Adapter createMessageListenerAdapter() {
- if (messageListenerItemProvider == null) {
- messageListenerItemProvider = new MessageListenerItemProvider(this);
- }
-
- return messageListenerItemProvider;
- }
-
- /**
- * This keeps track of the one adapter used for all {@link com.ibm.etools.jca.ActivationSpec}
- * instances. <!-- begin-user-doc --> <!-- end-user-doc -->
- *
- * @generated
- */
- protected ActivationSpecItemProvider activationSpecItemProvider;
-
- /**
- * This creates an adapter for a {@link com.ibm.etools.jca.ActivationSpec}. <!-- begin-user-doc
- * --> <!-- end-user-doc -->
- *
- * @generated
- */
- @Override
- public Adapter createActivationSpecAdapter() {
- if (activationSpecItemProvider == null) {
- activationSpecItemProvider = new ActivationSpecItemProvider(this);
- }
-
- return activationSpecItemProvider;
- }
-
- /**
- * This keeps track of the one adapter used for all
- * {@link com.ibm.etools.jca.RequiredConfigPropertyType}instances. <!-- begin-user-doc --> <!--
- * end-user-doc -->
- *
- * @generated
- */
- protected RequiredConfigPropertyTypeItemProvider requiredConfigPropertyTypeItemProvider;
-
- /**
- * This creates an adapter for a {@link com.ibm.etools.jca.RequiredConfigPropertyType}. <!--
- * begin-user-doc --> <!-- end-user-doc -->
- *
- * @generated
- */
- @Override
- public Adapter createRequiredConfigPropertyTypeAdapter() {
- if (requiredConfigPropertyTypeItemProvider == null) {
- requiredConfigPropertyTypeItemProvider = new RequiredConfigPropertyTypeItemProvider(this);
- }
-
- return requiredConfigPropertyTypeItemProvider;
- }
-
- /**
- * This keeps track of the one adapter used for all ResourceAdapter instances.
- */
- protected ResourceAdapterItemProvider resourceAdapterItemProvider;
-
- /**
- * This creates an adapter for a ResourceAdapter.
- *
- * @return Adapter
- */
- @Override
- public Adapter createResourceAdapterAdapter() {
- if (resourceAdapterItemProvider == null) {
- resourceAdapterItemProvider = new ResourceAdapterItemProvider(this);
- }// if
-
- return resourceAdapterItemProvider;
- }// createResourceAdapterAdapter
-
- /**
- * This keeps track of the one adapter used for all SecurityPermission instances.
- */
- protected SecurityPermissionItemProvider securityPermissionItemProvider;
-
- /**
- * This creates an adapter for a SecurityPermission.
- *
- * @return Adapter
- */
- @Override
- public Adapter createSecurityPermissionAdapter() {
- if (securityPermissionItemProvider == null) {
- securityPermissionItemProvider = new SecurityPermissionItemProvider(this);
- }// if
-
- return securityPermissionItemProvider;
- }// createSecurityPermissionAdapter
-
- /**
- * This keeps track of the one adapter used for all AuthenticationMechanism instances
- */
- protected AuthenticationMechanismItemProvider authenticationMechanismItemProvider;
-
- /**
- * This creates an adapter for a AuthenticationMechanism.
- *
- * @return Adapter
- */
- @Override
- public Adapter createAuthenticationMechanismAdapter() {
- if (authenticationMechanismItemProvider == null) {
- authenticationMechanismItemProvider = new AuthenticationMechanismItemProvider(this);
- }// if
-
- return authenticationMechanismItemProvider;
- }// createAuthenticationMechanismAdapter
-
- /**
- * This keeps track of the one adapter used for all ConfigProperty instances.
- */
- protected ConfigPropertyItemProvider configPropertyItemProvider;
-
- /**
- * This creates an adapter for a {@link com.ibm.etools.jca.ConfigProperty}.
- */
- @Override
- public Adapter createConfigPropertyAdapter() {
- if (configPropertyItemProvider == null) {
- configPropertyItemProvider = new ConfigPropertyItemProvider(this);
- }// if
-
- return configPropertyItemProvider;
- }// createConfigPropertyAdapter
-
- /**
- * This returns the root adapter factory that contains this factory.
- *
- * @return ComposeableAdapterFactory
- */
- public ComposeableAdapterFactory getRootAdapterFactory() {
- return parentAdapterFactory == null ? this : parentAdapterFactory.getRootAdapterFactory();
- }// getRootAdapterFactory
-
- /**
- * This sets the composed adapter factory that contains this factory.
- *
- * @return ComposedAdapterFactory
- */
- public void setParentAdapterFactory(ComposedAdapterFactory parentAdapterFactory) {
- this.parentAdapterFactory = parentAdapterFactory;
- }// setParentAdapterFactory
-
- /**
- * Checks if it is a factory type
- *
- * @param Object
- * type - The given type
- * @return boolean
- */
- @Override
- public boolean isFactoryForType(Object type) {
- return super.isFactoryForType(type) || supportedTypes.contains(type);
- }// isFactoryForType
-
- /**
- * This implementation substitutes the factory itself as the key for the adapter.
- *
- * @param Notifier
- * notifier - The given notifer.
- * @param Object
- * type - The given type
- * @return Adapter
- */
- @Override
- public Adapter adapt(Notifier notifier, Object type) {
- return super.adapt(notifier, this);
- }// adapt
-
- /**
- * Does adapting.
- *
- * @param Object
- * object - The given object.
- * @param Oject
- * type - The given type.
- * @return Object
- */
- @Override
- public Object adapt(Object object, Object type) {
- // This is a kludge to deal with enumerators, which crash the doSwitch.
- //
- if (object instanceof EObject && ((EObject) object).eClass() == null) {
- return null;
- }// if
-
- if (isFactoryForType(type)) {
- Object adapter = super.adapt(object, type);
- if (!(type instanceof Class) || (((Class) type).isInstance(adapter))) {
- return adapter;
- }// if
- }// if
-
- return null;
- }// adapt
-
- /**
- * This adds a listener. <!-- begin-user-doc --> <!-- end-user-doc -->
- *
- * @generated
- */
- public void addListener(INotifyChangedListener notifyChangedListener) {
- changeNotifier.addListener(notifyChangedListener);
- }
-
- /**
- * This removes a listener.
- *
- * @generated
- */
- public void removeListener(INotifyChangedListener notifyChangedListener) {
- changeNotifier.removeListener(notifyChangedListener);
- }// removeListener
-
- /**
- * This delegates to change Notifier and to parent AdapterFactory.
- *
- * @param Object
- * object - The given object.
- * @param int
- * eventType - The given type of event.
- * @param Object
- * feature - The given feature.
- * @param Object
- * oldValue - The old value of the event.
- * @param Object
- * nreValue - The new value of the event.
- * @param int
- * index - The current index
- */
- public void fireNotifyChanged(Notification msg) {
- changeNotifier.fireNotifyChanged(msg);
-
- if (parentAdapterFactory != null) {
- parentAdapterFactory.fireNotifyChanged(msg);
- }// if
- }// fireNotifyChanged
-
-}// JcaItemProviderAdapterFactory
diff --git a/plugins/org.eclipse.jst.j2ee.jca/jcaedit/org/eclipse/jst/j2ee/internal/jca/providers/LicenseItemProvider.java b/plugins/org.eclipse.jst.j2ee.jca/jcaedit/org/eclipse/jst/j2ee/internal/jca/providers/LicenseItemProvider.java
deleted file mode 100644
index 1f8fa30..0000000
--- a/plugins/org.eclipse.jst.j2ee.jca/jcaedit/org/eclipse/jst/j2ee/internal/jca/providers/LicenseItemProvider.java
+++ /dev/null
@@ -1,248 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2003, 2006 IBM Corporation and others.
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
- *
- * Contributors:
- * IBM Corporation - initial API and implementation
- *******************************************************************************/
-package org.eclipse.jst.j2ee.internal.jca.providers;
-
-
-
-import java.util.Collection;
-import java.util.List;
-
-import org.eclipse.emf.common.notify.AdapterFactory;
-import org.eclipse.emf.common.notify.Notification;
-import org.eclipse.emf.common.notify.Notifier;
-import org.eclipse.emf.common.util.ResourceLocator;
-import org.eclipse.emf.ecore.EObject;
-import org.eclipse.emf.ecore.InternalEObject;
-import org.eclipse.emf.ecore.impl.ENotificationImpl;
-import org.eclipse.emf.edit.provider.ComposeableAdapterFactory;
-import org.eclipse.emf.edit.provider.IEditingDomainItemProvider;
-import org.eclipse.emf.edit.provider.IItemLabelProvider;
-import org.eclipse.emf.edit.provider.IItemPropertySource;
-import org.eclipse.emf.edit.provider.ITreeItemContentProvider;
-import org.eclipse.emf.edit.provider.ItemPropertyDescriptor;
-import org.eclipse.jst.j2ee.common.CommonFactory;
-import org.eclipse.jst.j2ee.internal.plugin.J2EEPlugin;
-import org.eclipse.jst.j2ee.jca.JcaPackage;
-import org.eclipse.jst.j2ee.jca.License;
-import org.eclipse.jst.j2ee.jca.internal.plugin.JCAResourceHandler;
-import org.eclipse.jst.j2ee.webservice.wscommon.WscommonFactory;
-
-/**
- * This is the item provider adpater for a License object.
- */
-public class LicenseItemProvider extends JcaItemProviderAdapter implements IEditingDomainItemProvider, ITreeItemContentProvider, IItemLabelProvider, IItemPropertySource {
-
- /**
- * This constructs an instance from a factory and a notifier.
- *
- * @param AdapterFactory
- * adapterFactory - The adapt class.
- */
- public LicenseItemProvider(AdapterFactory adapterFactory) {
- super(adapterFactory);
- }// LicenseItemProvider
-
- /**
- * This returns the property descriptors for the adapted class. <!-- begin-user-doc --> <!--
- * end-user-doc -->
- *
- * @generated
- */
- @Override
- public List getPropertyDescriptors(Object object) {
- if (itemPropertyDescriptors == null) {
- super.getPropertyDescriptors(object);
-
- addDescriptionPropertyDescriptor(object);
- addRequiredPropertyDescriptor(object);
- }
- return itemPropertyDescriptors;
- }
-
- /**
- * This adds a property descriptor for the Description feature. <!-- begin-user-doc --> <!--
- * end-user-doc -->
- *
- * @generated
- */
- protected void addDescriptionPropertyDescriptor(Object object) {
- itemPropertyDescriptors.add(new ItemPropertyDescriptor(((ComposeableAdapterFactory) adapterFactory).getRootAdapterFactory(), getString("_UI_License_description_feature"), //$NON-NLS-1$
- getString("_UI_PropertyDescriptor_description", "_UI_License_description_feature", "_UI_License_type"), //$NON-NLS-1$ //$NON-NLS-2$ //$NON-NLS-3$
- JcaPackage.eINSTANCE.getLicense_Description(), true, ItemPropertyDescriptor.GENERIC_VALUE_IMAGE));
- }
-
- /**
- * This adds a property descriptor for the Required feature. <!-- begin-user-doc --> <!--
- * end-user-doc -->
- *
- * @generated
- */
- protected void addRequiredPropertyDescriptor(Object object) {
- itemPropertyDescriptors.add(new ItemPropertyDescriptor(((ComposeableAdapterFactory) adapterFactory).getRootAdapterFactory(), getString("_UI_License_required_feature"), //$NON-NLS-1$
- getString("_UI_PropertyDescriptor_description", "_UI_License_required_feature", "_UI_License_type"), //$NON-NLS-1$ //$NON-NLS-2$ //$NON-NLS-3$
- JcaPackage.eINSTANCE.getLicense_Required(), true, ItemPropertyDescriptor.BOOLEAN_VALUE_IMAGE));
- }
-
- /**
- * This specifies how to implement {@link #getChildren}and
- * {@link org.eclipse.emf.edit.command.AddCommand}and
- * {@link org.eclipse.emf.edit.command.RemoveCommand}support in {@link #createCommand}. <!--
- * begin-user-doc --> <!-- end-user-doc -->
- *
- * @generated
- */
- @Override
- public Collection getChildrenReferences(Object object) {
- if (childrenReferences == null) {
- super.getChildrenReferences(object);
- childrenReferences.add(JcaPackage.eINSTANCE.getLicense_Descriptions());
- }
- return childrenReferences;
- }
-
-
- /**
- * This returns the property descriptors for the adapted class.
- *
- * @param Object
- * object - The adapt class.
- * @return List
- */
- /*
- * public List getPropertyDescriptors(Object object) { if (itemPropertyDescriptors == null) {
- * super.getPropertyDescriptors(object);
- *
- * License f_license = ((License)object); JcaPackage pkg = JcaPackage.eINSTANCE;; // This is for
- * the description feature. // itemPropertyDescriptors.add (new ItemPropertyDescriptor
- * (((ComposeableAdapterFactory)adapterFactory).getRootAdapterFactory(), "Description", "The
- * description property of the license", pkg.getLicense_Description(), true,
- * ItemPropertyDescriptor.TEXT_VALUE_IMAGE)); // This is for the required feature. //
- * itemPropertyDescriptors.add (new ItemPropertyDescriptor
- * (((ComposeableAdapterFactory)adapterFactory).getRootAdapterFactory(), "Required", "The
- * required property of the license", pkg.getLicense_Required(), true,
- * ItemPropertyDescriptor.BOOLEAN_VALUE_IMAGE));
- *
- * }// if
- *
- * return itemPropertyDescriptors; }// getPropertyDescriptors
- */
- /**
- * This returns the parent of the License.
- *
- * @param Object
- * object - The adapt class.
- * @return Object
- */
- @Override
- public Object getParent(Object object) {
- return ((EObject) object).eContainer();
- }// getParent
-
- /**
- * This returns License.gif.
- *
- * @param Object
- * object - The adapt class
- * @return Object
- */
- @Override
- public Object getImage(Object object) {
- return J2EEPlugin.getPlugin().getImage("full/obj16/license_obj"); //$NON-NLS-1$
- }// getImage
-
- /**
- * Get the display name.
- *
- * @param Object
- * object - The object to get the name for.
- * @return String
- */
- @Override
- public String getText(Object object) {
- License license = ((License) object);
- if (license.getDescription() == null)
- return JCAResourceHandler.LicenseItemProvider_UI_0;
- return JCAResourceHandler.LicenseItemProvider_UI_0 + ":" + license.getDescription(); //$NON-NLS-1$
- }// getText
-
- /**
- * This handles notification by calling {@link #fireNotifyChanged fireNotifyChanged}. <!--
- * begin-user-doc --> <!-- end-user-doc -->
- *
- * @generated
- */
- @Override
- public void notifyChanged(Notification notification) {
- switch (notification.getFeatureID(License.class)) {
- case JcaPackage.LICENSE__DESCRIPTION :
- case JcaPackage.LICENSE__REQUIRED :
- case JcaPackage.LICENSE__DESCRIPTIONS : {
- fireNotifyChanged(notification);
- return;
- }
- }
- super.notifyChanged(notification);
- }
-
- /**
- * This adds to the collection of {@link org.eclipse.emf.edit.command.CommandParameter}s
- * describing all of the children that can be created under this object. <!-- begin-user-doc -->
- * <!-- end-user-doc -->
- *
- * @generated
- */
- @Override
- protected void collectNewChildDescriptors(Collection newChildDescriptors, Object object) {
- super.collectNewChildDescriptors(newChildDescriptors, object);
-
- newChildDescriptors.add(createChildParameter(JcaPackage.eINSTANCE.getLicense_Descriptions(), CommonFactory.eINSTANCE.createDescription()));
-
- newChildDescriptors.add(createChildParameter(JcaPackage.eINSTANCE.getLicense_Descriptions(), WscommonFactory.eINSTANCE.createDescriptionType()));
- }
-
- /**
- * Return the resource locator for this item provider's resources. <!-- begin-user-doc --> <!--
- * end-user-doc -->
- *
- * @generated
- */
- @Override
- public ResourceLocator getResourceLocator() {
- return J2EEPlugin.getDefault();
- }
-
- /**
- * This handles notification.
- *
- * @param Notifier
- * notifier - Notifies of change.
- * @param int
- * eventType - The event type.
- * @param EObject
- * feature - The reference object.
- * @param Object
- * oldValue - The old object reference.
- * @param Object
- * newValue - The new object reference.
- * @param int
- * index - The current of the object.
- */
- public void notifyChanged(Notifier notifier, int eventType, EObject feature, Object oldValue, Object newValue, int index) {
- JcaPackage pkg = JcaPackage.eINSTANCE;
- Notification msg = new ENotificationImpl((InternalEObject) notifier, eventType, feature.eContainmentFeature(), oldValue, newValue, index);
- if (feature == pkg.getLicense_Description() || feature == pkg.getLicense_Required()) {
- fireNotifyChanged(msg);
- return;
- }// if
- super.notifyChanged(msg);
- }// notifyChanged
-
-}// LicenseItemProvider
diff --git a/plugins/org.eclipse.jst.j2ee.jca/jcaedit/org/eclipse/jst/j2ee/internal/jca/providers/MessageAdapterItemProvider.java b/plugins/org.eclipse.jst.j2ee.jca/jcaedit/org/eclipse/jst/j2ee/internal/jca/providers/MessageAdapterItemProvider.java
deleted file mode 100644
index 089e98e..0000000
--- a/plugins/org.eclipse.jst.j2ee.jca/jcaedit/org/eclipse/jst/j2ee/internal/jca/providers/MessageAdapterItemProvider.java
+++ /dev/null
@@ -1,145 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2003, 2005 IBM Corporation and others.
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
- *
- * Contributors:
- * IBM Corporation - initial API and implementation
- *******************************************************************************/
-package org.eclipse.jst.j2ee.internal.jca.providers;
-
-
-import java.util.Collection;
-import java.util.List;
-
-import org.eclipse.emf.common.notify.AdapterFactory;
-import org.eclipse.emf.common.notify.Notification;
-import org.eclipse.emf.common.util.ResourceLocator;
-import org.eclipse.emf.edit.provider.IEditingDomainItemProvider;
-import org.eclipse.emf.edit.provider.IItemLabelProvider;
-import org.eclipse.emf.edit.provider.IItemPropertySource;
-import org.eclipse.emf.edit.provider.ITreeItemContentProvider;
-import org.eclipse.emf.edit.provider.ItemProviderAdapter;
-import org.eclipse.jst.j2ee.jca.JcaFactory;
-import org.eclipse.jst.j2ee.jca.JcaPackage;
-import org.eclipse.jst.j2ee.jca.MessageAdapter;
-import org.eclipse.jst.j2ee.jca.internal.plugin.JCAResourceHandler;
-import org.eclipse.jst.j2ee.jca.internal.plugin.JcaPlugin;
-
-/**
- * This is the item provider adpater for a {@link com.ibm.etools.jca.MessageAdapter}object. <!--
- * begin-user-doc --> <!-- end-user-doc -->
- *
- * @generated
- */
-public class MessageAdapterItemProvider extends ItemProviderAdapter implements IEditingDomainItemProvider, ITreeItemContentProvider, IItemLabelProvider, IItemPropertySource {
- /**
- * This constructs an instance from a factory and a notifier. <!-- begin-user-doc --> <!--
- * end-user-doc -->
- *
- * @generated
- */
- public MessageAdapterItemProvider(AdapterFactory adapterFactory) {
- super(adapterFactory);
- }
-
- /**
- * This returns the property descriptors for the adapted class. <!-- begin-user-doc --> <!--
- * end-user-doc -->
- *
- * @generated
- */
- @Override
- public List getPropertyDescriptors(Object object) {
- if (itemPropertyDescriptors == null) {
- super.getPropertyDescriptors(object);
-
- }
- return itemPropertyDescriptors;
- }
-
- /**
- * This specifies how to implement {@link #getChildren}and
- * {@link org.eclipse.emf.edit.command.AddCommand}and
- * {@link org.eclipse.emf.edit.command.RemoveCommand}support in {@link #createCommand}. <!--
- * begin-user-doc --> <!-- end-user-doc -->
- *
- * @generated
- */
- @Override
- public Collection getChildrenReferences(Object object) {
- if (childrenReferences == null) {
- super.getChildrenReferences(object);
- childrenReferences.add(JcaPackage.eINSTANCE.getMessageAdapter_MessageListeners());
- }
- return childrenReferences;
- }
-
-
- /**
- * This returns MessageAdapter.gif. <!-- begin-user-doc --> <!-- end-user-doc -->
- *
- * @generated
- */
- @Override
- public Object getImage(Object object) {
- return getResourceLocator().getImage("full/obj16/MessageAdapter"); //$NON-NLS-1$
- }
-
- /**
- * This returns the label text for the adapted class. <!-- begin-user-doc --> <!-- end-user-doc
- * -->
- *
- * @generated
- */
- @Override
- public String getText(Object object) {
- return JCAResourceHandler._UI_MessageAdapter_type;
- //return getString("_UI_MessageAdapter_type"); //$NON-NLS-1$
- }
-
- /**
- * This handles notification by calling {@link #fireNotifyChanged fireNotifyChanged}. <!--
- * begin-user-doc --> <!-- end-user-doc -->
- *
- * @generated
- */
- @Override
- public void notifyChanged(Notification notification) {
- switch (notification.getFeatureID(MessageAdapter.class)) {
- case JcaPackage.MESSAGE_ADAPTER__MESSAGE_LISTENERS : {
- fireNotifyChanged(notification);
- return;
- }
- }
- super.notifyChanged(notification);
- }
-
- /**
- * This adds to the collection of {@link org.eclipse.emf.edit.command.CommandParameter}s
- * describing all of the children that can be created under this object. <!-- begin-user-doc -->
- * <!-- end-user-doc -->
- *
- * @generated
- */
- @Override
- protected void collectNewChildDescriptors(Collection newChildDescriptors, Object object) {
- super.collectNewChildDescriptors(newChildDescriptors, object);
-
- newChildDescriptors.add(createChildParameter(JcaPackage.eINSTANCE.getMessageAdapter_MessageListeners(), JcaFactory.eINSTANCE.createMessageListener()));
- }
-
- /**
- * Return the resource locator for this item provider's resources. <!-- begin-user-doc --> <!--
- * end-user-doc -->
- *
- * @generated
- */
- @Override
- public ResourceLocator getResourceLocator() {
- //return J2EEPlugin.getDefault();
- return JcaPlugin.getPlugin();
- }
-}
diff --git a/plugins/org.eclipse.jst.j2ee.jca/jcaedit/org/eclipse/jst/j2ee/internal/jca/providers/MessageListenerItemProvider.java b/plugins/org.eclipse.jst.j2ee.jca/jcaedit/org/eclipse/jst/j2ee/internal/jca/providers/MessageListenerItemProvider.java
deleted file mode 100644
index 99fc195..0000000
--- a/plugins/org.eclipse.jst.j2ee.jca/jcaedit/org/eclipse/jst/j2ee/internal/jca/providers/MessageListenerItemProvider.java
+++ /dev/null
@@ -1,162 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2003, 2006 IBM Corporation and others.
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
- *
- * Contributors:
- * IBM Corporation - initial API and implementation
- *******************************************************************************/
-package org.eclipse.jst.j2ee.internal.jca.providers;
-
-
-import java.util.Collection;
-import java.util.List;
-
-import org.eclipse.emf.common.notify.AdapterFactory;
-import org.eclipse.emf.common.notify.Notification;
-import org.eclipse.emf.common.util.ResourceLocator;
-import org.eclipse.emf.edit.provider.ComposeableAdapterFactory;
-import org.eclipse.emf.edit.provider.IEditingDomainItemProvider;
-import org.eclipse.emf.edit.provider.IItemLabelProvider;
-import org.eclipse.emf.edit.provider.IItemPropertySource;
-import org.eclipse.emf.edit.provider.ITreeItemContentProvider;
-import org.eclipse.emf.edit.provider.ItemPropertyDescriptor;
-import org.eclipse.emf.edit.provider.ItemProviderAdapter;
-import org.eclipse.jst.j2ee.jca.JcaFactory;
-import org.eclipse.jst.j2ee.jca.JcaPackage;
-import org.eclipse.jst.j2ee.jca.MessageListener;
-import org.eclipse.jst.j2ee.jca.internal.plugin.JCAResourceHandler;
-import org.eclipse.jst.j2ee.jca.internal.plugin.JcaPlugin;
-
-/**
- * This is the item provider adpater for a {@link com.ibm.etools.jca.MessageListener}object. <!--
- * begin-user-doc --> <!-- end-user-doc -->
- *
- * @generated
- */
-public class MessageListenerItemProvider extends ItemProviderAdapter implements IEditingDomainItemProvider, ITreeItemContentProvider, IItemLabelProvider, IItemPropertySource {
- /**
- * This constructs an instance from a factory and a notifier. <!-- begin-user-doc --> <!--
- * end-user-doc -->
- *
- * @generated
- */
- public MessageListenerItemProvider(AdapterFactory adapterFactory) {
- super(adapterFactory);
- }
-
- /**
- * This returns the property descriptors for the adapted class. <!-- begin-user-doc --> <!--
- * end-user-doc -->
- *
- * @generated
- */
- @Override
- public List getPropertyDescriptors(Object object) {
- if (itemPropertyDescriptors == null) {
- super.getPropertyDescriptors(object);
-
- addMessageListenerTypePropertyDescriptor(object);
- }
- return itemPropertyDescriptors;
- }
-
- /**
- * This adds a property descriptor for the Message Listener Type feature. <!-- begin-user-doc
- * --> <!-- end-user-doc -->
- *
- * @generated
- */
- protected void addMessageListenerTypePropertyDescriptor(Object object) {
- itemPropertyDescriptors.add(new ItemPropertyDescriptor(((ComposeableAdapterFactory) adapterFactory).getRootAdapterFactory(), getString("_UI_MessageListener_messageListenerType_feature"), //$NON-NLS-1$
- getString("_UI_PropertyDescriptor_description", "_UI_MessageListener_messageListenerType_feature", "_UI_MessageListener_type"), //$NON-NLS-1$ //$NON-NLS-2$ //$NON-NLS-3$
- JcaPackage.eINSTANCE.getMessageListener_MessageListenerType(), true, ItemPropertyDescriptor.GENERIC_VALUE_IMAGE));
- }
-
- /**
- * This specifies how to implement {@link #getChildren}and
- * {@link org.eclipse.emf.edit.command.AddCommand}and
- * {@link org.eclipse.emf.edit.command.RemoveCommand}support in {@link #createCommand}. <!--
- * begin-user-doc --> <!-- end-user-doc -->
- *
- * @generated
- */
- @Override
- public Collection getChildrenReferences(Object object) {
- if (childrenReferences == null) {
- super.getChildrenReferences(object);
- childrenReferences.add(JcaPackage.eINSTANCE.getMessageListener_ActivationSpec());
- }
- return childrenReferences;
- }
-
-
- /**
- * This returns MessageListener.gif. <!-- begin-user-doc --> <!-- end-user-doc -->
- *
- * @generated
- */
- @Override
- public Object getImage(Object object) {
- return getResourceLocator().getImage("full/obj16/MessageListener"); //$NON-NLS-1$
- }
-
- /**
- * This returns the label text for the adapted class. <!-- begin-user-doc --> <!-- end-user-doc
- * -->
- *
- * @generated
- */
- @Override
- public String getText(Object object) {
- String label = ((MessageListener) object).getMessageListenerType();
- return label == null || label.length() == 0 ? JCAResourceHandler._UI_MessageListener_type :
- JCAResourceHandler._UI_MessageListener_type + " " + label; //$NON-NLS-1$
- }
-
- /**
- * This handles notification by calling {@link #fireNotifyChanged fireNotifyChanged}. <!--
- * begin-user-doc --> <!-- end-user-doc -->
- *
- * @generated
- */
- @Override
- public void notifyChanged(Notification notification) {
- switch (notification.getFeatureID(MessageListener.class)) {
- case JcaPackage.MESSAGE_LISTENER__MESSAGE_LISTENER_TYPE :
- case JcaPackage.MESSAGE_LISTENER__ACTIVATION_SPEC : {
- fireNotifyChanged(notification);
- return;
- }
- }
- super.notifyChanged(notification);
- }
-
- /**
- * This adds to the collection of {@link org.eclipse.emf.edit.command.CommandParameter}s
- * describing all of the children that can be created under this object. <!-- begin-user-doc -->
- * <!-- end-user-doc -->
- *
- * @generated
- */
- @Override
- protected void collectNewChildDescriptors(Collection newChildDescriptors, Object object) {
- super.collectNewChildDescriptors(newChildDescriptors, object);
-
- newChildDescriptors.add(createChildParameter(JcaPackage.eINSTANCE.getMessageListener_ActivationSpec(), JcaFactory.eINSTANCE.createActivationSpec()));
- }
-
- /**
- * Return the resource locator for this item provider's resources. <!-- begin-user-doc --> <!--
- * end-user-doc -->
- *
- * @generated
- */
- @Override
- public ResourceLocator getResourceLocator() {
- //return J2EEPlugin.getDefault();
- return JcaPlugin.getPlugin();
- }
-}
diff --git a/plugins/org.eclipse.jst.j2ee.jca/jcaedit/org/eclipse/jst/j2ee/internal/jca/providers/OutboundResourceAdapterItemProvider.java b/plugins/org.eclipse.jst.j2ee.jca/jcaedit/org/eclipse/jst/j2ee/internal/jca/providers/OutboundResourceAdapterItemProvider.java
deleted file mode 100644
index 27d3118..0000000
--- a/plugins/org.eclipse.jst.j2ee.jca/jcaedit/org/eclipse/jst/j2ee/internal/jca/providers/OutboundResourceAdapterItemProvider.java
+++ /dev/null
@@ -1,194 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2003, 2005 IBM Corporation and others.
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
- *
- * Contributors:
- * IBM Corporation - initial API and implementation
- *******************************************************************************/
-package org.eclipse.jst.j2ee.internal.jca.providers;
-
-
-import java.util.Collection;
-import java.util.List;
-
-import org.eclipse.emf.common.notify.AdapterFactory;
-import org.eclipse.emf.common.notify.Notification;
-import org.eclipse.emf.common.util.ResourceLocator;
-import org.eclipse.emf.ecore.EReference;
-import org.eclipse.emf.edit.provider.ComposeableAdapterFactory;
-import org.eclipse.emf.edit.provider.IEditingDomainItemProvider;
-import org.eclipse.emf.edit.provider.IItemLabelProvider;
-import org.eclipse.emf.edit.provider.IItemPropertySource;
-import org.eclipse.emf.edit.provider.ITreeItemContentProvider;
-import org.eclipse.emf.edit.provider.ItemPropertyDescriptor;
-import org.eclipse.emf.edit.provider.ItemProviderAdapter;
-import org.eclipse.jst.j2ee.jca.JcaFactory;
-import org.eclipse.jst.j2ee.jca.JcaPackage;
-import org.eclipse.jst.j2ee.jca.OutboundResourceAdapter;
-import org.eclipse.jst.j2ee.jca.internal.plugin.JCAResourceHandler;
-import org.eclipse.jst.j2ee.jca.internal.plugin.JcaPlugin;
-
-/**
- * This is the item provider adpater for a {@link com.ibm.etools.jca.OutboundResourceAdapter}
- * object. <!-- begin-user-doc --> <!-- end-user-doc -->
- *
- * @generated
- */
-public class OutboundResourceAdapterItemProvider extends ItemProviderAdapter implements IEditingDomainItemProvider, ITreeItemContentProvider, IItemLabelProvider, IItemPropertySource {
- /**
- * This constructs an instance from a factory and a notifier. <!-- begin-user-doc --> <!--
- * end-user-doc -->
- *
- * @generated
- */
- public OutboundResourceAdapterItemProvider(AdapterFactory adapterFactory) {
- super(adapterFactory);
- }
-
- /**
- * This returns the property descriptors for the adapted class. <!-- begin-user-doc --> <!--
- * end-user-doc -->
- *
- * @generated
- */
- @Override
- public List getPropertyDescriptors(Object object) {
- if (itemPropertyDescriptors == null) {
- super.getPropertyDescriptors(object);
-
- addReauthenticationSupportPropertyDescriptor(object);
- addTransactionSupportPropertyDescriptor(object);
- }
- return itemPropertyDescriptors;
- }
-
- /**
- * This adds a property descriptor for the Reauthentication Support feature. <!-- begin-user-doc
- * --> <!-- end-user-doc -->
- *
- * @generated
- */
- protected void addReauthenticationSupportPropertyDescriptor(Object object) {
- itemPropertyDescriptors.add(new ItemPropertyDescriptor(((ComposeableAdapterFactory) adapterFactory).getRootAdapterFactory(), getString("_UI_OutboundResourceAdapter_reauthenticationSupport_feature"), //$NON-NLS-1$
- getString("_UI_PropertyDescriptor_description", "_UI_OutboundResourceAdapter_reauthenticationSupport_feature", "_UI_OutboundResourceAdapter_type"), //$NON-NLS-1$ //$NON-NLS-2$ //$NON-NLS-3$
- JcaPackage.eINSTANCE.getOutboundResourceAdapter_ReauthenticationSupport(), true, ItemPropertyDescriptor.BOOLEAN_VALUE_IMAGE));
- }
-
- /**
- * This adds a property descriptor for the Transaction Support feature. <!-- begin-user-doc -->
- * <!-- end-user-doc -->
- *
- * @generated
- */
- protected void addTransactionSupportPropertyDescriptor(Object object) {
- itemPropertyDescriptors.add(new ItemPropertyDescriptor(((ComposeableAdapterFactory) adapterFactory).getRootAdapterFactory(), getString("_UI_OutboundResourceAdapter_transactionSupport_feature"), //$NON-NLS-1$
- getString("_UI_PropertyDescriptor_description", "_UI_OutboundResourceAdapter_transactionSupport_feature", "_UI_OutboundResourceAdapter_type"), //$NON-NLS-1$ //$NON-NLS-2$ //$NON-NLS-3$
- JcaPackage.eINSTANCE.getOutboundResourceAdapter_TransactionSupport(), true, ItemPropertyDescriptor.GENERIC_VALUE_IMAGE));
- }
-
- /**
- * This specifies how to implement {@link #getChildren}and
- * {@link org.eclipse.emf.edit.command.AddCommand}and
- * {@link org.eclipse.emf.edit.command.RemoveCommand}support in {@link #createCommand}. <!--
- * begin-user-doc --> <!-- end-user-doc -->
- *
- * @generated
- */
- @Override
- public Collection getChildrenReferences(Object object) {
- if (childrenReferences == null) {
- super.getChildrenReferences(object);
- childrenReferences.add(JcaPackage.eINSTANCE.getOutboundResourceAdapter_ConnectionDefinitions());
- }
- return childrenReferences;
- }
-
- /**
- * <!-- begin-user-doc --> <!-- end-user-doc -->
- *
- * @generated
- */
- @Override
- protected EReference getChildReference(Object object, Object child) {
- // Check the type of the specified child object and return the proper feature to use for
- // adding (see {@link AddCommand}) it as a child.
-
- return super.getChildReference(object, child);
- }
-
-
- /**
- * This returns OutboundResourceAdapter.gif. <!-- begin-user-doc --> <!-- end-user-doc -->
- *
- * @generated
- */
- @Override
- public Object getImage(Object object) {
- return getResourceLocator().getImage("full/obj16/OutboundResourceAdapter"); //$NON-NLS-1$
- }
-
- /**
- * This returns the label text for the adapted class. <!-- begin-user-doc --> <!-- end-user-doc
- * -->
- *
- * @generated
- */
- @Override
- public String getText(Object object) {
- // OutboundResourceAdapter outboundResourceAdapter = (OutboundResourceAdapter) object;
-
- return JCAResourceHandler._UI_OutboundResourceAdapter_type;
- //return getString("_UI_OutboundResourceAdapter_type") /*+ " " +
- // outboundResourceAdapter.isReauthenticationSupport()*/; //$NON-NLS-1$ //$NON-NLS-2$
- }
-
- /**
- * This handles notification by calling {@link #fireNotifyChanged fireNotifyChanged}. <!--
- * begin-user-doc --> <!-- end-user-doc -->
- *
- * @generated
- */
- @Override
- public void notifyChanged(Notification notification) {
- switch (notification.getFeatureID(OutboundResourceAdapter.class)) {
- case JcaPackage.OUTBOUND_RESOURCE_ADAPTER__REAUTHENTICATION_SUPPORT :
- case JcaPackage.OUTBOUND_RESOURCE_ADAPTER__TRANSACTION_SUPPORT :
- case JcaPackage.OUTBOUND_RESOURCE_ADAPTER__CONNECTION_DEFINITIONS :
- case JcaPackage.OUTBOUND_RESOURCE_ADAPTER__AUTHENTICATION_MECHANISMS : {
- fireNotifyChanged(notification);
- return;
- }
- }
- super.notifyChanged(notification);
- }
-
- /**
- * This adds to the collection of {@link org.eclipse.emf.edit.command.CommandParameter}s
- * describing all of the children that can be created under this object. <!-- begin-user-doc -->
- * <!-- end-user-doc -->
- *
- * @generated
- */
- @Override
- protected void collectNewChildDescriptors(Collection newChildDescriptors, Object object) {
- super.collectNewChildDescriptors(newChildDescriptors, object);
-
- newChildDescriptors.add(createChildParameter(JcaPackage.eINSTANCE.getOutboundResourceAdapter_ConnectionDefinitions(), JcaFactory.eINSTANCE.createConnectionDefinition()));
-
- newChildDescriptors.add(createChildParameter(JcaPackage.eINSTANCE.getOutboundResourceAdapter_AuthenticationMechanisms(), JcaFactory.eINSTANCE.createAuthenticationMechanism()));
- }
-
- /**
- * Return the resource locator for this item provider's resources. <!-- begin-user-doc --> <!--
- * end-user-doc -->
- *
- * @generated
- */
- @Override
- public ResourceLocator getResourceLocator() {
- return JcaPlugin.getPlugin();
- }
-}
diff --git a/plugins/org.eclipse.jst.j2ee.jca/jcaedit/org/eclipse/jst/j2ee/internal/jca/providers/RequiredConfigPropertyTypeItemProvider.java b/plugins/org.eclipse.jst.j2ee.jca/jcaedit/org/eclipse/jst/j2ee/internal/jca/providers/RequiredConfigPropertyTypeItemProvider.java
deleted file mode 100644
index 66581b6..0000000
--- a/plugins/org.eclipse.jst.j2ee.jca/jcaedit/org/eclipse/jst/j2ee/internal/jca/providers/RequiredConfigPropertyTypeItemProvider.java
+++ /dev/null
@@ -1,165 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2003, 2006 IBM Corporation and others.
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
- *
- * Contributors:
- * IBM Corporation - initial API and implementation
- *******************************************************************************/
-package org.eclipse.jst.j2ee.internal.jca.providers;
-
-
-import java.util.Collection;
-import java.util.List;
-
-import org.eclipse.emf.common.notify.AdapterFactory;
-import org.eclipse.emf.common.notify.Notification;
-import org.eclipse.emf.common.util.ResourceLocator;
-import org.eclipse.emf.edit.provider.ComposeableAdapterFactory;
-import org.eclipse.emf.edit.provider.IEditingDomainItemProvider;
-import org.eclipse.emf.edit.provider.IItemLabelProvider;
-import org.eclipse.emf.edit.provider.IItemPropertySource;
-import org.eclipse.emf.edit.provider.ITreeItemContentProvider;
-import org.eclipse.emf.edit.provider.ItemPropertyDescriptor;
-import org.eclipse.emf.edit.provider.ItemProviderAdapter;
-import org.eclipse.jst.j2ee.common.CommonFactory;
-import org.eclipse.jst.j2ee.jca.JcaPackage;
-import org.eclipse.jst.j2ee.jca.RequiredConfigPropertyType;
-import org.eclipse.jst.j2ee.jca.internal.plugin.JCAResourceHandler;
-import org.eclipse.jst.j2ee.jca.internal.plugin.JcaPlugin;
-import org.eclipse.jst.j2ee.webservice.wscommon.WscommonFactory;
-
-/**
- * This is the item provider adpater for a {@link com.ibm.etools.jca.RequiredConfigPropertyType}
- * object. <!-- begin-user-doc --> <!-- end-user-doc -->
- *
- * @generated
- */
-public class RequiredConfigPropertyTypeItemProvider extends ItemProviderAdapter implements IEditingDomainItemProvider, ITreeItemContentProvider, IItemLabelProvider, IItemPropertySource {
- /**
- * This constructs an instance from a factory and a notifier. <!-- begin-user-doc --> <!--
- * end-user-doc -->
- *
- * @generated
- */
- public RequiredConfigPropertyTypeItemProvider(AdapterFactory adapterFactory) {
- super(adapterFactory);
- }
-
- /**
- * This returns the property descriptors for the adapted class. <!-- begin-user-doc --> <!--
- * end-user-doc -->
- *
- * @generated
- */
- @Override
- public List getPropertyDescriptors(Object object) {
- if (itemPropertyDescriptors == null) {
- super.getPropertyDescriptors(object);
-
- addNamePropertyDescriptor(object);
- }
- return itemPropertyDescriptors;
- }
-
- /**
- * This adds a property descriptor for the Name feature. <!-- begin-user-doc --> <!--
- * end-user-doc -->
- *
- * @generated
- */
- protected void addNamePropertyDescriptor(Object object) {
- itemPropertyDescriptors.add(new ItemPropertyDescriptor(((ComposeableAdapterFactory) adapterFactory).getRootAdapterFactory(), getString("_UI_RequiredConfigPropertyType_name_feature"), //$NON-NLS-1$
- getString("_UI_PropertyDescriptor_description", "_UI_RequiredConfigPropertyType_name_feature", "_UI_RequiredConfigPropertyType_type"), //$NON-NLS-1$ //$NON-NLS-2$ //$NON-NLS-3$
- JcaPackage.eINSTANCE.getRequiredConfigPropertyType_Name(), true, ItemPropertyDescriptor.GENERIC_VALUE_IMAGE));
- }
-
- /**
- * This specifies how to implement {@link #getChildren}and
- * {@link org.eclipse.emf.edit.command.AddCommand}and
- * {@link org.eclipse.emf.edit.command.RemoveCommand}support in {@link #createCommand}. <!--
- * begin-user-doc --> <!-- end-user-doc -->
- *
- * @generated
- */
- @Override
- public Collection getChildrenReferences(Object object) {
- if (childrenReferences == null) {
- super.getChildrenReferences(object);
- childrenReferences.add(JcaPackage.eINSTANCE.getRequiredConfigPropertyType_Descriptions());
- }
- return childrenReferences;
- }
-
-
- /**
- * This returns RequiredConfigPropertyType.gif. <!-- begin-user-doc --> <!-- end-user-doc -->
- *
- * @generated
- */
- @Override
- public Object getImage(Object object) {
- return getResourceLocator().getImage("full/obj16/RequiredConfigPropertyType"); //$NON-NLS-1$
- }
-
- /**
- * This returns the label text for the adapted class. <!-- begin-user-doc --> <!-- end-user-doc
- * -->
- *
- * @generated
- */
- @Override
- public String getText(Object object) {
- String label = ((RequiredConfigPropertyType) object).getName();
- return label == null || label.length() == 0 ? JCAResourceHandler._UI_RequiredConfigPropertyType_type :
- JCAResourceHandler._UI_RequiredConfigPropertyType_type + " " + label; //$NON-NLS-1$
- }
-
- /**
- * This handles notification by calling {@link #fireNotifyChanged fireNotifyChanged}. <!--
- * begin-user-doc --> <!-- end-user-doc -->
- *
- * @generated
- */
- @Override
- public void notifyChanged(Notification notification) {
- switch (notification.getFeatureID(RequiredConfigPropertyType.class)) {
- case JcaPackage.REQUIRED_CONFIG_PROPERTY_TYPE__NAME :
- case JcaPackage.REQUIRED_CONFIG_PROPERTY_TYPE__DESCRIPTIONS : {
- fireNotifyChanged(notification);
- return;
- }
- }
- super.notifyChanged(notification);
- }
-
- /**
- * This adds to the collection of {@link org.eclipse.emf.edit.command.CommandParameter}s
- * describing all of the children that can be created under this object. <!-- begin-user-doc -->
- * <!-- end-user-doc -->
- *
- * @generated
- */
- @Override
- protected void collectNewChildDescriptors(Collection newChildDescriptors, Object object) {
- super.collectNewChildDescriptors(newChildDescriptors, object);
-
- newChildDescriptors.add(createChildParameter(JcaPackage.eINSTANCE.getRequiredConfigPropertyType_Descriptions(), CommonFactory.eINSTANCE.createDescription()));
-
- newChildDescriptors.add(createChildParameter(JcaPackage.eINSTANCE.getRequiredConfigPropertyType_Descriptions(), WscommonFactory.eINSTANCE.createDescriptionType()));
- }
-
- /**
- * Return the resource locator for this item provider's resources. <!-- begin-user-doc --> <!--
- * end-user-doc -->
- *
- * @generated
- */
- @Override
- public ResourceLocator getResourceLocator() {
- //return J2EEPlugin.getDefault();
- return JcaPlugin.getPlugin();
- }
-}
diff --git a/plugins/org.eclipse.jst.j2ee.jca/jcaedit/org/eclipse/jst/j2ee/internal/jca/providers/ResourceAdapterItemProvider.java b/plugins/org.eclipse.jst.j2ee.jca/jcaedit/org/eclipse/jst/j2ee/internal/jca/providers/ResourceAdapterItemProvider.java
deleted file mode 100644
index 3e6e175..0000000
--- a/plugins/org.eclipse.jst.j2ee.jca/jcaedit/org/eclipse/jst/j2ee/internal/jca/providers/ResourceAdapterItemProvider.java
+++ /dev/null
@@ -1,407 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2003, 2005 IBM Corporation and others.
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
- *
- * Contributors:
- * IBM Corporation - initial API and implementation
- *******************************************************************************/
-package org.eclipse.jst.j2ee.internal.jca.providers;
-
-
-
-import java.util.Collection;
-import java.util.List;
-
-import org.eclipse.emf.common.notify.AdapterFactory;
-import org.eclipse.emf.common.notify.Notification;
-import org.eclipse.emf.common.notify.Notifier;
-import org.eclipse.emf.common.util.ResourceLocator;
-import org.eclipse.emf.ecore.EObject;
-import org.eclipse.emf.ecore.EReference;
-import org.eclipse.emf.ecore.InternalEObject;
-import org.eclipse.emf.ecore.impl.ENotificationImpl;
-import org.eclipse.emf.edit.provider.ComposeableAdapterFactory;
-import org.eclipse.emf.edit.provider.IEditingDomainItemProvider;
-import org.eclipse.emf.edit.provider.IItemLabelProvider;
-import org.eclipse.emf.edit.provider.IItemPropertySource;
-import org.eclipse.emf.edit.provider.ITreeItemContentProvider;
-import org.eclipse.emf.edit.provider.ItemPropertyDescriptor;
-import org.eclipse.jst.j2ee.internal.J2EEVersionConstants;
-import org.eclipse.jst.j2ee.internal.plugin.J2EEPlugin;
-import org.eclipse.jst.j2ee.jca.Connector;
-import org.eclipse.jst.j2ee.jca.JcaFactory;
-import org.eclipse.jst.j2ee.jca.JcaPackage;
-import org.eclipse.jst.j2ee.jca.ResourceAdapter;
-import org.eclipse.jst.j2ee.jca.internal.plugin.JCAResourceHandler;
-import org.eclipse.jst.j2ee.jca.internal.plugin.JcaPlugin;
-
-/**
- * This is the item provider adpater for a ResourceAdapter object.
- */
-public class ResourceAdapterItemProvider extends JcaItemProviderAdapter implements IEditingDomainItemProvider, ITreeItemContentProvider, IItemLabelProvider, IItemPropertySource {
-
- /**
- * This constructs an instance from a factory and a notifier.
- *
- * @param AdapterFactory
- * adapterFactory - The adapt factory
- */
- public ResourceAdapterItemProvider(AdapterFactory adapterFactory) {
- super(adapterFactory);
- }// ResourceAdapterItemProvider
-
- /**
- * This returns the property descriptors for the adapted class. <!-- begin-user-doc --> <!--
- * end-user-doc -->
- *
- * @generated
- */
- @Override
- public List getPropertyDescriptors(Object object) {
- if (itemPropertyDescriptors == null) {
- super.getPropertyDescriptors(object);
-
- addManagedConnectionFactoryClassPropertyDescriptor(object);
- addConnectionFactoryInterfacePropertyDescriptor(object);
- addConnectionFactoryImplClassPropertyDescriptor(object);
- addConnectionInterfacePropertyDescriptor(object);
- addConnectionImplClassPropertyDescriptor(object);
- addTransactionSupportPropertyDescriptor(object);
- addReauthenticationSupportPropertyDescriptor(object);
- addResourceAdapterClassPropertyDescriptor(object);
- }
- return itemPropertyDescriptors;
- }
-
- /**
- * This adds a property descriptor for the Managed Connection Factory Class feature. <!--
- * begin-user-doc --> <!-- end-user-doc -->
- *
- * @generated
- */
- protected void addManagedConnectionFactoryClassPropertyDescriptor(Object object) {
- itemPropertyDescriptors.add(new ItemPropertyDescriptor(((ComposeableAdapterFactory) adapterFactory).getRootAdapterFactory(), getString("_UI_ResourceAdapter_managedConnectionFactoryClass_feature"), //$NON-NLS-1$
- getString("_UI_PropertyDescriptor_description", "_UI_ResourceAdapter_managedConnectionFactoryClass_feature", "_UI_ResourceAdapter_type"), //$NON-NLS-1$ //$NON-NLS-2$ //$NON-NLS-3$
- JcaPackage.eINSTANCE.getResourceAdapter_ManagedConnectionFactoryClass(), true, ItemPropertyDescriptor.GENERIC_VALUE_IMAGE));
- }
-
- /**
- * This adds a property descriptor for the Connection Factory Interface feature. <!--
- * begin-user-doc --> <!-- end-user-doc -->
- *
- * @generated
- */
- protected void addConnectionFactoryInterfacePropertyDescriptor(Object object) {
- itemPropertyDescriptors.add(new ItemPropertyDescriptor(((ComposeableAdapterFactory) adapterFactory).getRootAdapterFactory(), getString("_UI_ResourceAdapter_connectionFactoryInterface_feature"), //$NON-NLS-1$
- getString("_UI_PropertyDescriptor_description", "_UI_ResourceAdapter_connectionFactoryInterface_feature", "_UI_ResourceAdapter_type"), //$NON-NLS-1$ //$NON-NLS-2$ //$NON-NLS-3$
- JcaPackage.eINSTANCE.getResourceAdapter_ConnectionFactoryInterface(), true, ItemPropertyDescriptor.GENERIC_VALUE_IMAGE));
- }
-
- /**
- * This adds a property descriptor for the Connection Factory Impl Class feature. <!--
- * begin-user-doc --> <!-- end-user-doc -->
- *
- * @generated
- */
- protected void addConnectionFactoryImplClassPropertyDescriptor(Object object) {
- itemPropertyDescriptors.add(new ItemPropertyDescriptor(((ComposeableAdapterFactory) adapterFactory).getRootAdapterFactory(), getString("_UI_ResourceAdapter_connectionFactoryImplClass_feature"), //$NON-NLS-1$
- getString("_UI_PropertyDescriptor_description", "_UI_ResourceAdapter_connectionFactoryImplClass_feature", "_UI_ResourceAdapter_type"), //$NON-NLS-1$ //$NON-NLS-2$ //$NON-NLS-3$
- JcaPackage.eINSTANCE.getResourceAdapter_ConnectionFactoryImplClass(), true, ItemPropertyDescriptor.GENERIC_VALUE_IMAGE));
- }
-
- /**
- * This adds a property descriptor for the Connection Interface feature. <!-- begin-user-doc -->
- * <!-- end-user-doc -->
- *
- * @generated
- */
- protected void addConnectionInterfacePropertyDescriptor(Object object) {
- itemPropertyDescriptors.add(new ItemPropertyDescriptor(((ComposeableAdapterFactory) adapterFactory).getRootAdapterFactory(), getString("_UI_ResourceAdapter_connectionInterface_feature"), //$NON-NLS-1$
- getString("_UI_PropertyDescriptor_description", "_UI_ResourceAdapter_connectionInterface_feature", "_UI_ResourceAdapter_type"), //$NON-NLS-1$ //$NON-NLS-2$ //$NON-NLS-3$
- JcaPackage.eINSTANCE.getResourceAdapter_ConnectionInterface(), true, ItemPropertyDescriptor.GENERIC_VALUE_IMAGE));
- }
-
- /**
- * This adds a property descriptor for the Connection Impl Class feature. <!-- begin-user-doc
- * --> <!-- end-user-doc -->
- *
- * @generated
- */
- protected void addConnectionImplClassPropertyDescriptor(Object object) {
- itemPropertyDescriptors.add(new ItemPropertyDescriptor(((ComposeableAdapterFactory) adapterFactory).getRootAdapterFactory(), getString("_UI_ResourceAdapter_connectionImplClass_feature"), //$NON-NLS-1$
- getString("_UI_PropertyDescriptor_description", "_UI_ResourceAdapter_connectionImplClass_feature", "_UI_ResourceAdapter_type"), //$NON-NLS-1$ //$NON-NLS-2$ //$NON-NLS-3$
- JcaPackage.eINSTANCE.getResourceAdapter_ConnectionImplClass(), true, ItemPropertyDescriptor.GENERIC_VALUE_IMAGE));
- }
-
- /**
- * This adds a property descriptor for the Transaction Support feature. <!-- begin-user-doc -->
- * <!-- end-user-doc -->
- *
- * @generated
- */
- protected void addTransactionSupportPropertyDescriptor(Object object) {
- itemPropertyDescriptors.add(new ItemPropertyDescriptor(((ComposeableAdapterFactory) adapterFactory).getRootAdapterFactory(), getString("_UI_ResourceAdapter_transactionSupport_feature"), //$NON-NLS-1$
- getString("_UI_PropertyDescriptor_description", "_UI_ResourceAdapter_transactionSupport_feature", "_UI_ResourceAdapter_type"), //$NON-NLS-1$ //$NON-NLS-2$ //$NON-NLS-3$
- JcaPackage.eINSTANCE.getResourceAdapter_TransactionSupport(), true, ItemPropertyDescriptor.GENERIC_VALUE_IMAGE));
- }
-
- /**
- * This adds a property descriptor for the Reauthentication Support feature. <!-- begin-user-doc
- * --> <!-- end-user-doc -->
- *
- * @generated
- */
- protected void addReauthenticationSupportPropertyDescriptor(Object object) {
- itemPropertyDescriptors.add(new ItemPropertyDescriptor(((ComposeableAdapterFactory) adapterFactory).getRootAdapterFactory(), getString("_UI_ResourceAdapter_reauthenticationSupport_feature"), //$NON-NLS-1$
- getString("_UI_PropertyDescriptor_description", "_UI_ResourceAdapter_reauthenticationSupport_feature", "_UI_ResourceAdapter_type"), //$NON-NLS-1$ //$NON-NLS-2$ //$NON-NLS-3$
- JcaPackage.eINSTANCE.getResourceAdapter_ReauthenticationSupport(), true, ItemPropertyDescriptor.BOOLEAN_VALUE_IMAGE));
- }
-
- /**
- * This adds a property descriptor for the Resource Adapter Class feature. <!-- begin-user-doc
- * --> <!-- end-user-doc -->
- *
- * @generated
- */
- protected void addResourceAdapterClassPropertyDescriptor(Object object) {
- itemPropertyDescriptors.add(new ItemPropertyDescriptor(((ComposeableAdapterFactory) adapterFactory).getRootAdapterFactory(), getString("_UI_ResourceAdapter_resourceAdapterClass_feature"), //$NON-NLS-1$
- getString("_UI_PropertyDescriptor_description", "_UI_ResourceAdapter_resourceAdapterClass_feature", "_UI_ResourceAdapter_type"), //$NON-NLS-1$ //$NON-NLS-2$ //$NON-NLS-3$
- JcaPackage.eINSTANCE.getResourceAdapter_ResourceAdapterClass(), true, ItemPropertyDescriptor.GENERIC_VALUE_IMAGE));
- }
-
- /**
- * This returns the property descriptors for the adapted class.
- *
- * @param Object
- * object - The adapted class.
- * @return List
- */
- /*
- * public List getPropertyDescriptors(Object object) { if (itemPropertyDescriptors == null) {
- * super.getPropertyDescriptors(object);
- *
- * ResourceAdapter f_resourceAdapter = ((ResourceAdapter)object); JcaPackage pkg =
- * JcaPackage.eINSTANCE;; // This is for the managedConnectionFactoryClass feature. //
- * itemPropertyDescriptors.add (new ItemPropertyDescriptor
- * (((ComposeableAdapterFactory)adapterFactory).getRootAdapterFactory(), "Managed Connection
- * Factory Class", "The managed connection factory class property of the resource adapter",
- * pkg.getResourceAdapter_ManagedConnectionFactoryClass(), true,
- * ItemPropertyDescriptor.TEXT_VALUE_IMAGE)); // This is for the connectionFactoryInterface
- * feature. // itemPropertyDescriptors.add (new ItemPropertyDescriptor
- * (((ComposeableAdapterFactory)adapterFactory).getRootAdapterFactory(), "Connection Factory
- * Interface", "The connection factory interface property of the resource adapter",
- * pkg.getResourceAdapter_ConnectionFactoryInterface(), true,
- * ItemPropertyDescriptor.TEXT_VALUE_IMAGE)); // This is for the connectionFactoryImplClass
- * feature. // itemPropertyDescriptors.add (new ItemPropertyDescriptor
- * (((ComposeableAdapterFactory)adapterFactory).getRootAdapterFactory(), "Connection Factory
- * Impl Class", "The connection factory impl class property of the resource adapter",
- * pkg.getResourceAdapter_ConnectionFactoryImplClass(), true,
- * ItemPropertyDescriptor.TEXT_VALUE_IMAGE)); // This is for the connectionInterface feature. //
- * itemPropertyDescriptors.add (new ItemPropertyDescriptor
- * (((ComposeableAdapterFactory)adapterFactory).getRootAdapterFactory(), "Connection Interface",
- * "The connection interface property of the resource adapter",
- * pkg.getResourceAdapter_ConnectionInterface(), true,
- * ItemPropertyDescriptor.TEXT_VALUE_IMAGE)); // This is for the connectionImplClass feature. //
- * itemPropertyDescriptors.add (new ItemPropertyDescriptor
- * (((ComposeableAdapterFactory)adapterFactory).getRootAdapterFactory(), "Connection Impl
- * Class", "The connection impl class property of the resource adapter",
- * pkg.getResourceAdapter_ConnectionImplClass(), true,
- * ItemPropertyDescriptor.TEXT_VALUE_IMAGE)); // This is for the transactionSupport feature. //
- * itemPropertyDescriptors.add (new ItemPropertyDescriptor
- * (((ComposeableAdapterFactory)adapterFactory).getRootAdapterFactory(), "Transaction Support",
- * "The transaction support property of the resource adapter",
- * pkg.getResourceAdapter_TransactionSupport(), true,
- * ItemPropertyDescriptor.GENERIC_VALUE_IMAGE)); // This is for the reauthenticationSupport
- * feature. // itemPropertyDescriptors.add (new ItemPropertyDescriptor
- * (((ComposeableAdapterFactory)adapterFactory).getRootAdapterFactory(), "Reauthentication
- * Support", "The reauthentication support property of the resource adapter",
- * pkg.getResourceAdapter_ReauthenticationSupport(), true,
- * ItemPropertyDescriptor.BOOLEAN_VALUE_IMAGE));
- *
- * }// if return itemPropertyDescriptors; }// getPropertyDescriptors
- */
- /**
- * This specifies how to implement AddCommand and RemoveCommand support in createCommand.
- *
- * @param Object
- * object - The adapt class.
- * @return Collection
- */
- @Override
- public Collection getChildrenReferences(Object object) {
- if (childrenReferences == null) {
- super.getChildrenReferences(object);
- int version = J2EEVersionConstants.JCA_1_0_ID;
- if (object instanceof ResourceAdapter)
- version = ((Connector) ((EObject) object).eContainer()).getVersionID();
-
- switch (version) {
- case J2EEVersionConstants.JCA_1_0_ID :
- childrenReferences.add(JcaPackage.eINSTANCE.getResourceAdapter_OutboundResourceAdapter());
- childrenReferences.add(JcaPackage.eINSTANCE.getResourceAdapter_SecurityPermissions());
- childrenReferences.add(JcaPackage.eINSTANCE.getResourceAdapter_AuthenticationMechanisms());
- childrenReferences.add(JcaPackage.eINSTANCE.getResourceAdapter_ConfigProperties());
- break;
- case J2EEVersionConstants.JCA_1_5_ID :
- childrenReferences.add(JcaPackage.eINSTANCE.getResourceAdapter_OutboundResourceAdapter());
- childrenReferences.add(JcaPackage.eINSTANCE.getResourceAdapter_InboundResourceAdapter());
- childrenReferences.add(JcaPackage.eINSTANCE.getResourceAdapter_AdminObjects());
- childrenReferences.add(JcaPackage.eINSTANCE.getResourceAdapter_SecurityPermissions());
- childrenReferences.add(JcaPackage.eINSTANCE.getResourceAdapter_AuthenticationMechanisms());
- childrenReferences.add(JcaPackage.eINSTANCE.getResourceAdapter_ConfigProperties());
- break;
- }
-
- }// if
- return childrenReferences;
- }// getChildrenReferences
-
- /**
- * <!-- begin-user-doc --> <!-- end-user-doc -->
- *
- * @generated
- */
- @Override
- protected EReference getChildReference(Object object, Object child) {
- // Check the type of the specified child object and return the proper feature to use for
- // adding (see {@link AddCommand}) it as a child.
-
- return super.getChildReference(object, child);
- }
-
-
- /**
- * This returns the parent of the ResourceAdapter.
- *
- * @param Object
- * object - The adapt class.
- * @return Object
- */
- @Override
- public Object getParent(Object object) {
- return ((EObject) object).eContainer();
- }// getParent
-
- /**
- * This returns ResourceAdapter.gif.
- *
- * @param Object
- * object - The adapt class.
- * @return Object
- */
- @Override
- public Object getImage(Object object) {
- return J2EEPlugin.getPlugin().getImage("full/obj16/resource_adapter_obj"); //$NON-NLS-1$
- }// getImage
-
- /**
- * Get the display name.
- *
- * @param Object
- * object - The object to get the name for.
- * @return String
- */
- @Override
- public String getText(Object object) {
- // ResourceAdapter resourceAdapter = ((ResourceAdapter) object);
- //return "ResourceAdapter: " + resourceAdapter.getManagedConnectionFactoryClass();
- // //$NON-NLS-1$
- return JCAResourceHandler._UI_ResourceAdapter_type;
-
- }// getText
-
- /**
- * This handles notification by calling {@link #fireNotifyChanged fireNotifyChanged}. <!--
- * begin-user-doc --> <!-- end-user-doc -->
- *
- * @generated
- */
- @Override
- public void notifyChanged(Notification notification) {
- switch (notification.getFeatureID(ResourceAdapter.class)) {
- case JcaPackage.RESOURCE_ADAPTER__MANAGED_CONNECTION_FACTORY_CLASS :
- case JcaPackage.RESOURCE_ADAPTER__CONNECTION_FACTORY_INTERFACE :
- case JcaPackage.RESOURCE_ADAPTER__CONNECTION_FACTORY_IMPL_CLASS :
- case JcaPackage.RESOURCE_ADAPTER__CONNECTION_INTERFACE :
- case JcaPackage.RESOURCE_ADAPTER__CONNECTION_IMPL_CLASS :
- case JcaPackage.RESOURCE_ADAPTER__TRANSACTION_SUPPORT :
- case JcaPackage.RESOURCE_ADAPTER__REAUTHENTICATION_SUPPORT :
- case JcaPackage.RESOURCE_ADAPTER__RESOURCE_ADAPTER_CLASS :
- case JcaPackage.RESOURCE_ADAPTER__SECURITY_PERMISSIONS :
- case JcaPackage.RESOURCE_ADAPTER__AUTHENTICATION_MECHANISMS :
- case JcaPackage.RESOURCE_ADAPTER__CONFIG_PROPERTIES :
- case JcaPackage.RESOURCE_ADAPTER__OUTBOUND_RESOURCE_ADAPTER :
- case JcaPackage.RESOURCE_ADAPTER__INBOUND_RESOURCE_ADAPTER :
- case JcaPackage.RESOURCE_ADAPTER__ADMIN_OBJECTS : {
- fireNotifyChanged(notification);
- return;
- }
- }
- super.notifyChanged(notification);
- }
-
- /**
- * This adds to the collection of {@link org.eclipse.emf.edit.command.CommandParameter}s
- * describing all of the children that can be created under this object. <!-- begin-user-doc -->
- * <!-- end-user-doc -->
- *
- * @generated
- */
- @Override
- protected void collectNewChildDescriptors(Collection newChildDescriptors, Object object) {
- super.collectNewChildDescriptors(newChildDescriptors, object);
-
- newChildDescriptors.add(createChildParameter(JcaPackage.eINSTANCE.getResourceAdapter_SecurityPermissions(), JcaFactory.eINSTANCE.createSecurityPermission()));
-
- newChildDescriptors.add(createChildParameter(JcaPackage.eINSTANCE.getResourceAdapter_AuthenticationMechanisms(), JcaFactory.eINSTANCE.createAuthenticationMechanism()));
-
- newChildDescriptors.add(createChildParameter(JcaPackage.eINSTANCE.getResourceAdapter_ConfigProperties(), JcaFactory.eINSTANCE.createConfigProperty()));
-
- newChildDescriptors.add(createChildParameter(JcaPackage.eINSTANCE.getResourceAdapter_OutboundResourceAdapter(), JcaFactory.eINSTANCE.createOutboundResourceAdapter()));
-
- newChildDescriptors.add(createChildParameter(JcaPackage.eINSTANCE.getResourceAdapter_InboundResourceAdapter(), JcaFactory.eINSTANCE.createInboundResourceAdapter()));
-
- newChildDescriptors.add(createChildParameter(JcaPackage.eINSTANCE.getResourceAdapter_AdminObjects(), JcaFactory.eINSTANCE.createAdminObject()));
- }
-
- /**
- * Return the resource locator for this item provider's resources. <!-- begin-user-doc --> <!--
- * end-user-doc -->
- *
- * @generated
- */
- @Override
- public ResourceLocator getResourceLocator() {
- return JcaPlugin.getDefault();
- }
-
- /**
- * This handles notification.
- *
- * @param Notifier
- * notifier - Notifies of change.
- * @param int
- * eventType - The event type.
- * @param EObject
- * feature - The reference object.
- * @param Object
- * oldValue - The old object reference.
- * @param Object
- * newValue - The new object reference.
- * @param int
- * index - The current of the object.
- */
- public void notifyChanged(Notifier notifier, int eventType, EObject feature, Object oldValue, Object newValue, int index) {
- JcaPackage pkg = JcaPackage.eINSTANCE;
- Notification msg = new ENotificationImpl((InternalEObject) notifier, eventType, feature.eContainmentFeature(), oldValue, newValue, index);
- if (feature == pkg.getResourceAdapter_ManagedConnectionFactoryClass() || feature == pkg.getResourceAdapter_ConnectionFactoryInterface() || feature == pkg.getResourceAdapter_ConnectionFactoryImplClass() || feature == pkg.getResourceAdapter_ConnectionInterface() || feature == pkg.getResourceAdapter_ConnectionImplClass() || feature == pkg.getResourceAdapter_TransactionSupport() || feature == pkg.getResourceAdapter_ReauthenticationSupport() || feature == pkg.getResourceAdapter_SecurityPermissions() || feature == pkg.getResourceAdapter_AuthenticationMechanisms() || feature == pkg.getResourceAdapter_ConfigProperties()) {
- fireNotifyChanged(msg);
- return;
- }// if
- super.notifyChanged(msg);
- }// notifyChanged
-
-}// ResourceAdapterItemProvider
diff --git a/plugins/org.eclipse.jst.j2ee.jca/jcaedit/org/eclipse/jst/j2ee/internal/jca/providers/SecurityPermissionItemProvider.java b/plugins/org.eclipse.jst.j2ee.jca/jcaedit/org/eclipse/jst/j2ee/internal/jca/providers/SecurityPermissionItemProvider.java
deleted file mode 100644
index b1c6341..0000000
--- a/plugins/org.eclipse.jst.j2ee.jca/jcaedit/org/eclipse/jst/j2ee/internal/jca/providers/SecurityPermissionItemProvider.java
+++ /dev/null
@@ -1,249 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2003, 2006 IBM Corporation and others.
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
- *
- * Contributors:
- * IBM Corporation - initial API and implementation
- *******************************************************************************/
-package org.eclipse.jst.j2ee.internal.jca.providers;
-
-
-
-import java.util.Collection;
-import java.util.List;
-
-import org.eclipse.emf.common.notify.AdapterFactory;
-import org.eclipse.emf.common.notify.Notification;
-import org.eclipse.emf.common.notify.Notifier;
-import org.eclipse.emf.common.util.ResourceLocator;
-import org.eclipse.emf.ecore.EObject;
-import org.eclipse.emf.ecore.InternalEObject;
-import org.eclipse.emf.ecore.impl.ENotificationImpl;
-import org.eclipse.emf.edit.provider.ComposeableAdapterFactory;
-import org.eclipse.emf.edit.provider.IEditingDomainItemProvider;
-import org.eclipse.emf.edit.provider.IItemLabelProvider;
-import org.eclipse.emf.edit.provider.IItemPropertySource;
-import org.eclipse.emf.edit.provider.ITreeItemContentProvider;
-import org.eclipse.emf.edit.provider.ItemPropertyDescriptor;
-import org.eclipse.jst.j2ee.common.CommonFactory;
-import org.eclipse.jst.j2ee.internal.plugin.J2EEPlugin;
-import org.eclipse.jst.j2ee.jca.JcaPackage;
-import org.eclipse.jst.j2ee.jca.SecurityPermission;
-import org.eclipse.jst.j2ee.jca.internal.plugin.JCAResourceHandler;
-import org.eclipse.jst.j2ee.webservice.wscommon.WscommonFactory;
-
-
-/**
- * This is the item provider adpater for a SecurityPermission object.
- */
-public class SecurityPermissionItemProvider extends JcaItemProviderAdapter implements IEditingDomainItemProvider, ITreeItemContentProvider, IItemLabelProvider, IItemPropertySource {
-
- /**
- * This constructs an instance from a factory and a notifier.
- *
- * @param AdapterFactory
- * adapterFactory - The adapt factory.
- */
- public SecurityPermissionItemProvider(AdapterFactory adapterFactory) {
- super(adapterFactory);
- }// SecurityPermissionItemProvider
-
- /**
- * This returns the property descriptors for the adapted class. <!-- begin-user-doc --> <!--
- * end-user-doc -->
- *
- * @generated
- */
- @Override
- public List getPropertyDescriptors(Object object) {
- if (itemPropertyDescriptors == null) {
- super.getPropertyDescriptors(object);
-
- addDescriptionPropertyDescriptor(object);
- addSpecificationPropertyDescriptor(object);
- }
- return itemPropertyDescriptors;
- }
-
- /**
- * This adds a property descriptor for the Description feature. <!-- begin-user-doc --> <!--
- * end-user-doc -->
- *
- * @generated
- */
- protected void addDescriptionPropertyDescriptor(Object object) {
- itemPropertyDescriptors.add(new ItemPropertyDescriptor(((ComposeableAdapterFactory) adapterFactory).getRootAdapterFactory(), getString("_UI_SecurityPermission_description_feature"), //$NON-NLS-1$
- getString("_UI_PropertyDescriptor_description", "_UI_SecurityPermission_description_feature", "_UI_SecurityPermission_type"), //$NON-NLS-1$ //$NON-NLS-2$ //$NON-NLS-3$
- JcaPackage.eINSTANCE.getSecurityPermission_Description(), true, ItemPropertyDescriptor.GENERIC_VALUE_IMAGE));
- }
-
- /**
- * This adds a property descriptor for the Specification feature. <!-- begin-user-doc --> <!--
- * end-user-doc -->
- *
- * @generated
- */
- protected void addSpecificationPropertyDescriptor(Object object) {
- itemPropertyDescriptors.add(new ItemPropertyDescriptor(((ComposeableAdapterFactory) adapterFactory).getRootAdapterFactory(), getString("_UI_SecurityPermission_specification_feature"), //$NON-NLS-1$
- getString("_UI_PropertyDescriptor_description", "_UI_SecurityPermission_specification_feature", "_UI_SecurityPermission_type"), //$NON-NLS-1$ //$NON-NLS-2$ //$NON-NLS-3$
- JcaPackage.eINSTANCE.getSecurityPermission_Specification(), true, ItemPropertyDescriptor.GENERIC_VALUE_IMAGE));
- }
-
- /**
- * This specifies how to implement {@link #getChildren}and
- * {@link org.eclipse.emf.edit.command.AddCommand}and
- * {@link org.eclipse.emf.edit.command.RemoveCommand}support in {@link #createCommand}. <!--
- * begin-user-doc --> <!-- end-user-doc -->
- *
- * @generated
- */
- @Override
- public Collection getChildrenReferences(Object object) {
- if (childrenReferences == null) {
- super.getChildrenReferences(object);
- childrenReferences.add(JcaPackage.eINSTANCE.getSecurityPermission_Descriptions());
- }
- return childrenReferences;
- }
-
-
- /**
- * This returns the property descriptors for the adapted class.
- *
- * @param Object
- * object - The adapted class.
- * @return List
- */
- /*
- * public List getPropertyDescriptors(Object object) { if (itemPropertyDescriptors == null) {
- * super.getPropertyDescriptors(object);
- *
- * SecurityPermission f_securityPermission = ((SecurityPermission)object); JcaPackage pkg =
- * JcaPackage.eINSTANCE;; // This is for the description feature. // itemPropertyDescriptors.add
- * (new ItemPropertyDescriptor
- * (((ComposeableAdapterFactory)adapterFactory).getRootAdapterFactory(), "Description", "The
- * description property of the security permission", pkg.getSecurityPermission_Description(),
- * true, ItemPropertyDescriptor.TEXT_VALUE_IMAGE)); // This is for the specification feature. //
- * itemPropertyDescriptors.add (new ItemPropertyDescriptor
- * (((ComposeableAdapterFactory)adapterFactory).getRootAdapterFactory(), "Specification", "The
- * specification property of the security permission",
- * pkg.getSecurityPermission_Specification(), true, ItemPropertyDescriptor.TEXT_VALUE_IMAGE));
- *
- * }// if return itemPropertyDescriptors; }// getPropertyDescriptors
- */
- /**
- * This returns the parent of the SecurityPermission.
- *
- * @param Object
- * object - The adapt class.
- * @return Object
- */
- @Override
- public Object getParent(Object object) {
- return ((EObject) object).eContainer();
- }// getParent
-
- /**
- * This returns SecurityPermission.gif.
- *
- * @param Object
- * object - The adapt class.
- * @return object
- */
- @Override
- public Object getImage(Object object) {
- return J2EEPlugin.getPlugin().getImage("full/obj16/security_permission_obj"); //$NON-NLS-1$
- }// getImage
-
-
- /**
- * Get the display name.
- *
- * @param Object
- * object - The object to get the name for.
- * @return String
- */
- @Override
- public String getText(Object object) {
- SecurityPermission securityPermission = ((SecurityPermission) object);
- if (securityPermission.getDescription() == null)
- return JCAResourceHandler.SecurityPermissionItemProvider_UI_0;
- return JCAResourceHandler.SecurityPermissionItemProvider_UI_0 + ": " + securityPermission.getDescription(); //$NON-NLS-1$
- }// getText
-
- /**
- * This handles notification by calling {@link #fireNotifyChanged fireNotifyChanged}. <!--
- * begin-user-doc --> <!-- end-user-doc -->
- *
- * @generated
- */
- @Override
- public void notifyChanged(Notification notification) {
- switch (notification.getFeatureID(SecurityPermission.class)) {
- case JcaPackage.SECURITY_PERMISSION__DESCRIPTION :
- case JcaPackage.SECURITY_PERMISSION__SPECIFICATION :
- case JcaPackage.SECURITY_PERMISSION__DESCRIPTIONS : {
- fireNotifyChanged(notification);
- return;
- }
- }
- super.notifyChanged(notification);
- }
-
- /**
- * This adds to the collection of {@link org.eclipse.emf.edit.command.CommandParameter}s
- * describing all of the children that can be created under this object. <!-- begin-user-doc -->
- * <!-- end-user-doc -->
- *
- * @generated
- */
- @Override
- protected void collectNewChildDescriptors(Collection newChildDescriptors, Object object) {
- super.collectNewChildDescriptors(newChildDescriptors, object);
-
- newChildDescriptors.add(createChildParameter(JcaPackage.eINSTANCE.getSecurityPermission_Descriptions(), CommonFactory.eINSTANCE.createDescription()));
-
- newChildDescriptors.add(createChildParameter(JcaPackage.eINSTANCE.getSecurityPermission_Descriptions(), WscommonFactory.eINSTANCE.createDescriptionType()));
- }
-
- /**
- * Return the resource locator for this item provider's resources. <!-- begin-user-doc --> <!--
- * end-user-doc -->
- *
- * @generated
- */
- @Override
- public ResourceLocator getResourceLocator() {
- return J2EEPlugin.getDefault();
- }
-
- /**
- * This handles notification.
- *
- * @param Notifier
- * notifier - Notifies of change.
- * @param int
- * eventType - The event type.
- * @param EObject
- * feature - The reference object.
- * @param Object
- * oldValue - The old object reference.
- * @param Object
- * newValue - The new object reference.
- * @param int
- * index - The current of the object.
- */
- public void notifyChanged(Notifier notifier, int eventType, EObject feature, Object oldValue, Object newValue, int index) {
- JcaPackage pkg = JcaPackage.eINSTANCE;
- Notification msg = new ENotificationImpl((InternalEObject) notifier, eventType, feature.eContainmentFeature(), oldValue, newValue, index);
- if (feature == pkg.getSecurityPermission_Description() || feature == pkg.getSecurityPermission_Specification()) {
- fireNotifyChanged(msg);
- return;
- }// if
- super.notifyChanged(msg);
- }// notifyChanged
-
-}// SecurityPermissionItemProvider
diff --git a/plugins/org.eclipse.jst.j2ee.jca/plugin.properties b/plugins/org.eclipse.jst.j2ee.jca/plugin.properties
deleted file mode 100644
index 9e1c9ba..0000000
--- a/plugins/org.eclipse.jst.j2ee.jca/plugin.properties
+++ /dev/null
@@ -1,16 +0,0 @@
-###############################################################################
-# Copyright (c) 2003, 2006 IBM Corporation and others.
-# All rights reserved. This program and the accompanying materials
-# are made available under the terms of the Eclipse Public License v1.0
-# which accompanies this distribution, and is available at
-# http://www.eclipse.org/legal/epl-v10.html
-#
-# Contributors:
-# IBM Corporation - initial API and implementation
-###############################################################################
-connector_validator_UI_=Connector (1.0,1.5) Validator
-CONN_FACET_LABEL=JCA Module
-CONN_FACET_DESCRIPTION=Enables the project to be deployed as a JCA module.
-CONN_FACET_TEMPLATE=JCA Project
-pluginName=JCA Plug-in
-pluginVendor=Eclipse Web Tools Platform
diff --git a/plugins/org.eclipse.jst.j2ee.jca/plugin.xml b/plugins/org.eclipse.jst.j2ee.jca/plugin.xml
deleted file mode 100644
index 99428ae..0000000
--- a/plugins/org.eclipse.jst.j2ee.jca/plugin.xml
+++ /dev/null
@@ -1,149 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<?eclipse version="3.0"?>
-<plugin>
-
-
- <extension
- id="JcaModuleExtension"
- name="JcaModuleExtension"
- point="org.eclipse.jst.j2ee.EARModuleExtension">
- <earModuleExtension
- extensionClass="org.eclipse.jst.j2ee.jca.internal.plugin.JcaModuleExtensionImpl">
- </earModuleExtension>
- </extension>
- <extension
- point="org.eclipse.wst.common.emfworkbench.integration.adapterFactory">
- <adapterFactory
- functionGroupID="org.eclipse.jst.j2ee"
- className="org.eclipse.jst.j2ee.internal.jca.providers.JcaItemProviderAdapterFactory"
- packageURI="jca.xmi"
- id="org.eclipse.jst.j2ee.jca.providers.JcaItemProviderAdapterFactory">
- </adapterFactory>
- </extension>
- <extension
- id="ConnectorValidator"
- name="%connector_validator_UI_"
- point="org.eclipse.wst.validation.validator">
- <validator>
- <enablement>
- <and>
- <test property="org.eclipse.wst.common.project.facet.core.projectFacet" value="jst.connector:1.5]"/>
- </and>
- </enablement>
- <contentTypeBinding
- contentTypeId="org.eclipse.jst.j2ee.connectorDD">
- </contentTypeBinding>
- <filter
- objectClass="org.eclipse.core.resources.IFile"
- nameFilter="MANIFEST.MF">
- </filter>
- <helper
- class="org.eclipse.jst.j2ee.internal.jca.validation.ConnectorHelper">
- </helper>
- <run
- class="org.eclipse.jst.j2ee.internal.jca.validation.UIConnectorValidator">
- </run>
- <runStrategy
- project="true">
- </runStrategy>
- </validator>
- </extension>
-
- <extension
- point="org.eclipse.wst.common.emfworkbench.integration.editModel">
- <editModel
- editModelID="jst.connector"
- factoryClass="org.eclipse.wst.common.componentcore.internal.impl.ArtifactEditModelFactory">
- <editModelResource
- autoload="false"
- URI="META-INF/ra.xml"/>
- </editModel>
- </extension>
- <extension
- point="org.eclipse.wst.common.modulecore.artifactedit">
- <artifactedit
- typeID="jst.connector"
- class="org.eclipse.jst.j2ee.jca.modulecore.util.ConnectorArtifactEdit">
- </artifactedit>
- </extension>
-
- <!--============================-->
- <!-- Builder Provider registrations-->
- <!--============================-->
- <extension
- point="org.eclipse.wst.common.frameworks.DataModelProviderExtension">
- <ProviderDefinesType
- providerType="jst.connector.builder"
- providerID="org.eclipse.jst.j2ee.internal.deployables.JavaComponentBuilderDataModelProvider"/>
- </extension>
-
-
- <!-- Project Facets -->
- <extension point="org.eclipse.wst.common.project.facet.core.facets">
-
- <project-facet id="jst.connector">
- <label>%CONN_FACET_LABEL</label>
- <description>%CONN_FACET_DESCRIPTION</description>
- <icon>icons/full/obj16/Connector.gif</icon>
- <default-version version="1.6"/>
- </project-facet>
-
- <project-facet-version facet="jst.connector" version="1.0">
- <constraint>
- <and>
- <requires facet="jst.java" version="[1.3"/>
- <conflicts group="modules"/>
- </and>
- </constraint>
- <group-member id="modules"/>
- </project-facet-version>
-
- <project-facet-version facet="jst.connector" version="1.5">
- <constraint>
- <and>
- <requires facet="jst.java" version="[1.3"/>
- <conflicts group="modules"/>
- </and>
- </constraint>
- <group-member id="modules"/>
- </project-facet-version>
-
- <project-facet-version facet="jst.connector" version="1.6">
- <constraint>
- <and>
- <requires facet="jst.java" version="[6.0"/>
- <conflicts group="modules"/>
- </and>
- </constraint>
- <group-member id="modules"/>
- </project-facet-version>
-
- <action facet="jst.connector" version="[1.0-1.6]" type="INSTALL" id="jst.connector.install">
- <delegate class="org.eclipse.jst.j2ee.jca.project.facet.ConnectorFacetInstallDelegate"/>
- <config-factory class="org.eclipse.jst.j2ee.jca.project.facet.ConnectorFacetInstallDataModelProvider"/>
- </action>
-
- <event-handler facet="jst.connector" version="[1.0-1.6]" type="POST_INSTALL">
- <delegate class="org.eclipse.jst.j2ee.jca.project.facet.ConnectorFacetPostInstallDelegate"/>
- </event-handler>
-
- <event-handler facet="jst.connector" version="[1.0-1.6]" type="RUNTIME_CHANGED">
- <delegate class="org.eclipse.jst.j2ee.project.facet.J2EEFacetRuntimeChangedDelegate"/>
- </event-handler>
-
- <template id="template.jst.connector">
- <label>%CONN_FACET_TEMPLATE</label>
- <fixed facet="jst.java"/>
- <fixed facet="jst.connector"/>
- </template>
-
- </extension>
-
- <extension
- point="org.eclipse.jst.j2ee.J2EEModelProvider">
- <provider>
- <modelProvider factoryClass="org.eclipse.jst.j2ee.jca.modulecore.util.ConnectorArtifactEdit"/>
- <facet id="jst.connector" versions="1.0,1.5"/>
- </provider>
- </extension>
-</plugin>
diff --git a/plugins/org.eclipse.jst.j2ee.jca/prepareforpii.xml b/plugins/org.eclipse.jst.j2ee.jca/prepareforpii.xml
deleted file mode 100644
index f22ea3d..0000000
--- a/plugins/org.eclipse.jst.j2ee.jca/prepareforpii.xml
+++ /dev/null
@@ -1,38 +0,0 @@
-<project name="PrepareForPII" default="main" basedir=".">
-
- <!-- Setup temp variables -->
- <target name="init">
- <property name="nlsDir" value="d:/NLS/Corona/0526"/>
- <property name="plugin" value="com.ibm.wtp.jca"/>
- <property name="plugindir" value="d:/workspaceCorona/${plugin}"/>
- <property name="outputDir" value="${nlsDir}/${plugin}"/>
-
-
- </target>
-
- <!-- Create the destination dir -->
- <target name="nlsDir" depends="init">
- <mkdir dir="${nlsDir}"/>
- </target>
-
- <!-- Create the destination dir -->
- <target name="plugindir" depends="nlsDir">
- <delete dir="${outputDir}"/>
- <mkdir dir="${outputDir}"/>
- </target>
-
- <!-- Move the files to the correct locations in the workspace. -->
- <target name="main" depends="plugindir">
-
- <messageIdGen folderPath = "${plugindir}" componentId = "E" />
-
- <copy todir = "${outputDir}/property_files" >
- <fileset dir="${plugindir}/property_files">
- <include name="**/*.properties"/>
- </fileset>
- </copy>
-
- <copy file="${plugindir}/plugin.properties" todir="${outputDir}"/>
-
- </target>
-</project>
diff --git a/plugins/org.eclipse.jst.j2ee.jca/property_files/rar.properties b/plugins/org.eclipse.jst.j2ee.jca/property_files/rar.properties
deleted file mode 100644
index a201682..0000000
--- a/plugins/org.eclipse.jst.j2ee.jca/property_files/rar.properties
+++ /dev/null
@@ -1,22 +0,0 @@
-###############################################################################
-# Copyright (c) 2003, 2005 IBM Corporation and others.
-# All rights reserved. This program and the accompanying materials
-# are made available under the terms of the Eclipse Public License v1.0
-# which accompanies this distribution, and is available at
-# http://www.eclipse.org/legal/epl-v10.html
-#
-# Contributors:
-# IBM Corporation - initial API and implementation
-###############################################################################
-LicenseItemProvider_UI_0=License
-SecurityPermissionItemProvider_UI_0=SecurityPermission
-ConfigPropertyItemProvider_UI_0=ConfigProperty
-_UI_ResourceAdapter_type=ResourceAdapter
-_UI_OutboundResourceAdapter_type=OutboundResourceAdapter
-_UI_ConnectionDefinition_type=ConnectionDefinition
-_UI_InboundResourceAdapter_type=InboundResourceAdapter
-_UI_MessageAdapter_type=MessageAdapter
-_UI_MessageListener_type=MessageListener
-_UI_ActivationSpec_type=ActivationSpec
-_UI_RequiredConfigPropertyType_type=RequiredConfigProperty
-_UI_AdminObject_type=AdminObject
diff --git a/plugins/org.eclipse.jst.j2ee.jca/property_files/rarvalidation.properties b/plugins/org.eclipse.jst.j2ee.jca/property_files/rarvalidation.properties
deleted file mode 100644
index 2d7877d..0000000
--- a/plugins/org.eclipse.jst.j2ee.jca/property_files/rarvalidation.properties
+++ /dev/null
@@ -1,13 +0,0 @@
-###############################################################################
-# Copyright (c) 2001, 2006 IBM Corporation and others.
-# All rights reserved. This program and the accompanying materials
-# are made available under the terms of the Eclipse Public License v1.0
-# which accompanies this distribution, and is available at
-# http://www.eclipse.org/legal/epl-v10.html
-#
-# Contributors:
-# IBM Corporation - initial API and implementation
-###############################################################################
-CONNECTOR_INVALID_DOC_TYPE_ERROR_=IWAE0054E Document type version "{0}" for rar.xml in project "{1}" needs to be version "{2}".
-ERROR_INVALID_CONNECTOR_FILE="Invalid RAR File".
-ERROR_CONNECTOR_VALIDATION_FAILED="RAR Validation failed".
diff --git a/plugins/org.eclipse.jst.j2ee.jca/rarproject/org/eclipse/jst/j2ee/internal/jca/operations/ConnectorComponentExportDataModelProvider.java b/plugins/org.eclipse.jst.j2ee.jca/rarproject/org/eclipse/jst/j2ee/internal/jca/operations/ConnectorComponentExportDataModelProvider.java
deleted file mode 100644
index 60d9e89..0000000
--- a/plugins/org.eclipse.jst.j2ee.jca/rarproject/org/eclipse/jst/j2ee/internal/jca/operations/ConnectorComponentExportDataModelProvider.java
+++ /dev/null
@@ -1,75 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2003, 2005 IBM Corporation and others.
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
- *
- * Contributors:
- * IBM Corporation - initial API and implementation
- *******************************************************************************/
-package org.eclipse.jst.j2ee.internal.jca.operations;
-
-import org.eclipse.jst.j2ee.application.internal.operations.J2EEComponentExportDataModelProvider;
-import org.eclipse.jst.j2ee.internal.archive.operations.JavaEEComponentExportOperation;
-import org.eclipse.jst.j2ee.internal.earcreation.EARCreationResourceHandler;
-import org.eclipse.jst.j2ee.internal.plugin.IJ2EEModuleConstants;
-import org.eclipse.jst.j2ee.internal.project.J2EEProjectUtilities;
-import org.eclipse.wst.common.frameworks.datamodel.IDataModelOperation;
-
-public class ConnectorComponentExportDataModelProvider extends J2EEComponentExportDataModelProvider {
-
- public ConnectorComponentExportDataModelProvider() {
- super();
- }
-
- @Override
- public IDataModelOperation getDefaultOperation() {
- return new JavaEEComponentExportOperation(model);
- }
-
- @Override
- protected String getProjectType() {
- return J2EEProjectUtilities.JCA;
- }
-
- @Override
- protected String getWrongComponentTypeString(String projectName) {
- return EARCreationResourceHandler.getString(EARCreationResourceHandler.NOT_A_RAR, new Object[]{projectName});
- }
-
- @Override
- protected String getModuleExtension() {
- return IJ2EEModuleConstants.RAR_EXT;
- }
- /**
- * Exports the specified Connector Module project to the specified Connector RAR file.
- *
- * @param connectorProjectName
- * The name of the Connector Module project to export.
- * @param rarFileName
- * The fully qualified Connector RAR file location to export the specified Connector
- * Module project.
- * @param overwriteExisting
- * If this is <code>true</code> then an existing file at the location specified by
- * <code>earFileName</code> will be overwritten.
- * @param exportSource
- * If this is <code>true</code> then all source files in the specified Connector
- * Module will be included in the resulting Connector RAR file.
- * @plannedfor WTP 1.0
- */
-// public static void exportProject(String connectorProjectName, String rarFileName, boolean overwriteExisting, boolean exportSource) {
-// ConnectorModuleExportDataModel dataModel = new ConnectorModuleExportDataModel();
-// dataModel.setProperty(PROJECT_NAME, connectorProjectName);
-// dataModel.setBooleanProperty(OVERWRITE_EXISTING, overwriteExisting);
-// dataModel.setProperty(ARCHIVE_DESTINATION, rarFileName);
-// dataModel.setBooleanProperty(EXPORT_SOURCE_FILES, exportSource);
-// try {
-// dataModel.getDefaultOperation().run(null);
-// } catch (InvocationTargetException e) {
-// Logger.getLogger().logError(e);
-// } catch (InterruptedException e) {
-// Logger.getLogger().logError(e);
-// }
-// }
-}
diff --git a/plugins/org.eclipse.jst.j2ee.jca/rarproject/org/eclipse/jst/j2ee/internal/jca/operations/ConnectorComponentImportDataModelProvider.java b/plugins/org.eclipse.jst.j2ee.jca/rarproject/org/eclipse/jst/j2ee/internal/jca/operations/ConnectorComponentImportDataModelProvider.java
deleted file mode 100644
index 5c79396..0000000
--- a/plugins/org.eclipse.jst.j2ee.jca/rarproject/org/eclipse/jst/j2ee/internal/jca/operations/ConnectorComponentImportDataModelProvider.java
+++ /dev/null
@@ -1,81 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2003, 2007 IBM Corporation and others.
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
- *
- * Contributors:
- * IBM Corporation - initial API and implementation
- *******************************************************************************/
-package org.eclipse.jst.j2ee.internal.jca.operations;
-
-import org.eclipse.jst.j2ee.application.internal.operations.J2EEComponentImportDataModelProvider;
-import org.eclipse.jst.j2ee.internal.common.J2EEVersionUtil;
-import org.eclipse.jst.j2ee.internal.common.XMLResource;
-import org.eclipse.jst.j2ee.internal.project.J2EEProjectUtilities;
-import org.eclipse.jst.j2ee.jca.project.facet.ConnectorFacetProjectCreationDataModelProvider;
-import org.eclipse.jst.j2ee.project.facet.IJ2EEFacetConstants;
-import org.eclipse.jst.j2ee.project.facet.IJ2EEFacetInstallDataModelProperties;
-import org.eclipse.wst.common.componentcore.datamodel.properties.IFacetDataModelProperties;
-import org.eclipse.wst.common.componentcore.datamodel.properties.IFacetProjectCreationDataModelProperties;
-import org.eclipse.wst.common.componentcore.datamodel.properties.IFacetProjectCreationDataModelProperties.FacetDataModelMap;
-import org.eclipse.wst.common.frameworks.datamodel.DataModelFactory;
-import org.eclipse.wst.common.frameworks.datamodel.IDataModel;
-import org.eclipse.wst.common.frameworks.datamodel.IDataModelOperation;
-
-/**
- * This dataModel is used for to import Connector Modules (from RAR files) into the workspace.
- *
- * This class (and all its fields and methods) is likely to change during the WTP 1.0 milestones as
- * the new project structures are adopted. Use at your own risk.
- *
- * @plannedfor WTP 1.0
- */
-public final class ConnectorComponentImportDataModelProvider extends J2EEComponentImportDataModelProvider {
-
- @Override
- public void init() {
- super.init();
- //setIntProperty(IConnectorComponentCreationDataModelProperties.COMPONENT_VERSION, J2EEVersionConstants.J2EE_1_3_ID);
- IDataModel componentCreationDM = model.getNestedModel(NESTED_MODEL_J2EE_COMPONENT_CREATION);
- FacetDataModelMap map = (FacetDataModelMap) componentCreationDM.getProperty(IFacetProjectCreationDataModelProperties.FACET_DM_MAP);
- IDataModel connectorFacet = map.getFacetDataModel( IJ2EEFacetConstants.JCA );
- connectorFacet.setBooleanProperty(IJ2EEFacetInstallDataModelProperties.GENERATE_DD, false);
- }
-
- @Override
- protected int getType() {
- return XMLResource.RAR_TYPE;
- }
-
- @Override
- protected IDataModel createJ2EEComponentCreationDataModel() {
- return DataModelFactory.createDataModel(new ConnectorFacetProjectCreationDataModelProvider());
- }
-
- @Override
- public IDataModelOperation getDefaultOperation() {
- return new ConnectorComponentImportOperation(model);
- }
-
- @Override
- public boolean propertySet(String propertyName, Object propertyValue) {
- boolean set = super.propertySet(propertyName, propertyValue);
- if (propertyName.equals(ARCHIVE_WRAPPER)) {
- IDataModel moduleDM = model.getNestedModel(NESTED_MODEL_J2EE_COMPONENT_CREATION);
- if (getArchiveWrapper() != null) {
- FacetDataModelMap map = (FacetDataModelMap) moduleDM.getProperty(IFacetProjectCreationDataModelProperties.FACET_DM_MAP);
- IDataModel jcaFacetDataModel = map.getFacetDataModel( J2EEProjectUtilities.JCA );
-
- int version = getModuleSpecVersion();
- String versionText = J2EEVersionUtil.getJCATextVersion( version );
- jcaFacetDataModel.setStringProperty(IFacetDataModelProperties.FACET_VERSION_STR, versionText);
- model.notifyPropertyChange(PROJECT_NAME, IDataModel.VALID_VALUES_CHG);
- updateWorkingCopyFacetVersion(moduleDM, jcaFacetDataModel);
- updateJavaFacetVersion();
- }
- }
- return set;
- }
-}
diff --git a/plugins/org.eclipse.jst.j2ee.jca/rarproject/org/eclipse/jst/j2ee/internal/jca/operations/ConnectorComponentImportOperation.java b/plugins/org.eclipse.jst.j2ee.jca/rarproject/org/eclipse/jst/j2ee/internal/jca/operations/ConnectorComponentImportOperation.java
deleted file mode 100644
index 241a0b2..0000000
--- a/plugins/org.eclipse.jst.j2ee.jca/rarproject/org/eclipse/jst/j2ee/internal/jca/operations/ConnectorComponentImportOperation.java
+++ /dev/null
@@ -1,111 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2003, 2007 IBM Corporation and others.
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
- *
- * Contributors:
- * IBM Corporation - initial API and implementation
- *******************************************************************************/
-package org.eclipse.jst.j2ee.internal.jca.operations;
-
-import java.util.ArrayList;
-import java.util.List;
-
-import org.eclipse.core.commands.ExecutionException;
-import org.eclipse.core.resources.IFile;
-import org.eclipse.core.runtime.IProgressMonitor;
-import org.eclipse.core.runtime.NullProgressMonitor;
-import org.eclipse.jdt.core.IClasspathEntry;
-import org.eclipse.jdt.core.IJavaProject;
-import org.eclipse.jdt.core.JavaCore;
-import org.eclipse.jdt.core.JavaModelException;
-import org.eclipse.jem.util.logger.proxy.Logger;
-import org.eclipse.jst.j2ee.datamodel.properties.IJ2EEComponentImportDataModelProperties;
-import org.eclipse.jst.j2ee.internal.archive.ComponentArchiveSaveAdapter;
-import org.eclipse.jst.j2ee.internal.archive.ConnectorComponentArchiveSaveAdapter;
-import org.eclipse.jst.j2ee.internal.archive.operations.J2EEArtifactImportOperation;
-import org.eclipse.jst.j2ee.internal.plugin.IJ2EEModuleConstants;
-import org.eclipse.jst.jee.archive.IArchive;
-import org.eclipse.jst.jee.archive.IArchiveResource;
-import org.eclipse.wst.common.componentcore.resources.IVirtualComponent;
-import org.eclipse.wst.common.componentcore.resources.IVirtualFile;
-import org.eclipse.wst.common.frameworks.datamodel.IDataModel;
-
-public class ConnectorComponentImportOperation extends J2EEArtifactImportOperation {
-
- public ConnectorComponentImportOperation(IDataModel model) {
- super(model);
- }
-
- @Override
- protected void doExecute(IProgressMonitor monitor) throws ExecutionException {
- super.doExecute(monitor);
- addAssociateArchivesToClassPath();
- }
-
- /**
- * Adds all jar within the file to the classpath.
- */
- protected void addAssociateArchivesToClassPath() {
- List <IClasspathEntry> extraEntries = new ArrayList <IClasspathEntry> ();
-
- List <IArchiveResource> archiveResources = ((IArchive)archiveWrapper.getUnderLyingArchive()).getArchiveResources();
- IVirtualFile vFile = null;
- IFile file = null;
- for(IArchiveResource archiveResource : archiveResources){
- if(archiveResource.getPath().lastSegment().endsWith(IJ2EEModuleConstants.JAR_EXT)){
- vFile = virtualComponent.getRootFolder().getFile(archiveResource.getPath());
- if (vFile.exists()) {
- file = vFile.getUnderlyingFile();
- extraEntries.add(JavaCore.newLibraryEntry(file.getFullPath(), file.getFullPath(), null, true));
- }
- }
- }
- try {
- addToClasspath(getDataModel(), extraEntries);
- } catch (JavaModelException e) {
- Logger.getLogger().logError(e);
- }
- }
-
- protected static void addToClasspath(IDataModel importModel, List extraEntries) throws JavaModelException {
- if (extraEntries.size() > 0) {
- IJavaProject javaProject = JavaCore.create(((IVirtualComponent) importModel.getProperty(IJ2EEComponentImportDataModelProperties.COMPONENT)).getProject());
- addToClasspath(extraEntries, javaProject);
- }
- }
-
- protected static void addToClasspath(List extraEntries, IJavaProject javaProject) throws JavaModelException {
- if (extraEntries.size() > 0) {
- IClasspathEntry[] javaClasspath = javaProject.getRawClasspath();
- List nonDuplicateList = new ArrayList();
- for (int i = 0; i < extraEntries.size(); i++) {
- IClasspathEntry extraEntry = (IClasspathEntry) extraEntries.get(i);
- boolean include = true;
- for (int j = 0; include && j < javaClasspath.length; j++) {
- if (extraEntry.equals(javaClasspath[j])) {
- include = false;
- }
- }
- if (include) {
- nonDuplicateList.add(extraEntry);
- }
- }
- if (nonDuplicateList.size() > 0) {
- IClasspathEntry[] newJavaClasspath = new IClasspathEntry[javaClasspath.length + nonDuplicateList.size()];
- System.arraycopy(javaClasspath, 0, newJavaClasspath, 0, javaClasspath.length);
- for (int j = 0; j < nonDuplicateList.size(); j++) {
- newJavaClasspath[javaClasspath.length + j] = (IClasspathEntry) nonDuplicateList.get(j);
- }
- javaProject.setRawClasspath(newJavaClasspath, new NullProgressMonitor());
- }
- }
- }
-
- @Override
- protected ComponentArchiveSaveAdapter getArchiveSaveAdapter(IVirtualComponent virtualComponent){
- return new ConnectorComponentArchiveSaveAdapter(virtualComponent);
- }
-}
diff --git a/plugins/org.eclipse.jst.j2ee.jca/rarproject/org/eclipse/jst/j2ee/internal/jca/operations/IConnectorComponentExportDataModelProperties.java b/plugins/org.eclipse.jst.j2ee.jca/rarproject/org/eclipse/jst/j2ee/internal/jca/operations/IConnectorComponentExportDataModelProperties.java
deleted file mode 100644
index fc5a54a..0000000
--- a/plugins/org.eclipse.jst.j2ee.jca/rarproject/org/eclipse/jst/j2ee/internal/jca/operations/IConnectorComponentExportDataModelProperties.java
+++ /dev/null
@@ -1,32 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2003, 2005 IBM Corporation and others.
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
- *
- * Contributors:
- * IBM Corporation - initial API and implementation
- *******************************************************************************/
-package org.eclipse.jst.j2ee.internal.jca.operations;
-
-import org.eclipse.jst.j2ee.datamodel.properties.IJ2EEComponentExportDataModelProperties;
-/**
- * <p>
- * IConnectorComponentExportDataModel provides properties to the IDataModel associated with the
- * ConnectorComponentExportDataModelProvider.\
- * NOTE: The associated Provider and Operations will be created during M5
- * </p>
- * <p>
- * This interface is not intended to be implemented by clients.
- * </p>
- *
- * @see org.eclipse.wst.common.frameworks.datamodel.IDataModelProvider
- * @see org.eclipse.wst.common.frameworks.datamodel.DataModelFactory
- * @see org.eclipse.wst.common.frameworks.datamodel.IDataModelProperties
- *
- * @plannedfor 1.0
- */
-public interface IConnectorComponentExportDataModelProperties extends IJ2EEComponentExportDataModelProperties {
-
-}
diff --git a/plugins/org.eclipse.jst.j2ee.jca/rarproject/org/eclipse/jst/j2ee/internal/jca/operations/IConnectorComponentImportDataModelProperties.java b/plugins/org.eclipse.jst.j2ee.jca/rarproject/org/eclipse/jst/j2ee/internal/jca/operations/IConnectorComponentImportDataModelProperties.java
deleted file mode 100644
index f172846..0000000
--- a/plugins/org.eclipse.jst.j2ee.jca/rarproject/org/eclipse/jst/j2ee/internal/jca/operations/IConnectorComponentImportDataModelProperties.java
+++ /dev/null
@@ -1,32 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2003, 2005 IBM Corporation and others.
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
- *
- * Contributors:
- * IBM Corporation - initial API and implementation
- *******************************************************************************/
-package org.eclipse.jst.j2ee.internal.jca.operations;
-
-import org.eclipse.jst.j2ee.datamodel.properties.IJ2EEModuleImportDataModelProperties;
-/**
- * <p>
- * IConnectorComponentImportDataModelProperties provides properties to the IDataModel associated with the
- * ConnectorComponentImportDataModelProvider.
- * NOTE: The associated Provider and Operations will be created during M5
- * </p>
- * <p>
- * This interface is not intended to be implemented by clients.
- * </p>
- *
- * @see org.eclipse.wst.common.frameworks.datamodel.IDataModelProvider
- * @see org.eclipse.wst.common.frameworks.datamodel.DataModelFactory
- * @see org.eclipse.wst.common.frameworks.datamodel.IDataModelProperties
- *
- * @plannedfor 1.0
- */
-public interface IConnectorComponentImportDataModelProperties extends IJ2EEModuleImportDataModelProperties {
-
-}
diff --git a/plugins/org.eclipse.jst.j2ee.jca/rarproject/org/eclipse/jst/j2ee/jca/internal/module/util/ConnectorEditAdapterFactory.java b/plugins/org.eclipse.jst.j2ee.jca/rarproject/org/eclipse/jst/j2ee/jca/internal/module/util/ConnectorEditAdapterFactory.java
deleted file mode 100644
index 844da04..0000000
--- a/plugins/org.eclipse.jst.j2ee.jca/rarproject/org/eclipse/jst/j2ee/jca/internal/module/util/ConnectorEditAdapterFactory.java
+++ /dev/null
@@ -1,45 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2005 IBM Corporation and others.
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
- *
- * Contributors:
- * IBM Corporation - initial API and implementation
- *******************************************************************************/
-package org.eclipse.jst.j2ee.jca.internal.module.util;
-
-import org.eclipse.core.runtime.IAdapterFactory;
-import org.eclipse.jst.j2ee.jca.modulecore.util.ConnectorArtifactEdit;
-import org.eclipse.jst.j2ee.project.JavaEEProjectUtilities;
-import org.eclipse.wst.common.componentcore.ArtifactEdit;
-import org.eclipse.wst.common.componentcore.internal.ArtifactEditModel;
-
-public class ConnectorEditAdapterFactory implements IAdapterFactory {
-
- /*
- * (non-Javadoc)
- *
- * @see org.eclipse.core.runtime.IAdapterFactory#getAdapter(java.lang.Object, java.lang.Class)
- */
- public Object getAdapter(Object adaptableObject, Class adapterType) {
- if (adapterType == ConnectorArtifactEdit.ADAPTER_TYPE || adapterType == ArtifactEdit.ADAPTER_TYPE) {
- ArtifactEditModel editModel = (ArtifactEditModel) adaptableObject;
- if (JavaEEProjectUtilities.isJCAProject(editModel.getProject()))
- return new ConnectorArtifactEdit((ArtifactEditModel) adaptableObject);
- }
- return null;
- }
-
- /*
- * (non-Javadoc)
- *
- * @see org.eclipse.core.runtime.IAdapterFactory#getAdapterList()
- */
- public Class[] getAdapterList() {
- return new Class[]{ArtifactEdit.class, ConnectorEditAdapterFactory.class};
- }
-
-
-}
diff --git a/plugins/org.eclipse.jst.j2ee.jca/rarproject/org/eclipse/jst/j2ee/jca/modulecore/util/ConnectorArtifactEdit.java b/plugins/org.eclipse.jst.j2ee.jca/rarproject/org/eclipse/jst/j2ee/jca/modulecore/util/ConnectorArtifactEdit.java
deleted file mode 100644
index 0d599d5..0000000
--- a/plugins/org.eclipse.jst.j2ee.jca/rarproject/org/eclipse/jst/j2ee/jca/modulecore/util/ConnectorArtifactEdit.java
+++ /dev/null
@@ -1,449 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2005, 2007 IBM Corporation and others.
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
- *
- * Contributors:
- * IBM Corporation - initial API and implementation
- *******************************************************************************/
-package org.eclipse.jst.j2ee.jca.modulecore.util;
-
-import java.util.List;
-
-import org.eclipse.core.resources.IProject;
-import org.eclipse.core.runtime.IPath;
-import org.eclipse.core.runtime.NullProgressMonitor;
-import org.eclipse.emf.common.util.URI;
-import org.eclipse.emf.ecore.EObject;
-import org.eclipse.emf.ecore.resource.Resource;
-import org.eclipse.jst.j2ee.commonarchivecore.internal.Archive;
-import org.eclipse.jst.j2ee.commonarchivecore.internal.CommonarchiveFactory;
-import org.eclipse.jst.j2ee.commonarchivecore.internal.exception.OpenFailureException;
-import org.eclipse.jst.j2ee.componentcore.EnterpriseArtifactEdit;
-import org.eclipse.jst.j2ee.internal.J2EEConstants;
-import org.eclipse.jst.j2ee.internal.common.XMLResource;
-import org.eclipse.jst.j2ee.internal.componentcore.JavaEEBinaryComponentHelper;
-import org.eclipse.jst.j2ee.internal.jca.archive.operations.ConnectorComponentLoadStrategyImpl;
-import org.eclipse.jst.j2ee.internal.project.J2EEProjectUtilities;
-import org.eclipse.jst.j2ee.jca.Connector;
-import org.eclipse.jst.j2ee.jca.ConnectorResource;
-import org.eclipse.jst.j2ee.jca.JcaFactory;
-import org.eclipse.jst.j2ee.model.IModelProvider;
-import org.eclipse.jst.j2ee.project.JavaEEProjectUtilities;
-import org.eclipse.wst.common.componentcore.ArtifactEdit;
-import org.eclipse.wst.common.componentcore.ComponentCore;
-import org.eclipse.wst.common.componentcore.ModuleCoreNature;
-import org.eclipse.wst.common.componentcore.UnresolveableURIException;
-import org.eclipse.wst.common.componentcore.internal.ArtifactEditModel;
-import org.eclipse.wst.common.componentcore.internal.BinaryComponentHelper;
-import org.eclipse.wst.common.componentcore.internal.StructureEdit;
-import org.eclipse.wst.common.componentcore.internal.impl.ModuleURIUtil;
-import org.eclipse.wst.common.componentcore.internal.util.IArtifactEditFactory;
-import org.eclipse.wst.common.componentcore.resources.IVirtualComponent;
-
-/**
- * Provides access to J2EE Connector models using the ArtifactEdit pattern.
- * <p>
- * Clients should use getConnectorArtifactForRead/Write() to acquire an instance of the correct
- * artifact edit class.
- * </p>
- */
-public class ConnectorArtifactEdit extends EnterpriseArtifactEdit implements IArtifactEditFactory {
-
- private static final String CONNECTOR_CONTENT_TYPE = "org.eclipse.jst.j2ee.connectorDD"; //$NON-NLS-1$
-
- /**
- * <p>
- * Identifier used to link ConnectorArtifactEdit to a ConnectorEditAdapterFactory
- * {@see ConnectorEditAdapterFactory} stored in an AdapterManger (@see AdapterManager)
- * </p>
- */
-
- public static final Class ADAPTER_TYPE = ConnectorArtifactEdit.class;
-
- /**
- *
- */
- public ConnectorArtifactEdit() {
- super();
- }
-
- public ConnectorArtifactEdit(IVirtualComponent aModule) {
- super(aModule);
- }
-
- @Override
- protected BinaryComponentHelper initBinaryComponentHelper(IVirtualComponent binaryModule) {
- return new JavaEEBinaryComponentHelper(binaryModule);
- }
-
- /**
- * @param aHandle
- * @param toAccessAsReadOnly
- * @throws IllegalArgumentException
- */
- public ConnectorArtifactEdit(IProject aProject, boolean toAccessAsReadOnly) throws IllegalArgumentException {
- super(aProject, toAccessAsReadOnly);
- }
-
- public ConnectorArtifactEdit(IProject aProject, boolean toAccessAsReadOnly, boolean forCreate) throws IllegalArgumentException {
- super(aProject, toAccessAsReadOnly, forCreate, J2EEProjectUtilities.JCA);
- }
-
- /**
- * <p>
- * Creates an instance facade for the given {@see ArtifactEditModel}.
- * </p>
- *
- * @param anArtifactEditModel
- */
-
- public ConnectorArtifactEdit(ArtifactEditModel anArtifactEditModel) {
- super(anArtifactEditModel);
- }
-
- /**
- * <p>
- * Creates an instance facade for the given {@see ArtifactEditModel}
- * </p>
- * <p>
- * Note: This method is for internal use only. Clients should not call this method.
- * </p>
- *
- * @param aNature
- * A non-null {@see ModuleCoreNature}for an accessible project
- * @param aModule
- * A non-null {@see WorkbenchComponent}pointing to a module from the given
- * {@see ModuleCoreNature}
- */
-
- protected ConnectorArtifactEdit(ModuleCoreNature aNature, IVirtualComponent aModule, boolean toAccessAsReadOnly) {
- super(aNature, aModule, toAccessAsReadOnly);
- }
-
- /**
- * @return ConnectorResource from (@link getDeploymentDescriptorResource())
- */
-
- public ConnectorResource getConnectorXmiResource() {
- return (ConnectorResource) getDeploymentDescriptorResource();
- }
-
- /**
- * <p>
- * Retrieves the underlying resource from the ArtifactEditModel using defined URI.
- * </p>
- *
- * @return Resource
- */
-
- @Override
- public Resource getDeploymentDescriptorResource() {
- if (isBinary()) {
- return getBinaryComponentHelper().getResource(J2EEConstants.RAR_DD_URI_OBJ);
- }
- return getArtifactEditModel().getResource(J2EEConstants.RAR_DD_URI_OBJ);
- }
-
- /**
- * <p>
- * Obtains the Connector (@see Connector) root object from the ConnectorResource. If the root
- * object does not exist, then one is created (@link
- * addConnectorIfNecessary(getConnectorXmiResource())). The root object contains all other
- * resource defined objects.
- * </p>
- *
- * @return EObject
- */
- @Override
- public EObject getDeploymentDescriptorRoot() {
- List contents = getDeploymentDescriptorResource().getContents();
- if (contents.size() > 0)
- return (EObject) contents.get(0);
- if (isBinary()) {
- return null;
- }
- addConnectorIfNecessary(getConnectorXmiResource());
- return (EObject) contents.get(0);
- }
-
- /**
- * <p>
- * Creates a deployment descriptor root object (Connector) and populates with data. Adds the
- * root object to the deployment descriptor resource.
- * </p>
- * <p>
- *
- * @param aModule
- * A non-null pointing to a {@see XMLResource} Note: This method is typically used
- * for JUNIT - move?
- * </p>
- */
- protected void addConnectorIfNecessary(XMLResource aResource) {
- if (isBinary()) {
- throwAttemptedBinaryEditModelAccess();
- }
- if (aResource != null && aResource.getContents().isEmpty()) {
- Connector connector = JcaFactory.eINSTANCE.createConnector();
- aResource.getContents().add(connector);
- URI moduleURI = getArtifactEditModel().getModuleURI();
- try {
- connector.setDisplayName(StructureEdit.getDeployedName(moduleURI));
- } catch (UnresolveableURIException e) {
- // Ignore
- }
- aResource.setID(connector, J2EEConstants.CONNECTOR_ID);
- // TODO add more mandatory elements
- }
- }
-
- /**
- * <p>
- * Returns an instance facade to manage the underlying edit model for the given
- * {@see WorkbenchComponent}. Instances of ArtifactEdit that are returned through this method
- * must be {@see #dispose()}ed of when no longer in use.
- * </p>
- * <p>
- * Use to acquire an ArtifactEdit facade for a specific {@see WorkbenchComponent} that
- * will not be used for editing. Invocations of any save*() API on an instance returned from
- * this method will throw exceptions.
- * </p>
- * <p>
- * <b>The following method may return null. </b>
- * </p>
- *
- * @param aModule
- * A valid {@see WorkbenchComponent} with a handle that resolves to an
- * accessible project in the workspace
- * @return An instance of ArtifactEdit that may only be used to read the underlying content
- * model
- */
- public static ConnectorArtifactEdit getConnectorArtifactEditForRead(IProject aProject) {
- ConnectorArtifactEdit artifactEdit = null;
- try {
- if (isValidConnectorModule(ComponentCore.createComponent(aProject)))
- artifactEdit = new ConnectorArtifactEdit(aProject, true, false);
- } catch (Exception e) {
- artifactEdit = null;
- }
- return artifactEdit;
- }
-
- /**
- * <p>
- * Returns an instance facade to manage the underlying edit model for the given
- * {@see WorkbenchComponent}. Instances of ArtifactEdit that are returned through this method
- * must be {@see #dispose()}ed of when no longer in use.
- * </p>
- * <p>
- * Use to acquire an ArtifactEdit facade for a specific {@see WorkbenchComponent} that
- * will be used for editing.
- * </p>
- * <p>
- * <b>The following method may return null. </b>
- * </p>
- *
- * @param aModule
- * A valid {@see WorkbenchComponent} with a handle that resolves to an
- * accessible project in the workspace
- * @return An instance of ArtifactEdit that may be used to modify and persist changes to the
- * underlying content model
- */
- public static ConnectorArtifactEdit getConnectorArtifactEditForWrite(IProject aProject) {
- ConnectorArtifactEdit artifactEdit = null;
- try {
- if (isValidConnectorModule(ComponentCore.createComponent(aProject)))
- artifactEdit = new ConnectorArtifactEdit(aProject, false, false);
- } catch (Exception e) {
- artifactEdit = null;
- }
- return artifactEdit;
- }
-
- /**
- * <p>
- * Returns an instance facade to manage the underlying edit model for the given
- * {@see WorkbenchComponent}. Instances of ConnectorArtifactEdit that are returned through this
- * method must be {@see #dispose()}ed of when no longer in use.
- * </p>
- * <p>
- * Use to acquire an ConnectorArtifactEdit facade for a specific {@see WorkbenchComponent} that
- * will not be used for editing. Invocations of any save*() API on an instance returned from
- * this method will throw exceptions.
- * </p>
- * <p>
- * <b>This method may return null. </b>
- * </p>
- * <p>
- * Note: This method is for internal use only. Clients should not call this method.
- * </p>
- *
- * @param aModule
- * A valid {@see WorkbenchComponent} with a handle that resolves to an
- * accessible project in the workspace
- * @return An instance of ConnectorArtifactEdit that may only be used to read the underlying
- * content model
- * @throws UnresolveableURIException
- * could not resolve uri.
- */
- public static ConnectorArtifactEdit getConnectorArtifactEditForRead(IVirtualComponent aModule) {
- if (aModule == null)
- return null;
- if (aModule.isBinary()) {
- return new ConnectorArtifactEdit(aModule);
- }
- return getConnectorArtifactEditForRead(aModule.getProject());
- }
-
- /**
- * <p>
- * Returns an instance facade to manage the underlying edit model for the given
- * {@see WorkbenchComponent}. Instances of ConnectorArtifactEdit that are returned through this
- * method must be {@see #dispose()}ed of when no longer in use.
- * </p>
- * <p>
- * Use to acquire an ConnectorArtifactEdit facade for a specific {@see WorkbenchComponent} that
- * will be used for editing.
- * </p>
- * <p>
- * <b>This method may return null. </b>
- * </p>
- * <p>
- * Note: This method is for internal use only. Clients should not call this method.
- * </p>
- *
- * @param aModule
- * A valid {@see WorkbenchComponent} with a handle that resolves to an
- * accessible project in the workspace
- * @return An instance of ConnectorArtifactEdit that may be used to modify and persist changes
- * to the underlying content model
- */
- public static ConnectorArtifactEdit getConnectorArtifactEditForWrite(IVirtualComponent aModule) {
- if (aModule == null || aModule.isBinary())
- return null;
- return getConnectorArtifactEditForWrite(aModule.getProject());
- }
-
- /**
- * @param module
- * A {@see WorkbenchComponent}
- * @return True if the supplied module
- * {@see ArtifactEdit#isValidEditableModule(WorkbenchComponent)}and the moduleTypeId is
- * a JST module
- */
- public static boolean isValidConnectorModule(IVirtualComponent aModule) throws UnresolveableURIException {
- if (!isValidEditableModule(aModule))
- return false;
- /* and match the JST_Connector_MODULE type */
- return JavaEEProjectUtilities.isJCAProject(aModule.getProject());
- }
-
- /**
- * <p>
- * Retrieves J2EE version information from ConnectorResource.
- * </p>
- *
- * @return an integer representation of a J2EE Spec version
- */
-
- @Override
- public int getJ2EEVersion() {
- return getConnectorXmiResource().getJ2EEVersionID();
- }
-
- /**
- * @return Connector from (@link getDeploymentDescriptorRoot())
- */
- public Connector getConnector() {
- return (Connector) getDeploymentDescriptorRoot();
- }
-
- @Override
- public EObject createModelRoot() {
- if (isBinary()) {
- throwAttemptedBinaryEditModelAccess();
- }
- return createModelRoot(getJ2EEVersion());
- }
-
- /*
- * (non-Javadoc)
- *
- * @see org.eclipse.jst.j2ee.internal.modulecore.util.EnterpriseArtifactEdit#createModelRoot(java.lang.Integer)
- */
- @Override
- public EObject createModelRoot(int version) {
- if (isBinary()) {
- throwAttemptedBinaryEditModelAccess();
- }
- ConnectorResource res = (ConnectorResource) getDeploymentDescriptorResource();
- res.setModuleVersionID(version);
- addConnectorIfNecessary(res);
- return ((ConnectorResource) getDeploymentDescriptorResource()).getRootObject();
- }
-
- public ArtifactEdit createArtifactEditForRead(IVirtualComponent aComponent) {
- return getConnectorArtifactEditForRead(aComponent);
- }
-
- public ArtifactEdit createArtifactEditForWrite(IVirtualComponent aComponent) {
- return getConnectorArtifactEditForWrite(aComponent);
- }
-
- @Override
- public Archive asArchive(boolean includeSource, boolean includeClasspathComponents) throws OpenFailureException {
- if (isBinary()) {
- JavaEEBinaryComponentHelper helper = (JavaEEBinaryComponentHelper)getBinaryComponentHelper();
- return helper.accessLegacyArchive();
- }
- ConnectorComponentLoadStrategyImpl loader = new ConnectorComponentLoadStrategyImpl(getComponent(), includeClasspathComponents);
- loader.setExportSource(includeSource);
- String uri = ModuleURIUtil.getHandleString(getComponent());
- return CommonarchiveFactory.eINSTANCE.openRARFile(loader, uri);
- }
-
- public static void createDeploymentDescriptor(IProject project, int version) {
- ConnectorArtifactEdit jcaEdit = new ConnectorArtifactEdit(project, false, true);
- try {
- jcaEdit.createModelRoot(version);
- jcaEdit.save(null);
- } finally {
- jcaEdit.dispose();
- }
- }
- @Override
- public IModelProvider create(IProject project) {
- return getConnectorArtifactEditForRead(project);
- }
-
- @Override
- public IModelProvider create(IVirtualComponent component) {
- return getConnectorArtifactEditForRead(component);
- }
- @Override
- public void modify(Runnable runnable, IPath modelPath) {
- setWritableEdit(getConnectorArtifactEditForWrite(getProject()));
- try{
- runnable.run();
- if( getWritableEdit() != null ){
- // Always save regardless of resource path passed - Artifactedits save resources as a unit
- getWritableEdit().saveIfNecessary( new NullProgressMonitor() );
- }
-
- } finally { //Properly dispose the write artifact edit
- getWritableEdit().dispose();
- setWritableEdit(null);
- }
- }
-
- @Override
- protected String getContentTypeDescriber() {
- return CONNECTOR_CONTENT_TYPE;
- }
- @Override
- protected URI getRootURI() {
- return J2EEConstants.RAR_DD_URI_OBJ;
- }
-}
diff --git a/plugins/org.eclipse.jst.j2ee.jca/rarproject/org/eclipse/jst/j2ee/jca/modulecore/util/package.xml b/plugins/org.eclipse.jst.j2ee.jca/rarproject/org/eclipse/jst/j2ee/jca/modulecore/util/package.xml
deleted file mode 100644
index b428bb6..0000000
--- a/plugins/org.eclipse.jst.j2ee.jca/rarproject/org/eclipse/jst/j2ee/jca/modulecore/util/package.xml
+++ /dev/null
@@ -1,19 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<html>
- <head>
- <meta
- name="root"
- content="../../../../../../../" />
- <title>WebArtifactEdit api overview</title>
- </head>
-
- <body>
- <abstract>
- This package includes the ConnectorArtifactEdit api. This api is used to work with the emf model
- of a flexible connector module. It contains api to read and serialize out the emf model for connector modules.
- </abstract>
-
- <a href="#top">top</a>
- </body>
-</html>
-
\ No newline at end of file
diff --git a/plugins/org.eclipse.jst.j2ee.navigator.ui/.cdtproject b/plugins/org.eclipse.jst.j2ee.navigator.ui/.cdtproject
deleted file mode 100644
index 8e388b2..0000000
--- a/plugins/org.eclipse.jst.j2ee.navigator.ui/.cdtproject
+++ /dev/null
@@ -1,10 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<?eclipse-cdt version="2.0"?>
-
-<cdtproject>
-<data>
-<item id="cdt_indexer">
-<indexEnabled indexValue="true"/>
-</item>
-</data>
-</cdtproject>
diff --git a/plugins/org.eclipse.jst.j2ee.navigator.ui/.classpath b/plugins/org.eclipse.jst.j2ee.navigator.ui/.classpath
deleted file mode 100644
index 025428e..0000000
--- a/plugins/org.eclipse.jst.j2ee.navigator.ui/.classpath
+++ /dev/null
@@ -1,7 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<classpath>
- <classpathentry kind="src" path="j2ee-navigator/"/>
- <classpathentry kind="con" path="org.eclipse.jdt.launching.JRE_CONTAINER/org.eclipse.jdt.internal.debug.ui.launcher.StandardVMType/J2SE-1.5"/>
- <classpathentry kind="con" path="org.eclipse.pde.core.requiredPlugins"/>
- <classpathentry kind="output" path="bin"/>
-</classpath>
diff --git a/plugins/org.eclipse.jst.j2ee.navigator.ui/.cvsignore b/plugins/org.eclipse.jst.j2ee.navigator.ui/.cvsignore
deleted file mode 100644
index e8246ca..0000000
--- a/plugins/org.eclipse.jst.j2ee.navigator.ui/.cvsignore
+++ /dev/null
@@ -1,7 +0,0 @@
-bin
-temp.folder
-build.xml
-j2ee-navigator.jar
-@dot
-src.zip
-javaCompiler...args
diff --git a/plugins/org.eclipse.jst.j2ee.navigator.ui/.project b/plugins/org.eclipse.jst.j2ee.navigator.ui/.project
deleted file mode 100644
index d856d10..0000000
--- a/plugins/org.eclipse.jst.j2ee.navigator.ui/.project
+++ /dev/null
@@ -1,29 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<projectDescription>
- <name>org.eclipse.jst.j2ee.navigator.ui</name>
- <comment></comment>
- <projects>
- </projects>
- <buildSpec>
- <buildCommand>
- <name>org.eclipse.jdt.core.javabuilder</name>
- <arguments>
- </arguments>
- </buildCommand>
- <buildCommand>
- <name>org.eclipse.pde.ManifestBuilder</name>
- <arguments>
- </arguments>
- </buildCommand>
- <buildCommand>
- <name>org.eclipse.pde.SchemaBuilder</name>
- <arguments>
- </arguments>
- </buildCommand>
- </buildSpec>
- <natures>
- <nature>org.eclipse.pde.PluginNature</nature>
- <nature>org.eclipse.jdt.core.javanature</nature>
- <nature>com.ibm.etools.ctc.javaprojectnature</nature>
- </natures>
-</projectDescription>
diff --git a/plugins/org.eclipse.jst.j2ee.navigator.ui/.settings/org.eclipse.jdt.core.prefs b/plugins/org.eclipse.jst.j2ee.navigator.ui/.settings/org.eclipse.jdt.core.prefs
deleted file mode 100644
index a8c3583..0000000
--- a/plugins/org.eclipse.jst.j2ee.navigator.ui/.settings/org.eclipse.jdt.core.prefs
+++ /dev/null
@@ -1,94 +0,0 @@
-#Mon Jun 08 16:18:46 EDT 2009
-org.eclipse.jdt.core.compiler.problem.unusedParameterWhenImplementingAbstract=disabled
-org.eclipse.jdt.core.compiler.problem.comparingIdentical=error
-org.eclipse.jdt.core.compiler.problem.unnecessaryElse=error
-org.eclipse.jdt.core.compiler.problem.redundantSuperinterface=error
-org.eclipse.jdt.core.compiler.problem.unusedLocal=error
-org.eclipse.jdt.core.compiler.problem.emptyStatement=error
-org.eclipse.jdt.core.compiler.problem.unusedLabel=error
-org.eclipse.jdt.core.compiler.problem.unusedParameter=warning
-org.eclipse.jdt.core.compiler.problem.rawTypeReference=warning
-org.eclipse.jdt.core.incompatibleJDKLevel=ignore
-org.eclipse.jdt.core.compiler.problem.incompatibleNonInheritedInterfaceMethod=error
-org.eclipse.jdt.core.compiler.debug.lineNumber=generate
-org.eclipse.jdt.core.compiler.problem.unusedDeclaredThrownException=warning
-org.eclipse.jdt.core.builder.cleanOutputFolder=clean
-org.eclipse.jdt.core.compiler.problem.unusedWarningToken=warning
-org.eclipse.jdt.core.compiler.problem.noImplicitStringConversion=error
-org.eclipse.jdt.core.compiler.problem.deprecationInDeprecatedCode=enabled
-org.eclipse.jdt.core.compiler.problem.deprecation=warning
-org.eclipse.jdt.core.compiler.problem.unusedParameterWhenOverridingConcrete=disabled
-org.eclipse.jdt.core.compiler.problem.missingSynchronizedOnInheritedMethod=error
-org.eclipse.jdt.core.compiler.problem.deprecationWhenOverridingDeprecatedMethod=enabled
-org.eclipse.jdt.core.compiler.problem.redundantNullCheck=error
-org.eclipse.jdt.core.compiler.problem.unusedImport=error
-org.eclipse.jdt.core.builder.recreateModifiedClassFileInOutputFolder=ignore
-org.eclipse.jdt.core.builder.resourceCopyExclusionFilter=*.launch
-org.eclipse.jdt.core.classpath.multipleOutputLocations=enabled
-org.eclipse.jdt.core.compiler.problem.suppressWarnings=enabled
-org.eclipse.jdt.core.compiler.problem.typeParameterHiding=error
-org.eclipse.jdt.core.builder.invalidClasspath=abort
-org.eclipse.jdt.core.compiler.problem.localVariableHiding=warning
-org.eclipse.jdt.core.compiler.problem.possibleAccidentalBooleanAssignment=error
-org.eclipse.jdt.core.compiler.problem.missingHashCodeMethod=error
-org.eclipse.jdt.core.codeComplete.argumentSuffixes=
-org.eclipse.jdt.core.codeComplete.argumentPrefixes=
-org.eclipse.jdt.core.compiler.problem.indirectStaticAccess=ignore
-org.eclipse.jdt.core.compiler.problem.potentialNullReference=error
-org.eclipse.jdt.core.compiler.codegen.inlineJsrBytecode=enabled
-org.eclipse.jdt.core.compiler.problem.finalParameterBound=warning
-org.eclipse.jdt.core.compiler.problem.missingSerialVersion=error
-org.eclipse.jdt.core.compiler.problem.nullReference=error
-org.eclipse.jdt.core.compiler.source=1.5
-org.eclipse.jdt.core.compiler.problem.enumIdentifier=error
-org.eclipse.jdt.core.compiler.problem.syntheticAccessEmulation=ignore
-org.eclipse.jdt.core.builder.duplicateResourceTask=warning
-org.eclipse.jdt.core.compiler.problem.fieldHiding=error
-org.eclipse.jdt.core.compiler.problem.unusedDeclaredThrownExceptionExemptExceptionAndThrowable=enabled
-org.eclipse.jdt.core.compiler.problem.missingOverrideAnnotation=error
-org.eclipse.jdt.core.compiler.problem.hiddenCatchBlock=error
-org.eclipse.jdt.core.compiler.problem.overridingPackageDefaultMethod=error
-org.eclipse.jdt.core.compiler.problem.finallyBlockNotCompletingNormally=error
-org.eclipse.jdt.core.compiler.problem.undocumentedEmptyBlock=warning
-org.eclipse.jdt.core.classpath.exclusionPatterns=enabled
-org.eclipse.jdt.core.compiler.problem.methodWithConstructorName=error
-org.eclipse.jdt.core.compiler.problem.discouragedReference=warning
-org.eclipse.jdt.core.compiler.problem.unqualifiedFieldAccess=ignore
-org.eclipse.jdt.core.compiler.problem.incompleteEnumSwitch=error
-eclipse.preferences.version=1
-org.eclipse.jdt.core.incompleteClasspath=error
-org.eclipse.jdt.core.compiler.problem.unnecessaryTypeCheck=error
-org.eclipse.jdt.core.compiler.problem.deadCode=error
-org.eclipse.jdt.core.compiler.problem.specialParameterHidingField=enabled
-org.eclipse.jdt.core.compiler.problem.fatalOptionalError=enabled
-org.eclipse.jdt.core.compiler.problem.noEffectAssignment=error
-org.eclipse.jdt.core.compiler.debug.sourceFile=generate
-org.eclipse.jdt.core.compiler.problem.unusedDeclaredThrownExceptionIncludeUncheckedExceptions=disabled
-org.eclipse.jdt.core.compiler.problem.missingDeprecatedAnnotation=warning
-org.eclipse.jdt.core.codeComplete.fieldPrefixes=
-org.eclipse.jdt.core.compiler.problem.fallthroughCase=error
-org.eclipse.jdt.core.compiler.codegen.targetPlatform=1.5
-org.eclipse.jdt.core.compiler.problem.unusedPrivateMember=error
-org.eclipse.jdt.core.compiler.problem.autoboxing=warning
-org.eclipse.jdt.core.circularClasspath=error
-org.eclipse.jdt.core.compiler.problem.annotationSuperInterface=warning
-org.eclipse.jdt.core.compiler.problem.nonExternalizedStringLiteral=error
-org.eclipse.jdt.core.codeComplete.fieldSuffixes=
-org.eclipse.jdt.core.codeComplete.localSuffixes=
-org.eclipse.jdt.core.compiler.problem.parameterAssignment=error
-org.eclipse.jdt.core.compiler.problem.staticAccessReceiver=error
-org.eclipse.jdt.core.codeComplete.localPrefixes=
-org.eclipse.jdt.core.compiler.problem.unusedDeclaredThrownExceptionIncludeDocCommentReference=enabled
-org.eclipse.jdt.core.compiler.maxProblemPerUnit=100
-org.eclipse.jdt.core.compiler.problem.varargsArgumentNeedCast=error
-org.eclipse.jdt.core.compiler.problem.assertIdentifier=error
-org.eclipse.jdt.core.compiler.compliance=1.5
-org.eclipse.jdt.core.compiler.problem.unusedParameterIncludeDocCommentReference=enabled
-org.eclipse.jdt.core.codeComplete.staticFieldPrefixes=
-org.eclipse.jdt.core.compiler.debug.localVariable=generate
-org.eclipse.jdt.core.compiler.problem.unhandledWarningToken=warning
-org.eclipse.jdt.core.compiler.problem.forbiddenReference=error
-org.eclipse.jdt.core.compiler.codegen.unusedLocal=preserve
-org.eclipse.jdt.core.compiler.problem.uncheckedTypeOperation=warning
-org.eclipse.jdt.core.compiler.problem.unusedDeclaredThrownExceptionWhenOverriding=disabled
-org.eclipse.jdt.core.codeComplete.staticFieldSuffixes=
diff --git a/plugins/org.eclipse.jst.j2ee.navigator.ui/META-INF/MANIFEST.MF b/plugins/org.eclipse.jst.j2ee.navigator.ui/META-INF/MANIFEST.MF
deleted file mode 100644
index 266a8b2..0000000
--- a/plugins/org.eclipse.jst.j2ee.navigator.ui/META-INF/MANIFEST.MF
+++ /dev/null
@@ -1,42 +0,0 @@
-Manifest-Version: 1.0
-Bundle-ManifestVersion: 2
-Bundle-Name: %Plugin.name
-Bundle-SymbolicName: org.eclipse.jst.j2ee.navigator.ui; singleton:=true
-Bundle-Version: 1.1.403.qualifier
-Bundle-Activator: org.eclipse.jst.j2ee.navigator.internal.plugin.J2EENavigatorPlugin
-Bundle-Vendor: %Plugin.providerName
-Bundle-Localization: plugin
-Export-Package: org.eclipse.jst.j2ee.navigator.internal;x-internal:=true,
- org.eclipse.jst.j2ee.navigator.internal.dnd;x-internal:=true,
- org.eclipse.jst.j2ee.navigator.internal.plugin;x-internal:=true
-Require-Bundle: org.eclipse.ui;bundle-version="[3.2.0,4.0.0)",
- org.eclipse.core.resources;bundle-version="[3.2.0,4.0.0)",
- org.eclipse.core.runtime;bundle-version="[3.2.0,4.0.0)",
- org.eclipse.jst.j2ee.core;bundle-version="[1.1.0,2.0.0)",
- org.eclipse.jst.j2ee.ui;bundle-version="[1.1.0,1.2.0)",
- org.eclipse.emf.edit;bundle-version="[2.2.0,3.0.0)",
- org.eclipse.emf.edit.ui;bundle-version="[2.2.0,3.0.0)",
- org.eclipse.wst.common.emfworkbench.integration;bundle-version="[1.2.0,2.0.0)",
- org.eclipse.wst.common.frameworks;bundle-version="[1.2.0,2.0.0)",
- org.eclipse.jdt.ui;bundle-version="[3.2.0,4.0.0)",
- org.eclipse.jst.j2ee;bundle-version="[1.1.0,1.2.0)",
- org.eclipse.jface.text;bundle-version="[3.2.0,4.0.0)",
- org.eclipse.wst.common.frameworks.ui;bundle-version="[1.2.0,2.0.0)",
- org.eclipse.ui.ide;bundle-version="[3.2.0,4.0.0)",
- org.eclipse.jdt.core;bundle-version="[3.2.0,4.0.0)",
- org.eclipse.jst.j2ee.jca.ui;bundle-version="[1.1.0,1.2.0)",
- org.eclipse.wst.common.modulecore;bundle-version="[1.2.0,2.0.0)",
- org.eclipse.jem.util;bundle-version="[2.0.0,3.0.0)",
- org.eclipse.jst.common.frameworks;bundle-version="[1.1.0,1.2.0)",
- org.eclipse.wst.common.project.facet.core;bundle-version="[1.3.0,2.0.0)",
- org.eclipse.ui.navigator;bundle-version="[3.2.0,4.0.0)",
- org.eclipse.ui.navigator.resources;bundle-version="[3.2.0,4.0.0)",
- org.eclipse.wst.common.emf;bundle-version="[1.2.0,2.0.0)",
- org.eclipse.jst.common.project.facet.core;bundle-version="[1.3.0,2.0.0)",
- org.eclipse.jst.j2ee.web;bundle-version="[1.1.0,1.2.0)",
- org.eclipse.jst.j2ee.jca;bundle-version="[1.1.0,1.2.0)",
- org.eclipse.jst.j2ee.ejb;bundle-version="[1.1.0,1.2.0)",
- org.eclipse.core.expressions;bundle-version="[3.2.0,4.0.0)",
- org.eclipse.wst.common.ui;bundle-version="[1.1.500,1.2.0)"
-Eclipse-LazyStart: true; exceptions="org.eclipse.jst.j2ee.navigator.internal"
-Bundle-RequiredExecutionEnvironment: J2SE-1.5
diff --git a/plugins/org.eclipse.jst.j2ee.navigator.ui/about.html b/plugins/org.eclipse.jst.j2ee.navigator.ui/about.html
deleted file mode 100644
index 2199df3..0000000
--- a/plugins/org.eclipse.jst.j2ee.navigator.ui/about.html
+++ /dev/null
@@ -1,34 +0,0 @@
-<!DOCTYPE HTML PUBLIC "-//W3C//DTD HTML 4.0//EN">
-<HTML>
-
-<head>
-<title>About</title>
-<meta http-equiv=Content-Type content="text/html; charset=ISO-8859-1">
-</head>
-
-<BODY lang="EN-US">
-
-<H3>About This Content</H3>
-
-<P>June, 2008</P>
-
-<H3>License</H3>
-
-<P>The Eclipse Foundation makes available all content in this plug-in
-("Content"). Unless otherwise indicated below, the Content is provided to you
-under the terms and conditions of the Eclipse Public License Version 1.0
-("EPL"). A copy of the EPL is available at
-<A href="http://www.eclipse.org/org/documents/epl-v10.php">http://www.eclipse.org/org/documents/epl-v10.php</A>.
-For purposes of the EPL, "Program" will mean the Content.</P>
-
-<P>If you did not receive this Content directly from the Eclipse Foundation, the
-Content is being redistributed by another party ("Redistributor") and different
-terms and conditions may apply to your use of any object code in the Content.
-Check the Redistributors license that was provided with the Content. If no such
-license exists, contact the Redistributor. Unless otherwise indicated below, the
-terms and conditions of the EPL still apply to any source code in the Content
-and such source code may be obtained at
-<A href="http://www.eclipse.org/">http://www.eclipse.org/</A>.</P>
-
-</BODY>
-</HTML>
diff --git a/plugins/org.eclipse.jst.j2ee.navigator.ui/build.properties b/plugins/org.eclipse.jst.j2ee.navigator.ui/build.properties
deleted file mode 100644
index 7d56e5b..0000000
--- a/plugins/org.eclipse.jst.j2ee.navigator.ui/build.properties
+++ /dev/null
@@ -1,18 +0,0 @@
-###############################################################################
-# Copyright (c) 2003, 2007 IBM Corporation and others.
-# All rights reserved. This program and the accompanying materials
-# are made available under the terms of the Eclipse Public License v1.0
-# which accompanies this distribution, and is available at
-# http://www.eclipse.org/legal/epl-v10.html
-#
-# Contributors:
-# IBM Corporation - initial API and implementation
-###############################################################################
-bin.includes = plugin.xml,\
- *.jar,\
- .,\
- icons/,\
- plugin.properties,\
- META-INF/,\
- about.html
-source.. = j2ee-navigator/
diff --git a/plugins/org.eclipse.jst.j2ee.navigator.ui/icons/J2EEPerspective.gif b/plugins/org.eclipse.jst.j2ee.navigator.ui/icons/J2EEPerspective.gif
deleted file mode 100644
index c456568..0000000
--- a/plugins/org.eclipse.jst.j2ee.navigator.ui/icons/J2EEPerspective.gif
+++ /dev/null
Binary files differ
diff --git a/plugins/org.eclipse.jst.j2ee.navigator.ui/icons/appclientgroup_obj.gif b/plugins/org.eclipse.jst.j2ee.navigator.ui/icons/appclientgroup_obj.gif
deleted file mode 100644
index 2768428..0000000
--- a/plugins/org.eclipse.jst.j2ee.navigator.ui/icons/appclientgroup_obj.gif
+++ /dev/null
Binary files differ
diff --git a/plugins/org.eclipse.jst.j2ee.navigator.ui/icons/connectorgroup_obj.gif b/plugins/org.eclipse.jst.j2ee.navigator.ui/icons/connectorgroup_obj.gif
deleted file mode 100644
index ad3af3c..0000000
--- a/plugins/org.eclipse.jst.j2ee.navigator.ui/icons/connectorgroup_obj.gif
+++ /dev/null
Binary files differ
diff --git a/plugins/org.eclipse.jst.j2ee.navigator.ui/icons/eargroup_obj.gif b/plugins/org.eclipse.jst.j2ee.navigator.ui/icons/eargroup_obj.gif
deleted file mode 100644
index 2eeb3ef..0000000
--- a/plugins/org.eclipse.jst.j2ee.navigator.ui/icons/eargroup_obj.gif
+++ /dev/null
Binary files differ
diff --git a/plugins/org.eclipse.jst.j2ee.navigator.ui/icons/ejbgroup_obj.gif b/plugins/org.eclipse.jst.j2ee.navigator.ui/icons/ejbgroup_obj.gif
deleted file mode 100644
index b0adb3e..0000000
--- a/plugins/org.eclipse.jst.j2ee.navigator.ui/icons/ejbgroup_obj.gif
+++ /dev/null
Binary files differ
diff --git a/plugins/org.eclipse.jst.j2ee.navigator.ui/icons/folder.gif b/plugins/org.eclipse.jst.j2ee.navigator.ui/icons/folder.gif
deleted file mode 100644
index c91b267..0000000
--- a/plugins/org.eclipse.jst.j2ee.navigator.ui/icons/folder.gif
+++ /dev/null
Binary files differ
diff --git a/plugins/org.eclipse.jst.j2ee.navigator.ui/icons/full/ctool16/appclient_export.gif b/plugins/org.eclipse.jst.j2ee.navigator.ui/icons/full/ctool16/appclient_export.gif
deleted file mode 100644
index 6f83300..0000000
--- a/plugins/org.eclipse.jst.j2ee.navigator.ui/icons/full/ctool16/appclient_export.gif
+++ /dev/null
Binary files differ
diff --git a/plugins/org.eclipse.jst.j2ee.navigator.ui/icons/full/ctool16/appclient_import_wiz.gif b/plugins/org.eclipse.jst.j2ee.navigator.ui/icons/full/ctool16/appclient_import_wiz.gif
deleted file mode 100644
index ce667f4..0000000
--- a/plugins/org.eclipse.jst.j2ee.navigator.ui/icons/full/ctool16/appclient_import_wiz.gif
+++ /dev/null
Binary files differ
diff --git a/plugins/org.eclipse.jst.j2ee.navigator.ui/icons/full/ctool16/export_ear.gif b/plugins/org.eclipse.jst.j2ee.navigator.ui/icons/full/ctool16/export_ear.gif
deleted file mode 100644
index 2270b17..0000000
--- a/plugins/org.eclipse.jst.j2ee.navigator.ui/icons/full/ctool16/export_ear.gif
+++ /dev/null
Binary files differ
diff --git a/plugins/org.eclipse.jst.j2ee.navigator.ui/icons/full/ctool16/export_ejbjar_wiz.gif b/plugins/org.eclipse.jst.j2ee.navigator.ui/icons/full/ctool16/export_ejbjar_wiz.gif
deleted file mode 100644
index 72cd417..0000000
--- a/plugins/org.eclipse.jst.j2ee.navigator.ui/icons/full/ctool16/export_ejbjar_wiz.gif
+++ /dev/null
Binary files differ
diff --git a/plugins/org.eclipse.jst.j2ee.navigator.ui/icons/full/ctool16/export_rar.gif b/plugins/org.eclipse.jst.j2ee.navigator.ui/icons/full/ctool16/export_rar.gif
deleted file mode 100644
index befb3d4..0000000
--- a/plugins/org.eclipse.jst.j2ee.navigator.ui/icons/full/ctool16/export_rar.gif
+++ /dev/null
Binary files differ
diff --git a/plugins/org.eclipse.jst.j2ee.navigator.ui/icons/full/ctool16/exportwar_wiz.gif b/plugins/org.eclipse.jst.j2ee.navigator.ui/icons/full/ctool16/exportwar_wiz.gif
deleted file mode 100644
index ced859d..0000000
--- a/plugins/org.eclipse.jst.j2ee.navigator.ui/icons/full/ctool16/exportwar_wiz.gif
+++ /dev/null
Binary files differ
diff --git a/plugins/org.eclipse.jst.j2ee.navigator.ui/icons/full/ctool16/import_ear.gif b/plugins/org.eclipse.jst.j2ee.navigator.ui/icons/full/ctool16/import_ear.gif
deleted file mode 100644
index 099201b..0000000
--- a/plugins/org.eclipse.jst.j2ee.navigator.ui/icons/full/ctool16/import_ear.gif
+++ /dev/null
Binary files differ
diff --git a/plugins/org.eclipse.jst.j2ee.navigator.ui/icons/full/ctool16/import_ejbjar.gif b/plugins/org.eclipse.jst.j2ee.navigator.ui/icons/full/ctool16/import_ejbjar.gif
deleted file mode 100644
index 5644b48..0000000
--- a/plugins/org.eclipse.jst.j2ee.navigator.ui/icons/full/ctool16/import_ejbjar.gif
+++ /dev/null
Binary files differ
diff --git a/plugins/org.eclipse.jst.j2ee.navigator.ui/icons/full/ctool16/import_rar.gif b/plugins/org.eclipse.jst.j2ee.navigator.ui/icons/full/ctool16/import_rar.gif
deleted file mode 100644
index 50f25a2..0000000
--- a/plugins/org.eclipse.jst.j2ee.navigator.ui/icons/full/ctool16/import_rar.gif
+++ /dev/null
Binary files differ
diff --git a/plugins/org.eclipse.jst.j2ee.navigator.ui/icons/full/ctool16/importwar_wiz.gif b/plugins/org.eclipse.jst.j2ee.navigator.ui/icons/full/ctool16/importwar_wiz.gif
deleted file mode 100644
index 432c066..0000000
--- a/plugins/org.eclipse.jst.j2ee.navigator.ui/icons/full/ctool16/importwar_wiz.gif
+++ /dev/null
Binary files differ
diff --git a/plugins/org.eclipse.jst.j2ee.navigator.ui/icons/full/ctool16/newappclient_wiz.gif b/plugins/org.eclipse.jst.j2ee.navigator.ui/icons/full/ctool16/newappclient_wiz.gif
deleted file mode 100644
index 0ce86a1..0000000
--- a/plugins/org.eclipse.jst.j2ee.navigator.ui/icons/full/ctool16/newappclient_wiz.gif
+++ /dev/null
Binary files differ
diff --git a/plugins/org.eclipse.jst.j2ee.navigator.ui/icons/full/ctool16/newconnectionprj_wiz.gif b/plugins/org.eclipse.jst.j2ee.navigator.ui/icons/full/ctool16/newconnectionprj_wiz.gif
deleted file mode 100644
index 1bec6ba..0000000
--- a/plugins/org.eclipse.jst.j2ee.navigator.ui/icons/full/ctool16/newconnectionprj_wiz.gif
+++ /dev/null
Binary files differ
diff --git a/plugins/org.eclipse.jst.j2ee.navigator.ui/icons/full/ctool16/newear_wiz.gif b/plugins/org.eclipse.jst.j2ee.navigator.ui/icons/full/ctool16/newear_wiz.gif
deleted file mode 100644
index 8b409b5..0000000
--- a/plugins/org.eclipse.jst.j2ee.navigator.ui/icons/full/ctool16/newear_wiz.gif
+++ /dev/null
Binary files differ
diff --git a/plugins/org.eclipse.jst.j2ee.navigator.ui/icons/full/ctool16/newejbprj_wiz.gif b/plugins/org.eclipse.jst.j2ee.navigator.ui/icons/full/ctool16/newejbprj_wiz.gif
deleted file mode 100644
index ecda22b..0000000
--- a/plugins/org.eclipse.jst.j2ee.navigator.ui/icons/full/ctool16/newejbprj_wiz.gif
+++ /dev/null
Binary files differ
diff --git a/plugins/org.eclipse.jst.j2ee.navigator.ui/icons/full/ctool16/newwar_wiz.gif b/plugins/org.eclipse.jst.j2ee.navigator.ui/icons/full/ctool16/newwar_wiz.gif
deleted file mode 100644
index b9ac6be..0000000
--- a/plugins/org.eclipse.jst.j2ee.navigator.ui/icons/full/ctool16/newwar_wiz.gif
+++ /dev/null
Binary files differ
diff --git a/plugins/org.eclipse.jst.j2ee.navigator.ui/icons/full/cview16/j2ee_view.gif b/plugins/org.eclipse.jst.j2ee.navigator.ui/icons/full/cview16/j2ee_view.gif
deleted file mode 100644
index 20acd4c..0000000
--- a/plugins/org.eclipse.jst.j2ee.navigator.ui/icons/full/cview16/j2ee_view.gif
+++ /dev/null
Binary files differ
diff --git a/plugins/org.eclipse.jst.j2ee.navigator.ui/icons/full/etool16/loading1.gif b/plugins/org.eclipse.jst.j2ee.navigator.ui/icons/full/etool16/loading1.gif
deleted file mode 100644
index eae118a..0000000
--- a/plugins/org.eclipse.jst.j2ee.navigator.ui/icons/full/etool16/loading1.gif
+++ /dev/null
Binary files differ
diff --git a/plugins/org.eclipse.jst.j2ee.navigator.ui/icons/full/etool16/loading2.gif b/plugins/org.eclipse.jst.j2ee.navigator.ui/icons/full/etool16/loading2.gif
deleted file mode 100644
index c37f13d..0000000
--- a/plugins/org.eclipse.jst.j2ee.navigator.ui/icons/full/etool16/loading2.gif
+++ /dev/null
Binary files differ
diff --git a/plugins/org.eclipse.jst.j2ee.navigator.ui/icons/full/etool16/loading3.gif b/plugins/org.eclipse.jst.j2ee.navigator.ui/icons/full/etool16/loading3.gif
deleted file mode 100644
index 10a87c2..0000000
--- a/plugins/org.eclipse.jst.j2ee.navigator.ui/icons/full/etool16/loading3.gif
+++ /dev/null
Binary files differ
diff --git a/plugins/org.eclipse.jst.j2ee.navigator.ui/icons/full/etool16/loading4.gif b/plugins/org.eclipse.jst.j2ee.navigator.ui/icons/full/etool16/loading4.gif
deleted file mode 100644
index 7c6cfa8..0000000
--- a/plugins/org.eclipse.jst.j2ee.navigator.ui/icons/full/etool16/loading4.gif
+++ /dev/null
Binary files differ
diff --git a/plugins/org.eclipse.jst.j2ee.navigator.ui/icons/full/obj16/webapp_deploy.gif b/plugins/org.eclipse.jst.j2ee.navigator.ui/icons/full/obj16/webapp_deploy.gif
deleted file mode 100644
index 80531e3..0000000
--- a/plugins/org.eclipse.jst.j2ee.navigator.ui/icons/full/obj16/webapp_deploy.gif
+++ /dev/null
Binary files differ
diff --git a/plugins/org.eclipse.jst.j2ee.navigator.ui/icons/full/ovr16/client_app_ovr.gif b/plugins/org.eclipse.jst.j2ee.navigator.ui/icons/full/ovr16/client_app_ovr.gif
deleted file mode 100644
index 3ff1ca5..0000000
--- a/plugins/org.eclipse.jst.j2ee.navigator.ui/icons/full/ovr16/client_app_ovr.gif
+++ /dev/null
Binary files differ
diff --git a/plugins/org.eclipse.jst.j2ee.navigator.ui/icons/full/ovr16/connector_ovr.gif b/plugins/org.eclipse.jst.j2ee.navigator.ui/icons/full/ovr16/connector_ovr.gif
deleted file mode 100644
index b7e77bc..0000000
--- a/plugins/org.eclipse.jst.j2ee.navigator.ui/icons/full/ovr16/connector_ovr.gif
+++ /dev/null
Binary files differ
diff --git a/plugins/org.eclipse.jst.j2ee.navigator.ui/icons/full/ovr16/ejb_module_ovr.gif b/plugins/org.eclipse.jst.j2ee.navigator.ui/icons/full/ovr16/ejb_module_ovr.gif
deleted file mode 100644
index cf50d6d..0000000
--- a/plugins/org.eclipse.jst.j2ee.navigator.ui/icons/full/ovr16/ejb_module_ovr.gif
+++ /dev/null
Binary files differ
diff --git a/plugins/org.eclipse.jst.j2ee.navigator.ui/icons/full/ovr16/enterprise_app_ovr.gif b/plugins/org.eclipse.jst.j2ee.navigator.ui/icons/full/ovr16/enterprise_app_ovr.gif
deleted file mode 100644
index ec19c47..0000000
--- a/plugins/org.eclipse.jst.j2ee.navigator.ui/icons/full/ovr16/enterprise_app_ovr.gif
+++ /dev/null
Binary files differ
diff --git a/plugins/org.eclipse.jst.j2ee.navigator.ui/icons/full/ovr16/web_module_ovr.gif b/plugins/org.eclipse.jst.j2ee.navigator.ui/icons/full/ovr16/web_module_ovr.gif
deleted file mode 100644
index c1e9617..0000000
--- a/plugins/org.eclipse.jst.j2ee.navigator.ui/icons/full/ovr16/web_module_ovr.gif
+++ /dev/null
Binary files differ
diff --git a/plugins/org.eclipse.jst.j2ee.navigator.ui/icons/full/ovr16/webfragmentoverlayicon.gif b/plugins/org.eclipse.jst.j2ee.navigator.ui/icons/full/ovr16/webfragmentoverlayicon.gif
deleted file mode 100644
index e262c9a..0000000
--- a/plugins/org.eclipse.jst.j2ee.navigator.ui/icons/full/ovr16/webfragmentoverlayicon.gif
+++ /dev/null
Binary files differ
diff --git a/plugins/org.eclipse.jst.j2ee.navigator.ui/icons/full/wizban/appclient_wiz.gif b/plugins/org.eclipse.jst.j2ee.navigator.ui/icons/full/wizban/appclient_wiz.gif
deleted file mode 100644
index 56d7fa7..0000000
--- a/plugins/org.eclipse.jst.j2ee.navigator.ui/icons/full/wizban/appclient_wiz.gif
+++ /dev/null
Binary files differ
diff --git a/plugins/org.eclipse.jst.j2ee.navigator.ui/icons/full/wizban/appclient_wiz.png b/plugins/org.eclipse.jst.j2ee.navigator.ui/icons/full/wizban/appclient_wiz.png
deleted file mode 100644
index 81b82df..0000000
--- a/plugins/org.eclipse.jst.j2ee.navigator.ui/icons/full/wizban/appclient_wiz.png
+++ /dev/null
Binary files differ
diff --git a/plugins/org.eclipse.jst.j2ee.navigator.ui/icons/full/wizban/connector_wiz.gif b/plugins/org.eclipse.jst.j2ee.navigator.ui/icons/full/wizban/connector_wiz.gif
deleted file mode 100644
index 231f8d3..0000000
--- a/plugins/org.eclipse.jst.j2ee.navigator.ui/icons/full/wizban/connector_wiz.gif
+++ /dev/null
Binary files differ
diff --git a/plugins/org.eclipse.jst.j2ee.navigator.ui/icons/full/wizban/connector_wiz.png b/plugins/org.eclipse.jst.j2ee.navigator.ui/icons/full/wizban/connector_wiz.png
deleted file mode 100644
index fd5c26b..0000000
--- a/plugins/org.eclipse.jst.j2ee.navigator.ui/icons/full/wizban/connector_wiz.png
+++ /dev/null
Binary files differ
diff --git a/plugins/org.eclipse.jst.j2ee.navigator.ui/icons/full/wizban/ear_wiz.gif b/plugins/org.eclipse.jst.j2ee.navigator.ui/icons/full/wizban/ear_wiz.gif
deleted file mode 100644
index 625e763..0000000
--- a/plugins/org.eclipse.jst.j2ee.navigator.ui/icons/full/wizban/ear_wiz.gif
+++ /dev/null
Binary files differ
diff --git a/plugins/org.eclipse.jst.j2ee.navigator.ui/icons/full/wizban/ear_wiz.png b/plugins/org.eclipse.jst.j2ee.navigator.ui/icons/full/wizban/ear_wiz.png
deleted file mode 100644
index e3631e5..0000000
--- a/plugins/org.eclipse.jst.j2ee.navigator.ui/icons/full/wizban/ear_wiz.png
+++ /dev/null
Binary files differ
diff --git a/plugins/org.eclipse.jst.j2ee.navigator.ui/icons/full/wizban/ejbproject_wiz.gif b/plugins/org.eclipse.jst.j2ee.navigator.ui/icons/full/wizban/ejbproject_wiz.gif
deleted file mode 100644
index 7f2aa1e..0000000
--- a/plugins/org.eclipse.jst.j2ee.navigator.ui/icons/full/wizban/ejbproject_wiz.gif
+++ /dev/null
Binary files differ
diff --git a/plugins/org.eclipse.jst.j2ee.navigator.ui/icons/full/wizban/ejbproject_wiz.png b/plugins/org.eclipse.jst.j2ee.navigator.ui/icons/full/wizban/ejbproject_wiz.png
deleted file mode 100644
index 581b413..0000000
--- a/plugins/org.eclipse.jst.j2ee.navigator.ui/icons/full/wizban/ejbproject_wiz.png
+++ /dev/null
Binary files differ
diff --git a/plugins/org.eclipse.jst.j2ee.navigator.ui/icons/full/wizban/export_appclient_wiz.gif b/plugins/org.eclipse.jst.j2ee.navigator.ui/icons/full/wizban/export_appclient_wiz.gif
deleted file mode 100644
index 3515396..0000000
--- a/plugins/org.eclipse.jst.j2ee.navigator.ui/icons/full/wizban/export_appclient_wiz.gif
+++ /dev/null
Binary files differ
diff --git a/plugins/org.eclipse.jst.j2ee.navigator.ui/icons/full/wizban/export_appclient_wiz.png b/plugins/org.eclipse.jst.j2ee.navigator.ui/icons/full/wizban/export_appclient_wiz.png
deleted file mode 100644
index 6cbf0b3..0000000
--- a/plugins/org.eclipse.jst.j2ee.navigator.ui/icons/full/wizban/export_appclient_wiz.png
+++ /dev/null
Binary files differ
diff --git a/plugins/org.eclipse.jst.j2ee.navigator.ui/icons/full/wizban/export_ear_wiz.gif b/plugins/org.eclipse.jst.j2ee.navigator.ui/icons/full/wizban/export_ear_wiz.gif
deleted file mode 100644
index a327fa6..0000000
--- a/plugins/org.eclipse.jst.j2ee.navigator.ui/icons/full/wizban/export_ear_wiz.gif
+++ /dev/null
Binary files differ
diff --git a/plugins/org.eclipse.jst.j2ee.navigator.ui/icons/full/wizban/export_ear_wiz.png b/plugins/org.eclipse.jst.j2ee.navigator.ui/icons/full/wizban/export_ear_wiz.png
deleted file mode 100644
index d9fba97..0000000
--- a/plugins/org.eclipse.jst.j2ee.navigator.ui/icons/full/wizban/export_ear_wiz.png
+++ /dev/null
Binary files differ
diff --git a/plugins/org.eclipse.jst.j2ee.navigator.ui/icons/full/wizban/export_ejbjar_obj.gif b/plugins/org.eclipse.jst.j2ee.navigator.ui/icons/full/wizban/export_ejbjar_obj.gif
deleted file mode 100644
index adca79e..0000000
--- a/plugins/org.eclipse.jst.j2ee.navigator.ui/icons/full/wizban/export_ejbjar_obj.gif
+++ /dev/null
Binary files differ
diff --git a/plugins/org.eclipse.jst.j2ee.navigator.ui/icons/full/wizban/export_ejbjar_obj.png b/plugins/org.eclipse.jst.j2ee.navigator.ui/icons/full/wizban/export_ejbjar_obj.png
deleted file mode 100644
index a1e9366..0000000
--- a/plugins/org.eclipse.jst.j2ee.navigator.ui/icons/full/wizban/export_ejbjar_obj.png
+++ /dev/null
Binary files differ
diff --git a/plugins/org.eclipse.jst.j2ee.navigator.ui/icons/full/wizban/export_rar_wiz.gif b/plugins/org.eclipse.jst.j2ee.navigator.ui/icons/full/wizban/export_rar_wiz.gif
deleted file mode 100644
index 6047f1a..0000000
--- a/plugins/org.eclipse.jst.j2ee.navigator.ui/icons/full/wizban/export_rar_wiz.gif
+++ /dev/null
Binary files differ
diff --git a/plugins/org.eclipse.jst.j2ee.navigator.ui/icons/full/wizban/export_rar_wiz.png b/plugins/org.eclipse.jst.j2ee.navigator.ui/icons/full/wizban/export_rar_wiz.png
deleted file mode 100644
index ba746e8..0000000
--- a/plugins/org.eclipse.jst.j2ee.navigator.ui/icons/full/wizban/export_rar_wiz.png
+++ /dev/null
Binary files differ
diff --git a/plugins/org.eclipse.jst.j2ee.navigator.ui/icons/full/wizban/export_war_wiz.gif b/plugins/org.eclipse.jst.j2ee.navigator.ui/icons/full/wizban/export_war_wiz.gif
deleted file mode 100644
index d251242..0000000
--- a/plugins/org.eclipse.jst.j2ee.navigator.ui/icons/full/wizban/export_war_wiz.gif
+++ /dev/null
Binary files differ
diff --git a/plugins/org.eclipse.jst.j2ee.navigator.ui/icons/full/wizban/export_war_wiz.png b/plugins/org.eclipse.jst.j2ee.navigator.ui/icons/full/wizban/export_war_wiz.png
deleted file mode 100644
index de33fa5..0000000
--- a/plugins/org.eclipse.jst.j2ee.navigator.ui/icons/full/wizban/export_war_wiz.png
+++ /dev/null
Binary files differ
diff --git a/plugins/org.eclipse.jst.j2ee.navigator.ui/icons/full/wizban/import_appclient_wiz.gif b/plugins/org.eclipse.jst.j2ee.navigator.ui/icons/full/wizban/import_appclient_wiz.gif
deleted file mode 100644
index 351a31d..0000000
--- a/plugins/org.eclipse.jst.j2ee.navigator.ui/icons/full/wizban/import_appclient_wiz.gif
+++ /dev/null
Binary files differ
diff --git a/plugins/org.eclipse.jst.j2ee.navigator.ui/icons/full/wizban/import_appclient_wiz.png b/plugins/org.eclipse.jst.j2ee.navigator.ui/icons/full/wizban/import_appclient_wiz.png
deleted file mode 100644
index 1925c85..0000000
--- a/plugins/org.eclipse.jst.j2ee.navigator.ui/icons/full/wizban/import_appclient_wiz.png
+++ /dev/null
Binary files differ
diff --git a/plugins/org.eclipse.jst.j2ee.navigator.ui/icons/full/wizban/import_ear_wiz.gif b/plugins/org.eclipse.jst.j2ee.navigator.ui/icons/full/wizban/import_ear_wiz.gif
deleted file mode 100644
index 67754de..0000000
--- a/plugins/org.eclipse.jst.j2ee.navigator.ui/icons/full/wizban/import_ear_wiz.gif
+++ /dev/null
Binary files differ
diff --git a/plugins/org.eclipse.jst.j2ee.navigator.ui/icons/full/wizban/import_ear_wiz.png b/plugins/org.eclipse.jst.j2ee.navigator.ui/icons/full/wizban/import_ear_wiz.png
deleted file mode 100644
index 2ca96c2..0000000
--- a/plugins/org.eclipse.jst.j2ee.navigator.ui/icons/full/wizban/import_ear_wiz.png
+++ /dev/null
Binary files differ
diff --git a/plugins/org.eclipse.jst.j2ee.navigator.ui/icons/full/wizban/import_ejbjar_wiz.gif b/plugins/org.eclipse.jst.j2ee.navigator.ui/icons/full/wizban/import_ejbjar_wiz.gif
deleted file mode 100644
index d123519..0000000
--- a/plugins/org.eclipse.jst.j2ee.navigator.ui/icons/full/wizban/import_ejbjar_wiz.gif
+++ /dev/null
Binary files differ
diff --git a/plugins/org.eclipse.jst.j2ee.navigator.ui/icons/full/wizban/import_ejbjar_wiz.png b/plugins/org.eclipse.jst.j2ee.navigator.ui/icons/full/wizban/import_ejbjar_wiz.png
deleted file mode 100644
index 551ca51..0000000
--- a/plugins/org.eclipse.jst.j2ee.navigator.ui/icons/full/wizban/import_ejbjar_wiz.png
+++ /dev/null
Binary files differ
diff --git a/plugins/org.eclipse.jst.j2ee.navigator.ui/icons/full/wizban/import_rar_wiz.gif b/plugins/org.eclipse.jst.j2ee.navigator.ui/icons/full/wizban/import_rar_wiz.gif
deleted file mode 100644
index ea9dff4..0000000
--- a/plugins/org.eclipse.jst.j2ee.navigator.ui/icons/full/wizban/import_rar_wiz.gif
+++ /dev/null
Binary files differ
diff --git a/plugins/org.eclipse.jst.j2ee.navigator.ui/icons/full/wizban/import_rar_wiz.png b/plugins/org.eclipse.jst.j2ee.navigator.ui/icons/full/wizban/import_rar_wiz.png
deleted file mode 100644
index cde7b25..0000000
--- a/plugins/org.eclipse.jst.j2ee.navigator.ui/icons/full/wizban/import_rar_wiz.png
+++ /dev/null
Binary files differ
diff --git a/plugins/org.eclipse.jst.j2ee.navigator.ui/icons/full/wizban/import_war_wiz.gif b/plugins/org.eclipse.jst.j2ee.navigator.ui/icons/full/wizban/import_war_wiz.gif
deleted file mode 100644
index 514274d..0000000
--- a/plugins/org.eclipse.jst.j2ee.navigator.ui/icons/full/wizban/import_war_wiz.gif
+++ /dev/null
Binary files differ
diff --git a/plugins/org.eclipse.jst.j2ee.navigator.ui/icons/full/wizban/import_war_wiz.png b/plugins/org.eclipse.jst.j2ee.navigator.ui/icons/full/wizban/import_war_wiz.png
deleted file mode 100644
index 2b8bca0..0000000
--- a/plugins/org.eclipse.jst.j2ee.navigator.ui/icons/full/wizban/import_war_wiz.png
+++ /dev/null
Binary files differ
diff --git a/plugins/org.eclipse.jst.j2ee.navigator.ui/icons/full/wizban/war_wiz.gif b/plugins/org.eclipse.jst.j2ee.navigator.ui/icons/full/wizban/war_wiz.gif
deleted file mode 100644
index d964e2e..0000000
--- a/plugins/org.eclipse.jst.j2ee.navigator.ui/icons/full/wizban/war_wiz.gif
+++ /dev/null
Binary files differ
diff --git a/plugins/org.eclipse.jst.j2ee.navigator.ui/icons/full/wizban/war_wiz.png b/plugins/org.eclipse.jst.j2ee.navigator.ui/icons/full/wizban/war_wiz.png
deleted file mode 100644
index 6a82e57..0000000
--- a/plugins/org.eclipse.jst.j2ee.navigator.ui/icons/full/wizban/war_wiz.png
+++ /dev/null
Binary files differ
diff --git a/plugins/org.eclipse.jst.j2ee.navigator.ui/icons/jcu_obj.gif b/plugins/org.eclipse.jst.j2ee.navigator.ui/icons/jcu_obj.gif
deleted file mode 100644
index 36a73ac..0000000
--- a/plugins/org.eclipse.jst.j2ee.navigator.ui/icons/jcu_obj.gif
+++ /dev/null
Binary files differ
diff --git a/plugins/org.eclipse.jst.j2ee.navigator.ui/icons/servlet.gif b/plugins/org.eclipse.jst.j2ee.navigator.ui/icons/servlet.gif
deleted file mode 100644
index fc1bece..0000000
--- a/plugins/org.eclipse.jst.j2ee.navigator.ui/icons/servlet.gif
+++ /dev/null
Binary files differ
diff --git a/plugins/org.eclipse.jst.j2ee.navigator.ui/icons/sessionBean_obj.gif b/plugins/org.eclipse.jst.j2ee.navigator.ui/icons/sessionBean_obj.gif
deleted file mode 100644
index 507b8a8..0000000
--- a/plugins/org.eclipse.jst.j2ee.navigator.ui/icons/sessionBean_obj.gif
+++ /dev/null
Binary files differ
diff --git a/plugins/org.eclipse.jst.j2ee.navigator.ui/icons/srvce_elem_obj.gif b/plugins/org.eclipse.jst.j2ee.navigator.ui/icons/srvce_elem_obj.gif
deleted file mode 100644
index 6fdcb3f..0000000
--- a/plugins/org.eclipse.jst.j2ee.navigator.ui/icons/srvce_elem_obj.gif
+++ /dev/null
Binary files differ
diff --git a/plugins/org.eclipse.jst.j2ee.navigator.ui/icons/webgroup_obj.gif b/plugins/org.eclipse.jst.j2ee.navigator.ui/icons/webgroup_obj.gif
deleted file mode 100644
index 274d361..0000000
--- a/plugins/org.eclipse.jst.j2ee.navigator.ui/icons/webgroup_obj.gif
+++ /dev/null
Binary files differ
diff --git a/plugins/org.eclipse.jst.j2ee.navigator.ui/icons/webservicedesc.gif b/plugins/org.eclipse.jst.j2ee.navigator.ui/icons/webservicedesc.gif
deleted file mode 100644
index 8fb844f..0000000
--- a/plugins/org.eclipse.jst.j2ee.navigator.ui/icons/webservicedesc.gif
+++ /dev/null
Binary files differ
diff --git a/plugins/org.eclipse.jst.j2ee.navigator.ui/icons/wsdl.gif b/plugins/org.eclipse.jst.j2ee.navigator.ui/icons/wsdl.gif
deleted file mode 100644
index 8fb844f..0000000
--- a/plugins/org.eclipse.jst.j2ee.navigator.ui/icons/wsdl.gif
+++ /dev/null
Binary files differ
diff --git a/plugins/org.eclipse.jst.j2ee.navigator.ui/j2ee-navigator/org/eclipse/jst/j2ee/internal/navigator/ui/Messages.java b/plugins/org.eclipse.jst.j2ee.navigator.ui/j2ee-navigator/org/eclipse/jst/j2ee/internal/navigator/ui/Messages.java
deleted file mode 100644
index 6595b40..0000000
--- a/plugins/org.eclipse.jst.j2ee.navigator.ui/j2ee-navigator/org/eclipse/jst/j2ee/internal/navigator/ui/Messages.java
+++ /dev/null
@@ -1,32 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2003, 2006 IBM Corporation and others.
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
- *
- * Contributors:
- * IBM Corporation - initial API and implementation
- *******************************************************************************/
-package org.eclipse.jst.j2ee.internal.navigator.ui;
-
-import org.eclipse.osgi.util.NLS;
-
-public class Messages extends NLS {
-
- public static final String BUNDLE_NAME = "org.eclipse.jst.j2ee.internal.navigator.ui.messages"; //$NON-NLS-1$
- public static String LoadingDDNode_Loading_0_;
- public static String ClearPlaceHolderJob_Removing_place_holder_;
- public static String AddProjectToEARDropAssistant_The_dragged_project_cannot_be_added_;
- public static String AddModuleToEarDropAssistant_Adding_module_to_ea_;
- public static String AddUtilityJarToEarDropAssistant_Add_Utility_Jar_to_0_;
- public static String ImportJ2EEModuleDropAssistant_Importing_Java_Enterprise_Edition_artifacts;
- public static String ImportJ2EEModuleDropAssistant_Could_not_recognize_extension_0_;
- public static String AddProjectToEARDropAssistant_The_project_0_cannot_be_accesse_;
- public static String AddProjectToEARDropAssistant_Could_not_add_module_to_Enterprise_;
-
- static {
- NLS.initializeMessages(BUNDLE_NAME, Messages.class);
- }
-
-}
diff --git a/plugins/org.eclipse.jst.j2ee.navigator.ui/j2ee-navigator/org/eclipse/jst/j2ee/internal/navigator/ui/messages.properties b/plugins/org.eclipse.jst.j2ee.navigator.ui/j2ee-navigator/org/eclipse/jst/j2ee/internal/navigator/ui/messages.properties
deleted file mode 100644
index 0f78891..0000000
--- a/plugins/org.eclipse.jst.j2ee.navigator.ui/j2ee-navigator/org/eclipse/jst/j2ee/internal/navigator/ui/messages.properties
+++ /dev/null
@@ -1,21 +0,0 @@
-###############################################################################
-# Copyright (c) 2005, 2006 IBM Corporation and others.
-# All rights reserved. This program and the accompanying materials
-# are made available under the terms of the Eclipse Public License v1.0
-# which accompanies this distribution, and is available at
-# http://www.eclipse.org/legal/epl-v10.html
-#
-# Contributors:
-# IBM Corporation - initial API and implementation
-###############################################################################
-#String externalization, key=value
-#Sat Apr 15 16:12:10 EDT 2006
-AddModuleToEarDropAssistant_Adding_module_to_ea_=Adding module to {0}
-ClearPlaceHolderJob_Removing_place_holder_=Removing place holder ...
-ImportJ2EEModuleDropAssistant_Could_not_recognize_extension_0_=Could not recognize extension "{0}" as a Java Enterprise Edition artifact.
-AddUtilityJarToEarDropAssistant_Add_Utility_Jar_to_0_=Add Utility Jar to {0}
-ImportJ2EEModuleDropAssistant_Importing_Java_Enterprise_Edition_artifacts=Importing Java Enterprise Edition artifacts ...
-AddProjectToEARDropAssistant_The_project_0_cannot_be_accesse_=The project "{0}" cannot be accessed
-AddProjectToEARDropAssistant_The_dragged_project_cannot_be_added_=The dragged project cannot be added to the *.ear because it is closed.
-AddProjectToEARDropAssistant_Could_not_add_module_to_Enterprise_=Could not add module to Enterprise Application.
-LoadingDDNode_Loading_0_=Loading descriptor for {0}.
diff --git a/plugins/org.eclipse.jst.j2ee.navigator.ui/j2ee-navigator/org/eclipse/jst/j2ee/navigator/internal/ApplicationViewerSorter.java b/plugins/org.eclipse.jst.j2ee.navigator.ui/j2ee-navigator/org/eclipse/jst/j2ee/navigator/internal/ApplicationViewerSorter.java
deleted file mode 100644
index 5692e63..0000000
--- a/plugins/org.eclipse.jst.j2ee.navigator.ui/j2ee-navigator/org/eclipse/jst/j2ee/navigator/internal/ApplicationViewerSorter.java
+++ /dev/null
@@ -1,32 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2003, 2006 IBM Corporation and others.
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
- *
- * Contributors:
- * IBM Corporation - initial API and implementation
- *******************************************************************************/
-package org.eclipse.jst.j2ee.navigator.internal;
-
-import org.eclipse.jface.viewers.Viewer;
-import org.eclipse.jst.j2ee.internal.provider.J2EEBinaryModulesItemProvider;
-
-public class ApplicationViewerSorter extends J2EEViewerSorter {
-
- public ApplicationViewerSorter() {
- super();
- }
-
- @Override
- public int compare(Viewer viewer, Object e1, Object e2) {
- if(e1 instanceof J2EEBinaryModulesItemProvider){
- return 1;
- } else if(e2 instanceof J2EEBinaryModulesItemProvider){
- return -1;
- }
- return super.compare(viewer, e1, e2);
- }
-
-}
diff --git a/plugins/org.eclipse.jst.j2ee.navigator.ui/j2ee-navigator/org/eclipse/jst/j2ee/navigator/internal/ClearPlaceHolderJob.java b/plugins/org.eclipse.jst.j2ee.navigator.ui/j2ee-navigator/org/eclipse/jst/j2ee/navigator/internal/ClearPlaceHolderJob.java
deleted file mode 100644
index 48e0627..0000000
--- a/plugins/org.eclipse.jst.j2ee.navigator.ui/j2ee-navigator/org/eclipse/jst/j2ee/navigator/internal/ClearPlaceHolderJob.java
+++ /dev/null
@@ -1,53 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2003, 2006 IBM Corporation and others.
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
- *
- * Contributors:
- * IBM Corporation - initial API and implementation
- *******************************************************************************/
-package org.eclipse.jst.j2ee.navigator.internal;
-
-import org.eclipse.core.runtime.IProgressMonitor;
-import org.eclipse.core.runtime.IStatus;
-import org.eclipse.core.runtime.Status;
-import org.eclipse.jface.viewers.AbstractTreeViewer;
-import org.eclipse.jst.j2ee.internal.navigator.ui.Messages;
-import org.eclipse.ui.progress.UIJob;
-
-public class ClearPlaceHolderJob extends UIJob {
-
- private AbstractTreeViewer viewer;
- private LoadingDDNode placeHolder;
- private Object[] children;
- private Object parent;
-
- public ClearPlaceHolderJob(AbstractTreeViewer viewer, LoadingDDNode placeHolder, Object parent, Object[] children) {
- super(Messages.ClearPlaceHolderJob_Removing_place_holder_);
- this.viewer = viewer;
- this.placeHolder = placeHolder;
- this.parent = parent;
- this.children = children;
- setRule(new NonConflictingRule());
- }
-
- @Override
- public IStatus runInUIThread(IProgressMonitor monitor) {
-
- try {
- if( !viewer.getControl().isDisposed() ){
- viewer.getControl().setRedraw(false);
- viewer.remove(placeHolder);
- viewer.add(parent, children);
- }
- } finally {
- if( !viewer.getControl().isDisposed() ){
- viewer.getControl().setRedraw(true);
- }
- }
- return Status.OK_STATUS;
- }
-
-}
diff --git a/plugins/org.eclipse.jst.j2ee.navigator.ui/j2ee-navigator/org/eclipse/jst/j2ee/navigator/internal/EARContentProvider.java b/plugins/org.eclipse.jst.j2ee.navigator.ui/j2ee-navigator/org/eclipse/jst/j2ee/navigator/internal/EARContentProvider.java
deleted file mode 100644
index 97396ac..0000000
--- a/plugins/org.eclipse.jst.j2ee.navigator.ui/j2ee-navigator/org/eclipse/jst/j2ee/navigator/internal/EARContentProvider.java
+++ /dev/null
@@ -1,52 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2003, 2006 IBM Corporation and others.
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
- *
- * Contributors:
- * IBM Corporation - initial API and implementation
- *******************************************************************************/
-package org.eclipse.jst.j2ee.navigator.internal;
-
-import org.eclipse.emf.ecore.EObject;
-import org.eclipse.jst.j2ee.application.ApplicationPackage;
-import org.eclipse.jst.j2ee.common.CommonPackage;
-
-/**
- * This class handles the EAR navigator content to the project explorer
- */
-public class EARContentProvider extends J2EEContentProvider {
-
- /**
- * Default constructor
- */
- public EARContentProvider() {
- super();
- }
-
- /**
- * Constructor
- * @param aViewerId
- */
- public EARContentProvider(String aViewerId) {
- super(aViewerId);
- }
-
- /**
- * This method will filter out any non Application DD objects so as not to duplicate meta nodes in
- * the binary modules case.
- */
- @Override
- public Object[] getChildren(Object aParentElement) {
- if (aParentElement instanceof EObject) {
- EObject eObject = (EObject)aParentElement;
- String emfPackage = eObject.eClass().getEPackage().getNsURI();
- if (!emfPackage.equals(ApplicationPackage.eNS_URI)&&
- !emfPackage.equals(CommonPackage.eNS_URI))
- return new Object[]{};
- }
- return super.getChildren(aParentElement);
- }
-}
diff --git a/plugins/org.eclipse.jst.j2ee.navigator.ui/j2ee-navigator/org/eclipse/jst/j2ee/navigator/internal/EMFModelManager.java b/plugins/org.eclipse.jst.j2ee.navigator.ui/j2ee-navigator/org/eclipse/jst/j2ee/navigator/internal/EMFModelManager.java
deleted file mode 100644
index 0589294..0000000
--- a/plugins/org.eclipse.jst.j2ee.navigator.ui/j2ee-navigator/org/eclipse/jst/j2ee/navigator/internal/EMFModelManager.java
+++ /dev/null
@@ -1,44 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2005 IBM Corporation and others.
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
- *
- * Contributors:
- * IBM Corporation - initial API and implementation
- *******************************************************************************/
-/*
- * Created on Feb 17, 2005
- */
-package org.eclipse.jst.j2ee.navigator.internal;
-
-import org.eclipse.core.resources.IProject;
-
-public abstract class EMFModelManager {
- private final IProject project;
- private final EMFRootObjectProvider provider;
- public abstract Object[] getModels();
- public final IProject getProject() {
- return project;
- }
- public final EMFRootObjectProvider getEMFRootObjectProvider(){
- return provider;
- }
- public EMFModelManager(IProject aProject, EMFRootObjectProvider aProvider) {
- project = aProject;
- provider = aProvider;
- }
-
- /**
- * @param affectedProject
- */
- protected void notifyListeners(IProject affectedProject) {
- provider.notifyListeners(affectedProject);
- }
- /**
- *
- */
- public abstract void dispose();
-
-}
diff --git a/plugins/org.eclipse.jst.j2ee.navigator.ui/j2ee-navigator/org/eclipse/jst/j2ee/navigator/internal/EMFModelManagerFactory.java b/plugins/org.eclipse.jst.j2ee.navigator.ui/j2ee-navigator/org/eclipse/jst/j2ee/navigator/internal/EMFModelManagerFactory.java
deleted file mode 100644
index 4bb0337..0000000
--- a/plugins/org.eclipse.jst.j2ee.navigator.ui/j2ee-navigator/org/eclipse/jst/j2ee/navigator/internal/EMFModelManagerFactory.java
+++ /dev/null
@@ -1,29 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2005 IBM Corporation and others.
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
- *
- * Contributors:
- * IBM Corporation - initial API and implementation
- *******************************************************************************/
-/*
- * Created on Feb 17, 2005
- */
-package org.eclipse.jst.j2ee.navigator.internal;
-
-import org.eclipse.core.resources.IProject;
-import org.eclipse.wst.common.componentcore.ModuleCoreNature;
-
-public class EMFModelManagerFactory {
- public static EMFModelManager createEMFModelManager(IProject project, EMFRootObjectProvider provider) {
- boolean flexible = (ModuleCoreNature.getModuleCoreNature(project) != null);
- EMFModelManager modelManager = null;
- if (flexible)
- modelManager = new FlexibleEMFModelManager(project,provider);
- else
- modelManager = new NonFlexibleEMFModelManager(project,provider);
- return modelManager;
- }
-}
diff --git a/plugins/org.eclipse.jst.j2ee.navigator.ui/j2ee-navigator/org/eclipse/jst/j2ee/navigator/internal/EMFRootObjectManager.java b/plugins/org.eclipse.jst.j2ee.navigator.ui/j2ee-navigator/org/eclipse/jst/j2ee/navigator/internal/EMFRootObjectManager.java
deleted file mode 100644
index 1633456..0000000
--- a/plugins/org.eclipse.jst.j2ee.navigator.ui/j2ee-navigator/org/eclipse/jst/j2ee/navigator/internal/EMFRootObjectManager.java
+++ /dev/null
@@ -1,253 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2003, 2005 IBM Corporation and others.
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
- *
- * Contributors:
- * IBM Corporation - initial API and implementation
- *******************************************************************************/
-package org.eclipse.jst.j2ee.navigator.internal;
-
-import java.util.ArrayList;
-import java.util.HashMap;
-import java.util.List;
-import java.util.Map;
-
-import org.eclipse.core.resources.IProject;
-import org.eclipse.core.resources.IResource;
-import org.eclipse.core.resources.IResourceChangeEvent;
-import org.eclipse.core.resources.IResourceChangeListener;
-import org.eclipse.core.resources.IResourceDelta;
-import org.eclipse.core.resources.IResourceDeltaVisitor;
-import org.eclipse.core.resources.ResourcesPlugin;
-import org.eclipse.core.runtime.CoreException;
-import org.eclipse.emf.ecore.EObject;
-import org.eclipse.jem.util.logger.proxy.Logger;
-import org.eclipse.swt.SWTError;
-import org.eclipse.swt.SWTException;
-import org.eclipse.wst.common.componentcore.ArtifactEdit;
-import org.eclipse.wst.common.componentcore.ComponentCore;
-import org.eclipse.wst.common.componentcore.resources.IVirtualComponent;
-import org.eclipse.wst.common.internal.emfworkbench.integration.EditModel;
-import org.eclipse.wst.common.internal.emfworkbench.integration.EditModelEvent;
-import org.eclipse.wst.common.internal.emfworkbench.integration.EditModelListener;
-
-/**
- * <p>
- * The following class is experimental until fully documented.
- * </p>
- */
-public class EMFRootObjectManager implements EditModelListener, IResourceChangeListener, IResourceDeltaVisitor {
-
-
-
- private final Map projectEditModels = new HashMap();
- private final Map projectRootObjects = new HashMap();
-
- private final List listeners = new ArrayList();
-
- public interface IRefreshHandlerListener {
- void onRefresh(Object element);
- }
-
- /**
- *
- */
- public EMFRootObjectManager() {
- super();
- ResourcesPlugin.getWorkspace().addResourceChangeListener(this);
- }
-
-
-
- public void dispose() {
- if (projectEditModels == null)
- return;
- ResourcesPlugin.getWorkspace().removeResourceChangeListener(this);
- EditModel editModel = null;
- Object[] keys = projectEditModels.keySet().toArray();
- for (int i = 0; i < keys.length; i++) {
- editModel = (EditModel) projectEditModels.remove(keys[i]);
- if (editModel != null) {
- editModel.removeListener(this);
- editModel.releaseAccess(this);
- }
- }
- }
-
- public Object getRootObject(IProject project) {
- if (project == null || !project.isAccessible())
- return null;
-
- Object rootObject = null;
- synchronized (projectRootObjects) {
- rootObject = projectRootObjects.get(project);
-
- if (rootObject == null || ((EObject) rootObject).eResource() == null) {
- EditModel editModel = getEditModelForProject(project);
- if (editModel != null) {
- rootObject = editModel.getPrimaryRootObject();
- projectRootObjects.put(project, rootObject);
- }
- }
- }
- return rootObject;
- }
-
-
- protected EditModel getEditModelForProject(IProject project) {
- if (project == null)
- return null;
- EditModel editModel = null;
- synchronized (projectEditModels) {
- editModel = (EditModel) projectEditModels.get(project);
- IVirtualComponent component = ComponentCore.createComponent(project);
- ArtifactEdit artifactEdit = null;
- try {
- if (editModel == null && project.isAccessible()) {
- artifactEdit = ArtifactEdit.getArtifactEditForRead(component);
- if (artifactEdit != null) {
- editModel = (EditModel) artifactEdit.getAdapter(EditModel.class);
- if (editModel != null) {
- editModel.addListener(this);
- addMapping(project, editModel);
- }
- }
- }
- } finally {
- if (artifactEdit!=null)
- artifactEdit.dispose();
- }
- }
- return editModel;
- }
-
- protected void addMapping(IProject project, EditModel editModel) {
- projectEditModels.put(project, editModel);
- }
-
- /*
- * (non-Javadoc)
- *
- * @see org.eclipse.wst.common.internal.emfworkbench.integration.EditModelListener#editModelChanged(org.eclipse.wst.common.internal.emfworkbench.integration.EditModelEvent)
- */
- public void editModelChanged(EditModelEvent anEvent) {
- IProject affectedProject = anEvent.getEditModel().getProject();
- switch (anEvent.getEventCode()) {
- case EditModelEvent.UNLOADED_RESOURCE :
- case EditModelEvent.REMOVED_RESOURCE : {
- Object oldRootObject = projectRootObjects.remove(affectedProject);
- if (oldRootObject != null)
- notifyListeners(affectedProject);
- }
- break;
- case EditModelEvent.SAVE : {
- Object oldRootObject = projectRootObjects.get(affectedProject);
- if (oldRootObject == null)
- notifyListeners(affectedProject);
- }
- break;
- case EditModelEvent.PRE_DISPOSE :
- disposeCache(affectedProject);
- break;
- default :
- break;
- }
- }
-
-
- /**
- * @param aProject
- */
- private void notifyListeners(IProject aProject) {
- for (int x = 0; x < listeners.size(); ++x) {
- IRefreshHandlerListener refreshHandler = (IRefreshHandlerListener) listeners.get(x);
- refreshHandler.onRefresh(aProject);
- }
-
- }
-
-
-
- /*
- * (non-Javadoc)
- *
- * @see org.eclipse.core.resources.IResourceChangeListener#resourceChanged(org.eclipse.core.resources.IResourceChangeEvent)
- */
- public void resourceChanged(IResourceChangeEvent event) {
- final IResourceDelta delta = event.getDelta();
-
- if (delta != null) {
- try {
- delta.accept(EMFRootObjectManager.this);
- } catch (CoreException e) {
- Logger.getLogger().logError(e);
- } catch (SWTException swte) {
- Logger.getLogger().logError(swte);
- } catch (SWTError swte) {
- Logger.getLogger().logError(swte);
- }
- }
- }
-
- /*
- * (non-Javadoc)
- *
- * @see org.eclipse.core.resources.IResourceDeltaVisitor#visit(org.eclipse.core.resources.IResourceDelta)
- */
- public boolean visit(IResourceDelta delta) throws CoreException {
- IResource resource = delta.getResource();
- if (resource != null) {
- switch (resource.getType()) {
- case IResource.ROOT :
- return true;
- case IResource.PROJECT :
- boolean projectOpenStateChanged = ((delta.getFlags() & IResourceDelta.OPEN) != 0);
- if (delta.getKind() == IResourceDelta.REMOVED || projectOpenStateChanged)
- disposeCache((IProject) resource);
- return false;
- }
- }
- return false;
- }
-
-
- protected void disposeCache(IProject affectedProject) {
- synchronized (projectEditModels) {
- projectRootObjects.remove(affectedProject);
- //System.out.println("REMOVING edit model: " + affectedProject.getName());
- EditModel editModel = (EditModel) projectEditModels.remove(affectedProject);
- //System.out.println("REMOVED edit model " + affectedProject.getName());
- if (editModel != null) {
- editModel.removeListener(this);
- editModel.releaseAccess(this);
- //System.out.println("RELEASED edit model " + affectedProject.getName());
- }
- }
- }
-
- public void addRefreshHandlerListener(IRefreshHandlerListener aListener) {
- synchronized (getListeners()) {
- if (aListener != null && !getListeners().contains(aListener))
- getListeners().add(aListener);
- }
- }
-
- public void removeRefreshHandlerListener(IRefreshHandlerListener aListener) {
- synchronized (listeners) {
- listeners.remove(aListener);
- }
- }
-
- /**
- * Insert the method's description here. Creation date: (4/11/2001 4:42:58 PM)
- *
- * @return java.util.List
- */
- protected java.util.List getListeners() {
- return listeners;
- }
-
-}
diff --git a/plugins/org.eclipse.jst.j2ee.navigator.ui/j2ee-navigator/org/eclipse/jst/j2ee/navigator/internal/EMFRootObjectProvider.java b/plugins/org.eclipse.jst.j2ee.navigator.ui/j2ee-navigator/org/eclipse/jst/j2ee/navigator/internal/EMFRootObjectProvider.java
deleted file mode 100644
index 8c973c5..0000000
--- a/plugins/org.eclipse.jst.j2ee.navigator.ui/j2ee-navigator/org/eclipse/jst/j2ee/navigator/internal/EMFRootObjectProvider.java
+++ /dev/null
@@ -1,166 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2005, 2006 IBM Corporation and others.
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
- *
- * Contributors:
- * IBM Corporation - initial API and implementation
- *******************************************************************************/
-/*
- * Created on Feb 17, 2005
- */
-package org.eclipse.jst.j2ee.navigator.internal;
-
-import java.util.ArrayList;
-import java.util.HashMap;
-import java.util.List;
-
-import org.eclipse.core.resources.IProject;
-import org.eclipse.core.resources.IResource;
-import org.eclipse.core.resources.IResourceChangeEvent;
-import org.eclipse.core.resources.IResourceChangeListener;
-import org.eclipse.core.resources.IResourceDelta;
-import org.eclipse.core.resources.IResourceDeltaVisitor;
-import org.eclipse.core.resources.ResourcesPlugin;
-import org.eclipse.core.runtime.CoreException;
-import org.eclipse.jem.util.logger.proxy.Logger;
-import org.eclipse.swt.SWTError;
-import org.eclipse.swt.SWTException;
-
-public class EMFRootObjectProvider implements IResourceChangeListener, IResourceDeltaVisitor{
- private final HashMap emfModelCache = new HashMap();
- private final List listeners = new ArrayList();
-
- public interface IRefreshHandlerListener {
- void onRefresh(Object element);
- }
-
- /**
- *
- */
- public EMFRootObjectProvider() {
- super();
- ResourcesPlugin.getWorkspace().addResourceChangeListener(this);
- }
-
- public Object[] getModels(IProject project){
- try {
- EMFModelManager modelManager = null;
- synchronized (emfModelCache) {
- modelManager = (EMFModelManager) emfModelCache.get(project);
- if (modelManager == null) {
- modelManager= EMFModelManagerFactory.createEMFModelManager(project,this) ;
- emfModelCache.put(project,modelManager);
- }
- }
- return modelManager.getModels();
- } catch (Exception ex) {
- return null;
- }
- }
-
- public boolean hasLoadedModels(IProject project) {
- synchronized (emfModelCache) {
- return emfModelCache.get(project) != null;
- }
- }
-
- /* (non-Javadoc)
- * @see org.eclipse.core.resources.IResourceChangeListener#resourceChanged(org.eclipse.core.resources.IResourceChangeEvent)
- */
- public void resourceChanged(IResourceChangeEvent event) {
- final IResourceDelta delta = event.getDelta();
-
- if (delta != null) {
- try {
- delta.accept(EMFRootObjectProvider.this);
- } catch (CoreException e) {
- Logger.getLogger().logError(e);
- } catch (SWTException swte) {
- Logger.getLogger().logError(swte);
- } catch (SWTError swte) {
- Logger.getLogger().logError(swte);
- }
- }
-
- }
-
- /* (non-Javadoc)
- * @see org.eclipse.core.resources.IResourceDeltaVisitor#visit(org.eclipse.core.resources.IResourceDelta)
- */
- public boolean visit(IResourceDelta delta) throws CoreException {
- IResource resource = delta.getResource();
- if (resource != null) {
- switch (resource.getType()) {
- case IResource.ROOT :
- return true;
- case IResource.PROJECT :
- boolean projectOpenStateChanged = ((delta.getFlags() & IResourceDelta.OPEN) != 0);
- if (delta.getKind() == IResourceDelta.REMOVED || projectOpenStateChanged) {
- IProject project = (IProject) resource;
- dispose(project);
- }
- return false;
- }
- }
- return false;
- }
-
- private void dispose(IProject project) {
- if (project == null) return;
- EMFModelManager modelManager = (EMFModelManager) emfModelCache.remove(project);
- if (modelManager != null) {
- modelManager.dispose();
- modelManager = null;
- }
- }
- public void dispose() {
- ResourcesPlugin.getWorkspace().removeResourceChangeListener(this);
- EMFModelManager modelManager = null;
- Object[] keys = emfModelCache.keySet().toArray();
- for (int i = 0; i < keys.length; i++) {
- modelManager = (EMFModelManager) emfModelCache.remove(keys[i]);
- if (modelManager != null) {
- modelManager.dispose();
- }
- }
- }
-
-
- /**
- * @param aProject
- */
- public void notifyListeners(IProject aProject) {
- for (int x = 0; x < listeners.size(); ++x) {
- IRefreshHandlerListener refreshHandler = (IRefreshHandlerListener) listeners.get(x);
- refreshHandler.onRefresh(aProject);
- }
-
- }
-
- public void addRefreshHandlerListener(IRefreshHandlerListener aListener) {
- synchronized (getListeners()) {
- if (aListener != null && !getListeners().contains(aListener))
- getListeners().add(aListener);
- }
- }
-
- public void removeRefreshHandlerListener(IRefreshHandlerListener aListener) {
- synchronized (listeners) {
- listeners.remove(aListener);
- }
- }
-
- /**
- * Insert the method's description here. Creation date: (4/11/2001 4:42:58 PM)
- *
- * @return java.util.List
- */
- protected java.util.List getListeners() {
- return listeners;
- }
-
-
-}
diff --git a/plugins/org.eclipse.jst.j2ee.navigator.ui/j2ee-navigator/org/eclipse/jst/j2ee/navigator/internal/FlexibleEMFModelManager.java b/plugins/org.eclipse.jst.j2ee.navigator.ui/j2ee-navigator/org/eclipse/jst/j2ee/navigator/internal/FlexibleEMFModelManager.java
deleted file mode 100644
index 0973187..0000000
--- a/plugins/org.eclipse.jst.j2ee.navigator.ui/j2ee-navigator/org/eclipse/jst/j2ee/navigator/internal/FlexibleEMFModelManager.java
+++ /dev/null
@@ -1,228 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2005, 2007 IBM Corporation and others.
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
- *
- * Contributors:
- * IBM Corporation - initial API and implementation
- *******************************************************************************/
-/*
- * Created on Feb 17, 2005
- */
-package org.eclipse.jst.j2ee.navigator.internal;
-
-import java.util.ArrayList;
-import java.util.HashMap;
-import java.util.List;
-import java.util.Map;
-
-import org.eclipse.core.resources.IProject;
-import org.eclipse.emf.ecore.EObject;
-import org.eclipse.wst.common.componentcore.ArtifactEdit;
-import org.eclipse.wst.common.internal.emfworkbench.integration.EditModel;
-import org.eclipse.wst.common.internal.emfworkbench.integration.EditModelEvent;
-import org.eclipse.wst.common.internal.emfworkbench.integration.EditModelListener;
-import org.eclipse.jst.j2ee.navigator.internal.plugin.J2EENavigatorPlugin;
-
-public class FlexibleEMFModelManager extends EMFModelManager implements EditModelListener{
-
- private List rootObjects = new ArrayList();
- private static final Object[] EMPTY_OBJECT = new Object[0];
- private final List artifactEdits = new ArrayList();
- private final Map artifactEditToRootObject = new HashMap();
-
- /**
- * @param aProject
- * @param provider
- */
- public FlexibleEMFModelManager(IProject aProject, EMFRootObjectProvider provider) {
- super(aProject,provider);
- }
-
- /* (non-Javadoc)
- * @see org.eclipse.jst.j2ee.navigator.internal.EMFModelManager#getModels()
- */
- @Override
- public Object[] getModels() {
- try {
-
- IProject project = getProject();
- if ( project== null || !project.isAccessible())
- return EMPTY_OBJECT;
-
- synchronized (rootObjects) {
- if (!isValid(rootObjects)) {
- rootObjects = getRootObjects();
- }
- }
- } catch (Exception ex) {
- J2EENavigatorPlugin.logError(ex);
- }
- if (rootObjects != null) {
- return rootObjects.toArray() ;
- }
- return EMPTY_OBJECT;
-
- }
-
- private boolean isValid(List rootObjects) {
- if (rootObjects == null || rootObjects.size()==0)
- return false;
- for (int x=0; x< rootObjects.size(); ++x) {
- EObject eObject = (EObject) rootObjects.get(x);
- if (eObject != null && eObject.eResource() == null)
- return false;
- }
- return true;
- }
-
- /**
- * @param project
- * @return
- */
- private List getRootObjects() {
- List artifacts = getArtifactEdits();
- List flexibleObjects = new ArrayList();
- ArtifactEdit artifactEdit = null;
- EObject contentModelRoot = null;
- for (int x=0; x< artifacts.size(); ++x) {
- artifactEdit = (ArtifactEdit)artifacts.get(x);
- contentModelRoot = artifactEdit.getContentModelRoot();
- if (contentModelRoot != null) {
- flexibleObjects.add(contentModelRoot);
- if (!rootObjects.contains(contentModelRoot))
- rootObjects.add(contentModelRoot);
- artifactEditToRootObject.put(artifactEdit,contentModelRoot);
- }
- }
- return flexibleObjects;
- }
-
- protected List getArtifactEdits() {
-
- IProject project = getProject();
- if (project == null)
- return null;
- synchronized (artifactEdits) {
- if (artifactEdits.size() ==0 && project.isAccessible()) {
- ArtifactEdit artifactEdit = null;
- try{
- artifactEdit = ArtifactEdit.getArtifactEditForRead(project);
- if(artifactEdit != null) {
- artifactEdits.add(artifactEdit);
- artifactEdit.addListener(this);
- }
- } catch(Exception e){
- J2EENavigatorPlugin.logError(e);
- }
- }
- }
- return artifactEdits;
- }
-
- /* (non-Javadoc)
- * @see org.eclipse.jst.j2ee.navigator.internal.EMFModelManager#dispose()
- */
- @Override
- public void dispose() {
- if (artifactEdits != null) {
- for (int x=0; x< artifactEdits.size(); ++x) {
- ArtifactEdit artifactEdit = (ArtifactEdit)artifactEdits.get(x);
- if (artifactEdit != null) {
- artifactEdit.removeListener(this);
- artifactEdit.dispose();
- }
-
- }
- }
- rootObjects.clear();
-
- }
-
- /* (non-Javadoc)
- * @see org.eclipse.wst.common.internal.emfworkbench.integration.EditModelListener#editModelChanged(org.eclipse.wst.common.internal.emfworkbench.integration.EditModelEvent)
- */
- public void editModelChanged(EditModelEvent anEvent) {
- IProject affectedProject = anEvent.getEditModel().getProject();
-
- switch (anEvent.getEventCode()) {
- case EditModelEvent.UNLOADED_RESOURCE :
- case EditModelEvent.REMOVED_RESOURCE : {
- Object oldRootObject = removeRootObject(anEvent.getEditModel(),affectedProject);
- getRootObjects();
- if (oldRootObject != null)
- notifyListeners(affectedProject);
- }
- break;
- case EditModelEvent.SAVE : {
- Object oldRootObject = getRootObject(anEvent.getEditModel(),affectedProject);
- if (oldRootObject == null)
- notifyListeners(affectedProject);
- }
- break;
- case EditModelEvent.PRE_DISPOSE :
- dispose(anEvent.getEditModel(),affectedProject);
- break;
- default :
- break;
- }
-
- }
-
-
-
- /**
- * @param editModel
- * @param affectedProject
- * @return
- */
- private Object getRootObject(EditModel editModel, IProject project) {
- ArtifactEdit artifactEdit = getArtifactEdit(editModel,project);
- if (artifactEdit != null) {
- return artifactEditToRootObject.get(artifactEdit);
- }
- return null;
- }
-
- /**
- * @param editModel
- * @param affectedProject
- * @return
- */
- private Object removeRootObject(EditModel editModel, IProject project) {
- ArtifactEdit artifactEdit = getArtifactEdit(editModel,project);
- if (artifactEdit != null) {
- rootObjects.remove(artifactEditToRootObject.get(artifactEdit));
- artifactEditToRootObject.remove(artifactEdit);
- }
- return artifactEdit;
- }
-
- /**
- * @param affectedProject
- * @param editModel
- */
- private void dispose( EditModel editModel, IProject project) {
- ArtifactEdit artifactEdit = getArtifactEdit(editModel,project);
- if (artifactEdit != null) {
- artifactEdit.removeListener(this);
- artifactEdits.remove(artifactEdit);
- artifactEditToRootObject.remove(artifactEdit);
- }
-
- }
-
- private ArtifactEdit getArtifactEdit(EditModel editModel, IProject project) {
- if (artifactEdits != null) {
- for (int x=0; x<artifactEdits.size(); ++x) {
- ArtifactEdit artifactEdit = (ArtifactEdit)artifactEdits.get(x);
- if (artifactEdit.hasEditModel(editModel))
- return artifactEdit;
- }
- }
- return null;
- }
-
-}
diff --git a/plugins/org.eclipse.jst.j2ee.navigator.ui/j2ee-navigator/org/eclipse/jst/j2ee/navigator/internal/IJ2EENavigatorConstants.java b/plugins/org.eclipse.jst.j2ee.navigator.ui/j2ee-navigator/org/eclipse/jst/j2ee/navigator/internal/IJ2EENavigatorConstants.java
deleted file mode 100644
index 0bf7e81..0000000
--- a/plugins/org.eclipse.jst.j2ee.navigator.ui/j2ee-navigator/org/eclipse/jst/j2ee/navigator/internal/IJ2EENavigatorConstants.java
+++ /dev/null
@@ -1,23 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2003, 2006 IBM Corporation and others.
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
- *
- * Contributors:
- * IBM Corporation - initial API and implementation
- *******************************************************************************/
-/*
- * Created on Jul 7, 2004
- */
-package org.eclipse.jst.j2ee.navigator.internal;
-
-
-/**
- * @author mdelder
- */
-public interface IJ2EENavigatorConstants {
-
- String VIEWER_ID = "org.eclipse.ui.navigator.ProjectExplorer";//$NON-NLS-1$
-}
diff --git a/plugins/org.eclipse.jst.j2ee.navigator.ui/j2ee-navigator/org/eclipse/jst/j2ee/navigator/internal/IJ2EEWizardConstants.java b/plugins/org.eclipse.jst.j2ee.navigator.ui/j2ee-navigator/org/eclipse/jst/j2ee/navigator/internal/IJ2EEWizardConstants.java
deleted file mode 100644
index 05943c2..0000000
--- a/plugins/org.eclipse.jst.j2ee.navigator.ui/j2ee-navigator/org/eclipse/jst/j2ee/navigator/internal/IJ2EEWizardConstants.java
+++ /dev/null
@@ -1,67 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2003, 2006 IBM Corporation and others.
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
- *
- * Contributors:
- * IBM Corporation - initial API and implementation
- *******************************************************************************/
-package org.eclipse.jst.j2ee.navigator.internal;
-
-import org.eclipse.jst.j2ee.internal.wizard.AppClientComponentExportWizard;
-import org.eclipse.jst.j2ee.internal.wizard.AppClientComponentImportWizard;
-import org.eclipse.jst.j2ee.internal.wizard.EARComponentExportWizard;
-import org.eclipse.jst.j2ee.internal.wizard.EARComponentImportWizard;
-import org.eclipse.jst.j2ee.internal.wizard.J2EEUtilityJarImportWizardNew;
-import org.eclipse.jst.j2ee.jca.ui.internal.wizard.ConnectorComponentExportWizard;
-import org.eclipse.jst.j2ee.jca.ui.internal.wizard.ConnectorComponentImportWizard;
-
-/**
- * <p>
- * The following class is experimental until fully documented.
- * </p>
- * <p>
- * The Creation IDs are used for activity filtering and as such are declared on the individual
- * wizards. All other IDs must be maintained to stay in sync with the values found in the plugin.xml
- * files of the respective module UI plugins.
- */
-public interface IJ2EEWizardConstants {
-
-// String NEW_EAR_PROJECT_WIZARD_ID = EARComponentCreationWizard.WIZARD_ID;
-
-// String NEW_APPCLIENT_PROJECT_WIZARD_ID = AppClientComponentCreationWizard.WIZARD_ID;
-//
-// String NEW_JCA_PROJECT_WIZARD_ID = ConnectorComponentCreationWizard.WIZARD_ID;
-//
-// String NEW_EJB_PROJECT_WIZARD_ID = EJBComponentCreationWizard.WIZARD_ID;
-//
-// String NEW_WEB_PROJECT_WIZARD_ID = WebComponentCreationWizard.WIZARD_ID;
-
- String NEW_ENTERPRISE_BEAN_WIZARD_ID = "org.eclipse.jst.j2ee.ejb.ui.util.createEJBWizard"; //$NON-NLS-1$
-
- String IMPORT_EAR_WIZARD_ID = EARComponentImportWizard.class.getName();
-
- String IMPORT_APPCLIENT_WIZARD_ID = AppClientComponentImportWizard.class.getName();
-
- String IMPORT_CONNECTOR_WIZARD_ID = ConnectorComponentImportWizard.class.getName();
-
- String IMPORT_ENTERPRISE_BEAN_WIZARD_ID = "org.eclipse.jst.ejb.ui.internal.wizard.EJBComponentImportWizard"; //$NON-NLS-1$
-
- String IMPORT_WEB_MODULE_WIZARD_ID = "org.eclipse.jst.servlet.ui.internal.wizard.WebComponentImportWizard"; //$NON-NLS-1$
-
- String EXPORT_WEB_MODULE_WIZARD_ID = "org.eclipse.jst.servlet.ui.internal.wizard.WebComponentExportWizard"; //$NON-NLS-1$
-
- String IMPORT_UTILITY_JAR_WIZARD_ID = J2EEUtilityJarImportWizardNew.class.getName();
-
- String EXPORT_EAR_WIZARD_ID = EARComponentExportWizard.class.getName();
-
- String EXPORT_APPCLIENT_WIZARD_ID = AppClientComponentExportWizard.class.getName();
-
- String EXPORT_CONNECTOR_WIZARD_ID = ConnectorComponentExportWizard.class.getName();
-
- String EXPORT_ENTERPRISE_BEAN_WIZARD_ID = "org.eclipse.jst.ejb.ui.internal.wizardEJBComponentExportWizard"; //$NON-NLS-1$
-
-
-}
diff --git a/plugins/org.eclipse.jst.j2ee.navigator.ui/j2ee-navigator/org/eclipse/jst/j2ee/navigator/internal/J2EEActionProvider.java b/plugins/org.eclipse.jst.j2ee.navigator.ui/j2ee-navigator/org/eclipse/jst/j2ee/navigator/internal/J2EEActionProvider.java
deleted file mode 100644
index 8986d05..0000000
--- a/plugins/org.eclipse.jst.j2ee.navigator.ui/j2ee-navigator/org/eclipse/jst/j2ee/navigator/internal/J2EEActionProvider.java
+++ /dev/null
@@ -1,138 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2003, 2006 IBM Corporation and others.
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
- *
- * Contributors:
- * IBM Corporation - initial API and implementation
- *******************************************************************************/
-package org.eclipse.jst.j2ee.navigator.internal;
-
-import java.util.ArrayList;
-import java.util.List;
-
-import org.eclipse.core.resources.IResource;
-import org.eclipse.core.runtime.IAdaptable;
-import org.eclipse.jface.action.IMenuManager;
-import org.eclipse.jface.viewers.IStructuredSelection;
-import org.eclipse.jface.viewers.StructuredSelection;
-import org.eclipse.jst.j2ee.internal.actions.OpenJ2EEResourceAction;
-import org.eclipse.jst.j2ee.internal.provider.J2EEUtilityJarItemProvider;
-import org.eclipse.ui.IActionBars;
-import org.eclipse.ui.actions.ActionContext;
-import org.eclipse.ui.navigator.CommonActionProvider;
-import org.eclipse.ui.navigator.ICommonActionConstants;
-import org.eclipse.ui.navigator.ICommonActionExtensionSite;
-import org.eclipse.ui.navigator.ICommonMenuConstants;
-
-public class J2EEActionProvider extends CommonActionProvider {
-
- private static final Class IRESOURCE_CLASS = IResource.class;
-
- private OpenJ2EEResourceAction openAction;
-
- /**
- *
- */
- public J2EEActionProvider() {
- }
- /*
- * (non-Javadoc)
- *
- * @see org.eclipse.wst.common.navigator.internal.views.actions.ICommonActionProvider#init(org.eclipse.ui.IViewPart,
- * org.eclipse.jface.viewers.StructuredViewer,
- * org.eclipse.wst.common.navigator.internal.views.extensions.NavigatorContentService)
- */
- @Override
- public void init(ICommonActionExtensionSite aConfig) {
- openAction = new OpenJ2EEResourceAction();
-
-// renameAction = new J2EERenameAction(aConfig.getViewSite(), aConfig.getViewSite().getShell());
-
-
- }
-
- /*
- * (non-Javadoc)
- *
- * @see org.eclipse.wst.common.navigator.internal.views.actions.ICommonActionProvider#setActionContext(org.eclipse.ui.actions.ActionContext)
- */
- @Override
- public void setContext(ActionContext aContext) {
-
- if (aContext != null && aContext.getSelection() instanceof IStructuredSelection) {
- IStructuredSelection selection = (IStructuredSelection) aContext.getSelection();
-
- openAction.selectionChanged(selection);
-// renameAction.selectionChanged(selection);
-
- Object[] array = selection.toArray();
- if (isUtilityJars(array)) {
- J2EEUtilityJarItemProvider utilityJarItemProvider = null;
- List newSelection = new ArrayList();
- for (int i = 0; i < array.length; i++) {
- utilityJarItemProvider = (J2EEUtilityJarItemProvider) array[i];
- newSelection.addAll(utilityJarItemProvider.getChildren(null));
- }
- selection = new StructuredSelection(newSelection);
- }
- //genericDelete.selectionChanged(genericDelete, selection);
- }
- super.setContext(aContext);
- }
-
- /*
- * (non-Javadoc)
- *
- * @see org.eclipse.wst.common.navigator.internal.views.actions.ICommonActionProvider#fillActionBars(org.eclipse.ui.IActionBars)
- */
- @Override
- public void fillActionBars(IActionBars theActionBars) {
-// if (genericDelete.isEnabled())
-// theActionBars.setGlobalActionHandler(ActionFactory.DELETE.getId(), genericDelete);
- if(openAction.isEnabled())
- theActionBars.setGlobalActionHandler(ICommonActionConstants.OPEN, openAction);
- return;
- }
-
- /*
- * (non-Javadoc)
- *
- * @see org.eclipse.wst.common.navigator.internal.views.actions.ICommonActionProvider#fillContextMenu(org.eclipse.jface.action.IMenuManager)
- */
- @Override
- public void fillContextMenu(IMenuManager aMenu) {
- if (getContext()==null || getContext().getSelection().isEmpty())
- return;
- IStructuredSelection selection = (IStructuredSelection) getContext().getSelection();
- if(!adaptsToResource(selection.toArray())) {
- openAction.selectionChanged(selection);
- if (openAction.isEnabled())
- aMenu.insertAfter(ICommonMenuConstants.GROUP_OPEN, openAction);
- }
- }
-
- private boolean adaptsToResource(Object[] objects) {
- for (int i = 0; i < objects.length; i++) {
- if(objects[i] instanceof IResource) {
- return true;
- } else if (objects[i] instanceof IAdaptable && (((IAdaptable)objects[i]).getAdapter(IRESOURCE_CLASS) != null)) {
- return true;
- }
- }
- return false;
- }
- private boolean isUtilityJars(Object[] items) {
- if (items != null) {
- for (int i = 0; i < items.length; i++) {
- if (items[i] == null || items[i].getClass() != J2EEUtilityJarItemProvider.class)
- return false;
- }
- return true;
- }
- return false;
- }
-
-}
diff --git a/plugins/org.eclipse.jst.j2ee.navigator.ui/j2ee-navigator/org/eclipse/jst/j2ee/navigator/internal/J2EEComparator.java b/plugins/org.eclipse.jst.j2ee.navigator.ui/j2ee-navigator/org/eclipse/jst/j2ee/navigator/internal/J2EEComparator.java
deleted file mode 100644
index 8fbe490..0000000
--- a/plugins/org.eclipse.jst.j2ee.navigator.ui/j2ee-navigator/org/eclipse/jst/j2ee/navigator/internal/J2EEComparator.java
+++ /dev/null
@@ -1,67 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2005 IBM Corporation and others.
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
- *
- * Contributors:
- * IBM Corporation - initial API and implementation
- *******************************************************************************/
-/*
- * Created on Jan 22, 2005
- */
-package org.eclipse.jst.j2ee.navigator.internal;
-
-import java.util.Comparator;
-
-import org.eclipse.jst.j2ee.ejb.EnterpriseBean;
-import org.eclipse.jst.j2ee.internal.ejb.provider.J2EEJavaClassProviderHelper;
-
-
-public class J2EEComparator implements Comparator {
-
- private J2EEViewerSorter j2eeViewSorter = new J2EEViewerSorter();
-
- /*
- * (non-Javadoc)
- *
- * @see java.util.Comparator#compare(java.lang.Object, java.lang.Object)
- */
- public int compare(Object o1, Object o2) {
- J2EEJavaClassProviderHelper providerHelperLeftArg = null;
- J2EEJavaClassProviderHelper providerHelperRightArg = null;
-
- if (o1 instanceof J2EEJavaClassProviderHelper)
- providerHelperLeftArg = (J2EEJavaClassProviderHelper) o1;
- if (o2 instanceof J2EEJavaClassProviderHelper)
- providerHelperRightArg = (J2EEJavaClassProviderHelper) o2;
-
-
- /* if both arguments are J2EEJavaClassProviderHelpers */
- if (providerHelperLeftArg != null && providerHelperRightArg != null)
- return providerHelperLeftArg.getText().compareTo(providerHelperRightArg.getText());
- /* if exactly one of the arguments are J2EEJavaClassProviderHelpers */
- else if (providerHelperLeftArg != null && o2 instanceof EnterpriseBean)
- return 1;
- else if (providerHelperRightArg != null && o1 instanceof EnterpriseBean)
- return -1;
- return j2eeViewSorter.compare(null, o1, o2);
- }
-
- /*
- * (non-Javadoc)
- *
- * @see java.util.Comparator#equals(java.lang.Object)
- */
- @Override
- public boolean equals(Object obj) {
- return obj instanceof J2EEComparator;
- }
-
- @Override
- public int hashCode() {
- return J2EEComparator.class.hashCode();
- }
-
-}
\ No newline at end of file
diff --git a/plugins/org.eclipse.jst.j2ee.navigator.ui/j2ee-navigator/org/eclipse/jst/j2ee/navigator/internal/J2EEContentProvider.java b/plugins/org.eclipse.jst.j2ee.navigator.ui/j2ee-navigator/org/eclipse/jst/j2ee/navigator/internal/J2EEContentProvider.java
deleted file mode 100644
index 356b58f..0000000
--- a/plugins/org.eclipse.jst.j2ee.navigator.ui/j2ee-navigator/org/eclipse/jst/j2ee/navigator/internal/J2EEContentProvider.java
+++ /dev/null
@@ -1,245 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2003, 2006 IBM Corporation and others.
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
- *
- * Contributors:
- * IBM Corporation - initial API and implementation
- *******************************************************************************/
-package org.eclipse.jst.j2ee.navigator.internal;
-
-import java.util.ArrayList;
-import java.util.Arrays;
-import java.util.List;
-
-import org.eclipse.core.resources.IProject;
-import org.eclipse.core.runtime.IAdaptable;
-import org.eclipse.core.runtime.IProgressMonitor;
-import org.eclipse.core.runtime.IStatus;
-import org.eclipse.core.runtime.Status;
-import org.eclipse.core.runtime.jobs.ISchedulingRule;
-import org.eclipse.core.runtime.jobs.Job;
-import org.eclipse.emf.ecore.EObject;
-import org.eclipse.emf.ecore.resource.Resource;
-import org.eclipse.emf.edit.provider.ItemProvider;
-import org.eclipse.emf.edit.ui.provider.AdapterFactoryContentProvider;
-import org.eclipse.jem.util.emf.workbench.ProjectUtilities;
-import org.eclipse.jface.viewers.AbstractTreeViewer;
-import org.eclipse.jface.viewers.ITreeContentProvider;
-import org.eclipse.jface.viewers.Viewer;
-import org.eclipse.jst.j2ee.internal.ejb.provider.BeanClassProviderHelper;
-import org.eclipse.jst.j2ee.internal.ejb.provider.J2EEJavaClassProviderHelper;
-import org.eclipse.jst.j2ee.internal.provider.MethodsProviderDelegate;
-import org.eclipse.jst.j2ee.navigator.internal.EMFRootObjectProvider.IRefreshHandlerListener;
-import org.eclipse.jst.j2ee.navigator.internal.plugin.J2EENavigatorPlugin;
-import org.eclipse.swt.widgets.Display;
-import org.eclipse.ui.navigator.CommonViewer;
-import org.eclipse.ui.progress.UIJob;
-import org.eclipse.wst.common.internal.emfworkbench.integration.DynamicAdapterFactory;
-
-/**
- * <p>
- * The following class is experimental until fully documented.
- * </p>
- */
-public class J2EEContentProvider implements ITreeContentProvider, IRefreshHandlerListener {
-
- private final EMFRootObjectProvider rootObjectProvider;
-
- private AdapterFactoryContentProvider delegateContentProvider;
- private MethodsProviderDelegate delegateMethodsProvider;
-
- private String viewerId = null;
- private AbstractTreeViewer viewer;
-
- /**
- *
- */
- public J2EEContentProvider() {
- rootObjectProvider = new EMFRootObjectProvider();
- rootObjectProvider.addRefreshHandlerListener(this);
- }
-
- /**
- *
- */
- public J2EEContentProvider(String aViewerId) {
- rootObjectProvider = new EMFRootObjectProvider();
- updateContentProviders(aViewerId);
- rootObjectProvider.addRefreshHandlerListener(this);
- }
-
-
- /*
- * (non-Javadoc)
- *
- * @see org.eclipse.jface.viewers.IStructuredContentProvider#getElements(java.lang.Object)
- */
- public Object[] getElements(Object anInputElement) {
- return getChildren(anInputElement);
- }
-
- /*
- * (non-Javadoc)
- *
- * @see org.eclipse.emf.edit.ui.provider.AdapterFactoryContentProvider#getChildren(java.lang.Object)
- */
- public Object[] getChildren(Object aParentElement) {
- IProject project = null;
- List children = new ArrayList();
- if (aParentElement instanceof IAdaptable && !(aParentElement instanceof EObject) && !(aParentElement instanceof ItemProvider)
- && !(aParentElement instanceof J2EEJavaClassProviderHelper)) {
- project = ProjectUtilities.getProject(aParentElement);
-
- if (project != null) {
- // Verify if the model *is being*
- // loaded and just return the place holder
- if (LoadingDDNode.isBeingLoaded(project)) {
- children.add(LoadingDDNode.createPlaceHolder(project));
-
- // Verify if the model has been loaded, just return it
- } else if (rootObjectProvider.hasLoadedModels(project)) {
- /* model already loaded, just return the model */
- children.addAll(Arrays.asList(rootObjectProvider.getModels(project)));
-
- // Otherwise return a place holder node and start loading
- // job
- } else {
- LoadingDDNode placeHolder = LoadingDDNode.createPlaceHolder(project);
- /*
- * we need to load the model; possible long running
- * operation
- */
- if (LoadingDDNode.canBeginLoading(project))
- new LoadingDDJob(viewer, placeHolder, (IAdaptable) aParentElement, rootObjectProvider).schedule();
- children.add(placeHolder);
- }
-
- }
- } else if (MethodsProviderDelegate.providesContentFor(aParentElement))
- return delegateMethodsProvider.getChildren(aParentElement);
- else /* if (isEMFEditObject(aParentElement)) */{
- Object[] siblings = null;
- try {
- siblings = delegateContentProvider.getChildren(aParentElement);
- } catch (Exception e) {
- J2EENavigatorPlugin.logError(0, e.getMessage(), e); }
- if (siblings != null)
- children.addAll(Arrays.asList(siblings));
- }
- return children.toArray();
- }
-
- public Object getParent(Object object) {
- if (MethodsProviderDelegate.providesContentFor(object))
- return delegateMethodsProvider.getParent(object);
- Object parent = delegateContentProvider.getParent(object);
- if(parent instanceof Resource) {
- parent = ProjectUtilities.getProject((EObject) object);
- } else if (parent == null) {
- if(object instanceof BeanClassProviderHelper)
- parent = ((BeanClassProviderHelper) object).getEjb();
- else if (object instanceof EObject) {
- parent = ProjectUtilities.getProject((EObject) object);
- }
- }
- return parent;
- }
-
- /**
- * @see org.eclipse.jface.viewers.IContentProvider#dispose()
- */
- public void dispose() {
- rootObjectProvider.removeRefreshHandlerListener(this);
- delegateContentProvider.dispose();
- rootObjectProvider.dispose();
- delegateMethodsProvider.dispose();
-
- }
-
- /*
- * @see ITreeContentProvider#hasChildren(Object)
- */
- public boolean hasChildren(Object element) {
- if (MethodsProviderDelegate.providesContentFor(element))
- return delegateMethodsProvider.hasChildren(element);
- /* else if (isEMFEditObject(element)) */
- if(element instanceof ItemProvider)
- return true;
- return delegateContentProvider.hasChildren(element);
-
- }
-
- /*
- * (non-Javadoc)
- *
- * @see org.eclipse.emf.edit.ui.provider.AdapterFactoryContentProvider#inputChanged(org.eclipse.jface.viewers.Viewer,
- * java.lang.Object, java.lang.Object)
- */
- public void inputChanged(Viewer aViewer, Object anOldInput, Object aNewInput) {
- String newViewerId = null;
- viewer = (AbstractTreeViewer) aViewer;
- if (aViewer instanceof CommonViewer)
- newViewerId = ((CommonViewer) aViewer).getNavigatorContentService().getViewerId();
-
- if (newViewerId != null && (viewerId == null || !viewerId.equals(newViewerId)))
- updateContentProviders(newViewerId);
-
- delegateContentProvider.inputChanged(aViewer, anOldInput, aNewInput);
- delegateMethodsProvider.inputChanged(aViewer, anOldInput, aNewInput);
- }
-
- /**
- * @param viewerId2
- */
- private void updateContentProviders(String aViewerId) {
-
- /* Dispose of the existing content providers */
- if (delegateContentProvider != null)
- delegateContentProvider.dispose();
- if (delegateMethodsProvider != null)
- delegateMethodsProvider.dispose();
-
- /* Create new content providers using the new viewer id */
- DynamicAdapterFactory adapterFactory = new DynamicAdapterFactory(aViewerId);
- delegateContentProvider = new AdapterFactoryContentProvider(adapterFactory);
- delegateMethodsProvider = new MethodsProviderDelegate(adapterFactory);
-
- /* Remember the viewer id */
- viewerId = aViewerId;
-
- }
-
- /*
- * (non-Javadoc)
- *
- * @see org.eclipse.jst.j2ee.navigator.internal.EMFRootObjectManager.IRefreshHandlerListener#onRefresh(java.lang.Object)
- */
- public void onRefresh(final Object element) {
- if (Display.getCurrent() != null) {
- (viewer).refresh(element, true);
- } else {
- /* Create and schedule a UI Job to update the Navigator Content Viewer */
- Job job = new UIJob("Update the Navigator Content Viewer Job") { //$NON-NLS-1$
- @Override
- public IStatus runInUIThread(IProgressMonitor monitor) {
- (viewer).refresh(element, true);
- return Status.OK_STATUS;
- }
- };
- ISchedulingRule rule = new ISchedulingRule() {
- public boolean contains(ISchedulingRule rule) {
- return rule == this;
- }
- public boolean isConflicting(ISchedulingRule rule) {
- return rule == this;
- }
- };
- job.setRule(rule);
- job.schedule();
- }
- }
-
-}
diff --git a/plugins/org.eclipse.jst.j2ee.navigator.ui/j2ee-navigator/org/eclipse/jst/j2ee/navigator/internal/J2EEEMFAdapterFactory.java b/plugins/org.eclipse.jst.j2ee.navigator.ui/j2ee-navigator/org/eclipse/jst/j2ee/navigator/internal/J2EEEMFAdapterFactory.java
deleted file mode 100644
index 451280e..0000000
--- a/plugins/org.eclipse.jst.j2ee.navigator.ui/j2ee-navigator/org/eclipse/jst/j2ee/navigator/internal/J2EEEMFAdapterFactory.java
+++ /dev/null
@@ -1,66 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2003, 2006 IBM Corporation and others.
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
- *
- * Contributors:
- * IBM Corporation - initial API and implementation
- *******************************************************************************/
-/*
- * Created on Feb 25, 2004
- *
- */
-package org.eclipse.jst.j2ee.navigator.internal;
-
-import org.eclipse.core.resources.IFile;
-import org.eclipse.core.resources.IProject;
-import org.eclipse.core.resources.IResource;
-import org.eclipse.core.runtime.IAdapterFactory;
-import org.eclipse.emf.ecore.EObject;
-import org.eclipse.wst.common.internal.emfworkbench.WorkbenchResourceHelper;
-
-/**
- * @author mdelder
- *
- */
-public class J2EEEMFAdapterFactory implements IAdapterFactory {
-
- protected static final Class IPROJECT_CLASS = IProject.class;
- protected static final Class IRESOURCE_CLASS = IResource.class;
- protected static final Class IFILE_CLASS = IFile.class;
- protected static final Class EOBJECT_CLASS = EObject.class;
-
- /**
- *
- */
- public J2EEEMFAdapterFactory() {
- super();
- }
-
- /*
- * (non-Javadoc)
- *
- * @see org.eclipse.core.runtime.IAdapterFactory#getAdapter(java.lang.Object, java.lang.Class)
- */
- public Object getAdapter(Object adaptableObject, Class adapterType) {
- if (adaptableObject instanceof EObject) {
- if (adapterType == IFILE_CLASS || adapterType == IRESOURCE_CLASS)
- return WorkbenchResourceHelper.getFile((EObject) adaptableObject);
- //else if (adapterType == IPROJECT_CLASS)
- // return ProjectUtilities.getProject((EObject) adaptableObject);
- }
- return null;
- }
-
- /*
- * (non-Javadoc)
- *
- * @see org.eclipse.core.runtime.IAdapterFactory#getAdapterList()
- */
- public Class[] getAdapterList() {
- return new Class[]{IRESOURCE_CLASS, IFILE_CLASS};
- }
-
-}
diff --git a/plugins/org.eclipse.jst.j2ee.navigator.ui/j2ee-navigator/org/eclipse/jst/j2ee/navigator/internal/J2EELabelProvider.java b/plugins/org.eclipse.jst.j2ee.navigator.ui/j2ee-navigator/org/eclipse/jst/j2ee/navigator/internal/J2EELabelProvider.java
deleted file mode 100644
index 6e58cc8..0000000
--- a/plugins/org.eclipse.jst.j2ee.navigator.ui/j2ee-navigator/org/eclipse/jst/j2ee/navigator/internal/J2EELabelProvider.java
+++ /dev/null
@@ -1,257 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2003, 2006 IBM Corporation and others.
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
- *
- * Contributors:
- * IBM Corporation - initial API and implementation
- *******************************************************************************/
-package org.eclipse.jst.j2ee.navigator.internal;
-
-import java.io.File;
-
-import org.eclipse.core.resources.IProject;
-import org.eclipse.core.runtime.Path;
-import org.eclipse.emf.common.notify.AdapterFactory;
-import org.eclipse.emf.common.notify.Notification;
-import org.eclipse.emf.ecore.EObject;
-import org.eclipse.emf.edit.ui.provider.AdapterFactoryLabelProvider;
-import org.eclipse.jdt.core.IJavaProject;
-import org.eclipse.jem.util.emf.workbench.ProjectUtilities;
-import org.eclipse.jface.viewers.ILabelProviderListener;
-import org.eclipse.jst.j2ee.common.internal.util.CommonUtil;
-import org.eclipse.jst.j2ee.internal.ejb.provider.J2EEJavaClassProviderHelper;
-import org.eclipse.jst.j2ee.internal.plugin.J2EEUIPlugin;
-import org.eclipse.jst.j2ee.internal.provider.J2EEAdapterFactoryLabelProvider;
-import org.eclipse.swt.graphics.Image;
-import org.eclipse.ui.IMemento;
-import org.eclipse.ui.navigator.ICommonContentExtensionSite;
-import org.eclipse.ui.navigator.ICommonLabelProvider;
-import org.eclipse.wst.common.internal.emfworkbench.integration.DynamicAdapterFactory;
-
-/**
- * <p>
- * The following class is experimental until fully documented.
- * </p>
- */
-public class J2EELabelProvider implements ICommonLabelProvider {
-
- private AdapterFactoryLabelProvider delegateLabelProvider;
-
- /**
- *
- */
- public J2EELabelProvider() {
- super();
- }
-
- /**
- *
- */
- public J2EELabelProvider(String aViewerId) {
- super();
- initialize(aViewerId);
- }
-
- public void initialize(String aViewerId) {
- delegateLabelProvider = new J2EEAdapterFactoryLabelProvider(new DynamicAdapterFactory(aViewerId));
- }
-
- /*
- * (non-Javadoc)
- *
- * @see org.eclipse.wst.common.navigator.internal.views.extensions.ICommonLabelProvider#getDescription(java.lang.Object)
- */
- public String getDescription(Object anElement) {
- if (anElement != null && anElement instanceof EObject) {
- EObject eObj = (EObject) anElement;
- if (CommonUtil.isDeploymentDescriptorRoot(eObj, true /* include ears */)) {
- IProject parent = ProjectUtilities.getProject(eObj);
- if(eObj.eResource() != null) {
- String path = new Path(eObj.eResource().getURI().toString()).makeRelative().toString();
- if (parent == null)
- return path;
- int startIndex = path.indexOf(parent.getFullPath().toString());
- return -1 == startIndex ? path : path.substring(startIndex);
- }
- return getText(eObj);
- }
- }
- return null;
- }
-
- /**
- * @param listener
- */
- public void addListener(ILabelProviderListener listener) {
- if (delegateLabelProvider != null)
- delegateLabelProvider.addListener(listener);
- }
-
- /**
- *
- */
- public void dispose() {
- if (delegateLabelProvider != null)
- delegateLabelProvider.dispose();
- }
-
- /*
- * (non-Javadoc)
- *
- * @see java.lang.Object#equals(java.lang.Object)
- */
- @Override
- public boolean equals(Object obj) {
- if (delegateLabelProvider != null)
- return delegateLabelProvider.equals(obj);
- return false;
- }
-
- /**
- *
- */
- public void fireLabelProviderChanged() {
- if (delegateLabelProvider != null)
- delegateLabelProvider.fireLabelProviderChanged();
- }
-
- /**
- * @return
- */
- public AdapterFactory getAdapterFactory() {
- if (delegateLabelProvider != null)
- return delegateLabelProvider.getAdapterFactory();
- return null;
- }
-
- /**
- * @param object
- * @param columnIndex
- * @return
- */
- public Image getColumnImage(Object object, int columnIndex) {
- if (delegateLabelProvider != null)
- return delegateLabelProvider.getColumnImage(object, columnIndex);
- return null;
- }
-
- /**
- * @param object
- * @param columnIndex
- * @return
- */
- public String getColumnText(Object object, int columnIndex) {
- if (delegateLabelProvider != null)
- return delegateLabelProvider.getColumnText(object, columnIndex);
- return null;
- }
-
- /**
- * @param element
- * @return
- */
- public Image getImage(Object element) {
- if(element instanceof J2EEJavaClassProviderHelper)
- return ((J2EEJavaClassProviderHelper) element).getImage();
- if (element instanceof File)
- return J2EEUIPlugin.getDefault().getImage("jar_obj"); //$NON-NLS-1$
- if(element instanceof LoadingDDNode)
- return ((LoadingDDNode)element).getImage();
- if (element instanceof IProject || element instanceof IJavaProject)
- return null;
- if (delegateLabelProvider != null)
- return delegateLabelProvider.getImage(element);
- return null;
- }
-
- /**
- * @param element
- * @return
- */
- public String getText(Object element) {
- if(element instanceof J2EEJavaClassProviderHelper)
- return ((J2EEJavaClassProviderHelper) element).getText();
- if (element instanceof File)
- return ((File)element).getName();
- if (element instanceof IProject)
- return ((IProject)element).getName();
- if(element instanceof LoadingDDNode)
- return ((LoadingDDNode)element).getText();
- if (delegateLabelProvider != null)
- return delegateLabelProvider.getText(element);
- return null;
- }
-
- /*
- * (non-Javadoc)
- *
- * @see java.lang.Object#hashCode()
- */
- @Override
- public int hashCode() {
- if (delegateLabelProvider != null)
- return delegateLabelProvider.hashCode();
- return super.hashCode();
- }
-
- /**
- * @param object
- * @param id
- * @return
- */
- public boolean isLabelProperty(Object object, String id) {
- if (delegateLabelProvider != null)
- return delegateLabelProvider.isLabelProperty(object, id);
- return false;
- }
-
- /**
- * @param notification
- */
- public void notifyChanged(Notification notification) {
- if (delegateLabelProvider != null)
- delegateLabelProvider.notifyChanged(notification);
- }
-
- /**
- * @param listener
- */
- public void removeListener(ILabelProviderListener listener) {
- if (delegateLabelProvider != null)
- delegateLabelProvider.removeListener(listener);
- }
-
- /**
- * @param adapterFactory
- */
- public void setAdapterFactory(AdapterFactory adapterFactory) {
- if (delegateLabelProvider != null)
- delegateLabelProvider.setAdapterFactory(adapterFactory);
- }
-
- /*
- * (non-Javadoc)
- *
- * @see java.lang.Object#toString()
- */
- @Override
- public String toString() {
- if (delegateLabelProvider != null)
- return delegateLabelProvider.toString();
- return super.toString();
- }
-
- public void init(ICommonContentExtensionSite aSite) {
- initialize(IJ2EENavigatorConstants.VIEWER_ID);
-
- }
-
- public void restoreState(IMemento aMemento) {
- }
-
- public void saveState(IMemento aMemento) {
- }
-}
diff --git a/plugins/org.eclipse.jst.j2ee.navigator.ui/j2ee-navigator/org/eclipse/jst/j2ee/navigator/internal/J2EENavigationLabelProvider.java b/plugins/org.eclipse.jst.j2ee.navigator.ui/j2ee-navigator/org/eclipse/jst/j2ee/navigator/internal/J2EENavigationLabelProvider.java
deleted file mode 100644
index 0820d93..0000000
--- a/plugins/org.eclipse.jst.j2ee.navigator.ui/j2ee-navigator/org/eclipse/jst/j2ee/navigator/internal/J2EENavigationLabelProvider.java
+++ /dev/null
@@ -1,33 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2003, 2005 IBM Corporation and others.
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
- *
- * Contributors:
- * IBM Corporation - initial API and implementation
- *******************************************************************************/
-/*
- * Created on Nov 21, 2003
- *
- * To change the template for this generated file go to
- * Window - Preferences - Java - Code Generation - Code and Comments
- */
-package org.eclipse.jst.j2ee.navigator.internal;
-
-import org.eclipse.emf.common.notify.AdapterFactory;
-import org.eclipse.jst.j2ee.internal.provider.J2EEAdapterFactoryLabelProvider;
-
-/**
- * @author Administrator
- *
- * To change the template for this generated type comment go to Window - Preferences - Java - Code
- * Generation - Code and Comments
- */
-public class J2EENavigationLabelProvider extends J2EEAdapterFactoryLabelProvider {
-
- public J2EENavigationLabelProvider(AdapterFactory adapterFactory) {
- super(adapterFactory);
- }
-}
diff --git a/plugins/org.eclipse.jst.j2ee.navigator.ui/j2ee-navigator/org/eclipse/jst/j2ee/navigator/internal/J2EEProjectDecorator.java b/plugins/org.eclipse.jst.j2ee.navigator.ui/j2ee-navigator/org/eclipse/jst/j2ee/navigator/internal/J2EEProjectDecorator.java
deleted file mode 100644
index fb95f04..0000000
--- a/plugins/org.eclipse.jst.j2ee.navigator.ui/j2ee-navigator/org/eclipse/jst/j2ee/navigator/internal/J2EEProjectDecorator.java
+++ /dev/null
@@ -1,154 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2005, 2006 IBM Corporation and others.
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
- *
- * Contributors:
- * IBM Corporation - initial API and implementation
- *******************************************************************************/
-package org.eclipse.jst.j2ee.navigator.internal;
-
-import java.net.URL;
-
-import org.eclipse.core.resources.IProject;
-import org.eclipse.core.runtime.CoreException;
-import org.eclipse.core.runtime.FileLocator;
-import org.eclipse.core.runtime.IPath;
-import org.eclipse.core.runtime.Path;
-import org.eclipse.core.runtime.Platform;
-import org.eclipse.jdt.core.IJavaProject;
-import org.eclipse.jface.resource.ImageDescriptor;
-import org.eclipse.jface.viewers.IDecoration;
-import org.eclipse.jface.viewers.ILightweightLabelDecorator;
-import org.eclipse.jface.viewers.LabelProvider;
-import org.eclipse.jst.j2ee.navigator.internal.plugin.J2EENavigatorPlugin;
-import org.eclipse.wst.common.project.facet.core.FacetedProjectFramework;
-
-/**
- * J2EEProjectDecorator
- */
-public class J2EEProjectDecorator extends LabelProvider implements ILightweightLabelDecorator {
-
- private static ImageDescriptor EAR;
- private static ImageDescriptor APPCLIENT;
- private static ImageDescriptor DYNAMICWEB;
- private static ImageDescriptor EJB;
- private static ImageDescriptor CONNECTOR;
- private static ImageDescriptor WEBFRAGMENT;
-
- /* The constants are duplicated here to avoid plugin loading. */
- private static final String EAR_FACET = "jst.ear"; //$NON-NLS-1$
- private static final String APPCLIENT_FACET = "jst.appclient"; //$NON-NLS-1$
- private static final String WEB_FACET = "jst.web"; //$NON-NLS-1$
- private static final String EJB_FACET = "jst.ejb"; //$NON-NLS-1$
- private static final String CONNECTOR_FACET = "jst.connector"; //$NON-NLS-1$
- private static final String STATIC_WEB_FACET = "wst.web"; //$NON-NLS-1$
- private static final String WEB_FRAGMENT_FACET = "jst.webfragment"; //$NON-NLS-1$
-
- private static final String ICON_DIR = "icons/full/ovr16"; //$NON-NLS-1$
-
-
- public J2EEProjectDecorator() {
- super();
- }
-
- public void decorate(Object element, IDecoration decoration) {
- IProject project = null;
- if(element instanceof IProject) {
- project = (IProject) element;
- } else if(element instanceof IJavaProject) {
- project = ((IJavaProject)element).getProject();
- }
- if (project != null) {
- ImageDescriptor overlay = null;
- if (hasFacet(project, EAR_FACET))
- overlay=getEAR();
- else if (hasFacet(project, APPCLIENT_FACET))
- overlay=getAPPCLIENT();
- else if (hasFacet(project, WEB_FACET))
- overlay=getDYNAMICWEB();
- else if (hasFacet(project, EJB_FACET))
- overlay=getEJB();
- else if (hasFacet(project, CONNECTOR_FACET))
- overlay=getCONNECTOR();
- else if (hasFacet(project, STATIC_WEB_FACET))
- overlay=getDYNAMICWEB();
- else if (hasFacet(project, WEB_FRAGMENT_FACET))
- overlay=getWEBFRAGMENT();
-
- // keep it null for if (hasFacet(project, UTILITY_FACET))
- if (overlay != null)
- decoration.addOverlay(overlay);
- }
- }
-
- private boolean hasFacet(IProject project, String facet) {
- try {
- return FacetedProjectFramework.hasProjectFacet(project, facet);
- } catch (CoreException e) {
- J2EENavigatorPlugin.logError(0, e.getMessage(), e);
- return false;
- }
- }
-
- /**
- * This gets a .gif from the icons folder.
- */
- private static ImageDescriptor getImageDescriptor(String key) {
- ImageDescriptor imageDescriptor = null;
- if (key != null) {
- String gif = "/" + key + ".gif"; //$NON-NLS-1$ //$NON-NLS-2$
- IPath path = new Path(ICON_DIR).append(gif);
- URL gifImageURL = FileLocator.find(Platform.getBundle(J2EENavigatorPlugin.PLUGIN_ID), path, null);
- if (gifImageURL != null)
- imageDescriptor = ImageDescriptor.createFromURL(gifImageURL);
- }
- return imageDescriptor;
- }
-
- private static ImageDescriptor getEAR() {
- if (EAR == null) {
- EAR = getImageDescriptor("enterprise_app_ovr"); //$NON-NLS-1$
- }
- return EAR;
- }
-
- private static ImageDescriptor getAPPCLIENT() {
- if (APPCLIENT == null) {
- APPCLIENT = getImageDescriptor("client_app_ovr"); //$NON-NLS-1$
- }
- return APPCLIENT;
- }
-
- private static ImageDescriptor getDYNAMICWEB() {
- if (DYNAMICWEB == null) {
- DYNAMICWEB = getImageDescriptor("web_module_ovr"); //$NON-NLS-1$
- }
- return DYNAMICWEB;
- }
-
- private static ImageDescriptor getWEBFRAGMENT() {
- if (WEBFRAGMENT == null) {
- WEBFRAGMENT = getImageDescriptor("webfragmentoverlayicon"); //$NON-NLS-1$
- }
- return WEBFRAGMENT;
- }
-
- private static ImageDescriptor getEJB() {
- if (EJB == null) {
- EJB = getImageDescriptor("ejb_module_ovr"); //$NON-NLS-1$
- }
- return EJB;
- }
-
- private static ImageDescriptor getCONNECTOR() {
- if (CONNECTOR == null) {
- CONNECTOR = getImageDescriptor("connector_ovr"); //$NON-NLS-1$
- }
- return CONNECTOR;
- }
-
-}
-
diff --git a/plugins/org.eclipse.jst.j2ee.navigator.ui/j2ee-navigator/org/eclipse/jst/j2ee/navigator/internal/J2EEViewerSorter.java b/plugins/org.eclipse.jst.j2ee.navigator.ui/j2ee-navigator/org/eclipse/jst/j2ee/navigator/internal/J2EEViewerSorter.java
deleted file mode 100644
index d094b9d..0000000
--- a/plugins/org.eclipse.jst.j2ee.navigator.ui/j2ee-navigator/org/eclipse/jst/j2ee/navigator/internal/J2EEViewerSorter.java
+++ /dev/null
@@ -1,85 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2003, 2006 IBM Corporation and others.
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
- *
- * Contributors:
- * IBM Corporation - initial API and implementation
- *******************************************************************************/
-package org.eclipse.jst.j2ee.navigator.internal;
-
-
-import org.eclipse.core.resources.IFile;
-import org.eclipse.jface.viewers.Viewer;
-import org.eclipse.jface.viewers.ViewerSorter;
-import org.eclipse.jst.j2ee.common.internal.util.CommonUtil;
-import org.eclipse.jst.j2ee.ejb.EnterpriseBean;
-
-
-public class J2EEViewerSorter extends ViewerSorter {
-
- /**
- * Constructor for J2EEViewerSorter.
- */
- public J2EEViewerSorter() {
- super();
- }
-
- private static final String WST = "org.eclipse.wst"; //$NON-NLS-1$
- private static final String JST = "org.eclipse.jst"; //$NON-NLS-1$
-
- /**
- * @see ViewerSorter#compare(Viewer, Object, Object)
- */
- @Override
- public int compare(Viewer viewer, Object e1, Object e2) {
- // Check to see if each object is a base WST or JST core contribution
- boolean e1_isCore = isCore(e1);
- boolean e2_isCore = isCore(e2);
- // If both elements are from the same category, do default comparison
- if (e1_isCore == e2_isCore)
- return super.compare(viewer, e1, e2);
- // If e1 is core, but not e2, e1 is less than e2
- else if (e1_isCore)
- return -1;
- // If e1 is not core, but e2 is, e1 is greater than e2
- else
- return 1;
- }
-
- /**
- * Any contribution from the base JST or WST packages is considered core, everything else is
- * an extension
- * @param element
- * @return boolean is Contribution Core?
- */
- private boolean isCore(Object element) {
- if (element != null) {
- Class clazz = element.getClass();
- if (clazz != null) {
- Package pack = clazz.getPackage();
- if (pack != null) {
- String packageName = pack.getName();
- return packageName!=null && (packageName.startsWith(WST) || packageName.startsWith(JST));
- }
- }
- }
- return false;
- }
-
- protected boolean isEnterpriseBean(Object o) {
- return o instanceof EnterpriseBean;
- }
-
- protected boolean isDeploymentDescriptorRoot(Object o) {
- return CommonUtil.isDeploymentDescriptorRoot(o);
- }
-
- protected boolean shouldSort(Object e1, Object e2) {
- return (isDeploymentDescriptorRoot(e1) && isDeploymentDescriptorRoot(e2)) || (isEnterpriseBean(e1) && isEnterpriseBean(e2)) || ((e1 instanceof IFile) && (e2 instanceof IFile));
- }
-
-
-}
diff --git a/plugins/org.eclipse.jst.j2ee.navigator.ui/j2ee-navigator/org/eclipse/jst/j2ee/navigator/internal/LoadingDDJob.java b/plugins/org.eclipse.jst.j2ee.navigator.ui/j2ee-navigator/org/eclipse/jst/j2ee/navigator/internal/LoadingDDJob.java
deleted file mode 100644
index fde69bc..0000000
--- a/plugins/org.eclipse.jst.j2ee.navigator.ui/j2ee-navigator/org/eclipse/jst/j2ee/navigator/internal/LoadingDDJob.java
+++ /dev/null
@@ -1,69 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2003, 2006 IBM Corporation and others.
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
- *
- * Contributors:
- * IBM Corporation - initial API and implementation
- *******************************************************************************/
-package org.eclipse.jst.j2ee.navigator.internal;
-
-import java.util.ArrayList;
-import java.util.List;
-
-import org.eclipse.core.resources.IProject;
-import org.eclipse.core.runtime.IAdaptable;
-import org.eclipse.core.runtime.IProgressMonitor;
-import org.eclipse.core.runtime.IStatus;
-import org.eclipse.core.runtime.Status;
-import org.eclipse.core.runtime.jobs.Job;
-import org.eclipse.jface.viewers.AbstractTreeViewer;
-
-public class LoadingDDJob extends Job {
-
- private static final Class IPROJECT_CLASS = IProject.class;
-
- private EMFRootObjectProvider rootObjectProvider;
- private LoadingDDNode placeHolder;
- private AbstractTreeViewer viewer;
- private IAdaptable parent;
-
- public LoadingDDJob(AbstractTreeViewer viewer, LoadingDDNode placeHolder, IAdaptable parent, EMFRootObjectProvider rootObjectProvider) {
- super(placeHolder.getText());
- this.viewer = viewer;
- this.placeHolder = placeHolder;
- this.parent = parent;
- this.rootObjectProvider = rootObjectProvider;
- setRule(new NonConflictingRule());
- }
-
- @Override
- protected IStatus run(IProgressMonitor monitor) {
-
- LoadingDDUIJob updateUIJob = new LoadingDDUIJob(viewer, placeHolder);
- updateUIJob.schedule();
-
- List children = new ArrayList();
-
- try {
- IProject project = (IProject) parent.getAdapter(IPROJECT_CLASS);
- Object[] rootObjects = (rootObjectProvider != null) ? rootObjectProvider.getModels(project) : null;
- if (rootObjects != null) {
- for (int x=0; x< rootObjects.length ; ++x) {
- children.add(rootObjects[x]);
- }
-
- }
- } finally {
- /* dispose of the place holder, causes the termination of the animation job */
- placeHolder.dispose();
- new ClearPlaceHolderJob(viewer, placeHolder, parent, children.toArray()).schedule();
- }
-
-
- return Status.OK_STATUS;
- }
-
-}
diff --git a/plugins/org.eclipse.jst.j2ee.navigator.ui/j2ee-navigator/org/eclipse/jst/j2ee/navigator/internal/LoadingDDNode.java b/plugins/org.eclipse.jst.j2ee.navigator.ui/j2ee-navigator/org/eclipse/jst/j2ee/navigator/internal/LoadingDDNode.java
deleted file mode 100644
index b8000ee..0000000
--- a/plugins/org.eclipse.jst.j2ee.navigator.ui/j2ee-navigator/org/eclipse/jst/j2ee/navigator/internal/LoadingDDNode.java
+++ /dev/null
@@ -1,160 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2003, 2006 IBM Corporation and others.
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
- *
- * Contributors:
- * IBM Corporation - initial API and implementation
- *******************************************************************************/
-package org.eclipse.jst.j2ee.navigator.internal;
-
-import java.util.HashMap;
-import java.util.HashSet;
-import java.util.Map;
-import java.util.Set;
-
-import org.eclipse.core.resources.IProject;
-import org.eclipse.jface.resource.ImageDescriptor;
-import org.eclipse.jst.j2ee.internal.navigator.ui.Messages;
-import org.eclipse.jst.j2ee.navigator.internal.plugin.J2EENavigatorPlugin;
-import org.eclipse.osgi.util.NLS;
-import org.eclipse.swt.graphics.Image;
-import org.eclipse.wst.common.ui.internal.navigator.ILoadingDDNode;
-
-public class LoadingDDNode implements ILoadingDDNode{
-
- private static ImageDescriptor loadingOne;
- private static ImageDescriptor loadingTwo;
- private static ImageDescriptor loadingThree;
- private static ImageDescriptor loadingFour;
-
-
- private static final Set loadingFiles = new HashSet();
- private static final Map placeHolders = new HashMap();
-
- static {
- try {
- loadingOne = J2EENavigatorPlugin.getDefault().getImageDescriptor("full/etool16/loading1.gif"); //$NON-NLS-1$
- loadingTwo = J2EENavigatorPlugin.getDefault().getImageDescriptor("full/etool16/loading2.gif"); //$NON-NLS-1$
- loadingThree = J2EENavigatorPlugin.getDefault().getImageDescriptor("full/etool16/loading3.gif"); //$NON-NLS-1$
- loadingFour = J2EENavigatorPlugin.getDefault().getImageDescriptor("full/etool16/loading4.gif"); //$NON-NLS-1$
- } catch (RuntimeException e) {
- String msg = e.getMessage() != null ? e.getMessage() : e.toString();
- J2EENavigatorPlugin.logError(0, msg, e);
- loadingOne = ImageDescriptor.getMissingImageDescriptor();
- loadingTwo = ImageDescriptor.getMissingImageDescriptor();
- loadingThree = ImageDescriptor.getMissingImageDescriptor();
- loadingFour = ImageDescriptor.getMissingImageDescriptor();
- }
- }
-
- private String text;
- private String text1;
- private String text2;
- private String text3;
- private int count = 0;
-
- private boolean disposed = false;
- private IProject modelProject;
-
-
- /**
- * Return a place holder node to sit in the tree until data is available.
- * This place holder node will be animated for the user's enjoyment.
- *
- * @param modelFile The modelFile to be loaded
- * @return A new unique place holder for this file for a given load cycle
- */
- public static LoadingDDNode createPlaceHolder(IProject modelFile) {
- LoadingDDNode node = null;
- synchronized (LoadingDDNode.class) {
- if(placeHolders.containsKey(modelFile))
- node = (LoadingDDNode) placeHolders.get(modelFile);
- else
- placeHolders.put(modelFile, node = new LoadingDDNode(modelFile));
- }
- return node;
- }
-
- public LoadingDDNode(IProject model) {
- text = NLS.bind(Messages.LoadingDDNode_Loading_0_, model.getName());
- text1 = text + "."; //$NON-NLS-1$
- text2 = text + ".."; //$NON-NLS-1$
- text3 = text + "..."; //$NON-NLS-1$
- modelProject = model;
- }
-
- public String getText() {
-
- switch ( count % 4) {
- case 0 :
- return text;
- case 1 :
- return text1;
- case 2 :
- return text2;
- case 3 :
- default :
- return text3;
- }
- }
-
- public Image getImage() {
- switch ( count = (++count % 4)) {
- case 0 :
- return J2EENavigatorPlugin.getDefault().getImage(loadingOne);
- case 1 :
- return J2EENavigatorPlugin.getDefault().getImage(loadingTwo);
- case 2 :
- return J2EENavigatorPlugin.getDefault().getImage(loadingThree);
- case 3 :
- default :
- return J2EENavigatorPlugin.getDefault().getImage(loadingFour);
- }
- }
-
-
-
- public boolean isDisposed() {
- return disposed;
- }
-
- public void dispose() {
- synchronized (LoadingDDNode.class) {
- disposed = true;
- placeHolders.remove(modelProject);
- loadingFiles.remove(modelProject);
- }
- }
-
- /**
- * Employ a Test and Set (TST) primitive to ensure
- * that only job is spawned to load the model file
- *
- *
- * @return True only if no other jobs are trying to load this model.
- */
- public static boolean canBeginLoading(IProject modelProject) {
- synchronized (LoadingDDNode.class) {
- if(loadingFiles.contains(modelProject))
- return false;
- loadingFiles.add(modelProject);
- return true;
- }
-
- }
-
- /**
- * Return true if a job has requested permission to load the model file
- * @param modelFile The model file that should be loaded
- * @return True only if a job is trying to load the model.
- */
- public static boolean isBeingLoaded(IProject modelProject) {
- synchronized (LoadingDDNode.class) {
- return loadingFiles.contains(modelProject);
- }
- }
-
-}
diff --git a/plugins/org.eclipse.jst.j2ee.navigator.ui/j2ee-navigator/org/eclipse/jst/j2ee/navigator/internal/LoadingDDUIJob.java b/plugins/org.eclipse.jst.j2ee.navigator.ui/j2ee-navigator/org/eclipse/jst/j2ee/navigator/internal/LoadingDDUIJob.java
deleted file mode 100644
index 29eab0b..0000000
--- a/plugins/org.eclipse.jst.j2ee.navigator.ui/j2ee-navigator/org/eclipse/jst/j2ee/navigator/internal/LoadingDDUIJob.java
+++ /dev/null
@@ -1,45 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2003, 2007 IBM Corporation and others.
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
- *
- * Contributors:
- * IBM Corporation - initial API and implementation
- *******************************************************************************/
-package org.eclipse.jst.j2ee.navigator.internal;
-
-import org.eclipse.core.runtime.IProgressMonitor;
-import org.eclipse.core.runtime.IStatus;
-import org.eclipse.core.runtime.Status;
-import org.eclipse.jface.viewers.StructuredViewer;
-import org.eclipse.ui.progress.UIJob;
-
-public class LoadingDDUIJob extends UIJob {
-
- private static final long DELAY = 200;
-
- private LoadingDDNode placeHolder;
- private StructuredViewer viewer;
-
- public LoadingDDUIJob(StructuredViewer viewer, LoadingDDNode placeHolder) {
- super(placeHolder.getText());
- this.viewer = viewer;
- this.placeHolder = placeHolder;
- setSystem(true);
- setRule(new NonConflictingRule());
- }
-
- @Override
- public IStatus runInUIThread(IProgressMonitor monitor) {
-
- if(!placeHolder.isDisposed()) {
- viewer.refresh(placeHolder, true);
- schedule(DELAY);
- }
- return Status.OK_STATUS;
-
- }
-
-}
diff --git a/plugins/org.eclipse.jst.j2ee.navigator.ui/j2ee-navigator/org/eclipse/jst/j2ee/navigator/internal/NonConflictingRule.java b/plugins/org.eclipse.jst.j2ee.navigator.ui/j2ee-navigator/org/eclipse/jst/j2ee/navigator/internal/NonConflictingRule.java
deleted file mode 100644
index a02990c..0000000
--- a/plugins/org.eclipse.jst.j2ee.navigator.ui/j2ee-navigator/org/eclipse/jst/j2ee/navigator/internal/NonConflictingRule.java
+++ /dev/null
@@ -1,27 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2003, 2006 IBM Corporation and others.
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
- *
- * Contributors:
- * IBM Corporation - initial API and implementation
- *******************************************************************************/
-package org.eclipse.jst.j2ee.navigator.internal;
-
-import org.eclipse.core.runtime.jobs.ISchedulingRule;
-
-public class NonConflictingRule implements ISchedulingRule {
-
- public static final NonConflictingRule INSTANCE = new NonConflictingRule();
-
- public boolean contains(ISchedulingRule rule) {
- return rule == this;
- }
-
- public boolean isConflicting(ISchedulingRule rule) {
- return rule == this;
- }
-
-}
diff --git a/plugins/org.eclipse.jst.j2ee.navigator.ui/j2ee-navigator/org/eclipse/jst/j2ee/navigator/internal/NonFlexibleEMFModelManager.java b/plugins/org.eclipse.jst.j2ee.navigator.ui/j2ee-navigator/org/eclipse/jst/j2ee/navigator/internal/NonFlexibleEMFModelManager.java
deleted file mode 100644
index 69a0049..0000000
--- a/plugins/org.eclipse.jst.j2ee.navigator.ui/j2ee-navigator/org/eclipse/jst/j2ee/navigator/internal/NonFlexibleEMFModelManager.java
+++ /dev/null
@@ -1,130 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2005 IBM Corporation and others.
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
- *
- * Contributors:
- * IBM Corporation - initial API and implementation
- *******************************************************************************/
-/*
- * Created on Feb 17, 2005
- */
-package org.eclipse.jst.j2ee.navigator.internal;
-
-import org.eclipse.core.resources.IProject;
-import org.eclipse.emf.ecore.EObject;
-import org.eclipse.wst.common.internal.emfworkbench.integration.EditModel;
-import org.eclipse.wst.common.internal.emfworkbench.integration.EditModelEvent;
-import org.eclipse.wst.common.internal.emfworkbench.integration.EditModelListener;
-
-public class NonFlexibleEMFModelManager extends EMFModelManager implements EditModelListener{
-
- private EditModel editModel;
- private Object rootObject;
- private static final Object[] EMPTY_OBJECT = new Object[0];
- /**
- * @param aProject
- * @param provider
- */
- public NonFlexibleEMFModelManager(IProject aProject, EMFRootObjectProvider provider) {
- super(aProject, provider);
- }
-
- /* (non-Javadoc)
- * @see org.eclipse.jst.j2ee.navigator.internal.EMFModelManager#getModels()
- */
- @Override
- public Object[] getModels() {
- if (getProject() == null || !getProject().isAccessible())
- return EMPTY_OBJECT;
-
- //synchronized (rootObject) {
- if (rootObject == null || ((EObject) rootObject).eResource() == null) {
- EditModel editModel = getEditModel();
- if (editModel != null) {
- rootObject = editModel.getPrimaryRootObject();
- }
- }
- //}
- if (rootObject==null)
- return EMPTY_OBJECT;
- Object[] objects = new Object[1];
- objects[0] = rootObject;
- return objects;
- }
-
- /* (non-Javadoc)
- * @see org.eclipse.jst.j2ee.navigator.internal.EMFModelManager#dispose()
- */
- @Override
- public void dispose() {
- if (editModel != null) {
- editModel.removeListener(this);
- editModel.releaseAccess(this);
- editModel = null;
- }
- }
-
- /* (non-Javadoc)
- * @see org.eclipse.wst.common.internal.emfworkbench.integration.EditModelListener#editModelChanged(org.eclipse.wst.common.internal.emfworkbench.integration.EditModelEvent)
- */
- public void editModelChanged(EditModelEvent anEvent) {
- IProject affectedProject = anEvent.getEditModel().getProject();
- switch (anEvent.getEventCode()) {
- case EditModelEvent.UNLOADED_RESOURCE :
- case EditModelEvent.REMOVED_RESOURCE :
- if (rootObject != null){
- notifyListeners(affectedProject);
- }
- break;
- case EditModelEvent.SAVE : {
- if (rootObject == null)
- notifyListeners(affectedProject);
- }
- break;
- case EditModelEvent.PRE_DISPOSE :
- dispose();
- break;
- default :
- break;
- }
-
- }
-
-
-
- protected EditModel getEditModel() {
- IProject project = getProject();
- if (project == null)
- return null;
-
- //TODO fix up
- //synchronized (editModel) {
-// if (editModel == null && project.isAccessible()) {
-// //System.out.println("getEditModelForProject " + project.getName());
-// J2EENature nature = J2EENature.getRegisteredRuntime(project);
-// if (nature != null) {
-// editModel = nature.getJ2EEEditModelForRead(this);
-// if (editModel != null) {
-// editModel.addListener(this);
-// }
-// }
-// }
- //}
- return editModel;
- }
-
- protected void disposeCache(IProject affectedProject) {
- //synchronized (editModel) {
- if (editModel != null) {
- editModel.removeListener(this);
- editModel.releaseAccess(this);
- editModel = null;
- }
- //}
- }
-
-
-}
diff --git a/plugins/org.eclipse.jst.j2ee.navigator.ui/j2ee-navigator/org/eclipse/jst/j2ee/navigator/internal/WebResourcePropertyTester.java b/plugins/org.eclipse.jst.j2ee.navigator.ui/j2ee-navigator/org/eclipse/jst/j2ee/navigator/internal/WebResourcePropertyTester.java
deleted file mode 100644
index 4553f50..0000000
--- a/plugins/org.eclipse.jst.j2ee.navigator.ui/j2ee-navigator/org/eclipse/jst/j2ee/navigator/internal/WebResourcePropertyTester.java
+++ /dev/null
@@ -1,26 +0,0 @@
-package org.eclipse.jst.j2ee.navigator.internal;
-
-import org.eclipse.core.expressions.PropertyTester;
-import org.eclipse.core.resources.IResource;
-import org.eclipse.jst.j2ee.project.WebUtilities;
-
-public class WebResourcePropertyTester extends PropertyTester {
-
- private static final String WEB_RESOURCE = "webResource"; //$NON-NLS-1$
-
- public WebResourcePropertyTester() {
- }
-
- public boolean test(Object receiver, String property, Object[] args, Object expectedValue) {
- if (!(receiver instanceof IResource))
- return false;
-
- IResource resource = (IResource) receiver;
- if (WEB_RESOURCE.equals(property)) {
- return WebUtilities.isWebResource(resource);
- }
-
- return false;
- }
-
-}
diff --git a/plugins/org.eclipse.jst.j2ee.navigator.ui/j2ee-navigator/org/eclipse/jst/j2ee/navigator/internal/dnd/AddExternalUtilityJarDropAction.java b/plugins/org.eclipse.jst.j2ee.navigator.ui/j2ee-navigator/org/eclipse/jst/j2ee/navigator/internal/dnd/AddExternalUtilityJarDropAction.java
deleted file mode 100644
index 9afcaab..0000000
--- a/plugins/org.eclipse.jst.j2ee.navigator.ui/j2ee-navigator/org/eclipse/jst/j2ee/navigator/internal/dnd/AddExternalUtilityJarDropAction.java
+++ /dev/null
@@ -1,51 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2003, 2006 IBM Corporation and others.
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
- *
- * Contributors:
- * IBM Corporation - initial API and implementation
- *******************************************************************************/
-package org.eclipse.jst.j2ee.navigator.internal.dnd;
-
-import org.eclipse.swt.dnd.TransferData;
-import org.eclipse.ui.navigator.CommonDropAdapter;
-import org.eclipse.ui.navigator.resources.ResourceDropAdapterAssistant;
-
-/**
- * @author mdelder
- *
- */
-public class AddExternalUtilityJarDropAction extends ResourceDropAdapterAssistant {
-
- /*
- * (non-Javadoc)
- *
- * @see org.eclipse.ui.workbench.navigator.dnd.ResourceDropAction#validateDrop(org.eclipse.wst.common.navigator.internal.views.navigator.dnd.CommonNavigatorDropAdapter,
- * java.lang.Object, int, org.eclipse.swt.dnd.TransferData)
- */
- public boolean validateDrop(CommonDropAdapter dropAdapter, Object target, int operation, TransferData transferType) {
- //TODO redo with components
-// if (FileTransfer.getInstance().isSupportedType(transferType)) {
-// IProject project = (IProject) AdaptabilityUtility.getAdapter(target, IProject.class);
-// try {
-// if (project.hasNature(IEARNatureConstants.NATURE_ID)) {
-// String[] sourceNames = (String[]) FileTransfer.getInstance().nativeToJava(transferType);
-// if (sourceNames == null)
-// return true;
-//
-// boolean result = true;
-// for (int i = 0; i < sourceNames.length; i++)
-// if (!(result = sourceNames[0].endsWith(".jar")))break; //$NON-NLS-1$
-// return result;
-// }
-// return false;
-// } catch (CoreException e) {
-// return false;
-// }
-// }
- return false;
- }
-}
diff --git a/plugins/org.eclipse.jst.j2ee.navigator.ui/j2ee-navigator/org/eclipse/jst/j2ee/navigator/internal/dnd/AddProjectToEARDropAssistant.java b/plugins/org.eclipse.jst.j2ee.navigator.ui/j2ee-navigator/org/eclipse/jst/j2ee/navigator/internal/dnd/AddProjectToEARDropAssistant.java
deleted file mode 100644
index 2cd8c5a..0000000
--- a/plugins/org.eclipse.jst.j2ee.navigator.ui/j2ee-navigator/org/eclipse/jst/j2ee/navigator/internal/dnd/AddProjectToEARDropAssistant.java
+++ /dev/null
@@ -1,311 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2003, 2007 IBM Corporation and others.
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
- *
- * Contributors:
- * IBM Corporation - initial API and implementation
- *******************************************************************************/
-package org.eclipse.jst.j2ee.navigator.internal.dnd;
-
-import java.util.ArrayList;
-import java.util.HashMap;
-import java.util.Iterator;
-import java.util.List;
-import java.util.Map;
-
-import org.eclipse.core.commands.ExecutionException;
-import org.eclipse.core.commands.operations.IUndoableOperation;
-import org.eclipse.core.resources.IFile;
-import org.eclipse.core.resources.IProject;
-import org.eclipse.core.resources.IWorkspaceRoot;
-import org.eclipse.core.resources.ResourcesPlugin;
-import org.eclipse.core.runtime.CoreException;
-import org.eclipse.core.runtime.IAdaptable;
-import org.eclipse.core.runtime.IProgressMonitor;
-import org.eclipse.core.runtime.IStatus;
-import org.eclipse.core.runtime.Platform;
-import org.eclipse.core.runtime.Status;
-import org.eclipse.core.runtime.jobs.Job;
-import org.eclipse.emf.ecore.EObject;
-import org.eclipse.jem.util.emf.workbench.ProjectUtilities;
-import org.eclipse.jface.util.LocalSelectionTransfer;
-import org.eclipse.jface.viewers.ISelection;
-import org.eclipse.jface.viewers.IStructuredSelection;
-import org.eclipse.jst.j2ee.application.internal.operations.AddComponentToEnterpriseApplicationDataModelProvider;
-import org.eclipse.jst.j2ee.application.internal.operations.IAddComponentToEnterpriseApplicationDataModelProperties;
-import org.eclipse.jst.j2ee.internal.common.J2EEVersionUtil;
-import org.eclipse.jst.j2ee.internal.navigator.ui.Messages;
-import org.eclipse.jst.j2ee.internal.plugin.IJ2EEModuleConstants;
-import org.eclipse.jst.j2ee.internal.project.J2EEProjectUtilities;
-import org.eclipse.jst.j2ee.internal.provider.J2EEItemProvider;
-import org.eclipse.jst.j2ee.navigator.internal.plugin.J2EENavigatorPlugin;
-import org.eclipse.jst.j2ee.project.EarUtilities;
-import org.eclipse.jst.j2ee.project.JavaEEProjectUtilities;
-import org.eclipse.jst.j2ee.project.facet.IJ2EEFacetConstants;
-import org.eclipse.osgi.util.NLS;
-import org.eclipse.swt.dnd.DropTargetEvent;
-import org.eclipse.swt.dnd.TransferData;
-import org.eclipse.ui.PlatformUI;
-import org.eclipse.ui.navigator.CommonDropAdapter;
-import org.eclipse.ui.navigator.CommonDropAdapterAssistant;
-import org.eclipse.ui.part.PluginTransfer;
-import org.eclipse.ui.progress.IProgressService;
-import org.eclipse.wst.common.componentcore.ComponentCore;
-import org.eclipse.wst.common.componentcore.datamodel.properties.ICreateReferenceComponentsDataModelProperties;
-import org.eclipse.wst.common.componentcore.resources.IVirtualComponent;
-import org.eclipse.wst.common.frameworks.datamodel.DataModelFactory;
-import org.eclipse.wst.common.frameworks.datamodel.IDataModel;
-import org.eclipse.wst.common.project.facet.core.IFacetedProject;
-import org.eclipse.wst.common.project.facet.core.IProjectFacetVersion;
-import org.eclipse.wst.common.project.facet.core.ProjectFacetsManager;
-
-public class AddProjectToEARDropAssistant extends CommonDropAdapterAssistant {
-
- private static final Class IPROJECT_CLASS = IProject.class;
-
- public AddProjectToEARDropAssistant() {
- super();
- }
-
- @Override
- public boolean isSupportedType(TransferData aTransferType) {
- return LocalSelectionTransfer.getTransfer().isSupportedType(aTransferType);
- }
-
- @Override
- public IStatus handleDrop(CommonDropAdapter aDropAdapter, DropTargetEvent aDropTargetEvent, final Object aTarget) {
-
- if (LocalSelectionTransfer.getTransfer().isSupportedType(aDropAdapter.getCurrentTransfer())) {
-
- final IStructuredSelection selection = (IStructuredSelection) LocalSelectionTransfer.getTransfer().getSelection();
- IProgressService service = PlatformUI.getWorkbench().getProgressService();
-
- IProject earProject = getProject(aTarget);
- IVirtualComponent earComponent = ComponentCore.createComponent(earProject);
-
- Job addProjectToEarJob = new Job(getJobTitle(earComponent)) {
- @Override
- protected IStatus run(IProgressMonitor monitor) {
-
- IStatus status = null;
- try {
- IProject earProject = getProject(aTarget);
-
- List projects = new ArrayList();
-
- for (Iterator selectionIterator = selection.iterator(); selectionIterator.hasNext();) {
- Object sourceObject = selectionIterator.next();
-
- IProject projectToAdd = getProject(sourceObject);
- if (projectToAdd != null)
- projects.add(projectToAdd);
- }
-
- IDataModel dataModel = getAddModuleDataModel(earProject, projects);
- IUndoableOperation dropOperation = dataModel.getDefaultOperation();
- status = dropOperation.execute(monitor, null);
-
- if (!status.isOK())
- return status;
- } catch (ExecutionException e) {
- String msg = e.getMessage() != null ? e.getMessage() : e.toString();
- status = J2EENavigatorPlugin.createErrorStatus(0, msg, e);
- }
- return status;
- }
- };
- service.showInDialog(PlatformUI.getWorkbench().getActiveWorkbenchWindow().getShell(), addProjectToEarJob);
- addProjectToEarJob.setRule(ResourcesPlugin.getWorkspace().getRoot());
- addProjectToEarJob.schedule();
- }
- return Status.OK_STATUS;
- }
-
- @Override
- public IStatus validateDrop(Object target, int operation, TransferData transferType) {
-
- if (LocalSelectionTransfer.getTransfer().isSupportedType(transferType) || PluginTransfer.getInstance().isSupportedType(transferType)) {
- ISelection selection = LocalSelectionTransfer.getTransfer().getSelection();
- if (selection != null && !selection.isEmpty() && (selection instanceof IStructuredSelection)) {
-
- IStructuredSelection structuredSelection = (IStructuredSelection) selection;
- IProject earProject = getProject(target);
- int earVersion = getEarVersion(earProject);
- IStatus status = null;
- for(Iterator iterator = structuredSelection.iterator(); iterator.hasNext();) {
- Object next = iterator.next();
- IProject projectToAdd = getProject(next);
- if( (status = validateProjectMayBeAdded(earProject, projectToAdd, earVersion)).isOK())
- return status;
- }
- }
-
- }
- return Status.CANCEL_STATUS;
- }
-
- /**
- * @param target
- */
- private IStatus validateProjectMayBeAdded(IProject earProject, IProject projectToAdd, int earVersion) {
-
- if (earProject == null || projectToAdd == null || earVersion < 0)
- return J2EENavigatorPlugin.createErrorStatus(0, Messages.AddProjectToEARDropAssistant_Could_not_add_module_to_Enterprise_, null);
- else if (!earProject.isAccessible()) {
- return J2EENavigatorPlugin.createErrorStatus(0, NLS.bind(Messages.AddProjectToEARDropAssistant_The_project_0_cannot_be_accesse_, earProject.getName()), null);
- } else if (!projectToAdd.isAccessible()) {
- return J2EENavigatorPlugin.createErrorStatus(0, Messages.AddProjectToEARDropAssistant_The_dragged_project_cannot_be_added_, null);
- }
- else if (earVersion > 14){
- return J2EENavigatorPlugin.createErrorStatus(0, Messages.AddProjectToEARDropAssistant_Could_not_add_module_to_Enterprise_, null);
- }
-
- IStatus isValid = validateProjectToAdd(projectToAdd, earVersion);
- if (!isValid.isOK()) {
- return isValid;
- }
- // TODO Check if the project is already attached to the *.ear
- // if (editModel.hasMappingToProject(projectToAdd)) {
- // return false;
- // }
- return Status.OK_STATUS;
- }
-
- /**
- *
- * @return -1 on error
- */
- protected final int getEarVersion(IProject earProject) {
- int earVersion = -1;
-
- IFacetedProject facetedProject;
- try {
- facetedProject = ProjectFacetsManager.create(earProject);
- IProjectFacetVersion version = facetedProject.getProjectFacetVersion(EarUtilities.ENTERPRISE_APPLICATION_FACET);
- earVersion = J2EEVersionUtil.convertVersionStringToInt(version.getVersionString());
- } catch (CoreException e) {
- //nothing to do version cannot be determined since there is a problem with faceted project.
- J2EENavigatorPlugin.logError(0, e.getMessage(), e);
- }
- return earVersion;
- }
-
- /**
- * @param facetedProject
- * @return
- */
- protected final boolean hasEarFacet(IProject project) {
- IFacetedProject facetedProject = null;
- try {
- facetedProject = ProjectFacetsManager.create(project);
- } catch (CoreException e1) {
- }
- return facetedProject != null && facetedProject.hasProjectFacet(IJ2EEFacetConstants.ENTERPRISE_APPLICATION_FACET);
- }
-
- protected final String calculateValidProjectName(final String originalName) {
-
- IWorkspaceRoot root = ResourcesPlugin.getWorkspace().getRoot();
- String validName = originalName;
- int count = 1;
- while (root.getProject(validName).exists()) {
- validName = originalName + count++;
- }
- return validName;
- }
-
- protected IDataModel getAddModuleDataModel(IProject earProject, List projects) {
- IDataModel datamodel = DataModelFactory.createDataModel(new AddComponentToEnterpriseApplicationDataModelProvider());
-
- IVirtualComponent earComponent = ComponentCore.createComponent(earProject);
- Map componentToURIMap = new HashMap();
- List components = new ArrayList();
- IVirtualComponent moduleComponent = null;
- for(Iterator itr = projects.iterator(); itr.hasNext(); ) {
- moduleComponent = ComponentCore.createComponent((IProject)itr.next());
- components.add(moduleComponent);
- componentToURIMap.put(moduleComponent, getDefaultURI(moduleComponent));
- }
- datamodel.setProperty(ICreateReferenceComponentsDataModelProperties.SOURCE_COMPONENT, earComponent);
- datamodel.setProperty(ICreateReferenceComponentsDataModelProperties.TARGET_COMPONENT_LIST, components);
- datamodel.setProperty(IAddComponentToEnterpriseApplicationDataModelProperties.TARGET_COMPONENTS_TO_URI_MAP, componentToURIMap);
- return datamodel;
- }
-
- protected String getJobTitle(IVirtualComponent earComponent) {
- return NLS.bind(Messages.AddModuleToEarDropAssistant_Adding_module_to_ea_, earComponent.getName());
- }
-
- protected IStatus validateProjectToAdd(IProject projectToAdd, int earVersion) {
- try {
- // check if the project to add is not an EAR itself
- IFacetedProject facetedProject = ProjectFacetsManager.create(projectToAdd);
- if( facetedProject.hasProjectFacet(IJ2EEFacetConstants.ENTERPRISE_APPLICATION_FACET) )
- return Status.CANCEL_STATUS;
-
- // check if the project to add is with Java EE version equal or lesser than that of the EAR
- String verStr = J2EEProjectUtilities.getJ2EEProjectVersion(projectToAdd);
- if (verStr != null) {
- int version;
- if (JavaEEProjectUtilities.isApplicationClientProject(projectToAdd))
- version = J2EEVersionUtil.convertAppClientVersionStringToJ2EEVersionID(verStr);
- else if (JavaEEProjectUtilities.isEJBProject(projectToAdd))
- version = J2EEVersionUtil.convertEJBVersionStringToJ2EEVersionID(verStr);
- else if (JavaEEProjectUtilities.isDynamicWebProject(projectToAdd))
- version = J2EEVersionUtil.convertWebVersionStringToJ2EEVersionID(verStr);
- else if (JavaEEProjectUtilities.isJCAProject(projectToAdd))
- version = J2EEVersionUtil.convertConnectorVersionStringToJ2EEVersionID(verStr);
- else
- version = J2EEVersionUtil.convertVersionStringToInt(verStr);
-
- if (version > earVersion)
- return Status.CANCEL_STATUS;
- }
- } catch (CoreException e) {
- String msg = e.getMessage() != null ? e.getMessage() : e.toString();
- return J2EENavigatorPlugin.createErrorStatus(0, msg, e);
- }
- return Status.OK_STATUS;
-
- }
-
- protected static IProject getProject(Object element) {
- if (element == null)
- return null;
- IProject project = null;
- if (element instanceof IAdaptable)
- project = (IProject) ((IAdaptable) element).getAdapter(IPROJECT_CLASS);
- else
- project = (IProject) Platform.getAdapterManager().getAdapter(element, IPROJECT_CLASS);
- if (project == null) {
- if(element instanceof EObject) {
- project = ProjectUtilities.getProject((EObject) element);
- } else if (element instanceof J2EEItemProvider) {
- IFile associatedFile = ((J2EEItemProvider)element).getAssociatedFile();
- if(associatedFile != null)
- project = associatedFile.getProject();
- }
- }
- return project;
- }
-
- protected static String getDefaultURI(IVirtualComponent component) {
- IProject project = component.getProject();
- String name = component.getName();
-
- if (JavaEEProjectUtilities.isDynamicWebProject(project)) {
- name += IJ2EEModuleConstants.WAR_EXT;
- } else if (JavaEEProjectUtilities.isEARProject(project)) {
- name += IJ2EEModuleConstants.EAR_EXT;
- } else if (JavaEEProjectUtilities.isJCAProject(project)) {
- name += IJ2EEModuleConstants.RAR_EXT;
- } else {
- name += IJ2EEModuleConstants.JAR_EXT;
- }
- return name;
- }
-
-}
diff --git a/plugins/org.eclipse.jst.j2ee.navigator.ui/j2ee-navigator/org/eclipse/jst/j2ee/navigator/internal/dnd/IModuleExtensions.java b/plugins/org.eclipse.jst.j2ee.navigator.ui/j2ee-navigator/org/eclipse/jst/j2ee/navigator/internal/dnd/IModuleExtensions.java
deleted file mode 100644
index e0af278..0000000
--- a/plugins/org.eclipse.jst.j2ee.navigator.ui/j2ee-navigator/org/eclipse/jst/j2ee/navigator/internal/dnd/IModuleExtensions.java
+++ /dev/null
@@ -1,24 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2003, 2006 IBM Corporation and others.
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
- *
- * Contributors:
- * IBM Corporation - initial API and implementation
- *******************************************************************************/
-package org.eclipse.jst.j2ee.navigator.internal.dnd;
-
-import org.eclipse.jst.j2ee.internal.plugin.IJ2EEModuleConstants;
-
-//@deprecated @see org.eclipse.jst.j2ee.internal.plugin.IJ2EEModuleConstants
-
-public interface IModuleExtensions {
-
- public String DOT_WAR = IJ2EEModuleConstants.WAR_EXT;
- public String DOT_JAR = IJ2EEModuleConstants.JAR_EXT;
- public String DOT_RAR = IJ2EEModuleConstants.RAR_EXT;
- public String DOT_EAR = IJ2EEModuleConstants.EAR_EXT;
-
-}
diff --git a/plugins/org.eclipse.jst.j2ee.navigator.ui/j2ee-navigator/org/eclipse/jst/j2ee/navigator/internal/dnd/ImportJ2EEModuleDropAssistant.java b/plugins/org.eclipse.jst.j2ee.navigator.ui/j2ee-navigator/org/eclipse/jst/j2ee/navigator/internal/dnd/ImportJ2EEModuleDropAssistant.java
deleted file mode 100644
index bf3d679..0000000
--- a/plugins/org.eclipse.jst.j2ee.navigator.ui/j2ee-navigator/org/eclipse/jst/j2ee/navigator/internal/dnd/ImportJ2EEModuleDropAssistant.java
+++ /dev/null
@@ -1,209 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2003, 2007 IBM Corporation and others.
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
- *
- * Contributors:
- * IBM Corporation - initial API and implementation
- *******************************************************************************/
-package org.eclipse.jst.j2ee.navigator.internal.dnd;
-
-import java.io.File;
-import java.util.ArrayList;
-import java.util.List;
-
-import org.eclipse.core.commands.ExecutionException;
-import org.eclipse.core.commands.operations.IUndoableOperation;
-import org.eclipse.core.resources.IProject;
-import org.eclipse.core.resources.IWorkspaceRoot;
-import org.eclipse.core.resources.ResourcesPlugin;
-import org.eclipse.core.runtime.IProgressMonitor;
-import org.eclipse.core.runtime.IStatus;
-import org.eclipse.core.runtime.MultiStatus;
-import org.eclipse.core.runtime.Status;
-import org.eclipse.core.runtime.SubProgressMonitor;
-import org.eclipse.core.runtime.jobs.Job;
-import org.eclipse.jst.j2ee.application.internal.operations.EARComponentImportDataModelProvider;
-import org.eclipse.jst.j2ee.applicationclient.internal.creation.AppClientComponentImportDataModelProvider;
-import org.eclipse.jst.j2ee.commonarchivecore.internal.Archive;
-import org.eclipse.jst.j2ee.commonarchivecore.internal.CommonarchiveFactory;
-import org.eclipse.jst.j2ee.datamodel.properties.IJ2EEComponentImportDataModelProperties;
-import org.eclipse.jst.j2ee.internal.ejb.project.operations.EJBComponentImportDataModelProvider;
-import org.eclipse.jst.j2ee.internal.jca.operations.ConnectorComponentImportDataModelProvider;
-import org.eclipse.jst.j2ee.internal.navigator.ui.Messages;
-import org.eclipse.jst.j2ee.internal.plugin.IJ2EEModuleConstants;
-import org.eclipse.jst.j2ee.internal.web.archive.operations.WebComponentImportDataModelProvider;
-import org.eclipse.jst.j2ee.navigator.internal.plugin.J2EENavigatorPlugin;
-import org.eclipse.osgi.util.NLS;
-import org.eclipse.swt.dnd.DropTargetEvent;
-import org.eclipse.swt.dnd.FileTransfer;
-import org.eclipse.swt.dnd.TransferData;
-import org.eclipse.swt.widgets.Shell;
-import org.eclipse.ui.PlatformUI;
-import org.eclipse.ui.actions.CopyFilesAndFoldersOperation;
-import org.eclipse.ui.navigator.CommonDropAdapter;
-import org.eclipse.ui.progress.IProgressService;
-import org.eclipse.wst.common.componentcore.resources.IVirtualComponent;
-import org.eclipse.wst.common.frameworks.datamodel.DataModelFactory;
-import org.eclipse.wst.common.frameworks.datamodel.IDataModel;
-
-public class ImportJ2EEModuleDropAssistant extends AddProjectToEARDropAssistant {
-
- @Override
- public boolean isSupportedType(TransferData aTransferType) {
- return FileTransfer.getInstance().isSupportedType(aTransferType);
- }
-
- @Override
- public IStatus handleDrop(CommonDropAdapter aDropAdapter, final DropTargetEvent aDropTargetEvent, final Object aTarget) {
-
- if(FileTransfer.getInstance().isSupportedType(aDropAdapter.getCurrentTransfer())) {
-
- final Shell shell = getShell();
-
- IProgressService service = PlatformUI.getWorkbench().getProgressService();
- Job importArtifactsJob = new Job(Messages.ImportJ2EEModuleDropAssistant_Importing_Java_Enterprise_Edition_artifacts) {
- @Override
- protected IStatus run(IProgressMonitor monitor) {
-
- IProject targetEARProject = getProject(aTarget);
- if(targetEARProject != null) {
- /* If this isn't an ear project, we can't add the newly created modules to it. */
- if(!hasEarFacet(targetEARProject))
- targetEARProject = null;
- } /* otherwise we assume the IWorkspaceRoot and just don't add the new modules an an existing ear */
-
- String[] names = (String[]) aDropTargetEvent.data;
-
- monitor.beginTask(Messages.ImportJ2EEModuleDropAssistant_Importing_Java_Enterprise_Edition_artifacts, names.length);
- final MultiStatus status = new MultiStatus(J2EENavigatorPlugin.PLUGIN_ID, 0, Messages.ImportJ2EEModuleDropAssistant_Importing_Java_Enterprise_Edition_artifacts, null);
-
- SubProgressMonitor submonitor = new SubProgressMonitor(monitor, 10);
- IDataModel importDataModel = null;
- boolean performSimpleJarCopy = false;
- List simpleJarsToCopyList = null;
- IWorkspaceRoot root = ResourcesPlugin.getWorkspace().getRoot();
- List createdComponents = new ArrayList();
- for(int i=0; i<names.length && !monitor.isCanceled(); i++) {
- try {
- importDataModel = null;
- performSimpleJarCopy = false;
- int separatorIndex = names[i].lastIndexOf(File.separatorChar);
- int dotIndex = names[i].lastIndexOf('.');
- if(separatorIndex > 0 && separatorIndex+1 < dotIndex) {
- String filename = names[i].substring(separatorIndex+1, dotIndex);
- if(root.getProject(filename).exists()) {
- filename = calculateValidProjectName(filename);
- }
- String extension = names[i].substring(dotIndex);
- if(IJ2EEModuleConstants.WAR_EXT.equals(extension)) {
- importDataModel = DataModelFactory.createDataModel(new WebComponentImportDataModelProvider());
- } else if(IJ2EEModuleConstants.RAR_EXT.equals(extension)) {
- importDataModel = DataModelFactory.createDataModel(new ConnectorComponentImportDataModelProvider());
- } else if(IJ2EEModuleConstants.EAR_EXT.equals(extension)) {
- importDataModel = DataModelFactory.createDataModel(new EARComponentImportDataModelProvider());
- } else if(IJ2EEModuleConstants.JAR_EXT.equals(extension)) {
- Archive archive = null;
- try {
- archive = CommonarchiveFactory.eINSTANCE.openArchive(names[i]);
- if(archive.isApplicationClientFile())
- importDataModel = DataModelFactory.createDataModel(new AppClientComponentImportDataModelProvider());
- else if(archive.isEJBJarFile())
- importDataModel = DataModelFactory.createDataModel(new EJBComponentImportDataModelProvider());
- else {
- performSimpleJarCopy = true; //handle Utility jars as regular jars.
- if(simpleJarsToCopyList == null){
- simpleJarsToCopyList = new ArrayList();
- simpleJarsToCopyList.add(names[i]);
- }
- }
-
- } finally {
- if(archive != null)
- archive.close();
- }
- }
-
- if(importDataModel != null) {
- importDataModel.setStringProperty(IJ2EEComponentImportDataModelProperties.FILE_NAME, names[i]);
- importDataModel.setStringProperty(IJ2EEComponentImportDataModelProperties.PROJECT_NAME, filename);
- importDataModel.getDefaultOperation().execute(submonitor, null);
-
- createdComponents.add(importDataModel.getProperty(IJ2EEComponentImportDataModelProperties.COMPONENT));
-
- } else if(!performSimpleJarCopy){
- status.add(J2EENavigatorPlugin.createErrorStatus(0, NLS.bind(Messages.ImportJ2EEModuleDropAssistant_Could_not_recognize_extension_0_, extension), null));
- }
-
- }
- } catch (Throwable e) {
- String msg = e.getMessage() != null ? e.getMessage() : e.toString();
- status.add(J2EENavigatorPlugin.createErrorStatus(0, msg, e));
- }
- }
-
- if(targetEARProject != null) {
- List createdModuleProjects = new ArrayList();
- for(int i=0; i<createdComponents.size(); i++) {
- IVirtualComponent component = (IVirtualComponent) createdComponents.get(i);
- /* If this isn't an ear project, we can't add the newly created modules to it. */
- if(!hasEarFacet(component.getProject())) {
- createdModuleProjects.add(component.getProject());
- }
- }
- IDataModel dataModel = getAddModuleDataModel(targetEARProject, createdModuleProjects);
- IUndoableOperation dropOperation = dataModel.getDefaultOperation();
- IStatus addProjectsStatus = null;
- try {
- addProjectsStatus = dropOperation.execute(monitor, null);
- if(addProjectsStatus != null)
- status.add(addProjectsStatus);
- } catch (ExecutionException e) {
- String msg = e.getMessage() != null ? e.getMessage() : e.toString();
- status.add(J2EENavigatorPlugin.createErrorStatus(0, msg, null));
- }
- //copy the simpleJarsOver
- if(simpleJarsToCopyList != null ){
- try{
- final String [] jarsToCopyArray = new String[simpleJarsToCopyList.size()];
- simpleJarsToCopyList.toArray(jarsToCopyArray);
-
- CopyFilesAndFoldersOperation operation = new CopyFilesAndFoldersOperation(shell);
- operation.copyFilesInCurrentThread(jarsToCopyArray, targetEARProject, monitor);
- }catch (Throwable e) {
- String msg = e.getMessage() != null ? e.getMessage() : e.toString();
- status.add(J2EENavigatorPlugin.createErrorStatus(0, msg, e));
- }
- }
- }
-
- return status;
- }
-
- };
-
- service.showInDialog(PlatformUI.getWorkbench().getActiveWorkbenchWindow().getShell(), importArtifactsJob);
- importArtifactsJob.setRule(ResourcesPlugin.getWorkspace().getRoot());
- importArtifactsJob.schedule();
- return Status.OK_STATUS;
- }
- return Status.CANCEL_STATUS;
- }
-
-
- @Override
- public IStatus validateDrop(Object target, int operation, TransferData transferType) {
- IStatus status = Status.CANCEL_STATUS;
- if(FileTransfer.getInstance().isSupportedType(transferType)) {
- IProject project = null;
- if(target instanceof IWorkspaceRoot)
- status = Status.OK_STATUS;
- else if( (project = getProject(target)) != null && hasEarFacet(project))
- status = Status.OK_STATUS;
- }
- return status;
- }
-
-}
diff --git a/plugins/org.eclipse.jst.j2ee.navigator.ui/j2ee-navigator/org/eclipse/jst/j2ee/navigator/internal/dnd/ModuleIdentifierSerializer.java b/plugins/org.eclipse.jst.j2ee.navigator.ui/j2ee-navigator/org/eclipse/jst/j2ee/navigator/internal/dnd/ModuleIdentifierSerializer.java
deleted file mode 100644
index 173c287..0000000
--- a/plugins/org.eclipse.jst.j2ee.navigator.ui/j2ee-navigator/org/eclipse/jst/j2ee/navigator/internal/dnd/ModuleIdentifierSerializer.java
+++ /dev/null
@@ -1,48 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2003, 2006 IBM Corporation and others.
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
- *
- * Contributors:
- * IBM Corporation - initial API and implementation
- *******************************************************************************/
-package org.eclipse.jst.j2ee.navigator.internal.dnd;
-
-import org.eclipse.core.resources.IProject;
-import org.eclipse.core.resources.ResourcesPlugin;
-import org.eclipse.wst.common.frameworks.internal.AdaptabilityUtility;
-
-
-
-/**
- * @author mdelder
- *
- */
-public class ModuleIdentifierSerializer {
-
-
- /*
- * (non-Javadoc)
- *
- * @see org.eclipse.wst.common.navigator.internal.views.navigator.dnd.ISerializer#toByteArray(java.lang.Object)
- */
- public byte[] toByteArray(Object data) {
- IProject project = (IProject) AdaptabilityUtility.getAdapter(data, IProject.class);
- if (project != null)
- return project.getName().getBytes();
- return null;
- }
-
-
- /*
- * (non-Javadoc)
- *
- * @see org.eclipse.wst.common.navigator.internal.views.navigator.dnd.ISerializer#fromByteArray(byte[])
- */
- public Object fromByteArray(byte[] data) {
- String name = new String(data);
- return ResourcesPlugin.getWorkspace().getRoot().getProject(name);
- }
-}
diff --git a/plugins/org.eclipse.jst.j2ee.navigator.ui/j2ee-navigator/org/eclipse/jst/j2ee/navigator/internal/plugin/J2EENavigatorPlugin.java b/plugins/org.eclipse.jst.j2ee.navigator.ui/j2ee-navigator/org/eclipse/jst/j2ee/navigator/internal/plugin/J2EENavigatorPlugin.java
deleted file mode 100644
index 5662e78..0000000
--- a/plugins/org.eclipse.jst.j2ee.navigator.ui/j2ee-navigator/org/eclipse/jst/j2ee/navigator/internal/plugin/J2EENavigatorPlugin.java
+++ /dev/null
@@ -1,187 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2003, 2007 IBM Corporation and others.
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
- *
- * Contributors:
- * IBM Corporation - initial API and implementation
- *******************************************************************************/
-package org.eclipse.jst.j2ee.navigator.internal.plugin;
-
-import java.net.URL;
-import java.util.Collections;
-
-import org.eclipse.core.resources.IWorkspace;
-import org.eclipse.core.resources.ResourcesPlugin;
-import org.eclipse.core.runtime.FileLocator;
-import org.eclipse.core.runtime.IStatus;
-import org.eclipse.core.runtime.Path;
-import org.eclipse.core.runtime.Status;
-import org.eclipse.jface.resource.ImageDescriptor;
-import org.eclipse.jface.resource.ImageRegistry;
-import org.eclipse.swt.graphics.Image;
-import org.eclipse.swt.widgets.Display;
-import org.eclipse.ui.plugin.AbstractUIPlugin;
-import org.osgi.framework.BundleContext;
-import org.eclipse.core.runtime.Platform;
-import java.lang.Throwable;
-import org.eclipse.core.runtime.CoreException;
-
-/**
- * The main plugin class to be used in the desktop.
- */
-public class J2EENavigatorPlugin extends AbstractUIPlugin {
- //The shared instance.
- private static J2EENavigatorPlugin plugin;
- public static final String PLUGIN_ID = "org.eclipse.jst.j2ee.navigator.ui"; //$NON-NLS-1$
- private static final String ICONS = "icons/"; //$NON-NLS-1$
-
- private ImageRegistry images;
-
-
- /**
- * The constructor.
- */
- public J2EENavigatorPlugin() {
- super();
- plugin = this;
- }
-
- /**
- * Returns the shared instance.
- */
- public static J2EENavigatorPlugin getDefault() {
- return plugin;
- }
-
- /**
- * Returns the workspace instance.
- */
- public static IWorkspace getWorkspace() {
- return ResourcesPlugin.getWorkspace();
- }
-
- @Override
- public void start(BundleContext context) throws Exception {
- super.start(context);
- images = new ImageRegistry(Display.getDefault());
- }
-
- public ImageDescriptor getImageDescriptor(String relativePath) {
- ImageDescriptor descriptor = images.getDescriptor(relativePath);
- if(descriptor == null) {
- synchronized (this) {
- descriptor = images.getDescriptor(relativePath);
- if(descriptor == null) {
- URL imageUrl = FileLocator.find(getBundle(), new Path(ICONS+relativePath), Collections.EMPTY_MAP);
- descriptor = ImageDescriptor.createFromURL(imageUrl);
- }
- }
- }
- return descriptor;
- }
-
-
- public Image getImage(ImageDescriptor descriptor) {
-
- Image image = images.get(descriptor.toString());
- if(image == null) {
- synchronized (this) {
- image = images.get(descriptor.toString());
- if(image == null) {
- images.put(descriptor.toString(), (image = descriptor.createImage(true)));
- }
- }
- }
- return image;
- }
-
- @Override
- public void stop(BundleContext context) throws Exception {
- super.stop(context);
- images.dispose();
- }
-
-
- /**
- * Record an error against this plugin's log.
- *
- * @param aCode
- * @param aMessage
- * @param anException
- */
- public static void logError(int aCode, String aMessage,
- Throwable anException) {
- getDefault().getLog().log(
- createErrorStatus(aCode, aMessage, anException));
- }
-
- /**
- *
- * Record a message against this plugin's log.
- *
- * @param severity
- * @param aCode
- * @param aMessage
- * @param exception
- */
- public static void log(int severity, int aCode, String aMessage,
- Throwable exception) {
- log(createStatus(severity, aCode, aMessage, exception));
- }
-
- /**
- *
- * Record a status against this plugin's log.
- *
- * @param aStatus
- */
- public static void log(IStatus aStatus) {
- getDefault().getLog().log(aStatus);
- }
-
- /**
- * Create a status associated with this plugin.
- *
- * @param severity
- * @param aCode
- * @param aMessage
- * @param exception
- * @return A status configured with this plugin's id and the given parameters.
- */
- public static IStatus createStatus(int severity, int aCode,
- String aMessage, Throwable exception) {
- return new Status(severity, PLUGIN_ID, aCode,
- aMessage != null ? aMessage : "No message.", exception); //$NON-NLS-1$
- }
-
- /**
- *
- * @param aCode
- * @param aMessage
- * @param exception
- * @return A status configured with this plugin's id and the given parameters.
- */
- public static IStatus createErrorStatus(int aCode, String aMessage,
- Throwable exception) {
- return createStatus(IStatus.ERROR, aCode, aMessage, exception);
- }
-
- public static IStatus createStatus(int severity, String message, Throwable exception) {
- return new Status(severity, PLUGIN_ID, message, exception);
- }
-
- public static IStatus createStatus(int severity, String message) {
- return createStatus(severity, message, null);
- }
-
- public static void logError(Throwable exception) {
- Platform.getLog(Platform.getBundle(PLUGIN_ID)).log( createStatus(IStatus.ERROR, exception.getMessage(), exception));
- }
-
- public static void logError(CoreException exception) {
- Platform.getLog(Platform.getBundle(PLUGIN_ID)).log( exception.getStatus() );
- }
-}
diff --git a/plugins/org.eclipse.jst.j2ee.navigator.ui/plugin.properties b/plugins/org.eclipse.jst.j2ee.navigator.ui/plugin.properties
deleted file mode 100644
index 0025ca4..0000000
--- a/plugins/org.eclipse.jst.j2ee.navigator.ui/plugin.properties
+++ /dev/null
@@ -1,41 +0,0 @@
-###############################################################################
-# Copyright (c) 2003, 2006 IBM Corporation and others.
-# All rights reserved. This program and the accompanying materials
-# are made available under the terms of the Eclipse Public License v1.0
-# which accompanies this distribution, and is available at
-# http://www.eclipse.org/legal/epl-v10.html
-#
-# Contributors:
-# IBM Corporation - initial API and implementation
-###############################################################################
-Plugin.name=J2EE Extensions to Common Navigator
-Plugin.providerName=Eclipse.org
-Plugin.description=Contains J2EE Extensions built on the Common Navigator Framework
-j2ee=J2EE
-j2ee.view_ui_=Project Explorer
-j2ee.category_ui_=J2EE
-Enterprise_Applications=Enterprise Applications
-Application_Client_Projects=Application Client Projects
-Connector_Projects=Connector Projects
-EJB_Projects=EJB Projects
-Web_Projects=Dynamic Web Projects
-Other_Projects=Other Projects
-J2EE_Add_Module=J2EE Add Module
-Adds_J2EE_modules_to_EAR_projects=Adds J2EE modules to EAR projects
-J2EE_Add_Utility_Jar=J2EE Add Utility Jar
-Adds_Utility_Jars_to_EAR_projects=Adds Utility Jars to EAR projects
-J2EE_Utility_Jar_Import=J2EE Utility Jar Import
-Import_a_jar_file_UI_=Import a jar file into an EAR project as a J2EE Utility Jar
-J2EE_Import=J2EE Import
-J2EE_IMPORT_MESSAGE=Imports J2EE artifacts: EARs, EJB Jars, Application Client Jars, RARs and WARs
-j2eeProjectDecorator=J2EE Project Decorator
-j2eeProjectDecorator.description=Adds a version decorator to J2EE projects.
-extension.j2ee.name=J2EE Deployment Descriptors
-extension.application.name=J2EE Application Deployment Descriptors
-extension.appclient.name=J2EE Application Client Deployment Descriptors
-extension.connector.name=J2EE Connector Deployment Descriptors
-extension.ejb.name=J2EE EJB Deployment Descriptors
-extension.web.name=J2EE Web Deployment Descriptors
-filter.jetemitters.name=.JETEmitters
-filter.jetemitters.description=Hide .JETEmitters project
-PROBLEM_MARKER_LABEL_RESOURCE_DECORATOR=Problem Marker Resource Decorator
diff --git a/plugins/org.eclipse.jst.j2ee.navigator.ui/plugin.xml b/plugins/org.eclipse.jst.j2ee.navigator.ui/plugin.xml
deleted file mode 100644
index e4578f2..0000000
--- a/plugins/org.eclipse.jst.j2ee.navigator.ui/plugin.xml
+++ /dev/null
@@ -1,1402 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<?eclipse version="3.0"?>
-<plugin>
-
- <extension
- point="org.eclipse.ui.navigator.viewer">
- <viewerContentBinding
- viewerId="org.eclipse.ui.navigator.ProjectExplorer">
- <includes>
- <contentExtension pattern="org.eclipse.jst.navigator.j2ee.ui.*"/>
- <contentExtension pattern="org.eclipse.jst.j2ee.navigator.ui.filters.*"/>
- </includes>
- </viewerContentBinding>
- </extension>
-
- <extension
- point="org.eclipse.ui.navigator.navigatorContent">
- <navigatorContent name="%extension.application.name"
- priority="highest" icon="icons/eargroup_obj.gif"
- activeByDefault="true"
- contentProvider="org.eclipse.jst.j2ee.navigator.internal.EARContentProvider"
- labelProvider="org.eclipse.jst.j2ee.navigator.internal.J2EELabelProvider"
- id="org.eclipse.jst.navigator.j2ee.ui.EARDDContent">
- <triggerPoints>
- <or>
- <instanceof value="java.io.File" />
- <and>
- <instanceof value="org.eclipse.emf.ecore.EObject" />
- <or>
- <test forcePluginActivation="true"
- property="org.eclipse.wst.common.emfworkbench.integration.emfPackage"
- value="common.xmi" />
- <test forcePluginActivation="true"
- property="org.eclipse.wst.common.emfworkbench.integration.emfPackage"
- value="application.xmi" />
- </or>
- </and>
- <and>
- <adapt type="org.eclipse.core.resources.IProject">
- <or>
- <test forcePluginActivation="true"
- property="org.eclipse.wst.common.project.facet.core.projectFacet"
- value="jst.ear:1.4]" />
- </or>
- </adapt>
- </and>
- <instanceof
- value="org.eclipse.jst.j2ee.internal.provider.ModulesItemProvider">
- </instanceof>
- <instanceof
- value="org.eclipse.jst.j2ee.internal.provider.J2EEUtilityJarItemProvider">
- </instanceof>
- <instanceof
- value="org.eclipse.jst.j2ee.internal.provider.J2EEBinaryModulesItemProvider" />
- <instanceof
- value="org.eclipse.jst.j2ee.internal.provider.UtilityModuleProjectItemProvider">
- </instanceof>
- </or>
- </triggerPoints>
- <!-- The possibleChildren is more verbose to allow the drop handlers to be invoked for
- children not provided by this extension
- -->
- <possibleChildren>
- <or>
- <instanceof value="java.io.File" />
- <adapt type="org.eclipse.core.resources.IProject">
- <or>
- <test forcePluginActivation="true"
- property="org.eclipse.wst.common.project.facet.core.projectFacet"
- value="jst.web" />
- <test forcePluginActivation="true"
- property="org.eclipse.wst.common.project.facet.core.projectFacet"
- value="jst.ejb" />
- <test forcePluginActivation="true"
- property="org.eclipse.wst.common.project.facet.core.projectFacet"
- value="jst.utility" />
- <test forcePluginActivation="true"
- property="org.eclipse.wst.common.project.facet.core.projectFacet"
- value="jst.ear" />
- <test forcePluginActivation="true"
- property="org.eclipse.wst.common.project.facet.core.projectFacet"
- value="jst.appclient" />
- <test forcePluginActivation="true"
- property="org.eclipse.wst.common.project.facet.core.projectFacet"
- value="jst.connector" />
- </or>
- </adapt>
- <and>
- <instanceof value="org.eclipse.emf.ecore.EObject" />
- <or>
- <test forcePluginActivation="true"
- property="org.eclipse.wst.common.emfworkbench.integration.emfPackage"
- value="common.xmi" />
- <test forcePluginActivation="true"
- property="org.eclipse.wst.common.emfworkbench.integration.emfPackage"
- value="application.xmi" />
- <test forcePluginActivation="true"
- property="org.eclipse.wst.common.emfworkbench.integration.emfPackage"
- value="client.xmi" />
- <test forcePluginActivation="true"
- property="org.eclipse.wst.common.emfworkbench.integration.emfPackage"
- value="ejb.xmi" />
- <test forcePluginActivation="true"
- property="org.eclipse.wst.common.emfworkbench.integration.emfPackage"
- value="jca.xmi" />
- <test forcePluginActivation="true"
- property="org.eclipse.wst.common.emfworkbench.integration.emfPackage"
- value="webapplication.xmi" />
- <test forcePluginActivation="true"
- property="org.eclipse.wst.common.emfworkbench.integration.emfPackage"
- value="jsp.xmi" />
- </or>
- </and>
- </or>
- </possibleChildren>
- <commonSorter
- id="org.eclipse.jst.j2ee.navigator.internal.ApplicationViewerSorter"
- class="org.eclipse.jst.j2ee.navigator.internal.ApplicationViewerSorter" />
- <!-- Handle open requests -->
- <actionProvider
- class="org.eclipse.jst.j2ee.navigator.internal.J2EEActionProvider"
- id="org.eclipse.jst.j2ee.navigator.ui.EARActionProvider">
- <enablement>
- <or>
- <and>
- <instanceof
- value="org.eclipse.emf.ecore.EObject" />
- <or>
- <test forcePluginActivation="true"
- property="org.eclipse.wst.common.emfworkbench.integration.emfPackage"
- value="common.xmi" />
- <test forcePluginActivation="true"
- property="org.eclipse.wst.common.emfworkbench.integration.emfPackage"
- value="application.xmi" />
- </or>
- </and>
- <instanceof
- value="org.eclipse.jst.j2ee.internal.provider.J2EEItemProvider" />
- </or>
- </enablement>
- </actionProvider>
- <dropAssistant
- class="org.eclipse.jst.j2ee.navigator.internal.dnd.AddProjectToEARDropAssistant"
- id="org.eclipse.jst.j2ee.navigator.ui.AddModulesToEAR">
- <possibleDropTargets>
- <or>
- <adapt type="org.eclipse.core.resources.IProject">
- <test forcePluginActivation="true"
- property="org.eclipse.wst.common.project.facet.core.projectFacet"
- value="jst.ear" />
- </adapt>
- <instanceof
- value="org.eclipse.jst.j2ee.application.Application" />
- <instanceof
- value="org.eclipse.jst.j2ee.internal.provider.ModulesItemProvider" />
- </or>
- </possibleDropTargets>
- </dropAssistant>
- <dropAssistant
- class="org.eclipse.jst.j2ee.navigator.internal.dnd.ImportJ2EEModuleDropAssistant"
- id="org.eclipse.jst.j2ee.navigator.ui.ImportJ2EEModule">
- <possibleDropTargets>
- <or>
- <instanceof
- value="org.eclipse.core.resources.IWorkspaceRoot" />
- <adapt type="org.eclipse.core.resources.IProject">
- <test forcePluginActivation="true"
- property="org.eclipse.wst.common.project.facet.core.projectFacet"
- value="jst.ear" />
- </adapt>
- </or>
- </possibleDropTargets>
- </dropAssistant>
-
- <!-- EAR New -->
- <commonWizard
- menuGroupId="org.eclipse.jst.j2ee.ui.newProjects"
- type="new"
- wizardId="org.eclipse.jst.j2ee.ui.project.facet.EarProjectWizard">
- <enablement>
- <or>
- <instanceof
- value="org.eclipse.core.resources.IWorkspaceRoot" />
- <and>
- <adapt
- type="org.eclipse.core.resources.IProject">
- <or>
- <test forcePluginActivation="true"
- property="org.eclipse.wst.common.project.facet.core.projectFacet"
- value="jst.ear" />
- <test forcePluginActivation="true"
- property="org.eclipse.wst.common.project.facet.core.projectFacet"
- value="jst.ejb" />
- <test forcePluginActivation="true"
- property="org.eclipse.wst.common.project.facet.core.projectFacet"
- value="jst.connector" />
- <test forcePluginActivation="true"
- property="org.eclipse.wst.common.project.facet.core.projectFacet"
- value="jst.utility" />
- <test forcePluginActivation="true"
- property="org.eclipse.wst.common.project.facet.core.projectFacet"
- value="jst.web" />
- </or>
- </adapt>
- </and>
- <instanceof
- value="org.eclipse.jst.j2ee.internal.provider.ModulesItemProvider" />
- <instanceof
- value="org.eclipse.jst.j2ee.application.Application" />
- <and>
- <instanceof value="java.util.Collection"/>
- <count value="0" />
- </and>
- </or>
- </enablement>
- </commonWizard>
- <!-- EAR Import -->
- <commonWizard type="import"
- wizardId="org.eclipse.jst.j2ee.internal.wizard.EARComponentImportWizard">
- <enablement>
- <or>
- <instanceof
- value="org.eclipse.core.resources.IWorkspaceRoot" />
- <and>
- <adapt
- type="org.eclipse.core.resources.IProject">
- <or>
- <test forcePluginActivation="true"
- property="org.eclipse.wst.common.project.facet.core.projectFacet"
- value="jst.ear" />
- <test forcePluginActivation="true"
- property="org.eclipse.wst.common.project.facet.core.projectFacet"
- value="jst.web" />
- </or>
- </adapt>
- </and>
- <instanceof
- value="org.eclipse.jst.j2ee.internal.provider.ModulesItemProvider" />
- <instanceof
- value="org.eclipse.jst.j2ee.application.Application" />
- <and>
- <instanceof value="java.util.Collection"/>
- <count value="0" />
- </and>
- </or>
- </enablement>
- </commonWizard>
- <!-- Utility Jar Import -->
- <commonWizard type="import"
- wizardId="org.eclipse.jst.j2ee.internal.wizard.J2EEUtilityJarImportWizardNew">
- <enablement>
- <or>
- <instanceof
- value="org.eclipse.core.resources.IWorkspaceRoot" />
- <and>
- <adapt
- type="org.eclipse.core.resources.IProject">
- <or>
- <test forcePluginActivation="true"
- property="org.eclipse.wst.common.project.facet.core.projectFacet"
- value="jst.ear" />
- </or>
- </adapt>
- </and>
- <instanceof
- value="org.eclipse.jst.j2ee.application.Application" />
- <instanceof
- value="org.eclipse.jst.j2ee.application.Module" />
- <instanceof
- value="org.eclipse.jst.j2ee.internal.provider.ModulesItemProvider" />
- <and>
- <instanceof value="java.util.Collection"/>
- <count value="0" />
- </and>
- </or>
- </enablement>
- </commonWizard>
-
- <!-- EAR export -->
- <commonWizard type="export"
- wizardId="org.eclipse.jst.j2ee.internal.wizard.EARComponentExportWizard">
- <enablement>
- <or>
- <instanceof
- value="org.eclipse.core.resources.IWorkspaceRoot" />
- <and>
- <adapt
- type="org.eclipse.core.resources.IProject">
- <or>
- <test forcePluginActivation="true"
- property="org.eclipse.wst.common.project.facet.core.projectFacet"
- value="jst.ear" />
- </or>
- </adapt>
- </and>
- <instanceof
- value="org.eclipse.jst.j2ee.application.Application" />
- </or>
- </enablement>
- </commonWizard>
-
- <commonWizard
- menuGroupId="org.eclipse.jst.j2ee.ui.newProjects"
- type="new"
- wizardId="org.eclipse.jpt.ui.wizard.newJpaProject">
- <enablement>
- <or>
- <instanceof
- value="org.eclipse.core.resources.IWorkspaceRoot" />
- <and>
- <adapt
- type="org.eclipse.core.resources.IProject">
- <or>
- <test forcePluginActivation="true"
- property="org.eclipse.wst.common.project.facet.core.projectFacet"
- value="jst.ear" />
- </or>
- </adapt>
- </and>
- <and>
- <instanceof value="java.util.Collection"/>
- <count value="0" />
- </and>
- </or>
- </enablement>
- </commonWizard>
- </navigatorContent>
-
- <navigatorContent name="%extension.appclient.name" priority="highest"
- icon="icons/appclientgroup_obj.gif" activeByDefault="true"
- contentProvider="org.eclipse.jst.j2ee.navigator.internal.J2EEContentProvider"
- labelProvider="org.eclipse.jst.j2ee.navigator.internal.J2EELabelProvider"
- id="org.eclipse.jst.navigator.j2ee.ui.AppClientContent">
- <triggerPoints>
- <or>
- <and>
- <instanceof value="org.eclipse.emf.ecore.EObject" />
- <or>
- <test forcePluginActivation="true"
- property="org.eclipse.wst.common.emfworkbench.integration.emfPackage"
- value="client.xmi" />
- </or>
- </and>
- <adapt type="org.eclipse.core.resources.IProject">
- <test forcePluginActivation="true"
- property="org.eclipse.wst.common.project.facet.core.projectFacet"
- value="jst.appclient:1.4]" />
- </adapt>
- </or>
- </triggerPoints>
- <possibleChildren>
- <and>
- <instanceof value="org.eclipse.emf.ecore.EObject" />
- <or>
- <test forcePluginActivation="true"
- property="org.eclipse.wst.common.emfworkbench.integration.emfPackage"
- value="client.xmi" />
- </or>
- </and>
- </possibleChildren>
- <commonSorter
- id="org.eclipse.jst.j2ee.navigator.internal.J2EEViewerSorter"
- class="org.eclipse.jst.j2ee.navigator.internal.J2EEViewerSorter" />
- <!-- Handle open requests -->
- <actionProvider
- class="org.eclipse.jst.j2ee.navigator.internal.J2EEActionProvider"
- id="org.eclipse.jst.j2ee.navigator.ui.AppClientActionProvider">
- <enablement>
- <or>
- <and>
- <instanceof
- value="org.eclipse.emf.ecore.EObject" />
- <or>
- <test forcePluginActivation="true"
- property="org.eclipse.wst.common.emfworkbench.integration.emfPackage"
- value="client.xmi" />
- </or>
- </and>
- </or>
- </enablement>
- </actionProvider>
-
- <!-- AppClient New -->
- <commonWizard
- menuGroupId="org.eclipse.jst.j2ee.ui.newProjects"
- type="new"
- wizardId="org.eclipse.jst.j2ee.ui.project.facet.appclient.AppClientProjectWizard">
- <enablement>
- <or>
- <instanceof
- value="org.eclipse.core.resources.IWorkspaceRoot" />
- <and>
- <adapt
- type="org.eclipse.core.resources.IProject">
- <or>
- <test forcePluginActivation="true"
- property="org.eclipse.wst.common.project.facet.core.projectFacet"
- value="jst.ear" />
- <test forcePluginActivation="true"
- property="org.eclipse.wst.common.project.facet.core.projectFacet"
- value="jst.appclient" />
- </or>
- </adapt>
- </and>
- <instanceof
- value="org.eclipse.jst.j2ee.application.Application" />
- <instanceof
- value="org.eclipse.jst.j2ee.internal.provider.ModulesItemProvider" />
- <and>
- <instanceof value="java.util.Collection"/>
- <count value="0" />
- </and>
- </or>
- </enablement>
- </commonWizard>
- <!-- App Client Import -->
- <commonWizard type="import"
- wizardId="org.eclipse.jst.j2ee.internal.wizard.AppClientComponentImportWizard">
- <enablement>
- <or>
- <instanceof
- value="org.eclipse.core.resources.IWorkspaceRoot" />
- <and>
- <adapt
- type="org.eclipse.core.resources.IProject">
- <or>
- <test forcePluginActivation="true"
- property="org.eclipse.wst.common.project.facet.core.projectFacet"
- value="jst.ear" />
- </or>
- </adapt>
- </and>
- <instanceof
- value="org.eclipse.jst.j2ee.application.Application" />
- <instanceof
- value="org.eclipse.jst.j2ee.internal.provider.ModulesItemProvider" />
- <and>
- <instanceof value="java.util.Collection"/>
- <count value="0" />
- </and>
- </or>
- </enablement>
- </commonWizard>
- <!-- App Client export -->
- <commonWizard type="export"
- wizardId="org.eclipse.jst.j2ee.internal.wizard.AppClientComponentExportWizard">
- <enablement>
- <or>
- <instanceof
- value="org.eclipse.core.resources.IWorkspaceRoot" />
- <and>
- <adapt
- type="org.eclipse.core.resources.IProject">
- <or>
- <test forcePluginActivation="true"
- property="org.eclipse.wst.common.project.facet.core.projectFacet"
- value="jst.appclient" />
- </or>
- </adapt>
- </and>
- <instanceof
- value="org.eclipse.jst.j2ee.client.ApplicationClient" />
- </or>
- </enablement>
- </commonWizard>
- </navigatorContent>
-
- <navigatorContent name="%extension.web.name" priority="highest"
- icon="icons/webgroup_obj.gif" activeByDefault="true"
- contentProvider="org.eclipse.jst.j2ee.navigator.internal.J2EEContentProvider"
- labelProvider="org.eclipse.jst.j2ee.navigator.internal.J2EELabelProvider"
- id="org.eclipse.jst.navigator.j2ee.ui.WebDDContent">
- <triggerPoints>
- <or>
- <and>
- <instanceof value="org.eclipse.emf.ecore.EObject" />
- <or>
- <test forcePluginActivation="true"
- property="org.eclipse.wst.common.emfworkbench.integration.emfPackage"
- value="webapplication.xmi" />
- <test forcePluginActivation="true"
- property="org.eclipse.wst.common.emfworkbench.integration.emfPackage"
- value="jsp.xmi" />
- </or>
- </and>
- <adapt type="org.eclipse.core.resources.IProject">
- <test forcePluginActivation="true"
- property="org.eclipse.wst.common.project.facet.core.projectFacet"
- value="jst.web:2.4]" />
- </adapt>
- <instanceof
- value="org.eclipse.jst.j2ee.internal.war.ui.util.WebGroupItemProvider">
- </instanceof>
- </or>
- </triggerPoints>
- <possibleChildren>
- <or>
- <and>
- <instanceof value="org.eclipse.emf.ecore.EObject"/>
- <or>
- <test forcePluginActivation="true"
- property="org.eclipse.wst.common.emfworkbench.integration.emfPackage"
- value="webapplication.xmi" />
- <test forcePluginActivation="true"
- property="org.eclipse.wst.common.emfworkbench.integration.emfPackage"
- value="jsp.xmi" />
- </or>
- </and>
- </or>
- </possibleChildren>
- <commonSorter
- id="org.eclipse.jst.j2ee.navigator.internal.J2EEViewerSorter"
- class="org.eclipse.jst.j2ee.navigator.internal.J2EEViewerSorter" />
- <!-- Handle open requests -->
- <actionProvider
- class="org.eclipse.jst.j2ee.navigator.internal.J2EEActionProvider"
- id="org.eclipse.jst.j2ee.navigator.ui.WebActionProvider">
- <enablement>
- <and>
- <instanceof value="org.eclipse.emf.ecore.EObject" />
- <or>
- <test forcePluginActivation="true"
- property="org.eclipse.wst.common.emfworkbench.integration.emfPackage"
- value="webapplication.xmi" />
- <test forcePluginActivation="true"
- property="org.eclipse.wst.common.emfworkbench.integration.emfPackage"
- value="jsp.xmi" />
- </or>
- </and>
- </enablement>
- </actionProvider>
- <actionProvider
- class="org.eclipse.ui.internal.navigator.resources.actions.NewActionProvider"
- id="org.eclipse.jst.j2ee.navigator.internal.WebNewActionProvider">
- <enablement>
- <instanceof value="org.eclipse.jst.j2ee.internal.war.ui.util.WebGroupItemProvider"/>
- </enablement>
- </actionProvider>
-
- <!-- Web New -->
- <commonWizard
- menuGroupId="org.eclipse.jst.j2ee.ui.newProjects"
- type="new"
- wizardId="org.eclipse.jst.servlet.ui.project.facet.WebProjectWizard">
- <enablement>
- <or>
- <instanceof
- value="org.eclipse.core.resources.IWorkspaceRoot" />
- <and>
- <adapt
- type="org.eclipse.core.resources.IProject">
- <or>
- <test forcePluginActivation="true"
- property="org.eclipse.wst.common.project.facet.core.projectFacet"
- value="jst.web" />
- <test forcePluginActivation="true"
- property="org.eclipse.wst.common.project.facet.core.projectFacet"
- value="jst.ear" />
- <test forcePluginActivation="true"
- property="org.eclipse.wst.common.project.facet.core.projectFacet"
- value="jst.web" />
- </or>
- </adapt>
- </and>
- <instanceof
- value="org.eclipse.jst.j2ee.application.Application" />
- <instanceof
- value="org.eclipse.jst.j2ee.internal.provider.ModulesItemProvider" />
- <and>
- <instanceof value="java.util.Collection"/>
- <count value="0" />
- </and>
- </or>
- </enablement>
- </commonWizard>
-
-
- <!-- Web Fragment New -->
- <commonWizard type="new"
- menuGroupId="org.eclipse.jst.j2ee.ui.newProjects"
- wizardId="org.eclipse.jst.servlet.ui.project.facet.WebFragmentProjectWizard">
- <enablement>
- <or>
- <instanceof
- value="org.eclipse.core.resources.IWorkspaceRoot" />
- <and>
- <instanceof value="java.util.Collection"/>
- <count value="0" />
- </and>
- </or>
- </enablement>
- </commonWizard>
-
-
-
- <!-- Web Import -->
- <commonWizard type="import"
- wizardId="org.eclipse.jst.servlet.ui.internal.wizard.WebComponentImportWizard">
- <enablement>
- <or>
- <instanceof
- value="org.eclipse.core.resources.IWorkspaceRoot" />
- <and>
- <adapt
- type="org.eclipse.core.resources.IProject">
- <or>
- <test forcePluginActivation="true"
- property="org.eclipse.wst.common.project.facet.core.projectFacet"
- value="jst.ear" />
- <test forcePluginActivation="true"
- property="org.eclipse.wst.common.project.facet.core.projectFacet"
- value="jst.web" />
- </or>
- </adapt>
- </and>
- <instanceof
- value="org.eclipse.jst.j2ee.internal.provider.ModulesItemProvider" />
- <instanceof
- value="org.eclipse.jst.j2ee.application.Application" />
- <and>
- <instanceof value="java.util.Collection"/>
- <count value="0" />
- </and>
- </or>
- </enablement>
- </commonWizard>
- <!-- Web Export -->
- <commonWizard type="export"
- wizardId="org.eclipse.jst.servlet.ui.internal.wizard.WebComponentExportWizard">
- <enablement>
- <or>
- <instanceof
- value="org.eclipse.core.resources.IWorkspaceRoot" />
- <and>
- <adapt
- type="org.eclipse.core.resources.IProject">
- <or>
- <test forcePluginActivation="true"
- property="org.eclipse.wst.common.project.facet.core.projectFacet"
- value="jst.web" />
- </or>
- </adapt>
- </and>
- <instanceof
- value="org.eclipse.jst.j2ee.webapplication.WebApp" />
- <instanceof
- value="org.eclipse.jst.j2ee.internal.war.ui.util.WebGroupItemProvider" />
- </or>
- </enablement>
- </commonWizard>
-
- <!-- The contribution of the New *.jsp wizard to Files, Folders, and Projects
- is handled in org.eclipse.jst.jsp.ui. This contribution adds the
- wizard to the model elements contributed by the J2EE Content Provider -->
- <commonWizard
- menuGroupId="org.eclipse.wst.web.ui"
- type="new"
- wizardId="org.eclipse.jst.jsp.ui.internal.wizard.NewJSPWizard">
- <enablement>
- <or>
- <instanceof
- value="org.eclipse.jst.j2ee.internal.war.ui.util.WebGroupItemProvider" />
-
- <instanceof
- value="org.eclipse.jst.j2ee.webapplication.WebApp" />
-
- </or>
- </enablement>
- </commonWizard>
-
- <!-- The contribution of the New *.html wizard to Files, Folders, and Projects
- is handled in org.eclipse.jst.html.ui. This contribution adds the
- wizard to the model elements contributed by the J2EE Content Provider -->
- <commonWizard
- menuGroupId="org.eclipse.wst.web.ui"
- type="new"
- wizardId="org.eclipse.wst.html.ui.internal.wizard.NewHTMLWizard">
- <enablement>
- <or>
- <instanceof
- value="org.eclipse.jst.j2ee.internal.war.ui.util.WebGroupItemProvider" />
- <instanceof
- value="org.eclipse.jst.j2ee.webapplication.WebApp" />
- </or>
- </enablement>
- </commonWizard>
-
- <!-- New Servlet -->
- <commonWizard
- menuGroupId="org.eclipse.wst.web.ui.webclass"
- type="new"
- wizardId="org.eclipse.jst.servlet.ui.internal.wizard.AddServletWizard">
- <enablement>
- <or>
- <and>
- <adapt
- type="org.eclipse.core.resources.IResource">
- <or>
- <test forcePluginActivation="true"
- property="org.eclipse.wst.common.project.facet.core.projectFacet"
- value="jst.web"/>
- </or>
- </adapt>
- <or>
- <instanceof value="org.eclipse.core.resources.IProject"/>
- <instanceof value="org.eclipse.jdt.core.IPackageFragment"/>
- <instanceof value="org.eclipse.jdt.core.IPackageFragmentRoot"/>
- <instanceof value="org.eclipse.jdt.core.ICompilationUnit"/>
- <instanceof
- value="org.eclipse.jdt.core.IType">
- </instanceof>
- <adapt
- type="org.eclipse.core.resources.IResource">
- <and>
- <test
- forcePluginActivation="true"
- property="org.eclipse.core.resources.webResource">
- </test>
- <test
- forcePluginActivation="true"
- property="org.eclipse.core.resources.extension"
- value="jsp">
- </test>
- </and>
- </adapt>
- </or>
- </and>
- <instanceof
- value="org.eclipse.jst.servlet.ui.internal.navigator.ICompressedNode"/>
- <instanceof
- value="org.eclipse.jst.j2ee.webapplication.WebApp"/>
- <instanceof
- value="org.eclipse.jst.j2ee.internal.war.ui.util.WebServletGroupItemProvider"/>
- <instanceof
- value="org.eclipse.jst.j2ee.webapplication.Servlet"/>
- <instanceof
- value="org.eclipse.jst.j2ee.internal.war.ui.util.WebServletMappingGroupItemProvider"/>
- <instanceof
- value="org.eclipse.jst.j2ee.webapplication.ServletMapping"/>
- </or>
- </enablement>
- </commonWizard>
-
- <!-- New Filter -->
- <commonWizard
- menuGroupId="org.eclipse.wst.web.ui.webclass"
- type="new"
- wizardId="org.eclipse.jst.servlet.ui.internal.wizard.AddFilterWizard">
- <enablement>
- <or>
- <and>
- <adapt
- type="org.eclipse.core.resources.IResource">
- <test
- forcePluginActivation="true"
- property="org.eclipse.wst.common.project.facet.core.projectFacet"
- value="jst.web:[2.3">
- </test>
- </adapt>
- <or>
- <instanceof
- value="org.eclipse.core.resources.IProject">
- </instanceof>
- <instanceof
- value="org.eclipse.jdt.core.IPackageFragmentRoot">
- </instanceof>
- <instanceof
- value="org.eclipse.jdt.core.IPackageFragment">
- </instanceof>
- <instanceof
- value="org.eclipse.jdt.core.ICompilationUnit">
- </instanceof>
- <instanceof
- value="org.eclipse.jdt.core.IType">
- </instanceof>
- <instanceof
- value="org.eclipse.jst.j2ee.webapplication.WebApp">
- </instanceof>
-
- <instanceof
- value="org.eclipse.jst.j2ee.webapplication.Filter">
- </instanceof>
- <instanceof
- value="org.eclipse.jst.j2ee.webapplication.FilterMapping">
- </instanceof>
- <instanceof
- value="org.eclipse.jst.j2ee.webapplication.Servlet">
- </instanceof>
-
- </or>
- </and>
- <and>
- <or>
- <instanceof
- value="org.eclipse.jst.j2ee.internal.war.ui.util.WebFiltersGroupItemProvider">
- </instanceof>
- <instanceof
- value="org.eclipse.jst.j2ee.internal.war.ui.util.WebFilterMappingGroupItemProvider">
- </instanceof>
- </or>
- <test
- forcePluginActivation="true"
- property="org.eclipse.jst.j2ee.provider.projectFacet"
- value="jst.web:[2.3">
- </test></and>
- <and>
- <instanceof
- value="org.eclipse.jst.servlet.ui.internal.navigator.ICompressedNode">
- </instanceof>
- <test
- forcePluginActivation="true"
- property="org.eclipse.jst.servlet.ui.navigator.projectFacet"
- value="jst.web:[2.3">
- </test>
- </and>
- </or>
- </enablement>
- </commonWizard>
-
- <!-- New Listener -->
- <commonWizard
- menuGroupId="org.eclipse.wst.web.ui.webclass"
- type="new"
- wizardId="org.eclipse.jst.servlet.ui.internal.wizard.AddListenerWizard">
- <enablement>
- <or>
- <and>
- <adapt
- type="org.eclipse.core.resources.IResource">
- <test
- forcePluginActivation="true"
- property="org.eclipse.wst.common.project.facet.core.projectFacet"
- value="jst.web:[2.3">
- </test>
- </adapt>
- <or>
- <instanceof
- value="org.eclipse.core.resources.IProject">
- </instanceof>
- <instanceof
- value="org.eclipse.jdt.core.IPackageFragmentRoot">
- </instanceof>
- <instanceof
- value="org.eclipse.jdt.core.IPackageFragment">
- </instanceof>
- <instanceof
- value="org.eclipse.jdt.core.ICompilationUnit">
- </instanceof>
- <instanceof
- value="org.eclipse.jdt.core.IType">
- </instanceof>
- <instanceof
- value="org.eclipse.jst.j2ee.webapplication.WebApp">
- </instanceof>
- <instanceof
- value="org.eclipse.jst.j2ee.common.Listener">
- </instanceof>
- </or>
- </and>
- <and>
- <instanceof
- value="org.eclipse.jst.j2ee.internal.war.ui.util.WebListenerGroupItemProvider">
- </instanceof>
- <test
- forcePluginActivation="true"
- property="org.eclipse.jst.j2ee.provider.projectFacet"
- value="jst.web:[2.3">
- </test>
- </and>
- <and>
- <instanceof
- value="org.eclipse.jst.servlet.ui.internal.navigator.ICompressedNode">
- </instanceof>
- <test
- forcePluginActivation="true"
- property="org.eclipse.jst.servlet.ui.navigator.projectFacet"
- value="jst.web:[2.3">
- </test>
- </and>
- </or>
- </enablement>
- </commonWizard>
- </navigatorContent>
- <navigatorContent name="%extension.ejb.name" priority="highest"
- icon="icons/ejbgroup_obj.gif" activeByDefault="true"
- contentProvider="org.eclipse.jst.j2ee.navigator.internal.J2EEContentProvider"
- labelProvider="org.eclipse.jst.j2ee.navigator.internal.J2EELabelProvider"
- id="org.eclipse.jst.navigator.j2ee.ui.EJBDDContent">
- <triggerPoints>
- <or>
- <and>
- <instanceof value="org.eclipse.emf.ecore.EObject" />
- <test forcePluginActivation="true"
- property="org.eclipse.wst.common.emfworkbench.integration.emfPackage"
- value="ejb.xmi" />
- </and>
- <and>
- <adapt type="org.eclipse.core.resources.IProject">
- <test forcePluginActivation="true"
- property="org.eclipse.wst.common.project.facet.core.projectFacet"
- value="jst.ejb:2.1]" />
- </adapt>
- </and>
- <instanceof
- value="org.eclipse.jst.j2ee.internal.ejb.provider.J2EEJavaClassProviderHelper">
- </instanceof>
- <instanceof
- value="org.eclipse.jst.j2ee.internal.ejb.provider.GroupedEJBItemProvider">
- </instanceof>
- <instanceof
- value="org.eclipse.jst.j2ee.navigator.internal.LoadingDDNode">
- </instanceof>
- </or>
- </triggerPoints>
- <possibleChildren>
- <or>
- <and>
- <instanceof value="org.eclipse.emf.ecore.EObject" />
- <or>
- <test forcePluginActivation="true"
- property="org.eclipse.wst.common.emfworkbench.integration.emfPackage"
- value="ejb.xmi" />
- </or>
- </and>
- <instanceof value="org.eclipse.jst.j2ee.internal.ejb.provider.J2EEJavaClassProviderHelper"/>
- <instanceof value="org.eclipse.jst.j2ee.internal.ejb.provider.GroupedEJBItemProvider"/>
- </or>
- <instanceof value="org.eclipse.jst.j2ee.navigator.internal.LoadingDDNode"/>
- </possibleChildren>
- <commonSorter
- id="org.eclipse.jst.j2ee.navigator.internal.J2EEViewerSorter"
- class="org.eclipse.jst.j2ee.navigator.internal.J2EEViewerSorter" />
- <!-- Handle open requests -->
- <actionProvider
- class="org.eclipse.jst.j2ee.navigator.internal.J2EEActionProvider"
- id="org.eclipse.jst.j2ee.navigator.ui.EJBActionProvider">
- <enablement>
- <or>
- <and>
- <instanceof value="org.eclipse.emf.ecore.EObject" />
- <test forcePluginActivation="true"
- property="org.eclipse.wst.common.emfworkbench.integration.emfPackage"
- value="ejb.xmi" />
- </and>
- <instanceof value="org.eclipse.jst.j2ee.internal.ejb.provider.J2EEJavaClassProviderHelper"/>
- </or>
- </enablement>
- </actionProvider>
- <!-- By default, anything that can adapt to an IResource gets New Action Provider (from the Resources extension),
- so we just need to add one for the EJB Item Providers (the groupings in the tree)
- -->
- <actionProvider
- class="org.eclipse.ui.internal.navigator.resources.actions.NewActionProvider"
- id="org.eclipse.jst.j2ee.navigator.internal.EjbNewActionProvider">
- <enablement>
- <instanceof
- value="org.eclipse.jst.j2ee.internal.ejb.provider.GroupedEJBItemProvider" />
- </enablement>
- </actionProvider>
-
- <!-- EJB New -->
- <commonWizard
- menuGroupId="org.eclipse.jst.j2ee.ui.newProjects"
- type="new"
- wizardId="org.eclipse.jst.ejb.ui.project.facet.EjbProjectWizard">
- <enablement>
- <or>
- <instanceof
- value="org.eclipse.core.resources.IWorkspaceRoot" />
- <and>
- <adapt
- type="org.eclipse.core.resources.IProject">
- <or>
- <test forcePluginActivation="true"
- property="org.eclipse.wst.common.project.facet.core.projectFacet"
- value="jst.ear" />
- <test forcePluginActivation="true"
- property="org.eclipse.wst.common.project.facet.core.projectFacet"
- value="jst.ejb" />
- </or>
- </adapt>
- </and>
- <instanceof
- value="org.eclipse.jst.j2ee.application.Application" />
- <instanceof
- value="org.eclipse.jst.j2ee.internal.provider.ModulesItemProvider" />
- <and>
- <instanceof value="java.util.Collection"/>
- <count value="0" />
- </and>
- </or>
- </enablement>
- </commonWizard>
- <!-- EJB Import -->
- <commonWizard type="import"
- wizardId="org.eclipse.jst.ejb.ui.internal.wizard.EJBComponentImportWizard">
- <enablement>
- <or>
- <instanceof
- value="org.eclipse.core.resources.IWorkspaceRoot" />
- <and>
- <adapt
- type="org.eclipse.core.resources.IProject">
- <or>
- <test forcePluginActivation="true"
- property="org.eclipse.wst.common.project.facet.core.projectFacet"
- value="jst.ear" />
- <test forcePluginActivation="true"
- property="org.eclipse.wst.common.project.facet.core.projectFacet"
- value="jst.ejb" />
- </or>
- </adapt>
- </and>
- <instanceof
- value="org.eclipse.jst.j2ee.application.Application" />
- <instanceof
- value="org.eclipse.jst.j2ee.internal.provider.ModulesItemProvider" />
- <and>
- <instanceof value="java.util.Collection"/>
- <count value="0" />
- </and>
- </or>
- </enablement>
- </commonWizard>
- <!-- EJB Export -->
- <commonWizard type="export"
- wizardId="org.eclipse.jst.ejb.ui.internal.wizard.EJBComponentExportWizard">
- <enablement>
- <or>
- <instanceof
- value="org.eclipse.core.resources.IWorkspaceRoot" />
- <and>
- <adapt
- type="org.eclipse.core.resources.IProject">
- <or>
- <test forcePluginActivation="true"
- property="org.eclipse.wst.common.project.facet.core.projectFacet"
- value="jst.ejb" />
- </or>
- </adapt>
- </and>
- <instanceof value="org.eclipse.jst.j2ee.ejb.EJBJar" />
- <instanceof
- value="org.eclipse.jst.j2ee.internal.ejb.provider.GroupedEJBItemProvider" />
- </or>
- </enablement>
- </commonWizard>
-
- <!-- Add Enterprise Bean -->
- <commonWizard
- menuGroupId="org.eclipse.jst.ejb.ui"
- type="new"
- wizardId="org.eclipse.jst.j2ee.ejb.annotation.ui.internal.wizards.AddEjbWizard">
- <enablement>
- <or>
- <adapt
- type="org.eclipse.core.resources.IProject">
- <test forcePluginActivation="true"
- property="org.eclipse.wst.common.project.facet.core.projectFacet"
- value="jst.ejb.xdoclet" />
- </adapt>
- <and>
- <instanceof
- value="org.eclipse.jst.j2ee.ejb.EJBJar" />
- <adapt
- type="org.eclipse.core.resources.IResource">
- <test forcePluginActivation="true"
- property="org.eclipse.wst.common.project.facet.core.projectFacet"
- value="jst.ejb.xdoclet" />
- </adapt>
- </and>
- <and>
- <instanceof
- value="org.eclipse.jst.j2ee.internal.provider.J2EEItemProvider" />
- <test forcePluginActivation="true"
- property="org.eclipse.jst.j2ee.provider.projectFacet"
- value="jst.ejb.xdoclet" />
- </and>
- </or>
- </enablement>
- </commonWizard>
- <commonWizard
- menuGroupId="org.eclipse.jst.ejb.ui"
- type="new"
- wizardId="org.eclipse.jst.ejb.ui.internal.wizard.AddSessionBeanWizard">
- <enablement>
- <or>
- <and>
- <adapt
- type="org.eclipse.core.resources.IResource">
- <or>
- <test forcePluginActivation="true"
- property="org.eclipse.wst.common.project.facet.core.projectFacet"
- value="jst.ejb:[3.0"/>
- </or>
- </adapt>
- <or>
- <instanceof value="org.eclipse.core.resources.IProject"/>
- <instanceof value="org.eclipse.jdt.core.IPackageFragment"/>
- <instanceof value="org.eclipse.jdt.core.IPackageFragmentRoot"/>
- <instanceof value="org.eclipse.jdt.core.ICompilationUnit"/>
- </or>
- </and>
- <and>
- <instanceof
- value="org.eclipse.jst.j2ee.ejb.EJBJar" />
- <adapt
- type="org.eclipse.core.resources.IResource">
- <test forcePluginActivation="true"
- property="org.eclipse.wst.common.project.facet.core.projectFacet"
- value="jst.ejb:[3.0" />
- </adapt>
- </and>
- <and>
- <instanceof
- value="org.eclipse.jst.j2ee.internal.provider.J2EEItemProvider" />
- <test forcePluginActivation="true"
- property="org.eclipse.jst.j2ee.provider.projectFacet"
- value="jst.ejb.xdoclet" />
- </and>
- </or>
- </enablement>
- </commonWizard>
- <commonWizard
- menuGroupId="org.eclipse.jst.ejb.ui"
- type="new"
- wizardId="org.eclipse.jst.ejb.ui.internal.wizard.AddMessageDrivenBeanWizard">
- <enablement>
- <or>
- <and>
- <adapt
- type="org.eclipse.core.resources.IResource">
- <or>
- <test
- forcePluginActivation="true"
- property="org.eclipse.wst.common.project.facet.core.projectFacet"
- value="jst.ejb:[3.0">
- </test>
- </or>
- </adapt>
- <or>
- <instanceof
- value="org.eclipse.core.resources.IProject">
- </instanceof>
- <instanceof
- value="org.eclipse.jdt.core.IPackageFragment">
- </instanceof>
- <instanceof
- value="org.eclipse.jdt.core.IPackageFragmentRoot">
- </instanceof>
- <instanceof
- value="org.eclipse.jdt.core.ICompilationUnit">
- </instanceof>
- </or>
- </and>
- <and>
- <instanceof
- value="org.eclipse.jst.j2ee.ejb.EJBJar">
- </instanceof>
- <adapt
- type="org.eclipse.core.resources.IResource">
- <test
- forcePluginActivation="true"
- property="org.eclipse.wst.common.project.facet.core.projectFacet"
- value="jst.ejb:[3.0">
- </test>
- </adapt>
- </and>
- <and>
- <instanceof
- value="org.eclipse.jst.j2ee.internal.provider.J2EEItemProvider">
- </instanceof>
- <test
- forcePluginActivation="true"
- property="org.eclipse.jst.j2ee.provider.projectFacet"
- value="jst.ejb.xdoclet">
- </test>
- </and>
- </or>
- </enablement>
- </commonWizard>
- </navigatorContent>
- <navigatorContent name="%extension.connector.name"
- priority="highest" icon="icons/connectorgroup_obj.gif"
- activeByDefault="true"
- contentProvider="org.eclipse.jst.j2ee.navigator.internal.J2EEContentProvider"
- labelProvider="org.eclipse.jst.j2ee.navigator.internal.J2EELabelProvider"
- id="org.eclipse.jst.navigator.j2ee.ui.ConnectorDDContent">
- <triggerPoints>
- <or>
- <and>
- <instanceof value="org.eclipse.emf.ecore.EObject" />
- <test forcePluginActivation="true"
- property="org.eclipse.wst.common.emfworkbench.integration.emfPackage"
- value="jca.xmi" />
- </and>
- <adapt type="org.eclipse.core.resources.IProject">
- <test forcePluginActivation="true"
- property="org.eclipse.wst.common.project.facet.core.projectFacet"
- value="jst.connector:1.5]" />
- </adapt>
- </or>
- </triggerPoints>
- <possibleChildren>
- <and>
- <instanceof value="org.eclipse.emf.ecore.EObject" />
- <test forcePluginActivation="true"
- property="org.eclipse.wst.common.emfworkbench.integration.emfPackage"
- value="jca.xmi" />
- </and>
- </possibleChildren>
- <commonSorter
- id="org.eclipse.jst.j2ee.navigator.internal.J2EEViewerSorter"
- class="org.eclipse.jst.j2ee.navigator.internal.J2EEViewerSorter" />
- <!-- Handle open requests -->
- <actionProvider
- class="org.eclipse.jst.j2ee.navigator.internal.J2EEActionProvider"
- id="org.eclipse.jst.j2ee.navigator.ui.ConnectorActionProvider">
- <enablement>
- <and>
- <instanceof value="org.eclipse.emf.ecore.EObject" />
- <test forcePluginActivation="true"
- property="org.eclipse.wst.common.emfworkbench.integration.emfPackage"
- value="jca.xmi" />
- </and>
- </enablement>
- </actionProvider>
-
- <!-- Connector New -->
- <commonWizard
- menuGroupId="org.eclipse.jst.j2ee.ui.newProjects"
- type="new"
- wizardId="org.eclipse.jst.j2ee.jca.ui.internal.wizard.ConnectorProjectWizard">
- <enablement>
- <or>
- <instanceof
- value="org.eclipse.core.resources.IWorkspaceRoot" />
- <and>
- <adapt
- type="org.eclipse.core.resources.IProject">
- <or>
- <test forcePluginActivation="true"
- property="org.eclipse.wst.common.project.facet.core.projectFacet"
- value="jst.ear" />
- <test forcePluginActivation="true"
- property="org.eclipse.wst.common.project.facet.core.projectFacet"
- value="jst.connector" />
- </or>
- </adapt>
- </and>
- <instanceof
- value="org.eclipse.jst.j2ee.application.Application" />
- <instanceof
- value="org.eclipse.jst.j2ee.internal.provider.ModulesItemProvider" />
- <and>
- <instanceof value="java.util.Collection"/>
- <count value="0" />
- </and>
- </or>
- </enablement>
- </commonWizard>
- <!-- Connector import -->
- <commonWizard type="import"
- wizardId="org.eclipse.jst.j2ee.jca.ui.internal.wizard.ConnectorComponentImportWizard">
- <enablement>
- <or>
- <instanceof
- value="org.eclipse.core.resources.IWorkspaceRoot" />
- <and>
- <adapt
- type="org.eclipse.core.resources.IProject">
- <or>
- <test forcePluginActivation="true"
- property="org.eclipse.wst.common.project.facet.core.projectFacet"
- value="jst.ear" />
- <test forcePluginActivation="true"
- property="org.eclipse.wst.common.project.facet.core.projectFacet"
- value="jst.connector" />
- </or>
- </adapt>
- </and>
- <instanceof
- value="org.eclipse.jst.j2ee.application.Application" />
- <instanceof
- value="org.eclipse.jst.j2ee.internal.provider.ModulesItemProvider" />
- <instanceof
- value="org.eclipse.jst.j2ee.jca.internal.impl.ResourceAdapterImpl" />
- <and>
- <instanceof value="java.util.Collection"/>
- <count value="0" />
- </and>
- </or>
- </enablement>
- </commonWizard>
- <!-- Connector Export -->
- <commonWizard type="export"
- wizardId="org.eclipse.jst.j2ee.jca.ui.internal.wizard.ConnectorComponentExportWizard">
- <enablement>
- <or>
- <instanceof
- value="org.eclipse.core.resources.IWorkspaceRoot" />
- <and>
- <adapt
- type="org.eclipse.core.resources.IProject">
- <or>
- <test forcePluginActivation="true"
- property="org.eclipse.wst.common.project.facet.core.projectFacet"
- value="jst.connector" />
- </or>
- </adapt>
- </and>
- <instanceof
- value="org.eclipse.jst.j2ee.jca.Connector" />
- <instanceof
- value="org.eclipse.jst.j2ee.jca.internal.impl.ResourceAdapterImpl" />
- </or>
- </enablement>
- </commonWizard>
- </navigatorContent>
- <commonFilter
- activeByDefault="true"
- description="%filter.jetemitters.description"
- id="org.eclipse.jst.j2ee.navigator.ui.filters.jetemitters"
- name="%filter.jetemitters.name">
- <filterExpression>
- <adapt type="org.eclipse.core.resources.IProject">
- <test
- forcePluginActivation="true"
- property="org.eclipse.core.resources.name"
- value=".JETEmitters"/>
- </adapt>
- </filterExpression>
- </commonFilter>
-
- </extension>
-
- <extension
- point="org.eclipse.core.runtime.adapters">
- <factory
- adaptableType="org.eclipse.jst.j2ee.common.J2EEEObject"
- class="org.eclipse.jst.j2ee.navigator.internal.J2EEEMFAdapterFactory">
- <adapter type="org.eclipse.core.resources.IFile"/>
- <adapter type="org.eclipse.core.resources.IResource"/>
- </factory>
- <factory
- adaptableType="org.eclipse.jst.j2ee.common.J2EEEAttribute"
- class="org.eclipse.jst.j2ee.navigator.internal.J2EEEMFAdapterFactory">
- <adapter type="org.eclipse.core.resources.IFile"/>
- <adapter type="org.eclipse.core.resources.IResource"/>
- </factory>
- </extension>
-
-<!-- ====================================================== -->
-<!-- Label Decorators -->
-<!-- ====================================================== -->
- <extension
- point="org.eclipse.ui.decorators">
- <decorator
- adaptable="true"
- location="TOP_LEFT"
- lightweight="true"
- label="%j2eeProjectDecorator"
- state="true"
- class="org.eclipse.jst.j2ee.navigator.internal.J2EEProjectDecorator"
- id="org.eclipse.jst.j2ee.navigator.internal.J2EEProjectDecorator">
- <enablement>
- <or>
- <objectClass name="org.eclipse.core.resources.IProject"/>
- <objectClass name="org.eclipse.jdt.core.IJavaProject"/>
- </or>
- </enablement>
- <description>
- %j2eeProjectDecorator.description
- </description>
- </decorator>
- </extension>
-
- <extension
- point="org.eclipse.ui.decorators">
- <decorator
- adaptable="true"
- label="%PROBLEM_MARKER_LABEL_RESOURCE_DECORATOR"
- state="true"
- class="org.eclipse.jdt.ui.ProblemsLabelDecorator"
- id="org.eclipse.jst.j2ee.navigator.ui.java.resource.decorator">
- <enablement>
- <objectClass name="org.eclipse.core.resources.IResource"/>
- </enablement>
- </decorator>
- </extension>
- <extension
- point="org.eclipse.core.expressions.propertyTesters">
- <propertyTester
- class="org.eclipse.jst.j2ee.navigator.internal.WebResourcePropertyTester"
- id="org.eclipse.jst.j2ee.navigator.webResourcePropertyTester"
- namespace="org.eclipse.core.resources"
- properties="webResource"
- type="org.eclipse.core.resources.IResource">
- </propertyTester>
- </extension>
-
-</plugin>
diff --git a/plugins/org.eclipse.jst.j2ee.navigator.ui/prepareforpii.xml b/plugins/org.eclipse.jst.j2ee.navigator.ui/prepareforpii.xml
deleted file mode 100644
index f673207..0000000
--- a/plugins/org.eclipse.jst.j2ee.navigator.ui/prepareforpii.xml
+++ /dev/null
@@ -1,32 +0,0 @@
-<project name="PrepareForPII" default="main" basedir=".">
-
- <!-- Setup temp variables -->
- <target name="init">
- <property name="nlsDir" value="d:/NLS/Corona/0526"/>
- <property name="plugin" value="com.ibm.wtp.j2ee.ui.navigator"/>
- <property name="plugindir" value="d:/workspaceCorona/${plugin}"/>
- <property name="outputDir" value="${nlsDir}/${plugin}"/>
-
-
- </target>
-
- <!-- Create the destination dir -->
- <target name="nlsDir" depends="init">
- <mkdir dir="${nlsDir}"/>
- </target>
-
- <!-- Create the destination dir -->
- <target name="plugindir" depends="nlsDir">
- <delete dir="${outputDir}"/>
- <mkdir dir="${outputDir}"/>
- </target>
-
- <!-- Move the files to the correct locations in the workspace. -->
- <target name="main" depends="plugindir">
-
- <messageIdGen folderPath = "${plugindir}" componentId = "E" />
-
- <copy file="${plugindir}/plugin.properties" todir="${outputDir}"/>
-
- </target>
-</project>
diff --git a/plugins/org.eclipse.jst.j2ee.ui/.classpath b/plugins/org.eclipse.jst.j2ee.ui/.classpath
deleted file mode 100644
index 3dce472..0000000
--- a/plugins/org.eclipse.jst.j2ee.ui/.classpath
+++ /dev/null
@@ -1,8 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<classpath>
- <classpathentry kind="src" path="j2ee_ui"/>
- <classpathentry kind="src" path="property_files"/>
- <classpathentry kind="con" path="org.eclipse.jdt.launching.JRE_CONTAINER/org.eclipse.jdt.internal.debug.ui.launcher.StandardVMType/J2SE-1.5"/>
- <classpathentry kind="con" path="org.eclipse.pde.core.requiredPlugins"/>
- <classpathentry kind="output" path="bin"/>
-</classpath>
diff --git a/plugins/org.eclipse.jst.j2ee.ui/.cvsignore b/plugins/org.eclipse.jst.j2ee.ui/.cvsignore
deleted file mode 100644
index 678089c..0000000
--- a/plugins/org.eclipse.jst.j2ee.ui/.cvsignore
+++ /dev/null
@@ -1,8 +0,0 @@
-bin
-doc
-temp.folder
-build.xml
-j2ee_ui.jar
-@dot
-src.zip
-javaCompiler...args
diff --git a/plugins/org.eclipse.jst.j2ee.ui/.project b/plugins/org.eclipse.jst.j2ee.ui/.project
deleted file mode 100644
index 937fa4b..0000000
--- a/plugins/org.eclipse.jst.j2ee.ui/.project
+++ /dev/null
@@ -1,29 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<projectDescription>
- <name>org.eclipse.jst.j2ee.ui</name>
- <comment></comment>
- <projects>
- </projects>
- <buildSpec>
- <buildCommand>
- <name>org.eclipse.jdt.core.javabuilder</name>
- <arguments>
- </arguments>
- </buildCommand>
- <buildCommand>
- <name>org.eclipse.pde.ManifestBuilder</name>
- <arguments>
- </arguments>
- </buildCommand>
- <buildCommand>
- <name>org.eclipse.pde.SchemaBuilder</name>
- <arguments>
- </arguments>
- </buildCommand>
- </buildSpec>
- <natures>
- <nature>org.eclipse.pde.PluginNature</nature>
- <nature>org.eclipse.jdt.core.javanature</nature>
- <nature>com.ibm.etools.ctc.javaprojectnature</nature>
- </natures>
-</projectDescription>
diff --git a/plugins/org.eclipse.jst.j2ee.ui/.settings/org.eclipse.core.resources.prefs b/plugins/org.eclipse.jst.j2ee.ui/.settings/org.eclipse.core.resources.prefs
deleted file mode 100644
index 04a5d48..0000000
--- a/plugins/org.eclipse.jst.j2ee.ui/.settings/org.eclipse.core.resources.prefs
+++ /dev/null
@@ -1,3 +0,0 @@
-#Wed Jul 25 14:00:45 EDT 2007
-eclipse.preferences.version=1
-encoding//j2ee_ui/org/eclipse/jst/j2ee/internal/wizard/earlibraries.properties=8859_1
diff --git a/plugins/org.eclipse.jst.j2ee.ui/.settings/org.eclipse.jdt.core.prefs b/plugins/org.eclipse.jst.j2ee.ui/.settings/org.eclipse.jdt.core.prefs
deleted file mode 100644
index 037a4e5..0000000
--- a/plugins/org.eclipse.jst.j2ee.ui/.settings/org.eclipse.jdt.core.prefs
+++ /dev/null
@@ -1,95 +0,0 @@
-#Mon Jun 08 15:35:45 EDT 2009
-org.eclipse.jdt.core.compiler.problem.unusedParameterWhenImplementingAbstract=disabled
-org.eclipse.jdt.core.compiler.problem.comparingIdentical=error
-org.eclipse.jdt.core.compiler.problem.unnecessaryElse=error
-org.eclipse.jdt.core.compiler.problem.redundantSuperinterface=error
-org.eclipse.jdt.core.compiler.problem.unusedLocal=error
-org.eclipse.jdt.core.compiler.problem.emptyStatement=error
-org.eclipse.jdt.core.compiler.problem.unusedLabel=error
-org.eclipse.jdt.core.compiler.problem.unusedParameter=warning
-org.eclipse.jdt.core.compiler.problem.rawTypeReference=warning
-org.eclipse.jdt.core.incompatibleJDKLevel=ignore
-org.eclipse.jdt.core.compiler.problem.incompatibleNonInheritedInterfaceMethod=error
-org.eclipse.jdt.core.compiler.debug.lineNumber=generate
-org.eclipse.jdt.core.compiler.problem.unusedDeclaredThrownException=warning
-org.eclipse.jdt.core.builder.cleanOutputFolder=clean
-org.eclipse.jdt.core.compiler.problem.unusedWarningToken=warning
-org.eclipse.jdt.core.compiler.problem.noImplicitStringConversion=error
-org.eclipse.jdt.core.compiler.problem.deprecationInDeprecatedCode=enabled
-org.eclipse.jdt.core.compiler.problem.deprecation=warning
-org.eclipse.jdt.core.compiler.problem.unusedParameterWhenOverridingConcrete=disabled
-org.eclipse.jdt.core.compiler.problem.missingSynchronizedOnInheritedMethod=error
-org.eclipse.jdt.core.compiler.problem.deprecationWhenOverridingDeprecatedMethod=enabled
-org.eclipse.jdt.core.compiler.problem.redundantNullCheck=error
-org.eclipse.jdt.core.compiler.problem.unusedImport=error
-org.eclipse.jdt.core.builder.recreateModifiedClassFileInOutputFolder=ignore
-org.eclipse.jdt.core.builder.resourceCopyExclusionFilter=*.launch
-org.eclipse.jdt.core.classpath.multipleOutputLocations=enabled
-org.eclipse.jdt.core.compiler.problem.suppressWarnings=enabled
-org.eclipse.jdt.core.compiler.problem.typeParameterHiding=error
-org.eclipse.jdt.core.builder.invalidClasspath=abort
-org.eclipse.jdt.core.compiler.problem.localVariableHiding=warning
-org.eclipse.jdt.core.compiler.problem.possibleAccidentalBooleanAssignment=error
-org.eclipse.jdt.core.compiler.problem.missingHashCodeMethod=error
-org.eclipse.jdt.core.codeComplete.argumentSuffixes=
-org.eclipse.jdt.core.codeComplete.argumentPrefixes=
-org.eclipse.jdt.core.compiler.problem.indirectStaticAccess=ignore
-org.eclipse.jdt.core.compiler.problem.potentialNullReference=error
-org.eclipse.jdt.core.compiler.codegen.inlineJsrBytecode=enabled
-org.eclipse.jdt.core.compiler.problem.finalParameterBound=warning
-org.eclipse.jdt.core.compiler.problem.missingSerialVersion=error
-org.eclipse.jdt.core.compiler.problem.nullReference=error
-org.eclipse.jdt.core.compiler.source=1.5
-org.eclipse.jdt.core.compiler.problem.enumIdentifier=error
-org.eclipse.jdt.core.compiler.problem.syntheticAccessEmulation=ignore
-org.eclipse.jdt.core.builder.duplicateResourceTask=warning
-org.eclipse.jdt.core.compiler.problem.fieldHiding=error
-org.eclipse.jdt.core.compiler.problem.unusedDeclaredThrownExceptionExemptExceptionAndThrowable=enabled
-org.eclipse.jdt.core.compiler.problem.missingOverrideAnnotation=error
-org.eclipse.jdt.core.compiler.problem.hiddenCatchBlock=error
-org.eclipse.jdt.core.compiler.problem.overridingPackageDefaultMethod=error
-org.eclipse.jdt.core.compiler.problem.finallyBlockNotCompletingNormally=error
-org.eclipse.jdt.core.compiler.problem.undocumentedEmptyBlock=warning
-org.eclipse.jdt.core.classpath.exclusionPatterns=enabled
-org.eclipse.jdt.core.compiler.problem.methodWithConstructorName=error
-org.eclipse.jdt.core.compiler.problem.discouragedReference=warning
-org.eclipse.jdt.core.compiler.problem.unqualifiedFieldAccess=ignore
-org.eclipse.jdt.core.compiler.problem.incompleteEnumSwitch=error
-eclipse.preferences.version=1
-org.eclipse.jdt.core.incompleteClasspath=error
-org.eclipse.jdt.core.compiler.problem.unnecessaryTypeCheck=error
-org.eclipse.jdt.core.compiler.problem.deadCode=error
-org.eclipse.jdt.core.compiler.problem.specialParameterHidingField=enabled
-org.eclipse.jdt.core.compiler.problem.fatalOptionalError=enabled
-org.eclipse.jdt.core.compiler.problem.noEffectAssignment=error
-org.eclipse.jdt.core.compiler.debug.sourceFile=generate
-org.eclipse.jdt.core.compiler.problem.unusedDeclaredThrownExceptionIncludeUncheckedExceptions=disabled
-org.eclipse.jdt.core.compiler.problem.missingDeprecatedAnnotation=warning
-org.eclipse.jdt.core.codeComplete.fieldPrefixes=
-org.eclipse.jdt.core.compiler.problem.fallthroughCase=error
-org.eclipse.jdt.core.compiler.codegen.targetPlatform=1.5
-org.eclipse.jdt.core.compiler.problem.unusedPrivateMember=error
-org.eclipse.jdt.core.compiler.problem.autoboxing=warning
-org.eclipse.jdt.core.circularClasspath=error
-org.eclipse.jdt.core.compiler.problem.annotationSuperInterface=warning
-org.eclipse.jdt.core.compiler.problem.nonExternalizedStringLiteral=error
-org.eclipse.jdt.core.codeComplete.fieldSuffixes=
-org.eclipse.jdt.core.codeComplete.localSuffixes=
-org.eclipse.jdt.core.compiler.problem.parameterAssignment=error
-org.eclipse.jdt.core.compiler.problem.staticAccessReceiver=error
-org.eclipse.jdt.core.codeComplete.localPrefixes=
-org.eclipse.jdt.core.compiler.problem.unusedDeclaredThrownExceptionIncludeDocCommentReference=enabled
-org.eclipse.jdt.core.compiler.maxProblemPerUnit=100
-org.eclipse.jdt.core.compiler.problem.varargsArgumentNeedCast=error
-org.eclipse.jdt.core.compiler.problem.assertIdentifier=error
-org.eclipse.jdt.core.compiler.compliance=1.5
-org.eclipse.jdt.core.compiler.problem.unusedParameterIncludeDocCommentReference=enabled
-org.eclipse.jdt.core.codeComplete.staticFieldPrefixes=
-org.eclipse.jdt.core.compiler.debug.localVariable=generate
-org.eclipse.jdt.core.compiler.problem.unhandledWarningToken=warning
-instance/org.eclipse.core.net/org.eclipse.core.net.hasMigrated=true
-org.eclipse.jdt.core.compiler.problem.forbiddenReference=error
-org.eclipse.jdt.core.compiler.codegen.unusedLocal=preserve
-org.eclipse.jdt.core.compiler.problem.uncheckedTypeOperation=warning
-org.eclipse.jdt.core.compiler.problem.unusedDeclaredThrownExceptionWhenOverriding=disabled
-org.eclipse.jdt.core.codeComplete.staticFieldSuffixes=
diff --git a/plugins/org.eclipse.jst.j2ee.ui/.settings/org.eclipse.jdt.ui.prefs b/plugins/org.eclipse.jst.j2ee.ui/.settings/org.eclipse.jdt.ui.prefs
deleted file mode 100644
index 6cf9579..0000000
--- a/plugins/org.eclipse.jst.j2ee.ui/.settings/org.eclipse.jdt.ui.prefs
+++ /dev/null
@@ -1,3 +0,0 @@
-#Fri Apr 13 14:16:39 EDT 2007
-eclipse.preferences.version=1
-internal.default.compliance=default
diff --git a/plugins/org.eclipse.jst.j2ee.ui/META-INF/MANIFEST.MF b/plugins/org.eclipse.jst.j2ee.ui/META-INF/MANIFEST.MF
deleted file mode 100644
index a791632..0000000
--- a/plugins/org.eclipse.jst.j2ee.ui/META-INF/MANIFEST.MF
+++ /dev/null
@@ -1,80 +0,0 @@
-Manifest-Version: 1.0
-Bundle-ManifestVersion: 2
-Bundle-Name: %Bundle-Name.0
-Bundle-SymbolicName: org.eclipse.jst.j2ee.ui; singleton:=true
-Bundle-Version: 1.1.404.qualifier
-Bundle-Activator: org.eclipse.jst.j2ee.internal.plugin.J2EEUIPlugin
-Bundle-Vendor: %Bundle-Vendor.0
-Bundle-Localization: plugin
-Export-Package: org.eclipse.jst.common.jdt.internal.integration.ui;x-internal:=true,
- org.eclipse.jst.j2ee.internal;x-internal:=true,
- org.eclipse.jst.j2ee.internal.actions;x-internal:=true,
- org.eclipse.jst.j2ee.internal.classpathdep.ui,
- org.eclipse.jst.j2ee.internal.client.actions;x-internal:=true,
- org.eclipse.jst.j2ee.internal.command;x-internal:=true,
- org.eclipse.jst.j2ee.internal.deployables;x-internal:=true,
- org.eclipse.jst.j2ee.internal.dialogs;x-internal:=true,
- org.eclipse.jst.j2ee.internal.ejb.provider;x-internal:=true,
- org.eclipse.jst.j2ee.internal.listeners;x-internal:=true,
- org.eclipse.jst.j2ee.internal.perspective;x-internal:=true,
- org.eclipse.jst.j2ee.internal.plugin;x-internal:=true,
- org.eclipse.jst.j2ee.internal.provider;x-internal:=true,
- org.eclipse.jst.j2ee.internal.ui;x-internal:=true,
- org.eclipse.jst.j2ee.internal.ui.util;x-internal:=true,
- org.eclipse.jst.j2ee.internal.war.ui.util;x-internal:=true,
- org.eclipse.jst.j2ee.internal.wizard;x-internal:=true,
- org.eclipse.jst.j2ee.ui.archive,
- org.eclipse.jst.j2ee.ui.archive.internal,
- org.eclipse.jst.j2ee.ui.project.facet,
- org.eclipse.jst.j2ee.ui.project.facet.appclient,
- org.eclipse.jst.j2ee.internal.ui.preferences
-Require-Bundle: org.eclipse.ui.ide;bundle-version="[3.2.0,4.0.0)",
- org.eclipse.core.resources;bundle-version="[3.2.0,4.0.0)",
- org.eclipse.ui;bundle-version="[3.2.0,4.0.0)",
- org.eclipse.wst.common.frameworks.ui;bundle-version="[1.2.0,2.0.0)",
- org.eclipse.jst.j2ee;bundle-version="[1.1.0,1.2.0)",
- org.eclipse.jst.j2ee.ejb;bundle-version="[1.1.0,1.2.0)",
- org.eclipse.jst.j2ee.jca;bundle-version="[1.1.0,1.2.0)",
- org.eclipse.jst.j2ee.web;bundle-version="[1.1.0,1.2.0)",
- org.eclipse.emf.edit.ui;bundle-version="[2.2.0,3.0.0)",
- org.eclipse.jdt.ui;bundle-version="[3.2.0,4.0.0)",
- org.eclipse.wst.validation;bundle-version="[1.2.0,2.0.0)",
- org.eclipse.jst.j2ee.core;bundle-version="[1.1.0,2.0.0)",
- org.eclipse.wst.common.emfworkbench.integration;bundle-version="[1.2.0,2.0.0)",
- org.eclipse.jem.workbench;bundle-version="[2.0.0,3.0.0)",
- org.eclipse.jem;bundle-version="[2.0.0,3.0.0)",
- org.eclipse.core.runtime;bundle-version="[3.2.0,4.0.0)",
- org.eclipse.wst.common.frameworks;bundle-version="[1.2.0,2.0.0)",
- org.eclipse.jdt.core;bundle-version="[3.2.0,4.0.0)",
- org.eclipse.wst.server.core;bundle-version="[1.0.102,2.0.0)",
- org.eclipse.wst.server.ui;bundle-version="[1.0.102,2.0.0)",
- org.eclipse.wst.common.emf;bundle-version="[1.2.0,2.0.0)",
- org.eclipse.emf.ecore.xmi;bundle-version="[2.2.0,3.0.0)",
- org.eclipse.ltk.core.refactoring;bundle-version="[3.2.0,4.0.0)",
- org.eclipse.ltk.ui.refactoring;bundle-version="[3.2.0,4.0.0)",
- org.eclipse.jface.text;bundle-version="[3.2.0,4.0.0)",
- org.eclipse.wst.web;bundle-version="[1.1.0,1.2.0)",
- org.eclipse.debug.ui;bundle-version="[3.2.0,4.0.0)",
- org.eclipse.ui.editors;bundle-version="[3.2.0,4.0.0)",
- org.eclipse.ui.workbench.texteditor;bundle-version="[3.2.0,4.0.0)",
- org.eclipse.wst.sse.core;bundle-version="[1.1.0,1.2.0)",
- org.eclipse.wst.common.modulecore;bundle-version="[1.2.0,2.0.0)",
- org.eclipse.jst.common.frameworks;bundle-version="[1.1.0,1.2.0)",
- org.eclipse.jem.util;bundle-version="[2.0.0,3.0.0)",
- org.eclipse.jst.common.annotations.controller;bundle-version="[1.1.0,1.2.0)",
- org.eclipse.jst.j2ee.ejb.annotation.model;bundle-version="[1.1.0,1.2.0)",
- org.eclipse.wst.common.project.facet.core;bundle-version="[1.3.0,2.0.0)",
- org.eclipse.wst.common.project.facet.ui;bundle-version="[1.3.0,2.0.0)",
- org.eclipse.jst.server.core;bundle-version="[1.0.102,2.0.0)",
- org.eclipse.wst.web.ui;bundle-version="[1.1.0,1.2.0)",
- org.eclipse.ui.navigator.resources;bundle-version="[3.2.0,4.0.0)",
- com.ibm.icu;bundle-version="3.8.1",
- org.eclipse.ui.forms;bundle-version="[3.2.0,4.0.0)",
- org.eclipse.ui.navigator;bundle-version="[3.2.0,4.0.0)",
- org.eclipse.jst.jee;bundle-version="[1.0.0,1.1.0)",
- org.eclipse.jst.common.project.facet.ui;bundle-version="[1.3.1,2.0.0)",
- org.eclipse.jst.common.project.facet.core;bundle-version="[1.3.100,2.0.0)",
- org.eclipse.wst.common.modulecore.ui;bundle-version="1.0.0",
- org.eclipse.jst.common.ui;bundle-version="1.0.0"
-Eclipse-LazyStart: true
-Bundle-RequiredExecutionEnvironment: J2SE-1.5
diff --git a/plugins/org.eclipse.jst.j2ee.ui/about.html b/plugins/org.eclipse.jst.j2ee.ui/about.html
deleted file mode 100644
index 2199df3..0000000
--- a/plugins/org.eclipse.jst.j2ee.ui/about.html
+++ /dev/null
@@ -1,34 +0,0 @@
-<!DOCTYPE HTML PUBLIC "-//W3C//DTD HTML 4.0//EN">
-<HTML>
-
-<head>
-<title>About</title>
-<meta http-equiv=Content-Type content="text/html; charset=ISO-8859-1">
-</head>
-
-<BODY lang="EN-US">
-
-<H3>About This Content</H3>
-
-<P>June, 2008</P>
-
-<H3>License</H3>
-
-<P>The Eclipse Foundation makes available all content in this plug-in
-("Content"). Unless otherwise indicated below, the Content is provided to you
-under the terms and conditions of the Eclipse Public License Version 1.0
-("EPL"). A copy of the EPL is available at
-<A href="http://www.eclipse.org/org/documents/epl-v10.php">http://www.eclipse.org/org/documents/epl-v10.php</A>.
-For purposes of the EPL, "Program" will mean the Content.</P>
-
-<P>If you did not receive this Content directly from the Eclipse Foundation, the
-Content is being redistributed by another party ("Redistributor") and different
-terms and conditions may apply to your use of any object code in the Content.
-Check the Redistributors license that was provided with the Content. If no such
-license exists, contact the Redistributor. Unless otherwise indicated below, the
-terms and conditions of the EPL still apply to any source code in the Content
-and such source code may be obtained at
-<A href="http://www.eclipse.org/">http://www.eclipse.org/</A>.</P>
-
-</BODY>
-</HTML>
diff --git a/plugins/org.eclipse.jst.j2ee.ui/build.properties b/plugins/org.eclipse.jst.j2ee.ui/build.properties
deleted file mode 100644
index c031d2c..0000000
--- a/plugins/org.eclipse.jst.j2ee.ui/build.properties
+++ /dev/null
@@ -1,20 +0,0 @@
-###############################################################################
-# Copyright (c) 2003, 2005 IBM Corporation and others.
-# All rights reserved. This program and the accompanying materials
-# are made available under the terms of the Eclipse Public License v1.0
-# which accompanies this distribution, and is available at
-# http://www.eclipse.org/legal/epl-v10.html
-#
-# Contributors:
-# IBM Corporation - initial API and implementation
-###############################################################################
-bin.includes = plugin.xml,\
- icons/,\
- plugin.properties,\
- .,\
- META-INF/,\
- about.html
-jars.compile.order = .
-source.. = j2ee_ui/,\
- property_files/
-output.. = bin/
diff --git a/plugins/org.eclipse.jst.j2ee.ui/icons/20_cmpbean_obj.gif b/plugins/org.eclipse.jst.j2ee.ui/icons/20_cmpbean_obj.gif
deleted file mode 100644
index 023fe8d..0000000
--- a/plugins/org.eclipse.jst.j2ee.ui/icons/20_cmpbean_obj.gif
+++ /dev/null
Binary files differ
diff --git a/plugins/org.eclipse.jst.j2ee.ui/icons/adown.gif b/plugins/org.eclipse.jst.j2ee.ui/icons/adown.gif
deleted file mode 100644
index 91e708f..0000000
--- a/plugins/org.eclipse.jst.j2ee.ui/icons/adown.gif
+++ /dev/null
Binary files differ
diff --git a/plugins/org.eclipse.jst.j2ee.ui/icons/appclientgroup_obj.gif b/plugins/org.eclipse.jst.j2ee.ui/icons/appclientgroup_obj.gif
deleted file mode 100644
index 2768428..0000000
--- a/plugins/org.eclipse.jst.j2ee.ui/icons/appclientgroup_obj.gif
+++ /dev/null
Binary files differ
diff --git a/plugins/org.eclipse.jst.j2ee.ui/icons/arrow_down.gif b/plugins/org.eclipse.jst.j2ee.ui/icons/arrow_down.gif
deleted file mode 100644
index 3c455c9..0000000
--- a/plugins/org.eclipse.jst.j2ee.ui/icons/arrow_down.gif
+++ /dev/null
Binary files differ
diff --git a/plugins/org.eclipse.jst.j2ee.ui/icons/arrowp.gif b/plugins/org.eclipse.jst.j2ee.ui/icons/arrowp.gif
deleted file mode 100644
index a906320..0000000
--- a/plugins/org.eclipse.jst.j2ee.ui/icons/arrowp.gif
+++ /dev/null
Binary files differ
diff --git a/plugins/org.eclipse.jst.j2ee.ui/icons/cascade_left.gif b/plugins/org.eclipse.jst.j2ee.ui/icons/cascade_left.gif
deleted file mode 100644
index 788e76d..0000000
--- a/plugins/org.eclipse.jst.j2ee.ui/icons/cascade_left.gif
+++ /dev/null
Binary files differ
diff --git a/plugins/org.eclipse.jst.j2ee.ui/icons/cascade_left2.gif b/plugins/org.eclipse.jst.j2ee.ui/icons/cascade_left2.gif
deleted file mode 100644
index 3e31054..0000000
--- a/plugins/org.eclipse.jst.j2ee.ui/icons/cascade_left2.gif
+++ /dev/null
Binary files differ
diff --git a/plugins/org.eclipse.jst.j2ee.ui/icons/cascade_right.gif b/plugins/org.eclipse.jst.j2ee.ui/icons/cascade_right.gif
deleted file mode 100644
index 573b60f..0000000
--- a/plugins/org.eclipse.jst.j2ee.ui/icons/cascade_right.gif
+++ /dev/null
Binary files differ
diff --git a/plugins/org.eclipse.jst.j2ee.ui/icons/cmp.gif b/plugins/org.eclipse.jst.j2ee.ui/icons/cmp.gif
deleted file mode 100644
index 20ed1f9..0000000
--- a/plugins/org.eclipse.jst.j2ee.ui/icons/cmp.gif
+++ /dev/null
Binary files differ
diff --git a/plugins/org.eclipse.jst.j2ee.ui/icons/connectorgroup_obj.gif b/plugins/org.eclipse.jst.j2ee.ui/icons/connectorgroup_obj.gif
deleted file mode 100644
index ad3af3c..0000000
--- a/plugins/org.eclipse.jst.j2ee.ui/icons/connectorgroup_obj.gif
+++ /dev/null
Binary files differ
diff --git a/plugins/org.eclipse.jst.j2ee.ui/icons/deadend.gif b/plugins/org.eclipse.jst.j2ee.ui/icons/deadend.gif
deleted file mode 100644
index 5df6193..0000000
--- a/plugins/org.eclipse.jst.j2ee.ui/icons/deadend.gif
+++ /dev/null
Binary files differ
diff --git a/plugins/org.eclipse.jst.j2ee.ui/icons/ear-wiz-banner.gif b/plugins/org.eclipse.jst.j2ee.ui/icons/ear-wiz-banner.gif
deleted file mode 100644
index 625e763..0000000
--- a/plugins/org.eclipse.jst.j2ee.ui/icons/ear-wiz-banner.gif
+++ /dev/null
Binary files differ
diff --git a/plugins/org.eclipse.jst.j2ee.ui/icons/ear-wiz-icon.gif b/plugins/org.eclipse.jst.j2ee.ui/icons/ear-wiz-icon.gif
deleted file mode 100644
index 8b409b5..0000000
--- a/plugins/org.eclipse.jst.j2ee.ui/icons/ear-wiz-icon.gif
+++ /dev/null
Binary files differ
diff --git a/plugins/org.eclipse.jst.j2ee.ui/icons/ear.gif b/plugins/org.eclipse.jst.j2ee.ui/icons/ear.gif
deleted file mode 100644
index f52fa97..0000000
--- a/plugins/org.eclipse.jst.j2ee.ui/icons/ear.gif
+++ /dev/null
Binary files differ
diff --git a/plugins/org.eclipse.jst.j2ee.ui/icons/eargroup_obj.gif b/plugins/org.eclipse.jst.j2ee.ui/icons/eargroup_obj.gif
deleted file mode 100644
index 2eeb3ef..0000000
--- a/plugins/org.eclipse.jst.j2ee.ui/icons/eargroup_obj.gif
+++ /dev/null
Binary files differ
diff --git a/plugins/org.eclipse.jst.j2ee.ui/icons/ejbgroup_obj.gif b/plugins/org.eclipse.jst.j2ee.ui/icons/ejbgroup_obj.gif
deleted file mode 100644
index b0adb3e..0000000
--- a/plugins/org.eclipse.jst.j2ee.ui/icons/ejbgroup_obj.gif
+++ /dev/null
Binary files differ
diff --git a/plugins/org.eclipse.jst.j2ee.ui/icons/folder.gif b/plugins/org.eclipse.jst.j2ee.ui/icons/folder.gif
deleted file mode 100644
index c91b267..0000000
--- a/plugins/org.eclipse.jst.j2ee.ui/icons/folder.gif
+++ /dev/null
Binary files differ
diff --git a/plugins/org.eclipse.jst.j2ee.ui/icons/full/clcl16/ejb_client_remove_action_obj.gif b/plugins/org.eclipse.jst.j2ee.ui/icons/full/clcl16/ejb_client_remove_action_obj.gif
deleted file mode 100644
index 1823211..0000000
--- a/plugins/org.eclipse.jst.j2ee.ui/icons/full/clcl16/ejb_client_remove_action_obj.gif
+++ /dev/null
Binary files differ
diff --git a/plugins/org.eclipse.jst.j2ee.ui/icons/full/clcl16/ejb_deploy_action_obj.gif b/plugins/org.eclipse.jst.j2ee.ui/icons/full/clcl16/ejb_deploy_action_obj.gif
deleted file mode 100644
index db8945f..0000000
--- a/plugins/org.eclipse.jst.j2ee.ui/icons/full/clcl16/ejb_deploy_action_obj.gif
+++ /dev/null
Binary files differ
diff --git a/plugins/org.eclipse.jst.j2ee.ui/icons/full/ctool16/appclient_export.gif b/plugins/org.eclipse.jst.j2ee.ui/icons/full/ctool16/appclient_export.gif
deleted file mode 100644
index 6f83300..0000000
--- a/plugins/org.eclipse.jst.j2ee.ui/icons/full/ctool16/appclient_export.gif
+++ /dev/null
Binary files differ
diff --git a/plugins/org.eclipse.jst.j2ee.ui/icons/full/ctool16/appclient_import_wiz.gif b/plugins/org.eclipse.jst.j2ee.ui/icons/full/ctool16/appclient_import_wiz.gif
deleted file mode 100644
index ce667f4..0000000
--- a/plugins/org.eclipse.jst.j2ee.ui/icons/full/ctool16/appclient_import_wiz.gif
+++ /dev/null
Binary files differ
diff --git a/plugins/org.eclipse.jst.j2ee.ui/icons/full/ctool16/ejbclientjar_wiz.gif b/plugins/org.eclipse.jst.j2ee.ui/icons/full/ctool16/ejbclientjar_wiz.gif
deleted file mode 100644
index 6e65e7d..0000000
--- a/plugins/org.eclipse.jst.j2ee.ui/icons/full/ctool16/ejbclientjar_wiz.gif
+++ /dev/null
Binary files differ
diff --git a/plugins/org.eclipse.jst.j2ee.ui/icons/full/ctool16/export_ear.gif b/plugins/org.eclipse.jst.j2ee.ui/icons/full/ctool16/export_ear.gif
deleted file mode 100644
index 2270b17..0000000
--- a/plugins/org.eclipse.jst.j2ee.ui/icons/full/ctool16/export_ear.gif
+++ /dev/null
Binary files differ
diff --git a/plugins/org.eclipse.jst.j2ee.ui/icons/full/ctool16/export_ejbjar_wiz.gif b/plugins/org.eclipse.jst.j2ee.ui/icons/full/ctool16/export_ejbjar_wiz.gif
deleted file mode 100644
index 72cd417..0000000
--- a/plugins/org.eclipse.jst.j2ee.ui/icons/full/ctool16/export_ejbjar_wiz.gif
+++ /dev/null
Binary files differ
diff --git a/plugins/org.eclipse.jst.j2ee.ui/icons/full/ctool16/export_rar.gif b/plugins/org.eclipse.jst.j2ee.ui/icons/full/ctool16/export_rar.gif
deleted file mode 100644
index befb3d4..0000000
--- a/plugins/org.eclipse.jst.j2ee.ui/icons/full/ctool16/export_rar.gif
+++ /dev/null
Binary files differ
diff --git a/plugins/org.eclipse.jst.j2ee.ui/icons/full/ctool16/exportwar_wiz.gif b/plugins/org.eclipse.jst.j2ee.ui/icons/full/ctool16/exportwar_wiz.gif
deleted file mode 100644
index ced859d..0000000
--- a/plugins/org.eclipse.jst.j2ee.ui/icons/full/ctool16/exportwar_wiz.gif
+++ /dev/null
Binary files differ
diff --git a/plugins/org.eclipse.jst.j2ee.ui/icons/full/ctool16/import_ear.gif b/plugins/org.eclipse.jst.j2ee.ui/icons/full/ctool16/import_ear.gif
deleted file mode 100644
index 099201b..0000000
--- a/plugins/org.eclipse.jst.j2ee.ui/icons/full/ctool16/import_ear.gif
+++ /dev/null
Binary files differ
diff --git a/plugins/org.eclipse.jst.j2ee.ui/icons/full/ctool16/import_ejbjar.gif b/plugins/org.eclipse.jst.j2ee.ui/icons/full/ctool16/import_ejbjar.gif
deleted file mode 100644
index 5644b48..0000000
--- a/plugins/org.eclipse.jst.j2ee.ui/icons/full/ctool16/import_ejbjar.gif
+++ /dev/null
Binary files differ
diff --git a/plugins/org.eclipse.jst.j2ee.ui/icons/full/ctool16/import_rar.gif b/plugins/org.eclipse.jst.j2ee.ui/icons/full/ctool16/import_rar.gif
deleted file mode 100644
index 50f25a2..0000000
--- a/plugins/org.eclipse.jst.j2ee.ui/icons/full/ctool16/import_rar.gif
+++ /dev/null
Binary files differ
diff --git a/plugins/org.eclipse.jst.j2ee.ui/icons/full/ctool16/importwar_wiz.gif b/plugins/org.eclipse.jst.j2ee.ui/icons/full/ctool16/importwar_wiz.gif
deleted file mode 100644
index 432c066..0000000
--- a/plugins/org.eclipse.jst.j2ee.ui/icons/full/ctool16/importwar_wiz.gif
+++ /dev/null
Binary files differ
diff --git a/plugins/org.eclipse.jst.j2ee.ui/icons/full/ctool16/newappclient_wiz.gif b/plugins/org.eclipse.jst.j2ee.ui/icons/full/ctool16/newappclient_wiz.gif
deleted file mode 100644
index 0ce86a1..0000000
--- a/plugins/org.eclipse.jst.j2ee.ui/icons/full/ctool16/newappclient_wiz.gif
+++ /dev/null
Binary files differ
diff --git a/plugins/org.eclipse.jst.j2ee.ui/icons/full/ctool16/newconnectionprj_wiz.gif b/plugins/org.eclipse.jst.j2ee.ui/icons/full/ctool16/newconnectionprj_wiz.gif
deleted file mode 100644
index 1bec6ba..0000000
--- a/plugins/org.eclipse.jst.j2ee.ui/icons/full/ctool16/newconnectionprj_wiz.gif
+++ /dev/null
Binary files differ
diff --git a/plugins/org.eclipse.jst.j2ee.ui/icons/full/ctool16/newear_wiz.gif b/plugins/org.eclipse.jst.j2ee.ui/icons/full/ctool16/newear_wiz.gif
deleted file mode 100644
index 8b409b5..0000000
--- a/plugins/org.eclipse.jst.j2ee.ui/icons/full/ctool16/newear_wiz.gif
+++ /dev/null
Binary files differ
diff --git a/plugins/org.eclipse.jst.j2ee.ui/icons/full/ctool16/newejbprj_wiz.gif b/plugins/org.eclipse.jst.j2ee.ui/icons/full/ctool16/newejbprj_wiz.gif
deleted file mode 100644
index ecda22b..0000000
--- a/plugins/org.eclipse.jst.j2ee.ui/icons/full/ctool16/newejbprj_wiz.gif
+++ /dev/null
Binary files differ
diff --git a/plugins/org.eclipse.jst.j2ee.ui/icons/full/ctool16/newwar_wiz.gif b/plugins/org.eclipse.jst.j2ee.ui/icons/full/ctool16/newwar_wiz.gif
deleted file mode 100644
index b9ac6be..0000000
--- a/plugins/org.eclipse.jst.j2ee.ui/icons/full/ctool16/newwar_wiz.gif
+++ /dev/null
Binary files differ
diff --git a/plugins/org.eclipse.jst.j2ee.ui/icons/full/ctool16/re_execute.gif b/plugins/org.eclipse.jst.j2ee.ui/icons/full/ctool16/re_execute.gif
deleted file mode 100644
index 8f943a8..0000000
--- a/plugins/org.eclipse.jst.j2ee.ui/icons/full/ctool16/re_execute.gif
+++ /dev/null
Binary files differ
diff --git a/plugins/org.eclipse.jst.j2ee.ui/icons/full/cview16/j2ee_perspective.gif b/plugins/org.eclipse.jst.j2ee.ui/icons/full/cview16/j2ee_perspective.gif
deleted file mode 100644
index 20acd4c..0000000
--- a/plugins/org.eclipse.jst.j2ee.ui/icons/full/cview16/j2ee_perspective.gif
+++ /dev/null
Binary files differ
diff --git a/plugins/org.eclipse.jst.j2ee.ui/icons/full/cview16/j2ee_view.gif b/plugins/org.eclipse.jst.j2ee.ui/icons/full/cview16/j2ee_view.gif
deleted file mode 100644
index 20acd4c..0000000
--- a/plugins/org.eclipse.jst.j2ee.ui/icons/full/cview16/j2ee_view.gif
+++ /dev/null
Binary files differ
diff --git a/plugins/org.eclipse.jst.j2ee.ui/icons/full/dlcl16/ejb_client_remove_action_obj.gif b/plugins/org.eclipse.jst.j2ee.ui/icons/full/dlcl16/ejb_client_remove_action_obj.gif
deleted file mode 100644
index 928a0bf..0000000
--- a/plugins/org.eclipse.jst.j2ee.ui/icons/full/dlcl16/ejb_client_remove_action_obj.gif
+++ /dev/null
Binary files differ
diff --git a/plugins/org.eclipse.jst.j2ee.ui/icons/full/dlcl16/ejb_deploy_action_obj.gif b/plugins/org.eclipse.jst.j2ee.ui/icons/full/dlcl16/ejb_deploy_action_obj.gif
deleted file mode 100644
index 9657388..0000000
--- a/plugins/org.eclipse.jst.j2ee.ui/icons/full/dlcl16/ejb_deploy_action_obj.gif
+++ /dev/null
Binary files differ
diff --git a/plugins/org.eclipse.jst.j2ee.ui/icons/full/obj16/13_ear_obj.gif b/plugins/org.eclipse.jst.j2ee.ui/icons/full/obj16/13_ear_obj.gif
deleted file mode 100644
index 54b9b17..0000000
--- a/plugins/org.eclipse.jst.j2ee.ui/icons/full/obj16/13_ear_obj.gif
+++ /dev/null
Binary files differ
diff --git a/plugins/org.eclipse.jst.j2ee.ui/icons/full/obj16/21_cmpbean_obj.gif b/plugins/org.eclipse.jst.j2ee.ui/icons/full/obj16/21_cmpbean_obj.gif
deleted file mode 100644
index 35835bc..0000000
--- a/plugins/org.eclipse.jst.j2ee.ui/icons/full/obj16/21_cmpbean_obj.gif
+++ /dev/null
Binary files differ
diff --git a/plugins/org.eclipse.jst.j2ee.ui/icons/full/obj16/21_ejb_obj.gif b/plugins/org.eclipse.jst.j2ee.ui/icons/full/obj16/21_ejb_obj.gif
deleted file mode 100644
index 673ba6a..0000000
--- a/plugins/org.eclipse.jst.j2ee.ui/icons/full/obj16/21_ejb_obj.gif
+++ /dev/null
Binary files differ
diff --git a/plugins/org.eclipse.jst.j2ee.ui/icons/full/obj16/21_ejbjar_wiz.gif b/plugins/org.eclipse.jst.j2ee.ui/icons/full/obj16/21_ejbjar_wiz.gif
deleted file mode 100644
index 9dae052..0000000
--- a/plugins/org.eclipse.jst.j2ee.ui/icons/full/obj16/21_ejbjar_wiz.gif
+++ /dev/null
Binary files differ
diff --git a/plugins/org.eclipse.jst.j2ee.ui/icons/full/obj16/annotation_positioned_overlay.gif b/plugins/org.eclipse.jst.j2ee.ui/icons/full/obj16/annotation_positioned_overlay.gif
deleted file mode 100644
index cec1d2d..0000000
--- a/plugins/org.eclipse.jst.j2ee.ui/icons/full/obj16/annotation_positioned_overlay.gif
+++ /dev/null
Binary files differ
diff --git a/plugins/org.eclipse.jst.j2ee.ui/icons/full/obj16/appclient_14.gif b/plugins/org.eclipse.jst.j2ee.ui/icons/full/obj16/appclient_14.gif
deleted file mode 100644
index b248380..0000000
--- a/plugins/org.eclipse.jst.j2ee.ui/icons/full/obj16/appclient_14.gif
+++ /dev/null
Binary files differ
diff --git a/plugins/org.eclipse.jst.j2ee.ui/icons/full/obj16/appclient_14_deploy.gif b/plugins/org.eclipse.jst.j2ee.ui/icons/full/obj16/appclient_14_deploy.gif
deleted file mode 100644
index b0d08af..0000000
--- a/plugins/org.eclipse.jst.j2ee.ui/icons/full/obj16/appclient_14_deploy.gif
+++ /dev/null
Binary files differ
diff --git a/plugins/org.eclipse.jst.j2ee.ui/icons/full/obj16/extwebserviceitemprovider_obj.gif b/plugins/org.eclipse.jst.j2ee.ui/icons/full/obj16/extwebserviceitemprovider_obj.gif
deleted file mode 100644
index f4cc6e3..0000000
--- a/plugins/org.eclipse.jst.j2ee.ui/icons/full/obj16/extwebserviceitemprovider_obj.gif
+++ /dev/null
Binary files differ
diff --git a/plugins/org.eclipse.jst.j2ee.ui/icons/full/obj16/home_interface_positioned_overlay.gif b/plugins/org.eclipse.jst.j2ee.ui/icons/full/obj16/home_interface_positioned_overlay.gif
deleted file mode 100644
index 91a756a..0000000
--- a/plugins/org.eclipse.jst.j2ee.ui/icons/full/obj16/home_interface_positioned_overlay.gif
+++ /dev/null
Binary files differ
diff --git a/plugins/org.eclipse.jst.j2ee.ui/icons/full/obj16/library_obj.gif b/plugins/org.eclipse.jst.j2ee.ui/icons/full/obj16/library_obj.gif
deleted file mode 100644
index cb55e33..0000000
--- a/plugins/org.eclipse.jst.j2ee.ui/icons/full/obj16/library_obj.gif
+++ /dev/null
Binary files differ
diff --git a/plugins/org.eclipse.jst.j2ee.ui/icons/full/obj16/local_home_interface_positioned_overlay.gif b/plugins/org.eclipse.jst.j2ee.ui/icons/full/obj16/local_home_interface_positioned_overlay.gif
deleted file mode 100644
index e5d6090..0000000
--- a/plugins/org.eclipse.jst.j2ee.ui/icons/full/obj16/local_home_interface_positioned_overlay.gif
+++ /dev/null
Binary files differ
diff --git a/plugins/org.eclipse.jst.j2ee.ui/icons/full/obj16/local_interface_positioned_overlay.gif b/plugins/org.eclipse.jst.j2ee.ui/icons/full/obj16/local_interface_positioned_overlay.gif
deleted file mode 100644
index 156febe..0000000
--- a/plugins/org.eclipse.jst.j2ee.ui/icons/full/obj16/local_interface_positioned_overlay.gif
+++ /dev/null
Binary files differ
diff --git a/plugins/org.eclipse.jst.j2ee.ui/icons/full/obj16/remote_interface_positioned_overlay.gif b/plugins/org.eclipse.jst.j2ee.ui/icons/full/obj16/remote_interface_positioned_overlay.gif
deleted file mode 100644
index 203e398..0000000
--- a/plugins/org.eclipse.jst.j2ee.ui/icons/full/obj16/remote_interface_positioned_overlay.gif
+++ /dev/null
Binary files differ
diff --git a/plugins/org.eclipse.jst.j2ee.ui/icons/full/obj16/service_interface_positioned_overlay.gif b/plugins/org.eclipse.jst.j2ee.ui/icons/full/obj16/service_interface_positioned_overlay.gif
deleted file mode 100644
index 6146667..0000000
--- a/plugins/org.eclipse.jst.j2ee.ui/icons/full/obj16/service_interface_positioned_overlay.gif
+++ /dev/null
Binary files differ
diff --git a/plugins/org.eclipse.jst.j2ee.ui/icons/full/obj16/webServiceItemProvider_obj.gif b/plugins/org.eclipse.jst.j2ee.ui/icons/full/obj16/webServiceItemProvider_obj.gif
deleted file mode 100644
index 8fb844f..0000000
--- a/plugins/org.eclipse.jst.j2ee.ui/icons/full/obj16/webServiceItemProvider_obj.gif
+++ /dev/null
Binary files differ
diff --git a/plugins/org.eclipse.jst.j2ee.ui/icons/full/obj16/webServicesFolder_obj.gif b/plugins/org.eclipse.jst.j2ee.ui/icons/full/obj16/webServicesFolder_obj.gif
deleted file mode 100644
index ab3039c..0000000
--- a/plugins/org.eclipse.jst.j2ee.ui/icons/full/obj16/webServicesFolder_obj.gif
+++ /dev/null
Binary files differ
diff --git a/plugins/org.eclipse.jst.j2ee.ui/icons/full/obj16/webapp_14.gif b/plugins/org.eclipse.jst.j2ee.ui/icons/full/obj16/webapp_14.gif
deleted file mode 100644
index 83f9165..0000000
--- a/plugins/org.eclipse.jst.j2ee.ui/icons/full/obj16/webapp_14.gif
+++ /dev/null
Binary files differ
diff --git a/plugins/org.eclipse.jst.j2ee.ui/icons/full/obj16/webapp_deploy.gif b/plugins/org.eclipse.jst.j2ee.ui/icons/full/obj16/webapp_deploy.gif
deleted file mode 100644
index 80531e3..0000000
--- a/plugins/org.eclipse.jst.j2ee.ui/icons/full/obj16/webapp_deploy.gif
+++ /dev/null
Binary files differ
diff --git a/plugins/org.eclipse.jst.j2ee.ui/icons/full/ovr16/annotation_bean_overlay.gif b/plugins/org.eclipse.jst.j2ee.ui/icons/full/ovr16/annotation_bean_overlay.gif
deleted file mode 100644
index f277755..0000000
--- a/plugins/org.eclipse.jst.j2ee.ui/icons/full/ovr16/annotation_bean_overlay.gif
+++ /dev/null
Binary files differ
diff --git a/plugins/org.eclipse.jst.j2ee.ui/icons/full/ovr16/annotation_positioned_overlay.gif b/plugins/org.eclipse.jst.j2ee.ui/icons/full/ovr16/annotation_positioned_overlay.gif
deleted file mode 100644
index cec1d2d..0000000
--- a/plugins/org.eclipse.jst.j2ee.ui/icons/full/ovr16/annotation_positioned_overlay.gif
+++ /dev/null
Binary files differ
diff --git a/plugins/org.eclipse.jst.j2ee.ui/icons/full/ovr16/client_app_ovr.gif b/plugins/org.eclipse.jst.j2ee.ui/icons/full/ovr16/client_app_ovr.gif
deleted file mode 100644
index 3ff1ca5..0000000
--- a/plugins/org.eclipse.jst.j2ee.ui/icons/full/ovr16/client_app_ovr.gif
+++ /dev/null
Binary files differ
diff --git a/plugins/org.eclipse.jst.j2ee.ui/icons/full/ovr16/connector_ovr.gif b/plugins/org.eclipse.jst.j2ee.ui/icons/full/ovr16/connector_ovr.gif
deleted file mode 100644
index b7e77bc..0000000
--- a/plugins/org.eclipse.jst.j2ee.ui/icons/full/ovr16/connector_ovr.gif
+++ /dev/null
Binary files differ
diff --git a/plugins/org.eclipse.jst.j2ee.ui/icons/full/ovr16/dis_annotation_bean_overlay.gif b/plugins/org.eclipse.jst.j2ee.ui/icons/full/ovr16/dis_annotation_bean_overlay.gif
deleted file mode 100644
index dac498a..0000000
--- a/plugins/org.eclipse.jst.j2ee.ui/icons/full/ovr16/dis_annotation_bean_overlay.gif
+++ /dev/null
Binary files differ
diff --git a/plugins/org.eclipse.jst.j2ee.ui/icons/full/ovr16/ejb_module_ovr.gif b/plugins/org.eclipse.jst.j2ee.ui/icons/full/ovr16/ejb_module_ovr.gif
deleted file mode 100644
index cf50d6d..0000000
--- a/plugins/org.eclipse.jst.j2ee.ui/icons/full/ovr16/ejb_module_ovr.gif
+++ /dev/null
Binary files differ
diff --git a/plugins/org.eclipse.jst.j2ee.ui/icons/full/ovr16/enterprise_app_ovr.gif b/plugins/org.eclipse.jst.j2ee.ui/icons/full/ovr16/enterprise_app_ovr.gif
deleted file mode 100644
index ec19c47..0000000
--- a/plugins/org.eclipse.jst.j2ee.ui/icons/full/ovr16/enterprise_app_ovr.gif
+++ /dev/null
Binary files differ
diff --git a/plugins/org.eclipse.jst.j2ee.ui/icons/full/ovr16/externalWebServiceOverlay_obj.gif b/plugins/org.eclipse.jst.j2ee.ui/icons/full/ovr16/externalWebServiceOverlay_obj.gif
deleted file mode 100644
index daff412..0000000
--- a/plugins/org.eclipse.jst.j2ee.ui/icons/full/ovr16/externalWebServiceOverlay_obj.gif
+++ /dev/null
Binary files differ
diff --git a/plugins/org.eclipse.jst.j2ee.ui/icons/full/ovr16/home_interface_overlay_obj.gif b/plugins/org.eclipse.jst.j2ee.ui/icons/full/ovr16/home_interface_overlay_obj.gif
deleted file mode 100644
index 48380fc..0000000
--- a/plugins/org.eclipse.jst.j2ee.ui/icons/full/ovr16/home_interface_overlay_obj.gif
+++ /dev/null
Binary files differ
diff --git a/plugins/org.eclipse.jst.j2ee.ui/icons/full/ovr16/home_interface_positioned_overlay.gif b/plugins/org.eclipse.jst.j2ee.ui/icons/full/ovr16/home_interface_positioned_overlay.gif
deleted file mode 100644
index 91a756a..0000000
--- a/plugins/org.eclipse.jst.j2ee.ui/icons/full/ovr16/home_interface_positioned_overlay.gif
+++ /dev/null
Binary files differ
diff --git a/plugins/org.eclipse.jst.j2ee.ui/icons/full/ovr16/key_interf_ov.gif b/plugins/org.eclipse.jst.j2ee.ui/icons/full/ovr16/key_interf_ov.gif
deleted file mode 100644
index 3070440..0000000
--- a/plugins/org.eclipse.jst.j2ee.ui/icons/full/ovr16/key_interf_ov.gif
+++ /dev/null
Binary files differ
diff --git a/plugins/org.eclipse.jst.j2ee.ui/icons/full/ovr16/local_home_interface_overlay_obj.gif b/plugins/org.eclipse.jst.j2ee.ui/icons/full/ovr16/local_home_interface_overlay_obj.gif
deleted file mode 100644
index d782734..0000000
--- a/plugins/org.eclipse.jst.j2ee.ui/icons/full/ovr16/local_home_interface_overlay_obj.gif
+++ /dev/null
Binary files differ
diff --git a/plugins/org.eclipse.jst.j2ee.ui/icons/full/ovr16/local_home_interface_positioned_overlay.gif b/plugins/org.eclipse.jst.j2ee.ui/icons/full/ovr16/local_home_interface_positioned_overlay.gif
deleted file mode 100644
index e5d6090..0000000
--- a/plugins/org.eclipse.jst.j2ee.ui/icons/full/ovr16/local_home_interface_positioned_overlay.gif
+++ /dev/null
Binary files differ
diff --git a/plugins/org.eclipse.jst.j2ee.ui/icons/full/ovr16/local_interface_overlay_obj.gif b/plugins/org.eclipse.jst.j2ee.ui/icons/full/ovr16/local_interface_overlay_obj.gif
deleted file mode 100644
index 43e1655..0000000
--- a/plugins/org.eclipse.jst.j2ee.ui/icons/full/ovr16/local_interface_overlay_obj.gif
+++ /dev/null
Binary files differ
diff --git a/plugins/org.eclipse.jst.j2ee.ui/icons/full/ovr16/local_interface_positioned_overlay.gif b/plugins/org.eclipse.jst.j2ee.ui/icons/full/ovr16/local_interface_positioned_overlay.gif
deleted file mode 100644
index 156febe..0000000
--- a/plugins/org.eclipse.jst.j2ee.ui/icons/full/ovr16/local_interface_positioned_overlay.gif
+++ /dev/null
Binary files differ
diff --git a/plugins/org.eclipse.jst.j2ee.ui/icons/full/ovr16/remote_interface_overlay_obj.gif b/plugins/org.eclipse.jst.j2ee.ui/icons/full/ovr16/remote_interface_overlay_obj.gif
deleted file mode 100644
index 19c9cae..0000000
--- a/plugins/org.eclipse.jst.j2ee.ui/icons/full/ovr16/remote_interface_overlay_obj.gif
+++ /dev/null
Binary files differ
diff --git a/plugins/org.eclipse.jst.j2ee.ui/icons/full/ovr16/remote_interface_positioned_overlay.gif b/plugins/org.eclipse.jst.j2ee.ui/icons/full/ovr16/remote_interface_positioned_overlay.gif
deleted file mode 100644
index 203e398..0000000
--- a/plugins/org.eclipse.jst.j2ee.ui/icons/full/ovr16/remote_interface_positioned_overlay.gif
+++ /dev/null
Binary files differ
diff --git a/plugins/org.eclipse.jst.j2ee.ui/icons/full/ovr16/service_interface_overlay_obj.gif b/plugins/org.eclipse.jst.j2ee.ui/icons/full/ovr16/service_interface_overlay_obj.gif
deleted file mode 100644
index 93f0679..0000000
--- a/plugins/org.eclipse.jst.j2ee.ui/icons/full/ovr16/service_interface_overlay_obj.gif
+++ /dev/null
Binary files differ
diff --git a/plugins/org.eclipse.jst.j2ee.ui/icons/full/ovr16/service_interface_positioned_overlay.gif b/plugins/org.eclipse.jst.j2ee.ui/icons/full/ovr16/service_interface_positioned_overlay.gif
deleted file mode 100644
index 6146667..0000000
--- a/plugins/org.eclipse.jst.j2ee.ui/icons/full/ovr16/service_interface_positioned_overlay.gif
+++ /dev/null
Binary files differ
diff --git a/plugins/org.eclipse.jst.j2ee.ui/icons/full/ovr16/web_module_ovr.gif b/plugins/org.eclipse.jst.j2ee.ui/icons/full/ovr16/web_module_ovr.gif
deleted file mode 100644
index c1e9617..0000000
--- a/plugins/org.eclipse.jst.j2ee.ui/icons/full/ovr16/web_module_ovr.gif
+++ /dev/null
Binary files differ
diff --git a/plugins/org.eclipse.jst.j2ee.ui/icons/full/wizban/add_mess_dest_wiz_ban.gif b/plugins/org.eclipse.jst.j2ee.ui/icons/full/wizban/add_mess_dest_wiz_ban.gif
deleted file mode 100644
index f9941ce..0000000
--- a/plugins/org.eclipse.jst.j2ee.ui/icons/full/wizban/add_mess_dest_wiz_ban.gif
+++ /dev/null
Binary files differ
diff --git a/plugins/org.eclipse.jst.j2ee.ui/icons/full/wizban/add_web_service_handler_wiz.gif b/plugins/org.eclipse.jst.j2ee.ui/icons/full/wizban/add_web_service_handler_wiz.gif
deleted file mode 100644
index e1fa98a..0000000
--- a/plugins/org.eclipse.jst.j2ee.ui/icons/full/wizban/add_web_service_handler_wiz.gif
+++ /dev/null
Binary files differ
diff --git a/plugins/org.eclipse.jst.j2ee.ui/icons/full/wizban/addauthoritycontraints_wiz_.gif b/plugins/org.eclipse.jst.j2ee.ui/icons/full/wizban/addauthoritycontraints_wiz_.gif
deleted file mode 100644
index 2ec0ffb..0000000
--- a/plugins/org.eclipse.jst.j2ee.ui/icons/full/wizban/addauthoritycontraints_wiz_.gif
+++ /dev/null
Binary files differ
diff --git a/plugins/org.eclipse.jst.j2ee.ui/icons/full/wizban/addcmpfiled_wiz_ban.gif b/plugins/org.eclipse.jst.j2ee.ui/icons/full/wizban/addcmpfiled_wiz_ban.gif
deleted file mode 100644
index 879329e..0000000
--- a/plugins/org.eclipse.jst.j2ee.ui/icons/full/wizban/addcmpfiled_wiz_ban.gif
+++ /dev/null
Binary files differ
diff --git a/plugins/org.eclipse.jst.j2ee.ui/icons/full/wizban/addcontextparameter_wiz_ban.gif b/plugins/org.eclipse.jst.j2ee.ui/icons/full/wizban/addcontextparameter_wiz_ban.gif
deleted file mode 100644
index 6457e12..0000000
--- a/plugins/org.eclipse.jst.j2ee.ui/icons/full/wizban/addcontextparameter_wiz_ban.gif
+++ /dev/null
Binary files differ
diff --git a/plugins/org.eclipse.jst.j2ee.ui/icons/full/wizban/addenvirentry_wiz_ban.gif b/plugins/org.eclipse.jst.j2ee.ui/icons/full/wizban/addenvirentry_wiz_ban.gif
deleted file mode 100644
index 653ab02..0000000
--- a/plugins/org.eclipse.jst.j2ee.ui/icons/full/wizban/addenvirentry_wiz_ban.gif
+++ /dev/null
Binary files differ
diff --git a/plugins/org.eclipse.jst.j2ee.ui/icons/full/wizban/adderrorcodeerror_wiz_ban.g.gif b/plugins/org.eclipse.jst.j2ee.ui/icons/full/wizban/adderrorcodeerror_wiz_ban.g.gif
deleted file mode 100644
index 2eb9efe..0000000
--- a/plugins/org.eclipse.jst.j2ee.ui/icons/full/wizban/adderrorcodeerror_wiz_ban.g.gif
+++ /dev/null
Binary files differ
diff --git a/plugins/org.eclipse.jst.j2ee.ui/icons/full/wizban/addexceptionerrorpage_wiz_ban.gif b/plugins/org.eclipse.jst.j2ee.ui/icons/full/wizban/addexceptionerrorpage_wiz_ban.gif
deleted file mode 100644
index e12d2ac..0000000
--- a/plugins/org.eclipse.jst.j2ee.ui/icons/full/wizban/addexceptionerrorpage_wiz_ban.gif
+++ /dev/null
Binary files differ
diff --git a/plugins/org.eclipse.jst.j2ee.ui/icons/full/wizban/addfiltermapping_wiz_ban.gif b/plugins/org.eclipse.jst.j2ee.ui/icons/full/wizban/addfiltermapping_wiz_ban.gif
deleted file mode 100644
index 5b53010..0000000
--- a/plugins/org.eclipse.jst.j2ee.ui/icons/full/wizban/addfiltermapping_wiz_ban.gif
+++ /dev/null
Binary files differ
diff --git a/plugins/org.eclipse.jst.j2ee.ui/icons/full/wizban/addhandlersoapheader_wiz_ba.gif b/plugins/org.eclipse.jst.j2ee.ui/icons/full/wizban/addhandlersoapheader_wiz_ba.gif
deleted file mode 100644
index 189c3e9..0000000
--- a/plugins/org.eclipse.jst.j2ee.ui/icons/full/wizban/addhandlersoapheader_wiz_ba.gif
+++ /dev/null
Binary files differ
diff --git a/plugins/org.eclipse.jst.j2ee.ui/icons/full/wizban/addjsppropgropu_wiz_ban.gif b/plugins/org.eclipse.jst.j2ee.ui/icons/full/wizban/addjsppropgropu_wiz_ban.gif
deleted file mode 100644
index 624fe7f..0000000
--- a/plugins/org.eclipse.jst.j2ee.ui/icons/full/wizban/addjsppropgropu_wiz_ban.gif
+++ /dev/null
Binary files differ
diff --git a/plugins/org.eclipse.jst.j2ee.ui/icons/full/wizban/addlocencodingmap_wiz_ban.gif b/plugins/org.eclipse.jst.j2ee.ui/icons/full/wizban/addlocencodingmap_wiz_ban.gif
deleted file mode 100644
index 46e3e08..0000000
--- a/plugins/org.eclipse.jst.j2ee.ui/icons/full/wizban/addlocencodingmap_wiz_ban.gif
+++ /dev/null
Binary files differ
diff --git a/plugins/org.eclipse.jst.j2ee.ui/icons/full/wizban/addmimemapping_wiz_ban.gif b/plugins/org.eclipse.jst.j2ee.ui/icons/full/wizban/addmimemapping_wiz_ban.gif
deleted file mode 100644
index bb856a4..0000000
--- a/plugins/org.eclipse.jst.j2ee.ui/icons/full/wizban/addmimemapping_wiz_ban.gif
+++ /dev/null
Binary files differ
diff --git a/plugins/org.eclipse.jst.j2ee.ui/icons/full/wizban/addservletmapping_wiz_ban.gif b/plugins/org.eclipse.jst.j2ee.ui/icons/full/wizban/addservletmapping_wiz_ban.gif
deleted file mode 100644
index 2820c5a..0000000
--- a/plugins/org.eclipse.jst.j2ee.ui/icons/full/wizban/addservletmapping_wiz_ban.gif
+++ /dev/null
Binary files differ
diff --git a/plugins/org.eclipse.jst.j2ee.ui/icons/full/wizban/addtaglibref_wiz_ban.gif b/plugins/org.eclipse.jst.j2ee.ui/icons/full/wizban/addtaglibref_wiz_ban.gif
deleted file mode 100644
index d238b56..0000000
--- a/plugins/org.eclipse.jst.j2ee.ui/icons/full/wizban/addtaglibref_wiz_ban.gif
+++ /dev/null
Binary files differ
diff --git a/plugins/org.eclipse.jst.j2ee.ui/icons/full/wizban/addwebSecuritycontraint_wiz.gif b/plugins/org.eclipse.jst.j2ee.ui/icons/full/wizban/addwebSecuritycontraint_wiz.gif
deleted file mode 100644
index fc97d84..0000000
--- a/plugins/org.eclipse.jst.j2ee.ui/icons/full/wizban/addwebSecuritycontraint_wiz.gif
+++ /dev/null
Binary files differ
diff --git a/plugins/org.eclipse.jst.j2ee.ui/icons/full/wizban/addwebrescollection_wiz_ban.gif b/plugins/org.eclipse.jst.j2ee.ui/icons/full/wizban/addwebrescollection_wiz_ban.gif
deleted file mode 100644
index 7dfe6e9..0000000
--- a/plugins/org.eclipse.jst.j2ee.ui/icons/full/wizban/addwebrescollection_wiz_ban.gif
+++ /dev/null
Binary files differ
diff --git a/plugins/org.eclipse.jst.j2ee.ui/icons/full/wizban/addwebsecurityroleref_wiz_b.gif b/plugins/org.eclipse.jst.j2ee.ui/icons/full/wizban/addwebsecurityroleref_wiz_b.gif
deleted file mode 100644
index aab4b50..0000000
--- a/plugins/org.eclipse.jst.j2ee.ui/icons/full/wizban/addwebsecurityroleref_wiz_b.gif
+++ /dev/null
Binary files differ
diff --git a/plugins/org.eclipse.jst.j2ee.ui/icons/full/wizban/addwelcomepage_wiz_ban.gif b/plugins/org.eclipse.jst.j2ee.ui/icons/full/wizban/addwelcomepage_wiz_ban.gif
deleted file mode 100644
index e0f50cc..0000000
--- a/plugins/org.eclipse.jst.j2ee.ui/icons/full/wizban/addwelcomepage_wiz_ban.gif
+++ /dev/null
Binary files differ
diff --git a/plugins/org.eclipse.jst.j2ee.ui/icons/full/wizban/appclient_wiz.gif b/plugins/org.eclipse.jst.j2ee.ui/icons/full/wizban/appclient_wiz.gif
deleted file mode 100644
index 56d7fa7..0000000
--- a/plugins/org.eclipse.jst.j2ee.ui/icons/full/wizban/appclient_wiz.gif
+++ /dev/null
Binary files differ
diff --git a/plugins/org.eclipse.jst.j2ee.ui/icons/full/wizban/connection_migration_wizard_wiz.gif b/plugins/org.eclipse.jst.j2ee.ui/icons/full/wizban/connection_migration_wizard_wiz.gif
deleted file mode 100644
index e9ecba5..0000000
--- a/plugins/org.eclipse.jst.j2ee.ui/icons/full/wizban/connection_migration_wizard_wiz.gif
+++ /dev/null
Binary files differ
diff --git a/plugins/org.eclipse.jst.j2ee.ui/icons/full/wizban/connector_wiz.gif b/plugins/org.eclipse.jst.j2ee.ui/icons/full/wizban/connector_wiz.gif
deleted file mode 100644
index 231f8d3..0000000
--- a/plugins/org.eclipse.jst.j2ee.ui/icons/full/wizban/connector_wiz.gif
+++ /dev/null
Binary files differ
diff --git a/plugins/org.eclipse.jst.j2ee.ui/icons/full/wizban/ear_wiz.gif b/plugins/org.eclipse.jst.j2ee.ui/icons/full/wizban/ear_wiz.gif
deleted file mode 100644
index 625e763..0000000
--- a/plugins/org.eclipse.jst.j2ee.ui/icons/full/wizban/ear_wiz.gif
+++ /dev/null
Binary files differ
diff --git a/plugins/org.eclipse.jst.j2ee.ui/icons/full/wizban/ejbclientjar_wizban.gif b/plugins/org.eclipse.jst.j2ee.ui/icons/full/wizban/ejbclientjar_wizban.gif
deleted file mode 100644
index 231da61..0000000
--- a/plugins/org.eclipse.jst.j2ee.ui/icons/full/wizban/ejbclientjar_wizban.gif
+++ /dev/null
Binary files differ
diff --git a/plugins/org.eclipse.jst.j2ee.ui/icons/full/wizban/ejbproject_wiz.gif b/plugins/org.eclipse.jst.j2ee.ui/icons/full/wizban/ejbproject_wiz.gif
deleted file mode 100644
index 7f2aa1e..0000000
--- a/plugins/org.eclipse.jst.j2ee.ui/icons/full/wizban/ejbproject_wiz.gif
+++ /dev/null
Binary files differ
diff --git a/plugins/org.eclipse.jst.j2ee.ui/icons/full/wizban/export_appclient_wiz.gif b/plugins/org.eclipse.jst.j2ee.ui/icons/full/wizban/export_appclient_wiz.gif
deleted file mode 100644
index 3515396..0000000
--- a/plugins/org.eclipse.jst.j2ee.ui/icons/full/wizban/export_appclient_wiz.gif
+++ /dev/null
Binary files differ
diff --git a/plugins/org.eclipse.jst.j2ee.ui/icons/full/wizban/export_ear_wiz.gif b/plugins/org.eclipse.jst.j2ee.ui/icons/full/wizban/export_ear_wiz.gif
deleted file mode 100644
index a327fa6..0000000
--- a/plugins/org.eclipse.jst.j2ee.ui/icons/full/wizban/export_ear_wiz.gif
+++ /dev/null
Binary files differ
diff --git a/plugins/org.eclipse.jst.j2ee.ui/icons/full/wizban/export_ejbjar_obj.gif b/plugins/org.eclipse.jst.j2ee.ui/icons/full/wizban/export_ejbjar_obj.gif
deleted file mode 100644
index adca79e..0000000
--- a/plugins/org.eclipse.jst.j2ee.ui/icons/full/wizban/export_ejbjar_obj.gif
+++ /dev/null
Binary files differ
diff --git a/plugins/org.eclipse.jst.j2ee.ui/icons/full/wizban/export_rar_wiz.gif b/plugins/org.eclipse.jst.j2ee.ui/icons/full/wizban/export_rar_wiz.gif
deleted file mode 100644
index 6047f1a..0000000
--- a/plugins/org.eclipse.jst.j2ee.ui/icons/full/wizban/export_rar_wiz.gif
+++ /dev/null
Binary files differ
diff --git a/plugins/org.eclipse.jst.j2ee.ui/icons/full/wizban/export_war_wiz.gif b/plugins/org.eclipse.jst.j2ee.ui/icons/full/wizban/export_war_wiz.gif
deleted file mode 100644
index d251242..0000000
--- a/plugins/org.eclipse.jst.j2ee.ui/icons/full/wizban/export_war_wiz.gif
+++ /dev/null
Binary files differ
diff --git a/plugins/org.eclipse.jst.j2ee.ui/icons/full/wizban/import_appclient_wiz.gif b/plugins/org.eclipse.jst.j2ee.ui/icons/full/wizban/import_appclient_wiz.gif
deleted file mode 100644
index 351a31d..0000000
--- a/plugins/org.eclipse.jst.j2ee.ui/icons/full/wizban/import_appclient_wiz.gif
+++ /dev/null
Binary files differ
diff --git a/plugins/org.eclipse.jst.j2ee.ui/icons/full/wizban/import_class_file_wiz_ban.gif b/plugins/org.eclipse.jst.j2ee.ui/icons/full/wizban/import_class_file_wiz_ban.gif
deleted file mode 100644
index 81b1e3f..0000000
--- a/plugins/org.eclipse.jst.j2ee.ui/icons/full/wizban/import_class_file_wiz_ban.gif
+++ /dev/null
Binary files differ
diff --git a/plugins/org.eclipse.jst.j2ee.ui/icons/full/wizban/import_ear_wiz.gif b/plugins/org.eclipse.jst.j2ee.ui/icons/full/wizban/import_ear_wiz.gif
deleted file mode 100644
index 67754de..0000000
--- a/plugins/org.eclipse.jst.j2ee.ui/icons/full/wizban/import_ear_wiz.gif
+++ /dev/null
Binary files differ
diff --git a/plugins/org.eclipse.jst.j2ee.ui/icons/full/wizban/import_ejbjar_wiz.gif b/plugins/org.eclipse.jst.j2ee.ui/icons/full/wizban/import_ejbjar_wiz.gif
deleted file mode 100644
index d123519..0000000
--- a/plugins/org.eclipse.jst.j2ee.ui/icons/full/wizban/import_ejbjar_wiz.gif
+++ /dev/null
Binary files differ
diff --git a/plugins/org.eclipse.jst.j2ee.ui/icons/full/wizban/import_rar_wiz.gif b/plugins/org.eclipse.jst.j2ee.ui/icons/full/wizban/import_rar_wiz.gif
deleted file mode 100644
index ea9dff4..0000000
--- a/plugins/org.eclipse.jst.j2ee.ui/icons/full/wizban/import_rar_wiz.gif
+++ /dev/null
Binary files differ
diff --git a/plugins/org.eclipse.jst.j2ee.ui/icons/full/wizban/import_war_wiz.gif b/plugins/org.eclipse.jst.j2ee.ui/icons/full/wizban/import_war_wiz.gif
deleted file mode 100644
index 514274d..0000000
--- a/plugins/org.eclipse.jst.j2ee.ui/icons/full/wizban/import_war_wiz.gif
+++ /dev/null
Binary files differ
diff --git a/plugins/org.eclipse.jst.j2ee.ui/icons/full/wizban/init_param_wiz_ban.gif b/plugins/org.eclipse.jst.j2ee.ui/icons/full/wizban/init_param_wiz_ban.gif
deleted file mode 100644
index 3fb6df4..0000000
--- a/plugins/org.eclipse.jst.j2ee.ui/icons/full/wizban/init_param_wiz_ban.gif
+++ /dev/null
Binary files differ
diff --git a/plugins/org.eclipse.jst.j2ee.ui/icons/full/wizban/mdb_2_1_jms_creation_wiz.gif b/plugins/org.eclipse.jst.j2ee.ui/icons/full/wizban/mdb_2_1_jms_creation_wiz.gif
deleted file mode 100644
index 51b1d5a..0000000
--- a/plugins/org.eclipse.jst.j2ee.ui/icons/full/wizban/mdb_2_1_jms_creation_wiz.gif
+++ /dev/null
Binary files differ
diff --git a/plugins/org.eclipse.jst.j2ee.ui/icons/full/wizban/mdb_2_1_non_jms_creation_wi.gif b/plugins/org.eclipse.jst.j2ee.ui/icons/full/wizban/mdb_2_1_non_jms_creation_wi.gif
deleted file mode 100644
index 51b1d5a..0000000
--- a/plugins/org.eclipse.jst.j2ee.ui/icons/full/wizban/mdb_2_1_non_jms_creation_wi.gif
+++ /dev/null
Binary files differ
diff --git a/plugins/org.eclipse.jst.j2ee.ui/icons/full/wizban/newservlet_wiz.gif b/plugins/org.eclipse.jst.j2ee.ui/icons/full/wizban/newservlet_wiz.gif
deleted file mode 100644
index 147e57a..0000000
--- a/plugins/org.eclipse.jst.j2ee.ui/icons/full/wizban/newservlet_wiz.gif
+++ /dev/null
Binary files differ
diff --git a/plugins/org.eclipse.jst.j2ee.ui/icons/full/wizban/versionmigrate3_wiz.gif b/plugins/org.eclipse.jst.j2ee.ui/icons/full/wizban/versionmigrate3_wiz.gif
deleted file mode 100644
index 9b72bf5..0000000
--- a/plugins/org.eclipse.jst.j2ee.ui/icons/full/wizban/versionmigrate3_wiz.gif
+++ /dev/null
Binary files differ
diff --git a/plugins/org.eclipse.jst.j2ee.ui/icons/full/wizban/war_wiz.gif b/plugins/org.eclipse.jst.j2ee.ui/icons/full/wizban/war_wiz.gif
deleted file mode 100644
index d964e2e..0000000
--- a/plugins/org.eclipse.jst.j2ee.ui/icons/full/wizban/war_wiz.gif
+++ /dev/null
Binary files differ
diff --git a/plugins/org.eclipse.jst.j2ee.ui/icons/full/wizban/web_library_project_wiz_ban.gif b/plugins/org.eclipse.jst.j2ee.ui/icons/full/wizban/web_library_project_wiz_ban.gif
deleted file mode 100644
index 767a416..0000000
--- a/plugins/org.eclipse.jst.j2ee.ui/icons/full/wizban/web_library_project_wiz_ban.gif
+++ /dev/null
Binary files differ
diff --git a/plugins/org.eclipse.jst.j2ee.ui/icons/jar_obj.gif b/plugins/org.eclipse.jst.j2ee.ui/icons/jar_obj.gif
deleted file mode 100644
index ec315d5..0000000
--- a/plugins/org.eclipse.jst.j2ee.ui/icons/jar_obj.gif
+++ /dev/null
Binary files differ
diff --git a/plugins/org.eclipse.jst.j2ee.ui/icons/jcu_obj.gif b/plugins/org.eclipse.jst.j2ee.ui/icons/jcu_obj.gif
deleted file mode 100644
index 36a73ac..0000000
--- a/plugins/org.eclipse.jst.j2ee.ui/icons/jcu_obj.gif
+++ /dev/null
Binary files differ
diff --git a/plugins/org.eclipse.jst.j2ee.ui/icons/key_interf_ov.gif b/plugins/org.eclipse.jst.j2ee.ui/icons/key_interf_ov.gif
deleted file mode 100644
index 3070440..0000000
--- a/plugins/org.eclipse.jst.j2ee.ui/icons/key_interf_ov.gif
+++ /dev/null
Binary files differ
diff --git a/plugins/org.eclipse.jst.j2ee.ui/icons/left_arrow.gif b/plugins/org.eclipse.jst.j2ee.ui/icons/left_arrow.gif
deleted file mode 100644
index 3bc3831..0000000
--- a/plugins/org.eclipse.jst.j2ee.ui/icons/left_arrow.gif
+++ /dev/null
Binary files differ
diff --git a/plugins/org.eclipse.jst.j2ee.ui/icons/prj_obj.gif b/plugins/org.eclipse.jst.j2ee.ui/icons/prj_obj.gif
deleted file mode 100644
index a4ea580..0000000
--- a/plugins/org.eclipse.jst.j2ee.ui/icons/prj_obj.gif
+++ /dev/null
Binary files differ
diff --git a/plugins/org.eclipse.jst.j2ee.ui/icons/right_arrow.gif b/plugins/org.eclipse.jst.j2ee.ui/icons/right_arrow.gif
deleted file mode 100644
index d03e351..0000000
--- a/plugins/org.eclipse.jst.j2ee.ui/icons/right_arrow.gif
+++ /dev/null
Binary files differ
diff --git a/plugins/org.eclipse.jst.j2ee.ui/icons/servlet.gif b/plugins/org.eclipse.jst.j2ee.ui/icons/servlet.gif
deleted file mode 100644
index fc1bece..0000000
--- a/plugins/org.eclipse.jst.j2ee.ui/icons/servlet.gif
+++ /dev/null
Binary files differ
diff --git a/plugins/org.eclipse.jst.j2ee.ui/icons/sessionBean_obj.gif b/plugins/org.eclipse.jst.j2ee.ui/icons/sessionBean_obj.gif
deleted file mode 100644
index 507b8a8..0000000
--- a/plugins/org.eclipse.jst.j2ee.ui/icons/sessionBean_obj.gif
+++ /dev/null
Binary files differ
diff --git a/plugins/org.eclipse.jst.j2ee.ui/icons/showerr_tsk.gif b/plugins/org.eclipse.jst.j2ee.ui/icons/showerr_tsk.gif
deleted file mode 100644
index 0bc6068..0000000
--- a/plugins/org.eclipse.jst.j2ee.ui/icons/showerr_tsk.gif
+++ /dev/null
Binary files differ
diff --git a/plugins/org.eclipse.jst.j2ee.ui/icons/showwarn_tsk.gif b/plugins/org.eclipse.jst.j2ee.ui/icons/showwarn_tsk.gif
deleted file mode 100644
index 14009e9..0000000
--- a/plugins/org.eclipse.jst.j2ee.ui/icons/showwarn_tsk.gif
+++ /dev/null
Binary files differ
diff --git a/plugins/org.eclipse.jst.j2ee.ui/icons/srvce_elem_obj.gif b/plugins/org.eclipse.jst.j2ee.ui/icons/srvce_elem_obj.gif
deleted file mode 100644
index 6fdcb3f..0000000
--- a/plugins/org.eclipse.jst.j2ee.ui/icons/srvce_elem_obj.gif
+++ /dev/null
Binary files differ
diff --git a/plugins/org.eclipse.jst.j2ee.ui/icons/util-wiz-banner.gif b/plugins/org.eclipse.jst.j2ee.ui/icons/util-wiz-banner.gif
deleted file mode 100644
index 9b93c9a..0000000
--- a/plugins/org.eclipse.jst.j2ee.ui/icons/util-wiz-banner.gif
+++ /dev/null
Binary files differ
diff --git a/plugins/org.eclipse.jst.j2ee.ui/icons/util-wiz-icon.gif b/plugins/org.eclipse.jst.j2ee.ui/icons/util-wiz-icon.gif
deleted file mode 100644
index 2038b22..0000000
--- a/plugins/org.eclipse.jst.j2ee.ui/icons/util-wiz-icon.gif
+++ /dev/null
Binary files differ
diff --git a/plugins/org.eclipse.jst.j2ee.ui/icons/webgroup_obj.gif b/plugins/org.eclipse.jst.j2ee.ui/icons/webgroup_obj.gif
deleted file mode 100644
index 274d361..0000000
--- a/plugins/org.eclipse.jst.j2ee.ui/icons/webgroup_obj.gif
+++ /dev/null
Binary files differ
diff --git a/plugins/org.eclipse.jst.j2ee.ui/icons/webservicedesc.gif b/plugins/org.eclipse.jst.j2ee.ui/icons/webservicedesc.gif
deleted file mode 100644
index 8fb844f..0000000
--- a/plugins/org.eclipse.jst.j2ee.ui/icons/webservicedesc.gif
+++ /dev/null
Binary files differ
diff --git a/plugins/org.eclipse.jst.j2ee.ui/icons/wsdl.gif b/plugins/org.eclipse.jst.j2ee.ui/icons/wsdl.gif
deleted file mode 100644
index 8fb844f..0000000
--- a/plugins/org.eclipse.jst.j2ee.ui/icons/wsdl.gif
+++ /dev/null
Binary files differ
diff --git a/plugins/org.eclipse.jst.j2ee.ui/j2ee_ui/org/eclipse/jst/common/jdt/internal/integration/ui/WTPUIWorkingCopyManager.java b/plugins/org.eclipse.jst.j2ee.ui/j2ee_ui/org/eclipse/jst/common/jdt/internal/integration/ui/WTPUIWorkingCopyManager.java
deleted file mode 100644
index 1b909a2..0000000
--- a/plugins/org.eclipse.jst.j2ee.ui/j2ee_ui/org/eclipse/jst/common/jdt/internal/integration/ui/WTPUIWorkingCopyManager.java
+++ /dev/null
@@ -1,484 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2003, 2006 IBM Corporation and others.
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
- *
- * Contributors:
- * IBM Corporation - initial API and implementation
- *******************************************************************************/
-package org.eclipse.jst.common.jdt.internal.integration.ui;
-
-
-import java.util.ArrayList;
-import java.util.HashMap;
-import java.util.HashSet;
-import java.util.Iterator;
-import java.util.List;
-import java.util.Map;
-import java.util.Set;
-
-import org.eclipse.core.resources.IFile;
-import org.eclipse.core.resources.IResource;
-import org.eclipse.core.resources.ResourcesPlugin;
-import org.eclipse.core.runtime.CoreException;
-import org.eclipse.core.runtime.IProgressMonitor;
-import org.eclipse.core.runtime.IStatus;
-import org.eclipse.jdt.core.IClassFile;
-import org.eclipse.jdt.core.ICompilationUnit;
-import org.eclipse.jdt.core.IJavaElement;
-import org.eclipse.jdt.core.JavaModelException;
-import org.eclipse.jdt.internal.ui.JavaPlugin;
-import org.eclipse.jdt.internal.ui.javaeditor.ICompilationUnitDocumentProvider;
-import org.eclipse.jdt.internal.ui.javaeditor.InternalClassFileEditorInput;
-import org.eclipse.jdt.ui.IWorkingCopyManager;
-import org.eclipse.jdt.ui.JavaUI;
-import org.eclipse.jem.util.logger.proxy.Logger;
-import org.eclipse.jface.text.IDocument;
-import org.eclipse.jface.text.source.IAnnotationModel;
-import org.eclipse.jst.common.jdt.internal.integration.WTPWorkingCopyManager;
-import org.eclipse.jst.j2ee.internal.plugin.J2EEUIPlugin;
-import org.eclipse.swt.widgets.Display;
-import org.eclipse.ui.IEditorInput;
-import org.eclipse.ui.IFileEditorInput;
-import org.eclipse.ui.IWorkbenchWindow;
-import org.eclipse.ui.PlatformUI;
-import org.eclipse.ui.part.FileEditorInput;
-import org.eclipse.ui.texteditor.AbstractMarkerAnnotationModel;
-import org.eclipse.ui.texteditor.IDocumentProvider;
-import org.eclipse.wst.common.frameworks.internal.SaveFailedException;
-
-/**
- * Insert the type's description here. Creation date: (4/25/2001 7:05:36 PM)
- *
- * @author: Administrator
- */
-public class WTPUIWorkingCopyManager extends WTPWorkingCopyManager {
- private IWorkingCopyManager javaWorkingCopyManager;
- private ICompilationUnitDocumentProvider cuDocumentProvider;
- private HashMap editorInputs;
- private CoreException lastError;
-
- /**
- * WTPUIWorkingCopyManager constructor comment.
- */
- public WTPUIWorkingCopyManager() {
- super();
- cuDocumentProvider = JavaPlugin.getDefault().getCompilationUnitDocumentProvider();
- javaWorkingCopyManager = JavaUI.getWorkingCopyManager();
- }
-
- protected void syncConnect(final IEditorInput input, final ICompilationUnit cu) throws CoreException {
- Display d = Display.getCurrent();
- if (d != null) {
- lastError = null;
- d.syncExec(new Runnable() {
- public void run() {
- try {
- connect(input, cu);
- } catch (CoreException e) {
- lastError = e;
- }
- }
- });
- } else
- connect(input, cu);
- if (lastError != null)
- throw lastError;
- }
-
- /**
- * Connect the CompilationUnitDocumentProvider to the
- *
- * @input and connect the annotation model from the provider to the IDocument of the
- * @input.
- */
- protected void connect(IEditorInput input, ICompilationUnit cu) throws CoreException {
- if (input != null && javaWorkingCopyManager != null && cuDocumentProvider != null ) {
- javaWorkingCopyManager.connect(input);
- getEditorInputs().put(cu, input);
- IDocument doc = cuDocumentProvider.getDocument(input);
- if (doc != null && cuDocumentProvider.getAnnotationModel(input)!= null)
- cuDocumentProvider.getAnnotationModel(input).connect(doc);
- }
- }
-
- protected void revertWorkingCopies() {
- if (getEditorInputs().isEmpty())
- return;
- Iterator it = getEditorInputs().values().iterator();
- IEditorInput input;
- while (it.hasNext()) {
- input = (IEditorInput) it.next();
- revert(input);
- }
- }
-
- /**
- * Disonnect the CompilationUnitDocumentProvider from the
- *
- * @input and disconnect the annotation model from the provider from the IDocument of the
- * @input.
- */
- protected void disconnect(IEditorInput input) {
- IDocument doc = cuDocumentProvider.getDocument(input);
- cuDocumentProvider.getAnnotationModel(input).disconnect(doc);
- javaWorkingCopyManager.disconnect(input);
- }
-
- protected void revert(IEditorInput input) {
- try {
- cuDocumentProvider.resetDocument(input);
- } catch (CoreException e) {
- Logger.getLogger().logError(e);
- }
- IDocument doc = cuDocumentProvider.getDocument(input);
- IAnnotationModel model = cuDocumentProvider.getAnnotationModel(input);
-
- if (model instanceof AbstractMarkerAnnotationModel) {
- AbstractMarkerAnnotationModel markerModel = (AbstractMarkerAnnotationModel) model;
- markerModel.resetMarkers();
- }
- model.disconnect(doc);
- javaWorkingCopyManager.disconnect(input);
- }
-
- protected void disconnectEditorInputs() {
- Iterator it = getEditorInputs().values().iterator();
- IEditorInput input;
- while (it.hasNext()) {
- input = (IEditorInput) it.next();
- disconnect(input);
- }
- }
-
- protected void discardExistingCompilationUnits() {
- if (getEditorInputs().isEmpty())
- return;
- Iterator it = getEditorInputs().values().iterator();
- IEditorInput input;
- while (it.hasNext()) {
- input = (IEditorInput) it.next();
- disconnect(input);
- }
- }
-
- @Override
- public Set getAffectedFiles() {
- Set aSet = new HashSet();
- Iterator it = getEditorInputs().keySet().iterator();
- ICompilationUnit unit = null;
- IResource resource = null;
- while (it.hasNext()) {
- unit = (ICompilationUnit) it.next();
- if (isDirty(unit)) {
- try {
- resource = unit.getUnderlyingResource();
- } catch (JavaModelException ignore) {
- continue;
- }
- if (resource instanceof IFile)
- aSet.add(resource);
- }
- }
- return aSet;
- }
-
- protected IEditorInput getEditorInput(ICompilationUnit cu) {
- IEditorInput input = primGetEditorInput(cu);
- if (input == null) {
- try {
- input = getEditorInput((IJavaElement) cu);
- } catch (JavaModelException e) {
- //Ignore
- }
- }
- return input;
- }
-
- protected IEditorInput getEditorInput(IJavaElement element) throws JavaModelException {
- IJavaElement localElement = element;
- while (localElement != null) {
- switch (localElement.getElementType()) {
- case IJavaElement.COMPILATION_UNIT : {
- ICompilationUnit cu = (ICompilationUnit) localElement;
- if (cu.isWorkingCopy())
- cu = cu.getPrimary();
- IResource resource = cu.getUnderlyingResource();
- if (resource.getType() == IResource.FILE)
- return new FileEditorInput((IFile) resource);
- break;
- }
- case IJavaElement.CLASS_FILE :
- return new InternalClassFileEditorInput((IClassFile) localElement);
- }
- localElement = localElement.getParent();
- }
- return null;
- }
-
- /**
- * Insert the method's description here. Creation date: (4/25/2001 7:30:20 PM)
- *
- * @return java.util.HashMap
- */
- protected java.util.HashMap getEditorInputs() {
- if (editorInputs == null)
- editorInputs = new HashMap(20);
- return editorInputs;
- }
-
- /**
- * Returns the working copy remembered for the compilation unit encoded in the given editor
- * input. Does not connect the edit model to the working copy.
- *
- * @param input
- * ICompilationUnit
- * @return the working copy of the compilation unit, or <code>null</code> if the input does
- * not encode an editor input, or if there is no remembered working copy for this
- * compilation unit
- */
- @Override
- public org.eclipse.jdt.core.ICompilationUnit getExistingWorkingCopy(ICompilationUnit cu) throws CoreException {
- if (cu == null || cu.isWorkingCopy()) {
- return cu;
- }
- ICompilationUnit newCU = super.getExistingWorkingCopy(cu);
- if (newCU != null)
- return newCU;
- IEditorInput editorInput = getEditorInput(cu);
- return javaWorkingCopyManager.getWorkingCopy(editorInput);
- }
-
- /**
- * Returns the working copy remembered for the compilation unit.
- *
- * @param input
- * ICompilationUnit
- * @return the working copy of the compilation unit, or <code>null</code> if there is no
- * remembered working copy for this compilation unit
- */
- @Override
- public org.eclipse.jdt.core.ICompilationUnit getWorkingCopy(ICompilationUnit cu, boolean forNewCU) throws org.eclipse.core.runtime.CoreException {
- if (forNewCU)
- return super.getWorkingCopy(cu, forNewCU);
- return primGetWorkingCopy(cu);
- }
-
- public boolean isDirty(ICompilationUnit cu) {
- if (cu == null)
- return false;
- IDocumentProvider p = cuDocumentProvider;
- return p == null ? false : p.canSaveDocument(getEditorInput(cu));
- }
-
- /**
- * mustSaveDocument method comment.
- */
- public boolean isSaveNeeded() {
- Iterator it = getEditorInputs().entrySet().iterator();
- while (it.hasNext()) {
- if (cuDocumentProvider.mustSaveDocument(it.next()))
- return true;
- }
- return false;
- }
-
- @Override
- protected void primDispose() {
- super.primDispose();
- discardExistingCompilationUnits();
- editorInputs = null;
- javaWorkingCopyManager = null;
- }
-
- @Override
- protected void primRevert() {
- super.primRevert();
- revertWorkingCopies();
- editorInputs = null;
- javaWorkingCopyManager = null;
- }
-
- protected IEditorInput primGetEditorInput(ICompilationUnit cu) {
- return (IEditorInput) getEditorInputs().get(cu);
- }
-
- /**
- * Returns the working copy remembered for the compilation unit encoded in the given editor
- * input.
- *
- * @param input
- * ICompilationUnit
- * @return the working copy of the compilation unit, or <code>null</code> if the input does
- * not encode an editor input, or if there is no remembered working copy for this
- * compilation unit
- */
- @Override
- protected org.eclipse.jdt.core.ICompilationUnit primGetWorkingCopy(ICompilationUnit cu) throws CoreException {
- if (cu == null) {
- return cu;
- }
- ICompilationUnit primary = cu.getPrimary();
- ICompilationUnit newCU = getNewCompilationUnitWorkingCopy(primary);
- if (newCU != null)
- return newCU;
- IEditorInput editorInput = primGetEditorInput(primary);
- if (editorInput == null) {
- editorInput = getEditorInput(cu);
- syncConnect(editorInput, cu);
- }
- if (cu.isWorkingCopy())
- return cu;
- return javaWorkingCopyManager.getWorkingCopy(editorInput);
- }
-
- /**
- * This will save all of the referenced CompilationUnits to be saved.
- */
- @Override
- protected void primSaveCompilationUnits(org.eclipse.core.runtime.IProgressMonitor monitor) {
- super.primSaveCompilationUnits(null);
- saveExistingCompilationUnits(monitor);
- }
-
- protected void primSaveDocument(IEditorInput input, IDocument doc, IProgressMonitor monitor) throws CoreException {
- try {
- cuDocumentProvider.saveDocument(monitor, input, doc, true); // overwrite if needed
- } catch (CoreException ex) {
- if (!isFailedWriteFileFailure(ex))
- throw ex;
- IResource resource = (IResource) input.getAdapter(IRESOURCE_CLASS);
- if (resource == null || resource.getType() != IResource.FILE || !resource.getResourceAttributes().isReadOnly())
- throw ex;
-
- if (getSaveHandler().shouldContinueAndMakeFileEditable((IFile) resource))
- cuDocumentProvider.saveDocument(monitor, input, doc, false);
- else
- throw ex;
- }
- }
-
- protected void saveDocument(IEditorInput input, IProgressMonitor monitor) {
- IDocument doc = cuDocumentProvider.getDocument(input);
- boolean canSave = cuDocumentProvider.canSaveDocument(input);
- try {
- if (canSave) {
- ICompilationUnit unit = javaWorkingCopyManager.getWorkingCopy(input);
- synchronized (unit) {
- cuDocumentProvider.aboutToChange(input);
- primSaveDocument(input, doc, monitor);
- }
- }
- } catch (CoreException e) {
- J2EEUIPlugin.logError(e);
- throw new SaveFailedException(e);
- } finally {
- if (canSave)
- cuDocumentProvider.changed(input);
- }
- }
-
- /**
- * This will save all of the referenced CompilationUnits to be saved.
- */
- protected void saveExistingCompilationUnits(org.eclipse.core.runtime.IProgressMonitor monitor) {
- if (getEditorInputs().isEmpty())
- return;
- if (!validateState()) {
- if (monitor != null)
- monitor.setCanceled(true);
- return;
- }
- Iterator it = getEditorInputs().entrySet().iterator();
- Map.Entry entry;
- // ICompilationUnit cu;
- IEditorInput input;
- try {
- while (it.hasNext()) {
- entry = (Map.Entry) it.next();
- // cu = (ICompilationUnit) entry.getKey();
- input = (IEditorInput) entry.getValue();
- try {
- saveDocument(input, null);
- } finally {
- disconnect(input);
- }
- }
- } finally {
- getEditorInputs().clear();
- }
- }
-
- /**
- * Call validateEdit for all read only IFiles corresponding to each WorkingCopy.
- *
- * @return boolean
- */
- private boolean validateState() {
- List readOnlyFiles = getReadOnlyModifiedFiles();
- if (readOnlyFiles != null && !readOnlyFiles.isEmpty()) {
- IFile[] files = new IFile[readOnlyFiles.size()];
- readOnlyFiles.toArray(files);
- IWorkbenchWindow win = PlatformUI.getWorkbench().getActiveWorkbenchWindow();
- Object ctx = win == null ? null : win.getShell();
- IStatus status = ResourcesPlugin.getWorkspace().validateEdit(files, ctx);
- return status.isOK();
- }
- return true;
- }
-
- private List getReadOnlyModifiedFiles() {
- List readOnlyFiles = null;
- IFile readOnlyFile = null;
- Iterator it = getEditorInputs().entrySet().iterator();
- Map.Entry entry;
- // ICompilationUnit cu;
- IEditorInput input;
- IDocumentProvider docProv = cuDocumentProvider;
- while (it.hasNext()) {
- readOnlyFile = null;
- entry = (Map.Entry) it.next();
- // cu = (ICompilationUnit) entry.getKey();
- input = (IEditorInput) entry.getValue();
- if (docProv.canSaveDocument(input))
- readOnlyFile = getReadOnlyFile(input);
- if (readOnlyFile != null) {
- if (readOnlyFiles == null)
- readOnlyFiles = new ArrayList();
- readOnlyFiles.add(readOnlyFile);
- }
- }
- return readOnlyFiles;
- }
-
- private IFile getReadOnlyFile(IEditorInput input) {
- if (input instanceof IFileEditorInput) {
- IFileEditorInput finput = (IFileEditorInput) input;
- IFile file = finput.getFile();
- if (file.isReadOnly())
- return file;
- }
- return null;
- }
-
-
- @Override
- protected void addDeletedCompilationUnit(ICompilationUnit cu) {
- IEditorInput input = primGetEditorInput(cu);
- if (input != null)
- disconnect(input);
- getEditorInputs().remove(cu);
- super.addDeletedCompilationUnit(cu);
- }
-
- /**
- * @see com.ibm.etools.j2ee.workbench.IJ2EEWorkingCopyManager#hasWorkingCopies()
- */
- @Override
- public boolean hasWorkingCopies() {
- return super.hasWorkingCopies() || (editorInputs != null && !editorInputs.isEmpty());
- }
-
-}
diff --git a/plugins/org.eclipse.jst.j2ee.ui/j2ee_ui/org/eclipse/jst/j2ee/internal/AddModulestoEARPropertiesPage.java b/plugins/org.eclipse.jst.j2ee.ui/j2ee_ui/org/eclipse/jst/j2ee/internal/AddModulestoEARPropertiesPage.java
deleted file mode 100644
index 42b92c1..0000000
--- a/plugins/org.eclipse.jst.j2ee.ui/j2ee_ui/org/eclipse/jst/j2ee/internal/AddModulestoEARPropertiesPage.java
+++ /dev/null
@@ -1,1282 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2005, 2009 IBM Corporation and others.
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
- *
- * Contributors:
- * IBM Corporation - initial API and implementation
- * David Schneider, david.schneider@unisys.com - [142500] WTP properties pages fonts don't follow Eclipse preferences
- * Stefan Dimov, stefan.dimov@sap.com - bugs 207826, 222651
- * Milen Manov, milen.manov@sap.com - bugs 248623
- *******************************************************************************/
-package org.eclipse.jst.j2ee.internal;
-
-import java.util.ArrayList;
-import java.util.HashMap;
-import java.util.HashSet;
-import java.util.LinkedList;
-import java.util.List;
-import java.util.Map;
-import java.util.Set;
-
-import org.eclipse.core.commands.ExecutionException;
-import org.eclipse.core.resources.IProject;
-import org.eclipse.core.resources.IWorkspaceRoot;
-import org.eclipse.core.resources.IWorkspaceRunnable;
-import org.eclipse.core.resources.ResourcesPlugin;
-import org.eclipse.core.runtime.CoreException;
-import org.eclipse.core.runtime.IPath;
-import org.eclipse.core.runtime.IProgressMonitor;
-import org.eclipse.core.runtime.IStatus;
-import org.eclipse.core.runtime.NullProgressMonitor;
-import org.eclipse.core.runtime.Path;
-import org.eclipse.jdt.core.JavaCore;
-import org.eclipse.jdt.ui.wizards.BuildPathDialogAccess;
-import org.eclipse.jface.dialogs.Dialog;
-import org.eclipse.jface.dialogs.MessageDialog;
-import org.eclipse.jface.viewers.CheckStateChangedEvent;
-import org.eclipse.jface.viewers.CheckboxTableViewer;
-import org.eclipse.jface.viewers.ColumnWeightData;
-import org.eclipse.jface.viewers.ICheckStateListener;
-import org.eclipse.jface.viewers.IContentProvider;
-import org.eclipse.jface.viewers.ILabelDecorator;
-import org.eclipse.jface.viewers.ILabelProviderListener;
-import org.eclipse.jface.viewers.LabelProviderChangedEvent;
-import org.eclipse.jface.viewers.TableLayout;
-import org.eclipse.jst.j2ee.application.internal.operations.AddComponentToEnterpriseApplicationDataModelProvider;
-import org.eclipse.jst.j2ee.application.internal.operations.RemoveComponentFromEnterpriseApplicationDataModelProvider;
-import org.eclipse.jst.j2ee.classpathdep.ClasspathDependencyUtil;
-import org.eclipse.jst.j2ee.componentcore.J2EEModuleVirtualArchiveComponent;
-import org.eclipse.jst.j2ee.internal.common.J2EEVersionUtil;
-import org.eclipse.jst.j2ee.internal.common.classpath.J2EEComponentClasspathUpdater;
-import org.eclipse.jst.j2ee.internal.dialogs.ChangeLibDirDialog;
-import org.eclipse.jst.j2ee.internal.dialogs.DependencyConflictResolveDialog;
-import org.eclipse.jst.j2ee.internal.plugin.IJ2EEModuleConstants;
-import org.eclipse.jst.j2ee.internal.plugin.J2EEUIMessages;
-import org.eclipse.jst.j2ee.internal.plugin.J2EEUIPlugin;
-import org.eclipse.jst.j2ee.internal.ui.DoubleCheckboxTableItem;
-import org.eclipse.jst.j2ee.internal.ui.DoubleCheckboxTableViewer;
-import org.eclipse.jst.j2ee.model.IEARModelProvider;
-import org.eclipse.jst.j2ee.model.ModelProviderManager;
-import org.eclipse.jst.j2ee.project.EarUtilities;
-import org.eclipse.jst.j2ee.project.JavaEEProjectUtilities;
-import org.eclipse.jst.j2ee.project.facet.EarFacetRuntimeHandler;
-import org.eclipse.jst.j2ee.project.facet.IJ2EEFacetConstants;
-import org.eclipse.jst.j2ee.project.facet.IJavaProjectMigrationDataModelProperties;
-import org.eclipse.jst.j2ee.project.facet.JavaProjectMigrationDataModelProvider;
-import org.eclipse.jst.javaee.application.Application;
-import org.eclipse.jst.jee.project.facet.EarCreateDeploymentFilesDataModelProvider;
-import org.eclipse.jst.jee.project.facet.ICreateDeploymentFilesDataModelProperties;
-import org.eclipse.swt.SWT;
-import org.eclipse.swt.graphics.Point;
-import org.eclipse.swt.graphics.Rectangle;
-import org.eclipse.swt.layout.FillLayout;
-import org.eclipse.swt.layout.GridData;
-import org.eclipse.swt.layout.GridLayout;
-import org.eclipse.swt.widgets.Button;
-import org.eclipse.swt.widgets.Composite;
-import org.eclipse.swt.widgets.Display;
-import org.eclipse.swt.widgets.Event;
-import org.eclipse.swt.widgets.Group;
-import org.eclipse.swt.widgets.Label;
-import org.eclipse.swt.widgets.Listener;
-import org.eclipse.swt.widgets.Shell;
-import org.eclipse.swt.widgets.Table;
-import org.eclipse.swt.widgets.TableColumn;
-import org.eclipse.swt.widgets.TableItem;
-import org.eclipse.swt.widgets.Text;
-import org.eclipse.ui.PlatformUI;
-import org.eclipse.wst.common.componentcore.ComponentCore;
-import org.eclipse.wst.common.componentcore.datamodel.properties.ICreateReferenceComponentsDataModelProperties;
-import org.eclipse.wst.common.componentcore.internal.operation.CreateReferenceComponentsDataModelProvider;
-import org.eclipse.wst.common.componentcore.internal.resources.VirtualArchiveComponent;
-import org.eclipse.wst.common.componentcore.resources.IVirtualComponent;
-import org.eclipse.wst.common.componentcore.resources.IVirtualFile;
-import org.eclipse.wst.common.componentcore.resources.IVirtualReference;
-import org.eclipse.wst.common.frameworks.datamodel.DataModelFactory;
-import org.eclipse.wst.common.frameworks.datamodel.IDataModel;
-import org.eclipse.wst.common.frameworks.datamodel.IDataModelOperation;
-import org.eclipse.wst.common.frameworks.datamodel.IDataModelProvider;
-import org.eclipse.wst.common.project.facet.core.IFacetedProject;
-import org.eclipse.wst.common.project.facet.core.IProjectFacetVersion;
-import org.eclipse.wst.common.project.facet.core.ProjectFacetsManager;
-
-/**
- * @deprecated wtp 3.2
- */
-public class AddModulestoEARPropertiesPage implements IJ2EEDependenciesControl, Listener {
-
- protected final String PATH_SEPARATOR = AvailableJ2EEComponentsForEARContentProvider.PATH_SEPARATOR;
- protected final IProject project;
- protected final J2EEDependenciesPage propPage;
- protected IVirtualComponent earComponent = null;
- protected Text componentNameText;
- protected Label availableModules;
- protected CheckboxTableViewer availableComponentsViewer;
- protected Button selectAllButton;
- protected Button deselectAllButton;
- protected Button projectJarButton;
- protected Button externalJarButton;
- protected Button addVariableButton;
- protected Button changeLibPathButton;
- protected Composite buttonColumn;
-
- protected String libDir = null;
- protected String oldLibDir;
- protected List j2eeComponentList = new ArrayList();
- protected List javaProjectsList = new ArrayList();
- protected List j2eeLibElementList = new ArrayList();
- protected List javaLibProjectsList = new ArrayList();
- protected static final IStatus OK_STATUS = IDataModelProvider.OK_STATUS;
- protected boolean isVersion5;
- protected Set libsToUncheck;
- protected Listener tableListener;
- protected Listener labelListener;
-
- //[Bug 238264] the cached list of jars selected using 'add jar' or 'add external jars'
- protected List<IVirtualComponent> addedJARComponents = new ArrayList<IVirtualComponent>();
-
-
- /**
- * Constructor for AddModulestoEARPropertiesControl.
- */
- public AddModulestoEARPropertiesPage(final IProject project, final J2EEDependenciesPage page) {
- this.project = project;
- this.propPage = page;
- earComponent = ComponentCore.createComponent(project);
- boolean hasEE5Facet = false;
- try {
- IFacetedProject facetedProject = ProjectFacetsManager.create(project);
- if(facetedProject != null){
- IProjectFacetVersion facetVersion = facetedProject.getProjectFacetVersion(EarUtilities.ENTERPRISE_APPLICATION_FACET);
- //EE6TODO
- if(facetVersion.equals(EarUtilities.ENTERPRISE_APPLICATION_50)){
- hasEE5Facet = true;
- }
- }
- } catch (CoreException e) {
- J2EEUIPlugin.logError(e);
- }
- //EE6TODO
- if(hasEE5Facet){
- String earDDVersion = JavaEEProjectUtilities.getJ2EEDDProjectVersion(project);
- if (earDDVersion.equals(J2EEVersionConstants.VERSION_5_0_TEXT)) {
- isVersion5 = true;
- Application app = (Application)ModelProviderManager.getModelProvider(project).getModelObject();
- if (app != null)
- oldLibDir = app.getLibraryDirectory();
- if (oldLibDir == null) oldLibDir = J2EEConstants.EAR_DEFAULT_LIB_DIR;
- libDir = oldLibDir;
- }
- }
- libsToUncheck = new HashSet();
- }
-
- public Composite createContents(final Composite parent) {
- Composite composite = new Composite(parent, SWT.NONE);
- GridLayout layout = new GridLayout();
- layout.marginWidth = 0;
- layout.marginWidth = 0;
- composite.setLayout(layout);
- composite.setLayoutData(new GridData(GridData.FILL_BOTH));
- J2EEDependenciesPage.createDescriptionComposite(composite, ManifestUIResourceHandler.EAR_Modules_Desc);
- createListGroup(composite);
- refresh();
- Dialog.applyDialogFont(parent);
- return composite;
- }
-
- protected void createListGroup(Composite parent) {
- Composite listGroup = new Composite(parent, SWT.NONE);
- GridLayout layout = new GridLayout();
- layout.numColumns = 1;
- layout.marginWidth = 0;
- layout.marginHeight = 0;
- listGroup.setLayout(layout);
- GridData gData = new GridData(GridData.FILL_BOTH);
- gData.horizontalIndent = 5;
- listGroup.setLayoutData(gData);
-
- availableModules = new Label(listGroup, SWT.NONE);
- gData = new GridData(GridData.HORIZONTAL_ALIGN_FILL | GridData.VERTICAL_ALIGN_FILL);
- availableModules.setText(J2EEUIMessages.getResourceString("AVAILABLE_J2EE_COMPONENTS")); //$NON-NLS-1$ = "Available dependent JARs:"
- availableModules.setLayoutData(gData);
- createTableComposite(listGroup);
- }
-
- public boolean performOk() {
- NullProgressMonitor monitor = new NullProgressMonitor();
- if (isVersion5) {
- if (libDir.length() == 0) {
-
- MessageDialog dlg = new MessageDialog(null,
- J2EEUIMessages.getResourceString(J2EEUIMessages.BLANK_LIB_DIR),
- null, J2EEUIMessages.getResourceString(J2EEUIMessages.BLANK_LIB_DIR_WARN_QUESTION),
- MessageDialog.QUESTION, new String[] {J2EEUIMessages.YES_BUTTON,
- J2EEUIMessages.NO_BUTTON,
- J2EEUIMessages.CANCEL_BUTTON}, 1);
- switch (dlg.open()) {
- case 0: break;
- case 1: {
- handleChangeLibDirButton(false);
- return false;
- }
- case 2: return false;
- default: return false;
- }
- }
- updateLibDir(monitor);
- }
- removeModulesFromEAR(monitor);
- addModulesToEAR(monitor);
- refresh();
- return true;
- }
-
- public void performDefaults() {
- }
-
- public boolean performCancel() {
- return true;
- }
-
- public void dispose() {
- Table table = null;
- if (availableComponentsViewer != null) {
- table = availableComponentsViewer.getTable();
- }
- if(table != null){
- table.removeListener(SWT.Dispose, tableListener);
- table.removeListener(SWT.KeyDown, tableListener);
- table.removeListener(SWT.MouseMove, tableListener);
- table.removeListener(SWT.MouseHover, tableListener);
- }
- }
-
- public void setVisible(boolean visible) {
- }
-
- private List newJ2EEModulesToAdd(boolean inLibFolder){
- if (inLibFolder && !isVersion5) return null;
- List newComps = new ArrayList();
- List comps = inLibFolder ? j2eeLibElementList : j2eeComponentList;
- if (comps != null && !comps.isEmpty()){
- for (int i = 0; i < comps.size(); i++){
- IVirtualComponent handle = (IVirtualComponent)comps.get(i);
- if (ClasspathDependencyUtil.isClasspathComponentDependency(handle)) {
- continue;
- }
- if( !inEARAlready(handle))
- newComps.add(handle);
- }
- }
- return newComps;
- }
-
- private void updateLibDir(IProgressMonitor monitor) {
- if (libDir.equals(oldLibDir)) return;
- final IEARModelProvider earModel = (IEARModelProvider)ModelProviderManager.getModelProvider(project);
- final Application app = (Application)ModelProviderManager.getModelProvider(project).getModelObject();
- oldLibDir = app.getLibraryDirectory();
- if (oldLibDir == null) oldLibDir = J2EEConstants.EAR_DEFAULT_LIB_DIR;
- earModel.modify(new Runnable() {
- public void run() {
- app.setLibraryDirectory(libDir);
- }}, null);
- }
-
- protected void createDD(IProgressMonitor monitor) {
- if( earComponent != null ){
- IDataModelOperation op = generateEARDDOperation();
- try {
- op.execute(monitor, null);
- } catch (ExecutionException e) {
- J2EEUIPlugin.logError(e);
- }
- }
- }
-
- private void execAddOp(IProgressMonitor monitor, List componentList, String path) throws CoreException {
- if (componentList == null || componentList.isEmpty()) return;
- IDataModel dm = DataModelFactory.createDataModel(new AddComponentToEnterpriseApplicationDataModelProvider());
-
- dm.setProperty(ICreateReferenceComponentsDataModelProperties.SOURCE_COMPONENT, earComponent);
- dm.setProperty(ICreateReferenceComponentsDataModelProperties.TARGET_COMPONENT_LIST, componentList);
-
- //[Bug 238264] the uri map needs to be manually set correctly
- Map uriMap = new HashMap();
- IVirtualComponent virtComp;
- String virtCompURIMapName;
- for(int i=0; i<componentList.size(); i++) {
- virtComp = (IVirtualComponent)componentList.get(i);
- virtCompURIMapName = getVirtualComponentNameWithExtension(virtComp);
- uriMap.put(virtComp, virtCompURIMapName);
- }
- dm.setProperty(ICreateReferenceComponentsDataModelProperties.TARGET_COMPONENTS_TO_URI_MAP, uriMap);
-
- if (isVersion5) dm.setProperty(ICreateReferenceComponentsDataModelProperties.TARGET_COMPONENTS_DEPLOY_PATH, path);
-
- IStatus stat = dm.validateProperty(ICreateReferenceComponentsDataModelProperties.TARGET_COMPONENT_LIST);
- if (stat != OK_STATUS)
- throw new CoreException(stat);
- try {
- dm.getDefaultOperation().execute(monitor, null);
- } catch (ExecutionException e) {
- J2EEUIPlugin.logError(e);
- }
- }
-
- private void execAddOp1(IProgressMonitor monitor, List jProjList, List j2eeCompList, String path)
- throws CoreException {
- if (!jProjList.isEmpty()) {
- Set moduleProjects = new HashSet();
- for (int i = 0; i < jProjList.size(); i++) {
- try {
- IProject proj = (IProject) jProjList.get(i);
- moduleProjects.add(proj);
- IDataModel migrationdm = DataModelFactory.createDataModel(new JavaProjectMigrationDataModelProvider());
- migrationdm.setProperty(IJavaProjectMigrationDataModelProperties.PROJECT_NAME, proj.getName());
- migrationdm.getDefaultOperation().execute(monitor, null);
-
-
- IDataModel refdm = DataModelFactory.createDataModel(new CreateReferenceComponentsDataModelProvider());
- List targetCompList = (List) refdm.getProperty(ICreateReferenceComponentsDataModelProperties.TARGET_COMPONENT_LIST);
-
- IVirtualComponent targetcomponent = ComponentCore.createComponent(proj);
- targetCompList.add(targetcomponent);
-
- refdm.setProperty(ICreateReferenceComponentsDataModelProperties.SOURCE_COMPONENT, earComponent);
- refdm.setProperty(ICreateReferenceComponentsDataModelProperties.TARGET_COMPONENT_LIST, targetCompList);
- if (isVersion5) refdm.setProperty(ICreateReferenceComponentsDataModelProperties.TARGET_COMPONENTS_DEPLOY_PATH, path);
-
-
- // referenced java projects should have archiveName attribute
- ((Map)refdm.getProperty(ICreateReferenceComponentsDataModelProperties.TARGET_COMPONENTS_TO_URI_MAP)).put(targetcomponent, proj.getName().replace(' ', '_') + IJ2EEModuleConstants.JAR_EXT);
-
- refdm.getDefaultOperation().execute(monitor, null);
- j2eeCompList.add(targetcomponent);
- } catch (ExecutionException e) {
- J2EEUIPlugin.logError(e);
- }
- }
- EarFacetRuntimeHandler.updateModuleProjectRuntime(earComponent.getProject(), moduleProjects, new NullProgressMonitor());
- } // end
-
- }
-
- private IStatus addModulesToEAR(IProgressMonitor monitor) {
- try {
- if( earComponent != null ){
- final List list = newJ2EEModulesToAdd(false);
- final List bndList = newJ2EEModulesToAdd(true);
- final boolean shouldRun = (list != null && !list.isEmpty()) || !javaProjectsList.isEmpty();
- final boolean shouldBndRun = isVersion5 &&
- ((bndList != null && !bndList.isEmpty()) || !javaLibProjectsList.isEmpty());
- if(shouldRun || shouldBndRun){
- IWorkspaceRunnable runnable = new IWorkspaceRunnable(){
-
- public void run(IProgressMonitor monitor) throws CoreException{
- if (shouldRun) {
- execAddOp(monitor, list, J2EEConstants.EAR_ROOT_DIR);
- execAddOp1(monitor, javaProjectsList, j2eeComponentList, J2EEConstants.EAR_ROOT_DIR);
- }
- if (shouldBndRun) {
- execAddOp(monitor, bndList, libDir);
- execAddOp1(monitor, javaLibProjectsList, j2eeLibElementList, libDir);
- }
- }
- };
- J2EEUIPlugin.getWorkspace().run(runnable, monitor);
- }
- }
- } catch (Exception e) {
- J2EEUIPlugin.logError(e);
- }
-
- //[Bug 238264] clear out the cache because they should all either be added as references now
- // or no longer checked and therefore not wanted by the user
- this.addedJARComponents.clear();
-
- return OK_STATUS;
- }
-
- private void remComps(List list, String path) {
- if( !list.isEmpty()){
- try {
- // remove the components from the EAR
- IDataModelOperation op = removeComponentFromEAROperation(earComponent, list, path);
- op.execute(null, null);
- // if that succeeded, remove all EAR-scope J2EE dependencies on these components
- J2EEComponentClasspathUpdater.getInstance().queueUpdateEAR(earComponent.getProject());
- } catch (ExecutionException e) {
- J2EEUIPlugin.logError(e);
- }
- }
- }
-
- private IStatus removeModulesFromEAR(IProgressMonitor monitor) {
- IStatus stat = OK_STATUS;
- if (!isVersion5) {
- if(earComponent != null && j2eeComponentList != null) {
- List list = getComponentsToRemove();
- remComps(list, J2EEConstants.EAR_ROOT_DIR);
- }
- } else {
- if( earComponent != null && j2eeComponentList != null) {
- List[] list = getComponentsToRemoveUpdate(!libDir.equals(oldLibDir));
- remComps(list[0], J2EEConstants.EAR_ROOT_DIR);
-
- remComps(list[1], oldLibDir);
- }
- }
- return stat;
- }
-
- protected IDataModelOperation generateEARDDOperation() {
- IDataModel model = DataModelFactory.createDataModel(new EarCreateDeploymentFilesDataModelProvider());
- model.setProperty(ICreateDeploymentFilesDataModelProperties.GENERATE_DD, earComponent);
- model.setProperty(ICreateDeploymentFilesDataModelProperties.TARGET_PROJECT, project);
- return model.getDefaultOperation();
- }
-
- protected IDataModelOperation removeComponentFromEAROperation(IVirtualComponent sourceComponent, List targetComponentsHandles, String dir) {
- IDataModel model = DataModelFactory.createDataModel(new RemoveComponentFromEnterpriseApplicationDataModelProvider());
- model.setProperty(ICreateReferenceComponentsDataModelProperties.SOURCE_COMPONENT, sourceComponent);
- List modHandlesList = (List) model.getProperty(ICreateReferenceComponentsDataModelProperties.TARGET_COMPONENT_LIST);
- modHandlesList.addAll(targetComponentsHandles);
- model.setProperty(ICreateReferenceComponentsDataModelProperties.TARGET_COMPONENT_LIST, modHandlesList);
- model.setProperty(ICreateReferenceComponentsDataModelProperties.TARGET_COMPONENTS_DEPLOY_PATH, dir);
- return model.getDefaultOperation();
- }
-
- protected List getComponentsToRemove(){
- //j2eeComponentList = getCheckedJ2EEElementsAsList();
- List list = new ArrayList();
- if( earComponent != null){
- IVirtualReference[] oldrefs = earComponent.getReferences();
- for (int j = 0; j < oldrefs.length; j++) {
- IVirtualReference ref = oldrefs[j];
- IVirtualComponent handle = ref.getReferencedComponent();
- if(!j2eeComponentList.contains(handle) && (isVersion5 ? !j2eeLibElementList.contains(handle) : true)){
- if ((handle instanceof VirtualArchiveComponent) && (isPhysicallyAdded((VirtualArchiveComponent)handle)))
- continue;
- list.add(handle);
- }
- }
- }
- return list;
- }
-
- // EAR5 case
- protected List[] getComponentsToRemoveUpdate(boolean dirUpdated){
- //j2eeComponentList = getCheckedJ2EEElementsAsList();
- List[] list = new ArrayList[2];
- list[0] = new ArrayList();
- list[1] = new ArrayList();
- if( earComponent != null){
- IVirtualReference[] oldrefs = earComponent.getReferences();
- for (int j = 0; j < oldrefs.length; j++) {
- IVirtualReference ref = oldrefs[j];
- IVirtualComponent handle = ref.getReferencedComponent();
- if (handle instanceof VirtualArchiveComponent) {
- VirtualArchiveComponent comp = (VirtualArchiveComponent)handle;
- if (isPhysicallyAdded(comp))
- continue;
- }
- if(!j2eeComponentList.contains(handle) && ref.getRuntimePath().isRoot()) {
- list[0].add(handle);
- }
- if((!j2eeLibElementList.contains(handle) || dirUpdated) &&
- ref.getRuntimePath().toString().equals(oldLibDir)) {
- list[1].add(handle);
- }
- }
- }
- return list;
- }
-
-
- public void handleEvent(Event event) {
- if (event.widget == selectAllButton)
- handleSelectAllButtonPressed();
- else if (event.widget == deselectAllButton)
- handleDeselectAllButtonPressed();
- else if(event.widget == projectJarButton)
- handleSelectProjectJarButton();
- else if(event.widget == externalJarButton)
- handleSelectExternalJarButton();
- else if(event.widget == addVariableButton)
- handleSelectVariableButton();
- else if(event.widget == changeLibPathButton) {
- this.handleChangeLibDirButton(true);
- }
- }
-
- private void handleSelectAllButtonPressed() {
- availableComponentsViewer.setAllChecked(true);
- j2eeComponentList = getCheckedJ2EEElementsAsList(true);
- javaProjectsList = getCheckedJavaProjectsAsList(true);
- if (isVersion5) {
- j2eeLibElementList = getCheckedJ2EEElementsAsList(false);
- javaLibProjectsList = getCheckedJavaProjectsAsList(false);
- }
- }
-
- /**
- * [Bug 279386] Grayed items must not be deselected.
- */
- private void handleDeselectAllButtonPressed() {
- TableItem[] items = availableComponentsViewer.getTable().getItems();
- for (TableItem item : items) {
- if (item.getChecked() && !item.getGrayed()) {
- // uncheck this item if already checked and not grayed
- item.setChecked(false);
- if (isVersion5) {
- ((DoubleCheckboxTableItem) item).setSecondChecked(false);
- }
-
- // remove from the cache lists
- Object comp = item.getData();
- if (comp != null) {
- j2eeComponentList.remove(comp);
- javaProjectsList.remove(comp);
- if (isVersion5) {
- libsToUncheck.remove(comp);
- j2eeLibElementList.remove(comp);
- javaLibProjectsList.remove(comp);
- }
- }
- }
- }
- }
-
- /**
- * [Bug 238264]
- * Add an archive as a potential new reference for this.earComponent
- * NOTE1: the given archive will not be added as a potential reference if there is already a reference to it
- * NOTE2: the given archive will only be added as an actual reference when this.performOk is invoked
- *
- * @param archive the archive to add as a potential new reference in this.earComponent
- *
- */
- private void addPotentialNewReference(IVirtualComponent archive) {
- //check to see if a reference to the given archive already exists
- IVirtualReference [] existingRefs = earComponent.getReferences();
- IVirtualComponent referencedComponent;
- boolean refAlreadyExists = false;
- for(int i=0;i<existingRefs.length && !refAlreadyExists;i++){
- referencedComponent = existingRefs[i].getReferencedComponent();
- refAlreadyExists = referencedComponent.equals(archive);
- }
-
- //only add the archive as a potentialy new reference if it does not already exist
- if(!refAlreadyExists && !j2eeComponentList.contains(archive) && !addedJARComponents.contains(archive)) {
- this.j2eeComponentList.add(archive);
- this.addedJARComponents.add(archive);
- } else {
- //TODO should inform user that they selected an already referenced archive?
- }
- }
-
- private void handleSelectExternalJarButton(){
- IPath[] selected= BuildPathDialogAccess.chooseExternalJAREntries(propPage.getShell());
-
- if (selected != null) {
- for (int i= 0; i < selected.length; i++) {
-
- String type = VirtualArchiveComponent.LIBARCHIVETYPE + IPath.SEPARATOR;
- IVirtualComponent archive = ComponentCore.createArchiveComponent( earComponent.getProject(), type +
- selected[i].toString());
-
- this.addPotentialNewReference(archive);
- }
- refresh();
- }
-
- }
-
- private void handleSelectVariableButton(){
- IPath existingPath[] = new Path[0];
- IPath[] paths = BuildPathDialogAccess.chooseVariableEntries(propPage.getShell(), existingPath);
-
- if (paths != null) {
- refresh();
- for (int i = 0; i < paths.length; i++) {
- IPath resolvedPath= JavaCore.getResolvedVariablePath(paths[i]);
-
- java.io.File file = new java.io.File(resolvedPath.toOSString());
- if( file.isFile() && file.exists()){
- String type = VirtualArchiveComponent.VARARCHIVETYPE + IPath.SEPARATOR;
-
- IVirtualComponent archive = ComponentCore.createArchiveComponent( earComponent.getProject(), type +
- paths[i].toString());
-
- this.addPotentialNewReference(archive);
- }else{
- //display error
- }
- }
- refresh();
- }
- }
-
- private void handleChangeLibDirButton(boolean warnBlank) {
- IVirtualFile vFile = earComponent.getRootFolder().getFile(new Path(J2EEConstants.APPLICATION_DD_URI));
- if (!vFile.exists()) {
- if (!MessageDialog.openQuestion(null,
- J2EEUIMessages.getResourceString(J2EEUIMessages.NO_DD_MSG_TITLE),
- J2EEUIMessages.getResourceString(J2EEUIMessages.GEN_DD_QUESTION))) return;
- createDD(new NullProgressMonitor());
- }
- Application app = (Application)ModelProviderManager.getModelProvider(project).getModelObject();
- if (libDir == null) {
- libDir = app.getLibraryDirectory();
- if (libDir == null) libDir = J2EEConstants.EAR_DEFAULT_LIB_DIR;
- }
-
- ChangeLibDirDialog dlg = new ChangeLibDirDialog(PlatformUI.getWorkbench().getActiveWorkbenchWindow()
- .getShell(), libDir, warnBlank);
- if (dlg.open() == Dialog.CANCEL) return;
- libDir = dlg.getValue().trim();
- if (libDir.length() > 0) {
- if (!libDir.startsWith(J2EEConstants.EAR_ROOT_DIR)) libDir = IPath.SEPARATOR + libDir;
- }
- setLibDirInContentProvider();
- refresh();
- }
-
-
- protected void createTableComposite(Composite parent) {
- Composite composite = new Composite(parent, SWT.NONE);
- GridData gData = new GridData(GridData.FILL_BOTH);
- composite.setLayoutData(gData);
- fillComposite(composite);
- }
-
- public void fillComposite(Composite parent) {
- GridLayout layout = new GridLayout();
- layout.numColumns = 2;
- layout.marginHeight = 0;
- parent.setLayout(layout);
- parent.setLayoutData(new GridData(GridData.FILL_BOTH));
- createTable(parent);
- createButtonColumn(parent);
- }
-
- protected void createButtonColumn(Composite parent) {
- buttonColumn = createButtonColumnComposite(parent);
- GridData data = new GridData(GridData.HORIZONTAL_ALIGN_END);
- buttonColumn.setLayoutData(data);
- createPushButtons();
- }
-
- protected void createPushButtons() {
- selectAllButton = createPushButton(SELECT_ALL_BUTTON);
- deselectAllButton = createPushButton(DE_SELECT_ALL_BUTTON);
- projectJarButton = createPushButton(J2EEUIMessages.getResourceString(J2EEUIMessages.PROJECT_JAR));
- externalJarButton = createPushButton(J2EEUIMessages.getResourceString(J2EEUIMessages.EXTERNAL_JAR));
- addVariableButton = createPushButton(J2EEUIMessages.getResourceString(J2EEUIMessages.ADDVARIABLE));
- if (isVersion5) changeLibPathButton = createPushButton(J2EEUIMessages.getResourceString(J2EEUIMessages.CHANGE_LIB_DIR));
- }
-
- protected Button createPushButton(String label) {
- Button aButton = primCreatePushButton(label, buttonColumn);
- aButton.addListener(SWT.Selection, this);
- aButton.setLayoutData(new GridData(GridData.FILL_HORIZONTAL));
- return aButton;
- }
-
- public Button primCreatePushButton(String label, Composite aButtonColumn) {
- Button aButton = new Button(aButtonColumn, SWT.PUSH);
- aButton.setText(label);
- return aButton;
- }
-
- public Composite createButtonColumnComposite(Composite parent) {
- Composite aButtonColumn = new Composite(parent, SWT.NONE);
- GridLayout layout = new GridLayout();
- layout.numColumns = 1;
- layout.marginHeight = 0;
- layout.marginWidth = 0;
- aButtonColumn.setLayout(layout);
- GridData data = new GridData(GridData.HORIZONTAL_ALIGN_FILL | GridData.VERTICAL_ALIGN_BEGINNING);
- aButtonColumn.setLayoutData(data);
- return aButtonColumn;
- }
-
- public Group createGroup(Composite parent) {
- return new Group(parent, SWT.NULL);
- }
-
- protected void createTable(Composite parent) {
- availableComponentsViewer = createavailableComponentsViewer(parent);
- GridData gd = new GridData(GridData.HORIZONTAL_ALIGN_FILL | GridData.FILL_VERTICAL);
- availableComponentsViewer.getTable().setLayoutData(gd);
-
- if (earComponent != null) {
- int j2eeVersion = J2EEVersionUtil.convertVersionStringToInt(earComponent);
- ILabelDecorator decorator = PlatformUI.getWorkbench().getDecoratorManager().getLabelDecorator();
- AvailableJ2EEComponentsForEARContentProvider provider = new AvailableJ2EEComponentsForEARContentProvider(earComponent, j2eeVersion, decorator);
- decorator.addListener(new ILabelProviderListener(){
-
- public void labelProviderChanged(LabelProviderChangedEvent event) {
- refresh();
- }
- });
- availableComponentsViewer.setContentProvider(provider);
- availableComponentsViewer.setLabelProvider(provider);
-
-
- setLibDirInContentProvider();
- addTableListeners();
- }
- }
-
- private void setLibDirInContentProvider() {
- IContentProvider prov = availableComponentsViewer.getContentProvider();
- if (prov instanceof AvailableJ2EEComponentsForEARContentProvider)
- ((AvailableJ2EEComponentsForEARContentProvider)prov).setCurrentLibDir(libDir);
- }
-
- protected void addTableListeners() {
- addCheckStateListener();
- addHoverHelpListeners();
- }
-
- protected void addHoverHelpListeners() {
- final Table table = availableComponentsViewer.getTable();
- createLabelListener(table);
- createTableListener(table);
- table.addListener(SWT.Dispose, tableListener);
- table.addListener(SWT.KeyDown, tableListener);
- table.addListener(SWT.MouseMove, tableListener);
- table.addListener(SWT.MouseHover, tableListener);
- }
-
- protected void createLabelListener(final Table table) {
- labelListener = new Listener () {
- public void handleEvent (Event event) {
- Label label = (Label)event.widget;
- Shell shell = label.getShell ();
- switch (event.type) {
- case SWT.MouseDown:
- Event e = new Event ();
- e.item = (TableItem) label.getData ("_TABLEITEM"); //$NON-NLS-1$
- table.setSelection (new TableItem [] {(TableItem) e.item});
- table.notifyListeners (SWT.Selection, e);
- shell.dispose ();
- table.setFocus();
- break;
- case SWT.MouseExit:
- shell.dispose ();
- break;
- }
- }
- };
- }
-
- protected void createTableListener(final Table table) {
- tableListener = new Listener () {
- Shell tip = null;
- Label label = null;
- public void handleEvent (Event event) {
- switch (event.type) {
- case SWT.Dispose:
- case SWT.KeyDown:
- case SWT.MouseMove: {
- if (tip == null) break;
- tip.dispose ();
- tip = null;
- label = null;
- break;
- }
- case SWT.MouseHover: {
- TableItem item = table.getItem (new Point (event.x, event.y));
- if (item != null) {
- if (!item.getGrayed())
- return;
- if (tip != null && !tip.isDisposed ()) tip.dispose ();
- tip = new Shell (PlatformUI.getWorkbench().getActiveWorkbenchWindow()
- .getShell(), SWT.ON_TOP | SWT.NO_FOCUS | SWT.TOOL);
- tip.setBackground (Display.getDefault().getSystemColor (SWT.COLOR_INFO_BACKGROUND));
- FillLayout layout = new FillLayout ();
- layout.marginWidth = 2;
- tip.setLayout (layout);
- label = new Label (tip, SWT.WRAP);
- label.setForeground (Display.getDefault().getSystemColor (SWT.COLOR_INFO_FOREGROUND));
- label.setBackground (Display.getDefault().getSystemColor (SWT.COLOR_INFO_BACKGROUND));
- label.setData ("_TABLEITEM", item); //$NON-NLS-1$
- label.setText (J2EEUIMessages.getResourceString(J2EEUIMessages.HOVER_HELP_FOR_DISABLED_LIBS));
- label.addListener (SWT.MouseExit, labelListener);
- label.addListener (SWT.MouseDown, labelListener);
- Point size = tip.computeSize (SWT.DEFAULT, SWT.DEFAULT);
- Rectangle rect = item.getBounds (0);
- Point pt = table.toDisplay (rect.x, rect.y);
- tip.setBounds (pt.x, pt.y - size.y, size.x, size.y);
- tip.setVisible (true);
- }
- }
- }
- }
- };
- }
-
- protected void addCheckStateListener() {
- availableComponentsViewer.addCheckStateListener(new ICheckStateListener() {
- public void checkStateChanged(CheckStateChangedEvent event) {
- CheckboxTableViewer vr = (CheckboxTableViewer)event.getSource();
- Object element = event.getElement();
- if (vr.getGrayed(element))
- vr.setChecked(element, !vr.getChecked(element));
- if (!(event instanceof SecondCheckBoxStateChangedEvent) && (isVersion5)) {
- Object[] items = ((DoubleCheckboxTableViewer)vr).getUncheckedItems();
- for (int i = 0; i < items.length; i++) {
- DoubleCheckboxTableItem item = (DoubleCheckboxTableItem)items[i];
- if (item.getSecondChecked()) {
- item.setSecondChecked(false);
- libsToUncheck.remove(event.getElement());
- }
- }
- }
- if ((event instanceof SecondCheckBoxStateChangedEvent)) {
- SecondCheckBoxStateChangedEvent evt = (SecondCheckBoxStateChangedEvent)event;
- DoubleCheckboxTableItem tblItem = evt.getTableItem();
- if (tblItem.getSecondChecked() && isConflict(tblItem.getData())) {
- DependencyConflictResolveDialog dlg = new DependencyConflictResolveDialog(PlatformUI.getWorkbench().getActiveWorkbenchWindow()
- .getShell(), DependencyConflictResolveDialog.DLG_TYPE_2);
- if (dlg.open() == DependencyConflictResolveDialog.BTN_ID_CANCEL) {
- tblItem.setSecondChecked(false);
- return;
- }
- }
- if (tblItem.getSecondChecked()) {
- if (!tblItem.getChecked())
- tblItem.setChecked(true);
- libsToUncheck.add(event.getElement());
- } else {
- libsToUncheck.remove(event.getElement());
- }
- }
- j2eeComponentList = getCheckedJ2EEElementsAsList(true);
- javaProjectsList = getCheckedJavaProjectsAsList(true);
- if (isVersion5) {
- j2eeLibElementList = getCheckedJ2EEElementsAsList(false);
- javaLibProjectsList = getCheckedJavaProjectsAsList(false);
-
- }
- }
- });
- }
-
- protected List getCPComponentsInEar(boolean inLibFolder) {
- List list = new ArrayList();
- Map pathToComp = new HashMap();
- IVirtualReference refs[] = earComponent.getReferences();
- for( int i=0; i< refs.length; i++){
- IVirtualReference ref = refs[i];
- if ((ref.getRuntimePath().isRoot() && !inLibFolder) ||
- (!ref.getRuntimePath().isRoot() && inLibFolder) ||
- !isVersion5) {
-
- IVirtualComponent comp = ref.getReferencedComponent();
- AvailableJ2EEComponentsForEARContentProvider.addClasspathComponentDependencies(list, pathToComp, comp);
- }
- }
- return list;
- }
-
- protected List getComponentsInEar(boolean inLibFolder) {
- List list = new ArrayList();
- IVirtualReference refs[] = earComponent.getReferences();
- for( int i=0; i< refs.length; i++){
- IVirtualReference ref = refs[i];
- if ((ref.getRuntimePath().isRoot() && !inLibFolder) ||
- (!ref.getRuntimePath().isRoot() && inLibFolder) ||
- !isVersion5) {
-
- IVirtualComponent comp = ref.getReferencedComponent();
- list.add(comp);
- }
- }
- return list;
- }
-
- /**
- *
- * @param componentHandle
- * @return
- * @description returns true is a component is already in the EAR as a dependent
- */
- protected boolean inEARAlready(IVirtualComponent component){
- IVirtualReference refs[] = earComponent.getReferences();
- for( int i=0; i< refs.length; i++){
- IVirtualReference ref = refs[i];
- if ( ref.getReferencedComponent().equals( component ))
- return true;
- }
- return false;
- }
-
- // The next two are used in EAR5 case
- protected List getCheckedJ2EEElementsAsList(boolean singleChecked) {
- Object[] elements;
- if (isVersion5) {
- elements = singleChecked ? ((DoubleCheckboxTableViewer)availableComponentsViewer).getSingleCheckedElements():
- ((DoubleCheckboxTableViewer)availableComponentsViewer).getDoubleCheckedElements();
-
- } else {
- elements = availableComponentsViewer.getCheckedElements();
- }
- List list;
- if (elements == null || elements.length == 0)
- list = new ArrayList(0); // Collections.EMPTY_LIST would cause UnsupportedOperationException when a later attempt to add to it is made
- else {
- list = new ArrayList();
- for (int i = 0; i < elements.length; i++) {
- if (elements[i] instanceof IVirtualComponent) {
- list.add(elements[i]);
- }
- }
- }
- return list;
- }
-
- protected List getCheckedJavaProjectsAsList(boolean single) {
- Object[] elements;
- if (isVersion5) {
- elements = single ? ((DoubleCheckboxTableViewer)availableComponentsViewer).getSingleCheckedElements() :
- ((DoubleCheckboxTableViewer)availableComponentsViewer).getDoubleCheckedElements();
- } else {
- elements = availableComponentsViewer.getCheckedElements();
- }
-
- List list;
- if (elements == null || elements.length == 0)
- list = new ArrayList(0); // Collections.EMPTY_LIST would cause UnsupportedOperationException when a later attempt to add to it is made
- else {
- list = new ArrayList();
- for (int i = 0; i < elements.length; i++) {
- if (elements[i] instanceof IProject) {
- list.add(elements[i]);
- }
- }
- }
- return list;
- }
-
- protected List getLibFolderLibsAsList() {
- Object[] items = ((DoubleCheckboxTableViewer)availableComponentsViewer).getSecondCheckedItems();
- List list;
- if (items == null || items.length == 0)
- list = new ArrayList(0); // Collections.EMPTY_LIST would cause UnsupportedOperationException when a later attempt to add to it is made
- else {
- list = new ArrayList();
- for (int i = 0; i < items.length; i++) {
- Object element = ((DoubleCheckboxTableItem)items[i]).getData();
- if (element instanceof IProject) {
- list.add(element);
- }
- }
- }
- return list;
- }
-
- public CheckboxTableViewer createavailableComponentsViewer(Composite parent) {
- int flags = SWT.CHECK | SWT.BORDER | SWT.FULL_SELECTION | SWT.MULTI;
-
- Table table = isVersion5 ? new Table(parent, flags) : new Table(parent, flags);
- availableComponentsViewer = isVersion5 ? new DoubleCheckboxTableViewer(table, 2) : new CheckboxTableViewer(table);
-
- // set up table layout
- TableLayout tableLayout = new org.eclipse.jface.viewers.TableLayout();
- tableLayout.addColumnData(new ColumnWeightData(200, true));
- tableLayout.addColumnData(new ColumnWeightData(200, true));
- if (isVersion5) tableLayout.addColumnData(new ColumnWeightData(200, true));
- table.setLayout(tableLayout);
- table.setHeaderVisible(true);
- table.setLinesVisible(true);
- availableComponentsViewer.setSorter(null);
-
- // table columns
- TableColumn fileNameColumn = new TableColumn(table, SWT.NONE, 0);
- fileNameColumn.setText(ManifestUIResourceHandler.JAR_Module_UI_);
- fileNameColumn.setResizable(true);
-
- TableColumn projectColumn = new TableColumn(table, SWT.NONE, 1);
- projectColumn.setText(ManifestUIResourceHandler.Project_UI_);
- projectColumn.setResizable(true);
-
- if (isVersion5) {
- TableColumn bndColumn = new TableColumn(table, SWT.NONE, 2);
- bndColumn.setText(ManifestUIResourceHandler.Packed_In_Lib_UI_);
- bndColumn.setResizable(true);
- }
-
- tableLayout.layout(table, true);
- return availableComponentsViewer;
-
- }
-
- private boolean secondShouldBeDisabled(IVirtualComponent component) {
- if(component.isBinary()) return false;
- if (JavaEEProjectUtilities.isApplicationClientComponent(component)) return true;
- if (JavaEEProjectUtilities.isEARProject(component.getProject()) && component.isBinary()) return false;
- if (JavaEEProjectUtilities.isEJBComponent(component)) return true;
- if (JavaEEProjectUtilities.isDynamicWebComponent(component)) return true;
- if (JavaEEProjectUtilities.isJCAComponent(component)) return true;
- if (JavaEEProjectUtilities.isStaticWebProject(component.getProject())) return true;
- if (JavaEEProjectUtilities.isProjectOfType(component.getProject(), IJ2EEFacetConstants.JAVA)) return false;
- return false;
- }
-
- private boolean isPhysicallyAdded(VirtualArchiveComponent component) {
- try {
- if(component.getWorkspaceRelativePath() == null || !component.getWorkspaceRelativePath().segment(0).equals(earComponent.getName()))
- return false;
- component.getProjectRelativePath();
- return true;
- } catch (IllegalArgumentException e) {
- return false;
- }
- }
-
- private boolean isInLibDir(VirtualArchiveComponent comp) {
- IPath p = comp.getProjectRelativePath();
- if (p.segmentCount() == 2)
- return false;
- return true;
- }
-
-
- public void refresh() {
- if(availableComponentsViewer.getContentProvider() == null){
- return;
- }
- IWorkspaceRoot input = ResourcesPlugin.getWorkspace().getRoot();
- availableComponentsViewer.setInput(input);
- GridData data = new GridData(GridData.FILL_BOTH);
- int numlines = Math.min(10, availableComponentsViewer.getTable().getItemCount());
- data.heightHint = availableComponentsViewer.getTable().getItemHeight() * numlines;
- availableComponentsViewer.getTable().setLayoutData(data);
-
- //[Bug 238264] for all the jars in the cache temparaly list them in the grid
- // until the user applys the changes
- for(IVirtualComponent jarComponent : this.addedJARComponents) {
- availableComponentsViewer.add(jarComponent);
- }
-
- TableItem [] items = availableComponentsViewer.getTable().getItems();
- List list = new ArrayList();
- //Object[] comps = getComponentsInEar();
- List cpComps;
- List cpLibComps = new LinkedList();
- HashSet j2eeComponentSet = new HashSet();
- HashSet j2eeLibComponentSet = new HashSet();
- if (isVersion5) {
- if( j2eeComponentList.isEmpty() ){
- List comps = getComponentsInEar(false);
- j2eeComponentList.addAll(comps);
- }
- if( j2eeLibElementList.isEmpty() ){
- List comps = getComponentsInEar(true);
- j2eeLibElementList.addAll(comps);
- }
- // get all Classpath contributions to the Ear
- cpComps = getCPComponentsInEar(false);
- j2eeComponentList.addAll(cpComps);
- cpLibComps = getCPComponentsInEar(true);
- j2eeLibElementList.addAll(cpLibComps);
- for (int i = 0; i < j2eeLibElementList.size(); i++) {
- j2eeLibComponentSet.add(j2eeLibElementList.get(i));
- }
-
- } else {
- if( j2eeComponentList.isEmpty() ){
- List comps = getComponentsInEar(false);
- j2eeComponentList.addAll(comps);
- }
- // get all Classpath contributions to the Ear
- cpComps = getCPComponentsInEar(false);
- j2eeComponentList.addAll(cpComps);
- }
- for (int i = 0; i < j2eeComponentList.size(); i++) {
- j2eeComponentSet.add(j2eeComponentList.get(i));
- }
-
- for (int i = 0; i < items.length; i++) {
- Object element = items[i].getData();
- try {
- if (element instanceof IVirtualComponent ||
- (element instanceof IProject && ((IProject) element).hasNature(JavaCore.NATURE_ID))) {
- if (j2eeComponentSet.contains(element)) {
- list.add(element);
- }
- boolean shouldBeDisabled = false;
- if (element instanceof VirtualArchiveComponent) {
- shouldBeDisabled = isPhysicallyAdded((VirtualArchiveComponent)element);
- if (shouldBeDisabled) {
- items[i].setChecked(true);
- items[i].setGrayed(true);
- }
- }
- if (isVersion5) {
- DoubleCheckboxTableItem dcbItem = (DoubleCheckboxTableItem)items[i];
- boolean secondEnabled = true;
- if (element instanceof IVirtualComponent)
- secondEnabled = !secondShouldBeDisabled((IVirtualComponent) element);
- if (shouldBeDisabled) {
- dcbItem.setSecondChecked(isInLibDir((VirtualArchiveComponent)element));
- dcbItem.setSecondEnabled(false);
- } else {
- dcbItem.setSecondChecked(j2eeLibComponentSet.contains(element));
- dcbItem.setSecondEnabled(secondEnabled);
- }
- if (j2eeLibComponentSet.contains(element)) list.add(element);
- }
- }
- } catch (CoreException e) {
- J2EEUIPlugin.logError(0, e.getMessage(), e);
- }
- }
-
- for (int i = 0; i < list.size(); i++)
- availableComponentsViewer.setChecked(list.get(i), true);
- GridData btndata = new GridData(GridData.HORIZONTAL_ALIGN_FILL | GridData.VERTICAL_ALIGN_BEGINNING);
- buttonColumn.setLayoutData(btndata);
-
- }
-
- private boolean isConflict(Object lib) {
- IProject libProj = (lib instanceof IProject) ? (IProject)lib : ((IVirtualComponent)lib).getProject();
- IProject earProject = earComponent.getProject();
- try {
- IProject[] earRefProjects = earProject.getReferencedProjects();
- for (int i = 0; i < earRefProjects.length; i++) {
- if (!JavaEEProjectUtilities.isEARProject(earRefProjects[i]) &&
- !earRefProjects[i].equals(libProj)) {
- IVirtualComponent cmp1 = ComponentCore.createComponent(earRefProjects[i]);
- if (cmp1 != null) {
- IVirtualReference[] refs = cmp1.getReferences();
- for (int j = 0; j < refs.length; j++) {
- if (refs[j].getReferencedComponent().getProject().equals(libProj)) return true;
- }
- }
- }
- }
- return false;
- } catch (CoreException ce) {
- J2EEUIPlugin.logError(ce);
- }
- return false;
- }
-
- private void handleSelectProjectJarButton(){
- IPath[] selected= BuildPathDialogAccess.chooseJAREntries(propPage.getShell(), project.getLocation(), new IPath[0]);
-
- if (selected != null) {
- for (int i= 0; i < selected.length; i++) {
- //IPath fullPath = project.getFile(selected[i]).getFullPath();
- String type = VirtualArchiveComponent.LIBARCHIVETYPE + IPath.SEPARATOR;
- IVirtualComponent archive = ComponentCore.createArchiveComponent( earComponent.getProject(), type +
- selected[i].makeRelative().toString());
-
- this.addPotentialNewReference(archive);
- }
- refresh();
- }
-
- }
-
- /**
- * [Bug 238264]
- * determines a unique URI mapping name for a given component
- * this is in case two components have the same name.
- *
- * @return returns a valid (none duplicate) uri mapping name for the given component\
- */
- private String getURIMappingName(IVirtualComponent archive) {
-
- //get the default uri map name for the given archive
- IPath componentPath = Path.fromOSString(archive.getName());
- String uriMapName = componentPath.lastSegment().replace(' ', '_');
-
-
- //check to be sure this uri mapping is not already in use by another reference
- boolean dupeArchiveName;
- int lastDotIndex;
- String increment;
- IVirtualReference [] existingRefs = earComponent.getReferences();
- for(int i=0;i<existingRefs.length;i++){
- existingRefs[i].getReferencedComponent().getName();
-
- //if uri mapping names of the refed component and the given archive are the same
- // find a new uri map name for the given archive
- if(existingRefs[i].getArchiveName().equals(uriMapName)){
- dupeArchiveName = true;
- //find a new uriMapName for the given component
- for(int j=1; dupeArchiveName; j++){
- lastDotIndex = uriMapName.lastIndexOf('.');
- increment = "_"+j; //$NON-NLS-1$
-
- //create the new potential name
- if(lastDotIndex != -1){
- uriMapName = uriMapName.substring(0, lastDotIndex) + increment + uriMapName.substring(lastDotIndex);
- } else {
- uriMapName = uriMapName.substring(0)+increment;
- }
-
- //determine if the new potential name is valid
- for(int k=0; k<existingRefs.length; k++) {
- dupeArchiveName = existingRefs[k].getArchiveName().equals(uriMapName);
- if(dupeArchiveName) {
- break;
- }
- }
- }
- }
- }
-
- return uriMapName;
- }
-
- /**
- * Method returns the name of the given IVirtualComponent being sure the correct extension
- * is on the end of the name, this is important for internal projects. Added for [Bug 241509]
- *
- * @param virtComp the IVirtualComponent to get the name of with the correct extension
- * @return the name of the given IVirtualComponent with the correct extension
- */
- private String getVirtualComponentNameWithExtension(IVirtualComponent virtComp) {
- String virtCompURIMapName = this.getURIMappingName(virtComp);
-
- boolean linkedToEAR = true;
- try {
- if(virtComp.isBinary()){
- linkedToEAR = ((J2EEModuleVirtualArchiveComponent)virtComp).isLinkedToEAR();
- ((J2EEModuleVirtualArchiveComponent)virtComp).setLinkedToEAR(false);
- }
- if(JavaEEProjectUtilities.isDynamicWebComponent(virtComp)) {
- if(!virtCompURIMapName.endsWith(IJ2EEModuleConstants.WAR_EXT)) {
- //web module URIs need to end in WAR
- virtCompURIMapName += IJ2EEModuleConstants.WAR_EXT;
- }
- } else if(JavaEEProjectUtilities.isJCAComponent(virtComp)) {
- if(!virtCompURIMapName.endsWith(IJ2EEModuleConstants.RAR_EXT)) {
- //connector module URIs need to end in RAR
- virtCompURIMapName += IJ2EEModuleConstants.RAR_EXT;
- }
- } else if(!virtCompURIMapName.endsWith(IJ2EEModuleConstants.JAR_EXT)) {
- //all other modules (EJB, AppClient, Utility) need to end in JAR
- virtCompURIMapName += IJ2EEModuleConstants.JAR_EXT;
- }
- } finally {
- if(virtComp.isBinary()){
- ((J2EEModuleVirtualArchiveComponent)virtComp).setLinkedToEAR(linkedToEAR);
- }
- }
- return virtCompURIMapName;
- }
-
-}
diff --git a/plugins/org.eclipse.jst.j2ee.ui/j2ee_ui/org/eclipse/jst/j2ee/internal/AvailableJ2EEComponentsForEARContentProvider.java b/plugins/org.eclipse.jst.j2ee.ui/j2ee_ui/org/eclipse/jst/j2ee/internal/AvailableJ2EEComponentsForEARContentProvider.java
deleted file mode 100644
index f1f648d..0000000
--- a/plugins/org.eclipse.jst.j2ee.ui/j2ee_ui/org/eclipse/jst/j2ee/internal/AvailableJ2EEComponentsForEARContentProvider.java
+++ /dev/null
@@ -1,305 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2005, 2009 IBM Corporation and others.
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
- *
- * Contributors:
- * IBM Corporation - initial API and implementation
- * Stefan Dimov, stefan.dimov@sap.com - bug 207826
- * Milen Manov, milen.manov@sap.com - bugs 248623
- *******************************************************************************/
-package org.eclipse.jst.j2ee.internal;
-
-import java.util.ArrayList;
-import java.util.HashMap;
-import java.util.List;
-import java.util.Map;
-
-import org.eclipse.core.resources.IContainer;
-import org.eclipse.core.resources.IFile;
-import org.eclipse.core.resources.IProject;
-import org.eclipse.core.resources.IWorkspaceRoot;
-import org.eclipse.core.runtime.CoreException;
-import org.eclipse.core.runtime.IPath;
-import org.eclipse.jem.util.logger.proxy.Logger;
-import org.eclipse.jface.viewers.ILabelDecorator;
-import org.eclipse.jface.viewers.ILabelProvider;
-import org.eclipse.jface.viewers.IStructuredContentProvider;
-import org.eclipse.jface.viewers.ITableLabelProvider;
-import org.eclipse.jface.viewers.LabelProvider;
-import org.eclipse.jface.viewers.Viewer;
-import org.eclipse.jst.j2ee.application.internal.operations.ClassPathSelection;
-import org.eclipse.jst.j2ee.classpathdep.ClasspathDependencyUtil;
-import org.eclipse.jst.j2ee.classpathdep.IClasspathDependencyConstants;
-import org.eclipse.jst.j2ee.componentcore.J2EEModuleVirtualComponent;
-import org.eclipse.jst.j2ee.internal.common.J2EEVersionUtil;
-import org.eclipse.jst.j2ee.internal.project.J2EEProjectUtilities;
-import org.eclipse.jst.j2ee.model.IEARModelProvider;
-import org.eclipse.jst.j2ee.model.IModelProvider;
-import org.eclipse.jst.j2ee.model.ModelProviderManager;
-import org.eclipse.jst.j2ee.project.JavaEEProjectUtilities;
-import org.eclipse.jst.javaee.application.Application;
-import org.eclipse.swt.graphics.Image;
-import org.eclipse.ui.PlatformUI;
-import org.eclipse.ui.model.WorkbenchLabelProvider;
-import org.eclipse.wst.common.componentcore.ComponentCore;
-import org.eclipse.wst.common.componentcore.ModuleCoreNature;
-import org.eclipse.wst.common.componentcore.resources.IVirtualComponent;
-import org.eclipse.wst.common.componentcore.resources.IVirtualReference;
-
-public class AvailableJ2EEComponentsForEARContentProvider extends LabelProvider
- implements IStructuredContentProvider, ITableLabelProvider {
-
- final static String PATH_SEPARATOR = String.valueOf(IPath.SEPARATOR);
-
- private int j2eeVersion;
- private IVirtualComponent earComponent;
- private boolean isEE5 = false;
- private String libDir = null;
-
- private ILabelDecorator decorator = PlatformUI.getWorkbench().getDecoratorManager().getLabelDecorator();
-
- private ILabelProvider workbenchLabelProvider = new WorkbenchLabelProvider();
-
- public AvailableJ2EEComponentsForEARContentProvider(IVirtualComponent aEarComponent, int j2eeVersion) {
- super();
- this.j2eeVersion = j2eeVersion;
- earComponent = aEarComponent;
- }
-
- public AvailableJ2EEComponentsForEARContentProvider(IVirtualComponent aEarComponent, int j2eeVersion, ILabelDecorator decorator) {
- this(aEarComponent, j2eeVersion);
- this.decorator = decorator;
- }
-
- /*
- * (non-Javadoc)
- *
- * @see org.eclipse.jface.viewers.IStructuredContentProvider#getElements(java.lang.Object)
- */
- public Object[] getElements(Object inputElement) {
- if (null != earComponent){
- isEE5 = J2EEProjectUtilities.isJEEProject(earComponent.getProject());
- }
- Object[] empty = new Object[0];
- if (!(inputElement instanceof IWorkspaceRoot))
- return empty;
- IProject[] projects = ((IWorkspaceRoot) inputElement).getProjects();
- if (projects == null || projects.length == 0)
- return empty;
- List validCompList = new ArrayList();
- Map pathToComp = new HashMap();
- for (int i = 0; i < projects.length; i++) {
- // get flexible project
- IProject project = projects[i];
- if(ModuleCoreNature.isFlexibleProject(project)){
- IVirtualComponent component = ComponentCore.createComponent(project);
- if (JavaEEProjectUtilities.isApplicationClientProject(project) ||
- JavaEEProjectUtilities.isEJBProject(project) ||
- JavaEEProjectUtilities.isDynamicWebProject(project) ||
- JavaEEProjectUtilities.isJCAProject(project) ||
- JavaEEProjectUtilities.isUtilityProject(project) ){
- int compJ2EEVersion = J2EEVersionUtil.convertVersionStringToInt(component);
- if( compJ2EEVersion <= j2eeVersion){
- validCompList.add(component);
- } else if(isEE5){
- validCompList.add(component);
- }
- }else if(null != earComponent && JavaEEProjectUtilities.isEARProject(project)){
- //find the ArchiveComponent
- if (component.equals( earComponent )) {
- if (isEE5) {
- String earDDVersion = JavaEEProjectUtilities.getJ2EEDDProjectVersion(project);
- //EE6TODO
- boolean isDDVersion5 = earDDVersion.equals(J2EEVersionConstants.VERSION_5_0_TEXT) ? true : false;
- if (isDDVersion5) {
- Application app = (Application)ModelProviderManager.getModelProvider(project).getModelObject();
- if (libDir == null)
- libDir = app.getLibraryDirectory();
- if (libDir == null)
- libDir = J2EEConstants.EAR_DEFAULT_LIB_DIR;
- }
- }
- IVirtualReference[] newrefs = component.getReferences();
- for( int k=0; k< newrefs.length; k++ ){
- IVirtualReference tmpref = newrefs[k];
- IVirtualComponent referencedcomp = tmpref.getReferencedComponent();
- boolean isBinary = referencedcomp.isBinary();
- if( isBinary ){
- if (shouldShow(referencedcomp))
- validCompList.add(referencedcomp);
- } else {
- addClasspathComponentDependencies(validCompList, pathToComp, referencedcomp);
- }
- }
- }
- }
- } else
- try {
- if (project.exists() && project.isAccessible() && project.hasNature("org.eclipse.jdt.core.javanature") ){ //$NON-NLS-1$
- if( !project.getName().startsWith(".") ) //$NON-NLS-1$
- validCompList.add(project);
- }
- } catch (CoreException e) {
- Logger.getLogger().log(e);
- }
- }
- return validCompList.toArray();
- }
-
- public void setCurrentLibDir(String libDir) {
- this.libDir = libDir;
- }
-
- private boolean shouldShow(IVirtualComponent component) {
- if (!component.isBinary())
- return true;
-
- IFile workspaceFile = (IFile)component.getAdapter(IFile.class);
- if( workspaceFile == null )
- return true;
- if( workspaceFile.getFullPath().segment(0).equals(earComponent.getName()))
- return true;
-
- IPath p = workspaceFile.getProjectRelativePath();
- if ((p == null) || (p.segmentCount() == 0))
- return true;
- IContainer f = earComponent.getRootFolder().getUnderlyingFolder();
- String rootFolderName = f.getProjectRelativePath().segment(0);
- if (!p.segment(0).equals(rootFolderName))
- return false;
- if (p.segmentCount() == 2)
- return true;
- if (isEE5) {
- String strippedLibDir = stripSeparators(libDir);
- String[] libDirSegs = strippedLibDir.split(PATH_SEPARATOR);
- if (p.segmentCount() - 2 != libDirSegs.length)
- return false;
- for (int i = 0; i < libDirSegs.length; i++)
- if (!libDirSegs[i].equals(p.segment(i + 1)))
- return false;
- return true;
- }
- return false;
- }
-
- private String stripSeparators(final String dir) {
- String returnDir = dir;
- if (returnDir.startsWith(PATH_SEPARATOR))
- returnDir = returnDir.substring(1);
- if (returnDir.endsWith(PATH_SEPARATOR))
- returnDir = returnDir.substring(0, returnDir.length() - 1);
- return returnDir;
- }
-
- public static void addClasspathComponentDependencies(final List componentList, final Map pathToComp, final IVirtualComponent referencedComponent) {
- if (referencedComponent instanceof J2EEModuleVirtualComponent) {
- J2EEModuleVirtualComponent j2eeComp = (J2EEModuleVirtualComponent) referencedComponent;
- IVirtualReference[] cpRefs = j2eeComp.getJavaClasspathReferences();
- for (int j=0; j < cpRefs.length; j++) {
- // only ../ mappings supported at this level
- if (!cpRefs[j].getRuntimePath().equals(IClasspathDependencyConstants.RUNTIME_MAPPING_INTO_CONTAINER_PATH)) {
- continue;
- }
- // if the absolute path for this component already has a mapping, skip (the comp might be contributed by more than
- // one child module)
- final IPath path = ClasspathDependencyUtil.getClasspathVirtualReferenceLocation(cpRefs[j]);
- final IVirtualComponent comp = (IVirtualComponent) pathToComp.get(path);
- if (comp != null) {
- // replace with a temp VirtualArchiveComponent whose IProject is set to a new pseudo name that is
- // the concatenation of all project contributions for that archive
- if (comp.isBinary()) {
- componentList.remove(comp);
- IVirtualComponent newComponent = ClassPathSelection.updateVirtualArchiveComponentDisplay(comp, cpRefs[j]);
- pathToComp.put(path, newComponent);
- componentList.add(newComponent);
- }
- continue;
- }
- pathToComp.put(path, cpRefs[j].getReferencedComponent());
- componentList.add(cpRefs[j].getReferencedComponent());
- }
- }
- }
-
- /*
- * (non-Javadoc)
- *
- * @see org.eclipse.jface.viewers.ITableLabelProvider#getColumnImage(java.lang.Object, int)
- */
- public Image getColumnImage(Object element, int columnIndex) {
- if (columnIndex < 2){
- if (element instanceof IVirtualComponent) {
- IVirtualComponent comp = (IVirtualComponent)element;
- return getDecoratedImage(comp);
- } else if (element instanceof IProject){
- return workbenchLabelProvider.getImage(element);
- }
- }
- return null;
- }
-
- private Image getDecoratedImage(IVirtualComponent comp) {
- return getDecoratedImage(comp.getProject());
- }
-
- private Image getDecoratedImage(IProject project) {
- Image image = workbenchLabelProvider.getImage(project);
- if (decorator != null) {
- Image decorated = decorator.decorateImage(image, project);
- if (decorated != null) {
- return decorated;
- }
- }
- return image;
- }
-
- /*
- * (non-Javadoc)
- *
- * @see org.eclipse.jface.viewers.ITableLabelProvider#getColumnText(java.lang.Object, int)
- */
- public String getColumnText(Object element, int columnIndex) {
- if (element instanceof IVirtualComponent) {
- IVirtualComponent comp = (IVirtualComponent)element;
- String name = ""; //$NON-NLS-1$
- if( columnIndex == 0 ){
- if (ClasspathDependencyUtil.isClasspathComponentDependency(comp)) {
- return ClasspathDependencyUtil.getClasspathComponentDependencyDisplayString(comp);
- }
- IModelProvider provider = ModelProviderManager.getModelProvider(earComponent.getProject());
- if (provider instanceof IEARModelProvider)
- {
- name = ((IEARModelProvider)provider).getModuleURI(comp);
- }
- if( name == null || name == "" ){ //$NON-NLS-1$
- name = comp.getName();
- }
- return name;
- } else if (columnIndex == 1) {
- return comp.getProject().getName();
- } else if (columnIndex == 2) {
- return ""; //$NON-NLS-1$
- }
- } else if (element instanceof IProject){
- if (columnIndex != 2) {
- return ((IProject)element).getName();
- }
- return ""; //$NON-NLS-1$
- }
- return null;
- }
-
- /* (non-Javadoc)
- * @see org.eclipse.jface.viewers.IContentProvider#dispose()
- */
- @Override
- public void dispose() {
- }
-
- public void inputChanged(Viewer viewer, Object oldInput, Object newInput) {
-
- }
-}
diff --git a/plugins/org.eclipse.jst.j2ee.ui/j2ee_ui/org/eclipse/jst/j2ee/internal/ClassHelperAdapterFactory.java b/plugins/org.eclipse.jst.j2ee.ui/j2ee_ui/org/eclipse/jst/j2ee/internal/ClassHelperAdapterFactory.java
deleted file mode 100644
index 163ae74..0000000
--- a/plugins/org.eclipse.jst.j2ee.ui/j2ee_ui/org/eclipse/jst/j2ee/internal/ClassHelperAdapterFactory.java
+++ /dev/null
@@ -1,48 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2003, 2006 IBM Corporation and others.
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
- *
- * Contributors:
- * IBM Corporation - initial API and implementation
- *******************************************************************************/
-package org.eclipse.jst.j2ee.internal;
-
-import org.eclipse.core.resources.IFile;
-import org.eclipse.core.resources.IResource;
-import org.eclipse.core.runtime.IAdapterFactory;
-import org.eclipse.jst.j2ee.internal.ejb.provider.J2EEJavaClassProviderHelper;
-import org.eclipse.jst.j2ee.internal.plugin.J2EEUIPlugin;
-
-public class ClassHelperAdapterFactory implements IAdapterFactory {
-
- private static final Class IFILE_CLASS = IFile.class;
- private static final Class IRESOURCE_CLASS = IResource.class;
-
- private static final Class[] ADAPTER_TYPES = new Class[] {
- IFILE_CLASS, IRESOURCE_CLASS
- };
-
- public Object getAdapter(Object adaptableObject, Class adapterType) {
- if(IRESOURCE_CLASS == adapterType || IFILE_CLASS == adapterType) {
- if(adaptableObject instanceof J2EEJavaClassProviderHelper) {
- J2EEJavaClassProviderHelper provider = (J2EEJavaClassProviderHelper) adaptableObject;
- try {
- IResource resource = (IResource) provider.getAdapter(IRESOURCE_CLASS);
- return resource;
- } catch (RuntimeException e) {
- J2EEUIPlugin.logError(0, e.getMessage(), e);
- return null;
- }
- }
- }
- return null;
- }
-
- public Class[] getAdapterList() {
- return ADAPTER_TYPES;
- }
-
-}
diff --git a/plugins/org.eclipse.jst.j2ee.ui/j2ee_ui/org/eclipse/jst/j2ee/internal/ClasspathTableManager.java b/plugins/org.eclipse.jst.j2ee.ui/j2ee_ui/org/eclipse/jst/j2ee/internal/ClasspathTableManager.java
deleted file mode 100644
index a18b0d3..0000000
--- a/plugins/org.eclipse.jst.j2ee.ui/j2ee_ui/org/eclipse/jst/j2ee/internal/ClasspathTableManager.java
+++ /dev/null
@@ -1,643 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2005, 2007 IBM Corporation and others.
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
- *
- * Contributors:
- * IBM Corporation - initial API and implementation
- * Stefan Dimov, stefan.dimov@sap.com - bug 207826
- *******************************************************************************/
-/*
- * Created on Jan 17, 2005
- */
-package org.eclipse.jst.j2ee.internal;
-
-import java.util.Arrays;
-import java.util.HashSet;
-import java.util.Iterator;
-import java.util.LinkedList;
-import java.util.List;
-import java.util.Set;
-
-import org.eclipse.core.resources.IProject;
-import org.eclipse.jface.viewers.CheckStateChangedEvent;
-import org.eclipse.jface.viewers.CheckboxTableViewer;
-import org.eclipse.jface.viewers.ICheckStateListener;
-import org.eclipse.jface.viewers.ISelectionChangedListener;
-import org.eclipse.jface.viewers.IStructuredSelection;
-import org.eclipse.jface.viewers.SelectionChangedEvent;
-import org.eclipse.jst.j2ee.application.internal.operations.ClassPathSelection;
-import org.eclipse.jst.j2ee.application.internal.operations.ClasspathElement;
-import org.eclipse.jst.j2ee.componentcore.J2EEModuleVirtualArchiveComponent;
-import org.eclipse.jst.j2ee.internal.common.ClasspathModel;
-import org.eclipse.jst.j2ee.internal.common.ClasspathModelEvent;
-import org.eclipse.jst.j2ee.internal.dialogs.DependencyConflictResolveDialog;
-import org.eclipse.jst.j2ee.internal.listeners.IValidateEditListener;
-import org.eclipse.jst.j2ee.internal.plugin.J2EEUIMessages;
-import org.eclipse.jst.j2ee.internal.project.J2EEProjectUtilities;
-import org.eclipse.jst.j2ee.internal.wizard.AvailableJarsProvider;
-import org.eclipse.jst.j2ee.project.EarUtilities;
-import org.eclipse.jst.j2ee.project.JavaEEProjectUtilities;
-import org.eclipse.jst.j2ee.project.facet.IJ2EEFacetConstants;
-import org.eclipse.swt.SWT;
-import org.eclipse.swt.layout.GridData;
-import org.eclipse.swt.layout.GridLayout;
-import org.eclipse.swt.widgets.Button;
-import org.eclipse.swt.widgets.Composite;
-import org.eclipse.swt.widgets.Event;
-import org.eclipse.swt.widgets.Group;
-import org.eclipse.swt.widgets.Listener;
-import org.eclipse.ui.PlatformUI;
-import org.eclipse.wst.common.componentcore.ComponentCore;
-import org.eclipse.wst.common.componentcore.resources.IVirtualComponent;
-import org.eclipse.wst.common.componentcore.resources.IVirtualReference;
-
-/**
- * @author jialin
- */
-public class ClasspathTableManager implements Listener, ICommonManifestUIConstants {
-
- protected Button useClientJARsBtn;
- protected Button useServerJARsBtn;
- protected Button useAnyJARsBtn;
- protected Button upButton;
- protected Button downButton;
- protected Button selectAllButton;
- protected Button deselectAllButton;
- protected IClasspathTableOwner owner;
- protected Composite buttonColumn;
- protected ClasspathModel model;
- protected CheckboxTableViewer availableJARsViewer;
- protected IValidateEditListener validateEditListener;
- /**
- * @deprecated this field should be removed
- */
- protected boolean isWLPEntry;
- protected Group radioGroup;
-
- protected boolean readOnly;
- protected AvailableJarsProvider availableJarsProvider;
- protected Button externalJarButton;
- protected Button projectJarButton;
- protected Button addVariableButton;
-
- protected Set compsToUncheck = new HashSet();
-
- /**
- * Constructor for ButtonBarManager.
- */
- public ClasspathTableManager(IClasspathTableOwner owner, ClasspathModel model) {
- this(owner, model, null);
- }
-
- public ClasspathTableManager(IClasspathTableOwner owner, ClasspathModel model, IValidateEditListener listener) {
- super();
- this.owner = owner;
- this.model = model;
- this.validateEditListener = listener;
- }
- public void fillComposite(Composite parent) {
- GridLayout layout = new GridLayout();
- layout.numColumns = 2;
- layout.marginHeight = 0;
- parent.setLayout(layout);
- parent.setLayoutData(new GridData(GridData.FILL_BOTH));
- createRadioGroup(parent);
- createTable(parent);
- createButtonColumn(parent);
- }
-
- public void fillWLPComposite(Composite parent) {
- GridLayout layout = new GridLayout();
- layout.numColumns = 2;
- layout.marginHeight = 0;
- parent.setLayout(layout);
- parent.setLayoutData(new GridData(GridData.FILL_BOTH));
- createTable(parent);
- createWLPButtonColumn(parent);
- }
-
- public void fillWebRefComposite(Composite parent) {
- GridLayout layout = new GridLayout();
- layout.numColumns = 2;
- layout.marginHeight = 0;
- parent.setLayout(layout);
- parent.setLayoutData(new GridData(GridData.FILL_BOTH));
- createTable(parent);
- createWebRefButtonColumn(parent);
- }
-
- private void initializeEJBClientDefaults() {
- if (model == null || model.getClassPathSelection() == null)
- return;
- boolean shouldUseServerJARs = false;
- ClassPathSelection selection = model.getClassPathSelection();
- int filterLevel;
- boolean ejbSelected = selection.isAnyEJBJarSelected();
- boolean clientSelected = selection.isAnyEJBClientJARSelected();
- if (ejbSelected && clientSelected)
- filterLevel = ClassPathSelection.FILTER_NONE;
- else if (shouldUseServerJARs) {
- if (clientSelected)
- filterLevel = ClassPathSelection.FILTER_NONE;
- else
- filterLevel = ClassPathSelection.FILTER_EJB_CLIENT_JARS;
- } else {
- if (ejbSelected)
- filterLevel = ClassPathSelection.FILTER_NONE;
- else
- filterLevel = ClassPathSelection.FILTER_EJB_SERVER_JARS;
- }
- initFilterLevel(filterLevel);
- }
-
- private void initFilterLevel(int filterLevel) {
- model.getClassPathSelection().setFilterLevel(filterLevel);
- switch (filterLevel) {
- case (ClassPathSelection.FILTER_NONE) :
- useAnyJARsBtn.setSelection(true);
- useClientJARsBtn.setSelection(false);
- useServerJARsBtn.setSelection(false);
- break;
- case (ClassPathSelection.FILTER_EJB_CLIENT_JARS) :
- useAnyJARsBtn.setSelection(false);
- useClientJARsBtn.setSelection(false);
- useServerJARsBtn.setSelection(true);
- break;
- case (ClassPathSelection.FILTER_EJB_SERVER_JARS) :
- useAnyJARsBtn.setSelection(false);
- useClientJARsBtn.setSelection(true);
- useServerJARsBtn.setSelection(false);
- break;
- }
- }
-
- private void createRadioGroup(Composite parent) {
- radioGroup = owner.createGroup(parent);
- radioGroup.setText(EJB_CLIENT_RADIO_UI_);
- GridData data = new GridData(GridData.HORIZONTAL_ALIGN_FILL | GridData.VERTICAL_ALIGN_FILL);
- data.horizontalSpan = 2;
- data.horizontalIndent = 0;
- GridLayout layout = new GridLayout(3, false);
- radioGroup.setLayout(layout);
- radioGroup.setLayoutData(data);
-
- useServerJARsBtn = createRadioButton(USE_EJB_SERVER_JARs_UI_, radioGroup);
- useClientJARsBtn = createRadioButton(USE_EJB_CLIENT_JARs_UI_, radioGroup);
- useAnyJARsBtn = createRadioButton(USE_BOTH_UI_, radioGroup);
- initializeEJBClientDefaults();
- }
-
- protected void createButtonColumn(Composite parent) {
- buttonColumn = owner.createButtonColumnComposite(parent);
- GridData data = new GridData(GridData.HORIZONTAL_ALIGN_END);
- buttonColumn.setLayoutData(data);
- createPushButtons();
- }
-
- protected void createWLPButtonColumn(Composite parent) {
- buttonColumn = owner.createButtonColumnComposite(parent);
- GridData data = new GridData(GridData.HORIZONTAL_ALIGN_END);
- buttonColumn.setLayoutData(data);
- createWLPPushButtons();
- }
-
- protected void createWebRefButtonColumn(Composite parent) {
- buttonColumn = owner.createButtonColumnComposite(parent);
- GridData data = new GridData(GridData.HORIZONTAL_ALIGN_END);
- buttonColumn.setLayoutData(data);
- createWebRefPushButtons();
- }
-
- protected void createTable(Composite parent) {
- availableJARsViewer = owner.createAvailableJARsViewer(parent);
- GridData gd = new GridData(GridData.HORIZONTAL_ALIGN_FILL | GridData.FILL_VERTICAL);
- availableJARsViewer.getTable().setLayoutData(gd);
- availableJarsProvider = new AvailableJarsProvider();
- availableJARsViewer.setContentProvider(availableJarsProvider);
- availableJARsViewer.setLabelProvider(availableJarsProvider);
- addTableListeners();
- }
-
- protected void createWLPPushButtons() {
- selectAllButton = createPushButton(SELECT_ALL_BUTTON);
- deselectAllButton = createPushButton(DE_SELECT_ALL_BUTTON);
- projectJarButton = createPushButton(J2EEUIMessages.getResourceString("PROJECT_JAR")); //$NON-NLS-1$
- externalJarButton = createPushButton(J2EEUIMessages.getResourceString("EXTERNAL_JAR")); //$NON-NLS-1$
- addVariableButton = createPushButton(J2EEUIMessages.getResourceString("ADDVARIABLE"));//$NON-NLS-1$
- if (isReadOnly()) {
- selectAllButton.setEnabled(false);
- deselectAllButton.setEnabled(false);
- projectJarButton.setEnabled(false);
- externalJarButton.setEnabled(false);
- addVariableButton.setEnabled(false);
- }
- }
-
- protected void createWebRefPushButtons() {
- selectAllButton = createPushButton(SELECT_ALL_BUTTON);
- deselectAllButton = createPushButton(DE_SELECT_ALL_BUTTON);
- if (isReadOnly()) {
- selectAllButton.setEnabled(false);
- deselectAllButton.setEnabled(false);
- }
- }
-
- protected void createPushButtons() {
- upButton = createPushButton(UP_BUTTON);
- downButton = createPushButton(DOWN_BUTTON);
- selectAllButton = createPushButton(SELECT_ALL_BUTTON);
- deselectAllButton = createPushButton(DE_SELECT_ALL_BUTTON);
- if (isReadOnly()) {
- upButton.setEnabled(false);
- downButton.setEnabled(false);
- selectAllButton.setEnabled(false);
- deselectAllButton.setEnabled(false);
- }
- }
-
- protected void createWebLibPushButtons() {
- selectAllButton = createPushButton(SELECT_ALL_BUTTON);
- deselectAllButton = createPushButton(DE_SELECT_ALL_BUTTON);
- projectJarButton = createPushButton(J2EEUIMessages.getResourceString("PROJECT_JAR")); //$NON-NLS-1$
- externalJarButton = createPushButton(J2EEUIMessages.getResourceString("EXTERNAL_JAR")); //$NON-NLS-1$
- addVariableButton = createPushButton(J2EEUIMessages.getResourceString("ADDVARIABLE"));//$NON-NLS-1$
- if (isReadOnly()) {
- selectAllButton.setEnabled(false);
- deselectAllButton.setEnabled(false);
- }
- }
-
- protected Button createPushButton(String label) {
- Button aButton = owner.primCreatePushButton(label, buttonColumn);
- aButton.addListener(SWT.Selection, this);
- aButton.setLayoutData(new GridData(GridData.FILL_HORIZONTAL));
- return aButton;
- }
-
- protected Button createRadioButton(String label, Composite parent) {
- Button aButton = owner.primCreateRadioButton(label, parent);
- aButton.addListener(SWT.Selection, this);
- return aButton;
- }
- /**
- * @see Listener#handleEvent(Event)
- */
- public void handleEvent(Event event) {
-
- ClasspathModelEvent evt = new ClasspathModelEvent(ClasspathModelEvent.CLASS_PATH_CHANGED);
- model.fireNotification(evt);
- if (event.widget == upButton)
- upButtonSelected();
- else if (event.widget == downButton)
- downButtonSelected();
- else if (event.widget == selectAllButton)
- selectAllButtonSelected();
- else if (event.widget == deselectAllButton)
- deselectAllButtonSelected();
- else if (event.widget == useServerJARsBtn)
- handleServerJARsButtonSelected();
- else if (event.widget == useClientJARsBtn)
- handleClientJARsButtonSelected();
- else if (event.widget == useAnyJARsBtn)
- handleAnyJARsButtonSelected();
- else if(event.widget == projectJarButton)
- handleSelectProjectJarButton();
- else if(event.widget == externalJarButton)
- handleSelectExternalJarButton();
- else if(event.widget == addVariableButton)
- handleSelectVariableButton();
- }
-
- private void handleSelectExternalJarButton(){
- //owner.handleSelectExternalJarButton();
- if( owner instanceof WebLibDependencyPropertiesPage){
- WebLibDependencyPropertiesPage control = (WebLibDependencyPropertiesPage)owner;
- control.handleSelectExternalJarButton();
- }
- }
- private void handleSelectProjectJarButton(){
- //owner.handleSelectExternalJarButton();
- if( owner instanceof WebLibDependencyPropertiesPage){
- WebLibDependencyPropertiesPage control = (WebLibDependencyPropertiesPage)owner;
- control.handleSelectProjectJarButton();
- }
- }
-
- private void handleSelectVariableButton(){
- //owner.handleSelectVariableButton();
- if( owner instanceof WebLibDependencyPropertiesPage){
- WebLibDependencyPropertiesPage control = (WebLibDependencyPropertiesPage)owner;
- control.handleSelectVariableButton();
- }
- }
-
- private void handleServerJARsButtonSelected() {
- model.selectFilterLevel(ClassPathSelection.FILTER_EJB_CLIENT_JARS);
- refresh();
- }
-
- private void handleClientJARsButtonSelected() {
- model.selectFilterLevel(ClassPathSelection.FILTER_EJB_SERVER_JARS);
- refresh();
- }
-
- private void handleAnyJARsButtonSelected() {
- model.selectFilterLevel(ClassPathSelection.FILTER_NONE);
- refresh();
- }
-
- public boolean validatateEdit() {
- return validateEditListener.validateState().isOK();
- }
-
- protected void deselectAllButtonSelected() {
- if (!validatateEdit())
- return;
- availableJARsViewer.setAllChecked(false);
- model.setAllClasspathElementsSelected(false);
- compsToUncheck.clear();
- }
-
- protected void selectAllButtonSelected() {
- if (!validatateEdit())
- return;
- availableJARsViewer.setAllChecked(true);
- Object[] elements = availableJARsViewer.getCheckedElements();
- model.setAllClasspathElementsSelected(Arrays.asList(elements), true);
- for (int i = 0; i < elements.length; i++) {
- ClasspathElement el = (ClasspathElement)elements[i];
- el.getComponent().getAdapter(IVirtualComponent.class);
- IVirtualComponent ar = el.getTargetComponent();
- IVirtualComponent comp = (ar instanceof J2EEModuleVirtualArchiveComponent) ? ar : el.getComponent();
- if (isLibrary(comp))
- compsToUncheck.add(comp);
- }
- }
-
- protected java.util.List getSelectionAsList() {
- return ((IStructuredSelection) availableJARsViewer.getSelection()).toList();
- }
-
- protected java.util.List getCheckedLibsAsList() {
- List res = new LinkedList();
- Iterator it = compsToUncheck.iterator();
- while (it.hasNext()) {
- IVirtualComponent comp = (IVirtualComponent)it.next();
- res.add(comp);
- }
- return res;
- }
-
- protected void downButtonSelected() {
- if (!validatateEdit())
- return;
- model.moveDown(getSelectionAsList());
- refresh();
- }
-
- protected void upButtonSelected() {
- if (!validatateEdit())
- return;
- model.moveUp(getSelectionAsList());
- refresh();
- }
-
- /*
- * Updates the enable state of the all buttons
- */
- protected void updateButtonEnablements() {
- int[] indices = availableJARsViewer.getTable().getSelectionIndices();
- if (upButton != null && downButton != null) {
- upButton.setEnabled(canMoveUp(indices));
- downButton.setEnabled(canMoveDown(indices, availableJARsViewer.getTable().getItemCount()));
- }
- }
-
- protected boolean canMoveUp(int[] indices) {
- return canMove(indices, 0);
- }
-
- protected boolean canMoveDown(int[] indices, int itemCount) {
- return canMove(indices, itemCount - 1);
- }
-
- protected boolean canMove(int[] indices, int referenceIndex) {
- int length = indices.length;
- if (length == 0)
- return false;
- for (int i = 0; i < length; i++) {
- if (indices[i] == referenceIndex)
- return false;
- }
- return true;
- }
-
- protected void addTableListeners() {
- addCheckStateListener();
- addSelectionListener();
- }
-
- protected void addCheckStateListener() {
- availableJARsViewer.addCheckStateListener(new ICheckStateListener() {
- public void checkStateChanged(CheckStateChangedEvent event) {
- availableJARCheckStateChanged(event);
- }
- });
- }
-
- private boolean isLibrary(IVirtualComponent component) {
- if (JavaEEProjectUtilities.isApplicationClientComponent(component)) return false;
- if (JavaEEProjectUtilities.isEARProject(component.getProject()) && component.isBinary()) return true;
- if (JavaEEProjectUtilities.isEJBComponent(component)) return false;
- if (JavaEEProjectUtilities.isDynamicWebComponent(component)) return false;
- if (JavaEEProjectUtilities.isJCAComponent(component)) return false;
- if (JavaEEProjectUtilities.isStaticWebProject(component.getProject())) return false;
- if (JavaEEProjectUtilities.isProjectOfType(component.getProject(), IJ2EEFacetConstants.JAVA)) return true;
- return true;
- }
-
- protected void availableJARCheckStateChanged(CheckStateChangedEvent event) {
- ClasspathElement el = (ClasspathElement)event.getElement();
- //226823 targeting a regular java project from web libs
- if(el.getComponent() == null){
- ClasspathElement element = (ClasspathElement) event.getElement();
- model.setSelection(element, event.getChecked());
- return;
- }
- el.getComponent().getAdapter(IVirtualComponent.class);
- IVirtualComponent ar = el.getTargetComponent();
- IVirtualComponent comp = (ar instanceof J2EEModuleVirtualArchiveComponent) ? ar : el.getComponent();
- CheckboxTableViewer v = (CheckboxTableViewer)event.getSource();
- if (isLibrary(comp) && event.getChecked()) {
- if (isConflict(comp)) {
- DependencyConflictResolveDialog dlg = new DependencyConflictResolveDialog(PlatformUI.
- getWorkbench().
- getActiveWorkbenchWindow().
- getShell(),
- DependencyConflictResolveDialog.DLG_TYPE_1);
- if (dlg.open() == DependencyConflictResolveDialog.BTN_ID_CANCEL) {
- v.setChecked(el, false);
- return;
- }
-
- }
- compsToUncheck.add(comp);
- } else if (!event.getChecked()) {
- compsToUncheck.remove(comp);
- }
- if (!EarUtilities.isStandaloneProject(model.getComponent().getProject()) && (isReadOnly() || !validatateEdit() || (isMyClientJAR(event) && !event.getChecked()))) {
- availableJARsViewer.setChecked(event.getElement(), !event.getChecked());
- return;
- }
- ClasspathElement element = (ClasspathElement) event.getElement();
- model.setSelection(element, event.getChecked());
- }
-
-
- private boolean isConflict(IVirtualComponent lib) {
- IProject[] ears = EarUtilities.getReferencingEARProjects(lib.getProject());
- for (int i = 0; i < ears.length; i++) {
- if (J2EEProjectUtilities.isJEEProject(ears[i])) {
- IVirtualComponent cmp = ComponentCore.createComponent(ears[i]);
- IVirtualReference[] refs = cmp.getReferences();
- for (int j = 0; j < refs.length; j++) {
- if (model.getProject().equals(refs[j].getReferencedComponent().getProject())) {
- IVirtualReference ref = cmp.getReference(lib.getName());
- if (ref != null && !ref.getRuntimePath().isRoot()) return true;
- }
- }
- }
- }
- return false;
- }
-
-
-
- /**
- * @param event
- * @return
- */
- private boolean isMyClientJAR(CheckStateChangedEvent event) {
- ClasspathElement element = (ClasspathElement) event.getElement();
- if(getClasspathSelection() != null)
- return getClasspathSelection().isMyClientJAR(element);
- return false;
- }
-
- protected void addSelectionListener() {
- availableJARsViewer.addSelectionChangedListener(new ISelectionChangedListener() {
- public void selectionChanged(SelectionChangedEvent event) {
- tableSelectionChanged();
- }
- });
- }
-
- protected void tableSelectionChanged() {
- if (!isReadOnly())
- updateButtonEnablements();
- }
-
- protected ClassPathSelection getClasspathSelection() {
- if (model == null || model.getSelectedEARComponent() == null && !(EarUtilities.isStandaloneProject(model.getComponent().getProject())))
- return null;
- return model.getClassPathSelection();
- }
-
- public void refreshCheckedItems() {
- if (getClasspathSelection() == null)
- return;
- java.util.List elements = getClasspathSelection().getClasspathElements();
- for (int i = 0; i < elements.size(); i++) {
- ClasspathElement element = (ClasspathElement) elements.get(i);
- availableJARsViewer.setChecked(element, element.isSelected());
- if (element.isClasspathDependency()) {
- availableJARsViewer.setGrayed(element, true);
- }
- }
- }
-
- public void refresh() {
- final IProject project = model.getComponent().getProject();
- // if not a web project and it is either referenced by an EAR or a dynamic web project.
- if (!isWLPEntry() && (!EarUtilities.isStandaloneProject(project) ||
- (J2EEProjectUtilities.getReferencingWebProjects(project).length > 0))) {
- availableJARsViewer.setInput(getClasspathSelection());
- GridData data = new GridData(GridData.FILL_BOTH);
- int numlines = Math.min(10, availableJARsViewer.getTable().getItemCount());
- data.heightHint = availableJARsViewer.getTable().getItemHeight() * numlines;
- availableJARsViewer.getTable().setLayoutData(data);
- refreshCheckedItems();
- updateButtonEnablements();
- } else {
- availableJARsViewer.setInput(model.getClassPathSelectionForWLPs());
- GridData data = new GridData(GridData.FILL_BOTH);
- int numlines = Math.min(10, availableJARsViewer.getTable().getItemCount());
- data.heightHint = availableJARsViewer.getTable().getItemHeight() * numlines;
- availableJARsViewer.getTable().setLayoutData(data);
- refreshWLPCheckedItems();
- }
- }
-
- private void refreshWLPCheckedItems() {
- if (availableJARsViewer.getInput() != null) {
- java.util.List elements = ((ClassPathSelection) availableJARsViewer.getInput()).getClasspathElements();
- for (int i = 0; i < elements.size(); i++) {
- ClasspathElement element = (ClasspathElement) elements.get(i);
- availableJARsViewer.setChecked(element, element.isSelected());
- if (element.isClasspathDependency()) {
- availableJARsViewer.setGrayed(element, true);
- }
- }
- }
- }
-
- /**
- * Gets the model.
- * @return Returns a ClasspathModel
- */
- public ClasspathModel getModel() {
- return model;
- }
-
- /**
- * Sets the model.
- * @param model The model to set
- */
- public void setModel(ClasspathModel model) {
- this.model = model;
- initializeEJBClientDefaults();
- }
-
- /**
- * Returns the readOnly.
- * @return boolean
- */
- public boolean isReadOnly() {
- return readOnly;
- }
-
-
- /**
- * Sets the readOnly.
- * @param readOnly The readOnly to set
- */
- public void setReadOnly(boolean readOnly) {
- this.readOnly = readOnly;
- }
-
- public boolean isWLPEntry() {
- return model.isWLPModel();
- }
-
- /**
- * @deprecated do not use this method
- * @param isWLPEntry
- */
- public void setWLPEntry(boolean isWLPEntry) {
- this.isWLPEntry = isWLPEntry;
- }
-
-}
diff --git a/plugins/org.eclipse.jst.j2ee.ui/j2ee_ui/org/eclipse/jst/j2ee/internal/IClasspathTableOwner.java b/plugins/org.eclipse.jst.j2ee.ui/j2ee_ui/org/eclipse/jst/j2ee/internal/IClasspathTableOwner.java
deleted file mode 100644
index c2af1d1..0000000
--- a/plugins/org.eclipse.jst.j2ee.ui/j2ee_ui/org/eclipse/jst/j2ee/internal/IClasspathTableOwner.java
+++ /dev/null
@@ -1,31 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2005 IBM Corporation and others.
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
- *
- * Contributors:
- * IBM Corporation - initial API and implementation
- *******************************************************************************/
-/*
- * Created on Jan 17, 2005
- */
-package org.eclipse.jst.j2ee.internal;
-
-import org.eclipse.jface.viewers.CheckboxTableViewer;
-import org.eclipse.swt.widgets.Button;
-import org.eclipse.swt.widgets.Composite;
-import org.eclipse.swt.widgets.Group;
-
-/**
- * @author jialin
- */
-public interface IClasspathTableOwner {
- Button primCreatePushButton(String label, Composite buttonColumn);
- Button primCreateRadioButton(String label, Composite parent);
- CheckboxTableViewer createAvailableJARsViewer(Composite parent);
- Composite createButtonColumnComposite(Composite parent);
- //Button createHideEJBClientJARsButton(Composite parent); This method is never used hence commeting it out - vkb
- Group createGroup(Composite parent);
-}
diff --git a/plugins/org.eclipse.jst.j2ee.ui/j2ee_ui/org/eclipse/jst/j2ee/internal/ICommonManifestUIConstants.java b/plugins/org.eclipse.jst.j2ee.ui/j2ee_ui/org/eclipse/jst/j2ee/internal/ICommonManifestUIConstants.java
deleted file mode 100644
index a61619b..0000000
--- a/plugins/org.eclipse.jst.j2ee.ui/j2ee_ui/org/eclipse/jst/j2ee/internal/ICommonManifestUIConstants.java
+++ /dev/null
@@ -1,40 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2005 IBM Corporation and others.
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
- *
- * Contributors:
- * IBM Corporation - initial API and implementation
- *******************************************************************************/
-/*
- * Created on Jan 17, 2005
- */
-package org.eclipse.jst.j2ee.internal;
-
-import org.eclipse.jst.j2ee.internal.common.CommonEditResourceHandler;
-
-/**
- * @author jialin
- */
-public interface ICommonManifestUIConstants {
- String UP_BUTTON = ManifestUIResourceHandler.Up_1;
- String DOWN_BUTTON = ManifestUIResourceHandler.Down_2;
- String SELECT_ALL_BUTTON = ManifestUIResourceHandler.Select_All_3;
- String DE_SELECT_ALL_BUTTON = ManifestUIResourceHandler.Deselect_All_4;
- String ERROR_READING_MANIFEST_DIALOG_TITLE = ManifestUIResourceHandler.ERROR_READING_MANIFEST_DIALOG_TITLE;
- String SAVE_MANIFEST_WITH_ERROR =ManifestUIResourceHandler.SAVE_MANIFEST_WITH_ERROR;
- String ERROR_READING_MANIFEST_DIALOG_MESSAGE_EDITOR = ManifestUIResourceHandler.ERROR_READING_MANIFEST_DIALOG_MESSAGE_EDITOR;
- String ERROR_READING_MANIFEST_DIALOG_MESSAGE_PROP_PAGE = ManifestUIResourceHandler.ERROR_READING_MANIFEST_DIALOG_MESSAGE_PROP_PAGE;
- String MANIFEST_PROBLEM_1 = ManifestUIResourceHandler.MANIFEST_PROBLEM_1;
- String MANIFEST_PROBLEM_2 = ManifestUIResourceHandler.MANIFEST_PROBLEM_2;
- String MANIFEST_PROBLEM_3 = ManifestUIResourceHandler.MANIFEST_PROBLEM_3;
- String MANIFEST_PROBLEM_4 = ManifestUIResourceHandler.MANIFEST_PROBLEM_4;
- String REDIRECT_TEXT_EDITOR_UI_ = ManifestUIResourceHandler.REDIRECT_TEXT_EDITOR_UI_;
-
- String EJB_CLIENT_RADIO_UI_ = CommonEditResourceHandler.getString("EJB_CLIENT_RADIO_UI_"); //$NON-NLS-1$
- String USE_EJB_SERVER_JARs_UI_ = CommonEditResourceHandler.getString("USE_EJB_SERVER_JARs_UI_"); //$NON-NLS-1$
- String USE_EJB_CLIENT_JARs_UI_ = CommonEditResourceHandler.getString("USE_EJB_CLIENT_JARs_UI_"); //$NON-NLS-1$
- String USE_BOTH_UI_ = CommonEditResourceHandler.getString("USE_BOTH_UI_"); //$NON-NLS-1$
-}
diff --git a/plugins/org.eclipse.jst.j2ee.ui/j2ee_ui/org/eclipse/jst/j2ee/internal/IJ2EEDependenciesControl.java b/plugins/org.eclipse.jst.j2ee.ui/j2ee_ui/org/eclipse/jst/j2ee/internal/IJ2EEDependenciesControl.java
deleted file mode 100644
index f88e6ce..0000000
--- a/plugins/org.eclipse.jst.j2ee.ui/j2ee_ui/org/eclipse/jst/j2ee/internal/IJ2EEDependenciesControl.java
+++ /dev/null
@@ -1,59 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2005 BEA Systems, Inc.
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
- *
- * Contributors:
- * rfrost@bea.com - initial API and implementation
- *******************************************************************************/
-
-package org.eclipse.jst.j2ee.internal;
-
-import org.eclipse.swt.widgets.Composite;
-
-/**
- * Interface for classes that implement a portion the "J2EE Module Dependencies"
- * property page logic.
- * @deprecated wtp 3.2
- */
-public interface IJ2EEDependenciesControl extends ICommonManifestUIConstants {
-
- /**
- * Creates the Composite associated with this control.
- * @param parent Parent Composite.
- * @return Composite for the control.
- */
- Composite createContents(Composite parent);
-
- /**
- * Called when the property page's <code>performOk()</code> method is called.
- * @return
- */
- boolean performOk();
-
- /**
- * Called when the property page's <code>performDefaults()</code> method is called.
- * @return
- */
- void performDefaults();
-
- /**
- * Called when the property page's <code>performCancel()</code> method is called.
- * @return
- */
- boolean performCancel();
-
- /**
- * Called when the property page's <code>setVisible()</code> method is called.
- * @return
- */
- void setVisible(boolean visible);
-
- /**
- * Called when the property page's <code>dispose()</code> method is called.
- * @return
- */
- void dispose();
-}
diff --git a/plugins/org.eclipse.jst.j2ee.ui/j2ee_ui/org/eclipse/jst/j2ee/internal/J2EEComponentProjectMigrator.java b/plugins/org.eclipse.jst.j2ee.ui/j2ee_ui/org/eclipse/jst/j2ee/internal/J2EEComponentProjectMigrator.java
deleted file mode 100644
index 0b72e01..0000000
--- a/plugins/org.eclipse.jst.j2ee.ui/j2ee_ui/org/eclipse/jst/j2ee/internal/J2EEComponentProjectMigrator.java
+++ /dev/null
@@ -1,634 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2005, 2007 IBM Corporation and others.
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
- *
- * Contributors:
- * IBM Corporation - initial API and implementation
- *******************************************************************************/
-package org.eclipse.jst.j2ee.internal;
-
-import java.util.ArrayList;
-import java.util.Iterator;
-import java.util.List;
-
-import org.eclipse.core.commands.ExecutionException;
-import org.eclipse.core.resources.IFolder;
-import org.eclipse.core.resources.IProject;
-import org.eclipse.core.resources.IProjectDescription;
-import org.eclipse.core.resources.IResource;
-import org.eclipse.core.resources.IWorkspace;
-import org.eclipse.core.resources.ProjectScope;
-import org.eclipse.core.resources.ResourcesPlugin;
-import org.eclipse.core.runtime.CoreException;
-import org.eclipse.core.runtime.IPath;
-import org.eclipse.core.runtime.IStatus;
-import org.eclipse.core.runtime.preferences.IEclipsePreferences;
-import org.eclipse.core.runtime.preferences.IScopeContext;
-import org.eclipse.emf.ecore.resource.Resource;
-import org.eclipse.jdt.core.IClasspathEntry;
-import org.eclipse.jdt.core.IJavaProject;
-import org.eclipse.jdt.core.JavaCore;
-import org.eclipse.jdt.core.JavaModelException;
-import org.eclipse.jem.util.emf.workbench.WorkbenchResourceHelperBase;
-import org.eclipse.jem.workbench.utility.JemProjectUtilities;
-import org.eclipse.jst.common.frameworks.CommonFrameworksPlugin;
-import org.eclipse.jst.common.project.facet.IJavaFacetInstallDataModelProperties;
-import org.eclipse.jst.common.project.facet.JavaFacetInstallDataModelProvider;
-import org.eclipse.jst.common.project.facet.WtpUtils;
-import org.eclipse.jst.j2ee.internal.common.classpath.J2EEComponentClasspathContainerUtils;
-import org.eclipse.jst.j2ee.internal.common.classpath.J2EEComponentClasspathUpdater;
-import org.eclipse.jst.j2ee.internal.earcreation.EarFacetInstallDataModelProvider;
-import org.eclipse.jst.j2ee.internal.ejb.project.operations.EjbFacetInstallDataModelProvider;
-import org.eclipse.jst.j2ee.internal.ejb.project.operations.IEjbFacetInstallDataModelProperties;
-import org.eclipse.jst.j2ee.internal.plugin.J2EEPlugin;
-import org.eclipse.jst.j2ee.internal.plugin.J2EEPreferences;
-import org.eclipse.jst.j2ee.internal.project.J2EEProjectUtilities;
-import org.eclipse.jst.j2ee.jca.project.facet.ConnectorFacetInstallDataModelProvider;
-import org.eclipse.jst.j2ee.project.facet.AppClientFacetInstallDataModelProvider;
-import org.eclipse.jst.j2ee.project.facet.IAppClientFacetInstallDataModelProperties;
-import org.eclipse.jst.j2ee.project.facet.IJ2EEModuleFacetInstallDataModelProperties;
-import org.eclipse.jst.j2ee.project.facet.UtilityFacetInstallDataModelProvider;
-import org.eclipse.jst.j2ee.web.project.facet.WebFacetInstallDataModelProvider;
-import org.eclipse.swt.widgets.Display;
-import org.eclipse.ui.IViewPart;
-import org.eclipse.ui.PlatformUI;
-import org.eclipse.ui.navigator.CommonViewer;
-import org.eclipse.ui.navigator.INavigatorContentService;
-import org.eclipse.wst.common.componentcore.datamodel.FacetProjectCreationDataModelProvider;
-import org.eclipse.wst.common.componentcore.datamodel.properties.IFacetDataModelProperties;
-import org.eclipse.wst.common.componentcore.datamodel.properties.IFacetProjectCreationDataModelProperties;
-import org.eclipse.wst.common.componentcore.datamodel.properties.IFacetProjectCreationDataModelProperties.FacetDataModelMap;
-import org.eclipse.wst.common.componentcore.internal.ComponentType;
-import org.eclipse.wst.common.componentcore.internal.ComponentcoreFactory;
-import org.eclipse.wst.common.componentcore.internal.IComponentProjectMigrator;
-import org.eclipse.wst.common.componentcore.internal.Property;
-import org.eclipse.wst.common.componentcore.internal.StructureEdit;
-import org.eclipse.wst.common.componentcore.internal.WorkbenchComponent;
-import org.eclipse.wst.common.frameworks.datamodel.DataModelFactory;
-import org.eclipse.wst.common.frameworks.datamodel.IDataModel;
-import org.eclipse.wst.common.frameworks.internal.SimpleValidateEdit;
-import org.eclipse.wst.project.facet.SimpleWebFacetInstallDataModelProvider;
-import org.eclipse.wst.server.core.IRuntime;
-import org.eclipse.wst.server.core.ServerUtil;
-import org.eclipse.jst.j2ee.internal.plugin.J2EEUIPlugin;
-
-/**
- * This has been deprecated since WTP 3.1.2 and will be deleted post WTP 3.2.
- * See https://bugs.eclipse.org/bugs/show_bug.cgi?id=292934
- * @deprecated
- * @author jsholl
- */
-public class J2EEComponentProjectMigrator implements IComponentProjectMigrator {
-
- private static final String WEB_LIB_CONTAINER = "org.eclipse.jst.j2ee.internal.web.container"; //$NON-NLS-1$
- private static final String WEB_LIB_PATH = "/WEB-INF/lib"; //$NON-NLS-1$
- private static final String OLD_DEPLOYABLES_PATH = ".deployables"; //$NON-NLS-1$
- private IProject project;
-
- private static final String[] J2EE_CONTENT_EXTENSION_IDS = new String[] {
- "org.eclipse.jst.navigator.j2ee.ui.EARDDContent", //$NON-NLS-1$
- "org.eclipse.jst.navigator.j2ee.ui.WebDDContent", //$NON-NLS-1$
- "org.eclipse.jst.navigator.j2ee.ui.EJBDDContent", //$NON-NLS-1$
- "org.eclipse.jst.navigator.j2ee.ui.ConnectorDDContent" //$NON-NLS-1$
- };
-
- private static final String PROJECT_EXPLORER = "org.eclipse.ui.navigator.ProjectExplorer"; //$NON-NLS-1$
-
- public J2EEComponentProjectMigrator() {
- super();
- }
-
- public void migrateProject(IProject aProject) {
- if (aProject.isAccessible() && (aProject.getFile(StructureEdit.MODULE_META_FILE_NAME).exists())) {
- // The file corresponding to StructureEdit.MODULE_META_FILE_NAME is crucial to migration.
- // If it does not exist, the project cannot be migrated. We should never fail the test for existence
- // of the file, if we do then something has gone badly wrong.
- Resource resource = WorkbenchResourceHelperBase.getResource(aProject.getFile(StructureEdit.MODULE_META_FILE_NAME), false);
- if(resource != null && resource.isLoaded()){
- // Unload the resource because the model inside the StructureEdit was cached when the
- // the project was imported, and files may have moved due to migration (.wtpmodules for example).
- resource.unload();
- }
-
- final List files = new ArrayList();
- files.add(aProject.getFile(J2EEProjectUtilities.DOT_PROJECT));
- files.add(aProject.getFile(J2EEProjectUtilities.DOT_CLASSPATH));
- files.add(aProject.getFile(StructureEdit.MODULE_META_FILE_NAME));
- if(SimpleValidateEdit.validateEdit(files)){
- project = aProject;
-
- removeComponentBuilders(project);
- if (multipleComponentsDetected())
- createNewProjects();
- String facetid = getFacetFromProject(project);
- if (facetid.length() == 0)
- addFacets(project);
- J2EEComponentClasspathUpdater.getInstance().queueUpdate(project);
- }
- }
- ensureJ2EEContentExtensionsEnabled();
- }
-
- /**
- * Ensure the J2EE content extension ids are enabled on the project explorer
- * for the projects being migrated.
- */
- private void ensureJ2EEContentExtensionsEnabled() {
- IViewPart view = null;
- try {
- view = PlatformUI.getWorkbench().getWorkbenchWindows()[0].getActivePage().findView(PROJECT_EXPLORER);
- } catch (Exception e) {
- //Just bail and return if there is no view
- }
- if (view == null)
- return;
-
- INavigatorContentService contentService = (INavigatorContentService) view.getAdapter(INavigatorContentService.class);
- CommonViewer viewer = (CommonViewer) view.getAdapter(CommonViewer.class);
-
- // Set the J2EE content extensions as enabled now that we have set the J2EE facets
- if (contentService != null)
- contentService.getActivationService().activateExtensions(J2EE_CONTENT_EXTENSION_IDS, false);
-
- // Update the viewer if we are in the current UI thread
- if (viewer != null) {
- Display display = viewer.getControl().getDisplay();
- if (display!=null && Thread.currentThread().equals(display.getThread()))
- viewer.refresh();
- }
- }
-
- private void createNewProjects() {
-
- StructureEdit se = null;
- try {
- se = StructureEdit.getStructureEditForWrite(project);
- List comps = se.getComponentModelRoot().getComponents();
- List removedComps = new ArrayList();
- for (int i = 1;i<comps.size();i++) {
- WorkbenchComponent comp = (WorkbenchComponent) comps.get(i);
- IWorkspace ws = ResourcesPlugin.getWorkspace();
- IProject newProj = ws.getRoot().getProject(comp.getName());
- if (!newProj.exists()) {
- try {
- createProj(newProj,(!comp.getComponentType().getComponentTypeId().equals(J2EEProjectUtilities.ENTERPRISE_APPLICATION)));
- WtpUtils.addNatures(newProj);
- } catch (CoreException e) {
- J2EEUIPlugin.logError(e);
- }
- }
- if (comp.getComponentType()!=null)
- addFacetsToProject(newProj,comp.getComponentType().getComponentTypeId(),comp.getComponentType().getVersion(),false);
- removedComps.add(comp);
- IFolder compFolder = project.getFolder(comp.getName());
- if (compFolder.exists())
- try {
- compFolder.delete(true,null);
- } catch (CoreException e) {
- J2EEUIPlugin.logError(e);
- }
- }
- se.getComponentModelRoot().getComponents().removeAll(removedComps);
- se.save(null);
-
- } finally {
- if (se != null)
- se.dispose();
- }
-
-
- }
-
- private void createProj(IProject newProj, boolean isJavaProject) throws CoreException {
- newProj.create(null);
- IProjectDescription description = ResourcesPlugin.getWorkspace().newProjectDescription(newProj.getName());
-// if (isJavaProject)
-// description.setNatureIds(new String[]{JavaCore.NATURE_ID});
- description.setLocation(null);
- newProj.open(null);
- newProj.setDescription(description, null);
- }
-
- private boolean multipleComponentsDetected() {
- StructureEdit se = null;
- try {
- se = StructureEdit.getStructureEditForRead(project);
- if (se == null) return false;
- if (se.getComponentModelRoot() == null) return false;
- return se.getComponentModelRoot().getComponents().size() > 1;
- } finally {
- if (se != null)
- se.dispose();
- }
- }
-
- private void removeComponentBuilders(IProject aProject) {
- try {
- aProject.refreshLocal(IResource.DEPTH_INFINITE,null);
- } catch (CoreException e1) {
- J2EEUIPlugin.logError(e1);
- }
- //IJavaProject javaP = JemProjectUtilities.getJavaProject(aProject);
- List oldBuilders = new ArrayList();
- oldBuilders.add("org.eclipse.wst.common.modulecore.ComponentStructuralBuilder"); //$NON-NLS-1$
- oldBuilders.add("org.eclipse.wst.common.modulecore.ComponentStructuralBuilderDependencyResolver"); //$NON-NLS-1$
- oldBuilders.add("org.eclipse.wst.common.modulecore.DependencyGraphBuilder"); //$NON-NLS-1$
- try {
- J2EEProjectUtilities.removeBuilders(aProject,oldBuilders);
- } catch (CoreException e) {
- J2EEUIPlugin.logError(e);
- }
- }
-
- public String getFacetFromProject(IProject aProject) {
- return J2EEProjectUtilities.getJ2EEProjectType(aProject);
- }
-
-
- protected IDataModel setupJavaInstallAction(IProject aProject, boolean existing,String srcFolder) {
- IDataModel dm = DataModelFactory.createDataModel(new JavaFacetInstallDataModelProvider());
- dm.setProperty(IFacetDataModelProperties.FACET_PROJECT_NAME, aProject.getName());
- String jVersion = "1.4"; //$NON-NLS-1$
- IScopeContext context = new ProjectScope( project );
- IEclipsePreferences prefs
- = context.getNode( JavaCore.PLUGIN_ID );
- if (JavaCore.VERSION_1_5.equals(prefs.get(JavaCore.COMPILER_COMPLIANCE,JavaCore.VERSION_1_4))) {
- jVersion = "5.0"; //$NON-NLS-1$
- }
- dm.setProperty(IFacetDataModelProperties.FACET_VERSION_STR, jVersion);
- if (!existing)
- dm.setStringProperty(IJavaFacetInstallDataModelProperties.SOURCE_FOLDER_NAME, srcFolder);
- return dm;
- }
-
- protected IDataModel setupUtilInstallAction(IProject aProject,String specVersion) {
- IDataModel aFacetInstallDataModel = DataModelFactory.createDataModel(new UtilityFacetInstallDataModelProvider());
- aFacetInstallDataModel.setProperty(IFacetDataModelProperties.FACET_PROJECT_NAME, aProject.getName());
- aFacetInstallDataModel.setProperty(IFacetDataModelProperties.FACET_VERSION_STR, specVersion);
- aFacetInstallDataModel.setBooleanProperty(IJ2EEModuleFacetInstallDataModelProperties.ADD_TO_EAR,false);
- aFacetInstallDataModel.setStringProperty(IJ2EEModuleFacetInstallDataModelProperties.EAR_PROJECT_NAME,null);
- return aFacetInstallDataModel;
- }
- protected IDataModel setupEarInstallAction(IProject aProject,String specVersion) {
- IDataModel earFacetInstallDataModel = DataModelFactory.createDataModel(new EarFacetInstallDataModelProvider());
- earFacetInstallDataModel.setProperty(IFacetDataModelProperties.FACET_PROJECT_NAME, aProject.getName());
- earFacetInstallDataModel.setProperty(IFacetDataModelProperties.FACET_VERSION_STR, specVersion);
-
- return earFacetInstallDataModel;
- }
- protected IDataModel setupAppClientInstallAction(IProject aProject,String specVersion) {
- IDataModel aFacetInstallDataModel = DataModelFactory.createDataModel(new AppClientFacetInstallDataModelProvider());
- aFacetInstallDataModel.setProperty(IFacetDataModelProperties.FACET_PROJECT_NAME, aProject.getName());
- aFacetInstallDataModel.setProperty(IFacetDataModelProperties.FACET_VERSION_STR, specVersion);
- aFacetInstallDataModel.setBooleanProperty(IJ2EEModuleFacetInstallDataModelProperties.ADD_TO_EAR,false);
- aFacetInstallDataModel.setStringProperty(IJ2EEModuleFacetInstallDataModelProperties.EAR_PROJECT_NAME,null);
- aFacetInstallDataModel.setBooleanProperty(IAppClientFacetInstallDataModelProperties.CREATE_DEFAULT_MAIN_CLASS,false);
- return aFacetInstallDataModel;
- }
- protected IDataModel setupConnectorInstallAction(IProject aProject,String specVersion) {
- IDataModel aFacetInstallDataModel = DataModelFactory.createDataModel(new ConnectorFacetInstallDataModelProvider());
- aFacetInstallDataModel.setProperty(IFacetDataModelProperties.FACET_PROJECT_NAME, aProject.getName());
- aFacetInstallDataModel.setProperty(IFacetDataModelProperties.FACET_VERSION_STR, specVersion);
- aFacetInstallDataModel.setBooleanProperty(IJ2EEModuleFacetInstallDataModelProperties.ADD_TO_EAR,false);
- aFacetInstallDataModel.setStringProperty(IJ2EEModuleFacetInstallDataModelProperties.EAR_PROJECT_NAME,null);
- return aFacetInstallDataModel;
- }
-
- private void addFacets(IProject aProject) {
- StructureEdit edit = null;
- try {
- edit = StructureEdit.getStructureEditForWrite(aProject);
- if (edit == null) return; // Not a component project....
- edit.getModuleStructuralModel().setUseOldFormat(true);
- if (edit.getComponent() == null) return; // Can't migrate
- ComponentType type = edit.getComponent().getComponentType();
- if (type == null) return; // Can't migrate
- String compId = type.getComponentTypeId();
- String specVersion = edit.getComponent().getComponentType().getVersion();
- moveMetaProperties(edit.getComponent(),type);
- addFacetsToProject(aProject, compId, specVersion,true);
- }
- finally {
- if (edit != null) {
- edit.save(null);
- edit.getModuleStructuralModel().setUseOldFormat(false);
- edit.dispose();
- }
- }
-
- }
-
- private void moveMetaProperties(WorkbenchComponent component, ComponentType type) {
- List props = type.getProperties();
- List compProps = component.getProperties();
- for (Iterator iter = props.iterator(); iter.hasNext();) {
- Property element = (Property) iter.next();
- Property newProp = ComponentcoreFactory.eINSTANCE.createProperty();
- newProp.setName(element.getName());
- newProp.setValue(element.getValue());
- compProps.add(newProp);
- }
- props.clear();
- }
-
- private void addFacetsToProject(IProject aProject, String compId, String specVersion,boolean existing) {
- if (compId.equals(J2EEProjectUtilities.DYNAMIC_WEB))
- installWEBFacets(aProject,specVersion,existing);
- else if (compId.equals(J2EEProjectUtilities.EJB))
- installEJBFacets(aProject,specVersion,existing);
- else if (compId.equals(J2EEProjectUtilities.APPLICATION_CLIENT))
- installAppClientFacets(aProject,specVersion,existing);
- else if (compId.equals(J2EEProjectUtilities.ENTERPRISE_APPLICATION))
- installEARFacets(aProject,specVersion,existing);
- else if (compId.equals(J2EEProjectUtilities.JCA))
- installConnectorFacets(aProject,specVersion,existing);
- else if (compId.equals(J2EEProjectUtilities.UTILITY))
- installUtilityFacets(aProject,specVersion,existing);
- else if (compId.equals(J2EEProjectUtilities.STATIC_WEB))
- installStaticWebFacets(aProject,specVersion,existing);
- }
-
- private void installStaticWebFacets(IProject project2, String specVersion, boolean existing) {
- IDataModel dm = DataModelFactory.createDataModel(new FacetProjectCreationDataModelProvider());
- dm.setProperty(IFacetProjectCreationDataModelProperties.FACET_PROJECT_NAME, project2.getName());
- FacetDataModelMap facetDMs = (FacetDataModelMap) dm.getProperty(IFacetProjectCreationDataModelProperties.FACET_DM_MAP);
- //facetDMs.add(setupJavaInstallAction(webProj,existing,CreationConstants.DEFAULT_WEB_SOURCE_FOLDER));
- IDataModel newModel = setupStaticWebInstallAction(project2);
- facetDMs.add(newModel);
- //setRuntime(webProj,dm); //Setting runtime property
- try {
- /**
- * Warning cleanup 12/07/2005
- */
- //IStatus stat = dm.getDefaultOperation().execute(null,null);
- dm.getDefaultOperation().execute(null,null);
- } catch (ExecutionException e) {
- Throwable realException = e.getCause();
- if (realException != null && realException instanceof CoreException) {
- IStatus st = ((CoreException)realException).getStatus();
- String message = st != null ? st.toString() : ""; //$NON-NLS-1$
- J2EEUIPlugin.logError(message, realException);
- }
- }
- }
-
- private IDataModel setupStaticWebInstallAction(IProject project2) {
- IDataModel webFacetInstallDataModel = DataModelFactory.createDataModel(new SimpleWebFacetInstallDataModelProvider());
- webFacetInstallDataModel.setProperty(IFacetDataModelProperties.FACET_PROJECT_NAME, project2.getName());
- webFacetInstallDataModel.setProperty(IFacetDataModelProperties.FACET_VERSION_STR, "1.0"); //$NON-NLS-1$
-
- return webFacetInstallDataModel;
- }
-
- private void installUtilityFacets(IProject aProject, String specVersion, boolean existing) {
- replaceDeployablesOutputIfNecessary(project);
- IDataModel dm = DataModelFactory.createDataModel(new FacetProjectCreationDataModelProvider());
- dm.setProperty(IFacetProjectCreationDataModelProperties.FACET_PROJECT_NAME, aProject.getName());
- FacetDataModelMap facetDMs = (FacetDataModelMap) dm.getProperty(IFacetProjectCreationDataModelProperties.FACET_DM_MAP);
- facetDMs.add(setupJavaInstallAction(aProject,existing,"src")); //$NON-NLS-1$
- IDataModel newModel = setupUtilInstallAction(aProject,specVersion);
- facetDMs.add(newModel);
- try {
- /**
- * Warning cleanup 12/07/2005
- */
- //IStatus stat = dm.getDefaultOperation().execute(null,null);
- dm.getDefaultOperation().execute(null,null);
- } catch (ExecutionException e) {
- Throwable realException = e.getCause();
- if (realException != null && realException instanceof CoreException) {
- IStatus st = ((CoreException)realException).getStatus();
- String message = st != null ? st.toString() : ""; //$NON-NLS-1$
- J2EEUIPlugin.logError(message, realException);
- }
- }
-
- }
-
- private void installConnectorFacets(IProject aProject, String specVersion, boolean existing) {
- replaceDeployablesOutputIfNecessary(project);
- IDataModel dm = DataModelFactory.createDataModel(new FacetProjectCreationDataModelProvider());
- dm.setProperty(IFacetProjectCreationDataModelProperties.FACET_PROJECT_NAME, aProject.getName());
- FacetDataModelMap facetDMs = (FacetDataModelMap) dm.getProperty(IFacetProjectCreationDataModelProperties.FACET_DM_MAP);
- facetDMs.add(setupJavaInstallAction(aProject,existing,J2EEPlugin.getDefault().getJ2EEPreferences().getString(J2EEPreferences.Keys.JCA_CONTENT_FOLDER)));
- IDataModel newModel = setupConnectorInstallAction(aProject,specVersion);
- facetDMs.add(newModel);
- try {
- /**
- * Warning cleanup 12/07/2005
- */
- //IStatus stat = dm.getDefaultOperation().execute(null,null);
- dm.getDefaultOperation().execute(null,null);
- } catch (ExecutionException e) {
- Throwable realException = e.getCause();
- if (realException != null && realException instanceof CoreException) {
- IStatus st = ((CoreException)realException).getStatus();
- String message = st != null ? st.toString() : ""; //$NON-NLS-1$
- J2EEUIPlugin.logError(message, realException);
- }
- }
-
- }
-
- private void installEARFacets(IProject aProject, String specVersion, boolean existing) {
- IDataModel dm = DataModelFactory.createDataModel(new FacetProjectCreationDataModelProvider());
- dm.setProperty(IFacetProjectCreationDataModelProperties.FACET_PROJECT_NAME, aProject.getName());
- FacetDataModelMap facetDMs = (FacetDataModelMap) dm.getProperty(IFacetProjectCreationDataModelProperties.FACET_DM_MAP);
- IDataModel newModel = setupEarInstallAction(aProject,specVersion);
- facetDMs.add(newModel);
- try {
- /**
- * Warning cleanup 12/07/2005
- */
- //IStatus stat = dm.getDefaultOperation().execute(null,null);
- dm.getDefaultOperation().execute(null,null);
- } catch (ExecutionException e) {
- Throwable realException = e.getCause();
- if (realException != null && realException instanceof CoreException) {
- IStatus st = ((CoreException)realException).getStatus();
- String message = st != null ? st.toString() : ""; //$NON-NLS-1$
- J2EEUIPlugin.logError(message, realException);
- }
- }
-
- }
-
- private void installAppClientFacets(IProject aProject, String specVersion, boolean existing) {
- replaceDeployablesOutputIfNecessary(project);
- IDataModel dm = DataModelFactory.createDataModel(new FacetProjectCreationDataModelProvider());
- dm.setProperty(IFacetProjectCreationDataModelProperties.FACET_PROJECT_NAME, aProject.getName());
- FacetDataModelMap facetDMs = (FacetDataModelMap) dm.getProperty(IFacetProjectCreationDataModelProperties.FACET_DM_MAP);
- facetDMs.add(setupJavaInstallAction(aProject,existing,J2EEPlugin.getDefault().getJ2EEPreferences().getString(J2EEPreferences.Keys.APP_CLIENT_CONTENT_FOLDER)));
- IDataModel newModel = setupAppClientInstallAction(aProject,specVersion);
- facetDMs.add(newModel);
- try {
- /**
- * Warning cleanup 12/07/2005
- */
- //IStatus stat = dm.getDefaultOperation().execute(null,null);
- dm.getDefaultOperation().execute(null,null);
- } catch (ExecutionException e) {
- Throwable realException = e.getCause();
- if (realException != null && realException instanceof CoreException) {
- IStatus st = ((CoreException)realException).getStatus();
- String message = st != null ? st.toString() : ""; //$NON-NLS-1$
- J2EEUIPlugin.logError(message, realException);
- }
- }
-
- }
-
- private void installEJBFacets(IProject ejbProject2,String ejbVersion, boolean existing) {
- replaceDeployablesOutputIfNecessary(project);
- IDataModel dm = DataModelFactory.createDataModel(new FacetProjectCreationDataModelProvider());
- dm.setProperty(IFacetProjectCreationDataModelProperties.FACET_PROJECT_NAME, ejbProject2.getName());
- FacetDataModelMap facetDMs = (FacetDataModelMap) dm.getProperty(IFacetProjectCreationDataModelProperties.FACET_DM_MAP);
- facetDMs.add(setupJavaInstallAction(ejbProject2,existing,J2EEPlugin.getDefault().getJ2EEPreferences().getString(J2EEPreferences.Keys.EJB_CONTENT_FOLDER)));
- IDataModel newModel = setupEjbInstallAction(ejbProject2,ejbVersion,existing);
- facetDMs.add(newModel);
- //setRuntime(ejbProject2,dm); //Setting runtime property
- try {
- /**
- * Warning cleanup 12/07/2005
- */
- //IStatus stat = dm.getDefaultOperation().execute(null,null);
- dm.getDefaultOperation().execute(null,null);
- } catch (ExecutionException e) {
- Throwable realException = e.getCause();
- if (realException != null && realException instanceof CoreException) {
- IStatus st = ((CoreException)realException).getStatus();
- String message = st != null ? st.toString() : ""; //$NON-NLS-1$
- J2EEUIPlugin.logError(message, realException);
- }
- }
-
- }
- private void installWEBFacets(IProject webProj,String specVersion, boolean existing) {
- removeOldWebContainerIfNecessary(project);
- replaceDeployablesOutputIfNecessary(project);
-
- IDataModel dm = DataModelFactory.createDataModel(new FacetProjectCreationDataModelProvider());
- dm.setProperty(IFacetProjectCreationDataModelProperties.FACET_PROJECT_NAME, webProj.getName());
- FacetDataModelMap facetDMs = (FacetDataModelMap) dm.getProperty(IFacetProjectCreationDataModelProperties.FACET_DM_MAP);
- facetDMs.add(setupJavaInstallAction(webProj,existing, CommonFrameworksPlugin.getDefault().getPluginPreferences().getString(CommonFrameworksPlugin.DEFAULT_SOURCE_FOLDER)));
- IDataModel newModel = setupWebInstallAction(webProj,specVersion);
- facetDMs.add(newModel);
- //setRuntime(webProj,dm); //Setting runtime property
- try {
- /**
- * Warning cleanup 12/07/2005
- */
- //IStatus stat = dm.getDefaultOperation().execute(null,null);
- dm.getDefaultOperation().execute(null,null);
- } catch (ExecutionException e) {
- Throwable realException = e.getCause();
- if (realException != null && realException instanceof CoreException) {
- IStatus st = ((CoreException)realException).getStatus();
- String message = st != null ? st.toString() : ""; //$NON-NLS-1$
- J2EEUIPlugin.logError(message, realException);
- }
- } catch (Exception ex) {
- if (ex instanceof CoreException) {
- IStatus st = ((CoreException)ex).getStatus();
- String message = st != null ? st.toString() : ""; //$NON-NLS-1$
- J2EEUIPlugin.logError(message, ex);
- }
- }
-
-
- }
- private void replaceDeployablesOutputIfNecessary(IProject proj) {
-
-
- IJavaProject jproj = JemProjectUtilities.getJavaProject(proj);
- final IClasspathEntry[] current;
- boolean deployablesFound = false;
- try {
- current = jproj.getRawClasspath();
- List updatedList = new ArrayList();
- IPath sourcePath = null;
- for (int i = 0; i < current.length; i++) {
- IClasspathEntry entry = current[i];
- if ((entry.getEntryKind() == IClasspathEntry.CPE_SOURCE) && (entry.getOutputLocation() != null && entry.getOutputLocation().toString().indexOf(OLD_DEPLOYABLES_PATH) != -1)) {
- sourcePath = entry.getPath();
- updatedList.add(JavaCore.newSourceEntry(sourcePath));
- deployablesFound = true;
- }
- else
- updatedList.add(entry);
- }
- if (deployablesFound) {
- IClasspathEntry[] updated = (IClasspathEntry[])updatedList.toArray(new IClasspathEntry[updatedList.size()]);
- jproj.setRawClasspath(updated, null);
- jproj.save(null, true);
- }
- } catch (JavaModelException e) {
- J2EEUIPlugin.logError(e);
- }
-
-
-
- }
-
- private void removeOldWebContainerIfNecessary(IProject webProj) {
-
- IJavaProject jproj = JemProjectUtilities.getJavaProject(webProj);
- final IClasspathEntry[] current;
- try {
- current = jproj.getRawClasspath();
- List updatedList = new ArrayList();
- boolean useDefaultWebAppLibraries = J2EEComponentClasspathContainerUtils.getDefaultUseWebAppLibraries();
- for (int i = 0; i < current.length; i++) {
- IClasspathEntry entry = current[i];
- // the web container is added to the classpath if:
- // 1. they don't have an entry for WEB_LIB_CONTAINER AND
- // 2. they have an entry for WEB_LIB_PATH BUT
- // they do not have the preference checked to use the Web App classpath container
- if ((entry.getPath().toString().indexOf(WEB_LIB_CONTAINER) == -1) &&
- ((entry.getPath().toString().indexOf(WEB_LIB_PATH) == -1) || !useDefaultWebAppLibraries))
- updatedList.add(entry);
- }
- IClasspathEntry[] updated = (IClasspathEntry[])updatedList.toArray(new IClasspathEntry[updatedList.size()]);
- jproj.setRawClasspath(updated, null);
- jproj.save(null, true);
- } catch (JavaModelException e) {
- J2EEUIPlugin.logError(e);
- }
-
- }
-
- protected IRuntime getRuntimeByID(String id) {
- IRuntime[] targets = ServerUtil.getRuntimes("", ""); //$NON-NLS-1$ //$NON-NLS-2$
- for (int i = 0; i < targets.length; i++) {
- IRuntime target = targets[i];
- if (id.equals(target.getId()))
- return target;
- }
- return null;
- }
-
- protected IDataModel setupEjbInstallAction(IProject aProject,String ejbVersion, boolean existing) {
- IDataModel ejbFacetInstallDataModel = DataModelFactory.createDataModel(new EjbFacetInstallDataModelProvider());
- ejbFacetInstallDataModel.setProperty(IFacetDataModelProperties.FACET_PROJECT_NAME, aProject.getName());
- ejbFacetInstallDataModel.setProperty(IFacetDataModelProperties.FACET_VERSION_STR, ejbVersion);
- ejbFacetInstallDataModel.setBooleanProperty(IJ2EEModuleFacetInstallDataModelProperties.ADD_TO_EAR,false);
- ejbFacetInstallDataModel.setStringProperty(IJ2EEModuleFacetInstallDataModelProperties.EAR_PROJECT_NAME,null);
- if (!existing)
- ejbFacetInstallDataModel.setProperty(IEjbFacetInstallDataModelProperties.CONFIG_FOLDER, J2EEPlugin.getDefault().getJ2EEPreferences().getString(J2EEPreferences.Keys.EJB_CONTENT_FOLDER));
- return ejbFacetInstallDataModel;
- }
-
- protected IDataModel setupWebInstallAction(IProject aProject,String specVersion) {
- IDataModel webFacetInstallDataModel = DataModelFactory.createDataModel(new WebFacetInstallDataModelProvider());
- webFacetInstallDataModel.setProperty(IFacetDataModelProperties.FACET_PROJECT_NAME, aProject.getName());
- webFacetInstallDataModel.setProperty(IFacetDataModelProperties.FACET_VERSION_STR, specVersion);
- webFacetInstallDataModel.setBooleanProperty(IJ2EEModuleFacetInstallDataModelProperties.ADD_TO_EAR,false);
- webFacetInstallDataModel.setStringProperty(IJ2EEModuleFacetInstallDataModelProperties.EAR_PROJECT_NAME,null);
- return webFacetInstallDataModel;
- }
-
-
-}
diff --git a/plugins/org.eclipse.jst.j2ee.ui/j2ee_ui/org/eclipse/jst/j2ee/internal/J2EEDependenciesPage.java b/plugins/org.eclipse.jst.j2ee.ui/j2ee_ui/org/eclipse/jst/j2ee/internal/J2EEDependenciesPage.java
deleted file mode 100644
index d95c6d1..0000000
--- a/plugins/org.eclipse.jst.j2ee.ui/j2ee_ui/org/eclipse/jst/j2ee/internal/J2EEDependenciesPage.java
+++ /dev/null
@@ -1,244 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2005, 2007 IBM Corporation and others.
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
- *
- * Contributors:
- * IBM Corporation - initial implementation as prop page heirarchy
- * rfrost@bea.com - conversion to single property page impl
- *******************************************************************************/
-
-package org.eclipse.jst.j2ee.internal;
-
-import org.eclipse.core.resources.IProject;
-import org.eclipse.core.resources.IResource;
-import org.eclipse.core.runtime.CoreException;
-import org.eclipse.jst.j2ee.internal.plugin.J2EEUIMessages;
-import org.eclipse.jst.j2ee.internal.project.J2EEProjectUtilities;
-import org.eclipse.jst.j2ee.project.EarUtilities;
-import org.eclipse.swt.SWT;
-import org.eclipse.swt.layout.GridData;
-import org.eclipse.swt.layout.GridLayout;
-import org.eclipse.swt.widgets.Composite;
-import org.eclipse.swt.widgets.Control;
-import org.eclipse.swt.widgets.Label;
-import org.eclipse.swt.widgets.TabFolder;
-import org.eclipse.swt.widgets.TabItem;
-import org.eclipse.swt.widgets.Text;
-import org.eclipse.ui.dialogs.PropertyPage;
-import org.eclipse.wst.common.componentcore.internal.util.IModuleConstants;
-import org.eclipse.wst.common.project.facet.core.IFacetedProject;
-import org.eclipse.wst.common.project.facet.core.ProjectFacetsManager;
-
-/**
- * Primary project property page for J2EE dependencies; content is dynamically
- * generated based on the project facets and will be comprised by a
- * set of IJ2EEDependenciesControl implementations.
- *
- */
-public class J2EEDependenciesPage extends PropertyPage {
-
- public String DESCRIPTION = J2EEUIMessages.getResourceString("DESCRIPTION"); //$NON-NLS-1$
-
- private IProject project;
- private IJ2EEDependenciesControl[] controls = new IJ2EEDependenciesControl[0];
-
- public J2EEDependenciesPage() {
- super();
- }
-
- /* (non-Javadoc)
- * @see org.eclipse.jface.preference.PreferencePage#createContents(org.eclipse.swt.widgets.Composite)
- */
- @Override
- protected Control createContents(Composite parent) {
-
- // Need to find out what type of project we are handling
- project = (IProject) getElement().getAdapter(IResource.class);
- boolean isEAR = false;
- boolean isWEB = false;
- try {
- final IFacetedProject facetedProject = ProjectFacetsManager.create(project);
- if (facetedProject == null) {
- return getFacetErrorComposite(parent);
- }
- isEAR = facetedProject.hasProjectFacet(ProjectFacetsManager.getProjectFacet(IModuleConstants.JST_EAR_MODULE));
- isWEB = facetedProject.hasProjectFacet(ProjectFacetsManager.getProjectFacet(IModuleConstants.JST_WEB_MODULE));
- } catch (CoreException ce) {
- return getFacetErrorComposite(parent);
- }
-
- if (isEAR) {
- return createEARContent(parent);
- } else if (isWEB) {
- return createWebContent(parent);
- } else {
- return createNonEARContent(parent);
- }
- }
-
- private Composite getFacetErrorComposite(final Composite parent) {
- final String errorCheckingFacet = ManifestUIResourceHandler.Error_Checking_Project_Facets;
- setErrorMessage(errorCheckingFacet);
- setValid(false);
- return getErrorComposite(parent, errorCheckingFacet);
- }
-
- private Composite getErrorComposite(final Composite parent, final String error) {
- final Composite composite = new Composite(parent, SWT.NONE);
- final GridLayout layout = new GridLayout();
- layout.marginWidth = 0;
- layout.marginWidth = 0;
- composite.setLayout(layout);
- composite.setLayoutData(new GridData(GridData.FILL_BOTH));
- final Label label= new Label(composite, SWT.NONE);
- label.setText(error);
- return composite;
- }
-
- private Composite createEARContent(final Composite parent) {
- controls = new IJ2EEDependenciesControl[1];
- controls[0] = new AddModulestoEARPropertiesPage(project, this);
- return controls[0].createContents(parent);
- }
-
- private Composite createWebContent(final Composite parent) {
- final boolean standalone = EarUtilities.isStandaloneProject(project);
-
- if (standalone) {
- // only need to create the Web Libraries page
- controls = new IJ2EEDependenciesControl[1];
- controls[0] = new WebLibDependencyPropertiesPage(project, this);
- return controls[0].createContents(parent);
- }
- // Create a tabbed folder with both "J2EE Modules" and "Web Libraries"
- final TabFolder folder = new TabFolder(parent, SWT.LEFT);
- folder.setLayoutData(new GridData(GridData.FILL_BOTH));
- folder.setFont(parent.getFont());
-
- // Create the two tabs
- controls = new IJ2EEDependenciesControl[2];
-
- controls[0] = new JARDependencyPropertiesPage(project, this);
- TabItem tab = new TabItem(folder, SWT.NONE);
- tab.setControl(controls[0].createContents(folder));
- tab.setText(ManifestUIResourceHandler.J2EE_Modules);
- controls[1] = new WebLibDependencyPropertiesPage(project, this);
- tab = new TabItem(folder, SWT.NONE);
- tab.setControl(controls[1].createContents(folder));
- tab.setText(ManifestUIResourceHandler.Web_Libraries);
-
- folder.setSelection(0);
- return folder;
- }
-
- private Composite createNonEARContent(final Composite parent) {
- controls = new IJ2EEDependenciesControl[1];
- final boolean standalone = EarUtilities.isStandaloneProject(project);
- if (standalone) {
- // if not referenced by an EAR, check if referenced by a dynamic web project
- if (J2EEProjectUtilities.getReferencingWebProjects(project).length > 0) {
- controls[0] = new WebRefDependencyPropertiesPage(project, this);
- } else {
- return getUnreferencedErrorComposite(parent);
- }
- } else {
- controls[0] = new JARDependencyPropertiesPage(project, this);
- }
-
- return controls[0].createContents(parent);
- }
-
- private Composite getUnreferencedErrorComposite(final Composite parent) {
- final String msg = ManifestUIResourceHandler.Unreferenced_Module_Error;
- setErrorMessage(msg);
- return getErrorComposite(parent, msg);
- }
-
- /* (non-Javadoc)
- * @see org.eclipse.jface.preference.IPreferencePage#performOk()
- */
- @Override
- public boolean performOk() {
- for (int i = 0; i < controls.length; i++) {
- if (controls[i] != null) {
- if (!controls[i].performOk()) {
- return false;
- }
- }
- }
- return true;
- }
-
- /* (non-Javadoc)
- * @see org.eclipse.jface.preference.PreferencePage#performDefaults()
- */
- @Override
- public void performDefaults() {
- for (int i = 0; i < controls.length; i++) {
- if (controls[i] != null) {
- controls[i].performDefaults();
- }
- }
- }
-
- /* (non-Javadoc)
- * @see org.eclipse.jface.preference.IPreferencePage#performCancel()
- */
- @Override
- public boolean performCancel() {
- for (int i = 0; i < controls.length; i++) {
- if (controls[i] != null) {
- if (!controls[i].performCancel()) {
- return false;
- }
- }
- }
- return super.performCancel();
- }
-
- /* (non-Javadoc)
- * @see org.eclipse.jface.dialogs.IDialogPage#setVisible(boolean)
- */
- @Override
- public void setVisible(boolean visible) {
- super.setVisible(visible);
- for (int i = 0; i < controls.length; i++) {
- if (controls[i] != null) {
- controls[i].setVisible(visible);
- }
- }
- }
-
- /* (non-Javadoc)
- * @see org.eclipse.jface.dialogs.IDialogPage#dispose()
- */
- @Override
- public void dispose() {
- super.dispose();
- for (int i = 0; i < controls.length; i++) {
- if(controls[i] != null){
- controls[i].dispose();
- }
- }
- }
-
- protected static void createDescriptionComposite(final Composite parent, final String description) {
- Composite descriptionComp = new Composite(parent, SWT.NONE);
- GridLayout layout = new GridLayout();
- layout.numColumns = 1;
- descriptionComp.setLayout(layout);
- descriptionComp.setLayoutData(new GridData(GridData.FILL_HORIZONTAL));
- fillDescription(descriptionComp, description);
- }
-
- private static void fillDescription(Composite c, String s) {
- GridData data = new GridData(GridData.FILL_HORIZONTAL);
- data.widthHint = 250;
- Text text = new Text(c, SWT.READ_ONLY | SWT.WRAP);
- text.setLayoutData(data);
- text.setText(s);
- }
-}
diff --git a/plugins/org.eclipse.jst.j2ee.ui/j2ee_ui/org/eclipse/jst/j2ee/internal/J2EEPropertiesConstants.java b/plugins/org.eclipse.jst.j2ee.ui/j2ee_ui/org/eclipse/jst/j2ee/internal/J2EEPropertiesConstants.java
deleted file mode 100644
index ddfb3ee..0000000
--- a/plugins/org.eclipse.jst.j2ee.ui/j2ee_ui/org/eclipse/jst/j2ee/internal/J2EEPropertiesConstants.java
+++ /dev/null
@@ -1,58 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2003, 2004 IBM Corporation and others.
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
- *
- * Contributors:
- * IBM Corporation - initial API and implementation
- *******************************************************************************/
-/*
- * Created on Apr 8, 2004
- *
- * To change the template for this generated file go to
- * Window - Preferences - Java - Code Generation - Code and Comments
- */
-package org.eclipse.jst.j2ee.internal;
-
-import org.eclipse.jst.j2ee.internal.plugin.J2EEUIMessages;
-
-/**
- * @author vijayb
- *
- * To change the template for this generated type comment go to Window - Preferences - Java - Code
- * Generation - Code and Comments
- */
-public interface J2EEPropertiesConstants {
- //J2EEUIMessages.getResourceString("Import_Classes");
- public String J2EE_LEVEL = J2EEUIMessages.getResourceString("J2EE_Level"); //$NON-NLS-1$
- public String J2EE_12 = J2EEUIMessages.getResourceString("J2EE_12"); //$NON-NLS-1$
- public String J2EE_12_DESCRIPTION = J2EEUIMessages.getResourceString("J2EE_12_DESCRIPTION"); //$NON-NLS-1$
- public String J2EE_13 = J2EEUIMessages.getResourceString("J2EE_13"); //$NON-NLS-1$
- public String J2EE_13_DESCRIPTION = J2EEUIMessages.getResourceString("J2EE_13_DESCRIPTION"); //$NON-NLS-1$
- public String J2EE_14_DESCRIPTION = J2EEUIMessages.getResourceString("J2EE_14_DESCRIPTION"); //$NON-NLS-1$
- public String EJB_LEVEL = J2EEUIMessages.getResourceString("EJB_LEVEL"); //$NON-NLS-1$
- public String EJB_11 = J2EEUIMessages.getResourceString("EJB_11"); //$NON-NLS-1$
- public String EJB_11_DESCRIPTION = J2EEUIMessages.getResourceString("EJB_11_DESCRIPTION"); //$NON-NLS-1$
- public String EJB_20 = J2EEUIMessages.getResourceString("EJB_20"); //$NON-NLS-1$
- public String EJB_20_DESCRIPTION = J2EEUIMessages.getResourceString("EJB_20_DESCRIPTION"); //$NON-NLS-1$
- public String EJB_21_DESCRIPTION = J2EEUIMessages.getResourceString("EJB_21_DESCRIPTION"); //$NON-NLS-1$
- public String CONNECTOR_LEVEL = J2EEUIMessages.getResourceString("CONNECTOR_LEVEL"); //$NON-NLS-1$
- public String CONNECTOR_10 = J2EEUIMessages.getResourceString("CONNECTOR_10"); //$NON-NLS-1$
- public String CONNECTOR_15 = J2EEUIMessages.getResourceString("CONNECTOR_15"); //$NON-NLS-1$
- public String CONNECTOR_10_DESCRIPTION = J2EEUIMessages.getResourceString("CONNECTOR_10_DESCRIPTION"); //$NON-NLS-1$
- public String CONNECTOR_15_DESCRIPTION = J2EEUIMessages.getResourceString("CONNECTOR_15_DESCRIPTION"); //$NON-NLS-1$
- public String WEB_LEVEL = J2EEUIMessages.getResourceString("WEB_LEVEL"); //$NON-NLS-1$
- public String WEB_22_DESCRIPTION = J2EEUIMessages.getResourceString("WEB_22_DESCRIPTION"); //$NON-NLS-1$
- public String WEB_23_DESCRIPTION = J2EEUIMessages.getResourceString("WEB_23_DESCRIPTION"); //$NON-NLS-1$
- public String WEB_24_DESCRIPTION = J2EEUIMessages.getResourceString("WEB_24_DESCRIPTION"); //$NON-NLS-1$
- public String APP_CLIENT_LEVEL = J2EEUIMessages.getResourceString("APP_CLIENT_LEVEL"); //$NON-NLS-1$
- public String APP_CLIENT_12_DESCRIPTION = J2EEUIMessages.getResourceString("APP_CLIENT_12_DESCRIPTION"); //$NON-NLS-1$
- public String APP_CLIENT_13_DESCRIPTION = J2EEUIMessages.getResourceString("APP_CLIENT_13_DESCRIPTION"); //$NON-NLS-1$
- public String APP_CLIENT_14_DESCRIPTION = J2EEUIMessages.getResourceString("APP_CLIENT_14_DESCRIPTION"); //$NON-NLS-1$
- public String DESCRIPTION = J2EEUIMessages.getResourceString("DESCRIPTION"); //$NON-NLS-1$
- public String WEB_CONTEXT_ROOT = J2EEUIMessages.getResourceString("WEB_CONTEXT_ROOT"); //$NON-NLS-1$
- public String WEB_CONTENT_FOLDER_NAME = J2EEUIMessages.getResourceString("WEB_CONTENT_FOLDER_NAME"); //$NON-NLS-1$
-
-}
\ No newline at end of file
diff --git a/plugins/org.eclipse.jst.j2ee.ui/j2ee_ui/org/eclipse/jst/j2ee/internal/JARDependencyPropertiesPage.java b/plugins/org.eclipse.jst.j2ee.ui/j2ee_ui/org/eclipse/jst/j2ee/internal/JARDependencyPropertiesPage.java
deleted file mode 100644
index d42c66f..0000000
--- a/plugins/org.eclipse.jst.j2ee.ui/j2ee_ui/org/eclipse/jst/j2ee/internal/JARDependencyPropertiesPage.java
+++ /dev/null
@@ -1,1101 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2005, 2008 IBM Corporation and others.
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
- *
- * Contributors:
- * IBM Corporation - initial API and implementation
- * David Schneider, david.schneider@unisys.com - [142500] WTP properties pages fonts don't follow Eclipse preferences
- * Stefan Dimov, stefan.dimov@sap.com - bug 207826
- *******************************************************************************/
-package org.eclipse.jst.j2ee.internal;
-
-import java.io.IOException;
-import java.io.InputStream;
-import java.lang.reflect.InvocationTargetException;
-import java.util.ArrayList;
-import java.util.Arrays;
-import java.util.HashMap;
-import java.util.HashSet;
-import java.util.Iterator;
-import java.util.LinkedList;
-import java.util.List;
-import java.util.Map;
-import java.util.Set;
-import java.util.jar.Manifest;
-
-import org.eclipse.core.commands.ExecutionException;
-import org.eclipse.core.resources.IFile;
-import org.eclipse.core.resources.IProject;
-import org.eclipse.core.resources.IResourceDelta;
-import org.eclipse.core.resources.IWorkspaceRunnable;
-import org.eclipse.core.runtime.CoreException;
-import org.eclipse.core.runtime.IPath;
-import org.eclipse.core.runtime.IProgressMonitor;
-import org.eclipse.core.runtime.IStatus;
-import org.eclipse.core.runtime.NullProgressMonitor;
-import org.eclipse.core.runtime.Path;
-import org.eclipse.emf.common.util.URI;
-import org.eclipse.jdt.core.ElementChangedEvent;
-import org.eclipse.jdt.core.IClasspathAttribute;
-import org.eclipse.jdt.core.IClasspathEntry;
-import org.eclipse.jdt.core.IElementChangedListener;
-import org.eclipse.jdt.core.IJavaElement;
-import org.eclipse.jdt.core.IJavaElementDelta;
-import org.eclipse.jdt.core.IJavaModel;
-import org.eclipse.jdt.core.IJavaProject;
-import org.eclipse.jdt.core.JavaCore;
-import org.eclipse.jem.util.logger.proxy.Logger;
-import org.eclipse.jem.workbench.utility.JemProjectUtilities;
-import org.eclipse.jface.dialogs.Dialog;
-import org.eclipse.jface.dialogs.MessageDialog;
-import org.eclipse.jface.dialogs.ProgressMonitorDialog;
-import org.eclipse.jface.viewers.CheckboxTableViewer;
-import org.eclipse.jface.viewers.ColumnWeightData;
-import org.eclipse.jface.viewers.TableLayout;
-import org.eclipse.jst.j2ee.application.internal.operations.AddComponentToEnterpriseApplicationDataModelProvider;
-import org.eclipse.jst.j2ee.application.internal.operations.ClassPathSelection;
-import org.eclipse.jst.j2ee.application.internal.operations.ClasspathElement;
-import org.eclipse.jst.j2ee.application.internal.operations.RemoveComponentFromEnterpriseApplicationDataModelProvider;
-import org.eclipse.jst.j2ee.application.internal.operations.UpdateManifestDataModelProperties;
-import org.eclipse.jst.j2ee.application.internal.operations.UpdateManifestDataModelProvider;
-import org.eclipse.jst.j2ee.classpathdep.ClasspathDependencyUtil;
-import org.eclipse.jst.j2ee.classpathdep.IClasspathDependencyConstants;
-import org.eclipse.jst.j2ee.classpathdep.UpdateClasspathAttributeUtil;
-import org.eclipse.jst.j2ee.classpathdep.IClasspathDependencyConstants.DependencyAttributeType;
-import org.eclipse.jst.j2ee.commonarchivecore.internal.helpers.ArchiveManifest;
-import org.eclipse.jst.j2ee.commonarchivecore.internal.helpers.ArchiveManifestImpl;
-import org.eclipse.jst.j2ee.componentcore.J2EEModuleVirtualArchiveComponent;
-import org.eclipse.jst.j2ee.internal.classpathdep.ClasspathDependencyEnablement;
-import org.eclipse.jst.j2ee.internal.common.ClasspathModel;
-import org.eclipse.jst.j2ee.internal.common.ClasspathModelEvent;
-import org.eclipse.jst.j2ee.internal.common.ClasspathModelListener;
-import org.eclipse.jst.j2ee.internal.common.classpath.J2EEComponentClasspathUpdater;
-import org.eclipse.jst.j2ee.internal.listeners.IValidateEditListener;
-import org.eclipse.jst.j2ee.internal.listeners.ValidateEditListener;
-import org.eclipse.jst.j2ee.internal.plugin.IJ2EEModuleConstants;
-import org.eclipse.jst.j2ee.internal.plugin.J2EEUIPlugin;
-import org.eclipse.jst.j2ee.internal.project.J2EEProjectUtilities;
-import org.eclipse.jst.j2ee.model.ModelProviderManager;
-import org.eclipse.jst.j2ee.project.EarUtilities;
-import org.eclipse.jst.j2ee.project.JavaEEProjectUtilities;
-import org.eclipse.jst.javaee.application.Application;
-import org.eclipse.swt.SWT;
-import org.eclipse.swt.custom.CCombo;
-import org.eclipse.swt.layout.GridData;
-import org.eclipse.swt.layout.GridLayout;
-import org.eclipse.swt.widgets.Button;
-import org.eclipse.swt.widgets.Composite;
-import org.eclipse.swt.widgets.Display;
-import org.eclipse.swt.widgets.Event;
-import org.eclipse.swt.widgets.Group;
-import org.eclipse.swt.widgets.Label;
-import org.eclipse.swt.widgets.Listener;
-import org.eclipse.swt.widgets.Table;
-import org.eclipse.swt.widgets.TableColumn;
-import org.eclipse.swt.widgets.Text;
-import org.eclipse.wst.common.componentcore.ComponentCore;
-import org.eclipse.wst.common.componentcore.ModuleCoreNature;
-import org.eclipse.wst.common.componentcore.UnresolveableURIException;
-import org.eclipse.wst.common.componentcore.datamodel.properties.ICreateReferenceComponentsDataModelProperties;
-import org.eclipse.wst.common.componentcore.internal.builder.IDependencyGraph;
-import org.eclipse.wst.common.componentcore.internal.impl.ModuleURIUtil;
-import org.eclipse.wst.common.componentcore.internal.operation.RemoveReferenceComponentsDataModelProvider;
-import org.eclipse.wst.common.componentcore.internal.util.ComponentUtilities;
-import org.eclipse.wst.common.componentcore.internal.util.IModuleConstants;
-import org.eclipse.wst.common.componentcore.resources.IVirtualComponent;
-import org.eclipse.wst.common.componentcore.resources.IVirtualFile;
-import org.eclipse.wst.common.componentcore.resources.IVirtualReference;
-import org.eclipse.wst.common.frameworks.datamodel.DataModelFactory;
-import org.eclipse.wst.common.frameworks.datamodel.IDataModel;
-import org.eclipse.wst.common.frameworks.datamodel.IDataModelOperation;
-import org.eclipse.wst.common.frameworks.datamodel.IDataModelProvider;
-import org.eclipse.wst.common.frameworks.internal.ui.WTPUIPlugin;
-import org.eclipse.wst.common.frameworks.internal.ui.WorkspaceModifyComposedOperation;
-
-/**
- * @author jialin
- * @deprecated wtp 3.2
- */
-public class JARDependencyPropertiesPage implements IJ2EEDependenciesControl, IClasspathTableOwner, Listener, ClasspathModelListener, IElementChangedListener {
-
- protected final IProject project;
- protected final J2EEDependenciesPage propPage;
- protected IOException caughtManifestException;
- protected boolean isDirty;
- protected Text classPathText;
- protected Text componentNameText;
- protected ClasspathModel model;
- protected CCombo availableAppsCombo;
- protected ClasspathTableManager tableManager;
- protected IValidateEditListener validateEditListener;
- protected Label manifestLabel;
- protected Label enterpriseApplicationLabel;
- protected Label availableDependentJars;
- private final Display display;
- private boolean isDisposed = false;
-
- /**
- * Constructor for JARDependencyPropertiesControl
- */
- public JARDependencyPropertiesPage(final IProject project, final J2EEDependenciesPage page) {
- super();
- J2EEComponentClasspathUpdater.getInstance().pauseUpdates();
- this.project = project;
- this.propPage = page;
- this.display = propPage.getShell().getDisplay();
- }
-
- /**
- * Returns false if page should not be displayed for the project.
- */
- protected void initialize() {
- model = createClasspathModel();
- model.setProject(project);
- if (model.getComponent() != null) {
- model.addListener(this);
- updateModelManifest();
- initializeValidateEditListener();
- }
- }
-
- protected ClasspathModel createClasspathModel(){
- return new ClasspathModel(J2EEProjectUtilities.readManifest(project), false);
- }
-
- public void dispose() {
- isDisposed = true;
- JavaCore.removeElementChangedListener(this);
- J2EEComponentClasspathUpdater.getInstance().resumeUpdates();
- }
-
- private void updateModelManifest() {
- if (JemProjectUtilities.isBinaryProject(project) || model.getAvailableEARComponents().length == 0)
- return;
-
- IVirtualComponent component = ComponentCore.createComponent(project);
- if(component != null){
- IVirtualFile vManifest = component.getRootFolder().getFile(new Path(J2EEConstants.MANIFEST_URI));
- if(vManifest.exists()){
- IFile iManifest = vManifest.getUnderlyingFile();
- if(iManifest != null && iManifest.exists()){
- InputStream in = null;
- try {
- in = iManifest.getContents();
- ArchiveManifest mf = new ArchiveManifestImpl(new Manifest(in));
- model.primSetManifest(mf);
- } catch (CoreException e) {
- Logger.getLogger().logError(e);
- model.primSetManifest(new ArchiveManifestImpl());
- } catch (IOException iox) {
- Logger.getLogger().logError(iox);
- model.primSetManifest(new ArchiveManifestImpl());
- caughtManifestException = iox;
- } finally {
- if (in != null) {
- try {
- in.close();
- } catch (IOException weTried) {
- // Ignore
- }
- }
- }
- }
- }
- }
- }
-
-
- protected void initializeValidateEditListener() {
- validateEditListener = new ValidateEditListener(null, model);
- validateEditListener.setShell(propPage.getShell());
- }
-
- public void setVisible(boolean visible) {
- if (visible) {
- if (caughtManifestException != null && !model.isDirty()) {
- ManifestErrorPrompter.showManifestException(propPage.getShell(), ERROR_READING_MANIFEST_DIALOG_MESSAGE_PROP_PAGE, false, caughtManifestException);
- }
- }
- }
-
- /**
- * Refreshes the ClasspathModel if the project classpath is changed.
- */
- public void elementChanged(final ElementChangedEvent event) {
- if (event.getType() == ElementChangedEvent.POST_CHANGE && classpathChanged(event.getDelta())) {
- // trigger a recomputation and refresh for the currently selected EAR
- if (!isDisposed) {
- display.asyncExec (new Runnable () {
- public void run () {
- if (!isDisposed) {
- handleClasspathChange();
- }
- }
- });
- }
- }
- }
-
- /**
- * Called to refresh the UI when the classpath changes
- */
- protected void handleClasspathChange() {
- model.resetClassPathSelection();
- refresh();
- }
-
- private boolean classpathChanged(final IJavaElementDelta delta) {
- final int kind = delta.getKind();
- if (kind == IJavaElementDelta.CHANGED) {
- final int flags = delta.getFlags();
- final IJavaElement element = delta.getElement();
- if (element instanceof IJavaModel) {
- if ((flags & IJavaElementDelta.F_CHILDREN) == IJavaElementDelta.F_CHILDREN) {
- final IJavaElementDelta[] children = delta.getChangedChildren();
- for (int i = 0; i < children.length; i++) {
- // check all of the IJavaProject children
- if (classpathChanged(children[i])) {
- return true;
- }
- }
- }
- } else if (element instanceof IJavaProject) {
- // check if we either have a direct indication of a classpath change or a delta on the
- // .classpath file (changes to classpath entry attributes only give us this...)
- final IJavaProject jproject = (IJavaProject) element;
- final IProject eventProject = jproject.getProject();
- if (eventProject.equals(project)) {
- if ((flags & IJavaElementDelta.F_CLASSPATH_CHANGED) != 0) {
- return true;
- }
- final IResourceDelta[] deltas = delta.getResourceDeltas();
- if (deltas != null) {
- for (int i = 0; i < deltas.length; i++) {
- if (deltas[i].getProjectRelativePath().toString().equals(".classpath")) { //$NON-NLS-1$
- return true;
- }
- }
- }
- }
- }
- }
- return false;
- }
-
- public Composite createContents(Composite parent) {
- initialize();
- Composite composite = createBasicComposite(parent);
- GridLayout layout = new GridLayout();
- layout.marginWidth = 0;
- layout.marginWidth = 0;
- composite.setLayout(layout);
- composite.setLayoutData(new GridData(GridData.FILL_BOTH));
- if (model.getComponent() != null) {
- if (!isValidComponent())
- return composite;
- J2EEDependenciesPage.createDescriptionComposite(composite, ManifestUIResourceHandler.J2EE_Modules_Desc);
- createProjectLabelsGroup(composite);
- createListGroup(composite);
- createTextGroup(composite);
- refresh();
- }
- Dialog.applyDialogFont(parent);
- postCreateContents();
- return composite;
- }
-
- /**
- * Called at the end of createContents().
- */
- protected void postCreateContents() {
- // register this object as an IElementChangedListener so that it will react to user changes to the Java build path
- JavaCore.addElementChangedListener(this);
- }
-
- /**
- * @param comp
- * @return
- */
- protected Composite createBasicComposite(Composite comp) {
- Composite composite = new Composite(comp, SWT.NONE);
- GridLayout layout = new GridLayout();
- layout.marginWidth = 0;
- layout.marginWidth = 0;
- composite.setLayout(layout);
- composite.setLayoutData(new GridData(GridData.FILL_BOTH));
- return composite;
- }
-
- protected boolean isValidComponent() {
- if (JavaEEProjectUtilities.isEARProject(project)) {
- propPage.setErrorMessage(ManifestUIResourceHandler.EAR_Module_Dep_Error);
- return false;
- } else if (EarUtilities.isStandaloneProject(model.getComponent().getProject())) {
- propPage.setErrorMessage(ClasspathModel.NO_EAR_MESSAGE);
- return false;
- }
- return true;
- }
-
- protected void createProjectLabelsGroup(Composite parent) {
-
- Composite labelsGroup = new Composite(parent, SWT.NONE);
- GridLayout layout = new GridLayout();
- layout.numColumns = 2;
- labelsGroup.setLayout(layout);
- labelsGroup.setLayoutData(new GridData(GridData.FILL_HORIZONTAL));
- /*
- * Label label = new Label(labelsGroup, SWT.NONE);
- * label.setText(ManifestUIResourceHandler.Project_name__UI_);
- *
- * componentNameText = new Text(labelsGroup, SWT.BORDER); GridData data = new
- * GridData(GridData.FILL_HORIZONTAL); componentNameText.setEditable(false);
- * componentNameText.setLayoutData(data); componentNameText.setText(project.getName());
- */
-
- createEnterpriseAppsControls(labelsGroup);
-
- }
-
- private void createEnterpriseAppsControls(Composite labelsGroup) {
-
- enterpriseApplicationLabel = new Label(labelsGroup, SWT.NONE);
- enterpriseApplicationLabel.setText(ManifestUIResourceHandler.EAR_Project_Name__UI__UI_);
-
- availableAppsCombo = new CCombo(labelsGroup, SWT.READ_ONLY | SWT.BORDER);
- GridData gd = new GridData(GridData.FILL_HORIZONTAL);
- availableAppsCombo.setLayoutData(gd);
-
- availableAppsCombo.addListener(SWT.Selection, this);
-
- }
-
- protected void createListGroup(Composite parent) {
- Composite listGroup = new Composite(parent, SWT.NONE);
- GridLayout layout = new GridLayout();
- layout.numColumns = 1;
- layout.marginWidth = 0;
- layout.marginHeight = 0;
- listGroup.setLayout(layout);
- GridData gData = new GridData(GridData.FILL_BOTH);
- gData.horizontalIndent = 5;
- listGroup.setLayoutData(gData);
-
- availableDependentJars = new Label(listGroup, SWT.NONE);
- gData = new GridData(GridData.HORIZONTAL_ALIGN_FILL | GridData.VERTICAL_ALIGN_FILL);
- availableDependentJars.setText(ManifestUIResourceHandler.Available_dependent_JARs__UI_);
- availableDependentJars.setLayoutData(gData);
- createTableComposite(listGroup);
- }
-
- /*
- * (non-Javadoc)
- *
- * @see com.ibm.etools.j2ee.common.ui.classpath.IClasspathTableOwner#createGroup(org.eclipse.swt.widgets.Composite)
- */
- public Group createGroup(Composite parent) {
- return new Group(parent, SWT.NULL);
- }
-
- protected void createTextGroup(Composite parent) {
-
- Composite textGroup = new Composite(parent, SWT.NONE);
- GridLayout layout = new GridLayout();
- layout.numColumns = 1;
- textGroup.setLayout(layout);
- textGroup.setLayoutData(new GridData(GridData.FILL_BOTH | GridData.GRAB_HORIZONTAL));
-
- createClassPathText(textGroup);
-
- }
-
- protected void createClassPathText(Composite textGroup) {
-
- manifestLabel = new Label(textGroup, SWT.NONE);
- manifestLabel.setText(ManifestUIResourceHandler.Manifest_Class_Path__UI_);
-
- classPathText = new Text(textGroup, SWT.BORDER | SWT.MULTI | SWT.WRAP | SWT.V_SCROLL);
- GridData gData = new GridData(GridData.FILL_BOTH);
- gData.widthHint = 400;
- gData.heightHint = 100;
- classPathText.setLayoutData(gData);
- classPathText.setEditable(false);
- }
-
- protected void createTableComposite(Composite parent) {
- Composite composite = new Composite(parent, SWT.NONE);
- GridData gData = new GridData(GridData.FILL_BOTH);
- composite.setLayoutData(gData);
- tableManager = new ClasspathTableManager(this, model, validateEditListener);
- tableManager.fillComposite(composite);
- }
-
- /**
- * @see IClasspathTableOwner#createAvailableJARsViewer(Composite)
- */
- public CheckboxTableViewer createAvailableJARsViewer(Composite parent) {
- int flags = SWT.CHECK | SWT.BORDER | SWT.FULL_SELECTION | SWT.MULTI;
-
- Table table = new Table(parent, flags);
- CheckboxTableViewer availableJARsViewer = new CheckboxTableViewer(table);
-
- // set up table layout
- TableLayout tableLayout = new org.eclipse.jface.viewers.TableLayout();
- tableLayout.addColumnData(new ColumnWeightData(200, true));
- tableLayout.addColumnData(new ColumnWeightData(200, true));
- table.setLayout(tableLayout);
- table.setHeaderVisible(true);
- table.setLinesVisible(true);
-
- // do not create sorter otherwise order will go wrong
- //availableJARsViewer.setSorter(new ViewerSorter());
-
- // table columns
- TableColumn fileNameColumn = new TableColumn(table, SWT.NONE, 0);
- fileNameColumn.setText(ManifestUIResourceHandler.JAR_Module_UI_);
- fileNameColumn.setResizable(true);
-
- TableColumn projectColumn = new TableColumn(table, SWT.NONE, 1);
- projectColumn.setText(ManifestUIResourceHandler.Project_UI_);
- projectColumn.setResizable(true);
- tableLayout.layout(table, true);
- return availableJARsViewer;
-
- }
-
- /**
- * @see IClasspathTableOwner#createButtonColumnComposite(Composite)
- */
- public Composite createButtonColumnComposite(Composite parent) {
- Composite buttonColumn = new Composite(parent, SWT.NONE);
- GridLayout layout = new GridLayout();
- layout.numColumns = 1;
- layout.marginHeight = 0;
- layout.marginWidth = 0;
- buttonColumn.setLayout(layout);
- GridData data = new GridData(GridData.HORIZONTAL_ALIGN_FILL | GridData.VERTICAL_ALIGN_BEGINNING);
- buttonColumn.setLayoutData(data);
- return buttonColumn;
- }
-
- /**
- * @see IClasspathTableOwner
- */
- public Button primCreatePushButton(String label, Composite buttonColumn) {
- Button aButton = new Button(buttonColumn, SWT.PUSH);
- aButton.setText(label);
- return aButton;
- }
-
- /**
- * @see IClasspathTableOwner
- */
- public Button primCreateRadioButton(String label, Composite parent) {
- Button aButton = new Button(parent, SWT.RADIO);
- aButton.setText(label);
- return aButton;
- }
-
- /**
- * @see Listener#handleEvent(Event)
- */
- public void handleEvent(Event event) {
- if (event.widget == availableAppsCombo)
- availableAppsSelected(event);
- }
-
- protected void availableAppsSelected(Event event) {
- int index = availableAppsCombo.getSelectionIndex();
- model.selectEAR(index);
- }
-
- protected void populateApps() {
- IVirtualComponent[] components = model.getAvailableEARComponents();
- String[] values = new String[components.length];
- for (int i = 0; i < components.length; i++) {
- values[i] = components[i].getProject().getName();
- }
- if (availableAppsCombo != null) {
- availableAppsCombo.setItems(values);
- IVirtualComponent selected = model.getSelectedEARComponent();
- if (selected != null) {
- int index = Arrays.asList(components).indexOf(selected);
- availableAppsCombo.select(index);
- } else
- availableAppsCombo.clearSelection();
- }
- }
-
- protected void refresh() {
- populateApps();
- if (tableManager != null) {
- tableManager.refresh();
- }
- refreshText();
- }
-
-
- public void refreshText() {
- ClassPathSelection sel = model.getClassPathSelection();
- if (sel != null && classPathText != null)
- classPathText.setText(sel.toString());
- }
-
- /**
- * @see ClasspathModelListener#modelChanged(ClasspathModelEvent)
- */
- public void modelChanged(ClasspathModelEvent evt) {
- if (evt.getEventType() == ClasspathModelEvent.CLASS_PATH_CHANGED) {
- isDirty = true;
- refreshText();
- } else if (evt.getEventType() == ClasspathModelEvent.EAR_PROJECT_CHANGED) {
- tableManager.refresh();
- }
- }
-
- public void performDefaults() {
- model.resetClassPathSelection();
- refresh();
- isDirty = false;
- model.dispose();
- }
-
- public boolean performCancel() {
- model.dispose();
- return true;
- }
-
- /**
- * @see org.eclipse.jface.preference.IPreferencePage#performOk()
- */
- public boolean performOk() {
- if (!isDirty)
- return true;
- modifyEARBundledLibs();
- WorkspaceModifyComposedOperation composed = new WorkspaceModifyComposedOperation(createManifestOperation());
- createClasspathAttributeUpdateOperation(composed, model.getClassPathSelection(), false);
- try {
- new ProgressMonitorDialog(propPage.getShell()).run(true, true, composed);
- } catch (InvocationTargetException ex) {
- String title = ManifestUIResourceHandler.An_internal_error_occurred_ERROR_;
- String msg = title;
- if (ex.getTargetException() != null && ex.getTargetException().getMessage() != null)
- msg = ex.getTargetException().getMessage();
- MessageDialog.openError(propPage.getShell(), title, msg);
- org.eclipse.jem.util.logger.proxy.Logger.getLogger().logError(ex);
- return false;
- } catch (InterruptedException e) {
- // cancelled
- return false;
- } finally {
- model.dispose();
- }
- isDirty = false;
- return true;
- }
-
- List getUnSelectedClassPathElementsForJ2EEDependency() {
- List unselectedForJ2EE = getUnSelectedClassPathSelection().getClasspathElements();
-
- List unselected = new ArrayList();
- if (model != null && model.getClassPathSelectionForWLPs() != null) {
- List wlpSelected = model.getClassPathSelectionForWLPs().getSelectedClasspathElements();
-
- java.util.Iterator it = unselectedForJ2EE.iterator();
-
- while (it.hasNext()) {
- ClasspathElement element = (ClasspathElement) it.next();
- java.util.Iterator wlpIterator = wlpSelected.iterator();
- boolean found = false;
- while (wlpIterator.hasNext()) {
- ClasspathElement wlpElement = (ClasspathElement) wlpIterator.next();
- String text = element.getText();
- int index = text.indexOf(IJ2EEModuleConstants.JAR_EXT);
- if (index != -1) {
- text = text.substring(0, index);
- if (text.equals(wlpElement.getText())) {
- found = true;
- break;
- }
- }
- }
- if (!found) {
- if (!unselected.contains(element))
- unselected.add(element);
- }
-
- }
- }
- return unselected;
- }
-
-
- /**
- * @deprecated don't use this method it will be deleted
- * @return
- */
- List getUnSelectedClassPathElementsForWebDependency() {
- List unselectedForWLP = getUnSelectedClassPathSelectionForWLPs().getClasspathElements();
- List unselected = new ArrayList();
- if (model != null && model.getClassPathSelection() != null) {
- List j2eeSelected = model.getClassPathSelection().getSelectedClasspathElements();
- java.util.Iterator it = unselectedForWLP.iterator();
-
- while (it.hasNext()) {
- ClasspathElement element = (ClasspathElement) it.next();
- java.util.Iterator j2eeIterator = j2eeSelected.iterator();
- boolean found = false;
- while (j2eeIterator.hasNext()) {
- ClasspathElement j2eeElement = (ClasspathElement) j2eeIterator.next();
- String text = j2eeElement.getText();
- int index = text.indexOf(IJ2EEModuleConstants.JAR_EXT);
- if( index != -1 ){
- text = text.substring(0, index);
- if (element.getText().equals(text)) {
- found = true;
- break;
- }
- }
- }
- if (!found) {
- if (!unselected.contains(element))
- unselected.add(element);
- }
-
- }
- } else {
- unselected = unselectedForWLP;
- }
- return unselected;
- }
-
- /**
- * DoNotUseMeThisWillBeDeletedPost15
- * @return
- */
- protected WorkspaceModifyComposedOperation createJ2EEComponentDependencyOperations() {
- WorkspaceModifyComposedOperation composedOp = null;
- List selected = getSelectedClassPathSelection().getClasspathElements();
- List unselected = getUnSelectedClassPathElementsForJ2EEDependency();
-
- List targetComponentsHandles = new ArrayList();
- for (int i = 0; i < selected.size(); i++) {
- ClasspathElement element = (ClasspathElement) selected.get(i);
- IVirtualComponent component = element.getComponent();
- if (null != component) {
- targetComponentsHandles.add(component);
- }
- }
- if (!targetComponentsHandles.isEmpty()) {
- composedOp = new WorkspaceModifyComposedOperation();
- composedOp.addRunnable(WTPUIPlugin.getRunnableWithProgress(ComponentUtilities.createReferenceComponentOperation(model.getComponent(), targetComponentsHandles)));
- }
- targetComponentsHandles = new ArrayList();
- for (int i = 0; i < unselected.size(); i++) {
- ClasspathElement element = (ClasspathElement) unselected.get(i);
- IProject elementProject = element.getProject();
- if (elementProject != null) {
- if (ModuleCoreNature.isFlexibleProject(elementProject)) {
- IVirtualComponent targetComp = ComponentCore.createComponent(elementProject);
- targetComponentsHandles.add(targetComp);
- }
- } else {
- URI archiveURI = element.getArchiveURI();
- if (archiveURI != null && !archiveURI.equals("")) { //$NON-NLS-1$
- String name = ""; //$NON-NLS-1$
- try {
- String type = ModuleURIUtil.getArchiveType(archiveURI);
- String tmpname = ModuleURIUtil.getArchiveName(archiveURI);
- name = type + IPath.SEPARATOR + tmpname;
- } catch (UnresolveableURIException e) {
- Logger.getLogger().logError(e.getMessage());
- }
- if (!name.equals("")) { //$NON-NLS-1$
- IVirtualReference ref = model.getComponent().getReference(name);
- if (ref != null) {
- IVirtualComponent referenced = ref.getReferencedComponent();
- targetComponentsHandles.add(referenced);
- }
- }
- }
- }
- }
- if (!targetComponentsHandles.isEmpty()) {
- if (composedOp == null)
- composedOp = new WorkspaceModifyComposedOperation();
- composedOp.addRunnable(WTPUIPlugin.getRunnableWithProgress(ComponentUtilities.removeReferenceComponentOperation(model.getComponent(), targetComponentsHandles)));
- }
- return composedOp;
- }
-
-
- /**
- * This should be moved to the {@link WebLibDependencyPropertiesPage} because it is only used there.
- * @return
- */
- protected WorkspaceModifyComposedOperation createComponentDependencyOperations() {
- WorkspaceModifyComposedOperation composedOp = null;
- final ClassPathSelection selectedWLPs = getSelectedClassPathSelectionForWLPs();
- List selected = selectedWLPs.getClasspathElements();
- List unselected = getUnSelectedClassPathSelectionForWLPs().getClasspathElements();
-
- List targetComponentsHandles = new ArrayList();
- for (int i = 0; i < selected.size(); i++) {
- ClasspathElement element = (ClasspathElement) selected.get(i);
- if (element.isClasspathDependency() || element.isClasspathEntry()) {
- continue;
- }
- IProject elementProject = element.getProject();
- if (elementProject != null) {
- IVirtualComponent targetComp = ComponentCore.createComponent(elementProject);
- targetComponentsHandles.add(targetComp);
- }
- }
- if (!targetComponentsHandles.isEmpty()) {
- composedOp = new WorkspaceModifyComposedOperation();
- composedOp.addRunnable(WTPUIPlugin.getRunnableWithProgress(ComponentUtilities.createWLPReferenceComponentOperation(model.getComponent(), targetComponentsHandles)));
- }
- targetComponentsHandles = new ArrayList();
- for (int i = 0; i < unselected.size(); i++) {
- ClasspathElement element = (ClasspathElement) unselected.get(i);
- if (element.isClasspathDependency() || element.isClasspathEntry()) {
- continue;
- }
- IProject elementProject = element.getProject();
- if (elementProject != null) {
- if (ModuleCoreNature.isFlexibleProject(elementProject)) {
- IVirtualComponent targetComp = ComponentCore.createComponent(elementProject);
- targetComponentsHandles.add(targetComp);
- }
- } else {
- URI archiveURI = element.getArchiveURI();
- if (archiveURI != null && !archiveURI.equals("")) { //$NON-NLS-1$
- String name = ""; //$NON-NLS-1$
- try {
- String type = ModuleURIUtil.getArchiveType(archiveURI);
- String tmpname = ModuleURIUtil.getArchiveName(archiveURI);
- name = type + IPath.SEPARATOR + tmpname;
- } catch (UnresolveableURIException e) {
- Logger.getLogger().logError(e.getMessage());
- }
- if (!name.equals("")) { //$NON-NLS-1$
- IVirtualReference ref = model.getComponent().getReference(name);
- IVirtualComponent referenced = ref.getReferencedComponent();
- targetComponentsHandles.add(referenced);
- }
- }
- }
- }
- if (!targetComponentsHandles.isEmpty()) {
- if (composedOp == null) {
- composedOp = new WorkspaceModifyComposedOperation();
- }
- composedOp.addRunnable(WTPUIPlugin.getRunnableWithProgress(ComponentUtilities.removeWLPReferenceComponentOperation(model.getComponent(), targetComponentsHandles)));
- }
-
- if (composedOp == null) {
- composedOp = new WorkspaceModifyComposedOperation();
- }
- createClasspathAttributeUpdateOperation(composedOp, model.getClassPathSelectionForWLPs(), true);
-
- return composedOp;
- }
-
- protected WorkspaceModifyComposedOperation createFlexProjectOperations() {
- WorkspaceModifyComposedOperation composedOp = null;
- Object[] elements = tableManager.availableJARsViewer.getCheckedElements();
- for (int i = 0; i < elements.length; i++) {
- ClasspathElement element = (ClasspathElement) elements[i];
- IProject elementProject = element.getProject();
- try {
- if (elementProject != null && !elementProject.hasNature(IModuleConstants.MODULE_NATURE_ID)) {
- if (composedOp == null) {
- composedOp = new WorkspaceModifyComposedOperation();
- }
- composedOp.addRunnable(WTPUIPlugin.getRunnableWithProgress(J2EEProjectUtilities.createFlexJavaProjectForProjectOperation(elementProject, false)));
- }
- } catch (CoreException e) {
- Logger.getLogger().logError(e);
- }
- }
- return composedOp;
- }
-
- protected ClassPathSelection getUnSelectedClassPathSelectionForWLPs() {
- ClassPathSelection selection = new ClassPathSelection();
- Object[] checkedElements = tableManager.availableJARsViewer.getCheckedElements();
- List modelElements = model.getClassPathSelectionForWLPs().getClasspathElements();
- for (int i = 0; i < modelElements.size(); i++) {
- List checkedElementsList = Arrays.asList(checkedElements);
- if (!checkedElementsList.contains(modelElements.get(i))) {
- selection.getClasspathElements().add(modelElements.get(i));
- }
- }
- return selection;
- }
-
- private ClassPathSelection getSelectedClassPathSelection() {
- ClassPathSelection selection = new ClassPathSelection();
- Object[] checkedElements = tableManager.availableJARsViewer.getCheckedElements();
- for (int i = 0; i < checkedElements.length; i++) {
- selection.getClasspathElements().add(checkedElements[i]);
- }
- return selection;
- }
-
- protected ClassPathSelection getUnSelectedClassPathSelection() {
- ClassPathSelection selection = new ClassPathSelection();
- Object[] checkedElements = tableManager.availableJARsViewer.getCheckedElements();
- List modelElements = model.getClassPathSelection().getClasspathElements();
- for (int i = 0; i < modelElements.size(); i++) {
- List checkedElementsList = Arrays.asList(checkedElements);
- if (!checkedElementsList.contains(modelElements.get(i))) {
- selection.getClasspathElements().add(modelElements.get(i));
- }
- }
- return selection;
- }
-
-
- private ClassPathSelection getSelectedClassPathSelectionForWLPs() {
- ClassPathSelection selection = new ClassPathSelection();
- Object[] checkedElements = tableManager.availableJARsViewer.getCheckedElements();
- for (int i = 0; i < checkedElements.length; i++) {
- selection.getClasspathElements().add(checkedElements[i]);
- }
- return selection;
- }
-
- protected UpdateManifestOperation createManifestOperation() {
- return new UpdateManifestOperation(project.getName(), model.getClassPathSelection().toString(), true);
- }
-
- protected void createClasspathAttributeUpdateOperation(final WorkspaceModifyComposedOperation composedOp, final ClassPathSelection selection, final boolean isWebApp) {
- final boolean webLibsOnly = isWebApp && !ClasspathDependencyEnablement.isAllowClasspathComponentDependency();
- final Map selectedEntriesToRuntimePath = new HashMap();
- final Map unselectedEntriesToRuntimePath = new HashMap();
- final List elements = selection.getClasspathElements();
- for (int i = 0; i < elements.size(); i++) {
- final ClasspathElement element = (ClasspathElement) elements.get(i);
- if (element.isClasspathEntry()) {
- final IClasspathEntry entry = element.getClasspathEntry();
- final IClasspathAttribute attrib = ClasspathDependencyUtil.checkForComponentDependencyAttribute(entry, DependencyAttributeType.DEPENDENCY_OR_NONDEPENDENCY, webLibsOnly);
- boolean hasDepAttrib = false;
- if (attrib != null && attrib.getName().equals(IClasspathDependencyConstants.CLASSPATH_COMPONENT_DEPENDENCY)) {
- hasDepAttrib = true;
- }
- final IPath runtimePath = ClasspathDependencyUtil.getRuntimePath(attrib, isWebApp, ClasspathDependencyUtil.isClassFolderEntry(entry));
- if (element.isSelected()) {
- // only add if we don't already have the attribute
- if (!hasDepAttrib) {
- selectedEntriesToRuntimePath.put(entry, runtimePath);
- }
- } else {
- // only add if we already have the attribute
- if (hasDepAttrib) {
- unselectedEntriesToRuntimePath.put(entry, runtimePath);
- }
- }
- }
- }
-
- // if there are any attributes to add, create an operation to add all necessary attributes
- if (!selectedEntriesToRuntimePath.isEmpty()) {
- IDataModelOperation op = UpdateClasspathAttributeUtil.createAddDependencyAttributesOperation(project.getName(), selectedEntriesToRuntimePath);
- composedOp.addRunnable(WTPUIPlugin.getRunnableWithProgress(op));
- }
- // if there are any attributes to remove, create an operation to remove all necessary attributes
- if (!unselectedEntriesToRuntimePath.isEmpty()) {
- IDataModelOperation op = UpdateClasspathAttributeUtil.createRemoveDependencyAttributesOperation(project.getName(), unselectedEntriesToRuntimePath);
- composedOp.addRunnable(WTPUIPlugin.getRunnableWithProgress(op));
- }
- }
-
- protected boolean isReadOnly() {
- return JemProjectUtilities.isBinaryProject(project) && (project.findMember(IModuleConstants.COMPONENT_FILE_PATH) == null) ;
- }
-
- protected void modifyEARBundledLibs() {
- List compsToUncheckList = tableManager.getCheckedLibsAsList();
- if (compsToUncheckList.size() == 0) return;
- Set allCompsToUncheck = new HashSet();
- Set allCompNamesToUncheck = new HashSet();
- for (int i = 0; i < compsToUncheckList.size(); i++) {
- IVirtualComponent comp = (IVirtualComponent)compsToUncheckList.get(i);
- allCompsToUncheck.add(comp);
- if (comp instanceof J2EEModuleVirtualArchiveComponent) allCompNamesToUncheck.add(comp.getName());
- }
- IProject[] ears = EarUtilities.getReferencingEARProjects(project);
- for (int i = 0; i < ears.length; i++) {
- if (J2EEProjectUtilities.isJEEProject(ears[i])) {
- IVirtualComponent earComponent = ComponentCore.createComponent(ears[i]);
- List listToUncheck = createListToUncheck(earComponent, allCompsToUncheck, allCompNamesToUncheck);
- if (listToUncheck.size() == 0) continue;
- removeModulesFromEAR(new NullProgressMonitor(), earComponent, listToUncheck);
- addModulesToEAR(new NullProgressMonitor(), earComponent, listToUncheck);
- }
- }
- }
- //---------------------------------
- private IStatus removeModulesFromEAR(IProgressMonitor monitor, final IVirtualComponent earComponent, final List compsToUncheckList) {
- IStatus stat = IDataModelProvider.OK_STATUS;
- String libDir = ((Application)ModelProviderManager.getModelProvider(earComponent.getProject()).getModelObject()).getLibraryDirectory();
- libDir = (libDir == null) ? J2EEConstants.EAR_DEFAULT_LIB_DIR : libDir;
- Map dependentComps = getEARModuleDependencies(earComponent, compsToUncheckList);
- try {
- IDataModelOperation op = removeComponentFromEAROperation(earComponent, compsToUncheckList, libDir);
- op.execute(null, null);
- J2EEComponentClasspathUpdater.getInstance().queueUpdateEAR(earComponent.getProject());
- removeEARComponentDependencies(dependentComps);
- } catch (ExecutionException e) {
- Logger.getLogger().log(e);
- }
- return stat;
- }
-
-
- private IStatus addModulesToEAR(IProgressMonitor monitor, final IVirtualComponent earComponent, final List compsToUncheckList) {
- try {
- IWorkspaceRunnable runnable = new IWorkspaceRunnable(){
- public void run(IProgressMonitor monitor) throws CoreException{
- execAddOp(monitor, compsToUncheckList, J2EEConstants.EAR_ROOT_DIR, earComponent);
- }
- };
- J2EEUIPlugin.getWorkspace().run(runnable, monitor);
- } catch (Exception e) {
- Logger.getLogger().log(e);
- }
- return IDataModelProvider.OK_STATUS;
- }
-
- private List createListToUncheck(IVirtualComponent earComponent, Set compsToUncheckList, Set compNamesToUncheck) {
- LinkedList res = new LinkedList();
- IVirtualReference[] refs = earComponent.getReferences();
- for (int j = 0; j < refs.length; j++) {
- if (!refs[j].getRuntimePath().isRoot() &&
- (compsToUncheckList.contains(refs[j].getReferencedComponent()) ||
- compNamesToUncheck.contains(refs[j].getReferencedComponent().getName()))) {
- res.add(refs[j].getReferencedComponent());
- }
- }
- return res;
- }
-
- private void execAddOp(IProgressMonitor monitor, List list, String path, IVirtualComponent earComponent) throws CoreException {
- IDataModel dm = DataModelFactory.createDataModel(new AddComponentToEnterpriseApplicationDataModelProvider());
-
- dm.setProperty(ICreateReferenceComponentsDataModelProperties.SOURCE_COMPONENT, earComponent);
- dm.setProperty(ICreateReferenceComponentsDataModelProperties.TARGET_COMPONENT_LIST, list);
- dm.setProperty(ICreateReferenceComponentsDataModelProperties.TARGET_COMPONENTS_DEPLOY_PATH, path);
-
- IStatus stat = dm.validateProperty(ICreateReferenceComponentsDataModelProperties.TARGET_COMPONENT_LIST);
- if (stat != IDataModelProvider.OK_STATUS)
- throw new CoreException(stat);
- try {
- dm.getDefaultOperation().execute(monitor, null);
- } catch (ExecutionException e) {
- Logger.getLogger().log(e);
- }
- }
-
-
- protected IDataModelOperation removeComponentFromEAROperation(IVirtualComponent sourceComponent, List targetComponentsHandles, String dir) {
- IDataModel model = DataModelFactory.createDataModel(new RemoveComponentFromEnterpriseApplicationDataModelProvider());
- model.setProperty(ICreateReferenceComponentsDataModelProperties.SOURCE_COMPONENT, sourceComponent);
- List modHandlesList = (List) model.getProperty(ICreateReferenceComponentsDataModelProperties.TARGET_COMPONENT_LIST);
- modHandlesList.addAll(targetComponentsHandles);
- model.setProperty(ICreateReferenceComponentsDataModelProperties.TARGET_COMPONENT_LIST, modHandlesList);
- model.setProperty(ICreateReferenceComponentsDataModelProperties.TARGET_COMPONENTS_DEPLOY_PATH, dir);
- return model.getDefaultOperation();
- }
-
- private Map getEARModuleDependencies(final IVirtualComponent earComponent, final List components) {
- final Map dependentComps = new HashMap();
- // get all current references to project within the scope of this EAR
- for (int i = 0; i < components.size(); i++) {
-
- final List compsForProject = new ArrayList();
- final IVirtualComponent comp = (IVirtualComponent) components.get(i);
- Set<IProject> referencingComponents = IDependencyGraph.INSTANCE.getReferencingComponents(project);
- IProject [] dependentProjects = referencingComponents.toArray(new IProject[referencingComponents.size()]);
- for (int j = 0; j < dependentProjects.length; j++) {
- final IProject project = dependentProjects[j];
- // if this is an EAR, can skip
- if (JavaEEProjectUtilities.isEARProject(project)) {
- continue;
- }
- final IVirtualComponent dependentComp = ComponentCore.createComponent(project);
- // ensure that the project's share an EAR
- final IProject[] refEARs = EarUtilities.getReferencingEARProjects(project);
- boolean sameEAR = false;
- for (int k = 0; k < refEARs.length; k++) {
- if (refEARs[k].equals(earComponent.getProject())) {
- sameEAR = true;
- break;
- }
- }
- if (!sameEAR) {
- continue;
- }
- // if the dependency is a web lib dependency, can skip
- if (JavaEEProjectUtilities.isDynamicWebProject(project)) {
- IVirtualReference ref = dependentComp.getReference(comp.getName());
- if (ref != null && ref.getRuntimePath().equals(new Path("/WEB-INF/lib"))) { //$NON-NLS-1$
- continue;
- }
- }
- compsForProject.add(dependentComp);
- }
- dependentComps.put(comp, compsForProject);
- }
- return dependentComps;
- }
-
- private void removeEARComponentDependencies(final Map dependentComps) throws ExecutionException {
- final Iterator targets = dependentComps.keySet().iterator();
- while (targets.hasNext()) {
- final IVirtualComponent target = (IVirtualComponent) targets.next();
- final List sources = (List) dependentComps.get(target);
- for (int i = 0; i < sources.size(); i++) {
- final IVirtualComponent source = (IVirtualComponent) sources.get(i);
- final IDataModel model = DataModelFactory.createDataModel(new RemoveReferenceComponentsDataModelProvider());
- model.setProperty(ICreateReferenceComponentsDataModelProperties.SOURCE_COMPONENT, source);
- final List modHandlesList = (List) model.getProperty(ICreateReferenceComponentsDataModelProperties.TARGET_COMPONENT_LIST);
- modHandlesList.add(target);
- model.setProperty(ICreateReferenceComponentsDataModelProperties.TARGET_COMPONENT_LIST, modHandlesList);
- model.getDefaultOperation().execute(null, null);
- // update the manifest
- removeManifestDependency(source, target);
- }
- }
- }
-
- private void removeManifestDependency(final IVirtualComponent source, final IVirtualComponent target)
- throws ExecutionException {
- final String sourceProjName = source.getProject().getName();
- final String targetProjName = target.getProject().getName();
- final IProgressMonitor monitor = new NullProgressMonitor();
- final IFile manifestmf = J2EEProjectUtilities.getManifestFile(source.getProject());
- final ArchiveManifest mf = J2EEProjectUtilities.readManifest(source.getProject());
- if (mf == null)
- return;
- final IDataModel updateManifestDataModel = DataModelFactory.createDataModel(new UpdateManifestDataModelProvider());
- updateManifestDataModel.setProperty(UpdateManifestDataModelProperties.PROJECT_NAME, sourceProjName);
- updateManifestDataModel.setBooleanProperty(UpdateManifestDataModelProperties.MERGE, false);
- updateManifestDataModel.setProperty(UpdateManifestDataModelProperties.MANIFEST_FILE, manifestmf);
- String[] cp = mf.getClassPathTokenized();
- List cpList = new ArrayList();
- String cpToRemove = targetProjName + IJ2EEModuleConstants.JAR_EXT;
- for (int i = 0; i < cp.length; i++) {
- if (!cp[i].equals(cpToRemove)) {
- cpList.add(cp[i]);
- }
- }
- updateManifestDataModel.setProperty(UpdateManifestDataModelProperties.JAR_LIST, cpList);
- updateManifestDataModel.getDefaultOperation().execute(monitor, null );
- }
-
-}
diff --git a/plugins/org.eclipse.jst.j2ee.ui/j2ee_ui/org/eclipse/jst/j2ee/internal/ManifestErrorPrompter.java b/plugins/org.eclipse.jst.j2ee.ui/j2ee_ui/org/eclipse/jst/j2ee/internal/ManifestErrorPrompter.java
deleted file mode 100644
index ce309b4..0000000
--- a/plugins/org.eclipse.jst.j2ee.ui/j2ee_ui/org/eclipse/jst/j2ee/internal/ManifestErrorPrompter.java
+++ /dev/null
@@ -1,48 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2005 IBM Corporation and others.
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
- *
- * Contributors:
- * IBM Corporation - initial API and implementation
- *******************************************************************************/
-/*
- * Created on Jan 17, 2005
- */
-package org.eclipse.jst.j2ee.internal;
-
-import org.eclipse.jst.j2ee.internal.plugin.ErrorDialog;
-import org.eclipse.swt.widgets.Shell;
-
-/**
- * @author jialin
- */
-public class ManifestErrorPrompter implements ICommonManifestUIConstants {
-
- /**
- * Constructor for ManifestErrorPrompter.
- */
- private ManifestErrorPrompter() {
- super();
- }
-
- public static boolean showManifestException(Shell shell, String baseMessage, boolean includeCancel, Throwable caught) {
- StringBuffer msg = new StringBuffer(baseMessage);
- msg.append("\n"); //$NON-NLS-1$
- msg.append(MANIFEST_PROBLEM_1);
- msg.append("\n"); //$NON-NLS-1$
- msg.append(MANIFEST_PROBLEM_2);
- msg.append("\n"); //$NON-NLS-1$
- msg.append(MANIFEST_PROBLEM_3);
- msg.append("\n"); //$NON-NLS-1$
- msg.append(MANIFEST_PROBLEM_4);
- return ErrorDialog.openError(shell,
- ERROR_READING_MANIFEST_DIALOG_TITLE,
- msg.toString(),
- caught,
- 0, includeCancel);
- }
-
-}
diff --git a/plugins/org.eclipse.jst.j2ee.ui/j2ee_ui/org/eclipse/jst/j2ee/internal/ManifestUIResourceHandler.java b/plugins/org.eclipse.jst.j2ee.ui/j2ee_ui/org/eclipse/jst/j2ee/internal/ManifestUIResourceHandler.java
deleted file mode 100644
index 50c1f23..0000000
--- a/plugins/org.eclipse.jst.j2ee.ui/j2ee_ui/org/eclipse/jst/j2ee/internal/ManifestUIResourceHandler.java
+++ /dev/null
@@ -1,64 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2000, 2008 IBM Corporation and others.
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
- *
- * Contributors:
- * IBM Corporation - initial API and implementation
- * Stefan Dimov, stefan.dimov@sap.com - bug 207826
- *******************************************************************************/
-package org.eclipse.jst.j2ee.internal;
-
-import org.eclipse.osgi.util.NLS;
-
-public final class ManifestUIResourceHandler extends NLS {
-
- private static final String BUNDLE_NAME = "manifest_ui";//$NON-NLS-1$
-
- private ManifestUIResourceHandler() {
- // Do not instantiate
- }
-
- public static String Up_1;
- public static String Down_2;
- public static String Select_All_3;
- public static String Deselect_All_4;
- public static String ERROR_READING_MANIFEST_DIALOG_TITLE;
- public static String SAVE_MANIFEST_WITH_ERROR;
- public static String ERROR_READING_MANIFEST_DIALOG_MESSAGE_EDITOR;
- public static String ERROR_READING_MANIFEST_DIALOG_MESSAGE_PROP_PAGE;
- public static String MANIFEST_PROBLEM_1;
- public static String MANIFEST_PROBLEM_2;
- public static String MANIFEST_PROBLEM_3;
- public static String MANIFEST_PROBLEM_4;
- public static String An_internal_error_occurred_ERROR_;
- public static String Project_name__UI_;
- public static String EAR_Project_Name__UI__UI_;
- public static String Available_dependent_JARs__UI_;
- public static String Manifest_Class_Path__UI_;
- public static String JAR_Module_UI_;
- public static String Packed_In_Lib_UI_;
- public static String Project_UI_;
- public static String EAR_Modules;
- public static String EAR_Modules_Desc;
- public static String J2EE_Modules;
- public static String J2EE_Modules_Desc;
- public static String Web_Libraries;
- public static String Web_Libraries_Desc;
- public static String Web_Ref_Desc;
- public static String EAR_Module_Dep_Error;
- public static String Unreferenced_Module_Error;
- public static String Jar_Dep_One_Module_Error;
- public static String Web_Lib_Error;
- public static String REDIRECT_TEXT_EDITOR_UI_;
- public static String Error_Checking_Project_Facets;
- public static String WEB_LIB_LIST_DESCRIPTION;
- public static String Dynamic_Web_Error;
- public static String No_Web_Reference_Error;
-
- static {
- NLS.initializeMessages(BUNDLE_NAME, ManifestUIResourceHandler.class);
- }
-}
diff --git a/plugins/org.eclipse.jst.j2ee.ui/j2ee_ui/org/eclipse/jst/j2ee/internal/SecondCheckBoxStateChangedEvent.java b/plugins/org.eclipse.jst.j2ee.ui/j2ee_ui/org/eclipse/jst/j2ee/internal/SecondCheckBoxStateChangedEvent.java
deleted file mode 100644
index eeb1f5e..0000000
--- a/plugins/org.eclipse.jst.j2ee.ui/j2ee_ui/org/eclipse/jst/j2ee/internal/SecondCheckBoxStateChangedEvent.java
+++ /dev/null
@@ -1,38 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2008 SAP AG and others.
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
- *
- * Contributors:
- * Stefan Dimov, stefan.dimov@sap.com - initial API and implementation
- *******************************************************************************/
-package org.eclipse.jst.j2ee.internal;
-
-import org.eclipse.jface.viewers.CheckStateChangedEvent;
-import org.eclipse.jface.viewers.ICheckable;
-import org.eclipse.jst.j2ee.internal.ui.DoubleCheckboxTableItem;
-
-public class SecondCheckBoxStateChangedEvent extends CheckStateChangedEvent {
-
- /**
- *
- */
- private static final long serialVersionUID = 4497186607413856367L;
- private DoubleCheckboxTableItem item = null;
-
- public SecondCheckBoxStateChangedEvent(ICheckable source,
- Object element,
- boolean state) {
- super(source, element, state);
- }
-
- public void setTableItem(DoubleCheckboxTableItem itm) {
- item = itm;
- }
-
- public DoubleCheckboxTableItem getTableItem() {
- return item;
- }
-}
diff --git a/plugins/org.eclipse.jst.j2ee.ui/j2ee_ui/org/eclipse/jst/j2ee/internal/UpdateManifestOperation.java b/plugins/org.eclipse.jst.j2ee.ui/j2ee_ui/org/eclipse/jst/j2ee/internal/UpdateManifestOperation.java
deleted file mode 100644
index f0637b9..0000000
--- a/plugins/org.eclipse.jst.j2ee.ui/j2ee_ui/org/eclipse/jst/j2ee/internal/UpdateManifestOperation.java
+++ /dev/null
@@ -1,82 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2005 IBM Corporation and others.
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
- *
- * Contributors:
- * IBM Corporation - initial API and implementation
- *******************************************************************************/
-/*
- * Created on Jan 17, 2005
- */
-package org.eclipse.jst.j2ee.internal;
-
-import java.lang.reflect.InvocationTargetException;
-
-import org.eclipse.core.resources.IProject;
-import org.eclipse.jface.operation.IRunnableContext;
-import org.eclipse.jst.j2ee.commonarchivecore.internal.helpers.ArchiveManifest;
-import org.eclipse.jst.j2ee.commonarchivecore.internal.helpers.ArchiveManifestImpl;
-import org.eclipse.jst.j2ee.commonarchivecore.internal.util.ArchiveUtil;
-import org.eclipse.jst.j2ee.internal.plugin.J2EEPlugin;
-import org.eclipse.jst.j2ee.internal.project.J2EEProjectUtilities;
-import org.eclipse.wst.common.frameworks.internal.enablement.nonui.WFTWrappedException;
-
-/**
- * @deprecated as of wtp 3.2
- * @author jialin
- */
-public class UpdateManifestOperation implements org.eclipse.jface.operation.IRunnableWithProgress {
- protected String projectName;
- protected String classPathValue;
- protected boolean replace;
-/**
- * UpdateManifestOperation constructor comment.
- * @deprecated as of wtp 3.2
- */
-public UpdateManifestOperation(String aProjectName, String aSpaceDelimitedPath, boolean replaceInsteadOfMerge) {
- super();
- projectName = aProjectName;
- classPathValue = aSpaceDelimitedPath;
- replace = replaceInsteadOfMerge;
-}
-protected IProject getProject() {
- return J2EEPlugin.getWorkspace().getRoot().getProject(projectName);
-}
-/**
- * Runs this operation. Progress should be reported to the given progress monitor.
- * This method is usually invoked by an <code>IRunnableContext</code>'s <code>run</code> method,
- * which supplies the progress monitor.
- * A request to cancel the operation should be honored and acknowledged
- * by throwing <code>InterruptedException</code>.
- *
- * @param monitor the progress monitor to use to display progress and receive
- * requests for cancelation
- * @exception InvocationTargetException if the run method must propagate a checked exception,
- * it should wrap it inside an <code>InvocationTargetException</code>; runtime exceptions are automatically
- * wrapped in an <code>InvocationTargetException</code> by the calling context
- * @exception InterruptedException if the operation detects a request to cancel,
- * using <code>IProgressMonitor.isCanceled()</code>, it should exit by throwing
- * <code>InterruptedException</code>
- *
- * @see IRunnableContext#run
- */
-public void run(org.eclipse.core.runtime.IProgressMonitor monitor) throws java.lang.reflect.InvocationTargetException, InterruptedException {
- IProject p = getProject();
- try {
- ArchiveManifest mf = J2EEProjectUtilities.readManifest(p);
- if (mf == null)
- mf = new ArchiveManifestImpl();
- mf.addVersionIfNecessary();
- if (replace)
- mf.setClassPath(classPathValue);
- else
- mf.mergeClassPath(ArchiveUtil.getTokens(classPathValue));
- J2EEProjectUtilities.writeManifest(p, mf);
- } catch (java.io.IOException ex) {
- throw new WFTWrappedException(ex);
- }
-}
-}
diff --git a/plugins/org.eclipse.jst.j2ee.ui/j2ee_ui/org/eclipse/jst/j2ee/internal/WebLibDependencyPropertiesPage.java b/plugins/org.eclipse.jst.j2ee.ui/j2ee_ui/org/eclipse/jst/j2ee/internal/WebLibDependencyPropertiesPage.java
deleted file mode 100644
index bd6dbe5..0000000
--- a/plugins/org.eclipse.jst.j2ee.ui/j2ee_ui/org/eclipse/jst/j2ee/internal/WebLibDependencyPropertiesPage.java
+++ /dev/null
@@ -1,370 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2005, 2007 IBM Corporation and others.
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
- *
- * Contributors:
- * IBM Corporation - initial API and implementation
- * David Schneider, david.schneider@unisys.com - [142500] WTP properties pages fonts don't follow Eclipse preferences
- *******************************************************************************/
-package org.eclipse.jst.j2ee.internal;
-
-import java.lang.reflect.InvocationTargetException;
-import java.util.ArrayList;
-import java.util.Iterator;
-import java.util.List;
-
-import org.eclipse.core.resources.IProject;
-import org.eclipse.core.runtime.CoreException;
-import org.eclipse.core.runtime.IPath;
-import org.eclipse.core.runtime.IProgressMonitor;
-import org.eclipse.core.runtime.NullProgressMonitor;
-import org.eclipse.core.runtime.Path;
-import org.eclipse.core.runtime.SubProgressMonitor;
-import org.eclipse.emf.common.util.URI;
-import org.eclipse.jdt.core.JavaCore;
-import org.eclipse.jdt.ui.wizards.BuildPathDialogAccess;
-import org.eclipse.jface.dialogs.Dialog;
-import org.eclipse.jface.dialogs.MessageDialog;
-import org.eclipse.jface.dialogs.ProgressMonitorDialog;
-import org.eclipse.jst.j2ee.application.internal.operations.ClasspathElement;
-import org.eclipse.jst.j2ee.internal.common.ClasspathModel;
-import org.eclipse.jst.j2ee.internal.plugin.J2EEPlugin;
-import org.eclipse.jst.j2ee.internal.plugin.J2EEUIPlugin;
-import org.eclipse.jst.j2ee.project.JavaEEProjectUtilities;
-import org.eclipse.swt.SWT;
-import org.eclipse.swt.layout.GridData;
-import org.eclipse.swt.layout.GridLayout;
-import org.eclipse.swt.widgets.Composite;
-import org.eclipse.swt.widgets.Label;
-import org.eclipse.swt.widgets.Text;
-import org.eclipse.wst.common.componentcore.ComponentCore;
-import org.eclipse.wst.common.componentcore.internal.impl.ModuleURIUtil;
-import org.eclipse.wst.common.componentcore.internal.resources.VirtualArchiveComponent;
-import org.eclipse.wst.common.componentcore.internal.util.IModuleConstants;
-import org.eclipse.wst.common.componentcore.resources.IVirtualComponent;
-import org.eclipse.wst.common.componentcore.resources.IVirtualReference;
-import org.eclipse.wst.common.frameworks.internal.ui.WorkspaceModifyComposedOperation;
-import org.eclipse.wst.common.project.facet.core.IFacetedProject;
-import org.eclipse.wst.common.project.facet.core.IProjectFacetVersion;
-import org.eclipse.wst.common.project.facet.core.ProjectFacetsManager;
-import org.eclipse.wst.common.project.facet.core.runtime.IRuntime;
-
-/**
- * @deprecated wtp 3.2
- */
-public class WebLibDependencyPropertiesPage extends JARDependencyPropertiesPage {
-
- public WebLibDependencyPropertiesPage(final IProject project, final J2EEDependenciesPage page) {
- super(project, page);
- }
-
- @Override
- protected ClasspathModel createClasspathModel() {
- return new ClasspathModel(null, true);
- }
-
- @Override
- public Composite createContents(Composite parent) {
- initialize();
- Composite composite = createBasicComposite(parent);
- if (model.getComponent() != null) {
- if (!isValidWebModule())
- return composite;
- J2EEDependenciesPage.createDescriptionComposite(composite, ManifestUIResourceHandler.Web_Libraries_Desc);
- // createProjectLabelsGroup(composite);
- createListGroup(composite);
- handleWLPSupport();
- setEnablement();
- }
- Dialog.applyDialogFont(parent);
- postCreateContents();
- return composite;
- }
-
- @Override
- protected void createProjectLabelsGroup(Composite parent) {
-
- Composite labelsGroup = new Composite(parent, SWT.NONE);
- GridLayout layout = new GridLayout();
- layout.numColumns = 2;
- labelsGroup.setLayout(layout);
- labelsGroup.setLayoutData(new GridData(GridData.FILL_HORIZONTAL));
-
- Label label = new Label(labelsGroup, SWT.NONE);
- label.setText(ManifestUIResourceHandler.Project_name__UI_);
-
- componentNameText = new Text(labelsGroup, SWT.BORDER);
- GridData data = new GridData(GridData.FILL_HORIZONTAL);
- componentNameText.setEditable(false);
- componentNameText.setLayoutData(data);
- componentNameText.setText(project.getName());
- }
-
- @Override
- protected void createListGroup(Composite parent) {
- Composite listGroup = new Composite(parent, SWT.NONE);
- GridLayout layout = new GridLayout();
- layout.numColumns = 1;
- layout.marginWidth = 0;
- layout.marginHeight = 0;
- listGroup.setLayout(layout);
- GridData gData = new GridData(GridData.FILL_BOTH);
- gData.horizontalIndent = 5;
- listGroup.setLayoutData(gData);
-
- availableDependentJars = new Label(listGroup, SWT.NONE);
- gData = new GridData(GridData.HORIZONTAL_ALIGN_FILL | GridData.VERTICAL_ALIGN_FILL);
- availableDependentJars.setText(ManifestUIResourceHandler.Available_dependent_JARs__UI_);
- availableDependentJars.setLayoutData(gData);
- createTableComposite(listGroup);
- }
-
- @Override
- protected void createTableComposite(Composite parent) {
- Composite composite = new Composite(parent, SWT.NONE);
- GridData gData = new GridData(GridData.FILL_BOTH);
- composite.setLayoutData(gData);
- tableManager = new ClasspathTableManager(this, model, validateEditListener);
- tableManager.fillWLPComposite(composite);
- }
-
- protected boolean isValidWebModule() {
- if (!JavaEEProjectUtilities.isDynamicWebProject(project)) {
- propPage.setErrorMessage(ManifestUIResourceHandler.Web_Lib_Error);
- return false;
- }
- return true;
- }
- private boolean equals(final Object obj1, final Object obj2) {
- if (obj1 == obj2) {
- return true;
- } else if (obj1 == null || obj2 == null) {
- return false;
- } else {
- return obj1.equals(obj2);
- }
- }
-
- protected void setEnablement() {
- if (tableManager.availableJARsViewer.getTable().getItems().length == 0) {
- tableManager.selectAllButton.setEnabled(false);
- tableManager.deselectAllButton.setEnabled(false);
- } else {
- tableManager.selectAllButton.setEnabled(true);
- tableManager.deselectAllButton.setEnabled(true);
- }
- }
- private IProgressMonitor submon(final IProgressMonitor parent, final int ticks) {
- return (parent == null ? null : new SubProgressMonitor(parent, ticks));
- }
-
- private void handleWLPSupport() {
- availableDependentJars.setText(ManifestUIResourceHandler.WEB_LIB_LIST_DESCRIPTION);
- tableManager.refresh();
- }
-
- @Override
- protected void handleClasspathChange() {
- model.resetClassPathSelectionForWLPs();
- super.handleClasspathChange();
- setEnablement();
- }
-
- @Override
- public boolean performOk() {
- if (model.getComponent() == null || !isValidWebModule()) {
- return true;
- }
- if (!isDirty) {
- return true;
- }
- try {
- IProject[] javaProjects = getJavaProjectsWithoutFacets();
- boolean createdFlexProjects = runWLPOp(createFlexProjectOperations());
-
- boolean createdComponentDependency = false;
- if (createdFlexProjects) {
- addTargetRuntimesToNewJavaProjects(javaProjects,new NullProgressMonitor());
- createdComponentDependency = runWLPOp(createComponentDependencyOperations());
- isDirty = false;
- }
- // treat as a classpath change for refresh purposes
- // XXX this refresh is not working - suspect it is because the virtual component dependencies are
- // not consistently being recomputed
- //handleClasspathChange();
- return createdComponentDependency;
- } finally {
- model.dispose();
- }
- }
-
- private IProject[] getJavaProjectsWithoutFacets() {
- List projectsList = new ArrayList();
- Object[] elements = tableManager.availableJARsViewer.getCheckedElements();
- for (int i = 0; i < elements.length; i++) {
- ClasspathElement element = (ClasspathElement) elements[i];
- IProject elementProject = element.getProject();
- try {
- if (elementProject != null && !elementProject.hasNature(IModuleConstants.MODULE_NATURE_ID))
- projectsList.add(elementProject);
- } catch (CoreException e) {
- J2EEPlugin.logError(e);
- }
- }
- return (IProject[])projectsList.toArray(new IProject[projectsList.size()]);
- }
-
- private boolean runWLPOp(WorkspaceModifyComposedOperation composed) {
- try {
- if (composed != null)
- new ProgressMonitorDialog(propPage.getShell()).run(true, true, composed);
- } catch (InvocationTargetException ex) {
- if (ex.getCause() != null) {
- J2EEUIPlugin.logError(ex.getCause());
- }
- String title = ManifestUIResourceHandler.An_internal_error_occurred_ERROR_;
- String msg = title;
- if (ex.getTargetException() != null && ex.getTargetException().getMessage() != null)
- msg = ex.getTargetException().getMessage();
- MessageDialog.openError(propPage.getShell(), title, msg);
- J2EEUIPlugin.logError(ex);
- return false;
- } catch (InterruptedException e) {
- // cancelled
- return false;
- }
- return true;
- }
-
- private void addTargetRuntimesToNewJavaProjects(IProject[] javaProjects, final IProgressMonitor monitor )
-
- {
- if (monitor != null) {
- monitor.beginTask("", 1); //$NON-NLS-1$
- }
- IProject targetProject = project;
- for (int i = 0; i < javaProjects.length; i++) {
- IProject moduleProject = javaProjects[i];
-
- try {
- final IFacetedProject targetFacetedProject = ProjectFacetsManager.create(targetProject);
-
- final IRuntime targetRuntime = targetFacetedProject.getRuntime();
-
- final IFacetedProject moduleFacetedProject = ProjectFacetsManager.create(moduleProject);
-
- if (moduleFacetedProject != null && !equals(targetRuntime, moduleFacetedProject.getRuntime())) {
- boolean supports = true;
-
- if (targetRuntime != null) {
- for (Iterator itr = moduleFacetedProject.getProjectFacets().iterator(); itr.hasNext();) {
- final IProjectFacetVersion fver = (IProjectFacetVersion) itr.next();
-
- if (!targetRuntime.supports(fver)) {
- supports = false;
- break;
- }
- }
- }
-
- if (supports) {
- moduleFacetedProject.setRuntime(targetRuntime, submon(monitor, 1));
- }
- }
- } catch(CoreException ex) {
- J2EEPlugin.logError(ex);
- } finally {
- if (monitor != null) {
- monitor.done();
- }
- }
- }
- }
-
- private void createRef(String aComponentName){
- IVirtualComponent archive = ComponentCore.createArchiveComponent(model.getComponent().getProject(), aComponentName);
-
- // To do: check if archive component already exists
- IVirtualReference ref = ComponentCore.createReference(model.getComponent(), archive, new Path("/WEB-INF/lib")); //$NON-NLS-1$
- model.getComponent().addReferences(new IVirtualReference [] { ref });
-
- ClasspathElement element = createClassPathElement(archive, archive.getName());
-// ClassPathSelection selection = createClassPathSelectionForExternalJar(element);
- model.getClassPathSelectionForWLPs().getClasspathElements().add(element);
- }
-
- public void handleSelectExternalJarButton() {
- if (JavaEEProjectUtilities.isDynamicWebProject(project)) {
- IPath[] selected = BuildPathDialogAccess.chooseExternalJAREntries(propPage.getShell());
- if (selected != null) {
- String type = VirtualArchiveComponent.LIBARCHIVETYPE + IPath.SEPARATOR;
- for (int i = 0; i < selected.length; i++) {
- createRef(type + selected[i].toString());
- }
- refresh();
- }
- }
- }
-
- public void handleSelectVariableButton() {
- if (JavaEEProjectUtilities.isDynamicWebProject(project)) {
- IPath existingPath[] = new Path[0];
- IPath[] selected = BuildPathDialogAccess.chooseVariableEntries(propPage.getShell(), existingPath);
-
- if (selected != null) {
- String type = VirtualArchiveComponent.VARARCHIVETYPE + IPath.SEPARATOR;
- for (int i = 0; i < selected.length; i++) {
- IPath resolvedPath = JavaCore.getResolvedVariablePath(selected[i]);
- java.io.File file = new java.io.File(resolvedPath.toOSString());
- if (file.isFile() && file.exists()) {
- createRef(type + selected[i].toString());
- } else {
- // display error
- }
- }
- refresh();
- }
- }
- }
-
- private ClasspathElement createClassPathElement(IVirtualComponent archiveComp, String unresolvedName) {
-
- URI uri = URI.createURI(ModuleURIUtil.getHandleString(archiveComp));
- ClasspathElement element = new ClasspathElement(uri);
- element.setValid(false);
- element.setSelected(true);
- element.setRelativeText(unresolvedName);
- element.setText(unresolvedName);
- element.setEarProject(null);
- return element;
- }
-
-// private ClassPathSelection createClassPathSelectionForExternalJar(ClasspathElement element) {
-// ClassPathSelection selection = new ClassPathSelection();
-// selection.getClasspathElements().add(element);
-// return selection;
-// }
-
-// private ClassPathSelection createClassPathSelectionForProjectJar(ClasspathElement element) {
-// ClassPathSelection selection = new ClassPathSelection();
-// selection.getClasspathElements().add(element);
-// return selection;
-// }
-
- public void handleSelectProjectJarButton() {
- if (JavaEEProjectUtilities.isDynamicWebProject(project)) {
- IPath[] selected = BuildPathDialogAccess.chooseJAREntries(propPage.getShell(), project.getLocation(), new IPath[0]);
- if (selected != null) {
- String type = VirtualArchiveComponent.LIBARCHIVETYPE + IPath.SEPARATOR;
- for (int i = 0; i < selected.length; i++) {
- createRef(type + selected[i].makeRelative().toString());
- }
- refresh();
- }
- }
-
- }
-}
diff --git a/plugins/org.eclipse.jst.j2ee.ui/j2ee_ui/org/eclipse/jst/j2ee/internal/WebRefDependencyPropertiesPage.java b/plugins/org.eclipse.jst.j2ee.ui/j2ee_ui/org/eclipse/jst/j2ee/internal/WebRefDependencyPropertiesPage.java
deleted file mode 100644
index 09187b2..0000000
--- a/plugins/org.eclipse.jst.j2ee.ui/j2ee_ui/org/eclipse/jst/j2ee/internal/WebRefDependencyPropertiesPage.java
+++ /dev/null
@@ -1,105 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2005, 2007 IBM Corporation and BEA Systems, Inc.
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
- *
- * Contributors:
- * rfrost@bea.com - derived from WebLibDependencyPropertiesPage for projects referenced just from a dynamic web project.
- *******************************************************************************/
-package org.eclipse.jst.j2ee.internal;
-
-import org.eclipse.core.resources.IProject;
-import org.eclipse.core.runtime.CoreException;
-import org.eclipse.jdt.core.JavaCore;
-import org.eclipse.jface.dialogs.Dialog;
-import org.eclipse.jst.j2ee.internal.project.J2EEProjectUtilities;
-import org.eclipse.jst.j2ee.project.JavaEEProjectUtilities;
-import org.eclipse.swt.SWT;
-import org.eclipse.swt.layout.GridData;
-import org.eclipse.swt.widgets.Composite;
-
-/**
- * Supports UI manipulation of the published/exported classpath entries for projects referenced by dynamic web projects.
- * @deprecated wtp 3.2
- */
-public class WebRefDependencyPropertiesPage extends JARDependencyPropertiesPage {
-
- public WebRefDependencyPropertiesPage(final IProject project, final J2EEDependenciesPage page) {
- super(project, page);
- }
-
- @Override
- public Composite createContents(Composite parent) {
- initialize();
- Composite composite = createBasicComposite(parent);
- if (model.getComponent() != null) {
- if (!isValidComponent()) {
- return composite;
- }
- J2EEDependenciesPage.createDescriptionComposite(composite, ManifestUIResourceHandler.Web_Ref_Desc);
- createListGroup(composite);
- tableManager.refresh();
- setEnablement();
- }
- Dialog.applyDialogFont(parent);
- postCreateContents();
- return composite;
- }
-
- @Override
- protected void createTableComposite(Composite parent) {
- Composite composite = new Composite(parent, SWT.NONE);
- GridData gData = new GridData(GridData.FILL_BOTH);
- composite.setLayoutData(gData);
- tableManager = new ClasspathTableManager(this, model, validateEditListener);
- tableManager.setReadOnly(isReadOnly());
- tableManager.fillWebRefComposite(composite);
- }
-
- @Override
- protected boolean isValidComponent() {
- // must have the Java nature and cannot be a dynamic web project
- boolean isJavaProject = false;
- try {
- isJavaProject = project.hasNature(JavaCore.NATURE_ID);
- } catch (CoreException ce) {}
- if (JavaEEProjectUtilities.isDynamicWebProject(project) || !isJavaProject) {
- propPage.setErrorMessage(ManifestUIResourceHandler.Dynamic_Web_Error);
- return false;
- } else if (J2EEProjectUtilities.getReferencingWebProjects(project).length == 0) {
- propPage.setErrorMessage(ManifestUIResourceHandler.No_Web_Reference_Error);
- return false;
- }
- return true;
- }
-
- protected void setEnablement() {
- if (tableManager.availableJARsViewer.getTable().getItems().length == 0) {
- tableManager.selectAllButton.setEnabled(false);
- tableManager.deselectAllButton.setEnabled(false);
- } else {
- tableManager.selectAllButton.setEnabled(true);
- tableManager.deselectAllButton.setEnabled(true);
- }
- }
-
- @Override
- protected void handleClasspathChange() {
- super.handleClasspathChange();
- setEnablement();
- }
-
- @Override
- public boolean performOk() {
- if (model.getComponent() == null || !isValidComponent()) {
- return true;
- }
- if (!isDirty) {
- return true;
- }
- return super.performOk();
- }
-
-}
diff --git a/plugins/org.eclipse.jst.j2ee.ui/j2ee_ui/org/eclipse/jst/j2ee/internal/WorkspaceModifyComposedOperation.java b/plugins/org.eclipse.jst.j2ee.ui/j2ee_ui/org/eclipse/jst/j2ee/internal/WorkspaceModifyComposedOperation.java
deleted file mode 100644
index 93fc4b0..0000000
--- a/plugins/org.eclipse.jst.j2ee.ui/j2ee_ui/org/eclipse/jst/j2ee/internal/WorkspaceModifyComposedOperation.java
+++ /dev/null
@@ -1,47 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2005 IBM Corporation and others.
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
- *
- * Contributors:
- * IBM Corporation - initial API and implementation
- *******************************************************************************/
-/*
- * Created on Jan 17, 2005
- */
-package org.eclipse.jst.j2ee.internal;
-
-import java.util.List;
-
-import org.eclipse.core.runtime.jobs.ISchedulingRule;
-import org.eclipse.jface.operation.IRunnableWithProgress;
-
-/**
- * WARNING: This class will be deleted
- *
- * @deprecated use {@link org.eclipse.wst.common.frameworks.internal.ui.WorkspaceModifyComposedOperation}
- */
-public class WorkspaceModifyComposedOperation extends org.eclipse.wst.common.frameworks.internal.ui.WorkspaceModifyComposedOperation {
- public WorkspaceModifyComposedOperation(ISchedulingRule rule) {
- super(rule);
- }
-
- public WorkspaceModifyComposedOperation() {
- super();
- }
-
- public WorkspaceModifyComposedOperation(ISchedulingRule rule, List nestedRunnablesWithProgress) {
- super(rule, nestedRunnablesWithProgress);
- }
-
- public WorkspaceModifyComposedOperation(List nestedRunnablesWithProgress) {
- super(nestedRunnablesWithProgress);
- }
-
- public WorkspaceModifyComposedOperation(IRunnableWithProgress nestedOp) {
- super(nestedOp);
- }
-
-}
\ No newline at end of file
diff --git a/plugins/org.eclipse.jst.j2ee.ui/j2ee_ui/org/eclipse/jst/j2ee/internal/actions/AbstractActionDelegate.java b/plugins/org.eclipse.jst.j2ee.ui/j2ee_ui/org/eclipse/jst/j2ee/internal/actions/AbstractActionDelegate.java
deleted file mode 100644
index 9d9a71e..0000000
--- a/plugins/org.eclipse.jst.j2ee.ui/j2ee_ui/org/eclipse/jst/j2ee/internal/actions/AbstractActionDelegate.java
+++ /dev/null
@@ -1,225 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2003, 2005 IBM Corporation and others.
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
- *
- * Contributors:
- * IBM Corporation - initial API and implementation
- *******************************************************************************/
-package org.eclipse.jst.j2ee.internal.actions;
-
-
-
-import java.util.ArrayList;
-import java.util.Collections;
-import java.util.Iterator;
-import java.util.List;
-
-import org.eclipse.core.resources.IProject;
-import org.eclipse.core.runtime.IAdaptable;
-import org.eclipse.emf.ecore.EObject;
-import org.eclipse.jem.util.emf.workbench.ProjectUtilities;
-import org.eclipse.jface.action.IAction;
-import org.eclipse.jface.dialogs.MessageDialog;
-import org.eclipse.jface.viewers.ISelection;
-import org.eclipse.jface.viewers.IStructuredSelection;
-import org.eclipse.jst.j2ee.internal.plugin.J2EEUIMessages;
-import org.eclipse.jst.j2ee.internal.plugin.J2EEUIPlugin;
-import org.eclipse.swt.widgets.Shell;
-import org.eclipse.ui.IWorkbenchWindow;
-
-
-public abstract class AbstractActionDelegate implements org.eclipse.ui.IActionDelegate {
- protected ISelection selection;
- protected boolean allowsMultiSelect = false;
- public static final Class IPROJECT_CLASS = IProject.class;
- private final static String ERROR_OCCURRED_TITLE = J2EEUIMessages.getResourceString("ERROR_OCCURRED_TITLE"); //$NON-NLS-1$
- private final static String ERROR_OCCURRED_MESSAGE = J2EEUIMessages.getResourceString("ERROR_OCCURRED_MESSAGE"); //$NON-NLS-1$
-
- /**
- * EditModuleDependencyAction constructor comment.
- */
- public AbstractActionDelegate() {
- super();
- }
-
- /**
- * Applicable only when this action does not allow multi select
- */
- protected IProject getProject() {
- return getProject(getSelectedElement());
- }
-
- protected List getProjects() {
- if ((selection == null) || !(selection instanceof IStructuredSelection))
- return Collections.EMPTY_LIST;
-
- List result = new ArrayList();
- IStructuredSelection struct = (IStructuredSelection) selection;
- Iterator it = struct.iterator();
- while (it.hasNext()) {
- IProject p = getProject(it.next());
- if (p != null)
- result.add(p);
- }
- return result;
- }
-
- protected IProject getProject(Object element) {
-
- if (isSupportedAction(element))
- return ProjectUtilities.getProject((EObject) element);
- else if (element instanceof IAdaptable)
- return (IProject) ((IAdaptable) element).getAdapter(IPROJECT_CLASS);
- else
- return null;
- }
-
- protected IStructuredSelection getStructuredSelection() {
- if ((selection == null) || !(selection instanceof IStructuredSelection))
- return null;
- else if (selection.isEmpty()) {
- selection = J2EEUIPlugin.getCurrentSelection();
- }
- return (IStructuredSelection) selection;
- }
-
- /*
- * Only return if there is exactly one item selected
- */
- protected Object getSelectedElement() {
- IStructuredSelection sel = getStructuredSelection();
- return sel == null ? null : sel.getFirstElement();
- }
-
- protected IWorkbenchWindow getWorkbenchWindow() {
- return J2EEUIPlugin.getActiveWorkbenchWindow();
- }
-
- /**
- * Can the receiver be executed for
- *
- * @element
- */
- protected abstract boolean isSupportedAction(Object element);
-
- /**
- * @deprecated use {@link #primRun(Shell)}
- */
- protected void primRun(IProject project, Shell shell) {
- //Deprecated
- }
-
- /**
- * Subclasses should override this instead of {@link #run(org.eclipse.jface.action.IAction)}
- */
- protected void primRun(Shell shell) {
- primRun(getProject(), shell);
- }
-
- /**
- * Performs this action.
- * <p>
- * This method is called when the delegating action has been triggered. Implement this method to
- * do the actual work.
- * </p>
- *
- * @param action
- * the action proxy that handles the presentation portion of the action
- */
- public void run(org.eclipse.jface.action.IAction action) {
-
- Shell shell = getWorkbenchWindow().getShell();
- setActionStateFromProjects(action);
- if (!action.isEnabled())
- MessageDialog.openInformation(shell, J2EEUIMessages.getResourceString("INFORMATION_UI_"), J2EEUIMessages.getResourceString("CHOSEN_OP_NOT_AVAILABLE")); //$NON-NLS-2$ = "The chosen operation is not currently available." //$NON-NLS-1$ = "Information"
- else {
- try {
- primRun(shell);
- } catch (Throwable t) {
- org.eclipse.jst.j2ee.internal.plugin.ErrorDialog.openError(shell, ERROR_OCCURRED_TITLE, ERROR_OCCURRED_MESSAGE, t, 0, false);
- }
- }
-
-
- }
-
- /**
- * Notifies this action delegate that the selection in the workbench has changed.
- * <p>
- * Implementers can use this opportunity to change the availability of the action or to modify
- * other presentation properties.
- * </p>
- *
- * @param action
- * the action proxy that handles presentation portion of the action
- * @param aSelection
- * the current selection in the workbench
- */
- public void selectionChanged(org.eclipse.jface.action.IAction action, org.eclipse.jface.viewers.ISelection aSelection) {
- this.selection = aSelection;
- setActionState(action);
- }
-
- protected void setActionState(IAction action) {
- if (allowsMultiSelect)
- setActionStateForMultiSelect(action);
- else
- setActionStateForSingleSelect(action);
- }
-
- protected void setActionStateForSingleSelect(IAction action) {
- IStructuredSelection sel = getStructuredSelection();
- if (sel == null || sel.size() != 1) {
- action.setEnabled(false);
- return;
- }
- setActionStateFromProjects(action);
- }
-
- protected void setActionStateForMultiSelect(IAction action) {
- setActionStateFromProjects(action);
- }
-
- protected void setActionStateFromProjects(IAction action) {
- IStructuredSelection sel = getStructuredSelection();
- boolean allOk = false;
- if (sel != null && !sel.isEmpty()) {
- allOk = true;
- Iterator it = sel.iterator();
- while (it.hasNext()) {
- Object o = it.next();
- IProject project = getProject(o);
- if (project == null || !project.isOpen()) {
- allOk = false;
- break;
- }
- }
- }
- action.setEnabled(allOk);
- }
-
- /**
- * Returns the allowsMultiSelect.
- *
- * @return boolean
- */
- public boolean allowsMultiSelect() {
- return allowsMultiSelect;
- }
-
-
- /**
- * Sets the allowsMultiSelect.
- *
- * @param allowsMultiSelect
- * The allowsMultiSelect to set
- */
- public void setAllowsMultiSelect(boolean allowsMultiSelect) {
- this.allowsMultiSelect = allowsMultiSelect;
- }
-
-
-}
diff --git a/plugins/org.eclipse.jst.j2ee.ui/j2ee_ui/org/eclipse/jst/j2ee/internal/actions/AbstractActionWithDelegate.java b/plugins/org.eclipse.jst.j2ee.ui/j2ee_ui/org/eclipse/jst/j2ee/internal/actions/AbstractActionWithDelegate.java
deleted file mode 100644
index b55aeab..0000000
--- a/plugins/org.eclipse.jst.j2ee.ui/j2ee_ui/org/eclipse/jst/j2ee/internal/actions/AbstractActionWithDelegate.java
+++ /dev/null
@@ -1,71 +0,0 @@
-/***************************************************************************************************
- * Copyright (c) 2003, 2004 IBM Corporation and others. All rights reserved. This program and the
- * accompanying materials are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
- *
- * Contributors: IBM Corporation - initial API and implementation
- **************************************************************************************************/
-package org.eclipse.jst.j2ee.internal.actions;
-
-
-
-import org.eclipse.jface.viewers.IStructuredSelection;
-import org.eclipse.ui.IActionDelegate;
-
-
-public abstract class AbstractActionWithDelegate extends org.eclipse.ui.actions.SelectionListenerAction {
- protected IActionDelegate delegate;
-
- /**
- * EditModuleDependencyAction constructor comment.
- *
- * @param text
- * java.lang.String
- */
- public AbstractActionWithDelegate() {
- super("");//$NON-NLS-1$
- initLabel();
- initDelegate();
- }
-
- protected abstract IActionDelegate createDelegate();
-
- protected abstract String getLabel();
-
- protected void initDelegate() {
- delegate = createDelegate();
- }
-
- protected void initLabel() {
- setText(getLabel());
- }
-
- /**
- * Implementation of method defined on <code>IAction</code>.
- */
- @Override
- public void run() {
- delegate.run(this);
- }
-
- /**
- * Updates this action in response to the given selection.
- * <p>
- * The <code>SelectionListenerAction</code> implementation of this method returns
- * <code>true</code>. Subclasses may extend to react to selection changes; however, if the
- * super method returns <code>false</code>, the overriding method must also return
- * <code>false</code>.
- * </p>
- *
- * @param selection
- * the new selection
- * @return <code>true</code> if the action should be enabled for this selection, and
- * <code>false</code> otherwise
- */
- @Override
- protected boolean updateSelection(IStructuredSelection selection) {
- delegate.selectionChanged(this, selection);
- return this.isEnabled();
- }
-}
\ No newline at end of file
diff --git a/plugins/org.eclipse.jst.j2ee.ui/j2ee_ui/org/eclipse/jst/j2ee/internal/actions/AbstractOpenAction.java b/plugins/org.eclipse.jst.j2ee.ui/j2ee_ui/org/eclipse/jst/j2ee/internal/actions/AbstractOpenAction.java
deleted file mode 100644
index 7d11ac6..0000000
--- a/plugins/org.eclipse.jst.j2ee.ui/j2ee_ui/org/eclipse/jst/j2ee/internal/actions/AbstractOpenAction.java
+++ /dev/null
@@ -1,122 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2003, 2006 IBM Corporation and others.
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
- *
- * Contributors:
- * IBM Corporation - initial API and implementation
- *******************************************************************************/
-package org.eclipse.jst.j2ee.internal.actions;
-
-
-import org.eclipse.jface.action.IAction;
-import org.eclipse.jface.viewers.ISelection;
-import org.eclipse.jface.viewers.IStructuredSelection;
-import org.eclipse.swt.widgets.Event;
-import org.eclipse.ui.IActionDelegate2;
-import org.eclipse.ui.IEditorDescriptor;
-import org.eclipse.ui.IEditorRegistry;
-import org.eclipse.ui.PlatformUI;
-import org.eclipse.ui.actions.SelectionListenerAction;
-
-/**
- * Action for opening a J2EE resource from the J2EE navigator.
- */
-public abstract class AbstractOpenAction extends SelectionListenerAction implements IActionDelegate2 {
- // //$NON-NLS-1$
- protected IEditorDescriptor currentDescriptor;
- protected Object srcObject;
-
- protected AbstractOpenAction(String text) {
- super(text);
- }
-
- protected static IEditorDescriptor findEditorDescriptor(String id) {
- IEditorRegistry registry = PlatformUI.getWorkbench().getEditorRegistry();
- return registry.findEditor(id);
- }
-
- protected void setAttributesFromDescriptor() {
- if (currentDescriptor == null)
- return;
- //setText(currentDescriptor.getLabel());
- setToolTipText(currentDescriptor.getLabel());
- //setImageDescriptor(currentDescriptor.getImageDescriptor());
- }
-
- /**
- * The structured selection has changed in the workbench. Subclasses should override this method
- * to react to the change. Returns true if the action should be enabled for this selection, and
- * false otherwise.
- *
- * When this method is overridden, the super method must always be invoked. If the super method
- * returns false, this method must also return false.
- *
- * @param sel
- * the new structured selection
- */
- @Override
- public boolean updateSelection(IStructuredSelection s) {
- srcObject = null;
- if (!super.updateSelection(s))
- return false;
-
- if (s.size() != 1)
- return false;
-
- return true;
- }
-
- /*
- * (non-Javadoc)
- *
- * @see org.eclipse.ui.IActionDelegate2#dispose()
- */
- public void dispose() {
- //Dispose
- }
-
- /*
- * (non-Javadoc)
- *
- * @see org.eclipse.ui.IActionDelegate2#init(org.eclipse.jface.action.IAction)
- */
- public void init(IAction action) {
- //init
- }
-
- /*
- * (non-Javadoc)
- *
- * @see org.eclipse.ui.IActionDelegate2#runWithEvent(org.eclipse.jface.action.IAction,
- * org.eclipse.swt.widgets.Event)
- */
- public void runWithEvent(IAction action, Event event) {
- runWithEvent(event);
-
- }
-
- /*
- * (non-Javadoc)
- *
- * @see org.eclipse.ui.IActionDelegate#run(org.eclipse.jface.action.IAction)
- */
- public void run(IAction action) {
- run();
-
- }
-
- /*
- * (non-Javadoc)
- *
- * @see org.eclipse.ui.IActionDelegate#selectionChanged(org.eclipse.jface.action.IAction,
- * org.eclipse.jface.viewers.ISelection)
- */
- public void selectionChanged(IAction action, ISelection selection) {
- // TODO HACK!
- updateSelection((IStructuredSelection) selection);
- }
-
-}
diff --git a/plugins/org.eclipse.jst.j2ee.ui/j2ee_ui/org/eclipse/jst/j2ee/internal/actions/AbstractOpenWizardAction.java b/plugins/org.eclipse.jst.j2ee.ui/j2ee_ui/org/eclipse/jst/j2ee/internal/actions/AbstractOpenWizardAction.java
deleted file mode 100644
index 071b593..0000000
--- a/plugins/org.eclipse.jst.j2ee.ui/j2ee_ui/org/eclipse/jst/j2ee/internal/actions/AbstractOpenWizardAction.java
+++ /dev/null
@@ -1,148 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2003, 2005 IBM Corporation and others.
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
- *
- * Contributors:
- * IBM Corporation - initial API and implementation
- *******************************************************************************/
-package org.eclipse.jst.j2ee.internal.actions;
-
-
-import java.util.Iterator;
-
-import org.eclipse.jface.viewers.ISelection;
-import org.eclipse.jface.viewers.IStructuredSelection;
-import org.eclipse.jface.viewers.StructuredSelection;
-import org.eclipse.jface.wizard.Wizard;
-import org.eclipse.jface.wizard.WizardDialog;
-import org.eclipse.jst.j2ee.internal.plugin.J2EEUIMessages;
-import org.eclipse.jst.j2ee.internal.plugin.J2EEUIPlugin;
-import org.eclipse.ui.IWorkbench;
-import org.eclipse.ui.IWorkbenchWindow;
-import org.eclipse.ui.IWorkbenchWizard;
-import org.eclipse.ui.activities.WorkbenchActivityHelper;
-
-
-public abstract class AbstractOpenWizardAction extends org.eclipse.jface.action.Action {
- // //$NON-NLS-1$
-
- private IWorkbench fWorkbench;
-
- private Class[] fActivatedOnTypes;
-
- private boolean fAcceptEmptySelection;
-
- protected AbstractOpenWizardAction() {
- //Default constructor
- }
-
- public AbstractOpenWizardAction(IWorkbench workbench, String label, Class[] activatedOnTypes, boolean acceptEmptySelection) {
- super(label);
- fWorkbench = workbench;
- fActivatedOnTypes = activatedOnTypes;
- fAcceptEmptySelection = acceptEmptySelection;
- }
-
- public AbstractOpenWizardAction(IWorkbench workbench, String label, boolean acceptEmptySelection) {
- this(workbench, label, null, acceptEmptySelection);
- }
-
- public boolean canActionBeAdded() {
- ISelection selection = getCurrentSelection();
- if (selection == null || selection.isEmpty()) {
- return fAcceptEmptySelection;
- }
- if (fActivatedOnTypes != null) {
- if (selection instanceof IStructuredSelection) {
- return isEnabled(((IStructuredSelection) selection).iterator());
- }
- return false;
- }
- return true;
- }
-
- /**
- * Create the specific Wizard (to be implemented by a subclass)
- */
- abstract protected Wizard createWizard();
-
- protected IStructuredSelection getCurrentSelection() {
- IWorkbenchWindow window = J2EEUIPlugin.getDefault().getWorkbench().getActiveWorkbenchWindow();
- if (window != null) {
- ISelection selection = window.getSelectionService().getSelection();
- if (selection instanceof IStructuredSelection) {
- return (IStructuredSelection) selection;
- }
-
- }
- return null;
- }
-
- protected IWorkbench getWorkbench() {
- return fWorkbench;
- }
-
- private boolean isEnabled(Iterator iter) {
- while (iter.hasNext()) {
- Object obj = iter.next();
- if (!isOfAcceptedType(obj) || !shouldAcceptElement(obj)) {
- return false;
- }
- }
- return true;
- }
-
- private boolean isOfAcceptedType(Object obj) {
- for (int i = 0; i < fActivatedOnTypes.length; i++) {
- if (fActivatedOnTypes[i].isInstance(obj)) {
- return true;
- }
- }
- return false;
- }
-
- protected String getDialogText() {
- return J2EEUIMessages.getResourceString(J2EEUIMessages.NEW_LBL);
- }
-
- /**
- * The user has invoked this action.
- */
- @Override
- public void run() {
- Wizard wizard = createWizard();
- if (wizard instanceof IWorkbenchWizard) {
- IStructuredSelection sel = null;
- if (null != getCurrentSelection())
- sel = getCurrentSelection();
- else
- sel = new StructuredSelection();
- ((IWorkbenchWizard) wizard).init(J2EEUIPlugin.getDefault().getWorkbench(), sel);
- }
- if (WorkbenchActivityHelper.allowUseOf(null,wizard)) {
- IWorkbenchWindow window = J2EEUIPlugin.getDefault().getWorkbench().getActiveWorkbenchWindow();
- WizardDialog dialog = new WizardDialog(window.getShell(), wizard);
- dialog.create();
- String text = getDialogText();
- if (null != text) {
- dialog.getShell().setText(text);
- }
- dialog.open();
- }
- }
-
- protected void setWorkbench(IWorkbench workbench) {
- fWorkbench = workbench;
- }
-
- /**
- * can be overridden to add more checks obj is guaranteed to be instance of one of the accepted
- * types
- */
- protected boolean shouldAcceptElement(Object obj) {
- return true;
- }
-}
diff --git a/plugins/org.eclipse.jst.j2ee.ui/j2ee_ui/org/eclipse/jst/j2ee/internal/actions/AbstractOpenWizardWorkbenchAction.java b/plugins/org.eclipse.jst.j2ee.ui/j2ee_ui/org/eclipse/jst/j2ee/internal/actions/AbstractOpenWizardWorkbenchAction.java
deleted file mode 100644
index ccc42ae..0000000
--- a/plugins/org.eclipse.jst.j2ee.ui/j2ee_ui/org/eclipse/jst/j2ee/internal/actions/AbstractOpenWizardWorkbenchAction.java
+++ /dev/null
@@ -1,62 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2003, 2005 IBM Corporation and others.
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
- *
- * Contributors:
- * IBM Corporation - initial API and implementation
- *******************************************************************************/
-package org.eclipse.jst.j2ee.internal.actions;
-
-
-import org.eclipse.jface.action.IAction;
-import org.eclipse.jface.viewers.ISelection;
-import org.eclipse.ui.IActionDelegate;
-import org.eclipse.ui.IWorkbench;
-import org.eclipse.ui.IWorkbenchWindow;
-
-
-public abstract class AbstractOpenWizardWorkbenchAction extends AbstractOpenWizardAction implements org.eclipse.ui.IWorkbenchWindowActionDelegate {
- protected AbstractOpenWizardWorkbenchAction() {
- //Default
- }
-
- public AbstractOpenWizardWorkbenchAction(IWorkbench workbench, String label, Class[] activatedOnTypes, boolean acceptEmptySelection) {
- super(workbench, label, null, acceptEmptySelection);
- }
-
- public AbstractOpenWizardWorkbenchAction(IWorkbench workbench, String label, boolean acceptEmptySelection) {
- super(workbench, label, null, acceptEmptySelection);
- }
-
- /**
- * @see AbstractOpenWizardAction#dispose
- */
- public void dispose() {
- // do nothing.
- setWorkbench(null);
- }
-
- /**
- * @see AbstractOpenWizardAction#init
- */
- public void init(IWorkbenchWindow window) {
- setWorkbench(window.getWorkbench());
- }
-
- /**
- * @see IActionDelegate#run
- */
- public void run(IAction action) {
- run();
- }
-
- /**
- * @see IActionDelegate#selectionChanged
- */
- public void selectionChanged(IAction action, ISelection selection) {
- // do nothing. Action doesn't depend on selection.
- }
-}
diff --git a/plugins/org.eclipse.jst.j2ee.ui/j2ee_ui/org/eclipse/jst/j2ee/internal/actions/BaseAction.java b/plugins/org.eclipse.jst.j2ee.ui/j2ee_ui/org/eclipse/jst/j2ee/internal/actions/BaseAction.java
deleted file mode 100644
index 4a1ed7f..0000000
--- a/plugins/org.eclipse.jst.j2ee.ui/j2ee_ui/org/eclipse/jst/j2ee/internal/actions/BaseAction.java
+++ /dev/null
@@ -1,122 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2003, 2006 IBM Corporation and others.
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
- *
- * Contributors:
- * IBM Corporation - initial API and implementation
- *******************************************************************************/
-/*
- * Created on Mar 27, 2003
- *
- * To change this generated comment go to
- * Window>Preferences>Java>Code Generation>Code and Comments
- */
-package org.eclipse.jst.j2ee.internal.actions;
-
-import org.eclipse.jface.action.Action;
-import org.eclipse.jface.action.IAction;
-import org.eclipse.jface.viewers.ISelection;
-import org.eclipse.jface.viewers.IStructuredSelection;
-import org.eclipse.jst.j2ee.internal.plugin.ErrorDialog;
-import org.eclipse.jst.j2ee.internal.plugin.J2EEUIMessages;
-import org.eclipse.jst.j2ee.internal.plugin.J2EEUIPlugin;
-import org.eclipse.swt.widgets.Event;
-import org.eclipse.swt.widgets.Shell;
-import org.eclipse.ui.IActionDelegate;
-import org.eclipse.ui.IWorkbenchWindow;
-
-
-/**
- * @author jsholl
- *
- * To change this generated comment go to Window>Preferences>Java>Code Generation>Code and Comments
- */
-public abstract class BaseAction extends Action implements IActionDelegate {
-
- protected IStructuredSelection selection = null;
-
- protected IWorkbenchWindow getWorkbenchWindow() {
- return J2EEUIPlugin.getPluginWorkbench().getActiveWorkbenchWindow();
- }
-
- public void setSelection(IStructuredSelection selection) {
- this.selection = selection;
- }
-
- @Override
- public void run() {
- Shell shell = getWorkbenchWindow().getShell();
- if (null == selection) {
- ISelection autoselection = getWorkbenchWindow().getSelectionService().getSelection();
- if (autoselection instanceof IStructuredSelection)
- this.selection = (IStructuredSelection) autoselection;
- }
-
- try {
- primRun(shell);
- this.selection = null;
- } catch (Throwable t) {
- J2EEUIPlugin.logError(t);
- String ERROR_OCCURRED_TITLE = J2EEUIMessages.getResourceString("ERROR_OCCURRED_TITLE"); //$NON-NLS-1$
- String ERROR_OCCURRED_MESSAGE = J2EEUIMessages.getResourceString("ERROR_OCCURRED_MESSAGE"); //$NON-NLS-1$
- ErrorDialog.openError(shell, ERROR_OCCURRED_TITLE, ERROR_OCCURRED_MESSAGE, t, 0, false);
- }
-
- }
-
- protected abstract void primRun(Shell shell);
-
-
- /*
- * (non-Javadoc)
- *
- * @see org.eclipse.ui.IActionDelegate2#dispose()
- */
- public void dispose() {
- //dispose
- }
-
- /*
- * (non-Javadoc)
- *
- * @see org.eclipse.ui.IActionDelegate2#init(org.eclipse.jface.action.IAction)
- */
- public void init(IAction action) {
- //init
- }
-
-
- /*
- * (non-Javadoc)
- *
- * @see org.eclipse.ui.IActionDelegate#selectionChanged(org.eclipse.jface.action.IAction,
- * org.eclipse.jface.viewers.ISelection)
- */
- public void selectionChanged(IAction action, ISelection aSelection) {
- setSelection((IStructuredSelection) aSelection);
- }
-
- /*
- * (non-Javadoc)
- *
- * @see org.eclipse.ui.IActionDelegate2#runWithEvent(org.eclipse.jface.action.IAction,
- * org.eclipse.swt.widgets.Event)
- */
- public void runWithEvent(IAction action, Event event) {
- run();
-
- }
-
- /*
- * (non-Javadoc)
- *
- * @see org.eclipse.ui.IActionDelegate#run(org.eclipse.jface.action.IAction)
- */
- public void run(IAction action) {
- run();
- }
-
-}
diff --git a/plugins/org.eclipse.jst.j2ee.ui/j2ee_ui/org/eclipse/jst/j2ee/internal/actions/ComponentEditorInput.java b/plugins/org.eclipse.jst.j2ee.ui/j2ee_ui/org/eclipse/jst/j2ee/internal/actions/ComponentEditorInput.java
deleted file mode 100644
index 1f2bba9..0000000
--- a/plugins/org.eclipse.jst.j2ee.ui/j2ee_ui/org/eclipse/jst/j2ee/internal/actions/ComponentEditorInput.java
+++ /dev/null
@@ -1,54 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2003, 2006 IBM Corporation and others.
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
- *
- * Contributors:
- * IBM Corporation - initial API and implementation
- *******************************************************************************/
-package org.eclipse.jst.j2ee.internal.actions;
-
-import org.eclipse.jface.resource.ImageDescriptor;
-import org.eclipse.ui.IEditorInput;
-import org.eclipse.ui.IPersistableElement;
-import org.eclipse.wst.common.componentcore.resources.IVirtualComponent;
-
-public class ComponentEditorInput implements IEditorInput {
-
- private IVirtualComponent component;
-
- public ComponentEditorInput(IVirtualComponent component){
- this.component = component;
- }
-
- public boolean exists() {
- return component.exists();
- }
-
- public ImageDescriptor getImageDescriptor() {
- return null;
- }
-
- public String getName() {
- return component.getName();
- }
-
- public IPersistableElement getPersistable() {
- return null;
- }
-
- public String getToolTipText() {
- return ""; //$NON-NLS-1$
- }
-
- public Object getAdapter(Class adapter) {
- return null;
- }
-
- public IVirtualComponent getComponent(){
- return component;
- }
-
-}
diff --git a/plugins/org.eclipse.jst.j2ee.ui/j2ee_ui/org/eclipse/jst/j2ee/internal/actions/ForceClasspathUpdateAction.java b/plugins/org.eclipse.jst.j2ee.ui/j2ee_ui/org/eclipse/jst/j2ee/internal/actions/ForceClasspathUpdateAction.java
deleted file mode 100644
index 340756c..0000000
--- a/plugins/org.eclipse.jst.j2ee.ui/j2ee_ui/org/eclipse/jst/j2ee/internal/actions/ForceClasspathUpdateAction.java
+++ /dev/null
@@ -1,67 +0,0 @@
-/*******************************************************************************
- * Copyright (c)2006 IBM Corporation and others.
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
- *
- * Contributors:
- * IBM Corporation - initial API and implementation
- *******************************************************************************/
-package org.eclipse.jst.j2ee.internal.actions;
-
-import java.util.ArrayList;
-import java.util.Iterator;
-import java.util.List;
-
-import org.eclipse.core.resources.IProject;
-import org.eclipse.jface.action.Action;
-import org.eclipse.jface.action.IAction;
-import org.eclipse.jface.viewers.ISelection;
-import org.eclipse.jface.viewers.IStructuredSelection;
-import org.eclipse.jst.j2ee.internal.common.classpath.J2EEComponentClasspathUpdater;
-import org.eclipse.ui.IActionDelegate;
-
-public class ForceClasspathUpdateAction extends Action implements IActionDelegate{
-
- private List projectsList = new ArrayList();
-
- @Override
- public void run() {
- J2EEComponentClasspathUpdater.getInstance().forceUpdate(projectsList);
- }
-
- public void run(IAction action) {
- J2EEComponentClasspathUpdater.getInstance().forceUpdate(projectsList);
- }
-
- public void selectionChanged(IAction action, ISelection selection) {
- action.setEnabled(setSelection(selection));
- }
-
- private boolean setSelection(ISelection selection){
- projectsList.clear();
- if(selection != null && selection instanceof IStructuredSelection) {
- IStructuredSelection structuredSelection = (IStructuredSelection)selection;
- if (structuredSelection.size() > 0) {
- Iterator iterator = structuredSelection.iterator();
- while(iterator.hasNext()){
- Object next = iterator.next();
- if (next instanceof IProject) {
- projectsList.add(next);
- } else {
- projectsList.clear();
- return false;
- }
- }
- } else { // empty selection
- return false;
- }
- return true;
- }
- return false;
- }
-
-
-
-}
diff --git a/plugins/org.eclipse.jst.j2ee.ui/j2ee_ui/org/eclipse/jst/j2ee/internal/actions/IJ2EEUIContextIds.java b/plugins/org.eclipse.jst.j2ee.ui/j2ee_ui/org/eclipse/jst/j2ee/internal/actions/IJ2EEUIContextIds.java
deleted file mode 100644
index 71da360..0000000
--- a/plugins/org.eclipse.jst.j2ee.ui/j2ee_ui/org/eclipse/jst/j2ee/internal/actions/IJ2EEUIContextIds.java
+++ /dev/null
@@ -1,63 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2003, 2006 IBM Corporation and others.
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
- *
- * Contributors:
- * IBM Corporation - initial API and implementation
- *******************************************************************************/
-package org.eclipse.jst.j2ee.internal.actions;
-
-import org.eclipse.jst.j2ee.internal.plugin.J2EEUIPlugin;
-
-
-/**
- * Insert the type's description here. Creation date: (9/6/2001 12:23:02 PM)
- *
- * @author: Administrator
- */
-public interface IJ2EEUIContextIds {
- // New creation wizards
- public static final String NEW_EAR_WIZARD_P1 = J2EEUIPlugin.PLUGIN_ID + ".EAR_NEW_EAR_WIZARD_PAGE1"; //$NON-NLS-1$
- public static final String NEW_EAR_ADD_MODULES_PAGE = J2EEUIPlugin.PLUGIN_ID + ".NEW_EAR_ADD_MODULES_PAGE"; //$NON-NLS-1$
- public static final String NEW_EAR_COMP_PAGE = J2EEUIPlugin.PLUGIN_ID + ".NEW_EAR_COMP_PAGE"; //$NON-NLS-1$
- public static final String EAR_NEW_MODULE_PROJECTS_PAGE = J2EEUIPlugin.PLUGIN_ID + ".EAR_NEW_MODULE_PROJECTS_PAGE"; //$NON-NLS-1$
- public static final String NEW_APPCLIENT_WIZARD_P1 = J2EEUIPlugin.PLUGIN_ID + ".APPCLIENT_NEW_APPCLIENT_WIZARD_PAGE1"; //$NON-NLS-1$
- public static final String NEW_APPCLIENT_WIZARD_P3 = J2EEUIPlugin.PLUGIN_ID + ".APPCLIENT_NEW_APPCLIENT_WIZARD_PAGE3"; //$NON-NLS-1$
- public static final String NEW_EJB_WIZARD_P1 = J2EEUIPlugin.PLUGIN_ID + ".EJB_NEW_EJB_WIZARD_PAGE1"; //$NON-NLS-1$
- public static final String NEW_EJB_WIZARD_P2 = J2EEUIPlugin.PLUGIN_ID + ".EJB_NEW_EJB_WIZARD_PAGE2"; //$NON-NLS-1$
- public static final String NEW_EJB_WIZARD_P3 = J2EEUIPlugin.PLUGIN_ID + ".EJB_NEW_EJB_WIZARD_PAGE3"; //$NON-NLS-1$
- public static final String NEW_CONNECTOR_WIZARD_P1 = J2EEUIPlugin.PLUGIN_ID + ".JCA_NEWIZARD_PAGE1"; //$NON-NLS-1$
- public static final String NEW_CONNECTOR_WIZARD_P3 = J2EEUIPlugin.PLUGIN_ID + ".JCA_NEWIZARD_PAGE3"; //$NON-NLS-1$
- public static final String NEW_JAVA_COMPONENT_WIZARD_P1 = J2EEUIPlugin.PLUGIN_ID + ".NEW_JAVA_COMPONENT_WIZARD_PAGE1"; //$NON-NLS-1$
- public static final String NEW_JAVA_CLASS_OPTION_WIZARD_P1 = J2EEUIPlugin.PLUGIN_ID + ".NEW_JAVA_CLASS_OPTION_WIZARD_PAGE1"; //$NON-NLS-1$
- public static final String NEW_UTILITY_WIZARD_P1 = J2EEUIPlugin.PLUGIN_ID + ".NEW_UTILITY_WIZARD_P1"; //$NON-NLS-1$
- public static final String NEW_UTILITY_WIZARD_P3 = J2EEUIPlugin.PLUGIN_ID + ".NEW_UTILITY_WIZARD_P3"; //$NON-NLS-1$
-
- // Import, export wizards
- public static final String IMPORT_EAR_WIZARD_P1 = J2EEUIPlugin.PLUGIN_ID + ".EAR_IMPORT_EAR_WIZARD_PAGE1"; //$NON-NLS-1$
- public static final String IMPORT_EAR_WIZARD_P2 = J2EEUIPlugin.PLUGIN_ID + ".EAR_IMPORT_EAR_WIZARD_PAGE2"; //$NON-NLS-1$
- public static final String IMPORT_EAR_WIZARD_P3 = J2EEUIPlugin.PLUGIN_ID + ".EAR_IMPORT_EAR_WIZARD_PAGE3"; //$NON-NLS-1$
- public static final String IMPORT_APPCLIENT_WIZARD_P1 = J2EEUIPlugin.PLUGIN_ID + ".APPCLIENT_IMPORT_APPCLIENT_WIZARD_PAGE1"; //$NON-NLS-1$
- public static final String IMPORT_EJB_WIZARD_P1 = J2EEUIPlugin.PLUGIN_ID + ".EJB_IMPORT_EJB_WIZARD_PAGE1"; //$NON-NLS-1$
- public static final String IMPORT_RAR_WIZARD_PAGE = J2EEUIPlugin.PLUGIN_ID + ".IMPORT_RAR_WIZARD_PAGE"; //$NON-NLS-1$
- public static final String IMPORT_UTILITY_JAR_WIZARD_P1 = J2EEUIPlugin.PLUGIN_ID + ".IMPORT_UTILITY_JAR_WIZARD_PAGE1"; //$NON-NLS-1$
- public static final String IMPORT_UTILITY_JAR_WIZARD_P2 = J2EEUIPlugin.PLUGIN_ID + ".IMPORT_UTILITY_JAR_WIZARD_PAGE2"; //$NON-NLS-1$
- public static final String IMPORT_CLASS_WIZARD_P1 = J2EEUIPlugin.PLUGIN_ID + ".IMPORT_CLASS_WIZARD_PAGE1"; //$NON-NLS-1$
- public static final String IMPORT_CLASS_WIZARD_P2 = J2EEUIPlugin.PLUGIN_ID + ".IMPORT_CLASS_WIZARD_PAGE2"; //$NON-NLS-1$
-
- public static final String EXPORT_EAR_WIZARD_P1 = J2EEUIPlugin.PLUGIN_ID + ".EAR_EXPORT_PAGE1"; //$NON-NLS-1$
- public static final String EXPORT_APPCLIENT_WIZARD_P1 = J2EEUIPlugin.PLUGIN_ID + ".APPCLIENT_EXPORT_APPCLIENT_WIZARD_PAGE1"; //$NON-NLS-1$
- public static final String EXPORT_EJB_WIZARD_P1 = J2EEUIPlugin.PLUGIN_ID + ".EJB_EXPORT_PAGE1"; //$NON-NLS-1$
- public static final String EXPORT_RAR_WIZARD_PAGE = J2EEUIPlugin.PLUGIN_ID + ".EXPORT_RAR_WIZARD_PAGE"; //$NON-NLS-1$
-
- // dialogs
- public static final String DELEATE_EAR_DIALOG_1 = J2EEUIPlugin.PLUGIN_ID + ".navm2000"; //$NON-NLS-1$
- public static final String DELEATE_MODULE_DIALOG_1 = J2EEUIPlugin.PLUGIN_ID + ".navm2010"; //$NON-NLS-1$
- public static final String RENAME_EAR_DIALOG_1 = J2EEUIPlugin.PLUGIN_ID + ".navm3000"; //$NON-NLS-1$
- public static final String RENAME_MODULE_DIALOG_1 = J2EEUIPlugin.PLUGIN_ID + ".navm3010"; //$NON-NLS-1$
- public static final String DEPLOYMENT_ASSEMBLY_PREFERENCE_PAGE_ADD_REFERENCED_PROJECT_CLASSPATH_ENTRIES= J2EEUIPlugin.PLUGIN_ID + ".DEPLOYMENT_ASSEMBLY_PREFERENCE_PAGE_ADD_REFERENCED_PROJECT_CLASSPATH_ENTRIES"; //$NON-NLS-1$
-
-}
diff --git a/plugins/org.eclipse.jst.j2ee.ui/j2ee_ui/org/eclipse/jst/j2ee/internal/actions/J2EEDeployAction.java b/plugins/org.eclipse.jst.j2ee.ui/j2ee_ui/org/eclipse/jst/j2ee/internal/actions/J2EEDeployAction.java
deleted file mode 100644
index 245b05e..0000000
--- a/plugins/org.eclipse.jst.j2ee.ui/j2ee_ui/org/eclipse/jst/j2ee/internal/actions/J2EEDeployAction.java
+++ /dev/null
@@ -1,167 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2003, 2006 IBM Corporation and others.
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
- *
- * Contributors:
- * IBM Corporation - initial API and implementation
- *******************************************************************************/
-/*
- * Created on Mar 30, 2004
- *
- * To change the template for this generated file go to
- * Window - Preferences - Java - Code Generation - Code and Comments
- */
-package org.eclipse.jst.j2ee.internal.actions;
-
-import java.text.MessageFormat;
-import java.util.List;
-
-import org.eclipse.core.resources.IProject;
-import org.eclipse.core.runtime.CoreException;
-import org.eclipse.core.runtime.IProgressMonitor;
-import org.eclipse.core.runtime.IStatus;
-import org.eclipse.core.runtime.Status;
-import org.eclipse.core.runtime.jobs.Job;
-import org.eclipse.jem.util.logger.proxy.Logger;
-import org.eclipse.jface.action.IAction;
-import org.eclipse.jface.dialogs.IDialogConstants;
-import org.eclipse.jface.dialogs.MessageDialog;
-import org.eclipse.jface.viewers.ISelection;
-import org.eclipse.jface.viewers.IStructuredSelection;
-import org.eclipse.jst.j2ee.internal.deploy.DeployerRegistry;
-import org.eclipse.jst.j2ee.internal.deploy.J2EEDeployOperation;
-import org.eclipse.jst.j2ee.internal.dialogs.Messages;
-import org.eclipse.jst.j2ee.internal.dialogs.RuntimeSelectionDialog;
-import org.eclipse.jst.j2ee.internal.plugin.J2EEUIMessages;
-import org.eclipse.jst.j2ee.internal.plugin.J2EEUIPlugin;
-import org.eclipse.jst.j2ee.internal.project.J2EEProjectUtilities;
-import org.eclipse.swt.widgets.Shell;
-import org.eclipse.wst.common.componentcore.resources.IVirtualComponent;
-import org.eclipse.wst.common.frameworks.internal.WTPResourceHandler;
-import org.eclipse.wst.common.frameworks.internal.plugin.WTPCommonPlugin;
-import org.eclipse.wst.server.core.IRuntime;
-
-/**
- * @author cbridgha
- *
- * To change the template for this generated type comment go to Window - Preferences - Java - Code
- * Generation - Code and Comments
- */
-public class J2EEDeployAction extends BaseAction {
- /*
- * (non-Javadoc)
- *
- * @see org.eclipse.jst.j2ee.internal.internal.ui.actions.BaseAction#primRun(org.eclipse.swt.widgets.Shell)
- */
- @Override
- protected void primRun(Shell shell) {
-
- if (checkEnabled(shell)) {
- final IStructuredSelection deploySelection = selection;
- Job deployJob = new Job(Messages.J2EEDeployAction_Deploy_) {
- @Override
- protected IStatus run(IProgressMonitor monitor) {
- IStatus result = null;
- J2EEDeployOperation op = new J2EEDeployOperation(deploySelection.toArray());
- try {
- result = op.execute(monitor, null);
- } catch (Exception e) {
- result = new Status(IStatus.ERROR, WTPCommonPlugin.PLUGIN_ID, IStatus.ERROR, WTPResourceHandler.getString("27"), e); //$NON-NLS-1$
- Logger.getLogger().logError(e);
- } finally {
-
- }
- return result;
- }
- };
-
-
- try {
- deployJob.setUser(true);
- deployJob.schedule();
- } catch (Exception e) {
- //Ignore
- }
-
- }
-
- }
-
- /*
- *
- */
- public J2EEDeployAction() {
- super();
- }
-
- /*
- * (non-Javadoc)
- *
- * @see org.eclipse.ui.IActionDelegate#selectionChanged(org.eclipse.jface.action.IAction,
- * org.eclipse.jface.viewers.ISelection)
- */
- @Override
- public void selectionChanged(IAction action, ISelection aSelection) {
- super.selectionChanged(action, aSelection);
- action.setEnabled(true);
- }
-
-
- public boolean checkEnabled(Shell shell) {
-
- try {
- DeployerRegistry reg = DeployerRegistry.instance();
-
- List components = DeployerRegistry.getSelectedModules(selection.toArray());
- for (int i = 0; i < components.size(); i++) {
- IVirtualComponent component = (IVirtualComponent) components.get(i);
- IProject proj = component.getProject();
- if (proj == null) {
- displayMessageDialog(J2EEUIMessages.getResourceString("DEPLOY_PROJECT_NOT_FOUND") , shell); //$NON-NLS-1$
- return false;
- }
-
- IRuntime runtime = J2EEProjectUtilities.getServerRuntime(proj);
- if (runtime == null) {
- String message = MessageFormat.format(J2EEUIMessages.getResourceString("DEPLOY_RUNTIME_NOT_FOUND"), new Object []{proj.getName()}); //$NON-NLS-1$
- RuntimeSelectionDialog selectionDialog = new RuntimeSelectionDialog(shell,
- J2EEUIMessages.getResourceString("DEPLOY_DIALOG_TITLE"), //$NON-NLS-1$
- null /* default image */,
- message,
- MessageDialog.ERROR,
- new String[] { IDialogConstants.OK_LABEL }, 0, proj) ;
- selectionDialog.open();
- runtime = J2EEProjectUtilities.getServerRuntime(proj);
- if (runtime == null)
- return false;
- }
- List visitors = reg.getDeployModuleExtensions(proj, runtime);
- if (visitors.isEmpty()) {
- displayMessageDialog(MessageFormat.format(J2EEUIMessages.getResourceString("DEPLOY_PROJECT_NOT_SUPPORTED"), new Object []{proj.getName()}), shell); //$NON-NLS-1$
- return false;
- }
-
- }
-
- return true;
- } catch (CoreException e) {
- J2EEUIPlugin.logError(e);
- }
- return false;
- }
-
- private void displayMessageDialog(String message, Shell shell) {
- String title = J2EEUIMessages.getResourceString("DEPLOY_DIALOG_TITLE"); //$NON-NLS-1$
- MessageDialog dialog = new MessageDialog(shell,
- title,
- null /* default image */,
- message,
- MessageDialog.ERROR,
- new String[] { IDialogConstants.OK_LABEL }, 0) ;
- dialog.open();
- }
-
-}
diff --git a/plugins/org.eclipse.jst.j2ee.ui/j2ee_ui/org/eclipse/jst/j2ee/internal/actions/NewJavaEEArtifactDropDownAction.java b/plugins/org.eclipse.jst.j2ee.ui/j2ee_ui/org/eclipse/jst/j2ee/internal/actions/NewJavaEEArtifactDropDownAction.java
deleted file mode 100644
index 66a9d94..0000000
--- a/plugins/org.eclipse.jst.j2ee.ui/j2ee_ui/org/eclipse/jst/j2ee/internal/actions/NewJavaEEArtifactDropDownAction.java
+++ /dev/null
@@ -1,37 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2007,2009 SAP AG and others.
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
- *
- * Contributors:
- * Kaloyan Raev, kaloyan.raev@sap.com - initial API and implementation
- *******************************************************************************/
-package org.eclipse.jst.j2ee.internal.actions;
-
-/**
- * A wizard is added to the "New Java EE Artifact" drop down if it has a parameter 'javaeeartifact':
- * <wizard
- * name="My Java EE Project Wizard"
- * icon="icons/wiz.gif"
- * category="mycategory"
- * id="xx.MyWizard">
- * <class class="org.xx.MyWizard">
- * <parameter name="javaeeartifact" value="true"/>
- * </class>
- * <description>
- * My Wizard
- * </description>
- * </wizard>
- */
-public class NewJavaEEArtifactDropDownAction extends NewJavaEEDropDownAction {
-
- private final static String ATT_JAVAEEARTIFACT = "javaeeartifact";//$NON-NLS-1$
-
- @Override
- protected String getTypeAttribute() {
- return ATT_JAVAEEARTIFACT;
- }
-
-}
diff --git a/plugins/org.eclipse.jst.j2ee.ui/j2ee_ui/org/eclipse/jst/j2ee/internal/actions/NewJavaEEDropDownAction.java b/plugins/org.eclipse.jst.j2ee.ui/j2ee_ui/org/eclipse/jst/j2ee/internal/actions/NewJavaEEDropDownAction.java
deleted file mode 100644
index edb13a8..0000000
--- a/plugins/org.eclipse.jst.j2ee.ui/j2ee_ui/org/eclipse/jst/j2ee/internal/actions/NewJavaEEDropDownAction.java
+++ /dev/null
@@ -1,305 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2007,2009 SAP AG and others.
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
- *
- * Contributors:
- * Kaloyan Raev, kaloyan.raev@sap.com - initial API and implementation
- *******************************************************************************/
-package org.eclipse.jst.j2ee.internal.actions;
-
-import java.util.ArrayList;
-import java.util.Arrays;
-
-import org.eclipse.core.runtime.CoreException;
-import org.eclipse.core.runtime.IConfigurationElement;
-import org.eclipse.core.runtime.IExtensionPoint;
-import org.eclipse.core.runtime.Platform;
-import org.eclipse.jdt.internal.ui.util.CoreUtility;
-import org.eclipse.jem.util.logger.proxy.Logger;
-import org.eclipse.jface.action.Action;
-import org.eclipse.jface.action.ActionContributionItem;
-import org.eclipse.jface.action.IAction;
-import org.eclipse.jface.action.IMenuCreator;
-import org.eclipse.jface.layout.PixelConverter;
-import org.eclipse.jface.resource.ImageDescriptor;
-import org.eclipse.jface.resource.JFaceResources;
-import org.eclipse.jface.viewers.ISelection;
-import org.eclipse.jface.viewers.IStructuredSelection;
-import org.eclipse.jface.viewers.StructuredSelection;
-import org.eclipse.jface.window.Window;
-import org.eclipse.jface.wizard.WizardDialog;
-import org.eclipse.jst.j2ee.internal.plugin.J2EEUIPlugin;
-import org.eclipse.swt.widgets.Control;
-import org.eclipse.swt.widgets.Menu;
-import org.eclipse.swt.widgets.Shell;
-import org.eclipse.ui.INewWizard;
-import org.eclipse.ui.IWorkbenchWindow;
-import org.eclipse.ui.IWorkbenchWindowPulldownDelegate2;
-import org.eclipse.ui.PlatformUI;
-
-public abstract class NewJavaEEDropDownAction extends Action implements IMenuCreator, IWorkbenchWindowPulldownDelegate2 {
-
- public static class NewJavaEEWizardAction extends Action implements Comparable {
-
- private final static String ATT_NAME = "name";//$NON-NLS-1$
- private final static String ATT_CLASS = "class";//$NON-NLS-1$
- private final static String ATT_ICON = "icon";//$NON-NLS-1$
- private final static String TAG_DESCRIPTION = "description"; //$NON-NLS-1$
-
- private Shell fShell;
- private IStructuredSelection fSelection;
- private IConfigurationElement fConfigurationElement;
-
- private int menuIndex;
-
- public NewJavaEEWizardAction(IConfigurationElement element) {
- fConfigurationElement= element;
- setText(element.getAttribute(ATT_NAME));
-
- String description = getDescriptionFromConfig(fConfigurationElement);
- setDescription(description);
- setToolTipText(description);
- setImageDescriptor(getIconFromConfig(fConfigurationElement));
- setMenuIndex(getMenuIndexFromConfig(fConfigurationElement));
- }
-
- /* (non-Javadoc)
- * @see org.eclipse.jface.action.Action#run()
- */
- @Override
- public void run() {
- Shell shell = getShell();
- try {
- INewWizard wizard = createWizard();
- wizard.init(PlatformUI.getWorkbench(), getSelection());
-
- WizardDialog dialog = new WizardDialog(shell, wizard);
- PixelConverter converter = new PixelConverter(JFaceResources.getDialogFont());
- dialog.setMinimumPageSize(converter.convertWidthInCharsToPixels(70), converter.convertHeightInCharsToPixels(20));
- dialog.create();
- int res = dialog.open();
-
- notifyResult(res == Window.OK);
- } catch (CoreException e) {
- Logger.getLogger().log(e);
- }
- }
-
- /**
- * Returns the configured selection. If no selection has been configured using {@link #setSelection(IStructuredSelection)},
- * the currently selected element of the active workbench is returned.
- * @return the configured selection
- */
- protected IStructuredSelection getSelection() {
- if (fSelection == null) {
- return evaluateCurrentSelection();
- }
- return fSelection;
- }
-
- private IStructuredSelection evaluateCurrentSelection() {
- IWorkbenchWindow window = J2EEUIPlugin.getActiveWorkbenchWindow();
- if (window != null) {
- ISelection selection = window.getSelectionService().getSelection();
- if (selection instanceof IStructuredSelection) {
- return (IStructuredSelection) selection;
- }
- }
- return StructuredSelection.EMPTY;
- }
-
- /**
- * Configures the selection to be used as initial selection of the wizard.
- * @param selection the selection to be set or <code>null</code> to use the selection of the active workbench window
- */
- public void setSelection(IStructuredSelection selection) {
- fSelection = selection;
- }
-
- /**
- * Returns the configured shell. If no shell has been configured using {@link #setShell(Shell)},
- * the shell of the currently active workbench is returned.
- * @return the configured shell
- */
- protected Shell getShell() {
- if (fShell == null) {
- return J2EEUIPlugin.getActiveWorkbenchShell();
- }
- return fShell;
- }
-
- /**
- * Configures the shell to be used as parent shell by the wizard.
- * @param shell the shell to be set or <code>null</code> to use the shell of the active workbench window
- */
- public void setShell(Shell shell) {
- fShell = shell;
- }
-
- private String getDescriptionFromConfig(IConfigurationElement config) {
- IConfigurationElement [] children = config.getChildren(TAG_DESCRIPTION);
- if (children.length >= 1) {
- return children[0].getValue();
- }
- return ""; //$NON-NLS-1$
- }
-
- private ImageDescriptor getIconFromConfig(IConfigurationElement config) {
- String iconName = config.getAttribute(ATT_ICON);
- if (iconName != null) {
- return J2EEUIPlugin.imageDescriptorFromPlugin(config.getContributor().getName(), iconName);
- }
- return null;
- }
-
- private int getMenuIndexFromConfig(IConfigurationElement config) {
- IConfigurationElement[] classElements = config.getChildren(TAG_CLASS);
- if (classElements.length > 0) {
- for (IConfigurationElement classElement : classElements) {
- IConfigurationElement[] paramElements = classElement.getChildren(TAG_PARAMETER);
- for (IConfigurationElement paramElement : paramElements) {
- if (ATT_MENUINDEX.equals(paramElement.getAttribute(TAG_NAME))) {
- return Integer.parseInt(paramElement.getAttribute(TAG_VALUE));
- }
- }
- }
- }
- return Integer.MAX_VALUE;
- }
-
- protected INewWizard createWizard() throws CoreException {
- return (INewWizard) CoreUtility.createExtension(fConfigurationElement, ATT_CLASS);
- }
-
- public int getMenuIndex() {
- return menuIndex;
- }
-
- public void setMenuIndex(int menuIndex) {
- this.menuIndex = menuIndex;
- }
-
- public int compareTo(Object o) {
- NewJavaEEWizardAction action = (NewJavaEEWizardAction) o;
- return getMenuIndex() - action.getMenuIndex();
- }
- }
-
- protected final static String TAG_WIZARD = "wizard";//$NON-NLS-1$
- protected final static String TAG_PARAMETER = "parameter";//$NON-NLS-1$
- protected final static String TAG_NAME = "name";//$NON-NLS-1$
- protected final static String TAG_VALUE = "value";//$NON-NLS-1$
- protected final static String TAG_CLASS = "class"; //$NON-NLS-1$
- protected final static String ATT_MENUINDEX = "menuIndex";//$NON-NLS-1$
- protected final static String PL_NEW = "newWizards"; //$NON-NLS-1$
-
- protected Menu fMenu;
-
- protected Shell fWizardShell;
-
- public NewJavaEEDropDownAction() {
- fMenu = null;
- setMenuCreator(this);
- }
-
- public void dispose() {
- if (fMenu != null) {
- fMenu.dispose();
- fMenu = null;
- }
- }
-
- public Menu getMenu(Menu parent) {
- return null;
- }
-
- public Menu getMenu(Control parent) {
- if (fMenu == null) {
- fMenu = new Menu(parent);
- NewJavaEEWizardAction[] actions = getActionFromDescriptors();
- for (NewJavaEEWizardAction action : actions) {
- action.setShell(fWizardShell);
- ActionContributionItem item = new ActionContributionItem(action);
- item.fill(fMenu, -1);
- }
- }
- return fMenu;
- }
-
- @Override
- public void run() {
- getDefaultAction().run();
- }
-
- public Action getDefaultAction() {
- Action[] actions = getActionFromDescriptors();
- if (actions.length > 0)
- return actions[0];
- return null;
- }
-
- public NewJavaEEWizardAction[] getActionFromDescriptors() {
- ArrayList<NewJavaEEWizardAction> containers = new ArrayList<NewJavaEEWizardAction>();
-
- IExtensionPoint extensionPoint = Platform.getExtensionRegistry().getExtensionPoint(PlatformUI.PLUGIN_ID, PL_NEW);
- if (extensionPoint != null) {
- IConfigurationElement[] elements = extensionPoint.getConfigurationElements();
- for (IConfigurationElement element : elements) {
- if (element.getName().equals(TAG_WIZARD) && isJavaEEProjectWizard(element)) {
- containers.add(new NewJavaEEWizardAction(element));
- }
- }
- }
-
- NewJavaEEWizardAction[] actions = containers.toArray(new NewJavaEEWizardAction[containers.size()]);
- Arrays.sort(actions);
- return actions;
- }
-
- protected boolean isJavaEEProjectWizard(IConfigurationElement element) {
- IConfigurationElement[] classElements = element.getChildren(TAG_CLASS);
- if (classElements.length > 0) {
- for (IConfigurationElement classElement : classElements) {
- IConfigurationElement[] paramElements = classElement.getChildren(TAG_PARAMETER);
- for (IConfigurationElement paramElement : paramElements) {
- if (getTypeAttribute().equals(paramElement.getAttribute(TAG_NAME))) {
- return Boolean.valueOf(paramElement.getAttribute(TAG_VALUE)).booleanValue();
- }
- }
- }
- }
- // old way, deprecated
- if (Boolean.valueOf(element.getAttribute(getTypeAttribute())).booleanValue()) {
- return true;
- }
- return false;
- }
-
-
- /* (non-Javadoc)
- * @see org.eclipse.ui.IWorkbenchWindowActionDelegate#init(org.eclipse.ui.IWorkbenchWindow)
- */
- public void init(IWorkbenchWindow window) {
- fWizardShell = window.getShell();
- }
-
- /* (non-Javadoc)
- * @see org.eclipse.ui.IActionDelegate#run(org.eclipse.jface.action.IAction)
- */
- public void run(IAction action) {
- run();
- }
-
- /* (non-Javadoc)
- * @see org.eclipse.ui.IActionDelegate#selectionChanged(org.eclipse.jface.action.IAction, org.eclipse.jface.viewers.ISelection)
- */
- public void selectionChanged(IAction action, ISelection selection) {
-
- }
-
- protected abstract String getTypeAttribute();
-
-}
diff --git a/plugins/org.eclipse.jst.j2ee.ui/j2ee_ui/org/eclipse/jst/j2ee/internal/actions/NewJavaEEProjectDropDownAction.java b/plugins/org.eclipse.jst.j2ee.ui/j2ee_ui/org/eclipse/jst/j2ee/internal/actions/NewJavaEEProjectDropDownAction.java
deleted file mode 100644
index 7855306..0000000
--- a/plugins/org.eclipse.jst.j2ee.ui/j2ee_ui/org/eclipse/jst/j2ee/internal/actions/NewJavaEEProjectDropDownAction.java
+++ /dev/null
@@ -1,37 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2007,2009 SAP AG and others.
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
- *
- * Contributors:
- * Kaloyan Raev, kaloyan.raev@sap.com - initial API and implementation
- *******************************************************************************/
-package org.eclipse.jst.j2ee.internal.actions;
-
-/**
- * A wizard is added to the "New Java EE Project" drop down if it has a parameter 'javaeeproject':
- * <wizard
- * name="My Java EE Project Wizard"
- * icon="icons/wiz.gif"
- * category="mycategory"
- * id="xx.MyWizard">
- * <class class="org.xx.MyWizard">
- * <parameter name="javaeeproject" value="true"/>
- * </class>
- * <description>
- * My Wizard
- * </description>
- * </wizard>
- */
-public class NewJavaEEProjectDropDownAction extends NewJavaEEDropDownAction {
-
- private final static String ATT_JAVAEEPROJECT = "javaeeproject";//$NON-NLS-1$
-
- @Override
- protected String getTypeAttribute() {
- return ATT_JAVAEEPROJECT;
- }
-
-}
diff --git a/plugins/org.eclipse.jst.j2ee.ui/j2ee_ui/org/eclipse/jst/j2ee/internal/actions/OpenJ2EEResourceAction.java b/plugins/org.eclipse.jst.j2ee.ui/j2ee_ui/org/eclipse/jst/j2ee/internal/actions/OpenJ2EEResourceAction.java
deleted file mode 100644
index e1d10b1..0000000
--- a/plugins/org.eclipse.jst.j2ee.ui/j2ee_ui/org/eclipse/jst/j2ee/internal/actions/OpenJ2EEResourceAction.java
+++ /dev/null
@@ -1,460 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2003, 2006 IBM Corporation and others.
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
- *
- * Contributors:
- * IBM Corporation - initial API and implementation
- *******************************************************************************/
-
-package org.eclipse.jst.j2ee.internal.actions;
-
-import java.io.FileNotFoundException;
-import java.io.IOException;
-import java.io.InputStream;
-
-import org.eclipse.core.resources.IFile;
-import org.eclipse.core.resources.IProject;
-import org.eclipse.core.resources.IResource;
-import org.eclipse.core.runtime.IPath;
-import org.eclipse.core.runtime.Path;
-import org.eclipse.core.runtime.Platform;
-import org.eclipse.core.runtime.content.IContentType;
-import org.eclipse.emf.ecore.EObject;
-import org.eclipse.emf.ecore.resource.Resource;
-import org.eclipse.jdt.core.IClassFile;
-import org.eclipse.jdt.core.ICompilationUnit;
-import org.eclipse.jdt.core.IJavaProject;
-import org.eclipse.jdt.core.IType;
-import org.eclipse.jdt.core.JavaCore;
-import org.eclipse.jdt.core.JavaModelException;
-import org.eclipse.jdt.internal.ui.javaeditor.EditorUtility;
-import org.eclipse.jem.java.JavaClass;
-import org.eclipse.jem.util.emf.workbench.ProjectUtilities;
-import org.eclipse.jface.dialogs.MessageDialog;
-import org.eclipse.jface.viewers.IStructuredSelection;
-import org.eclipse.jst.j2ee.commonarchivecore.internal.ModuleFile;
-import org.eclipse.jst.j2ee.commonarchivecore.internal.helpers.ArchiveOptions;
-import org.eclipse.jst.j2ee.commonarchivecore.internal.util.ArchiveUtil;
-import org.eclipse.jst.j2ee.ejb.EJBJar;
-import org.eclipse.jst.j2ee.ejb.EnterpriseBean;
-import org.eclipse.jst.j2ee.ejb.componentcore.util.EJBArtifactEdit;
-import org.eclipse.jst.j2ee.internal.archive.JavaEEArchiveUtilities;
-import org.eclipse.jst.j2ee.internal.componentcore.ComponentArchiveOptions;
-import org.eclipse.jst.j2ee.internal.componentcore.JavaEEBinaryComponentHelper;
-import org.eclipse.jst.j2ee.internal.ejb.provider.J2EEJavaClassProviderHelper;
-import org.eclipse.jst.j2ee.internal.plugin.BinaryEditorUtilities;
-import org.eclipse.jst.j2ee.internal.plugin.J2EEEditorUtility;
-import org.eclipse.jst.j2ee.internal.plugin.J2EEUIMessages;
-import org.eclipse.jst.j2ee.internal.plugin.J2EEUIPlugin;
-import org.eclipse.jst.j2ee.web.componentcore.util.WebArtifactEdit;
-import org.eclipse.jst.j2ee.webapplication.Servlet;
-import org.eclipse.jst.j2ee.webapplication.WebApp;
-import org.eclipse.jst.j2ee.webservice.wsdd.BeanLink;
-import org.eclipse.jst.j2ee.webservice.wsdd.EJBLink;
-import org.eclipse.jst.j2ee.webservice.wsdd.ServletLink;
-import org.eclipse.jst.jee.archive.IArchive;
-import org.eclipse.jst.jee.archive.IArchiveResource;
-import org.eclipse.jst.jee.util.internal.JavaEEQuickPeek;
-import org.eclipse.ui.IEditorDescriptor;
-import org.eclipse.ui.IEditorInput;
-import org.eclipse.ui.IEditorPart;
-import org.eclipse.ui.IEditorRegistry;
-import org.eclipse.ui.IWorkbenchPage;
-import org.eclipse.ui.PartInitException;
-import org.eclipse.ui.PlatformUI;
-import org.eclipse.ui.ide.IDE;
-import org.eclipse.ui.part.FileEditorInput;
-import org.eclipse.ui.part.ISetSelectionTarget;
-import org.eclipse.wst.common.componentcore.internal.util.ComponentUtilities;
-import org.eclipse.wst.common.componentcore.resources.IVirtualComponent;
-import org.eclipse.wst.common.internal.emfworkbench.WorkbenchResourceHelper;
-
-/**
- * Action for opening a J2EE resource from the J2EE navigator.
- */
-public class OpenJ2EEResourceAction extends AbstractOpenAction {
-
- public static final String ID = "org.eclipse.jst.j2ee.internal.internal.ui.actions.OpenJ2EEResourceAction"; //$NON-NLS-1$
- public static final String JAVA_EDITOR_ID = "org.eclipse.jst.j2ee.internal.internal.ejb.ui.java.EnterpriseBeanJavaEditor"; //$NON-NLS-1$
- public static final String BASE_JAVA_EDITOR_ID = "org.eclipse.jdt.ui.CompilationUnitEditor"; //$NON-NLS-1$
-
- protected static IEditorDescriptor javaEditorDescriptor;
- protected static IEditorDescriptor baseJavaEditorDescriptor;
-
- /**
- * Create an instance of this class
- */
- public OpenJ2EEResourceAction() {
- super(J2EEUIMessages.getResourceString(J2EEUIMessages.OPEN_J2EE_RESOURCE_ACTION_0));
- }
-
- /**
- * Returns the action ID.
- */
- public String getID() {
- return ID;
- }
-
- public static IEditorDescriptor getJavaEditorDescriptor() {
- if (javaEditorDescriptor == null)
- javaEditorDescriptor = findEditorDescriptor(JAVA_EDITOR_ID);
- return javaEditorDescriptor;
- }
-
- public static IEditorDescriptor getBaseJavaEditorDescriptor() {
- if (baseJavaEditorDescriptor == null)
- baseJavaEditorDescriptor = findEditorDescriptor(BASE_JAVA_EDITOR_ID);
- return baseJavaEditorDescriptor;
- }
-
- protected void openAppropriateEditor(IVirtualComponent c){
- if (c == null){
- return;
- }
- IWorkbenchPage page = null;
- IEditorPart editor = null;
- try {
- page = PlatformUI.getWorkbench().getActiveWorkbenchWindow().getActivePage();
-
- IEditorInput editorInput = null;
-
- //[Bug 237794] if component c is a JEE 5 archive then editorInput needs to be a BinaryEditorInput
- if (c.isBinary()) {
- JavaEEQuickPeek qp = JavaEEBinaryComponentHelper.getJavaEEQuickPeek(c);
- //[Bug 239440] because Connectors are opened with the basic XML editor and not a specialized editor they need binary editor input
- if( qp.getJavaEEVersion() == JavaEEQuickPeek.JEE_5_0_ID || qp.getJavaEEVersion() == JavaEEQuickPeek.JEE_6_0_ID || qp.getType() == JavaEEQuickPeek.CONNECTOR_TYPE) {
- String path = ((EObject)srcObject).eResource().getURI().toString();
- editorInput = BinaryEditorUtilities.getBinaryEditorInput(c, path);
- }
- }
-
- //this is for all other cases
- if(editorInput == null) {
- editorInput = new ComponentEditorInput(c);
- }
-
- editor = page.openEditor(editorInput, currentDescriptor.getId());
- if (editor instanceof ISetSelectionTarget)
- ((ISetSelectionTarget) editor).selectReveal(getStructuredSelection());
- } catch (Exception e) {
- MessageDialog.openError(PlatformUI.getWorkbench().getActiveWorkbenchWindow().getShell(), J2EEUIMessages.getResourceString("Problems_Opening_Editor_ERROR_"), e.getMessage()); //$NON-NLS-1$ = "Problems Opening Editor"
- }
- }
-
-
- /**
- * open the appropriate editor
- */
- protected void openAppropriateEditor(IResource r) {
- if (r == null)
- return;
- IWorkbenchPage page = null;
- IEditorPart editor = null;
- try {
- page = PlatformUI.getWorkbench().getActiveWorkbenchWindow().getActivePage();
- if( currentDescriptor != null ){
- editor = page.openEditor(new FileEditorInput((IFile) r), currentDescriptor.getId());
- if (editor instanceof ISetSelectionTarget)
- ((ISetSelectionTarget) editor).selectReveal(getStructuredSelection());
- }
- } catch (Exception e) {
- MessageDialog.openError(PlatformUI.getWorkbench().getActiveWorkbenchWindow().getShell(), J2EEUIMessages.getResourceString("Problems_Opening_Editor_ERROR_"), e.getMessage()); //$NON-NLS-1$ = "Problems Opening Editor"
- }
- }
-
- /**
- * The user has invoked this action
- */
- @Override
- public void run() {
- if (!isEnabled())
- return;
-
- if (srcObject instanceof J2EEJavaClassProviderHelper) {
- ((J2EEJavaClassProviderHelper) srcObject).openInEditor();
- return;
- }
-
- if( isEJB3BeanObject(srcObject) ){
- String name = ""; //$NON-NLS-1$
- if( srcObject instanceof org.eclipse.jst.javaee.ejb.SessionBean ){
- org.eclipse.jst.javaee.ejb.SessionBean bean = (org.eclipse.jst.javaee.ejb.SessionBean)srcObject;
- name = bean.getEjbClass();
- }else if(srcObject instanceof org.eclipse.jst.javaee.ejb.MessageDrivenBean){
- org.eclipse.jst.javaee.ejb.MessageDrivenBean bean = (org.eclipse.jst.javaee.ejb.MessageDrivenBean)srcObject;
- name = bean.getEjbClass();
- }else if(srcObject instanceof org.eclipse.jst.javaee.ejb.EntityBean){
- org.eclipse.jst.javaee.ejb.EntityBean bean = (org.eclipse.jst.javaee.ejb.EntityBean)srcObject;
- name = bean.getEjbClass();
- }
- openResourceInEditor(name, (EObject)srcObject);
- return;
- }
-
- if(srcObject instanceof org.eclipse.jst.javaee.web.Servlet ){
- String name = ""; //$NON-NLS-1$
- name = ((org.eclipse.jst.javaee.web.Servlet)srcObject).getServletClass();
- openResourceInEditor(name, (EObject)srcObject);
- return;
- }
- if( srcObject instanceof org.eclipse.jst.javaee.web.Filter ){
- String name = ""; //$NON-NLS-1$
- name = ((org.eclipse.jst.javaee.web.Filter)srcObject).getFilterClass();
- openResourceInEditor(name, (EObject)srcObject);
- return;
- }
-
- if( srcObject instanceof org.eclipse.jst.javaee.core.Listener ){
- String name = ""; //$NON-NLS-1$
- name = ((org.eclipse.jst.javaee.core.Listener)srcObject).getListenerClass();
- openResourceInEditor(name, (EObject)srcObject);
- return;
- }
-
- if (srcObject instanceof EObject) {
- EObject ro = (EObject) srcObject;
- IProject p = ProjectUtilities.getProject(ro);
-
- if (ro instanceof BeanLink) {
- openBeanLinkInJavaEditor((BeanLink) ro, p);
- return;
- }
- IResource resource = WorkbenchResourceHelper.getFile((EObject)srcObject);
- if(resource != null && resource.exists()){
- openAppropriateEditor(resource);
- } else if(ro.eResource() != null) {
- ModuleFile moduleFile = ArchiveUtil.getModuleFile(ro);
- if (moduleFile != null) {
- ArchiveOptions options = moduleFile.getOptions();
- if(options instanceof ComponentArchiveOptions) {
- IVirtualComponent component = ((ComponentArchiveOptions)options).getComponent();
- openAppropriateEditor(component);
- }
- } else {
- //if can't get a ModuleFile then get the component from the archive
- IArchive archive = JavaEEArchiveUtilities.findArchive(ro);
- if(archive != null) {
- IVirtualComponent component = JavaEEArchiveUtilities.findComponent(archive);
- if(component != null){
- openAppropriateEditor(component);
- }
- }
- }
- }
- } else if (srcObject instanceof Resource) {
- openAppropriateEditor(WorkbenchResourceHelper.getFile((Resource)srcObject));
- }
- }
-
- /**
- * The structured selection has changed in the workbench. Subclasses should override this method
- * to react to the change. Returns true if the action should be enabled for this selection, and
- * false otherwise.
- *
- * When this method is overridden, the super method must always be invoked. If the super method
- * returns false, this method must also return false.
- *
- * @param sel the new structured selection
- */
- @Override
- public boolean updateSelection(IStructuredSelection s) {
- if (!super.updateSelection(s))
- return false;
-
- // Make sure this is one of the selections we can handle,
- // then set the source object as is. The run() will do the hard stuff.
- Object obj = s.getFirstElement();
-
- if (obj instanceof J2EEJavaClassProviderHelper) {
- currentDescriptor = getJavaEditorDescriptor();
- } else if (obj instanceof BeanLink) {
- currentDescriptor = getBaseJavaEditorDescriptor();
- } else if(isEJB3BeanObject(obj)) {
- //[241685] if it is a EJB 3 bean the class is specially opened by the run() method
- srcObject = obj;
- return true;
- } else if(obj instanceof org.eclipse.jst.javaee.web.Servlet ||
- obj instanceof org.eclipse.jst.javaee.web.Filter ||
- obj instanceof org.eclipse.jst.javaee.core.Listener ){
- srcObject = obj;
- return true;
- }else if (obj instanceof EObject) {
- IEditorRegistry registry = PlatformUI.getWorkbench().getEditorRegistry();
- IFile file = WorkbenchResourceHelper.getFile((EObject)obj);
- if(file != null) {
- if(file.exists()){
- IContentType contentType = IDE.getContentType(file);
- currentDescriptor = registry.getDefaultEditor(file.getName(), contentType);
- } else {
- currentDescriptor = null;
- return false;
- }
- } else if (((EObject)obj).eResource() != null) {
- //[Bug 237794] if the file is null then it maybe a binary resource in an archive
- // attempt to get the resource from the archive and the content type from that
- EObject eObj = (EObject) obj;
- IArchive archive = JavaEEArchiveUtilities.findArchive(eObj);
- if(archive != null) {
- IPath path = new Path(((EObject)obj).eResource().getURI().toString());
- if(archive.containsArchiveResource(path)) {
- InputStream stream = null;
- try {
- IArchiveResource resource = archive.getArchiveResource(path);
- stream = resource.getInputStream();
- IContentType type = Platform.getContentTypeManager().findContentTypeFor(stream, path.lastSegment());
- currentDescriptor = registry.getDefaultEditor(path.lastSegment(),type);
- } catch (FileNotFoundException e) {
- J2EEUIPlugin.logError(-1, e.getMessage(), e);
- } catch (IOException e) {
- J2EEUIPlugin.logError(-1, e.getMessage(), e);
- } finally {
- if(stream != null) {
- try {
- stream.close();
- } catch (IOException e) {
- J2EEUIPlugin.logError(-1, e.getMessage(), e);
- }
- }
- }
-
- }
- }
- }
- }
- else if (obj instanceof Resource) {
- IEditorRegistry registry = PlatformUI.getWorkbench().getEditorRegistry();
- IFile file = WorkbenchResourceHelper.getFile((Resource)obj);
- IContentType contentType = IDE.getContentType(file);
- currentDescriptor = registry.getDefaultEditor(file.getName(), contentType);
- }
- else {
- currentDescriptor = null;
- return false;
- }
- setAttributesFromDescriptor();
- srcObject = obj;
- return true;
- }
-
- /**
- * @param link
- */
- private void openBeanLinkInJavaEditor(BeanLink link, IProject p) {
- String linkName = null;
- JavaClass javaClass = null;
- IVirtualComponent comp = ComponentUtilities.findComponent(link);
- // Handle EJB Link case
- if (link instanceof EJBLink) {
- linkName = ((EJBLink) link).getEjbLink();
- EJBArtifactEdit artifactEdit = null;
- try {
- artifactEdit = EJBArtifactEdit.getEJBArtifactEditForRead(comp);
- EJBJar ejbJar = artifactEdit.getEJBJar();
- if (ejbJar == null)
- return;
- EnterpriseBean bean = ejbJar.getEnterpriseBeanNamed(linkName);
- if (bean == null)
- return;
- javaClass = bean.getEjbClass();
- } finally {
- if (artifactEdit!=null)
- artifactEdit.dispose();
- }
- }
- // Handle Servlet Link case
- else {
- linkName = ((ServletLink) link).getServletLink();
- WebArtifactEdit artifactEdit = null;
- try {
- artifactEdit = WebArtifactEdit.getWebArtifactEditForRead(comp);
- WebApp webApp = artifactEdit.getWebApp();
- if (webApp == null)
- return;
- Servlet servlet = webApp.getServletNamed(linkName);
- if (servlet == null)
- return;
- javaClass = servlet.getServletClass();
- } finally {
- if (artifactEdit!=null)
- artifactEdit.dispose();
- }
- }
- // Open java editor on the selected objects associated java file
- try {
- J2EEEditorUtility.openInEditor(javaClass, p);
- } catch (Exception cantOpen) {
- J2EEUIPlugin.logError(-1, cantOpen.getMessage(), cantOpen);
- }
- }
-
- protected EObject getRootObject(Object obj) {
- if (obj instanceof EObject) {
- EObject refObj = (EObject) obj;
- while (refObj != null && refObj.eContainer() != null)
- refObj = refObj.eContainer();
- return refObj;
- }
- return null;
- }
-
- /**
- * Determines if the given object is a EJB 3 Bean
- * [241685] first added
- *
- * @param obj determine weather this object is an EJB 3 bean or not
- * @return true if obj is a EJB 3 bean, false otherwise
- */
- private boolean isEJB3BeanObject(Object obj) {
- boolean isBean =
- obj instanceof org.eclipse.jst.javaee.ejb.SessionBean ||
- obj instanceof org.eclipse.jst.javaee.ejb.MessageDrivenBean ||
- obj instanceof org.eclipse.jst.javaee.ejb.EntityBean;
-
- return isBean;
- }
-
- protected void openResourceInEditor(String name, EObject object){
- IResource resource = WorkbenchResourceHelper.getFile(object);
- if( resource == null )
- return;
-
- IProject project = resource.getProject();
- IJavaProject javaProject = JavaCore.create(project);
- if(javaProject.exists()){
- IType type = null;
- try {
- //if name is null then can't get type
- if(name != null) {
- type = javaProject.findType( name );
- }
-
- //if type is null then can't open its editor, so open editor for the resource
- if(type != null) {
- if( !type.isBinary() ){
- ICompilationUnit cu = type.getCompilationUnit();
- EditorUtility.openInEditor(cu);
- }else{
- IClassFile classFile = type.getClassFile();
- EditorUtility.openInEditor(classFile);
- }
-
- } else{
- if(resource.exists() && resource.getType() == IResource.FILE ){
- IFile file = (IFile)resource;
- IContentType contentType = IDE.getContentType(file);
- currentDescriptor = PlatformUI.getWorkbench().getEditorRegistry().getDefaultEditor(file.getName(), contentType);
- }
- openAppropriateEditor(resource);
- }
- } catch (JavaModelException e) {
- J2EEUIPlugin.logError(-1, e.getMessage(), e);
- } catch (PartInitException e) {
- J2EEUIPlugin.logError(-1, e.getMessage(), e);
- }
-
- }
- }
-}
diff --git a/plugins/org.eclipse.jst.j2ee.ui/j2ee_ui/org/eclipse/jst/j2ee/internal/actions/WorkspaceModifyComposedOperation.java b/plugins/org.eclipse.jst.j2ee.ui/j2ee_ui/org/eclipse/jst/j2ee/internal/actions/WorkspaceModifyComposedOperation.java
deleted file mode 100644
index ec3fac9..0000000
--- a/plugins/org.eclipse.jst.j2ee.ui/j2ee_ui/org/eclipse/jst/j2ee/internal/actions/WorkspaceModifyComposedOperation.java
+++ /dev/null
@@ -1,44 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2003, 2004 IBM Corporation and others.
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
- *
- * Contributors:
- * IBM Corporation - initial API and implementation
- *******************************************************************************/
-package org.eclipse.jst.j2ee.internal.actions;
-
-import java.util.List;
-
-import org.eclipse.core.runtime.jobs.ISchedulingRule;
-import org.eclipse.jface.operation.IRunnableWithProgress;
-
-/**
- * WARNING: This class will be deleted
- *
- * @deprecated use {@link org.eclipse.wst.common.frameworks.internal.ui.WorkspaceModifyComposedOperation}
- */
-public class WorkspaceModifyComposedOperation extends org.eclipse.wst.common.frameworks.internal.ui.WorkspaceModifyComposedOperation {
- public WorkspaceModifyComposedOperation(ISchedulingRule rule) {
- super(rule);
- }
-
- public WorkspaceModifyComposedOperation() {
- super();
- }
-
- public WorkspaceModifyComposedOperation(ISchedulingRule rule, List nestedRunnablesWithProgress) {
- super(rule, nestedRunnablesWithProgress);
- }
-
- public WorkspaceModifyComposedOperation(List nestedRunnablesWithProgress) {
- super(nestedRunnablesWithProgress);
- }
-
- public WorkspaceModifyComposedOperation(IRunnableWithProgress nestedOp) {
- super(nestedOp);
- }
-
-}
\ No newline at end of file
diff --git a/plugins/org.eclipse.jst.j2ee.ui/j2ee_ui/org/eclipse/jst/j2ee/internal/classpathdep/ui/ClasspathDependencyAttributeConfiguration.java b/plugins/org.eclipse.jst.j2ee.ui/j2ee_ui/org/eclipse/jst/j2ee/internal/classpathdep/ui/ClasspathDependencyAttributeConfiguration.java
deleted file mode 100644
index f183b33..0000000
--- a/plugins/org.eclipse.jst.j2ee.ui/j2ee_ui/org/eclipse/jst/j2ee/internal/classpathdep/ui/ClasspathDependencyAttributeConfiguration.java
+++ /dev/null
@@ -1,111 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2005, 2007 BEA Systems, Inc.
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
- *
- * Contributors:
- * rfrost@bea.com - initial API and implementation
- *******************************************************************************/
-package org.eclipse.jst.j2ee.internal.classpathdep.ui;
-
-import java.net.URL;
-
-import org.eclipse.jdt.core.IClasspathAttribute;
-import org.eclipse.jdt.core.JavaCore;
-import org.eclipse.jdt.ui.wizards.ClasspathAttributeConfiguration;
-import org.eclipse.jface.resource.ImageDescriptor;
-import org.eclipse.jst.j2ee.classpathdep.IClasspathDependencyConstants;
-import org.eclipse.jst.j2ee.internal.plugin.J2EEPlugin;
-import org.eclipse.osgi.util.NLS;
-import org.eclipse.swt.widgets.Shell;
-
-public class ClasspathDependencyAttributeConfiguration extends ClasspathAttributeConfiguration {
-
- private static ImageDescriptor descriptor = null;
-
- /* (non-Javadoc)
- * @see org.eclipse.jdt.ui.wizards.ClasspathAttributeConfiguration#canEdit(org.eclipse.jdt.ui.wizards.ClasspathAttributeConfiguration.ClasspathAttributeAccess)
- */
- @Override
- public boolean canEdit(ClasspathAttributeAccess attribute) {
- return false;
- }
-
- /* (non-Javadoc)
- * @see org.eclipse.jdt.ui.wizards.ClasspathAttributeConfiguration#canRemove(org.eclipse.jdt.ui.wizards.ClasspathAttributeConfiguration.ClasspathAttributeAccess)
- */
- @Override
- public boolean canRemove(ClasspathAttributeAccess attribute) {
- return true;
- }
-
- /* (non-Javadoc)
- * @see org.eclipse.jdt.ui.wizards.ClasspathAttributeConfiguration#getImageDescriptor(org.eclipse.jdt.ui.wizards.ClasspathAttributeConfiguration.ClasspathAttributeAccess)
- */
- @Override
- public ImageDescriptor getImageDescriptor(ClasspathAttributeAccess attribute) {
- if (descriptor == null) {
- final URL gifImageURL = (URL) J2EEPlugin.getPlugin().getImage("CPDep"); //$NON-NLS-1$
- if (gifImageURL != null) {
- descriptor = ImageDescriptor.createFromURL(gifImageURL);
- }
- }
- return descriptor;
- }
-
- /* (non-Javadoc)
- * @see org.eclipse.jdt.ui.wizards.ClasspathAttributeConfiguration#getNameLabel(org.eclipse.jdt.ui.wizards.ClasspathAttributeConfiguration.ClasspathAttributeAccess)
- */
- @Override
- public String getNameLabel(ClasspathAttributeAccess attribute) {
- return Resources.nameLabel;
- }
-
- /* (non-Javadoc)
- * @see org.eclipse.jdt.ui.wizards.ClasspathAttributeConfiguration#getValueLabel(org.eclipse.jdt.ui.wizards.ClasspathAttributeConfiguration.ClasspathAttributeAccess)
- */
- @Override
- public String getValueLabel(ClasspathAttributeAccess attribute) {
- final IClasspathAttribute attrib = attribute.getClasspathAttribute();
- if (attrib != null) {
- final String value = attrib.getValue();
- if (value != null) {
- if (value.equals(IClasspathDependencyConstants.RUNTIME_MAPPING_INTO_CONTAINER)) {
- return Resources.containerMapping;
- }
- return value;
- }
- }
- return Resources.unspecified;
- }
-
- /* (non-Javadoc)
- * @see org.eclipse.jdt.ui.wizards.ClasspathAttributeConfiguration#performEdit(org.eclipse.swt.widgets.Shell, org.eclipse.jdt.ui.wizards.ClasspathAttributeConfiguration.ClasspathAttributeAccess)
- */
- @Override
- public IClasspathAttribute performEdit(Shell shell,
- ClasspathAttributeAccess attribute) {
- return null;
- }
-
- /* (non-Javadoc)
- * @see org.eclipse.jdt.ui.wizards.ClasspathAttributeConfiguration#performRemove(org.eclipse.jdt.ui.wizards.ClasspathAttributeConfiguration.ClasspathAttributeAccess)
- */
- @Override
- public IClasspathAttribute performRemove(ClasspathAttributeAccess attribute) {
- return JavaCore.newClasspathAttribute(IClasspathDependencyConstants.CLASSPATH_COMPONENT_DEPENDENCY, null);
- }
-
- private static final class Resources extends NLS {
- public static String nameLabel;
- public static String unspecified;
- public static String containerMapping;
- static
- {
- initializeMessages( ClasspathDependencyAttributeConfiguration.class.getName(),
- Resources.class );
- }
- }
-}
diff --git a/plugins/org.eclipse.jst.j2ee.ui/j2ee_ui/org/eclipse/jst/j2ee/internal/classpathdep/ui/ClasspathDependencyAttributeConfiguration.properties b/plugins/org.eclipse.jst.j2ee.ui/j2ee_ui/org/eclipse/jst/j2ee/internal/classpathdep/ui/ClasspathDependencyAttributeConfiguration.properties
deleted file mode 100644
index 3f050ff..0000000
--- a/plugins/org.eclipse.jst.j2ee.ui/j2ee_ui/org/eclipse/jst/j2ee/internal/classpathdep/ui/ClasspathDependencyAttributeConfiguration.properties
+++ /dev/null
@@ -1,13 +0,0 @@
-###############################################################################
-# Copyright (c) 2007 BEA Systems, Inc.
-# All rights reserved. This program and the accompanying materials
-# are made available under the terms of the Eclipse Public License v1.0
-# which accompanies this distribution, and is available at
-# http://www.eclipse.org/legal/epl-v10.html
-#
-# Contributors:
-# rfrost@bea.com - initial API and implementation
-###############################################################################
-nameLabel = Publish/export dependency
-unspecified = (None)
-containerMapping = Added to parent module
\ No newline at end of file
diff --git a/plugins/org.eclipse.jst.j2ee.ui/j2ee_ui/org/eclipse/jst/j2ee/internal/classpathdep/ui/ClasspathDependencyValidatorMarkerResolutions.java b/plugins/org.eclipse.jst.j2ee.ui/j2ee_ui/org/eclipse/jst/j2ee/internal/classpathdep/ui/ClasspathDependencyValidatorMarkerResolutions.java
deleted file mode 100644
index 24bf997..0000000
--- a/plugins/org.eclipse.jst.j2ee.ui/j2ee_ui/org/eclipse/jst/j2ee/internal/classpathdep/ui/ClasspathDependencyValidatorMarkerResolutions.java
+++ /dev/null
@@ -1,194 +0,0 @@
-/******************************************************************************
- * Copyright (c) 2007 BEA Systems, Inc.
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
- *
- * Contributors:
- * rfrost@bea.com - initial API and implementation
- ******************************************************************************/
-
-package org.eclipse.jst.j2ee.internal.classpathdep.ui;
-
-import org.eclipse.core.commands.ExecutionException;
-import org.eclipse.core.resources.IMarker;
-import org.eclipse.core.resources.IProject;
-import org.eclipse.core.resources.IResource;
-import org.eclipse.core.runtime.CoreException;
-import org.eclipse.core.runtime.IStatus;
-import org.eclipse.core.runtime.Status;
-import org.eclipse.jdt.core.IClasspathEntry;
-import org.eclipse.jdt.core.IJavaProject;
-import org.eclipse.jdt.core.JavaCore;
-import org.eclipse.jem.util.logger.proxy.Logger;
-import org.eclipse.jface.dialogs.ErrorDialog;
-import org.eclipse.jst.j2ee.classpathdep.UpdateClasspathAttributeUtil;
-import org.eclipse.jst.j2ee.internal.classpathdep.ClasspathDependencyValidator;
-import org.eclipse.jst.j2ee.internal.plugin.J2EEUIPlugin;
-import org.eclipse.jst.j2ee.project.JavaEEProjectUtilities;
-import org.eclipse.osgi.util.NLS;
-import org.eclipse.ui.IMarkerResolution;
-import org.eclipse.ui.IMarkerResolutionGenerator;
-import org.eclipse.wst.validation.internal.ConfigurationConstants;
-
-/**
- * IMarkerResolutionGenerator for classpath dependency validator problem markers.
- */
-public final class ClasspathDependencyValidatorMarkerResolutions implements IMarkerResolutionGenerator {
-
- /* (non-Javadoc)
- * @see org.eclipse.ui.IMarkerResolutionGenerator#getResolutions(org.eclipse.core.resources.IMarker)
- */
- public IMarkerResolution[] getResolutions(final IMarker marker) {
- // generate resolutions based on type of validation problem marker
- String messageId = null;
- String cpEntryPath = null;
- try {
- messageId = (String) marker.getAttribute(ConfigurationConstants.VALIDATION_MARKER_MESSAGEID);
- cpEntryPath = (String) marker.getAttribute(ConfigurationConstants.VALIDATION_MARKER_GROUP);
- } catch (CoreException ce) {
- Logger.getLogger(J2EEUIPlugin.PLUGIN_ID).logError(ce);
- return new IMarkerResolution[0];
- }
-
- if (messageId == null || cpEntryPath == null || cpEntryPath.length() == 0) {
- return new IMarkerResolution[0];
- }
-
- if (ClasspathDependencyValidator.AppClientProject.equals(messageId)) {
- // can apply to multiple cp entries so not currently supporting a quick fix...
- } else if (ClasspathDependencyValidator.DuplicateClassFolderEntry.equals(messageId)) {
- // quick fix removes the dependency
- return new IMarkerResolution[] { new UpdateClasspathDependencyAttributeResolution(cpEntryPath, false) };
- } else if (ClasspathDependencyValidator.DuplicateArchiveName.equals(messageId)) {
- // quick fix removes the dependency
- return new IMarkerResolution[] { new UpdateClasspathDependencyAttributeResolution(cpEntryPath, false) };
- } else if (ClasspathDependencyValidator.FilteredContainer.equals(messageId)) {
- // quick fix removes the dependency
- return new IMarkerResolution[] { new UpdateClasspathDependencyAttributeResolution(cpEntryPath, false) };
- } else if (ClasspathDependencyValidator.InvalidNonWebRuntimePath.equals(messageId)) {
- // quick fix removes the dependency
- return new IMarkerResolution[] { new UpdateClasspathDependencyAttributeResolution(cpEntryPath, false) };
- } else if (ClasspathDependencyValidator.InvalidWebRuntimePath.equals(messageId)) {
- // quick fix removes the dependency
- return new IMarkerResolution[] { new UpdateClasspathDependencyAttributeResolution(cpEntryPath, false) };
- } else if (ClasspathDependencyValidator.NonTaggedExportedClasses.equals(messageId)) {
- IResource resource = marker.getResource();
- if(null != resource && resource.getType() == IResource.PROJECT && !JavaEEProjectUtilities.isApplicationClientProject((IProject)resource)){
- // quick fix adds the dependency, and one to remove it
- return new IMarkerResolution[] { new UpdateClasspathDependencyAttributeResolution(cpEntryPath, true),
- new AddClasspathNonDependencyAttributeResolution(cpEntryPath)};
- }
- // quick fix removes the dependency
- return new IMarkerResolution[] { new AddClasspathNonDependencyAttributeResolution(cpEntryPath) };
- } else if (ClasspathDependencyValidator.ProjectClasspathEntry.equals(messageId)) {
- // quick fix removes the dependency
- return new IMarkerResolution[] { new UpdateClasspathDependencyAttributeResolution(cpEntryPath, false) };
- } else if (ClasspathDependencyValidator.RootMappingNonEARWARRef.equals(messageId)) {
- // can apply to multiple cp entries so not currently supporting a quick fix...
- } else if (ClasspathDependencyValidator.SourceEntry.equals(messageId)) {
- // quick fix removes the dependency
- return new IMarkerResolution[] { new UpdateClasspathDependencyAttributeResolution(cpEntryPath, false) };
- }
-
- return new IMarkerResolution[0];
- }
-
- private static IClasspathEntry getClasspathEntryForMarker(final IMarker marker, final String cpEntryPath) throws CoreException {
- final IProject proj = marker.getResource().getProject();
- if (proj != null && proj.hasNature(JavaCore.NATURE_ID)) {
- final IJavaProject jProject = JavaCore.create(proj);
- if (cpEntryPath != null) {
- IClasspathEntry[] rawCp = jProject.getRawClasspath();
- for (int i = 0; i < rawCp.length; i++) {
- if (rawCp[i].getPath().toString().equals(cpEntryPath)) {
- return rawCp[i];
- }
- }
- }
- }
- return null;
- }
-
- /* Resolution that add/removes the classpath dependency attribute */
- private static final class UpdateClasspathDependencyAttributeResolution implements IMarkerResolution {
- private final boolean add;
- private final String cpEntryPath;
- public UpdateClasspathDependencyAttributeResolution(final String cpEntryPath, final boolean add) {
- this.add = add;
- this.cpEntryPath = cpEntryPath;
- }
-
- public String getLabel() {
- if (add) {
- return Resources.addClasspathDependencyAttribute;
- }
- return Resources.removeClasspathDependencyAttribute;
- }
-
- public void run(final IMarker marker) {
- final IProject proj = marker.getResource().getProject();
- try {
- final IClasspathEntry cpEntry = getClasspathEntryForMarker(marker, cpEntryPath);
- if (add) {
- UpdateClasspathAttributeUtil.addDependencyAttribute(null, proj.getName(), cpEntry);
- } else {
- UpdateClasspathAttributeUtil.removeDependencyAttribute(null, proj.getName(), cpEntry);
- }
- } catch (CoreException ce){
- ErrorDialog.openError(null, Resources.errorDialogTitle,
- Resources.errorDialogMessage,
- ce.getStatus());
- } catch (ExecutionException ee){
- ErrorDialog.openError(null, Resources.errorDialogTitle,
- Resources.errorDialogMessage,
- new Status(IStatus.ERROR, J2EEUIPlugin.PLUGIN_ID, 0, ee.getLocalizedMessage(), ee));
- }
- }
- }
-
- /* Resolution that adds the classpath nondependency attribute */
- private static final class AddClasspathNonDependencyAttributeResolution implements IMarkerResolution {
- private final String cpEntryPath;
- public AddClasspathNonDependencyAttributeResolution(final String cpEntryPath) {
- this.cpEntryPath = cpEntryPath;
- }
-
- public String getLabel() {
- return Resources.addClasspathNonDependencyAttribute;
- }
-
- public void run(final IMarker marker) {
- final IProject proj = marker.getResource().getProject();
- try {
- final IClasspathEntry cpEntry = getClasspathEntryForMarker(marker, cpEntryPath);
- UpdateClasspathAttributeUtil.addNonDependencyAttribute(null, proj.getName(), cpEntry);
- } catch (CoreException ce){
- ErrorDialog.openError(null, Resources.errorDialogTitle,
- Resources.errorDialogMessage,
- ce.getStatus());
- } catch (ExecutionException ee){
- ErrorDialog.openError(null, Resources.errorDialogTitle,
- Resources.errorDialogMessage,
- new Status(IStatus.ERROR, J2EEUIPlugin.PLUGIN_ID, 0, ee.getLocalizedMessage(), ee));
- }
- }
- }
-
- private static final class Resources extends NLS {
- public static String removeClasspathDependencyAttribute;
- public static String addClasspathDependencyAttribute;
- public static String addClasspathNonDependencyAttribute;
- public static String errorDialogTitle;
- public static String errorDialogMessage;
-
- static
- {
- initializeMessages( ClasspathDependencyValidatorMarkerResolutions.class.getName(),
- Resources.class );
- }
- }
-
-
-}
diff --git a/plugins/org.eclipse.jst.j2ee.ui/j2ee_ui/org/eclipse/jst/j2ee/internal/classpathdep/ui/ClasspathDependencyValidatorMarkerResolutions.properties b/plugins/org.eclipse.jst.j2ee.ui/j2ee_ui/org/eclipse/jst/j2ee/internal/classpathdep/ui/ClasspathDependencyValidatorMarkerResolutions.properties
deleted file mode 100644
index c21e5af..0000000
--- a/plugins/org.eclipse.jst.j2ee.ui/j2ee_ui/org/eclipse/jst/j2ee/internal/classpathdep/ui/ClasspathDependencyValidatorMarkerResolutions.properties
+++ /dev/null
@@ -1,15 +0,0 @@
-###############################################################################
-# Copyright (c) 2005, 2007 IBM Corporation and others.
-# All rights reserved. This program and the accompanying materials
-# are made available under the terms of the Eclipse Public License v1.0
-# which accompanies this distribution, and is available at
-# http://www.eclipse.org/legal/epl-v10.html
-#
-# Contributors:
-# IBM Corporation - initial API and implementation
-###############################################################################
-addClasspathDependencyAttribute = Mark the associated raw classpath entry as a publish/export dependency.
-addClasspathNonDependencyAttribute = Exclude the associated raw classpath entry from the set of potential publish/export dependencies.
-removeClasspathDependencyAttribute = Remove publish/export dependency on the associated raw classpath entry.
-errorDialogTitle = Error
-errorDialogMessage = Failed while applying the quick fix.
\ No newline at end of file
diff --git a/plugins/org.eclipse.jst.j2ee.ui/j2ee_ui/org/eclipse/jst/j2ee/internal/classpathdep/ui/ClasspathNonDependencyAttributeConfiguration.java b/plugins/org.eclipse.jst.j2ee.ui/j2ee_ui/org/eclipse/jst/j2ee/internal/classpathdep/ui/ClasspathNonDependencyAttributeConfiguration.java
deleted file mode 100644
index cad0465..0000000
--- a/plugins/org.eclipse.jst.j2ee.ui/j2ee_ui/org/eclipse/jst/j2ee/internal/classpathdep/ui/ClasspathNonDependencyAttributeConfiguration.java
+++ /dev/null
@@ -1,100 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2007 BEA Systems, Inc.
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
- *
- * Contributors:
- * rfrost@bea.com - initial API and implementation
- *******************************************************************************/
-package org.eclipse.jst.j2ee.internal.classpathdep.ui;
-
-import java.net.URL;
-
-import org.eclipse.jdt.core.IClasspathAttribute;
-import org.eclipse.jdt.core.JavaCore;
-import org.eclipse.jdt.ui.wizards.ClasspathAttributeConfiguration;
-import org.eclipse.jface.resource.ImageDescriptor;
-import org.eclipse.jst.j2ee.classpathdep.IClasspathDependencyConstants;
-import org.eclipse.jst.j2ee.internal.plugin.J2EEPlugin;
-import org.eclipse.osgi.util.NLS;
-import org.eclipse.swt.widgets.Shell;
-
-public class ClasspathNonDependencyAttributeConfiguration extends ClasspathAttributeConfiguration {
-
- private static ImageDescriptor descriptor = null;
-
- /* (non-Javadoc)
- * @see org.eclipse.jdt.ui.wizards.ClasspathAttributeConfiguration#canEdit(org.eclipse.jdt.ui.wizards.ClasspathAttributeConfiguration.ClasspathAttributeAccess)
- */
- @Override
- public boolean canEdit(ClasspathAttributeAccess attribute) {
- return false;
- }
-
- /* (non-Javadoc)
- * @see org.eclipse.jdt.ui.wizards.ClasspathAttributeConfiguration#canRemove(org.eclipse.jdt.ui.wizards.ClasspathAttributeConfiguration.ClasspathAttributeAccess)
- */
- @Override
- public boolean canRemove(ClasspathAttributeAccess attribute) {
- return true;
- }
-
- /* (non-Javadoc)
- * @see org.eclipse.jdt.ui.wizards.ClasspathAttributeConfiguration#getImageDescriptor(org.eclipse.jdt.ui.wizards.ClasspathAttributeConfiguration.ClasspathAttributeAccess)
- */
- @Override
- public ImageDescriptor getImageDescriptor(ClasspathAttributeAccess attribute) {
- if (descriptor == null) {
- final URL gifImageURL = (URL) J2EEPlugin.getPlugin().getImage("CPDep"); //$NON-NLS-1$
- if (gifImageURL != null) {
- descriptor = ImageDescriptor.createFromURL(gifImageURL);
- }
- }
- return descriptor;
- }
-
- /* (non-Javadoc)
- * @see org.eclipse.jdt.ui.wizards.ClasspathAttributeConfiguration#getNameLabel(org.eclipse.jdt.ui.wizards.ClasspathAttributeConfiguration.ClasspathAttributeAccess)
- */
- @Override
- public String getNameLabel(ClasspathAttributeAccess attribute) {
- return Resources.nameLabel;
- }
-
- /* (non-Javadoc)
- * @see org.eclipse.jdt.ui.wizards.ClasspathAttributeConfiguration#getValueLabel(org.eclipse.jdt.ui.wizards.ClasspathAttributeConfiguration.ClasspathAttributeAccess)
- */
- @Override
- public String getValueLabel(ClasspathAttributeAccess attribute) {
- return Resources.unspecified;
- }
-
- /* (non-Javadoc)
- * @see org.eclipse.jdt.ui.wizards.ClasspathAttributeConfiguration#performEdit(org.eclipse.swt.widgets.Shell, org.eclipse.jdt.ui.wizards.ClasspathAttributeConfiguration.ClasspathAttributeAccess)
- */
- @Override
- public IClasspathAttribute performEdit(Shell shell,
- ClasspathAttributeAccess attribute) {
- return null;
- }
-
- /* (non-Javadoc)
- * @see org.eclipse.jdt.ui.wizards.ClasspathAttributeConfiguration#performRemove(org.eclipse.jdt.ui.wizards.ClasspathAttributeConfiguration.ClasspathAttributeAccess)
- */
- @Override
- public IClasspathAttribute performRemove(ClasspathAttributeAccess attribute) {
- return JavaCore.newClasspathAttribute(IClasspathDependencyConstants.CLASSPATH_COMPONENT_NON_DEPENDENCY, null);
- }
-
- private static final class Resources extends NLS {
- public static String nameLabel;
- public static String unspecified;
- static
- {
- initializeMessages( ClasspathNonDependencyAttributeConfiguration.class.getName(),
- Resources.class );
- }
- }
-}
diff --git a/plugins/org.eclipse.jst.j2ee.ui/j2ee_ui/org/eclipse/jst/j2ee/internal/classpathdep/ui/ClasspathNonDependencyAttributeConfiguration.properties b/plugins/org.eclipse.jst.j2ee.ui/j2ee_ui/org/eclipse/jst/j2ee/internal/classpathdep/ui/ClasspathNonDependencyAttributeConfiguration.properties
deleted file mode 100644
index 5234408..0000000
--- a/plugins/org.eclipse.jst.j2ee.ui/j2ee_ui/org/eclipse/jst/j2ee/internal/classpathdep/ui/ClasspathNonDependencyAttributeConfiguration.properties
+++ /dev/null
@@ -1,12 +0,0 @@
-###############################################################################
-# Copyright (c) 2007 BEA Systems, Inc.
-# All rights reserved. This program and the accompanying materials
-# are made available under the terms of the Eclipse Public License v1.0
-# which accompanies this distribution, and is available at
-# http://www.eclipse.org/legal/epl-v10.html
-#
-# Contributors:
-# rfrost@bea.com - initial API and implementation
-###############################################################################
-nameLabel = Excluded from publish/export structure
-unspecified = (None)
\ No newline at end of file
diff --git a/plugins/org.eclipse.jst.j2ee.ui/j2ee_ui/org/eclipse/jst/j2ee/internal/client/actions/AppClientArchiveUIResourceHandler.java b/plugins/org.eclipse.jst.j2ee.ui/j2ee_ui/org/eclipse/jst/j2ee/internal/client/actions/AppClientArchiveUIResourceHandler.java
deleted file mode 100644
index f610fcf..0000000
--- a/plugins/org.eclipse.jst.j2ee.ui/j2ee_ui/org/eclipse/jst/j2ee/internal/client/actions/AppClientArchiveUIResourceHandler.java
+++ /dev/null
@@ -1,59 +0,0 @@
-/***************************************************************************************************
- * Copyright (c) 2003, 2004 IBM Corporation and others. All rights reserved. This program and the
- * accompanying materials are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
- *
- * Contributors: IBM Corporation - initial API and implementation
- **************************************************************************************************/
-package org.eclipse.jst.j2ee.internal.client.actions;
-
-
-
-import java.text.MessageFormat;
-import java.util.MissingResourceException;
-import java.util.ResourceBundle;
-
-public class AppClientArchiveUIResourceHandler {
-
- private static ResourceBundle fgResourceBundle;
-
- /**
- * Returns the resource bundle used by all classes in this Project
- */
- public static ResourceBundle getResourceBundle() {
- try {
- return ResourceBundle.getBundle("appclientarchiveui");//$NON-NLS-1$
- } catch (MissingResourceException e) {
- // does nothing - this method will return null and
- // getString(String, String) will return the key
- // it was called with
- }
- return null;
- }
-
- public static String getString(String key) {
- if (fgResourceBundle == null) {
- fgResourceBundle = getResourceBundle();
- }
-
- if (fgResourceBundle != null) {
- try {
- return fgResourceBundle.getString(key);
- } catch (MissingResourceException e) {
- return "!" + key + "!";//$NON-NLS-2$//$NON-NLS-1$
- }
- }
- return "!" + key + "!";//$NON-NLS-2$//$NON-NLS-1$
- }
-
- public static String getString(String key, Object[] args) {
-
- try {
- return MessageFormat.format(getString(key), args);
- } catch (IllegalArgumentException e) {
- return getString(key);
- }
-
- }
-}
\ No newline at end of file
diff --git a/plugins/org.eclipse.jst.j2ee.ui/j2ee_ui/org/eclipse/jst/j2ee/internal/client/actions/ExportApplicationClientAction.java b/plugins/org.eclipse.jst.j2ee.ui/j2ee_ui/org/eclipse/jst/j2ee/internal/client/actions/ExportApplicationClientAction.java
deleted file mode 100644
index 519b60b..0000000
--- a/plugins/org.eclipse.jst.j2ee.ui/j2ee_ui/org/eclipse/jst/j2ee/internal/client/actions/ExportApplicationClientAction.java
+++ /dev/null
@@ -1,52 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2003, 2005 IBM Corporation and others.
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
- *
- * Contributors:
- * IBM Corporation - initial API and implementation
- *******************************************************************************/
-/*
- * Created on Mar 27, 2003
- *
- * To change this generated comment go to
- * Window>Preferences>Java>Code Generation>Code and Comments
- */
-package org.eclipse.jst.j2ee.internal.client.actions;
-
-import org.eclipse.jface.wizard.WizardDialog;
-import org.eclipse.jst.j2ee.internal.actions.BaseAction;
-import org.eclipse.jst.j2ee.internal.plugin.J2EEUIPlugin;
-import org.eclipse.jst.j2ee.internal.wizard.AppClientComponentExportWizard;
-import org.eclipse.swt.widgets.Shell;
-
-
-/**
- * @author jsholl
- *
- * To change this generated comment go to Window>Preferences>Java>Code Generation>Code and Comments
- */
-public class ExportApplicationClientAction extends BaseAction {
- public static String LABEL = J2EEUIPlugin.getDefault().getDescriptor().getResourceString("%client.export.action.label_ui_"); //$NON-NLS-1$
- private static final String ICON = "appclient_export_wiz"; //$NON-NLS-1$
-
- public ExportApplicationClientAction() {
- super();
- setText(LABEL);
- setImageDescriptor(J2EEUIPlugin.getDefault().getImageDescriptor(ICON));
- }
-
- @Override
- protected void primRun(Shell shell) {
- AppClientComponentExportWizard wizard = new AppClientComponentExportWizard();
- J2EEUIPlugin plugin = J2EEUIPlugin.getDefault();
- wizard.init(plugin.getWorkbench(), selection);
-
- WizardDialog dialog = new WizardDialog(shell, wizard);
- dialog.create();
- dialog.open();
- }
-
-}
diff --git a/plugins/org.eclipse.jst.j2ee.ui/j2ee_ui/org/eclipse/jst/j2ee/internal/client/actions/ImportApplicationClientAction.java b/plugins/org.eclipse.jst.j2ee.ui/j2ee_ui/org/eclipse/jst/j2ee/internal/client/actions/ImportApplicationClientAction.java
deleted file mode 100644
index 393146f..0000000
--- a/plugins/org.eclipse.jst.j2ee.ui/j2ee_ui/org/eclipse/jst/j2ee/internal/client/actions/ImportApplicationClientAction.java
+++ /dev/null
@@ -1,57 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2003, 2005 IBM Corporation and others.
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
- *
- * Contributors:
- * IBM Corporation - initial API and implementation
- *******************************************************************************/
-/*
- * Created on Mar 27, 2003
- *
- * To change this generated comment go to
- * Window>Preferences>Java>Code Generation>Code and Comments
- */
-package org.eclipse.jst.j2ee.internal.client.actions;
-
-import org.eclipse.jface.viewers.StructuredSelection;
-import org.eclipse.jface.wizard.WizardDialog;
-import org.eclipse.jst.j2ee.internal.actions.BaseAction;
-import org.eclipse.jst.j2ee.internal.plugin.J2EEUIPlugin;
-import org.eclipse.jst.j2ee.internal.wizard.AppClientComponentImportWizard;
-import org.eclipse.swt.widgets.Shell;
-
-
-/**
- * @author jsholl
- *
- * To change this generated comment go to Window>Preferences>Java>Code Generation>Code and Comments
- */
-public class ImportApplicationClientAction extends BaseAction {
-
- public static String LABEL = AppClientArchiveUIResourceHandler.getString("Application_Client_Import_UI_"); //$NON-NLS-1$
- private static final String ICON = "appclient_import_wiz"; //$NON-NLS-1$
-
- public ImportApplicationClientAction() {
- super();
- setText(LABEL);
- setImageDescriptor(J2EEUIPlugin.getDefault().getImageDescriptor(ICON));
- }
-
- @Override
- protected void primRun(Shell shell) {
-
- AppClientComponentImportWizard wizard = new AppClientComponentImportWizard();
-
- J2EEUIPlugin plugin = J2EEUIPlugin.getDefault();
-
- wizard.init(plugin.getWorkbench(), StructuredSelection.EMPTY);
-
- WizardDialog dialog = new WizardDialog(shell, wizard);
- dialog.create();
- dialog.open();
- }
-
-}
diff --git a/plugins/org.eclipse.jst.j2ee.ui/j2ee_ui/org/eclipse/jst/j2ee/internal/command/AbstractOverrideCommand.java b/plugins/org.eclipse.jst.j2ee.ui/j2ee_ui/org/eclipse/jst/j2ee/internal/command/AbstractOverrideCommand.java
deleted file mode 100644
index acb50d9..0000000
--- a/plugins/org.eclipse.jst.j2ee.ui/j2ee_ui/org/eclipse/jst/j2ee/internal/command/AbstractOverrideCommand.java
+++ /dev/null
@@ -1,101 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2003, 2004 IBM Corporation and others.
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
- *
- * Contributors:
- * IBM Corporation - initial API and implementation
- *******************************************************************************/
-package org.eclipse.jst.j2ee.internal.command;
-
-
-import java.util.Collection;
-
-import org.eclipse.emf.common.command.AbstractCommand;
-import org.eclipse.emf.edit.command.AbstractOverrideableCommand;
-import org.eclipse.emf.edit.domain.EditingDomain;
-
-/**
- * Insert the type's description here. Creation date: (06/07/01 10:56:08 AM)
- *
- * @author: Administrator
- */
-public abstract class AbstractOverrideCommand extends AbstractCommand {
- private AbstractOverrideableCommand overridable;
- private J2EEClipboard j2eeClipboard;
-
- /**
- * AbstractOverrideCommand constructor comment.
- */
- protected AbstractOverrideCommand() {
- super();
- }
-
- public AbstractOverrideCommand(AbstractOverrideableCommand command) {
- super(command.getLabel(), command.getDescription());
- setOverridable(command);
- }
-
- @Override
- public boolean canExecute() {
- return super.canExecute() && overridable.doCanExecute();
- }
-
- @Override
- public boolean canUndo() {
- return overridable.doCanUndo();
- }
-
- @Override
- public Collection getAffectedObjects() {
- return overridable.doGetAffectedObjects();
- }
-
- public EditingDomain getDomain() {
- return getOverridable().getDomain();
- }
-
- /**
- * Insert the method's description here. Creation date: (06/07/01 11:19:27 AM)
- *
- * @return org.eclipse.jst.j2ee.internal.internal.internal.command.J2EEClipboard
- */
- public J2EEClipboard getJ2eeClipboard() {
- return j2eeClipboard;
- }
-
- /**
- * Insert the method's description here. Creation date: (06/07/01 10:58:33 AM)
- *
- * @return AbstractOverrideableCommand
- */
- public AbstractOverrideableCommand getOverridable() {
- return overridable;
- }
-
- @Override
- public Collection getResult() {
- return getJ2eeClipboard();
- }
-
- /**
- * Insert the method's description here. Creation date: (06/07/01 11:19:27 AM)
- *
- * @param newJ2eeClipboard
- * org.eclipse.jst.j2ee.internal.internal.internal.command.J2EEClipboard
- */
- protected void setJ2eeClipboard(J2EEClipboard newJ2eeClipboard) {
- j2eeClipboard = newJ2eeClipboard;
- }
-
- /**
- * Insert the method's description here. Creation date: (06/07/01 10:58:33 AM)
- *
- * @param AbstractOverrideableCommand
- */
- protected void setOverridable(AbstractOverrideableCommand newOverridable) {
- overridable = newOverridable;
- }
-}
\ No newline at end of file
diff --git a/plugins/org.eclipse.jst.j2ee.ui/j2ee_ui/org/eclipse/jst/j2ee/internal/command/J2EEClipboard.java b/plugins/org.eclipse.jst.j2ee.ui/j2ee_ui/org/eclipse/jst/j2ee/internal/command/J2EEClipboard.java
deleted file mode 100644
index 313934d..0000000
--- a/plugins/org.eclipse.jst.j2ee.ui/j2ee_ui/org/eclipse/jst/j2ee/internal/command/J2EEClipboard.java
+++ /dev/null
@@ -1,84 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2003, 2005 IBM Corporation and others.
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
- *
- * Contributors:
- * IBM Corporation - initial API and implementation
- *******************************************************************************/
-package org.eclipse.jst.j2ee.internal.command;
-
-
-import java.util.ArrayList;
-import java.util.Collection;
-import java.util.HashMap;
-import java.util.Map;
-
-import org.eclipse.emf.ecore.EObject;
-
-public class J2EEClipboard extends ArrayList {
- /**
- * Warning cleanup 12/07/2005
- */
- private static final long serialVersionUID = 8713021573099134096L;
- private Map bindings;
- private Map extensions;
-
- /**
- * J2EEClipboard constructor comment.
- */
- public J2EEClipboard(Collection defaultClipboard) {
- super(defaultClipboard);
- }
-
- @Override
- public boolean addAll(Collection c) {
- boolean result = super.addAll(c);
- if (result && (c instanceof J2EEClipboard))
- addAllExtra((J2EEClipboard) c);
- return result;
- }
-
- protected void addAllExtra(J2EEClipboard c) {
- getBindings().putAll(c.getBindings());
- getExtensions().putAll(c.getExtensions());
- }
-
- protected void addBinding(EObject boundObject, EObject binding) {
- getBindings().put(boundObject, binding);
- }
-
- protected void addExtension(EObject extendedObject, EObject extension) {
- getExtensions().put(extendedObject, extension);
- }
-
- public EObject getBinding(EObject o) {
- return (EObject) getBindings().get(o);
- }
-
- protected Map getBindings() {
- if (bindings == null)
- bindings = new HashMap(10);
- return bindings;
- }
-
- public EObject getExtension(EObject o) {
- return (EObject) getExtensions().get(o);
- }
-
- protected Map getExtensions() {
- if (extensions == null)
- extensions = new HashMap(10);
- return extensions;
- }
-
- public boolean hasBindings() {
- return bindings != null && !bindings.isEmpty();
- }
-
- public boolean hasExtensions() {
- return extensions != null && !extensions.isEmpty();
- }
-}
diff --git a/plugins/org.eclipse.jst.j2ee.ui/j2ee_ui/org/eclipse/jst/j2ee/internal/command/J2EECompoundCommand.java b/plugins/org.eclipse.jst.j2ee.ui/j2ee_ui/org/eclipse/jst/j2ee/internal/command/J2EECompoundCommand.java
deleted file mode 100644
index 7fa7913..0000000
--- a/plugins/org.eclipse.jst.j2ee.ui/j2ee_ui/org/eclipse/jst/j2ee/internal/command/J2EECompoundCommand.java
+++ /dev/null
@@ -1,193 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2003, 2004 IBM Corporation and others.
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
- *
- * Contributors:
- * IBM Corporation - initial API and implementation
- *******************************************************************************/
-package org.eclipse.jst.j2ee.internal.command;
-
-
-import java.util.ArrayList;
-import java.util.Collection;
-import java.util.Iterator;
-
-import org.eclipse.emf.common.command.Command;
-import org.eclipse.emf.common.command.CompoundCommand;
-
-/**
- * Insert the type's description here. Creation date: (06/13/01 10:27:16 AM)
- *
- * @author: Administrator
- */
-public class J2EECompoundCommand extends CompoundCommand {
- /**
- * J2EECompoundCommand constructor comment.
- */
- public J2EECompoundCommand() {
- super();
- }
-
- /**
- * J2EECompoundCommand constructor comment.
- *
- * @param resultIndex
- * int
- */
- public J2EECompoundCommand(int resultIndex) {
- super(resultIndex);
- }
-
- /**
- * J2EECompoundCommand constructor comment.
- *
- * @param resultIndex
- * int
- * @param label
- * java.lang.String
- */
- public J2EECompoundCommand(int resultIndex, String label) {
- super(resultIndex, label);
- }
-
- /**
- * J2EECompoundCommand constructor comment.
- *
- * @param resultIndex
- * int
- * @param label
- * java.lang.String
- * @param description
- * java.lang.String
- */
- public J2EECompoundCommand(int resultIndex, String label, String description) {
- super(resultIndex, label, description);
- }
-
- /**
- * J2EECompoundCommand constructor comment.
- *
- * @param resultIndex
- * int
- * @param label
- * java.lang.String
- * @param description
- * java.lang.String
- * @param commandList
- * java.util.List
- */
- public J2EECompoundCommand(int resultIndex, String label, String description, java.util.List commandList) {
- super(resultIndex, label, description, commandList);
- }
-
- /**
- * J2EECompoundCommand constructor comment.
- *
- * @param resultIndex
- * int
- * @param label
- * java.lang.String
- * @param commandList
- * java.util.List
- */
- public J2EECompoundCommand(int resultIndex, String label, java.util.List commandList) {
- super(resultIndex, label, commandList);
- }
-
- /**
- * J2EECompoundCommand constructor comment.
- *
- * @param resultIndex
- * int
- * @param commandList
- * java.util.List
- */
- public J2EECompoundCommand(int resultIndex, java.util.List commandList) {
- super(resultIndex, commandList);
- }
-
- /**
- * J2EECompoundCommand constructor comment.
- *
- * @param label
- * java.lang.String
- */
- public J2EECompoundCommand(String label) {
- super(label);
- }
-
- /**
- * J2EECompoundCommand constructor comment.
- *
- * @param label
- * java.lang.String
- * @param description
- * java.lang.String
- */
- public J2EECompoundCommand(String label, String description) {
- super(label, description);
- }
-
- /**
- * J2EECompoundCommand constructor comment.
- *
- * @param label
- * java.lang.String
- * @param description
- * java.lang.String
- * @param commandList
- * java.util.List
- */
- public J2EECompoundCommand(String label, String description, java.util.List commandList) {
- super(label, description, commandList);
- }
-
- /**
- * J2EECompoundCommand constructor comment.
- *
- * @param label
- * java.lang.String
- * @param commandList
- * java.util.List
- */
- public J2EECompoundCommand(String label, java.util.List commandList) {
- super(label, commandList);
- }
-
- /**
- * J2EECompoundCommand constructor comment.
- *
- * @param commandList
- * java.util.List
- */
- public J2EECompoundCommand(java.util.List commandList) {
- super(commandList);
- }
-
- @Override
- protected Collection getMergedAffectedObjectsCollection() {
- J2EEClipboard result = new J2EEClipboard(new ArrayList());
-
- for (Iterator commands = commandList.iterator(); commands.hasNext();) {
- Command command = (Command) commands.next();
- result.addAll(command.getAffectedObjects());
- }
-
- return result;
- }
-
- @Override
- protected Collection getMergedResultCollection() {
- J2EEClipboard result = new J2EEClipboard(new ArrayList());
-
- for (Iterator commands = commandList.iterator(); commands.hasNext();) {
- Command command = (Command) commands.next();
- result.addAll(command.getResult());
- }
-
- return result;
- }
-}
\ No newline at end of file
diff --git a/plugins/org.eclipse.jst.j2ee.ui/j2ee_ui/org/eclipse/jst/j2ee/internal/command/J2EECopyCommand.java b/plugins/org.eclipse.jst.j2ee.ui/j2ee_ui/org/eclipse/jst/j2ee/internal/command/J2EECopyCommand.java
deleted file mode 100644
index 2a8f4fa..0000000
--- a/plugins/org.eclipse.jst.j2ee.ui/j2ee_ui/org/eclipse/jst/j2ee/internal/command/J2EECopyCommand.java
+++ /dev/null
@@ -1,84 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2003, 2005 IBM Corporation and others.
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
- *
- * Contributors:
- * IBM Corporation - initial API and implementation
- *******************************************************************************/
-package org.eclipse.jst.j2ee.internal.command;
-
-
-import java.util.Collection;
-import java.util.Collections;
-
-import org.eclipse.emf.common.command.AbstractCommand;
-import org.eclipse.emf.ecore.EObject;
-import org.eclipse.wst.common.internal.emf.utilities.CopyGroup;
-import org.eclipse.wst.common.internal.emf.utilities.EtoolsCopyUtility;
-
-
-public class J2EECopyCommand extends AbstractCommand {
- protected EObject objectToCopy;
- protected EObject bindingToCopy;
- protected EObject extensionToCopy;
- protected J2EEClipboard result;
- protected EtoolsCopyUtility copyUtil;
-
- public J2EECopyCommand(EObject object, EObject binding, EObject extension, EtoolsCopyUtility copyUtility) {
- objectToCopy = object;
- bindingToCopy = binding;
- extensionToCopy = extension;
- copyUtil = copyUtility;
- }
-
- /**
- * This will perform the command activity required for the effect. The effect of calling execute
- * when canExecute returns false, or when canExecute hasn't been called, is undefined.
- */
- public void execute() {
- CopyGroup group = new CopyGroup();
-
- group.add(objectToCopy);
-
- if (bindingToCopy != null)
- group.add(bindingToCopy);
- if (extensionToCopy != null)
- group.add(extensionToCopy);
- copyUtil.copy(group);
- EObject copy = copyUtil.getCopy(objectToCopy);
- result = new J2EEClipboard(Collections.singleton(copy));
-
- if (bindingToCopy != null)
- result.addBinding(copy, copyUtil.getCopy(bindingToCopy));
- if (extensionToCopy != null)
- result.addExtension(copy, copyUtil.getCopy(extensionToCopy));
- }
-
- @Override
- public Collection getAffectedObjects() {
- return result;
- }
-
- @Override
- public Collection getResult() {
- return result;
- }
-
- @Override
- protected boolean prepare() {
- return true;
- }
-
- /**
- * This will again perform the command activity required to redo the effect after undoing the
- * effect. The effect, if any, of calling redo before undo is called is undefined. Note that if
- * you implement redo to call execute then any derived class will be restricted to by that
- * decision also.
- */
- public void redo() {
- //redo
- }
-}
diff --git a/plugins/org.eclipse.jst.j2ee.ui/j2ee_ui/org/eclipse/jst/j2ee/internal/command/J2EECopyFromClipboardCommand.java b/plugins/org.eclipse.jst.j2ee.ui/j2ee_ui/org/eclipse/jst/j2ee/internal/command/J2EECopyFromClipboardCommand.java
deleted file mode 100644
index 2c1a1dd..0000000
--- a/plugins/org.eclipse.jst.j2ee.ui/j2ee_ui/org/eclipse/jst/j2ee/internal/command/J2EECopyFromClipboardCommand.java
+++ /dev/null
@@ -1,100 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2003, 2005 IBM Corporation and others.
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
- *
- * Contributors:
- * IBM Corporation - initial API and implementation
- *******************************************************************************/
-package org.eclipse.jst.j2ee.internal.command;
-
-
-import java.util.ArrayList;
-import java.util.Collection;
-
-import org.eclipse.emf.common.command.AbstractCommand;
-import org.eclipse.emf.ecore.EObject;
-import org.eclipse.jst.j2ee.internal.provider.J2EEUIEditingDomain;
-import org.eclipse.wst.common.internal.emf.utilities.CopyGroup;
-import org.eclipse.wst.common.internal.emf.utilities.EtoolsCopyUtility;
-
-
-/**
- * Insert the type's description here. Creation date: (06/11/01 8:45:21 AM)
- *
- * @author: Administrator
- */
-public class J2EECopyFromClipboardCommand extends AbstractCommand {
- private J2EEUIEditingDomain domain;
- private J2EEClipboard result;
- private EtoolsCopyUtility copyUtil;
-
- public J2EECopyFromClipboardCommand(J2EEUIEditingDomain editingDomain) {
- domain = editingDomain;
-
- }
-
- /**
- * This will perform the command activity required for the effect. The effect of calling execute
- * when canExecute returns false, or when canExecute hasn't been called, is undefined.
- */
- public void execute() {
- if (copyUtil != null)
- return;
- copyUtil = new EtoolsCopyUtility();
- J2EEClipboard clipboard = domain.getJ2EEClipboard();
- result = new J2EEClipboard(new ArrayList(0));
- for (int i = 0; i < clipboard.size(); i++) {
- CopyGroup group = new CopyGroup();
- EObject o = (EObject) clipboard.get(i);
- group.add(o);
- EObject bnd = clipboard.getBinding(o);
- if (bnd != null)
- group.add(bnd);
- EObject ext = clipboard.getExtension(o);
- if (ext != null)
- group.add(ext);
- copyUtil.copy(group);
- EObject copy = copyUtil.getCopy(o);
- result.add(copy);
- if (bnd != null)
- result.addBinding(copy, copyUtil.getCopy(bnd));
- if (ext != null)
- result.addExtension(copy, copyUtil.getCopy(ext));
- }
- //Reset the util so redo will actuall redo
- copyUtil = null;
- }
-
- @Override
- public Collection getAffectedObjects() {
- return result;
- }
-
- @Override
- public Collection getResult() {
- return result;
- }
-
- @Override
- protected boolean prepare() {
- return true;
- }
-
- /**
- * This will again perform the command activity required to redo the effect after undoing the
- * effect. The effect, if any, of calling redo before undo is called is undefined. Note that if
- * you implement redo to call execute then any derived class will be restricted to by that
- * decision also.
- */
- public void redo() {
- execute();
- }
-
- @Override
- public void undo() {
- result = null;
- }
-}
diff --git a/plugins/org.eclipse.jst.j2ee.ui/j2ee_ui/org/eclipse/jst/j2ee/internal/command/J2EECopyToClipboardOverrideCommand.java b/plugins/org.eclipse.jst.j2ee.ui/j2ee_ui/org/eclipse/jst/j2ee/internal/command/J2EECopyToClipboardOverrideCommand.java
deleted file mode 100644
index 5d2b7fc..0000000
--- a/plugins/org.eclipse.jst.j2ee.ui/j2ee_ui/org/eclipse/jst/j2ee/internal/command/J2EECopyToClipboardOverrideCommand.java
+++ /dev/null
@@ -1,85 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2003, 2005 IBM Corporation and others.
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
- *
- * Contributors:
- * IBM Corporation - initial API and implementation
- *******************************************************************************/
-package org.eclipse.jst.j2ee.internal.command;
-
-
-import java.util.Iterator;
-
-import org.eclipse.emf.common.command.Command;
-import org.eclipse.emf.common.command.CompoundCommand;
-import org.eclipse.emf.common.command.UnexecutableCommand;
-import org.eclipse.emf.ecore.EObject;
-import org.eclipse.emf.edit.command.CopyToClipboardCommand;
-import org.eclipse.wst.common.internal.emf.utilities.EtoolsCopyUtility;
-
-
-public class J2EECopyToClipboardOverrideCommand extends CopyToClipboardCommand {
- //The collection of source objects, with bindings and extensions, if any exist
- protected J2EEClipboard extendedSourceObjects;
- protected boolean onlyRefObjects = true;
-
- public J2EECopyToClipboardOverrideCommand(CopyToClipboardCommand cmd) {
- super(cmd.getDomain(), cmd.getSourceObjects());
- }
-
- protected Command createCopyCommand() {
- CompoundCommand cmd = new J2EECompoundCommand(CompoundCommand.MERGE_COMMAND_ALL);
- Iterator it = extendedSourceObjects.iterator();
- EtoolsCopyUtility copyUtil = new EtoolsCopyUtility();
- while (it.hasNext()) {
- Object o = it.next();
- if (!(o instanceof EObject)) {
- cmd.append(UnexecutableCommand.INSTANCE);
- } else {
- EObject r = (EObject) o;
- cmd.append(new J2EECopyCommand(r, extendedSourceObjects.getBinding(r), extendedSourceObjects.getExtension(r), copyUtil));
- }
- }
- return cmd.unwrap();
- }
-
- @Override
- protected boolean prepare() {
- prepareSourceObjects();
- if (!onlyRefObjects) {
- copyCommand = UnexecutableCommand.INSTANCE;
- return copyCommand.canExecute();
- }
-
- if (!extendedSourceObjects.hasBindings() && !extendedSourceObjects.hasExtensions())
- return super.prepare();
-
- copyCommand = createCopyCommand();
- return copyCommand.canExecute();
- }
-
- protected void prepareSourceObjects() {
- extendedSourceObjects = new J2EEClipboard(getSourceObjects());
- Iterator it = getSourceObjects().iterator();
- while (it.hasNext()) {
- Object o = it.next();
- if (o instanceof EObject) {
- // EObject r = (EObject) o;
- // TODO switch to adaptable commands
- // EObject bnd = BindingAndExtensionHelper.getBinding(r);
- // EObject ext = BindingAndExtensionHelper.getExtension(r);
- // if (bnd != null)
- // extendedSourceObjects.addBinding(r, bnd);
- // if (ext != null)
- // extendedSourceObjects.addExtension(r, ext);
- } else {
- //Right now we can only handle ref objects in the tree
- onlyRefObjects = false;
- return;
- }
- }
- }
-}
diff --git a/plugins/org.eclipse.jst.j2ee.ui/j2ee_ui/org/eclipse/jst/j2ee/internal/command/J2EEPasteFromClipboardOverrideCommand.java b/plugins/org.eclipse.jst.j2ee.ui/j2ee_ui/org/eclipse/jst/j2ee/internal/command/J2EEPasteFromClipboardOverrideCommand.java
deleted file mode 100644
index 93cd5a9..0000000
--- a/plugins/org.eclipse.jst.j2ee.ui/j2ee_ui/org/eclipse/jst/j2ee/internal/command/J2EEPasteFromClipboardOverrideCommand.java
+++ /dev/null
@@ -1,157 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2003, 2005 IBM Corporation and others.
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
- *
- * Contributors:
- * IBM Corporation - initial API and implementation
- *******************************************************************************/
-package org.eclipse.jst.j2ee.internal.command;
-
-
-import java.util.Collection;
-
-import org.eclipse.emf.common.command.Command;
-import org.eclipse.emf.common.command.CommandWrapper;
-import org.eclipse.emf.common.command.StrictCompoundCommand;
-import org.eclipse.emf.ecore.EObject;
-import org.eclipse.emf.edit.command.AddCommand;
-import org.eclipse.emf.edit.command.PasteFromClipboardCommand;
-import org.eclipse.jst.j2ee.common.internal.util.IDUtility;
-import org.eclipse.jst.j2ee.internal.provider.J2EEUIEditingDomain;
-
-
-public class J2EEPasteFromClipboardOverrideCommand extends PasteFromClipboardCommand {
- private J2EECopyFromClipboardCommand copyCommand;
- private Command addBindingsCommand;
- private Command addExtensionsCommand;
-
- public J2EEPasteFromClipboardOverrideCommand(PasteFromClipboardCommand p) {
- super(p.getDomain(), p.getOwner(), p.getFeature(), p.getIndex(), false);
- }
-
- @Override
- public void doExecute() {
- super.doExecute();
- executeAddBindings();
- executeAddExtensions();
- J2EEClipboard result = (J2EEClipboard) doGetResult();
- for (int i = 0; i < result.size(); i++) {
- EObject o = (EObject) result.get(i);
- if (result.getBinding(o) != null || result.getExtension(o) != null)
- IDUtility.setDefaultID(o, true);
- }
- }
-
- @Override
- public Collection doGetAffectedObjects() {
- return copyCommand.getAffectedObjects();
- }
-
- @Override
- public Collection doGetResult() {
- return copyCommand.getResult();
- }
-
- @Override
- public void doRedo() {
- super.doRedo();
- if (addBindingsCommand != null)
- addBindingsCommand.redo();
- if (addExtensionsCommand != null)
- addExtensionsCommand.redo();
- }
-
- @Override
- public void doUndo() {
- super.doUndo();
- if (addBindingsCommand != null)
- addBindingsCommand.undo();
- if (addExtensionsCommand != null)
- addExtensionsCommand.undo();
- }
-
- protected void executeAddBindings() {
- if (addBindingsCommand != null && addBindingsCommand.canExecute())
- addBindingsCommand.execute();
- }
-
- protected void executeAddExtensions() {
- if (addExtensionsCommand != null && addExtensionsCommand.canExecute())
- addExtensionsCommand.execute();
- }
-
- public J2EEClipboard getCopiedClipoard() {
- return (J2EEClipboard) copyCommand.getResult();
- }
-
- protected J2EEClipboard getJ2EEClipboard() {
- return (J2EEClipboard) domain.getClipboard();
- }
-
- @Override
- protected boolean prepare() {
- if (getJ2EEClipboard() == null)
- return false;
- command = new StrictCompoundCommand();
-
- copyCommand = new J2EECopyFromClipboardCommand((J2EEUIEditingDomain) domain);
- command.append(copyCommand);
-
- command.append(new CommandWrapper() {
- @Override
- protected Command createCommand() {
- Command addCommand = AddCommand.create(getDomain(), getOwner(), getFeature(), copyCommand.getResult(), getIndex());
- return addCommand;
- }
- });
- prepareBindingCommand(copyCommand);
- prepareExtensionCommand(copyCommand);
-
- boolean result;
- if (optimize) {
- // This will determine canExecute as efficiently as possible.
- //
- result = optimizedCanExecute();
- } else {
- // This will actually execute the copy command in order to check if the add can execute.
- //
- result = command.canExecute();
- }
-
- return result;
- }
-
- protected void prepareBindingCommand(final J2EECopyFromClipboardCommand cmd) {
- if (!getJ2EEClipboard().hasBindings())
- return;
- //TODO make adaptable command
- // addBindingsCommand = new CommandWrapper() {
- // protected Command createCommand() {
- // Object bindingOwner = BindingAndExtensionHelper.getBindingAddOwner((EObject)getOwner());
- // Collection bindingsCopies = getCopiedClipoard().getBindings().values();
- // Command addCommand = AddCommand.create(getDomain(), bindingOwner, null, bindingsCopies,
- // CommandParameter.NO_INDEX);
- // return addCommand;
- // }
- // };
- }
-
- protected void prepareExtensionCommand(final J2EECopyFromClipboardCommand cmd) {
- if (!getJ2EEClipboard().hasExtensions())
- return;
- // TODO make adaptable command
- // addExtensionsCommand = new CommandWrapper() {
- // protected Command createCommand() {
- // Object extensionOwner =
- // BindingAndExtensionHelper.getExtensionAddOwner((EObject)getOwner());
- // Collection extensionsCopies = getCopiedClipoard().getExtensions().values();
- // Command addCommand = AddCommand.create(getDomain(), extensionOwner, null,
- // extensionsCopies, CommandParameter.NO_INDEX);
- // return addCommand;
- // }
- // };
- }
-}
diff --git a/plugins/org.eclipse.jst.j2ee.ui/j2ee_ui/org/eclipse/jst/j2ee/internal/command/J2EERemoveOverrideCommand.java b/plugins/org.eclipse.jst.j2ee.ui/j2ee_ui/org/eclipse/jst/j2ee/internal/command/J2EERemoveOverrideCommand.java
deleted file mode 100644
index fad74e7..0000000
--- a/plugins/org.eclipse.jst.j2ee.ui/j2ee_ui/org/eclipse/jst/j2ee/internal/command/J2EERemoveOverrideCommand.java
+++ /dev/null
@@ -1,172 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2003, 2004 IBM Corporation and others.
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
- *
- * Contributors:
- * IBM Corporation - initial API and implementation
- *******************************************************************************/
-package org.eclipse.jst.j2ee.internal.command;
-
-
-import java.util.ArrayList;
-import java.util.Collection;
-import java.util.Iterator;
-import java.util.List;
-
-import org.eclipse.emf.ecore.EObject;
-import org.eclipse.emf.ecore.resource.ResourceSet;
-import org.eclipse.emf.edit.command.RemoveCommand;
-
-/**
- * Insert the type's description here. Creation date: (06/07/01 10:44:02 AM)
- *
- * @author: Administrator
- */
-public class J2EERemoveOverrideCommand extends AbstractOverrideCommand {
- private RemoveCommand bindingsRemoveCommand;
- private RemoveCommand extensionsRemoveCommand;
- private ResourceSet resourceSet;
-
- /**
- * J2EERemoveOverrideCommand constructor comment.
- */
- protected J2EERemoveOverrideCommand() {
- super();
- }
-
- public J2EERemoveOverrideCommand(RemoveCommand command) {
- super(command);
- }
-
- protected RemoveCommand createRemoveCommand(Collection elements) {
- return (RemoveCommand) RemoveCommand.create(getDomain(), elements);
- }
-
- /**
- * This will perform the command activity required for the effect. The effect of calling execute
- * when canExecute returns false, or when canExecute hasn't been called, is undefined.
- */
- public void execute() {
- /*
- * For each object being removed, check if it has a binding, and an extension Make
- * collections of these, make a command parameter for each collection, an instantiate a
- * remove command
- */
-
- Collection objects = getRemoveCommand().getCollection();
- List bindings = new ArrayList(objects.size());
- List extensions = new ArrayList(objects.size());
- Iterator it = objects.iterator();
- while (it.hasNext()) {
- EObject o = (EObject) it.next();
- if (resourceSet == null)
- resourceSet = o.eResource().getResourceSet();
- // TODO make command adaptable
- // EObject binding = BindingAndExtensionHelper.getBinding(o);
- // if (binding != null) {
- // bindings.add(binding);
- // getJ2eeClipboard().addBinding(o, binding);
- // }
- // EObject extension = BindingAndExtensionHelper.getExtension(o);
- // if (extension != null) {
- // extensions.add(extension);
- // getJ2eeClipboard().addExtension(o, extension);
- // }
- }
- if (!bindings.isEmpty())
- setBindingsRemoveCommand(createRemoveCommand(bindings));
-
- if (!extensions.isEmpty())
- setExtensionsRemoveCommand(createRemoveCommand(extensions));
-
- executeAllChildren();
- }
-
- protected void executeAllChildren() {
- executeNested(bindingsRemoveCommand);
- executeNested(extensionsRemoveCommand);
- getOverridable().doExecute();
- }
-
- protected void executeNested(RemoveCommand cmd) {
- if (cmd != null && cmd.doCanExecute()) {
- cmd.doExecute();
- // Collection result = cmd.getResult();
- //TODO
- // BindingAndExtensionHelper.resolveAllProxies(result, resourceSet);
- }
- }
-
- /**
- * Insert the method's description here. Creation date: (06/07/01 1:32:44 PM)
- *
- * @return RemoveCommand
- */
- protected RemoveCommand getBindingsRemoveCommand() {
- return bindingsRemoveCommand;
- }
-
- /**
- * Insert the method's description here. Creation date: (06/07/01 1:32:44 PM)
- *
- * @return RemoveCommand
- */
- protected RemoveCommand getExtensionsRemoveCommand() {
- return extensionsRemoveCommand;
- }
-
- public RemoveCommand getRemoveCommand() {
- return (RemoveCommand) getOverridable();
- }
-
- @Override
- protected boolean prepare() {
- setJ2eeClipboard(new J2EEClipboard(getRemoveCommand().getCollection()));
- return true;
- }
-
- /**
- * This will again perform the command activity required to redo the effect after undoing the
- * effect. The effect, if any, of calling redo before undo is called is undefined. Note that if
- * you implement redo to call execute then any derived class will be restricted to by that
- * decision also.
- */
- public void redo() {
- executeAllChildren();
- }
-
- /**
- * Insert the method's description here. Creation date: (06/07/01 1:32:44 PM)
- *
- * @param newBindingsRemoveCommand
- * RemoveCommand
- */
- protected void setBindingsRemoveCommand(RemoveCommand newBindingsRemoveCommand) {
- bindingsRemoveCommand = newBindingsRemoveCommand;
- }
-
- /**
- * Insert the method's description here. Creation date: (06/07/01 1:32:44 PM)
- *
- * @param newExtensionsRemoveCommand
- * RemoveCommand
- */
- protected void setExtensionsRemoveCommand(RemoveCommand newExtensionsRemoveCommand) {
- extensionsRemoveCommand = newExtensionsRemoveCommand;
- }
-
- @Override
- public void undo() {
- getRemoveCommand().doUndo();
- undoNested(bindingsRemoveCommand);
- undoNested(extensionsRemoveCommand);
- }
-
- protected void undoNested(RemoveCommand cmd) {
- if (cmd != null && cmd.doCanUndo())
- cmd.doUndo();
- }
-}
\ No newline at end of file
diff --git a/plugins/org.eclipse.jst.j2ee.ui/j2ee_ui/org/eclipse/jst/j2ee/internal/command/J2EEStrictCompoundCommand.java b/plugins/org.eclipse.jst.j2ee.ui/j2ee_ui/org/eclipse/jst/j2ee/internal/command/J2EEStrictCompoundCommand.java
deleted file mode 100644
index e0df82a..0000000
--- a/plugins/org.eclipse.jst.j2ee.ui/j2ee_ui/org/eclipse/jst/j2ee/internal/command/J2EEStrictCompoundCommand.java
+++ /dev/null
@@ -1,99 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2003, 2004 IBM Corporation and others.
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
- *
- * Contributors:
- * IBM Corporation - initial API and implementation
- *******************************************************************************/
-package org.eclipse.jst.j2ee.internal.command;
-
-import org.eclipse.emf.common.command.StrictCompoundCommand;
-
-
-
-/**
- * Overridden to provide an accessor to the pessimistic field. This is needed for the case of
- * undo/redo paste. We need the nested copy commmand in the paste command to redo itself when the
- * paste command is copied, otherwise we run into sed exception.
- */
-public class J2EEStrictCompoundCommand extends StrictCompoundCommand {
- /**
- * J2EEStrictCompoundCommand constructor comment.
- */
- public J2EEStrictCompoundCommand() {
- super();
- }
-
- /**
- * J2EEStrictCompoundCommand constructor comment.
- *
- * @param label
- * java.lang.String
- */
- public J2EEStrictCompoundCommand(String label) {
- super(label);
- }
-
- /**
- * J2EEStrictCompoundCommand constructor comment.
- *
- * @param label
- * java.lang.String
- * @param description
- * java.lang.String
- */
- public J2EEStrictCompoundCommand(String label, String description) {
- super(label, description);
- }
-
- /**
- * J2EEStrictCompoundCommand constructor comment.
- *
- * @param label
- * java.lang.String
- * @param description
- * java.lang.String
- * @param commandList
- * java.util.List
- */
- public J2EEStrictCompoundCommand(String label, String description, java.util.List commandList) {
- super(label, description, commandList);
- }
-
- /**
- * J2EEStrictCompoundCommand constructor comment.
- *
- * @param label
- * java.lang.String
- * @param commandList
- * java.util.List
- */
- public J2EEStrictCompoundCommand(String label, java.util.List commandList) {
- super(label, commandList);
- }
-
- /**
- * J2EEStrictCompoundCommand constructor comment.
- *
- * @param commandList
- * java.util.List
- */
- public J2EEStrictCompoundCommand(java.util.List commandList) {
- super(commandList);
- }
-
- /**
- * J2EEStrictCompoundCommand constructor comment.
- */
- public J2EEStrictCompoundCommand(boolean pessimistic) {
- super();
- setIsPessismistic(pessimistic);
- }
-
- public void setIsPessismistic(boolean aBool) {
- isPessimistic = aBool;
- }
-}
\ No newline at end of file
diff --git a/plugins/org.eclipse.jst.j2ee.ui/j2ee_ui/org/eclipse/jst/j2ee/internal/deployables/EnterpriseDeployableArtifactAdapterFactory.java b/plugins/org.eclipse.jst.j2ee.ui/j2ee_ui/org/eclipse/jst/j2ee/internal/deployables/EnterpriseDeployableArtifactAdapterFactory.java
deleted file mode 100644
index c459345..0000000
--- a/plugins/org.eclipse.jst.j2ee.ui/j2ee_ui/org/eclipse/jst/j2ee/internal/deployables/EnterpriseDeployableArtifactAdapterFactory.java
+++ /dev/null
@@ -1,36 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2005 IBM Corporation and others.
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
- *
- * Contributors:
- * IBM Corporation - initial API and implementation
- *******************************************************************************/
-/*
- * Created on Jan 18, 2005
- */
-package org.eclipse.jst.j2ee.internal.deployables;
-
-import org.eclipse.core.runtime.IAdapterFactory;
-import org.eclipse.debug.ui.actions.ILaunchable;
-import org.eclipse.wst.server.core.IModuleArtifact;
-import org.eclipse.wst.server.core.model.ModuleArtifactAdapterDelegate;
-
-public class EnterpriseDeployableArtifactAdapterFactory extends ModuleArtifactAdapterDelegate implements IAdapterFactory {
-
- public Object getAdapter(Object adaptableObject, Class adapterType) {
- return null;
- }
-
- public Class[] getAdapterList() {
- return new Class[] {ILaunchable.class };
- }
-
- @Override
- public IModuleArtifact getModuleArtifact(Object obj) {
- return EnterpriseApplicationDeployableAdapterUtil.getModuleObject(obj);
- }
-
-}
diff --git a/plugins/org.eclipse.jst.j2ee.ui/j2ee_ui/org/eclipse/jst/j2ee/internal/deployables/EnterpriseModuleArtifact.java b/plugins/org.eclipse.jst.j2ee.ui/j2ee_ui/org/eclipse/jst/j2ee/internal/deployables/EnterpriseModuleArtifact.java
deleted file mode 100644
index 0dc0437..0000000
--- a/plugins/org.eclipse.jst.j2ee.ui/j2ee_ui/org/eclipse/jst/j2ee/internal/deployables/EnterpriseModuleArtifact.java
+++ /dev/null
@@ -1,37 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2005 IBM Corporation and others.
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
- *
- * Contributors:
- * IBM Corporation - initial API and implementation
- *******************************************************************************/
-/*
- * Created on Feb 21, 2005
- */
-package org.eclipse.jst.j2ee.internal.deployables;
-
-import org.eclipse.debug.ui.actions.ILaunchable;
-import org.eclipse.wst.server.core.IModule;
-import org.eclipse.wst.server.core.IModuleArtifact;
-
-/**
- * @author blancett
- *
- */
-public class EnterpriseModuleArtifact implements IModuleArtifact {
-
- /* (non-Javadoc)
- * @see org.eclipse.wst.server.core.IModuleArtifact#getModule()
- */
- public IModule getModule() {
- return null;
- }
-
- public Class[] getAdapterList() {
- return new Class[] { IModuleArtifact.class, ILaunchable.class };
- }
-
-}
diff --git a/plugins/org.eclipse.jst.j2ee.ui/j2ee_ui/org/eclipse/jst/j2ee/internal/deployables/J2EEDeployableAdapterFactory.java b/plugins/org.eclipse.jst.j2ee.ui/j2ee_ui/org/eclipse/jst/j2ee/internal/deployables/J2EEDeployableAdapterFactory.java
deleted file mode 100644
index 78d7c98..0000000
--- a/plugins/org.eclipse.jst.j2ee.ui/j2ee_ui/org/eclipse/jst/j2ee/internal/deployables/J2EEDeployableAdapterFactory.java
+++ /dev/null
@@ -1,47 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2005 IBM Corporation and others.
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
- *
- * Contributors:
- * IBM Corporation - initial API and implementation
- *******************************************************************************/
-/*
- * Created on Feb 21, 2005
- */
-package org.eclipse.jst.j2ee.internal.deployables;
-
-import org.eclipse.core.runtime.IAdapterFactory;
-import org.eclipse.debug.ui.actions.ILaunchable;
-import org.eclipse.wst.server.core.IModuleArtifact;
-
-
-public class J2EEDeployableAdapterFactory implements IAdapterFactory {
- public Object getAdapter(Object adaptableObject, Class adapterType) {
- IModuleArtifact moduleArtifact = null;
-/* if (adapterType == IModuleArtifact.class ) {
-
- if (moduleArtifact == null && Platform.getAdapterManager().hasAdapter(adaptableObject, "org.eclipse.jst.j2ee.internal.web.deployables.WebModuleArtifact")) {
- moduleArtifact = (IModuleArtifact) Platform.getAdapterManager().loadAdapter(adaptableObject, "org.eclipse.jst.j2ee.internal.web.deployables.WebModuleArtifact");
- }
- if (moduleArtifact == null && Platform.getAdapterManager().hasAdapter(adaptableObject, "org.eclipse.jst.j2ee.ejb.internal.deployables.IEJBModuleArtifact")) {
- moduleArtifact = (IModuleArtifact) Platform.getAdapterManager().loadAdapter(adaptableObject, "org.eclipse.jst.j2ee.ejb.internal.deployables.IEJBModuleArtifact");
- }
- if (moduleArtifact == null && Platform.getAdapterManager().hasAdapter(adaptableObject, "org.eclipse.jst.j2ee.internal.deployables.EnterpriseModuleArtifact")) {
- moduleArtifact = (IModuleArtifact) Platform.getAdapterManager().loadAdapter(adaptableObject, "org.eclipse.jst.j2ee.internal.deployables.EnterpriseModuleArtifact");
- }
- if (moduleArtifact == null && Platform.getAdapterManager().hasAdapter(adaptableObject, "org.eclipse.wst.web.internal.deployables.IStaticWebModuleArtifact")) {
- moduleArtifact = (IModuleArtifact) Platform.getAdapterManager().loadAdapter(adaptableObject, "org.eclipse.wst.web.internal.deployables.IStaticWebModuleArtifact");
- }
- }*/
- return moduleArtifact;
- }
-
- public Class[] getAdapterList() {
- return new Class[]{IModuleArtifact.class, ILaunchable.class};
- }
-
-
-}
diff --git a/plugins/org.eclipse.jst.j2ee.ui/j2ee_ui/org/eclipse/jst/j2ee/internal/dialogs/ChangeLibDirDialog.java b/plugins/org.eclipse.jst.j2ee.ui/j2ee_ui/org/eclipse/jst/j2ee/internal/dialogs/ChangeLibDirDialog.java
deleted file mode 100644
index d9ac0dd..0000000
--- a/plugins/org.eclipse.jst.j2ee.ui/j2ee_ui/org/eclipse/jst/j2ee/internal/dialogs/ChangeLibDirDialog.java
+++ /dev/null
@@ -1,61 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2008 SAP AG and others.
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
- *
- * Contributors:
- * Stefan Dimov, stefan.dimov@sap.com - initial API and implementation
- *******************************************************************************/
-package org.eclipse.jst.j2ee.internal.dialogs;
-
-import org.eclipse.core.runtime.IPath;
-import org.eclipse.core.runtime.Path;
-import org.eclipse.jface.dialogs.IDialogConstants;
-import org.eclipse.jface.dialogs.InputDialog;
-import org.eclipse.jface.dialogs.MessageDialog;
-import org.eclipse.jst.j2ee.internal.plugin.J2EEUIMessages;
-import org.eclipse.swt.widgets.Shell;
-
-@Deprecated
-public class ChangeLibDirDialog extends InputDialog {
- private boolean warnBlank;
-
- public ChangeLibDirDialog(Shell parentShell, String initialValue, boolean warnBlank) {
- super(parentShell, J2EEUIMessages.getResourceString(J2EEUIMessages.CHANGE_LIB_DIR_HEAD),
- J2EEUIMessages.getResourceString(J2EEUIMessages.NEW_LIB_DIR_PROPMPT), initialValue, null);
- this.warnBlank = warnBlank;
- }
-
- @Override
- protected void buttonPressed(int buttonId) {
- if (buttonId == IDialogConstants.OK_ID) {
- String res = getText().getText().trim();
- if (res.length() == 0) {
- if (warnBlank)
- if (!MessageDialog.openQuestion(this.getShell(),
- J2EEUIMessages.getResourceString(J2EEUIMessages.BLANK_LIB_DIR),
- J2EEUIMessages.getResourceString(J2EEUIMessages.BLANK_LIB_DIR_CONFIRM))) return;
- } else {
- res = res.substring(1);
- String[] segments = res.split("" + IPath.SEPARATOR); //$NON-NLS-1$
- Path p = new Path(""); //$NON-NLS-1$
- boolean valid = true;
- for (int i = 0; i < segments.length; i++) {
- valid = p.isValidSegment(segments[i]);
- if (!valid)
- break;
- }
- if (!valid) {
- MessageDialog.openError(null,
- J2EEUIMessages.getResourceString(J2EEUIMessages.INVALID_PATH),
- J2EEUIMessages.getResourceString(J2EEUIMessages.INVALID_PATH_MSG));
- return;
- }
- }
- }
- super.buttonPressed(buttonId);
- }
-}
-
diff --git a/plugins/org.eclipse.jst.j2ee.ui/j2ee_ui/org/eclipse/jst/j2ee/internal/dialogs/DependencyConflictResolveDialog.java b/plugins/org.eclipse.jst.j2ee.ui/j2ee_ui/org/eclipse/jst/j2ee/internal/dialogs/DependencyConflictResolveDialog.java
deleted file mode 100644
index 87d55d5..0000000
--- a/plugins/org.eclipse.jst.j2ee.ui/j2ee_ui/org/eclipse/jst/j2ee/internal/dialogs/DependencyConflictResolveDialog.java
+++ /dev/null
@@ -1,67 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2008 SAP AG and others.
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
- *
- * Contributors:
- * Stefan Dimov, stefan.dimov@sap.com - initial API and implementation
- *******************************************************************************/
-package org.eclipse.jst.j2ee.internal.dialogs;
-
-import org.eclipse.jface.dialogs.MessageDialog;
-import org.eclipse.jface.dialogs.MessageDialogWithToggle;
-import org.eclipse.jface.preference.IPreferenceStore;
-import org.eclipse.jst.j2ee.internal.plugin.J2EEUIMessages;
-import org.eclipse.jst.j2ee.internal.plugin.J2EEUIPlugin;
-import org.eclipse.swt.widgets.Shell;
-
-public class DependencyConflictResolveDialog extends MessageDialogWithToggle {
-
- public static final int BTN_ID_OK = 0;
- public static final int BTN_ID_CANCEL = 1;
-
- public static final int DLG_TYPE_1 = 1;
- public static final int DLG_TYPE_2 = 2;
-
- public static final String DONT_SHOW_AGAIN = "DependencyConflictResolveDialog.DONT_SHOW_AGAIN"; //$NON-NLS-1$
-
- public DependencyConflictResolveDialog(Shell parentShell,
- int dlgType) {
-
- super(parentShell,
- J2EEUIMessages.getResourceString(J2EEUIMessages.DEPENDENCY_CONFLICT_TITLE),
- null,
- J2EEUIMessages.getResourceString((dlgType == DLG_TYPE_1) ?
- J2EEUIMessages.DEPENDENCY_CONFLICT_MSG_1 :
- J2EEUIMessages.DEPENDENCY_CONFLICT_MSG_2)
-
- , MessageDialog.WARNING,
-
- new String[] { J2EEUIMessages.OK_BUTTON,
- J2EEUIMessages.CANCEL_BUTTON },
- BTN_ID_CANCEL,
- J2EEUIMessages.getResourceString(J2EEUIMessages.DO_NOT_SHOW_WARNING_AGAIN),
- false);
- }
-
- @Override
- public int open() {
- if (getPrefStore().getBoolean(DONT_SHOW_AGAIN))
- return BTN_ID_OK;
- setToggleState(getPrefStore().getBoolean(DONT_SHOW_AGAIN));
- return super.open();
- }
-
- @Override
- public boolean close() {
- getPrefStore().setValue(DONT_SHOW_AGAIN, getToggleState());
- return super.close();
- }
-
- @Override
- public IPreferenceStore getPrefStore() {
- return J2EEUIPlugin.getDefault().getPreferenceStore();
- }
-}
diff --git a/plugins/org.eclipse.jst.j2ee.ui/j2ee_ui/org/eclipse/jst/j2ee/internal/dialogs/FilteredFileSelectionDialog.java b/plugins/org.eclipse.jst.j2ee.ui/j2ee_ui/org/eclipse/jst/j2ee/internal/dialogs/FilteredFileSelectionDialog.java
deleted file mode 100644
index 48d80d4..0000000
--- a/plugins/org.eclipse.jst.j2ee.ui/j2ee_ui/org/eclipse/jst/j2ee/internal/dialogs/FilteredFileSelectionDialog.java
+++ /dev/null
@@ -1,76 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2003, 2005 IBM Corporation and others.
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
- *
- * Contributors:
- * IBM Corporation - initial API and implementation
- *******************************************************************************/
-package org.eclipse.jst.j2ee.internal.dialogs;
-
-import org.eclipse.core.resources.IFile;
-import org.eclipse.jdt.internal.ui.wizards.TypedElementSelectionValidator;
-import org.eclipse.jst.j2ee.internal.plugin.J2EEUIMessages;
-import org.eclipse.swt.SWT;
-import org.eclipse.swt.widgets.Shell;
-import org.eclipse.ui.PlatformUI;
-import org.eclipse.ui.dialogs.ElementTreeSelectionDialog;
-import org.eclipse.ui.model.WorkbenchContentProvider;
-import org.eclipse.ui.model.WorkbenchLabelProvider;
-
-public class FilteredFileSelectionDialog extends ElementTreeSelectionDialog {
- protected String[] fExtensions;
- /**
- * FilteredFileSelectionDialog constructor comment.
- *
- * @param parent
- * Shell
- * @parent extensions String[]
- */
- public FilteredFileSelectionDialog(Shell parent, String[] extensions) {
- this(parent, null, null, extensions, false);
- }
- /**
- * FilteredFileSelectionDialog constructor comment.
- *
- * @param parent
- * Shell
- * @param title
- * String
- * @param message
- * String
- * @parent extensions String[]
- * @param allowMultiple
- * boolean
- */
- public FilteredFileSelectionDialog(Shell parent, String title, String message, String[] extensions, boolean allowMultiple) {
- super(parent, new WorkbenchLabelProvider(), new WorkbenchContentProvider());
- setShellStyle(SWT.DIALOG_TRIM | SWT.APPLICATION_MODAL | SWT.RESIZE);
-
- setTitle(title);
- if (title == null)
- setTitle(J2EEUIMessages.getResourceString("File_Selection_UI_")); //$NON-NLS-1$
- String localMessage = message;
- if (localMessage == null)
- localMessage = J2EEUIMessages.getResourceString("Select_a_file__UI_"); //$NON-NLS-1$
- setMessage(localMessage);
- setAllowMultiple(true);
- setExtensions(extensions);
- addFilter(new TypedFileViewerFilter(extensions));
- setValidator(new TypedElementSelectionValidator(new Class[]{IFile.class}, allowMultiple));
-
- }
- public String[] getExtensions() {
- return fExtensions;
- }
- public void setExtensions(String[] extensions) {
- fExtensions = extensions;
- }
-
- public void setHelp(String helpCode) {
- PlatformUI.getWorkbench().getHelpSystem().setHelp(this.getParentShell(), helpCode);
- }
-
-}
diff --git a/plugins/org.eclipse.jst.j2ee.ui/j2ee_ui/org/eclipse/jst/j2ee/internal/dialogs/ListMessageDialog.java b/plugins/org.eclipse.jst.j2ee.ui/j2ee_ui/org/eclipse/jst/j2ee/internal/dialogs/ListMessageDialog.java
deleted file mode 100644
index 25282a8..0000000
--- a/plugins/org.eclipse.jst.j2ee.ui/j2ee_ui/org/eclipse/jst/j2ee/internal/dialogs/ListMessageDialog.java
+++ /dev/null
@@ -1,212 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2003, 2004 IBM Corporation and others.
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
- *
- * Contributors:
- * IBM Corporation - initial API and implementation
- *******************************************************************************/
-package org.eclipse.jst.j2ee.internal.dialogs;
-
-
-
-import org.eclipse.jface.dialogs.IDialogConstants;
-import org.eclipse.swt.SWT;
-import org.eclipse.swt.layout.GridData;
-import org.eclipse.swt.layout.GridLayout;
-import org.eclipse.swt.widgets.Composite;
-import org.eclipse.swt.widgets.Control;
-import org.eclipse.swt.widgets.List;
-import org.eclipse.swt.widgets.Shell;
-
-/**
- * Insert the type's description here. Creation date: (9/7/2001 11:28:24 AM)
- *
- * @author: Administrator
- */
-public class ListMessageDialog extends org.eclipse.jface.dialogs.MessageDialog {
- protected String[] listItems;
- protected List list;
-
- /**
- * EJBSelectiveImportDialog constructor comment.
- *
- * @param parentShell
- * org.eclipse.swt.widgets.Shell
- * @param dialogTitle
- * java.lang.String
- * @param dialogTitleImage
- * org.eclipse.swt.graphics.Image
- * @param dialogMessage
- * java.lang.String
- * @param dialogImageType
- * int
- * @param dialogButtonLabels
- * java.lang.String[]
- * @param defaultIndex
- * int
- */
- public ListMessageDialog(org.eclipse.swt.widgets.Shell parentShell, String dialogTitle, org.eclipse.swt.graphics.Image dialogTitleImage, String dialogMessage, int dialogImageType, java.lang.String[] dialogButtonLabels, int defaultIndex) {
- super(parentShell, dialogTitle, dialogTitleImage, dialogMessage, dialogImageType, dialogButtonLabels, defaultIndex);
- }
-
- /**
- * ListMessageDialog constructor comment.
- *
- * @param parentShell
- * org.eclipse.swt.widgets.Shell
- * @param dialogTitle
- * java.lang.String
- * @param dialogTitleImage
- * org.eclipse.swt.graphics.Image
- * @param dialogMessage
- * java.lang.String
- * @param dialogImageType
- * int
- * @param dialogButtonLabels
- * java.lang.String[]
- * @param defaultIndex
- * int
- */
- public ListMessageDialog(org.eclipse.swt.widgets.Shell parentShell, String dialogTitle, org.eclipse.swt.graphics.Image dialogTitleImage, String dialogMessage, int dialogImageType, java.lang.String[] dialogButtonLabels, int defaultIndex, String[] names) {
- super(parentShell, dialogTitle, dialogTitleImage, dialogMessage, dialogImageType, dialogButtonLabels, defaultIndex);
- listItems = names;
- }
-
- /**
- * Creates and returns the contents of an area of the dialog which appears below the message and
- * above the button bar.
- * <p>
- * The default implementation of this framework method returns <code>null</code>. Subclasses
- * may override.
- * </p>
- *
- * @param the
- * parent composite to contain the custom area
- * @return the custom area control, or <code>null</code>
- */
- @Override
- protected Control createCustomArea(Composite parent) {
-
- Composite composite = new Composite(parent, 0);
- GridLayout layout = new GridLayout();
- layout.numColumns = 1;
- layout.marginHeight = convertVerticalDLUsToPixels(IDialogConstants.VERTICAL_MARGIN);
- layout.marginWidth = convertHorizontalDLUsToPixels(IDialogConstants.HORIZONTAL_MARGIN);
- layout.horizontalSpacing = convertHorizontalDLUsToPixels(IDialogConstants.HORIZONTAL_SPACING);
- composite.setLayout(layout);
- composite.setLayoutData(new GridData(GridData.FILL_BOTH));
-
- if (listItems != null) {
- list = new List(composite, SWT.BORDER);
- GridData data = new GridData(GridData.GRAB_HORIZONTAL | GridData.GRAB_VERTICAL | GridData.HORIZONTAL_ALIGN_FILL | GridData.VERTICAL_ALIGN_CENTER);
- list.setLayoutData(data);
- list.setItems(listItems);
- }
-
- return composite;
-
- }
-
- /**
- * Convenience method to open a simple confirm (OK/Cancel) dialog.
- *
- * @param parent
- * the parent shell of the dialog, or <code>null</code> if none
- * @param title
- * the dialog's title, or <code>null</code> if none
- * @param message
- * the message
- * @return <code>true</code> if the user presses the OK button, <code>false</code> otherwise
- */
- public static boolean openConfirm(Shell parent, String title, String message, String[] items) {
- ListMessageDialog dialog = new ListMessageDialog(parent, title, null, // accept the default
- // window icon
- message, QUESTION, new String[]{IDialogConstants.OK_LABEL, IDialogConstants.CANCEL_LABEL}, 0, items); // OK
- // is
- // the
- // default
- return dialog.open() == 0;
- }
-
- /**
- * Convenience method to open a standard error dialog.
- *
- * @param parent
- * the parent shell of the dialog, or <code>null</code> if none
- * @param title
- * the dialog's title, or <code>null</code> if none
- * @param message
- * the message
- */
- public static void openError(Shell parent, String title, String message, String[] items) {
- ListMessageDialog dialog = new ListMessageDialog(parent, title, null, // accept the default
- // window icon
- message, ERROR, new String[]{IDialogConstants.OK_LABEL}, 0, items); // ok is the
- // default
- dialog.open();
- return;
- }
-
- /**
- * Convenience method to open a standard information dialog.
- *
- * @param parent
- * the parent shell of the dialog, or <code>null</code> if none
- * @param title
- * the dialog's title, or <code>null</code> if none
- * @param message
- * the message
- */
- public static void openInformation(Shell parent, String title, String message, String[] items) {
- ListMessageDialog dialog = new ListMessageDialog(parent, title, null, // accept the default
- // window icon
- message, INFORMATION, new String[]{IDialogConstants.OK_LABEL}, 0, items);
- // ok is the default
- dialog.open();
- return;
- }
-
- /**
- * Convenience method to open a simple Yes/No question dialog.
- *
- * @param parent
- * the parent shell of the dialog, or <code>null</code> if none
- * @param title
- * the dialog's title, or <code>null</code> if none
- * @param message
- * the message
- * @return <code>true</code> if the user presses the OK button, <code>false</code> otherwise
- */
- public static boolean openQuestion(Shell parent, String title, String message, String[] items) {
- ListMessageDialog dialog = new ListMessageDialog(parent, title, null, // accept the default
- // window icon
- message, QUESTION, new String[]{IDialogConstants.YES_LABEL, IDialogConstants.NO_LABEL}, 0, items); // yes
- // is
- // the
- // default
- return dialog.open() == 0;
- }
-
- /**
- * Convenience method to open a standard warning dialog.
- *
- * @param parent
- * the parent shell of the dialog, or <code>null</code> if none
- * @param title
- * the dialog's title, or <code>null</code> if none
- * @param message
- * the message
- */
- public static void openWarning(Shell parent, String title, String message, String[] items) {
- ListMessageDialog dialog = new ListMessageDialog(parent, title, null, // accept the default
- // window icon
- message, WARNING, new String[]{IDialogConstants.OK_LABEL}, 0, items); // ok is
- // the
- // default
- dialog.open();
- return;
- }
-}
\ No newline at end of file
diff --git a/plugins/org.eclipse.jst.j2ee.ui/j2ee_ui/org/eclipse/jst/j2ee/internal/dialogs/Messages.java b/plugins/org.eclipse.jst.j2ee.ui/j2ee_ui/org/eclipse/jst/j2ee/internal/dialogs/Messages.java
deleted file mode 100644
index 8b1ccb5..0000000
--- a/plugins/org.eclipse.jst.j2ee.ui/j2ee_ui/org/eclipse/jst/j2ee/internal/dialogs/Messages.java
+++ /dev/null
@@ -1,15 +0,0 @@
-package org.eclipse.jst.j2ee.internal.dialogs;
-
-import org.eclipse.osgi.util.NLS;
-
-public class Messages extends NLS {
-
- public static final String BUNDLE_NAME = "org.eclipse.jst.j2ee.internal.dialogs.messages"; //$NON-NLS-1$
- public static String RuntimeSelectionDialog_Configure_Target_Runtime_;
- public static String J2EEDeployAction_Deploy_;
-
- static {
- NLS.initializeMessages(BUNDLE_NAME, Messages.class);
- }
-
-}
diff --git a/plugins/org.eclipse.jst.j2ee.ui/j2ee_ui/org/eclipse/jst/j2ee/internal/dialogs/RuntimeSelectionDialog.java b/plugins/org.eclipse.jst.j2ee.ui/j2ee_ui/org/eclipse/jst/j2ee/internal/dialogs/RuntimeSelectionDialog.java
deleted file mode 100644
index 16f06f1..0000000
--- a/plugins/org.eclipse.jst.j2ee.ui/j2ee_ui/org/eclipse/jst/j2ee/internal/dialogs/RuntimeSelectionDialog.java
+++ /dev/null
@@ -1,131 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2005, 2007 IBM Corporation and others.
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
- *
- * Contributors:
- * IBM Corporation - initial API and implementation
- *******************************************************************************/
-/**
- *
- */
-package org.eclipse.jst.j2ee.internal.dialogs;
-
-import java.text.MessageFormat;
-
-import org.eclipse.core.resources.IProject;
-import org.eclipse.core.runtime.CoreException;
-import org.eclipse.jface.dialogs.MessageDialog;
-import org.eclipse.jst.j2ee.internal.plugin.J2EEUIMessages;
-import org.eclipse.jst.j2ee.internal.plugin.J2EEUIPlugin;
-import org.eclipse.jst.j2ee.internal.project.J2EEProjectUtilities;
-import org.eclipse.swt.SWT;
-import org.eclipse.swt.graphics.Color;
-import org.eclipse.swt.graphics.Image;
-import org.eclipse.swt.graphics.RGB;
-import org.eclipse.swt.layout.GridData;
-import org.eclipse.swt.widgets.Composite;
-import org.eclipse.swt.widgets.Control;
-import org.eclipse.swt.widgets.Shell;
-import org.eclipse.ui.dialogs.PreferencesUtil;
-import org.eclipse.ui.forms.events.IHyperlinkListener;
-import org.eclipse.ui.forms.widgets.Hyperlink;
-import org.eclipse.wst.server.core.IRuntime;
-import org.eclipse.jst.j2ee.internal.dialogs.Messages;
-
-
-/**
- * @author Administrator
- *
- */
-public class RuntimeSelectionDialog extends MessageDialog {
- private IProject project = null;
- private String configuredMessage;
-
- /**
- * @param parentShell
- * @param dialogTitle
- * @param dialogTitleImage
- * @param dialogMessage
- * @param dialogImageType
- * @param dialogButtonLabels
- * @param defaultIndex
- */
- public RuntimeSelectionDialog(Shell parentShell, String dialogTitle,
- Image dialogTitleImage, String dialogMessage, int dialogImageType,
- String[] dialogButtonLabels, int defaultIndex, IProject project) {
- super(parentShell, dialogTitle, dialogTitleImage, dialogMessage,
- dialogImageType, dialogButtonLabels, defaultIndex);
- this.project = project;
- this.configuredMessage = MessageFormat.format(J2EEUIMessages.getResourceString("DEPLOY_RUNTIME_CONFIGURED"), new Object []{project.getName()}); //$NON-NLS-1$
- }
-
- @Override
- protected Control createCustomArea(Composite parent) {
-
- //Composite composite = new Composite(parent, 0);
- createHyperLink(parent);
- return parent;
-
- }
-
- private void createHyperLink(Composite parent) {
- Hyperlink link = new Hyperlink(parent,SWT.None);
- GridData layout = new GridData(GridData.HORIZONTAL_ALIGN_END);
- layout.horizontalSpan = 2;
- link.setLayoutData(layout);
- link.setUnderlined(true);
- Color color = new Color(parent.getDisplay(),new RGB(0,0,255) );
- link.setForeground(color);
- link.setText(Messages.RuntimeSelectionDialog_Configure_Target_Runtime_);
- link.addHyperlinkListener(new IHyperlinkListener() {
- public static final String DATA_NO_LINK = "PropertyAndPreferencePage.nolink"; //$NON-NLS-1$
-
- public void linkEntered(org.eclipse.ui.forms.events.HyperlinkEvent e) {
- }
-
- public void linkExited(org.eclipse.ui.forms.events.HyperlinkEvent e) {
- }
-
- public void linkActivated(org.eclipse.ui.forms.events.HyperlinkEvent e) {
- String id = getPreferencePageID();
- PreferencesUtil.createPropertyDialogOn(getShell(), project, id, new String[]{id}, DATA_NO_LINK).open(); //
- //(getShell(), id, new String[]{id}, DATA_NO_LINK).open();
- try {
- updateWidgets();
- } catch (Exception ie) {
-
- }
- }
-
- private String getPreferencePageID() {
- return "org.eclipse.wst.common.project.facet.ui.internal.RuntimesPropertyPage"; //$NON-NLS-1$
- }
- });
-
- }
-
- private void updateWidgets() {
- if (getTargetRuntime() != null) {
- messageLabel.setText(configuredMessage);
- imageLabel.setImage(this.getInfoImage());
- } else {
- messageLabel.setText(message);
- imageLabel.setImage(getErrorImage());
- }
-
- }
-
- private IRuntime getTargetRuntime() {
- try {
- IRuntime runtime = J2EEProjectUtilities.getServerRuntime(project);
- return runtime;
- } catch (CoreException e) {
- J2EEUIPlugin.logError(e);
- }
- return null;
- }
-
-}
diff --git a/plugins/org.eclipse.jst.j2ee.ui/j2ee_ui/org/eclipse/jst/j2ee/internal/dialogs/TwoArrayQuickSorter.java b/plugins/org.eclipse.jst.j2ee.ui/j2ee_ui/org/eclipse/jst/j2ee/internal/dialogs/TwoArrayQuickSorter.java
deleted file mode 100644
index 855f5fb..0000000
--- a/plugins/org.eclipse.jst.j2ee.ui/j2ee_ui/org/eclipse/jst/j2ee/internal/dialogs/TwoArrayQuickSorter.java
+++ /dev/null
@@ -1,128 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2003, 2005 IBM Corporation and others.
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
- *
- * Contributors:
- * IBM Corporation - initial API and implementation
- *******************************************************************************/
-package org.eclipse.jst.j2ee.internal.dialogs;
-
-/**
- * @author jialin
- *
- * To change the template for this generated type comment go to Window -
- * Preferences - Java - Code Generation - Code and Comments
- */
-import java.util.Comparator;
-
-import org.eclipse.jface.util.Assert;
-
-/**
- * Quick sort to sort key-value pairs. The keys and arrays are specified in
- * separate arrays.
- *
- * @plannedfor 2.0
- */
-public class TwoArrayQuickSorter {
-
- private Comparator fComparator;
-
- /**
- * Default comparator.
- */
- public static final class StringComparator implements Comparator {
- private boolean fIgnoreCase;
-
- StringComparator(boolean ignoreCase) {
- fIgnoreCase = ignoreCase;
- }
-
- public int compare(Object left, Object right) {
- return fIgnoreCase ? ((String) left).compareToIgnoreCase((String) right) : ((String) left).compareTo((String) right);
- }
- }
-
- /**
- * Creates a sorter with default string comparator. The keys are assumed to
- * be strings.
- *
- * @param ignoreCase
- * specifies whether sorting is case sensitive or not.
- */
- public TwoArrayQuickSorter(boolean ignoreCase) {
- fComparator = new StringComparator(ignoreCase);
- }
-
- /**
- * Creates a sorter with a comparator.
- *
- * @param comparator
- * the comparator to order the elements. The comparator must not
- * be <code>null</code>.
- */
- public TwoArrayQuickSorter(Comparator comparator) {
- fComparator = comparator;
- }
-
- /**
- * Sorts keys and values in parallel.
- *
- * @param keys
- * the keys to use for sorting.
- * @param values
- * the values associated with the keys.
- */
- public void sort(Object[] keys, Object[] values) {
- if ((keys == null) || (values == null)) {
- Assert.isTrue(false, "Either keys or values in null"); //$NON-NLS-1$
- return;
- }
-
- if (keys.length <= 1)
- return;
-
- internalSort(keys, values, 0, keys.length - 1);
- }
-
- private void internalSort(Object[] keys, Object[] values, int left, int right) {
- int localLeft = left;
- int localRight = right;
- int original_left = localLeft;
- int original_right = localRight;
-
- Object mid = keys[(localLeft + localRight) / 2];
- do {
- while (fComparator.compare(keys[localLeft], mid) < 0)
- localLeft++;
-
- while (fComparator.compare(mid, keys[localRight]) < 0)
- localRight--;
-
- if (localLeft <= localRight) {
- swap(keys, localLeft, localRight);
- swap(values, localLeft, localRight);
- localLeft++;
- localRight--;
- }
- } while (localLeft <= localRight);
-
- if (original_left < localRight)
- internalSort(keys, values, original_left, localRight);
-
- if (localLeft < original_right)
- internalSort(keys, values, localLeft, original_right);
- }
-
- /*
- * Swaps x[a] with x[b].
- */
- private static final void swap(Object x[], int a, int b) {
- Object t = x[a];
- x[a] = x[b];
- x[b] = t;
- }
-
-}
diff --git a/plugins/org.eclipse.jst.j2ee.ui/j2ee_ui/org/eclipse/jst/j2ee/internal/dialogs/TypeJavaSearchScope.java b/plugins/org.eclipse.jst.j2ee.ui/j2ee_ui/org/eclipse/jst/j2ee/internal/dialogs/TypeJavaSearchScope.java
deleted file mode 100644
index 6c430f6..0000000
--- a/plugins/org.eclipse.jst.j2ee.ui/j2ee_ui/org/eclipse/jst/j2ee/internal/dialogs/TypeJavaSearchScope.java
+++ /dev/null
@@ -1,352 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2003, 2005 IBM Corporation and others.
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
- *
- * Contributors:
- * IBM Corporation - initial API and implementation
- *******************************************************************************/
-package org.eclipse.jst.j2ee.internal.dialogs;
-
-import java.util.ArrayList;
-import java.util.HashSet;
-
-import org.eclipse.core.resources.IProject;
-import org.eclipse.core.resources.IResource;
-import org.eclipse.core.runtime.IPath;
-import org.eclipse.core.runtime.Path;
-import org.eclipse.jdt.core.IClasspathEntry;
-import org.eclipse.jdt.core.IJavaElement;
-import org.eclipse.jdt.core.IJavaModel;
-import org.eclipse.jdt.core.IJavaProject;
-import org.eclipse.jdt.core.IMember;
-import org.eclipse.jdt.core.IOpenable;
-import org.eclipse.jdt.core.IPackageFragment;
-import org.eclipse.jdt.core.IPackageFragmentRoot;
-import org.eclipse.jdt.core.JavaModelException;
-import org.eclipse.jdt.core.search.IJavaSearchScope;
-
-/**
- * This class was derived from JavaSearchScope as that class did not have a
- * provision to exclude classpath entries that are not exported A Java-specific
- * scope for searching relative to one or more java elements.
- */
-public class TypeJavaSearchScope implements IJavaSearchScope {
-
- private boolean includeExportedClassPathEntriesOnly = true;
-
- private ArrayList elements;
-
- /*
- * The paths of the resources in this search scope (or the classpath
- * entries' paths if the resources are projects)
- */
- private IPath[] paths;
- private boolean[] pathWithSubFolders;
- private int pathsCount;
-
- private IPath[] enclosingProjectsAndJars;
-
- public TypeJavaSearchScope() {
- this.initialize();
-
- // disabled for now as this could be expensive
- // JavaModelManager.getJavaModelManager().rememberScope(this);
- }
-
- private void addEnclosingProjectOrJar(IPath path) {
- int length = this.enclosingProjectsAndJars.length;
- for (int i = 0; i < length; i++) {
- if (this.enclosingProjectsAndJars[i].equals(path))
- return;
- }
- System.arraycopy(this.enclosingProjectsAndJars, 0, this.enclosingProjectsAndJars = new IPath[length + 1], 0, length);
- this.enclosingProjectsAndJars[length] = path;
- }
-
- /**
- * Method addProject. This method adds all the classpath entries for the
- * current project to the search scope.
- *
- * @param javaProject
- * @param includesPrereqProjects
- * @param visitedProjects
- * @throws JavaModelException
- */
- public void addProject(IJavaProject javaProject, boolean includesPrereqProjects, HashSet visitedProjects) throws JavaModelException {
- IProject project = javaProject.getProject();
- if (!project.isAccessible() || !visitedProjects.add(project))
- return;
-
- this.addEnclosingProjectOrJar(project.getFullPath());
-
- IClasspathEntry[] entries = javaProject.getResolvedClasspath(true);
- IJavaModel model = javaProject.getJavaModel();
- for (int i = 0, length = entries.length; i < length; i++) {
- IClasspathEntry entry = entries[i];
- switch (entry.getEntryKind()) {
- case IClasspathEntry.CPE_LIBRARY :
- IPath path = entry.getPath();
- this.add(path, true);
- this.addEnclosingProjectOrJar(path);
- break;
- case IClasspathEntry.CPE_PROJECT :
- if (includesPrereqProjects) {
- this.add(model.getJavaProject(entry.getPath().lastSegment()), true, visitedProjects);
- }
- break;
- case IClasspathEntry.CPE_SOURCE :
- this.add(entry.getPath(), true);
- break;
- }
- }
- }
-
- /**
- * Method add. This method filters out all the classpath entries of the
- * project which are not exported.
- *
- * @param javaProject
- * @param includesPrereqProjects
- * @param visitedProjects
- * @throws JavaModelException
- */
- public void add(IJavaProject javaProject, boolean includesPrereqProjects, HashSet visitedProjects) throws JavaModelException {
- IProject project = javaProject.getProject();
- if (!project.isAccessible() || !visitedProjects.add(project))
- return;
-
- this.addEnclosingProjectOrJar(project.getFullPath());
-
- IClasspathEntry[] entries = javaProject.getResolvedClasspath(true);
- IJavaModel model = javaProject.getJavaModel();
- for (int i = 0, length = entries.length; i < length; i++) {
- IClasspathEntry entry = entries[i];
- if (includeExportedClassPathEntriesOnly()) {
- if (!entry.isExported() && entry.getEntryKind() != IClasspathEntry.CPE_SOURCE)
- continue;
- }
- switch (entry.getEntryKind()) {
- case IClasspathEntry.CPE_LIBRARY :
- IPath path = entry.getPath();
- this.add(path, true);
- this.addEnclosingProjectOrJar(path);
- break;
- case IClasspathEntry.CPE_PROJECT :
- if (includesPrereqProjects) {
- this.add(model.getJavaProject(entry.getPath().lastSegment()), true, visitedProjects);
- }
- break;
- case IClasspathEntry.CPE_SOURCE :
- this.add(entry.getPath(), true);
- break;
- }
- }
- }
- public void add(IJavaElement element) throws JavaModelException {
- IPackageFragmentRoot root = null;
- switch (element.getElementType()) {
- case IJavaElement.JAVA_MODEL :
- // a workspace sope should be used
- break;
- case IJavaElement.JAVA_PROJECT :
- this.add((IJavaProject) element, true, new HashSet(2));
- break;
- case IJavaElement.PACKAGE_FRAGMENT_ROOT :
- root = (IPackageFragmentRoot) element;
- this.add(root.getPath(), true);
- break;
- case IJavaElement.PACKAGE_FRAGMENT :
- root = (IPackageFragmentRoot) element.getParent();
- if (root.isArchive()) {
- this.add(root.getPath().append(new Path(element.getElementName().replace('.', '/'))), false);
- } else {
- IResource resource = element.getUnderlyingResource();
- if (resource != null && resource.isAccessible()) {
- this.add(resource.getFullPath(), false);
- }
- }
- break;
- default :
- // remember sub-cu (or sub-class file) java elements
- if (element instanceof IMember) {
- if (this.elements == null) {
- this.elements = new ArrayList();
- }
- this.elements.add(element);
- }
- this.add(this.fullPath(element), true);
-
- // find package fragment root including this java element
- IJavaElement parent = element.getParent();
- while (parent != null && !(parent instanceof IPackageFragmentRoot)) {
- parent = parent.getParent();
- }
- if (parent instanceof IPackageFragmentRoot) {
- root = (IPackageFragmentRoot) parent;
- }
- }
-
- if (root != null) {
- if (root.getKind() == IPackageFragmentRoot.K_BINARY) {
- this.addEnclosingProjectOrJar(root.getPath());
- } else {
- this.addEnclosingProjectOrJar(root.getJavaProject().getProject().getFullPath());
- }
- }
- }
-
- /**
- * Adds the given path to this search scope. Remember if subfolders need to
- * be included as well.
- */
- private void add(IPath path, boolean withSubFolders) {
- if (this.paths.length == this.pathsCount) {
- System.arraycopy(this.paths, 0, this.paths = new IPath[this.pathsCount * 2], 0, this.pathsCount);
- System.arraycopy(this.pathWithSubFolders, 0, this.pathWithSubFolders = new boolean[this.pathsCount * 2], 0, this.pathsCount);
- }
- this.paths[this.pathsCount] = path;
- this.pathWithSubFolders[this.pathsCount++] = withSubFolders;
- }
-
- /*
- * (non-Javadoc)
- *
- * @see IJavaSearchScope#encloses(String)
- */
- public boolean encloses(String resourcePathString) {
- IPath resourcePath;
- int separatorIndex = resourcePathString.indexOf(JAR_FILE_ENTRY_SEPARATOR);
- if (separatorIndex != -1) {
- resourcePath = new Path(resourcePathString.substring(0, separatorIndex)).append(new Path(resourcePathString.substring(separatorIndex + 1)));
- } else {
- resourcePath = new Path(resourcePathString);
- }
- return this.encloses(resourcePath);
- }
-
- /**
- * Returns whether this search scope encloses the given path.
- */
- private boolean encloses(IPath path) {
- for (int i = 0; i < this.pathsCount; i++) {
- if (this.pathWithSubFolders[i]) {
- if (this.paths[i].isPrefixOf(path)) {
- return true;
- }
- } else {
- IPath scopePath = this.paths[i];
- if (scopePath.isPrefixOf(path) && (scopePath.segmentCount() == path.segmentCount() - 1)) {
- return true;
- }
- }
- }
- return false;
- }
-
- /*
- * (non-Javadoc)
- *
- * @see IJavaSearchScope#encloses(IJavaElement)
- */
- public boolean encloses(IJavaElement element) {
- if (this.elements != null) {
- for (int i = 0, length = this.elements.size(); i < length; i++) {
- IJavaElement scopeElement = (IJavaElement) this.elements.get(i);
- IJavaElement searchedElement = element;
- while (searchedElement != null) {
- if (searchedElement.equals(scopeElement)) {
- return true;
- }
- searchedElement = searchedElement.getParent();
- }
- }
- return false;
- }
- return this.encloses(this.fullPath(element));
- }
-
- /*
- * (non-Javadoc)
- *
- * @see IJavaSearchScope#enclosingProjectsAndJars()
- */
- public IPath[] enclosingProjectsAndJars() {
- return this.enclosingProjectsAndJars;
- }
- private IPath fullPath(IJavaElement element) {
- if (element instanceof IPackageFragmentRoot) {
- return ((IPackageFragmentRoot) element).getPath();
- }
- IJavaElement parent = element.getParent();
- IPath parentPath = parent == null ? null : this.fullPath(parent);
- IPath childPath;
- if (element instanceof IPackageFragment) {
- childPath = new Path(element.getElementName().replace('.', '/'));
- } else if (element instanceof IOpenable) {
- childPath = new Path(element.getElementName());
- } else {
- return parentPath;
- }
- return parentPath == null ? childPath : parentPath.append(childPath);
- }
-
- protected void initialize() {
- this.paths = new IPath[1];
- this.pathWithSubFolders = new boolean[1];
- this.pathsCount = 0;
- this.enclosingProjectsAndJars = new IPath[0];
- }
- /**
- * Gets the includeExportedClassPathEntriesOnly.
- *
- * @return Returns a boolean
- */
- public boolean includeExportedClassPathEntriesOnly() {
- return includeExportedClassPathEntriesOnly;
- }
-
- /**
- * Sets the includeExportedClassPathEntriesOnly.
- *
- * @param includeExportedClassPathEntriesOnly
- * The includeExportedClassPathEntriesOnly to set
- */
- public void setIncludeExportedClassPathEntriesOnly(boolean includeExportedClassPathEntriesOnly) {
- this.includeExportedClassPathEntriesOnly = includeExportedClassPathEntriesOnly;
- }
- /**
- * @see IJavaSearchScope#includesBinaries()
- * @deprecated
- */
- public boolean includesBinaries() {
- return true;
- }
-
- /**
- * @see IJavaSearchScope#includesClasspaths()
- * @deprecated
- */
- public boolean includesClasspaths() {
- return true;
- }
-
- /**
- * @see IJavaSearchScope#setIncludesBinaries(boolean)
- * @deprecated
- */
- public void setIncludesBinaries(boolean includesBinaries) {
- //Default nothing
- }
-
- /**
- * @see IJavaSearchScope#setIncludesClasspaths(boolean)
- * @deprecated
- */
- public void setIncludesClasspaths(boolean includesClasspaths) {
- //Default nothing
- }
-
-}
diff --git a/plugins/org.eclipse.jst.j2ee.ui/j2ee_ui/org/eclipse/jst/j2ee/internal/dialogs/TypeSearchEngine.java b/plugins/org.eclipse.jst.j2ee.ui/j2ee_ui/org/eclipse/jst/j2ee/internal/dialogs/TypeSearchEngine.java
deleted file mode 100644
index 353d443..0000000
--- a/plugins/org.eclipse.jst.j2ee.ui/j2ee_ui/org/eclipse/jst/j2ee/internal/dialogs/TypeSearchEngine.java
+++ /dev/null
@@ -1,65 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2003, 2005 IBM Corporation and others.
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
- *
- * Contributors:
- * IBM Corporation - initial API and implementation
- *******************************************************************************/
-package org.eclipse.jst.j2ee.internal.dialogs;
-
-import java.util.HashSet;
-
-import org.eclipse.jdt.core.ICompilationUnit;
-import org.eclipse.jdt.core.IJavaElement;
-import org.eclipse.jdt.core.IJavaProject;
-import org.eclipse.jdt.core.JavaModelException;
-import org.eclipse.jdt.core.search.IJavaSearchScope;
-import org.eclipse.jdt.core.search.SearchEngine;
-
-public class TypeSearchEngine extends SearchEngine {
-
- /**
- * Constructor for TypeSearchEngine.
- */
- public TypeSearchEngine() {
- super();
- }
-
- /**
- * Constructor for TypeSearchEngine.
- *
- * @param workingCopies
- */
- public TypeSearchEngine(ICompilationUnit[] workingCopies) {
- super(workingCopies);
- }
-
- /**
- * Method createJavaSearchScopeForAProject. Given a project it returns the
- * scope of the classes within the project's scope
- *
- * @param project
- * @param includeReferencedProjects
- * @param includeExportedClassPathEntriesOnly
- * @return IJavaSearchScope
- */
- public static IJavaSearchScope createJavaSearchScopeForAProject(IJavaProject project, boolean includeReferencedProjects, boolean includeExportedClassPathEntriesOnly) {
- if (!includeExportedClassPathEntriesOnly) {
- IJavaElement javaElements[] = new IJavaElement[]{project};
- return SearchEngine.createJavaSearchScope(javaElements, includeReferencedProjects);
- }
- TypeJavaSearchScope scope = new TypeJavaSearchScope();
- scope.setIncludeExportedClassPathEntriesOnly(true);
- HashSet visitedProjects = new HashSet(2);
- try {
- scope.addProject(project, includeReferencedProjects, visitedProjects);
- } catch (JavaModelException e) {
- // ignore
- }
- return scope;
- }
-
-}
diff --git a/plugins/org.eclipse.jst.j2ee.ui/j2ee_ui/org/eclipse/jst/j2ee/internal/dialogs/TypedFileViewerFilter.java b/plugins/org.eclipse.jst.j2ee.ui/j2ee_ui/org/eclipse/jst/j2ee/internal/dialogs/TypedFileViewerFilter.java
deleted file mode 100644
index 26449e9..0000000
--- a/plugins/org.eclipse.jst.j2ee.ui/j2ee_ui/org/eclipse/jst/j2ee/internal/dialogs/TypedFileViewerFilter.java
+++ /dev/null
@@ -1,73 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2003, 2005 IBM Corporation and others.
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
- *
- * Contributors:
- * IBM Corporation - initial API and implementation
- *******************************************************************************/
-package org.eclipse.jst.j2ee.internal.dialogs;
-
-import java.util.Hashtable;
-
-import org.eclipse.core.resources.IContainer;
-import org.eclipse.core.resources.IFile;
-import org.eclipse.core.resources.IResource;
-import org.eclipse.core.runtime.CoreException;
-import org.eclipse.jface.viewers.Viewer;
-
-public class TypedFileViewerFilter extends org.eclipse.jface.viewers.ViewerFilter {
- private String[] fAcceptedExtensions;
- private Hashtable visitedElements;
- public TypedFileViewerFilter(String[] acceptedExtensions) {
- fAcceptedExtensions = acceptedExtensions;
- visitedElements = new Hashtable();
- }
- public boolean isFilterProperty(Object element, Object property) {
- return false;
- }
- public boolean isValid(Object element) {
- if (IFile.class.isInstance(element))
- return isValidFile((IFile) element);
- if (IContainer.class.isInstance(element))
- return isValidContainer((IContainer) element);
- return false;
- }
- /*
- * A valid container is one that contains at least one valid member.
- */
- public boolean isValidContainer(IContainer container) {
- IResource[] members;
- Object valid = visitedElements.get(container);
- if (valid != null)
- return ((Boolean) valid).booleanValue();
- try {
- members = container.members();
- for (int i = 0; i < members.length; i++) {
- if (isValid(members[i])) {
- visitedElements.put(container, Boolean.TRUE);
- return true;
- }
- }
- } catch (CoreException e) {
- // Do nothing
- }
- visitedElements.put(container, Boolean.FALSE);
- return false;
- }
- public boolean isValidFile(IFile file) {
- String ext = file.getFileExtension();
- for (int i = 0; i < fAcceptedExtensions.length; i++) {
- if (fAcceptedExtensions[i].equalsIgnoreCase(ext)) {
- return true;
- }
- }
- return false;
- }
- @Override
- public boolean select(Viewer viewer, Object parentElement, Object element) {
- return isValid(element);
- }
-}
diff --git a/plugins/org.eclipse.jst.j2ee.ui/j2ee_ui/org/eclipse/jst/j2ee/internal/dialogs/messages.properties b/plugins/org.eclipse.jst.j2ee.ui/j2ee_ui/org/eclipse/jst/j2ee/internal/dialogs/messages.properties
deleted file mode 100644
index a128a9b..0000000
--- a/plugins/org.eclipse.jst.j2ee.ui/j2ee_ui/org/eclipse/jst/j2ee/internal/dialogs/messages.properties
+++ /dev/null
@@ -1,2 +0,0 @@
-J2EEDeployAction_Deploy_=Deploy
-RuntimeSelectionDialog_Configure_Target_Runtime_=Configure Target Runtime...
diff --git a/plugins/org.eclipse.jst.j2ee.ui/j2ee_ui/org/eclipse/jst/j2ee/internal/ejb/provider/AbstractMethodsContentProvider.java b/plugins/org.eclipse.jst.j2ee.ui/j2ee_ui/org/eclipse/jst/j2ee/internal/ejb/provider/AbstractMethodsContentProvider.java
deleted file mode 100644
index 3676317..0000000
--- a/plugins/org.eclipse.jst.j2ee.ui/j2ee_ui/org/eclipse/jst/j2ee/internal/ejb/provider/AbstractMethodsContentProvider.java
+++ /dev/null
@@ -1,319 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2003, 2005 IBM Corporation and others.
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
- *
- * Contributors:
- * IBM Corporation - initial API and implementation
- *******************************************************************************/
-package org.eclipse.jst.j2ee.internal.ejb.provider;
-
-
-import java.util.Arrays;
-import java.util.Comparator;
-import java.util.HashSet;
-import java.util.List;
-import java.util.Set;
-
-import org.eclipse.emf.common.notify.AdapterFactory;
-import org.eclipse.emf.common.notify.Notification;
-import org.eclipse.emf.ecore.EObject;
-import org.eclipse.emf.ecore.EStructuralFeature;
-import org.eclipse.emf.ecore.EcorePackage;
-import org.eclipse.emf.edit.ui.provider.AdapterFactoryContentProvider;
-import org.eclipse.jface.viewers.TreeViewer;
-import org.eclipse.jst.j2ee.ejb.AssemblyDescriptor;
-import org.eclipse.jst.j2ee.ejb.CMPAttribute;
-import org.eclipse.jst.j2ee.ejb.EjbMethodElementComparator;
-import org.eclipse.jst.j2ee.ejb.EnterpriseBean;
-import org.eclipse.jst.j2ee.ejb.MethodElement;
-import org.eclipse.jst.j2ee.ejb.internal.impl.EjbFactoryImpl;
-import org.eclipse.swt.widgets.TreeItem;
-import org.eclipse.wst.common.frameworks.internal.ui.DisplayUtility;
-
-
-public abstract class AbstractMethodsContentProvider extends AdapterFactoryContentProvider {
- protected static EStructuralFeature ME_EJB_SF = EjbFactoryImpl.getPackage().getMethodElement_EnterpriseBean();
- protected static EStructuralFeature JAR_ASSEMBLY_SF = EjbFactoryImpl.getPackage().getEJBJar_AssemblyDescriptor();
- private static final EStructuralFeature ECORE_BEAN_NAME = EcorePackage.eINSTANCE.getENamedElement_Name(); //ENAMED_ELEMENT__NAME
- protected Comparator meComparator;
- protected boolean isRoot = true;
-
- public class EJBMethodItem {
- public EObject refObject;
- public EnterpriseBean ejb;
-
- public EJBMethodItem(EObject aRefObject, EnterpriseBean anEJB) {
- refObject = aRefObject;
- ejb = anEJB;
- }
-
- }
-
- /**
- * Constructor for AbstractMethodsContentProvider.
- *
- * @param adapterFactory
- */
- public AbstractMethodsContentProvider(AdapterFactory adapterFactory) {
- super(adapterFactory);
- }
-
- public AbstractMethodsContentProvider(AdapterFactory adapterFactory, boolean root) {
- super(adapterFactory);
- isRoot = root;
- }
-
- protected Comparator getEnterpriseBeanComparator() {
- return EJBNameComparator.singleton();
- }
-
- protected Comparator getMethodElementComparator() {
- if (meComparator == null)
- meComparator = new EjbMethodElementComparator();
- return meComparator;
- }
-
- /*
- * @see ITreeContentProvider#getChildren(Object)
- */
- @Override
- public Object[] getChildren(Object parentElement) {
- if (parentElement instanceof AbstractMethodsContentProvider.EJBMethodItem)
- return getMethodElements((AbstractMethodsContentProvider.EJBMethodItem) parentElement);
- return new Object[0];
- }
-
- protected Object[] getMethodElements(AbstractMethodsContentProvider.EJBMethodItem ejbItem) {
- EObject refObject = ejbItem.refObject;
- if (refObject == null)
- return new Object[0];
- List elements = getMethodElements(refObject, ejbItem.ejb);
- Object[] result = elements.toArray();
- if (result.length == 1)
- return result;
- Arrays.sort(result, getMethodElementComparator());
- return result;
- }
-
- protected abstract List getMethodElements(EObject aRefObject, EnterpriseBean anEJB);
-
- protected Object[] getEnterpriseBeans(EObject parentElement, List someMethodElements) {
- if (someMethodElements.isEmpty())
- return new Object[0];
- Set ejbs = new HashSet();
- EnterpriseBean ejb = null;
- MethodElement me = null;
- for (int i = 0; i < someMethodElements.size(); i++) {
- me = (MethodElement) someMethodElements.get(i);
- ejb = me.getEnterpriseBean();
- if (ejb != null)
- ejbs.add(ejb);
- }
- Object[] result = ejbs.toArray();
- if (result.length != 1)
- Arrays.sort(result, getEnterpriseBeanComparator());
- ejb = null;
- for (int i = 0; i < result.length; i++) {
- ejb = (EnterpriseBean) result[i];
- result[i] = new EJBMethodItem(parentElement, ejb);
- }
- return result;
- }
-
- protected AssemblyDescriptor getAssemblyDescriptor(EnterpriseBean ejb) {
- if (ejb == null)
- return null;
- return ejb.getEjbJar().getAssemblyDescriptor();
- }
-
- /*
- * @see ITreeContentProvider#hasChildren(Object)
- */
- @Override
- public boolean hasChildren(Object element) {
- if (element instanceof AbstractMethodsContentProvider.EJBMethodItem)
- return true;
- return false;
- }
-
- protected TreeViewer getTreeViewer() {
- return (TreeViewer) viewer;
- }
-
- protected void refreshTreeViewer(Object obj) {
- if (viewer != null)
- DisplayUtility.asyncExec(createRefreshTreeRunnable(obj));
- }
-
- protected void refreshTreeViewer() {
- if (viewer != null)
- DisplayUtility.asyncExec(createRefreshTreeRunnable(null));
- }
-
- protected void refreshTreeViewer(MethodElement me) {
- refreshTreeViewer(me.eContainer());
- }
-
- protected void refreshTreeViewer(List aList) {
- if (aList.isEmpty())
- return;
- refreshTreeViewer((MethodElement) aList.get(0));
- }
-
- protected void addToTreeViewer(final MethodElement me) {
- if (viewer == null)
- return;
- DisplayUtility.asyncExec(new Runnable() {
-
- /*
- * (non-Javadoc)
- *
- * @see java.lang.Runnable#run()
- */
- public void run() {
- // findMethodItem() should be run in a Display thread
- EJBMethodItem item = findMethodItem(me);
- if (item != null)
- DisplayUtility.asyncExec(createAddItemTreeRunnable(item, me));
- else
- refreshTreeViewer(me.eContainer());
-
- }
- });
- }
-
- protected void removeFromTreeViewer(final EObject parent, final MethodElement me) {
- if (viewer == null)
- return;
- DisplayUtility.asyncExec(new Runnable() {
-
- /*
- * (non-Javadoc)
- *
- * @see java.lang.Runnable#run()
- */
- public void run() {
- EnterpriseBean ejb = me.getEnterpriseBean();
- EJBMethodItem item = findMethodItem(ejb, parent);
- if (item != null)
- refreshTreeViewer(item);
- else
- refreshTreeViewer((Object) null);
- }
- });
- }
-
- protected EJBMethodItem findMethodItem(MethodElement me) {
- return findMethodItem(me.getEnterpriseBean(), me.eContainer());
- }
-
- protected EJBMethodItem findMethodItem(EnterpriseBean ejb, EObject parentMethod) {
- TreeItem[] items = getTreeViewer().getTree().getItems();
- return findMethodItem(ejb, parentMethod, items);
- }
-
- protected EJBMethodItem findMethodItem(EnterpriseBean ejb, EObject parentMethod, TreeItem[] items) {
- TreeItem item = null;
- Object data = null;
- EJBMethodItem methodItem = null, found = null;
- for (int i = 0; i < items.length; i++) {
- item = items[i];
- data = item.getData();
- if (data instanceof EJBMethodItem) {
- methodItem = (EJBMethodItem) data;
- if (methodItem.ejb == ejb && methodItem.refObject == parentMethod)
- return methodItem;
- }
- found = findMethodItem(ejb, parentMethod, item.getItems());
- if (found != null)
- return found;
- }
- return null;
- }
-
- /*
- * @see INotifyChangedListener#notifyChanged(new ENotificationImpl((InternalEObject)Object,
- * int,(EStructuralFeature) Object, Object, Object, int))
- */
- @Override
- public void notifyChanged(Notification notifier) {
- if (notifier.getEventType() == Notification.RESOLVE)
- return;
- else if (notifier.getOldValue() instanceof CMPAttribute && notifier.getNewValue() == null)
- return;
- else if (notifier.getFeature() == ME_EJB_SF) {
- refreshTreeViewer((MethodElement) notifier.getNotifier());
- return;
- } else if (notifier.getFeature() == ECORE_BEAN_NAME) {
- refreshTreeViewer();
- return;
- } else if (getMethodElementsReference() == notifier.getFeature()) {
- if (notifier.getEventType() == Notification.ADD)
- addToTreeViewer((MethodElement) notifier.getNewValue());
- else if (notifier.getEventType() == Notification.REMOVE)
- removeFromTreeViewer((EObject) notifier.getNotifier(), (MethodElement) notifier.getOldValue());
- return;
- } else if (notifier.getFeature() == JAR_ASSEMBLY_SF && isRoot) {
- updateTreeInput(notifier.getNewValue());
- } else if (notifier.getFeature() == getMethodElementsContainerReference())
- super.notifyChanged(notifier);
- }
-
- /**
- * @param notifier
- */
- protected void updateTreeInput(final Object target) {
- DisplayUtility.asyncExec(new Runnable() {
-
- /*
- * (non-Javadoc)
- *
- * @see java.lang.Runnable#run()
- */
- public void run() {
-
- getTreeViewer().setInput(target); //reset the input
- getTreeViewer().refresh(target);
-
- }
- });
- }
-
- private Runnable createAddItemTreeRunnable(final Object parent, final MethodElement me) {
- return new Runnable() {
-
- /*
- * (non-Javadoc)
- *
- * @see java.lang.Runnable#run()
- */
- public void run() {
- getTreeViewer().add(parent, me);
- }
- };
- }
-
- private Runnable createRefreshTreeRunnable(final Object target) {
- return new Runnable() {
-
- /*
- * (non-Javadoc)
- *
- * @see java.lang.Runnable#run()
- */
- public void run() {
- if (target != null)
- getTreeViewer().refresh(target);
- else
- getTreeViewer().refresh();
- }
- };
- }
-
- protected abstract EStructuralFeature getMethodElementsReference();
-
- protected abstract EStructuralFeature getMethodElementsContainerReference();
-}
diff --git a/plugins/org.eclipse.jst.j2ee.ui/j2ee_ui/org/eclipse/jst/j2ee/internal/ejb/provider/BeanClassProviderHelper.java b/plugins/org.eclipse.jst.j2ee.ui/j2ee_ui/org/eclipse/jst/j2ee/internal/ejb/provider/BeanClassProviderHelper.java
deleted file mode 100644
index 4adce7e..0000000
--- a/plugins/org.eclipse.jst.j2ee.ui/j2ee_ui/org/eclipse/jst/j2ee/internal/ejb/provider/BeanClassProviderHelper.java
+++ /dev/null
@@ -1,61 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2003, 2004 IBM Corporation and others.
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
- *
- * Contributors:
- * IBM Corporation - initial API and implementation
- *******************************************************************************/
-package org.eclipse.jst.j2ee.internal.ejb.provider;
-
-
-import org.eclipse.jem.java.JavaClass;
-import org.eclipse.jst.j2ee.ejb.EnterpriseBean;
-import org.eclipse.jst.j2ee.internal.plugin.J2EEUIMessages;
-import org.eclipse.swt.graphics.Image;
-
-
-/**
- * Insert the type's description here. Creation date: (6/21/2001 12:29:49 AM)
- *
- * @author: Administrator
- */
-public class BeanClassProviderHelper extends J2EEJavaClassProviderHelper {
- private static Image image;
-
- /**
- * BeanClassProviderHelper constructor comment.
- */
- public BeanClassProviderHelper(EnterpriseBean anEJB) {
- super(anEJB);
- }
-
- @Override
- public Image getImage() {
- if (image == null)
- image = createImage();
- return image;
- }
-
- /**
- * Insert the method's description here. Creation date: (7/11/2001 1:53:09 PM)
- *
- * @return org.eclipse.jem.internal.java.JavaClass
- */
- @Override
- public JavaClass getJavaClass() {
- return getEjb().getEjbClass();
- }
-
- @Override
- protected String getOverlayKey() {
- return "ejb_module_ovr";//$NON-NLS-1$
- }
-
- @Override
- public String getTypeString(String className) {
- return J2EEUIMessages.getResourceString("EJB_Class_UI_", new Object[]{className}); //$NON-NLS-1$ = "EJB Class"
- }
-}
\ No newline at end of file
diff --git a/plugins/org.eclipse.jst.j2ee.ui/j2ee_ui/org/eclipse/jst/j2ee/internal/ejb/provider/EJBUIMessages.java b/plugins/org.eclipse.jst.j2ee.ui/j2ee_ui/org/eclipse/jst/j2ee/internal/ejb/provider/EJBUIMessages.java
deleted file mode 100644
index d03ed28..0000000
--- a/plugins/org.eclipse.jst.j2ee.ui/j2ee_ui/org/eclipse/jst/j2ee/internal/ejb/provider/EJBUIMessages.java
+++ /dev/null
@@ -1,31 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2003, 2005 IBM Corporation and others.
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
- *
- * Contributors:
- * IBM Corporation - initial API and implementation
- *******************************************************************************/
-package org.eclipse.jst.j2ee.internal.ejb.provider;
-
-import org.eclipse.osgi.util.NLS;
-
-
-public class EJBUIMessages extends NLS {
-
- private static final String BUNDLE_NAME = "j2ee_ejb_ui";//$NON-NLS-1$
-
- private EJBUIMessages() {
- // Do not instantiate
- }
-
- public static String GroupedEJBJarItemProvider_UI_0;
- public static String GroupedEJBJarItemProvider_UI_1;
- public static String GroupedEJBJarItemProvider_UI_2;
-
- static {
- NLS.initializeMessages(BUNDLE_NAME, EJBUIMessages.class);
- }
-}
diff --git a/plugins/org.eclipse.jst.j2ee.ui/j2ee_ui/org/eclipse/jst/j2ee/internal/ejb/provider/ExcludeListContentProvider.java b/plugins/org.eclipse.jst.j2ee.ui/j2ee_ui/org/eclipse/jst/j2ee/internal/ejb/provider/ExcludeListContentProvider.java
deleted file mode 100644
index f4d5e4c..0000000
--- a/plugins/org.eclipse.jst.j2ee.ui/j2ee_ui/org/eclipse/jst/j2ee/internal/ejb/provider/ExcludeListContentProvider.java
+++ /dev/null
@@ -1,145 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2003, 2005 IBM Corporation and others.
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
- *
- * Contributors:
- * IBM Corporation - initial API and implementation
- *******************************************************************************/
-package org.eclipse.jst.j2ee.internal.ejb.provider;
-
-
-import java.util.Collections;
-import java.util.List;
-
-import org.eclipse.emf.common.notify.AdapterFactory;
-import org.eclipse.emf.common.notify.Notification;
-import org.eclipse.emf.ecore.EObject;
-import org.eclipse.emf.ecore.EStructuralFeature;
-import org.eclipse.emf.ecore.EcorePackage;
-import org.eclipse.jst.j2ee.ejb.AssemblyDescriptor;
-import org.eclipse.jst.j2ee.ejb.CMPAttribute;
-import org.eclipse.jst.j2ee.ejb.EJBJar;
-import org.eclipse.jst.j2ee.ejb.EnterpriseBean;
-import org.eclipse.jst.j2ee.ejb.ExcludeList;
-import org.eclipse.jst.j2ee.ejb.internal.impl.EjbFactoryImpl;
-
-
-public class ExcludeListContentProvider extends AbstractMethodsContentProvider {
- private static final EStructuralFeature EXCLUDE_ME_SF = EjbFactoryImpl.getPackage().getExcludeList_MethodElements();
- private static final EStructuralFeature AD_EL_SF = EjbFactoryImpl.getPackage().getAssemblyDescriptor_ExcludeList();
- protected static final EStructuralFeature ECORE_BEAN_NAME = EcorePackage.eINSTANCE.getENamedElement_Name(); //ENAMED_ELEMENT__NAME
-
- /**
- * Constructor for ExcludeListContentProvider.
- *
- * @param adapterFactory
- * @param root
- * @param viewer
- */
- public ExcludeListContentProvider(AdapterFactory adapterFactory, boolean root) {
- super(adapterFactory, root);
- }
-
- /**
- * Constructor for ExcludesListContentProvider.
- *
- * @param adapterFactory
- */
- public ExcludeListContentProvider(AdapterFactory adapterFactory) {
- super(adapterFactory);
- }
-
- protected Object[] getEnterpriseBeans(ExcludeList list) {
- List mes = list.getMethodElements();
- return getEnterpriseBeans(list, mes);
- }
-
- /*
- * @see AbstractMethodsContentProvider#getMethodElements(EObject, EnterpriseBean)
- */
- @Override
- protected List getMethodElements(EObject aRefObject, EnterpriseBean anEJB) {
- if (aRefObject == null || !(aRefObject instanceof ExcludeList))
- return Collections.EMPTY_LIST;
- ExcludeList parentList = (ExcludeList) aRefObject;
- return parentList.getMethodElements(anEJB);
- }
-
- /*
- * @see IStructuredContentProvider#getElements(Object)
- */
- @Override
- public Object[] getElements(Object inputElement) {
- super.getElements(inputElement);
- ExcludeList list = null;
- if (inputElement instanceof EJBJar) {
- EJBJar jar = (EJBJar) inputElement;
- if (jar.getAssemblyDescriptor() != null)
- list = jar.getAssemblyDescriptor().getExcludeList();
- if (list != null)
- return getEnterpriseBeans(list);
- }
- if (inputElement instanceof AssemblyDescriptor) {
- list = ((AssemblyDescriptor) inputElement).getExcludeList();
- if (list != null)
- return getEnterpriseBeans(list);
- }
- return new Object[0];
- }
-
- /**
- * @see org.eclipse.jst.j2ee.internal.internal.ejb.ui.providers.AbstractMethodsContentProvider#getChildren(Object)
- */
- @Override
- public Object[] getChildren(Object parentElement) {
- if (parentElement instanceof ExcludeList)
- return getEnterpriseBeans((ExcludeList) parentElement);
- return super.getChildren(parentElement);
- }
-
- /**
- * @see org.eclipse.jst.j2ee.internal.internal.ejb.ui.providers.AbstractMethodsContentProvider#hasChildren(Object)
- */
- @Override
- public boolean hasChildren(Object element) {
- if (element instanceof ExcludeList)
- return !((ExcludeList) element).getMethodElements().isEmpty();
- return super.hasChildren(element);
- }
-
- @Override
- public void notifyChanged(Notification notifier) {
- if ((notifier.getFeature() == EXCLUDE_ME_SF && notifier.getNotifier() instanceof ExcludeList) || notifier.getFeature() == ECORE_BEAN_NAME) {
- if (notifier.getEventType() == Notification.RESOLVE)
- return;
- if (isRoot)
- refreshTreeViewer();
- else
- refreshTreeViewer(notifier.getNotifier());
- }
- if (notifier.getOldValue() instanceof CMPAttribute && notifier.getNewValue() == null)
- return;
- if (notifier.getFeature() == getMethodElementsReference() || notifier.getFeature() == getMethodElementsContainerReference())
- super.notifyChanged(notifier);
- }
-
- /*
- * @see AbstractMethodsContentProvider#getMethodElementsReference()
- */
- @Override
- protected EStructuralFeature getMethodElementsReference() {
- return EXCLUDE_ME_SF;
- }
-
- /**
- * @see org.eclipse.jst.j2ee.internal.internal.ejb.ui.providers.AbstractMethodsContentProvider#getMethodElementsContainerReference()
- */
- @Override
- protected EStructuralFeature getMethodElementsContainerReference() {
- return AD_EL_SF;
- }
-
-}
diff --git a/plugins/org.eclipse.jst.j2ee.ui/j2ee_ui/org/eclipse/jst/j2ee/internal/ejb/provider/GroupedEJBItemProvider.java b/plugins/org.eclipse.jst.j2ee.ui/j2ee_ui/org/eclipse/jst/j2ee/internal/ejb/provider/GroupedEJBItemProvider.java
deleted file mode 100644
index 6529545..0000000
--- a/plugins/org.eclipse.jst.j2ee.ui/j2ee_ui/org/eclipse/jst/j2ee/internal/ejb/provider/GroupedEJBItemProvider.java
+++ /dev/null
@@ -1,48 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2003, 2006 IBM Corporation and others.
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
- *
- * Contributors:
- * IBM Corporation - initial API and implementation
- *******************************************************************************/
-package org.eclipse.jst.j2ee.internal.ejb.provider;
-
-import java.util.Collection;
-
-import org.eclipse.core.resources.IFile;
-import org.eclipse.emf.common.notify.AdapterFactory;
-import org.eclipse.jem.util.emf.workbench.WorkbenchResourceHelperBase;
-import org.eclipse.jst.j2ee.ejb.EJBJar;
-import org.eclipse.jst.j2ee.internal.provider.J2EEItemProvider;
-
-
-
-/**
- * This class is the item provider for EJB groups
- */
-public abstract class GroupedEJBItemProvider extends J2EEItemProvider {
-
- public GroupedEJBItemProvider(AdapterFactory adapterFactory, String text, Object image, Object parent, Collection children) {
- super(adapterFactory, text, image, parent, children);
- }
-
- @Override
- public IFile getAssociatedFile() {
-
- try {
- EJBJar ejbJar = (EJBJar) getParent();
- if(ejbJar != null && ejbJar.eResource() != null) {
- return WorkbenchResourceHelperBase.getIFile(ejbJar.eResource().getURI());
- }
- } catch (Throwable t) {
-
- }
- return null;
- }
-
- @Override
- public abstract String getText(Object object);
-}
diff --git a/plugins/org.eclipse.jst.j2ee.ui/j2ee_ui/org/eclipse/jst/j2ee/internal/ejb/provider/GroupedEJBJarItemProvider.java b/plugins/org.eclipse.jst.j2ee.ui/j2ee_ui/org/eclipse/jst/j2ee/internal/ejb/provider/GroupedEJBJarItemProvider.java
deleted file mode 100644
index 6757470..0000000
--- a/plugins/org.eclipse.jst.j2ee.ui/j2ee_ui/org/eclipse/jst/j2ee/internal/ejb/provider/GroupedEJBJarItemProvider.java
+++ /dev/null
@@ -1,381 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2003, 2006 IBM Corporation and others.
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
- *
- * Contributors:
- * IBM Corporation - initial API and implementation
- *******************************************************************************/
-package org.eclipse.jst.j2ee.internal.ejb.provider;
-
-import java.util.ArrayList;
-import java.util.Arrays;
-import java.util.Collection;
-import java.util.HashMap;
-import java.util.Hashtable;
-import java.util.List;
-import java.util.Map;
-
-import org.eclipse.emf.common.notify.AdapterFactory;
-import org.eclipse.emf.common.notify.Notification;
-import org.eclipse.emf.common.notify.NotificationWrapper;
-import org.eclipse.emf.common.notify.impl.NotificationImpl;
-import org.eclipse.jst.j2ee.ejb.EJBJar;
-import org.eclipse.jst.j2ee.ejb.EjbPackage;
-import org.eclipse.jst.j2ee.ejb.EnterpriseBean;
-import org.eclipse.jst.j2ee.ejb.Entity;
-import org.eclipse.jst.j2ee.ejb.MessageDriven;
-import org.eclipse.jst.j2ee.ejb.Session;
-import org.eclipse.jst.j2ee.internal.J2EEVersionConstants;
-import org.eclipse.jst.j2ee.internal.plugin.J2EEPlugin;
-import org.eclipse.jst.j2ee.internal.provider.J2EEItemProvider;
-
-
-/**
- * @author Sachin P Patel
- *
- * To change this generated comment edit the template variable "typecomment":
- * Window>Preferences>Java>Templates. To enable and disable the creation of type comments go to
- * Window>Preferences>Java>Code Generation.
- */
-public class GroupedEJBJarItemProvider extends EJBJarItemProvider {
-
- private GroupedSessionItemProvider sessionProvider = null;
- private GroupedEntityItemProvider entityProvider = null;
- private GroupedMessageItemProvider messageProvider = null;
-
- private static Hashtable sessionTable = new Hashtable();
- private static Hashtable entityTable = new Hashtable();
- private static Hashtable messageTable = new Hashtable();
-
- private static final String SESSION = EJBUIMessages.GroupedEJBJarItemProvider_UI_0;
- private static final String ENTITY = EJBUIMessages.GroupedEJBJarItemProvider_UI_1;
- private static final String MESSAGE = EJBUIMessages.GroupedEJBJarItemProvider_UI_2;
-
- // Normally there is one instance of an item provider for all instances of the objecct
- // in the tree. The item provider would be stateless. However, because we are doing tricks
- // here, we are keeping track of all items this provider manages. The key in the map is the
- // object (EJBJar), and the value is the children nodes that we inserted
-
- protected Map children = new HashMap();
- private boolean showAssemblyDescriptor;
- private boolean isDisposing;
-
- public GroupedEJBJarItemProvider(AdapterFactory adapterFactory, boolean showAssemblyDescriptor) {
- super(adapterFactory);
- this.showAssemblyDescriptor = showAssemblyDescriptor;
- }
-
- @Override
- public Collection getChildren(Object object) {
- List result = initChildren(object);
- if (showAssemblyDescriptor) {
- if (((EJBJar) object).getAssemblyDescriptor() != null)
- result.add(((EJBJar) object).getAssemblyDescriptor());
- }
- return result;
- }
-
- protected List initChildren(Object object) {
- EJBJar ejbJar = (EJBJar) object;
- List allRootBeans = getAllRootBeans(ejbJar);
-
- boolean is20Jar = is20Jar(ejbJar);
-
- List localChildren = new ArrayList(5);
-
- List entityBeans = new ArrayList();
- List sessionBeans = new ArrayList();
- List messageBeans = new ArrayList();
-
- catagorizeBeans(allRootBeans, entityBeans, sessionBeans, messageBeans);
- orderBeans(entityBeans);
- orderBeans(sessionBeans);
- orderBeans(messageBeans);
-
- //ENABLE FOR: NOT TO SHOW EMPTY GROUPS
- //if (sessionBeans.size() > 0) {
- if (sessionTable.get(ejbJar) == null) {
- //create new item provider instance
- sessionProvider = new GroupedSessionItemProvider(adapterFactory, null, getImage(SESSION), object, sessionBeans);
- sessionTable.put(ejbJar, sessionProvider);
- localChildren.add(sessionProvider);
- } else {
- //use existing instance from table
- localChildren.add(sessionTable.get(ejbJar));
- }
- //}
-
- //ENABLE FOR: NOT TO SHOW EMPTY GROUPS
- //if (entityBeans.size() > 0) {
- if (entityTable.get(ejbJar) == null) {
- //create new item provider instance
- entityProvider = new GroupedEntityItemProvider(adapterFactory, null, getImage(ENTITY), object, entityBeans);
- entityTable.put(ejbJar, entityProvider);
- localChildren.add(entityProvider);
- } else {
- //use existing instance from table
- localChildren.add(entityTable.get(ejbJar));
- }
- //}
-
- //ENABLE FOR: NOT TO SHOW EMPTY GROUPS
- //if (is20Jar && messageBeans.size() > 0) {
- if (is20Jar) {
- if (messageTable.get(ejbJar) == null) {
- //create new item provider instance
- messageProvider = new GroupedMessageItemProvider(adapterFactory, null, getImage(MESSAGE), object, messageBeans);
- messageTable.put(ejbJar, messageProvider);
- localChildren.add(messageProvider);
- } else {
- //use existing instance from table
- localChildren.add(messageTable.get(ejbJar));
- }
- }
- //}
-
- children.put(object, localChildren);
-
- return localChildren;
- }
-
- protected void orderBeans(List beans) {
- Object[] beansArray = beans.toArray();
- Arrays.sort(beansArray, EJBNameComparator.singleton());
- beans.clear();
- beans.addAll(Arrays.asList(beansArray));
- }
-
- protected static List getAllRootBeans(EJBJar ejbJar) {
- return ejbJar.getEnterpriseBeans();
- }
-
- protected void catagorizeBeans(List allRootBeans, List entityBeans, List sessionBeans, List messageBeans) {
- for (int i = 0; i < allRootBeans.size(); i++) {
- if (((EnterpriseBean) allRootBeans.get(i)).isSession()) {
- sessionBeans.add(allRootBeans.get(i));
- } else if (((EnterpriseBean) allRootBeans.get(i)).isEntity()) {
- entityBeans.add(allRootBeans.get(i));
- } else if (((EnterpriseBean) allRootBeans.get(i)).isMessageDriven()) {
- messageBeans.add(allRootBeans.get(i));
- }
- }
- }
-
- static protected GroupedSessionItemProvider getSessionNode(Object object) {
- return (GroupedSessionItemProvider) sessionTable.get(object);
- }
-
- static protected GroupedEntityItemProvider getEntityNode(Object object) {
- return (GroupedEntityItemProvider) entityTable.get(object);
- }
-
- static protected GroupedMessageItemProvider getMessageNode(Object object) {
- return (GroupedMessageItemProvider) messageTable.get(object);
- }
-
- @Override
- public Object getImage(String type) {
- if (type.equals(SESSION))
- return J2EEPlugin.getPlugin().getImage("sessionBean_obj"); //$NON-NLS-1$
- else if (type.equals(MESSAGE))
- return J2EEPlugin.getPlugin().getImage("message_bean_obj"); //$NON-NLS-1$
- else if (type.equals(ENTITY))
- return J2EEPlugin.getPlugin().getImage("entitybean_obj"); //$NON-NLS-1$
- else
- return null;
- }
-
- private boolean is20Jar(EJBJar ejbJar) {
- switch (ejbJar.getVersionID()) {
- case J2EEVersionConstants.EJB_1_0_ID :
- case J2EEVersionConstants.EJB_1_1_ID :
- return false;
- case J2EEVersionConstants.EJB_2_0_ID :
- case J2EEVersionConstants.EJB_2_1_ID :
- default :
- return true;
- }
- }
-
- @Override
- public void notifyChanged(Notification notification) {
- if (notification.getEventType() == Notification.REMOVING_ADAPTER && notification.getOldValue() == this && !isDisposing) {
- removeTarget(notification);
- return;
- }
- if (notification.getFeature() == EjbPackage.eINSTANCE.getEJBJar_EnterpriseBeans()) {
- J2EEItemProvider provider = beansChanged((EJBJar) notification.getNotifier(), notification.getEventType(), notification.getOldValue(), notification.getNewValue(), notification.getPosition());
-
- //EJB's group has not been added yet, need to add group to tree before EJB can be added
- if (provider == null) {
- Notification msg = new NotificationImpl(Notification.ADD, null, getEJBItemProvider((EnterpriseBean) notification.getNewValue()), 1);
- NotificationWrapper notificationWrapper = new NotificationWrapper(notification.getNotifier(), msg);
- fireNotifyChanged(notificationWrapper);
- provider = beansChanged((EJBJar) notification.getNotifier(), notification.getEventType(), notification.getOldValue(), notification.getNewValue(), notification.getPosition());
- }
-
- //Fire notification for EJB add or remove
- NotificationWrapper notificationWrapper = new NotificationWrapper(provider, notification);
- fireNotifyChanged(notificationWrapper);
-
- //ENABLE FOR: NOT TO SHOW EMPTY GROUPS
- //If Group is empty remove the group
- /*
- * if (provider != null && provider.getChildren().size() == 0) { Notification msg = new
- * NotificationImpl(Notification.REMOVE, provider, null, 1); notificationWrapper = new
- * NotificationWrapper(notification.getNotifier(), msg);
- * fireNotifyChanged(notificationWrapper);
- *
- * //Group is removed so flush out table entry if (provider instanceof
- * GroupedSessionItemProvider) { sessionTable.remove(notification.getNotifier());
- * provider = null; } else if (provider instanceof GroupedEntityItemProvider) {
- * entityTable.remove(notification.getNotifier()); provider = null; } else if (provider
- * instanceof GroupedMessageItemProvider) {
- * messageTable.remove(notification.getNotifier()); provider = null; }
- *
- * //If all groups are removed remove the extended children List allChildren = new
- * ArrayList(this.getChildren((EJBJar) notification.getNotifier()));
- * if(sessionTable.get(notification.getNotifier()) == null &&
- * entityTable.get(notification.getNotifier()) == null &&
- * messageTable.get(notification.getNotifier()) == null) { for(int i = 0; i <
- * allChildren.size(); i++) { Notification message = new
- * NotificationImpl(Notification.REMOVE, allChildren.get(i), null, 1);
- * notificationWrapper = new NotificationWrapper(notification.getNotifier(), message);
- * fireNotifyChanged(notificationWrapper); } this.getChildren((EJBJar)
- * notification.getNotifier()).clear(); } }
- */
- } else {
- super.notifyChanged(notification);
- }
- }
-
- protected J2EEItemProvider beansChanged(EJBJar ejbJar, int eventType, Object oldValue, Object newValue, int pos) {
- J2EEItemProvider provider = getItemProvider(ejbJar, oldValue, newValue);
-
- if (provider != null) {
- Collection grandChildren = provider.getChildren();
-
- switch (eventType) {
- case Notification.ADD : {
- if (!grandChildren.contains(newValue))
- grandChildren.add(newValue);
-
- break;
- }
- case Notification.ADD_MANY : {
- grandChildren.addAll((Collection) newValue);
- break;
- }
- case Notification.REMOVE : {
- grandChildren.remove(oldValue);
- break;
- }
- case Notification.REMOVE_MANY : {
- grandChildren.removeAll((Collection) oldValue);
- break;
- }
- }
- } else {
- //GroupedProvider for new bean does not exist, create one.
- List allRootBeans = getAllRootBeans(ejbJar);
-
- List entityBeans = new ArrayList();
- List sessionBeans = new ArrayList();
- List messageBeans = new ArrayList();
-
- catagorizeBeans(allRootBeans, entityBeans, sessionBeans, messageBeans);
-
- if (newValue instanceof Session) {
- sessionProvider = new GroupedSessionItemProvider(adapterFactory, null, getImage(SESSION), ejbJar, sessionBeans);
- sessionTable.put(ejbJar, sessionProvider);
- } else if (newValue instanceof Entity) {
- entityProvider = new GroupedEntityItemProvider(adapterFactory, null, getImage(ENTITY), ejbJar, entityBeans);
- entityTable.put(ejbJar, entityProvider);
- } else if (newValue instanceof MessageDriven) {
- messageProvider = new GroupedMessageItemProvider(adapterFactory, null, getImage(MESSAGE), ejbJar, messageBeans);
- messageTable.put(ejbJar, messageProvider);
- }
- }
- return provider;
- }
-
- static public J2EEItemProvider getEJBJarItemProvider(EJBJar ejbJar, Object bean) {
- J2EEItemProvider provider = null;
- if (ejbJar != null && bean != null) {
- if (bean instanceof Session) {
- provider = getSessionNode(ejbJar);
- } else if (bean instanceof Entity) {
- provider = getEntityNode(ejbJar);
- } else if (bean instanceof MessageDriven) {
- provider = getMessageNode(ejbJar);
- }
- }
- return provider;
- }
-
- static public J2EEItemProvider getEJBItemProvider(EnterpriseBean bean) {
- if (bean != null) {
- EJBJar ejbJar = bean.getEjbJar();
- return getEJBJarItemProvider(ejbJar, bean);
- }
- return null;
- }
-
- protected J2EEItemProvider getItemProvider(EJBJar ejbJar, Object oldValue, Object newValue) {
- if (newValue != null)
- return getEJBJarItemProvider(ejbJar, newValue);
- else if (oldValue != null)
- return getEJBJarItemProvider(ejbJar, oldValue);
- else
- return null;
- }
-
- public static boolean isRootBean(EnterpriseBean bean) {
- List allRootBeans = getAllRootBeans(bean.getEjbJar());
- if (allRootBeans != null && allRootBeans.contains(bean)) {
- return true;
- }
- return false;
- }
-
- // Utility method for garbage collection - if EJBJar removed, remove
- // all entires in table for EJBJar
- static public void flushOutTableEntriesForEJBJar(EJBJar ejbJar) {
- sessionTable.remove(ejbJar);
- entityTable.remove(ejbJar);
- messageTable.remove(ejbJar);
- }
-
- @Override
- public boolean hasChildren(Object parent) {
- return true;
- }
-
- /*
- * (non-Javadoc)
- *
- * @see org.eclipse.jst.j2ee.internal.internal.ejb.provider.EJBJarItemProvider#removeTarget(org.eclipse.emf.common.notify.Notification)
- */
- protected void removeTarget(Notification not) {
- if (not.getNotifier() instanceof EJBJar)
- flushOutTableEntriesForEJBJar((EJBJar) not.getNotifier());
- }
-
- /*
- * (non-Javadoc)
- *
- * @see org.eclipse.emf.edit.provider.ItemProviderAdapter#dispose()
- */
- @Override
- public void dispose() {
- try {
- isDisposing = true;
- super.dispose();
- } finally {
- isDisposing = false;
- }
- }
-}
diff --git a/plugins/org.eclipse.jst.j2ee.ui/j2ee_ui/org/eclipse/jst/j2ee/internal/ejb/provider/GroupedEntityItemProvider.java b/plugins/org.eclipse.jst.j2ee.ui/j2ee_ui/org/eclipse/jst/j2ee/internal/ejb/provider/GroupedEntityItemProvider.java
deleted file mode 100644
index 80ef655..0000000
--- a/plugins/org.eclipse.jst.j2ee.ui/j2ee_ui/org/eclipse/jst/j2ee/internal/ejb/provider/GroupedEntityItemProvider.java
+++ /dev/null
@@ -1,38 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2003, 2004 IBM Corporation and others.
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
- *
- * Contributors:
- * IBM Corporation - initial API and implementation
- *******************************************************************************/
-package org.eclipse.jst.j2ee.internal.ejb.provider;
-
-import java.util.Collection;
-
-import org.eclipse.emf.common.notify.AdapterFactory;
-import org.eclipse.jst.j2ee.internal.plugin.J2EEUIMessages;
-
-
-/**
- * @author Sachin Patel
- *
- * To change this generated comment edit the template variable "typecomment":
- * Window>Preferences>Java>Templates. To enable and disable the creation of type comments go to
- * Window>Preferences>Java>Code Generation.
- */
-public class GroupedEntityItemProvider extends GroupedEJBItemProvider {
-
- public static final String ENTITY = J2EEUIMessages.getResourceString("Entity_UI_"); //$NON-NLS-1$
-
- public GroupedEntityItemProvider(AdapterFactory adapterFactory, String text, Object image, Object parent, Collection children) {
- super(adapterFactory, text, image, parent, children);
- }
-
- @Override
- public String getText(Object object) {
- return ENTITY;
- }
-}
\ No newline at end of file
diff --git a/plugins/org.eclipse.jst.j2ee.ui/j2ee_ui/org/eclipse/jst/j2ee/internal/ejb/provider/GroupedMessageItemProvider.java b/plugins/org.eclipse.jst.j2ee.ui/j2ee_ui/org/eclipse/jst/j2ee/internal/ejb/provider/GroupedMessageItemProvider.java
deleted file mode 100644
index ca49732..0000000
--- a/plugins/org.eclipse.jst.j2ee.ui/j2ee_ui/org/eclipse/jst/j2ee/internal/ejb/provider/GroupedMessageItemProvider.java
+++ /dev/null
@@ -1,39 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2003, 2004 IBM Corporation and others.
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
- *
- * Contributors:
- * IBM Corporation - initial API and implementation
- *******************************************************************************/
-package org.eclipse.jst.j2ee.internal.ejb.provider;
-
-import java.util.Collection;
-
-import org.eclipse.emf.common.notify.AdapterFactory;
-import org.eclipse.jst.j2ee.internal.plugin.J2EEUIMessages;
-
-
-
-/**
- * @author Sachin Patel
- *
- * To change this generated comment edit the template variable "typecomment":
- * Window>Preferences>Java>Templates. To enable and disable the creation of type comments go to
- * Window>Preferences>Java>Code Generation.
- */
-public class GroupedMessageItemProvider extends GroupedEJBItemProvider {
-
- public static final String MESSAGE_BEANS = J2EEUIMessages.getResourceString("Message_Driven_Beans_UI_"); //$NON-NLS-1$
-
- public GroupedMessageItemProvider(AdapterFactory adapterFactory, String text, Object image, Object parent, Collection children) {
- super(adapterFactory, text, image, parent, children);
- }
-
- @Override
- public String getText(Object object) {
- return MESSAGE_BEANS;
- }
-}
\ No newline at end of file
diff --git a/plugins/org.eclipse.jst.j2ee.ui/j2ee_ui/org/eclipse/jst/j2ee/internal/ejb/provider/GroupedSessionItemProvider.java b/plugins/org.eclipse.jst.j2ee.ui/j2ee_ui/org/eclipse/jst/j2ee/internal/ejb/provider/GroupedSessionItemProvider.java
deleted file mode 100644
index 5fc73a4..0000000
--- a/plugins/org.eclipse.jst.j2ee.ui/j2ee_ui/org/eclipse/jst/j2ee/internal/ejb/provider/GroupedSessionItemProvider.java
+++ /dev/null
@@ -1,38 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2003, 2004 IBM Corporation and others.
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
- *
- * Contributors:
- * IBM Corporation - initial API and implementation
- *******************************************************************************/
-package org.eclipse.jst.j2ee.internal.ejb.provider;
-
-import java.util.Collection;
-
-import org.eclipse.emf.common.notify.AdapterFactory;
-import org.eclipse.jst.j2ee.internal.plugin.J2EEUIMessages;
-
-
-/**
- * @author Sachin Patel
- *
- * To change this generated comment edit the template variable "typecomment":
- * Window>Preferences>Java>Templates. To enable and disable the creation of type comments go to
- * Window>Preferences>Java>Code Generation.
- */
-public class GroupedSessionItemProvider extends GroupedEJBItemProvider {
-
- public static final String SESSION_BEANS = J2EEUIMessages.getResourceString("Session_Beans_UI_"); //$NON-NLS-1$
-
- public GroupedSessionItemProvider(AdapterFactory adapterFactory, String text, Object image, Object parent, Collection children) {
- super(adapterFactory, text, image, parent, children);
- }
-
- @Override
- public String getText(Object object) {
- return SESSION_BEANS;
- }
-}
\ No newline at end of file
diff --git a/plugins/org.eclipse.jst.j2ee.ui/j2ee_ui/org/eclipse/jst/j2ee/internal/ejb/provider/HomeInterfaceProviderHelper.java b/plugins/org.eclipse.jst.j2ee.ui/j2ee_ui/org/eclipse/jst/j2ee/internal/ejb/provider/HomeInterfaceProviderHelper.java
deleted file mode 100644
index 2348efa..0000000
--- a/plugins/org.eclipse.jst.j2ee.ui/j2ee_ui/org/eclipse/jst/j2ee/internal/ejb/provider/HomeInterfaceProviderHelper.java
+++ /dev/null
@@ -1,64 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2003, 2004 IBM Corporation and others.
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
- *
- * Contributors:
- * IBM Corporation - initial API and implementation
- *******************************************************************************/
-package org.eclipse.jst.j2ee.internal.ejb.provider;
-
-
-import org.eclipse.jem.java.JavaClass;
-import org.eclipse.jst.j2ee.ejb.EnterpriseBean;
-import org.eclipse.jst.j2ee.internal.plugin.J2EEUIMessages;
-import org.eclipse.swt.graphics.Image;
-
-
-/**
- * Insert the type's description here. Creation date: (6/20/2001 11:23:30 PM)
- *
- * @author: Administrator
- */
-public class HomeInterfaceProviderHelper extends J2EEJavaClassProviderHelper {
- private static Image image;
-
- /**
- * HomeInterfaceProviderHelper constructor comment.
- *
- * @param cls
- * org.eclipse.jem.internal.java.JavaClass
- */
- public HomeInterfaceProviderHelper(EnterpriseBean anEJB) {
- super(anEJB);
- }
-
- @Override
- public Image getImage() {
- if (image == null)
- image = createImage();
- return image;
- }
-
- /**
- * Insert the method's description here. Creation date: (7/11/2001 1:53:49 PM)
- *
- * @return org.eclipse.jem.internal.java.JavaClass
- */
- @Override
- public JavaClass getJavaClass() {
- return getEjb().getHomeInterface();
- }
-
- @Override
- protected String getOverlayKey() {
- return "home_interface_overlay_obj";//$NON-NLS-1$
- }
-
- @Override
- public String getTypeString(String className) {
- return J2EEUIMessages.getResourceString("Home_Interface_UI_", new Object[]{className}); //$NON-NLS-1$ = "Home Interface"
- }
-}
\ No newline at end of file
diff --git a/plugins/org.eclipse.jst.j2ee.ui/j2ee_ui/org/eclipse/jst/j2ee/internal/ejb/provider/J2EEContainerManagedEntityItemProvider.java b/plugins/org.eclipse.jst.j2ee.ui/j2ee_ui/org/eclipse/jst/j2ee/internal/ejb/provider/J2EEContainerManagedEntityItemProvider.java
deleted file mode 100644
index 2a09f66..0000000
--- a/plugins/org.eclipse.jst.j2ee.ui/j2ee_ui/org/eclipse/jst/j2ee/internal/ejb/provider/J2EEContainerManagedEntityItemProvider.java
+++ /dev/null
@@ -1,47 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2003, 2004 IBM Corporation and others.
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
- *
- * Contributors:
- * IBM Corporation - initial API and implementation
- *******************************************************************************/
-package org.eclipse.jst.j2ee.internal.ejb.provider;
-
-
-import java.util.ArrayList;
-import java.util.Collection;
-import java.util.List;
-
-import org.eclipse.jst.j2ee.ejb.ContainerManagedEntity;
-import org.eclipse.jst.j2ee.ejb.EnterpriseBean;
-
-
-/**
- * Insert the type's description here. Creation date: (6/20/2001 6:58:51 PM)
- *
- * @author: Administrator
- */
-public class J2EEContainerManagedEntityItemProvider extends ContainerManagedEntityItemProvider {
- /**
- * J2EEContainerManagedEntityItemProvider constructor comment.
- *
- * @param adapterFactory
- * org.eclipse.emf.common.notify.AdapterFactory
- */
- public J2EEContainerManagedEntityItemProvider(EjbItemProviderAdapterFactory adapterFactory) {
- super(adapterFactory);
- }
-
- @Override
- public Collection getChildren(Object object) {
- List result = new ArrayList();
- result.addAll(super.getChildren(object));
- J2EEJavaClassProviderHelper.addChildren((ContainerManagedEntity) object, result);
- result.addAll(((ContainerManagedEntity) object).getEnvironmentProperties());
- result.addAll(J2EEReferenceProviderHelper.getReferences((EnterpriseBean) object));
- return result;
- }
-}
\ No newline at end of file
diff --git a/plugins/org.eclipse.jst.j2ee.ui/j2ee_ui/org/eclipse/jst/j2ee/internal/ejb/provider/J2EEEjbItemProviderAdapterFactory.java b/plugins/org.eclipse.jst.j2ee.ui/j2ee_ui/org/eclipse/jst/j2ee/internal/ejb/provider/J2EEEjbItemProviderAdapterFactory.java
deleted file mode 100644
index ddd17bf..0000000
--- a/plugins/org.eclipse.jst.j2ee.ui/j2ee_ui/org/eclipse/jst/j2ee/internal/ejb/provider/J2EEEjbItemProviderAdapterFactory.java
+++ /dev/null
@@ -1,85 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2003, 2005 IBM Corporation and others.
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
- *
- * Contributors:
- * IBM Corporation - initial API and implementation
- *******************************************************************************/
-package org.eclipse.jst.j2ee.internal.ejb.provider;
-
-import org.eclipse.emf.common.notify.Adapter;
-
-
-/**
- * Insert the type's description here. Creation date: (6/20/2001 7:20:07 PM)
- *
- * @author: Administrator
- */
-public class J2EEEjbItemProviderAdapterFactory extends org.eclipse.jst.j2ee.internal.ejb.provider.EjbItemProviderAdapterFactory {
- /**
- * J2EEEjbItemProviderAdapterFactory constructor comment.
- */
- public J2EEEjbItemProviderAdapterFactory() {
- super();
- }
-
- /**
- * This creates an adapter for a
- * {@link org.eclipse.jst.j2ee.internal.internal.ejb.ContainerManagedEntity}.
- */
- @Override
- public Adapter createContainerManagedEntityAdapter() {
- if (containerManagedEntityItemProvider == null) {
- containerManagedEntityItemProvider = new J2EEContainerManagedEntityItemProvider(this);
- }
-
- return containerManagedEntityItemProvider;
- }
-
- /**
- * This creates an adapter for a {@link org.eclipse.jst.j2ee.internal.internal.ejb.EJBJar}.
- */
- @Override
- public Adapter createEJBJarAdapter() {
- if (eJBJarItemProvider == null) {
- eJBJarItemProvider = new GroupedEJBJarItemProvider(this, true);
- }
-
- return eJBJarItemProvider;
- }
-
- /**
- * This creates an adapter for a {@link org.eclipse.jst.j2ee.internal.internal.ejb.Entity}.
- */
- @Override
- public Adapter createEntityAdapter() {
- if (entityItemProvider == null) {
- entityItemProvider = new J2EEEntityItemProvider(this);
- }
-
- return entityItemProvider;
- }
-
- /**
- * This creates an adapter for a {@link org.eclipse.jst.j2ee.internal.internal.ejb.Session}.
- */
- @Override
- public Adapter createSessionAdapter() {
- if (sessionItemProvider == null) {
- sessionItemProvider = new J2EESessionItemProvider(this);
- }
-
- return sessionItemProvider;
- }
-
- @Override
- public Adapter createMessageDrivenAdapter() {
- if (messageDrivenItemProvider == null) {
- messageDrivenItemProvider = new J2EEMessageDrivenItemProvider(this);
- }
- return messageDrivenItemProvider;
- }
-}
diff --git a/plugins/org.eclipse.jst.j2ee.ui/j2ee_ui/org/eclipse/jst/j2ee/internal/ejb/provider/J2EEEntityItemProvider.java b/plugins/org.eclipse.jst.j2ee.ui/j2ee_ui/org/eclipse/jst/j2ee/internal/ejb/provider/J2EEEntityItemProvider.java
deleted file mode 100644
index e41eee6..0000000
--- a/plugins/org.eclipse.jst.j2ee.ui/j2ee_ui/org/eclipse/jst/j2ee/internal/ejb/provider/J2EEEntityItemProvider.java
+++ /dev/null
@@ -1,44 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2003, 2004 IBM Corporation and others.
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
- *
- * Contributors:
- * IBM Corporation - initial API and implementation
- *******************************************************************************/
-package org.eclipse.jst.j2ee.internal.ejb.provider;
-
-
-import java.util.ArrayList;
-import java.util.Collection;
-import java.util.List;
-
-import org.eclipse.jst.j2ee.ejb.Entity;
-
-
-/**
- * Insert the type's description here. Creation date: (6/20/2001 11:10:06 PM)
- *
- * @author: Administrator
- */
-public class J2EEEntityItemProvider extends EntityItemProvider {
- /**
- * J2EEEntityItemProvider constructor comment.
- *
- * @param adapterFactory
- * org.eclipse.emf.common.notify.AdapterFactory
- */
- public J2EEEntityItemProvider(org.eclipse.emf.common.notify.AdapterFactory adapterFactory) {
- super(adapterFactory);
- }
-
- @Override
- public Collection getChildren(Object object) {
- List result = new ArrayList();
- result.addAll(super.getChildrenSuper(object));
- J2EEJavaClassProviderHelper.addChildren((Entity) object, result);
- return result;
- }
-}
\ No newline at end of file
diff --git a/plugins/org.eclipse.jst.j2ee.ui/j2ee_ui/org/eclipse/jst/j2ee/internal/ejb/provider/J2EEJavaClassProviderHelper.java b/plugins/org.eclipse.jst.j2ee.ui/j2ee_ui/org/eclipse/jst/j2ee/internal/ejb/provider/J2EEJavaClassProviderHelper.java
deleted file mode 100644
index 00fe427..0000000
--- a/plugins/org.eclipse.jst.j2ee.ui/j2ee_ui/org/eclipse/jst/j2ee/internal/ejb/provider/J2EEJavaClassProviderHelper.java
+++ /dev/null
@@ -1,146 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2003, 2005 IBM Corporation and others.
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
- *
- * Contributors:
- * IBM Corporation - initial API and implementation
- *******************************************************************************/
-package org.eclipse.jst.j2ee.internal.ejb.provider;
-
-
-import java.util.Collection;
-
-import org.eclipse.core.resources.IProject;
-import org.eclipse.core.resources.IResource;
-import org.eclipse.core.runtime.IAdaptable;
-import org.eclipse.jem.java.JavaClass;
-import org.eclipse.jem.util.emf.workbench.ProjectUtilities;
-import org.eclipse.jface.resource.ImageDescriptor;
-import org.eclipse.jst.j2ee.ejb.EnterpriseBean;
-import org.eclipse.jst.j2ee.ejb.Entity;
-import org.eclipse.jst.j2ee.internal.plugin.J2EEEditorUtility;
-import org.eclipse.jst.j2ee.internal.plugin.J2EEUIPlugin;
-import org.eclipse.swt.graphics.Image;
-import org.eclipse.wst.common.frameworks.internal.ui.OverlayIcon;
-
-public abstract class J2EEJavaClassProviderHelper implements IAdaptable {
- private EnterpriseBean ejb;
- public static final Class IRESOURCE_CLASS = IResource.class;
- public static final Class IPROJECT_CLASS = IProject.class;
-
- /**
- * J2EEJavaClassProviderHelper constructor comment.
- */
- public J2EEJavaClassProviderHelper(EnterpriseBean anEJB) {
- super();
- setEjb(anEJB);
- }
-
- public static void addChildren(Entity ejb, Collection children) {
- addChildren((EnterpriseBean) ejb, children);
- if (ejb.getPrimaryKey() != null)
- children.add(new PrimaryKeyClassProviderHelper(ejb));
- }
-
- public static void addChildren(EnterpriseBean ejb, Collection children) {
-
- if (ejb.getHomeInterface() != null)
- children.add(new HomeInterfaceProviderHelper(ejb));
- if (ejb.getRemoteInterface() != null)
- children.add(new RemoteInterfaceProviderHelper(ejb));
- if (ejb.getLocalHomeInterface() != null)
- children.add(new LocalHomeInterfaceProviderHelper(ejb));
- if (ejb.getLocalInterface() != null)
- children.add(new LocalInterfaceProviderHelper(ejb));
- if (ejb.getEjbClass() != null)
- children.add(new BeanClassProviderHelper(ejb));
- }
-
- protected Image createImage() {
- ImageDescriptor base = J2EEUIPlugin.getDefault().getImageDescriptor("jcu_obj");//$NON-NLS-1$
- if (base == null)
- return null;
- ImageDescriptor overlay = getOverlayDescriptor();
- if (overlay == null)
- return base.createImage();
- return new OverlayIcon(base, new ImageDescriptor[][]{{overlay}}).createImage();
- }
-
- /**
- * Insert the method's description here. Creation date: (7/11/2001 1:47:24 PM)
- *
- * @return org.eclipse.jst.j2ee.internal.internal.ejb.EnterpriseBean
- */
- public org.eclipse.jst.j2ee.ejb.EnterpriseBean getEjb() {
- return ejb;
- }
-
- public Image getImage() {
- return null;
- }
-
- /**
- * Insert the method's description here. Creation date: (6/20/2001 10:30:54 PM)
- *
- * @return JavaClass
- */
- public abstract JavaClass getJavaClass();
-
- protected ImageDescriptor getOverlayDescriptor() {
- return J2EEUIPlugin.getDefault().getImageDescriptor(getOverlayKey());
- }
-
- protected abstract String getOverlayKey();
-
- protected IProject getProject() {
- return ProjectUtilities.getProject(getJavaClass());
- }
-
- public String getStatusLineMessage() {
- if (getJavaClass() != null)
- return getTypeString(getJavaClass().getQualifiedName());
- return ""; //$NON-NLS-1$
- }
-
- public String getText() {
- if (getJavaClass() != null)
- return getJavaClass().getName();
- return ""; //$NON-NLS-1$
- }
-
- public abstract String getTypeString(String className);
-
- public void openInEditor() {
- IProject project = ProjectUtilities.getProject(getJavaClass());
- try {
- J2EEEditorUtility.openInEditor(getJavaClass(), project);
- } catch (Exception cantOpen) {
- //Ignore
- }
- }
-
- /**
- * Insert the method's description here. Creation date: (7/11/2001 1:47:24 PM)
- *
- * @param newEjb
- * org.eclipse.jst.j2ee.internal.internal.ejb.EnterpriseBean
- */
- public void setEjb(org.eclipse.jst.j2ee.ejb.EnterpriseBean newEjb) {
- ejb = newEjb;
- }
-
- /**
- * @see IAdaptable#EcoreUtil.getAdapter(eAdapters(),Class)
- */
- public Object getAdapter(Class adapter) {
- if (adapter == IRESOURCE_CLASS)
- return J2EEEditorUtility.getFile(getJavaClass());
- if (adapter == IPROJECT_CLASS)
- return getProject();
- return null;
- }
-
-}
diff --git a/plugins/org.eclipse.jst.j2ee.ui/j2ee_ui/org/eclipse/jst/j2ee/internal/ejb/provider/J2EEMessageDrivenItemProvider.java b/plugins/org.eclipse.jst.j2ee.ui/j2ee_ui/org/eclipse/jst/j2ee/internal/ejb/provider/J2EEMessageDrivenItemProvider.java
deleted file mode 100644
index f56248a..0000000
--- a/plugins/org.eclipse.jst.j2ee.ui/j2ee_ui/org/eclipse/jst/j2ee/internal/ejb/provider/J2EEMessageDrivenItemProvider.java
+++ /dev/null
@@ -1,41 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2003, 2004 IBM Corporation and others.
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
- *
- * Contributors:
- * IBM Corporation - initial API and implementation
- *******************************************************************************/
-package org.eclipse.jst.j2ee.internal.ejb.provider;
-
-
-import java.util.ArrayList;
-import java.util.Collection;
-import java.util.List;
-
-import org.eclipse.jst.j2ee.ejb.MessageDriven;
-
-
-/**
- * @author jsholl
- *
- * To change this generated comment edit the template variable "typecomment":
- * Window>Preferences>Java>Templates. To enable and disable the creation of type comments go to
- * Window>Preferences>Java>Code Generation.
- */
-public class J2EEMessageDrivenItemProvider extends MessageDrivenItemProvider {
-
- public J2EEMessageDrivenItemProvider(org.eclipse.emf.common.notify.AdapterFactory adapterFactory) {
- super(adapterFactory);
- }
-
- @Override
- public Collection getChildren(Object object) {
- List result = new ArrayList();
- result.addAll(super.getChildrenSuper(object));
- J2EEJavaClassProviderHelper.addChildren((MessageDriven) object, result);
- return result;
- }
-}
\ No newline at end of file
diff --git a/plugins/org.eclipse.jst.j2ee.ui/j2ee_ui/org/eclipse/jst/j2ee/internal/ejb/provider/J2EEReferenceProviderHelper.java b/plugins/org.eclipse.jst.j2ee.ui/j2ee_ui/org/eclipse/jst/j2ee/internal/ejb/provider/J2EEReferenceProviderHelper.java
deleted file mode 100644
index b8b8948..0000000
--- a/plugins/org.eclipse.jst.j2ee.ui/j2ee_ui/org/eclipse/jst/j2ee/internal/ejb/provider/J2EEReferenceProviderHelper.java
+++ /dev/null
@@ -1,49 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2003, 2004 IBM Corporation and others.
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
- *
- * Contributors:
- * IBM Corporation - initial API and implementation
- *******************************************************************************/
-/*
- * Created on May 6, 2003
- *
- * To change the template for this generated file go to
- * Window>Preferences>Java>Code Generation>Code and Comments
- */
-package org.eclipse.jst.j2ee.internal.ejb.provider;
-
-import java.util.ArrayList;
-import java.util.Collection;
-import java.util.List;
-
-import org.eclipse.jst.j2ee.ejb.EnterpriseBean;
-
-
-/**
- * @author jsholl
- *
- * To change the template for this generated type comment go to Window>Preferences>Java>Code
- * Generation>Code and Comments
- */
-public class J2EEReferenceProviderHelper {
-
- public static Collection getReferences(EnterpriseBean bean) {
- List result = new ArrayList();
- if (!bean.getEjbRefs().isEmpty())
- result.addAll(bean.getEjbRefs());
- if (!bean.getEjbLocalRefs().isEmpty())
- result.addAll(bean.getEjbLocalRefs());
- if (!bean.getResourceRefs().isEmpty())
- result.addAll(bean.getResourceRefs());
- if (!bean.getSecurityRoleRefs().isEmpty())
- result.addAll(bean.getSecurityRoleRefs());
- if (!bean.getResourceEnvRefs().isEmpty())
- result.addAll(bean.getResourceEnvRefs());
- return result;
- }
-
-}
\ No newline at end of file
diff --git a/plugins/org.eclipse.jst.j2ee.ui/j2ee_ui/org/eclipse/jst/j2ee/internal/ejb/provider/J2EESessionItemProvider.java b/plugins/org.eclipse.jst.j2ee.ui/j2ee_ui/org/eclipse/jst/j2ee/internal/ejb/provider/J2EESessionItemProvider.java
deleted file mode 100644
index ec372069..0000000
--- a/plugins/org.eclipse.jst.j2ee.ui/j2ee_ui/org/eclipse/jst/j2ee/internal/ejb/provider/J2EESessionItemProvider.java
+++ /dev/null
@@ -1,55 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2003, 2004 IBM Corporation and others.
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
- *
- * Contributors:
- * IBM Corporation - initial API and implementation
- *******************************************************************************/
-package org.eclipse.jst.j2ee.internal.ejb.provider;
-
-
-import java.util.ArrayList;
-import java.util.Collection;
-import java.util.List;
-
-import org.eclipse.jst.j2ee.ejb.Session;
-import org.eclipse.jst.j2ee.internal.J2EEVersionConstants;
-
-
-/**
- * Insert the type's description here. Creation date: (6/20/2001 11:10:48 PM)
- *
- * @author: Administrator
- */
-public class J2EESessionItemProvider extends org.eclipse.jst.j2ee.internal.ejb.provider.SessionItemProvider {
- /**
- * J2EESessionItemProvider constructor comment.
- *
- * @param adapterFactory
- * org.eclipse.emf.common.notify.AdapterFactory
- */
- public J2EESessionItemProvider(org.eclipse.emf.common.notify.AdapterFactory adapterFactory) {
- super(adapterFactory);
- }
-
- @Override
- public Collection getChildren(Object object) {
- List result = new ArrayList();
- result.addAll(super.getChildrenSuper(object));
- addServiceEndpointInterface((Session) object, result);
- J2EEJavaClassProviderHelper.addChildren((Session) object, result);
- return result;
- }
-
- /**
- * @param session
- * @param result
- */
- private void addServiceEndpointInterface(Session session, Collection children) {
- if (session.getVersionID() >= J2EEVersionConstants.EJB_2_1_ID && session.getServiceEndpoint() != null)
- children.add(new ServiceEndpointInterfaceProviderHelper(session));
- }
-}
\ No newline at end of file
diff --git a/plugins/org.eclipse.jst.j2ee.ui/j2ee_ui/org/eclipse/jst/j2ee/internal/ejb/provider/LocalHomeInterfaceProviderHelper.java b/plugins/org.eclipse.jst.j2ee.ui/j2ee_ui/org/eclipse/jst/j2ee/internal/ejb/provider/LocalHomeInterfaceProviderHelper.java
deleted file mode 100644
index 22891ad..0000000
--- a/plugins/org.eclipse.jst.j2ee.ui/j2ee_ui/org/eclipse/jst/j2ee/internal/ejb/provider/LocalHomeInterfaceProviderHelper.java
+++ /dev/null
@@ -1,62 +0,0 @@
-/***************************************************************************************************
- * Copyright (c) 2003, 2004 IBM Corporation and others. All rights reserved. This program and the
- * accompanying materials are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
- *
- * Contributors: IBM Corporation - initial API and implementation
- **************************************************************************************************/
-package org.eclipse.jst.j2ee.internal.ejb.provider;
-
-
-import org.eclipse.jem.java.JavaClass;
-import org.eclipse.jst.j2ee.ejb.EnterpriseBean;
-import org.eclipse.jst.j2ee.internal.plugin.J2EEUIMessages;
-import org.eclipse.swt.graphics.Image;
-
-
-public class LocalHomeInterfaceProviderHelper extends J2EEJavaClassProviderHelper {
-
- private static Image image;
-
- /**
- * Constructor for LocalHomeInterfaceProviderHelper.
- *
- * @param anEJB
- */
- public LocalHomeInterfaceProviderHelper(EnterpriseBean anEJB) {
- super(anEJB);
- }
-
- /**
- * @see J2EEJavaClassProviderHelper#getJavaClass()
- */
- @Override
- public JavaClass getJavaClass() {
- return getEjb().getLocalHomeInterface();
- }
-
- @Override
- public Image getImage() {
- if (image == null)
- image = createImage();
- return image;
- }
-
- /**
- * @see J2EEJavaClassProviderHelper#getOverlayKey()
- */
- @Override
- protected String getOverlayKey() {
- return "local_home_interface_overlay_obj"; //$NON-NLS-1$
- }
-
- /**
- * @see J2EEJavaClassProviderHelper#getTypeString(String)
- */
- @Override
- public String getTypeString(String className) {
- return J2EEUIMessages.getResourceString("Local_Home_Interface_UI_", new Object[]{className}); //$NON-NLS-1$ = "Local Home Interface";
- }
-
-}
\ No newline at end of file
diff --git a/plugins/org.eclipse.jst.j2ee.ui/j2ee_ui/org/eclipse/jst/j2ee/internal/ejb/provider/LocalInterfaceProviderHelper.java b/plugins/org.eclipse.jst.j2ee.ui/j2ee_ui/org/eclipse/jst/j2ee/internal/ejb/provider/LocalInterfaceProviderHelper.java
deleted file mode 100644
index 249aa59..0000000
--- a/plugins/org.eclipse.jst.j2ee.ui/j2ee_ui/org/eclipse/jst/j2ee/internal/ejb/provider/LocalInterfaceProviderHelper.java
+++ /dev/null
@@ -1,62 +0,0 @@
-/***************************************************************************************************
- * Copyright (c) 2003, 2004 IBM Corporation and others. All rights reserved. This program and the
- * accompanying materials are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
- *
- * Contributors: IBM Corporation - initial API and implementation
- **************************************************************************************************/
-package org.eclipse.jst.j2ee.internal.ejb.provider;
-
-
-import org.eclipse.jem.java.JavaClass;
-import org.eclipse.jst.j2ee.ejb.EnterpriseBean;
-import org.eclipse.jst.j2ee.internal.plugin.J2EEUIMessages;
-import org.eclipse.swt.graphics.Image;
-
-
-public class LocalInterfaceProviderHelper extends J2EEJavaClassProviderHelper {
-
- private static Image image;
-
- /**
- * Constructor for LocalInterfaceProviderHelper.
- *
- * @param anEJB
- */
- public LocalInterfaceProviderHelper(EnterpriseBean anEJB) {
- super(anEJB);
- }
-
- @Override
- public Image getImage() {
- if (image == null)
- image = createImage();
- return image;
- }
-
- /**
- * @see J2EEJavaClassProviderHelper#getJavaClass()
- */
- @Override
- public JavaClass getJavaClass() {
- return getEjb().getLocalInterface();
- }
-
- /**
- * @see J2EEJavaClassProviderHelper#getOverlayKey()
- */
- @Override
- protected String getOverlayKey() {
- return "local_interface_overlay_obj";//$NON-NLS-1$
- }
-
- /**
- * @see J2EEJavaClassProviderHelper#getTypeString(String)
- */
- @Override
- public String getTypeString(String className) {
- return J2EEUIMessages.getResourceString("Local_Interface_UI_", new Object[]{className}); //$NON-NLS-1$ = "Local Interface"
- }
-
-}
\ No newline at end of file
diff --git a/plugins/org.eclipse.jst.j2ee.ui/j2ee_ui/org/eclipse/jst/j2ee/internal/ejb/provider/MethodPermissionsContentProvider.java b/plugins/org.eclipse.jst.j2ee.ui/j2ee_ui/org/eclipse/jst/j2ee/internal/ejb/provider/MethodPermissionsContentProvider.java
deleted file mode 100644
index 2beda77..0000000
--- a/plugins/org.eclipse.jst.j2ee.ui/j2ee_ui/org/eclipse/jst/j2ee/internal/ejb/provider/MethodPermissionsContentProvider.java
+++ /dev/null
@@ -1,134 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2003, 2005 IBM Corporation and others.
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
- *
- * Contributors:
- * IBM Corporation - initial API and implementation
- *******************************************************************************/
-package org.eclipse.jst.j2ee.internal.ejb.provider;
-
-import java.util.Collections;
-import java.util.List;
-
-import org.eclipse.emf.common.notify.AdapterFactory;
-import org.eclipse.emf.common.notify.Notification;
-import org.eclipse.emf.ecore.EObject;
-import org.eclipse.emf.ecore.EStructuralFeature;
-import org.eclipse.jst.j2ee.ejb.AssemblyDescriptor;
-import org.eclipse.jst.j2ee.ejb.CMPAttribute;
-import org.eclipse.jst.j2ee.ejb.EJBJar;
-import org.eclipse.jst.j2ee.ejb.EnterpriseBean;
-import org.eclipse.jst.j2ee.ejb.MethodPermission;
-import org.eclipse.jst.j2ee.ejb.internal.impl.EjbFactoryImpl;
-
-
-public class MethodPermissionsContentProvider extends AbstractMethodsContentProvider {
- private static final EStructuralFeature PERMISSION_MES_SF = EjbFactoryImpl.getPackage().getMethodPermission_MethodElements();
- private static final EStructuralFeature PERMISSION_MES_UNCHECKED_SF = EjbFactoryImpl.getPackage().getMethodPermission_Unchecked();
- private static final EStructuralFeature PERMISSION_MES_ROLES_SF = EjbFactoryImpl.getPackage().getMethodPermission_Roles();
- private static final EStructuralFeature AD_MP_SF = EjbFactoryImpl.getPackage().getAssemblyDescriptor_MethodPermissions();
-
- /**
- * Constructor for MethodPermissionsContentProvider.
- *
- * @param adapterFactory
- * @param root
- * @param viewer
- */
- public MethodPermissionsContentProvider(AdapterFactory adapterFactory, boolean root) {
- super(adapterFactory, root);
- }
-
- /**
- * Constructor for MethodPermissionsContentProvider.
- *
- * @param adapterFactory
- */
- public MethodPermissionsContentProvider(AdapterFactory adapterFactory) {
- super(adapterFactory);
- }
-
- /*
- * @see ITreeContentProvider#getChildren(Object)
- */
- @Override
- public Object[] getChildren(Object parentElement) {
- if (parentElement instanceof MethodPermission)
- return getEnterpriseBeans((MethodPermission) parentElement);
- return super.getChildren(parentElement);
- }
-
- protected Object[] getEnterpriseBeans(MethodPermission mp) {
- List mes = mp.getMethodElements();
- return getEnterpriseBeans(mp, mes);
- }
-
- /*
- * @see AbstractMethodsContentProvider#getMethodElements(EObject, EnterpriseBean)
- */
- @Override
- protected List getMethodElements(EObject aRefObject, EnterpriseBean anEJB) {
- if (aRefObject == null || !(aRefObject instanceof MethodPermission))
- return Collections.EMPTY_LIST;
- MethodPermission parentMP = (MethodPermission) aRefObject;
- return parentMP.getMethodElements(anEJB);
- }
-
- /*
- * @see IStructuredContentProvider#getElements(Object)
- */
- @Override
- public Object[] getElements(Object inputElement) {
- super.getElements(inputElement);
- if (inputElement instanceof EJBJar) {
- EJBJar jar = (EJBJar) inputElement;
- if (jar.getAssemblyDescriptor() != null)
- return jar.getAssemblyDescriptor().getMethodPermissions().toArray();
- }
- if (inputElement instanceof AssemblyDescriptor)
- return ((AssemblyDescriptor) inputElement).getMethodPermissions().toArray();
- return new Object[0];
- }
-
- /*
- * @see ITreeContentProvider#hasChildren(Object)
- */
- @Override
- public boolean hasChildren(Object element) {
- if (element instanceof MethodPermission)
- return !((MethodPermission) element).getMethodElements().isEmpty();
- return super.hasChildren(element);
- }
-
- /*
- * @see AbstractMethodsContentProvider#getMethodElementsReference()
- */
- @Override
- protected EStructuralFeature getMethodElementsReference() {
- return PERMISSION_MES_SF;
- }
-
- /**
- * @see org.eclipse.jst.j2ee.internal.internal.ejb.ui.providers.AbstractMethodsContentProvider#getMethodElementsContainerReference()
- */
- @Override
- protected EStructuralFeature getMethodElementsContainerReference() {
- return AD_MP_SF;
- }
-
- /**
- * @see org.eclipse.emf.edit.provider.INotifyChangedListener#notifyChanged(Notification)
- */
- @Override
- public void notifyChanged(Notification notification) {
- if (notification.getFeature() == PERMISSION_MES_SF || notification.getFeature() == AD_MP_SF)
- refreshTreeViewer();
- else if (notification.getOldValue() instanceof CMPAttribute && notification.getNewValue() == null)
- return;
- if (notification.getFeature() == PERMISSION_MES_UNCHECKED_SF || notification.getFeature() == PERMISSION_MES_ROLES_SF || notification.getFeature() == getMethodElementsReference() || notification.getFeature() == getMethodElementsContainerReference())
- super.notifyChanged(notification);
- }
-}
diff --git a/plugins/org.eclipse.jst.j2ee.ui/j2ee_ui/org/eclipse/jst/j2ee/internal/ejb/provider/MethodTransactionContentProvider.java b/plugins/org.eclipse.jst.j2ee.ui/j2ee_ui/org/eclipse/jst/j2ee/internal/ejb/provider/MethodTransactionContentProvider.java
deleted file mode 100644
index 0ef2f26..0000000
--- a/plugins/org.eclipse.jst.j2ee.ui/j2ee_ui/org/eclipse/jst/j2ee/internal/ejb/provider/MethodTransactionContentProvider.java
+++ /dev/null
@@ -1,121 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2003, 2005 IBM Corporation and others.
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
- *
- * Contributors:
- * IBM Corporation - initial API and implementation
- *******************************************************************************/
-package org.eclipse.jst.j2ee.internal.ejb.provider;
-
-
-import java.util.Collections;
-import java.util.List;
-
-import org.eclipse.emf.common.notify.AdapterFactory;
-import org.eclipse.emf.ecore.EObject;
-import org.eclipse.emf.ecore.EStructuralFeature;
-import org.eclipse.jst.j2ee.ejb.AssemblyDescriptor;
-import org.eclipse.jst.j2ee.ejb.EJBJar;
-import org.eclipse.jst.j2ee.ejb.EnterpriseBean;
-import org.eclipse.jst.j2ee.ejb.MethodTransaction;
-import org.eclipse.jst.j2ee.ejb.internal.impl.EjbFactoryImpl;
-
-
-public class MethodTransactionContentProvider extends AbstractMethodsContentProvider {
- private static final EStructuralFeature TRANSACTION_MES_SF = EjbFactoryImpl.getPackage().getMethodTransaction_MethodElements();
- private static final EStructuralFeature AD_MT_SF = EjbFactoryImpl.getPackage().getAssemblyDescriptor_MethodTransactions();
-
- /**
- * Constructor for MethodTransactionContentProvider.
- *
- * @param adapterFactory
- * @param root
- * @param viewer
- */
- public MethodTransactionContentProvider(AdapterFactory adapterFactory, boolean root) {
- super(adapterFactory, root);
- }
-
- /**
- * Constructor for MethodTransationContentProvider.
- *
- * @param adapterFactory
- */
- public MethodTransactionContentProvider(AdapterFactory adapterFactory) {
- super(adapterFactory);
- }
-
- /*
- * @see ITreeContentProvider#getChildren(Object)
- */
- @Override
- public Object[] getChildren(Object parentElement) {
- if (parentElement instanceof MethodTransaction)
- return getEnterpriseBeans((MethodTransaction) parentElement);
- return super.getChildren(parentElement);
- }
-
- protected Object[] getEnterpriseBeans(MethodTransaction mt) {
- List mes = mt.getMethodElements();
- return getEnterpriseBeans(mt, mes);
- }
-
- /*
- * @see AbstractMethodsContentProvider#getMethodElements(EObject, EnterpriseBean)
- */
- @Override
- protected List getMethodElements(EObject aRefObject, EnterpriseBean anEJB) {
- if (aRefObject == null || !(aRefObject instanceof MethodTransaction))
- return Collections.EMPTY_LIST;
- MethodTransaction parentMT = (MethodTransaction) aRefObject;
- return parentMT.getMethodElements(anEJB);
- }
-
- /*
- * @see IStructuredContentProvider#getElements(Object)
- */
- @Override
- public Object[] getElements(Object inputElement) {
- super.getElements(inputElement);
- if (inputElement instanceof EJBJar) {
- EJBJar jar = (EJBJar) inputElement;
- if (jar.getAssemblyDescriptor() != null)
- return jar.getAssemblyDescriptor().getMethodTransactions().toArray();
- }
- if (inputElement instanceof AssemblyDescriptor)
- return ((AssemblyDescriptor) inputElement).getMethodTransactions().toArray();
- return new Object[0];
- }
-
- /*
- * @see ITreeContentProvider#hasChildren(Object)
- */
- @Override
- public boolean hasChildren(Object element) {
- if (element instanceof MethodTransaction)
- return !((MethodTransaction) element).getMethodElements().isEmpty();
- return super.hasChildren(element);
- }
-
- /*
- * @see AbstractMethodsContentProvider#getMethodElementsReference()
- */
- @Override
- protected EStructuralFeature getMethodElementsReference() {
- return TRANSACTION_MES_SF;
- }
-
- /**
- * @see org.eclipse.jst.j2ee.internal.internal.ejb.ui.providers.AbstractMethodsContentProvider#getMethodElementsContainerReference()
- */
- @Override
- protected EStructuralFeature getMethodElementsContainerReference() {
- return AD_MT_SF;
- }
-
-
-
-}
diff --git a/plugins/org.eclipse.jst.j2ee.ui/j2ee_ui/org/eclipse/jst/j2ee/internal/ejb/provider/PrimaryKeyClassProviderHelper.java b/plugins/org.eclipse.jst.j2ee.ui/j2ee_ui/org/eclipse/jst/j2ee/internal/ejb/provider/PrimaryKeyClassProviderHelper.java
deleted file mode 100644
index 437f797..0000000
--- a/plugins/org.eclipse.jst.j2ee.ui/j2ee_ui/org/eclipse/jst/j2ee/internal/ejb/provider/PrimaryKeyClassProviderHelper.java
+++ /dev/null
@@ -1,65 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2003, 2004 IBM Corporation and others.
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
- *
- * Contributors:
- * IBM Corporation - initial API and implementation
- *******************************************************************************/
-package org.eclipse.jst.j2ee.internal.ejb.provider;
-
-
-import org.eclipse.jem.java.JavaClass;
-import org.eclipse.jst.j2ee.ejb.EnterpriseBean;
-import org.eclipse.jst.j2ee.ejb.Entity;
-import org.eclipse.jst.j2ee.internal.plugin.J2EEUIMessages;
-import org.eclipse.swt.graphics.Image;
-
-
-/**
- * Insert the type's description here. Creation date: (6/21/2001 12:28:55 AM)
- *
- * @author: Administrator
- */
-public class PrimaryKeyClassProviderHelper extends J2EEJavaClassProviderHelper {
- private static Image image;
-
- /**
- * PrimaryKeyClassProviderHelper constructor comment.
- *
- * @param cls
- * org.eclipse.jem.internal.java.JavaClass
- */
- public PrimaryKeyClassProviderHelper(EnterpriseBean anEJB) {
- super(anEJB);
- }
-
- @Override
- public Image getImage() {
- if (image == null)
- image = createImage();
- return image;
- }
-
- /**
- * Insert the method's description here. Creation date: (7/11/2001 1:54:22 PM)
- *
- * @return org.eclipse.jem.internal.java.JavaClass
- */
- @Override
- public JavaClass getJavaClass() {
- return ((Entity) getEjb()).getPrimaryKey();
- }
-
- @Override
- protected String getOverlayKey() {
- return "key_interf_ov";//$NON-NLS-1$
- }
-
- @Override
- public String getTypeString(String className) {
- return J2EEUIMessages.getResourceString("Primary_Key_Class_UI_", new Object[]{className}); //$NON-NLS-1$ = "Primary Key Class"
- }
-}
\ No newline at end of file
diff --git a/plugins/org.eclipse.jst.j2ee.ui/j2ee_ui/org/eclipse/jst/j2ee/internal/ejb/provider/RemoteInterfaceProviderHelper.java b/plugins/org.eclipse.jst.j2ee.ui/j2ee_ui/org/eclipse/jst/j2ee/internal/ejb/provider/RemoteInterfaceProviderHelper.java
deleted file mode 100644
index a677d57..0000000
--- a/plugins/org.eclipse.jst.j2ee.ui/j2ee_ui/org/eclipse/jst/j2ee/internal/ejb/provider/RemoteInterfaceProviderHelper.java
+++ /dev/null
@@ -1,64 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2003, 2004 IBM Corporation and others.
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
- *
- * Contributors:
- * IBM Corporation - initial API and implementation
- *******************************************************************************/
-package org.eclipse.jst.j2ee.internal.ejb.provider;
-
-
-import org.eclipse.jem.java.JavaClass;
-import org.eclipse.jst.j2ee.ejb.EnterpriseBean;
-import org.eclipse.jst.j2ee.internal.plugin.J2EEUIMessages;
-import org.eclipse.swt.graphics.Image;
-
-
-/**
- * Insert the type's description here. Creation date: (6/21/2001 12:28:12 AM)
- *
- * @author: Administrator
- */
-public class RemoteInterfaceProviderHelper extends J2EEJavaClassProviderHelper {
- private static Image image;
-
- /**
- * RemoteInterfaceProviderHelper constructor comment.
- *
- * @param cls
- * org.eclipse.jem.internal.java.JavaClass
- */
- public RemoteInterfaceProviderHelper(EnterpriseBean anEJB) {
- super(anEJB);
- }
-
- @Override
- public Image getImage() {
- if (image == null)
- image = createImage();
- return image;
- }
-
- /**
- * Insert the method's description here. Creation date: (7/11/2001 1:55:48 PM)
- *
- * @return org.eclipse.jem.internal.java.JavaClass
- */
- @Override
- public JavaClass getJavaClass() {
- return getEjb().getRemoteInterface();
- }
-
- @Override
- protected String getOverlayKey() {
- return "remote_interface_overlay_obj";//$NON-NLS-1$
- }
-
- @Override
- public String getTypeString(String className) {
- return J2EEUIMessages.getResourceString("Remote_Interface_UI_", new Object[]{className}); //$NON-NLS-1$ = "Remote Interface"
- }
-}
\ No newline at end of file
diff --git a/plugins/org.eclipse.jst.j2ee.ui/j2ee_ui/org/eclipse/jst/j2ee/internal/ejb/provider/ServiceEndpointInterfaceProviderHelper.java b/plugins/org.eclipse.jst.j2ee.ui/j2ee_ui/org/eclipse/jst/j2ee/internal/ejb/provider/ServiceEndpointInterfaceProviderHelper.java
deleted file mode 100644
index 53528b2..0000000
--- a/plugins/org.eclipse.jst.j2ee.ui/j2ee_ui/org/eclipse/jst/j2ee/internal/ejb/provider/ServiceEndpointInterfaceProviderHelper.java
+++ /dev/null
@@ -1,69 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2003, 2004 IBM Corporation and others.
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
- *
- * Contributors:
- * IBM Corporation - initial API and implementation
- *******************************************************************************/
-/*
- * Created on Mar 19, 2004
- *
- * To change the template for this generated file go to
- * Window - Preferences - Java - Code Generation - Code and Comments
- */
-package org.eclipse.jst.j2ee.internal.ejb.provider;
-
-import org.eclipse.jem.java.JavaClass;
-import org.eclipse.jst.j2ee.ejb.EnterpriseBean;
-import org.eclipse.jst.j2ee.ejb.Session;
-import org.eclipse.jst.j2ee.internal.plugin.J2EEUIMessages;
-import org.eclipse.swt.graphics.Image;
-
-
-/**
- * @author dfholttp
- *
- * To change the template for this generated type comment go to Window - Preferences - Java - Code
- * Generation - Code and Comments
- */
-public class ServiceEndpointInterfaceProviderHelper extends J2EEJavaClassProviderHelper {
- private static Image image;
-
- /**
- * @param anEJB
- */
- public ServiceEndpointInterfaceProviderHelper(EnterpriseBean anEJB) {
- super(anEJB);
- }
-
- @Override
- public Image getImage() {
- if (image == null)
- image = createImage();
- return image;
- }
-
- /**
- * Insert the method's description here. Creation date: (7/11/2001 1:53:49 PM)
- *
- * @return org.eclipse.jem.internal.java.JavaClass
- */
- @Override
- public JavaClass getJavaClass() {
- return ((Session) getEjb()).getServiceEndpoint();
- }
-
- @Override
- protected String getOverlayKey() {
- //TODO: DFH we need an icon
- return "";//$NON-NLS-1$
- }
-
- @Override
- public String getTypeString(String className) {
- return J2EEUIMessages.getResourceString("Service_Endpoint_Interface_UI_", new Object[]{className}); //$NON-NLS-1$ = "Home Interface"
- }
-}
\ No newline at end of file
diff --git a/plugins/org.eclipse.jst.j2ee.ui/j2ee_ui/org/eclipse/jst/j2ee/internal/listeners/IValidateEditListener.java b/plugins/org.eclipse.jst.j2ee.ui/j2ee_ui/org/eclipse/jst/j2ee/internal/listeners/IValidateEditListener.java
deleted file mode 100644
index 0544eb5..0000000
--- a/plugins/org.eclipse.jst.j2ee.ui/j2ee_ui/org/eclipse/jst/j2ee/internal/listeners/IValidateEditListener.java
+++ /dev/null
@@ -1,43 +0,0 @@
-/***************************************************************************************************
- * Copyright (c) 2003, 2004 IBM Corporation and others. All rights reserved. This program and the
- * accompanying materials are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
- *
- * Contributors: IBM Corporation - initial API and implementation
- **************************************************************************************************/
-package org.eclipse.jst.j2ee.internal.listeners;
-
-import org.eclipse.core.runtime.CoreException;
-import org.eclipse.core.runtime.IStatus;
-import org.eclipse.swt.events.ShellListener;
-import org.eclipse.swt.widgets.Shell;
-import org.eclipse.ui.IPartListener;
-import org.eclipse.wst.common.internal.emfworkbench.validateedit.ResourceStateValidatorPresenter;
-
-
-public interface IValidateEditListener extends ResourceStateValidatorPresenter, IPartListener, ShellListener {
- /**
- * This method should be called by any action that is about to edit any contents of any IFile.
- */
- public IStatus validateState();
-
- /**
- * Return true if there are any read only IFiles that are being managed.
- *
- * @return boolean
- * @see com.ibm.etools.emf.workbench.ResourceStateInputProvider#getResources()
- */
- boolean hasReadOnlyFiles();
-
- /**
- * This method should be called prior to saving the contents. It returns true if the contents
- * can be saved.
- */
- boolean checkSave() throws CoreException;
-
- /**
- * Use this method to set the Shell that will be used to prompt to the user.
- */
- void setShell(Shell aShell);
-}
\ No newline at end of file
diff --git a/plugins/org.eclipse.jst.j2ee.ui/j2ee_ui/org/eclipse/jst/j2ee/internal/listeners/ValidateEditListener.java b/plugins/org.eclipse.jst.j2ee.ui/j2ee_ui/org/eclipse/jst/j2ee/internal/listeners/ValidateEditListener.java
deleted file mode 100644
index be6b1dc..0000000
--- a/plugins/org.eclipse.jst.j2ee.ui/j2ee_ui/org/eclipse/jst/j2ee/internal/listeners/ValidateEditListener.java
+++ /dev/null
@@ -1,332 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2003, 2007 IBM Corporation and others.
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
- *
- * Contributors:
- * IBM Corporation - initial API and implementation
- *******************************************************************************/
-package org.eclipse.jst.j2ee.internal.listeners;
-
-import java.util.ArrayList;
-import java.util.List;
-
-import org.eclipse.core.resources.IFile;
-import org.eclipse.core.resources.IResource;
-import org.eclipse.core.runtime.CoreException;
-import org.eclipse.core.runtime.IStatus;
-import org.eclipse.emf.ecore.resource.Resource;
-import org.eclipse.jface.dialogs.MessageDialog;
-import org.eclipse.jst.j2ee.internal.dialogs.ListMessageDialog;
-import org.eclipse.jst.j2ee.internal.plugin.J2EEUIMessages;
-import org.eclipse.jst.j2ee.internal.plugin.J2EEUIPlugin;
-import org.eclipse.swt.events.ShellAdapter;
-import org.eclipse.swt.events.ShellEvent;
-import org.eclipse.swt.widgets.Display;
-import org.eclipse.swt.widgets.Shell;
-import org.eclipse.ui.IWorkbench;
-import org.eclipse.ui.IWorkbenchPart;
-import org.eclipse.ui.IWorkbenchWindow;
-import org.eclipse.ui.PlatformUI;
-import org.eclipse.wst.common.internal.emfworkbench.WorkbenchResourceHelper;
-import org.eclipse.wst.common.internal.emfworkbench.integration.EditModel;
-import org.eclipse.wst.common.internal.emfworkbench.validateedit.IValidateEditContext;
-import org.eclipse.wst.common.internal.emfworkbench.validateedit.ResourceStateValidator;
-
-public class ValidateEditListener extends ShellAdapter implements IValidateEditListener, IValidateEditContext {
-
- protected ResourceStateValidator fValidator;
- private boolean fNeedsStateValidation = true;
- private Shell fShell;
- private IWorkbenchPart fPart;
- private boolean fHasReadOnlyFiles = false;
- private boolean firstReadOnlyFileAttempt = true;
- private boolean fMessageUp = false;
- private boolean fIsActivating = false;
- private boolean fIsDeactivating = false;
- private boolean inconsistentResult;
- private boolean inconsistentOverwriteResult;
-
- public ValidateEditListener() {
- super();
- try {
- Display.getDefault().asyncExec(new Runnable() {
- public void run() {
- IWorkbench wb = PlatformUI.getWorkbench();
- if (wb == null) return;
- IWorkbenchWindow window = wb.getActiveWorkbenchWindow();
- if (window == null && wb.getWorkbenchWindowCount()>0) {
- for (int i=0; i<wb.getWorkbenchWindows().length; i++) {
- window = wb.getWorkbenchWindows()[i];
- if (window != null)
- break;
- }
-
- }
- if (window!=null)
- setShell(window.getShell());
- }
- });
-
- } catch (Exception e) {
- J2EEUIPlugin.logError(e);
- }
- }
- /**
- * Constructor for ValidateEditHandler.
- */
- public ValidateEditListener(IWorkbenchPart part, ResourceStateValidator aValidator) {
- super();
- fPart = part;
- fValidator = aValidator;
- if (part != null)
- part.getSite().getPage().addPartListener(this);
- if (getShell() != null)
- getShell().addShellListener(this);
- }
-
- protected Shell getShell() {
- if (fShell == null) {
- if (fPart != null && fPart.getSite() != null)
- fShell = fPart.getSite().getShell();
- }
- return fShell;
- }
-
- /**
- * @see IValidateEditListener#getValidator()
- */
- public ResourceStateValidator getValidator() {
- return fValidator;
- }
-
- /**
- * @see IValidateEditListener#getNeedsStateValidation()
- */
- public boolean getNeedsStateValidation() {
- return fNeedsStateValidation;
- }
-
- /**
- * @see IValidateEditListener#setNeedsStateValidation(boolean)
- */
- public void setNeedsStateValidation(boolean needsStateValidation) {
- fNeedsStateValidation = needsStateValidation;
- }
-
- /**
- * @see org.eclipse.wst.common.internal.emfworkbench.validateedit.ResourceStateValidatorPresenter#promptForInconsistentFileRefresh(List)
- */
- public boolean promptForInconsistentFileRefresh(List inconsistentFiles) {
- if (inconsistentFiles == null || inconsistentFiles.size() == 0) // this case should never
- // occur.
- return false;
-
- List inconsistentFileNames = new ArrayList();
- for (int i = 0; inconsistentFiles.size() > i; i++) {
- Object file = inconsistentFiles.get(i);
- if (file instanceof Resource) {
- IFile aFile = WorkbenchResourceHelper.getFile((Resource) file);
- inconsistentFileNames.add(aFile.getFullPath().toOSString());
- } else if (file instanceof IResource) {
- IResource resfile = (IResource) file;
- if (!resfile.exists()) {
- return false;
- }
- inconsistentFileNames.add(resfile.getFullPath().toOSString());
- }
- }
-
- final String title = J2EEUIMessages.getResourceString("Inconsistent_Files_3"); //$NON-NLS-1$
- final String message = J2EEUIMessages.getResourceString("The_following_workspace_files_are_inconsistent_with_the_editor_4") + J2EEUIMessages.getResourceString("Update_the_editor_with_the_workspace_contents__5"); //$NON-NLS-1$ //$NON-NLS-2$
- final String[] fileNames = (String[])inconsistentFileNames.toArray(new String[inconsistentFileNames.size()]);
-
- Display.getDefault().asyncExec(new Runnable() {
- public void run() {
- inconsistentResult = ListMessageDialog.openQuestion(getShell(), title, message, fileNames);
- }
- });
- return inconsistentResult;
- }
-
- /**
- * @see org.eclipse.wst.common.internal.emfworkbench.validateedit.ResourceStateValidatorPresenter#getValidateEditContext()
- */
- public Object getValidateEditContext() {
- return getShell();
- }
-
- /**
- * @see org.eclipse.ui.IPartListener#partActivated(IWorkbenchPart)
- */
- public void partActivated(IWorkbenchPart part) {
- if (part == fPart) {
- handleActivation();
- }
- }
-
- protected void handleActivation() {
- if (fIsActivating)
- return;
- fIsActivating = true;
- try {
- fValidator.checkActivation(this);
- updatePartReadOnly();
- } catch (CoreException e) {
- // do nothing for now
- } finally {
- fIsActivating = false;
- }
- }
-
- /**
- * @see org.eclipse.swt.events.ShellListener#shellActivated(ShellEvent)
- */
- @Override
- public void shellActivated(ShellEvent event) {
- handleActivation();
- }
-
- /**
- * @see org.eclipse.ui.IPartListener#partBroughtToTop(IWorkbenchPart)
- */
- public void partBroughtToTop(IWorkbenchPart part) {
- //do nothing
- }
-
- /**
- * @see org.eclipse.ui.IPartListener#partClosed(IWorkbenchPart)
- */
- public void partClosed(IWorkbenchPart part) {
- if (part == fPart)
- part.getSite().getPage().removePartListener(this);
- if (getShell() != null)
- getShell().removeShellListener(this);
- }
-
- /**
- * @see org.eclipse.ui.IPartListener#partDeactivated(IWorkbenchPart)
- */
- public void partDeactivated(IWorkbenchPart part) {
- if (part == fPart) {
- if (fIsDeactivating)
- return;
- fIsDeactivating = true;
- try {
- fValidator.lostActivation(this);
- updatePartReadOnly();
- } catch (CoreException e) {
- // do nothing for now
- } finally {
- fIsDeactivating = true;
- }
- }
- }
-
- /**
- * @see org.eclipse.ui.IPartListener#partOpened(IWorkbenchPart)
- */
- public void partOpened(IWorkbenchPart part) {
- //do nothing
- }
-
- public IStatus validateState() {
- IWorkbench wb = PlatformUI.getWorkbench();
- if ((fShell==null) && (wb != null && (wb.getActiveWorkbenchWindow() != null)))
- fShell=wb.getActiveWorkbenchWindow().getShell();
- if (fNeedsStateValidation) {
- setNeedsStateValidation(false);
- try {
- final IStatus status = fValidator.validateState(this);
- if (status.getSeverity() == IStatus.ERROR) {
- setNeedsStateValidation(true);
- if (!fMessageUp) {
- fMessageUp = true;
- Display.getDefault().asyncExec(new Runnable() {
- public void run() {
- MessageDialog.openError(getShell(), J2EEUIMessages.getResourceString("Error_checking_out_files_10"), status.getMessage()); //$NON-NLS-1$
- }
- });
- fMessageUp = false;
- }
- }
- fValidator.checkActivation(this);
- updatePartReadOnly();
- return status;
- } catch (CoreException e) {
- // do nothing for now
- }
- }
- return ResourceStateValidator.OK_STATUS;
- }
-
- /**
- * @see org.eclipse.wst.common.internal.emfworkbench.validateedit.ResourceStateValidatorPresenter#promptForInconsistentFileOverwrite(List)
- */
- public boolean promptForInconsistentFileOverwrite(List inconsistentFiles) {
- int size = inconsistentFiles.size();
- List files = new ArrayList();
- IFile file = null;
- for (int i = 0; i < size; i++) {
- file = (IFile) inconsistentFiles.get(i);
- files.add(file.getFullPath().toString());
- }
- final String[] items = (String[])files.toArray(new String[files.size()]);
- Display.getDefault().asyncExec(new Runnable() {
- public void run() {
- inconsistentOverwriteResult = ListMessageDialog.openQuestion(getShell(), J2EEUIMessages.getResourceString("Inconsistent_files_detected_11"), //$NON-NLS-1$
- J2EEUIMessages.getResourceString("The_following_files_are_inconsistent_with_the_file_system._Do_you_want_to_save_and_overwrite_these_files_on_the_file_system__12_WARN_"), //$NON-NLS-1$
- items);
- }
- });
- return inconsistentOverwriteResult;
- }
-
- protected boolean checkReadOnly() {
- fHasReadOnlyFiles = fValidator.checkReadOnly();
- return fHasReadOnlyFiles;
- }
-
- /**
- * @see IValidateEditListener#hasReadOnlyFiles()
- */
- public boolean hasReadOnlyFiles() {
- if (firstReadOnlyFileAttempt) {
- checkReadOnly();
- firstReadOnlyFileAttempt = false;
- }
- return fHasReadOnlyFiles;
- }
-
- /**
- * Method updatePartReadOnly.
- */
- protected void updatePartReadOnly() {
- if (!getNeedsStateValidation()) {
- checkReadOnly();
- setNeedsStateValidation(true);
- } else { //So that J2EEXMLActionBarContributor get updated info when editor Activated.
- firstReadOnlyFileAttempt = true;
- }
- }
-
- public boolean checkSave() throws CoreException {
- return validateState().isOK() && getValidator().checkSave(this);
- }
-
- public void setShell(Shell aShell) {
- fShell = aShell;
- }
-
- public void setEditModel(EditModel anEditModel) {
- fValidator = anEditModel;
-
- }
-
- public IStatus validateState(EditModel anEditModel) {
- setEditModel(anEditModel);
- return validateState();
- }
-}
diff --git a/plugins/org.eclipse.jst.j2ee.ui/j2ee_ui/org/eclipse/jst/j2ee/internal/perspective/J2EEPerspective.java b/plugins/org.eclipse.jst.j2ee.ui/j2ee_ui/org/eclipse/jst/j2ee/internal/perspective/J2EEPerspective.java
deleted file mode 100644
index 4f60738..0000000
--- a/plugins/org.eclipse.jst.j2ee.ui/j2ee_ui/org/eclipse/jst/j2ee/internal/perspective/J2EEPerspective.java
+++ /dev/null
@@ -1,144 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2005, 2006 IBM Corporation and others.
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
- *
- * Contributors:
- * IBM Corporation - initial API and implementation
- *******************************************************************************/
-/*
- * Created on Dec 7, 2004
- */
-package org.eclipse.jst.j2ee.internal.perspective;
-
-import org.eclipse.debug.ui.IDebugUIConstants;
-import org.eclipse.jdt.ui.JavaUI;
-import org.eclipse.jst.j2ee.internal.plugin.J2EEPlugin;
-import org.eclipse.jst.j2ee.internal.plugin.J2EEPreferences;
-import org.eclipse.ui.IFolderLayout;
-import org.eclipse.ui.IPageLayout;
-import org.eclipse.ui.PlatformUI;
-import org.eclipse.ui.progress.IProgressConstants;
-import org.eclipse.ui.views.IViewDescriptor;
-import org.eclipse.wst.project.facet.IProductConstants;
-import org.eclipse.wst.project.facet.ProductManager;
-
-public class J2EEPerspective implements org.eclipse.ui.IPerspectiveFactory {
-
- protected static String ID_SERVERS_VIEW = "org.eclipse.wst.server.ui.ServersView"; //$NON-NLS-1$
- protected static String ID_J2EE_HIERARCHY_VIEW = "org.eclipse.ui.navigator.ProjectExplorer"; //$NON-NLS-1$
-
- private static String ID_WST_SNIPPETS_VIEW = "org.eclipse.wst.common.snippets.internal.ui.SnippetsView"; //$NON-NLS-1$
- private static final String ID_SEARCH_VIEW = "org.eclipse.search.ui.views.SearchView"; //$NON-NLS-1$
- private static final String ID_DATA_VIEW = "org.eclipse.datatools.connectivity.DataSourceExplorerNavigator"; //$NON-NLS-1$
- public static final String ID_CONSOLE_VIEW= "org.eclipse.ui.console.ConsoleView"; //$NON-NLS-1$
- public static final String ID_MARKERS_VIEW= "org.eclipse.ui.views.AllMarkersView"; //$NON-NLS-1$
- public static final String ID_TASKLIST_VIEW= "org.eclipse.mylyn.tasks.ui.views.tasks"; //$NON-NLS-1$
-
- public J2EEPerspective() {
- super();
- //If preference exists for alternate view, replace.
- String viewerID = ProductManager.getProperty(IProductConstants.ID_PERSPECTIVE_HIERARCHY_VIEW);
- if (viewerID != null) {
- // verify that the view actually exists
- if (PlatformUI.getWorkbench().getViewRegistry().find(viewerID) != null){
- ID_J2EE_HIERARCHY_VIEW = viewerID;
- }
- } else {
- viewerID = J2EEPlugin.getDefault().getJ2EEPreferences().getString(J2EEPreferences.Keys.ID_PERSPECTIVE_HIERARCHY_VIEW);
- if (viewerID != null){
- if (PlatformUI.getWorkbench().getViewRegistry().find(viewerID) != null){
- ID_J2EE_HIERARCHY_VIEW = viewerID;
- }
- }
- }
- }
-
- /*
- * (non-Javadoc)
- *
- * @see org.eclipse.ui.IPerspectiveFactory#createInitialLayout(org.eclipse.ui.IPageLayout)
- */
- public void createInitialLayout(IPageLayout layout) {
- defineLayout(layout);
- defineActions(layout);
- }
-
-
-
- public void defineActions(IPageLayout layout) {
- layout.addActionSet("org.eclipse.jst.j2ee.J2eeMainActionSet"); //$NON-NLS-1$
- layout.addActionSet("org.eclipse.jdt.ui.JavaActionSet"); //$NON-NLS-1$
-
- layout.addActionSet(IDebugUIConstants.LAUNCH_ACTION_SET);
- layout.addActionSet(IDebugUIConstants.DEBUG_ACTION_SET);
-
- layout.addActionSet(IPageLayout.ID_NAVIGATE_ACTION_SET);
-
- layout.addShowViewShortcut(ID_J2EE_HIERARCHY_VIEW);
- layout.addShowViewShortcut(ID_SERVERS_VIEW);
- layout.addShowViewShortcut(ID_DATA_VIEW);
- layout.addShowViewShortcut(IPageLayout.ID_BOOKMARKS);
- layout.addShowViewShortcut(IPageLayout.ID_OUTLINE);
- layout.addShowViewShortcut(IPageLayout.ID_PROP_SHEET);
- layout.addShowViewShortcut(IPageLayout.ID_RES_NAV);
- layout.addShowViewShortcut(ID_WST_SNIPPETS_VIEW);
- layout.addShowViewShortcut(ID_MARKERS_VIEW);
- layout.addShowViewShortcut(ID_TASKLIST_VIEW);
-
- // views - search
- layout.addShowViewShortcut(ID_SEARCH_VIEW);
- // views - debugging
- layout.addShowViewShortcut(ID_CONSOLE_VIEW);
-
- layout.addShowInPart(ID_J2EE_HIERARCHY_VIEW);
- }
-
- public void defineLayout(IPageLayout layout) {
- // Editors are placed for free.
- String editorArea = layout.getEditorArea();
-
- // Top left.
- IFolderLayout topLeft = layout.createFolder("topLeft", IPageLayout.LEFT, 0.25f, editorArea);//$NON-NLS-1$
- topLeft.addView(ID_J2EE_HIERARCHY_VIEW);
- topLeft.addPlaceholder(IPageLayout.ID_RES_NAV);
- topLeft.addPlaceholder(JavaUI.ID_TYPE_HIERARCHY);
- topLeft.addPlaceholder(JavaUI.ID_PACKAGES_VIEW);
-
- // Bottom right.
- IFolderLayout bottomRight = layout.createFolder("bottomRight", IPageLayout.BOTTOM, 0.7f, editorArea);//$NON-NLS-1$
- bottomRight.addView(ID_MARKERS_VIEW);
- bottomRight.addView(IPageLayout.ID_PROP_SHEET);
- bottomRight.addView(ID_SERVERS_VIEW);
- addDBViewIfPresent(layout,bottomRight);
- bottomRight.addView(ID_WST_SNIPPETS_VIEW);
-
- bottomRight.addPlaceholder(IPageLayout.ID_PROBLEM_VIEW);
- bottomRight.addPlaceholder(IPageLayout.ID_TASK_LIST);
- bottomRight.addPlaceholder(ID_CONSOLE_VIEW);
- bottomRight.addPlaceholder(IPageLayout.ID_BOOKMARKS);
- bottomRight.addPlaceholder(IProgressConstants.PROGRESS_VIEW_ID);
- bottomRight.addPlaceholder(ID_SEARCH_VIEW);
-
- // Top right.
- IFolderLayout topRight = layout.createFolder("topRight", IPageLayout.RIGHT, 0.7f, editorArea);//$NON-NLS-1$
- topRight.addView(IPageLayout.ID_OUTLINE);
- addTLViewIfPresent(layout, topRight);
-
- }
- private void addDBViewIfPresent(IPageLayout page,IFolderLayout bottomRight) {
- IViewDescriptor dbView = PlatformUI.getWorkbench().getViewRegistry().find(ID_DATA_VIEW);
- if (dbView != null)
- bottomRight.addView(ID_DATA_VIEW);
- }
- private void addTLViewIfPresent(IPageLayout page,IFolderLayout topRight) {
- IViewDescriptor tlView = PlatformUI.getWorkbench().getViewRegistry().find(ID_TASKLIST_VIEW);
- if (tlView != null)
- topRight.addView(ID_TASKLIST_VIEW);
- }
-}
-
-
-
diff --git a/plugins/org.eclipse.jst.j2ee.ui/j2ee_ui/org/eclipse/jst/j2ee/internal/plugin/BinaryEditorUtilities.java b/plugins/org.eclipse.jst.j2ee.ui/j2ee_ui/org/eclipse/jst/j2ee/internal/plugin/BinaryEditorUtilities.java
deleted file mode 100644
index cc9eca4..0000000
--- a/plugins/org.eclipse.jst.j2ee.ui/j2ee_ui/org/eclipse/jst/j2ee/internal/plugin/BinaryEditorUtilities.java
+++ /dev/null
@@ -1,235 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2008 IBM Corporation and others.
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
- *
- * Contributors:
- * IBM Corporation - initial API and implementation
- *******************************************************************************/
-
-package org.eclipse.jst.j2ee.internal.plugin;
-
-import java.io.File;
-import java.io.IOException;
-import java.io.InputStream;
-import java.util.zip.ZipEntry;
-import java.util.zip.ZipFile;
-
-import org.eclipse.core.resources.IResource;
-import org.eclipse.core.resources.IStorage;
-import org.eclipse.core.resources.IWorkspace;
-import org.eclipse.core.resources.IWorkspaceRoot;
-import org.eclipse.core.resources.ResourcesPlugin;
-import org.eclipse.core.runtime.CoreException;
-import org.eclipse.core.runtime.IPath;
-import org.eclipse.core.runtime.Path;
-import org.eclipse.core.runtime.PlatformObject;
-import org.eclipse.jdt.core.IJavaModelStatusConstants;
-import org.eclipse.jdt.core.JavaModelException;
-import org.eclipse.jdt.internal.core.JavaModelManager;
-import org.eclipse.jdt.internal.core.JavaModelStatus;
-import org.eclipse.jface.resource.ImageDescriptor;
-import org.eclipse.jst.jee.archive.internal.ArchiveUtil;
-import org.eclipse.ui.IEditorInput;
-import org.eclipse.ui.IEditorRegistry;
-import org.eclipse.ui.IPersistableElement;
-import org.eclipse.ui.IStorageEditorInput;
-import org.eclipse.ui.PlatformUI;
-import org.eclipse.wst.common.componentcore.internal.resources.VirtualArchiveComponent;
-import org.eclipse.wst.common.componentcore.resources.IVirtualComponent;
-
-public class BinaryEditorUtilities {
-
- private static class JarEntryFile extends PlatformObject implements
- IStorage {
- private String entryName;
- private String zipName;
- private IPath path;
-
- public JarEntryFile(String entryName, String zipName) {
- this.entryName = entryName;
- this.zipName = zipName;
- this.path = new Path(this.entryName);
- }
-
- public InputStream getContents() throws CoreException {
-
- try {
- if (JavaModelManager.ZIP_ACCESS_VERBOSE) {
- //$ANALYSIS-IGNORE
- System.out.println("(" + Thread.currentThread() + ") [JarEntryFile.getContents()] Creating ZipFile on " + this.zipName); //$NON-NLS-1$ //$NON-NLS-2$
- }
- ZipFile zipFile = ArchiveUtil.newZipFile(this.zipName);
- ZipEntry zipEntry = zipFile.getEntry(this.entryName);
- if (zipEntry == null) {
- throw new JavaModelException(new JavaModelStatus(
- IJavaModelStatusConstants.INVALID_PATH,
- this.entryName));
- }
- return zipFile.getInputStream(zipEntry);
- } catch (IOException e) {
- throw new JavaModelException(e,
- IJavaModelStatusConstants.IO_EXCEPTION);
- }
- }
-
- /**
- * @see IStorage#getFullPath
- */
- public IPath getFullPath() {
- return this.path;
- }
-
- /**
- * @see IStorage#getName
- */
- public String getName() {
- return this.path.lastSegment();
- }
-
- /**
- * @see IStorage#isReadOnly()
- */
- public boolean isReadOnly() {
- return true;
- }
-
- /**
- * @see IStorage#isReadOnly()
- */
- @Override
- public String toString() {
- return "JarEntryFile[" + this.zipName + "::" + this.entryName + "]"; //$NON-NLS-2$ //$NON-NLS-3$ //$NON-NLS-1$
- }
- }
-
- private static class JarEntryEditorInput implements IStorageEditorInput {
-
- private IStorage fJarEntryFile;
-
- public JarEntryEditorInput(IStorage jarEntryFile) {
- fJarEntryFile = jarEntryFile;
- }
-
- @Override
- public int hashCode() {
- return super.hashCode() + fJarEntryFile.hashCode();
- }
-
- /*
- */
- @Override
- public boolean equals(Object obj) {
- if (this == obj)
- return true;
- if (!(obj instanceof JarEntryEditorInput))
- return false;
- JarEntryEditorInput other = (JarEntryEditorInput) obj;
- return fJarEntryFile.equals(other.fJarEntryFile);
- }
-
- /*
- * @see IEditorInput#getPersistable()
- */
- public IPersistableElement getPersistable() {
- return null;
- }
-
- /*
- * @see IEditorInput#getName()
- */
- public String getName() {
- return fJarEntryFile.getName();
- }
-
- /*
- * @see IEditorInput#getToolTipText()
- */
- public String getToolTipText() {
- return fJarEntryFile.getFullPath().toString();
- }
-
- /*
- * @see IEditorInput#getImageDescriptor()
- */
- public ImageDescriptor getImageDescriptor() {
- IEditorRegistry registry = PlatformUI.getWorkbench()
- .getEditorRegistry();
- return registry.getImageDescriptor(fJarEntryFile.getFullPath()
- .getFileExtension());
- }
-
- /*
- * @see IEditorInput#exists()
- */
- public boolean exists() {
- // JAR entries can't be deleted
- return true;
- }
-
- /*
- * @see IAdaptable#getAdapter(Class)
- */
- public Object getAdapter(Class adapter) {
- return null;
- }
-
- /*
- * see IStorageEditorInput#getStorage()
- */
- public IStorage getStorage() {
- return fJarEntryFile;
- }
- }
-
- /**
- *
- * @param component
- * @param archiveRelativePath
- * @return
- * @deprecated
- */
- public static IEditorInput getBinaryEditorInput(
- VirtualArchiveComponent component, String archiveRelativePath) {
- return getBinaryEditorInput((IVirtualComponent)component, archiveRelativePath);
- }
-
- public static IEditorInput getBinaryEditorInput(IVirtualComponent component, String archiveRelativePath) {
- File f = (File)component.getAdapter(File.class);
- return getBinaryEditorInput(f.getAbsolutePath(), archiveRelativePath);
- }
-
-
- public static IEditorInput getBinaryEditorInput(IPath archivePath,
- String archiveRelativePath) {
- IWorkspace workspace = ResourcesPlugin.getWorkspace();
- IWorkspaceRoot root = workspace.getRoot();
- IResource resource = root.findMember(archivePath);
- if (resource == null) {
- return null;
- }
- String archiveOSPath = resource.getLocation().toOSString();
- IEditorInput editorInput = getBinaryEditorInput(archiveOSPath, archiveRelativePath);
- return editorInput;
- }
-
- /**
- * [Bug 238616]
- *
- * Gets binary editor input given an OS relative path to an archive and
- * the archive relative path to a file
- *
- * @param archiveOSPath the OS relative path to the archive
- * @param archiveRelativePath the archive relative path to the file to get binary editor input for
- * @return
- */
- public static IEditorInput getBinaryEditorInput(String archiveOSPath,
- String archiveRelativePath) {
- JarEntryFile jarFile = new JarEntryFile(archiveRelativePath, archiveOSPath);
- JarEntryEditorInput editorInput = new JarEntryEditorInput(jarFile);
- return editorInput;
- }
-
-}
diff --git a/plugins/org.eclipse.jst.j2ee.ui/j2ee_ui/org/eclipse/jst/j2ee/internal/plugin/CommonEditorUtility.java b/plugins/org.eclipse.jst.j2ee.ui/j2ee_ui/org/eclipse/jst/j2ee/internal/plugin/CommonEditorUtility.java
deleted file mode 100644
index 0739393..0000000
--- a/plugins/org.eclipse.jst.j2ee.ui/j2ee_ui/org/eclipse/jst/j2ee/internal/plugin/CommonEditorUtility.java
+++ /dev/null
@@ -1,136 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2003, 2006 IBM Corporation and others.
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
- *
- * Contributors:
- * IBM Corporation - initial API and implementation
- *******************************************************************************/
-package org.eclipse.jst.j2ee.internal.plugin;
-
-
-import java.util.ArrayList;
-import java.util.Arrays;
-import java.util.HashSet;
-import java.util.List;
-import java.util.Set;
-
-import org.eclipse.core.resources.IProject;
-import org.eclipse.core.resources.IResource;
-import org.eclipse.ui.IEditorInput;
-import org.eclipse.ui.IEditorPart;
-import org.eclipse.ui.IWorkbench;
-import org.eclipse.ui.IWorkbenchPage;
-import org.eclipse.ui.IWorkbenchWindow;
-import org.eclipse.ui.PlatformUI;
-
-
-
-/**
- * @author cbridgha
- *
- */
-public class CommonEditorUtility {
-
- public static final Class IRESOURCE_CLASS = IResource.class;
-
- private CommonEditorUtility() {
- super();
- }
-
- /**
- * Returns an array of all editors that have an unsaved content. If the identical content is
- * presented in more than one editor, only one of those editor parts is part of the result.
- *
- * @return an array of all dirty editor parts.
- */
- public static IEditorPart[] getDirtyEditors() {
- return getDirtyEditors(null);
- }
-
- /**
- * Returns an array of all editors that have an unsaved content, where the content is include in
- * one of the projects in the List parameter. If the identical content is presented in more than
- * one editor, only one of those editor parts is part of the result.
- *
- * @return an array of all dirty editor parts.
- */
- public static IEditorPart[] getDirtyEditors(List projects) {
- Set inputs = new HashSet();
- List result = new ArrayList(0);
- IWorkbench workbench = J2EEUIPlugin.getPluginWorkbench();
- IWorkbenchWindow[] windows = workbench.getWorkbenchWindows();
- for (int i = 0; i < windows.length; i++) {
- IWorkbenchPage[] pages = windows[i].getPages();
- for (int x = 0; x < pages.length; x++) {
- IEditorPart[] editors = pages[x].getDirtyEditors();
- for (int z = 0; z < editors.length; z++) {
- IEditorPart ep = editors[z];
- IEditorInput input = ep.getEditorInput();
- if (!inputs.contains(input) && (projects == null || inputInProjects(input, projects))) {
- inputs.add(input);
- result.add(ep);
- }
- }
- }
- }
- return (IEditorPart[]) result.toArray(new IEditorPart[result.size()]);
- }
-
- public static boolean inputInProjects(IEditorInput input, List projects) {
- IResource res = (IResource) input.getAdapter(IRESOURCE_CLASS);
- IProject project = res == null ? null : res.getProject();
- if (project == null)
- return false;
- for (int i = 0; i < projects.size(); i++) {
- if (project.equals(projects.get(i)))
- return true;
- }
- return false;
- }
-
- public static boolean promptToSaveAllDirtyEditors() {
- boolean retVal = true;
- IWorkbench workbench = J2EEUIPlugin.getPluginWorkbench();
- IWorkbenchWindow[] windows = workbench.getWorkbenchWindows();
- for (int i = 0; retVal && i < windows.length; i++) {
- IWorkbenchPage[] pages = windows[i].getPages();
- for (int x = 0; retVal && x < pages.length; x++) {
- retVal = pages[x].saveAllEditors(true);
- }
- }
- return retVal;
- }
-
- /**
- *
- * This method used to save only the editors specified. It now saves all dirty editors
- * due to changes in the Eclipse platform
- * @param dirtyEditors
- * @return true if it succeeds, false if the user cancels
- * @deprecated due to changes in the Eclipse platform
- */
- public static boolean promptToSaveDirtyEditors(List dirtyEditors) {
- if (dirtyEditors.isEmpty())
- return true;
- return promptToSaveAllDirtyEditors();
- }
-
- /**
- * This will close all editors without prompting for save.
- * @param dirtyEditors
- * @return true is succeeded, false if not
- */
- public static void closeAllEditors() {
-
- IWorkbenchPage page = PlatformUI.getWorkbench().getActiveWorkbenchWindow().getActivePage();
- page.closeAllEditors(false);
-
- }
-
- public static boolean promptToSaveDirtyEditorsInProjects(List projects) {
- return promptToSaveDirtyEditors(Arrays.asList(getDirtyEditors(projects)));
- }
-}
diff --git a/plugins/org.eclipse.jst.j2ee.ui/j2ee_ui/org/eclipse/jst/j2ee/internal/plugin/ErrorDialog.java b/plugins/org.eclipse.jst.j2ee.ui/j2ee_ui/org/eclipse/jst/j2ee/internal/plugin/ErrorDialog.java
deleted file mode 100644
index e6a4c6c..0000000
--- a/plugins/org.eclipse.jst.j2ee.ui/j2ee_ui/org/eclipse/jst/j2ee/internal/plugin/ErrorDialog.java
+++ /dev/null
@@ -1,195 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2003, 2005 IBM Corporation and others.
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
- *
- * Contributors:
- * IBM Corporation - initial API and implementation
- *******************************************************************************/
-package org.eclipse.jst.j2ee.internal.plugin;
-
-import java.io.ByteArrayOutputStream;
-import java.io.IOException;
-import java.io.PrintStream;
-
-import org.eclipse.jface.dialogs.IDialogConstants;
-import org.eclipse.jface.dialogs.MessageDialog;
-import org.eclipse.swt.SWT;
-import org.eclipse.swt.SWTError;
-import org.eclipse.swt.SWTException;
-import org.eclipse.swt.graphics.Image;
-import org.eclipse.swt.graphics.Point;
-import org.eclipse.swt.layout.GridData;
-import org.eclipse.swt.layout.GridLayout;
-import org.eclipse.swt.widgets.Button;
-import org.eclipse.swt.widgets.Composite;
-import org.eclipse.swt.widgets.Control;
-import org.eclipse.swt.widgets.Label;
-import org.eclipse.swt.widgets.Shell;
-import org.eclipse.swt.widgets.Text;
-
-/**
- * Added a Details button to the MessageDialog to show the exception stack trace.
- *
- * Borrowed from an eclipse InternalErrorDialog
- */
-public class ErrorDialog extends MessageDialog {
- protected static final String[] LABELS_OK = {IDialogConstants.OK_LABEL};
- protected static final String[] LABELS_OK_CANCEL = {IDialogConstants.OK_LABEL, IDialogConstants.CANCEL_LABEL};
- protected static final String[] LABELS_OK_DETAILS = {IDialogConstants.OK_LABEL, IDialogConstants.SHOW_DETAILS_LABEL};
- protected static final String[] LABELS_OK_CANCEL_DETAILS = {IDialogConstants.OK_LABEL, IDialogConstants.CANCEL_LABEL, IDialogConstants.SHOW_DETAILS_LABEL};
- private Throwable detail;
- private int detailButtonID = -1;
- private Text text;
- private String message;
- //Workaround. SWT does not seem to set the default button if
- //there is not control with focus. Bug: 14668
- private int defaultButtonIndex = 0;
- /**
- * Size of the text in lines.
- */
- private static final int TEXT_LINE_COUNT = 15;
-
- public ErrorDialog(Shell parentShell, String dialogTitle, Image dialogTitleImage, String dialogMessage, Throwable detail, int dialogImageType, String[] dialogButtonLabels, int defaultIndex) {
- super(parentShell, dialogTitle, dialogTitleImage, dialogMessage, dialogImageType, dialogButtonLabels, defaultIndex);
- defaultButtonIndex = defaultIndex;
- this.detail = detail;
- message = dialogMessage;
- setShellStyle(getShellStyle() | SWT.APPLICATION_MODAL | SWT.RESIZE);
- }
-
- //Workaround. SWT does not seem to set rigth the default button if
- //there is not control with focus. Bug: 14668
- @Override
- public int open() {
- create();
- Button b = getButton(defaultButtonIndex);
- b.setFocus();
- b.getShell().setDefaultButton(b);
- return super.open();
- }
-
- /**
- * Set the detail button;
- */
- public void setDetailButton(int index) {
- detailButtonID = index;
- }
-
- /*
- * (non-Javadoc) Method declared on Dialog.
- */
- @Override
- protected void buttonPressed(int buttonId) {
- if (buttonId == detailButtonID) {
- toggleDetailsArea();
- } else {
- setReturnCode(buttonId);
- close();
- }
- }
-
- /**
- * Toggles the unfolding of the details area. This is triggered by the user pressing the details
- * button.
- */
- private void toggleDetailsArea() {
- Point windowSize = getShell().getSize();
- Point oldSize = getContents().computeSize(SWT.DEFAULT, SWT.DEFAULT);
- if (text != null) {
- text.dispose();
- text = null;
- getButton(detailButtonID).setText(IDialogConstants.SHOW_DETAILS_LABEL);
- } else {
- createDropDownText((Composite) getContents());
- getButton(detailButtonID).setText(IDialogConstants.HIDE_DETAILS_LABEL);
- }
- Point newSize = getContents().computeSize(SWT.DEFAULT, SWT.DEFAULT);
- getShell().setSize(new Point(windowSize.x, windowSize.y + (newSize.y - oldSize.y)));
- }
-
- /**
- * Create this dialog's drop-down list component.
- *
- * @param parent
- * the parent composite
- * @return the drop-down list component
- */
- protected void createDropDownText(Composite parent) {
- // create the list
- text = new Text(parent, SWT.BORDER | SWT.H_SCROLL | SWT.V_SCROLL);
- // print the stacktrace in the text field
- try {
- ByteArrayOutputStream baos = new ByteArrayOutputStream();
- PrintStream ps = new PrintStream(baos);
- detail.printStackTrace(ps);
- if ((detail instanceof SWTError) && (((SWTError) detail).throwable != null)) {
- ps.println("\n*** Stack trace of contained exception ***"); //$NON-NLS-1$
- ((SWTError) detail).throwable.printStackTrace(ps);
- } else if ((detail instanceof SWTException) && (((SWTException) detail).throwable != null)) {
- ps.println("\n*** Stack trace of contained exception ***"); //$NON-NLS-1$
- ((SWTException) detail).throwable.printStackTrace(ps);
- }
- ps.flush();
- baos.flush();
- text.setText(baos.toString());
- } catch (IOException e) {
- //Ignore
- }
- GridData data = new GridData(GridData.HORIZONTAL_ALIGN_FILL | GridData.GRAB_HORIZONTAL | GridData.VERTICAL_ALIGN_FILL | GridData.GRAB_VERTICAL);
- data.heightHint = text.getLineHeight() * TEXT_LINE_COUNT;
- text.setLayoutData(data);
- }
-
- public static boolean openError(Shell parent, String title, String message, Throwable detail, int defaultIndex, boolean showCancel) {
- String[] labels;
- if (detail == null)
- labels = showCancel ? LABELS_OK_CANCEL : LABELS_OK;
- else
- labels = showCancel ? LABELS_OK_CANCEL_DETAILS : LABELS_OK_DETAILS;
- ErrorDialog dialog = new ErrorDialog(parent, title, null, // accept
- // the
- // default
- // window
- // icon
- message, detail, ERROR, labels, defaultIndex);
- if (detail != null)
- dialog.setDetailButton(labels.length - 1);
- return dialog.open() == 0;
- }
-
- @Override
- protected Control createDialogArea(Composite parent) {
- // create a composite with standard margins and spacing
- Composite composite = new Composite(parent, SWT.NONE);
- GridLayout layout = new GridLayout();
- layout.marginHeight = convertVerticalDLUsToPixels(IDialogConstants.VERTICAL_MARGIN);
- layout.marginWidth = convertHorizontalDLUsToPixels(IDialogConstants.HORIZONTAL_MARGIN);
- layout.verticalSpacing = convertVerticalDLUsToPixels(IDialogConstants.VERTICAL_SPACING);
- layout.horizontalSpacing = convertHorizontalDLUsToPixels(IDialogConstants.HORIZONTAL_SPACING);
- composite.setLayout(layout);
- composite.setLayoutData(new GridData(GridData.FILL_BOTH));
- composite.setFont(parent.getFont());
- ((GridLayout) composite.getLayout()).numColumns = 2;
- // create image
- Image image = composite.getDisplay().getSystemImage(SWT.ICON_ERROR);
- if (image != null) {
- Label label = new Label(composite, 0);
- image.setBackground(label.getBackground());
- label.setImage(image);
- label.setLayoutData(new GridData(GridData.HORIZONTAL_ALIGN_CENTER | GridData.VERTICAL_ALIGN_BEGINNING));
- }
- // create message
- if (message != null) {
- Label label = new Label(composite, SWT.WRAP);
- label.setText(message);
- GridData data = new GridData(GridData.GRAB_HORIZONTAL | GridData.GRAB_VERTICAL | GridData.HORIZONTAL_ALIGN_FILL | GridData.VERTICAL_ALIGN_CENTER);
- data.widthHint = convertHorizontalDLUsToPixels(IDialogConstants.MINIMUM_MESSAGE_AREA_WIDTH);
- label.setLayoutData(data);
- label.setFont(parent.getFont());
- }
- return composite;
- }
-}
diff --git a/plugins/org.eclipse.jst.j2ee.ui/j2ee_ui/org/eclipse/jst/j2ee/internal/plugin/FacetedProjectActionFilter.java b/plugins/org.eclipse.jst.j2ee.ui/j2ee_ui/org/eclipse/jst/j2ee/internal/plugin/FacetedProjectActionFilter.java
deleted file mode 100644
index db953bd..0000000
--- a/plugins/org.eclipse.jst.j2ee.ui/j2ee_ui/org/eclipse/jst/j2ee/internal/plugin/FacetedProjectActionFilter.java
+++ /dev/null
@@ -1,101 +0,0 @@
-/******************************************************************************
- * Copyright (c) 2005 BEA Systems, Inc.
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
- *
- * Contributors:
- * Konstantin Komissarchik - initial API and implementation
- ******************************************************************************/
-
-package org.eclipse.jst.j2ee.internal.plugin;
-
-import org.eclipse.core.resources.IProject;
-import org.eclipse.core.runtime.CoreException;
-import org.eclipse.jem.util.logger.proxy.Logger;
-import org.eclipse.ui.IActionFilter;
-import org.eclipse.wst.common.project.facet.core.IFacetedProject;
-import org.eclipse.wst.common.project.facet.core.IProjectFacet;
-import org.eclipse.wst.common.project.facet.core.IProjectFacetVersion;
-import org.eclipse.wst.common.project.facet.core.ProjectFacetsManager;
-
-/**
- * @author <a href="mailto:kosta@bea.com">Konstantin Komissarchik</a>
- */
-
-public final class FacetedProjectActionFilter
-
- implements IActionFilter
-
-{
- public boolean testAttribute( final Object target,
- final String name,
- final String value )
- {
-
- if( name.equals( "facet" ) ) //$NON-NLS-1$
- {
- IProject project = (IProject)target;
- IFacetedProject fproj = null;
- if(project.isAccessible()){
- try {
- fproj = ProjectFacetsManager.create( project );
- } catch (CoreException e1) {
- Logger.getLogger().logError(e1);
- }
- }
-
- if( fproj != null ){
- final int colon = value.indexOf( ':' );
- final String fid;
- final String vexprstr;
-
- if( colon == -1 || colon == value.length() - 1 )
- {
- fid = value;
- vexprstr = null;
- }
- else
- {
- fid = value.substring( 0, colon );
- vexprstr = value.substring( colon + 1 );
- }
-
- if( ! ProjectFacetsManager.isProjectFacetDefined( fid ) )
- {
- return false;
- }
-
- final IProjectFacet f = ProjectFacetsManager.getProjectFacet( fid );
-
- if( ! fproj.hasProjectFacet( f ) )
- {
- return false;
- }
-
- if( vexprstr == null )
- {
- return true;
- }
- final IProjectFacetVersion fv = fproj.getInstalledVersion( f );
-
- try
- {
- if( f.getVersions( vexprstr ).contains( fv ) )
- {
- return true;
- }
- }
- catch( CoreException e )
- {
- //EJBUIPlugin.getDefault().log
- }
- return false;
- }
- return false;
- }
- return true;
- }
-
-}
diff --git a/plugins/org.eclipse.jst.j2ee.ui/j2ee_ui/org/eclipse/jst/j2ee/internal/plugin/FacetedProjectAdapterFactory.java b/plugins/org.eclipse.jst.j2ee.ui/j2ee_ui/org/eclipse/jst/j2ee/internal/plugin/FacetedProjectAdapterFactory.java
deleted file mode 100644
index 6bab544..0000000
--- a/plugins/org.eclipse.jst.j2ee.ui/j2ee_ui/org/eclipse/jst/j2ee/internal/plugin/FacetedProjectAdapterFactory.java
+++ /dev/null
@@ -1,37 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2005, 2006 IBM Corporation and others.
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
- *
- * Contributors:
- * IBM Corporation - initial API and implementation
- *******************************************************************************/
-package org.eclipse.jst.j2ee.internal.plugin;
-
-import org.eclipse.core.runtime.IAdapterFactory;
-import org.eclipse.ui.IActionFilter;
-
-public class FacetedProjectAdapterFactory implements IAdapterFactory {
-
-
- private static final Class[] ADAPTER_TYPES = { IActionFilter.class };
-
- public Object getAdapter( final Object adaptable,
- final Class adapterType )
- {
- if( adapterType == IActionFilter.class )
- {
- return new FacetedProjectActionFilter();
- }
- return null;
- }
-
- public Class[] getAdapterList()
- {
- return ADAPTER_TYPES;
- }
-
-
-}
diff --git a/plugins/org.eclipse.jst.j2ee.ui/j2ee_ui/org/eclipse/jst/j2ee/internal/plugin/J2EEEditorUtility.java b/plugins/org.eclipse.jst.j2ee.ui/j2ee_ui/org/eclipse/jst/j2ee/internal/plugin/J2EEEditorUtility.java
deleted file mode 100644
index 6fce02a..0000000
--- a/plugins/org.eclipse.jst.j2ee.ui/j2ee_ui/org/eclipse/jst/j2ee/internal/plugin/J2EEEditorUtility.java
+++ /dev/null
@@ -1,196 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2002, 2005 IBM Corporation and others.
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
- *
- * Contributors:
- * IBM Corporation - initial API and implementation
- *******************************************************************************/
-
-package org.eclipse.jst.j2ee.internal.plugin;
-
-import org.eclipse.core.resources.IFile;
-import org.eclipse.core.resources.IProject;
-import org.eclipse.emf.ecore.EObject;
-import org.eclipse.emf.ecore.util.EcoreUtil;
-import org.eclipse.jdt.core.ICompilationUnit;
-import org.eclipse.jdt.core.IJavaModel;
-import org.eclipse.jdt.core.IJavaProject;
-import org.eclipse.jdt.core.IPackageFragment;
-import org.eclipse.jdt.core.IType;
-import org.eclipse.jdt.core.JavaModelException;
-import org.eclipse.jdt.internal.ui.javaeditor.EditorUtility;
-import org.eclipse.jem.internal.adapters.jdom.JavaClassJDOMAdaptor;
-import org.eclipse.jem.internal.java.adapters.ReadAdaptor;
-import org.eclipse.jem.java.JavaClass;
-import org.eclipse.jem.java.JavaPackage;
-import org.eclipse.jem.util.emf.workbench.ProjectUtilities;
-import org.eclipse.jem.workbench.utility.JemProjectUtilities;
-import org.eclipse.ui.IEditorInput;
-import org.eclipse.ui.IEditorPart;
-import org.eclipse.ui.IWorkbenchPage;
-import org.eclipse.ui.PartInitException;
-import org.eclipse.ui.part.FileEditorInput;
-import org.eclipse.wst.common.internal.emfworkbench.WorkbenchResourceHelper;
-
-/**
- * A number of routines for working with JavaElements in editors
- *
- * Use 'isOpenInEditor' to test if an element is already open in a editor Use 'openInEditor' to
- * force opening an element in a editor With 'getWorkingCopy' you get the working copy (element in
- * the editor) of an element
- */
-public class J2EEEditorUtility {
- // //$NON-NLS-1$
- public static final String EJB_JAVA_EDITOR_ID = "org.eclipse.jst.j2ee.internal.internal.ejb.ui.misc.EJBJavaEditor"; //$NON-NLS-1$
-
- public static ICompilationUnit getCompilationUnit(JavaClass javaClass) {
- IProject project = ProjectUtilities.getProject(javaClass);
- if (project == null)
- return null;
- return getCompilationUnit(javaClass, project);
- }
-
- public static ICompilationUnit getCompilationUnit(JavaClass javaClass, IProject project) {
- if (javaClass == null)
- return null;
- IJavaProject javaProj = getJavaProject(project);
- if (javaProj == null)
- return null;
- return getCompilationUnit(javaClass, javaProj);
- }
-
- public static ICompilationUnit getCompilationUnit(JavaClass javaClass, IJavaProject javaProject) {
- if (javaClass == null)
- return null;
- IType type = getType(javaClass);
- if (type != null)
- return type.getCompilationUnit();
- return null;
- }
-
- public static IType getType(JavaClass javaClass) {
- if (javaClass != null) {
- JavaClassJDOMAdaptor adaptor = (JavaClassJDOMAdaptor) EcoreUtil.getRegisteredAdapter(javaClass, ReadAdaptor.TYPE_KEY);
- if (adaptor != null)
- return adaptor.getSourceType();
- }
- return null;
- }
-
- public static IEditorInput getEditorInput(Object input) {
- if (input instanceof EObject)
- return new FileEditorInput(WorkbenchResourceHelper.getFile((EObject) input));
- if (input instanceof IFile)
- return new FileEditorInput((IFile) input);
- return null;
- }
-
- public static IFile getFile(JavaClass javaClass) {
- ICompilationUnit comp = getCompilationUnit(javaClass);
- if (comp == null)
- return null;
- IEditorInput input = null;
- input = EditorUtility.getEditorInput(comp);
- if (input != null) {
- return (IFile) input.getAdapter(IFile.class);
- }
- return null;
- }
-
- public static IJavaProject getJavaProject(IProject aProject) {
- if (aProject == null)
- return null;
- IJavaModel javaModel = JemProjectUtilities.getJavaModel();
- return javaModel.getJavaProject(aProject.getName());
- }
-
- /**
- * Return the IPackageFragment for the JavaPackage for
- *
- * @javaClass.
- */
- public static IPackageFragment getPackageFragment(JavaClass javaClass, IJavaProject javaProject) {
- if (javaProject != null) {
- try {
- JavaPackage javaPackage = (JavaPackage) javaClass.eContainer();
- String packageName = javaPackage.getName();
- IPackageFragment[] pkgFrags = javaProject.getPackageFragments();
- for (int i = 0; i < pkgFrags.length; i++) {
- if ((pkgFrags[i].getElementName().equals(packageName)))
- return pkgFrags[i];
- }
- } catch (JavaModelException e) {
- //Ignore
- }
- }
- return null;
- }
-
- /**
- * Opens a Java editor for the given element if the element is a Java compilation unit or a Java
- * class file.
- *
- * @return the IEditorPart or null if wrong element type or opening failed
- */
- public static IEditorPart openInEditor(JavaClass javaClass, IProject aProject) throws JavaModelException, PartInitException {
- return openInEditor(javaClass, getJavaProject(aProject));
- }
-
- /**
- * Opens a Java editor for the given element if the element is a Java compilation unit or a Java
- * class file.
- *
- * @return the IEditorPart or null if wrong element type or opening failed
- */
- public static IEditorPart openInEditor(JavaClass javaClass, IJavaProject javaProject) throws JavaModelException, PartInitException {
- if (javaClass == null || javaProject == null)
- return null;
- IType type = getType(javaClass);
- if (type == null)
- return openInEditor(getCompilationUnit(javaClass, javaProject));
- return EditorUtility.openInEditor(type);
- }
-
-
- /**
- * Opens a Java editor for the given element if the element is a Java compilation unit or a Java
- * class file.
- *
- * @return the IEditorPart or null if wrong element type or opening failed
- */
- public static IEditorPart openInEditor(JavaClass javaClass, IJavaProject javaProject, String editorId) throws JavaModelException, PartInitException {
- return openInEditor(getCompilationUnit(javaClass, javaProject), editorId);
- }
-
- /**
- * Opens a Java editor for the given element if the element is a Java compilation unit or a Java
- * class file.
- *
- * @return the IEditorPart or null if wrong element type or opening failed
- */
- public static IEditorPart openInEditor(ICompilationUnit aCompilationUnit) throws JavaModelException, PartInitException {
- return EditorUtility.openInEditor(aCompilationUnit);
- }
-
- /**
- * Opens a Java editor for the given element if the element is a Java compilation unit or a Java
- * class file.
- *
- * @return the IEditorPart or null if wrong element type or opening failed
- */
- public static IEditorPart openInEditor(ICompilationUnit aCompilationUnit, String editorId) throws JavaModelException, PartInitException {
- return openInEditor(EditorUtility.getEditorInput(aCompilationUnit), editorId);
- }
-
- private static IEditorPart openInEditor(IEditorInput input, String editorID) throws PartInitException {
- if (input != null) {
- IWorkbenchPage p = J2EEUIPlugin.getActiveWorkbenchWindow().getActivePage();
- if (p != null)
- return p.openEditor(input, editorID, true);
- }
- return null;
- }
-}
\ No newline at end of file
diff --git a/plugins/org.eclipse.jst.j2ee.ui/j2ee_ui/org/eclipse/jst/j2ee/internal/plugin/J2EEUIAdapterFactory.java b/plugins/org.eclipse.jst.j2ee.ui/j2ee_ui/org/eclipse/jst/j2ee/internal/plugin/J2EEUIAdapterFactory.java
deleted file mode 100644
index 372f44c..0000000
--- a/plugins/org.eclipse.jst.j2ee.ui/j2ee_ui/org/eclipse/jst/j2ee/internal/plugin/J2EEUIAdapterFactory.java
+++ /dev/null
@@ -1,56 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2005 IBM Corporation and others.
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
- *
- * Contributors:
- * IBM Corporation - initial API and implementation
- *******************************************************************************/
-/*
- * Created on Jun 30, 2004
- */
-package org.eclipse.jst.j2ee.internal.plugin;
-
-import org.eclipse.core.runtime.IAdapterFactory;
-import org.eclipse.debug.ui.actions.ILaunchable;
-import org.eclipse.emf.ecore.EObject;
-
-/**
- * @author jlanuti
- */
-public class J2EEUIAdapterFactory implements IAdapterFactory {
-
- protected static final Class ILAUNCHABLE_CLASS = ILaunchable.class;
-
- /**
- * Default Constructor
- */
- public J2EEUIAdapterFactory() {
- super();
- }
-
- /*
- * (non-Javadoc)
- *
- * @see org.eclipse.core.runtime.IAdapterFactory#getAdapter(java.lang.Object, java.lang.Class)
- */
- public Object getAdapter(Object adaptableObject, Class adapterType) {
- if (adaptableObject instanceof EObject) {
- if (adapterType == ILAUNCHABLE_CLASS)
- return adaptableObject;
- }
- return null;
- }
-
- /*
- * (non-Javadoc)
- *
- * @see org.eclipse.core.runtime.IAdapterFactory#getAdapterList()
- */
- public Class[] getAdapterList() {
- return new Class[]{ILAUNCHABLE_CLASS};
- }
-
-}
\ No newline at end of file
diff --git a/plugins/org.eclipse.jst.j2ee.ui/j2ee_ui/org/eclipse/jst/j2ee/internal/plugin/J2EEUIContextIds.java b/plugins/org.eclipse.jst.j2ee.ui/j2ee_ui/org/eclipse/jst/j2ee/internal/plugin/J2EEUIContextIds.java
deleted file mode 100644
index 7d8053c..0000000
--- a/plugins/org.eclipse.jst.j2ee.ui/j2ee_ui/org/eclipse/jst/j2ee/internal/plugin/J2EEUIContextIds.java
+++ /dev/null
@@ -1,30 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2003, 2005 IBM Corporation and others.
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
- *
- * Contributors:
- * IBM Corporation - initial API and implementation
- *******************************************************************************/
-/*
- * Created on Feb 27, 2004
- *
- * To change the template for this generated file go to
- * Window - Preferences - Java - Code Generation - Code and Comments
- */
-package org.eclipse.jst.j2ee.internal.plugin;
-
-/**
- * @author vijayb
- *
- * To change the template for this generated type comment go to Window - Preferences - Java - Code
- * Generation - Code and Comments
- */
-public interface J2EEUIContextIds {
-
- // Delete Enterprise Bean Dialog
- public static final String DELETE_ENTERPRISE_BEAN_DIALOG = J2EEUIPlugin.PLUGIN_ID + ".delb1000"; //$NON-NLS-1$
-
-}
diff --git a/plugins/org.eclipse.jst.j2ee.ui/j2ee_ui/org/eclipse/jst/j2ee/internal/plugin/J2EEUIMessages.java b/plugins/org.eclipse.jst.j2ee.ui/j2ee_ui/org/eclipse/jst/j2ee/internal/plugin/J2EEUIMessages.java
deleted file mode 100644
index ef040c8..0000000
--- a/plugins/org.eclipse.jst.j2ee.ui/j2ee_ui/org/eclipse/jst/j2ee/internal/plugin/J2EEUIMessages.java
+++ /dev/null
@@ -1,251 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2003, 2008 IBM Corporation and others.
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
- *
- * Contributors:
- * IBM Corporation - initial API and implementation
- * Stefan Dimov, stefan.dimov@sap.com - bug 207826
- *******************************************************************************/
-package org.eclipse.jst.j2ee.internal.plugin;
-
-import java.util.MissingResourceException;
-import java.util.ResourceBundle;
-
-import org.eclipse.wst.common.frameworks.internal.Messages;
-
-
-public class J2EEUIMessages extends Messages {
-
- private static final J2EEUIMessages INSTANCE = new J2EEUIMessages();
-
- public static final String PROJECT_LOC_LBL = "1"; //$NON-NLS-1$
- public static final String TARGET_RUNTIME_LBL = "2"; //$NON-NLS-1$
- public static final String J2EE_VERSION_LBL = "3"; //$NON-NLS-1$
- public static final String IMAGE_LOAD_ERROR = "4"; //$NON-NLS-1$
- public static final String APP_PROJECT_WIZ_TITLE = "5"; //$NON-NLS-1$
- public static final String APP_PROJECT_MAIN_PG_TITLE = "6"; //$NON-NLS-1$
- public static final String APP_PROJECT_MAIN_PG_DESC = "7"; //$NON-NLS-1$
- public static final String APP_PROJECT_MODULES_PG_TITLE = "8"; //$NON-NLS-1$
- public static final String APP_PROJECT_MODULES_PG_DESC = "9"; //$NON-NLS-1$
- public static final String APP_PROJECT_MODULES_PG_SELECT = "10"; //$NON-NLS-1$
- public static final String APP_PROJECT_MODULES_PG_DESELECT = "11"; //$NON-NLS-1$
- public static final String APP_PROJECT_MODULES_PG_NEW = "12"; //$NON-NLS-1$
- public static final String EAR_PROJECT_FOR_MODULE_CREATION = "13"; //$NON-NLS-1$
- public static final String NEW_THREE_DOTS_E = "14"; //$NON-NLS-1$
- public static final String NEW_THREE_DOTS_W = "14a"; //$NON-NLS-1$
- public static final String LINK_MODULETO_EAR_PROJECT = "15"; //$NON-NLS-1$
- public static final String NEW_MOD_SEL_PG_TITLE = "16"; //$NON-NLS-1$
- public static final String NEW_MOD_SEL_PG_DESC = "17"; //$NON-NLS-1$
- public static final String NEW_MOD_WIZ_TITLE = "18"; //$NON-NLS-1$
- public static final String NEW_MOD_SEL_PG_DEF_BTN = "19"; //$NON-NLS-1$
- public static final String APP_CLIENT_PROJ_LBL = "20"; //$NON-NLS-1$
- public static final String EJB_PROJ_LBL = "21"; //$NON-NLS-1$
- public static final String WEB_PROJ_LBL = "22"; //$NON-NLS-1$
- public static final String JCA_PROJ_LBL = "23"; //$NON-NLS-1$
-
- public static final String APP_CLIENT_PROJECT_WIZ_TITLE = "24"; //$NON-NLS-1$
- public static final String APP_CLIENT_VERSION_LBL = "3"; //$NON-NLS-1$
- public static final String APP_CLIENT_PROJECT_MAIN_PG_TITLE = "25"; //$NON-NLS-1$
- public static final String APP_CLIENT_SETTINGS = "101"; //$NON-NLS-1$
-
- public static final String APP_CLIENT_PROJECT_MAIN_PG_DESC = "26"; //$NON-NLS-1$
- public static final String MODULES_DEPENDENCY_PAGE_TITLE = "27"; //$NON-NLS-1$
-
- public static final String MODULES_DEPENDENCY_PAGE_DESC = "28"; //$NON-NLS-1$
- public static final String MODULES_DEPENDENCY_PAGE_AVAILABLE_JARS = "29"; //$NON-NLS-1$
- public static final String MODULES_DEPENDENCY_PAGE_CLASSPATH = "30"; //$NON-NLS-1$
- public static final String MODULES_DEPENDENCY_PAGE_TABLE_MODULE = "31"; //$NON-NLS-1$
- public static final String MODULES_DEPENDENCY_PAGE_TABLE_PROJECT = "32"; //$NON-NLS-1$
- public static final String NEW_LBL = "33"; //$NON-NLS-1$
- public static final String APP_CLIENT_IMPORT_MAIN_PG_DESC = "34"; //$NON-NLS-1$
- public static final String APP_CLIENT_IMPORT_MAIN_PG_TITLE = "35"; //$NON-NLS-1$
- public static final String APP_CLIENT_IMPORT_FILE_LABEL = "36"; //$NON-NLS-1$
-
- public static final String APP_CLIENT_IMPORT_PROJECT_LABEL = "37"; //$NON-NLS-1$
-
- public static final String IMPORT_WIZ_TITLE = "38"; //$NON-NLS-1$
- public static final String EAR_IMPORT_MAIN_PG_DESC = "39"; //$NON-NLS-1$
- public static final String EAR_IMPORT_MAIN_PG_TITLE = "40"; //$NON-NLS-1$
- public static final String EAR_IMPORT_FILE_LABEL = "41"; //$NON-NLS-1$
- public static final String OVERWRITE_RESOURCES = "42"; //$NON-NLS-1$
- public static final String EAR_IMPORT_PROJECT_TYPE = "43"; //$NON-NLS-1$
- public static final String EAR_IMPORT_PROJECT_TYPE_BINARY = "44"; //$NON-NLS-1$
- public static final String EAR_IMPORT_PROJECT_TYPE_SOURCE = "45"; //$NON-NLS-1$
- public static final String EAR_IMPORT_PARTIAL_DEVELOPMENT = "46"; //$NON-NLS-1$
- public static final String EAR_IMPORT_DESELECT_ALL_UTIL_BUTTON = "48"; //$NON-NLS-1$
- public static final String EAR_IMPORT_SELECT_ALL_UTIL_BUTTON = "47"; //$NON-NLS-1$
- public static final String EAR_IMPORT_JARS_GROUP = "49"; //$NON-NLS-1$
- public static final String EAR_IMPORT_SELECT_UTIL_JARS_TO_BE_PROJECTS = "50"; //$NON-NLS-1$
- public static final String EAR_IMPORT_PROJECT_PG_DESC = "51"; //$NON-NLS-1$
- public static final String EAR_IMPORT_PROJECT_PG_TITLE = "52"; //$NON-NLS-1$
- public static final String PROJECT_LOCATIONS_GROUP = "53"; //$NON-NLS-1$
- public static final String NEW_PROJECT_GROUP_DESCRIPTION = "54"; //$NON-NLS-1$
- public static final String USE_DEFAULT_ROOT_RADIO = "55"; //$NON-NLS-1$
- public static final String USE_ALTERNATE_ROOT_RADIO = "56"; //$NON-NLS-1$
- public static final String SELECT_DIRECTORY_DLG = "57"; //$NON-NLS-1$
- public static final String EAR_IMPORT_Modules_in_EAR = "58"; //$NON-NLS-1$
- public static final String EAR_IMPORT_New_Project_Name = "59"; //$NON-NLS-1$
- public static final String EAR_IMPORT_FILENAMES = "60"; //$NON-NLS-1$
- public static final String EAR_IMPORT_PROJECTNAMES = "61"; //$NON-NLS-1$
- public static final String J2EE_EXPORT_DESTINATION = "62"; //$NON-NLS-1$
- public static final String J2EE_EXPORT_OVERWRITE_CHECKBOX = "63"; //$NON-NLS-1$
- public static final String J2EE_EXPORT_SOURCE_CHECKBOX = "64"; //$NON-NLS-1$
- public static final String APP_CLIENT_EXPORT_MAIN_PG_TITLE = "65"; //$NON-NLS-1$
- public static final String APP_CLIENT_EXPORT_MAIN_PG_DESC = "66"; //$NON-NLS-1$
- public static final String EXPORT_WIZ_TITLE = "67"; //$NON-NLS-1$
- public static final String EAR_EXPORT_MAIN_PG_TITLE = "68"; //$NON-NLS-1$
- public static final String EAR_EXPORT_MAIN_PG_DESC = "69"; //$NON-NLS-1$
- public static final String EAR_EXPORT_INCLUDE_PROJECT_FILES = "70"; //$NON-NLS-1$
- public static final String EAR_EXPORT_INCLUDE_PROJECT_FILES_DESC = "71"; //$NON-NLS-1$
- public static final String EAR_IMPORT_INCLUDE_PROJECT = "72"; //$NON-NLS-1$
- public static final String EAR_IMPORT_OVERWRITE_NESTED = "74"; //$NON-NLS-1$
- public static final String DELETE_PROJECT = "75"; //$NON-NLS-1$
- public static final String EAR_IMPORT_PROJECT_LABEL = "76"; //$NON-NLS-1$
-
- //string for migration
- public static final String ERROR_OCCURRED_TITLE = "77"; //$NON-NLS-1$
- public static final String ERROR_OCCURRED_MESSAGE = "78"; //$NON-NLS-1$
- public static final String BINARY_PROJECT = "79"; //$NON-NLS-1$
- public static final String ACTION_CANNOT_BE_PERFORMED_ON_BIN_PROJECT = "80"; //$NON-NLS-1$
- public static final String INFORMATION_UI_ = "81"; //$NON-NLS-1$
- public static final String CHOSEN_OP_NOT_AVAILABLE = "82"; //$NON-NLS-1$
-
- public static final String CREATE_EJB_CLIENT_JAR = "90"; //$NON-NLS-1$
- public static final String USE_ANNOTATIONS = "91"; //$NON-NLS-1$
- public static final String USE_ANNOTATIONS_SERVLET = "98"; //$NON-NLS-1$
- public static final String ADD_ANNOTATIONS_SUPPORT = "92"; //$NON-NLS-1$
- public static final String BROWSE_LABEL = "93"; //$NON-NLS-1$
- public static final String NAME_LABEL = "94"; //$NON-NLS-1$
-
- public static final String APP_CLIENT_CREATE_MAIN = "95"; //$NON-NLS-1$
- public static final String CREATE_DEFAULT_SESSION_BEAN = "96"; //$NON-NLS-1$
-
- public static final String MODULE_NAME = "99"; //$NON-NLS-1$
- public static final String MODULE_VERSION_LABEL = "100"; //$NON-NLS-1$
-
- public static final String J2EE_UTILITY_JAR_LISTEAR_IMPORT_SELECT_UTIL_JARS_TO_BE_PROJECTS = "97"; //$NON-NLS-1$
-
- public static final String J2EE_EXPORT_RUNTIME = "103"; //$NON-NLS-1$
-
- public static final String FLEXIBLE_PROJECT_WIZ_TITLE = "FlexibleProjectCreationWizard.title"; //$NON-NLS-1$
- public static final String FLEXIBLE_PROJECT_MAIN_PG_TITLE = "FlexibleProjectCreationWizard.mainPage.title"; //$NON-NLS-1$
- public static final String FLEXIBLE_PROJECT_MAIN_PG_DESC = "FlexibleProjectCreationWizard.mainPage.desc"; //$NON-NLS-1$
- public static final String EAR_COMPONENT_WIZ_TITLE = "EARComponentCreationWizard.title"; //$NON-NLS-1$
- public static final String EAR_COMPONENT_MAIN_PG_TITLE = "EARComponentCreationWizard.mainPage.title"; //$NON-NLS-1$
- public static final String EAR_COMPONENT_MAIN_PG_DESC = "EARComponentCreationWizard.mainPage.desc"; //$NON-NLS-1$
- public static final String EAR_COMPONENT_SECOND_PG_TITLE = "EARComponentCreationWizard.secondPage.title"; //$NON-NLS-1$
- public static final String EAR_COMPONENT_SECOND_PG_DESC = "EARComponentCreationWizard.secondPage.desc"; //$NON-NLS-1$
- public static final String J2EE_MODULE_DEPENDENCIES_LABEL = "J2EEModuleDependencies.label"; //$NON-NLS-1$
- public static final String J2EE_MODULE_DEPENDENCIES_LABEL_ACCESSIBILITY = "J2EEModuleDependencies.label_accessibility"; //$NON-NLS-1$
- public static final String APPCLIENT_COMPONENT_WIZ_TITLE = "AppClientComponentCreationWizard.title"; //$NON-NLS-1$
- public static final String APPCLIENT_COMPONENT_MAIN_PG_TITLE = "AppClientComponentCreationWizard.mainPage.title"; //$NON-NLS-1$
- public static final String APPCLIENT_COMPONENT_MAIN_PG_DESC = "AppClientComponentCreationWizard.mainPage.desc"; //$NON-NLS-1$
- public static final String DEFAULT_COMPONENT_WIZ_TITLE = "DefaultJ2EEComponentCreationWizard.title"; //$NON-NLS-1$
- public static final String DEFAULT_COMPONENT_PAGE_TITLE = "DefaultJ2EEComponentCreationWizard.page.title"; //$NON-NLS-1$
- public static final String DEFAULT_COMPONENT_PAGE_DESC = "DefaultJ2EEComponentCreationWizard.page.desc"; //$NON-NLS-1$
- public static final String DEFAULT_COMPONENT_PAGE_EJB_MODULE_LBL = "DefaultJ2EEComponentCreationWizard.page.label.ejb"; //$NON-NLS-1$
- public static final String DEFAULT_COMPONENT_PAGE_WEB_MODULE_LBL = "DefaultJ2EEComponentCreationWizard.page.label.web"; //$NON-NLS-1$
- public static final String DEFAULT_COMPONENT_PAGE_JCA_MODULE_LBL = "DefaultJ2EEComponentCreationWizard.page.label.jca"; //$NON-NLS-1$
- public static final String DEFAULT_COMPONENT_PAGE_APPCLIENT_MODULE_LBL = "DefaultJ2EEComponentCreationWizard.page.label.appclient"; //$NON-NLS-1$
- public static final String DEFAULT_COMPONENT_PAGE_NEW_MOD_SEL_PG_DEF_BTN = "DefaultJ2EEComponentCreationWizard.page.button.select"; //$NON-NLS-1$
-
- public final static String EMPTY_STRING = ""; //$NON-NLS-1$
- public final static String FOLDER_LABEL = getResourceString("FOLDER_LABEL"); //$NON-NLS-1$
- public final static String BROWSE_BUTTON_LABEL = getResourceString("BROWSE_BUTTON_LABEL"); //$NON-NLS-1$
- public final static String BROWSE_BUTTON_LABEL_O = getResourceString("BROWSE_BUTTON_LABEL_O"); //$NON-NLS-1$
- public final static String BROWSE_BUTTON_LABEL_W = getResourceString("BROWSE_BUTTON_LABEL_W"); //$NON-NLS-1$
- public final static String BROWSE_BUTTON_LABEL_E = getResourceString("BROWSE_BUTTON_LABEL_E"); //$NON-NLS-1$
- public final static String JAVA_PACKAGE_LABEL = getResourceString("JAVA_PACKAGE_LABEL"); //$NON-NLS-1$
- public final static String CLASS_NAME_LABEL = getResourceString("CLASS_NAME_LABEL"); //$NON-NLS-1$
- public final static String SUPERCLASS_LABEL = getResourceString("SUPERCLASS_LABEL"); //$NON-NLS-1$
- public final static String CONTAINER_SELECTION_DIALOG_TITLE = getResourceString("CONTAINER_SELECTION_DIALOG_TITLE"); //$NON-NLS-1$
- public final static String CONTAINER_SELECTION_DIALOG_DESC = getResourceString("CONTAINER_SELECTION_DIALOG_DESC"); //$NON-NLS-1$
- public final static String CONTAINER_SELECTION_DIALOG_VALIDATOR_MESG = getResourceString("CONTAINER_SELECTION_DIALOG_VALIDATOR_MESG"); //$NON-NLS-1$
- public final static String PACKAGE_SELECTION_DIALOG_TITLE = getResourceString("PACKAGE_SELECTION_DIALOG_TITLE"); //$NON-NLS-1$
- public final static String PACKAGE_SELECTION_DIALOG_DESC = getResourceString("PACKAGE_SELECTION_DIALOG_DESC"); //$NON-NLS-1$
- public final static String PACKAGE_SELECTION_DIALOG_MSG_NONE = getResourceString("PACKAGE_SELECTION_DIALOG_MSG_NONE"); //$NON-NLS-1$
- public final static String SUPERCLASS_SELECTION_DIALOG_TITLE = getResourceString("SUPERCLASS_SELECTION_DIALOG_TITLE"); //$NON-NLS-1$
- public final static String SUPERCLASS_SELECTION_DIALOG_DESC = getResourceString("SUPERCLASS_SELECTION_DIALOG_DESC"); //$NON-NLS-1$
- public final static String JAVA_CLASS_MODIFIERS_LABEL = getResourceString("JAVA_CLASS_MODIFIERS_LABEL"); //$NON-NLS-1$
- public final static String JAVA_CLASS_INTERFACES_LABEL = getResourceString("JAVA_CLASS_INTERFACES_LABEL"); //$NON-NLS-1$
- public final static String JAVA_CLASS_METHOD_STUBS_LABEL = getResourceString("JAVA_CLASS_METHOD_STUBS_LABEL"); //$NON-NLS-1$
- public final static String JAVA_CLASS_PUBLIC_CHECKBOX_LABEL = getResourceString("JAVA_CLASS_PUBLIC_CHECKBOX_LABEL"); //$NON-NLS-1$
- public final static String JAVA_CLASS_ABSTRACT_CHECKBOX_LABEL = getResourceString("JAVA_CLASS_ABSTRACT_CHECKBOX_LABEL"); //$NON-NLS-1$
- public final static String JAVA_CLASS_FINAL_CHECKBOX_LABEL = getResourceString("JAVA_CLASS_FINAL_CHECKBOX_LABEL"); //$NON-NLS-1$
- public final static String JAVA_CLASS_CONSTRUCTOR_CHECKBOX_LABEL = getResourceString("JAVA_CLASS_CONSTRUCTOR_CHECKBOX_LABEL"); //$NON-NLS-1$
- public final static String JAVA_CLASS_MAIN_CHECKBOX_LABEL = getResourceString("JAVA_CLASS_MAIN_CHECKBOX_LABEL"); //$NON-NLS-1$
- public final static String JAVA_CLASS_INHERIT_CHECKBOX_LABEL = getResourceString("JAVA_CLASS_INHERIT_CHECKBOX_LABEL"); //$NON-NLS-1$
- public final static String ADD_BUTTON_LABEL = getResourceString("ADD_BUTTON_LABEL"); //$NON-NLS-1$
- public static final String REMOVE_BUTTON = getResourceString("REMOVE_BUTTON"); //$NON-NLS-1$
- public static final String YES_BUTTON = getResourceString("YES_BUTTON"); //$NON-NLS-1$
- public static final String NO_BUTTON = getResourceString("NO_BUTTON"); //$NON-NLS-1$
- public static final String OK_BUTTON = getResourceString("OK_BUTTON"); //$NON-NLS-1$
- public static final String CANCEL_BUTTON = getResourceString("CANCEL_BUTTON"); //$NON-NLS-1$
- public static final String BINARY = getResourceString("BINARY"); //$NON-NLS-1$
- public final static String INTERFACE_SELECTION_DIALOG_TITLE = getResourceString("INTERFACE_SELECTION_DIALOG_TITLE"); //$NON-NLS-1$
-
- public static final String JAVAUTIL_COMPONENT_WIZ_TITLE="JAVAUTIL_COMPONENT_WIZ_TITLE"; //$NON-NLS-1$
- public static final String JAVAUTILITY_MAIN_PG_TITLE = "JAVAUTILITY_MAIN_PG_TITLE";//$NON-NLS-1$
- public final static String JAVAUTILITY_MAIN_PG_DESC = "JAVAUTILITY_MAIN_PG_DESC";//$NON-NLS-1$
- public static final String AVAILABLE_J2EE_COMPONENTS="AVAILABLE_J2EE_COMPONENTS"; //$NON-NLS-1$
- public static final String EXTERNAL_JAR="EXTERNAL_JAR";//$NON-NLS-1$
- public static final String PROJECT_JAR="PROJECT_JAR";//$NON-NLS-1$
- public static final String ADDVARIABLE="ADDVARIABLE";//$NON-NLS-1$
- public static final String CHANGE_LIB_DIR ="CHANGE_LIB_DIR";//$NON-NLS-1$
- public static final String NO_DD_MSG_TITLE = "NO_DD_MSG_TITLE";//$NON-NLS-1$
- public static final String GEN_DD_QUESTION = "GEN_DD_QUESTION";//$NON-NLS-1$
-
- public static final String CHANGE_LIB_DIR_HEAD = "CHANGE_LIB_DIR_HEAD";//$NON-NLS-1$
- public static final String NEW_LIB_DIR_PROPMPT = "NEW_LIB_DIR_PROPMPT";//$NON-NLS-1$
- public static final String BLANK_LIB_DIR = "BLANK_LIB_DIR";//$NON-NLS-1$
- public static final String BLANK_LIB_DIR_CONFIRM = "BLANK_LIB_DIR_CONFIRM";//$NON-NLS-1$
- public static final String BLANK_LIB_DIR_WARN_QUESTION = "BLANK_LIB_DIR_WARN_QUESTION";//$NON-NLS-1$
- public static final String INVALID_PATH = "INVALID_PATH";//$NON-NLS-1$
- public static final String INVALID_PATH_MSG = "INVALID_PATH_MSG";//$NON-NLS-1$
- public static final String DEPENDENCY_CONFLICT_TITLE = "DEPENDENCY_CONFLICT_TITLE";//$NON-NLS-1$
- public static final String DEPENDENCY_CONFLICT_MSG_1 = "DEPENDENCY_CONFLICT_MSG_1";//$NON-NLS-1$
- public static final String DEPENDENCY_CONFLICT_MSG_2 = "DEPENDENCY_CONFLICT_MSG_2";//$NON-NLS-1$
- public static final String DO_NOT_SHOW_WARNING_AGAIN = "DO_NOT_SHOW_WARNING_AGAIN";//$NON-NLS-1$
-
- public static final String SUPPORTMULTIPLEMODULES="SUPPORTMULTIPLEMODULES";//$NON-NLS-1$
- public static final String SOURCEFOLDER="SOURCEFOLDER";//$NON-NLS-1$
- public static final String CONTENT_FOLDER = "102"; //$NON-NLS-1$
-
- public static final String HOVER_HELP_FOR_DISABLED_LIBS = "HOVER_HELP_FOR_DISABLED_LIBS"; //$NON-NLS-1$
- public static final String JAVA_EE_PREFERENCE_PAGE_NAME = "JAVA_EE_PREFERENCE_PAGE_NAME"; //$NON-NLS-1$
- public static final String JAVA_EE_PREFERENCE_PAGE_JET_TEMPLATE = "JAVA_EE_PREFERENCE_PAGE_JET_TEMPLATE"; //$NON-NLS-1$
- public static final String JAVA_EE_PREFERENCE_PAGE_DYN_TRANSLATION_BTN_NAME = "JAVA_EE_PREFERENCE_PAGE_DYN_TRANSLATION_BTN_NAME"; //$NON-NLS-1$
- public static final String OPEN_J2EE_RESOURCE_ACTION_0 = "OpenJ2EEResourceAction.0"; //$NON-NLS-1$
- /**
- * Returns the string from the resource bundle, or 'key' if not found.
- */
- public static String getResourceString(String key) {
- return INSTANCE.doGetResourceString(key);
- }
-
- public static String getResourceString(String key, Object[] args) {
- return INSTANCE.doGetResourceString(key, args);
- }
-
- private J2EEUIMessages() {
- super();
- }
-
- /*
- * (non-Javadoc)
- *
- * @see org.eclipse.wst.common.frameworks.internal.Messages#initializeBundle()
- */
- @Override
- protected void initializeBundle() {
- try {
- resourceBundle = ResourceBundle.getBundle("j2ee_ui"); //$NON-NLS-1$
- } catch (MissingResourceException x) {
- //Ignore
- }
- }
-
-}
diff --git a/plugins/org.eclipse.jst.j2ee.ui/j2ee_ui/org/eclipse/jst/j2ee/internal/plugin/J2EEUIPlugin.java b/plugins/org.eclipse.jst.j2ee.ui/j2ee_ui/org/eclipse/jst/j2ee/internal/plugin/J2EEUIPlugin.java
deleted file mode 100644
index b67dbf4..0000000
--- a/plugins/org.eclipse.jst.j2ee.ui/j2ee_ui/org/eclipse/jst/j2ee/internal/plugin/J2EEUIPlugin.java
+++ /dev/null
@@ -1,253 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2003, 2006 IBM Corporation and others.
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
- *
- * Contributors:
- * IBM Corporation - initial API and implementation
- *******************************************************************************/
-package org.eclipse.jst.j2ee.internal.plugin;
-
-import java.io.IOException;
-import java.net.URL;
-
-import org.eclipse.core.internal.boot.PlatformURLConnection;
-import org.eclipse.core.resources.IWorkspace;
-import org.eclipse.core.resources.ResourcesPlugin;
-import org.eclipse.core.runtime.CoreException;
-import org.eclipse.core.runtime.IPath;
-import org.eclipse.core.runtime.IStatus;
-import org.eclipse.core.runtime.MultiStatus;
-import org.eclipse.core.runtime.Path;
-import org.eclipse.core.runtime.Platform;
-import org.eclipse.core.runtime.Status;
-import org.eclipse.jface.resource.ImageDescriptor;
-import org.eclipse.jface.resource.ImageRegistry;
-import org.eclipse.jface.viewers.ISelection;
-import org.eclipse.jface.viewers.IStructuredSelection;
-import org.eclipse.swt.graphics.Image;
-import org.eclipse.swt.widgets.Shell;
-import org.eclipse.ui.IWorkbench;
-import org.eclipse.ui.IWorkbenchWindow;
-import org.eclipse.ui.plugin.AbstractUIPlugin;
-import org.eclipse.jst.j2ee.internal.plugin.J2EEUIPlugin;
-import java.lang.Throwable;
-
-
-/**
- * The main plugin class to be used in the desktop.
- */
-public class J2EEUIPlugin extends AbstractUIPlugin {
-
- public static final String PLUGIN_ID = "org.eclipse.jst.j2ee.ui"; //$NON-NLS-1$
-
- //The shared instance.
- private static J2EEUIPlugin plugin;
- private static IPath location;
-
- /**
- * The constructor.
- */
- public J2EEUIPlugin() {
- super();
- plugin = this;
- }
-
- /**
- * Returns the shared instance.
- */
- public static J2EEUIPlugin getDefault() {
- return plugin;
- }
-
- /**
- * Returns the workspace instance.
- */
- public static IWorkspace getWorkspace() {
- return ResourcesPlugin.getWorkspace();
- }
-
- public static IPath getInstallLocation() {
- if (location == null) {
- URL url = getInstallURL();
- try {
- String installLocation = ((PlatformURLConnection) url.openConnection()).getURLAsLocal().getFile();
- location = new Path(installLocation);
- }catch (IOException e) {
- logWarning(J2EEPluginResourceHandler.getString("Install_Location_Error_", new Object[]{url}) + e); //$NON-NLS-1$
- }
- }
- return location;
- }
-
- public static URL getInstallURL() {
- return getDefault().getBundle().getEntry("/"); //$NON-NLS-1$
- }
-
- /**
- * Get a .gif from the image registry.
- */
- public Image getImage(String key) {
- ImageRegistry imageRegistry = getImageRegistry();
- Image image = imageRegistry.get(key);
- if (image == null || image.isDisposed()) {
- ImageDescriptor descriptor = getImageDescriptor(key);
- if (descriptor != null) {
- image = descriptor.createImage();
- imageRegistry.put(key, image);
- }
- }
- return image;
- }
-
- /**
- * This gets a .gif from the icons folder.
- */
- public ImageDescriptor getImageDescriptor(String key) {
- ImageDescriptor imageDescriptor = null;
- URL gifImageURL = getImageURL(key);
- if (gifImageURL != null)
- imageDescriptor = ImageDescriptor.createFromURL(gifImageURL);
- return imageDescriptor;
- }
-
- /**
- * @param key
- * @return
- */
- private URL getImageURL(String key) {
- return J2EEPlugin.getImageURL(key, getBundle());
- }
-
- public static IWorkbenchWindow getActiveWorkbenchWindow() {
- return getPluginWorkbench().getActiveWorkbenchWindow();
- }
-
- /**
- * Return the workbench
- *
- * This method is internal to the j2ee plugin and must not be called by any other plugins.
- */
-
- public static IWorkbench getPluginWorkbench() {
- return getDefault().getWorkbench();
- }
-
- public static Shell getActiveWorkbenchShell() {
- IWorkbenchWindow window = getActiveWorkbenchWindow();
- if (window != null) {
- return window.getShell();
- }
- return null;
- }
-
- public static IStructuredSelection getCurrentSelection() {
- IWorkbenchWindow window = getActiveWorkbenchWindow();
- if (window != null) {
- ISelection selection = window.getSelectionService().getSelection();
- if (selection instanceof IStructuredSelection) {
- return (IStructuredSelection) selection;
- }
-
- }
- return null;
- }
-
-
- /**
- * Record an error against this plugin's log.
- *
- * @param aCode
- * @param aMessage
- * @param anException
- */
- public static void logError(int aCode, String aMessage,
- Throwable anException) {
- getDefault().getLog().log(
- createErrorStatus(aCode, aMessage, anException));
- }
-
- /**
- *
- * Record a message against this plugin's log.
- *
- * @param severity
- * @param aCode
- * @param aMessage
- * @param exception
- */
- public static void log(int severity, int aCode, String aMessage,
- Throwable exception) {
- log(createStatus(severity, aCode, aMessage, exception));
- }
-
- /**
- *
- * Record a status against this plugin's log.
- *
- * @param aStatus
- */
- public static void log(IStatus aStatus) {
- getDefault().getLog().log(aStatus);
- }
-
- /**
- * Create a status associated with this plugin.
- *
- * @param severity
- * @param aCode
- * @param aMessage
- * @param exception
- * @return A status configured with this plugin's id and the given parameters.
- */
- public static IStatus createStatus(int severity, int aCode,
- String aMessage, Throwable exception) {
- return new Status(severity, PLUGIN_ID, aCode,
- aMessage != null ? aMessage : "No message.", exception); //$NON-NLS-1$
- }
-
- /**
- *
- * @param aCode
- * @param aMessage
- * @param exception
- * @return A status configured with this plugin's id and the given parameters.
- */
- public static IStatus createErrorStatus(int aCode, String aMessage,
- Throwable exception) {
- return createStatus(IStatus.ERROR, aCode, aMessage, exception);
- }
-
- public static IStatus createStatus(int severity, String message, Throwable exception) {
- return new Status(severity, PLUGIN_ID, message, exception);
- }
-
- public static IStatus createStatus(int severity, String message) {
- return createStatus(severity, message, null);
- }
-
- public static void logError(Throwable exception) {
- Platform.getLog(Platform.getBundle(PLUGIN_ID)).log( createStatus(IStatus.ERROR, exception.getMessage(), exception));
- }
-
- public static void logError(CoreException exception) {
- Platform.getLog(Platform.getBundle(PLUGIN_ID)).log( exception.getStatus() );
- }
-
- public static void logError(String message, Throwable exception) {
- Platform.getLog(Platform.getBundle(PLUGIN_ID)).log( createStatus(IStatus.ERROR, message, exception));
- }
-
- public static void logError(String message, CoreException exception) {
- MultiStatus status = new MultiStatus(PLUGIN_ID,IStatus.ERROR,new IStatus[]{exception.getStatus()},message,exception);
- Platform.getLog(Platform.getBundle(PLUGIN_ID)).log( status );
- }
-
- public static void logWarning(String message) {
- Platform.getLog(Platform.getBundle(PLUGIN_ID)).log(createStatus(IStatus.WARNING, message));
- }
-
-
-}
diff --git a/plugins/org.eclipse.jst.j2ee.ui/j2ee_ui/org/eclipse/jst/j2ee/internal/plugin/J2EEUIPluginIcons.java b/plugins/org.eclipse.jst.j2ee.ui/j2ee_ui/org/eclipse/jst/j2ee/internal/plugin/J2EEUIPluginIcons.java
deleted file mode 100644
index 6740842..0000000
--- a/plugins/org.eclipse.jst.j2ee.ui/j2ee_ui/org/eclipse/jst/j2ee/internal/plugin/J2EEUIPluginIcons.java
+++ /dev/null
@@ -1,55 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2003, 2004 IBM Corporation and others.
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
- *
- * Contributors:
- * IBM Corporation - initial API and implementation
- *******************************************************************************/
-/*
- * Created on Nov 10, 2003
- *
- * To change the template for this generated file go to
- * Window>Preferences>Java>Code Generation>Code and Comments
- */
-package org.eclipse.jst.j2ee.internal.plugin;
-
-/**
- * @author jsholl
- *
- * To change the template for this generated type comment go to
- * Window>Preferences>Java>Code Generation>Code and Comments
- */
-public class J2EEUIPluginIcons {
-
- public static String EAR_IMPORT_WIZARD_BANNER = "import_ear_wiz"; //$NON-NLS-1$
- public static final String JCA_IMPORT_WIZARD_BANNER = "import_rar_wiz"; //$NON-NLS-1$
- public static final String EJB_IMPORT_WIZARD_BANNER = "import_ejbjar_wiz"; //$NON-NLS-1$
- public static final String APP_CLIENT_IMPORT_WIZARD_BANNER = "import_appclient_wiz"; //$NON-NLS-1$
- public static final String WEB_IMPORT_WIZARD_BANNER = "import_war_wiz"; //$NON-NLS-1$
- public static final String EAR_WIZ_BANNER = "ear_wiz"; //$NON-NLS-1$
- public static final String APP_CLIENT_PROJECT_WIZARD_BANNER = "appclient_wiz"; //$NON-NLS-1$
- //EJB Icons
- public static final String EJB_PROJECT_WIZARD_BANNER = "ejbproject_wiz"; //$NON-NLS-1$
- //WEB Icons
- public static final String WEB_PROJECT_WIZARD_BANNER = "war_wiz"; //$NON-NLS-1$
- //JCA Icons
- public static final String JCA_PROJECT_WIZARD_BANNER = "connector_wiz"; //$NON-NLS-1$
- public static final String APP_CLIENT_EXPORT_WIZARD_BANNER = "export_appclient_wiz"; //$NON-NLS-1$
- public static final String EJB_EXPORT_WIZARD_BANNER = "export_ejbjar_obj"; //$NON-NLS-1$;
- public static final String WEB_EXPORT_WIZARD_BANNER = "export_war_wiz"; //$NON-NLS-1$;
- public static final String JCA_EXPORT_WIZARD_BANNER = "export_rar_wiz"; //$NON-NLS-1$;
- public static final String EAR_EXPORT_WIZARD_BANNER = "export_ear_wiz"; //$NON-NLS-1$;
-
- //Migration Wizard Icons
-
- public static final String WARNING_TASK = "showwarn_tsk"; //$NON-NLS-1$
-
- public static final String CLIENT_BANNER = "ejbclientjar_wizban"; //$NON-NLS-1$
-
- public static final String MIGRATION_WIZARD_BANNER = "versionmigrate3_wiz"; //$NON-NLS-1$
-
-
-}
\ No newline at end of file
diff --git a/plugins/org.eclipse.jst.j2ee.ui/j2ee_ui/org/eclipse/jst/j2ee/internal/plugin/J2EEViewerSorter.java b/plugins/org.eclipse.jst.j2ee.ui/j2ee_ui/org/eclipse/jst/j2ee/internal/plugin/J2EEViewerSorter.java
deleted file mode 100644
index 6c8095b..0000000
--- a/plugins/org.eclipse.jst.j2ee.ui/j2ee_ui/org/eclipse/jst/j2ee/internal/plugin/J2EEViewerSorter.java
+++ /dev/null
@@ -1,54 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2003, 2005 IBM Corporation and others.
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
- *
- * Contributors:
- * IBM Corporation - initial API and implementation
- *******************************************************************************/
-package org.eclipse.jst.j2ee.internal.plugin;
-
-
-import org.eclipse.core.resources.IFile;
-import org.eclipse.jface.viewers.Viewer;
-import org.eclipse.jface.viewers.ViewerSorter;
-import org.eclipse.jst.j2ee.common.internal.util.CommonUtil;
-import org.eclipse.jst.j2ee.ejb.EnterpriseBean;
-
-public class J2EEViewerSorter extends ViewerSorter {
-
- /**
- * Constructor for J2EEViewerSorter.
- */
- public J2EEViewerSorter() {
- super();
- }
-
-
-
- /**
- * @see ViewerSorter#compare(Viewer, Object, Object)
- */
- @Override
- public int compare(Viewer viewer, Object e1, Object e2) {
- if (shouldSort(e1, e2))
- return super.compare(viewer, e1, e2);
- return 0;
- }
-
- protected boolean isEnterpriseBean(Object o) {
- return o instanceof EnterpriseBean;
- }
-
- protected boolean isDeploymentDescriptorRoot(Object o) {
- return CommonUtil.isDeploymentDescriptorRoot(o);
- }
-
- protected boolean shouldSort(Object e1, Object e2) {
- return (isDeploymentDescriptorRoot(e1) && isDeploymentDescriptorRoot(e2)) || (isEnterpriseBean(e1) && isEnterpriseBean(e2)) || ((e1 instanceof IFile) && (e2 instanceof IFile));
- }
-
-
-}
diff --git a/plugins/org.eclipse.jst.j2ee.ui/j2ee_ui/org/eclipse/jst/j2ee/internal/plugin/UIProjectUtilities.java b/plugins/org.eclipse.jst.j2ee.ui/j2ee_ui/org/eclipse/jst/j2ee/internal/plugin/UIProjectUtilities.java
deleted file mode 100644
index deb4f97..0000000
--- a/plugins/org.eclipse.jst.j2ee.ui/j2ee_ui/org/eclipse/jst/j2ee/internal/plugin/UIProjectUtilities.java
+++ /dev/null
@@ -1,154 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2003, 2006 IBM Corporation and others.
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
- *
- * Contributors:
- * IBM Corporation - initial API and implementation
- *******************************************************************************/
-/*
- * Created on Feb 2, 2004
- *
- * To change the template for this generated file go to
- * Window - Preferences - Java - Code Generation - Code and Comments
- */
-package org.eclipse.jst.j2ee.internal.plugin;
-
-import java.util.ArrayList;
-import java.util.Iterator;
-import java.util.List;
-
-import org.eclipse.core.resources.IFile;
-import org.eclipse.core.resources.IProject;
-import org.eclipse.core.runtime.CoreException;
-import org.eclipse.core.runtime.IAdaptable;
-import org.eclipse.emf.ecore.EObject;
-import org.eclipse.emf.edit.provider.ItemProvider;
-import org.eclipse.jdt.core.IJavaElement;
-import org.eclipse.jem.util.emf.workbench.ProjectUtilities;
-import org.eclipse.jface.viewers.IStructuredSelection;
-
-/**
- * Utility class for retrieving the project from the specified selection
- */
-public class UIProjectUtilities {
-
- /**
- * @param selection
- * The current selection
- * @return The first project (regardless of nature) in the selection
- */
- public static IProject getSelectedProject(IStructuredSelection selection) {
- return getSelectedProject(selection, (String[]) null);
- }
-
- /**
- * @param selection
- * The current selection
- * @param expectedNatureId
- * The required Nature ID
- * @return The first project, only if the first project has the given nature
- */
- public static IProject getSelectedProject(IStructuredSelection selection, String expectedNatureId) {
- return getSelectedProject(selection, new String[] {expectedNatureId});
- }
-
- /**
- *
- * @param selection
- * The current selection
- * @param possibleNatureIds
- * A list of possible nature ids
- * @return The first project selected, only if it has AT LEAST ONE of the possible nature ids
- */
- public static IProject getSelectedProject(IStructuredSelection selection, String[] possibleNatureIds) {
- IProject[] projects = getAllSelectedProjects(selection, possibleNatureIds);
- if (projects == null || projects.length==0)
- return null;
- return projects[0];
- }
-
- /**
- *
- * @param selection
- * The current selection
- * @return All selected Projects, regardless of nature
- */
- public static IProject[] getAllSelectedProjects(IStructuredSelection selection) {
- return getAllSelectedProjects(selection, (String[]) null);
- }
-
- /**
- *
- * @param selection
- * The current selection
- * @param expectedNatureId
- * The expected nature id
- * @return All selected Projects which have the expected nature id
- */
- public static IProject[] getAllSelectedProjects(IStructuredSelection selection, String expectedNatureId) {
- return getAllSelectedProjects(selection, new String[] {expectedNatureId});
- }
-
- /**
- *
- * @param selection
- * The current selection
- * @param possibleNatureIds
- * a list of possible nature ids
- * @return All selected Projects which have AT LEAST ONE of the given nature ids
- */
- public static IProject[] getAllSelectedProjects(IStructuredSelection selection, String[] possibleNatureIds) {
- if (selection != null && !selection.isEmpty()) {
- Object obj = null;
- List projects = new ArrayList();
- Iterator selectionIterator = selection.iterator();
- while (selectionIterator.hasNext()) {
- obj = selectionIterator.next();
- IProject project = null;
- if (obj instanceof IProject)
- project = (IProject) obj;
- else if (obj instanceof IAdaptable) {
- project = (IProject) ((IAdaptable) obj).getAdapter(IProject.class);
- if (project == null) {
- //Check for IJavaElements.
- IJavaElement javaElement = (IJavaElement) ((IAdaptable) obj).getAdapter(IJavaElement.class);
- if (javaElement != null) {
- project = javaElement.getJavaProject().getProject();
- }
- }
- }
- // Selection may not be adaptable to a project so continue trying to get selected project
- if (project == null && obj instanceof EObject)
- project = ProjectUtilities.getProject((EObject) obj);
- else if (project == null && obj instanceof ItemProvider) {
- Object temp = ((ItemProvider) obj).getParent(EObject.class);
- if (temp != null && temp instanceof EObject)
- project = ProjectUtilities.getProject((EObject) temp);
- }
- else if (project == null && obj instanceof IFile)
- project = ProjectUtilities.getProject(obj);
-
- if (project != null && possibleNatureIds != null && possibleNatureIds.length > 0) {
- try {
- for (int i = 0; i < possibleNatureIds.length; i++)
- if (project.hasNature(possibleNatureIds[i]))
- projects.add(project);
- } catch (CoreException e) {
- //Ignore
- }
- }
-
- else
- projects.add(project);
- }
- IProject[] finalProjects = new IProject[projects.size()];
- projects.toArray(finalProjects);
- return finalProjects;
- }
- return new IProject[0];
- }
-
-}
diff --git a/plugins/org.eclipse.jst.j2ee.ui/j2ee_ui/org/eclipse/jst/j2ee/internal/provider/J2EEAdapterFactoryContentProvider.java b/plugins/org.eclipse.jst.j2ee.ui/j2ee_ui/org/eclipse/jst/j2ee/internal/provider/J2EEAdapterFactoryContentProvider.java
deleted file mode 100644
index 609bee6..0000000
--- a/plugins/org.eclipse.jst.j2ee.ui/j2ee_ui/org/eclipse/jst/j2ee/internal/provider/J2EEAdapterFactoryContentProvider.java
+++ /dev/null
@@ -1,138 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2003, 2005 IBM Corporation and others.
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
- *
- * Contributors:
- * IBM Corporation - initial API and implementation
- *******************************************************************************/
-package org.eclipse.jst.j2ee.internal.provider;
-
-
-
-import java.util.ArrayList;
-import java.util.Arrays;
-import java.util.List;
-
-import org.eclipse.emf.edit.provider.ITreeItemContentProvider;
-import org.eclipse.emf.edit.ui.provider.AdapterFactoryContentProvider;
-import org.eclipse.jface.viewers.IContentProvider;
-import org.eclipse.jface.viewers.Viewer;
-import org.eclipse.jst.j2ee.ejb.EnterpriseBean;
-import org.eclipse.jst.j2ee.internal.ejb.provider.GroupedEJBJarItemProvider;
-
-
-public class J2EEAdapterFactoryContentProvider extends AdapterFactoryContentProvider {
- protected MethodsProviderDelegate methodsProviderDelegate;
- protected static final Class ITreeItemContentProviderClass = ITreeItemContentProvider.class;
- protected List roots = new ArrayList();
-
- /**
- * J2EEAdapterFactoryContentProvider constructor comment.
- *
- * @param adapterFactory
- * org.eclipse.emf.common.notify.AdapterFactory
- */
- public J2EEAdapterFactoryContentProvider(org.eclipse.emf.common.notify.AdapterFactory adapterFactory) {
- super(adapterFactory);
- methodsProviderDelegate = new MethodsProviderDelegate(adapterFactory);
- }
-
- @Override
- public Object getParent(Object object) {
-
- if (MethodsProviderDelegate.providesContentFor(object))
- return methodsProviderDelegate.getParent(object);
-
- //Added so internalExpand() in AbstractTreeViewer knows that EJB's parent is now instance
- // of J2EEItemProvider
- //rather than EJBJar only if bean is root bean
- if (object instanceof EnterpriseBean && GroupedEJBJarItemProvider.isRootBean((EnterpriseBean) object)) {
- J2EEItemProvider provider = GroupedEJBJarItemProvider.getEJBItemProvider((EnterpriseBean) object);
- if (provider != null) {
- return provider;
- }
- }
-
- Object parent = super.getParent(object);
-
- // if (parent == null) {
- // if (object instanceof EObject)
- // return J2EERoot.instance().groupFor((EObject) object);
- // }
- return parent;
- }
-
- protected boolean isEMFEditObject(Object object) {
- ITreeItemContentProvider treeItemContentProvider = (ITreeItemContentProvider) adapterFactory.adapt(object, ITreeItemContentProviderClass);
- return treeItemContentProvider != null;
- }
-
- /*
- * @see ITreeContentProvider#getChildren(Object)
- */
- @Override
- public Object[] getChildren(Object parentElement) {
-
- if (MethodsProviderDelegate.providesContentFor(parentElement))
- return methodsProviderDelegate.getChildren(parentElement);
- else if (isEMFEditObject(parentElement))
- return super.getChildren(parentElement);
- else
- return null;
- }
-
- /*
- * @see IStructuredContentProvider#getElements(Object)
- */
- @Override
- public Object[] getElements(Object inputElement) {
- return getRoots(inputElement);
- // else if (MethodsProviderDelegate.providesContentFor(inputElement))
- // return methodsProviderDelegate.getChildren(inputElement);
- // return super.getElements(inputElement);
- }
-
- public Object[] getRoots(Object parent) {
- if (roots.isEmpty()) {
- Object[] j2eeGroups = super.getChildren(parent);
- roots.addAll(Arrays.asList(j2eeGroups));
- }
- return roots.toArray();
- }
-
- /*
- * @see ITreeContentProvider#hasChildren(Object)
- */
- @Override
- public boolean hasChildren(Object element) {
- if (MethodsProviderDelegate.providesContentFor(element))
- return methodsProviderDelegate.hasChildren(element);
- else if (isEMFEditObject(element))
- return super.hasChildren(element);
- else
- return false;
- }
-
- /**
- * @see IContentProvider#dispose()
- */
- @Override
- public void dispose() {
- super.dispose();
- if (methodsProviderDelegate != null)
- methodsProviderDelegate.dispose();
- }
-
- /**
- * @see org.eclipse.jface.viewers.IContentProvider#inputChanged(Viewer, Object, Object)
- */
- @Override
- public void inputChanged(Viewer aViewer, Object oldInput, Object newInput) {
- super.inputChanged(aViewer, oldInput, newInput);
- methodsProviderDelegate.inputChanged(aViewer, oldInput, newInput);
- }
-
-}
diff --git a/plugins/org.eclipse.jst.j2ee.ui/j2ee_ui/org/eclipse/jst/j2ee/internal/provider/J2EEAdapterFactoryLabelProvider.java b/plugins/org.eclipse.jst.j2ee.ui/j2ee_ui/org/eclipse/jst/j2ee/internal/provider/J2EEAdapterFactoryLabelProvider.java
deleted file mode 100644
index e50d06f..0000000
--- a/plugins/org.eclipse.jst.j2ee.ui/j2ee_ui/org/eclipse/jst/j2ee/internal/provider/J2EEAdapterFactoryLabelProvider.java
+++ /dev/null
@@ -1,104 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2003, 2006 IBM Corporation and others.
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
- *
- * Contributors:
- * IBM Corporation - initial API and implementation
- *******************************************************************************/
-package org.eclipse.jst.j2ee.internal.provider;
-
-
-import java.io.File;
-import java.net.URL;
-
-import org.eclipse.core.resources.IFile;
-import org.eclipse.emf.common.notify.Notification;
-import org.eclipse.emf.ecore.EStructuralFeature;
-import org.eclipse.emf.edit.provider.IItemLabelProvider;
-import org.eclipse.emf.edit.ui.provider.AdapterFactoryLabelProvider;
-import org.eclipse.jface.resource.ImageDescriptor;
-import org.eclipse.jst.j2ee.common.CommonPackage;
-import org.eclipse.jst.j2ee.common.internal.util.CommonUtil;
-import org.eclipse.jst.j2ee.ejb.internal.impl.EjbFactoryImpl;
-import org.eclipse.jst.j2ee.internal.ejb.provider.AbstractMethodsContentProvider;
-import org.eclipse.jst.j2ee.internal.ejb.provider.J2EEJavaClassProviderHelper;
-import org.eclipse.jst.j2ee.internal.plugin.J2EEPlugin;
-import org.eclipse.jst.j2ee.internal.plugin.J2EEUIMessages;
-import org.eclipse.swt.graphics.Image;
-import org.eclipse.ui.model.WorkbenchLabelProvider;
-
-/**
- * Insert the type's description here. Creation date: (6/20/2001 10:40:41 PM)
- *
- * @author: Administrator
- */
-public class J2EEAdapterFactoryLabelProvider extends AdapterFactoryLabelProvider {
- // //$NON-NLS-1$
- protected static final Class IItemLabelProviderClass = IItemLabelProvider.class;
- private static final EStructuralFeature ROLE_NAME_SF = CommonPackage.eINSTANCE.getSecurityRole_RoleName();
- private static final EStructuralFeature ROLES_SF = EjbFactoryImpl.getPackage().getMethodPermission_Roles();
-
-
- /**
- * This is used for delegation to get labels for server objects, which don't fit into EMF edit
- */
- protected WorkbenchLabelProvider wbLabelProvider;
-
- public J2EEAdapterFactoryLabelProvider(org.eclipse.emf.common.notify.AdapterFactory adapterFactory) {
- super(adapterFactory);
- wbLabelProvider = new WorkbenchLabelProvider();
- }
-
- @Override
- public Image getImage(Object object) {
- if (object instanceof J2EEJavaClassProviderHelper)
- return ((J2EEJavaClassProviderHelper) object).getImage();
- else if (isEMFEditObject(object))
- return super.getImage(object);
- else if (object instanceof AbstractMethodsContentProvider.EJBMethodItem)
- return super.getImage(((AbstractMethodsContentProvider.EJBMethodItem) object).ejb);
- else if (object instanceof File) {
- URL url = (URL) J2EEPlugin.getPlugin().getImage("jar_obj"); //$NON-NLS-1$
- return ImageDescriptor.createFromURL(url).createImage();
- }
- return wbLabelProvider.getImage(object);
- }
-
- @Override
- public String getText(Object object) {
-
- if (object instanceof J2EEJavaClassProviderHelper)
- return ((J2EEJavaClassProviderHelper) object).getText();
- else if (isEMFEditObject(object)) {
- if (CommonUtil.isDeploymentDescriptorRoot(object))
- return J2EEUIMessages.getResourceString("Deployment_Descriptor_UI_") + ": " + super.getText(object); //$NON-NLS-1$ //$NON-NLS-2$
- return super.getText(object);
- } else if (object instanceof AbstractMethodsContentProvider.EJBMethodItem)
- return super.getText(((AbstractMethodsContentProvider.EJBMethodItem) object).ejb);
- else if (object instanceof IFile) {
- return ((IFile) object).getName();
- } else if (object instanceof File) {
- return ((File)object).getName();
- }
- return wbLabelProvider.getText(object);
- }
-
- protected boolean isEMFEditObject(Object object) {
- IItemLabelProvider itemLabelProvider = (IItemLabelProvider) adapterFactory.adapt(object, IItemLabelProviderClass);
- return itemLabelProvider != null;
- }
-
- /*
- * @see INotifyChangedListener#notifyChanged(new ENotificationImpl((InternalEObject)Object,
- * int,(EStructuralFeature) Object, Object, Object, int))
- */
- @Override
- public void notifyChanged(Notification notification) {
- Object feature = notification.getFeature();
- if (feature == ROLE_NAME_SF || feature == ROLES_SF)
- fireLabelProviderChanged();
- }
-}
diff --git a/plugins/org.eclipse.jst.j2ee.ui/j2ee_ui/org/eclipse/jst/j2ee/internal/provider/J2EEApplicationItemProvider.java b/plugins/org.eclipse.jst.j2ee.ui/j2ee_ui/org/eclipse/jst/j2ee/internal/provider/J2EEApplicationItemProvider.java
deleted file mode 100644
index 9d2705a..0000000
--- a/plugins/org.eclipse.jst.j2ee.ui/j2ee_ui/org/eclipse/jst/j2ee/internal/provider/J2EEApplicationItemProvider.java
+++ /dev/null
@@ -1,197 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2003, 2007 IBM Corporation and others.
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
- *
- * Contributors:
- * IBM Corporation - initial API and implementation
- *******************************************************************************/
-package org.eclipse.jst.j2ee.internal.provider;
-
-
-import java.util.ArrayList;
-import java.util.Collection;
-import java.util.HashMap;
-import java.util.List;
-import java.util.Map;
-
-import org.eclipse.core.resources.IProject;
-import org.eclipse.core.resources.IResource;
-import org.eclipse.core.runtime.IAdaptable;
-import org.eclipse.emf.common.notify.AdapterFactory;
-import org.eclipse.emf.common.notify.Notification;
-import org.eclipse.emf.common.notify.impl.AdapterImpl;
-import org.eclipse.emf.ecore.resource.Resource;
-import org.eclipse.jst.j2ee.application.Application;
-import org.eclipse.jst.j2ee.application.ApplicationPackage;
-import org.eclipse.jst.j2ee.application.internal.impl.ApplicationFactoryImpl;
-import org.eclipse.jst.j2ee.internal.application.provider.ApplicationItemProvider;
-import org.eclipse.jst.j2ee.internal.ejb.provider.J2EENotificationImpl;
-
-public class J2EEApplicationItemProvider extends ApplicationItemProvider implements IAdaptable {
-
- protected static final Class IRESOURCE_CLASS = IResource.class;
- protected static final Class IPROJECT_CLASS = IProject.class;
-
- protected Map children = new HashMap();
- protected List resourceAdapters = null;
-
- /**
- * Constructor for J2EEApplicationItemProvider.
- *
- * @param adapterFactory
- */
- public J2EEApplicationItemProvider(AdapterFactory adapterFactory) {
- super(adapterFactory);
- }
-
- /**
- * @see org.eclipse.emf.edit.provider.ItemProviderAdapter#getChildren(Object)
- */
- @Override
- public Collection getChildren(Object object) {
- List localChildren = (List) children.get(object);
- if (localChildren == null)
- return initChildren(object);
- return localChildren;
- }
-
- protected List initChildren(Object object) {
- Application app = (Application) object;
- List localChildren = new ArrayList(2);
- // MDE: changed getParent(object) to just app
- localChildren.add(new ModulesItemProvider(getAdapterFactory(), null, null, app));
-
- // IProject project = ProjectUtilities.getProject(app);
- // IVirtualComponent ear = ComponentUtilities.findComponent(app);
- // TODO switch to retrieve referenceComponents
- // EAREditModel editModel = null;
- // try {
- // EARNatureRuntime runtime = EARNatureRuntime.getRuntime(project);
- // if (runtime != null) {
- // editModel = runtime.getEarEditModelForRead(this);
- // EARProjectMap map = editModel.getEARProjectMap();
- // localChildren.add(map);
- // map.eResource().eAdapters().add(getNewAdapter(app));
- // }
- // } finally {
- // if (editModel != null)
- // editModel.releaseAccess(this);
- // }
- localChildren.add(new J2EEUtilityJarItemProvider(app, getAdapterFactory(), this));
-
- children.put(object, localChildren);
- return localChildren;
- }
-
- protected ModulesItemProvider getModulesNode(Object object) {
- return (ModulesItemProvider) ((List) getChildren(object)).get(0);
- }
-
-
- /**
- * @see Adapter#notifyChanged(new ENotificationImpl((InternalEObject)Notifier,
- * int,(EStructuralFeature) EObject, Object, Object, int))
- * @deprecated
- */
- @Override
- public void notifyChanged(Notification notification) {
- switch (notification.getFeatureID(Application.class)) {
- case ApplicationPackage.APPLICATION__MODULES :
- break;
- default :
- super.notifyChanged(notification);
- }
- if (notification.getEventType() == Notification.REMOVING_ADAPTER && notification.getOldValue() == this)
- children.remove(notification.getNotifier());
- else if (notification.getFeature() == ApplicationFactoryImpl.getPackage().getApplication_Modules())
- modulesChanged((Application) notification.getNotifier(), notification.getEventType(), notification.getOldValue(), notification.getNewValue(), notification.getPosition());
- }
-
- protected void modulesChanged(Application app, int eventType, Object oldValue, Object newValue, int pos) {
- ModulesItemProvider provider = getModulesNode(app);
- Collection grandChildren = provider.getChildren();
- switch (eventType) {
- case Notification.ADD : {
- grandChildren.add(newValue);
- break;
- }
- case Notification.ADD_MANY : {
- grandChildren.addAll((Collection) newValue);
- break;
- }
- case Notification.REMOVE : {
- grandChildren.remove(oldValue);
- break;
- }
- case Notification.REMOVE_MANY : {
- grandChildren.removeAll((Collection) oldValue);
- break;
- }
- }
- }
-
- /*
- * (non-Javadoc)
- *
- * @see org.eclipse.emf.edit.provider.ItemProviderAdapter#dispose()
- */
- @Override
- public void dispose() {
- super.dispose();
- List adapters = getResourceAdapters();
- ResourceAdapter adapter = null;
- for (int i = 0; i < adapters.size(); i++) {
- adapter = (ResourceAdapter) adapters.get(i);
- adapter.getTarget().eAdapters().remove(adapter);
- }
- }
-
- protected class ResourceAdapter extends AdapterImpl {
-
- private Application app = null;
-
- public ResourceAdapter(Application app) {
- this.app = app;
- }
-
- @Override
- public void notifyChanged(Notification notification) {
-
- Resource res = (Resource) notification.getNotifier();
- if (notification.getEventType() == Notification.SET && notification.getFeatureID(null) == Resource.RESOURCE__IS_LOADED && !res.isLoaded()) {
- J2EEApplicationItemProvider.this.children.remove(app);
- res.eAdapters().remove(ResourceAdapter.this);
- fireNotifyChanged(new J2EENotificationImpl(app, Notification.MOVE, (Object) null, (Object) null, 0));
-
- }
- }
- }
-
- protected ResourceAdapter getNewAdapter(Application key) {
- ResourceAdapter adapter = new ResourceAdapter(key);
- getResourceAdapters().add(adapter);
- return adapter;
- }
-
- /**
- * @return Returns the resourceAdapters.
- */
- protected List getResourceAdapters() {
- if (resourceAdapters == null)
- resourceAdapters = new ArrayList();
- return resourceAdapters;
- }
-
- /*
- * (non-Javadoc)
- *
- * @see org.eclipse.core.runtime.IAdaptable#getAdapter(java.lang.Class)
- */
- public Object getAdapter(Class adapter) {
- return null;
- }
-
-}
diff --git a/plugins/org.eclipse.jst.j2ee.ui/j2ee_ui/org/eclipse/jst/j2ee/internal/provider/J2EEApplicationItemProviderAdapterFactory.java b/plugins/org.eclipse.jst.j2ee.ui/j2ee_ui/org/eclipse/jst/j2ee/internal/provider/J2EEApplicationItemProviderAdapterFactory.java
deleted file mode 100644
index 1df4baf..0000000
--- a/plugins/org.eclipse.jst.j2ee.ui/j2ee_ui/org/eclipse/jst/j2ee/internal/provider/J2EEApplicationItemProviderAdapterFactory.java
+++ /dev/null
@@ -1,35 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2003, 2005 IBM Corporation and others.
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
- *
- * Contributors:
- * IBM Corporation - initial API and implementation
- *******************************************************************************/
-package org.eclipse.jst.j2ee.internal.provider;
-
-
-import org.eclipse.emf.common.notify.Adapter;
-import org.eclipse.jst.j2ee.internal.application.provider.ApplicationItemProviderAdapterFactory;
-
-
-public class J2EEApplicationItemProviderAdapterFactory extends ApplicationItemProviderAdapterFactory {
-
- /**
- * Constructor for J2EEApplicationAdapterFactory.
- */
- public J2EEApplicationItemProviderAdapterFactory() {
- super();
- }
-
- /**
- * @see ApplicationAdapterFactory#createApplicationAdapter()
- */
- @Override
- public Adapter createApplicationAdapter() {
- return new J2EEApplicationItemProvider(this);
- }
-
-}
diff --git a/plugins/org.eclipse.jst.j2ee.ui/j2ee_ui/org/eclipse/jst/j2ee/internal/provider/J2EEBinaryModulesItemProvider.java b/plugins/org.eclipse.jst.j2ee.ui/j2ee_ui/org/eclipse/jst/j2ee/internal/provider/J2EEBinaryModulesItemProvider.java
deleted file mode 100644
index 86ae2a2..0000000
--- a/plugins/org.eclipse.jst.j2ee.ui/j2ee_ui/org/eclipse/jst/j2ee/internal/provider/J2EEBinaryModulesItemProvider.java
+++ /dev/null
@@ -1,36 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2003, 2006 IBM Corporation and others.
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
- *
- * Contributors:
- * IBM Corporation - initial API and implementation
- *******************************************************************************/
-package org.eclipse.jst.j2ee.internal.provider;
-
-import java.util.Collection;
-
-import org.eclipse.emf.common.notify.AdapterFactory;
-import org.eclipse.jst.j2ee.application.Application;
-import org.eclipse.jst.j2ee.internal.plugin.J2EEPlugin;
-import org.eclipse.jst.j2ee.internal.plugin.J2EEUIMessages;
-
-public class J2EEBinaryModulesItemProvider extends J2EEItemProvider {
-
- public J2EEBinaryModulesItemProvider(Application app, AdapterFactory adapterFactory, Collection children) {
- super(adapterFactory, children);
- }
-
- @Override
- public String getText(Object obj) {
- return J2EEUIMessages.BINARY;
- }
-
- @Override
- public Object getImage(Object object) {
- return J2EEPlugin.getPlugin().getImage("folder"); //$NON-NLS-1$
- }
-
-}
diff --git a/plugins/org.eclipse.jst.j2ee.ui/j2ee_ui/org/eclipse/jst/j2ee/internal/provider/J2EEEditingDomain.java b/plugins/org.eclipse.jst.j2ee.ui/j2ee_ui/org/eclipse/jst/j2ee/internal/provider/J2EEEditingDomain.java
deleted file mode 100644
index a0da2f9..0000000
--- a/plugins/org.eclipse.jst.j2ee.ui/j2ee_ui/org/eclipse/jst/j2ee/internal/provider/J2EEEditingDomain.java
+++ /dev/null
@@ -1,153 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2003, 2004 IBM Corporation and others.
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
- *
- * Contributors:
- * IBM Corporation - initial API and implementation
- *******************************************************************************/
-package org.eclipse.jst.j2ee.internal.provider;
-
-
-import org.eclipse.emf.common.command.Command;
-import org.eclipse.emf.common.command.CommandStack;
-import org.eclipse.emf.edit.command.AddCommand;
-import org.eclipse.emf.edit.command.CopyToClipboardCommand;
-import org.eclipse.emf.edit.command.CreateCopyCommand;
-import org.eclipse.emf.edit.command.DragAndDropCommand;
-import org.eclipse.emf.edit.command.InitializeCopyCommand;
-import org.eclipse.emf.edit.command.MoveCommand;
-import org.eclipse.emf.edit.command.OverrideableCommand;
-import org.eclipse.emf.edit.command.PasteFromClipboardCommand;
-import org.eclipse.emf.edit.command.RemoveCommand;
-import org.eclipse.emf.edit.command.ReplaceCommand;
-import org.eclipse.emf.edit.command.SetCommand;
-import org.eclipse.emf.edit.domain.AdapterFactoryEditingDomain;
-
-/**
- * Custom editing domain which provides hooks for creating override commands; should not be used
- * directly but can be subclassed to override commands as necessary. All the override methods by
- * default return null, so a subclass may override only a subset of the commands.
- */
-public class J2EEEditingDomain extends AdapterFactoryEditingDomain {
- /**
- * J2EEEditingDomain constructor comment.
- *
- * @param adapterFactory
- * org.eclipse.emf.common.notify.AdapterFactory
- * @param commandStack
- * CommandStack
- */
- public J2EEEditingDomain(org.eclipse.emf.common.notify.AdapterFactory adapterFactory, CommandStack commandStack) {
- super(adapterFactory, commandStack);
- }
-
- /**
- * The default is not to override this command; subclasses can override if necessary
- */
- protected Command createAddOverrideCommand(AddCommand addCommand) {
- return null;
- }
-
- /**
- * The default is not to override this command; subclasses can override if necessary
- */
- protected Command createCopyToClipboardOverrideCommand(CopyToClipboardCommand copyToClipboardCommand) {
- return null;
- }
-
- /**
- * The default is not to override this command; subclasses can override if necessary
- */
- protected Command createCreateCopyOverrideCommand(CreateCopyCommand createCopyCommand) {
- return null;
- }
-
- /**
- * The default is not to override this command; subclasses can override if necessary
- */
- protected Command createDragAndDropOverrideCommand(DragAndDropCommand dragAndDropCommand) {
- return null;
- }
-
- /**
- * The default is not to override this command; subclasses can override if necessary
- */
- protected Command createInitializeCopyOverrideCommand(InitializeCopyCommand initializeCopyCommand) {
- return null;
- }
-
- /**
- * The default is not to override this command; subclasses can override if necessary
- */
- protected Command createMoveOverrideCommand(MoveCommand moveCommand) {
- return null;
- }
-
- @Override
- public Command createOverrideCommand(OverrideableCommand command) {
- if (command instanceof AddCommand) {
- AddCommand addCommand = (AddCommand) command;
- return createAddOverrideCommand(addCommand);
- } else if (command instanceof RemoveCommand) {
- RemoveCommand removeCommand = (RemoveCommand) command;
- return createRemoveOverrideCommand(removeCommand);
- } else if (command instanceof SetCommand) {
- SetCommand setCommand = (SetCommand) command;
- return createSetOverrideCommand(setCommand);
- } else if (command instanceof ReplaceCommand) {
- ReplaceCommand replaceCommand = (ReplaceCommand) command;
- return createReplaceOverrideCommand(replaceCommand);
- } else if (command instanceof MoveCommand) {
- MoveCommand moveCommand = (MoveCommand) command;
- return createMoveOverrideCommand(moveCommand);
- } else if (command instanceof CreateCopyCommand) {
- CreateCopyCommand createCopyCommand = (CreateCopyCommand) command;
- return createCreateCopyOverrideCommand(createCopyCommand);
- } else if (command instanceof InitializeCopyCommand) {
- InitializeCopyCommand initializeCopyCommand = (InitializeCopyCommand) command;
- return createInitializeCopyOverrideCommand(initializeCopyCommand);
- } else if (command instanceof CopyToClipboardCommand) {
- CopyToClipboardCommand copyToClipboardCommand = (CopyToClipboardCommand) command;
- return createCopyToClipboardOverrideCommand(copyToClipboardCommand);
- } else if (command instanceof PasteFromClipboardCommand) {
- PasteFromClipboardCommand pasteFromClipboardCommand = (PasteFromClipboardCommand) command;
- return createPasteFromClipboardOverrideCommand(pasteFromClipboardCommand);
- } else if (command instanceof DragAndDropCommand) {
- DragAndDropCommand dragAndDropCommand = (DragAndDropCommand) command;
- return createDragAndDropOverrideCommand(dragAndDropCommand);
- } else {
- return null;
- }
- }
-
- /**
- * The default is not to override this command; subclasses can override if necessary
- */
- protected Command createPasteFromClipboardOverrideCommand(PasteFromClipboardCommand pasteFromClipboardCommand) {
- return null;
- }
-
- /**
- * The default is not to override this command; subclasses can override if necessary
- */
- protected Command createRemoveOverrideCommand(RemoveCommand removeCommand) {
- return null;
- }
-
- /**
- * The default is not to override this command; subclasses can override if necessary
- */
- protected Command createReplaceOverrideCommand(ReplaceCommand replaceCommand) {
- return null;
- }
-
- /**
- * The default is not to override this command; subclasses can override if necessary
- */
- protected Command createSetOverrideCommand(SetCommand setCommand) {
- return null;
- }
-}
\ No newline at end of file
diff --git a/plugins/org.eclipse.jst.j2ee.ui/j2ee_ui/org/eclipse/jst/j2ee/internal/provider/J2EEProviderUtility.java b/plugins/org.eclipse.jst.j2ee.ui/j2ee_ui/org/eclipse/jst/j2ee/internal/provider/J2EEProviderUtility.java
deleted file mode 100644
index 3839ba3..0000000
--- a/plugins/org.eclipse.jst.j2ee.ui/j2ee_ui/org/eclipse/jst/j2ee/internal/provider/J2EEProviderUtility.java
+++ /dev/null
@@ -1,38 +0,0 @@
-/***************************************************************************************************
- * Copyright (c) 2003, 2004 IBM Corporation and others. All rights reserved. This program and the
- * accompanying materials are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
- *
- * Contributors: IBM Corporation - initial API and implementation
- **************************************************************************************************/
-package org.eclipse.jst.j2ee.internal.provider;
-
-
-import org.eclipse.core.resources.IProject;
-import org.eclipse.emf.ecore.EObject;
-import org.eclipse.wst.common.internal.emfworkbench.WorkbenchResourceHelper;
-
-public class J2EEProviderUtility {
-
- private J2EEProviderUtility() {
- super();
- }
-
- public static String prependProjectName(EObject object, String label) {
- String projectName = null;
- if (object.eResource() != null) {
- IProject proj = WorkbenchResourceHelper.getProject(object.eResource());
- if (proj != null)
- projectName = proj.getName();
- }
-
- if (projectName == null || projectName.equals(label))
- return label;
- else if (label == null || label.length() == 0)
- return projectName;
- else
- return projectName + ": " + label; //$NON-NLS-1$
- }
-
-}
\ No newline at end of file
diff --git a/plugins/org.eclipse.jst.j2ee.ui/j2ee_ui/org/eclipse/jst/j2ee/internal/provider/J2EEUIEditingDomain.java b/plugins/org.eclipse.jst.j2ee.ui/j2ee_ui/org/eclipse/jst/j2ee/internal/provider/J2EEUIEditingDomain.java
deleted file mode 100644
index fd92251..0000000
--- a/plugins/org.eclipse.jst.j2ee.ui/j2ee_ui/org/eclipse/jst/j2ee/internal/provider/J2EEUIEditingDomain.java
+++ /dev/null
@@ -1,77 +0,0 @@
-/***************************************************************************************************
- * Copyright (c) 2003, 2004 IBM Corporation and others. All rights reserved. This program and the
- * accompanying materials are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
- *
- * Contributors: IBM Corporation - initial API and implementation
- **************************************************************************************************/
-package org.eclipse.jst.j2ee.internal.provider;
-
-
-import org.eclipse.emf.common.command.Command;
-import org.eclipse.emf.common.command.CommandStack;
-import org.eclipse.emf.ecore.EObject;
-import org.eclipse.emf.edit.command.CopyToClipboardCommand;
-import org.eclipse.emf.edit.command.PasteFromClipboardCommand;
-import org.eclipse.emf.edit.command.RemoveCommand;
-import org.eclipse.jst.j2ee.internal.command.J2EEClipboard;
-import org.eclipse.jst.j2ee.internal.command.J2EECopyToClipboardOverrideCommand;
-import org.eclipse.jst.j2ee.internal.command.J2EEPasteFromClipboardOverrideCommand;
-import org.eclipse.jst.j2ee.internal.command.J2EERemoveOverrideCommand;
-
-
-public class J2EEUIEditingDomain extends J2EEEditingDomain {
- /**
- * J2EEUIEditingDomain constructor comment.
- *
- * @param adapterFactory
- * org.eclipse.emf.common.notify.AdapterFactory
- * @param commandStack
- * CommandStack
- */
- public J2EEUIEditingDomain(org.eclipse.emf.common.notify.AdapterFactory adapterFactory, CommandStack commandStack) {
- super(adapterFactory, commandStack);
- turnTraceOnIfDebugging();
- }
-
- @Override
- protected Command createCopyToClipboardOverrideCommand(CopyToClipboardCommand copyToClipboardCommand) {
-
- if (copyToClipboardCommand instanceof J2EECopyToClipboardOverrideCommand)
- return null;
- return new J2EECopyToClipboardOverrideCommand(copyToClipboardCommand);
- }
-
- @Override
- protected Command createPasteFromClipboardOverrideCommand(PasteFromClipboardCommand pasteFromClipboardCommand) {
- if (pasteFromClipboardCommand instanceof J2EEPasteFromClipboardOverrideCommand)
- return null;
- if (!(getClipboard() instanceof J2EEClipboard))
- return null;
- return new J2EEPasteFromClipboardOverrideCommand(pasteFromClipboardCommand);
- }
-
- @Override
- protected Command createRemoveOverrideCommand(RemoveCommand removeCommand) {
- return new J2EERemoveOverrideCommand(removeCommand);
- }
-
- public J2EEClipboard getJ2EEClipboard() {
- return (J2EEClipboard) getClipboard();
- }
-
- @Override
- public Object getParent(Object object) {
- Object parent = super.getParent(object);
- if (parent != null)
- return parent;
- if (object instanceof EObject)
- return ((EObject) object).eContainer();
- return null;
- }
-
- protected void turnTraceOnIfDebugging() {
- //AbstractCommand.Trace.enable();
- }
-}
\ No newline at end of file
diff --git a/plugins/org.eclipse.jst.j2ee.ui/j2ee_ui/org/eclipse/jst/j2ee/internal/provider/J2EEUtilityJarItemProvider.java b/plugins/org.eclipse.jst.j2ee.ui/j2ee_ui/org/eclipse/jst/j2ee/internal/provider/J2EEUtilityJarItemProvider.java
deleted file mode 100644
index 583452f..0000000
--- a/plugins/org.eclipse.jst.j2ee.ui/j2ee_ui/org/eclipse/jst/j2ee/internal/provider/J2EEUtilityJarItemProvider.java
+++ /dev/null
@@ -1,307 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2003, 2007 IBM Corporation and others.
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
- *
- * Contributors:
- * IBM Corporation - initial API and implementation
- *******************************************************************************/
-package org.eclipse.jst.j2ee.internal.provider;
-
-import java.util.ArrayList;
-import java.util.Collection;
-import java.util.HashMap;
-import java.util.List;
-import java.util.Map;
-
-import org.eclipse.core.resources.IFile;
-import org.eclipse.core.resources.IProject;
-import org.eclipse.core.resources.IResource;
-import org.eclipse.core.resources.IResourceChangeEvent;
-import org.eclipse.core.resources.IResourceChangeListener;
-import org.eclipse.core.resources.IResourceDelta;
-import org.eclipse.core.resources.IResourceDeltaVisitor;
-import org.eclipse.core.resources.ResourcesPlugin;
-import org.eclipse.core.runtime.CoreException;
-import org.eclipse.emf.common.notify.AdapterFactory;
-import org.eclipse.jem.util.emf.workbench.ProjectUtilities;
-import org.eclipse.jem.util.emf.workbench.WorkbenchResourceHelperBase;
-import org.eclipse.jst.j2ee.application.Application;
-import org.eclipse.jst.j2ee.componentcore.util.EARArtifactEdit;
-import org.eclipse.jst.j2ee.internal.plugin.IJ2EEModuleConstants;
-import org.eclipse.jst.j2ee.internal.plugin.J2EEPlugin;
-import org.eclipse.jst.j2ee.internal.plugin.J2EEUIMessages;
-import org.eclipse.jst.j2ee.internal.plugin.J2EEUIPlugin;
-import org.eclipse.jst.j2ee.project.JavaEEProjectUtilities;
-import org.eclipse.wst.common.componentcore.internal.util.ComponentUtilities;
-import org.eclipse.wst.common.componentcore.internal.util.IModuleConstants;
-import org.eclipse.wst.common.componentcore.resources.IVirtualComponent;
-import org.eclipse.wst.common.componentcore.resources.IVirtualReference;
-
-/**
- * @author jsholl
- *
- * To change this generated comment edit the template variable "typecomment":
- * Window>Preferences>Java>Templates. To enable and disable the creation of type comments go to
- * Window>Preferences>Java>Code Generation.
- */
-public class J2EEUtilityJarItemProvider extends J2EEItemProvider {
-
- public final static String UTILITY_JARS = J2EEUIMessages.getResourceString("Utility_JARs_UI_"); //$NON-NLS-1$
-
- private boolean childrenLoaded = false;
- private Application application = null;
-
- /**
- * Constructor for J2EEUtilityJarItemProvider.
- */
- public J2EEUtilityJarItemProvider(Application app, AdapterFactory adapterFactory, Object parent) {
- super(adapterFactory);
- setParent(parent);
- application = app;
- UtilityJarResourceChangeListener.INSTANCE.addUtilityJarItemProvider(ProjectUtilities.getProject(application), this);
- }
-
- @Override
- public boolean hasChildren(Object object) {
- getChildren(object);
- return !children.isEmpty();
- }
-
- @Override
- public Collection getChildren(final Object object) {
- if (!childrenLoaded) {
- try {
- disableNotification();
- org.eclipse.swt.custom.BusyIndicator.showWhile(null, new Runnable() {
- public void run() {
- computeChildren();
- }
- });
- } finally {
- enableNotification();
- }
- }
- return children;
- }
-
- /*
- * (non-Javadoc)
- *
- * @see org.eclipse.emf.edit.provider.ItemProvider#dispose()
- */
- @Override
- public void dispose() {
- super.dispose();
- UtilityJarResourceChangeListener.INSTANCE.removeUtilityJarItemProvider(ProjectUtilities.getProject(application), this);
-
- }
-
- /**
- * @see org.eclipse.emf.edit.provider.ItemProvider#getChildren(Object)
- */
- private void computeChildren() {
- childrenLoaded = true;
- IVirtualComponent ear = ComponentUtilities.findComponent(application);
- if (ear != null) {
- EARArtifactEdit earEdit = null;
- try {
- earEdit = EARArtifactEdit.getEARArtifactEditForRead(ear);
- IVirtualReference[] modules = earEdit.getUtilityModuleReferences();
- for (int i = 0; i < modules.length; i++) {
- IVirtualComponent module = modules[i].getReferencedComponent();
- if (module.isBinary()) {
- IFile utilityJar = (IFile)module.getAdapter(IFile.class);
- if (utilityJar != null)
- children.add(utilityJar);
- else {
- java.io.File diskFile = (java.io.File)module.getAdapter(java.io.File.class);
- if (diskFile.exists())
- children.add(diskFile);
- }
- }
- if (module.getProject() == null || !module.getProject().isAccessible())
- continue;
- // return only jars for utility components
- if (JavaEEProjectUtilities.isUtilityProject(module.getProject())) {
- IProject project = ProjectUtilities.getProject(application);
- if (project == null)
- continue;
- // we will assume the component name is in synch with the module uri
- IFile utilityJar = project.getFile(module.getName() + IJ2EEModuleConstants.JAR_EXT);
- if (utilityJar != null) {
- if (utilityJar.exists())
- children.add(utilityJar);
- else
- children.add(new UtilityModuleProjectItemProvider(getAdapterFactory(),module.getProject(),this));
- }
-
- }
- }
- } finally {
- if (earEdit != null) {
- earEdit.dispose();
- }
- }
- }
- }
-
- // private Collection getJars(List list, IResource[] members) {
- // for (int i = 0; i < members.length; i++) {
- // if (isJarFile(members[i])) {
- // list.add(members[i]);
- // } else if (members[i].getType() == IResource.FOLDER) {
- // try {
- // getJars(list, ((IFolder) members[i]).members());
- // } catch (CoreException e) {
- // Logger.getLogger().logError(e);
- // }
- // }
- // }
- // return list;
- // }
-
- public static boolean isJarFile(IResource member) {
- return member.getType() == IResource.FILE && member.getName().toLowerCase().endsWith(IJ2EEModuleConstants.JAR_EXT);
- }
-
- public static boolean isComponentFile(IResource member) {
- return member.getType() == IResource.FILE && member.getName().toLowerCase().endsWith(IModuleConstants.COMPONENT_FILE_NAME);
- }
-
-
- /**
- * @see org.eclipse.emf.edit.provider.ItemProviderAdapter#getImage(Object)
- */
- @Override
- public Object getImage(Object object) {
- return J2EEPlugin.getPlugin().getImage("folder"); //$NON-NLS-1$
- }
-
- /**
- * @see org.eclipse.emf.edit.provider.ItemProviderAdapter#getText(Object)
- */
- @Override
- public String getText(Object object) {
- return UTILITY_JARS;
- }
-
- // assume this resource is a jar resource
- public void utilityJarChanged(IResource resource, IResourceDelta delta) {
- if (childrenLoaded) {
- if (delta.getKind() == IResourceDelta.ADDED && !children.contains(resource)) {
- children.add(resource);
- } else if (delta.getKind() == IResourceDelta.REMOVED && children.contains(resource)) {
- children.remove(resource);
- }
- }
- }
-
- protected static class UtilityJarResourceChangeListener implements IResourceChangeListener, IResourceDeltaVisitor {
-
- protected static final UtilityJarResourceChangeListener INSTANCE = new UtilityJarResourceChangeListener();
-
- private boolean listening = false;
- private Map earProjectsToUtilityJarProviderMap;
-
- public void addUtilityJarItemProvider(IProject project, J2EEUtilityJarItemProvider utilityJarItemProvider) {
- List providers = getProviders(project);
- if (providers != null)
- providers.add(utilityJarItemProvider);
- if (!listening) {
- ResourcesPlugin.getWorkspace().addResourceChangeListener(this, IResourceChangeEvent.POST_CHANGE);
- listening = true;
- }
- }
-
- /**
- * @param project
- * @return
- */
- private List getProviders(IProject project) {
- List result = (List) getEarProjectsToUtilityJarProviderMap().get(project);
- if (result == null && project != null)
- getEarProjectsToUtilityJarProviderMap().put(project, (result = new ArrayList()));
- return result;
- }
-
- /**
- * @return
- */
- private Map getEarProjectsToUtilityJarProviderMap() {
- if (earProjectsToUtilityJarProviderMap == null)
- earProjectsToUtilityJarProviderMap = new HashMap();
- return earProjectsToUtilityJarProviderMap;
- }
-
- public void removeUtilityJarItemProvider(IProject project, J2EEUtilityJarItemProvider utilityJarItemProvider) {
- List providers = getProviders(project);
- providers.remove(utilityJarItemProvider);
- if (providers.isEmpty())
- getEarProjectsToUtilityJarProviderMap().remove(project);
-
- if (getEarProjectsToUtilityJarProviderMap().isEmpty()) {
- ResourcesPlugin.getWorkspace().removeResourceChangeListener(this);
- listening = false;
- }
- }
-
- /*
- * (non-Javadoc)
- *
- * @see org.eclipse.core.resources.IResourceChangeListener#resourceChanged(org.eclipse.core.resources.IResourceChangeEvent)
- */
- public void resourceChanged(IResourceChangeEvent event) {
- try {
- event.getDelta().accept(this);
- } catch (CoreException e) {
- J2EEUIPlugin.logError(e);
- }
- }
-
- /*
- * (non-Javadoc)
- *
- * @see org.eclipse.core.resources.IResourceDeltaVisitor#visit(org.eclipse.core.resources.IResourceDelta)
- */
- public boolean visit(IResourceDelta delta) {
- switch (delta.getResource().getType()) {
- case IResource.ROOT :
- case IResource.FOLDER :
- return true;
-
- case IResource.PROJECT :
- return getEarProjectsToUtilityJarProviderMap().containsKey(delta.getResource());
- case IResource.FILE : {
- IResource resource = delta.getResource();
- if (isComponentFile(resource)) {
- List utilityJarItemProviders = getProviders(resource.getProject());
- for (int i = 0; i < utilityJarItemProviders.size(); i++) {
- ((J2EEUtilityJarItemProvider) utilityJarItemProviders.get(i)).getChildren().clear();
- ((J2EEUtilityJarItemProvider) utilityJarItemProviders.get(i)).computeChildren();
- }
- }
- return false;
- }
-
- }
- return false;
- }
- }
-
- @Override
- public IFile getAssociatedFile() {
-
- try {
- if (application != null && application.eResource() != null) {
- return WorkbenchResourceHelperBase.getIFile(application.eResource().getURI());
- }
- } catch (Throwable t) {
-
- }
- return null;
- }
-
-}
diff --git a/plugins/org.eclipse.jst.j2ee.ui/j2ee_ui/org/eclipse/jst/j2ee/internal/provider/MethodsProviderDelegate.java b/plugins/org.eclipse.jst.j2ee.ui/j2ee_ui/org/eclipse/jst/j2ee/internal/provider/MethodsProviderDelegate.java
deleted file mode 100644
index 1200806..0000000
--- a/plugins/org.eclipse.jst.j2ee.ui/j2ee_ui/org/eclipse/jst/j2ee/internal/provider/MethodsProviderDelegate.java
+++ /dev/null
@@ -1,119 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2003, 2005 IBM Corporation and others.
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
- *
- * Contributors:
- * IBM Corporation - initial API and implementation
- *******************************************************************************/
-package org.eclipse.jst.j2ee.internal.provider;
-
-
-import org.eclipse.emf.common.notify.AdapterFactory;
-import org.eclipse.emf.ecore.EObject;
-import org.eclipse.jface.viewers.ITreeContentProvider;
-import org.eclipse.jface.viewers.Viewer;
-import org.eclipse.jst.j2ee.ejb.ExcludeList;
-import org.eclipse.jst.j2ee.ejb.MethodPermission;
-import org.eclipse.jst.j2ee.ejb.MethodTransaction;
-import org.eclipse.jst.j2ee.ejb.internal.impl.EjbFactoryImpl;
-import org.eclipse.jst.j2ee.internal.ejb.provider.AbstractMethodsContentProvider;
-import org.eclipse.jst.j2ee.internal.ejb.provider.ExcludeListContentProvider;
-import org.eclipse.jst.j2ee.internal.ejb.provider.MethodPermissionsContentProvider;
-import org.eclipse.jst.j2ee.internal.ejb.provider.MethodTransactionContentProvider;
-
-
-public class MethodsProviderDelegate implements ITreeContentProvider {
-
- protected ExcludeListContentProvider excludeListContentProvider;
- protected MethodPermissionsContentProvider methodPermissionsContentProvider;
- protected MethodTransactionContentProvider methodTransactionContentProvider;
-
- protected static EObject EL_META = EjbFactoryImpl.getPackage().getExcludeList();
- protected static EObject MP_META = EjbFactoryImpl.getPackage().getMethodPermission();
- protected static EObject MT_META = EjbFactoryImpl.getPackage().getMethodTransaction();
-
- public static boolean providesContentFor(Object object) {
- return object instanceof AbstractMethodsContentProvider.EJBMethodItem || object instanceof MethodPermission || object instanceof MethodTransaction || object instanceof ExcludeList;
- }
-
- public MethodsProviderDelegate(AdapterFactory adapterFactory) {
- super();
- excludeListContentProvider = new ExcludeListContentProvider(adapterFactory, false);
- methodPermissionsContentProvider = new MethodPermissionsContentProvider(adapterFactory, false);
- methodTransactionContentProvider = new MethodTransactionContentProvider(adapterFactory, false);
- }
-
- /**
- * @see org.eclipse.jface.viewers.IBaseLabelProvider#dispose()
- */
- public void dispose() {
- if (excludeListContentProvider != null)
- excludeListContentProvider.dispose();
- if (methodPermissionsContentProvider != null)
- methodPermissionsContentProvider.dispose();
- if (methodTransactionContentProvider != null)
- methodTransactionContentProvider.dispose();
- }
-
- public AbstractMethodsContentProvider getContentProvider(Object object) {
- EObject metaClass = null;
- if (object instanceof AbstractMethodsContentProvider.EJBMethodItem)
- metaClass = ((AbstractMethodsContentProvider.EJBMethodItem) object).refObject.eClass();
- else
- metaClass = ((EObject) object).eClass();
-
- if (metaClass == EL_META)
- return excludeListContentProvider;
- else if (metaClass == MP_META)
- return methodPermissionsContentProvider;
- else if (metaClass == MT_META)
- return methodTransactionContentProvider;
-
- return null;
- }
-
-
- /**
- * @see org.eclipse.jface.viewers.IContentProvider#inputChanged(Viewer, Object, Object)
- */
- public void inputChanged(Viewer viewer, Object oldInput, Object newInput) {
- excludeListContentProvider.inputChanged(viewer, oldInput, newInput);
- methodPermissionsContentProvider.inputChanged(viewer, oldInput, newInput);
- methodTransactionContentProvider.inputChanged(viewer, oldInput, newInput);
- }
-
- /**
- * @see org.eclipse.jface.viewers.ITreeContentProvider#getChildren(Object)
- */
- public Object[] getChildren(Object parentElement) {
- AbstractMethodsContentProvider prov = getContentProvider(parentElement);
- return prov == null ? null : prov.getChildren(parentElement);
- }
-
- /**
- * @see org.eclipse.jface.viewers.ITreeContentProvider#getParent(Object)
- */
- public Object getParent(Object element) {
- AbstractMethodsContentProvider prov = getContentProvider(element);
- return prov == null ? null : prov.getParent(element);
- }
-
- /**
- * @see org.eclipse.jface.viewers.ITreeContentProvider#hasChildren(Object)
- */
- public boolean hasChildren(Object element) {
- AbstractMethodsContentProvider prov = getContentProvider(element);
- return prov != null && prov.hasChildren(element);
- }
-
- /**
- * @see org.eclipse.jface.viewers.IStructuredContentProvider#getElements(Object)
- */
- public Object[] getElements(Object inputElement) {
- AbstractMethodsContentProvider prov = getContentProvider(inputElement);
- return prov == null ? null : prov.getElements(inputElement);
- }
-}
diff --git a/plugins/org.eclipse.jst.j2ee.ui/j2ee_ui/org/eclipse/jst/j2ee/internal/provider/ModulesItemProvider.java b/plugins/org.eclipse.jst.j2ee.ui/j2ee_ui/org/eclipse/jst/j2ee/internal/provider/ModulesItemProvider.java
deleted file mode 100644
index ec8f20a..0000000
--- a/plugins/org.eclipse.jst.j2ee.ui/j2ee_ui/org/eclipse/jst/j2ee/internal/provider/ModulesItemProvider.java
+++ /dev/null
@@ -1,296 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2003, 2007 IBM Corporation and others.
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
- *
- * Contributors:
- * IBM Corporation - initial API and implementation
- *******************************************************************************/
-package org.eclipse.jst.j2ee.internal.provider;
-
-
-import java.util.ArrayList;
-import java.util.Collection;
-import java.util.List;
-
-import org.eclipse.core.resources.IFile;
-import org.eclipse.core.runtime.Path;
-import org.eclipse.emf.common.notify.AdapterFactory;
-import org.eclipse.jem.util.emf.workbench.WorkbenchResourceHelperBase;
-import org.eclipse.jst.j2ee.application.Application;
-import org.eclipse.jst.j2ee.application.Module;
-import org.eclipse.jst.j2ee.internal.componentcore.JavaEEBinaryComponentHelper;
-import org.eclipse.jst.j2ee.internal.plugin.J2EEPlugin;
-import org.eclipse.jst.j2ee.internal.plugin.J2EEUIMessages;
-import org.eclipse.wst.common.componentcore.internal.util.ComponentUtilities;
-import org.eclipse.wst.common.componentcore.resources.IVirtualComponent;
-import org.eclipse.wst.common.componentcore.resources.IVirtualReference;
-
-public class ModulesItemProvider extends J2EEItemProvider {
- public static final String MODULES = J2EEUIMessages.getResourceString("Modules_UI_"); //$NON-NLS-1$
-
- /**
- * Constructor for ModulesItemProvider.
- */
- public ModulesItemProvider() {
- super();
- }
-
- /**
- * Constructor for ModulesItemProvider.
- *
- * @param children
- */
- public ModulesItemProvider(Collection children) {
- super(children);
- }
-
- /**
- * Constructor for ModulesItemProvider.
- *
- * @param text
- */
- public ModulesItemProvider(String text) {
- super(text);
- }
-
- /**
- * Constructor for ModulesItemProvider.
- *
- * @param text
- * @param children
- */
- public ModulesItemProvider(String text, Collection children) {
- super(text, children);
- }
-
- /**
- * Constructor for ModulesItemProvider.
- *
- * @param text
- * @param image
- */
- public ModulesItemProvider(String text, Object image) {
- super(text, image);
- }
-
- /**
- * Constructor for ModulesItemProvider.
- *
- * @param text
- * @param image
- * @param children
- */
- public ModulesItemProvider(String text, Object image, Collection children) {
- super(text, image, children);
- }
-
- /**
- * Constructor for ModulesItemProvider.
- *
- * @param text
- * @param image
- * @param parent
- */
- public ModulesItemProvider(String text, Object image, Object parent) {
- super(text, image, parent);
- }
-
- /**
- * Constructor for ModulesItemProvider.
- *
- * @param text
- * @param image
- * @param parent
- * @param children
- */
- public ModulesItemProvider(String text, Object image, Object parent, Collection children) {
- super(text, image, parent, children);
- }
-
- /**
- * Constructor for ModulesItemProvider.
- *
- * @param adapterFactory
- */
- public ModulesItemProvider(AdapterFactory adapterFactory) {
- super(adapterFactory);
- }
-
- /**
- * Constructor for ModulesItemProvider.
- *
- * @param adapterFactory
- * @param text
- */
- public ModulesItemProvider(AdapterFactory adapterFactory, String text) {
- super(adapterFactory, text);
- }
-
- /**
- * Constructor for ModulesItemProvider.
- *
- * @param adapterFactory
- * @param text
- * @param image
- */
- public ModulesItemProvider(AdapterFactory adapterFactory, String text, Object image) {
- super(adapterFactory, text, image);
- }
-
- /**
- * Constructor for ModulesItemProvider.
- *
- * @param adapterFactory
- * @param text
- * @param image
- * @param parent
- */
- public ModulesItemProvider(AdapterFactory adapterFactory, String text, Object image, Object parent) {
- super(adapterFactory, text, image, parent);
- }
-
- /**
- * Constructor for ModulesItemProvider.
- *
- * @param adapterFactory
- * @param children
- */
- public ModulesItemProvider(AdapterFactory adapterFactory, Collection children) {
- super(adapterFactory, children);
- }
-
- /**
- * Constructor for ModulesItemProvider.
- *
- * @param adapterFactory
- * @param text
- * @param children
- */
- public ModulesItemProvider(AdapterFactory adapterFactory, String text, Collection children) {
- super(adapterFactory, text, children);
- }
-
- /**
- * Constructor for ModulesItemProvider.
- *
- * @param adapterFactory
- * @param text
- * @param image
- * @param children
- */
- public ModulesItemProvider(AdapterFactory adapterFactory, String text, Object image, Collection children) {
- super(adapterFactory, text, image, children);
- }
-
- /**
- * Constructor for ModulesItemProvider.
- *
- * @param adapterFactory
- * @param text
- * @param image
- * @param parent
- * @param children
- */
- public ModulesItemProvider(AdapterFactory adapterFactory, String text, Object image, Object parent, Collection children) {
- super(adapterFactory, text, image, parent, children);
- }
-
-
- /**
- * @see org.eclipse.emf.edit.provider.ItemProviderAdapter#getImage(Object)
- */
- @Override
- public Object getImage(Object object) {
- return J2EEPlugin.getPlugin().getImage("folder"); //$NON-NLS-1$
- }
-
- public Application getParentApplication() {
- return (Application) getParent();
- }
-
- @Override
- public IFile getAssociatedFile() {
-
- try {
- Application application = getParentApplication();
- if (application != null && application.eResource() != null) {
- return WorkbenchResourceHelperBase.getIFile(application.eResource().getURI());
- }
- } catch (Throwable t) {
-
- }
- return null;
- }
-
-
- /**
- * @see org.eclipse.emf.edit.provider.IItemLabelProvider#getText(Object)
- */
- @Override
- public String getText(Object object) {
- return MODULES;
- }
-
- @Override
- public boolean hasChildren(Object object) {
- getChildren(object);
- return !localChildren.isEmpty();
- }
-
- private List localChildren = null;
-
- @Override
- public Collection getChildren(Object object) {
- return initChildren(object);
- }
-
- protected List initChildren(Object object) {
- localChildren = new ArrayList();
- Application app = (Application) getParent();
- IVirtualComponent ear = ComponentUtilities.findComponent(app);
- List modules = app.getModules();
- List binaryModules = new ArrayList();
- IVirtualReference[] refs = ear.getReferences();
- for (int i = 0; i < modules.size(); i++) {
- Module module = (Module) modules.get(i);
- String moduleURI = module.getUri();
- boolean foundBinary = false;
- if(moduleURI != null) {
- String moduleName = new Path(moduleURI).lastSegment();
- for (int j = 0; j < refs.length && !foundBinary; j++) {
- IVirtualComponent component = refs[j].getReferencedComponent();
- if (component.isBinary()) {
- if (refs[j].getArchiveName().equals(moduleName)) {
- foundBinary = true;
- JavaEEBinaryComponentHelper helper = null;
- try {
- helper = new JavaEEBinaryComponentHelper(component);
- Object binaryModule = helper.getPrimaryRootObject();
- if (binaryModule != null) {
- binaryModules.add(binaryModule);
- }
- } finally {
- if(helper != null){
- helper.dispose();
- }
- }
- }
- }
- }
- }
- if (!foundBinary) {
- localChildren.add(module);
- }
- }
-
- if (!binaryModules.isEmpty()) {
- localChildren.add(new J2EEBinaryModulesItemProvider(app, getAdapterFactory(), binaryModules));
- }
-
- return localChildren;
-
- }
-}
diff --git a/plugins/org.eclipse.jst.j2ee.ui/j2ee_ui/org/eclipse/jst/j2ee/internal/provider/UtilityModuleProjectItemProvider.java b/plugins/org.eclipse.jst.j2ee.ui/j2ee_ui/org/eclipse/jst/j2ee/internal/provider/UtilityModuleProjectItemProvider.java
deleted file mode 100644
index c7eed44..0000000
--- a/plugins/org.eclipse.jst.j2ee.ui/j2ee_ui/org/eclipse/jst/j2ee/internal/provider/UtilityModuleProjectItemProvider.java
+++ /dev/null
@@ -1,52 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2008 IBM Corporation and others.
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
- *
- * Contributors:
- * IBM Corporation - initial API and implementation
- *******************************************************************************/
-package org.eclipse.jst.j2ee.internal.provider;
-
-import java.util.Collection;
-
-import org.eclipse.core.resources.IProject;
-import org.eclipse.emf.common.notify.AdapterFactory;
-import org.eclipse.emf.edit.provider.ItemProviderAdapter;
-import org.eclipse.jst.j2ee.internal.plugin.J2EEPlugin;
-
-public class UtilityModuleProjectItemProvider extends J2EEItemProvider {
-
- private IProject utilProject;
-
- public UtilityModuleProjectItemProvider(AdapterFactory adapterFactory, IProject project, Object parent) {
- super(adapterFactory);
- setParent(parent);
- utilProject = project;
- }
-
- /**
- * @see ItemProviderAdapter#getImage(Object)
- */
- @Override
- public Object getImage(Object object) {
- return J2EEPlugin.getPlugin().getImage("icons/full/obj16/prjutiljar_obj"); //$NON-NLS-1$
- }
-
- /**
- * @see ItemProviderAdapter#getText(Object)
- */
- @Override
- public String getText(Object object) {
-
- return utilProject.getName();
- }
-
- @Override
- public Collection<?> getChildren(Object object) {
- return super.getChildren(object);
- }
-
-}
diff --git a/plugins/org.eclipse.jst.j2ee.ui/j2ee_ui/org/eclipse/jst/j2ee/internal/ui/AddJavaBuildPathEntriesWizardFragment.java b/plugins/org.eclipse.jst.j2ee.ui/j2ee_ui/org/eclipse/jst/j2ee/internal/ui/AddJavaBuildPathEntriesWizardFragment.java
deleted file mode 100644
index ebd1d91..0000000
--- a/plugins/org.eclipse.jst.j2ee.ui/j2ee_ui/org/eclipse/jst/j2ee/internal/ui/AddJavaBuildPathEntriesWizardFragment.java
+++ /dev/null
@@ -1,444 +0,0 @@
-/******************************************************************************
- * Copyright (c) 2010 Oracle
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
- *
- * Contributors:
- * Konstantin Komissarchik - initial implementation and ongoing maintenance
- ******************************************************************************/
-
-package org.eclipse.jst.j2ee.internal.ui;
-
-import static org.eclipse.jst.j2ee.classpathdep.ClasspathDependencyUtil.checkForComponentDependencyAttribute;
-import static org.eclipse.jst.j2ee.classpathdep.ClasspathDependencyUtil.getDefaultRuntimePath;
-import static org.eclipse.jst.j2ee.classpathdep.ClasspathDependencyUtil.isClassFolderEntry;
-import static org.eclipse.jst.j2ee.classpathdep.ClasspathDependencyUtil.modifyDependencyPath;
-
-import java.util.ArrayList;
-import java.util.Iterator;
-import java.util.List;
-
-import org.eclipse.core.resources.IProject;
-import org.eclipse.core.runtime.CoreException;
-import org.eclipse.core.runtime.IPath;
-import org.eclipse.jdt.core.IClasspathContainer;
-import org.eclipse.jdt.core.IClasspathEntry;
-import org.eclipse.jdt.core.IJavaProject;
-import org.eclipse.jdt.core.JavaCore;
-import org.eclipse.jdt.internal.ui.JavaPluginImages;
-import org.eclipse.jdt.ui.ISharedImages;
-import org.eclipse.jdt.ui.JavaUI;
-import org.eclipse.jface.viewers.DoubleClickEvent;
-import org.eclipse.jface.viewers.IDoubleClickListener;
-import org.eclipse.jface.viewers.ISelectionChangedListener;
-import org.eclipse.jface.viewers.IStructuredSelection;
-import org.eclipse.jface.viewers.ITreeContentProvider;
-import org.eclipse.jface.viewers.LabelProvider;
-import org.eclipse.jface.viewers.SelectionChangedEvent;
-import org.eclipse.jface.viewers.TreeViewer;
-import org.eclipse.jface.viewers.Viewer;
-import org.eclipse.jst.j2ee.classpathdep.IClasspathDependencyConstants.DependencyAttributeType;
-import org.eclipse.jst.j2ee.internal.classpathdep.ClasspathDependencyExtensions;
-import org.eclipse.jst.j2ee.internal.plugin.J2EEUIPlugin;
-import org.eclipse.jst.j2ee.internal.ui.J2EEModuleDependenciesPropertyPage.ClasspathEntryProxy;
-import org.eclipse.jst.j2ee.project.JavaEEProjectUtilities;
-import org.eclipse.osgi.util.NLS;
-import org.eclipse.swt.SWT;
-import org.eclipse.swt.graphics.Image;
-import org.eclipse.swt.layout.GridData;
-import org.eclipse.swt.layout.GridLayout;
-import org.eclipse.swt.widgets.Composite;
-import org.eclipse.wst.common.componentcore.ComponentCore;
-import org.eclipse.wst.common.componentcore.resources.IVirtualComponent;
-import org.eclipse.wst.common.componentcore.ui.internal.taskwizard.IWizardHandle;
-import org.eclipse.wst.common.componentcore.ui.internal.taskwizard.WizardFragment;
-import org.eclipse.wst.common.componentcore.ui.propertypage.IReferenceWizardConstants;
-
-@SuppressWarnings( "restriction" )
-
-public final class AddJavaBuildPathEntriesWizardFragment
-
- extends WizardFragment
-
-{
- public static final String PROP_SELECTION = "selection"; //$NON-NLS-1$
-
- private IWizardHandle wizard;
- private TreeViewer viewer;
- private IJavaProject jproj;
-
- public AddJavaBuildPathEntriesWizardFragment()
- {
- setComplete( false );
- }
-
- @Override
- public boolean hasComposite()
- {
- return true;
- }
-
- @Override
- public Composite createComposite( final Composite parent,
- final IWizardHandle handle )
- {
- this.wizard = handle;
-
- handle.setTitle( Resources.title );
- handle.setDescription( Resources.description );
- handle.setImageDescriptor( JavaPluginImages.DESC_WIZBAN_ADD_LIBRARY );
-
- final Composite composite = new Composite( parent, SWT.NONE );
- composite.setLayout( new GridLayout() );
-
- this.viewer = new TreeViewer( composite, SWT.MULTI | SWT.BORDER );
-
- final GridData gd = new GridData( GridData.FILL_BOTH );
- gd.widthHint = 390;
- gd.heightHint = 185;
-
- this.viewer.getTree().setLayoutData( gd );
-
- this.viewer.setContentProvider( new BuildPathEntriesContentProvider() );
- this.viewer.setLabelProvider( new BuildPathEntriesLabelProvider() );
-
- this.viewer.addSelectionChangedListener
- (
- new ISelectionChangedListener()
- {
- public void selectionChanged( final SelectionChangedEvent event )
- {
- handleSelectionChanged();
- }
- }
- );
-
- this.viewer.addDoubleClickListener
- (
- new IDoubleClickListener()
- {
- public void doubleClick( final DoubleClickEvent event )
- {
- handleDoubleClick();
- }
- }
- );
-
- final IProject proj = (IProject) getTaskModel().getObject( IReferenceWizardConstants.PROJECT );
- this.jproj = JavaCore.create( proj );
-
- this.viewer.setInput( new Object() );
-
- return composite;
- }
-
- private void handleSelectionChanged()
- {
- final List<IClasspathEntry> list = new ArrayList<IClasspathEntry>();
- final IStructuredSelection selection = (IStructuredSelection) this.viewer.getSelection();
- final IVirtualComponent virtualComponent = ComponentCore.createComponent(this.jproj.getProject());
- final boolean isWebApp = JavaEEProjectUtilities.isDynamicWebProject( this.jproj.getProject() );
-
- for( Iterator<?> itr = selection.iterator(); itr.hasNext(); )
- {
- final Object obj = itr.next();
-
- if( obj instanceof IClasspathEntry )
- {
- final IClasspathEntry cpeOriginal = (IClasspathEntry) obj;
-
- IPath runtimePath = null;
- if(virtualComponent == null){
- runtimePath = getDefaultRuntimePath( isWebApp, isClassFolderEntry( cpeOriginal ) );
- } else {
- runtimePath = getDefaultRuntimePath(virtualComponent, cpeOriginal);
- }
- final IClasspathEntry cpeTagged = modifyDependencyPath( cpeOriginal, runtimePath );
-
- list.add( cpeTagged );
- }
- else
- {
- list.clear();
- break;
- }
- }
-
- getTaskModel().putObject( PROP_SELECTION, list );
-
- setComplete( ! list.isEmpty() );
- this.wizard.update();
- }
-
- private void handleDoubleClick()
- {
- advanceToNextPageOrFinish();
- }
-
- private IJavaProject getJavaProject()
- {
- return this.jproj;
- }
-
- public static String getClasspathEntryText( final IJavaProject jproj,
- final IClasspathEntry cpe )
- {
- final int type = cpe.getEntryKind();
-
- if( type == IClasspathEntry.CPE_CONTAINER )
- {
- try
- {
- final IClasspathContainer container = JavaCore.getClasspathContainer( cpe.getPath(), jproj );
- return container.getDescription();
- }
- catch( Exception e )
- {
- J2EEUIPlugin.logError(e);
- }
- }
- else if( type == IClasspathEntry.CPE_LIBRARY )
- {
- final IPath path = cpe.getPath();
-
- final StringBuilder buf = new StringBuilder();
- buf.append( path.lastSegment() );
- buf.append( " - " ); //$NON-NLS-1$
- buf.append( path.removeLastSegments( 1 ).toOSString() );
-
- return buf.toString();
- }
-
- return cpe.getPath().toPortableString();
- }
-
- public static Image getClasspathEntryImage( final IJavaProject jproj,
- final IClasspathEntry cpe )
- {
- final int type = cpe.getEntryKind();
- final String imgId;
-
- if( type == IClasspathEntry.CPE_CONTAINER )
- {
- imgId = ISharedImages.IMG_OBJS_LIBRARY;
- }
- else if( type == IClasspathEntry.CPE_LIBRARY )
- {
- imgId = ISharedImages.IMG_OBJS_JAR;
- }
- else if( type == IClasspathEntry.CPE_VARIABLE )
- {
- imgId = ISharedImages.IMG_OBJS_CLASSPATH_VAR_ENTRY;
- }
- else
- {
- imgId = null;
- }
-
- return ( imgId == null ? null : JavaUI.getSharedImages().getImage( imgId ) );
- }
-
- private final class BuildPathEntriesContentProvider
-
- implements ITreeContentProvider
-
- {
- public Object[] getElements( final Object input )
- {
- final List<IClasspathEntry> elements = new ArrayList<IClasspathEntry>();
- final List<?> filteredContainerIds = ClasspathDependencyExtensions.get().getFilteredClasspathContainerIDs();
-
- try
- {
- for( IClasspathEntry cpe : getJavaProject().getRawClasspath() )
- {
- final int type = cpe.getEntryKind();
- final IPath path = cpe.getPath();
- boolean relevant = false;
-
- if( type == IClasspathEntry.CPE_CONTAINER )
- {
- if( path.segmentCount() > 0 && ! filteredContainerIds.contains( path.segment( 0 ) ) )
- {
- relevant = true;
- }
- }
- else if( type == IClasspathEntry.CPE_LIBRARY || type == IClasspathEntry.CPE_VARIABLE )
- {
- relevant = true;
- }
-
- if( relevant )
- {
- if( checkForComponentDependencyAttribute( cpe, DependencyAttributeType.CLASSPATH_COMPONENT_NONDEPENDENCY ) != null )
- {
- relevant = false;
- }
- }
-
- if( relevant )
- {
- boolean found = false;
-
- for( Object directive : (List<?>) getTaskModel().getObject( IReferenceWizardConstants.ALL_DIRECTIVES ) )
- {
- if( directive instanceof ClasspathEntryProxy )
- {
- final ClasspathEntryProxy proxy = (ClasspathEntryProxy) directive;
-
- if( type == proxy.entry.getEntryKind() && path.equals( proxy.entry.getPath() ) )
- {
- found = true;
- break;
- }
- }
- }
-
- if( found )
- {
- relevant = false;
- }
- }
-
- if( relevant )
- {
- elements.add( cpe );
- }
- }
- }
- catch( CoreException e )
- {
- J2EEUIPlugin.logError(e);
- }
-
- return elements.toArray();
- }
-
- public boolean hasChildren( final Object element )
- {
- return ( element instanceof IClasspathEntry ) &&
- ( ( (IClasspathEntry) element ).getEntryKind() == IClasspathEntry.CPE_CONTAINER );
- }
-
- public Object[] getChildren( final Object parent )
- {
- if( parent instanceof IClasspathEntry )
- {
- final IClasspathEntry cpe = (IClasspathEntry) parent;
-
- if( cpe.getEntryKind() == IClasspathEntry.CPE_CONTAINER )
- {
- final List<ChildClasspathEntry> children = new ArrayList<ChildClasspathEntry>();
-
- try
- {
- final IClasspathContainer container = JavaCore.getClasspathContainer( cpe.getPath(), getJavaProject() );
-
- if( container != null )
- {
- for( IClasspathEntry child : container.getClasspathEntries() )
- {
- children.add( new ChildClasspathEntry( cpe, child ) );
- }
- }
- }
- catch( Exception e )
- {
- J2EEUIPlugin.logError(e);
- }
-
- return children.toArray();
- }
- }
-
- return new Object[ 0 ];
- }
-
- public Object getParent( final Object element )
- {
- if( element instanceof ChildClasspathEntry )
- {
- return ( (ChildClasspathEntry) element ).parent;
- }
-
- return null;
- }
-
- public void inputChanged( final Viewer viewer,
- final Object oldInput,
- final Object newInput )
- {
- }
-
- public void dispose()
- {
- }
- }
-
- private final class BuildPathEntriesLabelProvider
-
- extends LabelProvider
-
- {
- @Override
- public String getText( final Object element )
- {
- final IClasspathEntry cpe;
-
- if( element instanceof IClasspathEntry )
- {
- cpe = (IClasspathEntry) element;
- }
- else
- {
- cpe = ( (ChildClasspathEntry) element ).entry;
- }
-
- return getClasspathEntryText( getJavaProject(), cpe );
- }
-
- @Override
- public Image getImage( final Object element )
- {
- final IClasspathEntry cpe;
-
- if( element instanceof IClasspathEntry )
- {
- cpe = (IClasspathEntry) element;
- }
- else
- {
- cpe = ( (ChildClasspathEntry) element ).entry;
- }
-
- return getClasspathEntryImage( getJavaProject(), cpe );
- }
- }
-
- private static final class ChildClasspathEntry
- {
- public final IClasspathEntry parent;
- public final IClasspathEntry entry;
-
- public ChildClasspathEntry( final IClasspathEntry parent,
- final IClasspathEntry entry )
- {
- this.parent = parent;
- this.entry = entry;
- }
- }
-
- public static final class Resources extends NLS
- {
- public static String title;
- public static String description;
-
- static
- {
- initializeMessages( AddJavaBuildPathEntriesWizardFragment.class.getName(), Resources.class );
- }
- }
-
-}
diff --git a/plugins/org.eclipse.jst.j2ee.ui/j2ee_ui/org/eclipse/jst/j2ee/internal/ui/AddJavaBuildPathEntriesWizardFragment.properties b/plugins/org.eclipse.jst.j2ee.ui/j2ee_ui/org/eclipse/jst/j2ee/internal/ui/AddJavaBuildPathEntriesWizardFragment.properties
deleted file mode 100644
index 665e659..0000000
--- a/plugins/org.eclipse.jst.j2ee.ui/j2ee_ui/org/eclipse/jst/j2ee/internal/ui/AddJavaBuildPathEntriesWizardFragment.properties
+++ /dev/null
@@ -1,2 +0,0 @@
-title = Java Build Path Entries
-description = Select build path entries to include in the deployment assembly.
diff --git a/plugins/org.eclipse.jst.j2ee.ui/j2ee_ui/org/eclipse/jst/j2ee/internal/ui/DoubleCheckboxTableItem.java b/plugins/org.eclipse.jst.j2ee.ui/j2ee_ui/org/eclipse/jst/j2ee/internal/ui/DoubleCheckboxTableItem.java
deleted file mode 100644
index a4b6e46..0000000
--- a/plugins/org.eclipse.jst.j2ee.ui/j2ee_ui/org/eclipse/jst/j2ee/internal/ui/DoubleCheckboxTableItem.java
+++ /dev/null
@@ -1,115 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2008 SAP AG and others.
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
- *
- * Contributors:
- * Stefan Dimov, stefan.dimov@sap.com - initial API and implementation
- *******************************************************************************/
-package org.eclipse.jst.j2ee.internal.ui;
-
-import org.eclipse.jface.viewers.ICheckStateListener;
-import org.eclipse.jst.j2ee.internal.SecondCheckBoxStateChangedEvent;
-import org.eclipse.swt.SWT;
-import org.eclipse.swt.events.SelectionEvent;
-import org.eclipse.swt.events.SelectionListener;
-import org.eclipse.swt.widgets.Button;
-import org.eclipse.swt.widgets.Table;
-import org.eclipse.swt.widgets.TableItem;
-
-public class DoubleCheckboxTableItem extends TableItem {
-
- protected int mSecondCheckboxColumnIndex;
- protected Button secondCheckBox;
- protected SelectionListener selLstnr;
- protected ICheckStateListener tblLstnr = null;
- protected DoubleCheckboxTableViewer tableViewer;
-
- public DoubleCheckboxTableItem (Table parent, int style, int secondCheckboxColumnIndex, DoubleCheckboxTableViewer tableViewer) {
- super(parent, style);
- mSecondCheckboxColumnIndex = secondCheckboxColumnIndex;
- this.tableViewer = tableViewer;
- createCheckBox(parent);
- }
-
- public DoubleCheckboxTableItem(Table parent, int style, int index, int secondCheckboxColumnIndex, DoubleCheckboxTableViewer tableViewer) {
- super(parent, style, index);
- mSecondCheckboxColumnIndex = secondCheckboxColumnIndex;
- this.tableViewer = tableViewer;
- createCheckBox(parent);
- }
-
- public void setSecondChecked (boolean checked) {
- secondCheckBox.setSelection(checked);
- }
-
- public boolean getSecondChecked() {
- return secondCheckBox.getSelection();
- }
-
- public void setSecondGrayed(boolean grayed) {
- secondCheckBox.setGrayed(grayed);
- }
-
- public boolean getSecondGrayed() {
- return secondCheckBox.getGrayed();
- }
-
- public void setSecondEnabled(boolean enabled) {
- secondCheckBox.setEnabled(enabled);
- }
-
- public boolean getSecondEnabled() {
- return secondCheckBox.getEnabled();
- }
-
- public boolean isSecondEnabled() {
- return secondCheckBox.isEnabled();
- }
-
- private void createCheckBox(Table parentTable) {
- secondCheckBox = new Button(parentTable, SWT.CHECK | SWT.FLAT);
- secondCheckBox.pack();
- final DoubleCheckboxTableItem th = this;
- selLstnr = new SelectionListener() {
- public void widgetSelected(SelectionEvent e) {
- SecondCheckBoxStateChangedEvent evt = new SecondCheckBoxStateChangedEvent(tableViewer,
- getData(),
- getChecked());
- evt.setTableItem(th);
- tblLstnr.checkStateChanged(evt);
- }
- public void widgetDefaultSelected(SelectionEvent e) {}
- };
- secondCheckBox.addSelectionListener(selLstnr);
- }
-
- public Button getSecondCheckBox() {
- return secondCheckBox;
- }
-
- @Override
- public void dispose() {
- disposeSecondCheckbox();
- super.dispose();
- }
-
- protected void disposeSecondCheckbox() {
- if (secondCheckBox != null) {
- secondCheckBox.removeSelectionListener(selLstnr);
- secondCheckBox.dispose();
- secondCheckBox = null;
- }
- selLstnr = null;
- }
-
- void setTableListener(ICheckStateListener tblLstnr) {
- this.tblLstnr = tblLstnr;
- }
-
- @Override
- protected void checkSubclass () {}
-
-}
diff --git a/plugins/org.eclipse.jst.j2ee.ui/j2ee_ui/org/eclipse/jst/j2ee/internal/ui/DoubleCheckboxTableViewer.java b/plugins/org.eclipse.jst.j2ee.ui/j2ee_ui/org/eclipse/jst/j2ee/internal/ui/DoubleCheckboxTableViewer.java
deleted file mode 100644
index 31510f4..0000000
--- a/plugins/org.eclipse.jst.j2ee.ui/j2ee_ui/org/eclipse/jst/j2ee/internal/ui/DoubleCheckboxTableViewer.java
+++ /dev/null
@@ -1,184 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2008 SAP AG and others.
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
- *
- * Contributors:
- * Stefan Dimov, stefan.dimov@sap.com - initial API and implementation
- *******************************************************************************/
-package org.eclipse.jst.j2ee.internal.ui;
-
-import java.util.ArrayList;
-import java.util.Hashtable;
-
-import org.eclipse.jface.viewers.CheckboxTableViewer;
-import org.eclipse.jface.viewers.ICheckStateListener;
-import org.eclipse.jface.viewers.ViewerRow;
-import org.eclipse.swt.SWT;
-import org.eclipse.swt.custom.TableEditor;
-import org.eclipse.swt.widgets.Table;
-import org.eclipse.swt.widgets.TableItem;
-
-public class DoubleCheckboxTableViewer extends CheckboxTableViewer {
-
- protected int mSecondCheckboxColumnIndex;
- protected ICheckStateListener lstnr = null;
-
- public DoubleCheckboxTableViewer(Table table, int secondCheckBoxColumnIndex) {
- super(table);
- if (secondCheckBoxColumnIndex < 1)
- throw new IllegalArgumentException(
- "The index of the second column with check box must be bigger than zero"); //$NON-NLS-1$
-
- mSecondCheckboxColumnIndex = secondCheckBoxColumnIndex;
- }
-
- @Override
- public void addCheckStateListener(ICheckStateListener listener) {
- super.addCheckStateListener(listener);
- lstnr = listener;
- }
-
- @Override
- public void removeCheckStateListener(ICheckStateListener listener) {
- super.removeCheckStateListener(listener);
- lstnr = null;
- getTable().getItems();
- for (int i = 0; i < getTable().getItems().length; i++) {
- DoubleCheckboxTableItem it = (DoubleCheckboxTableItem)getTable().getItem(i);
- it.setTableListener(null);
- }
- }
-
- @Override
- protected ViewerRow internalCreateNewRowPart(int style, int rowIndex) {
- DoubleCheckboxTableItem item;
- if (rowIndex >= 0) {
- item = new DoubleCheckboxTableItem(getTable(), style, rowIndex, mSecondCheckboxColumnIndex, this);
- } else {
- item = new DoubleCheckboxTableItem(getTable(), style, mSecondCheckboxColumnIndex, this);
- }
- item.setTableListener(lstnr);
- TableEditor editor = new TableEditor(getTable());
- editor.minimumWidth = item.getSecondCheckBox().getSize ().x;
- editor.horizontalAlignment = SWT.CENTER;
- editor.setEditor(item.getSecondCheckBox(), item, mSecondCheckboxColumnIndex);
- return getViewerRowFromItem(item);
- }
-
- public Object[] getSecondCheckedItems() {
- TableItem[] children = getTable().getItems();
- ArrayList v = new ArrayList(children.length);
- for (int i = 0; i < children.length; i++) {
- DoubleCheckboxTableItem item = (DoubleCheckboxTableItem)children[i];
- if (item.getSecondChecked()) {
- v.add(item);
- }
- }
- return v.toArray();
- }
-
- public void setAllSecondChecked(boolean state) {
- TableItem[] children = getTable().getItems();
- for (int i = 0; i < children.length; i++) {
- DoubleCheckboxTableItem item = (DoubleCheckboxTableItem)children[i];
- item.setSecondChecked(state);
- }
- }
-
- public Object[] getSingleCheckedElements() {
- TableItem[] children = getTable().getItems();
- ArrayList v = new ArrayList(children.length);
- for (int i = 0; i < children.length; i++) {
- DoubleCheckboxTableItem item = (DoubleCheckboxTableItem)children[i];
- if (item.getChecked() && (!item.getSecondChecked())) {
- v.add(item.getData());
- }
- }
- return v.toArray();
- }
-
- public Object[] getDoubleCheckedElements() {
- TableItem[] children = getTable().getItems();
- ArrayList v = new ArrayList(children.length);
- for (int i = 0; i < children.length; i++) {
- DoubleCheckboxTableItem item = (DoubleCheckboxTableItem)children[i];
- if (item.getChecked() && item.getSecondChecked()) {
- v.add(item.getData());
- }
- }
- return v.toArray();
- }
-
- public Object[] getUncheckedItems() {
- TableItem[] children = getTable().getItems();
- ArrayList v = new ArrayList(children.length);
- for (int i = 0; i < children.length; i++) {
- TableItem item = children[i];
- if (!item.getChecked()) {
- v.add(item);
- }
- }
- return v.toArray();
- }
-
-
- public Object[] getSecondUncheckedElements() {
- TableItem[] children = getTable().getItems();
- ArrayList v = new ArrayList(children.length);
- for (int i = 0; i < children.length; i++) {
- DoubleCheckboxTableItem item = (DoubleCheckboxTableItem)children[i];
- if (!item.getSecondChecked()) {
- v.add(item.getData());
- }
- }
- return v.toArray();
- }
-
- public void setSecondCheckedItems(Object[] inputItems) {
- assertElementsNotNull(inputItems);
- Hashtable set = new Hashtable();
- for (int i = 0; i < inputItems.length; ++i) {
- set.put(inputItems[i], inputItems[i]);
- }
- TableItem[] items = getTable().getItems();
- for (int i = 0; i < items.length; ++i) {
- DoubleCheckboxTableItem item = (DoubleCheckboxTableItem)items[i];
- boolean check = set.containsKey(item);
- if (item.getSecondChecked() != check) {
- item.setSecondChecked(check);
- }
-
- }
- }
-
- @Override
- protected void doRemove(int start, int end) {
- // ensure that the second check box is disposed
- for (int i = start; i <= end; i++) {
- disposeSecondCheckboxOfItem(i);
- }
-
- super.doRemove(start, end);
- }
-
- @Override
- protected void doRemove(int[] indices) {
- // ensure that the second check box is disposed
- for (int i : indices) {
- disposeSecondCheckboxOfItem(i);
- }
-
- super.doRemove(indices);
- }
-
- private void disposeSecondCheckboxOfItem(int index) {
- TableItem item = getTable().getItem(index);
- if (item instanceof DoubleCheckboxTableItem) {
- ((DoubleCheckboxTableItem) item).disposeSecondCheckbox();
- }
- }
-
-}
diff --git a/plugins/org.eclipse.jst.j2ee.ui/j2ee_ui/org/eclipse/jst/j2ee/internal/ui/J2EEDependencyPageProvider.java b/plugins/org.eclipse.jst.j2ee.ui/j2ee_ui/org/eclipse/jst/j2ee/internal/ui/J2EEDependencyPageProvider.java
deleted file mode 100644
index 4860f5d..0000000
--- a/plugins/org.eclipse.jst.j2ee.ui/j2ee_ui/org/eclipse/jst/j2ee/internal/ui/J2EEDependencyPageProvider.java
+++ /dev/null
@@ -1,120 +0,0 @@
-/******************************************************************************
- * Copyright (c) 2010 Red Hat and Others
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
- *
- * Contributors:
- * Rob Stryker - initial implementation and ongoing maintenance
- * Konstantin Komissarchik - misc. UI cleanup
- ******************************************************************************/
-package org.eclipse.jst.j2ee.internal.ui;
-
-import org.eclipse.core.resources.IProject;
-import org.eclipse.jst.common.internal.modulecore.util.JavaModuleComponentUtility;
-import org.eclipse.jst.common.ui.internal.assembly.wizard.ManifestModuleDependencyControl;
-import org.eclipse.jst.j2ee.project.JavaEEProjectUtilities;
-import org.eclipse.swt.SWT;
-import org.eclipse.swt.layout.GridData;
-import org.eclipse.swt.layout.GridLayout;
-import org.eclipse.swt.widgets.Composite;
-import org.eclipse.swt.widgets.Control;
-import org.eclipse.swt.widgets.TabFolder;
-import org.eclipse.swt.widgets.TabItem;
-import org.eclipse.wst.common.componentcore.internal.util.IModuleConstants;
-import org.eclipse.wst.common.componentcore.ui.propertypage.IDependencyPageProvider;
-import org.eclipse.wst.common.componentcore.ui.propertypage.IModuleDependenciesControl;
-import org.eclipse.wst.common.componentcore.ui.propertypage.ModuleAssemblyRootPage;
-import org.eclipse.wst.common.project.facet.core.IFacetedProject;
-import org.eclipse.wst.common.project.facet.core.ProjectFacetsManager;
-
-public class J2EEDependencyPageProvider implements IDependencyPageProvider {
-
- private IModuleDependenciesControl[] controls;
-
- public boolean canHandle(IFacetedProject project) {
- return isJavaEENotEarWeb(project);
- }
-
- protected boolean isJavaEENotEarWeb(IFacetedProject fp) {
- return fp.hasProjectFacet(ProjectFacetsManager.getProjectFacet(IModuleConstants.JST_EJB_MODULE)) ||
- fp.hasProjectFacet(ProjectFacetsManager.getProjectFacet(IModuleConstants.JST_APPCLIENT_MODULE)) ||
- fp.hasProjectFacet(ProjectFacetsManager.getProjectFacet(IModuleConstants.JST_CONNECTOR_MODULE)) ||
- fp.hasProjectFacet(ProjectFacetsManager.getProjectFacet(IModuleConstants.JST_UTILITY_MODULE)) ||
- fp.hasProjectFacet(ProjectFacetsManager.getProjectFacet(IModuleConstants.JST_WEBFRAGMENT_MODULE));
- }
-
- public IModuleDependenciesControl[] createPages(IFacetedProject project,
- ModuleAssemblyRootPage parent) {
-
- if( isStandalone(project.getProject()))
- return new IModuleDependenciesControl[] {
- new J2EEModuleDependenciesPropertyPage(project.getProject(), parent)};
-
- return new IModuleDependenciesControl[] {
- new J2EEModuleDependenciesPropertyPage(project.getProject(), parent),
- new ManifestModuleDependencyControl(project.getProject(), parent)};
-
- }
-
- /*
- * This now allows extenders to say whether this project is standalone or not
- */
- protected boolean isStandalone(IProject project) {
- return JavaModuleComponentUtility.findParentProjects(project).length == 0;
- }
-
- public Composite createRootControl(IFacetedProject project,IModuleDependenciesControl[] pages,
- Composite parent) {
-
- if( isStandalone(project.getProject()))
- return pages[0].createContents(parent);
-
- final TabFolder folder = new TabFolder(parent, SWT.LEFT);
- folder.setLayoutData(new GridData(GridData.FILL_BOTH));
- folder.setFont(parent.getFont());
-
- // Create the two tabs
- controls = new IModuleDependenciesControl[2];
- controls[0] = pages[0];
- controls[1] = pages[1];
-
- TabItem tab = new TabItem(folder, SWT.NONE);
- tab.setControl(create(controls[0],folder));
- tab.setText(Messages.J2EEDependencyPageProvider_4);
- tab = new TabItem(folder, SWT.NONE);
- tab.setControl(create(controls[1],folder));
- tab.setText(Messages.J2EEDependencyPageProvider_5);
-
- folder.setSelection(0);
- return folder;
- }
-
- private static Control create( final IModuleDependenciesControl control,
- final Composite parent )
- {
- final Composite composite = new Composite( parent, SWT.NONE );
- composite.setLayout( new GridLayout() );
- final Composite inner = control.createContents( composite );
- inner.setLayoutData( new GridData( GridData.FILL_BOTH ) );
-
- return composite;
- }
-
- protected boolean isWeb(IFacetedProject project) {
- return project.hasProjectFacet(ProjectFacetsManager.getProjectFacet(IModuleConstants.JST_WEB_MODULE));
- }
-
- public String getPageTitle(IProject project) {
-
- if (JavaEEProjectUtilities.isEJBProject(project))
- return Messages.J2EEDependencyPageProvider_1;
- if (JavaEEProjectUtilities.isApplicationClientProject(project))
- return Messages.J2EEDependencyPageProvider_2;
- if (JavaEEProjectUtilities.isJCAProject(project))
- return Messages.J2EEDependencyPageProvider_3;
- return Messages.J2EEDependencyPageProvider_4;
- }
-
-}
diff --git a/plugins/org.eclipse.jst.j2ee.ui/j2ee_ui/org/eclipse/jst/j2ee/internal/ui/J2EEModuleDependenciesPropertyPage.java b/plugins/org.eclipse.jst.j2ee.ui/j2ee_ui/org/eclipse/jst/j2ee/internal/ui/J2EEModuleDependenciesPropertyPage.java
deleted file mode 100644
index 8229855..0000000
--- a/plugins/org.eclipse.jst.j2ee.ui/j2ee_ui/org/eclipse/jst/j2ee/internal/ui/J2EEModuleDependenciesPropertyPage.java
+++ /dev/null
@@ -1,420 +0,0 @@
-/******************************************************************************
- * Copyright (c) 2009 Red Hat and Others
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
- *
- * Contributors:
- * Rob Stryker - initial implementation and ongoing maintenance
- * Chuck Bridgham - additional support
- * Konstantin Komissarchik - misc. UI cleanup
- ******************************************************************************/
-package org.eclipse.jst.j2ee.internal.ui;
-
-import java.util.ArrayList;
-import java.util.HashMap;
-import java.util.List;
-import java.util.Map;
-
-import org.eclipse.core.resources.IProject;
-import org.eclipse.core.runtime.CoreException;
-import org.eclipse.core.runtime.IPath;
-import org.eclipse.core.runtime.IProgressMonitor;
-import org.eclipse.core.runtime.IStatus;
-import org.eclipse.core.runtime.Path;
-import org.eclipse.jdt.core.IClasspathAttribute;
-import org.eclipse.jdt.core.IClasspathEntry;
-import org.eclipse.jdt.core.IJavaProject;
-import org.eclipse.jdt.core.JavaCore;
-import org.eclipse.jdt.core.JavaModelException;
-import org.eclipse.jst.common.jdt.internal.javalite.IJavaProjectLite;
-import org.eclipse.jst.common.jdt.internal.javalite.JavaCoreLite;
-import org.eclipse.jst.j2ee.classpathdep.ClasspathDependencyUtil;
-import org.eclipse.jst.j2ee.classpathdep.IClasspathDependencyConstants.DependencyAttributeType;
-import org.eclipse.jst.j2ee.internal.common.classpath.J2EEComponentClasspathUpdater;
-import org.eclipse.jst.j2ee.internal.componentcore.JavaEEModuleHandler;
-import org.eclipse.jst.j2ee.internal.plugin.J2EEUIPlugin;
-import org.eclipse.jst.j2ee.internal.project.J2EEProjectUtilities;
-import org.eclipse.jst.j2ee.project.JavaEEProjectUtilities;
-import org.eclipse.swt.widgets.TreeItem;
-import org.eclipse.wst.common.componentcore.internal.IModuleHandler;
-import org.eclipse.wst.common.componentcore.internal.impl.TaskModel;
-import org.eclipse.wst.common.componentcore.resources.IVirtualComponent;
-import org.eclipse.wst.common.componentcore.resources.IVirtualReference;
-import org.eclipse.wst.common.componentcore.ui.internal.propertypage.ComponentDependencyContentProvider;
-import org.eclipse.wst.common.componentcore.ui.internal.taskwizard.TaskWizard;
-import org.eclipse.wst.common.componentcore.ui.propertypage.AddModuleDependenciesPropertiesPage;
-import org.eclipse.wst.common.componentcore.ui.propertypage.IReferenceWizardConstants;
-import org.eclipse.wst.common.componentcore.ui.propertypage.IReferenceWizardConstants.ProjectConverterOperationProvider;
-import org.eclipse.wst.common.componentcore.ui.propertypage.ModuleAssemblyRootPage;
-import org.eclipse.wst.common.frameworks.datamodel.IDataModelOperation;
-
-public class J2EEModuleDependenciesPropertyPage extends
- AddModuleDependenciesPropertiesPage {
-
- public J2EEModuleDependenciesPropertyPage(IProject project,
- ModuleAssemblyRootPage page) {
- super(project, page);
- }
-
- public class ClasspathEntryProxy {
- public IClasspathEntry entry;
- public ClasspathEntryProxy(IClasspathEntry entry){
- this.entry = entry;
- }
- }
-
- protected List <IClasspathEntry> originalClasspathEntries = new ArrayList<IClasspathEntry>();
- protected List <ClasspathEntryProxy> currentClasspathEntries = new ArrayList<ClasspathEntryProxy>();
-
- @Override
- protected void initialize() {
- super.initialize();
- resetClasspathEntries();
- }
-
- private void resetClasspathEntries() {
- originalClasspathEntries.clear();
- currentClasspathEntries.clear();
- originalClasspathEntries.addAll(readRawEntries());
- for(IClasspathEntry entry:originalClasspathEntries){
- currentClasspathEntries.add(new ClasspathEntryProxy(entry));
- }
- }
-
- @Override
- public void performDefaults() {
- resetClasspathEntries();
- super.performDefaults();
- }
-
- protected List <IClasspathEntry> readRawEntries(){
- return readRawEntries(rootComponent);
- }
-
- public static List <IClasspathEntry> readRawEntries(IVirtualComponent component){
- List <IClasspathEntry> entries = new ArrayList<IClasspathEntry>();
- IJavaProjectLite javaProjectLite = JavaCoreLite.create(component.getProject());
- try {
- Map<IClasspathEntry, IClasspathAttribute> rawComponentClasspathDependencies = ClasspathDependencyUtil.getRawComponentClasspathDependencies(javaProjectLite, DependencyAttributeType.CLASSPATH_COMPONENT_DEPENDENCY);
- entries.addAll(rawComponentClasspathDependencies.keySet());
- } catch (CoreException e) {
- J2EEUIPlugin.logError(e);
- }
- return entries;
- }
-
- @Override
- public boolean postHandleChanges(IProgressMonitor monitor) {
- return true;
- }
-
- @Override
- protected void handleRemoved(ArrayList<IVirtualReference> removed) {
- super.handleRemoved(removed);
- J2EEComponentClasspathUpdater.getInstance().queueUpdateEAR(rootComponent.getProject());
- }
-
- @Override
- protected void remove(Object selectedItem) {
- if(selectedItem instanceof ClasspathEntryProxy){
- ClasspathEntryProxy entry = (ClasspathEntryProxy)selectedItem;
- currentClasspathEntries.remove(entry);
- } else {
- super.remove(selectedItem);
- }
- }
-
- @Override
- protected String getModuleAssemblyRootPageDescription() {
- if (JavaEEProjectUtilities.isEJBProject(project))
- return Messages.J2EEModuleDependenciesPropertyPage_3;
- if (JavaEEProjectUtilities.isApplicationClientProject(project))
- return Messages.J2EEModuleDependenciesPropertyPage_4;
- if (JavaEEProjectUtilities.isJCAProject(project))
- return Messages.J2EEModuleDependenciesPropertyPage_5;
- return super.getModuleAssemblyRootPageDescription();
- }
-
- @Override
- protected IModuleHandler getModuleHandler() {
- if(moduleHandler == null)
- moduleHandler = new JavaEEModuleHandler();
- return moduleHandler;
- }
-
- @Override
- protected void setCustomReferenceWizardProperties(TaskModel model) {
- model.putObject(IReferenceWizardConstants.PROJECT_CONVERTER_OPERATION_PROVIDER, getConverterProvider());
- }
-
- public ProjectConverterOperationProvider getConverterProvider() {
- return new ProjectConverterOperationProvider() {
- public IDataModelOperation getConversionOperation(IProject project) {
- return J2EEProjectUtilities.createFlexJavaProjectForProjectOperation(project);
- }
- };
- }
-
- @Override
- protected ComponentDependencyContentProvider createProvider() {
- JavaEEComponentDependencyContentProvider provider = new JavaEEComponentDependencyContentProvider(this);
- provider.setClasspathEntries(currentClasspathEntries);
- return provider;
- }
-
- @Override
- protected boolean canRemove(Object selectedObject) {
- return super.canRemove(selectedObject) && !(selectedObject instanceof JavaEEComponentDependencyContentProvider.ConsumedClasspathEntryProxy);
- }
-
- @Override
- protected RuntimePathCellModifier getRuntimePathCellModifier() {
- return new AddModuleDependenciesPropertiesPage.RuntimePathCellModifier(){
- @Override
- public boolean canModify(Object element, String property) {
- if( property.equals(DEPLOY_PATH_PROPERTY) && element instanceof ClasspathEntryProxy) {
- return true;
- }
- return super.canModify(element, property);
- }
-
- @Override
- public Object getValue(Object element, String property) {
- if(element instanceof ClasspathEntryProxy){
- IClasspathEntry entry = ((ClasspathEntryProxy)element).entry;
- IPath runtimePath = ClasspathDependencyUtil.getRuntimePath(entry);
- if(runtimePath.isRoot())
- return runtimePath.toString();
- return runtimePath.makeRelative().toString();
- }
- return super.getValue(element, property);
- }
-
- @Override
- public void modify(Object element, String property, Object value) {
- if (property.equals(DEPLOY_PATH_PROPERTY)) {
- TreeItem item = (TreeItem) element;
- if(item.getData() instanceof ClasspathEntryProxy){
- TreeItem[] components = availableComponentsViewer.getTree().getItems();
- int tableIndex = -1;
- for(int i=0; i < components.length; i++) {
- if(components[i] == item) {
- tableIndex = i;
- break;
- }
- }
- ClasspathEntryProxy proxy = (ClasspathEntryProxy)item.getData();
- IPath runtimePath = new Path(((String)value).trim()).makeRelative();
- if(runtimePath.isEmpty())
- runtimePath = runtimePath.makeAbsolute();
- if(tableIndex >= 0)
- components[tableIndex].setText(AddModuleDependenciesPropertiesPage.DEPLOY_COLUMN, runtimePath.toString());
- if(!ClasspathDependencyUtil.isMappedIntoContainer(runtimePath.toString()))
- runtimePath = runtimePath.makeAbsolute();
- IClasspathEntry newEntry = ClasspathDependencyUtil.modifyDependencyPath(proxy.entry, runtimePath);
- proxy.entry = newEntry;
- resourceMappingsChanged = true;
- }
- }
- super.modify(element, property, value);
- }
- };
- }
-
-
- @Override
- protected boolean saveReferenceChanges() {
- boolean subResult = super.saveReferenceChanges();
- if(!subResult){
- return subResult;
- }
- Map <IPath, IClasspathEntry> modified = new HashMap <IPath, IClasspathEntry>();
-
- Map <IPath, IClasspathEntry> originalMap = new HashMap <IPath, IClasspathEntry>();
- for(IClasspathEntry originalEntry : originalClasspathEntries){
- originalMap.put(originalEntry.getPath(), originalEntry);
- }
-
- for(ClasspathEntryProxy proxy: currentClasspathEntries){
- IClasspathEntry currentEntry = proxy.entry;
- IPath path = currentEntry.getPath();
- IClasspathEntry originalEntry = originalMap.remove(path);
- if(currentEntry.equals(originalEntry)){
- //no change
- continue;
- }
- modified.put(path, currentEntry);
- }
-
- Map <IPath, IClasspathEntry> removed = originalMap;
-
- IJavaProject javaProject = JavaCore.create(rootComponent.getProject());
- try {
- final IClasspathEntry [] rawClasspath = javaProject.getRawClasspath();
- List <IClasspathEntry> newClasspath = new ArrayList <IClasspathEntry>();
- for(IClasspathEntry entry:rawClasspath){
- IPath path = entry.getPath();
- if(removed.containsKey(path)){
- //user removed entry
- IClasspathEntry newEntry = ClasspathDependencyUtil.modifyDependencyPath(entry, null);
- newClasspath.add(newEntry);
- } else if(modified.containsKey(path)){
- //user changed path value
- IClasspathEntry newEntry = modified.get(path);
- IPath runtimePath = ClasspathDependencyUtil.getRuntimePath(newEntry);
- if(runtimePath.toString().length() == 0){
- //prevent the user from specifying no path
- newEntry = ClasspathDependencyUtil.modifyDependencyPath(newEntry, new Path("/")); //$NON-NLS-1$
- }
- newClasspath.add(newEntry);
- } else {
- //no change
- newClasspath.add(entry);
- }
- }
- javaProject.setRawClasspath( newClasspath.toArray( new IClasspathEntry[ newClasspath.size() ] ), null );
-
- originalClasspathEntries.clear();
- currentClasspathEntries.clear();
- resetClasspathEntries();
- } catch (JavaModelException e) {
- J2EEUIPlugin.logError(e);
- return false;
- }
- return true;
- }
-
- @Override
- protected void handleAddDirective( final TaskWizard wizard )
- {
- final List<IClasspathEntry> classpathEntries
- = (List<IClasspathEntry>) wizard.getTaskModel().getObject( AddJavaBuildPathEntriesWizardFragment.PROP_SELECTION );
-
- if( classpathEntries != null && ! classpathEntries.isEmpty() )
- {
- for( IClasspathEntry cpe : classpathEntries )
- {
- this.currentClasspathEntries.add( new ClasspathEntryProxy( cpe ) );
- }
- }
- else
- {
- super.handleAddDirective(wizard);
- }
- }
-
- @Override
- protected void verify() {
- propPage.refreshProblemsView();
- }
-
- @Override
- public IStatus validate() {
- ArrayList<ComponentResourceProxy> allMappings = new ArrayList<ComponentResourceProxy>();
- allMappings.addAll(resourceMappings);
- allMappings.addAll(hiddenMappings);
-
- return J2EEModuleDeploymentAssemblyVerifierHelper.verify(rootComponent, runtime, currentReferences, allMappings,resourceMappingsChanged, currentClasspathEntries);
- }
-
-//
-// @Override
-// protected IDataModelProvider getAddReferenceDataModelProvider(IVirtualComponent component) {
-// return new AddComponentToEnterpriseApplicationDataModelProvider();
-// }
-//
-// protected void addToManifest(ArrayList<IVirtualComponent> components) {
-// StringBuffer newComps = getCompsForManifest(components);
-// if(newComps.toString().length() > 0) {
-// UpdateManifestOperation op = createManifestOperation(newComps.toString());
-// try {
-// op.run(new NullProgressMonitor());
-// } catch (InvocationTargetException e) {
-// J2EEUIPlugin.logError(e);
-// } catch (InterruptedException e) {
-// J2EEUIPlugin.logError(e);
-// }
-// }
-// }
-//
-// protected void addOneComponent(IVirtualComponent component, IPath path, String archiveName) throws CoreException {
-// //Find the Ear's that contain this component
-// IProject[] earProjects = EarUtilities.getReferencingEARProjects(rootComponent.getProject());
-// for (int i = 0; i < earProjects.length; i++) {
-// IProject project = earProjects[i];
-//
-// IDataModelProvider provider = getAddReferenceDataModelProvider(component);
-// IDataModel dm = DataModelFactory.createDataModel(provider);
-//
-// dm.setProperty(ICreateReferenceComponentsDataModelProperties.SOURCE_COMPONENT, ComponentCore.createComponent(project));
-// dm.setProperty(ICreateReferenceComponentsDataModelProperties.TARGET_COMPONENT_LIST, Arrays.asList(component));
-//
-// //[Bug 238264] the uri map needs to be manually set correctly
-// Map<IVirtualComponent, String> uriMap = new HashMap<IVirtualComponent, String>();
-// uriMap.put(component, archiveName);
-// dm.setProperty(ICreateReferenceComponentsDataModelProperties.TARGET_COMPONENTS_TO_URI_MAP, uriMap);
-// dm.setProperty(ICreateReferenceComponentsDataModelProperties.TARGET_COMPONENTS_DEPLOY_PATH, path);
-//
-// IStatus stat = dm.validateProperty(ICreateReferenceComponentsDataModelProperties.TARGET_COMPONENT_LIST);
-// if (stat != OK_STATUS)
-// throw new CoreException(stat);
-// try {
-// dm.getDefaultOperation().execute(new NullProgressMonitor(), null);
-// } catch (ExecutionException e) {
-// ModuleCoreUIPlugin.logError(e);
-// }
-// }
-// }
-//
-//
-// protected StringBuffer getCompsForManifest(ArrayList<IVirtualComponent> components) {
-// StringBuffer newComps = new StringBuffer();
-// for (Iterator iterator = components.iterator(); iterator.hasNext();) {
-// IVirtualComponent comp = (IVirtualComponent) iterator.next();
-// String archiveName = new Path(derivedRefsObjectToRuntimePath.get(comp)).lastSegment();
-// newComps.append(archiveName);
-// newComps.append(' ');
-// }
-// return newComps;
-// }
-//
-// protected UpdateManifestOperation createManifestOperation(String newComps) {
-// return new UpdateManifestOperation(project.getName(), newComps, false);
-// }
-//
-// private void removeFromManifest(ArrayList<IVirtualComponent> removed) {
-// String sourceProjName = project.getName();
-// IProgressMonitor monitor = new NullProgressMonitor();
-// IFile manifestmf = J2EEProjectUtilities.getManifestFile(project);
-// ArchiveManifest mf = J2EEProjectUtilities.readManifest(project);
-// if (mf == null)
-// return;
-// IDataModel updateManifestDataModel = DataModelFactory.createDataModel(new UpdateManifestDataModelProvider());
-// updateManifestDataModel.setProperty(UpdateManifestDataModelProperties.PROJECT_NAME, sourceProjName);
-// updateManifestDataModel.setBooleanProperty(UpdateManifestDataModelProperties.MERGE, false);
-// updateManifestDataModel.setProperty(UpdateManifestDataModelProperties.MANIFEST_FILE, manifestmf);
-// String[] cp = mf.getClassPathTokenized();
-// List cpList = new ArrayList();
-//
-// for (int i = 0; i < cp.length; i++) {
-// boolean foundMatch = false;
-// for (Iterator iterator = removed.iterator(); iterator.hasNext();) {
-// IVirtualComponent comp = (IVirtualComponent) iterator.next();
-// String cpToRemove = new Path(derivedRefsOldComponentToRuntimePath.get(comp)).lastSegment();
-// if (cp[i].equals(cpToRemove))
-// foundMatch = true;
-// }
-// if (!foundMatch)
-// cpList.add(cp[i]);
-// }
-// updateManifestDataModel.setProperty(UpdateManifestDataModelProperties.JAR_LIST, cpList);
-// try {
-// updateManifestDataModel.getDefaultOperation().execute(monitor, null );
-// } catch (ExecutionException e) {
-// J2EEUIPlugin.logError(e);
-// }
-// }
-
-}
diff --git a/plugins/org.eclipse.jst.j2ee.ui/j2ee_ui/org/eclipse/jst/j2ee/internal/ui/J2EEModuleDeploymentAssemblyVerifierData.java b/plugins/org.eclipse.jst.j2ee.ui/j2ee_ui/org/eclipse/jst/j2ee/internal/ui/J2EEModuleDeploymentAssemblyVerifierData.java
deleted file mode 100644
index af9bb7a..0000000
--- a/plugins/org.eclipse.jst.j2ee.ui/j2ee_ui/org/eclipse/jst/j2ee/internal/ui/J2EEModuleDeploymentAssemblyVerifierData.java
+++ /dev/null
@@ -1,38 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2010 IBM Corporation and others.
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
- *
- * Contributors:
- * IBM Corporation - initial API and implementation
- *******************************************************************************/
-package org.eclipse.jst.j2ee.internal.ui;
-
-import java.util.ArrayList;
-import java.util.List;
-
-import org.eclipse.jst.j2ee.internal.ui.J2EEModuleDependenciesPropertyPage.ClasspathEntryProxy;
-import org.eclipse.wst.common.componentcore.resources.IVirtualComponent;
-import org.eclipse.wst.common.componentcore.resources.IVirtualReference;
-import org.eclipse.wst.common.componentcore.ui.internal.propertypage.verifier.DeploymentAssemblyVerifierData;
-import org.eclipse.wst.common.componentcore.ui.propertypage.AddModuleDependenciesPropertiesPage.ComponentResourceProxy;
-import org.eclipse.wst.server.core.IRuntime;
-
-public class J2EEModuleDeploymentAssemblyVerifierData extends DeploymentAssemblyVerifierData{
-
- public J2EEModuleDeploymentAssemblyVerifierData(IVirtualComponent component, IRuntime runtime, ArrayList<IVirtualReference> currentReferences,
- ArrayList<ComponentResourceProxy> resourceMappings, boolean resourceMappingsChanged, List<ClasspathEntryProxy> currentClasspathEntries2) {
- super(component, runtime, currentReferences,resourceMappings, resourceMappingsChanged);
- this.currentClasspathEntries = currentClasspathEntries2;
- }
- private List<ClasspathEntryProxy> currentClasspathEntries;
-
- public List<ClasspathEntryProxy> getCurrentClasspathEntries() {
- return currentClasspathEntries;
- }
- public void setCurrentClasspathEntries(List<ClasspathEntryProxy> currentClasspathEntries) {
- this.currentClasspathEntries = currentClasspathEntries;
- }
-}
diff --git a/plugins/org.eclipse.jst.j2ee.ui/j2ee_ui/org/eclipse/jst/j2ee/internal/ui/J2EEModuleDeploymentAssemblyVerifierHelper.java b/plugins/org.eclipse.jst.j2ee.ui/j2ee_ui/org/eclipse/jst/j2ee/internal/ui/J2EEModuleDeploymentAssemblyVerifierHelper.java
deleted file mode 100644
index c8b1468..0000000
--- a/plugins/org.eclipse.jst.j2ee.ui/j2ee_ui/org/eclipse/jst/j2ee/internal/ui/J2EEModuleDeploymentAssemblyVerifierHelper.java
+++ /dev/null
@@ -1,74 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2010 IBM Corporation and others.
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
- *
- * Contributors:
- * IBM Corporation - initial API and implementation
- *******************************************************************************/
-package org.eclipse.jst.j2ee.internal.ui;
-
-import java.util.ArrayList;
-import java.util.List;
-
-import org.eclipse.core.resources.IProject;
-import org.eclipse.core.runtime.IConfigurationElement;
-import org.eclipse.core.runtime.IStatus;
-import org.eclipse.core.runtime.MultiStatus;
-import org.eclipse.core.runtime.Status;
-import org.eclipse.jst.j2ee.internal.ui.J2EEModuleDependenciesPropertyPage.ClasspathEntryProxy;
-import org.eclipse.wst.common.componentcore.resources.IVirtualComponent;
-import org.eclipse.wst.common.componentcore.resources.IVirtualReference;
-import org.eclipse.wst.common.componentcore.ui.Messages;
-import org.eclipse.wst.common.componentcore.ui.ModuleCoreUIPlugin;
-import org.eclipse.wst.common.componentcore.ui.internal.propertypage.verifier.DeploymentAssemblyVerifierHelper;
-import org.eclipse.wst.common.componentcore.ui.internal.propertypage.verifier.IDeploymentAssemblyVerifier;
-import org.eclipse.wst.common.componentcore.ui.internal.propertypage.verifier.VerifierRegistryReader;
-import org.eclipse.wst.common.componentcore.ui.propertypage.AddModuleDependenciesPropertiesPage.ComponentResourceProxy;
-import org.eclipse.wst.server.core.IRuntime;
-
-public class J2EEModuleDeploymentAssemblyVerifierHelper {
-
-
- /**
- * This method will use the facet framework to find all registered verifiers based on installed facets and runtimes.
- * All the verifiers will have an opportunity to verify and return status on the proposed component mappings
- * @param component
- * @param runtime
- * @param resourceMappingsChanged
- * @param resourceMappings
- * @param currentReferences
- * @param currentClasspathEntries
- * @return IStatus
- */
- public static IStatus verify(IVirtualComponent component,IRuntime runtime, ArrayList<IVirtualReference> currentReferences, ArrayList<ComponentResourceProxy> resourceMappings, boolean resourceMappingsChanged, List<ClasspathEntryProxy> currentClasspathEntries) {
- IProject project = component.getProject();
-
- List verifiers = DeploymentAssemblyVerifierHelper.collectAllVerifiers(project,runtime);
- if (verifiers.isEmpty()) return Status.OK_STATUS;
- MultiStatus masterStatus = new MultiStatus(ModuleCoreUIPlugin.PLUGIN_ID, IStatus.OK, Messages.DeploymentAssemblyVerifierHelper_0,null);
-
- for (int i = 0; i < verifiers.size(); i++) {
- if (!(verifiers.get(i) instanceof IConfigurationElement))
- continue;
- IDeploymentAssemblyVerifier verifier = null;
- try {
- verifier = (IDeploymentAssemblyVerifier) ((IConfigurationElement) verifiers.get(i)).createExecutableExtension(VerifierRegistryReader.VERIFIER_CLASS);
- J2EEModuleDeploymentAssemblyVerifierData data = new J2EEModuleDeploymentAssemblyVerifierData(component, runtime,currentReferences,resourceMappings,resourceMappingsChanged,currentClasspathEntries );
- IStatus verifyStatus = verifier.verify(data);
- if(verifyStatus != null && verifyStatus.isMultiStatus()) {
- masterStatus.addAll(verifyStatus);
- } else {
- masterStatus.add(verifyStatus);
- }
- } catch (Exception e) {
- ModuleCoreUIPlugin.log(e);
- continue;
- }
-
- }
- return masterStatus;
- }
-}
diff --git a/plugins/org.eclipse.jst.j2ee.ui/j2ee_ui/org/eclipse/jst/j2ee/internal/ui/J2EEPropertiesPage.java b/plugins/org.eclipse.jst.j2ee.ui/j2ee_ui/org/eclipse/jst/j2ee/internal/ui/J2EEPropertiesPage.java
deleted file mode 100644
index 4c5c2f0..0000000
--- a/plugins/org.eclipse.jst.j2ee.ui/j2ee_ui/org/eclipse/jst/j2ee/internal/ui/J2EEPropertiesPage.java
+++ /dev/null
@@ -1,178 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2006, 2007 IBM Corporation and others.
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
- *
- * Contributors:
- * IBM Corporation - initial API and implementation
- * David Schneider, david.schneider@unisys.com - [142500] WTP properties pages fonts don't follow Eclipse preferences
- *******************************************************************************/
-
-package org.eclipse.jst.j2ee.internal.ui;
-
-import org.eclipse.core.resources.IProject;
-import org.eclipse.core.runtime.IStatus;
-import org.eclipse.jface.dialogs.IDialogConstants;
-import org.eclipse.jface.layout.GridDataFactory;
-import org.eclipse.jface.layout.GridLayoutFactory;
-import org.eclipse.jst.j2ee.internal.J2EEPropertiesConstants;
-import org.eclipse.jst.j2ee.internal.ui.refactoring.RenameContextRootChange;
-import org.eclipse.jst.j2ee.internal.ui.refactoring.RenameContextRootRefactoringProcessor;
-import org.eclipse.jst.j2ee.internal.ui.refactoring.RenameContextRootWizard;
-import org.eclipse.jst.j2ee.project.JavaEEProjectUtilities;
-import org.eclipse.ltk.ui.refactoring.RefactoringWizard;
-import org.eclipse.ltk.ui.refactoring.RefactoringWizardOpenOperation;
-import org.eclipse.swt.SWT;
-import org.eclipse.swt.events.ModifyEvent;
-import org.eclipse.swt.events.ModifyListener;
-import org.eclipse.swt.widgets.Composite;
-import org.eclipse.swt.widgets.Control;
-import org.eclipse.swt.widgets.Label;
-import org.eclipse.swt.widgets.Text;
-import org.eclipse.ui.dialogs.PropertyPage;
-import org.eclipse.wst.common.componentcore.internal.util.ComponentUtilities;
-
-public class J2EEPropertiesPage extends PropertyPage implements J2EEPropertiesConstants {
-
- private Text contextRootNameField;
- private boolean dirty = false;
-
- /**
- * @see org.eclipse.jface.preference.PreferencePage#createContents(Composite)
- */
- @Override
- protected Control createContents(Composite parent) {
- Composite c = parent;
- IProject project = getProject();
- if (project != null
- && JavaEEProjectUtilities.getJ2EEProjectType(project).equals(
- JavaEEProjectUtilities.DYNAMIC_WEB)
- || JavaEEProjectUtilities.getJ2EEProjectType(project).equals(
- JavaEEProjectUtilities.STATIC_WEB)) {
-
- c = new Composite(parent, SWT.NONE);
-
- Label contextRootLabel = new Label(c, SWT.NONE);
- contextRootLabel.setText(J2EEPropertiesConstants.WEB_CONTEXT_ROOT);
-
- contextRootNameField = new Text(c, SWT.BORDER);
- contextRootNameField.addModifyListener(new ModifyListener() {
-
- public void modifyText(ModifyEvent e) {
- dirty = !contextRootNameField.getText().equals(
- ComponentUtilities.getServerContextRoot(getProject()));
- validateText();
- }
- });
- GridLayoutFactory.fillDefaults().numColumns(2).applyTo(c);
- GridDataFactory.defaultsFor(contextRootLabel).applyTo(contextRootLabel);
- GridDataFactory.defaultsFor(contextRootNameField).grab(true, false).applyTo(
- contextRootNameField);
- }
- applyDialogFont(c);
- return c;
- }
-
- @Override
- public void createControl(Composite parent) {
- super.createControl(parent);
- refresh();
- refreshApplyButton();
- }
-
- private void validateText() {
- IStatus status = RenameContextRootChange
- .validateContextRoot(contextRootNameField.getText());
- if (!status.isOK()) {
- setErrorMessage(status.getMessage());
- setValid(false);
- }
- else {
- setErrorMessage(null);
- setValid(true);
- refreshApplyButton();
- }
- }
-
- private void refreshApplyButton() {
- if (dirty) {
- if (getApplyButton() != null) {
- getApplyButton().setEnabled(true);
- }
- }
- else {
- if (getApplyButton() != null) {
- getApplyButton().setEnabled(false);
- }
- }
- }
-
- public void refresh() {
- if (contextRootNameField != null) {
- String s = ComponentUtilities.getServerContextRoot(getProject());
- if (s == null) {
- s = ""; //$NON-NLS-1$
- }
- contextRootNameField.setText(s);
- validateText();
- }
- }
-
- private IProject getProject() {
-
- Object element = getElement();
- if (element == null) {
- return null;
- }
- if (element instanceof IProject) {
- IProject project = (IProject) element;
- return project;
- }
- return null;
-
- }
-
- private int doRefactor() {
- int id = IDialogConstants.OK_ID;
- if (dirty) {
- RenameContextRootRefactoringProcessor processor = new RenameContextRootRefactoringProcessor();
- processor.setProject(getProject());
- processor.setNewName(contextRootNameField.getText());
- RenameContextRootWizard wizard = new RenameContextRootWizard(processor,
- RefactoringWizard.DIALOG_BASED_USER_INTERFACE);
- wizard.setPrompt(false);
- RefactoringWizardOpenOperation operation = new RefactoringWizardOpenOperation(wizard);
-
- try {
- id = operation.run(getShell(), ""); //$NON-NLS-1$
- }
- catch (InterruptedException ee) {
-
- }
- if (id == IDialogConstants.OK_ID) {
- dirty = false;
- refresh();
- }
- }
-
- return id;
- }
-
- @Override
- protected void performApply() {
- doRefactor();
- }
-
- @Override
- protected void performDefaults() {
- refresh();
- }
-
- @Override
- public boolean performOk() {
- return doRefactor() == IDialogConstants.OK_ID;
- }
-
-}
diff --git a/plugins/org.eclipse.jst.j2ee.ui/j2ee_ui/org/eclipse/jst/j2ee/internal/ui/JavaEEComponentDependencyContentProvider.java b/plugins/org.eclipse.jst.j2ee.ui/j2ee_ui/org/eclipse/jst/j2ee/internal/ui/JavaEEComponentDependencyContentProvider.java
deleted file mode 100644
index dd50b94..0000000
--- a/plugins/org.eclipse.jst.j2ee.ui/j2ee_ui/org/eclipse/jst/j2ee/internal/ui/JavaEEComponentDependencyContentProvider.java
+++ /dev/null
@@ -1,143 +0,0 @@
-package org.eclipse.jst.j2ee.internal.ui;
-
-import java.util.ArrayList;
-import java.util.List;
-
-import org.eclipse.core.runtime.IPath;
-import org.eclipse.core.runtime.Path;
-import org.eclipse.jdt.core.IClasspathAttribute;
-import org.eclipse.jdt.core.IClasspathEntry;
-import org.eclipse.jdt.core.IJavaProject;
-import org.eclipse.jdt.core.JavaCore;
-import org.eclipse.jst.j2ee.classpathdep.ClasspathDependencyUtil;
-import org.eclipse.jst.j2ee.classpathdep.IClasspathDependencyConstants.DependencyAttributeType;
-import org.eclipse.jst.j2ee.internal.ui.J2EEModuleDependenciesPropertyPage.ClasspathEntryProxy;
-import org.eclipse.swt.graphics.Image;
-import org.eclipse.wst.common.componentcore.resources.IVirtualComponent;
-import org.eclipse.wst.common.componentcore.resources.IVirtualReference;
-import org.eclipse.wst.common.componentcore.ui.ModuleCoreUIPlugin;
-import org.eclipse.wst.common.componentcore.ui.internal.propertypage.ComponentDependencyContentProvider;
-import org.eclipse.wst.common.componentcore.ui.propertypage.AddModuleDependenciesPropertiesPage;
-
-/**
- * Same as {@link ComponentDependencyContentProvider} except this pulls in
- * references tagged in the classpath to be pulled up by modules with ../
- *
- * @author jsholl
- *
- */
-public class JavaEEComponentDependencyContentProvider extends ComponentDependencyContentProvider {
-
- public JavaEEComponentDependencyContentProvider(AddModuleDependenciesPropertiesPage addModuleDependenciesPropertiesPage) {
- super(addModuleDependenciesPropertiesPage);
- }
-
- public class ConsumedClasspathEntryProxy {
- public IClasspathEntry entry;
- public ConsumedClasspathEntryProxy(IClasspathEntry entry){
- this.entry = entry;
- }
- }
-
- protected List<ClasspathEntryProxy> classpathEntries = null;
-
- public void setClasspathEntries(List<ClasspathEntryProxy> classpathEntries) {
- this.classpathEntries = classpathEntries;
- }
-
- @Override
- public Object[] getElements(Object inputElement) {
- @SuppressWarnings("restriction")
- Object[] superElements = super.getElements(inputElement);
- List<Object> elements = new ArrayList<Object>();
- for (Object obj : superElements) {
- elements.add(obj);
- }
- elements.addAll(classpathEntries);
- return elements.toArray();
- }
-
- @Override
- public String getColumnText(Object element, int columnIndex) {
- if (element instanceof ClasspathEntryProxy || element instanceof ConsumedClasspathEntryProxy) {
- IClasspathEntry classpathEntry = ((element instanceof ConsumedClasspathEntryProxy) ? ((ConsumedClasspathEntryProxy)element).entry : ((ClasspathEntryProxy) element).entry);
- if (columnIndex == AddModuleDependenciesPropertiesPage.SOURCE_COLUMN) {
- final IJavaProject jproj = JavaCore.create(getComponent().getProject());
- return AddJavaBuildPathEntriesWizardFragment.getClasspathEntryText(jproj, classpathEntry);
- } else if (columnIndex == AddModuleDependenciesPropertiesPage.DEPLOY_COLUMN) {
- IClasspathAttribute attribute = ClasspathDependencyUtil.checkForComponentDependencyAttribute(classpathEntry, DependencyAttributeType.CLASSPATH_COMPONENT_DEPENDENCY);
- if (attribute != null) {
- IPath runtimePath = new Path(attribute.getValue());
- if(runtimePath.isRoot())
- return runtimePath.toString();
- return runtimePath.makeRelative().toString();
- }
- return null;
- }
- }
- return super.getColumnText(element, columnIndex);
- }
-
- @Override
- public Image getColumnImage(Object element, int columnIndex) {
- if (element instanceof ClasspathEntryProxy || element instanceof ConsumedClasspathEntryProxy) {
- if (columnIndex == AddModuleDependenciesPropertiesPage.SOURCE_COLUMN) {
- final IJavaProject jproj = JavaCore.create(getComponent().getProject());
- IClasspathEntry classpathEntry = ((element instanceof ConsumedClasspathEntryProxy) ? ((ConsumedClasspathEntryProxy)element).entry : ((ClasspathEntryProxy) element).entry);
- return AddJavaBuildPathEntriesWizardFragment.getClasspathEntryImage(jproj, classpathEntry);
- } else if(columnIndex == AddModuleDependenciesPropertiesPage.DEPLOY_COLUMN) {
- if(element instanceof ConsumedClasspathEntryProxy){
- IClasspathEntry classpathEntry = ((ConsumedClasspathEntryProxy)element).entry;
- if(classpathEntry.getEntryKind() == IClasspathEntry.CPE_LIBRARY){
- final IJavaProject jproj = JavaCore.create(getComponent().getProject());
- return AddJavaBuildPathEntriesWizardFragment.getClasspathEntryImage(jproj, classpathEntry);
- }
- }
- return ModuleCoreUIPlugin.getInstance().getImage("folder"); //$NON-NLS-1$
- }
- }
- return super.getColumnImage(element, columnIndex);
- }
-
-
- @Override
- public boolean hasChildren(Object element) {
- Object [] children = getChildren(element);
- return children != null && children.length > 0;
- }
-
- @Override
- public Object getParent(Object element) {
- return null;
- }
-
- @Override
- public Object[] getChildren(Object parentElement) {
- if(parentElement instanceof IVirtualReference){
- IVirtualReference ref = (IVirtualReference)parentElement;
- IPath refRuntimePath = ref.getRuntimePath();
- IVirtualComponent comp = ref.getReferencedComponent();
- if(!comp.isBinary()){
- List <IClasspathEntry> originalClasspathEntries = J2EEModuleDependenciesPropertyPage.readRawEntries(comp);
- List <ConsumedClasspathEntryProxy> relativeClasspathEntries = new ArrayList<ConsumedClasspathEntryProxy>();
- for(IClasspathEntry classpathEntry : originalClasspathEntries){
- IClasspathAttribute attribute = ClasspathDependencyUtil.checkForComponentDependencyAttribute(classpathEntry, DependencyAttributeType.CLASSPATH_COMPONENT_DEPENDENCY);
- if (attribute != null) {
- String rawValue = attribute.getValue();
- if(rawValue.startsWith("../")){ //$NON-NLS-1$
- IPath basePath = new Path(rawValue);
- IPath path = refRuntimePath.append(basePath.removeFirstSegments(1));
- if(classpathEntry.getEntryKind() == IClasspathEntry.CPE_LIBRARY){
- path = path.append(classpathEntry.getPath().lastSegment());
- }
- IClasspathEntry relativeEntry = ClasspathDependencyUtil.modifyDependencyPath(classpathEntry, path);
- relativeClasspathEntries.add(new ConsumedClasspathEntryProxy(relativeEntry));
- }
- }
- }
- return relativeClasspathEntries.toArray();
- }
- }
- return super.getChildren(parentElement);
- }
-}
diff --git a/plugins/org.eclipse.jst.j2ee.ui/j2ee_ui/org/eclipse/jst/j2ee/internal/ui/Messages.java b/plugins/org.eclipse.jst.j2ee.ui/j2ee_ui/org/eclipse/jst/j2ee/internal/ui/Messages.java
deleted file mode 100644
index 649a90c..0000000
--- a/plugins/org.eclipse.jst.j2ee.ui/j2ee_ui/org/eclipse/jst/j2ee/internal/ui/Messages.java
+++ /dev/null
@@ -1,28 +0,0 @@
-package org.eclipse.jst.j2ee.internal.ui;
-
-import org.eclipse.osgi.util.NLS;
-
-public class Messages extends NLS {
- private static final String BUNDLE_NAME = "org.eclipse.jst.j2ee.internal.ui.messages"; //$NON-NLS-1$
- public static String J2EEDependencyPageProvider_0;
- public static String J2EEDependencyPageProvider_1;
- public static String J2EEDependencyPageProvider_2;
- public static String J2EEDependencyPageProvider_3;
- public static String J2EEDependencyPageProvider_4;
- public static String J2EEDependencyPageProvider_5;
- public static String J2EEModuleDependenciesPropertyPage_0;
- public static String J2EEModuleDependenciesPropertyPage_1;
- public static String J2EEModuleDependenciesPropertyPage_2;
- public static String J2EEModuleDependenciesPropertyPage_3;
- public static String J2EEModuleDependenciesPropertyPage_4;
- public static String J2EEModuleDependenciesPropertyPage_5;
- public static String J2EEModuleDependenciesPropertyPage_6;
-
- static {
- // initialize resource bundle
- NLS.initializeMessages(BUNDLE_NAME, Messages.class);
- }
-
- private Messages() {
- }
-}
diff --git a/plugins/org.eclipse.jst.j2ee.ui/j2ee_ui/org/eclipse/jst/j2ee/internal/ui/WtpOsgiBundlesLibraryProviderInstallPanel.java b/plugins/org.eclipse.jst.j2ee.ui/j2ee_ui/org/eclipse/jst/j2ee/internal/ui/WtpOsgiBundlesLibraryProviderInstallPanel.java
deleted file mode 100644
index 00aaeb6..0000000
--- a/plugins/org.eclipse.jst.j2ee.ui/j2ee_ui/org/eclipse/jst/j2ee/internal/ui/WtpOsgiBundlesLibraryProviderInstallPanel.java
+++ /dev/null
@@ -1,97 +0,0 @@
-/******************************************************************************
- * Copyright (c) 2008 Oracle
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
- *
- * Contributors:
- * Konstantin Komissarchik - initial implementation and ongoing maintenance
- ******************************************************************************/
-
-package org.eclipse.jst.j2ee.internal.ui;
-
-import org.eclipse.jst.common.project.facet.core.libprov.IPropertyChangeListener;
-import org.eclipse.jst.common.project.facet.ui.libprov.osgi.OsgiBundlesLibraryProviderInstallPanel;
-import org.eclipse.jst.j2ee.internal.common.classpath.WtpOsgiBundlesLibraryProviderInstallOperationConfig;
-import org.eclipse.osgi.util.NLS;
-import org.eclipse.swt.SWT;
-import org.eclipse.swt.events.DisposeEvent;
-import org.eclipse.swt.events.DisposeListener;
-import org.eclipse.swt.events.SelectionAdapter;
-import org.eclipse.swt.events.SelectionEvent;
-import org.eclipse.swt.widgets.Button;
-import org.eclipse.swt.widgets.Composite;
-import org.eclipse.swt.widgets.Control;
-
-/**
- * @author <a href="mailto:konstantin.komissarchik@oracle.com">Konstantin Komissarchik</a>
- */
-
-public class WtpOsgiBundlesLibraryProviderInstallPanel
-
- extends OsgiBundlesLibraryProviderInstallPanel
-
-{
- @Override
- protected Control createFooter( final Composite composite )
- {
- final WtpOsgiBundlesLibraryProviderInstallOperationConfig cfg
- = (WtpOsgiBundlesLibraryProviderInstallOperationConfig) getOperationConfig();
-
- final Button copyOnPublishCheckBox = new Button( composite, SWT.CHECK );
- copyOnPublishCheckBox.setText( Resources.copyLibraries );
- copyOnPublishCheckBox.setSelection( cfg.isIncludeWithApplicationEnabled() );
-
- copyOnPublishCheckBox.addSelectionListener
- (
- new SelectionAdapter()
- {
- @Override
- public void widgetSelected( final SelectionEvent event )
- {
- cfg.setIncludeWithApplicationEnabled( copyOnPublishCheckBox.getSelection() );
- }
- }
- );
-
- final IPropertyChangeListener listener = new IPropertyChangeListener()
- {
- public void propertyChanged( final String property,
- final Object oldValue,
- final Object newValue )
- {
- copyOnPublishCheckBox.setSelection( cfg.isIncludeWithApplicationEnabled() );
- }
- };
-
- cfg.addListener( listener, WtpOsgiBundlesLibraryProviderInstallOperationConfig.PROP_INCLUDE_WITH_APPLICATION_ENABLED );
-
- copyOnPublishCheckBox.addDisposeListener
- (
- new DisposeListener()
- {
- public void widgetDisposed( final DisposeEvent event )
- {
- cfg.removeListener( listener );
- }
- }
- );
-
- return copyOnPublishCheckBox;
- }
-
- private static final class Resources
-
- extends NLS
-
- {
- public static String copyLibraries;
-
- static
- {
- initializeMessages( WtpOsgiBundlesLibraryProviderInstallPanel.class.getName(),
- Resources.class );
- }
- }
-}
diff --git a/plugins/org.eclipse.jst.j2ee.ui/j2ee_ui/org/eclipse/jst/j2ee/internal/ui/WtpOsgiBundlesLibraryProviderInstallPanel.properties b/plugins/org.eclipse.jst.j2ee.ui/j2ee_ui/org/eclipse/jst/j2ee/internal/ui/WtpOsgiBundlesLibraryProviderInstallPanel.properties
deleted file mode 100644
index fc11daf..0000000
--- a/plugins/org.eclipse.jst.j2ee.ui/j2ee_ui/org/eclipse/jst/j2ee/internal/ui/WtpOsgiBundlesLibraryProviderInstallPanel.properties
+++ /dev/null
@@ -1 +0,0 @@
-copyLibraries = &Include libraries with this application
diff --git a/plugins/org.eclipse.jst.j2ee.ui/j2ee_ui/org/eclipse/jst/j2ee/internal/ui/WtpUserLibraryProviderInstallPanel.java b/plugins/org.eclipse.jst.j2ee.ui/j2ee_ui/org/eclipse/jst/j2ee/internal/ui/WtpUserLibraryProviderInstallPanel.java
deleted file mode 100644
index f457e12..0000000
--- a/plugins/org.eclipse.jst.j2ee.ui/j2ee_ui/org/eclipse/jst/j2ee/internal/ui/WtpUserLibraryProviderInstallPanel.java
+++ /dev/null
@@ -1,97 +0,0 @@
-/******************************************************************************
- * Copyright (c) 2008 Oracle
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
- *
- * Contributors:
- * Konstantin Komissarchik - initial implementation and ongoing maintenance
- ******************************************************************************/
-
-package org.eclipse.jst.j2ee.internal.ui;
-
-import org.eclipse.jst.common.project.facet.core.libprov.IPropertyChangeListener;
-import org.eclipse.jst.common.project.facet.ui.libprov.user.UserLibraryProviderInstallPanel;
-import org.eclipse.jst.j2ee.internal.common.classpath.WtpUserLibraryProviderInstallOperationConfig;
-import org.eclipse.osgi.util.NLS;
-import org.eclipse.swt.SWT;
-import org.eclipse.swt.events.DisposeEvent;
-import org.eclipse.swt.events.DisposeListener;
-import org.eclipse.swt.events.SelectionAdapter;
-import org.eclipse.swt.events.SelectionEvent;
-import org.eclipse.swt.widgets.Button;
-import org.eclipse.swt.widgets.Composite;
-import org.eclipse.swt.widgets.Control;
-
-/**
- * @author <a href="mailto:konstantin.komissarchik@oracle.com">Konstantin Komissarchik</a>
- */
-
-public class WtpUserLibraryProviderInstallPanel
-
- extends UserLibraryProviderInstallPanel
-
-{
- @Override
- protected Control createControlNextToManageHyperlink( final Composite composite )
- {
- final WtpUserLibraryProviderInstallOperationConfig cfg
- = (WtpUserLibraryProviderInstallOperationConfig) getOperationConfig();
-
- final Button copyOnPublishCheckBox = new Button( composite, SWT.CHECK );
- copyOnPublishCheckBox.setText( Resources.copyLibraries );
- copyOnPublishCheckBox.setSelection( cfg.isIncludeWithApplicationEnabled() );
-
- copyOnPublishCheckBox.addSelectionListener
- (
- new SelectionAdapter()
- {
- @Override
- public void widgetSelected( final SelectionEvent event )
- {
- cfg.setIncludeWithApplicationEnabled( copyOnPublishCheckBox.getSelection() );
- }
- }
- );
-
- final IPropertyChangeListener listener = new IPropertyChangeListener()
- {
- public void propertyChanged( final String property,
- final Object oldValue,
- final Object newValue )
- {
- copyOnPublishCheckBox.setSelection( cfg.isIncludeWithApplicationEnabled() );
- }
- };
-
- cfg.addListener( listener, WtpUserLibraryProviderInstallOperationConfig.PROP_INCLUDE_WITH_APPLICATION_ENABLED );
-
- copyOnPublishCheckBox.addDisposeListener
- (
- new DisposeListener()
- {
- public void widgetDisposed( final DisposeEvent event )
- {
- cfg.removeListener( listener );
- }
- }
- );
-
- return copyOnPublishCheckBox;
- }
-
- private static final class Resources
-
- extends NLS
-
- {
- public static String copyLibraries;
-
- static
- {
- initializeMessages( WtpUserLibraryProviderInstallPanel.class.getName(),
- Resources.class );
- }
- }
-}
diff --git a/plugins/org.eclipse.jst.j2ee.ui/j2ee_ui/org/eclipse/jst/j2ee/internal/ui/WtpUserLibraryProviderInstallPanel.properties b/plugins/org.eclipse.jst.j2ee.ui/j2ee_ui/org/eclipse/jst/j2ee/internal/ui/WtpUserLibraryProviderInstallPanel.properties
deleted file mode 100644
index fc11daf..0000000
--- a/plugins/org.eclipse.jst.j2ee.ui/j2ee_ui/org/eclipse/jst/j2ee/internal/ui/WtpUserLibraryProviderInstallPanel.properties
+++ /dev/null
@@ -1 +0,0 @@
-copyLibraries = &Include libraries with this application
diff --git a/plugins/org.eclipse.jst.j2ee.ui/j2ee_ui/org/eclipse/jst/j2ee/internal/ui/messages.properties b/plugins/org.eclipse.jst.j2ee.ui/j2ee_ui/org/eclipse/jst/j2ee/internal/ui/messages.properties
deleted file mode 100644
index 8b11dc6..0000000
--- a/plugins/org.eclipse.jst.j2ee.ui/j2ee_ui/org/eclipse/jst/j2ee/internal/ui/messages.properties
+++ /dev/null
@@ -1,14 +0,0 @@
-J2EEDependencyPageProvider_0=Web Deployment Assembly
-J2EEDependencyPageProvider_1=EJB Deployment Assembly
-J2EEDependencyPageProvider_2=Application Client Deployment Assembly
-J2EEDependencyPageProvider_3=Connector Deployment Assembly
-J2EEDependencyPageProvider_4=Deplo&yment Assembly
-J2EEDependencyPageProvider_5=&Manifest Entries
-J2EEModuleDependenciesPropertyPage_0=Add EJB Module Folder...
-J2EEModuleDependenciesPropertyPage_1=Add App Client Module Folder...
-J2EEModuleDependenciesPropertyPage_2=Add Connector Module Folder...
-J2EEModuleDependenciesPropertyPage_3=Assemble packaging structure for this EJB project
-J2EEModuleDependenciesPropertyPage_4=Assemble packaging structure for this Application Client project
-J2EEModuleDependenciesPropertyPage_5=Assemble packaging structure for this Connector project
-J2EEModuleDependenciesPropertyPage_6=Derived References
-
diff --git a/plugins/org.eclipse.jst.j2ee.ui/j2ee_ui/org/eclipse/jst/j2ee/internal/ui/preferences/ClasspathDependencyComponentLabelProvider.java b/plugins/org.eclipse.jst.j2ee.ui/j2ee_ui/org/eclipse/jst/j2ee/internal/ui/preferences/ClasspathDependencyComponentLabelProvider.java
deleted file mode 100644
index d963d98..0000000
--- a/plugins/org.eclipse.jst.j2ee.ui/j2ee_ui/org/eclipse/jst/j2ee/internal/ui/preferences/ClasspathDependencyComponentLabelProvider.java
+++ /dev/null
@@ -1,32 +0,0 @@
-package org.eclipse.jst.j2ee.internal.ui.preferences;
-
-import org.eclipse.jst.j2ee.internal.modulecore.util.DummyClasspathDependencyContainerVirtualComponent;
-import org.eclipse.jst.j2ee.internal.wizard.AvailableJarsProvider;
-import org.eclipse.swt.graphics.Image;
-import org.eclipse.wst.common.componentcore.resources.IVirtualComponent;
-import org.eclipse.wst.common.componentcore.ui.internal.propertypage.IVirtualComponentLabelProvider;
-
-public class ClasspathDependencyComponentLabelProvider implements
- IVirtualComponentLabelProvider {
-
- public ClasspathDependencyComponentLabelProvider() {
- // Do nothing
- }
-
- public boolean canHandle(IVirtualComponent component) {
- if( component instanceof DummyClasspathDependencyContainerVirtualComponent)
- return true;
- return false;
- }
-
- public String getSourceText(IVirtualComponent component) {
- return Messages.ChildClasspathDependencyDescription;
- }
-
- public Image getSourceImage(IVirtualComponent component) {
- return AvailableJarsProvider.getClasspathDependencyImage();
- }
- public void dispose() {
- // Do nothing
- }
-}
diff --git a/plugins/org.eclipse.jst.j2ee.ui/j2ee_ui/org/eclipse/jst/j2ee/internal/ui/preferences/CustomEARProjectReferenceWizardFragment.java b/plugins/org.eclipse.jst.j2ee.ui/j2ee_ui/org/eclipse/jst/j2ee/internal/ui/preferences/CustomEARProjectReferenceWizardFragment.java
deleted file mode 100644
index 07ec2b0..0000000
--- a/plugins/org.eclipse.jst.j2ee.ui/j2ee_ui/org/eclipse/jst/j2ee/internal/ui/preferences/CustomEARProjectReferenceWizardFragment.java
+++ /dev/null
@@ -1,42 +0,0 @@
-/******************************************************************************
- * Copyright (c) 2009 IBM
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
- *
- * Contributors:
- * Aidyl Kareh - initial implementation
- ******************************************************************************/
-package org.eclipse.jst.j2ee.internal.ui.preferences;
-
-import org.eclipse.core.resources.IProject;
-import org.eclipse.core.runtime.CoreException;
-import org.eclipse.core.runtime.IProgressMonitor;
-import org.eclipse.core.runtime.Path;
-import org.eclipse.jst.j2ee.project.JavaEEProjectUtilities;
-import org.eclipse.wst.common.componentcore.internal.resources.VirtualReference;
-import org.eclipse.wst.common.componentcore.ui.internal.propertypage.ProjectReferenceWizardFragment;
-import org.eclipse.wst.common.componentcore.ui.propertypage.IReferenceWizardConstants;
-
-public class CustomEARProjectReferenceWizardFragment extends ProjectReferenceWizardFragment {
-
- public CustomEARProjectReferenceWizardFragment() {
- super();
- }
-
- @Override
- public void performFinish(IProgressMonitor monitor) throws CoreException {
- super.performFinish(monitor);
- VirtualReference[] refs = (VirtualReference []) getTaskModel().getObject(IReferenceWizardConstants.FINAL_REFERENCE);
- for (int i = 0; i < refs.length; i++) {
- IProject proj = refs[i].getReferencedComponent().getProject();
- if (JavaEEProjectUtilities.isApplicationClientProject(proj) ||
- JavaEEProjectUtilities.isEJBProject(proj) ||
- JavaEEProjectUtilities.isDynamicWebProject(proj) ||
- JavaEEProjectUtilities.isJCAProject(proj)) {
- refs[i].setRuntimePath(new Path("/").makeAbsolute()); //$NON-NLS-1$
- }
- }
- }
-}
diff --git a/plugins/org.eclipse.jst.j2ee.ui/j2ee_ui/org/eclipse/jst/j2ee/internal/ui/preferences/EarModuleDependenciesPropertyPage.java b/plugins/org.eclipse.jst.j2ee.ui/j2ee_ui/org/eclipse/jst/j2ee/internal/ui/preferences/EarModuleDependenciesPropertyPage.java
deleted file mode 100644
index 77ed871..0000000
--- a/plugins/org.eclipse.jst.j2ee.ui/j2ee_ui/org/eclipse/jst/j2ee/internal/ui/preferences/EarModuleDependenciesPropertyPage.java
+++ /dev/null
@@ -1,402 +0,0 @@
-/******************************************************************************
- * Copyright (c) 2009 Red Hat, IBM
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
- *
- * Contributors:
- * Rob Stryker - initial implementation and ongoing maintenance
- * Chuck Bridgham - additional support
- ******************************************************************************/
-package org.eclipse.jst.j2ee.internal.ui.preferences;
-
-import java.util.ArrayList;
-import java.util.List;
-
-import org.eclipse.core.commands.ExecutionException;
-import org.eclipse.core.resources.IProject;
-import org.eclipse.core.runtime.IProgressMonitor;
-import org.eclipse.core.runtime.IStatus;
-import org.eclipse.core.runtime.MultiStatus;
-import org.eclipse.core.runtime.NullProgressMonitor;
-import org.eclipse.core.runtime.Path;
-import org.eclipse.core.runtime.Status;
-import org.eclipse.jface.dialogs.MessageDialog;
-import org.eclipse.jface.fieldassist.ControlDecoration;
-import org.eclipse.jface.fieldassist.FieldDecorationRegistry;
-import org.eclipse.jst.j2ee.application.internal.operations.AddReferenceToEnterpriseApplicationDataModelProvider;
-import org.eclipse.jst.j2ee.application.internal.operations.RemoveReferenceFromEnterpriseApplicationDataModelProvider;
-import org.eclipse.jst.j2ee.internal.J2EEConstants;
-import org.eclipse.jst.j2ee.internal.common.classpath.J2EEComponentClasspathUpdater;
-import org.eclipse.jst.j2ee.internal.componentcore.JavaEEBinaryComponentHelper;
-import org.eclipse.jst.j2ee.internal.componentcore.JavaEEModuleHandler;
-import org.eclipse.jst.j2ee.internal.plugin.J2EEUIMessages;
-import org.eclipse.jst.j2ee.internal.plugin.J2EEUIPlugin;
-import org.eclipse.jst.j2ee.internal.project.J2EEProjectUtilities;
-import org.eclipse.jst.j2ee.internal.ui.J2EEModuleDependenciesPropertyPage.ClasspathEntryProxy;
-import org.eclipse.jst.j2ee.internal.ui.JavaEEComponentDependencyContentProvider;
-import org.eclipse.jst.j2ee.model.IEARModelProvider;
-import org.eclipse.jst.j2ee.model.ModelProviderManager;
-import org.eclipse.jst.j2ee.project.EarUtilities;
-import org.eclipse.jst.j2ee.project.JavaEEProjectUtilities;
-import org.eclipse.jst.javaee.application.Application;
-import org.eclipse.jst.jee.project.facet.EarCreateDeploymentFilesDataModelProvider;
-import org.eclipse.jst.jee.project.facet.ICreateDeploymentFilesDataModelProperties;
-import org.eclipse.jst.jee.util.internal.JavaEEQuickPeek;
-import org.eclipse.swt.SWT;
-import org.eclipse.swt.events.ModifyEvent;
-import org.eclipse.swt.events.ModifyListener;
-import org.eclipse.swt.layout.GridData;
-import org.eclipse.swt.layout.GridLayout;
-import org.eclipse.swt.widgets.Composite;
-import org.eclipse.swt.widgets.Event;
-import org.eclipse.swt.widgets.Label;
-import org.eclipse.swt.widgets.Text;
-import org.eclipse.wst.common.componentcore.internal.IModuleHandler;
-import org.eclipse.wst.common.componentcore.internal.impl.TaskModel;
-import org.eclipse.wst.common.componentcore.internal.resources.VirtualArchiveComponent;
-import org.eclipse.wst.common.componentcore.resources.IVirtualComponent;
-import org.eclipse.wst.common.componentcore.resources.IVirtualFile;
-import org.eclipse.wst.common.componentcore.resources.IVirtualReference;
-import org.eclipse.wst.common.componentcore.ui.internal.propertypage.ComponentDependencyContentProvider;
-import org.eclipse.wst.common.componentcore.ui.internal.propertypage.DependencyPageExtensionManager;
-import org.eclipse.wst.common.componentcore.ui.internal.propertypage.DependencyPageExtensionManager.ReferenceExtension;
-import org.eclipse.wst.common.componentcore.ui.internal.taskwizard.TaskWizard;
-import org.eclipse.wst.common.componentcore.ui.propertypage.AddModuleDependenciesPropertiesPage;
-import org.eclipse.wst.common.componentcore.ui.propertypage.IReferenceWizardConstants;
-import org.eclipse.wst.common.componentcore.ui.propertypage.IReferenceWizardConstants.ProjectConverterOperationProvider;
-import org.eclipse.wst.common.componentcore.ui.propertypage.ModuleAssemblyRootPage;
-import org.eclipse.wst.common.frameworks.datamodel.DataModelFactory;
-import org.eclipse.wst.common.frameworks.datamodel.IDataModel;
-import org.eclipse.wst.common.frameworks.datamodel.IDataModelOperation;
-import org.eclipse.wst.common.frameworks.datamodel.IDataModelProvider;
-
-public class EarModuleDependenciesPropertyPage extends
- AddModuleDependenciesPropertiesPage {
- private String libDir = null;
- private Text libDirText;
- private ControlDecoration libDirTextErrorDecoration = null;
- private static String earDefaultLirDir = new Path(J2EEConstants.EAR_DEFAULT_LIB_DIR).makeRelative().toString();
- boolean previousLibDirIsValid = true;
-
- public EarModuleDependenciesPropertyPage(IProject project,
- ModuleAssemblyRootPage page) {
- super(project, page);
- }
-
- @Override
- protected void createTableComposite(Composite parent) {
- Composite composite = new Composite(parent, SWT.NONE);
- GridData gData = new GridData(GridData.FILL_BOTH);
- composite.setLayoutData(gData);
- fillTableComposite(composite);
- if(JavaEEProjectUtilities.isJEEComponent(rootComponent, JavaEEProjectUtilities.DD_VERSION) && JavaEEProjectUtilities.isJEEComponent(rootComponent, JavaEEProjectUtilities.FACET_VERSION))
- addLibDirComposite(composite);
- }
-
- private String loadLibDirString() {
- return EarUtilities.getEARLibDir(rootComponent);
- }
-
- protected void addLibDirComposite(Composite parent) {
- libDir = loadLibDirString();
- if(libDir != null) {
- Composite c = new Composite(parent, SWT.NONE);
- GridData mainData = new GridData(GridData.FILL_HORIZONTAL);
- c.setLayoutData(mainData);
-
- GridLayout gl = new GridLayout(2,false);
- gl.marginWidth = 0;
- gl.marginHeight = 0;
- c.setLayout(gl);
- Label l = new Label(c, SWT.NONE);
- l.setText(Messages.EarModuleDependenciesPropertyPage_LIBDIR);
- libDirText = new Text(c, SWT.BORDER);
- GridData gd = new GridData(GridData.FILL_HORIZONTAL);
- gd.horizontalIndent = FieldDecorationRegistry.getDefault().getMaximumDecorationWidth();
- libDirText.setText(libDir);
- libDirText.setLayoutData(gd);
- libDirTextErrorDecoration = new ControlDecoration(libDirText, SWT.TOP | SWT.LEAD);
- libDirTextErrorDecoration.hide();
- libDirText.addModifyListener(new ModifyListener() {
- public void modifyText(ModifyEvent e) {
- libDirTextModified();
- } });
- }
- }
-
- protected void libDirTextModified() {
- boolean refresh = mustRefreshLibDirValidationMessages(libDir, libDirText.getText());
- libDir = libDirText.getText();
- if(refresh)
- propPage.refreshProblemsView();
- }
-
- protected boolean mustRefreshLibDirValidationMessages(String oldLibDir, String newLibDir) {
- boolean newIsValid = isValidLibDir(newLibDir);
- boolean newIsEmpty = (newLibDir != null && newLibDir.trim().length() == 0);
- // Both are valid; no need to refresh
- if(previousLibDirIsValid && newIsValid && !newIsEmpty)
- return false;
- boolean oldIsValid = isValidLibDir(oldLibDir);
- boolean oldIsEmpty = (oldLibDir != null && oldLibDir.trim().length() == 0);
- // Both are invalid and no change in reason for being invalid; no need to refresh
- if(!previousLibDirIsValid && oldIsValid == newIsValid && oldIsEmpty == newIsEmpty)
- return false;
- return true;
- }
-
- protected void validatelibDirText() {
- if(libDirTextErrorDecoration != null) {
- if(!isValidLibDir(libDir)) {
- libDirTextErrorDecoration.setImage(FieldDecorationRegistry.getDefault().getFieldDecoration(FieldDecorationRegistry.DEC_ERROR).getImage());
- libDirTextErrorDecoration.setDescriptionText(Messages.EarModuleDependenciesPropertyPage_ERROR_INVALID_LIBDIR);
- libDirTextErrorDecoration.show();
- previousLibDirIsValid = false;
- }else if(libDir != null && libDir.trim().length() == 0){
- libDirTextErrorDecoration.setImage(FieldDecorationRegistry.getDefault().getFieldDecoration(FieldDecorationRegistry.DEC_WARNING).getImage());
- libDirTextErrorDecoration.setDescriptionText(Messages.EarModuleDependenciesPropertyPage_WARNING_EMPTY_LIB_DIR);
- libDirTextErrorDecoration.show();
- previousLibDirIsValid = false;
- } else if(!previousLibDirIsValid){
- previousLibDirIsValid = true;
- libDirTextErrorDecoration.setImage(null);
- libDirTextErrorDecoration.setDescriptionText(null);
- libDirTextErrorDecoration.hide();
- }
- }
- }
-
- private boolean isValidLibDir(String libraryDirectory) {
- if(libraryDirectory != null && libraryDirectory.trim().length() > 0 && new Path(libraryDirectory.trim()).isAbsolute()) {
- return false;
- }
- return true;
- }
-
- protected IDataModelOperation generateEARDDOperation() {
- IDataModel model = DataModelFactory.createDataModel(new EarCreateDeploymentFilesDataModelProvider());
- model.setProperty(ICreateDeploymentFilesDataModelProperties.GENERATE_DD, rootComponent);
- model.setProperty(ICreateDeploymentFilesDataModelProperties.TARGET_PROJECT, project);
- return model.getDefaultOperation();
- }
-
- @Override
- public boolean postHandleChanges(IProgressMonitor monitor) {
- return true;
- }
-
- @Override
- protected void handleRemoved(ArrayList<IVirtualReference> removed) {
- super.handleRemoved(removed);
- boolean binariesRemoved = false;
- for(IVirtualReference ref : removed){
- IVirtualComponent comp = ref.getReferencedComponent();
- if(comp.isBinary()){
- binariesRemoved = true;
- break;
- }
- }
- if(binariesRemoved){
- JavaEEBinaryComponentHelper.clearDisconnectedArchivesInEAR(rootComponent);
- }
- J2EEComponentClasspathUpdater.getInstance().queueUpdateEAR(rootComponent.getProject());
- }
-
- @Override
- protected IDataModelProvider getAddReferenceDataModelProvider(IVirtualReference component) {
- return new AddReferenceToEnterpriseApplicationDataModelProvider();
- }
-
- @Override
- protected String getModuleAssemblyRootPageDescription() {
- return Messages.EarModuleDependenciesPropertyPage_3;
- }
-
- @Override
- protected IDataModelProvider getRemoveReferenceDataModelProvider(IVirtualReference component) {
- return new RemoveReferenceFromEnterpriseApplicationDataModelProvider();
- }
-
- @Override
- protected void filterReferenceTypes( final List<ReferenceExtension> extensions )
- {
- // Replace the default one with our own custom one, in class CustomEARProjectReferenceWizardFragment
-
- for( int i = 0, n = extensions.size(); i < n; i++ )
- {
- final ReferenceExtension ext = extensions.get( i );
-
- if( ext.getId().equals( "org.eclipse.wst.common.componentcore.ui.newProjectReference" ) ) //$NON-NLS-1$
- {
- extensions.set( i, DependencyPageExtensionManager.getManager().findReferenceExtension( "org.eclipse.jst.j2ee.internal.ui.preferences.CustomEARProjectReferenceWizardFragment" ) ); //$NON-NLS-1$
- }
- }
- }
-
- protected void createDD(IProgressMonitor monitor) {
- if( rootComponent != null ){
- IDataModelOperation op = generateEARDDOperation();
- try {
- op.execute(monitor, null);
- } catch (ExecutionException e) {
- J2EEUIPlugin.logError(e);
- }
- }
- }
-
- @Override
- public void handleEvent(Event event) {
- super.handleEvent(event);
- }
-
- @Override
- public boolean performOk() {
- boolean result = super.performOk();
- if(JavaEEProjectUtilities.isJEEComponent(rootComponent, JavaEEProjectUtilities.DD_VERSION) && JavaEEProjectUtilities.isJEEComponent(rootComponent, JavaEEProjectUtilities.FACET_VERSION) && libDir != null)
- updateLibDir();
- return result;
- }
-
- private void updateLibDir() {
- if (!libDir.equals(earDefaultLirDir)) {
- IVirtualFile vFile = rootComponent.getRootFolder().getFile(new Path(J2EEConstants.APPLICATION_DD_URI));
- if (!vFile.exists()) {
- if (!MessageDialog.openQuestion(null,
- J2EEUIMessages.getResourceString(J2EEUIMessages.NO_DD_MSG_TITLE),
- J2EEUIMessages.getResourceString(J2EEUIMessages.GEN_DD_QUESTION)))
- return;
- createDD(new NullProgressMonitor());
- }
- }
-
- final IEARModelProvider earModel = (IEARModelProvider)ModelProviderManager.getModelProvider(project);
- Application app = (Application)earModel.getModelObject();
- String oldLibDir = app.getLibraryDirectory();
- if (libDir.equals(earDefaultLirDir)) {
- if(oldLibDir != null) {
- earModel.modify(new Runnable() {
- public void run() {
- Application app2 = (Application)earModel.getModelObject();
- app2.setLibraryDirectory(null);
- }}, null);
- }
- } else if ((oldLibDir != null && !oldLibDir.equals(libDir)) || oldLibDir == null) {
- earModel.modify(new Runnable() {
- public void run() {
- Application app2 = (Application)earModel.getModelObject();
- app2.setLibraryDirectory(libDir);
- }}, null);
- }
- }
-
- @Override
- protected void setCustomReferenceWizardProperties(TaskModel model) {
- model.putObject(IReferenceWizardConstants.DEFAULT_LIBRARY_LOCATION, libDir);
- model.putObject(IReferenceWizardConstants.PROJECT_CONVERTER_OPERATION_PROVIDER, getConverterProvider());
- }
-
- public ProjectConverterOperationProvider getConverterProvider() {
- return new ProjectConverterOperationProvider() {
- public IDataModelOperation getConversionOperation(IProject project) {
- return J2EEProjectUtilities.createFlexJavaProjectForProjectOperation(project);
- }
- };
- }
-
- @Override
- protected IModuleHandler getModuleHandler() {
- if(moduleHandler == null)
- moduleHandler = new JavaEEModuleHandler();
- return moduleHandler;
- }
-
- @Override
- protected ComponentDependencyContentProvider createProvider() {
- JavaEEComponentDependencyContentProvider provider = new JavaEEComponentDependencyContentProvider(this);
- provider.setClasspathEntries(new ArrayList<ClasspathEntryProxy>());
- return provider;
- }
-
- @Override
- protected boolean canRemove(Object selectedObject) {
- return super.canRemove(selectedObject) && !(selectedObject instanceof JavaEEComponentDependencyContentProvider.ConsumedClasspathEntryProxy);
- }
-
- @Override
- public IStatus validate() {
- IStatus status = super.validate();
- validatelibDirText();
- if(libDirTextErrorDecoration != null && libDirTextErrorDecoration.getImage() != null) {
- int severity = Status.ERROR;
- if(libDirTextErrorDecoration.getImage().equals(FieldDecorationRegistry.getDefault().getFieldDecoration(FieldDecorationRegistry.DEC_WARNING).getImage()))
- severity = Status.WARNING;
- status = appendStatusMessage(status, libDirTextErrorDecoration.getDescriptionText(), severity);
- }
- return status;
- }
-
- @Override
- public void performDefaults() {
- libDir = loadLibDirString();
- if(libDir != null)
- libDirText.setText(libDir);
- super.performDefaults();
- }
-
- private IStatus appendStatusMessage(IStatus existingStatus, String message, int severity) {
- MultiStatus multiStatus;
- IStatus newStatus = new Status(severity, J2EEUIPlugin.PLUGIN_ID, message);
- int newSeverity = severity;
- if(existingStatus.getSeverity() > severity)
- newSeverity = existingStatus.getSeverity();
- if(existingStatus instanceof MultiStatus){
- multiStatus = (MultiStatus)existingStatus;
- multiStatus.merge(newStatus);
- } else {
- if(!existingStatus.isMultiStatus() && existingStatus.isOK()) {
- return newStatus;
- }
- IStatus [] children = new IStatus [] {existingStatus, newStatus};
- multiStatus = new MultiStatus(J2EEUIPlugin.PLUGIN_ID, newSeverity, children, null, null);
- }
- return multiStatus;
- }
-
- @Override
- protected void handleAddDirective( final TaskWizard wizard )
- {
- final Object folderMapping = wizard.getTaskModel().getObject(IReferenceWizardConstants.FOLDER_MAPPING);
-
- if( folderMapping != null && folderMapping instanceof ComponentResourceProxy || libDir == null)
- {
- super.handleAddDirective(wizard);
- }
- else
- {
- Object reference = wizard.getTaskModel().getObject(IReferenceWizardConstants.FINAL_REFERENCE);
-
- if( reference != null )
- {
- IVirtualReference[] referenceArray = reference instanceof IVirtualReference ?
- new IVirtualReference[] { (IVirtualReference)reference } :
- (IVirtualReference[])reference;
- for(int i = 0; i < referenceArray.length; i++) {
- IVirtualComponent component = referenceArray[i].getReferencedComponent();
- if(component instanceof VirtualArchiveComponent) {
- JavaEEQuickPeek qp = JavaEEBinaryComponentHelper.getJavaEEQuickPeek(component);
- switch (qp.getType()) {
- case JavaEEQuickPeek.EJB_TYPE:
- case JavaEEQuickPeek.WEB_TYPE:
- case JavaEEQuickPeek.APPLICATION_CLIENT_TYPE:
- case JavaEEQuickPeek.CONNECTOR_TYPE:
- referenceArray[i].setRuntimePath(new Path("/")); //$NON-NLS-1$
- }
- }
- currentReferences.add(referenceArray[i]);
- }
- }
- }
- }
-}
diff --git a/plugins/org.eclipse.jst.j2ee.ui/j2ee_ui/org/eclipse/jst/j2ee/internal/ui/preferences/EarModuleDependencyPageProvider.java b/plugins/org.eclipse.jst.j2ee.ui/j2ee_ui/org/eclipse/jst/j2ee/internal/ui/preferences/EarModuleDependencyPageProvider.java
deleted file mode 100644
index 4c2724a..0000000
--- a/plugins/org.eclipse.jst.j2ee.ui/j2ee_ui/org/eclipse/jst/j2ee/internal/ui/preferences/EarModuleDependencyPageProvider.java
+++ /dev/null
@@ -1,50 +0,0 @@
-/******************************************************************************
- * Copyright (c) 2009 Red Hat, IBM
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
- *
- * Contributors:
- * Rob Stryker - initial implementation and ongoing maintenance
- * Chuck Bridgham - Additional support
- ******************************************************************************/
-package org.eclipse.jst.j2ee.internal.ui.preferences;
-
-import org.eclipse.core.resources.IProject;
-import org.eclipse.swt.widgets.Composite;
-import org.eclipse.wst.common.componentcore.internal.util.IModuleConstants;
-import org.eclipse.wst.common.componentcore.ui.propertypage.IDependencyPageProvider;
-import org.eclipse.wst.common.componentcore.ui.propertypage.IModuleDependenciesControl;
-import org.eclipse.wst.common.componentcore.ui.propertypage.ModuleAssemblyRootPage;
-import org.eclipse.wst.common.project.facet.core.IFacetedProject;
-import org.eclipse.wst.common.project.facet.core.ProjectFacetsManager;
-
-public class EarModuleDependencyPageProvider implements IDependencyPageProvider {
-
- public boolean canHandle(IFacetedProject project) {
- boolean isEAR = project.hasProjectFacet(ProjectFacetsManager.getProjectFacet(IModuleConstants.JST_EAR_MODULE));
- return isEAR;
- }
-
- public IModuleDependenciesControl[] createPages(IFacetedProject project,
- ModuleAssemblyRootPage parent) {
- return new IModuleDependenciesControl[] {
- new EarModuleDependenciesPropertyPage(project.getProject(), parent)
- };
- }
-
- public Composite createRootControl(IFacetedProject project,IModuleDependenciesControl[] pages,
- Composite parent) {
- if( pages.length == 1 && pages[0] != null)
- return pages[0].createContents(parent);
- return null;
- }
-
- public String getPageTitle(IProject project) {
- return Messages.EarModuleDependencyPageProvider_0;
- }
-
-
-
-}
diff --git a/plugins/org.eclipse.jst.j2ee.ui/j2ee_ui/org/eclipse/jst/j2ee/internal/ui/preferences/IJavaEEPreferencePageExtender.java b/plugins/org.eclipse.jst.j2ee.ui/j2ee_ui/org/eclipse/jst/j2ee/internal/ui/preferences/IJavaEEPreferencePageExtender.java
deleted file mode 100644
index 925a54b..0000000
--- a/plugins/org.eclipse.jst.j2ee.ui/j2ee_ui/org/eclipse/jst/j2ee/internal/ui/preferences/IJavaEEPreferencePageExtender.java
+++ /dev/null
@@ -1,21 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2009 IBM Corporation and others.
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
- *
- * Contributors:
- * IBM Corporation - initial API and implementation
- *******************************************************************************/
-package org.eclipse.jst.j2ee.internal.ui.preferences;
-
-import org.eclipse.swt.widgets.Composite;
-
-public abstract interface IJavaEEPreferencePageExtender {
-
- Composite extendPage(Composite parent);
- void performDefaults();
- boolean performOk();
- void dispose();
-}
diff --git a/plugins/org.eclipse.jst.j2ee.ui/j2ee_ui/org/eclipse/jst/j2ee/internal/ui/preferences/JavaEEPreferencePage.java b/plugins/org.eclipse.jst.j2ee.ui/j2ee_ui/org/eclipse/jst/j2ee/internal/ui/preferences/JavaEEPreferencePage.java
deleted file mode 100644
index 514f5b2..0000000
--- a/plugins/org.eclipse.jst.j2ee.ui/j2ee_ui/org/eclipse/jst/j2ee/internal/ui/preferences/JavaEEPreferencePage.java
+++ /dev/null
@@ -1,111 +0,0 @@
-package org.eclipse.jst.j2ee.internal.ui.preferences;
-
-import java.util.ArrayList;
-import java.util.List;
-
-import org.eclipse.core.runtime.Preferences;
-import org.eclipse.jface.dialogs.IDialogConstants;
-import org.eclipse.jface.preference.PreferencePage;
-import org.eclipse.jst.j2ee.internal.plugin.J2EEPlugin;
-import org.eclipse.jst.j2ee.internal.plugin.J2EEUIMessages;
-import org.eclipse.swt.SWT;
-import org.eclipse.swt.events.SelectionAdapter;
-import org.eclipse.swt.events.SelectionEvent;
-import org.eclipse.swt.layout.GridData;
-import org.eclipse.swt.layout.GridLayout;
-import org.eclipse.swt.widgets.Button;
-import org.eclipse.swt.widgets.Composite;
-import org.eclipse.swt.widgets.Control;
-import org.eclipse.swt.widgets.Group;
-import org.eclipse.ui.IWorkbench;
-import org.eclipse.ui.IWorkbenchPreferencePage;
-
-
-public class JavaEEPreferencePage extends PreferencePage implements
- IWorkbenchPreferencePage {
-
- private Preferences preferences;
- private String name = J2EEPlugin.DYNAMIC_TRANSLATION_OF_JET_TEMPLATES_PREF_KEY;
- private Button showReferences;
- private boolean dynamicTranslation;
- private ArrayList<IJavaEEPreferencePageExtender> extenders = new ArrayList();
-
- public JavaEEPreferencePage() {
- setDescription(J2EEUIMessages.getResourceString(J2EEUIMessages.JAVA_EE_PREFERENCE_PAGE_NAME));
- }
-
- @Override
- protected void performDefaults() {
- preferences.setToDefault(name);
- J2EEPlugin.getDefault().savePluginPreferences();
- dynamicTranslation = preferences.getBoolean(name);
- showReferences.setSelection(dynamicTranslation);
- for(IJavaEEPreferencePageExtender extender : extenders ){
- extender.performDefaults();
- }
-
- super.performDefaults();
- }
-
- @Override
- protected Control createContents(Composite parent) {
- Composite result= new Composite(parent, SWT.NONE);
- GridLayout layout= new GridLayout();
- layout.marginHeight= convertVerticalDLUsToPixels(IDialogConstants.VERTICAL_MARGIN);
- layout.marginWidth= 0;
- layout.verticalSpacing= convertVerticalDLUsToPixels(10);
- layout.horizontalSpacing= convertHorizontalDLUsToPixels(IDialogConstants.HORIZONTAL_SPACING);
- result.setLayout(layout);
- Group buttonComposite= new Group(result, SWT.NONE);
- buttonComposite.setLayout(new GridLayout());
- buttonComposite.setLayoutData(new GridData(GridData.FILL_HORIZONTAL));
- buttonComposite.setText(J2EEUIMessages.getResourceString(J2EEUIMessages.JAVA_EE_PREFERENCE_PAGE_JET_TEMPLATE));
-
- showReferences = new Button(buttonComposite, SWT.CHECK);
- showReferences.setText(J2EEUIMessages.getResourceString(J2EEUIMessages.JAVA_EE_PREFERENCE_PAGE_DYN_TRANSLATION_BTN_NAME));
- showReferences.setSelection(dynamicTranslation);
- showReferences.addSelectionListener(new SelectionAdapter() {
- @Override
- public void widgetSelected(SelectionEvent e) {
- dynamicTranslation = showReferences.getSelection();
- }
- });
- invokeExtensions(result);
-
- return result;
- }
-
- public void init(IWorkbench workbench) {
- preferences = J2EEPlugin.getDefault().getPluginPreferences();
- dynamicTranslation = preferences.getBoolean(name);
- }
-
- @Override
- public boolean performOk() {
- preferences.setValue(name, showReferences.getSelection());
- J2EEPlugin.getDefault().savePluginPreferences();
- boolean result = false;
- for(IJavaEEPreferencePageExtender extender : extenders ){
- result = extender.performOk();
- }
- result = super.performOk();
- return result;
- }
-
-
- protected void invokeExtensions(Composite parent){
- List<JavaEEPreferencePageExtension> list = JavaEEPreferencePageExtensionReader.getInstance().getJavaEEPageExtenders();
- for(JavaEEPreferencePageExtension pageExtension : list ){
- IJavaEEPreferencePageExtender extender = pageExtension.getInstance();
- extenders.add(extender);
- extender.extendPage(parent);
- }
- }
-
- @Override
- public void dispose(){
- for(IJavaEEPreferencePageExtender extender : extenders ){
- extender.dispose();
- }
- }
-}
\ No newline at end of file
diff --git a/plugins/org.eclipse.jst.j2ee.ui/j2ee_ui/org/eclipse/jst/j2ee/internal/ui/preferences/JavaEEPreferencePageExtension.java b/plugins/org.eclipse.jst.j2ee.ui/j2ee_ui/org/eclipse/jst/j2ee/internal/ui/preferences/JavaEEPreferencePageExtension.java
deleted file mode 100644
index a20e338..0000000
--- a/plugins/org.eclipse.jst.j2ee.ui/j2ee_ui/org/eclipse/jst/j2ee/internal/ui/preferences/JavaEEPreferencePageExtension.java
+++ /dev/null
@@ -1,70 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2009 IBM Corporation and others.
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
- *
- * Contributors:
- * IBM Corporation - initial API and implementation
- *******************************************************************************/
-
-package org.eclipse.jst.j2ee.internal.ui.preferences;
-
-import org.eclipse.core.runtime.IConfigurationElement;
-import org.eclipse.wst.common.internal.emf.utilities.Assert;
-
-
-
-
-
-public class JavaEEPreferencePageExtension {
-
- public static final String ATT_ID = "id"; //$NON-NLS-1$
- public static final String ATT_CLASS = "class"; //$NON-NLS-1$
- public static final String JAVAEE_PAGE_EXTENSION = "javaeepageextender"; //$NON-NLS-1$
-
- private String id = null;
- private IConfigurationElement element;
- private IJavaEEPreferencePageExtender instance;
- private boolean errorCondition = false;
-
- public JavaEEPreferencePageExtension(){
- super();
- }
-
- private void init() {
- id = element.getAttribute(ATT_ID);
- }
-
- /**
- * @return Returns the id.
- */
- public String getId() {
- return id;
- }
-
- /**
- * @param id
- * The id to set.
- */
- public void setId(String id) {
- this.id = id;
- }
-
- public JavaEEPreferencePageExtension(IConfigurationElement element) {
- Assert.isLegal(JAVAEE_PAGE_EXTENSION.equals(element.getName()), "Extensions must be of the type \"" + JAVAEE_PAGE_EXTENSION + "\"."); //$NON-NLS-1$ //$NON-NLS-2$
- this.element = element;
- init();
- }
-
- public IJavaEEPreferencePageExtender getInstance() {
- try {
- if (instance == null && !errorCondition)
- instance = (IJavaEEPreferencePageExtender) element.createExecutableExtension("className"); //$NON-NLS-1$
- } catch (Throwable e) {
- errorCondition = true;
- }
- return instance;
- }
-}
diff --git a/plugins/org.eclipse.jst.j2ee.ui/j2ee_ui/org/eclipse/jst/j2ee/internal/ui/preferences/JavaEEPreferencePageExtensionReader.java b/plugins/org.eclipse.jst.j2ee.ui/j2ee_ui/org/eclipse/jst/j2ee/internal/ui/preferences/JavaEEPreferencePageExtensionReader.java
deleted file mode 100644
index 0dafb31..0000000
--- a/plugins/org.eclipse.jst.j2ee.ui/j2ee_ui/org/eclipse/jst/j2ee/internal/ui/preferences/JavaEEPreferencePageExtensionReader.java
+++ /dev/null
@@ -1,59 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2009 IBM Corporation and others.
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
- *
- * Contributors:
- * IBM Corporation - initial API and implementation
- *******************************************************************************/
-
-package org.eclipse.jst.j2ee.internal.ui.preferences;
-
-import java.util.ArrayList;
-import java.util.List;
-
-import org.eclipse.core.runtime.IConfigurationElement;
-import org.eclipse.jem.util.RegistryReader;
-
-
-
-public class JavaEEPreferencePageExtensionReader extends RegistryReader {
-
- private static JavaEEPreferencePageExtensionReader instance = null;
- private List<JavaEEPreferencePageExtension> pageExtenders = null;
-
- public JavaEEPreferencePageExtensionReader(){
- super("org.eclipse.jst.j2ee.ui", "JavaEEPreferencePageExtender"); //$NON-NLS-1$ //$NON-NLS-2$
- }
-
-
- public static JavaEEPreferencePageExtensionReader getInstance() {
- if (instance == null) {
- instance = new JavaEEPreferencePageExtensionReader();
- instance.readRegistry();
- }
- return instance;
- }
-
- @Override
- public boolean readElement(IConfigurationElement element) {
- if (JavaEEPreferencePageExtension.JAVAEE_PAGE_EXTENSION.equals(element.getName())) {
- addExtension(element);
- return true;
- }
- return false;
- }
-
- protected void addExtension(IConfigurationElement newExtension) {
- getJavaEEPageExtenders().add(new JavaEEPreferencePageExtension(newExtension));
- }
-
- public List<JavaEEPreferencePageExtension> getJavaEEPageExtenders() {
- if (pageExtenders == null)
- pageExtenders = new ArrayList();
- return pageExtenders;
- }
-
-}
diff --git a/plugins/org.eclipse.jst.j2ee.ui/j2ee_ui/org/eclipse/jst/j2ee/internal/ui/preferences/Messages.java b/plugins/org.eclipse.jst.j2ee.ui/j2ee_ui/org/eclipse/jst/j2ee/internal/ui/preferences/Messages.java
deleted file mode 100644
index 2118439..0000000
--- a/plugins/org.eclipse.jst.j2ee.ui/j2ee_ui/org/eclipse/jst/j2ee/internal/ui/preferences/Messages.java
+++ /dev/null
@@ -1,28 +0,0 @@
-package org.eclipse.jst.j2ee.internal.ui.preferences;
-
-import org.eclipse.osgi.util.NLS;
-
-public class Messages extends NLS {
- private static final String BUNDLE_NAME = "org.eclipse.jst.j2ee.internal.ui.preferences.messages"; //$NON-NLS-1$
- public static String EarModuleDependenciesPropertyPage_0;
- public static String EarModuleDependenciesPropertyPage_1;
- public static String EarModuleDependenciesPropertyPage_2;
- public static String EarModuleDependenciesPropertyPage_3;
- public static String EarModuleDependenciesPropertyPage_LIBDIR;
- public static String EarModuleDependenciesPropertyPage_ERROR_INVALID_LIBDIR;
- public static String EarModuleDependenciesPropertyPage_WARNING_EMPTY_LIB_DIR;
- public static String EarModuleDependencyPageProvider_0;
- public static String WebDependencyPropertyPage_0;
- public static String WebDependencyPropertyPage_1;
- public static String ChildClasspathDependencyDescription;
- public static String ClasspathDependencyFragmentTitle;
- public static String ClasspathDependencyFragmentDescription;
-
- static {
- // initialize resource bundle
- NLS.initializeMessages(BUNDLE_NAME, Messages.class);
- }
-
- private Messages() {
- }
-}
diff --git a/plugins/org.eclipse.jst.j2ee.ui/j2ee_ui/org/eclipse/jst/j2ee/internal/ui/preferences/messages.properties b/plugins/org.eclipse.jst.j2ee.ui/j2ee_ui/org/eclipse/jst/j2ee/internal/ui/preferences/messages.properties
deleted file mode 100644
index c839fb5..0000000
--- a/plugins/org.eclipse.jst.j2ee.ui/j2ee_ui/org/eclipse/jst/j2ee/internal/ui/preferences/messages.properties
+++ /dev/null
@@ -1,13 +0,0 @@
-EarModuleDependenciesPropertyPage_0=Add Ear Module Folder...
-EarModuleDependenciesPropertyPage_1=Add Ear Module Reference...
-EarModuleDependenciesPropertyPage_2=Edit Ear Module Reference...
-EarModuleDependenciesPropertyPage_3=Define packaging structure for this Java EE Application project.
-EarModuleDependenciesPropertyPage_LIBDIR=EAR &library directory:
-EarModuleDependenciesPropertyPage_ERROR_INVALID_LIBDIR=Library directory value cannot begin with a slash character. Specify as relative path to the root of the project.
-EarModuleDependenciesPropertyPage_WARNING_EMPTY_LIB_DIR=An empty library directory field indicates that no library directory will be used when creating the class paths! Set the value to 'lib' to use the default library directory.
-EarModuleDependencyPageProvider_0=Ear Module Assembly
-WebDependencyPropertyPage_0=Add Web Library Reference...
-WebDependencyPropertyPage_1=Define packaging structure for this Java EE Web Application project.
-ChildClasspathDependencyDescription=Pull in classpath elements from referenced projects.
-ClasspathDependencyFragmentTitle=Manage referenced classpath entries
-ClasspathDependencyFragmentDescription=Here you can adjust which referenced projects' classpath entries should be pulled into this component.
\ No newline at end of file
diff --git a/plugins/org.eclipse.jst.j2ee.ui/j2ee_ui/org/eclipse/jst/j2ee/internal/ui/refactoring/ContextRootInputPage.java b/plugins/org.eclipse.jst.j2ee.ui/j2ee_ui/org/eclipse/jst/j2ee/internal/ui/refactoring/ContextRootInputPage.java
deleted file mode 100644
index 4c49b49..0000000
--- a/plugins/org.eclipse.jst.j2ee.ui/j2ee_ui/org/eclipse/jst/j2ee/internal/ui/refactoring/ContextRootInputPage.java
+++ /dev/null
@@ -1,86 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2008 IBM Corporation and others.
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
- *
- * Contributors:
- * IBM Corporation - initial API and implementation
- *******************************************************************************/
-package org.eclipse.jst.j2ee.internal.ui.refactoring;
-
-import org.eclipse.jface.layout.GridLayoutFactory;
-import org.eclipse.jface.wizard.IWizardPage;
-import org.eclipse.jst.j2ee.internal.plugin.J2EEUIMessages;
-import org.eclipse.ltk.core.refactoring.RefactoringStatus;
-import org.eclipse.ltk.ui.refactoring.UserInputWizardPage;
-import org.eclipse.swt.SWT;
-import org.eclipse.swt.events.ModifyEvent;
-import org.eclipse.swt.events.ModifyListener;
-import org.eclipse.swt.layout.GridData;
-import org.eclipse.swt.widgets.Composite;
-import org.eclipse.swt.widgets.Label;
-import org.eclipse.swt.widgets.Text;
-
-public class ContextRootInputPage extends UserInputWizardPage {
-
- private final RenameContextRootRefactoringProcessor fProcessor;
- private Text fNameField;
-
- public ContextRootInputPage(String name, RenameContextRootRefactoringProcessor processor) {
- super(name);
- this.fProcessor = processor;
- }
-
- public void createControl(Composite parent) {
- Composite c = new Composite(parent, SWT.NONE);
-
- Label label = new Label(c, SWT.NONE);
- label.setText(J2EEUIMessages.getResourceString("NewContextRoot")); //$NON-NLS-1$
-
- fNameField = new Text(c, SWT.BORDER);
- fNameField.setLayoutData(new GridData(SWT.FILL, SWT.BEGINNING, true, false));
-
- fNameField.addModifyListener(new ModifyListener() {
- public void modifyText(ModifyEvent e) {
- validatePage();
- }
-
- });
- String oldName = fProcessor.getOldContextRoot();
- if (oldName != null && oldName.length() > 0) {
- fNameField.setText(oldName);
- fNameField.setSelection(0, oldName.length());
- }
-
- GridLayoutFactory.swtDefaults().numColumns(2).applyTo(c);
-
- setControl(c);
- fNameField.setFocus();
-
- validatePage();
- }
-
- private void validatePage() {
- String text = fNameField.getText();
- RefactoringStatus status = fProcessor.validateNewElementName(text);
- setPageComplete(status);
- }
-
- @Override
- protected boolean performFinish() {
- initializeRefactoring();
- return super.performFinish();
- }
-
- @Override
- public IWizardPage getNextPage() {
- initializeRefactoring();
- return super.getNextPage();
- }
-
- private void initializeRefactoring() {
- fProcessor.setNewName(fNameField.getText());
- }
-}
diff --git a/plugins/org.eclipse.jst.j2ee.ui/j2ee_ui/org/eclipse/jst/j2ee/internal/ui/refactoring/RenameContextRootChange.java b/plugins/org.eclipse.jst.j2ee.ui/j2ee_ui/org/eclipse/jst/j2ee/internal/ui/refactoring/RenameContextRootChange.java
deleted file mode 100644
index f7d1440..0000000
--- a/plugins/org.eclipse.jst.j2ee.ui/j2ee_ui/org/eclipse/jst/j2ee/internal/ui/refactoring/RenameContextRootChange.java
+++ /dev/null
@@ -1,130 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2008 IBM Corporation and others.
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
- *
- * Contributors:
- * IBM Corporation - initial API and implementation
- *******************************************************************************/
- package org.eclipse.jst.j2ee.internal.ui.refactoring;
-
-import org.eclipse.core.resources.IProject;
-import org.eclipse.core.runtime.CoreException;
-import org.eclipse.core.runtime.IProgressMonitor;
-import org.eclipse.core.runtime.IStatus;
-import org.eclipse.core.runtime.OperationCanceledException;
-import org.eclipse.core.runtime.Status;
-import org.eclipse.jst.j2ee.internal.plugin.J2EEUIMessages;
-import org.eclipse.jst.j2ee.internal.plugin.J2EEUIPlugin;
-import org.eclipse.jst.j2ee.internal.project.ProjectSupportResourceHandler;
-import org.eclipse.ltk.core.refactoring.Change;
-import org.eclipse.ltk.core.refactoring.RefactoringStatus;
-import org.eclipse.wst.common.componentcore.internal.util.ComponentUtilities;
-
-import com.ibm.icu.text.UTF16;
-import com.ibm.icu.util.StringTokenizer;
-
-public class RenameContextRootChange extends Change {
-
- private final IProject project;
- private final String newContextRoot;
- private final String oldContextRoot;
-
- public RenameContextRootChange(IProject project, String newContextRoot, String oldContextRoot) {
- this.project = project;
- this.oldContextRoot = oldContextRoot;
- this.newContextRoot = newContextRoot;
- }
-
- @Override
- public Object getModifiedElement() {
- return project;
- }
-
- @Override
- public String getName() {
- return J2EEUIMessages.getResourceString("RenameContextRootFromXtoY", new String[]{oldContextRoot, //$NON-NLS-1$
- newContextRoot});
- }
-
- @Override
- public void initializeValidationData(IProgressMonitor pm) {
-
- }
-
- public static IStatus validateContextRoot(String name) {
- IStatus status = Status.OK_STATUS;
- if (name == null || name.length() == 0) {
- // this was added because the error message shouldnt be shown
- // initially. It should be shown only if context
- // root field is edited to
- status = new Status(IStatus.ERROR, J2EEUIPlugin.PLUGIN_ID,
- ProjectSupportResourceHandler.getString(
- ProjectSupportResourceHandler.Context_Root_cannot_be_empty_2,
- new Object[0]));
-
- } else if (!(name.indexOf(' ') > -1)) {
- StringTokenizer stok = new StringTokenizer(name, "."); //$NON-NLS-1$
- while (stok.hasMoreTokens()) {
- String token = stok.nextToken();
- int cp;
- for (int i = 0; i < token.length(); i += UTF16.getCharCount(cp)) {
- cp = UTF16.charAt(token, i);
- if (!(token.charAt(i) == '_') && !(token.charAt(i) == '-')
- && !(token.charAt(i) == '/')
- && Character.isLetterOrDigit(token.charAt(i)) == false) {
- if (Character.isWhitespace(token.charAt(i)) == false) {
- String invalidCharString = null;
- if (UTF16.getCharCount(cp)>1)
- {
- invalidCharString = UTF16.valueOf(cp);
- }
- else
- {
- invalidCharString = (new Character(token.charAt(i))).toString();
- }
- Object[] invalidChar = new Object[]{invalidCharString};
- status = new Status(
- IStatus.ERROR,
- J2EEUIPlugin.PLUGIN_ID,
- ProjectSupportResourceHandler
- .getString(
- ProjectSupportResourceHandler.The_character_is_invalid_in_a_context_root,
- invalidChar));
-
- }
- }
- }
- }
- } // en/ end of if(name.trim
- else {
- status = new Status(IStatus.ERROR, J2EEUIPlugin.PLUGIN_ID,
- ProjectSupportResourceHandler.getString(
- ProjectSupportResourceHandler.Names_cannot_contain_whitespace_,
- new Object[0]));
-
- }
- return status;
-
- }
-
- @Override
- public RefactoringStatus isValid(IProgressMonitor pm) throws CoreException,
- OperationCanceledException {
- IStatus phase1 = validateContextRoot(newContextRoot);
- if (phase1.isOK())
- return new RefactoringStatus();
- return RefactoringStatus.create(phase1);
- }
-
- @Override
- public Change perform(IProgressMonitor pm) throws CoreException {
-
- ComponentUtilities.setServerContextRoot(project, newContextRoot);
-
- return new RenameContextRootChange(project, oldContextRoot, newContextRoot);
- }
-
-}
diff --git a/plugins/org.eclipse.jst.j2ee.ui/j2ee_ui/org/eclipse/jst/j2ee/internal/ui/refactoring/RenameContextRootRefactoringProcessor.java b/plugins/org.eclipse.jst.j2ee.ui/j2ee_ui/org/eclipse/jst/j2ee/internal/ui/refactoring/RenameContextRootRefactoringProcessor.java
deleted file mode 100644
index 2564e1b..0000000
--- a/plugins/org.eclipse.jst.j2ee.ui/j2ee_ui/org/eclipse/jst/j2ee/internal/ui/refactoring/RenameContextRootRefactoringProcessor.java
+++ /dev/null
@@ -1,121 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2008 IBM Corporation and others.
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
- *
- * Contributors:
- * IBM Corporation - initial API and implementation
- *******************************************************************************/
-package org.eclipse.jst.j2ee.internal.ui.refactoring;
-
-import org.eclipse.core.resources.IProject;
-import org.eclipse.core.runtime.CoreException;
-import org.eclipse.core.runtime.IProgressMonitor;
-import org.eclipse.core.runtime.OperationCanceledException;
-import org.eclipse.jst.j2ee.internal.plugin.J2EEUIMessages;
-import org.eclipse.jst.j2ee.internal.project.J2EEProjectUtilities;
-import org.eclipse.ltk.core.refactoring.Change;
-import org.eclipse.ltk.core.refactoring.RefactoringStatus;
-import org.eclipse.ltk.core.refactoring.participants.CheckConditionsContext;
-import org.eclipse.ltk.core.refactoring.participants.ParticipantManager;
-import org.eclipse.ltk.core.refactoring.participants.RefactoringParticipant;
-import org.eclipse.ltk.core.refactoring.participants.RenameArguments;
-import org.eclipse.ltk.core.refactoring.participants.RenameProcessor;
-import org.eclipse.ltk.core.refactoring.participants.SharableParticipants;
-
-public class RenameContextRootRefactoringProcessor extends RenameProcessor {
-
- private IProject fProject;
- private String fNewName;
- private boolean fUpdateReferences;
-
- @Override
- public RefactoringStatus checkFinalConditions(IProgressMonitor pm,
- CheckConditionsContext context) throws CoreException, OperationCanceledException {
- if (!isApplicable())
- return RefactoringStatus.createErrorStatus(J2EEUIMessages
- .getResourceString("RefactoringNoInit")); //$NON-NLS-1$
- return validateNewElementName(fNewName);
- }
-
- @Override
- public RefactoringStatus checkInitialConditions(IProgressMonitor pm) throws CoreException,
- OperationCanceledException {
- return new RefactoringStatus();
- }
-
- @Override
- public Change createChange(IProgressMonitor pm) throws CoreException,
- OperationCanceledException {
- if (isApplicable() && fNewName != null)
- return new RenameContextRootChange(getProject(), fNewName, getOldContextRoot());
- return null;
- }
-
- @Override
- public Object[] getElements() {
- if (getProject() == null)
- return new Object[0];
- return new Object[] {
- getProject()
- };
- }
-
- @Override
- public String getIdentifier() {
- return "org.eclipse.jst.j2ee.ChangeContextRootRefactoringProcessor"; //$NON-NLS-1$
- }
-
- @Override
- public String getProcessorName() {
- return J2EEUIMessages.getResourceString("RenameContextRoot"); //$NON-NLS-1$
- }
-
- public IProject getProject() {
- return fProject;
- }
-
- @Override
- public boolean isApplicable() throws CoreException {
- return getProject() != null;
- }
-
- private RenameArguments getRenameArguments() {
- return new RenameArguments(fNewName, fUpdateReferences);
- }
-
- @Override
- public RefactoringParticipant[] loadParticipants(RefactoringStatus status,
- SharableParticipants sharedParticipants) throws CoreException {
- String[] natures = new String[0];
- IProject project = getProject();
- if (project != null && fNewName != null) {
- natures = project.getDescription().getNatureIds();
- return ParticipantManager.loadRenameParticipants(status, this, project,
- getRenameArguments(), natures, sharedParticipants);
- }
- return new RefactoringParticipant[0];
- }
-
- public void setProject(IProject project) {
- this.fProject = project;
- }
-
- public void setNewName(String newName) {
- this.fNewName = newName;
- }
-
- public void setUpdateReferences(boolean updateReferences) {
- this.fUpdateReferences = updateReferences;
- }
-
- public RefactoringStatus validateNewElementName(String newName) {
- return RefactoringStatus.create(RenameContextRootChange.validateContextRoot(newName));
- }
-
- public String getOldContextRoot() {
- return J2EEProjectUtilities.getServerContextRoot(getProject());
- }
-}
diff --git a/plugins/org.eclipse.jst.j2ee.ui/j2ee_ui/org/eclipse/jst/j2ee/internal/ui/refactoring/RenameContextRootWizard.java b/plugins/org.eclipse.jst.j2ee.ui/j2ee_ui/org/eclipse/jst/j2ee/internal/ui/refactoring/RenameContextRootWizard.java
deleted file mode 100644
index 2919f8d..0000000
--- a/plugins/org.eclipse.jst.j2ee.ui/j2ee_ui/org/eclipse/jst/j2ee/internal/ui/refactoring/RenameContextRootWizard.java
+++ /dev/null
@@ -1,43 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2008 IBM Corporation and others.
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
- *
- * Contributors:
- * IBM Corporation - initial API and implementation
- *******************************************************************************/
-package org.eclipse.jst.j2ee.internal.ui.refactoring;
-
-import org.eclipse.jst.j2ee.internal.plugin.J2EEUIMessages;
-import org.eclipse.ltk.core.refactoring.participants.RenameRefactoring;
-import org.eclipse.ltk.ui.refactoring.RefactoringWizard;
-
-public class RenameContextRootWizard extends RefactoringWizard {
-
- private boolean prompt = true;
-
- public RenameContextRootWizard(RenameContextRootRefactoringProcessor processor, int flags) {
- super(new RenameRefactoring(processor), flags);
- setDefaultPageTitle(J2EEUIMessages.getResourceString("RenameContextRoot")); //$NON-NLS-1$
-
- setChangeCreationCancelable(true);
- setHelpAvailable(false);
- setNeedsProgressMonitor(true);
- }
-
- @Override
- protected void addUserInputPages() {
- if (prompt) {
- addPage(new ContextRootInputPage("", //$NON-NLS-1$
- (RenameContextRootRefactoringProcessor) getRefactoring().getAdapter(
- RenameContextRootRefactoringProcessor.class)));
- }
- }
-
- public void setPrompt(boolean prompt) {
- this.prompt = prompt;
- }
-
-}
diff --git a/plugins/org.eclipse.jst.j2ee.ui/j2ee_ui/org/eclipse/jst/j2ee/internal/ui/util/AnnotationIconDecorator.java b/plugins/org.eclipse.jst.j2ee.ui/j2ee_ui/org/eclipse/jst/j2ee/internal/ui/util/AnnotationIconDecorator.java
deleted file mode 100644
index 47b7996..0000000
--- a/plugins/org.eclipse.jst.j2ee.ui/j2ee_ui/org/eclipse/jst/j2ee/internal/ui/util/AnnotationIconDecorator.java
+++ /dev/null
@@ -1,117 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2003, 2005 IBM Corporation and others.
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
- *
- * Contributors:
- * IBM Corporation - initial API and implementation
- *******************************************************************************/
-/*
- * Created on Aug 18, 2004
- */
-package org.eclipse.jst.j2ee.internal.ui.util;
-
-import org.eclipse.core.resources.IFile;
-import org.eclipse.core.resources.IProject;
-import org.eclipse.emf.ecore.EObject;
-import org.eclipse.jem.util.emf.workbench.ProjectUtilities;
-import org.eclipse.jface.resource.ImageDescriptor;
-import org.eclipse.jface.viewers.IDecoration;
-import org.eclipse.jface.viewers.ILabelDecorator;
-import org.eclipse.jface.viewers.ILightweightLabelDecorator;
-import org.eclipse.jface.viewers.LabelProvider;
-import org.eclipse.jst.common.internal.annotations.controller.AnnotationsController;
-import org.eclipse.jst.common.internal.annotations.controller.AnnotationsControllerHelper;
-import org.eclipse.jst.common.internal.annotations.controller.AnnotationsControllerManager;
-import org.eclipse.jst.j2ee.ejb.EnterpriseBean;
-import org.eclipse.jst.j2ee.internal.ejb.provider.BeanClassProviderHelper;
-import org.eclipse.jst.j2ee.internal.plugin.J2EEUIPlugin;
-import org.eclipse.jst.j2ee.webapplication.Servlet;
-import org.eclipse.swt.graphics.Image;
-
-/**
- * Add overlay for annotated objects
- */
-public class AnnotationIconDecorator extends LabelProvider implements ILightweightLabelDecorator {
-
- protected static final String ANNOTATION_IMAGE_DESC_STRING = "annotation_bean_overlay"; //$NON-NLS-1$
- protected static final String ANNOTATION_DISABLED_IMAGE_DESC_STRING = "dis_annotation_bean_overlay"; //$NON-NLS-1$
- private static final ImageDescriptor ANNOTATION_IMG_DESC = getImageDescriptor(ANNOTATION_IMAGE_DESC_STRING);
- private static final ImageDescriptor ANNOTATION_DISABLED_IMG_DESC = getImageDescriptor(ANNOTATION_DISABLED_IMAGE_DESC_STRING);
-
- public AnnotationIconDecorator() {
- super();
- }
-
- /**
- * @see org.eclipse.jface.viewers.ILightweightLabelDecorator#decorate(java.lang.Object,
- * org.eclipse.jface.viewers.IDecoration)
- */
- private boolean isAnnotatedSupported(EObject target) {
- boolean bAnnotationSupported = false;
- if (AnnotationsControllerHelper.INSTANCE.isAnnotated(target)) {
- bAnnotationSupported = true;
- }
- return bAnnotationSupported;
- }
-
- private AnnotationsController getControllerForProject(IProject targetProject) {
- AnnotationsController controller = AnnotationsControllerManager.INSTANCE.getAnnotationsController(targetProject);
- return controller;
- }
-
- public void decorate(Object element, IDecoration decoration) {
- EObject eObject = null;
- if (element instanceof BeanClassProviderHelper) {
- BeanClassProviderHelper beanClassHelper = (BeanClassProviderHelper) element;
- eObject = beanClassHelper.getEjb();
- } else if (element instanceof EnterpriseBean || element instanceof Servlet)
- eObject = (EObject) element;
- if (eObject == null)
- return;
- if (isAnnotatedSupported(eObject)) {
- if (isAnnotationEnabled(eObject)) {
- if (ANNOTATION_IMG_DESC != null)
- decoration.addOverlay(ANNOTATION_IMG_DESC);
- } else {
- if (ANNOTATION_DISABLED_IMG_DESC != null)
- decoration.addOverlay(ANNOTATION_DISABLED_IMG_DESC);
- }
- }
- }
-
- /**
- * @param bean
- * @return
- */
- private boolean isAnnotationEnabled(EObject eObject) {
- IFile annotatedSource = null;
- /* short circuit if possible */
- if (AnnotationsControllerManager.INSTANCE.isAnyAnnotationsSupported()) {
- IProject targetProject = ProjectUtilities.getProject(eObject);
- AnnotationsController controller = getControllerForProject(targetProject);
- if (controller != null)
- annotatedSource = controller.getEnabledAnnotationFile(eObject);
- }
- return (annotatedSource != null) ? true : false;
- }
-
- public Image decorateImage(Image image, Object element) {
- return image;
- }
-
- /**
- * @see ILabelDecorator#decorateText(String, Object)
- */
- public String decorateText(String text, Object element) {
- return text;
- }
-
- protected static ImageDescriptor getImageDescriptor(String imageFileName) {
- if (imageFileName != null)
- return J2EEUIPlugin.getDefault().getImageDescriptor(imageFileName);
- return null;
- }
-}
diff --git a/plugins/org.eclipse.jst.j2ee.ui/j2ee_ui/org/eclipse/jst/j2ee/internal/ui/util/BinaryProjectUIHelper.java b/plugins/org.eclipse.jst.j2ee.ui/j2ee_ui/org/eclipse/jst/j2ee/internal/ui/util/BinaryProjectUIHelper.java
deleted file mode 100644
index 4205656..0000000
--- a/plugins/org.eclipse.jst.j2ee.ui/j2ee_ui/org/eclipse/jst/j2ee/internal/ui/util/BinaryProjectUIHelper.java
+++ /dev/null
@@ -1,44 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2003, 2005 IBM Corporation and others.
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
- *
- * Contributors:
- * IBM Corporation - initial API and implementation
- *******************************************************************************/
-package org.eclipse.jst.j2ee.internal.ui.util;
-
-
-import org.eclipse.core.resources.IProject;
-import org.eclipse.jem.workbench.utility.JemProjectUtilities;
-import org.eclipse.jface.dialogs.MessageDialog;
-import org.eclipse.jst.j2ee.internal.plugin.J2EEUIMessages;
-import org.eclipse.swt.widgets.Shell;
-
-public class BinaryProjectUIHelper {
-
- public static final String DIALOG_TITLE = J2EEUIMessages.getResourceString("BINARY_PROJECT"); //$NON-NLS-1$
- public static final String DIALOG_MESSAGE = J2EEUIMessages.getResourceString("ACTION_CANNOT_BE_PERFORMED_ON_BIN_PROJECT"); //$NON-NLS-1$
-
- /**
- * Constructor for BinaryProjectUIHelper.
- */
- public BinaryProjectUIHelper() {
- super();
- }
-
- public static void displayError(Shell parent) {
- MessageDialog.openError(parent, DIALOG_TITLE, DIALOG_MESSAGE);
- return;
- }
-
- public static boolean displayErrorIfBinaryProject(Shell parent, IProject aProject) {
- boolean isBinary = JemProjectUtilities.isBinaryProject(aProject);
- if (isBinary)
- displayError(parent);
- return isBinary;
- }
-}
-
diff --git a/plugins/org.eclipse.jst.j2ee.ui/j2ee_ui/org/eclipse/jst/j2ee/internal/war/ui/util/J2EEWebAppItemProvider.java b/plugins/org.eclipse.jst.j2ee.ui/j2ee_ui/org/eclipse/jst/j2ee/internal/war/ui/util/J2EEWebAppItemProvider.java
deleted file mode 100644
index d039bbd..0000000
--- a/plugins/org.eclipse.jst.j2ee.ui/j2ee_ui/org/eclipse/jst/j2ee/internal/war/ui/util/J2EEWebAppItemProvider.java
+++ /dev/null
@@ -1,319 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2003, 2006 IBM Corporation and others.
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
- *
- * Contributors:
- * IBM Corporation - initial API and implementation
- *******************************************************************************/
-/*
- * Created on Mar 29, 2004
- *
- * To change the template for this generated file go to
- * Window - Preferences - Java - Code Generation - Code and Comments
- */
-package org.eclipse.jst.j2ee.internal.war.ui.util;
-
-import java.lang.ref.WeakReference;
-import java.util.ArrayList;
-import java.util.Collection;
-import java.util.Collections;
-import java.util.List;
-
-import org.eclipse.emf.common.notify.AdapterFactory;
-import org.eclipse.emf.common.notify.Notification;
-import org.eclipse.emf.common.notify.NotificationWrapper;
-import org.eclipse.emf.common.notify.impl.AdapterImpl;
-import org.eclipse.jst.j2ee.internal.J2EEVersionConstants;
-import org.eclipse.jst.j2ee.internal.common.J2EEVersionUtil;
-import org.eclipse.jst.j2ee.internal.web.providers.WebAppItemProvider;
-import org.eclipse.jst.j2ee.webapplication.WebApp;
-import org.eclipse.jst.j2ee.webapplication.WebapplicationPackage;
-import org.eclipse.jst.j2ee.webservice.wsclient.WebServicesClient;
-import org.eclipse.jst.j2ee.webservice.wsclient.Webservice_clientPackage;
-import org.eclipse.wst.common.internal.emfworkbench.integration.EditModelEvent;
-import org.eclipse.wst.common.internal.emfworkbench.integration.EditModelListener;
-
-/**
- * @author jlanuti
- *
- * To change the template for this generated type comment go to Window - Preferences - Java - Code
- * Generation - Code and Comments
- */
-public class J2EEWebAppItemProvider extends WebAppItemProvider {
-
- private List children = new ArrayList();
- private boolean isInitializing = false;
- private WebErrorPageGroupItemProvider webErrorPageGroup;
- private WebServletGroupItemProvider webServletGroup;
- private WebServletMappingGroupItemProvider webServletMappingGroup;
- private WebFiltersGroupItemProvider webFiltersGroup;
- private WebFilterMappingGroupItemProvider webFilterMappingGroup;
- private WebReferencesGroupItemProvider webRefsGroup;
- private WebSecurityGroupItemProvider webSecurityGroup;
- private J2EEWebServiceClientDDManager clientMgr;
- private WebListenerGroupItemProvider webListenerGroup;
- private WebWelcomeFileGroupItemProvider webWelcomeFileGroup;
- private WebContextParamGroupItemProvider webContextParamGroup;
-
- /**
- * Listen and fire updates for 1.3 web service clients
- */
- private class J2EEWebServiceClientDDManager extends AdapterImpl implements EditModelListener {
- WebServicesClient client;
-
- public J2EEWebServiceClientDDManager(WeakReference weakWebApp) {
- init();
- }
-
- public void init() {
- // TODO fix up notification
- // editModel = webServiceMgr.getWSEditModel(ProjectUtilities.getProject(webApp));
- // if (editModel != null) {
- // editModel.addListener(this);
- // if (editModel.get13WebServicesClientResource() != null) {
- // client = editModel.get13WebServicesClientResource().getWebServicesClient();
- // if (client != null)
- // client.eAdapters().add(this);
- // }
- // }
- }
-
- /*
- * (non-Javadoc)
- *
- * @see org.eclipse.wst.common.internal.emfworkbench.integration.EditModelListener#editModelChanged(org.eclipse.wst.common.internal.emfworkbench.integration.EditModelEvent)
- */
- public void editModelChanged(EditModelEvent anEvent) {
- // TODO fix up notification
- // if (editModel == null)
- // init();
- }
-
- /*
- * (non-Javadoc)
- *
- * @see org.eclipse.emf.common.notify.Adapter#notifyChanged(org.eclipse.emf.common.notify.Notification)
- */
- @Override
- public void notifyChanged(Notification notification) {
- if (notification.getEventType() == Notification.ADD || notification.getEventType() == Notification.ADD_MANY || notification.getEventType() == Notification.REMOVE || notification.getEventType() == Notification.REMOVE_MANY) {
- if (notification.getFeatureID(WebServicesClient.class) == Webservice_clientPackage.WEB_SERVICES_CLIENT__SERVICE_REFS) {
- NotificationWrapper notificationWrapper = new NotificationWrapper(webRefsGroup, notification);
- fireNotifyChanged(notificationWrapper);
- }
- }
- super.notifyChanged(notification);
- }
-
- public void dispose() {
- // TODO fix up notification
-
- webErrorPageGroup.dispose();
- webContextParamGroup.dispose();
- webWelcomeFileGroup.dispose();
- webServletGroup.dispose();
- webServletMappingGroup.dispose();
- webFiltersGroup.dispose();
- webFilterMappingGroup.dispose();
- webRefsGroup.dispose();
- webSecurityGroup.dispose();
- webListenerGroup.dispose();
-
- weakWebApp = null;
- if (client != null)
- client.eAdapters().remove(this);
- children.clear();
- }
- }
-
- /**
- * Default constructor
- */
- public J2EEWebAppItemProvider(AdapterFactory adapterFactory) {
- super(adapterFactory);
- }
-
- /**
- * Initialize the list of children
- */
- private void initChildren(WebApp webApp) {
- if (isInitializing)
- return;
-
- isInitializing = true;
- try {
- children.clear();
- if (clientMgr == null) {
- clientMgr = new J2EEWebServiceClientDDManager(weakWebApp);
- }
-// if (!((WebApp)weakWebApp.get()).getErrorPages().isEmpty()) {
-// children.add(webErrorPageGroup = new WebErrorPageGroupItemProvider(adapterFactory, weakWebApp));
-// } else {
-// WebErrorPageGroupItemProvider child = null;
-// for (int i=0; i < children.size(); i++) {
-// Object object = children.get(i);
-// if (object instanceof WebErrorPageGroupItemProvider) {
-// child = (WebErrorPageGroupItemProvider) object;
-// break;
-// }
-// }
-// if (child != null) {
-// child.dispose();
-// }
-// }
-// if (!((WebApp)weakWebApp.get()).getContextParams().isEmpty()) {
-// children.add(webContextParamGroup = new WebContextParamGroupItemProvider(adapterFactory, weakWebApp));
-// } else {
-// WebContextParamGroupItemProvider child = null;
-// for (int i=0; i < children.size(); i++) {
-// Object object = children.get(i);
-// if (object instanceof WebContextParamGroupItemProvider) {
-// child = (WebContextParamGroupItemProvider) object;
-// break;
-// }
-// }
-// if (child != null) {
-// child.dispose();
-// }
-// }
-// WelcomeFileList welcomeFileList = ((WebApp)weakWebApp.get()).getFileList();
-// if (welcomeFileList != null && !welcomeFileList.getFile().isEmpty()) {
-// children.add(webWelcomeFileGroup = new WebWelcomeFileGroupItemProvider(adapterFactory, weakWebApp));
-// } else {
-// WebWelcomeFileGroupItemProvider child = null;
-// for (int i=0; i < children.size(); i++) {
-// Object object = children.get(i);
-// if (object instanceof WebWelcomeFileGroupItemProvider) {
-// child = (WebWelcomeFileGroupItemProvider) object;
-// break;
-// }
-// }
-// if (child != null) {
-// child.dispose();
-// }
-// }
-
- children.add(webErrorPageGroup = new WebErrorPageGroupItemProvider(adapterFactory, weakWebApp));
- children.add(webContextParamGroup = new WebContextParamGroupItemProvider(adapterFactory, weakWebApp));
- children.add(webWelcomeFileGroup = new WebWelcomeFileGroupItemProvider(adapterFactory, weakWebApp));
-
- children.add(webServletGroup = new WebServletGroupItemProvider(adapterFactory, weakWebApp));
- children.add(webServletMappingGroup = new WebServletMappingGroupItemProvider(adapterFactory, weakWebApp));
- children.add(webRefsGroup = new WebReferencesGroupItemProvider(adapterFactory, weakWebApp));
- children.add(webSecurityGroup = new WebSecurityGroupItemProvider(adapterFactory, weakWebApp));
-
- // show the below nodes only if Web 2.3 and greater
- if (J2EEVersionUtil.convertVersionStringToInt(webApp.getVersion()) > J2EEVersionConstants.SERVLET_2_2) {
- children.add(webFiltersGroup = new WebFiltersGroupItemProvider(adapterFactory, weakWebApp));
- children.add(webFilterMappingGroup = new WebFilterMappingGroupItemProvider(adapterFactory, weakWebApp));
- children.add(webListenerGroup = new WebListenerGroupItemProvider(adapterFactory, weakWebApp));
- }
- } finally {
- isInitializing = false;
- }
- }
-
- protected WeakReference weakWebApp = null;
-
- @Override
- public Collection getChildren(Object object) {
- if (object instanceof WebApp) {
- WebApp webApp = (WebApp) object;
- // If uninitialized or web app needs to re-initialize, init the children
- if(weakWebApp == null || children.isEmpty() || webApp != weakWebApp.get()) {
- weakWebApp = new WeakReference(webApp);
- initChildren(webApp);
- }
-// if (isInitializing) return children;
-// isInitializing = true;
-// updateContextParams(webApp);
-// updateWelcomePages(webApp);
-// isInitializing = false;
- return children;
- }
- return Collections.EMPTY_LIST;
- }
-
- /*
- * (non-Javadoc)
- *
- * @see org.eclipse.emf.edit.provider.ItemProviderAdapter#hasChildren(java.lang.Object)
- */
- @Override
- public boolean hasChildren(Object object) {
- return true;
- }
-
- /*
- * (non-Javadoc)
- *
- * @see org.eclipse.emf.common.notify.Adapter#notifyChanged(org.eclipse.emf.common.notify.Notification)
- */
- @Override
- public void notifyChanged(Notification notification) {
- // We only care about adds and removes for the different item provider
- // groups
- if (notification.getEventType() == Notification.ADD || notification.getEventType() == Notification.ADD_MANY || notification.getEventType() == Notification.REMOVE || notification.getEventType() == Notification.REMOVE_MANY) {
- Object notifier = null;
- switch (notification.getFeatureID(WebApp.class)) {
- case WebapplicationPackage.WEB_APP__ERROR_PAGES :
- notifier = webErrorPageGroup;
- break;
- case WebapplicationPackage.WEB_APP__CONTEXT_PARAMS :
- notifier = webContextParamGroup;
- break;
- case WebapplicationPackage.WEB_APP__FILE_LIST :
- notifier = webWelcomeFileGroup;
- break;
- case WebapplicationPackage.WEB_APP__SERVLETS :
- notifier = webServletGroup;
- break;
- case WebapplicationPackage.WEB_APP__SERVLET_MAPPINGS :
- notifier = webServletMappingGroup;
- break;
- case WebapplicationPackage.WEB_APP__FILTERS :
- notifier = webFiltersGroup;
- break;
- case WebapplicationPackage.WEB_APP__FILTER_MAPPINGS :
- notifier = webFilterMappingGroup;
- break;
- case WebapplicationPackage.WEB_APP__EJB_LOCAL_REFS :
- case WebapplicationPackage.WEB_APP__EJB_REFS :
- case WebapplicationPackage.WEB_APP__MESSAGE_DESTINATION_REFS :
- case WebapplicationPackage.WEB_APP__RESOURCE_ENV_REFS :
- case WebapplicationPackage.WEB_APP__RESOURCE_REFS :
- case WebapplicationPackage.WEB_APP__SERVICE_REFS :
- notifier = webRefsGroup;
- break;
- case WebapplicationPackage.WEB_APP__SECURITY_ROLES :
- case WebapplicationPackage.WEB_APP__CONSTRAINTS :
- notifier = webSecurityGroup;
- break;
- case WebapplicationPackage.WEB_APP__LISTENERS :
- notifier = webListenerGroup;
- break;
- }
- if (notifier != null) {
- NotificationWrapper notificationWrapper = new NotificationWrapper(notifier, notification);
- fireNotifyChanged(notificationWrapper);
- return;
- }
- }
- super.notifyChanged(notification);
- }
-
- /*
- * (non-Javadoc)
- *
- * @see org.eclipse.emf.edit.provider.IDisposable#dispose()
- */
- @Override
- public void dispose() {
- if (clientMgr != null)
- clientMgr.dispose();
- super.dispose();
- }
-}
diff --git a/plugins/org.eclipse.jst.j2ee.ui/j2ee_ui/org/eclipse/jst/j2ee/internal/war/ui/util/J2EEWebItemProviderAdapterFactory.java b/plugins/org.eclipse.jst.j2ee.ui/j2ee_ui/org/eclipse/jst/j2ee/internal/war/ui/util/J2EEWebItemProviderAdapterFactory.java
deleted file mode 100644
index 6882f43..0000000
--- a/plugins/org.eclipse.jst.j2ee.ui/j2ee_ui/org/eclipse/jst/j2ee/internal/war/ui/util/J2EEWebItemProviderAdapterFactory.java
+++ /dev/null
@@ -1,50 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2003, 2004 IBM Corporation and others.
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
- *
- * Contributors:
- * IBM Corporation - initial API and implementation
- *******************************************************************************/
-/*
- * Created on Mar 29, 2004
- *
- * To change the template for this generated file go to
- * Window - Preferences - Java - Code Generation - Code and Comments
- */
-package org.eclipse.jst.j2ee.internal.war.ui.util;
-
-import org.eclipse.emf.common.notify.Adapter;
-import org.eclipse.jst.j2ee.internal.web.providers.WebapplicationItemProviderAdapterFactory;
-
-
-/**
- * @author jlanuti
- *
- * To change the template for this generated type comment go to Window - Preferences - Java - Code
- * Generation - Code and Comments
- */
-public class J2EEWebItemProviderAdapterFactory extends WebapplicationItemProviderAdapterFactory {
-
- /**
- * Default constructor
- */
- public J2EEWebItemProviderAdapterFactory() {
- super();
- }
-
-
- /*
- * (non-Javadoc)
- *
- * @see org.eclipse.jst.j2ee.internal.internal.webapplication.util.WebapplicationAdapterFactory#createWebAppAdapter()
- */
- @Override
- public Adapter createWebAppAdapter() {
- if (webAppItemProvider == null)
- webAppItemProvider = new J2EEWebAppItemProvider(this);
- return webAppItemProvider;
- }
-}
\ No newline at end of file
diff --git a/plugins/org.eclipse.jst.j2ee.ui/j2ee_ui/org/eclipse/jst/j2ee/internal/war/ui/util/WebContextParamGroupItemProvider.java b/plugins/org.eclipse.jst.j2ee.ui/j2ee_ui/org/eclipse/jst/j2ee/internal/war/ui/util/WebContextParamGroupItemProvider.java
deleted file mode 100644
index 65d781e..0000000
--- a/plugins/org.eclipse.jst.j2ee.ui/j2ee_ui/org/eclipse/jst/j2ee/internal/war/ui/util/WebContextParamGroupItemProvider.java
+++ /dev/null
@@ -1,76 +0,0 @@
-/*
- * Created on Mar 29, 2004
- */
-package org.eclipse.jst.j2ee.internal.war.ui.util;
-
-import java.lang.ref.WeakReference;
-import java.util.ArrayList;
-import java.util.Collection;
-import java.util.List;
-
-import org.eclipse.emf.common.notify.AdapterFactory;
-import org.eclipse.jst.j2ee.internal.web.plugin.WebPlugin;
-import org.eclipse.jst.j2ee.internal.web.providers.WebAppEditResourceHandler;
-import org.eclipse.jst.j2ee.webapplication.WebApp;
-
-
-/**
- * @author jlanuti
- *
- * To change the template for this generated type comment go to Window - Preferences - Java - Code
- * Generation - Code and Comments
- */
-public class WebContextParamGroupItemProvider extends WebGroupItemProvider {
-
- /**
- * @param adapterFactory
- */
- public WebContextParamGroupItemProvider(AdapterFactory adapterFactory, WeakReference weakWebApp) {
- super(adapterFactory, weakWebApp);
- }
-
- /* (non-Javadoc)
- * @see org.eclipse.emf.edit.provider.ITreeItemContentProvider#getChildren(java.lang.Object)
- */
- @Override
- public Collection getChildren(Object object) {
- List result = new ArrayList();
- if (weakWebApp!=null) {
- Object webApp = weakWebApp.get();
- if(null != webApp){
- result.addAll(((WebApp)webApp).getContextParams());
- }
- }
- return result;
- }
-
- /* (non-Javadoc)
- * @see org.eclipse.emf.edit.provider.ItemProvider#getImage()
- */
- @Override
- public Object getImage(Object object) {
- return WebPlugin.getDefault().getImage("initializ_parameter_context"); //$NON-NLS-1$
- }
- /* (non-Javadoc)
- * @see org.eclipse.emf.edit.provider.ItemProvider#getText()
- */
- @Override
- public String getText(Object object) {
- return WebAppEditResourceHandler.getString("Context_Parameters_2"); //$NON-NLS-1$
- }
- /* (non-Javadoc)
- * @see org.eclipse.emf.edit.provider.ITreeItemContentProvider#hasChildren(java.lang.Object)
- */
- @Override
- public boolean hasChildren(Object object) {
- return !getChildren(object).isEmpty();
- }
-
- /* (non-Javadoc)
- * @see org.eclipse.emf.edit.provider.ITreeItemContentProvider#getParent(java.lang.Object)
- */
- @Override
- public Object getParent(Object object) {
- return weakWebApp.get();
- }
-}
diff --git a/plugins/org.eclipse.jst.j2ee.ui/j2ee_ui/org/eclipse/jst/j2ee/internal/war/ui/util/WebErrorPageGroupItemProvider.java b/plugins/org.eclipse.jst.j2ee.ui/j2ee_ui/org/eclipse/jst/j2ee/internal/war/ui/util/WebErrorPageGroupItemProvider.java
deleted file mode 100644
index 2806f52..0000000
--- a/plugins/org.eclipse.jst.j2ee.ui/j2ee_ui/org/eclipse/jst/j2ee/internal/war/ui/util/WebErrorPageGroupItemProvider.java
+++ /dev/null
@@ -1,76 +0,0 @@
-/*
- * Created on Mar 29, 2004
- */
-package org.eclipse.jst.j2ee.internal.war.ui.util;
-
-import java.lang.ref.WeakReference;
-import java.util.ArrayList;
-import java.util.Collection;
-import java.util.List;
-
-import org.eclipse.emf.common.notify.AdapterFactory;
-import org.eclipse.jst.j2ee.internal.web.plugin.WebPlugin;
-import org.eclipse.jst.j2ee.internal.web.providers.WebAppEditResourceHandler;
-import org.eclipse.jst.j2ee.webapplication.WebApp;
-
-
-/**
- * @author jlanuti
- *
- * To change the template for this generated type comment go to Window - Preferences - Java - Code
- * Generation - Code and Comments
- */
-public class WebErrorPageGroupItemProvider extends WebGroupItemProvider {
-
- /**
- * @param adapterFactory
- */
- public WebErrorPageGroupItemProvider(AdapterFactory adapterFactory, WeakReference weakWebApp) {
- super(adapterFactory, weakWebApp);
- }
-
- /* (non-Javadoc)
- * @see org.eclipse.emf.edit.provider.ITreeItemContentProvider#getChildren(java.lang.Object)
- */
- @Override
- public Collection getChildren(Object object) {
- List result = new ArrayList();
- if (weakWebApp!=null) {
- Object webApp = weakWebApp.get();
- if(null != webApp){
- result.addAll(((WebApp)webApp).getErrorPages());
- }
- }
- return result;
- }
-
- /* (non-Javadoc)
- * @see org.eclipse.emf.edit.provider.ItemProvider#getImage()
- */
- @Override
- public Object getImage(Object object) {
- return WebPlugin.getDefault().getImage("error_page"); //$NON-NLS-1$
- }
- /* (non-Javadoc)
- * @see org.eclipse.emf.edit.provider.ItemProvider#getText()
- */
- @Override
- public String getText(Object object) {
- return WebAppEditResourceHandler.getString("Error_Pages_1"); //$NON-NLS-1$
- }
- /* (non-Javadoc)
- * @see org.eclipse.emf.edit.provider.ITreeItemContentProvider#hasChildren(java.lang.Object)
- */
- @Override
- public boolean hasChildren(Object object) {
- return !getChildren(object).isEmpty();
- }
-
- /* (non-Javadoc)
- * @see org.eclipse.emf.edit.provider.ITreeItemContentProvider#getParent(java.lang.Object)
- */
- @Override
- public Object getParent(Object object) {
- return weakWebApp.get();
- }
-}
diff --git a/plugins/org.eclipse.jst.j2ee.ui/j2ee_ui/org/eclipse/jst/j2ee/internal/war/ui/util/WebFilterMappingGroupItemProvider.java b/plugins/org.eclipse.jst.j2ee.ui/j2ee_ui/org/eclipse/jst/j2ee/internal/war/ui/util/WebFilterMappingGroupItemProvider.java
deleted file mode 100644
index 7d9bfcf..0000000
--- a/plugins/org.eclipse.jst.j2ee.ui/j2ee_ui/org/eclipse/jst/j2ee/internal/war/ui/util/WebFilterMappingGroupItemProvider.java
+++ /dev/null
@@ -1,79 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2003, 2005 IBM Corporation and others.
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
- *
- * Contributors:
- * IBM Corporation - initial API and implementation
- *******************************************************************************/
-/*
- * Created on Jun 11, 2004
- */
-package org.eclipse.jst.j2ee.internal.war.ui.util;
-
-import java.lang.ref.WeakReference;
-import java.util.Collection;
-import java.util.Collections;
-
-import org.eclipse.emf.common.notify.AdapterFactory;
-import org.eclipse.jst.j2ee.internal.web.plugin.WebPlugin;
-import org.eclipse.jst.j2ee.internal.web.providers.WebAppEditResourceHandler;
-import org.eclipse.jst.j2ee.webapplication.WebApp;
-
-
-/**
- * @author jialin
- */
-public class WebFilterMappingGroupItemProvider extends WebGroupItemProvider {
-
- /**
- * @param adapterFactory
- */
- public WebFilterMappingGroupItemProvider(AdapterFactory adapterFactory, WeakReference weakWebApp) {
- super(adapterFactory,weakWebApp);
- }
-
- /* (non-Javadoc)
- * @see org.eclipse.emf.edit.provider.ITreeItemContentProvider#getChildren(java.lang.Object)
- */
- @Override
- public Collection getChildren(Object object) {
- Object webApp = weakWebApp.get();
- if(null != webApp){
- return ((WebApp)webApp).getFilterMappings();
- }
- return Collections.EMPTY_LIST;
- }
-
- /* (non-Javadoc)
- * @see org.eclipse.emf.edit.provider.ItemProvider#getImage()
- */
- @Override
- public Object getImage(Object object) {
- return WebPlugin.getDefault().getImage("filter_mapping"); //$NON-NLS-1$
- }
- /* (non-Javadoc)
- * @see org.eclipse.emf.edit.provider.ItemProvider#getText()
- */
- @Override
- public String getText(Object object) {
- return WebAppEditResourceHandler.getString("Filter_Mappings_1"); //$NON-NLS-1$
- }
- /* (non-Javadoc)
- * @see org.eclipse.emf.edit.provider.ITreeItemContentProvider#hasChildren(java.lang.Object)
- */
- @Override
- public boolean hasChildren(Object object) {
- return !getChildren(object).isEmpty();
- }
-
- /* (non-Javadoc)
- * @see org.eclipse.emf.edit.provider.ITreeItemContentProvider#getParent(java.lang.Object)
- */
- @Override
- public Object getParent(Object object) {
- return weakWebApp.get();
- }
-}
diff --git a/plugins/org.eclipse.jst.j2ee.ui/j2ee_ui/org/eclipse/jst/j2ee/internal/war/ui/util/WebFiltersGroupItemProvider.java b/plugins/org.eclipse.jst.j2ee.ui/j2ee_ui/org/eclipse/jst/j2ee/internal/war/ui/util/WebFiltersGroupItemProvider.java
deleted file mode 100644
index 7191d06..0000000
--- a/plugins/org.eclipse.jst.j2ee.ui/j2ee_ui/org/eclipse/jst/j2ee/internal/war/ui/util/WebFiltersGroupItemProvider.java
+++ /dev/null
@@ -1,89 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2003, 2005 IBM Corporation and others.
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
- *
- * Contributors:
- * IBM Corporation - initial API and implementation
- *******************************************************************************/
-/*
- * Created on Mar 29, 2004
- *
- * To change the template for this generated file go to
- * Window - Preferences - Java - Code Generation - Code and Comments
- */
-package org.eclipse.jst.j2ee.internal.war.ui.util;
-
-import java.lang.ref.WeakReference;
-import java.util.ArrayList;
-import java.util.Collection;
-import java.util.List;
-
-import org.eclipse.emf.common.notify.AdapterFactory;
-import org.eclipse.jst.j2ee.internal.web.plugin.WebPlugin;
-import org.eclipse.jst.j2ee.internal.web.providers.WebAppEditResourceHandler;
-import org.eclipse.jst.j2ee.webapplication.WebApp;
-
-
-/**
- * @author jlanuti
- *
- * To change the template for this generated type comment go to Window - Preferences - Java - Code
- * Generation - Code and Comments
- */
-public class WebFiltersGroupItemProvider extends WebGroupItemProvider {
-
- /**
- * @param adapterFactory
- */
- public WebFiltersGroupItemProvider(AdapterFactory adapterFactory, WeakReference weakWebApp) {
- super(adapterFactory, weakWebApp);
- }
-
- /**
- * This returns Filter.gif.
- */
- @Override
- public Object getImage(Object object) {
- return WebPlugin.getDefault().getImage("filter"); //$NON-NLS-1$
- }
-
- /* (non-Javadoc)
- * @see org.eclipse.emf.edit.provider.ITreeItemContentProvider#getChildren(java.lang.Object)
- */
- @Override
- public Collection getChildren(Object object) {
- List result = new ArrayList();
- Object webApp = weakWebApp.get();
- if(webApp != null){
- result.addAll(((WebApp)webApp).getFilters());
- }
- return getSortedChildren(result);
- }
-
- /* (non-Javadoc)
- * @see org.eclipse.emf.edit.provider.ITreeItemContentProvider#getParent(java.lang.Object)
- */
- @Override
- public Object getParent(Object object) {
- return weakWebApp.get();
- }
-
- /* (non-Javadoc)
- * @see org.eclipse.emf.edit.provider.IItemLabelProvider#getText(java.lang.Object)
- */
- @Override
- public String getText(Object object) {
- return WebAppEditResourceHandler.getString("Filters_1"); //$NON-NLS-1$
- }
-
- /* (non-Javadoc)
- * @see org.eclipse.emf.edit.provider.ITreeItemContentProvider#hasChildren(java.lang.Object)
- */
- @Override
- public boolean hasChildren(Object object) {
- return !getChildren(object).isEmpty();
- }
-}
diff --git a/plugins/org.eclipse.jst.j2ee.ui/j2ee_ui/org/eclipse/jst/j2ee/internal/war/ui/util/WebGroupItemProvider.java b/plugins/org.eclipse.jst.j2ee.ui/j2ee_ui/org/eclipse/jst/j2ee/internal/war/ui/util/WebGroupItemProvider.java
deleted file mode 100644
index 9084a9d..0000000
--- a/plugins/org.eclipse.jst.j2ee.ui/j2ee_ui/org/eclipse/jst/j2ee/internal/war/ui/util/WebGroupItemProvider.java
+++ /dev/null
@@ -1,95 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2003, 2006 IBM Corporation and others.
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
- *
- * Contributors:
- * IBM Corporation - initial API and implementation
- *******************************************************************************/
-/*
- * Created on Aug 11, 2004
- */
-package org.eclipse.jst.j2ee.internal.war.ui.util;
-
-import java.lang.ref.WeakReference;
-import java.util.Collection;
-import java.util.Collections;
-import java.util.Comparator;
-import java.util.List;
-
-import org.eclipse.core.resources.IFile;
-import org.eclipse.emf.common.notify.AdapterFactory;
-import org.eclipse.jem.util.emf.workbench.WorkbenchResourceHelperBase;
-import org.eclipse.jst.j2ee.common.Listener;
-import org.eclipse.jst.j2ee.internal.provider.J2EEItemProvider;
-import org.eclipse.jst.j2ee.webapplication.Filter;
-import org.eclipse.jst.j2ee.webapplication.Servlet;
-import org.eclipse.jst.j2ee.webapplication.WebApp;
-
-/**
- * @author jlanuti
- */
-public abstract class WebGroupItemProvider extends J2EEItemProvider {
-
- class WebGroupComparator implements Comparator {
- public int compare(Object o1, Object o2) {
- if (o1 instanceof Servlet) {
- Servlet s1 = (Servlet)o1;
- Servlet s2 = (Servlet)o2;
- if (s1.getServletName() != null && s2.getServletName() != null)
- return s1.getServletName().compareTo(s2.getServletName());
- return -1;
- }
- else if (o1 instanceof Filter) {
- Filter f1 = (Filter) o1;
- Filter f2 = (Filter) o2;
- if (f1.getName() != null && f2.getName() != null)
- return f1.getName().compareTo(f2.getName());
- return -1;
- }
- else if (o1 instanceof Listener) {
- Listener l1 = (Listener) o1;
- Listener l2 = (Listener) o2;
- if (l1.getListenerClassName() != null && l2.getListenerClassName() !=null)
- return l1.getListenerClassName().compareTo(l2.getListenerClassName());
- return -1;
- }
- else return -1;
- }
- }
-
- protected WeakReference weakWebApp;
-
- public WebGroupItemProvider(AdapterFactory adapterFactory, WeakReference weakWebApp) {
- super(adapterFactory);
- this.weakWebApp = weakWebApp;
- }
-
- public Collection getSortedChildren(List theChildren) {
- Collections.sort(theChildren, new WebGroupComparator());
- return theChildren;
- }
-
- @Override
- public void dispose() {
- super.dispose();
- weakWebApp = null;
- }
-
-
- @Override
- public IFile getAssociatedFile() {
-
- try {
- WebApp webapp = (WebApp) weakWebApp.get();
- if(webapp != null && webapp.eResource() != null) {
- return WorkbenchResourceHelperBase.getIFile(webapp.eResource().getURI());
- }
- } catch (Throwable t) {
-
- }
- return null;
- }
-}
diff --git a/plugins/org.eclipse.jst.j2ee.ui/j2ee_ui/org/eclipse/jst/j2ee/internal/war/ui/util/WebListenerGroupItemProvider.java b/plugins/org.eclipse.jst.j2ee.ui/j2ee_ui/org/eclipse/jst/j2ee/internal/war/ui/util/WebListenerGroupItemProvider.java
deleted file mode 100644
index 49608e7..0000000
--- a/plugins/org.eclipse.jst.j2ee.ui/j2ee_ui/org/eclipse/jst/j2ee/internal/war/ui/util/WebListenerGroupItemProvider.java
+++ /dev/null
@@ -1,83 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2003, 2005 IBM Corporation and others.
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
- *
- * Contributors:
- * IBM Corporation - initial API and implementation
- *******************************************************************************/
-/*
- * Created on Jun 11, 2004
- */
-package org.eclipse.jst.j2ee.internal.war.ui.util;
-
-import java.lang.ref.WeakReference;
-import java.util.ArrayList;
-import java.util.Collection;
-import java.util.List;
-
-import org.eclipse.emf.common.notify.AdapterFactory;
-import org.eclipse.jst.j2ee.internal.plugin.J2EEPlugin;
-import org.eclipse.jst.j2ee.internal.web.providers.WebAppEditResourceHandler;
-import org.eclipse.jst.j2ee.webapplication.WebApp;
-
-
-/**
- * @author jialin
- */
-public class WebListenerGroupItemProvider extends WebGroupItemProvider {
-
- /**
- * @param adapterFactory
- */
- public WebListenerGroupItemProvider(AdapterFactory adapterFactory, WeakReference weakWebApp) {
- super(adapterFactory, weakWebApp);
- }
-
- /**
- * This returns Filter.gif.
- */
- @Override
- public Object getImage(Object object) {
- return J2EEPlugin.getDefault().getImage("listener"); //$NON-NLS-1$
- }
-
- /* (non-Javadoc)
- * @see org.eclipse.emf.edit.provider.ITreeItemContentProvider#getChildren(java.lang.Object)
- */
- @Override
- public Collection getChildren(Object object) {
- List result = new ArrayList();
- Object webApp = weakWebApp.get();
- if(webApp != null){
- result.addAll(((WebApp)webApp).getListeners());
- }
- return getSortedChildren(result);
- }
-
- /* (non-Javadoc)
- * @see org.eclipse.emf.edit.provider.ITreeItemContentProvider#getParent(java.lang.Object)
- */
- @Override
- public Object getParent(Object object) {
- return weakWebApp.get();
- }
-
- /* (non-Javadoc)
- * @see org.eclipse.emf.edit.provider.IItemLabelProvider#getText(java.lang.Object)
- */
- @Override
- public String getText(Object object) {
- return WebAppEditResourceHandler.getString("LISTENER"); //$NON-NLS-1$
- }
-
- /* (non-Javadoc)
- * @see org.eclipse.emf.edit.provider.ITreeItemContentProvider#hasChildren(java.lang.Object)
- */
- @Override
- public boolean hasChildren(Object object) {
- return !getChildren(object).isEmpty();
- }
-}
diff --git a/plugins/org.eclipse.jst.j2ee.ui/j2ee_ui/org/eclipse/jst/j2ee/internal/war/ui/util/WebReferencesGroupItemProvider.java b/plugins/org.eclipse.jst.j2ee.ui/j2ee_ui/org/eclipse/jst/j2ee/internal/war/ui/util/WebReferencesGroupItemProvider.java
deleted file mode 100644
index 4a7ca31..0000000
--- a/plugins/org.eclipse.jst.j2ee.ui/j2ee_ui/org/eclipse/jst/j2ee/internal/war/ui/util/WebReferencesGroupItemProvider.java
+++ /dev/null
@@ -1,124 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2003, 2005 IBM Corporation and others.
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
- *
- * Contributors:
- * IBM Corporation - initial API and implementation
- *******************************************************************************/
-/*
- * Created on Mar 29, 2004
- *
- * To change the template for this generated file go to
- * Window - Preferences - Java - Code Generation - Code and Comments
- */
-package org.eclipse.jst.j2ee.internal.war.ui.util;
-
-import java.lang.ref.WeakReference;
-import java.util.ArrayList;
-import java.util.Collection;
-import java.util.Collections;
-import java.util.List;
-
-import org.eclipse.emf.common.notify.AdapterFactory;
-import org.eclipse.jst.j2ee.internal.plugin.J2EEPlugin;
-import org.eclipse.jst.j2ee.internal.web.providers.WebAppEditResourceHandler;
-import org.eclipse.jst.j2ee.internal.webservices.WSDLServiceExtManager;
-import org.eclipse.jst.j2ee.internal.webservices.WSDLServiceHelper;
-import org.eclipse.jst.j2ee.webapplication.WebApp;
-
-/**
- * @author jlanuti
- *
- * To change the template for this generated type comment go to Window - Preferences - Java - Code
- * Generation - Code and Comments
- */
-public class WebReferencesGroupItemProvider extends WebGroupItemProvider {
-
- /**
- * @param adapterFactory
- */
- public WebReferencesGroupItemProvider(AdapterFactory adapterFactory, WeakReference weakWebApp) {
- super(adapterFactory, weakWebApp);
- }
-
- /*
- * (non-Javadoc)
- *
- * @see org.eclipse.emf.edit.provider.ITreeItemContentProvider#getParent(java.lang.Object)
- */
- @Override
- public Object getParent(Object object) {
- return weakWebApp.get();
- }
-
- /*
- * (non-Javadoc)
- *
- * @see org.eclipse.emf.edit.provider.ITreeItemContentProvider#getChildren(java.lang.Object)
- */
- @Override
- public Collection getChildren(Object object) {
- List result = new ArrayList();
- Object obj = weakWebApp.get();
- if (null != obj) {
- WebApp webApp = (WebApp) obj;
- if (!webApp.getEjbLocalRefs().isEmpty())
- result.addAll(webApp.getEjbLocalRefs());
- if (!webApp.getEjbRefs().isEmpty())
- result.addAll(webApp.getEjbRefs());
- if (!webApp.getResourceEnvRefs().isEmpty())
- result.addAll(webApp.getResourceEnvRefs());
- if (!webApp.getResourceRefs().isEmpty())
- result.addAll(webApp.getResourceRefs());
- if (!webApp.getMessageDestinationRefs().isEmpty())
- result.addAll(webApp.getMessageDestinationRefs());
- if (!webApp.getServiceRefs().isEmpty())
- result.addAll(webApp.getServiceRefs());
- Collection serviceRefs = null;
- try {
- WSDLServiceHelper serviceHelper = WSDLServiceExtManager.getServiceHelper();
- serviceRefs = serviceHelper.get13ServiceRefs(webApp);
- } catch (Exception re) {
- serviceRefs = Collections.EMPTY_LIST;
- }
-
- if (serviceRefs != null && !serviceRefs.isEmpty())
- result.addAll(serviceRefs);
- }
- return result;
- }
-
- /*
- * (non-Javadoc)
- *
- * @see org.eclipse.emf.edit.provider.ITreeItemContentProvider#hasChildren(java.lang.Object)
- */
- @Override
- public boolean hasChildren(Object object) {
- return !getChildren(object).isEmpty();
- }
-
- /*
- * (non-Javadoc)
- *
- * @see org.eclipse.emf.edit.provider.ItemProvider#getImage()
- */
- @Override
- public Object getImage(Object object) {
- return J2EEPlugin.getDefault().getImage("resourceRef_obj"); //$NON-NLS-1$
- }
-
- /*
- * (non-Javadoc)
- *
- * @see org.eclipse.emf.edit.provider.ItemProvider#getText()
- */
- @Override
- public String getText(Object object) {
- return WebAppEditResourceHandler.getString("References_1"); //$NON-NLS-1$
- }
-
-}
diff --git a/plugins/org.eclipse.jst.j2ee.ui/j2ee_ui/org/eclipse/jst/j2ee/internal/war/ui/util/WebSecurityGroupItemProvider.java b/plugins/org.eclipse.jst.j2ee.ui/j2ee_ui/org/eclipse/jst/j2ee/internal/war/ui/util/WebSecurityGroupItemProvider.java
deleted file mode 100644
index ae99987..0000000
--- a/plugins/org.eclipse.jst.j2ee.ui/j2ee_ui/org/eclipse/jst/j2ee/internal/war/ui/util/WebSecurityGroupItemProvider.java
+++ /dev/null
@@ -1,103 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2003, 2005 IBM Corporation and others.
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
- *
- * Contributors:
- * IBM Corporation - initial API and implementation
- *******************************************************************************/
-/*
- * Created on Mar 29, 2004
- *
- * To change the template for this generated file go to
- * Window - Preferences - Java - Code Generation - Code and Comments
- */
-package org.eclipse.jst.j2ee.internal.war.ui.util;
-
-import java.lang.ref.WeakReference;
-import java.util.ArrayList;
-import java.util.Collection;
-import java.util.List;
-
-import org.eclipse.emf.common.notify.AdapterFactory;
-import org.eclipse.jst.j2ee.internal.plugin.J2EEPlugin;
-import org.eclipse.jst.j2ee.internal.web.providers.WebAppEditResourceHandler;
-import org.eclipse.jst.j2ee.webapplication.WebApp;
-
-
-/**
- * @author jlanuti
- *
- * To change the template for this generated type comment go to Window - Preferences - Java - Code
- * Generation - Code and Comments
- */
-public class WebSecurityGroupItemProvider extends WebGroupItemProvider {
-
- /**
- * @param adapterFactory
- */
- public WebSecurityGroupItemProvider(AdapterFactory adapterFactory, WeakReference weakWebApp) {
- super(adapterFactory, weakWebApp);
- }
-
- /*
- * (non-Javadoc)
- *
- * @see org.eclipse.emf.edit.provider.ITreeItemContentProvider#getParent(java.lang.Object)
- */
- @Override
- public Object getParent(Object object) {
- return weakWebApp.get();
- }
-
- /*
- * (non-Javadoc)
- *
- * @see org.eclipse.emf.edit.provider.ITreeItemContentProvider#hasChildren(java.lang.Object)
- */
- @Override
- public boolean hasChildren(Object object) {
- return !getChildren(object).isEmpty();
- }
-
- /*
- * (non-Javadoc)
- *
- * @see org.eclipse.emf.edit.provider.ItemProvider#getText()
- */
- @Override
- public String getText(Object object) {
- return WebAppEditResourceHandler.getString("Security_1"); //$NON-NLS-1$
- }
-
- /*
- * (non-Javadoc)
- *
- * @see org.eclipse.emf.edit.provider.ITreeItemContentProvider#getChildren(java.lang.Object)
- */
- @Override
- public Collection getChildren(Object object) {
- List result = new ArrayList();
- Object obj = weakWebApp.get();
- if (null != obj) {
- WebApp webApp = (WebApp) obj;
- if (!webApp.getSecurityRoles().isEmpty())
- result.addAll(webApp.getSecurityRoles());
- if (!webApp.getConstraints().isEmpty())
- result.addAll(webApp.getConstraints());
- }
- return result;
- }
-
- /*
- * (non-Javadoc)
- *
- * @see org.eclipse.emf.edit.provider.ItemProvider#getImage()
- */
- @Override
- public Object getImage(Object object) {
- return J2EEPlugin.getPlugin().getImage("security_role");//$NON-NLS-1$
- }
-}
diff --git a/plugins/org.eclipse.jst.j2ee.ui/j2ee_ui/org/eclipse/jst/j2ee/internal/war/ui/util/WebServletGroupItemProvider.java b/plugins/org.eclipse.jst.j2ee.ui/j2ee_ui/org/eclipse/jst/j2ee/internal/war/ui/util/WebServletGroupItemProvider.java
deleted file mode 100644
index 16d0bb5..0000000
--- a/plugins/org.eclipse.jst.j2ee.ui/j2ee_ui/org/eclipse/jst/j2ee/internal/war/ui/util/WebServletGroupItemProvider.java
+++ /dev/null
@@ -1,86 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2003, 2006 IBM Corporation and others.
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
- *
- * Contributors:
- * IBM Corporation - initial API and implementation
- *******************************************************************************/
-/*
- * Created on Mar 29, 2004
- */
-package org.eclipse.jst.j2ee.internal.war.ui.util;
-
-import java.lang.ref.WeakReference;
-import java.util.ArrayList;
-import java.util.Collection;
-import java.util.List;
-
-import org.eclipse.emf.common.notify.AdapterFactory;
-import org.eclipse.jst.j2ee.internal.web.plugin.WebPlugin;
-import org.eclipse.jst.j2ee.internal.web.providers.WebAppEditResourceHandler;
-import org.eclipse.jst.j2ee.webapplication.WebApp;
-
-
-/**
- * @author jlanuti
- *
- * To change the template for this generated type comment go to Window - Preferences - Java - Code
- * Generation - Code and Comments
- */
-public class WebServletGroupItemProvider extends WebGroupItemProvider {
-
- /**
- * @param adapterFactory
- */
- public WebServletGroupItemProvider(AdapterFactory adapterFactory, WeakReference weakWebApp) {
- super(adapterFactory, weakWebApp);
- }
-
- /* (non-Javadoc)
- * @see org.eclipse.emf.edit.provider.ITreeItemContentProvider#getChildren(java.lang.Object)
- */
- @Override
- public Collection getChildren(Object object) {
- List result = new ArrayList();
- if (weakWebApp!=null) {
- Object webApp = weakWebApp.get();
- if(null != webApp){
- result.addAll(((WebApp)webApp).getServlets());
- }
- }
- return getSortedChildren(result);
- }
-
- /* (non-Javadoc)
- * @see org.eclipse.emf.edit.provider.ItemProvider#getImage()
- */
- @Override
- public Object getImage(Object object) {
- return WebPlugin.getDefault().getImage("servlet"); //$NON-NLS-1$
- }
- /* (non-Javadoc)
- * @see org.eclipse.emf.edit.provider.ItemProvider#getText()
- */
- @Override
- public String getText(Object object) {
- return WebAppEditResourceHandler.getString("Servlets_1"); //$NON-NLS-1$
- }
- /* (non-Javadoc)
- * @see org.eclipse.emf.edit.provider.ITreeItemContentProvider#hasChildren(java.lang.Object)
- */
- @Override
- public boolean hasChildren(Object object) {
- return !getChildren(object).isEmpty();
- }
-
- /* (non-Javadoc)
- * @see org.eclipse.emf.edit.provider.ITreeItemContentProvider#getParent(java.lang.Object)
- */
- @Override
- public Object getParent(Object object) {
- return weakWebApp.get();
- }
-}
diff --git a/plugins/org.eclipse.jst.j2ee.ui/j2ee_ui/org/eclipse/jst/j2ee/internal/war/ui/util/WebServletMappingGroupItemProvider.java b/plugins/org.eclipse.jst.j2ee.ui/j2ee_ui/org/eclipse/jst/j2ee/internal/war/ui/util/WebServletMappingGroupItemProvider.java
deleted file mode 100644
index a356099..0000000
--- a/plugins/org.eclipse.jst.j2ee.ui/j2ee_ui/org/eclipse/jst/j2ee/internal/war/ui/util/WebServletMappingGroupItemProvider.java
+++ /dev/null
@@ -1,91 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2003, 2005 IBM Corporation and others.
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
- *
- * Contributors:
- * IBM Corporation - initial API and implementation
- *******************************************************************************/
-/*
- * Created on Jun 11, 2004
- */
-package org.eclipse.jst.j2ee.internal.war.ui.util;
-
-import java.lang.ref.WeakReference;
-import java.util.Collection;
-import java.util.Collections;
-
-import org.eclipse.emf.common.notify.AdapterFactory;
-import org.eclipse.jst.j2ee.internal.web.plugin.WebPlugin;
-import org.eclipse.jst.j2ee.internal.web.providers.WebAppEditResourceHandler;
-import org.eclipse.jst.j2ee.webapplication.WebApp;
-
-
-/**
- * @author jialin
- */
-public class WebServletMappingGroupItemProvider extends WebGroupItemProvider {
-
- /**
- * @param adapterFactory
- */
- public WebServletMappingGroupItemProvider(AdapterFactory adapterFactory, WeakReference weakWebApp) {
- super(adapterFactory, weakWebApp);
- }
-
- /*
- * (non-Javadoc)
- *
- * @see org.eclipse.emf.edit.provider.ITreeItemContentProvider#getChildren(java.lang.Object)
- */
- @Override
- public Collection getChildren(Object object) {
- Object webApp = weakWebApp.get();
- if (null != webApp) {
- return ((WebApp) webApp).getServletMappings();
- }
- return Collections.EMPTY_LIST;
- }
-
- /*
- * (non-Javadoc)
- *
- * @see org.eclipse.emf.edit.provider.ItemProvider#getImage()
- */
- @Override
- public Object getImage(Object object) {
- return WebPlugin.getDefault().getImage("servlet_mapping"); //$NON-NLS-1$
- }
-
- /*
- * (non-Javadoc)
- *
- * @see org.eclipse.emf.edit.provider.ItemProvider#getText()
- */
- @Override
- public String getText(Object object) {
- return WebAppEditResourceHandler.getString("Servlet_Mappings_2"); //$NON-NLS-1$
- }
-
- /*
- * (non-Javadoc)
- *
- * @see org.eclipse.emf.edit.provider.ITreeItemContentProvider#hasChildren(java.lang.Object)
- */
- @Override
- public boolean hasChildren(Object object) {
- return !getChildren(object).isEmpty();
- }
-
- /*
- * (non-Javadoc)
- *
- * @see org.eclipse.emf.edit.provider.ITreeItemContentProvider#getParent(java.lang.Object)
- */
- @Override
- public Object getParent(Object object) {
- return weakWebApp.get();
- }
-}
diff --git a/plugins/org.eclipse.jst.j2ee.ui/j2ee_ui/org/eclipse/jst/j2ee/internal/war/ui/util/WebWelcomeFileGroupItemProvider.java b/plugins/org.eclipse.jst.j2ee.ui/j2ee_ui/org/eclipse/jst/j2ee/internal/war/ui/util/WebWelcomeFileGroupItemProvider.java
deleted file mode 100644
index 1bd59f2..0000000
--- a/plugins/org.eclipse.jst.j2ee.ui/j2ee_ui/org/eclipse/jst/j2ee/internal/war/ui/util/WebWelcomeFileGroupItemProvider.java
+++ /dev/null
@@ -1,80 +0,0 @@
-/*
- * Created on Mar 29, 2004
- */
-package org.eclipse.jst.j2ee.internal.war.ui.util;
-
-import java.lang.ref.WeakReference;
-import java.util.ArrayList;
-import java.util.Collection;
-import java.util.List;
-
-import org.eclipse.emf.common.notify.AdapterFactory;
-import org.eclipse.jst.j2ee.internal.web.plugin.WebPlugin;
-import org.eclipse.jst.j2ee.internal.web.providers.WebAppEditResourceHandler;
-import org.eclipse.jst.j2ee.webapplication.WebApp;
-import org.eclipse.jst.j2ee.webapplication.WelcomeFileList;
-
-
-/**
- * @author jlanuti
- *
- * To change the template for this generated type comment go to Window - Preferences - Java - Code
- * Generation - Code and Comments
- */
-public class WebWelcomeFileGroupItemProvider extends WebGroupItemProvider {
-
- /**
- * @param adapterFactory
- */
- public WebWelcomeFileGroupItemProvider(AdapterFactory adapterFactory, WeakReference weakWebApp) {
- super(adapterFactory, weakWebApp);
- }
-
- /* (non-Javadoc)
- * @see org.eclipse.emf.edit.provider.ITreeItemContentProvider#getChildren(java.lang.Object)
- */
- @Override
- public Collection getChildren(Object object) {
- List result = new ArrayList();
- if (weakWebApp!=null) {
- Object webApp = weakWebApp.get();
- if (null != webApp) {
- WelcomeFileList fileList = ((WebApp)webApp).getFileList();
- if (fileList != null) {
- result.addAll(fileList.getFile());
- }
- }
- }
- return result;
- }
-
- /* (non-Javadoc)
- * @see org.eclipse.emf.edit.provider.ItemProvider#getImage()
- */
- @Override
- public Object getImage(Object object) {
- return WebPlugin.getDefault().getImage("welcome_list"); //$NON-NLS-1$
- }
- /* (non-Javadoc)
- * @see org.eclipse.emf.edit.provider.ItemProvider#getText()
- */
- @Override
- public String getText(Object object) {
- return WebAppEditResourceHandler.getString("Welcome_Pages_1"); //$NON-NLS-1$
- }
- /* (non-Javadoc)
- * @see org.eclipse.emf.edit.provider.ITreeItemContentProvider#hasChildren(java.lang.Object)
- */
- @Override
- public boolean hasChildren(Object object) {
- return !getChildren(object).isEmpty();
- }
-
- /* (non-Javadoc)
- * @see org.eclipse.emf.edit.provider.ITreeItemContentProvider#getParent(java.lang.Object)
- */
- @Override
- public Object getParent(Object object) {
- return weakWebApp.get();
- }
-}
diff --git a/plugins/org.eclipse.jst.j2ee.ui/j2ee_ui/org/eclipse/jst/j2ee/internal/wizard/AnnotationsStandaloneGroup.java b/plugins/org.eclipse.jst.j2ee.ui/j2ee_ui/org/eclipse/jst/j2ee/internal/wizard/AnnotationsStandaloneGroup.java
deleted file mode 100644
index e977b50..0000000
--- a/plugins/org.eclipse.jst.j2ee.ui/j2ee_ui/org/eclipse/jst/j2ee/internal/wizard/AnnotationsStandaloneGroup.java
+++ /dev/null
@@ -1,113 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2003, 2006 IBM Corporation and others.
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
- *
- * Contributors:
- * IBM Corporation - initial API and implementation
- * David Schneider, david.schneider@unisys.com - [142500] WTP properties pages fonts don't follow Eclipse preferences
- *******************************************************************************/
-/*
- * Created on Mar 29, 2004
- *
- * To change the template for this generated file go to
- * Window - Preferences - Java - Code Generation - Code and Comments
- */
-package org.eclipse.jst.j2ee.internal.wizard;
-
-import org.eclipse.core.resources.IProject;
-import org.eclipse.jface.dialogs.Dialog;
-import org.eclipse.jst.j2ee.application.internal.operations.IAnnotationsDataModel;
-import org.eclipse.jst.j2ee.internal.plugin.J2EEUIMessages;
-import org.eclipse.swt.SWT;
-import org.eclipse.swt.layout.GridData;
-import org.eclipse.swt.widgets.Button;
-import org.eclipse.swt.widgets.Composite;
-import org.eclipse.swt.widgets.Label;
-import org.eclipse.wst.common.frameworks.datamodel.IDataModel;
-import org.eclipse.wst.common.frameworks.internal.datamodel.ui.DataModelSynchHelper;
-
-/**
- * @author jlanuti
- *
- * To change the template for this generated type comment go to Window - Preferences - Java - Code
- * Generation - Code and Comments
- */
-public class AnnotationsStandaloneGroup {
-
- protected Object model;
- protected Object synchHelper;
- protected Button useAnnotations;
- private boolean isForBean;
- private boolean useServletString = false;
- public static final String EJBTAGSET = "ejb"; //$NON-NLS-1$
-
- /**
- * Constructor
- */
- public AnnotationsStandaloneGroup(Composite parent, Object model, boolean forBean) {
- this(parent, model, forBean, false);
- }
-
- /**
- * Constructor
- */
- public AnnotationsStandaloneGroup(Composite parent, Object model, boolean forBean, boolean useServlet) {
- super();
- synchHelper = new DataModelSynchHelper((IDataModel)model);
- this.model = model;
- this.isForBean = forBean;
- this.useServletString = useServlet;
-
- buildComposites(parent);
- }
-
- /**
- * @param parent
- */
- protected void buildComposites(Composite parent) {
- // Add separator
- Label separator = new Label(parent, SWT.SEPARATOR | SWT.HORIZONTAL);
- GridData gd = new GridData(GridData.FILL_HORIZONTAL);
- gd.horizontalSpan = 3;
- separator.setLayoutData(gd);
- // Add spacer
- Label spacer = new Label(parent, SWT.NONE);
- GridData gd1 = new GridData(GridData.FILL_HORIZONTAL);
- gd1.horizontalSpan = 3;
- spacer.setLayoutData(gd1);
- // Add annotations checkbox and label
- useAnnotations = new Button(parent, SWT.CHECK);
- String labelText;
- if (useServletString)
- labelText = J2EEUIMessages.getResourceString(J2EEUIMessages.USE_ANNOTATIONS_SERVLET);
- else if (isForBean)
- labelText = J2EEUIMessages.getResourceString(J2EEUIMessages.USE_ANNOTATIONS);
- else
- labelText = J2EEUIMessages.getResourceString(J2EEUIMessages.ADD_ANNOTATIONS_SUPPORT);
- useAnnotations.setText(labelText);
- ((DataModelSynchHelper)synchHelper).synchCheckbox(useAnnotations, IAnnotationsDataModel.USE_ANNOTATIONS, null);
- GridData gd2 = new GridData(GridData.FILL_HORIZONTAL);
- gd2.horizontalSpan = 2;
- useAnnotations.setLayoutData(gd2);
- Dialog.applyDialogFont(parent);
- }
-
- public void dispose() {
- ((IDataModel)model).removeListener((DataModelSynchHelper)synchHelper);
- synchHelper = null;
- model = null;
- }
-
- public void setEnablement(IProject project) {
- //TODO Remove - this is to be handled by the provider of the DataModel.
- }
-
-
-
- public void setUseServlet(boolean aBoolean) {
- useServletString = aBoolean;
- }
-}
diff --git a/plugins/org.eclipse.jst.j2ee.ui/j2ee_ui/org/eclipse/jst/j2ee/internal/wizard/AppClientComponentExportWizard.java b/plugins/org.eclipse.jst.j2ee.ui/j2ee_ui/org/eclipse/jst/j2ee/internal/wizard/AppClientComponentExportWizard.java
deleted file mode 100644
index 85131f7..0000000
--- a/plugins/org.eclipse.jst.j2ee.ui/j2ee_ui/org/eclipse/jst/j2ee/internal/wizard/AppClientComponentExportWizard.java
+++ /dev/null
@@ -1,79 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2003, 2005 IBM Corporation and others.
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
- *
- * Contributors:
- * IBM Corporation - initial API and implementation
- *******************************************************************************/
-package org.eclipse.jst.j2ee.internal.wizard;
-
-import org.eclipse.jst.j2ee.application.internal.operations.AppClientComponentExportDataModelProvider;
-import org.eclipse.jst.j2ee.internal.plugin.J2EEUIPlugin;
-import org.eclipse.jst.j2ee.internal.plugin.J2EEUIPluginIcons;
-import org.eclipse.ui.IExportWizard;
-import org.eclipse.wst.common.frameworks.datamodel.IDataModel;
-import org.eclipse.wst.common.frameworks.datamodel.IDataModelProvider;
-
-/**
- * <p>
- * Wizard used to export J2EE Application Client module structures from the Eclipse Workbench to a
- * deployable Application Client Archive *.jar file.
- * </p>
- */
-public final class AppClientComponentExportWizard extends J2EEArtifactExportWizard implements IExportWizard {
-
- /**
- * <p>
- * The default constructor. Creates a wizard with no selection, no model instance, and no
- * operation instance. The model and operation will be created as needed.
- * </p>
- */
- public AppClientComponentExportWizard() {
- super();
- }
-
- /**
- * <p>
- * The model is used to prepopulate the wizard controls and interface with the operation.
- * </p>
- *
- * @param model
- * The model parameter is used to pre-populate wizard controls and interface with the
- * operation
- */
- public AppClientComponentExportWizard(IDataModel model) {
- super(model);
- }
- @Override
- protected IDataModelProvider getDefaultProvider() {
- return new AppClientComponentExportDataModelProvider();
- }
-
- /**
- * <p>
- * Adds the following pages:
- * <ul>
- * <li>{@link AppClientExportPage}as the main wizard page ({@link #MAIN_PG})
- * </ul>
- * </p>
- */
- @Override
- public void doAddPages() {
- addPage(new AppClientExportPage(getDataModel(), MAIN_PG, getSelection()));
- }
-
- /**
- * {@inheritDoc}
- *
- * <p>
- * Sets up the default wizard page image.
- * </p>
- */
- @Override
- protected void doInit() {
- setDefaultPageImageDescriptor(J2EEUIPlugin.getDefault().getImageDescriptor(J2EEUIPluginIcons.APP_CLIENT_EXPORT_WIZARD_BANNER));
- }
-}
diff --git a/plugins/org.eclipse.jst.j2ee.ui/j2ee_ui/org/eclipse/jst/j2ee/internal/wizard/AppClientComponentImportPage.java b/plugins/org.eclipse.jst.j2ee.ui/j2ee_ui/org/eclipse/jst/j2ee/internal/wizard/AppClientComponentImportPage.java
deleted file mode 100644
index 43be19e..0000000
--- a/plugins/org.eclipse.jst.j2ee.ui/j2ee_ui/org/eclipse/jst/j2ee/internal/wizard/AppClientComponentImportPage.java
+++ /dev/null
@@ -1,87 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2003, 2006 IBM Corporation and others.
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
- *
- * Contributors:
- * IBM Corporation - initial API and implementation
- *******************************************************************************/
-package org.eclipse.jst.j2ee.internal.wizard;
-
-import org.eclipse.jst.j2ee.internal.actions.IJ2EEUIContextIds;
-import org.eclipse.jst.j2ee.internal.plugin.J2EEUIMessages;
-import org.eclipse.jst.j2ee.internal.plugin.J2EEUIPlugin;
-import org.eclipse.jst.j2ee.internal.plugin.J2EEUIPluginIcons;
-import org.eclipse.jst.j2ee.internal.project.J2EEProjectUtilities;
-import org.eclipse.swt.widgets.Composite;
-import org.eclipse.wst.common.frameworks.datamodel.IDataModel;
-
-public class AppClientComponentImportPage extends J2EEModuleImportPage {
- /**
- * @param model
- * @param pageName
- */
- public AppClientComponentImportPage(IDataModel model, String pageName) {
- super(model, pageName);
- setTitle(J2EEUIMessages.getResourceString(J2EEUIMessages.APP_CLIENT_IMPORT_MAIN_PG_TITLE));
- setDescription(J2EEUIMessages.getResourceString(J2EEUIMessages.APP_CLIENT_IMPORT_MAIN_PG_DESC));
- setImageDescriptor(J2EEUIPlugin.getDefault().getImageDescriptor(J2EEUIPluginIcons.APP_CLIENT_IMPORT_WIZARD_BANNER));
-
- }
-
- /*
- * (non-Javadoc)
- *
- * @see org.eclipse.jst.j2ee.internal.internal.internal.ui.wizard.J2EEImportPage#getFileImportLabel()
- */
- @Override
- protected String getFileImportLabel() {
- return J2EEUIMessages.getResourceString(J2EEUIMessages.APP_CLIENT_IMPORT_FILE_LABEL);
- }
-
- @Override
- protected String getFileNamesStoreID() {
- return "APP_CLIENT"; //$NON-NLS-1$;
- }
-
- /*
- * (non-Javadoc)
- *
- * @see org.eclipse.jst.j2ee.internal.internal.internal.ui.wizard.J2EEImportPage#getFilterExpression()
- */
- @Override
- protected String[] getFilterExpression() {
- return new String[]{"*.jar"}; //$NON-NLS-1$
- }
-
- /*
- * (non-Javadoc)
- *
- * @see org.eclipse.jst.j2ee.internal.internal.internal.ui.wizard.J2EEImportPage#getProjectImportLabel()
- */
- @Override
- protected String getProjectImportLabel() {
- return J2EEUIMessages.getResourceString(J2EEUIMessages.APP_CLIENT_IMPORT_PROJECT_LABEL);
- }
-
- // protected J2EEComponentCreationDataModel getNewProjectCreationDataModel() {
- // return getAppClientDataModel().getJ2eeArtifactCreationDataModel();
- // }
- //
- // private AppClientModuleImportDataModel getAppClientDataModel() {
- // return (AppClientModuleImportDataModel) model;
- // }
-
- @Override
- protected Composite createTopLevelComposite(Composite parent) {
- setInfopopID(IJ2EEUIContextIds.IMPORT_APPCLIENT_WIZARD_P1);
- return super.createTopLevelComposite(parent);
- }
-
- @Override
- protected String getModuleFacetID(){
- return J2EEProjectUtilities.APPLICATION_CLIENT;
- }
-}
diff --git a/plugins/org.eclipse.jst.j2ee.ui/j2ee_ui/org/eclipse/jst/j2ee/internal/wizard/AppClientComponentImportWizard.java b/plugins/org.eclipse.jst.j2ee.ui/j2ee_ui/org/eclipse/jst/j2ee/internal/wizard/AppClientComponentImportWizard.java
deleted file mode 100644
index 86c8685..0000000
--- a/plugins/org.eclipse.jst.j2ee.ui/j2ee_ui/org/eclipse/jst/j2ee/internal/wizard/AppClientComponentImportWizard.java
+++ /dev/null
@@ -1,90 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2003, 2006 IBM Corporation and others.
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
- *
- * Contributors:
- * IBM Corporation - initial API and implementation
- *******************************************************************************/
-package org.eclipse.jst.j2ee.internal.wizard;
-
-import org.eclipse.jst.j2ee.applicationclient.internal.creation.AppClientComponentImportDataModelProvider;
-import org.eclipse.jst.j2ee.internal.plugin.J2EEUIMessages;
-import org.eclipse.jst.j2ee.internal.plugin.J2EEUIPlugin;
-import org.eclipse.jst.j2ee.internal.plugin.J2EEUIPluginIcons;
-import org.eclipse.wst.common.frameworks.datamodel.IDataModel;
-import org.eclipse.wst.common.frameworks.datamodel.IDataModelProvider;
-import org.eclipse.wst.project.facet.IProductConstants;
-import org.eclipse.wst.project.facet.ProductManager;
-
-/**
- * <p>
- * Wizard used to import J2EE Application Client module structures into the Eclipse Workbench from
- * an existing Application Client *.jar file.
- * </p>
- */
-public final class AppClientComponentImportWizard extends J2EEComponentImportWizard {
-
- /**
- * <p>
- * The default constructor. Creates a wizard with no selection, no model instance, and no
- * operation instance. The model and operation will be created as needed.
- * </p>
- */
- public AppClientComponentImportWizard() {
- super();
- }
-
- /**
- * <p>
- * The model is used to prepopulate the wizard controls and interface with the operation.
- * </p>
- *
- * @param model
- * The model parameter is used to pre-populate wizard controls and interface with the
- * operation
- */
- public AppClientComponentImportWizard(IDataModel model) {
- super(model);
- }
-
- /**
- * <p>
- * Adds an {@link AppClientImportPage}as the main wizard page ({@link #MAIN_PG}).
- * </p>
- */
- @Override
- public void doAddPages() {
- addPage(new AppClientComponentImportPage(getDataModel(), MAIN_PG));
- }
-
- /**
- * {@inheritDoc}
- *
- * <p>
- * Sets up the dialog window title and default wizard page image.
- * </p>
- */
- @Override
- public final void doInit() {
- setWindowTitle(J2EEUIMessages.getResourceString(J2EEUIMessages.IMPORT_WIZ_TITLE));
- setDefaultPageImageDescriptor(J2EEUIPlugin.getDefault().getImageDescriptor(J2EEUIPluginIcons.APP_CLIENT_IMPORT_WIZARD_BANNER));
- }
-
- @Override
- protected String[] getModuleValidatorStrings() {
- return new String[]{"org.eclipse.jst.j2ee.internal.validation.UIApplicationClientValidator"}; //$NON-NLS-1$
- }
-
- @Override
- protected IDataModelProvider getDefaultProvider() {
- return new AppClientComponentImportDataModelProvider();
- }
-
- @Override
- protected String getFinalPerspectiveID() {
- return ProductManager.getProperty(IProductConstants.FINAL_PERSPECTIVE_APPCLIENT);
- }
-}
diff --git a/plugins/org.eclipse.jst.j2ee.ui/j2ee_ui/org/eclipse/jst/j2ee/internal/wizard/AppClientExportPage.java b/plugins/org.eclipse.jst.j2ee.ui/j2ee_ui/org/eclipse/jst/j2ee/internal/wizard/AppClientExportPage.java
deleted file mode 100644
index 42dfa68..0000000
--- a/plugins/org.eclipse.jst.j2ee.ui/j2ee_ui/org/eclipse/jst/j2ee/internal/wizard/AppClientExportPage.java
+++ /dev/null
@@ -1,86 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2003, 2006 IBM Corporation and others.
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
- *
- * Contributors:
- * IBM Corporation - initial API and implementation
- *******************************************************************************/
-/*
- * Created on Dec 3, 2003
- *
- * To change the template for this generated file go to
- * Window>Preferences>Java>Code Generation>Code and Comments
- */
-package org.eclipse.jst.j2ee.internal.wizard;
-
-import org.eclipse.jface.viewers.IStructuredSelection;
-import org.eclipse.jst.j2ee.client.ApplicationClient;
-import org.eclipse.jst.j2ee.internal.actions.IJ2EEUIContextIds;
-import org.eclipse.jst.j2ee.internal.plugin.J2EEUIMessages;
-import org.eclipse.jst.j2ee.internal.plugin.J2EEUIPlugin;
-import org.eclipse.jst.j2ee.internal.plugin.J2EEUIPluginIcons;
-import org.eclipse.wst.common.frameworks.datamodel.IDataModel;
-
-/**
- * @author cbridgha
- *
- * To change the template for this generated type comment go to Window>Preferences>Java>Code
- * Generation>Code and Comments
- */
-public class AppClientExportPage extends J2EEModuleExportPage {
- /**
- * @param model
- * @param pageName
- */
- public AppClientExportPage(IDataModel model, String pageName, IStructuredSelection selection) {
- super(model, pageName, selection);
- setTitle(J2EEUIMessages.getResourceString(J2EEUIMessages.APP_CLIENT_EXPORT_MAIN_PG_TITLE));
- setDescription(J2EEUIMessages.getResourceString(J2EEUIMessages.APP_CLIENT_EXPORT_MAIN_PG_DESC));
- setImageDescriptor(J2EEUIPlugin.getDefault().getImageDescriptor(J2EEUIPluginIcons.APP_CLIENT_EXPORT_WIZARD_BANNER));
-
- }
-
- /*
- * (non-Javadoc)
- *
- * @see org.eclipse.jst.j2ee.internal.internal.internal.ui.wizard.J2EEImportPage#getProjectImportLabel()
- */
- @Override
- protected String getComponentLabel() {
- return J2EEUIMessages.getResourceString(J2EEUIMessages.APP_CLIENT_PROJ_LBL);
- }
-
- /*
- * (non-Javadoc)
- *
- * @see org.eclipse.jst.j2ee.internal.internal.internal.ui.wizard.J2EEImportPage#getFilterExpression()
- */
- @Override
- protected String[] getFilterExpression() {
- return new String[]{"*.jar"}; //$NON-NLS-1$
- }
-
- /*
- * (non-Javadoc)
- *
- * @see org.eclipse.jst.j2ee.internal.internal.internal.ui.wizard.J2EEExportPage#isMetaTypeSupported(java.lang.Object)
- */
- @Override
- protected boolean isMetaTypeSupported(Object o) {
- return o instanceof ApplicationClient;
- }
-
- @Override
- protected String getInfopopID() {
- return IJ2EEUIContextIds.EXPORT_APPCLIENT_WIZARD_P1;
- }
-
- @Override
- protected String getComponentID() {
- return "JST_APPCLIENT"; //$NON-NLS-1$
- }
-
-}
diff --git a/plugins/org.eclipse.jst.j2ee.ui/j2ee_ui/org/eclipse/jst/j2ee/internal/wizard/AvailableJarsProvider.java b/plugins/org.eclipse.jst.j2ee.ui/j2ee_ui/org/eclipse/jst/j2ee/internal/wizard/AvailableJarsProvider.java
deleted file mode 100644
index 9efe700..0000000
--- a/plugins/org.eclipse.jst.j2ee.ui/j2ee_ui/org/eclipse/jst/j2ee/internal/wizard/AvailableJarsProvider.java
+++ /dev/null
@@ -1,248 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2003, 2007 IBM Corporation and others.
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
- *
- * Contributors:
- * IBM Corporation - initial API and implementation
- *******************************************************************************/
-package org.eclipse.jst.j2ee.internal.wizard;
-
-
-
-import java.net.URL;
-import java.util.ArrayList;
-import java.util.List;
-
-import org.eclipse.jface.resource.ImageDescriptor;
-import org.eclipse.jst.j2ee.application.internal.operations.ClassPathSelection;
-import org.eclipse.jst.j2ee.application.internal.operations.ClasspathElement;
-import org.eclipse.jst.j2ee.internal.plugin.J2EEPlugin;
-import org.eclipse.swt.graphics.Image;
-import org.eclipse.wst.common.frameworks.internal.ui.OverlayIcon;
-
-
-public class AvailableJarsProvider implements org.eclipse.jface.viewers.IStructuredContentProvider, org.eclipse.jface.viewers.ITableLabelProvider {
- protected static Image utilImage;
- protected static Image invalidImage;
- protected static Image ejbImage;
- protected static Image ejbClientImage;
- protected static Image classpathImage;
-
- /**
- * AvailableJarsContentProvider constructor comment.
- */
- public AvailableJarsProvider() {
- super();
- }
-
- /**
- * Adds a listener to this label provider. Has no effect if an identical listener is already
- * registered.
- * <p>
- * Label provider listeners are informed about state changes that affect the rendering of the
- * viewer that uses this label provider.
- * </p>
- *
- * @param listener
- * a label provider listener
- */
- public void addListener(org.eclipse.jface.viewers.ILabelProviderListener listener) {
- //do nothing
- }
-
- /**
- * Disposes of this label provider. When a label provider is attached to a viewer, the viewer
- * will automatically call this method when the viewer is being closed. When label providers are
- * used outside of the context of a viewer, it is the client's responsibility to ensure that
- * this method is called when the provider is no longer needed.
- */
- public void dispose() {
- //dispose
- }
-
- /**
- * Returns the label image for the given column of the given element.
- *
- * @param element
- * the object representing the entire row, or <code>null</code> indicating that no
- * input object is set in the viewer
- * @param columnIndex
- * the zero-based index of the column in which the label appears
- */
- public org.eclipse.swt.graphics.Image getColumnImage(Object element, int columnIndex) {
- if (columnIndex > 0)
- return null;
- ClasspathElement cp = (ClasspathElement) element;
- if (!cp.isValid())
- return getInvalidImage();
-
- if (cp.isClasspathEntry()) {
- return getClasspathDependencyImage();
- }
-
- switch (cp.getJarType()) {
- case ClasspathElement.EJB_JAR :
- return getEjbImage();
- case ClasspathElement.EJB_CLIENT_JAR :
- return getEjbClientImage();
- default :
- return getUtilImage();
- }
- }
-
- /**
- * Returns the label text for the given column of the given element.
- *
- * @param element
- * the object representing the entire row, or <code>null</code> indicating that no
- * input object is set in the viewer
- * @param columnIndex
- * the zero-based index of the column in which the label appears
- */
- public String getColumnText(Object element, int columnIndex) {
- String value = null;
- switch (columnIndex) {
- case 0 : {
- value = ((ClasspathElement) element).getText();
- break;
- }
- case 1 :
- value = ((ClasspathElement) element).getProjectName();
- }
- return value == null ? "" : value;//$NON-NLS-1$
- }
-
- public static Image getEjbImage() {
- if (ejbImage == null)
- ejbImage = getImageDescriptor("EJBJar").createImage();//$NON-NLS-1$
- return ejbImage;
- }
-
- public static Image getEjbClientImage() {
- if (ejbClientImage == null)
- ejbClientImage = getImageDescriptor("ejbclientjar_obj").createImage();//$NON-NLS-1$
- return ejbClientImage;
- }
-
- public static Image getClasspathDependencyImage() {
- if (classpathImage == null)
- classpathImage = getImageDescriptor("CPDep").createImage();//$NON-NLS-1$
- return classpathImage;
- }
-
- /**
- * Returns the elements to display in the viewer when its input is set to the given element.
- * These elements can be presented as rows in a table, items in a list, etc. The result is not
- * modified by the viewer.
- *
- * @param inputElement
- * the input element
- * @return the array of elements to display in the viewer
- */
- public java.lang.Object[] getElements(Object inputElement) {
- ClassPathSelection selection = (ClassPathSelection) inputElement;
- return filter(selection, selection.getFilterLevel()).toArray();
- }
-
- /**
- * @param list
- */
- private List filter(ClassPathSelection selection, int filterLevel) {
- List list = selection.getClasspathElements();
- List result = new ArrayList(list.size());
- for (int i = 0; i < list.size(); i++) {
- ClasspathElement element = (ClasspathElement) list.get(i);
- if (!element.isSelected()) {
- switch (filterLevel) {
- case (ClassPathSelection.FILTER_EJB_CLIENT_JARS) :
- if (element.isEJBClientJar())
- continue;
- break;
- case (ClassPathSelection.FILTER_EJB_SERVER_JARS) :
- if (element.isEJBJar() && selection.getOppositeElement(element) != null)
- continue;
- }
- }
- result.add(element);
- }
- return result;
- }
-
- /**
- * This gets a .gif from the icons folder.
- */
- protected static ImageDescriptor getImageDescriptor(String key) {
- ImageDescriptor imageDescriptor = null;
-
- URL gifImageURL = (URL) J2EEPlugin.getPlugin().getImage(key);
- imageDescriptor = ImageDescriptor.createFromURL(gifImageURL);
- return imageDescriptor;
- }
-
- public static Image getInvalidImage() {
- if (invalidImage == null) {
- ImageDescriptor base = getImageDescriptor("jar_nonexist_obj");//$NON-NLS-1$
- ImageDescriptor overlay = getImageDescriptor("warning_co");//$NON-NLS-1$
- invalidImage = new OverlayIcon(base, new ImageDescriptor[][]{{overlay}}).createImage();
- }
- return invalidImage;
- }
-
- public static Image getUtilImage() {
- if (utilImage == null)
- utilImage = getImageDescriptor("jar_obj").createImage();//$NON-NLS-1$
- return utilImage;
- }
-
- /**
- * Notifies this content provider that the given viewer's input has been switched to a different
- * element.
- * <p>
- * A typical use for this method is registering the content provider as a listener to changes on
- * the new input (using model-specific means), and deregistering the viewer from the old input.
- * In response to these change notifications, the content provider propagates the changes to the
- * viewer.
- * </p>
- *
- * @param viewer
- * the viewer
- * @param oldInput
- * the old input element, or <code>null</code> if the viewer did not previously
- * have an input
- * @param newInput
- * the new input element, or <code>null</code> if the viewer does not have an input
- */
- public void inputChanged(org.eclipse.jface.viewers.Viewer viewer, Object oldInput, Object newInput) {
- //do nothing
- }
-
- /**
- * Returns whether the label would be affected by a change to the given property of the given
- * element. This can be used to optimize a non-structural viewer update. If the property
- * mentioned in the update does not affect the label, then the viewer need not update the label.
- *
- * @param element
- * the element
- * @param property
- * the property
- * @return <code>true</code> if the label would be affected, and <code>false</code> if it
- * would be unaffected
- */
- public boolean isLabelProperty(Object element, String property) {
- return false;
- }
-
- /**
- * Removes a listener to this label provider. Has no affect if an identical listener is not
- * registered.
- *
- * @param listener
- * a label provider listener
- */
- public void removeListener(org.eclipse.jface.viewers.ILabelProviderListener listener) {
- //do nothing
- }
-}
diff --git a/plugins/org.eclipse.jst.j2ee.ui/j2ee_ui/org/eclipse/jst/j2ee/internal/wizard/AvailableUtilJarsAndWebLibProvider.java b/plugins/org.eclipse.jst.j2ee.ui/j2ee_ui/org/eclipse/jst/j2ee/internal/wizard/AvailableUtilJarsAndWebLibProvider.java
deleted file mode 100644
index a42118e..0000000
--- a/plugins/org.eclipse.jst.j2ee.ui/j2ee_ui/org/eclipse/jst/j2ee/internal/wizard/AvailableUtilJarsAndWebLibProvider.java
+++ /dev/null
@@ -1,159 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2003, 2007 IBM Corporation and others.
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
- *
- * Contributors:
- * IBM Corporation - initial API and implementation
- *******************************************************************************/
-/*
- * Created on Apr 22, 2003
- *
- * To change the template for this generated file go to Window>Preferences>Java>Code Generation>Code and Comments
- */
-package org.eclipse.jst.j2ee.internal.wizard;
-
-import java.util.Arrays;
-import java.util.Comparator;
-import java.util.List;
-
-import org.eclipse.core.runtime.IPath;
-import org.eclipse.jface.viewers.ILabelProviderListener;
-import org.eclipse.jface.viewers.IStructuredContentProvider;
-import org.eclipse.jface.viewers.ITableLabelProvider;
-import org.eclipse.jface.viewers.Viewer;
-import org.eclipse.jst.j2ee.commonarchivecore.internal.helpers.ArchiveConstants;
-import org.eclipse.jst.j2ee.internal.archive.ArchiveWrapper;
-import org.eclipse.swt.graphics.Image;
-
-
-/**
- * @author vijayb
- *
- * To change the template for this generated type comment go to Window>Preferences>Java>Code
- * Generation>Code and Comments
- */
-public class AvailableUtilJarsAndWebLibProvider implements IStructuredContentProvider, ITableLabelProvider {
-
- public AvailableUtilJarsAndWebLibProvider() {
- //Default constructor
- }
-
- /*
- * (non-Javadoc)
- *
- * @see org.eclipse.jface.viewers.IStructuredContentProvider#getElements(java.lang.Object)
- */
- public Object[] getElements(Object inputElement) {
- if(inputElement instanceof ArchiveWrapper){
- ArchiveWrapper wrapper = (ArchiveWrapper)inputElement;
- List <ArchiveWrapper> utilities = wrapper.getEARUtilitiesAndWebLibs();
- if (utilities.size() > 0){
- filterEJBClientJars(utilities, wrapper);
- Object [] array = utilities.toArray();
- Arrays.sort(array, new Comparator() {
- public int compare(Object o1, Object o2) {
- return getColumnText(o1, 0).compareTo(getColumnText(o2, 0));
- }
- });
- return array;
- }
- }
- return new Object[0];
- }
-
- /**
- * @param array
- * @return
- */
- private void filterEJBClientJars(List <ArchiveWrapper> utilities, ArchiveWrapper earWrapper) {
- List <ArchiveWrapper> modules = earWrapper.getEarModules();
- for(ArchiveWrapper module : modules){
- if(module.isEJBJarFile()){
- ArchiveWrapper clientWrapper = earWrapper.getEJBClientArchiveWrapper(module);
- if(null != clientWrapper){
- boolean removed = false;
- for(int i=0;i<utilities.size() && !removed; i++){
- if(clientWrapper.getUnderLyingArchive() == utilities.get(i).getUnderLyingArchive()){
- utilities.remove(i);
- removed = true;
- }
- }
- }
- }
- }
- }
-
- /*
- * (non-Javadoc)
- *
- * @see org.eclipse.jface.viewers.ITableLabelProvider#getColumnImage(java.lang.Object, int)
- */
- public Image getColumnImage(Object element, int columnIndex) {
- return AvailableJarsProvider.getUtilImage();
- }
-
- /*
- * (non-Javadoc)
- *
- * @see org.eclipse.jface.viewers.ITableLabelProvider#getColumnText(java.lang.Object, int)
- */
- public String getColumnText(Object element, int columnIndex) {
- ArchiveWrapper wrapper = (ArchiveWrapper)element;
- IPath path = wrapper.getPath();
- if(path.toString().startsWith(ArchiveConstants.WEBAPP_LIB_URI)){
- return wrapper.getParent().getName()+"#"+wrapper.getPath(); //$NON-NLS-1$
- }
- return wrapper.getName();
- }
-
- /*
- * (non-Javadoc)
- *
- * @see org.eclipse.jface.viewers.IBaseLabelProvider#dispose()
- */
- public void dispose() {
- //Auto-generated method stub
- }
-
- /*
- * (non-Javadoc)
- *
- * @see org.eclipse.jface.viewers.IContentProvider#inputChanged(org.eclipse.jface.viewers.Viewer,
- * java.lang.Object, java.lang.Object)
- */
- public void inputChanged(Viewer viewer, Object oldInput, Object newInput) {
- //Auto-generated method stub
- }
-
- /*
- * (non-Javadoc)
- *
- * @see org.eclipse.jface.viewers.IBaseLabelProvider#addListener(org.eclipse.jface.viewers.ILabelProviderListener)
- */
- public void addListener(ILabelProviderListener listener) {
- //Auto-generated method stub
- }
-
- /*
- * (non-Javadoc)
- *
- * @see org.eclipse.jface.viewers.IBaseLabelProvider#isLabelProperty(java.lang.Object,
- * java.lang.String)
- */
- public boolean isLabelProperty(Object element, String property) {
- return false;
- }
-
- /*
- * (non-Javadoc)
- *
- * @see org.eclipse.jface.viewers.IBaseLabelProvider#removeListener(org.eclipse.jface.viewers.ILabelProviderListener)
- */
- public void removeListener(ILabelProviderListener listener) {
- //Auto-generated method stub
- }
-
-}
diff --git a/plugins/org.eclipse.jst.j2ee.ui/j2ee_ui/org/eclipse/jst/j2ee/internal/wizard/AvailableUtilityJarsProvider.java b/plugins/org.eclipse.jst.j2ee.ui/j2ee_ui/org/eclipse/jst/j2ee/internal/wizard/AvailableUtilityJarsProvider.java
deleted file mode 100644
index 8dbb87e..0000000
--- a/plugins/org.eclipse.jst.j2ee.ui/j2ee_ui/org/eclipse/jst/j2ee/internal/wizard/AvailableUtilityJarsProvider.java
+++ /dev/null
@@ -1,163 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2003, 2005 IBM Corporation and others.
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
- *
- * Contributors:
- * IBM Corporation - initial API and implementation
- *******************************************************************************/
-/*
- * Created on Apr 22, 2003
- *
- * To change the template for this generated file go to Window>Preferences>Java>Code Generation>Code and Comments
- */
-package org.eclipse.jst.j2ee.internal.wizard;
-
-import java.io.File;
-import java.util.ArrayList;
-import java.util.Arrays;
-import java.util.Comparator;
-import java.util.List;
-
-import org.eclipse.jface.viewers.ILabelProviderListener;
-import org.eclipse.jface.viewers.IStructuredContentProvider;
-import org.eclipse.jface.viewers.ITableLabelProvider;
-import org.eclipse.jface.viewers.Viewer;
-import org.eclipse.jst.j2ee.datamodel.properties.IJ2EEUtilityJarListImportDataModelProperties;
-import org.eclipse.jst.j2ee.internal.plugin.IJ2EEModuleConstants;
-import org.eclipse.swt.graphics.Image;
-import org.eclipse.wst.common.frameworks.datamodel.IDataModel;
-
-/**
- * @author vijayb
- *
- * To change the template for this generated type comment go to Window>Preferences>Java>Code
- * Generation>Code and Comments
- */
-public class AvailableUtilityJarsProvider implements IStructuredContentProvider, ITableLabelProvider {
-
- public AvailableUtilityJarsProvider() {
- //default constructor
- }
-
- /*
- * (non-Javadoc)
- *
- * @see org.eclipse.jface.viewers.IStructuredContentProvider#getElements(java.lang.Object)
- */
- public Object[] getElements(Object inputElement) {
- /*
- * Object[] array = EARImportDataModel.getAllUtilities((EARFile) inputElement).toArray();
- */
- Object[] array = getJarFilesFromDirectory(inputElement);
- Arrays.sort(array, new Comparator() {
-
- public int compare(Object o1, Object o2) {
- return getColumnText(o1, 0).compareTo(getColumnText(o2, 0));
- }
-
- });
- return array;
- }
-
- /**
- * @param inputElement
- * @return
- */
- private Object[] getJarFilesFromDirectory(Object inputElement) {
-
- List collectedJars = new ArrayList();
- IDataModel model = null;
- if (inputElement instanceof IDataModel)
- model = (IDataModel) inputElement;
- if (model != null) {
-
- String fileName = model.getStringProperty(IJ2EEUtilityJarListImportDataModelProperties.AVAILABLE_JARS_DIRECTORY);
- File directory = new File(fileName);
- if (directory.exists() && directory.canRead() && directory.isDirectory()) {
- File[] availableFiles = directory.listFiles();
-
- if (availableFiles == null)
- return new File[0];
-
- for (int i = 0; i < availableFiles.length; i++)
- if (availableFiles[i] != null && availableFiles[i].getName().endsWith(IJ2EEModuleConstants.JAR_EXT))collectedJars.add(availableFiles[i]);
- }
- }
- return collectedJars.toArray();
- }
-
- /*
- * (non-Javadoc)
- *
- * @see org.eclipse.jface.viewers.ITableLabelProvider#getColumnImage(java.lang.Object, int)
- */
- public Image getColumnImage(Object element, int columnIndex) {
- return AvailableJarsProvider.getUtilImage();
- }
-
- /*
- * (non-Javadoc)
- *
- * @see org.eclipse.jface.viewers.ITableLabelProvider#getColumnText(java.lang.Object, int)
- */
- public String getColumnText(Object element, int columnIndex) {
- /*
- * FileImpl file = (FileImpl) element; if
- * (file.getURI().startsWith(ArchiveConstants.WEBAPP_LIB_URI)) { String parentWarFileName =
- * ((WARFile) file.eContainer()).getName(); return parentWarFileName + "#" + file.getURI();
- * //$NON-NLS-1$ } else return file.getName();
- */
- return element.toString();
- }
-
- /*
- * (non-Javadoc)
- *
- * @see org.eclipse.jface.viewers.IBaseLabelProvider#dispose()
- */
- public void dispose() {
- //dispose
- }
-
- /*
- * (non-Javadoc)
- *
- * @see org.eclipse.jface.viewers.IContentProvider#inputChanged(org.eclipse.jface.viewers.Viewer,
- * java.lang.Object, java.lang.Object)
- */
- public void inputChanged(Viewer viewer, Object oldInput, Object newInput) {
- //do nothing
- }
-
- /*
- * (non-Javadoc)
- *
- * @see org.eclipse.jface.viewers.IBaseLabelProvider#addListener(org.eclipse.jface.viewers.ILabelProviderListener)
- */
- public void addListener(ILabelProviderListener listener) {
- //do nothing
- }
-
- /*
- * (non-Javadoc)
- *
- * @see org.eclipse.jface.viewers.IBaseLabelProvider#isLabelProperty(java.lang.Object,
- * java.lang.String)
- */
- public boolean isLabelProperty(Object element, String property) {
- return false;
- }
-
- /*
- * (non-Javadoc)
- *
- * @see org.eclipse.jface.viewers.IBaseLabelProvider#removeListener(org.eclipse.jface.viewers.ILabelProviderListener)
- */
- public void removeListener(ILabelProviderListener listener) {
- //do nothing
- }
-
-}
diff --git a/plugins/org.eclipse.jst.j2ee.ui/j2ee_ui/org/eclipse/jst/j2ee/internal/wizard/DefaultJ2EEComponentCreationWizard.java b/plugins/org.eclipse.jst.j2ee.ui/j2ee_ui/org/eclipse/jst/j2ee/internal/wizard/DefaultJ2EEComponentCreationWizard.java
deleted file mode 100644
index aa77126..0000000
--- a/plugins/org.eclipse.jst.j2ee.ui/j2ee_ui/org/eclipse/jst/j2ee/internal/wizard/DefaultJ2EEComponentCreationWizard.java
+++ /dev/null
@@ -1,87 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2005, 2006 IBM Corporation and others.
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
- *
- * Contributors:
- * IBM Corporation - initial API and implementation
- *******************************************************************************/
-/*
- * Created on Mar 23, 2005
- */
-package org.eclipse.jst.j2ee.internal.wizard;
-
-import java.net.MalformedURLException;
-import java.net.URL;
-
-import org.eclipse.jface.resource.ImageDescriptor;
-import org.eclipse.jst.j2ee.internal.earcreation.DefaultJ2EEComponentCreationDataModelProvider;
-import org.eclipse.jst.j2ee.internal.earcreation.IDefaultJ2EEComponentCreationDataModelProperties;
-import org.eclipse.jst.j2ee.internal.plugin.J2EEUIMessages;
-import org.eclipse.ui.internal.ide.IDEWorkbenchPlugin;
-import org.eclipse.wst.common.frameworks.datamodel.IDataModel;
-import org.eclipse.wst.common.frameworks.datamodel.IDataModelProvider;
-import org.eclipse.wst.common.frameworks.internal.datamodel.ui.DataModelWizard;
-
-public class DefaultJ2EEComponentCreationWizard extends DataModelWizard {
- private static final String SELECTION_PG = "selection"; //$NON-NLS-1$
-
- /**
- * @param model
- */
- public DefaultJ2EEComponentCreationWizard(IDataModel model) {
- super(model);
- initialize();
- }
-
- /**
- *
- */
- public DefaultJ2EEComponentCreationWizard() {
- super();
- initialize();
- }
-
- /**
- *
- */
- private void initialize() {
- setWindowTitle(J2EEUIMessages.getResourceString(J2EEUIMessages.DEFAULT_COMPONENT_WIZ_TITLE));
- String iconPath = "icons/full/"; //$NON-NLS-1$
- try {
- URL installURL = IDEWorkbenchPlugin.getDefault().getDescriptor().getInstallURL();
- URL url = new URL(installURL, iconPath + "wizban/new_wiz.png"); //$NON-NLS-1$
- ImageDescriptor desc = ImageDescriptor.createFromURL(url);
- setDefaultPageImageDescriptor(desc);
- } catch (MalformedURLException e) {
- // Should not happen. Ignore.
- }
- setNeedsProgressMonitor(true);
- setForcePreviousAndNextButtons(true);
- }
-
- /*
- * (non-Javadoc)
- *
- * @see org.eclipse.jface.wizard.Wizard#addPages()
- */
- @Override
- public void doAddPages() {
- addPage(new NewJ2EEComponentSelectionPage(getDataModel(), SELECTION_PG));
- }
-
- @Override
- public boolean canFinish() {
- if (!super.canFinish()) {
- return false;
- }
- return getDataModel().getBooleanProperty(IDefaultJ2EEComponentCreationDataModelProperties.ENABLED);
- }
-
- @Override
- protected IDataModelProvider getDefaultProvider() {
- return new DefaultJ2EEComponentCreationDataModelProvider();
- }
-}
diff --git a/plugins/org.eclipse.jst.j2ee.ui/j2ee_ui/org/eclipse/jst/j2ee/internal/wizard/EARComponentExportPage.java b/plugins/org.eclipse.jst.j2ee.ui/j2ee_ui/org/eclipse/jst/j2ee/internal/wizard/EARComponentExportPage.java
deleted file mode 100644
index 0a883f0..0000000
--- a/plugins/org.eclipse.jst.j2ee.ui/j2ee_ui/org/eclipse/jst/j2ee/internal/wizard/EARComponentExportPage.java
+++ /dev/null
@@ -1,100 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2003, 2006 IBM Corporation and others.
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
- *
- * Contributors:
- * IBM Corporation - initial API and implementation
- *******************************************************************************/
-/*
- * Created on Dec 3, 2003
- *
- * To change the template for this generated file go to
- * Window>Preferences>Java>Code Generation>Code and Comments
- */
-package org.eclipse.jst.j2ee.internal.wizard;
-
-import org.eclipse.jface.viewers.IStructuredSelection;
-import org.eclipse.jst.j2ee.application.Application;
-import org.eclipse.jst.j2ee.datamodel.properties.IJ2EEComponentExportDataModelProperties;
-import org.eclipse.jst.j2ee.internal.actions.IJ2EEUIContextIds;
-import org.eclipse.jst.j2ee.internal.plugin.J2EEUIMessages;
-import org.eclipse.jst.j2ee.internal.plugin.J2EEUIPlugin;
-import org.eclipse.jst.j2ee.internal.plugin.J2EEUIPluginIcons;
-import org.eclipse.wst.common.frameworks.datamodel.IDataModel;
-
-/**
- * @author cbridgha
- *
- * To change the template for this generated type comment go to Window>Preferences>Java>Code
- * Generation>Code and Comments
- */
-public class EARComponentExportPage extends J2EEExportPage {
- /**
- * @param model
- * @param pageName
- */
- public EARComponentExportPage(IDataModel model, String pageName, IStructuredSelection selection) {
- super(model, pageName, selection);
- setTitle(J2EEUIMessages.getResourceString(J2EEUIMessages.EAR_EXPORT_MAIN_PG_TITLE));
- setDescription(J2EEUIMessages.getResourceString(J2EEUIMessages.EAR_EXPORT_MAIN_PG_DESC));
- setImageDescriptor(J2EEUIPlugin.getDefault().getImageDescriptor(J2EEUIPluginIcons.EAR_EXPORT_WIZARD_BANNER));
-
- }
-
- /*
- * (non-Javadoc)
- *
- * @see org.eclipse.jst.j2ee.internal.internal.internal.ui.wizard.J2EEImportPage#getProjectImportLabel()
- */
- @Override
- protected String getComponentLabel() {
- return J2EEUIMessages.getResourceString(J2EEUIMessages.EAR_PROJECT_FOR_MODULE_CREATION);
- }
-
-
- /*
- * (non-Javadoc)
- *
- * @see org.eclipse.jst.j2ee.internal.internal.internal.ui.wizard.J2EEImportPage#getFilterExpression()
- */
- @Override
- protected String[] getFilterExpression() {
- return new String[]{"*.ear"}; //$NON-NLS-1$
- }
-
- /**
- * @return
- */
- @Override
- protected boolean shouldShowProjectFilesCheckbox() {
- return true;
- }
-
- /*
- * (non-Javadoc)
- *
- * @see org.eclipse.jst.j2ee.internal.internal.internal.ui.wizard.J2EEExportPage#isMetaTypeSupported(java.lang.Object)
- */
- @Override
- protected boolean isMetaTypeSupported(Object o) {
- return o instanceof Application;
- }
-
- @Override
- protected String[] getValidationPropertyNames() {
- return new String[]{IJ2EEComponentExportDataModelProperties.PROJECT_NAME, IJ2EEComponentExportDataModelProperties.ARCHIVE_DESTINATION, IJ2EEComponentExportDataModelProperties.OVERWRITE_EXISTING};
- }
-
- @Override
- protected String getInfopopID() {
- return IJ2EEUIContextIds.EXPORT_EAR_WIZARD_P1;
- }
-
- @Override
- protected String getComponentID() {
- return "JST_EAR"; //$NON-NLS-1$
- }
-}
diff --git a/plugins/org.eclipse.jst.j2ee.ui/j2ee_ui/org/eclipse/jst/j2ee/internal/wizard/EARComponentExportWizard.java b/plugins/org.eclipse.jst.j2ee.ui/j2ee_ui/org/eclipse/jst/j2ee/internal/wizard/EARComponentExportWizard.java
deleted file mode 100644
index 20a0b78..0000000
--- a/plugins/org.eclipse.jst.j2ee.ui/j2ee_ui/org/eclipse/jst/j2ee/internal/wizard/EARComponentExportWizard.java
+++ /dev/null
@@ -1,81 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2003, 2005 IBM Corporation and others.
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
- *
- * Contributors:
- * IBM Corporation - initial API and implementation
- *******************************************************************************/
-package org.eclipse.jst.j2ee.internal.wizard;
-
-import org.eclipse.jst.j2ee.application.internal.operations.EARComponentExportDataModelProvider;
-import org.eclipse.jst.j2ee.internal.plugin.J2EEUIPlugin;
-import org.eclipse.jst.j2ee.internal.plugin.J2EEUIPluginIcons;
-import org.eclipse.ui.IExportWizard;
-import org.eclipse.wst.common.frameworks.datamodel.IDataModel;
-import org.eclipse.wst.common.frameworks.datamodel.IDataModelProvider;
-
-/**
- * <p>
- * Wizard used to export J2EE Enterprise Application structures from the Eclipse Workbench to a
- * deployable Enterprise Application Archive *.ear file.
- * </p>
- */
-public final class EARComponentExportWizard extends J2EEArtifactExportWizard implements IExportWizard {
-
- /**
- * <p>
- * The default constructor. Creates a wizard with no selection, no model instance, and no
- * operation instance. The model and operation will be created as needed.
- * </p>
- */
- public EARComponentExportWizard() {
- super();
- }
-
- /**
- * <p>
- * The model is used to prepopulate the wizard controls and interface with the operation.
- * </p>
- *
- * @param model
- * The model parameter is used to pre-populate wizard controls and interface with the
- * operation
- */
- public EARComponentExportWizard(IDataModel model) {
- super(model);
- }
-
- @Override
- protected IDataModelProvider getDefaultProvider() {
- return new EARComponentExportDataModelProvider();
- }
-
- /**
- * <p>
- * Adds the following pages:
- * <ul>
- * <li>{@link EARComponentExportPage}as the main wizard page ({@link #MAIN_PG})
- * </ul>
- * </p>
- */
- @Override
- public void doAddPages() {
- addPage(new EARComponentExportPage(getDataModel(), MAIN_PG, getSelection()));
- }
-
- /**
- * {@inheritDoc}
- *
- * <p>
- * Sets up the default wizard page image.
- * </p>
- */
- @Override
- protected void doInit() {
- setDefaultPageImageDescriptor(J2EEUIPlugin.getDefault().getImageDescriptor(J2EEUIPluginIcons.EAR_EXPORT_WIZARD_BANNER));
- }
-
-}
diff --git a/plugins/org.eclipse.jst.j2ee.ui/j2ee_ui/org/eclipse/jst/j2ee/internal/wizard/EARComponentImportOptionsPage.java b/plugins/org.eclipse.jst.j2ee.ui/j2ee_ui/org/eclipse/jst/j2ee/internal/wizard/EARComponentImportOptionsPage.java
deleted file mode 100644
index 2262415..0000000
--- a/plugins/org.eclipse.jst.j2ee.ui/j2ee_ui/org/eclipse/jst/j2ee/internal/wizard/EARComponentImportOptionsPage.java
+++ /dev/null
@@ -1,327 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2003, 2007 IBM Corporation and others.
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
- *
- * Contributors:
- * IBM Corporation - initial API and implementation
- *******************************************************************************/
-/*
- * Created on Dec 8, 2003
- *
- * To change the template for this generated file go to Window>Preferences>Java>Code Generation>Code and Comments
- */
-package org.eclipse.jst.j2ee.internal.wizard;
-
-import java.io.File;
-import java.util.ArrayList;
-import java.util.Arrays;
-import java.util.List;
-
-import org.eclipse.jface.viewers.CheckStateChangedEvent;
-import org.eclipse.jface.viewers.CheckboxTableViewer;
-import org.eclipse.jface.viewers.ICheckStateListener;
-import org.eclipse.jface.viewers.ISelectionChangedListener;
-import org.eclipse.jface.viewers.SelectionChangedEvent;
-import org.eclipse.jface.viewers.TableLayout;
-import org.eclipse.jst.j2ee.datamodel.properties.IEARComponentImportDataModelProperties;
-import org.eclipse.jst.j2ee.datamodel.properties.IJ2EEComponentImportDataModelProperties;
-import org.eclipse.jst.j2ee.internal.actions.IJ2EEUIContextIds;
-import org.eclipse.jst.j2ee.internal.archive.ArchiveWrapper;
-import org.eclipse.jst.j2ee.internal.plugin.J2EEUIMessages;
-import org.eclipse.jst.j2ee.internal.plugin.J2EEUIPlugin;
-import org.eclipse.jst.j2ee.internal.plugin.J2EEUIPluginIcons;
-import org.eclipse.swt.SWT;
-import org.eclipse.swt.events.SelectionAdapter;
-import org.eclipse.swt.events.SelectionEvent;
-import org.eclipse.swt.layout.GridData;
-import org.eclipse.swt.layout.GridLayout;
-import org.eclipse.swt.widgets.Button;
-import org.eclipse.swt.widgets.Composite;
-import org.eclipse.swt.widgets.DirectoryDialog;
-import org.eclipse.swt.widgets.Group;
-import org.eclipse.swt.widgets.Label;
-import org.eclipse.swt.widgets.Text;
-import org.eclipse.wst.common.frameworks.datamodel.DataModelEvent;
-import org.eclipse.wst.common.frameworks.datamodel.IDataModel;
-import org.eclipse.wst.common.frameworks.datamodel.IDataModelListener;
-import org.eclipse.wst.common.frameworks.internal.datamodel.ui.DataModelWizardPage;
-
-/**
- * @author cbridgha
- *
- * To change the template for this generated type comment go to Window>Preferences>Java>Code
- * Generation>Code and Comments
- */
-public class EARComponentImportOptionsPage extends DataModelWizardPage {
- private Button deselectAllButton;
- private Button selectAllButton;
- private Label moduleProjectLocationLabel;
- protected Button browseButton;
- protected Button useAlternateRootBtn;
- protected Text systemDefaultText;
- protected ArchiveWrapper aWrapper;
- public CheckboxTableViewer availableJARsViewer;
- public boolean utilJarSelectionChanged = false;
-
- /**
- * @param model
- * @param pageName
- */
- public EARComponentImportOptionsPage(IDataModel model, String pageName) {
- super(model, pageName);
- setTitle(J2EEUIMessages.getResourceString(J2EEUIMessages.EAR_IMPORT_MAIN_PG_TITLE));
- setDescription(J2EEUIMessages.getResourceString(J2EEUIMessages.EAR_IMPORT_MAIN_PG_DESC));
- setImageDescriptor(J2EEUIPlugin.getDefault().getImageDescriptor(J2EEUIPluginIcons.EAR_IMPORT_WIZARD_BANNER));
- }
-
- /*
- * (non-Javadoc)
- *
- * @see org.eclipse.wst.common.frameworks.internal.ui.wizard.WTPWizardPage#createTopLevelComposite(org.eclipse.swt.widgets.Composite)
- */
- @Override
- protected Composite createTopLevelComposite(Composite parent) {
- Composite composite = new Composite(parent, SWT.NONE);
- setInfopopID(IJ2EEUIContextIds.IMPORT_EAR_WIZARD_P2);
- GridLayout layout = new GridLayout();
- composite.setLayout(layout);
- composite.setLayoutData(new GridData(GridData.FILL_HORIZONTAL));
- createJARsComposite(composite);
- createProjectRootComposite(composite);
-
- return composite;
- }
-
- /*
- * Updates the enable state of the all buttons
- */
- protected void updateButtonEnablements() {
- utilJarSelectionChanged = true;
- }
-
- protected void createAvailableJarsList(Composite listGroup) {
- availableJARsViewer = CheckboxTableViewer.newCheckList(listGroup, SWT.BORDER | SWT.H_SCROLL | SWT.V_SCROLL);
- GridData gData = new GridData(GridData.FILL_BOTH | GridData.GRAB_HORIZONTAL | GridData.GRAB_VERTICAL);
- gData.widthHint = 200;
- gData.heightHint = 80;
- availableJARsViewer.getControl().setLayoutData(gData);
- AvailableUtilJarsAndWebLibProvider availableUtilJARsProvider = new AvailableUtilJarsAndWebLibProvider();
- availableJARsViewer.setContentProvider(availableUtilJARsProvider);
- availableJARsViewer.setLabelProvider(availableUtilJARsProvider);
- availableJARsViewer.addCheckStateListener(new ICheckStateListener() {
- public void checkStateChanged(CheckStateChangedEvent event) {
- availableJARCheckStateChanged(event);
- }
- });
- availableJARsViewer.addSelectionChangedListener(new ISelectionChangedListener() {
- public void selectionChanged(SelectionChangedEvent event) {
- updateButtonEnablements();
- }
- });
- TableLayout tableLayout = new TableLayout();
- availableJARsViewer.getTable().setLayout(tableLayout);
- availableJARsViewer.getTable().setHeaderVisible(false);
- availableJARsViewer.getTable().setLinesVisible(false);
-
- model.addListener(new IDataModelListener() {
- public void propertyChanged(DataModelEvent event) {
- if (event.getPropertyName().equals(IEARComponentImportDataModelProperties.UTILITY_LIST)) {
- availableJARsViewer.setCheckedElements(((List) model.getProperty(IEARComponentImportDataModelProperties.UTILITY_LIST)).toArray());
- }
- }
- });
- }
-
- private void handleDeselectAllButtonPressed() {
- ArrayList emptySelection = new ArrayList(2);
- model.setProperty(IEARComponentImportDataModelProperties.UTILITY_LIST, emptySelection);
- validatePage();
- }
-
- private void handleSelectAllButtonPressed() {
- ArrayList allSelection = new ArrayList(2);
- Object selection = null;
- for (int i = 0; (null != (selection = availableJARsViewer.getElementAt(i))); i++) {
- allSelection.add(selection);
- }
- model.setProperty(IEARComponentImportDataModelProperties.UTILITY_LIST, allSelection);
- validatePage();
- }
-
- /**
- * Open an appropriate directory browser
- */
- protected void handleBrowseButtonPressed() {
- DirectoryDialog dialog = new DirectoryDialog(browseButton.getShell());
- dialog.setMessage(J2EEUIMessages.getResourceString(J2EEUIMessages.SELECT_DIRECTORY_DLG));
-
- String dirName = getBrowseStartLocation();
-
- if (!isNullOrEmpty(dirName)) {
- File path = new File(dirName);
- if (path.exists())
- dialog.setFilterPath(dirName);
- }
-
- String selectedDirectory = dialog.open();
- if (selectedDirectory != null)
- systemDefaultText.setText(selectedDirectory);
-
- }
-
- protected String getBrowseStartLocation() {
- String text = systemDefaultText.getText();
- return text;
- }
-
- protected void createButtonsGroup(Composite parent) {
- Composite buttonGroup = new Composite(parent, SWT.NONE);
- GridLayout layout = new GridLayout();
- layout.numColumns = 2;
- buttonGroup.setLayout(layout);
- buttonGroup.setLayoutData(new GridData(GridData.FILL_BOTH));
-
- selectAllButton = new Button(buttonGroup, SWT.PUSH);
- selectAllButton.setText(J2EEUIMessages.getResourceString(J2EEUIMessages.EAR_IMPORT_SELECT_ALL_UTIL_BUTTON));
- GridData gd = new GridData(GridData.HORIZONTAL_ALIGN_FILL | GridData.VERTICAL_ALIGN_FILL);
- gd.widthHint = 160;
- selectAllButton.setLayoutData(gd);
- selectAllButton.addSelectionListener(new SelectionAdapter() {
- @Override
- public void widgetSelected(SelectionEvent e) {
- handleSelectAllButtonPressed();
- }
- });
-
- deselectAllButton = new Button(buttonGroup, SWT.PUSH);
- deselectAllButton.setText(J2EEUIMessages.getResourceString(J2EEUIMessages.EAR_IMPORT_DESELECT_ALL_UTIL_BUTTON));
- gd = new GridData(GridData.HORIZONTAL_ALIGN_FILL | GridData.VERTICAL_ALIGN_FILL);
- gd.widthHint = 160;
- deselectAllButton.setLayoutData(gd);
- deselectAllButton.addSelectionListener(new SelectionAdapter() {
- @Override
- public void widgetSelected(SelectionEvent e) {
- handleDeselectAllButtonPressed();
- }
- });
- }
-
- protected void createJARsComposite(Composite parent) {
- Group group = new Group(parent, SWT.NULL);
- group.setText(J2EEUIMessages.getResourceString(J2EEUIMessages.EAR_IMPORT_JARS_GROUP));
- GridLayout layout = new GridLayout();
- layout.numColumns = 1;
- group.setLayout(layout);
- group.setLayoutData(new GridData(GridData.FILL_BOTH));
-
- Label description = new Label(group, SWT.NULL);
- description.setText(J2EEUIMessages.getResourceString(J2EEUIMessages.EAR_IMPORT_SELECT_UTIL_JARS_TO_BE_PROJECTS));
- GridData gd2 = new GridData(GridData.HORIZONTAL_ALIGN_FILL);
- gd2.horizontalSpan = 3;
- description.setLayoutData(gd2);
-
- // create jars check box viewer
- createAvailableJarsList(group);
- createButtonsGroup(group);
- }
-
- protected void createProjectRootComposite(Composite parent) {
- Group group = new Group(parent, SWT.NULL);
- group.setText(J2EEUIMessages.getResourceString(J2EEUIMessages.PROJECT_LOCATIONS_GROUP));
- GridLayout layout = new GridLayout();
- layout.numColumns = 3;
- group.setLayout(layout);
- group.setLayoutData(new GridData(GridData.FILL_HORIZONTAL));
-
- Label description = new Label(group, SWT.NULL);
- description.setText(J2EEUIMessages.getResourceString(J2EEUIMessages.NEW_PROJECT_GROUP_DESCRIPTION));
- GridData gd2 = new GridData(GridData.HORIZONTAL_ALIGN_FILL);
- gd2.horizontalSpan = 3;
- description.setLayoutData(gd2);
-
- moduleProjectLocationLabel = new Label(group, SWT.NULL);
- moduleProjectLocationLabel.setText(J2EEUIMessages.getResourceString(J2EEUIMessages.USE_DEFAULT_ROOT_RADIO));
- moduleProjectLocationLabel.setLayoutData(new GridData(GridData.HORIZONTAL_ALIGN_FILL));
-
- systemDefaultText = new Text(group, SWT.READ_ONLY | SWT.WRAP | SWT.BORDER);
- GridData gd = new GridData(GridData.FILL_HORIZONTAL);
- systemDefaultText.setLayoutData(gd);
- synchHelper.synchText(systemDefaultText, IEARComponentImportDataModelProperties.NESTED_MODULE_ROOT, null);
-
- browseButton = new Button(group, SWT.PUSH);
- browseButton.setText(J2EEUIMessages.getResourceString(J2EEUIMessages.BROWSE_LABEL));
- gd = new GridData(GridData.HORIZONTAL_ALIGN_END);
- browseButton.setLayoutData(gd);
- browseButton.addSelectionListener(new SelectionAdapter() {
- @Override
- public void widgetSelected(SelectionEvent e) {
- handleBrowseButtonPressed();
- }
- });
- }
-
- private void refreshEARFileIfNecessary() {
- if (isEARFileChanged()) {
- aWrapper = (ArchiveWrapper) model.getProperty(IJ2EEComponentImportDataModelProperties.ARCHIVE_WRAPPER);
- refresh();
- }
- }
-
- protected void setJARsCompositeEnabled(boolean enabled) {
- availableJARsViewer.getTable().setEnabled(enabled);
- availableJARsViewer.setAllChecked(false);
- availableJARsViewer.setAllGrayed(!enabled);
- selectAllButton.setEnabled(enabled);
- deselectAllButton.setEnabled(enabled);
- }
-
- private void refresh() {
- availableJARsViewer.setInput(aWrapper);
- }
-
- public boolean isEARFileChanged() {
- return aWrapper != model.getProperty(IJ2EEComponentImportDataModelProperties.ARCHIVE_WRAPPER);
- }
-
- @Override
- protected void enter() {
- super.enter();
- refreshEARFileIfNecessary();
- }
-
- public void availableJARCheckStateChanged(CheckStateChangedEvent event) {
- model.setProperty(IEARComponentImportDataModelProperties.UTILITY_LIST, getJARsForProjects());
- validatePage();
- }
-
- public List getJARsForProjects() {
- refreshEARFileIfNecessary();
- List result = new ArrayList();
- result.addAll(Arrays.asList(availableJARsViewer.getCheckedElements()));
- return result;
- }
-
- protected boolean isNullOrEmpty(String aString) {
- return aString == null || aString.length() == 0;
- }
-
- @Override
- protected String[] getValidationPropertyNames() {
- return new String[]{};
- }
-
- protected void restoreWidgetValues() {
- // This page doesn't implement...
- }
-
- @Override
- public void storeDefaultSettings() {
- // This page doesn't implement...
- }
-
-
-
-}
diff --git a/plugins/org.eclipse.jst.j2ee.ui/j2ee_ui/org/eclipse/jst/j2ee/internal/wizard/EARComponentImportPage.java b/plugins/org.eclipse.jst.j2ee.ui/j2ee_ui/org/eclipse/jst/j2ee/internal/wizard/EARComponentImportPage.java
deleted file mode 100644
index 9ad4663..0000000
--- a/plugins/org.eclipse.jst.j2ee.ui/j2ee_ui/org/eclipse/jst/j2ee/internal/wizard/EARComponentImportPage.java
+++ /dev/null
@@ -1,136 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2003, 2006 IBM Corporation and others.
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
- *
- * Contributors:
- * IBM Corporation - initial API and implementation
- * David Schneider, david.schneider@unisys.com - [142500] WTP properties pages fonts don't follow Eclipse preferences
- *******************************************************************************/
-/*
- * Created on Dec 8, 2003
- *
- * To change the template for this generated file go to Window>Preferences>Java>Code Generation>Code and Comments
- */
-package org.eclipse.jst.j2ee.internal.wizard;
-
-import org.eclipse.jface.dialogs.Dialog;
-import org.eclipse.jst.j2ee.application.internal.operations.EARComponentImportDataModelProvider;
-import org.eclipse.jst.j2ee.application.internal.operations.IAnnotationsDataModel;
-import org.eclipse.jst.j2ee.application.internal.operations.J2EEArtifactImportDataModelProvider;
-import org.eclipse.jst.j2ee.datamodel.properties.IJ2EEComponentImportDataModelProperties;
-import org.eclipse.jst.j2ee.internal.actions.IJ2EEUIContextIds;
-import org.eclipse.jst.j2ee.internal.plugin.J2EEUIMessages;
-import org.eclipse.jst.j2ee.internal.plugin.J2EEUIPlugin;
-import org.eclipse.jst.j2ee.internal.plugin.J2EEUIPluginIcons;
-import org.eclipse.swt.SWT;
-import org.eclipse.swt.layout.GridLayout;
-import org.eclipse.swt.widgets.Combo;
-import org.eclipse.swt.widgets.Composite;
-import org.eclipse.wst.common.componentcore.datamodel.properties.IFacetProjectCreationDataModelProperties;
-import org.eclipse.wst.common.frameworks.datamodel.IDataModel;
-
-/**
- * @author cbridgha
- *
- * To change the template for this generated type comment go to Window>Preferences>Java>Code
- * Generation>Code and Comments
- */
-public class EARComponentImportPage extends J2EEImportPage {
- protected Combo serverTargetCombo;
-
- /**
- * @param model
- * @param pageName
- */
- public EARComponentImportPage(IDataModel dataModel, String pageName) {
- super(dataModel, pageName);
- setTitle(J2EEUIMessages.getResourceString(J2EEUIMessages.EAR_IMPORT_MAIN_PG_TITLE));
- setDescription(J2EEUIMessages.getResourceString(J2EEUIMessages.EAR_IMPORT_MAIN_PG_DESC));
- setImageDescriptor(J2EEUIPlugin.getDefault().getImageDescriptor(J2EEUIPluginIcons.EAR_IMPORT_WIZARD_BANNER));
- }
-
- /*
- * (non-Javadoc)
- *
- * @see org.eclipse.wst.common.frameworks.internal.ui.wizard.WTPWizardPage#createTopLevelComposite(org.eclipse.swt.widgets.Composite)
- */
- @Override
- protected Composite createTopLevelComposite(Composite parent) {
- Composite composite = new Composite(parent, SWT.NULL);
- setInfopopID(IJ2EEUIContextIds.IMPORT_EAR_WIZARD_P1);
- GridLayout layout = new GridLayout(3, false);
- composite.setLayout(layout);
- createFileNameComposite(composite);
- createProjectNameComposite(composite);
- createAnnotationsStandaloneGroup(composite);
- restoreWidgetValues();
- Dialog.applyDialogFont(parent);
- return composite;
- }
-
- @Override
- protected String getProjectImportLabel() {
- return J2EEUIMessages.getResourceString(J2EEUIMessages.EAR_IMPORT_PROJECT_LABEL);
- }
-
- /*
- * (non-Javadoc)
- *
- * @see org.eclipse.jst.j2ee.internal.internal.internal.ui.wizard.J2EEImportPage#getFileImportLabel()
- */
- @Override
- protected String getFileImportLabel() {
- return J2EEUIMessages.getResourceString(J2EEUIMessages.EAR_IMPORT_FILE_LABEL);
- }
-
- /*
- * (non-Javadoc)
- *
- * @see org.eclipse.jst.j2ee.internal.internal.internal.ui.wizard.J2EEImportPage#getFilterExpression()
- */
- @Override
- protected String[] getFilterExpression() {
- return new String[]{"*.ear"}; //$NON-NLS-1$
- }
-
- /*
- * (non-Javadoc)
- *
- * @see org.eclipse.jst.j2ee.internal.internal.internal.ui.wizard.J2EEModuleImportPage#createAnnotationsStandaloneGroup(org.eclipse.swt.widgets.Composite)
- */
- protected void createAnnotationsStandaloneGroup(Composite composite) {
- // new AnnotationsStandaloneGroup(composite, model, false);
- }
-
- /*
- * (non-Javadoc)
- *
- * @see org.eclipse.wst.common.frameworks.internal.ui.wizard.WTPWizardPage#getValidationPropertyNames()
- */
-
- @Override
- protected String[] getValidationPropertyNames() {
- return new String[]{IJ2EEComponentImportDataModelProperties.FILE_NAME,
- IFacetProjectCreationDataModelProperties.FACET_PROJECT_NAME,
- EARComponentImportDataModelProvider.EAR_NAME_VALIDATION,
- IFacetProjectCreationDataModelProperties.FACET_RUNTIME,
- IAnnotationsDataModel.USE_ANNOTATIONS,
- J2EEArtifactImportDataModelProvider.FACET_RUNTIME};
- }
-
- /*
- * (non-Javadoc)
- *
- * @see org.eclipse.jst.j2ee.internal.internal.internal.ui.wizard.J2EEImportPage#getFileNamesStoreID()
- */
- @Override
- protected String getFileNamesStoreID() {
- return "EAR";//$NON-NLS-1$
- }
-
-
-
-}
diff --git a/plugins/org.eclipse.jst.j2ee.ui/j2ee_ui/org/eclipse/jst/j2ee/internal/wizard/EARComponentImportWizard.java b/plugins/org.eclipse.jst.j2ee.ui/j2ee_ui/org/eclipse/jst/j2ee/internal/wizard/EARComponentImportWizard.java
deleted file mode 100644
index 63fd90a..0000000
--- a/plugins/org.eclipse.jst.j2ee.ui/j2ee_ui/org/eclipse/jst/j2ee/internal/wizard/EARComponentImportWizard.java
+++ /dev/null
@@ -1,113 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2003, 2006 IBM Corporation and others.
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
- *
- * Contributors:
- * IBM Corporation - initial API and implementation
- *******************************************************************************/
-package org.eclipse.jst.j2ee.internal.wizard;
-
-import org.eclipse.jst.j2ee.application.internal.operations.EARComponentImportDataModelProvider;
-import org.eclipse.jst.j2ee.internal.plugin.J2EEUIMessages;
-import org.eclipse.jst.j2ee.internal.plugin.J2EEUIPlugin;
-import org.eclipse.jst.j2ee.internal.plugin.J2EEUIPluginIcons;
-import org.eclipse.wst.common.frameworks.datamodel.IDataModel;
-import org.eclipse.wst.common.frameworks.datamodel.IDataModelProvider;
-import org.eclipse.wst.project.facet.IProductConstants;
-import org.eclipse.wst.project.facet.ProductManager;
-
-/**
- * <p>
- * Wizard used to import J2EE Application structures into the Eclipse Workbench from an existing
- * Enterprise Application Archive *.ear file.
- * </p>
- */
-public final class EARComponentImportWizard extends J2EEArtifactImportWizard{
-
- /**
- * <p>
- * Constant used to identify the key of the Projects page of the Wizard.
- * </p>
- */
- protected static final String PROJECT_PG = "projects"; //$NON-NLS-1$
-
- /**
- * <p>
- * Constant used to identify the key of the Options page of the Wizard.
- * </p>
- */
- protected static final String OPTIONS_PG = "options"; //$NON-NLS-1$
-
- /**
- * <p>
- * The default constructor. Creates a wizard with no selection, no model instance, and no
- * operation instance. The model and operation will be created as needed.
- * </p>
- */
- public EARComponentImportWizard() {
- super();
- setWindowTitle(J2EEUIMessages.getResourceString("38")); //$NON-NLS-1$
- }
-
- /**
- * <p>
- * The model is used to prepopulate the wizard controls and interface with the operation.
- * </p>
- *
- * @param model
- * The model parameter is used to pre-populate wizard controls and interface with the
- * operation
- */
- public EARComponentImportWizard(IDataModel model) {
- super(model);
- setWindowTitle(J2EEUIMessages.getResourceString("38")); //$NON-NLS-1$
- }
-
- /**
- * <p>
- * Adds the following pages:
- * <ul>
- * <li>{@link EARComponentImportPage}as the main wizard page ({@link #MAIN_PG})
- * <li>{@link EARComponentImportOptionsPage}as the options wizard page ({@link #OPTIONS_PG})
- * <li>{@link EARComponentProjectsPage}as the project wizard page ({@link #PROJECT_PG})
- * </ul>
- *
- * </p>
- */
- @Override
- public void doAddPages() {
- addPage(new EARComponentImportPage(getDataModel(), MAIN_PG));
- addPage(new EARComponentImportOptionsPage(getDataModel(), OPTIONS_PG));
- addPage(new EARComponentProjectsPage(getDataModel(), PROJECT_PG));
- }
-
-
-
- /**
- * {@inheritDoc}
- *
- * <p>
- * Sets up the dialog window title and default wizard page image.
- * </p>
- */
- @Override
- protected void doInit() {
- setWindowTitle(J2EEUIMessages.getResourceString(J2EEUIMessages.IMPORT_WIZ_TITLE));
- setDefaultPageImageDescriptor(J2EEUIPlugin.getDefault().getImageDescriptor(J2EEUIPluginIcons.EAR_IMPORT_WIZARD_BANNER));
-
- }
-
- @Override
- protected IDataModelProvider getDefaultProvider() {
- return new EARComponentImportDataModelProvider();
- }
-
- @Override
- protected String getFinalPerspectiveID() {
- return ProductManager.getProperty(IProductConstants.FINAL_PERSPECTIVE_EAR);
- }
-
-}
diff --git a/plugins/org.eclipse.jst.j2ee.ui/j2ee_ui/org/eclipse/jst/j2ee/internal/wizard/EARComponentProjectsPage.java b/plugins/org.eclipse.jst.j2ee.ui/j2ee_ui/org/eclipse/jst/j2ee/internal/wizard/EARComponentProjectsPage.java
deleted file mode 100644
index aeacb7d..0000000
--- a/plugins/org.eclipse.jst.j2ee.ui/j2ee_ui/org/eclipse/jst/j2ee/internal/wizard/EARComponentProjectsPage.java
+++ /dev/null
@@ -1,302 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2003, 2006 IBM Corporation and others.
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
- *
- * Contributors:
- * IBM Corporation - initial API and implementation
- *******************************************************************************/
-/*
- * Created on Dec 8, 2003
- *
- * To change the template for this generated file go to Window>Preferences>Java>Code Generation>Code and Comments
- */
-package org.eclipse.jst.j2ee.internal.wizard;
-
-import java.util.ArrayList;
-import java.util.Arrays;
-import java.util.Iterator;
-import java.util.List;
-
-import org.eclipse.jface.viewers.CellEditor;
-import org.eclipse.jface.viewers.CheckStateChangedEvent;
-import org.eclipse.jface.viewers.CheckboxTableViewer;
-import org.eclipse.jface.viewers.ColumnWeightData;
-import org.eclipse.jface.viewers.ICellModifier;
-import org.eclipse.jface.viewers.ICheckStateListener;
-import org.eclipse.jface.viewers.TableLayout;
-import org.eclipse.jface.viewers.TextCellEditor;
-import org.eclipse.jst.j2ee.application.internal.operations.EARComponentImportDataModelProvider;
-import org.eclipse.jst.j2ee.datamodel.properties.IEARComponentImportDataModelProperties;
-import org.eclipse.jst.j2ee.datamodel.properties.IJ2EEComponentImportDataModelProperties;
-import org.eclipse.jst.j2ee.internal.actions.IJ2EEUIContextIds;
-import org.eclipse.jst.j2ee.internal.plugin.J2EEUIMessages;
-import org.eclipse.jst.j2ee.internal.plugin.J2EEUIPlugin;
-import org.eclipse.jst.j2ee.internal.plugin.J2EEUIPluginIcons;
-import org.eclipse.swt.SWT;
-import org.eclipse.swt.events.SelectionAdapter;
-import org.eclipse.swt.events.SelectionEvent;
-import org.eclipse.swt.layout.GridData;
-import org.eclipse.swt.layout.GridLayout;
-import org.eclipse.swt.widgets.Button;
-import org.eclipse.swt.widgets.Composite;
-import org.eclipse.swt.widgets.Table;
-import org.eclipse.swt.widgets.TableColumn;
-import org.eclipse.swt.widgets.TableItem;
-import org.eclipse.wst.common.componentcore.resources.IVirtualComponent;
-import org.eclipse.wst.common.frameworks.datamodel.DataModelEvent;
-import org.eclipse.wst.common.frameworks.datamodel.IDataModel;
-import org.eclipse.wst.common.frameworks.internal.datamodel.ui.DataModelWizardPage;
-
-/**
- * @author cbridgha
- *
- * To change the template for this generated type comment go to Window>Preferences>Java>Code
- * Generation>Code and Comments
- */
-public class EARComponentProjectsPage extends DataModelWizardPage {
-
- private CheckboxTableViewer earFileListViewer;
-
- public static final String INCLUDE_COLUMN = J2EEUIMessages.getResourceString("EARImportProjectsPage_UI_0"); //$NON-NLS-1$
- public static final String FILE_COLUMN = J2EEUIMessages.getResourceString("EARImportProjectsPage_UI_1"); //$NON-NLS-1$
- public static final String PROJECT_COLUMN = J2EEUIMessages.getResourceString("EARImportProjectsPage_UI_2"); //$NON-NLS-1$
-
- /**
- * @param model
- * @param pageName
- */
- public EARComponentProjectsPage(IDataModel model, String pageName) {
- super(model, pageName);
- setTitle(J2EEUIMessages.getResourceString(J2EEUIMessages.EAR_IMPORT_PROJECT_PG_TITLE));
- setDescription(J2EEUIMessages.getResourceString(J2EEUIMessages.EAR_IMPORT_PROJECT_PG_DESC));
- setImageDescriptor(J2EEUIPlugin.getDefault().getImageDescriptor(J2EEUIPluginIcons.EAR_IMPORT_WIZARD_BANNER));
- }
-
- @Override
- protected Composite createTopLevelComposite(Composite parent) {
- Composite composite = new Composite(parent, SWT.NONE);
- setInfopopID(IJ2EEUIContextIds.IMPORT_EAR_WIZARD_P3);
- GridLayout layout = new GridLayout();
- composite.setLayout(layout);
- composite.setLayoutData(new GridData(GridData.FILL_HORIZONTAL));
- createListGroup(composite);
- createButtonsGroup(composite);
-
- return composite;
- }
-
- protected void setColumnEditors() {
- Table t = earFileListViewer.getTable();
- CellEditor[] columnEditors = new CellEditor[t.getColumnCount()];
- columnEditors[1] = new TextCellEditor(t);
-
- earFileListViewer.setCellEditors(columnEditors);
- }
-
- protected void createButtonsGroup(Composite parent) {
- Composite buttonGroup = new Composite(parent, SWT.NONE);
- GridLayout layout = new GridLayout();
- layout.numColumns = 3;
- buttonGroup.setLayout(layout);
- buttonGroup.setLayoutData(new GridData(GridData.FILL_BOTH));
-
- Button selectNotInWorkspace = new Button(buttonGroup, SWT.PUSH);
- selectNotInWorkspace.setText(J2EEUIMessages.getResourceString("EARImportProjectsPage_UI_3")); //$NON-NLS-1$
- GridData gd = new GridData(GridData.HORIZONTAL_ALIGN_FILL | GridData.VERTICAL_ALIGN_FILL);
- //gd.horizontalSpan = 1;
- //gd.heightHint = 22;
- gd.widthHint = 140;
- selectNotInWorkspace.setLayoutData(gd);
- selectNotInWorkspace.addSelectionListener(new SelectionAdapter() {
- @Override
- public void widgetSelected(SelectionEvent e) {
- List list = (List) model.getProperty(IEARComponentImportDataModelProperties.ALL_PROJECT_MODELS_LIST);
- List selectedList = (List) model.getProperty(IEARComponentImportDataModelProperties.SELECTED_MODELS_LIST);
- List newList = new ArrayList();
- newList.addAll(selectedList);
- IDataModel importDM = null;
- for (int i = 0; i < list.size(); i++) {
- importDM = (IDataModel) list.get(i);
- if (!newList.contains(importDM)) {
- IVirtualComponent tempComponent = (IVirtualComponent) importDM.getProperty(IJ2EEComponentImportDataModelProperties.COMPONENT);
- if(tempComponent == null || !tempComponent.exists()){
- newList.add(importDM);
- }
- }
- }
- model.setProperty(IEARComponentImportDataModelProperties.SELECTED_MODELS_LIST, newList);
- }
- });
-
- Button selectAllButton = new Button(buttonGroup, SWT.PUSH);
- selectAllButton.setText(J2EEUIMessages.getResourceString(J2EEUIMessages.EAR_IMPORT_SELECT_ALL_UTIL_BUTTON));
- gd = new GridData(GridData.HORIZONTAL_ALIGN_FILL | GridData.VERTICAL_ALIGN_FILL);
- //gd.horizontalSpan = 1;
- //gd.heightHint = 22;
- gd.widthHint = 140;
- selectAllButton.setLayoutData(gd);
- selectAllButton.addSelectionListener(new SelectionAdapter() {
- @Override
- public void widgetSelected(SelectionEvent e) {
- List list = (List) model.getProperty(IEARComponentImportDataModelProperties.ALL_PROJECT_MODELS_LIST);
- List newList = new ArrayList();
- newList.addAll(list);
- model.setProperty(IEARComponentImportDataModelProperties.SELECTED_MODELS_LIST, newList);
- }
- });
-
- Button deselectAllButton = new Button(buttonGroup, SWT.PUSH);
- deselectAllButton.setText(J2EEUIMessages.getResourceString(J2EEUIMessages.EAR_IMPORT_DESELECT_ALL_UTIL_BUTTON));
- gd = new GridData(GridData.HORIZONTAL_ALIGN_FILL | GridData.VERTICAL_ALIGN_FILL);
- ////gd.horizontalSpan = 1;
- //gd.heightHint = 22;
- gd.widthHint = 140;
- deselectAllButton.setLayoutData(gd);
- deselectAllButton.addSelectionListener(new SelectionAdapter() {
- @Override
- public void widgetSelected(SelectionEvent e) {
- List newList = new ArrayList();
- model.setProperty(IEARComponentImportDataModelProperties.SELECTED_MODELS_LIST, newList);
- }
- });
- }
-
- @Override
- public void propertyChanged(DataModelEvent event) {
- if (event.getPropertyName().equals(IEARComponentImportDataModelProperties.SELECTED_MODELS_LIST)) {
- if(earFileListViewer != null){
- updateGUICheckSelection();
- }
- }
- super.propertyChanged(event);
- }
-
- public void setFileListViewerInput() {
- TableObjects files = new TableObjects();
- Iterator iterator = ((List) model.getProperty(IEARComponentImportDataModelProperties.ALL_PROJECT_MODELS_LIST)).iterator();
- while (iterator.hasNext()) {
- files.tableObjectsList.add(iterator.next());
- }
- earFileListViewer.setInput(files);
- updateGUICheckSelection();
- }
-
- private void updateGUICheckSelection() {
- List selectedList = (List) model.getProperty(IEARComponentImportDataModelProperties.SELECTED_MODELS_LIST);
- List projectList = (List) model.getProperty(IEARComponentImportDataModelProperties.ALL_PROJECT_MODELS_LIST);
- Object currentElement = null;
- for (int i = 0; i < projectList.size(); i++) {
- currentElement = projectList.get(i);
- earFileListViewer.setChecked(currentElement, selectedList.contains(currentElement));
- }
- }
-
- /**
- * @see org.eclipse.jst.j2ee.internal.internal.internal.wizard.J2EEWizardPage#enter()
- */
- @Override
- protected void enter() {
- super.enter();
- setFileListViewerInput();
- validatePage();
- }
-
- /**
- * Creates the import source specification widgets. <b>Subclasses </b> must override this hook
- * method.
- *
- * @param parent
- * a <code>Composite</code> that is to be used as the parent of this group's
- * collection of visual components
- * @see org.eclipse.swt.widgets.Composite
- */
- protected void createListGroup(org.eclipse.swt.widgets.Composite parent) {
- Composite listGroup = new Composite(parent, SWT.NONE);
- GridLayout layout = new GridLayout();
- layout.numColumns = 1;
- listGroup.setLayout(layout);
- GridData gd = new GridData(GridData.FILL_BOTH);
- listGroup.setLayoutData(gd);
-
- earFileListViewer = CheckboxTableViewer.newCheckList(listGroup, SWT.BORDER | SWT.H_SCROLL | SWT.V_SCROLL | SWT.FULL_SELECTION);
- EARImportListContentProvider provider = new EARImportListContentProvider();
- earFileListViewer.setContentProvider(provider);
- earFileListViewer.setLabelProvider(provider);
- earFileListViewer.addCheckStateListener(new ICheckStateListener() {
- public void checkStateChanged(CheckStateChangedEvent event) {
- List result = new ArrayList();
- result.addAll(Arrays.asList(earFileListViewer.getCheckedElements()));
- model.setProperty(IEARComponentImportDataModelProperties.SELECTED_MODELS_LIST, result);
-
- }
- });
-
- Table earFileListTable = (Table) earFileListViewer.getControl();
- earFileListTable.setHeaderVisible(true);
- earFileListTable.setLinesVisible(true);
- // set up table layout
- TableLayout tableLayout = new org.eclipse.jface.viewers.TableLayout();
- tableLayout.addColumnData(new ColumnWeightData(100, true));
- tableLayout.addColumnData(new ColumnWeightData(200, true));
- earFileListTable.setLayout(tableLayout);
-
- gd = new GridData(GridData.FILL_BOTH | GridData.GRAB_HORIZONTAL | GridData.GRAB_VERTICAL);
- gd.widthHint = 400;
- earFileListTable.setLayoutData(gd);
-
-
- TableColumn fileNameColumns = new TableColumn(earFileListTable, SWT.NONE);
- fileNameColumns.setText(J2EEUIMessages.getResourceString(J2EEUIMessages.EAR_IMPORT_Modules_in_EAR));
- fileNameColumns.setResizable(true);
-
- TableColumn importNameColumn = new TableColumn(earFileListTable, SWT.NONE);
- importNameColumn.setText(J2EEUIMessages.getResourceString(J2EEUIMessages.EAR_IMPORT_New_Project_Name));
- importNameColumn.setResizable(true);
-
- String[] columnProperties = new String[2];
- columnProperties[0] = FILE_COLUMN;
- columnProperties[1] = PROJECT_COLUMN;
- earFileListViewer.setColumnProperties(columnProperties);
-
- setColumnEditors();
- earFileListViewer.setCellModifier(new ICellModifier() {
- public boolean canModify(Object element, String property) {
- return PROJECT_COLUMN.equals(property);
- }
-
- public Object getValue(Object element, String property) {
- TableItem[] items = earFileListViewer.getTable().getSelection();
- TableItem item = items[0];
- return item.getText(1);
- }
-
- public void modify(Object element, String property, Object value) {
- TableItem elementHolder = (TableItem) element;
- if (property.equals(PROJECT_COLUMN)) {
- elementHolder.setText(1, (String) value);
- ((IDataModel) elementHolder.getData()).setProperty(IJ2EEComponentImportDataModelProperties.PROJECT_NAME, value);
- }
- }
- });
- }
-
-
- protected void restoreWidgetValues() {
- // This page doesn't implement...
- }
-
- @Override
- public void storeDefaultSettings() {
- // This page doesn't implement...
- }
-
- @Override
- protected String[] getValidationPropertyNames() {
- return new String[]{IEARComponentImportDataModelProperties.SELECTED_MODELS_LIST, EARComponentImportDataModelProvider.NESTED_PROJECTS_VALIDATION};
- }
-
-
-}
diff --git a/plugins/org.eclipse.jst.j2ee.ui/j2ee_ui/org/eclipse/jst/j2ee/internal/wizard/EARImportListContentProvider.java b/plugins/org.eclipse.jst.j2ee.ui/j2ee_ui/org/eclipse/jst/j2ee/internal/wizard/EARImportListContentProvider.java
deleted file mode 100644
index 9023251..0000000
--- a/plugins/org.eclipse.jst.j2ee.ui/j2ee_ui/org/eclipse/jst/j2ee/internal/wizard/EARImportListContentProvider.java
+++ /dev/null
@@ -1,108 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2003, 2007 IBM Corporation and others.
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
- *
- * Contributors:
- * IBM Corporation - initial API and implementation
- *******************************************************************************/
-package org.eclipse.jst.j2ee.internal.wizard;
-
-import java.util.Arrays;
-import java.util.Comparator;
-
-import org.eclipse.jface.viewers.IStructuredContentProvider;
-import org.eclipse.jface.viewers.ITableLabelProvider;
-import org.eclipse.jface.viewers.LabelProvider;
-import org.eclipse.jface.viewers.Viewer;
-import org.eclipse.jst.j2ee.commonarchivecore.internal.helpers.ArchiveConstants;
-import org.eclipse.jst.j2ee.datamodel.properties.IJ2EEComponentImportDataModelProperties;
-import org.eclipse.jst.j2ee.internal.archive.ArchiveWrapper;
-import org.eclipse.wst.common.componentcore.datamodel.properties.IFacetProjectCreationDataModelProperties;
-import org.eclipse.wst.common.frameworks.datamodel.IDataModel;
-
-
-
-/**
- * Insert the type's description here. Creation date: (5/7/2001 11:39:11 AM)
- *
- * @author: Administrator
- */
-public class EARImportListContentProvider extends LabelProvider implements IStructuredContentProvider, ITableLabelProvider {
- /**
- * EARImportListContentProvider constructor comment.
- */
- public EARImportListContentProvider() {
- super();
- }
-
- /**
- * Returns the elements to display in the viewer when its input is set to the given element.
- * These elements can be presented as rows in a table, items in a list, etc. The result is not
- * modified by the viewer.
- *
- * @param inputElement
- * the input element
- * @return the array of elements to display in the viewer
- */
- public java.lang.Object[] getElements(Object inputElement) {
- if (inputElement instanceof TableObjects) {
- Object[] array = ((TableObjects) inputElement).getTableObjects().toArray();
- Arrays.sort(array, new Comparator() {
- public int compare(Object o1, Object o2) {
- return getColumnText(o1, 0).compareTo(getColumnText(o2, 0));
- }
- });
- return array;
- }
- return new Object[0]; // should throw exception instead
- }
-
- /**
- * Returns the label image for the given column of the given element.
- *
- * @param element
- * the object representing the entire row, or <code>null</code> indicating that no
- * input object is set in the viewer
- * @param columnIndex
- * the zero-based index of the column in which the label appears
- */
- public org.eclipse.swt.graphics.Image getColumnImage(Object element, int columnIndex) {
- return null;
- }
-
- /**
- * Returns the label text for the given column of the given element.
- *
- * @param element
- * the object representing the entire row, or <code>null</code> indicating that no
- * input object is set in the viewer
- * @param columnIndex
- * the zero-based index of the column in which the label appears
- */
- public String getColumnText(Object element, int columnIndex) {
- IDataModel dataModel = (IDataModel) element;
- if (columnIndex == 0) {
- ArchiveWrapper wrapper = (ArchiveWrapper) dataModel.getProperty(IJ2EEComponentImportDataModelProperties.ARCHIVE_WRAPPER);
- if (wrapper.getPath().toString().startsWith(ArchiveConstants.WEBAPP_LIB_URI)) {
- String parentWarFileName = wrapper.getParent().getName();
- return parentWarFileName + "#" + wrapper.getName(); //$NON-NLS-1$
- }
- return wrapper.getPath().toString();
- } else if (columnIndex == 1) {
- return dataModel.getStringProperty(IFacetProjectCreationDataModelProperties.FACET_PROJECT_NAME);
- }
- return ""; //$NON-NLS-1$
- }
-
- public void inputChanged(Viewer viewer, Object oldInput, Object newInput) {
- // do nothing
- }
-
- @Override
- public void dispose() {
- // dispose
- }
-}
diff --git a/plugins/org.eclipse.jst.j2ee.ui/j2ee_ui/org/eclipse/jst/j2ee/internal/wizard/EARLibrariesContainerPage.java b/plugins/org.eclipse.jst.j2ee.ui/j2ee_ui/org/eclipse/jst/j2ee/internal/wizard/EARLibrariesContainerPage.java
deleted file mode 100644
index f45daeb..0000000
--- a/plugins/org.eclipse.jst.j2ee.ui/j2ee_ui/org/eclipse/jst/j2ee/internal/wizard/EARLibrariesContainerPage.java
+++ /dev/null
@@ -1,67 +0,0 @@
-package org.eclipse.jst.j2ee.internal.wizard;
-
-import org.eclipse.jdt.core.IClasspathEntry;
-import org.eclipse.jdt.core.IJavaProject;
-import org.eclipse.jdt.core.JavaCore;
-import org.eclipse.jdt.ui.wizards.IClasspathContainerPage;
-import org.eclipse.jdt.ui.wizards.IClasspathContainerPageExtension;
-import org.eclipse.jdt.ui.wizards.NewElementWizardPage;
-import org.eclipse.jst.j2ee.internal.common.classpath.J2EEComponentClasspathContainer;
-import org.eclipse.osgi.util.NLS;
-import org.eclipse.swt.SWT;
-import org.eclipse.swt.layout.GridData;
-import org.eclipse.swt.layout.GridLayout;
-import org.eclipse.swt.widgets.Composite;
-import org.eclipse.swt.widgets.Text;
-
-public class EARLibrariesContainerPage extends NewElementWizardPage implements IClasspathContainerPage, IClasspathContainerPageExtension {
-
- protected IClasspathEntry entry = null;
-
- public EARLibrariesContainerPage() {
- super("EARLibrariesContainerPage"); //$NON-NLS-1$
- setTitle(EARLibrariesMessages.EARLibrariesContainerPage_0);
- setDescription(EARLibrariesMessages.EARLibrariesContainerPage_1);
- }
-
- public boolean finish() {
- return true;
- }
-
- public IClasspathEntry getSelection() {
- return JavaCore.newContainerEntry(J2EEComponentClasspathContainer.CONTAINER_PATH);
- }
-
- public void setSelection(IClasspathEntry containerEntry) {
- }
-
- public void createControl(Composite parent) {
- final Composite composite = new Composite(parent, SWT.NONE);
- composite.setLayout(new GridLayout(1, false));
-
- final Text text = new Text(composite, SWT.MULTI | SWT.READ_ONLY | SWT.WRAP);
- text.setText(getDescription());
- text.setLayoutData(new GridData(GridData.FILL_BOTH));
- setControl(composite);
- }
-
- public void initialize(IJavaProject project, IClasspathEntry[] currentEntries) {
- }
-
-
- public static class EARLibrariesMessages extends NLS {
- private static final String BUNDLE_NAME = "org.eclipse.jst.j2ee.internal.wizard.earlibraries"; //$NON-NLS-1$
-
- public static String EARLibrariesContainerPage_0;
-
- public static String EARLibrariesContainerPage_1;
- static {
- // initialize resource bundle
- NLS.initializeMessages(BUNDLE_NAME, EARLibrariesMessages.class);
- }
-
- private EARLibrariesMessages() {
- }
- }
-
-}
diff --git a/plugins/org.eclipse.jst.j2ee.ui/j2ee_ui/org/eclipse/jst/j2ee/internal/wizard/EARValidationHelper.java b/plugins/org.eclipse.jst.j2ee.ui/j2ee_ui/org/eclipse/jst/j2ee/internal/wizard/EARValidationHelper.java
deleted file mode 100644
index 7b3772c..0000000
--- a/plugins/org.eclipse.jst.j2ee.ui/j2ee_ui/org/eclipse/jst/j2ee/internal/wizard/EARValidationHelper.java
+++ /dev/null
@@ -1,92 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2003, 2005 IBM Corporation and others.
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
- *
- * Contributors:
- * IBM Corporation - initial API and implementation
- *******************************************************************************/
-package org.eclipse.jst.j2ee.internal.wizard;
-
-
-import java.util.ArrayList;
-import java.util.Arrays;
-import java.util.Collections;
-import java.util.List;
-
-import org.eclipse.core.resources.IProject;
-import org.eclipse.jface.operation.IRunnableWithProgress;
-import org.eclipse.jst.j2ee.internal.project.J2EEProjectUtilities;
-import org.eclipse.jst.j2ee.internal.validation.UIEarValidator;
-import org.eclipse.wst.common.frameworks.internal.ui.RunnableWithProgressWrapper;
-import org.eclipse.wst.validation.internal.operations.OneValidatorOperation;
-import org.eclipse.wst.validation.internal.operations.ValidatorManager;
-
-public class EARValidationHelper {
-
- /**
- * Constructor for EARValidationHelper.
- */
- private EARValidationHelper() {
- super();
- }
-
- /**
- * Return a list of runnable validation operations for all EAR projects which have auto validate
- * enabled, and are impacted by the list of projects; If the ear project itself is in the list,
- * then it is skipped.
- */
- public static IRunnableWithProgress[] getEARValidationOperations(List modifiedProjects) {
- List earProjects = Arrays.asList(J2EEProjectUtilities.getAllProjectsInWorkspaceOfType(J2EEProjectUtilities.ENTERPRISE_APPLICATION));
- List result = new ArrayList(earProjects.size());
- for (int i = 0; i < earProjects.size(); i++) {
- IProject earProj = (IProject) earProjects.get(i);
- if (willEARProjectNeedValidation(earProj, modifiedProjects)) {
- result.add(createValidationRunnable(earProj));
- }
- }
- return (IRunnableWithProgress[]) result.toArray(new IRunnableWithProgress[result.size()]);
- }
-
- /**
- * Return a list of runnable validation operations for all EAR projects which have auto validate
- * enabled, and are impacted by the j2ee project
- */
- public static IRunnableWithProgress[] getEARValidationOperations(IProject modifiedJ2EEProject) {
- return getEARValidationOperations(Collections.singletonList(modifiedJ2EEProject));
- }
-
- public static boolean isEARValidationAutoEnabled(IProject earProj) {
- return ValidatorManager.getManager().isAutoValidate(earProj) && ValidatorManager.getManager().isEnabled(earProj, UIEarValidator.VALIDATOR_ID);
- }
-
- private static boolean willEARProjectNeedValidation(IProject earProj, List modifiedProjects) {
- if (modifiedProjects.contains(earProj) || !isEARValidationAutoEnabled(earProj))
- return false;
- //TODO migrate to use artifact edits and components
-// Object accessorKey = new Object();
-// EAREditModel editModel = runtime.getEarEditModelForRead(accessorKey);
-// try {
-// for (int i = 0; i < modifiedProjects.size(); i++) {
-// if (editModel.hasMappingToProject((IProject) modifiedProjects.get(i)))
-// return true;
-// }
-// } finally {
-// if (editModel != null)
-// editModel.releaseAccess(accessorKey);
-// }
- return false;
- }
-
- /**
- * Creates a new IRunnableWithProgress which runs a one validator operation on the EAR project
- */
- public static IRunnableWithProgress createValidationRunnable(IProject earProj) {
- OneValidatorOperation op = new OneValidatorOperation(earProj, UIEarValidator.VALIDATOR_ID, true, false);
-
- return new RunnableWithProgressWrapper(op);
- }
-
-}
diff --git a/plugins/org.eclipse.jst.j2ee.ui/j2ee_ui/org/eclipse/jst/j2ee/internal/wizard/J2EEArtifactExportWizard.java b/plugins/org.eclipse.jst.j2ee.ui/j2ee_ui/org/eclipse/jst/j2ee/internal/wizard/J2EEArtifactExportWizard.java
deleted file mode 100644
index 8ca0623..0000000
--- a/plugins/org.eclipse.jst.j2ee.ui/j2ee_ui/org/eclipse/jst/j2ee/internal/wizard/J2EEArtifactExportWizard.java
+++ /dev/null
@@ -1,174 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2003, 2006 IBM Corporation and others.
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
- *
- * Contributors:
- * IBM Corporation - initial API and implementation
- *******************************************************************************/
-package org.eclipse.jst.j2ee.internal.wizard;
-
-import org.eclipse.jface.viewers.IStructuredSelection;
-import org.eclipse.jst.j2ee.internal.plugin.CommonEditorUtility;
-import org.eclipse.jst.j2ee.internal.plugin.J2EEUIMessages;
-import org.eclipse.ui.IWorkbench;
-import org.eclipse.wst.common.frameworks.datamodel.IDataModel;
-import org.eclipse.wst.common.frameworks.internal.datamodel.ui.DataModelWizard;
-
-/**
- * <p>
- * Serves as a base class for Wizards which export J2EE artifact structures from Eclipse projects
- * into a deployable form.
- * </p>
- * <p>
- * Subclasses must provide the methods that are required by
- * {@link com.ibm.etools.j2ee.common.wizard.datamodel.WTPWizard}.
- * </p>
- * <p>
- * Optionally, subclasses may also override the following methods:
- * <ul>
- * <li>{@link #doInit()()}
- * <li>{@link #doDispose()()}
- * </ul>
- * </p>
- * <p>
- * The base class will ensure that the Wizard is not spawned unless all open editors are in a
- * non-dirty state. Additionally, the selection from the active view which spanwed the wizard will
- * be made available to subclasses via {@link #getSelection()}.
- * </p>
- */
-public abstract class J2EEArtifactExportWizard extends DataModelWizard {
-
- /**
- * <p>
- * Constant used to identify the key of the main page of the Wizard.
- * </p>
- */
- protected static final String MAIN_PG = "main"; //$NON-NLS-1$
-
- private IStructuredSelection currentSelection;
-
- /**
- * <p>
- * The default constructor. Creates a wizard with no selection, no model instance, and no
- * operation instance. The model and operation will be created as needed.
- * </p>
- */
- public J2EEArtifactExportWizard() {
- super();
- setWindowTitle(J2EEUIMessages.getResourceString("67"));//$NON-NLS-1$
- }
-
- /**
- * <p>
- * The model is used to prepopulate the wizard controls and interface with the operation.
- * </p>
- *
- * @param model
- * The model parameter is used to pre-populate wizard controls and interface with the
- * operation
- */
- public J2EEArtifactExportWizard(IDataModel model) {
- super(model);
- setWindowTitle(J2EEUIMessages.getResourceString("67"));//$NON-NLS-1$
- }
-
- /**
- * <p>
- * Invoked from init(IWorkbench, IStructuredSelection) once the workbench and selection have
- * been safely stored away.
- * </p>
- * <p>
- * No-op by default.
- * </p>
- */
- protected void doInit() {
- //init
- }
-
- /**
- * <p>
- * Invoked from {@link #dispose()}. Should be used to handle any specific Wizard disposal.
- * </p>
- */
- private void doDispose() {
- //dispose
- }
-
- /**
- * <p>
- * The selection is used to pre-populate values in the Wizard dialog controls.
- * </p>
- *
- * @see org.eclipse.ui.IWorkbenchWizard#init(org.eclipse.ui.IWorkbench,
- * org.eclipse.jface.viewers.IStructuredSelection)
- *
- * @param workbench
- * the current workbench parent of the wizard
- * @param aSelection
- * the selection from the view used to start the wizard (if any)
- */
- public final void init(IWorkbench workbench, IStructuredSelection selection) {
- setWindowTitle(J2EEUIMessages.getResourceString(J2EEUIMessages.EXPORT_WIZ_TITLE));
- this.currentSelection = selection;
-
-//TODO: enable selection defaults
-// if (this.currentSelection.size() > 0) {
-// Object element = this.currentSelection.getFirstElement();
-// IProject project = ProjectUtilities.getProject(element);
-// if (project != null) {
-// IDataModel m = getDataModel();
-// Object originalProjectName = m.getProperty(IJ2EEComponentExportDataModelProperties.COMPONENT_NAME);
-// m.setProperty(IJ2EEComponentExportDataModelProperties.COMPONENT_NAME, project.getName());
-// if (!m.validateProperty(IJ2EEComponentExportDataModelProperties.COMPONENT_NAME).isOK()) {
-// m.setProperty(IJ2EEComponentExportDataModelProperties.COMPONENT_NAME, originalProjectName);
-// }
-// }
-// }
- setNeedsProgressMonitor(true);
- doInit();
- }
-
- /**
- * <p>
- * Calls {@link #doDispose()}and then nulls out fields that are no longer needed once the
- * wizard completes.
- * </p>
- *
- * @see com.ibm.etools.j2ee.common.wizard.datamodel.WTPWizard#dispose()
- */
- @Override
- public final void dispose() {
- super.dispose();
- doDispose();
- this.currentSelection = null;
- }
-
- @Override
- protected final boolean prePerformFinish() {
- if (!CommonEditorUtility.promptToSaveAllDirtyEditors()) {
- return false;
- }
- if (CommonEditorUtility.getDirtyEditors().length != 0) { // all checkboxes were not selected
- return false;
- }
- return super.prePerformFinish();
- }
-
- /**
- * @return Returns the currentSelection.
- */
- protected final IStructuredSelection getSelection() {
- return currentSelection;
- }
-
- /**
- * @return
- */
- protected final J2EEExportPage getMainPage() {
- return (J2EEExportPage) getPage(MAIN_PG);
- }
-
-}
diff --git a/plugins/org.eclipse.jst.j2ee.ui/j2ee_ui/org/eclipse/jst/j2ee/internal/wizard/J2EEArtifactImportWizard.java b/plugins/org.eclipse.jst.j2ee.ui/j2ee_ui/org/eclipse/jst/j2ee/internal/wizard/J2EEArtifactImportWizard.java
deleted file mode 100644
index 39a1e62..0000000
--- a/plugins/org.eclipse.jst.j2ee.ui/j2ee_ui/org/eclipse/jst/j2ee/internal/wizard/J2EEArtifactImportWizard.java
+++ /dev/null
@@ -1,231 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2003, 2006 IBM Corporation and others.
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
- *
- * Contributors:
- * IBM Corporation - initial API and implementation
- *******************************************************************************/
-package org.eclipse.jst.j2ee.internal.wizard;
-
-import java.lang.reflect.InvocationTargetException;
-
-import org.eclipse.core.runtime.CoreException;
-import org.eclipse.core.runtime.IConfigurationElement;
-import org.eclipse.core.runtime.IExecutableExtension;
-import org.eclipse.jface.viewers.IStructuredSelection;
-import org.eclipse.jst.j2ee.internal.plugin.CommonEditorUtility;
-import org.eclipse.swt.widgets.Display;
-import org.eclipse.ui.IImportWizard;
-import org.eclipse.ui.IWorkbench;
-import org.eclipse.ui.wizards.newresource.BasicNewProjectResourceWizard;
-import org.eclipse.wst.common.frameworks.datamodel.IDataModel;
-import org.eclipse.wst.common.frameworks.internal.datamodel.ui.DataModelWizard;
-import org.eclipse.wst.web.internal.DelegateConfigurationElement;
-
-/**
- * <p>
- * Serves as a base class for Wizards which import J2EE artifact structures into Eclipse projects.
- * </p>
- * <p>
- * Subclasses must provide the methods that are required by
- * {@see org.eclipse.wst.common.frameworks.internal.ui.WTPWizard}.
- * </p>
- * <p>
- * Optionally, subclasses may also override the following methods:
- * <ul>
- * <li>{@link #getFinalPerspectiveID()}
- * <li>{@link #doInit()()}
- * <li>{@link #doDispose()()}
- * </ul>
- * </p>
- * <p>
- * The base class will ensure that the Wizard is not spawned unless all open editors are in a
- * non-dirty state. Additionally, the selection from the active view which spanwed the wizard will
- * be made available to subclasses via {@link #getCurrentSelection()}.
- * </p>
- */
-public abstract class J2EEArtifactImportWizard extends DataModelWizard implements IImportWizard, IExecutableExtension {
-
- /**
- * <p>
- * Constant used to identify the key of the main page of the Wizard.
- * </p>
- */
- protected static final String MAIN_PG = "main"; //$NON-NLS-1$
-
- private IConfigurationElement configurationElement;
- private IStructuredSelection selection;
-
- /**
- * <p>
- * The default constructor. Creates a wizard with no selection, no model instance, and no
- * operation instance. The model and operation will be created as needed.
- * </p>
- */
- public J2EEArtifactImportWizard() {
- super();
- }
-
- /**
- * <p>
- * The model is used to prepopulate the wizard controls and interface with the operation.
- * </p>
- *
- * @param model
- * The model parameter is used to pre-populate wizard controls and interface with the
- * operation
- */
- public J2EEArtifactImportWizard(IDataModel model) {
- super(model);
- }
-
- /**
- * <p>
- * The selection is used to pre-populate values in the Wizard dialog controls.
- * </p>
- *
- * @see org.eclipse.ui.IWorkbenchWizard#init(org.eclipse.ui.IWorkbench,
- * org.eclipse.jface.viewers.IStructuredSelection)
- *
- * @param workbench
- * the current workbench parent of the wizard
- * @param aSelection
- * the selection from the view used to start the wizard (if any)
- */
- public final void init(IWorkbench workbench, IStructuredSelection aSelection) {
- this.selection = aSelection;
- setNeedsProgressMonitor(true);
- doInit();
- }
-
- /**
- * <p>
- * Calls {@link #doDispose()}and then nulls out fields that are no longer needed once the
- * wizard completes.
- * </p>
- *
- * @see com.ibm.etools.j2ee.common.wizard.datamodel.WTPWizard#dispose()
- */
- @Override
- public final void dispose() {
- super.dispose();
- doDispose();
- this.selection = null;
- this.configurationElement = null;
- }
-
- /**
- * <p>
- * Invoked after the selection has been saved off in
- * {@link #init(IWorkbench, IStructuredSelection)}. Should be used to handle any specific
- * Wizard initialization.
- * </p>
- */
- protected void doInit() {
- // init
- }
-
- /**
- * <p>
- * Invoked from {@link #dispose()}. Should be used to handle any specific Wizard disposal.
- * </p>
- */
- protected void doDispose() {
- // dispose
- }
-
- /**
- * <p>
- * The return value of this method will be used to suggest a final perspective to the user once
- * the wizard completes.
- * </p>
- *
- * @return Returns the J2EE Perpsective ID by default
- */
- protected String getFinalPerspectiveID() {
- return null;
- }
-
- /**
- * <p>
- * Prompts the user to save open, dirty editors.
- * </p>
- *
- * @return true only if all editors are saved
- */
- @Override
- protected final boolean prePerformFinish() {
- if (!CommonEditorUtility.promptToSaveAllDirtyEditors()) {
- return false;
- }
- //Must have selected to not save, but should close all remaining
- CommonEditorUtility.closeAllEditors();
- return super.prePerformFinish();
- }
-
- /**
- * <p>
- * Invoked after the user has clicked the "Finish" button of the wizard. The default
- * implementation will attempt to update the final perspective to the value specified by
- * {@link #getFinalPerspectiveID() }
- * </p>
- *
- * @throws InvocationTargetException
- *
- * @see org.eclipse.wst.common.frameworks.internal.ui.wizard.WTPWizard#postPerformFinish()
- */
- @Override
- protected final void postPerformFinish() throws InvocationTargetException {
- super.postPerformFinish();
- if (getFinalPerspectiveID() != null && getFinalPerspectiveID().length() > 0) {
- final IConfigurationElement element = new DelegateConfigurationElement(configurationElement) {
- @Override
- public String getAttribute(String aName) {
- if (aName.equals("finalPerspective")) { //$NON-NLS-1$
- return getFinalPerspectiveID();
- }
- return super.getAttribute(aName);
- }
- };
- Display.getDefault().asyncExec(new Runnable() {
- public void run() {
- BasicNewProjectResourceWizard.updatePerspective(element);
- }
- });
- } else {
- Display.getDefault().asyncExec(new Runnable() {
- public void run() {
- BasicNewProjectResourceWizard.updatePerspective(configurationElement);
- }
- });
- }
- }
-
- /**
- * {@inheritDoc}
- *
- * <p>
- * The configuration element is saved to use when the wizard completes in order to change the
- * current perspective using either (1) the value specified by {@see #getFinalPerspectiveID()}
- * or (2) the value specified by the finalPerspective attribute in the Wizard's configuration
- * element.
- * </p>
- *
- * @see org.eclipse.core.runtime.IExecutableExtension#setInitializationData(org.eclipse.core.runtime.IConfigurationElement,
- * java.lang.String, java.lang.Object)
- */
- public final void setInitializationData(IConfigurationElement config, String propertyName, Object data) throws CoreException {
- this.configurationElement = config;
- }
-
- /**
- * @return Returns the selection.
- */
- protected final IStructuredSelection getSelection() {
- return selection;
- }
-
-}
diff --git a/plugins/org.eclipse.jst.j2ee.ui/j2ee_ui/org/eclipse/jst/j2ee/internal/wizard/J2EEComponentFacetCreationWizardPage.java b/plugins/org.eclipse.jst.j2ee.ui/j2ee_ui/org/eclipse/jst/j2ee/internal/wizard/J2EEComponentFacetCreationWizardPage.java
deleted file mode 100644
index af0b673..0000000
--- a/plugins/org.eclipse.jst.j2ee.ui/j2ee_ui/org/eclipse/jst/j2ee/internal/wizard/J2EEComponentFacetCreationWizardPage.java
+++ /dev/null
@@ -1,140 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2003, 2006 IBM Corporation and others.
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
- *
- * Contributors:
- * IBM Corporation - initial API and implementation
- *******************************************************************************/
-/*
- * Created on Nov 10, 2003
- *
- * To change the template for this generated file go to
- * Window>Preferences>Java>Code Generation>Code and Comments
- */
-package org.eclipse.jst.j2ee.internal.wizard;
-
-import java.util.ArrayList;
-import java.util.Arrays;
-import java.util.List;
-
-import org.eclipse.jface.dialogs.IDialogSettings;
-import org.eclipse.jst.j2ee.internal.plugin.J2EEUIPlugin;
-import org.eclipse.jst.j2ee.project.facet.IJ2EEFacetProjectCreationDataModelProperties;
-import org.eclipse.jst.j2ee.project.facet.IJ2EEModuleFacetInstallDataModelProperties;
-import org.eclipse.jst.j2ee.ui.project.facet.EarSelectionPanel;
-import org.eclipse.swt.widgets.Composite;
-import org.eclipse.wst.common.componentcore.datamodel.properties.IFacetProjectCreationDataModelProperties;
-import org.eclipse.wst.common.frameworks.datamodel.IDataModel;
-import org.eclipse.wst.common.project.facet.core.IFacetedProject;
-import org.eclipse.wst.common.project.facet.core.IFacetedProjectWorkingCopy;
-import org.eclipse.wst.common.project.facet.core.IProjectFacet;
-import org.eclipse.wst.common.project.facet.core.ProjectFacetsManager;
-import org.eclipse.wst.web.ui.internal.wizards.DataModelFacetCreationWizardPage;
-
-public abstract class J2EEComponentFacetCreationWizardPage extends DataModelFacetCreationWizardPage {
-
- private static final String STORE_LABEL = "LASTEARNAME_"; //$NON-NLS-1$
-
- protected EarSelectionPanel earPanel;
-
- private boolean shouldAddEARComposite = true;
-
-
-
- public J2EEComponentFacetCreationWizardPage(IDataModel dataModel, String pageName) {
- super(dataModel, pageName);
- }
-
- @Override
- protected Composite createTopLevelComposite(Composite parent) {
- final Composite top = super.createTopLevelComposite(parent);
- if(isShouldAddEARComposite()){
- createEarComposite(top);
- createWorkingSetGroupPanel(top, new String[] { RESOURCE_WORKING_SET, JAVA_WORKING_SET });
- }
- return top;
- }
-
- private void createEarComposite(Composite top)
- {
- final IFacetedProjectWorkingCopy fpjwc
- = (IFacetedProjectWorkingCopy) this.model.getProperty( FACETED_PROJECT_WORKING_COPY );
-
- final String moduleFacetId = getModuleFacetID();
- final IProjectFacet moduleFacet = ProjectFacetsManager.getProjectFacet( moduleFacetId );
- final IFacetedProject.Action action = fpjwc.getProjectFacetAction( moduleFacet );
-
- earPanel = new EarSelectionPanel( (IDataModel) action.getConfig(), top );
- }
-
- protected abstract String getModuleFacetID();
-
- @Override
- protected String getModuleTypeID() {
- return getModuleFacetID();
- }
-
- @Override
- public void dispose() {
- super.dispose();
- if (earPanel != null)
- earPanel.dispose();
- }
-
- @Override
- public void storeDefaultSettings() {
- super.storeDefaultSettings();
- IDialogSettings settings = getDialogSettings();
- if (settings != null) {
- FacetDataModelMap map = (FacetDataModelMap)model.getProperty(IFacetProjectCreationDataModelProperties.FACET_DM_MAP);
- String facetID = getModuleFacetID();
- IDataModel j2eeModel = map.getFacetDataModel(facetID);
- if(j2eeModel.getBooleanProperty(IJ2EEModuleFacetInstallDataModelProperties.ADD_TO_EAR)){
- String lastEARName = j2eeModel.getStringProperty(IJ2EEModuleFacetInstallDataModelProperties.EAR_PROJECT_NAME);
- settings.put(STORE_LABEL, lastEARName);
- }
- }
- }
-
- @Override
- public void restoreDefaultSettings() {
- super.restoreDefaultSettings();
- IDialogSettings settings = getDialogSettings();
- if (settings != null) {
- String lastEARName = settings.get(STORE_LABEL);
- if (lastEARName != null){
- FacetDataModelMap map = (FacetDataModelMap)model.getProperty(IFacetProjectCreationDataModelProperties.FACET_DM_MAP);
- String facetID = getModuleFacetID();
- IDataModel j2eeModel = map.getFacetDataModel(facetID);
- j2eeModel.setProperty(IJ2EEModuleFacetInstallDataModelProperties.LAST_EAR_NAME, lastEARName);
- }
- }
- }
-
- @Override
- protected IDialogSettings getDialogSettings() {
- return J2EEUIPlugin.getDefault().getDialogSettings();
- }
-
- @Override
- protected String[] getValidationPropertyNames() {
- String[] superProperties = super.getValidationPropertyNames();
- List list = Arrays.asList(superProperties);
- ArrayList arrayList = new ArrayList();
- arrayList.addAll( list );
- arrayList.add( IJ2EEFacetProjectCreationDataModelProperties.EAR_PROJECT_NAME );
- arrayList.add( IJ2EEFacetProjectCreationDataModelProperties.ADD_TO_EAR );
- return (String[])arrayList.toArray( new String[0] );
- }
-
- protected boolean isShouldAddEARComposite() {
- return shouldAddEARComposite;
- }
-
- protected void setShouldAddEARComposite(boolean shouldAddEARComposite) {
- this.shouldAddEARComposite = shouldAddEARComposite;
- }
-}
diff --git a/plugins/org.eclipse.jst.j2ee.ui/j2ee_ui/org/eclipse/jst/j2ee/internal/wizard/J2EEComponentImportWizard.java b/plugins/org.eclipse.jst.j2ee.ui/j2ee_ui/org/eclipse/jst/j2ee/internal/wizard/J2EEComponentImportWizard.java
deleted file mode 100644
index f685333..0000000
--- a/plugins/org.eclipse.jst.j2ee.ui/j2ee_ui/org/eclipse/jst/j2ee/internal/wizard/J2EEComponentImportWizard.java
+++ /dev/null
@@ -1,74 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2003, 2006 IBM Corporation and others.
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
- *
- * Contributors:
- * IBM Corporation - initial API and implementation
- *******************************************************************************/
-package org.eclipse.jst.j2ee.internal.wizard;
-
-import org.eclipse.jst.j2ee.internal.plugin.J2EEUIMessages;
-import org.eclipse.wst.common.frameworks.datamodel.IDataModel;
-
-/**
- * <p>
- * Serves as a base class for Wizards which import J2EE module structures into Eclipse projects.
- * </p>
- * <p>
- * Import wizards must define the following methods:
- * <ul>
- * <li>{@link #getImportOperation()}
- * <li>{@link #getModuleValidatorStrings()}
- * </ul>
- * </p>
- * <p>
- * And optionally, they may override the following methods from
- * {@see org.eclipse.jst.j2ee.internal.wizard.J2EEArtifactImportWizard}:
- * <ul>
- * <li>{@link #getFinalPerspectiveID()}
- * <li>{@link #doInit()()}
- * <li>{@link #doDispose()()}
- * </ul>
- */
-public abstract class J2EEComponentImportWizard extends J2EEArtifactImportWizard {
-
- /**
- * <p>
- * The default constructor. Creates a wizard with no selection, no model instance, and no
- * operation instance. The model and operation will be created as needed.
- * </p>
- */
- public J2EEComponentImportWizard() {
- super();
- setWindowTitle(J2EEUIMessages.getResourceString("38")); //$NON-NLS-1$
- }
-
- /**
- * <p>
- * The model is used to prepopulate the wizard controls and interface with the operation.
- * </p>
- *
- * @param model
- * The model parameter is used to pre-populate wizard controls and interface with the
- * operation
- */
- public J2EEComponentImportWizard(IDataModel model) {
- super(model);
- setWindowTitle(J2EEUIMessages.getResourceString("38"));//$NON-NLS-1$
- }
-
- /**
- * <p>
- * The Import Wizards can run arbitrary validators once the module has been created. These
- * validators ensure that the structure created by the Import operation and the contents of that
- * structure are valid. Any errors will be announced to the Problems view in Eclipse.
- * </p>
- *
- * @return An array of validator IDs that should be used for this module type
- */
- protected abstract String[] getModuleValidatorStrings();
-
-}
diff --git a/plugins/org.eclipse.jst.j2ee.ui/j2ee_ui/org/eclipse/jst/j2ee/internal/wizard/J2EEComponentLabelProvider.java b/plugins/org.eclipse.jst.j2ee.ui/j2ee_ui/org/eclipse/jst/j2ee/internal/wizard/J2EEComponentLabelProvider.java
deleted file mode 100644
index 99e1cd8..0000000
--- a/plugins/org.eclipse.jst.j2ee.ui/j2ee_ui/org/eclipse/jst/j2ee/internal/wizard/J2EEComponentLabelProvider.java
+++ /dev/null
@@ -1,62 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2005, 2009 IBM Corporation and others.
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
- *
- * Contributors:
- * IBM Corporation - initial API and implementation
- * Milen Manov, milen.manov@sap.com - bugs 248623
- *******************************************************************************/
-package org.eclipse.jst.j2ee.internal.wizard;
-
-import org.eclipse.jface.viewers.ILabelProviderListener;
-import org.eclipse.jface.viewers.ITableLabelProvider;
-import org.eclipse.jface.viewers.LabelProvider;
-import org.eclipse.jface.viewers.LabelProviderChangedEvent;
-import org.eclipse.swt.graphics.Image;
-
-public class J2EEComponentLabelProvider extends LabelProvider {
-
- ITableLabelProvider tableLableProvider;
-
- private J2EEComponentLabelProvider instance;
-
- public J2EEComponentLabelProvider(ITableLabelProvider tableLableProvider){
- this.tableLableProvider = tableLableProvider;
- instance = this;
- tableLableProvider.addListener(new ILabelProviderListener(){
- public void labelProviderChanged(LabelProviderChangedEvent event) {
- LabelProviderChangedEvent newEvent = new LabelProviderChangedEvent(instance);
- fireLabelProviderChanged(newEvent);
- }
- });
- }
- /* (non-Javadoc)
- * @see org.eclipse.jface.viewers.ILabelProvider#getImage(java.lang.Object)
- */
- @Override
- public Image getImage(Object element) {
- return tableLableProvider.getColumnImage(element, 1);
- }
-
- /* (non-Javadoc)
- * @see org.eclipse.jface.viewers.ILabelProvider#getText(java.lang.Object)
- */
- @Override
- public String getText(Object element) {
- return tableLableProvider.getColumnText(element, 1);
-// if(element instanceof IVirtualComponent){
-// IVirtualComponent comp = (IVirtualComponent)element;
-// return comp.getProject().getName();
-// }
-//
-// if (element instanceof IProject) {
-// IProject handle = (IProject)element;
-// return handle.getName();
-// }
-// return null;
- }
-
-}
diff --git a/plugins/org.eclipse.jst.j2ee.ui/j2ee_ui/org/eclipse/jst/j2ee/internal/wizard/J2EEExportPage.java b/plugins/org.eclipse.jst.j2ee.ui/j2ee_ui/org/eclipse/jst/j2ee/internal/wizard/J2EEExportPage.java
deleted file mode 100644
index 01df3cd..0000000
--- a/plugins/org.eclipse.jst.j2ee.ui/j2ee_ui/org/eclipse/jst/j2ee/internal/wizard/J2EEExportPage.java
+++ /dev/null
@@ -1,575 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2003, 2006 IBM Corporation and others.
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
- *
- * Contributors:
- * IBM Corporation - initial API and implementation
- * David Schneider, david.schneider@unisys.com - [142500] WTP properties pages fonts don't follow Eclipse preferences
- *******************************************************************************/
-/*
- * Created on Dec 3, 2003
- *
- * To change the template for this generated file go to
- * Window>Preferences>Java>Code Generation>Code and Comments
- */
-package org.eclipse.jst.j2ee.internal.wizard;
-
-import java.util.ArrayList;
-import java.util.Iterator;
-import java.util.List;
-
-import org.eclipse.core.resources.IProject;
-import org.eclipse.core.resources.IResource;
-import org.eclipse.emf.ecore.EObject;
-import org.eclipse.jem.util.emf.workbench.ProjectUtilities;
-import org.eclipse.jface.dialogs.Dialog;
-import org.eclipse.jface.dialogs.IDialogSettings;
-import org.eclipse.jface.viewers.IStructuredSelection;
-import org.eclipse.jst.j2ee.datamodel.properties.IJ2EEComponentExportDataModelProperties;
-import org.eclipse.jst.j2ee.datamodel.properties.IJ2EEComponentExportDataModelProperties.IArchiveExportParticipantData;
-import org.eclipse.jst.j2ee.internal.plugin.J2EEUIMessages;
-import org.eclipse.jst.j2ee.internal.plugin.J2EEUIPlugin;
-import org.eclipse.jst.j2ee.project.EarUtilities;
-import org.eclipse.jst.j2ee.ui.archive.IArchiveExportParticipantPanelFactory;
-import org.eclipse.jst.j2ee.ui.archive.internal.ArchiveExportParticipantPanelsExtensionPoint;
-import org.eclipse.swt.SWT;
-import org.eclipse.swt.events.SelectionAdapter;
-import org.eclipse.swt.events.SelectionEvent;
-import org.eclipse.swt.layout.GridData;
-import org.eclipse.swt.layout.GridLayout;
-import org.eclipse.swt.widgets.Button;
-import org.eclipse.swt.widgets.Combo;
-import org.eclipse.swt.widgets.Composite;
-import org.eclipse.swt.widgets.Control;
-import org.eclipse.swt.widgets.FileDialog;
-import org.eclipse.swt.widgets.Group;
-import org.eclipse.swt.widgets.Label;
-import org.eclipse.wst.common.frameworks.datamodel.DataModelEvent;
-import org.eclipse.wst.common.frameworks.datamodel.DataModelPropertyDescriptor;
-import org.eclipse.wst.common.frameworks.datamodel.IDataModel;
-import org.eclipse.wst.common.frameworks.datamodel.IDataModelListener;
-import org.eclipse.wst.common.frameworks.internal.datamodel.ui.DataModelWizardPage;
-
-/**
- * @author cbridgha
- *
- * To change the template for this generated type comment go to Window>Preferences>Java>Code
- * Generation>Code and Comments
- */
-public abstract class J2EEExportPage extends DataModelWizardPage {
-
- public static boolean isWindows = SWT.getPlatform().toLowerCase().startsWith("win"); //$NON-NLS-1$
-
- protected IStructuredSelection currentResourceSelection;
- private static final int SIZING_TEXT_FIELD_WIDTH = 305;
- protected static final String STORE_LABEL = "J2EE_EXPORT_"; //$NON-NLS-1$
- protected static final String OVERWRITE_LABEL = "OVERWRITE"; //$NON-NLS-1$
- protected static final String SOURCE_LABEL = "SOURCE"; //$NON-NLS-1$
- protected static final String defBrowseButtonLabel = J2EEUIMessages.getResourceString(J2EEUIMessages.BROWSE_LABEL);
- protected String LABEL_DESTINATION = J2EEUIMessages.getResourceString(J2EEUIMessages.J2EE_EXPORT_DESTINATION);
- protected String LABEL_RUNTIME = J2EEUIMessages.getResourceString(J2EEUIMessages.J2EE_EXPORT_RUNTIME);
- private Combo resourceNameCombo;
- private Combo destinationNameCombo;
- private Button optimizeForRuntimeCheckbox;
- private Combo runtimeNameCombo;
- private Button destinationBrowseButton;
- protected Button overwriteExistingFilesCheckbox;
- private Button sourceFilesCheckbox;
-
- /**
- * @param model
- * @param pageName
- */
- public J2EEExportPage(IDataModel model, String pageName, IStructuredSelection selection) {
- super(model, pageName);
- currentResourceSelection = selection;
- Object element = currentResourceSelection.getFirstElement();
- IProject project = ProjectUtilities.getProject(element);
- if (project != null) {
- String projectName = project.getName();
- DataModelPropertyDescriptor [] validProjectNames = model.getValidPropertyDescriptors(IJ2EEComponentExportDataModelProperties.PROJECT_NAME);
- boolean projectNameSet = false;
- for(int i=0;i<validProjectNames.length && !projectNameSet; i++){
- if(projectName.equals(validProjectNames[i].getPropertyDescription())){
- projectNameSet = true;
- model.setProperty(IJ2EEComponentExportDataModelProperties.PROJECT_NAME, projectName);
- }
- }
- if(!projectNameSet && validProjectNames.length > 0){
- //if export dialog is invoked by selecting a non EAR project, get the corresponding EAR
- IProject[] earProjects = EarUtilities.getReferencingEARProjects(project);
- if( earProjects.length > 0 ){
- model.setProperty(IJ2EEComponentExportDataModelProperties.PROJECT_NAME, earProjects[0].getName());
- }else
- model.setProperty(IJ2EEComponentExportDataModelProperties.PROJECT_NAME, validProjectNames[0].getPropertyDescription());
- }
- }
- }
-
- /*
- * (non-Javadoc)
- *
- * @see org.eclipse.wst.common.frameworks.internal.ui.wizard.WTPWizardPage#getValidationPropertyNames()
- */
- @Override
- protected String[] getValidationPropertyNames() {
- return null;
- }
-
- /*
- * (non-Javadoc)
- *
- * @see org.eclipse.wst.common.frameworks.internal.ui.wizard.WTPWizardPage#createTopLevelComposite(org.eclipse.swt.widgets.Composite)
- */
- @Override
- protected Composite createTopLevelComposite(Composite parent) {
-
- Composite composite = new Composite(parent, SWT.NULL);
- //WorkbenchHelp.setHelp(composite, getInfopopID());
- GridLayout layout = new GridLayout(1, false);
- composite.setLayout(layout);
-
- createSourceAndDestinationGroup(composite);
- createRuntimeGroup(composite);
- createOptionsGroup(composite);
-
- //setupBasedOnInitialSelections();
- setupInfopop(composite);
- restoreWidgetValues();
- Dialog.applyDialogFont(parent);
- return composite;
- }
-
- /**
- * @param composite
- */
- private void createSourceAndDestinationGroup(Composite parent) {
-
- Composite composite = new Composite(parent, SWT.NULL);
- GridLayout layout = new GridLayout(3, false);
- composite.setLayout(layout);
- GridData data = new GridData(GridData.FILL_HORIZONTAL);
- composite.setLayoutData(data);
- createExportComponentGroup(composite);
- createDestinationGroup(composite);
-
- }
- /**
- * Creates the export source resource specification widgets.
- *
- * @param parent
- * a <code>Composite</code> that is to be used as the parent of this group's
- * collection of visual components
- * @see org.eclipse.swt.widgets.Composite
- */
- protected void createExportComponentGroup(Composite parent) {
-
- //Project label
- Label projectLabel = new Label(parent, SWT.NONE);
- projectLabel.setText(getComponentLabel());
- //Project combo
- resourceNameCombo = new Combo(parent, SWT.SINGLE | SWT.BORDER);
- GridData data = new GridData(GridData.FILL_HORIZONTAL);
- data.widthHint = SIZING_TEXT_FIELD_WIDTH;
- resourceNameCombo.setLayoutData(data);
- synchHelper.synchCombo(resourceNameCombo, IJ2EEComponentExportDataModelProperties.PROJECT_NAME, null);
-
-
- new Label(parent, SWT.NONE);//Pad label
- }
-
- /**
- * @return
- */
- protected abstract String getComponentLabel();
-
- protected void createDestinationGroup(org.eclipse.swt.widgets.Composite parent) {
-
- //Destination label
- Label destinationLabel = new Label(parent, SWT.NONE);
- destinationLabel.setText(LABEL_DESTINATION);
- // destination name combo field
- destinationNameCombo = new Combo(parent, SWT.SINGLE | SWT.BORDER);
- destinationNameCombo.setLayoutData(new GridData(GridData.FILL_HORIZONTAL));
- synchHelper.synchCombo(destinationNameCombo, IJ2EEComponentExportDataModelProperties.ARCHIVE_DESTINATION, null);
-
- // destination browse button
- destinationBrowseButton = new Button(parent, SWT.PUSH);
- destinationBrowseButton.setText(defBrowseButtonLabel);
- // bug 290709
-// destinationBrowseButton.setLayoutData((new GridData(GridData.FILL_HORIZONTAL)));
- destinationBrowseButton.addSelectionListener(new SelectionAdapter() {
- @Override
- public void widgetSelected(SelectionEvent e) {
- handleDestinationBrowseButtonPressed();
- }
- });
- destinationBrowseButton.setEnabled(true);
-
- }
-
- protected void createRuntimeGroup( final Composite parent )
- {
- final Group group = new Group( parent, SWT.NONE );
- group.setLayoutData( new GridData( GridData.FILL_HORIZONTAL ) );
- group.setLayout( new GridLayout( 1, false ) );
- group.setText( LABEL_RUNTIME );
-
- this.optimizeForRuntimeCheckbox = new Button( group, SWT.CHECK );
- this.optimizeForRuntimeCheckbox.setText( J2EEWizardNLS.J2EEExportPage_Optimize_for_a_specific_server_runt_ );
- this.synchHelper.synchCheckbox( this.optimizeForRuntimeCheckbox, IJ2EEComponentExportDataModelProperties.OPTIMIZE_FOR_SPECIFIC_RUNTIME, null );
-
- final GridData gd = new GridData();
- gd.verticalIndent = 2;
-
- this.optimizeForRuntimeCheckbox.setLayoutData( gd );
-
- this.runtimeNameCombo = new Combo( group, SWT.READ_ONLY | SWT.SINGLE | SWT.BORDER );
- this.runtimeNameCombo.setLayoutData( new GridData( GridData.FILL_HORIZONTAL ) );
- this.synchHelper.synchCombo( this.runtimeNameCombo, IJ2EEComponentExportDataModelProperties.RUNTIME, null );
-
- final Composite extComposite = new EnhancedComposite( group, SWT.NONE );
- extComposite.setLayoutData( new GridData( GridData.FILL_HORIZONTAL ) );
-
- final GridLayout layout = new GridLayout( 1, false );
- layout.marginWidth = 10;
- layout.marginHeight = 1;
-
- extComposite.setLayout( layout );
-
- getDataModel().addListener
- (
- new IDataModelListener()
- {
- public void propertyChanged( final DataModelEvent event )
- {
- if( event.getPropertyName().equals( IJ2EEComponentExportDataModelProperties.RUNTIME ) &&
- event.getFlag() == IDataModel.VALUE_CHG )
- {
- refreshExtensionsComposite( extComposite, true );
- }
- else if( event.getPropertyName().equals( IJ2EEComponentExportDataModelProperties.OPTIMIZE_FOR_SPECIFIC_RUNTIME ) &&
- event.getFlag() == IDataModel.VALUE_CHG )
- {
- final boolean optimize = ( (Boolean) event.getProperty() ).booleanValue();
- extComposite.setEnabled( optimize );
- }
- }
- }
- );
-
- refreshExtensionsComposite( extComposite, false );
- }
-
- private void refreshExtensionsComposite( final Composite extComposite, boolean forceRefresh )
- {
- for( Control child : extComposite.getChildren() )
- {
- child.dispose();
- }
-
- final List<IArchiveExportParticipantData> extensions
- = (List<IArchiveExportParticipantData>) getDataModel().getProperty( IJ2EEComponentExportDataModelProperties.RUNTIME_SPECIFIC_PARTICIPANTS );
-
- if( extensions != null )
- {
- Composite innerComposite = null;
-
- for( IArchiveExportParticipantData extension : extensions )
- {
- final String id = extension.getId();
-
- final ArchiveExportParticipantPanelsExtensionPoint.PanelFactoryInfo panelExtInfo
- = ArchiveExportParticipantPanelsExtensionPoint.getExtension( id );
-
- if( panelExtInfo != null )
- {
- final IArchiveExportParticipantPanelFactory panelFactory = panelExtInfo.loadPanelFactory();
-
- if( panelFactory != null )
- {
- if( innerComposite == null )
- {
- innerComposite = new EnhancedComposite( extComposite, SWT.NONE );
- innerComposite.setLayoutData( new GridData( GridData.FILL_BOTH ) );
-
- final GridLayout innerCompositeLayout = new GridLayout( 1, false );
- innerCompositeLayout.marginWidth = 0;
- innerCompositeLayout.marginHeight = 0;
-
- innerComposite.setLayout( innerCompositeLayout );
- }
-
- try
- {
- panelFactory.createPanel( innerComposite, extension.getDataModel() );
- }
- catch( Exception e )
- {
- J2EEUIPlugin.logError( -1, e.getMessage(), e );
- }
- }
- }
- }
- }
-
- if (forceRefresh) {
- extComposite.getShell().layout( true, true );
- }
- }
-
- /**
- * Create the export options specification widgets.
- *
- * @param parent
- * org.eclipse.swt.widgets.Composite
- */
- protected void createOptionsGroup(Composite parent) {
-
- // options group
- Composite optionsGroup = new Composite(parent, SWT.NULL);
- GridLayout layout = new GridLayout(1, false);
- optionsGroup.setLayout(layout);
-
-
- // source files... checkbox
- createSourceFilesCheckbox(optionsGroup);
-
- // overwrite... checkbox
- createOverwriteExistingFilesCheckbox(optionsGroup);
-
- // advanced button
- if (shouldShowProjectFilesCheckbox()) {
- createProjectFilesCheckbox(optionsGroup);
- }
- }
-
- protected void createOverwriteExistingFilesCheckbox(Composite optionsGroup) {
- //Overwrite checkbox
- overwriteExistingFilesCheckbox = new Button(optionsGroup, SWT.CHECK | SWT.LEFT);
- overwriteExistingFilesCheckbox.setText(J2EEUIMessages.getResourceString(J2EEUIMessages.J2EE_EXPORT_OVERWRITE_CHECKBOX));
- overwriteExistingFilesCheckbox.setEnabled(true);
- synchHelper.synchCheckbox(overwriteExistingFilesCheckbox, IJ2EEComponentExportDataModelProperties.OVERWRITE_EXISTING, null);
- }
-
- protected void createSourceFilesCheckbox(Composite optionsGroup) {
- sourceFilesCheckbox = new Button(optionsGroup, SWT.CHECK | SWT.LEFT);
- sourceFilesCheckbox.setText(J2EEUIMessages.getResourceString(J2EEUIMessages.J2EE_EXPORT_SOURCE_CHECKBOX));
- synchHelper.synchCheckbox(sourceFilesCheckbox, IJ2EEComponentExportDataModelProperties.EXPORT_SOURCE_FILES, null);
- }
-
- /**
- * @return
- */
- protected boolean shouldShowProjectFilesCheckbox() {
- return false;
- }
-
- protected void createProjectFilesCheckbox(Composite composite) {
- //do nothing
- }
-
- /**
- * Populates the resource name field based upon the currently-selected resources.
- */
- protected void setupBasedOnInitialSelections() {
-
- if (currentResourceSelection.isEmpty() || setupBasedOnRefObjectSelection())
- return; // no setup needed
-
- java.util.List selections = new ArrayList();
- Iterator aenum = currentResourceSelection.iterator();
- while (aenum.hasNext()) {
- IResource currentResource = (IResource) aenum.next();
- // do not add inaccessible elements
- if (currentResource.isAccessible())
- selections.add(currentResource);
- }
- if (selections.isEmpty())
- return; // setup not needed anymore
-
-// int selectedResourceCount = selections.size();
-//TODO: find a way to select an existing component
-// if (selectedResourceCount == 1) {
-// IResource resource = (IResource) selections.get(0);
-// if ((resource instanceof IProject) && checkForNature((IProject) resource)) {
-// resourceNameCombo.setText(resource.getName().toString());
-// }
-// }
- }
-
- /**
- * @return
- */
- protected String getProjectImportLabel() {
- return null;
- }
-
- /**
- *
- */
- protected void handleDestinationBrowseButtonPressed() {
-
- FileDialog dialog = new FileDialog(destinationNameCombo.getShell(), SWT.SAVE);
- String fileName = getDataModel().getStringProperty(IJ2EEComponentExportDataModelProperties.PROJECT_NAME);
- String[] filters = getFilterExpression();
- if (!isWindows) {
- if (filters.length != 0 && filters[0] != null && filters[0].indexOf('.') != -1) {
- fileName += filters[0].substring(filters[0].indexOf('.'));
- }
- }
- dialog.setFileName(fileName);
- if (isWindows) {
- dialog.setFilterExtensions(filters);
- }
- String filename = dialog.open();
- if (filename != null)
- destinationNameCombo.setText(filename);
- }
-
- protected void restoreWidgetValues() {
-
- IDialogSettings settings = getDialogSettings();
- if (settings != null) {
- String[] sourceNames = settings.getArray(STORE_LABEL + getFileNamesStoreID());
- if (sourceNames == null)
- return; // ie.- no settings stored
- for (int i = 0; i < sourceNames.length; i++) {
- if (sourceNames[i] == null)
- sourceNames[i] = ""; //$NON-NLS-1$
- }
- destinationNameCombo.setItems(sourceNames);
- boolean overwrite = settings.getBoolean(STORE_LABEL + OVERWRITE_LABEL);
- model.setBooleanProperty(IJ2EEComponentExportDataModelProperties.OVERWRITE_EXISTING, overwrite);
- boolean includeSource = settings.getBoolean(STORE_LABEL + SOURCE_LABEL);
- model.setBooleanProperty(IJ2EEComponentExportDataModelProperties.EXPORT_SOURCE_FILES, includeSource);
- }
- }
-
- @Override
- public void storeDefaultSettings() {
- IDialogSettings settings = getDialogSettings();
- if (settings != null) {
- // update source names history
- String[] sourceNames = settings.getArray(STORE_LABEL + getFileNamesStoreID());
- if (sourceNames == null) {
- sourceNames = new String[0];
- }
-
- String newName = destinationNameCombo.getText();
-
- //rip out any empty filenames and trim length to 5
- ArrayList newNames = new ArrayList();
- for (int i = 0; i < sourceNames.length && i < 5; i++) {
- if (sourceNames[i].trim().length() > 0 && !newName.equals(sourceNames[i])) {
- newNames.add(sourceNames[i]);
- }
- }
- newNames.add(0, destinationNameCombo.getText());
- sourceNames = new String[newNames.size()];
- newNames.toArray(sourceNames);
-
- settings.put(STORE_LABEL + getFileNamesStoreID(), sourceNames);
- settings.put(STORE_LABEL + OVERWRITE_LABEL, model.getBooleanProperty(IJ2EEComponentExportDataModelProperties.OVERWRITE_EXISTING));
- settings.put(STORE_LABEL + SOURCE_LABEL, model.getBooleanProperty(IJ2EEComponentExportDataModelProperties.EXPORT_SOURCE_FILES));
- }
- }
-
- /**
- * @return
- */
- protected String getFileNamesStoreID() {
- return getComponentID();
- }
-
- @Deprecated
- protected String getCompnentID() {
- return null;
- }
-
- protected String getComponentID() {
- return getCompnentID();
- }
-
- /**
- * @return
- */
- protected String[] getFilterExpression() {
- return new String[0];
- }
-
- /*
- * (non-Javadoc)
- *
- * @see org.eclipse.wst.common.frameworks.internal.ui.wizard.WTPWizardPage#enter()
- */
- @Override
- protected void enter() {
- super.enter();
- restoreWidgetValues();
- }
-
- /**
- * @return
- */
- //protected abstract String getNatureID();
-
- protected abstract boolean isMetaTypeSupported(Object o);
-
- /**
- * Populates the resource name field based upon the currently-selected resources.
- */
- protected boolean setupBasedOnRefObjectSelection() {
-
- if (currentResourceSelection.size() != 1)
- return false;
-
- Object o = currentResourceSelection.getFirstElement();
- if (!isMetaTypeSupported(o))
- return false;
-
- EObject ref = (EObject) o;
- IResource resource = ProjectUtilities.getProject(ref);
- if (resource != null) {
- resourceNameCombo.setText(resource.getName().toString());
- }
- return true;
- }
-
- /*
- * (non-Javadoc)
- *
- * @see org.eclipse.jface.wizard.WizardPage#getDialogSettings()
- */
- @Override
- protected IDialogSettings getDialogSettings() {
- return J2EEUIPlugin.getDefault().getDialogSettings();
- }
-
- private static class EnhancedComposite
-
- extends Composite
-
- {
- public EnhancedComposite( final Composite parent,
- final int style )
- {
- super( parent, style );
- }
-
- @Override
- public void setEnabled( boolean enabled )
- {
- super.setEnabled( enabled );
-
- for( Control child : getChildren() )
- {
- child.setEnabled( enabled );
- }
- }
- }
-
-}
diff --git a/plugins/org.eclipse.jst.j2ee.ui/j2ee_ui/org/eclipse/jst/j2ee/internal/wizard/J2EEImportPage.java b/plugins/org.eclipse.jst.j2ee.ui/j2ee_ui/org/eclipse/jst/j2ee/internal/wizard/J2EEImportPage.java
deleted file mode 100644
index f21049d..0000000
--- a/plugins/org.eclipse.jst.j2ee.ui/j2ee_ui/org/eclipse/jst/j2ee/internal/wizard/J2EEImportPage.java
+++ /dev/null
@@ -1,290 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2003, 2006 IBM Corporation and others.
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
- *
- * Contributors:
- * IBM Corporation - initial API and implementation
- * David Schneider, david.schneider@unisys.com - [142500] WTP properties pages fonts don't follow Eclipse preferences
- *******************************************************************************/
-package org.eclipse.jst.j2ee.internal.wizard;
-
-import java.util.ArrayList;
-
-import org.eclipse.jem.util.emf.workbench.ProjectUtilities;
-import org.eclipse.jface.dialogs.Dialog;
-import org.eclipse.jface.dialogs.IDialogSettings;
-import org.eclipse.jst.j2ee.datamodel.properties.IJ2EEComponentImportDataModelProperties;
-import org.eclipse.jst.j2ee.internal.plugin.J2EEUIMessages;
-import org.eclipse.jst.j2ee.internal.plugin.J2EEUIPlugin;
-import org.eclipse.swt.SWT;
-import org.eclipse.swt.events.SelectionAdapter;
-import org.eclipse.swt.events.SelectionEvent;
-import org.eclipse.swt.layout.GridData;
-import org.eclipse.swt.layout.GridLayout;
-import org.eclipse.swt.widgets.Button;
-import org.eclipse.swt.widgets.Combo;
-import org.eclipse.swt.widgets.Composite;
-import org.eclipse.swt.widgets.Control;
-import org.eclipse.swt.widgets.FileDialog;
-import org.eclipse.swt.widgets.Label;
-import org.eclipse.swt.widgets.Shell;
-import org.eclipse.wst.common.componentcore.datamodel.properties.IFacetProjectCreationDataModelProperties;
-import org.eclipse.wst.common.frameworks.datamodel.DataModelPropertyDescriptor;
-import org.eclipse.wst.common.frameworks.datamodel.IDataModel;
-import org.eclipse.wst.common.frameworks.internal.datamodel.ui.DataModelWizardPage;
-import org.eclipse.wst.server.ui.ServerUIUtil;
-import org.eclipse.wst.web.ui.internal.wizards.DataModelFacetCreationWizardPage;
-
-public abstract class J2EEImportPage extends DataModelWizardPage {
-
- private Combo componentCombo;
- private Combo fileNameCombo;
- private static final String STORE_LABEL = "J2EE_IMPORT_"; //$NON-NLS-1$
- private static final int SIZING_TEXT_FIELD_WIDTH = 305;
- protected static final String defBrowseButtonLabel = J2EEUIMessages.getResourceString(J2EEUIMessages.BROWSE_LABEL);
-
- /**
- * @param model
- * @param pageName
- */
- public J2EEImportPage(IDataModel model, String pageName) {
- super(model, pageName);
- }
-
- /*
- * (non-Javadoc)
- *
- * @see org.eclipse.wst.common.frameworks.internal.ui.wizard.WTPWizardPage#getValidationPropertyNames()
- */
- @Override
- protected String[] getValidationPropertyNames() {
- return null;
- }
-
- /*
- * (non-Javadoc)
- *
- * @see org.eclipse.wst.common.frameworks.internal.ui.wizard.WTPWizardPage#createTopLevelComposite(org.eclipse.swt.widgets.Composite)
- */
- @Override
- protected Composite createTopLevelComposite(Composite parent) {
- Composite composite = new Composite(parent, SWT.NULL);
- GridLayout layout = new GridLayout(3, false);
- composite.setLayout(layout);
- createFileNameComposite(composite);
- createProjectNameComposite(composite);
- restoreWidgetValues();
- Dialog.applyDialogFont(parent);
- return composite;
- }
-
- /**
- * @param composite
- */
- protected void createProjectNameComposite(Composite parent) {
-// if (FlexibleJavaProjectPreferenceUtil.getMultipleModulesPerProjectProp()) {
-// new NewModuleDataModelGroup(parent, getDataModel(), synchHelper);
-// } else {
- Label componentLabel = new Label(parent, SWT.NONE);
-
- componentLabel.setText(getProjectImportLabel());
- componentLabel.setLayoutData(new GridData(GridData.HORIZONTAL_ALIGN_BEGINNING));
-
- // setting up combo
- componentCombo = new Combo(parent, SWT.SINGLE | SWT.BORDER);
- GridData data = new GridData(GridData.FILL_HORIZONTAL);
- data.widthHint = SIZING_TEXT_FIELD_WIDTH;
- componentCombo.setLayoutData(data);
-
- // // setting up button
- // Button newProjectButton = new Button(parent, SWT.PUSH);
- // newProjectButton.setText(defNewButtonLabel); //$NON-NLS-1$
- // newProjectButton.setLayoutData((new GridData(GridData.FILL_HORIZONTAL)));
- // newProjectButton.addSelectionListener(new SelectionAdapter() {
- // public void widgetSelected(SelectionEvent e) {
- // // handleNewProjectButtonPressed();
- // }
- // });
- // newProjectButton.setEnabled(true);
- synchHelper.synchCombo(componentCombo, IJ2EEComponentImportDataModelProperties.PROJECT_NAME, new Control[]{componentLabel});
- new Label(parent, SWT.NULL);
- createServerTargetComposite(parent);
- //}
- }
-
-
-
- protected void createServerTargetComposite(Composite parent) {
- Label label = new Label(parent, SWT.NONE);
- label.setText(J2EEUIMessages.getResourceString(J2EEUIMessages.TARGET_RUNTIME_LBL));
- Combo serverTargetCombo = new Combo(parent, SWT.BORDER | SWT.READ_ONLY);
- serverTargetCombo.setLayoutData(new GridData(GridData.FILL_HORIZONTAL));
- Button newServerTargetButton = new Button(parent, SWT.NONE);
- newServerTargetButton.setText(J2EEUIMessages.getResourceString(J2EEUIMessages.NEW_THREE_DOTS_E));
- newServerTargetButton.setLayoutData(new GridData(GridData.FILL_HORIZONTAL));
- newServerTargetButton.addSelectionListener(new SelectionAdapter() {
- @Override
- public void widgetSelected(SelectionEvent e) {
- //FlexibleProjectCreationWizardPage.launchNewRuntimeWizard(getShell(), model);
- launchNewRuntimeWizard(getShell(), model);
- }
- });
- Control[] deps = new Control[]{label, newServerTargetButton};
- synchHelper.synchCombo(serverTargetCombo, IFacetProjectCreationDataModelProperties.FACET_RUNTIME, deps);
- }
-
- @Override
- protected IDialogSettings getDialogSettings() {
- return J2EEUIPlugin.getDefault().getDialogSettings();
- }
-
- protected String getProjectImportLabel() {
- return null;
- }
-
- /**
- * @param composite
- */
- protected void createFileNameComposite(Composite parent) {
- Label fileLabel = new Label(parent, SWT.NONE);
- fileLabel.setText(getFileImportLabel());
-
- // setup combo
- fileNameCombo = new Combo(parent, SWT.SINGLE | SWT.BORDER);
- fileNameCombo.setLayoutData((new GridData(GridData.FILL_HORIZONTAL)));
-
- // setup browse button
- Button browseButton = new Button(parent, SWT.PUSH);
- browseButton.setText(defBrowseButtonLabel);
- browseButton.setLayoutData((new GridData(GridData.HORIZONTAL_ALIGN_END)));
- browseButton.addSelectionListener(new SelectionAdapter() {
- @Override
- public void widgetSelected(SelectionEvent e) {
- handleFileBrowseButtonPressed();
- }
- });
- browseButton.setEnabled(true);
-
- synchHelper.synchCombo(fileNameCombo, IJ2EEComponentImportDataModelProperties.FILE_NAME, new Control[]{fileLabel, browseButton});
- }
-
- /**
- *
- */
- protected void handleFileBrowseButtonPressed() {
-
- FileDialog dialog = new FileDialog(fileNameCombo.getShell());
- dialog.setFilterExtensions(getFilterExpression());
- String filename = dialog.open();
- if (filename != null)
- model.setProperty(IJ2EEComponentImportDataModelProperties.FILE_NAME, filename);
- }
-
- /**
- * @return
- */
- protected String[] getFilterExpression() {
- return new String[0];
- }
-
- protected void restoreWidgetValues() {
-
- IDialogSettings settings = getDialogSettings();
- if (settings != null) {
- String[] sourceNames = settings.getArray(STORE_LABEL + getFileNamesStoreID());
- if (sourceNames == null)
- return; // ie.- no settings stored
- for (int i = 0; i < sourceNames.length; i++) {
- if (sourceNames[i] == null)
- sourceNames[i] = ""; //$NON-NLS-1$
- }
- fileNameCombo.setItems(sourceNames);
- }
- }
-
- @Override
- public void storeDefaultSettings() {
- IDialogSettings settings = getDialogSettings();
- if (settings != null) {
- // update source names history
- String[] sourceNames = settings.getArray(STORE_LABEL + getFileNamesStoreID());
- if (sourceNames == null) {
- sourceNames = new String[0];
- }
- // rip out any empty filenames and trim length to 5
- ArrayList newNames = new ArrayList();
- for (int i = 0; i < sourceNames.length && i < 5; i++) {
- if (sourceNames[i].trim().length() > 0) {
- newNames.add(sourceNames[i]);
- }
- }
- String text = fileNameCombo.getText();
- newNames.remove(text);
- newNames.add(0, text);
- sourceNames = new String[newNames.size()];
- newNames.toArray(sourceNames);
-
- // sourceNames = addToHistory(sourceNames,
- // getJ2EEImportDataModel().getStringProperty(J2EEImportDataModel.FILE_NAME));
- settings.put(STORE_LABEL + getFileNamesStoreID(), sourceNames);
-
- DataModelFacetCreationWizardPage.saveRuntimeSettings(settings, model);
- }
- }
-
- @Override
- public void restoreDefaultSettings() {
- IDialogSettings settings = getDialogSettings();
- DataModelFacetCreationWizardPage.restoreRuntimeSettings(settings, model);
- }
-
- /**
- * @return
- */
- protected String getFileNamesStoreID() {
- return null;
- }
-
- /**
- * Must override
- */
- protected String getFileImportLabel() {
- return null;
- }
-
- /*
- * (non-Javadoc)
- *
- * @see org.eclipse.wst.common.frameworks.internal.ui.wizard.WTPWizardPage#enter()
- */
- @Override
- protected void enter() {
- super.enter();
- }
-
- private boolean launchNewRuntimeWizard(Shell shell, IDataModel model) {
- DataModelPropertyDescriptor[] preAdditionDescriptors = model.getValidPropertyDescriptors(IFacetProjectCreationDataModelProperties.FACET_RUNTIME);
- boolean isOK = ServerUIUtil.showNewRuntimeWizard(shell, "", ""); //$NON-NLS-1$ //$NON-NLS-2$
- if (isOK) {
- DataModelPropertyDescriptor[] postAdditionDescriptors = model.getValidPropertyDescriptors(IFacetProjectCreationDataModelProperties.FACET_RUNTIME);
- Object[] preAddition = new Object[preAdditionDescriptors.length];
- for (int i = 0; i < preAddition.length; i++) {
- preAddition[i] = preAdditionDescriptors[i].getPropertyValue();
- }
- Object[] postAddition = new Object[postAdditionDescriptors.length];
- for (int i = 0; i < postAddition.length; i++) {
- postAddition[i] = postAdditionDescriptors[i].getPropertyValue();
- }
- Object newAddition = ProjectUtilities.getNewObject(preAddition, postAddition);
-
- model.notifyPropertyChange(IFacetProjectCreationDataModelProperties.FACET_RUNTIME, IDataModel.VALID_VALUES_CHG);
- if (newAddition != null)
- model.setProperty(IFacetProjectCreationDataModelProperties.FACET_RUNTIME, newAddition);
- }
- return isOK;
- }
-
-}
diff --git a/plugins/org.eclipse.jst.j2ee.ui/j2ee_ui/org/eclipse/jst/j2ee/internal/wizard/J2EEModuleExportPage.java b/plugins/org.eclipse.jst.j2ee.ui/j2ee_ui/org/eclipse/jst/j2ee/internal/wizard/J2EEModuleExportPage.java
deleted file mode 100644
index 1064801..0000000
--- a/plugins/org.eclipse.jst.j2ee.ui/j2ee_ui/org/eclipse/jst/j2ee/internal/wizard/J2EEModuleExportPage.java
+++ /dev/null
@@ -1,43 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2003, 2006 IBM Corporation and others.
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
- *
- * Contributors:
- * IBM Corporation - initial API and implementation
- *******************************************************************************/
-/*
- * Created on Dec 4, 2003
- *
- * To change the template for this generated file go to
- * Window>Preferences>Java>Code Generation>Code and Comments
- */
-package org.eclipse.jst.j2ee.internal.wizard;
-
-import org.eclipse.jface.viewers.IStructuredSelection;
-import org.eclipse.jst.j2ee.datamodel.properties.IJ2EEComponentExportDataModelProperties;
-import org.eclipse.wst.common.frameworks.datamodel.IDataModel;
-
-
-/**
- * @author cbridgha
- *
- * To change the template for this generated type comment go to Window>Preferences>Java>Code
- * Generation>Code and Comments
- */
-public abstract class J2EEModuleExportPage extends J2EEExportPage {
- /**
- * @param model
- * @param pageName
- */
- public J2EEModuleExportPage(IDataModel model, String pageName, IStructuredSelection selection) {
- super(model, pageName, selection);
- }
-
- @Override
- protected String[] getValidationPropertyNames() {
- return new String[]{IJ2EEComponentExportDataModelProperties.PROJECT_NAME, IJ2EEComponentExportDataModelProperties.ARCHIVE_DESTINATION, IJ2EEComponentExportDataModelProperties.OVERWRITE_EXISTING};
- }
-}
diff --git a/plugins/org.eclipse.jst.j2ee.ui/j2ee_ui/org/eclipse/jst/j2ee/internal/wizard/J2EEModuleFacetInstallPage.java b/plugins/org.eclipse.jst.j2ee.ui/j2ee_ui/org/eclipse/jst/j2ee/internal/wizard/J2EEModuleFacetInstallPage.java
deleted file mode 100644
index dc714af..0000000
--- a/plugins/org.eclipse.jst.j2ee.ui/j2ee_ui/org/eclipse/jst/j2ee/internal/wizard/J2EEModuleFacetInstallPage.java
+++ /dev/null
@@ -1,133 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2003, 2005 IBM Corporation and others.
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
- *
- * Contributors:
- * IBM Corporation - initial API and implementation
- *******************************************************************************/
-package org.eclipse.jst.j2ee.internal.wizard;
-
-
-import org.eclipse.jst.j2ee.project.facet.IJ2EEModuleFacetInstallDataModelProperties;
-import org.eclipse.jst.j2ee.ui.project.facet.EarSelectionPanel;
-import org.eclipse.osgi.util.NLS;
-import org.eclipse.swt.SWT;
-import org.eclipse.swt.layout.GridData;
-import org.eclipse.swt.layout.GridLayout;
-import org.eclipse.swt.widgets.Button;
-import org.eclipse.swt.widgets.Composite;
-import org.eclipse.swt.widgets.Display;
-import org.eclipse.wst.common.frameworks.datamodel.DataModelEvent;
-import org.eclipse.wst.common.frameworks.datamodel.IDataModelListener;
-import org.eclipse.wst.web.ui.internal.wizards.DataModelFacetInstallPage;
-
-public abstract class J2EEModuleFacetInstallPage extends DataModelFacetInstallPage implements IJ2EEModuleFacetInstallDataModelProperties {
-
- private IDataModelListener facetVersionListener = null;
- protected Button addDD;
-
- public J2EEModuleFacetInstallPage(String pageName) {
- super(pageName);
- }
-
- /**
- * @deprecated This member should not be used any more. The EAR Panel is moved to the first wizard page.
- */
- protected EarSelectionPanel earPanel;
-
- @Override
- public void dispose() {
- if (null != earPanel) {
- earPanel.dispose();
- }
- this.model.removeListener( this.facetVersionListener );
- super.dispose();
- }
-
- /**
- * @deprecated This method should not be called any more. The EAR Panel is moved to the first wizard page.
- */
- protected void setupEarControl(final Composite parent) {
- Composite c = new Composite(parent, SWT.NONE);
- c.setLayoutData(gdhfill());
- final GridLayout layout = new GridLayout(3, false);
- layout.marginWidth = 0;
- layout.marginHeight = 0;
- c.setLayout(layout);
- this.earPanel = new EarSelectionPanel(model, c);
- }
-
- protected void createGenerateDescriptorControl(Composite parent) {
- createGenerateDescriptorControl(parent, null);
- }
-
- protected void createGenerateDescriptorControl(Composite parent, String ddFileName) {
- this.addDD = new Button(parent, SWT.CHECK);
- if (ddFileName == null) {
- this.addDD.setText(Resources.generateDeploymentDescriptor);
- } else {
- this.addDD.setText(NLS.bind(Resources.generateDeploymentDescriptorWithFileName, ddFileName));
- }
- //synchHelper.synchCheckbox(addDD, GENERATE_DD, null); bug 215284 - see enter()
- GridData gd = new GridData(GridData.FILL_HORIZONTAL);
- gd.horizontalSpan = 2;
- this.addDD.setLayoutData(gd);
- }
-
- protected void registerFacetVersionChangeListener()
- {
- this.facetVersionListener = new IDataModelListener()
- {
- public void propertyChanged( final DataModelEvent event )
- {
- if( event.getFlag() == DataModelEvent.VALUE_CHG &&
- event.getPropertyName().equals( FACET_VERSION ) )
- {
- final Runnable runnable = new Runnable()
- {
- public void run()
- {
- handleFacetVersionChangedEvent();
- }
- };
- if(Thread.currentThread() == Display.getDefault().getThread()){
- runnable.run();
- } else {
- Display.getDefault().asyncExec( runnable );
- }
- }
- }
- };
-
- this.model.addListener( facetVersionListener );
- handleFacetVersionChangedEvent();
- }
-
- protected void handleFacetVersionChangedEvent()
- {
- // The default implementation doesn't do anything. The subclass should override
- // to handle this event.
- }
-
- private static final class Resources extends NLS {
- public static String generateDeploymentDescriptor;
- public static String generateDeploymentDescriptorWithFileName;
-
- static {
- initializeMessages(J2EEModuleFacetInstallPage.class.getName(), Resources.class);
- }
- }
-
- @Override
- protected void enter() {
- if (isFirstTimeToPage() && addDD != null)
- {
- synchHelper.synchCheckbox(addDD, GENERATE_DD, null);
- }
- super.enter();
- }
-
-}
diff --git a/plugins/org.eclipse.jst.j2ee.ui/j2ee_ui/org/eclipse/jst/j2ee/internal/wizard/J2EEModuleFacetInstallPage.properties b/plugins/org.eclipse.jst.j2ee.ui/j2ee_ui/org/eclipse/jst/j2ee/internal/wizard/J2EEModuleFacetInstallPage.properties
deleted file mode 100644
index 321d1db..0000000
--- a/plugins/org.eclipse.jst.j2ee.ui/j2ee_ui/org/eclipse/jst/j2ee/internal/wizard/J2EEModuleFacetInstallPage.properties
+++ /dev/null
@@ -1,2 +0,0 @@
-generateDeploymentDescriptor = &Generate deployment descriptor
-generateDeploymentDescriptorWithFileName = &Generate {0} deployment descriptor
diff --git a/plugins/org.eclipse.jst.j2ee.ui/j2ee_ui/org/eclipse/jst/j2ee/internal/wizard/J2EEModuleImportPage.java b/plugins/org.eclipse.jst.j2ee.ui/j2ee_ui/org/eclipse/jst/j2ee/internal/wizard/J2EEModuleImportPage.java
deleted file mode 100644
index df85210..0000000
--- a/plugins/org.eclipse.jst.j2ee.ui/j2ee_ui/org/eclipse/jst/j2ee/internal/wizard/J2EEModuleImportPage.java
+++ /dev/null
@@ -1,105 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2003, 2006 IBM Corporation and others.
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
- *
- * Contributors:
- * IBM Corporation - initial API and implementation
- *******************************************************************************/
-/*
- * Created on Dec 4, 2003
- *
- * To change the template for this generated file go to Window>Preferences>Java>Code Generation>Code and Comments
- */
-package org.eclipse.jst.j2ee.internal.wizard;
-
-import org.eclipse.jst.j2ee.application.internal.operations.J2EEArtifactImportDataModelProvider;
-import org.eclipse.jst.j2ee.datamodel.properties.IJ2EEComponentImportDataModelProperties;
-import org.eclipse.jst.j2ee.project.facet.IJ2EEFacetProjectCreationDataModelProperties;
-import org.eclipse.jst.j2ee.ui.project.facet.EarSelectionPanel;
-import org.eclipse.swt.SWT;
-import org.eclipse.swt.layout.GridData;
-import org.eclipse.swt.layout.GridLayout;
-import org.eclipse.swt.widgets.Composite;
-import org.eclipse.ui.PlatformUI;
-import org.eclipse.wst.common.componentcore.datamodel.properties.IFacetProjectCreationDataModelProperties;
-import org.eclipse.wst.common.componentcore.datamodel.properties.IFacetProjectCreationDataModelProperties.FacetDataModelMap;
-import org.eclipse.wst.common.frameworks.datamodel.IDataModel;
-
-
-/**
- * @author cbridgha
- *
- * To change the template for this generated type comment go to Window>Preferences>Java>Code
- * Generation>Code and Comments
- */
-public abstract class J2EEModuleImportPage extends J2EEImportPage {
- /**
- * @param model
- * @param pageName
- */
-
- protected EarSelectionPanel earPanel;
-
- public J2EEModuleImportPage(IDataModel model, String pageName) {
- super(model, pageName);
- }
-
- @Override
- protected Composite createTopLevelComposite(Composite parent) {
- Composite composite = super.createTopLevelComposite(parent);
- PlatformUI.getWorkbench().getHelpSystem().setHelp(composite, getInfopopID());
- createServerEarAndStandaloneGroup(composite);
- createAnnotationsStandaloneGroup(composite);
- return composite;
- }
-
- /**
- * @param composite
- */
- protected void createAnnotationsStandaloneGroup(Composite composite) {
- }
-
- protected abstract String getModuleFacetID();
- /**
- * @param composite
- */
-
- private void createServerEarAndStandaloneGroup(Composite composite) {
- IDataModel creationDM = getDataModel().getNestedModel(IJ2EEComponentImportDataModelProperties.NESTED_MODEL_J2EE_COMPONENT_CREATION);
- FacetDataModelMap map = (FacetDataModelMap) creationDM.getProperty(IFacetProjectCreationDataModelProperties.FACET_DM_MAP);
- IDataModel facetModel = (IDataModel) map.get(getModuleFacetID());
-
- Composite c = new Composite(composite, SWT.NONE);
- GridData data = new GridData(GridData.FILL_HORIZONTAL);
- data.horizontalSpan = 3;
- c.setLayoutData(data);
- final GridLayout layout = new GridLayout(3, false);
- layout.marginWidth = 0;
- layout.marginHeight = 0;
- layout.horizontalSpacing = 0;
- c.setLayout(layout);
- earPanel = new EarSelectionPanel(facetModel, c);
- }
-
-
- @Override
- protected String[] getValidationPropertyNames() {
- return new String[]{IJ2EEComponentImportDataModelProperties.FILE_NAME,
- IFacetProjectCreationDataModelProperties.FACET_PROJECT_NAME,
- IFacetProjectCreationDataModelProperties.FACET_RUNTIME,
- IJ2EEFacetProjectCreationDataModelProperties.EAR_PROJECT_NAME,
- IJ2EEFacetProjectCreationDataModelProperties.ADD_TO_EAR,
- J2EEArtifactImportDataModelProvider.FACET_RUNTIME};
- }
-
- @Override
- public void dispose() {
- super.dispose();
- if (earPanel != null)
- earPanel.dispose();
- }
-
-}
diff --git a/plugins/org.eclipse.jst.j2ee.ui/j2ee_ui/org/eclipse/jst/j2ee/internal/wizard/J2EEUtilityJarImportPageNew.java b/plugins/org.eclipse.jst.j2ee.ui/j2ee_ui/org/eclipse/jst/j2ee/internal/wizard/J2EEUtilityJarImportPageNew.java
deleted file mode 100644
index 3253110..0000000
--- a/plugins/org.eclipse.jst.j2ee.ui/j2ee_ui/org/eclipse/jst/j2ee/internal/wizard/J2EEUtilityJarImportPageNew.java
+++ /dev/null
@@ -1,420 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2003, 2006 IBM Corporation and others.
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
- *
- * Contributors:
- * IBM Corporation - initial API and implementation
- * David Schneider, david.schneider@unisys.com - [142500] WTP properties pages fonts don't follow Eclipse preferences
- *******************************************************************************/
-/*
- * Created on Dec 8, 2003
- *
- * To change the template for this generated file go to Window>Preferences>Java>Code Generation>Code and Comments
- */
-package org.eclipse.jst.j2ee.internal.wizard;
-
-import java.io.File;
-import java.util.ArrayList;
-
-import org.eclipse.jface.dialogs.Dialog;
-import org.eclipse.jface.dialogs.IDialogSettings;
-import org.eclipse.jface.viewers.CheckboxTableViewer;
-import org.eclipse.jst.j2ee.datamodel.properties.IJ2EEUtilityJarListImportDataModelProperties;
-import org.eclipse.jst.j2ee.internal.actions.IJ2EEUIContextIds;
-import org.eclipse.jst.j2ee.internal.plugin.J2EEUIMessages;
-import org.eclipse.jst.j2ee.internal.plugin.J2EEUIPlugin;
-import org.eclipse.jst.j2ee.internal.plugin.J2EEUIPluginIcons;
-import org.eclipse.swt.SWT;
-import org.eclipse.swt.events.SelectionAdapter;
-import org.eclipse.swt.events.SelectionEvent;
-import org.eclipse.swt.layout.GridData;
-import org.eclipse.swt.layout.GridLayout;
-import org.eclipse.swt.widgets.Button;
-import org.eclipse.swt.widgets.Combo;
-import org.eclipse.swt.widgets.Composite;
-import org.eclipse.swt.widgets.Control;
-import org.eclipse.swt.widgets.DirectoryDialog;
-import org.eclipse.swt.widgets.Group;
-import org.eclipse.swt.widgets.Label;
-import org.eclipse.swt.widgets.Text;
-import org.eclipse.wst.common.frameworks.datamodel.DataModelEvent;
-import org.eclipse.wst.common.frameworks.datamodel.IDataModel;
-import org.eclipse.wst.common.frameworks.datamodel.IDataModelListener;
-
-/**
- * @author mdelder
- */
-public class J2EEUtilityJarImportPageNew extends J2EEImportPage {
-
- private static final String STORE_LABEL = "J2EE_UTILITY_JAR_LIST_IMPORT_"; //$NON-NLS-1$
- // private static final int SIZING_TEXT_FIELD_WIDTH = 305;
-
- private Button deselectAllButton;
-
- private Button selectAllButton;
-
- protected Button browseButton;
-
- protected Button useAlternateRootBtn;
-
- private Button overwriteProjectCheckbox;
-
- protected CheckboxTableViewer availableJARsViewer;
-
- protected boolean utilJarSelectionChanged = false;
-
- private Combo availableJarsCombo;
-
- protected Button linkedPathCheckbox;
-
-
- /**
- * @param model
- * @param pageName
- */
- public J2EEUtilityJarImportPageNew(IDataModel model, String pageName) {
- super(model, pageName);
- setTitle(J2EEUIMessages.getResourceString("J2EEUtilityJarImportPage_UI_0")); //$NON-NLS-1$
- setDescription(J2EEUIMessages.getResourceString("J2EEUtilityJarImportPage_UI_1")); //$NON-NLS-1$
- setImageDescriptor(J2EEUIPlugin.getDefault().getImageDescriptor(J2EEUIPluginIcons.EAR_IMPORT_WIZARD_BANNER));
- setInfopopID(IJ2EEUIContextIds.IMPORT_UTILITY_JAR_WIZARD_P1);
- }
-
- /*
- * (non-Javadoc)
- *
- * @see org.eclipse.wst.common.frameworks.internal.ui.wizard.WTPWizardPage#createTopLevelComposite(org.eclipse.swt.widgets.Composite)
- */
- @Override
- protected Composite createTopLevelComposite(Composite parent) {
-
- Composite composite = new Composite(parent, SWT.NONE);
- GridLayout layout = new GridLayout();
- layout.numColumns = 1;
- composite.setLayout(layout);
- composite.setLayoutData(new GridData(GridData.FILL_HORIZONTAL));
-
- createUtilityJarFileNameComposite(composite);
- createLinkedPathVariable(composite);
- createJARsComposite(composite);
- createOverwriteCheckbox(composite);
-
- restoreWidgetValues();
- Dialog.applyDialogFont(parent);
- return composite;
- }
-
- /**
- * @param composite
- */
- protected void createUtilityJarFileNameComposite(Composite parent) {
- Group fileNameGroup = new Group(parent, SWT.NULL);
- fileNameGroup.setText(J2EEUIMessages.getResourceString("J2EEUtilityJarImportPage_UI_2")); //$NON-NLS-1$
- GridLayout layout = new GridLayout(3, false);
- fileNameGroup.setLayout(layout);
- fileNameGroup.setLayoutData(new GridData(GridData.FILL_HORIZONTAL));
-
- Label fileLabel = new Label(fileNameGroup, SWT.NONE);
- fileLabel.setText(J2EEUIMessages.getResourceString("J2EEUtilityJarImportPage_UI_3")); //$NON-NLS-1$
- fileLabel.setLayoutData(new GridData(GridData.HORIZONTAL_ALIGN_BEGINNING));
-
- // setup combo
- availableJarsCombo = new Combo(fileNameGroup, SWT.SINGLE | SWT.BORDER);
- availableJarsCombo.setLayoutData((new GridData(GridData.FILL_HORIZONTAL)));
-
- // setup browse button
- browseButton = new Button(fileNameGroup, SWT.PUSH);
- browseButton.setText(defBrowseButtonLabel);
- browseButton.setLayoutData((new GridData(GridData.HORIZONTAL_ALIGN_END)));
- browseButton.addSelectionListener(new SelectionAdapter() {
-
- @Override
- public void widgetSelected(SelectionEvent e) {
- handleBrowseButtonPressed();
- }
- });
- browseButton.setEnabled(true);
-
- synchHelper.synchCombo(availableJarsCombo, IJ2EEUtilityJarListImportDataModelProperties.AVAILABLE_JARS_DIRECTORY, new Control[]{fileLabel, browseButton});
- }
-
- protected void createLinkedPathVariable(Composite parent) {
-
-
- Group linkedPathGroup = new Group(parent, SWT.NULL);
- linkedPathGroup.setText(J2EEUIMessages.getResourceString("J2EEUtilityJarImportPage_UI_4")); //$NON-NLS-1$
-
- GridLayout layout = new GridLayout(1, true);
- linkedPathGroup.setLayout(layout);
- linkedPathGroup.setLayoutData(new GridData(GridData.FILL_HORIZONTAL));
-
- Composite checkboxGroup = new Composite(linkedPathGroup, SWT.NULL);
- GridLayout checkboxLayout = new GridLayout(2, false);
- checkboxGroup.setLayout(checkboxLayout);
- checkboxGroup.setLayoutData(new GridData(GridData.FILL_BOTH));
-
- linkedPathCheckbox = new Button(checkboxGroup, SWT.CHECK);
- linkedPathCheckbox.setText(" "); //$NON-NLS-1$
- final Text linkedPathText = new Text(checkboxGroup, SWT.MULTI | SWT.WRAP | SWT.V_SCROLL);
- linkedPathText.setText(J2EEUIMessages.getResourceString("J2EEUtilityJarImportPage_UI_5")); //$NON-NLS-1$
- linkedPathText.setEnabled(true);
-
- getDataModel().addListener(new IDataModelListener() {
- public void propertyChanged(DataModelEvent event) {
- if(IJ2EEUtilityJarListImportDataModelProperties.CREATE_LINKED_PATH_VARIABLE.equals(event.getPropertyName())) {
- linkedPathText.setEnabled(getDataModel().isPropertyEnabled(IJ2EEUtilityJarListImportDataModelProperties.CREATE_LINKED_PATH_VARIABLE));
- }
-
- }
- });
-
- GridData textGridData = new GridData(GridData.FILL_BOTH | GridData.GRAB_HORIZONTAL);
- textGridData.heightHint = 50;
- textGridData.widthHint = 350;
- linkedPathText.setLayoutData(textGridData);
- linkedPathText.setBackground(checkboxGroup.getBackground());
-
- // setup combo
- Combo availableLinkedPathsCombo = new Combo(linkedPathGroup, SWT.SINGLE | SWT.BORDER);
- availableLinkedPathsCombo.setLayoutData((new GridData(GridData.FILL_HORIZONTAL)));
-
- synchHelper.synchCombo(availableLinkedPathsCombo, IJ2EEUtilityJarListImportDataModelProperties.LINKED_PATH_VARIABLE, new Control[]{availableLinkedPathsCombo});
-
- synchHelper.synchCheckbox(linkedPathCheckbox, IJ2EEUtilityJarListImportDataModelProperties.CREATE_LINKED_PATH_VARIABLE, new Control[]{availableLinkedPathsCombo});
-
- }
-
- /**
- * Open an appropriate directory browser
- */
- protected void handleBrowseButtonPressed() {
- DirectoryDialog dialog = new DirectoryDialog(browseButton.getShell());
- dialog.setMessage(J2EEUIMessages.getResourceString(J2EEUIMessages.SELECT_DIRECTORY_DLG));
-
- String dirName = getBrowseStartLocation();
-
- if (!isNullOrEmpty(dirName)) {
- File path = new File(dirName);
- if (path.exists())
- dialog.setFilterPath(dirName);
- }
-
- String selectedDirectory = dialog.open();
- if (selectedDirectory != null)
- availableJarsCombo.setText(selectedDirectory);
- }
-
- /**
- * @return
- */
- protected String getBrowseStartLocation() {
- if (availableJarsCombo.getText() != null && availableJarsCombo.getText().length() > 0)
- return availableJarsCombo.getText();
- return null;
- }
-
- protected boolean isNullOrEmpty(String aString) {
- return aString == null || aString.length() == 0;
- }
-
- /*
- * Updates the enable state of the all buttons
- */
- protected void updateButtonEnablements() {
-
- utilJarSelectionChanged = true;
- }
-
- protected void createAvailableJarsList(Composite listGroup) {
- availableJARsViewer = CheckboxTableViewer.newCheckList(listGroup, SWT.BORDER | SWT.H_SCROLL | SWT.V_SCROLL);
-
- GridData gData = new GridData(GridData.FILL_BOTH | GridData.GRAB_HORIZONTAL | GridData.GRAB_VERTICAL);
- gData.widthHint = 200;
- gData.heightHint = 80;
- availableJARsViewer.getControl().setLayoutData(gData);
- AvailableUtilityJarsProvider availableUtilJARsProvider = new AvailableUtilityJarsProvider();
- availableJARsViewer.setContentProvider(availableUtilJARsProvider);
- availableJARsViewer.setLabelProvider(availableUtilJARsProvider);
-
- availableJARsViewer.getTable().setHeaderVisible(false);
- availableJARsViewer.getTable().setLinesVisible(false);
-
- availableJARsViewer.setInput(model);
-
- /* getModel().addListener(getOperationDataModelListener()); */
- synchHelper.synchCheckBoxTableViewer(availableJARsViewer, IJ2EEUtilityJarListImportDataModelProperties.UTILITY_JAR_LIST, null);
-
-
- model.addListener(new IDataModelListener() {
-
- public void propertyChanged(DataModelEvent event) {
- if (IJ2EEUtilityJarListImportDataModelProperties.AVAILABLE_JARS_DIRECTORY.equals(event.getPropertyName()))
- availableJARsViewer.setInput(model);
- }
- });
- }
-
- private void handleDeselectAllButtonPressed() {
- model.setProperty(IJ2EEUtilityJarListImportDataModelProperties.UTILITY_JAR_LIST, new Object[0]);
- }
-
- private void handleSelectAllButtonPressed() {
- Object[] selection = new Object[availableJARsViewer.getTable().getItemCount()];
- for (int i = 0; i < selection.length; i++) {
- selection[i] = availableJARsViewer.getElementAt(i);
- }
- model.setProperty(IJ2EEUtilityJarListImportDataModelProperties.UTILITY_JAR_LIST, selection);
- }
-
- protected void createButtonsGroup(org.eclipse.swt.widgets.Composite parent) {
- Composite buttonGroup = new Composite(parent, SWT.NONE);
- GridLayout layout = new GridLayout();
- layout.numColumns = 4;
- buttonGroup.setLayout(layout);
- buttonGroup.setLayoutData(new GridData(GridData.FILL_BOTH));
-
- selectAllButton = new Button(buttonGroup, SWT.PUSH);
- selectAllButton.setText(J2EEUIMessages.getResourceString(J2EEUIMessages.EAR_IMPORT_SELECT_ALL_UTIL_BUTTON));
- GridData gd = new GridData(GridData.HORIZONTAL_ALIGN_FILL);
- gd.horizontalSpan = 1;
- gd.heightHint = 22;
- gd.widthHint = 120;
- selectAllButton.setLayoutData(gd);
- selectAllButton.addSelectionListener(new SelectionAdapter() {
-
- @Override
- public void widgetSelected(SelectionEvent e) {
- handleSelectAllButtonPressed();
- }
- });
-
- deselectAllButton = new Button(buttonGroup, SWT.PUSH);
- deselectAllButton.setText(J2EEUIMessages.getResourceString(J2EEUIMessages.EAR_IMPORT_DESELECT_ALL_UTIL_BUTTON));
- gd = new GridData(GridData.HORIZONTAL_ALIGN_FILL);
- gd.horizontalSpan = 2;
- gd.heightHint = 22;
- gd.widthHint = 120;
- deselectAllButton.setLayoutData(gd);
- deselectAllButton.addSelectionListener(new SelectionAdapter() {
-
- @Override
- public void widgetSelected(SelectionEvent e) {
- handleDeselectAllButtonPressed();
- }
- });
- }
-
- protected void createJARsComposite(Composite parent) {
- Group group = new Group(parent, SWT.NULL);
- group.setText(J2EEUIMessages.getResourceString(J2EEUIMessages.EAR_IMPORT_JARS_GROUP));
- GridLayout layout = new GridLayout();
- layout.numColumns = 1;
- group.setLayout(layout);
- group.setLayoutData(new GridData(GridData.FILL_BOTH));
-
- Label description = new Label(group, SWT.NULL);
- description.setText(J2EEUIMessages.getResourceString(J2EEUIMessages.J2EE_UTILITY_JAR_LISTEAR_IMPORT_SELECT_UTIL_JARS_TO_BE_PROJECTS));
- GridData gd2 = new GridData(GridData.HORIZONTAL_ALIGN_FILL);
- gd2.horizontalSpan = 2;
- description.setLayoutData(gd2);
-
- // create jars check box viewer
- createAvailableJarsList(group);
- createButtonsGroup(group);
- }
-
- /**
- * @param projectOptionsGroup
- */
- protected void createOverwriteCheckbox(Composite parent) {
-
- overwriteProjectCheckbox = new Button(parent, SWT.CHECK);
- overwriteProjectCheckbox.setText(J2EEUIMessages.getResourceString("J2EEUtilityJarImportPage_UI_6")); //$NON-NLS-1$
- synchHelper.synchCheckbox(overwriteProjectCheckbox, IJ2EEUtilityJarListImportDataModelProperties.OVERWRITE_IF_NECESSARY, null);
- }
-
- protected void setJARsCompositeEnabled(boolean enabled) {
- availableJARsViewer.getTable().setEnabled(enabled);
- availableJARsViewer.setAllChecked(false);
- availableJARsViewer.setAllGrayed(!enabled);
- selectAllButton.setEnabled(enabled);
- deselectAllButton.setEnabled(enabled);
- }
-
- @Override
- protected String[] getValidationPropertyNames() {
- return new String[]{IJ2EEUtilityJarListImportDataModelProperties.UTILITY_JAR_LIST, IJ2EEUtilityJarListImportDataModelProperties.OVERWRITE_IF_NECESSARY, IJ2EEUtilityJarListImportDataModelProperties.LINKED_PATH_VARIABLE};
- }
-
- @Override
- protected void restoreWidgetValues() {
-
- IDialogSettings settings = getDialogSettings();
- if (settings != null) {
- String[] sourceNames = settings.getArray(STORE_LABEL + getFileNamesStoreID());
- if (sourceNames == null)
- return; // ie.- no settings stored
- for (int i = 0; i < sourceNames.length; i++) {
- if (sourceNames[i] == null)
- sourceNames[i] = ""; //$NON-NLS-1$
- }
- availableJarsCombo.setItems(sourceNames);
- }
- }
-
- @Override
- public void storeDefaultSettings() {
- IDialogSettings settings = getDialogSettings();
- if (settings != null) {
- // update source names history
- String[] sourceNames = settings.getArray(STORE_LABEL + getFileNamesStoreID());
- if (sourceNames == null) {
- sourceNames = new String[0];
- }
-
- String newName = availableJarsCombo.getText();
-
- // rip out any empty filenames and trim length to 5
- ArrayList newNames = new ArrayList();
- for (int i = 0; i < sourceNames.length && i < 5; i++) {
- if (sourceNames[i].trim().length() > 0 && !newName.equals(sourceNames[i])) {
- newNames.add(sourceNames[i]);
- }
- }
- newNames.add(0, availableJarsCombo.getText());
- sourceNames = new String[newNames.size()];
- newNames.toArray(sourceNames);
-
- settings.put(STORE_LABEL + getFileNamesStoreID(), sourceNames);
- }
- }
-
- /*
- * (non-Javadoc)
- *
- * @see org.eclipse.jst.j2ee.internal.internal.internal.ui.wizard.J2EEImportPage#getFileNamesStoreID()
- */
- @Override
- protected String getFileNamesStoreID() {
- return "UTIL";//$NON-NLS-1$
- }
-
- /*
- * (non-Javadoc)
- *
- * @see org.eclipse.jst.j2ee.internal.internal.internal.ui.wizard.J2EEImportPage#getFileImportLabel()
- */
- @Override
- protected String getFileImportLabel() {
- return J2EEUIMessages.getResourceString("J2EEUtilityJarImportPage_UI_7"); //$NON-NLS-1$
- }
-
-
- @Override
- public void restoreDefaultSettings() {
- }
-
-}
diff --git a/plugins/org.eclipse.jst.j2ee.ui/j2ee_ui/org/eclipse/jst/j2ee/internal/wizard/J2EEUtilityJarImportTypePageNew.java b/plugins/org.eclipse.jst.j2ee.ui/j2ee_ui/org/eclipse/jst/j2ee/internal/wizard/J2EEUtilityJarImportTypePageNew.java
deleted file mode 100644
index b7f43d4..0000000
--- a/plugins/org.eclipse.jst.j2ee.ui/j2ee_ui/org/eclipse/jst/j2ee/internal/wizard/J2EEUtilityJarImportTypePageNew.java
+++ /dev/null
@@ -1,374 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2003, 2006 IBM Corporation and others.
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
- *
- * Contributors:
- * IBM Corporation - initial API and implementation
- * David Schneider, david.schneider@unisys.com - [142500] WTP properties pages fonts don't follow Eclipse preferences
- *******************************************************************************/
-/*
- * Created on May 13, 2004
- */
-package org.eclipse.jst.j2ee.internal.wizard;
-
-import java.io.File;
-import java.util.ArrayList;
-import java.util.Iterator;
-
-import org.eclipse.core.resources.IProject;
-import org.eclipse.core.resources.IResource;
-import org.eclipse.core.resources.ResourcesPlugin;
-import org.eclipse.emf.ecore.EObject;
-import org.eclipse.jem.util.emf.workbench.ProjectUtilities;
-import org.eclipse.jface.dialogs.Dialog;
-import org.eclipse.jface.resource.ImageDescriptor;
-import org.eclipse.jface.viewers.IStructuredSelection;
-import org.eclipse.jst.j2ee.application.Application;
-import org.eclipse.jst.j2ee.commonarchivecore.internal.EARFile;
-import org.eclipse.jst.j2ee.datamodel.properties.IJ2EEUtilityJarListImportDataModelProperties;
-import org.eclipse.jst.j2ee.internal.actions.IJ2EEUIContextIds;
-import org.eclipse.jst.j2ee.internal.plugin.J2EEUIMessages;
-import org.eclipse.jst.j2ee.internal.plugin.J2EEUIPlugin;
-import org.eclipse.jst.j2ee.internal.plugin.J2EEUIPluginIcons;
-import org.eclipse.jst.j2ee.project.EarUtilities;
-import org.eclipse.swt.SWT;
-import org.eclipse.swt.events.SelectionAdapter;
-import org.eclipse.swt.events.SelectionEvent;
-import org.eclipse.swt.layout.GridData;
-import org.eclipse.swt.layout.GridLayout;
-import org.eclipse.swt.widgets.Button;
-import org.eclipse.swt.widgets.Combo;
-import org.eclipse.swt.widgets.Composite;
-import org.eclipse.swt.widgets.Control;
-import org.eclipse.swt.widgets.DirectoryDialog;
-import org.eclipse.swt.widgets.Group;
-import org.eclipse.swt.widgets.Label;
-import org.eclipse.swt.widgets.Text;
-import org.eclipse.wst.common.frameworks.datamodel.IDataModel;
-import org.eclipse.wst.common.frameworks.internal.datamodel.ui.DataModelWizardPage;
-
-/**
- * @author mdelder
- */
-public class J2EEUtilityJarImportTypePageNew extends DataModelWizardPage {
-
- protected static final String defBrowseButtonLabel = J2EEUIMessages.getResourceString(J2EEUIMessages.BROWSE_LABEL);
-
- private static final int SIZING_TEXT_FIELD_WIDTH = 305;
-
- protected IStructuredSelection currentResourceSelection;
-
- private Combo resourceNameCombo;
-
- private Button copyJarIntoEAR;
-
- private Button linkJarIntoEAR;
-
- private Button createLinkedProjects;
-
- private Button createProjects;
-
- protected Button browseButton;
-
- private Button overrideProjectRootCheckbox;
-
-
- protected Text projectRootLocationText;
-
- private Label moduleProjectLocationLabel;
-
- protected boolean synching;
-
- public static final String TITLE = J2EEUIMessages.getResourceString("J2EEUtilityJarImportTypePage_UI_0"); //$NON-NLS-1$
- public static final String DESCRIPTION = J2EEUIMessages.getResourceString("J2EEUtilityJarImportTypePage_UI_1"); //$NON-NLS-1$
-
- private Group projectRootComposite;
-
-
- /**
- * @param model
- * @param pageName
- * @param title
- * @param titleImage
- */
- public J2EEUtilityJarImportTypePageNew(IDataModel model, String pageName, String title, ImageDescriptor titleImage) {
- super(model, pageName, title, titleImage);
- setTitle(""); //$NON-NLS-1$
- setDescription(""); //$NON-NLS-1$
- setImageDescriptor(J2EEUIPlugin.getDefault().getImageDescriptor(J2EEUIPluginIcons.EAR_IMPORT_WIZARD_BANNER));
- setInfopopID(IJ2EEUIContextIds.IMPORT_UTILITY_JAR_WIZARD_P2);
- }
-
- public J2EEUtilityJarImportTypePageNew(IDataModel model, String pageName, IStructuredSelection selection) {
- super(model, pageName);
- this.currentResourceSelection = selection;
- setTitle(TITLE);
- setDescription(DESCRIPTION);
- setImageDescriptor(J2EEUIPlugin.getDefault().getImageDescriptor(J2EEUIPluginIcons.EAR_IMPORT_WIZARD_BANNER));
- }
-
- public J2EEUtilityJarImportTypePageNew(IDataModel model, String pageName) {
- super(model, pageName);
- setTitle(TITLE);
- setDescription(DESCRIPTION);
- setImageDescriptor(J2EEUIPlugin.getDefault().getImageDescriptor(J2EEUIPluginIcons.EAR_IMPORT_WIZARD_BANNER));
- }
-
- /*
- * (non-Javadoc)
- *
- * @see org.eclipse.wst.common.frameworks.internal.ui.wizard.WTPWizardPage#getValidationPropertyNames()
- */
- @Override
- protected String[] getValidationPropertyNames() {
- return new String[]{IJ2EEUtilityJarListImportDataModelProperties.EAR_PROJECT_NAME, IJ2EEUtilityJarListImportDataModelProperties.PROJECT_ROOT};
- }
-
- /*
- * (non-Javadoc)
- *
- * @see org.eclipse.wst.common.frameworks.internal.ui.wizard.WTPWizardPage#createTopLevelComposite(org.eclipse.swt.widgets.Composite)
- */
- @Override
- protected Composite createTopLevelComposite(Composite parent) {
- Composite composite = new Composite(parent, SWT.NULL);
- GridLayout layout = new GridLayout(1, false);
- composite.setLayout(layout);
- composite.setLayoutData(new GridData(GridData.FILL_HORIZONTAL));
-
- createEARProjectGroup(composite);
- createUtilityJarImportTypes(composite);
- // TODO The binary / project location options are not yet (re-) supported by the import operations.
- createProjectCreationOptions(composite);
-
- setupBasedOnInitialSelections();
- Dialog.applyDialogFont(parent);
- return composite;
- }
-
- /**
- * @param composite
- */
- protected void createUtilityJarImportTypes(Composite parent) {
- Group typesGroup = new Group(parent, SWT.NULL);
- typesGroup.setText(J2EEUIMessages.getResourceString("J2EEUtilityJarImportTypePage_UI_2")); //$NON-NLS-1$
-
- GridLayout layout = new GridLayout(1, false);
- typesGroup.setLayout(layout);
- typesGroup.setLayoutData(new GridData(GridData.FILL_HORIZONTAL));
-
- createProjects = new Button(typesGroup, SWT.RADIO);
- createProjects.setText(J2EEUIMessages.getResourceString("J2EEUtilityJarImportTypePage_UI_3")); //$NON-NLS-1$
- synchHelper.synchRadio(createProjects, IJ2EEUtilityJarListImportDataModelProperties.CREATE_PROJECT, null);
-
- createLinkedProjects = new Button(typesGroup, SWT.RADIO);
- createLinkedProjects.setText(J2EEUIMessages.getResourceString("J2EEUtilityJarImportTypePage_UI_4")); //$NON-NLS-1$
- synchHelper.synchRadio(createLinkedProjects, IJ2EEUtilityJarListImportDataModelProperties.CREATE_LINKED_PROJECT, null);
-
- copyJarIntoEAR = new Button(typesGroup, SWT.RADIO);
- copyJarIntoEAR.setText(J2EEUIMessages.getResourceString("J2EEUtilityJarImportTypePage_UI_5")); //$NON-NLS-1$
- synchHelper.synchRadio(copyJarIntoEAR, IJ2EEUtilityJarListImportDataModelProperties.COPY, null);
-
- linkJarIntoEAR = new Button(typesGroup, SWT.RADIO);
- linkJarIntoEAR.setText(J2EEUIMessages.getResourceString("J2EEUtilityJarImportTypePage_UI_6")); //$NON-NLS-1$
- /* linkJarIntoEAR.addSelectionListener(getTypeSelectionListener()); */
- synchHelper.synchRadio(linkJarIntoEAR, IJ2EEUtilityJarListImportDataModelProperties.LINK_IMPORT, null);
-
- }
-
- protected void createProjectCreationOptions(Composite parent) {
-
- Group projectOptionsGroup = new Group(parent, SWT.NULL);
- projectOptionsGroup.setText(J2EEUIMessages.getResourceString("J2EEUtilityJarImportTypePage_UI_7")); //$NON-NLS-1$
-
- GridLayout layout = new GridLayout(1, false);
- projectOptionsGroup.setLayout(layout);
- projectOptionsGroup.setLayoutData(new GridData(GridData.FILL_HORIZONTAL));
-
- overrideProjectRootCheckbox = new Button(projectOptionsGroup, SWT.CHECK);
- overrideProjectRootCheckbox.setText(J2EEUIMessages.getResourceString("J2EEUtilityJarImportTypePage_UI_11")); //$NON-NLS-1$
- createProjectRootComposite(projectOptionsGroup);
-
- synchHelper.synchCheckbox(overrideProjectRootCheckbox, IJ2EEUtilityJarListImportDataModelProperties.OVERRIDE_PROJECT_ROOT, new Control[]{/*
- * moduleProjectLocationLabel,
- * projectRootLocationText,
- * browseButton
- */});
- }
-
- /**
- *
- * @param parent
- * a <code>Composite</code> that is to be used as the parent of this group's
- * collection of visual components
- * @see org.eclipse.swt.widgets.Composite
- */
- protected void createEARProjectGroup(Composite parent) {
-
- Group earGroup = new Group(parent, SWT.NULL);
- earGroup.setText(J2EEUIMessages.getResourceString("J2EEUtilityJarImportTypePage_UI_8")); //$NON-NLS-1$
-
- GridLayout layout = new GridLayout(2, false);
- earGroup.setLayout(layout);
- earGroup.setLayoutData(new GridData(GridData.FILL_HORIZONTAL));
-
- // Project label
- Label projectLabel = new Label(earGroup, SWT.NONE);
- projectLabel.setText(J2EEUIMessages.getResourceString("J2EEUtilityJarImportTypePage_UI_9")); //$NON-NLS-1$
- // Project combo
- resourceNameCombo = new Combo(earGroup, SWT.SINGLE | SWT.BORDER);
- GridData data = new GridData(GridData.FILL_HORIZONTAL);
- data.widthHint = SIZING_TEXT_FIELD_WIDTH;
- resourceNameCombo.setLayoutData(data);
- synchHelper.synchCombo(resourceNameCombo, IJ2EEUtilityJarListImportDataModelProperties.EAR_PROJECT_NAME, null);
-
- }
-
- protected void createProjectRootComposite(Composite parent) {
- projectRootComposite = new Group(parent, SWT.NULL);
- projectRootComposite.setText(J2EEUIMessages.getResourceString(J2EEUIMessages.PROJECT_LOCATIONS_GROUP));
- GridLayout layout = new GridLayout();
- layout.numColumns = 3;
- projectRootComposite.setLayout(layout);
- projectRootComposite.setLayoutData(new GridData(GridData.FILL_HORIZONTAL));
-
- Label description = new Label(projectRootComposite, SWT.NULL);
- description.setText(J2EEUIMessages.getResourceString(J2EEUIMessages.NEW_PROJECT_GROUP_DESCRIPTION));
- GridData gd2 = new GridData(GridData.HORIZONTAL_ALIGN_FILL);
- gd2.horizontalSpan = 3;
- description.setLayoutData(gd2);
-
- moduleProjectLocationLabel = new Label(projectRootComposite, SWT.NULL);
- moduleProjectLocationLabel.setText(J2EEUIMessages.getResourceString(J2EEUIMessages.USE_DEFAULT_ROOT_RADIO));
- moduleProjectLocationLabel.setLayoutData(new GridData(GridData.HORIZONTAL_ALIGN_FILL));
-
- projectRootLocationText = new Text(projectRootComposite, SWT.BORDER);
- GridData gd = new GridData(GridData.FILL_HORIZONTAL);
- projectRootLocationText.setLayoutData(gd);
- projectRootLocationText.setText(ResourcesPlugin.getWorkspace().getRoot().getFullPath().toOSString());
- projectRootLocationText.setEnabled(false); /* disabled by default */
-
- browseButton = new Button(projectRootComposite, SWT.PUSH);
- browseButton.setText(defBrowseButtonLabel);
- gd = new GridData(GridData.HORIZONTAL_ALIGN_END);
- browseButton.setLayoutData(gd);
- browseButton.addSelectionListener(new SelectionAdapter() {
-
- @Override
- public void widgetSelected(SelectionEvent e) {
- handleRootProjectBrowseButtonPressed();
- }
- });
-
- synchHelper.synchText(projectRootLocationText, IJ2EEUtilityJarListImportDataModelProperties.PROJECT_ROOT, new Control[]{moduleProjectLocationLabel, projectRootLocationText, browseButton});
- }
-
-
- /**
- * Open an appropriate directory browser
- */
- protected void handleRootProjectBrowseButtonPressed() {
- DirectoryDialog dialog = new DirectoryDialog(browseButton.getShell());
- dialog.setMessage(J2EEUIMessages.getResourceString(J2EEUIMessages.SELECT_DIRECTORY_DLG));
-
- String dirName = getBrowseStartLocation();
-
- if (!isNullOrEmpty(dirName)) {
- File path = new File(dirName);
- if (path.exists())
- dialog.setFilterPath(dirName);
- }
-
- String selectedDirectory = dialog.open();
- if (selectedDirectory != null)
- projectRootLocationText.setText(selectedDirectory);
-
- }
-
- protected String getBrowseStartLocation() {
- String text = projectRootLocationText.getText();
- return text;
- }
-
-
- protected boolean isNullOrEmpty(String aString) {
- return aString == null || aString.length() == 0;
- }
-
- /**
- * Populates the resource name field based upon the currently-selected resources.
- */
- protected void setupBasedOnInitialSelections() {
-
- if (null == currentResourceSelection || currentResourceSelection.isEmpty() || setupBasedOnRefObjectSelection())
- return; // no
- // setup
- // needed
-
- java.util.List selections = new ArrayList();
- Iterator aenum = currentResourceSelection.iterator();
- while (aenum.hasNext()) {
- IResource currentResource = (IResource) aenum.next();
- // do not add inaccessible elements
- if (currentResource.isAccessible())
- selections.add(currentResource);
- }
- if (selections.isEmpty())
- return; // setup not needed anymore
-
- int selectedResourceCount = selections.size();
- if (selectedResourceCount == 1) {
- IResource resource = (IResource) selections.get(0);
- if (resource instanceof IProject && EarUtilities.isEARProject((IProject)resource)) {
- resourceNameCombo.setText(resource.getName().toString());
- }
- }
- }
-
- /**
- * Populates the resource name field based upon the currently-selected resources.
- */
- protected boolean setupBasedOnRefObjectSelection() {
-
- if (currentResourceSelection.size() != 1)
- return false;
-
- Object o = currentResourceSelection.getFirstElement();
- if (!isMetaTypeSupported(o))
- return false;
-
- EObject ref = (EObject) o;
- IResource resource = ProjectUtilities.getProject(ref);
- if (resource != null)
- resourceNameCombo.setText(resource.getName().toString());
- return true;
- }
-
- protected boolean isMetaTypeSupported(Object o) {
- return o instanceof EARFile || o instanceof Application;
- }
-
- protected void enableProjectOptions(boolean enabled) {
- overrideProjectRootCheckbox.setEnabled(enabled);
-
- if (overrideProjectRootCheckbox.getSelection() && enabled)
- projectRootLocationText.setEnabled(true);
- else
- projectRootLocationText.setEnabled(false);
- }
-
-
- /*
- * (non-Javadoc)
- *
- * @see org.eclipse.jface.wizard.WizardPage#isPageComplete()
- */
- @Override
- public boolean isPageComplete() {
- return model.validateProperty(IJ2EEUtilityJarListImportDataModelProperties.EAR_PROJECT_NAME).isOK();
- }
-
-}
diff --git a/plugins/org.eclipse.jst.j2ee.ui/j2ee_ui/org/eclipse/jst/j2ee/internal/wizard/J2EEUtilityJarImportWizardNew.java b/plugins/org.eclipse.jst.j2ee.ui/j2ee_ui/org/eclipse/jst/j2ee/internal/wizard/J2EEUtilityJarImportWizardNew.java
deleted file mode 100644
index 0047efc..0000000
--- a/plugins/org.eclipse.jst.j2ee.ui/j2ee_ui/org/eclipse/jst/j2ee/internal/wizard/J2EEUtilityJarImportWizardNew.java
+++ /dev/null
@@ -1,97 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2003, 2006 IBM Corporation and others.
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
- *
- * Contributors:
- * IBM Corporation - initial API and implementation
- *******************************************************************************/
-package org.eclipse.jst.j2ee.internal.wizard;
-
-import org.eclipse.jst.j2ee.application.internal.operations.J2EEUtilityJarListImportDataModelProvider;
-import org.eclipse.jst.j2ee.internal.plugin.J2EEUIMessages;
-import org.eclipse.wst.common.frameworks.datamodel.IDataModel;
-import org.eclipse.wst.common.frameworks.datamodel.IDataModelProvider;
-import org.eclipse.wst.project.facet.IProductConstants;
-import org.eclipse.wst.project.facet.ProductManager;
-
-
-/**
- * <p>
- * Used to import Utility Jars into several Eclipse workbench configurations. These can be extracted
- * as editable projects, binary projects, linked resources in the EAR module or actual resources in
- * the EAR module.
- * </p>
- */
-public final class J2EEUtilityJarImportWizardNew extends J2EEArtifactImportWizard{
-
- /**
- * <p>
- * Constant used to identify the key of the page of the Wizard which allows users to define the
- * type of import they would like to carry out.
- * </p>
- */
- private static final String IMPORT_TYPE = "IMPORT_TYPE"; //$NON-NLS-1$
-
- /**
- * <p>
- * Constant used to identify the key of the page of the Wizard that allows users to select jar
- * files for import
- * </p>
- */
- private static final String SELECT_JARS = "SELECT_JARS"; //$NON-NLS-1$
-
-
- /**
- * <p>
- * The default constructor. Creates a wizard with no selection, no model instance, and no
- * operation instance. The model and operation will be created as needed.
- * </p>
- */
- public J2EEUtilityJarImportWizardNew() {
- super();
- setWindowTitle(J2EEUIMessages.getResourceString("38")); //$NON-NLS-1$
- }
-
- /**
- * <p>
- * The model is used to prepopulate the wizard controls and interface with the operation.
- * </p>
- *
- * @param model
- * The model parameter is used to pre-populate wizard controls and interface with the
- * operation
- */
- public J2EEUtilityJarImportWizardNew(IDataModel model) {
- super(model);
- setWindowTitle(J2EEUIMessages.getResourceString("38")); //$NON-NLS-1$
- }
-
- /**
- * <p>
- * Adds the following pages:
- * <ul>
- * <li>{@link J2EEUtilityJarImportTypePageNew}as the main wizard page ({@link #IMPORT_TYPE})
- * <li>{@link J2EEUtilityJarImportPageNew}as the main wizard page ({@link #SELECT_JARS})
- * </ul>
- * </p>
- */
- @Override
- public void doAddPages() {
- this.addPage(new J2EEUtilityJarImportTypePageNew(getDataModel(), IMPORT_TYPE, getSelection()));
- this.addPage(new J2EEUtilityJarImportPageNew(getDataModel(), SELECT_JARS));
- }
-
- @Override
- protected IDataModelProvider getDefaultProvider() {
- return new J2EEUtilityJarListImportDataModelProvider();
- }
-
- @Override
- protected String getFinalPerspectiveID() {
- return ProductManager.getProperty(IProductConstants.FINAL_PERSPECTIVE_UTILITY);
- }
-
-}
diff --git a/plugins/org.eclipse.jst.j2ee.ui/j2ee_ui/org/eclipse/jst/j2ee/internal/wizard/J2EEWizardNLS.java b/plugins/org.eclipse.jst.j2ee.ui/j2ee_ui/org/eclipse/jst/j2ee/internal/wizard/J2EEWizardNLS.java
deleted file mode 100644
index 84af015..0000000
--- a/plugins/org.eclipse.jst.j2ee.ui/j2ee_ui/org/eclipse/jst/j2ee/internal/wizard/J2EEWizardNLS.java
+++ /dev/null
@@ -1,14 +0,0 @@
-package org.eclipse.jst.j2ee.internal.wizard;
-
-import org.eclipse.osgi.util.NLS;
-
-public class J2EEWizardNLS extends NLS {
-
- public static final String BUNDLE_NAME = "org.eclipse.jst.j2ee.internal.wizard.messages"; //$NON-NLS-1$
- public static String J2EEExportPage_Optimize_for_a_specific_server_runt_;
-
- static {
- NLS.initializeMessages(BUNDLE_NAME, J2EEWizardNLS.class);
- }
-
-}
diff --git a/plugins/org.eclipse.jst.j2ee.ui/j2ee_ui/org/eclipse/jst/j2ee/internal/wizard/NewJ2EEComponentSelectionPage.java b/plugins/org.eclipse.jst.j2ee.ui/j2ee_ui/org/eclipse/jst/j2ee/internal/wizard/NewJ2EEComponentSelectionPage.java
deleted file mode 100644
index accebf1..0000000
--- a/plugins/org.eclipse.jst.j2ee.ui/j2ee_ui/org/eclipse/jst/j2ee/internal/wizard/NewJ2EEComponentSelectionPage.java
+++ /dev/null
@@ -1,530 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2005, 2007 IBM Corporation and others.
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
- *
- * Contributors:
- * IBM Corporation - initial API and implementation
- * David Schneider, david.schneider@unisys.com - [142500] WTP properties pages fonts don't follow Eclipse preferences
- *******************************************************************************/
-/*
- * Created on Mar 23, 2005
- */
-package org.eclipse.jst.j2ee.internal.wizard;
-
-import java.util.Iterator;
-
-import org.eclipse.core.runtime.CoreException;
-import org.eclipse.jem.util.logger.proxy.Logger;
-import org.eclipse.jface.dialogs.Dialog;
-import org.eclipse.jface.wizard.IWizard;
-import org.eclipse.jface.wizard.IWizardPage;
-import org.eclipse.jst.j2ee.internal.J2EEVersionConstants;
-import org.eclipse.jst.j2ee.internal.actions.IJ2EEUIContextIds;
-import org.eclipse.jst.j2ee.internal.earcreation.IDefaultJ2EEComponentCreationDataModelProperties;
-import org.eclipse.jst.j2ee.internal.moduleextension.EarModuleManager;
-import org.eclipse.jst.j2ee.internal.plugin.J2EEPlugin;
-import org.eclipse.jst.j2ee.internal.plugin.J2EEUIMessages;
-import org.eclipse.swt.SWT;
-import org.eclipse.swt.custom.StackLayout;
-import org.eclipse.swt.layout.GridData;
-import org.eclipse.swt.layout.GridLayout;
-import org.eclipse.swt.widgets.Button;
-import org.eclipse.swt.widgets.Composite;
-import org.eclipse.swt.widgets.Event;
-import org.eclipse.swt.widgets.Label;
-import org.eclipse.swt.widgets.Text;
-import org.eclipse.ui.IPluginContribution;
-import org.eclipse.ui.activities.WorkbenchActivityHelper;
-import org.eclipse.ui.internal.WorkbenchPlugin;
-import org.eclipse.ui.wizards.IWizardDescriptor;
-import org.eclipse.ui.wizards.IWizardRegistry;
-import org.eclipse.wst.common.componentcore.datamodel.properties.IFacetProjectCreationDataModelProperties;
-import org.eclipse.wst.common.frameworks.datamodel.IDataModel;
-import org.eclipse.wst.common.frameworks.internal.datamodel.ui.DataModelWizardPage;
-import org.eclipse.wst.common.frameworks.internal.ui.GenericWizardNode;
-import org.eclipse.wst.web.ui.internal.wizards.NewProjectDataModelFacetWizard;
-
-public class NewJ2EEComponentSelectionPage extends DataModelWizardPage implements IDefaultJ2EEComponentCreationDataModelProperties {
- private Button defaultModulesButton;
-
- private Composite defaultModulesComposite;
-
- private Composite newModulesComposite;
-
- private Button appClientRadioButton;
-
- private Button ejbRadioButton;
-
- private Button webRadioButton;
-
- private Button connectorRadioButton;
-
- private GenericWizardNode appClientNode;
-
- private GenericWizardNode ejbNode;
-
- private GenericWizardNode webNode;
-
- private GenericWizardNode connectorNode;
-
- private GenericWizardNode selectedNode;
-
- private StackLayout stackLayout;
-
- /**
- * @param model
- * @param pageName
- */
- protected NewJ2EEComponentSelectionPage(IDataModel model, String pageName) {
- super(model, pageName);
- setTitle(J2EEUIMessages.getResourceString(J2EEUIMessages.DEFAULT_COMPONENT_PAGE_TITLE));
- setDescription(J2EEUIMessages.getResourceString(J2EEUIMessages.DEFAULT_COMPONENT_PAGE_DESC));
- }
-
- /*
- * (non-Javadoc)
- *
- * @see org.eclipse.wst.common.frameworks.internal.ui.wizard.J2EEWizardPage#getValidationPropertyNames()
- */
- @Override
- protected String[] getValidationPropertyNames() {
- return new String[] { CREATE_APPCLIENT, APPCLIENT_COMPONENT_NAME, CREATE_CONNECTOR, CONNECTOR_COMPONENT_NAME, CREATE_EJB, EJB_COMPONENT_NAME, CREATE_WEB, WEB_COMPONENT_NAME, MODULE_NAME_COLLISIONS_VALIDATION, ENABLED };
- }
-
- /*
- * (non-Javadoc)
- *
- * @see org.eclipse.wst.common.frameworks.internal.ui.wizard.J2EEWizardPage#createTopLevelComposite(org.eclipse.swt.widgets.Composite)
- */
- @Override
- protected Composite createTopLevelComposite(Composite parent) {
- Composite composite = new Composite(parent, SWT.NULL);
- GridLayout layout = new GridLayout();
- layout.numColumns = 1;
- composite.setLayout(layout);
- composite.setLayoutData(new GridData(GridData.FILL_BOTH));
- setInfopopID(IJ2EEUIContextIds.EAR_NEW_MODULE_PROJECTS_PAGE);
- createDefaultCheckBox(composite);
- Composite forStackComposite = new Composite(composite, SWT.NULL);
- layout = new GridLayout();
- forStackComposite.setLayout(layout);
- forStackComposite.setLayoutData(new GridData(GridData.FILL_BOTH));
- Composite stackComposite = createStackLayoutComposite(forStackComposite);
- createDefaultModulesComposite(stackComposite);
- createModuleSelectionComposite(stackComposite);
- stackLayout.topControl = defaultModulesComposite;
- setButtonEnablement();
- Dialog.applyDialogFont(parent);
- return composite;
- }
-
- protected Composite createStackLayoutComposite(Composite parent) {
- Composite composite = new Composite(parent, SWT.NULL);
- stackLayout = new StackLayout();
- composite.setLayout(stackLayout);
- composite.setLayoutData(new GridData(GridData.FILL_BOTH));
- return composite;
- }
-
- private void createDefaultModulesComposite(Composite parent) {
- defaultModulesComposite = new Composite(parent, SWT.NULL);
- GridLayout layout = new GridLayout();
- layout.numColumns = 2;
- layout.marginHeight = 0;
- defaultModulesComposite.setLayout(layout);
- defaultModulesComposite.setLayoutData(new GridData(GridData.FILL_HORIZONTAL));
- // Default Module Controls creation
- createAppClientDefaultModuleControl();
- if (J2EEPlugin.isEJBSupportAvailable())
- createEJBDefaultModuleControl();
- createWebDefaultModuleControl();
- if (J2EEPlugin.isEJBSupportAvailable())
- createConnectorDefaultModuleControl();
- }
-
- /**
- * @param parent
- */
- private void createModuleSelectionComposite(Composite parent) {
- newModulesComposite = new Composite(parent, SWT.NULL);
- GridLayout layout = new GridLayout();
- layout.numColumns = 1;
- newModulesComposite.setLayout(layout);
- newModulesComposite.setLayoutData(new GridData(GridData.FILL_HORIZONTAL));
- appClientRadioButton = new Button(newModulesComposite, SWT.RADIO);
-
- appClientRadioButton.setText(J2EEUIMessages.getResourceString("NewModuleSelectionPage.appClient")); //$NON-NLS-1$
- appClientRadioButton.addListener(SWT.Selection, this);
- if (EarModuleManager.getEJBModuleExtension() != null) {
- ejbRadioButton = new Button(newModulesComposite, SWT.RADIO);
- ejbRadioButton.setText(J2EEUIMessages.getResourceString("NewModuleSelectionPage.ejb")); //$NON-NLS-1$
- ejbRadioButton.addListener(SWT.Selection, this);
- }
- if (EarModuleManager.getWebModuleExtension() != null) {
- webRadioButton = new Button(newModulesComposite, SWT.RADIO);
- webRadioButton.setText(J2EEUIMessages.getResourceString("NewModuleSelectionPage.web")); //$NON-NLS-1$
- webRadioButton.addListener(SWT.Selection, this);
- }
- if (EarModuleManager.getJCAModuleExtension() != null) {
- connectorRadioButton = new Button(newModulesComposite, SWT.RADIO);
- connectorRadioButton.setText(J2EEUIMessages.getResourceString("NewModuleSelectionPage.jca")); //$NON-NLS-1$
- connectorRadioButton.addListener(SWT.Selection, this);
- }
- }
-
- /**
- *
- */
- private void createConnectorDefaultModuleControl() {
- if (EarModuleManager.getJCAModuleExtension() != null) {
- String label = J2EEUIMessages.getResourceString(J2EEUIMessages.DEFAULT_COMPONENT_PAGE_JCA_MODULE_LBL);
- createJ2EEComponentControl(label, CREATE_CONNECTOR, CONNECTOR_COMPONENT_NAME);
- }
- }
-
- /**
- *
- */
- private void createWebDefaultModuleControl() {
- if (EarModuleManager.getWebModuleExtension() != null) {
- String label = J2EEUIMessages.getResourceString(J2EEUIMessages.DEFAULT_COMPONENT_PAGE_WEB_MODULE_LBL);
- createJ2EEComponentControl(label, CREATE_WEB, WEB_COMPONENT_NAME);
- }
- }
-
- /**
- *
- */
- private void createEJBDefaultModuleControl() {
- if (EarModuleManager.getEJBModuleExtension() != null) {
- String label = J2EEUIMessages.getResourceString(J2EEUIMessages.DEFAULT_COMPONENT_PAGE_EJB_MODULE_LBL);
- createJ2EEComponentControl(label, CREATE_EJB, EJB_COMPONENT_NAME);
- }
- }
-
- private void createAppClientDefaultModuleControl() {
- String label = J2EEUIMessages.getResourceString(J2EEUIMessages.DEFAULT_COMPONENT_PAGE_APPCLIENT_MODULE_LBL);
- createJ2EEComponentControl(label, CREATE_APPCLIENT, APPCLIENT_COMPONENT_NAME);
- }
-
- private void createJ2EEComponentControl(String label, String createProperty, String projectProperty) {
- final Button checkBox = new Button(defaultModulesComposite, SWT.CHECK);
- checkBox.setSelection(true);
- checkBox.setText(label);
-
- final Text textField = new Text(defaultModulesComposite, SWT.BORDER);
- GridData data = new GridData(GridData.FILL_HORIZONTAL);
- textField.setLayoutData(data);
- synchHelper.synchCheckbox(checkBox, createProperty, null);
- synchHelper.synchText(textField, projectProperty, null);
- }
-
- private void createDefaultCheckBox(Composite composite) {
- Composite checkBoxComposite = new Composite(composite, SWT.NULL);
- GridLayout layout = new GridLayout();
- checkBoxComposite.setLayout(layout);
- checkBoxComposite.setLayoutData(new GridData(GridData.FILL_BOTH));
- defaultModulesButton = new Button(checkBoxComposite, SWT.CHECK);
- GridData data = new GridData(GridData.HORIZONTAL_ALIGN_BEGINNING);
- data.horizontalIndent = 0;
- defaultModulesButton.setLayoutData(data);
- defaultModulesButton.setText(J2EEUIMessages.getResourceString(J2EEUIMessages.DEFAULT_COMPONENT_PAGE_NEW_MOD_SEL_PG_DEF_BTN));
- defaultModulesButton.setSelection(true);
- defaultModulesButton.addListener(SWT.Selection, this);
- synchHelper.synchCheckbox(defaultModulesButton, ENABLED, null);
- createControlsSeparatorLine(checkBoxComposite);
- }
-
- protected void createControlsSeparatorLine(Composite parent) {
- // add a horizontal line
- Label separator = new Label(parent, SWT.SEPARATOR | SWT.HORIZONTAL);
- GridData data = new GridData(GridData.FILL_HORIZONTAL | GridData.VERTICAL_ALIGN_BEGINNING);
- separator.setLayoutData(data);
- }
-
- /*
- * (non-Javadoc)
- *
- * @see org.eclipse.swt.widgets.Listener#handleEvent(org.eclipse.swt.widgets.Event)
- */
- @Override
- public void handleEvent(Event evt) {
- if (evt.widget == defaultModulesButton)
- handleDefaultModulesButtonPressed();
- else if (!defaultModulesButton.getSelection()) {
- if (evt.widget == appClientRadioButton && appClientRadioButton.getSelection())
- setSelectedNode(getAppClientNode());
- else if (evt.widget == ejbRadioButton && ejbRadioButton.getSelection())
- setSelectedNode(getEjbNode());
- else if (evt.widget == webRadioButton && webRadioButton.getSelection())
- setSelectedNode(getWebNode());
- else if (evt.widget == connectorRadioButton && connectorRadioButton.getSelection())
- setSelectedNode(getConnectorNode());
- validatePage();
- }
- super.handleEvent(evt);
- }
-
- /**
- *
- */
- private void handleDefaultModulesButtonPressed() {
- if (defaultModulesButton.getSelection()) {
- setSelectedNode(null);
- showDefaultModulesComposite();
- setDefaultModulesSelection(true);
- } else {
- setDefaultModulesSelection(false);
- showNewModulesCompsite();
- }
- setButtonEnablement();
- validatePage();
- }
-
- private void setDefaultModulesSelection(boolean selection) {
- getDataModel().setBooleanProperty(CREATE_APPCLIENT, selection);
- getDataModel().setBooleanProperty(CREATE_CONNECTOR, selection);
- getDataModel().setBooleanProperty(CREATE_EJB, selection);
- getDataModel().setBooleanProperty(CREATE_WEB, selection);
- }
-
- private void showDefaultModulesComposite() {
- defaultModulesComposite.setVisible(true);
- newModulesComposite.setVisible(false);
- stackLayout.topControl = defaultModulesComposite;
- }
-
- /**
- * This is done based on the J2EE version. We need to disable Connectors if
- * not j2ee 1.3 or higher.
- */
- private void setButtonEnablement() {
- if (!defaultModulesButton.getSelection() && connectorRadioButton != null) {
- int version = getDataModel().getIntProperty(J2EE_VERSION);
- connectorRadioButton.setEnabled(version > J2EEVersionConstants.J2EE_1_2_ID);
- }
- }
-
- /**
- *
- */
- private void showNewModulesCompsite() {
- defaultModulesComposite.setVisible(false);
- newModulesComposite.setVisible(true);
- if (!isAnyModuleRadioSelected())
- appClientRadioButton.setSelection(true);
- setSelectedNode(getWizardNodeFromSelection());
- stackLayout.topControl = newModulesComposite;
- }
-
- /**
- * @return
- */
- private GenericWizardNode getWizardNodeFromSelection() {
- if (appClientRadioButton.getSelection())
- return getAppClientNode();
- if (connectorRadioButton != null && connectorRadioButton.getSelection())
- return getConnectorNode();
- if (ejbRadioButton != null && ejbRadioButton.getSelection())
- return getEjbNode();
- if (webRadioButton != null && webRadioButton.getSelection())
- return getWebNode();
- return null;
- }
-
- /**
- * @return
- */
- private boolean isAnyModuleRadioSelected() {
- return appClientRadioButton.getSelection() || (connectorRadioButton != null && connectorRadioButton.getSelection()) || (ejbRadioButton != null && ejbRadioButton.getSelection()) || (webRadioButton != null && webRadioButton.getSelection());
- }
-
- /**
- * @return Returns the appClientNode.
- */
- private GenericWizardNode getAppClientNode() {
- if (appClientNode == null) {
- appClientNode = new GenericWizardNode() {
- /*
- * (non-Javadoc)
- *
- * @see org.eclipse.wst.common.frameworks.internal.ui.wizard.GenericWizardNode#createWizard()
- */
- @Override
- protected IWizard createWizard() {
- return createChildWizard("org.eclipse.jst.j2ee.ui.project.facet.appclient.AppClientProjectWizard", NESTED_MODEL_CLIENT); //$NON-NLS-1$
- }
- };
- }
- return appClientNode;
- }
-
- /**
- * @return Returns the connectorNode.
- */
- private GenericWizardNode getConnectorNode() {
- if (connectorNode == null) {
- connectorNode = new GenericWizardNode() {
- /*
- * (non-Javadoc)
- *
- * @see org.eclipse.wst.common.frameworks.internal.ui.wizard.GenericWizardNode#createWizard()
- */
- @Override
- protected IWizard createWizard() {
- return createChildWizard("org.eclipse.jst.j2ee.jca.ui.internal.wizard.ConnectorProjectWizard", NESTED_MODEL_JCA); //$NON-NLS-1$
- }
- };
- }
- return connectorNode;
- }
-
- /**
- * @return Returns the ejbNode.
- */
- private GenericWizardNode getEjbNode() {
- if (ejbNode == null) {
- ejbNode = new GenericWizardNode() {
- /*
- * (non-Javadoc)
- *
- * @see org.eclipse.wst.common.frameworks.internal.ui.wizard.GenericWizardNode#createWizard()
- */
- @Override
- protected IWizard createWizard() {
- return createChildWizard("org.eclipse.jst.ejb.ui.project.facet.EjbProjectWizard", NESTED_MODEL_EJB); //$NON-NLS-1$
- }
- };
- }
- return ejbNode;
- }
-
- /**
- * @return Returns the webNode.
- */
- private GenericWizardNode getWebNode() {
- if (webNode == null) {
- webNode = new GenericWizardNode() {
- /*
- * (non-Javadoc)
- *
- * @see org.eclipse.wst.common.frameworks.internal.ui.wizard.GenericWizardNode#createWizard()
- */
- @Override
- protected IWizard createWizard() {
- return createChildWizard("org.eclipse.jst.servlet.ui.project.facet.WebProjectWizard", NESTED_MODEL_WEB); //$NON-NLS-1$
- }
- };
- }
- return webNode;
- }
-
- private IWizard createChildWizard(String id, String parentWizModelName) {
- NewProjectDataModelFacetWizard wizard = null;
- IWizardRegistry newWizardRegistry = WorkbenchPlugin.getDefault().getNewWizardRegistry();
- IWizardDescriptor wizardDescriptor = newWizardRegistry.findWizard(id);
- try {
- // retrieve the model of the parent wizard
- IDataModel parentWizModel = getDataModel().getNestedModel(parentWizModelName);
-
- // create the child wizard and retrieve its model
- wizard = (NewProjectDataModelFacetWizard) wizardDescriptor.createWizard();
- IDataModel childWizModel = wizard.getDataModel();
-
- // copy the properties of the parent wizard's model to the child wizard's model
- Iterator props = parentWizModel.getBaseProperties().iterator();
- while (props.hasNext()) {
- String prop = (String) props.next();
- if(!prop.equals(IFacetProjectCreationDataModelProperties.FACETED_PROJECT_WORKING_COPY)){
- childWizModel.setProperty(prop, parentWizModel.getProperty(prop));
- }
- }
- } catch (CoreException ce) {
- Logger.getLogger().log(ce);
- }
- return wizard;
- }
-
- /**
- * @param selectedNode
- * The selectedNode to set.
- */
- private void setSelectedNode(GenericWizardNode selectedNode) {
- this.selectedNode = selectedNode;
- }
-
- /*
- * (non-Javadoc)
- *
- * @see org.eclipse.jface.wizard.WizardPage#canFlipToNextPage()
- */
- @Override
- public boolean canFlipToNextPage() {
- if (!defaultModulesButton.getSelection())
- return selectedNode != null;
- return false;
- }
-
- /**
- * The <code>WizardSelectionPage</code> implementation of this
- * <code>IWizardPage</code> method returns the first page of the currently
- * selected wizard if there is one.
- */
- @Override
- public IWizardPage getNextPage() {
- if (selectedNode == null)
- return null;
- IPluginContribution pluginContribution = new IPluginContribution() {
- public String getLocalId() {
- String id = null;
- if (selectedNode == appClientNode) {
- id = "org.eclipse.jst.j2ee.internal.internal.internal.appclientProjectWizard"; //$NON-NLS-1$
- } else if (selectedNode == ejbNode) {
- id = "org.eclipse.jst.j2ee.internal.internal.internal.ejb.ui.util.ejbProjectWizard"; //$NON-NLS-1$
- } else if (selectedNode == connectorNode) {
- id = "org.eclipse.jst.j2ee.internal.internal.internal.jcaProjectWizard"; //$NON-NLS-1$
- } else if (selectedNode == webNode) {
- id = "org.eclipse.jst.j2ee.internal.internal.internal.webProjectWizard"; //$NON-NLS-1$
- }
- return id;
- }
-
- public String getPluginId() {
- return "org.eclipse.jst.j2ee.internal.internal.internal.ui"; //$NON-NLS-1$
- }
- };
-
- if (!WorkbenchActivityHelper.allowUseOf(null,pluginContribution)) {
- return null;
- }
-
- boolean isCreated = selectedNode.isContentCreated();
- IWizard wizard = selectedNode.getWizard();
- if (wizard == null) {
- setSelectedNode(null);
- return null;
- }
- if (!isCreated) // Allow the wizard to create its pages
- wizard.addPages();
-
- return wizard.getStartingPage();
- }
-
- /*
- * (non-Javadoc)
- *
- * @see org.eclipse.wst.common.frameworks.internal.ui.wizard.J2EEWizardPage#validatePage()
- */
- @Override
- protected void validatePage() {
- if (!defaultModulesButton.getSelection()) {
- setPageComplete(false);
- setErrorMessage(null);
- } else
- super.validatePage();
- }
-
-}
diff --git a/plugins/org.eclipse.jst.j2ee.ui/j2ee_ui/org/eclipse/jst/j2ee/internal/wizard/NewJavaClassOptionsWizardPage.java b/plugins/org.eclipse.jst.j2ee.ui/j2ee_ui/org/eclipse/jst/j2ee/internal/wizard/NewJavaClassOptionsWizardPage.java
deleted file mode 100644
index c64ddd4..0000000
--- a/plugins/org.eclipse.jst.j2ee.ui/j2ee_ui/org/eclipse/jst/j2ee/internal/wizard/NewJavaClassOptionsWizardPage.java
+++ /dev/null
@@ -1,404 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2003, 2007 IBM Corporation and others.
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
- *
- * Contributors:
- * IBM Corporation - initial API and implementation
- * David Schneider, david.schneider@unisys.com - [142500] WTP properties pages fonts don't follow Eclipse preferences
- *******************************************************************************/
-package org.eclipse.jst.j2ee.internal.wizard;
-
-import java.util.ArrayList;
-import java.util.List;
-
-import org.eclipse.core.resources.IProject;
-import org.eclipse.jdt.core.IJavaProject;
-import org.eclipse.jdt.core.IType;
-import org.eclipse.jdt.core.search.IJavaSearchConstants;
-import org.eclipse.jdt.core.search.IJavaSearchScope;
-import org.eclipse.jdt.internal.ui.JavaPluginImages;
-import org.eclipse.jdt.internal.ui.dialogs.FilteredTypesSelectionDialog;
-import org.eclipse.jem.workbench.utility.JemProjectUtilities;
-import org.eclipse.jface.dialogs.Dialog;
-import org.eclipse.jface.operation.IRunnableContext;
-import org.eclipse.jface.viewers.ILabelProvider;
-import org.eclipse.jface.viewers.ILabelProviderListener;
-import org.eclipse.jface.viewers.ISelection;
-import org.eclipse.jface.viewers.ISelectionChangedListener;
-import org.eclipse.jface.viewers.IStructuredContentProvider;
-import org.eclipse.jface.viewers.IStructuredSelection;
-import org.eclipse.jface.viewers.SelectionChangedEvent;
-import org.eclipse.jface.viewers.TableViewer;
-import org.eclipse.jface.viewers.Viewer;
-import org.eclipse.jface.window.Window;
-import org.eclipse.jst.j2ee.internal.actions.IJ2EEUIContextIds;
-import org.eclipse.jst.j2ee.internal.common.operations.INewJavaClassDataModelProperties;
-import org.eclipse.jst.j2ee.internal.dialogs.TypeSearchEngine;
-import org.eclipse.jst.j2ee.internal.plugin.J2EEUIMessages;
-import org.eclipse.swt.SWT;
-import org.eclipse.swt.events.KeyEvent;
-import org.eclipse.swt.events.KeyListener;
-import org.eclipse.swt.events.SelectionEvent;
-import org.eclipse.swt.events.SelectionListener;
-import org.eclipse.swt.graphics.Image;
-import org.eclipse.swt.layout.GridData;
-import org.eclipse.swt.layout.GridLayout;
-import org.eclipse.swt.widgets.Button;
-import org.eclipse.swt.widgets.Composite;
-import org.eclipse.swt.widgets.Label;
-import org.eclipse.swt.widgets.TableItem;
-import org.eclipse.ui.PlatformUI;
-import org.eclipse.wst.common.frameworks.datamodel.IDataModel;
-import org.eclipse.wst.common.frameworks.internal.datamodel.ui.DataModelWizardPage;
-
-/**
- * @author jialin
- *
- * To change the template for this generated type comment go to Window -
- * Preferences - Java - Code Generation - Code and Comments
- */
-public class NewJavaClassOptionsWizardPage extends DataModelWizardPage {
-
- protected Button publicButton;
- protected Button abstractButton;
- protected Button finalButton;
- protected TableViewer interfaceViewer;
- protected Button addButton;
- protected Button removeButton;
- protected Button inheritButton;
- protected Button constructorButton;
- protected Button mainMethodButton;
-
- /**
- * @param model
- * @param pageName
- */
- public NewJavaClassOptionsWizardPage(IDataModel model, String pageName, String pageDesc, String pageTitle) {
- super(model, pageName);
- setDescription(pageDesc);
- this.setTitle(pageTitle);
- setInfopopID(IJ2EEUIContextIds.NEW_JAVA_CLASS_OPTION_WIZARD_P1);
- }
-
- /*
- * (non-Javadoc)
- *
- * @see org.eclipse.jem.util.ui.wizard.WTPWizardPage#getValidationPropertyNames()
- */
- @Override
- protected String[] getValidationPropertyNames() {
- return new String[]{INewJavaClassDataModelProperties.MODIFIER_ABSTRACT, INewJavaClassDataModelProperties.MODIFIER_FINAL};
- }
-
- /*
- * (non-Javadoc)
- *
- * @see org.eclipse.jem.util.ui.wizard.WTPWizardPage#createTopLevelComposite(org.eclipse.swt.widgets.Composite)
- */
- @Override
- protected Composite createTopLevelComposite(Composite parent) {
- Composite composite = new Composite(parent, SWT.NULL);
- GridLayout layout = new GridLayout();
- layout.numColumns = 2;
- composite.setLayout(layout);
- GridData data = new GridData(GridData.FILL_BOTH);
- data.widthHint = 300;
- composite.setLayoutData(data);
-
- createModifierControls(composite);
- createInterfaceControls(composite);
-
- // Separator label
- Label seperator = new Label(composite, SWT.HORIZONTAL | SWT.SEPARATOR);
- data = new GridData(GridData.HORIZONTAL_ALIGN_FILL);
- data.horizontalSpan = 2;
- seperator.setLayoutData(data);
-
- createStubsComposite(composite);
-
- publicButton.setFocus();
- PlatformUI.getWorkbench().getHelpSystem().setHelp(composite, getInfopopID());
- Dialog.applyDialogFont(parent);
- return composite;
- }
-
- /**
- * Create controls for the modifiers
- */
- protected void createModifierControls(Composite parent) {
- Label modifiersLabel = new Label(parent, SWT.NONE);
- modifiersLabel.setText(J2EEUIMessages.JAVA_CLASS_MODIFIERS_LABEL);
- modifiersLabel.setLayoutData(new GridData(GridData.HORIZONTAL_ALIGN_BEGINNING));
- Composite composite = new Composite(parent, SWT.NULL);
- GridLayout layout = new GridLayout();
- layout.numColumns = 3;
- layout.makeColumnsEqualWidth = true;
- composite.setLayout(layout);
- composite.setLayoutData(new GridData(GridData.FILL_HORIZONTAL));
-
- publicButton = new Button(composite, SWT.CHECK);
- publicButton.setText(J2EEUIMessages.JAVA_CLASS_PUBLIC_CHECKBOX_LABEL);
- synchHelper.synchCheckbox(publicButton, INewJavaClassDataModelProperties.MODIFIER_PUBLIC, null);
-
- abstractButton = new Button(composite, SWT.CHECK);
- abstractButton.setText(J2EEUIMessages.JAVA_CLASS_ABSTRACT_CHECKBOX_LABEL);
- synchHelper.synchCheckbox(abstractButton, INewJavaClassDataModelProperties.MODIFIER_ABSTRACT, null);
-
- finalButton = new Button(composite, SWT.CHECK);
- finalButton.setText(J2EEUIMessages.JAVA_CLASS_FINAL_CHECKBOX_LABEL);
- synchHelper.synchCheckbox(finalButton, INewJavaClassDataModelProperties.MODIFIER_FINAL, null);
- }
-
- protected void createInterfaceControls(Composite parent) {
- Label interfaceLabel = new Label(parent, SWT.NONE);
- interfaceLabel.setText(J2EEUIMessages.JAVA_CLASS_INTERFACES_LABEL);
- interfaceLabel.setLayoutData(new GridData(GridData.HORIZONTAL_ALIGN_BEGINNING | GridData.VERTICAL_ALIGN_BEGINNING));
- Composite composite = new Composite(parent, SWT.NULL);
- GridLayout layout = new GridLayout();
- layout.numColumns = 2;
- composite.setLayout(layout);
- composite.setLayoutData(new GridData(GridData.FILL_BOTH));
-
- interfaceViewer = new TableViewer(composite, SWT.BORDER | SWT.MULTI);
- interfaceViewer.getControl().setLayoutData(new GridData(GridData.FILL_BOTH));
- interfaceViewer.setContentProvider(getInterfaceContentProvider());
- interfaceViewer.setLabelProvider(getInterfaceLabelProvider());
- interfaceViewer.getControl().addKeyListener(getInterfaceKeyListener());
- interfaceViewer.setInput(model.getProperty(INewJavaClassDataModelProperties.INTERFACES));
-
- Composite buttonCompo = new Composite(composite, SWT.NULL);
- layout = new GridLayout();
- layout.marginHeight = 0;
- buttonCompo.setLayout(layout);
- buttonCompo.setLayoutData(new GridData(GridData.FILL_VERTICAL | GridData.VERTICAL_ALIGN_BEGINNING));
-
- addButton = new Button(buttonCompo, SWT.PUSH);
- addButton.setText(J2EEUIMessages.ADD_BUTTON_LABEL);
- addButton.setLayoutData(new GridData(GridData.VERTICAL_ALIGN_BEGINNING | GridData.HORIZONTAL_ALIGN_FILL));
- addButton.addSelectionListener(new SelectionListener() {
- public void widgetSelected(SelectionEvent event) {
- handleInterfaceAddButtonSelected();
- }
- public void widgetDefaultSelected(SelectionEvent event) {
- //Do nothing
- }
- });
-
- removeButton = new Button(buttonCompo, SWT.PUSH);
- removeButton.setText(J2EEUIMessages.REMOVE_BUTTON);
- removeButton.setLayoutData(new GridData(GridData.VERTICAL_ALIGN_BEGINNING | GridData.HORIZONTAL_ALIGN_FILL));
- removeButton.addSelectionListener(new SelectionListener() {
- public void widgetSelected(SelectionEvent event) {
- handleInterfaceRemoveButtonSelected();
- }
- public void widgetDefaultSelected(SelectionEvent event) {
- //Do nothing
- }
- });
- removeButton.setEnabled(false);
-
- interfaceViewer.addSelectionChangedListener(new ISelectionChangedListener() {
- public void selectionChanged(SelectionChangedEvent event) {
- ISelection selection = event.getSelection();
- removeButton.setEnabled(!selection.isEmpty());
- }
- });
-
- }
-
- /**
- * Create the composite with all the stubs
- */
- protected void createStubsComposite(Composite parent) {
- Label stubLabel = new Label(parent, SWT.NONE);
- stubLabel.setText(J2EEUIMessages.JAVA_CLASS_METHOD_STUBS_LABEL);
- GridData data = new GridData(GridData.HORIZONTAL_ALIGN_FILL);
- data.horizontalSpan = 2;
- stubLabel.setLayoutData(data);
-
- Composite buttonCompo = new Composite(parent, SWT.NULL);
- buttonCompo.setLayout(new GridLayout());
- data = new GridData(GridData.HORIZONTAL_ALIGN_FILL);
- data.horizontalSpan = 2;
- data.horizontalIndent = 15;
- buttonCompo.setLayoutData(data);
-
- mainMethodButton = new Button(buttonCompo, SWT.CHECK);
- mainMethodButton.setText(J2EEUIMessages.JAVA_CLASS_MAIN_CHECKBOX_LABEL);
- synchHelper.synchCheckbox(mainMethodButton, INewJavaClassDataModelProperties.MAIN_METHOD, null);
-
- inheritButton = new Button(buttonCompo, SWT.CHECK);
- inheritButton.setText(J2EEUIMessages.JAVA_CLASS_INHERIT_CHECKBOX_LABEL);
- synchHelper.synchCheckbox(inheritButton, INewJavaClassDataModelProperties.ABSTRACT_METHODS, null);
-
- constructorButton = new Button(buttonCompo, SWT.CHECK);
- constructorButton.setText(J2EEUIMessages.JAVA_CLASS_CONSTRUCTOR_CHECKBOX_LABEL);
- synchHelper.synchCheckbox(constructorButton, INewJavaClassDataModelProperties.CONSTRUCTOR, null);
- }
-
- @Override
- protected void enter() {
- super.enter();
- //set the intefaces on every page enter (not only on viewer creation)
- interfaceViewer.setInput(model.getProperty(INewJavaClassDataModelProperties.INTERFACES));
- }
-
- /**
- * @see IStatefulWizardPage#saveWidgetValues()
- */
- // public void saveWidgetValues() {
- // // TODO: do we want to do this here or in the concrete subclasses???
- // IDialogSettings store = getDialogSettings();
- // if (store != null)
- // store.put(getUniqueKey(""), getUniqueKey("")); //$NON-NLS-1$
- // //$NON-NLS-2$
- // DialogSettingsHelper.saveButton(inheritButton,
- // getUniqueKey(idInheritedAbstractButton), store);
- // DialogSettingsHelper.saveButton(constructorButton,
- // getUniqueKey(idSuperClassConstructorsButton), store);
- // DialogSettingsHelper.saveButton(publicButton,
- // getUniqueKey(idPublicButton), store);
- // DialogSettingsHelper.saveButton(abstractButton,
- // getUniqueKey(idAbstractButton), store);
- // DialogSettingsHelper.saveButton(finalButton, getUniqueKey(idFinalButton),
- // store);
- //
- // }
- /**
- * @see IStatefulWizardPage#restoreWidgetValues()
- */
- // public void restoreWidgetValues() {
- // IDialogSettings store = super.getDialogSettings();
- // if (store != null && store.get(getUniqueKey("")) != null) { //$NON-NLS-1$
- // DialogSettingsHelper.restoreButton(inheritButton,
- // getUniqueKey(idInheritedAbstractButton), store);
- // DialogSettingsHelper.restoreButton(constructorButton,
- // getUniqueKey(idSuperClassConstructorsButton), store);
- // DialogSettingsHelper.restoreButton(publicButton,
- // getUniqueKey(idPublicButton), store);
- // DialogSettingsHelper.restoreButton(abstractButton,
- // getUniqueKey(idAbstractButton), store);
- // DialogSettingsHelper.restoreButton(finalButton,
- // getUniqueKey(idFinalButton), store);
- // }
- // }
- /**
- * Returns the Super Interface Content Provider
- */
- protected IStructuredContentProvider getInterfaceContentProvider() {
- return new IStructuredContentProvider() {
- public Object[] getElements(Object inputElement) {
- Object[] ret = new Object[0];
- if (inputElement instanceof List) {
- ret = ((List) inputElement).toArray();
- }
- return ret;
- }
- public void dispose() {
- //Do nothing
- }
- public void inputChanged(Viewer viewer, Object oldInput, Object newInput) {
- //Default is nothing
- }
- };
- }
-
- /**
- * Returns the Super Interface Label Provider
- */
- protected ILabelProvider getInterfaceLabelProvider() {
- return new ILabelProvider() {
- public Image getImage(Object element) {
- return JavaPluginImages.get(JavaPluginImages.IMG_OBJS_INTERFACE);
- }
-
- public String getText(Object element) {
- String ret = J2EEUIMessages.EMPTY_STRING;
- if (element instanceof String)
- ret = (String) element;
- return ret;
- }
-
- public void addListener(ILabelProviderListener listener) {
- //Do nothing
- }
- public void dispose() {
- //Do nothing
- }
- public boolean isLabelProperty(Object element, String property) {
- return true;
- }
- public void removeListener(ILabelProviderListener listener) {
- //Do nothing
- }
- };
- }
-
- protected KeyListener getInterfaceKeyListener() {
- return new KeyListener() {
-
- public void keyPressed(KeyEvent e) {
- }
-
- public void keyReleased(KeyEvent e) {
- if (e.keyCode == SWT.DEL) {
- handleInterfaceRemoveButtonSelected();
- }
- }
-
- };
- }
-
- /**
- * Browse for a new Super Interface Class
- */
- protected void handleInterfaceAddButtonSelected() {
- IProject project = (IProject) model.getProperty(INewJavaClassDataModelProperties.PROJECT);
- IRunnableContext context = PlatformUI.getWorkbench().getActiveWorkbenchWindow();
- IJavaProject javaProject = JemProjectUtilities.getJavaProject(project);
- // this eliminates the non-exported classpath entries
- final IJavaSearchScope scope = TypeSearchEngine.createJavaSearchScopeForAProject(javaProject, true, true);
- FilteredTypesSelectionDialog dialog = new FilteredTypesSelectionDialog(getShell(),false, context, scope,IJavaSearchConstants.INTERFACE);
- dialog.setTitle(J2EEUIMessages.INTERFACE_SELECTION_DIALOG_TITLE);
- if (dialog.open() == Window.OK) {
- IType type = (IType) dialog.getFirstResult();
- String newInterface = ""; //$NON-NLS-1$
- if (type != null) {
- newInterface = type.getFullyQualifiedName();
- List valueList = getInterfaceViewerItems();
- if (!valueList.contains(newInterface)) {
- interfaceViewer.add(newInterface);
- model.setProperty(INewJavaClassDataModelProperties.INTERFACES, getInterfaceViewerItems());
- }
- }
- }
- }
-
- /**
- * Remove an interface from the SuperInterface List
- */
- protected void handleInterfaceRemoveButtonSelected() {
- IStructuredSelection selection = (IStructuredSelection) interfaceViewer.getSelection();
- List items = selection.toList();
- if (!items.isEmpty()) {
- List valueList = getInterfaceViewerItems();
- for (int i = 0; i < items.size(); i++) {
- valueList.remove(items.get(i));
- }
- interfaceViewer.setInput(valueList);
- model.setProperty(INewJavaClassDataModelProperties.INTERFACES, valueList);
- }
- }
-
- private List getInterfaceViewerItems() {
- ArrayList<String> list = new ArrayList<String>();
- TableItem[] items = interfaceViewer.getTable().getItems();
- for (TableItem item : items) {
- list.add(item.getText());
- }
- return list;
- }
-}
diff --git a/plugins/org.eclipse.jst.j2ee.ui/j2ee_ui/org/eclipse/jst/j2ee/internal/wizard/NewJavaClassWizardPage.java b/plugins/org.eclipse.jst.j2ee.ui/j2ee_ui/org/eclipse/jst/j2ee/internal/wizard/NewJavaClassWizardPage.java
deleted file mode 100644
index 2365c92..0000000
--- a/plugins/org.eclipse.jst.j2ee.ui/j2ee_ui/org/eclipse/jst/j2ee/internal/wizard/NewJavaClassWizardPage.java
+++ /dev/null
@@ -1,748 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2003, 2007 IBM Corporation and others.
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
- *
- * Contributors:
- * IBM Corporation - initial API and implementation
- * David Schneider, david.schneider@unisys.com - [142500] WTP properties pages fonts don't follow Eclipse preferences
- *******************************************************************************/
-
-package org.eclipse.jst.j2ee.internal.wizard;
-
-import java.util.ArrayList;
-import java.util.List;
-
-import org.eclipse.core.resources.IContainer;
-import org.eclipse.core.resources.IFolder;
-import org.eclipse.core.resources.IProject;
-import org.eclipse.core.resources.IResource;
-import org.eclipse.core.resources.IWorkspaceRoot;
-import org.eclipse.core.resources.ResourcesPlugin;
-import org.eclipse.core.runtime.CoreException;
-import org.eclipse.core.runtime.IAdaptable;
-import org.eclipse.core.runtime.IStatus;
-import org.eclipse.core.runtime.Platform;
-import org.eclipse.emf.ecore.EObject;
-import org.eclipse.jdt.core.ICompilationUnit;
-import org.eclipse.jdt.core.IJavaElement;
-import org.eclipse.jdt.core.IJavaProject;
-import org.eclipse.jdt.core.IPackageFragment;
-import org.eclipse.jdt.core.IPackageFragmentRoot;
-import org.eclipse.jdt.core.IType;
-import org.eclipse.jdt.core.JavaCore;
-import org.eclipse.jdt.core.JavaModelException;
-import org.eclipse.jdt.core.search.IJavaSearchConstants;
-import org.eclipse.jdt.core.search.IJavaSearchScope;
-import org.eclipse.jdt.internal.ui.JavaPlugin;
-import org.eclipse.jdt.internal.ui.dialogs.FilteredTypesSelectionDialog;
-import org.eclipse.jdt.internal.ui.viewsupport.IViewPartInputProvider;
-import org.eclipse.jdt.ui.JavaElementLabelProvider;
-import org.eclipse.jem.util.emf.workbench.ProjectUtilities;
-import org.eclipse.jface.dialogs.Dialog;
-import org.eclipse.jface.viewers.DecoratingLabelProvider;
-import org.eclipse.jface.viewers.ILabelProvider;
-import org.eclipse.jface.viewers.ISelection;
-import org.eclipse.jface.viewers.IStructuredSelection;
-import org.eclipse.jface.viewers.ITreeContentProvider;
-import org.eclipse.jface.viewers.TreePath;
-import org.eclipse.jface.viewers.TreeSelection;
-import org.eclipse.jface.viewers.Viewer;
-import org.eclipse.jface.viewers.ViewerFilter;
-import org.eclipse.jface.window.Window;
-import org.eclipse.jst.j2ee.internal.common.operations.INewJavaClassDataModelProperties;
-import org.eclipse.jst.j2ee.internal.dialogs.TypeSearchEngine;
-import org.eclipse.jst.j2ee.internal.plugin.J2EEUIMessages;
-import org.eclipse.jst.j2ee.internal.project.J2EEProjectUtilities;
-import org.eclipse.jst.j2ee.project.JavaEEProjectUtilities;
-import org.eclipse.swt.SWT;
-import org.eclipse.swt.events.SelectionAdapter;
-import org.eclipse.swt.events.SelectionEvent;
-import org.eclipse.swt.events.SelectionListener;
-import org.eclipse.swt.graphics.Cursor;
-import org.eclipse.swt.layout.GridData;
-import org.eclipse.swt.layout.GridLayout;
-import org.eclipse.swt.widgets.Button;
-import org.eclipse.swt.widgets.Combo;
-import org.eclipse.swt.widgets.Composite;
-import org.eclipse.swt.widgets.Label;
-import org.eclipse.swt.widgets.Text;
-import org.eclipse.ui.IWorkbenchPart;
-import org.eclipse.ui.IWorkbenchWindow;
-import org.eclipse.ui.PlatformUI;
-import org.eclipse.ui.dialogs.ElementListSelectionDialog;
-import org.eclipse.ui.dialogs.ElementTreeSelectionDialog;
-import org.eclipse.ui.dialogs.ISelectionStatusValidator;
-import org.eclipse.ui.model.WorkbenchContentProvider;
-import org.eclipse.ui.model.WorkbenchLabelProvider;
-import org.eclipse.ui.views.contentoutline.ContentOutline;
-import org.eclipse.wst.common.componentcore.internal.operation.IArtifactEditOperationDataModelProperties;
-import org.eclipse.wst.common.componentcore.internal.util.IModuleConstants;
-import org.eclipse.wst.common.frameworks.datamodel.IDataModel;
-import org.eclipse.wst.common.frameworks.internal.datamodel.ui.DataModelWizardPage;
-import org.eclipse.wst.common.frameworks.internal.plugin.WTPCommonPlugin;
-
-/**
- *
- */
-public class NewJavaClassWizardPage extends DataModelWizardPage {
-
- private Text folderText;
- private Button folderButton;
- protected Text packageText;
- protected Button packageButton;
- protected Label packageLabel;
- protected Text classText;
- protected Label classLabel;
- protected Text superText;
- protected Button superButton;
- protected Label superLabel;
- protected Label projectNameLabel;
- private Combo projectNameCombo;
- protected String projectType;
- private String projectName;
-
- /**
- * @param model
- * @param pageName
- */
- public NewJavaClassWizardPage(IDataModel model, String pageName, String pageDesc, String pageTitle,
- String moduleType) {
- super(model, pageName);
- setDescription(pageDesc);
- this.setTitle(pageTitle);
- setPageComplete(false);
- this.projectType = moduleType;
- this.projectName = null;
- }
-
- /**
- *
- */
- @Override
- protected String[] getValidationPropertyNames() {
- return new String[]{IArtifactEditOperationDataModelProperties.PROJECT_NAME,
- IArtifactEditOperationDataModelProperties.COMPONENT_NAME,
- INewJavaClassDataModelProperties.SOURCE_FOLDER,
- INewJavaClassDataModelProperties.JAVA_PACKAGE,
- INewJavaClassDataModelProperties.CLASS_NAME,
- INewJavaClassDataModelProperties.SUPERCLASS};
- }
-
- /**
- *
- */
- @Override
- protected Composite createTopLevelComposite(Composite parent) {
- Composite composite = new Composite(parent, SWT.NULL);
- GridLayout layout = new GridLayout();
- layout.numColumns = 3;
- composite.setLayout(layout);
- GridData data = new GridData();
- data.verticalAlignment = GridData.FILL;
- data.horizontalAlignment = GridData.FILL;
- data.widthHint = 300;
- composite.setLayoutData(data);
-
- addProjectNameGroup(composite);
- addFolderGroup(composite);
- addSeperator(composite, 3);
- addPackageGroup(composite);
- addClassnameGroup(composite);
- addSuperclassGroup(composite);
-
- // set the cursor focus
- // - to the "Java package" if it is empty
- // - to the "Class name" - otherwise
- if (packageText.getText().trim().length() == 0) {
- packageText.setFocus();
- } else {
- classText.setFocus();
- }
-
- PlatformUI.getWorkbench().getHelpSystem().setHelp(composite, getInfopopID());
- Dialog.applyDialogFont(parent);
- return composite;
- }
-
- /**
- * Add project group
- */
- private void addProjectNameGroup(Composite parent) {
- // set up project name label
- projectNameLabel = new Label(parent, SWT.NONE);
- projectNameLabel.setText(J2EEUIMessages.getResourceString(J2EEUIMessages.MODULES_DEPENDENCY_PAGE_TABLE_PROJECT));
- GridData data = new GridData();
- projectNameLabel.setLayoutData(data);
- // set up project name entry field
- projectNameCombo = new Combo(parent, SWT.BORDER | SWT.READ_ONLY);
- data = new GridData(GridData.FILL_HORIZONTAL);
- data.widthHint = 300;
- data.horizontalSpan = 1;
- projectNameCombo.setLayoutData(data);
- projectNameCombo.addSelectionListener(new SelectionAdapter() {
- @Override
- public void widgetSelected(SelectionEvent e) {
- super.widgetSelected(e);
- IProject project = ProjectUtilities.getProject(projectNameCombo.getText());
- validateProjectRequirements(project);
- }
- });
- synchHelper.synchCombo(projectNameCombo, IArtifactEditOperationDataModelProperties.PROJECT_NAME, null);
- initializeProjectList();
- new Label(parent, SWT.NONE);
- }
-
- /**
- *
- **/
- private IFolder getDefaultJavaSourceFolder(IProject project) {
-
- if (project == null)
- return null;
- IPackageFragmentRoot[] sources = J2EEProjectUtilities.getSourceContainers(project);
- // Try and return the first source folder
- if (sources.length > 0) {
- try {
- return (IFolder) sources[0].getCorrespondingResource();
- } catch (Exception e) {
- return null;
- }
- }
- return null;
- }
-
- /**
- * This method is used by the project list initializer. The method checks
- * if the specified project is valid to include it in the project list.
- *
- * <p>Subclasses of this wizard page should override this method to
- * adjust filtering of the projects to their needs. </p>
- *
- * @param project reference to the project to be checked
- *
- * @return <code>true</code> if the project is valid to be included in
- * the project list, <code>false</code> - otherwise.
- */
- protected boolean isProjectValid(IProject project) {
- boolean result;
- try {
- result = project.isAccessible() &&
- project.hasNature(IModuleConstants.MODULE_NATURE_ID) &&
- JavaEEProjectUtilities.getJ2EEProjectType(project).equals(projectType);
- } catch (CoreException ce) {
- result = false;
- }
- return result;
- }
-
- /**
- *
- */
- private void initializeProjectList() {
- IProject[] workspaceProjects = ProjectUtilities.getAllProjects();
- List items = new ArrayList();
- for (int i = 0; i < workspaceProjects.length; i++) {
- IProject project = workspaceProjects[i];
- if (isProjectValid(project))
- items.add(project.getName());
- }
- if (items.isEmpty()) return;
- String[] names = new String[items.size()];
- for (int i = 0; i < items.size(); i++) {
- names[i] = (String) items.get(i);
- }
- projectNameCombo.setItems(names);
- IProject selectedProject = null;
- try {
- if (model !=null) {
- String projectNameFromModel = model.getStringProperty(IArtifactEditOperationDataModelProperties.COMPONENT_NAME);
- if (projectNameFromModel!=null && projectNameFromModel.length()>0)
- selectedProject = ProjectUtilities.getProject(projectNameFromModel);
- }
- } catch (Exception e) {}
- try {
- if (selectedProject == null)
- selectedProject = getSelectedProject();
- if (selectedProject != null && selectedProject.isAccessible()
- && selectedProject.hasNature(IModuleConstants.MODULE_NATURE_ID)) {
- projectNameCombo.setText(selectedProject.getName());
- validateProjectRequirements(selectedProject);
- model.setProperty(IArtifactEditOperationDataModelProperties.PROJECT_NAME, selectedProject.getName());
- }
- } catch (CoreException ce) {
- // Ignore
- }
- if (projectName == null && names.length > 0)
- projectName = names[0];
-
- if ((projectNameCombo.getText() == null || projectNameCombo.getText().length() == 0) && projectName != null) {
- projectNameCombo.setText(projectName);
- validateProjectRequirements(ProjectUtilities.getProject(projectName));
- model.setProperty(IArtifactEditOperationDataModelProperties.PROJECT_NAME, projectName);
- }
-
- }
-
- /**
- * Add folder group to composite
- */
- private void addFolderGroup(Composite composite) {
- // folder
- Label folderLabel = new Label(composite, SWT.LEFT);
- folderLabel.setText(J2EEUIMessages.FOLDER_LABEL);
- folderLabel.setLayoutData(new GridData(GridData.HORIZONTAL_ALIGN_FILL));
-
- folderText = new Text(composite, SWT.SINGLE | SWT.BORDER);
- folderText.setLayoutData(new GridData(GridData.FILL_HORIZONTAL));
- synchHelper.synchText(folderText, INewJavaClassDataModelProperties.SOURCE_FOLDER, null);
-
- IPackageFragmentRoot root = getSelectedPackageFragmentRoot();
- String projectName = model.getStringProperty(IArtifactEditOperationDataModelProperties.PROJECT_NAME);
- if (projectName != null && projectName.length() > 0) {
- IProject targetProject = ProjectUtilities.getProject(projectName);
- if (root == null || !root.getJavaProject().getProject().equals(targetProject)) {
- IFolder folder = getDefaultJavaSourceFolder(targetProject);
- if (folder != null)
- folderText.setText(folder.getFullPath().toOSString());
- } else {
- folderText.setText(root.getPath().toString());
- }
- }
-
- folderButton = new Button(composite, SWT.PUSH);
- folderButton.setText(J2EEUIMessages.BROWSE_BUTTON_LABEL_O);
- folderButton.setLayoutData(new GridData(GridData.HORIZONTAL_ALIGN_FILL));
- folderButton.addSelectionListener(new SelectionListener() {
- public void widgetSelected(SelectionEvent e) {
- handleFolderButtonPressed();
- }
-
- public void widgetDefaultSelected(SelectionEvent e) {
- // Do nothing
- }
- });
- }
-
- /**
- * Add package group to composite
- */
- private void addPackageGroup(Composite composite) {
- // package
- packageLabel = new Label(composite, SWT.LEFT);
- packageLabel.setText(J2EEUIMessages.JAVA_PACKAGE_LABEL);
- packageLabel.setLayoutData(new GridData(GridData.HORIZONTAL_ALIGN_FILL));
-
- packageText = new Text(composite, SWT.SINGLE | SWT.BORDER);
- packageText.setLayoutData(new GridData(GridData.FILL_HORIZONTAL));
- synchHelper.synchText(packageText, INewJavaClassDataModelProperties.JAVA_PACKAGE, null);
-
- IPackageFragment packageFragment = getSelectedPackageFragment();
- String targetProject = model.getStringProperty(IArtifactEditOperationDataModelProperties.PROJECT_NAME);
- if (packageFragment != null && packageFragment.exists() &&
- packageFragment.getJavaProject().getElementName().equals(targetProject)) {
- IPackageFragmentRoot root = getPackageFragmentRoot(packageFragment);
- if (root != null)
- folderText.setText(root.getPath().toString());
- model.setProperty(INewJavaClassDataModelProperties.JAVA_PACKAGE, packageFragment.getElementName());
- }
-
- packageButton = new Button(composite, SWT.PUSH);
- packageButton.setText(J2EEUIMessages.BROWSE_BUTTON_LABEL_W);
- packageButton.setLayoutData(new GridData(GridData.HORIZONTAL_ALIGN_FILL));
- packageButton.addSelectionListener(new SelectionListener() {
- public void widgetSelected(SelectionEvent e) {
- handlePackageButtonPressed();
- }
-
- public void widgetDefaultSelected(SelectionEvent e) {
- // Do nothing
- }
- });
- }
-
- protected IPackageFragmentRoot getPackageFragmentRoot(IPackageFragment packageFragment) {
- if (packageFragment == null)
- return null;
- else if (packageFragment.getParent() instanceof IPackageFragment)
- return getPackageFragmentRoot((IPackageFragment) packageFragment.getParent());
- else if (packageFragment.getParent() instanceof IPackageFragmentRoot)
- return (IPackageFragmentRoot) packageFragment.getParent();
- else
- return null;
- }
-
- /**
- * Add classname group to composite
- */
- private void addClassnameGroup(Composite composite) {
- // class name
- classLabel = new Label(composite, SWT.LEFT);
- classLabel.setText(J2EEUIMessages.CLASS_NAME_LABEL);
- classLabel.setLayoutData(new GridData(GridData.HORIZONTAL_ALIGN_FILL));
-
- classText = new Text(composite, SWT.SINGLE | SWT.BORDER);
- classText.setLayoutData(new GridData(GridData.FILL_HORIZONTAL));
- synchHelper.synchText(classText, INewJavaClassDataModelProperties.CLASS_NAME, null);
-
- new Label(composite, SWT.LEFT);
- }
-
- /**
- * Add seperator to composite
- */
- protected void addSeperator(Composite composite, int horSpan) {
- GridData data = new GridData();
- data.verticalAlignment = GridData.FILL;
- data.horizontalAlignment = GridData.FILL;
- data.widthHint = 300;
- // Separator label
- Label seperator = new Label(composite, SWT.HORIZONTAL | SWT.SEPARATOR);
- data = new GridData(GridData.HORIZONTAL_ALIGN_FILL);
- data.horizontalSpan = horSpan;
- seperator.setLayoutData(data);
- }
-
- /**
- * Add superclass group to the composite
- */
- private void addSuperclassGroup(Composite composite) {
- // superclass
- superLabel = new Label(composite, SWT.LEFT);
- superLabel.setText(J2EEUIMessages.SUPERCLASS_LABEL);
- superLabel.setLayoutData(new GridData(GridData.HORIZONTAL_ALIGN_FILL));
-
- superText = new Text(composite, SWT.SINGLE | SWT.BORDER);
- superText.setLayoutData(new GridData(GridData.FILL_HORIZONTAL));
- synchHelper.synchText(superText, INewJavaClassDataModelProperties.SUPERCLASS, null);
-
- superButton = new Button(composite, SWT.PUSH);
- superButton.setText(J2EEUIMessages.BROWSE_BUTTON_LABEL_E);
- superButton.setLayoutData(new GridData(GridData.HORIZONTAL_ALIGN_FILL));
- superButton.addSelectionListener(new SelectionListener() {
- public void widgetSelected(SelectionEvent e) {
- handleSuperButtonPressed();
- }
-
- public void widgetDefaultSelected(SelectionEvent e) {
- // Do nothing
- }
- });
- }
-
- /**
- * Browse for a new Destination Folder
- */
- protected void handleFolderButtonPressed() {
- ISelectionStatusValidator validator = getContainerDialogSelectionValidator();
- ViewerFilter filter = getContainerDialogViewerFilter();
- ITreeContentProvider contentProvider = new WorkbenchContentProvider();
- ILabelProvider labelProvider = new DecoratingLabelProvider(new WorkbenchLabelProvider(), PlatformUI.getWorkbench()
- .getDecoratorManager().getLabelDecorator());
- ElementTreeSelectionDialog dialog = new ElementTreeSelectionDialog(getShell(), labelProvider, contentProvider);
- dialog.setValidator(validator);
- dialog.setTitle(J2EEUIMessages.CONTAINER_SELECTION_DIALOG_TITLE);
- dialog.setMessage(J2EEUIMessages.CONTAINER_SELECTION_DIALOG_DESC);
- dialog.addFilter(filter);
- String projectName = model.getStringProperty(IArtifactEditOperationDataModelProperties.PROJECT_NAME);
- if (projectName==null || projectName.length()==0)
- return;
- IProject project = ProjectUtilities.getProject(projectName);
- dialog.setInput(ResourcesPlugin.getWorkspace().getRoot());
-
- if (project != null)
- dialog.setInitialSelection(project);
- if (dialog.open() == Window.OK) {
- Object element = dialog.getFirstResult();
- try {
- if (element instanceof IContainer) {
- IContainer container = (IContainer) element;
- folderText.setText(container.getFullPath().toString());
- // dealWithSelectedContainerResource(container);
- }
- } catch (Exception ex) {
- // Do nothing
- }
-
- }
- }
-
- protected void handlePackageButtonPressed() {
- IPackageFragmentRoot packRoot = (IPackageFragmentRoot) model.getProperty(INewJavaClassDataModelProperties.JAVA_PACKAGE_FRAGMENT_ROOT);
- if (packRoot == null)
- return;
- IJavaElement[] packages = null;
- try {
- packages = packRoot.getChildren();
- } catch (JavaModelException e) {
- // Do nothing
- }
- if (packages == null)
- packages = new IJavaElement[0];
-
- ElementListSelectionDialog dialog = new ElementListSelectionDialog(getShell(), new JavaElementLabelProvider(
- JavaElementLabelProvider.SHOW_DEFAULT));
- dialog.setTitle(J2EEUIMessages.PACKAGE_SELECTION_DIALOG_TITLE);
- dialog.setMessage(J2EEUIMessages.PACKAGE_SELECTION_DIALOG_DESC);
- dialog.setEmptyListMessage(J2EEUIMessages.PACKAGE_SELECTION_DIALOG_MSG_NONE);
- dialog.setElements(packages);
- if (dialog.open() == Window.OK) {
- IPackageFragment fragment = (IPackageFragment) dialog.getFirstResult();
- if (fragment != null) {
- packageText.setText(fragment.getElementName());
- } else {
- packageText.setText(J2EEUIMessages.EMPTY_STRING);
- }
- }
- }
-
- protected void handleSuperButtonPressed() {
- getControl().setCursor(new Cursor(getShell().getDisplay(), SWT.CURSOR_WAIT));
- IPackageFragmentRoot packRoot = (IPackageFragmentRoot) model.getProperty(INewJavaClassDataModelProperties.JAVA_PACKAGE_FRAGMENT_ROOT);
- if (packRoot == null)
- return;
-
- // this eliminates the non-exported classpath entries
- final IJavaSearchScope scope = TypeSearchEngine.createJavaSearchScopeForAProject(packRoot.getJavaProject(), true, true);
-
- // This includes all entries on the classpath. This behavior is
- // identical
- // to the Super Class Browse Button on the Create new Java Class Wizard
- // final IJavaSearchScope scope = SearchEngine.createJavaSearchScope(new
- // IJavaElement[] {root.getJavaProject()} );
- FilteredTypesSelectionDialog dialog = new FilteredTypesSelectionDialog(getShell(),false, getWizard().getContainer(), scope, IJavaSearchConstants.CLASS);
- dialog.setTitle(J2EEUIMessages.SUPERCLASS_SELECTION_DIALOG_TITLE);
- dialog.setMessage(J2EEUIMessages.SUPERCLASS_SELECTION_DIALOG_DESC);
-
- if (dialog.open() == Window.OK) {
- IType type = (IType) dialog.getFirstResult();
- String superclassFullPath = J2EEUIMessages.EMPTY_STRING;
- if (type != null) {
- superclassFullPath = type.getFullyQualifiedName();
- }
- superText.setText(superclassFullPath);
- getControl().setCursor(null);
- return;
- }
- getControl().setCursor(null);
- }
-
- /**
- * Returns a new instance of the Selection validator for the Container
- * Selection Dialog This method can be extended by subclasses, as it does
- * some basic validation.
- */
- protected ISelectionStatusValidator getContainerDialogSelectionValidator() {
- return new ISelectionStatusValidator() {
- public IStatus validate(Object[] selection) {
- if (selection != null && selection[0] != null && !(selection[0] instanceof IProject))
- return WTPCommonPlugin.OK_STATUS;
- return WTPCommonPlugin.createErrorStatus(J2EEUIMessages.CONTAINER_SELECTION_DIALOG_VALIDATOR_MESG);
- }
- };
- }
-
- /**
- * Returns a new instance of the Selection Listner for the Container
- * Selection Dialog
- */
- protected ViewerFilter getContainerDialogViewerFilter() {
- return new ViewerFilter() {
- @Override
- public boolean select(Viewer viewer, Object parent, Object element) {
- if (element instanceof IProject) {
- IProject project = (IProject) element;
- return project.getName().equals(model.getProperty(IArtifactEditOperationDataModelProperties.PROJECT_NAME));
- } else if (element instanceof IFolder) {
- IFolder folder = (IFolder) element;
- // only show source folders
- IProject project = ProjectUtilities.getProject(model.getStringProperty(IArtifactEditOperationDataModelProperties.PROJECT_NAME));
- IPackageFragmentRoot[] sourceFolders = J2EEProjectUtilities.getSourceContainers(project);
- for (int i = 0; i < sourceFolders.length; i++) {
- if (sourceFolders[i].getResource()!= null && sourceFolders[i].getResource().equals(folder))
- return true;
- }
- }
- return false;
- }
- };
- }
-
-
-
- /**
- * @return
- */
- private IProject getSelectedProject() {
- IWorkbenchWindow window = PlatformUI.getWorkbench().getActiveWorkbenchWindow();
- if (window == null)
- return null;
- ISelection selection = window.getSelectionService().getSelection();
- if (selection == null)
- return null;
- if (!(selection instanceof IStructuredSelection))
- return null;
- IJavaElement element = getInitialJavaElement(selection);
- if (element != null && element.getJavaProject() != null)
- return element.getJavaProject().getProject();
- IStructuredSelection stucturedSelection = (IStructuredSelection) selection;
- if (stucturedSelection.getFirstElement() instanceof EObject)
- return ProjectUtilities.getProject(stucturedSelection.getFirstElement());
- IProject project = getExtendedSelectedProject(stucturedSelection.getFirstElement());
- if(project != null) {
- return project;
- }
- if(selection instanceof TreeSelection && (((TreeSelection)selection).getPaths().length > 0)){
- TreePath path = (((TreeSelection)selection).getPaths()[0]);
- if(path.getSegmentCount() > 0 && path.getSegment(0) instanceof IProject) {
- return (IProject) path.getSegment(0);
- }
- }
- return null;
- }
-
- protected IProject getExtendedSelectedProject(Object selection) {
- return null;
- }
-
- /**
- * @return
- */
- private IPackageFragment getSelectedPackageFragment() {
- IWorkbenchWindow window = PlatformUI.getWorkbench().getActiveWorkbenchWindow();
- if (window == null)
- return null;
- ISelection selection = window.getSelectionService().getSelection();
- if (selection == null)
- return null;
- IJavaElement element = getInitialJavaElement(selection);
- if (element != null) {
- if (element.getElementType() == IJavaElement.PACKAGE_FRAGMENT) {
- return (IPackageFragment) element;
- } else if (element.getElementType() == IJavaElement.COMPILATION_UNIT) {
- IJavaElement parent = ((ICompilationUnit) element).getParent();
- if (parent.getElementType() == IJavaElement.PACKAGE_FRAGMENT) {
- return (IPackageFragment) parent;
- }
- } else if (element.getElementType() == IJavaElement.TYPE) {
- return ((IType) element).getPackageFragment();
- }
- }
- return null;
- }
-
- private IPackageFragmentRoot getSelectedPackageFragmentRoot() {
- IWorkbenchWindow window = PlatformUI.getWorkbench().getActiveWorkbenchWindow();
- if (window == null)
- return null;
- ISelection selection = window.getSelectionService().getSelection();
- if (selection == null)
- return null;
- // StructuredSelection stucturedSelection = (StructuredSelection)
- // selection;
- IJavaElement element = getInitialJavaElement(selection);
- if (element != null) {
- if (element.getElementType() == IJavaElement.PACKAGE_FRAGMENT_ROOT)
- return (IPackageFragmentRoot) element;
- }
- return null;
- }
-
- /**
- * Utility method to inspect a selection to find a Java element.
- *
- * @param selection
- * the selection to be inspected
- * @return a Java element to be used as the initial selection, or
- * <code>null</code>, if no Java element exists in the given
- * selection
- */
- protected IJavaElement getInitialJavaElement(ISelection selection) {
- IJavaElement jelem = null;
- if (selection != null && !selection.isEmpty() && selection instanceof IStructuredSelection) {
- Object selectedElement = ((IStructuredSelection) selection).getFirstElement();
- jelem = getJavaElement(selectedElement);
- if (jelem == null) {
- IResource resource = getResource(selectedElement);
- if (resource != null && resource.getType() != IResource.ROOT) {
- while (jelem == null && resource.getType() != IResource.PROJECT) {
- resource = resource.getParent();
- jelem = (IJavaElement) resource.getAdapter(IJavaElement.class);
- }
- if (jelem == null) {
- jelem = JavaCore.create(resource); // java project
- }
- }
- }
- }
- if (jelem == null) {
- IWorkbenchWindow window= PlatformUI.getWorkbench().getActiveWorkbenchWindow();
- if (window == null)
- return null;
- IWorkbenchPart part = window.getActivePage().getActivePart();
- if (part instanceof ContentOutline) {
- part = window.getActivePage().getActiveEditor();
- }
-
- if (part instanceof IViewPartInputProvider) {
- Object elem = ((IViewPartInputProvider) part).getViewPartInput();
- if (elem instanceof IJavaElement) {
- jelem = (IJavaElement) elem;
- }
- }
- }
-
- if (jelem == null || jelem.getElementType() == IJavaElement.JAVA_MODEL) {
- try {
- IJavaProject[] projects = JavaCore.create(getWorkspaceRoot()).getJavaProjects();
- if (projects.length == 1) {
- jelem = projects[0];
- }
- } catch (JavaModelException e) {
- JavaPlugin.log(e);
- }
- }
- return jelem;
- }
-
- protected IWorkspaceRoot getWorkspaceRoot() {
- return ResourcesPlugin.getWorkspace().getRoot();
- }
-
- public void setProjectName(String projectName) {
- this.projectName = projectName;
- }
-
- protected void validateProjectRequirements(IProject project)
- {
- // nothing to do in most cases
- }
-
- protected IJavaElement getJavaElement(Object obj) {
- if (obj == null)
- return null;
-
- if (obj instanceof IJavaElement)
- return (IJavaElement) obj;
-
- if (obj instanceof IAdaptable)
- return (IJavaElement) ((IAdaptable) obj).getAdapter(IJavaElement.class);
-
- return (IJavaElement) Platform.getAdapterManager().getAdapter(obj, IJavaElement.class);
- }
-
- protected IResource getResource(Object obj) {
- if (obj == null)
- return null;
-
- if (obj instanceof IResource)
- return (IResource) obj;
-
- if (obj instanceof IAdaptable)
- return (IResource) ((IAdaptable) obj).getAdapter(IResource.class);
-
- return (IResource) Platform.getAdapterManager().getAdapter(obj, IResource.class);
- }
-}
diff --git a/plugins/org.eclipse.jst.j2ee.ui/j2ee_ui/org/eclipse/jst/j2ee/internal/wizard/ServerTargetComboHelper.java b/plugins/org.eclipse.jst.j2ee.ui/j2ee_ui/org/eclipse/jst/j2ee/internal/wizard/ServerTargetComboHelper.java
deleted file mode 100644
index d0e6af5..0000000
--- a/plugins/org.eclipse.jst.j2ee.ui/j2ee_ui/org/eclipse/jst/j2ee/internal/wizard/ServerTargetComboHelper.java
+++ /dev/null
@@ -1,76 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2003, 2005 IBM Corporation and others.
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
- *
- * Contributors:
- * IBM Corporation - initial API and implementation
- *******************************************************************************/
-/*
- * Created on Aug 27, 2003
- *
- * To change the template for this generated file go to Window>Preferences>Java>Code Generation>Code
- * and Comments
- */
-package org.eclipse.jst.j2ee.internal.wizard;
-
-import java.util.List;
-
-import org.eclipse.jst.j2ee.internal.plugin.J2EEPlugin;
-import org.eclipse.wst.server.core.IRuntime;
-import org.eclipse.wst.server.core.internal.ResourceManager;
-
-
-public class ServerTargetComboHelper {
- private List targets;
- public String[] items;
- public static final String defaultId = "com.ibm.etools.websphere.serverTarget.base.v51"; //$NON-NLS-1$
- public static final String defaultExpressId = "com.ibm.etools.websphere.serverTarget.express.v51"; //$NON-NLS-1$
-
- ServerTargetComboHelper(List targets, String[] items) {
- this.targets = targets;
- this.items = items;
- }
-
- public IRuntime getSelectedTarget(int itemIndex) {
- return (IRuntime) targets.get(itemIndex);
- }
-
- /**
- * @param target
- * @return
- */
- public boolean isCompatible(IRuntime target) {
- return targets.contains(target);
- }
-
- public int getDefaultServerTargetIndex() {
- IRuntime v51TargetServer = null;
- if (J2EEPlugin.isEJBSupportAvailable())
- v51TargetServer = ResourceManager.getInstance().getRuntime(defaultId);
- else
- v51TargetServer = ResourceManager.getInstance().getRuntime(defaultExpressId);
- if (v51TargetServer != null && targets.contains(v51TargetServer))
- return targets.indexOf(v51TargetServer) + 1;
- return -1;
- }
-
- public int getServerTargetIndexFromItems(IRuntime serverTarget) {
- if (items != null && items.length > 0) {
- String serverTargetLabel = serverTarget.getName() + " (" + serverTarget.getRuntimeType().getName() + ")"; //$NON-NLS-1$ //$NON-NLS-2$
- for (int i = 0; i < items.length; i++) {
- String label = items[i];
- if (label.equals(serverTargetLabel)) {
- return i;
- }
- }
- }
- return -1;
- }
-
- public List getValidTargets() {
- return targets;
- }
-}
diff --git a/plugins/org.eclipse.jst.j2ee.ui/j2ee_ui/org/eclipse/jst/j2ee/internal/wizard/ServerTargetUIHelper.java b/plugins/org.eclipse.jst.j2ee.ui/j2ee_ui/org/eclipse/jst/j2ee/internal/wizard/ServerTargetUIHelper.java
deleted file mode 100644
index bef30d4..0000000
--- a/plugins/org.eclipse.jst.j2ee.ui/j2ee_ui/org/eclipse/jst/j2ee/internal/wizard/ServerTargetUIHelper.java
+++ /dev/null
@@ -1,129 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2003, 2007 IBM Corporation and others.
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
- *
- * Contributors:
- * IBM Corporation - initial API and implementation
- *******************************************************************************/
-/*
- * Created on Aug 17, 2003
- *
- * To change the template for this generated file go to
- * Window>Preferences>Java>Code Generation>Code and Comments
- */
-package org.eclipse.jst.j2ee.internal.wizard;
-
-import java.lang.reflect.InvocationTargetException;
-import java.util.Arrays;
-
-import org.eclipse.core.resources.IProject;
-import org.eclipse.core.runtime.IProgressMonitor;
-import org.eclipse.jem.util.logger.proxy.Logger;
-import org.eclipse.jface.operation.IRunnableWithProgress;
-import org.eclipse.swt.widgets.Combo;
-import org.eclipse.swt.widgets.Shell;
-import org.eclipse.wst.server.core.IRuntime;
-import org.eclipse.wst.server.core.ServerUtil;
-
-/**
- * @author vijayb
- *
- * To change the template for this generated type comment go to Window>Preferences>Java>Code
- * Generation>Code and Comments
- */
-public class ServerTargetUIHelper {
- /**
- *
- */
- public ServerTargetUIHelper() {
- super();
- }
-
- public static String getSelectedServerTargetString(Combo serverTargetCombo) {
- if (serverTargetCombo.getSelectionIndex() != -1)
- return serverTargetCombo.getItem(serverTargetCombo.getSelectionIndex());
- return null;
- }
-
- /**
- * @return
- */
- public static int getSelectedServerTargetStringIndex(Combo serverTargetCombo) {
- return serverTargetCombo.getSelectionIndex();
- }
-
-// private static void setServerTargetForProject(Shell shell, IProject project, IRuntime runtime) {
-// //ServerTargetHelper.cleanUpNonServerTargetClasspath(project);
-// setServerTarget(shell, project, runtime, null);
-// }
-
- /**
- * @param earProject
- * @param moduleProject
- * @return
- */
- public static boolean setModuleServerTargetIfNecessary(IProject earProject, IProject moduleProject, Shell shell) {
- return true;
- }
-
- // private static String getEARJ2EELevel(IProject earProject) {
- // EARNatureRuntime nature = EARNatureRuntime.getRuntime(earProject);
- // String j2eeLevel = null;
- // int natureID = nature.getJ2EEVersion();
- // switch (natureID) {
- // case (J2EEVersionConstants.J2EE_1_2_ID) :
- // j2eeLevel = J2EEVersionConstants.VERSION_1_2_TEXT;
- // break;
- // case (J2EEVersionConstants.J2EE_1_3_ID) :
- // j2eeLevel = J2EEVersionConstants.VERSION_1_3_TEXT;
- // break;
- // case (J2EEVersionConstants.J2EE_1_4_ID) :
- // j2eeLevel = J2EEVersionConstants.VERSION_1_4_TEXT;
- // break;
- // default :
- // j2eeLevel = J2EEVersionConstants.VERSION_1_4_TEXT;
- // break;
- // }
- // return j2eeLevel;
- // }
-
- public static void setServerTarget(Shell shell, IProject project, IRuntime runtime, IProgressMonitor monitor) {
-// try {
-// ServerCore.getProjectProperties(project).setRuntimeTarget(runtime, monitor);
-// } catch (CoreException e) {
-// Logger.getLogger().logError(e);
-// }
- }
-
-
- public static ServerTargetComboHelper getValidServerTargetComboItems(String j2eeType, String selectedVersion) {
- IRuntime[] validServerTargets = ServerUtil.getRuntimes(j2eeType, selectedVersion);
- String[] serverTargetList = null;
- if (validServerTargets.length>0) {
- int serverTargetListSize = validServerTargets.length;
- serverTargetList = new String[serverTargetListSize];
- for (int i = 0; i < validServerTargets.length; i++) {
- IRuntime runtime = validServerTargets[i];
- serverTargetList[i] = runtime.getName() + " (" + runtime.getRuntimeType().getName() + ")"; //$NON-NLS-1$ //$NON-NLS-2$
- }
- }
- return new ServerTargetComboHelper(Arrays.asList(validServerTargets), serverTargetList);
- }
-
- /**
- * @param project
- */
- public static void runEarValidation(IProject project) {
- try {
- IRunnableWithProgress runnable = EARValidationHelper.createValidationRunnable(project);
- runnable.run(null);
- } catch (InterruptedException ie) {
- Logger.getLogger().logError(ie);
- } catch (InvocationTargetException ite) {
- Logger.getLogger().logError(ite);
- }
- }
-}
diff --git a/plugins/org.eclipse.jst.j2ee.ui/j2ee_ui/org/eclipse/jst/j2ee/internal/wizard/StringArrayTableWizardSection.java b/plugins/org.eclipse.jst.j2ee.ui/j2ee_ui/org/eclipse/jst/j2ee/internal/wizard/StringArrayTableWizardSection.java
deleted file mode 100644
index a124c90..0000000
--- a/plugins/org.eclipse.jst.j2ee.ui/j2ee_ui/org/eclipse/jst/j2ee/internal/wizard/StringArrayTableWizardSection.java
+++ /dev/null
@@ -1,548 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2003, 2007 IBM Corporation and others.
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
- *
- * Contributors:
- * IBM Corporation - initial API and implementation
- * David Schneider, david.schneider@unisys.com - [142500] WTP properties pages fonts don't follow Eclipse preferences
- *******************************************************************************/
-package org.eclipse.jst.j2ee.internal.wizard;
-
-import java.util.ArrayList;
-import java.util.Collection;
-import java.util.List;
-
-import org.eclipse.jface.dialogs.Dialog;
-import org.eclipse.jface.dialogs.IDialogConstants;
-import org.eclipse.jface.viewers.DoubleClickEvent;
-import org.eclipse.jface.viewers.IDoubleClickListener;
-import org.eclipse.jface.viewers.ISelection;
-import org.eclipse.jface.viewers.ISelectionChangedListener;
-import org.eclipse.jface.viewers.IStructuredContentProvider;
-import org.eclipse.jface.viewers.IStructuredSelection;
-import org.eclipse.jface.viewers.ITableLabelProvider;
-import org.eclipse.jface.viewers.LabelProvider;
-import org.eclipse.jface.viewers.SelectionChangedEvent;
-import org.eclipse.jface.viewers.TableViewer;
-import org.eclipse.jface.viewers.Viewer;
-import org.eclipse.swt.SWT;
-import org.eclipse.swt.events.ControlAdapter;
-import org.eclipse.swt.events.ControlEvent;
-import org.eclipse.swt.events.ModifyEvent;
-import org.eclipse.swt.events.ModifyListener;
-import org.eclipse.swt.events.SelectionEvent;
-import org.eclipse.swt.events.SelectionListener;
-import org.eclipse.swt.graphics.Image;
-import org.eclipse.swt.graphics.Point;
-import org.eclipse.swt.graphics.Rectangle;
-import org.eclipse.swt.layout.GridData;
-import org.eclipse.swt.layout.GridLayout;
-import org.eclipse.swt.widgets.Button;
-import org.eclipse.swt.widgets.Composite;
-import org.eclipse.swt.widgets.Control;
-import org.eclipse.swt.widgets.Label;
-import org.eclipse.swt.widgets.Shell;
-import org.eclipse.swt.widgets.Table;
-import org.eclipse.swt.widgets.TableColumn;
-import org.eclipse.swt.widgets.Text;
-import org.eclipse.wst.common.frameworks.datamodel.IDataModel;
-
-/**
- * @author jialin
- *
- * To change the template for this generated type comment go to Window -
- * Preferences - Java - Code Generation - Code and Comments
- */
-public class StringArrayTableWizardSection extends Composite {
-
- protected class StringArrayListContentProvider implements IStructuredContentProvider {
- public boolean isDeleted(Object element) {
- return false;
- }
- public Object[] getElements(Object element) {
- if (element instanceof List) {
- return ((List) element).toArray();
- }
- return new Object[0];
- }
- public void inputChanged(Viewer aViewer, Object oldInput, Object newInput) {
- //Default nothing
- }
- public void dispose() {
- //Default nothing
- }
- }
-
- protected class StringArrayListLabelProvider extends LabelProvider implements ITableLabelProvider {
- public Image getColumnImage(Object element, int columnIndex) {
- if (columnIndex == 0) {
- return labelProviderImage;
- }
- return null;
- }
-
- public String getColumnText(Object element, int columnIndex) {
- String[] array = (String[]) element;
- return array[columnIndex];
- }
-
- @Override
- public Image getImage(Object element) {
- return labelProviderImage;
- }
-
- @Override
- public String getText(Object element) {
- String[] array = (String[]) element;
- if (array.length > 0) {
- return array[0];
- }
- return super.getText(element);
- }
- }
-
- protected class AddStringArrayDialog extends Dialog implements ModifyListener {
- protected String windowTitle;
- protected String[] labelsForTextField;
- protected Text[] texts;
- protected String[] stringArray;
- /**
- * CMPFieldDialog constructor comment.
- */
- public AddStringArrayDialog(Shell shell, String windowTitle, String[] labelsForTextField) {
- super(shell);
- this.windowTitle = windowTitle;
- this.labelsForTextField = labelsForTextField;
- }
- /**
- * CMPFieldDialog constructor comment.
- */
- @Override
- public Control createDialogArea(Composite parent) {
-
- Composite composite = (Composite) super.createDialogArea(parent);
- getShell().setText(windowTitle);
-
- GridLayout layout = new GridLayout();
- layout.numColumns = 2;
- composite.setLayout(layout);
- GridData data = new GridData();
- data.verticalAlignment = GridData.FILL;
- data.horizontalAlignment = GridData.FILL;
- data.widthHint = 300;
- composite.setLayoutData(data);
-
- int n = labelsForTextField.length;
- texts = new Text[n];
- for (int i = 0; i < n; i++) {
- Label label = new Label(composite, SWT.LEFT);
- label.setText(labelsForTextField[i]);
- label.setLayoutData(new GridData(GridData.HORIZONTAL_ALIGN_BEGINNING));
- texts[i] = new Text(composite, SWT.SINGLE | SWT.BORDER);
- data = new GridData(GridData.FILL_HORIZONTAL);
- data.widthHint = 100;
- texts[i].setLayoutData(data);
- }
-
- // set focus
- texts[0].setFocus();
- Dialog.applyDialogFont(parent);
- return composite;
- }
-
- @Override
- protected Control createContents(Composite parent) {
- Composite composite = (Composite) super.createContents(parent);
-
- for (int i = 0; i < texts.length; i++) {
- texts[i].addModifyListener(this);
- }
-
- updateOKButton();
-
- return composite;
- }
-
- @Override
- protected void okPressed() {
- stringArray = callback.retrieveResultStrings(texts);
- super.okPressed();
- }
-
- public String[] getStringArray() {
- return stringArray;
- }
-
- public void modifyText(ModifyEvent e) {
- updateOKButton();
- }
-
- private void updateOKButton() {
- getButton(IDialogConstants.OK_ID).setEnabled(callback.validate(texts));
- }
- }
-
- protected class EditStringArrayDialog extends AddStringArrayDialog {
- protected String[] valuesForTextField;
- /**
- * CMPFieldDialog constructor comment.
- */
- public EditStringArrayDialog(Shell shell, String windowTitle, String[] labelsForTextField, String[] valuesForTextField) {
- super(shell, windowTitle, labelsForTextField);
- this.valuesForTextField = valuesForTextField;
- }
- /**
- * CMPFieldDialog constructor comment.
- */
- @Override
- public Control createDialogArea(Composite parent) {
-
- Composite composite = (Composite) super.createDialogArea(parent);
-
- int n = valuesForTextField.length;
- for (int i = 0; i < n; i++) {
- texts[i].setText(valuesForTextField[i]);
- }
-
- return composite;
- }
- }
-
- /**
- * Callback interface used by the Add/Edit-StringArrayDialog classes.
- */
- public interface StringArrayDialogCallback {
-
- /**
- * Validates the text fields.
- * <p>Used to decide wheather to enable the OK button of the dialog.
- * If the method returns <code>true</code> the OK button is enabled,
- * otherwise the OK button is disabled.</p>
- *
- * @param reference to the text fields in the dialog
- *
- * @return <code>true</code> if the values in the text fields are
- * valid, <code>false</code> otherwise.
- */
- public boolean validate(Text[] texts);
-
- /**
- * Retrieves the strings from the text fields of the dialog.
- * <p>Implementers of the callback can use these method to do some
- * preprocessing (like trimming) of the data in the text fields before
- * using it. The returned values will be the actual data that will be
- * put in the table viewer.</p>
- *
- * @param texts reference to the text fields in the dialog
- *
- * @return the values retreived from the text fields
- */
- public String[] retrieveResultStrings(Text[] texts);
-
- }
-
- /**
- * Default adapter with basic implementation of the
- * <code>StringArrayDialogCallback</code> interface.
- */
- protected class StringArrayDialogCallbackAdapter implements StringArrayDialogCallback {
-
- /**
- * Returns always <code>true</code>.
- */
- public boolean validate(Text[] texts) {
- return true;
- }
-
- /**
- * Just retreives the unmodified values of the text fields as a
- * string array.
- */
- public String[] retrieveResultStrings(Text[] texts) {
- int n = texts.length;
- String[] result = new String[n];
- for (int i = 0; i < n; i++) {
- result[i] = texts[i].getText();
- }
- return result;
- }
-
- }
-
- private TableViewer viewer;
- private Button addButton;
- private Button editButton;
- private Button removeButton;
- private String dialogTitle;
- private String[] fieldLabels;
- private IDataModel model;
- private String propertyName;
- private Image labelProviderImage;
- private StringArrayDialogCallback callback;
-
- public StringArrayTableWizardSection(Composite parent, String title, String addButtonLabel, String removeButtonLabel,
- String[] labelsForText, Image labelProviderImage, IDataModel model, String propertyName) {
- this(parent, title, addButtonLabel, null, removeButtonLabel, labelsForText, labelProviderImage, model, propertyName);
- }
-
- public StringArrayTableWizardSection(Composite parent, String title, String addButtonLabel, String editButtonLabel, String removeButtonLabel,
- String[] labelsForText, Image labelProviderImage, IDataModel model, String propertyName) {
- this(parent, title, title, addButtonLabel, editButtonLabel, removeButtonLabel, labelsForText, labelsForText, labelProviderImage, model, propertyName);
- }
-
- public StringArrayTableWizardSection(Composite parent, String componentLabel, String dialogTitle, String addButtonLabel, String editButtonLabel, String removeButtonLabel,
- String[] columnTitles, String[] fieldLabels, Image labelProviderImage, IDataModel model, String propertyName) {
- super(parent, SWT.NONE);
- this.dialogTitle = dialogTitle;
- this.fieldLabels = fieldLabels;
- this.labelProviderImage = labelProviderImage;
- this.model = model;
- this.propertyName = propertyName;
-
- GridLayout layout = new GridLayout(2, false);
- layout.marginHeight = 4;
- layout.marginWidth = 0;
- this.setLayout(layout);
- this.setLayoutData(new GridData(GridData.FILL_BOTH));
-
- Label titleLabel = new Label(this, SWT.LEFT);
- titleLabel.setText(componentLabel);
- GridData data = new GridData();
- data.horizontalSpan = 2;
- titleLabel.setLayoutData(data);
-
- Table table = new Table(this, SWT.FULL_SELECTION | SWT.BORDER);
- viewer = new TableViewer(table);
- table.setLayoutData(new GridData(GridData.FILL_BOTH));
- viewer.setContentProvider(new StringArrayListContentProvider());
- viewer.setLabelProvider(new StringArrayListLabelProvider());
-
- final Composite buttonCompo = new Composite(this, SWT.NULL);
- layout = new GridLayout();
- layout.marginHeight = 0;
- buttonCompo.setLayout(layout);
- buttonCompo.setLayoutData(new GridData(GridData.FILL_VERTICAL | GridData.VERTICAL_ALIGN_BEGINNING));
-
- addButton = new Button(buttonCompo, SWT.PUSH);
- addButton.setText(addButtonLabel);
- addButton.setLayoutData(new GridData(GridData.VERTICAL_ALIGN_BEGINNING | GridData.HORIZONTAL_ALIGN_FILL));
- addButton.addSelectionListener(new SelectionListener() {
- public void widgetSelected(SelectionEvent event) {
- handleAddButtonSelected();
- }
- public void widgetDefaultSelected(SelectionEvent event) {
- //Do nothing
- }
- });
-
- if (editButtonLabel != null) {
- editButton = new Button(buttonCompo, SWT.PUSH);
- editButton.setText(editButtonLabel);
- editButton.setLayoutData(new GridData(GridData.VERTICAL_ALIGN_BEGINNING | GridData.HORIZONTAL_ALIGN_FILL));
- editButton.addSelectionListener(new SelectionListener() {
- public void widgetSelected(SelectionEvent event) {
- handleEditButtonSelected();
- }
- public void widgetDefaultSelected(SelectionEvent event) {
- //Do nothing
- }
- });
- editButton.setEnabled(false);
- }
-
- removeButton = new Button(buttonCompo, SWT.PUSH);
- removeButton.setText(removeButtonLabel);
- removeButton.setLayoutData(new GridData(GridData.VERTICAL_ALIGN_BEGINNING | GridData.HORIZONTAL_ALIGN_FILL));
- removeButton.addSelectionListener(new SelectionListener() {
- public void widgetSelected(SelectionEvent event) {
- handleRemoveButtonSelected();
- }
- public void widgetDefaultSelected(SelectionEvent event) {
- //Do nothing
- }
- });
- removeButton.setEnabled(false);
-
- viewer.addSelectionChangedListener(new ISelectionChangedListener() {
- public void selectionChanged(SelectionChangedEvent event) {
- ISelection selection = event.getSelection();
- if (editButton != null) {
- boolean enabled = ((IStructuredSelection) selection).size() == 1;
- editButton.setEnabled(enabled);
- }
- removeButton.setEnabled(!selection.isEmpty());
- }
- });
-
- if (editButton != null) {
- viewer.addDoubleClickListener(new IDoubleClickListener() {
- public void doubleClick(DoubleClickEvent event) {
- handleEditButtonSelected();
- }
- });
- }
-
- if (columnTitles.length > 1) {
- for (int i = 0; i < columnTitles.length; i++) {
- TableColumn tableColumn = new TableColumn(table, SWT.NONE);
- tableColumn.setText(columnTitles[i]);
- }
- table.setHeaderVisible(true);
- this.addControlListener(new ControlAdapter() {
- @Override
- public void controlResized(ControlEvent e) {
- Table table = viewer.getTable();
- TableColumn[] columns = table.getColumns();
- Point buttonArea = buttonCompo.computeSize(SWT.DEFAULT, SWT.DEFAULT);
- Rectangle area = table.getParent().getClientArea();
- Point preferredSize = viewer.getTable().computeSize(SWT.DEFAULT, SWT.DEFAULT);
- int width = area.width - 2 * table.getBorderWidth() - buttonArea.x - columns.length * 2;
- if (preferredSize.y > area.height + table.getHeaderHeight()) {
- // Subtract the scrollbar width from the total column width
- // if a vertical scrollbar will be required
- Point vBarSize = table.getVerticalBar().getSize();
- width -= vBarSize.x;
- }
- Point oldSize = table.getSize();
- int consumeWidth = 0;
- for (int i = 0; i < columns.length; i++) {
- if (oldSize.x > area.width) {
- // table is getting smaller so make the columns
- // smaller first and then resize the table to
- // match the client area width
- consumeWidth = setColumntWidth(width, columns, consumeWidth, i);
- table.setSize(area.width - buttonArea.x - columns.length * 2, area.height);
- } else {
- // table is getting bigger so make the table
- // bigger first and then make the columns wider
- // to match the client area width
- table.setSize(area.width - buttonArea.x - columns.length * 2, area.height);
- consumeWidth = setColumntWidth(width, columns, consumeWidth, i);
- }
- }
- }
-
- private int setColumntWidth(int width, TableColumn[] columns, int consumeWidth, int i) {
- int localConsumeWidth = consumeWidth;
- if (i < columns.length - 1) {
- columns[i].setWidth(width / columns.length);
- localConsumeWidth += columns[i].getWidth();
- } else {
- columns[i].setWidth(width - localConsumeWidth);
- }
- return localConsumeWidth;
- }
- });
- }
-
- callback = new StringArrayDialogCallbackAdapter();
- }
-
- private void handleAddButtonSelected() {
- AddStringArrayDialog dialog = new AddStringArrayDialog(getShell(), dialogTitle, fieldLabels);
- dialog.open();
- String[] stringArray = dialog.getStringArray();
- addStringArray(stringArray);
- }
-
- private void handleEditButtonSelected() {
- ISelection s = viewer.getSelection();
- if (!(s instanceof IStructuredSelection))
- return;
- IStructuredSelection selection = (IStructuredSelection) s;
- if (selection.size() != 1)
- return;
-
- Object selectedObj = selection.getFirstElement();
- String[] valuesForText = (String[]) selectedObj;
-
- EditStringArrayDialog dialog = new EditStringArrayDialog(getShell(), dialogTitle, fieldLabels, valuesForText);
- dialog.open();
- String[] stringArray = dialog.getStringArray();
- editStringArray(valuesForText, stringArray);
- }
-
- private void handleRemoveButtonSelected() {
- ISelection selection = viewer.getSelection();
- if (selection.isEmpty() || !(selection instanceof IStructuredSelection))
- return;
- List selectedObj = ((IStructuredSelection) selection).toList();
- removeStringArrays(selectedObj);
- }
-
- public void addStringArray(String[] stringArray) {
- if (stringArray == null)
- return;
- List valueList = (List) viewer.getInput();
- if (valueList == null)
- valueList = new ArrayList();
- valueList.add(stringArray);
- setInput(valueList);
- }
-
- public void editStringArray(String[] oldStringArray, String[] newStringArray) {
- if (newStringArray == null)
- return;
-
- List valueList = (List) viewer.getInput();
- if (valueList == null)
- valueList = new ArrayList();
-
- int index = valueList.indexOf(oldStringArray);
- if (index == -1) {
- valueList.add(newStringArray);
- } else {
- valueList.set(index, newStringArray);
- }
-
- setInput(valueList);
- }
-
- public void removeStringArray(Object selectedStringArray) {
- List valueList = (List) viewer.getInput();
- valueList.remove(selectedStringArray);
- setInput(valueList);
- }
-
- public void removeStringArrays(Collection selectedStringArrays) {
- List valueList = (List) viewer.getInput();
- valueList.removeAll(selectedStringArrays);
- setInput(valueList);
- }
-
- public void setInput(List input) {
- viewer.setInput(input);
- // Create a new list to trigger property change
- List newInput = new ArrayList();
- newInput.addAll(input);
- model.setProperty(propertyName, newInput);
- }
-
- public TableViewer getTableViewer() {
- return viewer;
- }
-
- public Button getAddButton() {
- return addButton;
- }
-
- public Button getEditButton() {
- return editButton;
- }
-
- public Button getRemoveButton() {
- return removeButton;
- }
-
- /**
- * Set callback for customizing the preprocessing of the user input.
- *
- * @param callback an implementation of the callback interface.
- */
- public void setCallback(StringArrayDialogCallback callback) {
- this.callback = callback;
- }
-}
diff --git a/plugins/org.eclipse.jst.j2ee.ui/j2ee_ui/org/eclipse/jst/j2ee/internal/wizard/TableObjects.java b/plugins/org.eclipse.jst.j2ee.ui/j2ee_ui/org/eclipse/jst/j2ee/internal/wizard/TableObjects.java
deleted file mode 100644
index c480d0b..0000000
--- a/plugins/org.eclipse.jst.j2ee.ui/j2ee_ui/org/eclipse/jst/j2ee/internal/wizard/TableObjects.java
+++ /dev/null
@@ -1,42 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2003, 2004 IBM Corporation and others.
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
- *
- * Contributors:
- * IBM Corporation - initial API and implementation
- *******************************************************************************/
-package org.eclipse.jst.j2ee.internal.wizard;
-
-
-import java.util.ArrayList;
-import java.util.List;
-
-/**
- * Insert the type's description here. Creation date: (3/19/2001 5:10:14 PM)
- *
- * @author: Administrator
- */
-public class TableObjects {
- public List tableObjectsList;
-
- /**
- * EJBs constructor comment.
- */
- public TableObjects() {
- super();
- tableObjectsList = new ArrayList();
- }
-
- public List getTableObjects() {
- return tableObjectsList;
- }
-
- protected void initList() {
- if (tableObjectsList == null)
- tableObjectsList = new ArrayList();
-
- }
-}
\ No newline at end of file
diff --git a/plugins/org.eclipse.jst.j2ee.ui/j2ee_ui/org/eclipse/jst/j2ee/internal/wizard/earlibraries.properties b/plugins/org.eclipse.jst.j2ee.ui/j2ee_ui/org/eclipse/jst/j2ee/internal/wizard/earlibraries.properties
deleted file mode 100644
index b815ca6..0000000
--- a/plugins/org.eclipse.jst.j2ee.ui/j2ee_ui/org/eclipse/jst/j2ee/internal/wizard/earlibraries.properties
+++ /dev/null
@@ -1,2 +0,0 @@
-EARLibrariesContainerPage_0=EAR Libraries
-EARLibrariesContainerPage_1=The EAR Libraries classpath container dynamically computes the Java EE project's module classpath dependencies using the META-INF/MANIFEST.MF Class-Path entries.
diff --git a/plugins/org.eclipse.jst.j2ee.ui/j2ee_ui/org/eclipse/jst/j2ee/internal/wizard/messages.properties b/plugins/org.eclipse.jst.j2ee.ui/j2ee_ui/org/eclipse/jst/j2ee/internal/wizard/messages.properties
deleted file mode 100644
index 1ed5a8b..0000000
--- a/plugins/org.eclipse.jst.j2ee.ui/j2ee_ui/org/eclipse/jst/j2ee/internal/wizard/messages.properties
+++ /dev/null
@@ -1 +0,0 @@
-J2EEExportPage_Optimize_for_a_specific_server_runt_=Optimi&ze for a specific server runtime
diff --git a/plugins/org.eclipse.jst.j2ee.ui/j2ee_ui/org/eclipse/jst/j2ee/ui/archive/IArchiveExportParticipantPanelFactory.java b/plugins/org.eclipse.jst.j2ee.ui/j2ee_ui/org/eclipse/jst/j2ee/ui/archive/IArchiveExportParticipantPanelFactory.java
deleted file mode 100644
index 5a89717..0000000
--- a/plugins/org.eclipse.jst.j2ee.ui/j2ee_ui/org/eclipse/jst/j2ee/ui/archive/IArchiveExportParticipantPanelFactory.java
+++ /dev/null
@@ -1,38 +0,0 @@
-/******************************************************************************
- * Copyright (c) 2005, 2007 BEA Systems, Inc.
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
- *
- * Contributors:
- * Konstantin Komissarchik
- ******************************************************************************/
-
-package org.eclipse.jst.j2ee.ui.archive;
-
-import org.eclipse.swt.widgets.Composite;
-import org.eclipse.wst.common.frameworks.datamodel.IDataModel;
-
-/**
- * Used in conjunction with the <code>org.eclipse.jst.j2ee.ui.archiveExportParticipantPanels</code>
- * extension point in order to extend the UI of the base module archive export wizard.
- *
- * @since 3.0
- * @author <a href="mailto:kosta@bea.com">Konstantin Komissarchik</a>
- */
-
-public interface IArchiveExportParticipantPanelFactory
-{
- /**
- * Creates a composite containing the UI elements appropriate for the export participant
- * that this panel factory is registered with.
- *
- * @param parent the parent composite
- * @param dataModel the data model of the export participant
- * @return the created composite
- */
-
- Composite createPanel( Composite parent,
- IDataModel dataModel );
-}
diff --git a/plugins/org.eclipse.jst.j2ee.ui/j2ee_ui/org/eclipse/jst/j2ee/ui/archive/internal/ArchiveExportParticipantPanelsExtensionPoint.java b/plugins/org.eclipse.jst.j2ee.ui/j2ee_ui/org/eclipse/jst/j2ee/ui/archive/internal/ArchiveExportParticipantPanelsExtensionPoint.java
deleted file mode 100644
index 38b1307..0000000
--- a/plugins/org.eclipse.jst.j2ee.ui/j2ee_ui/org/eclipse/jst/j2ee/ui/archive/internal/ArchiveExportParticipantPanelsExtensionPoint.java
+++ /dev/null
@@ -1,119 +0,0 @@
-/******************************************************************************
- * Copyright (c) 2005, 2007 BEA Systems, Inc.
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
- *
- * Contributors:
- * Konstantin Komissarchik
- ******************************************************************************/
-
-package org.eclipse.jst.j2ee.ui.archive.internal;
-
-import static org.eclipse.jst.j2ee.internal.archive.ArchiveExportParticipantsExtensionPoint.PluginUtil.findExtensions;
-import static org.eclipse.jst.j2ee.internal.archive.ArchiveExportParticipantsExtensionPoint.PluginUtil.findRequiredAttribute;
-import static org.eclipse.jst.j2ee.internal.archive.ArchiveExportParticipantsExtensionPoint.PluginUtil.getTopLevelElements;
-import static org.eclipse.jst.j2ee.internal.archive.ArchiveExportParticipantsExtensionPoint.PluginUtil.instantiate;
-import static org.eclipse.jst.j2ee.internal.plugin.J2EEUIPlugin.PLUGIN_ID;
-import static org.eclipse.jst.j2ee.internal.plugin.J2EEUIPlugin.log;
-
-import java.util.HashMap;
-import java.util.Map;
-
-import org.eclipse.core.runtime.CoreException;
-import org.eclipse.core.runtime.IConfigurationElement;
-import org.eclipse.jst.j2ee.internal.archive.ArchiveExportParticipantsExtensionPoint.PluginUtil.InvalidExtensionException;
-import org.eclipse.jst.j2ee.ui.archive.IArchiveExportParticipantPanelFactory;
-
-/**
- * Contains the logic for processing the <code>org.eclipse.jst.j2ee.ui.archiveExportParticipantPanels</code>
- * extension point.
- *
- * @author <a href="mailto:kosta@bea.com">Konstantin Komissarchik</a>
- */
-
-public final class ArchiveExportParticipantPanelsExtensionPoint
-{
- public static final String EXTENSION_POINT_ID = "archiveExportParticipantPanels"; //$NON-NLS-1$
-
- private static final String EL_PANEL_FACTORY = "panel-factory"; //$NON-NLS-1$
- private static final String ATTR_ARCHIVE_EXPORT_PARTICIPANT_ID = "archiveExportParticipantId"; //$NON-NLS-1$
- private static final String ATTR_CLASS = "class"; //$NON-NLS-1$
-
- private static Map<String,PanelFactoryInfo> extensions = null;
-
- public static class PanelFactoryInfo
- {
- private String archiveExportParticipantId;
- private String pluginId = null;
- private String className = null;
-
- public String getArchiveExportExtensionId()
- {
- return this.archiveExportParticipantId;
- }
-
- public IArchiveExportParticipantPanelFactory loadPanelFactory()
- {
- try
- {
- return instantiate( this.pluginId, this.className,
- IArchiveExportParticipantPanelFactory.class );
- }
- catch( CoreException e )
- {
- log( e.getStatus() );
- return null;
- }
- }
- }
-
- public static PanelFactoryInfo getExtension( final String archiveExportParticipantId )
- {
- readExtensions();
-
- return extensions.get( archiveExportParticipantId );
- }
-
- private static synchronized void readExtensions()
- {
- if( extensions != null )
- {
- return;
- }
-
- extensions = new HashMap<String,PanelFactoryInfo>();
-
- for( IConfigurationElement element
- : getTopLevelElements( findExtensions( PLUGIN_ID, EXTENSION_POINT_ID ) ) )
- {
- if( element.getName().equals( EL_PANEL_FACTORY ) )
- {
- try
- {
- readExtension( element );
- }
- catch( InvalidExtensionException e )
- {
- // Continue. The problem has been reported to the user via the log.
- }
- }
- }
- }
-
- private static void readExtension( final IConfigurationElement config )
-
- throws InvalidExtensionException
-
- {
- final PanelFactoryInfo ext = new PanelFactoryInfo();
-
- ext.archiveExportParticipantId = findRequiredAttribute( config, ATTR_ARCHIVE_EXPORT_PARTICIPANT_ID );
- ext.pluginId = config.getContributor().getName();
- ext.className = findRequiredAttribute( config, ATTR_CLASS );
-
- extensions.put( ext.archiveExportParticipantId, ext );
- }
-
-}
diff --git a/plugins/org.eclipse.jst.j2ee.ui/j2ee_ui/org/eclipse/jst/j2ee/ui/project/facet/EarFacetInstallPage.java b/plugins/org.eclipse.jst.j2ee.ui/j2ee_ui/org/eclipse/jst/j2ee/ui/project/facet/EarFacetInstallPage.java
deleted file mode 100644
index 326dd76..0000000
--- a/plugins/org.eclipse.jst.j2ee.ui/j2ee_ui/org/eclipse/jst/j2ee/ui/project/facet/EarFacetInstallPage.java
+++ /dev/null
@@ -1,428 +0,0 @@
-/******************************************************************************
- * Copyright (c) 2005, 2009 BEA Systems, Inc. and others.
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
- *
- * Contributors:
- * Konstantin Komissarchik - initial API and implementation
- * David Schneider, david.schneider@unisys.com - [142500] WTP properties pages fonts don't follow Eclipse preferences
- * Milen Manov, milen.manov@sap.com - bugs 248623
- ******************************************************************************/
-
-package org.eclipse.jst.j2ee.ui.project.facet;
-
-import java.util.ArrayList;
-import java.util.Collections;
-import java.util.Iterator;
-import java.util.List;
-
-import org.eclipse.core.resources.IProject;
-import org.eclipse.core.resources.IWorkspaceRoot;
-import org.eclipse.core.resources.ResourcesPlugin;
-import org.eclipse.jem.util.emf.workbench.ProjectUtilities;
-import org.eclipse.jface.dialogs.Dialog;
-import org.eclipse.jface.dialogs.IDialogConstants;
-import org.eclipse.jface.layout.GridDataFactory;
-import org.eclipse.jface.viewers.CheckStateChangedEvent;
-import org.eclipse.jface.viewers.CheckboxTableViewer;
-import org.eclipse.jface.viewers.ICheckStateListener;
-import org.eclipse.jface.viewers.ILabelDecorator;
-import org.eclipse.jface.viewers.ILabelProviderListener;
-import org.eclipse.jface.viewers.LabelProviderChangedEvent;
-import org.eclipse.jface.viewers.TableLayout;
-import org.eclipse.jface.wizard.WizardDialog;
-import org.eclipse.jst.j2ee.earcreation.IEarFacetInstallDataModelProperties;
-import org.eclipse.jst.j2ee.internal.AvailableJ2EEComponentsForEARContentProvider;
-import org.eclipse.jst.j2ee.internal.J2EEConstants;
-import org.eclipse.jst.j2ee.internal.J2EEVersionConstants;
-import org.eclipse.jst.j2ee.internal.actions.IJ2EEUIContextIds;
-import org.eclipse.jst.j2ee.internal.common.J2EEVersionUtil;
-import org.eclipse.jst.j2ee.internal.earcreation.DefaultJ2EEComponentCreationDataModelProvider;
-import org.eclipse.jst.j2ee.internal.earcreation.IDefaultJ2EEComponentCreationDataModelProperties;
-import org.eclipse.jst.j2ee.internal.plugin.J2EEUIMessages;
-import org.eclipse.jst.j2ee.internal.plugin.J2EEUIPlugin;
-import org.eclipse.jst.j2ee.internal.plugin.J2EEUIPluginIcons;
-import org.eclipse.jst.j2ee.internal.wizard.DefaultJ2EEComponentCreationWizard;
-import org.eclipse.jst.j2ee.internal.wizard.J2EEComponentLabelProvider;
-import org.eclipse.jst.j2ee.internal.wizard.J2EEModuleFacetInstallPage;
-import org.eclipse.osgi.util.NLS;
-import org.eclipse.swt.SWT;
-import org.eclipse.swt.accessibility.AccessibleAdapter;
-import org.eclipse.swt.accessibility.AccessibleEvent;
-import org.eclipse.swt.layout.GridData;
-import org.eclipse.swt.layout.GridLayout;
-import org.eclipse.swt.widgets.Button;
-import org.eclipse.swt.widgets.Composite;
-import org.eclipse.swt.widgets.Event;
-import org.eclipse.swt.widgets.Label;
-import org.eclipse.swt.widgets.TableItem;
-import org.eclipse.swt.widgets.Text;
-import org.eclipse.ui.PlatformUI;
-import org.eclipse.wst.common.componentcore.datamodel.properties.IFacetDataModelProperties;
-import org.eclipse.wst.common.componentcore.resources.IVirtualComponent;
-import org.eclipse.wst.common.frameworks.datamodel.DataModelFactory;
-import org.eclipse.wst.common.frameworks.datamodel.IDataModel;
-import org.eclipse.wst.common.project.facet.core.IProjectFacetVersion;
-import org.eclipse.wst.common.project.facet.core.internal.FacetedProjectWorkingCopy;
-import org.eclipse.wst.common.project.facet.core.runtime.IRuntime;
-
-/**
- * @author <a href="mailto:kosta@bea.com">Konstantin Komissarchik</a>
- */
-
-public class EarFacetInstallPage extends J2EEModuleFacetInstallPage implements IEarFacetInstallDataModelProperties {
-
- private Button selectAllButton;
- private Button deselectAllButton;
- private Button newModuleButton;
-
- private Label moduleProjectsLabel;
- private CheckboxTableViewer moduleProjectsViewer;
-
- private boolean ignoreCheckedState = false;
-
- private Label contentDirLabel;
- private Text contentDir;
-
- public EarFacetInstallPage() {
- super("ear.facet.install.page"); //$NON-NLS-1$
- setTitle(J2EEUIMessages.getResourceString(J2EEUIMessages.EAR_COMPONENT_SECOND_PG_TITLE));
- setDescription(J2EEUIMessages.getResourceString(J2EEUIMessages.EAR_COMPONENT_SECOND_PG_DESC));
- setImageDescriptor(J2EEUIPlugin.getDefault().getImageDescriptor(J2EEUIPluginIcons.EAR_WIZ_BANNER));
- }
-
- @Override
- protected String[] getValidationPropertyNames() {
- return new String[]{CONTENT_DIR, J2EE_PROJECTS_LIST};
- }
-
- @Override
- protected Composite createTopLevelComposite(Composite parent) {
- setInfopopID(IJ2EEUIContextIds.NEW_EAR_ADD_MODULES_PAGE);
-
- Composite composite = new Composite(parent, SWT.NONE);
- composite.setLayout(new GridLayout());
- composite.setLayoutData(gdhfill());
-
- createModuleProjectOptions(composite);
- createContentDirGroup(composite);
-
- createGenerateDescriptorControl(composite, J2EEConstants.APPLICATION_DD_SHORT_NAME);
- registerFacetVersionChangeListener();
-
- Dialog.applyDialogFont(parent);
- return composite;
- }
-
- protected int getJ2EEVersion() {
- IProjectFacetVersion version = (IProjectFacetVersion)getDataModel().getProperty(FACET_VERSION);
- return J2EEVersionUtil.convertVersionStringToInt(version.getVersionString());
- }
-
- /**
- * @param parent
- */
- private void createModuleProjectOptions(Composite parent) {
- Composite composite = new Composite(parent, SWT.NONE);
- composite.setLayout(new GridLayout(2, false));
- composite.setLayoutData(new GridData(GridData.FILL_BOTH));
-
- moduleProjectsLabel = new Label(composite, SWT.NONE);
- moduleProjectsLabel.setText(J2EEUIMessages.getResourceString(J2EEUIMessages.J2EE_MODULE_DEPENDENCIES_LABEL));
- GridData gd = gdhfill();
- gd.horizontalSpan = 2;
- moduleProjectsLabel.setLayoutData(gd);
-
- moduleProjectsViewer = CheckboxTableViewer.newCheckList(composite, SWT.BORDER | SWT.H_SCROLL | SWT.V_SCROLL);
- GridData gData = new GridData(GridData.FILL_BOTH);
- gData.widthHint = 200;
- gData.heightHint = 80;
- moduleProjectsViewer.getControl().setLayoutData(gData);
- int j2eeVersion = getJ2EEVersion();
- ILabelDecorator decorator = PlatformUI.getWorkbench().getDecoratorManager().getLabelDecorator();
- AvailableJ2EEComponentsForEARContentProvider provider = new AvailableJ2EEComponentsForEARContentProvider(null, j2eeVersion, decorator);
- moduleProjectsViewer.setContentProvider(provider);
- final J2EEComponentLabelProvider labelProvider = new J2EEComponentLabelProvider(provider);
- decorator.addListener(new ILabelProviderListener(){
-
- public void labelProviderChanged(LabelProviderChangedEvent event) {
- if(!moduleProjectsViewer.getTable().isDisposed()){
- moduleProjectsViewer.refresh(true);
- }
- }
- });
- moduleProjectsViewer.setLabelProvider(labelProvider);
- setCheckedItemsFromModel();
-
- moduleProjectsViewer.addCheckStateListener(new ICheckStateListener() {
- public void checkStateChanged(CheckStateChangedEvent event) {
- if (!ignoreCheckedState) {
- getDataModel().setProperty(J2EE_PROJECTS_LIST, getCheckedJ2EEElementsAsList());
- getDataModel().setProperty(JAVA_PROJECT_LIST, getCheckedJavaProjectsAsList());
- }
- }
- });
- TableLayout tableLayout = new TableLayout();
- moduleProjectsViewer.getTable().setLayout(tableLayout);
- moduleProjectsViewer.getTable().setHeaderVisible(false);
- moduleProjectsViewer.getTable().setLinesVisible(false);
- moduleProjectsViewer.setSorter(null);
- this.moduleProjectsViewer.getTable().getAccessible().addAccessibleListener(
- new AccessibleAdapter() {
- @Override
- public void getName(AccessibleEvent e) {
- e.result = J2EEUIMessages.getResourceString(J2EEUIMessages.J2EE_MODULE_DEPENDENCIES_LABEL_ACCESSIBILITY);
- }});
-
- createButtonsGroup(composite);
- }
-
- /**
- *
- */
- private void setCheckedItemsFromModel() {
- List components = (List) getDataModel().getProperty(J2EE_PROJECTS_LIST);
-
- TableItem [] items = moduleProjectsViewer.getTable().getItems();
-
- List list = new ArrayList();
-
- for( int i=0; i< items.length; i++ ){
- Object element = items[i].getData();
- if( element instanceof IVirtualComponent){
- IVirtualComponent comp = (IVirtualComponent)element;
- Iterator it = components.iterator();
- while( it.hasNext() ){
- IProject project = (IProject)it.next();
- if( comp.getProject().getName().equals(project.getName()) ){
- list.add(comp);
- }
- }
- }
- }
- moduleProjectsViewer.setCheckedElements(list.toArray());
- }
-
- private void refreshModules() {
- moduleProjectsViewer.refresh();
- setCheckedItemsFromModel();
- }
-
- protected List getCheckedJ2EEElementsAsList() {
- Object[] elements = moduleProjectsViewer.getCheckedElements();
- List list;
- if (elements == null || elements.length == 0)
- list = Collections.EMPTY_LIST;
- else{
- list = new ArrayList();
- for( int i=0; i< elements.length; i++){
- if( elements[i] instanceof IVirtualComponent ) {
- list.add(((IVirtualComponent)elements[i]).getProject());
- }
- }
- }
- return list;
- }
-
- protected List getCheckedJavaProjectsAsList() {
- Object[] elements = moduleProjectsViewer.getCheckedElements();
- List list;
- if (elements == null || elements.length == 0)
- list = Collections.EMPTY_LIST;
- else{
- list = new ArrayList();
- for( int i=0; i< elements.length; i++){
- if( elements[i] instanceof IProject ) {
- list.add(elements[i]);
- }
- }
- }
- return list;
- }
-
-
- protected void createButtonsGroup(Composite parent) {
- Composite buttonGroup = new Composite(parent, SWT.NONE);
- buttonGroup.setLayout(new GridLayout());
- buttonGroup.setLayoutData(new GridData(GridData.VERTICAL_ALIGN_BEGINNING));
-
- selectAllButton = new Button(buttonGroup, SWT.PUSH);
- selectAllButton.setText(J2EEUIMessages.getResourceString(J2EEUIMessages.APP_PROJECT_MODULES_PG_SELECT));
- selectAllButton.addListener(SWT.Selection, this);
- GridDataFactory.defaultsFor( selectAllButton ).applyTo( selectAllButton );
-
- deselectAllButton = new Button(buttonGroup, SWT.PUSH);
- deselectAllButton.setText(J2EEUIMessages.getResourceString(J2EEUIMessages.APP_PROJECT_MODULES_PG_DESELECT));
- deselectAllButton.addListener(SWT.Selection, this);
- GridDataFactory.defaultsFor( deselectAllButton ).applyTo( deselectAllButton );
-
- new Label(buttonGroup, SWT.NONE); // pad
-
- newModuleButton = new Button(buttonGroup, SWT.PUSH);
- newModuleButton.setText(J2EEUIMessages.getResourceString(J2EEUIMessages.APP_PROJECT_MODULES_PG_NEW));
- newModuleButton.addListener(SWT.Selection, this);
- GridDataFactory.defaultsFor( newModuleButton ).applyTo( newModuleButton );
- }
-
- private void createContentDirGroup(Composite modulesGroup) {
- final Composite composite = new Composite(modulesGroup, SWT.NONE);
- composite.setLayout(new GridLayout(2, false));
- composite.setLayoutData(gdhfill());
-
- this.contentDirLabel = new Label(composite, SWT.NONE);
- this.contentDirLabel.setText(Resources.contentDirLabel);
- this.contentDirLabel.setLayoutData(new GridData());
-
- this.contentDir = new Text(composite, SWT.BORDER);
- this.contentDir.setLayoutData(gdhfill());
-
- synchHelper.synchText(contentDir, CONTENT_DIR, null);
- }
-
- /**
- * @see org.eclipse.swt.widgets.Listener#handleEvent(Event)
- */
- @Override
- public void handleEvent(Event evt) {
- if (evt.widget == selectAllButton)
- handleSelectAllButtonPressed();
- else if (evt.widget == deselectAllButton)
- handleDeselectAllButtonPressed();
- else if (evt.widget == newModuleButton)
- handleNewModuleButtonPressed();
- else
- super.handleEvent(evt);
- }
-
- @Override
- protected void handleFacetVersionChangedEvent()
- {
- String fv = model.getStringProperty(FACET_VERSION_STR);
- boolean isEAR50OrGreater = J2EEVersionUtil.convertVersionStringToInt(fv) >= J2EEVersionConstants.VERSION_5_0;
- this.addDD.setVisible(isEAR50OrGreater);
- }
-
- /**
- *
- */
- private void handleNewModuleButtonPressed() {
- IDataModel aModel = createNewModuleModel();
- DefaultJ2EEComponentCreationWizard wizard = new DefaultJ2EEComponentCreationWizard(aModel);
- WizardDialog dialog = new WizardDialog(getShell(), wizard);
- dialog.create();
- if (dialog.open() != IDialogConstants.CANCEL_ID) {
- IWorkspaceRoot input = ResourcesPlugin.getWorkspace().getRoot();
- moduleProjectsViewer.setInput(input);
- setNewModules(aModel);
- refreshModules();
- }
- }
- /**
- * @param model
- */
- private void setNewModules(IDataModel defaultModel) {
- List newComponents = new ArrayList();
- collectNewComponents(defaultModel, newComponents);
- List oldComponents = (List) getDataModel().getProperty(J2EE_PROJECTS_LIST);
- newComponents.addAll(oldComponents);
- getDataModel().setProperty(J2EE_PROJECTS_LIST, newComponents);
- }
-
- private void collectNewComponents(IDataModel defaultModel, List newProjects) {
- collectComponents(defaultModel.getNestedModel(IDefaultJ2EEComponentCreationDataModelProperties.NESTED_MODEL_EJB), newProjects);
- collectComponents(defaultModel.getNestedModel(IDefaultJ2EEComponentCreationDataModelProperties.NESTED_MODEL_WEB), newProjects);
- collectComponents(defaultModel.getNestedModel(IDefaultJ2EEComponentCreationDataModelProperties.NESTED_MODEL_CLIENT), newProjects);
- collectComponents(defaultModel.getNestedModel(IDefaultJ2EEComponentCreationDataModelProperties.NESTED_MODEL_JCA), newProjects);
- }
- private void collectComponents(IDataModel compDM, List newProjects) {
- if (compDM != null) {
- String projectName = compDM.getStringProperty(IFacetDataModelProperties.FACET_PROJECT_NAME);
- if(projectName == null) return;
- IProject project = ProjectUtilities.getProject(projectName);
- if (project != null && project.exists())
- newProjects.add(project);
- }
- }
-
- private IDataModel createNewModuleModel() {
- IDataModel defaultModel = DataModelFactory.createDataModel(new DefaultJ2EEComponentCreationDataModelProvider());
- // transfer properties, project name
- String projectName = model.getStringProperty(FACET_PROJECT_NAME);
- defaultModel.setProperty(IDefaultJ2EEComponentCreationDataModelProperties.PROJECT_NAME, projectName);
- // ear component name
- String earName = model.getStringProperty(FACET_PROJECT_NAME);
- defaultModel.setProperty(IDefaultJ2EEComponentCreationDataModelProperties.EAR_COMPONENT_NAME, earName);
- // ear j2ee version
- int j2eeVersion = getJ2EEVersion();
- defaultModel.setProperty(IDefaultJ2EEComponentCreationDataModelProperties.J2EE_VERSION, new Integer(j2eeVersion));
-
- FacetedProjectWorkingCopy fpwc = (FacetedProjectWorkingCopy)model.getProperty(FACETED_PROJECT_WORKING_COPY);
- IRuntime rt = fpwc.getPrimaryRuntime();
- defaultModel.setProperty(IDefaultJ2EEComponentCreationDataModelProperties.FACET_RUNTIME, rt);
-
- return defaultModel;
- }
-
- /**
- *
- */
- private void handleDeselectAllButtonPressed() {
- ignoreCheckedState = true;
- try {
- moduleProjectsViewer.setAllChecked(false);
- //getDataModel().setProperty(J2EE_COMPONENT_LIST, null);
- //IDataModel nestedModel = (IDataModel)getDataModel().getProperty(NESTED_ADD_COMPONENT_TO_EAR_DM);
- //(nestedModel).setProperty(AddComponentToEnterpriseApplicationDataModelProvider., getCheckedJ2EEElementsAsList());
- getDataModel().setProperty(J2EE_PROJECTS_LIST, null);
- getDataModel().setProperty(JAVA_PROJECT_LIST, null);
- } finally {
- ignoreCheckedState = false;
- }
- }
-
- /**
- *
- */
- private void handleSelectAllButtonPressed() {
- ignoreCheckedState = true;
- try {
- moduleProjectsViewer.setAllChecked(true);
- //getDataModel().setProperty(J2EE_COMPONENT_LIST, getCheckedElementsAsList());
- //IDataModel nestedModel = (IDataModel)getDataModel().getProperty(NESTED_ADD_COMPONENT_TO_EAR_DM);
- //(nestedModel).setProperty(AddComponentToEnterpriseApplicationDataModelProvider., getCheckedJ2EEElementsAsList());
-
- getDataModel().setProperty(J2EE_PROJECTS_LIST, getCheckedJ2EEElementsAsList());
- getDataModel().setProperty(JAVA_PROJECT_LIST, getCheckedJavaProjectsAsList());
-
- } finally {
- ignoreCheckedState = false;
- }
- }
-
- /*
- * (non-Javadoc)
- *
- * @see org.eclipse.wst.common.frameworks.internal.ui.wizard.J2EEWizardPage#enter()
- */
- @Override
- protected void enter() {
- IWorkspaceRoot input = ResourcesPlugin.getWorkspace().getRoot();
- moduleProjectsViewer.setInput(input);
- super.enter();
- }
-
-
- private static final class Resources
-
- extends NLS
- {
- public static String contentDirLabel;
-
- static {
- initializeMessages(EarFacetInstallPage.class.getName(), Resources.class);
- }
- }
-
-}
diff --git a/plugins/org.eclipse.jst.j2ee.ui/j2ee_ui/org/eclipse/jst/j2ee/ui/project/facet/EarFacetInstallPage.properties b/plugins/org.eclipse.jst.j2ee.ui/j2ee_ui/org/eclipse/jst/j2ee/ui/project/facet/EarFacetInstallPage.properties
deleted file mode 100644
index 2b4b77c..0000000
--- a/plugins/org.eclipse.jst.j2ee.ui/j2ee_ui/org/eclipse/jst/j2ee/ui/project/facet/EarFacetInstallPage.properties
+++ /dev/null
@@ -1,11 +0,0 @@
-###############################################################################
-# Copyright (c) 2005 IBM Corporation and others.
-# All rights reserved. This program and the accompanying materials
-# are made available under the terms of the Eclipse Public License v1.0
-# which accompanies this distribution, and is available at
-# http://www.eclipse.org/legal/epl-v10.html
-#
-# Contributors:
-# IBM Corporation - initial API and implementation
-###############################################################################
-contentDirLabel = &Content directory:
diff --git a/plugins/org.eclipse.jst.j2ee.ui/j2ee_ui/org/eclipse/jst/j2ee/ui/project/facet/EarProjectFirstPage.java b/plugins/org.eclipse.jst.j2ee.ui/j2ee_ui/org/eclipse/jst/j2ee/ui/project/facet/EarProjectFirstPage.java
deleted file mode 100644
index 1c8ba60..0000000
--- a/plugins/org.eclipse.jst.j2ee.ui/j2ee_ui/org/eclipse/jst/j2ee/ui/project/facet/EarProjectFirstPage.java
+++ /dev/null
@@ -1,49 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2003, 2006 IBM Corporation and others.
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
- *
- * Contributors:
- * IBM Corporation - initial API and implementation
- *******************************************************************************/
-package org.eclipse.jst.j2ee.ui.project.facet;
-
-import org.eclipse.jface.dialogs.IDialogSettings;
-import org.eclipse.jst.j2ee.internal.actions.IJ2EEUIContextIds;
-import org.eclipse.jst.j2ee.internal.plugin.J2EEUIMessages;
-import org.eclipse.jst.j2ee.internal.plugin.J2EEUIPlugin;
-import org.eclipse.jst.j2ee.internal.plugin.J2EEUIPluginIcons;
-import org.eclipse.swt.widgets.Composite;
-import org.eclipse.wst.common.componentcore.internal.util.IModuleConstants;
-import org.eclipse.wst.common.frameworks.datamodel.IDataModel;
-import org.eclipse.wst.web.ui.internal.wizards.DataModelFacetCreationWizardPage;
-
-public class EarProjectFirstPage extends DataModelFacetCreationWizardPage {
-
- public EarProjectFirstPage(IDataModel dataModel, String pageName) {
- super(dataModel, pageName);
- setTitle(J2EEUIMessages.getResourceString(J2EEUIMessages.EAR_COMPONENT_MAIN_PG_TITLE));
- setDescription(J2EEUIMessages.getResourceString(J2EEUIMessages.EAR_COMPONENT_MAIN_PG_DESC));
- setImageDescriptor(J2EEUIPlugin.getDefault().getImageDescriptor(J2EEUIPluginIcons.EAR_WIZ_BANNER));
- setInfopopID(IJ2EEUIContextIds.NEW_EAR_WIZARD_P1);
- }
-
- @Override
- protected IDialogSettings getDialogSettings() {
- return J2EEUIPlugin.getDefault().getDialogSettings();
- }
-
- @Override
- protected String getModuleTypeID() {
- return IModuleConstants.JST_EAR_MODULE;
- }
-
- @Override
- protected Composite createTopLevelComposite(Composite parent) {
- final Composite top = super.createTopLevelComposite(parent);
- createWorkingSetGroupPanel(top, new String[] { RESOURCE_WORKING_SET });
- return top;
- }
-}
diff --git a/plugins/org.eclipse.jst.j2ee.ui/j2ee_ui/org/eclipse/jst/j2ee/ui/project/facet/EarProjectWizard.java b/plugins/org.eclipse.jst.j2ee.ui/j2ee_ui/org/eclipse/jst/j2ee/ui/project/facet/EarProjectWizard.java
deleted file mode 100644
index ae391d1..0000000
--- a/plugins/org.eclipse.jst.j2ee.ui/j2ee_ui/org/eclipse/jst/j2ee/ui/project/facet/EarProjectWizard.java
+++ /dev/null
@@ -1,77 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2003, 2006 IBM Corporation and others.
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
- *
- * Contributors:
- * IBM Corporation - initial API and implementation
- *******************************************************************************/
-package org.eclipse.jst.j2ee.ui.project.facet;
-
-import java.net.URL;
-
-import org.eclipse.core.runtime.Platform;
-import org.eclipse.jface.resource.ImageDescriptor;
-import org.eclipse.jface.wizard.IWizardPage;
-import org.eclipse.jst.j2ee.internal.plugin.J2EEUIMessages;
-import org.eclipse.jst.j2ee.project.facet.EARFacetProjectCreationDataModelProvider;
-import org.eclipse.wst.common.frameworks.datamodel.DataModelFactory;
-import org.eclipse.wst.common.frameworks.datamodel.IDataModel;
-import org.eclipse.wst.common.project.facet.core.IFacetedProjectTemplate;
-import org.eclipse.wst.common.project.facet.core.ProjectFacetsManager;
-import org.eclipse.wst.common.project.facet.core.runtime.IRuntime;
-import org.eclipse.wst.project.facet.IProductConstants;
-import org.eclipse.wst.project.facet.ProductManager;
-import org.eclipse.wst.web.ui.internal.wizards.NewProjectDataModelFacetWizard;
-import org.osgi.framework.Bundle;
-
-public class EarProjectWizard extends NewProjectDataModelFacetWizard {
-
- public EarProjectWizard(IDataModel model){
- super(model);
- setWindowTitle(J2EEUIMessages.getResourceString(J2EEUIMessages.EAR_COMPONENT_WIZ_TITLE));
- }
-
- public EarProjectWizard(){
- super();
- setWindowTitle(J2EEUIMessages.getResourceString(J2EEUIMessages.EAR_COMPONENT_WIZ_TITLE));
- }
-
- @Override
- protected IDataModel createDataModel() {
- return DataModelFactory.createDataModel(new EARFacetProjectCreationDataModelProvider());
- }
-
- public void setRuntimeInDataModel(IRuntime runtime){
- model.setProperty(FACET_RUNTIME, runtime);
- }
-
- @Override
- protected ImageDescriptor getDefaultPageImageDescriptor() {
- final Bundle bundle = Platform.getBundle("org.eclipse.jst.j2ee.ui"); //$NON-NLS-1$
- final URL url = bundle.getEntry("icons/ear-wiz-banner.gif"); //$NON-NLS-1$
-
- return ImageDescriptor.createFromURL(url);
- }
-
- @Override
- protected IFacetedProjectTemplate getTemplate() {
- return ProjectFacetsManager.getTemplate("template.jst.ear"); //$NON-NLS-1$
- }
-
- @Override
- protected IWizardPage createFirstPage() {
- return new EarProjectFirstPage(model, "first.page"); //$NON-NLS-1$
- }
-
- @Override
- protected String getFinalPerspectiveID() {
- return ProductManager.getProperty(IProductConstants.FINAL_PERSPECTIVE_EAR);
- }
-
- public void setEARName( String earName ){
- model.setProperty(FACET_PROJECT_NAME, earName);
- }
-}
diff --git a/plugins/org.eclipse.jst.j2ee.ui/j2ee_ui/org/eclipse/jst/j2ee/ui/project/facet/EarSelectionPanel.java b/plugins/org.eclipse.jst.j2ee.ui/j2ee_ui/org/eclipse/jst/j2ee/ui/project/facet/EarSelectionPanel.java
deleted file mode 100644
index 1ece7b3..0000000
--- a/plugins/org.eclipse.jst.j2ee.ui/j2ee_ui/org/eclipse/jst/j2ee/ui/project/facet/EarSelectionPanel.java
+++ /dev/null
@@ -1,145 +0,0 @@
-/******************************************************************************
- * Copyright (c) 2005, 2009 BEA Systems, Inc. and others.
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
- *
- * Contributors:
- * Konstantin Komissarchik - initial API and implementation
- * David Schneider, david.schneider@unisys.com - [142500] WTP properties pages fonts don't follow Eclipse preferences
- ******************************************************************************/
-
-package org.eclipse.jst.j2ee.ui.project.facet;
-
-import org.eclipse.jface.dialogs.Dialog;
-import org.eclipse.jface.layout.GridDataFactory;
-import org.eclipse.jface.window.Window;
-import org.eclipse.jface.wizard.WizardDialog;
-import org.eclipse.jst.j2ee.web.project.facet.IWebFacetInstallDataModelProperties;
-import org.eclipse.osgi.util.NLS;
-import org.eclipse.swt.SWT;
-import org.eclipse.swt.events.SelectionAdapter;
-import org.eclipse.swt.events.SelectionEvent;
-import org.eclipse.swt.layout.GridData;
-import org.eclipse.swt.layout.GridLayout;
-import org.eclipse.swt.widgets.Button;
-import org.eclipse.swt.widgets.Combo;
-import org.eclipse.swt.widgets.Composite;
-import org.eclipse.swt.widgets.Control;
-import org.eclipse.swt.widgets.Group;
-import org.eclipse.swt.widgets.Label;
-import org.eclipse.wst.common.frameworks.datamodel.IDataModel;
-import org.eclipse.wst.common.frameworks.internal.datamodel.ui.DataModelSynchHelper;
-import org.eclipse.wst.common.project.facet.core.runtime.IRuntime;
-
-/**
- * @author <a href="mailto:kosta@bea.com">Konstantin Komissarchik</a>
- */
-
-public final class EarSelectionPanel implements IWebFacetInstallDataModelProperties
-
-{
- private final Button addToEar;
- private final Combo combo;
- private final Button newButton;
- private final Label label;
-
- private final IDataModel model;
- private DataModelSynchHelper synchhelper;
-
- public EarSelectionPanel( final IDataModel model, final Composite parent)
- {
- this.model = model;
- this.synchhelper = new DataModelSynchHelper(model);
-
- final Group group = new Group( parent, SWT.NONE );
- group.setLayoutData( gdhfill() );
- group.setLayout( new GridLayout( 3, false ) );
- group.setText( Resources.earMemberShip );
-
- this.addToEar = new Button( group, SWT.CHECK );
- this.addToEar.setText( Resources.addToEarLabel );
- GridDataFactory.defaultsFor(this.addToEar).span(3, 1).applyTo(this.addToEar);
- synchhelper.synchCheckbox(addToEar, ADD_TO_EAR, null);
-
- label = new Label(group, SWT.NULL);
- label.setText(Resources.earProjectLabel);
- this.combo = new Combo(group, SWT.NONE);
- this.combo.setLayoutData( gdhfill() );
-
- this.newButton = new Button( group, SWT.PUSH );
- this.newButton.setText( Resources.newButtonLabel );
- GridDataFactory.defaultsFor(this.newButton).applyTo(this.newButton);
-
- this.newButton.addSelectionListener( new SelectionAdapter()
- {
- @Override
- public void widgetSelected( final SelectionEvent event )
- {
- handleAddButton();
- }
- } );
-
- synchhelper.synchCombo(combo, EAR_PROJECT_NAME, new Control[]{label, newButton});
- Dialog.applyDialogFont(parent);
- }
-
- private void handleAddButton()
- {
- final EarProjectWizard wizard = new EarProjectWizard();
-
- final WizardDialog dialog
- = new WizardDialog( newButton.getShell(), wizard );
-
- IRuntime runtime = (IRuntime)model.getProperty(FACET_RUNTIME);
- wizard.setRuntimeInDataModel(runtime);
-
- if( dialog.open() != Window.CANCEL )
- {
- model.notifyPropertyChange(EAR_PROJECT_NAME, IDataModel.VALID_VALUES_CHG);
- final String earproj = wizard.getProjectName();
- model.setProperty(EAR_PROJECT_NAME, earproj);
- }
- }
-
- private static GridData gdhfill()
- {
- return new GridData( GridData.FILL_HORIZONTAL );
- }
-
- public static final GridData gdhspan( final GridData gd,
- final int span )
- {
- gd.horizontalSpan = span;
- return gd;
- }
-
- private static final class Resources
-
- extends NLS
-
- {
- public static String addToEarLabel;
- public static String newButtonLabel;
- public static String earProjectLabel;
- public static String earMemberShip;
-
- static
- {
- initializeMessages( EarSelectionPanel.class.getName(),
- Resources.class );
- }
- }
-
- public void dispose() {
- if(synchhelper != null){
- synchhelper.dispose();
- synchhelper = null;
- }
- }
-
- public String getComboText(){
- return combo.getText();
- }
-}
diff --git a/plugins/org.eclipse.jst.j2ee.ui/j2ee_ui/org/eclipse/jst/j2ee/ui/project/facet/EarSelectionPanel.properties b/plugins/org.eclipse.jst.j2ee.ui/j2ee_ui/org/eclipse/jst/j2ee/ui/project/facet/EarSelectionPanel.properties
deleted file mode 100644
index f7ab193..0000000
--- a/plugins/org.eclipse.jst.j2ee.ui/j2ee_ui/org/eclipse/jst/j2ee/ui/project/facet/EarSelectionPanel.properties
+++ /dev/null
@@ -1,15 +0,0 @@
-###############################################################################
-# Copyright (c) 2005, 2006 IBM Corporation and others.
-# All rights reserved. This program and the accompanying materials
-# are made available under the terms of the Eclipse Public License v1.0
-# which accompanies this distribution, and is available at
-# http://www.eclipse.org/legal/epl-v10.html
-#
-# Contributors:
-# IBM Corporation - initial API and implementation
-# SAP AG - adding keyboard shortcuts
-###############################################################################
-addToEarLabel = &Add project to an EAR
-newButtonLabel = New &Project...
-earProjectLabel=&EAR project name:
-earMemberShip=EAR membership
diff --git a/plugins/org.eclipse.jst.j2ee.ui/j2ee_ui/org/eclipse/jst/j2ee/ui/project/facet/RuntimeMismatchMarkerResolutions.java b/plugins/org.eclipse.jst.j2ee.ui/j2ee_ui/org/eclipse/jst/j2ee/ui/project/facet/RuntimeMismatchMarkerResolutions.java
deleted file mode 100644
index bcc777d..0000000
--- a/plugins/org.eclipse.jst.j2ee.ui/j2ee_ui/org/eclipse/jst/j2ee/ui/project/facet/RuntimeMismatchMarkerResolutions.java
+++ /dev/null
@@ -1,185 +0,0 @@
-/******************************************************************************
- * Copyright (c) 2005-2007 BEA Systems, Inc.
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
- *
- * Contributors:
- * Konstantin Komissarchik
- ******************************************************************************/
-
-package org.eclipse.jst.j2ee.ui.project.facet;
-
-import java.util.ArrayList;
-import java.util.Iterator;
-import java.util.List;
-
-import org.eclipse.core.resources.IMarker;
-import org.eclipse.core.resources.IProject;
-import org.eclipse.core.resources.IWorkspace;
-import org.eclipse.core.resources.ResourcesPlugin;
-import org.eclipse.core.runtime.CoreException;
-import org.eclipse.jface.dialogs.ErrorDialog;
-import org.eclipse.jst.j2ee.internal.plugin.J2EEUIPlugin;
-import org.eclipse.osgi.util.NLS;
-import org.eclipse.ui.IMarkerResolution;
-import org.eclipse.ui.IMarkerResolutionGenerator;
-import org.eclipse.wst.common.project.facet.core.IFacetedProject;
-import org.eclipse.wst.common.project.facet.core.ProjectFacetsManager;
-import org.eclipse.wst.common.project.facet.core.runtime.IRuntime;
-import org.eclipse.wst.common.project.facet.core.runtime.RuntimeManager;
-
-/**
- * @author <a href="mailto:kosta@bea.com">Konstantin Komissarchik</a>
- */
-
-public final class RuntimeMismatchMarkerResolutions
-
- implements IMarkerResolutionGenerator
-
-{
- private static final String ATTR_RUNTIME1 = "runtime1"; //$NON-NLS-1$
- private static final String ATTR_RUNTIME2 = "runtime2"; //$NON-NLS-1$
- private static final String ATTR_MODULE_PROJECT = "moduleProject"; //$NON-NLS-1$
-
- public IMarkerResolution[] getResolutions( final IMarker marker )
- {
- final List resolutions = new ArrayList( 2 );
-
- try
- {
- final IProject earProject = marker.getResource().getProject();
- final IFacetedProject earFacetedProject = ProjectFacetsManager.create( earProject );
- final IProject modProject = getModuleProject( marker );
- final IFacetedProject modFacetedProject = ProjectFacetsManager.create( modProject );
-
- for( Iterator itr = getRuntimes( marker ).iterator(); itr.hasNext(); )
- {
- final IRuntime runtime = (IRuntime) itr.next();
-
- if( earFacetedProject.isTargetable( runtime ) &&
- modFacetedProject.isTargetable( runtime ) )
- {
- final Resolution resolution
- = new Resolution( earFacetedProject, modFacetedProject, runtime );
-
- resolutions.add( resolution );
- }
- }
- }
- catch( CoreException e )
- {
- J2EEUIPlugin.logError( -1, null, e );
- }
-
- IMarkerResolution[] array = new IMarkerResolution[ resolutions.size() ];
- resolutions.toArray( array );
-
- return array;
- }
-
- private static IProject getModuleProject( final IMarker marker )
- {
- final IWorkspace ws = ResourcesPlugin.getWorkspace();
- final String moduleProjectName = marker.getAttribute( ATTR_MODULE_PROJECT, null );
- return ws.getRoot().getProject( moduleProjectName );
- }
-
- private static List getRuntimes( final IMarker marker )
- {
- final List runtimes = new ArrayList();
-
- IRuntime r = getRuntimeByName( marker.getAttribute( ATTR_RUNTIME1, null ) );
- if( r != null ) runtimes.add( r );
-
- r = getRuntimeByName( marker.getAttribute( ATTR_RUNTIME2, null ) );
- if( r != null ) runtimes.add( r );
-
- return runtimes;
- }
-
- private static IRuntime getRuntimeByName( final String name )
- {
- if( RuntimeManager.isRuntimeDefined( name ) )
- {
- return RuntimeManager.getRuntime( name );
- }
- return null;
- }
-
- private static final class Resolution
-
- implements IMarkerResolution
-
- {
- private final IFacetedProject earProject;
- private final IFacetedProject moduleProject;
- private final IRuntime runtime;
-
- public Resolution( final IFacetedProject earProject,
- final IFacetedProject moduleProject,
- final IRuntime runtime )
- {
- this.earProject = earProject;
- this.moduleProject = moduleProject;
- this.runtime = runtime;
- }
-
- public String getLabel()
- {
- return NLS.bind( Resources.useSameRuntime, this.runtime.getLocalizedName() );
- }
-
- public void run( final IMarker marker )
- {
- try
- {
- setRuntime( this.earProject, this.runtime );
- setRuntime( this.moduleProject, this.runtime );
- }
- catch( CoreException e )
- {
- ErrorDialog.openError( null, Resources.errorDialogTitle,
- Resources.errorDialogMessage, e.getStatus() );
- }
- }
-
- private void setRuntime( final IFacetedProject fproj,
- final IRuntime runtime )
-
- throws CoreException
-
- {
- final IRuntime currentPrimaryRuntime = fproj.getPrimaryRuntime();
-
- if( currentPrimaryRuntime != null &&
- ! currentPrimaryRuntime.getName().equals( runtime.getName() ) )
- {
- if( ! fproj.isTargeted( runtime ) )
- {
- fproj.addTargetedRuntime( runtime, null );
- }
-
- fproj.setPrimaryRuntime( runtime, null );
- }
- }
- }
-
- private static final class Resources
-
- extends NLS
-
- {
- public static String useSameRuntime;
- public static String errorDialogTitle;
- public static String errorDialogMessage;
-
- static
- {
- initializeMessages( RuntimeMismatchMarkerResolutions.class.getName(),
- Resources.class );
- }
- }
-
-}
diff --git a/plugins/org.eclipse.jst.j2ee.ui/j2ee_ui/org/eclipse/jst/j2ee/ui/project/facet/RuntimeMismatchMarkerResolutions.properties b/plugins/org.eclipse.jst.j2ee.ui/j2ee_ui/org/eclipse/jst/j2ee/ui/project/facet/RuntimeMismatchMarkerResolutions.properties
deleted file mode 100644
index f8b03d6..0000000
--- a/plugins/org.eclipse.jst.j2ee.ui/j2ee_ui/org/eclipse/jst/j2ee/ui/project/facet/RuntimeMismatchMarkerResolutions.properties
+++ /dev/null
@@ -1,13 +0,0 @@
-###############################################################################
-# Copyright (c) 2005, 2007 IBM Corporation and others.
-# All rights reserved. This program and the accompanying materials
-# are made available under the terms of the Eclipse Public License v1.0
-# which accompanies this distribution, and is available at
-# http://www.eclipse.org/legal/epl-v10.html
-#
-# Contributors:
-# IBM Corporation - initial API and implementation
-###############################################################################
-useSameRuntime = Switch both projects to {0}
-errorDialogTitle = Error
-errorDialogMessage = Failed while applying the quick fix.
\ No newline at end of file
diff --git a/plugins/org.eclipse.jst.j2ee.ui/j2ee_ui/org/eclipse/jst/j2ee/ui/project/facet/UtilityProjectFirstPage.java b/plugins/org.eclipse.jst.j2ee.ui/j2ee_ui/org/eclipse/jst/j2ee/ui/project/facet/UtilityProjectFirstPage.java
deleted file mode 100644
index 29bbeb7..0000000
--- a/plugins/org.eclipse.jst.j2ee.ui/j2ee_ui/org/eclipse/jst/j2ee/ui/project/facet/UtilityProjectFirstPage.java
+++ /dev/null
@@ -1,42 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2003, 2006 IBM Corporation and others.
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
- *
- * Contributors:
- * IBM Corporation - initial API and implementation
- *******************************************************************************/
-package org.eclipse.jst.j2ee.ui.project.facet;
-
-import org.eclipse.jst.j2ee.internal.actions.IJ2EEUIContextIds;
-import org.eclipse.jst.j2ee.internal.project.J2EEProjectUtilities;
-import org.eclipse.jst.j2ee.internal.wizard.J2EEComponentFacetCreationWizardPage;
-import org.eclipse.osgi.util.NLS;
-import org.eclipse.wst.common.frameworks.datamodel.IDataModel;
-
-public class UtilityProjectFirstPage extends J2EEComponentFacetCreationWizardPage {
-
- public UtilityProjectFirstPage(IDataModel dataModel, String pageName) {
- super(dataModel, pageName);
- setTitle(Resources.pageTitle);
- setDescription(Resources.pageDescription);
- setInfopopID(IJ2EEUIContextIds.NEW_UTILITY_WIZARD_P1);
- }
-
- private static final class Resources extends NLS {
- public static String pageTitle;
- public static String pageDescription;
-
- static {
- initializeMessages(UtilityProjectFirstPage.class.getName(), Resources.class);
- }
- }
-
- @Override
- protected String getModuleFacetID() {
- return J2EEProjectUtilities.UTILITY;
- }
-
-}
diff --git a/plugins/org.eclipse.jst.j2ee.ui/j2ee_ui/org/eclipse/jst/j2ee/ui/project/facet/UtilityProjectFirstPage.properties b/plugins/org.eclipse.jst.j2ee.ui/j2ee_ui/org/eclipse/jst/j2ee/ui/project/facet/UtilityProjectFirstPage.properties
deleted file mode 100644
index 0a6de07..0000000
--- a/plugins/org.eclipse.jst.j2ee.ui/j2ee_ui/org/eclipse/jst/j2ee/ui/project/facet/UtilityProjectFirstPage.properties
+++ /dev/null
@@ -1,12 +0,0 @@
-###############################################################################
-# Copyright (c) 2005 IBM Corporation and others.
-# All rights reserved. This program and the accompanying materials
-# are made available under the terms of the Eclipse Public License v1.0
-# which accompanies this distribution, and is available at
-# http://www.eclipse.org/legal/epl-v10.html
-#
-# Contributors:
-# IBM Corporation - initial API and implementation
-###############################################################################
-pageTitle = Utility Module
-pageDescription = Configure utility module settings.
\ No newline at end of file
diff --git a/plugins/org.eclipse.jst.j2ee.ui/j2ee_ui/org/eclipse/jst/j2ee/ui/project/facet/UtilityProjectWizard.java b/plugins/org.eclipse.jst.j2ee.ui/j2ee_ui/org/eclipse/jst/j2ee/ui/project/facet/UtilityProjectWizard.java
deleted file mode 100644
index f801445..0000000
--- a/plugins/org.eclipse.jst.j2ee.ui/j2ee_ui/org/eclipse/jst/j2ee/ui/project/facet/UtilityProjectWizard.java
+++ /dev/null
@@ -1,73 +0,0 @@
-/******************************************************************************
- * Copyright (c) 2005 BEA Systems, Inc.
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
- *
- * Contributors:
- * Konstantin Komissarchik - initial API and implementation
- ******************************************************************************/
-
-package org.eclipse.jst.j2ee.ui.project.facet;
-
-import java.net.URL;
-
-import org.eclipse.core.runtime.Platform;
-import org.eclipse.jface.resource.ImageDescriptor;
-import org.eclipse.jface.wizard.IWizardPage;
-import org.eclipse.jst.j2ee.internal.plugin.J2EEUIMessages;
-import org.eclipse.jst.j2ee.project.facet.UtilityProjectCreationDataModelProvider;
-import org.eclipse.wst.common.frameworks.datamodel.DataModelFactory;
-import org.eclipse.wst.common.frameworks.datamodel.IDataModel;
-import org.eclipse.wst.common.project.facet.core.IFacetedProjectTemplate;
-import org.eclipse.wst.common.project.facet.core.ProjectFacetsManager;
-import org.eclipse.wst.project.facet.IProductConstants;
-import org.eclipse.wst.project.facet.ProductManager;
-import org.eclipse.wst.web.ui.internal.wizards.NewProjectDataModelFacetWizard;
-import org.osgi.framework.Bundle;
-
-/**
- * @author <a href="mailto:kosta@bea.com">Konstantin Komissarchik</a>
- */
-
-public class UtilityProjectWizard extends NewProjectDataModelFacetWizard {
-
- public UtilityProjectWizard(IDataModel model) {
- super(model);
- setWindowTitle(J2EEUIMessages.getResourceString(J2EEUIMessages.JAVAUTIL_COMPONENT_WIZ_TITLE));
- }
-
- public UtilityProjectWizard(){
- super();
- setWindowTitle(J2EEUIMessages.getResourceString(J2EEUIMessages.JAVAUTIL_COMPONENT_WIZ_TITLE));
- }
-
- @Override
- protected IDataModel createDataModel() {
- return DataModelFactory.createDataModel(new UtilityProjectCreationDataModelProvider());
- }
-
- @Override
- protected ImageDescriptor getDefaultPageImageDescriptor() {
- final Bundle bundle = Platform.getBundle("org.eclipse.jst.j2ee.ui"); //$NON-NLS-1$
- final URL url = bundle.getEntry("icons/util-wiz-banner.gif"); //$NON-NLS-1$
- return ImageDescriptor.createFromURL(url);
- }
-
- @Override
- protected IFacetedProjectTemplate getTemplate() {
- return ProjectFacetsManager.getTemplate("template.jst.utility"); //$NON-NLS-1$
- }
-
- @Override
- protected IWizardPage createFirstPage() {
- return new UtilityProjectFirstPage(model, "first.page"); //$NON-NLS-1$
- }
-
- @Override
- protected String getFinalPerspectiveID() {
- return ProductManager.getProperty(IProductConstants.FINAL_PERSPECTIVE_UTILITY);
- }
-
-}
diff --git a/plugins/org.eclipse.jst.j2ee.ui/j2ee_ui/org/eclipse/jst/j2ee/ui/project/facet/appclient/AppClientFacetInstallPage.java b/plugins/org.eclipse.jst.j2ee.ui/j2ee_ui/org/eclipse/jst/j2ee/ui/project/facet/appclient/AppClientFacetInstallPage.java
deleted file mode 100644
index 9ecebbb..0000000
--- a/plugins/org.eclipse.jst.j2ee.ui/j2ee_ui/org/eclipse/jst/j2ee/ui/project/facet/appclient/AppClientFacetInstallPage.java
+++ /dev/null
@@ -1,68 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2005, 2006 IBM Corporation and others.
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
- *
- * Contributors:
- * IBM Corporation - initial API and implementation
- * David Schneider, david.schneider@unisys.com - [142500] WTP properties pages fonts don't follow Eclipse preferences
- *******************************************************************************/
-package org.eclipse.jst.j2ee.ui.project.facet.appclient;
-
-import org.eclipse.jface.dialogs.Dialog;
-import org.eclipse.jst.j2ee.internal.J2EEConstants;
-import org.eclipse.jst.j2ee.internal.J2EEVersionConstants;
-import org.eclipse.jst.j2ee.internal.actions.IJ2EEUIContextIds;
-import org.eclipse.jst.j2ee.internal.common.J2EEVersionUtil;
-import org.eclipse.jst.j2ee.internal.plugin.J2EEUIMessages;
-import org.eclipse.jst.j2ee.internal.wizard.J2EEModuleFacetInstallPage;
-import org.eclipse.jst.j2ee.project.facet.IAppClientFacetInstallDataModelProperties;
-import org.eclipse.swt.SWT;
-import org.eclipse.swt.layout.GridLayout;
-import org.eclipse.swt.widgets.Button;
-import org.eclipse.swt.widgets.Composite;
-import org.eclipse.wst.common.project.facet.core.IProjectFacetVersion;
-
-public class AppClientFacetInstallPage extends J2EEModuleFacetInstallPage implements IAppClientFacetInstallDataModelProperties {
-
- private Button createMainClass;
-
- public AppClientFacetInstallPage() {
- super("appclient.facet.install.page"); //$NON-NLS-1$
- setTitle(J2EEUIMessages.getResourceString(J2EEUIMessages.APP_CLIENT_PROJECT_MAIN_PG_TITLE));
- setDescription(J2EEUIMessages.getResourceString(J2EEUIMessages.APP_CLIENT_SETTINGS));
- }
-
- @Override
- protected String[] getValidationPropertyNames() {
- return new String[]{EAR_PROJECT_NAME, CONFIG_FOLDER, CREATE_DEFAULT_MAIN_CLASS};
- }
-
- @Override
- protected Composite createTopLevelComposite(Composite parent) {
- setInfopopID(IJ2EEUIContextIds.NEW_APPCLIENT_WIZARD_P3);
- final Composite composite = new Composite(parent, SWT.NONE);
- composite.setLayout(new GridLayout(1, false));
-
- createMainClass = new Button(composite, SWT.CHECK);
- createMainClass.setText(J2EEUIMessages.getResourceString(J2EEUIMessages.APP_CLIENT_CREATE_MAIN));
- synchHelper.synchCheckbox(createMainClass, CREATE_DEFAULT_MAIN_CLASS, null);
-
- createGenerateDescriptorControl(composite, J2EEConstants.APP_CLIENT_DD_SHORT_NAME);
- registerFacetVersionChangeListener();
-
- Dialog.applyDialogFont(parent);
- return composite;
- }
-
- @Override
- protected void handleFacetVersionChangedEvent()
- {
- final IProjectFacetVersion fv = (IProjectFacetVersion) this.model.getProperty( FACET_VERSION );
- boolean isJEE5OrGreater = J2EEVersionUtil.convertVersionStringToInt(fv.getVersionString()) >= J2EEVersionConstants.JEE_5_0_ID;
- this.addDD.setVisible(isJEE5OrGreater);
- }
-
-}
diff --git a/plugins/org.eclipse.jst.j2ee.ui/j2ee_ui/org/eclipse/jst/j2ee/ui/project/facet/appclient/AppClientProjectFirstPage.java b/plugins/org.eclipse.jst.j2ee.ui/j2ee_ui/org/eclipse/jst/j2ee/ui/project/facet/appclient/AppClientProjectFirstPage.java
deleted file mode 100644
index b9d0fe4..0000000
--- a/plugins/org.eclipse.jst.j2ee.ui/j2ee_ui/org/eclipse/jst/j2ee/ui/project/facet/appclient/AppClientProjectFirstPage.java
+++ /dev/null
@@ -1,77 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2005, 2006 IBM Corporation and others.
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
- *
- * Contributors:
- * IBM Corporation - initial API and implementation
- *******************************************************************************/
-package org.eclipse.jst.j2ee.ui.project.facet.appclient;
-
-import java.util.Collections;
-import java.util.HashSet;
-import java.util.Set;
-
-import org.eclipse.jst.common.project.facet.JavaFacetUtils;
-import org.eclipse.jst.j2ee.internal.actions.IJ2EEUIContextIds;
-import org.eclipse.jst.j2ee.internal.plugin.J2EEUIMessages;
-import org.eclipse.jst.j2ee.internal.plugin.J2EEUIPlugin;
-import org.eclipse.jst.j2ee.internal.plugin.J2EEUIPluginIcons;
-import org.eclipse.jst.j2ee.internal.project.J2EEProjectUtilities;
-import org.eclipse.jst.j2ee.internal.wizard.J2EEComponentFacetCreationWizardPage;
-import org.eclipse.jst.j2ee.project.facet.IJ2EEFacetConstants;
-import org.eclipse.wst.common.componentcore.datamodel.properties.IFacetProjectCreationDataModelProperties;
-import org.eclipse.wst.common.frameworks.datamodel.IDataModel;
-import org.eclipse.wst.common.project.facet.core.IProjectFacetVersion;
-import org.eclipse.wst.common.project.facet.core.runtime.IRuntime;
-
-public class AppClientProjectFirstPage extends J2EEComponentFacetCreationWizardPage {
-
- public AppClientProjectFirstPage(IDataModel dataModel, String pageName) {
- super(dataModel, pageName);
- setTitle(J2EEUIMessages.getResourceString(J2EEUIMessages.APP_CLIENT_PROJECT_MAIN_PG_TITLE));
- setDescription(J2EEUIMessages.getResourceString(J2EEUIMessages.APP_CLIENT_PROJECT_MAIN_PG_DESC));
- setImageDescriptor(J2EEUIPlugin.getDefault().getImageDescriptor(J2EEUIPluginIcons.APP_CLIENT_PROJECT_WIZARD_BANNER));
- setInfopopID(IJ2EEUIContextIds.NEW_APPCLIENT_WIZARD_P1);
- }
-
- @Override
- protected String getModuleFacetID() {
- return J2EEProjectUtilities.APPLICATION_CLIENT;
- }
-
- @Override
- protected Set<IProjectFacetVersion> getFacetConfiguration( final IProjectFacetVersion primaryFacetVersion )
- {
- IRuntime runtime = (IRuntime)model.getProperty(IFacetProjectCreationDataModelProperties.FACET_RUNTIME);
- final Set<IProjectFacetVersion> facets = new HashSet<IProjectFacetVersion>( 2 );
-
- if(runtime != null) {
- facets.addAll(super.getFacetConfiguration(primaryFacetVersion));
- }
- else {
- facets.add( primaryFacetVersion );
-
- if( primaryFacetVersion == IJ2EEFacetConstants.APPLICATION_CLIENT_60)
- {
- facets.add( JavaFacetUtils.JAVA_60 );
- }
- else if(primaryFacetVersion == IJ2EEFacetConstants.APPLICATION_CLIENT_50)
- {
- facets.add( JavaFacetUtils.JAVA_50 );
- }
- else if( primaryFacetVersion == IJ2EEFacetConstants.APPLICATION_CLIENT_14)
- {
- facets.add( JavaFacetUtils.JAVA_14 );
- }
- else if( primaryFacetVersion == IJ2EEFacetConstants.APPLICATION_CLIENT_13 ||
- primaryFacetVersion == IJ2EEFacetConstants.APPLICATION_CLIENT_12 )
- {
- facets.add( JavaFacetUtils.JAVA_13 );
- }
- }
- return Collections.unmodifiableSet( facets );
- }
-}
diff --git a/plugins/org.eclipse.jst.j2ee.ui/j2ee_ui/org/eclipse/jst/j2ee/ui/project/facet/appclient/AppClientProjectWizard.java b/plugins/org.eclipse.jst.j2ee.ui/j2ee_ui/org/eclipse/jst/j2ee/ui/project/facet/appclient/AppClientProjectWizard.java
deleted file mode 100644
index 3bd07a0..0000000
--- a/plugins/org.eclipse.jst.j2ee.ui/j2ee_ui/org/eclipse/jst/j2ee/ui/project/facet/appclient/AppClientProjectWizard.java
+++ /dev/null
@@ -1,69 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2005, 2006 IBM Corporation and others.
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
- *
- * Contributors:
- * IBM Corporation - initial API and implementation
- *******************************************************************************/
-package org.eclipse.jst.j2ee.ui.project.facet.appclient;
-
-import java.net.URL;
-
-import org.eclipse.core.runtime.Platform;
-import org.eclipse.jface.resource.ImageDescriptor;
-import org.eclipse.jface.wizard.IWizardPage;
-import org.eclipse.jst.j2ee.applicationclient.internal.creation.AppClientFacetProjectCreationDataModelProvider;
-import org.eclipse.jst.j2ee.internal.plugin.J2EEUIMessages;
-import org.eclipse.jst.j2ee.internal.plugin.J2EEUIPlugin;
-import org.eclipse.wst.common.frameworks.datamodel.DataModelFactory;
-import org.eclipse.wst.common.frameworks.datamodel.IDataModel;
-import org.eclipse.wst.common.project.facet.core.IFacetedProjectTemplate;
-import org.eclipse.wst.common.project.facet.core.ProjectFacetsManager;
-import org.eclipse.wst.project.facet.IProductConstants;
-import org.eclipse.wst.project.facet.ProductManager;
-import org.eclipse.wst.web.ui.internal.wizards.NewProjectDataModelFacetWizard;
-import org.osgi.framework.Bundle;
-
-public class AppClientProjectWizard extends NewProjectDataModelFacetWizard {
-
- public AppClientProjectWizard(IDataModel model) {
- super(model);
- setWindowTitle(J2EEUIMessages.getResourceString(J2EEUIMessages.APP_CLIENT_PROJECT_WIZ_TITLE));
- }
-
- public AppClientProjectWizard() {
- super();
- setWindowTitle(J2EEUIMessages.getResourceString(J2EEUIMessages.APP_CLIENT_PROJECT_WIZ_TITLE));
- }
-
- @Override
- protected IDataModel createDataModel() {
- return DataModelFactory.createDataModel(new AppClientFacetProjectCreationDataModelProvider());
- }
-
- @Override
- protected ImageDescriptor getDefaultPageImageDescriptor() {
- final Bundle bundle = Platform.getBundle(J2EEUIPlugin.PLUGIN_ID);
- final URL url = bundle.getEntry("icons/full/wizban/appclient_wiz.gif"); //$NON-NLS-1$
- return ImageDescriptor.createFromURL(url);
- }
-
- @Override
- protected IFacetedProjectTemplate getTemplate() {
- return ProjectFacetsManager.getTemplate("template.jst.appclient"); //$NON-NLS-1$
- }
-
- @Override
- protected IWizardPage createFirstPage() {
- return new AppClientProjectFirstPage(model, "first.page"); //$NON-NLS-1$
- }
-
- @Override
- protected String getFinalPerspectiveID() {
- return ProductManager.getProperty(IProductConstants.FINAL_PERSPECTIVE_APPCLIENT);
- }
-
-}
diff --git a/plugins/org.eclipse.jst.j2ee.ui/javadoc.xml b/plugins/org.eclipse.jst.j2ee.ui/javadoc.xml
deleted file mode 100644
index 633a03e..0000000
--- a/plugins/org.eclipse.jst.j2ee.ui/javadoc.xml
+++ /dev/null
@@ -1,6 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<project default="javadoc">
- <target name="javadoc">
- <javadoc access="protected" author="false" classpath="../org.eclipse.jst.j2ee.web/bin;../org.eclipse.jst.common.frameworks/bin;../org.eclipse.jst.common.navigator.java/bin;D:\Development\targets\wtp_target\eclipse\plugins\org.eclipse.osgi_3.1.0\core.jar;D:\Development\targets\wtp_target\eclipse\plugins\org.eclipse.wst.common.uriresolver_1.0.0\uriresolver.jar;D:\Development\targets\wtp_target\eclipse\plugins\org.eclipse.emf.edit.ui_2.1.0\runtime\edit.ui.jar;D:\Development\targets\wtp_target\eclipse\plugins\org.eclipse.wst.wsdl_1.0.0\wsdl.jar;D:\Development\targets\wtp_target\eclipse\plugins\org.eclipse.ui.editors_3.1.0\editors.jar;D:\Development\targets\wtp_target\eclipse\plugins\com.ibm.wtp.common.util_1.0.1\util.jar;D:\Development\targets\wtp_target\eclipse\plugins\org.eclipse.emf.ecore.edit_2.1.0\runtime\ecore.edit.jar;D:\Development\targets\wtp_target\eclipse\plugins\org.eclipse.wst.xml.uriresolver_1.0.0\xmlcatalog.jar;D:\Development\targets\wtp_target\eclipse\plugins\org.eclipse.ui.workbench_3.1.0\workbench.jar;D:\Development\targets\wtp_target\eclipse\plugins\org.eclipse.core.runtime.compatibility_3.0.0\compatibility.jar;D:\Development\targets\wtp_target\eclipse\plugins\com.ibm.wtp.emf.workbench_1.0.1.1\emfworkbench.jar;../org.eclipse.jst.j2ee.jca.ui/bin;D:\Development\targets\wtp_target\eclipse\plugins\org.eclipse.emf.edit_2.1.0\runtime\edit.jar;../org.eclipse.wst.common.emfworkbench.integration/bin;D:\Development\targets\wtp_target\eclipse\plugins\org.eclipse.jem.workbench_1.0.1.1\workbench.jar;../org.eclipse.wst.validation/bin;../org.eclipse.wst.web/bin;../org.eclipse.jst.ejb.ui/bin;D:\Development\targets\wtp_target\eclipse\plugins\org.eclipse.jdt.core_3.1.0\jdtcore.jar;D:\Development\targets\wtp_target\eclipse\plugins\org.eclipse.osgi_3.1.0\osgi.jar;D:\Development\targets\wtp_target\eclipse\plugins\org.eclipse.emf.common.ui_2.0.1\runtime\common.ui.jar;../org.eclipse.jst.common.annotations.controller/bin;D:\Development\targets\wtp_target\eclipse\plugins\org.eclipse.emf.codegen_2.1.0\runtime\codegen.jar;D:\Development\targets\wtp_target\eclipse\plugins\org.eclipse.ui.ide_3.1.0\ide.jar;D:\Development\targets\wtp_target\eclipse\plugins\org.eclipse.jdt.ui_3.1.0\jdt.jar;D:\Development\targets\wtp_target\eclipse\plugins\org.eclipse.jem_1.0.1\javainst.jar;../org.eclipse.jst.j2ee.ejb/bin;D:\Development\targets\wtp_target\eclipse\plugins\org.eclipse.osgi_3.1.0\defaultAdaptor.jar;D:\Development\targets\wtp_target\eclipse\plugins\org.eclipse.swt.win32_3.1.0\ws\win32\swt.jar;D:\Development\targets\wtp_target\eclipse\plugins\org.eclipse.osgi_3.1.0\resolver.jar;D:\Development\targets\wtp_target\eclipse\plugins\org.eclipse.wst.wsdl_1.0.0\jars\wsdl4j.jar;../org.eclipse.jst.j2ee.jca/bin;D:\Development\targets\wtp_target\eclipse\plugins\org.eclipse.xsd_2.1.0\runtime\xsd.jar;D:\Development\targets\wtp_target\eclipse\plugins\org.eclipse.jface.text_3.1.0\jfacetext.jar;D:\Development\targets\wtp_target\eclipse\plugins\org.eclipse.ui.workbench.texteditor_3.1.0\texteditor.jar;D:\Development\targets\wtp_target\eclipse\plugins\org.eclipse.ui.views_3.1.0\views.jar;D:\Development\targets\wtp_target\eclipse\plugins\org.eclipse.core.resources_3.1.0\resources.jar;D:\Development\targets\wtp_target\eclipse\plugins\org.eclipse.wst.common.contentmodel_1.0.0\contentmodel.jar;D:\Development\targets\wtp_target\eclipse\plugins\org.eclipse.text_3.1.0\text.jar;D:\Development\targets\wtp_target\eclipse\plugins\org.eclipse.wst.ws.parser_1.0.0\parser.jar;../org.eclipse.jst.j2ee/bin;../org.eclipse.jst.common.annotations.core/bin;D:\Development\targets\wtp_target\eclipse\plugins\org.eclipse.osgi_3.1.0\eclipseAdaptor.jar;../org.eclipse.jst.j2ee.core/runtime/j2ee.jar;../org.eclipse.wst.sse.core/bin;D:\Development\targets\wtp_target\eclipse\plugins\org.eclipse.core.filebuffers_3.1.0\filebuffers.jar;../org.eclipse.wst.common.navigator.workbench/bin;../org.eclipse.wst.common.migration/bin;D:\Development\targets\wtp_target\eclipse\plugins\org.eclipse.wst.webbrowser_1.0.0\webbrowser.jar;D:\Development\targets\wtp_target\eclipse\plugins\org.eclipse.jem_1.0.1\mofjava.jar;D:\Development\targets\wtp_target\eclipse\plugins\org.eclipse.wst.server.core_3.0.0\servercore.jar;D:\Development\targets\wtp_target\eclipse\plugins\org.eclipse.emf.common_2.1.0\runtime\common.jar;D:\Development\targets\wtp_target\eclipse\plugins\org.eclipse.wst.server.ui_3.0.0\serverui.jar;D:\Development\targets\wtp_target\eclipse\plugins\org.eclipse.jdt.launching_3.1.0\launching.jar;D:\Development\targets\wtp_target\eclipse\plugins\org.eclipse.wst.wsdl_1.0.0\jars\qname.jar;D:\Development\targets\wtp_target\eclipse\plugins\org.eclipse.ui_3.1.0\ui.jar;../org.eclipse.wst.common.frameworks/bin;../org.eclipse.jst.j2ee.core/bin;D:\Development\targets\wtp_target\eclipse\plugins\org.eclipse.emf.codegen.ecore_2.1.0\runtime\codegen.ecore.jar;D:\Development\targets\wtp_target\eclipse\plugins\org.eclipse.ltk.core.refactoring_3.1.0\refcore.jar;../org.eclipse.jst.servlet.ui/bin;bin;D:\Development\targets\wtp_target\eclipse\plugins\org.eclipse.core.runtime_3.1.0\runtime.jar;D:\Development\targets\wtp_target\eclipse\plugins\org.eclipse.osgi_3.1.0\console.jar;../org.eclipse.wst.common.emf/bin;../org.eclipse.wst.common.navigator.views/bin;D:\Development\targets\wtp_target\eclipse\plugins\org.eclipse.update.configurator_3.0.0\configurator.jar;D:\Development\targets\wtp_target\eclipse\plugins\org.eclipse.emf.ecore.xmi_2.1.0\runtime\ecore.xmi.jar;D:\Development\targets\wtp_target\eclipse\plugins\org.eclipse.jface_3.1.0\jface.jar;D:\Development\targets\wtp_target\eclipse\plugins\org.eclipse.emf.ecore_2.1.0\runtime\ecore.jar;../org.eclipse.wst.common.frameworks.ui/bin;D:\Development\targets\wtp_target\eclipse\plugins\org.eclipse.jst.server.core_3.0.0\sjavacore.jar;D:\Development\targets\wtp_target\eclipse\plugins\org.eclipse.wst.common.encoding_1.0.0\encodingresource.jar" destdir="D:\Development\wtp_api_docs" nodeprecated="false" nodeprecatedlist="false" noindex="false" nonavbar="false" notree="false" packagenames="org.eclipse.jst.j2ee.jca.ui,org.eclipse.jst.servlet.ui,org.eclipse.jst.j2ee.ui,org.eclipse.jst.ejb.ui" sourcepath="j2ee_ui;../org.eclipse.jst.ejb.ui/property_files;../org.eclipse.jst.servlet.ui/property_files;property_files;../org.eclipse.jst.servlet.ui/servlet_ui;../org.eclipse.jst.ejb.ui/ejb_ui;../org.eclipse.jst.j2ee.jca.ui/property_files;../org.eclipse.jst.j2ee.jca.ui/jca_ui" splitindex="true" use="true" version="true"/>
- </target>
-</project>
diff --git a/plugins/org.eclipse.jst.j2ee.ui/plugin.properties b/plugins/org.eclipse.jst.j2ee.ui/plugin.properties
deleted file mode 100644
index 9824ea7..0000000
--- a/plugins/org.eclipse.jst.j2ee.ui/plugin.properties
+++ /dev/null
@@ -1,43 +0,0 @@
-###############################################################################
-# Copyright (c) 2003, 2007 IBM Corporation and others.
-# All rights reserved. This program and the accompanying materials
-# are made available under the terms of the Eclipse Public License v1.0
-# which accompanies this distribution, and is available at
-# http://www.eclipse.org/legal/epl-v10.html
-#
-# Contributors:
-# IBM Corporation - initial API and implementation
-###############################################################################
-j2ee=Java EE
-client.jar.file_ui_=App Client JAR file
-client.import.description_ui_=Import an external Application Client JAR file into an Application Client project
-client.export.description_ui_=Export an Application Client project into an Application Client JAR file
-ear.file_ui_=EAR file
-ear.import.description_ui_=Import an external EAR file into an Enterprise Application project
-
-ear.export.description_ui_=Export an Enterprise Application project into an EAR file
-j2ee.category_ui_=Java EE
-j2ee.actions.description_ui_=Actions for Java EE Development
-create.enterprise.application_ui_=Create an Enterprise Application
-create.client.module_ui_=Create an Application Client project
-ejb.export.action.description_ui_=Export EJB JAR File...
-utility_jar_import_wizard=Java EE Utility Jar
-ear_component_ui_=Enterprise Application Project
-new.ear.component.description_ui_=Create a Java EE EAR project
-appclient_component_ui_=Application Client Project
-new.appclient.component.description_ui_=Create a Java EE application client project
-J2EEDependenciesPage.name = Java EE Module Dependencies
-util-project-wizard-name = Utility Project
-util-project-wizard-description = Create a Utility project
-utility.import.description_ui_=Import one or more external *.jar files as Java EE Utility Projects or *.jars.
-Web_Project_Settings=Web Project Settings
-update-ear-libraries=Update EAR Libraries
-update-ear-libraries-tooltip=Recompute the contents of the EAR Libraries classpath container.
-earLibrariesContainerName=EAR Libraries
-
-Bundle-Name.0 = WTP J2EE UI Plug-in
-Bundle-Vendor.0 = Eclipse Web Tools Platform
-javaee.ui.popupMenu=Java EE Tools
-
-Project=Project
-AddJavaBuildPathEntriesWizardFragment-Name = Java Build Path Entries
\ No newline at end of file
diff --git a/plugins/org.eclipse.jst.j2ee.ui/plugin.xml b/plugins/org.eclipse.jst.j2ee.ui/plugin.xml
deleted file mode 100644
index 322f8e6..0000000
--- a/plugins/org.eclipse.jst.j2ee.ui/plugin.xml
+++ /dev/null
@@ -1,842 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<?eclipse version="3.0"?>
-<plugin>
-
- <extension-point
- id="archiveExportParticipantPanels"
- name="Archive Export Participant Panels Extension Point"
- schema="schema/archiveExportParticipantPanels.exsd"/>
-
- <extension-point id="JavaEEPreferencePageExtender"
- name="JavaEEPreferencePage"
- schema="schema/JavaEEPreferencePageExtender.exsd"/>
-
-<!--================================-->
-<!-- Project Wizard Contributions -->
-<!--================================-->
- <extension
- id="J2EEUIProjectWizards"
- point="org.eclipse.ui.newWizards">
- <category
- name="%j2ee.category_ui_"
- id="org.eclipse.jst.j2ee.internal">
- </category>
-<!-- Flexible Project Wizard
- <wizard
- name="%flexible.project_ui_"
- icon="icons/full/ctool16/newear_wiz.gif"
- category="org.eclipse.jdt.ui.java"
- class="org.eclipse.jst.j2ee.internal.wizard.FlexibleProjectCreationWizard"
- project="true"
- finalPerspective="org.eclipse.jst.j2ee.J2EEPerspective"
- id="org.eclipse.jst.j2ee.ui.FlexibleProjectCreationWizard"
- >
- <description>
- %new.flexible.project.description_ui_
- </description>
- <selection
- class="org.eclipse.core.resources.IResource">
- </selection>
- </wizard>-->
-<!-- EAR Component Wizard -->
- <wizard
- name="%ear_component_ui_"
- icon="icons/full/ctool16/newear_wiz.gif"
- category="org.eclipse.jst.j2ee.internal"
- project="true"
- finalPerspective="org.eclipse.jst.j2ee.J2EEPerspective"
- id="org.eclipse.jst.j2ee.ui.project.facet.EarProjectWizard">
- <class class="org.eclipse.jst.j2ee.ui.project.facet.EarProjectWizard">
- <parameter name="javaeeproject" value="true" />
- <parameter name="menuIndex" value="30" />
- </class>
- <description>
- %new.ear.component.description_ui_
- </description>
- <selection
- class="org.eclipse.core.resources.IResource" />
- </wizard>
-<!-- Application Client Component Wizard -->
- <wizard
- name="%appclient_component_ui_"
- icon="icons/full/ctool16/newappclient_wiz.gif"
- category="org.eclipse.jst.j2ee.internal"
- project="true"
- finalPerspective="org.eclipse.jst.j2ee.J2EEPerspective"
- id="org.eclipse.jst.j2ee.ui.project.facet.appclient.AppClientProjectWizard">
- <class class="org.eclipse.jst.j2ee.ui.project.facet.appclient.AppClientProjectWizard">
- <parameter name="javaeeproject" value="true"/>
- <parameter name="menuIndex" value="40" />
- </class>
- <description>
- %new.appclient.component.description_ui_
- </description>
- <selection
- class="org.eclipse.core.resources.IResource" />
- </wizard>
-<!-- Utility Component Wizard -->
- <wizard
- name="%util-project-wizard-name"
- icon="icons/util-wiz-icon.gif"
- category="org.eclipse.jst.j2ee.internal"
- project="true"
- finalPerspective="org.eclipse.jst.j2ee.J2EEPerspective"
- id="org.eclipse.jst.j2ee.ui.project.facet.UtilityProjectWizard">
- <class class="org.eclipse.jst.j2ee.ui.project.facet.UtilityProjectWizard">
- <parameter name="javaeeproject" value="true"/>
- <parameter name="menuIndex" value="60" />
- </class>
- <description>
- %util-project-wizard-description
- </description>
- <selection
- class="org.eclipse.core.resources.IResource" />
- </wizard>
-
- </extension>
-
-<!--================================-->
-<!-- Import Wizard Contributions -->
-<!--================================-->
- <extension
- point="org.eclipse.ui.importWizards">
- <wizard
- category="org.eclipse.jst.j2ee.internal"
- class="org.eclipse.jst.j2ee.internal.wizard.AppClientComponentImportWizard"
- icon="icons/full/ctool16/appclient_import_wiz.gif"
- id="org.eclipse.jst.j2ee.internal.wizard.AppClientComponentImportWizard"
- name="%client.jar.file_ui_">
- <description>
- %client.import.description_ui_
- </description>
- <selection
- class="org.eclipse.core.resources.IResource">
- </selection>
- </wizard>
- <wizard
- category="org.eclipse.jst.j2ee.internal"
- class="org.eclipse.jst.j2ee.internal.wizard.EARComponentImportWizard"
- icon="icons/full/ctool16/import_ear.gif"
- id="org.eclipse.jst.j2ee.internal.wizard.EARComponentImportWizard"
- name="%ear.file_ui_">
- <description>
- %ear.import.description_ui_
- </description>
- <selection
- class="org.eclipse.core.resources.IResource">
- </selection>
- </wizard>
- <wizard
- category="org.eclipse.jst.j2ee.internal"
- class="org.eclipse.jst.j2ee.internal.wizard.J2EEUtilityJarImportWizardNew"
- icon="icons/util-wiz-icon.gif"
- id="org.eclipse.jst.j2ee.internal.wizard.J2EEUtilityJarImportWizardNew"
- name="%utility_jar_import_wizard">
- <description>
- %utility.import.description_ui_
- </description>
- <selection class="org.eclipse.core.resources.IResource"/>
- </wizard>
- <category
- id="org.eclipse.jst.j2ee.internal"
- name="%j2ee.category_ui_"/>
- </extension>
-
- <!-- <wizard
- class="org.eclipse.jst.j2ee.internal.wizard.J2EEUtilityJarImportWizard"
- icon="icons/jar_obj.gif"
- name="%utility_jar_import_wizard"
- id="org.eclipse.jst.j2ee.ui.J2EEUtilityJarImportWizard">
- <selection
- class="org.eclipse.core.resources.IResource">
- </selection>
- </wizard>
- <wizard
- name="%Import_Classes"
- icon=""
- class="org.eclipse.jst.j2ee.internal.wizard.ClassesImportWizard"
- id="org.eclipse.jst.j2ee.internal.wizard.ClassesImportWizard">
-
- <selection
- class="org.eclipse.core.resources.IResource">
- </selection>
- </wizard>
- </extension> -->
-<!--================================-->
-<!-- Export Wizard Contributions -->
-<!--================================-->
- <extension
- point="org.eclipse.ui.exportWizards">
- <wizard
- category="org.eclipse.jst.j2ee.internal"
- class="org.eclipse.jst.j2ee.internal.wizard.AppClientComponentExportWizard"
- icon="icons/full/ctool16/appclient_export.gif"
- id="org.eclipse.jst.j2ee.internal.wizard.AppClientComponentExportWizard"
- name="%client.jar.file_ui_">
- <description>
- %client.export.description_ui_
- </description>
- <selection
- class="org.eclipse.core.resources.IResource">
- </selection>
- </wizard>
- <wizard
- category="org.eclipse.jst.j2ee.internal"
- class="org.eclipse.jst.j2ee.internal.wizard.EARComponentExportWizard"
- icon="icons/full/ctool16/export_ear.gif"
- id="org.eclipse.jst.j2ee.internal.wizard.EARComponentExportWizard"
- name="%ear.file_ui_">
- <description>
- %ear.export.description_ui_
- </description>
- <selection
- class="org.eclipse.core.resources.IResource">
- </selection>
- </wizard>
- <category
- id="org.eclipse.jst.j2ee.internal"
- name="%j2ee.category_ui_"/>
- </extension>
-<!-- ====================================================== -->
-<!-- Extension point: org.eclipse.ui.projectNatureImages -->
-<!-- Purpose: Attach icon overlays for J2EE project natures -->
-<!-- ====================================================== -->
- <extension
- point="org.eclipse.ui.ide.projectNatureImages">
- <image
- icon="icons/full/ovr16/ejb_module_ovr.gif"
- natureId="org.eclipse.jst.j2ee.ejb.EJBNature"
- id="org.eclipse.ui.ejbProjectNatureImage">
- </image>
- <image
- icon="icons/full/ovr16/enterprise_app_ovr.gif"
- natureId="org.eclipse.jst.j2ee.EARNature"
- id="org.eclipse.ui.earProjectNatureImage">
- </image>
- <image
- icon="icons/full/ovr16/client_app_ovr.gif"
- natureId="org.eclipse.jst.j2ee.ApplicationClientNature"
- id="org.eclipse.ui.appClientModProjectNatureImage">
- </image>
- <image
- icon="icons/full/ovr16/connector_ovr.gif"
- natureId="org.eclipse.jst.j2ee.jca.ConnectorNature"
- id="org.eclipse.ui.ConnectorModProjectNatureImage">
- </image>
- <image
- icon="icons/full/ovr16/web_module_ovr.gif"
- natureId="org.eclipse.jst.j2ee.web.WebNature"
- id="org.eclipse.ui.webProjectNatureImage">
- </image>
- </extension>
-
- <extension
- point="org.eclipse.wst.common.frameworks.ui.wtpuiAction">
- <masterOperation
- description="Delete the dependent J2EE modules"
- extendedGenericId="org.eclipse.wst.common.generic.Delete"
- populatorClass="org.eclipse.jst.j2ee.internal.ui.actions.J2EEDeleteModuleActionPopulator"
- operationClass="org.eclipse.wst.common.frameworks.internal.operation.extension.ui.IActionWTPOperation"
- name="Delete J2EE Dependent Modules"
- alwaysExecute="true"
- overrideId="org.eclipse.wst.common.actions.Java.delete">
- <selectionEnablement>
- <or>
- <and>
- <objectClass name="org.eclipse.core.resources.IProject"
- adaptable="true" />
- <or>
- <objectState
- value="org.eclipse.jst.j2ee.EARNature"
- name="projectNature" />
- <objectState
- value="org.eclipse.jst.j2ee.ApplicationClientNature"
- name="projectNature" />
- <objectState
- value="org.eclipse.jst.j2ee.jca.ConnectorNature"
- name="projectNature" />
- <objectState
- value="org.eclipse.jst.j2ee.ejb.EJBNature"
- name="projectNature" />
- <objectState
- value="org.eclipse.jst.j2ee.web.WebNature"
- name="projectNature" />
- </or>
- </and>
- <objectClass
- name="org.eclipse.jst.j2ee.internal.application.Application">
- </objectClass>
- <objectClass
- name="org.eclipse.jst.j2ee.internal.client.ApplicationClient">
- </objectClass>
- <objectClass
- name="org.eclipse.jst.j2ee.internal.jca.Connector">
- </objectClass>
- <objectClass
- name="org.eclipse.jst.j2ee.internal.ejb.EJBJar">
- </objectClass>
- <objectClass
- name="org.eclipse.jst.j2ee.internal.webapplication.WebApp">
- </objectClass>
- </or>
- </selectionEnablement>
- </masterOperation>
- </extension>
-
-
- <extension
- point="org.eclipse.wst.common.emfworkbench.integration.adapterFactory">
- <adapterFactory
- className="org.eclipse.jst.j2ee.internal.ejb.provider.J2EEEjbItemProviderAdapterFactory"
- packageURI="ejb.xmi"
- id="org.eclipse.jst.j2ee.internal.ejb.provider.J2EEEjbItemProviderAdapterFactory">
- <view
- id="org.eclipse.ui.navigator.ProjectExplorer">
- </view>
- </adapterFactory>
- <adapterFactory
- className="org.eclipse.jst.j2ee.internal.war.ui.util.J2EEWebItemProviderAdapterFactory"
- packageURI="webapplication.xmi"
- id="org.eclipse.jst.j2ee.internal.war.ui.util.J2EEWebItemProviderAdapterFactory">
- <view
- id="org.eclipse.ui.navigator.ProjectExplorer">
- </view>
- </adapterFactory>
- <adapterFactory
- className="org.eclipse.jst.j2ee.internal.provider.J2EEApplicationItemProviderAdapterFactory"
- packageURI="application.xmi"
- id="org.eclipse.jst.j2ee.internal.provider.J2EEApplicationItemProviderAdapterFactory">
- <view
- id="org.eclipse.ui.navigator.ProjectExplorer">
- </view>
- </adapterFactory>
- </extension>
- <extension point="org.eclipse.ui.popupMenus">
- <objectContribution objectClass="org.eclipse.core.resources.IProject" adaptable="true" id="org.eclipse.jst.j2ee.ui.popupMenu">
- <menu label="%javaee.ui.popupMenu" id="javeeUIPopupMenuCategory">
- <separator name="slot1"/> <!-- New/featured Java EE actions -->
- <separator name="slot2"/> <!-- Create files category -->
- <separator name="slot3"/> <!-- Project creation(clients) -->
- <separator name="slot4"/> <!-- Legacy(J2EE) actions -->
- </menu>
- </objectContribution>
- <!-- additional object contribution -->
- <objectContribution objectClass="org.eclipse.jdt.core.IJavaElement" adaptable="true" id="org.eclipse.jst.j2ee.ui.javaElement.popupMenu">
- <menu label="%javaee.ui.popupMenu" id="javeeUIPopupMenuCategory.javaElement">
- <separator name="slot1"/>
- <separator name="slot2"/>
- <separator name="slot3"/>
- <separator name="slot4"/>
- </menu>
- </objectContribution>
- </extension>
- <extension
- point="org.eclipse.ui.popupMenus">
- <objectContribution
- objectClass="org.eclipse.core.resources.IProject"
- adaptable="true"
- id="org.eclipse.jst.j2ee.internal.actions.ForceClasspathUpdateAction">
- <action
- label="%update-ear-libraries"
- tooltip="%update-ear-libraries-tooltip"
- class="org.eclipse.jst.j2ee.internal.actions.ForceClasspathUpdateAction"
- menubarPath="javeeUIPopupMenuCategory/slot1"
- enablesFor="+"
- icon="icons/full/obj16/library_obj.gif"
- id="org.eclipse.jst.j2ee.internal.actions.ForceClasspathUpdateAction">
- </action>
- <enablement>
- <adapt type="org.eclipse.core.resources.IProject">
- <and>
-
- <test forcePluginActivation="true"
- property="org.eclipse.wst.common.frameworks.actions.show"
- args="org.eclipse.jst.j2ee.internal.actions.ForceClasspathUpdateAction"/>
-
-
- <or>
- <test forcePluginActivation="true"
- property="org.eclipse.wst.common.project.facet.core.projectFacet"
- value="jst.web" />
- <test forcePluginActivation="true"
- property="org.eclipse.wst.common.project.facet.core.projectFacet"
- value="jst.ejb" />
- <test forcePluginActivation="true"
- property="org.eclipse.wst.common.project.facet.core.projectFacet"
- value="jst.utility" />
- <test forcePluginActivation="true"
- property="org.eclipse.wst.common.project.facet.core.projectFacet"
- value="jst.ear" />
- <test forcePluginActivation="true"
- property="org.eclipse.wst.common.project.facet.core.projectFacet"
- value="jst.appclient" />
- <test forcePluginActivation="true"
- property="org.eclipse.wst.common.project.facet.core.projectFacet"
- value="jst.connector" />
- </or>
- </and>
- </adapt>
- </enablement>
- </objectContribution>
- </extension>
-
-<!-- Navigator Object Contributions -->
-<!-- EAR Group Contributions
- <extension
- point="org.eclipse.ui.popupMenus">
- <objectContribution
- objectClass="org.eclipse.wst.common.navigator.internal.groups.NavigatorGroup"
- id="org.eclipse.jst.j2ee.internal.ui.navigator.earProjectActions">
- <action
- label="%ear.file_ui_"
- icon="icons/full/ctool16/import_ear.gif"
- class="org.eclipse.jst.j2ee.internal.ear.actions.ImportEARAction"
- menubarPath="org.eclipse.wst.common.frameworks.internal.navigator.import.menu/additions"
- enablesFor="1"
- id="org.eclipse.jst.j2ee.internal.ui.navigator.importEARAction">
- </action>
- <action
- label="%ear.file_ui_"
- icon="icons/full/ctool16/export_ear.gif"
- class="org.eclipse.jst.j2ee.internal.ear.actions.ExportEARAction"
- menubarPath="org.eclipse.wst.common.frameworks.internal.navigator.export.menu/additions"
- enablesFor="1"
- id="org.eclipse.jst.j2ee.internal.ui.navigator.exportEARAction">
- </action>
- <visibility>
- <objectState
- name="projectNature"
- value="org.eclipse.jst.j2ee.EARNature">
- </objectState>
- </visibility>
- </objectContribution>
- </extension>
- -->
-<!-- Navigator Object Contributions -->
-<!-- Application Client Group Contributions
- <extension
- point="org.eclipse.ui.popupMenus">
- <objectContribution
- objectClass="org.eclipse.wst.common.navigator.internal.groups.NavigatorGroup"
- id="org.eclipse.jst.j2ee.internal.ui.navigator.appClientProjectActions">
- <action
- label="%client.jar.file_ui_"
- icon="icons/full/ctool16/appclient_import_wiz.gif"
- class="org.eclipse.jst.j2ee.internal.client.actions.ImportApplicationClientAction"
- menubarPath="org.eclipse.wst.common.frameworks.internal.navigator.import.menu/additions"
- enablesFor="1"
- id="org.eclipse.jst.j2ee.internal.ui.navigator.importAppClientAction">
- </action>
- <action
- label="%client.jar.file_ui_"
- icon="icons/full/ctool16/appclient_export.gif"
- class="org.eclipse.jst.j2ee.internal.client.actions.ExportApplicationClientAction"
- menubarPath="org.eclipse.wst.common.frameworks.internal.navigator.export.menu/additions"
- enablesFor="1"
- id="org.eclipse.jst.j2ee.internal.ui.navigator.exportAppClientAction">
- </action>
- <visibility>
- <objectState
- name="projectNature"
- value="org.eclipse.jst.j2ee.ApplicationClientNature">
- </objectState>
- </visibility>
- </objectContribution>
- </extension>
- -->
-<!-- Navigator Object Contributions -->
-<!-- ================================================== -->
-<!-- DEPLOY EXTENSIONS -->
-<!-- ================================================== -->
-<!-- <extension
- point="org.eclipse.ui.popupMenus">
- <objectContribution
- objectClass="java.lang.Object"
- nameFilter="*"
- id="org.eclipse.jst.j2ee.internal.ui.deploy">
- <action
- label="%deploy_ui_"
- icon="icons/full/ctool16/re_execute.gif"
- class="org.eclipse.jst.j2ee.internal.actions.J2EEDeployAction"
- menubarPath="additions"
- id="deployAction">
- </action>
- <visibility>
- <or>
- <objectClass
- name="org.eclipse.jst.j2ee.ejb.EJBJar">
- </objectClass>
- <objectClass
- name="org.eclipse.jst.j2ee.ejb.EnterpriseBean">
- </objectClass>
- <objectClass
- name="org.eclipse.jst.j2ee.webapplication.WebApp">
- </objectClass>
- <objectClass
- name="org.eclipse.jst.j2ee.jca.Connector">
- </objectClass>
- <objectClass
- name="org.eclipse.jst.j2ee.application.Application">
- </objectClass>
- <objectClass
- name="org.eclipse.jst.j2ee.client.ApplicationClient">
- </objectClass>
-
- <objectState
- name="projectNature"
- value="org.eclipse.wst.common.componentcore.ModuleCoreNature">
- </objectState>
-
- </or>
- </visibility>
- </objectContribution>
- </extension> -->
-<!-- Navigator Object Contributions -->
-
-
-
-
-<!-- =========== org.eclipse.jst.j2ee.internal.J2EEDependencyPage ============ -->
-
- <extension point="org.eclipse.ui.propertyPages">
- <page
- adaptable="true"
- objectClass="org.eclipse.core.resources.IProject"
- name="%Web_Project_Settings"
- class="org.eclipse.jst.j2ee.internal.ui.J2EEPropertiesPage"
- id="J2EEPropertiesPage">
- <enabledWhen>
- <and>
- <adapt
- type="org.eclipse.core.resources.IProject">
- <or>
- <test forcePluginActivation="true"
- property="org.eclipse.wst.common.project.facet.core.projectFacet"
- value="jst.web" />
- <test forcePluginActivation="true"
- property="org.eclipse.wst.common.project.facet.core.projectFacet"
- value="wst.web" />
- </or>
- </adapt>
- </and>
- </enabledWhen>
- </page>
-
- </extension>
-
-<!--
- <extension point="org.eclipse.ltk.core.refactoring.renameParticipants">
-
- <renameParticipant
- class="org.eclipse.jst.j2ee.internal.actions.J2EERenameParticipant"
- id="org.eclipse.jst.j2ee.internal.actions.J2EERenameParticipant"
- name="%J2EE_Rename_Participant">
- <enablement>
- <with variable="affectedNatures">
- <iterate operator="or">
- <equals value="org.eclipse.wst.common.modulecore.ModuleCoreNature" />
-
- </iterate>
- </with>
- <with variable="element">
- <instanceof value="org.eclipse.core.resources.IProject" />
-
- </with>
- </enablement>
- </renameParticipant>
- </extension>
-
- <extension point="org.eclipse.ltk.core.refactoring.renameParticipants">
-
- <renameParticipant
- class="org.eclipse.jst.j2ee.internal.actions.J2EEComponentRenameParticipant"
- id="org.eclipse.jst.j2ee.internal.actions.J2EEComponentRenameParticipant"
- name="J2EE Rename Participant">
- <enablement>
- <with variable="affectedNatures">
- <iterate operator="or">
- <equals value="org.eclipse.wst.common.modulecore.ModuleCoreNature" />
- </iterate>
- </with>
- <with
- variable="element">
- <instanceof
- value="org.eclipse.wst.common.componentcore.resources.IVirtualComponent">
- </instanceof>
- </with>
- </enablement>
- </renameParticipant>
- </extension> -->
-
- <extension
- point="org.eclipse.ui.perspectives">
- <perspective
- name="%j2ee"
- icon="icons/full/cview16/j2ee_perspective.gif"
- class="org.eclipse.jst.j2ee.internal.perspective.J2EEPerspective"
- id="org.eclipse.jst.j2ee.J2EEPerspective">
- </perspective>
- </extension>
- <extension
- point="org.eclipse.ui.perspectiveExtensions">
- <perspectiveExtension targetID="org.eclipse.jst.j2ee.J2EEPerspective">
- <perspectiveShortcut id="org.eclipse.debug.ui.DebugPerspective"/>
- <perspectiveShortcut id="org.eclipse.jdt.ui.JavaPerspective"/>
- <perspectiveShortcut id="org.eclipse.ui.resourcePerspective"/>
- <perspectiveShortcut id="org.eclipse.wst.web.ui.webDevPerspective"/>
-
- <newWizardShortcut id="org.eclipse.jst.j2ee.ui.project.facet.EarProjectWizard"/>
- <newWizardShortcut id="org.eclipse.jst.servlet.ui.project.facet.WebProjectWizard"/>
- <newWizardShortcut id="org.eclipse.jst.ejb.ui.project.facet.EjbProjectWizard"/>
- <newWizardShortcut id="org.eclipse.jst.j2ee.jca.ui.internal.wizard.ConnectorProjectWizard"/>
- <newWizardShortcut id="org.eclipse.jst.j2ee.ui.project.facet.appclient.AppClientProjectWizard"/>
- <newWizardShortcut id="org.eclipse.wst.web.ui.internal.wizards.SimpleWebProjectWizard"/>
- <newWizardShortcut id="org.eclipse.jpt.ui.wizard.newJpaProject"/>
- <newWizardShortcut id="org.eclipse.jst.servlet.ui.internal.wizard.AddServletWizard"/>
- <newWizardShortcut id="org.eclipse.jst.ejb.ui.internal.wizard.AddSessionBeanWizard"/>
- <newWizardShortcut id="org.eclipse.jst.ejb.ui.internal.wizard.AddMessageDrivenBeanWizard"/>
- <newWizardShortcut id="org.eclipse.jpt.ui.wizard.newEntity"/>
- <newWizardShortcut id="org.eclipse.jst.ws.creation.ui.wizard.serverwizard"/>
- <newWizardShortcut id="org.eclipse.ui.wizards.new.folder"/>
- <newWizardShortcut id="org.eclipse.ui.wizards.new.file"/>
- <actionSet id="org.eclipse.wst.server.ui.internal.webbrowser.actionSet"/>
- <actionSet id="org.eclipse.debug.ui.breakpointActionSet"/>
- </perspectiveExtension>
- <perspectiveExtension targetID="org.eclipse.ui.resourcePerspective">
- <perspectiveShortcut id="org.eclipse.jst.j2ee.J2EEPerspective"/>
- </perspectiveExtension>
- <perspectiveExtension targetID="org.eclipse.wst.web.ui.webDevPerspective">
- <perspectiveShortcut id="org.eclipse.jst.j2ee.J2EEPerspective"/>
- </perspectiveExtension>
- </extension>
-
- <extension
- point="org.eclipse.wst.common.frameworks.DataModelProviderExtension">
- <DataModelProvider
- class="org.eclipse.jst.j2ee.internal.earcreation.EarComponentCreationDataModelProvider"
- id="org.eclipse.jst.j2ee.internal.earcreation.IEarComponentCreationDataModelProperties"/>
- </extension>
-
- <extension
- id="context.Sensitive.Class.workingCopyManager"
- name="Working Copy Manager - UI Context Class"
- point="org.eclipse.jem.util.uiContextSensitiveClass">
- <uiContextSensitiveClass
- context="UI"
- key="workingCopyManager"
- className="org.eclipse.jst.common.jdt.internal.integration.ui.WTPUIWorkingCopyManager">
- </uiContextSensitiveClass>
- </extension>
-
- <extension point="org.eclipse.core.runtime.adapters">
- <factory
- class="org.eclipse.jst.j2ee.internal.deployables.EnterpriseDeployableArtifactAdapterFactory"
- adaptableType="org.eclipse.core.resources.IProject">
- <adapter type= "org.eclipse.debug.ui.actions.ILaunchable"/>
- </factory>
- <factory
- class="org.eclipse.jst.j2ee.internal.deployables.EnterpriseDeployableArtifactAdapterFactory"
- adaptableType="org.eclipse.jst.j2ee.application.Application">
- <adapter type= "org.eclipse.debug.ui.actions.ILaunchable"/>
- </factory>
- <factory
- class="org.eclipse.jst.j2ee.internal.deployables.EnterpriseDeployableArtifactAdapterFactory"
- adaptableType="org.eclipse.core.resources.IFile">
- <adapter type= "org.eclipse.debug.ui.actions.ILaunchable"/>
- </factory>
- <factory
- adaptableType="org.eclipse.jst.j2ee.internal.ejb.provider.J2EEJavaClassProviderHelper"
- class="org.eclipse.jst.j2ee.internal.ClassHelperAdapterFactory">
- <adapter type="org.eclipse.core.resources.IFile"/>
- <adapter type="org.eclipse.core.resources.IResource"/>
- </factory>
-
- <!--
- <factory
- class="org.eclipse.jst.j2ee.internal.plugin.FacetedProjectAdapterFactory"
- adaptableType="org.eclipse.core.resources.IProject" >
- <adapter type="org.eclipse.ui.IActionFilter"/>
- </factory>
- -->
- </extension>
-
- <extension
- point="org.eclipse.wst.server.core.moduleArtifactAdapters">
- <moduleArtifactAdapter
- id="org.eclipse.jst.j2ee.server.ear1"
- class="org.eclipse.jst.j2ee.internal.deployables.EnterpriseDeployableArtifactAdapterFactory">
- <enablement>
- <with variable="selection">
- <adapt type="org.eclipse.jst.j2ee.application.Application"/>
- </with>
- </enablement>
- </moduleArtifactAdapter>
-
- <moduleArtifactAdapter
- id="org.eclipse.jst.j2ee.server.ear2"
- class="org.eclipse.jst.j2ee.internal.deployables.EnterpriseDeployableArtifactAdapterFactory">
- <enablement>
- <with variable="selection">
- <adapt type="org.eclipse.core.resources.IProject">
- <test forcePluginActivation="true"
- property="org.eclipse.wst.common.project.facet.core.projectFacet"
- value="jst.ear:1.4]" />
- </adapt>
-
- </with>
- </enablement>
- </moduleArtifactAdapter>
-
- <moduleArtifactAdapter
- id="org.eclipse.jst.j2ee.server.ear3"
- class="org.eclipse.jst.j2ee.internal.deployables.EnterpriseDeployableArtifactAdapterFactory">
- <enablement>
- <with variable="selection">
- <adapt type="org.eclipse.core.resources.IFile">
- <test forcePluginActivation="true"
- property="org.eclipse.wst.common.project.facet.core.projectFacet"
- value="jst.ear:1.4]" />
- </adapt>
- </with>
- </enablement>
- </moduleArtifactAdapter>
- </extension>
-
- <extension point="org.eclipse.wst.common.project.facet.ui.wizardPages">
- <wizard-pages action="jst.ear.install">
- <page class="org.eclipse.jst.j2ee.ui.project.facet.EarFacetInstallPage"/>
- </wizard-pages>
- <wizard-pages action="jst.appclient.install">
- <page class="org.eclipse.jst.j2ee.ui.project.facet.appclient.AppClientFacetInstallPage"/>
- </wizard-pages>
- </extension>
-
- <extension
- point="org.eclipse.ui.ide.markerResolution">
- <markerResolutionGenerator
- markerType="org.eclipse.jst.j2ee.differentRuntimesDetected"
- class="org.eclipse.jst.j2ee.ui.project.facet.RuntimeMismatchMarkerResolutions">
- </markerResolutionGenerator>
- </extension>
-
- <extension
- point="org.eclipse.jem.util.uiContextSensitiveClass">
- <uiContextSensitiveClass
- key="ValidateEditContext"
- className="org.eclipse.jst.j2ee.internal.listeners.ValidateEditListener"
- context="UI"/>
- </extension>
-
- <extension point="org.eclipse.jdt.ui.classpathAttributeConfiguration">
- <classpathAttributeConfiguration
- attributeName="org.eclipse.jst.component.dependency"
- class="org.eclipse.jst.j2ee.internal.classpathdep.ui.ClasspathDependencyAttributeConfiguration">
- </classpathAttributeConfiguration>
- </extension>
-
- <extension point="org.eclipse.jdt.ui.classpathAttributeConfiguration">
- <classpathAttributeConfiguration
- attributeName="org.eclipse.jst.component.nondependency"
- class="org.eclipse.jst.j2ee.internal.classpathdep.ui.ClasspathNonDependencyAttributeConfiguration">
- </classpathAttributeConfiguration>
- </extension>
-
- <extension
- point="org.eclipse.ui.ide.markerResolution">
- <markerResolutionGenerator
- markerType="org.eclipse.jst.j2ee.ClasspathDependencyValidatorMarker"
- class="org.eclipse.jst.j2ee.internal.classpathdep.ui.ClasspathDependencyValidatorMarkerResolutions">
- </markerResolutionGenerator>
- </extension>
-
- <extension
- point="org.eclipse.jdt.ui.classpathContainerPage">
- <classpathContainerPage
- name="%earLibrariesContainerName"
- class="org.eclipse.jst.j2ee.internal.wizard.EARLibrariesContainerPage"
- id="org.eclipse.jst.j2ee.internal.module.container">
- </classpathContainerPage>
- </extension>
-
- <extension
- point="org.eclipse.ui.preferencePages">
- <page
- class="org.eclipse.jst.j2ee.internal.ui.preferences.JavaEEPreferencePage"
- id="org.eclipse.jst.j2ee.ui.preferencePages.JavaEE"
- name="%j2ee">
- </page>
- </extension>
-
- <extension
- point="org.eclipse.wst.common.modulecore.ui.moduleDependencyPropertyPage">
- <dependencyPage
- class="org.eclipse.jst.j2ee.internal.ui.preferences.EarModuleDependencyPageProvider"
- id="org.eclipse.jst.j2ee.internal.ui.preferences.EarModuleDependencyPageProvider">
- </dependencyPage>
- </extension>
-
-
- <!--
- *****************************
- * WTP User Library Provider *
- *****************************
- -->
-
- <extension point="org.eclipse.jst.common.project.facet.ui.libraryProviderActionPanels">
- <panel
- provider="wtp-user-library-provider"
- class="org.eclipse.jst.j2ee.internal.ui.WtpUserLibraryProviderInstallPanel"/>
- </extension>
-
- <!--
- *************************************
- * WTP OSGi Bundles Library Provider *
- *************************************
- -->
-
- <extension point="org.eclipse.jst.common.project.facet.ui.libraryProviderActionPanels">
- <panel
- provider="wtp-osgi-bundles-library-provider"
- class="org.eclipse.jst.j2ee.internal.ui.WtpOsgiBundlesLibraryProviderInstallPanel"/>
- </extension>
-
-
- <extension
- point="org.eclipse.wst.common.modulecore.ui.moduleDependencyPropertyPage">
- <dependencyPage
- class="org.eclipse.jst.j2ee.internal.ui.J2EEDependencyPageProvider"
- id="org.eclipse.jst.j2ee.internal.ui.J2EEDependencyPageProvider">
- </dependencyPage>
- </extension>
- <extension
- point="org.eclipse.wst.common.modulecore.ui.virtualComponentLabelProvider">
- <provider
- class="org.eclipse.jst.j2ee.internal.ui.preferences.ClasspathDependencyComponentLabelProvider"
- weight="5">
- </provider>
- </extension>
-
- <extension
- point="org.eclipse.wst.common.modulecore.ui.referenceWizardFragment">
- <referenceFragment
- class="org.eclipse.jst.j2ee.internal.ui.preferences.CustomEARProjectReferenceWizardFragment"
- hidden="true"
- icon="icons/prj_obj.gif"
- id="org.eclipse.jst.j2ee.internal.ui.preferences.CustomEARProjectReferenceWizardFragment"
- name="%Project">
- </referenceFragment>
- </extension>
-
- <extension point="org.eclipse.wst.common.modulecore.ui.referenceWizardFragment">
- <referenceFragment
- class="org.eclipse.jst.j2ee.internal.ui.AddJavaBuildPathEntriesWizardFragment"
- icon="icons/util-wiz-icon.gif"
- id="org.eclipse.jst.j2ee.internal.ui.AddJavaBuildPathEntriesWizardFragment"
- name="%AddJavaBuildPathEntriesWizardFragment-Name">
- <enablement>
- <test property="org.eclipse.wst.common.project.facet.core.projectFacet" value="java" forcePluginActivation="true"/>
- </enablement>
- </referenceFragment>
- </extension>
-
-</plugin>
diff --git a/plugins/org.eclipse.jst.j2ee.ui/prepareforpii.xml b/plugins/org.eclipse.jst.j2ee.ui/prepareforpii.xml
deleted file mode 100644
index d3bfda0..0000000
--- a/plugins/org.eclipse.jst.j2ee.ui/prepareforpii.xml
+++ /dev/null
@@ -1,38 +0,0 @@
-<project name="PrepareForPII" default="main" basedir=".">
-
- <!-- Setup temp variables -->
- <target name="init">
- <property name="nlsDir" value="d:/NLS/Corona/0526"/>
- <property name="plugin" value="com.ibm.wtp.j2ee.ui"/>
- <property name="plugindir" value="d:/workspaceCorona/${plugin}"/>
- <property name="outputDir" value="${nlsDir}/${plugin}"/>
-
-
- </target>
-
- <!-- Create the destination dir -->
- <target name="nlsDir" depends="init">
- <mkdir dir="${nlsDir}"/>
- </target>
-
- <!-- Create the destination dir -->
- <target name="plugindir" depends="nlsDir">
- <delete dir="${outputDir}"/>
- <mkdir dir="${outputDir}"/>
- </target>
-
- <!-- Move the files to the correct locations in the workspace. -->
- <target name="main" depends="plugindir">
-
- <messageIdGen folderPath = "${plugindir}" componentId = "E" />
-
- <copy todir = "${outputDir}/property_files" >
- <fileset dir="${plugindir}/property_files">
- <include name="**/*.properties"/>
- </fileset>
- </copy>
-
- <copy file="${plugindir}/plugin.properties" todir="${outputDir}"/>
-
- </target>
-</project>
diff --git a/plugins/org.eclipse.jst.j2ee.ui/property_files/UtilityFacetInstallPage.properties b/plugins/org.eclipse.jst.j2ee.ui/property_files/UtilityFacetInstallPage.properties
deleted file mode 100644
index 0a6de07..0000000
--- a/plugins/org.eclipse.jst.j2ee.ui/property_files/UtilityFacetInstallPage.properties
+++ /dev/null
@@ -1,12 +0,0 @@
-###############################################################################
-# Copyright (c) 2005 IBM Corporation and others.
-# All rights reserved. This program and the accompanying materials
-# are made available under the terms of the Eclipse Public License v1.0
-# which accompanies this distribution, and is available at
-# http://www.eclipse.org/legal/epl-v10.html
-#
-# Contributors:
-# IBM Corporation - initial API and implementation
-###############################################################################
-pageTitle = Utility Module
-pageDescription = Configure utility module settings.
\ No newline at end of file
diff --git a/plugins/org.eclipse.jst.j2ee.ui/property_files/ejb_figures.properties b/plugins/org.eclipse.jst.j2ee.ui/property_files/ejb_figures.properties
deleted file mode 100644
index 0ada374..0000000
--- a/plugins/org.eclipse.jst.j2ee.ui/property_files/ejb_figures.properties
+++ /dev/null
@@ -1,18 +0,0 @@
-###############################################################################
-# Copyright (c) 2003, 2005 IBM Corporation and others.
-# All rights reserved. This program and the accompanying materials
-# are made available under the terms of the Eclipse Public License v1.0
-# which accompanies this distribution, and is available at
-# http://www.eclipse.org/legal/epl-v10.html
-#
-# Contributors:
-# IBM Corporation - initial API and implementation
-###############################################################################
-RelationshipPolyLine_UI_0=Navigation
-RelationshipPolyLine_UI_1=Navigation
-RelationshipPolyLine_UI_2=Cmr Field / Foreign Key
-RelationshipPolyLine_UI_3=Cmr Field / Foreign Key
-RelationshipPolyLine_UI_4=Edit left end
-RelationshipPolyLine_UI_5=Edit right
-RelationshipPolyLine_UI_6=Edit left end
-RelationshipPolyLine_UI_7=Edit right end
diff --git a/plugins/org.eclipse.jst.j2ee.ui/property_files/ejb_ui.properties b/plugins/org.eclipse.jst.j2ee.ui/property_files/ejb_ui.properties
deleted file mode 100644
index 7733593..0000000
--- a/plugins/org.eclipse.jst.j2ee.ui/property_files/ejb_ui.properties
+++ /dev/null
@@ -1,47 +0,0 @@
-###############################################################################
-# Copyright (c) 2003, 2006 IBM Corporation and others.
-# All rights reserved. This program and the accompanying materials
-# are made available under the terms of the Eclipse Public License v1.0
-# which accompanies this distribution, and is available at
-# http://www.eclipse.org/legal/epl-v10.html
-#
-# Contributors:
-# IBM Corporation - initial API and implementation
-###############################################################################
-KEY_0=Failed to find the image "{0}".
-KEY_1=New EJB Project
-KEY_2=EJB version:
-KEY_3=EJB Project
-KEY_4=Create an EJB project and add it to a new or existing Enterprise Application.
-KEY_5=Import an EJB jar from the file system
-KEY_6=EJB Jar Import
-KEY_7=EJB Jar file:
-KEY_8=EJB Project:
-KEY_9=EJB Jar Export
-KEY_10=Export EJB project to the local file system.
-KEY_11=EJB client JAR Creation
-KEY_12=Use this wizard to create an EJB client JAR from your existing EJB
-KEY_13=Client JAR URI:
-KEY_14=Project name:
-KEY_15=Project location:
-KEY_16=EJB Project:
-KEY_17=Delete Bean Only
-KEY_18=Delete Bean Classes
-KEY_19=Delete Access Bean
-KEY_20=Delete Deployed Code
-KEY_21=Select All
-KEY_22=Deselect All
-KEY_23=The selected enterprise bean cannot be deleted because it is involved in\nrelationships with other enterprise beans. You must first delete these\nrelationships before deleting the bean.
-KEY_24=Delete...
-KEY_25=Cannot delete Enterprise Bean
-KEY_26=Cannot delete the bean named "{0}" because it is in a binary project.
-KEY_27=Delete Enterprise Bean(s)
-KEY_28=What options would you like when deleting the selected\nEnterprise Bean(s)?
-GroupedEJBJarItemProvider_UI_0=Session
-GroupedEJBJarItemProvider_UI_1=Entity
-GroupedEJBJarItemProvider_UI_2=Message
-NewEJBProjectAction_UI_0=EJB Project
-NewEJBModuleAction_UI_0=EJB Project
-pageTitle=Ejb Module
-pageDescription=Configure ejb module settings.
-configFolderLabel=Config Folder:
diff --git a/plugins/org.eclipse.jst.j2ee.ui/property_files/j2ee_ejb_ui.properties b/plugins/org.eclipse.jst.j2ee.ui/property_files/j2ee_ejb_ui.properties
deleted file mode 100644
index fc3565e..0000000
--- a/plugins/org.eclipse.jst.j2ee.ui/property_files/j2ee_ejb_ui.properties
+++ /dev/null
@@ -1,15 +0,0 @@
-###############################################################################
-# Copyright (c) 2003, 2004 IBM Corporation and others.
-# All rights reserved. This program and the accompanying materials
-# are made available under the terms of the Eclipse Public License v1.0
-# which accompanies this distribution, and is available at
-# http://www.eclipse.org/legal/epl-v10.html
-#
-# Contributors:
-# IBM Corporation - initial API and implementation
-###############################################################################
-
-GroupedEJBJarItemProvider_UI_0=Session
-GroupedEJBJarItemProvider_UI_1=Entity
-GroupedEJBJarItemProvider_UI_2=Message
-
diff --git a/plugins/org.eclipse.jst.j2ee.ui/property_files/j2ee_ui.properties b/plugins/org.eclipse.jst.j2ee.ui/property_files/j2ee_ui.properties
deleted file mode 100644
index 7e16333..0000000
--- a/plugins/org.eclipse.jst.j2ee.ui/property_files/j2ee_ui.properties
+++ /dev/null
@@ -1,362 +0,0 @@
-###############################################################################
-# Copyright (c) 2003, 2006 IBM Corporation and others.
-# All rights reserved. This program and the accompanying materials
-# are made available under the terms of the Eclipse Public License v1.0
-# which accompanies this distribution, and is available at
-# http://www.eclipse.org/legal/epl-v10.html
-#
-# Contributors:
-# IBM Corporation - initial API and implementation
-###############################################################################
-1=Project location:
-2=&Target runtime:
-3=J2EE version:
-4=Failed to find the image "{0}".
-5=New Enterprise Application Project
-6=Enterprise Application Project
-7=Create an Enterprise Application project containing one or more module projects.
-8=EAR Module Projects
-9=Select the module projects to add to the new EAR project from the list. \nSelect New Module button to create a new module project.
-10=&Select All
-11=&Deselect All
-12=New &Module...
-13=EAR &project:
-14=N&ew...
-14a=Ne&w...
-15=Add module to an EAR application.
-16=New Module Project
-17=Create a new module project for the selected module type
-18=New Module Project
-19=Create default module projects.
-20=Application Client &project:
-21=EJB pro&ject:
-22=Web project:
-23=Connector &project:
-24=New Application Client Project
-25=Application Client module
-26=Create an Application Client project and add it to a new or existing Enterprise Application project
-27=Module Dependencies
-28=Select dependent JARs for the module within the Enterprise Application project.
-29=Available dependent JARs:
-30=Manifest Class-Path:
-31=JAR/Module
-32=&Project:
-33=New
-34=Import an Application Client project from the file System
-35=Application Client Import
-36=Application Client fi&le:
-37=Application Client pro&ject:
-38=Import
-39=Import an Enterprise Application project based on selected resources.
-40=Enterprise Application Import
-41=EAR fi&le:
-42=Overwrite existing resources without warning.
-43=Project import
-44=Optimized: make binary projects for EJB, client, and utility JARs
-45=Expanded: extract project contents for development
-46=Import for partial EAR development
-47=&Select All
-48=&Deselect All
-49=Utility JARs and web libraries
-50=Select the utility JARs from the list to be imported as utility projects. Unselected JARs will be imported as \nutility JARs in the EAR.
-51=Enter the new project name that will be created for the imported module file by selecting the second column of the table for edit. Unselected modules will be imported as JARs in the EAR.
-52=EAR Module and Utility JAR Projects
-53=Project locations
-54=This is the parent directory for all referenced projects. A subdirectory will be created for each project.
-55=&Module root location:
-
-57=Select the location directory
-58=Modules in EAR
-59=New Project Name
-60=filenames
-61=projectnames
-62=&Destination:
-63=Over&write existing file
-64=Export &source files
-65=Application Client Export
-66=Export Application Client project to the local file system.
-67=Export
-68=EAR Export
-69=Export Enterprise Application project to the local file system.
-70=Include project build paths and meta-data files
-71=If you select this option, the exported EAR maintains project names and external classpath dependencies, which are useful for later importing the EAR into binary projects. If you select this option and later import the EAR, only binary projects are created.
-72=Include
-74=Allow nested projects overwrites (module and utility projects)
-75=Delete project on overwrite
-76=EAR pro&ject:
-
-#migration strings
-77=Error
-78=An internal error occurred performing the selected action.
-79=Binary Project
-80=The action cannot be performed on the selection, which is part of a binary project.
-81=Information
-82=The chosen operation is not currently available.
-
-90=&Create an EJB Client JAR module to hold the client interfaces and classes
-91=Generate an annotated bean class
-92=Add support for annotated Java classes
-93=Br&owse...
-94=Na&me:
-95=&Create a default Main class
-96=Create a default stateless session bean
-98=&Generate a XDoclet annotated class
-
-97=Select the utility JARs from the &list to be imported as utility projects or jars:
-99=Project Name:
-100=Module Version:
-101=Configure Application Client module settings.
-102=Content Folder:
-103=&Target runtime
-Entity_UI_=Entity Beans (1.x-2.x)
-Message_Driven_Beans_UI_=Message-Driven Beans
-Session_Beans_UI_=Session Beans
-EJB_Class_UI_=EJB Class: {0}
-Home_Interface_UI_=Home Interface: {0}
-Service_Endpoint_Interface_UI_=Service Endpoint Interface: {0}
-Primary_Key_Class_UI_=Primary Key Class: {0}
-RefactoringNoInit=Refactoring not initialized properly
-Remote_Interface_UI_=Remote Interface: {0}
-Local_Interface_UI_=Local Interface: {0}
-Local_Home_Interface_UI_=Local Home Interface: {0}
-Delete_UI_=Delete...
-Project_should_not_be_null_1_EXC_=IWAE0021E Project should not be null
-Non-project_in_selection_2_EXC_=IWAE0022E Non-project in selection
-Problems_Opening_Editor_ERROR_=IWAE0052E Problems Opening Editor.
-Utility_JARs_UI_=Utility JARs
-Delete_1=Delete...
-Delete_selected_project(s)_2=Delete selected project(s)
-Remove_module(s)_from_all_Enterprise_Applications_3=Remove module(s) from all Enterprise Applications
-Remove_module(s)_from_all_other_Enterprise_Applications_4=Remove module(s) from all other Enterprise Applications
-Remove_module_dependencies_referencing_selected_project(s)_5=Remove module dependencies referencing selected project(s)
-Delete_Module_Options_6=Delete Module Options
-Delete_Enterprise_Application_Options_7=Delete Enterprise Application Options
-Delete_could_not_be_completed_8=Delete could not be completed
-Delete_error_9=Delete error
-What_would_you_like_to_delete__10=What would you like to delete?
-Delete_selected_Enterprise_Application_project(s)_only_11=Delete selected Enterprise Application project(s) only
-Also_delete_module_and_utility_Java_projects_12=Also delete module and utility Java projects
-Delete_selected_project(s)_only_13=Delete selected project(s) only
-Also_delete_references_to_selected_project(s)_14=Also delete references to selected project(s)
-CUSTOM_DELETE_MIX_MATCH_UI_=The custom Java EE delete options are not available for the selected Java EE projects. The standard delete options will be used.
-DEPLOY_DIALOG_TITLE=J2EE Deployment
-DEPLOY_ERROR_TEXT=IWAE0001E Error:
-DEPLOY_WARNING_TEXT=Warning:
-DEPLOY_INFO_TEXT=IWAE0002I Info:
-DEPLOY_OK_TEXT=Ok:
-DEPLOYMENT_IN_PROGRESS=Deployment operation in progress...
-DEPLOY_SUCCESS_REPORT=Deployment finished successfully.
-DEPLOY_WARNINGS_REPORT=Deployment finished with warnings; see log files for details.
-DEPLOY_ERRORS_REPORT=Deployment finished with errors; see log files for details.
-DEPLOY_PROJECT_NOT_FOUND=Cannot get handle to the project.
-DEPLOY_RUNTIME_NOT_FOUND=Target runtime not configured for project {0}.
-DEPLOY_RUNTIME_CONFIGURED=Target runtime configured successfully for project {0}.
-DEPLOY_PROJECT_NOT_SUPPORTED=Project {0} cannot be deployed with configured runtime or installed facets.
-
-NewModuleSelectionPage.appClient=&Application Client
-NewModuleSelectionPage.ejb=&Enterprise Java Bean
-NewModuleSelectionPage.web=&Web
-NewModuleSelectionPage.jca=&Connector
-
-NewApplClientModuleAction_UI_0=Application Client Module
-NewContextRoot=New context root:
-NewEARModuleAction_UI_0=EAR Module
-J2EEProjectCreationPage_UI_0=Hide &Advanced <<
-J2EEProjectCreationPage_UI_1=Show &Advanced >>
-J2EEUtilityJarImportPage_UI_0=Utility Jar Import
-J2EEUtilityJarImportPage_UI_1=Import dependent Utility Jars for Java EE Enterprise Applications
-J2EEUtilityJarImportPage_UI_2=Available utility JARs directory
-J2EEUtilityJarImportPage_UI_3=&External JAR directory:
-J2EEUtilityJarImportPage_UI_4=Linked path variable
-J2EEUtilityJarImportPage_UI_5=Make these imported files team-shareable by creating or re-using a linked path variable (LPV). Select an existing LPV or type a new name to create one to the directory above. Other teammates should define this value through Window > Preferences | Workbench > Linked Resources. This option is only available for linked imports.
-J2EEUtilityJarImportPage_UI_6=Over&write existing resources (projects and archives)
-J2EEUtilityJarImportPage_UI_7=Select Utility Jar:
-J2EEUtilityJarImportPage.0=Use Existing Linked Path Variable
-J2EEUtilityJarImportPage.1=Linked Path Variable:
-EARImportProjectsPage_UI_0=include
-EARImportProjectsPage_UI_1=file
-EARImportProjectsPage_UI_2=project
-EARImportProjectsPage_UI_3=Select New
-
-J2EEUtilityJarImportTypePage_UI_0=Utility Jar Import
-J2EEUtilityJarImportTypePage_UI_1=Import dependent Utility Jars for Java EE Enterprise Applications
-J2EEUtilityJarImportTypePage_UI_2=Select import type
-J2EEUtilityJarImportTypePage_UI_3=Create &Java projects from utility JARs
-J2EEUtilityJarImportTypePage_UI_4=Create &linked Java projects from utility JARs
-J2EEUtilityJarImportTypePage_UI_5=Cop&y utility JARs into an existing EAR from an external location
-J2EEUtilityJarImportTypePage_UI_6=&Create linked utility JARs in an existing EAR from an external location
-J2EEUtilityJarImportTypePage_UI_7=Project import options
-J2EEUtilityJarImportTypePage_UI_8=Select EAR project
-J2EEUtilityJarImportTypePage_UI_9=EAR &project:
-J2EEUtilityJarImportTypePage_UI_10=Create Binary Projects
-J2EEUtilityJarImportTypePage_UI_11=Override project &root (specify location below)
-
-Deployment_Descriptor_UI_=Deployment Descriptor
-
-Rename_1=Rename
-RenameDotDotDot=Rename...
-Rename_selected_project_2=Rename selected project
-Rename_module_in_all_Enterprise_Applications_3=Rename module in all Enterprise Applications
-Rename_module_in_all_other_Enterprise_Applications_4=Rename module in all other Enterprise Applications
-Rename_module_dependencies_referencing_selected_project_5=Rename module dependencies referencing selected project
-Rename_Module_Options_6=Rename Module Options
-Rename_Enterprise_Application_Options_7=Rename Enterprise Application Options
-Rename_could_not_be_completed_8=Rename could not be completed
-Rename_error_9=Rename error
-What_would_you_like_to_rename_this_to__10=What would you like to rename this to?
-Context_Root__11=Context root:
-Rename_selected_Enterprise_Application_project_only_12=Rename selected Enterprise Application project only
-RenameContextRoot=Rename Context Root
-RenameContextRootFromXtoY=Rename context root from "{0}" to "{1}"
-Also_rename_module_and_utility_Java_projects_13=Also rename module and utility Java projects
-Project_already_exists.=Project {0} already exists.
-Non-project_in_selection_2_ERROR_=IWAE0024E Non-project in selection
-
-
-ERROR_OCCURRED_TITLE=Error
-ERROR_OCCURRED_MESSAGE=An internal error occurred performing the selected action.
-
-Import_Class_Files_UI=Import
-FileImport.selectSource=Select a directory to import from.
-Import_Classes=Import Class Files...
-ClassesImport.fromDir=Import from Directory
-ClassesImport.fromZip=Import from Zip or Jar
-DataTransfer.browse=Browse...
-DataTransfer.directory=Source:
-DataTransfer.fileSystemTitle=Import Class Files
-FileImport.importFileSystem=Import class files from the local file system.
-FileImport.sourceEmpty=Source must not be empty.
-FileImport.overwriteExisting=Overwrite existing resources without warning
-DataTransfer.selectAll=Select All
-DataTransfer.deselectAll=Deselect All
-Inconsistent_Files_3=Inconsistent Files
-The_following_workspace_files_are_inconsistent_with_the_editor_4=The following workspace files are inconsistent with the editor: \n
-Update_the_editor_with_the_workspace_contents__5=Update the editor with the workspace contents?
-Error_checking_out_files_10=Error checking out files
-Inconsistent_files_detected_11=Inconsistent files detected
-Modules_UI_=Modules
-Utility_Java_Projects_UI_=Project Utility JARs
-The_following_files_are_inconsistent_with_the_file_system._Do_you_want_to_save_and_overwrite_these_files_on_the_file_system__12_WARN_=IWAE0020W The following files are inconsistent with the file system.\nDo you want to save and overwrite these files on the file system?
-J2EE_Level=J2EE Level:
-J2EE_12=1.2
-J2EE_13=1.3
-J2EE_14=1.4
-J2EE_12_DESCRIPTION=J2EE 1.2 includes Servlet Specification level 2.2, JSP Specification level 1.1, and EJB Specification level 1.1.
-J2EE_13_DESCRIPTION=J2EE 1.3 includes Connector Architecture Specification level 1.0, Servlet Specification level 2.3, JSP Specification level 1.2, and EJB Specification level 2.0.
-J2EE_14_DESCRIPTION=J2EE 1.4 includes Connector Architecture Specification level 1.5, Servlet Specification level 2.4, JSP Specification level 1.3, and EJB Specification level 2.1.
-EJB_LEVEL=EJB Level:
-EJB_11=1.1
-EJB_20=2.0
-EJB_21=2.1
-EJB_11_DESCRIPTION=EJB 1.1 includes Session Beans, BMP Beans and CMP 1.1 Beans. EJB 1.1 modules may be included in either Java EE 1.2 or Java EE 1.3 Enterprise Applications.
-EJB_20_DESCRIPTION=EJB 2.0 includes Message-Driven Beans, BMP Beans, and CMP 1.1 and CMP 2.0 Beans. EJB 2.0 modules may only be included in Java EE 1.3 Enterprise Applications.
-EJB_21_DESCRIPTION=EJB 2.1 includes Message-Driven Beans, BMP Beans, and CMP 1.1 and CMP 2.0 Beans. EJB 2.1 modules may only be included in Java EE 1.4 Enterprise Applications.
-WEB_LEVEL=Web Level:
-WEB_22=2.2
-WEB_23=2.3
-WEB_24=2.4
-WEB_22_DESCRIPTION=Web 2.2 includes Servlet specification 2.2 and JSP specification 1.1.
-WEB_23_DESCRIPTION=Web 2.3 includes Servlet specification 2.3 and JSP specification 1.2.
-WEB_24_DESCRIPTION=Web 2.4 includes Servlet specification 2.4 and JSP specification 2.0.
-APP_CLIENT_LEVEL=Application Client Level:
-APP_CLIENT_12_DESCRIPTION=Application 1.2 includes the Applciation client specification level 1.2.
-APP_CLIENT_13_DESCRIPTION=Application 1.3 includes the Applciation client specification level 1.3.
-APP_CLIENT_14_DESCRIPTION=Application 1.4 includes the Applciation client specification level 1.4.
-CONNECTOR_LEVEL=Connector Architecture Level:
-CONNECTOR_10=1.0
-CONNECTOR_15=1.5
-CONNECTOR_10_DESCRIPTION=Connector Architecture 1.0 modules may only be included in Java EE 1.3 Enterprise Applications.
-CONNECTOR_15_DESCRIPTION=Connector Architecture 1.5 modules may only be included in Java EE 1.4 Enterprise Applications.
-DESCRIPTION=Description:
-WEB_CONTEXT_ROOT=Context root:
-WEB_CONTENT_FOLDER_NAME=Web content folder name:
-FileImport.invalidSource = Source directory is not valid or has not been specified.
-FileImport.importProblems = Import Problems
-DataTransfer.information = Information
-FileImport.noneSelected = There are no resources currently selected for import.
-File_Selection_UI_=File Selection
-Select_a_file__UI_=Select a file:
-Flexible_Structure=Use flexible project structure
-FlexibleProjectCreationWizard.mainPage.title=J2EE Project
-FlexibleProjectCreationWizard.mainPage.desc=Create a Java EE project.
-FlexibleProjectCreationWizard.title=J2EE Project
-EARComponentCreationWizard.title=New EAR Application Project
-EARComponentCreationWizard.mainPage.title=EAR Application Project
-EARComponentCreationWizard.mainPage.desc=Create a EAR application.
-EARComponentCreationWizard.secondPage.title=Enterprise Application
-EARComponentCreationWizard.secondPage.desc=Configure enterprise application settings.
-J2EEModuleDependencies.label=&Java EE module dependencies:
-J2EEModuleDependencies.label_accessibility=Java EE module dependencies
-AppClientComponentCreationWizard.title=New Application Client Project
-AppClientComponentCreationWizard.mainPage.title=Application Client Project
-AppClientComponentCreationWizard.mainPage.desc=Create a Application Client.
-DefaultJ2EEComponentCreationWizard.title=Create default Java EE modules.
-DefaultJ2EEComponentCreationWizard.page.title=New Java EE Module
-DefaultJ2EEComponentCreationWizard.page.desc=Create a new Java EE module for the selected module type
-DefaultJ2EEComponentCreationWizard.page.label.ejb=&EJB module
-DefaultJ2EEComponentCreationWizard.page.label.web=&Web module
-DefaultJ2EEComponentCreationWizard.page.label.jca=&Connector module
-DefaultJ2EEComponentCreationWizard.page.label.appclient=&Application client module
-DefaultJ2EEComponentCreationWizard.page.button.select=Create &default modules
-
-FOLDER_LABEL=Source fol&der:
-BROWSE_BUTTON_LABEL=Browse...
-BROWSE_BUTTON_LABEL_O=Br&owse...
-BROWSE_BUTTON_LABEL_W=Bro&wse...
-BROWSE_BUTTON_LABEL_E=Brows&e...
-JAVA_PACKAGE_LABEL=Java pac&kage:
-CLASS_NAME_LABEL=Class na&me:
-SUPERCLASS_LABEL=&Superclass:
-CONTAINER_SELECTION_DIALOG_TITLE=Container Selection
-CONTAINER_SELECTION_DIALOG_DESC=Choose a Container:
-CONTAINER_SELECTION_DIALOG_VALIDATOR_MESG=Choose a valid java source folder for the selected module.
-PACKAGE_SELECTION_DIALOG_TITLE=Package Selection
-PACKAGE_SELECTION_DIALOG_DESC=Choose a package:
-PACKAGE_SELECTION_DIALOG_MSG_NONE=No packages to choose from
-SUPERCLASS_SELECTION_DIALOG_TITLE=Superclass Selection
-SUPERCLASS_SELECTION_DIALOG_DESC=Choose a superclass:
-JAVA_CLASS_MODIFIERS_LABEL=Modifiers:
-JAVA_CLASS_PUBLIC_CHECKBOX_LABEL=&public
-JAVA_CLASS_ABSTRACT_CHECKBOX_LABEL=abs&tract
-JAVA_CLASS_FINAL_CHECKBOX_LABEL=fina&l
-JAVA_CLASS_INTERFACES_LABEL=&Interfaces:
-JAVA_CLASS_METHOD_STUBS_LABEL=Which method stubs would you like to create?
-JAVA_CLASS_MAIN_CHECKBOX_LABEL=public static void &main(String[] args)
-JAVA_CLASS_CONSTRUCTOR_CHECKBOX_LABEL=&Constructors from superclass
-JAVA_CLASS_INHERIT_CHECKBOX_LABEL=In&herited abstract methods
-ADD_BUTTON_LABEL=&Add...
-REMOVE_BUTTON=&Remove
-YES_BUTTON=Yes
-NO_BUTTON=No
-OK_BUTTON=OK
-OpenJ2EEResourceAction.0=Open
-CANCEL_BUTTON=Cancel
-BINARY=Binary
-INTERFACE_SELECTION_DIALOG_TITLE=Interface Selection
-JAVAUTILITY_MAIN_PG_TITLE=Java Component
-JAVAUTILITY_MAIN_PG_DESC=Create a Java Component
-JAVAUTIL_COMPONENT_WIZ_TITLE=New Java Utility Module
-JAVA_EE_PREFERENCE_PAGE_NAME=General settings for Java EE development:
-JAVA_EE_PREFERENCE_PAGE_JET_TEMPLATE=JET templates
-JAVA_EE_PREFERENCE_PAGE_DYN_TRANSLATION_BTN_NAME=Use dynamic translation of JET templates
-AVAILABLE_J2EE_COMPONENTS= Available Java EE modules
-EXTERNAL_JAR=Add External JARs...
-PROJECT_JAR=Add JARs...
-ADDVARIABLE=Add Variable...
-CHANGE_LIB_DIR=Change &Library Directory...
-NO_DD_MSG_TITLE=No Deployment Descriptor
-GEN_DD_QUESTION=Changing the library directory must be reflected in the deployment descriptor. This EAR has no deployment descriptor yet and one will be generated now. Do you want to proceed?
-CHANGE_LIB_DIR_HEAD=Change Library Directory
-NEW_LIB_DIR_PROPMPT=New library directory location:
-BLANK_LIB_DIR=Blank Library Directory
-BLANK_LIB_DIR_CONFIRM=You've entered a blank library directory. In result, all the libraries will be packed in the root directory. In order to be able to pack any libraries in the library directory you must enter a non-blank library directory. Do you really want the library directory to be blank?
-BLANK_LIB_DIR_WARN_QUESTION=The specified library directory is blank. In result, all the libraries will be packed in the root directory. Are you sure you want this? (If you want to leave the bundled libraries directory blank, click 'Yes'. If you want to change it, click 'No')
-INVALID_PATH=Invalid Path
-INVALID_PATH_MSG=The entered path is invalid for a library directory. Please enter a valid path, different from root!
-DEPENDENCY_CONFLICT_TITLE=Dependencies Conflict
-DEPENDENCY_CONFLICT_MSG_1=This JAR is a bundled library of an EAR project and is supposed to be packed in the EAR's library directory. It conflicts with the manifest class path dependency you are trying to create. If you create this dependency, the JAR will be packed in the root (not library) directory of the EAR. Are you sure you want to proceed?
-DEPENDENCY_CONFLICT_MSG_2=This JAR is also a manifest class path dependency of a module in this EAR. It conflicts with packing the JAR in the library directory. If you want this JAR packed in the library directory, then it will be removed as a manifest class path dependency from all modules in this EAR. Are you sure you want to proceed?
-DO_NOT_SHOW_WARNING_AGAIN=Do not show this warning again
-SUPPORTMULTIPLEMODULES=Support Multiple Modules per project
-SOURCEFOLDER=Source Folder:
-HOVER_HELP_FOR_DISABLED_LIBS=This library has been added to the project by using the project tree or\nthe file system. If you want to move/remove it, use the same approach.
diff --git a/plugins/org.eclipse.jst.j2ee.ui/property_files/jca_ui.properties b/plugins/org.eclipse.jst.j2ee.ui/property_files/jca_ui.properties
deleted file mode 100644
index f8ff5fa..0000000
--- a/plugins/org.eclipse.jst.j2ee.ui/property_files/jca_ui.properties
+++ /dev/null
@@ -1,23 +0,0 @@
-###############################################################################
-# Copyright (c) 2003, 2005 IBM Corporation and others.
-# All rights reserved. This program and the accompanying materials
-# are made available under the terms of the Eclipse Public License v1.0
-# which accompanies this distribution, and is available at
-# http://www.eclipse.org/legal/epl-v10.html
-#
-# Contributors:
-# IBM Corporation - initial API and implementation
-###############################################################################
-_0=Failed to find the image "{0}".
-_1=New Connector Project
-_2=J2C version:
-_3=Connector Project
-_4=Create a standalone Connector module or add it to a new or existing Enterprise Application project.
-_5=Import a Connector module from the file system
-_6=Connector Import
-_7=Connector file:
-_8=Connector module:
-_9=Connector Export
-_10=Export Connector module to the local file system.
-_11=Configure Connector module settings.
-connector_export_action_label_ui_=Export RAR File...
diff --git a/plugins/org.eclipse.jst.j2ee.ui/property_files/manifest_ui.properties b/plugins/org.eclipse.jst.j2ee.ui/property_files/manifest_ui.properties
deleted file mode 100644
index 806d5f8..0000000
--- a/plugins/org.eclipse.jst.j2ee.ui/property_files/manifest_ui.properties
+++ /dev/null
@@ -1,47 +0,0 @@
-###############################################################################
-# Copyright (c) 2005, 2007 IBM Corporation and others.
-# All rights reserved. This program and the accompanying materials
-# are made available under the terms of the Eclipse Public License v1.0
-# which accompanies this distribution, and is available at
-# http://www.eclipse.org/legal/epl-v10.html
-#
-# Contributors:
-# IBM Corporation - initial API and implementation
-###############################################################################
-Up_1=&Up
-Down_2=&Down
-Select_All_3=Select &All
-Deselect_All_4=D&eselect All
-ERROR_READING_MANIFEST_DIALOG_TITLE=Error Reading Manifest
-SAVE_MANIFEST_WITH_ERROR=The manifest file contains errors and can not be parsed. The file will be saved but the Java build path will not be updated. Following are common limitations which can cause problems:
-ERROR_READING_MANIFEST_DIALOG_MESSAGE_EDITOR=The manifest file contains errors and can not be parsed. Other pages cannot be used until these errors are corrected. Following are common limitations which can cause problems:
-ERROR_READING_MANIFEST_DIALOG_MESSAGE_PROP_PAGE=The manifest file contains errors and can not be parsed. Following are common limitations which can cause problems:
-MANIFEST_PROBLEM_1=* Lines in the file must be no greater than 72 bytes. Continuation of long lines is indicated by a new line and a space.
-MANIFEST_PROBLEM_2=* The last line in the file must end with a new line or it will not be parsed.
-MANIFEST_PROBLEM_3=* Blank lines with extra white space may cause parse to fail.
-MANIFEST_PROBLEM_4=* The attributes must be formatted correctly. Refer to the manifest and JAR file specification for more information.
-An_internal_error_occurred_ERROR_=IWAE0010E An internal error occurred:
-Project_name__UI_=Project name:
-EAR_Project_Name__UI__UI_=Enterprise application project name:
-Available_dependent_JARs__UI_=Available dependent JARs:
-Manifest_Class_Path__UI_=Manifest Class-Path (does not include contributions from classpath entries):
-JAR_Module_UI_=JAR/Module
-Packed_In_Lib_UI_=In Lib Dir
-Project_UI_=Project
-EAR_Modules=EAR Modules:
-EAR_Modules_Desc=This property page lets you setup the module dependencies in an Enterprise Application.
-J2EE_Modules=J2EE Modules
-J2EE_Modules_Desc=This property page lets you add Manifest classpath dependencies to other Java EE modules or JARs contained within the same Enterprise Application. It also supports the selection of class folders whose contents will be added to the root of this module.
-Web_Libraries=Web Libraries
-Web_Libraries_Desc=This property page lets you add a Web Library dependency to utility projects, JAR files or classpath entries. Archive dependencies will be resolved into the WEB-INF/lib folder of the web module at deployment time. Class folder dependencies will be resolved into the WEB-INF/classes folder.
-Web_Ref_Desc=This property page lets you specify module dependencies on classpath entries. Entries that reference archives will be bundled, along with the project, into the WEB-INF/lib folder of referencing web modules. The contents of class folder entries will be added to the root of this module.
-EAR_Module_Dep_Error=J2EE Modules is not valid for EAR modules.
-Unreferenced_Module_Error=Selected module is not referenced by any EAR or Dynamic Web modules.
-Jar_Dep_One_Module_Error=Java Jar Dependencies is valid only for one module per flexible project.
-Web_Lib_Error=Web library settings are only valid for Web modules.
-REDIRECT_TEXT_EDITOR_UI_=REDIRECT_TEXT_EDITOR_UI_
-Error_Checking_Project_Facets=Error checking project facets.
-WEB_LIB_LIST_DESCRIPTION=Select the utility project, JAR or classpath entry to add as a Web Library dependency
-Dynamic_Web_Error=This property page is not valid for dynamic web projects.
-No_Web_Reference_Error=Selected project must be referenced by at least one dynamic web project.
-
diff --git a/plugins/org.eclipse.jst.j2ee.ui/schema/JavaEEPreferencePageExtender.exsd b/plugins/org.eclipse.jst.j2ee.ui/schema/JavaEEPreferencePageExtender.exsd
deleted file mode 100644
index deb3487..0000000
--- a/plugins/org.eclipse.jst.j2ee.ui/schema/JavaEEPreferencePageExtender.exsd
+++ /dev/null
@@ -1,83 +0,0 @@
-<?xml version='1.0' encoding='UTF-8'?>
-<!-- Schema file written by PDE -->
-<schema targetNamespace="org.eclipse.jst.j2ee.ui" xmlns="http://www.w3.org/2001/XMLSchema">
-<annotation>
- <appInfo>
- <meta.schema plugin="org.eclipse.jst.j2ee.ui" id="JavaEEPreferencePageExtender" name="JavaEEPreferencePageExtender"/>
- </appInfo>
- <documentation>
- Defines extension point for extending Java EE preference page.
- </documentation>
- </annotation>
-
- <element name="extension">
- <annotation>
- <appInfo>
- <meta.element />
- </appInfo>
- </annotation>
- <complexType>
- <sequence>
- <element ref="javaeepageextender"/>
- </sequence>
- <attribute name="point" type="string" use="required">
- <annotation>
- <documentation>
-
- </documentation>
- </annotation>
- </attribute>
- <attribute name="id" type="string">
- <annotation>
- <documentation>
-
- </documentation>
- </annotation>
- </attribute>
- <attribute name="name" type="string">
- <annotation>
- <documentation>
- Optional name for the extension point
- </documentation>
- <appInfo>
- <meta.attribute translatable="true"/>
- </appInfo>
- </annotation>
- </attribute>
- </complexType>
- </element>
-
- <element name="javaeepageextender">
- <complexType>
- <attribute name="className" type="string" use="required">
- <annotation>
- <documentation>
- The className is an implementation of interface IJavaEEPreferencePageExtender
- </documentation>
- </annotation>
- </attribute>
- </complexType>
- </element>
-
-
-
-
-
- <annotation>
- <appInfo>
- <meta.section type="copyright"/>
- </appInfo>
- <documentation>
- Copyright (c) 2009 IBM Corporation and others.
- All rights reserved. This program and the accompanying materials
- are made available under the terms of the Eclipse Public License v1.0
- which accompanies this distribution, and is available at
- http://www.eclipse.org/legal/epl-v10.html
-
- Contributors:
- IBM Corporation - initial API and implementation
-
- </documentation>
- </annotation>
-
-</schema>
diff --git a/plugins/org.eclipse.jst.j2ee.ui/schema/archiveExportParticipantPanels.exsd b/plugins/org.eclipse.jst.j2ee.ui/schema/archiveExportParticipantPanels.exsd
deleted file mode 100644
index 3ab16a1..0000000
--- a/plugins/org.eclipse.jst.j2ee.ui/schema/archiveExportParticipantPanels.exsd
+++ /dev/null
@@ -1,127 +0,0 @@
-<?xml version='1.0' encoding='UTF-8'?>
-<!-- Schema file written by PDE -->
-<schema targetNamespace="org.eclipse.jst.j2ee.ui">
-<annotation>
- <appInfo>
- <meta.schema plugin="org.eclipse.jst.j2ee.ui" id="archiveExportParticipantPanels" name="Archive Export Participant Panels Extension Point"/>
- </appInfo>
- <documentation>
- Used for supplying UI for the archive export participants registered via the <code>org.eclipse.jst.j2ee.archiveExportParticipants</code> extension point.
- </documentation>
- </annotation>
-
- <element name="extension">
- <complexType>
- <sequence>
- <element ref="panel-factory" minOccurs="1" maxOccurs="unbounded"/>
- </sequence>
- <attribute name="point" type="string" use="required">
- <annotation>
- <documentation>
-
- </documentation>
- </annotation>
- </attribute>
- <attribute name="id" type="string">
- <annotation>
- <documentation>
-
- </documentation>
- </annotation>
- </attribute>
- <attribute name="name" type="string">
- <annotation>
- <documentation>
-
- </documentation>
- <appInfo>
- <meta.attribute translatable="true"/>
- </appInfo>
- </annotation>
- </attribute>
- </complexType>
- </element>
-
- <element name="panel-factory">
- <annotation>
- <documentation>
- Registers a single archive export participant.
- </documentation>
- </annotation>
- <complexType>
- <attribute name="archiveExportParticipantId" type="string" use="required">
- <annotation>
- <documentation>
- The id of the archive export participant that this panel factory should be registered with. Has to include plugin id.
- </documentation>
- </annotation>
- </attribute>
- <attribute name="class" type="string" use="required">
- <annotation>
- <documentation>
- The factory implementation class.
- </documentation>
- <appInfo>
- <meta.attribute kind="java" basedOn=":org.eclipse.jst.j2ee.ui.archive.IArchiveExportParticipantPanelFactory"/>
- </appInfo>
- </annotation>
- </attribute>
- </complexType>
- </element>
-
- <annotation>
- <appInfo>
- <meta.section type="since"/>
- </appInfo>
- <documentation>
- 3.0
- </documentation>
- </annotation>
-
- <annotation>
- <appInfo>
- <meta.section type="examples"/>
- </appInfo>
- <documentation>
- <pre>
-<extension point="org.eclipse.jst.j2ee.ui.archiveExportParticipantPanels">
- <panel-factory
- archiveExportParticipantId="com.somecorp.MyExportParticipant"
- class="com.somecorp.MyPanelFactory"/>
-</extension>
-</pre>
- </documentation>
- </annotation>
-
- <annotation>
- <appInfo>
- <meta.section type="apiInfo"/>
- </appInfo>
- <documentation>
-
- </documentation>
- </annotation>
-
- <annotation>
- <appInfo>
- <meta.section type="implementation"/>
- </appInfo>
- <documentation>
-
- </documentation>
- </annotation>
-
- <annotation>
- <appInfo>
- <meta.section type="copyright"/>
- </appInfo>
- <documentation>
- Copyright (c) 2005, 2007 BEA Systems, Inc. and others.<br>
-All rights reserved. This program and the accompanying materials are made
-available under the terms of the Eclipse Public License v1.0 which accompanies
-this distribution, and is available at <a
-href="http://www.eclipse.org/legal/epl-v10.html">http://www.eclipse.org/legal/epl-v10.html</a>
- </documentation>
- </annotation>
-
-</schema>
diff --git a/plugins/org.eclipse.jst.j2ee.web/.classpath b/plugins/org.eclipse.jst.j2ee.web/.classpath
deleted file mode 100644
index ee4f412..0000000
--- a/plugins/org.eclipse.jst.j2ee.web/.classpath
+++ /dev/null
@@ -1,11 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<classpath>
- <classpathentry kind="src" path="web/"/>
- <classpathentry kind="src" path="war-validation/"/>
- <classpathentry kind="src" path="webedit/"/>
- <classpathentry kind="src" path="webproject/"/>
- <classpathentry kind="src" path="property_files/"/>
- <classpathentry kind="con" path="org.eclipse.jdt.launching.JRE_CONTAINER/org.eclipse.jdt.internal.debug.ui.launcher.StandardVMType/J2SE-1.5"/>
- <classpathentry kind="con" path="org.eclipse.pde.core.requiredPlugins"/>
- <classpathentry kind="output" path="bin"/>
-</classpath>
diff --git a/plugins/org.eclipse.jst.j2ee.web/.cvsignore b/plugins/org.eclipse.jst.j2ee.web/.cvsignore
deleted file mode 100644
index 9b9b366..0000000
--- a/plugins/org.eclipse.jst.j2ee.web/.cvsignore
+++ /dev/null
@@ -1,7 +0,0 @@
-bin
-build.xml
-runtime
-temp.folder
-@dot
-src.zip
-javaCompiler...args
diff --git a/plugins/org.eclipse.jst.j2ee.web/.externalToolBuilders/org.eclipse.emf.codegen.JETBuilder.launch b/plugins/org.eclipse.jst.j2ee.web/.externalToolBuilders/org.eclipse.emf.codegen.JETBuilder.launch
deleted file mode 100644
index 7111afb..0000000
--- a/plugins/org.eclipse.jst.j2ee.web/.externalToolBuilders/org.eclipse.emf.codegen.JETBuilder.launch
+++ /dev/null
@@ -1,7 +0,0 @@
-<?xml version="1.0" encoding="UTF-8" standalone="no"?>
-<launchConfiguration type="org.eclipse.ant.AntBuilderLaunchConfigurationType">
-<booleanAttribute key="org.eclipse.ui.externaltools.ATTR_BUILDER_ENABLED" value="false"/>
-<stringAttribute key="org.eclipse.ui.externaltools.ATTR_DISABLED_BUILDER" value="org.eclipse.emf.codegen.JETBuilder"/>
-<mapAttribute key="org.eclipse.ui.externaltools.ATTR_TOOL_ARGUMENTS"/>
-<booleanAttribute key="org.eclipse.ui.externaltools.ATTR_TRIGGERS_CONFIGURED" value="true"/>
-</launchConfiguration>
diff --git a/plugins/org.eclipse.jst.j2ee.web/.jetproperties b/plugins/org.eclipse.jst.j2ee.web/.jetproperties
deleted file mode 100644
index 6116937..0000000
--- a/plugins/org.eclipse.jst.j2ee.web/.jetproperties
+++ /dev/null
@@ -1,4 +0,0 @@
-<?xml version="1.0" encoding="UTF-8" standalone="no"?>
-<jet-settings>
- <template-container>templates</template-container> <source-container>web</source-container>
-</jet-settings>
\ No newline at end of file
diff --git a/plugins/org.eclipse.jst.j2ee.web/.project b/plugins/org.eclipse.jst.j2ee.web/.project
deleted file mode 100644
index 93eec33..0000000
--- a/plugins/org.eclipse.jst.j2ee.web/.project
+++ /dev/null
@@ -1,39 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<projectDescription>
- <name>org.eclipse.jst.j2ee.web</name>
- <comment></comment>
- <projects>
- </projects>
- <buildSpec>
- <buildCommand>
- <name>org.eclipse.ui.externaltools.ExternalToolBuilder</name>
- <triggers>full,incremental,</triggers>
- <arguments>
- <dictionary>
- <key>LaunchConfigHandle</key>
- <value><project>/.externalToolBuilders/org.eclipse.emf.codegen.JETBuilder.launch</value>
- </dictionary>
- </arguments>
- </buildCommand>
- <buildCommand>
- <name>org.eclipse.jdt.core.javabuilder</name>
- <arguments>
- </arguments>
- </buildCommand>
- <buildCommand>
- <name>org.eclipse.pde.ManifestBuilder</name>
- <arguments>
- </arguments>
- </buildCommand>
- <buildCommand>
- <name>org.eclipse.pde.SchemaBuilder</name>
- <arguments>
- </arguments>
- </buildCommand>
- </buildSpec>
- <natures>
- <nature>org.eclipse.emf.codegen.jet.IJETNature</nature>
- <nature>org.eclipse.pde.PluginNature</nature>
- <nature>org.eclipse.jdt.core.javanature</nature>
- </natures>
-</projectDescription>
diff --git a/plugins/org.eclipse.jst.j2ee.web/.settings/org.eclipse.jdt.core.prefs b/plugins/org.eclipse.jst.j2ee.web/.settings/org.eclipse.jdt.core.prefs
deleted file mode 100644
index 8337c9e..0000000
--- a/plugins/org.eclipse.jst.j2ee.web/.settings/org.eclipse.jdt.core.prefs
+++ /dev/null
@@ -1,99 +0,0 @@
-#Mon Feb 22 11:50:31 EET 2010
-eclipse.preferences.version=1
-instance/org.eclipse.core.net/org.eclipse.core.net.hasMigrated=true
-org.eclipse.jdt.core.builder.cleanOutputFolder=clean
-org.eclipse.jdt.core.builder.duplicateResourceTask=warning
-org.eclipse.jdt.core.builder.invalidClasspath=abort
-org.eclipse.jdt.core.builder.recreateModifiedClassFileInOutputFolder=ignore
-org.eclipse.jdt.core.builder.resourceCopyExclusionFilter=*.launch
-org.eclipse.jdt.core.circularClasspath=error
-org.eclipse.jdt.core.classpath.exclusionPatterns=enabled
-org.eclipse.jdt.core.classpath.multipleOutputLocations=enabled
-org.eclipse.jdt.core.codeComplete.argumentPrefixes=
-org.eclipse.jdt.core.codeComplete.argumentSuffixes=
-org.eclipse.jdt.core.codeComplete.fieldPrefixes=
-org.eclipse.jdt.core.codeComplete.fieldSuffixes=
-org.eclipse.jdt.core.codeComplete.localPrefixes=
-org.eclipse.jdt.core.codeComplete.localSuffixes=
-org.eclipse.jdt.core.codeComplete.staticFieldPrefixes=
-org.eclipse.jdt.core.codeComplete.staticFieldSuffixes=
-org.eclipse.jdt.core.codeComplete.staticFinalFieldPrefixes=
-org.eclipse.jdt.core.codeComplete.staticFinalFieldSuffixes=
-org.eclipse.jdt.core.compiler.codegen.inlineJsrBytecode=enabled
-org.eclipse.jdt.core.compiler.codegen.targetPlatform=1.5
-org.eclipse.jdt.core.compiler.codegen.unusedLocal=preserve
-org.eclipse.jdt.core.compiler.compliance=1.5
-org.eclipse.jdt.core.compiler.debug.lineNumber=generate
-org.eclipse.jdt.core.compiler.debug.localVariable=generate
-org.eclipse.jdt.core.compiler.debug.sourceFile=generate
-org.eclipse.jdt.core.compiler.maxProblemPerUnit=100
-org.eclipse.jdt.core.compiler.problem.annotationSuperInterface=warning
-org.eclipse.jdt.core.compiler.problem.assertIdentifier=error
-org.eclipse.jdt.core.compiler.problem.autoboxing=warning
-org.eclipse.jdt.core.compiler.problem.comparingIdentical=error
-org.eclipse.jdt.core.compiler.problem.deadCode=error
-org.eclipse.jdt.core.compiler.problem.deprecation=warning
-org.eclipse.jdt.core.compiler.problem.deprecationInDeprecatedCode=enabled
-org.eclipse.jdt.core.compiler.problem.deprecationWhenOverridingDeprecatedMethod=enabled
-org.eclipse.jdt.core.compiler.problem.discouragedReference=warning
-org.eclipse.jdt.core.compiler.problem.emptyStatement=error
-org.eclipse.jdt.core.compiler.problem.enumIdentifier=error
-org.eclipse.jdt.core.compiler.problem.fallthroughCase=error
-org.eclipse.jdt.core.compiler.problem.fatalOptionalError=enabled
-org.eclipse.jdt.core.compiler.problem.fieldHiding=warning
-org.eclipse.jdt.core.compiler.problem.finalParameterBound=warning
-org.eclipse.jdt.core.compiler.problem.finallyBlockNotCompletingNormally=error
-org.eclipse.jdt.core.compiler.problem.forbiddenReference=error
-org.eclipse.jdt.core.compiler.problem.hiddenCatchBlock=error
-org.eclipse.jdt.core.compiler.problem.incompatibleNonInheritedInterfaceMethod=error
-org.eclipse.jdt.core.compiler.problem.incompleteEnumSwitch=error
-org.eclipse.jdt.core.compiler.problem.indirectStaticAccess=ignore
-org.eclipse.jdt.core.compiler.problem.localVariableHiding=warning
-org.eclipse.jdt.core.compiler.problem.methodWithConstructorName=error
-org.eclipse.jdt.core.compiler.problem.missingDeprecatedAnnotation=warning
-org.eclipse.jdt.core.compiler.problem.missingHashCodeMethod=error
-org.eclipse.jdt.core.compiler.problem.missingOverrideAnnotation=error
-org.eclipse.jdt.core.compiler.problem.missingOverrideAnnotationForInterfaceMethodImplementation=enabled
-org.eclipse.jdt.core.compiler.problem.missingSerialVersion=error
-org.eclipse.jdt.core.compiler.problem.missingSynchronizedOnInheritedMethod=error
-org.eclipse.jdt.core.compiler.problem.noEffectAssignment=error
-org.eclipse.jdt.core.compiler.problem.noImplicitStringConversion=error
-org.eclipse.jdt.core.compiler.problem.nonExternalizedStringLiteral=error
-org.eclipse.jdt.core.compiler.problem.nullReference=error
-org.eclipse.jdt.core.compiler.problem.overridingPackageDefaultMethod=error
-org.eclipse.jdt.core.compiler.problem.parameterAssignment=error
-org.eclipse.jdt.core.compiler.problem.possibleAccidentalBooleanAssignment=error
-org.eclipse.jdt.core.compiler.problem.potentialNullReference=error
-org.eclipse.jdt.core.compiler.problem.rawTypeReference=warning
-org.eclipse.jdt.core.compiler.problem.redundantNullCheck=error
-org.eclipse.jdt.core.compiler.problem.redundantSuperinterface=error
-org.eclipse.jdt.core.compiler.problem.specialParameterHidingField=enabled
-org.eclipse.jdt.core.compiler.problem.staticAccessReceiver=error
-org.eclipse.jdt.core.compiler.problem.suppressWarnings=enabled
-org.eclipse.jdt.core.compiler.problem.syntheticAccessEmulation=ignore
-org.eclipse.jdt.core.compiler.problem.typeParameterHiding=error
-org.eclipse.jdt.core.compiler.problem.uncheckedTypeOperation=warning
-org.eclipse.jdt.core.compiler.problem.undocumentedEmptyBlock=warning
-org.eclipse.jdt.core.compiler.problem.unhandledWarningToken=warning
-org.eclipse.jdt.core.compiler.problem.unnecessaryElse=error
-org.eclipse.jdt.core.compiler.problem.unnecessaryTypeCheck=error
-org.eclipse.jdt.core.compiler.problem.unqualifiedFieldAccess=ignore
-org.eclipse.jdt.core.compiler.problem.unusedDeclaredThrownException=warning
-org.eclipse.jdt.core.compiler.problem.unusedDeclaredThrownExceptionExemptExceptionAndThrowable=enabled
-org.eclipse.jdt.core.compiler.problem.unusedDeclaredThrownExceptionIncludeDocCommentReference=enabled
-org.eclipse.jdt.core.compiler.problem.unusedDeclaredThrownExceptionIncludeUncheckedExceptions=disabled
-org.eclipse.jdt.core.compiler.problem.unusedDeclaredThrownExceptionWhenOverriding=disabled
-org.eclipse.jdt.core.compiler.problem.unusedImport=error
-org.eclipse.jdt.core.compiler.problem.unusedLabel=error
-org.eclipse.jdt.core.compiler.problem.unusedLocal=error
-org.eclipse.jdt.core.compiler.problem.unusedObjectAllocation=ignore
-org.eclipse.jdt.core.compiler.problem.unusedParameter=warning
-org.eclipse.jdt.core.compiler.problem.unusedParameterIncludeDocCommentReference=enabled
-org.eclipse.jdt.core.compiler.problem.unusedParameterWhenImplementingAbstract=disabled
-org.eclipse.jdt.core.compiler.problem.unusedParameterWhenOverridingConcrete=disabled
-org.eclipse.jdt.core.compiler.problem.unusedPrivateMember=error
-org.eclipse.jdt.core.compiler.problem.unusedWarningToken=warning
-org.eclipse.jdt.core.compiler.problem.varargsArgumentNeedCast=error
-org.eclipse.jdt.core.compiler.source=1.5
-org.eclipse.jdt.core.incompatibleJDKLevel=ignore
-org.eclipse.jdt.core.incompleteClasspath=error
diff --git a/plugins/org.eclipse.jst.j2ee.web/.settings/org.eclipse.jdt.ui.prefs b/plugins/org.eclipse.jst.j2ee.web/.settings/org.eclipse.jdt.ui.prefs
deleted file mode 100644
index 9bdbea6..0000000
--- a/plugins/org.eclipse.jst.j2ee.web/.settings/org.eclipse.jdt.ui.prefs
+++ /dev/null
@@ -1,6 +0,0 @@
-#Mon Feb 22 11:50:31 EET 2010
-eclipse.preferences.version=1
-org.eclipse.jdt.ui.exception.name=e
-org.eclipse.jdt.ui.gettersetter.use.is=true
-org.eclipse.jdt.ui.keywordthis=false
-org.eclipse.jdt.ui.overrideannotation=true
diff --git a/plugins/org.eclipse.jst.j2ee.web/META-INF/MANIFEST.MF b/plugins/org.eclipse.jst.j2ee.web/META-INF/MANIFEST.MF
deleted file mode 100644
index fdb48cd..0000000
--- a/plugins/org.eclipse.jst.j2ee.web/META-INF/MANIFEST.MF
+++ /dev/null
@@ -1,51 +0,0 @@
-Manifest-Version: 1.0
-Bundle-ManifestVersion: 2
-Bundle-Name: Web Plug-in
-Bundle-SymbolicName: org.eclipse.jst.j2ee.web; singleton:=true
-Bundle-Version: 1.1.404.qualifier
-Bundle-Activator: org.eclipse.jst.j2ee.internal.web.plugin.WebPlugin
-Bundle-Vendor: Eclipse.org
-Bundle-Localization: plugin
-Export-Package: org.eclipse.jst.j2ee.internal.web.archive.operations;x-internal:=true,
- org.eclipse.jst.j2ee.internal.web.classpath;x-internal:=true,
- org.eclipse.jst.j2ee.internal.web.deployables;x-internal:=true,
- org.eclipse.jst.j2ee.internal.web.jfaces.extension;x-internal:=true,
- org.eclipse.jst.j2ee.internal.web.operations;x-internal:=true,
- org.eclipse.jst.j2ee.internal.web.plugin;x-internal:=true,
- org.eclipse.jst.j2ee.internal.web.providers;x-internal:=true,
- org.eclipse.jst.j2ee.internal.web.util;x-internal:=true,
- org.eclipse.jst.j2ee.internal.web.validation;x-internal:=true,
- org.eclipse.jst.j2ee.web,
- org.eclipse.jst.j2ee.web.componentcore.util,
- org.eclipse.jst.j2ee.web.datamodel.properties,
- org.eclipse.jst.j2ee.web.project.facet,
- org.eclipse.jst.j2ee.web.validation
-Require-Bundle: org.eclipse.jst.j2ee;bundle-version="[1.1.0,1.2.0)",
- org.eclipse.core.runtime;bundle-version="[3.2.0,4.0.0)",
- org.eclipse.wst.server.core;bundle-version="[1.0.102,2.0.0)",
- org.eclipse.jst.server.core;bundle-version="[1.0.102,2.0.0)",
- org.eclipse.wst.common.frameworks;bundle-version="[1.2.0,2.0.0)",
- org.eclipse.jem.workbench;bundle-version="[2.0.0,3.0.0)",
- org.eclipse.wst.common.emfworkbench.integration;bundle-version="[1.2.0,2.0.0)",
- org.eclipse.jst.j2ee.core;bundle-version="[1.1.0,2.0.0)",
- org.eclipse.wst.validation;bundle-version="[1.2.0,2.0.0)",
- org.eclipse.wst.common.emf;bundle-version="[1.2.0,2.0.0)",
- org.eclipse.emf.ecore.xmi;bundle-version="[2.2.0,3.0.0)",
- org.eclipse.emf.edit;bundle-version="[2.2.0,3.0.0)",
- org.eclipse.core.runtime;bundle-version="[3.2.0,4.0.0)",
- org.eclipse.core.resources;bundle-version="[3.2.0,4.0.0)",
- org.eclipse.jdt.core;bundle-version="[3.2.0,4.0.0)",
- org.eclipse.emf.codegen;bundle-version="[2.2.0,3.0.0)",
- org.eclipse.wst.web;bundle-version="[1.1.0,1.2.0)",
- org.eclipse.jst.common.annotations.controller;bundle-version="[1.1.0,1.2.0)",
- org.eclipse.jst.common.frameworks;bundle-version="[1.1.0,1.2.0)",
- org.eclipse.wst.common.modulecore;bundle-version="[1.2.5,2.0.0)",
- org.eclipse.jem.util;bundle-version="[2.0.0,3.0.0)",
- org.eclipse.wst.common.project.facet.core;bundle-version="[1.3.0,2.0.0)",
- org.eclipse.jst.common.project.facet.core;bundle-version="[1.3.0,2.0.0)",
- com.ibm.icu;bundle-version="3.8.1",
- org.eclipse.wst.common.environment;bundle-version="[1.0.100,1.1.0)",
- org.eclipse.jst.jee;bundle-version="[1.0.100,1.1.0)",
- org.eclipse.core.commands;bundle-version="[3.4.0,4.0.0)"
-Eclipse-LazyStart: true
-Bundle-RequiredExecutionEnvironment: J2SE-1.5
diff --git a/plugins/org.eclipse.jst.j2ee.web/about.html b/plugins/org.eclipse.jst.j2ee.web/about.html
deleted file mode 100644
index 2199df3..0000000
--- a/plugins/org.eclipse.jst.j2ee.web/about.html
+++ /dev/null
@@ -1,34 +0,0 @@
-<!DOCTYPE HTML PUBLIC "-//W3C//DTD HTML 4.0//EN">
-<HTML>
-
-<head>
-<title>About</title>
-<meta http-equiv=Content-Type content="text/html; charset=ISO-8859-1">
-</head>
-
-<BODY lang="EN-US">
-
-<H3>About This Content</H3>
-
-<P>June, 2008</P>
-
-<H3>License</H3>
-
-<P>The Eclipse Foundation makes available all content in this plug-in
-("Content"). Unless otherwise indicated below, the Content is provided to you
-under the terms and conditions of the Eclipse Public License Version 1.0
-("EPL"). A copy of the EPL is available at
-<A href="http://www.eclipse.org/org/documents/epl-v10.php">http://www.eclipse.org/org/documents/epl-v10.php</A>.
-For purposes of the EPL, "Program" will mean the Content.</P>
-
-<P>If you did not receive this Content directly from the Eclipse Foundation, the
-Content is being redistributed by another party ("Redistributor") and different
-terms and conditions may apply to your use of any object code in the Content.
-Check the Redistributors license that was provided with the Content. If no such
-license exists, contact the Redistributor. Unless otherwise indicated below, the
-terms and conditions of the EPL still apply to any source code in the Content
-and such source code may be obtained at
-<A href="http://www.eclipse.org/">http://www.eclipse.org/</A>.</P>
-
-</BODY>
-</HTML>
diff --git a/plugins/org.eclipse.jst.j2ee.web/build.properties b/plugins/org.eclipse.jst.j2ee.web/build.properties
deleted file mode 100644
index a6a23c6..0000000
--- a/plugins/org.eclipse.jst.j2ee.web/build.properties
+++ /dev/null
@@ -1,26 +0,0 @@
-###############################################################################
-# Copyright (c) 2003, 2005 IBM Corporation and others.
-# All rights reserved. This program and the accompanying materials
-# are made available under the terms of the Eclipse Public License v1.0
-# which accompanies this distribution, and is available at
-# http://www.eclipse.org/legal/epl-v10.html
-#
-# Contributors:
-# IBM Corporation - initial API and implementation
-###############################################################################
-bin.includes = plugin.xml,\
- icons/,\
- plugin.properties,\
- templates/,\
- .,\
- META-INF/,\
- about.html,\
- schema/
-jars.compile.order = .
-source.. = web/,\
- war-validation/,\
- webedit/,\
- webproject/,\
- property_files/
-output.. = bin/
-src.includes = component.xml
diff --git a/plugins/org.eclipse.jst.j2ee.web/component.xml b/plugins/org.eclipse.jst.j2ee.web/component.xml
deleted file mode 100644
index e08c4bd..0000000
--- a/plugins/org.eclipse.jst.j2ee.web/component.xml
+++ /dev/null
@@ -1 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?><component xmlns="http://eclipse.org/wtp/releng/tools/component-model" name="org.eclipse.jst.j2ee.web"><component-depends unrestricted="true"></component-depends><plugin id="org.eclipse.jst.j2ee.web" fragment="false"/><plugin id="org.eclipse.jst.servlet.ui" fragment="false"/></component>
\ No newline at end of file
diff --git a/plugins/org.eclipse.jst.j2ee.web/icons/ServletCreateInitParam.gif b/plugins/org.eclipse.jst.j2ee.web/icons/ServletCreateInitParam.gif
deleted file mode 100644
index e12289b..0000000
--- a/plugins/org.eclipse.jst.j2ee.web/icons/ServletCreateInitParam.gif
+++ /dev/null
Binary files differ
diff --git a/plugins/org.eclipse.jst.j2ee.web/icons/WebAppCreateContextParam.gif b/plugins/org.eclipse.jst.j2ee.web/icons/WebAppCreateContextParam.gif
deleted file mode 100644
index 8450a6f..0000000
--- a/plugins/org.eclipse.jst.j2ee.web/icons/WebAppCreateContextParam.gif
+++ /dev/null
Binary files differ
diff --git a/plugins/org.eclipse.jst.j2ee.web/icons/WebResourceCollectionCreateURLPatternType.gif b/plugins/org.eclipse.jst.j2ee.web/icons/WebResourceCollectionCreateURLPatternType.gif
deleted file mode 100644
index 9f75eb0..0000000
--- a/plugins/org.eclipse.jst.j2ee.web/icons/WebResourceCollectionCreateURLPatternType.gif
+++ /dev/null
Binary files differ
diff --git a/plugins/org.eclipse.jst.j2ee.web/icons/authority_constraint.gif b/plugins/org.eclipse.jst.j2ee.web/icons/authority_constraint.gif
deleted file mode 100644
index 5b64c4d..0000000
--- a/plugins/org.eclipse.jst.j2ee.web/icons/authority_constraint.gif
+++ /dev/null
Binary files differ
diff --git a/plugins/org.eclipse.jst.j2ee.web/icons/error_co.gif b/plugins/org.eclipse.jst.j2ee.web/icons/error_co.gif
deleted file mode 100644
index 119dccc..0000000
--- a/plugins/org.eclipse.jst.j2ee.web/icons/error_co.gif
+++ /dev/null
Binary files differ
diff --git a/plugins/org.eclipse.jst.j2ee.web/icons/error_page.gif b/plugins/org.eclipse.jst.j2ee.web/icons/error_page.gif
deleted file mode 100644
index 811b21b..0000000
--- a/plugins/org.eclipse.jst.j2ee.web/icons/error_page.gif
+++ /dev/null
Binary files differ
diff --git a/plugins/org.eclipse.jst.j2ee.web/icons/errorcode_errorpage.gif b/plugins/org.eclipse.jst.j2ee.web/icons/errorcode_errorpage.gif
deleted file mode 100644
index 811b21b..0000000
--- a/plugins/org.eclipse.jst.j2ee.web/icons/errorcode_errorpage.gif
+++ /dev/null
Binary files differ
diff --git a/plugins/org.eclipse.jst.j2ee.web/icons/exception_type_errorpage.gif b/plugins/org.eclipse.jst.j2ee.web/icons/exception_type_errorpage.gif
deleted file mode 100644
index 1845563..0000000
--- a/plugins/org.eclipse.jst.j2ee.web/icons/exception_type_errorpage.gif
+++ /dev/null
Binary files differ
diff --git a/plugins/org.eclipse.jst.j2ee.web/icons/export_wiz.gif b/plugins/org.eclipse.jst.j2ee.web/icons/export_wiz.gif
deleted file mode 100644
index 3c8a0ba..0000000
--- a/plugins/org.eclipse.jst.j2ee.web/icons/export_wiz.gif
+++ /dev/null
Binary files differ
diff --git a/plugins/org.eclipse.jst.j2ee.web/icons/field.gif b/plugins/org.eclipse.jst.j2ee.web/icons/field.gif
deleted file mode 100644
index 06d38f5..0000000
--- a/plugins/org.eclipse.jst.j2ee.web/icons/field.gif
+++ /dev/null
Binary files differ
diff --git a/plugins/org.eclipse.jst.j2ee.web/icons/filter.gif b/plugins/org.eclipse.jst.j2ee.web/icons/filter.gif
deleted file mode 100644
index 0712d1e..0000000
--- a/plugins/org.eclipse.jst.j2ee.web/icons/filter.gif
+++ /dev/null
Binary files differ
diff --git a/plugins/org.eclipse.jst.j2ee.web/icons/filter_mapping.gif b/plugins/org.eclipse.jst.j2ee.web/icons/filter_mapping.gif
deleted file mode 100644
index 8f2e36b..0000000
--- a/plugins/org.eclipse.jst.j2ee.web/icons/filter_mapping.gif
+++ /dev/null
Binary files differ
diff --git a/plugins/org.eclipse.jst.j2ee.web/icons/form_banner.gif b/plugins/org.eclipse.jst.j2ee.web/icons/form_banner.gif
deleted file mode 100644
index aebc0b2..0000000
--- a/plugins/org.eclipse.jst.j2ee.web/icons/form_banner.gif
+++ /dev/null
Binary files differ
diff --git a/plugins/org.eclipse.jst.j2ee.web/icons/form_login_config.gif b/plugins/org.eclipse.jst.j2ee.web/icons/form_login_config.gif
deleted file mode 100644
index e3fcbb1..0000000
--- a/plugins/org.eclipse.jst.j2ee.web/icons/form_login_config.gif
+++ /dev/null
Binary files differ
diff --git a/plugins/org.eclipse.jst.j2ee.web/icons/full/ctool16/ArrowDown.gif b/plugins/org.eclipse.jst.j2ee.web/icons/full/ctool16/ArrowDown.gif
deleted file mode 100644
index 5f2f2d9..0000000
--- a/plugins/org.eclipse.jst.j2ee.web/icons/full/ctool16/ArrowDown.gif
+++ /dev/null
Binary files differ
diff --git a/plugins/org.eclipse.jst.j2ee.web/icons/full/ctool16/ArrowUp.gif b/plugins/org.eclipse.jst.j2ee.web/icons/full/ctool16/ArrowUp.gif
deleted file mode 100644
index 7a479e8..0000000
--- a/plugins/org.eclipse.jst.j2ee.web/icons/full/ctool16/ArrowUp.gif
+++ /dev/null
Binary files differ
diff --git a/plugins/org.eclipse.jst.j2ee.web/icons/full/ctool16/CreateDescriptionGroup_descriptions_Description.gif b/plugins/org.eclipse.jst.j2ee.web/icons/full/ctool16/CreateDescriptionGroup_descriptions_Description.gif
deleted file mode 100644
index 225e813..0000000
--- a/plugins/org.eclipse.jst.j2ee.web/icons/full/ctool16/CreateDescriptionGroup_descriptions_Description.gif
+++ /dev/null
Binary files differ
diff --git a/plugins/org.eclipse.jst.j2ee.web/icons/full/ctool16/CreateDescriptionGroup_descriptions_DescriptionType.gif b/plugins/org.eclipse.jst.j2ee.web/icons/full/ctool16/CreateDescriptionGroup_descriptions_DescriptionType.gif
deleted file mode 100644
index 45ca182..0000000
--- a/plugins/org.eclipse.jst.j2ee.web/icons/full/ctool16/CreateDescriptionGroup_descriptions_DescriptionType.gif
+++ /dev/null
Binary files differ
diff --git a/plugins/org.eclipse.jst.j2ee.web/icons/full/ctool16/CreateDescriptionGroup_displayNames_DisplayName.gif b/plugins/org.eclipse.jst.j2ee.web/icons/full/ctool16/CreateDescriptionGroup_displayNames_DisplayName.gif
deleted file mode 100644
index 346fc49..0000000
--- a/plugins/org.eclipse.jst.j2ee.web/icons/full/ctool16/CreateDescriptionGroup_displayNames_DisplayName.gif
+++ /dev/null
Binary files differ
diff --git a/plugins/org.eclipse.jst.j2ee.web/icons/full/ctool16/CreateDescriptionGroup_displayNames_DisplayNameType.gif b/plugins/org.eclipse.jst.j2ee.web/icons/full/ctool16/CreateDescriptionGroup_displayNames_DisplayNameType.gif
deleted file mode 100644
index 1df6f5f..0000000
--- a/plugins/org.eclipse.jst.j2ee.web/icons/full/ctool16/CreateDescriptionGroup_displayNames_DisplayNameType.gif
+++ /dev/null
Binary files differ
diff --git a/plugins/org.eclipse.jst.j2ee.web/icons/full/ctool16/CreateDescriptionGroup_icons_IconType.gif b/plugins/org.eclipse.jst.j2ee.web/icons/full/ctool16/CreateDescriptionGroup_icons_IconType.gif
deleted file mode 100644
index 5181241..0000000
--- a/plugins/org.eclipse.jst.j2ee.web/icons/full/ctool16/CreateDescriptionGroup_icons_IconType.gif
+++ /dev/null
Binary files differ
diff --git a/plugins/org.eclipse.jst.j2ee.web/icons/full/ctool16/CreateJSPConfig_propertyGroups_JSPPropertyGroup.gif b/plugins/org.eclipse.jst.j2ee.web/icons/full/ctool16/CreateJSPConfig_propertyGroups_JSPPropertyGroup.gif
deleted file mode 100644
index 5397c66..0000000
--- a/plugins/org.eclipse.jst.j2ee.web/icons/full/ctool16/CreateJSPConfig_propertyGroups_JSPPropertyGroup.gif
+++ /dev/null
Binary files differ
diff --git a/plugins/org.eclipse.jst.j2ee.web/icons/full/ctool16/CreateJSPConfig_tagLibs_TagLibRefType.gif b/plugins/org.eclipse.jst.j2ee.web/icons/full/ctool16/CreateJSPConfig_tagLibs_TagLibRefType.gif
deleted file mode 100644
index 34229a7..0000000
--- a/plugins/org.eclipse.jst.j2ee.web/icons/full/ctool16/CreateJSPConfig_tagLibs_TagLibRefType.gif
+++ /dev/null
Binary files differ
diff --git a/plugins/org.eclipse.jst.j2ee.web/icons/full/ctool16/add_column.gif b/plugins/org.eclipse.jst.j2ee.web/icons/full/ctool16/add_column.gif
deleted file mode 100644
index 256e5a0..0000000
--- a/plugins/org.eclipse.jst.j2ee.web/icons/full/ctool16/add_column.gif
+++ /dev/null
Binary files differ
diff --git a/plugins/org.eclipse.jst.j2ee.web/icons/full/ctool16/connection.gif b/plugins/org.eclipse.jst.j2ee.web/icons/full/ctool16/connection.gif
deleted file mode 100644
index e8efe69..0000000
--- a/plugins/org.eclipse.jst.j2ee.web/icons/full/ctool16/connection.gif
+++ /dev/null
Binary files differ
diff --git a/plugins/org.eclipse.jst.j2ee.web/icons/full/ctool16/convertlinks_wiz.gif b/plugins/org.eclipse.jst.j2ee.web/icons/full/ctool16/convertlinks_wiz.gif
deleted file mode 100644
index 3d75cb5..0000000
--- a/plugins/org.eclipse.jst.j2ee.web/icons/full/ctool16/convertlinks_wiz.gif
+++ /dev/null
Binary files differ
diff --git a/plugins/org.eclipse.jst.j2ee.web/icons/full/ctool16/default.gif b/plugins/org.eclipse.jst.j2ee.web/icons/full/ctool16/default.gif
deleted file mode 100644
index 52bac36..0000000
--- a/plugins/org.eclipse.jst.j2ee.web/icons/full/ctool16/default.gif
+++ /dev/null
Binary files differ
diff --git a/plugins/org.eclipse.jst.j2ee.web/icons/full/ctool16/exportftp_wiz.gif b/plugins/org.eclipse.jst.j2ee.web/icons/full/ctool16/exportftp_wiz.gif
deleted file mode 100644
index fc66e9e..0000000
--- a/plugins/org.eclipse.jst.j2ee.web/icons/full/ctool16/exportftp_wiz.gif
+++ /dev/null
Binary files differ
diff --git a/plugins/org.eclipse.jst.j2ee.web/icons/full/ctool16/exportwar_wiz.gif b/plugins/org.eclipse.jst.j2ee.web/icons/full/ctool16/exportwar_wiz.gif
deleted file mode 100644
index ced859d..0000000
--- a/plugins/org.eclipse.jst.j2ee.web/icons/full/ctool16/exportwar_wiz.gif
+++ /dev/null
Binary files differ
diff --git a/plugins/org.eclipse.jst.j2ee.web/icons/full/ctool16/importftp_wiz.gif b/plugins/org.eclipse.jst.j2ee.web/icons/full/ctool16/importftp_wiz.gif
deleted file mode 100644
index 400e049..0000000
--- a/plugins/org.eclipse.jst.j2ee.web/icons/full/ctool16/importftp_wiz.gif
+++ /dev/null
Binary files differ
diff --git a/plugins/org.eclipse.jst.j2ee.web/icons/full/ctool16/importhttp_wiz.gif b/plugins/org.eclipse.jst.j2ee.web/icons/full/ctool16/importhttp_wiz.gif
deleted file mode 100644
index 4176871..0000000
--- a/plugins/org.eclipse.jst.j2ee.web/icons/full/ctool16/importhttp_wiz.gif
+++ /dev/null
Binary files differ
diff --git a/plugins/org.eclipse.jst.j2ee.web/icons/full/ctool16/importwar_wiz.gif b/plugins/org.eclipse.jst.j2ee.web/icons/full/ctool16/importwar_wiz.gif
deleted file mode 100644
index 432c066..0000000
--- a/plugins/org.eclipse.jst.j2ee.web/icons/full/ctool16/importwar_wiz.gif
+++ /dev/null
Binary files differ
diff --git a/plugins/org.eclipse.jst.j2ee.web/icons/full/ctool16/method.gif b/plugins/org.eclipse.jst.j2ee.web/icons/full/ctool16/method.gif
deleted file mode 100644
index e336513..0000000
--- a/plugins/org.eclipse.jst.j2ee.web/icons/full/ctool16/method.gif
+++ /dev/null
Binary files differ
diff --git a/plugins/org.eclipse.jst.j2ee.web/icons/full/ctool16/methodreturn.gif b/plugins/org.eclipse.jst.j2ee.web/icons/full/ctool16/methodreturn.gif
deleted file mode 100644
index d528595..0000000
--- a/plugins/org.eclipse.jst.j2ee.web/icons/full/ctool16/methodreturn.gif
+++ /dev/null
Binary files differ
diff --git a/plugins/org.eclipse.jst.j2ee.web/icons/full/ctool16/newwebex_wiz.gif b/plugins/org.eclipse.jst.j2ee.web/icons/full/ctool16/newwebex_wiz.gif
deleted file mode 100644
index 43e86db..0000000
--- a/plugins/org.eclipse.jst.j2ee.web/icons/full/ctool16/newwebex_wiz.gif
+++ /dev/null
Binary files differ
diff --git a/plugins/org.eclipse.jst.j2ee.web/icons/full/ctool16/newwebprj_wiz.gif b/plugins/org.eclipse.jst.j2ee.web/icons/full/ctool16/newwebprj_wiz.gif
deleted file mode 100644
index 8956b3d..0000000
--- a/plugins/org.eclipse.jst.j2ee.web/icons/full/ctool16/newwebprj_wiz.gif
+++ /dev/null
Binary files differ
diff --git a/plugins/org.eclipse.jst.j2ee.web/icons/full/ctool16/warFile_obj.gif b/plugins/org.eclipse.jst.j2ee.web/icons/full/ctool16/warFile_obj.gif
deleted file mode 100644
index 31ecb7a..0000000
--- a/plugins/org.eclipse.jst.j2ee.web/icons/full/ctool16/warFile_obj.gif
+++ /dev/null
Binary files differ
diff --git a/plugins/org.eclipse.jst.j2ee.web/icons/full/ctool16/web_application.gif b/plugins/org.eclipse.jst.j2ee.web/icons/full/ctool16/web_application.gif
deleted file mode 100644
index 09f609d..0000000
--- a/plugins/org.eclipse.jst.j2ee.web/icons/full/ctool16/web_application.gif
+++ /dev/null
Binary files differ
diff --git a/plugins/org.eclipse.jst.j2ee.web/icons/full/ctool16/web_ovr.gif b/plugins/org.eclipse.jst.j2ee.web/icons/full/ctool16/web_ovr.gif
deleted file mode 100644
index e0dd2d8..0000000
--- a/plugins/org.eclipse.jst.j2ee.web/icons/full/ctool16/web_ovr.gif
+++ /dev/null
Binary files differ
diff --git a/plugins/org.eclipse.jst.j2ee.web/icons/full/linksview16/mailto_view.gif b/plugins/org.eclipse.jst.j2ee.web/icons/full/linksview16/mailto_view.gif
deleted file mode 100644
index 23f12fa..0000000
--- a/plugins/org.eclipse.jst.j2ee.web/icons/full/linksview16/mailto_view.gif
+++ /dev/null
Binary files differ
diff --git a/plugins/org.eclipse.jst.j2ee.web/icons/full/obj16/JSPConfig.gif b/plugins/org.eclipse.jst.j2ee.web/icons/full/obj16/JSPConfig.gif
deleted file mode 100644
index 30f0c48..0000000
--- a/plugins/org.eclipse.jst.j2ee.web/icons/full/obj16/JSPConfig.gif
+++ /dev/null
Binary files differ
diff --git a/plugins/org.eclipse.jst.j2ee.web/icons/full/obj16/JSPPropertyGroup.gif b/plugins/org.eclipse.jst.j2ee.web/icons/full/obj16/JSPPropertyGroup.gif
deleted file mode 100644
index 5915591..0000000
--- a/plugins/org.eclipse.jst.j2ee.web/icons/full/obj16/JSPPropertyGroup.gif
+++ /dev/null
Binary files differ
diff --git a/plugins/org.eclipse.jst.j2ee.web/icons/full/obj16/TagLibRefType.gif b/plugins/org.eclipse.jst.j2ee.web/icons/full/obj16/TagLibRefType.gif
deleted file mode 100644
index 53500da..0000000
--- a/plugins/org.eclipse.jst.j2ee.web/icons/full/obj16/TagLibRefType.gif
+++ /dev/null
Binary files differ
diff --git a/plugins/org.eclipse.jst.j2ee.web/icons/full/obj16/ascii.gif b/plugins/org.eclipse.jst.j2ee.web/icons/full/obj16/ascii.gif
deleted file mode 100644
index ef30288..0000000
--- a/plugins/org.eclipse.jst.j2ee.web/icons/full/obj16/ascii.gif
+++ /dev/null
Binary files differ
diff --git a/plugins/org.eclipse.jst.j2ee.web/icons/full/obj16/binary.gif b/plugins/org.eclipse.jst.j2ee.web/icons/full/obj16/binary.gif
deleted file mode 100644
index 17633ae..0000000
--- a/plugins/org.eclipse.jst.j2ee.web/icons/full/obj16/binary.gif
+++ /dev/null
Binary files differ
diff --git a/plugins/org.eclipse.jst.j2ee.web/icons/full/obj16/environment_entity.gif b/plugins/org.eclipse.jst.j2ee.web/icons/full/obj16/environment_entity.gif
deleted file mode 100644
index bf043f9..0000000
--- a/plugins/org.eclipse.jst.j2ee.web/icons/full/obj16/environment_entity.gif
+++ /dev/null
Binary files differ
diff --git a/plugins/org.eclipse.jst.j2ee.web/icons/full/obj16/jarproject_deploy.gif b/plugins/org.eclipse.jst.j2ee.web/icons/full/obj16/jarproject_deploy.gif
deleted file mode 100644
index 4c54bf1..0000000
--- a/plugins/org.eclipse.jst.j2ee.web/icons/full/obj16/jarproject_deploy.gif
+++ /dev/null
Binary files differ
diff --git a/plugins/org.eclipse.jst.j2ee.web/icons/full/obj16/java_properties.gif b/plugins/org.eclipse.jst.j2ee.web/icons/full/obj16/java_properties.gif
deleted file mode 100644
index 49873f4..0000000
--- a/plugins/org.eclipse.jst.j2ee.web/icons/full/obj16/java_properties.gif
+++ /dev/null
Binary files differ
diff --git a/plugins/org.eclipse.jst.j2ee.web/icons/full/obj16/method_return.gif b/plugins/org.eclipse.jst.j2ee.web/icons/full/obj16/method_return.gif
deleted file mode 100644
index d528595..0000000
--- a/plugins/org.eclipse.jst.j2ee.web/icons/full/obj16/method_return.gif
+++ /dev/null
Binary files differ
diff --git a/plugins/org.eclipse.jst.j2ee.web/icons/full/obj16/projlib_obj.gif b/plugins/org.eclipse.jst.j2ee.web/icons/full/obj16/projlib_obj.gif
deleted file mode 100644
index 6912def..0000000
--- a/plugins/org.eclipse.jst.j2ee.web/icons/full/obj16/projlib_obj.gif
+++ /dev/null
Binary files differ
diff --git a/plugins/org.eclipse.jst.j2ee.web/icons/full/obj16/servlet.gif b/plugins/org.eclipse.jst.j2ee.web/icons/full/obj16/servlet.gif
deleted file mode 100644
index fc1bece..0000000
--- a/plugins/org.eclipse.jst.j2ee.web/icons/full/obj16/servlet.gif
+++ /dev/null
Binary files differ
diff --git a/plugins/org.eclipse.jst.j2ee.web/icons/full/obj16/web12_deploy.gif b/plugins/org.eclipse.jst.j2ee.web/icons/full/obj16/web12_deploy.gif
deleted file mode 100644
index f507742..0000000
--- a/plugins/org.eclipse.jst.j2ee.web/icons/full/obj16/web12_deploy.gif
+++ /dev/null
Binary files differ
diff --git a/plugins/org.eclipse.jst.j2ee.web/icons/full/obj16/web13_deploy.gif b/plugins/org.eclipse.jst.j2ee.web/icons/full/obj16/web13_deploy.gif
deleted file mode 100644
index e3539d4..0000000
--- a/plugins/org.eclipse.jst.j2ee.web/icons/full/obj16/web13_deploy.gif
+++ /dev/null
Binary files differ
diff --git a/plugins/org.eclipse.jst.j2ee.web/icons/full/obj16/webstatic_deploy.gif b/plugins/org.eclipse.jst.j2ee.web/icons/full/obj16/webstatic_deploy.gif
deleted file mode 100644
index 80531e3..0000000
--- a/plugins/org.eclipse.jst.j2ee.web/icons/full/obj16/webstatic_deploy.gif
+++ /dev/null
Binary files differ
diff --git a/plugins/org.eclipse.jst.j2ee.web/icons/full/sample16/folder.gif b/plugins/org.eclipse.jst.j2ee.web/icons/full/sample16/folder.gif
deleted file mode 100644
index c91b267..0000000
--- a/plugins/org.eclipse.jst.j2ee.web/icons/full/sample16/folder.gif
+++ /dev/null
Binary files differ
diff --git a/plugins/org.eclipse.jst.j2ee.web/icons/full/thumbnail16/defaultFile.gif b/plugins/org.eclipse.jst.j2ee.web/icons/full/thumbnail16/defaultFile.gif
deleted file mode 100644
index ef30288..0000000
--- a/plugins/org.eclipse.jst.j2ee.web/icons/full/thumbnail16/defaultFile.gif
+++ /dev/null
Binary files differ
diff --git a/plugins/org.eclipse.jst.j2ee.web/icons/full/thumbnail16/defaultFolder.gif b/plugins/org.eclipse.jst.j2ee.web/icons/full/thumbnail16/defaultFolder.gif
deleted file mode 100644
index c91b267..0000000
--- a/plugins/org.eclipse.jst.j2ee.web/icons/full/thumbnail16/defaultFolder.gif
+++ /dev/null
Binary files differ
diff --git a/plugins/org.eclipse.jst.j2ee.web/icons/full/view16/colourpal_view.gif b/plugins/org.eclipse.jst.j2ee.web/icons/full/view16/colourpal_view.gif
deleted file mode 100644
index 3764249..0000000
--- a/plugins/org.eclipse.jst.j2ee.web/icons/full/view16/colourpal_view.gif
+++ /dev/null
Binary files differ
diff --git a/plugins/org.eclipse.jst.j2ee.web/icons/full/view16/gallery_view.gif b/plugins/org.eclipse.jst.j2ee.web/icons/full/view16/gallery_view.gif
deleted file mode 100644
index 9f779e4..0000000
--- a/plugins/org.eclipse.jst.j2ee.web/icons/full/view16/gallery_view.gif
+++ /dev/null
Binary files differ
diff --git a/plugins/org.eclipse.jst.j2ee.web/icons/full/view16/links_view.gif b/plugins/org.eclipse.jst.j2ee.web/icons/full/view16/links_view.gif
deleted file mode 100644
index 5fd9c94..0000000
--- a/plugins/org.eclipse.jst.j2ee.web/icons/full/view16/links_view.gif
+++ /dev/null
Binary files differ
diff --git a/plugins/org.eclipse.jst.j2ee.web/icons/full/view16/sample.gif b/plugins/org.eclipse.jst.j2ee.web/icons/full/view16/sample.gif
deleted file mode 100644
index bda81f7..0000000
--- a/plugins/org.eclipse.jst.j2ee.web/icons/full/view16/sample.gif
+++ /dev/null
Binary files differ
diff --git a/plugins/org.eclipse.jst.j2ee.web/icons/full/view16/thumbnail_view.gif b/plugins/org.eclipse.jst.j2ee.web/icons/full/view16/thumbnail_view.gif
deleted file mode 100644
index ababbca..0000000
--- a/plugins/org.eclipse.jst.j2ee.web/icons/full/view16/thumbnail_view.gif
+++ /dev/null
Binary files differ
diff --git a/plugins/org.eclipse.jst.j2ee.web/icons/full/wizban/ftpexport_wiz.png b/plugins/org.eclipse.jst.j2ee.web/icons/full/wizban/ftpexport_wiz.png
deleted file mode 100644
index cfe87a0..0000000
--- a/plugins/org.eclipse.jst.j2ee.web/icons/full/wizban/ftpexport_wiz.png
+++ /dev/null
Binary files differ
diff --git a/plugins/org.eclipse.jst.j2ee.web/icons/full/wizban/ftpimport_wiz.gif b/plugins/org.eclipse.jst.j2ee.web/icons/full/wizban/ftpimport_wiz.gif
deleted file mode 100644
index 56c8c3b..0000000
--- a/plugins/org.eclipse.jst.j2ee.web/icons/full/wizban/ftpimport_wiz.gif
+++ /dev/null
Binary files differ
diff --git a/plugins/org.eclipse.jst.j2ee.web/icons/full/wizban/ftpimport_wiz.png b/plugins/org.eclipse.jst.j2ee.web/icons/full/wizban/ftpimport_wiz.png
deleted file mode 100644
index 4713206..0000000
--- a/plugins/org.eclipse.jst.j2ee.web/icons/full/wizban/ftpimport_wiz.png
+++ /dev/null
Binary files differ
diff --git a/plugins/org.eclipse.jst.j2ee.web/icons/full/wizban/ftppub_wiz.gif b/plugins/org.eclipse.jst.j2ee.web/icons/full/wizban/ftppub_wiz.gif
deleted file mode 100644
index efb2bd4..0000000
--- a/plugins/org.eclipse.jst.j2ee.web/icons/full/wizban/ftppub_wiz.gif
+++ /dev/null
Binary files differ
diff --git a/plugins/org.eclipse.jst.j2ee.web/icons/full/wizban/ftppub_wiz.png b/plugins/org.eclipse.jst.j2ee.web/icons/full/wizban/ftppub_wiz.png
deleted file mode 100644
index e980375..0000000
--- a/plugins/org.eclipse.jst.j2ee.web/icons/full/wizban/ftppub_wiz.png
+++ /dev/null
Binary files differ
diff --git a/plugins/org.eclipse.jst.j2ee.web/icons/full/wizban/httpimport_wiz.gif b/plugins/org.eclipse.jst.j2ee.web/icons/full/wizban/httpimport_wiz.gif
deleted file mode 100644
index 71c8182..0000000
--- a/plugins/org.eclipse.jst.j2ee.web/icons/full/wizban/httpimport_wiz.gif
+++ /dev/null
Binary files differ
diff --git a/plugins/org.eclipse.jst.j2ee.web/icons/full/wizban/httpimport_wiz.png b/plugins/org.eclipse.jst.j2ee.web/icons/full/wizban/httpimport_wiz.png
deleted file mode 100644
index 67483ec..0000000
--- a/plugins/org.eclipse.jst.j2ee.web/icons/full/wizban/httpimport_wiz.png
+++ /dev/null
Binary files differ
diff --git a/plugins/org.eclipse.jst.j2ee.web/icons/full/wizban/newjprj_wiz_32.png b/plugins/org.eclipse.jst.j2ee.web/icons/full/wizban/newjprj_wiz_32.png
deleted file mode 100644
index 62cbd96..0000000
--- a/plugins/org.eclipse.jst.j2ee.web/icons/full/wizban/newjprj_wiz_32.png
+++ /dev/null
Binary files differ
diff --git a/plugins/org.eclipse.jst.j2ee.web/icons/full/wizban/newwebex_wiz.gif b/plugins/org.eclipse.jst.j2ee.web/icons/full/wizban/newwebex_wiz.gif
deleted file mode 100644
index ff7c242..0000000
--- a/plugins/org.eclipse.jst.j2ee.web/icons/full/wizban/newwebex_wiz.gif
+++ /dev/null
Binary files differ
diff --git a/plugins/org.eclipse.jst.j2ee.web/icons/full/wizban/newwebex_wiz.png b/plugins/org.eclipse.jst.j2ee.web/icons/full/wizban/newwebex_wiz.png
deleted file mode 100644
index 939a3ce..0000000
--- a/plugins/org.eclipse.jst.j2ee.web/icons/full/wizban/newwebex_wiz.png
+++ /dev/null
Binary files differ
diff --git a/plugins/org.eclipse.jst.j2ee.web/icons/full/wizban/newwprj_wiz.gif b/plugins/org.eclipse.jst.j2ee.web/icons/full/wizban/newwprj_wiz.gif
deleted file mode 100644
index 72944e9..0000000
--- a/plugins/org.eclipse.jst.j2ee.web/icons/full/wizban/newwprj_wiz.gif
+++ /dev/null
Binary files differ
diff --git a/plugins/org.eclipse.jst.j2ee.web/icons/full/wizban/newwprj_wiz.png b/plugins/org.eclipse.jst.j2ee.web/icons/full/wizban/newwprj_wiz.png
deleted file mode 100644
index 1edd090..0000000
--- a/plugins/org.eclipse.jst.j2ee.web/icons/full/wizban/newwprj_wiz.png
+++ /dev/null
Binary files differ
diff --git a/plugins/org.eclipse.jst.j2ee.web/icons/full/wizban/warexport_wiz.gif b/plugins/org.eclipse.jst.j2ee.web/icons/full/wizban/warexport_wiz.gif
deleted file mode 100644
index d251242..0000000
--- a/plugins/org.eclipse.jst.j2ee.web/icons/full/wizban/warexport_wiz.gif
+++ /dev/null
Binary files differ
diff --git a/plugins/org.eclipse.jst.j2ee.web/icons/full/wizban/warexport_wiz.png b/plugins/org.eclipse.jst.j2ee.web/icons/full/wizban/warexport_wiz.png
deleted file mode 100644
index 244dbb0..0000000
--- a/plugins/org.eclipse.jst.j2ee.web/icons/full/wizban/warexport_wiz.png
+++ /dev/null
Binary files differ
diff --git a/plugins/org.eclipse.jst.j2ee.web/icons/full/wizban/warimport_wiz.gif b/plugins/org.eclipse.jst.j2ee.web/icons/full/wizban/warimport_wiz.gif
deleted file mode 100644
index 0bbebe9..0000000
--- a/plugins/org.eclipse.jst.j2ee.web/icons/full/wizban/warimport_wiz.gif
+++ /dev/null
Binary files differ
diff --git a/plugins/org.eclipse.jst.j2ee.web/icons/full/wizban/warimport_wiz.png b/plugins/org.eclipse.jst.j2ee.web/icons/full/wizban/warimport_wiz.png
deleted file mode 100644
index adcf488..0000000
--- a/plugins/org.eclipse.jst.j2ee.web/icons/full/wizban/warimport_wiz.png
+++ /dev/null
Binary files differ
diff --git a/plugins/org.eclipse.jst.j2ee.web/icons/getstart_a.GIF b/plugins/org.eclipse.jst.j2ee.web/icons/getstart_a.GIF
deleted file mode 100644
index 6331e65..0000000
--- a/plugins/org.eclipse.jst.j2ee.web/icons/getstart_a.GIF
+++ /dev/null
Binary files differ
diff --git a/plugins/org.eclipse.jst.j2ee.web/icons/initializ_parameter.gif b/plugins/org.eclipse.jst.j2ee.web/icons/initializ_parameter.gif
deleted file mode 100644
index 162a578..0000000
--- a/plugins/org.eclipse.jst.j2ee.web/icons/initializ_parameter.gif
+++ /dev/null
Binary files differ
diff --git a/plugins/org.eclipse.jst.j2ee.web/icons/initializ_parameter_context.gif b/plugins/org.eclipse.jst.j2ee.web/icons/initializ_parameter_context.gif
deleted file mode 100644
index 162a578..0000000
--- a/plugins/org.eclipse.jst.j2ee.web/icons/initializ_parameter_context.gif
+++ /dev/null
Binary files differ
diff --git a/plugins/org.eclipse.jst.j2ee.web/icons/jsp_library_reference.gif b/plugins/org.eclipse.jst.j2ee.web/icons/jsp_library_reference.gif
deleted file mode 100644
index 997b50c..0000000
--- a/plugins/org.eclipse.jst.j2ee.web/icons/jsp_library_reference.gif
+++ /dev/null
Binary files differ
diff --git a/plugins/org.eclipse.jst.j2ee.web/icons/jsp_type.gif b/plugins/org.eclipse.jst.j2ee.web/icons/jsp_type.gif
deleted file mode 100644
index 8a63675..0000000
--- a/plugins/org.eclipse.jst.j2ee.web/icons/jsp_type.gif
+++ /dev/null
Binary files differ
diff --git a/plugins/org.eclipse.jst.j2ee.web/icons/key.gif b/plugins/org.eclipse.jst.j2ee.web/icons/key.gif
deleted file mode 100644
index 03af38b..0000000
--- a/plugins/org.eclipse.jst.j2ee.web/icons/key.gif
+++ /dev/null
Binary files differ
diff --git a/plugins/org.eclipse.jst.j2ee.web/icons/key_interf_ov.gif b/plugins/org.eclipse.jst.j2ee.web/icons/key_interf_ov.gif
deleted file mode 100644
index 3070440..0000000
--- a/plugins/org.eclipse.jst.j2ee.web/icons/key_interf_ov.gif
+++ /dev/null
Binary files differ
diff --git a/plugins/org.eclipse.jst.j2ee.web/icons/methElement_obj.gif b/plugins/org.eclipse.jst.j2ee.web/icons/methElement_obj.gif
deleted file mode 100644
index c3e27cd..0000000
--- a/plugins/org.eclipse.jst.j2ee.web/icons/methElement_obj.gif
+++ /dev/null
Binary files differ
diff --git a/plugins/org.eclipse.jst.j2ee.web/icons/mime_mapping.gif b/plugins/org.eclipse.jst.j2ee.web/icons/mime_mapping.gif
deleted file mode 100644
index b647758..0000000
--- a/plugins/org.eclipse.jst.j2ee.web/icons/mime_mapping.gif
+++ /dev/null
Binary files differ
diff --git a/plugins/org.eclipse.jst.j2ee.web/icons/newjprj_wiz.gif b/plugins/org.eclipse.jst.j2ee.web/icons/newjprj_wiz.gif
deleted file mode 100644
index 6d137cd..0000000
--- a/plugins/org.eclipse.jst.j2ee.web/icons/newjprj_wiz.gif
+++ /dev/null
Binary files differ
diff --git a/plugins/org.eclipse.jst.j2ee.web/icons/newjprj_wiz_32.gif b/plugins/org.eclipse.jst.j2ee.web/icons/newjprj_wiz_32.gif
deleted file mode 100644
index 8435ec7..0000000
--- a/plugins/org.eclipse.jst.j2ee.web/icons/newjprj_wiz_32.gif
+++ /dev/null
Binary files differ
diff --git a/plugins/org.eclipse.jst.j2ee.web/icons/newservlet_wiz.gif b/plugins/org.eclipse.jst.j2ee.web/icons/newservlet_wiz.gif
deleted file mode 100644
index f45eadc..0000000
--- a/plugins/org.eclipse.jst.j2ee.web/icons/newservlet_wiz.gif
+++ /dev/null
Binary files differ
diff --git a/plugins/org.eclipse.jst.j2ee.web/icons/newwprj_wiz.gif b/plugins/org.eclipse.jst.j2ee.web/icons/newwprj_wiz.gif
deleted file mode 100644
index 8956b3d..0000000
--- a/plugins/org.eclipse.jst.j2ee.web/icons/newwprj_wiz.gif
+++ /dev/null
Binary files differ
diff --git a/plugins/org.eclipse.jst.j2ee.web/icons/security_constraint.gif b/plugins/org.eclipse.jst.j2ee.web/icons/security_constraint.gif
deleted file mode 100644
index d155408..0000000
--- a/plugins/org.eclipse.jst.j2ee.web/icons/security_constraint.gif
+++ /dev/null
Binary files differ
diff --git a/plugins/org.eclipse.jst.j2ee.web/icons/server_ovr.gif b/plugins/org.eclipse.jst.j2ee.web/icons/server_ovr.gif
deleted file mode 100644
index b5e8b3f..0000000
--- a/plugins/org.eclipse.jst.j2ee.web/icons/server_ovr.gif
+++ /dev/null
Binary files differ
diff --git a/plugins/org.eclipse.jst.j2ee.web/icons/servlet.gif b/plugins/org.eclipse.jst.j2ee.web/icons/servlet.gif
deleted file mode 100644
index fc1bece..0000000
--- a/plugins/org.eclipse.jst.j2ee.web/icons/servlet.gif
+++ /dev/null
Binary files differ
diff --git a/plugins/org.eclipse.jst.j2ee.web/icons/servlet_mapping.gif b/plugins/org.eclipse.jst.j2ee.web/icons/servlet_mapping.gif
deleted file mode 100644
index c495ac8..0000000
--- a/plugins/org.eclipse.jst.j2ee.web/icons/servlet_mapping.gif
+++ /dev/null
Binary files differ
diff --git a/plugins/org.eclipse.jst.j2ee.web/icons/servlet_type.gif b/plugins/org.eclipse.jst.j2ee.web/icons/servlet_type.gif
deleted file mode 100644
index c4a9d21..0000000
--- a/plugins/org.eclipse.jst.j2ee.web/icons/servlet_type.gif
+++ /dev/null
Binary files differ
diff --git a/plugins/org.eclipse.jst.j2ee.web/icons/showerr_tsk.gif b/plugins/org.eclipse.jst.j2ee.web/icons/showerr_tsk.gif
deleted file mode 100644
index 0bc6068..0000000
--- a/plugins/org.eclipse.jst.j2ee.web/icons/showerr_tsk.gif
+++ /dev/null
Binary files differ
diff --git a/plugins/org.eclipse.jst.j2ee.web/icons/showwarn_tsk.gif b/plugins/org.eclipse.jst.j2ee.web/icons/showwarn_tsk.gif
deleted file mode 100644
index 14009e9..0000000
--- a/plugins/org.eclipse.jst.j2ee.web/icons/showwarn_tsk.gif
+++ /dev/null
Binary files differ
diff --git a/plugins/org.eclipse.jst.j2ee.web/icons/url_mapping.gif b/plugins/org.eclipse.jst.j2ee.web/icons/url_mapping.gif
deleted file mode 100644
index 5b5f008..0000000
--- a/plugins/org.eclipse.jst.j2ee.web/icons/url_mapping.gif
+++ /dev/null
Binary files differ
diff --git a/plugins/org.eclipse.jst.j2ee.web/icons/url_type.gif b/plugins/org.eclipse.jst.j2ee.web/icons/url_type.gif
deleted file mode 100644
index b26c71d..0000000
--- a/plugins/org.eclipse.jst.j2ee.web/icons/url_type.gif
+++ /dev/null
Binary files differ
diff --git a/plugins/org.eclipse.jst.j2ee.web/icons/user_data_constraint.gif b/plugins/org.eclipse.jst.j2ee.web/icons/user_data_constraint.gif
deleted file mode 100644
index 25dc9c8..0000000
--- a/plugins/org.eclipse.jst.j2ee.web/icons/user_data_constraint.gif
+++ /dev/null
Binary files differ
diff --git a/plugins/org.eclipse.jst.j2ee.web/icons/user_ovr.gif b/plugins/org.eclipse.jst.j2ee.web/icons/user_ovr.gif
deleted file mode 100644
index b8797f3..0000000
--- a/plugins/org.eclipse.jst.j2ee.web/icons/user_ovr.gif
+++ /dev/null
Binary files differ
diff --git a/plugins/org.eclipse.jst.j2ee.web/icons/war.gif b/plugins/org.eclipse.jst.j2ee.web/icons/war.gif
deleted file mode 100644
index 31ecb7a..0000000
--- a/plugins/org.eclipse.jst.j2ee.web/icons/war.gif
+++ /dev/null
Binary files differ
diff --git a/plugins/org.eclipse.jst.j2ee.web/icons/warn_tsk.gif b/plugins/org.eclipse.jst.j2ee.web/icons/warn_tsk.gif
deleted file mode 100644
index e2b751d..0000000
--- a/plugins/org.eclipse.jst.j2ee.web/icons/warn_tsk.gif
+++ /dev/null
Binary files differ
diff --git a/plugins/org.eclipse.jst.j2ee.web/icons/web_resource_collection.gif b/plugins/org.eclipse.jst.j2ee.web/icons/web_resource_collection.gif
deleted file mode 100644
index acba7cb..0000000
--- a/plugins/org.eclipse.jst.j2ee.web/icons/web_resource_collection.gif
+++ /dev/null
Binary files differ
diff --git a/plugins/org.eclipse.jst.j2ee.web/icons/web_type.gif b/plugins/org.eclipse.jst.j2ee.web/icons/web_type.gif
deleted file mode 100644
index 09f609d..0000000
--- a/plugins/org.eclipse.jst.j2ee.web/icons/web_type.gif
+++ /dev/null
Binary files differ
diff --git a/plugins/org.eclipse.jst.j2ee.web/icons/webapp_12.gif b/plugins/org.eclipse.jst.j2ee.web/icons/webapp_12.gif
deleted file mode 100644
index 7646c44..0000000
--- a/plugins/org.eclipse.jst.j2ee.web/icons/webapp_12.gif
+++ /dev/null
Binary files differ
diff --git a/plugins/org.eclipse.jst.j2ee.web/icons/webapp_13.gif b/plugins/org.eclipse.jst.j2ee.web/icons/webapp_13.gif
deleted file mode 100644
index fec24d6..0000000
--- a/plugins/org.eclipse.jst.j2ee.web/icons/webapp_13.gif
+++ /dev/null
Binary files differ
diff --git a/plugins/org.eclipse.jst.j2ee.web/icons/webapp_14.gif b/plugins/org.eclipse.jst.j2ee.web/icons/webapp_14.gif
deleted file mode 100644
index 83f9165..0000000
--- a/plugins/org.eclipse.jst.j2ee.web/icons/webapp_14.gif
+++ /dev/null
Binary files differ
diff --git a/plugins/org.eclipse.jst.j2ee.web/icons/webapp_22.gif b/plugins/org.eclipse.jst.j2ee.web/icons/webapp_22.gif
deleted file mode 100644
index 71bf43c..0000000
--- a/plugins/org.eclipse.jst.j2ee.web/icons/webapp_22.gif
+++ /dev/null
Binary files differ
diff --git a/plugins/org.eclipse.jst.j2ee.web/icons/webapp_23.gif b/plugins/org.eclipse.jst.j2ee.web/icons/webapp_23.gif
deleted file mode 100644
index 9fbce05..0000000
--- a/plugins/org.eclipse.jst.j2ee.web/icons/webapp_23.gif
+++ /dev/null
Binary files differ
diff --git a/plugins/org.eclipse.jst.j2ee.web/icons/webapp_24.gif b/plugins/org.eclipse.jst.j2ee.web/icons/webapp_24.gif
deleted file mode 100644
index a9045c1..0000000
--- a/plugins/org.eclipse.jst.j2ee.web/icons/webapp_24.gif
+++ /dev/null
Binary files differ
diff --git a/plugins/org.eclipse.jst.j2ee.web/icons/webgroup_obj.gif b/plugins/org.eclipse.jst.j2ee.web/icons/webgroup_obj.gif
deleted file mode 100644
index 274d361..0000000
--- a/plugins/org.eclipse.jst.j2ee.web/icons/webgroup_obj.gif
+++ /dev/null
Binary files differ
diff --git a/plugins/org.eclipse.jst.j2ee.web/icons/welcome_file.gif b/plugins/org.eclipse.jst.j2ee.web/icons/welcome_file.gif
deleted file mode 100644
index d7dab83..0000000
--- a/plugins/org.eclipse.jst.j2ee.web/icons/welcome_file.gif
+++ /dev/null
Binary files differ
diff --git a/plugins/org.eclipse.jst.j2ee.web/icons/welcome_list.gif b/plugins/org.eclipse.jst.j2ee.web/icons/welcome_list.gif
deleted file mode 100644
index f4c7132..0000000
--- a/plugins/org.eclipse.jst.j2ee.web/icons/welcome_list.gif
+++ /dev/null
Binary files differ
diff --git a/plugins/org.eclipse.jst.j2ee.web/icons/xml_image.gif b/plugins/org.eclipse.jst.j2ee.web/icons/xml_image.gif
deleted file mode 100644
index 1496cba..0000000
--- a/plugins/org.eclipse.jst.j2ee.web/icons/xml_image.gif
+++ /dev/null
Binary files differ
diff --git a/plugins/org.eclipse.jst.j2ee.web/plugin.properties b/plugins/org.eclipse.jst.j2ee.web/plugin.properties
deleted file mode 100644
index ce1444e..0000000
--- a/plugins/org.eclipse.jst.j2ee.web/plugin.properties
+++ /dev/null
@@ -1,18 +0,0 @@
-###############################################################################
-# Copyright (c) 2003, 2007 IBM Corporation and others.
-# All rights reserved. This program and the accompanying materials
-# are made available under the terms of the Eclipse Public License v1.0
-# which accompanies this distribution, and is available at
-# http://www.eclipse.org/legal/epl-v10.html
-#
-# Contributors:
-# IBM Corporation - initial API and implementation
-###############################################################################
-war_validator_UI_=Web (2.2-2.4) Validator
-WEB_FACET_LABEL=Dynamic Web Module
-WEB_FACET_DESCRIPTION=Adds support for the Java Servlet API, for generation of dynamic Web page content.
-WEB_FACET_TEMPLATE_LABEL=Dynamic Web Project
-WEBFRAGMENT_FACET_TEMPLATE_LABEL=Web Fragment Project
-WEBFRAGMENT_FACET_LABEL=Web Fragment Module
-WEBFRAGMENT_FACET_DESCRIPTION=Adds support for the Web Fragments, which are used in conjunction with Dynamic Web Projects for generation of dynamic Web page content.
-
diff --git a/plugins/org.eclipse.jst.j2ee.web/plugin.xml b/plugins/org.eclipse.jst.j2ee.web/plugin.xml
deleted file mode 100644
index f940841..0000000
--- a/plugins/org.eclipse.jst.j2ee.web/plugin.xml
+++ /dev/null
@@ -1,507 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<?eclipse version="3.0"?>
-<plugin>
-
-
-<!--============================-->
-<!-- Web JSFaces File URL extension -->
-<!--============================-->
-
- <extension-point id="fileURL" name="FileURL" schema="schema/fileURL.exsd"/>
-
-
-<!--============================-->
-<!-- Web Validator -->
-<!--============================-->
- <extension
- id="WarValidator"
- name="%war_validator_UI_"
- point="org.eclipse.wst.validation.validator">
- <validator>
- <enablement>
- <and>
- <test property="org.eclipse.wst.common.project.facet.core.projectFacet" value="jst.web"/>
- <test property="org.eclipse.wst.common.project.facet.core.projectFacet" value="jst.web:2.4]"/>
- </and>
- </enablement>
- <contentTypeBinding
- contentTypeId="org.eclipse.jst.j2ee.webDD">
- </contentTypeBinding>
- <filter
- objectClass="org.eclipse.core.resources.IFile"
- nameFilter="*.jar">
- </filter>
- <filter
- objectClass="org.eclipse.core.resources.IFile"
- nameFilter=".websettings">
- </filter>
- <filter
- objectClass="org.eclipse.core.resources.IFile"
- nameFilter="org.eclipse.wst.common.component">
- </filter>
- <filter
- objectClass="org.eclipse.core.resources.IFile"
- nameFilter=".classpath">
- </filter>
- <helper
- class="org.eclipse.jst.j2ee.internal.web.validation.UIWarHelper">
- </helper>
- <dependentValidator
- depValValue="true">
- </dependentValidator>
- <run
- class="org.eclipse.jst.j2ee.internal.web.validation.UIWarValidator">
- </run>
- <runStrategy
- project="true">
- </runStrategy>
- </validator>
- </extension>
-
- <extension
- id="WebModuleExtension"
- name="WebModuleExtension"
- point="org.eclipse.jst.j2ee.EARModuleExtension">
- <earModuleExtension
- extensionClass="org.eclipse.jst.j2ee.internal.web.plugin.WebModuleExtensionImpl">
- </earModuleExtension>
- </extension>
- <extension
- point="org.eclipse.wst.common.emfworkbench.integration.adapterFactory">
- <adapterFactory
- functionGroupID="org.eclipse.jst.j2ee"
- className="org.eclipse.jst.j2ee.internal.web.providers.WebapplicationItemProviderAdapterFactory"
- packageURI="webapplication.xmi"
- id="org.eclipse.jst.j2ee.webapplication.provider.WebapplicationItemProviderAdapterFactory">
- </adapterFactory>
- </extension>
- <extension
- point="org.eclipse.wst.common.emfworkbench.integration.adapterFactory">
- <adapterFactory
- functionGroupID="org.eclipse.jst.j2ee"
- className="org.eclipse.jst.j2ee.internal.web.providers.JspItemProviderAdapterFactory"
- packageURI="jsp.xmi"
- id="org.eclipse.jst.j2ee.internal.jsp.provider.JspItemProviderAdapterFactory">
- </adapterFactory>
- </extension>
-
-<!-- =========================================================== -->
-<!-- Web Tag set definitions for XDoclet -->
-<!-- =========================================================== -->
-
- <extension
- id="WebTagSets"
- point="org.eclipse.jst.common.annotations.controller.AnnotationTagSet">
- <AnnotationTagSet
- name="web">
- </AnnotationTagSet>
- </extension>
-
- <extension
- id="WebAnnotationInfo"
- point="org.eclipse.jst.common.annotations.controller.AnnotationTagInfo">
- <AnnotationTagInfo
- tagSet="web"
- tagName="filter"
- scope="type">
- <attrib
- use="required"
- name="name">
- </attrib>
- <attrib
- name="description">
- </attrib>
- <attrib
- name="display-name">
- </attrib>
- <attrib
- name="small-icon">
- </attrib>
- <attrib
- name="large-icon">
- </attrib>
- </AnnotationTagInfo>
- <AnnotationTagInfo
- tagSet="web"
- tagName="filter-init-param"
- scope="type">
- <attrib
- use="required"
- name="name">
- </attrib>
- <attrib
- name="value">
- </attrib>
- <attrib
- name="description">
- </attrib>
- </AnnotationTagInfo>
- <AnnotationTagInfo
- tagSet="web"
- tagName="filter-mapping"
- scope="type">
- <attrib
- name="url-pattern">
- </attrib>
- <attrib
- name="servlet-name">
- </attrib>
- </AnnotationTagInfo>
- <AnnotationTagInfo
- tagSet="web"
- tagName="servlet"
- scope="type">
- <attrib
- use="required"
- name="name">
- </attrib>
- <attrib
- name="display-name">
- </attrib>
- <attrib
- name="icon">
- </attrib>
- <attrib
- name="description">
- </attrib>
- <attrib
- name="load-on-startup">
- </attrib>
- <attrib
- name="run-as">
- </attrib>
- </AnnotationTagInfo>
- <AnnotationTagInfo
- tagSet="web"
- tagName="servlet-init-param"
- multiplicity="*"
- scope="type">
- <attrib
- use="required"
- name="name">
- </attrib>
- <attrib
- name="value">
- </attrib>
- <attrib
- name="description">
- </attrib>
- </AnnotationTagInfo>
- <AnnotationTagInfo
- tagSet="web"
- tagName="servlet-mapping"
- multiplicity="*"
- scope="type">
- <attrib
- use="required"
- name="url-pattern">
- </attrib>
- </AnnotationTagInfo>
- <AnnotationTagInfo
- tagSet="web"
- tagName="listener"
- scope="type">
- </AnnotationTagInfo>
- <AnnotationTagInfo
- tagSet="web"
- tagName="security-role-ref"
- scope="type">
- <attrib
- use="required"
- name="role-name">
- </attrib>
- <attrib
- use="required"
- name="role-link">
- </attrib>
- </AnnotationTagInfo>
- <AnnotationTagInfo
- tagSet="web"
- tagName="resource-env-ref"
- scope="type">
- <attrib
- use="required"
- name="name">
- </attrib>
- <attrib
- use="required"
- name="type">
- </attrib>
- <attrib
- name="description">
- </attrib>
- </AnnotationTagInfo>
- <AnnotationTagInfo
- tagSet="web"
- tagName="resource-ref"
- scope="type">
- <attrib
- use="required"
- name="name">
- </attrib>
- <attrib
- use="required"
- name="type">
- </attrib>
- <attrib
- use="required"
- name="auth">
- </attrib>
- <attrib
- name="description">
- </attrib>
- <attrib
- name="scope">
- </attrib>
- <attrib
- name="jndi-name">
- </attrib>
- </AnnotationTagInfo>
- <AnnotationTagInfo
- tagSet="web"
- tagName="security-role"
- scope="type">
- <attrib
- use="required"
- name="role-name">
- </attrib>
- <attrib
- name="description">
- </attrib>
- </AnnotationTagInfo>
- <AnnotationTagInfo
- tagSet="web"
- tagName="env-entry"
- scope="type">
- <attrib name="name" use="required">
- </attrib>
- <attrib name="description"/>
- <attrib name="type" type="enum">
- <enumValues value="java.lang.Boolean"/>
- <enumValues value="java.lang.Byte"/>
- <enumValues value="java.lang.Character"/>
- <enumValues value="java.lang.String"/>
- <enumValues value="java.lang.Short"/>
- <enumValues value="java.lang.Integer"/>
- <enumValues value="java.lang.Long"/>
- <enumValues value="java.lang.Float"/>
- <enumValues value="java.lang.Double"/>
- </attrib>
- <attrib name="value"/>
- </AnnotationTagInfo>
- <AnnotationTagInfo
- tagSet="web"
- tagName="ejb-ref"
- scope="type">
- <attrib name="name" use="required"/>
- <attrib name="type" type="enum" use="required">
- <enumValues value="Entity"/>
- <enumValues value="Session"/>
- </attrib>
- <attrib name="home" use="required"/>
- <attrib name="remote" use="required"/>
- <attrib name="link"/>
- <attrib name="description"/>
- </AnnotationTagInfo>
- <AnnotationTagInfo
- tagSet="web"
- tagName="ejb-local-ref"
- scope="type">
- <attrib name="name" use="required"/>
- <attrib name="type" type="enum" use="required">
- <enumValues value="Entity"/>
- <enumValues value="Session"/>
- </attrib>
- <attrib name="home" use="required"/>
- <attrib name="local" use="required"/>
- <attrib name="link"/>
- <attrib name="description"/>
- </AnnotationTagInfo>
- </extension>
-
-
- <extension
- point="org.eclipse.wst.common.emfworkbench.integration.editModel">
- <editModel
- editModelID="jst.web"
- factoryClass="org.eclipse.jst.common.jdt.internal.integration.JavaArtifactEditModelFactory">
- <editModelResource
- autoload="false"
- URI="WEB-INF/web.xml"/>
- </editModel>
- </extension>
-
- <extension
- point="org.eclipse.wst.common.modulecore.artifactedit">
- <artifactedit
- typeID="jst.web"
- class="org.eclipse.jst.j2ee.web.componentcore.util.WebArtifactEdit">
- </artifactedit>
- </extension>
-
- <!--============================-->
- <!-- Builder Provider registrations-->
- <!--============================-->
- <extension
- point="org.eclipse.wst.common.frameworks.DataModelProviderExtension">
- <ProviderDefinesType
- providerType="jst.web.builder"
- providerID="org.eclipse.jst.j2ee.internal.deployables.JavaComponentBuilderDataModelProvider"/>
- <DataModelProvider
- class="org.eclipse.jst.j2ee.internal.web.operations.NewServletClassDataModelProvider"
- id="org.eclipse.jst.j2ee.internal.web.operations.NewServletClassDataModelProvider"/>
- </extension>
-
- <extension
- point="org.eclipse.wst.common.frameworks.DataModelProviderExtension">
- <ProviderDefinesType
- providerType="jst.webfragment.builder"
- providerID="org.eclipse.jst.j2ee.internal.deployables.JavaComponentBuilderDataModelProvider"/>
- </extension>
-
- <extension
- point="org.eclipse.wst.common.frameworks.DataModelProviderExtension">
- <DataModelProvider
- class="org.eclipse.jst.j2ee.internal.web.operations.NewFilterClassDataModelProvider"
- id="org.eclipse.jst.j2ee.internal.web.operations.NewFilterClassDataModelProvider">
- </DataModelProvider>
- </extension>
- <extension
- point="org.eclipse.wst.common.frameworks.DataModelProviderExtension">
- <DataModelProvider
- class="org.eclipse.jst.j2ee.internal.web.operations.NewListenerClassDataModelProvider"
- id="org.eclipse.jst.j2ee.internal.web.operations.NewListenerClassDataModelProvider">
- </DataModelProvider>
- </extension>
-
- <extension point="org.eclipse.jdt.core.classpathContainerInitializer">
- <classpathContainerInitializer
- class="org.eclipse.jst.j2ee.internal.web.classpath.WebAppLibrariesContainerInitializer"
- id="org.eclipse.jst.j2ee.internal.web.container"/>
- </extension>
-
- <!-- Project Facets -->
-
- <extension point="org.eclipse.wst.common.project.facet.core.facets">
-
- <project-facet id="jst.web">
- <label>%WEB_FACET_LABEL</label>
- <description>%WEB_FACET_DESCRIPTION</description>
- <default-version version="3.0"/>
- </project-facet>
-
- <project-facet-version facet="jst.web" version="2.2">
- <constraint>
- <and>
- <requires facet="jst.java" version="[1.3"/>
- <conflicts group="modules"/>
- </and>
- </constraint>
- <group-member id="modules"/>
- </project-facet-version>
-
- <project-facet-version facet="jst.web" version="2.3">
- <constraint>
- <and>
- <requires facet="jst.java" version="[1.3"/>
- <conflicts group="modules"/>
- </and>
- </constraint>
- <group-member id="modules"/>
- </project-facet-version>
-
- <project-facet-version facet="jst.web" version="2.4">
- <constraint>
- <and>
- <requires facet="jst.java" version="[1.3"/>
- <conflicts group="modules"/>
- </and>
- </constraint>
- <group-member id="modules"/>
- </project-facet-version>
-
- <project-facet-version facet="jst.web" version="2.5">
- <constraint>
- <and>
- <requires facet="jst.java" version="[5.0"/>
- <conflicts group="modules"/>
- </and>
- </constraint>
- <group-member id="modules"/>
- </project-facet-version>
-
- <project-facet-version facet="jst.web" version="3.0">
- <constraint>
- <and>
- <requires facet="jst.java" version="[6.0"/>
- <conflicts group="modules"/>
- </and>
- </constraint>
- <group-member id="modules"/>
- </project-facet-version>
-
- <action facet="jst.web" version="[2.2-3.0]" type="INSTALL" id="jst.web.install">
- <delegate class="org.eclipse.jst.j2ee.web.project.facet.WebFacetInstallDelegate"/>
- <config-factory class="org.eclipse.jst.j2ee.web.project.facet.WebFacetInstallDataModelProvider"/>
- </action>
-
- <event-handler facet="jst.web" version="[2.2-3.0]" type="RUNTIME_CHANGED">
- <delegate class="org.eclipse.jst.j2ee.project.facet.J2EEFacetRuntimeChangedDelegate"/>
- </event-handler>
-
- <event-handler type="POST_INSTALL" facet="jst.web" version="[2.2-3.0]">
- <delegate class="org.eclipse.jst.j2ee.web.project.facet.WebFacetPostInstallDelegate"/>
- </event-handler>
-
- <template id="template.jst.web">
- <label>%WEB_FACET_TEMPLATE_LABEL</label>
- <fixed facet="jst.java"/>
- <fixed facet="jst.web"/>
- </template>
-
- <project-facet id="jst.webfragment">
- <label>%WEBFRAGMENT_FACET_LABEL</label>
- <description>%WEBFRAGMENT_FACET_DESCRIPTION</description>
- <default-version version="3.0"/>
- <property name="hide.version" value="true"/>
- </project-facet>
-
- <project-facet-version facet="jst.webfragment" version="3.0">
- <constraint>
- <and>
- <requires facet="jst.java" version="[6.0"/>
- <conflicts group="modules"/>
- </and>
- </constraint>
- <group-member id="modules"/>
- </project-facet-version>
-
- <action facet="jst.webfragment" version="3.0" type="INSTALL" id="jst.webfragment.install">
- <delegate class="org.eclipse.jst.j2ee.web.project.facet.WebFragmentFacetInstallDelegate"/>
- <config-factory class="org.eclipse.jst.j2ee.web.project.facet.WebFragmentFacetInstallDataModelProvider"/>
- </action>
-
- <event-handler facet="jst.webfragment" version="3.0" type="RUNTIME_CHANGED">
- <delegate class="org.eclipse.jst.j2ee.project.facet.J2EEFacetRuntimeChangedDelegate"/>
- </event-handler>
-
- <event-handler type="POST_INSTALL" facet="jst.webfragment" version="3.0">
- <delegate class="org.eclipse.jst.j2ee.web.project.facet.WebFragmentFacetPostInstallDelegate"/>
- </event-handler>
-
- <template id="template.jst.webfragment">
- <label>%WEBFRAGMENT_FACET_TEMPLATE_LABEL</label>
- <fixed facet="jst.java"/>
- <fixed facet="jst.webfragment"/>
- </template>
-
- </extension>
-
- <extension
- point="org.eclipse.jst.j2ee.J2EEModelProvider">
- <provider>
- <modelProvider factoryClass="org.eclipse.jst.j2ee.web.componentcore.util.WebArtifactEdit"/>
- <facet id="jst.web" versions="2.2,2.3,2.4"/>
- </provider>
- </extension>
-</plugin>
diff --git a/plugins/org.eclipse.jst.j2ee.web/prepareforpii.xml b/plugins/org.eclipse.jst.j2ee.web/prepareforpii.xml
deleted file mode 100644
index 4978da7..0000000
--- a/plugins/org.eclipse.jst.j2ee.web/prepareforpii.xml
+++ /dev/null
@@ -1,38 +0,0 @@
-<project name="PrepareForPII" default="main" basedir=".">
-
- <!-- Setup temp variables -->
- <target name="init">
- <property name="nlsDir" value="d:/NLS/Corona/0526"/>
- <property name="plugin" value="com.ibm.wtp.web"/>
- <property name="plugindir" value="d:/workspaceCorona/${plugin}"/>
- <property name="outputDir" value="${nlsDir}/${plugin}"/>
-
-
- </target>
-
- <!-- Create the destination dir -->
- <target name="nlsDir" depends="init">
- <mkdir dir="${nlsDir}"/>
- </target>
-
- <!-- Create the destination dir -->
- <target name="plugindir" depends="nlsDir">
- <delete dir="${outputDir}"/>
- <mkdir dir="${outputDir}"/>
- </target>
-
- <!-- Move the files to the correct locations in the workspace. -->
- <target name="main" depends="plugindir">
-
- <messageIdGen folderPath = "${plugindir}" componentId = "E" />
-
- <copy todir = "${outputDir}/property_files" >
- <fileset dir="${plugindir}/property_files">
- <include name="**/*.properties"/>
- </fileset>
- </copy>
-
- <copy file="${plugindir}/plugin.properties" todir="${outputDir}"/>
-
- </target>
-</project>
diff --git a/plugins/org.eclipse.jst.j2ee.web/property_files/web.properties b/plugins/org.eclipse.jst.j2ee.web/property_files/web.properties
deleted file mode 100644
index 3ba015f..0000000
--- a/plugins/org.eclipse.jst.j2ee.web/property_files/web.properties
+++ /dev/null
@@ -1,94 +0,0 @@
-###############################################################################
-# Copyright (c) 2003, 2006 IBM Corporation and others.
-# All rights reserved. This program and the accompanying materials
-# are made available under the terms of the Eclipse Public License v1.0
-# which accompanies this distribution, and is available at
-# http://www.eclipse.org/legal/epl-v10.html
-#
-# Contributors:
-# IBM Corporation - initial API and implementation
-###############################################################################
-ERR_JAR_NAME_EMPTY=The JAR name cannot be empty.
-ERR_JAR_NAME_EXIST=The JAR name already exists.
-ERR_JAVA_PROJECT_NAME_EMPTY=The Java project name cannot be empty.
-ERR_JAVA_PROJECT_NAME_EXIST=The Java project name already exists.
-ERR_SERVLET_MAPPING_URL_PATTERN_EMPTY=The servlet mapping url pattern cannot be empty.
-
-KEY_3=The filter mapping url pattern cannot be empty.
-KEY_4=The filter mapping url pattern "{0}" already exists.
-KEY_5=The filter mapping servlet cannot be empty.
-KEY_6=The filter init param name cannot be empty.
-ERR_FILTER_PARAMETER_NAME_EXIST=The filter initialization parameter name already exists.
-ERR_FILTER_MAPPING_SERVLET_EXIST=The filter mapping servlet "{0}" already exists.
-ERR_FILTER_MAPPING_SERVLET_DISPATCHER_TYPES_EMPTY=The dispatcher types cannot be empty.
-ERR_DISPLAY_NAME_EMPTY=The name cannot be empty.
-ERR_SERVLET_NAME_EXIST=The servlet name already exists.
-ERR_SERVLET_DISPLAY_NAME_EXIST=The servlet display name already exists.
-ERR_SERVLET_CLASS_NAME_USED=The class is already associated with other servlet.
-ERR_SERVLET_JAVA_CLASS_NAME_INVALID=Cannot use Servlet as the servlet class name.
-ERR_SERVLET_MAPPING_URL_PATTERN_EXIST=The servlet URL mapping pattern already exists.
-ERR_SERVLET_MAPPING_SERVLET_NOT_EXIST=The servlet does not exist.
-ERR_SERVLET_PARAMETER_NAME_EMPTY=The servlet initialization parameter name cannot be empty.
-ERR_SERVLET_PARAMETER_NAME_EXIST=The servlet initialization parameter name already exists.
-ERR_SERVLET_PARAMETER_VALUE_EMPTY=The servlet initialization parameter value cannot be empty.
-ERR_SERVLET_PARAMETER_VALUE_EXIST=The servlet initialization parameter value already exists.
-
-ERR_FILTER_DISPLAY_NAME_EXIST=The filter name already exists.
-ERR_FILTER_NAME_EXIST=The filter name already exists.
-ERR_FILTER_CLASS_NAME_USED=The class is already associated with other filter.
-ERR_FILTER_CLASS_NAME_INVALID=Cannot use Filter as the filter class name.
-
-ERR_LISTENER_DISPLAY_NAME_EXIST=The listener name already exists.
-ERR_LISTENER_CLASS_NAME_USED=The class is already associated with other listener.
-ERR_LISTENER_CLASS_NAME_INVALID=Cannot use Listener as the listener class name.
-
-ERR_DUPLICATED_INIT_PARAMETER=Duplicated initialization parameters.
-ERR_DUPLICATED_URL_MAPPING=Duplicated URL mappings.
-
-ERR_URL_MAPPING_LIST_EMPTY=The URL Mappings list cannot be empty.
-ERR_URL_PATTERN_INVALID="{0}" is unresolvable URL pattern. URL patterns should start with "/" or "*.".
-ERR_FILTER_MAPPING_EMPTY=The Filter Mappings list cannot be empty.
-
-ERR_SERVLET_ROLE_REF_NAME_EMPTY=The servlet security role reference name cannot be empty.
-ERR_SERVLET_ROLE_REF_NAME_EXIST=The servlet security role reference name already exists.
-ERR_SERVLET_ROLE_LINK_EMPTY=The servlet security role reference link cannot be empty.
-ERR_SERVLET_INTERFACE=The Servlet class or its superclass must implement the javax.servlet.Servlet interface.
-
-ERR_PAGE_ENCODING_EMPTY=The page encoding cannot be empty.
-ERR_PAGE_ENCODING_EXIST=The page encoding already exists.
-ERR_URL_PATTERN_EXIST=The URL pattern exists.
-ERR_INCLUDE_PRELUDES_EXIST=The include preludes exists.
-ERR_INCLUDE_CODAS_EXIST=The include Codas exists.
-ERR_SECURITY_CONSTRAINT_NAME_EMPTY=The security constraint name cannot be empty.
-ERR_SECURITY_CONSTRAINT_NAME_EXIST=The security constraint name already exists.
-ERR_CONTEXT_PARAMETER_NAME_EMPTY=The context parameter name cannot be empty.
-ERR_CONTEXT_PARAMETER_NAME_EXIST=The context parameter name already exists.
-ERR_RESOURCE_NAME_EMPTY=The web resource name cannot be empty.
-ERR_RESOURCE_NAME_EXIST=The web resource name already exists.
-ERR_URL_PATTERNS_EMPTY=The URL patterns cannot be empty.
-ERR_MIME_MAPPING_EXTENSION_EMPTY=The Mime mapping extension cannot be empty.
-ERR_MIME_MAPPING_EXTENSION_EXIST=The Mime mapping extension already exists.
-ERR_WELCOME_PAGE_EMPTY=The Welcome file name cannot be empty.
-ERR_WELCOME_PAGE_EXIST=The Welcome file name already exists in Welcome File List.
-ERR_ENV_ENTRY_NAME_EMPTY=The environment entry name cannot be empty.
-ERR_ENV_ENTRY_NAME_EXIST=The environment entry name already exists.
-ERR_ERROR_CODE_EMPTY=The error code cannot be empty.
-ERR_ERROR_CODE_MUST_BE_3_DIGITS=The error code must be three digits.
-ERR_ERROR_PAGE_LOCATION_EMPTY=The error page location cannot be empty.
-ERR_ERROR_PAGE_LOCATION_EXIST=The error page location already exists.
-ERR_ERROR_PAGE_LOCATION_MUST_START_WITH_SLASH=The error page location must start with /.
-ERR_EXCEPTION_TYPE_EMPTY=The exception type cannot be empty.
-ERR_EXCEPTION_SECURITY_ID_NO_BEANS=The bean selection can not be empty.
-ERR_EXCEPTION_ROLE_NAME_EMPTY=The role name can not be empty.
-ERR_LOCALE_NAME_EMPTY=The locale cannot be empty.
-ERR_LOCALE_NAME_EXIST=The locale already exists.
-ERR_TAGLIBREF_URL_EMPTY=The tag lib ref URL cannot be empty.
-ERR_TAGLIBREF_URL_EXIST=The tag lib ref URL already exists.
-ERR_MESSAGE_DESTINATION_NAME_EMPTY=The message destination name cannot be empty.
-ERR_MESSAGE_DESTINATION_NAME_EXIST=The message destination name already exists.
-ERR_EXCEPTION_METHOD_ELEMENT_EMPTY=The method elements cannot be empty.
-ERR_EXCEPTION_METHOD_TRANSACTION_ATTRIBUTES_EMPTY=The method transaction attributes can not be empty.
-ERR_SERVLET_LIST_EMPTY=The list of servlets to be removed cannot be empty.
-ERR_FILTER_LIST_EMPTY=The list of filters to be removed cannot be empty.
-ERR_LISTENER_LIST_EMPTY=The list of listeners to be removed cannot be empty.
-ERR_NO_LISTENER_SELECTED=At least one of the application lifecycle listeners must be selected.
diff --git a/plugins/org.eclipse.jst.j2ee.web/property_files/webedit.properties b/plugins/org.eclipse.jst.j2ee.web/property_files/webedit.properties
deleted file mode 100644
index 03d5767..0000000
--- a/plugins/org.eclipse.jst.j2ee.web/property_files/webedit.properties
+++ /dev/null
@@ -1,948 +0,0 @@
-###############################################################################
-# Copyright (c) 2003, 2004 IBM Corporation and others.
-# All rights reserved. This program and the accompanying materials
-# are made available under the terms of the Eclipse Public License v1.0
-# which accompanies this distribution, and is available at
-# http://www.eclipse.org/legal/epl-v10.html
-#
-# Contributors:
-# IBM Corporation - initial API and implementation
-###############################################################################
-Add_Filter_Mapping_Title_UI_=Add Filter Mapping
-Edit_Filter_Mapping_Title_UI_=Edit Filter Mapping
-FILTER_MAPPING=Filter Mapping
-DISPATCHER_R=R
-DISPATCHER_F=F
-DISPATCHER_I=I
-DISPATCHER_E=E
-LISTENER=Listener
-Select_Dispatchers_UI_=Select dispatchers
-Container_Selection_UI_=Folder Selection
-Choose_a_Container__UI_=Choose a Folder:
-Container__UI_=Folder:
-Browse..._UI_=Browse...
-Superclass_selection_UI_=Superclass selection
-Choose_a_superclass_UI_=Choose a superclass
-Add..._UI_=Add...
-Remove_UI_=Remove
-No_packages_to_choose_from_UI_=No packages to choose from.
-Error_EXC_=IWAE0015E Error
-Specify_a_name_and_package_UI_=Create a new Servlet class.
-Which_method_stubs_would_y_UI_=Which method stubs would you like to create?
-__Add_to_web.xml?_UI_=Add to web.xml?
-__Add...___UI_=Add
-__Delete___UI_=Delete
-Cancel_UI_=Cancel
-New_UI_=New
-None_UI_=None
-Create_the_Servlet_Class_UI_=Create the Servlet Class
-Define_the_Servlet_in_the__UI_=Define the Servlet in the Deployment Descriptor (web.xml) File
-Identify_any_information_t_UI_=Identify any information that should be inserted into the Deployment Descriptor (web.xml) file for the servlet.
-Create_Two_Children_UI_=Create Two Children
-Create_Child_UI_=Create Child
-Description_UI_=Description
-2concat_UI_=Create a new child for the selected {0}.
-4concat_UI_=Create a child of type {0} for the selected {1}.
-6concat_UI_=Create {0}
-7concat_UI_=Create two new children for the selected {0}.
-8concat_UI_=Create two new children of type {0} for the selected {1}.
-9concat_UI_=Create Two {0}s
-11concat_UI_=AuthConstraint {0}
-12concat_UI_=ContextParam {0}
-13concat_UI_=ErrorPage {0}
-14concat_UI_=Error Code: {0}
-15concat_UI_=Exception: {0}
-52concat_UI_=FormLoginConfig {0}
-16concat_UI_=FormLoginConfig {0}
-17concat_UI_=HTTPMethodType {0}
-18concat_UI_={0} = {1}
-21concat_UI_=LoginConfig {0}
-22concat_UI_=MimeMapping {0}
-23concat_UI_=RoleNameType {0}
-24concat=Create a child of type WebResourceCollection for the selected {0}.
-26concat_UI_=Create a child of type InitParam for the selected {0}.
-28concat_UI_={0} -> {1}
-31concat_UI_=SessionConfig {0}
-32concat_UI_=TagLibRef {0}
-33concat_UI_=URLPatternType {0}
-34concat_UI_=UserDataConstraint {0}
-35concat_UI_=Create a child of type ContextParam for the selected {0}.
-37concat_UI_=Create a child of type URLPatternType for the selected {0}.
-38concat_UI_=WebResourceCollection {0}
-40concat_UI_=JSPType {0}
-41concat_UI_=ServletType {0}
-42concat_UI_=Create a child of type WelcomeFile for the selected {0}.
-45concat_ERROR_=IWAE0016E Error writing to web.xml:{0}
-50concat_UI_={0} Change
-New_param_UI_=New param
-value_UI_=value
-New_init_param_UI_=New init param
-(New_Security_Role)_UI_=(New Security Role)
-New_security_role_UI_=New security role
-(New_Servlet)_UI_=(New Servlet)
-packagename.classname_UI_=packagename.classname
-New_servlet_UI_=New servlet
-/url/*_UI_=/url/*
-New_servlet_mapping_UI_=New servlet mapping
-(New_filename)_UI_=(New filename)
-New_welcome_file_UI_=New welcome file
-New_welcome_file_list_UI_=New welcome file list
-Problems_Opening_Editor_ERROR_=IWAE0017E Problems Opening Editor
-Large_Icon_Chooser_Dialog_UI_=Large Icon Chooser Dialog
-Small_Icon_Chooser_Dialog_UI_=Small Icon Chooser Dialog
-Browse..._UI__UI_=Browse...
-Value__UI_=Value:
-Description_UI__UI_=Description
-Error_EXC__ERROR_=IWAE0018E Error
-root_undef_ERROR_=IWAE0019E root undef
-Package__UI_=Package:
-(default)_UI_=(default)
-Servlet_Name__UI_=Servlet Name:
-Superclass__UI_=Superclass:
-Interfaces__UI_=Interfaces:
-Modifiers__UI_=Modifiers:
-Use_Single_Thread_Model_UI_=Use Single Thread Model
-Options__UI_=Options:
-Package_Selection_UI_=Package Selection
-Choose_a_package__UI_=Choose a package:
-Superinterfaces_Selection_UI_=Superinterfaces Selection
-Choose_interfaces_UI_=Choose interfaces
-Create_the_Servlet_Class_UI__UI_=Create the Servlet Class
-Inherited_abstract_methods_UI_=Inherited abstract methods
-Constructors_from_supercla_UI_=Constructors from superclass
-Mappings__UI_=Mappings:
-URL_UI_=URL
-URL__UI_=URL:
-Add_Mapping_UI_=Add Mapping
-Display_Name__UI_=Display name:
-Init_Parameters__UI_=Init Parameters:
-Initialization_parameter_UI_=Initialization parameter
-Value_UI_=Value
-Parameter_Name__UI_=Parameter Name:
-Parameter_Value__UI_=Parameter Value:
-Add_Initialization_Paramet_UI_=Add Initialization Parameter
-OK_UI_=OK
-(default_package)_UI_=(default package)
-Authorized_Roles_UI_=Authorized roles
-Edit..._UI_=Edit...
-(New_web_resource_collecti_UI_=(New web resource collection)
-New_web_resource_collectio_UI_=New web resource collection
-Delete_web_resource_collec_UI_=Delete web resource collection
-Web_Resource_Collection_UI_=Web resource collection
-Web_Resource_Collections_UI_=Web Resource Collections
-New_UI__UI_=Add
-Delete_UI_=Remove
-User_Data_Constraint_UI_=User data constraint
-New_security_constraint_UI_=New security constraint
-Transport_guarentee_change_UI_=Transport guarentee change
-Delete_security_constraint_UI_=Delete security constraint
-Security_constraints_UI_=Security constraints
-Name_UI_=Name
-(New_Web_Resource_Collecti_UI_=(New Web Resource Collection)
-Choose_a_JSP_UI_=Choose a JSP
-Select_a_JSP_file_UI_=Select a JSP file
-Choose_a_servlet_UI_=Choose a servlet
-Select_a_servlet_class_UI_=Select a servlet class
-(New_URL)_UI_=(New URL)
-Icon_change_UI_=Icon change
-Authorized_Roles__UI_=Authorized roles:
-Delete_servlet_mappings_UI_=Delete servlet mappings
-Type__UI_=Type:
-Servlet_class_UI_=Servlet class
-JSP_file_UI_=JSP file
-Display_name__UI_=Display name:
-Description__UI_=Description:
-Initialization__UI_=Initialization...
-Icons__UI_=Icons...
-Display_name_change_UI_=Display name change
-Description_change_UI_=Description change
-Web_type_change_UI_=Web type change
-URL_Mappings__UI_=URL mappings:
-New..._UI_=New...
-Add_UI_=Add
-Delete_servlets_UI_=Delete servlets
-Servlets_UI_=Servlets
-(New_URI)_UI_=(New URI)
-/WEB-INF/tlds/(taglib.tld)_UI_=/WEB-INF/tlds/(taglib.tld)
-New_taglib_UI_=New taglib
-Delete_taglibs_UI_=Delete taglibs
-URI_UI_=URI
-Location_UI_=Location
-(New_ContextParameter)_UI_=(New ContextParameter)
-New_context_parameter_UI_=New context parameter
-Context_parameters__UI_=Context parameters:
-Context_Parameter_Name_UI_=Context Parameter Name
-(New_Extension)_UI_=(New Extension)
-New_mime_mapping_UI_=New mime mapping
-Delete_mime_mappings_UI_=Delete mime mappings
-Session_time_out__UI_=Session time out:
-Distributable_UI_=Distributable
-Display_Name_UI_=Display Name
-Session_Config_UI_=Session Config
-Session_Timeout_UI_=Session Timeout
-Mime_mappings__UI_=Mime mappings:
-File_Extension_UI_=File Extension
-Mime_Type_UI_=Mime Type
-Delete_context_parameters_UI_=Delete context parameters
-Welcome_file_name_change_UI_=Welcome file name change
-(New_Welcome_File)_UI_=(New Welcome File)
-Choose_an_Error_Page_UI_=Choose an Error Page
-Select_an_Error_Page_UI_=Select an Error Page
-Delete_welcome_files_UI_=Delete welcome files
-Delete_error_pages_UI_=Delete error pages
-Welcome_files_UI_=Welcome files
-Choose_a_Login_Page_UI_=Choose a Login Page
-Select_a_Login_Page_UI_=Select a Login Page
-Error_mapping__UI_=Error mapping:
-Error/Exception_UI_=Error/Exception
-Login_UI_=Login
-Realm_name__UI_=Realm name:
-Authentication_method__UI_=Authentication method:
-Login_page__UI_=Login page:
-Error_page__UI_=Error page:
-New_login_config_UI_=New login config
-New_auth_method_ERROR_=IWAE0020E New auth method
-New_auth_method_UI_=New auth method
-New_realm_name_UI_=New realm name
-New_form_login_config_UI_=New form login config
-New_form_error_page_UI_=New form error page
-(New_Error_Code)_UI_=(New Error Code)
-New_error_page_UI_=New error page
-Role_Name_UI_=Role Name
-Select_all_UI_=Select all
-Deselect_all_UI_=Deselect all
-Authority_constraint_chang_UI_=Authority constraint change
-Select_Auth_Constraints_UI_=Select Auth Constraints
-Load_on_startup_UI_=Load on startup
-Load_order__UI_=Load order:
-New_parameter_UI_=New parameter
-Initialization_Parameter_UI_=Initialization Parameter
-Load_on_startup_change_UI_=Load on startup change
-Delete_parameter_UI_=Delete parameter
-Initialization_Parameters_UI_=Initialization Parameters
-Security_role_changes_UI_=Security role changes
-New_security_role_referenc_UI_=New security role reference
-remove_security_role_refer_UI_=remove security role reference
-Select_Authorized_Roles_UI_=Select Authorized Roles
-Name__UI_=Name:
-Delete_URL_Patterns_UI_=Delete URL Patterns
-URL_Patterns_UI_=URL Patterns
-HTTP_Methods_UI_=HTTP Methods
-(New_URL_pattern)_UI_=(New URL pattern)
-New_URL_pattern_UI_=New URL pattern
-Web_resource_collection_na_UI_=Web resource collection name change
-Web_resource_collection_de_UI_=Web resource collection description change
-Add_http_method_type_UI_=Add http method type
-Remove_http_method_type_UI_=Remove http method type
-EJB_references_UI_=EJB references
-Resource_factory_reference_UI_=Resource references
-JSP_tag_libraries_UI_=JSP tag libraries
-References_UI_=References
-Environment_UI_=Environment
-Source_UI_=Source
-Error_creating_nested_text_ERROR_=IWAE0021E Error creating nested text editor
-Pages_UI_=Pages
-Security_UI_=Security
-General_UI_=General
-The_description_property_UI_=The description property
-Roles_UI_=Roles
-The_roles_property_UI_=The roles property
-SecConstraint_UI_=SecConstraint
-The_secConstraint_property_UI_=The secConstraint property
-ParamName_UI_=ParamName
-The_paramName_property_UI_=The paramName property
-ParamValue_UI_=ParamValue
-The_paramValue_property_UI_=The paramValue property
-WebApp_UI_=WebApp
-The_webApp_property_UI_=The webApp property
-The_location_property_UI_=The location property
-ErrorCode_UI_=ErrorCode
-The_errorCode_property_UI_=The errorCode property
-ExceptionType_UI_=ExceptionType
-The_exceptionType_property_UI_=The exceptionType property
-FormLoginPage_UI_=FormLoginPage
-The_formLoginPage_property_UI_=The formLoginPage property
-FormErrorPage_UI_=FormErrorPage
-The_formErrorPage_property_UI_=The formErrorPage property
-LoginConfig_UI_=LoginConfig
-The_loginConfig_property_UI_=The loginConfig property
-HttpMethod_UI_=HttpMethod
-The_httpMethod_property_UI_=The httpMethod property
-ResCollection_UI_=ResCollection
-The_resCollection_property_UI_=The resCollection property
-AuthMethod_UI_=AuthMethod
-The_authMethod_property_UI_=The authMethod property
-RealmName_UI_=RealmName
-The_realmName_property_UI_=The realmName property
-FormLoginConfig_UI_=FormLoginConfig
-The_formLoginConfig_proper_UI_=The formLoginConfig property
-Extension_UI_=Extension
-The_extension_property_UI_=The extension property
-MimeType_UI_=MimeType
-The_mimeType_property_UI_=The mimeType property
-RoleName_UI_=RoleName
-The_roleName_property_UI_=The roleName property
-AuthConstraint_UI_=AuthConstraint
-The_authConstraint_propert_UI_=The authConstraint property
-UserDataConstraint_UI_=UserDataConstraint
-The_userDataConstraint_pro_UI_=The userDataConstraint property
-Create_WebResourceCollecti_UI_=Create WebResourceCollection
-SecurityConstraint_UI_=SecurityConstraint
-SmallIcon_UI_=SmallIcon
-Small_Icon_UI_=Small Icon
-LargeIcon_UI_=LargeIcon
-Large_Icon_UI_=Large Icon
-ServletName_UI_=ServletName
-The_servletName_property_UI_=The servletName property
-DisplayName_UI_=DisplayName
-The_displayName_property_UI_=The displayName property
-LoadOnStartup_UI_=LoadOnStartup
-The_loadOnStartup_property_UI_=The loadOnStartup property
-Create_InitParam_UI_=Create InitParam
-<servlet>_UI_=<servlet>
-UrlPattern_UI_=UrlPattern
-The_urlPattern_property_UI_=The urlPattern property
-Servlet_UI_=&Servlet
-JSP_UI_=&JSP
-The_servlet_property_UI_=The servlet property
-URL_pattern_UI_=&URL pattern
-?_UI_=?
-SessionTimeout_UI_=SessionTimeout
-The_sessionTimeout_propert_UI_=The sessionTimeout property
-TaglibURI_UI_=TaglibURI
-The_taglibURI_property_UI_=The taglibURI property
-TaglibLocation_UI_=TaglibLocation
-The_taglibLocation_propert_UI_=The taglibLocation property
-TransportGuarantee_UI_=TransportGuarantee
-The_transportGuarantee_pro_UI_=The transportGuarantee property
-The_distributable_property_UI_=The distributable property
-FileList_UI_=FileList
-The_fileList_property_UI_=The fileList property
-Create_ContextParam_UI_=Create ContextParam
-<web_app>_UI_=<web app>
-WebResourceName_UI_=WebResourceName
-The_webResourceName_proper_UI_=The webResourceName property
-Create_URLPatternType_UI_=Create URLPatternType
-WebType_UI_=WebType
-JspFile_UI_=JspFile
-The_jspFile_property_UI_=The jspFile property
-ClassName_UI_=ClassName
-The_className_property_UI_=The className property
-WelcomeFile_UI_=WelcomeFile
-The_welcomeFile_property_UI_=The welcomeFile property
-<welcome-file>_UI_=<welcome-file>
-Create_WelcomeFile_UI_=Create WelcomeFile
-Welcome_File_List_UI_=Welcome File List
-Error_Message_No_WRC_Entries_UI_=At least one web resource collection is required for a security constraint. If you want to delete this web resource collection, you must delete the entire security constraint.
-Error_Title_No_WRC_Entries_UI_=Web resource collection
-required1concat=Create a child of type #CHILD_CLASS_NAME# for the selected {0}.
-(New_URL)_UI__UI_=(New URL)
-New_param_UI__UI_=New param
-value_UI__UI_=value
-Select_Servlet_or_JSP_UI_=Select Servlet or JSP
-Select_JSP_UI_=Select JSP
-Add_Servlet_or_JSP_UI_=Add Servlet or JSP
-Add_JSP_UI_=Add JSP
-New_ErrorPage_UI_=New ErrorPage
-New_ExceptionType_UI_=New ExceptionType
-Add_Servlet_UI_=Add Servlet
-Web_Nature_Runtime_does_no_EXC_=IWAE0022E Web Nature Runtime does not exist.
-Editor_Redirection_UI_=Editor Redirection
-The_selected_web.xml_file__ERROR_=IWAE0023E The selected web.xml file is not contained within a WAR Project. Therefore, this web.xml file is not a Deployment Descriptor for a Web Archive, hence the XML editor will be opened.
-Problems_Opening_Editor_UI_=Problems Opening Editor
-Create_#CHILD_CLASS_NAME#_UI_=Create #CHILD_CLASS_NAME#
-Move_Welcome_Files_Down_UI_=Move Welcome Files Down
-Move_Welcome_Files_Up_UI_=Move Welcome Files Up
-Error_occurred_getting_web=Error occurred getting web.xml: {0}
-Select_Class_UI_=Select Class
-Could_not_uniquely_map_the_ERROR_=IWAE0024E Could not uniquely map the class name to a class.
-Information_UI_=Information
-The_chosen_operation_is_no_INFO_=IWAE0025I The chosen operation is not currently available.
-JNDI_Name_UI_=JNDI Name
-New_Servlet_UI_=New Servlet
-
-
-(New_Filter)_1=(New Filter)
-New_filter_2=New filter
-New_filter_mapping_1=New filter mapping
-New_listener_1=New listener
-The_name_property_2=The name property
-The_value_property_4=The value property
-The_target_property_2=The target property
-The_type_property_4=The type property
-The_ExternalCacheGroups_property_2=The ExternalCacheGroups property
-The_IdGenerator_property_4=The IdGenerator property
-The_InvalidateOnly_property_6=The InvalidateOnly property
-The_MetadataGenerator_property_8=The MetadataGenerator property
-The_Priority_property_10=The Priority property
-The_PropertiesGroupName_property_12=The PropertiesGroupName property
-The_Timeout_property_14=The Timeout property
-Small__1=Small:
-Large__3=Large:
-Choose_Small_Icon_5=Choose Small Icon
-Select_the_Small_Icon_6=Select the Small Icon
-Choose_Large_Icon_7=Choose Large Icon
-Select_the_Large_Icon_8=Select the Large Icon
-Caching_group_name__1=Caching group name:
-Priority__2=Priority:
-Timeout__3=Timeout:
-second(s)_4=second(s)
-Invalidate_only_5=Invalidate only
-Caching_group_members__6=Caching group members:
-_Servlet/JSP_7=\ Servlet/JSP
-Remove_9=Remove
-Use_URIs_for_cache_ID_building_1=Use URIs for cache ID building
-Use_specified_string__2=Use specified string:
-Variables__3=Variables:
-_ID_4=\ ID
-_Type_5=\ Type
-_Required_6=\ Required
-External_Cache_groups__1=External Cache groups:
-_Group_Name_2=\ Group Name
-ID_generator__3=ID generator:
-Meta_data_generator__4=Meta data generator:
-Remove_6=Remove
-Add_Servlet_Caching_Configuration_1=Add Servlet Caching Configuration
-Edit_Servlet_Caching_Configuration_2=Edit Servlet Caching Configuration
-Add_1=Add
-Remove_2=Remove
-UP_5=UP
-DOWN_6=DOWN
-Add_or_Remove_Servlet_or_JSP_1=Add or Remove Servlet or JSP
-Add_or_Remove_Security_Role_2=Add or Remove Security Role
-Add_or_Remove_Security_Constraint_3=Add or Remove Security Constraint
-Add_or_Remove_Environment_Variable_4=Add or Remove Environment Variable
-Add_or_Remove_EJB_Reference_5=Add or Remove EJB Reference
-Add_or_Remove_Resource_Reference_6=Add or Remove Resource Reference
-Add_or_Remove_JSP_Tag_Library_7=Add or Remove JSP Tag Library
-Add_or_Remove_Error_Page_8=Add or Remove Error Page
-Add_or_Remove_Exception_Page_9=Add or Remove Exception Page
-Add_or_Remove_Welcome_Page_10=Add or Remove Welcome Page
-Add_or_Remove_Context_Parameter_11=Add or Remove Context Parameter
-Add_or_Remove_Mime_Mapping_12=Add or Remove Mime Mapping
-Add_or_Remove_Filter_13=Add or Remove Filter
-Add_or_Remove_Listener_14=Add or Remove Listener
-Add_or_Remove_Mime_Filter_15=Add or Remove Mime Filter
-Add_or_Remove_File_Serving_Attribute_16=Add or Remove File Serving Attribute
-Add_or_Remove_Invoker_Attribute_17=Add or Remove Invoker Attribute
-Add_or_Remove_JSP_Attribute_18=Add or Remove JSP Attribute
-Add_or_Remove_Servlet_Caching_Configuration_19=Add or Remove Servlet Caching Configuration
-Filter_Mappings_1=Filter Mappings
-Read_Only_22=Read Only
-Writable_23=Writable
-Read_only_files____25=Read only files:
-Web_Deployment_Descriptor_28=Web Deployment Descriptor
-Environment_1=Environment
-Environment_Variables_2=Environment Variables
-Extensions_1=Extensions
-Filters_1=Filters
-Listeners_1=Listeners
-Mime_1=Mime
-Mime_Mappings_2=Mime Mappings
-Overview_1=Overview
-Pages_1=Pages
-Parameters_1=Parameters
-Context_Parameters_2=Context Parameters
-References_1=References
-References_2=References
-EJB_references_3=EJB references
-Resource_references_4=Resource references
-JSP_tag_libraries_5=JSP tag libraries
-Security_1=Security roles
-Security_Roles_3=Security Roles
-Security_Constraints_4=Security Constraints
-Servlets_1=Servlets
-Servlets_and_JSPs_2=Servlets and JSPs
-Details_1=Details
-Details_of_the_selected_environment_variable__2=Details of the selected environment variable:
-Type__3=Type:
-Value__13=Value:
-Mime_Type_change_14=Mime Type change
-Variables_1=Variables
-The_following_environment_variables_are_relevant_to_this_web_application__2=The following environment variables are relevant to this web application:
-(New_Variable)_3=(New Variable)
-File_Serving_Attributes_1=File Serving Attributes
-_Name_2=\ Name
-_Value_3=\ Value
-(name)_4=(name)
-(value)_5=(value)
-General_1=General
-Reloading_enabled_2=Reloading enabled
-Reload_interval__3=Reload interval:
-Default_error_page__5=Default error page:
-Additional_class_path__7=Additional class path:
-File_serving_enabled_9=File serving enabled
-Directory_browsing_enabled_10=Directory browsing enabled
-Serve_servlets_by_classname_11=Serve servlets by classname
-Precompile_JSPs_12=Precompile JSPs
-Automatic_Request_Encoding_enabled_13=Automatic Request Encoding enabled
-Automatic_Response_Encoding_enabled_14=Automatic Response Encoding enabled
-Choose_a_Default_Error_Page_15=Choose a Default Error Page
-Reload_Enabled_Changed_16=Reload Enabled Changed
-File_Serving_Enabled_Changed_17=File Serving Enabled Changed
-Directory_Browsing_Enabled_Changed_18=Directory Browsing Enabled Changed
-Serve_Servlets_by_classname_Enabled_Changed_19=Serve Servlets by classname Enabled Changed
-Precompile_JSPs_Enabled_Changed_20=Precompile JSPs Enabled Changed
-Automatic_Request_Encoding_Enabled_Changed_21=Automatic Request Encoding Enabled Changed
-Automatic_Response_Encoding_Enabled_Changed_22=Automatic Response Encoding Enabled Changed
-Reload_Interval_25=Reload Interval
-Default_Error_Page_26=Default Error Page
-Additional_Classpath_27=Additional Classpath
-Invoker_Attributes_1=Invoker Attributes
-JSP_Attributes_1=JSP Attributes
-MIME_Filters__1=MIME Filters
-_Target_2=\ Target
-_Type_3=\ Type
-(target)_4=(target)
-(type)_5=(type)
-Servlet_Caching_Configurations_1=Servlet Caching Configurations
-Details_of_the_selected_filter_2=Details of the selected filter
-Filter_class__3=Filter class:
-Display_name__5=Display name:
-Filter_Type_Selection_7=Filter Type Selection
-FilterItemProvider_UI_0=FilterName
-Choose_a_Filter_Type_8=Choose a Filter Type
-The_following_Filters_are_included_in_this_web_application__2=The following Filters are included in this web application:
-Icons_1=Icons
-The_following_icons_represent_the_selected_filter__2=The following icons represent the selected filter:
-Initialization_1=Initialization
-The_following_Filters_will_be_started_when_the_web_application_is_started__2=The following Filters will be started when the web application is started:
-_Name_3=\ Name
-_Value_4=\ Value
-Delete_Filter_Init_Param_5=Delete Filter Init Param
-(name)_6=(name)
-(value)_7=(value)
-New_Initialization_Parameter_8=New Initialization Parameter
-Servlet_Mappings_2=Servlet Mappings
-The_following_servlets_are_mapped_to_this_filter__3=The following servlets are mapped to this filter:
-Delete_filter_mappings_4=Delete filter mappings
-New_filter_mapping_5=New filter mapping
-URL_Mappings_1=URL Mappings
-The_following_URLs_are_mapped_to_this_filter__2=The following URLs are mapped to this filter:
-Delete_filter_mappings_3=Delete filter mappings
-New_filter_mapping_4=New filter mapping
-Details_of_the_selected_listener_2=Details of the selected listener
-Package__3=Package:
-(default_package)_5=(default package)
-Listeners_5=Listeners
-The_following_Listeners_are_included_in_this_web_application__6=The following Listeners are included in this web application:
-Listener_Type_Selection_10=Listener Type Selection
-Choose_a_Listener_Type_11=Choose a Listener Type
-Details_of_the_selected_file_extension__2=Details of the selected file extension:
-Mime_type__3=Mime type:
-Mime_Type_change_4=Mime Type change
-File_Extensions_1=File Extensions
-The_following_file_extensions_are_mapped_to_Mime_types__2=The following file extensions are mapped to Mime types:
-Context_Parameters_1=Context Parameters
-The_following_context_initialization_parameters_apply_to_all_servlets_in_this_web_application__2=The following context initialization parameters apply to all servlets in this web application:
-Environment_Variables_1=Environment Variables
-The_following_filters_are_used_in_this_application__2=The following filters are used in this application:
-General_Information_1=General Information
-Display_name__2=Display name:
-Description__3=Description:
-Session_time_out__4=Session time out:
-Distributable_5=Distributable
-Display_Name_6=Display Name
-Description_7=Description
-Icons_2=Icons
-The_following_icons_represent_this_web_application__3=The following icons represent this web application:
-The_following_listeners_are_used_in_this_application__2=The following listeners are used in this application:
-Mime_Type_1=Mime Type
-The_following_file_extensions_are_mapped_to_mime_types__2=The following file extensions are mapped to mime types:
-This_web_application_uses_the_following_welcome_and_error_pages__2=This web application uses the following welcome and error pages:
-This_web_application_references_the_following_resources__2=This web application references the following resources:
-The_following_security_roles_and_constraints_are_defined_for_this_web_application__2=The following security roles and constraints are defined for this web application:
-Servlets_and_JSPs_1=Servlets and JSPs
-The_following_servlets_and_JSPs_are_used_in_this_application__2=The following servlets and JSPs are used in this application:
-Usage_1=Usage
-The_following_Enterprise_Applications_use_this_web_module__2=The following Enterprise Applications use this web module:
-Error_Pages_1=Error Pages
-Resources_in_the_following_URLs_will_be_accessed_in_response_to_HTTP_error_codes__2=Resources in the following URLs will be accessed in response to HTTP error codes:
-_Error_Code_3=\ Error Code
-_URL_4=\ URL
-Java_Exception_Types_2=Java Exception Types
-Resources_in_the_following_URLs_will_be_accessed_in_response_to_Java_exception_types__3=Resources in the following URLs will be accessed in response to Java exception types:
-_Exception_Type_4=\ Exception Type
-_URL_5=\ URL
-Exception_Type_Selection_9=Exception Type Selection
-Choose_an_Exception_Type_10=Choose an Exception Type
-Login_1=Login
-The_following_Login_configuration_values_are_used_for_this_web_application__2=The following Login configuration values are used for this web application:
-Realm_name__3=Realm name:
-Authentication_method__4=Authentication method:
-Login_page__5=Login page:
-Error_page__8=Error page:
-Welcome_Pages_1=Welcome Pages
-The_server_will_search_for_the_following_pages,_in_this_order,_when_the_web_application_is_referenced__2=The server will search for the following pages, in this order, when the web application is referenced:
-The_following_context_parameters_are_included_in_this_web_application__2=The following context parameters are included in this web application:
-Details_of_the_selected_context_parameter__2=Details of the selected context parameter:
-Value__3=Value:
-Context_Param_Value_change_4=Context Param Value change
-WebSphere_Bindings_1=WebSphere Bindings
-JNDI_Name__2=JNDI Name:
-Ejb_Ref_JNDI_Name_change_3=Ejb Ref JNDI Name change
-Details_of_the_selected_EJB_reference_2=Details of the selected EJB reference
-Home__6=Home:
-Remote__7=Remote:
-Ejb_Ref_Home_change_8=Ejb Ref Home change
-Ejb_Ref_Remote_change_9=Ejb Ref Remote change
-EJB_Reference_Type_change_10=EJB Reference Type change
-EJB_References_1=EJB References
-The_following_EJB_references_are_used_in_this_web_application__2=The following EJB references are used in this web application:
-JNDI_Name_3=JNDI Name
-Details_of_the_selected_JSP_tag_library_2=Details of the selected JSP tag library
-URI__3=URI:
-Location__4=Location:
-JSP_tag_library_location_change_5=JSP tag library location change
-JSP_tag_library_URI_change_6=JSP tag library URI change
-JSP_tag_libraries_1=JSP tag libraries
-The_following_JSP_tag_libraries_are_used_in_this_web_application__2=The following JSP tag libraries are used in this web application:
-Resource_Ref_JNDI_Name_change_3=Resource Ref JNDI Name change
-Details_of_the_selected_resource_reference_2=Details of the selected resource reference
-Authentication__4=Authentication:
-Resource_Reference_Type_change_7=Resource Reference Type change
-Resource_Reference_Authentication_change_10=Resource Reference Authentication change
-Resource_References_1=Resource References
-The_following_resource_references_are_used_in_this_web_application__2=The following resource references are used in this web application:
-(New_ResourceRef)_3=(New ResourceRef)
-JNDI_Name_4=JNDI Name
-Authorized_Roles_2=Authorized Roles
-The_following_roles_are_authorized_to_access_the_web_resource_collections_in_this_security_constraint__3=The following roles are authorized to access the web resource collections in this security constraint:
-Security_Constraints_1=Security Constraints
-These_constraints_prescribe_access_policies_for_specific_web_resources_2=These constraints prescribe access policies for specific web resources
-User_Data_Constraint_1=User Data Constraint
-The_following_are_the_transport_guarantees_required_between_client_and_server_for_the_security_constraint__2=The following are the transport guarantees required between client and server for the security constraint:
-Web_Resource_Collections_1=Web Resource Collections
-The_following_define_web_resources_and_their_HTTP_method_for_this_web_application__2=The following define web resources and their HTTP method for this web application:
-Details_of_the_selected_security_role__2=Details of the selected security role:
-Security_Roles_Description_change_5=Security Roles Description change
-Security_Roles_1=Security Roles
-The_following_security_roles_are_defined_for_this_web_application__2=The following security roles are defined for this web application:
-Authorized_roles_2=Authorized roles
-The_following_roles_are_authorized_to_access_this_servlet__3=The following roles are authorized to access this servlet:
-Details_of_the_selected_servlet_or_JSP_2=Details of the selected servlet or JSP
-Servlet_class__3=Servlet class:
-WebSphere_Extensions_3=WebSphere Extensions
-Optional_WebSphere_specific_extensions_to_the_Web_Deployment_Descriptor_4=Optional WebSphere specific extensions to the Web Deployment Descriptor
-Unresolved_action__5=Unresolved action:
-Servlet_Extension_Change_6=Servlet Extension Change
-The_following_icons_represent_the_selected_servlet_or_JSP__3=The following icons represent the selected servlet or JSP:
-The_following_URLs_are_mapped_to_this_servlet__2=The following URLs are mapped to this servlet:
-The_following_servlets_and_JSPs_are_included_in_this_web_application__2=The following servlets and JSPs are included in this web application:
-The_filterName_property_3=The filterName property
-The_filter_property_2=The filter property
-The_ListenerClass_property_2=The ListenerClass property
-Details...=Details...
-Load_on_startup_5=Load on startup
-Load_order__6=Load order:
-Delete_Servlet_Init_Param_7=Delete Servlet Init Param
-(name)_8=(name)
-(value)_9=(value)
-New_Initialization_Parameter_10=New Initialization Parameter
-Filter_mapping___1=Filter mapping:
-SecurityConstraint_1=SecurityConstraint
-The_following_initialization_parameters_are_configured_for_this_servlet__1=The following initialization parameters are configured for this servlet:
-Filter_mapping_text={0} -> {1}
-Add_or_Remove_Resource_Environment_Reference_1=Add or Remove Resource Environment Reference
-MIME_1=MIME
-MIME_Mappings_2=MIME Mappings
-Resource_Environment_1=Resource Environment
-Automatic_Filter_Loading_enabled_1=Automatic Filter Loading enabled
-Automatic_Filter_Loading_Enabled_Changed_4=Automatic Filter Loading Enabled Changed
-The_following_servlets_have_this_filter_mapped_to_them_1=The following servlets have this filter mapped to them
-The_following_URLs_have_this_filter_mapped_to_them_1=The following URLs have this filter mapped to them
-MIME_type__1=MIME type:
-MIME_Type_change_2=MIME Type change
-The_following_file_extensions_are_mapped_to_MIME_types_1=The following file extensions are mapped to MIME types
-Location_1=\ Location
-Link__1=Link:
-Ejb_Ref_Link_change_2=Ejb Ref Link change
-Resource_Env_Ref_JNDI_Name_change_1=Resource Env Ref JNDI Name change
-Details_of_the_selected_resource_environment_reference_1=Details of the selected resource environment reference
-Type_Selection_2=Type Selection
-Choose_a_type_3=Choose a type
-Resource_Environment_References_1=Resource Environment References
-The_following_resource_environment_references_are_used_in_this_web_application_2=The following resource environment references are used in this web application
-New_ResourceEnvRef_3=New ResourceEnvRef
-Add_Servlet_Extension_1=Add Servlet Extension
-_ERROR_Problems_opening_editor_3=IWAE0026E Problems opening editor
-_ERROR_JSP_file_does_not_exist_4=IWAE0027E JSP file does not exist
-_ERROR_Problems_opening_editor_5=IWAE0028E Problems opening editor
-_ERROR_Could_not_find_type_within_project_6=IWAE0029E Could not find type within project
-_ERROR_Problems_opening_editor_7=IWAE0030E Problems opening editor
-_ERROR_Problems_opening_editor_8=IWAE0031E Problems opening editor
-Add_Variable_1=Add Variable
-Edit_Variable_2=Edit Variable
-Define_a_new_variable_in_this_servlet_caching_configuration_1=Define a new variable in this servlet caching configuration
-Variable_2=Variable
-ID__3=ID:
-Type__4=Type:
-Method__5=Method:
-Data_ID__6=Data ID:
-Invalid_ID__7=Invalid ID:
-Required_8=Required
-Add_External_Cache_Group_1=Add External Cache Group
-Add_an_external_cache_group_to_this_servlet_caching_configuration_1=Add an external cache group to this servlet caching configuration
-External_Cache_Group_2=External Cache Group
-Group_Name__3=Group Name:
-Group_Name_is_empty_5=Group Name is empty
-Caching_group_name_is_empty_2=Caching group name is empty
-Priority_must_be_an_integer_3=Priority must be an integer
-Timeout_must_be_an_integer_4=Timeout must be an integer
-Define_a_new_servlet_caching_configuration_1=Define a new servlet caching configuration
-Servlet_Caching_Configuration_2=Servlet Caching Configuration
-The_DefaultPage_property_2=The DefaultPage property
-The_ErrorPage_property_4=The ErrorPage property
-The_MimeType_property_6=The MimeType property
-The_Name_property_8=The Name property
-The_Pages_property_10=The Pages property
-The_ExtendedServlet_property_2=The ExtendedServlet property
-The_LocalTransaction_property_4=The LocalTransaction property
-The_MarkupLanguage_property_6=The MarkupLanguage property
-Define_Authorization_Constraint_1=Define Authorization Constraint
-Choose_a_servlet__1=&Choose a servlet:
-Choose_a_servlet__2=Choose a Servlet:
-Matching_servlets__2=&Matching servlets:
-Choose_a_filter__1=&Choose a filter:
-Matching_filters__2=&Matching filters:
-Qualifier__3=&Qualifier:
-Add_or_Remove_EJB_Local_Reference_1=Add or Remove EJB Local Reference
-Add_or_Remove_Markup_Language_2=Add or Remove Markup Language
-Close_editor_3=Close editor
-File_has_been_deleted_from_the_file_system._nWhat_would_you_like_to_do__4=File has been deleted from the file system.\nWhat would you like to do?
-Save_and_close_editor_5=Save and close editor
-Close_editor_6=Close editor
-This_web.xml_file_is_not_a_valid_Deployment_Descriptor_for_a_Web_Archive,_hence_the_XML_editor_will_be_opened_7=This web.xml file is not a valid Deployment Descriptor for a Web Archive, hence the XML editor will be opened.
-EJB_1=EJB
-EJB_Local_2=EJB Local
-Resource_3=Resource
-Resource_Environment_1_4=Resource_Environment_1
-JSP_tag_libraries_5_5=JSP_tag_libraries_5
-Choose_a_listener__1=Choose a listener:
-Matching_listener__2=Matching listener:
-Problems_opening_editor_2=Problems opening editor
-application.xml_does_not_exist_3=application.xml does not exist
-Refresh_4=Refresh
-Details_of_the_selected_EJB_Local_reference_1=Details of the selected EJB Local reference
-Local_home__2=Local home:
-Local__3=Local:
-EJB_Local_References_1=EJB Local References
-The_following_EJB_local_references_are_used_in_this_web_application_2=The following EJB local references are used in this web application
-(New_EJB_Local_Ref)_3=(New EJB Local Ref)
-(New_ResourceEnvRef)_1=(New ResourceEnvRef)
-Description__2=Description:
-Description_change_3=Description change
-Details_of_the_Servlet_Extension_of_the_selected_servlet_1=Details of the Servlet Extension of the selected servlet
-Markup_Languages_2=Markup Languages
-Local_Transaction_3=Local Transaction
-Delete_Filter_Mapping_1=Delete Filter Mapping
-Add_Filter_Mappings_2=Add Filter Mappings
-Choose_a_JSP__1=Choose a JSP:
-Name__2=Name:
-MIME_type__3=MIME type:
-Error_page__4=Error page:
-Browse_5=Browse
-Default_page__6=Default page:
-Browse_7=Browse
-Pages__8=Pages:
-_Name_9=\ Name
-_URI_10=\ URI
-(Name)_11=(Name)
-(URI)_12=(URI)
-Name_is_empty_13=Name is empty
-MIME_is_empty_14=MIME is empty
-Define_a_new_markup_language_entry_1=Define a new markup language entry
-Markup_Language_2=Markup Language
-Choose_a_Page_1=Choose a Page
-Description__1=Description:
-Environment_variable_value_change_1=Environment variable value change
-Environment_variable_description_change_2=Environment variable description change
-Description_name_change_2=Description name change
-Context_Param_Description_change_1=Context Param Description change
-Ejb_Ref_Description_change_1=Ejb Ref Description change
-Resource_Environment_Ref_Description_change_1=Resource Environment Ref Description change
-Resource_Ref_Description_change_1=Resource Ref Description change
-Details_of_the_selected_security_constraint_1=Details of the selected security constraint
-Display_Name__2=Display Name:
-Security_Constraint_DisplayName_change_3=Security Constraint DisplayName change
-Empty_List_2=Empty List
-_UI_Select_a_tag_library_to_add_to_the_deployment_descriptor_1=Select a tag library to add to the deployment descriptor
-_UI_Add_a_Tag_Library_2=Add a Tag Library
-_UI_Tag_Libraries__3=Tag Libraries:
-_UI_Available_Custom_Tags__4=Available Custom Tags:
-_UI__Tag_5=\ Tag
-_UI__Description_6=\ Description
-_UI_URI__7=URI:
-_UI_Select_a_Tag_Library_8=Select a Tag Library
-_UI_URI_cannot_be_empty_10=URI cannot be empty
-Browse..._1=Browse...
-Browse..._3=Browse...
-Browse..._4=Browse...
-Remove_Link_7=Remove Link
-Home_interface_selection_8=Home interface selection
-Local_interface_selection_13=Local interface selection
-Choose_an_interface_16=Choose an interface
-Matching_interfaces__17=Matching interfaces:
-Set_EJB_Local_Ref_Link_18=Set EJB Local Ref Link
-Remove_EJB_Local_Ref_Link_19=Remove EJB Local Ref Link
-EJB_selection_3=EJB selection
-Choose_an_EJB_4=Choose an EJB
-Matching_EJBs__5=Matching EJBs:
-Location__6=Location:
-Empty_List_11=Empty List
-Set_EJB_Ref_Link_8=Set EJB Ref Link
-Remove_EJB_Ref_Link_9=Remove EJB Ref Link
-Home_interface_selection_11=Home interface selection
-Remote_interface_selection_14=Remote interface selection
-Choose_an_interface_17=Choose an interface
-Matching_interfaces__18=Matching interfaces:
-Specify_an_Error_Code_and_Location_1=Specify an Error Code and Location
-Specify_an_Exception_Type_and_Location_2=Specify an Exception Type and Location
-Add_an_Error_Page_3=Add an Error Page
-Error_Code__4=Error Code:
-Exception_Type__5=Exception Type:
-Select..._6=Select...
-Browse..._7=Browse...
-Location__8=Location:
-Browse..._9=Browse...
-Error_Code_is_empty_13=Error Code is empty
-Exception_Type_is_empty_14=Exception Type is empty
-Location_is_empty_16=Location is empty
-Location_18=Location
-Select_a_Page_19=Select a Page
-Add_a_page_to_this_markup_language_1=Add a page to this markup language
-Page_2=Page
-Name__3=Name:
-URI__4=URI:
-Name_is_empty_8=Name is empty
-URI_is_empty_10=URI is empty
-Details_of_the_Servlet_Extension_for_the_selected_servlet_1=Details of the Servlet Extension for the selected servlet
-Delete_Markup_Language_7=Delete Markup Language
-Add_Markup_Language_entry_8=Add Markup Language entry
-Edit_Markup_Language_entry_9=Edit Markup Language entry
-The_name_property_1=The name property
-The_URI_property_2=The URI property
-Empty_List_1=Empty List
-Web_Library_Projects_1=Web Library Projects
-The_following_JARs_are_mapped_to_Java_projects__2=The following JARs are mapped to Java projects:
-_JAR_Name_3=\ JAR Name
-_Java_Project_4=\ Java Project
-Error_5=Error
-Add_Page_1=Add Page
-Up_1=Up
-Down_2=Down
-Resource_Reference_Shareable_change_3=Resource Reference Shareable change
-Environment_variable_type_change_1=Environment variable type change
-WebSphere_Extensions_1=WebSphere Extensions
-Browse..._2=Browse...
-Remove_Page_3=Remove Page
-Tag_Library_1=Tag Library
-Create_Page_1=Create Page
-Create_MarkupLanguage_1=Create MarkupLanguage
-Add_or_Remove_Servlet_Extension_1=Add or Remove Servlet Extension
-_INFO_No_security_roles_exist._1=IWAE0032I No security roles exist.
-_INFO_No_Enterprise_Beans_which_implement_the_remote_interface_exist._1=IWAE0033I No Enterprise Beans which implement the remote interface exist.
-_INFO_No_Enterprise_Beans_which_implement_the_local_interface_exist._2=IWAE0034I No Enterprise Beans which implement the local interface exist.
-_INFO_No_servlets_exist_to_add._1=IWAE0035I No servlets exist to add.
-_INFO_No_classes_which_implement_javax.servlet.Filter_exist._1=IWAE0037I No classes which implement javax.servlet.Filter exist.
-_INFO_No_filters_exist_to_add._1=IWAE0038I No filters exist to add.
-_INFO_No_listeners_exist_to_add._1=IWAE0039I No listeners exist to add.
-_ERROR_Error_updating_Web_Properties_1=IWAE0040E Error updating Web Properties
-_INFO_No_home_interfaces_exist._1=IWAE0041I No home interfaces exist.
-_INFO_No_local_interfaces_exist._2=IWAE0042I No local interfaces exist.
-_INFO_No_remote_interfaces_exist._2=IWAE0043I No remote interfaces exist.
-_INFO_No_tag_libraries_exist_to_add._1=IWAE0044I No tag libraries exist to add.
-_INFO_No_exceptions_exist_to_add._1=IWAE0045I No exceptions exist to add.
-Add_Resource_Reference_Extension_3=Add Resource Reference Extension
-Virtual_Host_Name__1=Virtual Host Name:
-Connection_management__1=Connection management:
-Isolation_level__2=Isolation level:
-_Markup_Language_1=\ Markup Language
-_Mime_Type_2=\ Mime Type
-Boundary__3=Boundary:
-Resolver__4=Resolver:
-Unresolved_Action__5=Unresolved Action:
-Select_an_Error_Code_1=Select an Error Code
-Code_2=Code
-Description_3=Description
-*_denotes_error_code_new_to_HTTP_1.1_4=* denotes error code new to HTTP 1.1
-Continue*_6=Continue*
-Switching_Protocols*_8=Switching Protocols*
-OK_10=OK
-Created_12=Created
-Accepted_14=Accepted
-Non-Authoritative_Information*_16=Non-Authoritative Information*
-No_Content_18=No Content
-Reset_Content*_20=Reset Content*
-Partial_Content*_22=Partial Content*
-Multiple_Choices_24=Multiple Choices
-Moved_Permanently_26=Moved Permanently
-Found_28=Found
-See_Other*_30=See Other*
-Not_Modified_32=Not Modified
-Use_Proxy*_34=Use Proxy*
-Temporary_Redirect*_36=Temporary Redirect*
-Bad_Request_38=Bad Request
-Unauthorized_40=Unauthorized
-Forbidden_42=Forbidden
-Not_Found_44=Not Found
-Method_Not_Allowed*_46=Method Not Allowed*
-Not_Acceptable*_48=Not Acceptable*
-Proxy_Authentication_Required*_50=Proxy Authentication Required*
-Request_Timeout*_52=Request Timeout*
-Conflict*_54=Conflict*
-Gone*_56=Gone*
-Length_Required*_58=Length Required*
-Precondition_Failed*_60=Precondition Failed*
-Request_Entity_Too_Large*_62=Request Entity Too Large*
-Request_URI_Too_Long*_64=Request URI Too Long*
-Unsupported_Media_Type*_66=Unsupported Media Type*
-Requested_Range_Not_Satisfiable*_68=Requested Range Not Satisfiable*
-Expectation_Failed*_70=Expectation Failed*
-Internal_Server_Error_72=Internal Server Error
-Not_Implemented_74=Not Implemented
-Bad_Gateway_76=Bad Gateway
-Service_Unavailable_78=Service Unavailable
-Gateway_Timeout*_80=Gateway Timeout*
-HTTP_Version_Not_Supported*_82=HTTP Version Not Supported*
-Choose_a_Servlet_1=Choose a Servlet
-Unspecified_1=Unspecified
-Sharing__1=Sharing:
-Error_Page_1=Error Page
-New_EJB_Ref=(New EJB Ref)
-selectSR=Select a Security Role
-Role_name=Role name
-NoSR=No Security Roles exist.
-RemoveUDC=Remove User Data Constraint
-UDC_desc_change=User Data Constraint description changed
-Run_As=Run As
-detRunAs=Details of the selected servlet's run-as element
-SR=Security role:
-Select=Select...
-Remove=Remove
-RemoveRA=Remove run-as
-SetRA=Set run-as
-SetRN=Set role-name
-SecurityRoleRefDialog.Security_Role_Ref=Security Role Ref
-SecurityRoleRefDialog.Role_name=Role name:
-SecurityRoleRefDialog.Role_link=Role link:
-SecurityRoleRefDialog.Description=Description:
-WebapplicationEditor.Add_or_Remove_Security_Role_Ref=Add or Remove Security Role Ref
-Ser_AuthSection._Link=\ Link
-Ser_AuthSection.Edit_Security_Role_Ref=Edit Security Role Ref
-srr_header=Security Role References
-srr_description=The following security role references are defined for this servlet:
-Local_encoding_mapping_list_UI_=Locale Encoding Mapping List
-local_encoding_mapping_UI_=Locale Encoding Mapping
-_UI_JSPConfig_type=JSP Config
-_UI_TagLibRefType_type=TagLibRefType
-_UI_JSPPropertyGroup_type=JSPPropertyGroup
-_UI_JSPPropertyGroup_urlPattern_feature=URL Pattern
-_UI_JSPPropertyGroup_elIgnored_feature=El Ignored
-_UI_JSPPropertyGroup_pageEncoding_feature=Page Encoding
-_UI_JSPPropertyGroup_scriptingInvalid_feature=Scripting Invalid
-_UI_JSPPropertyGroup_isXML_feature=Is XML
-_UI_JSPPropertyGroup_includePreludes_feature=Include Preludes
-_UI_JSPPropertyGroup_includeCodas_feature=Include Codas
-
-
diff --git a/plugins/org.eclipse.jst.j2ee.web/schema/fileURL.exsd b/plugins/org.eclipse.jst.j2ee.web/schema/fileURL.exsd
deleted file mode 100644
index 252f46a..0000000
--- a/plugins/org.eclipse.jst.j2ee.web/schema/fileURL.exsd
+++ /dev/null
@@ -1,118 +0,0 @@
-<?xml version='1.0' encoding='UTF-8'?>
-<!-- Schema file written by PDE -->
-<schema targetNamespace="org.eclipse.jst.j2ee.web">
-<annotation>
- <appInfo>
- <meta.schema plugin="org.eclipse.jst.j2ee.web" id="fileURL" name="File URL"/>
- </appInfo>
- <documentation>
- This is for the Web JSFaces File URL extension.
- </documentation>
- </annotation>
-
- <element name="extension">
- <complexType>
- <sequence>
- <element ref="fileURL"/>
- </sequence>
- <attribute name="point" type="string" use="required">
- <annotation>
- <documentation>
- a fully qualified identifier of the target extension point
- </documentation>
- </annotation>
- </attribute>
- <attribute name="id" type="string">
- <annotation>
- <documentation>
- an optional identifier of the extension instance
- </documentation>
- </annotation>
- </attribute>
- <attribute name="name" type="string">
- <annotation>
- <documentation>
- an optional name of the extension instance
- </documentation>
- </annotation>
- </attribute>
- </complexType>
- </element>
-
- <element name="fileURL">
- <complexType>
- <sequence>
- <element ref="run"/>
- </sequence>
- <attribute name="id" type="string">
- <annotation>
- <documentation>
- an optional identifier for this extension instance
- </documentation>
- </annotation>
- </attribute>
- </complexType>
- </element>
-
- <element name="run">
- <complexType>
- <attribute name="class" type="string" use="required">
- <annotation>
- <documentation>
- the qualified name of the class to run
- </documentation>
- </annotation>
- </attribute>
- </complexType>
- </element>
-
- <annotation>
- <appInfo>
- <meta.section type="since"/>
- </appInfo>
- <documentation>
- <b>This extension point is part of an interim API that is still under development and expected to change significantly before reaching stability. It is being made available at this early stage to solicit feedback from pioneering adopters on the understanding that any code that uses this API will almost certainly be broken (repeatedly) as the API evolves.</b>
- </documentation>
- </annotation>
-
- <annotation>
- <appInfo>
- <meta.section type="examples"/>
- </appInfo>
- <documentation>
-
- </documentation>
- </annotation>
-
- <annotation>
- <appInfo>
- <meta.section type="apiInfo"/>
- </appInfo>
- <documentation>
-
- </documentation>
- </annotation>
-
- <annotation>
- <appInfo>
- <meta.section type="implementation"/>
- </appInfo>
- <documentation>
-
- </documentation>
- </annotation>
-
- <annotation>
- <appInfo>
- <meta.section type="copyright"/>
- </appInfo>
- <documentation>
- Copyright (c) 2005 IBM Corporation and others.<br>
-All rights reserved. This program and the accompanying materials are made
-available under the terms of the Eclipse Public License v1.0 which accompanies
-this distribution, and is available at <a
-href="http://www.eclipse.org/legal/epl-v10.html">http://www.eclipse.org/legal/epl-v10.html</a>
- </documentation>
- </annotation>
-
-</schema>
diff --git a/plugins/org.eclipse.jst.j2ee.web/templates/_class.template b/plugins/org.eclipse.jst.j2ee.web/templates/_class.template
deleted file mode 100644
index 17fc58a..0000000
--- a/plugins/org.eclipse.jst.j2ee.web/templates/_class.template
+++ /dev/null
@@ -1,40 +0,0 @@
-<%
- if (model.isPublic()) {
-%>
-public
-<%
- }
-
- if (model.isAbstract()) {
-%>abstract
-<%
- }
-
- if (model.isFinal()) {
-%>final
-<%
- }
-%>class <%= model.getClassName() %>
-<%
- String superClass = model.getSuperclassName();
- if (superClass != null && superClass.length() > 0) {
-%> extends <%= superClass %>
-<%
- }
-
- List<String> interfaces = model.getInterfaces();
- if ( interfaces.size() > 0) {
-%> implements
-<%
- }
-
- for (int i = 0; i < interfaces.size(); i++) {
- String INTERFACE = interfaces.get(i);
- if (i > 0) {
-%>,
-<%
- }
-%><%= INTERFACE %>
-<%
- }
-%> {
diff --git a/plugins/org.eclipse.jst.j2ee.web/templates/_constructors.template b/plugins/org.eclipse.jst.j2ee.web/templates/_constructors.template
deleted file mode 100644
index 1b938b9..0000000
--- a/plugins/org.eclipse.jst.j2ee.web/templates/_constructors.template
+++ /dev/null
@@ -1,31 +0,0 @@
-<%
- if (!model.hasEmptySuperclassConstructor()) {
-%>
-
- /**
- * Default constructor.
- */
- public <%= model.getClassName() %>() {
- // TODO Auto-generated constructor stub
- }
-<%
- }
-
- if (model.shouldGenSuperclassConstructors()) {
- List<Constructor> constructors = model.getConstructors();
- for (Constructor constructor : constructors) {
- if (constructor.isPublic() || constructor.isProtected()) {
-%>
-
- /**
- * @see <%= model.getSuperclassName() %>#<%= model.getSuperclassName() %>(<%= constructor.getParamsForJavadoc() %>)
- */
- public <%= model.getClassName() %>(<%= constructor.getParamsForDeclaration() %>) {
- super(<%= constructor.getParamsForCall() %>);
- // TODO Auto-generated constructor stub
- }
-<%
- }
- }
- }
-%>
\ No newline at end of file
diff --git a/plugins/org.eclipse.jst.j2ee.web/templates/_flags.template b/plugins/org.eclipse.jst.j2ee.web/templates/_flags.template
deleted file mode 100644
index 7e6afd4..0000000
--- a/plugins/org.eclipse.jst.j2ee.web/templates/_flags.template
+++ /dev/null
@@ -1,3 +0,0 @@
-<%
- model.removeFlags(CreateJavaEEArtifactTemplateModel.FLAG_QUALIFIED_SUPERCLASS_NAME);
-%>
\ No newline at end of file
diff --git a/plugins/org.eclipse.jst.j2ee.web/templates/_imports.template b/plugins/org.eclipse.jst.j2ee.web/templates/_imports.template
deleted file mode 100644
index fde7b4b..0000000
--- a/plugins/org.eclipse.jst.j2ee.web/templates/_imports.template
+++ /dev/null
@@ -1,9 +0,0 @@
-<%
- Collection<String> imports = model.getImports();
- for (String anImport : imports) {
-%>
-import <%= anImport %>;
-<%
- }
-%>
-
diff --git a/plugins/org.eclipse.jst.j2ee.web/templates/_methods.template b/plugins/org.eclipse.jst.j2ee.web/templates/_methods.template
deleted file mode 100644
index 5fe3d10..0000000
--- a/plugins/org.eclipse.jst.j2ee.web/templates/_methods.template
+++ /dev/null
@@ -1,23 +0,0 @@
-<%
- if (model.shouldImplementAbstractMethods()) {
- for (Method method : model.getUnimplementedMethods()) {
-%>
-
- /**
- * @see <%= method.getContainingJavaClass() %>#<%= method.getName() %>(<%= method.getParamsForJavadoc() %>)
- */
- public <%= method.getReturnType() %> <%= method.getName() %>(<%= method.getParamsForDeclaration() %>) {
- // TODO Auto-generated method stub
-<%
- String defaultReturnValue = method.getDefaultReturnValue();
- if (defaultReturnValue != null) {
-%>
- return <%= defaultReturnValue %>;
-<%
- }
-%>
- }
-<%
- }
- }
-%>
\ No newline at end of file
diff --git a/plugins/org.eclipse.jst.j2ee.web/templates/_package.template b/plugins/org.eclipse.jst.j2ee.web/templates/_package.template
deleted file mode 100644
index f279df7..0000000
--- a/plugins/org.eclipse.jst.j2ee.web/templates/_package.template
+++ /dev/null
@@ -1,8 +0,0 @@
-<%
- if (model.getJavaPackageName() != null && model.getJavaPackageName().length() > 0) {
-%>
-package <%= model.getJavaPackageName() %>;
-<%
- }
-%>
-
diff --git a/plugins/org.eclipse.jst.j2ee.web/templates/filter.javajet b/plugins/org.eclipse.jst.j2ee.web/templates/filter.javajet
deleted file mode 100644
index 881fb0b..0000000
--- a/plugins/org.eclipse.jst.j2ee.web/templates/filter.javajet
+++ /dev/null
@@ -1,45 +0,0 @@
-<%@ jet package="org.eclipse.jst.j2ee.internal.web.operations"
- imports="java.util.* org.eclipse.jst.j2ee.internal.common.operations.*"
- class="FilterTemplate"
-%>
-<% CreateFilterTemplateModel model = (CreateFilterTemplateModel) argument; %>
-<%@ include file="_flags.template" %>
-<%@ include file="_package.template" %>
-<%@ include file="_imports.template" %>
-<%@ include file="filter_classHeader.template" %>
-<%@ include file="_class.template" %>
-<%@ include file="_constructors.template" %>
-<%@ include file="_methods.template" %>
-<% if (model.shouldGenDestroy()) { %>
-
- /**
- * @see Filter#destroy()
- */
- public void destroy() {
- // TODO Auto-generated method stub
- }
-<% } %>
-<% if (model.shouldGenDoFilter()) { %>
-
- /**
- * @see Filter#doFilter(ServletRequest, ServletResponse, FilterChain)
- */
- public void doFilter(ServletRequest request, ServletResponse response, FilterChain chain) throws IOException, ServletException {
- // TODO Auto-generated method stub
- // place your code here
-
- // pass the request along the filter chain
- chain.doFilter(request, response);
- }
-<% } %>
-<% if (model.shouldGenInit()) { %>
-
- /**
- * @see Filter#init(FilterConfig)
- */
- public void init(FilterConfig fConfig) throws ServletException {
- // TODO Auto-generated method stub
- }
-<% } %>
-
-}
diff --git a/plugins/org.eclipse.jst.j2ee.web/templates/filter_classHeader.template b/plugins/org.eclipse.jst.j2ee.web/templates/filter_classHeader.template
deleted file mode 100644
index f006a5e..0000000
--- a/plugins/org.eclipse.jst.j2ee.web/templates/filter_classHeader.template
+++ /dev/null
@@ -1,249 +0,0 @@
-/**
- * Servlet Filter implementation class <%= model.getClassName() %>
-<%
- if (model.isAnnotated()) {
-%>
- *
- * @web.filter
- * name="<%= model.getFilterName() %>"
- * display-name="<%= model.getFilterName() %>"
-<%
- if (model.getDescription() != null && model.getDescription().length() > 0) {
-%>
- * description="<%= model.getDescription() %>"
-<%
- }
-
- List<IFilterMappingItem> mappings = model.getFilterMappings();
- for (IFilterMappingItem mapping : mappings) {
-%>
- *
- * @web.filter-mapping
-<%
- if (mapping.isUrlPatternType()) {
-%>
- * url-pattern="<%= mapping.getName() %>"
-<%
- } else if (mapping.isServletNameType()) {
-%>
- * servlet-name="<%= mapping.getName() %>"
-<%
- }
-
- String dispatcher = model.getDispatcherList(mapping);
- if (dispatcher.length() > 0) {
-%>
- * dispatcher="<%= dispatcher %>"
-<%
- }
- }
-
- List<String[]> initParams = model.getInitParams();
- if (initParams != null && initParams.size() > 0) {
- for (int i = 0; i < initParams.size(); i++) {
- String name = model.getInitParam(i, CreateFilterTemplateModel.NAME);
- String value = model.getInitParam(i, CreateFilterTemplateModel.VALUE);
- String description = model.getInitParam(i, CreateFilterTemplateModel.DESCRIPTION);
-%>
- *
- * @web.filter-init-param
- * name="<%= name %>"
- * value="<%= value %>"
-<%
- if (description != null && description.length() > 0) {
-%>
- * description="<%= description %>"
-<%
- }
- }
- }
- }
-%>
- */
- <%
- if ("3.0".equals(model.getJavaEEVersion())) {
-%>
-@WebFilter
-<%
- Map<String, Object> params = model.getClassAnnotationParams();
- if (params.size() == 1 && params.containsKey(CreateServletTemplateModel.ATT_URL_PATTERNS)) {
- List<String> mappings = (List<String>) params.get(CreateServletTemplateModel.ATT_URL_PATTERNS);
- if (mappings.size() == 1) {
- String value = mappings.get(0);
-%>("<%= value %>")
-<%
- } else {
-%>({
-<%
- boolean needComma = false;
- for (String mapping : mappings) {
- if (needComma) {
-%>,
-<%
- }
-%>"<%= mapping %>"
-<%
- needComma = true;
- }
-%> })
-<%
- }
- } else if (!params.isEmpty()) {
-%>(
-<%
- Set<String> keys = params.keySet();
- boolean needNewLine = keys.contains(CreateFilterTemplateModel.ATT_INIT_PARAMS) ||
- (keys.contains(CreateFilterTemplateModel.ATT_URL_PATTERNS) &&
- ((List<String>) params.get(CreateFilterTemplateModel.ATT_URL_PATTERNS)).size() > 1) ||
- (keys.contains(CreateFilterTemplateModel.ATT_SERVLET_NAMES) &&
- ((List<String>) params.get(CreateFilterTemplateModel.ATT_SERVLET_NAMES)).size() > 1);
- boolean needComma = false;
- for (String key : keys) {
- if (needComma) {
-%>,
-<%
- }
-
- if (needNewLine) {
-%>
-
-<%
- }
-
- if (key.equals(CreateFilterTemplateModel.ATT_FILTER_NAME) || key.equals(CreateFilterTemplateModel.ATT_DESCRIPTION)) {
- String value = (String) params.get(key);
-%><%= key %> = "<%= value %>"
-<%
- } else if (key.equals(CreateFilterTemplateModel.ATT_URL_PATTERNS)) {
-%><%= key %> = {
-<%
- List<String> mappings = (List<String>) params.get(key);
- boolean needComma2 = false;
- boolean needNewLine2 = mappings.size() > 1;
- for (String mapping : mappings) {
- if (needComma2) {
-%>,
-<%
- }
-
- if (needNewLine2) {
-%>
-
-<%
- }
-%>"<%= mapping %>"
-<%
- needComma2 = true;
- }
-
- if (needNewLine2) {
-%>
-
-<%
- } else {
-%>
-<%
- }
-%>}
-<%
- } else if (key.equals(CreateFilterTemplateModel.ATT_SERVLET_NAMES)) {
-%><%= key %> = {
-<%
- List<String> servletNames = (List<String>) params.get(key);
- boolean needComma2 = false;
- boolean needNewLine2 = servletNames.size() > 1;
- for (String servletName : servletNames) {
- if (needComma2) {
-%>,
-<%
- }
-
- if (needNewLine2) {
-%>
-
-<%
- }
-%>"<%= servletName %>"
-<%
- needComma2 = true;
- }
-
- if (needNewLine2) {
-%>
-
-<%
- } else {
-%>
-<%
- }
-%>}
-<%
- } else if (key.equals(CreateFilterTemplateModel.ATT_INIT_PARAMS)) {
-%><%= key %> = {
-<%
- List<String[]> initParams = (List<String[]>) params.get(key);
- boolean needComma2 = false;
- for (String[] initParam : initParams) {
- if (needComma2) {
-%>,
-<%
- }
-
- String name = initParam[CreateFilterTemplateModel.NAME];
- String value = initParam[CreateFilterTemplateModel.VALUE];
- String description = initParam[CreateFilterTemplateModel.DESCRIPTION];
-%>
- @WebInitParam(name = "<%= name %>", value = "<%= value %>"
-<%
- if (description != null && description.length() > 0) {
-%>, description = "<%= description %>"
-<%
- }
-%>)
-<%
- needComma2 = true;
- }
-%>
- }
-<%
- } else if (key.equals(CreateFilterTemplateModel.ATT_DISPATCHER_TYPES)) {
- List<String> dispatcherTypes = (List<String>) params.get(key);
- boolean needComma2 = false;
- boolean needNewLine2 = dispatcherTypes.size() > 1;
- if (dispatcherTypes.size()>0){
- %><%= key %> = {<%
- }
- for (String dispType : dispatcherTypes) {
- if (needComma2) {
-%>,
-<%
- }
-
- if (needNewLine2) {
-%>
-
-<%
- }
-%><%= dispType %>
-<%
- needComma2 = true;
- }
-
- if (needNewLine2) {
-%>
-
-<%
- } else {
-%>
-<%
- }
- %>}
- <%
- }
- needComma = true;
- }
-%>)
-<%
- }
- }
-%>
\ No newline at end of file
diff --git a/plugins/org.eclipse.jst.j2ee.web/templates/listener.javajet b/plugins/org.eclipse.jst.j2ee.web/templates/listener.javajet
deleted file mode 100644
index 1cc8510..0000000
--- a/plugins/org.eclipse.jst.j2ee.web/templates/listener.javajet
+++ /dev/null
@@ -1,14 +0,0 @@
-<%@ jet package="org.eclipse.jst.j2ee.internal.web.operations"
- imports="java.util.* org.eclipse.jst.j2ee.internal.common.operations.*"
- class="ListenerTemplate"
-%>
-<% CreateListenerTemplateModel model = (CreateListenerTemplateModel) argument; %>
-<%@ include file="_flags.template" %>
-<%@ include file="_package.template" %>
-<%@ include file="_imports.template" %>
-<%@ include file="listener_classHeader.template" %>
-<%@ include file="_class.template" %>
-<%@ include file="_constructors.template" %>
-<%@ include file="_methods.template" %>
-
-}
diff --git a/plugins/org.eclipse.jst.j2ee.web/templates/listener_classHeader.template b/plugins/org.eclipse.jst.j2ee.web/templates/listener_classHeader.template
deleted file mode 100644
index 73ff422..0000000
--- a/plugins/org.eclipse.jst.j2ee.web/templates/listener_classHeader.template
+++ /dev/null
@@ -1,18 +0,0 @@
-/**
- * Application Lifecycle Listener implementation class <%= model.getClassName() %>
- *
-<%
- if (model.isAnnotated()) {
-%>
- * @web.listener
-<%
- }
-%>
- */
- <%
- if ("3.0".equals(model.getJavaEEVersion())) {
-%>
-@WebListener
-<%
-}
-%>
\ No newline at end of file
diff --git a/plugins/org.eclipse.jst.j2ee.web/templates/servlet.javajet b/plugins/org.eclipse.jst.j2ee.web/templates/servlet.javajet
deleted file mode 100644
index 3f8f6f5..0000000
--- a/plugins/org.eclipse.jst.j2ee.web/templates/servlet.javajet
+++ /dev/null
@@ -1,140 +0,0 @@
-<%@ jet package="org.eclipse.jst.j2ee.internal.web.operations"
- imports="java.util.* org.eclipse.jst.j2ee.internal.common.operations.*"
- class="ServletTemplate"
-%>
-<% CreateServletTemplateModel model = (CreateServletTemplateModel) argument; %>
-<%@ include file="_flags.template" %>
-<%@ include file="_package.template" %>
-<%@ include file="_imports.template" %>
-<%@ include file="servlet_classHeader.template" %>
-<%@ include file="_class.template" %>
-<%
- if (model.isGenericServletSuperclass()) {
-%>
- private static final long serialVersionUID = 1L;
-<%
- }
-%>
-<%@ include file="_constructors.template" %>
-<%@ include file="_methods.template" %>
-<% if (model.shouldGenInit()) { %>
-
- /**
- * @see Servlet#init(ServletConfig)
- */
- public void init(ServletConfig config) throws ServletException {
- // TODO Auto-generated method stub
- }
-<% } %>
-<% if (model.shouldGenDestroy()) { %>
-
- /**
- * @see Servlet#destroy()
- */
- public void destroy() {
- // TODO Auto-generated method stub
- }
-<% } %>
-<% if (model.shouldGenGetServletConfig()) { %>
-
- /**
- * @see Servlet#getServletConfig()
- */
- public ServletConfig getServletConfig() {
- // TODO Auto-generated method stub
- return null;
- }
-<% } %>
-<% if (model.shouldGenGetServletInfo()) { %>
-
- /**
- * @see Servlet#getServletInfo()
- */
- public String getServletInfo() {
- // TODO Auto-generated method stub
- return null;
- }
-<% } %>
-<% if (model.shouldGenService() && !model.isHttpServletSuperclass()) { %>
-
- /**
- * @see Servlet#service(ServletRequest request, ServletResponse response)
- */
- public void service(ServletRequest request, ServletResponse response) throws ServletException, IOException {
- // TODO Auto-generated method stub
- }
-<% } %>
-<% if (model.shouldGenService() && model.isHttpServletSuperclass()) { %>
-
- /**
- * @see HttpServlet#service(HttpServletRequest request, HttpServletResponse response)
- */
- protected void service(HttpServletRequest request, HttpServletResponse response) throws ServletException, IOException {
- // TODO Auto-generated method stub
- }
-<% } %>
-<% if (model.shouldGenDoGet()) { %>
-
- /**
- * @see HttpServlet#doGet(HttpServletRequest request, HttpServletResponse response)
- */
- protected void doGet(HttpServletRequest request, HttpServletResponse response) throws ServletException, IOException {
- // TODO Auto-generated method stub
- }
-<% } %>
-<% if (model.shouldGenDoPost()) { %>
-
- /**
- * @see HttpServlet#doPost(HttpServletRequest request, HttpServletResponse response)
- */
- protected void doPost(HttpServletRequest request, HttpServletResponse response) throws ServletException, IOException {
- // TODO Auto-generated method stub
- }
-<% } %>
-<% if (model.shouldGenDoPut()) { %>
-
- /**
- * @see HttpServlet#doPut(HttpServletRequest, HttpServletResponse)
- */
- protected void doPut(HttpServletRequest request, HttpServletResponse response) throws ServletException, IOException {
- // TODO Auto-generated method stub
- }
-<% } %>
-<% if (model.shouldGenDoDelete()) { %>
-
- /**
- * @see HttpServlet#doDelete(HttpServletRequest, HttpServletResponse)
- */
- protected void doDelete(HttpServletRequest request, HttpServletResponse response) throws ServletException, IOException {
- // TODO Auto-generated method stub
- }
-<% } %>
-<% if (model.shouldGenDoHead()) { %>
-
- /**
- * @see HttpServlet#doHead(HttpServletRequest, HttpServletResponse)
- */
- protected void doHead(HttpServletRequest request, HttpServletResponse response) throws ServletException, IOException {
- // TODO Auto-generated method stub
- }
-<% } %>
-<% if (model.shouldGenDoOptions()) { %>
-
- /**
- * @see HttpServlet#doOptions(HttpServletRequest, HttpServletResponse)
- */
- protected void doOptions(HttpServletRequest request, HttpServletResponse response) throws ServletException, IOException {
- // TODO Auto-generated method stub
- }
-<% } %>
-<% if (model.shouldGenDoTrace()) { %>
-
- /**
- * @see HttpServlet#doTrace(HttpServletRequest, HttpServletResponse)
- */
- protected void doTrace(HttpServletRequest request, HttpServletResponse response) throws ServletException, IOException {
- // TODO Auto-generated method stub
- }
-<% } %>
-
-}
diff --git a/plugins/org.eclipse.jst.j2ee.web/templates/servlet_classHeader.template b/plugins/org.eclipse.jst.j2ee.web/templates/servlet_classHeader.template
deleted file mode 100644
index 936eab4..0000000
--- a/plugins/org.eclipse.jst.j2ee.web/templates/servlet_classHeader.template
+++ /dev/null
@@ -1,169 +0,0 @@
-/**
- * Servlet implementation class <%= model.getClassName() %>
-<%
- if (model.isAnnotated()) {
-%>
- *
- * @web.servlet
- * name="<%= model.getServletName() %>"
- * display-name="<%= model.getServletName() %>"
-<%
- if (model.getDescription() != null && model.getDescription().length() > 0) {
-%>
- * description="<%= model.getDescription() %>"
-<%
- }
-
- List<String[]> mappings = model.getServletMappings();
- if (mappings != null && mappings.size() > 0) {
- for (int i = 0; i < mappings.size(); i++) {
- String map = model.getServletMapping(i); %>
- *
- * @web.servlet-mapping
- * url-pattern="<%= map %>"
-<%
- }
- }
- List<String[]> initParams = model.getInitParams();
- if (initParams != null && initParams.size() > 0) {
- for (int i = 0; i < initParams.size(); i++) {
- String name = model.getInitParam(i, CreateServletTemplateModel.NAME);
- String value = model.getInitParam(i, CreateServletTemplateModel.VALUE);
- String description = model.getInitParam(i, CreateServletTemplateModel.DESCRIPTION);
-%>
- *
- * @web.servlet-init-param
- * name="<%= name %>"
- * value="<%= value %>"
-<%
- if (description != null && description.length() > 0) {
-%>
- * description="<%= description %>"
-<%
- }
- }
- }
- }
-%>
- */
-<%
- if ("3.0".equals(model.getJavaEEVersion())) {
-%>
-@WebServlet
-<%
- Map<String, Object> params = model.getClassAnnotationParams();
- if (params.size() == 1 && params.containsKey(CreateServletTemplateModel.ATT_URL_PATTERNS)) {
- List<String[]> mappings = (List<String[]>) params.get(CreateServletTemplateModel.ATT_URL_PATTERNS);
- if (mappings.size() == 1) {
- String value = mappings.get(0)[0];
-%>("<%= value %>")
-<%
- } else {
-%>({
-<%
- boolean needComma = false;
- for (String[] mapping : mappings) {
- if (needComma) {
-%>,
-<%
- }
-%>"<%= mapping[0] %>"
-<%
- needComma = true;
- }
-%> })
-<%
- }
- } else if (!params.isEmpty()) {
-%>(
-<%
- Set<String> keys = params.keySet();
- boolean needNewLine = keys.contains(CreateServletTemplateModel.ATT_INIT_PARAMS) ||
- (keys.contains(CreateServletTemplateModel.ATT_URL_PATTERNS) &&
- ((List<String[]>) params.get(CreateServletTemplateModel.ATT_URL_PATTERNS)).size() > 1);
- boolean needComma = false;
- for (String key : keys) {
- if (needComma) {
-%>,
-<%
- }
-
- if (needNewLine) {
-%>
-
-<%
- }
-
- if (key.equals(CreateServletTemplateModel.ATT_NAME) || key.equals(CreateServletTemplateModel.ATT_DESCRIPTION)) {
- String value = (String) params.get(key);
-%><%= key %> = "<%= value %>"
-<%
- } else if (key.equals(CreateServletTemplateModel.ATT_URL_PATTERNS)) {
-%><%= key %> = {
-<%
- List<String[]> mappings = (List<String[]>) params.get(key);
- boolean needComma2 = false;
- boolean needNewLine2 = mappings.size() > 1;
- for (String[] mapping : mappings) {
- if (needComma2) {
-%>,
-<%
- }
-
- if (needNewLine2) {
-%>
-
-<%
- }
-%>"<%= mapping[0] %>"
-<%
- needComma2 = true;
- }
-
- if (needNewLine2) {
-%>
-
-<%
- } else {
-%>
-<%
- }
-%>}
-<%
- } else if (key.equals(CreateServletTemplateModel.ATT_INIT_PARAMS)) {
-%><%= key %> = {
-<%
- List<String[]> initParams = (List<String[]>) params.get(key);
- boolean needComma2 = false;
- for (String[] initParam : initParams) {
- if (needComma2) {
-%>,
-<%
- }
-
- String name = initParam[CreateServletTemplateModel.NAME];
- String value = initParam[CreateServletTemplateModel.VALUE];
- String description = initParam[CreateServletTemplateModel.DESCRIPTION];
-%>
- @WebInitParam(name = "<%= name %>", value = "<%= value %>"
-<%
- if (description != null && description.length() > 0) {
-%>, description = "<%= description %>"
-<%
- }
-%>)
-<%
- needComma2 = true;
- }
-%>
- }
-<%
- }
-
- needComma = true;
- }
-%>)
-<%
- }
- }
-%>
\ No newline at end of file
diff --git a/plugins/org.eclipse.jst.j2ee.web/war-validation/org/eclipse/jst/j2ee/internal/web/validation/UIWarHelper.java b/plugins/org.eclipse.jst.j2ee.web/war-validation/org/eclipse/jst/j2ee/internal/web/validation/UIWarHelper.java
deleted file mode 100644
index e533818..0000000
--- a/plugins/org.eclipse.jst.j2ee.web/war-validation/org/eclipse/jst/j2ee/internal/web/validation/UIWarHelper.java
+++ /dev/null
@@ -1,26 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2003, 2006 IBM Corporation and others.
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
- *
- * Contributors:
- * IBM Corporation - initial API and implementation
- *******************************************************************************/
-package org.eclipse.jst.j2ee.internal.web.validation;
-
-/**
- * Insert the type's description here. Creation date: (10/2/2001 7:06:43 PM)
- *
- * @author: Administrator
- */
-public class UIWarHelper extends WarHelper {
-
- /**
- * UIWarHelper constructor comment.
- */
- public UIWarHelper() {
- super();
- }
-}
diff --git a/plugins/org.eclipse.jst.j2ee.web/war-validation/org/eclipse/jst/j2ee/internal/web/validation/UIWarValidator.java b/plugins/org.eclipse.jst.j2ee.web/war-validation/org/eclipse/jst/j2ee/internal/web/validation/UIWarValidator.java
deleted file mode 100644
index d66db9f..0000000
--- a/plugins/org.eclipse.jst.j2ee.web/war-validation/org/eclipse/jst/j2ee/internal/web/validation/UIWarValidator.java
+++ /dev/null
@@ -1,285 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2003, 2007 IBM Corporation and others.
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
- *
- * Contributors:
- * IBM Corporation - initial API and implementation
- *******************************************************************************/
-package org.eclipse.jst.j2ee.internal.web.validation;
-
-
-
-import java.util.HashMap;
-import java.util.HashSet;
-import java.util.Map;
-import java.util.Set;
-
-import org.eclipse.core.resources.IFile;
-import org.eclipse.core.resources.IProject;
-import org.eclipse.core.resources.IResource;
-import org.eclipse.core.runtime.CoreException;
-import org.eclipse.core.runtime.IPath;
-import org.eclipse.core.runtime.IStatus;
-import org.eclipse.core.runtime.Path;
-import org.eclipse.core.runtime.jobs.ISchedulingRule;
-import org.eclipse.jst.j2ee.classpathdep.ClasspathDependencyUtil;
-import org.eclipse.jst.j2ee.componentcore.J2EEModuleVirtualComponent;
-import org.eclipse.jst.j2ee.internal.J2EEConstants;
-import org.eclipse.jst.j2ee.internal.plugin.IJ2EEModuleConstants;
-import org.eclipse.jst.j2ee.model.internal.validation.WarValidator;
-import org.eclipse.jst.j2ee.project.JavaEEProjectUtilities;
-import org.eclipse.jst.j2ee.project.WebUtilities;
-import org.eclipse.jst.j2ee.web.componentcore.util.WebArtifactEdit;
-import org.eclipse.wst.common.componentcore.ComponentCore;
-import org.eclipse.wst.common.componentcore.internal.resources.VirtualArchiveComponent;
-import org.eclipse.wst.common.componentcore.resources.IVirtualComponent;
-import org.eclipse.wst.common.componentcore.resources.IVirtualFile;
-import org.eclipse.wst.common.componentcore.resources.IVirtualFolder;
-import org.eclipse.wst.common.componentcore.resources.IVirtualReference;
-import org.eclipse.wst.common.componentcore.resources.IVirtualResource;
-import org.eclipse.wst.validation.internal.core.Message;
-import org.eclipse.wst.validation.internal.core.ValidationException;
-import org.eclipse.wst.validation.internal.operations.IWorkbenchContext;
-import org.eclipse.wst.validation.internal.provisional.core.IMessage;
-import org.eclipse.wst.validation.internal.provisional.core.IReporter;
-import org.eclipse.wst.validation.internal.provisional.core.IValidationContext;
-
-
-/**
- * Insert the type's description here. Creation date: (10/2/2001 6:46:56 PM)
- *
- * @author: Administrator
- */
-public class UIWarValidator extends WarValidator {
-
- protected org.eclipse.jst.j2ee.internal.web.validation.UIWarHelper warHelper;
-
-
-
-
- /**
- * UIWarValidator constructor comment.
- */
- public UIWarValidator() {
- super();
- }
-
- /**
- * Insert the method's description here. Creation date: (10/2/2001 8:01:45 PM)
- *
- * @return org.eclipse.wst.validation.internal.core.core.war.workbenchimpl.UIWarHelper
- */
- public org.eclipse.jst.j2ee.internal.web.validation.UIWarHelper getWarHelper() {
- return warHelper;
- }
-
- /**
- * Insert the method's description here. Creation date: (10/2/2001 8:01:45 PM)
- *
- * @param newWarHelper
- * org.eclipse.wst.validation.internal.core.core.war.workbenchimpl.UIWarHelper
- */
- public void setWarHelper(org.eclipse.jst.j2ee.internal.web.validation.UIWarHelper newWarHelper) {
- warHelper = newWarHelper;
- }
-
- /**
- * Insert the method's description here. Creation date: (10/2/2001 6:49:26 PM)
- */
- @Override
- public void validate() throws ValidationException {
- // First remove all previous msg. for this project
- // _reporter.removeAllMessages(this,null);
- super.validate();
- validateEARForContextRoot();
- }
-
- /**
- * Insert the method's description here. Creation date: (10/2/2001 6:49:26 PM)
- */
- @Override
- public IStatus validateInJob(IValidationContext inHelper, IReporter inReporter)
- throws org.eclipse.wst.validation.internal.core.ValidationException {
-
- setWarHelper((UIWarHelper) inHelper);
- IProject proj = ((IWorkbenchContext) warHelper).getProject();
- IVirtualComponent wbModule = ComponentCore.createComponent(proj);
- if( wbModule != null && JavaEEProjectUtilities.isDynamicWebProject(proj)) {
- IVirtualFile webFile = wbModule.getRootFolder().getFile(J2EEConstants.WEBAPP_DD_URI);
- if( webFile.exists()) {
- status = super.validateInJob(inHelper, inReporter);
- validateWebInfLibs(wbModule);
- }
- }
- return status;
- }
-
- /*
- * For web projects, need to validate that the classpath component dependencies (both
- * from this project's classpath and from the exported classpath entries of referenced
- * utility projects) do not conflict.
- */
- private void validateWebInfLibs(final IVirtualComponent component) {
-
- final Set webLibMappings = new HashSet();
-
- // get the libs currently in the WEB-INF/lib folder
- final IVirtualFolder folder = component.getRootFolder().getFolder(WebArtifactEdit.WEBLIB);
- try {
- IVirtualResource[] resources = folder.members();
- for (int i = 0; i < resources.length; i++) {
- if (resources[i] instanceof IVirtualFile) {
- IResource[] underlyingResources = resources[i].getUnderlyingResources();
- for (int j = 0; j < underlyingResources.length; j++) {
- webLibMappings.add(underlyingResources[j].getName());
- }
- }
- }
- } catch (CoreException ce) {
- // swallow
- }
- final Map archiveToPath = new HashMap();
- final IVirtualReference[] webLibs = WebUtilities.getLibModules(component);
- for (int i = 0; i < webLibs.length; i++) {
- IVirtualComponent comp = webLibs[i].getReferencedComponent();
- String name = null;
- if (comp.isBinary()) {
- java.io.File diskFile = (java.io.File)comp.getAdapter(java.io.File.class);
- checkLibName(diskFile.getName(), null, webLibMappings, true);
- } else {
- String archiveName = webLibs[i].getArchiveName();
- if (archiveName != null && archiveName.length() > 0) {
- name = archiveName;
- } else {
- name = comp.getName() + IJ2EEModuleConstants.JAR_EXT;
- }
- checkLibName(name, comp.getProject(), webLibMappings, true);
- if (comp instanceof J2EEModuleVirtualComponent) {
- final IVirtualReference[] cpRefs = ((J2EEModuleVirtualComponent) comp).getJavaClasspathReferences();
- for (int j = 0; j < cpRefs.length; j++) {
- final IVirtualReference ref = cpRefs[j];
- if (ref.getReferencedComponent() instanceof VirtualArchiveComponent) {
- final String cpCompName = ref.getArchiveName();
- checkLibName(cpCompName, comp.getProject(), webLibMappings, false);
- IPath cpEntryPath= ClasspathDependencyUtil.getClasspathVirtualReferenceLocation(ref);
- if (cpEntryPath != null) {
- IPath existingPath = (IPath) archiveToPath.get(cpCompName);
- if (existingPath != null && !existingPath.equals(cpEntryPath)) {
- _reporter.addMessage(this, new Message(getBaseName(), IMessage.HIGH_SEVERITY, ERROR_DUPLICATE_CLASSPATH_COMPONENT_URI, new String[]{cpCompName, comp.getProject().getName()}));
- } else {
- archiveToPath.put(cpCompName, cpEntryPath);
- }
- }
- }
- }
- }
- }
- }
- }
-
- private void checkLibName(final String name, final IProject project, final Set webLibNames, final boolean addName) {
- if (webLibNames.contains(name)) {
- if (project != null) {
- //ignore this because of WAR import brings in the lib jars along with projects
- //_reporter.addMessage(this, new Message(getBaseName(), IMessage.HIGH_SEVERITY, ERROR_DUPLICATE_WEB_INF_LIB_OTHER_PROJECT, new String[]{name, project.getName()}));
- } else {
- _reporter.addMessage(this, new Message(getBaseName(), IMessage.HIGH_SEVERITY, ERROR_DUPLICATE_WEB_INF_LIB, new String[]{name}));
- }
- } else if (addName) {
- webLibNames.add(name);
- }
- }
-
- /**
- * Insert the method's description here. Creation date: (10/2/2001 6:49:26 PM)
- */
- public void validateEARForContextRoot() {
-
-// IProject project = getWarHelper().getProject();
-// J2EEWebNatureRuntime webNature = J2EEWebNatureRuntime.getRuntime(project);
-// String contextRoot = webNature.getContextRoot();
-//
-// if (webNature == null)
-// return;
-//
-// EARNatureRuntime earRuntimeNature[] = webNature.getReferencingEARProjects();
-
-// for (int i = 0; i < earRuntimeNature.length; i++) {
-// // for each Ear Project that contains this web project update the context root.
-// // hold the model and validate the context root & release the model
-// org.eclipse.jst.j2ee.internal.earcreation.EAREditModel editModel = null;
-// try {
-// editModel = earRuntimeNature[i].getEarEditModelForRead(this);
-// if (editModel != null) {
-// Module module = null;
-// if ((module = earRuntimeNature[i].getModule(project)) != null) {
-// String webModcontextRoot = ((WebModule) module).getContextRoot();
-// if (webModcontextRoot != null && !webModcontextRoot.equals(contextRoot)) {
-// String[] params = new String[3];
-// params[0] = project.getName();
-// params[1] = ((WebModule) module).getContextRoot();
-// params[2] = earRuntimeNature[i].getProject().getName();
-// addError(WAR_CATEGORY, ERROR_EAR_INVALID_CONTEXT_ROOT, params);
-// }
-// }
-// }
-// } finally {
-// if (editModel != null) {
-// editModel.releaseAccess(this);
-// editModel = null;
-// }
-// }
-//
-// }
-
- }
-
- /**
- * Method validateLibModules.
- *
- *
- */
-
- //TODO create validation for modules
-/* protected void validateLibModules(J2EEWebNatureRuntime webNature) {
- if (webNature != null) {
- ILibModule[] libModules = webNature.getLibModules();
- IProject project = webNature.getProject();
-
- for (int i = 0; i < libModules.length; i++) {
- ILibModule lib = libModules[i];
- IProject tProject = lib.getProject();
- if (tProject != null) { // Project could be null if JavaProject is deleted, for
- // example
- if (!tProject.exists() || !tProject.isOpen()) {
- addWarning(WAR_CATEGORY, MESSAGE_WAR_VALIDATION_MISSING_WLP_PROJECT, new String[]{tProject.getName()}, webNature.getProject());
- }
- }
-
- String jarName = lib.getJarName();
- IPath jarPath = webNature.getLibraryFolder().getFullPath().append(jarName);
- if (((Resource) project).findExistingResourceVariant(jarPath) != null)
- addWarning(WAR_CATEGORY, MESSAGE_WAR_VALIDATION_CONFLICTING_WLP_PROJECT, new String[]{jarName}, webNature.getProject());
- }
- }
- }*/
-
- @Override
- public ISchedulingRule getSchedulingRule(IValidationContext helper) {
-
- IProject project = ((IWorkbenchContext) helper).getProject();
- IVirtualComponent comp = ComponentCore.createComponent( project );
- IFile webDeploymentDescriptor = null;
- if( comp != null ){
- IVirtualFile vf = comp.getRootFolder().getFile(new Path(J2EEConstants.WEBAPP_DD_URI));
- if( vf!= null ){
- webDeploymentDescriptor = vf.getUnderlyingFile();
- }
- }
- return webDeploymentDescriptor;
- }
-
-}
diff --git a/plugins/org.eclipse.jst.j2ee.web/war-validation/org/eclipse/jst/j2ee/internal/web/validation/WarHelper.java b/plugins/org.eclipse.jst.j2ee.web/war-validation/org/eclipse/jst/j2ee/internal/web/validation/WarHelper.java
deleted file mode 100644
index e3e8fbc..0000000
--- a/plugins/org.eclipse.jst.j2ee.web/war-validation/org/eclipse/jst/j2ee/internal/web/validation/WarHelper.java
+++ /dev/null
@@ -1,142 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2003, 2006 IBM Corporation and others.
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
- *
- * Contributors:
- * IBM Corporation - initial API and implementation
- *******************************************************************************/
-package org.eclipse.jst.j2ee.internal.web.validation;
-
-
-
-import java.util.Hashtable;
-
-import org.eclipse.core.resources.IFile;
-import org.eclipse.core.resources.IResource;
-import org.eclipse.core.runtime.IPath;
-import org.eclipse.emf.ecore.EObject;
-import org.eclipse.jst.j2ee.commonarchivecore.internal.WARFile;
-import org.eclipse.jst.j2ee.commonarchivecore.internal.exception.OpenFailureException;
-import org.eclipse.jst.j2ee.internal.J2EEConstants;
-import org.eclipse.jst.j2ee.internal.validation.J2EEValidationHelper;
-import org.eclipse.jst.j2ee.internal.web.plugin.WebPlugin;
-import org.eclipse.jst.j2ee.model.internal.validation.WARMessageConstants;
-import org.eclipse.jst.j2ee.web.componentcore.util.WebArtifactEdit;
-import org.eclipse.wst.common.componentcore.ArtifactEdit;
-import org.eclipse.wst.common.componentcore.ComponentCore;
-import org.eclipse.wst.common.componentcore.internal.util.ComponentUtilities;
-import org.eclipse.wst.common.componentcore.resources.IVirtualComponent;
-import org.eclipse.wst.validation.internal.operations.WorkbenchReporter;
-
-
-
-public class WarHelper extends J2EEValidationHelper {
- Hashtable warFileMap = new Hashtable();
- ArtifactEdit edit = null;
- WARFile warFile = null;
- final static String HelperID = "org.eclipse.wst.validation.internal.core.war.workbenchimpl.WarHelper"; //$NON-NLS-1$
-
-
- /**
- * WarHelper constructor comment.
- */
-
- public WarHelper() {
- super();
-
- registerModel(WARMessageConstants.WAR_MODEL_NAME, "loadWarFile"); //$NON-NLS-1$
- }
-
- /**
- * This method will be invoked indirectly from the WarValidator (via. the WorkbenchReporter). It
- * will expect the coming object to be a EObject for the node who generated this message. Note:
- * This methods may need to be implemented higher up in the class stack.
- */
- @Override
- public int getLineNo(Object object) {
-
-
- if (object instanceof Integer) { // Error discovered using the XML parser
- return ((Integer) object).intValue();
- }
-
- return super.getLineNo(object);
- }
-
- /**
- * Given a resource, return its non-eclipse-specific location. If this resource, or type of
- * resource, isn't handled by this helper, return null.
- */
- @Override
- public String getPortableName(IResource resource) {
- if (!(resource instanceof IFile)) {
- return null;
- }
-
- IPath resourcePath = resource.getFullPath();
- if (resourcePath != null)
- return resourcePath.toString();
-
- return null;
- }
-
- /**
- * Similar to the getFile() method, we know that we are talking about web.xml, but need a unique
- * ID.
- *
- * @return java.lang.String
- * @param object
- * Object
- */
- @Override
- public String getTargetObjectName(Object object) {
-
- if( object != null && object instanceof WARFile ){
- return J2EEConstants.WEBAPP_ID;
- }
- return null;
-// String ret = null;
-// if (object != null) {
-// IFile warFile = (IFile) warFileMap.get(getProject().toString());// validator framework
-// // will call getFile()
-// // first.
-// if (warFile != null) {
-// ret = (warFile.toString() + HelperID);
-// }
-// }
-// return ret;
- }
-
-
- public EObject loadWarFile() {
- IVirtualComponent comp = ComponentCore.createComponent(getProject());
- edit = ComponentUtilities.getArtifactEditForRead(comp);
-
- if (edit != null)
- {
- try {
- warFile = (WARFile)((WebArtifactEdit) edit).asArchive(false, true, true);
- return warFile;
- } catch (OpenFailureException e1) {
- WebPlugin.logError(e1);
- }
- }
- return null;
- }
-
- @Override
- public void cleanup(WorkbenchReporter reporter) {
- if (edit != null) {
- edit.dispose();
- edit = null;
- }
- if(warFile != null){
- warFile.close();
- warFile = null;
- }
- super.cleanup(reporter);
- }
-}
diff --git a/plugins/org.eclipse.jst.j2ee.web/web/org/eclipse/jst/j2ee/internal/web/deployables/ModuleAdapter.java b/plugins/org.eclipse.jst.j2ee.web/web/org/eclipse/jst/j2ee/internal/web/deployables/ModuleAdapter.java
deleted file mode 100644
index 4dc14e2..0000000
--- a/plugins/org.eclipse.jst.j2ee.web/web/org/eclipse/jst/j2ee/internal/web/deployables/ModuleAdapter.java
+++ /dev/null
@@ -1,33 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2005 IBM Corporation and others.
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
- *
- * Contributors:
- * IBM Corporation - initial API and implementation
- *******************************************************************************/
-/*
- * Created on Feb 8, 2005
- */
-package org.eclipse.jst.j2ee.internal.web.deployables;
-
-import org.eclipse.emf.common.notify.impl.AdapterImpl;
-import org.eclipse.jst.j2ee.internal.deployables.J2EEFlexProjDeployable;
-
-/**
- * @author blancett
- */
-public class ModuleAdapter extends AdapterImpl {
-
- J2EEFlexProjDeployable delegate;
-
- public void setModuleDelegate(J2EEFlexProjDeployable moduleDelegate) {
- delegate = moduleDelegate;
- }
-
- public J2EEFlexProjDeployable getDelegate() {
- return delegate;
- }
-}
diff --git a/plugins/org.eclipse.jst.j2ee.web/web/org/eclipse/jst/j2ee/internal/web/deployables/WebDeployableArtifactUtil.java b/plugins/org.eclipse.jst.j2ee.web/web/org/eclipse/jst/j2ee/internal/web/deployables/WebDeployableArtifactUtil.java
deleted file mode 100644
index 1646bc1..0000000
--- a/plugins/org.eclipse.jst.j2ee.web/web/org/eclipse/jst/j2ee/internal/web/deployables/WebDeployableArtifactUtil.java
+++ /dev/null
@@ -1,367 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2003, 2006 IBM Corporation and others.
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
- *
- * Contributors:
- * IBM Corporation - initial API and implementation
- *******************************************************************************/
-package org.eclipse.jst.j2ee.internal.web.deployables;
-
-import java.util.Iterator;
-import java.util.List;
-
-import org.eclipse.core.resources.IProject;
-import org.eclipse.core.resources.IResource;
-import org.eclipse.core.runtime.IAdaptable;
-import org.eclipse.core.runtime.IPath;
-import org.eclipse.core.runtime.NullProgressMonitor;
-import org.eclipse.core.runtime.Path;
-import org.eclipse.emf.ecore.EObject;
-import org.eclipse.emf.ecore.resource.Resource;
-import org.eclipse.jdt.core.IClasspathEntry;
-import org.eclipse.jdt.core.ICompilationUnit;
-import org.eclipse.jdt.core.IJavaElement;
-import org.eclipse.jdt.core.IJavaProject;
-import org.eclipse.jdt.core.IType;
-import org.eclipse.jdt.core.ITypeHierarchy;
-import org.eclipse.jdt.core.JavaCore;
-import org.eclipse.jem.util.emf.workbench.ProjectUtilities;
-import org.eclipse.jst.j2ee.internal.web.jfaces.extension.FileURL;
-import org.eclipse.jst.j2ee.internal.web.jfaces.extension.FileURLExtensionReader;
-import org.eclipse.jst.j2ee.internal.web.plugin.WebPlugin;
-import org.eclipse.jst.j2ee.project.JavaEEProjectUtilities;
-import org.eclipse.jst.j2ee.project.facet.IJ2EEFacetConstants;
-import org.eclipse.jst.j2ee.web.componentcore.util.WebArtifactEdit;
-import org.eclipse.jst.j2ee.webapplication.JSPType;
-import org.eclipse.jst.j2ee.webapplication.Servlet;
-import org.eclipse.jst.j2ee.webapplication.ServletMapping;
-import org.eclipse.jst.j2ee.webapplication.ServletType;
-import org.eclipse.jst.j2ee.webapplication.WebApp;
-import org.eclipse.jst.j2ee.webapplication.WebType;
-import org.eclipse.wst.common.componentcore.ComponentCore;
-import org.eclipse.wst.common.componentcore.resources.IVirtualComponent;
-import org.eclipse.wst.common.componentcore.resources.IVirtualResource;
-import org.eclipse.wst.common.internal.emfworkbench.WorkbenchResourceHelper;
-import org.eclipse.wst.server.core.IModule;
-import org.eclipse.wst.server.core.IModuleArtifact;
-import org.eclipse.wst.server.core.ServerUtil;
-import org.eclipse.wst.server.core.util.WebResource;
-
-/**
- * @version 1.0
- * @author
- */
-public class WebDeployableArtifactUtil {
-
- private final static String GENERIC_SERVLET_CLASS_TYPE = "javax.servlet.GenericServlet"; //$NON-NLS-1$
- private final static String CACTUS_SERVLET_CLASS_TYPE = "org.apache.cactus.server.ServletTestRedirector"; //$NON-NLS-1$
-
- public WebDeployableArtifactUtil() {
- super();
- }
-
- public static IModuleArtifact getModuleObject(Object obj) {
- IResource resource = null;
- if (obj instanceof IResource)
- resource = (IResource) obj;
- if (obj instanceof IModuleArtifact)
- resource = ((IModuleArtifact) obj).getModule().getProject();
- else if (obj instanceof IAdaptable)
- resource = (IResource) ((IAdaptable) obj).getAdapter(IResource.class);
- else if (obj instanceof EObject) {
- resource = ProjectUtilities.getProject((EObject) obj);
- if (obj instanceof Servlet) {
- Servlet servlet = ((Servlet) obj);
- Resource servResource = servlet.eResource();
- IVirtualResource[] resources = null;
- try {
- IResource eclipeServResoruce = WorkbenchResourceHelper.getFile(servResource);
- resources = ComponentCore.createResources(eclipeServResoruce);
- } catch (Exception e) {
- WebPlugin.logError(e);
- }
- IVirtualComponent component = null;
- if (resources != null && resources[0] != null)
- component = resources[0].getComponent();
- String mapping = null;
- java.util.List mappings = ((Servlet) obj).getMappings();
- if (mappings != null && !mappings.isEmpty()) {
- ServletMapping map = (ServletMapping) mappings.get(0);
- mapping = map.getUrlPattern();
- }
- if (mapping != null) {
- return new WebResource(getModule(resource.getProject(), component), new Path(mapping));
- }
- WebType webType = ((Servlet) obj).getWebType();
- if (webType == null) {
- return null;
- } else if (webType.isJspType()) {
- if (component != null) {
- IPath jspFilePath = new Path(((JSPType) webType).getJspFile());
- resource = component.getRootFolder().getUnderlyingFolder().getFile(jspFilePath);
- }
- } else if (webType.isServletType()) {
- return new WebResource(getModule(resource.getProject(), component), new Path("servlet/" + ((ServletType) webType).getClassName())); //$NON-NLS-1$
- }
- }
- }
- if (resource == null)
- return null;
-
- if (resource instanceof IProject) {
- IProject project = (IProject) resource;
- if (hasInterestedComponents(project))
- return new WebResource(getModule(project, null), project.getProjectRelativePath());
- }
-
- if (!hasInterestedComponents(resource.getProject()))
- return null;
- if (isCactusJunitTest(resource))
- return null;
-
- IPath resourcePath = resource.getFullPath();
- IVirtualResource[] resources = ComponentCore.createResources(resource);
- IVirtualComponent component = null;
- if (resources.length <= 0 || resources[0] == null )
- return null;
- component = resources[0].getComponent();
- String className = getServletClassName(resource);
- if (className != null && component != null) {
- String mapping = getServletMapping(resource, true, className, component.getName());
- if (mapping != null) {
- return new WebResource(getModule(resource.getProject(), component), new Path(mapping));
- }
- // if there is no servlet mapping, provide direct access to the servlet
- // through the fully qualified class name
- return new WebResource(getModule(resource.getProject(), component), new Path("servlet/" + className)); //$NON-NLS-1$
-
- }
- if (className == null && component != null) {
- WebArtifactEdit webEdit = null;
- try {
- webEdit = WebArtifactEdit.getWebArtifactEditForRead(component);
- List servlets = webEdit.getWebApp().getServlets();
- for (int i=0; i<servlets.size(); i++) {
- Servlet servlet = (Servlet) servlets.get(i);
- WebType type = servlet.getWebType();
- if (type.isJspType()) {
- JSPType jsp = (JSPType)type;
- IPath rootPath = component.getRootFolder().getProjectRelativePath();
- IPath jspPath = resource.getProjectRelativePath().removeFirstSegments(rootPath.segmentCount());
- if (jsp.getJspFile().equals(jspPath.makeAbsolute().toString())) {
- List mappings = servlet.getMappings();
- String mapping = null;
- if (mappings != null && !mappings.isEmpty()) {
- ServletMapping map = (ServletMapping) mappings.get(0);
- mapping = map.getUrlPattern();
- if (mapping != null)
- return new WebResource(getModule(resource.getProject(), component), new Path(mapping));
- }
- }
- }
- }
- } finally {
- if (webEdit != null)
- webEdit.dispose();
- }
- }
- resourcePath = resources[0].getRuntimePath();
-
- // Extension read to get the correct URL for Java Server Faces file if
- // the jsp is of type jsfaces.
- FileURL jspURL = FileURLExtensionReader.getInstance().getFilesURL();
- if (jspURL != null) {
- IPath correctJSPPath = jspURL.getFileURL(resource, resourcePath);
- if (correctJSPPath != null && correctJSPPath.toString().length() > 0)
- return new WebResource(getModule(resource.getProject(), component), correctJSPPath);
- }
- // return Web resource type
-
- return new WebResource(getModule(resource.getProject(), component), resourcePath);
- }
-
- protected static IModule getModule(IProject project, IVirtualComponent component) {
- String componentName = null;
- if (component != null)
- componentName = component.getName();
-
- // check for jst.web modules first
- IModule[] modules = ServerUtil.getModules(IJ2EEFacetConstants.DYNAMIC_WEB);
- for (IModule module : modules) {
- if ((project == null || project.equals(module.getProject()))
- && (componentName == null || componentName.equals(module.getName())))
- return module;
- }
-
- // otherwise fall back to other types of web modules on the project
- if (project != null) {
- modules = ServerUtil.getModules(project);
- for (IModule module : modules) {
- if (componentName == null || componentName.equals(module.getName()))
- return module;
- }
- }
- return null;
- }
-
- /**
- * @deprecated - see getModule() for better logic for finding a project's IModule
- */
- protected static IModule getModuleProject(IProject project, Iterator iterator) {
- IModule deployable = null;
- while (iterator.hasNext()) {
- Object next = iterator.next();
- if (next instanceof IModule) {
- deployable = (IModule) next;
- if (deployable.getProject().equals(project))
- return deployable;
- }
- }
- return null;
- }
-
- /**
- *
- * Very temporary api - TODO - rip this out by 1.0
- */
- private static boolean isCactusJunitTest(IResource resource) {
- return getClassNameForType(resource, CACTUS_SERVLET_CLASS_TYPE) != null;
- }
-
-
-
- private static IType[] getTypes(IJavaElement element) {
- try {
- if (element.getElementType() != IJavaElement.COMPILATION_UNIT)
- return null;
-
- return ((ICompilationUnit) element).getAllTypes();
- } catch (Exception e) {
- return null;
- }
- }
-
- public static String getServletClassName(IResource resource) {
- return getClassNameForType(resource, GENERIC_SERVLET_CLASS_TYPE);
- }
-
- public static String getClassNameForType(IResource resource, String superType) {
- if (resource == null)
- return null;
-
- try {
- IProject project = resource.getProject();
- IPath path = resource.getFullPath();
- if (!project.hasNature(JavaCore.NATURE_ID) || path == null)
- return null;
-
- IJavaProject javaProject = (IJavaProject) project.getNature(JavaCore.NATURE_ID);
- if (!javaProject.isOpen())
- javaProject.open(new NullProgressMonitor());
-
- // output location may not be on classpath
- IPath outputPath = javaProject.getOutputLocation();
- if (outputPath != null && "class".equals(path.getFileExtension()) && outputPath.isPrefixOf(path)) { //$NON-NLS-1$
- int count = outputPath.segmentCount();
- path = path.removeFirstSegments(count);
- }
-
- // remove initial part of classpath
- IClasspathEntry[] classPathEntry = javaProject.getResolvedClasspath(true);
- if (classPathEntry != null) {
- int size = classPathEntry.length;
- for (int i = 0; i < size; i++) {
- IPath classPath = classPathEntry[i].getPath();
- if (classPath.isPrefixOf(path)) {
- int count = classPath.segmentCount();
- path = path.removeFirstSegments(count);
- i += size;
- }
- }
- }
-
- // get java element
- IJavaElement javaElement = javaProject.findElement(path);
-
- IType[] types = getTypes(javaElement);
- if (types != null) {
- int size2 = types.length;
- for (int i = 0; i < size2; i++) {
- if (hasSuperclass(types[i], superType))
- return types[i].getFullyQualifiedName();
- }
- }
- return null;
- } catch (Exception e) {
- return null;
- }
- }
-
- public static boolean hasSuperclass(IType type, String superClassName) {
- try {
- ITypeHierarchy hierarchy = type.newSupertypeHierarchy(null);
- IType[] superClasses = hierarchy.getAllSuperclasses(type);
-
- int size = superClasses.length;
- for (int i = 0; i < size; i++) {
- if (superClassName.equals(superClasses[i].getFullyQualifiedName()))
- return true;
- }
- return false;
- } catch (Exception e) {
- return false;
- }
- }
-
- public static String getServletMapping(IResource resource, boolean isServlet, String typeName, String componentName) {
- if (typeName == null || typeName.equals("")) //$NON-NLS-1$
- return null;
-
- IProject project = resource.getProject();
- WebArtifactEdit edit = null;
- WebApp webApp = null;
- try {
- edit = WebArtifactEdit.getWebArtifactEditForRead(project);
- edit.getDeploymentDescriptorRoot();
- webApp = edit.getWebApp();
- if (webApp == null)
- return null;
- Iterator iterator = webApp.getServlets().iterator();
- while (iterator.hasNext()) {
- Servlet servlet = (Servlet) iterator.next();
- boolean valid = false;
-
- WebType webType = servlet.getWebType();
- if (webType.isServletType() && isServlet) {
- ServletType type = (ServletType) webType;
- if (typeName.equals(type.getClassName()))
- valid = true;
- } else if (webType.isJspType() && !isServlet) {
- JSPType type = (JSPType) webType;
- if (typeName.equals(type.getJspFile()))
- valid = true;
- }
- if (valid) {
- java.util.List mappings = servlet.getMappings();
- if (mappings != null && !mappings.isEmpty()) {
- ServletMapping map = (ServletMapping) mappings.get(0);
- return map.getUrlPattern();
- }
- }
- }
- return null;
- } finally {
- if (edit != null) {
- edit.dispose();
- }
- }
- }
-
- protected static boolean hasInterestedComponents(IProject project) {
- return JavaEEProjectUtilities.isDynamicWebProject(project);
- }
-
-}
diff --git a/plugins/org.eclipse.jst.j2ee.web/web/org/eclipse/jst/j2ee/internal/web/deployables/WebModuleArtifact.java b/plugins/org.eclipse.jst.j2ee.web/web/org/eclipse/jst/j2ee/internal/web/deployables/WebModuleArtifact.java
deleted file mode 100644
index 80d9381..0000000
--- a/plugins/org.eclipse.jst.j2ee.web/web/org/eclipse/jst/j2ee/internal/web/deployables/WebModuleArtifact.java
+++ /dev/null
@@ -1,21 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2005 IBM Corporation and others.
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
- *
- * Contributors:
- * IBM Corporation - initial API and implementation
- *******************************************************************************/
-/*
- * Created on Feb 21, 2005
- */
-package org.eclipse.jst.j2ee.internal.web.deployables;
-
-/**
- * Key Class for adapter manager
- */
-public class WebModuleArtifact {
-
-}
diff --git a/plugins/org.eclipse.jst.j2ee.web/web/org/eclipse/jst/j2ee/internal/web/jfaces/extension/FileURL.java b/plugins/org.eclipse.jst.j2ee.web/web/org/eclipse/jst/j2ee/internal/web/jfaces/extension/FileURL.java
deleted file mode 100644
index 325dcb7..0000000
--- a/plugins/org.eclipse.jst.j2ee.web/web/org/eclipse/jst/j2ee/internal/web/jfaces/extension/FileURL.java
+++ /dev/null
@@ -1,30 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2003, 2004 IBM Corporation and others.
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
- *
- * Contributors:
- * IBM Corporation - initial API and implementation
- *******************************************************************************/
-/*
- * Created on Jun 13, 2004
- */
-package org.eclipse.jst.j2ee.internal.web.jfaces.extension;
-
-import org.eclipse.core.resources.IResource;
-import org.eclipse.core.runtime.IPath;
-
-
-/**
- * @author vijayb
- */
-public interface FileURL {
-
- /**
- * @return The existingURL if no suitable extender is found, else the
- * path corresponding to the passed in resource.
- */
- public IPath getFileURL(IResource resource, IPath existingURL);
-}
\ No newline at end of file
diff --git a/plugins/org.eclipse.jst.j2ee.web/web/org/eclipse/jst/j2ee/internal/web/jfaces/extension/FileURLExtension.java b/plugins/org.eclipse.jst.j2ee.web/web/org/eclipse/jst/j2ee/internal/web/jfaces/extension/FileURLExtension.java
deleted file mode 100644
index 05575af..0000000
--- a/plugins/org.eclipse.jst.j2ee.web/web/org/eclipse/jst/j2ee/internal/web/jfaces/extension/FileURLExtension.java
+++ /dev/null
@@ -1,77 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2003, 2005 IBM Corporation and others.
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
- *
- * Contributors:
- * IBM Corporation - initial API and implementation
- *******************************************************************************/
-/*
- * Created on Jun 13, 2004
- */
-package org.eclipse.jst.j2ee.internal.web.jfaces.extension;
-
-import org.eclipse.core.runtime.IConfigurationElement;
-import org.eclipse.jst.j2ee.internal.web.plugin.WebPlugin;
-
-/**
- * @author vijayb
- */
-public class FileURLExtension {
- private String id = null;
- private FileURL instance;
- private boolean errorCondition = false;
- private IConfigurationElement element;
- public static final String FILE_URL_EXTENSION = "fileURL"; //$NON-NLS-1$
- public static final String RUN = "run"; //$NON-NLS-1$
- public static final String ATT_ID = "id"; //$NON-NLS-1$
- public static final String ATT_CLASS = "class"; //$NON-NLS-1$
-
-
- /**
- *
- */
- public FileURLExtension() {
- super();
- }
-
- public FileURL getInstance() {
- try {
- if (this.instance == null && !this.errorCondition)
- this.instance = (FileURL) this.element.createExecutableExtension("run"); //$NON-NLS-1$
- } catch (Throwable e) {
- WebPlugin.logError(e);
- this.errorCondition = true;
- }
- return this.instance;
- }
-
- public FileURLExtension(IConfigurationElement element) {
- if (!FILE_URL_EXTENSION.equals(element.getName()))
- throw new IllegalArgumentException("Extensions must be of the type \"" + FILE_URL_EXTENSION + "\"."); //$NON-NLS-1$ //$NON-NLS-2$
- this.element = element;
- init();
- }
-
- private void init() {
- this.id = this.element.getAttribute(ATT_ID);
-
- }
-
- /**
- * @return Returns the id.
- */
- public String getId() {
- return this.id;
- }
-
- /**
- * @param id
- * The id to set.
- */
- public void setId(String id) {
- this.id = id;
- }
-}
diff --git a/plugins/org.eclipse.jst.j2ee.web/web/org/eclipse/jst/j2ee/internal/web/jfaces/extension/FileURLExtensionReader.java b/plugins/org.eclipse.jst.j2ee.web/web/org/eclipse/jst/j2ee/internal/web/jfaces/extension/FileURLExtensionReader.java
deleted file mode 100644
index ac29b3b..0000000
--- a/plugins/org.eclipse.jst.j2ee.web/web/org/eclipse/jst/j2ee/internal/web/jfaces/extension/FileURLExtensionReader.java
+++ /dev/null
@@ -1,148 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2003, 2005 IBM Corporation and others.
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
- *
- * Contributors:
- * IBM Corporation - initial API and implementation
- *******************************************************************************/
-/*
- * Created on Jun 13, 2004
- */
-package org.eclipse.jst.j2ee.internal.web.jfaces.extension;
-
-import java.util.ArrayList;
-import java.util.Iterator;
-import java.util.List;
-
-import org.eclipse.core.resources.IResource;
-import org.eclipse.core.runtime.IConfigurationElement;
-import org.eclipse.core.runtime.IPath;
-import org.eclipse.wst.common.core.util.RegistryReader;
-import org.eclipse.jst.j2ee.internal.web.plugin.WebPlugin;
-
-/**
- * @author vijayb
- *
- * This class loads all the extensions that define the correct URL string for the Java Server Faces
- * file
- *
- *
- */
-public class FileURLExtensionReader extends RegistryReader {
- static FileURLExtensionReader instance = null;
- protected List fileURLExtensions;
-
- /**
- * @param registry
- * @param pluginID
- * @param extensionPoint
- */
- public FileURLExtensionReader() {
- super(WebPlugin.PLUGIN_ID, "fileURL"); //$NON-NLS-1$
- }
-
-
- /*
- * (non-Javadoc)
- *
- * @see org.eclipse.wst.common.frameworks.internal.RegistryReader#readElement(org.eclipse.core.runtime.IConfigurationElement)
- */
- @Override
- public boolean readElement(IConfigurationElement element) {
- if (FileURLExtension.FILE_URL_EXTENSION.equals(element.getName())) {
- addExtension(element);
- return true;
- }
- return false;
- }
-
- /**
- * Sets the extension point.
- *
- * @param extensions
- * The extensions to set
- */
- protected void addExtension(IConfigurationElement newExtension) {
- getFileURLExtensions().add(new FileURLExtension(newExtension));
- }
-
- /**
- * Sets the extension point.
- *
- * @param extensions
- * The extensions to set
- */
- protected void addExtensionPoint(FileURLExtensionReader newExtension) {
- if (this.fileURLExtensions == null)
- this.fileURLExtensions = new ArrayList();
- this.fileURLExtensions.add(newExtension);
- }
-
- /**
- * @return the appropriate handler for the project based on priorities of those which are
- * available and enabled
- */
- public FileURL getFilesURL() {
- FileURLExtension fileURLExt;
- ArrayList<FileURL> fileUrlList = new ArrayList<FileURL>();
- FileURL currentURL = null;
- for (Iterator fileURLExtItr = getFileURLExtensions().iterator(); fileURLExtItr.hasNext();) {
- fileURLExt = (FileURLExtension) fileURLExtItr.next();
- currentURL = fileURLExt.getInstance();
- if (currentURL != null)
- fileUrlList.add(currentURL);
- }
- if (fileUrlList.size() == 1)
- return fileUrlList.get(0);
- return new FileURLWrapper(fileUrlList);
- }
-
-
-
- private class FileURLWrapper implements FileURL {
- ArrayList<FileURL> myUrlList = new ArrayList<FileURL>();
- public FileURLWrapper(ArrayList<FileURL> newUrlList)
- {
- myUrlList = newUrlList;
- }
- public IPath getFileURL(IResource resource, IPath existingURL) {
- IPath retVal = existingURL;
- for (FileURL fileUrl: myUrlList){
- retVal = fileUrl.getFileURL(resource, existingURL);
- if (retVal != existingURL && retVal != null)
- {
- return retVal;
- }
- }
- return retVal;
- }
- }
-
-
- /**
- * Gets the instance.
- *
- * @return Returns a FileURLExtensionReader
- */
- public static FileURLExtensionReader getInstance() {
- if (instance == null) {
- instance = new FileURLExtensionReader();
- instance.readRegistry();
- }
- return instance;
- }
-
- /**
- * @return Returns the handlerExtensions.
- */
- protected List getFileURLExtensions() {
- if (this.fileURLExtensions == null)
- this.fileURLExtensions = new ArrayList();
- return this.fileURLExtensions;
- }
-
-
-}
diff --git a/plugins/org.eclipse.jst.j2ee.web/web/org/eclipse/jst/j2ee/internal/web/operations/AbstractSupertypesValidator.java b/plugins/org.eclipse.jst.j2ee.web/web/org/eclipse/jst/j2ee/internal/web/operations/AbstractSupertypesValidator.java
deleted file mode 100644
index 6f1cce4..0000000
--- a/plugins/org.eclipse.jst.j2ee.web/web/org/eclipse/jst/j2ee/internal/web/operations/AbstractSupertypesValidator.java
+++ /dev/null
@@ -1,87 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2007, 2008 SAP AG and others.
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
- *
- * Contributors:
- * Kaloyan Raev, kaloyan.raev@sap.com - initial API and implementation
- *******************************************************************************/
-package org.eclipse.jst.j2ee.internal.web.operations;
-
-import static org.eclipse.jst.j2ee.internal.common.operations.INewJavaClassDataModelProperties.INTERFACES;
-import static org.eclipse.jst.j2ee.internal.common.operations.INewJavaClassDataModelProperties.PROJECT;
-import static org.eclipse.jst.j2ee.internal.common.operations.INewJavaClassDataModelProperties.SUPERCLASS;
-
-import java.util.List;
-
-import org.eclipse.core.resources.IProject;
-import org.eclipse.jdt.core.IJavaProject;
-import org.eclipse.jdt.core.IType;
-import org.eclipse.jdt.core.ITypeHierarchy;
-import org.eclipse.jdt.core.JavaCore;
-import org.eclipse.jdt.core.JavaModelException;
-import org.eclipse.jst.j2ee.internal.web.plugin.WebPlugin;
-import org.eclipse.wst.common.frameworks.datamodel.IDataModel;
-
-public class AbstractSupertypesValidator {
-
- private static ITypeHierarchy typeHierarchyCache = null;
-
- protected static String getSuperclass(IDataModel dataModel) {
- return dataModel.getStringProperty(SUPERCLASS);
- }
-
- protected static List getInterfaces(IDataModel dataModel) {
- return (List) dataModel.getProperty(INTERFACES);
- }
-
- protected static IJavaProject getJavaProject(IDataModel dataModel) {
- return JavaCore.create((IProject) dataModel.getProperty(PROJECT));
- }
-
- protected static boolean hasSuperclass(IDataModel dataModel,
- String typeName, String superTypeName) {
- try {
- IType type = getJavaProject(dataModel).findType(typeName);
- if (type != null) {
- ITypeHierarchy typeHierarchy = getTypeHierarchy(type);
- for (IType superType : typeHierarchy.getAllSuperclasses(type)) {
- if (superTypeName.equals(superType.getFullyQualifiedName()))
- return true;
- }
- }
- } catch (JavaModelException e) {
- WebPlugin.log(e);
- }
-
- return false;
- }
-
- protected static boolean hasSuperInterface(IDataModel dataModel,
- String typeName, String superTypeName) {
- try {
- IType type = getJavaProject(dataModel).findType(typeName);
- if (type != null) {
- ITypeHierarchy typeHierarchy = getTypeHierarchy(type);
- for (IType superType : typeHierarchy.getAllSuperInterfaces(type)) {
- if (superTypeName.equals(superType.getFullyQualifiedName()))
- return true;
- }
- }
- } catch (JavaModelException e) {
- WebPlugin.log(e);
- }
-
- return false;
- }
-
- private static ITypeHierarchy getTypeHierarchy(IType type) throws JavaModelException {
- if (typeHierarchyCache == null || !type.equals(typeHierarchyCache.getType())) {
- typeHierarchyCache = type.newTypeHierarchy(null);
- }
- return typeHierarchyCache;
- }
-
-}
diff --git a/plugins/org.eclipse.jst.j2ee.web/web/org/eclipse/jst/j2ee/internal/web/operations/AddFilterOperation.java b/plugins/org.eclipse.jst.j2ee.web/web/org/eclipse/jst/j2ee/internal/web/operations/AddFilterOperation.java
deleted file mode 100644
index 54f99cb..0000000
--- a/plugins/org.eclipse.jst.j2ee.web/web/org/eclipse/jst/j2ee/internal/web/operations/AddFilterOperation.java
+++ /dev/null
@@ -1,351 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2007, 2008 SAP AG and others.
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
- *
- * Contributors:
- * Kaloyan Raev, kaloyan.raev@sap.com - initial API and implementation
- *******************************************************************************/
-package org.eclipse.jst.j2ee.internal.web.operations;
-
-import static org.eclipse.jst.j2ee.internal.web.operations.INewFilterClassDataModelProperties.FILTER_MAPPINGS;
-import static org.eclipse.jst.j2ee.internal.web.operations.INewFilterClassDataModelProperties.INIT_PARAM;
-import static org.eclipse.jst.j2ee.internal.web.operations.INewWebClassDataModelProperties.DESCRIPTION;
-import static org.eclipse.jst.j2ee.internal.web.operations.INewWebClassDataModelProperties.DISPLAY_NAME;
-
-import java.util.List;
-
-import org.eclipse.emf.common.util.EList;
-import org.eclipse.jst.j2ee.common.CommonFactory;
-import org.eclipse.jst.j2ee.common.Description;
-import org.eclipse.jst.j2ee.common.ParamValue;
-import org.eclipse.jst.j2ee.internal.J2EEVersionConstants;
-import org.eclipse.jst.j2ee.internal.common.operations.NewJavaEEArtifactClassOperation;
-import org.eclipse.jst.j2ee.webapplication.DispatcherType;
-import org.eclipse.jst.j2ee.webapplication.Filter;
-import org.eclipse.jst.j2ee.webapplication.FilterMapping;
-import org.eclipse.jst.j2ee.webapplication.InitParam;
-import org.eclipse.jst.j2ee.webapplication.Servlet;
-import org.eclipse.jst.j2ee.webapplication.WebApp;
-import org.eclipse.jst.j2ee.webapplication.WebapplicationFactory;
-import org.eclipse.jst.javaee.core.DisplayName;
-import org.eclipse.jst.javaee.core.JavaeeFactory;
-import org.eclipse.jst.javaee.core.UrlPatternType;
-import org.eclipse.jst.javaee.web.WebFactory;
-import org.eclipse.wst.common.componentcore.internal.operation.ArtifactEditProviderOperation;
-import org.eclipse.wst.common.frameworks.datamodel.IDataModel;
-
-/**
- * This class, AddFilter Operation is a IDataModelOperation following the
- * IDataModel wizard and operation framework.
- *
- * @see org.eclipse.wst.common.frameworks.datamodel.IDataModelOperation
- * @see org.eclipse.wst.common.frameworks.datamodel.IDataModelProvider
- *
- * This operation subclasses the ArtifactEditProviderOperation so the changes
- * made to the deployment descriptor models are saved to the artifact edit
- * model.
- * @see org.eclipse.wst.common.componentcore.internal.operation.ArtifactEditProviderOperation
- *
- * It is the operation which should be used when adding a new filter to a web
- * app. This uses the NewFilterClassDataModelProvider to retrieve properties set by the
- * user in order to create the custom filter.
- * @see org.eclipse.jst.j2ee.internal.web.operations.NewFilterClassDataModelProvider
- *
- * This operation will add the metadata necessary into the web deployment descriptor.
- * To actually create the java class for the filter, the operation uses the NewFilterClassOperation.
- * The NewFilterClassOperation shares the same data model provider.
- * @see org.eclipse.jst.j2ee.internal.web.operations.NewFilterClassOperation
- *
- * Clients may subclass this operation to provide their own behavior on filter
- * creation. The execute method can be extended to do so. Also,
- * generateFilterMetaData and creteFilterClass are exposed.
- *
- * The use of this class is EXPERIMENTAL and is subject to substantial changes.
- */
-public class AddFilterOperation extends AddWebClassOperation {
-
- /**
- * This is the constructor which should be used when creating the operation.
- * It will not accept null parameter. It will not return null.
- *
- * @see ArtifactEditProviderOperation#ArtifactEditProviderOperation(IDataModel)
- *
- * @param dataModel
- * @return AddFilterOperation
- */
- public AddFilterOperation(IDataModel dataModel) {
- super(dataModel);
- }
-
- @Override
- protected NewJavaEEArtifactClassOperation getNewClassOperation() {
- return new NewFilterClassOperation(getDataModel());
- }
-
- /**
- * Subclasses may extend this method to add their own generation steps for
- * the creation of the metadata for the web deployment descriptor. This
- * implementation uses the J2EE models to create the Filter model instance,
- * any init params specified, and any filter mappings. It then adds these
- * to the web application model. This will then be written out to the
- * deployment descriptor file. This method does not accept null parameters.
- *
- * @see Filter
- * @see AddFilterOperation#createFilter(String)
- * @see AddFilterOperation#setUpInitParams(List, Filter)
- * @see AddFilterOperation#setUpURLMappings(List, Filter)
- *
- * @param aModel
- * @param qualifiedClassName
- */
- @Override
- protected void generateMetaData(IDataModel aModel, String qualifiedClassName) {
- // Set up the filter modelled object
- Object filter = createFilter(qualifiedClassName);
-
- // Set up the InitParams if any
- List initParamList =
- (List) aModel.getProperty(INIT_PARAM);
- if (initParamList != null)
- setUpInitParams(initParamList, filter);
-
- // Set up the filter mappings if any
- List filterMappingsList =
- (List) aModel.getProperty(FILTER_MAPPINGS);
-
- if (filterMappingsList != null && !filterMappingsList.isEmpty())
- setUpMappings(filterMappingsList, filter);
- }
-
- /**
- * This method is intended for private use only. This method is used to
- * create the filter modeled object, to set any parameters specified in
- * the data model, and then to add the filter instance to the web
- * application model. This method does not accept null parameters. It will
- * not return null.
- *
- * @see AddFilterOperation#generateFilterMetaData(NewFilterClassDataModel,
- * String)
- * @see WebapplicationFactory#createFilter()
- * @see Filter
- *
- * @param qualifiedClassName
- * @return Filter instance
- */
- /**
- * @param qualifiedClassName
- * @return
- */
- private Object createFilter(String qualifiedClassName) {
- // Get values from data model
- String displayName =
- model.getStringProperty(DISPLAY_NAME);
- String description =
- model.getStringProperty(DESCRIPTION);
-
- // Create the filter instance and set up the parameters from data model
- Object modelObject = provider.getModelObject(WEB_APP_XML_PATH);
- if (modelObject instanceof org.eclipse.jst.j2ee.webapplication.WebApp) {
- Filter filter = WebapplicationFactory.eINSTANCE.createFilter();
- filter.setName(displayName);
- filter.setDisplayName(displayName);
- filter.setDescription(description);
- filter.setFilterClassName(qualifiedClassName);
-
- // Add the filter to the web application model
- WebApp webApp = (WebApp) modelObject;
- webApp.getFilters().add(filter);
- return filter;
- } else if (modelObject instanceof org.eclipse.jst.javaee.web.WebApp) {
- org.eclipse.jst.javaee.web.WebApp webApp = (org.eclipse.jst.javaee.web.WebApp) modelObject;
- org.eclipse.jst.javaee.web.Filter filter = WebFactory.eINSTANCE.createFilter();
- DisplayName displayNameObj = JavaeeFactory.eINSTANCE.createDisplayName();
- displayNameObj.setValue(displayName);
- filter.getDisplayNames().add(displayNameObj);
- filter.setFilterName(displayName);
- filter.setFilterClass(qualifiedClassName);
- webApp.getFilters().add(filter);
- // Should be return Filter's instance
- return filter;
- }
- // Return the filter instance
- return null;
- }
-
- /**
- * This method is intended for internal use only. This is used to create any
- * init params for the new filter metadata. It will not accept null
- * parameters. The init params are set on the filter modeled object.
- *
- * @see AddFilterOperation#generateFilterMetaData(NewFilterClassDataModel,
- * String)
- * @see WebapplicationFactory#createInitParam()
- *
- * @param initParamList
- * @param filter
- */
- private void setUpInitParams(List initParamList, Object filterObj) {
- // Get the web app instance from the data model
- Object modelObject = provider.getModelObject();
- if (modelObject instanceof org.eclipse.jst.j2ee.webapplication.WebApp) {
- WebApp webApp = (WebApp) modelObject;
- Filter filter = (Filter) filterObj;
-
- // If J2EE 1.4, add the param value and description info instances
- // to the filter init params
- if (webApp.getJ2EEVersionID() >= J2EEVersionConstants.J2EE_1_4_ID) {
- for (int iP = 0; iP < initParamList.size(); iP++) {
- String[] stringArray = (String[]) initParamList.get(iP);
- // Create 1.4 common param value
- ParamValue param = CommonFactory.eINSTANCE.createParamValue();
- param.setName(stringArray[0]);
- param.setValue(stringArray[1]);
- // Create 1.4 common descripton value
- Description descriptionObj = CommonFactory.eINSTANCE.createDescription();
- descriptionObj.setValue(stringArray[2]);
- // Set the description on the param
- param.getDescriptions().add(descriptionObj);
- param.setDescription(stringArray[2]);
- // Set the param to the filter model list of init params
- filter.getInitParamValues().add(param);
- }
- }
- // If J2EE 1.2 or 1.3, use the filter specific init param instances
- else {
- for (int iP = 0; iP < initParamList.size(); iP++) {
- String[] stringArray = (String[]) initParamList.get(iP);
- // Create the web init param
- InitParam ip = WebapplicationFactory.eINSTANCE.createInitParam();
- // Set the param name
- ip.setParamName(stringArray[0]);
- // Set the param value
- ip.setParamValue(stringArray[1]);
- // Set the param description
- ip.setDescription(stringArray[2]);
- // Add the init param to the filter model list of params
- filter.getInitParams().add(ip);
- }
- }
- } else if (modelObject instanceof org.eclipse.jst.javaee.web.WebApp) {
- org.eclipse.jst.javaee.web.Filter filter = (org.eclipse.jst.javaee.web.Filter) filterObj;
-
- for (int iP = 0; iP < initParamList.size(); iP++) {
- String[] stringArray = (String[]) initParamList.get(iP);
- // Create 1.4 common param value
- org.eclipse.jst.javaee.core.ParamValue param =
- JavaeeFactory.eINSTANCE.createParamValue();
- param.setParamName(stringArray[0]);
- param.setParamValue(stringArray[1]);
-
- org.eclipse.jst.javaee.core.Description descriptionObj =
- JavaeeFactory.eINSTANCE.createDescription();
- descriptionObj.setValue(stringArray[2]);
- // Set the description on the param
- param.getDescriptions().add(descriptionObj);
- // Add the param to the filter model list of init params
- filter.getInitParams().add(param);
- }
- }
- }
-
- /**
- * This method is intended for internal use only. This method is used to
- * create the filter mapping modelled objects so the metadata for the
- * filter mappings is store in the web deployment descriptor. This method
- * will not accept null parameters. The filter mappings are added to the
- * web application modeled object.
- *
- * @see AddFilterOperation#generateFilterMetaData(NewFilterClassDataModel,
- * String)
- * @see WebapplicationFactory#createFilterMapping()
- *
- * @param urlMappingList
- * @param filter
- */
- private void setUpMappings(List filterMappingsList, Object filterObj) {
- // Get the web app modelled object from the data model
- // WebApp webApp = (WebApp) artifactEdit.getContentModelRoot();
- Object modelObject = provider.getModelObject(WEB_APP_XML_PATH);
-
- // Create the filter mappings if any
- if (modelObject instanceof org.eclipse.jst.j2ee.webapplication.WebApp) {
- WebApp webApp = (WebApp) modelObject;
- Filter filter = (Filter) filterObj;
- if (filterMappingsList != null)
- for (int iM = 0; iM < filterMappingsList.size(); iM++) {
- IFilterMappingItem filterMapping = (IFilterMappingItem) filterMappingsList.get(iM);
- // Create the filter mapping instance from the web factory
- FilterMapping mapping = WebapplicationFactory.eINSTANCE.createFilterMapping();
- // Set the filter
- mapping.setFilter(filter);
- if (filterMapping.isUrlPatternType()) {
- // Set the URL pattern to map the filter to
- mapping.setUrlPattern(filterMapping.getName());
- } else {
- // Set the Servlet Name to map the filter to
- Servlet servlet = webApp.getServletNamed(filterMapping.getName());
- mapping.setServlet(servlet);
- }
- //Set dispatcher options for the filter mapping if any.
- int dispatchers = filterMapping.getDispatchers();
- EList dispatcherTypes = mapping.getDispatcherType();
- if ((dispatchers & IFilterMappingItem.REQUEST) > 0) {
- dispatcherTypes.add(DispatcherType.REQUEST_LITERAL);
- }
- if ((dispatchers & IFilterMappingItem.FORWARD) > 0) {
- dispatcherTypes.add(DispatcherType.FORWARD_LITERAL);
- }
- if ((dispatchers & IFilterMappingItem.INCLUDE) > 0) {
- dispatcherTypes.add(DispatcherType.INCLUDE_LITERAL);
- }
- if ((dispatchers & IFilterMappingItem.ERROR) > 0) {
- dispatcherTypes.add(DispatcherType.ERROR_LITERAL);
- }
- // Add the filter mapping to the web application modelled list
- webApp.getFilterMappings().add(mapping);
- }
- } else if (modelObject instanceof org.eclipse.jst.javaee.web.WebApp) {
- org.eclipse.jst.javaee.web.WebApp webApp = (org.eclipse.jst.javaee.web.WebApp) modelObject;
- org.eclipse.jst.javaee.web.Filter filter = (org.eclipse.jst.javaee.web.Filter) filterObj;
-
- // Create the filter mapping instance from the web factory
- org.eclipse.jst.javaee.web.FilterMapping mapping = null;
- // Create the filter mappings if any
- if (filterMappingsList != null) {
- for (int i = 0; i < filterMappingsList.size(); i++) {
- mapping = WebFactory.eINSTANCE.createFilterMapping();
- mapping.setFilterName(filter.getFilterName());
- IFilterMappingItem filterMapping = (IFilterMappingItem) filterMappingsList.get(i);
- if (filterMapping.getMappingType() == IFilterMappingItem.URL_PATTERN) {
- // Set the URL pattern to map the filter to
- UrlPatternType url = JavaeeFactory.eINSTANCE.createUrlPatternType();
- url.setValue(filterMapping.getName());
- mapping.getUrlPatterns().add(url);
- } else {
- mapping.getServletNames().add(filterMapping.getName());
- }
- //Set dispatcher options for the filter mapping if any.
- int dispatchers = filterMapping.getDispatchers();
- if ((dispatchers & IFilterMappingItem.REQUEST) > 0) {
- mapping.getDispatchers().add(org.eclipse.jst.javaee.web.DispatcherType.REQUEST_LITERAL);
- }
- if ((dispatchers & IFilterMappingItem.FORWARD) > 0) {
- mapping.getDispatchers().add(org.eclipse.jst.javaee.web.DispatcherType.FORWARD_LITERAL);
- }
- if ((dispatchers & IFilterMappingItem.INCLUDE) > 0) {
- mapping.getDispatchers().add(org.eclipse.jst.javaee.web.DispatcherType.INCLUDE_LITERAL);
- }
- if ((dispatchers & IFilterMappingItem.ERROR) > 0) {
- mapping.getDispatchers().add(org.eclipse.jst.javaee.web.DispatcherType.ERROR_LITERAL);
- }
- // Add the filter mapping to the web application model list
- webApp.getFilterMappings().add(mapping);
- }
- }
- }
- }
-
-}
diff --git a/plugins/org.eclipse.jst.j2ee.web/web/org/eclipse/jst/j2ee/internal/web/operations/AddListenerOperation.java b/plugins/org.eclipse.jst.j2ee.web/web/org/eclipse/jst/j2ee/internal/web/operations/AddListenerOperation.java
deleted file mode 100644
index 54fec93..0000000
--- a/plugins/org.eclipse.jst.j2ee.web/web/org/eclipse/jst/j2ee/internal/web/operations/AddListenerOperation.java
+++ /dev/null
@@ -1,122 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2007, 2008 SAP AG and others.
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
- *
- * Contributors:
- * Kaloyan Raev, kaloyan.raev@sap.com - initial API and implementation
- *******************************************************************************/
-package org.eclipse.jst.j2ee.internal.web.operations;
-
-import org.eclipse.jst.j2ee.common.CommonFactory;
-import org.eclipse.jst.j2ee.common.Listener;
-import org.eclipse.jst.j2ee.internal.common.operations.NewJavaEEArtifactClassOperation;
-import org.eclipse.jst.j2ee.webapplication.WebApp;
-import org.eclipse.jst.javaee.core.JavaeeFactory;
-import org.eclipse.wst.common.componentcore.internal.operation.ArtifactEditProviderOperation;
-import org.eclipse.wst.common.frameworks.datamodel.IDataModel;
-
-/**
- * This class, AddListenerOperation is a IDataModelOperation following the IDataModel wizard and
- * operation framework.
- * @see org.eclipse.wst.common.frameworks.datamodel.IDataModelOperation
- * @see org.eclipse.wst.common.frameworks.datamodel.IDataModelProvider
- *
- * This operation subclasses the ArtifactEditProviderOperation so the changes made to the deployment descriptor
- * models are saved to the artifact edit model.
- * @see org.eclipse.wst.common.componentcore.internal.operation.ArtifactEditProviderOperation
- *
- * It is the operation which should be used when adding a new application lifecycle listener to
- * a web app, whether that be an annotated listener or a non annotated listener. This uses the
- * NewListenerClassDataModelProvider to retrieve properties set by the user in order to create the custom
- * listener class.
- * @see org.eclipse.jst.j2ee.internal.web.operations.NewListenerClassDataModelProvider
- *
- * In the non annotated case, this operation will add the metadata necessary into the web deployment
- * descriptor. In the annotated case, it will not, it will leave this up to the parsing of the
- * annotations to build the deployment descriptor artifacts. To actually create the java class for
- * the listener, the operation uses the NewListenerClassOperation. The NewListenerClassOperation
- * shares the same data model provider.
- * @see org.eclipse.jst.j2ee.internal.web.operations.NewListenerClassOperation
- *
- * Clients may subclass this operation to provide their own behavior on listener creation. The execute
- * method can be extended to do so. Also, generateListenerMetaData and creteListenerClass are exposed.
- *
- * The use of this class is EXPERIMENTAL and is subject to substantial changes.
- */
-public class AddListenerOperation extends AddWebClassOperation {
-
- /**
- * This is the constructor which should be used when creating the operation.
- * It will not accept null parameter. It will not return null.
- * @see ArtifactEditProviderOperation#ArtifactEditProviderOperation(IDataModel)
- *
- * @param dataModel
- * @return AddListenerOperation
- */
- public AddListenerOperation(IDataModel dataModel) {
- super(dataModel);
- }
-
- @Override
- protected NewJavaEEArtifactClassOperation getNewClassOperation() {
- return new NewListenerClassOperation(getDataModel());
- }
-
- /**
- * Subclasses may extend this method to add their own generation steps for the creation of the
- * metadata for the web deployment descriptor. This implementation uses the J2EE models to create
- * the Listener model instance. It then adds these to the web application model. This will then be
- * written out to the deployment descriptor file. This method does not accept null parameters.
- * @see Listener
- * @see AddListenerOperation#createListener(String)
- *
- * @param aModel
- * @param qualifiedClassName
- */
- @Override
- protected void generateMetaData(IDataModel aModel, String qualifiedClassName) {
- // Set up the listener modeled object
- createListener(qualifiedClassName);
- }
-
- /**
- * This method is intended for private use only. This method is used to create the listener
- * modeled object, to set any parameters specified in the data model, and then to add the
- * listener instance to the web application model. This method does not accept null parameters.
- * It will not return null.
- * @see AddListenerOperation#generateListenerMetaData(IDataModel, String)
- * @see CommonFactory#createListener()
- * @see Listener
- *
- * @param qualifiedClassName
- * @return Listener instance
- */
- private Object createListener(String qualifiedClassName) {
- Object modelObject = provider.getModelObject(WEB_APP_XML_PATH);
- if (modelObject instanceof org.eclipse.jst.j2ee.webapplication.WebApp ){
- // Create the listener instance and set up the parameters from data model
- Listener listener = CommonFactory.eINSTANCE.createListener();
- listener.setListenerClassName(qualifiedClassName);
-
- // Add the listener to the web application model
- WebApp webApp = (WebApp) modelObject;
- webApp.getListeners().add(listener);
- return listener;
- } else if (modelObject instanceof org.eclipse.jst.javaee.web.WebApp ){
- // Create the listener instance and set up the parameters from data model
- org.eclipse.jst.javaee.core.Listener listener = JavaeeFactory.eINSTANCE.createListener();
- listener.setListenerClass(qualifiedClassName);
-
- // Add the listener to the web application model
- org.eclipse.jst.javaee.web.WebApp webApp = (org.eclipse.jst.javaee.web.WebApp) modelObject;
- webApp.getListeners().add(listener);
- return listener;
- }
-
- return null;
- }
-
-}
diff --git a/plugins/org.eclipse.jst.j2ee.web/web/org/eclipse/jst/j2ee/internal/web/operations/AddServletOperation.java b/plugins/org.eclipse.jst.j2ee.web/web/org/eclipse/jst/j2ee/internal/web/operations/AddServletOperation.java
deleted file mode 100644
index d41b140..0000000
--- a/plugins/org.eclipse.jst.j2ee.web/web/org/eclipse/jst/j2ee/internal/web/operations/AddServletOperation.java
+++ /dev/null
@@ -1,329 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2003, 2008 IBM Corporation and others.
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
- *
- * Contributors:
- * IBM Corporation - initial API and implementation
- * Kaloyan Raev, kaloyan.raev@sap.com
- *******************************************************************************/
-package org.eclipse.jst.j2ee.internal.web.operations;
-
-import static org.eclipse.jst.j2ee.internal.web.operations.INewServletClassDataModelProperties.INIT_PARAM;
-import static org.eclipse.jst.j2ee.internal.web.operations.INewServletClassDataModelProperties.IS_SERVLET_TYPE;
-import static org.eclipse.jst.j2ee.internal.web.operations.INewServletClassDataModelProperties.URL_MAPPINGS;
-import static org.eclipse.jst.j2ee.internal.web.operations.INewWebClassDataModelProperties.DESCRIPTION;
-import static org.eclipse.jst.j2ee.internal.web.operations.INewWebClassDataModelProperties.DISPLAY_NAME;
-
-import java.util.List;
-
-import org.eclipse.jst.j2ee.common.CommonFactory;
-import org.eclipse.jst.j2ee.common.Description;
-import org.eclipse.jst.j2ee.common.ParamValue;
-import org.eclipse.jst.j2ee.internal.J2EEVersionConstants;
-import org.eclipse.jst.j2ee.internal.common.operations.NewJavaEEArtifactClassOperation;
-import org.eclipse.jst.j2ee.webapplication.InitParam;
-import org.eclipse.jst.j2ee.webapplication.JSPType;
-import org.eclipse.jst.j2ee.webapplication.Servlet;
-import org.eclipse.jst.j2ee.webapplication.ServletMapping;
-import org.eclipse.jst.j2ee.webapplication.ServletType;
-import org.eclipse.jst.j2ee.webapplication.WebApp;
-import org.eclipse.jst.j2ee.webapplication.WebapplicationFactory;
-import org.eclipse.jst.javaee.core.DisplayName;
-import org.eclipse.jst.javaee.core.JavaeeFactory;
-import org.eclipse.jst.javaee.core.UrlPatternType;
-import org.eclipse.jst.javaee.web.IWebCommon;
-import org.eclipse.jst.javaee.web.WebFactory;
-import org.eclipse.wst.common.componentcore.internal.operation.ArtifactEditProviderOperation;
-import org.eclipse.wst.common.frameworks.datamodel.IDataModel;
-
-/**
- * This class, AddServlet Operation is a IDataModelOperation following the IDataModel wizard and
- * operation framework.
- * @see org.eclipse.wst.common.frameworks.datamodel.IDataModelOperation
- * @see org.eclipse.wst.common.frameworks.datamodel.IDataModelProvider
- *
- * This operation subclasses the ArtifactEditProviderOperation so the changes made to the deployment descriptor
- * models are saved to the artifact edit model.
- * @see org.eclipse.wst.common.componentcore.internal.operation.ArtifactEditProviderOperation
- *
- * It is the operation which should be used when adding a new servlet to
- * a web app, whether that be an annotated servlet or a non annotated servlet. This uses the
- * NewServletClassDataModelProvider to retrieve properties set by the user in order to create the custom
- * servet.
- * @see org.eclipse.jst.j2ee.internal.web.operations.NewServletClassDataModelProvider
- *
- * In the non annotated case, this operation will add the metadata necessary into the web deployment
- * descriptor. In the annotated case, it will not, it will leave this up to the parsing of the
- * annotations to build the deployment descriptor artifacts. To actually create the java class for
- * the servlet, the operation uses the NewServletClassOperation. The NewServletClassOperation
- * shares the same data model provider.
- * @see org.eclipse.jst.j2ee.internal.web.operations.NewServletClassOperation
- *
- * Clients may subclass this operation to provide their own behaviour on servlet creation. The execute
- * method can be extended to do so. Also, generateServletMetaData and creteServletClass are exposed.
- *
- * The use of this class is EXPERIMENTAL and is subject to substantial changes.
- */
-public class AddServletOperation extends AddWebClassOperation {
-
- /**
- * This is the constructor which should be used when creating the operation.
- * It will not accept null parameter. It will not return null.
- * @see ArtifactEditProviderOperation#ArtifactEditProviderOperation(IDataModel)
- *
- * @param dataModel
- * @return AddServletOperation
- */
-
-
- public AddServletOperation(IDataModel dataModel) {
- super(dataModel);
- }
-
- @Override
- protected NewJavaEEArtifactClassOperation getNewClassOperation() {
- return new NewServletClassOperation(getDataModel());
- }
-
- @Override
- protected void generateMetaData(IDataModel model, String qualifiedClassName) {
- boolean isServletType = model.getBooleanProperty(IS_SERVLET_TYPE);
- generateMetaData(model, qualifiedClassName, isServletType);
- }
-
- /**
- * Subclasses may extend this method to add their own generation steps for the creation of the
- * metadata for the web deployment descriptor. This implementation uses the J2EE models to create
- * the Servlet model instance, any init params specified, and any servlet mappings. It then adds
- * these to the web application model. This will then be written out to the deployment descriptor
- * file. This method does not accept null parameters.
- * @see Servlet
- * @see AddServletOperation#createServlet(String, boolean)
- * @see AddServletOperation#setUpInitParams(List, Servlet)
- * @see AddServletOperation#setUpURLMappings(List, Servlet)
- *
- * @param aModel
- * @param qualifiedClassName
- * @param isServletType
- */
- protected void generateMetaData(IDataModel aModel, String qualifiedClassName, boolean isServletType) {
- // Set up the servlet modelled object
- Object servlet = createServlet(qualifiedClassName, isServletType);
-
- // Set up the InitParams if any
- List initParamList = (List) aModel.getProperty(INIT_PARAM);
- if (initParamList != null)
- setUpInitParams(initParamList, servlet);
-
- // Set up the servlet URL mappings if any
- List urlMappingList = (List) aModel.getProperty(URL_MAPPINGS);
- if (urlMappingList != null)
- setUpURLMappings(urlMappingList, servlet);
- }
-
- /**
- * This method is intended for private use only. This method is used to create the servlet
- * modelled object, to set any parameters specified in the data model, and then to add the
- * servlet instance to the web application model. This method does not accpet null parameters.
- * It will not return null.
- * @see AddServletOperation#generateServletMetaData(NewServletClassDataModel, String, boolean)
- * @see WebapplicationFactory#createServlet()
- * @see Servlet
- *
- * @param qualifiedClassName
- * @param isServletType
- * @return Servlet instance
- */
- private Object createServlet(String qualifiedClassName, boolean isServletType) {
- // Get values from data model
- String displayName = model.getStringProperty(DISPLAY_NAME);
- String description = model.getStringProperty(DESCRIPTION);
-
- // Create the servlet instance and set up the parameters from data model
- Object modelObject = provider.getModelObject(WEB_APP_XML_PATH);
- if (modelObject instanceof org.eclipse.jst.j2ee.webapplication.WebApp) {
-
- Servlet servlet = WebapplicationFactory.eINSTANCE.createServlet();
- servlet.setDisplayName(displayName);
- servlet.setServletName(displayName);
- servlet.setDescription(description);
- // Handle servlet case
- if (isServletType) {
- ServletType servletType = WebapplicationFactory.eINSTANCE.createServletType();
- servletType.setClassName(qualifiedClassName);
- servlet.setWebType(servletType);
- }
- // Handle JSP case
- else {
- JSPType jspType = WebapplicationFactory.eINSTANCE.createJSPType();
- jspType.setJspFile(qualifiedClassName);
- servlet.setWebType(jspType);
- }
- // Add the servlet to the web application model
-
- //WebApp webApp = (WebApp) artifactEdit.getContentModelRoot();
- WebApp webApp = (WebApp) modelObject;
- webApp.getServlets().add(servlet);
- return servlet;
- } else if (modelObject instanceof IWebCommon) {
-
- org.eclipse.jst.javaee.web.Servlet servlet = WebFactory.eINSTANCE.createServlet();
-
- DisplayName displayNameObj = JavaeeFactory.eINSTANCE.createDisplayName();
- displayNameObj.setValue(displayName);
- servlet.getDisplayNames().add(displayNameObj);
-
- servlet.setServletName(displayName);
-
- org.eclipse.jst.javaee.core.Description descriptionObj = JavaeeFactory.eINSTANCE.createDescription();
- descriptionObj.setValue(description);
- servlet.getDescriptions().add(descriptionObj);
-
- // Handle servlet case
- if (isServletType) {
- servlet.setServletClass(qualifiedClassName);
- }
- // Handle JSP case
- else {
- servlet.setJspFile(qualifiedClassName);
- }
- // Add the servlet to the web application model
-
- //WebApp webApp = (WebApp) artifactEdit.getContentModelRoot();
- IWebCommon webApp = (IWebCommon) modelObject;
- webApp.getServlets().add(servlet);
- return servlet;
- }
- // Return the servlet instance
- return null;
- }
-
- /**
- * This method is intended for internal use only. This is used to create any init params
- * for the new servlet metadata. It will not accept null parameters. The init params are
- * set on the servlet modelled object.
- * @see AddServletOperation#generateServletMetaData(NewServletClassDataModel, String, boolean)
- * @see WebapplicationFactory#createInitParam()
- *
- * @param initParamList
- * @param servlet
- */
- private void setUpInitParams(List initParamList, Object servletObj) {
- // Get the web app instance from the data model
- Object modelObject = provider.getModelObject();
- if (modelObject instanceof org.eclipse.jst.j2ee.webapplication.WebApp) {
- WebApp webApp = (WebApp) modelObject;
- Servlet servlet = (Servlet) servletObj;
-
- // If J2EE 1.4, add the param value and description info instances to the servlet init params
- if (webApp.getJ2EEVersionID() >= J2EEVersionConstants.J2EE_1_4_ID) {
- for (int iP = 0; iP < initParamList.size(); iP++) {
- String[] stringArray = (String[]) initParamList.get(iP);
- // Create 1.4 common param value
- ParamValue param = CommonFactory.eINSTANCE.createParamValue();
- param.setName(stringArray[0]);
- param.setValue(stringArray[1]);
- // Create 1.4 common descripton value
- Description descriptionObj = CommonFactory.eINSTANCE.createDescription();
- descriptionObj.setValue(stringArray[2]);
- // Set the description on the param
- param.getDescriptions().add(descriptionObj);
- param.setDescription(stringArray[2]);
- // Add the param to the servlet model list of init params
- servlet.getInitParams().add(param);
- }
- }
- // If J2EE 1.2 or 1.3, use the servlet specific init param instances
- else {
- for (int iP = 0; iP < initParamList.size(); iP++) {
- String[] stringArray = (String[]) initParamList.get(iP);
- // Create the web init param
- InitParam ip = WebapplicationFactory.eINSTANCE.createInitParam();
- // Set the param name
- ip.setParamName(stringArray[0]);
- // Set the param value
- ip.setParamValue(stringArray[1]);
- // Set the param description
- ip.setDescription(stringArray[2]);
- // Add the init param to the servlet model list of params
- servlet.getParams().add(ip);
- }
- }
- } else if (modelObject instanceof org.eclipse.jst.javaee.web.WebApp) {
- org.eclipse.jst.javaee.web.Servlet servlet = (org.eclipse.jst.javaee.web.Servlet) servletObj;
-
- for (int iP = 0; iP < initParamList.size(); iP++) {
- String[] stringArray = (String[]) initParamList.get(iP);
- // Create 1.4 common param value
- org.eclipse.jst.javaee.core.ParamValue param= JavaeeFactory.eINSTANCE.createParamValue();
- param.setParamName(stringArray[0]);
- param.setParamValue(stringArray[1]);
-
- org.eclipse.jst.javaee.core.Description descriptionObj = JavaeeFactory.eINSTANCE.createDescription();
- descriptionObj.setValue(stringArray[2]);
- // Set the description on the param
- param.getDescriptions().add(descriptionObj);
- // Add the param to the servlet model list of init params
- servlet.getInitParams().add(param);
- }
- }
- }
-
- /**
- * This method is intended for internal use only. This method is used to create the servlet
- * mapping modelled objects so the metadata for the servlet mappings is store in the web
- * deployment descriptor. This method will not accept null parameters. The servlet mappings
- * are added to the web application modelled object.
- * @see AddServletOperation#generateServletMetaData(NewServletClassDataModel, String, boolean)
- * @see WebapplicationFactory#createServletMapping()
- *
- * @param urlMappingList
- * @param servlet
- */
- private void setUpURLMappings(List urlMappingList, Object servletObj) {
- // Get the web app modelled object from the data model
- //WebApp webApp = (WebApp) artifactEdit.getContentModelRoot();
- Object modelObject = provider.getModelObject(WEB_APP_XML_PATH);
- // Create the servlet mappings if any
- if (modelObject instanceof org.eclipse.jst.j2ee.webapplication.WebApp) {
- WebApp webApp = (WebApp) modelObject;
- Servlet servlet = (Servlet) servletObj;
- for (int iM = 0; iM < urlMappingList.size(); iM++) {
- String[] stringArray = (String[]) urlMappingList.get(iM);
- // Create the servlet mapping instance from the web factory
- ServletMapping mapping = WebapplicationFactory.eINSTANCE.createServletMapping();
- // Set the servlet and servlet name
- mapping.setServlet(servlet);
- mapping.setName(servlet.getServletName());
- // Set the URL pattern to map the servlet to
- mapping.setUrlPattern(stringArray[0]);
- // Add the servlet mapping to the web application modelled list
- webApp.getServletMappings().add(mapping);
- }
- } else if (modelObject instanceof IWebCommon) {
- IWebCommon webApp = (IWebCommon) modelObject;
- org.eclipse.jst.javaee.web.Servlet servlet = (org.eclipse.jst.javaee.web.Servlet) servletObj;
-
- // Create the servlet mappings if any
- if (urlMappingList.size() > 0) {
- // Create the servlet mapping instance from the web factory
- org.eclipse.jst.javaee.web.ServletMapping mapping = WebFactory.eINSTANCE.createServletMapping();
-
- mapping.setServletName(servlet.getServletName());
- for (int i = 0; i < urlMappingList.size(); i++) {
- String[] stringArray = (String[]) urlMappingList.get(i);
- // Set the URL pattern to map the servlet to
- UrlPatternType url = JavaeeFactory.eINSTANCE.createUrlPatternType();
- url.setValue(stringArray[0]);
- mapping.getUrlPatterns().add(url);
- }
- // Add the servlet mapping to the web application model list
- webApp.getServletMappings().add(mapping);
- }
- }
- }
-
-}
diff --git a/plugins/org.eclipse.jst.j2ee.web/web/org/eclipse/jst/j2ee/internal/web/operations/AddWebClassOperation.java b/plugins/org.eclipse.jst.j2ee.web/web/org/eclipse/jst/j2ee/internal/web/operations/AddWebClassOperation.java
deleted file mode 100644
index eecc6c3..0000000
--- a/plugins/org.eclipse.jst.j2ee.web/web/org/eclipse/jst/j2ee/internal/web/operations/AddWebClassOperation.java
+++ /dev/null
@@ -1,89 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2008 SAP AG and others.
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
- *
- * Contributors:
- * Kaloyan Raev, kaloyan.raev@sap.com - initial API and implementation
- *******************************************************************************/
-package org.eclipse.jst.j2ee.internal.web.operations;
-
-import static org.eclipse.jst.j2ee.application.internal.operations.IAnnotationsDataModel.USE_ANNOTATIONS;
-import static org.eclipse.jst.j2ee.internal.common.operations.INewJavaClassDataModelProperties.CLASS_NAME;
-import static org.eclipse.jst.j2ee.internal.common.operations.INewJavaClassDataModelProperties.GENERATE_DD;
-import static org.eclipse.jst.j2ee.internal.web.operations.INewWebClassDataModelProperties.USE_EXISTING_CLASS;
-import static org.eclipse.jst.j2ee.internal.web.operations.INewWebClassDataModelProperties.REGISTER_IN_WEB_XML;
-
-import java.lang.reflect.InvocationTargetException;
-
-import org.eclipse.core.commands.ExecutionException;
-import org.eclipse.core.runtime.CoreException;
-import org.eclipse.core.runtime.IAdaptable;
-import org.eclipse.core.runtime.IProgressMonitor;
-import org.eclipse.core.runtime.IStatus;
-import org.eclipse.core.runtime.Path;
-import org.eclipse.jst.j2ee.internal.J2EEConstants;
-import org.eclipse.jst.j2ee.internal.common.operations.AddJavaEEArtifactOperation;
-import org.eclipse.jst.jee.project.facet.ICreateDeploymentFilesDataModelProperties;
-import org.eclipse.jst.jee.project.facet.IWebCreateDeploymentFilesDataModelProperties;
-import org.eclipse.wst.common.frameworks.datamodel.DataModelFactory;
-import org.eclipse.wst.common.frameworks.datamodel.IDataModel;
-
-public abstract class AddWebClassOperation extends AddJavaEEArtifactOperation {
- protected Path WEB_APP_XML_PATH = new Path(J2EEConstants.WEBAPP_DD_URI);
- public AddWebClassOperation(IDataModel dataModel) {
- super(dataModel);
- }
-
- /**
- * Subclasses may extend this method to add their own actions during
- * execution. The implementation of the execute method drives the running of
- * the operation. This implementation will create the filter class, and
- * then it will create the filter metadata for the web deployment descriptor.
- * This method will accept null as a parameter.
- *
- * @see org.eclipse.core.commands.operations.AbstractOperation#execute(org.eclipse.core.runtime.IProgressMonitor,
- * org.eclipse.core.runtime.IAdaptable)
- * @see AddFilterOperation#createFilterClass()
- * @see AddFilterOperation#generateFilterMetaData(NewFilterClassDataModel,
- * String)
- *
- * @param monitor
- * IProgressMonitor
- * @param info
- * IAdaptable
- * @throws CoreException
- * @throws InterruptedException
- * @throws InvocationTargetException
- */
- @Override
- public IStatus doExecute(IProgressMonitor monitor, IAdaptable info)
- throws ExecutionException {
-
- boolean useExisting = model.getBooleanProperty(USE_EXISTING_CLASS);
- String qualifiedClassName = model.getStringProperty(CLASS_NAME);
-
- // create the java class
- if (!useExisting)
- qualifiedClassName = createClass();
-
- // If the filter is not annotated, generate the filter metadata for the DD
- if (useExisting || (!model.getBooleanProperty(USE_ANNOTATIONS) && model.getBooleanProperty(REGISTER_IN_WEB_XML)))
- {
- if (model.getBooleanProperty(GENERATE_DD))
- {
- IDataModel ddModel = DataModelFactory.createDataModel(IWebCreateDeploymentFilesDataModelProperties.class);
- ddModel.setProperty(ICreateDeploymentFilesDataModelProperties.TARGET_PROJECT, getTargetProject());
- ddModel.getDefaultOperation().execute(monitor, info);
- }
- generateMetaData(model, qualifiedClassName);
- }
-
- return OK_STATUS;
- }
-
- protected abstract void generateMetaData(IDataModel aModel, String qualifiedClassName);
-
-}
diff --git a/plugins/org.eclipse.jst.j2ee.web/web/org/eclipse/jst/j2ee/internal/web/operations/CreateFilterTemplateModel.java b/plugins/org.eclipse.jst.j2ee.web/web/org/eclipse/jst/j2ee/internal/web/operations/CreateFilterTemplateModel.java
deleted file mode 100644
index 4116152..0000000
--- a/plugins/org.eclipse.jst.j2ee.web/web/org/eclipse/jst/j2ee/internal/web/operations/CreateFilterTemplateModel.java
+++ /dev/null
@@ -1,269 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2007, 2008 SAP AG and others.
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
- *
- * Contributors:
- * Kaloyan Raev, kaloyan.raev@sap.com - initial API and implementation
- *******************************************************************************/
-package org.eclipse.jst.j2ee.internal.web.operations;
-
-import static org.eclipse.jst.j2ee.internal.common.operations.INewJavaClassDataModelProperties.ABSTRACT_METHODS;
-import static org.eclipse.jst.j2ee.internal.web.operations.INewFilterClassDataModelProperties.DESTROY;
-import static org.eclipse.jst.j2ee.internal.web.operations.INewFilterClassDataModelProperties.DO_FILTER;
-import static org.eclipse.jst.j2ee.internal.web.operations.INewFilterClassDataModelProperties.FILTER_MAPPINGS;
-import static org.eclipse.jst.j2ee.internal.web.operations.INewFilterClassDataModelProperties.INIT;
-import static org.eclipse.jst.j2ee.internal.web.operations.INewFilterClassDataModelProperties.INIT_PARAM;
-import static org.eclipse.jst.j2ee.web.IServletConstants.DESTROY_SIGNATURE;
-import static org.eclipse.jst.j2ee.web.IServletConstants.DO_FILTER_SIGNATURE;
-import static org.eclipse.jst.j2ee.web.IServletConstants.FILTER_INIT_SIGNATURE;
-import static org.eclipse.jst.j2ee.web.IServletConstants.METHOD_DESTROY;
-import static org.eclipse.jst.j2ee.web.IServletConstants.METHOD_DO_FILTER;
-import static org.eclipse.jst.j2ee.web.IServletConstants.METHOD_INIT;
-import static org.eclipse.jst.j2ee.web.IServletConstants.QUALIFIED_ANNOTATION_INIT_PARAM;
-import static org.eclipse.jst.j2ee.web.IServletConstants.QUALIFIED_FILTER_CHAIN;
-import static org.eclipse.jst.j2ee.web.IServletConstants.QUALIFIED_FILTER_CONFIG;
-import static org.eclipse.jst.j2ee.web.IServletConstants.QUALIFIED_IO_EXCEPTION;
-import static org.eclipse.jst.j2ee.web.IServletConstants.QUALIFIED_SERVLET_EXCEPTION;
-import static org.eclipse.jst.j2ee.web.IServletConstants.QUALIFIED_SERVLET_REQUEST;
-import static org.eclipse.jst.j2ee.web.IServletConstants.QUALIFIED_SERVLET_RESPONSE;
-import static org.eclipse.jst.j2ee.web.IServletConstants.QUALIFIED_WEB_FILTER;
-import static org.eclipse.jst.j2ee.web.IServletConstants.QUALIFIED_ANNOTATION_DISPATCHER_TYPE;
-
-import java.util.ArrayList;
-import java.util.Collection;
-import java.util.Hashtable;
-import java.util.Iterator;
-import java.util.List;
-import java.util.Map;
-
-import org.eclipse.jst.j2ee.internal.common.operations.Method;
-import org.eclipse.jst.j2ee.webapplication.DispatcherType;
-import org.eclipse.wst.common.frameworks.datamodel.IDataModel;
-
-public class CreateFilterTemplateModel extends CreateWebClassTemplateModel {
-
- public static final String ATT_FILTER_NAME = "filterName"; //$NON-NLS-1$
- public static final String ATT_SERVLET_NAMES = "servletNames"; //$NON-NLS-1$
- public static final String ATT_DISPATCHER_TYPES= "dispatcherTypes"; //$NON-NLS-1$
-
- public static final int NAME = 0;
- public static final int VALUE = 1;
- public static final int DESCRIPTION = 2;
-
- public CreateFilterTemplateModel(IDataModel dataModel) {
- super(dataModel);
- }
-
- @Override
- public Collection<String> getImports() {
- Collection<String> collection = super.getImports();
-
- if (shouldGenInit()) {
- collection.add(QUALIFIED_FILTER_CONFIG);
- collection.add(QUALIFIED_SERVLET_EXCEPTION);
- }
-
- if (shouldGenDoFilter()) {
- collection.add(QUALIFIED_SERVLET_REQUEST);
- collection.add(QUALIFIED_SERVLET_RESPONSE);
- collection.add(QUALIFIED_FILTER_CHAIN);
- collection.add(QUALIFIED_IO_EXCEPTION);
- collection.add(QUALIFIED_SERVLET_EXCEPTION);
- }
- if (SERVLET_3.equals(getJavaEEVersion())){
- collection.add(QUALIFIED_WEB_FILTER);
- if (getInitParams()!= null && getInitParams().size()>0){
- collection.add(QUALIFIED_ANNOTATION_INIT_PARAM);
- }
- if (hasDispatchers()){
- collection.add(QUALIFIED_ANNOTATION_DISPATCHER_TYPE);
- }
- }
-
- return collection;
- }
-
- public String getFilterName() {
- return super.getDisplayName();
- }
-
- public boolean shouldGenInit() {
- return implementImplementedMethod(METHOD_INIT);
- }
-
- public boolean shouldGenDoFilter() {
- return implementImplementedMethod(METHOD_DO_FILTER);
- }
-
- public boolean shouldGenDestroy() {
- return implementImplementedMethod(METHOD_DESTROY);
- }
-
- public List<String[]> getInitParams() {
- return (List) dataModel.getProperty(INIT_PARAM);
- }
-
- public String getInitParam(int index, int type) {
- List<String[]> params = getInitParams();
- if (index < params.size()) {
- String[] stringArray = params.get(index);
- return stringArray[type];
- }
- return null;
- }
-
- public List<IFilterMappingItem> getFilterMappings() {
- return (List<IFilterMappingItem>) dataModel.getProperty(FILTER_MAPPINGS);
- }
-
- public IFilterMappingItem getFilterMapping(int index) {
- List<IFilterMappingItem> mappings = getFilterMappings();
- if (index < mappings.size()) {
- return mappings.get(index);
- }
- return null;
- }
-
- public String getDispatcherList(IFilterMappingItem mapping) {
- List<String> list = new ArrayList<String>();
-
- int dispatchers = mapping.getDispatchers();
- if ((dispatchers & IFilterMappingItem.REQUEST) > 0) {
- list.add(DispatcherType.REQUEST_LITERAL.getLiteral());
- }
- if ((dispatchers & IFilterMappingItem.FORWARD) > 0) {
- list.add(DispatcherType.FORWARD_LITERAL.getLiteral());
- }
- if ((dispatchers & IFilterMappingItem.INCLUDE) > 0) {
- list.add(DispatcherType.INCLUDE_LITERAL.getLiteral());
- }
- if ((dispatchers & IFilterMappingItem.ERROR) > 0) {
- list.add(DispatcherType.ERROR_LITERAL.getLiteral());
- }
-
- StringBuilder builder = new StringBuilder();
- Iterator<String> iterator = list.iterator();
- while (iterator.hasNext()) {
- builder.append(iterator.next());
- if (iterator.hasNext()) {
- builder.append(","); //$NON-NLS-1$
- }
- }
-
- return builder.toString();
- }
-
- public List<String> getDispatcherListWeb3(IFilterMappingItem mapping) {
- List<String> list = new ArrayList<String>();
-
- int dispatchers = mapping.getDispatchers();
- if ((dispatchers & IFilterMappingItem.REQUEST) > 0) {
- list.add("DispatcherType.REQUEST"); //$NON-NLS-1$
- }
- if ((dispatchers & IFilterMappingItem.FORWARD) > 0) {
- list.add("DispatcherType.FORWARD"); //$NON-NLS-1$
- }
- if ((dispatchers & IFilterMappingItem.INCLUDE) > 0) {
- list.add("DispatcherType.INCLUDE"); //$NON-NLS-1$
- }
- if ((dispatchers & IFilterMappingItem.ERROR) > 0) {
- list.add("DispatcherType.ERROR"); //$NON-NLS-1$
- }
-
- return list;
- }
-
- protected boolean implementImplementedMethod(String methodName) {
- if (dataModel.getBooleanProperty(ABSTRACT_METHODS)) {
- if (methodName.equals(METHOD_INIT))
- return dataModel.getBooleanProperty(INIT);
- else if (methodName.equals(METHOD_DO_FILTER))
- return dataModel.getBooleanProperty(DO_FILTER);
- else if (methodName.equals(METHOD_DESTROY))
- return dataModel.getBooleanProperty(DESTROY);
- }
- return false;
- }
-
- @Override
- public Collection<Method> getUnimplementedMethods() {
- Collection<Method> unimplementedMethods = super.getUnimplementedMethods();
- Iterator<Method> iterator = unimplementedMethods.iterator();
-
- while (iterator.hasNext()) {
- Method method = iterator.next();
- if ((METHOD_INIT.equals(method.getName()) && FILTER_INIT_SIGNATURE.equals(method.getSignature())) ||
- (METHOD_DESTROY.equals(method.getName()) && DESTROY_SIGNATURE.equals(method.getSignature())) ||
- (METHOD_DO_FILTER.equals(method.getName()) && DO_FILTER_SIGNATURE.equals(method.getSignature()))) {
- iterator.remove();
- }
- }
-
- return unimplementedMethods;
- }
-
- public boolean hasDispatchers(){
- List<IFilterMappingItem> filterMappings = getFilterMappings();
- for (IFilterMappingItem filterMapping : filterMappings) {
- if (filterMapping.getDispatchersAsString().length()>0){
- return true;
- }
- }
- return false;
- }
-
- public Map<String, Object> getClassAnnotationParams() {
- Map<String, Object> result = new Hashtable<String, Object>();
-
- String dispName = getFilterName().trim();
- if (!dispName.equals(getClassName()) && (dispName.length() > 0))
- result.put(ATT_FILTER_NAME, dispName);
-
- String description = getDescription().trim();
- if (description.length() > 0)
- result.put(ATT_DESCRIPTION, description);
-
- List<IFilterMappingItem> filterMappings = getFilterMappings();
- List<String> urlMappings = new ArrayList<String>();
- List<String> servletNames = new ArrayList<String>();
- List<String> dispatcherTypes = new ArrayList<String>();
- for (IFilterMappingItem filterMapping : filterMappings) {
- List<String> dispatcherList = getDispatcherListWeb3(filterMapping);
- if (dispatcherList != null && dispatcherList.size()>0){
- for (String disp : dispatcherList) {
- if (!dispatcherTypes.contains(disp)){
- dispatcherTypes.add(disp);
- }
- }
-
- }
- if (filterMapping.isUrlPatternType()) {
- urlMappings.add(filterMapping.getName());
- } else if (filterMapping.isServletNameType()) {
- servletNames.add(filterMapping.getName());
- }
- }
- if (urlMappings.size() > 0) {
- result.put(ATT_URL_PATTERNS, urlMappings);
- }
- if (dispatcherTypes.size() > 0) {
- result.put(ATT_DISPATCHER_TYPES, dispatcherTypes);
- }
- if (servletNames.size() > 0) {
- result.put(ATT_SERVLET_NAMES, servletNames);
- }
-
-
- List<String[]> initParams = getInitParams();
- if (initParams != null && initParams.size() > 0) {
- result.put(ATT_INIT_PARAMS, initParams);
- }
-
- return result;
- }
-
-}
-
diff --git a/plugins/org.eclipse.jst.j2ee.web/web/org/eclipse/jst/j2ee/internal/web/operations/CreateListenerTemplateModel.java b/plugins/org.eclipse.jst.j2ee.web/web/org/eclipse/jst/j2ee/internal/web/operations/CreateListenerTemplateModel.java
deleted file mode 100644
index 0bad932..0000000
--- a/plugins/org.eclipse.jst.j2ee.web/web/org/eclipse/jst/j2ee/internal/web/operations/CreateListenerTemplateModel.java
+++ /dev/null
@@ -1,131 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2007, 2008 SAP AG and others.
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
- *
- * Contributors:
- * Kaloyan Raev, kaloyan.raev@sap.com - initial API and implementation
- *******************************************************************************/
-package org.eclipse.jst.j2ee.internal.web.operations;
-
-import static org.eclipse.jst.j2ee.web.IServletConstants.QUALIFIED_HTTP_SESSION_ACTIVATION_LISTENER;
-import static org.eclipse.jst.j2ee.web.IServletConstants.QUALIFIED_HTTP_SESSION_ATTRIBUTE_LISTENER;
-import static org.eclipse.jst.j2ee.web.IServletConstants.QUALIFIED_HTTP_SESSION_BINDING_EVENT;
-import static org.eclipse.jst.j2ee.web.IServletConstants.QUALIFIED_HTTP_SESSION_BINDING_LISTENER;
-import static org.eclipse.jst.j2ee.web.IServletConstants.QUALIFIED_HTTP_SESSION_EVENT;
-import static org.eclipse.jst.j2ee.web.IServletConstants.QUALIFIED_HTTP_SESSION_LISTENER;
-import static org.eclipse.jst.j2ee.web.IServletConstants.QUALIFIED_SERVLET_CONTEXT_ATTRIBUTE_EVENT;
-import static org.eclipse.jst.j2ee.web.IServletConstants.QUALIFIED_SERVLET_CONTEXT_ATTRIBUTE_LISTENER;
-import static org.eclipse.jst.j2ee.web.IServletConstants.QUALIFIED_SERVLET_CONTEXT_EVENT;
-import static org.eclipse.jst.j2ee.web.IServletConstants.QUALIFIED_SERVLET_CONTEXT_LISTENER;
-import static org.eclipse.jst.j2ee.web.IServletConstants.QUALIFIED_SERVLET_REQUEST_ATTRIBUTE_EVENT;
-import static org.eclipse.jst.j2ee.web.IServletConstants.QUALIFIED_SERVLET_REQUEST_ATTRIBUTE_LISTENER;
-import static org.eclipse.jst.j2ee.web.IServletConstants.QUALIFIED_SERVLET_REQUEST_EVENT;
-import static org.eclipse.jst.j2ee.web.IServletConstants.QUALIFIED_SERVLET_REQUEST_LISTENER;
-import static org.eclipse.jst.j2ee.web.IServletConstants.QUALIFIED_WEB_LISTENER;
-
-import java.util.Collection;
-import java.util.List;
-
-import org.eclipse.wst.common.frameworks.datamodel.IDataModel;
-
-public class CreateListenerTemplateModel extends CreateWebClassTemplateModel {
-
- @Override
- public Collection<String> getImports() {
- Collection<String> collection = super.getImports();
-
- if (implementServletContextListener()) {
- collection.add(QUALIFIED_SERVLET_CONTEXT_LISTENER);
- collection.add(QUALIFIED_SERVLET_CONTEXT_EVENT);
- }
-
- if (implementServletContextAttributeListener()) {
- collection.add(QUALIFIED_SERVLET_CONTEXT_ATTRIBUTE_LISTENER);
- collection.add(QUALIFIED_SERVLET_CONTEXT_ATTRIBUTE_EVENT);
- }
-
- if (implementHttpSessionListener()) {
- collection.add(QUALIFIED_HTTP_SESSION_LISTENER);
- collection.add(QUALIFIED_HTTP_SESSION_EVENT);
- }
-
- if (implementHttpSessionAttributeListener()) {
- collection.add(QUALIFIED_HTTP_SESSION_ATTRIBUTE_LISTENER);
- collection.add(QUALIFIED_HTTP_SESSION_BINDING_EVENT);
- }
-
- if (implementHttpSessionActivationListener()) {
- collection.add(QUALIFIED_HTTP_SESSION_ACTIVATION_LISTENER);
- collection.add(QUALIFIED_HTTP_SESSION_EVENT);
- }
-
- if (implementHttpSessionBindingListener()) {
- collection.add(QUALIFIED_HTTP_SESSION_BINDING_LISTENER);
- collection.add(QUALIFIED_HTTP_SESSION_BINDING_EVENT);
- }
-
- if (implementServletRequestListener()) {
- collection.add(QUALIFIED_SERVLET_REQUEST_LISTENER);
- collection.add(QUALIFIED_SERVLET_REQUEST_EVENT);
- }
-
- if (implementServletRequestAttributeListener()) {
- collection.add(QUALIFIED_SERVLET_REQUEST_ATTRIBUTE_LISTENER);
- collection.add(QUALIFIED_SERVLET_REQUEST_ATTRIBUTE_EVENT);
- }
-
- if (SERVLET_3.equals(getJavaEEVersion())){
- collection.add(QUALIFIED_WEB_LISTENER);
- }
-
- return collection;
- }
-
- public CreateListenerTemplateModel(IDataModel dataModel) {
- super(dataModel);
- }
-
- public boolean implementServletContextListener() {
- return implementInterface(QUALIFIED_SERVLET_CONTEXT_LISTENER);
- }
-
- public boolean implementServletContextAttributeListener() {
- return implementInterface(QUALIFIED_SERVLET_CONTEXT_ATTRIBUTE_LISTENER);
- }
-
- public boolean implementHttpSessionListener() {
- return implementInterface(QUALIFIED_HTTP_SESSION_LISTENER);
- }
-
- public boolean implementHttpSessionAttributeListener() {
- return implementInterface(QUALIFIED_HTTP_SESSION_ATTRIBUTE_LISTENER);
- }
-
- public boolean implementHttpSessionActivationListener() {
- return implementInterface(QUALIFIED_HTTP_SESSION_ACTIVATION_LISTENER);
- }
-
- public boolean implementHttpSessionBindingListener() {
- return implementInterface(QUALIFIED_HTTP_SESSION_BINDING_LISTENER);
- }
-
- public boolean implementServletRequestListener() {
- return implementInterface(QUALIFIED_SERVLET_REQUEST_LISTENER);
- }
-
- public boolean implementServletRequestAttributeListener() {
- return implementInterface(QUALIFIED_SERVLET_REQUEST_ATTRIBUTE_LISTENER);
- }
-
- private boolean implementInterface(String iface) {
- List<String> interfaces = getQualifiedInterfaces();
- if (interfaces != null) {
- return interfaces.contains(iface);
- }
- return false;
- }
-
-}
diff --git a/plugins/org.eclipse.jst.j2ee.web/web/org/eclipse/jst/j2ee/internal/web/operations/CreateServletTemplateModel.java b/plugins/org.eclipse.jst.j2ee.web/web/org/eclipse/jst/j2ee/internal/web/operations/CreateServletTemplateModel.java
deleted file mode 100644
index 4f6a59d..0000000
--- a/plugins/org.eclipse.jst.j2ee.web/web/org/eclipse/jst/j2ee/internal/web/operations/CreateServletTemplateModel.java
+++ /dev/null
@@ -1,329 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2003, 2008 IBM Corporation and others.
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
- *
- * Contributors:
- * IBM Corporation - initial API and implementation
- * Kiril Mitov, k.mitov@sap.com - bug 204160
- * Kaloyan Raev, kaloyan.raev@sap.com
- *******************************************************************************/
-/*
- * Created on Aug 6, 2004
- */
-package org.eclipse.jst.j2ee.internal.web.operations;
-
-import static org.eclipse.jst.j2ee.internal.common.operations.INewJavaClassDataModelProperties.ABSTRACT_METHODS;
-import static org.eclipse.jst.j2ee.internal.web.operations.INewServletClassDataModelProperties.DESTROY;
-import static org.eclipse.jst.j2ee.internal.web.operations.INewServletClassDataModelProperties.DO_DELETE;
-import static org.eclipse.jst.j2ee.internal.web.operations.INewServletClassDataModelProperties.DO_GET;
-import static org.eclipse.jst.j2ee.internal.web.operations.INewServletClassDataModelProperties.DO_HEAD;
-import static org.eclipse.jst.j2ee.internal.web.operations.INewServletClassDataModelProperties.DO_OPTIONS;
-import static org.eclipse.jst.j2ee.internal.web.operations.INewServletClassDataModelProperties.DO_POST;
-import static org.eclipse.jst.j2ee.internal.web.operations.INewServletClassDataModelProperties.DO_PUT;
-import static org.eclipse.jst.j2ee.internal.web.operations.INewServletClassDataModelProperties.DO_TRACE;
-import static org.eclipse.jst.j2ee.internal.web.operations.INewServletClassDataModelProperties.GET_SERVLET_CONFIG;
-import static org.eclipse.jst.j2ee.internal.web.operations.INewServletClassDataModelProperties.GET_SERVLET_INFO;
-import static org.eclipse.jst.j2ee.internal.web.operations.INewServletClassDataModelProperties.INIT;
-import static org.eclipse.jst.j2ee.internal.web.operations.INewServletClassDataModelProperties.INIT_PARAM;
-import static org.eclipse.jst.j2ee.internal.web.operations.INewServletClassDataModelProperties.SERVICE;
-import static org.eclipse.jst.j2ee.internal.web.operations.INewServletClassDataModelProperties.URL_MAPPINGS;
-import static org.eclipse.jst.j2ee.web.IServletConstants.DESTROY_SIGNATURE;
-import static org.eclipse.jst.j2ee.web.IServletConstants.DO_DELETE_SIGNATURE;
-import static org.eclipse.jst.j2ee.web.IServletConstants.DO_GET_SIGNATURE;
-import static org.eclipse.jst.j2ee.web.IServletConstants.DO_HEAD_SIGNATURE;
-import static org.eclipse.jst.j2ee.web.IServletConstants.DO_POST_SIGNATURE;
-import static org.eclipse.jst.j2ee.web.IServletConstants.DO_PUT_SIGNATURE;
-import static org.eclipse.jst.j2ee.web.IServletConstants.DO_TRACE_SIGNATURE;
-import static org.eclipse.jst.j2ee.web.IServletConstants.GET_SERVLET_CONFIG_SIGNATURE;
-import static org.eclipse.jst.j2ee.web.IServletConstants.GET_SERVLET_INFO_SIGNATURE;
-import static org.eclipse.jst.j2ee.web.IServletConstants.HTTP_SERVICE_SIGNATURE;
-import static org.eclipse.jst.j2ee.web.IServletConstants.METHOD_DESTROY;
-import static org.eclipse.jst.j2ee.web.IServletConstants.METHOD_DO_DELETE;
-import static org.eclipse.jst.j2ee.web.IServletConstants.METHOD_DO_GET;
-import static org.eclipse.jst.j2ee.web.IServletConstants.METHOD_DO_HEAD;
-import static org.eclipse.jst.j2ee.web.IServletConstants.METHOD_DO_OPTIONS;
-import static org.eclipse.jst.j2ee.web.IServletConstants.METHOD_DO_POST;
-import static org.eclipse.jst.j2ee.web.IServletConstants.METHOD_DO_PUT;
-import static org.eclipse.jst.j2ee.web.IServletConstants.METHOD_DO_TRACE;
-import static org.eclipse.jst.j2ee.web.IServletConstants.METHOD_GET_SERVLET_CONFIG;
-import static org.eclipse.jst.j2ee.web.IServletConstants.METHOD_GET_SERVLET_INFO;
-import static org.eclipse.jst.j2ee.web.IServletConstants.METHOD_INIT;
-import static org.eclipse.jst.j2ee.web.IServletConstants.METHOD_SERVICE;
-import static org.eclipse.jst.j2ee.web.IServletConstants.METHOD_TO_STRING;
-import static org.eclipse.jst.j2ee.web.IServletConstants.QUALIFIED_ANNOTATION_INIT_PARAM;
-import static org.eclipse.jst.j2ee.web.IServletConstants.QUALIFIED_HTTP_SERVLET_REQUEST;
-import static org.eclipse.jst.j2ee.web.IServletConstants.QUALIFIED_HTTP_SERVLET_RESPONSE;
-import static org.eclipse.jst.j2ee.web.IServletConstants.QUALIFIED_IO_EXCEPTION;
-import static org.eclipse.jst.j2ee.web.IServletConstants.QUALIFIED_SERVLET_CONFIG;
-import static org.eclipse.jst.j2ee.web.IServletConstants.QUALIFIED_SERVLET_EXCEPTION;
-import static org.eclipse.jst.j2ee.web.IServletConstants.QUALIFIED_SERVLET_REQUEST;
-import static org.eclipse.jst.j2ee.web.IServletConstants.QUALIFIED_SERVLET_RESPONSE;
-import static org.eclipse.jst.j2ee.web.IServletConstants.QUALIFIED_WEB_SERVLET;
-import static org.eclipse.jst.j2ee.web.IServletConstants.SERVICE_SIGNATURE;
-import static org.eclipse.jst.j2ee.web.IServletConstants.SERVLET_INIT_SIGNATURE;
-
-import java.util.Collection;
-import java.util.Hashtable;
-import java.util.Iterator;
-import java.util.List;
-import java.util.Map;
-
-import org.eclipse.jst.j2ee.internal.common.operations.Method;
-import org.eclipse.wst.common.frameworks.datamodel.IDataModel;
-
-/**
- * @author jlanuti
- */
-public class CreateServletTemplateModel extends CreateWebClassTemplateModel {
-
- public static final int NAME = 0;
- public static final int VALUE = 1;
- public static final int DESCRIPTION = 2;
-
- public CreateServletTemplateModel(IDataModel dataModel) {
- super(dataModel);
- }
-
- @Override
- public Collection<String> getImports() {
- Collection<String> collection = super.getImports();
-
- if (shouldGenInit()) {
- collection.add(QUALIFIED_SERVLET_CONFIG);
- collection.add(QUALIFIED_SERVLET_EXCEPTION);
- }
-
- if (shouldGenGetServletConfig()) {
- collection.add(QUALIFIED_SERVLET_CONFIG);
- }
-
- if (shouldGenService()) {
- if (isHttpServletSuperclass()) {
- collection.add(QUALIFIED_HTTP_SERVLET_REQUEST);
- collection.add(QUALIFIED_HTTP_SERVLET_RESPONSE);
- } else {
- collection.add(QUALIFIED_SERVLET_REQUEST);
- collection.add(QUALIFIED_SERVLET_RESPONSE);
- }
-
- collection.add(QUALIFIED_SERVLET_EXCEPTION);
- collection.add(QUALIFIED_IO_EXCEPTION);
- }
-
- if (shouldGenDoGet() || shouldGenDoPost() || shouldGenDoPut() ||
- shouldGenDoDelete() || shouldGenDoHead() ||
- shouldGenDoOptions() || shouldGenDoTrace()) {
- collection.add(QUALIFIED_HTTP_SERVLET_REQUEST);
- collection.add(QUALIFIED_HTTP_SERVLET_RESPONSE);
- collection.add(QUALIFIED_SERVLET_EXCEPTION);
- collection.add(QUALIFIED_IO_EXCEPTION);
- }
-
- if (SERVLET_3.equals(getJavaEEVersion())){
- collection.add(QUALIFIED_WEB_SERVLET);
- if (getInitParams()!= null && getInitParams().size()>0){
- collection.add(QUALIFIED_ANNOTATION_INIT_PARAM);
- }
-
-
-
- }
-
- return collection;
- }
-
- public String getServletName() {
- return super.getDisplayName();
- }
-
- /**
- * @deprecated Use {@link #getClassName()} instead. Will be removed post WTP
- * 3.0.
- *
- * @see CreateWebClassTemplateModel#getClassName()
- */
- public String getServletClassName() {
- return super.getClassName();
- }
-
- public boolean shouldGenInit() {
- return implementImplementedMethod(METHOD_INIT);
- }
-
- public boolean shouldGenDestroy() {
- return implementImplementedMethod(METHOD_DESTROY);
- }
-
- public boolean shouldGenGetServletConfig() {
- return implementImplementedMethod(METHOD_GET_SERVLET_CONFIG);
- }
-
- public boolean shouldGenGetServletInfo() {
- return implementImplementedMethod(METHOD_GET_SERVLET_INFO);
- }
-
- public boolean shouldGenService() {
- return implementImplementedMethod(METHOD_SERVICE);
- }
-
- public boolean shouldGenDoGet() {
- return implementImplementedMethod(METHOD_DO_GET);
- }
-
- public boolean shouldGenDoPost() {
- return implementImplementedMethod(METHOD_DO_POST);
- }
-
- public boolean shouldGenDoPut() {
- return implementImplementedMethod(METHOD_DO_PUT);
- }
-
- public boolean shouldGenDoDelete() {
- return implementImplementedMethod(METHOD_DO_DELETE);
- }
-
- public boolean shouldGenDoHead() {
- return implementImplementedMethod(METHOD_DO_HEAD);
- }
-
- public boolean shouldGenDoOptions() {
- return implementImplementedMethod(METHOD_DO_OPTIONS);
- }
-
- public boolean shouldGenDoTrace() {
- return implementImplementedMethod(METHOD_DO_TRACE);
- }
-
- public boolean shouldGenToString() {
- return implementImplementedMethod(METHOD_TO_STRING);
- }
-
- public boolean isGenericServletSuperclass() {
- return ServletSupertypesValidator.isGenericServletSuperclass(dataModel);
- }
-
- public boolean isHttpServletSuperclass() {
- return ServletSupertypesValidator.isHttpServletSuperclass(dataModel);
- }
-
- public List<String[]> getInitParams() {
- return (List) dataModel.getProperty(INIT_PARAM);
- }
-
- public String getInitParam(int index, int type) {
- List<String[]> params = getInitParams();
- if (index < params.size()) {
- String[] stringArray = params.get(index);
- return stringArray[type];
- }
- return null;
- }
-
- public List<String[]> getServletMappings() {
- return (List) dataModel.getProperty(URL_MAPPINGS);
- }
-
- public String getServletMapping(int index) {
- List<String[]> mappings = getServletMappings();
- if (index < mappings.size()) {
- String[] map = mappings.get(index);
- return map[0];
- }
- return null;
- }
-
- /**
- * @deprecated Use {@link #getDescription()} instead. Will be removed post
- * WTP 3.0.
- *
- * @see CreateWebClassTemplateModel#getDescription()
- */
- public String getServletDescription() {
- return super.getDescription();
- }
-
- protected boolean implementImplementedMethod(String methodName) {
- if (dataModel.getBooleanProperty(ABSTRACT_METHODS)) {
- if (methodName.equals(METHOD_INIT))
- return dataModel.getBooleanProperty(INIT);
- else if (methodName.equals(METHOD_DESTROY))
- return dataModel.getBooleanProperty(DESTROY);
- else if (methodName.equals(METHOD_GET_SERVLET_CONFIG))
- return dataModel.getBooleanProperty(GET_SERVLET_CONFIG);
- else if (methodName.equals(METHOD_GET_SERVLET_INFO))
- return dataModel.getBooleanProperty(GET_SERVLET_INFO);
- else if (methodName.equals(METHOD_SERVICE))
- return dataModel.getBooleanProperty(SERVICE);
- else if (methodName.equals(METHOD_DO_GET))
- return dataModel.getBooleanProperty(DO_GET);
- else if (methodName.equals(METHOD_DO_POST))
- return dataModel.getBooleanProperty(DO_POST);
- else if (methodName.equals(METHOD_DO_PUT))
- return dataModel.getBooleanProperty(DO_PUT);
- else if (methodName.equals(METHOD_DO_DELETE))
- return dataModel.getBooleanProperty(DO_DELETE);
- else if (methodName.equals(METHOD_DO_HEAD))
- return dataModel.getBooleanProperty(DO_HEAD);
- else if (methodName.equals(METHOD_DO_OPTIONS))
- return dataModel.getBooleanProperty(DO_OPTIONS);
- else if (methodName.equals(METHOD_DO_TRACE))
- return dataModel.getBooleanProperty(DO_TRACE);
- }
- return false;
- }
-
- @Override
- public Collection<Method> getUnimplementedMethods() {
- Collection<Method> unimplementedMethods = super.getUnimplementedMethods();
- Iterator<Method> iterator = unimplementedMethods.iterator();
-
- while (iterator.hasNext()) {
- Method method = iterator.next();
- if ((METHOD_INIT.equals(method.getName()) && SERVLET_INIT_SIGNATURE.equals(method.getSignature())) ||
- (METHOD_DESTROY.equals(method.getName()) && DESTROY_SIGNATURE.equals(method.getSignature())) ||
- (METHOD_GET_SERVLET_CONFIG.equals(method.getName()) && GET_SERVLET_CONFIG_SIGNATURE.equals(method.getSignature())) ||
- (METHOD_GET_SERVLET_INFO.equals(method.getName()) && GET_SERVLET_INFO_SIGNATURE.equals(method.getSignature())) ||
- (METHOD_SERVICE.equals(method.getName()) && SERVICE_SIGNATURE.equals(method.getSignature())) ||
- (METHOD_SERVICE.equals(method.getName()) && HTTP_SERVICE_SIGNATURE.equals(method.getSignature())) ||
- (METHOD_DO_GET.equals(method.getName()) && DO_GET_SIGNATURE.equals(method.getSignature())) ||
- (METHOD_DO_POST.equals(method.getName()) && DO_POST_SIGNATURE.equals(method.getSignature())) ||
- (METHOD_DO_PUT.equals(method.getName()) && DO_PUT_SIGNATURE.equals(method.getSignature())) ||
- (METHOD_DO_DELETE.equals(method.getName()) && DO_DELETE_SIGNATURE.equals(method.getSignature())) ||
- (METHOD_DO_HEAD.equals(method.getName()) && DO_HEAD_SIGNATURE.equals(method.getSignature())) ||
- (METHOD_DO_OPTIONS.equals(method.getName()) && METHOD_DO_OPTIONS.equals(method.getSignature())) ||
- (METHOD_DO_TRACE.equals(method.getName()) && DO_TRACE_SIGNATURE.equals(method.getSignature()))) {
- iterator.remove();
- }
- }
-
- return unimplementedMethods;
- }
-
- public Map<String, Object> getClassAnnotationParams() {
- Map<String, Object> result = new Hashtable<String, Object>();
-
- String dispName = getServletName().trim();
- if (!dispName.equals(getClassName()) && (dispName.length() > 0))
- result.put(ATT_NAME, dispName);
-
- String description = getDescription().trim();
- if (description.length() > 0)
- result.put(ATT_DESCRIPTION, description);
-
- List<String[]> servletMappings = getServletMappings();
- if (servletMappings != null && servletMappings.size() > 0) {
- result.put(ATT_URL_PATTERNS, servletMappings);
- }
-
- List<String[]> initParams = getInitParams();
- if (initParams != null && initParams.size() > 0) {
- result.put(ATT_INIT_PARAMS, initParams);
- }
-
- return result;
- }
-
-}
diff --git a/plugins/org.eclipse.jst.j2ee.web/web/org/eclipse/jst/j2ee/internal/web/operations/CreateWebClassTemplateModel.java b/plugins/org.eclipse.jst.j2ee.web/web/org/eclipse/jst/j2ee/internal/web/operations/CreateWebClassTemplateModel.java
deleted file mode 100644
index 809662a..0000000
--- a/plugins/org.eclipse.jst.j2ee.web/web/org/eclipse/jst/j2ee/internal/web/operations/CreateWebClassTemplateModel.java
+++ /dev/null
@@ -1,50 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2007, 2008 SAP AG and others.
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
- *
- * Contributors:
- * Kaloyan Raev, kaloyan.raev@sap.com - initial API and implementation
- * Carl Anderson, ccc@us.ibm.com - handle null superclass (no runtime) (bug 214950)
- *******************************************************************************/
-package org.eclipse.jst.j2ee.internal.web.operations;
-
-import static org.eclipse.jst.j2ee.application.internal.operations.IAnnotationsDataModel.USE_ANNOTATIONS;
-import static org.eclipse.jst.j2ee.internal.web.operations.INewWebClassDataModelProperties.DESCRIPTION;
-import static org.eclipse.jst.j2ee.internal.web.operations.INewWebClassDataModelProperties.DISPLAY_NAME;
-import static org.eclipse.jst.j2ee.internal.web.operations.INewWebClassDataModelProperties.JAVA_EE_VERSION;
-
-import org.eclipse.jst.j2ee.internal.common.operations.CreateJavaEEArtifactTemplateModel;
-import org.eclipse.wst.common.frameworks.datamodel.IDataModel;
-
-public class CreateWebClassTemplateModel extends
- CreateJavaEEArtifactTemplateModel {
-
- public static final String ATT_URL_PATTERNS = "urlPatterns"; //$NON-NLS-1$
- public static final String ATT_INIT_PARAMS = "initParams"; //$NON-NLS-1$
-
- public static final String SERVLET_3 = "3.0"; //$NON-NLS-1$
-
- public CreateWebClassTemplateModel(IDataModel dataModel) {
- super(dataModel);
- }
-
- public String getDisplayName() {
- return dataModel.getStringProperty(DISPLAY_NAME);
- }
-
- public String getDescription() {
- return dataModel.getStringProperty(DESCRIPTION);
- }
-
- public boolean isAnnotated() {
- return dataModel.getBooleanProperty(USE_ANNOTATIONS);
- }
-
- public String getJavaEEVersion() {
- return dataModel.getStringProperty(JAVA_EE_VERSION);
- }
-
-}
diff --git a/plugins/org.eclipse.jst.j2ee.web/web/org/eclipse/jst/j2ee/internal/web/operations/FilterMappingItem.java b/plugins/org.eclipse.jst.j2ee.web/web/org/eclipse/jst/j2ee/internal/web/operations/FilterMappingItem.java
deleted file mode 100644
index 59394f2..0000000
--- a/plugins/org.eclipse.jst.j2ee.web/web/org/eclipse/jst/j2ee/internal/web/operations/FilterMappingItem.java
+++ /dev/null
@@ -1,68 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2007, 2008 SAP AG and others.
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
- *
- * Contributors:
- * Kaloyan Raev, kaloyan.raev@sap.com - initial API and implementation
- *******************************************************************************/
-package org.eclipse.jst.j2ee.internal.web.operations;
-
-import org.eclipse.jst.j2ee.internal.web.providers.WebAppEditResourceHandler;
-
-public class FilterMappingItem implements IFilterMappingItem {
-
- private int mappingType;
- private int dispatchers;
- private String mapping;
-
- public FilterMappingItem(int type, String mapping) {
- mappingType = type;
- this.mapping = mapping;
- }
-
- public FilterMappingItem(int type, String mapping, int dispatchers) {
- this(type, mapping);
- this.dispatchers = dispatchers;
- }
-
- public int getMappingType() {
- return mappingType;
- }
-
- public boolean isUrlPatternType() {
- return mappingType == IFilterMappingItem.URL_PATTERN;
- }
-
- public boolean isServletNameType() {
- return mappingType == IFilterMappingItem.SERVLET_NAME;
- }
-
- public int getDispatchers() {
- return dispatchers;
- }
-
- public String getDispatchersAsString() {
- String result = ""; //$NON-NLS-1$
- if ((dispatchers & REQUEST) > 0) {
- result += WebAppEditResourceHandler.getString("DISPATCHER_R") + " "; //$NON-NLS-1$ //$NON-NLS-2$
- }
- if ((dispatchers & FORWARD) > 0) {
- result += WebAppEditResourceHandler.getString("DISPATCHER_F") + " "; //$NON-NLS-1$ //$NON-NLS-2$
- }
- if ((dispatchers & INCLUDE) > 0) {
- result += WebAppEditResourceHandler.getString("DISPATCHER_I") + " "; //$NON-NLS-1$ //$NON-NLS-2$
- }
- if ((dispatchers & ERROR) > 0) {
- result += WebAppEditResourceHandler.getString("DISPATCHER_E") + " "; //$NON-NLS-1$ //$NON-NLS-2$
- }
- return result.trim();
- }
-
- public String getName() {
- return mapping;
- }
-
-}
diff --git a/plugins/org.eclipse.jst.j2ee.web/web/org/eclipse/jst/j2ee/internal/web/operations/FilterSupertypesValidator.java b/plugins/org.eclipse.jst.j2ee.web/web/org/eclipse/jst/j2ee/internal/web/operations/FilterSupertypesValidator.java
deleted file mode 100644
index fb7c510..0000000
--- a/plugins/org.eclipse.jst.j2ee.web/web/org/eclipse/jst/j2ee/internal/web/operations/FilterSupertypesValidator.java
+++ /dev/null
@@ -1,31 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2007, 2008 SAP AG and others.
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
- *
- * Contributors:
- * Kaloyan Raev, kaloyan.raev@sap.com - initial API and implementation
- *******************************************************************************/
-package org.eclipse.jst.j2ee.internal.web.operations;
-
-import static org.eclipse.jst.j2ee.web.IServletConstants.QUALIFIED_FILTER;
-
-import org.eclipse.wst.common.frameworks.datamodel.IDataModel;
-
-public class FilterSupertypesValidator extends AbstractSupertypesValidator {
-
- public static boolean isFilterSuperclass(IDataModel dataModel) {
- if (hasSuperInterface(dataModel, getSuperclass(dataModel), QUALIFIED_FILTER))
- return true;
-
- for (Object iface : getInterfaces(dataModel)) {
- if (hasSuperInterface(dataModel, (String) iface, QUALIFIED_FILTER))
- return true;
- }
-
- return false;
- }
-
-}
diff --git a/plugins/org.eclipse.jst.j2ee.web/web/org/eclipse/jst/j2ee/internal/web/operations/FilterTemplate.java b/plugins/org.eclipse.jst.j2ee.web/web/org/eclipse/jst/j2ee/internal/web/operations/FilterTemplate.java
deleted file mode 100644
index ccce1a0..0000000
--- a/plugins/org.eclipse.jst.j2ee.web/web/org/eclipse/jst/j2ee/internal/web/operations/FilterTemplate.java
+++ /dev/null
@@ -1,588 +0,0 @@
-package org.eclipse.jst.j2ee.internal.web.operations;
-
-import java.util.*;
-import org.eclipse.jst.j2ee.internal.common.operations.*;
-
-public class FilterTemplate
-{
- protected static String nl;
- public static synchronized FilterTemplate create(String lineSeparator)
- {
- nl = lineSeparator;
- FilterTemplate result = new FilterTemplate();
- nl = null;
- return result;
- }
-
- public final String NL = nl == null ? (System.getProperties().getProperty("line.separator")) : nl; //$NON-NLS-1$
- protected final String TEXT_1 = "package "; //$NON-NLS-1$
- protected final String TEXT_2 = ";"; //$NON-NLS-1$
- protected final String TEXT_3 = NL;
- protected final String TEXT_4 = NL + "import "; //$NON-NLS-1$
- protected final String TEXT_5 = ";"; //$NON-NLS-1$
- protected final String TEXT_6 = NL;
- protected final String TEXT_7 = NL;
- protected final String TEXT_8 = "/**" + NL + " * Servlet Filter implementation class "; //$NON-NLS-1$ //$NON-NLS-2$
- protected final String TEXT_9 = NL + " *" + NL + " * @web.filter" + NL + " * name=\""; //$NON-NLS-1$ //$NON-NLS-2$ //$NON-NLS-3$
- protected final String TEXT_10 = "\"" + NL + " * display-name=\""; //$NON-NLS-1$ //$NON-NLS-2$
- protected final String TEXT_11 = "\""; //$NON-NLS-1$
- protected final String TEXT_12 = NL + " * description=\""; //$NON-NLS-1$
- protected final String TEXT_13 = "\""; //$NON-NLS-1$
- protected final String TEXT_14 = NL + " *" + NL + " * @web.filter-mapping"; //$NON-NLS-1$ //$NON-NLS-2$
- protected final String TEXT_15 = NL + " * url-pattern=\""; //$NON-NLS-1$
- protected final String TEXT_16 = "\""; //$NON-NLS-1$
- protected final String TEXT_17 = NL + " * servlet-name=\""; //$NON-NLS-1$
- protected final String TEXT_18 = "\""; //$NON-NLS-1$
- protected final String TEXT_19 = NL + " * dispatcher=\""; //$NON-NLS-1$
- protected final String TEXT_20 = "\""; //$NON-NLS-1$
- protected final String TEXT_21 = NL + " *" + NL + " * @web.filter-init-param" + NL + " * name=\""; //$NON-NLS-1$ //$NON-NLS-2$ //$NON-NLS-3$
- protected final String TEXT_22 = "\"" + NL + " * value=\""; //$NON-NLS-1$ //$NON-NLS-2$
- protected final String TEXT_23 = "\""; //$NON-NLS-1$
- protected final String TEXT_24 = NL + " * description=\""; //$NON-NLS-1$
- protected final String TEXT_25 = "\""; //$NON-NLS-1$
- protected final String TEXT_26 = NL + " */"; //$NON-NLS-1$
- protected final String TEXT_27 = NL + "@WebFilter"; //$NON-NLS-1$
- protected final String TEXT_28 = "(\""; //$NON-NLS-1$
- protected final String TEXT_29 = "\")"; //$NON-NLS-1$
- protected final String TEXT_30 = "({ "; //$NON-NLS-1$
- protected final String TEXT_31 = ", "; //$NON-NLS-1$
- protected final String TEXT_32 = "\""; //$NON-NLS-1$
- protected final String TEXT_33 = "\""; //$NON-NLS-1$
- protected final String TEXT_34 = " })"; //$NON-NLS-1$
- protected final String TEXT_35 = "("; //$NON-NLS-1$
- protected final String TEXT_36 = ", "; //$NON-NLS-1$
- protected final String TEXT_37 = NL + "\t\t"; //$NON-NLS-1$
- protected final String TEXT_38 = " = \""; //$NON-NLS-1$
- protected final String TEXT_39 = "\""; //$NON-NLS-1$
- protected final String TEXT_40 = " = { "; //$NON-NLS-1$
- protected final String TEXT_41 = ", "; //$NON-NLS-1$
- protected final String TEXT_42 = NL + "\t\t\t\t"; //$NON-NLS-1$
- protected final String TEXT_43 = "\""; //$NON-NLS-1$
- protected final String TEXT_44 = "\""; //$NON-NLS-1$
- protected final String TEXT_45 = NL + "\t\t"; //$NON-NLS-1$
- protected final String TEXT_46 = " "; //$NON-NLS-1$
- protected final String TEXT_47 = "}"; //$NON-NLS-1$
- protected final String TEXT_48 = " = { "; //$NON-NLS-1$
- protected final String TEXT_49 = ", "; //$NON-NLS-1$
- protected final String TEXT_50 = NL + "\t\t\t\t"; //$NON-NLS-1$
- protected final String TEXT_51 = "\""; //$NON-NLS-1$
- protected final String TEXT_52 = "\""; //$NON-NLS-1$
- protected final String TEXT_53 = NL + "\t\t"; //$NON-NLS-1$
- protected final String TEXT_54 = " "; //$NON-NLS-1$
- protected final String TEXT_55 = "}"; //$NON-NLS-1$
- protected final String TEXT_56 = " = { "; //$NON-NLS-1$
- protected final String TEXT_57 = ", "; //$NON-NLS-1$
- protected final String TEXT_58 = NL + "\t\t\t\t@WebInitParam(name = \""; //$NON-NLS-1$
- protected final String TEXT_59 = "\", value = \""; //$NON-NLS-1$
- protected final String TEXT_60 = "\""; //$NON-NLS-1$
- protected final String TEXT_61 = ", description = \""; //$NON-NLS-1$
- protected final String TEXT_62 = "\""; //$NON-NLS-1$
- protected final String TEXT_63 = ")"; //$NON-NLS-1$
- protected final String TEXT_64 = NL + "\t\t}"; //$NON-NLS-1$
- protected final String TEXT_65 = " = {"; //$NON-NLS-1$
- protected final String TEXT_66 = ", "; //$NON-NLS-1$
- protected final String TEXT_67 = NL + "\t\t\t\t"; //$NON-NLS-1$
- protected final String TEXT_68 = NL + "\t\t"; //$NON-NLS-1$
- protected final String TEXT_69 = " "; //$NON-NLS-1$
- protected final String TEXT_70 = "}" + NL + "\t\t\t\t\t"; //$NON-NLS-1$ //$NON-NLS-2$
- protected final String TEXT_71 = ")"; //$NON-NLS-1$
- protected final String TEXT_72 = NL + "public "; //$NON-NLS-1$
- protected final String TEXT_73 = "abstract "; //$NON-NLS-1$
- protected final String TEXT_74 = "final "; //$NON-NLS-1$
- protected final String TEXT_75 = "class "; //$NON-NLS-1$
- protected final String TEXT_76 = " extends "; //$NON-NLS-1$
- protected final String TEXT_77 = " implements "; //$NON-NLS-1$
- protected final String TEXT_78 = ", "; //$NON-NLS-1$
- protected final String TEXT_79 = " {"; //$NON-NLS-1$
- protected final String TEXT_80 = NL + NL + " /**" + NL + " * Default constructor. " + NL + " */" + NL + " public "; //$NON-NLS-1$ //$NON-NLS-2$ //$NON-NLS-3$ //$NON-NLS-4$
- protected final String TEXT_81 = "() {" + NL + " // TODO Auto-generated constructor stub" + NL + " }"; //$NON-NLS-1$ //$NON-NLS-2$ //$NON-NLS-3$
- protected final String TEXT_82 = NL + " " + NL + " /**" + NL + " * @see "; //$NON-NLS-1$ //$NON-NLS-2$ //$NON-NLS-3$
- protected final String TEXT_83 = "#"; //$NON-NLS-1$
- protected final String TEXT_84 = "("; //$NON-NLS-1$
- protected final String TEXT_85 = ")" + NL + " */" + NL + " public "; //$NON-NLS-1$ //$NON-NLS-2$ //$NON-NLS-3$
- protected final String TEXT_86 = "("; //$NON-NLS-1$
- protected final String TEXT_87 = ") {" + NL + " super("; //$NON-NLS-1$ //$NON-NLS-2$
- protected final String TEXT_88 = ");" + NL + " // TODO Auto-generated constructor stub" + NL + " }"; //$NON-NLS-1$ //$NON-NLS-2$ //$NON-NLS-3$
- protected final String TEXT_89 = NL + NL + "\t/**" + NL + " * @see "; //$NON-NLS-1$ //$NON-NLS-2$
- protected final String TEXT_90 = "#"; //$NON-NLS-1$
- protected final String TEXT_91 = "("; //$NON-NLS-1$
- protected final String TEXT_92 = ")" + NL + " */" + NL + " public "; //$NON-NLS-1$ //$NON-NLS-2$ //$NON-NLS-3$
- protected final String TEXT_93 = " "; //$NON-NLS-1$
- protected final String TEXT_94 = "("; //$NON-NLS-1$
- protected final String TEXT_95 = ") {" + NL + " // TODO Auto-generated method stub"; //$NON-NLS-1$ //$NON-NLS-2$
- protected final String TEXT_96 = NL + "\t\t\treturn "; //$NON-NLS-1$
- protected final String TEXT_97 = ";"; //$NON-NLS-1$
- protected final String TEXT_98 = NL + " }"; //$NON-NLS-1$
- protected final String TEXT_99 = NL + NL + "\t/**" + NL + "\t * @see Filter#destroy()" + NL + "\t */" + NL + "\tpublic void destroy() {" + NL + "\t\t// TODO Auto-generated method stub" + NL + "\t}"; //$NON-NLS-1$ //$NON-NLS-2$ //$NON-NLS-3$ //$NON-NLS-4$ //$NON-NLS-5$ //$NON-NLS-6$
- protected final String TEXT_100 = NL + NL + "\t/**" + NL + "\t * @see Filter#doFilter(ServletRequest, ServletResponse, FilterChain)" + NL + "\t */" + NL + "\tpublic void doFilter(ServletRequest request, ServletResponse response, FilterChain chain) throws IOException, ServletException {" + NL + "\t\t// TODO Auto-generated method stub" + NL + "\t\t// place your code here" + NL + "" + NL + "\t\t// pass the request along the filter chain" + NL + "\t\tchain.doFilter(request, response);" + NL + "\t}"; //$NON-NLS-1$ //$NON-NLS-2$ //$NON-NLS-3$ //$NON-NLS-4$ //$NON-NLS-5$ //$NON-NLS-6$ //$NON-NLS-7$ //$NON-NLS-8$ //$NON-NLS-9$ //$NON-NLS-10$
- protected final String TEXT_101 = NL + NL + "\t/**" + NL + "\t * @see Filter#init(FilterConfig)" + NL + "\t */" + NL + "\tpublic void init(FilterConfig fConfig) throws ServletException {" + NL + "\t\t// TODO Auto-generated method stub" + NL + "\t}"; //$NON-NLS-1$ //$NON-NLS-2$ //$NON-NLS-3$ //$NON-NLS-4$ //$NON-NLS-5$ //$NON-NLS-6$
- protected final String TEXT_102 = NL + NL + "}"; //$NON-NLS-1$
- protected final String TEXT_103 = NL;
-
- public String generate(Object argument)
- {
- final StringBuffer stringBuffer = new StringBuffer();
- CreateFilterTemplateModel model = (CreateFilterTemplateModel) argument;
-
- model.removeFlags(CreateJavaEEArtifactTemplateModel.FLAG_QUALIFIED_SUPERCLASS_NAME);
-
-
- if (model.getJavaPackageName() != null && model.getJavaPackageName().length() > 0) {
-
- stringBuffer.append(TEXT_1);
- stringBuffer.append( model.getJavaPackageName() );
- stringBuffer.append(TEXT_2);
-
- }
-
- stringBuffer.append(TEXT_3);
-
- Collection<String> imports = model.getImports();
- for (String anImport : imports) {
-
- stringBuffer.append(TEXT_4);
- stringBuffer.append( anImport );
- stringBuffer.append(TEXT_5);
-
- }
-
- stringBuffer.append(TEXT_6);
- stringBuffer.append(TEXT_7);
- stringBuffer.append(TEXT_8);
- stringBuffer.append( model.getClassName() );
-
- if (model.isAnnotated()) {
-
- stringBuffer.append(TEXT_9);
- stringBuffer.append( model.getFilterName() );
- stringBuffer.append(TEXT_10);
- stringBuffer.append( model.getFilterName() );
- stringBuffer.append(TEXT_11);
-
- if (model.getDescription() != null && model.getDescription().length() > 0) {
-
- stringBuffer.append(TEXT_12);
- stringBuffer.append( model.getDescription() );
- stringBuffer.append(TEXT_13);
-
- }
-
- List<IFilterMappingItem> mappings = model.getFilterMappings();
- for (IFilterMappingItem mapping : mappings) {
-
- stringBuffer.append(TEXT_14);
-
- if (mapping.isUrlPatternType()) {
-
- stringBuffer.append(TEXT_15);
- stringBuffer.append( mapping.getName() );
- stringBuffer.append(TEXT_16);
-
- } else if (mapping.isServletNameType()) {
-
- stringBuffer.append(TEXT_17);
- stringBuffer.append( mapping.getName() );
- stringBuffer.append(TEXT_18);
-
- }
-
- String dispatcher = model.getDispatcherList(mapping);
- if (dispatcher.length() > 0) {
-
- stringBuffer.append(TEXT_19);
- stringBuffer.append( dispatcher );
- stringBuffer.append(TEXT_20);
-
- }
- }
-
- List<String[]> initParams = model.getInitParams();
- if (initParams != null && initParams.size() > 0) {
- for (int i = 0; i < initParams.size(); i++) {
- String name = model.getInitParam(i, CreateFilterTemplateModel.NAME);
- String value = model.getInitParam(i, CreateFilterTemplateModel.VALUE);
- String description = model.getInitParam(i, CreateFilterTemplateModel.DESCRIPTION);
-
- stringBuffer.append(TEXT_21);
- stringBuffer.append( name );
- stringBuffer.append(TEXT_22);
- stringBuffer.append( value );
- stringBuffer.append(TEXT_23);
-
- if (description != null && description.length() > 0) {
-
- stringBuffer.append(TEXT_24);
- stringBuffer.append( description );
- stringBuffer.append(TEXT_25);
-
- }
- }
- }
- }
-
- stringBuffer.append(TEXT_26);
-
- if ("3.0".equals(model.getJavaEEVersion())) { //$NON-NLS-1$
-
- stringBuffer.append(TEXT_27);
-
- Map<String, Object> params = model.getClassAnnotationParams();
- if (params.size() == 1 && params.containsKey(CreateServletTemplateModel.ATT_URL_PATTERNS)) {
- List<String> mappings = (List<String>) params.get(CreateServletTemplateModel.ATT_URL_PATTERNS);
- if (mappings.size() == 1) {
- String value = mappings.get(0);
-
- stringBuffer.append(TEXT_28);
- stringBuffer.append( value );
- stringBuffer.append(TEXT_29);
-
- } else {
-
- stringBuffer.append(TEXT_30);
-
- boolean needComma = false;
- for (String mapping : mappings) {
- if (needComma) {
-
- stringBuffer.append(TEXT_31);
-
- }
-
- stringBuffer.append(TEXT_32);
- stringBuffer.append( mapping );
- stringBuffer.append(TEXT_33);
-
- needComma = true;
- }
-
- stringBuffer.append(TEXT_34);
-
- }
- } else if (!params.isEmpty()) {
-
- stringBuffer.append(TEXT_35);
-
- Set<String> keys = params.keySet();
- boolean needNewLine = keys.contains(CreateFilterTemplateModel.ATT_INIT_PARAMS) ||
- (keys.contains(CreateFilterTemplateModel.ATT_URL_PATTERNS) &&
- ((List<String>) params.get(CreateFilterTemplateModel.ATT_URL_PATTERNS)).size() > 1) ||
- (keys.contains(CreateFilterTemplateModel.ATT_SERVLET_NAMES) &&
- ((List<String>) params.get(CreateFilterTemplateModel.ATT_SERVLET_NAMES)).size() > 1);
- boolean needComma = false;
- for (String key : keys) {
- if (needComma) {
-
- stringBuffer.append(TEXT_36);
-
- }
-
- if (needNewLine) {
-
- stringBuffer.append(TEXT_37);
-
- }
-
- if (key.equals(CreateFilterTemplateModel.ATT_FILTER_NAME) || key.equals(CreateFilterTemplateModel.ATT_DESCRIPTION)) {
- String value = (String) params.get(key);
-
- stringBuffer.append( key );
- stringBuffer.append(TEXT_38);
- stringBuffer.append( value );
- stringBuffer.append(TEXT_39);
-
- } else if (key.equals(CreateFilterTemplateModel.ATT_URL_PATTERNS)) {
-
- stringBuffer.append( key );
- stringBuffer.append(TEXT_40);
-
- List<String> mappings = (List<String>) params.get(key);
- boolean needComma2 = false;
- boolean needNewLine2 = mappings.size() > 1;
- for (String mapping : mappings) {
- if (needComma2) {
-
- stringBuffer.append(TEXT_41);
-
- }
-
- if (needNewLine2) {
-
- stringBuffer.append(TEXT_42);
-
- }
-
- stringBuffer.append(TEXT_43);
- stringBuffer.append( mapping );
- stringBuffer.append(TEXT_44);
-
- needComma2 = true;
- }
-
- if (needNewLine2) {
-
- stringBuffer.append(TEXT_45);
-
- } else {
-
- stringBuffer.append(TEXT_46);
-
- }
-
- stringBuffer.append(TEXT_47);
-
- } else if (key.equals(CreateFilterTemplateModel.ATT_SERVLET_NAMES)) {
-
- stringBuffer.append( key );
- stringBuffer.append(TEXT_48);
-
- List<String> servletNames = (List<String>) params.get(key);
- boolean needComma2 = false;
- boolean needNewLine2 = servletNames.size() > 1;
- for (String servletName : servletNames) {
- if (needComma2) {
-
- stringBuffer.append(TEXT_49);
-
- }
-
- if (needNewLine2) {
-
- stringBuffer.append(TEXT_50);
-
- }
-
- stringBuffer.append(TEXT_51);
- stringBuffer.append( servletName );
- stringBuffer.append(TEXT_52);
-
- needComma2 = true;
- }
-
- if (needNewLine2) {
-
- stringBuffer.append(TEXT_53);
-
- } else {
-
- stringBuffer.append(TEXT_54);
-
- }
-
- stringBuffer.append(TEXT_55);
-
- } else if (key.equals(CreateFilterTemplateModel.ATT_INIT_PARAMS)) {
-
- stringBuffer.append( key );
- stringBuffer.append(TEXT_56);
-
- List<String[]> initParams = (List<String[]>) params.get(key);
- boolean needComma2 = false;
- for (String[] initParam : initParams) {
- if (needComma2) {
-
- stringBuffer.append(TEXT_57);
-
- }
-
- String name = initParam[CreateFilterTemplateModel.NAME];
- String value = initParam[CreateFilterTemplateModel.VALUE];
- String description = initParam[CreateFilterTemplateModel.DESCRIPTION];
-
- stringBuffer.append(TEXT_58);
- stringBuffer.append( name );
- stringBuffer.append(TEXT_59);
- stringBuffer.append( value );
- stringBuffer.append(TEXT_60);
-
- if (description != null && description.length() > 0) {
-
- stringBuffer.append(TEXT_61);
- stringBuffer.append( description );
- stringBuffer.append(TEXT_62);
-
- }
-
- stringBuffer.append(TEXT_63);
-
- needComma2 = true;
- }
-
- stringBuffer.append(TEXT_64);
-
- } else if (key.equals(CreateFilterTemplateModel.ATT_DISPATCHER_TYPES)) {
- List<String> dispatcherTypes = (List<String>) params.get(key);
- boolean needComma2 = false;
- boolean needNewLine2 = dispatcherTypes.size() > 1;
- if (dispatcherTypes.size()>0){
-
- stringBuffer.append( key );
- stringBuffer.append(TEXT_65);
-
- }
- for (String dispType : dispatcherTypes) {
- if (needComma2) {
-
- stringBuffer.append(TEXT_66);
-
- }
-
- if (needNewLine2) {
-
- stringBuffer.append(TEXT_67);
-
- }
-
- stringBuffer.append( dispType );
-
- needComma2 = true;
- }
-
- if (needNewLine2) {
-
- stringBuffer.append(TEXT_68);
-
- } else {
-
- stringBuffer.append(TEXT_69);
-
- }
-
- stringBuffer.append(TEXT_70);
-
- }
- needComma = true;
- }
-
- stringBuffer.append(TEXT_71);
-
- }
- }
-
-
- if (model.isPublic()) {
-
- stringBuffer.append(TEXT_72);
-
- }
-
- if (model.isAbstract()) {
-
- stringBuffer.append(TEXT_73);
-
- }
-
- if (model.isFinal()) {
-
- stringBuffer.append(TEXT_74);
-
- }
-
- stringBuffer.append(TEXT_75);
- stringBuffer.append( model.getClassName() );
-
- String superClass = model.getSuperclassName();
- if (superClass != null && superClass.length() > 0) {
-
- stringBuffer.append(TEXT_76);
- stringBuffer.append( superClass );
-
- }
-
- List<String> interfaces = model.getInterfaces();
- if ( interfaces.size() > 0) {
-
- stringBuffer.append(TEXT_77);
-
- }
-
- for (int i = 0; i < interfaces.size(); i++) {
- String INTERFACE = interfaces.get(i);
- if (i > 0) {
-
- stringBuffer.append(TEXT_78);
-
- }
-
- stringBuffer.append( INTERFACE );
-
- }
-
- stringBuffer.append(TEXT_79);
-
- if (!model.hasEmptySuperclassConstructor()) {
-
- stringBuffer.append(TEXT_80);
- stringBuffer.append( model.getClassName() );
- stringBuffer.append(TEXT_81);
-
- }
-
- if (model.shouldGenSuperclassConstructors()) {
- List<Constructor> constructors = model.getConstructors();
- for (Constructor constructor : constructors) {
- if (constructor.isPublic() || constructor.isProtected()) {
-
- stringBuffer.append(TEXT_82);
- stringBuffer.append( model.getSuperclassName() );
- stringBuffer.append(TEXT_83);
- stringBuffer.append( model.getSuperclassName() );
- stringBuffer.append(TEXT_84);
- stringBuffer.append( constructor.getParamsForJavadoc() );
- stringBuffer.append(TEXT_85);
- stringBuffer.append( model.getClassName() );
- stringBuffer.append(TEXT_86);
- stringBuffer.append( constructor.getParamsForDeclaration() );
- stringBuffer.append(TEXT_87);
- stringBuffer.append( constructor.getParamsForCall() );
- stringBuffer.append(TEXT_88);
-
- }
- }
- }
-
-
- if (model.shouldImplementAbstractMethods()) {
- for (Method method : model.getUnimplementedMethods()) {
-
- stringBuffer.append(TEXT_89);
- stringBuffer.append( method.getContainingJavaClass() );
- stringBuffer.append(TEXT_90);
- stringBuffer.append( method.getName() );
- stringBuffer.append(TEXT_91);
- stringBuffer.append( method.getParamsForJavadoc() );
- stringBuffer.append(TEXT_92);
- stringBuffer.append( method.getReturnType() );
- stringBuffer.append(TEXT_93);
- stringBuffer.append( method.getName() );
- stringBuffer.append(TEXT_94);
- stringBuffer.append( method.getParamsForDeclaration() );
- stringBuffer.append(TEXT_95);
-
- String defaultReturnValue = method.getDefaultReturnValue();
- if (defaultReturnValue != null) {
-
- stringBuffer.append(TEXT_96);
- stringBuffer.append( defaultReturnValue );
- stringBuffer.append(TEXT_97);
-
- }
-
- stringBuffer.append(TEXT_98);
-
- }
- }
-
- if (model.shouldGenDestroy()) {
- stringBuffer.append(TEXT_99);
- }
- if (model.shouldGenDoFilter()) {
- stringBuffer.append(TEXT_100);
- }
- if (model.shouldGenInit()) {
- stringBuffer.append(TEXT_101);
- }
- stringBuffer.append(TEXT_102);
- stringBuffer.append(TEXT_103);
- return stringBuffer.toString();
- }
-}
diff --git a/plugins/org.eclipse.jst.j2ee.web/web/org/eclipse/jst/j2ee/internal/web/operations/IFilterMappingItem.java b/plugins/org.eclipse.jst.j2ee.web/web/org/eclipse/jst/j2ee/internal/web/operations/IFilterMappingItem.java
deleted file mode 100644
index 4fd6f92..0000000
--- a/plugins/org.eclipse.jst.j2ee.web/web/org/eclipse/jst/j2ee/internal/web/operations/IFilterMappingItem.java
+++ /dev/null
@@ -1,30 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2007, 2008 SAP AG and others.
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
- *
- * Contributors:
- * Kaloyan Raev, kaloyan.raev@sap.com - initial API and implementation
- *******************************************************************************/
-package org.eclipse.jst.j2ee.internal.web.operations;
-
-public interface IFilterMappingItem {
-
- public static int URL_PATTERN = 0;
- public static int SERVLET_NAME = 1;
-
- public static int REQUEST = 1 << 1;
- public static int FORWARD = 1 << 2;
- public static int INCLUDE = 1 << 3;
- public static int ERROR = 1 << 4;
-
- public String getName();
- public int getMappingType();
- public boolean isUrlPatternType();
- public boolean isServletNameType();
- public int getDispatchers();
- public String getDispatchersAsString();
-
-}
diff --git a/plugins/org.eclipse.jst.j2ee.web/web/org/eclipse/jst/j2ee/internal/web/operations/INewFilterClassDataModelProperties.java b/plugins/org.eclipse.jst.j2ee.web/web/org/eclipse/jst/j2ee/internal/web/operations/INewFilterClassDataModelProperties.java
deleted file mode 100644
index 029c7c5..0000000
--- a/plugins/org.eclipse.jst.j2ee.web/web/org/eclipse/jst/j2ee/internal/web/operations/INewFilterClassDataModelProperties.java
+++ /dev/null
@@ -1,43 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2007, 2008 SAP AG and others.
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
- *
- * Contributors:
- * Kaloyan Raev, kaloyan.raev@sap.com - initial API and implementation
- *******************************************************************************/
-package org.eclipse.jst.j2ee.internal.web.operations;
-
-public interface INewFilterClassDataModelProperties extends INewWebClassDataModelProperties {
-
- /**
- * Optional, boolean property used to specify whether to generate the init method.
- * The default is false.
- */
- public static final String INIT = "NewFilterClassDataModel.INIT"; //$NON-NLS-1$
-
- /**
- * Optional, boolean property used to specify whether to generate the destroy method.
- * The default is false.
- */
- public static final String DESTROY = "NewFilterClassDataModel.DESTROY"; //$NON-NLS-1$
-
- /**
- * Optional, boolean property used to specify whether to generate the doFilter method.
- * The default is true.
- */
- public static final String DO_FILTER = "NewFilterClassDataModel.DO_FILTER"; //$NON-NLS-1$
-
- /**
- * Optional, List property used to cache all the init params defined on the filter.
- */
- public static final String INIT_PARAM = "NewFilterClassDataModel.INIT_PARAM"; //$NON-NLS-1$
-
- /**
- * Optional, List propety used to cache all the filter mappings for this filter on the web application.
- */
- public static final String FILTER_MAPPINGS = "NewFilterClassDataModel.FILTER_MAPPINGS"; //$NON-NLS-1$
-
-}
diff --git a/plugins/org.eclipse.jst.j2ee.web/web/org/eclipse/jst/j2ee/internal/web/operations/INewListenerClassDataModelProperties.java b/plugins/org.eclipse.jst.j2ee.web/web/org/eclipse/jst/j2ee/internal/web/operations/INewListenerClassDataModelProperties.java
deleted file mode 100644
index d408e9c..0000000
--- a/plugins/org.eclipse.jst.j2ee.web/web/org/eclipse/jst/j2ee/internal/web/operations/INewListenerClassDataModelProperties.java
+++ /dev/null
@@ -1,15 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2007, 2008 SAP AG and others.
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
- *
- * Contributors:
- * Kaloyan Raev, kaloyan.raev@sap.com - initial API and implementation
- *******************************************************************************/
-package org.eclipse.jst.j2ee.internal.web.operations;
-
-public interface INewListenerClassDataModelProperties extends INewWebClassDataModelProperties {
-
-}
diff --git a/plugins/org.eclipse.jst.j2ee.web/web/org/eclipse/jst/j2ee/internal/web/operations/INewServletClassDataModelProperties.java b/plugins/org.eclipse.jst.j2ee.web/web/org/eclipse/jst/j2ee/internal/web/operations/INewServletClassDataModelProperties.java
deleted file mode 100644
index 583f9a5..0000000
--- a/plugins/org.eclipse.jst.j2ee.web/web/org/eclipse/jst/j2ee/internal/web/operations/INewServletClassDataModelProperties.java
+++ /dev/null
@@ -1,109 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2005, 2008 IBM Corporation and others.
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
- *
- * Contributors:
- * IBM Corporation - initial API and implementation
- * Kiril Mitov, k.mitov@sap.com - bug 204160
- * Kaloyan Raev, kaloyan.raev@sap.com
- *******************************************************************************/
-package org.eclipse.jst.j2ee.internal.web.operations;
-
-public interface INewServletClassDataModelProperties extends INewWebClassDataModelProperties {
- /**
- * Optional, boolean property used to specify whether to generate the init method.
- * The default is false.
- */
- public static final String INIT = "NewServletClassDataModel.INIT"; //$NON-NLS-1$
-
- /**
- * Optional, boolean property used to specify whether to generate the destroy method. The default is false.
- */
- public static final String DESTROY = "NewServletClassDataModel.DESTROY"; //$NON-NLS-1$
-
- /**
- * Optional, boolean property used to specify whether to generate the getServletInfo method. The default is false.
- */
- public static final String GET_SERVLET_INFO = "NewServletClassDataModel.GET_SERVLET_INFO"; //$NON-NLS-1$
-
- /**
- * Optional, boolean property used to specify whether to generate the getServletConfig method. The default is false.
- */
- public static final String GET_SERVLET_CONFIG = "NewServletClassDataModel.GET_SERVLET_CONFIG"; //$NON-NLS-1$
-
- /**
- * Optional, boolean property used to specify whether to generate the service method. The default is false.
- */
- public static final String SERVICE = "NewServletClassDataModel.SERVICE"; //$NON-NLS-1$
-
- /**
- * Optional, boolean property used to specify whether to generate the doGet method. The default is true.
- */
- public static final String DO_GET = "NewServletClassDataModel.DO_GET"; //$NON-NLS-1$
-
- /**
- * Optional, boolean property used to specify whether to generate the doPost method.
- * The default is true.
- */
- public static final String DO_POST = "NewServletClassDataModel.DO_POST"; //$NON-NLS-1$
-
- /**
- * Optional, boolean property used to specify whether to generate the doPut method. The default is false.
- */
- public static final String DO_PUT = "NewServletClassDataModel.DO_PUT"; //$NON-NLS-1$
-
- /**
- * Optional, boolean property used to specify whether to generate the doDelete method. The default is false.
- */
- public static final String DO_DELETE = "NewServletClassDataModel.DO_DELETE"; //$NON-NLS-1$
-
- /**
- * Optional, boolean property used to specify whether to generate the doHead method. The default is false.
- */
- public static final String DO_HEAD = "NewServletClassDataModel.DO_HEAD"; //$NON-NLS-1$
-
- /**
- * Optional, boolean property used to specify whether to generate the doOptions method. The default is false.
- */
- public static final String DO_OPTIONS = "NewServletClassDataModel.DO_OPTIONS"; //$NON-NLS-1$
-
- /**
- * Optional, boolean property used to specify whether to generate the doTrace method. The default is false.
- */
- public static final String DO_TRACE = "NewServletClassDataModel.DO_TRACE"; //$NON-NLS-1$
-
- /**
- * Optional, boolean property used to specify whether to generate the doTrace method. The default is false.
- */
- public static final String TO_STRING = "NewServletClassDataModel.TO_STRING"; //$NON-NLS-1$
-
- /**
- * Optional, boolean property used to determine if building JSP or servlet.
- * The default is true.
- */
- public static final String IS_SERVLET_TYPE = "NewServletClassDataModel.IS_SERVLET_TYPE"; //$NON-NLS-1$
-
- /**
- * Optional, List property used to cache all the init params defined on the servlet.
- */
- public static final String INIT_PARAM = "NewServletClassDataModel.INIT_PARAM"; //$NON-NLS-1$
-
- /**
- * Optional, List propety used to cache all the servlet mappings for this servlet on the web application.
- */
- public static final String URL_MAPPINGS = "NewServletClassDataModel.URL_MAPPINGS"; //$NON-NLS-1$
-
- /**
- * Do not set! The javajet template file used in creating the annotated servlet template class
- */
- public static final String TEMPLATE_FILE = "NewServletClassDataModel.TEMPLATE_FILE"; //$NON-NLS-1$
-
- /**
- * Do not set! The javajet template file used in creating the non-annotated servlet template class
- */
- public static final String NON_ANNOTATED_TEMPLATE_FILE = "NewServletClassDataModel.NON_ANNOTATED_TEMPLATE_FILE"; //$NON-NLS-1$
-
-}
diff --git a/plugins/org.eclipse.jst.j2ee.web/web/org/eclipse/jst/j2ee/internal/web/operations/INewWebClassDataModelProperties.java b/plugins/org.eclipse.jst.j2ee.web/web/org/eclipse/jst/j2ee/internal/web/operations/INewWebClassDataModelProperties.java
deleted file mode 100644
index 5650d41..0000000
--- a/plugins/org.eclipse.jst.j2ee.web/web/org/eclipse/jst/j2ee/internal/web/operations/INewWebClassDataModelProperties.java
+++ /dev/null
@@ -1,45 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2008 SAP AG and others.
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
- *
- * Contributors:
- * Kaloyan Raev, kaloyan.raev@sap.com - initial API and implementation
- *******************************************************************************/
-package org.eclipse.jst.j2ee.internal.web.operations;
-
-import org.eclipse.jst.j2ee.application.internal.operations.IAnnotationsDataModel;
-import org.eclipse.jst.j2ee.internal.common.operations.INewJavaClassDataModelProperties;
-
-public interface INewWebClassDataModelProperties extends INewJavaClassDataModelProperties, IAnnotationsDataModel {
-
- /**
- * Required, String property of the display name for the filter
- */
- public static final String DISPLAY_NAME = "NewServletClassDataModel.DISPLAY_NAME"; //$NON-NLS-1$
-
- /**
- * Optional, String property of the description info for the filter
- */
- public static final String DESCRIPTION = "NewServletClassDataModel.DESCRIPTION"; //$NON-NLS-1$
-
- /**
- * Optional, boolean property used to specify whether or not to generate a new java class.
- * The default is false.
- */
- public static final String USE_EXISTING_CLASS = "NewServletClassDataModel.USE_EXISTING_CLASS"; //$NON-NLS-1$
-
- /**
- * Optional, boolean property used to specify whether or not to generate artifacts in web.xml
- */
- public static final String REGISTER_IN_WEB_XML = "NewServletClassDataModel.REGISTER_IN_WEB_XML"; //$NON-NLS-1$
-
- /**
- * Optional, boolean property used to specify whether or not to generate artifacts in web.xml
- */
- public static final String JAVA_EE_VERSION = "NewServletClassDataModel.JAVA_EE_VERSION"; //$NON-NLS-1$
-
-
-}
diff --git a/plugins/org.eclipse.jst.j2ee.web/web/org/eclipse/jst/j2ee/internal/web/operations/ListenerTemplate.java b/plugins/org.eclipse.jst.j2ee.web/web/org/eclipse/jst/j2ee/internal/web/operations/ListenerTemplate.java
deleted file mode 100644
index 0ad2ccc..0000000
--- a/plugins/org.eclipse.jst.j2ee.web/web/org/eclipse/jst/j2ee/internal/web/operations/ListenerTemplate.java
+++ /dev/null
@@ -1,225 +0,0 @@
-package org.eclipse.jst.j2ee.internal.web.operations;
-
-import java.util.*;
-import org.eclipse.jst.j2ee.internal.common.operations.*;
-
-public class ListenerTemplate
-{
- protected static String nl;
- public static synchronized ListenerTemplate create(String lineSeparator)
- {
- nl = lineSeparator;
- ListenerTemplate result = new ListenerTemplate();
- nl = null;
- return result;
- }
-
- public final String NL = nl == null ? (System.getProperties().getProperty("line.separator")) : nl; //$NON-NLS-1$
- protected final String TEXT_1 = "package "; //$NON-NLS-1$
- protected final String TEXT_2 = ";"; //$NON-NLS-1$
- protected final String TEXT_3 = NL;
- protected final String TEXT_4 = NL + "import "; //$NON-NLS-1$
- protected final String TEXT_5 = ";"; //$NON-NLS-1$
- protected final String TEXT_6 = NL;
- protected final String TEXT_7 = NL;
- protected final String TEXT_8 = "/**" + NL + " * Application Lifecycle Listener implementation class "; //$NON-NLS-1$ //$NON-NLS-2$
- protected final String TEXT_9 = NL + " *"; //$NON-NLS-1$
- protected final String TEXT_10 = NL + " * @web.listener"; //$NON-NLS-1$
- protected final String TEXT_11 = NL + " */"; //$NON-NLS-1$
- protected final String TEXT_12 = NL + "@WebListener"; //$NON-NLS-1$
- protected final String TEXT_13 = NL + "public "; //$NON-NLS-1$
- protected final String TEXT_14 = "abstract "; //$NON-NLS-1$
- protected final String TEXT_15 = "final "; //$NON-NLS-1$
- protected final String TEXT_16 = "class "; //$NON-NLS-1$
- protected final String TEXT_17 = " extends "; //$NON-NLS-1$
- protected final String TEXT_18 = " implements "; //$NON-NLS-1$
- protected final String TEXT_19 = ", "; //$NON-NLS-1$
- protected final String TEXT_20 = " {"; //$NON-NLS-1$
- protected final String TEXT_21 = NL + NL + " /**" + NL + " * Default constructor. " + NL + " */" + NL + " public "; //$NON-NLS-1$ //$NON-NLS-2$ //$NON-NLS-3$ //$NON-NLS-4$
- protected final String TEXT_22 = "() {" + NL + " // TODO Auto-generated constructor stub" + NL + " }"; //$NON-NLS-1$ //$NON-NLS-2$ //$NON-NLS-3$
- protected final String TEXT_23 = NL + " " + NL + " /**" + NL + " * @see "; //$NON-NLS-1$ //$NON-NLS-2$ //$NON-NLS-3$
- protected final String TEXT_24 = "#"; //$NON-NLS-1$
- protected final String TEXT_25 = "("; //$NON-NLS-1$
- protected final String TEXT_26 = ")" + NL + " */" + NL + " public "; //$NON-NLS-1$ //$NON-NLS-2$ //$NON-NLS-3$
- protected final String TEXT_27 = "("; //$NON-NLS-1$
- protected final String TEXT_28 = ") {" + NL + " super("; //$NON-NLS-1$ //$NON-NLS-2$
- protected final String TEXT_29 = ");" + NL + " // TODO Auto-generated constructor stub" + NL + " }"; //$NON-NLS-1$ //$NON-NLS-2$ //$NON-NLS-3$
- protected final String TEXT_30 = NL + NL + "\t/**" + NL + " * @see "; //$NON-NLS-1$ //$NON-NLS-2$
- protected final String TEXT_31 = "#"; //$NON-NLS-1$
- protected final String TEXT_32 = "("; //$NON-NLS-1$
- protected final String TEXT_33 = ")" + NL + " */" + NL + " public "; //$NON-NLS-1$ //$NON-NLS-2$ //$NON-NLS-3$
- protected final String TEXT_34 = " "; //$NON-NLS-1$
- protected final String TEXT_35 = "("; //$NON-NLS-1$
- protected final String TEXT_36 = ") {" + NL + " // TODO Auto-generated method stub"; //$NON-NLS-1$ //$NON-NLS-2$
- protected final String TEXT_37 = NL + "\t\t\treturn "; //$NON-NLS-1$
- protected final String TEXT_38 = ";"; //$NON-NLS-1$
- protected final String TEXT_39 = NL + " }"; //$NON-NLS-1$
- protected final String TEXT_40 = NL + "\t" + NL + "}"; //$NON-NLS-1$ //$NON-NLS-2$
- protected final String TEXT_41 = NL;
-
- public String generate(Object argument)
- {
- final StringBuffer stringBuffer = new StringBuffer();
- CreateListenerTemplateModel model = (CreateListenerTemplateModel) argument;
-
- model.removeFlags(CreateJavaEEArtifactTemplateModel.FLAG_QUALIFIED_SUPERCLASS_NAME);
-
-
- if (model.getJavaPackageName() != null && model.getJavaPackageName().length() > 0) {
-
- stringBuffer.append(TEXT_1);
- stringBuffer.append( model.getJavaPackageName() );
- stringBuffer.append(TEXT_2);
-
- }
-
- stringBuffer.append(TEXT_3);
-
- Collection<String> imports = model.getImports();
- for (String anImport : imports) {
-
- stringBuffer.append(TEXT_4);
- stringBuffer.append( anImport );
- stringBuffer.append(TEXT_5);
-
- }
-
- stringBuffer.append(TEXT_6);
- stringBuffer.append(TEXT_7);
- stringBuffer.append(TEXT_8);
- stringBuffer.append( model.getClassName() );
- stringBuffer.append(TEXT_9);
-
- if (model.isAnnotated()) {
-
- stringBuffer.append(TEXT_10);
-
- }
-
- stringBuffer.append(TEXT_11);
-
- if ("3.0".equals(model.getJavaEEVersion())) { //$NON-NLS-1$
-
- stringBuffer.append(TEXT_12);
-
-}
-
-
- if (model.isPublic()) {
-
- stringBuffer.append(TEXT_13);
-
- }
-
- if (model.isAbstract()) {
-
- stringBuffer.append(TEXT_14);
-
- }
-
- if (model.isFinal()) {
-
- stringBuffer.append(TEXT_15);
-
- }
-
- stringBuffer.append(TEXT_16);
- stringBuffer.append( model.getClassName() );
-
- String superClass = model.getSuperclassName();
- if (superClass != null && superClass.length() > 0) {
-
- stringBuffer.append(TEXT_17);
- stringBuffer.append( superClass );
-
- }
-
- List<String> interfaces = model.getInterfaces();
- if ( interfaces.size() > 0) {
-
- stringBuffer.append(TEXT_18);
-
- }
-
- for (int i = 0; i < interfaces.size(); i++) {
- String INTERFACE = interfaces.get(i);
- if (i > 0) {
-
- stringBuffer.append(TEXT_19);
-
- }
-
- stringBuffer.append( INTERFACE );
-
- }
-
- stringBuffer.append(TEXT_20);
-
- if (!model.hasEmptySuperclassConstructor()) {
-
- stringBuffer.append(TEXT_21);
- stringBuffer.append( model.getClassName() );
- stringBuffer.append(TEXT_22);
-
- }
-
- if (model.shouldGenSuperclassConstructors()) {
- List<Constructor> constructors = model.getConstructors();
- for (Constructor constructor : constructors) {
- if (constructor.isPublic() || constructor.isProtected()) {
-
- stringBuffer.append(TEXT_23);
- stringBuffer.append( model.getSuperclassName() );
- stringBuffer.append(TEXT_24);
- stringBuffer.append( model.getSuperclassName() );
- stringBuffer.append(TEXT_25);
- stringBuffer.append( constructor.getParamsForJavadoc() );
- stringBuffer.append(TEXT_26);
- stringBuffer.append( model.getClassName() );
- stringBuffer.append(TEXT_27);
- stringBuffer.append( constructor.getParamsForDeclaration() );
- stringBuffer.append(TEXT_28);
- stringBuffer.append( constructor.getParamsForCall() );
- stringBuffer.append(TEXT_29);
-
- }
- }
- }
-
-
- if (model.shouldImplementAbstractMethods()) {
- for (Method method : model.getUnimplementedMethods()) {
-
- stringBuffer.append(TEXT_30);
- stringBuffer.append( method.getContainingJavaClass() );
- stringBuffer.append(TEXT_31);
- stringBuffer.append( method.getName() );
- stringBuffer.append(TEXT_32);
- stringBuffer.append( method.getParamsForJavadoc() );
- stringBuffer.append(TEXT_33);
- stringBuffer.append( method.getReturnType() );
- stringBuffer.append(TEXT_34);
- stringBuffer.append( method.getName() );
- stringBuffer.append(TEXT_35);
- stringBuffer.append( method.getParamsForDeclaration() );
- stringBuffer.append(TEXT_36);
-
- String defaultReturnValue = method.getDefaultReturnValue();
- if (defaultReturnValue != null) {
-
- stringBuffer.append(TEXT_37);
- stringBuffer.append( defaultReturnValue );
- stringBuffer.append(TEXT_38);
-
- }
-
- stringBuffer.append(TEXT_39);
-
- }
- }
-
- stringBuffer.append(TEXT_40);
- stringBuffer.append(TEXT_41);
- return stringBuffer.toString();
- }
-}
diff --git a/plugins/org.eclipse.jst.j2ee.web/web/org/eclipse/jst/j2ee/internal/web/operations/NewFilterClassDataModelProvider.java b/plugins/org.eclipse.jst.j2ee.web/web/org/eclipse/jst/j2ee/internal/web/operations/NewFilterClassDataModelProvider.java
deleted file mode 100644
index c928ef9..0000000
--- a/plugins/org.eclipse.jst.j2ee.web/web/org/eclipse/jst/j2ee/internal/web/operations/NewFilterClassDataModelProvider.java
+++ /dev/null
@@ -1,371 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2007, 2008 SAP AG and others.
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
- *
- * Contributors:
- * Kaloyan Raev, kaloyan.raev@sap.com - initial API and implementation
- *******************************************************************************/
-package org.eclipse.jst.j2ee.internal.web.operations;
-
-import static org.eclipse.jst.j2ee.internal.common.operations.INewJavaClassDataModelProperties.ABSTRACT_METHODS;
-import static org.eclipse.jst.j2ee.internal.common.operations.INewJavaClassDataModelProperties.CLASS_NAME;
-import static org.eclipse.jst.j2ee.internal.common.operations.INewJavaClassDataModelProperties.INTERFACES;
-import static org.eclipse.jst.j2ee.internal.common.operations.INewJavaClassDataModelProperties.SUPERCLASS;
-import static org.eclipse.jst.j2ee.internal.web.operations.INewFilterClassDataModelProperties.DESTROY;
-import static org.eclipse.jst.j2ee.internal.web.operations.INewFilterClassDataModelProperties.DO_FILTER;
-import static org.eclipse.jst.j2ee.internal.web.operations.INewFilterClassDataModelProperties.FILTER_MAPPINGS;
-import static org.eclipse.jst.j2ee.internal.web.operations.INewFilterClassDataModelProperties.INIT;
-import static org.eclipse.jst.j2ee.internal.web.operations.INewFilterClassDataModelProperties.INIT_PARAM;
-import static org.eclipse.jst.j2ee.internal.web.operations.INewWebClassDataModelProperties.DISPLAY_NAME;
-import static org.eclipse.jst.j2ee.web.IServletConstants.QUALIFIED_FILTER;
-
-import java.util.ArrayList;
-import java.util.List;
-import java.util.Set;
-
-import org.eclipse.core.runtime.IStatus;
-import org.eclipse.jst.j2ee.internal.common.operations.NewJavaClassDataModelProvider;
-import org.eclipse.jst.j2ee.model.IModelProvider;
-import org.eclipse.jst.j2ee.model.ModelProviderManager;
-import org.eclipse.jst.j2ee.web.validation.UrlPattern;
-import org.eclipse.osgi.util.NLS;
-import org.eclipse.wst.common.frameworks.datamodel.IDataModel;
-import org.eclipse.wst.common.frameworks.datamodel.IDataModelOperation;
-import org.eclipse.wst.common.frameworks.datamodel.IDataModelProvider;
-import org.eclipse.wst.common.frameworks.internal.plugin.WTPCommonPlugin;
-
-public class NewFilterClassDataModelProvider extends
- NewWebClassDataModelProvider {
-
- /**
- * String array of the default, minimum required fully qualified Filter
- * interfaces
- */
- private final static String[] FILTER_INTERFACES = { QUALIFIED_FILTER };
-
- @Override
- public boolean isPropertyEnabled(String propertyName) {
- if (ABSTRACT_METHODS.equals(propertyName)) {
- return false;
- } else if (INIT.equals(propertyName)) {
- return false;
- } else if (DESTROY.equals(propertyName)) {
- return false;
- } else if (DO_FILTER.equals(propertyName)) {
- return false;
- }
- // Otherwise return super implementation
- return super.isPropertyEnabled(propertyName);
- }
-
- /**
- * Subclasses may extend this method to provide their own default operation
- * for this data model provider. This implementation uses the
- * AddFilterOperation to drive the filter creation. It will not return null.
- *
- * @see IDataModel#getDefaultOperation()
- *
- * @return IDataModelOperation AddFilterOperation
- */
- @Override
- public IDataModelOperation getDefaultOperation() {
- return new AddFilterOperation(getDataModel());
- }
-
- /**
- * Subclasses may extend this method to add their own data model's
- * properties as valid base properties.
- *
- * @see org.eclipse.wst.common.frameworks.datamodel.IDataModelProvider#getPropertyNames()
- */
- @Override
- public Set getPropertyNames() {
- // Add filter specific properties defined in this data model
- Set propertyNames = super.getPropertyNames();
-
- propertyNames.add(INIT);
- propertyNames.add(DESTROY);
- propertyNames.add(DO_FILTER);
- propertyNames.add(INIT_PARAM);
- propertyNames.add(FILTER_MAPPINGS);
-
- return propertyNames;
- }
-
- /**
- * Subclasses may extend this method to provide their own default values for
- * any of the properties in the data model hierarchy. This method does not
- * accept a null parameter. It may return null. This implementation sets
- * annotation use to be true, and to generate a filter with doFilter.
- *
- * @see NewJavaClassDataModelProvider#getDefaultProperty(String)
- * @see IDataModelProvider#getDefaultProperty(String)
- *
- * @param propertyName
- * @return Object default value of property
- */
- @Override
- public Object getDefaultProperty(String propertyName) {
- if (propertyName.equals(DESTROY))
- return Boolean.TRUE;
- else if (propertyName.equals(DO_FILTER))
- return Boolean.TRUE;
- else if (propertyName.equals(INIT))
- return Boolean.TRUE;
- else if (propertyName.equals(FILTER_MAPPINGS))
- return getDefaultFilterMapping();
- else if (propertyName.equals(INTERFACES))
- return getFilterInterfaces();
-
- // Otherwise check super for default value for property
- return super.getDefaultProperty(propertyName);
- }
-
- /**
- * Returns the default Url Mapping depending upon the display name of the
- * Filter
- *
- * @return List containting the default Url Mapping
- */
- private Object getDefaultFilterMapping() {
- List filterMappings = null;
- String text = (String) getProperty(DISPLAY_NAME);
- if (text != null) {
- filterMappings = new ArrayList();
- filterMappings.add(new FilterMappingItem(FilterMappingItem.URL_PATTERN, "/" + text)); //$NON-NLS-1$
- }
- return filterMappings;
- }
-
- /**
- * Subclasses may extend this method to provide their own validation on any
- * of the valid data model properties in the hierarchy. This implementation
- * adds validation for the init params, filter mappings, display name, and
- * existing class fields specific to the filter java class creation. It does
- * not accept a null parameter. This method will not return null.
- *
- * @see NewJavaClassDataModelProvider#validate(String)
- *
- * @param propertyName
- * @return IStatus is property value valid?
- */
- @Override
- public IStatus validate(String propertyName) {
- // If our default is the superclass, we know it is ok
- if (propertyName.equals(SUPERCLASS) && "".equals(getStringProperty(propertyName))) //$NON-NLS-1$
- return WTPCommonPlugin.OK_STATUS;
- // Validate init params
- if (propertyName.equals(INIT_PARAM))
- return validateInitParamList((List) getProperty(propertyName));
- // Validate url pattern and servlet name mappings
- if (propertyName.equals(FILTER_MAPPINGS))
- return validateFilterMappingList((List) getProperty(FILTER_MAPPINGS));
- // Validate the filter name in DD
- if (propertyName.equals(DISPLAY_NAME))
- return validateDisplayName(getStringProperty(propertyName));
-
- // Otherwise defer to super to validate the property
- return super.validate(propertyName);
- }
-
- /**
- * This method is intended for internal use only. It will be used to
- * validate the init params list to ensure there are not any duplicates.
- * This method will accept a null paramter. It will not return null.
- *
- * @see NewFilterClassDataModelProvider#validate(String)
- *
- * @param prop
- * @return IStatus is init params list valid?
- */
- private IStatus validateInitParamList(List prop) {
- if (prop != null && !prop.isEmpty()) {
- // Ensure there are not duplicate entries in the list
- boolean dup = hasDuplicatesInStringArrayList(prop);
- if (dup) {
- String msg = WebMessages.ERR_DUPLICATED_INIT_PARAMETER;
- return WTPCommonPlugin.createErrorStatus(msg);
- }
- }
- // Return OK
- return WTPCommonPlugin.OK_STATUS;
- }
-
- /**
- * This method is intended for internal use only. This will validate the
- * filter mappings list and ensure there are not duplicate entries. It will
- * accept a null parameter. It will not return null.
- *
- * @see NewFilterClassDataModelProvider#validate(String)
- *
- * @param prop
- * @return IStatus is filter mapping list valid?
- */
- private IStatus validateFilterMappingList(List prop) {
- if (prop != null && !prop.isEmpty()) {
- // Ensure there are not duplicates in the mapping list
- boolean dup = hasDuplicatesInFilterMappingItemList(prop);
- if (dup) {
- String msg = WebMessages.ERR_DUPLICATED_URL_MAPPING;
- return WTPCommonPlugin.createErrorStatus(msg);
- }
- String isValidValue = validateValue(prop);
- if (isValidValue != null && isValidValue.length() > 0) {
- NLS.bind(WebMessages.ERR_URL_PATTERN_INVALID, isValidValue);
- String resourceString = WebMessages.getResourceString(WebMessages.ERR_URL_PATTERN_INVALID, new String[]{isValidValue});
- return WTPCommonPlugin.createErrorStatus(resourceString);
- }
- } else {
- String msg = WebMessages.ERR_FILTER_MAPPING_EMPTY;
- return WTPCommonPlugin.createErrorStatus(msg);
- }
- // Return OK
- return WTPCommonPlugin.OK_STATUS;
- }
-
- private boolean hasDuplicatesInFilterMappingItemList(List<IFilterMappingItem> input) {
- // If list is null or empty return false
- if (input == null) return false;
- int n = input.size();
- boolean dup = false;
- // nested for loops to check each element to see if other elements are the same
- for (int i = 0; i < n; i++) {
- IFilterMappingItem item = input.get(i);
- for (int j = i + 1; j < n; j++) {
- IFilterMappingItem item2 = input.get(j);
- if (item.getName().equals(item2.getName()) &&
- item.getMappingType() == item2.getMappingType()) {
- dup = true;
- break;
- }
- }
- if (dup) break;
- }
- // Return boolean status for duplicates
- return dup;
- }
-
- /**
- * This method is intended for internal use only. It provides a simple
- * algorithm for detecting if there are invalid pattern's value in a list.
- * It will accept a null parameter.
- *
- * @see NewFilterClassDataModelProvider#validateFilterMappingList(List)
- *
- * @param input
- * @return String first invalid pattern's value
- */
- private String validateValue(List prop) {
- if (prop == null) {
- return ""; //$NON-NLS-1$
- }
- int size = prop.size();
- for (int i = 0; i < size; i++) {
- IFilterMappingItem filterMappingValue = (IFilterMappingItem) prop.get(i);
- if (filterMappingValue.isUrlPatternType() &&
- !UrlPattern.isValid(filterMappingValue.getName()))
- return filterMappingValue.getName();
- }
- return ""; //$NON-NLS-1$
- }
-
- /**
- * This method will return the list of filter interfaces to be implemented
- * for the new servlet java class. It will intialize the list using lazy
- * initialization to the minimum interfaces required by the data model
- * FILTER_INTERFACES. This method will not return null.
- *
- * @see #FILTER_INTERFACES
- *
- * @return List of servlet interfaces to be implemented
- */
- private List getFilterInterfaces() {
- if (interfaceList == null) {
- interfaceList = new ArrayList();
- // Add minimum required list of servlet interfaces to be implemented
- for (int i = 0; i < FILTER_INTERFACES.length; i++) {
- interfaceList.add(FILTER_INTERFACES[i]);
- }
- }
- // Return interface list
- return interfaceList;
- }
-
- /**
- * This method is intended for internal use only. This will validate whether
- * the display name selected is a valid display name for the filter in the
- * specified web application. It will make sure the name is not empty and
- * that it doesn't already exist in the web app. This method will accept
- * null as a parameter. It will not return null.
- *
- * @see NewFilterClassDataModelProvider#validate(String)
- *
- * @param prop
- * @return IStatus is filter display name valid?
- */
- private IStatus validateDisplayName(String prop) {
- // Ensure the filter display name is not null or empty
- if (prop == null || prop.trim().length() == 0) {
- String msg = WebMessages.ERR_DISPLAY_NAME_EMPTY;
- return WTPCommonPlugin.createErrorStatus(msg);
- }
- if (getTargetProject() == null || getTargetComponent() == null)
- return WTPCommonPlugin.OK_STATUS;
-
- IModelProvider provider = ModelProviderManager.getModelProvider(getTargetProject());
- Object mObj = provider.getModelObject();
- if (mObj instanceof org.eclipse.jst.j2ee.webapplication.WebApp) {
- org.eclipse.jst.j2ee.webapplication.WebApp webApp = (org.eclipse.jst.j2ee.webapplication.WebApp) mObj;
-
- List filters = webApp.getFilters();
- boolean exists = false;
- // Ensure the display does not already exist in the web application
- if (filters != null && !filters.isEmpty()) {
- for (int i = 0; i < filters.size(); i++) {
- String name = ((org.eclipse.jst.j2ee.webapplication.Filter) filters.get(i)).getName();
- if (prop.equals(name))
- exists = true;
- }
- }
- // If the filter name already exists, throw an error
- if (exists) {
- String msg = WebMessages.getResourceString(WebMessages.ERR_FILTER_NAME_EXIST, new String[]{prop});
- return WTPCommonPlugin.createErrorStatus(msg);
- }
- } else if (mObj instanceof org.eclipse.jst.javaee.web.WebApp) {
- org.eclipse.jst.javaee.web.WebApp webApp = (org.eclipse.jst.javaee.web.WebApp) mObj;
-
- List filters = webApp.getFilters();
- boolean exists = false;
- // Ensure the display does not already exist in the web application
- if (filters != null && !filters.isEmpty()) {
- for (int i = 0; i < filters.size(); i++) {
- String name = ((org.eclipse.jst.javaee.web.Filter) filters.get(i)).getFilterName();
- if (prop.equals(name))
- exists = true;
- }
- }
- // If the filter name already exists, throw an error
- if (exists) {
- String msg = WebMessages.getResourceString(WebMessages.ERR_FILTER_NAME_EXIST, new String[] {prop});
- return WTPCommonPlugin.createErrorStatus(msg);
- }
- }
-
- // Otherwise, return OK
- return WTPCommonPlugin.OK_STATUS;
- }
-
- @Override
- public boolean propertySet(String propertyName, Object propertyValue) {
- if (DISPLAY_NAME.equals(propertyName) || CLASS_NAME.equals(propertyName)) {
- model.notifyPropertyChange(FILTER_MAPPINGS, IDataModel.DEFAULT_CHG);
- }
-
- return super.propertySet(propertyName, propertyValue);
- }
-
-}
diff --git a/plugins/org.eclipse.jst.j2ee.web/web/org/eclipse/jst/j2ee/internal/web/operations/NewFilterClassOperation.java b/plugins/org.eclipse.jst.j2ee.web/web/org/eclipse/jst/j2ee/internal/web/operations/NewFilterClassOperation.java
deleted file mode 100644
index a9675d0..0000000
--- a/plugins/org.eclipse.jst.j2ee.web/web/org/eclipse/jst/j2ee/internal/web/operations/NewFilterClassOperation.java
+++ /dev/null
@@ -1,95 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2007, 2008 SAP AG and others.
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
- *
- * Contributors:
- * Kaloyan Raev, kaloyan.raev@sap.com - initial API and implementation
- *******************************************************************************/
-package org.eclipse.jst.j2ee.internal.web.operations;
-
-import org.eclipse.core.runtime.IProgressMonitor;
-import org.eclipse.jdt.core.IPackageFragment;
-import org.eclipse.wst.common.componentcore.internal.operation.ArtifactEditProviderOperation;
-import org.eclipse.wst.common.frameworks.datamodel.IDataModel;
-
-/**
- * The NewFilterClassOperation is an IDataModelOperation following the
- * IDataModel wizard and operation framework.
- *
- * @see org.eclipse.wst.common.frameworks.datamodel.IDataModelOperation
- * @see org.eclipse.wst.common.frameworks.datamodel.IDataModelProvider
- *
- * It extends ArtifactEditProviderOperation to provide filter specific java
- * class generation.
- * @see org.eclipse.wst.common.componentcore.internal.operation.ArtifactEditProviderOperation
- *
- * This operation is used by the AddFilterOperation to generate an
- * non annotated java class for an added filter. It shares the
- * NewFilterClassDataModelProvider with the AddFilterOperation to store the
- * appropriate properties required to generate the new filter.
- * @see org.eclipse.jst.j2ee.internal.web.operations.AddFilterOperation
- * @see org.eclipse.jst.j2ee.internal.web.operations.NewFilterClassDataModelProvider
- *
- * A WTPJetEmitter filter template is used to create the class with the filter template.
- * @see org.eclipse.jst.j2ee.internal.project.WTPJETEmitter
- * @see org.eclipse.jst.j2ee.internal.web.operations.CreateFilterTemplateModel
- *
- * Subclasses may extend this operation to provide their own specific filter
- * java class generation. The execute method may be extended to do so. Also,
- * generateUsingTemplates is exposed.
- *
- * The use of this class is EXPERIMENTAL and is subject to substantial changes.
- */
-public class NewFilterClassOperation extends NewWebClassOperation {
-
- /**
- * folder location of the filter creation templates diretory
- */
- protected static final String TEMPLATE_FILE = "/templates/filter.javajet"; //$NON-NLS-1$
-
- /**
- * This is the constructor which should be used when creating a
- * NewFilterClassOperation. An instance of the NewFilterClassDataModel
- * should be passed in. This does not accept null parameter. It will not
- * return null.
- *
- * @see ArtifactEditProviderOperation#ArtifactEditProviderOperation(IDataModel)
- * @see NewFilterClassDataModel
- *
- * @param dataModel
- * @return NewFilterClassOperation
- */
- public NewFilterClassOperation(IDataModel dataModel) {
- super(dataModel);
- }
-
- /**
- * This method will create an instance of the CreateFilterTemplate model to
- * be used in conjunction with the WTPJETEmitter. This method will not
- * return null.
- *
- * @see CreateFilterTemplateModel
- * @see NewFilterClassOperation#generateUsingTemplates(IProgressMonitor,
- * IPackageFragment)
- *
- * @return CreateFilterTemplateModel
- */
- @Override
- protected CreateFilterTemplateModel createTemplateModel() {
- return new CreateFilterTemplateModel(model);
- }
-
- @Override
- protected String getTemplateFile() {
- return TEMPLATE_FILE;
- }
-
- @Override
- protected FilterTemplate getTemplateImplementation() {
- return FilterTemplate.create(null);
- }
-
-}
diff --git a/plugins/org.eclipse.jst.j2ee.web/web/org/eclipse/jst/j2ee/internal/web/operations/NewListenerClassDataModelProvider.java b/plugins/org.eclipse.jst.j2ee.web/web/org/eclipse/jst/j2ee/internal/web/operations/NewListenerClassDataModelProvider.java
deleted file mode 100644
index 587928c..0000000
--- a/plugins/org.eclipse.jst.j2ee.web/web/org/eclipse/jst/j2ee/internal/web/operations/NewListenerClassDataModelProvider.java
+++ /dev/null
@@ -1,138 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2007, 2008 SAP AG and others.
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
- *
- * Contributors:
- * Kaloyan Raev, kaloyan.raev@sap.com - initial API and implementation
- *******************************************************************************/
-package org.eclipse.jst.j2ee.internal.web.operations;
-
-import static org.eclipse.jst.j2ee.internal.common.operations.INewJavaClassDataModelProperties.INTERFACES;
-import static org.eclipse.jst.j2ee.web.IServletConstants.QUALIFIED_HTTP_SESSION_ACTIVATION_LISTENER;
-import static org.eclipse.jst.j2ee.web.IServletConstants.QUALIFIED_HTTP_SESSION_ATTRIBUTE_LISTENER;
-import static org.eclipse.jst.j2ee.web.IServletConstants.QUALIFIED_HTTP_SESSION_BINDING_LISTENER;
-import static org.eclipse.jst.j2ee.web.IServletConstants.QUALIFIED_HTTP_SESSION_LISTENER;
-import static org.eclipse.jst.j2ee.web.IServletConstants.QUALIFIED_SERVLET_CONTEXT_ATTRIBUTE_LISTENER;
-import static org.eclipse.jst.j2ee.web.IServletConstants.QUALIFIED_SERVLET_CONTEXT_LISTENER;
-import static org.eclipse.jst.j2ee.web.IServletConstants.QUALIFIED_SERVLET_REQUEST_ATTRIBUTE_LISTENER;
-import static org.eclipse.jst.j2ee.web.IServletConstants.QUALIFIED_SERVLET_REQUEST_LISTENER;
-
-import java.util.List;
-
-import org.eclipse.core.runtime.IStatus;
-import org.eclipse.jst.j2ee.internal.common.operations.NewJavaClassDataModelProvider;
-import org.eclipse.wst.common.frameworks.datamodel.IDataModel;
-import org.eclipse.wst.common.frameworks.datamodel.IDataModelOperation;
-import org.eclipse.wst.common.frameworks.internal.plugin.WTPCommonPlugin;
-
-/**
- * The NewListenerClassDataModelProvider is a subclass of
- * NewWebClassDataModelProvider and follows the IDataModel Operation and Wizard
- * frameworks.
- *
- * @see org.eclipse.wst.common.frameworks.datamodel.IDataModelProvider
- * @see org.eclipse.wst.common.frameworks.datamodel.IDataModelOperation
- *
- * This data model provider is a subclass of the NewWebClassDataModelProvider,
- * which stores base properties necessary in the creation of a default java
- * class.
- * @see org.eclipse.jst.j2ee.internal.common.operations.NewWebClassDataModelProvider
- *
- * The NewListenerClassDataModelProvider provides more specific properties for
- * java class creation that are required in creating a listener java class. The
- * data model provider is used to store these values for the
- * NewListenerClassOperation.
- * @see org.eclipse.jst.j2ee.internal.web.operations.INewListenerClassDataModelProperties
- * That operation will create the listener java class based on the settings
- * defined here in the data model.
- * @see org.eclipse.jst.j2ee.internal.web.operations.NewListenerClassOperation
- *
- * This data model properties implements the IAnnotationsDataModel to get the
- * USE_ANNOTATIONS property for determining whether or not to generate an
- * annotated java class.
- * @see org.eclipse.jst.j2ee.application.internal.operations.IAnnotationsDataModel
- *
- * Clients can subclass this data model provider to cache and provide their own
- * specific attributes. They should also provide their own validation methods,
- * properties interface, and default values for the properties they add.
- *
- * The use of this class is EXPERIMENTAL and is subject to substantial changes.
- */
-public class NewListenerClassDataModelProvider extends
- NewWebClassDataModelProvider {
-
- public static final String[] LISTENER_INTERFACES = {
- QUALIFIED_SERVLET_CONTEXT_LISTENER,
- QUALIFIED_SERVLET_CONTEXT_ATTRIBUTE_LISTENER,
- QUALIFIED_HTTP_SESSION_LISTENER,
- QUALIFIED_HTTP_SESSION_ATTRIBUTE_LISTENER,
- QUALIFIED_HTTP_SESSION_ACTIVATION_LISTENER,
- QUALIFIED_HTTP_SESSION_BINDING_LISTENER,
- QUALIFIED_SERVLET_REQUEST_LISTENER,
- QUALIFIED_SERVLET_REQUEST_ATTRIBUTE_LISTENER
- };
-
- /**
- * Subclasses may extend this method to provide their own default operation
- * for this data model provider. This implementation uses the
- * AddListenerOperation to drive the listener creation. It will not return
- * null.
- *
- * @see IDataModel#getDefaultOperation()
- *
- * @return IDataModelOperation AddListenerOperation
- */
- @Override
- public IDataModelOperation getDefaultOperation() {
- return new AddListenerOperation(getDataModel());
- }
-
- /**
- * Subclasses may extend this method to provide their own validation on any
- * of the valid data model properties in the hierarchy. It does not accept a
- * null parameter. This method will not return null.
- *
- * @see NewJavaClassDataModelProvider#validate(String)
- *
- * @param propertyName
- * @return IStatus is property value valid?
- */
- @Override
- public IStatus validate(String propertyName) {
- if (propertyName.equals(INTERFACES)) {
- return validateListeners();
- }
-
- // Otherwise defer to super to validate the property
- return super.validate(propertyName);
- }
-
-
- /**
- * Checks if at least one of the application lifecycle listeners is
- * selected.
- */
- private IStatus validateListeners() {
- boolean atLeastOneSelected = false;
- Object value = model.getProperty(INTERFACES);
- if (value != null && (value instanceof List)) {
- List interfaces = (List) value;
- for (String iface : LISTENER_INTERFACES) {
- if (interfaces.contains(iface)) {
- atLeastOneSelected = true;
- break;
- }
- }
- }
-
- if (atLeastOneSelected) {
- return WTPCommonPlugin.OK_STATUS;
- }
- String msg = WebMessages.ERR_NO_LISTENER_SELECTED;
- return WTPCommonPlugin.createErrorStatus(msg);
- }
-
-}
diff --git a/plugins/org.eclipse.jst.j2ee.web/web/org/eclipse/jst/j2ee/internal/web/operations/NewListenerClassOperation.java b/plugins/org.eclipse.jst.j2ee.web/web/org/eclipse/jst/j2ee/internal/web/operations/NewListenerClassOperation.java
deleted file mode 100644
index 41c2d37..0000000
--- a/plugins/org.eclipse.jst.j2ee.web/web/org/eclipse/jst/j2ee/internal/web/operations/NewListenerClassOperation.java
+++ /dev/null
@@ -1,99 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2007, 2008 SAP AG and others.
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
- *
- * Contributors:
- * Kaloyan Raev, kaloyan.raev@sap.com - initial API and implementation
- *******************************************************************************/
-package org.eclipse.jst.j2ee.internal.web.operations;
-
-import org.eclipse.core.runtime.IProgressMonitor;
-import org.eclipse.jdt.core.IPackageFragment;
-import org.eclipse.wst.common.componentcore.internal.operation.ArtifactEditProviderOperation;
-import org.eclipse.wst.common.frameworks.datamodel.IDataModel;
-
-/**
- * The NewListenerClassOperation is an IDataModelOperation following the
- * IDataModel wizard and operation framework.
- *
- * @see org.eclipse.wst.common.frameworks.datamodel.IDataModelOperation
- * @see org.eclipse.wst.common.frameworks.datamodel.IDataModelProvider
- *
- * It extends ArtifactEditProviderOperation to provide listener specific java
- * class generation.
- * @see org.eclipse.wst.common.componentcore.internal.operation.ArtifactEditProviderOperation
- *
- * This operation is used by the AddListenerOperation to generate either an
- * annotated or non annotated java class for an added application lifecycle listener.
- * It shares the NewListenerClassDataModelProvider with the AddListenerOperation to
- * store the appropriate properties required to generate the new listener.
- * @see org.eclipse.jst.j2ee.internal.web.operations.AddListenerOperation
- * @see org.eclipse.jst.j2ee.internal.web.operations.NewListenerClassDataModelProvider
- *
- * In the annotated case, a WTPJetEmitter listener template is created and used
- * to generate the listener java class with the embedded annotated tags.
- * @see org.eclipse.jst.j2ee.internal.project.WTPJETEmitter
- * @see org.eclipse.jst.j2ee.internal.web.operations.CreateListenerTemplateModel
- *
- * In the non annotated case, the same emitter is used to create the class with
- * the non annotated listener template so the annotated tags are omitted.
- *
- * Subclasses may extend this operation to provide their own specific listener
- * java class generation. The execute method may be extended to do so. Also,
- * generateUsingTemplates is exposed.
- *
- * The use of this class is EXPERIMENTAL and is subject to substantial changes.
- */
-public class NewListenerClassOperation extends NewWebClassOperation {
-
- /**
- * folder location of the listener creation templates directory
- */
- protected static final String TEMPLATE_FILE = "/templates/listener.javajet"; //$NON-NLS-1$
-
- /**
- * This is the constructor which should be used when creating a
- * NewListenerClassOperation. An instance of the NewListenerClassDataModel
- * should be passed in. This does not accept null parameter. It will not
- * return null.
- *
- * @see ArtifactEditProviderOperation#ArtifactEditProviderOperation(IDataModel)
- * @see NewListenerClassDataModel
- *
- * @param dataModel
- * @return NewListenerClassOperation
- */
- public NewListenerClassOperation(IDataModel dataModel) {
- super(dataModel);
- }
-
- /**
- * This method will create an instance of the CreateListenerTemplateModel to
- * be used in conjunction with the WTPJETEmitter. This method will not
- * return null.
- *
- * @see CreateListenerTemplateModel
- * @see NewListenerClassOperation#generateUsingTemplates(IProgressMonitor,
- * IPackageFragment)
- *
- * @return CreateListenerTemplateModel
- */
- @Override
- protected CreateListenerTemplateModel createTemplateModel() {
- return new CreateListenerTemplateModel(model);
- }
-
- @Override
- protected String getTemplateFile() {
- return TEMPLATE_FILE;
- }
-
- @Override
- protected ListenerTemplate getTemplateImplementation() {
- return ListenerTemplate.create(null);
- }
-
-}
diff --git a/plugins/org.eclipse.jst.j2ee.web/web/org/eclipse/jst/j2ee/internal/web/operations/NewServletClassDataModelProvider.java b/plugins/org.eclipse.jst.j2ee.web/web/org/eclipse/jst/j2ee/internal/web/operations/NewServletClassDataModelProvider.java
deleted file mode 100644
index 9792723..0000000
--- a/plugins/org.eclipse.jst.j2ee.web/web/org/eclipse/jst/j2ee/internal/web/operations/NewServletClassDataModelProvider.java
+++ /dev/null
@@ -1,553 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2003, 2008 IBM Corporation and others.
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
- *
- * Contributors:
- * IBM Corporation - initial API and implementation
- * Kiril Mitov, k.mitov@sap.com - bug 204160
- * Kaloyan Raev, kaloyan.raev@sap.com
- *******************************************************************************/
-package org.eclipse.jst.j2ee.internal.web.operations;
-
-import static org.eclipse.jst.j2ee.internal.common.operations.INewJavaClassDataModelProperties.ABSTRACT_METHODS;
-import static org.eclipse.jst.j2ee.internal.common.operations.INewJavaClassDataModelProperties.CLASS_NAME;
-import static org.eclipse.jst.j2ee.internal.common.operations.INewJavaClassDataModelProperties.INTERFACES;
-import static org.eclipse.jst.j2ee.internal.common.operations.INewJavaClassDataModelProperties.SUPERCLASS;
-import static org.eclipse.jst.j2ee.internal.web.operations.INewServletClassDataModelProperties.DESTROY;
-import static org.eclipse.jst.j2ee.internal.web.operations.INewServletClassDataModelProperties.DO_DELETE;
-import static org.eclipse.jst.j2ee.internal.web.operations.INewServletClassDataModelProperties.DO_GET;
-import static org.eclipse.jst.j2ee.internal.web.operations.INewServletClassDataModelProperties.DO_HEAD;
-import static org.eclipse.jst.j2ee.internal.web.operations.INewServletClassDataModelProperties.DO_OPTIONS;
-import static org.eclipse.jst.j2ee.internal.web.operations.INewServletClassDataModelProperties.DO_POST;
-import static org.eclipse.jst.j2ee.internal.web.operations.INewServletClassDataModelProperties.DO_PUT;
-import static org.eclipse.jst.j2ee.internal.web.operations.INewServletClassDataModelProperties.DO_TRACE;
-import static org.eclipse.jst.j2ee.internal.web.operations.INewServletClassDataModelProperties.GET_SERVLET_CONFIG;
-import static org.eclipse.jst.j2ee.internal.web.operations.INewServletClassDataModelProperties.GET_SERVLET_INFO;
-import static org.eclipse.jst.j2ee.internal.web.operations.INewServletClassDataModelProperties.INIT;
-import static org.eclipse.jst.j2ee.internal.web.operations.INewServletClassDataModelProperties.INIT_PARAM;
-import static org.eclipse.jst.j2ee.internal.web.operations.INewServletClassDataModelProperties.IS_SERVLET_TYPE;
-import static org.eclipse.jst.j2ee.internal.web.operations.INewServletClassDataModelProperties.NON_ANNOTATED_TEMPLATE_FILE;
-import static org.eclipse.jst.j2ee.internal.web.operations.INewServletClassDataModelProperties.SERVICE;
-import static org.eclipse.jst.j2ee.internal.web.operations.INewServletClassDataModelProperties.TEMPLATE_FILE;
-import static org.eclipse.jst.j2ee.internal.web.operations.INewServletClassDataModelProperties.TO_STRING;
-import static org.eclipse.jst.j2ee.internal.web.operations.INewServletClassDataModelProperties.URL_MAPPINGS;
-import static org.eclipse.jst.j2ee.internal.web.operations.INewWebClassDataModelProperties.DISPLAY_NAME;
-import static org.eclipse.jst.j2ee.web.IServletConstants.QUALIFIED_HTTP_SERVLET;
-import static org.eclipse.jst.j2ee.web.IServletConstants.QUALIFIED_SERVLET;
-
-import java.util.ArrayList;
-import java.util.List;
-import java.util.Set;
-
-import org.eclipse.core.runtime.IStatus;
-import org.eclipse.jdt.core.Signature;
-import org.eclipse.jst.j2ee.commonarchivecore.internal.util.J2EEFileUtil;
-import org.eclipse.jst.j2ee.model.IModelProvider;
-import org.eclipse.jst.j2ee.model.ModelProviderManager;
-import org.eclipse.jst.j2ee.web.validation.UrlPattern;
-import org.eclipse.osgi.util.NLS;
-import org.eclipse.wst.common.frameworks.datamodel.IDataModel;
-import org.eclipse.wst.common.frameworks.datamodel.IDataModelOperation;
-import org.eclipse.wst.common.frameworks.datamodel.IDataModelProvider;
-import org.eclipse.wst.common.frameworks.internal.plugin.WTPCommonPlugin;
-
-/**
- * The NewServletClassDataModelProvider is a subclass of
- * NewWebClassDataModelProvider and follows the IDataModel Operation and Wizard
- * frameworks.
- *
- * @see org.eclipse.wst.common.frameworks.datamodel.IDataModelProvider
- * @see org.eclipse.wst.common.frameworks.datamodel.IDataModelOperation
- *
- * This data model provider is a subclass of the NewWebClassDataModelProvider,
- * which stores base properties necessary in the creation of a web artifact
- * class.
- *
- * @see NewWebClassDataModelProvider
- *
- * The NewServletClassDataModelProvider provides more specific properties for
- * java class creation that are required in creating a servlet java class. The
- * data model provider is used to store these values for the
- * NewServletClassOperation.
- *
- * @see INewServletClassDataModelProperties
- *
- * That operation will create the servlet java class based on the settings
- * defined here in the data model.
- *
- * @see NewServletClassOperation
- *
- * This data model properties implements the IAnnotationsDataModel to get the
- * USE_ANNOTATIONS property for determining whether or not to generate an
- * annotated java class.
- *
- * @see org.eclipse.jst.j2ee.application.internal.operations.IAnnotationsDataModel
- *
- * Clients can subclass this data model provider to cache and provide their own
- * specific attributes. They should also provide their own validation methods,
- * properties interface, and default values for the properties they add.
- */
-public class NewServletClassDataModelProvider extends
- NewWebClassDataModelProvider {
-
- /**
- * The fully qualified default servlet superclass: HttpServlet.
- */
- private final static String SERVLET_SUPERCLASS = QUALIFIED_HTTP_SERVLET;
-
- /**
- * String array of the default, minimum required fully qualified Servlet
- * interfaces
- */
- private final static String[] SERVLET_INTERFACES = { QUALIFIED_SERVLET };
-
- private final static String ANNOTATED_TEMPLATE_DEFAULT = "servlet.javajet"; //$NON-NLS-1$
-
- private final static String NON_ANNOTATED_TEMPLATE_DEFAULT = "servlet.javajet"; //$NON-NLS-1$
-
- /**
- * Subclasses may extend this method to provide their own default operation
- * for this data model provider. This implementation uses the
- * AddServletOperation to drive the servlet creation. It will not return
- * null.
- *
- * @see IDataModel#getDefaultOperation()
- *
- * @return IDataModelOperation AddServletOperation
- */
- @Override
- public IDataModelOperation getDefaultOperation() {
- return new AddServletOperation(model);
- }
-
- /**
- * Subclasses may extend this method to add their own data model's
- * properties as valid base properties.
- *
- * @see org.eclipse.wst.common.frameworks.datamodel.IDataModelProvider#getPropertyNames()
- */
- @Override
- public Set getPropertyNames() {
- // Add servlet specific properties defined in this data model
- Set propertyNames = super.getPropertyNames();
-
- propertyNames.add(INIT);
- propertyNames.add(DESTROY);
- propertyNames.add(GET_SERVLET_CONFIG);
- propertyNames.add(GET_SERVLET_INFO);
- propertyNames.add(SERVICE);
- propertyNames.add(DO_GET);
- propertyNames.add(DO_POST);
- propertyNames.add(DO_PUT);
- propertyNames.add(DO_DELETE);
- propertyNames.add(DO_HEAD);
- propertyNames.add(DO_OPTIONS);
- propertyNames.add(DO_TRACE);
- propertyNames.add(TO_STRING);
- propertyNames.add(IS_SERVLET_TYPE);
- propertyNames.add(INIT_PARAM);
- propertyNames.add(URL_MAPPINGS);
- propertyNames.add(NON_ANNOTATED_TEMPLATE_FILE);
- propertyNames.add(TEMPLATE_FILE);
-
- return propertyNames;
- }
-
- @Override
- public boolean isPropertyEnabled(String propertyName) {
- if (ABSTRACT_METHODS.equals(propertyName)) {
- return ServletSupertypesValidator.isGenericServletSuperclass(model);
- } else if (INIT.equals(propertyName) ||
- DESTROY.equals(propertyName) ||
- GET_SERVLET_CONFIG.equals(propertyName) ||
- GET_SERVLET_INFO.equals(propertyName) ||
- SERVICE.equals(propertyName)) {
- boolean genericServlet = ServletSupertypesValidator.isGenericServletSuperclass(model);
- boolean inherit = model.getBooleanProperty(ABSTRACT_METHODS);
- return genericServlet && inherit;
- } else if (DO_GET.equals(propertyName) ||
- DO_POST.equals(propertyName) ||
- DO_PUT.equals(propertyName) ||
- DO_DELETE.equals(propertyName) ||
- DO_HEAD.equals(propertyName) ||
- DO_OPTIONS.equals(propertyName) ||
- DO_TRACE.equals(propertyName)) {
- boolean httpServlet = ServletSupertypesValidator.isHttpServletSuperclass(model);
- boolean inherit = model.getBooleanProperty(ABSTRACT_METHODS);
- return httpServlet && inherit;
- }
-
- // Otherwise return super implementation
- return super.isPropertyEnabled(propertyName);
- }
-
- /**
- * Subclasses may extend this method to provide their own default values for
- * any of the properties in the data model hierarchy. This method does not
- * accept a null parameter. It may return null. This implementation sets
- * annotation use to be true, and to generate a servlet with doGet and
- * doPost.
- *
- * @see NewWebClassDataModelProvider#getDefaultProperty(String)
- * @see IDataModelProvider#getDefaultProperty(String)
- *
- * @param propertyName
- * @return Object default value of property
- */
- @Override
- public Object getDefaultProperty(String propertyName) {
- // Generate a doPost and doGet methods by default only if a class
- // extending HttpServlet is selected
- if (propertyName.equals(DO_POST) || propertyName.equals(DO_GET)) {
- if (ServletSupertypesValidator.isHttpServletSuperclass(model))
- return Boolean.TRUE;
- }
-
- // Generate a service method by default only if a class
- // not extending HttpServlet is selected
- if (propertyName.equals(SERVICE)) {
- if (!ServletSupertypesValidator.isHttpServletSuperclass(model))
- return Boolean.TRUE;
- }
-
- if (propertyName.equals(INIT) || propertyName.equals(DESTROY) ||
- propertyName.equals(GET_SERVLET_CONFIG) || propertyName.equals(GET_SERVLET_INFO)) {
- if (!ServletSupertypesValidator.isGenericServletSuperclass(model))
- return Boolean.TRUE;
- }
-
- // Use servlet by default
- else if (propertyName.equals(IS_SERVLET_TYPE))
- return Boolean.TRUE;
- else if (propertyName.equals(DISPLAY_NAME)) {
- String className = getStringProperty(CLASS_NAME);
- if (className.endsWith(J2EEFileUtil.DOT_JSP)) {
- int index = className.lastIndexOf("/"); //$NON-NLS-1$
- className = className.substring(index+1,className.length()-4);
- } else {
- className = Signature.getSimpleName(className);
- }
- return className;
- }
- else if (propertyName.equals(URL_MAPPINGS))
- return getDefaultUrlMapping();
- else if (propertyName.equals(INTERFACES))
- return getServletInterfaces();
- else if (propertyName.equals(SUPERCLASS))
- return SERVLET_SUPERCLASS;
- else if (propertyName.equals(TEMPLATE_FILE))
- return ANNOTATED_TEMPLATE_DEFAULT;
- else if (propertyName.equals(NON_ANNOTATED_TEMPLATE_FILE))
- return NON_ANNOTATED_TEMPLATE_DEFAULT;
-
- // Otherwise check super for default value for property
- return super.getDefaultProperty(propertyName);
- }
-
- /**
- * Subclasses may extend this method to provide their own validation on any
- * of the valid data model properties in the hierarchy. This implementation
- * adds validation for the init params, servlet mappings, display name, and
- * existing class fields specific to the servlet java class creation. It
- * does not accept a null parameter. This method will not return null.
- *
- * @see NewWebClassDataModelProvider#validate(String)
- *
- * @param propertyName
- * @return IStatus is property value valid?
- */
- @Override
- public IStatus validate(String propertyName) {
- // Validate super class
- if (propertyName.equals(SUPERCLASS))
- return validateSuperClassName(getStringProperty(propertyName));
- // Validate init params
- if (propertyName.equals(INIT_PARAM))
- return validateInitParamList((List) getProperty(propertyName));
- // Validate servlet mappings
- if (propertyName.equals(URL_MAPPINGS))
- return validateURLMappingList((List) getProperty(propertyName));
- // Validate the servlet name in DD
- if (propertyName.equals(DISPLAY_NAME))
- return validateDisplayName(getStringProperty(propertyName));
-
- // Otherwise defer to super to validate the property
- return super.validate(propertyName);
- }
-
- @Override
- public boolean propertySet(String propertyName, Object propertyValue) {
- boolean result = false;
-
- if (SUPERCLASS.equals(propertyName)) {
- model.notifyPropertyChange(ABSTRACT_METHODS, IDataModel.ENABLE_CHG);
- model.notifyPropertyChange(INIT, IDataModel.ENABLE_CHG);
- model.notifyPropertyChange(DESTROY, IDataModel.ENABLE_CHG);
- model.notifyPropertyChange(GET_SERVLET_CONFIG, IDataModel.ENABLE_CHG);
- model.notifyPropertyChange(GET_SERVLET_INFO, IDataModel.ENABLE_CHG);
- model.notifyPropertyChange(SERVICE, IDataModel.ENABLE_CHG);
- model.notifyPropertyChange(DO_GET, IDataModel.ENABLE_CHG);
- model.notifyPropertyChange(DO_POST, IDataModel.ENABLE_CHG);
- model.notifyPropertyChange(DO_PUT, IDataModel.ENABLE_CHG);
- model.notifyPropertyChange(DO_DELETE, IDataModel.ENABLE_CHG);
- model.notifyPropertyChange(DO_HEAD, IDataModel.ENABLE_CHG);
- model.notifyPropertyChange(DO_OPTIONS, IDataModel.ENABLE_CHG);
- model.notifyPropertyChange(DO_TRACE, IDataModel.ENABLE_CHG);
-
- if (!hasSuperClass()) {
- model.setProperty(ABSTRACT_METHODS, null);
- model.setProperty(INIT, null);
- model.setProperty(DESTROY, null);
- model.setProperty(GET_SERVLET_CONFIG, null);
- model.setProperty(GET_SERVLET_INFO, null);
- model.setProperty(SERVICE, null);
- model.setProperty(DO_GET, null);
- model.setProperty(DO_POST, null);
- model.setProperty(DO_PUT, null);
- model.setProperty(DO_DELETE, null);
- model.setProperty(DO_HEAD, null);
- model.setProperty(DO_OPTIONS, null);
- model.setProperty(DO_TRACE, null);
- }
-
- model.notifyPropertyChange(ABSTRACT_METHODS, IDataModel.DEFAULT_CHG);
- model.notifyPropertyChange(INIT, IDataModel.DEFAULT_CHG);
- model.notifyPropertyChange(DESTROY, IDataModel.DEFAULT_CHG);
- model.notifyPropertyChange(GET_SERVLET_CONFIG, IDataModel.DEFAULT_CHG);
- model.notifyPropertyChange(GET_SERVLET_INFO, IDataModel.DEFAULT_CHG);
- model.notifyPropertyChange(SERVICE, IDataModel.DEFAULT_CHG);
- model.notifyPropertyChange(DO_GET, IDataModel.DEFAULT_CHG);
- model.notifyPropertyChange(DO_POST, IDataModel.DEFAULT_CHG);
- model.notifyPropertyChange(DO_PUT, IDataModel.DEFAULT_CHG);
- model.notifyPropertyChange(DO_DELETE, IDataModel.DEFAULT_CHG);
- model.notifyPropertyChange(DO_HEAD, IDataModel.DEFAULT_CHG);
- model.notifyPropertyChange(DO_OPTIONS, IDataModel.DEFAULT_CHG);
- model.notifyPropertyChange(DO_TRACE, IDataModel.DEFAULT_CHG);
-
- if (!ServletSupertypesValidator.isServletSuperclass(model)) {
- List ifaces = (List) model.getProperty(INTERFACES);
- ifaces.add(QUALIFIED_SERVLET);
- }
- }
-
- return result || super.propertySet(propertyName, propertyValue);
- }
-
- /**
- * Subclasses may extend this method to provide their own validation of the specified java
- * classname. This implementation will ensure the class name is not set to Servlet and then will
- * forward on to the NewJavaClassDataModel to validate the class name as valid java. This method
- * does not accept null as a parameter. It will not return null.
- * It will check if the super class extends the javax.servlet.Servlet interface also.
- *
- * @param className
- * @return IStatus is java classname valid?
- */
- protected IStatus validateSuperClassName(String superclassName) {
- //If the servlet implements javax.servlet.Servlet, we do not need a super class
- if (ServletSupertypesValidator.isGenericServletSuperclass(model))
- return WTPCommonPlugin.OK_STATUS;
-
- // Check the super class as a java class
- IStatus status = null;
- if (superclassName.trim().length() > 0) {
- status = super.validate(SUPERCLASS);
- if (status.getSeverity() == IStatus.ERROR)
- return status;
- }
-
- if (!ServletSupertypesValidator.isServletSuperclass(model))
- return WTPCommonPlugin.createErrorStatus(WebMessages.ERR_SERVLET_INTERFACE);
-
- return status;
- }
-
- /**
- * Returns the default Url Mapping depending upon the display name of the Servlet
- *
- * @return List containting the default Url Mapping
- */
- private Object getDefaultUrlMapping() {
- List urlMappings = null;
- String text = (String) getProperty(DISPLAY_NAME);
- if (text != null) {
- urlMappings = new ArrayList();
- urlMappings.add(new String[] {"/" + text}); //$NON-NLS-1$
- }
- return urlMappings;
- }
-
- /**
- * This method is intended for internal use only. It will be used to
- * validate the init params list to ensure there are not any duplicates.
- * This method will accept a null paramter. It will not return null.
- *
- * @see NewServletClassDataModelProvider#validate(String)
- *
- * @param prop
- * @return IStatus is init params list valid?
- */
- private IStatus validateInitParamList(List prop) {
- if (prop != null && !prop.isEmpty()) {
- // Ensure there are not duplicate entries in the list
- boolean dup = hasDuplicatesInStringArrayList(prop);
- if (dup) {
- String msg = WebMessages.ERR_DUPLICATED_INIT_PARAMETER;
- return WTPCommonPlugin.createErrorStatus(msg);
- }
- }
- // Return OK
- return WTPCommonPlugin.OK_STATUS;
- }
-
- /**
- * This method is intended for internal use only. This will validate the
- * servlet mappings list and ensure there are not duplicate entries. It will
- * accept a null parameter. It will not return null.
- *
- * @see NewServletClassDataModelProvider#validate(String)
- *
- * @param prop
- * @return IStatus is servlet mapping list valid?
- */
- private IStatus validateURLMappingList(List prop) {
- if (prop != null && !prop.isEmpty()) {
- // Ensure there are not duplicates in the mapping list
- boolean dup = hasDuplicatesInStringArrayList(prop);
- if (dup) {
- String msg = WebMessages.ERR_DUPLICATED_URL_MAPPING;
- return WTPCommonPlugin.createErrorStatus(msg);
- }
- String isValidValue = validateValue(prop);
- if (isValidValue != null && isValidValue.length() > 0) {
- NLS.bind(WebMessages.ERR_URL_PATTERN_INVALID, isValidValue);
- String resourceString = WebMessages.getResourceString(WebMessages.ERR_URL_PATTERN_INVALID, new String[]{isValidValue});
- return WTPCommonPlugin.createErrorStatus(resourceString);
- }
- } else {
- String msg = WebMessages.ERR_URL_MAPPING_LIST_EMPTY;
- return WTPCommonPlugin.createErrorStatus(msg);
- }
- // Return OK
- return WTPCommonPlugin.OK_STATUS;
- }
-
- /**
- * This method is intended for internal use only. It provides a simple
- * algorithm for detecting if there are invalid pattern's value in a list.
- * It will accept a null parameter.
- *
- * @see NewServletClassDataModelProvider#validateURLMappingList(List)
- *
- * @param input
- * @return String first invalid pattern's value?
- */
- private String validateValue(List prop) {
- if (prop == null) {
- return ""; //$NON-NLS-1$
- }
- int size = prop.size();
- for (int i = 0; i < size; i++) {
- String urlMappingValue = ((String[]) prop.get(i))[0];
- if (!UrlPattern.isValid(urlMappingValue))
- return urlMappingValue;
- }
- return ""; //$NON-NLS-1$
- }
-
- /**
- * This method will return the list of servlet interfaces to be implemented
- * for the new servlet java class. It will intialize the list using lazy
- * initialization to the minimum interfaces required by the data model
- * SERVLET_INTERFACES. This method will not return null.
- *
- * @see #SERVLET_INTERFACES
- *
- * @return List of servlet interfaces to be implemented
- */
- private List getServletInterfaces() {
- if (interfaceList == null) {
- interfaceList = new ArrayList();
- // Add minimum required list of servlet interfaces to be implemented
- for (int i = 0; i < SERVLET_INTERFACES.length; i++) {
- interfaceList.add(SERVLET_INTERFACES[i]);
- }
- // Remove the javax.servlet.Servlet interface from the list if the
- // superclass already implements it
- if (ServletSupertypesValidator.isServletSuperclass(model)) {
- interfaceList.remove(QUALIFIED_SERVLET);
- }
- }
- // Return interface list
- return interfaceList;
- }
-
- /**
- * This method is intended for internal use only. This will validate whether
- * the display name selected is a valid display name for the servlet in the
- * specified web application. It will make sure the name is not empty and
- * that it doesn't already exist in the web app. This method will accept
- * null as a parameter. It will not return null.
- *
- * @see NewServletClassDataModelProvider#validate(String)
- *
- * @param prop
- * @return IStatus is servlet display name valid?
- */
- private IStatus validateDisplayName(String prop) {
- // Ensure the servlet display name is not null or empty
- if (prop == null || prop.trim().length() == 0) {
- String msg = WebMessages.ERR_DISPLAY_NAME_EMPTY;
- return WTPCommonPlugin.createErrorStatus(msg);
- }
- if (getTargetProject() == null || getTargetComponent() == null)
- return WTPCommonPlugin.OK_STATUS;
-
- IModelProvider provider = ModelProviderManager.getModelProvider(getTargetProject());
- Object mObj = provider.getModelObject();
- if (mObj instanceof org.eclipse.jst.j2ee.webapplication.WebApp) {
- org.eclipse.jst.j2ee.webapplication.WebApp webApp = (org.eclipse.jst.j2ee.webapplication.WebApp) mObj;
-
- List servlets = webApp.getServlets();
- boolean exists = false;
- // Ensure the display does not already exist in the web application
- if (servlets != null && !servlets.isEmpty()) {
- for (int i = 0; i < servlets.size(); i++) {
- String name = ((org.eclipse.jst.j2ee.webapplication.Servlet) servlets.get(i)).getServletName();
- if (prop.equals(name))
- exists = true;
- }
- }
- // If the servlet name already exists, throw an error
- if (exists) {
- String msg = WebMessages.getResourceString(WebMessages.ERR_SERVLET_NAME_EXIST, new String[]{prop});
- return WTPCommonPlugin.createErrorStatus(msg);
- }
- } else if (mObj instanceof org.eclipse.jst.javaee.web.WebApp) {
- org.eclipse.jst.javaee.web.WebApp webApp = (org.eclipse.jst.javaee.web.WebApp) mObj;
-
- List servlets = webApp.getServlets();
- boolean exists = false;
- // Ensure the display does not already exist in the web application
- if (servlets != null && !servlets.isEmpty()) {
- for (int i = 0; i < servlets.size(); i++) {
- String name = ((org.eclipse.jst.javaee.web.Servlet) servlets.get(i)).getServletName();
- if (prop.equals(name))
- exists = true;
- }
- }
- // If the servlet name already exists, throw an error
- if (exists) {
- String msg = WebMessages.getResourceString(WebMessages.ERR_SERVLET_NAME_EXIST, new String[]{prop});
- return WTPCommonPlugin.createErrorStatus(msg);
- }
- }
-
- // Otherwise, return OK
- return WTPCommonPlugin.OK_STATUS;
- }
-
-}
diff --git a/plugins/org.eclipse.jst.j2ee.web/web/org/eclipse/jst/j2ee/internal/web/operations/NewServletClassOperation.java b/plugins/org.eclipse.jst.j2ee.web/web/org/eclipse/jst/j2ee/internal/web/operations/NewServletClassOperation.java
deleted file mode 100644
index 72b1809..0000000
--- a/plugins/org.eclipse.jst.j2ee.web/web/org/eclipse/jst/j2ee/internal/web/operations/NewServletClassOperation.java
+++ /dev/null
@@ -1,105 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2003, 2008 IBM Corporation and others.
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
- *
- * Contributors:
- * IBM Corporation - initial API and implementation
- * Kaloyan Raev, kaloyan.raev@sap.com
- *******************************************************************************/
-package org.eclipse.jst.j2ee.internal.web.operations;
-
-import org.eclipse.core.runtime.IProgressMonitor;
-import org.eclipse.jdt.core.IPackageFragment;
-import org.eclipse.wst.common.componentcore.internal.operation.ArtifactEditProviderOperation;
-import org.eclipse.wst.common.frameworks.datamodel.IDataModel;
-
-/**
- * The NewServletClassOperation is an IDataModelOperation following the
- * IDataModel wizard and operation framework.
- *
- * @see org.eclipse.wst.common.frameworks.datamodel.IDataModelOperation
- * @see org.eclipse.wst.common.frameworks.datamodel.IDataModelProvider
- *
- * It extends ArtifactEditProviderOperation to provide servlet specific java
- * class generation.
- * @see org.eclipse.wst.common.componentcore.internal.operation.ArtifactEditProviderOperation
- *
- * This operation is used by the AddServletOperation to generate either an
- * annotated or non annotated java class for an added servlet. It shares the
- * NewServletClassDataModelProvider with the AddServletOperation to store the
- * appropriate properties required to generate the new servlet.
- * @see org.eclipse.jst.j2ee.internal.web.operations.AddServletOperation
- * @see org.eclipse.jst.j2ee.internal.web.operations.NewServletClassDataModelProvider
- *
- * In the annotated case, a WTPJetEmitter servlet template is created and used
- * to generate the servlet java class with the embedded annotated tags.
- * @see org.eclipse.jst.j2ee.internal.project.WTPJETEmitter
- * @see org.eclipse.jst.j2ee.internal.web.operations.CreateServletTemplateModel
- *
- * In the non annotated case, the same emitter is used to create the class with
- * the non annotated servlet template so the annotated tags are omitted.
- *
- * Subclasses may extend this operation to provide their own specific servlet
- * java class generation. The execute method may be extended to do so. Also,
- * generateUsingTemplates is exposed.
- *
- * The use of this class is EXPERIMENTAL and is subject to substantial changes.
- */
-public class NewServletClassOperation extends NewWebClassOperation {
-
- /**
- * folder location of the servlet creation templates diretory
- */
- protected static final String TEMPLATE_DIR = "/templates/"; //$NON-NLS-1$
-
- /**
- * location of the servlet creation template file
- */
- protected static final String TEMPLATE_FILE = "/templates/servlet.javajet"; //$NON-NLS-1$
-
- /**
- * This is the constructor which should be used when creating a
- * NewServletClassOperation. An instance of the NewServletClassDataModel
- * should be passed in. This does not accept null parameter. It will not
- * return null.
- *
- * @see ArtifactEditProviderOperation#ArtifactEditProviderOperation(IDataModel)
- * @see NewServletClassDataModel
- *
- * @param dataModel
- * @return NewServletClassOperation
- */
- public NewServletClassOperation(IDataModel dataModel) {
- super(dataModel);
- }
-
- /**
- * This method will create an instance of the CreateServletTemplate model to
- * be used in conjunction with the WTPJETEmitter. This method will not
- * return null.
- *
- * @see CreateServletTemplateModel
- * @see NewServletClassOperation#generateUsingTemplates(IProgressMonitor,
- * IPackageFragment)
- *
- * @return CreateServletTemplateModel
- */
- @Override
- protected CreateServletTemplateModel createTemplateModel() {
- return new CreateServletTemplateModel(model);
- }
-
- @Override
- protected String getTemplateFile() {
- return TEMPLATE_FILE;
- }
-
- @Override
- protected ServletTemplate getTemplateImplementation() {
- return ServletTemplate.create(null);
- }
-
-}
diff --git a/plugins/org.eclipse.jst.j2ee.web/web/org/eclipse/jst/j2ee/internal/web/operations/NewWebClassDataModelProvider.java b/plugins/org.eclipse.jst.j2ee.web/web/org/eclipse/jst/j2ee/internal/web/operations/NewWebClassDataModelProvider.java
deleted file mode 100644
index 54e84c0..0000000
--- a/plugins/org.eclipse.jst.j2ee.web/web/org/eclipse/jst/j2ee/internal/web/operations/NewWebClassDataModelProvider.java
+++ /dev/null
@@ -1,443 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2007, 2008 SAP AG and others.
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
- *
- * Contributors:
- * Kaloyan Raev, kaloyan.raev@sap.com - initial API and implementation
- *******************************************************************************/
-package org.eclipse.jst.j2ee.internal.web.operations;
-
-import static org.eclipse.jst.j2ee.application.internal.operations.IAnnotationsDataModel.USE_ANNOTATIONS;
-import static org.eclipse.jst.j2ee.internal.common.operations.INewJavaClassDataModelProperties.CLASS_NAME;
-import static org.eclipse.jst.j2ee.internal.common.operations.INewJavaClassDataModelProperties.CONSTRUCTOR;
-import static org.eclipse.jst.j2ee.internal.common.operations.INewJavaClassDataModelProperties.MODIFIER_ABSTRACT;
-import static org.eclipse.jst.j2ee.internal.common.operations.INewJavaClassDataModelProperties.MODIFIER_PUBLIC;
-import static org.eclipse.jst.j2ee.internal.common.operations.INewJavaClassDataModelProperties.SOURCE_FOLDER;
-import static org.eclipse.jst.j2ee.internal.common.operations.INewJavaClassDataModelProperties.SUPERCLASS;
-import static org.eclipse.jst.j2ee.internal.web.operations.INewWebClassDataModelProperties.DESCRIPTION;
-import static org.eclipse.jst.j2ee.internal.web.operations.INewWebClassDataModelProperties.DISPLAY_NAME;
-import static org.eclipse.jst.j2ee.internal.web.operations.INewWebClassDataModelProperties.JAVA_EE_VERSION;
-import static org.eclipse.jst.j2ee.internal.web.operations.INewWebClassDataModelProperties.REGISTER_IN_WEB_XML;
-import static org.eclipse.jst.j2ee.internal.web.operations.INewWebClassDataModelProperties.USE_EXISTING_CLASS;
-
-import java.io.File;
-import java.util.List;
-import java.util.Set;
-
-import org.eclipse.core.resources.IProject;
-import org.eclipse.core.resources.ResourcesPlugin;
-import org.eclipse.core.runtime.CoreException;
-import org.eclipse.core.runtime.IStatus;
-import org.eclipse.jdt.core.Signature;
-import org.eclipse.jem.util.emf.workbench.ProjectUtilities;
-import org.eclipse.jst.j2ee.application.internal.operations.IAnnotationsDataModel;
-import org.eclipse.jst.j2ee.internal.J2EEVersionConstants;
-import org.eclipse.jst.j2ee.internal.common.J2EEVersionUtil;
-import org.eclipse.jst.j2ee.internal.common.operations.NewJavaClassDataModelProvider;
-import org.eclipse.jst.j2ee.internal.project.J2EEProjectUtilities;
-import org.eclipse.jst.j2ee.project.JavaEEProjectUtilities;
-import org.eclipse.jst.j2ee.web.project.facet.WebFacetUtils;
-import org.eclipse.wst.common.componentcore.internal.util.FacetedProjectUtilities;
-import org.eclipse.wst.common.frameworks.datamodel.IDataModel;
-import org.eclipse.wst.common.frameworks.datamodel.IDataModelProvider;
-import org.eclipse.wst.common.frameworks.internal.plugin.WTPCommonPlugin;
-import org.eclipse.wst.common.project.facet.core.FacetedProjectFramework;
-
-/**
- * The NewWebClassDataModelProvider is a subclass of
- * NewJavaClassDataModelProvider and follows the IDataModel Operation and Wizard
- * frameworks.
- *
- * @see org.eclipse.wst.common.frameworks.datamodel.IDataModelProvider
- * @see org.eclipse.wst.common.frameworks.datamodel.IDataModelOperation
- *
- * This data model provider is a subclass of the NewJavaClassDataModelProvider,
- * which stores base properties necessary in the creation of a default java
- * class.
- * @see org.eclipse.jst.j2ee.internal.common.operations.NewJavaClassDataModelProvider
- *
- * The NewWebClassDataModelProvider provides more specific properties for java
- * class creation that are required in creating a web artifact java class. The
- * data model provider is used to store these values for the
- * AddWebClassOperation.
- * @see org.eclipse.jst.j2ee.internal.web.operations.INewWebClassDataModelProperties
- * That operation will create the web artifact java class based on the
- * settings defined here in the data model.
- * @see org.eclipse.jst.j2ee.internal.web.operations.AddWebClassOperation
- *
- * This data model properties implements the IAnnotationsDataModel to get the
- * USE_ANNOTATIONS property for determining whether or not to generate an
- * annotated java class.
- * @see org.eclipse.jst.j2ee.application.internal.operations.IAnnotationsDataModel
- *
- * Clients can subclass this data model provider to cache and provide their own
- * specific attributes. They should also provide their own validation methods,
- * properties interface, and default values for the properties they add.
- *
- * The use of this class is EXPERIMENTAL and is subject to substantial changes.
- */
-public abstract class NewWebClassDataModelProvider extends NewJavaClassDataModelProvider {
-
- /**
- * The fully qualified default superclass.
- */
- private final static String DEFAULT_SUPERCLASS = ""; //$NON-NLS-1$
-
- /**
- * The cache of all the interfaces the web artifact java class will
- * implement.
- */
- protected List interfaceList;
-
- private String classNameCache = ""; //$NON-NLS-1$
- private String existingClassNameCache = ""; //$NON-NLS-1$
-
- private static boolean useAnnotations = false;
-
- /**
- * Subclasses may extend this method to provide their own determination of
- * whether or not certain properties should be disabled or enabled. This
- * method does not accept null parameter. It will not return null. This
- * implementation makes sure annotation support is only allowed on web
- * projects of J2EE version 1.3 or higher.
- *
- * @see org.eclipse.wst.common.frameworks.datamodel.IDataModelProvider#isPropertyEnabled(String)
- * @see IAnnotationsDataModel#USE_ANNOTATIONS
- *
- * @param propertyName
- * @return boolean should property be enabled?
- */
- @Override
- public boolean isPropertyEnabled(String propertyName) {
- // Annotations should only be enabled on a valid j2ee project of version 1.3 or higher
- if (USE_ANNOTATIONS.equals(propertyName)) {
- return !getBooleanProperty(USE_EXISTING_CLASS) && isAnnotationsSupported();
- } else if (MODIFIER_PUBLIC.equals(propertyName)) {
- return false;
- } else if (MODIFIER_ABSTRACT.equals(propertyName)) {
- return false;
- } else if (CONSTRUCTOR.equals(propertyName)) {
- return hasSuperClass();
- }
- // Otherwise return super implementation
- return super.isPropertyEnabled(propertyName);
- }
-
- /**
- * Subclasses may extend this method to add their own data model's
- * properties as valid base properties.
- *
- * @see org.eclipse.wst.common.frameworks.datamodel.IDataModelProvider#getPropertyNames()
- */
- @Override
- public Set getPropertyNames() {
- // Add web artifact specific properties defined in this data model
- Set propertyNames = super.getPropertyNames();
- propertyNames.add(REGISTER_IN_WEB_XML);
- propertyNames.add(DISPLAY_NAME);
- propertyNames.add(DESCRIPTION);
- propertyNames.add(USE_EXISTING_CLASS);
- propertyNames.add(USE_ANNOTATIONS);
- propertyNames.add(JAVA_EE_VERSION);
-
- return propertyNames;
- }
-
- /**
- * Subclasses may extend this method to provide their own default values for
- * any of the properties in the data model hierarchy. This method does not
- * accept a null parameter. It may return null. This implementation sets
- * annotation use to be true.
- *
- * @see NewJavaClassDataModelProvider#getDefaultProperty(String)
- * @see IDataModelProvider#getDefaultProperty(String)
- *
- * @param propertyName
- * @return Object default value of property
- */
- @Override
- public Object getDefaultProperty(String propertyName) {
- if (propertyName.equals(DISPLAY_NAME))
- return Signature.getSimpleName(getStringProperty(CLASS_NAME));
- else if (propertyName.equals(USE_ANNOTATIONS))
- return shouldDefaultAnnotations();
- else if (propertyName.equals(SUPERCLASS))
- return DEFAULT_SUPERCLASS;
- else if (propertyName.equals(USE_EXISTING_CLASS))
- return Boolean.FALSE;
- else if (propertyName.equals(CONSTRUCTOR))
- return hasSuperClass();
- else if (propertyName.equals(REGISTER_IN_WEB_XML)){
- return !isJavaEE6Project();
- } else if (JAVA_EE_VERSION.equals(propertyName)){
- return getJavaEEVersion();
- }
- // Otherwise check super for default value for property
- return super.getDefaultProperty(propertyName);
- }
-
- @SuppressWarnings("restriction")
- public boolean isJavaEE6Project() {
- IProject project = ResourcesPlugin.getWorkspace().getRoot().getProject(getStringProperty(PROJECT_NAME));
- if (project != null && project.isAccessible()){
- try {
- return (FacetedProjectFramework.hasProjectFacet(project, WebFacetUtils.WEB_FACET.getId(), WebFacetUtils.WEB_30.getVersionString())
- || FacetedProjectFramework.hasProjectFacet(project, WebFacetUtils.WEBFRAGMENT_FACET.getId(), WebFacetUtils.WEBFRAGMENT_30.getVersionString()));
- } catch (CoreException e) {
- e.printStackTrace();
- }
- }
- return false;
- }
-
- @SuppressWarnings("restriction")
- public String getJavaEEVersion() {
- IProject project = ResourcesPlugin.getWorkspace().getRoot().getProject(getStringProperty(PROJECT_NAME));
- String id = null;
- if(JavaEEProjectUtilities.isDynamicWebProject(project)){
- id = WebFacetUtils.WEB_FACET.getId();
- }else {
- id = WebFacetUtils.WEBFRAGMENT_FACET.getId();
- }
- return FacetedProjectUtilities.getProjectFacetVersion(project, id).getVersionString();
- }
-
- /**
- * Subclasses may extend this method to add their own specific behavior when
- * a certain property in the data model hierarchy is set. this method does
- * not accept null for the property name, but it will for propertyValue. It
- * will not return null. It will return false if the set fails. This
- * implementation verifies the display name is set to the class name, that
- * the annotations is disabled/enabled properly, and that the target project
- * name is determined from the source folder setting.
- *
- * @see org.eclipse.wst.common.frameworks.datamodel.IDataModelProvider#propertySet(String,
- * Object)
- *
- * @param propertyName
- * @param propertyValue
- * @return boolean was property set?
- */
- @Override
- public boolean propertySet(String propertyName, Object propertyValue) {
- // If annotations is changed, notify an enablement change
- if (propertyName.equals(USE_ANNOTATIONS)) {
- useAnnotations = ((Boolean) propertyValue).booleanValue();
- if (useAnnotations && !isAnnotationsSupported())
- return true;
- model.notifyPropertyChange(USE_ANNOTATIONS, IDataModel.ENABLE_CHG);
- }
- // If the source folder is changed, ensure we have the correct project name
- if (propertyName.equals(SOURCE_FOLDER)) {
- // Get the project name from the source folder name
- String sourceFolder = (String) propertyValue;
- int index = sourceFolder.indexOf(File.separator);
- String projectName = sourceFolder;
- if (index == 0)
- projectName = sourceFolder.substring(1);
- index = projectName.indexOf(File.separator);
- if (index != -1) {
- projectName = projectName.substring(0, index);
- setProperty(PROJECT_NAME, projectName);
- }
- }
- // Call super to set the property on the data model
- boolean result = super.propertySet(propertyName, propertyValue);
- // If class name is changed, update the display name to be the same
- if (propertyName.equals(CLASS_NAME) && !model.isPropertySet(DISPLAY_NAME)) {
- model.notifyPropertyChange(DISPLAY_NAME, IDataModel.DEFAULT_CHG);
- }
- // After the property is set, if project changed, update the nature and the annotations
- // enablement
- if (propertyName.equals(COMPONENT_NAME)) {
- model.notifyPropertyChange(USE_ANNOTATIONS, IDataModel.ENABLE_CHG);
- }
- // After property is set, if annotations is set to true, update its value based on the new
- // level of the project
- if (getBooleanProperty(USE_ANNOTATIONS)) {
- if (!isAnnotationsSupported())
- setBooleanProperty(USE_ANNOTATIONS, false);
- }
- if (propertyName.equals(USE_EXISTING_CLASS)) {
- model.notifyPropertyChange(USE_ANNOTATIONS, IDataModel.ENABLE_CHG);
-
- if (((Boolean) propertyValue).booleanValue()) {
- classNameCache = getStringProperty(CLASS_NAME);
- setProperty(CLASS_NAME, existingClassNameCache);
- } else {
- existingClassNameCache = getStringProperty(CLASS_NAME);
- setProperty(CLASS_NAME, classNameCache);
- }
- }
- // if super class is changed, notify the constructor checkbox to update
- // its enabled state
- if (SUPERCLASS.equals(propertyName)) {
- model.notifyPropertyChange(CONSTRUCTOR, IDataModel.ENABLE_CHG);
- if (!hasSuperClass()) {
- model.setProperty(CONSTRUCTOR, null);
- }
- model.notifyPropertyChange(CONSTRUCTOR, IDataModel.DEFAULT_CHG);
- }
-
- // Return whether property was set
- return result;
- }
-
- /**
- * This method is used to determine if annotations should try to enable
- * based on workspace settings
- *
- * @return does any valid annotation provider or xdoclet handler exist
- */
- //TODO add this method back in for defect 146696
-// protected boolean isAnnotationProviderDefined() {
-// boolean isControllerEnabled = AnnotationsControllerManager.INSTANCE.isAnyAnnotationsSupported();
-// final String preferred = AnnotationPreferenceStore.getProperty(AnnotationPreferenceStore.ANNOTATIONPROVIDER);
-// IAnnotationProvider annotationProvider = null;
-// boolean isProviderEnabled = false;
-// if (preferred != null) {
-// try {
-// annotationProvider = AnnotationUtilities.findAnnotationProviderByName(preferred);
-// } catch (Exception ex) {
-// //Default
-// }
-// if (annotationProvider != null && annotationProvider.isValid())
-// isProviderEnabled = true;
-// }
-// return isControllerEnabled || isProviderEnabled;
-// }
-
- /**
- * This method checks to see if valid annotation providers exist and if
- * valid project version levels exist.
- *
- * @return should annotations be supported for this project in this
- * workspace
- */
- protected boolean isAnnotationsSupported() {
- //TODO add this check back in for defect 146696
-// if (!isAnnotationProviderDefined())
-// return false;
- if (!model.isPropertySet(PROJECT_NAME))
- return true;
- if (getStringProperty(PROJECT_NAME).equals("")) //$NON-NLS-1$
- return true;
- IProject project = ProjectUtilities.getProject(getStringProperty(PROJECT_NAME));
- String moduleName = getStringProperty(COMPONENT_NAME);
- if (project == null || moduleName == null || moduleName.equals(""))return true; //$NON-NLS-1$
- int j2eeVersion = J2EEVersionUtil.convertVersionStringToInt(J2EEProjectUtilities.getJ2EEProjectVersion(project));
-
- return j2eeVersion > J2EEVersionConstants.VERSION_1_2;
-
- }
-
- /**
- * Subclasses may extend this method to provide their own validation on any
- * of the valid data model properties in the hierarchy. It does not accept a
- * null parameter. This method will not return null.
- *
- * @see NewJavaClassDataModelProvider#validate(String)
- *
- * @param propertyName
- * @return IStatus is property value valid?
- */
- @Override
- public IStatus validate(String propertyName) {
- if (propertyName.equals(SUPERCLASS)) {
- // If our default is the superclass, we know it is ok
- if (getStringProperty(propertyName).equals(DEFAULT_SUPERCLASS))
- return WTPCommonPlugin.OK_STATUS;
- }
-
- if (propertyName.equals(CLASS_NAME)) {
- if (getStringProperty(propertyName).length() !=0 && getBooleanProperty(USE_EXISTING_CLASS)) {
- return WTPCommonPlugin.OK_STATUS;
- }
- }
-
- // Otherwise defer to super to validate the property
- return super.validate(propertyName);
- }
-
- /**
- * This method is intended for internal use only. It provides a simple
- * algorithm for detecting if there are duplicate entries in a list. It will
- * accept a null parameter. It will not return null.
- *
- * @see NewWebClassDataModelProvider#validateInitParamList(List)
- * @see NewWebClassDataModelProvider#validateURLMappingList(List)
- *
- * @param input
- * @return boolean are there dups in the list?
- */
- protected boolean hasDuplicatesInStringArrayList(List input) {
- // If list is null or empty return false
- if (input == null)
- return false;
- int n = input.size();
- boolean dup = false;
- // nested for loops to check each element to see if other elements are the same
- for (int i = 0; i < n; i++) {
- String[] sArray1 = (String[]) input.get(i);
- for (int j = i + 1; j < n; j++) {
- String[] sArray2 = (String[]) input.get(j);
- if (isTwoStringArraysEqual(sArray1, sArray2)) {
- dup = true;
- break;
- }
- }
- if (dup)
- break;
- }
- // Return boolean status for duplicates
- return dup;
- }
-
- /**
- * This method is intended for internal use only. This checks to see if the
- * two string arrays are equal. If either of the arrays are null or empty,
- * it returns false.
- *
- * @see NewWebClassDataModelProvider#hasDuplicatesInStringArrayList(List)
- *
- * @param sArray1
- * @param sArray2
- * @return boolean are Arrays equal?
- */
- protected boolean isTwoStringArraysEqual(String[] sArray1, String[] sArray2) {
- // If either array is null, return false
- if (sArray1 == null || sArray2 == null)
- return false;
- int n1 = sArray1.length;
- int n2 = sArray1.length;
- // If either array is empty, return false
- if (n1 == 0 || n2 == 0)
- return false;
- // If they don't have the same length, return false
- if (n1 != n2)
- return false;
- // If their first elements do not match, return false
- if (!sArray1[0].equals(sArray2[0]))
- return false;
- // Otherwise return true
- return true;
- }
-
- protected boolean hasSuperClass() {
- String superClass = model.getStringProperty(SUPERCLASS);
- return (superClass == null) ? false : superClass.trim().length() > 0;
- }
-
- /**
- * @return boolean should the default annotations be true?
- */
- private static Boolean shouldDefaultAnnotations() {
- if (useAnnotations)
- return Boolean.TRUE;
- return Boolean.FALSE;
- }
-
-}
diff --git a/plugins/org.eclipse.jst.j2ee.web/web/org/eclipse/jst/j2ee/internal/web/operations/NewWebClassOperation.java b/plugins/org.eclipse.jst.j2ee.web/web/org/eclipse/jst/j2ee/internal/web/operations/NewWebClassOperation.java
deleted file mode 100644
index 0cb28f7..0000000
--- a/plugins/org.eclipse.jst.j2ee.web/web/org/eclipse/jst/j2ee/internal/web/operations/NewWebClassOperation.java
+++ /dev/null
@@ -1,241 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2008 SAP AG and others.
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
- *
- * Contributors:
- * Kaloyan Raev, kaloyan.raev@sap.com - initial API and implementation
- *******************************************************************************/
-package org.eclipse.jst.j2ee.internal.web.operations;
-
-import static org.eclipse.jst.j2ee.application.internal.operations.IAnnotationsDataModel.USE_ANNOTATIONS;
-
-import java.util.Set;
-
-import org.eclipse.core.commands.ExecutionException;
-import org.eclipse.core.resources.IFile;
-import org.eclipse.core.resources.IProject;
-import org.eclipse.core.runtime.CoreException;
-import org.eclipse.core.runtime.IProgressMonitor;
-import org.eclipse.jdt.core.ICompilationUnit;
-import org.eclipse.jdt.core.IPackageFragment;
-import org.eclipse.jst.common.internal.annotations.controller.AnnotationsController;
-import org.eclipse.jst.common.internal.annotations.controller.AnnotationsControllerManager;
-import org.eclipse.jst.common.internal.annotations.controller.AnnotationsControllerManager.Descriptor;
-import org.eclipse.jst.j2ee.internal.common.operations.NewJavaEEArtifactClassOperation;
-import org.eclipse.jst.j2ee.internal.web.plugin.WebPlugin;
-import org.eclipse.jst.j2ee.project.facet.IJ2EEFacetConstants;
-import org.eclipse.jst.j2ee.web.project.facet.WebFacetUtils;
-import org.eclipse.wst.common.componentcore.ComponentCore;
-import org.eclipse.wst.common.componentcore.datamodel.FacetInstallDataModelProvider;
-import org.eclipse.wst.common.componentcore.datamodel.FacetProjectCreationDataModelProvider;
-import org.eclipse.wst.common.componentcore.datamodel.properties.IFacetDataModelProperties;
-import org.eclipse.wst.common.componentcore.datamodel.properties.IFacetProjectCreationDataModelProperties;
-import org.eclipse.wst.common.componentcore.datamodel.properties.IFacetProjectCreationDataModelProperties.FacetDataModelMap;
-import org.eclipse.wst.common.componentcore.internal.operation.ArtifactEditProviderOperation;
-import org.eclipse.wst.common.componentcore.resources.IVirtualComponent;
-import org.eclipse.wst.common.frameworks.datamodel.AbstractDataModelOperation;
-import org.eclipse.wst.common.frameworks.datamodel.DataModelFactory;
-import org.eclipse.wst.common.frameworks.datamodel.IDataModel;
-import org.eclipse.wst.common.frameworks.internal.enablement.nonui.WFTWrappedException;
-import org.eclipse.wst.common.project.facet.core.IFacetedProject;
-import org.eclipse.wst.common.project.facet.core.ProjectFacetsManager;
-
-/**
- * The NewWebClassOperation is an IDataModelOperation following the IDataModel
- * wizard and operation framework.
- *
- * @see org.eclipse.wst.common.frameworks.datamodel.IDataModelOperation
- * @see org.eclipse.wst.common.frameworks.datamodel.IDataModelProvider
- *
- * It extends AbstractDataModelOperation to provide web artifact specific java
- * class generation.
- * @see AbstractDataModelOperation
- *
- * This operation is used by the AddWebClassOperation to generate either an
- * annotated or non annotated java class for an added web artifact. It shares
- * the NewWebClassDataModelProvider with the AddWebClassOperation to store the
- * appropriate properties required to generate the new web artifact.
- *
- * @see AddWebClassOperation
- * @see NewWebClassDataModelProvider
- *
- * In the annotated case, a WTPJetEmitter listener template is created and used
- * to generate the listener java class with the embedded annotated tags.
- * @see org.eclipse.jst.j2ee.internal.project.WTPJETEmitter
- * @see CreateWebClassTemplateModel
- *
- * In the non annotated case, the same emitter is used to create the class with
- * the non annotated web artifact template so the annotated tags are omitted.
- *
- * Subclasses may extend this operation to provide their own specific web
- * artifact java class generation. The execute method may be extended to do so.
- * Also, generateUsingTemplates is exposed.
- *
- * The use of this class is EXPERIMENTAL and is subject to substantial changes.
- */
-public abstract class NewWebClassOperation extends NewJavaEEArtifactClassOperation {
-
- /**
- * XDoclet facet constants
- */
- private static final String JST_WEB_XDOCLET_VERSION = "1.2.3"; //$NON-NLS-1$
-
- /**
- * variable for the web plugin
- */
- protected static final String WEB_PLUGIN = "WEB_PLUGIN"; //$NON-NLS-1$
-
- /**
- * This is the constructor which should be used when creating a
- * NewWebClassOperation. An instance of the NewWebClassDataModel should be
- * passed in. This does not accept null parameter. It will not return null.
- *
- * @see ArtifactEditProviderOperation#ArtifactEditProviderOperation(IDataModel)
- * @see NewListenerClassDataModel
- *
- * @param dataModel
- * @return NewListenerClassOperation
- */
- public NewWebClassOperation(IDataModel dataModel) {
- super(dataModel);
- }
-
- /**
- * Subclasses may extend this method to provide their own template based
- * creation of an annotated web artifact java class file. This implementation
- * uses the creation of a CreateWebClassTemplateModel and the WTPJetEmitter
- * to create the java class with the annotated tags. This method accepts
- * null for monitor, it does not accept null for fragment. If annotations
- * are not being used the tags will be omitted from the class.
- *
- * @see CreateWebClassTemplateModel
- * @see #generateTemplateSource(CreateWebClassTemplateModel, IProgressMonitor)
- *
- * @param monitor
- * @param fragment
- * @throws CoreException
- * @throws WFTWrappedException
- */
- @Override
- protected void generateUsingTemplates(IProgressMonitor monitor, IPackageFragment fragment) throws WFTWrappedException, CoreException {
- // Create the web artifact template model
- CreateWebClassTemplateModel tempModel = createTemplateModel();
- IProject project = getTargetProject();
- String source;
- try {
- // generate the java source based on the template model
- source = generateTemplateSource(WebPlugin.getPlugin(), tempModel, getTemplateFile(), getTemplateImplementation(), monitor);
- } catch (Exception e) {
- throw new WFTWrappedException(e);
- }
- if (fragment != null) {
- // Create the java file
- String javaFileName = tempModel.getClassName() + DOT_JAVA;
- ICompilationUnit cu = fragment.getCompilationUnit(javaFileName);
- // Add the compilation unit to the java file
- if (cu == null || !cu.exists())
- cu = fragment.createCompilationUnit(javaFileName, source, true, monitor);
- IFile aFile = (IFile) cu.getResource();
- // Let the annotations controller process the annotated resource
- AnnotationsController controller = AnnotationsControllerManager.INSTANCE.getAnnotationsController(project);
- if (controller != null)
- controller.process(aFile);
- }
-
- // Add the xdoclet facet, if necessary, for xdoclet listener creation
- try {
- installXDocletFacetIfNecessary(monitor, project);
- } catch (Exception e) {
- throw new WFTWrappedException(e);
- }
- }
-
- /**
- * This method is intended for internal use only. This will add an webdoclet facet to the project.
- *
- * @throws CoreException
- * @throws ExecutionException
- */
- private void installXDocletFacet(IProgressMonitor monitor, IProject project) throws CoreException, ExecutionException {
- IFacetedProject facetedProject = ProjectFacetsManager.create(project);
- Set fixedFacets = facetedProject.getFixedProjectFacets();
- IDataModel dm = DataModelFactory.createDataModel(new FacetInstallDataModelProvider());
- dm.setProperty(IFacetDataModelProperties.FACET_ID, IJ2EEFacetConstants.DYNAMIC_WEB_XDOCLET);
- dm.setProperty(IFacetDataModelProperties.FACET_PROJECT_NAME, project.getName());
- dm.setProperty(IFacetDataModelProperties.FACET_VERSION_STR, JST_WEB_XDOCLET_VERSION);
- IDataModel fdm = DataModelFactory.createDataModel(new FacetProjectCreationDataModelProvider());
- fdm.setProperty(IFacetProjectCreationDataModelProperties.FACET_PROJECT_NAME, project.getName());
-
- FacetDataModelMap map = (FacetDataModelMap) fdm.getProperty(IFacetProjectCreationDataModelProperties.FACET_DM_MAP);
- map.add(dm);
-
- fdm.getDefaultOperation().execute(monitor, null);
- facetedProject.setFixedProjectFacets(fixedFacets);
- }
-
- /**
- * This method is intended for internal use only. This will check to see if it needs to add an
- * webdoclet facet to the project.
- *
- * @throws CoreException
- * @throws ExecutionException
- */
- private void installXDocletFacetIfNecessary(IProgressMonitor monitor, IProject project) throws CoreException, ExecutionException {
-
- // If not using annotations, ignore the xdoclet facet
- if (!model.getBooleanProperty(USE_ANNOTATIONS))
- return;
-
- // If an extended annotations processor is added, ignore the default xdoclet one
- Descriptor descriptor = AnnotationsControllerManager.INSTANCE.getDescriptor(getTargetComponent().getProject());
- if (descriptor != null)
- return;
-
- // Otherwise check and see if the xdoclet facet is on the project yet
- IFacetedProject facetedProject = ProjectFacetsManager.create(project);
- if (!facetedProject.hasProjectFacet(WebFacetUtils.WEB_XDOCLET_FACET))
- return;
-
- // Install xdoclet facet
- installXDocletFacet(monitor, project);
- }
-
- /**
- * This method will create an instance of the CreateWebClassTemplateModel to
- * be used in conjunction with the WTPJETEmitter. This method will not
- * return null.
- *
- * @see CreateWebClassTemplateModel
- * @see NewWebClassOperation#generateUsingTemplates(IProgressMonitor,
- * IPackageFragment)
- *
- * @return CreateWebClassTemplateModel
- */
- protected abstract CreateWebClassTemplateModel createTemplateModel();
-
- /**
- * This method will return the location of the template file that will be
- * passed to the WTPJETEmitter to generate the template implementation
- * class.
- *
- * @return path to the template file.
- */
- protected abstract String getTemplateFile();
-
- /**
- * This method will return an instance of the template implementation class
- * that is statically compiled in the plugin. This instance can be used to
- * generate the artifact's code without using the WTPJETEmitter.
- *
- * @return an instance of the template implementation class.
- */
- protected abstract Object getTemplateImplementation();
-
- private IVirtualComponent getTargetComponent() {
- return ComponentCore.createComponent(getTargetProject());
- }
-
-}
diff --git a/plugins/org.eclipse.jst.j2ee.web/web/org/eclipse/jst/j2ee/internal/web/operations/ServletSupertypesValidator.java b/plugins/org.eclipse.jst.j2ee.web/web/org/eclipse/jst/j2ee/internal/web/operations/ServletSupertypesValidator.java
deleted file mode 100644
index a911a6f..0000000
--- a/plugins/org.eclipse.jst.j2ee.web/web/org/eclipse/jst/j2ee/internal/web/operations/ServletSupertypesValidator.java
+++ /dev/null
@@ -1,65 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2007, 2008 SAP AG and others.
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
- *
- * Contributors:
- * Kaloyan Raev, kaloyan.raev@sap.com - initial API and implementation
- *******************************************************************************/
-package org.eclipse.jst.j2ee.internal.web.operations;
-
-import static org.eclipse.jst.j2ee.web.IServletConstants.QUALIFIED_GENERIC_SERVLET;
-import static org.eclipse.jst.j2ee.web.IServletConstants.QUALIFIED_HTTP_SERVLET;
-import static org.eclipse.jst.j2ee.web.IServletConstants.QUALIFIED_SERVLET;
-
-import org.eclipse.wst.common.frameworks.datamodel.IDataModel;
-
-public class ServletSupertypesValidator extends AbstractSupertypesValidator {
-
- public static boolean isHttpServletSuperclass(IDataModel dataModel) {
- if (QUALIFIED_HTTP_SERVLET.equals(getSuperclass(dataModel)))
- return true;
-
- if (hasSuperclass(dataModel, getSuperclass(dataModel), QUALIFIED_HTTP_SERVLET))
- return true;
-
- return false;
- }
-
- public static boolean isGenericServletSuperclass(IDataModel dataModel) {
- if (QUALIFIED_HTTP_SERVLET.equals(getSuperclass(dataModel)))
- return true;
-
- if (QUALIFIED_GENERIC_SERVLET.equals(getSuperclass(dataModel)))
- return true;
-
- if (hasSuperclass(dataModel, getSuperclass(dataModel), QUALIFIED_GENERIC_SERVLET))
- return true;
-
- return false;
- }
-
- public static boolean isServletSuperclass(IDataModel dataModel) {
- if (QUALIFIED_HTTP_SERVLET.equals(getSuperclass(dataModel)))
- return true;
-
- if (QUALIFIED_GENERIC_SERVLET.equals(getSuperclass(dataModel)))
- return true;
-
- if (getInterfaces(dataModel).contains(QUALIFIED_SERVLET))
- return true;
-
- if (hasSuperInterface(dataModel, getSuperclass(dataModel), QUALIFIED_SERVLET))
- return true;
-
- for (Object iface : getInterfaces(dataModel)) {
- if (hasSuperInterface(dataModel, (String) iface, QUALIFIED_SERVLET))
- return true;
- }
-
- return false;
- }
-
-}
diff --git a/plugins/org.eclipse.jst.j2ee.web/web/org/eclipse/jst/j2ee/internal/web/operations/ServletTemplate.java b/plugins/org.eclipse.jst.j2ee.web/web/org/eclipse/jst/j2ee/internal/web/operations/ServletTemplate.java
deleted file mode 100644
index 3411010..0000000
--- a/plugins/org.eclipse.jst.j2ee.web/web/org/eclipse/jst/j2ee/internal/web/operations/ServletTemplate.java
+++ /dev/null
@@ -1,517 +0,0 @@
-package org.eclipse.jst.j2ee.internal.web.operations;
-
-import java.util.*;
-import org.eclipse.jst.j2ee.internal.common.operations.*;
-
-public class ServletTemplate
-{
- protected static String nl;
- public static synchronized ServletTemplate create(String lineSeparator)
- {
- nl = lineSeparator;
- ServletTemplate result = new ServletTemplate();
- nl = null;
- return result;
- }
-
- public final String NL = nl == null ? (System.getProperties().getProperty("line.separator")) : nl; //$NON-NLS-1$
- protected final String TEXT_1 = "package "; //$NON-NLS-1$
- protected final String TEXT_2 = ";"; //$NON-NLS-1$
- protected final String TEXT_3 = NL;
- protected final String TEXT_4 = NL + "import "; //$NON-NLS-1$
- protected final String TEXT_5 = ";"; //$NON-NLS-1$
- protected final String TEXT_6 = NL;
- protected final String TEXT_7 = NL;
- protected final String TEXT_8 = "/**" + NL + " * Servlet implementation class "; //$NON-NLS-1$ //$NON-NLS-2$
- protected final String TEXT_9 = NL + " *" + NL + " * @web.servlet" + NL + " * name=\""; //$NON-NLS-1$ //$NON-NLS-2$ //$NON-NLS-3$
- protected final String TEXT_10 = "\"" + NL + " * display-name=\""; //$NON-NLS-1$ //$NON-NLS-2$
- protected final String TEXT_11 = "\""; //$NON-NLS-1$
- protected final String TEXT_12 = NL + " * description=\""; //$NON-NLS-1$
- protected final String TEXT_13 = "\""; //$NON-NLS-1$
- protected final String TEXT_14 = NL + " *" + NL + " * @web.servlet-mapping" + NL + " * url-pattern=\""; //$NON-NLS-1$ //$NON-NLS-2$ //$NON-NLS-3$
- protected final String TEXT_15 = "\""; //$NON-NLS-1$
- protected final String TEXT_16 = NL + " *" + NL + " * @web.servlet-init-param" + NL + " * name=\""; //$NON-NLS-1$ //$NON-NLS-2$ //$NON-NLS-3$
- protected final String TEXT_17 = "\"" + NL + " * value=\""; //$NON-NLS-1$ //$NON-NLS-2$
- protected final String TEXT_18 = "\""; //$NON-NLS-1$
- protected final String TEXT_19 = NL + " * description=\""; //$NON-NLS-1$
- protected final String TEXT_20 = "\""; //$NON-NLS-1$
- protected final String TEXT_21 = NL + " */"; //$NON-NLS-1$
- protected final String TEXT_22 = NL + "@WebServlet"; //$NON-NLS-1$
- protected final String TEXT_23 = "(\""; //$NON-NLS-1$
- protected final String TEXT_24 = "\")"; //$NON-NLS-1$
- protected final String TEXT_25 = "({ "; //$NON-NLS-1$
- protected final String TEXT_26 = ", "; //$NON-NLS-1$
- protected final String TEXT_27 = "\""; //$NON-NLS-1$
- protected final String TEXT_28 = "\""; //$NON-NLS-1$
- protected final String TEXT_29 = " })"; //$NON-NLS-1$
- protected final String TEXT_30 = "("; //$NON-NLS-1$
- protected final String TEXT_31 = ", "; //$NON-NLS-1$
- protected final String TEXT_32 = NL + "\t\t"; //$NON-NLS-1$
- protected final String TEXT_33 = " = \""; //$NON-NLS-1$
- protected final String TEXT_34 = "\""; //$NON-NLS-1$
- protected final String TEXT_35 = " = { "; //$NON-NLS-1$
- protected final String TEXT_36 = ", "; //$NON-NLS-1$
- protected final String TEXT_37 = NL + "\t\t\t\t"; //$NON-NLS-1$
- protected final String TEXT_38 = "\""; //$NON-NLS-1$
- protected final String TEXT_39 = "\""; //$NON-NLS-1$
- protected final String TEXT_40 = NL + "\t\t"; //$NON-NLS-1$
- protected final String TEXT_41 = " "; //$NON-NLS-1$
- protected final String TEXT_42 = "}"; //$NON-NLS-1$
- protected final String TEXT_43 = " = { "; //$NON-NLS-1$
- protected final String TEXT_44 = ", "; //$NON-NLS-1$
- protected final String TEXT_45 = NL + "\t\t\t\t@WebInitParam(name = \""; //$NON-NLS-1$
- protected final String TEXT_46 = "\", value = \""; //$NON-NLS-1$
- protected final String TEXT_47 = "\""; //$NON-NLS-1$
- protected final String TEXT_48 = ", description = \""; //$NON-NLS-1$
- protected final String TEXT_49 = "\""; //$NON-NLS-1$
- protected final String TEXT_50 = ")"; //$NON-NLS-1$
- protected final String TEXT_51 = NL + "\t\t}"; //$NON-NLS-1$
- protected final String TEXT_52 = ")"; //$NON-NLS-1$
- protected final String TEXT_53 = NL + "public "; //$NON-NLS-1$
- protected final String TEXT_54 = "abstract "; //$NON-NLS-1$
- protected final String TEXT_55 = "final "; //$NON-NLS-1$
- protected final String TEXT_56 = "class "; //$NON-NLS-1$
- protected final String TEXT_57 = " extends "; //$NON-NLS-1$
- protected final String TEXT_58 = " implements "; //$NON-NLS-1$
- protected final String TEXT_59 = ", "; //$NON-NLS-1$
- protected final String TEXT_60 = " {"; //$NON-NLS-1$
- protected final String TEXT_61 = NL + "\tprivate static final long serialVersionUID = 1L;"; //$NON-NLS-1$
- protected final String TEXT_62 = NL + NL + " /**" + NL + " * Default constructor. " + NL + " */" + NL + " public "; //$NON-NLS-1$ //$NON-NLS-2$ //$NON-NLS-3$ //$NON-NLS-4$
- protected final String TEXT_63 = "() {" + NL + " // TODO Auto-generated constructor stub" + NL + " }"; //$NON-NLS-1$ //$NON-NLS-2$ //$NON-NLS-3$
- protected final String TEXT_64 = NL + " " + NL + " /**" + NL + " * @see "; //$NON-NLS-1$ //$NON-NLS-2$ //$NON-NLS-3$
- protected final String TEXT_65 = "#"; //$NON-NLS-1$
- protected final String TEXT_66 = "("; //$NON-NLS-1$
- protected final String TEXT_67 = ")" + NL + " */" + NL + " public "; //$NON-NLS-1$ //$NON-NLS-2$ //$NON-NLS-3$
- protected final String TEXT_68 = "("; //$NON-NLS-1$
- protected final String TEXT_69 = ") {" + NL + " super("; //$NON-NLS-1$ //$NON-NLS-2$
- protected final String TEXT_70 = ");" + NL + " // TODO Auto-generated constructor stub" + NL + " }"; //$NON-NLS-1$ //$NON-NLS-2$ //$NON-NLS-3$
- protected final String TEXT_71 = NL + NL + "\t/**" + NL + " * @see "; //$NON-NLS-1$ //$NON-NLS-2$
- protected final String TEXT_72 = "#"; //$NON-NLS-1$
- protected final String TEXT_73 = "("; //$NON-NLS-1$
- protected final String TEXT_74 = ")" + NL + " */" + NL + " public "; //$NON-NLS-1$ //$NON-NLS-2$ //$NON-NLS-3$
- protected final String TEXT_75 = " "; //$NON-NLS-1$
- protected final String TEXT_76 = "("; //$NON-NLS-1$
- protected final String TEXT_77 = ") {" + NL + " // TODO Auto-generated method stub"; //$NON-NLS-1$ //$NON-NLS-2$
- protected final String TEXT_78 = NL + "\t\t\treturn "; //$NON-NLS-1$
- protected final String TEXT_79 = ";"; //$NON-NLS-1$
- protected final String TEXT_80 = NL + " }"; //$NON-NLS-1$
- protected final String TEXT_81 = NL + NL + "\t/**" + NL + "\t * @see Servlet#init(ServletConfig)" + NL + "\t */" + NL + "\tpublic void init(ServletConfig config) throws ServletException {" + NL + "\t\t// TODO Auto-generated method stub" + NL + "\t}"; //$NON-NLS-1$ //$NON-NLS-2$ //$NON-NLS-3$ //$NON-NLS-4$ //$NON-NLS-5$ //$NON-NLS-6$
- protected final String TEXT_82 = NL + NL + "\t/**" + NL + "\t * @see Servlet#destroy()" + NL + "\t */" + NL + "\tpublic void destroy() {" + NL + "\t\t// TODO Auto-generated method stub" + NL + "\t}"; //$NON-NLS-1$ //$NON-NLS-2$ //$NON-NLS-3$ //$NON-NLS-4$ //$NON-NLS-5$ //$NON-NLS-6$
- protected final String TEXT_83 = NL + NL + "\t/**" + NL + "\t * @see Servlet#getServletConfig()" + NL + "\t */" + NL + "\tpublic ServletConfig getServletConfig() {" + NL + "\t\t// TODO Auto-generated method stub" + NL + "\t\treturn null;" + NL + "\t}"; //$NON-NLS-1$ //$NON-NLS-2$ //$NON-NLS-3$ //$NON-NLS-4$ //$NON-NLS-5$ //$NON-NLS-6$ //$NON-NLS-7$
- protected final String TEXT_84 = NL + NL + "\t/**" + NL + "\t * @see Servlet#getServletInfo()" + NL + "\t */" + NL + "\tpublic String getServletInfo() {" + NL + "\t\t// TODO Auto-generated method stub" + NL + "\t\treturn null; " + NL + "\t}"; //$NON-NLS-1$ //$NON-NLS-2$ //$NON-NLS-3$ //$NON-NLS-4$ //$NON-NLS-5$ //$NON-NLS-6$ //$NON-NLS-7$
- protected final String TEXT_85 = NL + NL + "\t/**" + NL + "\t * @see Servlet#service(ServletRequest request, ServletResponse response)" + NL + "\t */" + NL + "\tpublic void service(ServletRequest request, ServletResponse response) throws ServletException, IOException {" + NL + "\t\t// TODO Auto-generated method stub" + NL + "\t}"; //$NON-NLS-1$ //$NON-NLS-2$ //$NON-NLS-3$ //$NON-NLS-4$ //$NON-NLS-5$ //$NON-NLS-6$
- protected final String TEXT_86 = NL + NL + "\t/**" + NL + "\t * @see HttpServlet#service(HttpServletRequest request, HttpServletResponse response)" + NL + "\t */" + NL + "\tprotected void service(HttpServletRequest request, HttpServletResponse response) throws ServletException, IOException {" + NL + "\t\t// TODO Auto-generated method stub" + NL + "\t}"; //$NON-NLS-1$ //$NON-NLS-2$ //$NON-NLS-3$ //$NON-NLS-4$ //$NON-NLS-5$ //$NON-NLS-6$
- protected final String TEXT_87 = NL + NL + "\t/**" + NL + "\t * @see HttpServlet#doGet(HttpServletRequest request, HttpServletResponse response)" + NL + "\t */" + NL + "\tprotected void doGet(HttpServletRequest request, HttpServletResponse response) throws ServletException, IOException {" + NL + "\t\t// TODO Auto-generated method stub" + NL + "\t}"; //$NON-NLS-1$ //$NON-NLS-2$ //$NON-NLS-3$ //$NON-NLS-4$ //$NON-NLS-5$ //$NON-NLS-6$
- protected final String TEXT_88 = NL + NL + "\t/**" + NL + "\t * @see HttpServlet#doPost(HttpServletRequest request, HttpServletResponse response)" + NL + "\t */" + NL + "\tprotected void doPost(HttpServletRequest request, HttpServletResponse response) throws ServletException, IOException {" + NL + "\t\t// TODO Auto-generated method stub" + NL + "\t}"; //$NON-NLS-1$ //$NON-NLS-2$ //$NON-NLS-3$ //$NON-NLS-4$ //$NON-NLS-5$ //$NON-NLS-6$
- protected final String TEXT_89 = NL + NL + "\t/**" + NL + "\t * @see HttpServlet#doPut(HttpServletRequest, HttpServletResponse)" + NL + "\t */" + NL + "\tprotected void doPut(HttpServletRequest request, HttpServletResponse response) throws ServletException, IOException {" + NL + "\t\t// TODO Auto-generated method stub" + NL + "\t}"; //$NON-NLS-1$ //$NON-NLS-2$ //$NON-NLS-3$ //$NON-NLS-4$ //$NON-NLS-5$ //$NON-NLS-6$
- protected final String TEXT_90 = NL + NL + "\t/**" + NL + "\t * @see HttpServlet#doDelete(HttpServletRequest, HttpServletResponse)" + NL + "\t */" + NL + "\tprotected void doDelete(HttpServletRequest request, HttpServletResponse response) throws ServletException, IOException {" + NL + "\t\t// TODO Auto-generated method stub" + NL + "\t}"; //$NON-NLS-1$ //$NON-NLS-2$ //$NON-NLS-3$ //$NON-NLS-4$ //$NON-NLS-5$ //$NON-NLS-6$
- protected final String TEXT_91 = NL + NL + "\t/**" + NL + "\t * @see HttpServlet#doHead(HttpServletRequest, HttpServletResponse)" + NL + "\t */" + NL + "\tprotected void doHead(HttpServletRequest request, HttpServletResponse response) throws ServletException, IOException {" + NL + "\t\t// TODO Auto-generated method stub" + NL + "\t}"; //$NON-NLS-1$ //$NON-NLS-2$ //$NON-NLS-3$ //$NON-NLS-4$ //$NON-NLS-5$ //$NON-NLS-6$
- protected final String TEXT_92 = NL + NL + "\t/**" + NL + "\t * @see HttpServlet#doOptions(HttpServletRequest, HttpServletResponse)" + NL + "\t */" + NL + "\tprotected void doOptions(HttpServletRequest request, HttpServletResponse response) throws ServletException, IOException {" + NL + "\t\t// TODO Auto-generated method stub" + NL + "\t}"; //$NON-NLS-1$ //$NON-NLS-2$ //$NON-NLS-3$ //$NON-NLS-4$ //$NON-NLS-5$ //$NON-NLS-6$
- protected final String TEXT_93 = NL + NL + "\t/**" + NL + "\t * @see HttpServlet#doTrace(HttpServletRequest, HttpServletResponse)" + NL + "\t */" + NL + "\tprotected void doTrace(HttpServletRequest request, HttpServletResponse response) throws ServletException, IOException {" + NL + "\t\t// TODO Auto-generated method stub" + NL + "\t}"; //$NON-NLS-1$ //$NON-NLS-2$ //$NON-NLS-3$ //$NON-NLS-4$ //$NON-NLS-5$ //$NON-NLS-6$
- protected final String TEXT_94 = NL + NL + "}"; //$NON-NLS-1$
- protected final String TEXT_95 = NL;
-
- public String generate(Object argument)
- {
- final StringBuffer stringBuffer = new StringBuffer();
- CreateServletTemplateModel model = (CreateServletTemplateModel) argument;
-
- model.removeFlags(CreateJavaEEArtifactTemplateModel.FLAG_QUALIFIED_SUPERCLASS_NAME);
-
-
- if (model.getJavaPackageName() != null && model.getJavaPackageName().length() > 0) {
-
- stringBuffer.append(TEXT_1);
- stringBuffer.append( model.getJavaPackageName() );
- stringBuffer.append(TEXT_2);
-
- }
-
- stringBuffer.append(TEXT_3);
-
- Collection<String> imports = model.getImports();
- for (String anImport : imports) {
-
- stringBuffer.append(TEXT_4);
- stringBuffer.append( anImport );
- stringBuffer.append(TEXT_5);
-
- }
-
- stringBuffer.append(TEXT_6);
- stringBuffer.append(TEXT_7);
- stringBuffer.append(TEXT_8);
- stringBuffer.append( model.getClassName() );
-
- if (model.isAnnotated()) {
-
- stringBuffer.append(TEXT_9);
- stringBuffer.append( model.getServletName() );
- stringBuffer.append(TEXT_10);
- stringBuffer.append( model.getServletName() );
- stringBuffer.append(TEXT_11);
-
- if (model.getDescription() != null && model.getDescription().length() > 0) {
-
- stringBuffer.append(TEXT_12);
- stringBuffer.append( model.getDescription() );
- stringBuffer.append(TEXT_13);
-
- }
-
- List<String[]> mappings = model.getServletMappings();
- if (mappings != null && mappings.size() > 0) {
- for (int i = 0; i < mappings.size(); i++) {
- String map = model.getServletMapping(i);
- stringBuffer.append(TEXT_14);
- stringBuffer.append( map );
- stringBuffer.append(TEXT_15);
-
- }
- }
- List<String[]> initParams = model.getInitParams();
- if (initParams != null && initParams.size() > 0) {
- for (int i = 0; i < initParams.size(); i++) {
- String name = model.getInitParam(i, CreateServletTemplateModel.NAME);
- String value = model.getInitParam(i, CreateServletTemplateModel.VALUE);
- String description = model.getInitParam(i, CreateServletTemplateModel.DESCRIPTION);
-
- stringBuffer.append(TEXT_16);
- stringBuffer.append( name );
- stringBuffer.append(TEXT_17);
- stringBuffer.append( value );
- stringBuffer.append(TEXT_18);
-
- if (description != null && description.length() > 0) {
-
- stringBuffer.append(TEXT_19);
- stringBuffer.append( description );
- stringBuffer.append(TEXT_20);
-
- }
- }
- }
- }
-
- stringBuffer.append(TEXT_21);
-
- if ("3.0".equals(model.getJavaEEVersion())) { //$NON-NLS-1$
-
- stringBuffer.append(TEXT_22);
-
- Map<String, Object> params = model.getClassAnnotationParams();
- if (params.size() == 1 && params.containsKey(CreateServletTemplateModel.ATT_URL_PATTERNS)) {
- List<String[]> mappings = (List<String[]>) params.get(CreateServletTemplateModel.ATT_URL_PATTERNS);
- if (mappings.size() == 1) {
- String value = mappings.get(0)[0];
-
- stringBuffer.append(TEXT_23);
- stringBuffer.append( value );
- stringBuffer.append(TEXT_24);
-
- } else {
-
- stringBuffer.append(TEXT_25);
-
- boolean needComma = false;
- for (String[] mapping : mappings) {
- if (needComma) {
-
- stringBuffer.append(TEXT_26);
-
- }
-
- stringBuffer.append(TEXT_27);
- stringBuffer.append( mapping[0] );
- stringBuffer.append(TEXT_28);
-
- needComma = true;
- }
-
- stringBuffer.append(TEXT_29);
-
- }
- } else if (!params.isEmpty()) {
-
- stringBuffer.append(TEXT_30);
-
- Set<String> keys = params.keySet();
- boolean needNewLine = keys.contains(CreateServletTemplateModel.ATT_INIT_PARAMS) ||
- (keys.contains(CreateServletTemplateModel.ATT_URL_PATTERNS) &&
- ((List<String[]>) params.get(CreateServletTemplateModel.ATT_URL_PATTERNS)).size() > 1);
- boolean needComma = false;
- for (String key : keys) {
- if (needComma) {
-
- stringBuffer.append(TEXT_31);
-
- }
-
- if (needNewLine) {
-
- stringBuffer.append(TEXT_32);
-
- }
-
- if (key.equals(CreateServletTemplateModel.ATT_NAME) || key.equals(CreateServletTemplateModel.ATT_DESCRIPTION)) {
- String value = (String) params.get(key);
-
- stringBuffer.append( key );
- stringBuffer.append(TEXT_33);
- stringBuffer.append( value );
- stringBuffer.append(TEXT_34);
-
- } else if (key.equals(CreateServletTemplateModel.ATT_URL_PATTERNS)) {
-
- stringBuffer.append( key );
- stringBuffer.append(TEXT_35);
-
- List<String[]> mappings = (List<String[]>) params.get(key);
- boolean needComma2 = false;
- boolean needNewLine2 = mappings.size() > 1;
- for (String[] mapping : mappings) {
- if (needComma2) {
-
- stringBuffer.append(TEXT_36);
-
- }
-
- if (needNewLine2) {
-
- stringBuffer.append(TEXT_37);
-
- }
-
- stringBuffer.append(TEXT_38);
- stringBuffer.append( mapping[0] );
- stringBuffer.append(TEXT_39);
-
- needComma2 = true;
- }
-
- if (needNewLine2) {
-
- stringBuffer.append(TEXT_40);
-
- } else {
-
- stringBuffer.append(TEXT_41);
-
- }
-
- stringBuffer.append(TEXT_42);
-
- } else if (key.equals(CreateServletTemplateModel.ATT_INIT_PARAMS)) {
-
- stringBuffer.append( key );
- stringBuffer.append(TEXT_43);
-
- List<String[]> initParams = (List<String[]>) params.get(key);
- boolean needComma2 = false;
- for (String[] initParam : initParams) {
- if (needComma2) {
-
- stringBuffer.append(TEXT_44);
-
- }
-
- String name = initParam[CreateServletTemplateModel.NAME];
- String value = initParam[CreateServletTemplateModel.VALUE];
- String description = initParam[CreateServletTemplateModel.DESCRIPTION];
-
- stringBuffer.append(TEXT_45);
- stringBuffer.append( name );
- stringBuffer.append(TEXT_46);
- stringBuffer.append( value );
- stringBuffer.append(TEXT_47);
-
- if (description != null && description.length() > 0) {
-
- stringBuffer.append(TEXT_48);
- stringBuffer.append( description );
- stringBuffer.append(TEXT_49);
-
- }
-
- stringBuffer.append(TEXT_50);
-
- needComma2 = true;
- }
-
- stringBuffer.append(TEXT_51);
-
- }
-
- needComma = true;
- }
-
- stringBuffer.append(TEXT_52);
-
- }
- }
-
-
- if (model.isPublic()) {
-
- stringBuffer.append(TEXT_53);
-
- }
-
- if (model.isAbstract()) {
-
- stringBuffer.append(TEXT_54);
-
- }
-
- if (model.isFinal()) {
-
- stringBuffer.append(TEXT_55);
-
- }
-
- stringBuffer.append(TEXT_56);
- stringBuffer.append( model.getClassName() );
-
- String superClass = model.getSuperclassName();
- if (superClass != null && superClass.length() > 0) {
-
- stringBuffer.append(TEXT_57);
- stringBuffer.append( superClass );
-
- }
-
- List<String> interfaces = model.getInterfaces();
- if ( interfaces.size() > 0) {
-
- stringBuffer.append(TEXT_58);
-
- }
-
- for (int i = 0; i < interfaces.size(); i++) {
- String INTERFACE = interfaces.get(i);
- if (i > 0) {
-
- stringBuffer.append(TEXT_59);
-
- }
-
- stringBuffer.append( INTERFACE );
-
- }
-
- stringBuffer.append(TEXT_60);
-
- if (model.isGenericServletSuperclass()) {
-
- stringBuffer.append(TEXT_61);
-
- }
-
-
- if (!model.hasEmptySuperclassConstructor()) {
-
- stringBuffer.append(TEXT_62);
- stringBuffer.append( model.getClassName() );
- stringBuffer.append(TEXT_63);
-
- }
-
- if (model.shouldGenSuperclassConstructors()) {
- List<Constructor> constructors = model.getConstructors();
- for (Constructor constructor : constructors) {
- if (constructor.isPublic() || constructor.isProtected()) {
-
- stringBuffer.append(TEXT_64);
- stringBuffer.append( model.getSuperclassName() );
- stringBuffer.append(TEXT_65);
- stringBuffer.append( model.getSuperclassName() );
- stringBuffer.append(TEXT_66);
- stringBuffer.append( constructor.getParamsForJavadoc() );
- stringBuffer.append(TEXT_67);
- stringBuffer.append( model.getClassName() );
- stringBuffer.append(TEXT_68);
- stringBuffer.append( constructor.getParamsForDeclaration() );
- stringBuffer.append(TEXT_69);
- stringBuffer.append( constructor.getParamsForCall() );
- stringBuffer.append(TEXT_70);
-
- }
- }
- }
-
-
- if (model.shouldImplementAbstractMethods()) {
- for (Method method : model.getUnimplementedMethods()) {
-
- stringBuffer.append(TEXT_71);
- stringBuffer.append( method.getContainingJavaClass() );
- stringBuffer.append(TEXT_72);
- stringBuffer.append( method.getName() );
- stringBuffer.append(TEXT_73);
- stringBuffer.append( method.getParamsForJavadoc() );
- stringBuffer.append(TEXT_74);
- stringBuffer.append( method.getReturnType() );
- stringBuffer.append(TEXT_75);
- stringBuffer.append( method.getName() );
- stringBuffer.append(TEXT_76);
- stringBuffer.append( method.getParamsForDeclaration() );
- stringBuffer.append(TEXT_77);
-
- String defaultReturnValue = method.getDefaultReturnValue();
- if (defaultReturnValue != null) {
-
- stringBuffer.append(TEXT_78);
- stringBuffer.append( defaultReturnValue );
- stringBuffer.append(TEXT_79);
-
- }
-
- stringBuffer.append(TEXT_80);
-
- }
- }
-
- if (model.shouldGenInit()) {
- stringBuffer.append(TEXT_81);
- }
- if (model.shouldGenDestroy()) {
- stringBuffer.append(TEXT_82);
- }
- if (model.shouldGenGetServletConfig()) {
- stringBuffer.append(TEXT_83);
- }
- if (model.shouldGenGetServletInfo()) {
- stringBuffer.append(TEXT_84);
- }
- if (model.shouldGenService() && !model.isHttpServletSuperclass()) {
- stringBuffer.append(TEXT_85);
- }
- if (model.shouldGenService() && model.isHttpServletSuperclass()) {
- stringBuffer.append(TEXT_86);
- }
- if (model.shouldGenDoGet()) {
- stringBuffer.append(TEXT_87);
- }
- if (model.shouldGenDoPost()) {
- stringBuffer.append(TEXT_88);
- }
- if (model.shouldGenDoPut()) {
- stringBuffer.append(TEXT_89);
- }
- if (model.shouldGenDoDelete()) {
- stringBuffer.append(TEXT_90);
- }
- if (model.shouldGenDoHead()) {
- stringBuffer.append(TEXT_91);
- }
- if (model.shouldGenDoOptions()) {
- stringBuffer.append(TEXT_92);
- }
- if (model.shouldGenDoTrace()) {
- stringBuffer.append(TEXT_93);
- }
- stringBuffer.append(TEXT_94);
- stringBuffer.append(TEXT_95);
- return stringBuffer.toString();
- }
-}
diff --git a/plugins/org.eclipse.jst.j2ee.web/web/org/eclipse/jst/j2ee/internal/web/operations/WebMessages.java b/plugins/org.eclipse.jst.j2ee.web/web/org/eclipse/jst/j2ee/internal/web/operations/WebMessages.java
deleted file mode 100644
index 47dd11a..0000000
--- a/plugins/org.eclipse.jst.j2ee.web/web/org/eclipse/jst/j2ee/internal/web/operations/WebMessages.java
+++ /dev/null
@@ -1,124 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2003, 2008 IBM Corporation and others.
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
- *
- * Contributors:
- * IBM Corporation - initial API and implementation
- * Kaloyan Raev, kaloyan.raev@sap.com - initial API and implementation
- *******************************************************************************/
-/*
- * Created on Jan 13, 2004
- *
- * To change the template for this generated file go to
- * Window - Preferences - Java - Code Generation - Code and Comments
- */
-package org.eclipse.jst.j2ee.internal.web.operations;
-
-import org.eclipse.osgi.util.NLS;
-
-
-/**
- * @author jialin
- *
- * To change the template for this generated type comment go to Window - Preferences - Java - Code
- * Generation - Code and Comments
- */
-public class WebMessages extends NLS {
- private static final String BUNDLE_NAME = "web";//$NON-NLS-1$
-
- private WebMessages() {
- // Do not instantiate
- }
-
- public static String ERR_JAR_NAME_EMPTY;
- public static String ERR_JAR_NAME_EXIST;
- public static String ERR_JAVA_PROJECT_NAME_EMPTY;
- public static String ERR_JAVA_PROJECT_NAME_EXIST;
- public static String ERR_DUPLICATED_INIT_PARAMETER;
- public static String ERR_DUPLICATED_URL_MAPPING;
-
- public static String ERR_SERVLET_MAPPING_URL_PATTERN_EXIST;
- public static String KEY_3;
- public static String KEY_4;
- public static String KEY_5;
- public static String KEY_6;
- public static String ERR_FILTER_PARAMETER_NAME_EXIST;
- public static String ERR_FILTER_MAPPING_SERVLET_EXIST;
- public static String ERR_FILTER_MAPPING_SERVLET_DISPATCHER_TYPES_EMPTY;
- public static String ERR_SERVLET_MAPPING_URL_PATTERN_EMPTY;
- public static String ERR_URL_MAPPING_LIST_EMPTY;
- public static String ERR_URL_PATTERN_INVALID;
- public static String ERR_FILTER_MAPPING_EMPTY;
- public static String ERR_DISPLAY_NAME_EMPTY;
- public static String ERR_SERVLET_CLASS_NAME_USED;
- public static String ERR_SERVLET_JAVA_CLASS_NAME_INVALID;
- public static String ERR_SERVLET_MAPPING_SERVLET_NOT_EXIST;
- public static String ERR_SERVLET_NAME_EXIST;
- public static String ERR_SERVLET_DISPLAY_NAME_EXIST;
- public static String ERR_SERVLET_PARAMETER_NAME_EMPTY;
- public static String ERR_SERVLET_PARAMETER_NAME_EXIST;
- public static String ERR_SERVLET_PARAMETER_VALUE_EMPTY;
- public static String ERR_SERVLET_PARAMETER_VALUE_EXIST;
- public static String ERR_SERVLET_ROLE_REF_NAME_EMPTY;
- public static String ERR_SERVLET_ROLE_REF_NAME_EXIST;
- public static String ERR_SERVLET_ROLE_LINK_EMPTY;
- public static String ERR_SERVLET_INTERFACE;
-
- public static String ERR_FILTER_DISPLAY_NAME_EXIST;
- public static String ERR_FILTER_NAME_EXIST;
- public static String ERR_FILTER_CLASS_NAME_USED;
- public static String ERR_FILTER_CLASS_NAME_INVALID;
- public static String ERR_LISTENER_DISPLAY_NAME_EXIST;
- public static String ERR_LISTENER_CLASS_NAME_USED;
- public static String ERR_LISTENER_CLASS_NAME_INVALID;
-
- public static String ERR_PAGE_ENCODING_EMPTY;
- public static String ERR_PAGE_ENCODING_EXIST;
- public static String ERR_URL_PATTERN_EXIST;
- public static String ERR_INCLUDE_PRELUDES_EXIST;
- public static String ERR_INCLUDE_CODAS_EXIST;
- public static String ERR_SECURITY_CONSTRAINT_NAME_EMPTY;
- public static String ERR_SECURITY_CONSTRAINT_NAME_EXIST;
- public static String ERR_CONTEXT_PARAMETER_NAME_EMPTY;
- public static String ERR_CONTEXT_PARAMETER_NAME_EXIST;
- public static String ERR_RESOURCE_NAME_EMPTY;
- public static String ERR_RESOURCE_NAME_EXIST;
- public static String ERR_URL_PATTERNS_EMPTY;
- public static String ERR_MIME_MAPPING_EXTENSION_EMPTY;
- public static String ERR_MIME_MAPPING_EXTENSION_EXIST;
- public static String ERR_WELCOME_PAGE_EMPTY;
- public static String ERR_WELCOME_PAGE_EXIST;
- public static String ERR_ENV_ENTRY_NAME_EMPTY;
- public static String ERR_ENV_ENTRY_NAME_EXIST;
- public static String ERR_ERROR_CODE_EMPTY;
- public static String ERR_ERROR_CODE_MUST_BE_3_DIGITS;
- public static String ERR_ERROR_PAGE_LOCATION_EMPTY;
- public static String ERR_ERROR_PAGE_LOCATION_EXIST;
- public static String ERR_ERROR_PAGE_LOCATION_MUST_START_WITH_SLASH;
- public static String ERR_EXCEPTION_TYPE_EMPTY;
- public static String ERR_EXCEPTION_SECURITY_ID_NO_BEANS;
- public static String ERR_EXCEPTION_ROLE_NAME_EMPTY;
- public static String ERR_LOCALE_NAME_EMPTY;
- public static String ERR_LOCALE_NAME_EXIST;
- public static String ERR_TAGLIBREF_URL_EMPTY;
- public static String ERR_TAGLIBREF_URL_EXIST;
- public static String ERR_MESSAGE_DESTINATION_NAME_EMPTY;
- public static String ERR_MESSAGE_DESTINATION_NAME_EXIST;
- public static String ERR_EXCEPTION_METHOD_ELEMENT_EMPTY;
- public static String ERR_EXCEPTION_METHOD_TRANSACTION_ATTRIBUTES_EMPTY;
- public static String ERR_SERVLET_LIST_EMPTY;
- public static String ERR_FILTER_LIST_EMPTY;
- public static String ERR_LISTENER_LIST_EMPTY;
- public static String ERR_NO_LISTENER_SELECTED;
-
- static {
- NLS.initializeMessages(BUNDLE_NAME, WebMessages.class);
- }
-
- public static String getResourceString(String key, Object[] args) {
- return NLS.bind(key, args);
- }
-}
diff --git a/plugins/org.eclipse.jst.j2ee.web/web/org/eclipse/jst/j2ee/internal/web/plugin/WebModuleExtensionImpl.java b/plugins/org.eclipse.jst.j2ee.web/web/org/eclipse/jst/j2ee/internal/web/plugin/WebModuleExtensionImpl.java
deleted file mode 100644
index ffc41ce..0000000
--- a/plugins/org.eclipse.jst.j2ee.web/web/org/eclipse/jst/j2ee/internal/web/plugin/WebModuleExtensionImpl.java
+++ /dev/null
@@ -1,152 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2003, 2005 IBM Corporation and others.
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
- *
- * Contributors:
- * IBM Corporation - initial API and implementation
- *******************************************************************************/
-/*
- * Created on Sep 29, 2003
- *
- * To change the template for this generated file go to Window>Preferences>Java>Code
- * Generation>Code and Comments
- */
-package org.eclipse.jst.j2ee.internal.web.plugin;
-
-import java.util.Set;
-
-import org.eclipse.core.resources.IFile;
-import org.eclipse.core.resources.IProject;
-import org.eclipse.core.runtime.CoreException;
-import org.eclipse.jst.j2ee.application.Module;
-import org.eclipse.jst.j2ee.application.WebModule;
-import org.eclipse.jst.j2ee.internal.moduleextension.EarModuleExtensionImpl;
-import org.eclipse.jst.j2ee.internal.moduleextension.WebModuleExtension;
-import org.eclipse.jst.j2ee.internal.project.J2EEJavaProjectInfo;
-import org.eclipse.jst.j2ee.internal.web.archive.operations.WebComponentImportDataModelProvider;
-import org.eclipse.jst.j2ee.internal.web.archive.operations.WebFacetProjectCreationDataModelProvider;
-import org.eclipse.wst.common.frameworks.datamodel.DataModelFactory;
-import org.eclipse.wst.common.frameworks.datamodel.IDataModel;
-
-
-
-public class WebModuleExtensionImpl extends EarModuleExtensionImpl implements WebModuleExtension {
-
- /**
- *
- */
- public WebModuleExtensionImpl() {
- super();
- }
-
- /*
- * (non-Javadoc)
- *
- * @see org.eclipse.jst.j2ee.internal.internal.moduleextension.WebModuleExtension#createProjectInfo()
- */
- public J2EEJavaProjectInfo createProjectInfo() {
- return null;
- }
-
- /*
- * (non-Javadoc)
- *
- * @see org.eclipse.jst.j2ee.internal.internal.moduleextension.WebModuleExtension#addWLPProjects(org.eclipse.core.resources.IProject,
- * java.util.Set)
- */
- public void addWLPProjects(IProject aProject, Set projectsToBuild) {
- // J2EEWebNatureRuntime nature = J2EEWebNatureRuntime.getRuntime(aProject);
- // if (nature == null)
- // return;
- // ILibModule[] libModules = nature.getLibModules();
- // for (int i = 0; i < libModules.length; i++) {
- // IProject p = libModules[i].getProject();
- // if (p.isAccessible())
- // projectsToBuild.add(libModules[i].getProject());
- // }
- }
-
-
- /*
- * (non-Javadoc)
- *
- * @see org.eclipse.jst.j2ee.internal.internal.moduleextension.WebModuleExtension#setContextRootForModuleMapping(org.eclipse.jst.j2ee.internal.internal.application.WebModule,
- * org.eclipse.core.resources.IProject)
- */
- public void setContextRootForModuleMapping(WebModule webModule, IProject nestedProject) throws CoreException {
- // TODO migrate to flex project
- }
-
- /*
- * (non-Javadoc)
- *
- * @see org.eclipse.jst.j2ee.internal.internal.moduleextension.WebModuleExtension#hasRuntime(org.eclipse.core.resources.IProject)
- */
- public boolean hasRuntime(IProject project) {
- // return J2EEWebNatureRuntimeUtilities.hasJ2EERuntime(project);
- // To do: work based on module
- return false;
- }
-
- // public J2EEImportOperationOLD createImportOperation(IProject
- // nestedProject, WARFile warFile, EARImportConfiguration importConfig){
- // WarImportOperation op = new WarImportOperation(nestedProject, warFile);
- // //op.setServerTarget(info.getServerTarget());
- // HashMap opMap = importConfig.createProjectOption;
- // if(opMap != null && !opMap.isEmpty())
- // op.createWLProjectOptions = opMap;
- // return op;
- // }
-
- /*
- * (non-Javadoc)
- *
- * @see org.eclipse.jst.j2ee.internal.internal.moduleextension.WebModuleExtension#getContentFolder(org.eclipse.core.resources.IProject,
- * org.eclipse.jst.j2ee.internal.internal.commonarchivecore.File)
- */
-
- public String getContentFolder(IProject project, IFile webSettingsFile) {
- return null;
- // To do: Needs work here, no content folder exists now
- }
-
- /*
- * (non-Javadoc)
- *
- * @see org.eclipse.jst.j2ee.internal.internal.moduleextension.WebModuleExtension#compareWebContextRoot(org.eclipse.jst.j2ee.internal.internal.application.Module,
- * org.eclipse.core.resources.IProject)
- */
- public boolean compareWebContextRoot(Module module, IProject project) throws CoreException {
- String contextRoot = ((WebModule) module).getContextRoot();
- if (contextRoot != null)
- return ((contextRoot).equals(getServerContextRoot(project)));
- return false;
- }
-
- protected String getServerContextRoot(IProject project) {
- // TODO migrate to flex project
- return ""; //$NON-NLS-1$
- }
-
- /*
- * (non-Javadoc)
- *
- * @see org.eclipse.jst.j2ee.internal.internal.moduleextension.EarModuleExtension#createProjectDataModel()
- */
- public IDataModel createProjectDataModel() {
- return DataModelFactory.createDataModel(new WebFacetProjectCreationDataModelProvider());
- }
-
- /*
- * (non-Javadoc)
- *
- * @see org.eclipse.jst.j2ee.internal.internal.moduleextension.EarModuleExtension#createImportDataModel()
- */
- public IDataModel createImportDataModel() {
- return DataModelFactory.createDataModel(new WebComponentImportDataModelProvider());
- }
-
-}
diff --git a/plugins/org.eclipse.jst.j2ee.web/web/org/eclipse/jst/j2ee/internal/web/plugin/WebPlugin.java b/plugins/org.eclipse.jst.j2ee.web/web/org/eclipse/jst/j2ee/internal/web/plugin/WebPlugin.java
deleted file mode 100644
index 5761790..0000000
--- a/plugins/org.eclipse.jst.j2ee.web/web/org/eclipse/jst/j2ee/internal/web/plugin/WebPlugin.java
+++ /dev/null
@@ -1,310 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2003, 2006 IBM Corporation and others.
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
- *
- * Contributors:
- * IBM Corporation - initial API and implementation
- *******************************************************************************/
-package org.eclipse.jst.j2ee.internal.web.plugin;
-
-import java.io.IOException;
-import java.net.URL;
-import java.text.MessageFormat;
-import java.util.List;
-import java.util.Vector;
-
-import org.eclipse.core.resources.IResourceStatus;
-import org.eclipse.core.resources.IWorkspace;
-import org.eclipse.core.resources.ResourcesPlugin;
-import org.eclipse.core.runtime.CoreException;
-import org.eclipse.core.runtime.IAdapterManager;
-import org.eclipse.core.runtime.IConfigurationElement;
-import org.eclipse.core.runtime.IExtension;
-import org.eclipse.core.runtime.IExtensionPoint;
-import org.eclipse.core.runtime.IExtensionRegistry;
-import org.eclipse.core.runtime.IPath;
-import org.eclipse.core.runtime.IStatus;
-import org.eclipse.core.runtime.Path;
-import org.eclipse.core.runtime.Platform;
-import org.eclipse.core.runtime.Status;
-import org.eclipse.emf.common.util.ResourceLocator;
-import org.eclipse.jst.j2ee.internal.plugin.J2EEPlugin;
-import org.eclipse.jst.j2ee.internal.web.util.WebEditAdapterFactory;
-import org.eclipse.wst.common.componentcore.internal.ArtifactEditModel;
-import org.eclipse.wst.common.frameworks.internal.WTPPlugin;
-import org.osgi.framework.Bundle;
-import org.osgi.framework.BundleContext;
-import java.lang.Throwable;
-
-
-/**
- * This is a top-level class of the j2ee plugin.
- *
- */
-
-public class WebPlugin extends WTPPlugin implements ResourceLocator {
- // Default instance of the receiver
- private static WebPlugin inst;
- protected final IPath iconsFolder = new Path(Platform.getBundle(PLUGIN_ID).getEntry("icons").getPath()); //$NON-NLS-1$
- // Links View part of the plugin
- //public static final String LINKS_BUILDER_ID =
- // "com.ibm.etools.links.management.linksbuilder";//$NON-NLS-1$
- public static final String LINKS_BUILDER_ID = "com.ibm.etools.webtools.additions.linksbuilder"; //$NON-NLS-1$
- // LibDir Change Listener
- public static final String LIBDIRCHANGE_BUILDER_ID = "com.ibm.etools.webtools.LibDirBuilder"; //$NON-NLS-1$
- public static final String PLUGIN_ID = "org.eclipse.jst.j2ee.web"; //$NON-NLS-1$
- // LibCopy builder ID
- public static final String LIBCOPY_BUILDER_ID = "org.eclipse.jst.j2ee.LibCopyBuilder"; //$NON-NLS-1$
- // Validation part of the plugin
- //Global ResourceSet (somewhat global)
- private static IPath location;
- public static final String[] ICON_DIRS = new String[]{"icons/full/obj16", //$NON-NLS-1$
- "icons/full/cview16", //$NON-NLS-1$
- "icons/full/ctool16", //$NON-NLS-1$
- "icons/full/clcl16", //$NON-NLS-1$
- "icons/full/ovr16", //$NON-NLS-1$
- "icons/full/extra", //$NON-NLS-1$
- "icons/full/wizban", //$NON-NLS-1$
- "icons", //$NON-NLS-1$
- ""}; //$NON-NLS-1$
-
- /**
- * Create the J2EE plugin and cache its default instance
- */
- public WebPlugin() {
- super();
- if (inst == null)
- inst = this;
- }
-
- /**
- * Get the plugin singleton.
- */
- static public WebPlugin getDefault() {
- return inst;
- }
-
- /*
- * Javadoc copied from interface.
- */
- public URL getBaseURL() {
- return getBundle().getEntry("/"); //$NON-NLS-1$
- }
-
- public Object[] getJ2EEWebProjectMigrationExtensions() {
-
- IExtensionRegistry registry = Platform.getExtensionRegistry();
- IExtensionPoint pct = registry.getExtensionPoint(getBundle().getSymbolicName(), "J2EEWebProjectMigrationExtension"); //$NON-NLS-1$
-
- IExtension[] extension = pct.getExtensions();
- List ret = new Vector();
- for (int l = 0; l < extension.length; ++l) {
- IExtension config = extension[l];
-
- IConfigurationElement[] cElems = config.getConfigurationElements();
- for (int i = 0; i < cElems.length; i++) {
- IConfigurationElement d = cElems[i];
- if (d.getName().equals("migration")) { //$NON-NLS-1$
- try {
- Object me = d.createExecutableExtension("run"); //$NON-NLS-1$
-
- ret.add(me);
- } catch (Exception ex) {
- // ignore this extension, keep going
- }
- }
- }
- }
-
- return ret.toArray();
- }
-
- /**
- * This gets a .gif from the icons folder.
- */
- public Object getImage(String key) {
- return J2EEPlugin.getImageURL(key, getBundle());
- }
-
- // ISSUE: this method is never used in WTP. Seems no need to be API
- public static IPath getInstallLocation() {
- if (location == null) {
- String installLocation = getDefault().getBundle().getLocation();
- location = new Path(installLocation);
- }
- return location;
- }
-
- public static URL getInstallURL() {
- return getDefault().getBundle().getEntry("/"); //$NON-NLS-1$
- }
-
- /**
- * Get the singleton instance.
- */
- public static WebPlugin getPlugin() {
- return inst;
- }
-
- /**
- * Return the plugin directory location- the directory that all the plugins are located in (i.e.
- * d:\installdir\plugin)
- */
- public static IPath getPluginLocation(String pluginId) {
- Bundle bundle = Platform.getBundle(pluginId);
- if (bundle != null) {
- try {
- IPath installPath = new Path(bundle.getEntry("/").toExternalForm()).removeTrailingSeparator(); //$NON-NLS-1$
- String installStr = Platform.asLocalURL(new URL(installPath.toString())).getFile();
- return new Path(installStr);
- } catch (IOException e) {
- //Do nothing
- }
- }
- return null;
- }
-
- /**
- * Return the Servlets Jar file path preference.
- *
- * @return String the file path to the servlets jar, or null if never specified.
- * @deprecated - the preference store is no longer on this plugin because of the UI dependency.
- */
- public String getPreferenceServletsJar() {
- // return getPreferenceStore().getString(IWebToolingCoreConstants.PROP_SERVLET_JAR);
- return "THIS IS THE WRONG PATH - NEED TO CHANGE IMPLEMENTATION!!!!!"; //$NON-NLS-1$
- }
-
- /**
- * Return the Servlets Jar file path preference.
- *
- * @return String the file path to the servlets jar, or null if never specified.
- * @deprecated - the preference store is no longer on this plugin because of the UI dependency.
- */
- public String getPreferenceWebASJar() {
- //return getPreferenceStore().getString(IWebToolingCoreConstants.PROP_WEBAS_JAR);
- return "THIS IS THE WRONG PATH - NEED TO CHANGE IMPLEMENTATION!!!!!"; //$NON-NLS-1$
- }
-
- public static IWorkspace getWorkspace() {
- return ResourcesPlugin.getWorkspace();
- }
-
- /**
- * If this is called from an operation, in response to some other exception that was caught,
- * then the client code should throw {@link com.ibm.etools.wft.util.WFTWrappedException};
- * otherwise this can still be used to signal some other error condition within the operation,
- * or to throw a core exception in a context other than executing an operation
- *
- * Create a new IStatus of type ERROR using the J2EEPlugin ID. aCode is just an internal code.
- */
- public static IStatus newErrorStatus(int aCode, String aMessage, Throwable exception) {
- return newStatus(IStatus.ERROR, aCode, aMessage, exception);
- }
-
- /**
- * If this is called from an operation, in response to some other exception that was caught,
- * then the client code should throw {@link com.ibm.etools.wft.util.WFTWrappedException};
- * otherwise this can still be used to signal some other error condition within the operation,
- * or to throw a core exception in a context other than executing an operation
- *
- * Create a new IStatus of type ERROR, code OPERATION_FAILED, using the J2EEPlugin ID
- */
- public static IStatus newErrorStatus(String aMessage, Throwable exception) {
- return newErrorStatus(0, aMessage, exception);
- }
-
- /**
- * If this is called from an operation, in response to some other exception that was caught,
- * then the client code should throw {@link com.ibm.etools.wft.util.WFTWrappedException};
- * otherwise this can still be used to signal some other error condition within the operation.
- *
- * Create a new IStatus of type ERROR, code OPERATION_FAILED, using the J2EEPlugin ID
- */
- public static IStatus newOperationFailedStatus(String aMessage, Throwable exception) {
- return newStatus(IStatus.ERROR, IResourceStatus.OPERATION_FAILED, aMessage, exception);
- }
-
- /**
- * Create a new IStatus with a severity using the J2EEPlugin ID. aCode is just an internal code.
- */
- public static IStatus newStatus(int severity, int aCode, String aMessage, Throwable exception) {
- return new Status(severity, PLUGIN_ID, aCode, aMessage, exception);
- }
-
- /*
- * Javadoc copied from interface.
- */
- public String getString(String key) {
- return Platform.getResourceString(getBundle(), key);
- }
-
- /*
- * Javadoc copied from interface.
- */
- public String getString(String key, Object[] substitutions) {
- return MessageFormat.format(getString(key), substitutions);
- }
-
- @Override
- public void stop(BundleContext context) throws Exception {
- super.stop(context);
- }
-
- @Override
- public void start(BundleContext context) throws Exception {
- super.start(context);
- //WebAppResourceFactory.register(WTPResourceFactoryRegistry.INSTANCE);
- IAdapterManager manager = Platform.getAdapterManager();
- manager.registerAdapters(new WebEditAdapterFactory(), ArtifactEditModel.class);
- }
-
-
- /*
- * (non-Javadoc)
- *
- * @see org.eclipse.wst.common.frameworks.internal.WTPPlugin#getPluginID()
- */
- @Override
- public String getPluginID() {
- return PLUGIN_ID;
- }
-
- public static void log( final Exception e )
- {
- logError(e);
- }
- public String getString(String key, boolean translate) {
- // TODO For now... translate not supported
- return getString(key);
- }
-
- public String getString(String key, Object[] substitutions, boolean translate) {
- // TODO For now... translate not supported
- return getString(key,substitutions);
- }
-
- public static IStatus createStatus(int severity, String message, Throwable exception) {
- return new Status(severity, PLUGIN_ID, message, exception);
- }
-
- public static IStatus createStatus(int severity, String message) {
- return createStatus(severity, message, null);
- }
-
- public static void logError(Throwable exception) {
- Platform.getLog(Platform.getBundle(PLUGIN_ID)).log( createStatus(IStatus.ERROR, exception.getMessage(), exception));
- }
-
- public static void logError(CoreException exception) {
- Platform.getLog(Platform.getBundle(PLUGIN_ID)).log( exception.getStatus() );
- }
-
- public static void logError(String message) {
- Platform.getLog(Platform.getBundle(PLUGIN_ID)).log( createStatus(IStatus.ERROR, message));
- }
-
-}
diff --git a/plugins/org.eclipse.jst.j2ee.web/web/org/eclipse/jst/j2ee/web/IServletConstants.java b/plugins/org.eclipse.jst.j2ee.web/web/org/eclipse/jst/j2ee/web/IServletConstants.java
deleted file mode 100644
index 07dd594..0000000
--- a/plugins/org.eclipse.jst.j2ee.web/web/org/eclipse/jst/j2ee/web/IServletConstants.java
+++ /dev/null
@@ -1,85 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2008 SAP AG and others.
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
- *
- * Contributors:
- * Kaloyan Raev, kaloyan.raev@sap.com - initial API and implementation
- *******************************************************************************/
-package org.eclipse.jst.j2ee.web;
-
-public interface IServletConstants {
-
- public static final String QUALIFIED_IO_EXCEPTION = "java.io.IOException"; //$NON-NLS-1$
-
- public static final String QUALIFIED_SERVLET = "javax.servlet.Servlet"; //$NON-NLS-1$
- public static final String QUALIFIED_GENERIC_SERVLET = "javax.servlet.GenericServlet"; //$NON-NLS-1$
- public static final String QUALIFIED_HTTP_SERVLET = "javax.servlet.http.HttpServlet"; //$NON-NLS-1$
-
- public static final String QUALIFIED_WEB_SERVLET = "javax.servlet.annotation.WebServlet"; //$NON-NLS-1$
- public static final String QUALIFIED_WEB_LISTENER = "javax.servlet.annotation.WebListener"; //$NON-NLS-1$
- public static final String QUALIFIED_WEB_FILTER = "javax.servlet.annotation.WebFilter"; //$NON-NLS-1$
- public static final String QUALIFIED_ANNOTATION_INIT_PARAM = "javax.servlet.annotation.WebInitParam"; //$NON-NLS-1$
- public static final String QUALIFIED_ANNOTATION_DISPATCHER_TYPE = "javax.servlet.DispatcherType"; //$NON-NLS-1$
-
-
- public static final String QUALIFIED_SERVLET_EXCEPTION = "javax.servlet.ServletException"; //$NON-NLS-1$
- public static final String QUALIFIED_SERVLET_CONFIG = "javax.servlet.ServletConfig"; //$NON-NLS-1$
- public static final String QUALIFIED_SERVLET_REQUEST = "javax.servlet.ServletRequest"; //$NON-NLS-1$
- public static final String QUALIFIED_SERVLET_RESPONSE = "javax.servlet.ServletResponse"; //$NON-NLS-1$
- public static final String QUALIFIED_HTTP_SERVLET_REQUEST = "javax.servlet.http.HttpServletRequest"; //$NON-NLS-1$
- public static final String QUALIFIED_HTTP_SERVLET_RESPONSE = "javax.servlet.http.HttpServletResponse"; //$NON-NLS-1$
-
- public static final String QUALIFIED_FILTER = "javax.servlet.Filter"; //$NON-NLS-1$
- public static final String QUALIFIED_FILTER_CONFIG = "javax.servlet.FilterConfig"; //$NON-NLS-1$
- public static final String QUALIFIED_FILTER_CHAIN = "javax.servlet.FilterChain"; //$NON-NLS-1$
-
- public static final String QUALIFIED_SERVLET_CONTEXT_LISTENER = "javax.servlet.ServletContextListener"; //$NON-NLS-1$
- public static final String QUALIFIED_SERVLET_CONTEXT_EVENT = "javax.servlet.ServletContextEvent"; //$NON-NLS-1$
- public static final String QUALIFIED_SERVLET_CONTEXT_ATTRIBUTE_LISTENER = "javax.servlet.ServletContextAttributeListener"; //$NON-NLS-1$
- public static final String QUALIFIED_SERVLET_CONTEXT_ATTRIBUTE_EVENT = "javax.servlet.ServletContextAttributeEvent"; //$NON-NLS-1$
- public static final String QUALIFIED_HTTP_SESSION_LISTENER = "javax.servlet.http.HttpSessionListener"; //$NON-NLS-1$
- public static final String QUALIFIED_HTTP_SESSION_EVENT = "javax.servlet.http.HttpSessionEvent"; //$NON-NLS-1$
- public static final String QUALIFIED_HTTP_SESSION_ATTRIBUTE_LISTENER = "javax.servlet.http.HttpSessionAttributeListener"; //$NON-NLS-1$
- public static final String QUALIFIED_HTTP_SESSION_BINDING_EVENT = "javax.servlet.http.HttpSessionBindingEvent"; //$NON-NLS-1$
- public static final String QUALIFIED_HTTP_SESSION_ACTIVATION_LISTENER = "javax.servlet.http.HttpSessionActivationListener"; //$NON-NLS-1$
- public static final String QUALIFIED_HTTP_SESSION_BINDING_LISTENER = "javax.servlet.http.HttpSessionBindingListener"; //$NON-NLS-1$
- public static final String QUALIFIED_SERVLET_REQUEST_LISTENER = "javax.servlet.ServletRequestListener"; //$NON-NLS-1$
- public static final String QUALIFIED_SERVLET_REQUEST_EVENT = "javax.servlet.ServletRequestEvent"; //$NON-NLS-1$
- public static final String QUALIFIED_SERVLET_REQUEST_ATTRIBUTE_LISTENER = "javax.servlet.ServletRequestAttributeListener"; //$NON-NLS-1$
- public static final String QUALIFIED_SERVLET_REQUEST_ATTRIBUTE_EVENT = "javax.servlet.ServletRequestAttributeEvent"; //$NON-NLS-1$
-
- public static final String METHOD_INIT = "init"; //$NON-NLS-1$
- public static final String METHOD_DESTROY = "destroy"; //$NON-NLS-1$
- public static final String METHOD_GET_SERVLET_CONFIG = "getServletConfig"; //$NON-NLS-1$
- public static final String METHOD_GET_SERVLET_INFO = "getServletInfo"; //$NON-NLS-1$
- public static final String METHOD_SERVICE = "service"; //$NON-NLS-1$
- public static final String METHOD_DO_GET = "doGet"; //$NON-NLS-1$
- public static final String METHOD_DO_POST = "doPost"; //$NON-NLS-1$
- public static final String METHOD_DO_PUT = "doPut"; //$NON-NLS-1$
- public static final String METHOD_DO_DELETE = "doDelete"; //$NON-NLS-1$
- public static final String METHOD_DO_HEAD = "doHead"; //$NON-NLS-1$
- public static final String METHOD_DO_OPTIONS = "doOptions"; //$NON-NLS-1$
- public static final String METHOD_DO_TRACE = "doTrace"; //$NON-NLS-1$
- public static final String METHOD_TO_STRING = "toString"; //$NON-NLS-1$
- public static final String METHOD_DO_FILTER = "doFilter"; //$NON-NLS-1$
-
- public static final String SERVLET_INIT_SIGNATURE = "(Ljavax/servlet/ServletConfig;)V"; //$NON-NLS-1$
- public static final String DESTROY_SIGNATURE = "()V"; //$NON-NLS-1$
- public static final String GET_SERVLET_CONFIG_SIGNATURE = "()Ljavax/servlet/ServletConfig;"; //$NON-NLS-1$
- public static final String GET_SERVLET_INFO_SIGNATURE = "()Ljava/lang/String;"; //$NON-NLS-1$
- public static final String SERVICE_SIGNATURE = "(Ljavax/servlet/ServletRequest;Ljavax/servlet/ServletResponse;)V"; //$NON-NLS-1$
- public static final String HTTP_SERVICE_SIGNATURE = "(Ljavax/servlet/http/HttpServletRequest;Ljavax/servlet/http/HttpServletResponse;)V"; //$NON-NLS-1$
- public static final String DO_GET_SIGNATURE = "(Ljavax/servlet/http/HttpServletRequest;Ljavax/servlet/http/HttpServletResponse;)V"; //$NON-NLS-1$
- public static final String DO_POST_SIGNATURE = "(Ljavax/servlet/http/HttpServletRequest;Ljavax/servlet/http/HttpServletResponse;)V"; //$NON-NLS-1$
- public static final String DO_PUT_SIGNATURE = "(Ljavax/servlet/http/HttpServletRequest;Ljavax/servlet/http/HttpServletResponse;)V"; //$NON-NLS-1$
- public static final String DO_DELETE_SIGNATURE = "(Ljavax/servlet/http/HttpServletRequest;Ljavax/servlet/http/HttpServletResponse;)V"; //$NON-NLS-1$
- public static final String DO_HEAD_SIGNATURE = "(Ljavax/servlet/http/HttpServletRequest;Ljavax/servlet/http/HttpServletResponse;)V"; //$NON-NLS-1$
- public static final String DO_OPTIONS_SIGNATURE = "(Ljavax/servlet/http/HttpServletRequest;Ljavax/servlet/http/HttpServletResponse;)V"; //$NON-NLS-1$
- public static final String DO_TRACE_SIGNATURE = "(Ljavax/servlet/http/HttpServletRequest;Ljavax/servlet/http/HttpServletResponse;)V"; //$NON-NLS-1$
- public static final String FILTER_INIT_SIGNATURE = "(Ljavax/servlet/FilterConfig;)V"; //$NON-NLS-1$
- public static final String DO_FILTER_SIGNATURE = "(Ljavax/servlet/ServletRequest;Ljavax/servlet/ServletResponse;Ljavax/servlet/FilterChain;)V"; //$NON-NLS-1$
-
-}
diff --git a/plugins/org.eclipse.jst.j2ee.web/web/org/eclipse/jst/j2ee/web/validation/UrlPattern.java b/plugins/org.eclipse.jst.j2ee.web/web/org/eclipse/jst/j2ee/web/validation/UrlPattern.java
deleted file mode 100644
index f7192f6..0000000
--- a/plugins/org.eclipse.jst.j2ee.web/web/org/eclipse/jst/j2ee/web/validation/UrlPattern.java
+++ /dev/null
@@ -1,58 +0,0 @@
-package org.eclipse.jst.j2ee.web.validation;
-
-/**
- * Utility method for URL patterns.
- *
- * <p>
- * Could be used by components dealing with URL patterns like: Servlet and
- * Filter wizards, web.xml validators, etc.
- * </p>
- *
- * @author kraev
- */
-public class UrlPattern {
-
- /**
- * Validates an URL pattern.
- *
- * @param urlPattern
- * the string representation of the URL pattern to validate
- *
- * @return <code>true</code> if the given pattern is a valid one,
- * <code>false</code> - otherwise.
- */
- public static boolean isValid(String urlPattern) {
- // URL Pattern must not be empty string
- if (urlPattern.length() == 0)
- return false;
-
- // URL Pattern must not contain Carriage Return characters
- if (urlPattern.indexOf('\r') != -1)
- return false;
-
- // URL Pattern must not contain New Line characters
- if (urlPattern.indexOf('\n') != -1)
- return false;
-
- // Path Mappings must not contain "*." character sequences
- if (urlPattern.startsWith("/")) { //$NON-NLS-1$
- if (urlPattern.indexOf("*.") == -1) { //$NON-NLS-1$
- return true;
- }
- return false;
- }
-
- // Extension Mappings must not contain '/' characters
- if (urlPattern.startsWith("*.")) { //$NON-NLS-1$
- if (urlPattern.indexOf('/') == -1) {
- return true;
- }
- return false;
- }
-
- // The URL Pattern is neither a Path Mapping, nor Extension Mapping
- // Therefore, it is invalid
- return false;
- }
-
-}
diff --git a/plugins/org.eclipse.jst.j2ee.web/webedit/org/eclipse/jst/j2ee/internal/web/providers/AuthConstraintItemProvider.java b/plugins/org.eclipse.jst.j2ee.web/webedit/org/eclipse/jst/j2ee/internal/web/providers/AuthConstraintItemProvider.java
deleted file mode 100644
index 3717d2d..0000000
--- a/plugins/org.eclipse.jst.j2ee.web/webedit/org/eclipse/jst/j2ee/internal/web/providers/AuthConstraintItemProvider.java
+++ /dev/null
@@ -1,234 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2003, 2005 IBM Corporation and others.
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
- *
- * Contributors:
- * IBM Corporation - initial API and implementation
- *******************************************************************************/
-package org.eclipse.jst.j2ee.internal.web.providers;
-
-import java.util.Collection;
-import java.util.List;
-
-import org.eclipse.emf.common.command.Command;
-import org.eclipse.emf.common.notify.AdapterFactory;
-import org.eclipse.emf.common.notify.Notification;
-import org.eclipse.emf.common.util.ResourceLocator;
-import org.eclipse.emf.ecore.EObject;
-import org.eclipse.emf.ecore.EStructuralFeature;
-import org.eclipse.emf.edit.command.AddCommand;
-import org.eclipse.emf.edit.command.CommandParameter;
-import org.eclipse.emf.edit.command.RemoveCommand;
-import org.eclipse.emf.edit.domain.EditingDomain;
-import org.eclipse.emf.edit.provider.ComposeableAdapterFactory;
-import org.eclipse.emf.edit.provider.IEditingDomainItemProvider;
-import org.eclipse.emf.edit.provider.IItemLabelProvider;
-import org.eclipse.emf.edit.provider.IItemPropertySource;
-import org.eclipse.emf.edit.provider.ITreeItemContentProvider;
-import org.eclipse.emf.edit.provider.ItemPropertyDescriptor;
-import org.eclipse.jst.j2ee.common.CommonFactory;
-import org.eclipse.jst.j2ee.common.Description;
-import org.eclipse.jst.j2ee.internal.plugin.J2EEPlugin;
-import org.eclipse.jst.j2ee.internal.web.plugin.WebPlugin;
-import org.eclipse.jst.j2ee.webapplication.AuthConstraint;
-import org.eclipse.jst.j2ee.webapplication.WebapplicationPackage;
-import org.eclipse.jst.j2ee.webservice.wscommon.WscommonFactory;
-
-/**
- * This is the item provider adpater for a {@link org.eclipse.jst.j2ee.internal.internal.webapplication.AuthConstraint}
- * object.
- */
-public class AuthConstraintItemProvider extends WebapplicationItemProviderAdapter implements IEditingDomainItemProvider, IItemLabelProvider, IItemPropertySource, ITreeItemContentProvider {
- /**
- * This constructs an instance from a factory and a notifier.
- */
- public AuthConstraintItemProvider(AdapterFactory adapterFactory) {
- super(adapterFactory);
- }
-
- /**
- * This returns authority_constraint.gif.
- */
- @Override
- public Object getImage(Object object) {
- return WebPlugin.getDefault().getImage("authority_constraint");//$NON-NLS-1$
- }
-
- /**
- * This returns the secConstraint of the AuthConstraint.
- */
- @Override
- public Object getParent(Object object) {
- return ((AuthConstraint) object).getSecConstraint();
- }
-
- /**
- * This returns the property descriptors for the adapted class.
- */
- @Override
- public List getPropertyDescriptors(Object object) {
- if (itemPropertyDescriptors == null) {
- super.getPropertyDescriptors(object);
- WebapplicationPackage pkg = WebapplicationPackage.eINSTANCE;
- // This is for the description feature.
- //
- itemPropertyDescriptors.add(new ItemPropertyDescriptor(((ComposeableAdapterFactory) adapterFactory).getRootAdapterFactory(), WebAppEditResourceHandler.getString("Description_UI__UI_"), //$NON-NLS-1$ = "Description"
- WebAppEditResourceHandler.getString("The_description_property_UI_"), //$NON-NLS-1$ = "The description property"
- pkg.getAuthConstraint_Description()));
- // This is for the roles feature.
- //
- WebToolingItemPropertyDescriptor propertyDescriptor = new WebToolingItemPropertyDescriptor(((ComposeableAdapterFactory) adapterFactory).getRootAdapterFactory(), WebAppEditResourceHandler.getString("Roles_UI_"), //$NON-NLS-1$ = "Roles"
- WebAppEditResourceHandler.getString("The_roles_property_UI_"), //$NON-NLS-1$ = "The roles property"
- pkg.getAuthConstraint_Roles(), WebToolingItemPropertyDescriptor.AUTH_CONSTRAINT_ROLES_EDITOR);
- itemPropertyDescriptors.add(propertyDescriptor);
- // This is for the secConstraint feature.
- //
- itemPropertyDescriptors.add(new ItemPropertyDescriptor(((ComposeableAdapterFactory) adapterFactory).getRootAdapterFactory(), WebAppEditResourceHandler.getString("SecConstraint_UI_"), //$NON-NLS-1$ = "SecConstraint"
- WebAppEditResourceHandler.getString("The_secConstraint_property_UI_"), //$NON-NLS-1$ = "The secConstraint property"
- pkg.getAuthConstraint_SecConstraint()));
- }
- return itemPropertyDescriptors;
- }
-
- /**
- * This adds a property descriptor for the Description feature. <!-- begin-user-doc --> <!--
- * end-user-doc -->
- *
- * @generated
- */
- protected void addDescriptionPropertyDescriptor(Object object) {
- itemPropertyDescriptors.add(new ItemPropertyDescriptor(((ComposeableAdapterFactory) adapterFactory).getRootAdapterFactory(), getString("_UI_AuthConstraint_description_feature"), getString( //$NON-NLS-1$
- "_UI_PropertyDescriptor_description", "_UI_AuthConstraint_description_feature", //$NON-NLS-1$ //$NON-NLS-2$
- "_UI_AuthConstraint_type"), WebapplicationPackage.eINSTANCE.getAuthConstraint_Description(), true, //$NON-NLS-1$
- ItemPropertyDescriptor.GENERIC_VALUE_IMAGE));
- }
-
- /**
- * This adds a property descriptor for the Roles feature. <!-- begin-user-doc --> <!--
- * end-user-doc -->
- *
- * @generated
- */
- protected void addRolesPropertyDescriptor(Object object) {
- itemPropertyDescriptors.add(new ItemPropertyDescriptor(((ComposeableAdapterFactory) adapterFactory).getRootAdapterFactory(), getString("_UI_AuthConstraint_roles_feature"), getString( //$NON-NLS-1$
- "_UI_PropertyDescriptor_description", "_UI_AuthConstraint_roles_feature", "_UI_AuthConstraint_type"), //$NON-NLS-1$ //$NON-NLS-2$ //$NON-NLS-3$
- WebapplicationPackage.eINSTANCE.getAuthConstraint_Roles(), true, ItemPropertyDescriptor.GENERIC_VALUE_IMAGE));
- }
-
- /**
- * This specifies how to implement {@link #getChildren}and
- * {@link org.eclipse.emf.edit.command.AddCommand}and
- * {@link org.eclipse.emf.edit.command.RemoveCommand}support in {@link #createCommand}. <!--
- * begin-user-doc --> <!-- end-user-doc -->
- *
- * @generated
- */
- @Override
- public Collection getChildrenReferences(Object object) {
- if (childrenReferences == null) {
- super.getChildrenReferences(object);
- childrenReferences.add(WebapplicationPackage.eINSTANCE.getAuthConstraint_Descriptions());
- }
- return childrenReferences;
- }
-
- @Override
- public String getText(Object object) {
- String description = ((AuthConstraint) object).getDescription();
- if (description == null) {
- List descList = ((AuthConstraint) object).getDescriptions();
- if (descList != null && descList.size() > 0)
- description = ((Description) descList.get(0)).getValue();
- }
- if (description == null)
- description = ""; //$NON-NLS-1$
- // return WebAppEditResourceHandler.getString("11concat_UI_", (new
- // Object[]{description})); //$NON-NLS-1$ = "AuthConstraint {0}"
- return description;
- }
-
- /**
- * This handles notification by calling {@link #fireNotifyChanged fireNotifyChanged}. <!--
- * begin-user-doc --> <!-- end-user-doc -->
- *
- * @generated
- */
- @Override
- public void notifyChanged(Notification notification) {
- switch (notification.getFeatureID(AuthConstraint.class)) {
- case WebapplicationPackage.AUTH_CONSTRAINT__DESCRIPTION :
- case WebapplicationPackage.AUTH_CONSTRAINT__ROLES :
- case WebapplicationPackage.AUTH_CONSTRAINT__DESCRIPTIONS : {
- fireNotifyChanged(notification);
- return;
- }
- }
- super.notifyChanged(notification);
- }
-
- /**
- * This adds to the collection of {@link org.eclipse.emf.edit.command.CommandParameter}s
- * describing all of the children that can be created under this object. <!-- begin-user-doc -->
- * <!-- end-user-doc -->
- *
- * @generated
- */
- @Override
- protected void collectNewChildDescriptors(Collection newChildDescriptors, Object object) {
- super.collectNewChildDescriptors(newChildDescriptors, object);
- newChildDescriptors.add(createChildParameter(WebapplicationPackage.eINSTANCE.getAuthConstraint_Descriptions(), CommonFactory.eINSTANCE.createDescription()));
- newChildDescriptors.add(createChildParameter(WebapplicationPackage.eINSTANCE.getAuthConstraint_Descriptions(), WscommonFactory.eINSTANCE.createDescriptionType()));
- }
-
- /**
- * Return the resource locator for this item provider's resources. <!-- begin-user-doc --> <!--
- * end-user-doc -->
- *
- * @generated
- */
- @Override
- public ResourceLocator getResourceLocator() {
- return J2EEPlugin.getDefault();
- }
-
- /**
- * This always returns false. The base class has already implemented
- * {@link org.eclipse.emf.edit.provider.ItemProviderAdapter#getChildren ItemProviderAdapter.getChildren}
- * to return the empty enumeration, and this to check that enumeration, but we know there can't
- * be any children, so this is faster.
- */
- @Override
- public boolean hasChildren(Object object) {
- return false;
- }
-
- /*
- * (non-Javadoc)
- *
- * @see org.eclipse.emf.edit.provider.IEditingDomainItemProvider#createCommand(java.lang.Object,
- * org.eclipse.emf.edit.domain.EditingDomain, java.lang.Class,
- * org.eclipse.emf.edit.command.CommandParameter)
- */
- @Override
- public Command createCommand(Object object, EditingDomain editingDomain, Class commandClass, CommandParameter commandParameter) {
- EStructuralFeature sf = commandParameter.getEReference();
- if (sf == null) {
- sf = commandParameter.getEAttribute();
- if (sf != null && !sf.isMany())
- sf = null;
- }
- if (sf != null) {
- EObject owner = commandParameter.getEOwner();
- Collection collection = commandParameter.getCollection();
- if (commandClass == AddCommand.class) {
- return createAddCommand(editingDomain, owner, sf, collection, commandParameter.getIndex());
- } else if (commandClass == RemoveCommand.class) {
- return createRemoveCommand(editingDomain, owner, sf, collection);
- }
- }
- return super.createCommand(object, editingDomain, commandClass, commandParameter);
- }
-}
diff --git a/plugins/org.eclipse.jst.j2ee.web/webedit/org/eclipse/jst/j2ee/internal/web/providers/ContextParamItemProvider.java b/plugins/org.eclipse.jst.j2ee.web/webedit/org/eclipse/jst/j2ee/internal/web/providers/ContextParamItemProvider.java
deleted file mode 100644
index 5841516..0000000
--- a/plugins/org.eclipse.jst.j2ee.web/webedit/org/eclipse/jst/j2ee/internal/web/providers/ContextParamItemProvider.java
+++ /dev/null
@@ -1,197 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2003, 2005 IBM Corporation and others.
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
- *
- * Contributors:
- * IBM Corporation - initial API and implementation
- *******************************************************************************/
-package org.eclipse.jst.j2ee.internal.web.providers;
-
-import java.util.Collection;
-import java.util.List;
-
-import org.eclipse.emf.common.notify.AdapterFactory;
-import org.eclipse.emf.common.notify.Notification;
-import org.eclipse.emf.common.util.ResourceLocator;
-import org.eclipse.emf.edit.provider.ComposeableAdapterFactory;
-import org.eclipse.emf.edit.provider.IEditingDomainItemProvider;
-import org.eclipse.emf.edit.provider.IItemLabelProvider;
-import org.eclipse.emf.edit.provider.IItemPropertySource;
-import org.eclipse.emf.edit.provider.ITreeItemContentProvider;
-import org.eclipse.emf.edit.provider.ItemPropertyDescriptor;
-import org.eclipse.jst.j2ee.internal.plugin.J2EEPlugin;
-import org.eclipse.jst.j2ee.internal.web.plugin.WebPlugin;
-import org.eclipse.jst.j2ee.webapplication.ContextParam;
-import org.eclipse.jst.j2ee.webapplication.WebapplicationPackage;
-
-
-/**
- * This is the item provider adpater for a {@link org.eclipse.jst.j2ee.internal.internal.webapplication.ContextParam}
- * object.
- */
-public class ContextParamItemProvider extends WebapplicationItemProviderAdapter implements IEditingDomainItemProvider, IItemLabelProvider, IItemPropertySource, ITreeItemContentProvider {
-
- /**
- * This constructs an instance from a factory and a notifier.
- */
- public ContextParamItemProvider(AdapterFactory adapterFactory) {
- super(adapterFactory);
- }
-
- /**
- * This returns initializ_parameter_context.gif.
- */
- @Override
- public Object getImage(Object object) {
- return WebPlugin.getDefault().getImage("initializ_parameter_context");//$NON-NLS-1$
- }
-
- /**
- * This returns the webApp of the ContextParam.
- */
- @Override
- public Object getParent(Object object) {
- return ((ContextParam) object).getWebApp();
- }
-
- /**
- * This returns the property descriptors for the adapted class.
- */
- @Override
- public List getPropertyDescriptors(Object object) {
- if (itemPropertyDescriptors == null) {
- super.getPropertyDescriptors(object);
-
- WebapplicationPackage pkg = WebapplicationPackage.eINSTANCE;
-
- // This is for the paramName feature.
- //
- itemPropertyDescriptors.add(new ItemPropertyDescriptor(((ComposeableAdapterFactory) adapterFactory).getRootAdapterFactory(), WebAppEditResourceHandler.getString("ParamName_UI_"), //$NON-NLS-1$ = "ParamName"
- WebAppEditResourceHandler.getString("The_paramName_property_UI_"), //$NON-NLS-1$ = "The paramName property"
- pkg.getContextParam_ParamName()));
-
- // This is for the paramValue feature.
- //
- itemPropertyDescriptors.add(new ItemPropertyDescriptor(((ComposeableAdapterFactory) adapterFactory).getRootAdapterFactory(), WebAppEditResourceHandler.getString("ParamValue_UI_"), //$NON-NLS-1$ = "ParamValue"
- WebAppEditResourceHandler.getString("The_paramValue_property_UI_"), //$NON-NLS-1$ = "The paramValue property"
- pkg.getContextParam_ParamValue()));
-
- // This is for the description feature.
- //
- itemPropertyDescriptors.add(new ItemPropertyDescriptor(((ComposeableAdapterFactory) adapterFactory).getRootAdapterFactory(), WebAppEditResourceHandler.getString("Description_UI__UI_"), //$NON-NLS-1$ = "Description"
- WebAppEditResourceHandler.getString("The_description_property_UI_"), //$NON-NLS-1$ = "The description property"
- pkg.getContextParam_Description()));
-
- // This is for the webApp feature.
- //
- /*
- * itemPropertyDescriptors.add (new ItemPropertyDescriptor
- * (((ComposeableAdapterFactory)adapterFactory).getRootAdapterFactory(),
- * WebAppEditResourceHandler.getString("WebApp_UI_"), //$NON-NLS-1$ = "WebApp"
- * WebAppEditResourceHandler.getString("The_webApp_property_UI_"), //$NON-NLS-1$ = "The
- * webApp property" pkg.getContextParam_WebApp()));
- */
-
- }
- return itemPropertyDescriptors;
- }
-
- /**
- * This adds a property descriptor for the Param Name feature. <!-- begin-user-doc --> <!--
- * end-user-doc -->
- *
- * @generated
- */
- protected void addParamNamePropertyDescriptor(Object object) {
- itemPropertyDescriptors.add(new ItemPropertyDescriptor(((ComposeableAdapterFactory) adapterFactory).getRootAdapterFactory(), getString("_UI_ContextParam_paramName_feature"), //$NON-NLS-1$
- getString("_UI_PropertyDescriptor_description", "_UI_ContextParam_paramName_feature", "_UI_ContextParam_type"), //$NON-NLS-1$ //$NON-NLS-2$ //$NON-NLS-3$
- WebapplicationPackage.eINSTANCE.getContextParam_ParamName(), true, ItemPropertyDescriptor.GENERIC_VALUE_IMAGE));
- }
-
- /**
- * This adds a property descriptor for the Param Value feature. <!-- begin-user-doc --> <!--
- * end-user-doc -->
- *
- * @generated
- */
- protected void addParamValuePropertyDescriptor(Object object) {
- itemPropertyDescriptors.add(new ItemPropertyDescriptor(((ComposeableAdapterFactory) adapterFactory).getRootAdapterFactory(), getString("_UI_ContextParam_paramValue_feature"), //$NON-NLS-1$
- getString("_UI_PropertyDescriptor_description", "_UI_ContextParam_paramValue_feature", "_UI_ContextParam_type"), //$NON-NLS-1$ //$NON-NLS-2$ //$NON-NLS-3$
- WebapplicationPackage.eINSTANCE.getContextParam_ParamValue(), true, ItemPropertyDescriptor.GENERIC_VALUE_IMAGE));
- }
-
- /**
- * This adds a property descriptor for the Description feature. <!-- begin-user-doc --> <!--
- * end-user-doc -->
- *
- * @generated
- */
- protected void addDescriptionPropertyDescriptor(Object object) {
- itemPropertyDescriptors.add(new ItemPropertyDescriptor(((ComposeableAdapterFactory) adapterFactory).getRootAdapterFactory(), getString("_UI_ContextParam_description_feature"), //$NON-NLS-1$
- getString("_UI_PropertyDescriptor_description", "_UI_ContextParam_description_feature", "_UI_ContextParam_type"), //$NON-NLS-1$ //$NON-NLS-2$ //$NON-NLS-3$
- WebapplicationPackage.eINSTANCE.getContextParam_Description(), true, ItemPropertyDescriptor.GENERIC_VALUE_IMAGE));
- }
-
-
- @Override
- public String getText(Object object) {
- return WebAppEditResourceHandler.getString("12concat_UI_", (new Object[]{((ContextParam) object).getParamName()})); //$NON-NLS-1$ = "ContextParam {0}"
- }
-
- /**
- * This handles notification by calling {@link #fireNotifyChanged fireNotifyChanged}. <!--
- * begin-user-doc --> <!-- end-user-doc -->
- *
- * @generated
- */
- @Override
- public void notifyChanged(Notification notification) {
- switch (notification.getFeatureID(ContextParam.class)) {
- case WebapplicationPackage.CONTEXT_PARAM__PARAM_NAME :
- case WebapplicationPackage.CONTEXT_PARAM__PARAM_VALUE :
- case WebapplicationPackage.CONTEXT_PARAM__DESCRIPTION : {
- fireNotifyChanged(notification);
- return;
- }
- }
- super.notifyChanged(notification);
- }
-
- /**
- * This adds to the collection of {@link org.eclipse.emf.edit.command.CommandParameter}s
- * describing all of the children that can be created under this object. <!-- begin-user-doc -->
- * <!-- end-user-doc -->
- *
- * @generated
- */
- @Override
- protected void collectNewChildDescriptors(Collection newChildDescriptors, Object object) {
- super.collectNewChildDescriptors(newChildDescriptors, object);
- }
-
- /**
- * Return the resource locator for this item provider's resources. <!-- begin-user-doc --> <!--
- * end-user-doc -->
- *
- * @generated
- */
- @Override
- public ResourceLocator getResourceLocator() {
- return J2EEPlugin.getDefault();
- }
-
- /**
- * This always returns false. The base class has already implemented
- * {@link org.eclipse.emf.edit.provider.ItemProviderAdapter#getChildren ItemProviderAdapter.getChildren}
- * to return the empty enumeration, and this to check that enumeration, but we know there can't
- * be any children, so this is faster.
- */
- @Override
- public boolean hasChildren(Object object) {
- return false;
- }
-
-}
diff --git a/plugins/org.eclipse.jst.j2ee.web/webedit/org/eclipse/jst/j2ee/internal/web/providers/ErrorCodeErrorPageItemProvider.java b/plugins/org.eclipse.jst.j2ee.web/webedit/org/eclipse/jst/j2ee/internal/web/providers/ErrorCodeErrorPageItemProvider.java
deleted file mode 100644
index e86a94e..0000000
--- a/plugins/org.eclipse.jst.j2ee.web/webedit/org/eclipse/jst/j2ee/internal/web/providers/ErrorCodeErrorPageItemProvider.java
+++ /dev/null
@@ -1,125 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2003, 2005 IBM Corporation and others.
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
- *
- * Contributors:
- * IBM Corporation - initial API and implementation
- *******************************************************************************/
-package org.eclipse.jst.j2ee.internal.web.providers;
-
-import java.util.Collection;
-import java.util.List;
-
-import org.eclipse.emf.common.notify.AdapterFactory;
-import org.eclipse.emf.common.notify.Notification;
-import org.eclipse.emf.common.util.ResourceLocator;
-import org.eclipse.emf.edit.provider.ComposeableAdapterFactory;
-import org.eclipse.emf.edit.provider.ItemPropertyDescriptor;
-import org.eclipse.jst.j2ee.internal.plugin.J2EEPlugin;
-import org.eclipse.jst.j2ee.internal.web.plugin.WebPlugin;
-import org.eclipse.jst.j2ee.webapplication.ErrorCodeErrorPage;
-import org.eclipse.jst.j2ee.webapplication.WebapplicationPackage;
-
-
-/**
- * This is the item provider adpater for a {@link org.eclipse.jst.j2ee.internal.internal.webapplication.ErrorCodeErrorPage}
- * object.
- */
-public class ErrorCodeErrorPageItemProvider extends ErrorPageItemProvider {
-
- /**
- * This constructs an instance from a factory and a notifier.
- */
- public ErrorCodeErrorPageItemProvider(AdapterFactory adapterFactory) {
- super(adapterFactory);
- }
-
- /**
- * This returns errorcode_errorpage.gif.
- */
- @Override
- public Object getImage(Object object) {
- return WebPlugin.getDefault().getImage("errorcode_errorpage"); //$NON-NLS-1$
- }
-
- /**
- * This returns the property descriptors for the adapted class.
- */
- @Override
- public List getPropertyDescriptors(Object object) {
- if (itemPropertyDescriptors == null) {
- super.getPropertyDescriptors(object);
-
- WebapplicationPackage pkg = WebapplicationPackage.eINSTANCE;
-
- // This is for the errorCode feature.
- //
- itemPropertyDescriptors.add(new ItemPropertyDescriptor(((ComposeableAdapterFactory) adapterFactory).getRootAdapterFactory(), WebAppEditResourceHandler.getString("ErrorCode_UI_"), //$NON-NLS-1$ = "ErrorCode"
- WebAppEditResourceHandler.getString("The_errorCode_property_UI_"), //$NON-NLS-1$ = "The errorCode property"
- pkg.getErrorCodeErrorPage_ErrorCode()));
-
- }
- return itemPropertyDescriptors;
- }
-
- /**
- * This adds a property descriptor for the Error Code feature. <!-- begin-user-doc --> <!--
- * end-user-doc -->
- *
- * @generated
- */
- protected void addErrorCodePropertyDescriptor(Object object) {
- itemPropertyDescriptors.add(new ItemPropertyDescriptor(((ComposeableAdapterFactory) adapterFactory).getRootAdapterFactory(), getString("_UI_ErrorCodeErrorPage_errorCode_feature"), //$NON-NLS-1$
- getString("_UI_PropertyDescriptor_description", "_UI_ErrorCodeErrorPage_errorCode_feature", "_UI_ErrorCodeErrorPage_type"), //$NON-NLS-1$ //$NON-NLS-2$ //$NON-NLS-3$
- WebapplicationPackage.eINSTANCE.getErrorCodeErrorPage_ErrorCode(), true, ItemPropertyDescriptor.GENERIC_VALUE_IMAGE));
- }
-
-
- @Override
- public String getText(Object object) {
- return ((ErrorCodeErrorPage) object).getErrorCode() + " -> " + ((ErrorCodeErrorPage) object).getLocation(); //$NON-NLS-1$
- }
-
- /**
- * This handles notification by calling {@link #fireNotifyChanged fireNotifyChanged}. <!--
- * begin-user-doc --> <!-- end-user-doc -->
- *
- * @generated
- */
- @Override
- public void notifyChanged(Notification notification) {
- switch (notification.getFeatureID(ErrorCodeErrorPage.class)) {
- case WebapplicationPackage.ERROR_CODE_ERROR_PAGE__ERROR_CODE : {
- fireNotifyChanged(notification);
- return;
- }
- }
- super.notifyChanged(notification);
- }
-
- /**
- * This adds to the collection of {@link org.eclipse.emf.edit.command.CommandParameter}s
- * describing all of the children that can be created under this object. <!-- begin-user-doc -->
- * <!-- end-user-doc -->
- *
- * @generated
- */
- @Override
- protected void collectNewChildDescriptors(Collection newChildDescriptors, Object object) {
- super.collectNewChildDescriptors(newChildDescriptors, object);
- }
-
- /**
- * Return the resource locator for this item provider's resources. <!-- begin-user-doc --> <!--
- * end-user-doc -->
- *
- * @generated
- */
- @Override
- public ResourceLocator getResourceLocator() {
- return J2EEPlugin.getDefault();
- }
-}
diff --git a/plugins/org.eclipse.jst.j2ee.web/webedit/org/eclipse/jst/j2ee/internal/web/providers/ErrorPageItemProvider.java b/plugins/org.eclipse.jst.j2ee.web/webedit/org/eclipse/jst/j2ee/internal/web/providers/ErrorPageItemProvider.java
deleted file mode 100644
index f20bd78..0000000
--- a/plugins/org.eclipse.jst.j2ee.web/webedit/org/eclipse/jst/j2ee/internal/web/providers/ErrorPageItemProvider.java
+++ /dev/null
@@ -1,147 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2003, 2005 IBM Corporation and others.
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
- *
- * Contributors:
- * IBM Corporation - initial API and implementation
- *******************************************************************************/
-package org.eclipse.jst.j2ee.internal.web.providers;
-
-import java.util.Collection;
-import java.util.List;
-
-import org.eclipse.emf.common.notify.AdapterFactory;
-import org.eclipse.emf.common.notify.Notification;
-import org.eclipse.emf.common.util.ResourceLocator;
-import org.eclipse.emf.edit.provider.ComposeableAdapterFactory;
-import org.eclipse.emf.edit.provider.IEditingDomainItemProvider;
-import org.eclipse.emf.edit.provider.IItemLabelProvider;
-import org.eclipse.emf.edit.provider.IItemPropertySource;
-import org.eclipse.emf.edit.provider.ITreeItemContentProvider;
-import org.eclipse.emf.edit.provider.ItemPropertyDescriptor;
-import org.eclipse.jst.j2ee.internal.plugin.J2EEPlugin;
-import org.eclipse.jst.j2ee.internal.web.plugin.WebPlugin;
-import org.eclipse.jst.j2ee.webapplication.ErrorPage;
-import org.eclipse.jst.j2ee.webapplication.WebapplicationPackage;
-
-
-/**
- * This is the item provider adpater for a {@link org.eclipse.jst.j2ee.internal.internal.webapplication.ErrorPage}object.
- */
-public class ErrorPageItemProvider extends WebapplicationItemProviderAdapter implements IEditingDomainItemProvider, IItemLabelProvider, IItemPropertySource, ITreeItemContentProvider {
-
- /**
- * This constructs an instance from a factory and a notifier.
- */
- public ErrorPageItemProvider(AdapterFactory adapterFactory) {
- super(adapterFactory);
- }
-
- /**
- * This returns error_page.gif.
- */
- @Override
- public Object getImage(Object object) {
- return WebPlugin.getDefault().getImage("error_page"); //$NON-NLS-1$
- }
-
- /**
- * This returns the webApp of the ErrorPage.
- */
- @Override
- public Object getParent(Object object) {
- return ((ErrorPage) object).getWebApp();
- }
-
- /**
- * This returns the property descriptors for the adapted class.
- */
- @Override
- public List getPropertyDescriptors(Object object) {
- if (itemPropertyDescriptors == null) {
- super.getPropertyDescriptors(object);
-
- WebapplicationPackage pkg = WebapplicationPackage.eINSTANCE;
-
- // This is for the location feature.
- //
- itemPropertyDescriptors.add(new ItemPropertyDescriptor(((ComposeableAdapterFactory) adapterFactory).getRootAdapterFactory(), WebAppEditResourceHandler.getString("Location_UI_"), //$NON-NLS-1$ = "Location"
- WebAppEditResourceHandler.getString("The_location_property_UI_"), //$NON-NLS-1$ = "The location property"
- pkg.getErrorPage_Location()));
- }
- return itemPropertyDescriptors;
- }
-
- /**
- * This adds a property descriptor for the Location feature. <!-- begin-user-doc --> <!--
- * end-user-doc -->
- *
- * @generated
- */
- protected void addLocationPropertyDescriptor(Object object) {
- itemPropertyDescriptors.add(new ItemPropertyDescriptor(((ComposeableAdapterFactory) adapterFactory).getRootAdapterFactory(), getString("_UI_ErrorPage_location_feature"), //$NON-NLS-1$
- getString("_UI_PropertyDescriptor_description", "_UI_ErrorPage_location_feature", "_UI_ErrorPage_type"), //$NON-NLS-1$ //$NON-NLS-2$ //$NON-NLS-3$
- WebapplicationPackage.eINSTANCE.getErrorPage_Location(), true, ItemPropertyDescriptor.GENERIC_VALUE_IMAGE));
- }
-
-
- @Override
- public String getText(Object object) {
- return WebAppEditResourceHandler.getString("13concat_UI_", (new Object[]{((ErrorPage) object).getLocation()})); //$NON-NLS-1$ = "ErrorPage {0}"
- }
-
- /**
- * This handles notification by calling {@link #fireNotifyChanged fireNotifyChanged}. <!--
- * begin-user-doc --> <!-- end-user-doc -->
- *
- * @generated
- */
- @Override
- public void notifyChanged(Notification notification) {
- switch (notification.getFeatureID(ErrorPage.class)) {
- case WebapplicationPackage.ERROR_PAGE__LOCATION : {
- fireNotifyChanged(notification);
- return;
- }
- }
- super.notifyChanged(notification);
- }
-
- /**
- * This adds to the collection of {@link org.eclipse.emf.edit.command.CommandParameter}s
- * describing all of the children that can be created under this object. <!-- begin-user-doc -->
- * <!-- end-user-doc -->
- *
- * @generated
- */
- @Override
- protected void collectNewChildDescriptors(Collection newChildDescriptors, Object object) {
- super.collectNewChildDescriptors(newChildDescriptors, object);
- }
-
- /**
- * Return the resource locator for this item provider's resources. <!-- begin-user-doc --> <!--
- * end-user-doc -->
- *
- * @generated
- */
- @Override
- public ResourceLocator getResourceLocator() {
- return J2EEPlugin.getDefault();
- }
-
- /**
- * This always returns false. The base class has already implemented
- * {@link org.eclipse.emf.edit.provider.ItemProviderAdapter#getChildren ItemProviderAdapter.getChildren}
- * to return the empty enumeration, and this to check that enumeration, but we know there can't
- * be any children, so this is faster.
- */
- @Override
- public boolean hasChildren(Object object) {
- return false;
- }
-
-}
diff --git a/plugins/org.eclipse.jst.j2ee.web/webedit/org/eclipse/jst/j2ee/internal/web/providers/ExceptionTypeErrorPageItemProvider.java b/plugins/org.eclipse.jst.j2ee.web/webedit/org/eclipse/jst/j2ee/internal/web/providers/ExceptionTypeErrorPageItemProvider.java
deleted file mode 100644
index 687e1e7..0000000
--- a/plugins/org.eclipse.jst.j2ee.web/webedit/org/eclipse/jst/j2ee/internal/web/providers/ExceptionTypeErrorPageItemProvider.java
+++ /dev/null
@@ -1,123 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2003, 2005 IBM Corporation and others.
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
- *
- * Contributors:
- * IBM Corporation - initial API and implementation
- *******************************************************************************/
-package org.eclipse.jst.j2ee.internal.web.providers;
-
-import java.util.Collection;
-import java.util.List;
-
-import org.eclipse.emf.common.notify.AdapterFactory;
-import org.eclipse.emf.common.notify.Notification;
-import org.eclipse.emf.common.util.ResourceLocator;
-import org.eclipse.emf.edit.provider.ComposeableAdapterFactory;
-import org.eclipse.emf.edit.provider.ItemPropertyDescriptor;
-import org.eclipse.jst.j2ee.internal.plugin.J2EEPlugin;
-import org.eclipse.jst.j2ee.internal.web.plugin.WebPlugin;
-import org.eclipse.jst.j2ee.webapplication.ExceptionTypeErrorPage;
-import org.eclipse.jst.j2ee.webapplication.WebapplicationPackage;
-
-
-/**
- * This is the item provider adpater for a
- * {@link org.eclipse.jst.j2ee.internal.internal.webapplication.ExceptionTypeErrorPage}object.
- */
-public class ExceptionTypeErrorPageItemProvider extends ErrorPageItemProvider {
-
- /**
- * This constructs an instance from a factory and a notifier.
- */
- public ExceptionTypeErrorPageItemProvider(AdapterFactory adapterFactory) {
- super(adapterFactory);
- }
-
- /**
- * This returns exception_type_errorpage.gif.
- */
- @Override
- public Object getImage(Object object) {
- return WebPlugin.getDefault().getImage("exception_type_errorpage"); //$NON-NLS-1$
- }
-
- /**
- * This returns the property descriptors for the adapted class.
- */
- @Override
- public List getPropertyDescriptors(Object object) {
- if (itemPropertyDescriptors == null) {
- super.getPropertyDescriptors(object);
-
- WebapplicationPackage pkg = WebapplicationPackage.eINSTANCE;
-
- // This is for the exceptionType feature.
- //
- itemPropertyDescriptors.add(new ItemPropertyDescriptor(((ComposeableAdapterFactory) adapterFactory).getRootAdapterFactory(), WebAppEditResourceHandler.getString("ExceptionType_UI_"), //$NON-NLS-1$ = "ExceptionType"
- WebAppEditResourceHandler.getString("The_exceptionType_property_UI_"), //$NON-NLS-1$ = "The exceptionType property"
- pkg.getExceptionTypeErrorPage_ExceptionType()));
-
- }
- return itemPropertyDescriptors;
- }
-
- /**
- * This adds a property descriptor for the Exception Type feature. <!-- begin-user-doc --> <!--
- * end-user-doc -->
- *
- * @generated
- */
- protected void addExceptionTypePropertyDescriptor(Object object) {
- itemPropertyDescriptors.add(new ItemPropertyDescriptor(((ComposeableAdapterFactory) adapterFactory).getRootAdapterFactory(), getString("_UI_ExceptionTypeErrorPage_exceptionType_feature"), //$NON-NLS-1$
- getString("_UI_PropertyDescriptor_description", "_UI_ExceptionTypeErrorPage_exceptionType_feature", "_UI_ExceptionTypeErrorPage_type"), //$NON-NLS-1$ //$NON-NLS-2$ //$NON-NLS-3$
- WebapplicationPackage.eINSTANCE.getExceptionTypeErrorPage_ExceptionType(), true));
- }
-
-
- @Override
- public String getText(Object object) {
- String typeName = ((ExceptionTypeErrorPage) object).getExceptionTypeName();
- if (typeName != null) {
- typeName = typeName.substring(typeName.lastIndexOf('.')+1);
- }
- return typeName + " -> " + ((ExceptionTypeErrorPage) object).getLocation(); //$NON-NLS-1$
- }
-
- /**
- * This handles notification by calling {@link #fireNotifyChanged fireNotifyChanged}. <!--
- * begin-user-doc --> <!-- end-user-doc -->
- *
- * @generated
- */
- @Override
- public void notifyChanged(Notification notification) {
- super.notifyChanged(notification);
- }
-
- /**
- * This adds to the collection of {@link org.eclipse.emf.edit.command.CommandParameter}s
- * describing all of the children that can be created under this object. <!-- begin-user-doc -->
- * <!-- end-user-doc -->
- *
- * @generated
- */
- @Override
- protected void collectNewChildDescriptors(Collection newChildDescriptors, Object object) {
- super.collectNewChildDescriptors(newChildDescriptors, object);
- }
-
- /**
- * Return the resource locator for this item provider's resources. <!-- begin-user-doc --> <!--
- * end-user-doc -->
- *
- * @generated
- */
- @Override
- public ResourceLocator getResourceLocator() {
- return J2EEPlugin.getDefault();
- }
-}
diff --git a/plugins/org.eclipse.jst.j2ee.web/webedit/org/eclipse/jst/j2ee/internal/web/providers/FilterItemProvider.java b/plugins/org.eclipse.jst.j2ee.web/webedit/org/eclipse/jst/j2ee/internal/web/providers/FilterItemProvider.java
deleted file mode 100644
index be6fcd6..0000000
--- a/plugins/org.eclipse.jst.j2ee.web/webedit/org/eclipse/jst/j2ee/internal/web/providers/FilterItemProvider.java
+++ /dev/null
@@ -1,273 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2003, 2005 IBM Corporation and others.
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
- *
- * Contributors:
- * IBM Corporation - initial API and implementation
- *******************************************************************************/
-package org.eclipse.jst.j2ee.internal.web.providers;
-
-
-import java.util.ArrayList;
-import java.util.Collection;
-import java.util.List;
-
-import org.eclipse.emf.common.notify.AdapterFactory;
-import org.eclipse.emf.common.notify.Notification;
-import org.eclipse.emf.common.util.ResourceLocator;
-import org.eclipse.emf.ecore.EObject;
-import org.eclipse.emf.ecore.EReference;
-import org.eclipse.emf.edit.command.AddCommand;
-import org.eclipse.emf.edit.command.RemoveCommand;
-import org.eclipse.emf.edit.provider.ComposeableAdapterFactory;
-import org.eclipse.emf.edit.provider.IItemPropertySource;
-import org.eclipse.emf.edit.provider.ItemPropertyDescriptor;
-import org.eclipse.jst.j2ee.common.CommonFactory;
-import org.eclipse.jst.j2ee.common.internal.provider.CompatibilityDescriptionGroupItemProvider;
-import org.eclipse.jst.j2ee.internal.J2EEVersionConstants;
-import org.eclipse.jst.j2ee.internal.plugin.J2EEPlugin;
-import org.eclipse.jst.j2ee.internal.web.plugin.WebPlugin;
-import org.eclipse.jst.j2ee.webapplication.Filter;
-import org.eclipse.jst.j2ee.webapplication.InitParam;
-import org.eclipse.jst.j2ee.webapplication.WebApp;
-import org.eclipse.jst.j2ee.webapplication.WebapplicationFactory;
-import org.eclipse.jst.j2ee.webapplication.WebapplicationPackage;
-
-public class FilterItemProvider extends CompatibilityDescriptionGroupItemProvider {
-
- /**
- * This constructs an instance from a factory and a notifier.
- */
- public FilterItemProvider(AdapterFactory adapterFactory) {
- super(adapterFactory);
- }
-
- /**
- * This creates a new child for {@link org.eclipse.jst.j2ee.internal.internal.webapplication.commandCreateChildCommand}.
- */
- public Object createChild(Object object) {
- // TODO: check that this is what you want.
- InitParam child = WebapplicationFactory.eINSTANCE.createInitParam();
-
- // TODO: initialize child here...
-
- return child;
- }
-
- /**
- * This specifies how to implement {@link #getChildren}and {@link AddCommand}and
- * {@link RemoveCommand}support in {@link #createCommand}.
- */
- @Override
- public Collection getChildrenReferences(Object object) {
- WebapplicationPackage pkg = WebapplicationPackage.eINSTANCE;
- Collection result = new ArrayList();
- WebApp webApp = (WebApp) ((Filter) object).eContainer();
- if (webApp.getJ2EEVersionID() >= J2EEVersionConstants.J2EE_1_4_ID)
- result.add(pkg.getFilter_InitParamValues());
- else
- result.add(pkg.getFilter_InitParams());
- return result;
- }
-
- /**
- * <!-- begin-user-doc --> <!-- end-user-doc -->
- *
- * @generated
- */
- @Override
- protected EReference getChildReference(Object object, Object child) {
- // Check the type of the specified child object and return the proper feature to use for
- // adding (see {@link AddCommand}) it as a child.
-
- return super.getChildReference(object, child);
- }
-
-
- /**
- * This returns the image for {@link org.eclipse.jst.j2ee.internal.internal.webapplication.commandCreateChildCommand}.
- */
- public Object getCreateChildImage(Object object) {
- EObject refObject = (EObject) object;
- return WebPlugin.getDefault().getImage(refObject.eClass().getName() + "CreateInitParam"); //$NON-NLS-1$
- }
-
- /**
- * This returns the label for {@link org.eclipse.jst.j2ee.internal.internal.webapplication.commandCreateChildCommand}.
- */
- public String getCreateChildText(Object object) {
- return "Create InitParam"; //$NON-NLS-1$
- }
-
- /**
- * This returns the help text for
- * {@link org.eclipse.jst.j2ee.internal.internal.webapplication.commandCreateChildCommand}.
- */
- public String getCreateChildToolTipText(Object object) {
- EObject refObject = (EObject) object;
- return WebAppEditResourceHandler.getString("26concat_UI_", (new Object[]{refObject.eClass().getName()})); //$NON-NLS-1$ = "Create a child of type InitParam for the selected {0}."
- }
-
- /**
- * This returns Filter.gif.
- */
- @Override
- public Object getImage(Object object) {
- return WebPlugin.getDefault().getImage("filter"); //$NON-NLS-1$
- }
-
- /**
- * This returns the webApp of the Filter.
- */
- @Override
- public Object getParent(Object object) {
- return WebapplicationPackage.eINSTANCE.getWebApp();
- }
-
- /**
- * This returns the property descriptors for the adapted class.
- */
- @Override
- public List getPropertyDescriptors(Object object) {
- if (itemPropertyDescriptors == null) {
- super.getPropertyDescriptors(object);
- WebapplicationPackage wap = WebapplicationPackage.eINSTANCE;
-
- // This is for the filterName feature.
-
- itemPropertyDescriptors.add(new ItemPropertyDescriptor(((ComposeableAdapterFactory) adapterFactory).getRootAdapterFactory(), WebAppEditResourceHandler.getString("FilterItemProvider_UI_0"), //$NON-NLS-1$
- WebAppEditResourceHandler.getString("The_filterName_property_3"), wap.getFilter_Name())); //$NON-NLS-1$
-
- }
- return itemPropertyDescriptors;
- }
-
- /**
- * This adds a property descriptor for the Name feature. <!-- begin-user-doc --> <!--
- * end-user-doc -->
- *
- * @generated
- */
- protected void addNamePropertyDescriptor(Object object) {
- itemPropertyDescriptors.add(new ItemPropertyDescriptor(((ComposeableAdapterFactory) adapterFactory).getRootAdapterFactory(), getString("_UI_Filter_name_feature"), //$NON-NLS-1$
- getString("_UI_PropertyDescriptor_description", "_UI_Filter_name_feature", "_UI_Filter_type"), //$NON-NLS-1$ //$NON-NLS-2$ //$NON-NLS-3$
- WebapplicationPackage.eINSTANCE.getFilter_Name(), true, ItemPropertyDescriptor.GENERIC_VALUE_IMAGE));
- }
-
- /**
- * This adds a property descriptor for the Filter Class feature. <!-- begin-user-doc --> <!--
- * end-user-doc -->
- *
- * @generated
- */
- protected void addFilterClassPropertyDescriptor(Object object) {
- itemPropertyDescriptors.add(new ItemPropertyDescriptor(((ComposeableAdapterFactory) adapterFactory).getRootAdapterFactory(), getString("_UI_Filter_filterClass_feature"), //$NON-NLS-1$
- getString("_UI_PropertyDescriptor_description", "_UI_Filter_filterClass_feature", "_UI_Filter_type"), //$NON-NLS-1$ //$NON-NLS-2$ //$NON-NLS-3$
- WebapplicationPackage.eINSTANCE.getFilter_FilterClass(), true));
- }
-
- /**
- * This implements
- * {@link IItemPropertySource#getPropertyValue IItemPropertySource.getPropertyValue}by
- * delegating to the descriptor, which is assumed to support the IItemPropertyDescriptor
- * interface
- */
- @Override
- public Object getPropertyValue(Object object, String property) {
- Object ret = null;
- if (getPropertyDescriptor(object, property) instanceof WebToolingItemPropertyDescriptor) {
- ret = ((WebToolingItemPropertyDescriptor) getPropertyDescriptor(object, property)).getPropertyValue(object);
- } else
- ret = super.getPropertyValue(object, property);
- return ret;
- }
-
- @Override
- public String getText(Object object) {
- Filter filter = (Filter) object;
- String name = filter.getName();
- if (name == null)
- name = "<filter>"; //$NON-NLS-1$
- return name;
- }
-
- /**
- * This handles notification by calling {@link #fireNotifyChanged fireNotifyChanged}. <!--
- * begin-user-doc --> <!-- end-user-doc -->
- *
- * @generated
- */
- @Override
- public void notifyChanged(Notification notification) {
- switch (notification.getFeatureID(Filter.class)) {
- case WebapplicationPackage.FILTER__NAME :
- case WebapplicationPackage.FILTER__INIT_PARAMS :
- case WebapplicationPackage.FILTER__INIT_PARAM_VALUES : {
- fireNotifyChanged(notification);
- return;
- }
- }
- super.notifyChanged(notification);
- }
-
- /**
- * This adds to the collection of {@link org.eclipse.emf.edit.command.CommandParameter}s
- * describing all of the children that can be created under this object. <!-- begin-user-doc -->
- * <!-- end-user-doc -->
- *
- * @generated
- */
- @Override
- protected void collectNewChildDescriptors(Collection newChildDescriptors, Object object) {
- super.collectNewChildDescriptors(newChildDescriptors, object);
-
- newChildDescriptors.add(createChildParameter(WebapplicationPackage.eINSTANCE.getFilter_InitParams(), WebapplicationFactory.eINSTANCE.createInitParam()));
-
- newChildDescriptors.add(createChildParameter(WebapplicationPackage.eINSTANCE.getFilter_InitParamValues(), CommonFactory.eINSTANCE.createParamValue()));
- }
-
- /**
- * Return the resource locator for this item provider's resources. <!-- begin-user-doc --> <!--
- * end-user-doc -->
- *
- * @generated
- */
- @Override
- public ResourceLocator getResourceLocator() {
- return J2EEPlugin.getDefault();
- }
-
- /**
- * This implements {@link IItemPropertySource#isPropertySet IItemPropertySource.isPropertySet}
- * by delegating to the descriptor, which is assumed to support the IItemPropertyDescriptor
- * interface
- */
- @Override
- public boolean isPropertySet(Object object, String property) {
- boolean ret = false;
- if (getPropertyDescriptor(object, property) instanceof WebToolingItemPropertyDescriptor) {
- ret = ((WebToolingItemPropertyDescriptor) getPropertyDescriptor(object, property)).isPropertySet(object);
- } else
- ret = super.isPropertySet(object, property);
- return ret;
- }
-
- /**
- * This implements
- * {@link IItemPropertySource#setPropertyValue IItemPropertySource.setPropertyValue}by
- * delegating to the descriptor, which is assumed to support the IItemPropertyDescriptor
- * interface
- */
- @Override
- public void setPropertyValue(Object object, String property, Object value) {
-
- if (getPropertyDescriptor(object, property) instanceof WebToolingItemPropertyDescriptor) {
- ((WebToolingItemPropertyDescriptor) getPropertyDescriptor(object, property)).setPropertyValue(object, value);
- } else
- super.setPropertyValue(object, property, value);
-
- }
-}
diff --git a/plugins/org.eclipse.jst.j2ee.web/webedit/org/eclipse/jst/j2ee/internal/web/providers/FilterMappingItemProvider.java b/plugins/org.eclipse.jst.j2ee.web/webedit/org/eclipse/jst/j2ee/internal/web/providers/FilterMappingItemProvider.java
deleted file mode 100644
index 82fdc4f..0000000
--- a/plugins/org.eclipse.jst.j2ee.web/webedit/org/eclipse/jst/j2ee/internal/web/providers/FilterMappingItemProvider.java
+++ /dev/null
@@ -1,203 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2003, 2005 IBM Corporation and others.
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
- *
- * Contributors:
- * IBM Corporation - initial API and implementation
- *******************************************************************************/
-package org.eclipse.jst.j2ee.internal.web.providers;
-
-import java.util.Collection;
-import java.util.List;
-
-import org.eclipse.emf.common.notify.AdapterFactory;
-import org.eclipse.emf.common.notify.Notification;
-import org.eclipse.emf.common.util.ResourceLocator;
-import org.eclipse.emf.edit.provider.ComposeableAdapterFactory;
-import org.eclipse.emf.edit.provider.IEditingDomainItemProvider;
-import org.eclipse.emf.edit.provider.IItemLabelProvider;
-import org.eclipse.emf.edit.provider.IItemPropertySource;
-import org.eclipse.emf.edit.provider.ITreeItemContentProvider;
-import org.eclipse.emf.edit.provider.ItemPropertyDescriptor;
-import org.eclipse.jst.j2ee.internal.plugin.J2EEPlugin;
-import org.eclipse.jst.j2ee.internal.web.plugin.WebPlugin;
-import org.eclipse.jst.j2ee.webapplication.Filter;
-import org.eclipse.jst.j2ee.webapplication.FilterMapping;
-import org.eclipse.jst.j2ee.webapplication.Servlet;
-import org.eclipse.jst.j2ee.webapplication.WebapplicationPackage;
-
-
-/**
- * This is the item provider adpater for a {@link org.eclipse.jst.j2ee.internal.internal.webapplication.FilterMapping}
- * object.
- */
-public class FilterMappingItemProvider extends WebapplicationItemProviderAdapter implements IEditingDomainItemProvider, IItemLabelProvider, IItemPropertySource, ITreeItemContentProvider {
-
- /**
- * This constructs an instance from a factory and a notifier.
- */
- public FilterMappingItemProvider(AdapterFactory adapterFactory) {
- super(adapterFactory);
- }
-
- /**
- * This returns filter_mapping.gif.
- */
- @Override
- public Object getImage(Object object) {
- return WebPlugin.getDefault().getImage("filter_mapping"); //$NON-NLS-1$
- }
-
- /**
- * This returns the webApp of the FilterMapping.
- */
- @Override
- public Object getParent(Object object) {
- return WebapplicationPackage.eINSTANCE.getWebApp();
- }
-
- /**
- * This returns the property descriptors for the adapted class.
- */
- @Override
- public List getPropertyDescriptors(Object object) {
- if (itemPropertyDescriptors == null) {
- super.getPropertyDescriptors(object);
- WebapplicationPackage wap = WebapplicationPackage.eINSTANCE;
-
- // This is for the urlPattern feature.
- //
- itemPropertyDescriptors.add(new ItemPropertyDescriptor(((ComposeableAdapterFactory) adapterFactory).getRootAdapterFactory(), WebAppEditResourceHandler.getString("UrlPattern_UI_"), //$NON-NLS-1$ = "UrlPattern"
- WebAppEditResourceHandler.getString("The_urlPattern_property_UI_"), //$NON-NLS-1$ = "The urlPattern property"
- wap.getFilterMapping_UrlPattern()));
-
- // This is for the filter feature.
- //
- itemPropertyDescriptors.add(new ItemPropertyDescriptor(((ComposeableAdapterFactory) adapterFactory).getRootAdapterFactory(), "Filter", WebAppEditResourceHandler.getString("The_filter_property_2"), wap.getFilterMapping_Filter(), false)); //$NON-NLS-1$ //$NON-NLS-2$
-
- }
- return itemPropertyDescriptors;
- }
-
- /**
- * This adds a property descriptor for the Url Pattern feature. <!-- begin-user-doc --> <!--
- * end-user-doc -->
- *
- * @generated
- */
- protected void addUrlPatternPropertyDescriptor(Object object) {
- itemPropertyDescriptors.add(new ItemPropertyDescriptor(((ComposeableAdapterFactory) adapterFactory).getRootAdapterFactory(), getString("_UI_FilterMapping_urlPattern_feature"), //$NON-NLS-1$
- getString("_UI_PropertyDescriptor_description", "_UI_FilterMapping_urlPattern_feature", "_UI_FilterMapping_type"), //$NON-NLS-1$ //$NON-NLS-2$ //$NON-NLS-3$
- WebapplicationPackage.eINSTANCE.getFilterMapping_UrlPattern(), true, ItemPropertyDescriptor.GENERIC_VALUE_IMAGE));
- }
-
- /**
- * This adds a property descriptor for the Dispatcher Type feature. <!-- begin-user-doc --> <!--
- * end-user-doc -->
- *
- * @generated
- */
- protected void addDispatcherTypePropertyDescriptor(Object object) {
- itemPropertyDescriptors.add(new ItemPropertyDescriptor(((ComposeableAdapterFactory) adapterFactory).getRootAdapterFactory(), getString("_UI_FilterMapping_dispatcherType_feature"), //$NON-NLS-1$
- getString("_UI_PropertyDescriptor_description", "_UI_FilterMapping_dispatcherType_feature", "_UI_FilterMapping_type"), //$NON-NLS-1$ //$NON-NLS-2$ //$NON-NLS-3$
- WebapplicationPackage.eINSTANCE.getFilterMapping_DispatcherType(), true, ItemPropertyDescriptor.GENERIC_VALUE_IMAGE));
- }
-
- /**
- * This adds a property descriptor for the Filter feature. <!-- begin-user-doc --> <!--
- * end-user-doc -->
- *
- * @generated
- */
- protected void addFilterPropertyDescriptor(Object object) {
- itemPropertyDescriptors.add(new ItemPropertyDescriptor(((ComposeableAdapterFactory) adapterFactory).getRootAdapterFactory(), getString("_UI_FilterMapping_filter_feature"), //$NON-NLS-1$
- getString("_UI_PropertyDescriptor_description", "_UI_FilterMapping_filter_feature", "_UI_FilterMapping_type"), //$NON-NLS-1$ //$NON-NLS-2$ //$NON-NLS-3$
- WebapplicationPackage.eINSTANCE.getFilterMapping_Filter(), true));
- }
-
- /**
- * This adds a property descriptor for the Servlet feature. <!-- begin-user-doc --> <!--
- * end-user-doc -->
- *
- * @generated
- */
- protected void addServletPropertyDescriptor(Object object) {
- itemPropertyDescriptors.add(new ItemPropertyDescriptor(((ComposeableAdapterFactory) adapterFactory).getRootAdapterFactory(), getString("_UI_FilterMapping_servlet_feature"), //$NON-NLS-1$
- getString("_UI_PropertyDescriptor_description", "_UI_FilterMapping_servlet_feature", "_UI_FilterMapping_type"), //$NON-NLS-1$ //$NON-NLS-2$ //$NON-NLS-3$
- WebapplicationPackage.eINSTANCE.getFilterMapping_Servlet(), true));
- }
-
-
- @Override
- public String getText(Object object) {
- FilterMapping filterMapping = (FilterMapping) object;
- Filter filter = filterMapping.getFilter();
- String filterStr = (filter == null) ? WebAppEditResourceHandler.getString("?_UI_") : filter.getName(); //$NON-NLS-1$ = "?"
-
- String mapText = ((FilterMapping) object).getUrlPattern();
- if (mapText == null) {
- Servlet servlet = filterMapping.getServlet();
- if (servlet != null)
- mapText = servlet.getServletName();
- }
- if (mapText == null)
- mapText = "?"; //$NON-NLS-1$
- return WebAppEditResourceHandler.getString("Filter_mapping_text", new Object[]{mapText, filterStr}); //$NON-NLS-1$
- }
-
- /**
- * This handles notification by calling {@link #fireNotifyChanged fireNotifyChanged}. <!--
- * begin-user-doc --> <!-- end-user-doc -->
- */
- @Override
- public void notifyChanged(Notification notification) {
- switch (notification.getFeatureID(FilterMapping.class)) {
- case WebapplicationPackage.FILTER_MAPPING__URL_PATTERN :
- case WebapplicationPackage.FILTER_MAPPING__FILTER :
- case WebapplicationPackage.FILTER_MAPPING__SERVLET :
- case WebapplicationPackage.FILTER_MAPPING__DISPATCHER_TYPE : {
- fireNotifyChanged(notification);
- return;
- }
- }
- super.notifyChanged(notification);
- }
-
- /**
- * This adds to the collection of {@link org.eclipse.emf.edit.command.CommandParameter}s
- * describing all of the children that can be created under this object. <!-- begin-user-doc -->
- * <!-- end-user-doc -->
- *
- * @generated
- */
- @Override
- protected void collectNewChildDescriptors(Collection newChildDescriptors, Object object) {
- super.collectNewChildDescriptors(newChildDescriptors, object);
- }
-
- /**
- * Return the resource locator for this item provider's resources. <!-- begin-user-doc --> <!--
- * end-user-doc -->
- *
- * @generated
- */
- @Override
- public ResourceLocator getResourceLocator() {
- return J2EEPlugin.getDefault();
- }
-
- /**
- * This always returns false. The base class has already implemented
- * {@link org.eclipse.emf.edit.provider.ItemProviderAdapter#getChildren ItemProviderAdapter.getChildren}
- * to return the empty enumeration, and this to check that enumeration, but we know there can't
- * be any children, so this is faster.
- */
- @Override
- public boolean hasChildren(Object object) {
- return false;
- }
-
-}
diff --git a/plugins/org.eclipse.jst.j2ee.web/webedit/org/eclipse/jst/j2ee/internal/web/providers/FormLoginConfigItemProvider.java b/plugins/org.eclipse.jst.j2ee.web/webedit/org/eclipse/jst/j2ee/internal/web/providers/FormLoginConfigItemProvider.java
deleted file mode 100644
index cae4065..0000000
--- a/plugins/org.eclipse.jst.j2ee.web/webedit/org/eclipse/jst/j2ee/internal/web/providers/FormLoginConfigItemProvider.java
+++ /dev/null
@@ -1,185 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2003, 2005 IBM Corporation and others.
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
- *
- * Contributors:
- * IBM Corporation - initial API and implementation
- *******************************************************************************/
-package org.eclipse.jst.j2ee.internal.web.providers;
-
-import java.util.Collection;
-import java.util.List;
-
-import org.eclipse.emf.common.notify.AdapterFactory;
-import org.eclipse.emf.common.notify.Notification;
-import org.eclipse.emf.common.util.ResourceLocator;
-import org.eclipse.emf.edit.provider.ComposeableAdapterFactory;
-import org.eclipse.emf.edit.provider.IEditingDomainItemProvider;
-import org.eclipse.emf.edit.provider.IItemLabelProvider;
-import org.eclipse.emf.edit.provider.IItemPropertySource;
-import org.eclipse.emf.edit.provider.ITreeItemContentProvider;
-import org.eclipse.emf.edit.provider.ItemPropertyDescriptor;
-import org.eclipse.jst.j2ee.internal.plugin.J2EEPlugin;
-import org.eclipse.jst.j2ee.internal.web.plugin.WebPlugin;
-import org.eclipse.jst.j2ee.webapplication.FormLoginConfig;
-import org.eclipse.jst.j2ee.webapplication.WebapplicationPackage;
-
-
-/**
- * This is the item provider adpater for a {@link org.eclipse.jst.j2ee.internal.internal.webapplication.FormLoginConfig}
- * object.
- */
-public class FormLoginConfigItemProvider extends WebapplicationItemProviderAdapter implements IEditingDomainItemProvider, IItemLabelProvider, IItemPropertySource, ITreeItemContentProvider {
-
- /**
- * This constructs an instance from a factory and a notifier.
- */
- public FormLoginConfigItemProvider(AdapterFactory adapterFactory) {
- super(adapterFactory);
- }
-
- /**
- * This returns form_login_config.gif.
- */
- @Override
- public Object getImage(Object object) {
- return WebPlugin.getDefault().getImage("form_login_config");//$NON-NLS-1$
- }
-
- /**
- * This returns form_login_config.gif.
- */
- //TODO Removing the UI dependency by commenting out this method
- /*
- * public Image getLabelImage(Object object) { return (Image)
- * WEBUIPlugin.getDefault().getImageFromRegistry("form_login_config");//$NON-NLS-1$ }
- */
- public String getLabelText(Object object) {
- return WebAppEditResourceHandler.getString("52concat_UI_", (new Object[]{((FormLoginConfig) object).getFormLoginPage()})); //$NON-NLS-1$ = "FormLoginConfig {0}"
- }
-
- /**
- * This returns the loginConfig of the FormLoginConfig.
- */
- @Override
- public Object getParent(Object object) {
- return ((FormLoginConfig) object).getLoginConfig();
- }
-
- /**
- * This returns the property descriptors for the adapted class.
- */
- @Override
- public List getPropertyDescriptors(Object object) {
- if (itemPropertyDescriptors == null) {
- super.getPropertyDescriptors(object);
-
- WebapplicationPackage pkg = WebapplicationPackage.eINSTANCE;
-
- // This is for the formLoginPage feature.
- //
- itemPropertyDescriptors.add(new ItemPropertyDescriptor(((ComposeableAdapterFactory) adapterFactory).getRootAdapterFactory(), WebAppEditResourceHandler.getString("FormLoginPage_UI_"), //$NON-NLS-1$ = "FormLoginPage"
- WebAppEditResourceHandler.getString("The_formLoginPage_property_UI_"), //$NON-NLS-1$ = "The formLoginPage property"
- pkg.getFormLoginConfig_FormLoginPage()));
-
- // This is for the formErrorPage feature.
- //
- itemPropertyDescriptors.add(new ItemPropertyDescriptor(((ComposeableAdapterFactory) adapterFactory).getRootAdapterFactory(), WebAppEditResourceHandler.getString("FormErrorPage_UI_"), //$NON-NLS-1$ = "FormErrorPage"
- WebAppEditResourceHandler.getString("The_formErrorPage_property_UI_"), //$NON-NLS-1$ = "The formErrorPage property"
- pkg.getFormLoginConfig_FormErrorPage()));
-
- // This is for the loginConfig feature.
- //
- itemPropertyDescriptors.add(new ItemPropertyDescriptor(((ComposeableAdapterFactory) adapterFactory).getRootAdapterFactory(), WebAppEditResourceHandler.getString("LoginConfig_UI_"), //$NON-NLS-1$ = "LoginConfig"
- WebAppEditResourceHandler.getString("The_loginConfig_property_UI_"), //$NON-NLS-1$ = "The loginConfig property"
- pkg.getFormLoginConfig_LoginConfig()));
-
- }
- return itemPropertyDescriptors;
- }
-
- /**
- * This adds a property descriptor for the Form Login Page feature. <!-- begin-user-doc --> <!--
- * end-user-doc -->
- *
- * @generated
- */
- protected void addFormLoginPagePropertyDescriptor(Object object) {
- itemPropertyDescriptors.add(new ItemPropertyDescriptor(((ComposeableAdapterFactory) adapterFactory).getRootAdapterFactory(), getString("_UI_FormLoginConfig_formLoginPage_feature"), //$NON-NLS-1$
- getString("_UI_PropertyDescriptor_description", "_UI_FormLoginConfig_formLoginPage_feature", "_UI_FormLoginConfig_type"), //$NON-NLS-1$ //$NON-NLS-2$ //$NON-NLS-3$
- WebapplicationPackage.eINSTANCE.getFormLoginConfig_FormLoginPage(), true, ItemPropertyDescriptor.GENERIC_VALUE_IMAGE));
- }
-
- /**
- * This adds a property descriptor for the Form Error Page feature. <!-- begin-user-doc --> <!--
- * end-user-doc -->
- *
- * @generated
- */
- protected void addFormErrorPagePropertyDescriptor(Object object) {
- itemPropertyDescriptors.add(new ItemPropertyDescriptor(((ComposeableAdapterFactory) adapterFactory).getRootAdapterFactory(), getString("_UI_FormLoginConfig_formErrorPage_feature"), //$NON-NLS-1$
- getString("_UI_PropertyDescriptor_description", "_UI_FormLoginConfig_formErrorPage_feature", "_UI_FormLoginConfig_type"), //$NON-NLS-1$ //$NON-NLS-2$ //$NON-NLS-3$
- WebapplicationPackage.eINSTANCE.getFormLoginConfig_FormErrorPage(), true, ItemPropertyDescriptor.GENERIC_VALUE_IMAGE));
- }
-
-
- @Override
- public String getText(Object object) {
- return WebAppEditResourceHandler.getString("16concat_UI_", (new Object[]{((FormLoginConfig) object).getFormLoginPage()})); //$NON-NLS-1$ = "FormLoginConfig {0}"
- }
-
- /**
- * This handles notification by calling {@link #fireNotifyChanged fireNotifyChanged}. <!--
- * begin-user-doc --> <!-- end-user-doc -->
- *
- * @generated
- */
- @Override
- public void notifyChanged(Notification notification) {
- switch (notification.getFeatureID(FormLoginConfig.class)) {
- case WebapplicationPackage.FORM_LOGIN_CONFIG__FORM_LOGIN_PAGE :
- case WebapplicationPackage.FORM_LOGIN_CONFIG__FORM_ERROR_PAGE : {
- fireNotifyChanged(notification);
- return;
- }
- }
- super.notifyChanged(notification);
- }
-
- /**
- * This adds to the collection of {@link org.eclipse.emf.edit.command.CommandParameter}s
- * describing all of the children that can be created under this object. <!-- begin-user-doc -->
- * <!-- end-user-doc -->
- *
- * @generated
- */
- @Override
- protected void collectNewChildDescriptors(Collection newChildDescriptors, Object object) {
- super.collectNewChildDescriptors(newChildDescriptors, object);
- }
-
- /**
- * Return the resource locator for this item provider's resources. <!-- begin-user-doc --> <!--
- * end-user-doc -->
- *
- * @generated
- */
- @Override
- public ResourceLocator getResourceLocator() {
- return J2EEPlugin.getDefault();
- }
-
- /**
- * This always returns false. The base class has already implemented
- * {@link org.eclipse.emf.edit.provider.ItemProviderAdapter#getChildren ItemProviderAdapter.getChildren}
- * to return the empty enumeration, and this to check that enumeration, but we know there can't
- * be any children, so this is faster.
- */
- @Override
- public boolean hasChildren(Object object) {
- return false;
- }
-}
diff --git a/plugins/org.eclipse.jst.j2ee.web/webedit/org/eclipse/jst/j2ee/internal/web/providers/HTTPMethodTypeItemProvider.java b/plugins/org.eclipse.jst.j2ee.web/webedit/org/eclipse/jst/j2ee/internal/web/providers/HTTPMethodTypeItemProvider.java
deleted file mode 100644
index 634e0e3..0000000
--- a/plugins/org.eclipse.jst.j2ee.web/webedit/org/eclipse/jst/j2ee/internal/web/providers/HTTPMethodTypeItemProvider.java
+++ /dev/null
@@ -1,156 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2003, 2005 IBM Corporation and others.
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
- *
- * Contributors:
- * IBM Corporation - initial API and implementation
- *******************************************************************************/
-package org.eclipse.jst.j2ee.internal.web.providers;
-
-
-import java.util.Collection;
-import java.util.List;
-
-import org.eclipse.emf.common.notify.AdapterFactory;
-import org.eclipse.emf.common.notify.Notification;
-import org.eclipse.emf.common.util.ResourceLocator;
-import org.eclipse.emf.edit.provider.ComposeableAdapterFactory;
-import org.eclipse.emf.edit.provider.IEditingDomainItemProvider;
-import org.eclipse.emf.edit.provider.IItemLabelProvider;
-import org.eclipse.emf.edit.provider.IItemPropertySource;
-import org.eclipse.emf.edit.provider.ITreeItemContentProvider;
-import org.eclipse.emf.edit.provider.ItemPropertyDescriptor;
-import org.eclipse.jst.j2ee.internal.plugin.J2EEPlugin;
-import org.eclipse.jst.j2ee.internal.web.plugin.WebPlugin;
-import org.eclipse.jst.j2ee.webapplication.HTTPMethodType;
-import org.eclipse.jst.j2ee.webapplication.WebapplicationPackage;
-
-
-/**
- * This is the item provider adpater for a {@link org.eclipse.jst.j2ee.internal.internal.webapplication.HTTPMethodType}
- * object.
- */
-public class HTTPMethodTypeItemProvider extends WebapplicationItemProviderAdapter implements IEditingDomainItemProvider, IItemLabelProvider, IItemPropertySource, ITreeItemContentProvider {
-
- /**
- * This constructs an instance from a factory and a notifier.
- */
- public HTTPMethodTypeItemProvider(AdapterFactory adapterFactory) {
- super(adapterFactory);
- }
-
- /**
- * This returns http_type.gif.
- */
- @Override
- public Object getImage(Object object) {
- return WebPlugin.getDefault().getImage("http_type");//$NON-NLS-1$
- }
-
- /**
- * This returns the resCollection of the HTTPMethodType.
- */
- @Override
- public Object getParent(Object object) {
- return ((HTTPMethodType) object).getHttpMethod();
- }
-
- /**
- * This returns the property descriptors for the adapted class.
- */
- @Override
- public List getPropertyDescriptors(Object object) {
- if (itemPropertyDescriptors == null) {
- super.getPropertyDescriptors(object);
-
- WebapplicationPackage pkg = WebapplicationPackage.eINSTANCE;
-
- // This is for the httpMethod feature.
- //
- itemPropertyDescriptors.add(new ItemPropertyDescriptor(((ComposeableAdapterFactory) adapterFactory).getRootAdapterFactory(), WebAppEditResourceHandler.getString("HttpMethod_UI_"), //$NON-NLS-1$ = "HttpMethod"
- WebAppEditResourceHandler.getString("The_httpMethod_property_UI_"), //$NON-NLS-1$ = "The httpMethod property"
- pkg.getHTTPMethodType_HttpMethod()));
-
- // This is for the resCollection feature.
- //
- itemPropertyDescriptors.add(new ItemPropertyDescriptor(((ComposeableAdapterFactory) adapterFactory).getRootAdapterFactory(), WebAppEditResourceHandler.getString("ResCollection_UI_"), //$NON-NLS-1$ = "ResCollection"
- WebAppEditResourceHandler.getString("The_resCollection_property_UI_"), //$NON-NLS-1$ = "The resCollection property"
- pkg.getHTTPMethodType_HttpMethod()));
-
- }
- return itemPropertyDescriptors;
- }
-
- /**
- * This adds a property descriptor for the Http Method feature. <!-- begin-user-doc --> <!--
- * end-user-doc -->
- *
- * @generated
- */
- protected void addHttpMethodPropertyDescriptor(Object object) {
- itemPropertyDescriptors.add(new ItemPropertyDescriptor(((ComposeableAdapterFactory) adapterFactory).getRootAdapterFactory(), getString("_UI_HTTPMethodType_httpMethod_feature"), //$NON-NLS-1$
- getString("_UI_PropertyDescriptor_description", "_UI_HTTPMethodType_httpMethod_feature", "_UI_HTTPMethodType_type"), //$NON-NLS-1$ //$NON-NLS-2$ //$NON-NLS-3$
- WebapplicationPackage.eINSTANCE.getHTTPMethodType_HttpMethod(), true, ItemPropertyDescriptor.GENERIC_VALUE_IMAGE));
- }
-
-
- @Override
- public String getText(Object object) {
- return WebAppEditResourceHandler.getString("17concat_UI_", (new Object[]{((HTTPMethodType) object).getHttpMethod()})); //$NON-NLS-1$ = "HTTPMethodType {0}"
- }
-
- /**
- * This handles notification by calling {@link #fireNotifyChanged fireNotifyChanged}. <!--
- * begin-user-doc --> <!-- end-user-doc -->
- *
- * @generated
- */
- @Override
- public void notifyChanged(Notification notification) {
- switch (notification.getFeatureID(HTTPMethodType.class)) {
- case WebapplicationPackage.HTTP_METHOD_TYPE__HTTP_METHOD : {
- fireNotifyChanged(notification);
- return;
- }
- }
- super.notifyChanged(notification);
- }
-
- /**
- * This adds to the collection of {@link org.eclipse.emf.edit.command.CommandParameter}s
- * describing all of the children that can be created under this object. <!-- begin-user-doc -->
- * <!-- end-user-doc -->
- *
- * @generated
- */
- @Override
- protected void collectNewChildDescriptors(Collection newChildDescriptors, Object object) {
- super.collectNewChildDescriptors(newChildDescriptors, object);
- }
-
- /**
- * Return the resource locator for this item provider's resources. <!-- begin-user-doc --> <!--
- * end-user-doc -->
- *
- * @generated
- */
- @Override
- public ResourceLocator getResourceLocator() {
- return J2EEPlugin.getDefault();
- }
-
- /**
- * This always returns false. The base class has already implemented
- * {@link org.eclipse.emf.edit.provider.ItemProviderAdapter#getChildren ItemProviderAdapter.getChildren}
- * to return the empty enumeration, and this to check that enumeration, but we know there can't
- * be any children, so this is faster.
- */
- @Override
- public boolean hasChildren(Object object) {
- return false;
- }
-
-}
diff --git a/plugins/org.eclipse.jst.j2ee.web/webedit/org/eclipse/jst/j2ee/internal/web/providers/InitParamItemProvider.java b/plugins/org.eclipse.jst.j2ee.web/webedit/org/eclipse/jst/j2ee/internal/web/providers/InitParamItemProvider.java
deleted file mode 100644
index d2d105b..0000000
--- a/plugins/org.eclipse.jst.j2ee.web/webedit/org/eclipse/jst/j2ee/internal/web/providers/InitParamItemProvider.java
+++ /dev/null
@@ -1,233 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2003, 2005 IBM Corporation and others.
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
- *
- * Contributors:
- * IBM Corporation - initial API and implementation
- *******************************************************************************/
-package org.eclipse.jst.j2ee.internal.web.providers;
-
-import java.util.Collection;
-import java.util.List;
-
-import org.eclipse.emf.common.notify.AdapterFactory;
-import org.eclipse.emf.common.notify.Notification;
-import org.eclipse.emf.common.util.ResourceLocator;
-import org.eclipse.emf.edit.provider.ComposeableAdapterFactory;
-import org.eclipse.emf.edit.provider.IEditingDomainItemProvider;
-import org.eclipse.emf.edit.provider.IItemLabelProvider;
-import org.eclipse.emf.edit.provider.IItemPropertySource;
-import org.eclipse.emf.edit.provider.ITreeItemContentProvider;
-import org.eclipse.emf.edit.provider.ItemPropertyDescriptor;
-import org.eclipse.jst.j2ee.internal.plugin.J2EEPlugin;
-import org.eclipse.jst.j2ee.internal.web.plugin.WebPlugin;
-import org.eclipse.jst.j2ee.webapplication.InitParam;
-import org.eclipse.jst.j2ee.webapplication.WebapplicationPackage;
-
-
-/**
- * This is the item provider adpater for a {@link org.eclipse.jst.j2ee.internal.internal.webapplication.InitParam}object.
- */
-public class InitParamItemProvider extends WebapplicationItemProviderAdapter implements IEditingDomainItemProvider, IItemLabelProvider, IItemPropertySource, ITreeItemContentProvider {
-
- /**
- * This constructs an instance from a factory and a notifier.
- */
- public InitParamItemProvider(AdapterFactory adapterFactory) {
- super(adapterFactory);
- }
-
- /**
- * This returns initializ_parameter.gif.
- */
- @Override
- public Object getImage(Object object) {
- return WebPlugin.getDefault().getImage("initializ_parameter"); //$NON-NLS-1$
- }
-
- /**
- * This returns the servlet of the InitParam.
- */
- @Override
- public Object getParent(Object object) {
- return ((InitParam) object).eContainer();
- }
-
- /**
- * This returns the property descriptors for the adapted class.
- */
- @Override
- public List getPropertyDescriptors(Object object) {
- if (itemPropertyDescriptors == null) {
- super.getPropertyDescriptors(object);
-
- WebapplicationPackage pkg = WebapplicationPackage.eINSTANCE;
-
- // This is for the paramName feature.
- //
- itemPropertyDescriptors.add(new ItemPropertyDescriptor(((ComposeableAdapterFactory) adapterFactory).getRootAdapterFactory(), WebAppEditResourceHandler.getString("ParamName_UI_"), //$NON-NLS-1$ = "ParamName"
- WebAppEditResourceHandler.getString("The_paramName_property_UI_"), //$NON-NLS-1$ = "The paramName property"
- pkg.getInitParam_ParamName()));
-
- // This is for the paramValue feature.
- //
- itemPropertyDescriptors.add(new ItemPropertyDescriptor(((ComposeableAdapterFactory) adapterFactory).getRootAdapterFactory(), WebAppEditResourceHandler.getString("ParamValue_UI_"), //$NON-NLS-1$ = "ParamValue"
- WebAppEditResourceHandler.getString("The_paramValue_property_UI_"), //$NON-NLS-1$ = "The paramValue property"
- pkg.getInitParam_ParamValue()));
-
- // This is for the description feature.
- //
- WebToolingItemPropertyDescriptor propertyDescriptor = new WebToolingItemPropertyDescriptor(((ComposeableAdapterFactory) adapterFactory).getRootAdapterFactory(), WebAppEditResourceHandler.getString("Description_UI__UI_"), //$NON-NLS-1$ = "Description"
- WebAppEditResourceHandler.getString("Description_UI__UI_"), //$NON-NLS-1$ = "Description"
- pkg.getInitParam_Description(), WebToolingItemPropertyDescriptor.MULTILINE_TEXT_EDITOR);
- itemPropertyDescriptors.add(propertyDescriptor);
-
- }
- return itemPropertyDescriptors;
- }
-
- /**
- * This adds a property descriptor for the Param Name feature. <!-- begin-user-doc --> <!--
- * end-user-doc -->
- *
- * @generated
- */
- protected void addParamNamePropertyDescriptor(Object object) {
- itemPropertyDescriptors.add(new ItemPropertyDescriptor(((ComposeableAdapterFactory) adapterFactory).getRootAdapterFactory(), getString("_UI_InitParam_paramName_feature"), //$NON-NLS-1$
- getString("_UI_PropertyDescriptor_description", "_UI_InitParam_paramName_feature", "_UI_InitParam_type"), //$NON-NLS-1$ //$NON-NLS-2$ //$NON-NLS-3$
- WebapplicationPackage.eINSTANCE.getInitParam_ParamName(), true, ItemPropertyDescriptor.GENERIC_VALUE_IMAGE));
- }
-
- /**
- * This adds a property descriptor for the Param Value feature. <!-- begin-user-doc --> <!--
- * end-user-doc -->
- *
- * @generated
- */
- protected void addParamValuePropertyDescriptor(Object object) {
- itemPropertyDescriptors.add(new ItemPropertyDescriptor(((ComposeableAdapterFactory) adapterFactory).getRootAdapterFactory(), getString("_UI_InitParam_paramValue_feature"), //$NON-NLS-1$
- getString("_UI_PropertyDescriptor_description", "_UI_InitParam_paramValue_feature", "_UI_InitParam_type"), //$NON-NLS-1$ //$NON-NLS-2$ //$NON-NLS-3$
- WebapplicationPackage.eINSTANCE.getInitParam_ParamValue(), true, ItemPropertyDescriptor.GENERIC_VALUE_IMAGE));
- }
-
- /**
- * This adds a property descriptor for the Description feature. <!-- begin-user-doc --> <!--
- * end-user-doc -->
- *
- * @generated
- */
- protected void addDescriptionPropertyDescriptor(Object object) {
- itemPropertyDescriptors.add(new ItemPropertyDescriptor(((ComposeableAdapterFactory) adapterFactory).getRootAdapterFactory(), getString("_UI_InitParam_description_feature"), //$NON-NLS-1$
- getString("_UI_PropertyDescriptor_description", "_UI_InitParam_description_feature", "_UI_InitParam_type"), //$NON-NLS-1$ //$NON-NLS-2$ //$NON-NLS-3$
- WebapplicationPackage.eINSTANCE.getInitParam_Description(), true, ItemPropertyDescriptor.GENERIC_VALUE_IMAGE));
- }
-
-
- /**
- * This implements
- * {@link IItemPropertySource#getPropertyValue IItemPropertySource.getPropertyValue}by
- * delegating to the descriptor, which is assumed to support the IItemPropertyDescriptor
- * interface
- */
- @Override
- public Object getPropertyValue(Object object, String property) {
- Object ret = null;
- if (getPropertyDescriptor(object, property) instanceof WebToolingItemPropertyDescriptor) {
- ret = ((WebToolingItemPropertyDescriptor) getPropertyDescriptor(object, property)).getPropertyValue(object);
- } else
- ret = super.getPropertyValue(object, property);
- return ret;
- }
-
- @Override
- public String getText(Object object) {
- return WebAppEditResourceHandler.getString("18concat_UI_", (new Object[]{((InitParam) object).getParamName(), ((InitParam) object).getParamValue()})); //$NON-NLS-1$ = "{0} = {1}"
- }
-
- /**
- * This handles notification by calling {@link #fireNotifyChanged fireNotifyChanged}. <!--
- * begin-user-doc --> <!-- end-user-doc -->
- *
- * @generated
- */
- @Override
- public void notifyChanged(Notification notification) {
- switch (notification.getFeatureID(InitParam.class)) {
- case WebapplicationPackage.INIT_PARAM__PARAM_NAME :
- case WebapplicationPackage.INIT_PARAM__PARAM_VALUE :
- case WebapplicationPackage.INIT_PARAM__DESCRIPTION : {
- fireNotifyChanged(notification);
- return;
- }
- }
- super.notifyChanged(notification);
- }
-
- /**
- * This adds to the collection of {@link org.eclipse.emf.edit.command.CommandParameter}s
- * describing all of the children that can be created under this object. <!-- begin-user-doc -->
- * <!-- end-user-doc -->
- *
- * @generated
- */
- @Override
- protected void collectNewChildDescriptors(Collection newChildDescriptors, Object object) {
- super.collectNewChildDescriptors(newChildDescriptors, object);
- }
-
- /**
- * Return the resource locator for this item provider's resources. <!-- begin-user-doc --> <!--
- * end-user-doc -->
- *
- * @generated
- */
- @Override
- public ResourceLocator getResourceLocator() {
- return J2EEPlugin.getDefault();
- }
-
- /**
- * This always returns false. The base class has already implemented
- * {@link org.eclipse.emf.edit.provider.ItemProviderAdapter#getChildren ItemProviderAdapter.getChildren}
- * to return the empty enumeration, and this to check that enumeration, but we know there can't
- * be any children, so this is faster.
- */
- @Override
- public boolean hasChildren(Object object) {
- return false;
- }
-
- /**
- * This implements {@link IItemPropertySource#isPropertySet IItemPropertySource.isPropertySet}
- * by delegating to the descriptor, which is assumed to support the IItemPropertyDescriptor
- * interface
- */
- @Override
- public boolean isPropertySet(Object object, String property) {
- boolean ret = false;
- if (getPropertyDescriptor(object, property) instanceof WebToolingItemPropertyDescriptor) {
- ret = ((WebToolingItemPropertyDescriptor) getPropertyDescriptor(object, property)).isPropertySet(object);
- } else
- ret = super.isPropertySet(object, property);
- return ret;
- }
-
- /**
- * This implements
- * {@link IItemPropertySource#setPropertyValue IItemPropertySource.setPropertyValue}by
- * delegating to the descriptor, which is assumed to support the IItemPropertyDescriptor
- * interface
- */
- @Override
- public void setPropertyValue(Object object, String property, Object value) {
-
- if (getPropertyDescriptor(object, property) instanceof WebToolingItemPropertyDescriptor) {
- ((WebToolingItemPropertyDescriptor) getPropertyDescriptor(object, property)).setPropertyValue(object, value);
- } else
- super.setPropertyValue(object, property, value);
-
- }
-}
diff --git a/plugins/org.eclipse.jst.j2ee.web/webedit/org/eclipse/jst/j2ee/internal/web/providers/ItemHolder.java b/plugins/org.eclipse.jst.j2ee.web/webedit/org/eclipse/jst/j2ee/internal/web/providers/ItemHolder.java
deleted file mode 100644
index ac3a14d..0000000
--- a/plugins/org.eclipse.jst.j2ee.web/webedit/org/eclipse/jst/j2ee/internal/web/providers/ItemHolder.java
+++ /dev/null
@@ -1,84 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2003, 2005 IBM Corporation and others.
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
- *
- * Contributors:
- * IBM Corporation - initial API and implementation
- *******************************************************************************/
-package org.eclipse.jst.j2ee.internal.web.providers;
-
-
-import java.util.Collection;
-import java.util.Vector;
-
-import org.eclipse.emf.edit.provider.ItemProvider;
-import org.eclipse.jst.j2ee.web.componentcore.util.WebArtifactEdit;
-import org.eclipse.jst.j2ee.webapplication.WebApp;
-
-
-/**
- * Insert the type's description here. Creation date: (6/18/2001 5:53:02 PM)
- *
- * @author: Administrator
- */
-public class ItemHolder extends ItemProvider {
- protected WebApp webApp;
- protected WebArtifactEdit webArtifactEdit;
-
- public ItemHolder() {
- super();
- }
-
- /**
- * Jarholder constructor comment.
- */
- public ItemHolder(WebApp webApp) {
- super();
- setWebApp(webApp);
- }
- public ItemHolder(WebArtifactEdit webArtifactEdit) {
- super();
- setWebArtifactEdit(webArtifactEdit);
- }
-
- @Override
- public Collection getChildren(Object element) {
- WebApp testElement;
- Vector v = new Vector();
- if (element instanceof ItemHolder) {
- testElement = ((ItemHolder) element).getWebApp();
- v.add(testElement);
- }
- return v;
- }
-
- /**
- * Insert the method's description here. Creation date: (6/18/2001 6:00:43 PM)
- *
- * @return org.eclipse.jst.j2ee.internal.internal.ejb.EJBJar
- */
- public WebApp getWebApp() {
- return webApp;
- }
-
- /**
- * Insert the method's description here. Creation date: (6/18/2001 6:00:43 PM)
- *
- * @param newJar
- * org.eclipse.jst.j2ee.internal.internal.ejb.EJBJar
- */
- public void setWebApp(WebApp aWebApp) {
- webApp = aWebApp;
- }
-
- public WebArtifactEdit getWebArtifactEdit() {
- return webArtifactEdit;
- }
-
- public void setWebArtifactEdit(WebArtifactEdit webArtifactEdit) {
- this.webArtifactEdit = webArtifactEdit;
- }
-}
diff --git a/plugins/org.eclipse.jst.j2ee.web/webedit/org/eclipse/jst/j2ee/internal/web/providers/JSPConfigItemProvider.java b/plugins/org.eclipse.jst.j2ee.web/webedit/org/eclipse/jst/j2ee/internal/web/providers/JSPConfigItemProvider.java
deleted file mode 100644
index b14dacb..0000000
--- a/plugins/org.eclipse.jst.j2ee.web/webedit/org/eclipse/jst/j2ee/internal/web/providers/JSPConfigItemProvider.java
+++ /dev/null
@@ -1,161 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2003, 2005 IBM Corporation and others.
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
- *
- * Contributors:
- * IBM Corporation - initial API and implementation
- *******************************************************************************/
-package org.eclipse.jst.j2ee.internal.web.providers;
-
-
-import java.util.Collection;
-import java.util.List;
-
-import org.eclipse.emf.common.notify.AdapterFactory;
-import org.eclipse.emf.common.notify.Notification;
-import org.eclipse.emf.common.util.ResourceLocator;
-import org.eclipse.emf.ecore.EReference;
-import org.eclipse.emf.edit.provider.IEditingDomainItemProvider;
-import org.eclipse.emf.edit.provider.IItemLabelProvider;
-import org.eclipse.emf.edit.provider.IItemPropertySource;
-import org.eclipse.emf.edit.provider.ITreeItemContentProvider;
-import org.eclipse.emf.edit.provider.ItemProviderAdapter;
-import org.eclipse.jst.j2ee.internal.plugin.J2EEPlugin;
-import org.eclipse.jst.j2ee.internal.web.plugin.WebPlugin;
-import org.eclipse.jst.j2ee.jsp.JSPConfig;
-import org.eclipse.jst.j2ee.jsp.JspFactory;
-import org.eclipse.jst.j2ee.jsp.JspPackage;
-
-
-/**
- * This is the item provider adpater for a {@link com.ibm.etools.jsp.JSPConfig}object. <!--
- * begin-user-doc --> <!-- end-user-doc -->
- *
- * @generated
- */
-public class JSPConfigItemProvider extends ItemProviderAdapter implements IEditingDomainItemProvider, ITreeItemContentProvider, IItemLabelProvider, IItemPropertySource {
- /**
- * This constructs an instance from a factory and a notifier. <!-- begin-user-doc --> <!--
- * end-user-doc -->
- *
- * @generated
- */
- public JSPConfigItemProvider(AdapterFactory adapterFactory) {
- super(adapterFactory);
- }
-
- /**
- * This returns the property descriptors for the adapted class. <!-- begin-user-doc --> <!--
- * end-user-doc -->
- *
- * @generated
- */
- @Override
- public List getPropertyDescriptors(Object object) {
- if (itemPropertyDescriptors == null) {
- super.getPropertyDescriptors(object);
-
- }
- return itemPropertyDescriptors;
- }
-
- /**
- * This specifies how to implement {@link #getChildren}and
- * {@link org.eclipse.emf.edit.command.AddCommand}and
- * {@link org.eclipse.emf.edit.command.RemoveCommand}support in {@link #createCommand}. <!--
- * begin-user-doc --> <!-- end-user-doc -->
- *
- * @generated
- */
- @Override
- public Collection getChildrenReferences(Object object) {
- if (childrenReferences == null) {
- super.getChildrenReferences(object);
- childrenReferences.add(JspPackage.eINSTANCE.getJSPConfig_TagLibs());
- childrenReferences.add(JspPackage.eINSTANCE.getJSPConfig_PropertyGroups());
- }
- return childrenReferences;
- }
-
- /**
- * <!-- begin-user-doc --> <!-- end-user-doc -->
- *
- * @generated
- */
- @Override
- protected EReference getChildReference(Object object, Object child) {
- // Check the type of the specified child object and return the proper feature to use for
- // adding (see {@link AddCommand}) it as a child.
-
- return super.getChildReference(object, child);
- }
-
-
- /**
- * This returns JSPConfig.gif. <!-- begin-user-doc --> <!-- end-user-doc -->
- *
- * @generated
- */
- @Override
- public Object getImage(Object object) {
- return WebPlugin.getDefault().getImage("full/obj16/JSPConfig"); //$NON-NLS-1$
- }
-
- /**
- * This returns the label text for the adapted class. <!-- begin-user-doc --> <!-- end-user-doc
- * -->
- *
- * @generated
- */
- @Override
- public String getText(Object object) {
- return WebAppEditResourceHandler.getString("_UI_JSPConfig_type"); //$NON-NLS-1$
- }
-
- /**
- * This handles notification by calling {@link #fireNotifyChanged fireNotifyChanged}. <!--
- * begin-user-doc --> <!-- end-user-doc -->
- *
- * @generated
- */
- @Override
- public void notifyChanged(Notification notification) {
- switch (notification.getFeatureID(JSPConfig.class)) {
- case JspPackage.JSP_CONFIG__TAG_LIBS :
- case JspPackage.JSP_CONFIG__PROPERTY_GROUPS : {
- fireNotifyChanged(notification);
- return;
- }
- }
- super.notifyChanged(notification);
- }
-
- /**
- * This adds to the collection of {@link org.eclipse.emf.edit.command.CommandParameter}s
- * describing all of the children that can be created under this object. <!-- begin-user-doc -->
- * <!-- end-user-doc -->
- *
- * @generated
- */
- @Override
- protected void collectNewChildDescriptors(Collection newChildDescriptors, Object object) {
- super.collectNewChildDescriptors(newChildDescriptors, object);
-
- newChildDescriptors.add(createChildParameter(JspPackage.eINSTANCE.getJSPConfig_TagLibs(), JspFactory.eINSTANCE.createTagLibRefType()));
-
- newChildDescriptors.add(createChildParameter(JspPackage.eINSTANCE.getJSPConfig_PropertyGroups(), JspFactory.eINSTANCE.createJSPPropertyGroup()));
- }
-
- /**
- * Return the resource locator for this item provider's resources. <!-- begin-user-doc --> <!--
- * end-user-doc -->
- *
- */
- @Override
- public ResourceLocator getResourceLocator() {
- return J2EEPlugin.getDefault();
- }
-}
diff --git a/plugins/org.eclipse.jst.j2ee.web/webedit/org/eclipse/jst/j2ee/internal/web/providers/JSPPropertyGroupItemProvider.java b/plugins/org.eclipse.jst.j2ee.web/webedit/org/eclipse/jst/j2ee/internal/web/providers/JSPPropertyGroupItemProvider.java
deleted file mode 100644
index bd0a2df..0000000
--- a/plugins/org.eclipse.jst.j2ee.web/webedit/org/eclipse/jst/j2ee/internal/web/providers/JSPPropertyGroupItemProvider.java
+++ /dev/null
@@ -1,219 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2003, 2005 IBM Corporation and others.
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
- *
- * Contributors:
- * IBM Corporation - initial API and implementation
- *******************************************************************************/
-package org.eclipse.jst.j2ee.internal.web.providers;
-
-
-import java.util.Collection;
-import java.util.List;
-
-import org.eclipse.emf.common.notify.AdapterFactory;
-import org.eclipse.emf.common.notify.Notification;
-import org.eclipse.emf.common.util.ResourceLocator;
-import org.eclipse.emf.edit.provider.ComposeableAdapterFactory;
-import org.eclipse.emf.edit.provider.ItemPropertyDescriptor;
-import org.eclipse.jst.j2ee.common.internal.provider.CompatibilityDescriptionGroupItemProvider;
-import org.eclipse.jst.j2ee.internal.web.plugin.WebPlugin;
-import org.eclipse.jst.j2ee.jsp.JSPPropertyGroup;
-import org.eclipse.jst.j2ee.jsp.JspPackage;
-
-/**
- * This is the item provider adpater for a {@link com.ibm.etools.jsp.JSPPropertyGroup}object. <!--
- * begin-user-doc --> <!-- end-user-doc -->
- *
- * @generated
- */
-public class JSPPropertyGroupItemProvider extends CompatibilityDescriptionGroupItemProvider {
- /**
- * This constructs an instance from a factory and a notifier. <!-- begin-user-doc --> <!--
- * end-user-doc -->
- *
- * @generated
- */
- public JSPPropertyGroupItemProvider(AdapterFactory adapterFactory) {
- super(adapterFactory);
- }
-
- /**
- * This returns the property descriptors for the adapted class. <!-- begin-user-doc --> <!--
- * end-user-doc -->
- *
- * @generated
- */
- @Override
- public List getPropertyDescriptors(Object object) {
- if (itemPropertyDescriptors == null) {
- super.getPropertyDescriptors(object);
-
- addUrlPatternPropertyDescriptor(object);
- addElIgnoredPropertyDescriptor(object);
- addPageEncodingPropertyDescriptor(object);
- addScriptingInvalidPropertyDescriptor(object);
- addIsXMLPropertyDescriptor(object);
- addIncludePreludesPropertyDescriptor(object);
- addIncludeCodasPropertyDescriptor(object);
- }
- return itemPropertyDescriptors;
- }
-
- /**
- * This adds a property descriptor for the Url Pattern feature. <!-- begin-user-doc --> <!--
- * end-user-doc -->
- *
- * @generated
- */
- protected void addUrlPatternPropertyDescriptor(Object object) {
- itemPropertyDescriptors.add(new ItemPropertyDescriptor(((ComposeableAdapterFactory) adapterFactory).getRootAdapterFactory(), getString("_UI_JSPPropertyGroup_urlPattern_feature"), //$NON-NLS-1$
- getString("_UI_PropertyDescriptor_description", "_UI_JSPPropertyGroup_urlPattern_feature", "_UI_JSPPropertyGroup_type"), //$NON-NLS-1$ //$NON-NLS-2$ //$NON-NLS-3$
- JspPackage.eINSTANCE.getJSPPropertyGroup_UrlPattern(), true, ItemPropertyDescriptor.GENERIC_VALUE_IMAGE));
- }
-
- /**
- * This adds a property descriptor for the El Ignored feature. <!-- begin-user-doc --> <!--
- * end-user-doc -->
- *
- * @generated
- */
- protected void addElIgnoredPropertyDescriptor(Object object) {
- itemPropertyDescriptors.add(new ItemPropertyDescriptor(((ComposeableAdapterFactory) adapterFactory).getRootAdapterFactory(), getString("_UI_JSPPropertyGroup_elIgnored_feature"), //$NON-NLS-1$
- getString("_UI_PropertyDescriptor_description", "_UI_JSPPropertyGroup_elIgnored_feature", "_UI_JSPPropertyGroup_type"), //$NON-NLS-1$ //$NON-NLS-2$ //$NON-NLS-3$
- JspPackage.eINSTANCE.getJSPPropertyGroup_ElIgnored(), true, ItemPropertyDescriptor.BOOLEAN_VALUE_IMAGE));
- }
-
- /**
- * This adds a property descriptor for the Page Encoding feature. <!-- begin-user-doc --> <!--
- * end-user-doc -->
- *
- * @generated
- */
- protected void addPageEncodingPropertyDescriptor(Object object) {
- itemPropertyDescriptors.add(new ItemPropertyDescriptor(((ComposeableAdapterFactory) adapterFactory).getRootAdapterFactory(), getString("_UI_JSPPropertyGroup_pageEncoding_feature"), //$NON-NLS-1$
- getString("_UI_PropertyDescriptor_description", "_UI_JSPPropertyGroup_pageEncoding_feature", "_UI_JSPPropertyGroup_type"), //$NON-NLS-1$ //$NON-NLS-2$ //$NON-NLS-3$
- JspPackage.eINSTANCE.getJSPPropertyGroup_PageEncoding(), true, ItemPropertyDescriptor.GENERIC_VALUE_IMAGE));
- }
-
- /**
- * This adds a property descriptor for the Scripting Invalid feature. <!-- begin-user-doc -->
- * <!-- end-user-doc -->
- *
- * @generated
- */
- protected void addScriptingInvalidPropertyDescriptor(Object object) {
- itemPropertyDescriptors.add(new ItemPropertyDescriptor(((ComposeableAdapterFactory) adapterFactory).getRootAdapterFactory(), getString("_UI_JSPPropertyGroup_scriptingInvalid_feature"), //$NON-NLS-1$
- getString("_UI_PropertyDescriptor_description", "_UI_JSPPropertyGroup_scriptingInvalid_feature", "_UI_JSPPropertyGroup_type"), //$NON-NLS-1$ //$NON-NLS-2$ //$NON-NLS-3$
- JspPackage.eINSTANCE.getJSPPropertyGroup_ScriptingInvalid(), true, ItemPropertyDescriptor.BOOLEAN_VALUE_IMAGE));
- }
-
- /**
- * This adds a property descriptor for the Is XML feature. <!-- begin-user-doc --> <!--
- * end-user-doc -->
- *
- * @generated
- */
- protected void addIsXMLPropertyDescriptor(Object object) {
- itemPropertyDescriptors.add(new ItemPropertyDescriptor(((ComposeableAdapterFactory) adapterFactory).getRootAdapterFactory(), getString("_UI_JSPPropertyGroup_isXML_feature"), //$NON-NLS-1$
- getString("_UI_PropertyDescriptor_description", "_UI_JSPPropertyGroup_isXML_feature", "_UI_JSPPropertyGroup_type"), //$NON-NLS-1$ //$NON-NLS-2$ //$NON-NLS-3$
- JspPackage.eINSTANCE.getJSPPropertyGroup_IsXML(), true, ItemPropertyDescriptor.BOOLEAN_VALUE_IMAGE));
- }
-
- /**
- * This adds a property descriptor for the Include Preludes feature. <!-- begin-user-doc -->
- * <!-- end-user-doc -->
- *
- * @generated
- */
- protected void addIncludePreludesPropertyDescriptor(Object object) {
- itemPropertyDescriptors.add(new ItemPropertyDescriptor(((ComposeableAdapterFactory) adapterFactory).getRootAdapterFactory(), getString("_UI_JSPPropertyGroup_includePreludes_feature"), //$NON-NLS-1$
- getString("_UI_PropertyDescriptor_description", "_UI_JSPPropertyGroup_includePreludes_feature", "_UI_JSPPropertyGroup_type"), //$NON-NLS-1$ //$NON-NLS-2$ //$NON-NLS-3$
- JspPackage.eINSTANCE.getJSPPropertyGroup_IncludePreludes(), true, ItemPropertyDescriptor.GENERIC_VALUE_IMAGE));
- }
-
- /**
- * This adds a property descriptor for the Include Codas feature. <!-- begin-user-doc --> <!--
- * end-user-doc -->
- *
- * @generated
- */
- protected void addIncludeCodasPropertyDescriptor(Object object) {
- itemPropertyDescriptors.add(new ItemPropertyDescriptor(((ComposeableAdapterFactory) adapterFactory).getRootAdapterFactory(), getString("_UI_JSPPropertyGroup_includeCodas_feature"), //$NON-NLS-1$
- getString("_UI_PropertyDescriptor_description", "_UI_JSPPropertyGroup_includeCodas_feature", "_UI_JSPPropertyGroup_type"), //$NON-NLS-1$ //$NON-NLS-2$ //$NON-NLS-3$
- JspPackage.eINSTANCE.getJSPPropertyGroup_IncludeCodas(), true, ItemPropertyDescriptor.GENERIC_VALUE_IMAGE));
- }
-
-
- /**
- * This returns JSPPropertyGroup.gif. <!-- begin-user-doc --> <!-- end-user-doc -->
- *
- * @generated
- */
- @Override
- public Object getImage(Object object) {
- return WebPlugin.getDefault().getImage("full/obj16/JSPPropertyGroup"); //$NON-NLS-1$
- }
-
- /**
- * This returns the label text for the adapted class. <!-- begin-user-doc --> <!-- end-user-doc
- * -->
- *
- * @generated
- */
- @Override
- public String getText(Object object) {
- String label = ((JSPPropertyGroup) object).getDisplayName();
- return label == null || label.length() == 0 ? getString("_UI_JSPPropertyGroup_type") : //$NON-NLS-1$
- getString("_UI_JSPPropertyGroup_type") + " " + label; //$NON-NLS-1$ //$NON-NLS-2$
- }
-
- /**
- * This handles notification by calling {@link #fireNotifyChanged fireNotifyChanged}. <!--
- * begin-user-doc --> <!-- end-user-doc -->
- *
- * @generated
- */
- @Override
- public void notifyChanged(Notification notification) {
- switch (notification.getFeatureID(JSPPropertyGroup.class)) {
- case JspPackage.JSP_PROPERTY_GROUP__URL_PATTERN :
- case JspPackage.JSP_PROPERTY_GROUP__EL_IGNORED :
- case JspPackage.JSP_PROPERTY_GROUP__PAGE_ENCODING :
- case JspPackage.JSP_PROPERTY_GROUP__SCRIPTING_INVALID :
- case JspPackage.JSP_PROPERTY_GROUP__IS_XML :
- case JspPackage.JSP_PROPERTY_GROUP__INCLUDE_PRELUDES :
- case JspPackage.JSP_PROPERTY_GROUP__INCLUDE_CODAS : {
- fireNotifyChanged(notification);
- return;
- }
- }
- super.notifyChanged(notification);
- }
-
- /**
- * This adds to the collection of {@link org.eclipse.emf.edit.command.CommandParameter}s
- * describing all of the children that can be created under this object. <!-- begin-user-doc -->
- * <!-- end-user-doc -->
- *
- * @generated
- */
- @Override
- protected void collectNewChildDescriptors(Collection newChildDescriptors, Object object) {
- super.collectNewChildDescriptors(newChildDescriptors, object);
- }
-
- /**
- * Return the resource locator for this item provider's resources. <!-- begin-user-doc --> <!--
- * end-user-doc -->
- *
- */
- @Override
- public ResourceLocator getResourceLocator() {
- // return J2EEPlugin.getDefault();
- return WebAppEditResourceHandler.RESOURCE_LOCATOR;
- }
-}
diff --git a/plugins/org.eclipse.jst.j2ee.web/webedit/org/eclipse/jst/j2ee/internal/web/providers/JSPTypeItemProvider.java b/plugins/org.eclipse.jst.j2ee.web/webedit/org/eclipse/jst/j2ee/internal/web/providers/JSPTypeItemProvider.java
deleted file mode 100644
index 0e28021..0000000
--- a/plugins/org.eclipse.jst.j2ee.web/webedit/org/eclipse/jst/j2ee/internal/web/providers/JSPTypeItemProvider.java
+++ /dev/null
@@ -1,124 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2003, 2005 IBM Corporation and others.
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
- *
- * Contributors:
- * IBM Corporation - initial API and implementation
- *******************************************************************************/
-package org.eclipse.jst.j2ee.internal.web.providers;
-
-import java.util.Collection;
-import java.util.List;
-
-import org.eclipse.emf.common.notify.AdapterFactory;
-import org.eclipse.emf.common.notify.Notification;
-import org.eclipse.emf.common.util.ResourceLocator;
-import org.eclipse.emf.edit.provider.ComposeableAdapterFactory;
-import org.eclipse.emf.edit.provider.ItemPropertyDescriptor;
-import org.eclipse.jst.j2ee.internal.plugin.J2EEPlugin;
-import org.eclipse.jst.j2ee.internal.web.plugin.WebPlugin;
-import org.eclipse.jst.j2ee.webapplication.JSPType;
-import org.eclipse.jst.j2ee.webapplication.WebapplicationPackage;
-
-
-/**
- * This is the item provider adpater for a {@link org.eclipse.jst.j2ee.internal.internal.webapplication.JSPType}object.
- */
-public class JSPTypeItemProvider extends WebTypeItemProvider {
-
- /**
- * This constructs an instance from a factory and a notifier.
- */
- public JSPTypeItemProvider(AdapterFactory adapterFactory) {
- super(adapterFactory);
- }
-
- /**
- * This returns jsp_type.gif.
- */
- @Override
- public Object getImage(Object object) {
- return WebPlugin.getDefault().getImage("jsp_type");//$NON-NLS-1$
- }
-
- /**
- * This returns the property descriptors for the adapted class.
- */
- @Override
- public List getPropertyDescriptors(Object object) {
- if (itemPropertyDescriptors == null) {
- super.getPropertyDescriptors(object);
-
- WebapplicationPackage pkg = WebapplicationPackage.eINSTANCE;
-
- // This is for the jspFile feature.
- //
- itemPropertyDescriptors.add(new ItemPropertyDescriptor(((ComposeableAdapterFactory) adapterFactory).getRootAdapterFactory(), WebAppEditResourceHandler.getString("JspFile_UI_"), //$NON-NLS-1$ = "JspFile"
- WebAppEditResourceHandler.getString("The_jspFile_property_UI_"), //$NON-NLS-1$ = "The jspFile property"
- pkg.getJSPType_JspFile()));
-
- }
- return itemPropertyDescriptors;
- }
-
- /**
- * This adds a property descriptor for the Jsp File feature. <!-- begin-user-doc --> <!--
- * end-user-doc -->
- *
- * @generated
- */
- protected void addJspFilePropertyDescriptor(Object object) {
- itemPropertyDescriptors.add(new ItemPropertyDescriptor(((ComposeableAdapterFactory) adapterFactory).getRootAdapterFactory(), getString("_UI_JSPType_jspFile_feature"), //$NON-NLS-1$
- getString("_UI_PropertyDescriptor_description", "_UI_JSPType_jspFile_feature", "_UI_JSPType_type"), //$NON-NLS-1$ //$NON-NLS-2$ //$NON-NLS-3$
- WebapplicationPackage.eINSTANCE.getJSPType_JspFile(), true, ItemPropertyDescriptor.GENERIC_VALUE_IMAGE));
- }
-
-
- @Override
- public String getText(Object object) {
- return WebAppEditResourceHandler.getString("40concat_UI_", (new Object[]{((JSPType) object).getJspFile()})); //$NON-NLS-1$ = "JSPType {0}"
- }
-
- /**
- * This handles notification by calling {@link #fireNotifyChanged fireNotifyChanged}. <!--
- * begin-user-doc --> <!-- end-user-doc -->
- *
- * @generated
- */
- @Override
- public void notifyChanged(Notification notification) {
- switch (notification.getFeatureID(JSPType.class)) {
- case WebapplicationPackage.JSP_TYPE__JSP_FILE : {
- fireNotifyChanged(notification);
- return;
- }
- }
- super.notifyChanged(notification);
- }
-
- /**
- * This adds to the collection of {@link org.eclipse.emf.edit.command.CommandParameter}s
- * describing all of the children that can be created under this object. <!-- begin-user-doc -->
- * <!-- end-user-doc -->
- *
- * @generated
- */
- @Override
- protected void collectNewChildDescriptors(Collection newChildDescriptors, Object object) {
- super.collectNewChildDescriptors(newChildDescriptors, object);
- }
-
- /**
- * Return the resource locator for this item provider's resources. <!-- begin-user-doc --> <!--
- * end-user-doc -->
- *
- * @generated
- */
- @Override
- public ResourceLocator getResourceLocator() {
- return J2EEPlugin.getDefault();
- }
-}
diff --git a/plugins/org.eclipse.jst.j2ee.web/webedit/org/eclipse/jst/j2ee/internal/web/providers/JspItemProviderAdapterFactory.java b/plugins/org.eclipse.jst.j2ee.web/webedit/org/eclipse/jst/j2ee/internal/web/providers/JspItemProviderAdapterFactory.java
deleted file mode 100644
index 3c66df7..0000000
--- a/plugins/org.eclipse.jst.j2ee.web/webedit/org/eclipse/jst/j2ee/internal/web/providers/JspItemProviderAdapterFactory.java
+++ /dev/null
@@ -1,238 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2003, 2005 IBM Corporation and others.
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
- *
- * Contributors:
- * IBM Corporation - initial API and implementation
- *******************************************************************************/
-package org.eclipse.jst.j2ee.internal.web.providers;
-
-import java.util.ArrayList;
-import java.util.Collection;
-
-import org.eclipse.emf.common.notify.Adapter;
-import org.eclipse.emf.common.notify.Notification;
-import org.eclipse.emf.common.notify.Notifier;
-import org.eclipse.emf.edit.provider.ChangeNotifier;
-import org.eclipse.emf.edit.provider.ComposeableAdapterFactory;
-import org.eclipse.emf.edit.provider.ComposedAdapterFactory;
-import org.eclipse.emf.edit.provider.IChangeNotifier;
-import org.eclipse.emf.edit.provider.IEditingDomainItemProvider;
-import org.eclipse.emf.edit.provider.IItemLabelProvider;
-import org.eclipse.emf.edit.provider.IItemPropertySource;
-import org.eclipse.emf.edit.provider.INotifyChangedListener;
-import org.eclipse.emf.edit.provider.IStructuredItemContentProvider;
-import org.eclipse.emf.edit.provider.ITreeItemContentProvider;
-import org.eclipse.jst.j2ee.jsp.internal.util.JspAdapterFactory;
-
-
-/**
- * This is the factory that is used to provide the interfaces needed to support Viewers. The
- * adapters generated by this factory convert EMF adapter notifications into calls to
- * {@link #fireNotifyChanged fireNotifyChanged}. The adapters also support Eclipse property sheets.
- * Note that most of the adapters are shared among multiple instances. <!-- begin-user-doc --> <!--
- * end-user-doc -->
- *
- * @generated
- */
-public class JspItemProviderAdapterFactory extends JspAdapterFactory implements ComposeableAdapterFactory, IChangeNotifier {
- /**
- * This keeps track of the root adapter factory that delegates to this adapter factory. <!--
- * begin-user-doc --> <!-- end-user-doc -->
- *
- * @generated
- */
- protected ComposedAdapterFactory parentAdapterFactory;
-
- /**
- * This is used to implement {@link org.eclipse.emf.edit.provider.IChangeNotifier}. <!--
- * begin-user-doc --> <!-- end-user-doc -->
- *
- * @generated
- */
- protected IChangeNotifier changeNotifier = new ChangeNotifier();
-
- /**
- * This keeps track of all the supported types checked by
- * {@link #isFactoryForType isFactoryForType}. <!-- begin-user-doc --> <!-- end-user-doc -->
- *
- * @generated
- */
- protected Collection supportedTypes = new ArrayList();
-
- /**
- * This constructs an instance. <!-- begin-user-doc --> <!-- end-user-doc -->
- *
- * @generated
- */
- public JspItemProviderAdapterFactory() {
- supportedTypes.add(IStructuredItemContentProvider.class);
- supportedTypes.add(ITreeItemContentProvider.class);
- supportedTypes.add(IItemPropertySource.class);
- supportedTypes.add(IEditingDomainItemProvider.class);
- supportedTypes.add(IItemLabelProvider.class);
- }
-
- /**
- * This keeps track of the one adapter used for all {@link com.ibm.etools.jsp.JSPConfig}
- * instances. <!-- begin-user-doc --> <!-- end-user-doc -->
- *
- * @generated
- */
- protected JSPConfigItemProvider jspConfigItemProvider;
-
- /**
- * This creates an adapter for a {@link com.ibm.etools.jsp.JSPConfig}. <!-- begin-user-doc -->
- * <!-- end-user-doc -->
- *
- * @generated
- */
- @Override
- public Adapter createJSPConfigAdapter() {
- if (jspConfigItemProvider == null) {
- jspConfigItemProvider = new JSPConfigItemProvider(this);
- }
-
- return jspConfigItemProvider;
- }
-
- /**
- * This keeps track of the one adapter used for all {@link com.ibm.etools.jsp.JSPPropertyGroup}
- * instances. <!-- begin-user-doc --> <!-- end-user-doc -->
- *
- * @generated
- */
- protected JSPPropertyGroupItemProvider jspPropertyGroupItemProvider;
-
- /**
- * This creates an adapter for a {@link com.ibm.etools.jsp.JSPPropertyGroup}. <!--
- * begin-user-doc --> <!-- end-user-doc -->
- *
- * @generated
- */
- @Override
- public Adapter createJSPPropertyGroupAdapter() {
- if (jspPropertyGroupItemProvider == null) {
- jspPropertyGroupItemProvider = new JSPPropertyGroupItemProvider(this);
- }
-
- return jspPropertyGroupItemProvider;
- }
-
- /**
- * This keeps track of the one adapter used for all {@link com.ibm.etools.jsp.TagLibRefType}
- * instances. <!-- begin-user-doc --> <!-- end-user-doc -->
- *
- * @generated
- */
- protected TagLibRefTypeItemProvider tagLibRefTypeItemProvider;
-
- /**
- * This creates an adapter for a {@link com.ibm.etools.jsp.TagLibRefType}. <!-- begin-user-doc
- * --> <!-- end-user-doc -->
- *
- * @generated
- */
- @Override
- public Adapter createTagLibRefTypeAdapter() {
- if (tagLibRefTypeItemProvider == null) {
- tagLibRefTypeItemProvider = new TagLibRefTypeItemProvider(this);
- }
-
- return tagLibRefTypeItemProvider;
- }
-
- /**
- * This returns the root adapter factory that contains this factory. <!-- begin-user-doc -->
- * <!-- end-user-doc -->
- *
- * @generated
- */
- public ComposeableAdapterFactory getRootAdapterFactory() {
- return parentAdapterFactory == null ? this : parentAdapterFactory.getRootAdapterFactory();
- }
-
- /**
- * This sets the composed adapter factory that contains this factory. <!-- begin-user-doc -->
- * <!-- end-user-doc -->
- *
- * @generated
- */
- public void setParentAdapterFactory(ComposedAdapterFactory parentAdapterFactory) {
- this.parentAdapterFactory = parentAdapterFactory;
- }
-
- /**
- * <!-- begin-user-doc --> <!-- end-user-doc -->
- *
- * @generated
- */
- @Override
- public boolean isFactoryForType(Object type) {
- return supportedTypes.contains(type) || super.isFactoryForType(type);
- }
-
- /**
- * This implementation substitutes the factory itself as the key for the adapter. <!--
- * begin-user-doc --> <!-- end-user-doc -->
- *
- * @generated
- */
- @Override
- public Adapter adapt(Notifier notifier, Object type) {
- return super.adapt(notifier, this);
- }
-
- /**
- * <!-- begin-user-doc --> <!-- end-user-doc -->
- *
- * @generated
- */
- @Override
- public Object adapt(Object object, Object type) {
- if (isFactoryForType(type)) {
- Object adapter = super.adapt(object, type);
- if (!(type instanceof Class) || (((Class) type).isInstance(adapter))) {
- return adapter;
- }
- }
-
- return null;
- }
-
- /**
- * This adds a listener. <!-- begin-user-doc --> <!-- end-user-doc -->
- *
- * @generated
- */
- public void addListener(INotifyChangedListener notifyChangedListener) {
- changeNotifier.addListener(notifyChangedListener);
- }
-
- /**
- * This removes a listener. <!-- begin-user-doc --> <!-- end-user-doc -->
- *
- * @generated
- */
- public void removeListener(INotifyChangedListener notifyChangedListener) {
- changeNotifier.removeListener(notifyChangedListener);
- }
-
- /**
- * This delegates to {@link #changeNotifier}and to {@link #parentAdapterFactory}. <!--
- * begin-user-doc --> <!-- end-user-doc -->
- *
- * @generated
- */
- public void fireNotifyChanged(Notification notification) {
- changeNotifier.fireNotifyChanged(notification);
-
- if (parentAdapterFactory != null) {
- parentAdapterFactory.fireNotifyChanged(notification);
- }
- }
-
-}
diff --git a/plugins/org.eclipse.jst.j2ee.web/webedit/org/eclipse/jst/j2ee/internal/web/providers/LocalEncodingMappingItemProvider.java b/plugins/org.eclipse.jst.j2ee.web/webedit/org/eclipse/jst/j2ee/internal/web/providers/LocalEncodingMappingItemProvider.java
deleted file mode 100644
index d77fdff..0000000
--- a/plugins/org.eclipse.jst.j2ee.web/webedit/org/eclipse/jst/j2ee/internal/web/providers/LocalEncodingMappingItemProvider.java
+++ /dev/null
@@ -1,153 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2003, 2005 IBM Corporation and others.
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
- *
- * Contributors:
- * IBM Corporation - initial API and implementation
- *******************************************************************************/
-package org.eclipse.jst.j2ee.internal.web.providers;
-
-
-import java.util.Collection;
-import java.util.List;
-
-import org.eclipse.emf.common.notify.AdapterFactory;
-import org.eclipse.emf.common.notify.Notification;
-import org.eclipse.emf.common.util.ResourceLocator;
-import org.eclipse.emf.edit.provider.ComposeableAdapterFactory;
-import org.eclipse.emf.edit.provider.IEditingDomainItemProvider;
-import org.eclipse.emf.edit.provider.IItemLabelProvider;
-import org.eclipse.emf.edit.provider.IItemPropertySource;
-import org.eclipse.emf.edit.provider.ITreeItemContentProvider;
-import org.eclipse.emf.edit.provider.ItemPropertyDescriptor;
-import org.eclipse.emf.edit.provider.ItemProviderAdapter;
-import org.eclipse.jst.j2ee.internal.plugin.J2EEPlugin;
-import org.eclipse.jst.j2ee.internal.web.plugin.WebPlugin;
-import org.eclipse.jst.j2ee.webapplication.LocalEncodingMapping;
-import org.eclipse.jst.j2ee.webapplication.WebapplicationPackage;
-
-
-/**
- * This is the item provider adpater for a
- * {@link org.eclipse.jst.j2ee.internal.internal.webapplication.LocalEncodingMapping}object. <!-- begin-user-doc --> <!--
- * end-user-doc -->
- *
- * @generated
- */
-public class LocalEncodingMappingItemProvider extends ItemProviderAdapter implements IEditingDomainItemProvider, ITreeItemContentProvider, IItemLabelProvider, IItemPropertySource {
- /**
- * This constructs an instance from a factory and a notifier. <!-- begin-user-doc --> <!--
- * end-user-doc -->
- *
- * @generated
- */
- public LocalEncodingMappingItemProvider(AdapterFactory adapterFactory) {
- super(adapterFactory);
- }
-
- /**
- * This returns the property descriptors for the adapted class. <!-- begin-user-doc --> <!--
- * end-user-doc -->
- *
- * @generated
- */
- @Override
- public List getPropertyDescriptors(Object object) {
- if (itemPropertyDescriptors == null) {
- super.getPropertyDescriptors(object);
-
- addLocalePropertyDescriptor(object);
- addEncodingPropertyDescriptor(object);
- }
- return itemPropertyDescriptors;
- }
-
- /**
- * This adds a property descriptor for the Locale feature. <!-- begin-user-doc --> <!--
- * end-user-doc -->
- *
- * @generated
- */
- protected void addLocalePropertyDescriptor(Object object) {
- itemPropertyDescriptors.add(new ItemPropertyDescriptor(((ComposeableAdapterFactory) adapterFactory).getRootAdapterFactory(), getString("_UI_LocalEncodingMapping_locale_feature"), //$NON-NLS-1$
- getString("_UI_PropertyDescriptor_description", "_UI_LocalEncodingMapping_locale_feature", "_UI_LocalEncodingMapping_type"), //$NON-NLS-1$ //$NON-NLS-2$ //$NON-NLS-3$
- WebapplicationPackage.eINSTANCE.getLocalEncodingMapping_Locale(), true, ItemPropertyDescriptor.GENERIC_VALUE_IMAGE));
- }
-
- /**
- * This adds a property descriptor for the Encoding feature. <!-- begin-user-doc --> <!--
- * end-user-doc -->
- *
- * @generated
- */
- protected void addEncodingPropertyDescriptor(Object object) {
- itemPropertyDescriptors.add(new ItemPropertyDescriptor(((ComposeableAdapterFactory) adapterFactory).getRootAdapterFactory(), getString("_UI_LocalEncodingMapping_encoding_feature"), //$NON-NLS-1$
- getString("_UI_PropertyDescriptor_description", "_UI_LocalEncodingMapping_encoding_feature", "_UI_LocalEncodingMapping_type"), //$NON-NLS-1$ //$NON-NLS-2$ //$NON-NLS-3$
- WebapplicationPackage.eINSTANCE.getLocalEncodingMapping_Encoding(), true, ItemPropertyDescriptor.GENERIC_VALUE_IMAGE));
- }
-
-
- /**
- * This returns LocalEncodingMapping.gif. <!-- begin-user-doc --> <!-- end-user-doc -->
- */
- @Override
- public Object getImage(Object object) {
- // return getResourceLocator().getImage("full/obj16/LocalEncodingMapping");
- return WebPlugin.getDefault().getImage("local_encoding_mapping");//$NON-NLS-1$
- }
-
- /**
- * This returns the label text for the adapted class. <!-- begin-user-doc --> <!-- end-user-doc
- * -->
- */
- @Override
- public String getText(Object object) {
- String lem = WebAppEditResourceHandler.getString("local_encoding_mapping_UI_"); //$NON-NLS-1$
- String label = ((LocalEncodingMapping) object).getLocale();
- return label == null || label.length() == 0 ? lem : lem + " " + label; //$NON-NLS-1$
- }
-
- /**
- * This handles notification by calling {@link #fireNotifyChanged fireNotifyChanged}. <!--
- * begin-user-doc --> <!-- end-user-doc -->
- *
- * @generated
- */
- @Override
- public void notifyChanged(Notification notification) {
- switch (notification.getFeatureID(LocalEncodingMapping.class)) {
- case WebapplicationPackage.LOCAL_ENCODING_MAPPING__LOCALE :
- case WebapplicationPackage.LOCAL_ENCODING_MAPPING__ENCODING : {
- fireNotifyChanged(notification);
- return;
- }
- }
- super.notifyChanged(notification);
- }
-
- /**
- * This adds to the collection of {@link org.eclipse.emf.edit.command.CommandParameter}s
- * describing all of the children that can be created under this object. <!-- begin-user-doc -->
- * <!-- end-user-doc -->
- *
- * @generated
- */
- @Override
- protected void collectNewChildDescriptors(Collection newChildDescriptors, Object object) {
- super.collectNewChildDescriptors(newChildDescriptors, object);
- }
-
- /**
- * Return the resource locator for this item provider's resources. <!-- begin-user-doc --> <!--
- * end-user-doc -->
- *
- * @generated
- */
- @Override
- public ResourceLocator getResourceLocator() {
- return J2EEPlugin.getDefault();
- }
-}
diff --git a/plugins/org.eclipse.jst.j2ee.web/webedit/org/eclipse/jst/j2ee/internal/web/providers/LocalEncodingMappingListItemProvider.java b/plugins/org.eclipse.jst.j2ee.web/webedit/org/eclipse/jst/j2ee/internal/web/providers/LocalEncodingMappingListItemProvider.java
deleted file mode 100644
index 18a9f93..0000000
--- a/plugins/org.eclipse.jst.j2ee.web/webedit/org/eclipse/jst/j2ee/internal/web/providers/LocalEncodingMappingListItemProvider.java
+++ /dev/null
@@ -1,142 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2003, 2005 IBM Corporation and others.
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
- *
- * Contributors:
- * IBM Corporation - initial API and implementation
- *******************************************************************************/
-package org.eclipse.jst.j2ee.internal.web.providers;
-
-
-import java.util.Collection;
-import java.util.List;
-
-import org.eclipse.emf.common.notify.AdapterFactory;
-import org.eclipse.emf.common.notify.Notification;
-import org.eclipse.emf.common.util.ResourceLocator;
-import org.eclipse.emf.edit.provider.IEditingDomainItemProvider;
-import org.eclipse.emf.edit.provider.IItemLabelProvider;
-import org.eclipse.emf.edit.provider.IItemPropertySource;
-import org.eclipse.emf.edit.provider.ITreeItemContentProvider;
-import org.eclipse.emf.edit.provider.ItemProviderAdapter;
-import org.eclipse.jst.j2ee.internal.plugin.J2EEPlugin;
-import org.eclipse.jst.j2ee.internal.web.plugin.WebPlugin;
-import org.eclipse.jst.j2ee.webapplication.LocalEncodingMappingList;
-import org.eclipse.jst.j2ee.webapplication.WebapplicationFactory;
-import org.eclipse.jst.j2ee.webapplication.WebapplicationPackage;
-
-
-/**
- * This is the item provider adpater for a
- * {@link org.eclipse.jst.j2ee.internal.internal.webapplication.LocalEncodingMappingList}object. <!-- begin-user-doc -->
- * <!-- end-user-doc -->
- *
- * @generated
- */
-public class LocalEncodingMappingListItemProvider extends ItemProviderAdapter implements IEditingDomainItemProvider, ITreeItemContentProvider, IItemLabelProvider, IItemPropertySource {
- /**
- * This constructs an instance from a factory and a notifier. <!-- begin-user-doc --> <!--
- * end-user-doc -->
- *
- * @generated
- */
- public LocalEncodingMappingListItemProvider(AdapterFactory adapterFactory) {
- super(adapterFactory);
- }
-
- /**
- * This returns the property descriptors for the adapted class. <!-- begin-user-doc --> <!--
- * end-user-doc -->
- *
- * @generated
- */
- @Override
- public List getPropertyDescriptors(Object object) {
- if (itemPropertyDescriptors == null) {
- super.getPropertyDescriptors(object);
-
- }
- return itemPropertyDescriptors;
- }
-
- /**
- * This specifies how to implement {@link #getChildren}and
- * {@link org.eclipse.emf.edit.command.AddCommand}and
- * {@link org.eclipse.emf.edit.command.RemoveCommand}support in {@link #createCommand}. <!--
- * begin-user-doc --> <!-- end-user-doc -->
- *
- * @generated
- */
- @Override
- public Collection getChildrenReferences(Object object) {
- if (childrenReferences == null) {
- super.getChildrenReferences(object);
- childrenReferences.add(WebapplicationPackage.eINSTANCE.getLocalEncodingMappingList_LocalEncodingMappings());
- }
- return childrenReferences;
- }
-
-
- /**
- * This returns LocalEncodingMappingList.gif. <!-- begin-user-doc --> <!-- end-user-doc -->
- */
- @Override
- public Object getImage(Object object) {
- // return getResourceLocator().getImage("full/obj16/LocalEncodingMappingList");
- return WebPlugin.getDefault().getImage("local_encoding_mapping_list");//$NON-NLS-1$
- }
-
- /**
- * This returns the label text for the adapted class. <!-- begin-user-doc --> <!-- end-user-doc
- * -->
- */
- @Override
- public String getText(Object object) {
- return WebAppEditResourceHandler.getString("Local_encoding_mapping_list_UI_"); //$NON-NLS-1$ = "Welcome File List"
- }
-
- /**
- * This handles notification by calling {@link #fireNotifyChanged fireNotifyChanged}. <!--
- * begin-user-doc --> <!-- end-user-doc -->
- *
- * @generated
- */
- @Override
- public void notifyChanged(Notification notification) {
- switch (notification.getFeatureID(LocalEncodingMappingList.class)) {
- case WebapplicationPackage.LOCAL_ENCODING_MAPPING_LIST__LOCAL_ENCODING_MAPPINGS : {
- fireNotifyChanged(notification);
- return;
- }
- }
- super.notifyChanged(notification);
- }
-
- /**
- * This adds to the collection of {@link org.eclipse.emf.edit.command.CommandParameter}s
- * describing all of the children that can be created under this object. <!-- begin-user-doc -->
- * <!-- end-user-doc -->
- *
- * @generated
- */
- @Override
- protected void collectNewChildDescriptors(Collection newChildDescriptors, Object object) {
- super.collectNewChildDescriptors(newChildDescriptors, object);
-
- newChildDescriptors.add(createChildParameter(WebapplicationPackage.eINSTANCE.getLocalEncodingMappingList_LocalEncodingMappings(), WebapplicationFactory.eINSTANCE.createLocalEncodingMapping()));
- }
-
- /**
- * Return the resource locator for this item provider's resources. <!-- begin-user-doc --> <!--
- * end-user-doc -->
- *
- * @generated
- */
- @Override
- public ResourceLocator getResourceLocator() {
- return J2EEPlugin.getDefault();
- }
-}
diff --git a/plugins/org.eclipse.jst.j2ee.web/webedit/org/eclipse/jst/j2ee/internal/web/providers/LoginConfigItemProvider.java b/plugins/org.eclipse.jst.j2ee.web/webedit/org/eclipse/jst/j2ee/internal/web/providers/LoginConfigItemProvider.java
deleted file mode 100644
index 064cd44..0000000
--- a/plugins/org.eclipse.jst.j2ee.web/webedit/org/eclipse/jst/j2ee/internal/web/providers/LoginConfigItemProvider.java
+++ /dev/null
@@ -1,236 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2003, 2005 IBM Corporation and others.
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
- *
- * Contributors:
- * IBM Corporation - initial API and implementation
- *******************************************************************************/
-package org.eclipse.jst.j2ee.internal.web.providers;
-
-import java.util.ArrayList;
-import java.util.Collection;
-import java.util.List;
-
-import org.eclipse.emf.common.notify.AdapterFactory;
-import org.eclipse.emf.common.notify.Notification;
-import org.eclipse.emf.common.util.ResourceLocator;
-import org.eclipse.emf.ecore.EObject;
-import org.eclipse.emf.edit.command.AddCommand;
-import org.eclipse.emf.edit.command.RemoveCommand;
-import org.eclipse.emf.edit.provider.ComposeableAdapterFactory;
-import org.eclipse.emf.edit.provider.IEditingDomainItemProvider;
-import org.eclipse.emf.edit.provider.IItemLabelProvider;
-import org.eclipse.emf.edit.provider.IItemPropertySource;
-import org.eclipse.emf.edit.provider.ITreeItemContentProvider;
-import org.eclipse.emf.edit.provider.ItemPropertyDescriptor;
-import org.eclipse.jst.j2ee.internal.plugin.J2EEPlugin;
-import org.eclipse.jst.j2ee.internal.web.plugin.WebPlugin;
-import org.eclipse.jst.j2ee.webapplication.LoginConfig;
-import org.eclipse.jst.j2ee.webapplication.WebapplicationFactory;
-import org.eclipse.jst.j2ee.webapplication.WebapplicationPackage;
-
-
-/**
- * This is the item provider adpater for a {@link org.eclipse.jst.j2ee.internal.internal.webapplication.LoginConfig}object.
- */
-public class LoginConfigItemProvider extends WebapplicationItemProviderAdapter implements IEditingDomainItemProvider, IItemLabelProvider, IItemPropertySource, ITreeItemContentProvider {
-
- /**
- * This constructs an instance from a factory and a notifier.
- */
- public LoginConfigItemProvider(AdapterFactory adapterFactory) {
- super(adapterFactory);
- }
-
- /**
- * This creates a new child for {@link org.eclipse.jst.j2ee.internal.internal.webapplication.commandCreateChildCommand}.
- */
- @Override
- public Object createChild(Object object) {
- // TODO: create some child object.
- return null;
- }
-
- /**
- * This specifies how to implement {@link #getChildren}and {@link AddCommand}and
- * {@link RemoveCommand}support in {@link #createCommand}.
- */
- @Override
- public Collection getChildrenReferences(Object object) {
- WebapplicationPackage pkg = WebapplicationPackage.eINSTANCE;
- Collection result = new ArrayList();
- result.add(pkg.getLoginConfig_FormLoginConfig());
- return result;
- }
-
- //TODO Removing UI dependency by commenting out method
- /**
- * This returns the image for {@link org.eclipse.jst.j2ee.internal.internal.webapplication.commandCreateChildCommand}.
- */
- /*
- * public ImageDescriptor getCreateChildImageDescriptor(Object object) { EObject refObject =
- * (EObject)object; return
- * WEBUIPlugin.getDefault().getImageDescriptor(refObject.eClass().getName() +
- * "Create#CHILD_CLASS_NAME#");//$NON-NLS-1$ }
- */
- /**
- * This returns the label for {@link org.eclipse.jst.j2ee.internal.internal.webapplication.commandCreateChildCommand}.
- */
- @Override
- public String getCreateChildText(Object object) {
- return WebAppEditResourceHandler.getString("Create_#CHILD_CLASS_NAME#_UI_"); //$NON-NLS-1$ = "Create #CHILD_CLASS_NAME#"
- }
-
- /**
- * This returns the help text for
- * {@link org.eclipse.jst.j2ee.internal.internal.webapplication.commandCreateChildCommand}.
- */
- @Override
- public String getCreateChildToolTipText(Object object) {
- EObject refObject = (EObject) object;
- return WebAppEditResourceHandler.getString("1concat", (new Object[]{refObject.eClass().getName()}));//$NON-NLS-1$ = "Create a child of type #CHILD_CLASS_NAME# for the selected {0}."
- }
-
- /**
- * This returns form_login_config.gif.
- */
- @Override
- public Object getImage(Object object) {
- return WebPlugin.getDefault().getImage("form_login_config");//$NON-NLS-1$
- }
-
- /**
- * This returns the webApp of the LoginConfig.
- */
- @Override
- public Object getParent(Object object) {
- return ((LoginConfig) object).getWebApp();
- }
-
- /**
- * This returns the property descriptors for the adapted class.
- */
- @Override
- public List getPropertyDescriptors(Object object) {
- if (itemPropertyDescriptors == null) {
- super.getPropertyDescriptors(object);
-
- WebapplicationPackage pkg = WebapplicationPackage.eINSTANCE;
-
- // This is for the authMethod feature.
- //
- itemPropertyDescriptors.add(new ItemPropertyDescriptor(((ComposeableAdapterFactory) adapterFactory).getRootAdapterFactory(), WebAppEditResourceHandler.getString("AuthMethod_UI_"), //$NON-NLS-1$ = "AuthMethod"
- WebAppEditResourceHandler.getString("The_authMethod_property_UI_"), //$NON-NLS-1$ = "The authMethod property"
- pkg.getLoginConfig_AuthMethod()));
-
- // This is for the realmName feature.
- //
- itemPropertyDescriptors.add(new ItemPropertyDescriptor(((ComposeableAdapterFactory) adapterFactory).getRootAdapterFactory(), WebAppEditResourceHandler.getString("RealmName_UI_"), //$NON-NLS-1$ = "RealmName"
- WebAppEditResourceHandler.getString("The_realmName_property_UI_"), //$NON-NLS-1$ = "The realmName property"
- pkg.getLoginConfig_RealmName()));
-
- // This is for the webApp feature.
- //
- itemPropertyDescriptors.add(new ItemPropertyDescriptor(((ComposeableAdapterFactory) adapterFactory).getRootAdapterFactory(), WebAppEditResourceHandler.getString("WebApp_UI_"), //$NON-NLS-1$ = "WebApp"
- WebAppEditResourceHandler.getString("The_webApp_property_UI_"), //$NON-NLS-1$ = "The webApp property"
- pkg.getLoginConfig_WebApp()));
-
- // This is for the formLoginConfig feature.
- //
- itemPropertyDescriptors.add(new ItemPropertyDescriptor(((ComposeableAdapterFactory) adapterFactory).getRootAdapterFactory(), WebAppEditResourceHandler.getString("FormLoginConfig_UI_"), //$NON-NLS-1$ = "FormLoginConfig"
- WebAppEditResourceHandler.getString("The_formLoginConfig_proper_UI_"), //$NON-NLS-1$ = "The formLoginConfig property"
- pkg.getLoginConfig_FormLoginConfig()));
-
- }
- return itemPropertyDescriptors;
- }
-
- /**
- * This adds a property descriptor for the Auth Method feature. <!-- begin-user-doc --> <!--
- * end-user-doc -->
- *
- * @generated
- */
- protected void addAuthMethodPropertyDescriptor(Object object) {
- itemPropertyDescriptors.add(new ItemPropertyDescriptor(((ComposeableAdapterFactory) adapterFactory).getRootAdapterFactory(), getString("_UI_LoginConfig_authMethod_feature"), //$NON-NLS-1$
- getString("_UI_PropertyDescriptor_description", "_UI_LoginConfig_authMethod_feature", "_UI_LoginConfig_type"), //$NON-NLS-1$ //$NON-NLS-2$ //$NON-NLS-3$
- WebapplicationPackage.eINSTANCE.getLoginConfig_AuthMethod(), true, ItemPropertyDescriptor.GENERIC_VALUE_IMAGE));
- }
-
- /**
- * This adds a property descriptor for the Realm Name feature. <!-- begin-user-doc --> <!--
- * end-user-doc -->
- *
- * @generated
- */
- protected void addRealmNamePropertyDescriptor(Object object) {
- itemPropertyDescriptors.add(new ItemPropertyDescriptor(((ComposeableAdapterFactory) adapterFactory).getRootAdapterFactory(), getString("_UI_LoginConfig_realmName_feature"), //$NON-NLS-1$
- getString("_UI_PropertyDescriptor_description", "_UI_LoginConfig_realmName_feature", "_UI_LoginConfig_type"), //$NON-NLS-1$ //$NON-NLS-2$ //$NON-NLS-3$
- WebapplicationPackage.eINSTANCE.getLoginConfig_RealmName(), true, ItemPropertyDescriptor.GENERIC_VALUE_IMAGE));
- }
-
- /**
- * This adds a property descriptor for the Authorization Method feature. <!-- begin-user-doc -->
- * <!-- end-user-doc -->
- *
- * @generated
- */
- protected void addAuthorizationMethodPropertyDescriptor(Object object) {
- itemPropertyDescriptors.add(new ItemPropertyDescriptor(((ComposeableAdapterFactory) adapterFactory).getRootAdapterFactory(), getString("_UI_LoginConfig_authorizationMethod_feature"), //$NON-NLS-1$
- getString("_UI_PropertyDescriptor_description", "_UI_LoginConfig_authorizationMethod_feature", "_UI_LoginConfig_type"), //$NON-NLS-1$ //$NON-NLS-2$ //$NON-NLS-3$
- WebapplicationPackage.eINSTANCE.getLoginConfig_AuthorizationMethod(), true, ItemPropertyDescriptor.GENERIC_VALUE_IMAGE));
- }
-
- @Override
- public String getText(Object object) {
- return WebAppEditResourceHandler.getString("21concat_UI_", (new Object[]{((LoginConfig) object).getRealmName()})); //$NON-NLS-1$ = "LoginConfig {0}"
- }
-
- /**
- * This handles notification by calling {@link #fireNotifyChanged fireNotifyChanged}. <!--
- * begin-user-doc --> <!-- end-user-doc -->
- *
- * @generated
- */
- @Override
- public void notifyChanged(Notification notification) {
- switch (notification.getFeatureID(LoginConfig.class)) {
- case WebapplicationPackage.LOGIN_CONFIG__AUTH_METHOD :
- case WebapplicationPackage.LOGIN_CONFIG__REALM_NAME :
- case WebapplicationPackage.LOGIN_CONFIG__AUTHORIZATION_METHOD :
- case WebapplicationPackage.LOGIN_CONFIG__FORM_LOGIN_CONFIG : {
- fireNotifyChanged(notification);
- return;
- }
- }
- super.notifyChanged(notification);
- }
-
- /**
- * This adds to the collection of {@link org.eclipse.emf.edit.command.CommandParameter}s
- * describing all of the children that can be created under this object. <!-- begin-user-doc -->
- * <!-- end-user-doc -->
- *
- * @generated
- */
- @Override
- protected void collectNewChildDescriptors(Collection newChildDescriptors, Object object) {
- super.collectNewChildDescriptors(newChildDescriptors, object);
-
- newChildDescriptors.add(createChildParameter(WebapplicationPackage.eINSTANCE.getLoginConfig_FormLoginConfig(), WebapplicationFactory.eINSTANCE.createFormLoginConfig()));
- }
-
- /**
- * Return the resource locator for this item provider's resources. <!-- begin-user-doc --> <!--
- * end-user-doc -->
- *
- * @generated
- */
- @Override
- public ResourceLocator getResourceLocator() {
- return J2EEPlugin.getDefault();
- }
-}
diff --git a/plugins/org.eclipse.jst.j2ee.web/webedit/org/eclipse/jst/j2ee/internal/web/providers/MimeMappingItemProvider.java b/plugins/org.eclipse.jst.j2ee.web/webedit/org/eclipse/jst/j2ee/internal/web/providers/MimeMappingItemProvider.java
deleted file mode 100644
index e216e4f..0000000
--- a/plugins/org.eclipse.jst.j2ee.web/webedit/org/eclipse/jst/j2ee/internal/web/providers/MimeMappingItemProvider.java
+++ /dev/null
@@ -1,178 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2003, 2005 IBM Corporation and others.
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
- *
- * Contributors:
- * IBM Corporation - initial API and implementation
- *******************************************************************************/
-package org.eclipse.jst.j2ee.internal.web.providers;
-
-
-import java.util.Collection;
-import java.util.List;
-
-import org.eclipse.emf.common.notify.AdapterFactory;
-import org.eclipse.emf.common.notify.Notification;
-import org.eclipse.emf.common.util.ResourceLocator;
-import org.eclipse.emf.edit.provider.ComposeableAdapterFactory;
-import org.eclipse.emf.edit.provider.IEditingDomainItemProvider;
-import org.eclipse.emf.edit.provider.IItemLabelProvider;
-import org.eclipse.emf.edit.provider.IItemPropertySource;
-import org.eclipse.emf.edit.provider.ITreeItemContentProvider;
-import org.eclipse.emf.edit.provider.ItemPropertyDescriptor;
-import org.eclipse.jst.j2ee.internal.plugin.J2EEPlugin;
-import org.eclipse.jst.j2ee.internal.web.plugin.WebPlugin;
-import org.eclipse.jst.j2ee.webapplication.MimeMapping;
-import org.eclipse.jst.j2ee.webapplication.WebapplicationPackage;
-
-
-/**
- * This is the item provider adpater for a {@link org.eclipse.jst.j2ee.internal.internal.webapplication.MimeMapping}object.
- */
-public class MimeMappingItemProvider extends WebapplicationItemProviderAdapter implements IEditingDomainItemProvider, IItemLabelProvider, IItemPropertySource, ITreeItemContentProvider {
-
- /**
- * This constructs an instance from a factory and a notifier.
- */
- public MimeMappingItemProvider(AdapterFactory adapterFactory) {
- super(adapterFactory);
- }
-
- /**
- * This returns mime_mapping.gif.
- */
- @Override
- public Object getImage(Object object) {
- return WebPlugin.getDefault().getImage("mime_mapping");//$NON-NLS-1$
- }
-
- /**
- * This returns the webApp of the MimeMapping.
- */
- @Override
- public Object getParent(Object object) {
- return ((MimeMapping) object).getWebApp();
- }
-
- /**
- * This returns the property descriptors for the adapted class.
- */
- @Override
- public List getPropertyDescriptors(Object object) {
- if (itemPropertyDescriptors == null) {
- super.getPropertyDescriptors(object);
-
- WebapplicationPackage pkg = WebapplicationPackage.eINSTANCE;
-
- // This is for the extension feature.
- //
- itemPropertyDescriptors.add(new ItemPropertyDescriptor(((ComposeableAdapterFactory) adapterFactory).getRootAdapterFactory(), WebAppEditResourceHandler.getString("Extension_UI_"), //$NON-NLS-1$ = "Extension"
- WebAppEditResourceHandler.getString("The_extension_property_UI_"), //$NON-NLS-1$ = "The extension property"
- pkg.getMimeMapping_Extension()));
-
- // This is for the mimeType feature.
- //
- itemPropertyDescriptors.add(new ItemPropertyDescriptor(((ComposeableAdapterFactory) adapterFactory).getRootAdapterFactory(), WebAppEditResourceHandler.getString("MimeType_UI_"), //$NON-NLS-1$ = "MimeType"
- WebAppEditResourceHandler.getString("The_mimeType_property_UI_"), //$NON-NLS-1$ = "The mimeType property"
- pkg.getMimeMapping_MimeType()));
-
- // This is for the webApp feature.
- //
- /*
- * itemPropertyDescriptors.add (new ItemPropertyDescriptor
- * (((ComposeableAdapterFactory)adapterFactory).getRootAdapterFactory(),
- * WebAppEditResourceHandler.getString("WebApp_UI_"), //$NON-NLS-1$ = "WebApp"
- * WebAppEditResourceHandler.getString("The_webApp_property_UI_"), //$NON-NLS-1$ = "The
- * webApp property" pkg.getMimeMapping_WebApp()));
- */
-
- }
- return itemPropertyDescriptors;
- }
-
- /**
- * This adds a property descriptor for the Extension feature. <!-- begin-user-doc --> <!--
- * end-user-doc -->
- *
- * @generated
- */
- protected void addExtensionPropertyDescriptor(Object object) {
- itemPropertyDescriptors.add(new ItemPropertyDescriptor(((ComposeableAdapterFactory) adapterFactory).getRootAdapterFactory(), getString("_UI_MimeMapping_extension_feature"), //$NON-NLS-1$
- getString("_UI_PropertyDescriptor_description", "_UI_MimeMapping_extension_feature", "_UI_MimeMapping_type"), //$NON-NLS-1$ //$NON-NLS-2$ //$NON-NLS-3$
- WebapplicationPackage.eINSTANCE.getMimeMapping_Extension(), true, ItemPropertyDescriptor.GENERIC_VALUE_IMAGE));
- }
-
- /**
- * This adds a property descriptor for the Mime Type feature. <!-- begin-user-doc --> <!--
- * end-user-doc -->
- *
- * @generated
- */
- protected void addMimeTypePropertyDescriptor(Object object) {
- itemPropertyDescriptors.add(new ItemPropertyDescriptor(((ComposeableAdapterFactory) adapterFactory).getRootAdapterFactory(), getString("_UI_MimeMapping_mimeType_feature"), //$NON-NLS-1$
- getString("_UI_PropertyDescriptor_description", "_UI_MimeMapping_mimeType_feature", "_UI_MimeMapping_type"), //$NON-NLS-1$ //$NON-NLS-2$ //$NON-NLS-3$
- WebapplicationPackage.eINSTANCE.getMimeMapping_MimeType(), true, ItemPropertyDescriptor.GENERIC_VALUE_IMAGE));
- }
-
-
- @Override
- public String getText(Object object) {
- return WebAppEditResourceHandler.getString("22concat_UI_", (new Object[]{((MimeMapping) object).getExtension()})); //$NON-NLS-1$ = "MimeMapping {0}"
- }
-
- /**
- * This handles notification by calling {@link #fireNotifyChanged fireNotifyChanged}. <!--
- * begin-user-doc --> <!-- end-user-doc -->
- *
- * @generated
- */
- @Override
- public void notifyChanged(Notification notification) {
- switch (notification.getFeatureID(MimeMapping.class)) {
- case WebapplicationPackage.MIME_MAPPING__EXTENSION :
- case WebapplicationPackage.MIME_MAPPING__MIME_TYPE : {
- fireNotifyChanged(notification);
- return;
- }
- }
- super.notifyChanged(notification);
- }
-
- /**
- * This adds to the collection of {@link org.eclipse.emf.edit.command.CommandParameter}s
- * describing all of the children that can be created under this object. <!-- begin-user-doc -->
- * <!-- end-user-doc -->
- *
- * @generated
- */
- @Override
- protected void collectNewChildDescriptors(Collection newChildDescriptors, Object object) {
- super.collectNewChildDescriptors(newChildDescriptors, object);
- }
-
- /**
- * Return the resource locator for this item provider's resources. <!-- begin-user-doc --> <!--
- * end-user-doc -->
- *
- * @generated
- */
- @Override
- public ResourceLocator getResourceLocator() {
- return J2EEPlugin.getDefault();
- }
-
- /**
- * This always returns false. The base class has already implemented
- * {@link org.eclipse.emf.edit.provider.ItemProviderAdapter#getChildren ItemProviderAdapter.getChildren}
- * to return the empty enumeration, and this to check that enumeration, but we know there can't
- * be any children, so this is faster.
- */
- @Override
- public boolean hasChildren(Object object) {
- return false;
- }
-
-}
diff --git a/plugins/org.eclipse.jst.j2ee.web/webedit/org/eclipse/jst/j2ee/internal/web/providers/RoleNameTypeItemProvider.java b/plugins/org.eclipse.jst.j2ee.web/webedit/org/eclipse/jst/j2ee/internal/web/providers/RoleNameTypeItemProvider.java
deleted file mode 100644
index 32528bd..0000000
--- a/plugins/org.eclipse.jst.j2ee.web/webedit/org/eclipse/jst/j2ee/internal/web/providers/RoleNameTypeItemProvider.java
+++ /dev/null
@@ -1,142 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2003, 2005 IBM Corporation and others.
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
- *
- * Contributors:
- * IBM Corporation - initial API and implementation
- *******************************************************************************/
-package org.eclipse.jst.j2ee.internal.web.providers;
-
-
-import java.util.Collection;
-import java.util.List;
-
-import org.eclipse.emf.common.notify.AdapterFactory;
-import org.eclipse.emf.common.notify.Notification;
-import org.eclipse.emf.common.util.ResourceLocator;
-import org.eclipse.emf.edit.provider.ComposeableAdapterFactory;
-import org.eclipse.emf.edit.provider.IEditingDomainItemProvider;
-import org.eclipse.emf.edit.provider.IItemLabelProvider;
-import org.eclipse.emf.edit.provider.IItemPropertySource;
-import org.eclipse.emf.edit.provider.ITreeItemContentProvider;
-import org.eclipse.emf.edit.provider.ItemPropertyDescriptor;
-import org.eclipse.jst.j2ee.internal.plugin.J2EEPlugin;
-import org.eclipse.jst.j2ee.internal.web.plugin.WebPlugin;
-import org.eclipse.jst.j2ee.webapplication.RoleNameType;
-import org.eclipse.jst.j2ee.webapplication.WebapplicationPackage;
-
-
-/**
- * This is the item provider adpater for a {@link org.eclipse.jst.j2ee.internal.internal.webapplication.RoleNameType}
- * object.
- */
-public class RoleNameTypeItemProvider extends WebapplicationItemProviderAdapter implements IEditingDomainItemProvider, IItemLabelProvider, IItemPropertySource, ITreeItemContentProvider {
-
- /**
- * This constructs an instance from a factory and a notifier.
- */
- public RoleNameTypeItemProvider(AdapterFactory adapterFactory) {
- super(adapterFactory);
- }
-
- /**
- * This returns security_role_nametype.gif.
- */
- @Override
- public Object getImage(Object object) {
- return WebPlugin.getDefault().getImage("security_role_nametype");//$NON-NLS-1$
- }
-
- /**
- * This returns the property descriptors for the adapted class.
- */
- @Override
- public List getPropertyDescriptors(Object object) {
- if (itemPropertyDescriptors == null) {
- super.getPropertyDescriptors(object);
-
- WebapplicationPackage pkg = WebapplicationPackage.eINSTANCE;
-
- // This is for the roleName feature.
- //
- itemPropertyDescriptors.add(new ItemPropertyDescriptor(((ComposeableAdapterFactory) adapterFactory).getRootAdapterFactory(), WebAppEditResourceHandler.getString("RoleName_UI_"), //$NON-NLS-1$ = "RoleName"
- WebAppEditResourceHandler.getString("The_roleName_property_UI_"), //$NON-NLS-1$ = "The roleName property"
- pkg.getRoleNameType_RoleName()));
-
- }
- return itemPropertyDescriptors;
- }
-
- /**
- * This adds a property descriptor for the Role Name feature. <!-- begin-user-doc --> <!--
- * end-user-doc -->
- *
- * @generated
- */
- protected void addRoleNamePropertyDescriptor(Object object) {
- itemPropertyDescriptors.add(new ItemPropertyDescriptor(((ComposeableAdapterFactory) adapterFactory).getRootAdapterFactory(), getString("_UI_RoleNameType_roleName_feature"), //$NON-NLS-1$
- getString("_UI_PropertyDescriptor_description", "_UI_RoleNameType_roleName_feature", "_UI_RoleNameType_type"), //$NON-NLS-1$ //$NON-NLS-2$ //$NON-NLS-3$
- WebapplicationPackage.eINSTANCE.getRoleNameType_RoleName(), true, ItemPropertyDescriptor.GENERIC_VALUE_IMAGE));
- }
-
-
- @Override
- public String getText(Object object) {
- return WebAppEditResourceHandler.getString("23concat_UI_", (new Object[]{((RoleNameType) object).getRoleName()})); //$NON-NLS-1$ = "RoleNameType {0}"
- }
-
- /**
- * This handles notification by calling {@link #fireNotifyChanged fireNotifyChanged}. <!--
- * begin-user-doc --> <!-- end-user-doc -->
- *
- * @generated
- */
- @Override
- public void notifyChanged(Notification notification) {
- switch (notification.getFeatureID(RoleNameType.class)) {
- case WebapplicationPackage.ROLE_NAME_TYPE__ROLE_NAME : {
- fireNotifyChanged(notification);
- return;
- }
- }
- super.notifyChanged(notification);
- }
-
- /**
- * This adds to the collection of {@link org.eclipse.emf.edit.command.CommandParameter}s
- * describing all of the children that can be created under this object. <!-- begin-user-doc -->
- * <!-- end-user-doc -->
- *
- * @generated
- */
- @Override
- protected void collectNewChildDescriptors(Collection newChildDescriptors, Object object) {
- super.collectNewChildDescriptors(newChildDescriptors, object);
- }
-
- /**
- * Return the resource locator for this item provider's resources. <!-- begin-user-doc --> <!--
- * end-user-doc -->
- *
- * @generated
- */
- @Override
- public ResourceLocator getResourceLocator() {
- return J2EEPlugin.getDefault();
- }
-
- /**
- * This always returns false. The base class has already implemented
- * {@link org.eclipse.emf.edit.provider.ItemProviderAdapter#getChildren ItemProviderAdapter.getChildren}
- * to return the empty enumeration, and this to check that enumeration, but we know there can't
- * be any children, so this is faster.
- */
- @Override
- public boolean hasChildren(Object object) {
- return false;
- }
-
-}
diff --git a/plugins/org.eclipse.jst.j2ee.web/webedit/org/eclipse/jst/j2ee/internal/web/providers/SecurityConstraintItemProvider.java b/plugins/org.eclipse.jst.j2ee.web/webedit/org/eclipse/jst/j2ee/internal/web/providers/SecurityConstraintItemProvider.java
deleted file mode 100644
index 08a2e4d..0000000
--- a/plugins/org.eclipse.jst.j2ee.web/webedit/org/eclipse/jst/j2ee/internal/web/providers/SecurityConstraintItemProvider.java
+++ /dev/null
@@ -1,256 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2003, 2005 IBM Corporation and others.
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
- *
- * Contributors:
- * IBM Corporation - initial API and implementation
- *******************************************************************************/
-package org.eclipse.jst.j2ee.internal.web.providers;
-
-import java.util.ArrayList;
-import java.util.Collection;
-import java.util.List;
-
-import org.eclipse.emf.common.notify.AdapterFactory;
-import org.eclipse.emf.common.notify.Notification;
-import org.eclipse.emf.common.util.ResourceLocator;
-import org.eclipse.emf.ecore.EObject;
-import org.eclipse.emf.ecore.EReference;
-import org.eclipse.emf.edit.command.AddCommand;
-import org.eclipse.emf.edit.command.RemoveCommand;
-import org.eclipse.emf.edit.provider.ComposeableAdapterFactory;
-import org.eclipse.emf.edit.provider.IEditingDomainItemProvider;
-import org.eclipse.emf.edit.provider.IItemLabelProvider;
-import org.eclipse.emf.edit.provider.IItemPropertySource;
-import org.eclipse.emf.edit.provider.ITreeItemContentProvider;
-import org.eclipse.emf.edit.provider.ItemPropertyDescriptor;
-import org.eclipse.jst.j2ee.common.CommonFactory;
-import org.eclipse.jst.j2ee.common.DisplayName;
-import org.eclipse.jst.j2ee.internal.plugin.J2EEPlugin;
-import org.eclipse.jst.j2ee.internal.web.plugin.WebPlugin;
-import org.eclipse.jst.j2ee.webapplication.SecurityConstraint;
-import org.eclipse.jst.j2ee.webapplication.WebResourceCollection;
-import org.eclipse.jst.j2ee.webapplication.WebapplicationFactory;
-import org.eclipse.jst.j2ee.webapplication.WebapplicationPackage;
-import org.eclipse.jst.j2ee.webservice.wscommon.WscommonFactory;
-
-/**
- * This is the item provider adpater for a {@link org.eclipse.jst.j2ee.internal.internal.webapplication.SecurityConstraint}
- * object.
- */
-public class SecurityConstraintItemProvider extends WebapplicationItemProviderAdapter implements IEditingDomainItemProvider, IItemLabelProvider, IItemPropertySource, ITreeItemContentProvider {
-
- /**
- * This constructs an instance from a factory and a notifier.
- */
- public SecurityConstraintItemProvider(AdapterFactory adapterFactory) {
- super(adapterFactory);
- }
-
- /**
- * This creates a new child for {@link org.eclipse.jst.j2ee.internal.internal.webapplication.commandCreateChildCommand}.
- */
- @Override
- public Object createChild(Object object) {
- // TODO: check that this is what you want.
- WebResourceCollection child = WebapplicationFactory.eINSTANCE.createWebResourceCollection();
-
- // TODO: initialize child here...
-
- return child;
- }
-
- /**
- * This specifies how to implement {@link #getChildren}and {@link AddCommand}and
- * {@link RemoveCommand}support in {@link #createCommand}.
- */
- @Override
- public Collection getChildrenReferences(Object object) {
- WebapplicationPackage pkg = WebapplicationPackage.eINSTANCE;
- Collection result = new ArrayList();
- result.add(pkg.getSecurityConstraint_WebResourceCollections());
- result.add(pkg.getSecurityConstraint_AuthConstraint());
- result.add(pkg.getSecurityConstraint_UserDataConstraint());
- return result;
- }
-
- /**
- * <!-- begin-user-doc --> <!-- end-user-doc -->
- *
- * @generated
- */
- @Override
- protected EReference getChildReference(Object object, Object child) {
- // Check the type of the specified child object and return the proper feature to use for
- // adding (see {@link AddCommand}) it as a child.
-
- return super.getChildReference(object, child);
- }
-
-
- /**
- * This returns the image for {@link org.eclipse.jst.j2ee.internal.internal.webapplication.commandCreateChildCommand}.
- */
- @Override
- public Object getCreateChildImage(Object object) {
- EObject refObject = (EObject) object;
- return WebPlugin.getDefault().getImage(refObject.eClass().getName() + "CreateWebResourceCollection"); //$NON-NLS-1$
- }
-
- /**
- * This returns the label for {@link org.eclipse.jst.j2ee.internal.internal.webapplication.commandCreateChildCommand}.
- */
- @Override
- public String getCreateChildText(Object object) {
- return WebAppEditResourceHandler.getString("Create_WebResourceCollecti_UI_"); //$NON-NLS-1$ = "Create WebResourceCollection"
- }
-
- /**
- * This returns the help text for
- * {@link org.eclipse.jst.j2ee.internal.internal.webapplication.commandCreateChildCommand}.
- */
- @Override
- public String getCreateChildToolTipText(Object object) {
- EObject refObject = (EObject) object;
- return WebAppEditResourceHandler.getString("24concat", (new Object[]{refObject.eClass().getName()})); //$NON-NLS-1$ = "Create a child of type WebResourceCollection for the selected {0}."
- }
-
- /**
- * This returns security_constraint.gif.
- */
- @Override
- public Object getImage(Object object) {
- return WebPlugin.getDefault().getImage("security_constraint"); //$NON-NLS-1$
- }
-
- /**
- * This returns the webApp of the SecurityConstraint.
- */
- @Override
- public Object getParent(Object object) {
- return ((SecurityConstraint) object).getWebApp();
- }
-
- /**
- * This returns the property descriptors for the adapted class.
- */
- @Override
- public List getPropertyDescriptors(Object object) {
- if (itemPropertyDescriptors == null) {
- super.getPropertyDescriptors(object);
-
- WebapplicationPackage pkg = WebapplicationPackage.eINSTANCE;
-
- // This is for the webApp feature.
- //
- /*
- * itemPropertyDescriptors.add (new ItemPropertyDescriptor
- * (((ComposeableAdapterFactory)adapterFactory).getRootAdapterFactory(),
- * WebAppEditResourceHandler.getString("WebApp_UI_"), //$NON-NLS-1$ = "WebApp"
- * WebAppEditResourceHandler.getString("The_webApp_property_UI_"), //$NON-NLS-1$ = "The
- * webApp property" pkg.getSecurityConstraint_WebApp()));
- */
-
- // This is for the displayName feature.
- itemPropertyDescriptors.add(new ItemPropertyDescriptor(((ComposeableAdapterFactory) adapterFactory).getRootAdapterFactory(), WebAppEditResourceHandler.getString("DisplayName_UI_"), //$NON-NLS-1$ = "DisplayName"
- WebAppEditResourceHandler.getString("The_displayName_property_UI_"), //$NON-NLS-1$ = "The displayName property"
- pkg.getSecurityConstraint_DisplayName()));
-
- // This is for the authConstraint feature.
- //
- itemPropertyDescriptors.add(new ItemPropertyDescriptor(((ComposeableAdapterFactory) adapterFactory).getRootAdapterFactory(), WebAppEditResourceHandler.getString("AuthConstraint_UI_"), //$NON-NLS-1$ = "AuthConstraint"
- WebAppEditResourceHandler.getString("The_authConstraint_propert_UI_"), //$NON-NLS-1$ = "The authConstraint property"
- pkg.getSecurityConstraint_AuthConstraint()));
-
- // This is for the userDataConstraint feature.
- //
- itemPropertyDescriptors.add(new ItemPropertyDescriptor(((ComposeableAdapterFactory) adapterFactory).getRootAdapterFactory(), WebAppEditResourceHandler.getString("UserDataConstraint_UI_"), //$NON-NLS-1$ = "UserDataConstraint"
- WebAppEditResourceHandler.getString("The_userDataConstraint_pro_UI_"), //$NON-NLS-1$ = "The userDataConstraint property"
- pkg.getSecurityConstraint_UserDataConstraint()));
-
- }
- return itemPropertyDescriptors;
- }
-
- /**
- * This adds a property descriptor for the Display Name feature. <!-- begin-user-doc --> <!--
- * end-user-doc -->
- *
- * @generated
- */
- protected void addDisplayNamePropertyDescriptor(Object object) {
- itemPropertyDescriptors.add(new ItemPropertyDescriptor(((ComposeableAdapterFactory) adapterFactory).getRootAdapterFactory(), getString("_UI_SecurityConstraint_displayName_feature"), //$NON-NLS-1$
- getString("_UI_PropertyDescriptor_description", "_UI_SecurityConstraint_displayName_feature", "_UI_SecurityConstraint_type"), //$NON-NLS-1$ //$NON-NLS-2$ //$NON-NLS-3$
- WebapplicationPackage.eINSTANCE.getSecurityConstraint_DisplayName(), true, ItemPropertyDescriptor.GENERIC_VALUE_IMAGE));
- }
-
- @Override
- public String getText(Object object) {
- String displayName = ((SecurityConstraint) object).getDisplayName();
- if (displayName == null) {
- List displayNameList = ((SecurityConstraint) object).getDisplayNames();
- if (displayNameList != null && displayNameList.size() > 0)
- displayName = ((DisplayName) displayNameList.get(0)).getValue();
- }
- if (displayName == null)
- displayName = ""; //$NON-NLS-1$
- return " " + displayName; //$NON-NLS-1$
- }
-
- /**
- * This handles notification by calling {@link #fireNotifyChanged fireNotifyChanged}. <!--
- * begin-user-doc --> <!-- end-user-doc -->
- *
- * @generated
- */
- @Override
- public void notifyChanged(Notification notification) {
- switch (notification.getFeatureID(SecurityConstraint.class)) {
- case WebapplicationPackage.SECURITY_CONSTRAINT__DISPLAY_NAME :
- case WebapplicationPackage.SECURITY_CONSTRAINT__WEB_RESOURCE_COLLECTIONS :
- case WebapplicationPackage.SECURITY_CONSTRAINT__AUTH_CONSTRAINT :
- case WebapplicationPackage.SECURITY_CONSTRAINT__USER_DATA_CONSTRAINT :
- case WebapplicationPackage.SECURITY_CONSTRAINT__DISPLAY_NAMES : {
- fireNotifyChanged(notification);
- return;
- }
- }
- super.notifyChanged(notification);
- }
-
- /**
- * This adds to the collection of {@link org.eclipse.emf.edit.command.CommandParameter}s
- * describing all of the children that can be created under this object. <!-- begin-user-doc -->
- * <!-- end-user-doc -->
- *
- * @generated
- */
- @Override
- protected void collectNewChildDescriptors(Collection newChildDescriptors, Object object) {
- super.collectNewChildDescriptors(newChildDescriptors, object);
-
- newChildDescriptors.add(createChildParameter(WebapplicationPackage.eINSTANCE.getSecurityConstraint_WebResourceCollections(), WebapplicationFactory.eINSTANCE.createWebResourceCollection()));
-
- newChildDescriptors.add(createChildParameter(WebapplicationPackage.eINSTANCE.getSecurityConstraint_AuthConstraint(), WebapplicationFactory.eINSTANCE.createAuthConstraint()));
-
- newChildDescriptors.add(createChildParameter(WebapplicationPackage.eINSTANCE.getSecurityConstraint_UserDataConstraint(), WebapplicationFactory.eINSTANCE.createUserDataConstraint()));
-
- newChildDescriptors.add(createChildParameter(WebapplicationPackage.eINSTANCE.getSecurityConstraint_DisplayNames(), CommonFactory.eINSTANCE.createDisplayName()));
-
- newChildDescriptors.add(createChildParameter(WebapplicationPackage.eINSTANCE.getSecurityConstraint_DisplayNames(), WscommonFactory.eINSTANCE.createDisplayNameType()));
- }
-
- /**
- * Return the resource locator for this item provider's resources. <!-- begin-user-doc --> <!--
- * end-user-doc -->
- *
- * @generated
- */
- @Override
- public ResourceLocator getResourceLocator() {
- return J2EEPlugin.getDefault();
- }
-}
diff --git a/plugins/org.eclipse.jst.j2ee.web/webedit/org/eclipse/jst/j2ee/internal/web/providers/ServletItemProvider.java b/plugins/org.eclipse.jst.j2ee.web/webedit/org/eclipse/jst/j2ee/internal/web/providers/ServletItemProvider.java
deleted file mode 100644
index 82a76b5..0000000
--- a/plugins/org.eclipse.jst.j2ee.web/webedit/org/eclipse/jst/j2ee/internal/web/providers/ServletItemProvider.java
+++ /dev/null
@@ -1,307 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2003, 2005 IBM Corporation and others.
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
- *
- * Contributors:
- * IBM Corporation - initial API and implementation
- *******************************************************************************/
-package org.eclipse.jst.j2ee.internal.web.providers;
-
-import java.util.ArrayList;
-import java.util.Collection;
-import java.util.List;
-
-import org.eclipse.emf.common.notify.AdapterFactory;
-import org.eclipse.emf.common.notify.Notification;
-import org.eclipse.emf.common.util.ResourceLocator;
-import org.eclipse.emf.ecore.EObject;
-import org.eclipse.emf.ecore.EReference;
-import org.eclipse.emf.edit.command.AddCommand;
-import org.eclipse.emf.edit.command.RemoveCommand;
-import org.eclipse.emf.edit.provider.ComposeableAdapterFactory;
-import org.eclipse.emf.edit.provider.IItemPropertySource;
-import org.eclipse.emf.edit.provider.ItemPropertyDescriptor;
-import org.eclipse.jst.j2ee.common.CommonFactory;
-import org.eclipse.jst.j2ee.common.internal.provider.CompatibilityDescriptionGroupItemProvider;
-import org.eclipse.jst.j2ee.internal.J2EEVersionConstants;
-import org.eclipse.jst.j2ee.internal.plugin.J2EEPlugin;
-import org.eclipse.jst.j2ee.internal.web.plugin.WebPlugin;
-import org.eclipse.jst.j2ee.webapplication.InitParam;
-import org.eclipse.jst.j2ee.webapplication.Servlet;
-import org.eclipse.jst.j2ee.webapplication.WebApp;
-import org.eclipse.jst.j2ee.webapplication.WebType;
-import org.eclipse.jst.j2ee.webapplication.WebapplicationFactory;
-import org.eclipse.jst.j2ee.webapplication.WebapplicationPackage;
-
-public class ServletItemProvider extends CompatibilityDescriptionGroupItemProvider {
-
-
- /**
- * This constructs an instance from a factory and a notifier.
- */
- public ServletItemProvider(AdapterFactory adapterFactory) {
- super(adapterFactory);
- }
-
- /**
- * This creates a new child for {@link org.eclipse.jst.j2ee.internal.internal.webapplication.commandCreateChildCommand}.
- */
- public Object createChild(Object object) {
- // TODO: check that this is what you want.
- InitParam child = WebapplicationFactory.eINSTANCE.createInitParam();
-
- // TODO: initialize child here...
-
- return child;
- }
-
- /**
- * This specifies how to implement {@link #getChildren}and {@link AddCommand}and
- * {@link RemoveCommand}support in {@link #createCommand}.
- */
- @Override
- public Collection getChildrenReferences(Object object) {
- WebapplicationPackage pkg = WebapplicationPackage.eINSTANCE;
- Collection result = new ArrayList();
- //result.add(pkg.getServlet_WebType());
- WebApp webApp = (WebApp) ((Servlet) object).eContainer();
- if (webApp == null)
- return result;
- if (webApp.getJ2EEVersionID() >= J2EEVersionConstants.J2EE_1_4_ID)
- result.add(pkg.getServlet_InitParams());
- else
- result.add(pkg.getServlet_Params());
- result.add(pkg.getServlet_SecurityRoleRefs());
- result.add(pkg.getServlet_RunAs());
- return result;
- }
-
- /**
- * <!-- begin-user-doc --> <!-- end-user-doc -->
- *
- * @generated
- */
- @Override
- protected EReference getChildReference(Object object, Object child) {
- // Check the type of the specified child object and return the proper feature to use for
- // adding (see {@link AddCommand}) it as a child.
-
- return super.getChildReference(object, child);
- }
-
-
- /**
- * This returns the image for {@link org.eclipse.jst.j2ee.internal.internal.webapplication.commandCreateChildCommand}.
- */
- public Object getCreateChildImage(Object object) {
- EObject refObject = (EObject) object;
- return WebPlugin.getDefault().getImage(refObject.eClass().getName() + "CreateInitParam"); //$NON-NLS-1$
- }
-
- /**
- * This returns the label for {@link org.eclipse.jst.j2ee.internal.internal.webapplication.commandCreateChildCommand}.
- */
- public String getCreateChildText(Object object) {
- return WebAppEditResourceHandler.getString("Create_InitParam_UI_"); //$NON-NLS-1$ = "Create InitParam"
- }
-
- /**
- * This returns the help text for
- * {@link org.eclipse.jst.j2ee.internal.internal.webapplication.commandCreateChildCommand}.
- */
- public String getCreateChildToolTipText(Object object) {
- EObject refObject = (EObject) object;
- return WebAppEditResourceHandler.getString("26concat_UI_", (new Object[]{refObject.eClass().getName()})); //$NON-NLS-1$ = "Create a child of type InitParam for the selected {0}."
- }
-
- /**
- * This returns Servlet.gif.
- */
- @Override
- public Object getImage(Object object) {
- WebType wt = ((Servlet) object).getWebType();
- if (wt != null && wt.isJspType())
- return WebPlugin.getDefault().getImage("jsp_type"); //$NON-NLS-1$
-
- return WebPlugin.getDefault().getImage("servlet"); //$NON-NLS-1$
- }
-
- /**
- * This returns the webApp of the Servlet.
- */
- @Override
- public Object getParent(Object object) {
- return ((Servlet) object).getWebApp();
- }
-
- /**
- * This returns the property descriptors for the adapted class.
- */
- @Override
- public List getPropertyDescriptors(Object object) {
- if (itemPropertyDescriptors == null) {
- super.getPropertyDescriptors(object);
-
- WebapplicationPackage pkg = WebapplicationPackage.eINSTANCE;
-
- // This is for the servletName feature.
- //
- itemPropertyDescriptors.add(new ItemPropertyDescriptor(((ComposeableAdapterFactory) adapterFactory).getRootAdapterFactory(), WebAppEditResourceHandler.getString("ServletName_UI_"), //$NON-NLS-1$
- //$NON-NLS-1$ = "ServletName"
- WebAppEditResourceHandler.getString("The_servletName_property_UI_"), //$NON-NLS-1$ = "The servletName property"
- pkg.getServlet_ServletName()));
-
-
- // This is for the loadOnStartup feature.
- //
- itemPropertyDescriptors.add(new ItemPropertyDescriptor(((ComposeableAdapterFactory) adapterFactory).getRootAdapterFactory(), WebAppEditResourceHandler.getString("LoadOnStartup_UI_"), //$NON-NLS-1$
- //$NON-NLS-1$ = "LoadOnStartup"
- WebAppEditResourceHandler.getString("The_loadOnStartup_property_UI_"), //$NON-NLS-1$ = "The loadOnStartup property"
- pkg.getServlet_LoadOnStartup(), false));
-
- }
- return itemPropertyDescriptors;
- }
-
- /**
- * This adds a property descriptor for the Servlet Name feature. <!-- begin-user-doc --> <!--
- * end-user-doc -->
- *
- * @generated
- */
- protected void addServletNamePropertyDescriptor(Object object) {
- itemPropertyDescriptors.add(new ItemPropertyDescriptor(((ComposeableAdapterFactory) adapterFactory).getRootAdapterFactory(), getString("_UI_Servlet_servletName_feature"), //$NON-NLS-1$
- getString("_UI_PropertyDescriptor_description", "_UI_Servlet_servletName_feature", "_UI_Servlet_type"), //$NON-NLS-1$ //$NON-NLS-2$ //$NON-NLS-3$
- WebapplicationPackage.eINSTANCE.getServlet_ServletName(), true, ItemPropertyDescriptor.GENERIC_VALUE_IMAGE));
- }
-
- /**
- * This adds a property descriptor for the Load On Startup feature. <!-- begin-user-doc --> <!--
- * end-user-doc -->
- *
- * @generated
- */
- protected void addLoadOnStartupPropertyDescriptor(Object object) {
- itemPropertyDescriptors.add(new ItemPropertyDescriptor(((ComposeableAdapterFactory) adapterFactory).getRootAdapterFactory(), getString("_UI_Servlet_loadOnStartup_feature"), //$NON-NLS-1$
- getString("_UI_PropertyDescriptor_description", "_UI_Servlet_loadOnStartup_feature", "_UI_Servlet_type"), //$NON-NLS-1$ //$NON-NLS-2$ //$NON-NLS-3$
- WebapplicationPackage.eINSTANCE.getServlet_LoadOnStartup(), true, ItemPropertyDescriptor.GENERIC_VALUE_IMAGE));
- }
-
- /**
- * This implements
- * {@link IItemPropertySource#getPropertyValue IItemPropertySource.getPropertyValue}by
- * delegating to the descriptor, which is assumed to support the IItemPropertyDescriptor
- * interface
- */
- @Override
- public Object getPropertyValue(Object object, String property) {
- Object ret = null;
- if (getPropertyDescriptor(object, property) instanceof WebToolingItemPropertyDescriptor) {
- ret = ((WebToolingItemPropertyDescriptor) getPropertyDescriptor(object, property)).getPropertyValue(object);
- } else
- ret = super.getPropertyValue(object, property);
- return ret;
- }
-
- @Override
- public String getText(Object object) {
- Servlet servlet = (Servlet) object;
- String name = servlet.getServletName();
- if (name == null)
- name = WebAppEditResourceHandler.getString("<servlet>_UI_"); //$NON-NLS-1$ = "<servlet>"
- return name;
- }
-
- /**
- * This handles notification by calling {@link #fireNotifyChanged fireNotifyChanged}. <!--
- * begin-user-doc --> <!-- end-user-doc -->
- *
- * @generated
- */
- @Override
- public void notifyChanged(Notification notification) {
- switch (notification.getFeatureID(Servlet.class)) {
- case WebapplicationPackage.SERVLET__SERVLET_NAME :
- case WebapplicationPackage.SERVLET__LOAD_ON_STARTUP :
- case WebapplicationPackage.SERVLET__WEB_TYPE :
- case WebapplicationPackage.SERVLET__PARAMS :
- case WebapplicationPackage.SERVLET__SECURITY_ROLE_REFS :
- case WebapplicationPackage.SERVLET__RUN_AS :
- case WebapplicationPackage.SERVLET__INIT_PARAMS : {
- fireNotifyChanged(notification);
- return;
- }
- }
- super.notifyChanged(notification);
- }
-
- /**
- * This adds to the collection of {@link org.eclipse.emf.edit.command.CommandParameter}s
- * describing all of the children that can be created under this object. <!-- begin-user-doc -->
- * <!-- end-user-doc -->
- *
- * @generated
- */
- @Override
- protected void collectNewChildDescriptors(Collection newChildDescriptors, Object object) {
- super.collectNewChildDescriptors(newChildDescriptors, object);
-
- newChildDescriptors.add(createChildParameter(WebapplicationPackage.eINSTANCE.getServlet_WebType(), WebapplicationFactory.eINSTANCE.createServletType()));
-
- newChildDescriptors.add(createChildParameter(WebapplicationPackage.eINSTANCE.getServlet_WebType(), WebapplicationFactory.eINSTANCE.createJSPType()));
-
- newChildDescriptors.add(createChildParameter(WebapplicationPackage.eINSTANCE.getServlet_Params(), WebapplicationFactory.eINSTANCE.createInitParam()));
-
- newChildDescriptors.add(createChildParameter(WebapplicationPackage.eINSTANCE.getServlet_SecurityRoleRefs(), CommonFactory.eINSTANCE.createSecurityRoleRef()));
-
- newChildDescriptors.add(createChildParameter(WebapplicationPackage.eINSTANCE.getServlet_RunAs(), CommonFactory.eINSTANCE.createRunAsSpecifiedIdentity()));
-
- newChildDescriptors.add(createChildParameter(WebapplicationPackage.eINSTANCE.getServlet_InitParams(), CommonFactory.eINSTANCE.createParamValue()));
- }
-
- /**
- * Return the resource locator for this item provider's resources. <!-- begin-user-doc --> <!--
- * end-user-doc -->
- *
- * @generated
- */
- @Override
- public ResourceLocator getResourceLocator() {
- return J2EEPlugin.getDefault();
- }
-
- /**
- * This implements {@link IItemPropertySource#isPropertySet IItemPropertySource.isPropertySet}
- * by delegating to the descriptor, which is assumed to support the IItemPropertyDescriptor
- * interface
- */
- @Override
- public boolean isPropertySet(Object object, String property) {
- boolean ret = false;
- if (getPropertyDescriptor(object, property) instanceof WebToolingItemPropertyDescriptor) {
- ret = ((WebToolingItemPropertyDescriptor) getPropertyDescriptor(object, property)).isPropertySet(object);
- } else
- ret = super.isPropertySet(object, property);
- return ret;
- }
-
-
- /**
- * This implements
- * {@link IItemPropertySource#setPropertyValue IItemPropertySource.setPropertyValue}by
- * delegating to the descriptor, which is assumed to support the IItemPropertyDescriptor
- * interface
- */
- @Override
- public void setPropertyValue(Object object, String property, Object value) {
-
- if (getPropertyDescriptor(object, property) instanceof WebToolingItemPropertyDescriptor) {
- ((WebToolingItemPropertyDescriptor) getPropertyDescriptor(object, property)).setPropertyValue(object, value);
- } else
- super.setPropertyValue(object, property, value);
-
- }
-}
diff --git a/plugins/org.eclipse.jst.j2ee.web/webedit/org/eclipse/jst/j2ee/internal/web/providers/ServletMappingItemProvider.java b/plugins/org.eclipse.jst.j2ee.web/webedit/org/eclipse/jst/j2ee/internal/web/providers/ServletMappingItemProvider.java
deleted file mode 100644
index 1c9463b..0000000
--- a/plugins/org.eclipse.jst.j2ee.web/webedit/org/eclipse/jst/j2ee/internal/web/providers/ServletMappingItemProvider.java
+++ /dev/null
@@ -1,184 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2003, 2005 IBM Corporation and others.
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
- *
- * Contributors:
- * IBM Corporation - initial API and implementation
- *******************************************************************************/
-package org.eclipse.jst.j2ee.internal.web.providers;
-
-import java.util.Collection;
-import java.util.List;
-
-import org.eclipse.emf.common.notify.AdapterFactory;
-import org.eclipse.emf.common.notify.Notification;
-import org.eclipse.emf.common.util.ResourceLocator;
-import org.eclipse.emf.edit.provider.ComposeableAdapterFactory;
-import org.eclipse.emf.edit.provider.IEditingDomainItemProvider;
-import org.eclipse.emf.edit.provider.IItemLabelProvider;
-import org.eclipse.emf.edit.provider.IItemPropertySource;
-import org.eclipse.emf.edit.provider.ITreeItemContentProvider;
-import org.eclipse.emf.edit.provider.ItemPropertyDescriptor;
-import org.eclipse.jst.j2ee.internal.plugin.J2EEPlugin;
-import org.eclipse.jst.j2ee.internal.web.plugin.WebPlugin;
-import org.eclipse.jst.j2ee.webapplication.Servlet;
-import org.eclipse.jst.j2ee.webapplication.ServletMapping;
-import org.eclipse.jst.j2ee.webapplication.WebapplicationPackage;
-
-
-/**
- * This is the item provider adpater for a {@link org.eclipse.jst.j2ee.internal.internal.webapplication.ServletMapping}
- * object.
- */
-public class ServletMappingItemProvider extends WebapplicationItemProviderAdapter implements IEditingDomainItemProvider, IItemLabelProvider, IItemPropertySource, ITreeItemContentProvider {
-
- /**
- * This constructs an instance from a factory and a notifier.
- */
- public ServletMappingItemProvider(AdapterFactory adapterFactory) {
- super(adapterFactory);
- }
-
- /**
- * This returns servlet_mapping.gif.
- */
- @Override
- public Object getImage(Object object) {
- return WebPlugin.getDefault().getImage("servlet_mapping");//$NON-NLS-1$
- }
-
- /**
- * This returns the webApp of the ServletMapping.
- */
- @Override
- public Object getParent(Object object) {
- return ((ServletMapping) object).getWebApp();
- }
-
- /**
- * This returns the property descriptors for the adapted class.
- */
- @Override
- public List getPropertyDescriptors(Object object) {
- if (itemPropertyDescriptors == null) {
- super.getPropertyDescriptors(object);
-
- WebapplicationPackage pkg = WebapplicationPackage.eINSTANCE;
-
- // This is for the urlPattern feature.
- //
- itemPropertyDescriptors.add(new ItemPropertyDescriptor(((ComposeableAdapterFactory) adapterFactory).getRootAdapterFactory(), WebAppEditResourceHandler.getString("UrlPattern_UI_"), //$NON-NLS-1$ = "UrlPattern"
- WebAppEditResourceHandler.getString("The_urlPattern_property_UI_"), //$NON-NLS-1$ = "The urlPattern property"
- pkg.getServletMapping_UrlPattern()));
-
-
- // This is for the servlet feature.
- //
- itemPropertyDescriptors.add(new ItemPropertyDescriptor(((ComposeableAdapterFactory) adapterFactory).getRootAdapterFactory(), WebAppEditResourceHandler.getString("Servlet_UI_"), //$NON-NLS-1$ = "Servlet"
- WebAppEditResourceHandler.getString("The_servlet_property_UI_"), //$NON-NLS-1$ = "The servlet property"
- pkg.getServletMapping_Servlet(), false));
-
- }
- return itemPropertyDescriptors;
- }
-
- /**
- * This adds a property descriptor for the Url Pattern feature. <!-- begin-user-doc --> <!--
- * end-user-doc -->
- *
- * @generated
- */
- protected void addUrlPatternPropertyDescriptor(Object object) {
- itemPropertyDescriptors.add(new ItemPropertyDescriptor(((ComposeableAdapterFactory) adapterFactory).getRootAdapterFactory(), getString("_UI_ServletMapping_urlPattern_feature"), //$NON-NLS-1$
- getString("_UI_PropertyDescriptor_description", "_UI_ServletMapping_urlPattern_feature", "_UI_ServletMapping_type"), //$NON-NLS-1$ //$NON-NLS-2$ //$NON-NLS-3$
- WebapplicationPackage.eINSTANCE.getServletMapping_UrlPattern(), true, ItemPropertyDescriptor.GENERIC_VALUE_IMAGE));
- }
-
- /**
- * This adds a property descriptor for the Name feature. <!-- begin-user-doc --> <!--
- * end-user-doc -->
- *
- * @generated
- */
- protected void addNamePropertyDescriptor(Object object) {
- itemPropertyDescriptors.add(new ItemPropertyDescriptor(((ComposeableAdapterFactory) adapterFactory).getRootAdapterFactory(), getString("_UI_ServletMapping_name_feature"), //$NON-NLS-1$
- getString("_UI_PropertyDescriptor_description", "_UI_ServletMapping_name_feature", "_UI_ServletMapping_type"), //$NON-NLS-1$ //$NON-NLS-2$ //$NON-NLS-3$
- WebapplicationPackage.eINSTANCE.getServletMapping_Name(), true, ItemPropertyDescriptor.GENERIC_VALUE_IMAGE));
- }
-
- /**
- * This adds a property descriptor for the Servlet feature. <!-- begin-user-doc --> <!--
- * end-user-doc -->
- *
- * @generated
- */
- protected void addServletPropertyDescriptor(Object object) {
- itemPropertyDescriptors.add(new ItemPropertyDescriptor(((ComposeableAdapterFactory) adapterFactory).getRootAdapterFactory(), getString("_UI_ServletMapping_servlet_feature"), //$NON-NLS-1$
- getString("_UI_PropertyDescriptor_description", "_UI_ServletMapping_servlet_feature", "_UI_ServletMapping_type"), //$NON-NLS-1$ //$NON-NLS-2$ //$NON-NLS-3$
- WebapplicationPackage.eINSTANCE.getServletMapping_Servlet(), false));
- }
-
-
- @Override
- public String getText(Object object) {
- String urlStr = ((ServletMapping) object).getUrlPattern();
- Servlet servlet = ((ServletMapping) object).getServlet();
- String servletStr = (servlet == null) ? WebAppEditResourceHandler.getString("?_UI_") : servlet.getServletName(); //$NON-NLS-1$ = "?"
- return WebAppEditResourceHandler.getString("28concat_UI_", (new Object[]{urlStr, servletStr})); //$NON-NLS-1$ = "Servlet mapping ({0} -> {1})"
- }
-
- /**
- * This handles notification by calling {@link #fireNotifyChanged fireNotifyChanged}. <!--
- * begin-user-doc --> <!-- end-user-doc -->
- */
- @Override
- public void notifyChanged(Notification notification) {
- switch (notification.getFeatureID(ServletMapping.class)) {
- case WebapplicationPackage.SERVLET_MAPPING__URL_PATTERN :
- case WebapplicationPackage.SERVLET_MAPPING__NAME :
- case WebapplicationPackage.SERVLET_MAPPING__SERVLET : {
- fireNotifyChanged(notification);
- return;
- }
- }
- super.notifyChanged(notification);
- }
-
- /**
- * This adds to the collection of {@link org.eclipse.emf.edit.command.CommandParameter}s
- * describing all of the children that can be created under this object. <!-- begin-user-doc -->
- * <!-- end-user-doc -->
- *
- * @generated
- */
- @Override
- protected void collectNewChildDescriptors(Collection newChildDescriptors, Object object) {
- super.collectNewChildDescriptors(newChildDescriptors, object);
- }
-
- /**
- * Return the resource locator for this item provider's resources. <!-- begin-user-doc --> <!--
- * end-user-doc -->
- *
- * @generated
- */
- @Override
- public ResourceLocator getResourceLocator() {
- return J2EEPlugin.getDefault();
- }
-
- /**
- * This always returns false. The base class has already implemented
- * {@link org.eclipse.emf.edit.provider.ItemProviderAdapter#getChildren ItemProviderAdapter.getChildren}
- * to return the empty enumeration, and this to check that enumeration, but we know there can't
- * be any children, so this is faster.
- */
- @Override
- public boolean hasChildren(Object object) {
- return false;
- }
-
-}
diff --git a/plugins/org.eclipse.jst.j2ee.web/webedit/org/eclipse/jst/j2ee/internal/web/providers/ServletTypeItemProvider.java b/plugins/org.eclipse.jst.j2ee.web/webedit/org/eclipse/jst/j2ee/internal/web/providers/ServletTypeItemProvider.java
deleted file mode 100644
index 688873d..0000000
--- a/plugins/org.eclipse.jst.j2ee.web/webedit/org/eclipse/jst/j2ee/internal/web/providers/ServletTypeItemProvider.java
+++ /dev/null
@@ -1,124 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2003, 2005 IBM Corporation and others.
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
- *
- * Contributors:
- * IBM Corporation - initial API and implementation
- *******************************************************************************/
-package org.eclipse.jst.j2ee.internal.web.providers;
-
-import java.util.Collection;
-import java.util.List;
-
-import org.eclipse.emf.common.notify.AdapterFactory;
-import org.eclipse.emf.common.notify.Notification;
-import org.eclipse.emf.common.util.ResourceLocator;
-import org.eclipse.emf.edit.provider.ComposeableAdapterFactory;
-import org.eclipse.emf.edit.provider.ItemPropertyDescriptor;
-import org.eclipse.jst.j2ee.internal.plugin.J2EEPlugin;
-import org.eclipse.jst.j2ee.internal.web.plugin.WebPlugin;
-import org.eclipse.jst.j2ee.webapplication.ServletType;
-import org.eclipse.jst.j2ee.webapplication.WebapplicationPackage;
-
-
-/**
- * This is the item provider adpater for a {@link org.eclipse.jst.j2ee.internal.internal.webapplication.ServletType}object.
- */
-public class ServletTypeItemProvider extends WebTypeItemProvider {
-
- /**
- * This constructs an instance from a factory and a notifier.
- */
- public ServletTypeItemProvider(AdapterFactory adapterFactory) {
- super(adapterFactory);
- }
-
- /**
- * This returns servlet_type.gif.
- */
- @Override
- public Object getImage(Object object) {
- return WebPlugin.getDefault().getImage("servlet_type"); //$NON-NLS-1$
- }
-
- /**
- * This returns the property descriptors for the adapted class.
- */
- @Override
- public List getPropertyDescriptors(Object object) {
- if (itemPropertyDescriptors == null) {
- super.getPropertyDescriptors(object);
-
- WebapplicationPackage pkg = WebapplicationPackage.eINSTANCE;
-
- // This is for the className feature.
- //
- itemPropertyDescriptors.add(new ItemPropertyDescriptor(((ComposeableAdapterFactory) adapterFactory).getRootAdapterFactory(), WebAppEditResourceHandler.getString("ClassName_UI_"), //$NON-NLS-1$ = "ClassName"
- WebAppEditResourceHandler.getString("The_className_property_UI_"), //$NON-NLS-1$ = "The className property"
- pkg.getServletType_ClassName()));
-
- }
- return itemPropertyDescriptors;
- }
-
- /**
- * This adds a property descriptor for the Class Name feature. <!-- begin-user-doc --> <!--
- * end-user-doc -->
- *
- * @generated
- */
- protected void addClassNamePropertyDescriptor(Object object) {
- itemPropertyDescriptors.add(new ItemPropertyDescriptor(((ComposeableAdapterFactory) adapterFactory).getRootAdapterFactory(), getString("_UI_ServletType_className_feature"), //$NON-NLS-1$
- getString("_UI_PropertyDescriptor_description", "_UI_ServletType_className_feature", "_UI_ServletType_type"), //$NON-NLS-1$ //$NON-NLS-2$ //$NON-NLS-3$
- WebapplicationPackage.eINSTANCE.getServletType_ClassName(), true, ItemPropertyDescriptor.GENERIC_VALUE_IMAGE));
- }
-
-
- @Override
- public String getText(Object object) {
- return WebAppEditResourceHandler.getString("41concat_UI_", (new Object[]{((ServletType) object).getClassName()})); //$NON-NLS-1$ = "ServletType {0}"
- }
-
- /**
- * This handles notification by calling {@link #fireNotifyChanged fireNotifyChanged}. <!--
- * begin-user-doc --> <!-- end-user-doc -->
- *
- * @generated
- */
- @Override
- public void notifyChanged(Notification notification) {
- switch (notification.getFeatureID(ServletType.class)) {
- case WebapplicationPackage.SERVLET_TYPE__CLASS_NAME : {
- fireNotifyChanged(notification);
- return;
- }
- }
- super.notifyChanged(notification);
- }
-
- /**
- * This adds to the collection of {@link org.eclipse.emf.edit.command.CommandParameter}s
- * describing all of the children that can be created under this object. <!-- begin-user-doc -->
- * <!-- end-user-doc -->
- *
- * @generated
- */
- @Override
- protected void collectNewChildDescriptors(Collection newChildDescriptors, Object object) {
- super.collectNewChildDescriptors(newChildDescriptors, object);
- }
-
- /**
- * Return the resource locator for this item provider's resources. <!-- begin-user-doc --> <!--
- * end-user-doc -->
- *
- * @generated
- */
- @Override
- public ResourceLocator getResourceLocator() {
- return J2EEPlugin.getDefault();
- }
-}
diff --git a/plugins/org.eclipse.jst.j2ee.web/webedit/org/eclipse/jst/j2ee/internal/web/providers/SessionConfigItemProvider.java b/plugins/org.eclipse.jst.j2ee.web/webedit/org/eclipse/jst/j2ee/internal/web/providers/SessionConfigItemProvider.java
deleted file mode 100644
index 8c5120c..0000000
--- a/plugins/org.eclipse.jst.j2ee.web/webedit/org/eclipse/jst/j2ee/internal/web/providers/SessionConfigItemProvider.java
+++ /dev/null
@@ -1,155 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2003, 2005 IBM Corporation and others.
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
- *
- * Contributors:
- * IBM Corporation - initial API and implementation
- *******************************************************************************/
-package org.eclipse.jst.j2ee.internal.web.providers;
-
-import java.util.Collection;
-import java.util.List;
-
-import org.eclipse.emf.common.notify.AdapterFactory;
-import org.eclipse.emf.common.notify.Notification;
-import org.eclipse.emf.common.util.ResourceLocator;
-import org.eclipse.emf.edit.provider.ComposeableAdapterFactory;
-import org.eclipse.emf.edit.provider.IEditingDomainItemProvider;
-import org.eclipse.emf.edit.provider.IItemLabelProvider;
-import org.eclipse.emf.edit.provider.IItemPropertySource;
-import org.eclipse.emf.edit.provider.ITreeItemContentProvider;
-import org.eclipse.emf.edit.provider.ItemPropertyDescriptor;
-import org.eclipse.jst.j2ee.internal.plugin.J2EEPlugin;
-import org.eclipse.jst.j2ee.internal.web.plugin.WebPlugin;
-import org.eclipse.jst.j2ee.webapplication.SessionConfig;
-import org.eclipse.jst.j2ee.webapplication.WebapplicationPackage;
-
-
-/**
- * This is the item provider adpater for a {@link org.eclipse.jst.j2ee.internal.internal.webapplication.SessionConfig}
- * object.
- */
-public class SessionConfigItemProvider extends WebapplicationItemProviderAdapter implements IEditingDomainItemProvider, IItemLabelProvider, IItemPropertySource, ITreeItemContentProvider {
-
- /**
- * This constructs an instance from a factory and a notifier.
- */
- public SessionConfigItemProvider(AdapterFactory adapterFactory) {
- super(adapterFactory);
- }
-
- /**
- * This returns session_config.gif.
- */
- @Override
- public Object getImage(Object object) {
- return WebPlugin.getDefault().getImage("session_config");//$NON-NLS-1$
- }
-
- /**
- * This returns the webApp of the SessionConfig.
- */
- @Override
- public Object getParent(Object object) {
- return ((SessionConfig) object).getWebApp();
- }
-
- /**
- * This returns the property descriptors for the adapted class.
- */
- @Override
- public List getPropertyDescriptors(Object object) {
- if (itemPropertyDescriptors == null) {
- super.getPropertyDescriptors(object);
-
- WebapplicationPackage pkg = WebapplicationPackage.eINSTANCE;
-
- // This is for the sessionTimeout feature.
- //
- itemPropertyDescriptors.add(new ItemPropertyDescriptor(((ComposeableAdapterFactory) adapterFactory).getRootAdapterFactory(), WebAppEditResourceHandler.getString("SessionTimeout_UI_"), //$NON-NLS-1$ = "SessionTimeout"
- WebAppEditResourceHandler.getString("The_sessionTimeout_propert_UI_"), //$NON-NLS-1$ = "The sessionTimeout property"
- pkg.getSessionConfig_SessionTimeout()));
-
- // This is for the webApp feature.
- //
- itemPropertyDescriptors.add(new ItemPropertyDescriptor(((ComposeableAdapterFactory) adapterFactory).getRootAdapterFactory(), WebAppEditResourceHandler.getString("WebApp_UI_"), //$NON-NLS-1$ = "WebApp"
- WebAppEditResourceHandler.getString("The_webApp_property_UI_"), //$NON-NLS-1$ = "The webApp property"
- pkg.getSessionConfig_WebApp()));
-
- }
- return itemPropertyDescriptors;
- }
-
- /**
- * This adds a property descriptor for the Session Timeout feature. <!-- begin-user-doc --> <!--
- * end-user-doc -->
- *
- * @generated
- */
- protected void addSessionTimeoutPropertyDescriptor(Object object) {
- itemPropertyDescriptors.add(new ItemPropertyDescriptor(((ComposeableAdapterFactory) adapterFactory).getRootAdapterFactory(), getString("_UI_SessionConfig_sessionTimeout_feature"), //$NON-NLS-1$
- getString("_UI_PropertyDescriptor_description", "_UI_SessionConfig_sessionTimeout_feature", "_UI_SessionConfig_type"), //$NON-NLS-1$ //$NON-NLS-2$ //$NON-NLS-3$
- WebapplicationPackage.eINSTANCE.getSessionConfig_SessionTimeout(), true, ItemPropertyDescriptor.INTEGRAL_VALUE_IMAGE));
- }
-
-
- @Override
- public String getText(Object object) {
- return WebAppEditResourceHandler.getString("31concat_UI_", (new Object[]{new Integer(((SessionConfig) object).getSessionTimeout())})); //$NON-NLS-1$ = "SessionConfig {0}"
- }
-
- /**
- * This handles notification by calling {@link #fireNotifyChanged fireNotifyChanged}. <!--
- * begin-user-doc --> <!-- end-user-doc -->
- *
- * @generated
- */
- @Override
- public void notifyChanged(Notification notification) {
- switch (notification.getFeatureID(SessionConfig.class)) {
- case WebapplicationPackage.SESSION_CONFIG__SESSION_TIMEOUT : {
- fireNotifyChanged(notification);
- return;
- }
- }
- super.notifyChanged(notification);
- }
-
- /**
- * This adds to the collection of {@link org.eclipse.emf.edit.command.CommandParameter}s
- * describing all of the children that can be created under this object. <!-- begin-user-doc -->
- * <!-- end-user-doc -->
- *
- * @generated
- */
- @Override
- protected void collectNewChildDescriptors(Collection newChildDescriptors, Object object) {
- super.collectNewChildDescriptors(newChildDescriptors, object);
- }
-
- /**
- * Return the resource locator for this item provider's resources. <!-- begin-user-doc --> <!--
- * end-user-doc -->
- *
- * @generated
- */
- @Override
- public ResourceLocator getResourceLocator() {
- return J2EEPlugin.getDefault();
- }
-
- /**
- * This always returns false. The base class has already implemented
- * {@link org.eclipse.emf.edit.provider.ItemProviderAdapter#getChildren ItemProviderAdapter.getChildren}
- * to return the empty enumeration, and this to check that enumeration, but we know there can't
- * be any children, so this is faster.
- */
- @Override
- public boolean hasChildren(Object object) {
- return false;
- }
-
-}
diff --git a/plugins/org.eclipse.jst.j2ee.web/webedit/org/eclipse/jst/j2ee/internal/web/providers/TagLibRefItemProvider.java b/plugins/org.eclipse.jst.j2ee.web/webedit/org/eclipse/jst/j2ee/internal/web/providers/TagLibRefItemProvider.java
deleted file mode 100644
index 11f328f..0000000
--- a/plugins/org.eclipse.jst.j2ee.web/webedit/org/eclipse/jst/j2ee/internal/web/providers/TagLibRefItemProvider.java
+++ /dev/null
@@ -1,177 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2003, 2005 IBM Corporation and others.
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
- *
- * Contributors:
- * IBM Corporation - initial API and implementation
- *******************************************************************************/
-package org.eclipse.jst.j2ee.internal.web.providers;
-
-import java.util.Collection;
-import java.util.List;
-
-import org.eclipse.emf.common.notify.AdapterFactory;
-import org.eclipse.emf.common.notify.Notification;
-import org.eclipse.emf.common.util.ResourceLocator;
-import org.eclipse.emf.edit.provider.ComposeableAdapterFactory;
-import org.eclipse.emf.edit.provider.IEditingDomainItemProvider;
-import org.eclipse.emf.edit.provider.IItemLabelProvider;
-import org.eclipse.emf.edit.provider.IItemPropertySource;
-import org.eclipse.emf.edit.provider.ITreeItemContentProvider;
-import org.eclipse.emf.edit.provider.ItemPropertyDescriptor;
-import org.eclipse.jst.j2ee.internal.plugin.J2EEPlugin;
-import org.eclipse.jst.j2ee.internal.web.plugin.WebPlugin;
-import org.eclipse.jst.j2ee.webapplication.TagLibRef;
-import org.eclipse.jst.j2ee.webapplication.WebapplicationPackage;
-
-
-/**
- * This is the item provider adpater for a {@link org.eclipse.jst.j2ee.internal.internal.webapplication.TagLibRef}object.
- */
-public class TagLibRefItemProvider extends WebapplicationItemProviderAdapter implements IEditingDomainItemProvider, IItemLabelProvider, IItemPropertySource, ITreeItemContentProvider {
-
- /**
- * This constructs an instance from a factory and a notifier.
- */
- public TagLibRefItemProvider(AdapterFactory adapterFactory) {
- super(adapterFactory);
- }
-
- /**
- * This returns jsp_library_reference.gif.
- */
- @Override
- public Object getImage(Object object) {
- return WebPlugin.getDefault().getImage("jsp_library_reference");//$NON-NLS-1$
- }
-
- /**
- * This returns the webApp of the TagLibRef.
- */
- @Override
- public Object getParent(Object object) {
- return ((TagLibRef) object).getWebApp();
- }
-
- /**
- * This returns the property descriptors for the adapted class.
- */
- @Override
- public List getPropertyDescriptors(Object object) {
- if (itemPropertyDescriptors == null) {
- super.getPropertyDescriptors(object);
-
- WebapplicationPackage pkg = WebapplicationPackage.eINSTANCE;
-
- // This is for the taglibURI feature.
- //
- itemPropertyDescriptors.add(new ItemPropertyDescriptor(((ComposeableAdapterFactory) adapterFactory).getRootAdapterFactory(), WebAppEditResourceHandler.getString("URI_UI_"), //$NON-NLS-1$ = "TaglibURI"
- WebAppEditResourceHandler.getString("The_taglibURI_property_UI_"), //$NON-NLS-1$ = "The taglibURI property"
- pkg.getTagLibRef_TaglibURI()));
-
- // This is for the taglibLocation feature.
- //
- itemPropertyDescriptors.add(new ItemPropertyDescriptor(((ComposeableAdapterFactory) adapterFactory).getRootAdapterFactory(), WebAppEditResourceHandler.getString("Location_UI_"), //$NON-NLS-1$ = "TaglibLocation"
- WebAppEditResourceHandler.getString("The_taglibLocation_propert_UI_"), //$NON-NLS-1$ = "The taglibLocation property"
- pkg.getTagLibRef_TaglibLocation()));
-
- // This is for the webApp feature.
- //
- /*
- * itemPropertyDescriptors.add (new ItemPropertyDescriptor
- * (((ComposeableAdapterFactory)adapterFactory).getRootAdapterFactory(),
- * WebAppEditResourceHandler.getString("WebApp_UI_"), //$NON-NLS-1$ = "WebApp"
- * WebAppEditResourceHandler.getString("The_webApp_property_UI_"), //$NON-NLS-1$ = "The
- * webApp property" pkg.getTagLibRef_WebApp()));
- */
-
- }
- return itemPropertyDescriptors;
- }
-
- /**
- * This adds a property descriptor for the Taglib URI feature. <!-- begin-user-doc --> <!--
- * end-user-doc -->
- *
- * @generated
- */
- protected void addTaglibURIPropertyDescriptor(Object object) {
- itemPropertyDescriptors.add(new ItemPropertyDescriptor(((ComposeableAdapterFactory) adapterFactory).getRootAdapterFactory(), getString("_UI_TagLibRef_taglibURI_feature"), //$NON-NLS-1$
- getString("_UI_PropertyDescriptor_description", "_UI_TagLibRef_taglibURI_feature", "_UI_TagLibRef_type"), //$NON-NLS-1$ //$NON-NLS-2$ //$NON-NLS-3$
- WebapplicationPackage.eINSTANCE.getTagLibRef_TaglibURI(), true, ItemPropertyDescriptor.GENERIC_VALUE_IMAGE));
- }
-
- /**
- * This adds a property descriptor for the Taglib Location feature. <!-- begin-user-doc --> <!--
- * end-user-doc -->
- *
- * @generated
- */
- protected void addTaglibLocationPropertyDescriptor(Object object) {
- itemPropertyDescriptors.add(new ItemPropertyDescriptor(((ComposeableAdapterFactory) adapterFactory).getRootAdapterFactory(), getString("_UI_TagLibRef_taglibLocation_feature"), //$NON-NLS-1$
- getString("_UI_PropertyDescriptor_description", "_UI_TagLibRef_taglibLocation_feature", "_UI_TagLibRef_type"), //$NON-NLS-1$ //$NON-NLS-2$ //$NON-NLS-3$
- WebapplicationPackage.eINSTANCE.getTagLibRef_TaglibLocation(), true, ItemPropertyDescriptor.GENERIC_VALUE_IMAGE));
- }
-
-
- @Override
- public String getText(Object object) {
- return WebAppEditResourceHandler.getString("32concat_UI_", (new Object[]{((TagLibRef) object).getTaglibURI()})); //$NON-NLS-1$ = "TagLibRef {0}"
- }
-
- /**
- * This handles notification by calling {@link #fireNotifyChanged fireNotifyChanged}. <!--
- * begin-user-doc --> <!-- end-user-doc -->
- *
- * @generated
- */
- @Override
- public void notifyChanged(Notification notification) {
- switch (notification.getFeatureID(TagLibRef.class)) {
- case WebapplicationPackage.TAG_LIB_REF__TAGLIB_URI :
- case WebapplicationPackage.TAG_LIB_REF__TAGLIB_LOCATION : {
- fireNotifyChanged(notification);
- return;
- }
- }
- super.notifyChanged(notification);
- }
-
- /**
- * This adds to the collection of {@link org.eclipse.emf.edit.command.CommandParameter}s
- * describing all of the children that can be created under this object. <!-- begin-user-doc -->
- * <!-- end-user-doc -->
- *
- * @generated
- */
- @Override
- protected void collectNewChildDescriptors(Collection newChildDescriptors, Object object) {
- super.collectNewChildDescriptors(newChildDescriptors, object);
- }
-
- /**
- * Return the resource locator for this item provider's resources. <!-- begin-user-doc --> <!--
- * end-user-doc -->
- *
- * @generated
- */
- @Override
- public ResourceLocator getResourceLocator() {
- return J2EEPlugin.getDefault();
- }
-
- /**
- * This always returns false. The base class has already implemented
- * {@link org.eclipse.emf.edit.provider.ItemProviderAdapter#getChildren ItemProviderAdapter.getChildren}
- * to return the empty enumeration, and this to check that enumeration, but we know there can't
- * be any children, so this is faster.
- */
- @Override
- public boolean hasChildren(Object object) {
- return false;
- }
-
-}
diff --git a/plugins/org.eclipse.jst.j2ee.web/webedit/org/eclipse/jst/j2ee/internal/web/providers/TagLibRefTypeItemProvider.java b/plugins/org.eclipse.jst.j2ee.web/webedit/org/eclipse/jst/j2ee/internal/web/providers/TagLibRefTypeItemProvider.java
deleted file mode 100644
index 9cbd7be..0000000
--- a/plugins/org.eclipse.jst.j2ee.web/webedit/org/eclipse/jst/j2ee/internal/web/providers/TagLibRefTypeItemProvider.java
+++ /dev/null
@@ -1,153 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2003, 2005 IBM Corporation and others.
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
- *
- * Contributors:
- * IBM Corporation - initial API and implementation
- *******************************************************************************/
-package org.eclipse.jst.j2ee.internal.web.providers;
-
-
-import java.util.Collection;
-import java.util.List;
-
-import org.eclipse.emf.common.notify.AdapterFactory;
-import org.eclipse.emf.common.notify.Notification;
-import org.eclipse.emf.common.util.ResourceLocator;
-import org.eclipse.emf.edit.provider.ComposeableAdapterFactory;
-import org.eclipse.emf.edit.provider.IEditingDomainItemProvider;
-import org.eclipse.emf.edit.provider.IItemLabelProvider;
-import org.eclipse.emf.edit.provider.IItemPropertySource;
-import org.eclipse.emf.edit.provider.ITreeItemContentProvider;
-import org.eclipse.emf.edit.provider.ItemPropertyDescriptor;
-import org.eclipse.emf.edit.provider.ItemProviderAdapter;
-import org.eclipse.jst.j2ee.internal.plugin.J2EEPlugin;
-import org.eclipse.jst.j2ee.internal.web.plugin.WebPlugin;
-import org.eclipse.jst.j2ee.jsp.JspPackage;
-import org.eclipse.jst.j2ee.jsp.TagLibRefType;
-
-/**
- * This is the item provider adpater for a {@link com.ibm.etools.jsp.TagLibRefType}object. <!--
- * begin-user-doc --> <!-- end-user-doc -->
- *
- * @generated
- */
-public class TagLibRefTypeItemProvider extends ItemProviderAdapter implements IEditingDomainItemProvider, ITreeItemContentProvider, IItemLabelProvider, IItemPropertySource {
- /**
- * This constructs an instance from a factory and a notifier. <!-- begin-user-doc --> <!--
- * end-user-doc -->
- *
- * @generated
- */
- public TagLibRefTypeItemProvider(AdapterFactory adapterFactory) {
- super(adapterFactory);
- }
-
- /**
- * This returns the property descriptors for the adapted class. <!-- begin-user-doc --> <!--
- * end-user-doc -->
- *
- * @generated
- */
- @Override
- public List getPropertyDescriptors(Object object) {
- if (itemPropertyDescriptors == null) {
- super.getPropertyDescriptors(object);
-
- addTaglibURIPropertyDescriptor(object);
- addTaglibLocationPropertyDescriptor(object);
- }
- return itemPropertyDescriptors;
- }
-
- /**
- * This adds a property descriptor for the Taglib URI feature. <!-- begin-user-doc --> <!--
- * end-user-doc -->
- *
- * @generated
- */
- protected void addTaglibURIPropertyDescriptor(Object object) {
- itemPropertyDescriptors.add(new ItemPropertyDescriptor(((ComposeableAdapterFactory) adapterFactory).getRootAdapterFactory(), WebAppEditResourceHandler.getString("URI_UI_"), //$NON-NLS-1$
- WebAppEditResourceHandler.getString("URI_UI_"), //$NON-NLS-1$
- JspPackage.eINSTANCE.getTagLibRefType_TaglibURI(), true, ItemPropertyDescriptor.GENERIC_VALUE_IMAGE));
- }
-
- /**
- * This adds a property descriptor for the Taglib Location feature. <!-- begin-user-doc --> <!--
- * end-user-doc -->
- *
- * @generated
- */
- protected void addTaglibLocationPropertyDescriptor(Object object) {
- itemPropertyDescriptors.add(new ItemPropertyDescriptor(((ComposeableAdapterFactory) adapterFactory).getRootAdapterFactory(), WebAppEditResourceHandler.getString("Location_UI_"), //$NON-NLS-1$
- WebAppEditResourceHandler.getString("Location_UI_"), //$NON-NLS-1$
- JspPackage.eINSTANCE.getTagLibRefType_TaglibLocation(), true, ItemPropertyDescriptor.GENERIC_VALUE_IMAGE));
- }
-
-
- /**
- * This returns TagLibRefType.gif. <!-- begin-user-doc --> <!-- end-user-doc -->
- *
- * @generated
- */
- @Override
- public Object getImage(Object object) {
- return WebPlugin.getDefault().getImage("full/obj16/TagLibRefType"); //$NON-NLS-1$
- }
-
- /**
- * This returns the label text for the adapted class. <!-- begin-user-doc --> <!-- end-user-doc
- * -->
- *
- * @generated
- */
- @Override
- public String getText(Object object) {
- String label = ((TagLibRefType) object).getTaglibURI();
- String tlrt = WebAppEditResourceHandler.getString("_UI_TagLibRefType_type"); //$NON-NLS-1$
- return label == null || label.length() == 0 ? tlrt : tlrt + " " + label; //$NON-NLS-1$
- }
-
- /**
- * This handles notification by calling {@link #fireNotifyChanged fireNotifyChanged}. <!--
- * begin-user-doc --> <!-- end-user-doc -->
- *
- * @generated
- */
- @Override
- public void notifyChanged(Notification notification) {
- switch (notification.getFeatureID(TagLibRefType.class)) {
- case JspPackage.TAG_LIB_REF_TYPE__TAGLIB_URI :
- case JspPackage.TAG_LIB_REF_TYPE__TAGLIB_LOCATION : {
- fireNotifyChanged(notification);
- return;
- }
- }
- super.notifyChanged(notification);
- }
-
- /**
- * This adds to the collection of {@link org.eclipse.emf.edit.command.CommandParameter}s
- * describing all of the children that can be created under this object. <!-- begin-user-doc -->
- * <!-- end-user-doc -->
- *
- * @generated
- */
- @Override
- protected void collectNewChildDescriptors(Collection newChildDescriptors, Object object) {
- super.collectNewChildDescriptors(newChildDescriptors, object);
- }
-
- /**
- * Return the resource locator for this item provider's resources. <!-- begin-user-doc --> <!--
- * end-user-doc -->
- *
- */
- @Override
- public ResourceLocator getResourceLocator() {
- return J2EEPlugin.getDefault();
- }
-}
diff --git a/plugins/org.eclipse.jst.j2ee.web/webedit/org/eclipse/jst/j2ee/internal/web/providers/URLPatternTypeItemProvider.java b/plugins/org.eclipse.jst.j2ee.web/webedit/org/eclipse/jst/j2ee/internal/web/providers/URLPatternTypeItemProvider.java
deleted file mode 100644
index ecfb955..0000000
--- a/plugins/org.eclipse.jst.j2ee.web/webedit/org/eclipse/jst/j2ee/internal/web/providers/URLPatternTypeItemProvider.java
+++ /dev/null
@@ -1,155 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2003, 2005 IBM Corporation and others.
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
- *
- * Contributors:
- * IBM Corporation - initial API and implementation
- *******************************************************************************/
-package org.eclipse.jst.j2ee.internal.web.providers;
-
-import java.util.Collection;
-import java.util.List;
-
-import org.eclipse.emf.common.notify.AdapterFactory;
-import org.eclipse.emf.common.notify.Notification;
-import org.eclipse.emf.common.util.ResourceLocator;
-import org.eclipse.emf.edit.provider.ComposeableAdapterFactory;
-import org.eclipse.emf.edit.provider.IEditingDomainItemProvider;
-import org.eclipse.emf.edit.provider.IItemLabelProvider;
-import org.eclipse.emf.edit.provider.IItemPropertySource;
-import org.eclipse.emf.edit.provider.ITreeItemContentProvider;
-import org.eclipse.emf.edit.provider.ItemPropertyDescriptor;
-import org.eclipse.jst.j2ee.internal.plugin.J2EEPlugin;
-import org.eclipse.jst.j2ee.internal.web.plugin.WebPlugin;
-import org.eclipse.jst.j2ee.webapplication.URLPatternType;
-import org.eclipse.jst.j2ee.webapplication.WebapplicationPackage;
-
-
-/**
- * This is the item provider adpater for a {@link org.eclipse.jst.j2ee.internal.internal.webapplication.URLPatternType}
- * object.
- */
-public class URLPatternTypeItemProvider extends WebapplicationItemProviderAdapter implements IEditingDomainItemProvider, IItemLabelProvider, IItemPropertySource, ITreeItemContentProvider {
-
- /**
- * This constructs an instance from a factory and a notifier.
- */
- public URLPatternTypeItemProvider(AdapterFactory adapterFactory) {
- super(adapterFactory);
- }
-
- /**
- * This returns url_type.gif.
- */
- @Override
- public Object getImage(Object object) {
- return WebPlugin.getDefault().getImage("url_type");//$NON-NLS-1$
- }
-
- /**
- * This returns the resCollection of the URLPatternType.
- */
- @Override
- public Object getParent(Object object) {
- return ((URLPatternType) object).getResCollection();
- }
-
- /**
- * This returns the property descriptors for the adapted class.
- */
- @Override
- public List getPropertyDescriptors(Object object) {
- if (itemPropertyDescriptors == null) {
- super.getPropertyDescriptors(object);
-
- WebapplicationPackage pkg = WebapplicationPackage.eINSTANCE;
-
- // This is for the urlPattern feature.
- //
- itemPropertyDescriptors.add(new ItemPropertyDescriptor(((ComposeableAdapterFactory) adapterFactory).getRootAdapterFactory(), WebAppEditResourceHandler.getString("UrlPattern_UI_"), //$NON-NLS-1$ = "UrlPattern"
- WebAppEditResourceHandler.getString("The_urlPattern_property_UI_"), //$NON-NLS-1$ = "The urlPattern property"
- pkg.getURLPatternType_UrlPattern()));
-
- // This is for the resCollection feature.
- //
- itemPropertyDescriptors.add(new ItemPropertyDescriptor(((ComposeableAdapterFactory) adapterFactory).getRootAdapterFactory(), WebAppEditResourceHandler.getString("ResCollection_UI_"), //$NON-NLS-1$ = "ResCollection"
- WebAppEditResourceHandler.getString("The_resCollection_property_UI_"), //$NON-NLS-1$ = "The resCollection property"
- pkg.getURLPatternType_ResCollection()));
-
- }
- return itemPropertyDescriptors;
- }
-
- /**
- * This adds a property descriptor for the Url Pattern feature. <!-- begin-user-doc --> <!--
- * end-user-doc -->
- *
- * @generated
- */
- protected void addUrlPatternPropertyDescriptor(Object object) {
- itemPropertyDescriptors.add(new ItemPropertyDescriptor(((ComposeableAdapterFactory) adapterFactory).getRootAdapterFactory(), getString("_UI_URLPatternType_urlPattern_feature"), //$NON-NLS-1$
- getString("_UI_PropertyDescriptor_description", "_UI_URLPatternType_urlPattern_feature", "_UI_URLPatternType_type"), //$NON-NLS-1$ //$NON-NLS-2$ //$NON-NLS-3$
- WebapplicationPackage.eINSTANCE.getURLPatternType_UrlPattern(), true, ItemPropertyDescriptor.GENERIC_VALUE_IMAGE));
- }
-
-
- @Override
- public String getText(Object object) {
- return WebAppEditResourceHandler.getString("33concat_UI_", (new Object[]{((URLPatternType) object).getUrlPattern()})); //$NON-NLS-1$ = "URLPatternType {0}"
- }
-
- /**
- * This handles notification by calling {@link #fireNotifyChanged fireNotifyChanged}. <!--
- * begin-user-doc --> <!-- end-user-doc -->
- *
- * @generated
- */
- @Override
- public void notifyChanged(Notification notification) {
- switch (notification.getFeatureID(URLPatternType.class)) {
- case WebapplicationPackage.URL_PATTERN_TYPE__URL_PATTERN : {
- fireNotifyChanged(notification);
- return;
- }
- }
- super.notifyChanged(notification);
- }
-
- /**
- * This adds to the collection of {@link org.eclipse.emf.edit.command.CommandParameter}s
- * describing all of the children that can be created under this object. <!-- begin-user-doc -->
- * <!-- end-user-doc -->
- *
- * @generated
- */
- @Override
- protected void collectNewChildDescriptors(Collection newChildDescriptors, Object object) {
- super.collectNewChildDescriptors(newChildDescriptors, object);
- }
-
- /**
- * Return the resource locator for this item provider's resources. <!-- begin-user-doc --> <!--
- * end-user-doc -->
- *
- * @generated
- */
- @Override
- public ResourceLocator getResourceLocator() {
- return J2EEPlugin.getDefault();
- }
-
- /**
- * This always returns false. The base class has already implemented
- * {@link org.eclipse.emf.edit.provider.ItemProviderAdapter#getChildren ItemProviderAdapter.getChildren}
- * to return the empty enumeration, and this to check that enumeration, but we know there can't
- * be any children, so this is faster.
- */
- @Override
- public boolean hasChildren(Object object) {
- return false;
- }
-
-}
diff --git a/plugins/org.eclipse.jst.j2ee.web/webedit/org/eclipse/jst/j2ee/internal/web/providers/UserDataConstraintItemProvider.java b/plugins/org.eclipse.jst.j2ee.web/webedit/org/eclipse/jst/j2ee/internal/web/providers/UserDataConstraintItemProvider.java
deleted file mode 100644
index 5ed05b7..0000000
--- a/plugins/org.eclipse.jst.j2ee.web/webedit/org/eclipse/jst/j2ee/internal/web/providers/UserDataConstraintItemProvider.java
+++ /dev/null
@@ -1,197 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2003, 2005 IBM Corporation and others.
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
- *
- * Contributors:
- * IBM Corporation - initial API and implementation
- *******************************************************************************/
-package org.eclipse.jst.j2ee.internal.web.providers;
-
-import java.util.Collection;
-import java.util.List;
-
-import org.eclipse.emf.common.notify.AdapterFactory;
-import org.eclipse.emf.common.notify.Notification;
-import org.eclipse.emf.common.util.ResourceLocator;
-import org.eclipse.emf.edit.provider.ComposeableAdapterFactory;
-import org.eclipse.emf.edit.provider.IEditingDomainItemProvider;
-import org.eclipse.emf.edit.provider.IItemLabelProvider;
-import org.eclipse.emf.edit.provider.IItemPropertySource;
-import org.eclipse.emf.edit.provider.ITreeItemContentProvider;
-import org.eclipse.emf.edit.provider.ItemPropertyDescriptor;
-import org.eclipse.jst.j2ee.common.CommonFactory;
-import org.eclipse.jst.j2ee.internal.plugin.J2EEPlugin;
-import org.eclipse.jst.j2ee.internal.web.plugin.WebPlugin;
-import org.eclipse.jst.j2ee.webapplication.UserDataConstraint;
-import org.eclipse.jst.j2ee.webapplication.WebapplicationPackage;
-import org.eclipse.jst.j2ee.webservice.wscommon.WscommonFactory;
-
-/**
- * This is the item provider adpater for a {@link org.eclipse.jst.j2ee.internal.internal.webapplication.UserDataConstraint}
- * object.
- */
-public class UserDataConstraintItemProvider extends WebapplicationItemProviderAdapter implements IEditingDomainItemProvider, IItemLabelProvider, IItemPropertySource, ITreeItemContentProvider {
-
- /**
- * This constructs an instance from a factory and a notifier.
- */
- public UserDataConstraintItemProvider(AdapterFactory adapterFactory) {
- super(adapterFactory);
- }
-
- /**
- * This returns user_data_constraint.gif.
- */
- @Override
- public Object getImage(Object object) {
- return WebPlugin.getDefault().getImage("user_data_constraint"); //$NON-NLS-1$
- }
-
- /**
- * This returns the secConstraint of the UserDataConstraint.
- */
- @Override
- public Object getParent(Object object) {
- return ((UserDataConstraint) object).getSecConstraint();
- }
-
- /**
- * This returns the property descriptors for the adapted class.
- */
- @Override
- public List getPropertyDescriptors(Object object) {
- if (itemPropertyDescriptors == null) {
- super.getPropertyDescriptors(object);
-
- WebapplicationPackage pkg = WebapplicationPackage.eINSTANCE;
-
- // This is for the description feature.
- //
- itemPropertyDescriptors.add(new ItemPropertyDescriptor(((ComposeableAdapterFactory) adapterFactory).getRootAdapterFactory(), WebAppEditResourceHandler.getString("Description_UI__UI_"), //$NON-NLS-1$ = "Description"
- WebAppEditResourceHandler.getString("The_description_property_UI_"), //$NON-NLS-1$ = "The description property"
- pkg.getUserDataConstraint_Description()));
-
- // This is for the transportGuarantee feature.
- //
- itemPropertyDescriptors.add(new ItemPropertyDescriptor(((ComposeableAdapterFactory) adapterFactory).getRootAdapterFactory(), WebAppEditResourceHandler.getString("TransportGuarantee_UI_"), //$NON-NLS-1$ = "TransportGuarantee"
- WebAppEditResourceHandler.getString("The_transportGuarantee_pro_UI_"), //$NON-NLS-1$ = "The transportGuarantee property"
- pkg.getUserDataConstraint_TransportGuarantee()));
-
- // This is for the secConstraint feature.
- //
- itemPropertyDescriptors.add(new ItemPropertyDescriptor(((ComposeableAdapterFactory) adapterFactory).getRootAdapterFactory(), WebAppEditResourceHandler.getString("SecConstraint_UI_"), //$NON-NLS-1$ = "SecConstraint"
- WebAppEditResourceHandler.getString("The_secConstraint_property_UI_"), //$NON-NLS-1$ = "The secConstraint property"
- pkg.getUserDataConstraint_SecConstraint()));
-
- }
- return itemPropertyDescriptors;
- }
-
- /**
- * This adds a property descriptor for the Description feature. <!-- begin-user-doc --> <!--
- * end-user-doc -->
- *
- * @generated
- */
- protected void addDescriptionPropertyDescriptor(Object object) {
- itemPropertyDescriptors.add(new ItemPropertyDescriptor(((ComposeableAdapterFactory) adapterFactory).getRootAdapterFactory(), getString("_UI_UserDataConstraint_description_feature"), //$NON-NLS-1$
- getString("_UI_PropertyDescriptor_description", "_UI_UserDataConstraint_description_feature", "_UI_UserDataConstraint_type"), //$NON-NLS-1$ //$NON-NLS-2$ //$NON-NLS-3$
- WebapplicationPackage.eINSTANCE.getUserDataConstraint_Description(), true, ItemPropertyDescriptor.GENERIC_VALUE_IMAGE));
- }
-
- /**
- * This adds a property descriptor for the Transport Guarantee feature. <!-- begin-user-doc -->
- * <!-- end-user-doc -->
- *
- * @generated
- */
- protected void addTransportGuaranteePropertyDescriptor(Object object) {
- itemPropertyDescriptors.add(new ItemPropertyDescriptor(((ComposeableAdapterFactory) adapterFactory).getRootAdapterFactory(), getString("_UI_UserDataConstraint_transportGuarantee_feature"), //$NON-NLS-1$
- getString("_UI_PropertyDescriptor_description", "_UI_UserDataConstraint_transportGuarantee_feature", "_UI_UserDataConstraint_type"), //$NON-NLS-1$ //$NON-NLS-2$ //$NON-NLS-3$
- WebapplicationPackage.eINSTANCE.getUserDataConstraint_TransportGuarantee(), true, ItemPropertyDescriptor.GENERIC_VALUE_IMAGE));
- }
-
- /**
- * This specifies how to implement {@link #getChildren}and
- * {@link org.eclipse.emf.edit.command.AddCommand}and
- * {@link org.eclipse.emf.edit.command.RemoveCommand}support in {@link #createCommand}. <!--
- * begin-user-doc --> <!-- end-user-doc -->
- *
- * @generated
- */
- @Override
- public Collection getChildrenReferences(Object object) {
- if (childrenReferences == null) {
- super.getChildrenReferences(object);
- childrenReferences.add(WebapplicationPackage.eINSTANCE.getUserDataConstraint_Descriptions());
- }
- return childrenReferences;
- }
-
-
- @Override
- public String getText(Object object) {
- return WebAppEditResourceHandler.getString("34concat_UI_", (new Object[]{((UserDataConstraint) object).getTransportGuarantee().getName()})); //$NON-NLS-1$ = "UserDataConstraint {0}"
- }
-
- /**
- * This handles notification by calling {@link #fireNotifyChanged fireNotifyChanged}. <!--
- * begin-user-doc --> <!-- end-user-doc -->
- *
- * @generated
- */
- @Override
- public void notifyChanged(Notification notification) {
- switch (notification.getFeatureID(UserDataConstraint.class)) {
- case WebapplicationPackage.USER_DATA_CONSTRAINT__DESCRIPTION :
- case WebapplicationPackage.USER_DATA_CONSTRAINT__TRANSPORT_GUARANTEE :
- case WebapplicationPackage.USER_DATA_CONSTRAINT__DESCRIPTIONS : {
- fireNotifyChanged(notification);
- return;
- }
- }
- super.notifyChanged(notification);
- }
-
- /**
- * This adds to the collection of {@link org.eclipse.emf.edit.command.CommandParameter}s
- * describing all of the children that can be created under this object. <!-- begin-user-doc -->
- * <!-- end-user-doc -->
- *
- * @generated
- */
- @Override
- protected void collectNewChildDescriptors(Collection newChildDescriptors, Object object) {
- super.collectNewChildDescriptors(newChildDescriptors, object);
-
- newChildDescriptors.add(createChildParameter(WebapplicationPackage.eINSTANCE.getUserDataConstraint_Descriptions(), CommonFactory.eINSTANCE.createDescription()));
-
- newChildDescriptors.add(createChildParameter(WebapplicationPackage.eINSTANCE.getUserDataConstraint_Descriptions(), WscommonFactory.eINSTANCE.createDescriptionType()));
- }
-
- /**
- * Return the resource locator for this item provider's resources. <!-- begin-user-doc --> <!--
- * end-user-doc -->
- *
- * @generated
- */
- @Override
- public ResourceLocator getResourceLocator() {
- return J2EEPlugin.getDefault();
- }
-
- /**
- * This always returns false. The base class has already implemented
- * {@link org.eclipse.emf.edit.provider.ItemProviderAdapter#getChildren ItemProviderAdapter.getChildren}
- * to return the empty enumeration, and this to check that enumeration, but we know there can't
- * be any children, so this is faster.
- */
- @Override
- public boolean hasChildren(Object object) {
- return false;
- }
-
-}
diff --git a/plugins/org.eclipse.jst.j2ee.web/webedit/org/eclipse/jst/j2ee/internal/web/providers/WebAppEditResourceHandler.java b/plugins/org.eclipse.jst.j2ee.web/webedit/org/eclipse/jst/j2ee/internal/web/providers/WebAppEditResourceHandler.java
deleted file mode 100644
index 8e82792..0000000
--- a/plugins/org.eclipse.jst.j2ee.web/webedit/org/eclipse/jst/j2ee/internal/web/providers/WebAppEditResourceHandler.java
+++ /dev/null
@@ -1,97 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2003, 2005 IBM Corporation and others.
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
- *
- * Contributors:
- * IBM Corporation - initial API and implementation
- *******************************************************************************/
-package org.eclipse.jst.j2ee.internal.web.providers;
-
-import java.net.URL;
-import java.text.MessageFormat;
-import java.util.MissingResourceException;
-import java.util.ResourceBundle;
-
-import org.eclipse.emf.common.util.ResourceLocator;
-import org.eclipse.jst.j2ee.internal.web.plugin.WebPlugin;
-
-
-public class WebAppEditResourceHandler {
-
- private static ResourceBundle fgResourceBundle;
-
- public static ResourceLocator RESOURCE_LOCATOR = new ResourceLocator() {
- public URL getBaseURL() {
- return null;
- }
-
- public Object getImage(String arg0) {
- return WebPlugin.getDefault().getImage(arg0);
- }
-
- public String getString(String arg0) {
- return WebAppEditResourceHandler.getString(arg0);
- }
-
- public String getString(String arg0, Object[] arg1) {
- return WebAppEditResourceHandler.getString(arg0, arg1);
- }
- public String getString(String key, boolean translate) {
- // TODO For now... translate not supported
- return getString(key);
- }
-
- public String getString(String key, Object[] substitutions, boolean translate) {
- // TODO For now... translate not supported
- return getString(key,substitutions);
- }
- };
-
- /**
- * Returns the resource bundle used by all classes in this Project
- */
- public static ResourceBundle getResourceBundle() {
- try {
- return ResourceBundle.getBundle("webedit");//$NON-NLS-1$
- } catch (MissingResourceException e) {
- // does nothing - this method will return null and
- // getString(String) will return the key
- // it was called with
- }
- return null;
- }
-
- public static String getString(String key) {
- if (fgResourceBundle == null) {
- fgResourceBundle = getResourceBundle();
- }
-
- if (fgResourceBundle != null) {
- try {
- return fgResourceBundle.getString(key);
- } catch (MissingResourceException e) {
- return "!" + key + "!";//$NON-NLS-2$//$NON-NLS-1$
- }
- }
- return "!" + key + "!";//$NON-NLS-2$//$NON-NLS-1$
-
- }
-
- public static String getString(String key, Object[] args) {
-
- try {
- return MessageFormat.format(getString(key), args);
- } catch (IllegalArgumentException e) {
- return getString(key);
- }
-
- }
-
- public static String getString(String key, Object[] args, int x) {
-
- return getString(key);
- }
-}
diff --git a/plugins/org.eclipse.jst.j2ee.web/webedit/org/eclipse/jst/j2ee/internal/web/providers/WebAppItemProvider.java b/plugins/org.eclipse.jst.j2ee.web/webedit/org/eclipse/jst/j2ee/internal/web/providers/WebAppItemProvider.java
deleted file mode 100644
index 3361daa..0000000
--- a/plugins/org.eclipse.jst.j2ee.web/webedit/org/eclipse/jst/j2ee/internal/web/providers/WebAppItemProvider.java
+++ /dev/null
@@ -1,356 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2003, 2006 IBM Corporation and others.
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
- *
- * Contributors:
- * IBM Corporation - initial API and implementation
- *******************************************************************************/
-package org.eclipse.jst.j2ee.internal.web.providers;
-
-import java.util.Collection;
-import java.util.List;
-
-import org.eclipse.emf.common.notify.AdapterFactory;
-import org.eclipse.emf.common.notify.Notification;
-import org.eclipse.emf.common.util.ResourceLocator;
-import org.eclipse.emf.ecore.EObject;
-import org.eclipse.emf.ecore.EReference;
-import org.eclipse.emf.edit.command.AddCommand;
-import org.eclipse.emf.edit.command.RemoveCommand;
-import org.eclipse.emf.edit.provider.ComposeableAdapterFactory;
-import org.eclipse.emf.edit.provider.ItemPropertyDescriptor;
-import org.eclipse.jst.j2ee.common.CommonFactory;
-import org.eclipse.jst.j2ee.common.CommonPackage;
-import org.eclipse.jst.j2ee.common.internal.provider.JNDIEnvRefsGroupItemProvider;
-import org.eclipse.jst.j2ee.internal.J2EEVersionConstants;
-import org.eclipse.jst.j2ee.internal.plugin.J2EEPlugin;
-import org.eclipse.jst.j2ee.internal.web.plugin.WebPlugin;
-import org.eclipse.jst.j2ee.internal.webservices.WSDLServiceExtManager;
-import org.eclipse.jst.j2ee.internal.webservices.WSDLServiceHelper;
-import org.eclipse.jst.j2ee.jsp.JspFactory;
-import org.eclipse.jst.j2ee.webapplication.ContextParam;
-import org.eclipse.jst.j2ee.webapplication.WebApp;
-import org.eclipse.jst.j2ee.webapplication.WebapplicationFactory;
-import org.eclipse.jst.j2ee.webapplication.WebapplicationPackage;
-
-
-/**
- * This is the item provider adpater for a {@link org.eclipse.jst.j2ee.internal.internal.webapplication.WebApp}object.
- */
-public class WebAppItemProvider extends JNDIEnvRefsGroupItemProvider {
-
- /**
- * This constructs an instance from a factory and a notifier.
- */
- public WebAppItemProvider(AdapterFactory adapterFactory) {
- super(adapterFactory);
- }
-
- /**
- * This creates a new child for {@link org.eclipse.jst.j2ee.internal.internal.webapplication.commandCreateChildCommand}.
- */
- public Object createChild(Object object) {
- // TODO: check that this is what you want.
- ContextParam child = WebapplicationFactory.eINSTANCE.createContextParam();
-
- // TODO: initialize child here...
-
- return child;
- }
-
- /*
- * (non-Javadoc)
- *
- * @see org.eclipse.emf.edit.provider.ItemProviderAdapter#getChildren(java.lang.Object)
- */
- @Override
- public Collection getChildren(Object object) {
- WebApp webApp = (WebApp) object;
- Collection myChildren = super.getChildren(object);
- if (webApp.getVersionID() <= J2EEVersionConstants.WEB_2_3_ID) {
- WSDLServiceHelper serviceHelper = WSDLServiceExtManager.getServiceHelper();
- myChildren.addAll(serviceHelper.get13ServiceRefs(webApp));
- }
- return myChildren;
- }
-
- /**
- * This specifies how to implement {@link #getChildren}and {@link AddCommand}and
- * {@link RemoveCommand}support in {@link #createCommand}.
- */
-
-
- @Override
- public Collection getChildrenReferences(Object object) {
- if (childrenReferences == null) {
- super.getChildrenReferences(object);
- childrenReferences.add(WebapplicationPackage.eINSTANCE.getWebApp_Contexts());
- childrenReferences.add(WebapplicationPackage.eINSTANCE.getWebApp_ErrorPages());
- childrenReferences.add(WebapplicationPackage.eINSTANCE.getWebApp_FileList());
- childrenReferences.add(WebapplicationPackage.eINSTANCE.getWebApp_TagLibs());
- childrenReferences.add(WebapplicationPackage.eINSTANCE.getWebApp_Constraints());
- //childrenReferences.add(WebapplicationPackage.eINSTANCE.getWebApp_LoginConfig());
- childrenReferences.add(WebapplicationPackage.eINSTANCE.getWebApp_MimeMappings());
- //childrenReferences.add(WebapplicationPackage.eINSTANCE.getWebApp_SessionConfig());
- childrenReferences.add(WebapplicationPackage.eINSTANCE.getWebApp_ServletMappings());
- childrenReferences.add(WebapplicationPackage.eINSTANCE.getWebApp_Servlets());
- childrenReferences.add(WebapplicationPackage.eINSTANCE.getWebApp_SecurityRoles());
- childrenReferences.add(WebapplicationPackage.eINSTANCE.getWebApp_Filters());
- childrenReferences.add(WebapplicationPackage.eINSTANCE.getWebApp_FilterMappings());
- childrenReferences.add(WebapplicationPackage.eINSTANCE.getWebApp_Listeners());
- childrenReferences.add(WebapplicationPackage.eINSTANCE.getWebApp_ContextParams());
- childrenReferences.add(WebapplicationPackage.eINSTANCE.getWebApp_JspConfig());
- childrenReferences.add(WebapplicationPackage.eINSTANCE.getWebApp_MessageDestinations());
- childrenReferences.add(WebapplicationPackage.eINSTANCE.getWebApp_LocalEncodingMappingList());
- }
- return childrenReferences;
- }
-
- /**
- * <!-- begin-user-doc --> <!-- end-user-doc -->
- *
- * @generated
- */
- @Override
- protected EReference getChildReference(Object object, Object child) {
- // Check the type of the specified child object and return the proper feature to use for
- // adding (see {@link AddCommand}) it as a child.
-
- return super.getChildReference(object, child);
- }
-
-
- /**
- * This returns the image for {@link org.eclipse.jst.j2ee.internal.internal.webapplication.commandCreateChildCommand}.
- */
- public Object getCreateChildImage(Object object) {
- EObject refObject = (EObject) object;
- return WebPlugin.getDefault().getImage(refObject.eClass().getName() + "CreateContextParam"); //$NON-NLS-1$
- }
-
- /**
- * This returns the label for {@link org.eclipse.jst.j2ee.internal.internal.webapplication.commandCreateChildCommand}.
- */
- public String getCreateChildText(Object object) {
- return WebAppEditResourceHandler.getString("Create_ContextParam_UI_"); //$NON-NLS-1$ = "Create ContextParam"
- }
-
- /**
- * This returns the help text for
- * {@link org.eclipse.jst.j2ee.internal.internal.webapplication.commandCreateChildCommand}.
- */
- public String getCreateChildToolTipText(Object object) {
- EObject refObject = (EObject) object;
- return WebAppEditResourceHandler.getString("35concat_UI_", (new Object[]{refObject.eClass().getName()})); //$NON-NLS-1$ = "Create a child of type ContextParam for the selected {0}."
- }
-
- @Override
- public Object getImage(Object object) {
- String key = null;
- if (((WebApp) object).eResource() == null)
- return J2EEPlugin.getPlugin().getImage("web_application"); //$NON-NLS-1$
- switch (((WebApp) object).getVersionID()) {
- case J2EEVersionConstants.WEB_2_2_ID :
- key = "webapp_22"; //$NON-NLS-1$
- break;
-
- case J2EEVersionConstants.WEB_2_3_ID :
- key = "webapp_23"; //$NON-NLS-1$
- break;
-
- case J2EEVersionConstants.WEB_2_4_ID :
- default :
- key = "webapp_24"; //$NON-NLS-1$
- break;
- }
- return WebPlugin.getDefault().getImage(key);
- }
-
- /**
- * This returns the property descriptors for the adapted class.
- */
- @Override
- public List getPropertyDescriptors(Object object) {
- if (itemPropertyDescriptors == null) {
- super.getPropertyDescriptors(object);
-
- WebapplicationPackage pkg = WebapplicationPackage.eINSTANCE;
-
- // This is for the distributable feature.
- //
- itemPropertyDescriptors.add(new ItemPropertyDescriptor(((ComposeableAdapterFactory) adapterFactory).getRootAdapterFactory(), WebAppEditResourceHandler.getString("Distributable_UI_"), //$NON-NLS-1$
- //$NON-NLS-1$ = "Distributable"
- WebAppEditResourceHandler.getString("The_distributable_property_UI_"), //$NON-NLS-1$ = "The distributable property"
- pkg.getWebApp_Distributable()));
-
-
- // This is for the fileList feature.
- //
- itemPropertyDescriptors.add(new ItemPropertyDescriptor(((ComposeableAdapterFactory) adapterFactory).getRootAdapterFactory(), WebAppEditResourceHandler.getString("FileList_UI_"), //$NON-NLS-1$ = "FileList"
- WebAppEditResourceHandler.getString("The_fileList_property_UI_"), //$NON-NLS-1$ = "The fileList property"
- pkg.getWebApp_FileList()));
-
- /*
- * // ccc - for usability reasons, these descriptors are removed from the property
- * sheet. // This is for the loginConfig feature. // itemPropertyDescriptors.add (new
- * ItemPropertyDescriptor
- * (((ComposeableAdapterFactory)adapterFactory).getRootAdapterFactory(), "LoginConfig",
- * "The loginConfig property", pkg.getWebApp_LoginConfig()));
- * // This is for the sessionConfig feature. // itemPropertyDescriptors.add (new
- * ItemPropertyDescriptor
- * (((ComposeableAdapterFactory)adapterFactory).getRootAdapterFactory(),
- * "SessionConfig", "The sessionConfig property", pkg.getWebApp_SessionConfig()));
- */
-
- }
- return itemPropertyDescriptors;
- }
-
- /**
- * This adds a property descriptor for the Distributable feature. <!-- begin-user-doc --> <!--
- * end-user-doc -->
- *
- * @generated
- */
- protected void addDistributablePropertyDescriptor(Object object) {
- itemPropertyDescriptors.add(new ItemPropertyDescriptor(((ComposeableAdapterFactory) adapterFactory).getRootAdapterFactory(), getString("_UI_WebApp_distributable_feature"), //$NON-NLS-1$
- getString("_UI_PropertyDescriptor_description", "_UI_WebApp_distributable_feature", "_UI_WebApp_type"), //$NON-NLS-1$ //$NON-NLS-2$ //$NON-NLS-3$
- WebapplicationPackage.eINSTANCE.getWebApp_Distributable(), true, ItemPropertyDescriptor.BOOLEAN_VALUE_IMAGE));
- }
-
- /**
- * This adds a property descriptor for the Version feature. <!-- begin-user-doc --> <!--
- * end-user-doc -->
- *
- * @generated
- */
- protected void addVersionPropertyDescriptor(Object object) {
- itemPropertyDescriptors.add(new ItemPropertyDescriptor(((ComposeableAdapterFactory) adapterFactory).getRootAdapterFactory(), getString("_UI_WebApp_version_feature"), //$NON-NLS-1$
- getString("_UI_PropertyDescriptor_description", "_UI_WebApp_version_feature", "_UI_WebApp_type"), //$NON-NLS-1$ //$NON-NLS-2$ //$NON-NLS-3$
- WebapplicationPackage.eINSTANCE.getWebApp_Version(), true, ItemPropertyDescriptor.GENERIC_VALUE_IMAGE));
- }
-
- @Override
- public String getText(Object object) {
- WebApp webApp = (WebApp) object;
- String name = webApp.getDisplayName();
- if (name == null)
- name = WebAppEditResourceHandler.getString("<web_app>_UI_"); //$NON-NLS-1$ = "<web app>"
- return name;
- }
-
- /**
- * This handles notification by calling {@link #fireNotifyChanged fireNotifyChanged}. <!--
- * begin-user-doc --> <!-- end-user-doc -->
- *
- * @generated
- */
- @Override
- public void notifyChanged(Notification notification) {
- switch (notification.getFeatureID(WebApp.class)) {
- case WebapplicationPackage.WEB_APP__DISTRIBUTABLE :
- case WebapplicationPackage.WEB_APP__VERSION :
- case WebapplicationPackage.WEB_APP__CONTEXTS :
- case WebapplicationPackage.WEB_APP__ERROR_PAGES :
- case WebapplicationPackage.WEB_APP__FILE_LIST :
- case WebapplicationPackage.WEB_APP__TAG_LIBS :
- case WebapplicationPackage.WEB_APP__CONSTRAINTS :
- case WebapplicationPackage.WEB_APP__LOGIN_CONFIG :
- case WebapplicationPackage.WEB_APP__MIME_MAPPINGS :
- case WebapplicationPackage.WEB_APP__SESSION_CONFIG :
- case WebapplicationPackage.WEB_APP__SERVLET_MAPPINGS :
- case WebapplicationPackage.WEB_APP__SERVLETS :
- case WebapplicationPackage.WEB_APP__SECURITY_ROLES :
- case WebapplicationPackage.WEB_APP__FILTERS :
- case WebapplicationPackage.WEB_APP__FILTER_MAPPINGS :
- case WebapplicationPackage.WEB_APP__LISTENERS :
- case WebapplicationPackage.WEB_APP__CONTEXT_PARAMS :
- case WebapplicationPackage.WEB_APP__JSP_CONFIG :
- case WebapplicationPackage.WEB_APP__MESSAGE_DESTINATIONS :
- case WebapplicationPackage.WEB_APP__LOCAL_ENCODING_MAPPING_LIST : {
- fireNotifyChanged(notification);
- return;
- }
- }
- super.notifyChanged(notification);
- }
-
- /**
- * This adds to the collection of {@link org.eclipse.emf.edit.command.CommandParameter}s
- * describing all of the children that can be created under this object. <!-- begin-user-doc -->
- * <!-- end-user-doc -->
- *
- * @generated
- */
- @Override
- protected void collectNewChildDescriptors(Collection newChildDescriptors, Object object) {
- super.collectNewChildDescriptors(newChildDescriptors, object);
-
- newChildDescriptors.add(createChildParameter(WebapplicationPackage.eINSTANCE.getWebApp_Contexts(), WebapplicationFactory.eINSTANCE.createContextParam()));
-
- newChildDescriptors.add(createChildParameter(WebapplicationPackage.eINSTANCE.getWebApp_ErrorPages(), WebapplicationFactory.eINSTANCE.createErrorPage()));
-
- newChildDescriptors.add(createChildParameter(WebapplicationPackage.eINSTANCE.getWebApp_ErrorPages(), WebapplicationFactory.eINSTANCE.createExceptionTypeErrorPage()));
-
- newChildDescriptors.add(createChildParameter(WebapplicationPackage.eINSTANCE.getWebApp_ErrorPages(), WebapplicationFactory.eINSTANCE.createErrorCodeErrorPage()));
-
- newChildDescriptors.add(createChildParameter(WebapplicationPackage.eINSTANCE.getWebApp_FileList(), WebapplicationFactory.eINSTANCE.createWelcomeFileList()));
-
- newChildDescriptors.add(createChildParameter(WebapplicationPackage.eINSTANCE.getWebApp_TagLibs(), WebapplicationFactory.eINSTANCE.createTagLibRef()));
-
- newChildDescriptors.add(createChildParameter(WebapplicationPackage.eINSTANCE.getWebApp_Constraints(), WebapplicationFactory.eINSTANCE.createSecurityConstraint()));
-
- newChildDescriptors.add(createChildParameter(WebapplicationPackage.eINSTANCE.getWebApp_LoginConfig(), WebapplicationFactory.eINSTANCE.createLoginConfig()));
-
- newChildDescriptors.add(createChildParameter(WebapplicationPackage.eINSTANCE.getWebApp_MimeMappings(), WebapplicationFactory.eINSTANCE.createMimeMapping()));
-
- newChildDescriptors.add(createChildParameter(WebapplicationPackage.eINSTANCE.getWebApp_SessionConfig(), WebapplicationFactory.eINSTANCE.createSessionConfig()));
-
- newChildDescriptors.add(createChildParameter(WebapplicationPackage.eINSTANCE.getWebApp_ServletMappings(), WebapplicationFactory.eINSTANCE.createServletMapping()));
-
- newChildDescriptors.add(createChildParameter(WebapplicationPackage.eINSTANCE.getWebApp_Servlets(), WebapplicationFactory.eINSTANCE.createServlet()));
-
- newChildDescriptors.add(createChildParameter(WebapplicationPackage.eINSTANCE.getWebApp_SecurityRoles(), CommonFactory.eINSTANCE.createSecurityRole()));
-
- newChildDescriptors.add(createChildParameter(WebapplicationPackage.eINSTANCE.getWebApp_Filters(), WebapplicationFactory.eINSTANCE.createFilter()));
-
- newChildDescriptors.add(createChildParameter(WebapplicationPackage.eINSTANCE.getWebApp_FilterMappings(), WebapplicationFactory.eINSTANCE.createFilterMapping()));
-
- newChildDescriptors.add(createChildParameter(WebapplicationPackage.eINSTANCE.getWebApp_Listeners(), CommonFactory.eINSTANCE.createListener()));
-
- newChildDescriptors.add(createChildParameter(WebapplicationPackage.eINSTANCE.getWebApp_ContextParams(), CommonFactory.eINSTANCE.createParamValue()));
-
- newChildDescriptors.add(createChildParameter(WebapplicationPackage.eINSTANCE.getWebApp_JspConfig(), JspFactory.eINSTANCE.createJSPConfig()));
-
- newChildDescriptors.add(createChildParameter(WebapplicationPackage.eINSTANCE.getWebApp_MessageDestinations(), CommonFactory.eINSTANCE.createMessageDestination()));
-
- newChildDescriptors.add(createChildParameter(WebapplicationPackage.eINSTANCE.getWebApp_LocalEncodingMappingList(), WebapplicationFactory.eINSTANCE.createLocalEncodingMappingList()));
- }
-
- /**
- * This returns the label text for {@link org.eclipse.emf.edit.command.CreateChildCommand}.
- * <!-- begin-user-doc --> <!-- end-user-doc -->
- *
- * @generated
- */
- @Override
- public String getCreateChildText(Object owner, Object feature, Object child, Collection selection) {
- boolean qualify = feature == CommonPackage.eINSTANCE.getJNDIEnvRefsGroup_EjbRefs() || feature == CommonPackage.eINSTANCE.getJNDIEnvRefsGroup_EjbLocalRefs();
- return getString(qualify ? "_UI_CreateChild_text2" : "_UI_CreateChild_text", //$NON-NLS-1$ //$NON-NLS-2$
- new Object[]{getTypeText(child), getFeatureText(feature), getTypeText(owner)});
- }
-
- /**
- * Return the resource locator for this item provider's resources. <!-- begin-user-doc --> <!--
- * end-user-doc -->
- *
- * @generated
- */
- @Override
- public ResourceLocator getResourceLocator() {
- return J2EEPlugin.getDefault();
- }
-}
diff --git a/plugins/org.eclipse.jst.j2ee.web/webedit/org/eclipse/jst/j2ee/internal/web/providers/WebResourceCollectionItemProvider.java b/plugins/org.eclipse.jst.j2ee.web/webedit/org/eclipse/jst/j2ee/internal/web/providers/WebResourceCollectionItemProvider.java
deleted file mode 100644
index f72bd2b..0000000
--- a/plugins/org.eclipse.jst.j2ee.web/webedit/org/eclipse/jst/j2ee/internal/web/providers/WebResourceCollectionItemProvider.java
+++ /dev/null
@@ -1,307 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2003, 2005 IBM Corporation and others.
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
- *
- * Contributors:
- * IBM Corporation - initial API and implementation
- *******************************************************************************/
-package org.eclipse.jst.j2ee.internal.web.providers;
-
-import java.util.ArrayList;
-import java.util.Collection;
-import java.util.List;
-
-import org.eclipse.emf.common.command.Command;
-import org.eclipse.emf.common.notify.AdapterFactory;
-import org.eclipse.emf.common.notify.Notification;
-import org.eclipse.emf.common.util.ResourceLocator;
-import org.eclipse.emf.ecore.EObject;
-import org.eclipse.emf.ecore.EReference;
-import org.eclipse.emf.ecore.EStructuralFeature;
-import org.eclipse.emf.edit.command.AddCommand;
-import org.eclipse.emf.edit.command.CommandParameter;
-import org.eclipse.emf.edit.command.RemoveCommand;
-import org.eclipse.emf.edit.domain.EditingDomain;
-import org.eclipse.emf.edit.provider.ComposeableAdapterFactory;
-import org.eclipse.emf.edit.provider.IEditingDomainItemProvider;
-import org.eclipse.emf.edit.provider.IItemLabelProvider;
-import org.eclipse.emf.edit.provider.IItemPropertySource;
-import org.eclipse.emf.edit.provider.ITreeItemContentProvider;
-import org.eclipse.emf.edit.provider.ItemPropertyDescriptor;
-import org.eclipse.jst.j2ee.common.CommonFactory;
-import org.eclipse.jst.j2ee.internal.plugin.J2EEPlugin;
-import org.eclipse.jst.j2ee.internal.web.plugin.WebPlugin;
-import org.eclipse.jst.j2ee.webapplication.URLPatternType;
-import org.eclipse.jst.j2ee.webapplication.WebResourceCollection;
-import org.eclipse.jst.j2ee.webapplication.WebapplicationFactory;
-import org.eclipse.jst.j2ee.webapplication.WebapplicationPackage;
-import org.eclipse.jst.j2ee.webservice.wscommon.WscommonFactory;
-
-/**
- * This is the item provider adpater for a
- * {@link org.eclipse.jst.j2ee.internal.internal.webapplication.WebResourceCollection}object.
- */
-public class WebResourceCollectionItemProvider extends WebapplicationItemProviderAdapter implements IEditingDomainItemProvider, IItemLabelProvider, IItemPropertySource, ITreeItemContentProvider {
-
- /**
- * This constructs an instance from a factory and a notifier.
- */
- public WebResourceCollectionItemProvider(AdapterFactory adapterFactory) {
- super(adapterFactory);
- }
-
- /**
- * This creates a new child for {@link org.eclipse.jst.j2ee.internal.internal.webapplication.commandCreateChildCommand}.
- */
- @Override
- public Object createChild(Object object) {
- // TODO: check that this is what you want.
- URLPatternType child = WebapplicationFactory.eINSTANCE.createURLPatternType();
-
- // TODO: initialize child here...
-
- return child;
- }
-
- /**
- * This specifies how to implement {@link #getChildren}and {@link AddCommand}and
- * {@link RemoveCommand}support in {@link #createCommand}.
- */
- @Override
- public Collection getChildrenReferences(Object object) {
- WebapplicationPackage pkg = WebapplicationPackage.eINSTANCE;
- Collection result = new ArrayList();
- result.add(pkg.getWebResourceCollection_UrlPattern());
- result.add(pkg.getWebResourceCollection_HttpMethod());
- return result;
- }
-
- /**
- * <!-- begin-user-doc --> <!-- end-user-doc -->
- *
- * @generated
- */
- @Override
- protected EReference getChildReference(Object object, Object child) {
- // Check the type of the specified child object and return the proper feature to use for
- // adding (see {@link AddCommand}) it as a child.
-
- return super.getChildReference(object, child);
- }
-
-
- /**
- * This returns the image for {@link org.eclipse.jst.j2ee.internal.internal.webapplication.commandCreateChildCommand}.
- */
- @Override
- public Object getCreateChildImage(Object object) {
- EObject refObject = (EObject) object;
- return WebPlugin.getDefault().getImage(refObject.eClass().getName() + "CreateURLPatternType");//$NON-NLS-1$
- }
-
- /**
- * This returns the label for {@link org.eclipse.jst.j2ee.internal.internal.webapplication.commandCreateChildCommand}.
- */
- @Override
- public String getCreateChildText(Object object) {
- return WebAppEditResourceHandler.getString("Create_URLPatternType_UI_"); //$NON-NLS-1$ = "Create URLPatternType"
- }
-
- /**
- * This returns the help text for
- * {@link org.eclipse.jst.j2ee.internal.internal.webapplication.commandCreateChildCommand}.
- */
- @Override
- public String getCreateChildToolTipText(Object object) {
- EObject refObject = (EObject) object;
- return WebAppEditResourceHandler.getString("37concat_UI_", (new Object[]{refObject.eClass().getName()})); //$NON-NLS-1$ = "Create a child of type URLPatternType for the selected {0}."
- }
-
- /**
- * This returns web_resource_collection.gif.
- */
- @Override
- public Object getImage(Object object) {
- return WebPlugin.getDefault().getImage("web_resource_collection");//$NON-NLS-1$
- }
-
- /**
- * This returns the secConstraint of the WebResourceCollection.
- */
- @Override
- public Object getParent(Object object) {
- return ((WebResourceCollection) object).getSecConstraint();
- }
-
- /**
- * This returns the property descriptors for the adapted class.
- */
- @Override
- public List getPropertyDescriptors(Object object) {
- if (itemPropertyDescriptors == null) {
- super.getPropertyDescriptors(object);
-
- WebapplicationPackage pkg = WebapplicationPackage.eINSTANCE;
-
- // This is for the webResourceName feature.
- //
- itemPropertyDescriptors.add(new ItemPropertyDescriptor(((ComposeableAdapterFactory) adapterFactory).getRootAdapterFactory(), WebAppEditResourceHandler.getString("WebResourceName_UI_"), //$NON-NLS-1$ = "WebResourceName"
- WebAppEditResourceHandler.getString("The_webResourceName_proper_UI_"), //$NON-NLS-1$ = "The webResourceName property"
- pkg.getWebResourceCollection_WebResourceName()));
-
- // This is for the description feature.
- //
- itemPropertyDescriptors.add(new ItemPropertyDescriptor(((ComposeableAdapterFactory) adapterFactory).getRootAdapterFactory(), WebAppEditResourceHandler.getString("Description_UI__UI_"), //$NON-NLS-1$ = "Description"
- WebAppEditResourceHandler.getString("The_description_property_UI_"), //$NON-NLS-1$ = "The description property"
- pkg.getWebResourceCollection_Description()));
-
- // This is for the secConstraint feature.
- //
- itemPropertyDescriptors.add(new ItemPropertyDescriptor(((ComposeableAdapterFactory) adapterFactory).getRootAdapterFactory(), WebAppEditResourceHandler.getString("SecConstraint_UI_"), //$NON-NLS-1$ = "SecConstraint"
- WebAppEditResourceHandler.getString("The_secConstraint_property_UI_"), //$NON-NLS-1$ = "The secConstraint property"
- pkg.getWebResourceCollection_SecConstraint()));
-
- }
- return itemPropertyDescriptors;
- }
-
- /**
- * This adds a property descriptor for the Web Resource Name feature. <!-- begin-user-doc -->
- * <!-- end-user-doc -->
- *
- * @generated
- */
- protected void addWebResourceNamePropertyDescriptor(Object object) {
- itemPropertyDescriptors.add(new ItemPropertyDescriptor(((ComposeableAdapterFactory) adapterFactory).getRootAdapterFactory(), getString("_UI_WebResourceCollection_webResourceName_feature"), //$NON-NLS-1$
- getString("_UI_PropertyDescriptor_description", "_UI_WebResourceCollection_webResourceName_feature", "_UI_WebResourceCollection_type"), //$NON-NLS-1$ //$NON-NLS-2$ //$NON-NLS-3$
- WebapplicationPackage.eINSTANCE.getWebResourceCollection_WebResourceName(), true, ItemPropertyDescriptor.GENERIC_VALUE_IMAGE));
- }
-
- /**
- * This adds a property descriptor for the Description feature. <!-- begin-user-doc --> <!--
- * end-user-doc -->
- *
- * @generated
- */
- protected void addDescriptionPropertyDescriptor(Object object) {
- itemPropertyDescriptors.add(new ItemPropertyDescriptor(((ComposeableAdapterFactory) adapterFactory).getRootAdapterFactory(), getString("_UI_WebResourceCollection_description_feature"), //$NON-NLS-1$
- getString("_UI_PropertyDescriptor_description", "_UI_WebResourceCollection_description_feature", "_UI_WebResourceCollection_type"), //$NON-NLS-1$ //$NON-NLS-2$ //$NON-NLS-3$
- WebapplicationPackage.eINSTANCE.getWebResourceCollection_Description(), true, ItemPropertyDescriptor.GENERIC_VALUE_IMAGE));
- }
-
- /**
- * This adds a property descriptor for the Url Pattern feature. <!-- begin-user-doc --> <!--
- * end-user-doc -->
- *
- * @generated
- */
- protected void addUrlPatternPropertyDescriptor(Object object) {
- itemPropertyDescriptors.add(new ItemPropertyDescriptor(((ComposeableAdapterFactory) adapterFactory).getRootAdapterFactory(), getString("_UI_WebResourceCollection_urlPattern_feature"), //$NON-NLS-1$
- getString("_UI_PropertyDescriptor_description", "_UI_WebResourceCollection_urlPattern_feature", "_UI_WebResourceCollection_type"), //$NON-NLS-1$ //$NON-NLS-2$ //$NON-NLS-3$
- WebapplicationPackage.eINSTANCE.getWebResourceCollection_UrlPattern(), true, ItemPropertyDescriptor.GENERIC_VALUE_IMAGE));
- }
-
- /**
- * This adds a property descriptor for the Http Method feature. <!-- begin-user-doc --> <!--
- * end-user-doc -->
- *
- * @generated
- */
- protected void addHttpMethodPropertyDescriptor(Object object) {
- itemPropertyDescriptors.add(new ItemPropertyDescriptor(((ComposeableAdapterFactory) adapterFactory).getRootAdapterFactory(), getString("_UI_WebResourceCollection_httpMethod_feature"), //$NON-NLS-1$
- getString("_UI_PropertyDescriptor_description", "_UI_WebResourceCollection_httpMethod_feature", "_UI_WebResourceCollection_type"), //$NON-NLS-1$ //$NON-NLS-2$ //$NON-NLS-3$
- WebapplicationPackage.eINSTANCE.getWebResourceCollection_HttpMethod(), true, ItemPropertyDescriptor.GENERIC_VALUE_IMAGE));
- }
-
- @Override
- public String getText(Object object) {
- // return WebAppEditResourceHandler.getString("38concat_UI_", (new Object[] {
- // ((WebResourceCollection)object).getWebResourceName() })); //$NON-NLS-1$ =
- // "WebResourceCollection {0}"
- return ((WebResourceCollection) object).getWebResourceName();
- }
-
- /**
- * This handles notification by calling {@link #fireNotifyChanged fireNotifyChanged}. <!--
- * begin-user-doc --> <!-- end-user-doc -->
- *
- * @generated
- */
- @Override
- public void notifyChanged(Notification notification) {
- switch (notification.getFeatureID(WebResourceCollection.class)) {
- case WebapplicationPackage.WEB_RESOURCE_COLLECTION__WEB_RESOURCE_NAME :
- case WebapplicationPackage.WEB_RESOURCE_COLLECTION__DESCRIPTION :
- case WebapplicationPackage.WEB_RESOURCE_COLLECTION__URL_PATTERN :
- case WebapplicationPackage.WEB_RESOURCE_COLLECTION__HTTP_METHOD :
- case WebapplicationPackage.WEB_RESOURCE_COLLECTION__UR_LS :
- case WebapplicationPackage.WEB_RESOURCE_COLLECTION__DESCRIPTIONS :
- case WebapplicationPackage.WEB_RESOURCE_COLLECTION__HTT_PS : {
- fireNotifyChanged(notification);
- return;
- }
- }
- super.notifyChanged(notification);
- }
-
- /**
- * This adds to the collection of {@link org.eclipse.emf.edit.command.CommandParameter}s
- * describing all of the children that can be created under this object. <!-- begin-user-doc -->
- * <!-- end-user-doc -->
- *
- * @generated
- */
- @Override
- protected void collectNewChildDescriptors(Collection newChildDescriptors, Object object) {
- super.collectNewChildDescriptors(newChildDescriptors, object);
-
- newChildDescriptors.add(createChildParameter(((WebResourceCollection) WebapplicationPackage.eINSTANCE.getWebResourceCollection()).getURLs(), WebapplicationFactory.eINSTANCE.createURLPatternType()));
-
- newChildDescriptors.add(createChildParameter(WebapplicationPackage.eINSTANCE.getWebResourceCollection_Descriptions(), CommonFactory.eINSTANCE.createDescription()));
-
- newChildDescriptors.add(createChildParameter(WebapplicationPackage.eINSTANCE.getWebResourceCollection_Descriptions(), WscommonFactory.eINSTANCE.createDescriptionType()));
-
- newChildDescriptors.add(createChildParameter(((WebResourceCollection) WebapplicationPackage.eINSTANCE.getWebResourceCollection()).getHttpMethod(), WebapplicationFactory.eINSTANCE.createHTTPMethodType()));
- }
-
- /**
- * Return the resource locator for this item provider's resources. <!-- begin-user-doc --> <!--
- * end-user-doc -->
- *
- * @generated
- */
- @Override
- public ResourceLocator getResourceLocator() {
- return J2EEPlugin.getDefault();
- }
-
- /*
- * (non-Javadoc)
- *
- * @see org.eclipse.emf.edit.provider.IEditingDomainItemProvider#createCommand(java.lang.Object,
- * org.eclipse.emf.edit.domain.EditingDomain, java.lang.Class,
- * org.eclipse.emf.edit.command.CommandParameter)
- */
- @Override
- public Command createCommand(Object object, EditingDomain editingDomain, Class commandClass, CommandParameter commandParameter) {
- EStructuralFeature sf = commandParameter.getEReference();
- if (sf == null) {
- sf = commandParameter.getEAttribute();
- if (sf != null && !sf.isMany())
- sf = null;
- }
- if (sf != null) {
- EObject owner = commandParameter.getEOwner();
- Collection collection = commandParameter.getCollection();
- if (commandClass == AddCommand.class) {
- return createAddCommand(editingDomain, owner, sf, collection, commandParameter.getIndex());
- } else if (commandClass == RemoveCommand.class) {
- return createRemoveCommand(editingDomain, owner, sf, collection);
- }
- }
- return super.createCommand(object, editingDomain, commandClass, commandParameter);
- }
-}
diff --git a/plugins/org.eclipse.jst.j2ee.web/webedit/org/eclipse/jst/j2ee/internal/web/providers/WebToolingItemPropertyDescriptor.java b/plugins/org.eclipse.jst.j2ee.web/webedit/org/eclipse/jst/j2ee/internal/web/providers/WebToolingItemPropertyDescriptor.java
deleted file mode 100644
index 9662a20..0000000
--- a/plugins/org.eclipse.jst.j2ee.web/webedit/org/eclipse/jst/j2ee/internal/web/providers/WebToolingItemPropertyDescriptor.java
+++ /dev/null
@@ -1,143 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2003, 2004 IBM Corporation and others.
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
- *
- * Contributors:
- * IBM Corporation - initial API and implementation
- *******************************************************************************/
-package org.eclipse.jst.j2ee.internal.web.providers;
-
-import org.eclipse.emf.common.command.Command;
-import org.eclipse.emf.common.command.CompoundCommand;
-import org.eclipse.emf.common.notify.AdapterFactory;
-import org.eclipse.emf.ecore.EObject;
-import org.eclipse.emf.ecore.EReference;
-import org.eclipse.emf.ecore.EStructuralFeature;
-import org.eclipse.emf.edit.command.SetCommand;
-import org.eclipse.emf.edit.domain.EditingDomain;
-import org.eclipse.emf.edit.provider.ItemPropertyDescriptor;
-
-/**
- * Insert the type's description here. Creation date: (12/11/2000 5:54:28 PM)
- *
- * @author: Administrator
- */
-public class WebToolingItemPropertyDescriptor extends ItemPropertyDescriptor {
-
- protected int cellEditorType = -1;
- public final static int SMALL_ICON_EDITOR = 1;
- public final static int LARGE_ICON_EDITOR = 2;
- public final static int MULTILINE_TEXT_EDITOR = 3;
- public final static int AUTH_CONSTRAINT_ROLES_EDITOR = 4;
-
- /**
- * This creates an instance where the category and filter flags are empty and the cell editor is
- * determined for the references.
- */
- public WebToolingItemPropertyDescriptor(AdapterFactory adapterFactory, String displayName, String description, EReference[] parentReferences) {
- super(adapterFactory, displayName, description, parentReferences);
- }
-
- /**
- * This creates an instance where the category is filter flags are empty and the cell editor is
- * determined from the type of the structural feature>
- */
- public WebToolingItemPropertyDescriptor(AdapterFactory adapterFactory, String displayName, String description, EStructuralFeature feature) {
- super(adapterFactory, displayName, description, feature);
- }
-
- /**
- * This creates an instance where the category is filter flags are empty and the cell editor is
- * determined from the type of the structural feature>
- */
- public WebToolingItemPropertyDescriptor(AdapterFactory adapterFactory, String displayName, String description, EStructuralFeature feature, int newCellEditorType) {
- super(adapterFactory, displayName, description, feature);
- cellEditorType = newCellEditorType;
- }
-
- protected void executeCommand(EditingDomain editingDomain, Command command) {
- //TODO We need to use the CommandStack from the WebEditModel.
- // if (editingDomain instanceof StructuredTextEditingDomain)
- // ((StructuredTextEditingDomain) editingDomain).execute(command);
- // else
- // editingDomain.getCommandStack().execute(command);
-
- }
-
- /**
- * Returns the editor type.
- */
- public int getCellEditorType() {
- return cellEditorType;
- }
-
- /**
- * This does the delegated job of setting the property to the given value. It is implemented in
- * a generic way using the structural feature.
- */
- @Override
- public void setPropertyValue(Object object, Object value) {
- EObject refObject = (EObject) object;
- EditingDomain editingDomain = getEditingDomain(object);
-
- if (parentReferences != null) {
- EObject refValue = (EObject) value;
- Command removeCommand = null;
- for (int i = 0; i < parentReferences.length; ++i) {
- Object oldValue = refObject.eGet(parentReferences[i]);
- if (oldValue != null) {
- final EReference parentReference = parentReferences[i];
- if (oldValue == value) {
- return;
- }
- // else if (refValue.refIsInstanceOf(parentReference.getEType(), true))
- else if (refValue.eClass() == parentReference.getEType() || refValue.eClass().getEAllSuperTypes().contains(parentReference.getEType())) {
- if (editingDomain == null) {
- refObject.eSet(parentReference, value);
- } else {
- Command setCommand = SetCommand.create(editingDomain, refObject, parentReference, value);
- executeCommand(editingDomain, setCommand);
- }
- return;
- } else {
- if (editingDomain == null) {
- refObject.eSet(parentReference, null);
- } else {
- removeCommand = SetCommand.create(editingDomain, refObject, parentReference, null);
- }
- break;
- }
- }
- }
-
- for (int i = 0; i < parentReferences.length; ++i) {
- final EReference parentReference = parentReferences[i];
- //if (refValue.refIsInstanceOf(parentReference.getEType(), true))
- if (refValue.eClass() == parentReference.getEType() || refValue.eClass().getEAllSuperTypes().contains(parentReference.getEType())) {
- if (editingDomain == null) {
- refObject.eSet(parentReferences[i], value);
- } else {
- if (removeCommand != null) {
- final CompoundCommand compoundCommand = new CompoundCommand(CompoundCommand.LAST_COMMAND_ALL);
- compoundCommand.append(removeCommand);
- compoundCommand.append(SetCommand.create(editingDomain, refObject, parentReference, value));
- executeCommand(editingDomain, compoundCommand);
- } else {
- executeCommand(editingDomain, SetCommand.create(editingDomain, refObject, parentReference, value));
- }
- }
- break;
- }
- }
- } else {
- if (editingDomain == null) {
- refObject.eSet(feature, value);
- } else {
- executeCommand(editingDomain, SetCommand.create(editingDomain, refObject, feature, value));
- }
- }
- }
-}
\ No newline at end of file
diff --git a/plugins/org.eclipse.jst.j2ee.web/webedit/org/eclipse/jst/j2ee/internal/web/providers/WebTypeItemProvider.java b/plugins/org.eclipse.jst.j2ee.web/webedit/org/eclipse/jst/j2ee/internal/web/providers/WebTypeItemProvider.java
deleted file mode 100644
index 2d67ec1..0000000
--- a/plugins/org.eclipse.jst.j2ee.web/webedit/org/eclipse/jst/j2ee/internal/web/providers/WebTypeItemProvider.java
+++ /dev/null
@@ -1,110 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2003, 2004 IBM Corporation and others.
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
- *
- * Contributors:
- * IBM Corporation - initial API and implementation
- *******************************************************************************/
-package org.eclipse.jst.j2ee.internal.web.providers;
-
-import java.util.Collection;
-import java.util.List;
-
-import org.eclipse.emf.common.notify.AdapterFactory;
-import org.eclipse.emf.common.notify.Notification;
-import org.eclipse.emf.common.util.ResourceLocator;
-import org.eclipse.emf.edit.provider.IEditingDomainItemProvider;
-import org.eclipse.emf.edit.provider.IItemLabelProvider;
-import org.eclipse.emf.edit.provider.IItemPropertySource;
-import org.eclipse.emf.edit.provider.ITreeItemContentProvider;
-import org.eclipse.jst.j2ee.internal.plugin.J2EEPlugin;
-import org.eclipse.jst.j2ee.internal.web.plugin.WebPlugin;
-
-
-/**
- * This is the item provider adpater for a {@link org.eclipse.jst.j2ee.internal.internal.webapplication.WebType}object.
- */
-public class WebTypeItemProvider extends WebapplicationItemProviderAdapter implements IEditingDomainItemProvider, IItemLabelProvider, IItemPropertySource, ITreeItemContentProvider {
-
- /**
- * This constructs an instance from a factory and a notifier.
- */
- public WebTypeItemProvider(AdapterFactory adapterFactory) {
- super(adapterFactory);
- }
-
- /**
- * This returns web_type.gif.
- */
- @Override
- public Object getImage(Object object) {
- return WebPlugin.getDefault().getImage("web_type");//$NON-NLS-1$
- }
-
- /**
- * This returns the property descriptors for the adapted class.
- */
- @Override
- public List getPropertyDescriptors(Object object) {
- if (itemPropertyDescriptors == null) {
- super.getPropertyDescriptors(object);
-
- //WebapplicationPackage pkg = WebapplicationPackage.eINSTANCE;;
-
- }
- return itemPropertyDescriptors;
- }
-
- @Override
- public String getText(Object object) {
- return WebAppEditResourceHandler.getString("WebType_UI_"); //$NON-NLS-1$ = "WebType"
- }
-
- /**
- * This handles notification by calling {@link #fireNotifyChanged fireNotifyChanged}. <!--
- * begin-user-doc --> <!-- end-user-doc -->
- *
- * @generated
- */
- @Override
- public void notifyChanged(Notification notification) {
- super.notifyChanged(notification);
- }
-
- /**
- * This adds to the collection of {@link org.eclipse.emf.edit.command.CommandParameter}s
- * describing all of the children that can be created under this object. <!-- begin-user-doc -->
- * <!-- end-user-doc -->
- *
- * @generated
- */
- @Override
- protected void collectNewChildDescriptors(Collection newChildDescriptors, Object object) {
- super.collectNewChildDescriptors(newChildDescriptors, object);
- }
-
- /**
- * Return the resource locator for this item provider's resources. <!-- begin-user-doc --> <!--
- * end-user-doc -->
- *
- * @generated
- */
- @Override
- public ResourceLocator getResourceLocator() {
- return J2EEPlugin.getDefault();
- }
-
- /**
- * This always returns false. The base class has already implemented
- * {@link org.eclipse.emf.edit.provider.ItemProviderAdapter#getChildren ItemProviderAdapter.getChildren}
- * to return the empty enumeration, and this to check that enumeration, but we know there can't
- * be any children, so this is faster.
- */
- @Override
- public boolean hasChildren(Object object) {
- return false;
- }
-}
\ No newline at end of file
diff --git a/plugins/org.eclipse.jst.j2ee.web/webedit/org/eclipse/jst/j2ee/internal/web/providers/WebapplicationItemProviderAdapter.java b/plugins/org.eclipse.jst.j2ee.web/webedit/org/eclipse/jst/j2ee/internal/web/providers/WebapplicationItemProviderAdapter.java
deleted file mode 100644
index fa80205..0000000
--- a/plugins/org.eclipse.jst.j2ee.web/webedit/org/eclipse/jst/j2ee/internal/web/providers/WebapplicationItemProviderAdapter.java
+++ /dev/null
@@ -1,118 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2003, 2004 IBM Corporation and others.
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
- *
- * Contributors:
- * IBM Corporation - initial API and implementation
- *******************************************************************************/
-package org.eclipse.jst.j2ee.internal.web.providers;
-
-import java.util.Collection;
-import java.util.Collections;
-
-import org.eclipse.emf.common.notify.AdapterFactory;
-import org.eclipse.emf.ecore.EObject;
-import org.eclipse.emf.ecore.EReference;
-import org.eclipse.jst.j2ee.internal.web.plugin.WebPlugin;
-
-
-/**
- * This extended item provider supports two addition features, (@link CreateChildCommand} and
- * {@link CreateChildrenCommand}. These two actions are implemented uniformly on all our item
- * adapters using this common base class.
- */
-public class WebapplicationItemProviderAdapter extends org.eclipse.emf.edit.provider.ItemProviderAdapter {
-
- /**
- * This creates and instance from an adapter factory and a domain notifier.
- */
- protected WebapplicationItemProviderAdapter(AdapterFactory adapterFactory) {
- super(adapterFactory);
- }
-
- /**
- * This implements the default behavior for
- * {@link org.eclipse.jst.j2ee.internal.internal.webapplication.command.CreateChildCommand}.
- */
- public Object createChild(Object object) {
- return null;
- }
-
- /**
- * This creates the default new children for {@link CreateChildrenCommand}.
- */
- public Collection createChildren(Object object) {
- return Collections.EMPTY_LIST;
- }
-
- /**
- * This returns the default create child image.
- */
- public Object getCreateChildImage(Object object) {
- EObject refObject = (EObject) object;
- Collection achildrenReferences = getChildrenReferences(object);
- if (achildrenReferences.size() != 1) {
- return WebPlugin.getDefault().getImage("create_child"); //$NON-NLS-1$
- }
- return WebPlugin.getDefault().getImage(refObject.eClass().getName() + "Create" + //$NON-NLS-1$
- ((EReference) achildrenReferences.iterator().next()).getEType().getName());
-
- }
-
- /**
- * This returns the default create children label.
- */
- public String getCreateChildrenText(Object object) {
- //EObject refObject = (EObject) object;
- Collection achildrenReferences = getChildrenReferences(object);
- if (achildrenReferences.size() != 1) {
- return WebAppEditResourceHandler.getString("Create_Two_Children_UI_"); //$NON-NLS-1$ = "Create Two Children"
- }
- return WebAppEditResourceHandler.getString("9concat_UI_", (new Object[]{((EReference) achildrenReferences.iterator().next()).getEType().getName()})); //$NON-NLS-1$ = "Create Two {0}s"
-
- }
-
- /**
- * This returns the default create children help text.
- */
- public String getCreateChildrenToolTipText(Object object) {
- EObject refObject = (EObject) object;
- Collection achildrenReferences = getChildrenReferences(object);
- if (achildrenReferences.size() != 1) {
- return WebAppEditResourceHandler.getString("7concat_UI_", (new Object[]{refObject.eClass().getName()})); //$NON-NLS-1$ = "Create two new children for the selected {0}."
- }
- return WebAppEditResourceHandler.getString("8concat_UI_", (new Object[]{((EReference) achildrenReferences.iterator().next()).getEType().getName(), refObject.eClass().getName()})); //$NON-NLS-1$
- //$NON-NLS-1$ = "Create two new children of type {0} for the selected {1}."
-
- }
-
- /**
- * This returns the default create child label.
- */
- public String getCreateChildText(Object object) {
- //EObject refObject = (EObject) object;
- Collection achildrenReferences = getChildrenReferences(object);
- if (achildrenReferences.size() != 1) {
- return WebAppEditResourceHandler.getString("Create_Child_UI_"); //$NON-NLS-1$ = "Create Child"
- }
- return WebAppEditResourceHandler.getString("6concat_UI_", (new Object[]{((EReference) achildrenReferences.iterator().next()).getEType().getName()})); //$NON-NLS-1$ = "Create {0}"
-
- }
-
- /**
- * This returns the default create child help text.
- */
- public String getCreateChildToolTipText(Object object) {
- EObject refObject = (EObject) object;
- Collection achildrenReferences = getChildrenReferences(object);
- if (achildrenReferences.size() != 1) {
- return WebAppEditResourceHandler.getString("2concat_UI_", (new Object[]{refObject.eClass().getName()})); //$NON-NLS-1$ = "Create a new child for the selected {0}."
- }
- return WebAppEditResourceHandler.getString("4concat_UI_", (new Object[]{((EReference) achildrenReferences.iterator().next()).getEType().getName(), refObject.eClass().getName()})); //$NON-NLS-1$
- //$NON-NLS-1$ = "Create a child of type {0} for the selected {1}."
-
- }
-}
\ No newline at end of file
diff --git a/plugins/org.eclipse.jst.j2ee.web/webedit/org/eclipse/jst/j2ee/internal/web/providers/WebapplicationItemProviderAdapterFactory.java b/plugins/org.eclipse.jst.j2ee.web/webedit/org/eclipse/jst/j2ee/internal/web/providers/WebapplicationItemProviderAdapterFactory.java
deleted file mode 100644
index 583d3fc..0000000
--- a/plugins/org.eclipse.jst.j2ee.web/webedit/org/eclipse/jst/j2ee/internal/web/providers/WebapplicationItemProviderAdapterFactory.java
+++ /dev/null
@@ -1,721 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2003, 2005 IBM Corporation and others.
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
- *
- * Contributors:
- * IBM Corporation - initial API and implementation
- *******************************************************************************/
-package org.eclipse.jst.j2ee.internal.web.providers;
-
-import java.util.ArrayList;
-import java.util.Collection;
-
-import org.eclipse.emf.common.notify.Adapter;
-import org.eclipse.emf.common.notify.Notification;
-import org.eclipse.emf.common.notify.Notifier;
-import org.eclipse.emf.edit.provider.ChangeNotifier;
-import org.eclipse.emf.edit.provider.ComposeableAdapterFactory;
-import org.eclipse.emf.edit.provider.ComposedAdapterFactory;
-import org.eclipse.emf.edit.provider.Disposable;
-import org.eclipse.emf.edit.provider.IChangeNotifier;
-import org.eclipse.emf.edit.provider.IDisposable;
-import org.eclipse.emf.edit.provider.IEditingDomainItemProvider;
-import org.eclipse.emf.edit.provider.IItemLabelProvider;
-import org.eclipse.emf.edit.provider.IItemPropertySource;
-import org.eclipse.emf.edit.provider.INotifyChangedListener;
-import org.eclipse.emf.edit.provider.IStructuredItemContentProvider;
-import org.eclipse.emf.edit.provider.ITableItemLabelProvider;
-import org.eclipse.emf.edit.provider.ITreeItemContentProvider;
-import org.eclipse.jst.j2ee.common.internal.provider.ListenerItemProvider;
-import org.eclipse.jst.j2ee.webapplication.internal.util.WebapplicationAdapterFactory;
-
-
-/**
- * This is the factory that is used to provide the interfaces needed to support
- * {@link org.eclipse.jface.viewer.ContentViewer}s. The adapters generated by this factory convert
- * MOF adapter notificiations into {@link org.eclipse.jface.DomainEvent}s. The adapters also
- * support property sheets, see {@link com.ibm.itp.ui.api.propertysheet}.
- */
-public class WebapplicationItemProviderAdapterFactory extends WebapplicationAdapterFactory implements ComposeableAdapterFactory, IChangeNotifier, IDisposable {
-
- /**
- * This keeps track of the root adapter factory that delegates to this adapter factory.
- */
- protected ComposedAdapterFactory parentAdapterFactory;
- /**
- * This is used to implement {@link org.eclipse.emf.edit.provider.IChangeNotifier}. <!--
- * begin-user-doc --> <!-- end-user-doc -->
- *
- * @generated
- */
- protected IChangeNotifier changeNotifier = new ChangeNotifier();
-
- /**
- * This keeps track of all the supported types checked by
- * {@link #isFactoryForType isFactoryForType}.
- */
- protected Collection supportedTypes = new ArrayList();
- /**
- * This keeps track of the one adapter used for all {@link org.eclipse.jst.j2ee.internal.internal.webapplication.WebApp}
- * instances.
- */
- protected WebAppItemProvider webAppItemProvider;
- /**
- * This keeps track of the one adapter used for all
- * {@link org.eclipse.jst.j2ee.internal.internal.webapplication.ContextParam}instances.
- */
- protected ContextParamItemProvider contextParamItemProvider;
- /**
- * This keeps track of the one adapter used for all
- * {@link org.eclipse.jst.j2ee.internal.internal.webapplication.ErrorPage}instances.
- */
- protected ErrorPageItemProvider errorPageItemProvider;
- /**
- * This keeps track of the one adapter used for all
- * {@link org.eclipse.jst.j2ee.internal.internal.webapplication.ExceptionTypeErrorPage}instances.
- */
- protected ExceptionTypeErrorPageItemProvider exceptionTypeErrorPageItemProvider;
- /**
- * This keeps track of the one adapter used for all {@link org.eclipse.jst.j2ee.internal.internal.webapplication.Filter}
- * instances.
- */
- protected FilterItemProvider filterItemProvider;
- /**
- * This keeps track of the one adapter used for all
- * {@link org.eclipse.jst.j2ee.internal.internal.webapplication.FilterMapping}instances.
- */
- protected FilterMappingItemProvider filterMappingItemProvider;
- /**
- * This keeps track of the one adapter used for all
- * {@link org.eclipse.jst.j2ee.internal.internal.webapplication.ErrorCodeErrorPage}instances.
- */
- protected ErrorCodeErrorPageItemProvider errorCodeErrorPageItemProvider;
- /**
- * This keeps track of the one adapter used for all
- * {@link org.eclipse.jst.j2ee.internal.internal.webapplication.WelcomeFileList}instances.
- */
- protected WelcomeFileListItemProvider welcomeFileListItemProvider;
- /**
- * This keeps track of the one adapter used for all
- * {@link org.eclipse.jst.j2ee.internal.internal.webapplication.WelcomeFile}instances.
- */
- protected WelcomeFileItemProvider welcomeFileItemProvider;
- /**
- * This keeps track of the one adapter used for all
- * {@link org.eclipse.jst.j2ee.internal.internal.webapplication.TagLibRef}instances.
- */
- protected TagLibRefItemProvider tagLibRefItemProvider;
- /**
- * This keeps track of the one adapter used for all
- * {@link org.eclipse.jst.j2ee.internal.internal.webapplication.TagLibRefType}instances.
- */
- protected TagLibRefTypeItemProvider tagLibRefTypeItemProvider;
- /**
- * This keeps track of the one adapter used for all
- * {@link org.eclipse.jst.j2ee.internal.internal.webapplication.SecurityConstraint}instances.
- */
- protected SecurityConstraintItemProvider securityConstraintItemProvider;
- /**
- * This keeps track of the one adapter used for all
- * {@link org.eclipse.jst.j2ee.internal.internal.webapplication.WebResourceCollection}instances.
- */
- protected WebResourceCollectionItemProvider webResourceCollectionItemProvider;
- /**
- * This keeps track of the one adapter used for all
- * {@link org.eclipse.jst.j2ee.internal.internal.webapplication.URLPatternType}instances.
- */
- protected URLPatternTypeItemProvider uRLPatternTypeItemProvider;
- /**
- * This keeps track of the one adapter used for all
- * {@link org.eclipse.jst.j2ee.internal.internal.webapplication.HTTPMethodType}instances.
- */
- protected HTTPMethodTypeItemProvider hTTPMethodTypeItemProvider;
- /**
- * This keeps track of the one adapter used for all
- * {@link org.eclipse.jst.j2ee.internal.internal.webapplication.AuthConstraint}instances.
- */
- protected AuthConstraintItemProvider authConstraintItemProvider;
- /**
- * This keeps track of the one adapter used for all
- * {@link org.eclipse.jst.j2ee.internal.internal.webapplication.UserDataConstraint}instances.
- */
- protected UserDataConstraintItemProvider userDataConstraintItemProvider;
- /**
- * This keeps track of the one adapter used for all
- * {@link org.eclipse.jst.j2ee.internal.internal.webapplication.LoginConfig}instances.
- */
- protected LoginConfigItemProvider loginConfigItemProvider;
- /**
- * This keeps track of the one adapter used for all
- * {@link org.eclipse.jst.j2ee.internal.internal.webapplication.FormLoginConfig}instances.
- */
- protected FormLoginConfigItemProvider formLoginConfigItemProvider;
- /**
- * This keeps track of the one adapter used for all
- * {@link org.eclipse.jst.j2ee.internal.internal.webapplication.MimeMapping}instances.
- */
- protected MimeMappingItemProvider mimeMappingItemProvider;
- /**
- * This keeps track of the one adapter used for all
- * {@link org.eclipse.jst.j2ee.internal.internal.webapplication.SessionConfig}instances.
- */
- protected SessionConfigItemProvider sessionConfigItemProvider;
- /**
- * This keeps track of the one adapter used for all
- * {@link org.eclipse.jst.j2ee.internal.internal.webapplication.ServletMapping}instances.
- */
- protected ServletMappingItemProvider servletMappingItemProvider;
- /**
- * This keeps track of the one adapter used for all
- * {@link org.eclipse.jst.j2ee.internal.internal.webapplication.Servlet}instances.
- */
- protected ServletItemProvider servletItemProvider;
- /**
- * This keeps track of the one adapter used for all
- * {@link org.eclipse.jst.j2ee.internal.internal.webapplication.WebType}instances.
- */
- protected WebTypeItemProvider webTypeItemProvider;
- /**
- * This keeps track of the one adapter used for all
- * {@link org.eclipse.jst.j2ee.internal.internal.webapplication.ServletType}instances.
- */
- protected ServletTypeItemProvider servletTypeItemProvider;
- /**
- * This keeps track of the one adapter used for all
- * {@link org.eclipse.jst.j2ee.internal.internal.webapplication.JSPType}instances.
- */
- protected JSPTypeItemProvider jSPTypeItemProvider;
- /**
- * This keeps track of the one adapter used for all
- * {@link org.eclipse.jst.j2ee.internal.internal.webapplication.InitParam}instances.
- */
- protected InitParamItemProvider initParamItemProvider;
- /**
- * This keeps track of the one adapter used for all
- * {@link org.eclipse.jst.j2ee.internal.internal.webapplication.Listener}instances.
- */
- protected ListenerItemProvider listenerItemProvider;
- /**
- * This keeps track of the one adapter used for all
- * {@link org.eclipse.jst.j2ee.internal.internal.webapplication.RoleNameType}instances.
- */
- protected RoleNameTypeItemProvider roleNameTypeItemProvider;
- protected Disposable disposable = new Disposable();
-
- /**
- * This constructs an instance from a domain notifier.
- */
- public WebapplicationItemProviderAdapterFactory() {
- supportedTypes.add(IStructuredItemContentProvider.class);
- supportedTypes.add(ITreeItemContentProvider.class);
- supportedTypes.add(IItemPropertySource.class);
- supportedTypes.add(IEditingDomainItemProvider.class);
- supportedTypes.add(IItemLabelProvider.class);
- supportedTypes.add(ITableItemLabelProvider.class);
- }
-
- @Override
- public Adapter adapt(Notifier target, Object adapterKey) {
- return super.adapt(target, this);
- }
-
- @Override
- public Object adapt(Object object, Object type) {
- if (isFactoryForType(type)) {
- Object adapter = super.adapt(object, type);
- if (!(type instanceof Class) || (((Class) type).isInstance(adapter))) {
- return adapter;
- }
- }
-
- return null;
- }
-
- @Override
- public Adapter adaptNew(Notifier target, Object adapterType) {
- Adapter adapter = super.adaptNew(target, adapterType);
- disposable.add(adapter);
- return adapter;
- }
-
- /**
- * This adds a listener. <!-- begin-user-doc --> <!-- end-user-doc -->
- *
- * @generated
- */
- public void addListener(INotifyChangedListener notifyChangedListener) {
- changeNotifier.addListener(notifyChangedListener);
- }
-
- /**
- * This creates an adapter for a {@link org.eclipse.jst.j2ee.internal.internal.webapplication.AuthConstraint}.
- */
- @Override
- public Adapter createAuthConstraintAdapter() {
- if (authConstraintItemProvider == null) {
- authConstraintItemProvider = new AuthConstraintItemProvider(this);
- }
-
- return authConstraintItemProvider;
- }
-
- /**
- * This creates an adapter for a {@link org.eclipse.jst.j2ee.internal.internal.webapplication.ContextParam}.
- */
- @Override
- public Adapter createContextParamAdapter() {
- if (contextParamItemProvider == null) {
- contextParamItemProvider = new ContextParamItemProvider(this);
- }
-
- return contextParamItemProvider;
- }
-
- /**
- * This creates an adapter for a {@link org.eclipse.jst.j2ee.internal.internal.webapplication.ErrorCodeErrorPage}.
- */
- @Override
- public Adapter createErrorCodeErrorPageAdapter() {
- if (errorCodeErrorPageItemProvider == null) {
- errorCodeErrorPageItemProvider = new ErrorCodeErrorPageItemProvider(this);
- }
-
- return errorCodeErrorPageItemProvider;
- }
-
- /**
- * This creates an adapter for a {@link org.eclipse.jst.j2ee.internal.internal.webapplication.ErrorPage}.
- */
- @Override
- public Adapter createErrorPageAdapter() {
- if (errorPageItemProvider == null) {
- errorPageItemProvider = new ErrorPageItemProvider(this);
- }
-
- return errorPageItemProvider;
- }
-
- /**
- * This creates an adapter for a {@link org.eclipse.jst.j2ee.internal.internal.webapplication.ExceptionTypeErrorPage}.
- */
- @Override
- public Adapter createExceptionTypeErrorPageAdapter() {
- if (exceptionTypeErrorPageItemProvider == null) {
- exceptionTypeErrorPageItemProvider = new ExceptionTypeErrorPageItemProvider(this);
- }
-
- return exceptionTypeErrorPageItemProvider;
- }
-
- /**
- * This creates an adapter for a {@link org.eclipse.jst.j2ee.internal.internal.webapplication.Filter}.
- */
- @Override
- public Adapter createFilterAdapter() {
- if (filterItemProvider == null) {
- filterItemProvider = new FilterItemProvider(this);
- }
-
- return filterItemProvider;
- }
-
- /**
- * This keeps track of the one adapter used for all
- * {@link org.eclipse.jst.j2ee.internal.internal.webapplication.LocalEncodingMappingList}instances. <!-- begin-user-doc
- * --> <!-- end-user-doc -->
- *
- * @generated
- */
- protected LocalEncodingMappingListItemProvider localEncodingMappingListItemProvider;
-
- /**
- * This creates an adapter for a {@link org.eclipse.jst.j2ee.internal.internal.webapplication.LocalEncodingMappingList}.
- * <!-- begin-user-doc --> <!-- end-user-doc -->
- *
- * @generated
- */
- @Override
- public Adapter createLocalEncodingMappingListAdapter() {
- if (localEncodingMappingListItemProvider == null) {
- localEncodingMappingListItemProvider = new LocalEncodingMappingListItemProvider(this);
- }
-
- return localEncodingMappingListItemProvider;
- }
-
- /**
- * This keeps track of the one adapter used for all
- * {@link org.eclipse.jst.j2ee.internal.internal.webapplication.LocalEncodingMapping}instances. <!-- begin-user-doc -->
- * <!-- end-user-doc -->
- *
- * @generated
- */
- protected LocalEncodingMappingItemProvider localEncodingMappingItemProvider;
-
- /**
- * This creates an adapter for a {@link org.eclipse.jst.j2ee.internal.internal.webapplication.LocalEncodingMapping}.
- * <!-- begin-user-doc --> <!-- end-user-doc -->
- *
- * @generated
- */
- @Override
- public Adapter createLocalEncodingMappingAdapter() {
- if (localEncodingMappingItemProvider == null) {
- localEncodingMappingItemProvider = new LocalEncodingMappingItemProvider(this);
- }
-
- return localEncodingMappingItemProvider;
- }
-
- /**
- * This creates an adapter for a {@link org.eclipse.jst.j2ee.internal.internal.webapplication.FilterMapping}.
- */
- @Override
- public Adapter createFilterMappingAdapter() {
- if (filterMappingItemProvider == null) {
- filterMappingItemProvider = new FilterMappingItemProvider(this);
- }
-
- return filterMappingItemProvider;
- }
-
- /**
- * This creates an adapter for a {@link org.eclipse.jst.j2ee.internal.internal.webapplication.FormLoginConfig}.
- */
- @Override
- public Adapter createFormLoginConfigAdapter() {
- if (formLoginConfigItemProvider == null) {
- formLoginConfigItemProvider = new FormLoginConfigItemProvider(this);
- }
-
- return formLoginConfigItemProvider;
- }
-
- /**
- * This creates an adapter for a {@link org.eclipse.jst.j2ee.internal.internal.webapplication.HTTPMethodType}.
- */
- @Override
- public Adapter createHTTPMethodTypeAdapter() {
- if (hTTPMethodTypeItemProvider == null) {
- hTTPMethodTypeItemProvider = new HTTPMethodTypeItemProvider(this);
- }
-
- return hTTPMethodTypeItemProvider;
- }
-
- /**
- * This creates an adapter for a {@link org.eclipse.jst.j2ee.internal.internal.webapplication.InitParam}.
- */
- @Override
- public Adapter createInitParamAdapter() {
- if (initParamItemProvider == null) {
- initParamItemProvider = new InitParamItemProvider(this);
- }
-
- return initParamItemProvider;
- }
-
- /**
- * This creates an adapter for a {@link org.eclipse.jst.j2ee.internal.internal.webapplication.Listener}.
- */
- @Override
- public Adapter createListenerAdapter() {
- if (listenerItemProvider == null) {
- listenerItemProvider = new ListenerItemProvider(this);
- }
-
- return listenerItemProvider;
- }
-
- /**
- * This creates an adapter for a {@link org.eclipse.jst.j2ee.internal.internal.webapplication.JSPType}.
- */
- @Override
- public Adapter createJSPTypeAdapter() {
- if (jSPTypeItemProvider == null) {
- jSPTypeItemProvider = new JSPTypeItemProvider(this);
- }
-
- return jSPTypeItemProvider;
- }
-
- /**
- * This keeps track of the one adapter used for all
- * {@link org.eclipse.jst.j2ee.internal.internal.webapplication.URLPatternType}instances. <!-- begin-user-doc --> <!--
- * end-user-doc -->
- *
- * @generated
- */
- protected URLPatternTypeItemProvider urlPatternTypeItemProvider;
-
- /**
- * This creates an adapter for a {@link org.eclipse.jst.j2ee.internal.internal.webapplication.LoginConfig}.
- */
- @Override
- public Adapter createLoginConfigAdapter() {
- if (loginConfigItemProvider == null) {
- loginConfigItemProvider = new LoginConfigItemProvider(this);
- }
-
- return loginConfigItemProvider;
- }
-
- /**
- * This creates an adapter for a {@link org.eclipse.jst.j2ee.internal.internal.webapplication.MimeMapping}.
- */
- @Override
- public Adapter createMimeMappingAdapter() {
- if (mimeMappingItemProvider == null) {
- mimeMappingItemProvider = new MimeMappingItemProvider(this);
- }
-
- return mimeMappingItemProvider;
- }
-
- /**
- * This creates an adapter for a {@link org.eclipse.jst.j2ee.internal.internal.webapplication.RoleNameType}.
- */
- @Override
- public Adapter createRoleNameTypeAdapter() {
- if (roleNameTypeItemProvider == null) {
- roleNameTypeItemProvider = new RoleNameTypeItemProvider(this);
- }
-
- return roleNameTypeItemProvider;
- }
-
- /**
- * This creates an adapter for a {@link org.eclipse.jst.j2ee.internal.internal.webapplication.SecurityConstraint}.
- */
- @Override
- public Adapter createSecurityConstraintAdapter() {
- if (securityConstraintItemProvider == null) {
- securityConstraintItemProvider = new SecurityConstraintItemProvider(this);
- }
-
- return securityConstraintItemProvider;
- }
-
- /**
- * This creates an adapter for a {@link org.eclipse.jst.j2ee.internal.internal.webapplication.Servlet}.
- */
- @Override
- public Adapter createServletAdapter() {
- if (servletItemProvider == null) {
- servletItemProvider = new ServletItemProvider(this);
- }
-
- return servletItemProvider;
- }
-
- /**
- * This creates an adapter for a {@link org.eclipse.jst.j2ee.internal.internal.webapplication.ServletMapping}.
- */
- @Override
- public Adapter createServletMappingAdapter() {
- if (servletMappingItemProvider == null) {
- servletMappingItemProvider = new ServletMappingItemProvider(this);
- }
-
- return servletMappingItemProvider;
- }
-
- /**
- * This creates an adapter for a {@link org.eclipse.jst.j2ee.internal.internal.webapplication.ServletType}.
- */
- @Override
- public Adapter createServletTypeAdapter() {
- if (servletTypeItemProvider == null) {
- servletTypeItemProvider = new ServletTypeItemProvider(this);
- }
-
- return servletTypeItemProvider;
- }
-
- /**
- * This keeps track of the one adapter used for all
- * {@link org.eclipse.jst.j2ee.internal.internal.webapplication.JSPType}instances. <!-- begin-user-doc --> <!--
- * end-user-doc -->
- *
- * @generated
- */
- protected JSPTypeItemProvider jspTypeItemProvider;
-
- /**
- * This creates an adapter for a {@link org.eclipse.jst.j2ee.internal.internal.webapplication.SessionConfig}.
- */
- @Override
- public Adapter createSessionConfigAdapter() {
- if (sessionConfigItemProvider == null) {
- sessionConfigItemProvider = new SessionConfigItemProvider(this);
- }
-
- return sessionConfigItemProvider;
- }
-
- /**
- * This creates an adapter for a {@link org.eclipse.jst.j2ee.internal.internal.webapplication.TagLibRef}.
- */
- @Override
- public Adapter createTagLibRefAdapter() {
- if (tagLibRefItemProvider == null) {
- tagLibRefItemProvider = new TagLibRefItemProvider(this);
- }
-
- return tagLibRefItemProvider;
- }
-
- /**
- * This creates an adapter for a {@link org.eclipse.jst.j2ee.internal.internal.webapplication.TagLibRef}.
- */
- @Override
- public Adapter createTagLibRefTypeAdapter() {
- if (tagLibRefTypeItemProvider == null) {
- tagLibRefTypeItemProvider = new TagLibRefTypeItemProvider(this);
- }
-
- return tagLibRefTypeItemProvider;
- }
-
- /**
- * This creates an adapter for a {@link org.eclipse.jst.j2ee.internal.internal.webapplication.URLPatternType}.
- */
- @Override
- public Adapter createURLPatternTypeAdapter() {
- if (uRLPatternTypeItemProvider == null) {
- uRLPatternTypeItemProvider = new URLPatternTypeItemProvider(this);
- }
-
- return uRLPatternTypeItemProvider;
- }
-
- /**
- * This keeps track of the one adapter used for all
- * {@link org.eclipse.jst.j2ee.internal.internal.webapplication.HTTPMethodType}instances. <!-- begin-user-doc --> <!--
- * end-user-doc -->
- *
- * @generated
- */
- protected HTTPMethodTypeItemProvider httpMethodTypeItemProvider;
-
- /**
- * This creates an adapter for a {@link org.eclipse.jst.j2ee.internal.internal.webapplication.UserDataConstraint}.
- */
- @Override
- public Adapter createUserDataConstraintAdapter() {
- if (userDataConstraintItemProvider == null) {
- userDataConstraintItemProvider = new UserDataConstraintItemProvider(this);
- }
-
- return userDataConstraintItemProvider;
- }
-
- /**
- * This creates an adapter for a {@link org.eclipse.jst.j2ee.internal.internal.webapplication.WebApp}.
- */
- @Override
- public Adapter createWebAppAdapter() {
- if (webAppItemProvider == null) {
- webAppItemProvider = new WebAppItemProvider(this);
- }
-
- return webAppItemProvider;
- }
-
- /**
- * This creates an adapter for a {@link org.eclipse.jst.j2ee.internal.internal.webapplication.WebResourceCollection}.
- */
- @Override
- public Adapter createWebResourceCollectionAdapter() {
- if (webResourceCollectionItemProvider == null) {
- webResourceCollectionItemProvider = new WebResourceCollectionItemProvider(this);
- }
-
- return webResourceCollectionItemProvider;
- }
-
- /**
- * This creates an adapter for a {@link org.eclipse.jst.j2ee.internal.internal.webapplication.WebType}.
- */
- @Override
- public Adapter createWebTypeAdapter() {
- if (webTypeItemProvider == null) {
- webTypeItemProvider = new WebTypeItemProvider(this);
- }
-
- return webTypeItemProvider;
- }
-
- /**
- * This creates an adapter for a {@link org.eclipse.jst.j2ee.internal.internal.webapplication.WelcomeFile}.
- */
- @Override
- public Adapter createWelcomeFileAdapter() {
- if (welcomeFileItemProvider == null) {
- welcomeFileItemProvider = new WelcomeFileItemProvider(this);
- }
-
- return welcomeFileItemProvider;
- }
-
- /**
- * This creates an adapter for a {@link org.eclipse.jst.j2ee.internal.internal.webapplication.WelcomeFileList}.
- */
- @Override
- public Adapter createWelcomeFileListAdapter() {
- if (welcomeFileListItemProvider == null) {
- welcomeFileListItemProvider = new WelcomeFileListItemProvider(this);
- }
-
- return welcomeFileListItemProvider;
- }
-
- public void dispose() {
- disposable.dispose();
- }
-
- /**
- * This returns the root adapter factory that contains the factory.
- */
- public ComposeableAdapterFactory getRootAdapterFactory() {
- return (parentAdapterFactory == null ? this : parentAdapterFactory.getRootAdapterFactory());
- }
-
- @Override
- public boolean isFactoryForType(Object type) {
- return super.isFactoryForType(type) || supportedTypes.contains(type);
- }
-
- /**
- * This removes a listener.
- *
- * @generated
- */
- public void removeListener(INotifyChangedListener notifyChangedListener) {
- changeNotifier.removeListener(notifyChangedListener);
- }
-
- /**
- * This delegates to {@link #changeNotifier}and to {@link #parentAdapterFactory}. <!--
- * begin-user-doc --> <!-- end-user-doc -->
- *
- * @generated
- */
- public void fireNotifyChanged(Notification notification) {
- changeNotifier.fireNotifyChanged(notification);
-
- if (parentAdapterFactory != null) {
- parentAdapterFactory.fireNotifyChanged(notification);
- }
- }
-
- /**
- * This sets the composed adapter factory that contains the factory.
- */
- public void setParentAdapterFactory(ComposedAdapterFactory parentAdapterFactory) {
- this.parentAdapterFactory = parentAdapterFactory;
- }
-}
diff --git a/plugins/org.eclipse.jst.j2ee.web/webedit/org/eclipse/jst/j2ee/internal/web/providers/WelcomeFileItemProvider.java b/plugins/org.eclipse.jst.j2ee.web/webedit/org/eclipse/jst/j2ee/internal/web/providers/WelcomeFileItemProvider.java
deleted file mode 100644
index bd1fefd..0000000
--- a/plugins/org.eclipse.jst.j2ee.web/webedit/org/eclipse/jst/j2ee/internal/web/providers/WelcomeFileItemProvider.java
+++ /dev/null
@@ -1,152 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2003, 2005 IBM Corporation and others.
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
- *
- * Contributors:
- * IBM Corporation - initial API and implementation
- *******************************************************************************/
-package org.eclipse.jst.j2ee.internal.web.providers;
-
-import java.util.Collection;
-import java.util.List;
-
-import org.eclipse.emf.common.notify.AdapterFactory;
-import org.eclipse.emf.common.notify.Notification;
-import org.eclipse.emf.common.util.ResourceLocator;
-import org.eclipse.emf.edit.provider.ComposeableAdapterFactory;
-import org.eclipse.emf.edit.provider.IEditingDomainItemProvider;
-import org.eclipse.emf.edit.provider.IItemLabelProvider;
-import org.eclipse.emf.edit.provider.IItemPropertySource;
-import org.eclipse.emf.edit.provider.ITreeItemContentProvider;
-import org.eclipse.emf.edit.provider.ItemPropertyDescriptor;
-import org.eclipse.jst.j2ee.internal.plugin.J2EEPlugin;
-import org.eclipse.jst.j2ee.internal.web.plugin.WebPlugin;
-import org.eclipse.jst.j2ee.webapplication.WebapplicationPackage;
-import org.eclipse.jst.j2ee.webapplication.WelcomeFile;
-
-
-/**
- * This is the item provider adpater for a {@link org.eclipse.jst.j2ee.internal.internal.webapplication.WelcomeFile}object.
- */
-public class WelcomeFileItemProvider extends WebapplicationItemProviderAdapter implements IEditingDomainItemProvider, IItemLabelProvider, IItemPropertySource, ITreeItemContentProvider {
-
- /**
- * This constructs an instance from a factory and a notifier.
- */
- public WelcomeFileItemProvider(AdapterFactory adapterFactory) {
- super(adapterFactory);
- }
-
- /**
- * This returns welcome_file.gif.
- */
- @Override
- public Object getImage(Object object) {
- return WebPlugin.getDefault().getImage("welcome_file");//$NON-NLS-1$
- }
-
- /**
- * This returns the fileList of the WelcomeFile.
- */
- @Override
- public Object getParent(Object object) {
- return ((WelcomeFile) object).getFileList();
- }
-
- /**
- * This returns the property descriptors for the adapted class.
- */
- @Override
- public List getPropertyDescriptors(Object object) {
- if (itemPropertyDescriptors == null) {
- super.getPropertyDescriptors(object);
-
- WebapplicationPackage pkg = WebapplicationPackage.eINSTANCE;
-
- // This is for the welcomeFile feature.
- //
- itemPropertyDescriptors.add(new ItemPropertyDescriptor(((ComposeableAdapterFactory) adapterFactory).getRootAdapterFactory(), WebAppEditResourceHandler.getString("WelcomeFile_UI_"), //$NON-NLS-1$ = "WelcomeFile"
- WebAppEditResourceHandler.getString("The_welcomeFile_property_UI_"), //$NON-NLS-1$ = "The welcomeFile property"
- pkg.getWelcomeFile_WelcomeFile()));
-
- }
- return itemPropertyDescriptors;
- }
-
- /**
- * This adds a property descriptor for the Welcome File feature. <!-- begin-user-doc --> <!--
- * end-user-doc -->
- *
- * @generated
- */
- protected void addWelcomeFilePropertyDescriptor(Object object) {
- itemPropertyDescriptors.add(new ItemPropertyDescriptor(((ComposeableAdapterFactory) adapterFactory).getRootAdapterFactory(), getString("_UI_WelcomeFile_welcomeFile_feature"), //$NON-NLS-1$
- getString("_UI_PropertyDescriptor_description", "_UI_WelcomeFile_welcomeFile_feature", "_UI_WelcomeFile_type"), //$NON-NLS-1$ //$NON-NLS-2$ //$NON-NLS-3$
- WebapplicationPackage.eINSTANCE.getWelcomeFile_WelcomeFile(), true, ItemPropertyDescriptor.GENERIC_VALUE_IMAGE));
- }
-
-
- @Override
- public String getText(Object object) {
- WelcomeFile welcomeFile = (WelcomeFile) object;
- String name = welcomeFile.getWelcomeFile();
- if (name == null)
- name = WebAppEditResourceHandler.getString("<welcome-file>_UI_"); //$NON-NLS-1$ = "<welcome-file>"
- return name;
- }
-
- /**
- * This handles notification by calling {@link #fireNotifyChanged fireNotifyChanged}. <!--
- * begin-user-doc --> <!-- end-user-doc -->
- *
- * @generated
- */
- @Override
- public void notifyChanged(Notification notification) {
- switch (notification.getFeatureID(WelcomeFile.class)) {
- case WebapplicationPackage.WELCOME_FILE__WELCOME_FILE : {
- fireNotifyChanged(notification);
- return;
- }
- }
- super.notifyChanged(notification);
- }
-
- /**
- * This adds to the collection of {@link org.eclipse.emf.edit.command.CommandParameter}s
- * describing all of the children that can be created under this object. <!-- begin-user-doc -->
- * <!-- end-user-doc -->
- *
- * @generated
- */
- @Override
- protected void collectNewChildDescriptors(Collection newChildDescriptors, Object object) {
- super.collectNewChildDescriptors(newChildDescriptors, object);
- }
-
- /**
- * Return the resource locator for this item provider's resources. <!-- begin-user-doc --> <!--
- * end-user-doc -->
- *
- * @generated
- */
- @Override
- public ResourceLocator getResourceLocator() {
- return J2EEPlugin.getDefault();
- }
-
- /**
- * This always returns false. The base class has already implemented
- * {@link org.eclipse.emf.edit.provider.ItemProviderAdapter#getChildren ItemProviderAdapter.getChildren}
- * to return the empty enumeration, and this to check that enumeration, but we know there can't
- * be any children, so this is faster.
- */
- @Override
- public boolean hasChildren(Object object) {
- return false;
- }
-
-}
diff --git a/plugins/org.eclipse.jst.j2ee.web/webedit/org/eclipse/jst/j2ee/internal/web/providers/WelcomeFileListItemProvider.java b/plugins/org.eclipse.jst.j2ee.web/webedit/org/eclipse/jst/j2ee/internal/web/providers/WelcomeFileListItemProvider.java
deleted file mode 100644
index 1486fa0..0000000
--- a/plugins/org.eclipse.jst.j2ee.web/webedit/org/eclipse/jst/j2ee/internal/web/providers/WelcomeFileListItemProvider.java
+++ /dev/null
@@ -1,174 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2003, 2005 IBM Corporation and others.
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
- *
- * Contributors:
- * IBM Corporation - initial API and implementation
- *******************************************************************************/
-package org.eclipse.jst.j2ee.internal.web.providers;
-
-import java.util.Collection;
-import java.util.Collections;
-import java.util.List;
-
-import org.eclipse.emf.common.notify.AdapterFactory;
-import org.eclipse.emf.common.notify.Notification;
-import org.eclipse.emf.common.util.ResourceLocator;
-import org.eclipse.emf.ecore.EObject;
-import org.eclipse.emf.edit.command.AddCommand;
-import org.eclipse.emf.edit.command.RemoveCommand;
-import org.eclipse.emf.edit.provider.IEditingDomainItemProvider;
-import org.eclipse.emf.edit.provider.IItemLabelProvider;
-import org.eclipse.emf.edit.provider.IItemPropertySource;
-import org.eclipse.emf.edit.provider.ITreeItemContentProvider;
-import org.eclipse.jst.j2ee.internal.plugin.J2EEPlugin;
-import org.eclipse.jst.j2ee.internal.web.plugin.WebPlugin;
-import org.eclipse.jst.j2ee.webapplication.WebapplicationFactory;
-import org.eclipse.jst.j2ee.webapplication.WebapplicationPackage;
-import org.eclipse.jst.j2ee.webapplication.WelcomeFile;
-import org.eclipse.jst.j2ee.webapplication.WelcomeFileList;
-
-
-/**
- * This is the item provider adpater for a {@link org.eclipse.jst.j2ee.internal.internal.webapplication.WelcomeFileList}
- * object.
- */
-public class WelcomeFileListItemProvider extends WebapplicationItemProviderAdapter implements IEditingDomainItemProvider, IItemLabelProvider, IItemPropertySource, ITreeItemContentProvider {
-
- /**
- * This constructs an instance from a factory and a notifier.
- */
- public WelcomeFileListItemProvider(AdapterFactory adapterFactory) {
- super(adapterFactory);
- }
-
- /**
- * This returns the property descriptors for the adapted class. <!-- begin-user-doc --> <!--
- * end-user-doc -->
- *
- * @generated
- */
- @Override
- public List getPropertyDescriptors(Object object) {
- if (itemPropertyDescriptors == null) {
- super.getPropertyDescriptors(object);
-
- }
- return itemPropertyDescriptors;
- }
-
- /**
- * This creates a new child for {@link org.eclipse.jst.j2ee.internal.internal.webapplication.commandCreateChildCommand}.
- */
- @Override
- public Object createChild(Object object) {
- // TODO: check that this is what you want.
- WelcomeFile child = WebapplicationFactory.eINSTANCE.createWelcomeFile();
-
- // TODO: initialize child here...
-
- return child;
- }
-
- /**
- * This specifies how to implement {@link #getChildren}and {@link AddCommand}and
- * {@link RemoveCommand}support in {@link #createCommand}.
- */
- @Override
- public Collection getChildrenReferences(Object object) {
- return Collections.singleton(WebapplicationPackage.eINSTANCE.getWelcomeFileList_File());
- }
-
- /**
- * This returns the image for {@link org.eclipse.jst.j2ee.internal.internal.webapplication.commandCreateChildCommand}.
- */
- @Override
- public Object getCreateChildImage(Object object) {
- EObject refObject = (EObject) object;
- return WebPlugin.getDefault().getImage(refObject.eClass().getName() + "CreateWelcomeFile");//$NON-NLS-1$
- }
-
- /**
- * This returns the label for {@link org.eclipse.jst.j2ee.internal.internal.webapplication.commandCreateChildCommand}.
- */
- @Override
- public String getCreateChildText(Object object) {
- return WebAppEditResourceHandler.getString("Create_WelcomeFile_UI_"); //$NON-NLS-1$ = "Create WelcomeFile"
- }
-
- /**
- * This returns the help text for
- * {@link org.eclipse.jst.j2ee.internal.internal.webapplication.commandCreateChildCommand}.
- */
- @Override
- public String getCreateChildToolTipText(Object object) {
- EObject refObject = (EObject) object;
- return WebAppEditResourceHandler.getString("42concat_UI_", (new Object[]{refObject.eClass().getName()})); //$NON-NLS-1$ = "Create a child of type WelcomeFile for the selected {0}."
- }
-
- /**
- * This returns welcome_list.gif.
- */
- @Override
- public Object getImage(Object object) {
- return WebPlugin.getDefault().getImage("welcome_list");//$NON-NLS-1$
- }
-
- /**
- * This returns the webApp of the WelcomeFileList.
- */
- @Override
- public Object getParent(Object object) {
- return ((WelcomeFileList) object).getWebApp();
- }
-
- @Override
- public String getText(Object object) {
- return WebAppEditResourceHandler.getString("Welcome_File_List_UI_"); //$NON-NLS-1$ = "Welcome File List"
- }
-
- /**
- * This handles notification by calling {@link #fireNotifyChanged fireNotifyChanged}. <!--
- * begin-user-doc --> <!-- end-user-doc -->
- *
- * @generated
- */
- @Override
- public void notifyChanged(Notification notification) {
- switch (notification.getFeatureID(WelcomeFileList.class)) {
- case WebapplicationPackage.WELCOME_FILE_LIST__FILE : {
- fireNotifyChanged(notification);
- return;
- }
- }
- super.notifyChanged(notification);
- }
-
- /**
- * This adds to the collection of {@link org.eclipse.emf.edit.command.CommandParameter}s
- * describing all of the children that can be created under this object. <!-- begin-user-doc -->
- * <!-- end-user-doc -->
- *
- * @generated
- */
- @Override
- protected void collectNewChildDescriptors(Collection newChildDescriptors, Object object) {
- super.collectNewChildDescriptors(newChildDescriptors, object);
-
- newChildDescriptors.add(createChildParameter(WebapplicationPackage.eINSTANCE.getWelcomeFileList_File(), WebapplicationFactory.eINSTANCE.createWelcomeFile()));
- }
-
- /**
- * Return the resource locator for this item provider's resources. <!-- begin-user-doc --> <!--
- * end-user-doc -->
- *
- * @generated
- */
- @Override
- public ResourceLocator getResourceLocator() {
- return J2EEPlugin.getDefault();
- }
-}
diff --git a/plugins/org.eclipse.jst.j2ee.web/webproject/org/eclipse/jst/j2ee/internal/web/archive/operations/WTProjectStrategyUtils.java b/plugins/org.eclipse.jst.j2ee.web/webproject/org/eclipse/jst/j2ee/internal/web/archive/operations/WTProjectStrategyUtils.java
deleted file mode 100644
index 34c0477..0000000
--- a/plugins/org.eclipse.jst.j2ee.web/webproject/org/eclipse/jst/j2ee/internal/web/archive/operations/WTProjectStrategyUtils.java
+++ /dev/null
@@ -1,90 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2003, 2005 IBM Corporation and others.
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
- *
- * Contributors:
- * IBM Corporation - initial API and implementation
- *******************************************************************************/
-package org.eclipse.jst.j2ee.internal.web.archive.operations;
-
-
-
-import org.eclipse.core.runtime.IPath;
-import org.eclipse.core.runtime.Path;
-import org.eclipse.jst.j2ee.commonarchivecore.internal.Archive;
-import org.eclipse.jst.j2ee.commonarchivecore.internal.File;
-import org.eclipse.jst.j2ee.commonarchivecore.internal.helpers.ArchiveConstants;
-import org.eclipse.jst.j2ee.internal.J2EEConstants;
-
-
-public class WTProjectStrategyUtils {
- public static File findSourceFile(Archive archive, String file) {
- if (isClassFile(file))
- return findSourceFileForClass(archive, file);
-
- // Look in the CLASSES directory
- try {
- if (!isOutputFile(file))
- return archive.getFile(file);
- } catch (java.io.FileNotFoundException ex) {
- //Do nothing
- }
- return null;
- }
-
- public static File findSourceFileForClass(Archive archive, String classFile) {
- // Look in the CLASSES directory
- IPath classFilePath = new Path(classFile);
- IPath sourceFilePath = classFilePath.removeFileExtension().addFileExtension("java");//$NON-NLS-1$
- try {
- File file = archive.getFile(sourceFilePath.toString());
- if (file != null)
- return file;
- } catch (java.io.FileNotFoundException ex) {
- //Do nothing
- }
-
- // Look in the LIB directory
- sourceFilePath = new Path(ArchiveConstants.WEBAPP_LIB_URI).append(sourceFilePath);
- try {
- File file = archive.getFile(sourceFilePath.toString());
- if (file != null)
- return file;
- } catch (java.io.FileNotFoundException ex) {
- //Do nothing
- }
- return null;
-
- }
-
- public static boolean isClassFile(String uri) {
- return uri.startsWith(ArchiveConstants.WEBAPP_CLASSES_URI) && uri.endsWith(".class");//$NON-NLS-1$
- }
-
- public static boolean isOutputFile(String uri) {
- return uri.startsWith(ArchiveConstants.WEBAPP_CLASSES_URI);
- }
-
- public static boolean isSourceFile(String uri) {
- // A file is considered a java source file if it is in the
- // WEB_INF directory and it does not end with .class.
- if (uri.startsWith(J2EEConstants.WEB_INF + "/") && //$NON-NLS-1$
- uri.endsWith(".java"))//$NON-NLS-1$
- return true;
- return false;
-
- }
-
- public static String makeRelative(String pathString, String relToPathString) {
- IPath relToPath = new Path(relToPathString);
- IPath path = new Path(pathString);
-
- if (path.matchingFirstSegments(relToPath) == relToPath.segmentCount())
- path = path.removeFirstSegments(relToPath.segmentCount());
-
- return path.toString();
- }
-}
diff --git a/plugins/org.eclipse.jst.j2ee.web/webproject/org/eclipse/jst/j2ee/internal/web/archive/operations/WebComponentExportDataModelProvider.java b/plugins/org.eclipse.jst.j2ee.web/webproject/org/eclipse/jst/j2ee/internal/web/archive/operations/WebComponentExportDataModelProvider.java
deleted file mode 100644
index 85228c2..0000000
--- a/plugins/org.eclipse.jst.j2ee.web/webproject/org/eclipse/jst/j2ee/internal/web/archive/operations/WebComponentExportDataModelProvider.java
+++ /dev/null
@@ -1,94 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2003, 2005 IBM Corporation and others.
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
- *
- * Contributors:
- * IBM Corporation - initial API and implementation
- *******************************************************************************/
-package org.eclipse.jst.j2ee.internal.web.archive.operations;
-
-import java.util.Set;
-
-import org.eclipse.jst.j2ee.application.internal.operations.J2EEComponentExportDataModelProvider;
-import org.eclipse.jst.j2ee.internal.archive.operations.JavaEEComponentExportOperation;
-import org.eclipse.jst.j2ee.internal.earcreation.EARCreationResourceHandler;
-import org.eclipse.jst.j2ee.internal.plugin.IJ2EEModuleConstants;
-import org.eclipse.jst.j2ee.internal.project.J2EEProjectUtilities;
-import org.eclipse.jst.j2ee.web.datamodel.properties.IWebComponentExportDataModelProperties;
-import org.eclipse.wst.common.frameworks.datamodel.IDataModelOperation;
-
-public class WebComponentExportDataModelProvider extends J2EEComponentExportDataModelProvider implements IWebComponentExportDataModelProperties {
-
- public WebComponentExportDataModelProvider() {
- super();
- }
-
- @Override
- public IDataModelOperation getDefaultOperation() {
- return new JavaEEComponentExportOperation(model);
- }
-
- @Override
- public Set getPropertyNames() {
- Set propertyNames = super.getPropertyNames();
- propertyNames.add(EXCLUDE_COMPILE_JSP);
- return propertyNames;
- }
-
- @Override
- public Object getDefaultProperty(String propertyName) {
- if (EXCLUDE_COMPILE_JSP.equals(propertyName)) {
- return Boolean.FALSE;
- }
- return super.getDefaultProperty(propertyName);
- }
-
- @Override
- protected String getProjectType() {
- return J2EEProjectUtilities.DYNAMIC_WEB;
- }
-
- @Override
- protected String getWrongComponentTypeString(String projectName) {
- return EARCreationResourceHandler.getString(EARCreationResourceHandler.NOT_A_WAR, new Object[]{projectName});
- }
-
- @Override
- protected String getModuleExtension() {
- return IJ2EEModuleConstants.WAR_EXT;
- }
- /**
- * Exports the specified Web Module project to the specified WAR file.
- *
- * @param webProjectName
- * The name of the Web Module project to export.
- * @param warFileName
- * The fully qualified WAR file location to export the specified Web Module project.
- * @param overwriteExisting
- * If this is <code>true</code> then an existing file at the location specified by
- * <code>earFileName</code> will be overwritten.
- * @param exportSource
- * If this is <code>true</code> then all source files in the specified Web Module
- * will be included in the resulting WAR file.
- * @plannedfor WTP 1.0
- */
- // TODO: determine plan for new DM Provider
- // public static void exportProject(String webProjectName, String warFileName, boolean
- // overwriteExisting, boolean exportSource) {
- // WebModuleExportDataModel dataModel = new WebModuleExportDataModel();
- // dataModel.setProperty(PROJECT_NAME, webProjectName);
- // dataModel.setBooleanProperty(OVERWRITE_EXISTING, overwriteExisting);
- // dataModel.setProperty(ARCHIVE_DESTINATION, warFileName);
- // dataModel.setBooleanProperty(EXPORT_SOURCE_FILES, exportSource);
- // try {
- // dataModel.getDefaultOperation().run(null);
- // } catch (InvocationTargetException e) {
- // Logger.getLogger().logError(e);
- // } catch (InterruptedException e) {
- // Logger.getLogger().logError(e);
- // }
- // }
-}
diff --git a/plugins/org.eclipse.jst.j2ee.web/webproject/org/eclipse/jst/j2ee/internal/web/archive/operations/WebComponentExportOperation.java b/plugins/org.eclipse.jst.j2ee.web/webproject/org/eclipse/jst/j2ee/internal/web/archive/operations/WebComponentExportOperation.java
deleted file mode 100644
index cc77e84..0000000
--- a/plugins/org.eclipse.jst.j2ee.web/webproject/org/eclipse/jst/j2ee/internal/web/archive/operations/WebComponentExportOperation.java
+++ /dev/null
@@ -1,29 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2003, 2007 IBM Corporation and others.
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
- *
- * Contributors:
- * IBM Corporation - initial API and implementation
- *******************************************************************************/
-package org.eclipse.jst.j2ee.internal.web.archive.operations;
-
-import org.eclipse.jst.j2ee.internal.archive.operations.J2EEArtifactExportOperation;
-import org.eclipse.wst.common.frameworks.datamodel.IDataModel;
-
-/**
- * @deprecated use org.eclipse.jst.j2ee.internal.archive.operations.JavaEEComponentExportOperation instead
- */
-public class WebComponentExportOperation extends J2EEArtifactExportOperation {
-
- public WebComponentExportOperation() {
- super();
- }
-
- public WebComponentExportOperation(IDataModel model) {
- super(model);
- }
-
-}
diff --git a/plugins/org.eclipse.jst.j2ee.web/webproject/org/eclipse/jst/j2ee/internal/web/archive/operations/WebComponentImportDataModelProvider.java b/plugins/org.eclipse.jst.j2ee.web/webproject/org/eclipse/jst/j2ee/internal/web/archive/operations/WebComponentImportDataModelProvider.java
deleted file mode 100644
index f19d41b..0000000
--- a/plugins/org.eclipse.jst.j2ee.web/webproject/org/eclipse/jst/j2ee/internal/web/archive/operations/WebComponentImportDataModelProvider.java
+++ /dev/null
@@ -1,220 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2003, 2007 IBM Corporation and others.
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
- *
- * Contributors:
- * IBM Corporation - initial API and implementation
- *******************************************************************************/
-package org.eclipse.jst.j2ee.internal.web.archive.operations;
-
-import java.util.ArrayList;
-import java.util.Collections;
-import java.util.List;
-import java.util.Set;
-
-import org.eclipse.core.runtime.IStatus;
-import org.eclipse.jst.j2ee.application.internal.operations.J2EEArtifactImportDataModelProvider;
-import org.eclipse.jst.j2ee.application.internal.operations.J2EEComponentImportDataModelProvider;
-import org.eclipse.jst.j2ee.application.internal.operations.J2EEUtilityJarImportDataModelProvider;
-import org.eclipse.jst.j2ee.application.internal.operations.J2EEUtilityJarImportOperationNew;
-import org.eclipse.jst.j2ee.datamodel.properties.IJ2EEComponentImportDataModelProperties;
-import org.eclipse.jst.j2ee.internal.J2EEConstants;
-import org.eclipse.jst.j2ee.internal.J2EEVersionConstants;
-import org.eclipse.jst.j2ee.internal.archive.ArchiveWrapper;
-import org.eclipse.jst.j2ee.internal.common.J2EEVersionUtil;
-import org.eclipse.jst.j2ee.internal.common.XMLResource;
-import org.eclipse.jst.j2ee.internal.project.J2EEProjectUtilities;
-import org.eclipse.jst.j2ee.project.facet.IJ2EEFacetConstants;
-import org.eclipse.jst.j2ee.project.facet.IJ2EEFacetInstallDataModelProperties;
-import org.eclipse.jst.j2ee.project.facet.IJ2EEFacetProjectCreationDataModelProperties;
-import org.eclipse.jst.j2ee.web.datamodel.properties.IWebComponentImportDataModelProperties;
-import org.eclipse.jst.j2ee.web.project.facet.IWebFacetInstallDataModelProperties;
-import org.eclipse.jst.j2ee.web.project.facet.WebFragmentFacetProjectCreationDataModelProvider;
-import org.eclipse.jst.jee.util.internal.JavaEEQuickPeek;
-import org.eclipse.wst.common.componentcore.datamodel.properties.IFacetDataModelProperties;
-import org.eclipse.wst.common.componentcore.datamodel.properties.IFacetProjectCreationDataModelProperties;
-import org.eclipse.wst.common.componentcore.datamodel.properties.IFacetProjectCreationDataModelProperties.FacetDataModelMap;
-import org.eclipse.wst.common.frameworks.datamodel.DataModelEvent;
-import org.eclipse.wst.common.frameworks.datamodel.DataModelFactory;
-import org.eclipse.wst.common.frameworks.datamodel.IDataModel;
-import org.eclipse.wst.common.frameworks.datamodel.IDataModelOperation;
-import org.eclipse.wst.common.frameworks.internal.plugin.WTPCommonPlugin;
-
-/**
- * This dataModel is used for to import Web Modules (from WAR files) into the workspace.
- *
- * This class (and all its fields and methods) is likely to change during the WTP 1.0 milestones as
- * the new project structures are adopted. Use at your own risk.
- *
- * @plannedfor WTP 1.0
- */
-public final class WebComponentImportDataModelProvider extends J2EEComponentImportDataModelProvider implements IWebComponentImportDataModelProperties {
-
- @Override
- public Set getPropertyNames() {
- Set propertyNames = super.getPropertyNames();
- propertyNames.add(WEB_LIB_MODELS);
- propertyNames.add(WEB_LIB_ARCHIVES_SELECTED);
- propertyNames.add(CONTEXT_ROOT);
- return propertyNames;
- }
-
- @Override
- public Object getDefaultProperty(String propertyName) {
- if (propertyName.equals(WEB_LIB_MODELS) || propertyName.equals(WEB_LIB_ARCHIVES_SELECTED)) {
- return Collections.EMPTY_LIST;
- }
- return super.getDefaultProperty(propertyName);
- }
-
- @Override
- protected int getType() {
- return XMLResource.WEB_APP_TYPE;
- }
-
- @Override
- protected void handleUnknownType(JavaEEQuickPeek jqp) {
- jqp.setType(J2EEVersionConstants.WEB_TYPE);
- jqp.setVersion(J2EEVersionConstants.WEB_3_0_ID);
- jqp.setJavaEEVersion(J2EEVersionConstants.JEE_6_0_ID);
- }
-
-
- protected IStatus validateModuleType() {
- if (getArchiveWrapper().getJavaEEQuickPeek().getType() == J2EEConstants.WEB_TYPE)
- return OK_STATUS;
-
- // TODO: STRING MOVE
- return WTPCommonPlugin.createErrorStatus(WTPCommonPlugin.getResourceString("Temp String for none WARFile")); //$NON-NLS-1$);
- }
-
- @Override
- public boolean propertySet(String propertyName, Object propertyValue) {
- super.propertySet(propertyName, propertyValue);
- if (propertyName.equals(ARCHIVE_WRAPPER)) {
- if (getArchiveWrapper() != null) {
- refreshInterpretedSpecVersion();
- model.notifyPropertyChange(PROJECT_NAME, IDataModel.VALID_VALUES_CHG);
- }
-
- ArchiveWrapper archiveWrapper = (ArchiveWrapper) propertyValue;
- if (null != archiveWrapper) {
- List <ArchiveWrapper> libs = archiveWrapper.getWebLibs();
- List nestedModels = new ArrayList();
- for (ArchiveWrapper libWrapper : libs) {
- IDataModel localModel = null;
- JavaEEQuickPeek jqp = libWrapper.getJavaEEQuickPeek();
- if(jqp.getType() == JavaEEQuickPeek.WEBFRAGMENT_TYPE){
- localModel = DataModelFactory.createDataModel(new J2EEArtifactImportDataModelProvider(){
-
- @Override
- protected IDataModel createJ2EEComponentCreationDataModel() {
- return DataModelFactory.createDataModel(new WebFragmentFacetProjectCreationDataModelProvider());
- }
-
- @Override
- public IDataModelOperation getDefaultOperation() {
- return new J2EEUtilityJarImportOperationNew(model);
- }
-
- @Override
- protected int getType() {
- return 0;
- }
-
- });
- } else {
- localModel = DataModelFactory.createDataModel(new J2EEUtilityJarImportDataModelProvider());
- }
- localModel.setProperty(ARCHIVE_WRAPPER, libWrapper);
- localModel.setProperty(IFacetProjectCreationDataModelProperties.FACET_RUNTIME, getProperty(IFacetProjectCreationDataModelProperties.FACET_RUNTIME));
- IDataModel facetDataModel = localModel.getNestedModel(IJ2EEComponentImportDataModelProperties.NESTED_MODEL_J2EE_COMPONENT_CREATION);
- facetDataModel.setBooleanProperty(IJ2EEFacetProjectCreationDataModelProperties.ADD_TO_EAR, false);
- nestedModels.add(localModel);
- }
- setProperty(WEB_LIB_MODELS, nestedModels);
- }
- }else if(propertyName.equals(CONTEXT_ROOT)){
- IDataModel creationModel = model.getNestedModel(NESTED_MODEL_J2EE_COMPONENT_CREATION);
- FacetDataModelMap map = (FacetDataModelMap) creationModel.getProperty(IFacetProjectCreationDataModelProperties.FACET_DM_MAP);
- IDataModel webFacetDataModel = map.getFacetDataModel( J2EEProjectUtilities.DYNAMIC_WEB );
- webFacetDataModel.setStringProperty(IWebFacetInstallDataModelProperties.CONTEXT_ROOT, (String)propertyValue);
- }else if(propertyName.equals(WEB_LIB_ARCHIVES_SELECTED)) {
- validateLibModelRuntimes();
- }
- return true;
- }
-
- @Override
- protected void refreshInterpretedSpecVersion() {
- IDataModel moduleDM = model.getNestedModel(NESTED_MODEL_J2EE_COMPONENT_CREATION);
- FacetDataModelMap map = (FacetDataModelMap) moduleDM.getProperty(IFacetProjectCreationDataModelProperties.FACET_DM_MAP);
- IDataModel webFacetDataModel = map.getFacetDataModel( J2EEProjectUtilities.DYNAMIC_WEB );
- int version = getInterpretedSpecVersion(getArchiveWrapper()).getVersion();
- String versionText = J2EEVersionUtil.getServletTextVersion( version );
- webFacetDataModel.setStringProperty(IFacetDataModelProperties.FACET_VERSION_STR, versionText);
- updateWorkingCopyFacetVersion(moduleDM, webFacetDataModel);
- updateJavaFacetVersion();
- }
-
- @Override
- public IStatus validate(String propertyName) {
- if(FACET_RUNTIME.equals(propertyName)){
- super.validate(propertyName);
- return validateLibModelRuntimes();
- }
- return super.validate(propertyName);
- }
-
- private IStatus validateLibModelRuntimes() {
- List libArchives = (List)getProperty(WEB_LIB_ARCHIVES_SELECTED);
- List libModels = (List)getProperty(WEB_LIB_MODELS);
- IStatus status = OK_STATUS;
- for (int i=0; i < libModels.size(); i++) {
- IDataModel libModel = (IDataModel)libModels.get(i);
- if (libArchives.contains(libModel.getProperty(ARCHIVE_WRAPPER))){
- status = libModel.validateProperty(FACET_RUNTIME);
- }
- if(!status.isOK()){
- return status;
- }
- }
- return status;
- }
-
- @Override
- protected IDataModel createJ2EEComponentCreationDataModel() {
- return DataModelFactory.createDataModel(new WebFacetProjectCreationDataModelProvider());
- }
-
- @Override
- public IDataModelOperation getDefaultOperation() {
- return new WebComponentImportOperation(model);
- }
-
- @Override
- public void init() {
- super.init();
- IDataModel componentCreationDM = model.getNestedModel(NESTED_MODEL_J2EE_COMPONENT_CREATION);
- FacetDataModelMap map = (FacetDataModelMap) componentCreationDM.getProperty(IFacetProjectCreationDataModelProperties.FACET_DM_MAP);
- IDataModel webFacet = map.getFacetDataModel( IJ2EEFacetConstants.DYNAMIC_WEB );
- webFacet.setBooleanProperty(IJ2EEFacetInstallDataModelProperties.GENERATE_DD, false);
- }
-
- @Override
- public void propertyChanged(DataModelEvent event) {
- super.propertyChanged(event);
- if (event.getPropertyName().equals(IFacetProjectCreationDataModelProperties.FACET_RUNTIME) && event.getDataModel() == model.getNestedModel(NESTED_MODEL_J2EE_COMPONENT_CREATION)) {
- Object propertyValue = event.getProperty();
- IDataModel nestedModel = null;
- List projectModels = (List) getProperty(WEB_LIB_MODELS);
- for (int i = 0; i < projectModels.size(); i++) {
- nestedModel = (IDataModel) projectModels.get(i);
- nestedModel.setProperty(IFacetProjectCreationDataModelProperties.FACET_RUNTIME, propertyValue);
- }
- }
- }
-}
diff --git a/plugins/org.eclipse.jst.j2ee.web/webproject/org/eclipse/jst/j2ee/internal/web/archive/operations/WebComponentImportOperation.java b/plugins/org.eclipse.jst.j2ee.web/webproject/org/eclipse/jst/j2ee/internal/web/archive/operations/WebComponentImportOperation.java
deleted file mode 100644
index 49df067..0000000
--- a/plugins/org.eclipse.jst.j2ee.web/webproject/org/eclipse/jst/j2ee/internal/web/archive/operations/WebComponentImportOperation.java
+++ /dev/null
@@ -1,132 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2003, 2007 IBM Corporation and others.
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
- *
- * Contributors:
- * IBM Corporation - initial API and implementation
- *******************************************************************************/
-package org.eclipse.jst.j2ee.internal.web.archive.operations;
-
-import java.lang.reflect.InvocationTargetException;
-import java.util.ArrayList;
-import java.util.HashMap;
-import java.util.List;
-import java.util.Map;
-
-import org.eclipse.core.commands.ExecutionException;
-import org.eclipse.core.resources.IResource;
-import org.eclipse.core.runtime.CoreException;
-import org.eclipse.core.runtime.IProgressMonitor;
-import org.eclipse.core.runtime.SubProgressMonitor;
-import org.eclipse.jst.j2ee.datamodel.properties.IJ2EEComponentImportDataModelProperties;
-import org.eclipse.jst.j2ee.internal.archive.ArchiveWrapper;
-import org.eclipse.jst.j2ee.internal.archive.ComponentArchiveSaveAdapter;
-import org.eclipse.jst.j2ee.internal.archive.WebComponentArchiveSaveAdapter;
-import org.eclipse.jst.j2ee.internal.archive.operations.J2EEArtifactImportOperation;
-import org.eclipse.jst.j2ee.internal.web.plugin.WebPlugin;
-import org.eclipse.jst.j2ee.web.componentcore.util.WebArtifactEdit;
-import org.eclipse.jst.j2ee.web.datamodel.properties.IWebComponentImportDataModelProperties;
-import org.eclipse.wst.common.componentcore.datamodel.properties.ICreateReferenceComponentsDataModelProperties;
-import org.eclipse.wst.common.componentcore.internal.operation.CreateReferenceComponentsDataModelProvider;
-import org.eclipse.wst.common.componentcore.resources.IVirtualComponent;
-import org.eclipse.wst.common.componentcore.resources.IVirtualFolder;
-import org.eclipse.wst.common.frameworks.datamodel.DataModelFactory;
-import org.eclipse.wst.common.frameworks.datamodel.IDataModel;
-
-public class WebComponentImportOperation extends J2EEArtifactImportOperation {
- /**
- * @param model
- */
- public WebComponentImportOperation(IDataModel model) {
- super(model);
- }
-
- protected final int LINK_COMPONENTS_WORK = 10;
- protected final int LIB_FOLDER_WORK = 2;
-
- @Override
- protected int computeTotalWork() {
- int baseWork = super.computeTotalWork() + LIB_FOLDER_WORK;
- List selectedLibs = (List) model.getProperty(IWebComponentImportDataModelProperties.WEB_LIB_ARCHIVES_SELECTED);
- List libProjects = (List) model.getProperty(IWebComponentImportDataModelProperties.WEB_LIB_MODELS);
- IDataModel importModel = null;
- ArchiveWrapper libArchive = null;
- for (int i = 0; null != libProjects && i < libProjects.size(); i++) {
- importModel = (IDataModel) libProjects.get(i);
- libArchive = (ArchiveWrapper) importModel.getProperty(IJ2EEComponentImportDataModelProperties.ARCHIVE_WRAPPER);
- if (selectedLibs.contains(libArchive)) {
- baseWork += LINK_COMPONENTS_WORK + PROJECT_CREATION_WORK + libArchive.getSize();
- }
- }
-
- return baseWork;
- }
-
- @Override
- protected void doExecute(IProgressMonitor monitor) throws ExecutionException {
- super.doExecute(monitor);
- IVirtualFolder libFolder = virtualComponent.getRootFolder().getFolder(WebArtifactEdit.WEBLIB);
- if (!libFolder.exists()) {
- try {
- libFolder.create(IResource.FORCE, new SubProgressMonitor(monitor, LIB_FOLDER_WORK));
- } catch (CoreException e) {
- WebPlugin.logError(e);
- }
- } else {
- monitor.worked(LIB_FOLDER_WORK);
- }
- try {
- importWebLibraryProjects(monitor);
- } catch (InvocationTargetException e) {
- WebPlugin.logError(e);
- } catch (InterruptedException e) {
- WebPlugin.logError(e);
- }
- }
-
- private void importWebLibraryProjects(IProgressMonitor monitor) throws InvocationTargetException, InterruptedException, ExecutionException {
- List <ArchiveWrapper> selectedLibs = (List<ArchiveWrapper>) model.getProperty(IWebComponentImportDataModelProperties.WEB_LIB_ARCHIVES_SELECTED);
- List <Object> selectedLibsUnderlyingArchives = new ArrayList();
- for(ArchiveWrapper lib: selectedLibs){
- selectedLibsUnderlyingArchives.add(lib.getUnderLyingArchive());
- }
- List <IDataModel> libProjects = (List <IDataModel>) model.getProperty(IWebComponentImportDataModelProperties.WEB_LIB_MODELS);
- IDataModel importModel = null;
- IVirtualComponent nestedComponent = null;
- ArchiveWrapper libArchive = null;
- List targetComponents = new ArrayList();
- Map compToURIMap = new HashMap();
- for (int i = 0; null != libProjects && i < libProjects.size(); i++) {
- importModel = libProjects.get(i);
- libArchive = (ArchiveWrapper) importModel.getProperty(IJ2EEComponentImportDataModelProperties.ARCHIVE_WRAPPER);
- if (selectedLibsUnderlyingArchives.contains(libArchive.getUnderLyingArchive())) {
- importModel.getDefaultOperation().execute(new SubProgressMonitor(monitor, PROJECT_CREATION_WORK + libArchive.getSize()) , info);
- nestedComponent = (IVirtualComponent) importModel.getProperty(IJ2EEComponentImportDataModelProperties.COMPONENT);
- targetComponents.add(nestedComponent);
- String archiveURI = libArchive.getPath().lastSegment();
- compToURIMap.put(nestedComponent, archiveURI);
- }
- }
- /**
- * The J2EEComponentClasspathContainr will handle adding these to the classpath, so they
- * don't need to be added here.
- */
- if (targetComponents.size() > 0) {
- IDataModel createRefComponentsModel = DataModelFactory.createDataModel(new CreateReferenceComponentsDataModelProvider());
- createRefComponentsModel.setProperty(ICreateReferenceComponentsDataModelProperties.SOURCE_COMPONENT, virtualComponent);
- createRefComponentsModel.setProperty(ICreateReferenceComponentsDataModelProperties.TARGET_COMPONENTS_DEPLOY_PATH, "/WEB-INF/lib/"); //$NON-NLS-1$
- createRefComponentsModel.setProperty(ICreateReferenceComponentsDataModelProperties.TARGET_COMPONENT_LIST, targetComponents);
- createRefComponentsModel.setProperty(ICreateReferenceComponentsDataModelProperties.TARGET_COMPONENTS_TO_URI_MAP, compToURIMap);
- createRefComponentsModel.getDefaultOperation().execute(new SubProgressMonitor(monitor, LINK_COMPONENTS_WORK * targetComponents.size()), info);
- }
- }
-
- @Override
- protected ComponentArchiveSaveAdapter getArchiveSaveAdapter(
- IVirtualComponent virtualComponent) {
- return new WebComponentArchiveSaveAdapter(virtualComponent);
- }
-}
diff --git a/plugins/org.eclipse.jst.j2ee.web/webproject/org/eclipse/jst/j2ee/internal/web/archive/operations/WebComponentLoadStrategyImpl.java b/plugins/org.eclipse.jst.j2ee.web/webproject/org/eclipse/jst/j2ee/internal/web/archive/operations/WebComponentLoadStrategyImpl.java
deleted file mode 100644
index a0adfda..0000000
--- a/plugins/org.eclipse.jst.j2ee.web/webproject/org/eclipse/jst/j2ee/internal/web/archive/operations/WebComponentLoadStrategyImpl.java
+++ /dev/null
@@ -1,119 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2003, 2007 IBM Corporation and others.
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
- *
- * Contributors:
- * IBM Corporation - initial API and implementation
- *******************************************************************************/
-package org.eclipse.jst.j2ee.internal.web.archive.operations;
-
-import java.io.File;
-import java.util.List;
-
-import org.eclipse.core.runtime.IPath;
-import org.eclipse.jst.j2ee.classpathdep.IClasspathDependencyConstants;
-import org.eclipse.jst.j2ee.commonarchivecore.internal.Archive;
-import org.eclipse.jst.j2ee.commonarchivecore.internal.exception.OpenFailureException;
-import org.eclipse.jst.j2ee.componentcore.J2EEModuleVirtualComponent;
-import org.eclipse.jst.j2ee.internal.archive.operations.ComponentLoadStrategyImpl;
-import org.eclipse.jst.j2ee.internal.plugin.IJ2EEModuleConstants;
-import org.eclipse.jst.j2ee.internal.project.J2EEProjectUtilities;
-import org.eclipse.jst.j2ee.internal.project.ProjectSupportResourceHandler;
-import org.eclipse.jst.j2ee.internal.web.plugin.WebPlugin;
-import org.eclipse.jst.j2ee.project.WebUtilities;
-import org.eclipse.jst.j2ee.web.componentcore.util.WebArtifactEdit;
-import org.eclipse.wst.common.componentcore.ArtifactEdit;
-import org.eclipse.wst.common.componentcore.resources.IVirtualComponent;
-import org.eclipse.wst.common.componentcore.resources.IVirtualReference;
-
-public class WebComponentLoadStrategyImpl extends ComponentLoadStrategyImpl {
-
- public WebComponentLoadStrategyImpl(IVirtualComponent vComponent) {
- super(vComponent);
- }
-
- public WebComponentLoadStrategyImpl(IVirtualComponent vComponent, boolean includeClasspathComponents) {
- super(vComponent, includeClasspathComponents);
- }
-
- @Override
- public List getFiles() {
- super.getFiles();
- addLooseLibJARsToFiles();
- if (includeClasspathComponents) {
- addMappedClassFolders(IClasspathDependencyConstants.WEB_INF_CLASSES_PATH);
- }
- return filesHolder.getFiles();
- }
-
- public IVirtualReference[] getLibModules() {
- return WebUtilities.getLibModules(getComponent());
- }
-
- public void addLooseLibJARsToFiles() {
- IVirtualReference[] libModules = getLibModules();
- for (int i = 0; i < libModules.length; i++) {
- IVirtualReference iLibModule = libModules[i];
- IVirtualComponent looseComponent = iLibModule.getReferencedComponent();
- if (looseComponent.isBinary()) {
- java.io.File diskFile = (java.io.File)looseComponent.getAdapter(java.io.File.class);
- String uri = iLibModule.getRuntimePath().makeRelative().toString() + "/" + diskFile.getName(); //$NON-NLS-1$
- addExternalFile(uri, diskFile);
- } else {
- String name = null;
- String archiveName = iLibModule.getArchiveName();
- if (archiveName != null && archiveName.length() > 0) {
- name = archiveName;
- } else {
- name = looseComponent.getName() + IJ2EEModuleConstants.JAR_EXT;
- }
- String prefix = iLibModule.getRuntimePath().makeRelative().toString();
- if (prefix.length() > 0 && prefix.charAt(prefix.length() - 1)!= '/') {
- prefix += "/"; //$NON-NLS-1$
- }
-
- addClasspathComponentDependencies(looseComponent);
-
- String uri = prefix + name;
- try {
- Archive utilJAR = J2EEProjectUtilities.asArchive(uri, looseComponent.getProject(), isExportSource());
- if (utilJAR == null)
- continue;
- filesHolder.addFile(utilJAR);
- } catch (OpenFailureException oe) {
- String message = ProjectSupportResourceHandler.getString(ProjectSupportResourceHandler.UNABLE_TO_LOAD_MODULE_ERROR_, new Object[]{uri, getComponent().getProject().getName(), oe.getConcatenatedMessages()});
- WebPlugin.logError(message);
- }
- }
- }
- }
- @Override
- protected synchronized ArtifactEdit getArtifactEditForRead() {
- if(artifactEdit == null){
- artifactEdit = WebArtifactEdit.getWebArtifactEditForRead(vComponent);
- }
- return artifactEdit;
- }
-
- private void addClasspathComponentDependencies(final IVirtualComponent referencedComponent) {
- // retrieve all Java classpath component dependencies
- if (includeClasspathComponents && referencedComponent instanceof J2EEModuleVirtualComponent) {
- final IVirtualReference[] cpRefs = ((J2EEModuleVirtualComponent) referencedComponent).getJavaClasspathReferences();
- for (int j = 0; j < cpRefs.length; j++) {
- final IVirtualReference ref = cpRefs[j];
- final IPath runtimePath = ref.getRuntimePath();
-
- // only process ../ mappings
- if (ref.getReferencedComponent().isBinary()
- && runtimePath.equals(IClasspathDependencyConstants.RUNTIME_MAPPING_INTO_CONTAINER_PATH)) {
- File cpEntryFile = (java.io.File)ref.getReferencedComponent().getAdapter(java.io.File.class);
- addExternalFile("WEB-INF/lib/" + ref.getArchiveName(), cpEntryFile); //$NON-NLS-1$
- }
- }
- }
- }
-
-}
diff --git a/plugins/org.eclipse.jst.j2ee.web/webproject/org/eclipse/jst/j2ee/internal/web/archive/operations/WebComponentSaveStrategyImpl.java b/plugins/org.eclipse.jst.j2ee.web/webproject/org/eclipse/jst/j2ee/internal/web/archive/operations/WebComponentSaveStrategyImpl.java
deleted file mode 100644
index fc144d0..0000000
--- a/plugins/org.eclipse.jst.j2ee.web/webproject/org/eclipse/jst/j2ee/internal/web/archive/operations/WebComponentSaveStrategyImpl.java
+++ /dev/null
@@ -1,117 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2003, 2006 IBM Corporation and others.
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
- *
- * Contributors:
- * IBM Corporation - initial API and implementation
- *******************************************************************************/
-package org.eclipse.jst.j2ee.internal.web.archive.operations;
-
-import java.util.HashMap;
-import java.util.Map;
-
-import org.eclipse.core.resources.IFile;
-import org.eclipse.core.runtime.IPath;
-import org.eclipse.core.runtime.Path;
-import org.eclipse.jst.j2ee.commonarchivecore.internal.Archive;
-import org.eclipse.jst.j2ee.commonarchivecore.internal.File;
-import org.eclipse.jst.j2ee.commonarchivecore.internal.WARFile;
-import org.eclipse.jst.j2ee.commonarchivecore.internal.helpers.ArchiveConstants;
-import org.eclipse.jst.j2ee.commonarchivecore.internal.util.ArchiveUtil;
-import org.eclipse.jst.j2ee.internal.archive.operations.J2EEComponentSaveStrategyImpl;
-import org.eclipse.wst.common.componentcore.resources.IVirtualComponent;
-import org.eclipse.wst.common.componentcore.resources.IVirtualFile;
-import org.eclipse.wst.common.componentcore.resources.IVirtualFolder;
-
-/**
- * @deprecated this will be deleted post WTP 3.2. This code is no longer
- * called because the IArchive API is used to handle imports.
- *
- * @author jsholl
- */
-public class WebComponentSaveStrategyImpl extends J2EEComponentSaveStrategyImpl {
-
- public WebComponentSaveStrategyImpl(IVirtualComponent vComponent) {
- super(vComponent);
- }
-
- /**
- * DoNotUseMeThisWillBeDeletedPost15
- *
- * @deprecated
- * @param archive
- * @return
- */
- protected boolean operationHandlesNested(Archive archive) {
- return !shouldLinkAsComponentRef(archive);
- }
-
- @Override
- protected boolean shouldAddImportedClassesToClasspath() {
- return false; // never add to classpath because the web app container will pick this up.
- }
-
- @Override
- protected String getImportedClassesURI(File aFile) {
- String uri = aFile.getURI();
- return WTProjectStrategyUtils.makeRelative(uri, ArchiveConstants.WEBAPP_CLASSES_URI);
- }
-
- @Override
- protected IPath getImportedClassesRuntimePath() {
- return new Path("/" + ArchiveConstants.WEBAPP_CLASSES_URI); //$NON-NLS-1$
- }
-
- @Override
- protected IPath getOutputPathForFile(File aFile) {
- if (null != nonStandardSourceFiles && nonStandardSourceFiles.containsKey(aFile)) {
- IVirtualFolder rootFolder = vComponent.getRootFolder();
- IVirtualFile vFile = rootFolder.getFile((String) nonStandardSourceFiles.get(aFile));
- IFile iFile = vFile.getUnderlyingFile();
- return iFile.getProjectRelativePath();
- }
- return super.getOutputPathForFile(aFile);
- }
-
- /**
- * This map handles the case when a java source file is not in the same place as the .class
- * file. For example if all the source files were contained in WEB-INF/source
- */
- protected Map nonStandardSourceFiles;
-
- @Override
- protected boolean isClassWithoutSource(File aFile) {
- String javaUri = ArchiveUtil.classUriToJavaUri(aFile.getURI());
- if (javaUri == null)
- return false;
- if (archive.containsFile(javaUri)) {
- return false;
- }
- // see if it is a JSP
- String jspUri = javaUri.substring(0, javaUri.indexOf(ArchiveUtil.DOT_JAVA));
- int lastSlash = jspUri.lastIndexOf('/');
- int _index = lastSlash == -1 ? ArchiveConstants.WEBAPP_CLASSES_URI.length() : lastSlash + 1;
- if (jspUri.charAt(_index) == '_') {
- jspUri = jspUri.substring(ArchiveConstants.WEBAPP_CLASSES_URI.length(), _index) + jspUri.substring(_index + 1) + ArchiveUtil.DOT_JSP;
- if (archive.containsFile(jspUri)) {
- return false;
- }
- }
-
- // see if the source is in another directory
- File sourceFile = ((WARFile) archive).getSourceFile(aFile);
- if (null == sourceFile) {
- return true;
- }
- if (nonStandardSourceFiles == null) {
- nonStandardSourceFiles = new HashMap();
- }
- if (!nonStandardSourceFiles.containsKey(sourceFile)) {
- nonStandardSourceFiles.put(sourceFile, javaUri);
- }
- return false;
- }
-}
diff --git a/plugins/org.eclipse.jst.j2ee.web/webproject/org/eclipse/jst/j2ee/internal/web/archive/operations/WebFacetProjectCreationDataModelProvider.java b/plugins/org.eclipse.jst.j2ee.web/webproject/org/eclipse/jst/j2ee/internal/web/archive/operations/WebFacetProjectCreationDataModelProvider.java
deleted file mode 100644
index 741a7f8..0000000
--- a/plugins/org.eclipse.jst.j2ee.web/webproject/org/eclipse/jst/j2ee/internal/web/archive/operations/WebFacetProjectCreationDataModelProvider.java
+++ /dev/null
@@ -1,77 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2003, 2007 IBM Corporation and others.
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
- *
- * Contributors:
- * IBM Corporation - initial API and implementation
- *******************************************************************************/
-package org.eclipse.jst.j2ee.internal.web.archive.operations;
-
-import java.util.ArrayList;
-import java.util.Collection;
-
-import org.eclipse.jst.common.project.facet.IJavaFacetInstallDataModelProperties;
-import org.eclipse.jst.common.project.facet.JavaFacetUtils;
-import org.eclipse.jst.j2ee.internal.plugin.J2EEPlugin;
-import org.eclipse.jst.j2ee.internal.plugin.J2EEPreferences.Keys;
-import org.eclipse.jst.j2ee.internal.project.J2EEProjectUtilities;
-import org.eclipse.jst.j2ee.project.facet.IJ2EEFacetConstants;
-import org.eclipse.jst.j2ee.project.facet.IJ2EEModuleFacetInstallDataModelProperties;
-import org.eclipse.jst.j2ee.project.facet.J2EEFacetProjectCreationDataModelProvider;
-import org.eclipse.jst.j2ee.web.project.facet.IWebFacetInstallDataModelProperties;
-import org.eclipse.wst.common.frameworks.datamodel.DataModelEvent;
-import org.eclipse.wst.common.frameworks.datamodel.IDataModel;
-import org.eclipse.wst.common.frameworks.datamodel.IDataModelListener;
-import org.eclipse.wst.common.project.facet.core.IProjectFacet;
-
-public class WebFacetProjectCreationDataModelProvider extends J2EEFacetProjectCreationDataModelProvider {
-
- public WebFacetProjectCreationDataModelProvider() {
- super();
- }
-
- @Override
- public void init() {
- super.init();
-
- Collection<IProjectFacet> requiredFacets = new ArrayList<IProjectFacet>();
- requiredFacets.add(JavaFacetUtils.JAVA_FACET);
- requiredFacets.add(IJ2EEFacetConstants.DYNAMIC_WEB_FACET);
- setProperty(REQUIRED_FACETS_COLLECTION, requiredFacets);
-
- FacetDataModelMap map = (FacetDataModelMap) getProperty(FACET_DM_MAP);
- IDataModel javaFacet = map.getFacetDataModel( JavaFacetUtils.JAVA_FACET.getId() );
- IDataModel webFacet = map.getFacetDataModel( IJ2EEFacetConstants.DYNAMIC_WEB_FACET.getId() );
- //String webRoot = webFacet.getStringProperty(IWebFacetInstallDataModelProperties.CONFIG_FOLDER);
- String webSrc = webFacet.getStringProperty(IWebFacetInstallDataModelProperties.SOURCE_FOLDER);
- javaFacet.setProperty(IJavaFacetInstallDataModelProperties.SOURCE_FOLDER_NAME, webSrc);
- javaFacet.setProperty(IJavaFacetInstallDataModelProperties.DEFAULT_OUTPUT_FOLDER_NAME,
- J2EEPlugin.getDefault().getJ2EEPreferences().getString(Keys.DYN_WEB_OUTPUT_FOLDER) );
-
- webFacet.addListener(new IDataModelListener() {
- public void propertyChanged(DataModelEvent event) {
- if (IJ2EEModuleFacetInstallDataModelProperties.EAR_PROJECT_NAME.equals(event.getPropertyName())) {
- if (isPropertySet(EAR_PROJECT_NAME))
- setProperty(EAR_PROJECT_NAME, event.getProperty());
- else
- model.notifyPropertyChange(EAR_PROJECT_NAME, IDataModel.DEFAULT_CHG);
- }else if (IJ2EEModuleFacetInstallDataModelProperties.ADD_TO_EAR.equals(event.getPropertyName())) {
- setProperty(ADD_TO_EAR, event.getProperty());
- }
- }
- });
- }
-
- @Override
- public boolean propertySet(String propertyName, Object propertyValue) {
- if( propertyName.equals( MODULE_URI )){
- FacetDataModelMap map = (FacetDataModelMap) getProperty(FACET_DM_MAP);
- IDataModel webFacet = map.getFacetDataModel( J2EEProjectUtilities.DYNAMIC_WEB );
- webFacet.setProperty( IJ2EEModuleFacetInstallDataModelProperties.MODULE_URI, propertyValue );
- }
- return super.propertySet(propertyName, propertyValue);
- }
-}
diff --git a/plugins/org.eclipse.jst.j2ee.web/webproject/org/eclipse/jst/j2ee/internal/web/classpath/WebAppLibrariesContainer.java b/plugins/org.eclipse.jst.j2ee.web/webproject/org/eclipse/jst/j2ee/internal/web/classpath/WebAppLibrariesContainer.java
deleted file mode 100644
index e499cfd..0000000
--- a/plugins/org.eclipse.jst.j2ee.web/webproject/org/eclipse/jst/j2ee/internal/web/classpath/WebAppLibrariesContainer.java
+++ /dev/null
@@ -1,246 +0,0 @@
-/******************************************************************************
- * Copyright (c) 2005-2006 BEA Systems, Inc.
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
- *
- * Contributors:
- * Konstantin Komissarchik - initial API and implementation
- ******************************************************************************/
-
-package org.eclipse.jst.j2ee.internal.web.classpath;
-
-import java.util.ArrayList;
-import java.util.HashMap;
-import java.util.List;
-import java.util.Map;
-
-import org.eclipse.core.resources.IProject;
-import org.eclipse.core.resources.ResourcesPlugin;
-import org.eclipse.core.runtime.IPath;
-import org.eclipse.core.runtime.IProgressMonitor;
-import org.eclipse.core.runtime.IStatus;
-import org.eclipse.core.runtime.Path;
-import org.eclipse.core.runtime.Status;
-import org.eclipse.core.runtime.jobs.Job;
-import org.eclipse.jdt.core.IClasspathContainer;
-import org.eclipse.jdt.core.IClasspathEntry;
-import org.eclipse.jdt.core.IJavaProject;
-import org.eclipse.jdt.core.JavaCore;
-import org.eclipse.jdt.core.JavaModelException;
-import org.eclipse.jst.common.internal.modulecore.ClasspathContainerVirtualComponent;
-import org.eclipse.jst.common.jdt.internal.classpath.FlexibleProjectContainer;
-import org.eclipse.jst.j2ee.internal.common.classpath.J2EEComponentClasspathUpdater;
-import org.eclipse.jst.j2ee.internal.web.plugin.WebPlugin;
-import org.eclipse.osgi.util.NLS;
-import org.eclipse.wst.common.componentcore.internal.builder.IDependencyGraph;
-import org.eclipse.wst.common.componentcore.internal.resources.VirtualComponent;
-import org.eclipse.wst.common.componentcore.resources.IVirtualComponent;
-import org.eclipse.wst.common.componentcore.resources.IVirtualReference;
-
-/**
- * @author <a href="mailto:kosta@bea.com">Konstantin Komissarchik</a>
- */
-
-public final class WebAppLibrariesContainer
-
- extends FlexibleProjectContainer
-
-{
- private WebAppLibrariesStore.RestoreState restoreState;
-
- private static final IPath[] paths
- = new IPath[] { new Path( "WEB-INF/lib" ), //$NON-NLS-1$
- new Path( "WEB-INF/classes" ) }; //$NON-NLS-1$
-
- private static final PathType[] types
- = new PathType[] { PathType.LIB_DIRECTORY, PathType.CLASSES_DIRECTORY };
-
- public static final String CONTAINER_ID
- = "org.eclipse.jst.j2ee.internal.web.container"; //$NON-NLS-1$
-
- public WebAppLibrariesContainer( final IPath path,
- final IJavaProject jproject )
- {
- super( path, jproject, getProject( path, jproject), paths, types );
- boolean needToVerify = false;
- if(null != restoreState){
- synchronized (restoreState) {
- needToVerify = restoreState.needToVerify;
- restoreState.needToVerify = false;
- }
- }
- if(needToVerify){
- Job verifyJob = new Job(Resources.verify){
- @Override
- protected IStatus run(IProgressMonitor monitor) {
- WebAppLibrariesContainer.this.refresh(false);
- return Status.OK_STATUS;
- }
- };
- verifyJob.setSystem(true);
- verifyJob.setRule(ResourcesPlugin.getWorkspace().getRoot());
- verifyJob.schedule();
- }
- }
-
- public String getDescription()
- {
- if( this.owner.getProject() != this.project )
- {
- return NLS.bind( Resources.labelWithProject, this.project.getName() );
- }
- return Resources.label;
- }
-
- public void install()
- {
- final IJavaProject[] projects = new IJavaProject[] { this.owner };
- final IClasspathContainer[] conts = new IClasspathContainer[] { this };
-
- try
- {
- JavaCore.setClasspathContainer( path, projects, conts, null );
- }
- catch( JavaModelException e )
- {
- WebPlugin.log( e );
- }
- }
-
- @Override
- public boolean isOutOfDate() {
- if(IDependencyGraph.INSTANCE.isStale()){
- //avoid deadlock https://bugs.eclipse.org/bugs/show_bug.cgi?id=334050
- //if the data is stale, return true and attempt to update again in the near future
- J2EEComponentClasspathUpdater.getInstance().queueUpdate(owner.getProject());
- return true;
- }
-
- final List currentEntries = computeClasspathEntries(false);
- boolean outOfDate = ! this.entries.equals( currentEntries );
- if(outOfDate){
- WebAppLibrariesStore.flush(project.getName());
- }
- return outOfDate;
- }
-
- @Override
- public void refresh(boolean forceUpdate){
- if(IDependencyGraph.INSTANCE.isStale()){
- //avoid deadlock https://bugs.eclipse.org/bugs/show_bug.cgi?id=334050
- //if the data is stale abort and attempt to update again in the near future
- J2EEComponentClasspathUpdater.getInstance().queueUpdate(owner.getProject());
- return;
- }
-
- if(forceUpdate || isOutOfDate()){
- refresh();
- }
- }
-
- @Override
- public void refresh()
- {
- if(IDependencyGraph.INSTANCE.isStale()){
- //avoid deadlock https://bugs.eclipse.org/bugs/show_bug.cgi?id=335645
- //if the data is stale abort and attempt to update again in the near future
- J2EEComponentClasspathUpdater.getInstance().queueUpdate(owner.getProject());
- return;
- }
-
- ( new WebAppLibrariesContainer( this.path, this.owner ) ).install();
- }
-
- private static Map<String, Object> referenceOptions = new HashMap<String, Object>();
- static {
- referenceOptions.put("GET_JAVA_REFS", Boolean.FALSE); //$NON-NLS-1$
- }
-
- protected List <IVirtualReference>consumedReferences;
-
- @Override
- protected IVirtualReference[] computeReferences(IVirtualComponent vc) {
- IVirtualReference [] baseRefs = ((VirtualComponent)vc).getReferences(referenceOptions);
- List <IVirtualReference> refs = new ArrayList <IVirtualReference>();
- for(IVirtualReference ref: baseRefs){
- if(ref.getDependencyType() == IVirtualReference.DEPENDENCY_TYPE_USES){
- refs.add(ref);
- } else {
- if (ref.getRuntimePath().equals(paths[0].makeAbsolute())){
- if(consumedReferences == null){
- consumedReferences = new ArrayList<IVirtualReference>();
- }
- consumedReferences.add(ref);
- }
- }
- }
- return refs.toArray(new IVirtualReference[refs.size()]);
- }
-
- @Override
- protected List computeClasspathEntries() {
- return computeClasspathEntries(true);
- }
-
- protected List computeClasspathEntries(boolean useRestoreState) {
- if(useRestoreState){
- restoreState = WebAppLibrariesStore.getRestoreState(project.getName());
- if(restoreState != null){
- return restoreState.paths;
- }
- }
-
- List <IPath>entries = super.computeClasspathEntries();
- if(consumedReferences != null){
- for(IVirtualReference ref:consumedReferences){
- if(ref.getReferencedComponent() instanceof ClasspathContainerVirtualComponent){
- ClasspathContainerVirtualComponent cpvc = (ClasspathContainerVirtualComponent)ref.getReferencedComponent();
- if(cpvc != null){
- IClasspathContainer container = cpvc.getClasspathContainer();
- if(container != null){
- IClasspathEntry [] newEntries = container.getClasspathEntries();
- for(IClasspathEntry entry:newEntries){
- IPath entryPath = entry.getPath();
- if(!entries.contains(entryPath)){
- entries.add(entryPath);
- }
- }
- }
- }
- }
- }
- }
- WebAppLibrariesStore.saveState(project.getName(), entries);
- return entries;
- }
-
- private static final IProject getProject( final IPath path,
- final IJavaProject jproject )
- {
- if( path.segmentCount() == 1 )
- {
- return jproject.getProject();
- }
- final String name = path.segment( 1 );
- return ResourcesPlugin.getWorkspace().getRoot().getProject( name );
- }
-
- private static final class Resources
-
- extends NLS
-
- {
- public static String label;
- public static String labelWithProject;
- public static String verify;
-
- static
- {
- initializeMessages( WebAppLibrariesContainer.class.getName(),
- Resources.class );
- }
- }
-
-}
diff --git a/plugins/org.eclipse.jst.j2ee.web/webproject/org/eclipse/jst/j2ee/internal/web/classpath/WebAppLibrariesContainer.properties b/plugins/org.eclipse.jst.j2ee.web/webproject/org/eclipse/jst/j2ee/internal/web/classpath/WebAppLibrariesContainer.properties
deleted file mode 100644
index 5768a0e..0000000
--- a/plugins/org.eclipse.jst.j2ee.web/webproject/org/eclipse/jst/j2ee/internal/web/classpath/WebAppLibrariesContainer.properties
+++ /dev/null
@@ -1,13 +0,0 @@
-###############################################################################
-# Copyright (c) 2005, 2006 IBM Corporation and others.
-# All rights reserved. This program and the accompanying materials
-# are made available under the terms of the Eclipse Public License v1.0
-# which accompanies this distribution, and is available at
-# http://www.eclipse.org/legal/epl-v10.html
-#
-# Contributors:
-# IBM Corporation - initial API and implementation
-###############################################################################
-label = Web App Libraries
-labelWithProject = Web App Libraries [{0}]
-verify = Verify Web App Libraries
\ No newline at end of file
diff --git a/plugins/org.eclipse.jst.j2ee.web/webproject/org/eclipse/jst/j2ee/internal/web/classpath/WebAppLibrariesContainerInitializer.java b/plugins/org.eclipse.jst.j2ee.web/webproject/org/eclipse/jst/j2ee/internal/web/classpath/WebAppLibrariesContainerInitializer.java
deleted file mode 100644
index 7b0f04a..0000000
--- a/plugins/org.eclipse.jst.j2ee.web/webproject/org/eclipse/jst/j2ee/internal/web/classpath/WebAppLibrariesContainerInitializer.java
+++ /dev/null
@@ -1,38 +0,0 @@
-/******************************************************************************
- * Copyright (c) 2005-2006 BEA Systems, Inc.
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
- *
- * Contributors:
- * Konstantin Komissarchik - initial API and implementation
- ******************************************************************************/
-
-package org.eclipse.jst.j2ee.internal.web.classpath;
-
-import org.eclipse.core.runtime.CoreException;
-import org.eclipse.core.runtime.IPath;
-import org.eclipse.jdt.core.IJavaProject;
-import org.eclipse.jst.common.jdt.internal.classpath.FlexibleProjectContainerInitializer;
-
-/**
- * @author <a href="mailto:kosta@bea.com">Konstantin Komissarchik</a>
- */
-
-public final class WebAppLibrariesContainerInitializer
-
- extends FlexibleProjectContainerInitializer
-
-{
- @Override
- public void initialize( final IPath path,
- final IJavaProject jproj )
-
- throws CoreException
-
- {
- ( new WebAppLibrariesContainer( path, jproj ) ).install();
- }
-
-}
diff --git a/plugins/org.eclipse.jst.j2ee.web/webproject/org/eclipse/jst/j2ee/internal/web/classpath/WebAppLibrariesStore.java b/plugins/org.eclipse.jst.j2ee.web/webproject/org/eclipse/jst/j2ee/internal/web/classpath/WebAppLibrariesStore.java
deleted file mode 100644
index 316f919..0000000
--- a/plugins/org.eclipse.jst.j2ee.web/webproject/org/eclipse/jst/j2ee/internal/web/classpath/WebAppLibrariesStore.java
+++ /dev/null
@@ -1,245 +0,0 @@
-package org.eclipse.jst.j2ee.internal.web.classpath;
-
-import java.io.BufferedInputStream;
-import java.io.BufferedOutputStream;
-import java.io.FileInputStream;
-import java.io.FileNotFoundException;
-import java.io.FileOutputStream;
-import java.io.IOException;
-import java.io.ObjectInputStream;
-import java.io.ObjectOutputStream;
-import java.io.Serializable;
-import java.util.ArrayList;
-import java.util.HashMap;
-import java.util.Iterator;
-import java.util.List;
-import java.util.Map;
-import java.util.Map.Entry;
-
-import org.eclipse.core.runtime.IPath;
-import org.eclipse.core.runtime.IProgressMonitor;
-import org.eclipse.core.runtime.ISafeRunnable;
-import org.eclipse.core.runtime.IStatus;
-import org.eclipse.core.runtime.Path;
-import org.eclipse.core.runtime.SafeRunner;
-import org.eclipse.core.runtime.Status;
-import org.eclipse.core.runtime.jobs.Job;
-import org.eclipse.jst.j2ee.internal.web.plugin.WebPlugin;
-
-public class WebAppLibrariesStore {
-
- private static final String WEB_LIBRARIES_CACHE = "webLibrariesCache.index"; //$NON-NLS-1$
- private static Map<String, RestoreState> restoreStateMap;
- private static Map<String, RestoreState> saveStateMap = new HashMap<String, RestoreState>();
-
- static class RestoreState implements Serializable {
- private static final long serialVersionUID = 5565856269776724522L;
- transient boolean needToVerify;
- List<String> pathStrings;
- transient List<IPath> paths;
-
- private void writeObject(java.io.ObjectOutputStream out) throws IOException {
- pathStrings = new ArrayList<String>(paths.size());
- for (IPath p : paths) {
- pathStrings.add(p.toString());
- }
- out.defaultWriteObject();
- }
-
- private void readObject(java.io.ObjectInputStream in) throws IOException, ClassNotFoundException {
- in.defaultReadObject();
- needToVerify = true;
- paths = new ArrayList<IPath>(pathStrings.size());
- for (String s : pathStrings) {
- paths.add(new Path(s));
- }
- }
-
- @Override
- public boolean equals(Object o) {
- if (this == o) {
- return true;
- } else if (o == null) {
- return false;
- } else if (o instanceof RestoreState) {
- RestoreState other = (RestoreState) o;
- if (paths == null) {
- return other.paths == null;
- }
- return paths.equals(other.paths);
- }
- return false;
- }
-
- @Override
- public int hashCode() {
- if (paths == null) {
- return 11;
- }
- return paths.hashCode();
- }
- }
-
- static {
- IPath stateLocation = WebPlugin.getDefault().getStateLocation();
- java.io.File file = stateLocation.append(WEB_LIBRARIES_CACHE).toFile();
- try{
- if (file.exists()) {
- FileInputStream fIn = null;
- boolean deleteCache = true;
- try {
- fIn = new FileInputStream(file);
- BufferedInputStream bIn = new BufferedInputStream(fIn);
- ObjectInputStream oIn = new ObjectInputStream(bIn);
- restoreStateMap = (HashMap<String, RestoreState>) oIn.readObject();
- oIn.close();
-
- //it is unfortunate this is necessary, but without iterating over the map
- //and explicitly testing each value, class cast exceptions may occur later
- //best to check them all now and recover
- Iterator<Entry<String, RestoreState>> iterator = restoreStateMap.entrySet().iterator();
- while(iterator.hasNext()){
- Entry<String, RestoreState> next = iterator.next();
- String s = next.getKey();
- RestoreState rs = next.getValue();
- if(s == null || rs == null){
- //may throw ClassCastException
- }
- }
- deleteCache = false;
- } catch (FileNotFoundException e) {
- WebPlugin.logError(e);
- } catch (IOException e) {
- WebPlugin.logError(e);
- } catch (ClassNotFoundException e) {
- WebPlugin.logError(e);
- } catch (ClassCastException e) {
- WebPlugin.logError(e);
- } finally {
- if (fIn != null) {
- try {
- fIn.close();
- } catch (IOException e) {
- WebPlugin.logError(e);
- }
- }
- if (deleteCache) {
- restoreStateMap = new HashMap<String, RestoreState>();
- file.delete();
- }
- }
- }
- } catch (Throwable e){
- try{
- WebPlugin.logError(e);
- file.delete();
- } catch (Exception e2){
- //eat it
- }
- restoreStateMap = new HashMap<String, RestoreState>();
- } finally {
- if(restoreStateMap == null) {
- restoreStateMap = new HashMap<String, RestoreState>();
- }
- }
-
- }
-
- public static RestoreState getRestoreState(String projectName) {
- RestoreState restoreState = null;
- synchronized (restoreStateMap) {
- restoreState = restoreStateMap.get(projectName);
- }
- if (restoreState != null) {
- synchronized (saveStateMap) {
- saveStateMap.put(projectName, restoreState);
- }
- }
- return restoreState;
- }
-
- static void flush(String projectName) {
- synchronized (restoreStateMap) {
- restoreStateMap.remove(projectName);
- }
- synchronized (saveStateMap) {
- saveStateMap.remove(projectName);
- }
- }
-
- private static class PersistJob extends Job {
-
- public PersistJob() {
- super("Persist Web App Libraries State"); //$NON-NLS-1$
- setSystem(true);
- setRule(null);
- }
-
- @Override
- protected IStatus run(IProgressMonitor monitor) {
- SafeRunner.run(new ISafeRunnable() {
- public void run() throws Exception {
- persist();
- }
-
- public void handleException(Throwable exception) {
- WebPlugin.logError(exception);
- }
- });
- return Status.OK_STATUS;
- }
- }
-
- private static int persistDelay = 60000; // 1 minute
- private static PersistJob persistJob = new PersistJob();
-
- static void saveState(String projectName, List<IPath> paths) {
- RestoreState toSave = new RestoreState();
- toSave.paths = paths;
-
- boolean scheduleJob = false;
-
- synchronized (saveStateMap) {
- RestoreState previous = saveStateMap.get(projectName);
- if (null == previous || !previous.equals(toSave)) {
- saveStateMap.put(projectName, toSave);
- scheduleJob = true;
- }
- }
- if (scheduleJob) {
- synchronized (restoreStateMap) {
- // if it changed, do not load it from the cache again
- restoreStateMap.remove(projectName);
- }
- persistJob.schedule(persistDelay);
- }
- }
-
- private static void persist() {
- synchronized (saveStateMap) {
- IPath stateLocation = WebPlugin.getDefault().getStateLocation();
- java.io.File file = stateLocation.append(WEB_LIBRARIES_CACHE).toFile();
- FileOutputStream fOut = null;
- try {
- fOut = new FileOutputStream(file);
- BufferedOutputStream bOut = new BufferedOutputStream(fOut);
- ObjectOutputStream oOut = new ObjectOutputStream(bOut);
- oOut.writeObject(saveStateMap);
- oOut.close();
- } catch (FileNotFoundException e) {
- WebPlugin.logError(e);
- } catch (IOException e) {
- WebPlugin.logError(e);
- } finally {
- if (fOut != null) {
- try {
- fOut.close();
- } catch (IOException e) {
- WebPlugin.logError(e);
- }
- }
- }
- }
- }
-
-}
diff --git a/plugins/org.eclipse.jst.j2ee.web/webproject/org/eclipse/jst/j2ee/internal/web/operations/ClasspathUtilities.java b/plugins/org.eclipse.jst.j2ee.web/webproject/org/eclipse/jst/j2ee/internal/web/operations/ClasspathUtilities.java
deleted file mode 100644
index aaae1b7..0000000
--- a/plugins/org.eclipse.jst.j2ee.web/webproject/org/eclipse/jst/j2ee/internal/web/operations/ClasspathUtilities.java
+++ /dev/null
@@ -1,68 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2003, 2006 IBM Corporation and others.
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
- *
- * Contributors:
- * IBM Corporation - initial API and implementation
- *******************************************************************************/
-package org.eclipse.jst.j2ee.internal.web.operations;
-
-import java.util.ArrayList;
-import java.util.Arrays;
-import java.util.List;
-
-import org.eclipse.jdt.core.IClasspathEntry;
-
-public class ClasspathUtilities {
-
- static public IClasspathEntry[] addClasspathEntries(IClasspathEntry[] entries1, IClasspathEntry[] entries2) {
- List list = new ArrayList(entries1.length + entries2.length);
- list.addAll(Arrays.asList(entries1));
-
- for (int i = 0; i < entries2.length; i++) {
- IClasspathEntry iClasspathEntry = entries2[i];
- if (!list.contains(iClasspathEntry))
- list.add(iClasspathEntry);
- }
-
- IClasspathEntry[] ret = new IClasspathEntry[list.size()];
- return (IClasspathEntry[]) list.toArray(ret);
- }
-
- static protected boolean entryExists(IClasspathEntry entry, IClasspathEntry[] col) {
- for (int i = 0; i < col.length; i++) {
- IClasspathEntry otherEntry = col[i];
- if (entry.getContentKind() != otherEntry.getContentKind())
- continue;
-
- if (entry.getEntryKind() != otherEntry.getEntryKind())
- continue;
-
- if (entry.isExported() != otherEntry.isExported())
- continue;
-
- if (!entry.getPath().equals(otherEntry.getPath()))
- continue;
- return true;
- }
- return false;
- }
-
- static public IClasspathEntry[] removeClasspathEntries(IClasspathEntry[] removeFromCol, IClasspathEntry[] removeCol) {
- List list = new ArrayList(removeFromCol.length);
- // list.addAll(Arrays.asList(removeFromCol));
-
- for (int i = 0; i < removeFromCol.length; i++) {
- IClasspathEntry iClasspathEntry = removeFromCol[i];
- if (!entryExists(iClasspathEntry, removeCol))
- list.add(iClasspathEntry);
- }
-
- IClasspathEntry[] ret = new IClasspathEntry[list.size()];
- return (IClasspathEntry[]) list.toArray(ret);
- }
-
-}
diff --git a/plugins/org.eclipse.jst.j2ee.web/webproject/org/eclipse/jst/j2ee/internal/web/operations/ConvertStaticWebToDyamnicDataModelProvider.java b/plugins/org.eclipse.jst.j2ee.web/webproject/org/eclipse/jst/j2ee/internal/web/operations/ConvertStaticWebToDyamnicDataModelProvider.java
deleted file mode 100644
index 7360e3a..0000000
--- a/plugins/org.eclipse.jst.j2ee.web/webproject/org/eclipse/jst/j2ee/internal/web/operations/ConvertStaticWebToDyamnicDataModelProvider.java
+++ /dev/null
@@ -1,41 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2008 IBM Corporation and others.
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
- *
- * Contributors:
- * IBM Corporation - initial API and implementation
- *******************************************************************************/
-package org.eclipse.jst.j2ee.internal.web.operations;
-
-import java.util.HashSet;
-import java.util.Set;
-
-import org.eclipse.jst.j2ee.web.datamodel.properties.IConvertStaticWebToDyamnicDataModelProperties;
-import org.eclipse.wst.common.frameworks.datamodel.AbstractDataModelProvider;
-import org.eclipse.wst.common.frameworks.datamodel.IDataModelOperation;
-
-public class ConvertStaticWebToDyamnicDataModelProvider extends AbstractDataModelProvider implements IConvertStaticWebToDyamnicDataModelProperties {
-
-
- public ConvertStaticWebToDyamnicDataModelProvider() {
- super();
- }
-
- @Override
- public IDataModelOperation getDefaultOperation() {
- return new ConvertStaticWebToDyamnicOperation(model);
- }
-
-
- @Override
- public Set getPropertyNames() {
- Set propertyNames = new HashSet();
- propertyNames.add(PROJECT);
- propertyNames.add(CONVERT_TO_WEB_VERSION);
- return propertyNames;
- }
-
-}
diff --git a/plugins/org.eclipse.jst.j2ee.web/webproject/org/eclipse/jst/j2ee/internal/web/operations/ConvertStaticWebToDyamnicOperation.java b/plugins/org.eclipse.jst.j2ee.web/webproject/org/eclipse/jst/j2ee/internal/web/operations/ConvertStaticWebToDyamnicOperation.java
deleted file mode 100644
index 5b21b57..0000000
--- a/plugins/org.eclipse.jst.j2ee.web/webproject/org/eclipse/jst/j2ee/internal/web/operations/ConvertStaticWebToDyamnicOperation.java
+++ /dev/null
@@ -1,114 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2008 IBM Corporation and others.
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
- *
- * Contributors:
- * IBM Corporation - initial API and implementation
- *******************************************************************************/
-package org.eclipse.jst.j2ee.internal.web.operations;
-
-import java.util.HashSet;
-import java.util.Set;
-
-import org.eclipse.core.commands.ExecutionException;
-import org.eclipse.core.resources.IProject;
-import org.eclipse.core.runtime.IAdaptable;
-import org.eclipse.core.runtime.IProgressMonitor;
-import org.eclipse.core.runtime.IStatus;
-import org.eclipse.core.runtime.NullProgressMonitor;
-import org.eclipse.jst.common.project.facet.IJavaFacetInstallDataModelProperties;
-import org.eclipse.jst.common.project.facet.JavaFacetInstallDataModelProvider;
-import org.eclipse.jst.common.project.facet.JavaFacetUtils;
-import org.eclipse.jst.j2ee.internal.J2EEConstants;
-import org.eclipse.jst.j2ee.internal.web.plugin.WebPlugin;
-import org.eclipse.jst.j2ee.web.datamodel.properties.IConvertStaticWebToDyamnicDataModelProperties;
-import org.eclipse.jst.j2ee.web.project.facet.IWebFacetInstallDataModelProperties;
-import org.eclipse.jst.j2ee.web.project.facet.WebFacetInstallDataModelProvider;
-import org.eclipse.jst.j2ee.web.project.facet.WebFacetUtils;
-import org.eclipse.wst.common.componentcore.ComponentCore;
-import org.eclipse.wst.common.componentcore.internal.util.IModuleConstants;
-import org.eclipse.wst.common.componentcore.resources.IVirtualComponent;
-import org.eclipse.wst.common.componentcore.resources.IVirtualFolder;
-import org.eclipse.wst.common.frameworks.datamodel.AbstractDataModelOperation;
-import org.eclipse.wst.common.frameworks.datamodel.DataModelFactory;
-import org.eclipse.wst.common.frameworks.datamodel.IDataModel;
-import org.eclipse.wst.common.project.facet.core.IFacetedProject;
-import org.eclipse.wst.common.project.facet.core.IProjectFacet;
-import org.eclipse.wst.common.project.facet.core.IProjectFacetVersion;
-import org.eclipse.wst.common.project.facet.core.ProjectFacetsManager;
-import org.eclipse.wst.project.facet.ProductManager;
-
-public class ConvertStaticWebToDyamnicOperation extends AbstractDataModelOperation {
-
- public ConvertStaticWebToDyamnicOperation() {
- super();
- }
-
- public ConvertStaticWebToDyamnicOperation(IDataModel dm) {
- super(dm);
- }
-
- @Override
- public IStatus execute(IProgressMonitor monitor, IAdaptable info)
- throws ExecutionException {
- try {
- doConvert();
- } catch (Exception e) {
- WebPlugin.log(e);
- }
-
-
- return OK_STATUS;
- }
-
- protected void doConvert() throws Exception {
-
-
- String selectedVersion = model.getStringProperty(IConvertStaticWebToDyamnicDataModelProperties.CONVERT_TO_WEB_VERSION);
- IProject project = (IProject) model.getProperty(IConvertStaticWebToDyamnicDataModelProperties.PROJECT);
- IFacetedProject facetedProject = ProjectFacetsManager.create(project);
- Set fixedFacets = new HashSet();
- fixedFacets.addAll(facetedProject.getFixedProjectFacets());
- IProjectFacet webFacet = ProjectFacetsManager.getProjectFacet(IModuleConstants.WST_WEB_MODULE);
- fixedFacets.remove(webFacet);
- fixedFacets.add(WebFacetUtils.WEB_FACET);
- fixedFacets.add(JavaFacetUtils.JAVA_FACET);
- facetedProject.setFixedProjectFacets(fixedFacets);
- IProjectFacetVersion webFv = WebFacetUtils.WEB_FACET.getVersion(selectedVersion);
- IProjectFacetVersion javaFv = JavaFacetUtils.compilerLevelToFacet(JavaFacetUtils.getCompilerLevel(project));
- IFacetedProject.Action uninstall = new IFacetedProject.Action(IFacetedProject.Action.Type.UNINSTALL, facetedProject.getInstalledVersion(webFacet), null);
- IDataModel webModelCfg = DataModelFactory.createDataModel(new WebFacetInstallDataModelProvider());
- webModelCfg.setBooleanProperty(IWebFacetInstallDataModelProperties.ADD_TO_EAR, false);
- // Get the default web root folder name (just in case the .component file doesn't exist for some reason)
- String webRoot = webModelCfg.getStringProperty(IWebFacetInstallDataModelProperties.CONFIG_FOLDER);
-
- IVirtualComponent c = ComponentCore.createComponent(project);
- c.create(0, null);
- if (c.exists()) {
- // Get the web root folder from the .component file
- IVirtualFolder root = c.getRootFolder();
- webRoot = root.getUnderlyingFolder().getName();
- // Store the name into the properties for use during facet instal
- webModelCfg.setStringProperty(IWebFacetInstallDataModelProperties.CONFIG_FOLDER, webRoot);
- }
-
- IDataModel javaModelCfg = null;
- if (ProductManager.shouldUseSingleRootStructure()){
- javaModelCfg = DataModelFactory.createDataModel(new JavaFacetInstallDataModelProvider());
- javaModelCfg.setProperty(IJavaFacetInstallDataModelProperties.DEFAULT_OUTPUT_FOLDER_NAME,
- webRoot+"/"+ J2EEConstants.WEB_INF_CLASSES); //$NON-NLS-1$
- }
-
- IFacetedProject.Action install = new IFacetedProject.Action(IFacetedProject.Action.Type.INSTALL,webFv,webModelCfg);
- IFacetedProject.Action javaInstall = new IFacetedProject.Action(IFacetedProject.Action.Type.INSTALL, javaFv, javaModelCfg);
- Set set = new HashSet();
- set.add(uninstall);
- set.add(install);
- set.add(javaInstall);
- facetedProject.modify(set, new NullProgressMonitor());
- }
-
-}
diff --git a/plugins/org.eclipse.jst.j2ee.web/webproject/org/eclipse/jst/j2ee/internal/web/operations/IWebProjectWizardInfo.java b/plugins/org.eclipse.jst.j2ee.web/webproject/org/eclipse/jst/j2ee/internal/web/operations/IWebProjectWizardInfo.java
deleted file mode 100644
index e8de100..0000000
--- a/plugins/org.eclipse.jst.j2ee.web/webproject/org/eclipse/jst/j2ee/internal/web/operations/IWebProjectWizardInfo.java
+++ /dev/null
@@ -1,63 +0,0 @@
-/***************************************************************************************************
- * Copyright (c) 2003, 2004 IBM Corporation and others. All rights reserved. This program and the
- * accompanying materials are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
- *
- * Contributors: IBM Corporation - initial API and implementation
- **************************************************************************************************/
-package org.eclipse.jst.j2ee.internal.web.operations;
-
-import org.eclipse.jdt.core.IClasspathEntry;
-
-public interface IWebProjectWizardInfo {
- /**
- * Adds entries to the class path for this project
- */
- public void addToClasspathEntries(IClasspathEntry[] entries);
-
- /**
- * Get the name of the specified project Creation date: (11/09/00 10:05:24 AM)
- *
- * @return java.lang.String
- */
- public String getProjectName();
-
- /**
- * Get the Enterprise Application Project
- */
- public String getEARProjectName();
-
- /**
- * Get the name of the web content folder. If not set then return the current default.
- */
- public String getWebContentName();
-
- /**
- * Set the name of the web content folder
- */
- public void setWebContentName(String name);
-
- /**
- * Get the name of the Java source folder If not set then return the current default.
- */
- public String getJavaSourceName();
-
- /**
- * Set the name of the Java source folder
- */
- public void setJavaSourceName(String name);
-
- /**
- * Return an Object for the assocated properties or null
- */
- public Object getProperty(String propertyName);
-
- /**
- * Set an Object for the assocated properties or null
- */
- public void setProperty(String propertyName, Object value);
-
-
-}
-
diff --git a/plugins/org.eclipse.jst.j2ee.web/webproject/org/eclipse/jst/j2ee/internal/web/operations/IWebToolingConstants.java b/plugins/org.eclipse.jst.j2ee.web/webproject/org/eclipse/jst/j2ee/internal/web/operations/IWebToolingConstants.java
deleted file mode 100644
index 9c50530..0000000
--- a/plugins/org.eclipse.jst.j2ee.web/webproject/org/eclipse/jst/j2ee/internal/web/operations/IWebToolingConstants.java
+++ /dev/null
@@ -1,34 +0,0 @@
-/***************************************************************************************************
- * Copyright (c) 2003, 2004 IBM Corporation and others. All rights reserved. This program and the
- * accompanying materials are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
- *
- * Contributors: IBM Corporation - initial API and implementation
- **************************************************************************************************/
-package org.eclipse.jst.j2ee.internal.web.operations;
-
-
-
-/*
- * The IConfigurationConstants are the list of tags that are usuable for specifying a web
- * application parameters via XML
- *
- * @see WebApplicationSpecification for the full DTD
- */
-
-public interface IWebToolingConstants {
-
- public String TRUE = "true"; //$NON-NLS-1$
- public String FALSE = "false"; //$NON-NLS-1$
-
- public String HTTP_PATH_PREFIX = "http://"; //$NON-NLS-1$
- public String INDEX_FILE = "index.html"; //$NON-NLS-1$
- public String HTTP_PARAMETER_SEPARATOR = "?"; //$NON-NLS-1$
- public String CONTENT_LENGTH_HEADER_KEY = "Content-Length"; //$NON-NLS-1$
-
- public String SENTENCE_TERMINATOR = "."; //$NON-NLS-1$
-
- public String POST_COMMAND = "POST"; //$NON-NLS-1$
- public String GET_COMMAND = "GET"; //$NON-NLS-1$
-}
\ No newline at end of file
diff --git a/plugins/org.eclipse.jst.j2ee.web/webproject/org/eclipse/jst/j2ee/internal/web/operations/IWebToolingCoreConstants.java b/plugins/org.eclipse.jst.j2ee.web/webproject/org/eclipse/jst/j2ee/internal/web/operations/IWebToolingCoreConstants.java
deleted file mode 100644
index 1d9eaaa..0000000
--- a/plugins/org.eclipse.jst.j2ee.web/webproject/org/eclipse/jst/j2ee/internal/web/operations/IWebToolingCoreConstants.java
+++ /dev/null
@@ -1,29 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2003, 2004 IBM Corporation and others.
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
- *
- * Contributors:
- * IBM Corporation - initial API and implementation
- *******************************************************************************/
-package org.eclipse.jst.j2ee.internal.web.operations;
-
-/**
- * The IWebToolingCoreConstants are the constants required by the ITP core
- */
-public interface IWebToolingCoreConstants {
- public String PLUG_IN_ID = "com.ibm.etools.webtools"; //$NON-NLS-1$
- public String PROP_SERVLET_JAR = "com.ibm.etools.webtools.servletjar"; //$NON-NLS-1$
- public String PROP_WEBAS_JAR = "com.ibm.etools.webtools.webasjar"; //$NON-NLS-1$
- public String PROP_CLIENT_NAME = "com.ibm.etools.webtools.clientname"; //$NON-NLS-1$
- public String PROP_LINK_STYLE = "com.ibm.etools.webtools.linkstyle"; //$NON-NLS-1$
- public String PROP_MODIFY_LINK_PROMPT = "com.ibm.etools.webtools.modifyprompt"; //$NON-NLS-1$
- public String PROP_AUTO_MODIFY_LINK = "com.ibm.etools.webtools.automodify"; //$NON-NLS-1$
- public String JDT_IDENTIFIER = "org.eclipse.jdt.ui"; //$NON-NLS-1$
- public String RUNTIME_IDENTIFIER = "WebNatureRuntime"; //$NON-NLS-1$
- public String DOC_RELATIVE = "DOC_RELATIVE"; //$NON-NLS-1$
- public String DOC_ROOT_RELATIVE = "DOC_ROOT_RELATIVE"; //$NON-NLS-1$
- public String ICON_PATH = "icons"; //$NON-NLS-1$
-}
\ No newline at end of file
diff --git a/plugins/org.eclipse.jst.j2ee.web/webproject/org/eclipse/jst/j2ee/internal/web/operations/MasterCSS.java b/plugins/org.eclipse.jst.j2ee.web/webproject/org/eclipse/jst/j2ee/internal/web/operations/MasterCSS.java
deleted file mode 100644
index f17c1b7..0000000
--- a/plugins/org.eclipse.jst.j2ee.web/webproject/org/eclipse/jst/j2ee/internal/web/operations/MasterCSS.java
+++ /dev/null
@@ -1,33 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2003, 2004 IBM Corporation and others.
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
- *
- * Contributors:
- * IBM Corporation - initial API and implementation
- *******************************************************************************/
-package org.eclipse.jst.j2ee.internal.web.operations;
-
-
-
-/**
- * Code generation class compiled from template file MasterCSS.tpl
- */
-public class MasterCSS implements WebToolingTemplate {
- private static final String TEXT_1 = "BODY\r\n{\r\n BACKGROUND-COLOR: #FFE4B5;\r\n COLOR: black;\r\n FONT-FAMILY: 'Times New Roman'\r\n}\r\nH1\r\n{\r\n COLOR: navy;\r\n FONT-FAMILY: 'Times New Roman';\r\n FONT-SIZE: x-large;\r\n FONT-WEIGHT: bolder;\r\n TEXT-TRANSFORM: capitalize\r\n}\r\nH2\r\n{\r\n COLOR: navy;\r\n FONT-FAMILY: 'Times New Roman';\r\n FONT-SIZE: large;\r\n FONT-WEIGHT: bolder;\r\n TEXT-TRANSFORM: capitalize\r\n}\r\nH3\r\n{\r\n COLOR: navy;\r\n FONT-FAMILY: 'Times New Roman';\r\n FONT-SIZE: large;\r\n FONT-WEIGHT: lighter;\r\n TEXT-TRANSFORM: capitalize\r\n}";//$NON-NLS-1$
- private static final String TEXT_2 = "\r\n";//$NON-NLS-1$
-
- /**
- * Code generation method
- *
- * @return String
- */
- public String generate(TemplateData data) {
- StringBuffer sb = new StringBuffer();
- sb.append(TEXT_1);
- sb.append(TEXT_2);
- return sb.toString();
- }
-}
\ No newline at end of file
diff --git a/plugins/org.eclipse.jst.j2ee.web/webproject/org/eclipse/jst/j2ee/internal/web/operations/RelationData.java b/plugins/org.eclipse.jst.j2ee.web/webproject/org/eclipse/jst/j2ee/internal/web/operations/RelationData.java
deleted file mode 100644
index b40f7bb..0000000
--- a/plugins/org.eclipse.jst.j2ee.web/webproject/org/eclipse/jst/j2ee/internal/web/operations/RelationData.java
+++ /dev/null
@@ -1,995 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2003, 2006 IBM Corporation and others.
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
- *
- * Contributors:
- * IBM Corporation - initial API and implementation
- *******************************************************************************/
-package org.eclipse.jst.j2ee.internal.web.operations;
-
-
-
-import java.io.BufferedReader;
-import java.io.BufferedWriter;
-import java.io.File;
-import java.io.FileNotFoundException;
-import java.io.FileReader;
-import java.io.FileWriter;
-import java.io.IOException;
-import java.io.PrintWriter;
-import java.util.ArrayList;
-import java.util.Collection;
-import java.util.Enumeration;
-import java.util.Hashtable;
-import java.util.List;
-import com.ibm.icu.util.StringTokenizer;
-import java.util.Vector;
-
-import org.eclipse.core.resources.IProject;
-import org.eclipse.core.runtime.IPath;
-import org.eclipse.core.runtime.Path;
-import org.eclipse.jst.j2ee.internal.plugin.J2EEPlugin;
-import org.eclipse.jst.j2ee.internal.project.ProjectSupportResourceHandler;
-import org.eclipse.jst.j2ee.internal.web.plugin.WebPlugin;
-
-
-/**
- * This class stores the relationship between two files. In particular, this is an inLink and the
- * files which reference it.
- */
-public class RelationData {
- public class Link implements Cloneable {
-
- private String url;
- private int occurrences = 0;
-
- public Link(String newUrl, int occ) {
- url = newUrl;
- occurrences = occ;
- }
-
- /**
- * Returns an exact copy of this object.
- *
- * @return Created clone object
- */
- @Override
- public Object clone() {
- return new Link(url, occurrences);
- }
-
- /**
- * Returns the url of the file that references this inLink
- *
- * @return String
- */
- public String getURL() {
- return url;
- }
-
- /**
- * Returns the number of times this file references the inLink
- *
- * @return int
- */
- public int getOccurrences() {
- return occurrences;
- }
-
- private int addOccurrence(int add) {
- occurrences = occurrences + add;
- return occurrences;
- }
-
- @Override
- public String toString() {
- return url;
- }
- }
-
- // our relationship table. Key is a string which is the path of the inLink,
- // value is a vector of files that reference the inLink.
- protected Hashtable inLinksTable = null;
- protected Hashtable anchorsTable = null;
- private static final int INIT_HASH_TABLE_SIZE = 100;
- private static final int INIT_ANCHORS_HASH_TABLE_SIZE = 10;
- private boolean fileOk = false;
- private static final String LINK_STATE_FILE_NAME = "link_table_states.txt";//$NON-NLS-1$
- private static final String LINK_SERVERCONTEXTROOT_FILE_NAME = "link_scr_states.txt";//$NON-NLS-1$
- public static final String LINK_MISSING_FILE = "-";//$NON-NLS-1$
- public static final String LINK_INDEX_SEPARATOR = "+";//$NON-NLS-1$
- public static final String ANCHOR_INDEX_SEPARATOR = "#";//$NON-NLS-1$
- public static final String LINK_OCCURENCE_SEPARATOR = "/";//$NON-NLS-1$
- public static final String ANCHOR_SEPARATOR = "#### ANCHORS ####";//$NON-NLS-1$
-
- /**
- * RelationData constructor comment.
- */
- public RelationData() {
- super();
- inLinksTable = new Hashtable(INIT_HASH_TABLE_SIZE);
- anchorsTable = new Hashtable(INIT_ANCHORS_HASH_TABLE_SIZE);
- }
-
- public Link addInLink(String file_path, String parent_path, int occurence) {
- Vector in_links = (Vector) inLinksTable.get(file_path);
- if (in_links == null) {
- return null;
- }
- for (int i = 0; i < in_links.size(); i++) {
- Link inlnk = (Link) in_links.elementAt(i);
- String url = inlnk.getURL();
-
- //
- // Increment the occurence and return
- //
-
- if (url.compareTo(parent_path) == 0) {
- inlnk.addOccurrence(occurence);
- return inlnk;
- }
- }
-
- //
- // The link does not exist, need to add an entry in the table for it
- //
-
- Link inlnk = new Link(parent_path, occurence);
- in_links.addElement(inlnk);
- return inlnk;
- }
-
- public void changeInLink(String filePath, boolean missing) {
-
- if (missing) {
- Vector inlinks = (Vector) inLinksTable.remove(filePath);
- inLinksTable.put(LINK_MISSING_FILE + filePath, inlinks);
- } else {
- Vector inlinks = (Vector) inLinksTable.remove(LINK_MISSING_FILE + filePath);
- inLinksTable.put(filePath, inlinks);
- }
- }
-
-
- /*
- * returns which projects depend on this file i.e. any projects that are in this file's list of
- * in_links
- */
- public Collection getDependentProjects(String file_path) {
- Hashtable outProjects = new Hashtable();
- Vector in_links = (Vector) inLinksTable.get(file_path);
-
- if (in_links != null) {
- for (int i = 0; i < in_links.size(); i++) {
- Link inlnk = (Link) in_links.elementAt(i);
- String url = inlnk.getURL();
- // should be in the form of: /ProjName/....
- if (url.length() > 0) {
- // key could be the filename or the missing filename ("-" + filename)
- // take this into account and offset the index accordingly
- int index = 0;
- int offset = 1;
- if (url.charAt(0) == '-') {
- index = url.indexOf(IPath.SEPARATOR, 2);
- offset = 2;
- } else {
- index = url.indexOf(IPath.SEPARATOR, 1);
- offset = 1;
- }
- if (index != -1) {
- String projName = url.substring(offset, index);
- outProjects.put(projName, projName);
- }
- }
- }
- }
- return outProjects.values();
- }
-
- /*
- * returns which cross-project files depend on this file i.e. any projects that are in this
- * file's list of in_links
- */
- public Collection getDependentProjectFiles(String projName) {
- Hashtable outProjects = new Hashtable();
-
- for (Enumeration aenum = inLinksTable.keys(); aenum.hasMoreElements();) {
- String path = (String) aenum.nextElement();
- // should be in the form of: /ProjName/....
- if (path.length() > 0) {
- // if path is a missing filename ("-" + filename) then it means that it had
- // to come from this project (that is, the external nonexistent file could not have
- // linked to this project). So, we will not add this path. Also, since it is marked
- // broken, it probably won't exist to do anything with it anyway.
- if (path.charAt(0) != '-') {
- int index = path.indexOf(IPath.SEPARATOR, 1);
- if (index != -1) {
- String currentProjName = path.substring(1, index);
- if (!currentProjName.equals(projName)) {
- outProjects.put(path, path);
- }
- }
- }
- }
- }
- return outProjects.values();
- }
-
-
-
- public void createInLinkEntry(String file_path, String parent_path, int occurence) {
-
- Vector in_links = new Vector();
- Link inlnk = new Link(parent_path, occurence);
- in_links.addElement(inlnk);
- inLinksTable.put(file_path, in_links);
- }
-
-
-
- public void dump() {
-// if (false) {
-// if (inLinksTable != null) {
-// for (Enumeration aenum = inLinksTable.keys(); aenum.hasMoreElements();) {
-// StringBuffer St = new StringBuffer();
-// String key = (String) aenum.nextElement();
-// St.append("\nKey=" + key + "\n");//$NON-NLS-1$//$NON-NLS-2$
-// Vector in_links = (Vector) inLinksTable.get(key);
-// int nb_of_links = in_links.size();
-//
-// // Replace the string by index
-// // Add a '+'separator only for more than one links to save space
-// //
-//
-//
-// for (int i = 0; i < nb_of_links; i++) {
-// Link lnk = (Link) in_links.elementAt(i);
-// St.append("\tValue=" + lnk.getURL() + "[" + lnk.getOccurrences() + "]");//$NON-NLS-3$//$NON-NLS-2$//$NON-NLS-1$
-// }
-// org.eclipse.jem.util.logger.proxy.Logger.getLogger().logInfo(St.toString());
-// }
-// }
-// }
- }
-
- public void dump(boolean dump) {
- if (dump) {
- if (inLinksTable != null) {
- for (Enumeration aenum = inLinksTable.keys(); aenum.hasMoreElements();) {
- StringBuffer St = new StringBuffer();
- String key = (String) aenum.nextElement();
- St.append("\nKey=" + key + "\n");//$NON-NLS-1$//$NON-NLS-2$
- Vector in_links = (Vector) inLinksTable.get(key);
- int nb_of_links = in_links.size();
-
- // Replace the string by index
- // Add a '+'separator only for more than one links to save space
- //
-
-
- for (int i = 0; i < nb_of_links; i++) {
- Link lnk = (Link) in_links.elementAt(i);
- St.append("\tValue=" + lnk.getURL() + "[" + lnk.getOccurrences() + "]");//$NON-NLS-3$//$NON-NLS-2$//$NON-NLS-1$
- }
- WebPlugin.logError(St.toString());
- }
- }
- }
- }
-
- /**
- * used for LinksBuilder debugging
- */
- public void dump2() {
- if (inLinksTable != null) {
- for (Enumeration aenum = inLinksTable.keys(); aenum.hasMoreElements();) {
- StringBuffer St = new StringBuffer();
- String key = (String) aenum.nextElement();
-
- Vector in_links = (Vector) inLinksTable.get(key);
- int nb_of_links = in_links.size();
- St.append("\nKey=" + key + " -- num:" + nb_of_links + "\n");//$NON-NLS-1$//$NON-NLS-2$ //$NON-NLS-3$
- // Replace the string by index
- // Add a '+'separator only for more than one links to save space
- //
-
-
- for (int i = 0; i < nb_of_links; i++) {
- Link lnk = (Link) in_links.elementAt(i);
- St.append("\tValue=" + lnk.getURL() + "[" + lnk.getOccurrences() + "]");//$NON-NLS-3$//$NON-NLS-2$//$NON-NLS-1$
- }
- System.out.println(St.toString());
- }
- }
- System.out.println("************************************************\n\n\n\n************************************\n"); //$NON-NLS-1$
- }
-
-
- public Vector getInLinks(String filePath) {
- return (Vector) inLinksTable.get(filePath);
- }
-
- public void getInLinks(String filePath, Vector vectInLinks) {
-
- if (inLinksTable != null) {
- dump();
- Vector in_links = (Vector) inLinksTable.get(filePath);
- if (in_links != null) {
- for (int i = 0; i < in_links.size(); i++) {
- Link inlnk = (Link) ((Link) in_links.elementAt(i)).clone();
- vectInLinks.addElement(inlnk);
- }
- }
- }
- }
-
- public Hashtable getAnchorsTable() {
- return anchorsTable;
- }
-
- /**
- * Returns the file used to store ServerContextRoot for the project.
- */
- public static File getPreviousSCRFile(IProject project) {
- return new Path(J2EEPlugin.getDefault().getStateLocation().toString() + File.separator + project.getName() + File.separator + LINK_SERVERCONTEXTROOT_FILE_NAME).toFile();
- }
-
- /**
- * Returns the file used to store the state of the link relations for the project.
- *
- * @return java.io.File The state file
- * @param project
- * org.eclipse.core.resources.IProject The project to get the state file for.
- */
- private File getStateFile(IProject project) {
- return new Path(J2EEPlugin.getDefault().getStateLocation().toString() + File.separator + project.getName() + File.separator + LINK_STATE_FILE_NAME).toFile();
- }
-
- public boolean hasInLinkEntry(String path) {
- return inLinksTable.containsKey(path);
- }
-
- /**
- * Run through all missing-file (-) RD entries to see if any of them closely match the path to
- * this class. Return all of the matches.
- */
- public Vector getPossibleMissingEndingMatches(IPath classPath) {
- Vector v = new Vector();
-
- String match = classPath.lastSegment();
- match = match.substring(0, match.length() - 6); // length minus ".class"
-
- String classPathStr = classPath.toString();
- String matchingClassPath = classPathStr.toString().substring(0, classPathStr.length() - 6);
-
- for (Enumeration aenum = inLinksTable.keys(); aenum.hasMoreElements();) {
- String path = (String) aenum.nextElement();
- // check if path ends with the class name that has been added/removed
- if (path.startsWith(LINK_MISSING_FILE) && path.endsWith(match)) {
- // OK: simple match found; now let's match with finer granularity.
- // Take path and put it into a form where we can check if it is a
- // close match to the class that has changed:
- // /Proj/Web Content/com.acme.Foo --> com/acme/Foo
- String linkPath;
- int index = path.lastIndexOf(IPath.SEPARATOR);
- if (index != -1 && index < path.length() - 1) {
- linkPath = path.substring(index + 1);
- } else {
- linkPath = path;
- }
- String closeMatch = linkPath.replace('.', IPath.SEPARATOR);
-
- if (matchingClassPath.endsWith(closeMatch)) {
- Vector in_links = (Vector) inLinksTable.get(path);
- String nonMissingPath = path.substring(1, path.length());
- changeInLink(nonMissingPath, false);
- if (in_links != null) {
- for (int i = 0; i < in_links.size(); i++) {
- Link inlnk = (Link) in_links.elementAt(i);
- String url = inlnk.getURL();
- v.add(url);
- }
- }
- }
- }
- }
- return v;
- }
-
-
- /**
- * Run through all existing RD entries to see if any of them closely match the path to this
- * class. Return all of the matches.
- */
- public Vector getPossibleExistingEndingMatches(IPath classPath) {
- Vector v = new Vector();
-
- String match = classPath.lastSegment();
- match = match.substring(0, match.length() - 6); // length minus ".class"
-
- String classPathStr = classPath.toString();
- String matchingClassPath = classPathStr.toString().substring(0, classPathStr.length() - 6);
-
- for (Enumeration aenum = inLinksTable.keys(); aenum.hasMoreElements();) {
- String path = (String) aenum.nextElement();
- // check if path ends with the class name that has been added/removed
- if (path.endsWith(match) && !path.startsWith(LINK_MISSING_FILE)) {
- // OK: simple match found; now let's match with finer granularity.
- // Take path and put it into a form where we can check if it is a
- // close match to the class that has changed:
- // /Proj/Web Content/com.acme.Foo --> com/acme/Foo
- String linkPath;
- int index = path.lastIndexOf(IPath.SEPARATOR);
- if (index != -1 && index < path.length() - 1) {
- linkPath = path.substring(index + 1);
- } else {
- linkPath = path;
- }
- String closeMatch = linkPath.replace('.', IPath.SEPARATOR);
-
- if (matchingClassPath.endsWith(closeMatch)) {
- Vector in_links = (Vector) inLinksTable.get(path);
- changeInLink(path, true);
- if (in_links != null) {
- for (int i = 0; i < in_links.size(); i++) {
- Link inlnk = (Link) in_links.elementAt(i);
- String url = inlnk.getURL();
- v.add(url);
- }
- }
- }
- }
- }
- return v;
- }
-
- /**
- * Run through all existing RD entries to see if any of them closely match the path to this
- * class. Remove the inlinks for all the matches.
- */
- public void removeInLinksPossibleExistingEndingMatches(IPath classPath) {
- String match = classPath.lastSegment();
- match = match.substring(0, match.length() - 6); // length minus ".class"
-
- String classPathStr = classPath.toString();
- String matchingClassPath = classPathStr.toString().substring(0, classPathStr.length() - 6);
-
- for (Enumeration aenum = inLinksTable.keys(); aenum.hasMoreElements();) {
- String path = (String) aenum.nextElement();
- if (path.endsWith(match) && !path.startsWith(LINK_MISSING_FILE)) {
- // OK: simple match found; now let's match with finer granularity.
- // Take path and put it into a form where we can check if it is a
- // close match to the class that has changed:
- // /Proj/Web Content/com.acme.Foo --> com/acme/Foo
- String linkPath;
- int index = path.lastIndexOf(IPath.SEPARATOR);
- if (index != -1 && index < path.length() - 1) {
- linkPath = path.substring(index + 1);
- } else {
- linkPath = path;
- }
- String closeMatch = linkPath.replace('.', IPath.SEPARATOR);
-
- if (matchingClassPath.endsWith(closeMatch)) {
- removeInLinks(path);
- }
- }
- }
- }
-
- /**
- * Initialize links tables
- */
- public void initialize() {
- inLinksTable = new Hashtable(INIT_HASH_TABLE_SIZE);
- anchorsTable = new Hashtable(INIT_ANCHORS_HASH_TABLE_SIZE);
-
- }
-
- /**
- * Initialize links tables
- */
- public void initializeAnchors() {
- anchorsTable = new Hashtable(INIT_ANCHORS_HASH_TABLE_SIZE);
- }
-
- /**
- * Initialize links tables
- */
- public void initializeInLinks() {
- inLinksTable = new Hashtable(INIT_HASH_TABLE_SIZE);
- }
-
- /**
- * Return true if the file to restore data from existed and was successfully read.
- *
- * @return boolean
- */
- public boolean isFileOk() {
- return fileOk;
- }
-
- public boolean isInitialized() {
- return (inLinksTable != null);
- }
-
- public void newInLinkEntry(String path) {
- if (!inLinksTable.containsKey(path))
- inLinksTable.put(path, new Vector());
- }
-
- public void removeInLinks(String file_path) {
-
- //
- // Iterate through the fLinksTable to remove all in-links references
- // for file_path
- //
-
- for (Enumeration aenum = inLinksTable.keys(); aenum.hasMoreElements();) {
- String key = (String) aenum.nextElement();
- Vector in_links = (Vector) inLinksTable.get(key);
-
- for (int i = 0; i < in_links.size(); i++) {
-
- Link inlnk = (Link) in_links.elementAt(i);
- String url = inlnk.getURL();
-
- if (url.compareTo(file_path) == 0) {
- in_links.removeElementAt(i);
- break;
- }
-
- //
- // Remove the entry in the fLinksTable if the in-link
- // of the file is not in the workbench and an orphan link
- // otherwise update the in-links fLinksTable
- //
- }
-
- if (in_links.isEmpty() && key.startsWith(LINK_MISSING_FILE)) {
- inLinksTable.remove(key);
- }
- }
- }
-
- /**
- * Iterate through the fLinksTable to return all out-links references for file_path
- *
- * @param file_path
- * @return
- */
- public List getOutLinks(String file_path) {
- ArrayList list = new ArrayList();
- for (Enumeration aenum = inLinksTable.keys(); aenum.hasMoreElements();) {
- String key = (String) aenum.nextElement();
- Vector in_links = (Vector) inLinksTable.get(key);
-
- for (int i = 0; i < in_links.size(); i++) {
-
- Link inlnk = (Link) in_links.elementAt(i);
- String url = inlnk.getURL();
-
- if (url.compareTo(file_path) == 0) {
- list.add(key);
- break;
- }
- }
- }
-
- return list;
- }
-
-
- /**
- * return whether other resources link to this file or not
- */
- public boolean referencedByOtherLinks(String file_path) {
-
- //
- // Iterate through the fLinksTable to remove all in-links references
- // for file_path
- //
- boolean referenced = false;
- for (Enumeration aenum = inLinksTable.keys(); !referenced && aenum.hasMoreElements();) {
- String key = (String) aenum.nextElement();
- Vector in_links = (Vector) inLinksTable.get(key);
-
- for (int i = 0; i < in_links.size(); i++) {
- Link inlnk = (Link) in_links.elementAt(i);
- String url = inlnk.getURL();
-
- if (url.compareTo(file_path) == 0) {
- referenced = true;
- break;
- }
- }
- }
- return referenced;
- }
-
-
- /*
- * performs as removeInLinks( String ) ... But for performance reasons, this also additionally
- * returns a list of all the projects that this file is dependent upon. This is useful to get
- * this information, and then go to all of those projects' relation data and tell them to
- * removeInLinks for this file.
- */
- public Collection removeInLinksForProjects(String file_path) {
-
- //
- // Iterate through the fLinksTable to remove all in-links references
- // for file_path
- //
- Hashtable projects = new Hashtable();
- for (Enumeration aenum = inLinksTable.keys(); aenum.hasMoreElements();) {
- String key = (String) aenum.nextElement();
- Vector in_links = (Vector) inLinksTable.get(key);
-
- for (int i = 0; i < in_links.size(); i++) {
-
- Link inlnk = (Link) in_links.elementAt(i);
- String url = inlnk.getURL();
-
- if (url.compareTo(file_path) == 0) {
- // should be in the form of: /ProjName/....
- if (key.length() > 0) {
- // key could be the filename or the missing filename ("-" + filename)
- // take this into account and offset the index accordingly
- int index = 0;
- int offset = 1;
- if (key.charAt(0) == '-') {
- index = key.indexOf(IPath.SEPARATOR, 2);
- offset = 2;
- } else {
- index = key.indexOf(IPath.SEPARATOR, 1);
- offset = 1;
- }
- if (index != -1) {
- String projName = key.substring(offset, index);
- projects.put(projName, projName);
- }
- }
- in_links.removeElementAt(i);
- break;
- }
-
- //
- // Remove the entry in the fLinksTable if the in-link
- // of the file is not in the workbench and an orphan link
- // otherwise update the in-links fLinksTable
- //
- }
-
- if (in_links.isEmpty() && key.startsWith(LINK_MISSING_FILE))
- inLinksTable.remove(key);
- }
-
- return projects.values();
- }
-
-
-
- /**
- * performs as removeInLinks( String ) ... But for performance reasons, it additionally returns
- * which projects depend on this file. i.e. any projects that are in this file's list of
- * in_links
- */
- public Collection removeInLinksAndGetDependentProjects(String file_path) {
- //
- // Iterate through the fLinksTable to remove all in-links references
- // for file_path
- //
- Hashtable projects = new Hashtable();
- for (Enumeration aenum = inLinksTable.keys(); aenum.hasMoreElements();) {
- String key = (String) aenum.nextElement();
- Vector in_links = (Vector) inLinksTable.get(key);
-
- if (key.equals(RelationData.LINK_MISSING_FILE + file_path)) {
- int index = -1;
- for (int i = 0; i < in_links.size(); i++) {
- Link inlnk = (Link) in_links.elementAt(i);
- String url = inlnk.getURL();
-
- if (url.compareTo(file_path) == 0) {
- index = i;
- }
- if (url.length() > 1) {
- int projindex = url.indexOf(IPath.SEPARATOR, 1);
- if (projindex != -1) {
- String projName = url.substring(1, projindex);
- projects.put(projName, projName);
- }
- }
- }
- if (index != -1) {
- in_links.removeElementAt(index);
- }
-
- } else {
- for (int i = 0; i < in_links.size(); i++) {
-
- Link inlnk = (Link) in_links.elementAt(i);
- String url = inlnk.getURL();
-
- if (url.compareTo(file_path) == 0) {
-
- in_links.removeElementAt(i);
- break;
- }
-
- //
- // Remove the entry in the fLinksTable if the in-link
- // of the file is not in the workbench and an orphan link
- // otherwise update the in-links fLinksTable
- //
- }
- }
-
- if (in_links.isEmpty() && key.startsWith(LINK_MISSING_FILE)) {
- inLinksTable.remove(key);
- }
- }
- return projects.values();
- }
-
-
- /**
- * remove all references to a specific inLink. When removeOrphan is true the inLink entry is
- * removed as well, when there are no more refereces to it
- */
- public void removeInLinks(String inLinkEntry, String inLinkReference, boolean removeOrphan) {
-
- String key = inLinkEntry;
- Vector in_links = (Vector) inLinksTable.get(key);
-
- for (int i = 0; i < in_links.size(); i++) {
-
- Link inlnk = (Link) in_links.elementAt(i);
- String url = inlnk.getURL();
-
- if (url.compareTo(inLinkReference) == 0) {
- in_links.removeElementAt(i);
- break;
- }
- }
-
- // If there are no more references to the inLinkEntry
- // and the caller wants this orphan deleted then
- // remove the key from the table
- if (in_links.isEmpty() && removeOrphan)
- inLinksTable.remove(key);
-
- }
-
- /**
- * Restores this builder's saved state and returns whether it was successful in doing so.
- */
- public boolean restore(IProject project) {
- if (project != null) {
- // get the state
- File stateFile = getStateFile(project);
- if (stateFile.exists()) {
- inLinksTable = new Hashtable(INIT_HASH_TABLE_SIZE);
-
- // read inLinksTable from stateFile
- Vector keys = new Vector();
- Vector indices = new Vector();
- BufferedReader reader = null;
- try {
- reader = new BufferedReader(new FileReader(stateFile));
-
- String line = null;
- // while( ((line = reader.readLine()) != null) && !line.startsWith(
- // ANCHOR_SEPARATOR ) )
- while ((line = reader.readLine()) != null) {
- String buffer = line;
-
-
- // to take into account the possibility of links spanning multiple lines,
- // keep reading until we find a line that starts with an idicator
- // that the link is finished (a line beginning w/ LINK_INDEX_SEPARATOR)
- line = reader.readLine();
- while (line != null && !line.startsWith(LINK_INDEX_SEPARATOR)) {
- buffer = buffer + line;
- line = reader.readLine();
- }
- // add link string (/MyProj/file.html)
- keys.addElement(buffer);
- // add references line (+2/3...)
- if (line != null) {
- indices.addElement(line);
- } else {
- System.out.println(ProjectSupportResourceHandler.Syntax_Error_in_the_links_UI_); // = "Syntax Error in the links state file"
- return false;
- }
- }
-
- // Use this to load anchor information
- // // Now let's add all of the extra anchor information
- // if ( line != null && line.startsWith( ANCHOR_SEPARATOR ) ) {
- // while( (line = reader.readLine()) != null )
- // {
- // String buffer = line;
- //
- // // to take into account the possibility of links spanning multiple lines,
- // // keep reading until we find a line that starts with an idicator
- // // that the link is finished (a line beginning w/ LINK_INDEX_SEPARATOR)
- // line = reader.readLine();
- // while ( line != null && !line.startsWith( ANCHOR_INDEX_SEPARATOR ) ) {
- // buffer = buffer + line;
- // line = reader.readLine();
- // }
- //
- // // add file and all of its anchors
- // if ( buffer != null && line != null)
- // {
- // anchorsTable.put( buffer, line );
- // }
- // else
- // {
- // System.out.println(ResourceHandler.getString("Syntax_Error_in_the_links_UI_"));
- // //$NON-NLS-1$ = "Syntax Error in the links state file"
- // return false;
- // }
- // }
- //
- // }
- } catch (FileNotFoundException fe) {
- WebPlugin.logError(fe);
- } catch (IOException ie) {
- WebPlugin.logError(ie);
- } finally {
- if (reader != null) {
- try {
- reader.close();
- } catch (IOException ie2) {
- WebPlugin.logError(ie2);
- }
- }
- }
-
-
- //
- // Populate the hash inLinksTable with keys (file paths) and values (in links files
- // paths)
- //
- fileOk = true;
- for (int i = 0; i < keys.size(); i++) {
- try {
- String key = (String) keys.elementAt(i);
- String compacted_indices = (String) indices.elementAt(i);
-
- //
- // Parse the in-links indexes
- //
-
- int size = keys.size();
- Vector in_links = new Vector();
- if (compacted_indices != LINK_INDEX_SEPARATOR) {
-
- // Extract indexes and occurences
-
- StringTokenizer st_idx_occ = new StringTokenizer(new String(compacted_indices), LINK_INDEX_SEPARATOR);
- while (st_idx_occ.hasMoreTokens()) {
- String idx_occ = new String(st_idx_occ.nextToken());
- int pos_occ = idx_occ.indexOf(LINK_OCCURENCE_SEPARATOR);
- int index;
- int occurence = 1;
- if (pos_occ == -1) {
- index = Integer.valueOf(idx_occ).intValue();
- } else {
- index = Integer.valueOf(idx_occ.substring(0, pos_occ)).intValue();
- occurence = Integer.valueOf(idx_occ.substring(pos_occ + 1)).intValue();
- }
- if (index >= 0 && index < size) {
- Link inlnk = new Link((String) keys.elementAt(index), occurence);
- in_links.addElement(inlnk);
- }
- }
- }
- inLinksTable.put(key, in_links);
- } catch (Exception e) {
- fileOk = false;
- }
- }
-
- return fileOk;
- }
- return false;
-
- }
-
- return false;
- }
-
- /**
- * Saves this builder's state to disk so that it can be restarted in the same state later.
- */
- public void save(IProject project) {
-
- File stateFile = getStateFile(project);
- if (inLinksTable == null) {
- stateFile.delete();
- } else {
-
- // Prepare the index vector
-
- Vector index_vector = new Vector(inLinksTable.size());
- for (Enumeration aenum = inLinksTable.keys(); aenum.hasMoreElements();) {
- index_vector.addElement(aenum.nextElement());
- }
-
- // write inLinksTable to stateFile
-
- try {
- File parentFolder = stateFile.getParentFile();
- if (!parentFolder.exists()) {
- parentFolder.mkdirs();
- }
- PrintWriter out = new PrintWriter(new BufferedWriter(new FileWriter(stateFile)));
- for (Enumeration aenum = inLinksTable.keys(); aenum.hasMoreElements();) {
- String key = (String) aenum.nextElement();
- out.print(key);
- out.println();
- out.print(LINK_INDEX_SEPARATOR);
- Vector in_links = (Vector) inLinksTable.get(key);
- int nb_of_links = in_links.size();
-
- // Replace the string by index
- // Add a '+'separator only for more than one links to save space
- // Add '/<occurence>' only if occurence > 1 to save space
- //
-
- Link lnk = null;
- int nb_lnks = 0;
- if (nb_of_links > 0) {
- lnk = (Link) in_links.elementAt(0);
- out.print(index_vector.indexOf(lnk.getURL()));
- nb_lnks = lnk.getOccurrences();
- if (nb_lnks > 1) {
- out.print(LINK_OCCURENCE_SEPARATOR);
- out.print(nb_lnks);
- }
- for (int i = 1; i < nb_of_links; i++) {
- out.print(LINK_INDEX_SEPARATOR);
- lnk = (Link) in_links.elementAt(i);
- out.print(index_vector.indexOf(lnk.getURL()));
- nb_lnks = lnk.getOccurrences();
- if (nb_lnks > 1) {
- out.print(LINK_OCCURENCE_SEPARATOR);
- out.print(nb_lnks);
- }
- }
- }
- out.println();
- }
- /*
- * use this to save out anchor information //
- * ############################################ if ( !anchorsTable.isEmpty() ) {
- * out.println( ANCHOR_SEPARATOR ); } for (Enumeration enum = anchorsTable.keys();
- * enum.hasMoreElements();) { String key = (String) enum.nextElement();
- * out.print(key); out.println(); //out.print(ANCHOR_INDEX_SEPARATOR); out.println(
- * anchorsTable.get(key) ); }
- */
-
- out.flush();
- out.close();
- } catch (IOException e) {
- WebPlugin.logError(ProjectSupportResourceHandler.Error_while_saving_links_s_EXC_); // = "Error while saving links state file"
- }
- }
- }
-
- /**
- * Insert the method's description here. Creation date: (3/21/2001 1:45:58 PM)
- *
- * @param newFileOk
- * boolean
- */
- void setFileOk(boolean newFileOk) {
- fileOk = newFileOk;
- }
-}
diff --git a/plugins/org.eclipse.jst.j2ee.web/webproject/org/eclipse/jst/j2ee/internal/web/operations/ServerTargetUtil.java b/plugins/org.eclipse.jst.j2ee.web/webproject/org/eclipse/jst/j2ee/internal/web/operations/ServerTargetUtil.java
deleted file mode 100644
index 5003dc6..0000000
--- a/plugins/org.eclipse.jst.j2ee.web/webproject/org/eclipse/jst/j2ee/internal/web/operations/ServerTargetUtil.java
+++ /dev/null
@@ -1,133 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2003, 2004 IBM Corporation and others.
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
- *
- * Contributors:
- * IBM Corporation - initial API and implementation
- *******************************************************************************/
-/*
- * Created on Sep 12, 2003
- */
-package org.eclipse.jst.j2ee.internal.web.operations;
-
-import java.util.List;
-
-import org.eclipse.core.resources.IProject;
-import org.eclipse.core.resources.ResourcesPlugin;
-import org.eclipse.jst.j2ee.internal.plugin.J2EEPlugin;
-import org.eclipse.jst.j2ee.internal.servertarget.IServerTargetConstants;
-import org.eclipse.wst.server.core.IRuntime;
-import org.eclipse.wst.server.core.ServerCore;
-
-/**
- * A class with some useful methods that support server targetting for Web projects.
- *
- * @author Pratik Shah
- */
-public class ServerTargetUtil {
-
- private static final String defaultId = "com.ibm.etools.websphere.serverTarget.base.v51"; //$NON-NLS-1$
- private static final String defaultExpressId = "com.ibm.etools.websphere.serverTarget.express.v51"; //$NON-NLS-1$
-
- /**
- * @param targets
- * A list of IServerTargets
- * @return The index of the target server with the
- * {@link #getDefaultServerTargetId() default Id}; or 0, if it could not be found.
- */
- public static int findDefaultServerTargetIndex(List targets) {
- int index = 0;
- for (int i = 0; i < targets.size(); i++) {
- IRuntime target = (IRuntime) targets.get(i);
- if (target.getId().equals(getDefaultServerTargetId())) {
- index = i;
- break;
- }
- }
- return index;
- }
-
- /**
- * @param target
- * The IServerTarget that has to be found in the given list; it can be
- * <code>null</code>
- * @param list
- * The List from which the IServerTarget has to be found
- *
- * @return The index of the given target in the given list; or 0, if the given target could not
- * be found in the given list. Two IServerTargets are considered to be equal if they
- * have the same ID.
- */
- public static int findIndexOf(IRuntime target, List list) {
- int index = 0;
- if (target != null) {
- for (int i = 0; i < list.size(); i++) {
- IRuntime element = (IRuntime) list.get(i);
- if (element.equals(target)) {
- index = i;
- break;
- }
- }
- }
- return index;
- }
-
- /**
- * @return the Id of the target server that should be selected by default
- */
- public static String getDefaultServerTargetId() {
- String id = defaultExpressId;
- if (J2EEPlugin.isEJBSupportAvailable()) {
- id = defaultId;
- }
- return id;
- }
-
- /**
- * @param isJ2EE13
- * <code>true</code> if the constant for J2EE version 1.3 is desired
- * @return IServerTargetConstants.J2EE_12 or IServerTargetConstants.J2EE_13
- */
- public static String getJ2EEVersion(boolean isJ2EE13) {
- return isJ2EE13 ? IServerTargetConstants.J2EE_13 : IServerTargetConstants.J2EE_12;
- }
-
- /**
- * A convenient method that takes in a list of IServerTargets and returns an array of labels of
- * the IServerTargets in the given list.
- *
- * @param serverTargets
- * The list of IServerTargets
- * @return An array lof labels of the IServerTargets in the given list
- */
- public static String[] getServerNames(List serverTargets) {
- String[] result = new String[serverTargets.size()];
- for (int i = 0; i < result.length; i++) {
- IRuntime runtime = (IRuntime) serverTargets.get(i);
- result[i] = runtime.getName() + " (" + runtime.getRuntimeType().getName() + ")"; //$NON-NLS-1$ //$NON-NLS-2$
- }
- return result;
- }
-
- /**
- * @param prjName
- * name of the project whose ServerTarget has to be retrieved; it can be
- * <code>null</code>
- *
- * @return the ServerTarget of the given project; <code>null</code> if the project does not
- * exist or its ServerTarget is not specified.
- */
- public static IRuntime getServerTarget(String prjName) {
- if (prjName != null && !prjName.trim().equals("")) { //$NON-NLS-1$
- IProject prj = ResourcesPlugin.getWorkspace().getRoot().getProject(prjName);
- if (prj != null && prj.exists()) {
- return ServerCore.getProjectProperties(prj).getRuntimeTarget();
- }
- }
- return null;
- }
-
-}
\ No newline at end of file
diff --git a/plugins/org.eclipse.jst.j2ee.web/webproject/org/eclipse/jst/j2ee/internal/web/operations/TemplateData.java b/plugins/org.eclipse.jst.j2ee.web/webproject/org/eclipse/jst/j2ee/internal/web/operations/TemplateData.java
deleted file mode 100644
index 092e800..0000000
--- a/plugins/org.eclipse.jst.j2ee.web/webproject/org/eclipse/jst/j2ee/internal/web/operations/TemplateData.java
+++ /dev/null
@@ -1,94 +0,0 @@
-/***************************************************************************************************
- * Copyright (c) 2003, 2004 IBM Corporation and others. All rights reserved. This program and the
- * accompanying materials are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
- *
- * Contributors: IBM Corporation - initial API and implementation
- **************************************************************************************************/
-package org.eclipse.jst.j2ee.internal.web.operations;
-
-
-
-public class TemplateData {
- protected java.lang.String wtFileName = "";//$NON-NLS-1$
- protected java.lang.String wtCSSName = "";//$NON-NLS-1$
- protected java.lang.String wtContainerLocatoin = "";//$NON-NLS-1$
- protected java.lang.String taglibs;
-
- /**
- * TemplateData constructor comment.
- */
- public TemplateData() {
- super();
- }
-
- /**
- */
- public String getContainerLocatoin() {
- return wtContainerLocatoin;
- }
-
- /**
- * Insert the method's description here. Creation date: (6/4/2001 5:24:30 PM)
- *
- * @return java.lang.String
- */
- public java.lang.String getCSSName() {
- return wtCSSName;
- }
-
- /**
- * Insert the method's description here. Creation date: (6/4/2001 5:22:56 PM)
- *
- * @return java.lang.String
- */
- public String getFileName() {
- return wtFileName;
- }
-
- /**
- * Insert the method's description here. Creation date: (11/15/2001 4:16:10 PM)
- *
- * @return java.lang.String
- */
- public java.lang.String getTaglibs() {
- return taglibs;
- }
-
- /**
- */
- public void setContainerLocatoin(String newFileName) {
- wtContainerLocatoin = newFileName;
- }
-
- /**
- * Insert the method's description here. Creation date: (6/4/2001 5:24:30 PM)
- *
- * @param newCSSName
- * java.lang.String
- */
- public void setCSSName(java.lang.String newCSSName) {
- wtCSSName = newCSSName;
- }
-
- /**
- * Insert the method's description here. Creation date: (6/4/2001 5:22:56 PM)
- *
- * @param newWtFileName
- * java.lang.String
- */
- public void setFileName(String newFileName) {
- wtFileName = newFileName;
- }
-
- /**
- * Insert the method's description here. Creation date: (11/15/2001 4:16:10 PM)
- *
- * @param newTaglibs
- * java.lang.String
- */
- public void setTaglibs(java.lang.String newTaglibs) {
- taglibs = newTaglibs;
- }
-}
\ No newline at end of file
diff --git a/plugins/org.eclipse.jst.j2ee.web/webproject/org/eclipse/jst/j2ee/internal/web/operations/WebPropertiesUtil.java b/plugins/org.eclipse.jst.j2ee.web/webproject/org/eclipse/jst/j2ee/internal/web/operations/WebPropertiesUtil.java
deleted file mode 100644
index e3853d5..0000000
--- a/plugins/org.eclipse.jst.j2ee.web/webproject/org/eclipse/jst/j2ee/internal/web/operations/WebPropertiesUtil.java
+++ /dev/null
@@ -1,586 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2003, 2007 IBM Corporation and others.
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
- *
- * Contributors:
- * IBM Corporation - initial API and implementation
- *******************************************************************************/
-package org.eclipse.jst.j2ee.internal.web.operations;
-
-import java.util.Enumeration;
-import java.util.Hashtable;
-import java.util.List;
-import java.util.Vector;
-
-import org.eclipse.core.resources.IContainer;
-import org.eclipse.core.resources.IFolder;
-import org.eclipse.core.resources.IProject;
-import org.eclipse.core.resources.IResource;
-import org.eclipse.core.runtime.CoreException;
-import org.eclipse.core.runtime.IPath;
-import org.eclipse.core.runtime.IProgressMonitor;
-import org.eclipse.core.runtime.IStatus;
-import org.eclipse.core.runtime.NullProgressMonitor;
-import org.eclipse.core.runtime.Path;
-import org.eclipse.core.runtime.Status;
-import org.eclipse.core.runtime.SubProgressMonitor;
-import org.eclipse.jdt.core.IClasspathEntry;
-import org.eclipse.jdt.core.IJavaProject;
-import org.eclipse.jdt.core.IPackageFragmentRoot;
-import org.eclipse.jdt.core.JavaCore;
-import org.eclipse.jdt.core.JavaModelException;
-import org.eclipse.jem.workbench.utility.JemProjectUtilities;
-import org.eclipse.jst.j2ee.internal.J2EEConstants;
-import org.eclipse.jst.j2ee.internal.plugin.IJ2EEModuleConstants;
-import org.eclipse.jst.j2ee.internal.project.ProjectSupportResourceHandler;
-import org.eclipse.jst.j2ee.internal.web.plugin.WebPlugin;
-import org.eclipse.wst.common.componentcore.ComponentCore;
-import org.eclipse.wst.common.componentcore.resources.IVirtualComponent;
-import org.eclipse.wst.common.componentcore.resources.IVirtualFolder;
-
-import com.ibm.icu.text.UTF16;
-import com.ibm.icu.util.StringTokenizer;
-
-public class WebPropertiesUtil {
- // private static final char[] BAD_CHARS = {'/', '\\', ':'};
- private static final char[] BAD_CHARS = {':'};
- public static final String DEFAULT_JAVA_SOURCE_NAME = "Java Source"; //$NON-NLS-1$
- //TODO Port to flexible structure
- /**
- * Update the Web Content folder to a new value if it is different. This applies to both Static
- * and J2EE Web Projects. In the case of a J2EE Project, the library classpath entries will be
- * modifies to reflect the new location.
- *
- * @param project
- * The Web Project to update
- * @param webContentName
- * The new name given to the Web Project's Web Content folder
- * @param progressMonitor
- * Indicates progress of the update operation
- * @return True if the web content rename was actually renamed, false if unneeded.
- * @throws CoreException
- * The exception that occured during renaming of the the project's web content
- * folder
- */
- public static boolean updateWebContentNameAndProperties(IProject project, String webContentName, IProgressMonitor progressMonitor) throws CoreException {
- boolean success = false;
- if (project.exists() && project.isOpen()) {
-
- /*
- * IBaseWebNature webNature = J2EEWebNatureRuntimeUtilities.getRuntime(project); if
- * (webContentName == null) { if (webNature.isStatic()) { webContentName =
- * J2EEWebNatureRuntimeUtilities.getDefaultStaticWebContentName(); } else {
- * webContentName = J2EEWebNatureRuntimeUtilities.getDefaultJ2EEWebContentName(); } }
- */
-
- IPath newPath = new Path(webContentName);
- if (getModuleServerRoot(project).getProjectRelativePath().equals(newPath))
- return false;
- if (project.exists(newPath)) {
- IStatus status = new Status(IStatus.ERROR, "org.eclipse.jst.j2ee", IStatus.OK, ProjectSupportResourceHandler.getString(ProjectSupportResourceHandler.Could_not_rename_____2, new Object[]{webContentName}), null); //$NON-NLS-1$
- throw new CoreException(status);
- }
-
- moveWebContentFolder(project, webContentName, progressMonitor);
- updateWebContentNamePropertiesOnly(project, webContentName, progressMonitor);
- success = true;
- }
- return success;
- }
-
- /**
- * Update the classpath entries and Server Root Name for this web project only.
- *
- * @param project
- * @param webContentName
- * @return
- */
- public static void updateWebContentNamePropertiesOnly(IProject project, String webContentName, IProgressMonitor progressMonitor) throws CoreException {
- IPath newPath = new Path(webContentName);
- if (getModuleServerRoot(project).equals(newPath))
- return;
-
- if (!getModuleServerRoot(project).equals(webContentName)) {
-
- // if (webModuleArtifact.isJ2EE) {
- // Update the library references
- IJavaProject javaProject = JemProjectUtilities.getJavaProject(project);
-
- IClasspathEntry[] classpath = javaProject.getRawClasspath();
- IClasspathEntry[] newClasspath = new IClasspathEntry[classpath.length];
-
- for (int i = 0; i < classpath.length; i++) {
- if (classpath[i].getEntryKind() == IClasspathEntry.CPE_LIBRARY) {
- IClasspathEntry library = classpath[i];
- IPath libpath = library.getPath();
- IPath modServerRootPath = getModuleServerRoot(project).getFullPath();
- if (modServerRootPath.isPrefixOf(libpath)) {
- IPath prunedPath = libpath.removeFirstSegments(modServerRootPath.segmentCount());
- IPath relWebContentPath = new Path(webContentName + "/" + prunedPath.toString()); //$NON-NLS-1$
- IResource absWebContentPath = project.getFile(relWebContentPath);
-
- IPath srcAttachmentPath = library.getSourceAttachmentPath();
- if (null != srcAttachmentPath) {
- prunedPath = srcAttachmentPath.removeFirstSegments(modServerRootPath.segmentCount());
- }
- IResource absWebContentSrcAttachmentPath = project.getFile(relWebContentPath);
-
- newClasspath[i] = JavaCore.newLibraryEntry(absWebContentPath.getFullPath(), absWebContentSrcAttachmentPath.getFullPath(), library.getSourceAttachmentRootPath(), library.isExported());
-
- } else {
- newClasspath[i] = classpath[i];
- }
-
- } else {
- newClasspath[i] = classpath[i];
- }
- // }
-
- // Set the java output folder
- IFolder outputFolder = project.getFolder(getModuleServerRoot(project).getFullPath());
- javaProject.setRawClasspath(newClasspath, outputFolder.getFullPath(), new SubProgressMonitor(progressMonitor, 1));
- }
- // update websettings
- // TODO add to WebArtifactEdit
- // webNature.setModuleServerRootName(webContentName);
- }
- }
-
- /**
- * Moves the web content folder to the name indicated only if that path doesn't already exist in
- * the project.
- *
- * @param project
- * The web project to be updated.
- * @param webContentName
- * The new web content name
- * @param progressMonitor
- * Indicates progress
- * @throws CoreException
- * The exception that occured during move operation
- */
- public static void moveWebContentFolder(IProject project, String webContentName, IProgressMonitor progressMonitor) throws CoreException {
- IPath newPath = new Path(webContentName);
- if (!project.exists(newPath)) {
- if (newPath.segmentCount() > 1) {
- for (int i = newPath.segmentCount() - 1; i > 0; i--) {
- IPath tempPath = newPath.removeLastSegments(i);
- IFolder tempFolder = project.getFolder(tempPath);
- if (!tempFolder.exists()) {
- tempFolder.create(true, true, null);
- }
- }
- }
- newPath = project.getFullPath().append(newPath);
- IContainer webContentRoot = getModuleServerRoot(project);
- IPath oldPath = webContentRoot.getProjectRelativePath();
- webContentRoot.move(newPath, IResource.FORCE | IResource.KEEP_HISTORY, new SubProgressMonitor(progressMonitor, 1));
- for (int i = 0; i < oldPath.segmentCount(); i++) {
- IPath tempPath = oldPath.removeLastSegments(i);
- IFolder tempFolder = project.getFolder(tempPath);
- if (tempFolder.exists() && tempFolder.members().length == 0) {
- tempFolder.delete(true, true, null);
- }
- }
- }
- }
-
- /**
- * Synchonizies the class path and the lib directories to catch any changes from the last use
- * Creation date: (4/17/01 11:48:12 AM)
- */
- protected static void synch(IProject project, IProgressMonitor monitor) {
- IProgressMonitor localMonitor = monitor;
- try {
- if (localMonitor == null) {
- localMonitor = new NullProgressMonitor();
- }
- localMonitor.beginTask(ProjectSupportResourceHandler.Sychronize_Class_Path_UI_, 4);
- //$NON-NLS-1$ = "Sychronize Class Path"
-
- IContainer lib_folder = getWebLibFolder(project);
- // Nothing to do if the lib folder does not exist.
- if (lib_folder == null || !lib_folder.isAccessible())
- return;
- IJavaProject javaProject = JemProjectUtilities.getJavaProject(project);
- IPath lib_path = lib_folder.getProjectRelativePath();
- IPath lib_full_path = lib_folder.getFullPath();
-
- IClasspathEntry[] cp = javaProject.getRawClasspath();
-
- boolean needsToBeModified = false;
- // Create a map of the lib projects in the current project
- Hashtable lib_jars = new Hashtable();
- IResource[] children = lib_folder.members();
- localMonitor.subTask(ProjectSupportResourceHandler.Catalog_Lib_Directory__UI_);
- //$NON-NLS-1$ = "Catalog Lib Directory:"
- for (int j = 0; j < children.length; j++) {
- IResource child = children[j];
- // monitor.setTaskName(ResourceHandler.getString("Catalog_Lib_Directory__UI_") +
- // child); //$NON-NLS-1$ = "Catalog Lib Directory:"
- // Make sure it is a zip or a jar file
- if (child.getType() == IResource.FILE && (child.getFullPath().toString().toLowerCase().endsWith(IJ2EEModuleConstants.JAR_EXT)
- || child.getFullPath().toString().toLowerCase().endsWith(".zip"))) { //$NON-NLS-1$
- lib_jars.put(child.getFullPath(), child);
- }
-
- }
-
- localMonitor.worked(1);
- localMonitor.subTask(ProjectSupportResourceHandler.Update_ClassPath__UI_);
- //$NON-NLS-1$ = "Update ClassPath:"
- // Loop through all the classpath dirs looking for ones that may have
- // been deleted
- Vector newClassPathVector = new Vector();
- for (int j = 0; j < cp.length; j++) {
-
- // If it is a lib_path
- if (cp[j].getPath().toString().startsWith(lib_path.toString()) || cp[j].getPath().toString().startsWith(lib_full_path.toString())) {
- // It was already in the class path
- if (lib_jars.get(cp[j].getPath()) != null) {
- newClassPathVector.add(cp[j]);
- // Remove it from the hash table of paths to add back
- // monitor.setTaskName(ResourceHandler.getString("Catalog_Lib_Directory__UI_")
- // + cp[j].getPath()); //$NON-NLS-1$ = "Catalog Lib Directory:"
- lib_jars.remove(cp[j].getPath());
-
- } else {
- // You have removed something form the class path you
- // will need to re-build
- // monitor.setTaskName(ResourceHandler.getString("Catalog_Lib_Directory_Remo_UI_")
- // + cp[j].getPath()); //$NON-NLS-1$ = "Catalog Lib Directory:Remove "
- needsToBeModified = true;
- }
- } else {
- localMonitor.subTask(ProjectSupportResourceHandler.Catalog_Lib_Directory__UI_ + cp[j].getPath());
- //$NON-NLS-1$ = "Catalog Lib Directory:"
- newClassPathVector.add(cp[j]);
- }
- }
- localMonitor.worked(1);
- localMonitor.subTask(ProjectSupportResourceHandler.Update_ClassPath__UI_);
- //$NON-NLS-1$ = "Update ClassPath:"
-
- // Add any entries not already found
- Enumeration aenum = lib_jars.keys();
- while (aenum.hasMoreElements()) {
- IPath path = (IPath) aenum.nextElement();
- newClassPathVector.add(JavaCore.newLibraryEntry(path, null, null));
- // You have added something form the class path you
- // will need to re-build
- // monitor.setTaskName(ResourceHandler.getString("23concat_UI_", (new Object[] {
- // path }))); //$NON-NLS-1$ = "Catalog Lib Directory:Add {0}"
- needsToBeModified = true;
- }
-
- localMonitor.worked(1);
- localMonitor.subTask(ProjectSupportResourceHandler.Set_ClassPath__UI_);
- //$NON-NLS-1$ = "Set ClassPath:"
-
- // Tansfer the vector to an array
- IClasspathEntry[] newClassPathArray = new IClasspathEntry[newClassPathVector.size()];
-
- for (int j = 0; j < newClassPathArray.length; j++) {
- newClassPathArray[j] = (IClasspathEntry) newClassPathVector.get(j);
- }
-
- // Only change the class path if there has been a modification
- if (needsToBeModified) {
-
- try {
- javaProject.setRawClasspath(newClassPathArray, localMonitor);
- } catch (Exception e) {
- WebPlugin.logError(e);
- }
- }
-
- } catch (ClassCastException ex) {
- WebPlugin.logError(ex);
- } catch (CoreException ex) {
- WebPlugin.logError(ex);
- } finally {
- localMonitor.done();
- }
- }
-
- public static void updateContextRoot(IProject project, String contextRoot) {
-
- }
-
-
- /**
- * @param project
- * org.eclipse.core.resources.IProject
- */
- /**
- * Returns a error message that states whether a context root is valid or not returns null if
- * context root is fine
- *
- * @return java.lang.String
- * @param contextRoot
- * java.lang.String
- */
- public static String validateContextRoot(String contextRoot) {
-
- if (contextRoot == null)
- return null;
-
- String errorMessage = null;
-
- String name = contextRoot;
- if (name.equals("")) { //$NON-NLS-1$
- // this was added because the error message shouldnt be shown initially. It should be
- // shown only if context root field is edited to
- errorMessage = ProjectSupportResourceHandler.Context_Root_cannot_be_empty_2;
- return errorMessage;
- }
-
- /*******************************************************************************************
- * // JZ - fix to defect 204264, "/" is valid in context root if (name.indexOf("//") != -1) {
- * //$NON-NLS-1$ errorMessage = "// are invalid characters in a resource name"; return
- * errorMessage; }
- ******************************************************************************************/
-
- if (name.trim().equals(name)) {
- StringTokenizer stok = new StringTokenizer(name, "."); //$NON-NLS-1$
- outer : while (stok.hasMoreTokens()) {
- String token = stok.nextToken();
- int cp;
- for (int i = 0; i < token.length(); i += UTF16.getCharCount(cp)) {
- cp = UTF16.charAt(token, i);
- if (!(token.charAt(i) == '_') && !(token.charAt(i) == '-') && !(token.charAt(i) == '/') && Character.isLetterOrDigit(token.charAt(i)) == false) {
- if (Character.isWhitespace(token.charAt(i))) {
- // Removed because context roots can contain white space
- // errorMessage =
- // ResourceHandler.getString("_Context_root_cannot_conta_UI_");//$NON-NLS-1$
- // = " Context root cannot contain whitespaces."
- } else {
- String invalidCharString = null;
- if (UTF16.getCharCount(cp)>1)
- {
- invalidCharString = UTF16.valueOf(cp);
- }
- else
- {
- invalidCharString = (new Character(token.charAt(i))).toString();
- }
- Object[] invalidChar = new Object[]{invalidCharString};
- errorMessage = ProjectSupportResourceHandler.getString(ProjectSupportResourceHandler.The_character_is_invalid_in_a_context_root, invalidChar);
- break outer;
- }
- }
- }
- }
- } // en/ end of if(name.trim
- else
- errorMessage = ProjectSupportResourceHandler.Names_cannot_begin_or_end_with_whitespace_5;
-
- return errorMessage;
- }
-
-
- /**
- * Return true if the string contains any of the characters in the array.
- */
- private static boolean contains(String str, char[] chars) {
- for (int i = 0; i < chars.length; i++) {
- if (str.indexOf(chars[i]) != -1)
- return true;
- }
- return false;
- }
-
-
- public static String validateFolderName(String folderName) {
- if (folderName.length() == 0)
- return ProjectSupportResourceHandler.Folder_name_cannot_be_empty_2;
-
- if (contains(folderName, BAD_CHARS))
- return ProjectSupportResourceHandler.getString(ProjectSupportResourceHandler.Folder_name_is_not_valid, new Object[]{folderName});
-
- return null;
- }
-
-
- public static String validateWebContentName(String webContentName, IProject project, String javaSourceName) {
-
- String msg = validateFolderName(webContentName);
- if (msg != null)
- return msg;
-
- if (javaSourceName != null && webContentName.equals(javaSourceName))
- return ProjectSupportResourceHandler.Folder_names_cannot_be_equal_4;
-
- // If given a java project, check to make sure current package fragment
- // root folders do not overlap with new web content name
- if (project != null) {
- IJavaProject javaProject = JemProjectUtilities.getJavaProject(project);
- if (javaProject != null) {
- try {
- IPackageFragmentRoot roots[] = javaProject.getPackageFragmentRoots();
- for (int i = 0; i < roots.length; i++) {
- IPackageFragmentRoot root = roots[i];
- if (!root.isArchive()) {
- IResource resource = root.getCorrespondingResource();
- if (resource.getType() == IResource.FOLDER) {
- IPath path = resource.getFullPath();
- String rootFolder = path.segment(1);
- if (webContentName.equals(rootFolder)) {
- if (root.getKind() == IPackageFragmentRoot.K_SOURCE)
- return ProjectSupportResourceHandler.Folder_name_cannot_be_the_same_as_Java_source_folder_5;
-
- return ProjectSupportResourceHandler.Folder_name_cannot_be_the_same_as_Java_class_folder_6;
- }
- }
- }
- }
- } catch (JavaModelException e) {
- return null;
- }
- }
- }
-
- return null;
- }
-
-
- /**
- * Update given web nature to the current version if necessary.
- *
- * @param webNature
- * The web Nature that should be examined.
- * @return True if successful, false if unnecessary.
- * @throws CoreException
- * The exception that occured during the version change operation.
- */
- /*
- * static public boolean updateNatureToCurrentVersion(J2EEWebNatureRuntime webNature) throws
- * CoreException {
- *
- * boolean success = false;
- *
- * if (webNature.getVersion() != WEB.CURRENT_VERSION) {
- * webNature.setVersion(J2EESettings.CURRENT_VERSION); success = true; }
- * ((J2EEModuleWorkbenchURIConverterImpl)
- * webNature.getResourceSet().getURIConverter()).recomputeContainersIfNecessary();
- *
- * return success; }
- */
-
- /**
- * Move the old source folder to the new default folder.
- *
- * @param project
- * The Web Project we are working with.
- * @param oldSourceFolder
- * The old "Java Source" folder that will be moved.
- * @param javaSourceName
- * The new name of the "Java Source" folder, or null for default.
- * @return The location of the new folder, or null if no move was necessary.
- * @throws CoreException
- * The exception that occured during the move operation.
- */
- static public IContainer updateJavaSourceName(IProject project, IContainer oldSourceFolder, String javaSourceName, IProgressMonitor progressMonitor) throws CoreException {
- IContainer newSourceFolder = null;
- if (oldSourceFolder != null) {
- IPath newPath;
- if (javaSourceName == null)
- newPath = new Path(DEFAULT_JAVA_SOURCE_NAME);
- else
- newPath = new Path(javaSourceName);
-
- // Make sure new path is different form old path
- if (!project.getFolder(newPath).getFullPath().equals(oldSourceFolder.getFullPath())) {
- oldSourceFolder.move(newPath, IResource.FORCE | IResource.KEEP_HISTORY, new SubProgressMonitor(progressMonitor, 1));
- JemProjectUtilities.removeFromJavaClassPath(project, oldSourceFolder);
- newSourceFolder = project.getFolder(newPath);
- JemProjectUtilities.appendJavaClassPath(project, JavaCore.newSourceEntry(project.getFolder(newPath).getFullPath()));
- }
- }
- return newSourceFolder;
- }
-
-
- /**
- * Get the source folder that should be used for migration.
- *
- * @param project
- * The Web Project to examine.
- * @return The source folder to use in migration, or null if it should be skipped.
- */
- static public IContainer getJavaSourceFolder(IProject project) {
- List sourceRoots = JemProjectUtilities.getSourceContainers(project);
- IContainer oldSourceFolder = null;
-
- if (sourceRoots != null) {
- if (sourceRoots.size() == 1) {
- IContainer sourceFolder = (IContainer) sourceRoots.get(0);
- if (sourceFolder instanceof IFolder) {
- oldSourceFolder = sourceFolder;
- }
- }
- }
- return oldSourceFolder;
- }
-
- public static IFolder getModuleServerRoot(IProject project) {
- // TODO need to implement module server root properly
- IPath compRootPath = ComponentCore.createComponent(project).getRootFolder().getUnderlyingFolder().getProjectRelativePath();
- return project.getFolder(compRootPath);
- //return project.getFolder("WebContent");
-
- }
-
- public static IVirtualFolder getWebLibFolder(IVirtualComponent webComponent) {
- IPath path = new Path(J2EEConstants.WEB_INF + "/" + "lib"); //$NON-NLS-1$//$NON-NLS-2$
- IVirtualFolder libFolder = webComponent.getRootFolder().getFolder(path);
- return libFolder;
- }
-
- //TODO delete jsholl
- /**
- * @deprecated use getWebLibFolder(IVirtualComponent webComponent)
- * @param project
- * @return
- */
- public static IContainer getWebLibFolder(IProject project) {
- return getWebLibFolder(ComponentCore.createComponent(project)).getUnderlyingFolder();
- }
-
- //
- // static public boolean isImportedClassesJARFileInLibDir(IResource resource) {
- // if (resource == null || !resource.exists())
- // return false;
- // return resource.getType() == resource.FILE &&
- // resource.getName().endsWith(IWebNatureConstants.IMPORTED_CLASSES_SUFFIX) && isZip(resource);
- // }
- //
- // static public boolean isLibDirJARFile(IResource resource) {
- // if (resource == null || !resource.exists())
- // return false;
- // return resource.getType() == resource.FILE && isZip(resource);
- // }
- //
- // static public boolean isZip(IResource resource) {
- // String path = resource.getLocation().toOSString();
- // ZipFile zip = null;
- //
- // try {
- // zip = new ZipFile(path);
- // } catch (IOException notAZip) {
- // return false;
- // } finally {
- // if (zip != null) {
- // try {
- // zip.close();
- // } catch (IOException ex) {}
- // }
- // }
- // return zip != null;
- // }
-
-
-}
diff --git a/plugins/org.eclipse.jst.j2ee.web/webproject/org/eclipse/jst/j2ee/internal/web/operations/WebToolingException.java b/plugins/org.eclipse.jst.j2ee.web/webproject/org/eclipse/jst/j2ee/internal/web/operations/WebToolingException.java
deleted file mode 100644
index a073e65..0000000
--- a/plugins/org.eclipse.jst.j2ee.web/webproject/org/eclipse/jst/j2ee/internal/web/operations/WebToolingException.java
+++ /dev/null
@@ -1,103 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2003, 2006 IBM Corporation and others.
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
- *
- * Contributors:
- * IBM Corporation - initial API and implementation
- *******************************************************************************/
-package org.eclipse.jst.j2ee.internal.web.operations;
-
-
-
-import java.io.IOException;
-
-import org.eclipse.core.runtime.CoreException;
-import org.eclipse.jdt.core.JavaModelException;
-import org.eclipse.jst.j2ee.internal.project.ProjectSupportResourceHandler;
-import org.xml.sax.SAXException;
-
-
-/**
- * The WebToolingException class is the generic class for exceptions generated by the web tooling.
- */
-public class WebToolingException extends Exception {
- /**
- *
- */
- private static final long serialVersionUID = 5721765673799055122L;
- public static final String SAX_ERROR_MESSAGE = ProjectSupportResourceHandler.Operation_failed_due_to_SA_ERROR_; // = "Operation failed due to SAX error: "
- public static final String IO_ERROR_MESSAGE = ProjectSupportResourceHandler.Operation_failed_due_to_IO_ERROR_; // = "Operation failed due to IO error: "
- public static final String CORE_ERROR_MESSAGE = ProjectSupportResourceHandler.Operation_failed_due_to_Co_ERROR_; // = "Operation failed due to Core error: "
- public static final String JAVA_MODEL_ERROR_MESSAGE = ProjectSupportResourceHandler.Operation_failed_due_to_Ja_ERROR_; // = "Operation failed due to Java Model error: "
-
- /**
- * Create a new WebToolingException with no message.
- */
- public WebToolingException() {
- super();
- }
-
- /**
- * Create a new instance of the receiver for a supplied IO Exception
- *
- * @param message
- * java.lang.String
- */
- public WebToolingException(IOException exception) {
- this(IO_ERROR_MESSAGE, exception);
- }
-
- /**
- * Create a new WebToolingException with error message of s.
- *
- * @param s
- * java.lang.String
- */
- public WebToolingException(String s) {
- super(s);
- }
-
- /**
- * Create a new instance of the receiver with the supplied preamble and the message of the
- * example appended to the end.
- *
- * @param message
- * java.lang.String
- */
- public WebToolingException(String preamble, Throwable exception) {
- this(preamble + exception.getMessage());
- }
-
- /**
- * Create a new instance of the receiver for a supplied CoreException
- *
- * @param exception
- * CoreException
- */
- public WebToolingException(CoreException exception) {
- this(CORE_ERROR_MESSAGE, exception);
- }
-
- /**
- * Create a new instance of the receiver for a supplied JavaModelException.
- *
- * @param exception
- * JavaModelException
- */
- public WebToolingException(JavaModelException exception) {
- this(JAVA_MODEL_ERROR_MESSAGE, exception);
- }
-
- /**
- * Create a new instance of the receiver for a supplied SAX Exception
- *
- * @param exception
- * SAXException
- */
- public WebToolingException(SAXException exception) {
- this(SAX_ERROR_MESSAGE, exception);
- }
-}
diff --git a/plugins/org.eclipse.jst.j2ee.web/webproject/org/eclipse/jst/j2ee/internal/web/operations/WebToolingTemplate.java b/plugins/org.eclipse.jst.j2ee.web/webproject/org/eclipse/jst/j2ee/internal/web/operations/WebToolingTemplate.java
deleted file mode 100644
index 7c9f607..0000000
--- a/plugins/org.eclipse.jst.j2ee.web/webproject/org/eclipse/jst/j2ee/internal/web/operations/WebToolingTemplate.java
+++ /dev/null
@@ -1,19 +0,0 @@
-/***************************************************************************************************
- * Copyright (c) 2003, 2004 IBM Corporation and others. All rights reserved. This program and the
- * accompanying materials are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
- *
- * Contributors: IBM Corporation - initial API and implementation
- **************************************************************************************************/
-package org.eclipse.jst.j2ee.internal.web.operations;
-
-public interface WebToolingTemplate {
- /**
- * Insert the method's description here. Creation date: (12/6/2000 7:35:38 PM)
- *
- * @param data
- * TemplateData
- */
- public String generate(TemplateData data);
-}
\ No newline at end of file
diff --git a/plugins/org.eclipse.jst.j2ee.web/webproject/org/eclipse/jst/j2ee/internal/web/util/WebArtifactEditUtilities.java b/plugins/org.eclipse.jst.j2ee.web/webproject/org/eclipse/jst/j2ee/internal/web/util/WebArtifactEditUtilities.java
deleted file mode 100644
index eeba7ab..0000000
--- a/plugins/org.eclipse.jst.j2ee.web/webproject/org/eclipse/jst/j2ee/internal/web/util/WebArtifactEditUtilities.java
+++ /dev/null
@@ -1,42 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2005 IBM Corporation and others.
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
- *
- * Contributors:
- * IBM Corporation - initial API and implementation
- *******************************************************************************/
-package org.eclipse.jst.j2ee.internal.web.util;
-
-import org.eclipse.core.resources.IProject;
-import org.eclipse.jem.util.emf.workbench.ProjectUtilities;
-import org.eclipse.jst.j2ee.project.JavaEEProjectUtilities;
-import org.eclipse.jst.j2ee.web.componentcore.util.WebArtifactEdit;
-import org.eclipse.jst.j2ee.webapplication.Servlet;
-import org.eclipse.jst.j2ee.webapplication.WebApp;
-import org.eclipse.wst.common.componentcore.ComponentCore;
-import org.eclipse.wst.common.componentcore.resources.IVirtualComponent;
-
-public class WebArtifactEditUtilities {
-
- public static IVirtualComponent getWebComponent(Servlet servlet) {
- IProject project = ProjectUtilities.getProject(servlet);
- IVirtualComponent component = ComponentCore.createComponent(project);
- WebArtifactEdit edit = null;
- try {
- if (JavaEEProjectUtilities.isDynamicWebProject(project)) {
- edit = WebArtifactEdit.getWebArtifactEditForRead(component);
- WebApp webapp = edit.getWebApp();
- if (webapp.getServletNamed(servlet.getServletName()) != null)
- return component;
- }
- } finally {
- if (edit != null)
- edit.dispose();
- }
- return null;
- }
-
-}
diff --git a/plugins/org.eclipse.jst.j2ee.web/webproject/org/eclipse/jst/j2ee/internal/web/util/WebEditAdapterFactory.java b/plugins/org.eclipse.jst.j2ee.web/webproject/org/eclipse/jst/j2ee/internal/web/util/WebEditAdapterFactory.java
deleted file mode 100644
index 1effdae..0000000
--- a/plugins/org.eclipse.jst.j2ee.web/webproject/org/eclipse/jst/j2ee/internal/web/util/WebEditAdapterFactory.java
+++ /dev/null
@@ -1,51 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2003, 2005 IBM Corporation and others.
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
- *
- * Contributors:
- * IBM Corporation - initial API and implementation
- *******************************************************************************/
-package org.eclipse.jst.j2ee.internal.web.util;
-
-import org.eclipse.core.runtime.IAdapterFactory;
-import org.eclipse.jst.j2ee.project.JavaEEProjectUtilities;
-import org.eclipse.jst.j2ee.web.componentcore.util.WebArtifactEdit;
-import org.eclipse.wst.common.componentcore.ArtifactEdit;
-import org.eclipse.wst.common.componentcore.internal.ArtifactEditModel;
-
-
-/**
- * <p>
- * Adapts {@see org.eclipse.wst.common.modulecore.ArtifactEditModel}s to
- * {@see org.eclipse.jst.j2ee.internal.web.util.WebArtifactEdit} facades.
- * </p>
- */
-public class WebEditAdapterFactory implements IAdapterFactory {
-
- /*
- * (non-Javadoc)
- *
- * @see org.eclipse.core.runtime.IAdapterFactory#getAdapter(java.lang.Object, java.lang.Class)
- */
- public Object getAdapter(Object adaptableObject, Class adapterType) {
- if (adapterType == WebArtifactEdit.ADAPTER_TYPE || adapterType == ArtifactEdit.ADAPTER_TYPE) {
- ArtifactEditModel editModel = (ArtifactEditModel) adaptableObject;
- if (JavaEEProjectUtilities.isDynamicWebProject(editModel.getProject()))
- return new WebArtifactEdit((ArtifactEditModel) adaptableObject);
- }
- return null;
- }
-
-
- /*
- * (non-Javadoc)
- *
- * @see org.eclipse.core.runtime.IAdapterFactory#getAdapterList()
- */
- public Class[] getAdapterList() {
- return new Class[]{ArtifactEdit.class, WebArtifactEdit.class};
- }
-}
diff --git a/plugins/org.eclipse.jst.j2ee.web/webproject/org/eclipse/jst/j2ee/web/componentcore/util/WebArtifactEdit.java b/plugins/org.eclipse.jst.j2ee.web/webproject/org/eclipse/jst/j2ee/web/componentcore/util/WebArtifactEdit.java
deleted file mode 100644
index a995ed9..0000000
--- a/plugins/org.eclipse.jst.j2ee.web/webproject/org/eclipse/jst/j2ee/web/componentcore/util/WebArtifactEdit.java
+++ /dev/null
@@ -1,710 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2003, 2007 IBM Corporation and others.
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
- *
- * Contributors:
- * IBM Corporation - initial API and implementation
- *******************************************************************************/
-package org.eclipse.jst.j2ee.web.componentcore.util;
-
-import java.util.List;
-
-import org.eclipse.core.resources.IFile;
-import org.eclipse.core.resources.IProject;
-import org.eclipse.core.runtime.IPath;
-import org.eclipse.core.runtime.NullProgressMonitor;
-import org.eclipse.core.runtime.Path;
-import org.eclipse.emf.common.util.URI;
-import org.eclipse.emf.ecore.EObject;
-import org.eclipse.emf.ecore.resource.Resource;
-import org.eclipse.jem.util.emf.workbench.WorkbenchResourceHelperBase;
-import org.eclipse.jst.j2ee.commonarchivecore.internal.Archive;
-import org.eclipse.jst.j2ee.commonarchivecore.internal.CommonarchiveFactory;
-import org.eclipse.jst.j2ee.commonarchivecore.internal.exception.OpenFailureException;
-import org.eclipse.jst.j2ee.commonarchivecore.internal.helpers.ArchiveOptions;
-import org.eclipse.jst.j2ee.componentcore.EnterpriseArtifactEdit;
-import org.eclipse.jst.j2ee.componentcore.util.EARArtifactEdit;
-import org.eclipse.jst.j2ee.internal.J2EEConstants;
-import org.eclipse.jst.j2ee.internal.J2EEVersionConstants;
-import org.eclipse.jst.j2ee.internal.common.XMLResource;
-import org.eclipse.jst.j2ee.internal.componentcore.JavaEEBinaryComponentHelper;
-import org.eclipse.jst.j2ee.internal.project.J2EEProjectUtilities;
-import org.eclipse.jst.j2ee.internal.web.archive.operations.WebComponentLoadStrategyImpl;
-import org.eclipse.jst.j2ee.internal.web.plugin.WebPlugin;
-import org.eclipse.jst.j2ee.model.IModelProvider;
-import org.eclipse.jst.j2ee.project.JavaEEProjectUtilities;
-import org.eclipse.jst.j2ee.project.WebUtilities;
-import org.eclipse.jst.j2ee.webapplication.WebApp;
-import org.eclipse.jst.j2ee.webapplication.WebAppResource;
-import org.eclipse.jst.j2ee.webapplication.WebapplicationFactory;
-import org.eclipse.jst.j2ee.webapplication.WelcomeFile;
-import org.eclipse.jst.j2ee.webapplication.WelcomeFileList;
-import org.eclipse.wst.common.componentcore.ArtifactEdit;
-import org.eclipse.wst.common.componentcore.ComponentCore;
-import org.eclipse.wst.common.componentcore.ModuleCoreNature;
-import org.eclipse.wst.common.componentcore.UnresolveableURIException;
-import org.eclipse.wst.common.componentcore.internal.ArtifactEditModel;
-import org.eclipse.wst.common.componentcore.internal.BinaryComponentHelper;
-import org.eclipse.wst.common.componentcore.internal.ReferencedComponent;
-import org.eclipse.wst.common.componentcore.internal.StructureEdit;
-import org.eclipse.wst.common.componentcore.internal.impl.ModuleURIUtil;
-import org.eclipse.wst.common.componentcore.internal.util.IArtifactEditFactory;
-import org.eclipse.wst.common.componentcore.resources.IVirtualComponent;
-import org.eclipse.wst.common.componentcore.resources.IVirtualReference;
-import org.eclipse.wst.common.internal.emfworkbench.WorkbenchResourceHelper;
-
-
-
-/**
- * <p>
- * WebArtifactEdit obtains a Web Deployment Descriptor metamodel specifec data from a
- * {@see org.eclipse.jst.j2ee.webapplication.WebAppResource} which stores the metamodel. The
- * {@see org.eclipse.jst.j2ee.webapplication.WebAppResource} is retrieved from the
- * {@see org.eclipse.wst.common.modulecore.ArtifactEditModel} using a constant {@see
- * J2EEConstants#WEBAPP_DD_URI_OBJ}. The defined methods extract data or manipulate the contents of
- * the underlying resource.
- * </p>
- *
- */
-public class WebArtifactEdit extends EnterpriseArtifactEdit implements IArtifactEditFactory {
-
- private static final String WEB_CONTENT_TYPE = "org.eclipse.jst.j2ee.webDD"; //$NON-NLS-1$
- /**
- * <p>
- * Identifier used to link WebArtifactEdit to a WebEditAdapterFactory {@see
- * WebEditAdapterFactory} stored in an AdapterManger (@see AdapterManager)
- * </p>
- */
- public static final Class ADAPTER_TYPE = WebArtifactEdit.class;
- public static final String WEB_CONTENT = "WebContent"; //$NON-NLS-1$
- public static final String WEB_INF = "WEB-INF"; //$NON-NLS-1$
- public static final String META_INF = "META-INF"; //$NON-NLS-1$
-
- public static IPath WEBLIB = new Path("/WEB-INF/lib"); //$NON-NLS-1$
-
- /**
- *
- */
- public WebArtifactEdit() {
- super();
- }
-
- public WebArtifactEdit(IVirtualComponent aModule) {
- super(aModule);
- }
-
- @Override
- protected BinaryComponentHelper initBinaryComponentHelper(IVirtualComponent binaryModule) {
- return new JavaEEBinaryComponentHelper(binaryModule);
- }
-
- /**
- * @param aHandle
- * @param toAccessAsReadOnly
- * @throws IllegalArgumentException
- */
- public WebArtifactEdit(IProject aProject, boolean toAccessAsReadOnly) throws IllegalArgumentException {
- super(aProject, toAccessAsReadOnly);
- }
-
- /**
- * @param aHandle
- * @param toAccessAsReadOnly
- * @throws IllegalArgumentException
- */
- public WebArtifactEdit(IProject aProject, boolean toAccessAsReadOnly, boolean forCreate) throws IllegalArgumentException {
- super(aProject, toAccessAsReadOnly, forCreate, J2EEProjectUtilities.DYNAMIC_WEB);
- }
-
- /**
- * @param aHandle
- * @param toAccessAsReadOnly
- * @throws IllegalArgumentException
- */
- protected WebArtifactEdit(IProject aProject, boolean toAccessAsReadOnly, boolean forCreate, String editModelID) throws IllegalArgumentException {
- super(aProject, toAccessAsReadOnly, forCreate, editModelID);
- }
-
- /**
- * <p>
- * Returns an instance facade to manage the underlying edit model for the given
- * {@see WorkbenchComponent}. Instances of ArtifactEdit that are returned through this method
- * must be {@see #dispose()}ed of when no longer in use.
- * </p>
- * <p>
- * Use to acquire an ArtifactEdit facade for a specific {@see WorkbenchComponent} that
- * will not be used for editing. Invocations of any save*() API on an instance returned from
- * this method will throw exceptions.
- * </p>
- * <p>
- * <b>The following method may return null. </b>
- * </p>
- *
- * @param aModule
- * A valid {@see WorkbenchComponent} with a handle that resolves to an
- * accessible project in the workspace
- * @return An instance of ArtifactEdit that may only be used to read the underlying content
- * model
- */
- public static WebArtifactEdit getWebArtifactEditForRead(IProject aProject) {
- WebArtifactEdit artifactEdit = null;
- try {
- if (isValidWebModule(ComponentCore.createComponent(aProject)))
- artifactEdit = new WebArtifactEdit(aProject, true, false);
- } catch (Exception e) {
- artifactEdit = null;
- }
- return artifactEdit;
- }
-
- /**
- * <p>
- * Returns an instance facade to manage the underlying edit model for the given
- * {@see WorkbenchComponent}. Instances of ArtifactEdit that are returned through this method
- * must be {@see #dispose()}ed of when no longer in use.
- * </p>
- * <p>
- * Use to acquire an ArtifactEdit facade for a specific {@see WorkbenchComponent} that
- * will be used for editing.
- * </p>
- * <p>
- * <b>The following method may return null. </b>
- * </p>
- *
- * @param aModule
- * A valid {@see WorkbenchComponent} with a handle that resolves to an
- * accessible project in the workspace
- * @return An instance of ArtifactEdit that may be used to modify and persist changes to the
- * underlying content model
- */
- public static WebArtifactEdit getWebArtifactEditForWrite(IProject aProject) {
- WebArtifactEdit artifactEdit = null;
- try {
- if (isValidWebModule(ComponentCore.createComponent(aProject)))
- artifactEdit = new WebArtifactEdit(aProject, false, false);
- } catch (Exception e) {
- artifactEdit = null;
- }
- return artifactEdit;
- }
-
- /**
- * <p>
- * Returns an instance facade to manage the underlying edit model for the given
- * {@see WorkbenchComponent}. Instances of WebArtifactEdit that are returned through this
- * method must be {@see #dispose()}ed of when no longer in use.
- * </p>
- * <p>
- * Use to acquire an WebArtifactEdit facade for a specific {@see WorkbenchComponent} that
- * will not be used for editing. Invocations of any save*() API on an instance returned from
- * this method will throw exceptions.
- * </p>
- * <p>
- * <b>This method may return null. </b>
- * </p>
- *
- * <p>
- * Note: This method is for internal use only. Clients should not call this method.
- * </p>
- *
- * @param aModule
- * A valid {@see WorkbenchComponent} with a handle that resolves to an
- * accessible project in the workspace
- * @return An instance of WebArtifactEdit that may only be used to read the underlying content
- * model
- * @throws UnresolveableURIException
- * could not resolve uri.
- */
- public static WebArtifactEdit getWebArtifactEditForRead(IVirtualComponent aModule) {
- if (aModule == null)
- return null;
- if (aModule.isBinary()) {
- return new WebArtifactEdit(aModule);
- }
-
- return getWebArtifactEditForRead(aModule.getProject());
- }
-
-
- /**
- * <p>
- * Returns an instance facade to manage the underlying edit model for the given
- * {@see WorkbenchComponent}. Instances of WebArtifactEdit that are returned through this
- * method must be {@see #dispose()}ed of when no longer in use.
- * </p>
- * <p>
- * Use to acquire an WebArtifactEdit facade for a specific {@see WorkbenchComponent} that
- * will be used for editing.
- * </p>
- * <p>
- * <b>This method may return null. </b>
- * </p>
- *
- * <p>
- * Note: This method is for internal use only. Clients should not call this method.
- * </p>
- *
- * @param aModule
- * A valid {@see WorkbenchComponent} with a handle that resolves to an
- * accessible project in the workspace
- * @return An instance of WebArtifactEdit that may be used to modify and persist changes to the
- * underlying content model
- */
- public static WebArtifactEdit getWebArtifactEditForWrite(IVirtualComponent aModule) {
- if (aModule == null || aModule.isBinary())
- return null;
- return getWebArtifactEditForWrite(aModule.getProject());
- }
-
- /**
- * @param module
- * A {@see WorkbenchComponent}
- * @return True if the supplied module
- * {@see ArtifactEdit#isValidEditableModule(WorkbenchComponent)}and the moduleTypeId is
- * a JST module
- */
- public static boolean isValidWebModule(IVirtualComponent aModule) throws UnresolveableURIException {
- if (!isValidEditableModule(aModule))
- return false;
- return JavaEEProjectUtilities.isDynamicWebProject(aModule.getProject());
- }
-
- /**
- * <p>
- * Creates an instance facade for the given {@see ArtifactEditModel}.
- * </p>
- *
- * @param anArtifactEditModel
- */
- public WebArtifactEdit(ArtifactEditModel model) {
- super(model);
-
- }
-
- /**
- * <p>
- * Creates an instance facade for the given {@see ArtifactEditModel}
- * </p>
- *
- * <p>
- * Note: This method is for internal use only. Clients should not call this method.
- * </p>
- *
- * @param aNature
- * A non-null {@see ModuleCoreNature}for an accessible project
- * @param aModule
- * A non-null {@see WorkbenchComponent}pointing to a module from the given
- * {@see ModuleCoreNature}
- */
- protected WebArtifactEdit(ModuleCoreNature aNature, IVirtualComponent aModule, boolean toAccessAsReadOnly) {
- super(aNature, aModule, toAccessAsReadOnly);
- }
-
-
-
- /**
- * <p>
- * Retrieves J2EE version information from WebAppResource.
- * </p>
- *
- * @return an integer representation of a J2EE Spec version
- *
- */
- @Override
- public int getJ2EEVersion() {
- verifyOperationSupported();
- return ((WebAppResource) getDeploymentDescriptorResource()).getJ2EEVersionID();
- }
-
- /**
- * <p>
- * Obtains the WebApp (@see WebApp) root object from the WebAppResource. If the root object does
- * not exist, then one is created (@link addWebAppIfNecessary(getWebApplicationXmiResource())).
- * The root object contains all other resource defined objects.
- * </p>
- *
- * @return EObject
- *
- */
- @Override
- public EObject getDeploymentDescriptorRoot() {
- verifyOperationSupported();
- List contents = getDeploymentDescriptorResource().getContents();
- if (contents.size() > 0)
- return (EObject) contents.get(0);
- if (isBinary()) {
- return null;
- }
- addWebAppIfNecessary((WebAppResource) getDeploymentDescriptorResource());
- return (EObject) contents.get(0);
- }
-
- /**
- * <p>
- * Retrieves the underlying resource from the ArtifactEditModel using defined URI.
- * </p>
- *
- * @return Resource
- *
- */
- @Override
- public Resource getDeploymentDescriptorResource() {
- verifyOperationSupported();
- if (isBinary()) {
- return getBinaryComponentHelper().getResource(J2EEConstants.WEBAPP_DD_URI_OBJ);
- }
- return getArtifactEditModel().getResource(J2EEConstants.WEBAPP_DD_URI_OBJ);
- }
-
- /**
- * <p>
- * Retrieves Servlet version information derived from the {@see WebAppResource}.
- * </p>
- *
- * @return an integer representation of a module version
- *
- */
- public int getServletVersion() {
- verifyOperationSupported();
- return ((WebAppResource) getDeploymentDescriptorResource()).getModuleVersionID();
- }
-
- /**
- * This method returns the integer representation for the JSP specification level associated
- * with the J2EE version for this workbench module. This method will not return null and returns
- * 20 as default.
- *
- * @see WebArtifactEdit#getServletVersion()
- *
- * @return an integer representation of the JSP level
- */
- public int getJSPVersion() {
- verifyOperationSupported();
- int servletVersion = getServletVersion();
- if (servletVersion == J2EEVersionConstants.WEB_2_2_ID)
- return J2EEVersionConstants.JSP_1_1_ID;
- else if (servletVersion == J2EEVersionConstants.WEB_2_3_ID)
- return J2EEVersionConstants.JSP_1_2_ID;
- else
- return J2EEVersionConstants.JSP_2_0_ID;
- }
-
- /**
- * <p>
- * Creates a deployment descriptor root object (WebApp) and populates with data. Adds the root
- * object to the deployment descriptor resource.
- * </p>
- *
- * <p>
- *
- * @param aModule
- * A non-null pointing to a {@see XMLResource}
- * @param version
- * Version to be set on resource....if null default is taken
- *
- * Note: This method is typically used for JUNIT - move?
- * </p>
- */
- protected void addWebAppIfNecessary(XMLResource aResource) {
- verifyOperationSupported();
- if (isBinary()) {
- throwAttemptedBinaryEditModelAccess();
- }
- if (aResource != null) {
- if (aResource.getContents() == null || aResource.getContents().isEmpty()) {
- WebApp webAppNew = WebapplicationFactory.eINSTANCE.createWebApp();
- aResource.getContents().add(webAppNew);
- aResource.setModified(true);
- }
- WebApp webApp = (WebApp) aResource.getContents().get(0);
- URI moduleURI = getArtifactEditModel().getModuleURI();
- try {
- webApp.setDisplayName(StructureEdit.getDeployedName(moduleURI));
- } catch (UnresolveableURIException e) {
- // Ignore
- }
- aResource.setID(webApp, J2EEConstants.WEBAPP_ID);
-
- WelcomeFileList wList = WebapplicationFactory.eINSTANCE.createWelcomeFileList();
- List files = wList.getFile();
- WelcomeFile file = WebapplicationFactory.eINSTANCE.createWelcomeFile();
- file.setWelcomeFile("index.html"); //$NON-NLS-1$
- files.add(file);
- file = WebapplicationFactory.eINSTANCE.createWelcomeFile();
- file.setWelcomeFile("index.htm"); //$NON-NLS-1$
- files.add(file);
- file = WebapplicationFactory.eINSTANCE.createWelcomeFile();
- file.setWelcomeFile("index.jsp"); //$NON-NLS-1$
- files.add(file);
- file = WebapplicationFactory.eINSTANCE.createWelcomeFile();
- file.setWelcomeFile("default.html"); //$NON-NLS-1$
- files.add(file);
- file = WebapplicationFactory.eINSTANCE.createWelcomeFile();
- file.setWelcomeFile("default.htm"); //$NON-NLS-1$
- files.add(file);
- file = WebapplicationFactory.eINSTANCE.createWelcomeFile();
- file.setWelcomeFile("default.jsp"); //$NON-NLS-1$
- files.add(file);
-
- webApp.setFileList(wList);
-
- try {
- aResource.saveIfNecessary();
- } catch (java.net.ConnectException ex) {
-
- } catch (Exception e) {
- WebPlugin.logError(e);
- }
- }
- }
-
-
- /**
- * This method returns the full path to the deployment descriptor resource for the associated
- * workbench module. This method may return null.
- *
- * @see WebArtifactEdit#getDeploymentDescriptorResource()
- *
- * @return the full IPath for the deployment descriptor resource
- */
- public IPath getDeploymentDescriptorPath() {
- verifyOperationSupported();
- IFile file = WorkbenchResourceHelper.getFile(getDeploymentDescriptorResource());
- if (file != null)
- return file.getFullPath();
- return null;
- }
-
- /**
- * This method will retrieve the web app resource, create it if necessary, add get the root
- * object, the web app out of that web app resource. It will create the web app instance if need
- * be, and add it to the web resource. Then, it returns the web app object as the model root.
- * This method will not return null.
- *
- * @see EnterpriseArtifactEdit#createModelRoot()
- *
- * @return the eObject instance of the model root
- */
- @Override
- public EObject createModelRoot() {
- verifyOperationSupported();
- if (isBinary()) {
- throwAttemptedBinaryEditModelAccess();
- }
- return createModelRoot(getJ2EEVersion());
- }
-
- /**
- * This method will retrieve the web app resource, create it if necessary, add get the root
- * object, set version the web app out of that web app resource. It will create the web app
- * instance if need be, and add it to the web resource. Then, it returns the web app object as
- * the model root. This method will not return null.
- *
- * @see EnterpriseArtifactEdit#createModelRoot()
- *
- * @return the eObject instance of the model root
- */
- @Override
- public EObject createModelRoot(int version) {
- verifyOperationSupported();
- if (isBinary()) {
- throwAttemptedBinaryEditModelAccess();
- }
- WebAppResource res = (WebAppResource) getDeploymentDescriptorResource();
- res.setModuleVersionID(version);
- addWebAppIfNecessary(res);
- return res.getRootObject();
- }
-
- /**
- * @deprecated
- * use {@link WebUtilities}{@link #getLibModules()}
- */
- public IVirtualReference[] getLibModules() {
- return WebUtilities.getLibModules(getProject());
- }
-
- /**
- * This method will add the dependent modules from the passed in array to the dependentmodules
- * list of the associated workbench module. It will ensure a null is not passed and it will
- * ensure the dependent modules are not already in the list.
- *
- * <p>
- * Note: This method is for internal use only. Clients should not call this method.
- * </p>
- *
- * @param libModules
- * array of dependent modules to add as web libraries
- */
- public void addLibModules(ReferencedComponent[] libModules) {
- // TODO - Need to implement
- // if (libModules==null)
- // return;
- // for (int i=0; i<libModules.length; i++) {
- // if (!module.getReferencedComponents().contains(libModules[i]))
- // module.getReferencedComponents().add(libModules[i]);
- // }
- }
-
- /**
- * This method will retrieve the context root for this web project's .component file. It is
- * meant to handle a standalone web case.
- *
- * @return contextRoot String
- */
- public String getServerContextRoot() {
- return J2EEProjectUtilities.getServerContextRoot(getProject());
- }
-
- /**
- * This method will retrieve the context root for this web project in the associated parameter's
- * application.xml. If the earProject is null, then the contextRoot from the .component of the
- * web project is returned.
- *
- * @param earProject
- * @return contextRoot String
- */
- public String getServerContextRoot(IProject earProject) {
- if (earProject == null || !JavaEEProjectUtilities.isEARProject(earProject))
- return getServerContextRoot();
- EARArtifactEdit earEdit = null;
- String contextRoot = null;
- try {
- earEdit = EARArtifactEdit.getEARArtifactEditForRead(earProject);
- if (earEdit != null)
- contextRoot = earEdit.getWebContextRoot(getProject());
- } finally {
- if (earEdit != null)
- earEdit.dispose();
- }
- return contextRoot;
- }
-
- /**
- * This method will update the context root for this web project on the EAR which is passed in.
- * If no EAR is passed the .component file for the web project will be updated.
- *
- * @param earProject
- * @param aContextRoot
- */
- public void setServerContextRoot(IProject earProject, String aContextRoot) {
- if (earProject == null || !JavaEEProjectUtilities.isEARProject(earProject))
- setServerContextRoot(aContextRoot);
- EARArtifactEdit earEdit = null;
- try {
- earEdit = EARArtifactEdit.getEARArtifactEditForWrite(earProject);
- if (earEdit != null)
- earEdit.setWebContextRoot(getProject(), aContextRoot);
- } finally {
- if (earEdit != null) {
- earEdit.saveIfNecessary(new NullProgressMonitor());
- earEdit.dispose();
- }
- }
- }
-
- /**
- * This method sets the context root property on the web project's .component file for the
- * standalone case.
- *
- * @param contextRoot
- * string
- */
- public void setServerContextRoot(String contextRoot) {
- J2EEProjectUtilities.setServerContextRoot(getProject(), contextRoot);
- }
-
-
- /**
- * @return WebApp
- */
- public WebApp getWebApp() {
- verifyOperationSupported();
-
- return (WebApp) getDeploymentDescriptorRoot();
- }
-
-
- public ArtifactEdit createArtifactEditForRead(IVirtualComponent aComponent) {
- return getWebArtifactEditForRead(aComponent);
- }
-
-
- public ArtifactEdit createArtifactEditForWrite(IVirtualComponent aComponent) {
- return getWebArtifactEditForWrite(aComponent);
- }
-
- @Override
- public Archive asArchive(boolean includeSource, boolean includeClasspathComponents) throws OpenFailureException {
- return asArchive(includeSource, includeClasspathComponents, false);
- }
- public Archive asArchive(boolean includeSource, boolean includeClasspathComponents, boolean readOnly) throws OpenFailureException {
- verifyOperationSupported();
- if (isBinary()) {
- JavaEEBinaryComponentHelper helper = (JavaEEBinaryComponentHelper)getBinaryComponentHelper();
- return helper.accessLegacyArchive();
- }
- WebComponentLoadStrategyImpl loader = new WebComponentLoadStrategyImpl(getComponent(), includeClasspathComponents);
- loader.setExportSource(includeSource);
- loader.setReadOnly(readOnly);
- String uri = ModuleURIUtil.getHandleString(getComponent());
- ArchiveOptions options = new ArchiveOptions();
- options.setLoadStrategy(loader);
- options.setIsReadOnly(readOnly);
- return CommonarchiveFactory.eINSTANCE.openWARFile(options, uri);
- }
-
- public static void createDeploymentDescriptor(IProject project, int version) {
- WebArtifactEdit webEdit = new WebArtifactEdit(project, false, true);
- try {
- webEdit.createModelRoot(version);
- webEdit.save(null);
- } finally { // Make sure new resource is removed - the uri used for creation shouldn't be cached
- Resource newRes = webEdit.getDeploymentDescriptorResource();
- WorkbenchResourceHelperBase.getResourceSet(project).getResources().remove(newRes);
- newRes.unload();
- webEdit.dispose();
- }
- }
- @Override
- public IModelProvider create(IProject project) {
- return getWebArtifactEditForRead(project);
- }
-
- @Override
- public IModelProvider create(IVirtualComponent component) {
- return getWebArtifactEditForRead(component);
- }
-
- @Override
- public void modify(Runnable runnable, IPath modelPath) {
- setWritableEdit(getWebArtifactEditForWrite(getProject()));
- try{
- runnable.run();
- if( getWritableEdit() != null ){
- // Always save regardless of resource path passed - Artifactedits save resources as a unit
- getWritableEdit().saveIfNecessary( new NullProgressMonitor() );
- }
-
- }finally{
- if (getWritableEdit() != null)
- getWritableEdit().dispose();
- setWritableEdit(null);
- }
- }
-
-
- @Override
- protected String getContentTypeDescriber() {
- return WEB_CONTENT_TYPE;
- }
- @Override
- protected URI getRootURI() {
- return J2EEConstants.WEBAPP_DD_URI_OBJ;
- }
-
-
-}
diff --git a/plugins/org.eclipse.jst.j2ee.web/webproject/org/eclipse/jst/j2ee/web/componentcore/util/package.xml b/plugins/org.eclipse.jst.j2ee.web/webproject/org/eclipse/jst/j2ee/web/componentcore/util/package.xml
deleted file mode 100644
index 6a17c4e..0000000
--- a/plugins/org.eclipse.jst.j2ee.web/webproject/org/eclipse/jst/j2ee/web/componentcore/util/package.xml
+++ /dev/null
@@ -1,19 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<html>
- <head>
- <meta
- name="root"
- content="../../../../../../../" />
- <title>WebArtifactEdit api overview</title>
- </head>
-
- <body>
- <abstract>
- This package includes the WebArtifactEdit api. This api is used to work with the emf model
- of a flexible web module. It contains api to read and serialize out the emf model for web applications.
- </abstract>
-
- <a href="#top">top</a>
- </body>
-</html>
-
\ No newline at end of file
diff --git a/plugins/org.eclipse.jst.j2ee.web/webproject/org/eclipse/jst/j2ee/web/datamodel/properties/IConvertStaticWebToDyamnicDataModelProperties.java b/plugins/org.eclipse.jst.j2ee.web/webproject/org/eclipse/jst/j2ee/web/datamodel/properties/IConvertStaticWebToDyamnicDataModelProperties.java
deleted file mode 100644
index ccfad90..0000000
--- a/plugins/org.eclipse.jst.j2ee.web/webproject/org/eclipse/jst/j2ee/web/datamodel/properties/IConvertStaticWebToDyamnicDataModelProperties.java
+++ /dev/null
@@ -1,25 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2008 IBM Corporation and others.
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
- *
- * Contributors:
- * IBM Corporation - initial API and implementation
- *******************************************************************************/
-package org.eclipse.jst.j2ee.web.datamodel.properties;
-
-import org.eclipse.jst.j2ee.internal.web.operations.ConvertStaticWebToDyamnicDataModelProvider;
-
-public interface IConvertStaticWebToDyamnicDataModelProperties {
-
- /**
- * This field should not be used. It is not part of the API and may be modified in the future.
- */
- public static Class _provider_class = ConvertStaticWebToDyamnicDataModelProvider.class;
-
- public static final String PROJECT = "IConvertStaticWebToDyamnicProperties.PROJECT"; //$NON-NLS-1$
- public static final String CONVERT_TO_WEB_VERSION = "IConvertStaticWebToDyamnicProperties.CONVERT_TO_WEB_VERSION"; //$NON-NLS-1$
-
-}
diff --git a/plugins/org.eclipse.jst.j2ee.web/webproject/org/eclipse/jst/j2ee/web/datamodel/properties/IWebComponentExportDataModelProperties.java b/plugins/org.eclipse.jst.j2ee.web/webproject/org/eclipse/jst/j2ee/web/datamodel/properties/IWebComponentExportDataModelProperties.java
deleted file mode 100644
index 129150d..0000000
--- a/plugins/org.eclipse.jst.j2ee.web/webproject/org/eclipse/jst/j2ee/web/datamodel/properties/IWebComponentExportDataModelProperties.java
+++ /dev/null
@@ -1,37 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2003, 2005 IBM Corporation and others.
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
- *
- * Contributors:
- * IBM Corporation - initial API and implementation
- *******************************************************************************/
-package org.eclipse.jst.j2ee.web.datamodel.properties;
-
-import org.eclipse.jst.j2ee.datamodel.properties.IJ2EEComponentExportDataModelProperties;
-/**
- * <p>
- * IWebComponentExportDataModelProperties provides properties to the IDataModel associated with the
- * WebComponentExportDataModelProvider.
- * NOTE: The associated Provider and Operations will be created during M5
- * </p>
- * <p>
- * This interface is not intended to be implemented by clients.
- * </p>
- *
- * @see org.eclipse.wst.common.frameworks.datamodel.IDataModelProvider
- * @see org.eclipse.wst.common.frameworks.datamodel.DataModelFactory
- * @see org.eclipse.wst.common.frameworks.datamodel.IDataModelProperties
- *
- * @plannedfor 1.0
- */
-public interface IWebComponentExportDataModelProperties extends IJ2EEComponentExportDataModelProperties {
- /**
- * Required, type Boolean flag which indicates whether or not to export compiled JSP files
- * (compiled files exist in /WEB-INF/classes as .class and .java[for debug])
- */
- public static final String EXCLUDE_COMPILE_JSP = "WebExportDataModel.EXCLUDE_COMPILE_JSP"; //$NON-NLS-1$
-
-}
diff --git a/plugins/org.eclipse.jst.j2ee.web/webproject/org/eclipse/jst/j2ee/web/datamodel/properties/IWebComponentImportDataModelProperties.java b/plugins/org.eclipse.jst.j2ee.web/webproject/org/eclipse/jst/j2ee/web/datamodel/properties/IWebComponentImportDataModelProperties.java
deleted file mode 100644
index 7a8697f..0000000
--- a/plugins/org.eclipse.jst.j2ee.web/webproject/org/eclipse/jst/j2ee/web/datamodel/properties/IWebComponentImportDataModelProperties.java
+++ /dev/null
@@ -1,58 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2003, 2006 IBM Corporation and others.
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
- *
- * Contributors:
- * IBM Corporation - initial API and implementation
- *******************************************************************************/
-package org.eclipse.jst.j2ee.web.datamodel.properties;
-
-import java.util.List;
-
-import org.eclipse.jst.j2ee.commonarchivecore.internal.Archive;
-import org.eclipse.jst.j2ee.datamodel.properties.IJ2EEModuleImportDataModelProperties;
-import org.eclipse.wst.common.frameworks.datamodel.IDataModel;
-
-/**
- * <p>
- * IWebComponentImportDataModelProperties provides properties to the IDataModel associated with the
- * WebComponentImportDataModelProvider. NOTE: The associated Provider and Operations will be created
- * during M5
- * </p>
- * <p>
- * This interface is not intended to be implemented by clients.
- * </p>
- *
- * @see org.eclipse.wst.common.frameworks.datamodel.IDataModelProvider
- * @see org.eclipse.wst.common.frameworks.datamodel.DataModelFactory
- * @see org.eclipse.wst.common.frameworks.datamodel.IDataModelProperties
- *
- * @plannedfor 1.0
- */
-public interface IWebComponentImportDataModelProperties extends IJ2EEModuleImportDataModelProperties {
-
- /**
- * <p>
- * This optional {@link List} property is used to specify which nested web libraries should be
- * expanded into projects during import. The contents of this {@link List} property should be
- * {@link Archive}s.
- * </p>
- */
- public static final String WEB_LIB_ARCHIVES_SELECTED = "WARImportDataModel.WEB_LIB_ARCHIVES_SELECTED"; //$NON-NLS-1$
-
- /**
- * <p>
- * This {@link List} property should not be set by clients. This list contains the
- * {@link IDataModel}s for creating the new components to be created for each of the selected
- * archives. This list will contain one entry for each web lib archive regardless of whether it
- * is selected for import by the {@link #WEB_LIB_ARCHIVES_SELECTED} property.
- * </p>
- */
- public static final String WEB_LIB_MODELS = "WARImportDataModel.WEB_LIB_MODELS"; //$NON-NLS-1$
-
- public static final String CONTEXT_ROOT = "IAddWebComponentToEnterpriseApplicationDataModelProperties.CONTEXT_ROOT"; //$NON-NLS-1$
-
-}
diff --git a/plugins/org.eclipse.jst.j2ee.web/webproject/org/eclipse/jst/j2ee/web/datamodel/properties/package.xml b/plugins/org.eclipse.jst.j2ee.web/webproject/org/eclipse/jst/j2ee/web/datamodel/properties/package.xml
deleted file mode 100644
index bc7e674..0000000
--- a/plugins/org.eclipse.jst.j2ee.web/webproject/org/eclipse/jst/j2ee/web/datamodel/properties/package.xml
+++ /dev/null
@@ -1,19 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<html>
- <head>
- <meta
- name="root"
- content="../../../../../../../" />
- <title>web module data model api overview</title>
- </head>
-
- <body>
- <abstract>
- This package includes the api to create, import and export web modules. The interfaces in this package
- define the properties that can be set on the web modules data models that are use to run the data model operations and drive the wizard data, validation.
- </abstract>
-
- <a href="#top">top</a>
- </body>
-</html>
-
\ No newline at end of file
diff --git a/plugins/org.eclipse.jst.j2ee.web/webproject/org/eclipse/jst/j2ee/web/project/facet/IWebFacetInstallDataModelProperties.java b/plugins/org.eclipse.jst.j2ee.web/webproject/org/eclipse/jst/j2ee/web/project/facet/IWebFacetInstallDataModelProperties.java
deleted file mode 100644
index eb30aaf..0000000
--- a/plugins/org.eclipse.jst.j2ee.web/webproject/org/eclipse/jst/j2ee/web/project/facet/IWebFacetInstallDataModelProperties.java
+++ /dev/null
@@ -1,30 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2003, 2007 IBM Corporation and others.
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
- *
- * Contributors:
- * IBM Corporation - initial API and implementation
- *******************************************************************************/
-package org.eclipse.jst.j2ee.web.project.facet;
-
-import org.eclipse.jst.j2ee.internal.web.archive.operations.WebFacetProjectCreationDataModelProvider;
-import org.eclipse.jst.j2ee.project.facet.IJ2EEModuleFacetInstallDataModelProperties;
-
-public interface IWebFacetInstallDataModelProperties extends IJ2EEModuleFacetInstallDataModelProperties {
-
- /**
- * This field should not be used. It is not part of the API and may be modified in the future.
- */
- public static Class _provider_class = WebFacetProjectCreationDataModelProvider.class;
-
- public static final String CONTEXT_ROOT = "IWebFacetInstallDataModelProperties.CONTEXT_ROOT"; //$NON-NLS-1$
-
- public static final String SOURCE_FOLDER = "IWebFacetInstallDataModelProperties.SOURCE_FOLDER"; //$NON-NLS-1$
-
- public static final String INSTALL_WEB_LIBRARY = "IWebFacetInstallDataModelProperties.INSTALL_WEB_LIBRARY"; //$NON-NLS-1$
-
-
-}
diff --git a/plugins/org.eclipse.jst.j2ee.web/webproject/org/eclipse/jst/j2ee/web/project/facet/IWebFragmentFacetInstallDataModelProperties.java b/plugins/org.eclipse.jst.j2ee.web/webproject/org/eclipse/jst/j2ee/web/project/facet/IWebFragmentFacetInstallDataModelProperties.java
deleted file mode 100644
index c40eb88..0000000
--- a/plugins/org.eclipse.jst.j2ee.web/webproject/org/eclipse/jst/j2ee/web/project/facet/IWebFragmentFacetInstallDataModelProperties.java
+++ /dev/null
@@ -1,27 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2010 IBM Corporation and others.
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
- *
- * Contributors:
- * IBM Corporation - initial API and implementation
- *******************************************************************************/
-package org.eclipse.jst.j2ee.web.project.facet;
-
-import org.eclipse.jst.j2ee.project.facet.IJ2EEModuleFacetInstallDataModelProperties;
-
-public interface IWebFragmentFacetInstallDataModelProperties extends IJ2EEModuleFacetInstallDataModelProperties {
- /**
- * This field should not be used. It is not part of the API and may be modified in the future.
- */
- public static Class _provider_class = WebFragmentFacetInstallDataModelProvider.class;
-
- public static final String CONTENT_DIR = "IWebFragmentFacetInstallDataModelProperties.CONTENT_DIR"; //$NON-NLS-1$
-
- public static final String ADD_TO_WAR = "IWebFragmentFacetInstallDataModelProperties.ADD_TO_WAR"; //$NON-NLS-1$
- public static final String WAR_PROJECT_NAME = "IWebFragmentFacetInstallDataModelProperties.WAR_PROJECT_NAME"; //$NON-NLS-1$
- public static final String LAST_WAR_NAME = "IWebFragmentFacetInstallDataModelProperties.LAST_WAR_NAME"; //$NON-NLS-1$
-
- }
diff --git a/plugins/org.eclipse.jst.j2ee.web/webproject/org/eclipse/jst/j2ee/web/project/facet/IWebFragmentProjectCreationDataModelProperties.java b/plugins/org.eclipse.jst.j2ee.web/webproject/org/eclipse/jst/j2ee/web/project/facet/IWebFragmentProjectCreationDataModelProperties.java
deleted file mode 100644
index cfc2dc7..0000000
--- a/plugins/org.eclipse.jst.j2ee.web/webproject/org/eclipse/jst/j2ee/web/project/facet/IWebFragmentProjectCreationDataModelProperties.java
+++ /dev/null
@@ -1,23 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2010 IBM Corporation and others.
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
- *
- * Contributors:
- * IBM Corporation - initial API and implementation
- *******************************************************************************/
-package org.eclipse.jst.j2ee.web.project.facet;
-
-
-import org.eclipse.wst.common.componentcore.datamodel.properties.IFacetProjectCreationDataModelProperties;
-
-public interface IWebFragmentProjectCreationDataModelProperties
- extends IFacetProjectCreationDataModelProperties{
-
- public static final String ADD_TO_WAR = "IWebFragmentProjectCreationDataModelProperties.ADD_TO_WAR"; //$NON-NLS-1$
- public static final String WAR_PROJECT_NAME = "IWebFragmentProjectCreationDataModelProperties.WAR_PROJECT_NAME"; //$NON-NLS-1$
-
-
-}
diff --git a/plugins/org.eclipse.jst.j2ee.web/webproject/org/eclipse/jst/j2ee/web/project/facet/WebFacetInstallDataModelProvider.java b/plugins/org.eclipse.jst.j2ee.web/webproject/org/eclipse/jst/j2ee/web/project/facet/WebFacetInstallDataModelProvider.java
deleted file mode 100644
index 2b32330..0000000
--- a/plugins/org.eclipse.jst.j2ee.web/webproject/org/eclipse/jst/j2ee/web/project/facet/WebFacetInstallDataModelProvider.java
+++ /dev/null
@@ -1,214 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2003, 2007 IBM Corporation and others.
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
- *
- * Contributors:
- * IBM Corporation - initial API and implementation
- *******************************************************************************/
-package org.eclipse.jst.j2ee.web.project.facet;
-
-import java.util.List;
-import java.util.Set;
-
-import org.eclipse.core.runtime.IPath;
-import org.eclipse.core.runtime.IStatus;
-import org.eclipse.core.runtime.Path;
-import org.eclipse.jst.common.project.facet.core.JavaFacetInstallConfig.ChangeEvent;
-import org.eclipse.jst.j2ee.internal.J2EEConstants;
-import org.eclipse.jst.j2ee.internal.J2EEVersionConstants;
-import org.eclipse.jst.j2ee.internal.common.J2EEVersionUtil;
-import org.eclipse.jst.j2ee.internal.common.classpath.J2EEComponentClasspathContainerUtils;
-import org.eclipse.jst.j2ee.internal.plugin.IJ2EEModuleConstants;
-import org.eclipse.jst.j2ee.internal.plugin.J2EEPlugin;
-import org.eclipse.jst.j2ee.internal.plugin.J2EEPreferences;
-import org.eclipse.jst.j2ee.internal.project.ProjectSupportResourceHandler;
-import org.eclipse.jst.j2ee.project.facet.J2EEModuleFacetInstallDataModelProvider;
-import org.eclipse.wst.common.frameworks.datamodel.IDataModel;
-import org.eclipse.wst.common.frameworks.internal.plugin.WTPCommonPlugin;
-import org.eclipse.wst.common.project.facet.core.IProjectFacetVersion;
-import org.eclipse.wst.project.facet.ProductManager;
-
-import com.ibm.icu.text.UTF16;
-import com.ibm.icu.util.StringTokenizer;
-
-public class WebFacetInstallDataModelProvider extends J2EEModuleFacetInstallDataModelProvider implements IWebFacetInstallDataModelProperties {
-
- @Override
- protected void handleJavaFacetSourceFoldersChanged( final ChangeEvent event )
- {
- final List<IPath> sourceFolders = event.getJavaFacetInstallConfig().getSourceFolders();
- final String sourceFolder = ( sourceFolders.isEmpty() ? null : sourceFolders.get( 0 ).toPortableString() );
- getDataModel().setProperty( SOURCE_FOLDER, sourceFolder );
- }
-
- @Override
- public Set getPropertyNames() {
- Set names = super.getPropertyNames();
- names.add(CONTEXT_ROOT);
- names.add(SOURCE_FOLDER);
- names.add(INSTALL_WEB_LIBRARY);
- return names;
- }
-
- @Override
- public Object getDefaultProperty(String propertyName) {
- if (propertyName.equals(CONFIG_FOLDER)) {
- return J2EEPlugin.getDefault().getJ2EEPreferences().getString(J2EEPreferences.Keys.WEB_CONTENT_FOLDER);
- } else if (propertyName.equals(SOURCE_FOLDER)) {
- return J2EEPlugin.getDefault().getJ2EEPreferences().getString(J2EEPreferences.Keys.DYN_WEB_SRC_FOLDER);
- } else if (propertyName.equals(CONTEXT_ROOT)) {
- return getStringProperty(FACET_PROJECT_NAME).replace(' ', '_');
- } else if (propertyName.equals(FACET_ID)) {
- return DYNAMIC_WEB;
- } else if (propertyName.equals(MODULE_URI)) {
- String projectName = model.getStringProperty(FACET_PROJECT_NAME).replace(' ', '_');
- return projectName + IJ2EEModuleConstants.WAR_EXT;
- } else if (propertyName.equals(GENERATE_DD)) {
- String facetVersion = getStringProperty(FACET_VERSION_STR);
- if(J2EEVersionConstants.VERSION_2_5_TEXT.equals(facetVersion)) {
- return Boolean.valueOf(J2EEPlugin.getDefault().getJ2EEPreferences().getBoolean(J2EEPreferences.Keys.DYNAMIC_WEB_GENERATE_DD));
- }
- else if(J2EEVersionConstants.VERSION_3_0_TEXT.equals(facetVersion)) {
- return Boolean.valueOf(J2EEPlugin.getDefault().getJ2EEPreferences().getBoolean(J2EEPreferences.Keys.EE6_DYNAMIC_WEB_GENERATE_DD));
- }
-
- return Boolean.TRUE;
- }else if (propertyName.equals(INSTALL_WEB_LIBRARY)){
- return J2EEComponentClasspathContainerUtils.getDefaultUseWebAppLibraries();
- }
- return super.getDefaultProperty(propertyName);
- }
-
- @Override
- public boolean propertySet(String propertyName, Object propertyValue) {
- if (ADD_TO_EAR.equals(propertyName)) {
- model.notifyPropertyChange(CONTEXT_ROOT, IDataModel.ENABLE_CHG);
- } else if (FACET_PROJECT_NAME.equals(propertyName)) {
- model.notifyPropertyChange(CONTEXT_ROOT, IDataModel.VALID_VALUES_CHG);
- } else if (propertyName.equals(CONFIG_FOLDER)) {
- return true;
- } else if (propertyName.equals(SOURCE_FOLDER))
- {
- if( this.javaFacetInstallConfig != null )
- {
- if( propertyValue == null )
- {
- this.javaFacetInstallConfig.setSourceFolder( null );
- }
- else
- {
- final IPath sourceFolder = new Path( (String) propertyValue );
-
- if( ! this.javaFacetInstallConfig.getSourceFolders().contains( sourceFolder ) )
- {
- this.javaFacetInstallConfig.setSourceFolder( sourceFolder );
- }
- }
- }
- }
-
- return super.propertySet(propertyName, propertyValue);
- }
-
- @Override
- public boolean isPropertyEnabled(String propertyName) {
- return super.isPropertyEnabled(propertyName);
- }
-
- @Override
- protected int convertFacetVersionToJ2EEVersion(IProjectFacetVersion version) {
- return J2EEVersionUtil.convertWebVersionStringToJ2EEVersionID(version.getVersionString());
- }
-
- @Override
- public IStatus validate(String name) {
- if (name.equals(CONTEXT_ROOT)) {
- return validateContextRoot(getStringProperty(CONTEXT_ROOT));
- } else if (name.equals(SOURCE_FOLDER)) {
- IStatus status = validateFolderName(getStringProperty(SOURCE_FOLDER));
- if( status.isOK() ){
- return validateSourceAndContentFolderUniqueness();
- }
- return status;
- }else if (name.equals( CONFIG_FOLDER )) {
- IStatus status = super.validate( CONFIG_FOLDER );
- if( status.isOK() ){
- status = validateSourceAndContentFolderUniqueness();
- }
- if( status.isOK() ){
- String configFolder = model.getStringProperty(CONFIG_FOLDER);
- String outFolder = null;
- if( javaFacetInstallConfig != null ){
- outFolder = javaFacetInstallConfig.getDefaultOutputFolder().toString();
- }
- if( outFolder != null )
- status = validateWebConfigAndOutputFolder(configFolder, outFolder);
- }
- return status;
- }
- // the superclass validates the content directory which is actually a "CONFIG_FOLDER"
- return super.validate(name);
- }
-
- protected IStatus validateContextRoot(String contextRoot) {
- if (contextRoot == null || contextRoot.length() == 0) {
- return J2EEPlugin.newErrorStatus(ProjectSupportResourceHandler.getString(ProjectSupportResourceHandler.Context_Root_cannot_be_empty_2, new Object[]{contextRoot}), null);
- } else if (contextRoot.trim().equals(contextRoot)) {
- StringTokenizer stok = new StringTokenizer(contextRoot, "."); //$NON-NLS-1$
- while (stok.hasMoreTokens()) {
- String token = stok.nextToken();
- int cp;
- for (int i = 0; i < token.length(); i += UTF16.getCharCount(cp)) {
- cp = UTF16.charAt(token, i);
- if(token.charAt(i) == ' ')
- {
- return J2EEPlugin.newErrorStatus(ProjectSupportResourceHandler.getString(ProjectSupportResourceHandler.Names_cannot_contain_whitespace_, new Object[]{contextRoot}), null);
- }
- else if (!(token.charAt(i) == '_') && !(token.charAt(i) == '-') && !(token.charAt(i) == '/') && Character.isLetterOrDigit(token.charAt(i)) == false) {
- String invalidCharString = null;
- if (UTF16.getCharCount(cp)>1)
- {
- invalidCharString = UTF16.valueOf(cp);
- }
- else
- {
- invalidCharString = (new Character(token.charAt(i))).toString();
- }
- Object[] invalidChar = new Object[]{invalidCharString};
- String errorStatus = ProjectSupportResourceHandler.getString(ProjectSupportResourceHandler.The_character_is_invalid_in_a_context_root, invalidChar);
- return J2EEPlugin.newErrorStatus(errorStatus, null);
- }
- }
- }
- } else
- return J2EEPlugin.newErrorStatus(ProjectSupportResourceHandler.getString(ProjectSupportResourceHandler.Names_cannot_contain_whitespace_, new Object[]{contextRoot}), null);
- return OK_STATUS;
- }
-
- protected IStatus validateSourceAndContentFolderUniqueness(){
- String srcFolder = getStringProperty(SOURCE_FOLDER);
- String contentFolder = getStringProperty( CONFIG_FOLDER );
- if( srcFolder != null && contentFolder != null){
- if (srcFolder.equals( contentFolder )){
- String errorMessage = ProjectSupportResourceHandler.DYNAMIC_WEB_DISTINCT_SRC_WEBCONTENT_ERROR;
- return WTPCommonPlugin.createErrorStatus(errorMessage);
- }
- }
- return OK_STATUS;
- }
-
- public static IStatus validateWebConfigAndOutputFolder(String rawConfigFolder, String outFolder){
- if( ProductManager.shouldUseSingleRootStructure()){
- String expectedOutFolder = rawConfigFolder+"/"+J2EEConstants.WEB_INF_CLASSES; //$NON-NLS-1$
- if( !outFolder.equals(expectedOutFolder) ){
- String message = ProjectSupportResourceHandler.getString( ProjectSupportResourceHandler.DYNAMIC_WEB_PERFORMANCE_VALIDATION,
- new Object[]{expectedOutFolder});
- return WTPCommonPlugin.createWarningStatus(message);
- }
- }
- return OK_STATUS;
- }
-}
diff --git a/plugins/org.eclipse.jst.j2ee.web/webproject/org/eclipse/jst/j2ee/web/project/facet/WebFacetInstallDelegate.java b/plugins/org.eclipse.jst.j2ee.web/webproject/org/eclipse/jst/j2ee/web/project/facet/WebFacetInstallDelegate.java
deleted file mode 100644
index f241213..0000000
--- a/plugins/org.eclipse.jst.j2ee.web/webproject/org/eclipse/jst/j2ee/web/project/facet/WebFacetInstallDelegate.java
+++ /dev/null
@@ -1,310 +0,0 @@
-/******************************************************************************
- * Copyright (c) 2005 BEA Systems, Inc.
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
- *
- * Contributors:
- * Konstantin Komissarchik - initial API and implementation
- ******************************************************************************/
-
-package org.eclipse.jst.j2ee.web.project.facet;
-
-import java.io.ByteArrayInputStream;
-import java.io.UnsupportedEncodingException;
-import java.lang.reflect.InvocationTargetException;
-import java.util.Arrays;
-import java.util.List;
-
-import org.eclipse.core.commands.ExecutionException;
-import org.eclipse.core.resources.IContainer;
-import org.eclipse.core.resources.IFile;
-import org.eclipse.core.resources.IFolder;
-import org.eclipse.core.resources.IProject;
-import org.eclipse.core.resources.IWorkspace;
-import org.eclipse.core.resources.ResourcesPlugin;
-import org.eclipse.core.runtime.CoreException;
-import org.eclipse.core.runtime.IPath;
-import org.eclipse.core.runtime.IProgressMonitor;
-import org.eclipse.core.runtime.Path;
-import org.eclipse.jdt.core.IClasspathEntry;
-import org.eclipse.jdt.core.IJavaProject;
-import org.eclipse.jdt.core.JavaCore;
-import org.eclipse.jst.common.project.facet.WtpUtils;
-import org.eclipse.jst.common.project.facet.core.ClasspathHelper;
-import org.eclipse.jst.j2ee.internal.J2EEConstants;
-import org.eclipse.jst.j2ee.internal.common.J2EEVersionUtil;
-import org.eclipse.jst.j2ee.internal.common.classpath.J2EEComponentClasspathContainer;
-import org.eclipse.jst.j2ee.internal.web.classpath.WebAppLibrariesContainer;
-import org.eclipse.jst.j2ee.internal.web.plugin.WebPlugin;
-import org.eclipse.jst.j2ee.model.IModelProvider;
-import org.eclipse.jst.j2ee.model.ModelProviderManager;
-import org.eclipse.jst.j2ee.project.facet.IJ2EEFacetInstallDataModelProperties;
-import org.eclipse.jst.j2ee.project.facet.IJ2EEModuleFacetInstallDataModelProperties;
-import org.eclipse.jst.j2ee.project.facet.J2EEFacetInstallDelegate;
-import org.eclipse.jst.j2ee.web.componentcore.util.WebArtifactEdit;
-import org.eclipse.jst.javaee.core.DisplayName;
-import org.eclipse.jst.javaee.core.JavaeeFactory;
-import org.eclipse.jst.javaee.web.WebApp;
-import org.eclipse.jst.javaee.web.WebFactory;
-import org.eclipse.jst.javaee.web.WelcomeFileList;
-import org.eclipse.wst.common.componentcore.ComponentCore;
-import org.eclipse.wst.common.componentcore.datamodel.FacetDataModelProvider;
-import org.eclipse.wst.common.componentcore.resources.IVirtualComponent;
-import org.eclipse.wst.common.componentcore.resources.IVirtualFile;
-import org.eclipse.wst.common.componentcore.resources.IVirtualFolder;
-import org.eclipse.wst.common.componentcore.resources.IVirtualResource;
-import org.eclipse.wst.common.frameworks.datamodel.IDataModel;
-import org.eclipse.wst.common.frameworks.datamodel.IDataModelOperation;
-import org.eclipse.wst.common.project.facet.core.IDelegate;
-import org.eclipse.wst.common.project.facet.core.IProjectFacetVersion;
-
-public final class WebFacetInstallDelegate extends J2EEFacetInstallDelegate implements IDelegate {
-
- public void execute(final IProject project, final IProjectFacetVersion fv, final Object cfg, final IProgressMonitor monitor) throws CoreException {
- if (monitor != null) {
- monitor.beginTask("", 1); //$NON-NLS-1$
- }
-
- try {
- final IDataModel model = (IDataModel) cfg;
-
- final IJavaProject jproj = JavaCore.create(project);
-
- // Add WTP natures.
-
- WtpUtils.addNatures(project);
-
- // Create the directory structure.
-
- final IWorkspace ws = ResourcesPlugin.getWorkspace();
- final IPath pjpath = project.getFullPath();
-
- final IPath contentdir = setContentPropertyIfNeeded(model, pjpath, project);
- mkdirs(ws.getRoot().getFolder(contentdir));
-
- final IPath webinf = contentdir.append("WEB-INF"); //$NON-NLS-1$
- IFolder webinfFolder = ws.getRoot().getFolder(webinf);
- mkdirs(webinfFolder);
-
- final IPath webinflib = webinf.append("lib"); //$NON-NLS-1$
- mkdirs(ws.getRoot().getFolder(webinflib));
-
- // Setup the flexible project structure.
-
- final IVirtualComponent c = ComponentCore.createComponent(project, false);
-
- c.create(0, null);
-
- String contextRoot = model.getStringProperty(IWebFacetInstallDataModelProperties.CONTEXT_ROOT);
- setContextRootPropertyIfNeeded(c, contextRoot);
- setOutputFolder(model, c);
-
- final IVirtualFolder webroot = c.getRootFolder();
- if (webroot.getProjectRelativePath().equals(new Path("/"))) //$NON-NLS-1$
- webroot.createLink(new Path("/" + model.getStringProperty(IJ2EEModuleFacetInstallDataModelProperties.CONFIG_FOLDER)), 0, null); //$NON-NLS-1$
-
- if( fv == WebFacetUtils.WEB_30 )
- {
- if(model.getBooleanProperty(IJ2EEFacetInstallDataModelProperties.GENERATE_DD)){
- createWeb30DeploymentDescriptor(project, fv, webinfFolder, monitor);
- }
- }
- else if( fv == WebFacetUtils.WEB_25 )
- {
- if(model.getBooleanProperty(IJ2EEFacetInstallDataModelProperties.GENERATE_DD)){
- createWeb25DeploymentDescriptor(project, fv, webinfFolder, monitor);
- }
- }
- else
- {
- // Create the deployment descriptor (web.xml) if one doesn't exist
- if (!webinfFolder.getFile("web.xml").exists()) { //$NON-NLS-1$
- String ver = fv.getVersionString();
- int nVer = J2EEVersionUtil.convertVersionStringToInt(ver);
- WebArtifactEdit.createDeploymentDescriptor(project, nVer);
- }
- }
-
- // Set entries for src folders
- final IVirtualFolder jsrc = c.getRootFolder().getFolder("/WEB-INF/classes"); //$NON-NLS-1$
- final IClasspathEntry[] cp = jproj.getRawClasspath();
- for (int i = 0; i < cp.length; i++) {
- final IClasspathEntry cpe = cp[i];
- if (cpe.getEntryKind() == IClasspathEntry.CPE_SOURCE) {
- if( cpe.getPath().removeFirstSegments(1).segmentCount() > 0 ){
- try{
- IFolder srcFolder = ws.getRoot().getFolder(cpe.getPath());
-
- IVirtualResource[] virtualResource = ComponentCore.createResources(srcFolder);
- //create link for source folder only when it is not mapped
- if( virtualResource.length == 0 ){
- jsrc.createLink(cpe.getPath().removeFirstSegments(1), 0, null);
- }
- }
- catch(Exception e){
- WebPlugin.logError(e);
- }
- }
- }
- }
-
- IVirtualFile vf = c.getRootFolder().getFile(new Path(J2EEConstants.MANIFEST_URI));
- IFile manifestmf = vf.getUnderlyingFile();
- if (manifestmf == null || !manifestmf.exists()) {
- try {
- createManifest(project, c.getRootFolder().getUnderlyingFolder(), monitor);
- } catch (InvocationTargetException e) {
- WebPlugin.logError(e);
- } catch (InterruptedException e) {
- WebPlugin.logError(e);
- }
- }
-
- // Setup the classpath.
-
- ClasspathHelper.removeClasspathEntries(project, fv);
-
- if (!ClasspathHelper.addClasspathEntries(project, fv)) {
- // TODO: Support the no runtime case.
- // ClasspathHelper.addClasspathEntries( project, fv, <something> );
- }
-
- // Add the web libraries container.
-
- if( model.getBooleanProperty(IWebFacetInstallDataModelProperties.INSTALL_WEB_LIBRARY)){
- final IPath webLibContainer = new Path(WebAppLibrariesContainer.CONTAINER_ID);
- addToClasspath(jproj, JavaCore.newContainerEntry(webLibContainer));
- }
-
- if( model.getBooleanProperty(IJ2EEModuleFacetInstallDataModelProperties.INSTALL_EAR_LIBRARY)){
- final IPath earLibContainer = new Path(J2EEComponentClasspathContainer.CONTAINER_ID);
- addToClasspath(jproj, JavaCore.newContainerEntry(earLibContainer));
- }
-
- try {
- ((IDataModelOperation) model.getProperty(FacetDataModelProvider.NOTIFICATION_OPERATION)).execute(monitor, null);
- } catch (ExecutionException e) {
- WebPlugin.logError(e);
- }
-
- if (monitor != null) {
- monitor.worked(1);
- }
- } finally {
- if (monitor != null) {
- monitor.done();
- }
- }
- }
-
-
- private void setContextRootPropertyIfNeeded(final IVirtualComponent c, String contextRoot) {
- String existing = c.getMetaProperties().getProperty("context-root"); //$NON-NLS-1$
- if (existing == null)
- c.setMetaProperty("context-root", contextRoot); //$NON-NLS-1$
- }
-
- private IPath setContentPropertyIfNeeded(final IDataModel model, final IPath pjpath, IProject project) {
- IVirtualComponent c = ComponentCore.createComponent(project, false);
- if (c.exists()) {
- if( !c.getRootFolder().getProjectRelativePath().isRoot() ){
- return c.getRootFolder().getUnderlyingResource().getFullPath();
- }
- }
- return pjpath.append(model.getStringProperty(IJ2EEModuleFacetInstallDataModelProperties.CONFIG_FOLDER));
- }
-
- private void createWeb30DeploymentDescriptor(final IProject project, final IProjectFacetVersion fv,
- IFolder webinfFolder, IProgressMonitor monitor) throws CoreException {
- // Create the deployment descriptor (web.xml) if one doesn't exist
- IFile webxmlFile = webinfFolder.getFile("web.xml"); //$NON-NLS-1$
- if (!webxmlFile.exists()) {
- try {
- // Create a minimal web.xml file, so the model can be initialized
- final String webXmlContents = "<?xml version=\"1.0\" encoding=\"UTF-8\"?>\n<web-app id=\"WebApp_ID\" version=\"3.0\" xmlns=\"http://java.sun.com/xml/ns/javaee\" xmlns:xsi=\"http://www.w3.org/2001/XMLSchema-instance\" xsi:schemaLocation=\"http://java.sun.com/xml/ns/javaee http://java.sun.com/xml/ns/javaee/web-app_3_0.xsd\">\n</web-app>"; //$NON-NLS-1$
- webxmlFile.create(new ByteArrayInputStream(webXmlContents.getBytes("UTF-8")), true, monitor); //$NON-NLS-1$
-
- populateDefaultContent(project, fv);
- } catch (UnsupportedEncodingException e) {
- WebPlugin.logError(e);
- }
- }
- }
-
- private void createWeb25DeploymentDescriptor(final IProject project, final IProjectFacetVersion fv,
- IFolder webinfFolder, IProgressMonitor monitor) throws CoreException {
- // Create the deployment descriptor (web.xml) if one doesn't exist
- IFile webxmlFile = webinfFolder.getFile("web.xml"); //$NON-NLS-1$
- if (!webxmlFile.exists()) {
- try {
- // Create a minimal web.xml file, so the model can be initialized
- final String webXmlContents = "<?xml version=\"1.0\" encoding=\"UTF-8\"?>\n<web-app id=\"WebApp_ID\" version=\"2.5\" xmlns=\"http://java.sun.com/xml/ns/javaee\" xmlns:xsi=\"http://www.w3.org/2001/XMLSchema-instance\" xsi:schemaLocation=\"http://java.sun.com/xml/ns/javaee http://java.sun.com/xml/ns/javaee/web-app_2_5.xsd\">\n</web-app>"; //$NON-NLS-1$
- webxmlFile.create(new ByteArrayInputStream(webXmlContents.getBytes("UTF-8")), true, monitor); //$NON-NLS-1$
-
- populateDefaultContent(project, fv);
- } catch (UnsupportedEncodingException e) {
- WebPlugin.logError(e);
- }
- }
- }
-
-
- private void populateDefaultContent(final IProject project,
- final IProjectFacetVersion fv) {
- final IModelProvider provider = ModelProviderManager.getModelProvider(project, fv);
- Runnable runnable = new Runnable(){
-
- public void run() {
- WebApp webApp = (WebApp) provider.getModelObject();
-
- // Add the display-name tag
- DisplayName displayName = JavaeeFactory.eINSTANCE.createDisplayName();
- displayName.setValue(project.getName());
- webApp.getDisplayNames().add(displayName);
-
- // welcome file list
- List<String> welcomeFiles = Arrays.asList(
- "index.html", //$NON-NLS-1$
- "index.htm", //$NON-NLS-1$
- "index.jsp", //$NON-NLS-1$
- "default.html", //$NON-NLS-1$
- "default.htm", //$NON-NLS-1$
- "default.jsp" //$NON-NLS-1$
- );
-
- // Add the welcome-file-list tag
- WelcomeFileList welcomeFileList = WebFactory.eINSTANCE.createWelcomeFileList();
- welcomeFileList.getWelcomeFiles().addAll(welcomeFiles);
- webApp.getWelcomeFileLists().add(welcomeFileList);
- }
- };
- provider.modify(runnable, null);
- }
-
-
- private static void mkdirs(final IFolder folder)
-
- throws CoreException
-
- {
- if (!folder.exists()) {
- if (folder.getParent() instanceof IFolder) {
- mkdirs((IFolder) folder.getParent());
- }
-
- folder.create(true, true, null);
- }
- else
- {
- IContainer x = folder;
-
- while( x instanceof IFolder && x.isDerived() )
- {
- x.setDerived( false );
- x = x.getParent();
- }
- }
- }
-}
diff --git a/plugins/org.eclipse.jst.j2ee.web/webproject/org/eclipse/jst/j2ee/web/project/facet/WebFacetInstallDelegateForWebFragmentProjects.java b/plugins/org.eclipse.jst.j2ee.web/webproject/org/eclipse/jst/j2ee/web/project/facet/WebFacetInstallDelegateForWebFragmentProjects.java
deleted file mode 100644
index 193bb92..0000000
--- a/plugins/org.eclipse.jst.j2ee.web/webproject/org/eclipse/jst/j2ee/web/project/facet/WebFacetInstallDelegateForWebFragmentProjects.java
+++ /dev/null
@@ -1,220 +0,0 @@
-/*******************************************************************************
-
- * Copyright (c) 2010 IBM Corporation and others.
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
- *
- * Contributors:
- * IBM Corporation - initial API and implementation
- *******************************************************************************/
-
-package org.eclipse.jst.j2ee.web.project.facet;
-
-import java.util.ArrayList;
-import java.util.Collection;
-import java.util.Collections;
-import java.util.HashSet;
-import java.util.List;
-import java.util.Map;
-import java.util.Set;
-
-import org.eclipse.core.commands.ExecutionException;
-import org.eclipse.core.resources.IProject;
-import org.eclipse.core.runtime.CoreException;
-import org.eclipse.core.runtime.IProgressMonitor;
-import org.eclipse.core.runtime.Path;
-import org.eclipse.jdt.core.IClasspathEntry;
-import org.eclipse.jdt.core.IJavaProject;
-import org.eclipse.jem.util.UIContextDetermination;
-import org.eclipse.jem.util.emf.workbench.ProjectUtilities;
-import org.eclipse.jst.common.project.facet.JavaFacetUtils;
-import org.eclipse.jst.common.project.facet.core.JavaFacetInstallConfig;
-import org.eclipse.jst.j2ee.application.internal.operations.AddWebFragmentComponentToWebApplicationDataModelProvider;
-import org.eclipse.jst.j2ee.application.internal.operations.IAddWebFragmentComponentToWebApplicationDataModelProperties;
-import org.eclipse.jst.j2ee.internal.plugin.J2EEPlugin;
-import org.eclipse.jst.j2ee.internal.plugin.J2EEPreferences.Keys;
-import org.eclipse.jst.j2ee.project.facet.IJ2EEFacetConstants;
-import org.eclipse.wst.common.componentcore.ComponentCore;
-import org.eclipse.wst.common.componentcore.datamodel.properties.ICreateReferenceComponentsDataModelProperties;
-import org.eclipse.wst.common.componentcore.resources.IVirtualComponent;
-import org.eclipse.wst.common.frameworks.datamodel.DataModelFactory;
-import org.eclipse.wst.common.frameworks.datamodel.IDataModel;
-import org.eclipse.wst.common.internal.emf.resource.RendererFactory;
-import org.eclipse.wst.common.project.facet.core.FacetedProjectFramework;
-import org.eclipse.wst.common.project.facet.core.IFacetedProject;
-import org.eclipse.wst.common.project.facet.core.IFacetedProjectWorkingCopy;
-import org.eclipse.wst.common.project.facet.core.IProjectFacet;
-import org.eclipse.wst.common.project.facet.core.IProjectFacetVersion;
-import org.eclipse.wst.common.project.facet.core.runtime.IRuntime;
-import org.eclipse.wst.common.project.facet.core.runtime.IRuntimeComponent;
-import org.eclipse.wst.web.internal.facet.RuntimePresetMappingRegistry;
-
-public abstract class WebFacetInstallDelegateForWebFragmentProjects {
-
- protected static void addToClasspath(final IJavaProject jproj, final IClasspathEntry entry) throws CoreException {
- final IClasspathEntry[] existingEntries = jproj.getRawClasspath();
- for(IClasspathEntry existingEntry : existingEntries){
- if(existingEntry.equals(entry)){
- return;
- }
- }
- final IClasspathEntry[] updated = new IClasspathEntry[existingEntries.length + 1];
- System.arraycopy(existingEntries, 0, updated, 0, existingEntries.length);
- updated[existingEntries.length] = entry;
- jproj.setRawClasspath(updated, null);
- }
-
- protected void installWARFacet( final String j2eeVersionText,
- final String warProjectName,
- final IRuntime runtime,
- final IProgressMonitor monitor )
- {
- IProject project = ProjectUtilities.getProject(warProjectName);
- if( project.exists())
- return;
-
- IFacetedProjectWorkingCopy fpjwc = null;
- try
- {
- fpjwc = FacetedProjectFramework.createNewProject();
-
-
- fpjwc.setProjectName( warProjectName );
-
- if( runtime != null )
- {
- fpjwc.setTargetedRuntimes( Collections.singleton( runtime ) );
- }
- ArrayList <IProjectFacet> requiredFacets = new ArrayList<IProjectFacet>();
- requiredFacets.add(JavaFacetUtils.JAVA_FACET);
- requiredFacets.add(IJ2EEFacetConstants.DYNAMIC_WEB_FACET);
- final Collection<IProjectFacet> fixedFacets = requiredFacets;
- fpjwc.setFixedProjectFacets( new HashSet<IProjectFacet>( fixedFacets ) );
- //fpjwc.setFixedProjectFacets( Collections.singleton( JavaFacetUtils.JAVA_FACET) );
- fpjwc.setSelectedPreset( FacetedProjectFramework.DEFAULT_CONFIGURATION_PRESET_ID );
-
- if( j2eeVersionText != null )
- {
- final IProjectFacetVersion defaultWarFacetVersion
- = fpjwc.getProjectFacetVersion( IJ2EEFacetConstants.DYNAMIC_WEB_FACET );
-
- if( ! defaultWarFacetVersion.getVersionString().equals( j2eeVersionText ) )
- {
- String presetId = null;
-
- if( runtime != null )
- {
- for( IRuntimeComponent rc : runtime.getRuntimeComponents() )
- {
- presetId = RuntimePresetMappingRegistry.INSTANCE.getPresetID
- (
- rc.getRuntimeComponentType().getId(),
- rc.getRuntimeComponentVersion().getVersionString(),
- IJ2EEFacetConstants.DYNAMIC_WEB_FACET.getId(),
- j2eeVersionText
- );
-
- if( presetId != null )
- {
- break;
- }
- }
- }
-
- final IProjectFacetVersion warFacetVersion
- = IJ2EEFacetConstants.DYNAMIC_WEB_FACET.getVersion( j2eeVersionText );
-
-
-
- // Note that the next call is necessary even if a preset is going to be selected
- // later since it allows the dynamic preset to adjust for the war facet version.
- ArrayList <IProjectFacetVersion> requiredFacetVersions = new ArrayList<IProjectFacetVersion>();
- requiredFacetVersions.add(JavaFacetUtils.JAVA_FACET.getVersion("1.5")); //$NON-NLS-1$
- requiredFacetVersions.add(warFacetVersion);
- final Collection<IProjectFacetVersion> fixedFacetVersions = requiredFacetVersions;
- fpjwc.setProjectFacets( new HashSet<IProjectFacetVersion>( fixedFacetVersions ) );
-
- //fpjwc.setProjectFacets( Collections.singleton( warFacetVersion ) );
-
- if( presetId != null )
- {
- fpjwc.setSelectedPreset( presetId );
- }
- }
-
- Set<IFacetedProject.Action> actions = fpjwc.getProjectFacetActions();
- for(IFacetedProject.Action action: actions){
- Object actionConfig = action.getConfig();
- if( actionConfig instanceof JavaFacetInstallConfig){
- JavaFacetInstallConfig c = (JavaFacetInstallConfig) actionConfig;
- c.setDefaultOutputFolder(new Path(J2EEPlugin.getDefault().getJ2EEPreferences().getString(Keys.DYN_WEB_OUTPUT_FOLDER)));
- }
- }
- }
- try
- {
- fpjwc.commitChanges( null );
- }
- catch( CoreException e )
- {
- J2EEPlugin.logError( e );
- }
- }finally {
- if(fpjwc != null){
- fpjwc.dispose();
- }
- }
- }
-
- protected void addToWar(IVirtualComponent warComp, IVirtualComponent j2eeComp, String moduleURI ){
- final IDataModel dataModel = DataModelFactory.createDataModel(new AddWebFragmentComponentToWebApplicationDataModelProvider());
- Map map = (Map)dataModel.getProperty(IAddWebFragmentComponentToWebApplicationDataModelProperties.TARGET_COMPONENTS_TO_URI_MAP);
- map.put(j2eeComp, moduleURI);
-
- dataModel.setProperty(ICreateReferenceComponentsDataModelProperties.SOURCE_COMPONENT, warComp);
-
- List modList = (List) dataModel.getProperty(ICreateReferenceComponentsDataModelProperties.TARGET_COMPONENT_LIST);
- modList.add(j2eeComp);
- dataModel.setProperty(ICreateReferenceComponentsDataModelProperties.TARGET_COMPONENT_LIST, modList);
- dataModel.setProperty(ICreateReferenceComponentsDataModelProperties.TARGET_COMPONENTS_DEPLOY_PATH, "/WEB-INF/lib"); //$NON-NLS-1$
- try {
- dataModel.getDefaultOperation().execute(null, null);
- } catch (ExecutionException e) {
- J2EEPlugin.logError(e);
- }
- }
-
- protected void installAndAddModuletoWAR( String j2eeVersionText,
- String warProjectName,
- IRuntime runtime,
- IProject moduleProject,
- String moduleURI,
- IProgressMonitor monitor ){
-
- installWARFacet(j2eeVersionText,
- warProjectName,
- runtime,
- monitor);
-
- final IVirtualComponent c = ComponentCore.createComponent( moduleProject );
- final IProject warProject = ProjectUtilities.getProject( warProjectName );
- final IVirtualComponent warComp = ComponentCore.createComponent( warProject );
-
- if( UIContextDetermination.getCurrentContext() == UIContextDetermination.HEADLESS_CONTEXT ){
- boolean isValidating = RendererFactory.getDefaultRendererFactory().isValidating();
- try{
- if( isValidating ){
- RendererFactory.getDefaultRendererFactory().setValidating(false);
- }
- addToWar( warComp, c, moduleURI );
- }finally{
- RendererFactory.getDefaultRendererFactory().setValidating(isValidating);
- }
- }
- else{
- addToWar( warComp, c, moduleURI );
- }
- }
-}
diff --git a/plugins/org.eclipse.jst.j2ee.web/webproject/org/eclipse/jst/j2ee/web/project/facet/WebFacetPostInstallDelegate.java b/plugins/org.eclipse.jst.j2ee.web/webproject/org/eclipse/jst/j2ee/web/project/facet/WebFacetPostInstallDelegate.java
deleted file mode 100644
index fbb89f6..0000000
--- a/plugins/org.eclipse.jst.j2ee.web/webproject/org/eclipse/jst/j2ee/web/project/facet/WebFacetPostInstallDelegate.java
+++ /dev/null
@@ -1,72 +0,0 @@
-/******************************************************************************
- * Copyright (c) 2005 BEA Systems, Inc.
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
- *
- * Contributors:
- * Konstantin Komissarchik - initial API and implementation
- ******************************************************************************/
-
-package org.eclipse.jst.j2ee.web.project.facet;
-
-import static org.eclipse.jst.j2ee.project.facet.IJ2EEModuleFacetInstallDataModelProperties.ADD_TO_EAR;
-import static org.eclipse.jst.j2ee.project.facet.IJ2EEModuleFacetInstallDataModelProperties.EAR_PROJECT_NAME;
-import static org.eclipse.jst.j2ee.project.facet.IJ2EEModuleFacetInstallDataModelProperties.MODULE_URI;
-import static org.eclipse.wst.common.componentcore.datamodel.properties.IFacetDataModelProperties.FACETED_PROJECT_WORKING_COPY;
-
-import org.eclipse.core.resources.IProject;
-import org.eclipse.core.runtime.CoreException;
-import org.eclipse.core.runtime.IProgressMonitor;
-import org.eclipse.jst.j2ee.internal.common.J2EEVersionUtil;
-import org.eclipse.jst.j2ee.project.facet.J2EEFacetInstallDelegate;
-import org.eclipse.wst.common.frameworks.datamodel.IDataModel;
-import org.eclipse.wst.common.project.facet.core.IDelegate;
-import org.eclipse.wst.common.project.facet.core.IFacetedProjectWorkingCopy;
-import org.eclipse.wst.common.project.facet.core.IProjectFacetVersion;
-
-public final class WebFacetPostInstallDelegate extends J2EEFacetInstallDelegate implements IDelegate {
-
- public void execute(final IProject project, final IProjectFacetVersion fv, final Object cfg, final IProgressMonitor monitor) throws CoreException {
- if (monitor != null) {
- monitor.beginTask("", 1); //$NON-NLS-1$
- }
-
- try {
- final IDataModel model = (IDataModel) cfg;
-
- // Associate with an EAR, if necessary.
- if ( model.getBooleanProperty(ADD_TO_EAR) ) {
- final String earProjectName = model.getStringProperty(EAR_PROJECT_NAME);
-
- if ( earProjectName != null && !earProjectName.equals("") ) { //$NON-NLS-1$
-
- String ver = fv.getVersionString();
-
- String j2eeVersionText = J2EEVersionUtil.convertVersionIntToString(J2EEVersionUtil.convertWebVersionStringToJ2EEVersionID(ver));
- final String moduleURI = model.getStringProperty(MODULE_URI);
-
- final IFacetedProjectWorkingCopy fpjwc
- = (IFacetedProjectWorkingCopy) model.getProperty( FACETED_PROJECT_WORKING_COPY );
-
- installAndAddModuletoEAR( j2eeVersionText,
- earProjectName,
- fpjwc.getPrimaryRuntime(),
- project,
- moduleURI,
- monitor );
-
- }
- }
-
- if (monitor != null) {
- monitor.worked(1);
- }
- } finally {
- if (monitor != null) {
- monitor.done();
- }
- }
- }
-}
diff --git a/plugins/org.eclipse.jst.j2ee.web/webproject/org/eclipse/jst/j2ee/web/project/facet/WebFacetRuntimeChangedDelegate.java b/plugins/org.eclipse.jst.j2ee.web/webproject/org/eclipse/jst/j2ee/web/project/facet/WebFacetRuntimeChangedDelegate.java
deleted file mode 100644
index b03ee51..0000000
--- a/plugins/org.eclipse.jst.j2ee.web/webproject/org/eclipse/jst/j2ee/web/project/facet/WebFacetRuntimeChangedDelegate.java
+++ /dev/null
@@ -1,67 +0,0 @@
-/******************************************************************************
- * Copyright (c) 2005 BEA Systems, Inc.
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
- *
- * Contributors:
- * Konstantin Komissarchik - initial API and implementation
- ******************************************************************************/
-
-package org.eclipse.jst.j2ee.web.project.facet;
-
-import org.eclipse.core.resources.IProject;
-import org.eclipse.core.runtime.CoreException;
-import org.eclipse.core.runtime.IProgressMonitor;
-import org.eclipse.jst.common.project.facet.core.ClasspathHelper;
-import org.eclipse.wst.common.project.facet.core.IDelegate;
-import org.eclipse.wst.common.project.facet.core.IProjectFacetVersion;
-
-/**
- * @author <a href="mailto:kosta@bea.com">Konstantin Komissarchik</a>
- */
-
-public final class WebFacetRuntimeChangedDelegate
-
- implements IDelegate
-
-{
- public void execute( final IProject project,
- final IProjectFacetVersion fv,
- final Object cfg,
- final IProgressMonitor monitor )
-
- throws CoreException
-
- {
- if( monitor != null )
- {
- monitor.beginTask( "", 1 ); //$NON-NLS-1$
- }
-
- try
- {
- ClasspathHelper.removeClasspathEntries( project, fv );
-
- if( ! ClasspathHelper.addClasspathEntries( project, fv ) )
- {
- // TODO: Support the no runtime case.
- // ClasspathHelper.addClasspathEntries( project, fv, <something> );
- }
-
- if( monitor != null )
- {
- monitor.worked( 1 );
- }
- }
- finally
- {
- if( monitor != null )
- {
- monitor.done();
- }
- }
- }
-
-}
diff --git a/plugins/org.eclipse.jst.j2ee.web/webproject/org/eclipse/jst/j2ee/web/project/facet/WebFacetUtils.java b/plugins/org.eclipse.jst.j2ee.web/webproject/org/eclipse/jst/j2ee/web/project/facet/WebFacetUtils.java
deleted file mode 100644
index c53840d..0000000
--- a/plugins/org.eclipse.jst.j2ee.web/webproject/org/eclipse/jst/j2ee/web/project/facet/WebFacetUtils.java
+++ /dev/null
@@ -1,48 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2003, 2006 IBM Corporation and others.
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
- *
- * Contributors:
- * IBM Corporation - initial API and implementation
- *******************************************************************************/
-package org.eclipse.jst.j2ee.web.project.facet;
-
-import org.eclipse.jst.j2ee.project.facet.IJ2EEFacetConstants;
-import org.eclipse.wst.common.project.facet.core.IProjectFacet;
-import org.eclipse.wst.common.project.facet.core.IProjectFacetVersion;
-import org.eclipse.wst.common.project.facet.core.ProjectFacetsManager;
-
-public class WebFacetUtils {
-
- public static final IProjectFacet WEB_FACET = ProjectFacetsManager.getProjectFacet(IJ2EEFacetConstants.DYNAMIC_WEB);
- public static final IProjectFacet WEBFRAGMENT_FACET = ProjectFacetsManager.getProjectFacet(IJ2EEFacetConstants.WEBFRAGMENT);
- public static final IProjectFacetVersion WEB_22 = WEB_FACET.getVersion("2.2"); //$NON-NLS-1$
- public static final IProjectFacetVersion WEB_23 = WEB_FACET.getVersion("2.3"); //$NON-NLS-1$
- public static final IProjectFacetVersion WEB_24 = WEB_FACET.getVersion("2.4"); //$NON-NLS-1$
- public static final IProjectFacetVersion WEB_25 = WEB_FACET.getVersion("2.5"); //$NON-NLS-1$
- public static final IProjectFacetVersion WEB_30 = WEB_FACET.getVersion("3.0"); //$NON-NLS-1$
- public static final IProjectFacetVersion WEBFRAGMENT_30 = WEBFRAGMENT_FACET.getVersion("3.0"); //$NON-NLS-1$
-
- public static final IProjectFacet WEB_XDOCLET_FACET = getWebDocletFacet();
-
- public static IProjectFacet getProjectFacet(String id) {
- try {
- return ProjectFacetsManager.getProjectFacet(id);
- } catch (IllegalArgumentException e) {
- return null;
- }
- }
-
- private static IProjectFacet getWebDocletFacet() {
- try {
- return ProjectFacetsManager.getProjectFacet(IJ2EEFacetConstants.DYNAMIC_WEB_XDOCLET);
- } catch (IllegalArgumentException e) {
- // the web doclet facet is not defined
- return null;
- }
- }
-
-}
diff --git a/plugins/org.eclipse.jst.j2ee.web/webproject/org/eclipse/jst/j2ee/web/project/facet/WebFacetVersionChangeDelegate.java b/plugins/org.eclipse.jst.j2ee.web/webproject/org/eclipse/jst/j2ee/web/project/facet/WebFacetVersionChangeDelegate.java
deleted file mode 100644
index 278b892..0000000
--- a/plugins/org.eclipse.jst.j2ee.web/webproject/org/eclipse/jst/j2ee/web/project/facet/WebFacetVersionChangeDelegate.java
+++ /dev/null
@@ -1,108 +0,0 @@
-/******************************************************************************
- * Copyright (c) 2005 BEA Systems, Inc.
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
- *
- * Contributors:
- * Konstantin Komissarchik - initial API and implementation
- ******************************************************************************/
-
-package org.eclipse.jst.j2ee.web.project.facet;
-
-import org.eclipse.core.resources.IProject;
-import org.eclipse.core.runtime.CoreException;
-import org.eclipse.core.runtime.IProgressMonitor;
-import org.eclipse.jst.common.project.facet.core.ClasspathHelper;
-import org.eclipse.wst.common.project.facet.core.IDelegate;
-import org.eclipse.wst.common.project.facet.core.IFacetedProject;
-import org.eclipse.wst.common.project.facet.core.IProjectFacetVersion;
-import org.eclipse.wst.common.project.facet.core.ProjectFacetsManager;
-
-/**
- * @author <a href="mailto:kosta@bea.com">Konstantin Komissarchik</a>
- */
-
-public final class WebFacetVersionChangeDelegate
-
- implements IDelegate
-
-{
- public void execute( final IProject project,
- final IProjectFacetVersion fv,
- final Object cfg,
- final IProgressMonitor monitor )
-
- throws CoreException
-
- {
- if( monitor != null )
- {
- monitor.beginTask( "", 1 ); //$NON-NLS-1$
- }
-
- try
- {
- // Find the version that's currently installed.
-
- final IFacetedProject fproj
- = ProjectFacetsManager.create( project );
-
- final IProjectFacetVersion oldver
- = fproj.getInstalledVersion( fv.getProjectFacet() );
-
- // Reset the classpath.
-
- ClasspathHelper.removeClasspathEntries( project, oldver );
-
- if( ! ClasspathHelper.addClasspathEntries( project, fv ) )
- {
- // TODO: Support the no runtime case.
- // ClasspathHelper.addClasspathEntries( project, fv, <something> );
- }
-
- // Update the component version.
-
-
-// final IVirtualComponent c = ComponentCore.createComponent(project);
-
-// final StructureEdit edit
-// = StructureEdit.getStructureEditForWrite( project );
-//
-// try
-// {
-// final ComponentType oldctype
-// = StructureEdit.getComponentType( c );
-//
-// final ComponentType newctype
-// = ComponentcoreFactory.eINSTANCE.createComponentType();
-//
-// newctype.setComponentTypeId( oldctype.getComponentTypeId() );
-// newctype.setVersion( fv.getVersionString() );
-// newctype.getProperties().addAll( oldctype.getProperties() );
-//
-// StructureEdit.setComponentType( c, newctype );
-//
-// edit.saveIfNecessary( null );
-// }
-// finally
-// {
-// edit.dispose();
-// }
-
- if( monitor != null )
- {
- monitor.worked( 1 );
- }
- }
- finally
- {
- if( monitor != null )
- {
- monitor.done();
- }
- }
- }
-
-}
diff --git a/plugins/org.eclipse.jst.j2ee.web/webproject/org/eclipse/jst/j2ee/web/project/facet/WebFragmentFacetInstallDataModelProvider.java b/plugins/org.eclipse.jst.j2ee.web/webproject/org/eclipse/jst/j2ee/web/project/facet/WebFragmentFacetInstallDataModelProvider.java
deleted file mode 100644
index 69e0daf..0000000
--- a/plugins/org.eclipse.jst.j2ee.web/webproject/org/eclipse/jst/j2ee/web/project/facet/WebFragmentFacetInstallDataModelProvider.java
+++ /dev/null
@@ -1,252 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2010 IBM Corporation and others.
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
- *
- * Contributors:
- * IBM Corporation - initial API and implementation
- *******************************************************************************/
-package org.eclipse.jst.j2ee.web.project.facet;
-
-import java.util.ArrayList;
-import java.util.Set;
-
-import org.eclipse.core.internal.resources.ResourceStatus;
-import org.eclipse.core.internal.utils.Messages;
-import org.eclipse.core.resources.IProject;
-import org.eclipse.core.resources.IResource;
-import org.eclipse.core.resources.IResourceStatus;
-import org.eclipse.core.resources.IWorkspace;
-import org.eclipse.core.resources.ResourcesPlugin;
-import org.eclipse.core.runtime.CoreException;
-import org.eclipse.core.runtime.IPath;
-import org.eclipse.core.runtime.IStatus;
-import org.eclipse.core.runtime.NullProgressMonitor;
-import org.eclipse.core.runtime.Path;
-import org.eclipse.jem.util.emf.workbench.ProjectUtilities;
-import org.eclipse.jst.common.project.facet.IJavaFacetInstallDataModelProperties;
-import org.eclipse.jst.j2ee.internal.common.J2EEVersionUtil;
-import org.eclipse.jst.j2ee.internal.plugin.IJ2EEModuleConstants;
-import org.eclipse.jst.j2ee.internal.plugin.J2EEPlugin;
-import org.eclipse.jst.j2ee.internal.plugin.J2EEPreferences;
-import org.eclipse.jst.j2ee.internal.project.J2EEProjectUtilities;
-import org.eclipse.jst.j2ee.project.JavaEEProjectUtilities;
-import org.eclipse.jst.j2ee.project.facet.IJ2EEFacetConstants;
-import org.eclipse.jst.j2ee.project.facet.J2EEModuleFacetInstallDataModelProvider;
-import org.eclipse.osgi.util.NLS;
-import org.eclipse.wst.common.componentcore.ComponentCore;
-import org.eclipse.wst.common.componentcore.ModuleCoreNature;
-import org.eclipse.wst.common.componentcore.datamodel.properties.IFacetProjectCreationDataModelProperties;
-import org.eclipse.wst.common.componentcore.datamodel.properties.IFacetProjectCreationDataModelProperties.FacetDataModelMap;
-import org.eclipse.wst.common.componentcore.resources.IVirtualComponent;
-import org.eclipse.wst.common.frameworks.datamodel.DataModelPropertyDescriptor;
-import org.eclipse.wst.common.frameworks.datamodel.IDataModel;
-import org.eclipse.wst.common.project.facet.core.IFacetedProject;
-import org.eclipse.wst.common.project.facet.core.IProjectFacetVersion;
-import org.eclipse.wst.common.project.facet.core.ProjectFacetsManager;
-import org.eclipse.wst.common.project.facet.core.runtime.IRuntime;
-
-public class WebFragmentFacetInstallDataModelProvider extends J2EEModuleFacetInstallDataModelProvider implements IWebFragmentFacetInstallDataModelProperties {
-
- public WebFragmentFacetInstallDataModelProvider() {
- super();
- }
-
-
- @Override
- public Set<String> getPropertyNames() {
- Set<String> names = super.getPropertyNames();
- names.add(CONTENT_DIR);
- names.add(ADD_TO_WAR);
- names.add(WAR_PROJECT_NAME);
- names.add(LAST_WAR_NAME);
- return names;
- }
-
- @Override
- public Object getDefaultProperty(String propertyName) {
- if (propertyName.equals(CONTENT_DIR)) {
- return ""; //$NON-NLS-1$
- } else if (propertyName.equals(FACET_ID)) {
- return WEBFRAGMENT;
- }else if (propertyName.equals(ADD_TO_EAR)) {
- return false;
- }else if (propertyName.equals(ADD_TO_WAR)) {
- return true;
- }else if (propertyName.equals(MODULE_URI)) {
- String projectName = model.getStringProperty(FACET_PROJECT_NAME).replace(' ', '_');
- return projectName + IJ2EEModuleConstants.JAR_EXT;
- }else if (propertyName.equals(ADD_TO_WAR)) {
- return new Boolean( J2EEPlugin.getDefault().getJ2EEPreferences().getBoolean(J2EEPreferences.Keys.ADD_TO_EAR_BY_DEFAULT) && isWARSupportedByRuntime());
- } else if (propertyName.equals(WAR_PROJECT_NAME)) {
- if (model.isPropertySet(LAST_WAR_NAME)) {
- IProject project = ProjectUtilities.getProject(getStringProperty(LAST_WAR_NAME));
- if (project.exists() && project.isAccessible())
- return project.getName();
- }
- DataModelPropertyDescriptor[] descs = getValidPropertyDescriptors(WAR_PROJECT_NAME);
- if (descs.length > 0) {
- DataModelPropertyDescriptor desc = descs[0];
- String eARName = desc.getPropertyDescription();
- if (eARName != null && !eARName.equals("")) { //$NON-NLS-1$
- return eARName;
- }
- return getDataModel().getStringProperty(FACET_PROJECT_NAME) + "WAR"; //$NON-NLS-1$
- }
- return getDataModel().getStringProperty(FACET_PROJECT_NAME) + "WAR"; //$NON-NLS-1$
- }
- return super.getDefaultProperty(propertyName);
- }
-
-
- @Override
- public IStatus validate(String name) {
-
- if (name.equals(CONTENT_DIR)) {
- String folderName = model.getStringProperty(CONTENT_DIR);
- IStatus status = validateFolderName(folderName);
- if (status.isOK())
- {
- if (folderName.indexOf('#') != -1) {
- String message = NLS.bind(Messages.resources_invalidCharInName, "#", folderName); //$NON-NLS-1$
- status = new ResourceStatus(IResourceStatus.INVALID_VALUE, null, message);
- }
- }
- return status;
- }
-
- return super.validate(name);
- }
-
-
- @Override
- protected IStatus validateFolderName(String folderName) {
- // the directory is not required, but if the name is entered ensure that it
- // contains only valid characters.
- if (folderName == null || folderName.length() == 0) {
- return OK_STATUS;
- }
- IWorkspace workspace = ResourcesPlugin.getWorkspace();
- IPath path = new Path(folderName);
- for (int i = 0, max = path.segmentCount(); i < max; i++) {
- IStatus status = workspace.validateName(path.segment(i), IResource.FOLDER);
- if (! status.isOK())
- return status;
- }
-
- // all of the potential segments of the folder have been verified
- return OK_STATUS;
- }
-
- private boolean isWARSupportedByRuntime() {
- boolean ret = true;
- IRuntime rt = (IRuntime) model.getProperty(IFacetProjectCreationDataModelProperties.FACET_RUNTIME);
- if (rt != null)
- ret = rt.supports(IJ2EEFacetConstants.DYNAMIC_WEB_FACET);
- return ret;
- }
-
- @Override
- public DataModelPropertyDescriptor[] getValidPropertyDescriptors(String propertyName) {
- if (WAR_PROJECT_NAME.equals(propertyName)) {
- int j2eeVersion = J2EEVersionUtil.convertVersionStringToInt(((IProjectFacetVersion) getProperty(FACET_VERSION)).getVersionString());
- return getWebAppPropertyDescriptors(j2eeVersion);
- }
- return super.getValidPropertyDescriptors(propertyName);
- }
-
-
- @Override
- public boolean propertySet(String propertyName, Object propertyValue) {
- if (FACET_PROJECT_NAME.equals(propertyName)) {
- if (getBooleanProperty(ADD_TO_WAR)) {
- if (!model.isPropertySet(WAR_PROJECT_NAME)) {
- model.notifyPropertyChange(WAR_PROJECT_NAME, IDataModel.DEFAULT_CHG);
- }
- }
- } else if (FACET_VERSION.equals(propertyName)) {
- model.notifyPropertyChange(WAR_PROJECT_NAME, IDataModel.VALID_VALUES_CHG);
- } else if (propertyName.equals(CONFIG_FOLDER)) {
- IDataModel masterModel = (IDataModel) model.getProperty(MASTER_PROJECT_DM);
- if (masterModel != null) {
- FacetDataModelMap map = (FacetDataModelMap) masterModel.getProperty(IFacetProjectCreationDataModelProperties.FACET_DM_MAP);
- IDataModel javaModel = map.getFacetDataModel(JAVA);
- if (javaModel != null) {
- javaModel.setProperty(IJavaFacetInstallDataModelProperties.SOURCE_FOLDER_NAME, propertyValue);
- }
- }
- } else if ((WAR_PROJECT_NAME.equals(propertyName) || ADD_TO_WAR.equals(propertyName) || LAST_WAR_NAME.equals(propertyName)) && getBooleanProperty(ADD_TO_WAR)) {
- //ValidateEAR really does general checks for project name. So its applicable here too.
- IStatus status = validateEAR(model.getStringProperty(WAR_PROJECT_NAME));
- if (status.isOK()) {
- IProject project = ProjectUtilities.getProject(getStringProperty(WAR_PROJECT_NAME));
- if (project.exists() && project.isAccessible() && JavaEEProjectUtilities.isDynamicWebProject(project)) {
- try {
- IFacetedProject facetProj = ProjectFacetsManager.create(project, false, new NullProgressMonitor());
- setProperty(FACET_RUNTIME, facetProj.getRuntime());
- } catch (CoreException e) {
- J2EEPlugin.logError(e);
- }
- }
- }
- model.notifyPropertyChange(FACET_RUNTIME, IDataModel.ENABLE_CHG);
- } else if (propertyName.equals(IFacetProjectCreationDataModelProperties.FACET_RUNTIME)) {
- model.notifyPropertyChange(ADD_TO_WAR, IDataModel.VALID_VALUES_CHG);
- model.notifyPropertyChange(WAR_PROJECT_NAME, IDataModel.VALID_VALUES_CHG);
- }
-
- if (ADD_TO_WAR.equals(propertyName)) {
- IStatus stat = model.validateProperty(propertyName);
- if (stat != OK_STATUS) {
- return true;
- }
- model.notifyPropertyChange(WAR_PROJECT_NAME, IDataModel.VALID_VALUES_CHG);
- }
-
-
- return super.propertySet(propertyName, propertyValue);
- }
-
- private DataModelPropertyDescriptor[] getWebAppPropertyDescriptors(int webAppVersion) {
- ArrayList webAppDescriptorList = new ArrayList();
-
- IProject[] projs = ProjectUtilities.getAllProjects();
-
- for (int index = 0; index < projs.length; index++) {
- IProject flexProject = projs[index];
- if (flexProject != null) {
- if (ModuleCoreNature.isFlexibleProject(flexProject)) {
- IVirtualComponent comp = ComponentCore.createComponent(flexProject);
- if (JavaEEProjectUtilities.isDynamicWebProject(comp.getProject())) {
- String sVer = J2EEProjectUtilities.getJ2EEProjectVersion(comp.getProject());
- int ver = J2EEVersionUtil.convertVersionStringToInt(sVer);
- if (webAppVersion <= ver) {
- DataModelPropertyDescriptor desc = new DataModelPropertyDescriptor(comp.getProject().getName());
- webAppDescriptorList.add(desc);
- }
- }
- }
- }
- }
- DataModelPropertyDescriptor[] descriptors = new DataModelPropertyDescriptor[webAppDescriptorList.size()];
- for (int i = 0; i < descriptors.length; i++) {
- DataModelPropertyDescriptor desc = (DataModelPropertyDescriptor) webAppDescriptorList.get(i);
- descriptors[i] = new DataModelPropertyDescriptor(desc.getPropertyDescription(), desc.getPropertyDescription());
- }
- return descriptors;
- }
-
- @Override
- public boolean isPropertyEnabled(String propertyName) {
- if (ADD_TO_WAR.equals(propertyName)) {
- return isWARSupportedByRuntime();
- }
- if (WAR_PROJECT_NAME.equals(propertyName)) {
- return isWARSupportedByRuntime() && getBooleanProperty(ADD_TO_WAR);
- }
- return super.isPropertyEnabled(propertyName);
- }
-
-}
diff --git a/plugins/org.eclipse.jst.j2ee.web/webproject/org/eclipse/jst/j2ee/web/project/facet/WebFragmentFacetInstallDelegate.java b/plugins/org.eclipse.jst.j2ee.web/webproject/org/eclipse/jst/j2ee/web/project/facet/WebFragmentFacetInstallDelegate.java
deleted file mode 100644
index b4d3e7a..0000000
--- a/plugins/org.eclipse.jst.j2ee.web/webproject/org/eclipse/jst/j2ee/web/project/facet/WebFragmentFacetInstallDelegate.java
+++ /dev/null
@@ -1,152 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2010 IBM Corporation and others.
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
- *
- * Contributors:
- * IBM Corporation - initial API and implementation
- *******************************************************************************/
-package org.eclipse.jst.j2ee.web.project.facet;
-
-import java.io.IOException;
-import java.lang.reflect.InvocationTargetException;
-import java.util.regex.Pattern;
-
-import org.eclipse.core.commands.ExecutionException;
-import org.eclipse.core.internal.resources.XMLWriter;
-import org.eclipse.core.resources.IContainer;
-import org.eclipse.core.resources.IFile;
-import org.eclipse.core.resources.IProject;
-import org.eclipse.core.runtime.CoreException;
-import org.eclipse.core.runtime.IPath;
-import org.eclipse.core.runtime.IProgressMonitor;
-import org.eclipse.core.runtime.Path;
-import org.eclipse.jdt.core.IClasspathEntry;
-import org.eclipse.jdt.core.IJavaProject;
-import org.eclipse.jdt.core.JavaCore;
-import org.eclipse.jem.util.emf.workbench.WorkbenchByteArrayOutputStream;
-import org.eclipse.jst.common.project.facet.WtpUtils;
-import org.eclipse.jst.common.project.facet.core.ClasspathHelper;
-import org.eclipse.jst.j2ee.internal.J2EEConstants;
-import org.eclipse.jst.j2ee.internal.plugin.J2EEPlugin;
-import org.eclipse.jst.j2ee.internal.project.ManifestFileCreationAction;
-import org.eclipse.jst.j2ee.internal.web.plugin.WebPlugin;
-import org.eclipse.wst.common.componentcore.ComponentCore;
-import org.eclipse.wst.common.componentcore.datamodel.FacetDataModelProvider;
-import org.eclipse.wst.common.componentcore.resources.IVirtualComponent;
-import org.eclipse.wst.common.componentcore.resources.IVirtualFolder;
-import org.eclipse.wst.common.frameworks.datamodel.IDataModel;
-import org.eclipse.wst.common.frameworks.datamodel.IDataModelOperation;
-import org.eclipse.wst.common.project.facet.core.IDelegate;
-import org.eclipse.wst.common.project.facet.core.IProjectFacetVersion;
-
-public class WebFragmentFacetInstallDelegate implements IDelegate {
-
- public void execute(IProject project, IProjectFacetVersion fv, Object config, IProgressMonitor monitor) throws CoreException {
- if (monitor != null)
- monitor.beginTask("", 1); //$NON-NLS-1$
- try {
- IDataModel model = (IDataModel) config;
- WtpUtils.addNatures(project);
- final IVirtualComponent c = ComponentCore.createComponent(project, false);
- c.create(0, null);
- final IVirtualFolder jsrc = c.getRootFolder();
- final IJavaProject jproj = JavaCore.create(project);
- final IClasspathEntry[] cp = jproj.getRawClasspath();
- for (int i = 0; i < cp.length; i++) {
- final IClasspathEntry cpe = cp[i];
-
- if (cpe.getEntryKind() == IClasspathEntry.CPE_SOURCE) {
- IPath path = cpe.getPath().removeFirstSegments(1);
- if (path.isEmpty()) {
- path = new Path("/"); //$NON-NLS-1$
- }
- jsrc.createLink(path, 0, null);
- }
- }
- final IVirtualFolder root = c.getRootFolder();
- IContainer container = null;
- if (root.getProjectRelativePath().segmentCount() == 0) {
- container = project;
- } else {
- container = root.getUnderlyingFolder();
- }
- try {
- if (container != null) {
- createWebFragmentFile(project, fv, container, monitor);
- createManifest (project, container, monitor);
- }
- } catch (InvocationTargetException e) {
- J2EEPlugin.logError(e);
- } catch (InterruptedException e) {
- J2EEPlugin.logError(e);
- }
- ClasspathHelper.removeClasspathEntries(project, fv);
- if (!ClasspathHelper.addClasspathEntries(project, fv)) {
- // TODO: Support the no runtime case.
- // ClasspathHelper.addClasspathEntries( project, fv, <something> );
- }
- try {
- ((IDataModelOperation) model.getProperty(FacetDataModelProvider.NOTIFICATION_OPERATION)).execute(monitor, null);
- } catch (ExecutionException e) {
- WebPlugin.logError(e);
- }
- } finally {
- if (monitor != null)
- monitor.done();
- }
- }
-
- protected void createWebFragmentFile(IProject project, IProjectFacetVersion fv, IContainer aFolder, IProgressMonitor monitor) throws CoreException, InvocationTargetException, InterruptedException {
-
- IFile file = aFolder.getFile(new Path(J2EEConstants.WEBFRAGMENT_DD_URI));
- if (file.exists()) return;
- try {
- createWebFragmentFile(file, project);
- } catch (CoreException e) {
- J2EEPlugin.logError(e);
- } catch (IOException e) {
- J2EEPlugin.logError(e);
- }
- }
-
- public static void createWebFragmentFile(IFile file, IProject project) throws CoreException, IOException {
- try {
- WorkbenchByteArrayOutputStream out = new WorkbenchByteArrayOutputStream(file);
- String projectNamewithoutSpecialChars = getNameWithoutSpecialCharacters(project.getName());
- final String webFragXmlContents = "<?xml version=\"1.0\" encoding=\"UTF-8\"?>\n<web-fragment id=\"WebFragment_ID\" version=\"3.0\" xmlns=\"http://java.sun.com/xml/ns/javaee\" xmlns:xsi=\"http://www.w3.org/2001/XMLSchema-instance\" xsi:schemaLocation=\"http://java.sun.com/xml/ns/javaee http://java.sun.com/xml/ns/javaee/web-fragment_3_0.xsd\">\n<display-name>" + XMLWriter.getEscaped(project.getName())+ "</display-name> \n <name>"+ XMLWriter.getEscaped(projectNamewithoutSpecialChars) + "</name> \n </web-fragment>"; //$NON-NLS-1$ //$NON-NLS-2$ //$NON-NLS-3$
- out.write(webFragXmlContents.getBytes("UTF-8")); //$NON-NLS-1$
- out.close();
- } catch (IOException ioe) {
- throw ioe;
- }
- }
-
-
-
- protected void createManifest(IProject project, IContainer aFolder, IProgressMonitor monitor) throws CoreException, InvocationTargetException, InterruptedException {
-
- IFile file = aFolder.getFile(new Path(J2EEConstants.MANIFEST_URI));
- if (file.exists()) return;
- try {
- ManifestFileCreationAction.createManifestFile(file, project);
- } catch (CoreException e) {
- J2EEPlugin.logError(e);
- } catch (IOException e) {
- J2EEPlugin.logError(e);
- }
- }
-
- private static String getNameWithoutSpecialCharacters(String projectName){
- String result = projectName;
- Pattern p = Pattern.compile("($|_|\\p{L})(\\p{L}|\\p{Nd}|_|$)*"); //$NON-NLS-1$
- for(int curLength = 1; curLength <= result.length(); curLength++){
- if(p.matcher(result.substring(0,curLength)).matches()== false){
- result = result.replace(result.charAt(curLength-1 < 0 ? curLength : curLength-1), '_');
- }
- }
- return result;
- }
-}
\ No newline at end of file
diff --git a/plugins/org.eclipse.jst.j2ee.web/webproject/org/eclipse/jst/j2ee/web/project/facet/WebFragmentFacetPostInstallDelegate.java b/plugins/org.eclipse.jst.j2ee.web/webproject/org/eclipse/jst/j2ee/web/project/facet/WebFragmentFacetPostInstallDelegate.java
deleted file mode 100644
index 1272ffd..0000000
--- a/plugins/org.eclipse.jst.j2ee.web/webproject/org/eclipse/jst/j2ee/web/project/facet/WebFragmentFacetPostInstallDelegate.java
+++ /dev/null
@@ -1,57 +0,0 @@
-/*******************************************************************************
-
- * Copyright (c) 2010 IBM Corporation and others.
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
- *
- * Contributors:
- * IBM Corporation - initial API and implementation
- *******************************************************************************/
-
-package org.eclipse.jst.j2ee.web.project.facet;
-
-import org.eclipse.core.resources.IProject;
-import org.eclipse.core.runtime.CoreException;
-import org.eclipse.core.runtime.IProgressMonitor;
-import org.eclipse.jst.j2ee.internal.J2EEVersionConstants;
-import org.eclipse.jst.j2ee.internal.plugin.J2EEPlugin;
-import org.eclipse.jst.j2ee.project.facet.IJ2EEFacetInstallDataModelProperties;
-import org.eclipse.jst.j2ee.project.facet.IJ2EEModuleFacetInstallDataModelProperties;
-import org.eclipse.wst.common.frameworks.datamodel.IDataModel;
-import org.eclipse.wst.common.project.facet.core.IDelegate;
-import org.eclipse.wst.common.project.facet.core.IProjectFacetVersion;
-import org.eclipse.wst.common.project.facet.core.runtime.IRuntime;
-
-public final class WebFragmentFacetPostInstallDelegate extends WebFacetInstallDelegateForWebFragmentProjects implements IDelegate {
-
- public void execute(final IProject project, final IProjectFacetVersion fv, final Object cfg, final IProgressMonitor monitor) throws CoreException {
- if (monitor != null) {
- monitor.beginTask("", 1); //$NON-NLS-1$
- }
- try {
- final IDataModel model = (IDataModel) cfg;
- if (model.getBooleanProperty(IWebFragmentFacetInstallDataModelProperties.ADD_TO_WAR)) {
- final String warProjectName = model.getStringProperty(IWebFragmentFacetInstallDataModelProperties.WAR_PROJECT_NAME);
- if (warProjectName != null && warProjectName != "") //$NON-NLS-1$
- {
- final String moduleURI = model.getStringProperty(IJ2EEModuleFacetInstallDataModelProperties.MODULE_URI);
-
- installAndAddModuletoWAR( J2EEVersionConstants.VERSION_3_0_TEXT,
- warProjectName,
- (IRuntime) model.getProperty(IJ2EEFacetInstallDataModelProperties.FACET_RUNTIME),
- project,
- moduleURI,
- monitor );
- }
- }
- } catch (Exception e) {
- J2EEPlugin.logError(e);
- } finally {
- if (monitor != null) {
- monitor.done();
- }
- }
- }
-}
diff --git a/plugins/org.eclipse.jst.j2ee.web/webproject/org/eclipse/jst/j2ee/web/project/facet/WebFragmentFacetProjectCreationDataModelProvider.java b/plugins/org.eclipse.jst.j2ee.web/webproject/org/eclipse/jst/j2ee/web/project/facet/WebFragmentFacetProjectCreationDataModelProvider.java
deleted file mode 100644
index abe00f5..0000000
--- a/plugins/org.eclipse.jst.j2ee.web/webproject/org/eclipse/jst/j2ee/web/project/facet/WebFragmentFacetProjectCreationDataModelProvider.java
+++ /dev/null
@@ -1,162 +0,0 @@
-/*******************************************************************************
-
- * Copyright (c) 2010 IBM Corporation and others.
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
- *
- * Contributors:
- * IBM Corporation - initial API and implementation
- *******************************************************************************/
-
-package org.eclipse.jst.j2ee.web.project.facet;
-
-import java.util.ArrayList;
-import java.util.Collection;
-import java.util.Set;
-
-import org.eclipse.core.resources.IProject;
-import org.eclipse.core.resources.ResourcesPlugin;
-import org.eclipse.core.runtime.IPath;
-import org.eclipse.core.runtime.IStatus;
-import org.eclipse.jst.common.project.facet.IJavaFacetInstallDataModelProperties;
-import org.eclipse.jst.common.project.facet.JavaFacetUtils;
-import org.eclipse.jst.j2ee.project.JavaEEProjectUtilities;
-import org.eclipse.jst.j2ee.project.facet.IJ2EEFacetConstants;
-import org.eclipse.jst.j2ee.project.facet.J2EEFacetProjectCreationDataModelProvider;
-import org.eclipse.osgi.util.NLS;
-import org.eclipse.wst.common.componentcore.datamodel.properties.IFacetProjectCreationDataModelProperties;
-import org.eclipse.wst.common.componentcore.internal.util.IModuleConstants;
-import org.eclipse.wst.common.frameworks.datamodel.DataModelEvent;
-import org.eclipse.wst.common.frameworks.datamodel.IDataModel;
-import org.eclipse.wst.common.frameworks.datamodel.IDataModelListener;
-import org.eclipse.wst.common.frameworks.internal.operations.ProjectCreationDataModelProviderNew;
-import org.eclipse.wst.common.frameworks.internal.plugin.WTPCommonMessages;
-import org.eclipse.wst.common.frameworks.internal.plugin.WTPCommonPlugin;
-import org.eclipse.wst.common.project.facet.core.IProjectFacet;
-import org.eclipse.wst.common.project.facet.core.IProjectFacetVersion;
-import org.eclipse.wst.common.project.facet.core.ProjectFacetsManager;
-
-public class WebFragmentFacetProjectCreationDataModelProvider extends J2EEFacetProjectCreationDataModelProvider implements IWebFragmentProjectCreationDataModelProperties{
-
- public WebFragmentFacetProjectCreationDataModelProvider() {
- super();
- }
-
- public IProjectFacet WEBFRAGMENT_FACET = ProjectFacetsManager.getProjectFacet(IModuleConstants.JST_WEBFRAGMENT_MODULE);
-
-
- @Override
- public void init() {
- super.init();
- Collection<IProjectFacet> requiredFacets = new ArrayList<IProjectFacet>();
- requiredFacets.add(JavaFacetUtils.JAVA_FACET);
- requiredFacets.add(ProjectFacetsManager.getProjectFacet(IModuleConstants.JST_WEBFRAGMENT_MODULE));
- setProperty(REQUIRED_FACETS_COLLECTION, requiredFacets);
- FacetDataModelMap map = (FacetDataModelMap) getProperty(FACET_DM_MAP);
- IDataModel javaFacet = map.getFacetDataModel(JavaFacetUtils.JAVA_FACET.getId());
- javaFacet.setProperty(IJavaFacetInstallDataModelProperties.DEFAULT_OUTPUT_FOLDER_NAME, "bin"); //$NON-NLS-1$
-
- IDataModel webFragmentFacet = map.getFacetDataModel(WEBFRAGMENT_FACET.getId());
- webFragmentFacet.addListener(new IDataModelListener() {
- public void propertyChanged(DataModelEvent event) {
- if (IWebFragmentFacetInstallDataModelProperties.WAR_PROJECT_NAME.equals(event.getPropertyName())) {
- if (isPropertySet(WAR_PROJECT_NAME))
- setProperty(WAR_PROJECT_NAME, event.getProperty());
- else
- model.notifyPropertyChange(WAR_PROJECT_NAME, IDataModel.DEFAULT_CHG);
- }else if (IWebFragmentFacetInstallDataModelProperties.ADD_TO_WAR.equals(event.getPropertyName())) {
- setProperty(ADD_TO_WAR, event.getProperty());
- }
- }
- });
- }
-
- @Override
- public IStatus validate(String propertyName) {
- if ( WAR_PROJECT_NAME.equals(propertyName) ) {
- if (model.getBooleanProperty(ADD_TO_WAR)) {
-
- IStatus status = validateWebProjForWebFragment(model.getStringProperty(WAR_PROJECT_NAME));
- if (!status.isOK())
- return status;
-
- if (getStringProperty(IFacetProjectCreationDataModelProperties.FACET_PROJECT_NAME).equals(getStringProperty(WAR_PROJECT_NAME))) {
- String errorMessage = WTPCommonPlugin.getResourceString(WTPCommonMessages.SAME_MODULE_AND_EAR_NAME, new Object[]{getStringProperty(WAR_PROJECT_NAME)});
- return WTPCommonPlugin.createErrorStatus(errorMessage);
- }
- }
- }
- return super.validate(propertyName);
- }
-
-
- protected IStatus validateWebProjForWebFragment(String webAppName) {
- if (webAppName.indexOf("#") != -1 || webAppName.indexOf("/") != -1) { //$NON-NLS-1$ //$NON-NLS-2$
- String errorMessage = WTPCommonPlugin.getResourceString(WTPCommonMessages.ERR_INVALID_CHARS);
- return WTPCommonPlugin.createErrorStatus(errorMessage);
- } else if (webAppName.equals("")) { //$NON-NLS-1$
- String errorMessage = WTPCommonPlugin.getResourceString(WTPCommonMessages.ERR_EMPTY_MODULE_NAME);
- return WTPCommonPlugin.createErrorStatus(errorMessage);
- }
-
- IStatus status = ProjectCreationDataModelProviderNew.validateProjectName(webAppName);
- //check for the deleted case, the project is deleted from the workspace but still exists in the
- //file system.
- if( status.isOK()){
- IProject webProj = JavaEEProjectUtilities.getProject(getStringProperty(WAR_PROJECT_NAME));
- if( !webProj.exists() ){
- IPath path = ResourcesPlugin.getWorkspace().getRoot().getLocation();
- path = path.append(webAppName);
- status = ProjectCreationDataModelProviderNew.validateExisting(webAppName, path.toOSString());
- } else{
- IProjectFacetVersion facetVersion = JavaEEProjectUtilities.getProjectFacetVersion(webProj, IJ2EEFacetConstants.DYNAMIC_WEB);
- if(facetVersion != null){
- if(facetVersion == IJ2EEFacetConstants.DYNAMIC_WEB_22 ||
- facetVersion == IJ2EEFacetConstants.DYNAMIC_WEB_23 ||
- facetVersion == IJ2EEFacetConstants.DYNAMIC_WEB_24 ||
- facetVersion == IJ2EEFacetConstants.DYNAMIC_WEB_25){
- String errorMessage = Resources.WEB_FRAGMENT_WEB_INCOMPATIBILITY;
- return WTPCommonPlugin.createErrorStatus(errorMessage);
- }
- }
- }
- }
- return status;
- }
-
- @Override
- public Object getDefaultProperty(String propertyName) {
- if (ADD_TO_WAR.equals(propertyName)) {
- return true;
- }else if (WAR_PROJECT_NAME.equals(propertyName)) {
- IDataModel nestedJ2EEFacetDataModel = getJ2EEFacetModel();
- if (nestedJ2EEFacetDataModel!=null)
- return nestedJ2EEFacetDataModel.getProperty(IWebFragmentFacetInstallDataModelProperties.WAR_PROJECT_NAME);
- }
- return super.getDefaultProperty(propertyName);
- }
-
- @Override
- public Set getPropertyNames() {
- Set names = super.getPropertyNames();
- names.add(WAR_PROJECT_NAME);
- names.add(ADD_TO_WAR);
-
- return names;
- }
-
- private static final class Resources
-
- extends NLS
-
- {
- public static String WEB_FRAGMENT_WEB_INCOMPATIBILITY;
- static
- {
- initializeMessages( WebFragmentFacetProjectCreationDataModelProvider.class.getName(),
- Resources.class );
- }
- }
-}
diff --git a/plugins/org.eclipse.jst.j2ee.web/webproject/org/eclipse/jst/j2ee/web/project/facet/WebFragmentFacetProjectCreationDataModelProvider.properties b/plugins/org.eclipse.jst.j2ee.web/webproject/org/eclipse/jst/j2ee/web/project/facet/WebFragmentFacetProjectCreationDataModelProvider.properties
deleted file mode 100644
index b1941fd..0000000
--- a/plugins/org.eclipse.jst.j2ee.web/webproject/org/eclipse/jst/j2ee/web/project/facet/WebFragmentFacetProjectCreationDataModelProvider.properties
+++ /dev/null
@@ -1,11 +0,0 @@
-###############################################################################
-# Copyright (c) 2010 IBM Corporation and others.
-# All rights reserved. This program and the accompanying materials
-# are made available under the terms of the Eclipse Public License v1.0
-# which accompanies this distribution, and is available at
-# http://www.eclipse.org/legal/epl-v10.html
-#
-# Contributors:
-# IBM Corporation - initial API and implementation
-###############################################################################
-WEB_FRAGMENT_WEB_INCOMPATIBILITY=Web Fragments require a Web Module with version 3.0 or higher
\ No newline at end of file
diff --git a/plugins/org.eclipse.jst.j2ee.webservice.ui/.classpath b/plugins/org.eclipse.jst.j2ee.webservice.ui/.classpath
deleted file mode 100644
index bebd6a1..0000000
--- a/plugins/org.eclipse.jst.j2ee.webservice.ui/.classpath
+++ /dev/null
@@ -1,8 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<classpath>
- <classpathentry kind="src" path="property_files/"/>
- <classpathentry kind="src" path="webservices_ui/"/>
- <classpathentry kind="con" path="org.eclipse.jdt.launching.JRE_CONTAINER/org.eclipse.jdt.internal.debug.ui.launcher.StandardVMType/J2SE-1.5"/>
- <classpathentry kind="con" path="org.eclipse.pde.core.requiredPlugins"/>
- <classpathentry kind="output" path="bin"/>
-</classpath>
diff --git a/plugins/org.eclipse.jst.j2ee.webservice.ui/.cvsignore b/plugins/org.eclipse.jst.j2ee.webservice.ui/.cvsignore
deleted file mode 100644
index 6aeb18d..0000000
--- a/plugins/org.eclipse.jst.j2ee.webservice.ui/.cvsignore
+++ /dev/null
@@ -1,8 +0,0 @@
-bin
-temp.folder
-build.xml
-servletui.jar
-webserviceui.jar
-@dot
-src.zip
-javaCompiler...args
diff --git a/plugins/org.eclipse.jst.j2ee.webservice.ui/.project b/plugins/org.eclipse.jst.j2ee.webservice.ui/.project
deleted file mode 100644
index 1b17773..0000000
--- a/plugins/org.eclipse.jst.j2ee.webservice.ui/.project
+++ /dev/null
@@ -1,29 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<projectDescription>
- <name>org.eclipse.jst.j2ee.webservice.ui</name>
- <comment></comment>
- <projects>
- </projects>
- <buildSpec>
- <buildCommand>
- <name>org.eclipse.jdt.core.javabuilder</name>
- <arguments>
- </arguments>
- </buildCommand>
- <buildCommand>
- <name>org.eclipse.pde.ManifestBuilder</name>
- <arguments>
- </arguments>
- </buildCommand>
- <buildCommand>
- <name>org.eclipse.pde.SchemaBuilder</name>
- <arguments>
- </arguments>
- </buildCommand>
- </buildSpec>
- <natures>
- <nature>org.eclipse.pde.PluginNature</nature>
- <nature>org.eclipse.jdt.core.javanature</nature>
- <nature>com.ibm.etools.ctc.javaprojectnature</nature>
- </natures>
-</projectDescription>
diff --git a/plugins/org.eclipse.jst.j2ee.webservice.ui/.settings/org.eclipse.jdt.core.prefs b/plugins/org.eclipse.jst.j2ee.webservice.ui/.settings/org.eclipse.jdt.core.prefs
deleted file mode 100644
index 037a4e5..0000000
--- a/plugins/org.eclipse.jst.j2ee.webservice.ui/.settings/org.eclipse.jdt.core.prefs
+++ /dev/null
@@ -1,95 +0,0 @@
-#Mon Jun 08 15:35:45 EDT 2009
-org.eclipse.jdt.core.compiler.problem.unusedParameterWhenImplementingAbstract=disabled
-org.eclipse.jdt.core.compiler.problem.comparingIdentical=error
-org.eclipse.jdt.core.compiler.problem.unnecessaryElse=error
-org.eclipse.jdt.core.compiler.problem.redundantSuperinterface=error
-org.eclipse.jdt.core.compiler.problem.unusedLocal=error
-org.eclipse.jdt.core.compiler.problem.emptyStatement=error
-org.eclipse.jdt.core.compiler.problem.unusedLabel=error
-org.eclipse.jdt.core.compiler.problem.unusedParameter=warning
-org.eclipse.jdt.core.compiler.problem.rawTypeReference=warning
-org.eclipse.jdt.core.incompatibleJDKLevel=ignore
-org.eclipse.jdt.core.compiler.problem.incompatibleNonInheritedInterfaceMethod=error
-org.eclipse.jdt.core.compiler.debug.lineNumber=generate
-org.eclipse.jdt.core.compiler.problem.unusedDeclaredThrownException=warning
-org.eclipse.jdt.core.builder.cleanOutputFolder=clean
-org.eclipse.jdt.core.compiler.problem.unusedWarningToken=warning
-org.eclipse.jdt.core.compiler.problem.noImplicitStringConversion=error
-org.eclipse.jdt.core.compiler.problem.deprecationInDeprecatedCode=enabled
-org.eclipse.jdt.core.compiler.problem.deprecation=warning
-org.eclipse.jdt.core.compiler.problem.unusedParameterWhenOverridingConcrete=disabled
-org.eclipse.jdt.core.compiler.problem.missingSynchronizedOnInheritedMethod=error
-org.eclipse.jdt.core.compiler.problem.deprecationWhenOverridingDeprecatedMethod=enabled
-org.eclipse.jdt.core.compiler.problem.redundantNullCheck=error
-org.eclipse.jdt.core.compiler.problem.unusedImport=error
-org.eclipse.jdt.core.builder.recreateModifiedClassFileInOutputFolder=ignore
-org.eclipse.jdt.core.builder.resourceCopyExclusionFilter=*.launch
-org.eclipse.jdt.core.classpath.multipleOutputLocations=enabled
-org.eclipse.jdt.core.compiler.problem.suppressWarnings=enabled
-org.eclipse.jdt.core.compiler.problem.typeParameterHiding=error
-org.eclipse.jdt.core.builder.invalidClasspath=abort
-org.eclipse.jdt.core.compiler.problem.localVariableHiding=warning
-org.eclipse.jdt.core.compiler.problem.possibleAccidentalBooleanAssignment=error
-org.eclipse.jdt.core.compiler.problem.missingHashCodeMethod=error
-org.eclipse.jdt.core.codeComplete.argumentSuffixes=
-org.eclipse.jdt.core.codeComplete.argumentPrefixes=
-org.eclipse.jdt.core.compiler.problem.indirectStaticAccess=ignore
-org.eclipse.jdt.core.compiler.problem.potentialNullReference=error
-org.eclipse.jdt.core.compiler.codegen.inlineJsrBytecode=enabled
-org.eclipse.jdt.core.compiler.problem.finalParameterBound=warning
-org.eclipse.jdt.core.compiler.problem.missingSerialVersion=error
-org.eclipse.jdt.core.compiler.problem.nullReference=error
-org.eclipse.jdt.core.compiler.source=1.5
-org.eclipse.jdt.core.compiler.problem.enumIdentifier=error
-org.eclipse.jdt.core.compiler.problem.syntheticAccessEmulation=ignore
-org.eclipse.jdt.core.builder.duplicateResourceTask=warning
-org.eclipse.jdt.core.compiler.problem.fieldHiding=error
-org.eclipse.jdt.core.compiler.problem.unusedDeclaredThrownExceptionExemptExceptionAndThrowable=enabled
-org.eclipse.jdt.core.compiler.problem.missingOverrideAnnotation=error
-org.eclipse.jdt.core.compiler.problem.hiddenCatchBlock=error
-org.eclipse.jdt.core.compiler.problem.overridingPackageDefaultMethod=error
-org.eclipse.jdt.core.compiler.problem.finallyBlockNotCompletingNormally=error
-org.eclipse.jdt.core.compiler.problem.undocumentedEmptyBlock=warning
-org.eclipse.jdt.core.classpath.exclusionPatterns=enabled
-org.eclipse.jdt.core.compiler.problem.methodWithConstructorName=error
-org.eclipse.jdt.core.compiler.problem.discouragedReference=warning
-org.eclipse.jdt.core.compiler.problem.unqualifiedFieldAccess=ignore
-org.eclipse.jdt.core.compiler.problem.incompleteEnumSwitch=error
-eclipse.preferences.version=1
-org.eclipse.jdt.core.incompleteClasspath=error
-org.eclipse.jdt.core.compiler.problem.unnecessaryTypeCheck=error
-org.eclipse.jdt.core.compiler.problem.deadCode=error
-org.eclipse.jdt.core.compiler.problem.specialParameterHidingField=enabled
-org.eclipse.jdt.core.compiler.problem.fatalOptionalError=enabled
-org.eclipse.jdt.core.compiler.problem.noEffectAssignment=error
-org.eclipse.jdt.core.compiler.debug.sourceFile=generate
-org.eclipse.jdt.core.compiler.problem.unusedDeclaredThrownExceptionIncludeUncheckedExceptions=disabled
-org.eclipse.jdt.core.compiler.problem.missingDeprecatedAnnotation=warning
-org.eclipse.jdt.core.codeComplete.fieldPrefixes=
-org.eclipse.jdt.core.compiler.problem.fallthroughCase=error
-org.eclipse.jdt.core.compiler.codegen.targetPlatform=1.5
-org.eclipse.jdt.core.compiler.problem.unusedPrivateMember=error
-org.eclipse.jdt.core.compiler.problem.autoboxing=warning
-org.eclipse.jdt.core.circularClasspath=error
-org.eclipse.jdt.core.compiler.problem.annotationSuperInterface=warning
-org.eclipse.jdt.core.compiler.problem.nonExternalizedStringLiteral=error
-org.eclipse.jdt.core.codeComplete.fieldSuffixes=
-org.eclipse.jdt.core.codeComplete.localSuffixes=
-org.eclipse.jdt.core.compiler.problem.parameterAssignment=error
-org.eclipse.jdt.core.compiler.problem.staticAccessReceiver=error
-org.eclipse.jdt.core.codeComplete.localPrefixes=
-org.eclipse.jdt.core.compiler.problem.unusedDeclaredThrownExceptionIncludeDocCommentReference=enabled
-org.eclipse.jdt.core.compiler.maxProblemPerUnit=100
-org.eclipse.jdt.core.compiler.problem.varargsArgumentNeedCast=error
-org.eclipse.jdt.core.compiler.problem.assertIdentifier=error
-org.eclipse.jdt.core.compiler.compliance=1.5
-org.eclipse.jdt.core.compiler.problem.unusedParameterIncludeDocCommentReference=enabled
-org.eclipse.jdt.core.codeComplete.staticFieldPrefixes=
-org.eclipse.jdt.core.compiler.debug.localVariable=generate
-org.eclipse.jdt.core.compiler.problem.unhandledWarningToken=warning
-instance/org.eclipse.core.net/org.eclipse.core.net.hasMigrated=true
-org.eclipse.jdt.core.compiler.problem.forbiddenReference=error
-org.eclipse.jdt.core.compiler.codegen.unusedLocal=preserve
-org.eclipse.jdt.core.compiler.problem.uncheckedTypeOperation=warning
-org.eclipse.jdt.core.compiler.problem.unusedDeclaredThrownExceptionWhenOverriding=disabled
-org.eclipse.jdt.core.codeComplete.staticFieldSuffixes=
diff --git a/plugins/org.eclipse.jst.j2ee.webservice.ui/.settings/org.eclipse.wst.validation.prefs b/plugins/org.eclipse.jst.j2ee.webservice.ui/.settings/org.eclipse.wst.validation.prefs
deleted file mode 100644
index bd171c4..0000000
--- a/plugins/org.eclipse.jst.j2ee.webservice.ui/.settings/org.eclipse.wst.validation.prefs
+++ /dev/null
@@ -1,6 +0,0 @@
-#Wed May 03 20:41:44 EDT 2006
-DELEGATES_PREFERENCE=delegateValidatorListorg.eclipse.wst.wsdl.validation.internal.eclipse.WSDLDelegatingValidator\=org.eclipse.wst.wsdl.validation.internal.eclipse.Validator;org.eclipse.wst.xsd.core.internal.validation.eclipse.XSDDelegatingValidator\=org.eclipse.wst.xsd.core.internal.validation.eclipse.Validator;
-USER_BUILD_PREFERENCE=enabledBuildValidatorListorg.eclipse.wst.html.internal.validation.HTMLValidator;org.eclipse.jst.jsp.core.internal.validation.JSPJavaValidator;org.eclipse.wst.dtd.core.internal.validation.eclipse.Validator;org.eclipse.wst.wsi.ui.internal.WSIMessageValidator;org.eclipse.wst.xml.core.internal.validation.eclipse.Validator;org.eclipse.wst.xsd.core.internal.validation.eclipse.XSDDelegatingValidator;org.eclipse.jst.jsp.core.internal.validation.JSPELValidator;org.eclipse.wst.wsdl.validation.internal.eclipse.WSDLDelegatingValidator;org.eclipse.jst.jsp.core.internal.validation.JSPDirectiveValidator;
-USER_MANUAL_PREFERENCE=enabledManualValidatorListorg.eclipse.wst.html.internal.validation.HTMLValidator;org.eclipse.jst.jsp.core.internal.validation.JSPJavaValidator;org.eclipse.wst.dtd.core.internal.validation.eclipse.Validator;org.eclipse.wst.wsi.ui.internal.WSIMessageValidator;org.eclipse.wst.xml.core.internal.validation.eclipse.Validator;org.eclipse.wst.xsd.core.internal.validation.eclipse.XSDDelegatingValidator;org.eclipse.jst.jsp.core.internal.validation.JSPELValidator;org.eclipse.wst.wsdl.validation.internal.eclipse.WSDLDelegatingValidator;org.eclipse.jst.jsp.core.internal.validation.JSPDirectiveValidator;
-USER_PREFERENCE=overrideGlobalPreferencesfalse
-eclipse.preferences.version=1
diff --git a/plugins/org.eclipse.jst.j2ee.webservice.ui/META-INF/MANIFEST.MF b/plugins/org.eclipse.jst.j2ee.webservice.ui/META-INF/MANIFEST.MF
deleted file mode 100644
index 97333ef..0000000
--- a/plugins/org.eclipse.jst.j2ee.webservice.ui/META-INF/MANIFEST.MF
+++ /dev/null
@@ -1,38 +0,0 @@
-Manifest-Version: 1.0
-Bundle-ManifestVersion: 2
-Bundle-Name: %pluginName
-Bundle-SymbolicName: org.eclipse.jst.j2ee.webservice.ui; singleton:=true
-Bundle-Version: 1.1.400.qualifier
-Bundle-Activator: org.eclipse.jst.j2ee.internal.webservice.plugin.WebServiceUIPlugin
-Bundle-Vendor: %pluginVendor
-Bundle-Localization: plugin
-Export-Package: org.eclipse.jst.j2ee.internal.webservice;x-internal:=true,
- org.eclipse.jst.j2ee.internal.webservice.plugin;x-internal:=true,
- org.eclipse.jst.j2ee.internal.webservice.startup;x-internal:=true
-Require-Bundle: org.eclipse.core.resources;bundle-version="[3.2.0,4.0.0)",
- org.eclipse.core.runtime;bundle-version="[3.2.0,4.0.0)",
- org.eclipse.ui.workbench;bundle-version="[3.2.0,4.0.0)",
- org.eclipse.jface;bundle-version="[3.2.0,4.0.0)",
- org.eclipse.jst.j2ee.ui;bundle-version="[1.1.0,1.2.0)",
- org.eclipse.wst.common.frameworks;bundle-version="[1.2.0,2.0.0)",
- org.eclipse.jst.j2ee;bundle-version="[1.1.0,1.2.0)",
- org.eclipse.emf.edit;bundle-version="[2.2.0,3.0.0)",
- org.eclipse.wst.common.emfworkbench.integration;bundle-version="[1.2.0,2.0.0)",
- org.eclipse.jst.j2ee.core;bundle-version="[1.1.0,2.0.0)",
- org.eclipse.emf.edit.ui;bundle-version="[2.2.0,3.0.0)",
- org.eclipse.emf.ecore.xmi;bundle-version="[2.2.0,3.0.0)",
- org.eclipse.ui.ide;bundle-version="[3.2.0,4.0.0)",
- org.eclipse.wst.common.emf;bundle-version="[1.2.0,2.0.0)",
- org.eclipse.jst.j2ee.webservice;bundle-version="[1.1.0,1.2.0)",
- org.eclipse.wst.wsdl;bundle-version="[1.2.0,1.3.0)",
- org.eclipse.jem.util;bundle-version="[2.0.0,3.0.0)",
- javax.wsdl;bundle-version="[1.5.0,1.6.0)",
- org.eclipse.jst.common.frameworks;bundle-version="[1.1.0,1.2.0)",
- org.eclipse.ui.navigator;bundle-version="[3.2.0,4.0.0)",
- org.eclipse.ui.navigator.resources;bundle-version="[3.2.0,4.0.0)",
- org.eclipse.jst.j2ee.navigator.ui;bundle-version="[1.1.0,1.2.0)",
- org.eclipse.wst.common.project.facet.core;bundle-version="[1.3.0,2.0.0)",
- org.eclipse.core.expressions;bundle-version="[3.2.0,4.0.0)",
- org.eclipse.wst.web;bundle-version="1.1.205"
-Eclipse-LazyStart: true; exceptions="org.eclipse.jst.j2ee.internal.webservice.startup"
-Bundle-RequiredExecutionEnvironment: J2SE-1.5
diff --git a/plugins/org.eclipse.jst.j2ee.webservice.ui/about.html b/plugins/org.eclipse.jst.j2ee.webservice.ui/about.html
deleted file mode 100644
index 2199df3..0000000
--- a/plugins/org.eclipse.jst.j2ee.webservice.ui/about.html
+++ /dev/null
@@ -1,34 +0,0 @@
-<!DOCTYPE HTML PUBLIC "-//W3C//DTD HTML 4.0//EN">
-<HTML>
-
-<head>
-<title>About</title>
-<meta http-equiv=Content-Type content="text/html; charset=ISO-8859-1">
-</head>
-
-<BODY lang="EN-US">
-
-<H3>About This Content</H3>
-
-<P>June, 2008</P>
-
-<H3>License</H3>
-
-<P>The Eclipse Foundation makes available all content in this plug-in
-("Content"). Unless otherwise indicated below, the Content is provided to you
-under the terms and conditions of the Eclipse Public License Version 1.0
-("EPL"). A copy of the EPL is available at
-<A href="http://www.eclipse.org/org/documents/epl-v10.php">http://www.eclipse.org/org/documents/epl-v10.php</A>.
-For purposes of the EPL, "Program" will mean the Content.</P>
-
-<P>If you did not receive this Content directly from the Eclipse Foundation, the
-Content is being redistributed by another party ("Redistributor") and different
-terms and conditions may apply to your use of any object code in the Content.
-Check the Redistributors license that was provided with the Content. If no such
-license exists, contact the Redistributor. Unless otherwise indicated below, the
-terms and conditions of the EPL still apply to any source code in the Content
-and such source code may be obtained at
-<A href="http://www.eclipse.org/">http://www.eclipse.org/</A>.</P>
-
-</BODY>
-</HTML>
diff --git a/plugins/org.eclipse.jst.j2ee.webservice.ui/build.properties b/plugins/org.eclipse.jst.j2ee.webservice.ui/build.properties
deleted file mode 100644
index 3ab4fa5..0000000
--- a/plugins/org.eclipse.jst.j2ee.webservice.ui/build.properties
+++ /dev/null
@@ -1,19 +0,0 @@
-###############################################################################
-# Copyright (c) 2005, 2006 IBM Corporation and others.
-# All rights reserved. This program and the accompanying materials
-# are made available under the terms of the Eclipse Public License v1.0
-# which accompanies this distribution, and is available at
-# http://www.eclipse.org/legal/epl-v10.html
-#
-# Contributors:
-# IBM Corporation - initial API and implementation
-###############################################################################
-source.. = property_files/,\
- webservices_ui/
-output.. = bin/
-bin.includes = plugin.xml,\
- .,\
- icons/,\
- META-INF/,\
- about.html,\
- plugin.properties
diff --git a/plugins/org.eclipse.jst.j2ee.webservice.ui/icons/full/ctool16/exportwar_wiz.gif b/plugins/org.eclipse.jst.j2ee.webservice.ui/icons/full/ctool16/exportwar_wiz.gif
deleted file mode 100644
index ced859d..0000000
--- a/plugins/org.eclipse.jst.j2ee.webservice.ui/icons/full/ctool16/exportwar_wiz.gif
+++ /dev/null
Binary files differ
diff --git a/plugins/org.eclipse.jst.j2ee.webservice.ui/icons/full/ctool16/importwar_wiz.gif b/plugins/org.eclipse.jst.j2ee.webservice.ui/icons/full/ctool16/importwar_wiz.gif
deleted file mode 100644
index 432c066..0000000
--- a/plugins/org.eclipse.jst.j2ee.webservice.ui/icons/full/ctool16/importwar_wiz.gif
+++ /dev/null
Binary files differ
diff --git a/plugins/org.eclipse.jst.j2ee.webservice.ui/icons/full/ctool16/newservlet_wiz.gif b/plugins/org.eclipse.jst.j2ee.webservice.ui/icons/full/ctool16/newservlet_wiz.gif
deleted file mode 100644
index f45eadc..0000000
--- a/plugins/org.eclipse.jst.j2ee.webservice.ui/icons/full/ctool16/newservlet_wiz.gif
+++ /dev/null
Binary files differ
diff --git a/plugins/org.eclipse.jst.j2ee.webservice.ui/icons/full/ctool16/newwar_wiz.gif b/plugins/org.eclipse.jst.j2ee.webservice.ui/icons/full/ctool16/newwar_wiz.gif
deleted file mode 100644
index b9ac6be..0000000
--- a/plugins/org.eclipse.jst.j2ee.webservice.ui/icons/full/ctool16/newwar_wiz.gif
+++ /dev/null
Binary files differ
diff --git a/plugins/org.eclipse.jst.j2ee.webservice.ui/icons/full/ctool16/webservicedesc.gif b/plugins/org.eclipse.jst.j2ee.webservice.ui/icons/full/ctool16/webservicedesc.gif
deleted file mode 100644
index 8fb844f..0000000
--- a/plugins/org.eclipse.jst.j2ee.webservice.ui/icons/full/ctool16/webservicedesc.gif
+++ /dev/null
Binary files differ
diff --git a/plugins/org.eclipse.jst.j2ee.webservice.ui/icons/full/ctool16/wsdl.gif b/plugins/org.eclipse.jst.j2ee.webservice.ui/icons/full/ctool16/wsdl.gif
deleted file mode 100644
index 8fb844f..0000000
--- a/plugins/org.eclipse.jst.j2ee.webservice.ui/icons/full/ctool16/wsdl.gif
+++ /dev/null
Binary files differ
diff --git a/plugins/org.eclipse.jst.j2ee.webservice.ui/plugin.properties b/plugins/org.eclipse.jst.j2ee.webservice.ui/plugin.properties
deleted file mode 100644
index 16bd247..0000000
--- a/plugins/org.eclipse.jst.j2ee.webservice.ui/plugin.properties
+++ /dev/null
@@ -1,13 +0,0 @@
-###############################################################################
-# Copyright (c) 2003, 2006 IBM Corporation and others.
-# All rights reserved. This program and the accompanying materials
-# are made available under the terms of the Eclipse Public License v1.0
-# which accompanies this distribution, and is available at
-# http://www.eclipse.org/legal/epl-v10.html
-#
-# Contributors:
-# IBM Corporation - initial API and implementation
-###############################################################################
-navigator.Content=JSR-109 Web Services Index
-pluginName=WTP Webservice UI Plug-in
-pluginVendor=Eclipse Web Tools Platform
diff --git a/plugins/org.eclipse.jst.j2ee.webservice.ui/plugin.xml b/plugins/org.eclipse.jst.j2ee.webservice.ui/plugin.xml
deleted file mode 100644
index 0a4e598..0000000
--- a/plugins/org.eclipse.jst.j2ee.webservice.ui/plugin.xml
+++ /dev/null
@@ -1,165 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<?eclipse version="3.0"?>
-<plugin>
- <extension
- point="org.eclipse.ui.navigator.navigatorContent">
- <navigatorContent
- name="%navigator.Content"
- priority="lower"
- icon="icons/full/ctool16/webservicedesc.gif"
- contentProvider="org.eclipse.jst.j2ee.internal.webservice.WebServicesNavigatorContentProvider"
- labelProvider="org.eclipse.jst.j2ee.internal.webservice.WebServicesNavigatorLabelProvider"
- id="org.eclipse.wst.common.frameworks.internal.navigator.webservice">
- <triggerPoints>
- <or>
- <instanceof value="org.eclipse.core.resources.IWorkspaceRoot"/>
- <instanceof value="org.eclipse.jst.j2ee.internal.webservice.WebServiceNavigatorGroup"/>
- <instanceof value="org.eclipse.jst.j2ee.webservice.wsdd.WebServiceDescription"/>
- <instanceof value="org.eclipse.jst.j2ee.internal.webservice.WebServiceNavigatorGroupType"/>
- <instanceof value="org.eclipse.wst.wsdl.util.WSDLResourceImpl"/>
- <instanceof value="org.eclipse.wst.wsdl.Service"/>
- <and>
- <instanceof value="org.eclipse.emf.ecore.EObject"/>
- <or>
- <test
- forcePluginActivation="true"
- property="org.eclipse.wst.common.emfworkbench.integration.emfPackage"
- value="wsdd.xmi"/>
- <test
- forcePluginActivation="true"
- property="org.eclipse.wst.common.emfworkbench.integration.emfPackage"
- value="webservice_client.xmi"/>
- <test
- forcePluginActivation="true"
- property="org.eclipse.wst.common.emfworkbench.integration.emfPackage"
- value="wscommon.xmi"/>
- <test
- forcePluginActivation="true"
- property="org.eclipse.wst.common.emfworkbench.integration.emfPackage"
- value="http://www.ibm.com/wsdl/2003/WSDL"/>
- </or>
- </and>
- </or>
- </triggerPoints>
- <possibleChildren>
- <or>
- <instanceof value="org.eclipse.jst.j2ee.internal.webservice.WebServiceNavigatorGroup"/>
- <instanceof value="org.eclipse.jst.j2ee.webservice.wsdd.WebServiceDescription"/>
- <instanceof value="org.eclipse.jst.j2ee.internal.webservice.WebServiceNavigatorGroupType"/>
- <instanceof value="org.eclipse.wst.wsdl.util.WSDLResourceImpl"/>
- <and>
- <instanceof value="org.eclipse.emf.ecore.EObject"/>
- <or>
- <test
- forcePluginActivation="true"
- property="org.eclipse.wst.common.emfworkbench.integration.emfPackage"
- value="wsdd.xmi"/>
- <test
- forcePluginActivation="true"
- property="org.eclipse.wst.common.emfworkbench.integration.emfPackage"
- value="webservice_client.xmi"/>
- <test
- forcePluginActivation="true"
- property="org.eclipse.wst.common.emfworkbench.integration.emfPackage"
- value="wscommon.xmi"/>
- <test
- forcePluginActivation="true"
- property="org.eclipse.wst.common.emfworkbench.integration.emfPackage"
- value="http://www.ibm.com/wsdl/2003/WSDL"/>
- </or>
- </and>
- </or>
- </possibleChildren>
- <commonSorter
- class="org.eclipse.jst.j2ee.navigator.internal.J2EEViewerSorter"
- id="org.eclipse.jst.navigator.j2ee.ui.J2EEContent">
- <parentExpression>
- <or>
- <instanceof
- value="org.eclipse.emf.ecore.EObject" />
- <instanceof
- value="org.eclipse.core.resources.IWorkspaceRoot" />
- </or>
- </parentExpression>
- </commonSorter>
- <!-- Handle open requests -->
- <actionProvider
- class="org.eclipse.jst.j2ee.internal.webservice.WebServicesNavigatorGroupOpenListener"
- id="org.eclipse.jst.j2ee.webservice.ui.J2EEWebServiceActionProvider">
- <enablement>
- <or>
- <and>
- <instanceof
- value="org.eclipse.emf.ecore.EObject" />
- <or>
- <test forcePluginActivation="true"
- property="org.eclipse.wst.common.emfworkbench.integration.emfPackage"
- value="wsdd.xmi" />
- <test forcePluginActivation="true"
- property="org.eclipse.wst.common.emfworkbench.integration.emfPackage"
- value="webservice_client.xmi" />
- <test forcePluginActivation="true"
- property="org.eclipse.wst.common.emfworkbench.integration.emfPackage"
- value="wscommon.xmi" />
- <test forcePluginActivation="true"
- property="org.eclipse.wst.common.emfworkbench.integration.emfPackage"
- value="http://www.ibm.com/wsdl/2003/WSDL" />
- </or>
- </and>
- <instanceof
- value="org.eclipse.jst.j2ee.internal.provider.J2EEItemProvider" />
- <instanceof
- value="org.eclipse.wst.wsdl.util.WSDLResourceImpl" />
- </or>
- </enablement>
- </actionProvider>
- </navigatorContent>
- </extension>
-
-
- <!-- J2EE View Web Services contribution -->
-
- <extension
- point="org.eclipse.ui.navigator.viewer">
- <viewerContentBinding
- viewerId="org.eclipse.ui.navigator.ProjectExplorer">
- <includes>
- <contentExtension pattern="org.eclipse.wst.common.frameworks.internal.navigator.webservice"
- isRoot="false"/>
- </includes>
- </viewerContentBinding>
- </extension>
-
- <extension
- point="org.eclipse.core.runtime.adapters">
- <factory
- class="org.eclipse.jst.j2ee.internal.webservice.WebServiceAdapterFactory"
- adaptableType="org.eclipse.wst.wsdl.Service">
- <adapter type="org.eclipse.core.resources.IResource"/>
- <adapter type="org.eclipse.core.resources.IFile"/>
- </factory>
- <factory
- class="org.eclipse.jst.j2ee.internal.webservice.WebServiceAdapterFactory"
- adaptableType="org.eclipse.jst.j2ee.webservice.wsclient.ServiceRef">
- <adapter type="org.eclipse.core.resources.IResource"/>
- <adapter type="org.eclipse.core.resources.IFile"/>
- </factory>
- <factory
- class="org.eclipse.jst.j2ee.internal.webservice.WsdlResourceAdapterFactory"
- adaptableType="org.eclipse.wst.wsdl.util.WSDLResourceImpl">
- <adapter type="org.eclipse.core.resources.IResource"/>
- <adapter type="org.eclipse.core.resources.IFile"/>
- </factory>
- <factory
- class="org.eclipse.jst.j2ee.internal.webservice.WebServiceAdapterFactory"
- adaptableType="org.eclipse.jst.j2ee.webservice.wsdd.ServiceImplBean">
- <adapter type="org.eclipse.core.resources.IResource"/>
- <adapter type="org.eclipse.core.resources.IFile"/>
- </factory>
-
- </extension>
- <extension
- point="org.eclipse.ui.startup">
- <startup class="org.eclipse.jst.j2ee.internal.webservice.startup.WebserviceListener"/>
- </extension>
-</plugin>
diff --git a/plugins/org.eclipse.jst.j2ee.webservice.ui/property_files/webserviceui.properties b/plugins/org.eclipse.jst.j2ee.webservice.ui/property_files/webserviceui.properties
deleted file mode 100644
index f7afb9f..0000000
--- a/plugins/org.eclipse.jst.j2ee.webservice.ui/property_files/webserviceui.properties
+++ /dev/null
@@ -1,53 +0,0 @@
-###############################################################################
-# Copyright (c) 2003, 2006 IBM Corporation and others.
-# All rights reserved. This program and the accompanying materials
-# are made available under the terms of the Eclipse Public License v1.0
-# which accompanies this distribution, and is available at
-# http://www.eclipse.org/legal/epl-v10.html
-#
-# Contributors:
-# IBM Corporation - initial API and implementation
-###############################################################################
-NEW_BUTTON_LABEL=New...
-NEW_HANDLER_WIZARD_WINDOW_TITLE=New Handler
-NEW_HANDLER_WIZARD_PAGE_TITLE=Web Service Handler
-NEW_HANDLER_WIZARD_PAGE_DESC=Create a new web service handler.
-HANDLER_DISPLAY_NAME_LABEL=Dispaly name:
-HANDLER_DESCRIPTION_LABEL=Description:
-HANDLER_NAME_LABEL=Handler name:
-HANDLER_CLASS_NAME_LABEL=Handler class:
-HANDLER_INIT_PARAM_WIZARD_WINDOW_TITLE=Handler Initialization Parameter
-HANDLER_INIT_PARAM_WIZARD_PAGE_TITLE=Enter Handler Initialization Parameter
-HANDLER_INIT_PARAM_WIZARD_PAGE_DESC=Creare a new handler initialization parameter.
-HANDLER_SOAP_HEADER_WIZARD_WINDOW_TITLE=Handler SOAP Headers
-HANDLER_SOAP_HEADER_WIZARD_PAGE_TITLE=Enter Handler SOAP Headers
-HANDLER_SOAP_HEADER_WIZARD_PAGE_DESC=Create a new SOAP header.
-HANDLER_NAMESPACE_URL_LABEL=Namespace URL:
-HANDLER_LOCAL_PART_LABEL=Local part:
-PortComponentRefLabelProvider_UI_1=Service Endpoint Interface:
-PortComponentRefLabelProvider_UI_2=Port Component Link:
-WebServiceNavigatorGroupType_UI_0=Services
-WebServiceNavigatorGroupType_UI_1=Clients
-WebServiceNavigatorGroupType_UI_2=Handlers
-WebServiceFilesContribution_UI_0=Files
-WebServiceGroupContentExtension_UI_1=Open with Web Browser
-WebServiceNavigatorGroup_UI_0=JSR-109 Web Services
-WebServiceViewerSynchronization_Searching_for_web_service_capable_p_=Searching for web service capable projects...
-Server_Invalid_For_Exisitng_EAR_UI_=Selected target server "{0}" is invalid for the existing EAR project "{1}"
-ServiceReferenceSelectionWizard_UI_6=Service Reference Selection
-ServiceReferenceSelectionWizard_UI_7=Service Reference Snippet
-ServiceReferenceSelectionPage_UI_0=Select a Service Reference
-ServiceReferenceSelectionPage_UI_1=Service Reference owner:
-ServiceReferenceSelectionPage_UI_2=New Service Reference...
-SERVICE_CLASSES_UI_=Service Classes
-PORT_UI_=Port:
-HANDLER_UI_=Handler:
-WSDL_PORT_UI_=WSDL Port:
-SERVICE_IMPL_UI_=ServiceImpl:
-WSDL_UI_=WSDL:
-WS_NAV_JOB0=Indexing JSR-109 Web Services
-WS_NAV_JOB1=Load Web Service Components
-WS_NAV_JOB2=Add JSR-109 Web Services node to viewer
-WS_NAV_JOB3=Update JSR-109 Web Services node in viewer
-WS_NAV_JOB4=Update JSR-109 Web Services node in viewer
-WS_NAV_JOB5=Updating Index of Web Service Components
diff --git a/plugins/org.eclipse.jst.j2ee.webservice.ui/webservices_ui/org/eclipse/jst/j2ee/internal/webservice/NewProjectsListener.java b/plugins/org.eclipse.jst.j2ee.webservice.ui/webservices_ui/org/eclipse/jst/j2ee/internal/webservice/NewProjectsListener.java
deleted file mode 100644
index fbf0159..0000000
--- a/plugins/org.eclipse.jst.j2ee.webservice.ui/webservices_ui/org/eclipse/jst/j2ee/internal/webservice/NewProjectsListener.java
+++ /dev/null
@@ -1,119 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2003, 2007 IBM Corporation and others.
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
- *
- * Contributors:
- * IBM Corporation - initial API and implementation
- *******************************************************************************/
-package org.eclipse.jst.j2ee.internal.webservice;
-
-import org.eclipse.core.resources.IFile;
-import org.eclipse.core.resources.IResource;
-import org.eclipse.core.resources.IResourceChangeEvent;
-import org.eclipse.core.resources.IResourceChangeListener;
-import org.eclipse.core.resources.IResourceDelta;
-import org.eclipse.core.resources.IResourceDeltaVisitor;
-import org.eclipse.core.resources.ResourcesPlugin;
-import org.eclipse.core.runtime.CoreException;
-import org.eclipse.core.runtime.NullProgressMonitor;
-import org.eclipse.jst.j2ee.internal.webservice.helper.WebServicesManager;
-import org.eclipse.jst.j2ee.internal.webservice.plugin.WebServiceUIPlugin;
-import org.eclipse.jst.j2ee.internal.webservice.startup.WebserviceListener;
-
-public class NewProjectsListener implements IResourceChangeListener, IResourceDeltaVisitor {
-
-
- private WebServiceViewerSynchronization synchronization;
- private boolean listening = false;
- private boolean synchronizing = false;
- private boolean isDisposed = false;
-
- public NewProjectsListener(WebServiceViewerSynchronization sync) {
- synchronization = sync;
- if(!synchronization.webServiceProjectsExist(new NullProgressMonitor())) {
- // none exist
- WebServiceViewerSynchronization.setAreThereWebServices(false);
- }
- startListening();
- }
-
- public void dispose() {
- if(listening)
- stopListening();
- if(synchronizing)
- synchronization.stop();
- if(WebserviceListener.getInstance() != null
- && !WebserviceListener.getInstance().isListening()){
- WebserviceListener.getInstance().startListening();
- }
- isDisposed = true;
- }
-
- public void resourceChanged(IResourceChangeEvent event) {
- try {
- event.getDelta().accept(this);
- } catch (CoreException e) {
- WebServiceUIPlugin.logError(0, e.getMessage(), e);
- }
- }
-
- public boolean visit(IResourceDelta delta) throws CoreException {
-
- IResource resource = delta.getResource();
- switch (resource.getType()) {
- case IResource.ROOT :
- return true;
- case IResource.PROJECT:
- if(listening && (delta.getKind() == IResourceDelta.ADDED || delta.getKind() == IResourceDelta.CHANGED)){
- if(WebServiceViewerSynchronization.isInteresting(resource.getProject()) && !synchronization.hasNavigatorGroupBeenAdded()) {
- return true;
- }
- }
- break;
- case IResource.FOLDER :
- if(listening && (delta.getKind() == IResourceDelta.ADDED || delta.getKind() == IResourceDelta.CHANGED)) {
- return true;
- }
- break;
- case IResource.FILE :
- if(listening && delta.getKind() == IResourceDelta.ADDED) {
- if(WebServicesManager.isFileInteresting((IFile)resource)){
- stopListening();
- if(!synchronizing){
- synchronizing = true;
- synchronization.start();
- }
- // set it to true, add the node if not already added
- WebServiceViewerSynchronization.setAreThereWebServices(true);
- if(!synchronization.hasNavigatorGroupBeenAdded()){
- synchronization.addWebServiceNode();
- synchronization.indexJobScheduled = false;
- }
- }
- }
- }
-
- return false;
- }
-
- void startListening() {
- ResourcesPlugin.getWorkspace().addResourceChangeListener(this, IResourceChangeEvent.POST_CHANGE);
- listening = true;
- }
-
- void stopListening() {
- ResourcesPlugin.getWorkspace().removeResourceChangeListener(this);
- listening = false;
- }
-
- boolean isListening() {
- return listening;
- }
-
- boolean isDisposed() {
- return isDisposed;
- }
-}
diff --git a/plugins/org.eclipse.jst.j2ee.webservice.ui/webservices_ui/org/eclipse/jst/j2ee/internal/webservice/OpenExternalWSDLAction.java b/plugins/org.eclipse.jst.j2ee.webservice.ui/webservices_ui/org/eclipse/jst/j2ee/internal/webservice/OpenExternalWSDLAction.java
deleted file mode 100644
index 146fe80..0000000
--- a/plugins/org.eclipse.jst.j2ee.webservice.ui/webservices_ui/org/eclipse/jst/j2ee/internal/webservice/OpenExternalWSDLAction.java
+++ /dev/null
@@ -1,65 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2003, 2006 IBM Corporation and others.
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
- *
- * Contributors:
- * IBM Corporation - initial API and implementation
- *******************************************************************************/
-
-package org.eclipse.jst.j2ee.internal.webservice;
-
-import java.net.URL;
-
-import org.eclipse.emf.ecore.EObject;
-import org.eclipse.emf.ecore.resource.Resource;
-import org.eclipse.jface.viewers.IStructuredSelection;
-import org.eclipse.jst.j2ee.internal.actions.AbstractOpenAction;
-import org.eclipse.jst.j2ee.internal.plugin.J2EEUIPlugin;
-import org.eclipse.jst.j2ee.internal.webservice.helper.WebServicesManager;
-import org.eclipse.jst.j2ee.internal.webservice.plugin.WebServiceUIPlugin;
-import org.eclipse.jst.j2ee.internal.webservices.WSDLServiceExtManager;
-import org.eclipse.jst.j2ee.internal.webservices.WSDLServiceHelper;
-import org.eclipse.ui.browser.IWebBrowser;
-import org.eclipse.ui.browser.IWorkbenchBrowserSupport;
-import org.eclipse.ui.plugin.AbstractUIPlugin;
-
-/**
- * @author jlanuti
- */
-public class OpenExternalWSDLAction extends AbstractOpenAction {
-
- String uri = ""; //$NON-NLS-1$
-
- /**
- * @param text
- */
- public OpenExternalWSDLAction(String text) {
- super(text);
- this.setImageDescriptor(AbstractUIPlugin.imageDescriptorFromPlugin(J2EEUIPlugin.PLUGIN_ID, "icons/web_type.gif")); //$NON-NLS-1$
- }
-
- @Override
- public void run() {
- try {
- IWorkbenchBrowserSupport browserSupport = WebServiceUIPlugin.getDefault().getWorkbench().getBrowserSupport();
- IWebBrowser browser = browserSupport.createBrowser(IWorkbenchBrowserSupport.LOCATION_BAR | IWorkbenchBrowserSupport.NAVIGATION_BAR,"WSDL","",""); //$NON-NLS-1$ //$NON-NLS-2$ //$NON-NLS-3$
- browser.openURL(new URL(uri));
- } catch (Exception e) {
- //Ignore
- }
- }
-
- @Override
- public boolean updateSelection(IStructuredSelection s) {
- Object obj = s.getFirstElement();
- WSDLServiceHelper serviceHelper = WSDLServiceExtManager.getServiceHelper();
- if (serviceHelper.isWSDLResource(obj))
- uri = ((Resource) obj).getURI().toString();
- else if (serviceHelper.isService(obj))
- uri = WebServicesManager.getInstance().getWSDLResource((EObject)obj).getURI().toString();
- return super.updateSelection(s);
- }
-}
diff --git a/plugins/org.eclipse.jst.j2ee.webservice.ui/webservices_ui/org/eclipse/jst/j2ee/internal/webservice/WebServiceAdapterFactory.java b/plugins/org.eclipse.jst.j2ee.webservice.ui/webservices_ui/org/eclipse/jst/j2ee/internal/webservice/WebServiceAdapterFactory.java
deleted file mode 100644
index 3ca247a..0000000
--- a/plugins/org.eclipse.jst.j2ee.webservice.ui/webservices_ui/org/eclipse/jst/j2ee/internal/webservice/WebServiceAdapterFactory.java
+++ /dev/null
@@ -1,62 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2003, 2006 IBM Corporation and others.
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
- *
- * Contributors:
- * IBM Corporation - initial API and implementation
- *******************************************************************************/
-/*
- * Created on Mar 4, 2004
- *
- * To change the template for this generated file go to
- * Window - Preferences - Java - Code Generation - Code and Comments
- */
-package org.eclipse.jst.j2ee.internal.webservice;
-
-import org.eclipse.emf.ecore.EObject;
-import org.eclipse.emf.ecore.resource.Resource;
-import org.eclipse.jst.j2ee.internal.webservice.helper.WebServicesManager;
-import org.eclipse.jst.j2ee.internal.webservices.WSDLServiceExtManager;
-import org.eclipse.jst.j2ee.internal.webservices.WSDLServiceHelper;
-import org.eclipse.jst.j2ee.navigator.internal.J2EEEMFAdapterFactory;
-import org.eclipse.wst.common.internal.emfworkbench.WorkbenchResourceHelper;
-
-/**
- * @author jlanuti
- *
- * To change the template for this generated type comment go to Window - Preferences - Java - Code
- * Generation - Code and Comments
- */
-public class WebServiceAdapterFactory extends J2EEEMFAdapterFactory {
-
- /**
- * Default constructor
- */
- public WebServiceAdapterFactory() {
- super();
- }
-
- /*
- * (non-Javadoc)
- *
- * @see org.eclipse.core.runtime.IAdapterFactory#getAdapter(java.lang.Object, java.lang.Class)
- */
- @Override
- public Object getAdapter(Object adaptableObject, Class adapterType) {
- Resource res = null;
- WSDLServiceHelper serviceHelper = WSDLServiceExtManager.getServiceHelper();
- if (serviceHelper.isService(adaptableObject))
- res = WebServicesManager.getInstance().getWsddResource((EObject) adaptableObject);
- if (res == null)
- res = WebServicesManager.getInstance().getWSDLResource((EObject) adaptableObject);
- if (res != null && adapterType == J2EEEMFAdapterFactory.IFILE_CLASS)
- return WorkbenchResourceHelper.getFile(res);
- else if (res != null && adapterType == J2EEEMFAdapterFactory.IRESOURCE_CLASS)
- return WorkbenchResourceHelper.getFile(res);
- else
- return super.getAdapter(adaptableObject, adapterType);
- }
-}
diff --git a/plugins/org.eclipse.jst.j2ee.webservice.ui/webservices_ui/org/eclipse/jst/j2ee/internal/webservice/WebServiceFilesContribution.java b/plugins/org.eclipse.jst.j2ee.webservice.ui/webservices_ui/org/eclipse/jst/j2ee/internal/webservice/WebServiceFilesContribution.java
deleted file mode 100644
index b40b86e..0000000
--- a/plugins/org.eclipse.jst.j2ee.webservice.ui/webservices_ui/org/eclipse/jst/j2ee/internal/webservice/WebServiceFilesContribution.java
+++ /dev/null
@@ -1,78 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2003, 2005 IBM Corporation and others.
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
- *
- * Contributors:
- * IBM Corporation - initial API and implementation
- *******************************************************************************/
-/*
- * Created on Jan 23, 2004
- *
- * To change the template for this generated file go to
- * Window - Preferences - Java - Code Generation - Code and Comments
- */
-package org.eclipse.jst.j2ee.internal.webservice;
-
-import java.util.ArrayList;
-import java.util.List;
-
-import org.eclipse.jst.j2ee.webservice.wsdd.WebServiceDescription;
-
-
-/**
- * @author jlanuti
- *
- * To change the template for this generated type comment go to Window - Preferences - Java - Code
- * Generation - Code and Comments
- */
-public class WebServiceFilesContribution {
-
- protected WebServiceDescription webService;
- protected List allFiles = null;
-
- /**
- * Constructor
- */
- public WebServiceFilesContribution(WebServiceDescription webService) {
- super();
- this.webService = webService;
- }
-
- /*
- * (non-Javadoc)
- *
- * @see java.lang.Object#toString()
- */
- @Override
- public String toString() {
- return WebServiceUIResourceHandler.WebServiceFilesContribution_UI_0;
- }
-
- public String getWSDLFile() {
- return webService.getWsdlFile();
- }
-
- public String getMappingFile() {
- return webService.getJaxrpcMappingFile();
- }
-
- public List getAllFiles() {
- if (allFiles == null) {
- allFiles = new ArrayList();
- allFiles.add(getWSDLFile());
- allFiles.add(getMappingFile());
- }
- return allFiles;
- }
-
- /**
- * @return Returns the webService.
- */
- public WebServiceDescription getWebService() {
- return webService;
- }
-
-}
diff --git a/plugins/org.eclipse.jst.j2ee.webservice.ui/webservices_ui/org/eclipse/jst/j2ee/internal/webservice/WebServiceNavigatorGroup.java b/plugins/org.eclipse.jst.j2ee.webservice.ui/webservices_ui/org/eclipse/jst/j2ee/internal/webservice/WebServiceNavigatorGroup.java
deleted file mode 100644
index e625a64..0000000
--- a/plugins/org.eclipse.jst.j2ee.webservice.ui/webservices_ui/org/eclipse/jst/j2ee/internal/webservice/WebServiceNavigatorGroup.java
+++ /dev/null
@@ -1,64 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2003, 2005 IBM Corporation and others.
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
- *
- * Contributors:
- * IBM Corporation - initial API and implementation
- *******************************************************************************/
-/*
- * Created on Jan 20, 2004
- *
- * To change the template for this generated file go to
- * Window - Preferences - Java - Code Generation - Code and Comments
- */
-package org.eclipse.jst.j2ee.internal.webservice;
-
-import org.eclipse.core.resources.IWorkspaceRoot;
-
-
-/**
- * @author jlanuti
- *
- * To change the template for this generated type comment go to Window - Preferences - Java - Code
- * Generation - Code and Comments
- */
-public class WebServiceNavigatorGroup {
-
- private String label = WebServiceUIResourceHandler.WebServiceNavigatorGroup_UI_0;
- private IWorkspaceRoot root;
-
- /**
- * Default constructor
- */
- public WebServiceNavigatorGroup(IWorkspaceRoot wsRoot) {
- super();
- root = wsRoot;
- }
-
- /**
- * @see java.lang.Object#toString()
- */
- @Override
- public String toString() {
- return label;
- }
-
- /**
- * @return Returns the root.
- */
- public IWorkspaceRoot getRoot() {
- return root;
- }
-
- /**
- * @param root
- * The root to set.
- */
- public void setRoot(IWorkspaceRoot root) {
- this.root = root;
- }
-
-}
diff --git a/plugins/org.eclipse.jst.j2ee.webservice.ui/webservices_ui/org/eclipse/jst/j2ee/internal/webservice/WebServiceNavigatorGroupType.java b/plugins/org.eclipse.jst.j2ee.webservice.ui/webservices_ui/org/eclipse/jst/j2ee/internal/webservice/WebServiceNavigatorGroupType.java
deleted file mode 100644
index 40fd3ba..0000000
--- a/plugins/org.eclipse.jst.j2ee.webservice.ui/webservices_ui/org/eclipse/jst/j2ee/internal/webservice/WebServiceNavigatorGroupType.java
+++ /dev/null
@@ -1,195 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2003, 2007 IBM Corporation and others.
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
- *
- * Contributors:
- * IBM Corporation - initial API and implementation
- *******************************************************************************/
-/*
- * Created on Feb 25, 2004
- *
- * To change the template for this generated file go to Window - Preferences - Java - Code
- * Generation - Code and Comments
- */
-package org.eclipse.jst.j2ee.internal.webservice;
-
-import java.util.ArrayList;
-import java.util.List;
-
-import org.eclipse.emf.common.notify.AdapterFactory;
-import org.eclipse.emf.ecore.EObject;
-import org.eclipse.emf.edit.provider.ITreeItemContentProvider;
-import org.eclipse.jst.j2ee.internal.webservice.helper.WebServicesManager;
-import org.eclipse.jst.j2ee.webservice.wsclient.ServiceRef;
-import org.eclipse.jst.j2ee.webservice.wsdd.PortComponent;
-import org.eclipse.ui.IActionFilter;
-
-/**
- * @author jlanuti
- *
- * To change the template for this generated type comment go to Window - Preferences - Java - Code
- * Generation - Code and Comments
- */
-public class WebServiceNavigatorGroupType implements IActionFilter {
-
- private static final Class ITreeItemContentProviderClass = ITreeItemContentProvider.class;
-
- private static final Object[] NO_CHILDREN = new Object[0];
-
- public static final int SERVICES = 0;
- public static final int CLIENTS = 2;
- public static final int HANDLERS = 3;
-
- public static final String SERVICES_UI = WebServiceUIResourceHandler.WebServiceNavigatorGroupType_UI_0;
- public static final String CLIENTS_UI = WebServiceUIResourceHandler.WebServiceNavigatorGroupType_UI_1;
- public static final String HANDLERS_UI = WebServiceUIResourceHandler.WebServiceNavigatorGroupType_UI_2;
-
- private int TYPE;
- private EObject wsdlService = null;
- private ServiceRef serviceRef = null;
- private final AdapterFactory adapterFactory;
-
- /**
- * Create a specific type of web service navigator grouping
- */
- public WebServiceNavigatorGroupType(int groupType, AdapterFactory factory) {
- super();
- TYPE = groupType;
- adapterFactory = factory;
- }
-
- /**
- * Create a specific type of web service navigator grouping
- */
- public WebServiceNavigatorGroupType(int groupType, EObject wsdlService, AdapterFactory factory) {
- super();
- TYPE = groupType;
- this.wsdlService = wsdlService;
- adapterFactory = factory;
- }
-
- /**
- * Create a specific type of web service navigator grouping
- */
- public WebServiceNavigatorGroupType(int groupType, ServiceRef serviceRef, AdapterFactory factory) {
- super();
- TYPE = groupType;
- this.serviceRef = serviceRef;
- adapterFactory = factory;
- }
-
- /**
- * @return Returns the TYPE.
- */
- public int getGroupType() {
- return TYPE;
- }
-
- public boolean isServices() {
- return getGroupType() == SERVICES;
- }
-
- public boolean isClients() {
- return getGroupType() == CLIENTS;
- }
-
- public boolean isHandlers() {
- return getGroupType() == HANDLERS;
- }
-
- public EObject getWsdlService() {
- return wsdlService;
- }
-
- /*
- * (non-Javadoc)
- *
- * @see java.lang.Object#toString()
- */
- @Override
- public String toString() {
- if (isServices())
- return SERVICES_UI;
- else if (isClients())
- return CLIENTS_UI;
- else if (isHandlers())
- return HANDLERS_UI;
- else
- return super.toString();
- }
-
- /*
- * (non-Javadoc)
- *
- * @see org.eclipse.ui.IActionFilter#testAttribute(java.lang.Object, java.lang.String,
- * java.lang.String)
- */
- public boolean testAttribute(Object target, String name, String value) {
- if (target != null && target instanceof WebServiceNavigatorGroupType && value != null) {
- WebServiceNavigatorGroupType group = (WebServiceNavigatorGroupType) target;
- if (group.isClients() && value.equals(CLIENTS_UI))
- return true;
- else if (group.isServices() && value.equals(SERVICES_UI))
- return true;
- else if (group.isHandlers() && value.equals(HANDLERS_UI))
- return true;
- }
- return false;
- }
-
- /**
- * @return Returns the serviceRef.
- */
- public ServiceRef getServiceRef() {
- return serviceRef;
- }
-
-
- public Object[] getChildren() {
-
- switch (getGroupType()) {
-
- case CLIENTS :
- return WebServicesManager.getInstance().getAllWorkspaceServiceRefs().toArray();
- case HANDLERS : {
-// List result = new ArrayList();
- // handle web service handlers case
- if (getWsdlService() != null) {
- PortComponent port = WebServicesManager.getInstance().getPortComponent(getWsdlService());
- if (port != null && port.getHandlers() != null && !port.getHandlers().isEmpty()) {
-
- /*
- * The rendering in the viewer is the list of handlers from an object
- * that is never touched by the AdapterFactoryContentProvider, and
- * thus never adapted by the AdapterFactory, and thus never has an
- * ItemProvider for the viewer attached to it. The following line
- * ensures that it looks like this element was "rendered" by the
- * content provider, so that updates to the list of handlers will
- * be propagated to the viewer.
- */
- adapterFactory.adapt(port, ITreeItemContentProviderClass);
-
- return port.getHandlers().toArray();
- }
- }
- // handle service ref case
- else if (getServiceRef() != null)
- return getServiceRef().getHandlers().toArray();
-
- return NO_CHILDREN;
- }
- case SERVICES : {
- List result = new ArrayList();
- result.addAll(WebServicesManager.getInstance().getInternalWSDLServices());
- result.addAll(WebServicesManager.getInstance().getExternalWSDLServices());
- return result.toArray();
- }
- }
- return NO_CHILDREN;
-
- }
-
-}
diff --git a/plugins/org.eclipse.jst.j2ee.webservice.ui/webservices_ui/org/eclipse/jst/j2ee/internal/webservice/WebServiceUIResourceHandler.java b/plugins/org.eclipse.jst.j2ee.webservice.ui/webservices_ui/org/eclipse/jst/j2ee/internal/webservice/WebServiceUIResourceHandler.java
deleted file mode 100644
index b799e63..0000000
--- a/plugins/org.eclipse.jst.j2ee.webservice.ui/webservices_ui/org/eclipse/jst/j2ee/internal/webservice/WebServiceUIResourceHandler.java
+++ /dev/null
@@ -1,70 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2000, 2006 IBM Corporation and others.
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
- *
- * Contributors:
- * IBM Corporation - initial API and implementation
- *******************************************************************************/
-package org.eclipse.jst.j2ee.internal.webservice;
-
-import org.eclipse.osgi.util.NLS;
-
-public final class WebServiceUIResourceHandler extends NLS {
-
- private static final String BUNDLE_NAME = "webserviceui";//$NON-NLS-1$
-
- private WebServiceUIResourceHandler() {
- // Do not instantiate
- }
-
- public static String NEW_BUTTON_LABEL;
- public static String NEW_HANDLER_WIZARD_WINDOW_TITLE;
- public static String NEW_HANDLER_WIZARD_PAGE_TITLE;
- public static String NEW_HANDLER_WIZARD_PAGE_DESC;
- public static String HANDLER_DISPLAY_NAME_LABEL;
- public static String HANDLER_DESCRIPTION_LABEL;
- public static String HANDLER_NAME_LABEL;
- public static String HANDLER_CLASS_NAME_LABEL;
- public static String HANDLER_INIT_PARAM_WIZARD_WINDOW_TITLE;
- public static String HANDLER_INIT_PARAM_WIZARD_PAGE_TITLE;
- public static String HANDLER_INIT_PARAM_WIZARD_PAGE_DESC;
- public static String HANDLER_SOAP_HEADER_WIZARD_WINDOW_TITLE;
- public static String HANDLER_SOAP_HEADER_WIZARD_PAGE_TITLE;
- public static String HANDLER_SOAP_HEADER_WIZARD_PAGE_DESC;
- public static String HANDLER_NAMESPACE_URL_LABEL;
- public static String HANDLER_LOCAL_PART_LABEL;
- public static String PortComponentRefLabelProvider_UI_1;
- public static String PortComponentRefLabelProvider_UI_2;
- public static String WebServiceNavigatorGroupType_UI_0;
- public static String WebServiceNavigatorGroupType_UI_1;
- public static String WebServiceNavigatorGroupType_UI_2;
- public static String WebServiceFilesContribution_UI_0;
- public static String WebServiceGroupContentExtension_UI_1;
- public static String WebServiceNavigatorGroup_UI_0;
- public static String Server_Invalid_For_Exisitng_EAR_UI_;
- public static String ServiceReferenceSelectionWizard_UI_6;
- public static String ServiceReferenceSelectionWizard_UI_7;
- public static String ServiceReferenceSelectionPage_UI_0;
- public static String ServiceReferenceSelectionPage_UI_1;
- public static String ServiceReferenceSelectionPage_UI_2;
- public static String SERVICE_CLASSES_UI_;
- public static String PORT_UI_;
- public static String HANDLER_UI_;
- public static String WS_NAV_JOB0;
- public static String WS_NAV_JOB1;
- public static String WS_NAV_JOB2;
- public static String WS_NAV_JOB3;
- public static String WS_NAV_JOB4;
- public static String WS_NAV_JOB5;
- public static String WSDL_PORT_UI_;
- public static String SERVICE_IMPL_UI_;
- public static String WSDL_UI_;
- public static String WebServiceViewerSynchronization_Searching_for_web_service_capable_p_;
-
- static {
- NLS.initializeMessages(BUNDLE_NAME, WebServiceUIResourceHandler.class);
- }
-}
diff --git a/plugins/org.eclipse.jst.j2ee.webservice.ui/webservices_ui/org/eclipse/jst/j2ee/internal/webservice/WebServiceViewerSynchronization.java b/plugins/org.eclipse.jst.j2ee.webservice.ui/webservices_ui/org/eclipse/jst/j2ee/internal/webservice/WebServiceViewerSynchronization.java
deleted file mode 100644
index e7aca40..0000000
--- a/plugins/org.eclipse.jst.j2ee.webservice.ui/webservices_ui/org/eclipse/jst/j2ee/internal/webservice/WebServiceViewerSynchronization.java
+++ /dev/null
@@ -1,360 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2003, 2007 IBM Corporation and others.
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
- *
- * Contributors:
- * IBM Corporation - initial API and implementation
- *******************************************************************************/
-package org.eclipse.jst.j2ee.internal.webservice;
-
-import org.eclipse.core.resources.IProject;
-import org.eclipse.core.resources.ResourcesPlugin;
-import org.eclipse.core.runtime.IProgressMonitor;
-import org.eclipse.core.runtime.IStatus;
-import org.eclipse.core.runtime.Status;
-import org.eclipse.core.runtime.jobs.Job;
-import org.eclipse.jface.viewers.TreeViewer;
-import org.eclipse.jst.j2ee.internal.webservice.helper.WebServiceEvent;
-import org.eclipse.jst.j2ee.internal.webservice.helper.WebServiceManagerListener;
-import org.eclipse.jst.j2ee.internal.webservice.helper.WebServicesManager;
-import org.eclipse.jst.j2ee.internal.webservice.plugin.WebServiceUIPlugin;
-import org.eclipse.jst.j2ee.navigator.internal.IJ2EENavigatorConstants;
-import org.eclipse.ui.progress.UIJob;
-import org.eclipse.wst.common.internal.emfworkbench.integration.DynamicAdapterFactory;
-import org.eclipse.wst.common.project.facet.core.internal.FacetedProjectPropertyTester;
-import org.eclipse.wst.project.facet.ProductManager;
-import org.eclipse.jst.j2ee.internal.webservice.WebServiceUIResourceHandler;
-
-public class WebServiceViewerSynchronization implements WebServiceManagerListener{
-
- public static final String ARE_THERE_WEBSERVICES = "areThereWebServices"; //$NON-NLS-1$
-
- private WebServicesManager webServicesManager = null;
-
- private static final String PROJECT_FACET = "projectFacet"; //$NON-NLS-1$
-
- /* The facets are duplicated here to avoid loading plugins just for constants */
- /* package */ static final String EAR_FACET = "jst.ear"; //$NON-NLS-1$
- /* package */ static final String APPCLIENT_FACET = "jst.appclient"; //$NON-NLS-1$
- /* package */ static final String WEB_FACET = "jst.web"; //$NON-NLS-1$
- /* package */ static final String EJB_FACET = "jst.ejb"; //$NON-NLS-1$
- /* package */ static final String UTILITY_FACET = "jst.utility"; //$NON-NLS-1$
- /* package */ static final String CONNECTOR_FACET = "jst.connector"; //$NON-NLS-1$
- /* package */ static final String STATIC_WEB_FACET = "wst.web"; //$NON-NLS-1$
-
- private static final FacetedProjectPropertyTester facetPropertyTester = new FacetedProjectPropertyTester();
-
-
- private WebServicesNavigatorContentProvider contentProvider;
-
- private Job indexJob = new WebServiceIndexJob();
- private Job updateJob = new UpdateWebServicesNodeUIJob();
- private Job removeJob = new RemoveWebServicesNodeUIJob();
-
- private boolean navigatorGroupAdded = false;
- boolean indexJobScheduled = false;
-
- private boolean initialized = false;
-
- public WebServiceViewerSynchronization(WebServicesNavigatorContentProvider provider) {
- contentProvider = provider;
- }
-
-
- public void start() {
-
- try {
-
- getWebServicesManager().addListener(this);
-
- // create the default synchronizer for any web service editor to use with view due
- // to the usage of seperate edit models.
- WebServicesNavigatorSynchronizer.createInstance(
- new DynamicAdapterFactory(IJ2EENavigatorConstants.VIEWER_ID), contentProvider);
- } finally {
- initialized = true;
- }
- }
-
- public void stop() {
- if(initialized) {
- getWebServicesManager().removeListener(this);
- // dispose current instance of web service editor/explorer synchronizer
- WebServicesNavigatorSynchronizer.disposeInstance();
- }
- }
-
- public void webServiceManagerChanged(WebServiceEvent anEvent) {
-
- switch (anEvent.getEventType()) {
- case WebServiceEvent.REFRESH:
-
- if(!hasNavigatorGroupBeenAdded()) {
- if(!hasIndexJobBeenScheduled()){
- indexJob.schedule();
- }
- if(!hasNavigatorGroupBeenAdded())
- addWebServiceNode();
- } else {
- updateJob.schedule();
- }
- break;
- case WebServiceEvent.REMOVE:
- if(hasNavigatorGroupBeenAdded())
- removeJob.schedule();
- }
- }
-
-
- void addWebServiceNode() {
- new AddWebServicesNodeUIJob().schedule();
- }
-
-
- public void startIndexJob() {
- indexJob.schedule();
- }
-
- /**
- * Employ a Test-And-Set (TST) primitive to ensure the Job is only scheduled once per load.
- *
- * @return True if the the index job has been scheduled. The value of indexJobSchedule will
- * _always_ be true after this method executes, so if false is returned, the job must be
- * scheduled by the caller.
- */
- /* package */ synchronized boolean hasIndexJobBeenScheduled() {
- if (!indexJobScheduled) {
- indexJobScheduled = true;
- return false;
- }
- return true;
- }
-
- /**
- * Multiple threads access this boolean flag, so we synchronize it to ensure that its value is
- * consistent across different threads.
- *
- * @return True if the WebServicesNavigatorGroup has already been processed and added to the
- * tree.
- */
- /* package */ synchronized boolean hasNavigatorGroupBeenAdded() {
- return navigatorGroupAdded;
- }
-
- /* package */ synchronized void setNavigatorGroupAdded(boolean hasBeenAdded) {
- navigatorGroupAdded = hasBeenAdded;
- }
-
- private WebServicesManager getWebServicesManager() {
- if (webServicesManager == null)
- webServicesManager = WebServicesManager.getInstance();
- return webServicesManager;
- }
-
- private boolean indexWebServices(IProgressMonitor monitor) {
- boolean hasChildren = false;
- if (!monitor.isCanceled()) {
- try {
- hasChildren |= getWebServicesManager().getWorkspace13ServiceRefs().size() > 0;
- } catch (RuntimeException e) {
- WebServiceUIPlugin.logError(0, e.getMessage(), e);
- }
- } else {
- return hasChildren;
- }
- monitor.worked(1);
-
- if (!monitor.isCanceled()) {
- try {
- hasChildren |= getWebServicesManager().getWorkspace14ServiceRefs().size() > 0;
- } catch (RuntimeException e) {
- WebServiceUIPlugin.logError(0, e.getMessage(), e);
- }
- } else {
- return hasChildren;
- }
- monitor.worked(1);
-
- if (!monitor.isCanceled()) {
- try {
- hasChildren |= getWebServicesManager().getInternalWSDLServices().size() > 0;
- } catch (RuntimeException e) {
- WebServiceUIPlugin.logError(0, e.getMessage(), e);
- }
- } else {
- return hasChildren;
- }
- monitor.worked(1);
-
- if (!monitor.isCanceled()) {
- try {
- hasChildren |= getWebServicesManager().getExternalWSDLServices().size() > 0;
- } catch (RuntimeException e) {
- WebServiceUIPlugin.logError(0, e.getMessage(), e);
- }
- } else {
- return hasChildren;
- }
- monitor.worked(1);
- return hasChildren;
- }
-
- /* package */ static boolean hasFacet(Object element, String facet) {
- return facetPropertyTester.test(element, PROJECT_FACET, new Object[] {}, facet);
- }
-
- /* package */ boolean webServiceProjectsExist(IProgressMonitor monitor) {
- boolean ret = false;
- IProject[] projects = ResourcesPlugin.getWorkspace().getRoot().getProjects();
-
- monitor.beginTask(WebServiceUIResourceHandler.WebServiceViewerSynchronization_Searching_for_web_service_capable_p_, projects.length);
- for (int i = 0; i < projects.length; i++) {
- if(isInteresting(projects[i])){
- ret = true;
- break;
- }
- }
- monitor.worked(1);
- return ret;
- }
-
- public static void setAreThereWebServices(boolean isThereWebServices) {
- // set the value of WebServiceViewerSynchronization.ARE_THERE_WEBSERVICES so that we do not index in future
- WebServiceUIPlugin.getDefault().getPluginPreferences().setValue(ARE_THERE_WEBSERVICES, Boolean.toString(isThereWebServices));
- WebServiceUIPlugin.getDefault().savePluginPreferences();
- }
-
- public static boolean areThereWebServices() {
- if (ProductManager.shouldUseViewerSyncForWebservices()) {
- String val = WebServiceUIPlugin.getDefault().getPluginPreferences().getString(WebServiceViewerSynchronization.ARE_THERE_WEBSERVICES);
- return Boolean.parseBoolean(val);
- }
- return false;
- }
-
- public static boolean isThereWebServicesPreferenceSet() {
- return WebServiceUIPlugin.getDefault().getPluginPreferences().contains(WebServiceViewerSynchronization.ARE_THERE_WEBSERVICES);
- }
-
-
- /* package */ public static boolean isInteresting(IProject project) {
- return hasFacet(project, WEB_FACET) ||
- hasFacet(project, EJB_FACET) ||
- hasFacet(project, APPCLIENT_FACET);
- }
-
- public class WebServiceIndexJob extends Job {
-
- public WebServiceIndexJob() {
- super(WebServiceUIResourceHandler.WS_NAV_JOB0);
- // [204833]
- //setRule(new NonConflictingRule());
- setRule(ResourcesPlugin.getWorkspace().getRoot());
- setSystem(true);
- }
-
- @Override
- protected IStatus run(IProgressMonitor monitor) {
- monitor.beginTask(WebServiceUIResourceHandler.WS_NAV_JOB1, 5);
-
- boolean isThereWebServices = false;
- if (webServiceProjectsExist(monitor)) {
- isThereWebServices = indexWebServices(monitor);
- if( isThereWebServices ){
- setAreThereWebServices(isThereWebServices);
- }
- }else{
- setAreThereWebServices(false);
- }
- if(!hasNavigatorGroupBeenAdded()){
- if(isThereWebServices)
- addWebServiceNode();
- }
-
- monitor.done();
-
- return Status.OK_STATUS;
- }
- }
-
- public class AddWebServicesNodeUIJob extends UIJob {
-
-
- public AddWebServicesNodeUIJob() {
- super(WebServiceUIResourceHandler.WS_NAV_JOB2);
- }
-
- @Override
- public IStatus runInUIThread(IProgressMonitor monitor) {
-
- TreeViewer viewer = contentProvider.getViewer();
- if(!viewer.getControl().isDisposed()) {
- viewer.add(viewer.getInput(), contentProvider.getNavigatorGroup());
- }
- setNavigatorGroupAdded(true);
- return Status.OK_STATUS;
- }
- }
-
- public class UpdateWebServicesNodeUIJob extends UIJob {
-
- public UpdateWebServicesNodeUIJob () {
- super(WebServiceUIResourceHandler.WS_NAV_JOB3);
- }
-
- @Override
- public IStatus runInUIThread(IProgressMonitor monitor) {
- TreeViewer viewer = contentProvider.getViewer();
-
- if(!viewer.getControl().isDisposed()) {
- if(hasNavigatorGroupBeenAdded())
- contentProvider.getViewer().refresh(contentProvider.getNavigatorGroup());
- else {
- viewer.add(viewer.getInput(), contentProvider.getNavigatorGroup());
- setNavigatorGroupAdded(true);
- }
- }
- return Status.OK_STATUS;
- }
- }
-
- public class RemoveWebServicesNodeUIJob extends UIJob {
-
- public RemoveWebServicesNodeUIJob() {
- super(WebServiceUIResourceHandler.WS_NAV_JOB4);
- // [204833]
- setRule(ResourcesPlugin.getWorkspace().getRoot());
- setSystem(true);
- }
-
- @Override
- public IStatus runInUIThread(IProgressMonitor monitor) {
-
- monitor.beginTask(WebServiceUIResourceHandler.WS_NAV_JOB5, 4);
-
- TreeViewer viewer = contentProvider.getViewer();
-
- if(!viewer.getControl().isDisposed()) {
- if(hasNavigatorGroupBeenAdded()){
- if (indexWebServices(monitor)) {
- viewer.refresh(contentProvider.getNavigatorGroup());
- setAreThereWebServices(true);
- } else {
- viewer.remove(contentProvider.getNavigatorGroup());
- setNavigatorGroupAdded(false);
- setAreThereWebServices(false);
- if(contentProvider.projectListener != null && !contentProvider.projectListener.isDisposed()
- && !contentProvider.projectListener.isListening())
- contentProvider.projectListener.startListening();
- }
- }
- }
- return Status.OK_STATUS;
- }
- }
-
-
-}
diff --git a/plugins/org.eclipse.jst.j2ee.webservice.ui/webservices_ui/org/eclipse/jst/j2ee/internal/webservice/WebServicesNavigatorContentProvider.java b/plugins/org.eclipse.jst.j2ee.webservice.ui/webservices_ui/org/eclipse/jst/j2ee/internal/webservice/WebServicesNavigatorContentProvider.java
deleted file mode 100644
index d683312..0000000
--- a/plugins/org.eclipse.jst.j2ee.webservice.ui/webservices_ui/org/eclipse/jst/j2ee/internal/webservice/WebServicesNavigatorContentProvider.java
+++ /dev/null
@@ -1,333 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2003, 2007 IBM Corporation and others.
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
- *
- * Contributors:
- * IBM Corporation - initial API and implementation
- *******************************************************************************/
-/*
- * Created on Jan 19, 2004
- *
- * To change the template for this generated file go to Window - Preferences - Java - Code
- * Generation - Code and Comments
- */
-package org.eclipse.jst.j2ee.internal.webservice;
-
-import java.util.ArrayList;
-import java.util.Collection;
-import java.util.HashMap;
-import java.util.List;
-
-import org.eclipse.core.resources.IWorkspaceRoot;
-import org.eclipse.core.resources.ResourcesPlugin;
-import org.eclipse.emf.common.notify.AdapterFactory;
-import org.eclipse.emf.common.notify.Notification;
-import org.eclipse.emf.ecore.EObject;
-import org.eclipse.emf.ecore.resource.Resource;
-import org.eclipse.emf.edit.ui.provider.AdapterFactoryContentProvider;
-import org.eclipse.jface.viewers.TreeViewer;
-import org.eclipse.jface.viewers.Viewer;
-import org.eclipse.jst.j2ee.internal.webservice.helper.WebServicesManager;
-import org.eclipse.jst.j2ee.internal.webservices.WSDLServiceExtManager;
-import org.eclipse.jst.j2ee.navigator.internal.IJ2EENavigatorConstants;
-import org.eclipse.jst.j2ee.webservice.wsclient.ServiceRef;
-import org.eclipse.jst.j2ee.webservice.wsclient.Webservice_clientPackage;
-import org.eclipse.jst.j2ee.webservice.wsdd.Handler;
-import org.eclipse.jst.j2ee.webservice.wsdd.PortComponent;
-import org.eclipse.jst.j2ee.webservice.wsdd.WsddPackage;
-import org.eclipse.wst.common.internal.emfworkbench.integration.DynamicAdapterFactory;
-import org.eclipse.wst.project.facet.ProductManager;
-
-/**
- * @author jlanuti
- *
- * To change the template for this generated type comment go to Window - Preferences - Java - Code
- * Generation - Code and Comments
- */
-public class WebServicesNavigatorContentProvider extends AdapterFactoryContentProvider {
-
- private static final Object[] NO_CHILDREN = new Object[0];
-
- private WebServicesManager webServicesManager = null;
- private WebServiceNavigatorGroup webServiceNavigatorGroup;
- private WebServiceNavigatorGroupType SERVICES = null;
- private WebServiceNavigatorGroupType CLIENTS = null;
- private HashMap HANDLERS = new HashMap();
- private TreeViewer viewer = null;
-
- private WebServiceViewerSynchronization viewerSynchronization;
- NewProjectsListener projectListener;
-
-
- public WebServicesNavigatorContentProvider() {
- super(createAdapterFactory());
- if (ProductManager.shouldUseViewerSyncForWebservices()) {
- viewerSynchronization = new WebServiceViewerSynchronization(this);
- projectListener = new NewProjectsListener(viewerSynchronization);
- }
-
- }
-
- @Override
- public void dispose() {
- super.dispose();
- if (projectListener != null)
- projectListener.dispose();
- }
-
- /**
- * Configure and return a composite adapter factory for our contents
- */
- public static AdapterFactory createAdapterFactory() {
- return new DynamicAdapterFactory(IJ2EENavigatorConstants.VIEWER_ID);
- }
-
- /*
- * (non-Javadoc)
- *
- * @see org.eclipse.wst.common.navigator.internal.views.navigator.INavigatorContentProvider#getChildren(java.lang.Object)
- */
- @Override
- public Object[] getChildren(Object parentElement) {
-
- if (parentElement instanceof IWorkspaceRoot) {
- // return new Object[]{ getWebServicesNavigatorGroup(parentElement) };
- if(WebServiceViewerSynchronization.isThereWebServicesPreferenceSet()){
- if(WebServiceViewerSynchronization.areThereWebServices()){
- if (viewerSynchronization != null)
- viewerSynchronization.setNavigatorGroupAdded(true);
- return new Object[]{getNavigatorGroup()};
- }
- return NO_CHILDREN;
- }
- // first time on this workspace, let the job set the WebServiceViewerSynchronization.ARE_THERE_WEBSERVICES
- if (viewerSynchronization != null && !viewerSynchronization.hasIndexJobBeenScheduled()) {
- viewerSynchronization.startIndexJob();
- }
- return NO_CHILDREN;
- } else if (parentElement instanceof WebServiceNavigatorGroup){
- if (viewerSynchronization != null && !viewerSynchronization.hasIndexJobBeenScheduled()) {
- viewerSynchronization.startIndexJob();
- }
- return new Object[]{getServicesGroup(), getClientsGroup()};
-
- }else if (parentElement instanceof WebServiceNavigatorGroupType) {
- if (viewerSynchronization != null && !viewerSynchronization.hasIndexJobBeenScheduled()) {
- viewerSynchronization.startIndexJob();
- }
- WebServiceNavigatorGroupType wsGroupType = (WebServiceNavigatorGroupType) parentElement;
- return wsGroupType.getChildren();
-
- } else if (WSDLServiceExtManager.getServiceHelper().isService(parentElement))
- return getServiceLevelNodes(parentElement).toArray();
-
- else if (parentElement instanceof ServiceRef)
- return new Object[]{getHandlersGroup(parentElement)};
-
- else if (parentElement instanceof Handler || parentElement instanceof org.eclipse.jst.j2ee.webservice.wsclient.Handler || WSDLServiceExtManager.getServiceHelper().isWSDLResource(parentElement))
- return NO_CHILDREN;
-
- else
- return super.getChildren(parentElement);
- }
-
-
- private List getServiceLevelNodes(Object parentElement) {
- List result = new ArrayList();
- // add service classes
- if (getWebServicesManager().isServiceInternal((EObject) parentElement) && getWebServicesManager().getServiceImplBean((EObject) parentElement) != null)
- result.add(getWebServicesManager().getServiceImplBean((EObject) parentElement));
- // Add handlers
- if (getWebServicesManager().isServiceInternal((EObject) parentElement))
- result.add(getHandlersGroup(parentElement));
- // add wsdl file
- Resource wsdl = getWebServicesManager().getWSDLResource((EObject) parentElement);
- if (wsdl != null)
- result.add(wsdl);
- return result;
- }
-
-// private List getHandlerChildren(Object parentElement) {
-// List result = new ArrayList();
-// WebServiceNavigatorGroupType handlersGroup = (WebServiceNavigatorGroupType) parentElement;
-// // handle web service handlers case
-// if (handlersGroup.getWsdlService() != null) {
-// PortComponent port = getWebServicesManager().getPortComponent(handlersGroup.getWsdlService());
-// if (port != null && port.getHandlers() != null && !port.getHandlers().isEmpty())
-// result.addAll(port.getHandlers());
-// }
-// // handle service ref case
-// else if (handlersGroup.getServiceRef() != null) {
-// result.addAll(handlersGroup.getServiceRef().getHandlers());
-// }
-// return result;
-// }
-
- /*
- * (non-Javadoc)
- *
- * @see org.eclipse.wst.common.navigator.internal.views.navigator.INavigatorContentProvider#getParent(java.lang.Object)
- */
- @Override
- public Object getParent(Object element) {
- if (element instanceof IWorkspaceRoot)
- return null;
- else if (element instanceof WebServiceNavigatorGroup)
- return ((WebServiceNavigatorGroup) element).getRoot();
- else
- return super.getParent(element);
- }
-
- /*
- * (non-Javadoc)
- *
- * @see org.eclipse.wst.common.navigator.internal.views.navigator.INavigatorContentProvider#hasChildren(java.lang.Object)
- */
- @Override
- public boolean hasChildren(Object element) {
- return true;
- }
-
- /*
- * (non-Javadoc)
- *
- * @see org.eclipse.wst.common.navigator.internal.views.navigator.INavigatorContentProvider#inputChanged(org.eclipse.jface.viewers.Viewer,
- * java.lang.Object, java.lang.Object)
- */
- @Override
- public void inputChanged(Viewer aViewer, Object oldInput, Object newInput) {
- // TODO handle change events
- if (aViewer != null && aViewer instanceof TreeViewer)
- viewer = (TreeViewer) aViewer;
- super.inputChanged(aViewer, oldInput, newInput);
- }
-
-
- /*
- * (non-Javadoc)
- *
- * @see org.eclipse.jface.viewers.IStructuredContentProvider#getElements(java.lang.Object)
- */
- @Override
- public Object[] getElements(Object inputElement) {
- return getChildren(inputElement);
- }
-
- /**
- * @return Returns the navigatorGroup.
- */
- public WebServiceNavigatorGroup getNavigatorGroup() {
- if (null == webServiceNavigatorGroup) {
- webServiceNavigatorGroup = new WebServiceNavigatorGroup(ResourcesPlugin.getWorkspace().getRoot());
- }
- return webServiceNavigatorGroup;
- }
-
- protected WebServicesManager getWebServicesManager() {
- if (webServicesManager == null)
- webServicesManager = WebServicesManager.getInstance();
- return webServicesManager;
- }
-
- private WebServiceNavigatorGroupType getServicesGroup() {
- if (SERVICES == null)
- SERVICES = new WebServiceNavigatorGroupType(WebServiceNavigatorGroupType.SERVICES, getAdapterFactory());
- return SERVICES;
- }
-
- private WebServiceNavigatorGroupType getClientsGroup() {
- if (CLIENTS == null)
- CLIENTS = new WebServiceNavigatorGroupType(WebServiceNavigatorGroupType.CLIENTS, getAdapterFactory());
- return CLIENTS;
- }
-
- private WebServiceNavigatorGroupType getHandlersGroup(Object key) {
- if (key == null)
- return null;
- WebServiceNavigatorGroupType handler = null;
- handler = (WebServiceNavigatorGroupType) HANDLERS.get(key);
- if (handler == null) {
- if (WSDLServiceExtManager.getServiceHelper().isService(key))
- handler = new WebServiceNavigatorGroupType(WebServiceNavigatorGroupType.HANDLERS, (EObject) key, getAdapterFactory());
- else if (key instanceof ServiceRef)
- handler = new WebServiceNavigatorGroupType(WebServiceNavigatorGroupType.HANDLERS, (ServiceRef) key, getAdapterFactory());
-
- if (handler != null)
- HANDLERS.put(key, handler);
- }
- return handler;
- }
-
- /**
- * @return Returns the viewer.
- */
- public TreeViewer getViewer() {
- return viewer;
- }
-
- @Override
- public void notifyChanged(Notification notification) {
-
- if(notification.getNotifier() instanceof ServiceRef) {
- switch(notification.getFeatureID(ServiceRef.class)) {
- case Webservice_clientPackage.SERVICE_REF__HANDLERS:
-
- WebServiceNavigatorGroupType handlersGroup = getHandlersGroup(notification.getNotifier());
-
- if(handlersGroup != null) {
- switch(notification.getEventType()) {
- case Notification.ADD:
- viewer.add(handlersGroup, notification.getNewValue());
- break;
- case Notification.ADD_MANY:
- viewer.add(handlersGroup, ((Collection)notification.getNewValue()).toArray());
- break;
- case Notification.REMOVE:
- viewer.remove(notification.getOldValue());
- break;
- case Notification.REMOVE_MANY:
- viewer.remove(((Collection)notification.getOldValue()).toArray());
- break;
- }
- }
- return;
- default:
- }
- } else if(notification.getNotifier() instanceof PortComponent) {
- switch(notification.getFeatureID(PortComponent.class)) {
- case WsddPackage.PORT_COMPONENT__HANDLERS:
-
- PortComponent pComp = (PortComponent) notification.getNotifier();
- EObject service = getWebServicesManager().getService(pComp);
- if(service != null) {
- WebServiceNavigatorGroupType handlersGroup = getHandlersGroup(service);
- if(handlersGroup != null) {
- switch(notification.getEventType()) {
- case Notification.ADD:
- viewer.add(handlersGroup, notification.getNewValue());
- break;
- case Notification.ADD_MANY:
- viewer.add(handlersGroup, ((Collection)notification.getNewValue()).toArray());
- break;
- case Notification.REMOVE:
- viewer.remove(notification.getOldValue());
- break;
- case Notification.REMOVE_MANY:
- viewer.remove(((Collection)notification.getOldValue()).toArray());
- break;
- }
- }
- }
-
-
- return;
- default:
- }
- }
- super.notifyChanged(notification);
- }
-
-}
diff --git a/plugins/org.eclipse.jst.j2ee.webservice.ui/webservices_ui/org/eclipse/jst/j2ee/internal/webservice/WebServicesNavigatorGroupOpenListener.java b/plugins/org.eclipse.jst.j2ee.webservice.ui/webservices_ui/org/eclipse/jst/j2ee/internal/webservice/WebServicesNavigatorGroupOpenListener.java
deleted file mode 100644
index 3991451..0000000
--- a/plugins/org.eclipse.jst.j2ee.webservice.ui/webservices_ui/org/eclipse/jst/j2ee/internal/webservice/WebServicesNavigatorGroupOpenListener.java
+++ /dev/null
@@ -1,167 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2005, 2006 IBM Corporation and others.
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
- *
- * Contributors:
- * IBM Corporation - initial API and implementation
- *******************************************************************************/
-/*
- * Created on Feb 10, 2005
- */
-package org.eclipse.jst.j2ee.internal.webservice;
-
-import java.util.ArrayList;
-import java.util.List;
-
-import org.eclipse.core.resources.IFile;
-import org.eclipse.emf.ecore.resource.Resource;
-import org.eclipse.jface.action.IMenuManager;
-import org.eclipse.jface.viewers.IStructuredSelection;
-import org.eclipse.jface.viewers.StructuredSelection;
-import org.eclipse.jst.j2ee.internal.actions.OpenJ2EEResourceAction;
-import org.eclipse.jst.j2ee.internal.webservice.helper.WebServicesManager;
-import org.eclipse.jst.j2ee.internal.webservices.WSDLServiceExtManager;
-import org.eclipse.jst.j2ee.internal.webservices.WSDLServiceHelper;
-import org.eclipse.jst.j2ee.webservice.wsdd.WsddResource;
-import org.eclipse.ui.IActionBars;
-import org.eclipse.ui.actions.ActionContext;
-import org.eclipse.ui.navigator.CommonActionProvider;
-import org.eclipse.ui.navigator.ICommonActionConstants;
-import org.eclipse.ui.navigator.ICommonActionExtensionSite;
-import org.eclipse.ui.navigator.ICommonMenuConstants;
-import org.eclipse.wst.common.internal.emfworkbench.WorkbenchResourceHelper;
-import org.eclipse.wst.wsdl.internal.impl.ServiceImpl;
-import org.eclipse.wst.wsdl.util.WSDLResourceImpl;
-
-/**
- * @author jlanuti
- */
-public class WebServicesNavigatorGroupOpenListener extends CommonActionProvider {
-
- private OpenExternalWSDLAction openExternalWSDLAction;
- private OpenJ2EEResourceAction openAction;
-
- /**
- * @param text
- */
- public WebServicesNavigatorGroupOpenListener() {
- }
-
- @Override
- public void init(ICommonActionExtensionSite aConfig) {
- openExternalWSDLAction = new OpenExternalWSDLAction(WebServiceUIResourceHandler.WebServiceGroupContentExtension_UI_1);
- openAction = new OpenJ2EEResourceAction();
- }
-
- @Override
- public void setContext(ActionContext aContext) {
- if (aContext != null && aContext.getSelection() instanceof IStructuredSelection) {
- IStructuredSelection selection = (IStructuredSelection) aContext.getSelection();
- WSDLServiceHelper serviceHelper = WSDLServiceExtManager.getServiceHelper();
- if (selection == null || selection.getFirstElement()==null)
- return;
- Object selectedObject = selection.getFirstElement();
- if (serviceHelper==null)
- return;
- else if (selectedObject instanceof ServiceImpl) {
- WsddResource resource = WebServicesManager.getInstance().getWsddResource((ServiceImpl)selectedObject);
- if (resource == null) {
- openExternalWSDLAction.selectionChanged(selection);
- super.setContext(aContext);
- return;
- }
- List wsddSelection = new ArrayList();
- wsddSelection.add(resource);
- openAction.selectionChanged(new StructuredSelection(wsddSelection));
- }
- else if (serviceHelper.isWSDLResource(selectedObject)) {
- Resource wsdl = (Resource) selectedObject;
- IFile wsdlFile = WorkbenchResourceHelper.getFile(wsdl);
- if (wsdlFile == null || !wsdlFile.exists()) {
- openExternalWSDLAction.selectionChanged(selection);
- super.setContext(aContext);
- return;
- }
- openAction.selectionChanged(selection);
- }
-
- else {
- openAction.selectionChanged(selection);
- }
- }
- super.setContext(aContext);
- }
-
- @Override
- public void fillActionBars(IActionBars theActionBars) {
- if (getContext()==null || getContext().getSelection().isEmpty())
- return;
- IStructuredSelection selection = (IStructuredSelection) getContext().getSelection();
-
- if (selection.getFirstElement() instanceof ServiceImpl) {
- ServiceImpl wsdl = (ServiceImpl) selection.getFirstElement();
- WsddResource resource = WebServicesManager.getInstance().getWsddResource(wsdl);
- if (resource == null) {
- IFile wsdlFile = WorkbenchResourceHelper.getFile(wsdl);
- if (wsdlFile == null || !wsdlFile.exists()) {
- openExternalWSDLAction.selectionChanged(selection);
- theActionBars.setGlobalActionHandler(ICommonActionConstants.OPEN, openExternalWSDLAction);
- return;
- }
- openAction.selectionChanged(selection);
- theActionBars.setGlobalActionHandler(ICommonActionConstants.OPEN, openAction);
- return;
- }
- List wsddSelection = new ArrayList();
- wsddSelection.add(resource);
- openAction.selectionChanged(new StructuredSelection(wsddSelection));
- theActionBars.setGlobalActionHandler(ICommonActionConstants.OPEN, openAction);
- return;
-
- } else if (selection.getFirstElement() instanceof WSDLResourceImpl) {
- WSDLResourceImpl wsdl = (WSDLResourceImpl) selection.getFirstElement();
- IFile wsdlFile = WorkbenchResourceHelper.getFile(wsdl);
- if (wsdlFile == null || !wsdlFile.exists()) {
- openExternalWSDLAction.selectionChanged(selection);
- theActionBars.setGlobalActionHandler(ICommonActionConstants.OPEN, openExternalWSDLAction);
- return;
- }
- }
-
- openAction.selectionChanged(selection);
- if(openAction.isEnabled())
- theActionBars.setGlobalActionHandler(ICommonActionConstants.OPEN, openAction);
- return;
- }
-
- @Override
- public void fillContextMenu(IMenuManager menu) {
- if (getContext()==null || getContext().getSelection().isEmpty())
- return;
- IStructuredSelection selection = (IStructuredSelection) getContext().getSelection();
- if (selection.getFirstElement() instanceof ServiceImpl) {
- ServiceImpl wsdl = (ServiceImpl) selection.getFirstElement();
- IFile wsdlFile = WorkbenchResourceHelper.getFile(wsdl);
- if (wsdlFile == null || !wsdlFile.exists()) {
- openExternalWSDLAction.selectionChanged(selection);
- menu.insertAfter(ICommonMenuConstants.GROUP_OPEN, openExternalWSDLAction);
- return;
- }
- }
- else if (selection.getFirstElement() instanceof WSDLResourceImpl) {
- WSDLResourceImpl wsdl = (WSDLResourceImpl) selection.getFirstElement();
- IFile wsdlFile = WorkbenchResourceHelper.getFile(wsdl);
- if (wsdlFile == null || !wsdlFile.exists()) {
- openExternalWSDLAction.selectionChanged(selection);
- menu.insertAfter(ICommonMenuConstants.GROUP_OPEN, openExternalWSDLAction);
- return;
- }
- }
- openAction.selectionChanged(selection);
- if (openAction.isEnabled())
- menu.insertAfter(ICommonMenuConstants.GROUP_OPEN, openAction);
- }
-}
diff --git a/plugins/org.eclipse.jst.j2ee.webservice.ui/webservices_ui/org/eclipse/jst/j2ee/internal/webservice/WebServicesNavigatorLabelProvider.java b/plugins/org.eclipse.jst.j2ee.webservice.ui/webservices_ui/org/eclipse/jst/j2ee/internal/webservice/WebServicesNavigatorLabelProvider.java
deleted file mode 100644
index 63d6d76..0000000
--- a/plugins/org.eclipse.jst.j2ee.webservice.ui/webservices_ui/org/eclipse/jst/j2ee/internal/webservice/WebServicesNavigatorLabelProvider.java
+++ /dev/null
@@ -1,194 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2003, 2005 IBM Corporation and others.
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
- *
- * Contributors:
- * IBM Corporation - initial API and implementation
- *******************************************************************************/
-/*
- * Created on Jan 19, 2004
- *
- * To change the template for this generated file go to
- * Window - Preferences - Java - Code Generation - Code and Comments
- */
-package org.eclipse.jst.j2ee.internal.webservice;
-
-import org.eclipse.core.resources.IFile;
-import org.eclipse.core.resources.IProject;
-import org.eclipse.emf.common.notify.AdapterFactory;
-import org.eclipse.emf.ecore.EObject;
-import org.eclipse.emf.ecore.resource.Resource;
-import org.eclipse.emf.edit.ui.provider.AdapterFactoryLabelProvider;
-import org.eclipse.jem.util.emf.workbench.ProjectUtilities;
-import org.eclipse.jface.viewers.ILabelProviderListener;
-import org.eclipse.jst.j2ee.ejb.Session;
-import org.eclipse.jst.j2ee.internal.plugin.J2EEUIPlugin;
-import org.eclipse.jst.j2ee.internal.webservice.helper.WebServicesManager;
-import org.eclipse.jst.j2ee.internal.webservices.WSDLServiceExtManager;
-import org.eclipse.jst.j2ee.internal.webservices.WSDLServiceHelper;
-import org.eclipse.jst.j2ee.webservice.wsclient.ServiceRef;
-import org.eclipse.jst.j2ee.webservice.wsdd.EJBLink;
-import org.eclipse.jst.j2ee.webservice.wsdd.Handler;
-import org.eclipse.jst.j2ee.webservice.wsdd.PortComponent;
-import org.eclipse.jst.j2ee.webservice.wsdd.ServiceImplBean;
-import org.eclipse.jst.j2ee.webservice.wsdd.ServletLink;
-import org.eclipse.jst.j2ee.webservice.wsdd.WSDLPort;
-import org.eclipse.jst.j2ee.webservice.wsdd.WebServiceDescription;
-import org.eclipse.swt.graphics.Image;
-import org.eclipse.wst.common.internal.emfworkbench.WorkbenchResourceHelper;
-import org.eclipse.wst.common.internal.emfworkbench.integration.DynamicAdapterFactory;
-
-/**
- * @author jlanuti
- *
- * To change the template for this generated type comment go to Window - Preferences - Java - Code
- * Generation - Code and Comments
- */
-public class WebServicesNavigatorLabelProvider extends AdapterFactoryLabelProvider {
-
- private final static String VIEWER_ID = "org.eclipse.wst.navigator.ui.WTPCommonNavigator";//$NON-NLS-1$
-
- public WebServicesNavigatorLabelProvider() {
- super(createAdapterFactory());
- }
-
- /**
- * Configure and return a composite adapter factory for our contents
- */
- public static AdapterFactory createAdapterFactory() {
- return new DynamicAdapterFactory(VIEWER_ID);
- }
-
- /*
- * (non-Javadoc)
- *
- * @see org.eclipse.jface.viewers.ILabelProvider#getImage(java.lang.Object)
- */
- @Override
- public Image getImage(Object element) {
- WSDLServiceHelper serviceHelper = WSDLServiceExtManager.getServiceHelper();
- if (element instanceof WebServiceNavigatorGroup)
- return J2EEUIPlugin.getDefault().getImage("webServicesFolder_obj"); //$NON-NLS-1$
- else if (element instanceof String)
- return J2EEUIPlugin.getDefault().getImage("wsdl"); //$NON-NLS-1$
- else if (element instanceof WebServiceNavigatorGroupType)
- return J2EEUIPlugin.getDefault().getImage("folder"); //$NON-NLS-1$
- else if (serviceHelper.isService(element)) {
- if (WebServicesManager.getInstance().isServiceInternal((EObject) element))
- return J2EEUIPlugin.getDefault().getImage("webServiceItemProvider_obj"); //$NON-NLS-1$
- return J2EEUIPlugin.getDefault().getImage("extwebserviceitemprovider_obj"); //$NON-NLS-1$
- } else if (serviceHelper.isWSDLResource(element))
- return J2EEUIPlugin.getDefault().getImage("wsdl"); //$NON-NLS-1$
- else
- return super.getImage(element);
- }
-
- /*
- * (non-Javadoc)
- *
- * @see org.eclipse.jface.viewers.ILabelProvider#getText(java.lang.Object)
- */
- @Override
- public String getText(Object element) {
- WSDLServiceHelper serviceHelper = WSDLServiceExtManager.getServiceHelper();
- String space = " "; //$NON-NLS-1$
- if (element instanceof WebServiceDescription)
- return getWebServiceDescriptionText((WebServiceDescription) element);
- else if (element instanceof PortComponent)
- return WebServiceUIResourceHandler.PORT_UI_ + space + super.getText(element);
- else if (element instanceof Handler)
- return WebServiceUIResourceHandler.HANDLER_UI_ + space + super.getText(element);
- else if (element instanceof WSDLPort)
- return WebServiceUIResourceHandler.WSDL_PORT_UI_ + space + super.getText(element);
- else if (element instanceof ServiceImplBean)
- return WebServiceUIResourceHandler.SERVICE_CLASSES_UI_;
- else if (element instanceof EJBLink)
- return WebServiceUIResourceHandler.SERVICE_IMPL_UI_ + space + super.getText(element);
- else if (element instanceof ServletLink)
- return WebServiceUIResourceHandler.SERVICE_IMPL_UI_ + space + super.getText(element);
- else if (serviceHelper.isService(element))
- return serviceHelper.getServiceLocalPart(element);
- else if (serviceHelper.isWSDLResource(element)) {
- String result = ""; //$NON-NLS-1$
- IFile file = WorkbenchResourceHelper.getFile((Resource) element);
- if (file != null && file.exists())
- result = file.getFullPath().toString();
- else
- result = ((Resource) element).getURI().toString();
- return WebServiceUIResourceHandler.WSDL_UI_ + space + result;
- } else if (element instanceof ServiceRef) {
- String beanName14 = ""; //$NON-NLS-1$
- if (WebServicesManager.getInstance().isJ2EE14((ServiceRef) element)) {
- if (((ServiceRef) element).eContainer() instanceof Session)
- beanName14 = ((Session) ((ServiceRef) element).eContainer()).getName() + ": "; //$NON-NLS-1$
- }
- IProject refProj = ProjectUtilities.getProject((ServiceRef) element);
- return (refProj != null) ? refProj.getName() : "" + ": " + beanName14 //$NON-NLS-1$ //$NON-NLS-2$
- + ((ServiceRef) element).getServiceRefName();
- } else
- return super.getText(element);
- }
-
- /**
- * get text for web service
- */
- private String getWebServiceDescriptionText(WebServiceDescription description) {
- Resource res = description.eResource();
- IProject project = null;
- String projString = ""; //$NON-NLS-1$
- if (res != null)
- project = WorkbenchResourceHelper.getProject(res);
- if (project != null)
- projString = project.getName() + ": "; //$NON-NLS-1$
- return projString + super.getText(description);
- }
-
- /*
- * (non-Javadoc)
- *
- * @see org.eclipse.jface.viewers.IBaseLabelProvider#addListener(org.eclipse.jface.viewers.ILabelProviderListener)
- */
- @Override
- public void addListener(ILabelProviderListener listener) {
- // TODO add any listeners?
-
- }
-
- /*
- * (non-Javadoc)
- *
- * @see org.eclipse.jface.viewers.IBaseLabelProvider#dispose()
- */
- @Override
- public void dispose() {
- // TODO handle dispose
-
- }
-
- /*
- * (non-Javadoc)
- *
- * @see org.eclipse.jface.viewers.IBaseLabelProvider#isLabelProperty(java.lang.Object,
- * java.lang.String)
- */
- @Override
- public boolean isLabelProperty(Object element, String property) {
- // TODO do something smart here?
- return false;
- }
-
- /*
- * (non-Javadoc)
- *
- * @see org.eclipse.jface.viewers.IBaseLabelProvider#removeListener(org.eclipse.jface.viewers.ILabelProviderListener)
- */
- @Override
- public void removeListener(ILabelProviderListener listener) {
- // TODO how do we remove listeners?
-
- }
-
-}
diff --git a/plugins/org.eclipse.jst.j2ee.webservice.ui/webservices_ui/org/eclipse/jst/j2ee/internal/webservice/WebServicesNavigatorSynchronizer.java b/plugins/org.eclipse.jst.j2ee.webservice.ui/webservices_ui/org/eclipse/jst/j2ee/internal/webservice/WebServicesNavigatorSynchronizer.java
deleted file mode 100644
index ca3a355..0000000
--- a/plugins/org.eclipse.jst.j2ee.webservice.ui/webservices_ui/org/eclipse/jst/j2ee/internal/webservice/WebServicesNavigatorSynchronizer.java
+++ /dev/null
@@ -1,135 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2003, 2006 IBM Corporation and others.
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
- *
- * Contributors:
- * IBM Corporation - initial API and implementation
- *******************************************************************************/
-/*
- * Created on Jun 10, 2004
- */
-package org.eclipse.jst.j2ee.internal.webservice;
-
-import org.eclipse.emf.common.notify.Adapter;
-import org.eclipse.emf.common.notify.AdapterFactory;
-import org.eclipse.emf.common.notify.Notification;
-import org.eclipse.emf.common.notify.Notifier;
-import org.eclipse.emf.ecore.EObject;
-import org.eclipse.emf.edit.ui.provider.AdapterFactoryContentProvider;
-import org.eclipse.jst.j2ee.internal.webservice.helper.WebServicesManager;
-import org.eclipse.jst.j2ee.webservice.wsclient.ComponentScopedRefs;
-import org.eclipse.jst.j2ee.webservice.wsclient.Handler;
-import org.eclipse.jst.j2ee.webservice.wsclient.ServiceRef;
-import org.eclipse.jst.j2ee.webservice.wsdd.WebServiceDescription;
-import org.eclipse.jst.j2ee.webservice.wsdd.WebServices;
-
-/**
- * @author jlanuti
- */
-public class WebServicesNavigatorSynchronizer extends AdapterFactoryContentProvider implements Adapter {
-
-
- private static WebServicesNavigatorSynchronizer INSTANCE = null;
- protected Notifier target = null;
- private WebServicesNavigatorContentProvider contentProvider = null;
-
- /**
- * Constructor
- */
- public WebServicesNavigatorSynchronizer(AdapterFactory adapterFactory, WebServicesNavigatorContentProvider provider) {
- super(adapterFactory);
- contentProvider = provider;
- }
-
- public static WebServicesNavigatorSynchronizer getInstance() {
- return INSTANCE;
- }
-
- public static WebServicesNavigatorSynchronizer createInstance(AdapterFactory adapterFactory, WebServicesNavigatorContentProvider provider) {
- INSTANCE = new WebServicesNavigatorSynchronizer(adapterFactory, provider);
- return INSTANCE;
- }
-
- public static void disposeInstance() {
- INSTANCE = null;
- }
-
- /*
- * (non-Javadoc)
- *
- * @see org.eclipse.emf.common.notify.Adapter#getTarget()
- */
- public Notifier getTarget() {
- return target;
- }
-
- /*
- * (non-Javadoc)
- *
- * @see org.eclipse.emf.common.notify.Adapter#isAdapterForType(java.lang.Object)
- */
- public boolean isAdapterForType(Object type) {
- return true;
- }
-
- /*
- * (non-Javadoc)
- *
- * @see org.eclipse.emf.common.notify.Adapter#setTarget(org.eclipse.emf.common.notify.Notifier)
- */
- public void setTarget(Notifier newTarget) {
- target = newTarget;
- }
-
- @Override
- public void notifyChanged(final Notification notification) {
- if (notification.isTouch()) {
- //There is nothing that is required since nothing changed.
- return;
- }
-
- EObject notifier = (EObject) notification.getNotifier();
- if (notifier instanceof WebServices) {
- //Do nothing.
- } else if (isServiceRefModification(notification)) {
- // Handle service ref edits
- contentProvider.getViewer().refresh(notifier);
- } else if (isServiceRefAddOrRemove(notification)) {
- //Handle service ref adds or removes
- contentProvider.getViewer().refresh();
- } else {
- // Handle web service changes by getting the WSDD parent
- while (!(notifier instanceof WebServiceDescription) && notifier != null) {
- notifier = notifier.eContainer();
- }
- // Refresh the associated wsdl service for the WSDD parent
- if (notifier instanceof WebServiceDescription) {
- EObject wsdl = WebServicesManager.getInstance().getWSDLServiceForWebService((WebServiceDescription)notifier);
- contentProvider.getViewer().refresh(wsdl);
- }
- super.notifyChanged(notification);
- }
- }
-
- private boolean isServiceRefAddOrRemove(Notification notification) {
- //Note this check is not handling ADD_MANY or REMOVE_MANY.
- Object value = null;
- switch (notification.getEventType()) {
- case Notification.ADD:
- value = notification.getNewValue();
- break;
- case Notification.REMOVE:
- value = notification.getOldValue();
- break;
- }
- return value != null && (value instanceof ServiceRef || value instanceof ComponentScopedRefs);
- }
-
- private boolean isServiceRefModification(Notification notification) {
- Object notifier = notification.getNotifier();
- return notifier instanceof ServiceRef || notifier instanceof Handler;
- }
-}
diff --git a/plugins/org.eclipse.jst.j2ee.webservice.ui/webservices_ui/org/eclipse/jst/j2ee/internal/webservice/WsdlResourceAdapterFactory.java b/plugins/org.eclipse.jst.j2ee.webservice.ui/webservices_ui/org/eclipse/jst/j2ee/internal/webservice/WsdlResourceAdapterFactory.java
deleted file mode 100644
index 9db6717..0000000
--- a/plugins/org.eclipse.jst.j2ee.webservice.ui/webservices_ui/org/eclipse/jst/j2ee/internal/webservice/WsdlResourceAdapterFactory.java
+++ /dev/null
@@ -1,59 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2003, 2006 IBM Corporation and others.
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
- *
- * Contributors:
- * IBM Corporation - initial API and implementation
- *******************************************************************************/
-/*
- * Created on Mar 5, 2004
- *
- * To change the template for this generated file go to
- * Window - Preferences - Java - Code Generation - Code and Comments
- */
-package org.eclipse.jst.j2ee.internal.webservice;
-
-import org.eclipse.emf.ecore.resource.Resource;
-import org.eclipse.jst.j2ee.internal.webservices.WSDLServiceExtManager;
-import org.eclipse.jst.j2ee.internal.webservices.WSDLServiceHelper;
-import org.eclipse.jst.j2ee.navigator.internal.J2EEEMFAdapterFactory;
-import org.eclipse.wst.common.internal.emfworkbench.WorkbenchResourceHelper;
-
-/**
- * @author jlanuti
- *
- * To change the template for this generated type comment go to Window - Preferences - Java - Code
- * Generation - Code and Comments
- */
-public class WsdlResourceAdapterFactory extends J2EEEMFAdapterFactory {
-
- /**
- * Default constructor
- */
- public WsdlResourceAdapterFactory() {
- super();
- }
-
- /*
- * (non-Javadoc)
- *
- * @see org.eclipse.core.runtime.IAdapterFactory#getAdapter(java.lang.Object, java.lang.Class)
- */
- @Override
- public Object getAdapter(Object adaptableObject, Class adapterType) {
- Resource res = null;
- WSDLServiceHelper serviceHelper = WSDLServiceExtManager.getServiceHelper();
- if (serviceHelper.isWSDLResource(adaptableObject))
- res = (Resource) adaptableObject;
-
- if (res != null && adapterType == J2EEEMFAdapterFactory.IFILE_CLASS)
- return WorkbenchResourceHelper.getFile(res) != null ? WorkbenchResourceHelper.getFile(res) : null;
- else if (res != null && adapterType == J2EEEMFAdapterFactory.IRESOURCE_CLASS)
- return WorkbenchResourceHelper.getFile(res);
- else
- return super.getAdapter(adaptableObject, adapterType);
- }
-}
diff --git a/plugins/org.eclipse.jst.j2ee.webservice.ui/webservices_ui/org/eclipse/jst/j2ee/internal/webservice/plugin/WebServiceUIPlugin.java b/plugins/org.eclipse.jst.j2ee.webservice.ui/webservices_ui/org/eclipse/jst/j2ee/internal/webservice/plugin/WebServiceUIPlugin.java
deleted file mode 100644
index 6886c77..0000000
--- a/plugins/org.eclipse.jst.j2ee.webservice.ui/webservices_ui/org/eclipse/jst/j2ee/internal/webservice/plugin/WebServiceUIPlugin.java
+++ /dev/null
@@ -1,126 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2005, 2006 IBM Corporation and others.
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
- *
- * Contributors:
- * IBM Corporation - initial API and implementation
- *******************************************************************************/
-/*
- * Created on Nov 15, 2004
- */
-package org.eclipse.jst.j2ee.internal.webservice.plugin;
-
-import org.eclipse.core.resources.IWorkspace;
-import org.eclipse.core.resources.ResourcesPlugin;
-import org.eclipse.core.runtime.IStatus;
-import org.eclipse.core.runtime.Status;
-import org.eclipse.ui.plugin.AbstractUIPlugin;
-import org.osgi.framework.BundleContext;
-
-/**
- * @author cbridgha
- */
-public class WebServiceUIPlugin extends AbstractUIPlugin {
-
- public static final String PLUGIN_ID = "org.eclipse.jst.j2ee.webservice.ui"; //$NON-NLS-1$
-
- // The shared instance.
- private static WebServiceUIPlugin plugin;
-
- /**
- * The constructor.
- */
- public WebServiceUIPlugin() {
- super();
- plugin = this;
- }
-
-
- /**
- * Returns the shared instance.
- */
- public static WebServiceUIPlugin getDefault() {
- return plugin;
- }
-
- /**
- * Returns the workspace instance.
- */
- public static IWorkspace getWorkspace() {
- return ResourcesPlugin.getWorkspace();
- }
-
-
- /**
- * Record an error against this plugin's log.
- *
- * @param aCode
- * @param aMessage
- * @param anException
- */
- public static void logError(int aCode, String aMessage,
- Throwable anException) {
- getDefault().getLog().log(
- createErrorStatus(aCode, aMessage, anException));
- }
-
- /**
- *
- * Record a message against this plugin's log.
- *
- * @param severity
- * @param aCode
- * @param aMessage
- * @param exception
- */
- public static void log(int severity, int aCode, String aMessage,
- Throwable exception) {
- log(createStatus(severity, aCode, aMessage, exception));
- }
-
- /**
- *
- * Record a status against this plugin's log.
- *
- * @param aStatus
- */
- public static void log(IStatus aStatus) {
- getDefault().getLog().log(aStatus);
- }
-
- /**
- * Create a status associated with this plugin.
- *
- * @param severity
- * @param aCode
- * @param aMessage
- * @param exception
- * @return A status configured with this plugin's id and the given parameters.
- */
- public static IStatus createStatus(int severity, int aCode,
- String aMessage, Throwable exception) {
- return new Status(severity, PLUGIN_ID, aCode,
- aMessage != null ? aMessage : "No message.", exception); //$NON-NLS-1$
- }
-
- /**
- *
- * @param aCode
- * @param aMessage
- * @param exception
- * @return A status configured with this plugin's id and the given parameters.
- */
- public static IStatus createErrorStatus(int aCode, String aMessage,
- Throwable exception) {
- return createStatus(IStatus.ERROR, aCode, aMessage, exception);
- }
-
- @Override
- public void start(BundleContext context) throws Exception {
- super.start(context);
- }
-
-}
diff --git a/plugins/org.eclipse.jst.j2ee.webservice.ui/webservices_ui/org/eclipse/jst/j2ee/internal/webservice/startup/WebserviceListener.java b/plugins/org.eclipse.jst.j2ee.webservice.ui/webservices_ui/org/eclipse/jst/j2ee/internal/webservice/startup/WebserviceListener.java
deleted file mode 100644
index 45f85b9..0000000
--- a/plugins/org.eclipse.jst.j2ee.webservice.ui/webservices_ui/org/eclipse/jst/j2ee/internal/webservice/startup/WebserviceListener.java
+++ /dev/null
@@ -1,137 +0,0 @@
-package org.eclipse.jst.j2ee.internal.webservice.startup;
-
-import org.eclipse.core.resources.IFile;
-import org.eclipse.core.resources.IProject;
-import org.eclipse.core.resources.IResource;
-import org.eclipse.core.resources.IResourceChangeEvent;
-import org.eclipse.core.resources.IResourceChangeListener;
-import org.eclipse.core.resources.IResourceDelta;
-import org.eclipse.core.resources.IResourceDeltaVisitor;
-import org.eclipse.core.resources.ResourcesPlugin;
-import org.eclipse.core.runtime.CoreException;
-import org.eclipse.ui.IStartup;
-import org.eclipse.wst.common.project.facet.core.internal.FacetedProjectPropertyTester;
-import org.eclipse.wst.project.facet.ProductManager;
-
-public class WebserviceListener implements IStartup, IResourceChangeListener, IResourceDeltaVisitor {
-
- private boolean listening = false;
-
- /* The constants/facets/file extns are duplicated here to avoid loading plugins */
- private static final String PROJECT_FACET = "projectFacet"; //$NON-NLS-1$
-
- private static final String APPCLIENT_FACET = "jst.appclient"; //$NON-NLS-1$
- private static final String WEB_FACET = "jst.web"; //$NON-NLS-1$
- private static final String EJB_FACET = "jst.ejb"; //$NON-NLS-1$
-
- private static final String WSDL_EXT = "wsdl"; //$NON-NLS-1$
- private static final String WSIL_EXT = "wsil"; //$NON-NLS-1$
- private static final String WEB_SERVICES_CLIENT_SHORTNAME = "webservicesclient.xml"; //$NON-NLS-1$
- private static final String WEB_SERVICES_DD_URI = "webservices.xml"; //$NON-NLS-1$
-
- private static final FacetedProjectPropertyTester facetPropertyTester = new FacetedProjectPropertyTester();
-
- private static WebserviceListener INSTANCE;
-
- public static WebserviceListener getInstance() {
- return INSTANCE;
- }
- /**
- * @param project
- * @return
- * method copied from WebServicesViewerSynchronization for performance reasons (not load plugins)
- */
- private static final boolean isInteresting(IProject project) {
- return hasFacet(project, WEB_FACET) ||
- hasFacet(project, EJB_FACET) ||
- hasFacet(project, APPCLIENT_FACET);
- }
- /**
- * @param element
- * @param facet
- * @return
- * method copied from WebServicesViewerSynchronization for performance reasons (not load plugins)
- */
- private static final boolean hasFacet(Object element, String facet) {
- return facetPropertyTester.test(element, PROJECT_FACET, new Object[] {}, facet);
- }
-
- /**
- * @param aFile
- * @return
- * method copied from WebServicesManager for performance reasons (not load plugins)
- */
- private static final boolean isFileInteresting(IFile aFile) {
- if (aFile != null && aFile.getFileExtension() != null) {
- String extension = aFile.getFileExtension();
- return extension.equals(WSDL_EXT) || extension.equals(WSIL_EXT)
- || aFile.getName().equals(WEB_SERVICES_CLIENT_SHORTNAME)
- || aFile.getName().equals(WEB_SERVICES_DD_URI);
- }
- return false;
- }
-
-
- public boolean isListening() {
- return listening;
- }
- public void earlyStartup() {
- if (ProductManager.shouldUseViewerSyncForWebservices()) {
- INSTANCE = this;
- startListening();
- } else {
- //Change to no-op
- //org.eclipse.jst.j2ee.internal.webservice.WebServiceViewerSynchronization.setAreThereWebServices(false);
- }
- }
-
- public void resourceChanged(IResourceChangeEvent event) {
- try {
- event.getDelta().accept(this);
- } catch (CoreException e) {
- }
- }
-
- public boolean visit(IResourceDelta delta) throws CoreException {
-
- IResource resource = delta.getResource();
- switch (resource.getType()) {
- case IResource.ROOT :
- return true;
- case IResource.PROJECT:
- if(isListening() && (delta.getKind() == IResourceDelta.ADDED || delta.getKind() == IResourceDelta.CHANGED)){
- if(isInteresting(resource.getProject())) {
- return true;
- }
- }
- break;
- case IResource.FOLDER :
- if(isListening() && (delta.getKind() == IResourceDelta.ADDED || delta.getKind() == IResourceDelta.CHANGED)) {
- return true;
- }
- break;
- case IResource.FILE :
- if(isListening() && delta.getKind() == IResourceDelta.ADDED) {
- if(isFileInteresting((IFile)resource)){
- stopListening();
- // this will cause the plug-in to start our goal was to delay it until now
- if(org.eclipse.jst.j2ee.internal.webservice.WebServiceViewerSynchronization.isThereWebServicesPreferenceSet()){
- org.eclipse.jst.j2ee.internal.webservice.WebServiceViewerSynchronization.setAreThereWebServices(true);
- }
- }
- }
- }
-
- return false;
- }
-
- public void startListening() {
- ResourcesPlugin.getWorkspace().addResourceChangeListener(this, IResourceChangeEvent.POST_CHANGE);
- listening = true;
- }
-
- public void stopListening() {
- ResourcesPlugin.getWorkspace().removeResourceChangeListener(this);
- listening = false;
- }
-}
diff --git a/plugins/org.eclipse.jst.j2ee.webservice/.classpath b/plugins/org.eclipse.jst.j2ee.webservice/.classpath
deleted file mode 100644
index 33223bd..0000000
--- a/plugins/org.eclipse.jst.j2ee.webservice/.classpath
+++ /dev/null
@@ -1,8 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<classpath>
- <classpathentry kind="src" path="webservice/"/>
- <classpathentry kind="src" path="property_files"/>
- <classpathentry kind="con" path="org.eclipse.jdt.launching.JRE_CONTAINER/org.eclipse.jdt.internal.debug.ui.launcher.StandardVMType/J2SE-1.5"/>
- <classpathentry kind="con" path="org.eclipse.pde.core.requiredPlugins"/>
- <classpathentry kind="output" path="bin"/>
-</classpath>
diff --git a/plugins/org.eclipse.jst.j2ee.webservice/.cvsignore b/plugins/org.eclipse.jst.j2ee.webservice/.cvsignore
deleted file mode 100644
index e54d286..0000000
--- a/plugins/org.eclipse.jst.j2ee.webservice/.cvsignore
+++ /dev/null
@@ -1,7 +0,0 @@
-bin
-temp.folder
-build.xml
-webservice.jar
-@dot
-src.zip
-javaCompiler...args
diff --git a/plugins/org.eclipse.jst.j2ee.webservice/.project b/plugins/org.eclipse.jst.j2ee.webservice/.project
deleted file mode 100644
index 5fcfb43..0000000
--- a/plugins/org.eclipse.jst.j2ee.webservice/.project
+++ /dev/null
@@ -1,28 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<projectDescription>
- <name>org.eclipse.jst.j2ee.webservice</name>
- <comment></comment>
- <projects>
- </projects>
- <buildSpec>
- <buildCommand>
- <name>org.eclipse.jdt.core.javabuilder</name>
- <arguments>
- </arguments>
- </buildCommand>
- <buildCommand>
- <name>org.eclipse.pde.ManifestBuilder</name>
- <arguments>
- </arguments>
- </buildCommand>
- <buildCommand>
- <name>org.eclipse.pde.SchemaBuilder</name>
- <arguments>
- </arguments>
- </buildCommand>
- </buildSpec>
- <natures>
- <nature>org.eclipse.pde.PluginNature</nature>
- <nature>org.eclipse.jdt.core.javanature</nature>
- </natures>
-</projectDescription>
diff --git a/plugins/org.eclipse.jst.j2ee.webservice/.settings/org.eclipse.jdt.core.prefs b/plugins/org.eclipse.jst.j2ee.webservice/.settings/org.eclipse.jdt.core.prefs
deleted file mode 100644
index 76f6f8f..0000000
--- a/plugins/org.eclipse.jst.j2ee.webservice/.settings/org.eclipse.jdt.core.prefs
+++ /dev/null
@@ -1,95 +0,0 @@
-#Wed Jun 10 11:36:45 EDT 2009
-org.eclipse.jdt.core.compiler.problem.unusedParameterWhenImplementingAbstract=disabled
-org.eclipse.jdt.core.compiler.problem.comparingIdentical=error
-org.eclipse.jdt.core.compiler.problem.unnecessaryElse=error
-org.eclipse.jdt.core.compiler.problem.redundantSuperinterface=error
-org.eclipse.jdt.core.compiler.problem.unusedLocal=error
-org.eclipse.jdt.core.compiler.problem.emptyStatement=error
-org.eclipse.jdt.core.compiler.problem.unusedLabel=error
-org.eclipse.jdt.core.compiler.problem.unusedParameter=warning
-org.eclipse.jdt.core.compiler.problem.rawTypeReference=warning
-org.eclipse.jdt.core.incompatibleJDKLevel=ignore
-org.eclipse.jdt.core.compiler.problem.incompatibleNonInheritedInterfaceMethod=error
-org.eclipse.jdt.core.compiler.debug.lineNumber=generate
-org.eclipse.jdt.core.compiler.problem.unusedDeclaredThrownException=warning
-org.eclipse.jdt.core.builder.cleanOutputFolder=clean
-org.eclipse.jdt.core.compiler.problem.unusedWarningToken=warning
-org.eclipse.jdt.core.compiler.problem.noImplicitStringConversion=error
-org.eclipse.jdt.core.compiler.problem.deprecationInDeprecatedCode=enabled
-org.eclipse.jdt.core.compiler.problem.deprecation=warning
-org.eclipse.jdt.core.compiler.problem.unusedParameterWhenOverridingConcrete=disabled
-org.eclipse.jdt.core.compiler.problem.missingSynchronizedOnInheritedMethod=error
-org.eclipse.jdt.core.compiler.problem.deprecationWhenOverridingDeprecatedMethod=enabled
-org.eclipse.jdt.core.compiler.problem.redundantNullCheck=error
-org.eclipse.jdt.core.compiler.problem.unusedImport=error
-org.eclipse.jdt.core.builder.recreateModifiedClassFileInOutputFolder=ignore
-org.eclipse.jdt.core.builder.resourceCopyExclusionFilter=*.launch
-org.eclipse.jdt.core.classpath.multipleOutputLocations=enabled
-org.eclipse.jdt.core.compiler.problem.suppressWarnings=enabled
-org.eclipse.jdt.core.compiler.problem.typeParameterHiding=error
-org.eclipse.jdt.core.builder.invalidClasspath=abort
-org.eclipse.jdt.core.compiler.problem.localVariableHiding=warning
-org.eclipse.jdt.core.compiler.problem.possibleAccidentalBooleanAssignment=error
-org.eclipse.jdt.core.compiler.problem.missingHashCodeMethod=error
-org.eclipse.jdt.core.codeComplete.argumentSuffixes=
-org.eclipse.jdt.core.codeComplete.argumentPrefixes=
-org.eclipse.jdt.core.compiler.problem.indirectStaticAccess=ignore
-org.eclipse.jdt.core.compiler.problem.potentialNullReference=error
-org.eclipse.jdt.core.compiler.codegen.inlineJsrBytecode=enabled
-org.eclipse.jdt.core.compiler.problem.finalParameterBound=warning
-org.eclipse.jdt.core.compiler.problem.missingSerialVersion=error
-org.eclipse.jdt.core.compiler.problem.nullReference=error
-org.eclipse.jdt.core.compiler.source=1.5
-org.eclipse.jdt.core.compiler.problem.enumIdentifier=error
-org.eclipse.jdt.core.compiler.problem.syntheticAccessEmulation=ignore
-org.eclipse.jdt.core.builder.duplicateResourceTask=warning
-org.eclipse.jdt.core.compiler.problem.fieldHiding=warning
-org.eclipse.jdt.core.compiler.problem.unusedDeclaredThrownExceptionExemptExceptionAndThrowable=enabled
-org.eclipse.jdt.core.compiler.problem.missingOverrideAnnotation=error
-org.eclipse.jdt.core.compiler.problem.hiddenCatchBlock=error
-org.eclipse.jdt.core.compiler.problem.overridingPackageDefaultMethod=error
-org.eclipse.jdt.core.compiler.problem.finallyBlockNotCompletingNormally=error
-org.eclipse.jdt.core.compiler.problem.undocumentedEmptyBlock=warning
-org.eclipse.jdt.core.classpath.exclusionPatterns=enabled
-org.eclipse.jdt.core.compiler.problem.methodWithConstructorName=error
-org.eclipse.jdt.core.compiler.problem.discouragedReference=warning
-org.eclipse.jdt.core.compiler.problem.unqualifiedFieldAccess=ignore
-org.eclipse.jdt.core.compiler.problem.incompleteEnumSwitch=error
-eclipse.preferences.version=1
-org.eclipse.jdt.core.incompleteClasspath=error
-org.eclipse.jdt.core.compiler.problem.unnecessaryTypeCheck=error
-org.eclipse.jdt.core.compiler.problem.deadCode=error
-org.eclipse.jdt.core.compiler.problem.specialParameterHidingField=enabled
-org.eclipse.jdt.core.compiler.problem.fatalOptionalError=enabled
-org.eclipse.jdt.core.compiler.problem.noEffectAssignment=error
-org.eclipse.jdt.core.compiler.debug.sourceFile=generate
-org.eclipse.jdt.core.compiler.problem.unusedDeclaredThrownExceptionIncludeUncheckedExceptions=disabled
-org.eclipse.jdt.core.compiler.problem.missingDeprecatedAnnotation=warning
-org.eclipse.jdt.core.codeComplete.fieldPrefixes=
-org.eclipse.jdt.core.compiler.problem.fallthroughCase=error
-org.eclipse.jdt.core.compiler.codegen.targetPlatform=1.5
-org.eclipse.jdt.core.compiler.problem.unusedPrivateMember=error
-org.eclipse.jdt.core.compiler.problem.autoboxing=warning
-org.eclipse.jdt.core.circularClasspath=error
-org.eclipse.jdt.core.compiler.problem.annotationSuperInterface=warning
-org.eclipse.jdt.core.compiler.problem.nonExternalizedStringLiteral=error
-org.eclipse.jdt.core.codeComplete.fieldSuffixes=
-org.eclipse.jdt.core.codeComplete.localSuffixes=
-org.eclipse.jdt.core.compiler.problem.parameterAssignment=error
-org.eclipse.jdt.core.compiler.problem.staticAccessReceiver=error
-org.eclipse.jdt.core.codeComplete.localPrefixes=
-org.eclipse.jdt.core.compiler.problem.unusedDeclaredThrownExceptionIncludeDocCommentReference=enabled
-org.eclipse.jdt.core.compiler.maxProblemPerUnit=100
-org.eclipse.jdt.core.compiler.problem.varargsArgumentNeedCast=error
-org.eclipse.jdt.core.compiler.problem.assertIdentifier=error
-org.eclipse.jdt.core.compiler.compliance=1.5
-org.eclipse.jdt.core.compiler.problem.unusedParameterIncludeDocCommentReference=enabled
-org.eclipse.jdt.core.codeComplete.staticFieldPrefixes=
-org.eclipse.jdt.core.compiler.debug.localVariable=generate
-org.eclipse.jdt.core.compiler.problem.unhandledWarningToken=warning
-instance/org.eclipse.core.net/org.eclipse.core.net.hasMigrated=true
-org.eclipse.jdt.core.compiler.problem.forbiddenReference=error
-org.eclipse.jdt.core.compiler.codegen.unusedLocal=preserve
-org.eclipse.jdt.core.compiler.problem.uncheckedTypeOperation=warning
-org.eclipse.jdt.core.compiler.problem.unusedDeclaredThrownExceptionWhenOverriding=disabled
-org.eclipse.jdt.core.codeComplete.staticFieldSuffixes=
diff --git a/plugins/org.eclipse.jst.j2ee.webservice/META-INF/MANIFEST.MF b/plugins/org.eclipse.jst.j2ee.webservice/META-INF/MANIFEST.MF
deleted file mode 100644
index 00fced7..0000000
--- a/plugins/org.eclipse.jst.j2ee.webservice/META-INF/MANIFEST.MF
+++ /dev/null
@@ -1,36 +0,0 @@
-Manifest-Version: 1.0
-Bundle-ManifestVersion: 2
-Bundle-Name: %pluginName
-Bundle-SymbolicName: org.eclipse.jst.j2ee.webservice; singleton:=true
-Bundle-Version: 1.1.400.qualifier
-Bundle-Activator: org.eclipse.jst.j2ee.internal.webservice.plugin.WebServicePlugin
-Bundle-Vendor: %pluginVendor
-Bundle-Localization: plugin
-Export-Package: org.eclipse.jst.j2ee.internal.webservice.adapter;x-internal:=true,
- org.eclipse.jst.j2ee.internal.webservice.command;x-internal:=true,
- org.eclipse.jst.j2ee.internal.webservice.componentcore.util;x-internal:=true,
- org.eclipse.jst.j2ee.internal.webservice.constants;x-internal:=true,
- org.eclipse.jst.j2ee.internal.webservice.helper;x-internal:=true,
- org.eclipse.jst.j2ee.internal.webservice.plugin;x-internal:=true,
- org.eclipse.jst.j2ee.internal.webservice.provider;x-internal:=true,
- org.eclipse.jst.j2ee.internal.wsdd.provider;x-internal:=true
-Require-Bundle: org.eclipse.jst.j2ee;bundle-version="[1.1.0,1.2.0)",
- org.eclipse.wst.common.frameworks;bundle-version="[1.2.0,2.0.0)",
- org.eclipse.wst.common.emfworkbench.integration;bundle-version="[1.2.0,2.0.0)",
- org.eclipse.jst.j2ee.core;bundle-version="[1.1.0,2.0.0)",
- org.eclipse.wst.common.emf;bundle-version="[1.2.0,2.0.0)",
- org.eclipse.emf.ecore.xmi;bundle-version="[2.2.0,3.0.0)",
- org.eclipse.emf.edit;bundle-version="[2.2.0,3.0.0)",
- org.eclipse.jem;bundle-version="[2.0.0,3.0.0)",
- org.eclipse.jdt.core;bundle-version="[3.2.0,4.0.0)",
- org.eclipse.core.runtime;bundle-version="[3.2.0,4.0.0)",
- org.eclipse.jst.common.frameworks;bundle-version="[1.1.0,1.2.0)",
- org.eclipse.core.resources;bundle-version="[3.2.0,4.0.0)",
- org.eclipse.jface;bundle-version="[3.2.0,4.0.0)";resolution:=optional,
- org.eclipse.wst.ws.parser;bundle-version="[1.0.100,1.1.0)",
- org.eclipse.wst.wsdl;bundle-version="[1.2.0,1.3.0)",
- javax.wsdl;bundle-version="[1.5.0,1.6.0)",
- org.eclipse.jem.util;bundle-version="[2.0.0,3.0.0)",
- org.eclipse.wst.common.project.facet.core;bundle-version="[1.3.0,2.0.0)"
-Eclipse-LazyStart: true
-Bundle-RequiredExecutionEnvironment: J2SE-1.5
diff --git a/plugins/org.eclipse.jst.j2ee.webservice/about.html b/plugins/org.eclipse.jst.j2ee.webservice/about.html
deleted file mode 100644
index 2199df3..0000000
--- a/plugins/org.eclipse.jst.j2ee.webservice/about.html
+++ /dev/null
@@ -1,34 +0,0 @@
-<!DOCTYPE HTML PUBLIC "-//W3C//DTD HTML 4.0//EN">
-<HTML>
-
-<head>
-<title>About</title>
-<meta http-equiv=Content-Type content="text/html; charset=ISO-8859-1">
-</head>
-
-<BODY lang="EN-US">
-
-<H3>About This Content</H3>
-
-<P>June, 2008</P>
-
-<H3>License</H3>
-
-<P>The Eclipse Foundation makes available all content in this plug-in
-("Content"). Unless otherwise indicated below, the Content is provided to you
-under the terms and conditions of the Eclipse Public License Version 1.0
-("EPL"). A copy of the EPL is available at
-<A href="http://www.eclipse.org/org/documents/epl-v10.php">http://www.eclipse.org/org/documents/epl-v10.php</A>.
-For purposes of the EPL, "Program" will mean the Content.</P>
-
-<P>If you did not receive this Content directly from the Eclipse Foundation, the
-Content is being redistributed by another party ("Redistributor") and different
-terms and conditions may apply to your use of any object code in the Content.
-Check the Redistributors license that was provided with the Content. If no such
-license exists, contact the Redistributor. Unless otherwise indicated below, the
-terms and conditions of the EPL still apply to any source code in the Content
-and such source code may be obtained at
-<A href="http://www.eclipse.org/">http://www.eclipse.org/</A>.</P>
-
-</BODY>
-</HTML>
diff --git a/plugins/org.eclipse.jst.j2ee.webservice/build.properties b/plugins/org.eclipse.jst.j2ee.webservice/build.properties
deleted file mode 100644
index f40d5ee..0000000
--- a/plugins/org.eclipse.jst.j2ee.webservice/build.properties
+++ /dev/null
@@ -1,21 +0,0 @@
-###############################################################################
-# Copyright (c) 2003, 2005 IBM Corporation and others.
-# All rights reserved. This program and the accompanying materials
-# are made available under the terms of the Eclipse Public License v1.0
-# which accompanies this distribution, and is available at
-# http://www.eclipse.org/legal/epl-v10.html
-#
-# Contributors:
-# IBM Corporation - initial API and implementation
-###############################################################################
-bin.includes = plugin.xml,\
- .,\
- icons/,\
- images/,\
- plugin.properties,\
- META-INF/,\
- about.html
-source.. = webservice/,\
- property_files/
-output.. = bin/
-src.includes = component.xml
diff --git a/plugins/org.eclipse.jst.j2ee.webservice/component.xml b/plugins/org.eclipse.jst.j2ee.webservice/component.xml
deleted file mode 100644
index 780cb13..0000000
--- a/plugins/org.eclipse.jst.j2ee.webservice/component.xml
+++ /dev/null
@@ -1 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?><component xmlns="http://eclipse.org/wtp/releng/tools/component-model" name="org.eclipse.jst.j2ee.webservice"><component-depends unrestricted="true"></component-depends><plugin id="org.eclipse.jst.j2ee.webservice" fragment="false"/><plugin id="org.eclipse.jst.j2ee.webservice.ui" fragment="false"/></component>
\ No newline at end of file
diff --git a/plugins/org.eclipse.jst.j2ee.webservice/icons/full/ctool16/CreateComponentScopedRefs_serviceRefs_ServiceRef.gif b/plugins/org.eclipse.jst.j2ee.webservice/icons/full/ctool16/CreateComponentScopedRefs_serviceRefs_ServiceRef.gif
deleted file mode 100644
index ac0d8b2..0000000
--- a/plugins/org.eclipse.jst.j2ee.webservice/icons/full/ctool16/CreateComponentScopedRefs_serviceRefs_ServiceRef.gif
+++ /dev/null
Binary files differ
diff --git a/plugins/org.eclipse.jst.j2ee.webservice/icons/full/ctool16/CreateDescriptionGroup_descriptions_Description.gif b/plugins/org.eclipse.jst.j2ee.webservice/icons/full/ctool16/CreateDescriptionGroup_descriptions_Description.gif
deleted file mode 100644
index eb074fb..0000000
--- a/plugins/org.eclipse.jst.j2ee.webservice/icons/full/ctool16/CreateDescriptionGroup_descriptions_Description.gif
+++ /dev/null
Binary files differ
diff --git a/plugins/org.eclipse.jst.j2ee.webservice/icons/full/ctool16/CreateDescriptionGroup_descriptions_DescriptionType.gif b/plugins/org.eclipse.jst.j2ee.webservice/icons/full/ctool16/CreateDescriptionGroup_descriptions_DescriptionType.gif
deleted file mode 100644
index 0c05357..0000000
--- a/plugins/org.eclipse.jst.j2ee.webservice/icons/full/ctool16/CreateDescriptionGroup_descriptions_DescriptionType.gif
+++ /dev/null
Binary files differ
diff --git a/plugins/org.eclipse.jst.j2ee.webservice/icons/full/ctool16/CreateDescriptionGroup_displayNames_DisplayName.gif b/plugins/org.eclipse.jst.j2ee.webservice/icons/full/ctool16/CreateDescriptionGroup_displayNames_DisplayName.gif
deleted file mode 100644
index f4df8d4..0000000
--- a/plugins/org.eclipse.jst.j2ee.webservice/icons/full/ctool16/CreateDescriptionGroup_displayNames_DisplayName.gif
+++ /dev/null
Binary files differ
diff --git a/plugins/org.eclipse.jst.j2ee.webservice/icons/full/ctool16/CreateDescriptionGroup_displayNames_DisplayNameType.gif b/plugins/org.eclipse.jst.j2ee.webservice/icons/full/ctool16/CreateDescriptionGroup_displayNames_DisplayNameType.gif
deleted file mode 100644
index 94dd253..0000000
--- a/plugins/org.eclipse.jst.j2ee.webservice/icons/full/ctool16/CreateDescriptionGroup_displayNames_DisplayNameType.gif
+++ /dev/null
Binary files differ
diff --git a/plugins/org.eclipse.jst.j2ee.webservice/icons/full/ctool16/CreateDescriptionGroup_icons_IconType.gif b/plugins/org.eclipse.jst.j2ee.webservice/icons/full/ctool16/CreateDescriptionGroup_icons_IconType.gif
deleted file mode 100644
index 02c00da..0000000
--- a/plugins/org.eclipse.jst.j2ee.webservice/icons/full/ctool16/CreateDescriptionGroup_icons_IconType.gif
+++ /dev/null
Binary files differ
diff --git a/plugins/org.eclipse.jst.j2ee.webservice/icons/full/ctool16/CreateHandler_initParams_InitParam.gif b/plugins/org.eclipse.jst.j2ee.webservice/icons/full/ctool16/CreateHandler_initParams_InitParam.gif
deleted file mode 100644
index 3b9e4ba..0000000
--- a/plugins/org.eclipse.jst.j2ee.webservice/icons/full/ctool16/CreateHandler_initParams_InitParam.gif
+++ /dev/null
Binary files differ
diff --git a/plugins/org.eclipse.jst.j2ee.webservice/icons/full/ctool16/CreateHandler_initParams_ParamValue.gif b/plugins/org.eclipse.jst.j2ee.webservice/icons/full/ctool16/CreateHandler_initParams_ParamValue.gif
deleted file mode 100644
index 022f2b6..0000000
--- a/plugins/org.eclipse.jst.j2ee.webservice/icons/full/ctool16/CreateHandler_initParams_ParamValue.gif
+++ /dev/null
Binary files differ
diff --git a/plugins/org.eclipse.jst.j2ee.webservice/icons/full/ctool16/CreateHandler_soapHeaders_QName.gif b/plugins/org.eclipse.jst.j2ee.webservice/icons/full/ctool16/CreateHandler_soapHeaders_QName.gif
deleted file mode 100644
index ff93e09..0000000
--- a/plugins/org.eclipse.jst.j2ee.webservice/icons/full/ctool16/CreateHandler_soapHeaders_QName.gif
+++ /dev/null
Binary files differ
diff --git a/plugins/org.eclipse.jst.j2ee.webservice/icons/full/ctool16/CreateHandler_soapHeaders_SOAPHeader.gif b/plugins/org.eclipse.jst.j2ee.webservice/icons/full/ctool16/CreateHandler_soapHeaders_SOAPHeader.gif
deleted file mode 100644
index 80ca95e..0000000
--- a/plugins/org.eclipse.jst.j2ee.webservice/icons/full/ctool16/CreateHandler_soapHeaders_SOAPHeader.gif
+++ /dev/null
Binary files differ
diff --git a/plugins/org.eclipse.jst.j2ee.webservice/icons/full/ctool16/CreateHandler_soapHeaders_WSDLPort.gif b/plugins/org.eclipse.jst.j2ee.webservice/icons/full/ctool16/CreateHandler_soapHeaders_WSDLPort.gif
deleted file mode 100644
index 3db9aa7..0000000
--- a/plugins/org.eclipse.jst.j2ee.webservice/icons/full/ctool16/CreateHandler_soapHeaders_WSDLPort.gif
+++ /dev/null
Binary files differ
diff --git a/plugins/org.eclipse.jst.j2ee.webservice/icons/full/ctool16/CreateHandler_soapRoles_SOAPRole.gif b/plugins/org.eclipse.jst.j2ee.webservice/icons/full/ctool16/CreateHandler_soapRoles_SOAPRole.gif
deleted file mode 100644
index cc5b0b0..0000000
--- a/plugins/org.eclipse.jst.j2ee.webservice/icons/full/ctool16/CreateHandler_soapRoles_SOAPRole.gif
+++ /dev/null
Binary files differ
diff --git a/plugins/org.eclipse.jst.j2ee.webservice/icons/full/ctool16/CreatePortComponent_descriptionType_DescriptionType.gif b/plugins/org.eclipse.jst.j2ee.webservice/icons/full/ctool16/CreatePortComponent_descriptionType_DescriptionType.gif
deleted file mode 100644
index 11202c5..0000000
--- a/plugins/org.eclipse.jst.j2ee.webservice/icons/full/ctool16/CreatePortComponent_descriptionType_DescriptionType.gif
+++ /dev/null
Binary files differ
diff --git a/plugins/org.eclipse.jst.j2ee.webservice/icons/full/ctool16/CreatePortComponent_displayNameType_DisplayNameType.gif b/plugins/org.eclipse.jst.j2ee.webservice/icons/full/ctool16/CreatePortComponent_displayNameType_DisplayNameType.gif
deleted file mode 100644
index 083d44b..0000000
--- a/plugins/org.eclipse.jst.j2ee.webservice/icons/full/ctool16/CreatePortComponent_displayNameType_DisplayNameType.gif
+++ /dev/null
Binary files differ
diff --git a/plugins/org.eclipse.jst.j2ee.webservice/icons/full/ctool16/CreatePortComponent_handlers_Handler.gif b/plugins/org.eclipse.jst.j2ee.webservice/icons/full/ctool16/CreatePortComponent_handlers_Handler.gif
deleted file mode 100644
index 8aee367..0000000
--- a/plugins/org.eclipse.jst.j2ee.webservice/icons/full/ctool16/CreatePortComponent_handlers_Handler.gif
+++ /dev/null
Binary files differ
diff --git a/plugins/org.eclipse.jst.j2ee.webservice/icons/full/ctool16/CreatePortComponent_iconType_IconType.gif b/plugins/org.eclipse.jst.j2ee.webservice/icons/full/ctool16/CreatePortComponent_iconType_IconType.gif
deleted file mode 100644
index da0b7ff..0000000
--- a/plugins/org.eclipse.jst.j2ee.webservice/icons/full/ctool16/CreatePortComponent_iconType_IconType.gif
+++ /dev/null
Binary files differ
diff --git a/plugins/org.eclipse.jst.j2ee.webservice/icons/full/ctool16/CreatePortComponent_serviceImplBean_ServiceImplBean.gif b/plugins/org.eclipse.jst.j2ee.webservice/icons/full/ctool16/CreatePortComponent_serviceImplBean_ServiceImplBean.gif
deleted file mode 100644
index 767ee93..0000000
--- a/plugins/org.eclipse.jst.j2ee.webservice/icons/full/ctool16/CreatePortComponent_serviceImplBean_ServiceImplBean.gif
+++ /dev/null
Binary files differ
diff --git a/plugins/org.eclipse.jst.j2ee.webservice/icons/full/ctool16/CreatePortComponent_wsdlPort_WSDLPort.gif b/plugins/org.eclipse.jst.j2ee.webservice/icons/full/ctool16/CreatePortComponent_wsdlPort_WSDLPort.gif
deleted file mode 100644
index 543f6df..0000000
--- a/plugins/org.eclipse.jst.j2ee.webservice/icons/full/ctool16/CreatePortComponent_wsdlPort_WSDLPort.gif
+++ /dev/null
Binary files differ
diff --git a/plugins/org.eclipse.jst.j2ee.webservice/icons/full/ctool16/CreateServiceImplBean_beanLink_BeanLink.gif b/plugins/org.eclipse.jst.j2ee.webservice/icons/full/ctool16/CreateServiceImplBean_beanLink_BeanLink.gif
deleted file mode 100644
index 98bbc52..0000000
--- a/plugins/org.eclipse.jst.j2ee.webservice/icons/full/ctool16/CreateServiceImplBean_beanLink_BeanLink.gif
+++ /dev/null
Binary files differ
diff --git a/plugins/org.eclipse.jst.j2ee.webservice/icons/full/ctool16/CreateServiceImplBean_beanLink_EJBLink.gif b/plugins/org.eclipse.jst.j2ee.webservice/icons/full/ctool16/CreateServiceImplBean_beanLink_EJBLink.gif
deleted file mode 100644
index 87e4705..0000000
--- a/plugins/org.eclipse.jst.j2ee.webservice/icons/full/ctool16/CreateServiceImplBean_beanLink_EJBLink.gif
+++ /dev/null
Binary files differ
diff --git a/plugins/org.eclipse.jst.j2ee.webservice/icons/full/ctool16/CreateServiceImplBean_beanLink_ServletLink.gif b/plugins/org.eclipse.jst.j2ee.webservice/icons/full/ctool16/CreateServiceImplBean_beanLink_ServletLink.gif
deleted file mode 100644
index 17c6fea..0000000
--- a/plugins/org.eclipse.jst.j2ee.webservice/icons/full/ctool16/CreateServiceImplBean_beanLink_ServletLink.gif
+++ /dev/null
Binary files differ
diff --git a/plugins/org.eclipse.jst.j2ee.webservice/icons/full/ctool16/CreateServiceImplBean_eEJBLink_EJBLink.gif b/plugins/org.eclipse.jst.j2ee.webservice/icons/full/ctool16/CreateServiceImplBean_eEJBLink_EJBLink.gif
deleted file mode 100644
index 87e4705..0000000
--- a/plugins/org.eclipse.jst.j2ee.webservice/icons/full/ctool16/CreateServiceImplBean_eEJBLink_EJBLink.gif
+++ /dev/null
Binary files differ
diff --git a/plugins/org.eclipse.jst.j2ee.webservice/icons/full/ctool16/CreateServiceImplBean_eServletLink_ServletLink.gif b/plugins/org.eclipse.jst.j2ee.webservice/icons/full/ctool16/CreateServiceImplBean_eServletLink_ServletLink.gif
deleted file mode 100644
index 17c6fea..0000000
--- a/plugins/org.eclipse.jst.j2ee.webservice/icons/full/ctool16/CreateServiceImplBean_eServletLink_ServletLink.gif
+++ /dev/null
Binary files differ
diff --git a/plugins/org.eclipse.jst.j2ee.webservice/icons/full/ctool16/CreateServiceRef_handlers_Handler.gif b/plugins/org.eclipse.jst.j2ee.webservice/icons/full/ctool16/CreateServiceRef_handlers_Handler.gif
deleted file mode 100644
index df680ce..0000000
--- a/plugins/org.eclipse.jst.j2ee.webservice/icons/full/ctool16/CreateServiceRef_handlers_Handler.gif
+++ /dev/null
Binary files differ
diff --git a/plugins/org.eclipse.jst.j2ee.webservice/icons/full/ctool16/CreateServiceRef_portComponentRefs_PortComponentRef.gif b/plugins/org.eclipse.jst.j2ee.webservice/icons/full/ctool16/CreateServiceRef_portComponentRefs_PortComponentRef.gif
deleted file mode 100644
index 5b3180b..0000000
--- a/plugins/org.eclipse.jst.j2ee.webservice/icons/full/ctool16/CreateServiceRef_portComponentRefs_PortComponentRef.gif
+++ /dev/null
Binary files differ
diff --git a/plugins/org.eclipse.jst.j2ee.webservice/icons/full/ctool16/CreateServiceRef_serviceQname_QName.gif b/plugins/org.eclipse.jst.j2ee.webservice/icons/full/ctool16/CreateServiceRef_serviceQname_QName.gif
deleted file mode 100644
index c707b34..0000000
--- a/plugins/org.eclipse.jst.j2ee.webservice/icons/full/ctool16/CreateServiceRef_serviceQname_QName.gif
+++ /dev/null
Binary files differ
diff --git a/plugins/org.eclipse.jst.j2ee.webservice/icons/full/ctool16/CreateServiceRef_serviceQname_SOAPHeader.gif b/plugins/org.eclipse.jst.j2ee.webservice/icons/full/ctool16/CreateServiceRef_serviceQname_SOAPHeader.gif
deleted file mode 100644
index 7bf9926..0000000
--- a/plugins/org.eclipse.jst.j2ee.webservice/icons/full/ctool16/CreateServiceRef_serviceQname_SOAPHeader.gif
+++ /dev/null
Binary files differ
diff --git a/plugins/org.eclipse.jst.j2ee.webservice/icons/full/ctool16/CreateServiceRef_serviceQname_WSDLPort.gif b/plugins/org.eclipse.jst.j2ee.webservice/icons/full/ctool16/CreateServiceRef_serviceQname_WSDLPort.gif
deleted file mode 100644
index afeb425..0000000
--- a/plugins/org.eclipse.jst.j2ee.webservice/icons/full/ctool16/CreateServiceRef_serviceQname_WSDLPort.gif
+++ /dev/null
Binary files differ
diff --git a/plugins/org.eclipse.jst.j2ee.webservice/icons/full/ctool16/CreateWebServiceDescription_descriptionType_DescriptionType.gif b/plugins/org.eclipse.jst.j2ee.webservice/icons/full/ctool16/CreateWebServiceDescription_descriptionType_DescriptionType.gif
deleted file mode 100644
index 2c77245..0000000
--- a/plugins/org.eclipse.jst.j2ee.webservice/icons/full/ctool16/CreateWebServiceDescription_descriptionType_DescriptionType.gif
+++ /dev/null
Binary files differ
diff --git a/plugins/org.eclipse.jst.j2ee.webservice/icons/full/ctool16/CreateWebServiceDescription_displayNameType_DisplayNameType.gif b/plugins/org.eclipse.jst.j2ee.webservice/icons/full/ctool16/CreateWebServiceDescription_displayNameType_DisplayNameType.gif
deleted file mode 100644
index f507a84..0000000
--- a/plugins/org.eclipse.jst.j2ee.webservice/icons/full/ctool16/CreateWebServiceDescription_displayNameType_DisplayNameType.gif
+++ /dev/null
Binary files differ
diff --git a/plugins/org.eclipse.jst.j2ee.webservice/icons/full/ctool16/CreateWebServiceDescription_iconType_IconType.gif b/plugins/org.eclipse.jst.j2ee.webservice/icons/full/ctool16/CreateWebServiceDescription_iconType_IconType.gif
deleted file mode 100644
index b5dd75e..0000000
--- a/plugins/org.eclipse.jst.j2ee.webservice/icons/full/ctool16/CreateWebServiceDescription_iconType_IconType.gif
+++ /dev/null
Binary files differ
diff --git a/plugins/org.eclipse.jst.j2ee.webservice/icons/full/ctool16/CreateWebServiceDescription_portComponents_PortComponent.gif b/plugins/org.eclipse.jst.j2ee.webservice/icons/full/ctool16/CreateWebServiceDescription_portComponents_PortComponent.gif
deleted file mode 100644
index 2dbc34d..0000000
--- a/plugins/org.eclipse.jst.j2ee.webservice/icons/full/ctool16/CreateWebServiceDescription_portComponents_PortComponent.gif
+++ /dev/null
Binary files differ
diff --git a/plugins/org.eclipse.jst.j2ee.webservice/icons/full/ctool16/CreateWebServicesClient_componentScopedRefs_ComponentScopedRefs.gif b/plugins/org.eclipse.jst.j2ee.webservice/icons/full/ctool16/CreateWebServicesClient_componentScopedRefs_ComponentScopedRefs.gif
deleted file mode 100644
index b54d742..0000000
--- a/plugins/org.eclipse.jst.j2ee.webservice/icons/full/ctool16/CreateWebServicesClient_componentScopedRefs_ComponentScopedRefs.gif
+++ /dev/null
Binary files differ
diff --git a/plugins/org.eclipse.jst.j2ee.webservice/icons/full/ctool16/CreateWebServicesClient_serviceRefs_ServiceRef.gif b/plugins/org.eclipse.jst.j2ee.webservice/icons/full/ctool16/CreateWebServicesClient_serviceRefs_ServiceRef.gif
deleted file mode 100644
index c2f688e..0000000
--- a/plugins/org.eclipse.jst.j2ee.webservice/icons/full/ctool16/CreateWebServicesClient_serviceRefs_ServiceRef.gif
+++ /dev/null
Binary files differ
diff --git a/plugins/org.eclipse.jst.j2ee.webservice/icons/full/ctool16/CreateWebServices_webServiceDescriptions_WebServiceDescription.gif b/plugins/org.eclipse.jst.j2ee.webservice/icons/full/ctool16/CreateWebServices_webServiceDescriptions_WebServiceDescription.gif
deleted file mode 100644
index 012ad9c..0000000
--- a/plugins/org.eclipse.jst.j2ee.webservice/icons/full/ctool16/CreateWebServices_webServiceDescriptions_WebServiceDescription.gif
+++ /dev/null
Binary files differ
diff --git a/plugins/org.eclipse.jst.j2ee.webservice/icons/full/obj16/BeanLink.gif b/plugins/org.eclipse.jst.j2ee.webservice/icons/full/obj16/BeanLink.gif
deleted file mode 100644
index 2124f3e..0000000
--- a/plugins/org.eclipse.jst.j2ee.webservice/icons/full/obj16/BeanLink.gif
+++ /dev/null
Binary files differ
diff --git a/plugins/org.eclipse.jst.j2ee.webservice/icons/full/obj16/ComponentScopedRefs.gif b/plugins/org.eclipse.jst.j2ee.webservice/icons/full/obj16/ComponentScopedRefs.gif
deleted file mode 100644
index 136e3b2..0000000
--- a/plugins/org.eclipse.jst.j2ee.webservice/icons/full/obj16/ComponentScopedRefs.gif
+++ /dev/null
Binary files differ
diff --git a/plugins/org.eclipse.jst.j2ee.webservice/icons/full/obj16/EJBLink.gif b/plugins/org.eclipse.jst.j2ee.webservice/icons/full/obj16/EJBLink.gif
deleted file mode 100644
index 33854e9..0000000
--- a/plugins/org.eclipse.jst.j2ee.webservice/icons/full/obj16/EJBLink.gif
+++ /dev/null
Binary files differ
diff --git a/plugins/org.eclipse.jst.j2ee.webservice/icons/full/obj16/Handler.gif b/plugins/org.eclipse.jst.j2ee.webservice/icons/full/obj16/Handler.gif
deleted file mode 100644
index 134551b..0000000
--- a/plugins/org.eclipse.jst.j2ee.webservice/icons/full/obj16/Handler.gif
+++ /dev/null
Binary files differ
diff --git a/plugins/org.eclipse.jst.j2ee.webservice/icons/full/obj16/PortComponent.gif b/plugins/org.eclipse.jst.j2ee.webservice/icons/full/obj16/PortComponent.gif
deleted file mode 100644
index a26660ec..0000000
--- a/plugins/org.eclipse.jst.j2ee.webservice/icons/full/obj16/PortComponent.gif
+++ /dev/null
Binary files differ
diff --git a/plugins/org.eclipse.jst.j2ee.webservice/icons/full/obj16/PortComponentRef.gif b/plugins/org.eclipse.jst.j2ee.webservice/icons/full/obj16/PortComponentRef.gif
deleted file mode 100644
index 48e3cf2..0000000
--- a/plugins/org.eclipse.jst.j2ee.webservice/icons/full/obj16/PortComponentRef.gif
+++ /dev/null
Binary files differ
diff --git a/plugins/org.eclipse.jst.j2ee.webservice/icons/full/obj16/SOAPHeader.gif b/plugins/org.eclipse.jst.j2ee.webservice/icons/full/obj16/SOAPHeader.gif
deleted file mode 100644
index 7bf9926..0000000
--- a/plugins/org.eclipse.jst.j2ee.webservice/icons/full/obj16/SOAPHeader.gif
+++ /dev/null
Binary files differ
diff --git a/plugins/org.eclipse.jst.j2ee.webservice/icons/full/obj16/ServiceImplBean.gif b/plugins/org.eclipse.jst.j2ee.webservice/icons/full/obj16/ServiceImplBean.gif
deleted file mode 100644
index ed87474..0000000
--- a/plugins/org.eclipse.jst.j2ee.webservice/icons/full/obj16/ServiceImplBean.gif
+++ /dev/null
Binary files differ
diff --git a/plugins/org.eclipse.jst.j2ee.webservice/icons/full/obj16/ServiceRef.gif b/plugins/org.eclipse.jst.j2ee.webservice/icons/full/obj16/ServiceRef.gif
deleted file mode 100644
index 7bac4fd..0000000
--- a/plugins/org.eclipse.jst.j2ee.webservice/icons/full/obj16/ServiceRef.gif
+++ /dev/null
Binary files differ
diff --git a/plugins/org.eclipse.jst.j2ee.webservice/icons/full/obj16/ServletLink.gif b/plugins/org.eclipse.jst.j2ee.webservice/icons/full/obj16/ServletLink.gif
deleted file mode 100644
index c8d381f..0000000
--- a/plugins/org.eclipse.jst.j2ee.webservice/icons/full/obj16/ServletLink.gif
+++ /dev/null
Binary files differ
diff --git a/plugins/org.eclipse.jst.j2ee.webservice/icons/full/obj16/WSDLPort.gif b/plugins/org.eclipse.jst.j2ee.webservice/icons/full/obj16/WSDLPort.gif
deleted file mode 100644
index 9041598..0000000
--- a/plugins/org.eclipse.jst.j2ee.webservice/icons/full/obj16/WSDLPort.gif
+++ /dev/null
Binary files differ
diff --git a/plugins/org.eclipse.jst.j2ee.webservice/icons/full/obj16/WebServiceDescription.gif b/plugins/org.eclipse.jst.j2ee.webservice/icons/full/obj16/WebServiceDescription.gif
deleted file mode 100644
index 1e5345f..0000000
--- a/plugins/org.eclipse.jst.j2ee.webservice/icons/full/obj16/WebServiceDescription.gif
+++ /dev/null
Binary files differ
diff --git a/plugins/org.eclipse.jst.j2ee.webservice/icons/full/obj16/WebServices.gif b/plugins/org.eclipse.jst.j2ee.webservice/icons/full/obj16/WebServices.gif
deleted file mode 100644
index a17dc7d..0000000
--- a/plugins/org.eclipse.jst.j2ee.webservice/icons/full/obj16/WebServices.gif
+++ /dev/null
Binary files differ
diff --git a/plugins/org.eclipse.jst.j2ee.webservice/icons/full/obj16/WebServicesClient.gif b/plugins/org.eclipse.jst.j2ee.webservice/icons/full/obj16/WebServicesClient.gif
deleted file mode 100644
index 89ad5da..0000000
--- a/plugins/org.eclipse.jst.j2ee.webservice/icons/full/obj16/WebServicesClient.gif
+++ /dev/null
Binary files differ
diff --git a/plugins/org.eclipse.jst.j2ee.webservice/icons/full/obj16/initializ_parameter.gif b/plugins/org.eclipse.jst.j2ee.webservice/icons/full/obj16/initializ_parameter.gif
deleted file mode 100644
index 162a578..0000000
--- a/plugins/org.eclipse.jst.j2ee.webservice/icons/full/obj16/initializ_parameter.gif
+++ /dev/null
Binary files differ
diff --git a/plugins/org.eclipse.jst.j2ee.webservice/icons/full/obj16/servlet.gif b/plugins/org.eclipse.jst.j2ee.webservice/icons/full/obj16/servlet.gif
deleted file mode 100644
index fc1bece..0000000
--- a/plugins/org.eclipse.jst.j2ee.webservice/icons/full/obj16/servlet.gif
+++ /dev/null
Binary files differ
diff --git a/plugins/org.eclipse.jst.j2ee.webservice/icons/full/obj16/sessionBean_obj.gif b/plugins/org.eclipse.jst.j2ee.webservice/icons/full/obj16/sessionBean_obj.gif
deleted file mode 100644
index 507b8a8..0000000
--- a/plugins/org.eclipse.jst.j2ee.webservice/icons/full/obj16/sessionBean_obj.gif
+++ /dev/null
Binary files differ
diff --git a/plugins/org.eclipse.jst.j2ee.webservice/icons/full/obj16/srvce_elem_obj.gif b/plugins/org.eclipse.jst.j2ee.webservice/icons/full/obj16/srvce_elem_obj.gif
deleted file mode 100644
index 6fdcb3f..0000000
--- a/plugins/org.eclipse.jst.j2ee.webservice/icons/full/obj16/srvce_elem_obj.gif
+++ /dev/null
Binary files differ
diff --git a/plugins/org.eclipse.jst.j2ee.webservice/icons/full/obj16/wsdl.gif b/plugins/org.eclipse.jst.j2ee.webservice/icons/full/obj16/wsdl.gif
deleted file mode 100644
index 8fb844f..0000000
--- a/plugins/org.eclipse.jst.j2ee.webservice/icons/full/obj16/wsdl.gif
+++ /dev/null
Binary files differ
diff --git a/plugins/org.eclipse.jst.j2ee.webservice/icons/obj16/componentscopedref.gif b/plugins/org.eclipse.jst.j2ee.webservice/icons/obj16/componentscopedref.gif
deleted file mode 100644
index 120b020..0000000
--- a/plugins/org.eclipse.jst.j2ee.webservice/icons/obj16/componentscopedref.gif
+++ /dev/null
Binary files differ
diff --git a/plugins/org.eclipse.jst.j2ee.webservice/icons/obj16/handler.gif b/plugins/org.eclipse.jst.j2ee.webservice/icons/obj16/handler.gif
deleted file mode 100644
index 1c8339c..0000000
--- a/plugins/org.eclipse.jst.j2ee.webservice/icons/obj16/handler.gif
+++ /dev/null
Binary files differ
diff --git a/plugins/org.eclipse.jst.j2ee.webservice/icons/obj16/portcomponent.gif b/plugins/org.eclipse.jst.j2ee.webservice/icons/obj16/portcomponent.gif
deleted file mode 100644
index b930e2d..0000000
--- a/plugins/org.eclipse.jst.j2ee.webservice/icons/obj16/portcomponent.gif
+++ /dev/null
Binary files differ
diff --git a/plugins/org.eclipse.jst.j2ee.webservice/icons/obj16/serviceref.gif b/plugins/org.eclipse.jst.j2ee.webservice/icons/obj16/serviceref.gif
deleted file mode 100644
index 670c5c9..0000000
--- a/plugins/org.eclipse.jst.j2ee.webservice/icons/obj16/serviceref.gif
+++ /dev/null
Binary files differ
diff --git a/plugins/org.eclipse.jst.j2ee.webservice/icons/obj16/webservicedesc.gif b/plugins/org.eclipse.jst.j2ee.webservice/icons/obj16/webservicedesc.gif
deleted file mode 100644
index 8fb844f..0000000
--- a/plugins/org.eclipse.jst.j2ee.webservice/icons/obj16/webservicedesc.gif
+++ /dev/null
Binary files differ
diff --git a/plugins/org.eclipse.jst.j2ee.webservice/icons/wsceditor.gif b/plugins/org.eclipse.jst.j2ee.webservice/icons/wsceditor.gif
deleted file mode 100644
index 16bc425..0000000
--- a/plugins/org.eclipse.jst.j2ee.webservice/icons/wsceditor.gif
+++ /dev/null
Binary files differ
diff --git a/plugins/org.eclipse.jst.j2ee.webservice/icons/wseditor.gif b/plugins/org.eclipse.jst.j2ee.webservice/icons/wseditor.gif
deleted file mode 100644
index 69ec361..0000000
--- a/plugins/org.eclipse.jst.j2ee.webservice/icons/wseditor.gif
+++ /dev/null
Binary files differ
diff --git a/plugins/org.eclipse.jst.j2ee.webservice/images/form_banner.gif b/plugins/org.eclipse.jst.j2ee.webservice/images/form_banner.gif
deleted file mode 100644
index aebc0b2..0000000
--- a/plugins/org.eclipse.jst.j2ee.webservice/images/form_banner.gif
+++ /dev/null
Binary files differ
diff --git a/plugins/org.eclipse.jst.j2ee.webservice/images/home_nav.gif b/plugins/org.eclipse.jst.j2ee.webservice/images/home_nav.gif
deleted file mode 100644
index fd0c669..0000000
--- a/plugins/org.eclipse.jst.j2ee.webservice/images/home_nav.gif
+++ /dev/null
Binary files differ
diff --git a/plugins/org.eclipse.jst.j2ee.webservice/plugin.properties b/plugins/org.eclipse.jst.j2ee.webservice/plugin.properties
deleted file mode 100644
index 2a4a1bd..0000000
--- a/plugins/org.eclipse.jst.j2ee.webservice/plugin.properties
+++ /dev/null
@@ -1,159 +0,0 @@
-###############################################################################
-# Copyright (c) 2003, 2006 IBM Corporation and others.
-# All rights reserved. This program and the accompanying materials
-# are made available under the terms of the Eclipse Public License v1.0
-# which accompanies this distribution, and is available at
-# http://www.eclipse.org/legal/epl-v10.html
-#
-# Contributors:
-# IBM Corporation - initial API and implementation
-###############################################################################
-# ----------------------------------------------------------------------
-# Properties for com.ibm.etools.webservice.atk.ui
-#
-# Entries are of the form CONSTANT=string
-#
-# File plugins/com.ibm.etools.webservice.atk.ui/plugin.properties, wsa.etools.ws.properties, lunar, 20030922a 26
-# Version 1.26 03/09/09 16:41:49
-# ----------------------------------------------------------------------
-
-#
-# Messages in plugin.xml.
-#
-
-pluginName=Web Service Plug-in
-pluginVendor=Eclipse Web Tools Platform
-
-
-#
-# Edit models
-#
-WSDD_EDIT_MODEL_NAME=Web Services Edit Model
-EDITOR_EDITMODELS_WEB_SERVICES=Web Services Editor Edit Model
-WSCDD_EDIT_MODEL_NAME=Web Services Client Edit Model
-EDITOR_EDITMODELS_WEB_SERVICES_CLIENT=Web Services Client Editor Edit Model
-
-#
-#Common Editor Messages
-#
-TITLE_SAVE_ERROR=Save Error
-MSG_SAVE_ERROR=An error occurred when attempting to save editor contents.
-
-#
-# Messages in WebServicesEditor
-#
-
-#
-# Messages in WebServicesClientEditor
-#
-
-
-
-#
-# Messages in WebServicesPage
-#
-
-
-#
-# Messages in PortComponentPage
-#
-
-
-#
-# Messages in HandlerPage
-#
-
-
-#
-# Messages in WebServicesClientPage
-#
-
-
-#
-# Messages in ServiceRefPage
-#
-
-
-#
-# Labels
-#
-LABEL_UNQUALIFIED_COMPONENT=<unqualified>
-LABEL_SERVLET_LINK=Servlet link
-
-
-
-#
-# Labels for table layout
-#
-LABEL_TABLE_NAME=Name
-LABEL_TABLE_VALUE=Value
-LABEL_TABLE_SOAP_ROLE=SOAP role
-LABEL_TABLE_PORT_NAME=Port name
-LABEL_TABLE_PORT_COMPONENT_LINK=Port component link
-LABEL_TABLE_DESCRIPTION=Description
-
-#
-# Page and Section titles/descriptions
-#
-
-
-
-
-#
-# Dialog labels
-#
-
-
-#
-# Tooltips
-#
-
-
-#
-# Labels for providers
-#
-_UI_WebServiceDescription_type=Web service description
-_UI_PortComponent_type=Port component
-_UI_Handler_type=Handler
-_UI_PortComponentRef_type=Port component reference
-_UI_ServiceRef_type=Service reference
-_UI_WebServicesClient_type=Web services client
-_UI_ComponentScopedRefs_type=Component scoped reference
-_UI_WSDLPort_type=WSDL port
-_UI_WebServices_type=Web services
-_UI_ServletLink_type=Servlet link
-_UI_ServiceImplBean_type=Service implementation bean
-_UI_EJBLink_type=EJB link
-_UI_BeanLink_type=Bean link
-_UI_SOAPRole_type=SOAP role
-_UI_SOAPHeader_type=SOAP header
-_UI_PortName_type=Port name
-_UI_InitParam_type=Initial parameter
-_UI_ServiceRef_jaxrpcMappingFile_feature=Jaxrpc Mapping File
-_UI_ServiceRef_jaxrpcMappingFile_feature_desc=The jaxrpc mapping file.
-_UI_ServiceRef_serviceInterface_feature=Service Interface
-_UI_ServiceRef_serviceInterface_feature_desc=The service interface.
-_UI_ServiceRef_serviceRefName_feature=Name
-_UI_ServiceRef_serviceRefName_feature_desc=The service reference name.
-_UI_ServiceRef_wsdlFile_feature=Wsdl File
-_UI_ServiceRef_wsdlFile_feature_desc=The .wsdl file.
-_UI_PortComponentRef_serviceEndpointInterface_feature=Service Endpoint Interface
-_UI_PortComponentRef_serviceEndpointInterface_feature_desc=The service endpoint interface.
-_UI_PortComponentRef_portComponentLink_feature=Link
-_UI_PortComponentRef_portComponentLink_feature_desc=The port component link.
-_UI_Handler_soapRoles_feature=Soap Roles
-_UI_Handler_soapRoles_feature_desc=The handler soap roles.
-_UI_Handler_portNames_feature=Port Names
-_UI_Handler_portNames_feature_desc=The handler port names.
-_UI_Handler_handlerName_feature=Handler Name
-_UI_Handler_handlerName_feature_desc=The handler name.
-_UI_Handler_handlerClass_feature=Handler Class
-_UI_Handler_handlerClass_feature_desc=The handler class.
-_UI_InitParam_paramName_feature=Name
-_UI_InitParam_paramName_feature_desc=The initial parameter name.
-_UI_InitParam_description_feature=Description
-_UI_InitParam_description_feature_desc=The initial parameter description.
-_UI_InitParam_paramValue_feature=Value
-_UI_InitParam_paramValue_feature_desc=The initial parameter value.
-_UI_JaxRPCMissingModel=Mapping file name unknown.
-
diff --git a/plugins/org.eclipse.jst.j2ee.webservice/plugin.xml b/plugins/org.eclipse.jst.j2ee.webservice/plugin.xml
deleted file mode 100644
index 3fcd0b4..0000000
--- a/plugins/org.eclipse.jst.j2ee.webservice/plugin.xml
+++ /dev/null
@@ -1,129 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<?eclipse version="3.0"?>
-<plugin>
-
-<!-- Dyanmic Content Provider extensions -->
- <extension
- point="org.eclipse.wst.common.emfworkbench.integration.adapterFactory">
- <adapterFactory
- functionGroupID="org.eclipse.jst.j2ee"
- className="org.eclipse.jst.j2ee.internal.webservice.provider.Webservice_clientItemProviderAdapterFactory"
- packageURI="webservice_client.xmi"
- id="org.eclipse.jst.j2ee.internal.webservice.provider.Webservice_clientItemProviderAdapterFactory">
- </adapterFactory>
- </extension>
- <extension
- point="org.eclipse.wst.common.emfworkbench.integration.adapterFactory">
- <adapterFactory
- functionGroupID="org.eclipse.jst.j2ee"
- className="org.eclipse.jst.j2ee.internal.webservice.provider.WscommonItemProviderAdapterFactory"
- packageURI="wscommon.xmi"
- id="org.eclipse.jst.j2ee.internal.webservice.provider.WscommonItemProviderAdapterFactory">
- </adapterFactory>
- <adapterFactory
- functionGroupID="org.eclipse.jst.j2ee"
- className="org.eclipse.jst.j2ee.internal.webservice.provider.Webservice_clientEditorItemProviderFactory"
- packageURI="client.xmi"
- id="org.eclipse.jst.j2ee.internal.webservice.provider.Webservice_clientItemProviderAdapterFactoryForClient">
- </adapterFactory>
- <adapterFactory
- functionGroupID="org.eclipse.jst.j2ee"
- className="org.eclipse.jst.j2ee.internal.webservice.provider.Webservice_clientEditorItemProviderFactory"
- packageURI="webservice_client.xmi"
- id="org.eclipse.jst.j2ee.internal.webservice.wsclient.provider.Webservice_clientItemProviderAdapterFactoryForWSClient">
- </adapterFactory>
- <adapterFactory
- functionGroupID="org.eclipse.jst.j2ee"
- className="org.eclipse.jst.j2ee.internal.webservice.provider.Webservice_clientEditorItemProviderFactory"
- packageURI="ejb.xmi"
- id="org.eclipse.jst.j2ee.internal.webservice.wsclient.provider.Webservice_clientItemProviderAdapterFactoryForEJB">
- </adapterFactory>
- <adapterFactory
- functionGroupID="org.eclipse.jst.j2ee"
- className="org.eclipse.jst.j2ee.internal.webservice.provider.Webservice_clientEditorItemProviderFactory"
- packageURI="webapplication.xmi"
- id="org.eclipse.jst.j2ee.internal.webservice.wsclient.provider.Webservice_clientItemProviderAdapterFactoryForWEB">
- </adapterFactory>
- </extension>
- <extension
- point="org.eclipse.wst.common.emfworkbench.integration.adapterFactory">
- <adapterFactory
- functionGroupID="org.eclipse.jst.j2ee"
- className="org.eclipse.jst.j2ee.internal.webservice.provider.WsddItemProviderAdapterFactory"
- packageURI="wsdd.xmi"
- id="org.eclipse.jst.j2ee.internal.webservice.provider.WsddItemProviderAdapterFactory">
- </adapterFactory>
- </extension>
- <extension
- point="org.eclipse.wst.common.emfworkbench.integration.editModelExtension">
- <editModelExtension
- editModelID="jst.web"
- id="webservices.web.editModelextension">
- <editModelResource
- URI="WEB-INF/webservicesclient.xml">
- </editModelResource>
- <editModelResource
- URI="WEB-INF/webservices.xml">
- </editModelResource>
- </editModelExtension>
- </extension>
- <extension
- point="org.eclipse.wst.common.emfworkbench.integration.editModelExtension">
- <editModelExtension
- editModelID="jst.ejb"
- id="webservices.ejb.editModelextension">
- <editModelResource
- URI="META-INF/webservicesclient.xml">
- </editModelResource>
- <editModelResource
- URI="META-INF/webservices.xml">
- </editModelResource>
- </editModelExtension>
- </extension>
- <extension
- point="org.eclipse.wst.common.emfworkbench.integration.editModelExtension">
- <editModelExtension
- editModelID="jst.appclient"
- id="webservices.appclient.editModelextension">
- <editModelResource
- URI="META-INF/webservicesclient.xml">
- </editModelResource>
- <editModelResource
- URI="META-INF/webservices.xml">
- </editModelResource>
- </editModelExtension>
- </extension>
-
- <extension
- id="WSDLServiceHelper"
- name="WSDLServiceHelper"
- point="org.eclipse.jst.j2ee.WSDLServiceHelper">
- <wsdlHelper
- helperClass="org.eclipse.jst.j2ee.internal.webservice.helper.WSDLServiceHelperImpl">
- </wsdlHelper>
- </extension>
- <extension
- point="org.eclipse.wst.common.modulecore.resourceFactories">
- <resourceFactory
- class="org.eclipse.jst.j2ee.webservice.internal.wsdd.WsddResourceFactory"
- shortSegment="webservices.xml"/>
- <resourceFactory
- class="org.eclipse.jst.j2ee.webservice.internal.wsdd.WsddResourceFactory"
- shortSegment="webservices-temp.xml"/>
- <resourceFactory
- class="org.eclipse.jst.j2ee.webservice.wsclient.internal.impl.WebServicesClientResourceFactory"
- shortSegment="webservicesclient.xml"/>
- </extension>
- <extension
- point="org.eclipse.wst.common.modulecore.resourceFactories">
- <resourceFactory
- class="org.eclipse.jst.j2ee.webservice.internal.wsdd.WsddResourceFactory"
- shortSegment="webservices.xml"/>
- <resourceFactory
- class="org.eclipse.jst.j2ee.webservice.internal.wsdd.WsddResourceFactory"
- shortSegment="webservices-temp.xml"/>
- <resourceFactory
- class="org.eclipse.jst.j2ee.webservice.wsclient.internal.impl.WebServicesClientResourceFactory"
- shortSegment="webservicesclient.xml"/>
- </extension>
-</plugin>
diff --git a/plugins/org.eclipse.jst.j2ee.webservice/prepareforpii.xml b/plugins/org.eclipse.jst.j2ee.webservice/prepareforpii.xml
deleted file mode 100644
index c58f273..0000000
--- a/plugins/org.eclipse.jst.j2ee.webservice/prepareforpii.xml
+++ /dev/null
@@ -1,38 +0,0 @@
-<project name="PrepareForPII" default="main" basedir=".">
-
- <!-- Setup temp variables -->
- <target name="init">
- <property name="nlsDir" value="d:/NLS/Corona/0526"/>
- <property name="plugin" value="com.ibm.wtp.webservice"/>
- <property name="plugindir" value="d:/workspaceCorona/${plugin}"/>
- <property name="outputDir" value="${nlsDir}/${plugin}"/>
-
-
- </target>
-
- <!-- Create the destination dir -->
- <target name="nlsDir" depends="init">
- <mkdir dir="${nlsDir}"/>
- </target>
-
- <!-- Create the destination dir -->
- <target name="plugindir" depends="nlsDir">
- <delete dir="${outputDir}"/>
- <mkdir dir="${outputDir}"/>
- </target>
-
- <!-- Move the files to the correct locations in the workspace. -->
- <target name="main" depends="plugindir">
-
- <messageIdGen folderPath = "${plugindir}" componentId = "E" />
-
- <copy todir = "${outputDir}/property_files" >
- <fileset dir="${plugindir}/property_files">
- <include name="**/*.properties"/>
- </fileset>
- </copy>
-
- <copy file="${plugindir}/plugin.properties" todir="${outputDir}"/>
-
- </target>
-</project>
diff --git a/plugins/org.eclipse.jst.j2ee.webservice/property_files/webservice.properties b/plugins/org.eclipse.jst.j2ee.webservice/property_files/webservice.properties
deleted file mode 100644
index 8a7b0a3..0000000
--- a/plugins/org.eclipse.jst.j2ee.webservice/property_files/webservice.properties
+++ /dev/null
@@ -1,16 +0,0 @@
-###############################################################################
-# Copyright (c) 2003, 2004 IBM Corporation and others.
-# All rights reserved. This program and the accompanying materials
-# are made available under the terms of the Eclipse Public License v1.0
-# which accompanies this distribution, and is available at
-# http://www.eclipse.org/legal/epl-v10.html
-#
-# Contributors:
-# IBM Corporation - initial API and implementation
-###############################################################################
-ERR_HANDLER_DISPLAY_NAME_EMPTY=The handler name cannot be empty.
-ERR_HANDLER_DISPLAY_NAME_EXIST=The handler name already exists.
-ERR_HANDLER_PARAM_NAME_EMPTY=The handler initialization parameter name cannot be empty.
-ERR_HANDLER_NAMESPACE_URL_EMPTY=The handler name space URL cannot be empty.ServiceRefItemProvider.0=ServiceRef
-ERR_HANDLER_PARAM_NAME_EXISTS=The parameter name already exist.
-ERR_HANDLER_NAMESPACE_URL_EXISTS=The handler name space URL already exisit, please change name.
\ No newline at end of file
diff --git a/plugins/org.eclipse.jst.j2ee.webservice/webservice/org/eclipse/jst/j2ee/internal/webservice/adapter/AdapterCCombo.java b/plugins/org.eclipse.jst.j2ee.webservice/webservice/org/eclipse/jst/j2ee/internal/webservice/adapter/AdapterCCombo.java
deleted file mode 100644
index 1458733..0000000
--- a/plugins/org.eclipse.jst.j2ee.webservice/webservice/org/eclipse/jst/j2ee/internal/webservice/adapter/AdapterCCombo.java
+++ /dev/null
@@ -1,134 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2003, 2005 IBM Corporation and others.
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
- *
- * Contributors:
- * IBM Corporation - initial API and implementation
- *******************************************************************************/
-
-package org.eclipse.jst.j2ee.internal.webservice.adapter;
-
-import java.util.Iterator;
-
-import org.eclipse.emf.common.notify.Notification;
-import org.eclipse.emf.common.notify.impl.AdapterImpl;
-import org.eclipse.emf.common.util.EList;
-import org.eclipse.emf.ecore.EObject;
-import org.eclipse.emf.ecore.EStructuralFeature;
-import org.eclipse.swt.custom.CCombo;
-import org.eclipse.swt.events.SelectionEvent;
-import org.eclipse.swt.events.SelectionListener;
-
-public class AdapterCCombo extends AdapterImpl implements SelectionListener {
- private EObject eObject_;
- private EStructuralFeature feature_;
- private EStructuralFeature displayFeature_;
- private CCombo combo_;
- private String defaultDisplayString_;
-
- public AdapterCCombo(EStructuralFeature feature, EStructuralFeature displayFeature, CCombo combo, String defaultDisplayString) {
- super();
- eObject_ = null;
- feature_ = feature;
- displayFeature_ = displayFeature;
- combo_ = combo;
- combo_.addSelectionListener(this);
- defaultDisplayString_ = (defaultDisplayString != null) ? defaultDisplayString : ""; //$NON-NLS-1$
- }
-
- public AdapterCCombo(EStructuralFeature feature, EStructuralFeature displayFeature, CCombo combo) {
- this(feature, displayFeature, combo, null);
- }
-
- public AdapterCCombo(EObject eObject, EStructuralFeature feature, EStructuralFeature displayFeature, CCombo combo) {
- this(eObject, feature, displayFeature, combo, null);
- }
-
- public AdapterCCombo(EObject eObject, EStructuralFeature feature, EStructuralFeature displayFeature, CCombo combo, String defaultDisplayString) {
- this(feature, displayFeature, combo, defaultDisplayString);
- adapt(eObject);
- }
-
- @Override
- public void notifyChanged(Notification msg) {
- Object notifier = msg.getNotifier();
- if (notifier == eObject_) {
- int type = msg.getEventType();
- if (type == Notification.SET || type == Notification.UNSET || type == Notification.ADD || type == Notification.REMOVE || type == Notification.ADD_MANY || type == Notification.REMOVE_MANY)
- populateCombo();
- } else if (msg.getFeature() == displayFeature_)
- populateCombo();
- }
-
- private void populateCombo() {
- if (eObject_ != null) {
- Object object = eObject_.eGet(feature_);
- if (object != null) {
- if (combo_.isDisposed())
- return;
- int selectionIndex = combo_.getSelectionIndex();
- String text = combo_.getText();
- combo_.removeAll();
- if (object instanceof EList) {
- EList eList = (EList) object;
- for (Iterator it = eList.iterator(); it.hasNext();)
- combo_.add(toDisplayString(((EObject) it.next()).eGet(displayFeature_)));
- } else
- combo_.add(toDisplayString(((EObject) object).eGet(displayFeature_)));
- int newIndex = combo_.indexOf(text);
- if (selectionIndex != -1 && newIndex != -1)
- combo_.select(newIndex);
- else
- combo_.select(0);
- }
- }
- }
-
- private String toDisplayString(Object object) {
- if (object != null) {
- String s = object.toString();
- if (s != null && s.length() > 0)
- return s;
- }
- return defaultDisplayString_;
- }
-
- public void widgetDefaultSelected(SelectionEvent e) {
- //Do nothing
- }
-
- public void widgetSelected(SelectionEvent e) {
- //Do nothing
- }
-
- public void adapt(EObject eObject) {
- if (eObject_ != null) {
- eObject_.eAdapters().remove(this);
- combo_.removeAll();
- }
- eObject_ = eObject;
- if (eObject_ != null) {
- eObject_.eAdapters().add(this);
- Object object = eObject_.eGet(feature_);
- if (object instanceof EList) {
- for (Iterator it = ((EList) object).iterator(); it.hasNext();) {
- Object item = it.next();
- if (item instanceof EObject)
- ((EObject) item).eAdapters().add(this);
- }
- } else if (object instanceof EObject)
- ((EObject) object).eAdapters().add(this);
- populateCombo();
- }
- }
-
- public void dispose() {
- if (eObject_ != null)
- eObject_.eAdapters().remove(this);
- if (combo_ != null && !combo_.isDisposed())
- combo_.removeSelectionListener(this);
- }
-}
diff --git a/plugins/org.eclipse.jst.j2ee.webservice/webservice/org/eclipse/jst/j2ee/internal/webservice/adapter/AdapterElement.java b/plugins/org.eclipse.jst.j2ee.webservice/webservice/org/eclipse/jst/j2ee/internal/webservice/adapter/AdapterElement.java
deleted file mode 100644
index fd95f24..0000000
--- a/plugins/org.eclipse.jst.j2ee.webservice/webservice/org/eclipse/jst/j2ee/internal/webservice/adapter/AdapterElement.java
+++ /dev/null
@@ -1,200 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2003, 2005 IBM Corporation and others.
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
- *
- * Contributors:
- * IBM Corporation - initial API and implementation
- *******************************************************************************/
-
-package org.eclipse.jst.j2ee.internal.webservice.adapter;
-
-import java.util.Iterator;
-
-import org.eclipse.emf.common.notify.Notification;
-import org.eclipse.emf.common.notify.impl.AdapterImpl;
-import org.eclipse.emf.ecore.EClass;
-import org.eclipse.emf.ecore.EFactory;
-import org.eclipse.emf.ecore.EObject;
-import org.eclipse.emf.ecore.EStructuralFeature;
-import org.eclipse.jst.j2ee.internal.webservice.command.CommandAddElement;
-import org.eclipse.jst.j2ee.internal.webservice.command.CommandRemoveElement;
-import org.eclipse.swt.events.ModifyEvent;
-import org.eclipse.swt.events.ModifyListener;
-import org.eclipse.swt.widgets.Text;
-import org.eclipse.wst.common.componentcore.ArtifactEdit;
-
-
-public class AdapterElement extends AdapterImpl implements ModifyListener {
- private ArtifactEdit artifactEdit;
- private EObject parent_;
- private EClass childEClass_;
- private EStructuralFeature childFeature_;
- private boolean childNillable_;
- private EStructuralFeature[] features_;
- private boolean[] featuresNillable_;
- private Text[] featuresTexts_;
- private AdapterText[] featuresAdapters_;
-
- public AdapterElement(ArtifactEdit anArtifactEdit, EClass childEClass, EStructuralFeature childFeature, boolean childNillable, EStructuralFeature[] features, boolean[] featuresNillable, Text[] featuresTexts) {
- super();
- artifactEdit = anArtifactEdit;
- parent_ = null;
- childEClass_ = childEClass;
- childFeature_ = childFeature;
- childNillable_ = childNillable;
- features_ = features;
- featuresNillable_ = featuresNillable;
- featuresTexts_ = featuresTexts;
- addModifyListener();
- featuresAdapters_ = new AdapterText[features_.length];
- newAdapters(null);
- }
-
- public AdapterElement(ArtifactEdit anArtifactEdit, EObject parent, EClass childEClass, EStructuralFeature childFeature, boolean childNillable, EStructuralFeature[] features, boolean[] featuresNillable, Text[] featuresTexts) {
- this(anArtifactEdit, childEClass, childFeature, childNillable, features, featuresNillable, featuresTexts);
- adapt(parent);
- }
-
- private void newAdapters(EObject eObject) {
- if (eObject == null)
- for (int i = 0; i < featuresAdapters_.length; i++)
- featuresAdapters_[i] = new AdapterText(artifactEdit, features_[i], featuresTexts_[i], featuresNillable_[i]);
- else
- for (int i = 0; i < featuresAdapters_.length; i++)
- featuresAdapters_[i] = new AdapterText(artifactEdit, eObject, features_[i], featuresTexts_[i], featuresNillable_[i]);
- }
-
- private void addModifyListener() {
- for (int i = 0; i < featuresTexts_.length; i++)
- featuresTexts_[i].addModifyListener(this);
- }
-
- @Override
- public void notifyChanged(Notification msg) {
- int type = msg.getEventType();
- if ((type == Notification.SET || type == Notification.UNSET) && msg.getFeature() == childFeature_) {
- EObject child = (EObject) parent_.eGet(childFeature_);
- if (child == null && !childNillable_)
- child = setChild();
- for (int i = 0; i < featuresAdapters_.length; i++)
- featuresAdapters_[i].adapt(child);
- }
- }
-
- public void modifyText(ModifyEvent e) {
- boolean isTextsNull = isTextsNull();
- EObject child = (EObject) parent_.eGet(childFeature_);
- boolean childCanBeRemoved = true;
- if (child != null) {
- Iterator allfeatures = childEClass_.getEAllStructuralFeatures().iterator();
- while (allfeatures.hasNext()) {
- EStructuralFeature thisFeature = (EStructuralFeature) allfeatures.next();
- if (!adaptingFeature(thisFeature) && child.eIsSet(thisFeature)) {
- childCanBeRemoved = false;
- break;
- }
- }
- }
- if (isTextsNull && child != null && childNillable_ && childCanBeRemoved) {
- disposeAdapters();
- parent_.eAdapters().remove(this);
- CommandRemoveElement command = new CommandRemoveElement(null, null, parent_, childFeature_);
- artifactEdit.getContentModelRoot().eResource().setModified(true);
- artifactEdit.getCommandStack().execute(command);
- parent_.eAdapters().add(this);
- newAdapters(null);
- } else if (!isTextsNull && child == null) {
- disposeAdapters();
- parent_.eAdapters().remove(this);
- child = createChild();
- for (int i = 0; i < features_.length; i++) {
- String text = featuresTexts_[i].getText();
- if (text != null && text.length() > 0)
- child.eSet(features_[i], text);
- }
- CommandAddElement command = new CommandAddElement(null, null, parent_, childFeature_, child);
- artifactEdit.getContentModelRoot().eResource().setModified(true);
- artifactEdit.getCommandStack().execute(command);
- parent_.eAdapters().add(this);
- newAdapters(child);
- }
- }
-
- private boolean isTextsNull() {
- for (int i = 0; i < featuresTexts_.length; i++) {
- String text = featuresTexts_[i].getText();
- if (text != null && text.length() > 0)
- return false;
- }
- return true;
- }
-
- public void adapt(EObject eObject) {
- if (parent_ != null)
- parent_.eAdapters().remove(this);
- parent_ = eObject;
- EObject child = null;
- if (parent_ != null) {
- parent_.eAdapters().add(this);
- child = (EObject) parent_.eGet(childFeature_);
- if (child == null && !childNillable_)
- child = setChild();
- }
- removeModifyListener();
- for (int i = 0; i < featuresAdapters_.length; i++)
- featuresAdapters_[i].adapt(child);
- addModifyListener();
- }
-
- private EObject setChild() {
- EObject child = createChild();
- parent_.eAdapters().remove(this);
- parent_.eSet(childFeature_, child);
- parent_.eAdapters().add(this);
- return child;
- }
-
- private EObject createChild() {
- EFactory childFactory = childEClass_.getEPackage().getEFactoryInstance();
- EObject child = childFactory.create(childEClass_);
- for (int i = 0; i < features_.length; i++) {
- if (!featuresNillable_[i])
- child.eSet(features_[i], ""); //$NON-NLS-1$
- }
- return child;
- }
-
- public void dispose() {
- if (parent_ != null)
- parent_.eAdapters().remove(this);
- disposeAdapters();
- removeModifyListener();
- }
-
- private void disposeAdapters() {
- for (int i = 0; i < featuresAdapters_.length; i++)
- featuresAdapters_[i].dispose();
- }
-
- private void removeModifyListener() {
- for (int i = 0; i < featuresTexts_.length; i++)
- if (featuresTexts_[i] != null && !featuresTexts_[i].isDisposed())
- featuresTexts_[i].removeModifyListener(this);
- }
-
- private boolean adaptingFeature(EStructuralFeature feature) {
- if (features_ == null)
- return false;
-
- for (int i = 0; i < features_.length; i++) {
- if (feature == features_[i]) {
- return true;
- }
- }
-
- return false;
- }
-}
diff --git a/plugins/org.eclipse.jst.j2ee.webservice/webservice/org/eclipse/jst/j2ee/internal/webservice/adapter/AdapterExpiresCCombo.java b/plugins/org.eclipse.jst.j2ee.webservice/webservice/org/eclipse/jst/j2ee/internal/webservice/adapter/AdapterExpiresCCombo.java
deleted file mode 100644
index 3f04cee..0000000
--- a/plugins/org.eclipse.jst.j2ee.webservice/webservice/org/eclipse/jst/j2ee/internal/webservice/adapter/AdapterExpiresCCombo.java
+++ /dev/null
@@ -1,163 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2003, 2005 IBM Corporation and others.
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
- *
- * Contributors:
- * IBM Corporation - initial API and implementation
- *******************************************************************************/
-
-package org.eclipse.jst.j2ee.internal.webservice.adapter;
-
-import org.eclipse.emf.common.notify.Notification;
-import org.eclipse.emf.common.notify.impl.AdapterImpl;
-import org.eclipse.emf.ecore.EObject;
-import org.eclipse.emf.ecore.EStructuralFeature;
-import org.eclipse.jst.j2ee.internal.webservice.command.CommandModifyText;
-import org.eclipse.swt.custom.CCombo;
-import org.eclipse.swt.events.ModifyEvent;
-import org.eclipse.swt.events.ModifyListener;
-import org.eclipse.wst.common.componentcore.ArtifactEdit;
-
-
-public class AdapterExpiresCCombo extends AdapterImpl implements ModifyListener {
- private ArtifactEdit artifactEdit_;
- private EObject eObject_;
- private EStructuralFeature feature_;
- private CCombo year_;
- private CCombo month_;
- private CCombo day_;
- private CCombo hour_;
- private CCombo minute_;
- private CCombo second_;
- private CCombo msecond_;
- private boolean nillable_;
-
- public AdapterExpiresCCombo(ArtifactEdit artifactEdit, EStructuralFeature feature, CCombo year, CCombo month, CCombo day, CCombo hour, CCombo minute, CCombo second, CCombo msecond, boolean nillable) {
- super();
- artifactEdit_ = artifactEdit;
- eObject_ = null;
- feature_ = feature;
- year_ = year;
- month_ = month;
- day_ = day;
- hour_ = hour;
- minute_ = minute;
- second_ = second;
- msecond_ = msecond;
- nillable_ = nillable;
- year_.addModifyListener(this);
- month_.addModifyListener(this);
- day_.addModifyListener(this);
- hour_.addModifyListener(this);
- minute_.addModifyListener(this);
- second_.addModifyListener(this);
- msecond_.addModifyListener(this);
- }
-
- public AdapterExpiresCCombo(ArtifactEdit artifactEdit, EObject eObject, EStructuralFeature feature, CCombo year, CCombo month, CCombo day, CCombo hour, CCombo minute, CCombo second, CCombo msecond, boolean nillable) {
- this(artifactEdit, feature, year, month, day, hour, minute, second, msecond, nillable);
- adapt(eObject);
- }
-
- @Override
- public void notifyChanged(Notification msg) {
- int type = msg.getEventType();
- if ((type == Notification.SET || type == Notification.UNSET) && syncTextAndModel() && msg.getFeature() == feature_)
- setText(msg.getNewStringValue());
- }
-
- public void modifyText(ModifyEvent e) {
- if (syncTextAndModel()) {
- CommandModifyText command = new CommandModifyText(null, null, eObject_, feature_, expires(), nillable_);
- artifactEdit_.getContentModelRoot().eResource().setModified(true);
- artifactEdit_.getCommandStack().execute(command);
- }
- }
-
- public String expires() {
- return "P" + //$NON-NLS-1$
- year_.getText() + "Y" + //$NON-NLS-1$
- month_.getText() + "M" + //$NON-NLS-1$
- day_.getText() + "DT" + //$NON-NLS-1$
- hour_.getText() + "H" + //$NON-NLS-1$
- minute_.getText() + "M" + //$NON-NLS-1$
- second_.getText() + "." + //$NON-NLS-1$
- msecond_.getText() + "S"; //$NON-NLS-1$
- }
-
- public void adapt(EObject eObject) {
- if (eObject_ != null)
- eObject_.eAdapters().remove(this);
- eObject_ = eObject;
- if (eObject_ != null) {
- eObject_.eAdapters().add(this);
- setText((String) eObject_.eGet(feature_));
- }
- }
-
- public void adapt(EObject eObject, EStructuralFeature feature) {
- feature_ = feature;
- adapt(eObject);
- }
-
- public void dispose() {
- if (eObject_ != null)
- eObject_.eAdapters().remove(this);
- if (year_ != null && !year_.isDisposed())
- year_.removeModifyListener(this);
- if (month_ != null && !month_.isDisposed())
- month_.removeModifyListener(this);
- if (day_ != null && !day_.isDisposed())
- day_.removeModifyListener(this);
- if (hour_ != null && !hour_.isDisposed())
- hour_.removeModifyListener(this);
- if (minute_ != null && !minute_.isDisposed())
- minute_.removeModifyListener(this);
- if (second_ != null && !second_.isDisposed())
- second_.removeModifyListener(this);
- if (msecond_ != null && !msecond_.isDisposed())
- msecond_.removeModifyListener(this);
-
- }
-
- private boolean syncTextAndModel() {
- if (eObject_ != null) {
- String modelValue = (String) eObject_.eGet(feature_);
- String value = expires();
- if (modelValue == null || modelValue.length() <= 0)
- return !(value == null || value.length() <= 0);
- return !(modelValue.equals(value));
- }
- return false;
- }
-
- private void setText(String modelValue) {
- if (modelValue != null) {
- int y = modelValue.indexOf("Y"); //$NON-NLS-1$
- int mo = modelValue.indexOf("M"); //$NON-NLS-1$
- int d = modelValue.indexOf("D"); //$NON-NLS-1$
- int h = modelValue.indexOf("H"); //$NON-NLS-1$
- int mi = modelValue.lastIndexOf("M"); //$NON-NLS-1$
- int s = modelValue.indexOf("."); //$NON-NLS-1$
- int ms = modelValue.indexOf("S"); //$NON-NLS-1$
-
- if (!year_.isDisposed() && y > 0)
- year_.setText(modelValue.substring(1, y));
- if (!month_.isDisposed() && mo > 0)
- month_.setText(modelValue.substring(y + 1, mo));
- if (!day_.isDisposed() && d > 0)
- day_.setText(modelValue.substring(mo + 1, d));
- if (!hour_.isDisposed() && h > 0)
- hour_.setText(modelValue.substring(d + 2, h));
- if (!minute_.isDisposed() && mi > 0)
- minute_.setText(modelValue.substring(h + 1, mi));
- if (!second_.isDisposed() && s > 0)
- second_.setText(modelValue.substring(mi + 1, s));
- if (!msecond_.isDisposed() && ms > 0)
- msecond_.setText(modelValue.substring(s + 1, ms));
- }
- }
-}
diff --git a/plugins/org.eclipse.jst.j2ee.webservice/webservice/org/eclipse/jst/j2ee/internal/webservice/adapter/AdapterHandlerClassText.java b/plugins/org.eclipse.jst.j2ee.webservice/webservice/org/eclipse/jst/j2ee/internal/webservice/adapter/AdapterHandlerClassText.java
deleted file mode 100644
index 27aee3b..0000000
--- a/plugins/org.eclipse.jst.j2ee.webservice/webservice/org/eclipse/jst/j2ee/internal/webservice/adapter/AdapterHandlerClassText.java
+++ /dev/null
@@ -1,130 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2003, 2005 IBM Corporation and others.
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
- *
- * Contributors:
- * IBM Corporation - initial API and implementation
- *******************************************************************************/
-
-package org.eclipse.jst.j2ee.internal.webservice.adapter;
-
-/*
- * import org.eclipse.emf.ecore.EObject;
- */
-import org.eclipse.emf.common.notify.Notification;
-import org.eclipse.emf.common.notify.impl.AdapterImpl;
-import org.eclipse.emf.ecore.EStructuralFeature;
-import org.eclipse.jst.j2ee.internal.webservice.command.CommandModifyHandlerClassText;
-import org.eclipse.jst.j2ee.webservice.wsclient.Handler;
-import org.eclipse.jst.j2ee.webservice.wsclient.Webservice_clientPackage;
-import org.eclipse.swt.events.ModifyEvent;
-import org.eclipse.swt.events.ModifyListener;
-import org.eclipse.swt.widgets.Text;
-import org.eclipse.wst.common.componentcore.ArtifactEdit;
-
-
-public class AdapterHandlerClassText extends AdapterImpl implements ModifyListener {
- protected ArtifactEdit artifactEdit;
- protected Handler eObject_;
- protected EStructuralFeature feature_;
- protected Text text_;
- protected boolean nillable_;
-
- public AdapterHandlerClassText(ArtifactEdit anArtifactEdit, Text text) {
- super();
- artifactEdit = anArtifactEdit;
- eObject_ = null;
- feature_ = Webservice_clientPackage.eINSTANCE.getHandler_HandlerClass();
- text_ = text;
- nillable_ = false;
- text_.addModifyListener(this);
- }
-
- public AdapterHandlerClassText(ArtifactEdit anArtifactEdit, Handler eObject, Text text) {
- this(anArtifactEdit, text);
- adapt(eObject);
- }
-
- @Override
- public void notifyChanged(Notification msg) {
- int type = msg.getEventType();
- if ((type == Notification.SET || type == Notification.UNSET) && syncTextAndModel() && msg.getFeature() == feature_) {
- String newClassName = eObject_.getHandlerClass().getQualifiedNameForReflection();
- setText(newClassName);
- }
- }
-
- public void modifyText(ModifyEvent e) {
- if (syncTextAndModel()) {
- CommandModifyHandlerClassText command = new CommandModifyHandlerClassText(null, null, eObject_, text_.getText());
- if (artifactEdit != null) {
- artifactEdit.getContentModelRoot().eResource().setModified(true);
- artifactEdit.getCommandStack().execute(command);
- }
- }
- }
-
- public void adapt(Handler eObject) {
- if (eObject_ != null)
- eObject_.eAdapters().remove(this);
- eObject_ = eObject;
- if (eObject_ != null) {
- eObject_.eAdapters().add(this);
- String newClassName = eObject_.getHandlerClass().getQualifiedNameForReflection();
- setText(newClassName);
- } else
- setText(null);
- }
-
- /*
- * public void adapt(EObject eObject, EStructuralFeature feature) { feature_ = feature;
- * adapt(eObject); }
- */
- public void dispose() {
- if (eObject_ != null)
- eObject_.eAdapters().remove(this);
- if (text_ != null && !text_.isDisposed())
- text_.removeModifyListener(this);
- }
-
- protected boolean syncTextAndModel() {
- if (eObject_ != null) {
- String modelValue = eObject_.getHandlerClass().getQualifiedNameForReflection();
- String textValue = text_.getText();
- if (modelValue == null || modelValue.length() <= 0)
- return !(textValue == null || textValue.length() <= 0);
- return !(modelValue.equals(textValue));
- }
- return false;
- }
-
- private void setText(String text) {
- if (!text_.isDisposed()) {
- String currText = text_.getText();
- if (text == null || text.length() <= 0) {
- if (currText != null && currText.length() > 0)
- text_.setText(""); //$NON-NLS-1$
- } else if (!text.equals(currText))
- text_.setText(text);
- }
- }
-
- /**
- * @return Returns the j2eeEditModel.
- */
- public ArtifactEdit getArtifactEdit() {
- return artifactEdit;
- }
-
- /**
- * @param editModel
- * The j2eeEditModel to set.
- */
- public void setArtifactEdit(ArtifactEdit anArtifactEdit) {
- artifactEdit = anArtifactEdit;
- }
-
-}
diff --git a/plugins/org.eclipse.jst.j2ee.webservice/webservice/org/eclipse/jst/j2ee/internal/webservice/adapter/AdapterLayer.java b/plugins/org.eclipse.jst.j2ee.webservice/webservice/org/eclipse/jst/j2ee/internal/webservice/adapter/AdapterLayer.java
deleted file mode 100644
index f524120..0000000
--- a/plugins/org.eclipse.jst.j2ee.webservice/webservice/org/eclipse/jst/j2ee/internal/webservice/adapter/AdapterLayer.java
+++ /dev/null
@@ -1,90 +0,0 @@
-/***************************************************************************************************
- * Copyright (c) 2003, 2004 IBM Corporation and others. All rights reserved. This program and the
- * accompanying materials are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
- *
- * Contributors: IBM Corporation - initial API and implementation
- **************************************************************************************************/
-
-package org.eclipse.jst.j2ee.internal.webservice.adapter;
-
-import java.util.Iterator;
-
-import org.eclipse.emf.common.notify.Notification;
-import org.eclipse.emf.common.notify.impl.AdapterImpl;
-import org.eclipse.emf.common.util.EList;
-import org.eclipse.emf.ecore.EClass;
-import org.eclipse.emf.ecore.EObject;
-import org.eclipse.emf.ecore.EStructuralFeature;
-
-public class AdapterLayer extends AdapterImpl {
- private EObject parent_;
- private EStructuralFeature feature_;
- private EClass childEClass_;
- private EObject child_;
-
- public AdapterLayer(EObject parent, EStructuralFeature feature, EClass childEClass) {
- super();
- parent_ = parent;
- feature_ = feature;
- childEClass_ = childEClass;
- adapt(parent_);
- }
-
- @Override
- public void notifyChanged(Notification msg) {
- int type = msg.getEventType();
- if (type == Notification.SET || type == Notification.UNSET || type == Notification.ADD || type == Notification.REMOVE || type == Notification.ADD_MANY || type == Notification.REMOVE_MANY)
- adaptParent();
- }
-
- public void adapt(EObject eObject) {
- if (child_ != null)
- child_.eAdapters().remove(this);
- parent_ = eObject;
- adaptChild();
- if (child_ != null)
- child_.eAdapters().add(this);
- }
-
- public void dispose() {
- if (child_ != null)
- child_.eAdapters().remove(this);
- }
-
- public EObject getChild() {
- return child_;
- }
-
- private void adaptChild() {
- if (parent_ != null) {
- Object object = parent_.eGet(feature_);
- if (object == null)
- child_ = childEClass_.getEPackage().getEFactoryInstance().create(childEClass_);
- else
- child_ = (EObject) object;
- } else
- child_ = null;
- }
-
- private void adaptParent() {
- if (parent_ != null && child_ != null) {
- EList childFeatures = childEClass_.getEAllStructuralFeatures();
- for (Iterator it = childFeatures.iterator(); it.hasNext();) {
- EStructuralFeature childFeature = (EStructuralFeature) it.next();
- boolean isFeatureSet;
- Object grandchild = child_.eGet(childFeature);
- if (grandchild != null && grandchild instanceof EList)
- isFeatureSet = !((EList) grandchild).isEmpty();
- else
- isFeatureSet = child_.eIsSet(childFeature);
- if (isFeatureSet) {
- parent_.eSet(feature_, child_);
- return;
- }
- }
- parent_.eUnset(feature_);
- }
- }
-}
\ No newline at end of file
diff --git a/plugins/org.eclipse.jst.j2ee.webservice/webservice/org/eclipse/jst/j2ee/internal/webservice/adapter/AdapterPCRefText.java b/plugins/org.eclipse.jst.j2ee.webservice/webservice/org/eclipse/jst/j2ee/internal/webservice/adapter/AdapterPCRefText.java
deleted file mode 100644
index 02d1b9b..0000000
--- a/plugins/org.eclipse.jst.j2ee.webservice/webservice/org/eclipse/jst/j2ee/internal/webservice/adapter/AdapterPCRefText.java
+++ /dev/null
@@ -1,120 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2003, 2005 IBM Corporation and others.
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
- *
- * Contributors:
- * IBM Corporation - initial API and implementation
- *******************************************************************************/
-/*
- * Created on Jan 21, 2004
- *
- * To change the template for this generated file go to
- * Window - Preferences - Java - Code Generation - Code and Comments
- */
-package org.eclipse.jst.j2ee.internal.webservice.adapter;
-
-import org.eclipse.emf.common.notify.Notification;
-import org.eclipse.emf.ecore.EObject;
-import org.eclipse.emf.ecore.EStructuralFeature;
-import org.eclipse.jem.java.JavaClass;
-import org.eclipse.jst.j2ee.internal.webservice.command.CommandModifySEI;
-import org.eclipse.jst.j2ee.internal.webservice.command.CommandModifyText;
-import org.eclipse.jst.j2ee.webservice.wsclient.PortComponentRef;
-import org.eclipse.jst.j2ee.webservice.wsclient.Webservice_clientPackage;
-import org.eclipse.swt.events.ModifyEvent;
-import org.eclipse.swt.widgets.Text;
-import org.eclipse.wst.common.componentcore.ArtifactEdit;
-
-
-/**
- * @author rsinha
- *
- * To change the template for this generated type comment go to Window - Preferences - Java - Code
- * Generation - Code and Comments
- */
-public class AdapterPCRefText extends AdapterText {
- public AdapterPCRefText(ArtifactEdit anArtifactEdit, EStructuralFeature feature, Text text, boolean nillable) {
- super(anArtifactEdit, feature, text, nillable);
- }
-
-
- public AdapterPCRefText(ArtifactEdit anArtifactEdit, EObject eObject, EStructuralFeature feature, Text text, boolean nillable) {
- super(anArtifactEdit, eObject, feature, text, nillable);
- }
-
- @Override
- public void notifyChanged(Notification msg) {
- int type = msg.getEventType();
- if ((type == Notification.SET || type == Notification.UNSET) && syncTextAndModel() && msg.getFeature() == feature_) {
- Object obj = eObject_.eGet(feature_);
- String objStringValue = ""; //$NON-NLS-1$
- if (obj instanceof String) {
- objStringValue = (String) obj;
- } else if (obj instanceof JavaClass) {
- JavaClass javaClass = (JavaClass) obj;
- objStringValue = javaClass.getQualifiedNameForReflection();
- }
- setText(objStringValue);
- }
- }
-
- @Override
- public void modifyText(ModifyEvent e) {
- if (syncTextAndModel()) {
- //Handle PortComponentRef_ServiceEndpointInterface feature in a special way.
- String SEIFeatureName = Webservice_clientPackage.eINSTANCE.getPortComponentRef_ServiceEndpointInterface().getName();
- if ((eObject_ instanceof PortComponentRef) && (feature_.getName().equals(SEIFeatureName))) {
- CommandModifySEI command = new CommandModifySEI(null, null, (PortComponentRef) eObject_, text_.getText(), nillable_);
- artifactEdit.getContentModelRoot().eResource().setModified(true);
- artifactEdit.getCommandStack().execute(command);
- } else {
- CommandModifyText command = new CommandModifyText(null, null, eObject_, feature_, text_.getText(), nillable_);
- artifactEdit.getContentModelRoot().eResource().setModified(true);
- artifactEdit.getCommandStack().execute(command);
- }
- }
- }
-
- @Override
- public void adapt(EObject eObject) {
- if (eObject_ != null)
- eObject_.eAdapters().remove(this);
- eObject_ = eObject;
- if (eObject_ != null) {
- eObject_.eAdapters().add(this);
- Object obj = eObject_.eGet(feature_);
- String objStringValue = ""; //$NON-NLS-1$
- if (obj instanceof String) {
- objStringValue = (String) obj;
- } else if (obj instanceof JavaClass) {
- JavaClass javaClass = (JavaClass) obj;
- objStringValue = javaClass.getQualifiedNameForReflection();
- }
- setText(objStringValue);
- } else
- setText(null);
- }
-
- @Override
- protected boolean syncTextAndModel() {
- if (eObject_ != null) {
- String modelValue;
- //Handle PortComponentRef_ServiceEndpointInterface feature in a special way.
- String SEIFeatureName = Webservice_clientPackage.eINSTANCE.getPortComponentRef_ServiceEndpointInterface().getName();
- if ((eObject_ instanceof PortComponentRef) && (feature_.getName().equals(SEIFeatureName))) {
- modelValue = ((PortComponentRef) eObject_).getServiceEndpointInterface().getQualifiedNameForReflection();
- } else {
- modelValue = (String) eObject_.eGet(feature_);
- }
- String textValue = text_.getText();
- if (modelValue == null || modelValue.length() <= 0)
- return !(textValue == null || textValue.length() <= 0);
- return !(modelValue.equals(textValue));
- }
- return false;
- }
-
-}
diff --git a/plugins/org.eclipse.jst.j2ee.webservice/webservice/org/eclipse/jst/j2ee/internal/webservice/adapter/AdapterQNameElement.java b/plugins/org.eclipse.jst.j2ee.webservice/webservice/org/eclipse/jst/j2ee/internal/webservice/adapter/AdapterQNameElement.java
deleted file mode 100644
index 698f91e..0000000
--- a/plugins/org.eclipse.jst.j2ee.webservice/webservice/org/eclipse/jst/j2ee/internal/webservice/adapter/AdapterQNameElement.java
+++ /dev/null
@@ -1,248 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2003, 2005 IBM Corporation and others.
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
- *
- * Contributors:
- * IBM Corporation - initial API and implementation
- *******************************************************************************/
-
-package org.eclipse.jst.j2ee.internal.webservice.adapter;
-
-import java.util.Iterator;
-
-import org.eclipse.emf.common.notify.Notification;
-import org.eclipse.emf.common.notify.impl.AdapterImpl;
-import org.eclipse.emf.ecore.EClass;
-import org.eclipse.emf.ecore.EFactory;
-import org.eclipse.emf.ecore.EObject;
-import org.eclipse.emf.ecore.EStructuralFeature;
-import org.eclipse.jst.j2ee.common.CommonPackage;
-import org.eclipse.jst.j2ee.common.QName;
-import org.eclipse.jst.j2ee.internal.webservice.command.CommandAddElement;
-import org.eclipse.jst.j2ee.internal.webservice.command.CommandRemoveElement;
-import org.eclipse.jst.j2ee.webservice.internal.util.QNameHelper;
-import org.eclipse.swt.events.ModifyEvent;
-import org.eclipse.swt.events.ModifyListener;
-import org.eclipse.swt.widgets.Text;
-import org.eclipse.wst.common.componentcore.ArtifactEdit;
-
-
-/**
- * Generic eSet's will not work when setting namespaceURIs on QName's so AdapterElement cannot be
- * used when the child is a QName. This class is very similar AdapterElement but has special
- * behaviour for handling QName's.
- */
-public class AdapterQNameElement extends AdapterImpl implements ModifyListener {
-
- private ArtifactEdit artifactEdit;
- private EObject parent_;
- private EClass childEClass_;
- private EStructuralFeature childFeature_;
- private boolean childNillable_;
- private EStructuralFeature[] features_;
- private boolean[] featuresNillable_;
- private Text[] featuresTexts_;
- private AdapterText[] featuresAdapters_;
-
- /**
- *
- */
- public AdapterQNameElement(ArtifactEdit anArtifactEdit, EClass childEClass, EStructuralFeature childFeature, boolean childNillable, Text nsURIText, Text localPartText) {
- super();
- artifactEdit = anArtifactEdit;
- parent_ = null;
- childEClass_ = childEClass;
- childFeature_ = childFeature;
- childNillable_ = childNillable;
- CommonPackage commonPKG = CommonPackage.eINSTANCE;
- // Set up QName features
- features_ = new EStructuralFeature[2];
- features_[0] = commonPKG.getQName_NamespaceURI();
- features_[1] = commonPKG.getQName_LocalPart();
- featuresNillable_ = new boolean[2];
- featuresNillable_[0] = false;
- featuresNillable_[1] = false;
- featuresTexts_ = new Text[2];
- featuresTexts_[0] = nsURIText;
- featuresTexts_[1] = localPartText;
- addModifyListener();
- featuresAdapters_ = new AdapterText[features_.length];
- newAdapters(null);
-
- }
-
- /**
- *
- */
- public AdapterQNameElement(ArtifactEdit anArtifactEdit, EObject parent, EClass childEClass, EStructuralFeature childFeature, boolean childNillable, Text nsURIText, Text localPartText) {
- this(anArtifactEdit, childEClass, childFeature, childNillable, nsURIText, localPartText);
- adapt(parent);
- }
-
- private void newAdapters(EObject eObject) {
- if (eObject == null) {
- featuresAdapters_[0] = new AdapterQNameText(artifactEdit, features_[0], featuresTexts_[0], featuresNillable_[0]);
- featuresAdapters_[1] = new AdapterText(artifactEdit, features_[1], featuresTexts_[1], featuresNillable_[1]);
- } else {
- featuresAdapters_[0] = new AdapterQNameText(artifactEdit, eObject, features_[0], featuresTexts_[0], featuresNillable_[0]);
- featuresAdapters_[1] = new AdapterText(artifactEdit, eObject, features_[1], featuresTexts_[1], featuresNillable_[1]);
- }
- }
-
- private void addModifyListener() {
- for (int i = 0; i < featuresTexts_.length; i++)
- featuresTexts_[i].addModifyListener(this);
- }
-
- @Override
- public void notifyChanged(Notification msg) {
- int type = msg.getEventType();
- if ((type == Notification.SET || type == Notification.UNSET) && msg.getFeature() == childFeature_) {
- EObject child = (EObject) parent_.eGet(childFeature_);
- if (child == null && !childNillable_)
- child = setChild();
- for (int i = 0; i < featuresAdapters_.length; i++)
- featuresAdapters_[i].adapt(child);
- }
- }
-
- public void modifyText(ModifyEvent e) {
- boolean isTextsNull = isTextsNull();
- EObject child = (EObject) parent_.eGet(childFeature_);
- boolean childCanBeRemoved = true;
- if (child != null) {
- Iterator allfeatures = childEClass_.getEAllStructuralFeatures().iterator();
- while (allfeatures.hasNext()) {
- EStructuralFeature thisFeature = (EStructuralFeature) allfeatures.next();
- if (!adaptingFeature(thisFeature) && child.eIsSet(thisFeature)) {
- childCanBeRemoved = false;
- break;
- }
- }
- }
- if (isTextsNull && child != null && childNillable_ && childCanBeRemoved) {
- disposeAdapters();
- parent_.eAdapters().remove(this);
- CommandRemoveElement command = new CommandRemoveElement(null, null, parent_, childFeature_);
- artifactEdit.getContentModelRoot().eResource().setModified(true);
- artifactEdit.getCommandStack().execute(command);
- parent_.eAdapters().add(this);
- newAdapters(null);
- } else if (!isTextsNull && child == null) {
- disposeAdapters();
- parent_.eAdapters().remove(this);
- child = createChild();
- setFeaturesOnChild(child);
- /*
- * replaced by setFeaturesOnChild for (int i = 0; i < features_.length; i++) { String
- * text = featuresTexts_[i].getText(); if (text != null && text.length() > 0)
- * child.eSet(features_[i], text); }
- */
- CommandAddElement command = new CommandAddElement(null, null, parent_, childFeature_, child);
- artifactEdit.getContentModelRoot().eResource().setModified(true);
- artifactEdit.getCommandStack().execute(command);
- parent_.eAdapters().add(this);
- newAdapters(child);
- }
- }
-
- private boolean isTextsNull() {
- for (int i = 0; i < featuresTexts_.length; i++) {
- String text = featuresTexts_[i].getText();
- if (text != null && text.length() > 0)
- return false;
- }
- return true;
- }
-
- public void adapt(EObject eObject) {
- if (parent_ != null)
- parent_.eAdapters().remove(this);
- parent_ = eObject;
- EObject child = null;
- if (parent_ != null) {
- parent_.eAdapters().add(this);
- child = (EObject) parent_.eGet(childFeature_);
- if (child == null && !childNillable_)
- child = setChild();
- }
- removeModifyListener();
- for (int i = 0; i < featuresAdapters_.length; i++)
- featuresAdapters_[i].adapt(child);
- addModifyListener();
- }
-
- private EObject setChild() {
- EObject child = createChild();
- parent_.eAdapters().remove(this);
- parent_.eSet(childFeature_, child);
- parent_.eAdapters().add(this);
- return child;
- }
-
- private EObject createChild() {
- EFactory childFactory = childEClass_.getEPackage().getEFactoryInstance();
- EObject child = childFactory.create(childEClass_);
- for (int i = 0; i < features_.length; i++) {
- if (!featuresNillable_[i])
- child.eSet(features_[i], ""); //$NON-NLS-1$
- }
- return child;
- }
-
- public void dispose() {
- if (parent_ != null)
- parent_.eAdapters().remove(this);
- disposeAdapters();
- removeModifyListener();
- }
-
- private void disposeAdapters() {
- for (int i = 0; i < featuresAdapters_.length; i++)
- featuresAdapters_[i].dispose();
- }
-
- private void removeModifyListener() {
- for (int i = 0; i < featuresTexts_.length; i++)
- if (featuresTexts_[i] != null && !featuresTexts_[i].isDisposed())
- featuresTexts_[i].removeModifyListener(this);
- }
-
- private boolean adaptingFeature(EStructuralFeature feature) {
- if (features_ == null)
- return false;
-
- for (int i = 0; i < features_.length; i++) {
- if (feature == features_[i]) {
- return true;
- }
- }
-
- return false;
- }
-
- protected void setFeaturesOnChild(EObject child) {
- if (child instanceof QName) //This will always be true.
- {
- QName qname = (QName) child;
- String namespaceURIValue = featuresTexts_[0].getText();
- String localPartValue = featuresTexts_[1].getText();
- if (namespaceURIValue == null || namespaceURIValue.length() == 0) {
- //Just set the local part
- if (localPartValue != null && localPartValue.length() > 0)
- qname.setLocalPart(localPartValue);
-
- } else {
- if (localPartValue == null)
- localPartValue = ""; //$NON-NLS-1$
-
- //Set namespace and local part using QNameHelper
- QNameHelper.setQNameValue(qname, namespaceURIValue, localPartValue);
- }
- }
- }
-
-}
diff --git a/plugins/org.eclipse.jst.j2ee.webservice/webservice/org/eclipse/jst/j2ee/internal/webservice/adapter/AdapterQNameText.java b/plugins/org.eclipse.jst.j2ee.webservice/webservice/org/eclipse/jst/j2ee/internal/webservice/adapter/AdapterQNameText.java
deleted file mode 100644
index d937bf8..0000000
--- a/plugins/org.eclipse.jst.j2ee.webservice/webservice/org/eclipse/jst/j2ee/internal/webservice/adapter/AdapterQNameText.java
+++ /dev/null
@@ -1,63 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2003, 2005 IBM Corporation and others.
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
- *
- * Contributors:
- * IBM Corporation - initial API and implementation
- *******************************************************************************/
-package org.eclipse.jst.j2ee.internal.webservice.adapter;
-
-import org.eclipse.emf.ecore.EObject;
-import org.eclipse.emf.ecore.EStructuralFeature;
-import org.eclipse.jst.j2ee.common.CommonPackage;
-import org.eclipse.jst.j2ee.common.QName;
-import org.eclipse.jst.j2ee.internal.webservice.command.CommandModifyNSURI;
-import org.eclipse.jst.j2ee.internal.webservice.command.CommandModifyText;
-import org.eclipse.swt.events.ModifyEvent;
-import org.eclipse.swt.widgets.Text;
-import org.eclipse.wst.common.componentcore.ArtifactEdit;
-
-
-
-
-/**
- * Since generic eSet's will not work for setting QName namespaceURI's, this subclass's purpose is
- * to override the behaviour when necessary.
- */
-public class AdapterQNameText extends AdapterText {
-
- public AdapterQNameText(ArtifactEdit anArtifactEdit, EStructuralFeature feature, Text text, boolean nillable) {
- super(anArtifactEdit, feature, text, nillable);
- }
-
-
- public AdapterQNameText(ArtifactEdit anArtifactEdit, EObject eObject, EStructuralFeature feature, Text text, boolean nillable) {
- super(anArtifactEdit, eObject, feature, text, nillable);
- }
-
- @Override
- public void modifyText(ModifyEvent e) {
- if (syncTextAndModel()) {
- //Handle QName_NamespaceURI feature in a special way.
- String namespaceFeatureName = CommonPackage.eINSTANCE.getQName_NamespaceURI().getName();
- if ((eObject_ instanceof QName) && (feature_.getName().equals(namespaceFeatureName))) {
- CommandModifyNSURI command = new CommandModifyNSURI(null, null, (QName) eObject_, text_.getText(), nillable_);
- if (artifactEdit != null) {
- artifactEdit.getContentModelRoot().eResource().setModified(true);
- artifactEdit.getCommandStack().execute(command);
- }
- } else {
- CommandModifyText command = new CommandModifyText(null, null, eObject_, feature_, text_.getText(), nillable_);
- if (artifactEdit != null) {
- artifactEdit.getContentModelRoot().eResource().setModified(true);
- artifactEdit.getCommandStack().execute(command);
- }
- }
-
-
- }
- }
-}
diff --git a/plugins/org.eclipse.jst.j2ee.webservice/webservice/org/eclipse/jst/j2ee/internal/webservice/adapter/AdapterServiceInterfaceText.java b/plugins/org.eclipse.jst.j2ee.webservice/webservice/org/eclipse/jst/j2ee/internal/webservice/adapter/AdapterServiceInterfaceText.java
deleted file mode 100644
index 57894df..0000000
--- a/plugins/org.eclipse.jst.j2ee.webservice/webservice/org/eclipse/jst/j2ee/internal/webservice/adapter/AdapterServiceInterfaceText.java
+++ /dev/null
@@ -1,118 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2003, 2005 IBM Corporation and others.
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
- *
- * Contributors:
- * IBM Corporation - initial API and implementation
- *******************************************************************************/
-
-package org.eclipse.jst.j2ee.internal.webservice.adapter;
-
-/*
- * import org.eclipse.emf.ecore.EObject;
- */
-import org.eclipse.emf.common.notify.Notification;
-import org.eclipse.emf.common.notify.impl.AdapterImpl;
-import org.eclipse.emf.ecore.EStructuralFeature;
-import org.eclipse.jst.j2ee.internal.webservice.command.CommandModifyServiceInterfaceText;
-import org.eclipse.jst.j2ee.webservice.wsclient.ServiceRef;
-import org.eclipse.jst.j2ee.webservice.wsclient.Webservice_clientPackage;
-import org.eclipse.swt.events.ModifyEvent;
-import org.eclipse.swt.events.ModifyListener;
-import org.eclipse.swt.widgets.Text;
-import org.eclipse.wst.common.componentcore.ArtifactEdit;
-
-
-public class AdapterServiceInterfaceText extends AdapterImpl implements ModifyListener {
- protected ArtifactEdit artifactEdit;
- protected ServiceRef eObject_;
- protected EStructuralFeature feature_;
- protected Text text_;
- protected boolean nillable_;
-
- public AdapterServiceInterfaceText(ArtifactEdit anArtifactEdit, Text text) {
- super();
- artifactEdit = anArtifactEdit;
- eObject_ = null;
- feature_ = Webservice_clientPackage.eINSTANCE.getServiceRef_ServiceInterface();
- text_ = text;
- nillable_ = false;
- text_.addModifyListener(this);
- }
-
- public AdapterServiceInterfaceText(ArtifactEdit anArtifactEdit, ServiceRef eObject, Text text) {
- this(anArtifactEdit, text);
- adapt(eObject);
- }
-
- @Override
- public void notifyChanged(Notification msg) {
- int type = msg.getEventType();
- if ((type == Notification.SET || type == Notification.UNSET) && syncTextAndModel() && msg.getFeature() == feature_) {
- String newClassName = eObject_.getServiceInterface().getQualifiedNameForReflection();
- setText(newClassName);
- }
- }
-
- public void modifyText(ModifyEvent e) {
- if (syncTextAndModel()) {
- CommandModifyServiceInterfaceText command = new CommandModifyServiceInterfaceText(null, null, eObject_, text_.getText());
- artifactEdit.getContentModelRoot().eResource().setModified(true);
- artifactEdit.getCommandStack().execute(command);
- }
- }
-
- public void adapt(ServiceRef eObject) {
- if (eObject_ != null)
- eObject_.eAdapters().remove(this);
- eObject_ = eObject;
- if (eObject_ != null) {
- eObject_.eAdapters().add(this);
- if (eObject_.getServiceInterface() != null) {
- String newClassName = eObject_.getServiceInterface().getQualifiedNameForReflection();
- setText(newClassName);
- } else {
- setText(null);
- }
- } else
- setText(null);
- }
-
- /*
- * public void adapt(EObject eObject, EStructuralFeature feature) { feature_ = feature;
- * adapt(eObject); }
- */
- public void dispose() {
- if (eObject_ != null)
- eObject_.eAdapters().remove(this);
- if (text_ != null && !text_.isDisposed())
- text_.removeModifyListener(this);
- }
-
- protected boolean syncTextAndModel() {
- if (eObject_ != null) {
- String modelValue = null;
- if (eObject_.getServiceInterface() != null)
- modelValue = eObject_.getServiceInterface().getQualifiedNameForReflection();
- String textValue = text_.getText();
- if (modelValue == null || modelValue.length() <= 0)
- return !(textValue == null || textValue.length() <= 0);
- return !(modelValue.equals(textValue));
- }
- return false;
- }
-
- private void setText(String text) {
- if (!text_.isDisposed()) {
- String currText = text_.getText();
- if (text == null || text.length() <= 0) {
- if (currText != null && currText.length() > 0)
- text_.setText(""); //$NON-NLS-1$
- } else if (!text.equals(currText))
- text_.setText(text);
- }
- }
-}
diff --git a/plugins/org.eclipse.jst.j2ee.webservice/webservice/org/eclipse/jst/j2ee/internal/webservice/adapter/AdapterText.java b/plugins/org.eclipse.jst.j2ee.webservice/webservice/org/eclipse/jst/j2ee/internal/webservice/adapter/AdapterText.java
deleted file mode 100644
index 0779466..0000000
--- a/plugins/org.eclipse.jst.j2ee.webservice/webservice/org/eclipse/jst/j2ee/internal/webservice/adapter/AdapterText.java
+++ /dev/null
@@ -1,124 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2003, 2005 IBM Corporation and others.
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
- *
- * Contributors:
- * IBM Corporation - initial API and implementation
- *******************************************************************************/
-
-package org.eclipse.jst.j2ee.internal.webservice.adapter;
-
-import org.eclipse.emf.common.notify.Notification;
-import org.eclipse.emf.common.notify.impl.AdapterImpl;
-import org.eclipse.emf.ecore.EObject;
-import org.eclipse.emf.ecore.EStructuralFeature;
-import org.eclipse.jst.j2ee.internal.webservice.command.CommandModifyText;
-import org.eclipse.swt.events.ModifyEvent;
-import org.eclipse.swt.events.ModifyListener;
-import org.eclipse.swt.widgets.Text;
-import org.eclipse.wst.common.componentcore.ArtifactEdit;
-
-
-public class AdapterText extends AdapterImpl implements ModifyListener {
- protected EObject eObject_;
- protected EStructuralFeature feature_;
- protected Text text_;
- protected boolean nillable_;
- protected ArtifactEdit artifactEdit;
-
- public AdapterText(ArtifactEdit anArtifactEdit, EStructuralFeature feature, Text text, boolean nillable) {
- super();
- artifactEdit = anArtifactEdit;
- eObject_ = null;
- feature_ = feature;
- text_ = text;
- nillable_ = nillable;
- text_.addModifyListener(this);
- }
-
- public AdapterText(ArtifactEdit anArtifactEdit, EObject eObject, EStructuralFeature feature, Text text, boolean nillable) {
- this(anArtifactEdit, feature, text, nillable);
- adapt(eObject);
- }
-
- @Override
- public void notifyChanged(Notification msg) {
- int type = msg.getEventType();
- if ((type == Notification.SET || type == Notification.UNSET) && syncTextAndModel() && msg.getFeature() == feature_)
- setText(msg.getNewStringValue());
- }
-
- public void modifyText(ModifyEvent e) {
- if (syncTextAndModel()) {
- CommandModifyText command = new CommandModifyText(null, null, eObject_, feature_, text_.getText(), nillable_);
- if (artifactEdit != null) {
- artifactEdit.getContentModelRoot().eResource().setModified(true);
- artifactEdit.getCommandStack().execute(command);
- }
- }
- }
-
- public void adapt(EObject eObject) {
- if (eObject_ != null)
- eObject_.eAdapters().remove(this);
- eObject_ = eObject;
- if (eObject_ != null) {
- eObject_.eAdapters().add(this);
- setText((String) eObject_.eGet(feature_));
- } else
- setText(null);
- }
-
- public void adapt(EObject eObject, EStructuralFeature feature) {
- feature_ = feature;
- adapt(eObject);
- }
-
- public void dispose() {
- if (eObject_ != null)
- eObject_.eAdapters().remove(this);
- if (text_ != null && !text_.isDisposed())
- text_.removeModifyListener(this);
- }
-
- protected boolean syncTextAndModel() {
- if (eObject_ != null) {
- String modelValue = (String) eObject_.eGet(feature_);
- String textValue = text_.getText();
- if (modelValue == null || modelValue.length() <= 0)
- return !(textValue == null || textValue.length() <= 0);
- return !(modelValue.equals(textValue));
- }
- return false;
- }
-
- protected void setText(String text) {
- if (!text_.isDisposed()) {
- String currText = text_.getText();
- if (text == null || text.length() <= 0) {
- if (currText != null && currText.length() > 0)
- text_.setText(""); //$NON-NLS-1$
- } else if (!text.equals(currText))
- text_.setText(text);
- }
- }
-
- /**
- * @return Returns the j2eeEditModel.
- */
- public ArtifactEdit getArtifactEdit() {
- return artifactEdit;
- }
-
- /**
- * @param editModel
- * The j2eeEditModel to set.
- */
- public void setArtifactEdit(ArtifactEdit anArtifactEdit) {
- artifactEdit = anArtifactEdit;
- }
-
-}
diff --git a/plugins/org.eclipse.jst.j2ee.webservice/webservice/org/eclipse/jst/j2ee/internal/webservice/adapter/AdapterTextCCombo.java b/plugins/org.eclipse.jst.j2ee.webservice/webservice/org/eclipse/jst/j2ee/internal/webservice/adapter/AdapterTextCCombo.java
deleted file mode 100644
index ac8b4bc..0000000
--- a/plugins/org.eclipse.jst.j2ee.webservice/webservice/org/eclipse/jst/j2ee/internal/webservice/adapter/AdapterTextCCombo.java
+++ /dev/null
@@ -1,106 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2003, 2005 IBM Corporation and others.
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
- *
- * Contributors:
- * IBM Corporation - initial API and implementation
- *******************************************************************************/
-
-package org.eclipse.jst.j2ee.internal.webservice.adapter;
-
-import org.eclipse.emf.common.notify.Notification;
-import org.eclipse.emf.common.notify.impl.AdapterImpl;
-import org.eclipse.emf.ecore.EObject;
-import org.eclipse.emf.ecore.EStructuralFeature;
-import org.eclipse.jst.j2ee.internal.webservice.command.CommandModifyText;
-import org.eclipse.swt.custom.CCombo;
-import org.eclipse.swt.events.ModifyEvent;
-import org.eclipse.swt.events.ModifyListener;
-import org.eclipse.wst.common.componentcore.ArtifactEdit;
-
-
-public class AdapterTextCCombo extends AdapterImpl implements ModifyListener {
- private ArtifactEdit artifactEdit_;
- private EObject eObject_;
- private EStructuralFeature feature_;
- private CCombo text_;
- private boolean nillable_;
-
- public AdapterTextCCombo(ArtifactEdit artifactEdit, EStructuralFeature feature, CCombo text, boolean nillable) {
- super();
- artifactEdit_ = artifactEdit;
- eObject_ = null;
- feature_ = feature;
- text_ = text;
- nillable_ = nillable;
- text_.addModifyListener(this);
- }
-
- public AdapterTextCCombo(ArtifactEdit artifactEdit, EObject eObject, EStructuralFeature feature, CCombo text, boolean nillable) {
- this(artifactEdit, feature, text, nillable);
- adapt(eObject);
- }
-
- @Override
- public void notifyChanged(Notification msg) {
- int type = msg.getEventType();
- if ((type == Notification.SET || type == Notification.UNSET) && syncTextAndModel() && msg.getFeature() == feature_)
- setText(msg.getNewStringValue());
- }
-
- public void modifyText(ModifyEvent e) {
- if (syncTextAndModel()) {
- CommandModifyText command = new CommandModifyText(null, null, eObject_, feature_, text_.getText(), nillable_);
- artifactEdit_.getContentModelRoot().eResource().setModified(true);
- artifactEdit_.getCommandStack().execute(command);
- }
- }
-
- public void adapt(EObject eObject) {
- if (eObject_ != null)
- eObject_.eAdapters().remove(this);
- eObject_ = eObject;
- if (eObject_ != null) {
- eObject_.eAdapters().add(this);
- setText((String) eObject_.eGet(feature_));
- } else
- setText(null);
- }
-
- public void adapt(EObject eObject, EStructuralFeature feature) {
- feature_ = feature;
- adapt(eObject);
- }
-
- public void dispose() {
- if (eObject_ != null)
- eObject_.eAdapters().remove(this);
- if (text_ != null && !text_.isDisposed())
- text_.removeModifyListener(this);
- }
-
- private boolean syncTextAndModel() {
- if (eObject_ != null) {
- String modelValue = (String) eObject_.eGet(feature_);
- String textValue = text_.getText();
- if (modelValue == null || modelValue.length() <= 0)
- return !(textValue == null || textValue.length() <= 0);
- return !(modelValue.equals(textValue));
- }
- return false;
- }
-
- private void setText(String text) {
- if (!text_.isDisposed()) {
- String currText = text_.getText();
- if (text == null || text.length() <= 0) {
- if (currText != null && currText.length() > 0)
- text_.setText(""); //$NON-NLS-1$
- } else if (!text.equals(currText))
- text_.setText(text);
- }
- }
-}
diff --git a/plugins/org.eclipse.jst.j2ee.webservice/webservice/org/eclipse/jst/j2ee/internal/webservice/adapter/AdapterViewer.java b/plugins/org.eclipse.jst.j2ee.webservice/webservice/org/eclipse/jst/j2ee/internal/webservice/adapter/AdapterViewer.java
deleted file mode 100644
index 66967ad..0000000
--- a/plugins/org.eclipse.jst.j2ee.webservice/webservice/org/eclipse/jst/j2ee/internal/webservice/adapter/AdapterViewer.java
+++ /dev/null
@@ -1,148 +0,0 @@
-/***************************************************************************************************
- * Copyright (c) 2003, 2004 IBM Corporation and others. All rights reserved. This program and the
- * accompanying materials are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
- *
- * Contributors: IBM Corporation - initial API and implementation
- **************************************************************************************************/
-
-package org.eclipse.jst.j2ee.internal.webservice.adapter;
-
-import java.util.ArrayList;
-
-import org.eclipse.emf.common.notify.Notification;
-import org.eclipse.emf.common.notify.impl.AdapterImpl;
-import org.eclipse.emf.common.util.EList;
-import org.eclipse.emf.ecore.EObject;
-import org.eclipse.emf.ecore.EStructuralFeature;
-import org.eclipse.jface.viewers.Viewer;
-
-public class AdapterViewer extends AdapterImpl {
- private EObject eObject_;
- private Viewer viewer_;
- private ArrayList features_;
-
- public AdapterViewer(Viewer viewer) {
- super();
- eObject_ = null;
- viewer_ = viewer;
- features_ = new ArrayList();
- }
-
- public AdapterViewer(EObject eObject, Viewer viewer) {
- this(viewer);
- adapt(eObject);
- }
-
- @Override
- public void notifyChanged(Notification msg) {
- int type = msg.getEventType();
- if (type == Notification.SET || type == Notification.UNSET || type == Notification.ADD || type == Notification.REMOVE || type == Notification.ADD_MANY || type == Notification.REMOVE_MANY) {
- Object notifier = msg.getNotifier();
- if (notifier == eObject_) {
- if (type == Notification.SET || type == Notification.ADD || type == Notification.ADD_MANY)
- internalAdaptFeature((EStructuralFeature) msg.getFeature());
- else if (type == Notification.UNSET || type == Notification.REMOVE || type == Notification.REMOVE_MANY) {
- Object object = msg.getOldValue();
- if (object instanceof EObject)
- ((EObject) object).eAdapters().remove(this);
- else if (object instanceof EList) {
- EList eList = (EList) object;
- for (int i = 0; i < eList.size(); i++) {
- Object item = eList.get(i);
- if (item instanceof EObject)
- ((EObject) item).eAdapters().remove(this);
- }
- }
- }
- }
- viewer_.refresh();
- }
- }
-
- public void adapt(EObject eObject) {
- if (eObject_ != null) {
- eObject_.eAdapters().remove(this);
- unadaptAllCachedFeature();
- }
- eObject_ = eObject;
- if (eObject_ != null) {
- eObject_.eAdapters().add(this);
- readaptAllCachedFeature();
- }
- viewer_.refresh();
- }
-
- public void adaptFeature(EStructuralFeature feature) {
- if (!features_.contains(feature)) {
- features_.add(feature);
- internalAdaptFeature(feature);
- }
- }
-
- private void internalAdaptFeature(EStructuralFeature feature) {
- if (eObject_ != null) {
- Object featureObject = eObject_.eGet(feature);
- if (featureObject instanceof EObject) {
- EList eAdapters = ((EObject) featureObject).eAdapters();
- if (!eAdapters.contains(this))
- eAdapters.add(this);
- } else if (featureObject instanceof EList) {
- EList eList = (EList) featureObject;
- for (int i = 0; i < eList.size(); i++) {
- Object object = eList.get(i);
- if (object instanceof EObject) {
- EList eAdapters = ((EObject) object).eAdapters();
- if (!eAdapters.contains(this))
- eAdapters.add(this);
- }
- }
- }
- }
- }
-
- private void readaptAllCachedFeature() {
- EStructuralFeature[] features = new EStructuralFeature[features_.size()];
- for (int i = 0; i < features.length; i++)
- features[i] = (EStructuralFeature) features_.get(i);
- for (int i = 0; i < features.length; i++)
- internalAdaptFeature(features[i]);
- }
-
- public void unadaptFeature(EStructuralFeature feature) {
- features_.remove(feature);
- internalUnadaptFeature(feature);
- }
-
- private void internalUnadaptFeature(EStructuralFeature feature) {
- if (eObject_ != null) {
- Object featureObject = eObject_.eGet(feature);
- if (featureObject instanceof EObject)
- ((EObject) featureObject).eAdapters().remove(this);
- else if (featureObject instanceof EList) {
- EList eList = (EList) featureObject;
- for (int i = 0; i < eList.size(); i++) {
- Object object = eList.get(i);
- if (object instanceof EObject)
- ((EObject) object).eAdapters().remove(this);
- }
- }
- }
- }
-
- private void unadaptAllCachedFeature() {
- EStructuralFeature[] features = new EStructuralFeature[features_.size()];
- for (int i = 0; i < features.length; i++)
- features[i] = (EStructuralFeature) features_.get(i);
- for (int i = 0; i < features.length; i++)
- internalUnadaptFeature(features[i]);
- }
-
- public void dispose() {
- if (eObject_ != null)
- eObject_.eAdapters().remove(this);
- unadaptAllCachedFeature();
- features_ = null;
- }
-}
\ No newline at end of file
diff --git a/plugins/org.eclipse.jst.j2ee.webservice/webservice/org/eclipse/jst/j2ee/internal/webservice/adapter/AdapterViewerItem.java b/plugins/org.eclipse.jst.j2ee.webservice/webservice/org/eclipse/jst/j2ee/internal/webservice/adapter/AdapterViewerItem.java
deleted file mode 100644
index cdba309..0000000
--- a/plugins/org.eclipse.jst.j2ee.webservice/webservice/org/eclipse/jst/j2ee/internal/webservice/adapter/AdapterViewerItem.java
+++ /dev/null
@@ -1,39 +0,0 @@
-/***************************************************************************************************
- * Copyright (c) 2003, 2004 IBM Corporation and others. All rights reserved. This program and the
- * accompanying materials are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
- *
- * Contributors: IBM Corporation - initial API and implementation
- **************************************************************************************************/
-
-package org.eclipse.jst.j2ee.internal.webservice.adapter;
-
-import org.eclipse.emf.common.util.BasicEList;
-import org.eclipse.emf.common.util.EList;
-import org.eclipse.emf.ecore.EObject;
-import org.eclipse.emf.ecore.EStructuralFeature;
-
-public class AdapterViewerItem {
- private EList eObjects_;
- private EStructuralFeature feature_;
-
- public AdapterViewerItem(EList eObjects, EStructuralFeature feature) {
- eObjects_ = eObjects;
- feature_ = feature;
- }
-
- public AdapterViewerItem(EObject eObject, EStructuralFeature feature) {
- eObjects_ = new BasicEList();
- eObjects_.add(eObject);
- feature_ = feature;
- }
-
- public EList getEObjectList() {
- return eObjects_;
- }
-
- public EStructuralFeature getEStructuralFeature() {
- return feature_;
- }
-}
\ No newline at end of file
diff --git a/plugins/org.eclipse.jst.j2ee.webservice/webservice/org/eclipse/jst/j2ee/internal/webservice/command/CommandAddClientHandler.java b/plugins/org.eclipse.jst.j2ee.webservice/webservice/org/eclipse/jst/j2ee/internal/webservice/command/CommandAddClientHandler.java
deleted file mode 100644
index 7b5c538..0000000
--- a/plugins/org.eclipse.jst.j2ee.webservice/webservice/org/eclipse/jst/j2ee/internal/webservice/command/CommandAddClientHandler.java
+++ /dev/null
@@ -1,201 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2003, 2005 IBM Corporation and others.
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
- *
- * Contributors:
- * IBM Corporation - initial API and implementation
- *******************************************************************************/
-
-package org.eclipse.jst.j2ee.internal.webservice.command;
-
-import java.util.Collection;
-
-import org.eclipse.emf.common.command.AbstractCommand;
-import org.eclipse.emf.common.command.Command;
-import org.eclipse.jem.java.JavaClass;
-import org.eclipse.jem.java.JavaRefFactory;
-import org.eclipse.jst.j2ee.webservice.wsclient.Handler;
-import org.eclipse.jst.j2ee.webservice.wsclient.ServiceRef;
-import org.eclipse.jst.j2ee.webservice.wsclient.Webservice_clientFactory;
-import org.eclipse.jst.j2ee.webservice.wsclient.Webservice_clientPackage;
-
-
-public class CommandAddClientHandler extends AbstractCommand {
- private ServiceRef parent_;
- private Handler newChild_;
-
- //private boolean oldChildSet_;
-
- public CommandAddClientHandler(String label, String description, ServiceRef parent, Handler newChild) {
- super(label, description);
- parent_ = parent;
- newChild_ = newChild;
- }
-
- public CommandAddClientHandler(String label, String description, ServiceRef parent, String handlerName, JavaClass handlerClass) {
- super(label, description);
- parent_ = parent;
- newChild_ = createNewHandler(handlerName, handlerClass);
- }
-
- public CommandAddClientHandler(String label, String description, ServiceRef parent, String handlerName, String handlerClassName) {
- super(label, description);
- parent_ = parent;
- JavaClass handlerClass = JavaRefFactory.eINSTANCE.createClassRef(handlerClassName);
- newChild_ = createNewHandler(handlerName, handlerClass);
- }
-
- private Handler createNewHandler(String handlerName, JavaClass handlerClass) {
- Webservice_clientFactory factory = Webservice_clientPackage.eINSTANCE.getWebservice_clientFactory();
- Handler newChild = factory.createHandler();
- newChild.setHandlerName(handlerName);
- newChild.setHandlerClass(handlerClass);
- return newChild;
- }
-
- /**
- * Called at most once in {@link #canExecute}to give the command an opportunity to ready itself
- * for execution. The returned value is stored in {@link #canExecute}. In other words, you can
- * override this method to initialize and to yield a cached value for the all subsequent calls
- * to canExecute.
- *
- * @return whether the command is executable.
- */
- @Override
- protected boolean prepare() {
- return true;
- }
-
- /**
- * Returns whether the comamad is valid to <code>execute</code>. The
- * {@link UnexecutableCommand#INSTANCE}.<code>canExecute()</code> always returns
- * <code>false</code>. This <b>must </b> be called before calling <code>execute</code>.
- *
- * @return whether the comamad is valid to <code>execute</code>.
- */
- @Override
- public boolean canExecute() {
- return super.canExecute();
- }
-
- /**
- * Performs the command activity required for the effect. The effect of calling
- * <code>execute</code> when <code>canExecute</code> returns <code>false</code>, or when
- * <code>canExecute</code> hasn't been called, is undefined.
- */
- public void execute() {
- parent_.getHandlers().add(newChild_);
- }
-
- /**
- * Returns <code>true</code> because most command should be undoable.
- *
- * @return <code>true</code>.
- */
- @Override
- public boolean canUndo() {
- return true;
- }
-
- /**
- * Performs the command activity required to <code>undo</code> the effects of a preceding
- * <code>execute</code> (or <code>redo</code>). The effect, if any, of calling
- * <code>undo</code> before <code>execute</code> or <code>redo</code> have been called, or
- * when canUndo returns <code>false</code>, is undefined.
- */
- @Override
- public void undo() {
- parent_.getHandlers().remove(newChild_);
- }
-
- /**
- * Performs the command activity required to <code>redo</code> the effect after undoing the
- * effect. The effect, if any, of calling <code>redo</code> before <code>undo</code> is
- * called is undefined. Note that if you implement <code>redo</code> to call
- * <code>execute</code> then any derived class will be restricted by that decision also.
- */
- public void redo() {
- execute();
- }
-
- /**
- * Returns a collection of things which this command wishes to present as it's result. The
- * result of calling this before an <code>execute</code> or <code>redo</code>, or after an
- * <code>undo</code>, is undefined.
- *
- * @return a collection of things which this command wishes to present as it's result.
- */
- @Override
- public Collection getResult() {
- return super.getResult();
- }
-
- /**
- * Returns the collection of things which this command wishes to present as the objects affected
- * by the command. Typically should could be used as the selection that should be highlighted to
- * best illustrate the effect of the command. The result of calling this before an
- * <code>execute</code>,<code>redo</code>, or <code>undo</code> is undefined. The
- * result may be different after an <code>undo</code> than it is after an <code>execute</code>
- * or <code>redo</code>, but the result should be the same (equivalent) after either an
- * <code>execute</code> or <code>redo</code>.
- *
- * @return the collection of things which this command wishes to present as the objects affected
- * by the command.
- */
- @Override
- public Collection getAffectedObjects() {
- return super.getAffectedObjects();
- }
-
- /**
- * Called to indicate that the command will never be used again. Calling any other method after
- * this one has undefined results.
- */
- @Override
- public void dispose() {
- //Do nothing
- }
-
- /**
- * Returns a command that represents the composition of this command with the given command. The
- * resulting command may just be this, if this command is capabable of composition. Otherwise,
- * it will be a new command created to compose the two.
- * <p>
- * Instead of the following pattern of usage
- *
- * <pre>
- * Command result = x;
- * if (condition)
- * result = result.chain(y);
- * </pre>
- *
- * you should consider using a {@link org.eclipse.emf.common.command.CompoundCommand}and using
- * {@link org.eclipse.emf.common.command.CompoundCommand#unwrap()}to optimize the result:
- *
- * <pre>
- * CompoundCommand subcommands = new CompoundCommand();
- * subcommands.append(x);
- * if (condition)
- * subcommands.append(y);
- * Command result = subcommands.unwrap();
- * </pre>
- *
- * This gives you more control over how the compound command composes it's result and affected
- * objects.
- *
- * @param command
- * the command to chain.
- * @return a command that represents the composition of this command with the given command.
- */
- @Override
- public Command chain(Command command) {
- return super.chain(command);
- }
-
- public Object getAddedObject() {
- return newChild_;
- }
-}
diff --git a/plugins/org.eclipse.jst.j2ee.webservice/webservice/org/eclipse/jst/j2ee/internal/webservice/command/CommandAddElement.java b/plugins/org.eclipse.jst.j2ee.webservice/webservice/org/eclipse/jst/j2ee/internal/webservice/command/CommandAddElement.java
deleted file mode 100644
index f4d23c0..0000000
--- a/plugins/org.eclipse.jst.j2ee.webservice/webservice/org/eclipse/jst/j2ee/internal/webservice/command/CommandAddElement.java
+++ /dev/null
@@ -1,215 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2003, 2005 IBM Corporation and others.
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
- *
- * Contributors:
- * IBM Corporation - initial API and implementation
- *******************************************************************************/
-
-package org.eclipse.jst.j2ee.internal.webservice.command;
-
-import java.util.Collection;
-
-import org.eclipse.emf.common.command.AbstractCommand;
-import org.eclipse.emf.common.command.Command;
-import org.eclipse.emf.common.util.EList;
-import org.eclipse.emf.ecore.EClass;
-import org.eclipse.emf.ecore.EFactory;
-import org.eclipse.emf.ecore.EObject;
-import org.eclipse.emf.ecore.EStructuralFeature;
-
-public class CommandAddElement extends AbstractCommand {
- private EObject parent_;
- private EStructuralFeature childFeature_;
- private Object newChild_;
- private Object oldChild_;
- private boolean oldChildSet_;
-
- public CommandAddElement(String label, String description, EObject parent, EStructuralFeature childFeature, Object newChild) {
- super(label, description);
- parent_ = parent;
- childFeature_ = childFeature;
- newChild_ = newChild;
- oldChild_ = null;
- oldChildSet_ = true;
- }
-
- public CommandAddElement(String label, String description, EObject parent, EClass childEClass, EStructuralFeature childFeature, EStructuralFeature[] childProperties, Object[] propertyValues) {
- super(label, description);
- parent_ = parent;
- childFeature_ = childFeature;
- newChild_ = createNewChild(childEClass, (childProperties != null) ? childProperties : new EStructuralFeature[0], (propertyValues != null) ? propertyValues : new Object[0]);
- oldChild_ = null;
- oldChildSet_ = true;
- }
-
- private Object createNewChild(EClass childEClass, EStructuralFeature[] childProperties, Object[] propertyValues) {
- EFactory eFactory = childEClass.getEPackage().getEFactoryInstance();
- EObject newChild = eFactory.create(childEClass);
- if (newChild != null)
- for (int i = 0; i < childProperties.length; i++)
- newChild.eSet(childProperties[i], propertyValues[i]);
- return newChild;
- }
-
- /**
- * Called at most once in {@link #canExecute}to give the command an opportunity to ready itself
- * for execution. The returned value is stored in {@link #canExecute}. In other words, you can
- * override this method to initialize and to yield a cached value for the all subsequent calls
- * to canExecute.
- *
- * @return whether the command is executable.
- */
- @Override
- protected boolean prepare() {
- return true;
- }
-
- /**
- * Returns whether the comamad is valid to <code>execute</code>. The
- * {@link UnexecutableCommand#INSTANCE}.<code>canExecute()</code> always returns
- * <code>false</code>. This <b>must </b> be called before calling <code>execute</code>.
- *
- * @return whether the comamad is valid to <code>execute</code>.
- */
- @Override
- public boolean canExecute() {
- return super.canExecute();
- }
-
- /**
- * Performs the command activity required for the effect. The effect of calling
- * <code>execute</code> when <code>canExecute</code> returns <code>false</code>, or when
- * <code>canExecute</code> hasn't been called, is undefined.
- */
- public void execute() {
- if (childFeature_.isMany()) {
- if (newChild_ != null)
- ((EList) parent_.eGet(childFeature_)).add(newChild_);
- } else {
- oldChild_ = parent_.eGet(childFeature_);
- oldChildSet_ = parent_.eIsSet(childFeature_);
- parent_.eSet(childFeature_, newChild_);
- }
- }
-
- /**
- * Returns <code>true</code> because most command should be undoable.
- *
- * @return <code>true</code>.
- */
- @Override
- public boolean canUndo() {
- return true;
- }
-
- /**
- * Performs the command activity required to <code>undo</code> the effects of a preceding
- * <code>execute</code> (or <code>redo</code>). The effect, if any, of calling
- * <code>undo</code> before <code>execute</code> or <code>redo</code> have been called, or
- * when canUndo returns <code>false</code>, is undefined.
- */
- @Override
- public void undo() {
- if (childFeature_.isMany()) {
- if (newChild_ != null)
- ((EList) parent_.eGet(childFeature_)).remove(newChild_);
- } else {
- if (oldChildSet_)
- parent_.eSet(childFeature_, oldChild_);
- else
- parent_.eUnset(childFeature_);
- }
- }
-
- /**
- * Performs the command activity required to <code>redo</code> the effect after undoing the
- * effect. The effect, if any, of calling <code>redo</code> before <code>undo</code> is
- * called is undefined. Note that if you implement <code>redo</code> to call
- * <code>execute</code> then any derived class will be restricted by that decision also.
- */
- public void redo() {
- execute();
- }
-
- /**
- * Returns a collection of things which this command wishes to present as it's result. The
- * result of calling this before an <code>execute</code> or <code>redo</code>, or after an
- * <code>undo</code>, is undefined.
- *
- * @return a collection of things which this command wishes to present as it's result.
- */
- @Override
- public Collection getResult() {
- return super.getResult();
- }
-
- /**
- * Returns the collection of things which this command wishes to present as the objects affected
- * by the command. Typically should could be used as the selection that should be highlighted to
- * best illustrate the effect of the command. The result of calling this before an
- * <code>execute</code>,<code>redo</code>, or <code>undo</code> is undefined. The
- * result may be different after an <code>undo</code> than it is after an <code>execute</code>
- * or <code>redo</code>, but the result should be the same (equivalent) after either an
- * <code>execute</code> or <code>redo</code>.
- *
- * @return the collection of things which this command wishes to present as the objects affected
- * by the command.
- */
- @Override
- public Collection getAffectedObjects() {
- return super.getAffectedObjects();
- }
-
- /**
- * Called to indicate that the command will never be used again. Calling any other method after
- * this one has undefined results.
- */
- @Override
- public void dispose() {
- //Do nothing
- }
-
- /**
- * Returns a command that represents the composition of this command with the given command. The
- * resulting command may just be this, if this command is capabable of composition. Otherwise,
- * it will be a new command created to compose the two.
- * <p>
- * Instead of the following pattern of usage
- *
- * <pre>
- * Command result = x;
- * if (condition)
- * result = result.chain(y);
- * </pre>
- *
- * you should consider using a {@link org.eclipse.emf.common.command.CompoundCommand}and using
- * {@link org.eclipse.emf.common.command.CompoundCommand#unwrap()}to optimize the result:
- *
- * <pre>
- * CompoundCommand subcommands = new CompoundCommand();
- * subcommands.append(x);
- * if (condition)
- * subcommands.append(y);
- * Command result = subcommands.unwrap();
- * </pre>
- *
- * This gives you more control over how the compound command composes it's result and affected
- * objects.
- *
- * @param command
- * the command to chain.
- * @return a command that represents the composition of this command with the given command.
- */
- @Override
- public Command chain(Command command) {
- return super.chain(command);
- }
-
- public Object getAddedObject() {
- return newChild_;
- }
-}
diff --git a/plugins/org.eclipse.jst.j2ee.webservice/webservice/org/eclipse/jst/j2ee/internal/webservice/command/CommandAddPortComponentRef.java b/plugins/org.eclipse.jst.j2ee.webservice/webservice/org/eclipse/jst/j2ee/internal/webservice/command/CommandAddPortComponentRef.java
deleted file mode 100644
index f443c24..0000000
--- a/plugins/org.eclipse.jst.j2ee.webservice/webservice/org/eclipse/jst/j2ee/internal/webservice/command/CommandAddPortComponentRef.java
+++ /dev/null
@@ -1,201 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2003, 2005 IBM Corporation and others.
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
- *
- * Contributors:
- * IBM Corporation - initial API and implementation
- *******************************************************************************/
-
-package org.eclipse.jst.j2ee.internal.webservice.command;
-
-import java.util.Collection;
-
-import org.eclipse.emf.common.command.AbstractCommand;
-import org.eclipse.emf.common.command.Command;
-import org.eclipse.jem.java.JavaClass;
-import org.eclipse.jem.java.JavaRefFactory;
-import org.eclipse.jst.j2ee.webservice.wsclient.PortComponentRef;
-import org.eclipse.jst.j2ee.webservice.wsclient.ServiceRef;
-import org.eclipse.jst.j2ee.webservice.wsclient.Webservice_clientFactory;
-import org.eclipse.jst.j2ee.webservice.wsclient.Webservice_clientPackage;
-
-
-public class CommandAddPortComponentRef extends AbstractCommand {
- private ServiceRef parent_;
- private PortComponentRef newChild_;
-
- //private boolean oldChildSet_;
-
- public CommandAddPortComponentRef(String label, String description, ServiceRef parent, PortComponentRef newChild) {
- super(label, description);
- parent_ = parent;
- newChild_ = newChild;
- }
-
- public CommandAddPortComponentRef(String label, String description, ServiceRef parent, String portComponentLink, JavaClass serviceEndpointInterface) {
- super(label, description);
- parent_ = parent;
- newChild_ = createNewPortComponentRef(portComponentLink, serviceEndpointInterface);
- }
-
- public CommandAddPortComponentRef(String label, String description, ServiceRef parent, String portComponentLink, String seiName) {
- super(label, description);
- parent_ = parent;
- JavaClass seiClass = JavaRefFactory.eINSTANCE.createClassRef(seiName);
- newChild_ = createNewPortComponentRef(portComponentLink, seiClass);
- }
-
- private PortComponentRef createNewPortComponentRef(String portComponentLink, JavaClass serviceEndpointInterface) {
- Webservice_clientFactory factory = Webservice_clientPackage.eINSTANCE.getWebservice_clientFactory();
- PortComponentRef newChild = factory.createPortComponentRef();
- newChild.setPortComponentLink(portComponentLink);
- newChild.setServiceEndpointInterface(serviceEndpointInterface);
- return newChild;
- }
-
- /**
- * Called at most once in {@link #canExecute}to give the command an opportunity to ready itself
- * for execution. The returned value is stored in {@link #canExecute}. In other words, you can
- * override this method to initialize and to yield a cached value for the all subsequent calls
- * to canExecute.
- *
- * @return whether the command is executable.
- */
- @Override
- protected boolean prepare() {
- return true;
- }
-
- /**
- * Returns whether the comamad is valid to <code>execute</code>. The
- * {@link UnexecutableCommand#INSTANCE}.<code>canExecute()</code> always returns
- * <code>false</code>. This <b>must </b> be called before calling <code>execute</code>.
- *
- * @return whether the comamad is valid to <code>execute</code>.
- */
- @Override
- public boolean canExecute() {
- return super.canExecute();
- }
-
- /**
- * Performs the command activity required for the effect. The effect of calling
- * <code>execute</code> when <code>canExecute</code> returns <code>false</code>, or when
- * <code>canExecute</code> hasn't been called, is undefined.
- */
- public void execute() {
- parent_.getPortComponentRefs().add(newChild_);
- }
-
- /**
- * Returns <code>true</code> because most command should be undoable.
- *
- * @return <code>true</code>.
- */
- @Override
- public boolean canUndo() {
- return true;
- }
-
- /**
- * Performs the command activity required to <code>undo</code> the effects of a preceding
- * <code>execute</code> (or <code>redo</code>). The effect, if any, of calling
- * <code>undo</code> before <code>execute</code> or <code>redo</code> have been called, or
- * when canUndo returns <code>false</code>, is undefined.
- */
- @Override
- public void undo() {
- parent_.getPortComponentRefs().remove(newChild_);
- }
-
- /**
- * Performs the command activity required to <code>redo</code> the effect after undoing the
- * effect. The effect, if any, of calling <code>redo</code> before <code>undo</code> is
- * called is undefined. Note that if you implement <code>redo</code> to call
- * <code>execute</code> then any derived class will be restricted by that decision also.
- */
- public void redo() {
- execute();
- }
-
- /**
- * Returns a collection of things which this command wishes to present as it's result. The
- * result of calling this before an <code>execute</code> or <code>redo</code>, or after an
- * <code>undo</code>, is undefined.
- *
- * @return a collection of things which this command wishes to present as it's result.
- */
- @Override
- public Collection getResult() {
- return super.getResult();
- }
-
- /**
- * Returns the collection of things which this command wishes to present as the objects affected
- * by the command. Typically should could be used as the selection that should be highlighted to
- * best illustrate the effect of the command. The result of calling this before an
- * <code>execute</code>,<code>redo</code>, or <code>undo</code> is undefined. The
- * result may be different after an <code>undo</code> than it is after an <code>execute</code>
- * or <code>redo</code>, but the result should be the same (equivalent) after either an
- * <code>execute</code> or <code>redo</code>.
- *
- * @return the collection of things which this command wishes to present as the objects affected
- * by the command.
- */
- @Override
- public Collection getAffectedObjects() {
- return super.getAffectedObjects();
- }
-
- /**
- * Called to indicate that the command will never be used again. Calling any other method after
- * this one has undefined results.
- */
- @Override
- public void dispose() {
- //Do nothing
- }
-
- /**
- * Returns a command that represents the composition of this command with the given command. The
- * resulting command may just be this, if this command is capabable of composition. Otherwise,
- * it will be a new command created to compose the two.
- * <p>
- * Instead of the following pattern of usage
- *
- * <pre>
- * Command result = x;
- * if (condition)
- * result = result.chain(y);
- * </pre>
- *
- * you should consider using a {@link org.eclipse.emf.common.command.CompoundCommand}and using
- * {@link org.eclipse.emf.common.command.CompoundCommand#unwrap()}to optimize the result:
- *
- * <pre>
- * CompoundCommand subcommands = new CompoundCommand();
- * subcommands.append(x);
- * if (condition)
- * subcommands.append(y);
- * Command result = subcommands.unwrap();
- * </pre>
- *
- * This gives you more control over how the compound command composes it's result and affected
- * objects.
- *
- * @param command
- * the command to chain.
- * @return a command that represents the composition of this command with the given command.
- */
- @Override
- public Command chain(Command command) {
- return super.chain(command);
- }
-
- public Object getAddedObject() {
- return newChild_;
- }
-}
diff --git a/plugins/org.eclipse.jst.j2ee.webservice/webservice/org/eclipse/jst/j2ee/internal/webservice/command/CommandAddServiceRef.java b/plugins/org.eclipse.jst.j2ee.webservice/webservice/org/eclipse/jst/j2ee/internal/webservice/command/CommandAddServiceRef.java
deleted file mode 100644
index 6738352..0000000
--- a/plugins/org.eclipse.jst.j2ee.webservice/webservice/org/eclipse/jst/j2ee/internal/webservice/command/CommandAddServiceRef.java
+++ /dev/null
@@ -1,193 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2003, 2005 IBM Corporation and others.
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
- *
- * Contributors:
- * IBM Corporation - initial API and implementation
- *******************************************************************************/
-
-package org.eclipse.jst.j2ee.internal.webservice.command;
-
-import java.util.Collection;
-
-import org.eclipse.emf.common.command.AbstractCommand;
-import org.eclipse.emf.common.command.Command;
-import org.eclipse.jem.java.JavaClass;
-import org.eclipse.jst.j2ee.webservice.wsclient.ServiceRef;
-import org.eclipse.jst.j2ee.webservice.wsclient.WebServicesClient;
-import org.eclipse.jst.j2ee.webservice.wsclient.Webservice_clientFactory;
-import org.eclipse.jst.j2ee.webservice.wsclient.Webservice_clientPackage;
-
-
-public class CommandAddServiceRef extends AbstractCommand {
- private WebServicesClient parent_;
- private ServiceRef newChild_;
-
- //private boolean oldChildSet_;
-
- public CommandAddServiceRef(String label, String description, WebServicesClient parent, ServiceRef newChild) {
- super(label, description);
- parent_ = parent;
- newChild_ = newChild;
- }
-
- public CommandAddServiceRef(String label, String description, WebServicesClient parent, String serviceRefName, JavaClass serviceInterface) {
- super(label, description);
- parent_ = parent;
- newChild_ = createNewServiceRef(serviceRefName, serviceInterface);
- }
-
- private ServiceRef createNewServiceRef(String serviceRefName, JavaClass serviceInterface) {
- Webservice_clientFactory factory = Webservice_clientPackage.eINSTANCE.getWebservice_clientFactory();
- ServiceRef newChild = factory.createServiceRef();
- newChild.setServiceRefName(serviceRefName);
- newChild.setServiceInterface(serviceInterface);
- return newChild;
- }
-
- /**
- * Called at most once in {@link #canExecute}to give the command an opportunity to ready itself
- * for execution. The returned value is stored in {@link #canExecute}. In other words, you can
- * override this method to initialize and to yield a cached value for the all subsequent calls
- * to canExecute.
- *
- * @return whether the command is executable.
- */
- @Override
- protected boolean prepare() {
- return true;
- }
-
- /**
- * Returns whether the comamad is valid to <code>execute</code>. The
- * {@link UnexecutableCommand#INSTANCE}.<code>canExecute()</code> always returns
- * <code>false</code>. This <b>must </b> be called before calling <code>execute</code>.
- *
- * @return whether the comamad is valid to <code>execute</code>.
- */
- @Override
- public boolean canExecute() {
- return super.canExecute();
- }
-
- /**
- * Performs the command activity required for the effect. The effect of calling
- * <code>execute</code> when <code>canExecute</code> returns <code>false</code>, or when
- * <code>canExecute</code> hasn't been called, is undefined.
- */
- public void execute() {
- parent_.getServiceRefs().add(newChild_);
- }
-
- /**
- * Returns <code>true</code> because most command should be undoable.
- *
- * @return <code>true</code>.
- */
- @Override
- public boolean canUndo() {
- return true;
- }
-
- /**
- * Performs the command activity required to <code>undo</code> the effects of a preceding
- * <code>execute</code> (or <code>redo</code>). The effect, if any, of calling
- * <code>undo</code> before <code>execute</code> or <code>redo</code> have been called, or
- * when canUndo returns <code>false</code>, is undefined.
- */
- @Override
- public void undo() {
- parent_.getServiceRefs().remove(newChild_);
- }
-
- /**
- * Performs the command activity required to <code>redo</code> the effect after undoing the
- * effect. The effect, if any, of calling <code>redo</code> before <code>undo</code> is
- * called is undefined. Note that if you implement <code>redo</code> to call
- * <code>execute</code> then any derived class will be restricted by that decision also.
- */
- public void redo() {
- execute();
- }
-
- /**
- * Returns a collection of things which this command wishes to present as it's result. The
- * result of calling this before an <code>execute</code> or <code>redo</code>, or after an
- * <code>undo</code>, is undefined.
- *
- * @return a collection of things which this command wishes to present as it's result.
- */
- @Override
- public Collection getResult() {
- return super.getResult();
- }
-
- /**
- * Returns the collection of things which this command wishes to present as the objects affected
- * by the command. Typically should could be used as the selection that should be highlighted to
- * best illustrate the effect of the command. The result of calling this before an
- * <code>execute</code>,<code>redo</code>, or <code>undo</code> is undefined. The
- * result may be different after an <code>undo</code> than it is after an <code>execute</code>
- * or <code>redo</code>, but the result should be the same (equivalent) after either an
- * <code>execute</code> or <code>redo</code>.
- *
- * @return the collection of things which this command wishes to present as the objects affected
- * by the command.
- */
- @Override
- public Collection getAffectedObjects() {
- return super.getAffectedObjects();
- }
-
- /**
- * Called to indicate that the command will never be used again. Calling any other method after
- * this one has undefined results.
- */
- @Override
- public void dispose() {
- //Do nothing
- }
-
- /**
- * Returns a command that represents the composition of this command with the given command. The
- * resulting command may just be this, if this command is capabable of composition. Otherwise,
- * it will be a new command created to compose the two.
- * <p>
- * Instead of the following pattern of usage
- *
- * <pre>
- * Command result = x;
- * if (condition)
- * result = result.chain(y);
- * </pre>
- *
- * you should consider using a {@link org.eclipse.emf.common.command.CompoundCommand}and using
- * {@link org.eclipse.emf.common.command.CompoundCommand#unwrap()}to optimize the result:
- *
- * <pre>
- * CompoundCommand subcommands = new CompoundCommand();
- * subcommands.append(x);
- * if (condition)
- * subcommands.append(y);
- * Command result = subcommands.unwrap();
- * </pre>
- *
- * This gives you more control over how the compound command composes it's result and affected
- * objects.
- *
- * @param command
- * the command to chain.
- * @return a command that represents the composition of this command with the given command.
- */
- @Override
- public Command chain(Command command) {
- return super.chain(command);
- }
-
- public Object getAddedObject() {
- return newChild_;
- }
-}
diff --git a/plugins/org.eclipse.jst.j2ee.webservice/webservice/org/eclipse/jst/j2ee/internal/webservice/command/CommandModifyElement.java b/plugins/org.eclipse.jst.j2ee.webservice/webservice/org/eclipse/jst/j2ee/internal/webservice/command/CommandModifyElement.java
deleted file mode 100644
index f0462e0..0000000
--- a/plugins/org.eclipse.jst.j2ee.webservice/webservice/org/eclipse/jst/j2ee/internal/webservice/command/CommandModifyElement.java
+++ /dev/null
@@ -1,190 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2003, 2005 IBM Corporation and others.
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
- *
- * Contributors:
- * IBM Corporation - initial API and implementation
- *******************************************************************************/
-
-package org.eclipse.jst.j2ee.internal.webservice.command;
-
-import java.util.Collection;
-
-import org.eclipse.emf.common.command.AbstractCommand;
-import org.eclipse.emf.common.command.Command;
-import org.eclipse.emf.ecore.EObject;
-import org.eclipse.emf.ecore.EStructuralFeature;
-
-public class CommandModifyElement extends AbstractCommand {
- private EObject parent_;
- private EStructuralFeature[] properties_;
- private Object[] propertyValues_;
- private Object[] oldPropertyValues_;
-
- public CommandModifyElement(String label, String description, EObject parent, EStructuralFeature[] properties, Object[] propertyValues) {
- super(label, description);
- parent_ = parent;
- properties_ = properties;
- propertyValues_ = propertyValues;
-
- }
-
-
- /**
- * Called at most once in {@link #canExecute}to give the command an opportunity to ready itself
- * for execution. The returned value is stored in {@link #canExecute}. In other words, you can
- * override this method to initialize and to yield a cached value for the all subsequent calls
- * to canExecute.
- *
- * @return whether the command is executable.
- */
- @Override
- protected boolean prepare() {
- return true;
- }
-
- /**
- * Returns whether the comamad is valid to <code>execute</code>. The
- * {@link UnexecutableCommand#INSTANCE}.<code>canExecute()</code> always returns
- * <code>false</code>. This <b>must </b> be called before calling <code>execute</code>.
- *
- * @return whether the comamad is valid to <code>execute</code>.
- */
- @Override
- public boolean canExecute() {
- return super.canExecute();
- }
-
- /**
- * Performs the command activity required for the effect. The effect of calling
- * <code>execute</code> when <code>canExecute</code> returns <code>false</code>, or when
- * <code>canExecute</code> hasn't been called, is undefined.
- */
- public void execute() {
- oldPropertyValues_ = new Object[properties_.length];
-
- if (parent_ != null) {
- for (int i = 0; i < properties_.length; i++) {
- oldPropertyValues_[i] = parent_.eGet(properties_[i]);
- parent_.eSet(properties_[i], propertyValues_[i]);
- }
- }
-
-
- }
-
- /**
- * Returns <code>true</code> because most command should be undoable.
- *
- * @return <code>true</code>.
- */
- @Override
- public boolean canUndo() {
- return true;
- }
-
- /**
- * Performs the command activity required to <code>undo</code> the effects of a preceding
- * <code>execute</code> (or <code>redo</code>). The effect, if any, of calling
- * <code>undo</code> before <code>execute</code> or <code>redo</code> have been called, or
- * when canUndo returns <code>false</code>, is undefined.
- */
- @Override
- public void undo() {
-
- if (parent_ != null) {
- for (int i = 0; i < oldPropertyValues_.length; i++) {
- parent_.eSet(properties_[i], oldPropertyValues_[i]);
- }
- }
-
- }
-
- /**
- * Performs the command activity required to <code>redo</code> the effect after undoing the
- * effect. The effect, if any, of calling <code>redo</code> before <code>undo</code> is
- * called is undefined. Note that if you implement <code>redo</code> to call
- * <code>execute</code> then any derived class will be restricted by that decision also.
- */
- public void redo() {
- execute();
- }
-
- /**
- * Returns a collection of things which this command wishes to present as it's result. The
- * result of calling this before an <code>execute</code> or <code>redo</code>, or after an
- * <code>undo</code>, is undefined.
- *
- * @return a collection of things which this command wishes to present as it's result.
- */
- @Override
- public Collection getResult() {
- return super.getResult();
- }
-
- /**
- * Returns the collection of things which this command wishes to present as the objects affected
- * by the command. Typically should could be used as the selection that should be highlighted to
- * best illustrate the effect of the command. The result of calling this before an
- * <code>execute</code>,<code>redo</code>, or <code>undo</code> is undefined. The
- * result may be different after an <code>undo</code> than it is after an <code>execute</code>
- * or <code>redo</code>, but the result should be the same (equivalent) after either an
- * <code>execute</code> or <code>redo</code>.
- *
- * @return the collection of things which this command wishes to present as the objects affected
- * by the command.
- */
- @Override
- public Collection getAffectedObjects() {
- return super.getAffectedObjects();
- }
-
- /**
- * Called to indicate that the command will never be used again. Calling any other method after
- * this one has undefined results.
- */
- @Override
- public void dispose() {
- //Do nothing
- }
-
- /**
- * Returns a command that represents the composition of this command with the given command. The
- * resulting command may just be this, if this command is capabable of composition. Otherwise,
- * it will be a new command created to compose the two.
- * <p>
- * Instead of the following pattern of usage
- *
- * <pre>
- * Command result = x;
- * if (condition)
- * result = result.chain(y);
- * </pre>
- *
- * you should consider using a {@link org.eclipse.emf.common.command.CompoundCommand}and using
- * {@link org.eclipse.emf.common.command.CompoundCommand#unwrap()}to optimize the result:
- *
- * <pre>
- * CompoundCommand subcommands = new CompoundCommand();
- * subcommands.append(x);
- * if (condition)
- * subcommands.append(y);
- * Command result = subcommands.unwrap();
- * </pre>
- *
- * This gives you more control over how the compound command composes it's result and affected
- * objects.
- *
- * @param command
- * the command to chain.
- * @return a command that represents the composition of this command with the given command.
- */
- @Override
- public Command chain(Command command) {
- return super.chain(command);
- }
-
-}
diff --git a/plugins/org.eclipse.jst.j2ee.webservice/webservice/org/eclipse/jst/j2ee/internal/webservice/command/CommandModifyHandlerClassText.java b/plugins/org.eclipse.jst.j2ee.webservice/webservice/org/eclipse/jst/j2ee/internal/webservice/command/CommandModifyHandlerClassText.java
deleted file mode 100644
index 7f5ccdb..0000000
--- a/plugins/org.eclipse.jst.j2ee.webservice/webservice/org/eclipse/jst/j2ee/internal/webservice/command/CommandModifyHandlerClassText.java
+++ /dev/null
@@ -1,191 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2003, 2005 IBM Corporation and others.
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
- *
- * Contributors:
- * IBM Corporation - initial API and implementation
- *******************************************************************************/
-
-package org.eclipse.jst.j2ee.internal.webservice.command;
-
-import java.util.Collection;
-
-import org.eclipse.emf.common.command.AbstractCommand;
-import org.eclipse.emf.common.command.Command;
-import org.eclipse.emf.ecore.EStructuralFeature;
-import org.eclipse.jem.java.JavaClass;
-import org.eclipse.jem.java.JavaRefFactory;
-import org.eclipse.jst.j2ee.webservice.wsclient.Handler;
-import org.eclipse.jst.j2ee.webservice.wsclient.Webservice_clientPackage;
-
-
-public class CommandModifyHandlerClassText extends AbstractCommand {
- private Handler eObject_;
- private EStructuralFeature feature_;
- private String newValue_;
- private JavaClass oldValue_;
- private boolean nillable_;
- private boolean oldIsSet_;
-
- public CommandModifyHandlerClassText(String label, String description, Handler eObject, String newValue) {
- super(label, description);
- eObject_ = eObject;
- feature_ = Webservice_clientPackage.eINSTANCE.getHandler_HandlerClass();
- if (newValue == null)
- newValue_ = ""; //$NON-NLS-1$
- else
- newValue_ = newValue;
- nillable_ = false;
- oldValue_ = null;
- oldIsSet_ = true;
- }
-
- /**
- * Called at most once in {@link #canExecute}to give the command an opportunity to ready itself
- * for execution. The returned value is stored in {@link #canExecute}. In other words, you can
- * override this method to initialize and to yield a cached value for the all subsequent calls
- * to canExecute.
- *
- * @return whether the command is executable.
- */
- @Override
- protected boolean prepare() {
- return true;
- }
-
- /**
- * Returns whether the comamad is valid to <code>execute</code>. The
- * {@link UnexecutableCommand#INSTANCE}.<code>canExecute()</code> always returns
- * <code>false</code>. This <b>must </b> be called before calling <code>execute</code>.
- *
- * @return whether the comamad is valid to <code>execute</code>.
- */
- @Override
- public boolean canExecute() {
- return super.canExecute();
- }
-
- /**
- * Performs the command activity required for the effect. The effect of calling
- * <code>execute</code> when <code>canExecute</code> returns <code>false</code>, or when
- * <code>canExecute</code> hasn't been called, is undefined.
- */
- public void execute() {
- oldIsSet_ = eObject_.eIsSet(feature_);
- oldValue_ = eObject_.getHandlerClass();
- eObject_.setHandlerClass(JavaRefFactory.eINSTANCE.createClassRef(newValue_));
- if (nillable_ && newValue_ == null)
- eObject_.eUnset(feature_);
- }
-
- /**
- * Returns <code>true</code> because most command should be undoable.
- *
- * @return <code>true</code>.
- */
- @Override
- public boolean canUndo() {
- return true;
- }
-
- /**
- * Performs the command activity required to <code>undo</code> the effects of a preceding
- * <code>execute</code> (or <code>redo</code>). The effect, if any, of calling
- * <code>undo</code> before <code>execute</code> or <code>redo</code> have been called, or
- * when canUndo returns <code>false</code>, is undefined.
- */
- @Override
- public void undo() {
- if (oldIsSet_)
- eObject_.setHandlerClass(oldValue_);
- else
- eObject_.eUnset(feature_);
- }
-
- /**
- * Performs the command activity required to <code>redo</code> the effect after undoing the
- * effect. The effect, if any, of calling <code>redo</code> before <code>undo</code> is
- * called is undefined. Note that if you implement <code>redo</code> to call
- * <code>execute</code> then any derived class will be restricted by that decision also.
- */
- public void redo() {
- execute();
- }
-
- /**
- * Returns a collection of things which this command wishes to present as it's result. The
- * result of calling this before an <code>execute</code> or <code>redo</code>, or after an
- * <code>undo</code>, is undefined.
- *
- * @return a collection of things which this command wishes to present as it's result.
- */
- @Override
- public Collection getResult() {
- return super.getResult();
- }
-
- /**
- * Returns the collection of things which this command wishes to present as the objects affected
- * by the command. Typically should could be used as the selection that should be highlighted to
- * best illustrate the effect of the command. The result of calling this before an
- * <code>execute</code>,<code>redo</code>, or <code>undo</code> is undefined. The
- * result may be different after an <code>undo</code> than it is after an <code>execute</code>
- * or <code>redo</code>, but the result should be the same (equivalent) after either an
- * <code>execute</code> or <code>redo</code>.
- *
- * @return the collection of things which this command wishes to present as the objects affected
- * by the command.
- */
- @Override
- public Collection getAffectedObjects() {
- return super.getAffectedObjects();
- }
-
- /**
- * Called to indicate that the command will never be used again. Calling any other method after
- * this one has undefined results.
- */
- @Override
- public void dispose() {
- //Do nothing
- }
-
- /**
- * Returns a command that represents the composition of this command with the given command. The
- * resulting command may just be this, if this command is capabable of composition. Otherwise,
- * it will be a new command created to compose the two.
- * <p>
- * Instead of the following pattern of usage
- *
- * <pre>
- * Command result = x;
- * if (condition)
- * result = result.chain(y);
- * </pre>
- *
- * you should consider using a {@link org.eclipse.emf.common.command.CompoundCommand}and using
- * {@link org.eclipse.emf.common.command.CompoundCommand#unwrap()}to optimize the result:
- *
- * <pre>
- * CompoundCommand subcommands = new CompoundCommand();
- * subcommands.append(x);
- * if (condition)
- * subcommands.append(y);
- * Command result = subcommands.unwrap();
- * </pre>
- *
- * This gives you more control over how the compound command composes it's result and affected
- * objects.
- *
- * @param command
- * the command to chain.
- * @return a command that represents the composition of this command with the given command.
- */
- @Override
- public Command chain(Command command) {
- return super.chain(command);
- }
-}
diff --git a/plugins/org.eclipse.jst.j2ee.webservice/webservice/org/eclipse/jst/j2ee/internal/webservice/command/CommandModifyNSURI.java b/plugins/org.eclipse.jst.j2ee.webservice/webservice/org/eclipse/jst/j2ee/internal/webservice/command/CommandModifyNSURI.java
deleted file mode 100644
index 4d4085c..0000000
--- a/plugins/org.eclipse.jst.j2ee.webservice/webservice/org/eclipse/jst/j2ee/internal/webservice/command/CommandModifyNSURI.java
+++ /dev/null
@@ -1,191 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2003, 2005 IBM Corporation and others.
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
- *
- * Contributors:
- * IBM Corporation - initial API and implementation
- *******************************************************************************/
-
-package org.eclipse.jst.j2ee.internal.webservice.command;
-
-import java.util.Collection;
-
-import org.eclipse.emf.common.command.AbstractCommand;
-import org.eclipse.emf.common.command.Command;
-import org.eclipse.emf.ecore.EStructuralFeature;
-import org.eclipse.jst.j2ee.common.CommonPackage;
-import org.eclipse.jst.j2ee.common.QName;
-import org.eclipse.jst.j2ee.webservice.internal.util.QNameHelper;
-
-public class CommandModifyNSURI extends AbstractCommand {
- private QName eObject_;
- private EStructuralFeature feature_;
- private String newValue_;
- private Object oldValue_;
- private boolean nillable_;
- private boolean oldIsSet_;
-
- public CommandModifyNSURI(String label, String description, QName eObject, String newValue, boolean nillable) {
- super(label, description);
- eObject_ = eObject;
- feature_ = CommonPackage.eINSTANCE.getQName_NamespaceURI();
- if (nillable && (newValue == null || newValue.length() <= 0))
- newValue_ = null;
- else if (!nillable && newValue == null)
- newValue_ = ""; //$NON-NLS-1$
- else
- newValue_ = newValue;
- nillable_ = nillable;
- oldValue_ = null;
- oldIsSet_ = true;
- }
-
- /**
- * Called at most once in {@link #canExecute}to give the command an opportunity to ready itself
- * for execution. The returned value is stored in {@link #canExecute}. In other words, you can
- * override this method to initialize and to yield a cached value for the all subsequent calls
- * to canExecute.
- *
- * @return whether the command is executable.
- */
- @Override
- protected boolean prepare() {
- return true;
- }
-
- /**
- * Returns whether the comamad is valid to <code>execute</code>. The
- * {@link UnexecutableCommand#INSTANCE}.<code>canExecute()</code> always returns
- * <code>false</code>. This <b>must </b> be called before calling <code>execute</code>.
- *
- * @return whether the comamad is valid to <code>execute</code>.
- */
- @Override
- public boolean canExecute() {
- return super.canExecute();
- }
-
- /**
- * Performs the command activity required for the effect. The effect of calling
- * <code>execute</code> when <code>canExecute</code> returns <code>false</code>, or when
- * <code>canExecute</code> hasn't been called, is undefined.
- */
- public void execute() {
- oldIsSet_ = eObject_.eIsSet(feature_);
- oldValue_ = eObject_.getNamespaceURI();
- QNameHelper.setQNameNamespaceURI(eObject_, newValue_);
- if (nillable_ && newValue_ == null)
- eObject_.eUnset(feature_);
- }
-
- /**
- * Returns <code>true</code> because most command should be undoable.
- *
- * @return <code>true</code>.
- */
- @Override
- public boolean canUndo() {
- return true;
- }
-
- /**
- * Performs the command activity required to <code>undo</code> the effects of a preceding
- * <code>execute</code> (or <code>redo</code>). The effect, if any, of calling
- * <code>undo</code> before <code>execute</code> or <code>redo</code> have been called, or
- * when canUndo returns <code>false</code>, is undefined.
- */
- @Override
- public void undo() {
- if (oldIsSet_)
- eObject_.eSet(feature_, oldValue_);
- else
- eObject_.eUnset(feature_);
- }
-
- /**
- * Performs the command activity required to <code>redo</code> the effect after undoing the
- * effect. The effect, if any, of calling <code>redo</code> before <code>undo</code> is
- * called is undefined. Note that if you implement <code>redo</code> to call
- * <code>execute</code> then any derived class will be restricted by that decision also.
- */
- public void redo() {
- execute();
- }
-
- /**
- * Returns a collection of things which this command wishes to present as it's result. The
- * result of calling this before an <code>execute</code> or <code>redo</code>, or after an
- * <code>undo</code>, is undefined.
- *
- * @return a collection of things which this command wishes to present as it's result.
- */
- @Override
- public Collection getResult() {
- return super.getResult();
- }
-
- /**
- * Returns the collection of things which this command wishes to present as the objects affected
- * by the command. Typically should could be used as the selection that should be highlighted to
- * best illustrate the effect of the command. The result of calling this before an
- * <code>execute</code>,<code>redo</code>, or <code>undo</code> is undefined. The
- * result may be different after an <code>undo</code> than it is after an <code>execute</code>
- * or <code>redo</code>, but the result should be the same (equivalent) after either an
- * <code>execute</code> or <code>redo</code>.
- *
- * @return the collection of things which this command wishes to present as the objects affected
- * by the command.
- */
- @Override
- public Collection getAffectedObjects() {
- return super.getAffectedObjects();
- }
-
- /**
- * Called to indicate that the command will never be used again. Calling any other method after
- * this one has undefined results.
- */
- @Override
- public void dispose() {
- //Do nothing
- }
-
- /**
- * Returns a command that represents the composition of this command with the given command. The
- * resulting command may just be this, if this command is capabable of composition. Otherwise,
- * it will be a new command created to compose the two.
- * <p>
- * Instead of the following pattern of usage
- *
- * <pre>
- * Command result = x;
- * if (condition)
- * result = result.chain(y);
- * </pre>
- *
- * you should consider using a {@link org.eclipse.emf.common.command.CompoundCommand}and using
- * {@link org.eclipse.emf.common.command.CompoundCommand#unwrap()}to optimize the result:
- *
- * <pre>
- * CompoundCommand subcommands = new CompoundCommand();
- * subcommands.append(x);
- * if (condition)
- * subcommands.append(y);
- * Command result = subcommands.unwrap();
- * </pre>
- *
- * This gives you more control over how the compound command composes it's result and affected
- * objects.
- *
- * @param command
- * the command to chain.
- * @return a command that represents the composition of this command with the given command.
- */
- @Override
- public Command chain(Command command) {
- return super.chain(command);
- }
-}
diff --git a/plugins/org.eclipse.jst.j2ee.webservice/webservice/org/eclipse/jst/j2ee/internal/webservice/command/CommandModifySEI.java b/plugins/org.eclipse.jst.j2ee.webservice/webservice/org/eclipse/jst/j2ee/internal/webservice/command/CommandModifySEI.java
deleted file mode 100644
index d971cb7..0000000
--- a/plugins/org.eclipse.jst.j2ee.webservice/webservice/org/eclipse/jst/j2ee/internal/webservice/command/CommandModifySEI.java
+++ /dev/null
@@ -1,204 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2003, 2005 IBM Corporation and others.
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
- *
- * Contributors:
- * IBM Corporation - initial API and implementation
- *******************************************************************************/
-package org.eclipse.jst.j2ee.internal.webservice.command;
-
-import java.util.Collection;
-
-import org.eclipse.emf.common.command.AbstractCommand;
-import org.eclipse.emf.common.command.Command;
-import org.eclipse.emf.ecore.EStructuralFeature;
-import org.eclipse.jem.java.JavaClass;
-import org.eclipse.jem.java.JavaRefFactory;
-import org.eclipse.jst.j2ee.webservice.wsclient.PortComponentRef;
-import org.eclipse.jst.j2ee.webservice.wsclient.Webservice_clientPackage;
-
-
-/**
- *
- */
-public class CommandModifySEI extends AbstractCommand {
- private PortComponentRef eObject_;
- private EStructuralFeature feature_;
- private String newValue_;
- private Object oldValue_;
- private boolean nillable_;
- private boolean oldIsSet_;
-
-
- public CommandModifySEI(String label, String description, PortComponentRef eObject, String newValue, boolean nillable) {
- super(label, description);
- eObject_ = eObject;
- feature_ = Webservice_clientPackage.eINSTANCE.getPortComponentRef_ServiceEndpointInterface();
- if (nillable && (newValue == null || newValue.length() <= 0))
- newValue_ = null;
- else if (!nillable && newValue == null)
- newValue_ = ""; //$NON-NLS-1$
- else
- newValue_ = newValue;
- nillable_ = nillable;
- oldValue_ = null;
- oldIsSet_ = true;
- }
-
- /**
- * Called at most once in {@link #canExecute}to give the command an opportunity to ready itself
- * for execution. The returned value is stored in {@link #canExecute}. In other words, you can
- * override this method to initialize and to yield a cached value for the all subsequent calls
- * to canExecute.
- *
- * @return whether the command is executable.
- */
- @Override
- protected boolean prepare() {
- return true;
- }
-
- /**
- * Returns whether the comamad is valid to <code>execute</code>. The
- * {@link UnexecutableCommand#INSTANCE}.<code>canExecute()</code> always returns
- * <code>false</code>. This <b>must </b> be called before calling <code>execute</code>.
- *
- * @return whether the comamad is valid to <code>execute</code>.
- */
- @Override
- public boolean canExecute() {
- return super.canExecute();
- }
-
- /**
- * Performs the command activity required for the effect. The effect of calling
- * <code>execute</code> when <code>canExecute</code> returns <code>false</code>, or when
- * <code>canExecute</code> hasn't been called, is undefined.
- */
- public void execute() {
- oldIsSet_ = eObject_.eIsSet(feature_);
- oldValue_ = eObject_.getServiceEndpointInterface();
- JavaClass newJavaClass_ = JavaRefFactory.eINSTANCE.createClassRef(newValue_);
- eObject_.setServiceEndpointInterface(newJavaClass_);
- if (nillable_ && newValue_ == null)
- eObject_.eUnset(feature_);
- }
-
- /**
- * Returns <code>true</code> because most command should be undoable.
- *
- * @return <code>true</code>.
- */
- @Override
- public boolean canUndo() {
- return true;
- }
-
- /**
- * Performs the command activity required to <code>undo</code> the effects of a preceding
- * <code>execute</code> (or <code>redo</code>). The effect, if any, of calling
- * <code>undo</code> before <code>execute</code> or <code>redo</code> have been called, or
- * when canUndo returns <code>false</code>, is undefined.
- */
- @Override
- public void undo() {
- if (oldIsSet_)
- eObject_.eSet(feature_, oldValue_);
- else
- eObject_.eUnset(feature_);
- }
-
- /**
- * Performs the command activity required to <code>redo</code> the effect after undoing the
- * effect. The effect, if any, of calling <code>redo</code> before <code>undo</code> is
- * called is undefined. Note that if you implement <code>redo</code> to call
- * <code>execute</code> then any derived class will be restricted by that decision also.
- */
- public void redo() {
- execute();
- }
-
- /**
- * Returns a collection of things which this command wishes to present as it's result. The
- * result of calling this before an <code>execute</code> or <code>redo</code>, or after an
- * <code>undo</code>, is undefined.
- *
- * @return a collection of things which this command wishes to present as it's result.
- */
- @Override
- public Collection getResult() {
- return super.getResult();
- }
-
- /**
- * Returns the collection of things which this command wishes to present as the objects affected
- * by the command. Typically should could be used as the selection that should be highlighted to
- * best illustrate the effect of the command. The result of calling this before an
- * <code>execute</code>,<code>redo</code>, or <code>undo</code> is undefined. The
- * result may be different after an <code>undo</code> than it is after an <code>execute</code>
- * or <code>redo</code>, but the result should be the same (equivalent) after either an
- * <code>execute</code> or <code>redo</code>.
- *
- * @return the collection of things which this command wishes to present as the objects affected
- * by the command.
- */
- @Override
- public Collection getAffectedObjects() {
- return super.getAffectedObjects();
- }
-
- /**
- * Called to indicate that the command will never be used again. Calling any other method after
- * this one has undefined results.
- */
- @Override
- public void dispose() {
- //Do nothing
- }
-
- /**
- * Returns a command that represents the composition of this command with the given command. The
- * resulting command may just be this, if this command is capabable of composition. Otherwise,
- * it will be a new command created to compose the two.
- * <p>
- * Instead of the following pattern of usage
- *
- * <pre>
- * Command result = x;
- * if (condition)
- * result = result.chain(y);
- * </pre>
- *
- * you should consider using a {@link org.eclipse.emf.common.command.CompoundCommand}and using
- * {@link org.eclipse.emf.common.command.CompoundCommand#unwrap()}to optimize the result:
- *
- * <pre>
- * CompoundCommand subcommands = new CompoundCommand();
- * subcommands.append(x);
- * if (condition)
- * subcommands.append(y);
- * Command result = subcommands.unwrap();
- * </pre>
- *
- * This gives you more control over how the compound command composes it's result and affected
- * objects.
- *
- * @param command
- * the command to chain.
- * @return a command that represents the composition of this command with the given command.
- */
- @Override
- public Command chain(Command command) {
- return super.chain(command);
- }
- /*
- * (non-Javadoc)
- *
- * @see org.eclipse.emf.common.command.Command#execute()
- */
-
-
-}
diff --git a/plugins/org.eclipse.jst.j2ee.webservice/webservice/org/eclipse/jst/j2ee/internal/webservice/command/CommandModifyServiceInterfaceText.java b/plugins/org.eclipse.jst.j2ee.webservice/webservice/org/eclipse/jst/j2ee/internal/webservice/command/CommandModifyServiceInterfaceText.java
deleted file mode 100644
index 6d938ae..0000000
--- a/plugins/org.eclipse.jst.j2ee.webservice/webservice/org/eclipse/jst/j2ee/internal/webservice/command/CommandModifyServiceInterfaceText.java
+++ /dev/null
@@ -1,191 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2003, 2005 IBM Corporation and others.
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
- *
- * Contributors:
- * IBM Corporation - initial API and implementation
- *******************************************************************************/
-
-package org.eclipse.jst.j2ee.internal.webservice.command;
-
-import java.util.Collection;
-
-import org.eclipse.emf.common.command.AbstractCommand;
-import org.eclipse.emf.common.command.Command;
-import org.eclipse.emf.ecore.EStructuralFeature;
-import org.eclipse.jem.java.JavaClass;
-import org.eclipse.jem.java.JavaRefFactory;
-import org.eclipse.jst.j2ee.webservice.wsclient.ServiceRef;
-import org.eclipse.jst.j2ee.webservice.wsclient.Webservice_clientPackage;
-
-
-public class CommandModifyServiceInterfaceText extends AbstractCommand {
- private ServiceRef eObject_;
- private EStructuralFeature feature_;
- private String newValue_;
- private JavaClass oldValue_;
- private boolean nillable_;
- private boolean oldIsSet_;
-
- public CommandModifyServiceInterfaceText(String label, String description, ServiceRef eObject, String newValue) {
- super(label, description);
- eObject_ = eObject;
- feature_ = Webservice_clientPackage.eINSTANCE.getServiceRef_ServiceInterface();
- if (newValue == null)
- newValue_ = ""; //$NON-NLS-1$
- else
- newValue_ = newValue;
- nillable_ = false;
- oldValue_ = null;
- oldIsSet_ = true;
- }
-
- /**
- * Called at most once in {@link #canExecute}to give the command an opportunity to ready itself
- * for execution. The returned value is stored in {@link #canExecute}. In other words, you can
- * override this method to initialize and to yield a cached value for the all subsequent calls
- * to canExecute.
- *
- * @return whether the command is executable.
- */
- @Override
- protected boolean prepare() {
- return true;
- }
-
- /**
- * Returns whether the comamad is valid to <code>execute</code>. The
- * {@link UnexecutableCommand#INSTANCE}.<code>canExecute()</code> always returns
- * <code>false</code>. This <b>must </b> be called before calling <code>execute</code>.
- *
- * @return whether the comamad is valid to <code>execute</code>.
- */
- @Override
- public boolean canExecute() {
- return super.canExecute();
- }
-
- /**
- * Performs the command activity required for the effect. The effect of calling
- * <code>execute</code> when <code>canExecute</code> returns <code>false</code>, or when
- * <code>canExecute</code> hasn't been called, is undefined.
- */
- public void execute() {
- oldIsSet_ = eObject_.eIsSet(feature_);
- oldValue_ = eObject_.getServiceInterface();
- eObject_.setServiceInterface(JavaRefFactory.eINSTANCE.createClassRef(newValue_));
- if (nillable_ && newValue_ == null)
- eObject_.eUnset(feature_);
- }
-
- /**
- * Returns <code>true</code> because most command should be undoable.
- *
- * @return <code>true</code>.
- */
- @Override
- public boolean canUndo() {
- return true;
- }
-
- /**
- * Performs the command activity required to <code>undo</code> the effects of a preceding
- * <code>execute</code> (or <code>redo</code>). The effect, if any, of calling
- * <code>undo</code> before <code>execute</code> or <code>redo</code> have been called, or
- * when canUndo returns <code>false</code>, is undefined.
- */
- @Override
- public void undo() {
- if (oldIsSet_)
- eObject_.setServiceInterface(oldValue_);
- else
- eObject_.eUnset(feature_);
- }
-
- /**
- * Performs the command activity required to <code>redo</code> the effect after undoing the
- * effect. The effect, if any, of calling <code>redo</code> before <code>undo</code> is
- * called is undefined. Note that if you implement <code>redo</code> to call
- * <code>execute</code> then any derived class will be restricted by that decision also.
- */
- public void redo() {
- execute();
- }
-
- /**
- * Returns a collection of things which this command wishes to present as it's result. The
- * result of calling this before an <code>execute</code> or <code>redo</code>, or after an
- * <code>undo</code>, is undefined.
- *
- * @return a collection of things which this command wishes to present as it's result.
- */
- @Override
- public Collection getResult() {
- return super.getResult();
- }
-
- /**
- * Returns the collection of things which this command wishes to present as the objects affected
- * by the command. Typically should could be used as the selection that should be highlighted to
- * best illustrate the effect of the command. The result of calling this before an
- * <code>execute</code>,<code>redo</code>, or <code>undo</code> is undefined. The
- * result may be different after an <code>undo</code> than it is after an <code>execute</code>
- * or <code>redo</code>, but the result should be the same (equivalent) after either an
- * <code>execute</code> or <code>redo</code>.
- *
- * @return the collection of things which this command wishes to present as the objects affected
- * by the command.
- */
- @Override
- public Collection getAffectedObjects() {
- return super.getAffectedObjects();
- }
-
- /**
- * Called to indicate that the command will never be used again. Calling any other method after
- * this one has undefined results.
- */
- @Override
- public void dispose() {
- //Do nothing
- }
-
- /**
- * Returns a command that represents the composition of this command with the given command. The
- * resulting command may just be this, if this command is capabable of composition. Otherwise,
- * it will be a new command created to compose the two.
- * <p>
- * Instead of the following pattern of usage
- *
- * <pre>
- * Command result = x;
- * if (condition)
- * result = result.chain(y);
- * </pre>
- *
- * you should consider using a {@link org.eclipse.emf.common.command.CompoundCommand}and using
- * {@link org.eclipse.emf.common.command.CompoundCommand#unwrap()}to optimize the result:
- *
- * <pre>
- * CompoundCommand subcommands = new CompoundCommand();
- * subcommands.append(x);
- * if (condition)
- * subcommands.append(y);
- * Command result = subcommands.unwrap();
- * </pre>
- *
- * This gives you more control over how the compound command composes it's result and affected
- * objects.
- *
- * @param command
- * the command to chain.
- * @return a command that represents the composition of this command with the given command.
- */
- @Override
- public Command chain(Command command) {
- return super.chain(command);
- }
-}
diff --git a/plugins/org.eclipse.jst.j2ee.webservice/webservice/org/eclipse/jst/j2ee/internal/webservice/command/CommandModifyText.java b/plugins/org.eclipse.jst.j2ee.webservice/webservice/org/eclipse/jst/j2ee/internal/webservice/command/CommandModifyText.java
deleted file mode 100644
index 6b34fa0..0000000
--- a/plugins/org.eclipse.jst.j2ee.webservice/webservice/org/eclipse/jst/j2ee/internal/webservice/command/CommandModifyText.java
+++ /dev/null
@@ -1,189 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2003, 2005 IBM Corporation and others.
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
- *
- * Contributors:
- * IBM Corporation - initial API and implementation
- *******************************************************************************/
-
-package org.eclipse.jst.j2ee.internal.webservice.command;
-
-import java.util.Collection;
-
-import org.eclipse.emf.common.command.AbstractCommand;
-import org.eclipse.emf.common.command.Command;
-import org.eclipse.emf.ecore.EObject;
-import org.eclipse.emf.ecore.EStructuralFeature;
-
-public class CommandModifyText extends AbstractCommand {
- private EObject eObject_;
- private EStructuralFeature feature_;
- private String newValue_;
- private Object oldValue_;
- private boolean nillable_;
- private boolean oldIsSet_;
-
- public CommandModifyText(String label, String description, EObject eObject, EStructuralFeature feature, String newValue, boolean nillable) {
- super(label, description);
- eObject_ = eObject;
- feature_ = feature;
- if (nillable && (newValue == null || newValue.length() <= 0))
- newValue_ = null;
- else if (!nillable && newValue == null)
- newValue_ = ""; //$NON-NLS-1$
- else
- newValue_ = newValue;
- nillable_ = nillable;
- oldValue_ = null;
- oldIsSet_ = true;
- }
-
- /**
- * Called at most once in {@link #canExecute}to give the command an opportunity to ready itself
- * for execution. The returned value is stored in {@link #canExecute}. In other words, you can
- * override this method to initialize and to yield a cached value for the all subsequent calls
- * to canExecute.
- *
- * @return whether the command is executable.
- */
- @Override
- protected boolean prepare() {
- return true;
- }
-
- /**
- * Returns whether the comamad is valid to <code>execute</code>. The
- * {@link UnexecutableCommand#INSTANCE}.<code>canExecute()</code> always returns
- * <code>false</code>. This <b>must </b> be called before calling <code>execute</code>.
- *
- * @return whether the comamad is valid to <code>execute</code>.
- */
- @Override
- public boolean canExecute() {
- return super.canExecute();
- }
-
- /**
- * Performs the command activity required for the effect. The effect of calling
- * <code>execute</code> when <code>canExecute</code> returns <code>false</code>, or when
- * <code>canExecute</code> hasn't been called, is undefined.
- */
- public void execute() {
- oldIsSet_ = eObject_.eIsSet(feature_);
- oldValue_ = eObject_.eGet(feature_);
- eObject_.eSet(feature_, newValue_);
- if (nillable_ && newValue_ == null)
- eObject_.eUnset(feature_);
- }
-
- /**
- * Returns <code>true</code> because most command should be undoable.
- *
- * @return <code>true</code>.
- */
- @Override
- public boolean canUndo() {
- return true;
- }
-
- /**
- * Performs the command activity required to <code>undo</code> the effects of a preceding
- * <code>execute</code> (or <code>redo</code>). The effect, if any, of calling
- * <code>undo</code> before <code>execute</code> or <code>redo</code> have been called, or
- * when canUndo returns <code>false</code>, is undefined.
- */
- @Override
- public void undo() {
- if (oldIsSet_)
- eObject_.eSet(feature_, oldValue_);
- else
- eObject_.eUnset(feature_);
- }
-
- /**
- * Performs the command activity required to <code>redo</code> the effect after undoing the
- * effect. The effect, if any, of calling <code>redo</code> before <code>undo</code> is
- * called is undefined. Note that if you implement <code>redo</code> to call
- * <code>execute</code> then any derived class will be restricted by that decision also.
- */
- public void redo() {
- execute();
- }
-
- /**
- * Returns a collection of things which this command wishes to present as it's result. The
- * result of calling this before an <code>execute</code> or <code>redo</code>, or after an
- * <code>undo</code>, is undefined.
- *
- * @return a collection of things which this command wishes to present as it's result.
- */
- @Override
- public Collection getResult() {
- return super.getResult();
- }
-
- /**
- * Returns the collection of things which this command wishes to present as the objects affected
- * by the command. Typically should could be used as the selection that should be highlighted to
- * best illustrate the effect of the command. The result of calling this before an
- * <code>execute</code>,<code>redo</code>, or <code>undo</code> is undefined. The
- * result may be different after an <code>undo</code> than it is after an <code>execute</code>
- * or <code>redo</code>, but the result should be the same (equivalent) after either an
- * <code>execute</code> or <code>redo</code>.
- *
- * @return the collection of things which this command wishes to present as the objects affected
- * by the command.
- */
- @Override
- public Collection getAffectedObjects() {
- return super.getAffectedObjects();
- }
-
- /**
- * Called to indicate that the command will never be used again. Calling any other method after
- * this one has undefined results.
- */
- @Override
- public void dispose() {
- //Do nothing
- }
-
- /**
- * Returns a command that represents the composition of this command with the given command. The
- * resulting command may just be this, if this command is capabable of composition. Otherwise,
- * it will be a new command created to compose the two.
- * <p>
- * Instead of the following pattern of usage
- *
- * <pre>
- * Command result = x;
- * if (condition)
- * result = result.chain(y);
- * </pre>
- *
- * you should consider using a {@link org.eclipse.emf.common.command.CompoundCommand}and using
- * {@link org.eclipse.emf.common.command.CompoundCommand#unwrap()}to optimize the result:
- *
- * <pre>
- * CompoundCommand subcommands = new CompoundCommand();
- * subcommands.append(x);
- * if (condition)
- * subcommands.append(y);
- * Command result = subcommands.unwrap();
- * </pre>
- *
- * This gives you more control over how the compound command composes it's result and affected
- * objects.
- *
- * @param command
- * the command to chain.
- * @return a command that represents the composition of this command with the given command.
- */
- @Override
- public Command chain(Command command) {
- return super.chain(command);
- }
-}
diff --git a/plugins/org.eclipse.jst.j2ee.webservice/webservice/org/eclipse/jst/j2ee/internal/webservice/command/CommandMoveServiceRefs.java b/plugins/org.eclipse.jst.j2ee.webservice/webservice/org/eclipse/jst/j2ee/internal/webservice/command/CommandMoveServiceRefs.java
deleted file mode 100644
index bb37dbc..0000000
--- a/plugins/org.eclipse.jst.j2ee.webservice/webservice/org/eclipse/jst/j2ee/internal/webservice/command/CommandMoveServiceRefs.java
+++ /dev/null
@@ -1,299 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2003, 2005 IBM Corporation and others.
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
- *
- * Contributors:
- * IBM Corporation - initial API and implementation
- *******************************************************************************/
-
-package org.eclipse.jst.j2ee.internal.webservice.command;
-
-import java.util.Collection;
-import java.util.Iterator;
-import java.util.List;
-
-import org.eclipse.emf.common.command.AbstractCommand;
-import org.eclipse.emf.common.command.Command;
-import org.eclipse.emf.common.util.BasicEList;
-import org.eclipse.emf.common.util.EList;
-import org.eclipse.emf.ecore.EClass;
-import org.eclipse.emf.ecore.EFactory;
-import org.eclipse.emf.ecore.EObject;
-import org.eclipse.emf.ecore.EPackage;
-import org.eclipse.emf.ecore.EStructuralFeature;
-import org.eclipse.jst.j2ee.webservice.wsclient.WebServicesClient;
-
-
-public class CommandMoveServiceRefs extends AbstractCommand {
- private EObject source_;
- private EObject target_;
- private EStructuralFeature childFeature_;
- private Object[] children_;
- private boolean isCopy_;
- private Object[] clonedChildren_;
- private EList serviceRefs;
-
- public CommandMoveServiceRefs(String label, String description, EObject source, EObject target, EStructuralFeature childFeature, Object[] children, boolean isCopy, EList serviceRefs) {
- super(label, description);
- source_ = source;
- target_ = target;
- childFeature_ = childFeature;
- children_ = children;
- isCopy_ = isCopy;
- clonedChildren_ = null;
- this.serviceRefs = serviceRefs;
- }
-
- private Object cloneObject(Object object) {
- if (object instanceof EList) {
- EList clone = new BasicEList();
- for (Iterator it = ((EList) object).iterator(); it.hasNext();) {
- clone.add(cloneObject(it.next()));
- }
- return clone;
- }
- if (object instanceof EObject) {
- EObject source = (EObject) object;
- EClass eClass = ((EObject) object).eClass();
- EPackage ePackage = eClass.getEPackage();
- EFactory eFactory = ePackage.getEFactoryInstance();
- EObject clone = eFactory.create(eClass);
- EList features = eClass.getEAllStructuralFeatures();
- for (Iterator it = features.iterator(); it.hasNext();) {
- EStructuralFeature feature = (EStructuralFeature) it.next();
- if (source.eIsSet(feature)) {
- Object clonedFeature = cloneObject(source.eGet(feature));
- if (feature.isMany())
- ((List) clone.eGet(feature)).addAll((List) clonedFeature);
- else
- clone.eSet(feature, clonedFeature);
- } else
- clone.eUnset(feature);
- }
- return clone;
- }
- if (object != null)
- return new String(object.toString());
- return null;
- }
-
- /**
- * Called at most once in {@link #canExecute}to give the command an opportunity to ready itself
- * for execution. The returned value is stored in {@link #canExecute}. In other words, you can
- * override this method to initialize and to yield a cached value for the all subsequent calls
- * to canExecute.
- *
- * @return whether the command is executable.
- */
- @Override
- protected boolean prepare() {
- return true;
- }
-
- /**
- * Returns whether the comamad is valid to <code>execute</code>. The
- * {@link UnexecutableCommand#INSTANCE}.<code>canExecute()</code> always returns
- * <code>false</code>. This <b>must </b> be called before calling <code>execute</code>.
- *
- * @return whether the comamad is valid to <code>execute</code>.
- */
- @Override
- public boolean canExecute() {
- return super.canExecute();
- }
-
- /**
- * Performs the command activity required for the effect. The effect of calling
- * <code>execute</code> when <code>canExecute</code> returns <code>false</code>, or when
- * <code>canExecute</code> hasn't been called, is undefined.
- */
- public void execute() {
- if (childFeature_.isMany())
- executeMany();
- else
- executeSingle();
- }
-
- private void executeSingle() {
- Object child = source_.eGet(childFeature_);
- if (isCopy_)
- target_.eSet(childFeature_, cloneObject(child));
- else {
- source_.eUnset(childFeature_);
- target_.eSet(childFeature_, child);
- }
- }
-
- private void executeMany() {
- EList sourceList;
- if (source_ instanceof WebServicesClient)
- sourceList = serviceRefs;
- else
- sourceList = (EList) source_.eGet(childFeature_);
- EList targetList;
- if (target_ instanceof WebServicesClient)
- targetList = serviceRefs;
- else
- targetList = (EList) target_.eGet(childFeature_);
- if (isCopy_)
- clonedChildren_ = new Object[children_.length];
- for (int i = 0; i < children_.length; i++) {
- int index = sourceList.indexOf(children_[i]);
- if (index != -1) {
- if (isCopy_) {
- clonedChildren_[i] = cloneObject(children_[i]);
- targetList.add(clonedChildren_[i]);
- } else {
- sourceList.remove(index);
- targetList.add(children_[i]);
- }
- }
- }
- }
-
- /**
- * Returns <code>true</code> because most command should be undoable.
- *
- * @return <code>true</code>.
- */
- @Override
- public boolean canUndo() {
- return true;
- }
-
- /**
- * Performs the command activity required to <code>undo</code> the effects of a preceding
- * <code>execute</code> (or <code>redo</code>). The effect, if any, of calling
- * <code>undo</code> before <code>execute</code> or <code>redo</code> have been called, or
- * when canUndo returns <code>false</code>, is undefined.
- */
- @Override
- public void undo() {
- if (childFeature_.isMany())
- undoSingle();
- else
- undoMany();
- }
-
- private void undoSingle() {
- Object child = target_.eGet(childFeature_);
- target_.eUnset(childFeature_);
- if (!isCopy_)
- source_.eSet(childFeature_, child);
- }
-
- private void undoMany() {
- EList sourceList;
- if (source_ instanceof WebServicesClient)
- sourceList = serviceRefs;
- else
- sourceList = (EList) source_.eGet(childFeature_);
- EList targetList;
- if (target_ instanceof WebServicesClient)
- targetList = serviceRefs;
- else
- targetList = (EList) target_.eGet(childFeature_);
- if (isCopy_) {
- if (clonedChildren_ != null) {
- for (int i = 0; i < clonedChildren_.length; i++) {
- targetList.remove(clonedChildren_[i]);
- }
- }
- } else {
- for (int i = 0; i < children_.length; i++) {
- int index = targetList.indexOf(children_[i]);
- if (index != -1) {
- targetList.remove(index);
- sourceList.add(children_[i]);
- }
- }
- }
- }
-
- /**
- * Performs the command activity required to <code>redo</code> the effect after undoing the
- * effect. The effect, if any, of calling <code>redo</code> before <code>undo</code> is
- * called is undefined. Note that if you implement <code>redo</code> to call
- * <code>execute</code> then any derived class will be restricted by that decision also.
- */
- public void redo() {
- execute();
- }
-
- /**
- * Returns a collection of things which this command wishes to present as it's result. The
- * result of calling this before an <code>execute</code> or <code>redo</code>, or after an
- * <code>undo</code>, is undefined.
- *
- * @return a collection of things which this command wishes to present as it's result.
- */
- @Override
- public Collection getResult() {
- return super.getResult();
- }
-
- /**
- * Returns the collection of things which this command wishes to present as the objects affected
- * by the command. Typically should could be used as the selection that should be highlighted to
- * best illustrate the effect of the command. The result of calling this before an
- * <code>execute</code>,<code>redo</code>, or <code>undo</code> is undefined. The
- * result may be different after an <code>undo</code> than it is after an <code>execute</code>
- * or <code>redo</code>, but the result should be the same (equivalent) after either an
- * <code>execute</code> or <code>redo</code>.
- *
- * @return the collection of things which this command wishes to present as the objects affected
- * by the command.
- */
- @Override
- public Collection getAffectedObjects() {
- return super.getAffectedObjects();
- }
-
- /**
- * Called to indicate that the command will never be used again. Calling any other method after
- * this one has undefined results.
- */
- @Override
- public void dispose() {
- //Do nothing
- }
-
- /**
- * Returns a command that represents the composition of this command with the given command. The
- * resulting command may just be this, if this command is capabable of composition. Otherwise,
- * it will be a new command created to compose the two.
- * <p>
- * Instead of the following pattern of usage
- *
- * <pre>
- * Command result = x;
- * if (condition)
- * result = result.chain(y);
- * </pre>
- *
- * you should consider using a {@link org.eclipse.emf.common.command.CompoundCommand}and using
- * {@link org.eclipse.emf.common.command.CompoundCommand#unwrap()}to optimize the result:
- *
- * <pre>
- * CompoundCommand subcommands = new CompoundCommand();
- * subcommands.append(x);
- * if (condition)
- * subcommands.append(y);
- * Command result = subcommands.unwrap();
- * </pre>
- *
- * This gives you more control over how the compound command composes it's result and affected
- * objects.
- *
- * @param command
- * the command to chain.
- * @return a command that represents the composition of this command with the given command.
- */
- @Override
- public Command chain(Command command) {
- return super.chain(command);
- }
-}
diff --git a/plugins/org.eclipse.jst.j2ee.webservice/webservice/org/eclipse/jst/j2ee/internal/webservice/command/CommandRemoveElement.java b/plugins/org.eclipse.jst.j2ee.webservice/webservice/org/eclipse/jst/j2ee/internal/webservice/command/CommandRemoveElement.java
deleted file mode 100644
index 2aa91d9..0000000
--- a/plugins/org.eclipse.jst.j2ee.webservice/webservice/org/eclipse/jst/j2ee/internal/webservice/command/CommandRemoveElement.java
+++ /dev/null
@@ -1,208 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2003, 2005 IBM Corporation and others.
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
- *
- * Contributors:
- * IBM Corporation - initial API and implementation
- *******************************************************************************/
-
-package org.eclipse.jst.j2ee.internal.webservice.command;
-
-import java.util.Collection;
-
-import org.eclipse.emf.common.command.AbstractCommand;
-import org.eclipse.emf.common.command.Command;
-import org.eclipse.emf.common.util.EList;
-import org.eclipse.emf.ecore.EObject;
-import org.eclipse.emf.ecore.EStructuralFeature;
-
-public class CommandRemoveElement extends AbstractCommand {
- private EObject parent_;
- private Object child_;
- private Object oldChild_;
- private boolean oldChildSet_;
- private EStructuralFeature childFeature_;
- private boolean nillable_;
-
- public CommandRemoveElement(String label, String description, EObject parent, EStructuralFeature childFeature) {
- this(label, description, parent, childFeature, true);
- }
-
- public CommandRemoveElement(String label, String description, EObject parent, EStructuralFeature childFeature, boolean nillable) {
- this(label, description, parent, null, childFeature, nillable);
- }
-
- public CommandRemoveElement(String label, String description, EObject parent, Object child, EStructuralFeature childFeature) {
- this(label, description, parent, child, childFeature, true);
- }
-
- public CommandRemoveElement(String label, String description, EObject parent, Object child, EStructuralFeature childFeature, boolean nillable) {
- super(label, description);
- parent_ = parent;
- child_ = child;
- oldChild_ = null;
- oldChildSet_ = true;
- childFeature_ = childFeature;
- nillable_ = nillable;
- }
-
- /**
- * Called at most once in {@link #canExecute}to give the command an opportunity to ready itself
- * for execution. The returned value is stored in {@link #canExecute}. In other words, you can
- * override this method to initialize and to yield a cached value for the all subsequent calls
- * to canExecute.
- *
- * @return whether the command is executable.
- */
- @Override
- protected boolean prepare() {
- return true;
- }
-
- /**
- * Returns whether the comamad is valid to <code>execute</code>. The
- * {@link UnexecutableCommand#INSTANCE}.<code>canExecute()</code> always returns
- * <code>false</code>. This <b>must </b> be called before calling <code>execute</code>.
- *
- * @return whether the comamad is valid to <code>execute</code>.
- */
- @Override
- public boolean canExecute() {
- return super.canExecute();
- }
-
- /**
- * Performs the command activity required for the effect. The effect of calling
- * <code>execute</code> when <code>canExecute</code> returns <code>false</code>, or when
- * <code>canExecute</code> hasn't been called, is undefined.
- */
- public void execute() {
- if (childFeature_.isMany()) {
- if (child_ != null)
- ((EList) parent_.eGet(childFeature_)).remove(child_);
- } else {
- oldChild_ = parent_.eGet(childFeature_);
- oldChildSet_ = parent_.eIsSet(childFeature_);
- if (nillable_)
- parent_.eUnset(childFeature_);
- else
- parent_.eSet(childFeature_, null);
- }
- }
-
- /**
- * Returns <code>true</code> because most command should be undoable.
- *
- * @return <code>true</code>.
- */
- @Override
- public boolean canUndo() {
- return true;
- }
-
- /**
- * Performs the command activity required to <code>undo</code> the effects of a preceding
- * <code>execute</code> (or <code>redo</code>). The effect, if any, of calling
- * <code>undo</code> before <code>execute</code> or <code>redo</code> have been called, or
- * when canUndo returns <code>false</code>, is undefined.
- */
- @Override
- public void undo() {
- if (childFeature_.isMany()) {
- if (child_ != null)
- ((EList) parent_.eGet(childFeature_)).add(child_);
- } else {
- if (oldChildSet_)
- parent_.eSet(childFeature_, oldChild_);
- else
- parent_.eUnset(childFeature_);
- }
- }
-
- /**
- * Performs the command activity required to <code>redo</code> the effect after undoing the
- * effect. The effect, if any, of calling <code>redo</code> before <code>undo</code> is
- * called is undefined. Note that if you implement <code>redo</code> to call
- * <code>execute</code> then any derived class will be restricted by that decision also.
- */
- public void redo() {
- execute();
- }
-
- /**
- * Returns a collection of things which this command wishes to present as it's result. The
- * result of calling this before an <code>execute</code> or <code>redo</code>, or after an
- * <code>undo</code>, is undefined.
- *
- * @return a collection of things which this command wishes to present as it's result.
- */
- @Override
- public Collection getResult() {
- return super.getResult();
- }
-
- /**
- * Returns the collection of things which this command wishes to present as the objects affected
- * by the command. Typically should could be used as the selection that should be highlighted to
- * best illustrate the effect of the command. The result of calling this before an
- * <code>execute</code>,<code>redo</code>, or <code>undo</code> is undefined. The
- * result may be different after an <code>undo</code> than it is after an <code>execute</code>
- * or <code>redo</code>, but the result should be the same (equivalent) after either an
- * <code>execute</code> or <code>redo</code>.
- *
- * @return the collection of things which this command wishes to present as the objects affected
- * by the command.
- */
- @Override
- public Collection getAffectedObjects() {
- return super.getAffectedObjects();
- }
-
- /**
- * Called to indicate that the command will never be used again. Calling any other method after
- * this one has undefined results.
- */
- @Override
- public void dispose() {
- //Do nothing
- }
-
- /**
- * Returns a command that represents the composition of this command with the given command. The
- * resulting command may just be this, if this command is capabable of composition. Otherwise,
- * it will be a new command created to compose the two.
- * <p>
- * Instead of the following pattern of usage
- *
- * <pre>
- * Command result = x;
- * if (condition)
- * result = result.chain(y);
- * </pre>
- *
- * you should consider using a {@link org.eclipse.emf.common.command.CompoundCommand}and using
- * {@link org.eclipse.emf.common.command.CompoundCommand#unwrap()}to optimize the result:
- *
- * <pre>
- * CompoundCommand subcommands = new CompoundCommand();
- * subcommands.append(x);
- * if (condition)
- * subcommands.append(y);
- * Command result = subcommands.unwrap();
- * </pre>
- *
- * This gives you more control over how the compound command composes it's result and affected
- * objects.
- *
- * @param command
- * the command to chain.
- * @return a command that represents the composition of this command with the given command.
- */
- @Override
- public Command chain(Command command) {
- return super.chain(command);
- }
-}
diff --git a/plugins/org.eclipse.jst.j2ee.webservice/webservice/org/eclipse/jst/j2ee/internal/webservice/command/CommandSetElement.java b/plugins/org.eclipse.jst.j2ee.webservice/webservice/org/eclipse/jst/j2ee/internal/webservice/command/CommandSetElement.java
deleted file mode 100644
index d888b9e..0000000
--- a/plugins/org.eclipse.jst.j2ee.webservice/webservice/org/eclipse/jst/j2ee/internal/webservice/command/CommandSetElement.java
+++ /dev/null
@@ -1,206 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2003, 2005 IBM Corporation and others.
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
- *
- * Contributors:
- * IBM Corporation - initial API and implementation
- *******************************************************************************/
-
-package org.eclipse.jst.j2ee.internal.webservice.command;
-
-import java.util.Collection;
-
-import org.eclipse.emf.common.command.AbstractCommand;
-import org.eclipse.emf.common.command.Command;
-import org.eclipse.emf.common.util.EList;
-import org.eclipse.emf.ecore.EObject;
-import org.eclipse.emf.ecore.EStructuralFeature;
-
-public class CommandSetElement extends AbstractCommand {
- private EObject parent_;
- private EStructuralFeature childFeature_;
- private Object newChild_;
- private Object oldChild_;
- private boolean oldChildSet_;
-
- public CommandSetElement(String label, String description, EObject parent, EStructuralFeature childFeature, Object newChild) {
- this(label, description, parent, childFeature, newChild, null);
- }
-
- public CommandSetElement(String label, String description, EObject parent, EStructuralFeature childFeature, Object newChild, Object oldChild) {
- super(label, description);
- parent_ = parent;
- childFeature_ = childFeature;
- newChild_ = newChild;
- oldChild_ = oldChild;
- oldChildSet_ = true;
- }
-
- /**
- * Called at most once in {@link #canExecute}to give the command an opportunity to ready itself
- * for execution. The returned value is stored in {@link #canExecute}. In other words, you can
- * override this method to initialize and to yield a cached value for the all subsequent calls
- * to canExecute.
- *
- * @return whether the command is executable.
- */
- @Override
- protected boolean prepare() {
- return true;
- }
-
- /**
- * Returns whether the comamad is valid to <code>execute</code>. The
- * {@link UnexecutableCommand#INSTANCE}.<code>canExecute()</code> always returns
- * <code>false</code>. This <b>must </b> be called before calling <code>execute</code>.
- *
- * @return whether the comamad is valid to <code>execute</code>.
- */
- @Override
- public boolean canExecute() {
- return super.canExecute();
- }
-
- /**
- * Performs the command activity required for the effect. The effect of calling
- * <code>execute</code> when <code>canExecute</code> returns <code>false</code>, or when
- * <code>canExecute</code> hasn't been called, is undefined.
- */
- public void execute() {
- if (childFeature_.isMany() && !(newChild_ instanceof EList)) {
- if (oldChild_ != null && newChild_ != null) {
- EList eList = (EList) parent_.eGet(childFeature_);
- int index = eList.indexOf(oldChild_);
- if (index != -1)
- eList.set(index, newChild_);
- }
- } else {
- oldChild_ = parent_.eGet(childFeature_);
- oldChildSet_ = parent_.eIsSet(childFeature_);
- if (newChild_ != null)
- parent_.eSet(childFeature_, newChild_);
- else
- parent_.eUnset(childFeature_);
- }
- }
-
- /**
- * Returns <code>true</code> because most command should be undoable.
- *
- * @return <code>true</code>.
- */
- @Override
- public boolean canUndo() {
- return true;
- }
-
- /**
- * Performs the command activity required to <code>undo</code> the effects of a preceding
- * <code>execute</code> (or <code>redo</code>). The effect, if any, of calling
- * <code>undo</code> before <code>execute</code> or <code>redo</code> have been called, or
- * when canUndo returns <code>false</code>, is undefined.
- */
- @Override
- public void undo() {
- if (childFeature_.isMany() && !(newChild_ instanceof EList)) {
- if (oldChild_ != null && newChild_ != null) {
- EList eList = (EList) parent_.eGet(childFeature_);
- int index = eList.indexOf(newChild_);
- if (index != -1)
- eList.set(index, oldChild_);
- }
- } else {
- if (oldChildSet_)
- parent_.eSet(childFeature_, oldChild_);
- else
- parent_.eUnset(childFeature_);
- }
- }
-
- /**
- * Performs the command activity required to <code>redo</code> the effect after undoing the
- * effect. The effect, if any, of calling <code>redo</code> before <code>undo</code> is
- * called is undefined. Note that if you implement <code>redo</code> to call
- * <code>execute</code> then any derived class will be restricted by that decision also.
- */
- public void redo() {
- execute();
- }
-
- /**
- * Returns a collection of things which this command wishes to present as it's result. The
- * result of calling this before an <code>execute</code> or <code>redo</code>, or after an
- * <code>undo</code>, is undefined.
- *
- * @return a collection of things which this command wishes to present as it's result.
- */
- @Override
- public Collection getResult() {
- return super.getResult();
- }
-
- /**
- * Returns the collection of things which this command wishes to present as the objects affected
- * by the command. Typically should could be used as the selection that should be highlighted to
- * best illustrate the effect of the command. The result of calling this before an
- * <code>execute</code>,<code>redo</code>, or <code>undo</code> is undefined. The
- * result may be different after an <code>undo</code> than it is after an <code>execute</code>
- * or <code>redo</code>, but the result should be the same (equivalent) after either an
- * <code>execute</code> or <code>redo</code>.
- *
- * @return the collection of things which this command wishes to present as the objects affected
- * by the command.
- */
- @Override
- public Collection getAffectedObjects() {
- return super.getAffectedObjects();
- }
-
- /**
- * Called to indicate that the command will never be used again. Calling any other method after
- * this one has undefined results.
- */
- @Override
- public void dispose() {
- //Do nothing
- }
-
- /**
- * Returns a command that represents the composition of this command with the given command. The
- * resulting command may just be this, if this command is capabable of composition. Otherwise,
- * it will be a new command created to compose the two.
- * <p>
- * Instead of the following pattern of usage
- *
- * <pre>
- * Command result = x;
- * if (condition)
- * result = result.chain(y);
- * </pre>
- *
- * you should consider using a {@link org.eclipse.emf.common.command.CompoundCommand}and using
- * {@link org.eclipse.emf.common.command.CompoundCommand#unwrap()}to optimize the result:
- *
- * <pre>
- * CompoundCommand subcommands = new CompoundCommand();
- * subcommands.append(x);
- * if (condition)
- * subcommands.append(y);
- * Command result = subcommands.unwrap();
- * </pre>
- *
- * This gives you more control over how the compound command composes it's result and affected
- * objects.
- *
- * @param command
- * the command to chain.
- * @return a command that represents the composition of this command with the given command.
- */
- @Override
- public Command chain(Command command) {
- return super.chain(command);
- }
-}
diff --git a/plugins/org.eclipse.jst.j2ee.webservice/webservice/org/eclipse/jst/j2ee/internal/webservice/componentcore/util/JaxRPCMapArtifactEdit.java b/plugins/org.eclipse.jst.j2ee.webservice/webservice/org/eclipse/jst/j2ee/internal/webservice/componentcore/util/JaxRPCMapArtifactEdit.java
deleted file mode 100644
index cef940c..0000000
--- a/plugins/org.eclipse.jst.j2ee.webservice/webservice/org/eclipse/jst/j2ee/internal/webservice/componentcore/util/JaxRPCMapArtifactEdit.java
+++ /dev/null
@@ -1,391 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2005, 2007 IBM Corporation and others.
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
- *
- * Contributors:
- * IBM Corporation - initial API and implementation
- *******************************************************************************/
-package org.eclipse.jst.j2ee.internal.webservice.componentcore.util;
-
-import java.util.List;
-
-import org.eclipse.core.resources.IProject;
-import org.eclipse.emf.common.util.URI;
-import org.eclipse.emf.ecore.EObject;
-import org.eclipse.emf.ecore.resource.Resource;
-import org.eclipse.emf.ecore.resource.ResourceSet;
-import org.eclipse.jst.j2ee.componentcore.EnterpriseArtifactEdit;
-import org.eclipse.jst.j2ee.internal.webservice.plugin.WebServicePlugin;
-import org.eclipse.jst.j2ee.project.JavaEEProjectUtilities;
-import org.eclipse.jst.j2ee.webservice.jaxrpcmap.JavaWSDLMapping;
-import org.eclipse.jst.j2ee.webservice.jaxrpcmap.JaxrpcmapFactory;
-import org.eclipse.jst.j2ee.webservice.jaxrpcmap.JaxrpcmapResource;
-import org.eclipse.jst.j2ee.webservice.jaxrpcmap.JaxrpcmapResourceFactory;
-import org.eclipse.wst.common.componentcore.ModuleCoreNature;
-import org.eclipse.wst.common.componentcore.UnresolveableURIException;
-import org.eclipse.wst.common.componentcore.internal.ArtifactEditModel;
-import org.eclipse.wst.common.componentcore.internal.impl.WTPResourceFactoryRegistry;
-import org.eclipse.wst.common.componentcore.resources.IVirtualComponent;
-import org.eclipse.wst.common.internal.emf.resource.RendererFactory;
-
-/**
- * <p>
- * WSDDArtifactEdit obtains a WS Deployment Descriptor metamodel specifec data from a
- * {@see org.eclipse.jst.j2ee.ejb.EJBResource} which stores the metamodel. The
- * {@see org.eclipse.jst.j2ee.ejb.EJBResource} is retrieved from the
- * {@see org.eclipse.wst.common.modulecore.ArtifactEditModel} using a constant {@see
- * J2EEConstants#EJBJAR_DD_URI_OBJ}. The defined methods extract data or manipulate the contents of
- * the underlying resource.
- * </p>
- *
- */
-public class JaxRPCMapArtifactEdit extends EnterpriseArtifactEdit {
-
- /**
- * <p>
- * Identifier used to link WSDDArtifactEdit to a WsddAdapterFactory {@see
- * WsddAdapterFactory} stored in an AdapterManger (@see AdapterManager)
- * </p>
- */
-
- public static final Class ADAPTER_TYPE = JaxRPCMapArtifactEdit.class;
-
-
- /**
- * @param aHandle
- * @param toAccessAsReadOnly
- * @throws IllegalArgumentException
- */
- public JaxRPCMapArtifactEdit(IProject aProject, boolean toAccessAsReadOnly) throws IllegalArgumentException {
- super(aProject, toAccessAsReadOnly);
- }
-
-
- /**
- * <p>
- * Creates an instance facade for the given {@see ArtifactEditModel}.
- * </p>
- *
- * @param anArtifactEditModel
- */
- public JaxRPCMapArtifactEdit(ArtifactEditModel model) {
- super(model);
- }
-
- /**
- * <p>
- * Creates an instance facade for the given {@see ArtifactEditModel}
- * </p>
- *
- * <p>Note: This method is for internal use only. Clients should not call this method.</p>
- * @param aNature
- * A non-null {@see ModuleCoreNature}for an accessible project
- * @param aModule
- * A non-null {@see WorkbenchComponent}pointing to a module from the given
- * {@see ModuleCoreNature}
- */
- protected JaxRPCMapArtifactEdit(ModuleCoreNature aNature, IVirtualComponent aModule, boolean toAccessAsReadOnly) {
- super(aNature, aModule, toAccessAsReadOnly);
- }
-
- /**
- *
- * @return WsddResource from (@link getDeploymentDescriptorResource())
- *
- */
-
- public JaxrpcmapResource getJaxRPCMapXmiResource(String mappingFilePathURI) {
-
- URI uri = URI.createPlatformResourceURI(mappingFilePathURI);
- ResourceSet resSet = getArtifactEditModel().getResourceSet();
- WTPResourceFactoryRegistry registry = (WTPResourceFactoryRegistry) resSet.getResourceFactoryRegistry();
- registry.registerLastFileSegment(uri.lastSegment(), new JaxrpcmapResourceFactory(RendererFactory.getDefaultRendererFactory()));
-
- JaxrpcmapResource jaxrpcmapRes = (JaxrpcmapResource) resSet.getResource(uri, true);
-
- return jaxrpcmapRes;
- }
-
- /**
- * <p>
- * Retrieves J2EE version information from EJBResource.
- * </p>
- *
- * @return an integer representation of a J2EE Spec version
- *
- */
-
- public int getJ2EEVersion(String mappingFilePathURI) {
- return getJaxRPCMapXmiResource(mappingFilePathURI).getJ2EEVersionID();
- }
-
-
- /**
- * <p>
- * Retrieves the underlying resource from the ArtifactEditModel using defined URI.
- * </p>
- *
- * @return Resource
- *
- */
-
- public Resource getDeploymentDescriptorResource(String mappingFilePathURI) {
- return getJaxRPCMapXmiResource(mappingFilePathURI);
- }
-
-
- /**
- *
- * @return WebServices from (@link getDeploymentDescriptorRoot())
- *
- */
- public JavaWSDLMapping getJavaWSDLMapping() {
- return (JavaWSDLMapping) getDeploymentDescriptorRoot();
- }
-
- /**
- * <p>
- * Obtains the WebServices (@see WebServices) root object from the WsddResource. If the root object does
- * not exist, then one is created (@link addEJBJarIfNecessary(getEJBJarXmiResource())).
- * The root object contains all other resource defined objects.
- * </p>
- *
- * @return EObject
- *
- */
- public EObject getDeploymentDescriptorRoot(String mappingFilePathURI) {
- List contents = getDeploymentDescriptorResource(mappingFilePathURI).getContents();
- if (contents.size() > 0)
- return (EObject) contents.get(0);
- addJavaWSDLMappingIfNecessary(getJaxRPCMapXmiResource(mappingFilePathURI));
- return (EObject) contents.get(0);
- }
-
- /**
- * <p>
- * Creates a deployment descriptor root object (WebServices) and populates with data. Adds the root
- * object to the deployment descriptor resource.
- * </p>
- *
- * <p>
- *
- * @param aModule
- * A non-null pointing to a {@see XMLResource}
- * Note: This method is typically used for JUNIT - move?
- * </p>
- */
- protected void addJavaWSDLMappingIfNecessary(JaxrpcmapResource aResource) {
- if (aResource != null) {
- if(aResource.getContents() == null || aResource.getContents().isEmpty()) {
- JavaWSDLMapping map = JaxrpcmapFactory.eINSTANCE.createJavaWSDLMapping();
- aResource.getContents().add(map);
- }
- aResource.getContents().get(0);
- getArtifactEditModel().getModuleURI();
- try {
- aResource.saveIfNecessary();
- }
- catch (Exception e) {
- WebServicePlugin.logError(e);
- }
- }
- }
-
- /**
- * <p>
- * Returns an instance facade to manage the underlying edit model for the given
- * {@see WorkbenchComponent}. Instances of ArtifactEdit that are returned through this method
- * must be {@see #dispose()}ed of when no longer in use.
- * </p>
- * <p>
- * Use to acquire an ArtifactEdit facade for a specific {@see WorkbenchComponent} that
- * will not be used for editing. Invocations of any save*() API on an instance returned from
- * this method will throw exceptions.
- * </p>
- * <p>
- * <b>The following method may return null. </b>
- * </p>
- *
- * @param aModule
- * A valid {@see WorkbenchComponent} with a handle that resolves to an
- * accessible project in the workspace
- * @return An instance of ArtifactEdit that may only be used to read the underlying content
- * model
- */
- public static JaxRPCMapArtifactEdit getJaxRPCMapArtifactEditForRead(IProject aProject) {
- JaxRPCMapArtifactEdit artifactEdit = null;
- try {
- artifactEdit = new JaxRPCMapArtifactEdit(aProject, true);
- } catch (IllegalArgumentException iae) {
- artifactEdit = null;
- }
- return artifactEdit;
- }
- /**
- * <p>
- * Returns an instance facade to manage the underlying edit model for the given
- * {@see WorkbenchComponent}. Instances of ArtifactEdit that are returned through this method
- * must be {@see #dispose()}ed of when no longer in use.
- * </p>
- * <p>
- * Use to acquire an ArtifactEdit facade for a specific {@see WorkbenchComponent} that
- * will be used for editing.
- * </p>
- * <p>
- * <b>The following method may return null. </b>
- * </p>
- *
- * @param aModule
- * A valid {@see WorkbenchComponent} with a handle that resolves to an
- * accessible project in the workspace
- * @return An instance of ArtifactEdit that may be used to modify and persist changes to the
- * underlying content model
- */
- public static JaxRPCMapArtifactEdit getJaxRPCMapArtifactEditForWrite(IProject aProject) {
- JaxRPCMapArtifactEdit artifactEdit = null;
- try {
- artifactEdit = new JaxRPCMapArtifactEdit(aProject, false);
- } catch (IllegalArgumentException iae) {
- artifactEdit = null;
- }
- return artifactEdit;
- }
-
- /**
- * <p>
- * Returns an instance facade to manage the underlying edit model for the given
- * {@see WorkbenchComponent}. Instances of WSDDArtifactEdit that are returned through this method
- * must be {@see #dispose()}ed of when no longer in use.
- * </p>
- * <p>
- * Use to acquire an WSDDArtifactEdit facade for a specific {@see WorkbenchComponent} that will not
- * be used for editing. Invocations of any save*() API on an instance returned from this method
- * will throw exceptions.
- * </p>
- * <p>
- * <b>This method may return null. </b>
- * </p>
- *
- * <p>Note: This method is for internal use only. Clients should not call this method.</p>
- * @param aModule
- * A valid {@see WorkbenchComponent} with a handle that resolves to an accessible
- * project in the workspace
- * @return An instance of WSDDArtifactEdit that may only be used to read the underlying content
- * model
- * @throws UnresolveableURIException
- * could not resolve uri.
- */
- public static JaxRPCMapArtifactEdit getJaxRPCMapArtifactEditForRead(IVirtualComponent aModule) {
- IProject project = aModule.getProject();
- ModuleCoreNature nature = ModuleCoreNature.getModuleCoreNature(project);
- return new JaxRPCMapArtifactEdit(nature, aModule, true);
- }
-
-
- /**
- * <p>
- * Returns an instance facade to manage the underlying edit model for the given
- * {@see WorkbenchComponent}. Instances of EJBArtifactEdit that are returned through this method
- * must be {@see #dispose()}ed of when no longer in use.
- * </p>
- * <p>
- * Use to acquire an WSDDArtifactEdit facade for a specific {@see WorkbenchComponent} that
- * will be used for editing.
- * </p>
- * <p>
- * <b>This method may return null. </b>
- * </p>
- *
- * <p>Note: This method is for internal use only. Clients should not call this method.</p>
- * @param aModule
- * A valid {@see WorkbenchComponent} with a handle that resolves to an accessible
- * project in the workspace
- * @return An instance of WSDDArtifactEdit that may be used to modify and persist changes to the
- * underlying content model
- */
- public static JaxRPCMapArtifactEdit getJaxRPCMapArtifactEditForWrite(IVirtualComponent aModule) {
-
- IProject project = aModule.getProject();
- ModuleCoreNature nature = ModuleCoreNature.getModuleCoreNature(project);
- return new JaxRPCMapArtifactEdit(nature, aModule, false);
-
- }
-
-
- /**
- * @param component
- * A {@see IVirtualComponent}
- * @return True if the supplied module
- * {@see ArtifactEdit#isValidEditableModule(IVirtualComponent)}and the moduleTypeId is a
- * JST module
- */
- public static boolean isValidEJBModule(IVirtualComponent aComponent) {
- return JavaEEProjectUtilities.isEJBProject(aComponent.getProject());
- }
- /**
- * @param component
- * A {@see IVirtualComponent}
- * @return True if the supplied module
- * {@see ArtifactEdit#isValidEditableModule(IVirtualComponent)}and the moduleTypeId is a
- * JST module
- */
- public static boolean isValidWebModule(IVirtualComponent aComponent) {
- return JavaEEProjectUtilities.isDynamicWebProject(aComponent.getProject());
- }
- /**
- * @param component
- * A {@see IVirtualComponent}
- * @return True if the supplied module
- * {@see ArtifactEdit#isValidEditableModule(IVirtualComponent)}and the moduleTypeId is a
- * JST module
- */
- public static boolean isValidAppClientModule(IVirtualComponent aComponent) {
- return JavaEEProjectUtilities.isApplicationClientProject(aComponent.getProject());
- }
-
- /* (non-Javadoc)
- * @see org.eclipse.jst.j2ee.internal.modulecore.util.EnterpriseArtifactEdit#createModelRoot()
- */
- public EObject createModelRoot(String mappingFilePathURI) {
- return createModelRoot(getJ2EEVersion(),mappingFilePathURI);
- }
-
- /* (non-Javadoc)
- * @see org.eclipse.jst.j2ee.internal.modulecore.util.EnterpriseArtifactEdit#createModelRoot(int)
- */
- public EObject createModelRoot(int version,String mappingFilePathURI) {
- JaxrpcmapResource res = getJaxRPCMapXmiResource(mappingFilePathURI);
- res.setModuleVersionID(version);
- addJavaWSDLMappingIfNecessary(res);
- return getJavaWSDLMapping();
- }
-
- @Override
- public EObject createModelRoot() {
- throw new IllegalArgumentException(WebServicePlugin.getMessage("_UI_JaxRPCMissingModel")); //$NON-NLS-1$
- }
-
- @Override
- public EObject createModelRoot(int version) {
- throw new IllegalArgumentException(WebServicePlugin.getMessage("_UI_JaxRPCMissingModel")); //$NON-NLS-1$
- }
-
- @Override
- public Resource getDeploymentDescriptorResource() {
- throw new IllegalArgumentException(WebServicePlugin.getMessage("_UI_JaxRPCMissingModel")); //$NON-NLS-1$
- }
-
- @Override
- public int getJ2EEVersion() {
- throw new IllegalArgumentException(WebServicePlugin.getMessage("_UI_JaxRPCMissingModel")); //$NON-NLS-1$
- }
-
- // [182417] This ArtifactEdit works for all project versions, so just return true.
- @Override
- protected boolean validProjectVersion(IProject project) {
- return true;
- }
-}
diff --git a/plugins/org.eclipse.jst.j2ee.webservice/webservice/org/eclipse/jst/j2ee/internal/webservice/componentcore/util/WSCDDArtifactEdit.java b/plugins/org.eclipse.jst.j2ee.webservice/webservice/org/eclipse/jst/j2ee/internal/webservice/componentcore/util/WSCDDArtifactEdit.java
deleted file mode 100644
index 36faf4e..0000000
--- a/plugins/org.eclipse.jst.j2ee.webservice/webservice/org/eclipse/jst/j2ee/internal/webservice/componentcore/util/WSCDDArtifactEdit.java
+++ /dev/null
@@ -1,423 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2005, 2007 IBM Corporation and others.
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
- *
- * Contributors:
- * IBM Corporation - initial API and implementation
- *******************************************************************************/
-package org.eclipse.jst.j2ee.internal.webservice.componentcore.util;
-
-import java.util.List;
-
-import org.eclipse.core.resources.IProject;
-import org.eclipse.core.runtime.IPath;
-import org.eclipse.core.runtime.NullProgressMonitor;
-import org.eclipse.emf.common.util.URI;
-import org.eclipse.emf.ecore.EObject;
-import org.eclipse.emf.ecore.resource.Resource;
-import org.eclipse.jst.j2ee.componentcore.EnterpriseArtifactEdit;
-import org.eclipse.jst.j2ee.internal.J2EEConstants;
-import org.eclipse.jst.j2ee.model.IModelProvider;
-import org.eclipse.jst.j2ee.project.JavaEEProjectUtilities;
-import org.eclipse.jst.j2ee.webservice.wsclient.WebServicesClient;
-import org.eclipse.jst.j2ee.webservice.wsclient.WebServicesResource;
-import org.eclipse.jst.j2ee.webservice.wsclient.Webservice_clientFactory;
-import org.eclipse.wst.common.componentcore.ComponentCore;
-import org.eclipse.wst.common.componentcore.ModuleCoreNature;
-import org.eclipse.wst.common.componentcore.UnresolveableURIException;
-import org.eclipse.wst.common.componentcore.internal.ArtifactEditModel;
-import org.eclipse.wst.common.componentcore.resources.IVirtualComponent;
-
-/**
- * <p>
- * WSDDArtifactEdit obtains a WS Deployment Descriptor metamodel specifec data
- * from a {@see org.eclipse.jst.j2ee.ejb.EJBResource} which stores the
- * metamodel. The {@see org.eclipse.jst.j2ee.ejb.EJBResource} is retrieved
- * from the {@see org.eclipse.wst.common.modulecore.ArtifactEditModel} using
- * a constant {@see J2EEConstants#EJBJAR_DD_URI_OBJ}. The defined methods
- * extract data or manipulate the contents of the underlying resource.
- * </p>
- */
-public class WSCDDArtifactEdit extends EnterpriseArtifactEdit {
-
- /**
- * <p>
- * Identifier used to link WSDDArtifactEdit to a WsddAdapterFactory {@see
- * WsddAdapterFactory} stored in an AdapterManger (@see AdapterManager)
- * </p>
- */
-
- public static final Class ADAPTER_TYPE = WSCDDArtifactEdit.class;
-
- /**
- * @param aHandle
- * @param toAccessAsReadOnly
- * @throws IllegalArgumentException
- */
- public WSCDDArtifactEdit(IProject aProject, boolean toAccessAsReadOnly) throws IllegalArgumentException {
- super(aProject, toAccessAsReadOnly);
- }
-
- /**
- * <p>
- * Creates an instance facade for the given {@see ArtifactEditModel}.
- * </p>
- *
- * @param anArtifactEditModel
- */
- public WSCDDArtifactEdit(ArtifactEditModel model) {
- super(model);
- }
-
- /**
- * <p>
- * Creates an instance facade for the given {@see ArtifactEditModel}
- * </p>
- * <p>
- * Note: This method is for internal use only. Clients should not call this
- * method.
- * </p>
- *
- * @param aNature
- * A non-null {@see ModuleCoreNature}for an accessible project
- * @param aModule
- * A non-null {@see WorkbenchComponent}pointing to a module from
- * the given {@see ModuleCoreNature}
- */
- public WSCDDArtifactEdit(ModuleCoreNature aNature, IVirtualComponent aModule, boolean toAccessAsReadOnly) {
- super(aNature, aModule, toAccessAsReadOnly);
- }
-
- /**
- * @return WsddResource from (@link getDeploymentDescriptorResource())
- */
-
- public WebServicesResource getWscddXmiResource() {
- return (WebServicesResource) getDeploymentDescriptorResource();
- }
-
- /**
- * <p>
- * Retrieves J2EE version information from EJBResource.
- * </p>
- *
- * @return an integer representation of a J2EE Spec version
- */
-
- @Override
- public int getJ2EEVersion() {
- return getWscddXmiResource().getJ2EEVersionID();
- }
-
- /**
- * <p>
- * Retrieves the underlying resource from the ArtifactEditModel using
- * defined URI.
- * </p>
- *
- * @return Resource
- */
-
- @Override
- public Resource getDeploymentDescriptorResource() {
- if (getArtifactEditModel()!=null)
- return getArtifactEditModel().getResource(getWebServicesClientXmlResourceURI());
- return null;
- }
-
- public URI getWebServicesClientXmlResourceURI() {
- URI resourceURI = J2EEConstants.WEB_SERVICES_CLIENT_WEB_INF_DD_URI_OBJ;
- if (isValidAppClientModule(ComponentCore.createComponent(getProject())))
- resourceURI = J2EEConstants.WEB_SERVICES_CLIENT_META_INF_DD_URI_OBJ;
- else if (isValidEJBModule(ComponentCore.createComponent(getProject())))
- resourceURI = J2EEConstants.WEB_SERVICES_CLIENT_META_INF_DD_URI_OBJ;
- return resourceURI;
- }
-
- /**
- * @return WebServices from (@link getDeploymentDescriptorRoot())
- */
- public WebServicesClient getWebServicesClient() {
- return (WebServicesClient) getDeploymentDescriptorRoot();
- }
-
- /**
- * <p>
- * Obtains the WebServices (@see WebServices) root object from the
- * WsddResource. If the root object does not exist, then one is created
- * (@link addEJBJarIfNecessary(getEJBJarXmiResource())). The root object
- * contains all other resource defined objects.
- * </p>
- *
- * @return EObject
- */
- @Override
- public EObject getDeploymentDescriptorRoot() {
- List contents = getDeploymentDescriptorResource().getContents();
- if (contents.size() > 0)
- return (EObject) contents.get(0);
- addWebServicesClientIfNecessary(getWscddXmiResource());
- return (EObject) contents.get(0);
- }
-
- /**
- * <p>
- * Creates a deployment descriptor root object (WebServices) and populates
- * with data. Adds the root object to the deployment descriptor resource.
- * </p>
- * <p>
- *
- * @param aModule
- * A non-null pointing to a {@see XMLResource} Note: This method
- * is typically used for JUNIT - move?
- * </p>
- */
- protected void addWebServicesClientIfNecessary(WebServicesResource aResource) {
- if (aResource != null) {
- if (aResource.getContents() == null || aResource.getContents().isEmpty()) {
- WebServicesClient ws_client = Webservice_clientFactory.eINSTANCE.createWebServicesClient();
- aResource.getContents().add(ws_client);
- }
- aResource.getContents().get(0);
- getArtifactEditModel().getModuleURI();
- try {
- aResource.saveIfNecessary();
- } catch (Exception e) {
- e.printStackTrace();
- }
- }
- }
-
- /**
- * <p>
- * Returns an instance facade to manage the underlying edit model for the
- * given {@see WorkbenchComponent}. Instances of ArtifactEdit that are
- * returned through this method must be {@see #dispose()}ed of when no
- * longer in use.
- * </p>
- * <p>
- * Use to acquire an ArtifactEdit facade for a specific
- * {@see WorkbenchComponent} that will not be used for editing.
- * Invocations of any save*() API on an instance returned from this method
- * will throw exceptions.
- * </p>
- * <p>
- * <b>The following method may return null. </b>
- * </p>
- *
- * @param aModule
- * A valid {@see WorkbenchComponent} with a handle that
- * resolves to an accessible project in the workspace
- * @return An instance of ArtifactEdit that may only be used to read the
- * underlying content model
- */
- public static WSCDDArtifactEdit getWSCDDArtifactEditForRead(IProject aProject) {
- WSCDDArtifactEdit artifactEdit = null;
- try {
- artifactEdit = new WSCDDArtifactEdit(aProject, true);
- } catch (IllegalArgumentException iae) {
- artifactEdit = null;
- }
- return artifactEdit;
- }
-
- /**
- * <p>
- * Returns an instance facade to manage the underlying edit model for the
- * given {@see WorkbenchComponent}. Instances of ArtifactEdit that are
- * returned through this method must be {@see #dispose()}ed of when no
- * longer in use.
- * </p>
- * <p>
- * Use to acquire an ArtifactEdit facade for a specific
- * {@see WorkbenchComponent} that will be used for editing.
- * </p>
- * <p>
- * <b>The following method may return null. </b>
- * </p>
- *
- * @param aModule
- * A valid {@see WorkbenchComponent} with a handle that
- * resolves to an accessible project in the workspace
- * @return An instance of ArtifactEdit that may be used to modify and
- * persist changes to the underlying content model
- */
- public static WSCDDArtifactEdit getWSCDDArtifactEditForWrite(IProject aProject) {
- WSCDDArtifactEdit artifactEdit = null;
- try {
- artifactEdit = new WSCDDArtifactEdit(aProject, false);
- } catch (IllegalArgumentException iae) {
- artifactEdit = null;
- }
- return artifactEdit;
- }
-
- /**
- * <p>
- * Returns an instance facade to manage the underlying edit model for the
- * given {@see WorkbenchComponent}. Instances of WSDDArtifactEdit that are
- * returned through this method must be {@see #dispose()}ed of when no
- * longer in use.
- * </p>
- * <p>
- * Use to acquire an WSDDArtifactEdit facade for a specific
- * {@see WorkbenchComponent} that will not be used for editing.
- * Invocations of any save*() API on an instance returned from this method
- * will throw exceptions.
- * </p>
- * <p>
- * <b>This method may return null. </b>
- * </p>
- * <p>
- * Note: This method is for internal use only. Clients should not call this
- * method.
- * </p>
- *
- * @param aModule
- * A valid {@see WorkbenchComponent} with a handle that
- * resolves to an accessible project in the workspace
- * @return An instance of WSDDArtifactEdit that may only be used to read the
- * underlying content model
- * @throws UnresolveableURIException
- * could not resolve uri.
- */
- public static WSCDDArtifactEdit getWSCDDArtifactEditForRead(IVirtualComponent aModule) {
-
- IProject project = aModule.getProject();
- ModuleCoreNature nature = ModuleCoreNature.getModuleCoreNature(project);
- if (isValidWSCDDModule(aModule))
- return new WSCDDArtifactEdit(nature, aModule, true);
- return null;
- }
-
- /**
- * <p>
- * Returns an instance facade to manage the underlying edit model for the
- * given {@see WorkbenchComponent}. Instances of EJBArtifactEdit that are
- * returned through this method must be {@see #dispose()}ed of when no
- * longer in use.
- * </p>
- * <p>
- * Use to acquire an WSDDArtifactEdit facade for a specific
- * {@see WorkbenchComponent} that will be used for editing.
- * </p>
- * <p>
- * <b>This method may return null. </b>
- * </p>
- * <p>
- * Note: This method is for internal use only. Clients should not call this
- * method.
- * </p>
- *
- * @param aModule
- * A valid {@see WorkbenchComponent} with a handle that
- * resolves to an accessible project in the workspace
- * @return An instance of WSDDArtifactEdit that may be used to modify and
- * persist changes to the underlying content model
- */
- public static WSCDDArtifactEdit getWSCDDArtifactEditForWrite(IVirtualComponent aModule) {
- IProject project = aModule.getProject();
- ModuleCoreNature nature = ModuleCoreNature.getModuleCoreNature(project);
- if (isValidWSCDDModule(aModule))
- return new WSCDDArtifactEdit(nature, aModule, false);
- return null;
- }
-
- /**
- * @param component
- * A {@see IVirtualComponent}
- * @return True if the supplied module
- * {@see ArtifactEdit#isValidEditableModule(IVirtualComponent)}and
- * the moduleTypeId is a JST module
- */
- public static boolean isValidEJBModule(IVirtualComponent aComponent) {
- return aComponent !=null && JavaEEProjectUtilities.isEJBProject(aComponent.getProject());
- }
-
- /**
- * @param component
- * A {@see IVirtualComponent}
- * @return True if the supplied module
- * {@see ArtifactEdit#isValidWSDDModule(IVirtualComponent)}and the
- * moduleTypeId is a JST module
- */
- protected static boolean isValidWSCDDModule(IVirtualComponent aComponent) {
- return (isValidAppClientModule(aComponent) || isValidWebModule(aComponent) || isValidEJBModule(aComponent));
- }
-
- /**
- * @param component
- * A {@see IVirtualComponent}
- * @return True if the supplied module
- * {@see ArtifactEdit#isValidEditableModule(IVirtualComponent)}and
- * the moduleTypeId is a JST module
- */
- public static boolean isValidWebModule(IVirtualComponent aComponent) {
- return aComponent !=null && JavaEEProjectUtilities.isDynamicWebProject(aComponent.getProject());
- }
-
- /**
- * @param component
- * A {@see IVirtualComponent}
- * @return True if the supplied module
- * {@see ArtifactEdit#isValidEditableModule(IVirtualComponent)}and
- * the moduleTypeId is a JST module
- */
- public static boolean isValidAppClientModule(IVirtualComponent aComponent) {
- return aComponent !=null && JavaEEProjectUtilities.isApplicationClientProject(aComponent.getProject());
- }
-
- /*
- * (non-Javadoc)
- *
- * @see org.eclipse.jst.j2ee.internal.modulecore.util.EnterpriseArtifactEdit#createModelRoot()
- */
- @Override
- public EObject createModelRoot() {
- return createModelRoot(getJ2EEVersion());
- }
-
- /*
- * (non-Javadoc)
- *
- * @see org.eclipse.jst.j2ee.internal.modulecore.util.EnterpriseArtifactEdit#createModelRoot(int)
- */
- @Override
- public EObject createModelRoot(int version) {
- WebServicesResource res = getWscddXmiResource();
- res.setModuleVersionID(version);
- addWebServicesClientIfNecessary(res);
- return getWebServicesClient();
- }
- @Override
- public IModelProvider create(IProject project) {
- return getWSCDDArtifactEditForRead(project);
- }
-
- @Override
- public IModelProvider create(IVirtualComponent component) {
- return getWSCDDArtifactEditForRead(component);
- }
- @Override
- public void modify(Runnable runnable, IPath modelPath) {
- setWritableEdit(getWSCDDArtifactEditForWrite(getProject()));
- try{
- runnable.run();
- if( getWritableEdit() != null ){
- // Always save regardless of resource path passed - Artifactedits save resources as a unit
- getWritableEdit().saveIfNecessary( new NullProgressMonitor() );
- }
-
- } finally { //Properly dispose the write artifact edit
- getWritableEdit().dispose();
- setWritableEdit(null);
- }
- }
- @Override
- protected boolean validProjectVersion(IProject project2) {
- return true;
- }
-}
diff --git a/plugins/org.eclipse.jst.j2ee.webservice/webservice/org/eclipse/jst/j2ee/internal/webservice/componentcore/util/WSDDArtifactEdit.java b/plugins/org.eclipse.jst.j2ee.webservice/webservice/org/eclipse/jst/j2ee/internal/webservice/componentcore/util/WSDDArtifactEdit.java
deleted file mode 100644
index 29c5d1a..0000000
--- a/plugins/org.eclipse.jst.j2ee.webservice/webservice/org/eclipse/jst/j2ee/internal/webservice/componentcore/util/WSDDArtifactEdit.java
+++ /dev/null
@@ -1,522 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2005, 2007 IBM Corporation and others.
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
- *
- * Contributors:
- * IBM Corporation - initial API and implementation
- *******************************************************************************/
-package org.eclipse.jst.j2ee.internal.webservice.componentcore.util;
-
-import java.util.ArrayList;
-import java.util.List;
-
-import org.eclipse.core.resources.IProject;
-import org.eclipse.core.resources.IResource;
-import org.eclipse.core.resources.IResourceProxy;
-import org.eclipse.core.resources.IResourceProxyVisitor;
-import org.eclipse.core.runtime.CoreException;
-import org.eclipse.core.runtime.IPath;
-import org.eclipse.core.runtime.NullProgressMonitor;
-import org.eclipse.emf.common.util.URI;
-import org.eclipse.emf.ecore.EObject;
-import org.eclipse.emf.ecore.resource.Resource;
-import org.eclipse.jem.util.emf.workbench.WorkbenchResourceHelperBase;
-import org.eclipse.jst.j2ee.componentcore.EnterpriseArtifactEdit;
-import org.eclipse.jst.j2ee.internal.J2EEConstants;
-import org.eclipse.jst.j2ee.internal.webservice.plugin.WebServicePlugin;
-import org.eclipse.jst.j2ee.internal.webservices.WSDLServiceExtManager;
-import org.eclipse.jst.j2ee.internal.webservices.WSDLServiceHelper;
-import org.eclipse.jst.j2ee.model.IModelProvider;
-import org.eclipse.jst.j2ee.project.JavaEEProjectUtilities;
-import org.eclipse.jst.j2ee.webservice.wsdd.WebServices;
-import org.eclipse.jst.j2ee.webservice.wsdd.WsddFactory;
-import org.eclipse.jst.j2ee.webservice.wsdd.WsddResource;
-import org.eclipse.wst.common.componentcore.ComponentCore;
-import org.eclipse.wst.common.componentcore.ModuleCoreNature;
-import org.eclipse.wst.common.componentcore.UnresolveableURIException;
-import org.eclipse.wst.common.componentcore.internal.ArtifactEditModel;
-import org.eclipse.wst.common.componentcore.resources.IVirtualComponent;
-import org.eclipse.wst.common.componentcore.resources.IVirtualResource;
-
-/**
- * <p>
- * WSDDArtifactEdit obtains a WS Deployment Descriptor metamodel specifec data
- * from a {@see org.eclipse.jst.j2ee.ejb.EJBResource} which stores the
- * metamodel. The {@see org.eclipse.jst.j2ee.ejb.EJBResource} is retrieved
- * from the {@see org.eclipse.wst.common.modulecore.ArtifactEditModel} using
- * a constant {@see J2EEConstants#EJBJAR_DD_URI_OBJ}. The defined methods
- * extract data or manipulate the contents of the underlying resource.
- * </p>
- */
-public class WSDDArtifactEdit extends EnterpriseArtifactEdit {
-
- /**
- * <p>
- * Identifier used to link WSDDArtifactEdit to a WsddAdapterFactory {@see
- * WsddAdapterFactory} stored in an AdapterManger (@see AdapterManager)
- * </p>
- */
-
- public static final Class ADAPTER_TYPE = WSDDArtifactEdit.class;
-
- public static final String WSIL_FILE_EXT = "wsil"; //$NON-NLS-1$
-
- public static final String WSDL_FILE_EXT = "wsdl"; //$NON-NLS-1$
-
- /**
- * @param aHandle
- * @param toAccessAsReadOnly
- * @throws IllegalArgumentException
- */
- public WSDDArtifactEdit(IProject aProject, boolean toAccessAsReadOnly) throws IllegalArgumentException {
- super(aProject, toAccessAsReadOnly);
- }
-
- /**
- * <p>
- * Creates an instance facade for the given {@see ArtifactEditModel}.
- * </p>
- *
- * @param anArtifactEditModel
- */
- public WSDDArtifactEdit(ArtifactEditModel model) {
- super(model);
- }
-
- /**
- * <p>
- * Creates an instance facade for the given {@see ArtifactEditModel}
- * </p>
- * <p>
- * Note: This method is for internal use only. Clients should not call this
- * method.
- * </p>
- *
- * @param aNature
- * A non-null {@see ModuleCoreNature}for an accessible project
- * @param aModule
- * A non-null {@see WorkbenchComponent}pointing to a module from
- * the given {@see ModuleCoreNature}
- */
- public WSDDArtifactEdit(ModuleCoreNature aNature, IVirtualComponent aModule, boolean toAccessAsReadOnly) {
- super(aNature, aModule, toAccessAsReadOnly);
- }
-
- /**
- * @return WsddResource from (@link getDeploymentDescriptorResource())
- */
-
- public WsddResource getWsddXmiResource() {
- return (WsddResource) getDeploymentDescriptorResource();
- }
-
- /**
- * <p>
- * Retrieves J2EE version information from EJBResource.
- * </p>
- *
- * @return an integer representation of a J2EE Spec version
- */
-
- @Override
- public int getJ2EEVersion() {
- return getWsddXmiResource().getJ2EEVersionID();
- }
-
- /**
- * <p>
- * Retrieves the underlying resource from the ArtifactEditModel using
- * defined URI.
- * </p>
- *
- * @return Resource
- */
-
- @Override
- public Resource getDeploymentDescriptorResource() {
- return getArtifactEditModel().getResource(getWebServicesXmlResourceURI());
- }
-
- public static void createDeploymentDescriptor(IProject project, int version) {
- EnterpriseArtifactEdit wsDDEdit = new WSDDArtifactEdit(project, false);
- try {
- wsDDEdit.createModelRoot(version);
- wsDDEdit.save(null);
- } finally { // Make sure new resource is removed - the uri used for creation shouldn't be cached
- Resource newRes = wsDDEdit.getDeploymentDescriptorResource();
- WorkbenchResourceHelperBase.getResourceSet(project).getResources().remove(newRes);
- newRes.unload();
- wsDDEdit.dispose();
- }
- }
-
- public URI getWebServicesXmlResourceURI() {
-
- URI resourceURI = J2EEConstants.WEB_SERVICES_WEB_INF_DD_URI_OBJ;
- if (isValidAppClientModule(getComponent()))
- resourceURI = J2EEConstants.WEB_SERVICES_META_INF_DD_URI_OBJ;
- else if (isValidEJBModule(getComponent()))
- resourceURI = J2EEConstants.WEB_SERVICES_META_INF_DD_URI_OBJ;
- return resourceURI;
- }
-
- /**
- * @return WebServices from (@link getDeploymentDescriptorRoot())
- */
- public WebServices getWebServices() {
- if (!getProject().isAccessible())
- return null;
- if (getWsddXmiResource().getContents().isEmpty())
- return null;
- return (WebServices) getDeploymentDescriptorRoot();
- }
-
- /**
- * <p>
- * Obtains the WebServices (@see WebServices) root object from the
- * WsddResource. If the root object does not exist, then one is created
- * (@link addEJBJarIfNecessary(getEJBJarXmiResource())). The root object
- * contains all other resource defined objects.
- * </p>
- *
- * @return EObject
- */
- @Override
- public EObject getDeploymentDescriptorRoot() {
- List contents = getDeploymentDescriptorResource().getContents();
- if (contents.size() > 0)
- return (EObject) contents.get(0);
- addWebServicesIfNecessary(getWsddXmiResource());
- if (contents.isEmpty())
- return null;
- return (EObject) contents.get(0);
- }
-
- /**
- * <p>
- * Creates a deployment descriptor root object (WebServices) and populates
- * with data. Adds the root object to the deployment descriptor resource.
- * </p>
- * <p>
- *
- * @param aModule
- * A non-null pointing to a {@see XMLResource} Note: This method
- * is typically used for JUNIT - move?
- * </p>
- */
- protected void addWebServicesIfNecessary(WsddResource aResource) {
- if (aResource != null) {
- if (aResource.getContents() == null || aResource.getContents().isEmpty()) {
- WebServices ws = WsddFactory.eINSTANCE.createWebServices();
- aResource.getContents().add(ws);
- }
- aResource.getContents().get(0);
- getArtifactEditModel().getModuleURI();
- try {
- aResource.saveIfNecessary();
- } catch (Exception e) {
- e.printStackTrace();
- }
- }
- }
-
- /**
- * <p>
- * Returns an instance facade to manage the underlying edit model for the
- * given {@see WorkbenchComponent}. Instances of ArtifactEdit that are
- * returned through this method must be {@see #dispose()}ed of when no
- * longer in use.
- * </p>
- * <p>
- * Use to acquire an ArtifactEdit facade for a specific
- * {@see WorkbenchComponent} that will not be used for editing.
- * Invocations of any save*() API on an instance returned from this method
- * will throw exceptions.
- * </p>
- * <p>
- * <b>The following method may return null. </b>
- * </p>
- *
- * @param aModule
- * A valid {@see WorkbenchComponent} with a handle that
- * resolves to an accessible project in the workspace
- * @return An instance of ArtifactEdit that may only be used to read the
- * underlying content model
- */
- public static WSDDArtifactEdit getWSDDArtifactEditForRead(IProject aProject) {
- WSDDArtifactEdit artifactEdit = null;
- IVirtualComponent comp = ComponentCore.createComponent(aProject);
- if (comp != null && isValidWSDDModule(comp)) {
- try {
- artifactEdit = new WSDDArtifactEdit(aProject, true);
- } catch (IllegalArgumentException iae) {
- artifactEdit = null;
- }
- }
- return artifactEdit;
- }
-
- /**
- * <p>
- * Returns an instance facade to manage the underlying edit model for the
- * given {@see WorkbenchComponent}. Instances of ArtifactEdit that are
- * returned through this method must be {@see #dispose()}ed of when no
- * longer in use.
- * </p>
- * <p>
- * Use to acquire an ArtifactEdit facade for a specific
- * {@see WorkbenchComponent} that will be used for editing.
- * </p>
- * <p>
- * <b>The following method may return null. </b>
- * </p>
- *
- * @param aModule
- * A valid {@see WorkbenchComponent} with a handle that
- * resolves to an accessible project in the workspace
- * @return An instance of ArtifactEdit that may be used to modify and
- * persist changes to the underlying content model
- */
- public static WSDDArtifactEdit getWSDDArtifactEditForWrite(IProject aProject) {
- WSDDArtifactEdit artifactEdit = null;
- IVirtualComponent comp = ComponentCore.createComponent(aProject);
- if (comp != null && isValidWSDDModule(comp)) {
- try {
- artifactEdit = new WSDDArtifactEdit(aProject, false);
- } catch (IllegalArgumentException iae) {
- artifactEdit = null;
- }
- }
- return artifactEdit;
- }
-
- /**
- * <p>
- * Returns an instance facade to manage the underlying edit model for the
- * given {@see WorkbenchComponent}. Instances of WSDDArtifactEdit that are
- * returned through this method must be {@see #dispose()}ed of when no
- * longer in use.
- * </p>
- * <p>
- * Use to acquire an WSDDArtifactEdit facade for a specific
- * {@see WorkbenchComponent} that will not be used for editing.
- * Invocations of any save*() API on an instance returned from this method
- * will throw exceptions.
- * </p>
- * <p>
- * <b>This method may return null. </b>
- * </p>
- * <p>
- * Note: This method is for internal use only. Clients should not call this
- * method.
- * </p>
- *
- * @param aModule
- * A valid {@see WorkbenchComponent} with a handle that
- * resolves to an accessible project in the workspace
- * @return An instance of WSDDArtifactEdit that may only be used to read the
- * underlying content model
- * @throws UnresolveableURIException
- * could not resolve uri.
- */
- public static WSDDArtifactEdit getWSDDArtifactEditForRead(IVirtualComponent aModule) {
- IProject project = aModule.getProject();
- ModuleCoreNature nature = ModuleCoreNature.getModuleCoreNature(project);
- if (isValidWSDDModule(aModule))
- return new WSDDArtifactEdit(nature, aModule, true);
- return null;
- }
-
- /**
- * <p>
- * Returns an instance facade to manage the underlying edit model for the
- * given {@see WorkbenchComponent}. Instances of EJBArtifactEdit that are
- * returned through this method must be {@see #dispose()}ed of when no
- * longer in use.
- * </p>
- * <p>
- * Use to acquire an WSDDArtifactEdit facade for a specific
- * {@see WorkbenchComponent} that will be used for editing.
- * </p>
- * <p>
- * <b>This method may return null. </b>
- * </p>
- * <p>
- * Note: This method is for internal use only. Clients should not call this
- * method.
- * </p>
- *
- * @param aModule
- * A valid {@see WorkbenchComponent} with a handle that
- * resolves to an accessible project in the workspace
- * @return An instance of WSDDArtifactEdit that may be used to modify and
- * persist changes to the underlying content model
- */
- public static WSDDArtifactEdit getWSDDArtifactEditForWrite(IVirtualComponent aModule) {
- IProject project = aModule.getProject();
- ModuleCoreNature nature = ModuleCoreNature.getModuleCoreNature(project);
- if (isValidWSDDModule(aModule))
- return new WSDDArtifactEdit(nature, aModule, false);
- return null;
- }
-
- /**
- * @param component
- * A {@see IVirtualComponent}
- * @return True if the supplied module
- * {@see ArtifactEdit#isValidEditableModule(IVirtualComponent)}and
- * the moduleTypeId is a JST module
- */
- public static boolean isValidEJBModule(IVirtualComponent aComponent) {
- return JavaEEProjectUtilities.isEJBProject(aComponent.getProject());
- }
-
- /**
- * @param component
- * A {@see IVirtualComponent}
- * @return True if the supplied module
- * {@see ArtifactEdit#isValidWSDDModule(IVirtualComponent)}and the
- * moduleTypeId is a JST module
- */
- protected static boolean isValidWSDDModule(IVirtualComponent aComponent) {
- return (isValidAppClientModule(aComponent) || isValidWebModule(aComponent) || isValidEJBModule(aComponent));
- }
-
- /**
- * @param component
- * A {@see IVirtualComponent}
- * @return True if the supplied module
- * {@see ArtifactEdit#isValidEditableModule(IVirtualComponent)}and
- * the moduleTypeId is a JST module
- */
- public static boolean isValidWebModule(IVirtualComponent aComponent) {
- return JavaEEProjectUtilities.isDynamicWebProject(aComponent.getProject());
- }
-
- /**
- * @param component
- * A {@see IVirtualComponent}
- * @return True if the supplied module
- * {@see ArtifactEdit#isValidEditableModule(IVirtualComponent)}and
- * the moduleTypeId is a JST module
- */
- public static boolean isValidAppClientModule(IVirtualComponent aComponent) {
- return JavaEEProjectUtilities.isApplicationClientProject(aComponent.getProject());
- }
-
- /*
- * (non-Javadoc)
- *
- * @see org.eclipse.jst.j2ee.internal.modulecore.util.EnterpriseArtifactEdit#createModelRoot()
- */
- @Override
- public EObject createModelRoot() {
- return createModelRoot(getJ2EEVersion());
- }
-
- /*
- * (non-Javadoc)
- *
- * @see org.eclipse.jst.j2ee.internal.modulecore.util.EnterpriseArtifactEdit#createModelRoot(int)
- */
- @Override
- public EObject createModelRoot(int version) {
- WsddResource res = (WsddResource) getDeploymentDescriptorResource();
- res.setModuleVersionID(version);
- addWebServicesIfNecessary(res);
- return getWebServices();
- }
-
- @Override
- public EObject getContentModelRoot() {
- return getWebServices();
- }
-
- public List getWSILResources() {
- final List result = new ArrayList();
-
- try {
- getProject().accept(new IResourceProxyVisitor() {
-
- public boolean visit(IResourceProxy proxy) throws CoreException {
- if(proxy.getName().endsWith(WSIL_FILE_EXT)) {
- IResource file = proxy.requestResource();
- IVirtualResource[] vResources = ComponentCore.createResources(file);
- if (vResources.length > 0 && !result.contains(file))
- result.add(file);
- }
- return true;
- }
-
- }, IResource.NONE);
- } catch (CoreException e) {
- WebServicePlugin.logError(0, e.getMessage(), e);
- }
- return result;
- }
-
- public List getWSDLResources() {
- return getResources(WSDL_FILE_EXT);
- }
-
- private List getResources(String ext) {
- List resources = getArtifactEditModel().getResources();
- List result = new ArrayList();
- for (int i = 0; i < resources.size(); i++) {
- Resource res = (Resource) resources.get(i);
- if (res != null && res.getURI().fileExtension() != null && res.getURI().fileExtension().equals(ext))
- result.add(res);
- }
- return result;
- }
-
- /**
- * return the WSDLResource if it exists, otherwise return null
- */
- public Resource getWsdlResource(String path) {
- if (path == null || path.equals(""))return null; //$NON-NLS-1$
- Resource res = null;
- try {
- res = getArtifactEditModel().getResource(URI.createURI(path));
- } catch (Exception e) {
- // Ignore
- }
- WSDLServiceHelper serviceHelper = WSDLServiceExtManager.getServiceHelper();
- if (res != null && res.isLoaded() && serviceHelper != null && serviceHelper.isWSDLResource(res))
- return res;
- return null;
- }
- @Override
- public IModelProvider create(IProject project) {
- return getWSDDArtifactEditForRead(project);
- }
-
- @Override
- public IModelProvider create(IVirtualComponent component) {
- return getWSDDArtifactEditForRead(component);
- }
-
- // [182417] This ArtifactEdit works for all project versions, so just return true.
- @Override
- protected boolean validProjectVersion(IProject project) {
- return true;
- }
- @Override
- public void modify(Runnable runnable, IPath modelPath) {
- setWritableEdit(getWSDDArtifactEditForWrite(getProject()));
- try{
- runnable.run();
- if( getWritableEdit() != null ){
- // Always save regardless of resource path passed - Artifactedits save resources as a unit
- getWritableEdit().saveIfNecessary( new NullProgressMonitor() );
- }
-
- } finally { //Properly dispose the write artifact edit
- getWritableEdit().dispose();
- setWritableEdit(null);
- }
- }
-}
diff --git a/plugins/org.eclipse.jst.j2ee.webservice/webservice/org/eclipse/jst/j2ee/internal/webservice/constants/ATKUIConstants.java b/plugins/org.eclipse.jst.j2ee.webservice/webservice/org/eclipse/jst/j2ee/internal/webservice/constants/ATKUIConstants.java
deleted file mode 100644
index 0101578..0000000
--- a/plugins/org.eclipse.jst.j2ee.webservice/webservice/org/eclipse/jst/j2ee/internal/webservice/constants/ATKUIConstants.java
+++ /dev/null
@@ -1,146 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2003, 2005 IBM Corporation and others.
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
- *
- * Contributors:
- * IBM Corporation - initial API and implementation
- *******************************************************************************/
-
-package org.eclipse.jst.j2ee.internal.webservice.constants;
-
-import org.eclipse.jem.java.JavaClass;
-import org.eclipse.jem.java.JavaRefFactory;
-import org.eclipse.jst.j2ee.internal.webservice.plugin.WebServicePlugin;
-import org.eclipse.jst.j2ee.webservice.internal.util.QNameHelper;
-import org.eclipse.jst.j2ee.webservice.wsclient.ServiceRef;
-import org.eclipse.jst.j2ee.webservice.wsclient.Webservice_clientFactory;
-import org.eclipse.jst.j2ee.webservice.wsdd.PortComponent;
-import org.eclipse.jst.j2ee.webservice.wsdd.ServiceImplBean;
-import org.eclipse.jst.j2ee.webservice.wsdd.ServletLink;
-import org.eclipse.jst.j2ee.webservice.wsdd.WSDLPort;
-import org.eclipse.jst.j2ee.webservice.wsdd.WsddFactory;
-
-
-public class ATKUIConstants {
- // init-param
- public String defaultInitParamName() {
- return new String(WebServicePlugin.getMessage("%LABEL_TABLE_NAME")); //$NON-NLS-1$
- }
-
- public String defaultInitParamValue() {
- return new String(WebServicePlugin.getMessage("%LABEL_TABLE_VALUE")); //$NON-NLS-1$
- }
-
- public String defaultDescription() {
- return new String(WebServicePlugin.getMessage("%LABEL_TABLE_DESCRIPTION")); //$NON-NLS-1$
- }
-
- // QName
- private String DEFAULT_PREFIX = "pfx"; //$NON-NLS-1$
- private String DEFAULT_NAMESPACEURI = "NamespaceURI"; //$NON-NLS-1$
- private String DEFAULT_LOCALPART = "LocalPart"; //$NON-NLS-1$
-
- public String defaultPrefix() {
- return new String(DEFAULT_PREFIX);
- }
-
- public String defaultNamespaceURI() {
- return new String(DEFAULT_NAMESPACEURI);
- }
-
- public String defaultLocalPart() {
- return new String(DEFAULT_LOCALPART);
- }
-
- // soap role
- public String defaultSOAPRole() {
- return new String(WebServicePlugin.getMessage("%LABEL_TABLE_SOAP_ROLE")); //$NON-NLS-1$
- }
-
- // port name
- public String defaultPortName() {
- return new String(WebServicePlugin.getMessage("%LABEL_TABLE_PORT_NAME")); //$NON-NLS-1$
- }
-
- //port component
- public String defaultServiceEndpointInterface() {
- return new String("java.rmi.Remote"); //$NON-NLS-1$
- }
-
-
- // port component ref
- public JavaClass defaultClientServiceEndpointInterface() {
- return JavaRefFactory.eINSTANCE.createClassRef("java.rmi.Remote"); //$NON-NLS-1$
- }
-
- public String defaultPortComponentLink() {
- return new String(WebServicePlugin.getMessage("%LABEL_TABLE_PORT_COMPONENT_LINK")); //$NON-NLS-1$
- }
-
- // service-ref
- public ServiceRef defaultServiceRef() {
- ServiceRef serviceRef = Webservice_clientFactory.eINSTANCE.createServiceRef();
- serviceRef.setServiceRefName(defaultServiceRefName());
- serviceRef.setServiceInterface(defaultServiceInterface());
- return serviceRef;
- }
-
- public String defaultServiceRefName() {
- StringBuffer sb = new StringBuffer("service/"); //$NON-NLS-1$
- sb.append(WebServicePlugin.getMessage("%_UI_ServiceRef_type")); //$NON-NLS-1$
- return sb.toString();
- }
-
- public JavaClass defaultServiceInterface() {
- return JavaRefFactory.eINSTANCE.createClassRef("javax.xml.rpc.Service"); //$NON-NLS-1$
- }
-
- // port component name
- public String defaultPortComponentName() {
- return new String(WebServicePlugin.getMessage("%_UI_PortComponent_type")); //$NON-NLS-1$
- }
-
- // service impl bean
- public ServiceImplBean defaultServiceImplBean() {
- ServiceImplBean serviceImplBean = WsddFactory.eINSTANCE.createServiceImplBean();
- serviceImplBean.setEServletLink(defaultServletLink());
- return serviceImplBean;
- }
-
- // servlet link
- public ServletLink defaultServletLink() {
- ServletLink servletLink = WsddFactory.eINSTANCE.createServletLink();
- servletLink.setServletLink(WebServicePlugin.getMessage("%LABEL_SERVLET_LINK")); //$NON-NLS-1$
- return servletLink;
- }
-
- // WSDL port
- public WSDLPort defaultWSDLPort(int versionID) {
- WSDLPort wsdlport = WsddFactory.eINSTANCE.createWSDLPort();
- QNameHelper.setQNameValue(wsdlport, defaultNamespaceURI(), defaultLocalPart(), defaultPrefix(), versionID);
- return wsdlport;
- }
-
- // port component
- public PortComponent defaultPortComponent(int versionID) {
- PortComponent portComponent = WsddFactory.eINSTANCE.createPortComponent();
- portComponent.setPortComponentName(defaultPortComponentName());
- portComponent.setWsdlPort(defaultWSDLPort(versionID));
- portComponent.setServiceEndpointInterface(defaultServiceEndpointInterface());
- portComponent.setServiceImplBean(defaultServiceImplBean());
- return portComponent;
- }
-
- // JAX RPC mapping
- public String defaultJaxRpcMappingFile() {
- return new String("jaxrpcmapping.xml"); //$NON-NLS-1$
- }
-
- // component scoped reference
- public String defaultComponentName() {
- return new String(WebServicePlugin.getMessage("%_UI_PortComponentRef_type")); //$NON-NLS-1$
- }
-}
diff --git a/plugins/org.eclipse.jst.j2ee.webservice/webservice/org/eclipse/jst/j2ee/internal/webservice/constants/InfopopConstants.java b/plugins/org.eclipse.jst.j2ee.webservice/webservice/org/eclipse/jst/j2ee/internal/webservice/constants/InfopopConstants.java
deleted file mode 100644
index f3fbbbc..0000000
--- a/plugins/org.eclipse.jst.j2ee.webservice/webservice/org/eclipse/jst/j2ee/internal/webservice/constants/InfopopConstants.java
+++ /dev/null
@@ -1,250 +0,0 @@
-/***************************************************************************************************
- * Copyright (c) 2003, 2004 IBM Corporation and others. All rights reserved. This program and the
- * accompanying materials are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
- *
- * Contributors: IBM Corporation - initial API and implementation
- **************************************************************************************************/
-
-package org.eclipse.jst.j2ee.internal.webservice.constants;
-
-
-public class InfopopConstants {
-
- public static final String PLUGIN_ID_DOC = "org.eclipse.jst.j2ee.internal.internal.webservice"; //$NON-NLS-1$
-
- /** *************************Infopops for pages************************ */
- public String getInfopopWebServicesPage() {
- return PLUGIN_ID_DOC + ".EJSRP0001"; //$NON-NLS-1$
- }
-
- public String getInfopopPortComponentPage() {
- return PLUGIN_ID_DOC + ".EJSRP0002"; //$NON-NLS-1$
- }
-
- public String getInfopopWSHandlerPage() {
- return PLUGIN_ID_DOC + ".EJSRP0003"; //$NON-NLS-1$
- }
-
- public String getInfopopServiceRefPage() {
- return PLUGIN_ID_DOC + ".EJSRP0004"; //$NON-NLS-1$
- }
-
- public String getInfopopSRHandlerPage() {
- return PLUGIN_ID_DOC + ".EJSRP0005"; //$NON-NLS-1$
- }
-
-
-
- /** *************************Infopops for sections*********************** */
- public String getInfopopDescription() {
- /* CONTEXT_ID EJSR0001 for the description text field */
- return PLUGIN_ID_DOC + "EJSR0001"; //$NON-NLS-1$
- }
-
- public String getInfopopDisplayName() {
- /* CONTEXT_ID EJSR0002 for the display name text field */
- return PLUGIN_ID_DOC + "EJSR0002"; //$NON-NLS-1$
- }
-
- public String getInfopopSmallIcon() {
- /* CONTEXT_ID EJSR0003 for the small icon display */
- return PLUGIN_ID_DOC + "EJSR0003"; //$NON-NLS-1$
- }
-
- public String getInfopopLargeIcon() {
- /* CONTEXT_ID EJSR0004 for the large icon display */
- return PLUGIN_ID_DOC + "EJSR0004"; //$NON-NLS-1$
- }
-
- public String getInfopopWebServiceDescriptionName() {
- /* CONTEXT_ID EJSR0005 for the Web service description name text field */
- return PLUGIN_ID_DOC + "EJSR0005"; //$NON-NLS-1$
- }
-
- public String getInfopopWSDLFile() {
- /* CONTEXT_ID EJSR0006 for the WSDL file location text field */
- return PLUGIN_ID_DOC + "EJSR0006"; //$NON-NLS-1$
- }
-
- public String getInfopopJAXRPCMappingFile() {
- /* CONTEXT_ID EJSR0007 for the JAX-RPC mapping file location text field */
- return PLUGIN_ID_DOC + "EJSR0007"; //$NON-NLS-1$
- }
-
- public String getInfopopPortComponentName() {
- /* CONTEXT_ID EJSR0008 for the port component name text field */
- return PLUGIN_ID_DOC + "EJSR0008"; //$NON-NLS-1$
- }
-
- public String getInfopopWSDLPortNamespaceURI() {
- /* CONTEXT_ID EJSR0009 for the WSDL port namespace URI text field */
- return PLUGIN_ID_DOC + "EJSR0009"; //$NON-NLS-1$
- }
-
- public String getInfopopWSDLPortLocalpart() {
- /* CONTEXT_ID EJSR0010 for the WSDL port local part text field */
- return PLUGIN_ID_DOC + "EJSR0010"; //$NON-NLS-1$
- }
-
- public String getInfopopServiceEndpointInterface() {
- /*
- * CONTEXT_ID EJSR0011 for the fully qualified service endpoint interface class name text
- * field
- */
- return PLUGIN_ID_DOC + "EJSR0011"; //$NON-NLS-1$
- }
-
- public String getInfopopServiceImplBean() {
- /*
- * CONTEXT_ID EJSR0012 for the fully qualified service implementation bean class name text
- * field
- */
- return PLUGIN_ID_DOC + "EJSR0012"; //$NON-NLS-1$
- }
-
- public String getInfopopEJBLink() {
- /* CONTEXT_ID EJSR0013 for the use EJB link radio button */
- return PLUGIN_ID_DOC + "EJSR0013"; //$NON-NLS-1$
- }
-
- public String getInfopopServletLink() {
- /* CONTEXT_ID EJSR0014 for the use servlet link radio button */
- return PLUGIN_ID_DOC + "EJSR0014"; //$NON-NLS-1$
- }
-
- public String getInfopopHandlerName() {
- /* CONTEXT_ID EJSR0015 for the handler name text field */
- return PLUGIN_ID_DOC + "EJSR0015"; //$NON-NLS-1$
- }
-
- public String getInfopopHandlerClass() {
- /* CONTEXT_ID EJSR0016 for the fully qualified handler class name text field */
- return PLUGIN_ID_DOC + "EJSR0016"; //$NON-NLS-1$
- }
-
- public String getInfopopServiceRefName() {
- /* CONTEXT_ID EJSR0017 for the service reference name text field */
- return PLUGIN_ID_DOC + "EJSR0017"; //$NON-NLS-1$
- }
-
- public String getInfopopServiceInterfaceName() {
- /* CONTEXT_ID EJSR0018 for the service interface name text field */
- return PLUGIN_ID_DOC + "EJSR0018"; //$NON-NLS-1$
- }
-
- public String getInfopopServiceQNameNamespaceURI() {
- /* CONTEXT_ID EJSR0019 for the service qname namspace URI text field */
- return PLUGIN_ID_DOC + "EJSR0019"; //$NON-NLS-1$
- }
-
- public String getInfopopServiceQNameLocalpart() {
- /* CONTEXT_ID EJSR0020 for the service qname local part text field */
- return PLUGIN_ID_DOC + "EJSR0020"; //$NON-NLS-1$
- }
-
- public String getInfopopComboWebServiceDescription() {
- /*
- * CONTEXT_ID EJSR0021 for the Web service description drop-down (list of Web service
- * descriptions)
- */
- return PLUGIN_ID_DOC + "EJSR0021"; //$NON-NLS-1$
- }
-
- public String getInfopopComboPortComponent() {
- /* CONTEXT_ID EJSR0022 for the port component drop-down (list of port components) */
- return PLUGIN_ID_DOC + "EJSR0022"; //$NON-NLS-1$
- }
-
- public String getInfopopComboComponentScopedRef() {
- /*
- * CONTEXT_ID EJSR0023 for the component scoped reference drop-down (list of component
- * scoped reference)
- */
- return PLUGIN_ID_DOC + "EJSR0023"; //$NON-NLS-1$
- }
-
- public String getInfopopComboServiceRef() {
- /* CONTEXT_ID EJSR0024 for the service reference drop-down (list of service references) */
- return PLUGIN_ID_DOC + "EJSR0024"; //$NON-NLS-1$
- }
-
- public String getInfopopSectionWebServiceDescription() {
- /* CONTEXT_ID EJSR0025 for the Web service description section in the webservices.xml editor */
- return PLUGIN_ID_DOC + "EJSR0025"; //$NON-NLS-1$
- }
-
- public String getInfopopSectionPortComponent() {
- /* CONTEXT_ID EJSR0026 for the port component section in the webservices.xml editor */
- return PLUGIN_ID_DOC + "EJSR0026"; //$NON-NLS-1$
- }
-
- public String getInfopopSectionHandlerWS() {
- /* CONTEXT_ID EJSR0027 for the handler section in the webservices.xml editor */
- return PLUGIN_ID_DOC + "EJSR0027"; //$NON-NLS-1$
- }
-
- public String getInfopopSectionComponentScopedRef() {
- /*
- * CONTEXT_ID EJSR0028 for the component scoped reference section in the
- * webservicesclient.xml editor
- */
- return PLUGIN_ID_DOC + "EJSR0028"; //$NON-NLS-1$
- }
-
- public String getInfopopSectionServiceRef() {
- /* CONTEXT_ID EJSR0029 for the service reference section in the webservicesclient.xml editor */
- return PLUGIN_ID_DOC + "EJSR0029"; //$NON-NLS-1$
- }
-
- public String getInfopopSectionPortComponentRef() {
- /*
- * CONTEXT_ID EJSR0030 for the port component reference section in the webservicesclient.xml
- * editor
- */
- return PLUGIN_ID_DOC + "EJSR0030"; //$NON-NLS-1$
- }
-
- public String getInfopopSectionHandlerWSC() {
- /* CONTEXT_ID EJSR0031 for the handler section in the webservicesclient.xml editor */
- return PLUGIN_ID_DOC + "EJSR0031"; //$NON-NLS-1$
- }
-
- public String getInfopopSectionInitParams() {
- /*
- * CONTEXT_ID EJSR0032 for the initial parameter section in both webservices.xml and
- * webservicesclient.xml editor
- */
- return PLUGIN_ID_DOC + "EJSR0032"; //$NON-NLS-1$
- }
-
- public String getInfopopSectionSOAPHeaders() {
- /*
- * CONTEXT_ID EJSR0033 for the SOAP header section in both webservices.xml and
- * webservicesclient.xml editor
- */
- return PLUGIN_ID_DOC + "EJSR0033"; //$NON-NLS-1$
- }
-
- public String getInfopopSectionSOAPRoles() {
- /*
- * CONTEXT_ID EJSR0034 for the SOAP role section in both webservices.xml and
- * webservicesclient.xml editor
- */
- return PLUGIN_ID_DOC + "EJSR0034"; //$NON-NLS-1$
- }
-
- public String getInfopopSectionPortNames() {
- /* CONTEXT_ID EJSR0035 for the port name section in the webservicesclient.xml editor */
- return PLUGIN_ID_DOC + "EJSR0035"; //$NON-NLS-1$
- }
-
- public String getInfopopResourceTree() {
- /*
- * CONTEXT_ID EJSR0036 for the popup dialog that allows the user to select a resource in the
- * workbench
- */
- return PLUGIN_ID_DOC + "EJSR0036"; //$NON-NLS-1$
- }
-}
\ No newline at end of file
diff --git a/plugins/org.eclipse.jst.j2ee.webservice/webservice/org/eclipse/jst/j2ee/internal/webservice/helper/WSDLHelper.java b/plugins/org.eclipse.jst.j2ee.webservice/webservice/org/eclipse/jst/j2ee/internal/webservice/helper/WSDLHelper.java
deleted file mode 100644
index d05b17c..0000000
--- a/plugins/org.eclipse.jst.j2ee.webservice/webservice/org/eclipse/jst/j2ee/internal/webservice/helper/WSDLHelper.java
+++ /dev/null
@@ -1,358 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2003, 2005 IBM Corporation and others.
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
- *
- * Contributors:
- * IBM Corporation - initial API and implementation
- *******************************************************************************/
-
-package org.eclipse.jst.j2ee.internal.webservice.helper;
-
-import java.net.MalformedURLException;
-import java.util.ArrayList;
-import java.util.Iterator;
-import java.util.Map;
-
-import org.eclipse.core.resources.IFile;
-import org.eclipse.core.resources.IProject;
-import org.eclipse.jst.j2ee.common.QName;
-import org.eclipse.jst.j2ee.internal.webservices.WSDLServiceExtManager;
-import org.eclipse.jst.j2ee.internal.webservices.WSDLServiceHelper;
-import org.eclipse.jst.j2ee.webservice.wsclient.ComponentScopedRefs;
-import org.eclipse.jst.j2ee.webservice.wsclient.ServiceRef;
-import org.eclipse.jst.j2ee.webservice.wsclient.WebServicesClient;
-import org.eclipse.wst.common.componentcore.ComponentCore;
-import org.eclipse.wst.common.componentcore.resources.IVirtualComponent;
-import org.eclipse.wst.common.componentcore.resources.IVirtualFolder;
-
-/**
- * This class contains methods to help navigate WSDL files provided in various JSR-109 descriptors
- */
-public class WSDLHelper {
-
- private IProject proj;
-
- public WSDLHelper(IProject aProject) {
- this.proj = aProject;
- }
-
- /**
- * This method returns the list of wsdl:port@name's contained in the WSDL file referred to by
- * the specified <service-ref>
- *
- * @param serviceRefName
- * The name of the <service-ref>
- * @param compScopedRefName
- * The name of the <component-scoped-refs>
- * @param wsc
- * The root object of the webservicesclient.xml descriptor
- * @param exclude
- * port names to exclude in the returned array
- * @return String[] An array of wsdl:port@names's. null is returned if there are any problems
- * with navigating the webservicesclient.xml or the WSDL.
- */
- public String[] getPortNames(String serviceRefName, String compScopedRefName, WebServicesClient wsc, String[] exclude) {
- ServiceRef sr = getServiceRef(serviceRefName, compScopedRefName, wsc);
- if (sr == null)
- return null;
-
- String wsdlURL = getWSDLFileURL(sr);
- if (wsdlURL.length() == 0)
- return null;
-
- String serviceLocalName = getServiceQname(sr);
- String[] portNames = getPortNames(wsdlURL, serviceLocalName);
- portNames = trim(portNames, exclude);
- return portNames;
-
- }
-
- /**
- * This method returns the namespace of the wsdl:service in WSDL file referred to by the
- * specified <service-ref>
- *
- * @param serviceRefName
- * The name of the <service-ref>
- * @param compScopedRefName
- * The name of the <component-scoped-refs>
- * @param wsc
- * The root object of the webservicesclient.xml descriptor
- * @param exclude
- * port names to exclude in the returned array
- * @return String The namespace of the wsdl:service. null is returned if there are any problems
- * with navigating the webservicesclient.xml or the WSDL.
- */
- public String getPortNamespace(String serviceRefName, String compScopedRefName, WebServicesClient wsc) {
- ServiceRef sr = getServiceRef(serviceRefName, compScopedRefName, wsc);
- if (sr == null)
- return null;
-
- String wsdlURL = getWSDLFileURL(sr);
- if (wsdlURL.length() == 0)
- return ""; //$NON-NLS-1$
-
- String serviceLocalName = getServiceQname(sr);
- String namespace = getPortNamespace(wsdlURL, serviceLocalName);
- return namespace;
- }
-
- /**
- * This method returns the list of wsdl:port@name's contained in the specified wsdl:service in
- * the specified WSDL file.
- *
- * @param wsdlURL
- * The URL of the WSDL file.
- * @param serviceLocalName
- * The local name of the wsdl:service to look in.
- * @return String[] An array of wsdl:port@name's. Null is returned a wsdl:service with the
- * specified local name could not be found.
- */
- private String[] getPortNames(String wsdlURL, String serviceLocalName) {
- WSDLServiceHelper serviceHelper = WSDLServiceExtManager.getServiceHelper();
- Object targetService = getTargetService(wsdlURL, serviceLocalName);
-
- if (targetService == null) {
- //System.out.println("getPortNames ... targetService null.");
- return null;
- }
-
- Map ports = serviceHelper.getServicePorts(targetService);
- int numberOfPorts = ports.size();
- String[] portNames = new String[numberOfPorts];
- Iterator k = ports.values().iterator();
- for (int m = 0; m < numberOfPorts; m++) {
- Object port = k.next();
- portNames[m] = serviceHelper.getPortName(port);
- }
-
- return portNames;
- }
-
- /**
- * This method returns the namespace of the specified wsdl:service in the specified WSDL file.
- *
- * @param wsdlURL
- * The URL of the WSDL file.
- * @param serviceLocalName
- * The local name of the wsdl:service to look in.
- * @return String[] An array of wsdl:port@name's. An empty String is returned if a wsdl:service
- * with the specified local name could not be found.
- */
- private String getPortNamespace(String wsdlURL, String serviceLocalName) {
- Object targetService = getTargetService(wsdlURL, serviceLocalName);
-
- if (targetService == null) {
- //System.out.println("getPortNamespace ... targetService null.");
- return ""; //$NON-NLS-1$
- }
-
- return WSDLServiceExtManager.getServiceHelper().getServiceNamespaceURI(targetService);
- }
-
- private Object getTargetService(String wsdlURL, String serviceLocalName) {
- WSDLServiceHelper serviceHelper = WSDLServiceExtManager.getServiceHelper();
- Object definition = getWSDLDefinition(wsdlURL);
- if (definition == null) {
- return null;
- }
-
- Object targetService = null;
- Map services = serviceHelper.getDefinitionServices(definition);
- if (!services.isEmpty()) {
- if ((serviceLocalName == null || serviceLocalName.length() == 0) && services.size() > 1) //Multiple
- // services
- // without
- // one
- // designated
- // is
- // an
- // error
- {
- return null;
- }
-
- if ((serviceLocalName == null || serviceLocalName.length() == 0) && services.size() == 1) {
- //Return the port names in the one service
- Iterator i = services.values().iterator();
- targetService = i.next();
- } else //There are multiple services but one is designated
- {
- Iterator j = services.values().iterator();
- while (j.hasNext()) {
- Object service = j.next();
- String serviceName = serviceHelper.getServiceLocalPart(service);
- if (serviceName.equals(serviceLocalName)) {
- targetService = service;
- break; //Found a match. Break out of loop. We must be assuming unique names
- // on services.
- }
- }
- }
- }
-
- return targetService;
-
- }
-
-
- private Object getWSDLDefinition(String wsdlURL) {
- WSDLServiceHelper serviceHelper = WSDLServiceExtManager.getServiceHelper();
- return serviceHelper.getWSDLDefinition(wsdlURL);
-
- /*try {
- WSDLResourceImpl res = (WSDLResourceImpl) WorkbenchResourceHelperBase.getResource(URI.createURI(wsdlURL), true);
- if (res == null)
- return null;
- return res.getDefinition();
- } catch (Exception wsdle) {
- return null;
- }*/
- }
-
- /**
- * Returns the file URL of the <wsdl-file>specified in the given <service-ref>. Returns a blank
- * String if <wsdl-file>is not specified in the provided <service-ref>
- */
- private String getWSDLFileURL(ServiceRef sr) {
- String wsdlFileRelPath = sr.getWsdlFile();
- if (wsdlFileRelPath == null || wsdlFileRelPath.length() == 0)
- return ""; //$NON-NLS-1$
-
- // Get a handle on the WSDL file.
- IVirtualComponent component = ComponentCore.createComponent(proj);
- if (component != null) {
- IVirtualFolder moduleRoot = component.getRootFolder().getFolder("/"); //$NON-NLS-1$
- IFile wsdlFile = moduleRoot.getFile(wsdlFileRelPath).getUnderlyingFile();
- if (!wsdlFile.exists()) {
- return ""; //$NON-NLS-1$
- }
- //Get the fileURL from wsdlFile
- String wsdlURL;
- try {
- wsdlURL = wsdlFile.getLocation().toFile().toURL().toString();
- } catch (MalformedURLException murle) {
- return ""; //$NON-NLS-1$
- }
-
- if (wsdlURL == null || wsdlURL.length() == 0)
- return ""; //$NON-NLS-1$
- return wsdlURL;
- }
- return ""; //$NON-NLS-1$
- }
-
- /**
- * Returns the local part of the <service-qname>specified in the given <service-ref>. Returns a
- * blank String if <service-qname>is not specified in the provided <service-ref>
- */
- private String getServiceQname(ServiceRef sr) {
- QName serviceQname = sr.getServiceQname();
- if (serviceQname == null)
- return ""; //$NON-NLS-1$
-
- String serviceLocalName = serviceQname.getLocalPart();
- if (serviceLocalName == null)
- return ""; //$NON-NLS-1$
-
- return serviceLocalName;
- }
-
- /* If compScopedRefName is empty or null, we may have to check all of them. */
- public ServiceRef getServiceRef(String name, String compScopedRefName, WebServicesClient wsc) {
- Iterator serviceRefs;
- if (compScopedRefName != null && compScopedRefName.length() > 0) {
- ComponentScopedRefs csr = getCompScopedRef(compScopedRefName, wsc);
- serviceRefs = csr.getServiceRefs().iterator();
- } else {
- serviceRefs = wsc.getServiceRefs().iterator();
- //If there are no service refs ... check all component-scoped-refs for the service-ref
- if (!serviceRefs.hasNext()) {
- Iterator csRefs = wsc.getComponentScopedRefs().iterator();
-
- while (csRefs.hasNext()) {
- ComponentScopedRefs csr = (ComponentScopedRefs) csRefs.next();
- Iterator srs = csr.getServiceRefs().iterator();
- while (srs.hasNext()) {
- ServiceRef sr = (ServiceRef) srs.next();
- String thisName = sr.getServiceRefName();
- if (thisName.equals(name)) {
- return sr;
- }
- }
- }
-
- return null; //Could not find it in any of the component-scoped-refs
- }
-
- }
-
- while (serviceRefs.hasNext()) {
- ServiceRef serviceRef = (ServiceRef) serviceRefs.next();
- String serviceRefName = serviceRef.getServiceRefName();
- if (serviceRefName.equals(name))
- return serviceRef;
- }
- return null;
- }
-
-
- private ComponentScopedRefs getCompScopedRef(String name, WebServicesClient wsc) {
- Iterator compScopedRefs = wsc.getComponentScopedRefs().iterator();
- while (compScopedRefs.hasNext()) {
- ComponentScopedRefs compScopedRef = (ComponentScopedRefs) compScopedRefs.next();
- String compScopedRefName = compScopedRef.getComponentName();
- if (compScopedRefName.equals(name))
- return compScopedRef;
- }
- return null;
-
- }
-
-
- private String[] trim(String[] values, String[] exclude) {
- if (values == null || values.length == 0 || exclude == null || exclude.length == 0) //no
- // change
- // required.
- // return
- // as
- // is.
- return values;
-
- String[] finalValues;
- ArrayList finalList = new ArrayList();
- for (int i = 0; i < values.length; i++) {
- if (!contains(exclude, values[i])) {
- finalList.add(values[i]);
- }
- }
-
- int finalSize = finalList.size();
- finalValues = new String[finalSize];
- Object[] finalArray = finalList.toArray();
- for (int j = 0; j < finalSize; j++) {
- finalValues[j] = (String) (finalArray[j]);
- }
-
- return finalValues;
-
- }
-
- /**
- * Returns true if the array of String's contains the specified String. False otherwise.
- */
- private boolean contains(String[] values, String s) {
- if (values == null)
- return false;
-
- for (int i = 0; i < values.length; i++) {
- if (values[i].equals(s))
- return true;
- }
-
- return false;
- }
-
-}
diff --git a/plugins/org.eclipse.jst.j2ee.webservice/webservice/org/eclipse/jst/j2ee/internal/webservice/helper/WSDLServiceHelperImpl.java b/plugins/org.eclipse.jst.j2ee.webservice/webservice/org/eclipse/jst/j2ee/internal/webservice/helper/WSDLServiceHelperImpl.java
deleted file mode 100644
index df42d7c..0000000
--- a/plugins/org.eclipse.jst.j2ee.webservice/webservice/org/eclipse/jst/j2ee/internal/webservice/helper/WSDLServiceHelperImpl.java
+++ /dev/null
@@ -1,207 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2005 IBM Corporation and others.
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
- *
- * Contributors:
- * IBM Corporation - initial API and implementation
- *******************************************************************************/
-/*
- * Created on Feb 21, 2005
- *
- * TODO To change the template for this generated file go to
- * Window - Preferences - Java - Code Style - Code Templates
- */
-package org.eclipse.jst.j2ee.internal.webservice.helper;
-
-import java.util.ArrayList;
-import java.util.Collections;
-import java.util.Iterator;
-import java.util.List;
-import java.util.Map;
-
-import org.eclipse.core.resources.IFile;
-import org.eclipse.emf.common.util.URI;
-import org.eclipse.emf.ecore.EObject;
-import org.eclipse.emf.ecore.resource.Resource;
-import org.eclipse.jem.util.emf.workbench.WorkbenchResourceHelperBase;
-import org.eclipse.jst.j2ee.client.ApplicationClient;
-import org.eclipse.jst.j2ee.ejb.EnterpriseBean;
-import org.eclipse.jst.j2ee.internal.webservices.WSDLServiceHelper;
-import org.eclipse.jst.j2ee.webapplication.WebApp;
-import org.eclipse.wst.ws.internal.parser.wsil.WebServiceEntity;
-import org.eclipse.wst.ws.internal.parser.wsil.WebServicesParser;
-import org.eclipse.wst.wsdl.Definition;
-import org.eclipse.wst.wsdl.Port;
-import org.eclipse.wst.wsdl.Service;
-import org.eclipse.wst.wsdl.util.WSDLResourceImpl;
-
-/**
- * @author cbridgha
- *
- * TODO To change the template for this generated type comment go to
- * Window - Preferences - Java - Code Style - Code Templates
- */
-public class WSDLServiceHelperImpl implements WSDLServiceHelper {
-
- /**
- *
- */
- public WSDLServiceHelperImpl() {
- super();
- }
-
-
- /* (non-Javadoc)
- * @see org.eclipse.jst.j2ee.internal.webservices.WSDLServiceHelper#getPortName(java.lang.Object)
- */
- public String getPortName(Object port) {
- Port aPort = (Port)port;
- return aPort.getName();
- }
-
- /* (non-Javadoc)
- * @see org.eclipse.jst.j2ee.internal.webservices.WSDLServiceHelper#getServicePorts(java.lang.Object)
- */
- public Map getServicePorts(Object aService) {
- Service service =(Service)aService;
- return service.getPorts();
- }
-
- /* (non-Javadoc)
- * @see org.eclipse.jst.j2ee.internal.webservices.WSDLServiceHelper#getServiceNamespaceURI(java.lang.Object)
- */
- public String getServiceNamespaceURI(Object aService) {
- Service service =(Service)aService;
- return service.getQName().getNamespaceURI();
- }
-
- /* (non-Javadoc)
- * @see org.eclipse.jst.j2ee.internal.webservices.WSDLServiceHelper#getServiceDefinitionLocation(org.eclipse.emf.ecore.EObject)
- */
- public Object getServiceDefinitionLocation(EObject aService) {
- Service service =(Service)aService;
- return service.getEnclosingDefinition().getLocation();
- }
-
- /* (non-Javadoc)
- * @see org.eclipse.jst.j2ee.internal.webservices.WSDLServiceHelper#getPortBindingNamespaceURI(java.lang.Object)
- */
- public String getPortBindingNamespaceURI(Object aPort) {
- Port port = (Port)aPort;
- return port.getBinding().getQName().getNamespaceURI();
- }
-
- /* (non-Javadoc)
- * @see org.eclipse.jst.j2ee.internal.webservices.WSDLServiceHelper#getServiceLocalPart(java.lang.Object)
- */
- public String getServiceLocalPart(Object aService) {
- Service service =(Service)aService;
- return service.getQName().getLocalPart();
- }
-
- /* (non-Javadoc)
- * @see org.eclipse.jst.j2ee.internal.webservices.WSDLServiceHelper#getServiceQName(java.lang.Object)
- */
- public Object getServiceQName(Object aService) {
- Service service =(Service)aService;
- return service.getQName();
- }
-
- /* (non-Javadoc)
- * @see org.eclipse.jst.j2ee.internal.webservices.WSDLServiceHelper#getDefinitionServices(java.lang.Object)
- */
- public Map getDefinitionServices(Object aDefinition) {
- Definition definition =(Definition)aDefinition;
- return definition.getServices();
- }
-
- /* (non-Javadoc)
- * @see org.eclipse.jst.j2ee.internal.webservices.WSDLServiceHelper#getWSDLDefinition(java.lang.String)
- */
- public Object getWSDLDefinition(String wsdlURL) {
- try {
- WSDLResourceImpl res = (WSDLResourceImpl) WorkbenchResourceHelperBase.getResource(URI.createURI(wsdlURL), true);
- if (res == null)
- return null;
- return res.getDefinition();
- } catch (Exception wsdle) {
- return null;
- }
- }
-
- /* (non-Javadoc)
- * @see org.eclipse.jst.j2ee.internal.webservices.WSDLServiceHelper#getWSDLDefinition(org.eclipse.emf.ecore.resource.Resource)
- */
- public Object getWSDLDefinition(Resource wsdlResource) {
- return ((WSDLResourceImpl)wsdlResource).getDefinition();
- }
-
- /* (non-Javadoc)
- * @see org.eclipse.jst.j2ee.internal.webservices.WSDLServiceHelper#getWsdlServicesFromWsilFile(org.eclipse.core.resources.IFile)
- */
- public List getWsdlServicesFromWsilFile(IFile wsil) {
- List result = new ArrayList();
- WebServiceEntity entity = parseWsilFile(wsil);
- if (entity != null && entity.getType() == WebServiceEntity.TYPE_WSIL) {
- // get all the WSDL references from the WSIL entity
- List wsdlList = entity.getChildren();
- for (Iterator it = wsdlList.iterator(); it.hasNext();) {
- Object item = it.next();
- if (item != null && item instanceof WebServiceEntity) {
- if (((WebServiceEntity) item).getModel() != null && ((WebServiceEntity) item).getModel() instanceof Definition) {
- Definition def = (Definition) ((WebServiceEntity) item).getModel();
- if (def != null && !def.getServices().isEmpty())
- result.addAll(def.getServices().values());
- }
- }
- }
- }
- return result;
- }
- public WebServiceEntity parseWsilFile(IFile wsil) {
- WebServicesParser parser = null;
- String url = null;
- // verify proper input
- if (wsil == null || !wsil.getFileExtension().equals(WSIL_EXT))
- return null;
- // Parse wsil file to get wsdl services
- try {
- url = wsil.getLocation().toFile().toURL().toString();
- parser = new WebServicesParser(url);
- parser.parse(WebServicesParser.PARSE_WSIL | WebServicesParser.PARSE_WSDL);
- } catch (Exception e) {
- //Ignore
- }
- if (parser == null)
- return null;
- return parser.getWebServiceEntityByURI(url);
-}
-
- public boolean isService(Object aService) {
-
- return aService instanceof Service;
- }
- public boolean isWSDLResource(Object aResource) {
-
- return aResource instanceof WSDLResourceImpl;
- }
- public boolean isDefinition(Object aDefinition) {
-
- return aDefinition instanceof Definition;
- }
-
-
- public List get13ServiceRefs(EObject j2eeObject) {
- if (j2eeObject instanceof ApplicationClient)
- return WebServicesManager.getInstance().get13ServiceRefs((ApplicationClient)j2eeObject);
- else if (j2eeObject instanceof EnterpriseBean)
- return WebServicesManager.getInstance().get13ServiceRefs((EnterpriseBean)j2eeObject);
- else if (j2eeObject instanceof WebApp)
- return WebServicesManager.getInstance().get13ServiceRefs((WebApp)j2eeObject);
- else
- return Collections.EMPTY_LIST;
- }
-}
diff --git a/plugins/org.eclipse.jst.j2ee.webservice/webservice/org/eclipse/jst/j2ee/internal/webservice/helper/WebServiceEvent.java b/plugins/org.eclipse.jst.j2ee.webservice/webservice/org/eclipse/jst/j2ee/internal/webservice/helper/WebServiceEvent.java
deleted file mode 100644
index da53338..0000000
--- a/plugins/org.eclipse.jst.j2ee.webservice/webservice/org/eclipse/jst/j2ee/internal/webservice/helper/WebServiceEvent.java
+++ /dev/null
@@ -1,29 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2005, 2006 IBM Corporation and others.
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
- *
- * Contributors:
- * IBM Corporation - initial API and implementation
- *******************************************************************************/
-package org.eclipse.jst.j2ee.internal.webservice.helper;
-
-public class WebServiceEvent {
-
- public static final int REFRESH = 1;
- public static final int REMOVE = 0;
-
- private int eventType = 0;
-
- public WebServiceEvent(int anEventType) {
- super();
- eventType = anEventType;
- }
-
- public int getEventType() {
- return eventType;
- }
-
-}
diff --git a/plugins/org.eclipse.jst.j2ee.webservice/webservice/org/eclipse/jst/j2ee/internal/webservice/helper/WebServiceManagerListener.java b/plugins/org.eclipse.jst.j2ee.webservice/webservice/org/eclipse/jst/j2ee/internal/webservice/helper/WebServiceManagerListener.java
deleted file mode 100644
index e1dcaee..0000000
--- a/plugins/org.eclipse.jst.j2ee.webservice/webservice/org/eclipse/jst/j2ee/internal/webservice/helper/WebServiceManagerListener.java
+++ /dev/null
@@ -1,16 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2005 IBM Corporation and others.
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
- *
- * Contributors:
- * IBM Corporation - initial API and implementation
- *******************************************************************************/
-package org.eclipse.jst.j2ee.internal.webservice.helper;
-
-public interface WebServiceManagerListener {
-
- public void webServiceManagerChanged(WebServiceEvent anEvent);
-}
diff --git a/plugins/org.eclipse.jst.j2ee.webservice/webservice/org/eclipse/jst/j2ee/internal/webservice/helper/WebServiceManagerNLS.java b/plugins/org.eclipse.jst.j2ee.webservice/webservice/org/eclipse/jst/j2ee/internal/webservice/helper/WebServiceManagerNLS.java
deleted file mode 100644
index 5b0ad0c..0000000
--- a/plugins/org.eclipse.jst.j2ee.webservice/webservice/org/eclipse/jst/j2ee/internal/webservice/helper/WebServiceManagerNLS.java
+++ /dev/null
@@ -1,14 +0,0 @@
-package org.eclipse.jst.j2ee.internal.webservice.helper;
-
-import org.eclipse.osgi.util.NLS;
-
-public class WebServiceManagerNLS extends NLS {
-
- public static final String BUNDLE_NAME = "org.eclipse.jst.j2ee.internal.webservice.helper.messages"; //$NON-NLS-1$
- public static String WebServicesManager_Loading_Webservice_;
-
- static {
- NLS.initializeMessages(BUNDLE_NAME, WebServiceManagerNLS.class);
- }
-
-}
diff --git a/plugins/org.eclipse.jst.j2ee.webservice/webservice/org/eclipse/jst/j2ee/internal/webservice/helper/WebServicesManager.java b/plugins/org.eclipse.jst.j2ee.webservice/webservice/org/eclipse/jst/j2ee/internal/webservice/helper/WebServicesManager.java
deleted file mode 100644
index 54649e9..0000000
--- a/plugins/org.eclipse.jst.j2ee.webservice/webservice/org/eclipse/jst/j2ee/internal/webservice/helper/WebServicesManager.java
+++ /dev/null
@@ -1,1070 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2003, 2007 IBM Corporation and others.
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
- *
- * Contributors:
- * IBM Corporation - initial API and implementation
- *******************************************************************************/
-/*
- * Created on Feb 9, 2004
- *
- * To change the template for this generated file go to
- * Window - Preferences - Java - Code Generation - Code and Comments
- */
-
-
-
-package org.eclipse.jst.j2ee.internal.webservice.helper;
-
-import java.util.ArrayList;
-import java.util.Collection;
-import java.util.Collections;
-import java.util.HashMap;
-import java.util.HashSet;
-import java.util.Iterator;
-import java.util.List;
-import java.util.Map;
-import java.util.Set;
-
-import org.eclipse.core.resources.IFile;
-import org.eclipse.core.resources.IProject;
-import org.eclipse.core.resources.IResource;
-import org.eclipse.core.resources.IResourceChangeEvent;
-import org.eclipse.core.resources.IResourceChangeListener;
-import org.eclipse.core.resources.IResourceDelta;
-import org.eclipse.core.resources.IResourceDeltaVisitor;
-import org.eclipse.core.resources.ResourcesPlugin;
-import org.eclipse.core.runtime.CoreException;
-import org.eclipse.core.runtime.IProgressMonitor;
-import org.eclipse.core.runtime.IStatus;
-import org.eclipse.core.runtime.Status;
-import org.eclipse.core.runtime.jobs.Job;
-import org.eclipse.emf.common.util.URI;
-import org.eclipse.emf.ecore.EObject;
-import org.eclipse.emf.ecore.resource.Resource;
-import org.eclipse.jem.util.emf.workbench.ProjectUtilities;
-import org.eclipse.jem.util.emf.workbench.WorkbenchResourceHelperBase;
-import org.eclipse.jem.util.logger.proxy.Logger;
-import org.eclipse.jst.j2ee.client.ApplicationClient;
-import org.eclipse.jst.j2ee.client.ApplicationClientResource;
-import org.eclipse.jst.j2ee.ejb.EJBJar;
-import org.eclipse.jst.j2ee.ejb.EJBResource;
-import org.eclipse.jst.j2ee.ejb.EnterpriseBean;
-import org.eclipse.jst.j2ee.internal.J2EEConstants;
-import org.eclipse.jst.j2ee.internal.J2EEVersionConstants;
-import org.eclipse.jst.j2ee.internal.common.J2EEVersionUtil;
-import org.eclipse.jst.j2ee.internal.common.XMLResource;
-import org.eclipse.jst.j2ee.internal.project.J2EEProjectUtilities;
-import org.eclipse.jst.j2ee.internal.webservice.componentcore.util.WSCDDArtifactEdit;
-import org.eclipse.jst.j2ee.internal.webservice.componentcore.util.WSDDArtifactEdit;
-import org.eclipse.jst.j2ee.internal.webservices.WSDLServiceExtManager;
-import org.eclipse.jst.j2ee.internal.webservices.WSDLServiceHelper;
-import org.eclipse.jst.j2ee.project.JavaEEProjectUtilities;
-import org.eclipse.jst.j2ee.webapplication.WebApp;
-import org.eclipse.jst.j2ee.webapplication.WebAppResource;
-import org.eclipse.jst.j2ee.webservice.wsclient.ComponentScopedRefs;
-import org.eclipse.jst.j2ee.webservice.wsclient.ServiceRef;
-import org.eclipse.jst.j2ee.webservice.wsclient.WebServicesClient;
-import org.eclipse.jst.j2ee.webservice.wsclient.WebServicesResource;
-import org.eclipse.jst.j2ee.webservice.wsdd.PortComponent;
-import org.eclipse.jst.j2ee.webservice.wsdd.ServiceImplBean;
-import org.eclipse.jst.j2ee.webservice.wsdd.WebServiceDescription;
-import org.eclipse.jst.j2ee.webservice.wsdd.WebServices;
-import org.eclipse.jst.j2ee.webservice.wsdd.WsddResource;
-import org.eclipse.wst.common.componentcore.ArtifactEdit;
-import org.eclipse.wst.common.componentcore.ComponentCore;
-import org.eclipse.wst.common.componentcore.ModuleCoreNature;
-import org.eclipse.wst.common.componentcore.internal.ArtifactEditModel;
-import org.eclipse.wst.common.componentcore.internal.util.IModuleConstants;
-import org.eclipse.wst.common.componentcore.resources.IVirtualComponent;
-import org.eclipse.wst.common.componentcore.resources.IVirtualResource;
-import org.eclipse.wst.common.internal.emfworkbench.WorkbenchResourceHelper;
-import org.eclipse.wst.common.internal.emfworkbench.integration.EditModelEvent;
-import org.eclipse.wst.common.internal.emfworkbench.integration.EditModelListener;
-
-/**
- * Internal API class
- *
- * This utility class is meant to aid in managing webservice(jsr109) metadata related to Java EE 1.4 or earlier, and will not be upgraded beyond this release.
- * The WTP webservices team has duplicate public api for gathering serviceRef's etc.
- *
- * Marking as @frozen to support <= Java EE 1.4
- *
- */
-public class WebServicesManager implements EditModelListener, IResourceChangeListener, IResourceDeltaVisitor {
-
- private HashMap wsArtifactEdits = new HashMap();
- private HashMap wsClientArtifactEdits = new HashMap();
- private List wsArtifactEditsList;
- private List wsClientArtifactEditsList;
- private static WebServicesManager INSTANCE = null;
- private List listeners;
- private List removedListeners = new ArrayList();
- private boolean isNotifying = false;
- private boolean wsClientElementsChanged = true;
- private boolean wsElementsChanged = true;
- private ProcessProjectsWithWSDL processNewProjects;
-
- public static final String WSDL_EXT = "wsdl"; //$NON-NLS-1$
- public static final String WSIL_EXT = "wsil"; //$NON-NLS-1$
-
- public synchronized static WebServicesManager getInstance() {
- if (INSTANCE == null)
- INSTANCE = new WebServicesManager();
- return INSTANCE;
- }
-
- public static boolean isFileInteresting(IFile aFile) {
- if (aFile != null && aFile.getFileExtension() != null) {
- String extension = aFile.getFileExtension();
- return extension.equals(WSDL_EXT) || extension.equals(WSIL_EXT)
- || aFile.getName().equals(J2EEConstants.WEB_SERVICES_CLIENT_SHORTNAME)
- || aFile.getName().equals(J2EEConstants.WEB_SERVICES_DD_URI);
- }
- return false;
- }
- /**
- * Default Constructor
- */
- public WebServicesManager() {
- super();
- init();
- }
-
- private void init() {
- collectArtifactEdits();
- ResourcesPlugin.getWorkspace().addResourceChangeListener(this, IResourceChangeEvent.POST_CHANGE);
- }
-
- private void addArtifactEdit(IProject handle) {
- synchronized(wsArtifactEdits) {
- if (!wsArtifactEdits.containsKey(handle)) {
- WSDDArtifactEdit edit = WSDDArtifactEdit.getWSDDArtifactEditForRead(handle);
- if (edit != null) {
- WebServices webServices = edit.getWebServices();
- // If the project has a webservice.xml with internal services or
- // it has .wsil files with external services, we cache the artifact edit
- if ((webServices != null && !webServices.getWebServiceDescriptions().isEmpty()) || !edit.getWSILResources().isEmpty()) {
- edit.addListener(this);
- wsArtifactEdits.put(handle, edit);
- wsElementsChanged = true;
- // Otherwise, dispose the artifact edit
- } else {
- edit.dispose();
- }
- }
- }
- }
- synchronized (wsClientArtifactEdits) {
- if (!wsClientArtifactEdits.containsKey(handle)) {
- WSCDDArtifactEdit edit = WSCDDArtifactEdit.getWSCDDArtifactEditForRead(handle);
- if (edit != null) {
- WebServicesResource res = edit.getWscddXmiResource();
- boolean isInterested = false;
- // Does the project have 1.3 web service clients?
- if (res != null && res.isLoaded() && res.getWebServicesClient() != null)
- isInterested = true;
-
- // Does the project have 1.4 web service clients?
- List wsClientEdits = new ArrayList();
- wsClientEdits.add(edit);
- //if (!getWorkspace14ServiceRefs(wsClientEdits).isEmpty())
- isInterested = true;
-
- // If project has 1.3 or 1.4 web service clients, cache the artifact edit
- if (isInterested) {
- edit.addListener(this);
- wsClientArtifactEdits.put(handle, edit);
- wsClientElementsChanged = true;
- // Otherwise, dispose the artifact edit
- } else {
- edit.dispose();
- }
- }
- }
- }
- }
-
- private void removeArtifactEdit(IProject handle) {
- synchronized(wsArtifactEdits) {
- if (wsArtifactEdits.containsKey(handle)) {
- ArtifactEdit edit = (ArtifactEdit) wsArtifactEdits.get(handle);
- if (edit != null) {
- wsArtifactEdits.remove(handle);
- edit.removeListener(this);
- edit.dispose();
- wsElementsChanged = true;
- }
- }
- }
- synchronized (wsClientArtifactEdits) {
- if (wsClientArtifactEdits.containsKey(handle)) {
- ArtifactEdit edit = (ArtifactEdit) wsClientArtifactEdits.get(handle);
- if (edit != null) {
- wsClientArtifactEdits.remove(handle);
- edit.removeListener(this);
- edit.dispose();
- wsClientElementsChanged = true;
- }
- }
- }
- }
-
- private void collectArtifactEdits() {
- IProject[] projects = ResourcesPlugin.getWorkspace().getRoot().getProjects();
- for (int i = 0; i < projects.length; i++) {
- IProject project = projects[i];
- IVirtualComponent component = ComponentCore.createComponent(project);
- try {
- if (!ModuleCoreNature.isFlexibleProject(project) || JavaEEProjectUtilities.isEARProject(project) || JavaEEProjectUtilities.isStaticWebProject(project))
- continue;
- } catch (Exception e) {
- continue;
- }
- addArtifactEdit(component.getProject());
- }
- }
-
- /**
- * @return Returns the artifact edit iterator for web service artifact edits
- */
- private List getWSArtifactEdits() {
- synchronized (wsArtifactEdits) {
- if (wsElementsChanged) {
- wsArtifactEditsList = new ArrayList();
- wsArtifactEditsList.addAll(wsArtifactEdits.values());
- wsElementsChanged = false;
- }
- }
- return wsArtifactEditsList;
- }
-
- /**
- * @return Returns the editModels.
- */
- private List getWSClientArtifactEdits() {
- synchronized (wsClientArtifactEdits) {
- if (wsClientElementsChanged) {
- wsClientArtifactEditsList = new ArrayList();
- wsClientArtifactEditsList.addAll(wsClientArtifactEdits.values());
- wsClientElementsChanged = false;
- }
- }
- return wsClientArtifactEditsList;
- }
-
- private List getListeners() {
- if (listeners == null)
- listeners = new ArrayList();
- return listeners;
- }
-
- /**
- * Add aListener to the list of listeners.
- */
- public void addListener(WebServiceManagerListener aListener) {
- if (aListener != null && !getListeners().contains(aListener))
- getListeners().add(aListener);
- }
-
- /*
- * (non-Javadoc)
- *
- * @see org.eclipse.wst.common.internal.emfworkbench.integration.EditModelListener#editModelChanged(org.eclipse.wst.common.internal.emfworkbench.integration.EditModelEvent)
- */
- public void editModelChanged(EditModelEvent anEvent) {
- if (anEvent == null)
- return;
- if (anEvent.getEventCode()==EditModelEvent.UNLOADED_RESOURCE) {
- List resources = anEvent.getChangedResources();
- for (int i=0; i<resources.size(); i++) {
- Resource res = (Resource) resources.get(i);
- if (isInterestedInResource(res))
- notifyListeners(anEvent.getEventCode());
- }
- }
- else if (anEvent.getEventCode() == EditModelEvent.PRE_DISPOSE) {
- ArtifactEditModel editModel = (ArtifactEditModel) anEvent.getEditModel();
- if (editModel == null || editModel.getProject() == null)
- return;
- removeArtifactEdit(editModel.getProject());
- notifyListeners(anEvent.getEventCode());
- }
- }
-
-
- /**
- * Notify listeners of
- *
- * @anEvent.
- */
- protected void notifyListeners(int anEventType) {
- if (listeners == null)
- return;
- synchronized (this) {
- isNotifying = true;
- }
- try {
- WebServiceEvent webServiceEvent = null;
-
- switch (anEventType) {
- case EditModelEvent.UNLOADED_RESOURCE:
- case EditModelEvent.PRE_DISPOSE:
- case EditModelEvent.REMOVED_RESOURCE:
- webServiceEvent = new WebServiceEvent(WebServiceEvent.REMOVE);
- break;
- default:
- if (!getAllWorkspaceServiceRefs().isEmpty() || !getAllWSDLServices().isEmpty())
- webServiceEvent = new WebServiceEvent(WebServiceEvent.REFRESH);
- }
- List list = getListeners();
- if (webServiceEvent!=null) {
- for (int i = 0; i < list.size(); i++) {
- ((WebServiceManagerListener) list.get(i)).webServiceManagerChanged(webServiceEvent);
- }
- }
- } finally {
- synchronized (this) {
- isNotifying = false;
- if (removedListeners != null && !removedListeners.isEmpty()) {
- for (int i = 0; i < removedListeners.size(); i++)
- listeners.remove(removedListeners.get(i));
- removedListeners.clear();
- }
- }
- }
- }
-
- /**
- * Remove aListener from the list of listeners.
- */
- public synchronized boolean removeListener(WebServiceManagerListener aListener) {
- if (aListener != null) {
- if (isNotifying)
- return removedListeners.add(aListener);
- return getListeners().remove(aListener);
- }
- return false;
- }
-
- private void releaseArtifactEdits() {
- synchronized (wsArtifactEdits) {
- Iterator iter = wsArtifactEdits.values().iterator();
- while (iter.hasNext()) {
- WSDDArtifactEdit artifactEdit = (WSDDArtifactEdit) iter.next();
- artifactEdit.removeListener(this);
- artifactEdit.dispose();
- }
- wsArtifactEdits.clear();
- }
-
- synchronized (wsClientArtifactEdits) {
- Iterator iter = wsClientArtifactEdits.values().iterator();
- while (iter.hasNext()) {
- WSCDDArtifactEdit artifactEdit = (WSCDDArtifactEdit) iter.next();
- artifactEdit.removeListener(this);
- artifactEdit.dispose();
- }
- wsClientArtifactEdits.clear();
- }
- }
-
- /*
- * (non-Javadoc)
- *
- * @see org.eclipse.core.resources.IResourceChangeListener#resourceChanged(org.eclipse.core.resources.IResourceChangeEvent)
- */
- public void resourceChanged(IResourceChangeEvent event) {
- acceptDelta(event);
- }
-
-
- protected void acceptDelta(IResourceChangeEvent event) {
- IResourceDelta delta = event.getDelta();
- // search for changes to any projects using a visitor
- if (delta != null) {
- try {
- delta.accept(this);
-
- } catch (Exception e) {
- Logger.getLogger().logError(e);
- }
- }
- }
-
- /**
- * returns a list of internal web services descriptions in the workspace
- */
- public List getInternalWebServicesDescriptions() {
- List result = new ArrayList();
- List webServices = getInternalWebServices();
- for (int i = 0; i < webServices.size(); i++) {
- WebServices webService = (WebServices) webServices.get(i);
- if (webService != null)
- result.addAll(webService.getWebServiceDescriptions());
- }
- return result;
- }
-
- /**
- * @return all internal web services instances in workspace
- */
- public List getInternalWebServices() {
- List result = new ArrayList();
- Iterator iter = getWSArtifactEdits().iterator();
- while (iter.hasNext()) {
- WSDDArtifactEdit artifactEdit = (WSDDArtifactEdit) iter.next();
- WebServices webServices = artifactEdit.getWebServices();
- if (webServices != null)
- result.add(webServices);
- }
- return result;
- }
-
- /**
- * returns a list of all the internal wsdl services in wsdl's pointed to by wsdd's
- */
- public List getInternalWSDLServices() {
- return getWSDLServicesFromWSDLResources(getInternalWSDLResources());
- }
-
- public List getInternalWSDLResources() {
- List result = new ArrayList();
- List wsddWebServices = getInternalWebServicesDescriptions();
- for (int i = 0; i < wsddWebServices.size(); i++) {
- WebServiceDescription webServices = (WebServiceDescription) wsddWebServices.get(i);
- Resource wsdl = getWSDLResource(webServices);
- if (wsdl != null && !result.contains(wsdl))
- result.add(wsdl);
- }
- return result;
- }
-
- public List getExternalWSDLResources() {
- //TODO fix up for basis off .wsil
- List result = getWorkspaceWSDLResources();
- result.removeAll(getInternalWSDLResources());
- List serviceRefs = getAllWorkspaceServiceRefs();
- for (int i=0; i<serviceRefs.size(); i++) {
- ServiceRef ref = (ServiceRef) serviceRefs.get(i);
- try {
- Resource res = WorkbenchResourceHelperBase.getResource(URI.createURI(ref.getWsdlFile()), true);
- if (res !=null && result.contains(res))
- result.remove(res);
- } catch (Exception e) {
- //Ignore
- }
- }
- return result;
- }
-
- public boolean isServiceInternal(EObject service) {
- return getInternalWSDLResources().contains(getWSDLResource(service));
- }
-
- private List getWSDLServicesFromWSDLResources(List wsdlResources) {
- List result = new ArrayList();
- for (int i = 0; i < wsdlResources.size(); i++) {
- Resource wsdl = (Resource) wsdlResources.get(i);
- List services = getWSDLServices(wsdl);
- if (wsdl != null && services != null && !services.isEmpty())
- result.addAll(services);
- }
- return result;
- }
-
- public List getExternalWSDLServices() {
- List result = getWsdlServicesFromWorkspaceWSILs();
- result.removeAll(getInternalWSDLServices());
- return result;
- }
-
- public List getWsdlServicesFromWorkspaceWSILs() {
- List result = new ArrayList();
- List wsilFiles = getWorkspaceWSILFiles();
- for (int i = 0; i < wsilFiles.size(); i++) {
- IFile wsil = (IFile) wsilFiles.get(i);
- List services = getWsdlServicesFromWsilFile(wsil);
- if (!services.isEmpty())
- result.addAll(services);
- }
- return result;
- }
-
- public List getWsdlServicesFromWsilFile(IFile wsil) {
- WSDLServiceHelper serviceHelper = WSDLServiceExtManager.getServiceHelper();
- return serviceHelper.getWsdlServicesFromWsilFile(wsil);
- }
-
- /**
- * Returns all WSDL Services, both internal and external
- */
- public List getAllWSDLServices() {
- List result = new ArrayList();
- result.addAll(getInternalWSDLServices());
- result.addAll(getExternalWSDLServices());
- return result;
- }
-
- protected void dispose() {
- ResourcesPlugin.getWorkspace().removeResourceChangeListener(this);
- releaseArtifactEdits();
- INSTANCE = null;
- }
-
- public Resource getWSDLResource(WebServiceDescription webService) {
- if (webService == null)
- return null;
- String wsdlFileName = webService.getWsdlFile();
- Resource res = null;
- IVirtualResource[] resources = ComponentCore.createResources(WorkbenchResourceHelper.getFile(webService));
- if (resources == null || resources.length==0) return res;
- WSDDArtifactEdit artifactEdit = getExistingWSDDArtifactEdit(resources[0].getComponent().getProject());
- if (artifactEdit!=null)
- res = artifactEdit.getWsdlResource(wsdlFileName);
- return res;
- }
-
- private WSDDArtifactEdit getExistingWSDDArtifactEdit(IProject project) {
- List wsEdits = getWSArtifactEdits();
- for (int i=0; i<wsEdits.size(); i++) {
- WSDDArtifactEdit edit = (WSDDArtifactEdit) wsEdits.get(i);
- if (edit !=null && edit.getProject()!= null && edit.getProject().equals(project))
- return edit;
- }
- return null;
- }
-
- private WSCDDArtifactEdit getExistingWSCDDArtifactEdit(IProject project) {
- List wsClientEdits = getWSClientArtifactEdits();
- for (int i=0; i<wsClientEdits.size(); i++) {
- WSCDDArtifactEdit edit = (WSCDDArtifactEdit) wsClientEdits.get(i);
- if (edit !=null && edit.getProject()!= null && edit.getProject().equals(project))
- return edit;
- }
- return null;
- }
-
- public List getWSDLServices(Resource wsdl) {
- WSDLServiceHelper serviceHelper = WSDLServiceExtManager.getServiceHelper();
- List result = new ArrayList();
- Object def = serviceHelper.getWSDLDefinition(wsdl);
- if (def == null)
- return result;
- result = new ArrayList(serviceHelper.getDefinitionServices(def).values());
- return result;
- }
-
- public EObject getWSDLServiceForWebService(WebServiceDescription webService) {
- EObject service = null;
- WSDLServiceHelper serviceHelper = WSDLServiceExtManager.getServiceHelper();
- Resource wsdl = getWSDLResource(webService);
- if (wsdl == null) return service;
- Object definition = serviceHelper.getWSDLDefinition(wsdl);
- if (definition == null) return service;
- Map services = serviceHelper.getDefinitionServices(definition);
- if (services.isEmpty()) return service;
- PortComponent portComp = null;
- if (webService.getPortComponents()!=null && webService.getPortComponents().size()>0) {
- portComp = (PortComponent) webService.getPortComponents().get(0);
- return getService(portComp);
- }
- return service;
- }
-
- public Resource getWSDLResource(EObject wsdlService) {
- return wsdlService.eResource();
- }
-
- public EObject getService(PortComponent port) {
- List services = getInternalWSDLServices();
- WSDLServiceHelper serviceHelper = WSDLServiceExtManager.getServiceHelper();
- for (int i = 0; i < services.size(); i++) {
- EObject service = (EObject)services.get(i);
- if (serviceHelper.getServicePorts(service).size() == 1) {
- Object wsdlPort = serviceHelper.getServicePorts(service).values().toArray()[0];
- String qName = serviceHelper.getPortBindingNamespaceURI(wsdlPort);
- if (port.getWsdlPort().getNamespaceURI().equals(qName))
- return service;
- }
- }
- return null;
- }
-
- public PortComponent getPortComponent(String qName) {
- List wsDescs = getInternalWebServicesDescriptions();
- for (int i = 0; i < wsDescs.size(); i++) {
- WebServiceDescription wsDesc = (WebServiceDescription) wsDescs.get(i);
- List ports = wsDesc.getPortComponents();
- for (int j = 0; j < ports.size(); j++) {
- PortComponent portComp = (PortComponent) ports.get(j);
- if (portComp.getWsdlPort().getNamespaceURI().equals(qName))
- return portComp;
- }
- }
- return null;
- }
-
- public PortComponent getPortComponent(String qName, IProject project) {
- List wsDescs = getInternalWebServicesDescriptions();
- for (int i = 0; i < wsDescs.size(); i++) {
- WebServiceDescription wsDesc = (WebServiceDescription) wsDescs.get(i);
- List ports = wsDesc.getPortComponents();
- for (int j = 0; j < ports.size(); j++) {
- PortComponent portComp = (PortComponent) ports.get(j);
- if (project == ProjectUtilities.getProject(portComp))
- return portComp;
- }
- }
- return null;
- }
-
- public PortComponent getPortComponent(EObject wsdlService) {
- // If there is only one port in the wsdl service, find the matching port component
- // otherwise if multiple ports return null because we need more information
- WSDLServiceHelper serviceHelper = WSDLServiceExtManager.getServiceHelper();
- if (wsdlService == null || serviceHelper.getServicePorts(wsdlService).isEmpty())
- return null;
- if (serviceHelper.getServicePorts(wsdlService).size() > 0) {
- Object port = serviceHelper.getServicePorts(wsdlService).values().toArray()[0];
- String qName = serviceHelper.getPortBindingNamespaceURI(port);
- return getPortComponent(qName, ProjectUtilities.getProject(wsdlService));
- }
- return null;
- }
-
- public ServiceImplBean getServiceImplBean(EObject wsdlService) {
- PortComponent port = getPortComponent(wsdlService);
- if (port == null)
- return null;
- return port.getServiceImplBean();
- }
-
- public WsddResource getWsddResource(EObject wsdlService) {
- PortComponent port = getPortComponent(wsdlService);
- if (port == null)
- return null;
- return (WsddResource) port.eResource();
- }
-
- public String getServiceEndpointInterface(EObject wsdlService) {
- PortComponent port = getPortComponent(wsdlService);
- if (port == null)
- return null;
- return port.getServiceEndpointInterface();
- }
-
- public List getAllWorkspaceServiceRefs() {
- List result = new ArrayList();
- result.addAll(getWorkspace13ServiceRefs());
- result.addAll(getWorkspace14ServiceRefs());
- return result;
- }
-
- public List getWorkspace13ServiceRefs() {
- List result = new ArrayList();
- Iterator iter = getWSClientArtifactEdits().iterator();
- while (iter.hasNext()) {
- WSCDDArtifactEdit artifactEdit = (WSCDDArtifactEdit) iter.next();
- WebServicesResource res = artifactEdit.getWscddXmiResource();
- if (res != null && res.isLoaded() && res.getWebServicesClient() != null) {
- if (JavaEEProjectUtilities.isEJBProject(artifactEdit.getProject())) {
- List scopedBeans = res.getWebServicesClient().getComponentScopedRefs();
- for (Iterator iterator = scopedBeans.iterator(); iterator.hasNext();) {
- ComponentScopedRefs refBean = (ComponentScopedRefs) iterator.next();
- result.addAll(refBean.getServiceRefs());
- }
- } else result.addAll(res.getWebServicesClient().getServiceRefs());
- }
- }
- return result;
- }
-
- public List get13ServiceRefs(IProject handle) {
- List result = new ArrayList();
- WSCDDArtifactEdit wsClientArtifactEdit = getExistingWSCDDArtifactEdit(handle);
- if (wsClientArtifactEdit !=null) {
- WebServicesResource res = wsClientArtifactEdit.getWscddXmiResource();
- if (res != null && res.isLoaded() && res.getWebServicesClient() != null)
- result.addAll(res.getWebServicesClient().getServiceRefs());
- }
- return result;
- }
-
- public List getWorkspace14ServiceRefs() {
- return getWorkspace14ServiceRefs(getWSClientArtifactEdits());
- }
-
- private List getWorkspace14ServiceRefs(List wsClientArtifactEdits) {
- Iterator iter = wsClientArtifactEdits.iterator();
- List result = new ArrayList();
- while (iter.hasNext()) {
- WSCDDArtifactEdit wscArtifactEdit = (WSCDDArtifactEdit) iter.next();
-
- IProject project = wscArtifactEdit.getProject();
-
- String projectType = J2EEProjectUtilities.getJ2EEProjectType(project);
- String projectVersion = J2EEProjectUtilities.getJ2EEProjectVersion(project);
- int j2eeLevel = 0;
- if(IModuleConstants.JST_EJB_MODULE.equals(projectType)){
- j2eeLevel = J2EEVersionUtil.convertEJBVersionStringToJ2EEVersionID(projectVersion);
- } else if(IModuleConstants.JST_WEB_MODULE.equals(projectType)){
- j2eeLevel = J2EEVersionUtil.convertWebVersionStringToJ2EEVersionID(projectVersion);
- } else if(IModuleConstants.JST_APPCLIENT_MODULE.equals(projectType)){
- j2eeLevel = J2EEVersionUtil.convertAppClientVersionStringToJ2EEVersionID(projectVersion);
- }
-
- // this method needs to check that project's j2ee level is 14
- if(j2eeLevel != J2EEVersionConstants.J2EE_1_4_ID)
- continue;
-
- ArtifactEdit artifactEdit = ArtifactEdit.getArtifactEditForRead(project);
- try {
- EObject rootObject = null;
- if (artifactEdit!=null)
- rootObject = artifactEdit.getContentModelRoot();
- // handle EJB project case
- if (rootObject instanceof EJBJar) {
- List cmps = ((EJBJar) rootObject).getEnterpriseBeans();
- for (int j = 0; j < cmps.size(); j++) {
- EnterpriseBean bean = (EnterpriseBean) cmps.get(j);
- if (bean.getServiceRefs() != null && !bean.getServiceRefs().isEmpty())
- result.addAll(bean.getServiceRefs());
- }
- }
- // handle Web Project
- else if (rootObject instanceof WebApp) {
- if (((WebApp) rootObject).getServiceRefs() != null && !((WebApp) rootObject).getServiceRefs().isEmpty())
- result.addAll(((WebApp) rootObject).getServiceRefs());
- }
- // handle App clients
- else if (rootObject instanceof ApplicationClient) {
- if (((ApplicationClient) rootObject).getServiceRefs() != null && !((ApplicationClient) rootObject).getServiceRefs().isEmpty())
- result.addAll(((ApplicationClient) rootObject).getServiceRefs());
- }
- } finally {
- if (artifactEdit != null)
- artifactEdit.dispose();
- }
- }
- return result;
- }
-
- public boolean isJ2EE14(ServiceRef ref) {
- return !(ref.eContainer() instanceof WebServicesClient);
- }
-
- public List getWorkspaceWSILFiles() {
- List result = new ArrayList();
- Iterator iter = getWSArtifactEdits().iterator();
- while (iter.hasNext()) {
- WSDDArtifactEdit artifactEdit = (WSDDArtifactEdit) iter.next();
- List files = artifactEdit.getWSILResources();
- for (int j = 0; j < files.size(); j++) {
- IFile file = (IFile) files.get(j);
- if (file != null && WSIL_EXT.equals(file.getFileExtension()))
- result.add(file);
- }
- }
- return result;
- }
-
- public List getWorkspaceWSDLResources() {
- List result = new ArrayList();
- Iterator iter = getWSArtifactEdits().iterator();
- while (iter.hasNext()) {
- WSDDArtifactEdit artifactEdit = (WSDDArtifactEdit) iter.next();
- IProject project = artifactEdit.getProject();
- if (project != null) {
- List wsdlResources = artifactEdit.getWSDLResources();
- if (wsdlResources != null && !wsdlResources.isEmpty()) {
- for (int j = 0; j < wsdlResources.size(); j++) {
- Resource wsdl = (Resource) wsdlResources.get(j);
- if (!result.contains(wsdl))
- result.add(wsdl);
- }
- }
- }
- }
- return result;
- }
-
- public List getWSDLServices() {
- List result = new ArrayList();
- List internalWsdls = getInternalWSDLServices();
- if (internalWsdls != null && !internalWsdls.isEmpty())
- result.addAll(internalWsdls);
- //TODO add externals
- return result;
- }
-
- /**
- * @param bean
- * @return
- */
- public List get13ServiceRefs(EnterpriseBean bean) {
- WSCDDArtifactEdit artifactEdit = null;
- IFile file = WorkbenchResourceHelper.getFile(bean);
- if (file!=null)
- artifactEdit = getExistingWSCDDArtifactEdit(file.getProject());
- if (artifactEdit !=null) {
- WebServicesResource res = artifactEdit.getWscddXmiResource();
- if (res != null && res.getWebServicesClient() != null) {
- String ejbName = bean.getName();
- List scopes = res.getWebServicesClient().getComponentScopedRefs();
- for (Iterator iter = scopes.iterator(); iter.hasNext();) {
- ComponentScopedRefs scope = (ComponentScopedRefs) iter.next();
- if (scope.getComponentName().equals(ejbName))
- return scope.getServiceRefs();
- }
- }
- }
- return Collections.EMPTY_LIST;
- }
-
- /**
- * @param client
- * @return
- */
- public List get13ServiceRefs(ApplicationClient client) {
- IProject handle = getComponentProject(WorkbenchResourceHelper.getFile(client));
- if (handle == null)
- return Collections.EMPTY_LIST;
- WSCDDArtifactEdit artifactEdit = getExistingWSCDDArtifactEdit(handle);
- if (artifactEdit !=null) {
- WebServicesResource res = artifactEdit.getWscddXmiResource();
- if (res != null) {
- WebServicesClient webClient = res.getWebServicesClient();
- if (webClient != null)
- return webClient.getServiceRefs();
- }
- }
- return Collections.EMPTY_LIST;
- }
-
- /**
- * @param webapp
- * @return
- */
- public List get13ServiceRefs(WebApp webapp) {
- IProject handle = getComponentProject(WorkbenchResourceHelper.getFile(webapp));
- if (handle == null)
- return Collections.EMPTY_LIST;
- WSCDDArtifactEdit artifactEdit = getExistingWSCDDArtifactEdit(handle);
- if (artifactEdit !=null) {
- WebServicesResource res = artifactEdit.getWscddXmiResource();
- if (res != null) {
- WebServicesClient webClient = res.getWebServicesClient();
- if (webClient != null)
- return webClient.getServiceRefs();
- }
- }
- return Collections.EMPTY_LIST;
- }
-
- /*
- * (non-Javadoc)
- *
- * @see org.eclipse.core.resources.IResourceDeltaVisitor#visit(org.eclipse.core.resources.IResourceDelta)
- */
- public boolean visit(IResourceDelta delta) throws CoreException {
- IResource resource = delta.getResource();
- if (resource.getType() == IResource.PROJECT) {
- IProject p = (IProject) resource;
- // Handle project adds and project opens
- if ((delta.getKind()==IResourceDelta.ADDED || (((delta.getFlags() & IResourceDelta.OPEN) != 0) && p.isAccessible()))) {
- IVirtualComponent component = ComponentCore.createComponent(p);
- if (component!=null && !JavaEEProjectUtilities.isEARProject(p) && !JavaEEProjectUtilities.isStaticWebProject(p)) {
- getQueuedJob().addProject(p);
- return false;
- }
- }
- // Handle project close events and removals
- else if ((delta.getKind() == IResourceDelta.CHANGED && ((delta.getFlags() & IResourceDelta.OPEN) != 0))
- || (delta.getKind() == IResourceDelta.REMOVED)){
- removeArtifactEdit(p);
- return false;
- }
- }
-
- else if (resource.getType() == IResource.FILE && isInterrestedInFile((IFile) resource)) {
- // Handle WSIL and WSDL File additions as well as webservice.xml and webserviceclient.xml
- if ((delta.getKind() == IResourceDelta.ADDED) || ((delta.getFlags() & IResourceDelta.MOVED_TO) != 0)) {
- if (resource.getFileExtension().equals(WSDL_EXT))
- addedWsdl((IFile) resource);
- else if (resource.getFileExtension().equals(WSIL_EXT))
- addedWsil((IFile)resource);
- else if (resource.getName().equals(J2EEConstants.WEB_SERVICES_CLIENT_SHORTNAME) ||
- resource.getName().equals(J2EEConstants.WEB_SERVICES_DD_URI)) {
- getQueuedJob().addProject(resource.getProject());
- }
- }
- // Handle WSIL or WSDL file removals
- else if ((delta.getKind() == IResourceDelta.REMOVED) || ((delta.getFlags() & IResourceDelta.MOVED_FROM) != 0)) {
- if (resource.getFileExtension().equals(WSDL_EXT) || resource.getFileExtension().equals(WSIL_EXT))
- notifyListeners(EditModelEvent.UNLOADED_RESOURCE);
- }
- return false;
- }
- return true;
- }
-
- private ProcessProjectsWithWSDL createProjectsJob() {
- Set newSet = new HashSet();
- ProcessProjectsWithWSDL job = new ProcessProjectsWithWSDL(newSet, EditModelEvent.ADDED_RESOURCE);
- job.setRule(ResourcesPlugin.getWorkspace().getRoot());
- job.setSystem(true);
- return job;
- }
-
- private ProcessProjectsWithWSDL getQueuedJob() {
-
- if (processNewProjects != null && (processNewProjects.getState() == Job.WAITING)){
- return processNewProjects;
- }
- processNewProjects = createProjectsJob();
- processNewProjects.schedule();
- return processNewProjects;
- }
-
- private class ProcessProjectsWithWSDL extends Job
- {
- private Set currentProjects;
- private int eventType;
-
- public ProcessProjectsWithWSDL(Set p, int newEventType)
- {
- super(WebServiceManagerNLS.WebServicesManager_Loading_Webservice_);
- currentProjects = p;
- eventType = newEventType;
- }
-
- public void addProject(IProject p) {
- synchronized(currentProjects) {
- currentProjects.add(p);
- }
- }
-
- @Override
- protected IStatus run(IProgressMonitor monitor) {
- // Null out job for processing new projects
- synchronized (processNewProjects) {
- if(processNewProjects == this){
- processNewProjects = null;
- }
- }
- for (Iterator iterator = currentProjects.iterator(); iterator.hasNext();) {
- IProject currentProject = (IProject) iterator.next();
- addArtifactEdit(currentProject);
- }
- notifyListeners(eventType);
-
- return Status.OK_STATUS;
- }
- }
-
- protected void addedWsdl(IFile wsdl) {
- if (!wsdl.exists())
- return;
- IProject handle = getComponentProject(wsdl);
- if (handle != null) {
- addArtifactEdit(handle);
- notifyListeners(EditModelEvent.LOADED_RESOURCE);
- }
- }
-
- protected void addedWsil(IFile wsil) {
- if (!wsil.exists())
- return;
- IProject handle = getComponentProject(wsil);
- if (handle != null) {
- addArtifactEdit(handle);
- notifyListeners(EditModelEvent.LOADED_RESOURCE);
- }
- }
-
- private IProject getComponentProject(IFile res) {
- if (res==null)
- return null;
- return res.getProject();
- }
-
- protected boolean isInterrestedInFile(IFile aFile) {
- return isFileInteresting(aFile);
- }
-
- /**
- * The only resources webservice manager is concerned about are:
- * webservice.xml, webserviceclient.xml, and J2EE 1.4 web.xml, ejb-jar-xml, and application-client.xml
- * @param res
- * @return boolean isInterested
- */
- private boolean isInterestedInResource(Resource res) {
- if (res instanceof WsddResource || res instanceof WebServicesResource) {
- return true;
- } else if (res instanceof EJBResource || res instanceof WebAppResource || res instanceof ApplicationClientResource) {
- return ((XMLResource)res).getJ2EEVersionID()>J2EEVersionConstants.J2EE_1_3_ID;
- } else {
- return false;
- }
- }
-
- /**
- * @param object
- * @return
- */
- public Collection getServiceRefs(EJBJar jar) {
-
- List list = new ArrayList();
- List beans = jar.getEnterpriseBeans();
- try {
- for (int i = 0; i < beans.size(); i++) {
- EnterpriseBean bean = (EnterpriseBean) beans.get(i);
- list.addAll(getServiceRefs(bean));
- }
- } catch (Exception e) {
- //Ignore
- }
- return list;
- }
-
- public Collection getServiceRefs(EnterpriseBean bean) {
- List list = new ArrayList();
- if (bean.getEjbJar().getJ2EEVersionID() >= J2EEVersionConstants.J2EE_1_4_ID)
- list.addAll(bean.getServiceRefs());
- else
- list.addAll(get13ServiceRefs(bean));
- return list;
- }
-
- public Collection getServiceRefs(WebApp webapp) {
-
- List list = new ArrayList();
- try {
- if (webapp.getVersionID() >= J2EEVersionConstants.WEB_2_4_ID)
- list.addAll(webapp.getServiceRefs());
- else
- list.addAll(get13ServiceRefs(webapp));
- } catch (Exception e) {
- //Ignore
- }
- return list;
- }
-
- public Collection getServiceRefs(ApplicationClient client) {
-
- List list = new ArrayList();
- try {
- if (client.getJ2EEVersionID() >= J2EEVersionConstants.J2EE_1_4_ID)
- list.addAll(client.getServiceRefs());
- else
- list.addAll(get13ServiceRefs(client));
- } catch (Exception e) {
- //Ignore
- }
- return list;
- }
-}
diff --git a/plugins/org.eclipse.jst.j2ee.webservice/webservice/org/eclipse/jst/j2ee/internal/webservice/helper/messages.properties b/plugins/org.eclipse.jst.j2ee.webservice/webservice/org/eclipse/jst/j2ee/internal/webservice/helper/messages.properties
deleted file mode 100644
index 5e8d870..0000000
--- a/plugins/org.eclipse.jst.j2ee.webservice/webservice/org/eclipse/jst/j2ee/internal/webservice/helper/messages.properties
+++ /dev/null
@@ -1 +0,0 @@
-WebServicesManager_Loading_Webservice_=Loading Webservices
diff --git a/plugins/org.eclipse.jst.j2ee.webservice/webservice/org/eclipse/jst/j2ee/internal/webservice/plugin/WebServicePlugin.java b/plugins/org.eclipse.jst.j2ee.webservice/webservice/org/eclipse/jst/j2ee/internal/webservice/plugin/WebServicePlugin.java
deleted file mode 100644
index 549e7f8..0000000
--- a/plugins/org.eclipse.jst.j2ee.webservice/webservice/org/eclipse/jst/j2ee/internal/webservice/plugin/WebServicePlugin.java
+++ /dev/null
@@ -1,317 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2003, 2006 IBM Corporation and others.
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
- *
- * Contributors:
- * IBM Corporation - initial API and implementation
- *******************************************************************************/
-/*
- * Created on Jan 28, 2004
- *
- * To change the template for this generated file go to
- * Window - Preferences - Java - Code Generation - Code and Comments
- */
-package org.eclipse.jst.j2ee.internal.webservice.plugin;
-
-import java.net.MalformedURLException;
-import java.net.URL;
-import java.text.MessageFormat;
-
-import org.eclipse.core.runtime.CoreException;
-import org.eclipse.core.runtime.IStatus;
-import org.eclipse.core.runtime.Platform;
-import org.eclipse.core.runtime.Status;
-import org.eclipse.emf.common.util.ResourceLocator;
-import org.eclipse.jface.resource.ImageDescriptor;
-import org.eclipse.wst.common.frameworks.internal.WTPPlugin;
-import org.osgi.framework.BundleContext;
-import java.lang.Throwable;
-
-
-/**
- * @author jlanuti
- *
- * To change the template for this generated type comment go to Window - Preferences - Java - Code
- * Generation - Code and Comments
- */
-public class WebServicePlugin extends WTPPlugin implements ResourceLocator {
-
-
- /**
- * The reference to the singleton instance of this plugin.
- */
- private static WebServicePlugin singleton;
-
- //the ID for this plugin (added automatically by logging quickfix)
- public static final String PLUGIN_ID = "org.eclipse.jst.j2ee.webservice"; //$NON-NLS-1$
-
- /**
- * @param descriptor
- */
- public WebServicePlugin() {
- super();
- if (singleton == null)
- singleton = this;
-
- }
-
- /*
- * (non-Javadoc)
- *
- * @see org.eclipse.wst.common.frameworks.internal.WTPPlugin#getPluginID()
- */
- @Override
- public String getPluginID() {
- return PLUGIN_ID;
- }
-
- /**
- * Returns an image descriptor for the named resource as relative to the plugin install
- * location.
- *
- * @return An image descriptor, possibly null.
- */
- public static ImageDescriptor getImageDescriptor(String name) {
- try {
- URL installURL = getInstance().getBundle().getEntry("/"); //$NON-NLS-1$
- URL imageURL = new URL(installURL, name);
- return ImageDescriptor.createFromURL(imageURL);
- } catch (MalformedURLException e) {
- return null;
- }
- }
-
- /**
- * Returns the singleton instance of this plugin. Equivalent to calling
- * (ATKUIPlugin)Platform.getPlugin("com.ibm.etools.webservice.atk.ui");
- *
- * @return The ATKUIPlugin singleton.
- */
- static public WebServicePlugin getInstance() {
- return singleton;
- }
-
- /**
- * Returns the message string identified by the given key from the plugin.properties file for
- * the appropriate locale.
- *
- * @param key
- * The message key string prefixed by a "%" symbol. That is, the string passed in
- * must be of the form "%KEY" where the plugin.properties file contains a line of the
- * form: "KEY = value".
- * @return The locale-specific message.
- */
- public static String getMessage(String key) {
- return Platform.getResourceString(getInstance().getBundle(), key);
- }
-
- /**
- * Returns the message string identified by the given key from the plugin.properties file for
- * the appropriate locale. Substitution sequences in the message string are replaced by the
- * given array of substitution objects (which are most frequently strings). See
- * java.text.MessageFormat for further details on substitution.
- *
- * @param key
- * The message key string prefixed by a "%" symbol. That is, the string passed in
- * must be of the form "%KEY" where the plugin.properties file contains a line of the
- * form: "KEY = value".
- * @param args
- * The substitution values for the message as required by the message in
- * plugin.properties and by the rules of class java.text.MessageFormat.
- * @return The locale-specific message.
- */
- public static String getMessage(String key, Object[] args) {
- return MessageFormat.format(getMessage(key), args);
- }
-
-
- /**
- * Returns the URL from which all resources are based.
- *
- * @return the URL from which all resources are based.
- */
- public URL getBaseURL() {
- String installURL = getPluginInstallLocation();
- if (installURL != null) {
- try {
- StringBuffer sb = new StringBuffer(installURL);
- sb.append("plugin.properties"); //$NON-NLS-1$
- return new URL(sb.toString());
- } catch (MalformedURLException e) {
- //Ignore
- }
- }
- return null;
- }
-
- /**
- * Returns the description that can be used to create the image resource associated with the
- * key. The description will typically be in the form of a URL to the image data. Creation of an
- * actual image depends on the GUI environment; within Eclipse,
- * org.eclipse.emf.edit.ui.provider.ExtendedImageRegistry can be used.
- *
- * @param key
- * the key of the image resource.
- * @return the description on the image resource.
- */
- public Object getImage(String key) {
- ImageDescriptor imageDescriptor = getImageDescriptor(key);
- if (imageDescriptor != null)
- return imageDescriptor.createImage();
- return null;
- }
-
- public String getPluginStateLocation() {
- return Platform.getPluginStateLocation(this).addTrailingSeparator().toOSString();
- }
-
- public String getPluginInstallLocation() {
- try {
- return Platform.resolve(getInstance().getBundle().getEntry("/")).getFile(); //$NON-NLS-1$
- } catch (Throwable t) {
- return null;
- }
- }
-
- /**
- * Returns the string resource associated with the key.
- *
- * @param key
- * the key of the string resource.
- * @return the string resource associated with the key.
- */
- public String getString(String key) {
- return getMessage(key);
- }
-
- /**
- * Returns a string resource associated with the key, and peforms substitutions.
- *
- * @param key
- * the key of the string.
- * @param substitutions
- * the message substitutions.
- * @return a string resource associated with the key.
- * @see #getString(String)
- * @see MessageFormat#format(String, Object[])
- */
- public String getString(String key, Object[] substitutions) {
- return getMessage(key, substitutions);
- }
-
- /**
- * Called once by the platform when this plugin is first loaded.
- *
- * @throws CoreException
- * If this plugin fails to start.
- */
- @Override
- public void start(BundleContext context) throws Exception {
- super.start(context);
- }
-
- /**
- * Called once by the platform when this plugin is unloaded.
- *
- * @throws CoreException
- * If this plugin fails to shutdown.
- */
- @Override
- public void stop(BundleContext context) throws Exception {
- super.stop(context);
- }
- public String getString(String key, boolean translate) {
- // TODO For now... translate not supported
- return getString(key);
- }
-
- public String getString(String key, Object[] substitutions, boolean translate) {
- // TODO For now... translate not supported
- return getString(key,substitutions);
- }
-
-
- /**
- * Record an error against this plugin's log.
- *
- * @param aCode
- * @param aMessage
- * @param anException
- */
- public static void logError(int aCode, String aMessage,
- Throwable anException) {
- getInstance().getLog().log(
- createErrorStatus(aCode, aMessage, anException));
- }
-
- /**
- *
- * Record a message against this plugin's log.
- *
- * @param severity
- * @param aCode
- * @param aMessage
- * @param exception
- */
- public static void log(int severity, int aCode, String aMessage,
- Throwable exception) {
- log(createStatus(severity, aCode, aMessage, exception));
- }
-
- /**
- *
- * Record a status against this plugin's log.
- *
- * @param aStatus
- */
- public static void log(IStatus aStatus) {
- getInstance().getLog().log(aStatus);
- }
-
- /**
- * Create a status associated with this plugin.
- *
- * @param severity
- * @param aCode
- * @param aMessage
- * @param exception
- * @return A status configured with this plugin's id and the given parameters.
- */
- public static IStatus createStatus(int severity, int aCode,
- String aMessage, Throwable exception) {
- return new Status(severity, PLUGIN_ID, aCode,
- aMessage != null ? aMessage : "No message.", exception); //$NON-NLS-1$
- }
-
- /**
- *
- * @param aCode
- * @param aMessage
- * @param exception
- * @return A status configured with this plugin's id and the given parameters.
- */
- public static IStatus createErrorStatus(int aCode, String aMessage,
- Throwable exception) {
- return createStatus(IStatus.ERROR, aCode, aMessage, exception);
- }
-
- public static IStatus createStatus(int severity, String message, Throwable exception) {
- return new Status(severity, PLUGIN_ID, message, exception);
- }
-
- public static IStatus createStatus(int severity, String message) {
- return createStatus(severity, message, null);
- }
-
- public static void logError(Throwable exception) {
- Platform.getLog(Platform.getBundle(PLUGIN_ID)).log( createStatus(IStatus.ERROR, exception.getMessage(), exception));
- }
-
- public static void logError(CoreException exception) {
- Platform.getLog(Platform.getBundle(PLUGIN_ID)).log( exception.getStatus() );
- }
-
-}
diff --git a/plugins/org.eclipse.jst.j2ee.webservice/webservice/org/eclipse/jst/j2ee/internal/webservice/provider/ATKUIAdapterFactory.java b/plugins/org.eclipse.jst.j2ee.webservice/webservice/org/eclipse/jst/j2ee/internal/webservice/provider/ATKUIAdapterFactory.java
deleted file mode 100644
index dfc72a2..0000000
--- a/plugins/org.eclipse.jst.j2ee.webservice/webservice/org/eclipse/jst/j2ee/internal/webservice/provider/ATKUIAdapterFactory.java
+++ /dev/null
@@ -1,93 +0,0 @@
-/***************************************************************************************************
- * Copyright (c) 2003, 2004 IBM Corporation and others. All rights reserved. This program and the
- * accompanying materials are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
- *
- * Contributors: IBM Corporation - initial API and implementation
- **************************************************************************************************/
-package org.eclipse.jst.j2ee.internal.webservice.provider;
-
-import org.eclipse.emf.common.notify.Adapter;
-import org.eclipse.emf.common.notify.AdapterFactory;
-import org.eclipse.emf.common.notify.Notifier;
-import org.eclipse.emf.common.notify.impl.AdapterFactoryImpl;
-import org.eclipse.emf.common.util.EList;
-import org.eclipse.emf.edit.provider.INotifyChangedListener;
-import org.eclipse.jst.j2ee.internal.webservice.adapter.AdapterViewerItem;
-
-
-public class ATKUIAdapterFactory extends AdapterFactoryImpl {
- private AdapterFactory[] adapterFactories_;
-
- public ATKUIAdapterFactory() {
- adapterFactories_ = new AdapterFactory[4];
- adapterFactories_[0] = new WsddItemProviderAdapterFactory();
- adapterFactories_[1] = new ATKUIWscddAdapterFactory();
- adapterFactories_[2] = new ATKUIWscommonAdapterFactory();
- adapterFactories_[3] = new ATKUICommonAdapterFactory();
-
- }
-
- @Override
- public Object adapt(Object target, Object type) {
-
- if (target instanceof Notifier) {
- for (int i = 0; i < adapterFactories_.length; i++) {
- Object object = adapterFactories_[i].adapt(target, type);
- if (object != null) {
- return object;
- }
- }
- return null;
- }
- return resolve(target, type);
- }
-
- @Override
- public Adapter adapt(Notifier target, Object type) {
- Object object = adapt((Object) target, type);
- if (object instanceof Adapter) {
- return (Adapter) object;
- }
- return null;
- }
-
- /**
- * This is called by {@link #adapt(Object,Object) adapt(Object, Object)}for objects that aren't
- * notifiers.
- *
- * @param an
- * arbitrary object to adapt.
- * @param type
- * the key indicating the type of adapter required.
- * @return the object itself.
- * @see #adapt(Object,Object)
- */
- @Override
- protected Object resolve(Object object, Object type) {
- if (object instanceof EList)
- return resolveEList((EList) object, type);
- else if (object instanceof AdapterViewerItem)
- return resolveAdapterViewerItem((AdapterViewerItem) object, type);
- else
- return null;
- }
-
- private Object resolveEList(EList eList, Object type) {
- if (eList.size() > 0)
- return adapt(eList.get(0), type);
- return null;
- }
-
- private Object resolveAdapterViewerItem(AdapterViewerItem adapterViewerItem, Object type) {
- return resolveEList(adapterViewerItem.getEObjectList(), type);
- }
-
- public void addListener(INotifyChangedListener listener) {
- ((WsddItemProviderAdapterFactory) adapterFactories_[0]).addListener(listener);
- ((ATKUIWscddAdapterFactory) adapterFactories_[1]).addListener(listener);
- ((ATKUIWscommonAdapterFactory) adapterFactories_[2]).addListener(listener);
- ((ATKUICommonAdapterFactory) adapterFactories_[3]).addListener(listener);
- }
-}
\ No newline at end of file
diff --git a/plugins/org.eclipse.jst.j2ee.webservice/webservice/org/eclipse/jst/j2ee/internal/webservice/provider/ATKUICommonAdapterFactory.java b/plugins/org.eclipse.jst.j2ee.webservice/webservice/org/eclipse/jst/j2ee/internal/webservice/provider/ATKUICommonAdapterFactory.java
deleted file mode 100644
index 6c639fb..0000000
--- a/plugins/org.eclipse.jst.j2ee.webservice/webservice/org/eclipse/jst/j2ee/internal/webservice/provider/ATKUICommonAdapterFactory.java
+++ /dev/null
@@ -1,50 +0,0 @@
-/***************************************************************************************************
- * Copyright (c) 2003, 2004 IBM Corporation and others. All rights reserved. This program and the
- * accompanying materials are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
- *
- * Contributors: IBM Corporation - initial API and implementation
- **************************************************************************************************/
-package org.eclipse.jst.j2ee.internal.webservice.provider;
-
-import org.eclipse.emf.common.notify.Adapter;
-import org.eclipse.jst.j2ee.common.internal.provider.CommonItemProviderAdapterFactory;
-
-
-public class ATKUICommonAdapterFactory extends CommonItemProviderAdapterFactory {
- public ATKUICommonAdapterFactory() {
- super();
- }
-
- @Override
- public Adapter createParamValueAdapter() {
- if (paramValueItemProvider == null)
- paramValueItemProvider = new ATKUIParamValueItemProvider(this);
-
- return paramValueItemProvider;
- }
-
- @Override
- public Adapter createQNameAdapter() {
- if (qNameItemProvider == null) {
- qNameItemProvider = new ATKUIQNameItemProvider(this);
- }
-
- return qNameItemProvider;
- }
-
-
- /*
- * public Adapter createSOAPHeaderAdapter() { if (soapHeaderItemProvider == null)
- * soapHeaderItemProvider = new ATKUISOAPHeaderItemProvider(this); return
- * soapHeaderItemProvider; }
- *
- * public Adapter createSOAPRoleAdapter() { if (soapRoleItemProvider == null)
- * soapRoleItemProvider = new ATKUISOAPRoleItemProvider(this); return soapRoleItemProvider; }
- *
- * public Adapter createPortNameAdapter() { if (portNameItemProvider == null)
- * portNameItemProvider = new ATKUIPortNameItemProvider(this); return portNameItemProvider; }
- *
- */
-}
\ No newline at end of file
diff --git a/plugins/org.eclipse.jst.j2ee.webservice/webservice/org/eclipse/jst/j2ee/internal/webservice/provider/ATKUIComponentScopedRefsItemProvider.java b/plugins/org.eclipse.jst.j2ee.webservice/webservice/org/eclipse/jst/j2ee/internal/webservice/provider/ATKUIComponentScopedRefsItemProvider.java
deleted file mode 100644
index 95fd652..0000000
--- a/plugins/org.eclipse.jst.j2ee.webservice/webservice/org/eclipse/jst/j2ee/internal/webservice/provider/ATKUIComponentScopedRefsItemProvider.java
+++ /dev/null
@@ -1,90 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2003, 2005 IBM Corporation and others.
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
- *
- * Contributors:
- * IBM Corporation - initial API and implementation
- *******************************************************************************/
-package org.eclipse.jst.j2ee.internal.webservice.provider;
-
-import java.util.ArrayList;
-import java.util.Collection;
-import java.util.Iterator;
-import java.util.List;
-
-import org.eclipse.emf.common.notify.AdapterFactory;
-import org.eclipse.emf.common.util.EList;
-import org.eclipse.emf.ecore.EObject;
-import org.eclipse.emf.ecore.EStructuralFeature;
-import org.eclipse.emf.edit.provider.ITableItemLabelProvider;
-import org.eclipse.jst.j2ee.internal.webservice.adapter.AdapterViewerItem;
-import org.eclipse.jst.j2ee.webservice.wsclient.ComponentScopedRefs;
-
-
-public class ATKUIComponentScopedRefsItemProvider extends ComponentScopedRefsItemProvider implements ITableItemLabelProvider {
- public ATKUIComponentScopedRefsItemProvider(AdapterFactory adapterFactory) {
- super(adapterFactory);
- }
-
- protected Collection getChildrenFromAdapterViewerItem(AdapterViewerItem adapterViewerItem) {
- Collection result = new ArrayList();
- EList eObjectList = adapterViewerItem.getEObjectList();
- EStructuralFeature feature = adapterViewerItem.getEStructuralFeature();
- for (Iterator it = eObjectList.iterator(); it.hasNext();) {
- EObject eObject = (EObject) it.next();
- Object object = eObject.eGet(feature);
- if (object != null) {
- if (object instanceof List)
- result.addAll((List) object);
- else
- result.add(object);
- }
- }
- return result;
- }
-
- protected String toDisplayString(String s) {
- return (s != null) ? s : ""; //$NON-NLS-1$
- }
-
- /**
- * This does the same thing as ITableLabelProvider.getColumnText.
- */
- @Override
- public String getColumnText(Object object, int columnIndex) {
- return toDisplayString(((ComponentScopedRefs) object).getComponentName());
- }
-
- /**
- * This does the same thing as ITableLabelProvider.getColumnImage.
- */
- @Override
- public Object getColumnImage(Object object, int columnIndex) {
- return null;
- }
-
- /**
- * This implements
- * {@link ITreeItemContentProvider#getChildren ITreeItemContentProvider.getChildren}by calling
- * {@link #getChildrenReferences getChildrenReferences}and using those to collect the children.
- */
- @Override
- public Collection getChildren(Object object) {
- if (object instanceof EList)
- return getChildrenFromEList((EList) object);
- else if (object instanceof AdapterViewerItem)
- return getChildrenFromAdapterViewerItem((AdapterViewerItem) object);
- else
- return super.getChildren(object);
- }
-
- protected Collection getChildrenFromEList(EList eList) {
- Collection result = new ArrayList();
- for (Iterator it = eList.iterator(); it.hasNext();)
- result.addAll(super.getChildren(it.next()));
- return result;
- }
-}
diff --git a/plugins/org.eclipse.jst.j2ee.webservice/webservice/org/eclipse/jst/j2ee/internal/webservice/provider/ATKUIHandlerItemProvider.java b/plugins/org.eclipse.jst.j2ee.webservice/webservice/org/eclipse/jst/j2ee/internal/webservice/provider/ATKUIHandlerItemProvider.java
deleted file mode 100644
index 33ad020..0000000
--- a/plugins/org.eclipse.jst.j2ee.webservice/webservice/org/eclipse/jst/j2ee/internal/webservice/provider/ATKUIHandlerItemProvider.java
+++ /dev/null
@@ -1,101 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2003, 2005 IBM Corporation and others.
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
- *
- * Contributors:
- * IBM Corporation - initial API and implementation
- *******************************************************************************/
-package org.eclipse.jst.j2ee.internal.webservice.provider;
-
-import java.util.ArrayList;
-import java.util.Collection;
-import java.util.Iterator;
-import java.util.List;
-
-import org.eclipse.emf.common.notify.AdapterFactory;
-import org.eclipse.emf.common.util.EList;
-import org.eclipse.emf.ecore.EObject;
-import org.eclipse.emf.ecore.EStructuralFeature;
-import org.eclipse.emf.edit.provider.ITableItemLabelProvider;
-import org.eclipse.jem.java.JavaClass;
-import org.eclipse.jst.j2ee.internal.webservice.adapter.AdapterViewerItem;
-import org.eclipse.jst.j2ee.webservice.wsclient.Handler;
-
-
-public class ATKUIHandlerItemProvider extends HandlerItemProvider implements ITableItemLabelProvider {
- public ATKUIHandlerItemProvider(AdapterFactory adapterFactory) {
- super(adapterFactory);
- }
-
-
- /**
- * This does the same thing as ITableLabelProvider.getColumnText.
- */
- @Override
- public String getColumnText(Object object, int columnIndex) {
- return toDisplayString(((Handler) object).getHandlerName());
- }
-
- protected String toDisplayString(String s) {
- return (s != null) ? s : ""; //$NON-NLS-1$
- }
-
- /**
- * This does the same thing as ITableLabelProvider.getColumnImage.
- */
- @Override
- public Object getColumnImage(Object object, int columnIndex) {
- return null;
- }
-
- protected String toDisplayString(JavaClass javaClass) {
- String className = javaClass.getQualifiedNameForReflection();
- return (className != null) ? className : ""; //$NON-NLS-1$
- }
-
-
- /**
- * This implements
- * {@link ITreeItemContentProvider#getChildren ITreeItemContentProvider.getChildren}by calling
- * {@link #getChildrenReferences getChildrenReferences}and using those to collect the children.
- */
- @Override
- public Collection getChildren(Object object) {
- if (object instanceof EList)
- return getChildrenFromEList((EList) object);
- else if (object instanceof AdapterViewerItem)
- return getChildrenFromAdapterViewerItem((AdapterViewerItem) object);
- else
- return super.getChildren(object);
- }
-
-
- protected Collection getChildrenFromAdapterViewerItem(AdapterViewerItem adapterViewerItem) {
- Collection result = new ArrayList();
- EList eObjectList = adapterViewerItem.getEObjectList();
- EStructuralFeature feature = adapterViewerItem.getEStructuralFeature();
- for (Iterator it = eObjectList.iterator(); it.hasNext();) {
- EObject eObject = (EObject) it.next();
- Object object = eObject.eGet(feature);
- if (object != null) {
- if (object instanceof List)
- result.addAll((List) object);
- else
- result.add(object);
- }
- }
- return result;
- }
-
-
- protected Collection getChildrenFromEList(EList eList) {
- Collection result = new ArrayList();
- for (Iterator it = eList.iterator(); it.hasNext();)
- result.addAll(super.getChildren(it.next()));
- return result;
- }
-
-}
diff --git a/plugins/org.eclipse.jst.j2ee.webservice/webservice/org/eclipse/jst/j2ee/internal/webservice/provider/ATKUIInitParamItemProvider.java b/plugins/org.eclipse.jst.j2ee.webservice/webservice/org/eclipse/jst/j2ee/internal/webservice/provider/ATKUIInitParamItemProvider.java
deleted file mode 100644
index 7477a1a..0000000
--- a/plugins/org.eclipse.jst.j2ee.webservice/webservice/org/eclipse/jst/j2ee/internal/webservice/provider/ATKUIInitParamItemProvider.java
+++ /dev/null
@@ -1,50 +0,0 @@
-/***************************************************************************************************
- * Copyright (c) 2003, 2004 IBM Corporation and others. All rights reserved. This program and the
- * accompanying materials are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
- *
- * Contributors: IBM Corporation - initial API and implementation
- **************************************************************************************************/
-package org.eclipse.jst.j2ee.internal.webservice.provider;
-
-import org.eclipse.emf.common.notify.AdapterFactory;
-import org.eclipse.emf.edit.provider.ITableItemLabelProvider;
-import org.eclipse.jst.j2ee.webservice.wscommon.InitParam;
-
-
-public class ATKUIInitParamItemProvider extends InitParamItemProvider implements ITableItemLabelProvider {
- public ATKUIInitParamItemProvider(AdapterFactory adapterFactory) {
- super(adapterFactory);
- }
-
- /**
- * This does the same thing as ITableLabelProvider.getColumnText.
- */
- @Override
- public String getColumnText(Object object, int columnIndex) {
- InitParam initParam = (InitParam) object;
- switch (columnIndex) {
- case 0 :
- return toDisplayString(initParam.getParamName());
- case 1 :
- return toDisplayString(initParam.getParamValue());
- case 2 :
- return toDisplayString(initParam.getDescription());
- default :
- StringBuffer sb = new StringBuffer();
- sb.append(initParam.getParamName());
- sb.append("="); //$NON-NLS-1$
- sb.append(initParam.getParamValue());
- return sb.toString();
- }
- }
-
- /**
- * This does the same thing as ITableLabelProvider.getColumnImage.
- */
- @Override
- public Object getColumnImage(Object object, int columnIndex) {
- return null;
- }
-}
\ No newline at end of file
diff --git a/plugins/org.eclipse.jst.j2ee.webservice/webservice/org/eclipse/jst/j2ee/internal/webservice/provider/ATKUIParamValueItemProvider.java b/plugins/org.eclipse.jst.j2ee.webservice/webservice/org/eclipse/jst/j2ee/internal/webservice/provider/ATKUIParamValueItemProvider.java
deleted file mode 100644
index 2a075b9..0000000
--- a/plugins/org.eclipse.jst.j2ee.webservice/webservice/org/eclipse/jst/j2ee/internal/webservice/provider/ATKUIParamValueItemProvider.java
+++ /dev/null
@@ -1,54 +0,0 @@
-/***************************************************************************************************
- * Copyright (c) 2003, 2004 IBM Corporation and others. All rights reserved. This program and the
- * accompanying materials are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
- *
- * Contributors: IBM Corporation - initial API and implementation
- **************************************************************************************************/
-package org.eclipse.jst.j2ee.internal.webservice.provider;
-
-import org.eclipse.emf.common.notify.AdapterFactory;
-import org.eclipse.emf.edit.provider.ITableItemLabelProvider;
-import org.eclipse.jst.j2ee.common.ParamValue;
-import org.eclipse.jst.j2ee.common.internal.provider.ParamValueItemProvider;
-
-public class ATKUIParamValueItemProvider extends ParamValueItemProvider implements ITableItemLabelProvider {
- public ATKUIParamValueItemProvider(AdapterFactory adapterFactory) {
- super(adapterFactory);
- }
-
- /**
- * This does the same thing as ITableLabelProvider.getColumnText.
- */
- @Override
- public String getColumnText(Object object, int columnIndex) {
- ParamValue initParam = (ParamValue) object;
- switch (columnIndex) {
- case 0 :
- return toDisplayString(initParam.getName());
- case 1 :
- return toDisplayString(initParam.getValue());
- case 2 :
- return toDisplayString(initParam.getDescription());
- default :
- StringBuffer sb = new StringBuffer();
- sb.append(initParam.getName());
- sb.append("="); //$NON-NLS-1$
- sb.append(initParam.getValue());
- return sb.toString();
- }
- }
-
- protected String toDisplayString(String s) {
- return (s != null) ? s : ""; //$NON-NLS-1$
- }
-
- /**
- * This does the same thing as ITableLabelProvider.getColumnImage.
- */
- @Override
- public Object getColumnImage(Object object, int columnIndex) {
- return null;
- }
-}
\ No newline at end of file
diff --git a/plugins/org.eclipse.jst.j2ee.webservice/webservice/org/eclipse/jst/j2ee/internal/webservice/provider/ATKUIPortComponentRefItemProvider.java b/plugins/org.eclipse.jst.j2ee.webservice/webservice/org/eclipse/jst/j2ee/internal/webservice/provider/ATKUIPortComponentRefItemProvider.java
deleted file mode 100644
index 0eb154c..0000000
--- a/plugins/org.eclipse.jst.j2ee.webservice/webservice/org/eclipse/jst/j2ee/internal/webservice/provider/ATKUIPortComponentRefItemProvider.java
+++ /dev/null
@@ -1,55 +0,0 @@
-/***************************************************************************************************
- * Copyright (c) 2003, 2004 IBM Corporation and others. All rights reserved. This program and the
- * accompanying materials are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
- *
- * Contributors: IBM Corporation - initial API and implementation
- **************************************************************************************************/
-package org.eclipse.jst.j2ee.internal.webservice.provider;
-
-import org.eclipse.emf.common.notify.AdapterFactory;
-import org.eclipse.emf.edit.provider.ITableItemLabelProvider;
-import org.eclipse.jem.java.JavaClass;
-import org.eclipse.jst.j2ee.webservice.wsclient.PortComponentRef;
-
-
-public class ATKUIPortComponentRefItemProvider extends PortComponentRefItemProvider implements ITableItemLabelProvider {
- public ATKUIPortComponentRefItemProvider(AdapterFactory adapterFactory) {
- super(adapterFactory);
- }
-
- /**
- * This does the same thing as ITableLabelProvider.getColumnText.
- */
- @Override
- public String getColumnText(Object object, int columnIndex) {
- PortComponentRef portCompRef = (PortComponentRef) object;
- switch (columnIndex) {
- case 0 :
- return toDisplayString(portCompRef.getServiceEndpointInterface());
- case 1 :
- return toDisplayString(portCompRef.getPortComponentLink());
- default :
- return toDisplayString(portCompRef.getServiceEndpointInterface());
- }
- }
-
- protected String toDisplayString(String s) {
- return (s != null) ? s : ""; //$NON-NLS-1$
- }
-
- /**
- * This does the same thing as ITableLabelProvider.getColumnImage.
- */
- @Override
- public Object getColumnImage(Object object, int columnIndex) {
- return null;
- }
-
- protected String toDisplayString(JavaClass javaClass) {
- String className = javaClass.getQualifiedNameForReflection();
- return (className != null) ? className : ""; //$NON-NLS-1$
- }
-
-}
\ No newline at end of file
diff --git a/plugins/org.eclipse.jst.j2ee.webservice/webservice/org/eclipse/jst/j2ee/internal/webservice/provider/ATKUIPortNameItemProvider.java b/plugins/org.eclipse.jst.j2ee.webservice/webservice/org/eclipse/jst/j2ee/internal/webservice/provider/ATKUIPortNameItemProvider.java
deleted file mode 100644
index 742ad88..0000000
--- a/plugins/org.eclipse.jst.j2ee.webservice/webservice/org/eclipse/jst/j2ee/internal/webservice/provider/ATKUIPortNameItemProvider.java
+++ /dev/null
@@ -1,37 +0,0 @@
-/***************************************************************************************************
- * Copyright (c) 2003, 2004 IBM Corporation and others. All rights reserved. This program and the
- * accompanying materials are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
- *
- * Contributors: IBM Corporation - initial API and implementation
- **************************************************************************************************/
-package org.eclipse.jst.j2ee.internal.webservice.provider;
-
-import org.eclipse.emf.common.notify.AdapterFactory;
-import org.eclipse.emf.edit.provider.ITableItemLabelProvider;
-import org.eclipse.jst.j2ee.webservice.wscommon.PortName;
-
-
-public class ATKUIPortNameItemProvider extends PortNameItemProvider implements ITableItemLabelProvider {
- public ATKUIPortNameItemProvider(AdapterFactory adapterFactory) {
- super(adapterFactory);
- }
-
- /**
- * This does the same thing as ITableLabelProvider.getColumnText.
- */
- @Override
- public String getColumnText(Object object, int columnIndex) {
- PortName portName = (PortName) object;
- return toDisplayString(portName.getPortName());
- }
-
- /**
- * This does the same thing as ITableLabelProvider.getColumnImage.
- */
- @Override
- public Object getColumnImage(Object object, int columnIndex) {
- return null;
- }
-}
\ No newline at end of file
diff --git a/plugins/org.eclipse.jst.j2ee.webservice/webservice/org/eclipse/jst/j2ee/internal/webservice/provider/ATKUIQNameItemProvider.java b/plugins/org.eclipse.jst.j2ee.webservice/webservice/org/eclipse/jst/j2ee/internal/webservice/provider/ATKUIQNameItemProvider.java
deleted file mode 100644
index b147637..0000000
--- a/plugins/org.eclipse.jst.j2ee.webservice/webservice/org/eclipse/jst/j2ee/internal/webservice/provider/ATKUIQNameItemProvider.java
+++ /dev/null
@@ -1,53 +0,0 @@
-/***************************************************************************************************
- * Copyright (c) 2003, 2004 IBM Corporation and others. All rights reserved. This program and the
- * accompanying materials are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
- *
- * Contributors: IBM Corporation - initial API and implementation
- **************************************************************************************************/
-package org.eclipse.jst.j2ee.internal.webservice.provider;
-
-import org.eclipse.emf.common.notify.AdapterFactory;
-import org.eclipse.emf.edit.provider.ITableItemLabelProvider;
-import org.eclipse.jst.j2ee.common.QName;
-import org.eclipse.jst.j2ee.common.internal.provider.QNameItemProvider;
-
-
-public class ATKUIQNameItemProvider extends QNameItemProvider implements ITableItemLabelProvider {
- public ATKUIQNameItemProvider(AdapterFactory adapterFactory) {
- super(adapterFactory);
- }
-
- /**
- * This does the same thing as ITableLabelProvider.getColumnText.
- */
- @Override
- public String getColumnText(Object object, int columnIndex) {
- QName qname = (QName) object;
- switch (columnIndex) {
- case 0 :
- return toDisplayString(qname.getNamespaceURI());
- case 1 :
- return toDisplayString(qname.getLocalPart());
- default :
- StringBuffer sb = new StringBuffer();
- sb.append(qname.getNamespaceURI());
- sb.append("#"); //$NON-NLS-1$
- sb.append(qname.getLocalPart());
- return sb.toString();
- }
- }
-
- protected String toDisplayString(String s) {
- return (s != null) ? s : ""; //$NON-NLS-1$
- }
-
- /**
- * This does the same thing as ITableLabelProvider.getColumnImage.
- */
- @Override
- public Object getColumnImage(Object object, int columnIndex) {
- return null;
- }
-}
\ No newline at end of file
diff --git a/plugins/org.eclipse.jst.j2ee.webservice/webservice/org/eclipse/jst/j2ee/internal/webservice/provider/ATKUISOAPHeaderItemProvider.java b/plugins/org.eclipse.jst.j2ee.webservice/webservice/org/eclipse/jst/j2ee/internal/webservice/provider/ATKUISOAPHeaderItemProvider.java
deleted file mode 100644
index f4ef91a..0000000
--- a/plugins/org.eclipse.jst.j2ee.webservice/webservice/org/eclipse/jst/j2ee/internal/webservice/provider/ATKUISOAPHeaderItemProvider.java
+++ /dev/null
@@ -1,50 +0,0 @@
-/***************************************************************************************************
- * Copyright (c) 2003, 2004 IBM Corporation and others. All rights reserved. This program and the
- * accompanying materials are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
- *
- * Contributors: IBM Corporation - initial API and implementation
- **************************************************************************************************/
-package org.eclipse.jst.j2ee.internal.webservice.provider;
-
-import org.eclipse.emf.common.notify.AdapterFactory;
-import org.eclipse.emf.edit.provider.ITableItemLabelProvider;
-import org.eclipse.jst.j2ee.webservice.wscommon.SOAPHeader;
-
-
-
-
-public class ATKUISOAPHeaderItemProvider extends SOAPHeaderItemProvider implements ITableItemLabelProvider {
- public ATKUISOAPHeaderItemProvider(AdapterFactory adapterFactory) {
- super(adapterFactory);
- }
-
- /**
- * This does the same thing as ITableLabelProvider.getColumnText.
- */
- @Override
- public String getColumnText(Object object, int columnIndex) {
- SOAPHeader soapHeader = (SOAPHeader) object;
- switch (columnIndex) {
- case 0 :
- return toDisplayString(soapHeader.getNamespaceURI());
- case 1 :
- return toDisplayString(soapHeader.getLocalPart());
- default :
- StringBuffer sb = new StringBuffer();
- sb.append(soapHeader.getNamespaceURI());
- sb.append("#"); //$NON-NLS-1$
- sb.append(soapHeader.getLocalPart());
- return sb.toString();
- }
- }
-
- /**
- * This does the same thing as ITableLabelProvider.getColumnImage.
- */
- @Override
- public Object getColumnImage(Object object, int columnIndex) {
- return null;
- }
-}
\ No newline at end of file
diff --git a/plugins/org.eclipse.jst.j2ee.webservice/webservice/org/eclipse/jst/j2ee/internal/webservice/provider/ATKUISOAPRoleItemProvider.java b/plugins/org.eclipse.jst.j2ee.webservice/webservice/org/eclipse/jst/j2ee/internal/webservice/provider/ATKUISOAPRoleItemProvider.java
deleted file mode 100644
index 6c5843f..0000000
--- a/plugins/org.eclipse.jst.j2ee.webservice/webservice/org/eclipse/jst/j2ee/internal/webservice/provider/ATKUISOAPRoleItemProvider.java
+++ /dev/null
@@ -1,37 +0,0 @@
-/***************************************************************************************************
- * Copyright (c) 2003, 2004 IBM Corporation and others. All rights reserved. This program and the
- * accompanying materials are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
- *
- * Contributors: IBM Corporation - initial API and implementation
- **************************************************************************************************/
-package org.eclipse.jst.j2ee.internal.webservice.provider;
-
-import org.eclipse.emf.common.notify.AdapterFactory;
-import org.eclipse.emf.edit.provider.ITableItemLabelProvider;
-import org.eclipse.jst.j2ee.webservice.wscommon.SOAPRole;
-
-
-public class ATKUISOAPRoleItemProvider extends SOAPRoleItemProvider implements ITableItemLabelProvider {
- public ATKUISOAPRoleItemProvider(AdapterFactory adapterFactory) {
- super(adapterFactory);
- }
-
- /**
- * This does the same thing as ITableLabelProvider.getColumnText.
- */
- @Override
- public String getColumnText(Object object, int columnIndex) {
- SOAPRole soapRole = (SOAPRole) object;
- return toDisplayString(soapRole.getSoapRole());
- }
-
- /**
- * This does the same thing as ITableLabelProvider.getColumnImage.
- */
- @Override
- public Object getColumnImage(Object object, int columnIndex) {
- return null;
- }
-}
\ No newline at end of file
diff --git a/plugins/org.eclipse.jst.j2ee.webservice/webservice/org/eclipse/jst/j2ee/internal/webservice/provider/ATKUIServiceRefItemProvider.java b/plugins/org.eclipse.jst.j2ee.webservice/webservice/org/eclipse/jst/j2ee/internal/webservice/provider/ATKUIServiceRefItemProvider.java
deleted file mode 100644
index 2eb9d93..0000000
--- a/plugins/org.eclipse.jst.j2ee.webservice/webservice/org/eclipse/jst/j2ee/internal/webservice/provider/ATKUIServiceRefItemProvider.java
+++ /dev/null
@@ -1,101 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2003, 2005 IBM Corporation and others.
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
- *
- * Contributors:
- * IBM Corporation - initial API and implementation
- *******************************************************************************/
-package org.eclipse.jst.j2ee.internal.webservice.provider;
-
-import java.util.ArrayList;
-import java.util.Collection;
-import java.util.Iterator;
-import java.util.List;
-
-import org.eclipse.emf.common.notify.AdapterFactory;
-import org.eclipse.emf.common.util.EList;
-import org.eclipse.emf.ecore.EObject;
-import org.eclipse.emf.ecore.EStructuralFeature;
-import org.eclipse.emf.edit.provider.ITableItemLabelProvider;
-import org.eclipse.jem.java.JavaClass;
-import org.eclipse.jst.j2ee.internal.webservice.adapter.AdapterViewerItem;
-import org.eclipse.jst.j2ee.webservice.wsclient.ServiceRef;
-
-
-public class ATKUIServiceRefItemProvider extends ServiceRefItemProvider implements ITableItemLabelProvider {
- public ATKUIServiceRefItemProvider(AdapterFactory adapterFactory) {
- super(adapterFactory);
- }
-
-
- /**
- * This does the same thing as ITableLabelProvider.getColumnText.
- */
- @Override
- public String getColumnText(Object object, int columnIndex) {
- return toDisplayString(((ServiceRef) object).getServiceRefName());
- }
-
- protected String toDisplayString(String s) {
- return (s != null) ? s : ""; //$NON-NLS-1$
- }
-
- /**
- * This does the same thing as ITableLabelProvider.getColumnImage.
- */
- @Override
- public Object getColumnImage(Object object, int columnIndex) {
- return null;
- }
-
- protected String toDisplayString(JavaClass javaClass) {
- String className = javaClass.getQualifiedNameForReflection();
- return (className != null) ? className : ""; //$NON-NLS-1$
- }
-
-
- /**
- * This implements
- * {@link ITreeItemContentProvider#getChildren ITreeItemContentProvider.getChildren}by calling
- * {@link #getChildrenReferences getChildrenReferences}and using those to collect the children.
- */
- @Override
- public Collection getChildren(Object object) {
- if (object instanceof EList)
- return getChildrenFromEList((EList) object);
- else if (object instanceof AdapterViewerItem)
- return getChildrenFromAdapterViewerItem((AdapterViewerItem) object);
- else
- return super.getChildren(object);
- }
-
-
- protected Collection getChildrenFromAdapterViewerItem(AdapterViewerItem adapterViewerItem) {
- Collection result = new ArrayList();
- EList eObjectList = adapterViewerItem.getEObjectList();
- EStructuralFeature feature = adapterViewerItem.getEStructuralFeature();
- for (Iterator it = eObjectList.iterator(); it.hasNext();) {
- EObject eObject = (EObject) it.next();
- Object object = eObject.eGet(feature);
- if (object != null) {
- if (object instanceof List)
- result.addAll((List) object);
- else
- result.add(object);
- }
- }
- return result;
- }
-
-
- protected Collection getChildrenFromEList(EList eList) {
- Collection result = new ArrayList();
- for (Iterator it = eList.iterator(); it.hasNext();)
- result.addAll(super.getChildren(it.next()));
- return result;
- }
-
-}
diff --git a/plugins/org.eclipse.jst.j2ee.webservice/webservice/org/eclipse/jst/j2ee/internal/webservice/provider/ATKUIWebServicesClientItemProvider.java b/plugins/org.eclipse.jst.j2ee.webservice/webservice/org/eclipse/jst/j2ee/internal/webservice/provider/ATKUIWebServicesClientItemProvider.java
deleted file mode 100644
index 87767e0..0000000
--- a/plugins/org.eclipse.jst.j2ee.webservice/webservice/org/eclipse/jst/j2ee/internal/webservice/provider/ATKUIWebServicesClientItemProvider.java
+++ /dev/null
@@ -1,94 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2003, 2005 IBM Corporation and others.
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
- *
- * Contributors:
- * IBM Corporation - initial API and implementation
- *******************************************************************************/
-package org.eclipse.jst.j2ee.internal.webservice.provider;
-
-import java.util.ArrayList;
-import java.util.Collection;
-import java.util.Iterator;
-import java.util.List;
-
-import org.eclipse.emf.common.notify.AdapterFactory;
-import org.eclipse.emf.common.util.EList;
-import org.eclipse.emf.ecore.EObject;
-import org.eclipse.emf.ecore.EStructuralFeature;
-import org.eclipse.jst.j2ee.internal.webservice.adapter.AdapterViewerItem;
-import org.eclipse.jst.j2ee.internal.webservice.plugin.WebServicePlugin;
-import org.eclipse.jst.j2ee.webservice.wsclient.Webservice_clientFactory;
-
-
-public class ATKUIWebServicesClientItemProvider extends WebServicesClientItemProvider {
- public ATKUIWebServicesClientItemProvider(AdapterFactory adapterFactory) {
- super(adapterFactory);
- }
-
- protected Collection getChildrenFromAdapterViewerItem(AdapterViewerItem adapterViewerItem) {
- Collection result = new ArrayList();
- EList eObjectList = adapterViewerItem.getEObjectList();
- EStructuralFeature feature = adapterViewerItem.getEStructuralFeature();
- for (Iterator it = eObjectList.iterator(); it.hasNext();) {
- EObject eObject = (EObject) it.next();
- Object object = eObject.eGet(feature);
- if (object != null) {
- if (object instanceof List)
- result.addAll((List) object);
- else
- result.add(object);
- }
- }
- feature = Webservice_clientFactory.eINSTANCE.getWebservice_clientPackage().getWebServicesClient_ComponentScopedRefs();
- if (feature.getName().equals(adapterViewerItem.getEStructuralFeature().getName()))
- result.add(SectionComponentScopedRefHelper.getWsClient());
- return result;
- }
-
- /**
- * This returns WebServicesClient.gif. <!-- begin-user-doc --> <!-- end-user-doc -->
- *
- * @generated
- */
- @Override
- public Object getImage(Object object) {
- return null;
- }
-
- /**
- * This returns the label text for the adapted class. <!-- begin-user-doc --> <!-- end-user-doc
- * -->
- *
- * @non-generated
- */
- @Override
- public String getText(Object object) {
- return WebServicePlugin.getMessage("%LABEL_UNQUALIFIED_COMPONENT"); //$NON-NLS-1$
- }
-
- /**
- * This implements
- * {@link ITreeItemContentProvider#getChildren ITreeItemContentProvider.getChildren}by calling
- * {@link #getChildrenReferences getChildrenReferences}and using those to collect the children.
- */
- @Override
- public Collection getChildren(Object object) {
- if (object instanceof EList)
- return getChildrenFromEList((EList) object);
- else if (object instanceof AdapterViewerItem)
- return getChildrenFromAdapterViewerItem((AdapterViewerItem) object);
- else
- return super.getChildren(object);
- }
-
- protected Collection getChildrenFromEList(EList eList) {
- Collection result = new ArrayList();
- for (Iterator it = eList.iterator(); it.hasNext();)
- result.addAll(super.getChildren(it.next()));
- return result;
- }
-}
diff --git a/plugins/org.eclipse.jst.j2ee.webservice/webservice/org/eclipse/jst/j2ee/internal/webservice/provider/ATKUIWscddAdapterFactory.java b/plugins/org.eclipse.jst.j2ee.webservice/webservice/org/eclipse/jst/j2ee/internal/webservice/provider/ATKUIWscddAdapterFactory.java
deleted file mode 100644
index 6fd9d01..0000000
--- a/plugins/org.eclipse.jst.j2ee.webservice/webservice/org/eclipse/jst/j2ee/internal/webservice/provider/ATKUIWscddAdapterFactory.java
+++ /dev/null
@@ -1,64 +0,0 @@
-/***************************************************************************************************
- * Copyright (c) 2003, 2004 IBM Corporation and others. All rights reserved. This program and the
- * accompanying materials are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
- *
- * Contributors: IBM Corporation - initial API and implementation
- **************************************************************************************************/
-package org.eclipse.jst.j2ee.internal.webservice.provider;
-
-import org.eclipse.emf.common.notify.Adapter;
-
-
-public class ATKUIWscddAdapterFactory extends Webservice_clientItemProviderAdapterFactory {
- public ATKUIWscddAdapterFactory() {
- super();
- }
-
- @Override
- public Adapter createWebServicesClientAdapter() {
- if (webServicesClientItemProvider == null)
- webServicesClientItemProvider = new ATKUIWebServicesClientItemProvider(this);
- return webServicesClientItemProvider;
- }
-
- @Override
- public Adapter createComponentScopedRefsAdapter() {
- if (componentScopedRefsItemProvider == null)
- componentScopedRefsItemProvider = new ATKUIComponentScopedRefsItemProvider(this);
- return componentScopedRefsItemProvider;
- }
-
- @Override
- public Adapter createPortComponentRefAdapter() {
- if (portComponentRefItemProvider == null)
- portComponentRefItemProvider = new ATKUIPortComponentRefItemProvider(this);
- return portComponentRefItemProvider;
- }
-
- /*
- * (non-Javadoc)
- *
- * @see org.eclipse.jst.j2ee.internal.internal.webservice.wsclient.util.Webservice_clientAdapterFactory#createServiceRefAdapter()
- */
- @Override
- public Adapter createServiceRefAdapter() {
- if (serviceRefItemProvider == null)
- serviceRefItemProvider = new ATKUIServiceRefItemProvider(this);
- return serviceRefItemProvider;
- }
-
- /*
- * (non-Javadoc)
- *
- * @see org.eclipse.jst.j2ee.internal.internal.webservice.wsclient.util.Webservice_clientAdapterFactory#createHandlerAdapter()
- */
- @Override
- public Adapter createHandlerAdapter() {
- if (handlerItemProvider == null)
- handlerItemProvider = new ATKUIHandlerItemProvider(this);
- return handlerItemProvider;
- }
-
-}
\ No newline at end of file
diff --git a/plugins/org.eclipse.jst.j2ee.webservice/webservice/org/eclipse/jst/j2ee/internal/webservice/provider/ATKUIWscommonAdapterFactory.java b/plugins/org.eclipse.jst.j2ee.webservice/webservice/org/eclipse/jst/j2ee/internal/webservice/provider/ATKUIWscommonAdapterFactory.java
deleted file mode 100644
index 0493a5e..0000000
--- a/plugins/org.eclipse.jst.j2ee.webservice/webservice/org/eclipse/jst/j2ee/internal/webservice/provider/ATKUIWscommonAdapterFactory.java
+++ /dev/null
@@ -1,45 +0,0 @@
-/***************************************************************************************************
- * Copyright (c) 2003, 2004 IBM Corporation and others. All rights reserved. This program and the
- * accompanying materials are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
- *
- * Contributors: IBM Corporation - initial API and implementation
- **************************************************************************************************/
-package org.eclipse.jst.j2ee.internal.webservice.provider;
-
-import org.eclipse.emf.common.notify.Adapter;
-
-public class ATKUIWscommonAdapterFactory extends WscommonItemProviderAdapterFactory {
- public ATKUIWscommonAdapterFactory() {
- super();
- }
-
- @Override
- public Adapter createInitParamAdapter() {
- if (initParamItemProvider == null)
- initParamItemProvider = new ATKUIInitParamItemProvider(this);
- return initParamItemProvider;
- }
-
- @Override
- public Adapter createSOAPHeaderAdapter() {
- if (soapHeaderItemProvider == null)
- soapHeaderItemProvider = new ATKUISOAPHeaderItemProvider(this);
- return soapHeaderItemProvider;
- }
-
- @Override
- public Adapter createSOAPRoleAdapter() {
- if (soapRoleItemProvider == null)
- soapRoleItemProvider = new ATKUISOAPRoleItemProvider(this);
- return soapRoleItemProvider;
- }
-
- @Override
- public Adapter createPortNameAdapter() {
- if (portNameItemProvider == null)
- portNameItemProvider = new ATKUIPortNameItemProvider(this);
- return portNameItemProvider;
- }
-}
\ No newline at end of file
diff --git a/plugins/org.eclipse.jst.j2ee.webservice/webservice/org/eclipse/jst/j2ee/internal/webservice/provider/AbstractATKUIItemProvider.java b/plugins/org.eclipse.jst.j2ee.webservice/webservice/org/eclipse/jst/j2ee/internal/webservice/provider/AbstractATKUIItemProvider.java
deleted file mode 100644
index 4da1365..0000000
--- a/plugins/org.eclipse.jst.j2ee.webservice/webservice/org/eclipse/jst/j2ee/internal/webservice/provider/AbstractATKUIItemProvider.java
+++ /dev/null
@@ -1,85 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2003, 2005 IBM Corporation and others.
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
- *
- * Contributors:
- * IBM Corporation - initial API and implementation
- *******************************************************************************/
-package org.eclipse.jst.j2ee.internal.webservice.provider;
-
-import java.util.ArrayList;
-import java.util.Collection;
-import java.util.Iterator;
-import java.util.List;
-
-import org.eclipse.emf.common.notify.AdapterFactory;
-import org.eclipse.emf.common.util.EList;
-import org.eclipse.emf.common.util.ResourceLocator;
-import org.eclipse.emf.ecore.EObject;
-import org.eclipse.emf.ecore.EStructuralFeature;
-import org.eclipse.emf.edit.provider.ItemProviderAdapter;
-import org.eclipse.jst.j2ee.internal.webservice.adapter.AdapterViewerItem;
-import org.eclipse.jst.j2ee.internal.webservice.plugin.WebServicePlugin;
-
-
-// Non-generated provider code
-
-public abstract class AbstractATKUIItemProvider extends ItemProviderAdapter {
- public AbstractATKUIItemProvider(AdapterFactory adapterFactory) {
- super(adapterFactory);
- }
-
- /**
- * Get the resource locator for this adapter's resources.
- */
- @Override
- protected ResourceLocator getResourceLocator() {
- return WebServicePlugin.getInstance();
- }
-
- /**
- * This implements
- * {@link ITreeItemContentProvider#getChildren ITreeItemContentProvider.getChildren}by calling
- * {@link #getChildrenReferences getChildrenReferences}and using those to collect the children.
- */
- @Override
- public Collection getChildren(Object object) {
- if (object instanceof EList)
- return getChildrenFromEList((EList) object);
- else if (object instanceof AdapterViewerItem)
- return getChildrenFromAdapterViewerItem((AdapterViewerItem) object);
- else
- return super.getChildren(object);
- }
-
- protected Collection getChildrenFromEList(EList eList) {
- Collection result = new ArrayList();
- for (Iterator it = eList.iterator(); it.hasNext();)
- result.addAll(super.getChildren(it.next()));
- return result;
- }
-
- protected Collection getChildrenFromAdapterViewerItem(AdapterViewerItem adapterViewerItem) {
- Collection result = new ArrayList();
- EList eObjectList = adapterViewerItem.getEObjectList();
- EStructuralFeature feature = adapterViewerItem.getEStructuralFeature();
- for (Iterator it = eObjectList.iterator(); it.hasNext();) {
- EObject eObject = (EObject) it.next();
- Object object = eObject.eGet(feature);
- if (object != null) {
- if (object instanceof List)
- result.addAll((List) object);
- else
- result.add(object);
- }
- }
- return result;
- }
-
- protected String toDisplayString(String s) {
- return (s != null) ? s : ""; //$NON-NLS-1$
- }
-}
diff --git a/plugins/org.eclipse.jst.j2ee.webservice/webservice/org/eclipse/jst/j2ee/internal/webservice/provider/BeanLinkItemProvider.java b/plugins/org.eclipse.jst.j2ee.webservice/webservice/org/eclipse/jst/j2ee/internal/webservice/provider/BeanLinkItemProvider.java
deleted file mode 100644
index 951badd..0000000
--- a/plugins/org.eclipse.jst.j2ee.webservice/webservice/org/eclipse/jst/j2ee/internal/webservice/provider/BeanLinkItemProvider.java
+++ /dev/null
@@ -1,169 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2003, 2004 IBM Corporation and others.
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
- *
- * Contributors:
- * IBM Corporation - initial API and implementation
- *******************************************************************************/
-package org.eclipse.jst.j2ee.internal.webservice.provider;
-
-
-import java.util.ArrayList;
-import java.util.Collection;
-import java.util.Iterator;
-import java.util.List;
-
-import org.eclipse.emf.common.notify.AdapterFactory;
-import org.eclipse.emf.common.notify.Notification;
-import org.eclipse.emf.common.util.EList;
-import org.eclipse.emf.common.util.ResourceLocator;
-import org.eclipse.emf.ecore.EObject;
-import org.eclipse.emf.ecore.EStructuralFeature;
-import org.eclipse.emf.edit.provider.IEditingDomainItemProvider;
-import org.eclipse.emf.edit.provider.IItemLabelProvider;
-import org.eclipse.emf.edit.provider.IItemPropertySource;
-import org.eclipse.emf.edit.provider.ITreeItemContentProvider;
-import org.eclipse.emf.edit.provider.ItemProviderAdapter;
-import org.eclipse.jst.j2ee.internal.webservice.adapter.AdapterViewerItem;
-import org.eclipse.jst.j2ee.internal.webservice.plugin.WebServicePlugin;
-
-
-/**
- * This is the item provider adpater for a {@link org.eclipse.jst.j2ee.internal.internal.webservice.wsdd.BeanLink}object.
- * <!-- begin-user-doc --> <!-- end-user-doc -->
- *
- * @generated
- */
-public class BeanLinkItemProvider extends ItemProviderAdapter implements IEditingDomainItemProvider, ITreeItemContentProvider, IItemLabelProvider, IItemPropertySource {
- /**
- * This constructs an instance from a factory and a notifier. <!-- begin-user-doc --> <!--
- * end-user-doc -->
- *
- * @generated
- */
- public BeanLinkItemProvider(AdapterFactory adapterFactory) {
- super(adapterFactory);
- }
-
- /**
- * This returns the property descriptors for the adapted class. <!-- begin-user-doc --> <!--
- * end-user-doc -->
- *
- * @generated
- */
- @Override
- public List getPropertyDescriptors(Object object) {
- if (itemPropertyDescriptors == null) {
- super.getPropertyDescriptors(object);
-
- }
- return itemPropertyDescriptors;
- }
-
-
- /**
- * This returns BeanLink.gif. <!-- begin-user-doc --> <!-- end-user-doc -->
- *
- * @generated
- */
- @Override
- public Object getImage(Object object) {
- return getResourceLocator().getImage("full/obj16/BeanLink"); //$NON-NLS-1$
- }
-
- /**
- * This returns the label text for the adapted class. <!-- begin-user-doc --> <!-- end-user-doc
- * -->
- *
- * @generated
- */
- /*
- * public String getText(Object object) { return getString("_UI_BeanLink_type"); }
- */
-
- /**
- * This returns the label text for the adapted class. <!-- begin-user-doc --> <!-- end-user-doc
- * -->
- *
- * @non-generated
- */
- @Override
- public String getText(Object object) {
- return getString("%_UI_BeanLink_type"); //$NON-NLS-1$
- }
-
- /**
- * This handles notification by calling {@link #fireNotifyChanged fireNotifyChanged}. <!--
- * begin-user-doc --> <!-- end-user-doc -->
- *
- * @generated
- */
- @Override
- public void notifyChanged(Notification notification) {
- super.notifyChanged(notification);
- }
-
- /**
- * This adds to the collection of {@link org.eclipse.emf.edit.command.CommandParameter}s
- * describing all of the children that can be created under this object. <!-- begin-user-doc -->
- * <!-- end-user-doc -->
- *
- * @generated
- */
- @Override
- protected void collectNewChildDescriptors(Collection newChildDescriptors, Object object) {
- super.collectNewChildDescriptors(newChildDescriptors, object);
- }
-
- /**
- * Return the resource locator for this item provider's resources. <!-- begin-user-doc --> <!--
- * end-user-doc -->
- *
- */
- @Override
- public ResourceLocator getResourceLocator() {
- return WebServicePlugin.getInstance();
- }
-
- /**
- * This implements
- * {@link ITreeItemContentProvider#getChildren ITreeItemContentProvider.getChildren}by calling
- * {@link #getChildrenReferences getChildrenReferences}and using those to collect the children.
- */
- @Override
- public Collection getChildren(Object object) {
- if (object instanceof EList)
- return getChildrenFromEList((EList) object);
- else if (object instanceof AdapterViewerItem)
- return getChildrenFromAdapterViewerItem((AdapterViewerItem) object);
- else
- return super.getChildren(object);
- }
-
- protected Collection getChildrenFromEList(EList eList) {
- Collection result = new ArrayList();
- for (Iterator it = eList.iterator(); it.hasNext();)
- result.addAll(super.getChildren(it.next()));
- return result;
- }
-
- protected Collection getChildrenFromAdapterViewerItem(AdapterViewerItem adapterViewerItem) {
- Collection result = new ArrayList();
- EList eObjectList = adapterViewerItem.getEObjectList();
- EStructuralFeature feature = adapterViewerItem.getEStructuralFeature();
- for (Iterator it = eObjectList.iterator(); it.hasNext();) {
- EObject eObject = (EObject) it.next();
- Object object = eObject.eGet(feature);
- if (object != null) {
- if (object instanceof List)
- result.addAll((List) object);
- else
- result.add(object);
- }
- }
- return result;
- }
-}
\ No newline at end of file
diff --git a/plugins/org.eclipse.jst.j2ee.webservice/webservice/org/eclipse/jst/j2ee/internal/webservice/provider/ComponentScopedRefsItemProvider.java b/plugins/org.eclipse.jst.j2ee.webservice/webservice/org/eclipse/jst/j2ee/internal/webservice/provider/ComponentScopedRefsItemProvider.java
deleted file mode 100644
index 12e7016..0000000
--- a/plugins/org.eclipse.jst.j2ee.webservice/webservice/org/eclipse/jst/j2ee/internal/webservice/provider/ComponentScopedRefsItemProvider.java
+++ /dev/null
@@ -1,171 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2003, 2005 IBM Corporation and others.
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
- *
- * Contributors:
- * IBM Corporation - initial API and implementation
- *******************************************************************************/
-package org.eclipse.jst.j2ee.internal.webservice.provider;
-
-
-import java.util.Collection;
-import java.util.List;
-
-import org.eclipse.emf.common.notify.AdapterFactory;
-import org.eclipse.emf.common.notify.Notification;
-import org.eclipse.emf.common.util.ResourceLocator;
-import org.eclipse.emf.edit.provider.ComposeableAdapterFactory;
-import org.eclipse.emf.edit.provider.IEditingDomainItemProvider;
-import org.eclipse.emf.edit.provider.IItemLabelProvider;
-import org.eclipse.emf.edit.provider.IItemPropertySource;
-import org.eclipse.emf.edit.provider.ITreeItemContentProvider;
-import org.eclipse.emf.edit.provider.ItemPropertyDescriptor;
-import org.eclipse.emf.edit.provider.ItemProviderAdapter;
-import org.eclipse.jst.j2ee.internal.webservice.plugin.WebServicePlugin;
-import org.eclipse.jst.j2ee.webservice.wsclient.ComponentScopedRefs;
-import org.eclipse.jst.j2ee.webservice.wsclient.Webservice_clientFactory;
-import org.eclipse.jst.j2ee.webservice.wsclient.Webservice_clientPackage;
-
-
-/**
- * This is the item provider adpater for a {@link com.ibm.etools.wsclient.ComponentScopedRefs}
- * object. <!-- begin-user-doc --> <!-- end-user-doc -->
- *
- * @generated
- */
-public class ComponentScopedRefsItemProvider extends ItemProviderAdapter implements IEditingDomainItemProvider, ITreeItemContentProvider, IItemLabelProvider, IItemPropertySource {
- /**
- * This constructs an instance from a factory and a notifier. <!-- begin-user-doc --> <!--
- * end-user-doc -->
- *
- * @generated
- */
- public ComponentScopedRefsItemProvider(AdapterFactory adapterFactory) {
- super(adapterFactory);
- }
-
- /**
- * This returns the property descriptors for the adapted class. <!-- begin-user-doc --> <!--
- * end-user-doc -->
- *
- * @generated
- */
- @Override
- public List getPropertyDescriptors(Object object) {
- if (itemPropertyDescriptors == null) {
- super.getPropertyDescriptors(object);
-
- addComponentNamePropertyDescriptor(object);
- }
- return itemPropertyDescriptors;
- }
-
- /**
- * This adds a property descriptor for the Component Name feature. <!-- begin-user-doc --> <!--
- * end-user-doc -->
- *
- * @generated
- */
- protected void addComponentNamePropertyDescriptor(Object object) {
- itemPropertyDescriptors.add(new ItemPropertyDescriptor(((ComposeableAdapterFactory) adapterFactory).getRootAdapterFactory(), getString("_UI_ComponentScopedRefs_componentName_feature"), //$NON-NLS-1$
- getString("_UI_PropertyDescriptor_description", "_UI_ComponentScopedRefs_componentName_feature", "_UI_ComponentScopedRefs_type"), //$NON-NLS-1$ //$NON-NLS-2$ //$NON-NLS-3$
- Webservice_clientPackage.eINSTANCE.getComponentScopedRefs_ComponentName(), true, ItemPropertyDescriptor.GENERIC_VALUE_IMAGE));
- }
-
- /**
- * This specifies how to implement {@link #getChildren}and
- * {@link org.eclipse.emf.edit.command.AddCommand}and
- * {@link org.eclipse.emf.edit.command.RemoveCommand}support in {@link #createCommand}. <!--
- * begin-user-doc --> <!-- end-user-doc -->
- *
- * @generated
- */
- @Override
- public Collection getChildrenReferences(Object object) {
- if (childrenReferences == null) {
- super.getChildrenReferences(object);
- childrenReferences.add(Webservice_clientPackage.eINSTANCE.getComponentScopedRefs_ServiceRefs());
- }
- return childrenReferences;
- }
-
-
- /**
- * This returns ComponentScopedRefs.gif. <!-- begin-user-doc --> <!-- end-user-doc -->
- *
- * @generated
- */
- @Override
- public Object getImage(Object object) {
- return getResourceLocator().getImage("icons/full/obj16/ComponentScopedRefs.gif"); //$NON-NLS-1$
- }
-
- /**
- * This returns the label text for the adapted class. <!-- begin-user-doc --> <!-- end-user-doc
- * -->
- *
- * @generated
- */
- /*
- * public String getText(Object object) { String label =
- * ((ComponentScopedRefs)object).getComponentName(); return label == null || label.length() == 0 ?
- * getString("_UI_ComponentScopedRefs_type") : getString("_UI_ComponentScopedRefs_type") + " " +
- * label; }
- */
- /**
- * This returns the label text for the adapted class. <!-- begin-user-doc --> <!-- end-user-doc
- * -->
- *
- * @non-generated
- */
- @Override
- public String getText(Object object) {
- String label = ((ComponentScopedRefs) object).getComponentName();
- return label == null || label.length() == 0 ? getString("%_UI_ComponentScopedRefs_type") : label; //$NON-NLS-1$
- }
-
-
- /**
- * This handles notification by calling {@link #fireNotifyChanged fireNotifyChanged}. <!--
- * begin-user-doc --> <!-- end-user-doc -->
- *
- * @generated
- */
- @Override
- public void notifyChanged(Notification notification) {
- switch (notification.getFeatureID(ComponentScopedRefs.class)) {
- case Webservice_clientPackage.COMPONENT_SCOPED_REFS__COMPONENT_NAME :
- case Webservice_clientPackage.COMPONENT_SCOPED_REFS__SERVICE_REFS : {
- fireNotifyChanged(notification);
- return;
- }
- }
- super.notifyChanged(notification);
- }
-
- /**
- * This adds to the collection of {@link org.eclipse.emf.edit.command.CommandParameter}s
- * describing all of the children that can be created under this object. <!-- begin-user-doc -->
- * <!-- end-user-doc -->
- *
- * @generated
- */
- @Override
- protected void collectNewChildDescriptors(Collection newChildDescriptors, Object object) {
- super.collectNewChildDescriptors(newChildDescriptors, object);
-
- newChildDescriptors.add(createChildParameter(Webservice_clientPackage.eINSTANCE.getComponentScopedRefs_ServiceRefs(), Webservice_clientFactory.eINSTANCE.createServiceRef()));
- }
-
- /**
- * Return the resource locator for this item provider's resources. <!-- begin-user-doc --> <!--
- * end-user-doc -->
- */
- @Override
- public ResourceLocator getResourceLocator() {
- return WebServicePlugin.getInstance();
- }
-}
diff --git a/plugins/org.eclipse.jst.j2ee.webservice/webservice/org/eclipse/jst/j2ee/internal/webservice/provider/ConstructorParameterOrderItemProvider.java b/plugins/org.eclipse.jst.j2ee.webservice/webservice/org/eclipse/jst/j2ee/internal/webservice/provider/ConstructorParameterOrderItemProvider.java
deleted file mode 100644
index f7a0465..0000000
--- a/plugins/org.eclipse.jst.j2ee.webservice/webservice/org/eclipse/jst/j2ee/internal/webservice/provider/ConstructorParameterOrderItemProvider.java
+++ /dev/null
@@ -1,161 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2003, 2005 IBM Corporation and others.
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
- *
- * Contributors:
- * IBM Corporation - initial API and implementation
- *******************************************************************************/
-package org.eclipse.jst.j2ee.internal.webservice.provider;
-
-
-import java.util.Collection;
-import java.util.List;
-
-import org.eclipse.emf.common.notify.AdapterFactory;
-import org.eclipse.emf.common.notify.Notification;
-import org.eclipse.emf.common.util.ResourceLocator;
-import org.eclipse.emf.edit.provider.ComposeableAdapterFactory;
-import org.eclipse.emf.edit.provider.IEditingDomainItemProvider;
-import org.eclipse.emf.edit.provider.IItemLabelProvider;
-import org.eclipse.emf.edit.provider.IItemPropertySource;
-import org.eclipse.emf.edit.provider.ITreeItemContentProvider;
-import org.eclipse.emf.edit.provider.ItemPropertyDescriptor;
-import org.eclipse.emf.edit.provider.ItemProviderAdapter;
-import org.eclipse.jst.j2ee.webservice.jaxrpcmap.ConstructorParameterOrder;
-import org.eclipse.jst.j2ee.webservice.jaxrpcmap.JaxrpcmapFactory;
-import org.eclipse.jst.j2ee.webservice.jaxrpcmap.JaxrpcmapPackage;
-
-
-/**
- * This is the item provider adpater for a
- * {@link org.eclipse.jst.j2ee.internal.internal.webservice.jaxrpcmap.ConstructorParameterOrder}object. <!-- begin-user-doc
- * --> <!-- end-user-doc -->
- *
- * @generated
- */
-public class ConstructorParameterOrderItemProvider extends ItemProviderAdapter implements IEditingDomainItemProvider, ITreeItemContentProvider, IItemLabelProvider, IItemPropertySource {
- /**
- * This constructs an instance from a factory and a notifier. <!-- begin-user-doc --> <!--
- * end-user-doc -->
- *
- * @generated
- */
- public ConstructorParameterOrderItemProvider(AdapterFactory adapterFactory) {
- super(adapterFactory);
- }
-
- /**
- * This returns the property descriptors for the adapted class. <!-- begin-user-doc --> <!--
- * end-user-doc -->
- *
- * @generated
- */
- @Override
- public List getPropertyDescriptors(Object object) {
- if (itemPropertyDescriptors == null) {
- super.getPropertyDescriptors(object);
-
- addIdPropertyDescriptor(object);
- }
- return itemPropertyDescriptors;
- }
-
- /**
- * This adds a property descriptor for the Id feature. <!-- begin-user-doc --> <!-- end-user-doc
- * -->
- *
- * @generated
- */
- protected void addIdPropertyDescriptor(Object object) {
- itemPropertyDescriptors.add(new ItemPropertyDescriptor(((ComposeableAdapterFactory) adapterFactory).getRootAdapterFactory(), getString("_UI_ConstructorParameterOrder_id_feature"), //$NON-NLS-1$
- getString("_UI_PropertyDescriptor_description", "_UI_ConstructorParameterOrder_id_feature", "_UI_ConstructorParameterOrder_type"), //$NON-NLS-1$ //$NON-NLS-2$ //$NON-NLS-3$
- JaxrpcmapPackage.eINSTANCE.getConstructorParameterOrder_Id(), true, ItemPropertyDescriptor.GENERIC_VALUE_IMAGE));
- }
-
- /**
- * This specifies how to implement {@link #getChildren}and
- * {@link org.eclipse.emf.edit.command.AddCommand}and
- * {@link org.eclipse.emf.edit.command.RemoveCommand}support in {@link #createCommand}. <!--
- * begin-user-doc --> <!-- end-user-doc -->
- *
- * @generated
- */
- @Override
- public Collection getChildrenReferences(Object object) {
- if (childrenFeatures == null) {
- super.getChildrenFeatures(object);
- childrenFeatures.add(JaxrpcmapPackage.eINSTANCE.getConstructorParameterOrder_ElementNames());
- }
- return childrenFeatures;
- }
-
-
- /**
- * This returns ConstructorParameterOrder.gif. <!-- begin-user-doc --> <!-- end-user-doc -->
- *
- * @generated
- */
- @Override
- public Object getImage(Object object) {
- return getResourceLocator().getImage("full/obj16/ConstructorParameterOrder"); //$NON-NLS-1$
- }
-
- /**
- * This returns the label text for the adapted class. <!-- begin-user-doc --> <!-- end-user-doc
- * -->
- *
- * @generated
- */
- @Override
- public String getText(Object object) {
- String label = ((ConstructorParameterOrder) object).getId();
- return label == null || label.length() == 0 ? getString("_UI_ConstructorParameterOrder_type") : //$NON-NLS-1$
- getString("_UI_ConstructorParameterOrder_type") + " " + label; //$NON-NLS-1$ //$NON-NLS-2$
- }
-
- /**
- * This handles notification by calling {@link #fireNotifyChanged fireNotifyChanged}. <!--
- * begin-user-doc --> <!-- end-user-doc -->
- *
- * @generated
- */
- @Override
- public void notifyChanged(Notification notification) {
- switch (notification.getFeatureID(ConstructorParameterOrder.class)) {
- case JaxrpcmapPackage.CONSTRUCTOR_PARAMETER_ORDER__ID :
- case JaxrpcmapPackage.CONSTRUCTOR_PARAMETER_ORDER__ELEMENT_NAMES : {
- fireNotifyChanged(notification);
- return;
- }
- }
- super.notifyChanged(notification);
- }
-
- /**
- * This adds to the collection of {@link org.eclipse.emf.edit.command.CommandParameter}s
- * describing all of the children that can be created under this object. <!-- begin-user-doc -->
- * <!-- end-user-doc -->
- *
- * @generated
- */
- @Override
- protected void collectNewChildDescriptors(Collection newChildDescriptors, Object object) {
- super.collectNewChildDescriptors(newChildDescriptors, object);
-
- newChildDescriptors.add(createChildParameter(JaxrpcmapPackage.eINSTANCE.getConstructorParameterOrder_ElementNames(), JaxrpcmapFactory.eINSTANCE.createElementName()));
- }
-
- /**
- * Return the resource locator for this item provider's resources. <!-- begin-user-doc --> <!--
- * end-user-doc -->
- *
- * @generated
- */
- @Override
- public ResourceLocator getResourceLocator() {
- return Webservicej2eeEditPlugin.INSTANCE;
- }
-}
diff --git a/plugins/org.eclipse.jst.j2ee.webservice/webservice/org/eclipse/jst/j2ee/internal/webservice/provider/DescriptionTypeItemProvider.java b/plugins/org.eclipse.jst.j2ee.webservice/webservice/org/eclipse/jst/j2ee/internal/webservice/provider/DescriptionTypeItemProvider.java
deleted file mode 100644
index 37d9df2..0000000
--- a/plugins/org.eclipse.jst.j2ee.webservice/webservice/org/eclipse/jst/j2ee/internal/webservice/provider/DescriptionTypeItemProvider.java
+++ /dev/null
@@ -1,114 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2003, 2004 IBM Corporation and others.
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
- *
- * Contributors:
- * IBM Corporation - initial API and implementation
- *******************************************************************************/
-package org.eclipse.jst.j2ee.internal.webservice.provider;
-
-
-import java.util.Collection;
-import java.util.List;
-
-import org.eclipse.emf.common.notify.AdapterFactory;
-import org.eclipse.emf.common.notify.Notification;
-import org.eclipse.emf.common.util.ResourceLocator;
-import org.eclipse.jst.j2ee.common.internal.provider.DescriptionItemProvider;
-import org.eclipse.jst.j2ee.webservice.wscommon.DescriptionType;
-
-
-/**
- * This is the item provider adpater for a
- * {@link org.eclipse.jst.j2ee.internal.internal.webservice.wscommon.DescriptionType}object. <!-- begin-user-doc --> <!--
- * end-user-doc -->
- *
- * @generated
- */
-public class DescriptionTypeItemProvider extends DescriptionItemProvider {
- /**
- * This constructs an instance from a factory and a notifier. <!-- begin-user-doc --> <!--
- * end-user-doc -->
- *
- * @generated
- */
- public DescriptionTypeItemProvider(AdapterFactory adapterFactory) {
- super(adapterFactory);
- }
-
- /**
- * This returns the property descriptors for the adapted class. <!-- begin-user-doc --> <!--
- * end-user-doc -->
- *
- * @generated
- */
- @Override
- public List getPropertyDescriptors(Object object) {
- if (itemPropertyDescriptors == null) {
- super.getPropertyDescriptors(object);
-
- }
- return itemPropertyDescriptors;
- }
-
-
- /**
- * This returns DescriptionType.gif. <!-- begin-user-doc --> <!-- end-user-doc -->
- *
- * @generated
- */
- @Override
- public Object getImage(Object object) {
- return getResourceLocator().getImage("full/obj16/DescriptionType"); //$NON-NLS-1$
- }
-
- /**
- * This returns the label text for the adapted class. <!-- begin-user-doc --> <!-- end-user-doc
- * -->
- *
- * @generated
- */
- @Override
- public String getText(Object object) {
- String label = ((DescriptionType) object).getLang();
- return label == null || label.length() == 0 ? getString("_UI_DescriptionType_type") : //$NON-NLS-1$
- getString("_UI_DescriptionType_type") + " " + label; //$NON-NLS-1$ //$NON-NLS-2$
- }
-
- /**
- * This handles notification by calling {@link #fireNotifyChanged fireNotifyChanged}. <!--
- * begin-user-doc --> <!-- end-user-doc -->
- *
- * @generated
- */
- @Override
- public void notifyChanged(Notification notification) {
- super.notifyChanged(notification);
- }
-
- /**
- * This adds to the collection of {@link org.eclipse.emf.edit.command.CommandParameter}s
- * describing all of the children that can be created under this object. <!-- begin-user-doc -->
- * <!-- end-user-doc -->
- *
- * @generated
- */
- @Override
- protected void collectNewChildDescriptors(Collection newChildDescriptors, Object object) {
- super.collectNewChildDescriptors(newChildDescriptors, object);
- }
-
- /**
- * Return the resource locator for this item provider's resources. <!-- begin-user-doc --> <!--
- * end-user-doc -->
- *
- * @generated
- */
- @Override
- public ResourceLocator getResourceLocator() {
- return Webservicej2eeEditPlugin.INSTANCE;
- }
-}
\ No newline at end of file
diff --git a/plugins/org.eclipse.jst.j2ee.webservice/webservice/org/eclipse/jst/j2ee/internal/webservice/provider/DisplayNameTypeItemProvider.java b/plugins/org.eclipse.jst.j2ee.webservice/webservice/org/eclipse/jst/j2ee/internal/webservice/provider/DisplayNameTypeItemProvider.java
deleted file mode 100644
index 0d15751..0000000
--- a/plugins/org.eclipse.jst.j2ee.webservice/webservice/org/eclipse/jst/j2ee/internal/webservice/provider/DisplayNameTypeItemProvider.java
+++ /dev/null
@@ -1,114 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2003, 2004 IBM Corporation and others.
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
- *
- * Contributors:
- * IBM Corporation - initial API and implementation
- *******************************************************************************/
-package org.eclipse.jst.j2ee.internal.webservice.provider;
-
-
-import java.util.Collection;
-import java.util.List;
-
-import org.eclipse.emf.common.notify.AdapterFactory;
-import org.eclipse.emf.common.notify.Notification;
-import org.eclipse.emf.common.util.ResourceLocator;
-import org.eclipse.jst.j2ee.common.internal.provider.DisplayNameItemProvider;
-import org.eclipse.jst.j2ee.webservice.wscommon.DisplayNameType;
-
-
-/**
- * This is the item provider adpater for a
- * {@link org.eclipse.jst.j2ee.internal.internal.webservice.wscommon.DisplayNameType}object. <!-- begin-user-doc --> <!--
- * end-user-doc -->
- *
- * @generated
- */
-public class DisplayNameTypeItemProvider extends DisplayNameItemProvider{
- /**
- * This constructs an instance from a factory and a notifier. <!-- begin-user-doc --> <!--
- * end-user-doc -->
- *
- * @generated
- */
- public DisplayNameTypeItemProvider(AdapterFactory adapterFactory) {
- super(adapterFactory);
- }
-
- /**
- * This returns the property descriptors for the adapted class. <!-- begin-user-doc --> <!--
- * end-user-doc -->
- *
- * @generated
- */
- @Override
- public List getPropertyDescriptors(Object object) {
- if (itemPropertyDescriptors == null) {
- super.getPropertyDescriptors(object);
-
- }
- return itemPropertyDescriptors;
- }
-
-
- /**
- * This returns DisplayNameType.gif. <!-- begin-user-doc --> <!-- end-user-doc -->
- *
- * @generated
- */
- @Override
- public Object getImage(Object object) {
- return getResourceLocator().getImage("full/obj16/DisplayNameType"); //$NON-NLS-1$
- }
-
- /**
- * This returns the label text for the adapted class. <!-- begin-user-doc --> <!-- end-user-doc
- * -->
- *
- * @generated
- */
- @Override
- public String getText(Object object) {
- String label = ((DisplayNameType) object).getLang();
- return label == null || label.length() == 0 ? getString("_UI_DisplayNameType_type") : //$NON-NLS-1$
- getString("_UI_DisplayNameType_type") + " " + label; //$NON-NLS-1$ //$NON-NLS-2$
- }
-
- /**
- * This handles notification by calling {@link #fireNotifyChanged fireNotifyChanged}. <!--
- * begin-user-doc --> <!-- end-user-doc -->
- *
- * @generated
- */
- @Override
- public void notifyChanged(Notification notification) {
- super.notifyChanged(notification);
- }
-
- /**
- * This adds to the collection of {@link org.eclipse.emf.edit.command.CommandParameter}s
- * describing all of the children that can be created under this object. <!-- begin-user-doc -->
- * <!-- end-user-doc -->
- *
- * @generated
- */
- @Override
- protected void collectNewChildDescriptors(Collection newChildDescriptors, Object object) {
- super.collectNewChildDescriptors(newChildDescriptors, object);
- }
-
- /**
- * Return the resource locator for this item provider's resources. <!-- begin-user-doc --> <!--
- * end-user-doc -->
- *
- * @generated
- */
- @Override
- public ResourceLocator getResourceLocator() {
- return Webservicej2eeEditPlugin.INSTANCE;
- }
-}
\ No newline at end of file
diff --git a/plugins/org.eclipse.jst.j2ee.webservice/webservice/org/eclipse/jst/j2ee/internal/webservice/provider/EJBLinkItemProvider.java b/plugins/org.eclipse.jst.j2ee.webservice/webservice/org/eclipse/jst/j2ee/internal/webservice/provider/EJBLinkItemProvider.java
deleted file mode 100644
index bb64e2d..0000000
--- a/plugins/org.eclipse.jst.j2ee.webservice/webservice/org/eclipse/jst/j2ee/internal/webservice/provider/EJBLinkItemProvider.java
+++ /dev/null
@@ -1,159 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2003, 2005 IBM Corporation and others.
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
- *
- * Contributors:
- * IBM Corporation - initial API and implementation
- *******************************************************************************/
-package org.eclipse.jst.j2ee.internal.webservice.provider;
-
-
-import java.util.Collection;
-import java.util.List;
-
-import org.eclipse.emf.common.notify.AdapterFactory;
-import org.eclipse.emf.common.notify.Notification;
-import org.eclipse.emf.common.util.ResourceLocator;
-import org.eclipse.emf.edit.provider.ComposeableAdapterFactory;
-import org.eclipse.emf.edit.provider.ItemPropertyDescriptor;
-import org.eclipse.jst.j2ee.internal.webservice.plugin.WebServicePlugin;
-import org.eclipse.jst.j2ee.webservice.wsdd.EJBLink;
-import org.eclipse.jst.j2ee.webservice.wsdd.WsddPackage;
-
-
-/**
- * This is the item provider adpater for a {@link org.eclipse.jst.j2ee.internal.internal.webservice.wsdd.EJBLink}object.
- * <!-- begin-user-doc --> <!-- end-user-doc -->
- *
- * @generated
- */
-public class EJBLinkItemProvider extends BeanLinkItemProvider{
- /**
- * This constructs an instance from a factory and a notifier. <!-- begin-user-doc --> <!--
- * end-user-doc -->
- *
- * @generated
- */
- public EJBLinkItemProvider(AdapterFactory adapterFactory) {
- super(adapterFactory);
- }
-
- /**
- * This returns the property descriptors for the adapted class. <!-- begin-user-doc --> <!--
- * end-user-doc -->
- *
- * @generated
- */
- @Override
- public List getPropertyDescriptors(Object object) {
- if (itemPropertyDescriptors == null) {
- super.getPropertyDescriptors(object);
-
- addEjbLinkPropertyDescriptor(object);
- }
- return itemPropertyDescriptors;
- }
-
- /**
- * This adds a property descriptor for the Id feature. <!-- begin-user-doc --> <!-- end-user-doc
- * -->
- *
- * @generated
- */
- /*
- * pgm protected void addIdPropertyDescriptor(Object object) { itemPropertyDescriptors.add (new
- * ItemPropertyDescriptor (((ComposeableAdapterFactory)adapterFactory).getRootAdapterFactory(),
- * getString("_UI_EJBLink_id_feature"), getString("_UI_PropertyDescriptor_description",
- * "_UI_EJBLink_id_feature", "_UI_EJBLink_type"), WsddPackage.eINSTANCE.getEJBLink_Id(), true,
- * ItemPropertyDescriptor.GENERIC_VALUE_IMAGE)); }
- */
-
- /**
- * This adds a property descriptor for the Ejb Link feature. <!-- begin-user-doc --> <!--
- * end-user-doc -->
- *
- * @generated
- */
- protected void addEjbLinkPropertyDescriptor(Object object) {
- itemPropertyDescriptors.add(new ItemPropertyDescriptor(((ComposeableAdapterFactory) adapterFactory).getRootAdapterFactory(), getString("_UI_EJBLink_ejbLink_feature"), //$NON-NLS-1$
- getString("_UI_PropertyDescriptor_description", "_UI_EJBLink_ejbLink_feature", "_UI_EJBLink_type"), //$NON-NLS-1$ //$NON-NLS-2$ //$NON-NLS-3$
- WsddPackage.eINSTANCE.getEJBLink_EjbLink(), true, ItemPropertyDescriptor.GENERIC_VALUE_IMAGE));
- }
-
-
- /**
- * This returns EJBLink.gif. <!-- begin-user-doc --> <!-- end-user-doc -->
- */
- @Override
- public Object getImage(Object object) {
- return getResourceLocator().getImage("icons/full/obj16/sessionBean_obj.gif"); //$NON-NLS-1$
- }
-
- /**
- * This returns the label text for the adapted class. <!-- begin-user-doc --> <!-- end-user-doc
- * -->
- *
- * @generated
- */
- /*
- * public String getText(Object object) { String label = ((EJBLink)object).getId(); return label ==
- * null || label.length() == 0 ? getString("_UI_EJBLink_type") : getString("_UI_EJBLink_type") + " " +
- * label; }
- */
-
- /**
- * This returns the label text for the adapted class. <!-- begin-user-doc --> <!-- end-user-doc
- * -->
- *
- * @non-generated
- */
- @Override
- public String getText(Object object) {
- String label = ((EJBLink) object).getEjbLink();
- return label == null || label.length() == 0 ? getString("%_UI_EJBLink_type") : label; //$NON-NLS-1$
- }
-
- /**
- * This handles notification by calling {@link #fireNotifyChanged fireNotifyChanged}. <!--
- * begin-user-doc --> <!-- end-user-doc -->
- *
- * @generated
- */
- @Override
- public void notifyChanged(Notification notification) {
- switch (notification.getFeatureID(EJBLink.class)) {
- case WsddPackage.EJB_LINK__EJB_LINK : {
- fireNotifyChanged(notification);
- return;
- }
- }
- super.notifyChanged(notification);
- }
-
- /**
- * This adds to the collection of {@link org.eclipse.emf.edit.command.CommandParameter}s
- * describing all of the children that can be created under this object. <!-- begin-user-doc -->
- * <!-- end-user-doc -->
- *
- * @generated
- */
- @Override
- protected void collectNewChildDescriptors(Collection newChildDescriptors, Object object) {
- super.collectNewChildDescriptors(newChildDescriptors, object);
- }
-
- /**
- * Return the resource locator for this item provider's resources. <!-- begin-user-doc --> <!--
- * end-user-doc -->
- *
- */
- @Override
- public ResourceLocator getResourceLocator() {
- return WebServicePlugin.getInstance();
- }
-
-
-}
diff --git a/plugins/org.eclipse.jst.j2ee.webservice/webservice/org/eclipse/jst/j2ee/internal/webservice/provider/ElementNameItemProvider.java b/plugins/org.eclipse.jst.j2ee.webservice/webservice/org/eclipse/jst/j2ee/internal/webservice/provider/ElementNameItemProvider.java
deleted file mode 100644
index 8b7457b..0000000
--- a/plugins/org.eclipse.jst.j2ee.webservice/webservice/org/eclipse/jst/j2ee/internal/webservice/provider/ElementNameItemProvider.java
+++ /dev/null
@@ -1,153 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2003, 2005 IBM Corporation and others.
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
- *
- * Contributors:
- * IBM Corporation - initial API and implementation
- *******************************************************************************/
-package org.eclipse.jst.j2ee.internal.webservice.provider;
-
-
-import java.util.Collection;
-import java.util.List;
-
-import org.eclipse.emf.common.notify.AdapterFactory;
-import org.eclipse.emf.common.notify.Notification;
-import org.eclipse.emf.common.util.ResourceLocator;
-import org.eclipse.emf.edit.provider.ComposeableAdapterFactory;
-import org.eclipse.emf.edit.provider.IEditingDomainItemProvider;
-import org.eclipse.emf.edit.provider.IItemLabelProvider;
-import org.eclipse.emf.edit.provider.IItemPropertySource;
-import org.eclipse.emf.edit.provider.ITreeItemContentProvider;
-import org.eclipse.emf.edit.provider.ItemPropertyDescriptor;
-import org.eclipse.emf.edit.provider.ItemProviderAdapter;
-import org.eclipse.jst.j2ee.webservice.jaxrpcmap.ElementName;
-import org.eclipse.jst.j2ee.webservice.jaxrpcmap.JaxrpcmapPackage;
-
-
-/**
- * This is the item provider adpater for a {@link org.eclipse.jst.j2ee.internal.internal.webservice.jaxrpcmap.ElementName}
- * object. <!-- begin-user-doc --> <!-- end-user-doc -->
- *
- * @generated
- */
-public class ElementNameItemProvider extends ItemProviderAdapter implements IEditingDomainItemProvider, ITreeItemContentProvider, IItemLabelProvider, IItemPropertySource {
- /**
- * This constructs an instance from a factory and a notifier. <!-- begin-user-doc --> <!--
- * end-user-doc -->
- *
- * @generated
- */
- public ElementNameItemProvider(AdapterFactory adapterFactory) {
- super(adapterFactory);
- }
-
- /**
- * This returns the property descriptors for the adapted class. <!-- begin-user-doc --> <!--
- * end-user-doc -->
- *
- * @generated
- */
- @Override
- public List getPropertyDescriptors(Object object) {
- if (itemPropertyDescriptors == null) {
- super.getPropertyDescriptors(object);
-
- addIdPropertyDescriptor(object);
- addTextPropertyDescriptor(object);
- }
- return itemPropertyDescriptors;
- }
-
- /**
- * This adds a property descriptor for the Id feature. <!-- begin-user-doc --> <!-- end-user-doc
- * -->
- *
- * @generated
- */
- protected void addIdPropertyDescriptor(Object object) {
- itemPropertyDescriptors.add(new ItemPropertyDescriptor(((ComposeableAdapterFactory) adapterFactory).getRootAdapterFactory(), getString("_UI_ElementName_id_feature"), //$NON-NLS-1$
- getString("_UI_PropertyDescriptor_description", "_UI_ElementName_id_feature", "_UI_ElementName_type"), //$NON-NLS-1$ //$NON-NLS-2$ //$NON-NLS-3$
- JaxrpcmapPackage.eINSTANCE.getElementName_Id(), true, ItemPropertyDescriptor.GENERIC_VALUE_IMAGE));
- }
-
- /**
- * This adds a property descriptor for the Text feature. <!-- begin-user-doc --> <!--
- * end-user-doc -->
- *
- * @generated
- */
- protected void addTextPropertyDescriptor(Object object) {
- itemPropertyDescriptors.add(new ItemPropertyDescriptor(((ComposeableAdapterFactory) adapterFactory).getRootAdapterFactory(), getString("_UI_ElementName_text_feature"), //$NON-NLS-1$
- getString("_UI_PropertyDescriptor_description", "_UI_ElementName_text_feature", "_UI_ElementName_type"), //$NON-NLS-1$ //$NON-NLS-2$ //$NON-NLS-3$
- JaxrpcmapPackage.eINSTANCE.getElementName_Text(), true, ItemPropertyDescriptor.GENERIC_VALUE_IMAGE));
- }
-
-
- /**
- * This returns ElementName.gif. <!-- begin-user-doc --> <!-- end-user-doc -->
- *
- * @generated
- */
- @Override
- public Object getImage(Object object) {
- return getResourceLocator().getImage("full/obj16/ElementName"); //$NON-NLS-1$
- }
-
- /**
- * This returns the label text for the adapted class. <!-- begin-user-doc --> <!-- end-user-doc
- * -->
- *
- * @generated
- */
- @Override
- public String getText(Object object) {
- String label = ((ElementName) object).getId();
- return label == null || label.length() == 0 ? getString("_UI_ElementName_type") : //$NON-NLS-1$
- getString("_UI_ElementName_type") + " " + label; //$NON-NLS-1$ //$NON-NLS-2$
- }
-
- /**
- * This handles notification by calling {@link #fireNotifyChanged fireNotifyChanged}. <!--
- * begin-user-doc --> <!-- end-user-doc -->
- *
- * @generated
- */
- @Override
- public void notifyChanged(Notification notification) {
- switch (notification.getFeatureID(ElementName.class)) {
- case JaxrpcmapPackage.ELEMENT_NAME__ID :
- case JaxrpcmapPackage.ELEMENT_NAME__TEXT : {
- fireNotifyChanged(notification);
- return;
- }
- }
- super.notifyChanged(notification);
- }
-
- /**
- * This adds to the collection of {@link org.eclipse.emf.edit.command.CommandParameter}s
- * describing all of the children that can be created under this object. <!-- begin-user-doc -->
- * <!-- end-user-doc -->
- *
- * @generated
- */
- @Override
- protected void collectNewChildDescriptors(Collection newChildDescriptors, Object object) {
- super.collectNewChildDescriptors(newChildDescriptors, object);
- }
-
- /**
- * Return the resource locator for this item provider's resources. <!-- begin-user-doc --> <!--
- * end-user-doc -->
- *
- * @generated
- */
- @Override
- public ResourceLocator getResourceLocator() {
- return Webservicej2eeEditPlugin.INSTANCE;
- }
-}
diff --git a/plugins/org.eclipse.jst.j2ee.webservice/webservice/org/eclipse/jst/j2ee/internal/webservice/provider/ExceptionMappingItemProvider.java b/plugins/org.eclipse.jst.j2ee.webservice/webservice/org/eclipse/jst/j2ee/internal/webservice/provider/ExceptionMappingItemProvider.java
deleted file mode 100644
index 2eb13f7..0000000
--- a/plugins/org.eclipse.jst.j2ee.webservice/webservice/org/eclipse/jst/j2ee/internal/webservice/provider/ExceptionMappingItemProvider.java
+++ /dev/null
@@ -1,207 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2003, 2005 IBM Corporation and others.
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
- *
- * Contributors:
- * IBM Corporation - initial API and implementation
- *******************************************************************************/
-package org.eclipse.jst.j2ee.internal.webservice.provider;
-
-
-import java.util.Collection;
-import java.util.List;
-
-import org.eclipse.emf.common.notify.AdapterFactory;
-import org.eclipse.emf.common.notify.Notification;
-import org.eclipse.emf.common.util.ResourceLocator;
-import org.eclipse.emf.ecore.EReference;
-import org.eclipse.emf.edit.provider.ComposeableAdapterFactory;
-import org.eclipse.emf.edit.provider.IEditingDomainItemProvider;
-import org.eclipse.emf.edit.provider.IItemLabelProvider;
-import org.eclipse.emf.edit.provider.IItemPropertySource;
-import org.eclipse.emf.edit.provider.ITreeItemContentProvider;
-import org.eclipse.emf.edit.provider.ItemPropertyDescriptor;
-import org.eclipse.emf.edit.provider.ItemProviderAdapter;
-import org.eclipse.jst.j2ee.webservice.jaxrpcmap.ExceptionMapping;
-import org.eclipse.jst.j2ee.webservice.jaxrpcmap.JaxrpcmapFactory;
-import org.eclipse.jst.j2ee.webservice.jaxrpcmap.JaxrpcmapPackage;
-
-
-/**
- * This is the item provider adpater for a
- * {@link org.eclipse.jst.j2ee.internal.internal.webservice.jaxrpcmap.ExceptionMapping}object. <!-- begin-user-doc --> <!--
- * end-user-doc -->
- *
- * @generated
- */
-public class ExceptionMappingItemProvider extends ItemProviderAdapter implements IEditingDomainItemProvider, ITreeItemContentProvider, IItemLabelProvider, IItemPropertySource {
- /**
- * This constructs an instance from a factory and a notifier. <!-- begin-user-doc --> <!--
- * end-user-doc -->
- *
- * @generated
- */
- public ExceptionMappingItemProvider(AdapterFactory adapterFactory) {
- super(adapterFactory);
- }
-
- /**
- * This returns the property descriptors for the adapted class. <!-- begin-user-doc --> <!--
- * end-user-doc -->
- *
- * @generated
- */
- @Override
- public List getPropertyDescriptors(Object object) {
- if (itemPropertyDescriptors == null) {
- super.getPropertyDescriptors(object);
-
- addIdPropertyDescriptor(object);
- addExceptionTypePropertyDescriptor(object);
- addWsdlMessagePartNamePropertyDescriptor(object);
- }
- return itemPropertyDescriptors;
- }
-
- /**
- * This adds a property descriptor for the Id feature. <!-- begin-user-doc --> <!-- end-user-doc
- * -->
- *
- * @generated
- */
- protected void addIdPropertyDescriptor(Object object) {
- itemPropertyDescriptors.add(new ItemPropertyDescriptor(((ComposeableAdapterFactory) adapterFactory).getRootAdapterFactory(), getString("_UI_ExceptionMapping_id_feature"), //$NON-NLS-1$
- getString("_UI_PropertyDescriptor_description", "_UI_ExceptionMapping_id_feature", "_UI_ExceptionMapping_type"), //$NON-NLS-1$ //$NON-NLS-2$ //$NON-NLS-3$
- JaxrpcmapPackage.eINSTANCE.getExceptionMapping_Id(), true, ItemPropertyDescriptor.GENERIC_VALUE_IMAGE));
- }
-
- /**
- * This adds a property descriptor for the Exception Type feature. <!-- begin-user-doc --> <!--
- * end-user-doc -->
- *
- * @generated
- */
- protected void addExceptionTypePropertyDescriptor(Object object) {
- itemPropertyDescriptors.add(new ItemPropertyDescriptor(((ComposeableAdapterFactory) adapterFactory).getRootAdapterFactory(), getString("_UI_ExceptionMapping_exceptionType_feature"), //$NON-NLS-1$
- getString("_UI_PropertyDescriptor_description", "_UI_ExceptionMapping_exceptionType_feature", "_UI_ExceptionMapping_type"), //$NON-NLS-1$ //$NON-NLS-2$ //$NON-NLS-3$
- JaxrpcmapPackage.eINSTANCE.getExceptionMapping_ExceptionType(), true, ItemPropertyDescriptor.GENERIC_VALUE_IMAGE));
- }
-
- /**
- * This adds a property descriptor for the Wsdl Message Part Name feature. <!-- begin-user-doc
- * --> <!-- end-user-doc -->
- *
- * @generated
- */
- protected void addWsdlMessagePartNamePropertyDescriptor(Object object) {
- itemPropertyDescriptors.add(new ItemPropertyDescriptor(((ComposeableAdapterFactory) adapterFactory).getRootAdapterFactory(), getString("_UI_ExceptionMapping_wsdlMessagePartName_feature"), //$NON-NLS-1$
- getString("_UI_PropertyDescriptor_description", "_UI_ExceptionMapping_wsdlMessagePartName_feature", "_UI_ExceptionMapping_type"), //$NON-NLS-1$ //$NON-NLS-2$ //$NON-NLS-3$
- JaxrpcmapPackage.eINSTANCE.getExceptionMapping_WsdlMessagePartName(), true, ItemPropertyDescriptor.GENERIC_VALUE_IMAGE));
- }
-
- /**
- * This specifies how to implement {@link #getChildren}and
- * {@link org.eclipse.emf.edit.command.AddCommand}and
- * {@link org.eclipse.emf.edit.command.RemoveCommand}support in {@link #createCommand}. <!--
- * begin-user-doc --> <!-- end-user-doc -->
- *
- * @generated
- */
- @Override
- public Collection getChildrenReferences(Object object) {
- if (childrenReferences == null) {
- super.getChildrenReferences(object);
- childrenReferences.add(JaxrpcmapPackage.eINSTANCE.getExceptionMapping_WsdlMessage());
- childrenReferences.add(JaxrpcmapPackage.eINSTANCE.getExceptionMapping_ConstructorParameterOrder());
- }
- return childrenReferences;
- }
-
- /**
- * <!-- begin-user-doc --> <!-- end-user-doc -->
- *
- * @generated
- */
- @Override
- protected EReference getChildReference(Object object, Object child) {
- // Check the type of the specified child object and return the proper feature to use for
- // adding (see {@link AddCommand}) it as a child.
-
- return super.getChildReference(object, child);
- }
-
-
- /**
- * This returns ExceptionMapping.gif. <!-- begin-user-doc --> <!-- end-user-doc -->
- *
- * @generated
- */
- @Override
- public Object getImage(Object object) {
- return getResourceLocator().getImage("full/obj16/ExceptionMapping"); //$NON-NLS-1$
- }
-
- /**
- * This returns the label text for the adapted class. <!-- begin-user-doc --> <!-- end-user-doc
- * -->
- *
- * @generated
- */
- @Override
- public String getText(Object object) {
- String label = ((ExceptionMapping) object).getWsdlMessagePartName();
- return label == null || label.length() == 0 ? getString("_UI_ExceptionMapping_type") : //$NON-NLS-1$
- getString("_UI_ExceptionMapping_type") + " " + label; //$NON-NLS-1$ //$NON-NLS-2$
- }
-
- /**
- * This handles notification by calling {@link #fireNotifyChanged fireNotifyChanged}. <!--
- * begin-user-doc --> <!-- end-user-doc -->
- *
- * @generated
- */
- @Override
- public void notifyChanged(Notification notification) {
- switch (notification.getFeatureID(ExceptionMapping.class)) {
- case JaxrpcmapPackage.EXCEPTION_MAPPING__ID :
- case JaxrpcmapPackage.EXCEPTION_MAPPING__EXCEPTION_TYPE :
- case JaxrpcmapPackage.EXCEPTION_MAPPING__WSDL_MESSAGE_PART_NAME :
- case JaxrpcmapPackage.EXCEPTION_MAPPING__WSDL_MESSAGE :
- case JaxrpcmapPackage.EXCEPTION_MAPPING__CONSTRUCTOR_PARAMETER_ORDER : {
- fireNotifyChanged(notification);
- return;
- }
- }
- super.notifyChanged(notification);
- }
-
- /**
- * This adds to the collection of {@link org.eclipse.emf.edit.command.CommandParameter}s
- * describing all of the children that can be created under this object. <!-- begin-user-doc -->
- * <!-- end-user-doc -->
- *
- * @generated
- */
- @Override
- protected void collectNewChildDescriptors(Collection newChildDescriptors, Object object) {
- super.collectNewChildDescriptors(newChildDescriptors, object);
-
- newChildDescriptors.add(createChildParameter(JaxrpcmapPackage.eINSTANCE.getExceptionMapping_WsdlMessage(), JaxrpcmapFactory.eINSTANCE.createWSDLMessage()));
-
- newChildDescriptors.add(createChildParameter(JaxrpcmapPackage.eINSTANCE.getExceptionMapping_ConstructorParameterOrder(), JaxrpcmapFactory.eINSTANCE.createConstructorParameterOrder()));
- }
-
- /**
- * Return the resource locator for this item provider's resources. <!-- begin-user-doc --> <!--
- * end-user-doc -->
- *
- * @generated
- */
- @Override
- public ResourceLocator getResourceLocator() {
- return Webservicej2eeEditPlugin.INSTANCE;
- }
-}
diff --git a/plugins/org.eclipse.jst.j2ee.webservice/webservice/org/eclipse/jst/j2ee/internal/webservice/provider/HandlerItemProvider.java b/plugins/org.eclipse.jst.j2ee.webservice/webservice/org/eclipse/jst/j2ee/internal/webservice/provider/HandlerItemProvider.java
deleted file mode 100644
index a7c7793..0000000
--- a/plugins/org.eclipse.jst.j2ee.webservice/webservice/org/eclipse/jst/j2ee/internal/webservice/provider/HandlerItemProvider.java
+++ /dev/null
@@ -1,225 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2003, 2006 IBM Corporation and others.
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
- *
- * Contributors:
- * IBM Corporation - initial API and implementation
- *******************************************************************************/
-package org.eclipse.jst.j2ee.internal.webservice.provider;
-
-
-import java.util.Collection;
-import java.util.List;
-
-import org.eclipse.emf.common.notify.AdapterFactory;
-import org.eclipse.emf.common.notify.Notification;
-import org.eclipse.emf.common.util.ResourceLocator;
-import org.eclipse.emf.ecore.EReference;
-import org.eclipse.emf.edit.provider.ComposeableAdapterFactory;
-import org.eclipse.emf.edit.provider.ItemPropertyDescriptor;
-import org.eclipse.jst.j2ee.common.CommonFactory;
-import org.eclipse.jst.j2ee.common.internal.provider.CompatibilityDescriptionGroupItemProvider;
-import org.eclipse.jst.j2ee.internal.webservice.plugin.WebServicePlugin;
-import org.eclipse.jst.j2ee.webservice.wsclient.Handler;
-import org.eclipse.jst.j2ee.webservice.wsclient.Webservice_clientPackage;
-import org.eclipse.jst.j2ee.webservice.wscommon.WscommonFactory;
-import org.eclipse.jst.j2ee.webservice.wsdd.WsddFactory;
-
-/**
- * This is the item provider adpater for a {@link com.ibm.etools.wsclient.Handler}object. <!--
- * begin-user-doc --> <!-- end-user-doc -->
- *
- * @generated
- */
-public class HandlerItemProvider extends CompatibilityDescriptionGroupItemProvider {
- /**
- * This constructs an instance from a factory and a notifier. <!-- begin-user-doc --> <!--
- * end-user-doc -->
- *
- * @generated
- */
- public HandlerItemProvider(AdapterFactory adapterFactory) {
- super(adapterFactory);
- }
-
- /**
- * This returns the property descriptors for the adapted class. <!-- begin-user-doc --> <!--
- * end-user-doc -->
- *
- * @generated
- */
- @Override
- public List getPropertyDescriptors(Object object) {
- if (itemPropertyDescriptors == null) {
- super.getPropertyDescriptors(object);
-
- addHandlerNamePropertyDescriptor(object);
- addSoapRolesPropertyDescriptor(object);
- addPortNamesPropertyDescriptor(object);
- addHandlerClassPropertyDescriptor(object);
- }
- return itemPropertyDescriptors;
- }
-
- /**
- * This adds a property descriptor for the Handler Name feature. <!-- begin-user-doc --> <!--
- * end-user-doc -->
- *
- */
- protected void addHandlerNamePropertyDescriptor(Object object) {
- itemPropertyDescriptors.add(new ItemPropertyDescriptor(((ComposeableAdapterFactory) adapterFactory).getRootAdapterFactory(), getString("%_UI_Handler_handlerName_feature"), //$NON-NLS-1$
- getString("%_UI_Handler_handlerName_feature_desc"), //$NON-NLS-1$
- Webservice_clientPackage.eINSTANCE.getHandler_HandlerName(), true, ItemPropertyDescriptor.GENERIC_VALUE_IMAGE));
- }
-
- /**
- * This adds a property descriptor for the Soap Roles feature. <!-- begin-user-doc --> <!--
- * end-user-doc -->
- *
- */
- protected void addSoapRolesPropertyDescriptor(Object object) {
- itemPropertyDescriptors.add(new ItemPropertyDescriptor(((ComposeableAdapterFactory) adapterFactory).getRootAdapterFactory(), getString("%_UI_Handler_soapRoles_feature"), //$NON-NLS-1$
- getString("%_UI_Handler_soapRoles_feature_desc"), //$NON-NLS-1$
- Webservice_clientPackage.eINSTANCE.getHandler_SoapRoles(), false, ItemPropertyDescriptor.GENERIC_VALUE_IMAGE));
- }
-
- /**
- * This adds a property descriptor for the Port Names feature. <!-- begin-user-doc --> <!--
- * end-user-doc -->
- *
- */
- protected void addPortNamesPropertyDescriptor(Object object) {
- itemPropertyDescriptors.add(new ItemPropertyDescriptor(((ComposeableAdapterFactory) adapterFactory).getRootAdapterFactory(), getString("%_UI_Handler_portNames_feature"), //$NON-NLS-1$
- getString("%_UI_Handler_portNames_feature_desc"), //$NON-NLS-1$
- Webservice_clientPackage.eINSTANCE.getHandler_PortNames(), false, ItemPropertyDescriptor.GENERIC_VALUE_IMAGE));
- }
-
- /**
- * This adds a property descriptor for the Handler Class feature. <!-- begin-user-doc --> <!--
- * end-user-doc -->
- *
- */
- protected void addHandlerClassPropertyDescriptor(Object object) {
- itemPropertyDescriptors.add(new ItemPropertyDescriptor(((ComposeableAdapterFactory) adapterFactory).getRootAdapterFactory(), getString("%_UI_Handler_handlerClass_feature"), //$NON-NLS-1$
- getString("%_UI_Handler_handlerClass_feature_desc"), //$NON-NLS-1$
- Webservice_clientPackage.eINSTANCE.getHandler_HandlerClass(), false));
- }
-
- /**
- * This specifies how to implement {@link #getChildren}and
- * {@link org.eclipse.emf.edit.command.AddCommand}and
- * {@link org.eclipse.emf.edit.command.RemoveCommand}support in {@link #createCommand}. <!--
- * begin-user-doc --> <!-- end-user-doc -->
- *
- */
- @Override
- public Collection getChildrenReferences(Object object) {
- if (childrenReferences == null) {
- super.getChildrenReferences(object);
- childrenReferences.add(Webservice_clientPackage.eINSTANCE.getHandler_InitParams());
- childrenReferences.add(Webservice_clientPackage.eINSTANCE.getHandler_SoapHeaders());
-// childrenReferences.add(Webservice_clientPackage.eINSTANCE.getHandler_HandlerName());
- }
- return childrenReferences;
- }
-
- /**
- * <!-- begin-user-doc --> <!-- end-user-doc -->
- *
- * @generated
- */
- @Override
- protected EReference getChildReference(Object object, Object child) {
- // Check the type of the specified child object and return the proper feature to use for
- // adding (see {@link AddCommand}) it as a child.
-
- return super.getChildReference(object, child);
- }
-
-
- /**
- * This returns Handler.gif. <!-- begin-user-doc --> <!-- end-user-doc -->
- */
- @Override
- public Object getImage(Object object) {
- return getResourceLocator().getImage("icons/obj16/handler.gif"); //$NON-NLS-1$
- }
-
- /**
- * This returns the label text for the adapted class. <!-- begin-user-doc --> <!-- end-user-doc
- * -->
- *
- * @generated
- */
- /*
- * public String getText(Object object) { String label = ((Handler)object).getHandlerName();
- * return label == null || label.length() == 0 ? getString("_UI_Handler_type") :
- * getString("_UI_Handler_type") + " " + label; }
- */
-
- /**
- * This returns the label text for the adapted class. <!-- begin-user-doc --> <!-- end-user-doc
- * -->
- *
- * @non-generated
- */
- @Override
- public String getText(Object object) {
- String label = ((Handler) object).getHandlerName();
- return label == null || label.length() == 0 ? getString("%_UI_Handler_type") : getString("%_UI_Handler_type") + ": " + label; //$NON-NLS-1$ //$NON-NLS-2$ //$NON-NLS-3$
- }
-
-
- /**
- * This handles notification by calling {@link #fireNotifyChanged fireNotifyChanged}. <!--
- * begin-user-doc --> <!-- end-user-doc -->
- *
- * @generated
- */
- @Override
- public void notifyChanged(Notification notification) {
- switch (notification.getFeatureID(Handler.class)) {
- case Webservice_clientPackage.HANDLER__HANDLER_NAME :
- case Webservice_clientPackage.HANDLER__SOAP_ROLES :
- case Webservice_clientPackage.HANDLER__PORT_NAMES :
- case Webservice_clientPackage.HANDLER__INIT_PARAMS :
- case Webservice_clientPackage.HANDLER__SOAP_HEADERS : {
- fireNotifyChanged(notification);
- return;
- }
- }
- super.notifyChanged(notification);
- }
-
- /**
- * This adds to the collection of {@link org.eclipse.emf.edit.command.CommandParameter}s
- * describing all of the children that can be created under this object. <!-- begin-user-doc -->
- * <!-- end-user-doc -->
- *
- * @generated
- */
- @Override
- protected void collectNewChildDescriptors(Collection newChildDescriptors, Object object) {
- super.collectNewChildDescriptors(newChildDescriptors, object);
-
- newChildDescriptors.add(createChildParameter(Webservice_clientPackage.eINSTANCE.getHandler_InitParams(), CommonFactory.eINSTANCE.createParamValue()));
-
- newChildDescriptors.add(createChildParameter(Webservice_clientPackage.eINSTANCE.getHandler_SoapHeaders(), CommonFactory.eINSTANCE.createQName()));
-
- newChildDescriptors.add(createChildParameter(Webservice_clientPackage.eINSTANCE.getHandler_SoapHeaders(), WscommonFactory.eINSTANCE.createSOAPHeader()));
-
- newChildDescriptors.add(createChildParameter(Webservice_clientPackage.eINSTANCE.getHandler_SoapHeaders(), WsddFactory.eINSTANCE.createWSDLPort()));
- }
-
- /**
- * Return the resource locator for this item provider's resources. <!-- begin-user-doc --> <!--
- * end-user-doc -->
- */
- @Override
- public ResourceLocator getResourceLocator() {
- return WebServicePlugin.getInstance();
- }
-}
diff --git a/plugins/org.eclipse.jst.j2ee.webservice/webservice/org/eclipse/jst/j2ee/internal/webservice/provider/InitParamItemProvider.java b/plugins/org.eclipse.jst.j2ee.webservice/webservice/org/eclipse/jst/j2ee/internal/webservice/provider/InitParamItemProvider.java
deleted file mode 100644
index d40813f..0000000
--- a/plugins/org.eclipse.jst.j2ee.webservice/webservice/org/eclipse/jst/j2ee/internal/webservice/provider/InitParamItemProvider.java
+++ /dev/null
@@ -1,226 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2003, 2005 IBM Corporation and others.
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
- *
- * Contributors:
- * IBM Corporation - initial API and implementation
- *******************************************************************************/
-package org.eclipse.jst.j2ee.internal.webservice.provider;
-
-
-import java.util.Collection;
-import java.util.List;
-
-import org.eclipse.emf.common.notify.AdapterFactory;
-import org.eclipse.emf.common.notify.Notification;
-import org.eclipse.emf.edit.provider.ComposeableAdapterFactory;
-import org.eclipse.emf.edit.provider.IEditingDomainItemProvider;
-import org.eclipse.emf.edit.provider.IItemLabelProvider;
-import org.eclipse.emf.edit.provider.IItemPropertySource;
-import org.eclipse.emf.edit.provider.ITreeItemContentProvider;
-import org.eclipse.emf.edit.provider.ItemPropertyDescriptor;
-import org.eclipse.jst.j2ee.webservice.wscommon.InitParam;
-import org.eclipse.jst.j2ee.webservice.wscommon.WscommonFactory;
-import org.eclipse.jst.j2ee.webservice.wscommon.WscommonPackage;
-
-
-/**
- * This is the item provider adpater for a {@link org.eclipse.jst.j2ee.internal.internal.webservice.wscommon.InitParam}
- * object. <!-- begin-user-doc --> <!-- end-user-doc -->
- *
- * @generated
- */
-public class InitParamItemProvider extends AbstractATKUIItemProvider implements IEditingDomainItemProvider, ITreeItemContentProvider, IItemLabelProvider, IItemPropertySource {
- /**
- * This constructs an instance from a factory and a notifier. <!-- begin-user-doc --> <!--
- * end-user-doc -->
- *
- * @generated
- */
- public InitParamItemProvider(AdapterFactory adapterFactory) {
- super(adapterFactory);
- }
-
- /**
- * This returns the property descriptors for the adapted class. <!-- begin-user-doc --> <!--
- * end-user-doc -->
- *
- */
- @Override
- public List getPropertyDescriptors(Object object) {
- if (itemPropertyDescriptors == null) {
- super.getPropertyDescriptors(object);
-
- //pgm addIdPropertyDescriptor(object);
- addParamNamePropertyDescriptor(object);
- addParamValuePropertyDescriptor(object);
- addDescriptionPropertyDescriptor(object);
- }
- return itemPropertyDescriptors;
- }
-
- /**
- * This adds a property descriptor for the Id feature. <!-- begin-user-doc --> <!-- end-user-doc
- * -->
- *
- * @generated
- */
- /*
- * pgm protected void addIdPropertyDescriptor(Object object) { itemPropertyDescriptors.add (new
- * ItemPropertyDescriptor (((ComposeableAdapterFactory)adapterFactory).getRootAdapterFactory(),
- * getString("_UI_InitParam_id_feature"), getString("_UI_PropertyDescriptor_description",
- * "_UI_InitParam_id_feature", "_UI_InitParam_type"),
- * WscommonPackage.eINSTANCE.getInitParam_Id(), true,
- * ItemPropertyDescriptor.GENERIC_VALUE_IMAGE)); }
- */
-
- /**
- * This adds a property descriptor for the Param Name feature. <!-- begin-user-doc --> <!--
- * end-user-doc -->
- *
- */
- protected void addParamNamePropertyDescriptor(Object object) {
- itemPropertyDescriptors.add(new ItemPropertyDescriptor(((ComposeableAdapterFactory) adapterFactory).getRootAdapterFactory(), getString("%_UI_InitParam_paramName_feature"), //$NON-NLS-1$
- getString("%_UI_InitParam_paramName_feature_desc"), //$NON-NLS-1$
- WscommonPackage.eINSTANCE.getInitParam_ParamName(), true, ItemPropertyDescriptor.GENERIC_VALUE_IMAGE));
- }
-
- /**
- * This adds a property descriptor for the Param Value feature. <!-- begin-user-doc --> <!--
- * end-user-doc -->
- *
- */
- protected void addParamValuePropertyDescriptor(Object object) {
- itemPropertyDescriptors.add(new ItemPropertyDescriptor(((ComposeableAdapterFactory) adapterFactory).getRootAdapterFactory(), getString("%_UI_InitParam_paramValue_feature"), //$NON-NLS-1$
- getString("%_UI_InitParam_paramValue_feature_desc"), //$NON-NLS-1$
- WscommonPackage.eINSTANCE.getInitParam_ParamValue(), true, ItemPropertyDescriptor.GENERIC_VALUE_IMAGE));
- }
-
- /**
- * This adds a property descriptor for the Description feature. <!-- begin-user-doc --> <!--
- * end-user-doc -->
- *
- */
- protected void addDescriptionPropertyDescriptor(Object object) {
- itemPropertyDescriptors.add(new ItemPropertyDescriptor(((ComposeableAdapterFactory) adapterFactory).getRootAdapterFactory(), getString("%_UI_InitParam_description_feature"), //$NON-NLS-1$
- getString("%_UI_InitParam_description_feature_desc"), //$NON-NLS-1$
- WscommonPackage.eINSTANCE.getInitParam_Description(), true, ItemPropertyDescriptor.GENERIC_VALUE_IMAGE));
- }
-
- /**
- * This specifies how to implement {@link #getChildren}and
- * {@link org.eclipse.emf.edit.command.AddCommand}and
- * {@link org.eclipse.emf.edit.command.RemoveCommand}support in {@link #createCommand}. <!--
- * begin-user-doc --> <!-- end-user-doc -->
- *
- * @generated
- */
- @Override
- public Collection getChildrenReferences(Object object) {
- if (childrenReferences == null) {
- super.getChildrenReferences(object);
- childrenReferences.add(WscommonPackage.eINSTANCE.getInitParam_DescriptionTypes());
- }
- return childrenReferences;
- }
-
-
- /**
- * This returns InitParam.gif. <!-- begin-user-doc --> <!-- end-user-doc -->
- *
- * @generated
- */
- @Override
- public Object getImage(Object object) {
- return getResourceLocator().getImage("icons/full/obj16/initializ_parameter.gif"); //$NON-NLS-1$
- }
-
- /**
- * This returns the label text for the adapted class. <!-- begin-user-doc --> <!-- end-user-doc
- * -->
- *
- * @generated
- */
- /*
- * public String getText(Object object) { String label = ((InitParam)object).getParamName();
- * return label == null || label.length() == 0 ? getString("_UI_InitParam_type") :
- * getString("_UI_InitParam_type") + " " + label; } /*
- *
- * /** This returns the label text for the adapted class. <!-- begin-user-doc --> <!--
- * end-user-doc --> @non-generated
- */
- @Override
- public String getText(Object object) {
- InitParam initParam = (InitParam) object;
- String name = initParam.getParamName();
- String value = initParam.getParamValue();
- if (name == null || name.length() == 0 || value == null || value.length() == 0)
- return getString("%_UI_InitParam_type"); //$NON-NLS-1$
- StringBuffer label = new StringBuffer();
- label.append(name);
- label.append("="); //$NON-NLS-1$
- label.append(value);
- return label.toString();
- }
-
- /**
- * This handles notification by calling {@link #fireNotifyChanged fireNotifyChanged}. <!--
- * begin-user-doc --> <!-- end-user-doc -->
- *
- * @generated
- */
- @Override
- public void notifyChanged(Notification notification) {
- switch (notification.getFeatureID(InitParam.class)) {
- //pgm case WscommonPackage.INIT_PARAM__ID:
- case WscommonPackage.INIT_PARAM__PARAM_NAME :
- case WscommonPackage.INIT_PARAM__PARAM_VALUE :
- case WscommonPackage.INIT_PARAM__DESCRIPTION :
- case WscommonPackage.INIT_PARAM__DESCRIPTION_TYPES : {
- fireNotifyChanged(notification);
- return;
- }
- }
- super.notifyChanged(notification);
- }
-
- /**
- * This adds to the collection of {@link org.eclipse.emf.edit.command.CommandParameter}s
- * describing all of the children that can be created under this object. <!-- begin-user-doc -->
- * <!-- end-user-doc -->
- *
- * @generated
- */
- @Override
- protected void collectNewChildDescriptors(Collection newChildDescriptors, Object object) {
- super.collectNewChildDescriptors(newChildDescriptors, object);
-
- newChildDescriptors.add(createChildParameter(WscommonPackage.eINSTANCE.getInitParam_DescriptionTypes(), WscommonFactory.eINSTANCE.createDescriptionType()));
- }
-
- /**
- * Return the resource locator for this item provider's resources. <!-- begin-user-doc --> <!--
- * end-user-doc -->
- *
- * @generated
- */
- /*
- * public ResourceLocator getResourceLocator() { return Webservicej2eeEditPlugin.INSTANCE; }
- */
- @Override
- public Collection getChildren(Object object) {
- Collection children = super.getChildren(object);
- InitParam param = (InitParam) object;
- if (param.getParamName() != null)
- children.add(param.getParamName());
- if (param.getParamValue() != null)
- children.add(param.getParamValue());
- if (param.getDescription() != null)
- children.add(param.getDescription());
- return children;
-
- }
-}
diff --git a/plugins/org.eclipse.jst.j2ee.webservice/webservice/org/eclipse/jst/j2ee/internal/webservice/provider/InterfaceMappingItemProvider.java b/plugins/org.eclipse.jst.j2ee.webservice/webservice/org/eclipse/jst/j2ee/internal/webservice/provider/InterfaceMappingItemProvider.java
deleted file mode 100644
index 7fce309..0000000
--- a/plugins/org.eclipse.jst.j2ee.webservice/webservice/org/eclipse/jst/j2ee/internal/webservice/provider/InterfaceMappingItemProvider.java
+++ /dev/null
@@ -1,114 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2003, 2004 IBM Corporation and others.
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
- *
- * Contributors:
- * IBM Corporation - initial API and implementation
- *******************************************************************************/
-package org.eclipse.jst.j2ee.internal.webservice.provider;
-
-
-import java.util.Collection;
-import java.util.List;
-
-import org.eclipse.emf.common.notify.AdapterFactory;
-import org.eclipse.emf.common.notify.Notification;
-import org.eclipse.emf.common.util.ResourceLocator;
-import org.eclipse.emf.edit.provider.IEditingDomainItemProvider;
-import org.eclipse.emf.edit.provider.IItemLabelProvider;
-import org.eclipse.emf.edit.provider.IItemPropertySource;
-import org.eclipse.emf.edit.provider.ITreeItemContentProvider;
-import org.eclipse.emf.edit.provider.ItemProviderAdapter;
-
-/**
- * This is the item provider adpater for a
- * {@link org.eclipse.jst.j2ee.internal.internal.webservice.jaxrpcmap.InterfaceMapping}object. <!-- begin-user-doc --> <!--
- * end-user-doc -->
- *
- * @generated
- */
-public class InterfaceMappingItemProvider extends ItemProviderAdapter implements IEditingDomainItemProvider, ITreeItemContentProvider, IItemLabelProvider, IItemPropertySource {
- /**
- * This constructs an instance from a factory and a notifier. <!-- begin-user-doc --> <!--
- * end-user-doc -->
- *
- * @generated
- */
- public InterfaceMappingItemProvider(AdapterFactory adapterFactory) {
- super(adapterFactory);
- }
-
- /**
- * This returns the property descriptors for the adapted class. <!-- begin-user-doc --> <!--
- * end-user-doc -->
- *
- * @generated
- */
- @Override
- public List getPropertyDescriptors(Object object) {
- if (itemPropertyDescriptors == null) {
- super.getPropertyDescriptors(object);
-
- }
- return itemPropertyDescriptors;
- }
-
-
- /**
- * This returns InterfaceMapping.gif. <!-- begin-user-doc --> <!-- end-user-doc -->
- *
- * @generated
- */
- @Override
- public Object getImage(Object object) {
- return getResourceLocator().getImage("full/obj16/InterfaceMapping"); //$NON-NLS-1$
- }
-
- /**
- * This returns the label text for the adapted class. <!-- begin-user-doc --> <!-- end-user-doc
- * -->
- *
- * @generated
- */
- @Override
- public String getText(Object object) {
- return getString("_UI_InterfaceMapping_type"); //$NON-NLS-1$
- }
-
- /**
- * This handles notification by calling {@link #fireNotifyChanged fireNotifyChanged}. <!--
- * begin-user-doc --> <!-- end-user-doc -->
- *
- * @generated
- */
- @Override
- public void notifyChanged(Notification notification) {
- super.notifyChanged(notification);
- }
-
- /**
- * This adds to the collection of {@link org.eclipse.emf.edit.command.CommandParameter}s
- * describing all of the children that can be created under this object. <!-- begin-user-doc -->
- * <!-- end-user-doc -->
- *
- * @generated
- */
- @Override
- protected void collectNewChildDescriptors(Collection newChildDescriptors, Object object) {
- super.collectNewChildDescriptors(newChildDescriptors, object);
- }
-
- /**
- * Return the resource locator for this item provider's resources. <!-- begin-user-doc --> <!--
- * end-user-doc -->
- *
- * @generated
- */
- @Override
- public ResourceLocator getResourceLocator() {
- return Webservicej2eeEditPlugin.INSTANCE;
- }
-}
\ No newline at end of file
diff --git a/plugins/org.eclipse.jst.j2ee.webservice/webservice/org/eclipse/jst/j2ee/internal/webservice/provider/JavaWSDLMappingItemProvider.java b/plugins/org.eclipse.jst.j2ee.webservice/webservice/org/eclipse/jst/j2ee/internal/webservice/provider/JavaWSDLMappingItemProvider.java
deleted file mode 100644
index f512fe6..0000000
--- a/plugins/org.eclipse.jst.j2ee.webservice/webservice/org/eclipse/jst/j2ee/internal/webservice/provider/JavaWSDLMappingItemProvider.java
+++ /dev/null
@@ -1,191 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2003, 2005 IBM Corporation and others.
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
- *
- * Contributors:
- * IBM Corporation - initial API and implementation
- *******************************************************************************/
-package org.eclipse.jst.j2ee.internal.webservice.provider;
-
-
-import java.util.Collection;
-import java.util.List;
-
-import org.eclipse.emf.common.notify.AdapterFactory;
-import org.eclipse.emf.common.notify.Notification;
-import org.eclipse.emf.common.util.ResourceLocator;
-import org.eclipse.emf.ecore.EReference;
-import org.eclipse.emf.edit.provider.ComposeableAdapterFactory;
-import org.eclipse.emf.edit.provider.IEditingDomainItemProvider;
-import org.eclipse.emf.edit.provider.IItemLabelProvider;
-import org.eclipse.emf.edit.provider.IItemPropertySource;
-import org.eclipse.emf.edit.provider.ITreeItemContentProvider;
-import org.eclipse.emf.edit.provider.ItemPropertyDescriptor;
-import org.eclipse.emf.edit.provider.ItemProviderAdapter;
-import org.eclipse.jst.j2ee.webservice.jaxrpcmap.JavaWSDLMapping;
-import org.eclipse.jst.j2ee.webservice.jaxrpcmap.JaxrpcmapFactory;
-import org.eclipse.jst.j2ee.webservice.jaxrpcmap.JaxrpcmapPackage;
-
-
-/**
- * This is the item provider adpater for a
- * {@link org.eclipse.jst.j2ee.internal.internal.webservice.jaxrpcmap.JavaWSDLMapping}object. <!-- begin-user-doc --> <!--
- * end-user-doc -->
- *
- * @generated
- */
-public class JavaWSDLMappingItemProvider extends ItemProviderAdapter implements IEditingDomainItemProvider, ITreeItemContentProvider, IItemLabelProvider, IItemPropertySource {
- /**
- * This constructs an instance from a factory and a notifier. <!-- begin-user-doc --> <!--
- * end-user-doc -->
- *
- * @generated
- */
- public JavaWSDLMappingItemProvider(AdapterFactory adapterFactory) {
- super(adapterFactory);
- }
-
- /**
- * This returns the property descriptors for the adapted class. <!-- begin-user-doc --> <!--
- * end-user-doc -->
- *
- * @generated
- */
- @Override
- public List getPropertyDescriptors(Object object) {
- if (itemPropertyDescriptors == null) {
- super.getPropertyDescriptors(object);
-
- addIdPropertyDescriptor(object);
- }
- return itemPropertyDescriptors;
- }
-
- /**
- * This adds a property descriptor for the Id feature. <!-- begin-user-doc --> <!-- end-user-doc
- * -->
- *
- * @generated
- */
- protected void addIdPropertyDescriptor(Object object) {
- itemPropertyDescriptors.add(new ItemPropertyDescriptor(((ComposeableAdapterFactory) adapterFactory).getRootAdapterFactory(), getString("_UI_JavaWSDLMapping_id_feature"), //$NON-NLS-1$
- getString("_UI_PropertyDescriptor_description", "_UI_JavaWSDLMapping_id_feature", "_UI_JavaWSDLMapping_type"), //$NON-NLS-1$ //$NON-NLS-2$ //$NON-NLS-3$
- JaxrpcmapPackage.eINSTANCE.getJavaWSDLMapping_Id(), true, ItemPropertyDescriptor.GENERIC_VALUE_IMAGE));
- }
-
- /**
- * This specifies how to implement {@link #getChildren}and
- * {@link org.eclipse.emf.edit.command.AddCommand}and
- * {@link org.eclipse.emf.edit.command.RemoveCommand}support in {@link #createCommand}. <!--
- * begin-user-doc --> <!-- end-user-doc -->
- *
- * @generated
- */
- @Override
- public Collection getChildrenReferences(Object object) {
- if (childrenReferences == null) {
- super.getChildrenReferences(object);
- childrenReferences.add(JaxrpcmapPackage.eINSTANCE.getJavaWSDLMapping_PackageMappings());
- childrenReferences.add(JaxrpcmapPackage.eINSTANCE.getJavaWSDLMapping_JavaXMLTypeMappings());
- childrenReferences.add(JaxrpcmapPackage.eINSTANCE.getJavaWSDLMapping_ExceptionMappings());
- childrenReferences.add(JaxrpcmapPackage.eINSTANCE.getJavaWSDLMapping_InterfaceMappings());
- }
- return childrenReferences;
- }
-
- /**
- * <!-- begin-user-doc --> <!-- end-user-doc -->
- *
- * @generated
- */
- @Override
- protected EReference getChildReference(Object object, Object child) {
- // Check the type of the specified child object and return the proper feature to use for
- // adding (see {@link AddCommand}) it as a child.
-
- return super.getChildReference(object, child);
- }
-
-
- /**
- * This returns JavaWSDLMapping.gif. <!-- begin-user-doc --> <!-- end-user-doc -->
- *
- * @generated
- */
- @Override
- public Object getImage(Object object) {
- return getResourceLocator().getImage("full/obj16/JavaWSDLMapping"); //$NON-NLS-1$
- }
-
- /**
- * This returns the label text for the adapted class. <!-- begin-user-doc --> <!-- end-user-doc
- * -->
- *
- * @generated
- */
- @Override
- public String getText(Object object) {
- String label = ((JavaWSDLMapping) object).getId();
- return label == null || label.length() == 0 ? getString("_UI_JavaWSDLMapping_type") : //$NON-NLS-1$
- getString("_UI_JavaWSDLMapping_type") + " " + label; //$NON-NLS-1$ //$NON-NLS-2$
- }
-
- /**
- * This handles notification by calling {@link #fireNotifyChanged fireNotifyChanged}. <!--
- * begin-user-doc --> <!-- end-user-doc -->
- *
- * @generated
- */
- @Override
- public void notifyChanged(Notification notification) {
- switch (notification.getFeatureID(JavaWSDLMapping.class)) {
- case JaxrpcmapPackage.JAVA_WSDL_MAPPING__ID :
- case JaxrpcmapPackage.JAVA_WSDL_MAPPING__PACKAGE_MAPPINGS :
- case JaxrpcmapPackage.JAVA_WSDL_MAPPING__JAVA_XML_TYPE_MAPPINGS :
- case JaxrpcmapPackage.JAVA_WSDL_MAPPING__EXCEPTION_MAPPINGS :
- case JaxrpcmapPackage.JAVA_WSDL_MAPPING__INTERFACE_MAPPINGS : {
- fireNotifyChanged(notification);
- return;
- }
- }
- super.notifyChanged(notification);
- }
-
- /**
- * This adds to the collection of {@link org.eclipse.emf.edit.command.CommandParameter}s
- * describing all of the children that can be created under this object. <!-- begin-user-doc -->
- * <!-- end-user-doc -->
- *
- * @generated
- */
- @Override
- protected void collectNewChildDescriptors(Collection newChildDescriptors, Object object) {
- super.collectNewChildDescriptors(newChildDescriptors, object);
-
- newChildDescriptors.add(createChildParameter(JaxrpcmapPackage.eINSTANCE.getJavaWSDLMapping_PackageMappings(), JaxrpcmapFactory.eINSTANCE.createPackageMapping()));
-
- newChildDescriptors.add(createChildParameter(JaxrpcmapPackage.eINSTANCE.getJavaWSDLMapping_JavaXMLTypeMappings(), JaxrpcmapFactory.eINSTANCE.createJavaXMLTypeMapping()));
-
- newChildDescriptors.add(createChildParameter(JaxrpcmapPackage.eINSTANCE.getJavaWSDLMapping_ExceptionMappings(), JaxrpcmapFactory.eINSTANCE.createExceptionMapping()));
-
- newChildDescriptors.add(createChildParameter(JaxrpcmapPackage.eINSTANCE.getJavaWSDLMapping_InterfaceMappings(), JaxrpcmapFactory.eINSTANCE.createInterfaceMapping()));
-
- newChildDescriptors.add(createChildParameter(JaxrpcmapPackage.eINSTANCE.getJavaWSDLMapping_InterfaceMappings(), JaxrpcmapFactory.eINSTANCE.createServiceInterfaceMapping()));
-
- newChildDescriptors.add(createChildParameter(JaxrpcmapPackage.eINSTANCE.getJavaWSDLMapping_InterfaceMappings(), JaxrpcmapFactory.eINSTANCE.createServiceEndpointInterfaceMapping()));
- }
-
- /**
- * Return the resource locator for this item provider's resources. <!-- begin-user-doc --> <!--
- * end-user-doc -->
- *
- * @generated
- */
- @Override
- public ResourceLocator getResourceLocator() {
- return Webservicej2eeEditPlugin.INSTANCE;
- }
-}
diff --git a/plugins/org.eclipse.jst.j2ee.webservice/webservice/org/eclipse/jst/j2ee/internal/webservice/provider/JavaXMLTypeMappingItemProvider.java b/plugins/org.eclipse.jst.j2ee.webservice/webservice/org/eclipse/jst/j2ee/internal/webservice/provider/JavaXMLTypeMappingItemProvider.java
deleted file mode 100644
index 85239e1..0000000
--- a/plugins/org.eclipse.jst.j2ee.webservice/webservice/org/eclipse/jst/j2ee/internal/webservice/provider/JavaXMLTypeMappingItemProvider.java
+++ /dev/null
@@ -1,221 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2003, 2005 IBM Corporation and others.
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
- *
- * Contributors:
- * IBM Corporation - initial API and implementation
- *******************************************************************************/
-package org.eclipse.jst.j2ee.internal.webservice.provider;
-
-
-import java.util.Collection;
-import java.util.List;
-
-import org.eclipse.emf.common.notify.AdapterFactory;
-import org.eclipse.emf.common.notify.Notification;
-import org.eclipse.emf.common.util.ResourceLocator;
-import org.eclipse.emf.ecore.EReference;
-import org.eclipse.emf.edit.provider.ComposeableAdapterFactory;
-import org.eclipse.emf.edit.provider.IEditingDomainItemProvider;
-import org.eclipse.emf.edit.provider.IItemLabelProvider;
-import org.eclipse.emf.edit.provider.IItemPropertySource;
-import org.eclipse.emf.edit.provider.ITreeItemContentProvider;
-import org.eclipse.emf.edit.provider.ItemPropertyDescriptor;
-import org.eclipse.emf.edit.provider.ItemProviderAdapter;
-import org.eclipse.jst.j2ee.webservice.jaxrpcmap.JavaXMLTypeMapping;
-import org.eclipse.jst.j2ee.webservice.jaxrpcmap.JaxrpcmapFactory;
-import org.eclipse.jst.j2ee.webservice.jaxrpcmap.JaxrpcmapPackage;
-
-
-/**
- * This is the item provider adpater for a
- * {@link org.eclipse.jst.j2ee.internal.internal.webservice.jaxrpcmap.JavaXMLTypeMapping}object. <!-- begin-user-doc -->
- * <!-- end-user-doc -->
- *
- * @generated
- */
-public class JavaXMLTypeMappingItemProvider extends ItemProviderAdapter implements IEditingDomainItemProvider, ITreeItemContentProvider, IItemLabelProvider, IItemPropertySource {
- /**
- * This constructs an instance from a factory and a notifier. <!-- begin-user-doc --> <!--
- * end-user-doc -->
- *
- * @generated
- */
- public JavaXMLTypeMappingItemProvider(AdapterFactory adapterFactory) {
- super(adapterFactory);
- }
-
- /**
- * This returns the property descriptors for the adapted class. <!-- begin-user-doc --> <!--
- * end-user-doc -->
- *
- * @generated
- */
- @Override
- public List getPropertyDescriptors(Object object) {
- if (itemPropertyDescriptors == null) {
- super.getPropertyDescriptors(object);
-
- addIdPropertyDescriptor(object);
- addClassTypePropertyDescriptor(object);
- addQnameScopePropertyDescriptor(object);
- addAnonymousTypeQnamePropertyDescriptor(object);
- }
- return itemPropertyDescriptors;
- }
-
- /**
- * This adds a property descriptor for the Id feature. <!-- begin-user-doc --> <!-- end-user-doc
- * -->
- *
- * @generated
- */
- protected void addIdPropertyDescriptor(Object object) {
- itemPropertyDescriptors.add(new ItemPropertyDescriptor(((ComposeableAdapterFactory) adapterFactory).getRootAdapterFactory(), getString("_UI_JavaXMLTypeMapping_id_feature"), //$NON-NLS-1$
- getString("_UI_PropertyDescriptor_description", "_UI_JavaXMLTypeMapping_id_feature", "_UI_JavaXMLTypeMapping_type"), //$NON-NLS-1$ //$NON-NLS-2$ //$NON-NLS-3$
- JaxrpcmapPackage.eINSTANCE.getJavaXMLTypeMapping_Id(), true, ItemPropertyDescriptor.GENERIC_VALUE_IMAGE));
- }
-
- /**
- * This adds a property descriptor for the Class Type feature. <!-- begin-user-doc --> <!--
- * end-user-doc -->
- *
- * @generated
- */
- protected void addClassTypePropertyDescriptor(Object object) {
- itemPropertyDescriptors.add(new ItemPropertyDescriptor(((ComposeableAdapterFactory) adapterFactory).getRootAdapterFactory(), getString("_UI_JavaXMLTypeMapping_classType_feature"), //$NON-NLS-1$
- getString("_UI_PropertyDescriptor_description", "_UI_JavaXMLTypeMapping_classType_feature", "_UI_JavaXMLTypeMapping_type"), //$NON-NLS-1$ //$NON-NLS-2$ //$NON-NLS-3$
- JaxrpcmapPackage.eINSTANCE.getJavaXMLTypeMapping_ClassType(), true, ItemPropertyDescriptor.GENERIC_VALUE_IMAGE));
- }
-
- /**
- * This adds a property descriptor for the Qname Scope feature. <!-- begin-user-doc --> <!--
- * end-user-doc -->
- *
- * @generated
- */
- protected void addQnameScopePropertyDescriptor(Object object) {
- itemPropertyDescriptors.add(new ItemPropertyDescriptor(((ComposeableAdapterFactory) adapterFactory).getRootAdapterFactory(), getString("_UI_JavaXMLTypeMapping_qnameScope_feature"), //$NON-NLS-1$
- getString("_UI_PropertyDescriptor_description", "_UI_JavaXMLTypeMapping_qnameScope_feature", "_UI_JavaXMLTypeMapping_type"), //$NON-NLS-1$ //$NON-NLS-2$ //$NON-NLS-3$
- JaxrpcmapPackage.eINSTANCE.getJavaXMLTypeMapping_QnameScope(), true, ItemPropertyDescriptor.GENERIC_VALUE_IMAGE));
- }
-
- /**
- * This adds a property descriptor for the Anonymous Type Qname feature. <!-- begin-user-doc -->
- * <!-- end-user-doc -->
- *
- * @generated
- */
- protected void addAnonymousTypeQnamePropertyDescriptor(Object object) {
- itemPropertyDescriptors.add(new ItemPropertyDescriptor(((ComposeableAdapterFactory) adapterFactory).getRootAdapterFactory(), getString("_UI_JavaXMLTypeMapping_anonymousTypeQname_feature"), //$NON-NLS-1$
- getString("_UI_PropertyDescriptor_description", "_UI_JavaXMLTypeMapping_anonymousTypeQname_feature", "_UI_JavaXMLTypeMapping_type"), //$NON-NLS-1$ //$NON-NLS-2$ //$NON-NLS-3$
- JaxrpcmapPackage.eINSTANCE.getJavaXMLTypeMapping_AnonymousTypeQname(), true, ItemPropertyDescriptor.GENERIC_VALUE_IMAGE));
- }
-
- /**
- * This specifies how to implement {@link #getChildren}and
- * {@link org.eclipse.emf.edit.command.AddCommand}and
- * {@link org.eclipse.emf.edit.command.RemoveCommand}support in {@link #createCommand}. <!--
- * begin-user-doc --> <!-- end-user-doc -->
- *
- * @generated
- */
- @Override
- public Collection getChildrenReferences(Object object) {
- if (childrenReferences == null) {
- super.getChildrenReferences(object);
- childrenReferences.add(JaxrpcmapPackage.eINSTANCE.getJavaXMLTypeMapping_RootTypeQname());
- childrenReferences.add(JaxrpcmapPackage.eINSTANCE.getJavaXMLTypeMapping_VariableMappings());
- }
- return childrenReferences;
- }
-
- /**
- * <!-- begin-user-doc --> <!-- end-user-doc -->
- *
- * @generated
- */
- @Override
- protected EReference getChildReference(Object object, Object child) {
- // Check the type of the specified child object and return the proper feature to use for
- // adding (see {@link AddCommand}) it as a child.
-
- return super.getChildReference(object, child);
- }
-
-
- /**
- * This returns JavaXMLTypeMapping.gif. <!-- begin-user-doc --> <!-- end-user-doc -->
- *
- * @generated
- */
- @Override
- public Object getImage(Object object) {
- return getResourceLocator().getImage("full/obj16/JavaXMLTypeMapping"); //$NON-NLS-1$
- }
-
- /**
- * This returns the label text for the adapted class. <!-- begin-user-doc --> <!-- end-user-doc
- * -->
- *
- * @generated
- */
- @Override
- public String getText(Object object) {
- String label = ((JavaXMLTypeMapping) object).getAnonymousTypeQname();
- return label == null || label.length() == 0 ? getString("_UI_JavaXMLTypeMapping_type") : //$NON-NLS-1$
- getString("_UI_JavaXMLTypeMapping_type") + " " + label; //$NON-NLS-1$ //$NON-NLS-2$
- }
-
- /**
- * This handles notification by calling {@link #fireNotifyChanged fireNotifyChanged}. <!--
- * begin-user-doc --> <!-- end-user-doc -->
- *
- * @generated
- */
- @Override
- public void notifyChanged(Notification notification) {
- switch (notification.getFeatureID(JavaXMLTypeMapping.class)) {
- case JaxrpcmapPackage.JAVA_XML_TYPE_MAPPING__ID :
- case JaxrpcmapPackage.JAVA_XML_TYPE_MAPPING__CLASS_TYPE :
- case JaxrpcmapPackage.JAVA_XML_TYPE_MAPPING__QNAME_SCOPE :
- case JaxrpcmapPackage.JAVA_XML_TYPE_MAPPING__ANONYMOUS_TYPE_QNAME :
- case JaxrpcmapPackage.JAVA_XML_TYPE_MAPPING__ROOT_TYPE_QNAME :
- case JaxrpcmapPackage.JAVA_XML_TYPE_MAPPING__VARIABLE_MAPPINGS : {
- fireNotifyChanged(notification);
- return;
- }
- }
- super.notifyChanged(notification);
- }
-
- /**
- * This adds to the collection of {@link org.eclipse.emf.edit.command.CommandParameter}s
- * describing all of the children that can be created under this object. <!-- begin-user-doc -->
- * <!-- end-user-doc -->
- *
- * @generated
- */
- @Override
- protected void collectNewChildDescriptors(Collection newChildDescriptors, Object object) {
- super.collectNewChildDescriptors(newChildDescriptors, object);
-
- newChildDescriptors.add(createChildParameter(JaxrpcmapPackage.eINSTANCE.getJavaXMLTypeMapping_RootTypeQname(), JaxrpcmapFactory.eINSTANCE.createRootTypeQname()));
-
- newChildDescriptors.add(createChildParameter(JaxrpcmapPackage.eINSTANCE.getJavaXMLTypeMapping_VariableMappings(), JaxrpcmapFactory.eINSTANCE.createVariableMapping()));
- }
-
- /**
- * Return the resource locator for this item provider's resources. <!-- begin-user-doc --> <!--
- * end-user-doc -->
- *
- * @generated
- */
- @Override
- public ResourceLocator getResourceLocator() {
- return Webservicej2eeEditPlugin.INSTANCE;
- }
-}
diff --git a/plugins/org.eclipse.jst.j2ee.webservice/webservice/org/eclipse/jst/j2ee/internal/webservice/provider/JaxrpcmapItemProviderAdapterFactory.java b/plugins/org.eclipse.jst.j2ee.webservice/webservice/org/eclipse/jst/j2ee/internal/webservice/provider/JaxrpcmapItemProviderAdapterFactory.java
deleted file mode 100644
index 38fc666..0000000
--- a/plugins/org.eclipse.jst.j2ee.webservice/webservice/org/eclipse/jst/j2ee/internal/webservice/provider/JaxrpcmapItemProviderAdapterFactory.java
+++ /dev/null
@@ -1,703 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2003, 2005 IBM Corporation and others.
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
- *
- * Contributors:
- * IBM Corporation - initial API and implementation
- *******************************************************************************/
-package org.eclipse.jst.j2ee.internal.webservice.provider;
-
-import java.util.ArrayList;
-import java.util.Collection;
-
-import org.eclipse.emf.common.notify.Adapter;
-import org.eclipse.emf.common.notify.Notification;
-import org.eclipse.emf.common.notify.Notifier;
-import org.eclipse.emf.edit.provider.ChangeNotifier;
-import org.eclipse.emf.edit.provider.ComposeableAdapterFactory;
-import org.eclipse.emf.edit.provider.ComposedAdapterFactory;
-import org.eclipse.emf.edit.provider.IChangeNotifier;
-import org.eclipse.emf.edit.provider.IEditingDomainItemProvider;
-import org.eclipse.emf.edit.provider.IItemLabelProvider;
-import org.eclipse.emf.edit.provider.IItemPropertySource;
-import org.eclipse.emf.edit.provider.INotifyChangedListener;
-import org.eclipse.emf.edit.provider.IStructuredItemContentProvider;
-import org.eclipse.emf.edit.provider.ITreeItemContentProvider;
-import org.eclipse.jst.j2ee.webservice.jaxrpcmap.internal.util.JaxrpcmapAdapterFactory;
-
-
-/**
- * This is the factory that is used to provide the interfaces needed to support Viewers. The
- * adapters generated by this factory convert EMF adapter notifications into calls to
- * {@link #fireNotifyChanged fireNotifyChanged}. The adapters also support Eclipse property sheets.
- * Note that most of the adapters are shared among multiple instances. <!-- begin-user-doc --> <!--
- * end-user-doc -->
- *
- * @generated
- */
-public class JaxrpcmapItemProviderAdapterFactory extends JaxrpcmapAdapterFactory implements ComposeableAdapterFactory, IChangeNotifier {
- /**
- * This keeps track of the root adapter factory that delegates to this adapter factory. <!--
- * begin-user-doc --> <!-- end-user-doc -->
- *
- * @generated
- */
- protected ComposedAdapterFactory parentAdapterFactory;
-
- /**
- * This is used to implement {@link org.eclipse.emf.edit.provider.IChangeNotifier}. <!--
- * begin-user-doc --> <!-- end-user-doc -->
- *
- * @generated
- */
- protected IChangeNotifier changeNotifier = new ChangeNotifier();
-
- /**
- * This keeps track of all the supported types checked by
- * {@link #isFactoryForType isFactoryForType}. <!-- begin-user-doc --> <!-- end-user-doc -->
- *
- * @generated
- */
- protected Collection supportedTypes = new ArrayList();
-
- /**
- * This constructs an instance. <!-- begin-user-doc --> <!-- end-user-doc -->
- *
- * @generated
- */
- public JaxrpcmapItemProviderAdapterFactory() {
- supportedTypes.add(IStructuredItemContentProvider.class);
- supportedTypes.add(ITreeItemContentProvider.class);
- supportedTypes.add(IItemPropertySource.class);
- supportedTypes.add(IEditingDomainItemProvider.class);
- supportedTypes.add(IItemLabelProvider.class);
- }
-
- /**
- * This keeps track of the one adapter used for all
- * {@link org.eclipse.jst.j2ee.internal.internal.webservice.jaxrpcmap.JavaWSDLMapping}instances. <!-- begin-user-doc
- * --> <!-- end-user-doc -->
- *
- * @generated
- */
- protected JavaWSDLMappingItemProvider javaWSDLMappingItemProvider;
-
- /**
- * This creates an adapter for a {@link org.eclipse.jst.j2ee.internal.internal.webservice.jaxrpcmap.JavaWSDLMapping}.
- * <!-- begin-user-doc --> <!-- end-user-doc -->
- *
- * @generated
- */
- @Override
- public Adapter createJavaWSDLMappingAdapter() {
- if (javaWSDLMappingItemProvider == null) {
- javaWSDLMappingItemProvider = new JavaWSDLMappingItemProvider(this);
- }
-
- return javaWSDLMappingItemProvider;
- }
-
- /**
- * This keeps track of the one adapter used for all
- * {@link org.eclipse.jst.j2ee.internal.internal.webservice.jaxrpcmap.PackageMapping}instances. <!-- begin-user-doc -->
- * <!-- end-user-doc -->
- *
- * @generated
- */
- protected PackageMappingItemProvider packageMappingItemProvider;
-
- /**
- * This creates an adapter for a {@link org.eclipse.jst.j2ee.internal.internal.webservice.jaxrpcmap.PackageMapping}.
- * <!-- begin-user-doc --> <!-- end-user-doc -->
- *
- * @generated
- */
- @Override
- public Adapter createPackageMappingAdapter() {
- if (packageMappingItemProvider == null) {
- packageMappingItemProvider = new PackageMappingItemProvider(this);
- }
-
- return packageMappingItemProvider;
- }
-
- /**
- * This keeps track of the one adapter used for all
- * {@link org.eclipse.jst.j2ee.internal.internal.webservice.jaxrpcmap.JavaXMLTypeMapping}instances. <!-- begin-user-doc
- * --> <!-- end-user-doc -->
- *
- * @generated
- */
- protected JavaXMLTypeMappingItemProvider javaXMLTypeMappingItemProvider;
-
- /**
- * This creates an adapter for a {@link org.eclipse.jst.j2ee.internal.internal.webservice.jaxrpcmap.JavaXMLTypeMapping}.
- * <!-- begin-user-doc --> <!-- end-user-doc -->
- *
- * @generated
- */
- @Override
- public Adapter createJavaXMLTypeMappingAdapter() {
- if (javaXMLTypeMappingItemProvider == null) {
- javaXMLTypeMappingItemProvider = new JavaXMLTypeMappingItemProvider(this);
- }
-
- return javaXMLTypeMappingItemProvider;
- }
-
- /**
- * This keeps track of the one adapter used for all
- * {@link org.eclipse.jst.j2ee.internal.internal.webservice.jaxrpcmap.ExceptionMapping}instances. <!-- begin-user-doc
- * --> <!-- end-user-doc -->
- *
- * @generated
- */
- protected ExceptionMappingItemProvider exceptionMappingItemProvider;
-
- /**
- * This creates an adapter for a {@link org.eclipse.jst.j2ee.internal.internal.webservice.jaxrpcmap.ExceptionMapping}.
- * <!-- begin-user-doc --> <!-- end-user-doc -->
- *
- * @generated
- */
- @Override
- public Adapter createExceptionMappingAdapter() {
- if (exceptionMappingItemProvider == null) {
- exceptionMappingItemProvider = new ExceptionMappingItemProvider(this);
- }
-
- return exceptionMappingItemProvider;
- }
-
- /**
- * This keeps track of the one adapter used for all
- * {@link org.eclipse.jst.j2ee.internal.internal.webservice.jaxrpcmap.ServiceInterfaceMapping}instances. <!--
- * begin-user-doc --> <!-- end-user-doc -->
- *
- * @generated
- */
- protected ServiceInterfaceMappingItemProvider serviceInterfaceMappingItemProvider;
-
- /**
- * This creates an adapter for a
- * {@link org.eclipse.jst.j2ee.internal.internal.webservice.jaxrpcmap.ServiceInterfaceMapping}. <!-- begin-user-doc -->
- * <!-- end-user-doc -->
- *
- * @generated
- */
- @Override
- public Adapter createServiceInterfaceMappingAdapter() {
- if (serviceInterfaceMappingItemProvider == null) {
- serviceInterfaceMappingItemProvider = new ServiceInterfaceMappingItemProvider(this);
- }
-
- return serviceInterfaceMappingItemProvider;
- }
-
- /**
- * This keeps track of the one adapter used for all
- * {@link org.eclipse.jst.j2ee.internal.internal.webservice.jaxrpcmap.ServiceEndpointInterfaceMapping}instances. <!--
- * begin-user-doc --> <!-- end-user-doc -->
- *
- * @generated
- */
- protected ServiceEndpointInterfaceMappingItemProvider serviceEndpointInterfaceMappingItemProvider;
-
- /**
- * This creates an adapter for a
- * {@link org.eclipse.jst.j2ee.internal.internal.webservice.jaxrpcmap.ServiceEndpointInterfaceMapping}. <!--
- * begin-user-doc --> <!-- end-user-doc -->
- *
- * @generated
- */
- @Override
- public Adapter createServiceEndpointInterfaceMappingAdapter() {
- if (serviceEndpointInterfaceMappingItemProvider == null) {
- serviceEndpointInterfaceMappingItemProvider = new ServiceEndpointInterfaceMappingItemProvider(this);
- }
-
- return serviceEndpointInterfaceMappingItemProvider;
- }
-
- /**
- * This keeps track of the one adapter used for all
- * {@link org.eclipse.jst.j2ee.internal.internal.webservice.jaxrpcmap.RootTypeQname}instances. <!-- begin-user-doc -->
- * <!-- end-user-doc -->
- *
- * @generated
- */
- protected RootTypeQnameItemProvider rootTypeQnameItemProvider;
-
- /**
- * This creates an adapter for a {@link org.eclipse.jst.j2ee.internal.internal.webservice.jaxrpcmap.RootTypeQname}.
- * <!-- begin-user-doc --> <!-- end-user-doc -->
- *
- * @generated
- */
- @Override
- public Adapter createRootTypeQnameAdapter() {
- if (rootTypeQnameItemProvider == null) {
- rootTypeQnameItemProvider = new RootTypeQnameItemProvider(this);
- }
-
- return rootTypeQnameItemProvider;
- }
-
- /**
- * This keeps track of the one adapter used for all
- * {@link org.eclipse.jst.j2ee.internal.internal.webservice.jaxrpcmap.VariableMapping}instances. <!-- begin-user-doc
- * --> <!-- end-user-doc -->
- *
- * @generated
- */
- protected VariableMappingItemProvider variableMappingItemProvider;
-
- /**
- * This creates an adapter for a {@link org.eclipse.jst.j2ee.internal.internal.webservice.jaxrpcmap.VariableMapping}.
- * <!-- begin-user-doc --> <!-- end-user-doc -->
- *
- * @generated
- */
- @Override
- public Adapter createVariableMappingAdapter() {
- if (variableMappingItemProvider == null) {
- variableMappingItemProvider = new VariableMappingItemProvider(this);
- }
-
- return variableMappingItemProvider;
- }
-
- /**
- * This keeps track of the one adapter used for all
- * {@link org.eclipse.jst.j2ee.internal.internal.webservice.jaxrpcmap.WSDLMessage}instances. <!-- begin-user-doc -->
- * <!-- end-user-doc -->
- *
- * @generated
- */
- protected WSDLMessageItemProvider wsdlMessageItemProvider;
-
- /**
- * This creates an adapter for a {@link org.eclipse.jst.j2ee.internal.internal.webservice.jaxrpcmap.WSDLMessage}. <!--
- * begin-user-doc --> <!-- end-user-doc -->
- *
- * @generated
- */
- @Override
- public Adapter createWSDLMessageAdapter() {
- if (wsdlMessageItemProvider == null) {
- wsdlMessageItemProvider = new WSDLMessageItemProvider(this);
- }
-
- return wsdlMessageItemProvider;
- }
-
- /**
- * This keeps track of the one adapter used for all
- * {@link org.eclipse.jst.j2ee.internal.internal.webservice.jaxrpcmap.ConstructorParameterOrder}instances. <!--
- * begin-user-doc --> <!-- end-user-doc -->
- *
- * @generated
- */
- protected ConstructorParameterOrderItemProvider constructorParameterOrderItemProvider;
-
- /**
- * This creates an adapter for a
- * {@link org.eclipse.jst.j2ee.internal.internal.webservice.jaxrpcmap.ConstructorParameterOrder}. <!-- begin-user-doc
- * --> <!-- end-user-doc -->
- *
- * @generated
- */
- @Override
- public Adapter createConstructorParameterOrderAdapter() {
- if (constructorParameterOrderItemProvider == null) {
- constructorParameterOrderItemProvider = new ConstructorParameterOrderItemProvider(this);
- }
-
- return constructorParameterOrderItemProvider;
- }
-
- /**
- * This keeps track of the one adapter used for all
- * {@link org.eclipse.jst.j2ee.internal.internal.webservice.jaxrpcmap.ElementName}instances. <!-- begin-user-doc -->
- * <!-- end-user-doc -->
- *
- * @generated
- */
- protected ElementNameItemProvider elementNameItemProvider;
-
- /**
- * This creates an adapter for a {@link org.eclipse.jst.j2ee.internal.internal.webservice.jaxrpcmap.ElementName}. <!--
- * begin-user-doc --> <!-- end-user-doc -->
- *
- * @generated
- */
- @Override
- public Adapter createElementNameAdapter() {
- if (elementNameItemProvider == null) {
- elementNameItemProvider = new ElementNameItemProvider(this);
- }
-
- return elementNameItemProvider;
- }
-
- /**
- * This keeps track of the one adapter used for all
- * {@link org.eclipse.jst.j2ee.internal.internal.webservice.jaxrpcmap.WSDLServiceName}instances. <!-- begin-user-doc
- * --> <!-- end-user-doc -->
- *
- * @generated
- */
- protected WSDLServiceNameItemProvider wsdlServiceNameItemProvider;
-
- /**
- * This creates an adapter for a {@link org.eclipse.jst.j2ee.internal.internal.webservice.jaxrpcmap.WSDLServiceName}.
- * <!-- begin-user-doc --> <!-- end-user-doc -->
- *
- * @generated
- */
- @Override
- public Adapter createWSDLServiceNameAdapter() {
- if (wsdlServiceNameItemProvider == null) {
- wsdlServiceNameItemProvider = new WSDLServiceNameItemProvider(this);
- }
-
- return wsdlServiceNameItemProvider;
- }
-
- /**
- * This keeps track of the one adapter used for all
- * {@link org.eclipse.jst.j2ee.internal.internal.webservice.jaxrpcmap.PortMapping}instances. <!-- begin-user-doc -->
- * <!-- end-user-doc -->
- *
- * @generated
- */
- protected PortMappingItemProvider portMappingItemProvider;
-
- /**
- * This creates an adapter for a {@link org.eclipse.jst.j2ee.internal.internal.webservice.jaxrpcmap.PortMapping}. <!--
- * begin-user-doc --> <!-- end-user-doc -->
- *
- * @generated
- */
- @Override
- public Adapter createPortMappingAdapter() {
- if (portMappingItemProvider == null) {
- portMappingItemProvider = new PortMappingItemProvider(this);
- }
-
- return portMappingItemProvider;
- }
-
- /**
- * This keeps track of the one adapter used for all
- * {@link org.eclipse.jst.j2ee.internal.internal.webservice.jaxrpcmap.WSDLPortType}instances. <!-- begin-user-doc -->
- * <!-- end-user-doc -->
- *
- * @generated
- */
- protected WSDLPortTypeItemProvider wsdlPortTypeItemProvider;
-
- /**
- * This creates an adapter for a {@link org.eclipse.jst.j2ee.internal.internal.webservice.jaxrpcmap.WSDLPortType}. <!--
- * begin-user-doc --> <!-- end-user-doc -->
- *
- * @generated
- */
- @Override
- public Adapter createWSDLPortTypeAdapter() {
- if (wsdlPortTypeItemProvider == null) {
- wsdlPortTypeItemProvider = new WSDLPortTypeItemProvider(this);
- }
-
- return wsdlPortTypeItemProvider;
- }
-
- /**
- * This keeps track of the one adapter used for all
- * {@link org.eclipse.jst.j2ee.internal.internal.webservice.jaxrpcmap.WSDLBinding}instances. <!-- begin-user-doc -->
- * <!-- end-user-doc -->
- *
- * @generated
- */
- protected WSDLBindingItemProvider wsdlBindingItemProvider;
-
- /**
- * This creates an adapter for a {@link org.eclipse.jst.j2ee.internal.internal.webservice.jaxrpcmap.WSDLBinding}. <!--
- * begin-user-doc --> <!-- end-user-doc -->
- *
- * @generated
- */
- @Override
- public Adapter createWSDLBindingAdapter() {
- if (wsdlBindingItemProvider == null) {
- wsdlBindingItemProvider = new WSDLBindingItemProvider(this);
- }
-
- return wsdlBindingItemProvider;
- }
-
- /**
- * This keeps track of the one adapter used for all
- * {@link org.eclipse.jst.j2ee.internal.internal.webservice.jaxrpcmap.ServiceEndpointMethodMapping}instances. <!--
- * begin-user-doc --> <!-- end-user-doc -->
- *
- * @generated
- */
- protected ServiceEndpointMethodMappingItemProvider serviceEndpointMethodMappingItemProvider;
-
- /**
- * This creates an adapter for a
- * {@link org.eclipse.jst.j2ee.internal.internal.webservice.jaxrpcmap.ServiceEndpointMethodMapping}. <!--
- * begin-user-doc --> <!-- end-user-doc -->
- *
- * @generated
- */
- @Override
- public Adapter createServiceEndpointMethodMappingAdapter() {
- if (serviceEndpointMethodMappingItemProvider == null) {
- serviceEndpointMethodMappingItemProvider = new ServiceEndpointMethodMappingItemProvider(this);
- }
-
- return serviceEndpointMethodMappingItemProvider;
- }
-
- /**
- * This keeps track of the one adapter used for all
- * {@link org.eclipse.jst.j2ee.internal.internal.webservice.jaxrpcmap.WSDLOperation}instances. <!-- begin-user-doc -->
- * <!-- end-user-doc -->
- *
- * @generated
- */
- protected WSDLOperationItemProvider wsdlOperationItemProvider;
-
- /**
- * This creates an adapter for a {@link org.eclipse.jst.j2ee.internal.internal.webservice.jaxrpcmap.WSDLOperation}.
- * <!-- begin-user-doc --> <!-- end-user-doc -->
- *
- * @generated
- */
- @Override
- public Adapter createWSDLOperationAdapter() {
- if (wsdlOperationItemProvider == null) {
- wsdlOperationItemProvider = new WSDLOperationItemProvider(this);
- }
-
- return wsdlOperationItemProvider;
- }
-
- /**
- * This keeps track of the one adapter used for all
- * {@link org.eclipse.jst.j2ee.internal.internal.webservice.jaxrpcmap.MethodParamPartsMapping}instances. <!--
- * begin-user-doc --> <!-- end-user-doc -->
- *
- * @generated
- */
- protected MethodParamPartsMappingItemProvider methodParamPartsMappingItemProvider;
-
- /**
- * This creates an adapter for a
- * {@link org.eclipse.jst.j2ee.internal.internal.webservice.jaxrpcmap.MethodParamPartsMapping}. <!-- begin-user-doc -->
- * <!-- end-user-doc -->
- *
- * @generated
- */
- @Override
- public Adapter createMethodParamPartsMappingAdapter() {
- if (methodParamPartsMappingItemProvider == null) {
- methodParamPartsMappingItemProvider = new MethodParamPartsMappingItemProvider(this);
- }
-
- return methodParamPartsMappingItemProvider;
- }
-
- /**
- * This keeps track of the one adapter used for all
- * {@link org.eclipse.jst.j2ee.internal.internal.webservice.jaxrpcmap.WSDLReturnValueMapping}instances. <!--
- * begin-user-doc --> <!-- end-user-doc -->
- *
- * @generated
- */
- protected WSDLReturnValueMappingItemProvider wsdlReturnValueMappingItemProvider;
-
- /**
- * This creates an adapter for a
- * {@link org.eclipse.jst.j2ee.internal.internal.webservice.jaxrpcmap.WSDLReturnValueMapping}. <!-- begin-user-doc -->
- * <!-- end-user-doc -->
- *
- * @generated
- */
- @Override
- public Adapter createWSDLReturnValueMappingAdapter() {
- if (wsdlReturnValueMappingItemProvider == null) {
- wsdlReturnValueMappingItemProvider = new WSDLReturnValueMappingItemProvider(this);
- }
-
- return wsdlReturnValueMappingItemProvider;
- }
-
- /**
- * This keeps track of the one adapter used for all
- * {@link org.eclipse.jst.j2ee.internal.internal.webservice.jaxrpcmap.WSDLMessageMapping}instances. <!-- begin-user-doc
- * --> <!-- end-user-doc -->
- *
- * @generated
- */
- protected WSDLMessageMappingItemProvider wsdlMessageMappingItemProvider;
-
- /**
- * This creates an adapter for a {@link org.eclipse.jst.j2ee.internal.internal.webservice.jaxrpcmap.WSDLMessageMapping}.
- * <!-- begin-user-doc --> <!-- end-user-doc -->
- *
- * @generated
- */
- @Override
- public Adapter createWSDLMessageMappingAdapter() {
- if (wsdlMessageMappingItemProvider == null) {
- wsdlMessageMappingItemProvider = new WSDLMessageMappingItemProvider(this);
- }
-
- return wsdlMessageMappingItemProvider;
- }
-
- /**
- * This keeps track of the one adapter used for all
- * {@link org.eclipse.jst.j2ee.internal.internal.webservice.jaxrpcmap.WSDLMessagePartName}instances. <!--
- * begin-user-doc --> <!-- end-user-doc -->
- *
- * @generated
- */
- protected WSDLMessagePartNameItemProvider wsdlMessagePartNameItemProvider;
-
- /**
- * This creates an adapter for a {@link org.eclipse.jst.j2ee.internal.internal.webservice.jaxrpcmap.WSDLMessagePartName}.
- * <!-- begin-user-doc --> <!-- end-user-doc -->
- *
- * @generated
- */
- @Override
- public Adapter createWSDLMessagePartNameAdapter() {
- if (wsdlMessagePartNameItemProvider == null) {
- wsdlMessagePartNameItemProvider = new WSDLMessagePartNameItemProvider(this);
- }
-
- return wsdlMessagePartNameItemProvider;
- }
-
- /**
- * This keeps track of the one adapter used for all
- * {@link org.eclipse.jst.j2ee.internal.internal.webservice.jaxrpcmap.InterfaceMapping}instances. <!-- begin-user-doc
- * --> <!-- end-user-doc -->
- *
- * @generated
- */
- protected InterfaceMappingItemProvider interfaceMappingItemProvider;
-
- /**
- * This creates an adapter for a {@link org.eclipse.jst.j2ee.internal.internal.webservice.jaxrpcmap.InterfaceMapping}.
- * <!-- begin-user-doc --> <!-- end-user-doc -->
- *
- * @generated
- */
- @Override
- public Adapter createInterfaceMappingAdapter() {
- if (interfaceMappingItemProvider == null) {
- interfaceMappingItemProvider = new InterfaceMappingItemProvider(this);
- }
-
- return interfaceMappingItemProvider;
- }
-
- /**
- * This returns the root adapter factory that contains this factory. <!-- begin-user-doc -->
- * <!-- end-user-doc -->
- *
- * @generated
- */
- public ComposeableAdapterFactory getRootAdapterFactory() {
- return parentAdapterFactory == null ? this : parentAdapterFactory.getRootAdapterFactory();
- }
-
- /**
- * This sets the composed adapter factory that contains this factory. <!-- begin-user-doc -->
- * <!-- end-user-doc -->
- *
- * @generated
- */
- public void setParentAdapterFactory(ComposedAdapterFactory parentAdapterFactory) {
- this.parentAdapterFactory = parentAdapterFactory;
- }
-
- /**
- * <!-- begin-user-doc --> <!-- end-user-doc -->
- *
- * @generated
- */
- @Override
- public boolean isFactoryForType(Object type) {
- return supportedTypes.contains(type) || super.isFactoryForType(type);
- }
-
- /**
- * This implementation substitutes the factory itself as the key for the adapter. <!--
- * begin-user-doc --> <!-- end-user-doc -->
- *
- * @generated
- */
- @Override
- public Adapter adapt(Notifier notifier, Object type) {
- return super.adapt(notifier, this);
- }
-
- /**
- * <!-- begin-user-doc --> <!-- end-user-doc -->
- *
- * @generated
- */
- @Override
- public Object adapt(Object object, Object type) {
- if (isFactoryForType(type)) {
- Object adapter = super.adapt(object, type);
- if (!(type instanceof Class) || (((Class) type).isInstance(adapter))) {
- return adapter;
- }
- }
-
- return null;
- }
-
- /**
- * This adds a listener. <!-- begin-user-doc --> <!-- end-user-doc -->
- *
- * @generated
- */
- public void addListener(INotifyChangedListener notifyChangedListener) {
- changeNotifier.addListener(notifyChangedListener);
- }
-
- /**
- * This removes a listener. <!-- begin-user-doc --> <!-- end-user-doc -->
- *
- * @generated
- */
- public void removeListener(INotifyChangedListener notifyChangedListener) {
- changeNotifier.removeListener(notifyChangedListener);
- }
-
- /**
- * This delegates to {@link #changeNotifier}and to {@link #parentAdapterFactory}. <!--
- * begin-user-doc --> <!-- end-user-doc -->
- *
- * @generated
- */
- public void fireNotifyChanged(Notification notification) {
- changeNotifier.fireNotifyChanged(notification);
-
- if (parentAdapterFactory != null) {
- parentAdapterFactory.fireNotifyChanged(notification);
- }
- }
-
-}
diff --git a/plugins/org.eclipse.jst.j2ee.webservice/webservice/org/eclipse/jst/j2ee/internal/webservice/provider/MethodParamPartsMappingItemProvider.java b/plugins/org.eclipse.jst.j2ee.webservice/webservice/org/eclipse/jst/j2ee/internal/webservice/provider/MethodParamPartsMappingItemProvider.java
deleted file mode 100644
index 6c4c39a..0000000
--- a/plugins/org.eclipse.jst.j2ee.webservice/webservice/org/eclipse/jst/j2ee/internal/webservice/provider/MethodParamPartsMappingItemProvider.java
+++ /dev/null
@@ -1,189 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2003, 2005 IBM Corporation and others.
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
- *
- * Contributors:
- * IBM Corporation - initial API and implementation
- *******************************************************************************/
-package org.eclipse.jst.j2ee.internal.webservice.provider;
-
-
-import java.util.Collection;
-import java.util.List;
-
-import org.eclipse.emf.common.notify.AdapterFactory;
-import org.eclipse.emf.common.notify.Notification;
-import org.eclipse.emf.common.util.ResourceLocator;
-import org.eclipse.emf.edit.provider.ComposeableAdapterFactory;
-import org.eclipse.emf.edit.provider.IEditingDomainItemProvider;
-import org.eclipse.emf.edit.provider.IItemLabelProvider;
-import org.eclipse.emf.edit.provider.IItemPropertySource;
-import org.eclipse.emf.edit.provider.ITreeItemContentProvider;
-import org.eclipse.emf.edit.provider.ItemPropertyDescriptor;
-import org.eclipse.emf.edit.provider.ItemProviderAdapter;
-import org.eclipse.jst.j2ee.webservice.jaxrpcmap.JaxrpcmapFactory;
-import org.eclipse.jst.j2ee.webservice.jaxrpcmap.JaxrpcmapPackage;
-import org.eclipse.jst.j2ee.webservice.jaxrpcmap.MethodParamPartsMapping;
-
-
-/**
- * This is the item provider adpater for a
- * {@link org.eclipse.jst.j2ee.internal.internal.webservice.jaxrpcmap.MethodParamPartsMapping}object. <!-- begin-user-doc
- * --> <!-- end-user-doc -->
- *
- * @generated
- */
-public class MethodParamPartsMappingItemProvider extends ItemProviderAdapter implements IEditingDomainItemProvider, ITreeItemContentProvider, IItemLabelProvider, IItemPropertySource {
- /**
- * This constructs an instance from a factory and a notifier. <!-- begin-user-doc --> <!--
- * end-user-doc -->
- *
- * @generated
- */
- public MethodParamPartsMappingItemProvider(AdapterFactory adapterFactory) {
- super(adapterFactory);
- }
-
- /**
- * This returns the property descriptors for the adapted class. <!-- begin-user-doc --> <!--
- * end-user-doc -->
- *
- * @generated
- */
- @Override
- public List getPropertyDescriptors(Object object) {
- if (itemPropertyDescriptors == null) {
- super.getPropertyDescriptors(object);
-
- addIdPropertyDescriptor(object);
- addParamPositionPropertyDescriptor(object);
- addParamTypePropertyDescriptor(object);
- }
- return itemPropertyDescriptors;
- }
-
- /**
- * This adds a property descriptor for the Id feature. <!-- begin-user-doc --> <!-- end-user-doc
- * -->
- *
- * @generated
- */
- protected void addIdPropertyDescriptor(Object object) {
- itemPropertyDescriptors.add(new ItemPropertyDescriptor(((ComposeableAdapterFactory) adapterFactory).getRootAdapterFactory(), getString("_UI_MethodParamPartsMapping_id_feature"), //$NON-NLS-1$
- getString("_UI_PropertyDescriptor_description", "_UI_MethodParamPartsMapping_id_feature", "_UI_MethodParamPartsMapping_type"), //$NON-NLS-1$ //$NON-NLS-2$ //$NON-NLS-3$
- JaxrpcmapPackage.eINSTANCE.getMethodParamPartsMapping_Id(), true, ItemPropertyDescriptor.GENERIC_VALUE_IMAGE));
- }
-
- /**
- * This adds a property descriptor for the Param Position feature. <!-- begin-user-doc --> <!--
- * end-user-doc -->
- *
- * @generated
- */
- protected void addParamPositionPropertyDescriptor(Object object) {
- itemPropertyDescriptors.add(new ItemPropertyDescriptor(((ComposeableAdapterFactory) adapterFactory).getRootAdapterFactory(), getString("_UI_MethodParamPartsMapping_paramPosition_feature"), //$NON-NLS-1$
- getString("_UI_PropertyDescriptor_description", "_UI_MethodParamPartsMapping_paramPosition_feature", "_UI_MethodParamPartsMapping_type"), //$NON-NLS-1$ //$NON-NLS-2$ //$NON-NLS-3$
- JaxrpcmapPackage.eINSTANCE.getMethodParamPartsMapping_ParamPosition(), true, ItemPropertyDescriptor.GENERIC_VALUE_IMAGE));
- }
-
- /**
- * This adds a property descriptor for the Param Type feature. <!-- begin-user-doc --> <!--
- * end-user-doc -->
- *
- * @generated
- */
- protected void addParamTypePropertyDescriptor(Object object) {
- itemPropertyDescriptors.add(new ItemPropertyDescriptor(((ComposeableAdapterFactory) adapterFactory).getRootAdapterFactory(), getString("_UI_MethodParamPartsMapping_paramType_feature"), //$NON-NLS-1$
- getString("_UI_PropertyDescriptor_description", "_UI_MethodParamPartsMapping_paramType_feature", "_UI_MethodParamPartsMapping_type"), //$NON-NLS-1$ //$NON-NLS-2$ //$NON-NLS-3$
- JaxrpcmapPackage.eINSTANCE.getMethodParamPartsMapping_ParamType(), true, ItemPropertyDescriptor.GENERIC_VALUE_IMAGE));
- }
-
- /**
- * This specifies how to implement {@link #getChildren}and
- * {@link org.eclipse.emf.edit.command.AddCommand}and
- * {@link org.eclipse.emf.edit.command.RemoveCommand}support in {@link #createCommand}. <!--
- * begin-user-doc --> <!-- end-user-doc -->
- *
- * @generated
- */
- @Override
- public Collection getChildrenReferences(Object object) {
- if (childrenReferences == null) {
- super.getChildrenReferences(object);
- childrenReferences.add(JaxrpcmapPackage.eINSTANCE.getMethodParamPartsMapping_WsdlMessageMapping());
- }
- return childrenReferences;
- }
-
-
- /**
- * This returns MethodParamPartsMapping.gif. <!-- begin-user-doc --> <!-- end-user-doc -->
- *
- * @generated
- */
- @Override
- public Object getImage(Object object) {
- return getResourceLocator().getImage("full/obj16/MethodParamPartsMapping"); //$NON-NLS-1$
- }
-
- /**
- * This returns the label text for the adapted class. <!-- begin-user-doc --> <!-- end-user-doc
- * -->
- *
- * @generated
- */
- @Override
- public String getText(Object object) {
- String label = ((MethodParamPartsMapping) object).getId();
- return label == null || label.length() == 0 ? getString("_UI_MethodParamPartsMapping_type") : //$NON-NLS-1$
- getString("_UI_MethodParamPartsMapping_type") + " " + label; //$NON-NLS-1$ //$NON-NLS-2$
- }
-
- /**
- * This handles notification by calling {@link #fireNotifyChanged fireNotifyChanged}. <!--
- * begin-user-doc --> <!-- end-user-doc -->
- *
- * @generated
- */
- @Override
- public void notifyChanged(Notification notification) {
- switch (notification.getFeatureID(MethodParamPartsMapping.class)) {
- case JaxrpcmapPackage.METHOD_PARAM_PARTS_MAPPING__ID :
- case JaxrpcmapPackage.METHOD_PARAM_PARTS_MAPPING__PARAM_POSITION :
- case JaxrpcmapPackage.METHOD_PARAM_PARTS_MAPPING__PARAM_TYPE :
- case JaxrpcmapPackage.METHOD_PARAM_PARTS_MAPPING__WSDL_MESSAGE_MAPPING : {
- fireNotifyChanged(notification);
- return;
- }
- }
- super.notifyChanged(notification);
- }
-
- /**
- * This adds to the collection of {@link org.eclipse.emf.edit.command.CommandParameter}s
- * describing all of the children that can be created under this object. <!-- begin-user-doc -->
- * <!-- end-user-doc -->
- *
- * @generated
- */
- @Override
- protected void collectNewChildDescriptors(Collection newChildDescriptors, Object object) {
- super.collectNewChildDescriptors(newChildDescriptors, object);
-
- newChildDescriptors.add(createChildParameter(JaxrpcmapPackage.eINSTANCE.getMethodParamPartsMapping_WsdlMessageMapping(), JaxrpcmapFactory.eINSTANCE.createWSDLMessageMapping()));
- }
-
- /**
- * Return the resource locator for this item provider's resources. <!-- begin-user-doc --> <!--
- * end-user-doc -->
- *
- * @generated
- */
- @Override
- public ResourceLocator getResourceLocator() {
- return Webservicej2eeEditPlugin.INSTANCE;
- }
-}
diff --git a/plugins/org.eclipse.jst.j2ee.webservice/webservice/org/eclipse/jst/j2ee/internal/webservice/provider/PackageMappingItemProvider.java b/plugins/org.eclipse.jst.j2ee.webservice/webservice/org/eclipse/jst/j2ee/internal/webservice/provider/PackageMappingItemProvider.java
deleted file mode 100644
index 69c683f..0000000
--- a/plugins/org.eclipse.jst.j2ee.webservice/webservice/org/eclipse/jst/j2ee/internal/webservice/provider/PackageMappingItemProvider.java
+++ /dev/null
@@ -1,168 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2003, 2005 IBM Corporation and others.
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
- *
- * Contributors:
- * IBM Corporation - initial API and implementation
- *******************************************************************************/
-package org.eclipse.jst.j2ee.internal.webservice.provider;
-
-
-import java.util.Collection;
-import java.util.List;
-
-import org.eclipse.emf.common.notify.AdapterFactory;
-import org.eclipse.emf.common.notify.Notification;
-import org.eclipse.emf.common.util.ResourceLocator;
-import org.eclipse.emf.edit.provider.ComposeableAdapterFactory;
-import org.eclipse.emf.edit.provider.IEditingDomainItemProvider;
-import org.eclipse.emf.edit.provider.IItemLabelProvider;
-import org.eclipse.emf.edit.provider.IItemPropertySource;
-import org.eclipse.emf.edit.provider.ITreeItemContentProvider;
-import org.eclipse.emf.edit.provider.ItemPropertyDescriptor;
-import org.eclipse.emf.edit.provider.ItemProviderAdapter;
-import org.eclipse.jst.j2ee.webservice.jaxrpcmap.JaxrpcmapPackage;
-import org.eclipse.jst.j2ee.webservice.jaxrpcmap.PackageMapping;
-
-
-/**
- * This is the item provider adpater for a
- * {@link org.eclipse.jst.j2ee.internal.internal.webservice.jaxrpcmap.PackageMapping}object. <!-- begin-user-doc --> <!--
- * end-user-doc -->
- *
- * @generated
- */
-public class PackageMappingItemProvider extends ItemProviderAdapter implements IEditingDomainItemProvider, ITreeItemContentProvider, IItemLabelProvider, IItemPropertySource {
- /**
- * This constructs an instance from a factory and a notifier. <!-- begin-user-doc --> <!--
- * end-user-doc -->
- *
- * @generated
- */
- public PackageMappingItemProvider(AdapterFactory adapterFactory) {
- super(adapterFactory);
- }
-
- /**
- * This returns the property descriptors for the adapted class. <!-- begin-user-doc --> <!--
- * end-user-doc -->
- *
- * @generated
- */
- @Override
- public List getPropertyDescriptors(Object object) {
- if (itemPropertyDescriptors == null) {
- super.getPropertyDescriptors(object);
-
- addIdPropertyDescriptor(object);
- addPackageTypePropertyDescriptor(object);
- addNamespaceURIPropertyDescriptor(object);
- }
- return itemPropertyDescriptors;
- }
-
- /**
- * This adds a property descriptor for the Id feature. <!-- begin-user-doc --> <!-- end-user-doc
- * -->
- *
- * @generated
- */
- protected void addIdPropertyDescriptor(Object object) {
- itemPropertyDescriptors.add(new ItemPropertyDescriptor(((ComposeableAdapterFactory) adapterFactory).getRootAdapterFactory(), getString("_UI_PackageMapping_id_feature"), //$NON-NLS-1$
- getString("_UI_PropertyDescriptor_description", "_UI_PackageMapping_id_feature", "_UI_PackageMapping_type"), //$NON-NLS-1$ //$NON-NLS-2$ //$NON-NLS-3$
- JaxrpcmapPackage.eINSTANCE.getPackageMapping_Id(), true, ItemPropertyDescriptor.GENERIC_VALUE_IMAGE));
- }
-
- /**
- * This adds a property descriptor for the Package Type feature. <!-- begin-user-doc --> <!--
- * end-user-doc -->
- *
- * @generated
- */
- protected void addPackageTypePropertyDescriptor(Object object) {
- itemPropertyDescriptors.add(new ItemPropertyDescriptor(((ComposeableAdapterFactory) adapterFactory).getRootAdapterFactory(), getString("_UI_PackageMapping_packageType_feature"), //$NON-NLS-1$
- getString("_UI_PropertyDescriptor_description", "_UI_PackageMapping_packageType_feature", "_UI_PackageMapping_type"), //$NON-NLS-1$ //$NON-NLS-2$ //$NON-NLS-3$
- JaxrpcmapPackage.eINSTANCE.getPackageMapping_PackageType(), true, ItemPropertyDescriptor.GENERIC_VALUE_IMAGE));
- }
-
- /**
- * This adds a property descriptor for the Namespace URI feature. <!-- begin-user-doc --> <!--
- * end-user-doc -->
- *
- * @generated
- */
- protected void addNamespaceURIPropertyDescriptor(Object object) {
- itemPropertyDescriptors.add(new ItemPropertyDescriptor(((ComposeableAdapterFactory) adapterFactory).getRootAdapterFactory(), getString("_UI_PackageMapping_namespaceURI_feature"), //$NON-NLS-1$
- getString("_UI_PropertyDescriptor_description", "_UI_PackageMapping_namespaceURI_feature", "_UI_PackageMapping_type"), //$NON-NLS-1$ //$NON-NLS-2$ //$NON-NLS-3$
- JaxrpcmapPackage.eINSTANCE.getPackageMapping_NamespaceURI(), true, ItemPropertyDescriptor.GENERIC_VALUE_IMAGE));
- }
-
-
- /**
- * This returns PackageMapping.gif. <!-- begin-user-doc --> <!-- end-user-doc -->
- *
- * @generated
- */
- @Override
- public Object getImage(Object object) {
- return getResourceLocator().getImage("full/obj16/PackageMapping"); //$NON-NLS-1$
- }
-
- /**
- * This returns the label text for the adapted class. <!-- begin-user-doc --> <!-- end-user-doc
- * -->
- *
- * @generated
- */
- @Override
- public String getText(Object object) {
- String label = ((PackageMapping) object).getId();
- return label == null || label.length() == 0 ? getString("_UI_PackageMapping_type") : //$NON-NLS-1$
- getString("_UI_PackageMapping_type") + " " + label; //$NON-NLS-1$ //$NON-NLS-2$
- }
-
- /**
- * This handles notification by calling {@link #fireNotifyChanged fireNotifyChanged}. <!--
- * begin-user-doc --> <!-- end-user-doc -->
- *
- * @generated
- */
- @Override
- public void notifyChanged(Notification notification) {
- switch (notification.getFeatureID(PackageMapping.class)) {
- case JaxrpcmapPackage.PACKAGE_MAPPING__ID :
- case JaxrpcmapPackage.PACKAGE_MAPPING__PACKAGE_TYPE :
- case JaxrpcmapPackage.PACKAGE_MAPPING__NAMESPACE_URI : {
- fireNotifyChanged(notification);
- return;
- }
- }
- super.notifyChanged(notification);
- }
-
- /**
- * This adds to the collection of {@link org.eclipse.emf.edit.command.CommandParameter}s
- * describing all of the children that can be created under this object. <!-- begin-user-doc -->
- * <!-- end-user-doc -->
- *
- * @generated
- */
- @Override
- protected void collectNewChildDescriptors(Collection newChildDescriptors, Object object) {
- super.collectNewChildDescriptors(newChildDescriptors, object);
- }
-
- /**
- * Return the resource locator for this item provider's resources. <!-- begin-user-doc --> <!--
- * end-user-doc -->
- *
- * @generated
- */
- @Override
- public ResourceLocator getResourceLocator() {
- return Webservicej2eeEditPlugin.INSTANCE;
- }
-}
diff --git a/plugins/org.eclipse.jst.j2ee.webservice/webservice/org/eclipse/jst/j2ee/internal/webservice/provider/PortComponentItemProvider.java b/plugins/org.eclipse.jst.j2ee.webservice/webservice/org/eclipse/jst/j2ee/internal/webservice/provider/PortComponentItemProvider.java
deleted file mode 100644
index a603fa1..0000000
--- a/plugins/org.eclipse.jst.j2ee.webservice/webservice/org/eclipse/jst/j2ee/internal/webservice/provider/PortComponentItemProvider.java
+++ /dev/null
@@ -1,344 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2003, 2005 IBM Corporation and others.
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
- *
- * Contributors:
- * IBM Corporation - initial API and implementation
- *******************************************************************************/
-package org.eclipse.jst.j2ee.internal.webservice.provider;
-
-
-import java.util.ArrayList;
-import java.util.Collection;
-import java.util.Iterator;
-import java.util.List;
-
-import org.eclipse.emf.common.notify.AdapterFactory;
-import org.eclipse.emf.common.notify.Notification;
-import org.eclipse.emf.common.util.EList;
-import org.eclipse.emf.common.util.ResourceLocator;
-import org.eclipse.emf.ecore.EObject;
-import org.eclipse.emf.ecore.EReference;
-import org.eclipse.emf.ecore.EStructuralFeature;
-import org.eclipse.emf.edit.provider.ComposeableAdapterFactory;
-import org.eclipse.emf.edit.provider.IEditingDomainItemProvider;
-import org.eclipse.emf.edit.provider.IItemLabelProvider;
-import org.eclipse.emf.edit.provider.IItemPropertySource;
-import org.eclipse.emf.edit.provider.ITreeItemContentProvider;
-import org.eclipse.emf.edit.provider.ItemPropertyDescriptor;
-import org.eclipse.emf.edit.provider.ItemProviderAdapter;
-import org.eclipse.jst.j2ee.common.CommonFactory;
-import org.eclipse.jst.j2ee.internal.webservice.adapter.AdapterViewerItem;
-import org.eclipse.jst.j2ee.internal.webservice.plugin.WebServicePlugin;
-import org.eclipse.jst.j2ee.webservice.wscommon.WscommonFactory;
-import org.eclipse.jst.j2ee.webservice.wsdd.PortComponent;
-import org.eclipse.jst.j2ee.webservice.wsdd.WsddFactory;
-import org.eclipse.jst.j2ee.webservice.wsdd.WsddPackage;
-
-/**
- * This is the item provider adpater for a {@link org.eclipse.jst.j2ee.internal.internal.webservice.wsdd.PortComponent}
- * object. <!-- begin-user-doc --> <!-- end-user-doc -->
- *
- * @generated
- */
-public class PortComponentItemProvider extends ItemProviderAdapter implements IEditingDomainItemProvider, ITreeItemContentProvider, IItemLabelProvider, IItemPropertySource {
- /**
- * This constructs an instance from a factory and a notifier. <!-- begin-user-doc --> <!--
- * end-user-doc -->
- *
- * @generated
- */
- public PortComponentItemProvider(AdapterFactory adapterFactory) {
- super(adapterFactory);
- }
-
- /**
- * This returns the property descriptors for the adapted class. <!-- begin-user-doc --> <!--
- * end-user-doc -->
- *
- * @generated
- */
- @Override
- public List getPropertyDescriptors(Object object) {
- if (itemPropertyDescriptors == null) {
- super.getPropertyDescriptors(object);
-
- addPortComponentNamePropertyDescriptor(object);
- addServiceEndpointInterfacePropertyDescriptor(object);
- addSmallIconPropertyDescriptor(object);
- addLargeIconPropertyDescriptor(object);
- addDescriptionPropertyDescriptor(object);
- addDisplayNamePropertyDescriptor(object);
- }
- return itemPropertyDescriptors;
- }
-
- /**
- * This adds a property descriptor for the Id feature. <!-- begin-user-doc --> <!-- end-user-doc
- * -->
- *
- * @generated
- */
- /*
- * pgm protected void addIdPropertyDescriptor(Object object) { itemPropertyDescriptors.add (new
- * ItemPropertyDescriptor (((ComposeableAdapterFactory)adapterFactory).getRootAdapterFactory(),
- * getString("_UI_PortComponent_id_feature"), getString("_UI_PropertyDescriptor_description",
- * "_UI_PortComponent_id_feature", "_UI_PortComponent_type"),
- * WsddPackage.eINSTANCE.getPortComponent_Id(), true,
- * ItemPropertyDescriptor.GENERIC_VALUE_IMAGE)); }
- */
-
- /**
- * This adds a property descriptor for the Port Component Name feature. <!-- begin-user-doc -->
- * <!-- end-user-doc -->
- *
- * @generated
- */
- protected void addPortComponentNamePropertyDescriptor(Object object) {
- itemPropertyDescriptors.add(new ItemPropertyDescriptor(((ComposeableAdapterFactory) adapterFactory).getRootAdapterFactory(), getString("_UI_PortComponent_portComponentName_feature"), //$NON-NLS-1$
- getString("_UI_PropertyDescriptor_description", "_UI_PortComponent_portComponentName_feature", "_UI_PortComponent_type"), //$NON-NLS-1$ //$NON-NLS-2$ //$NON-NLS-3$
- WsddPackage.eINSTANCE.getPortComponent_PortComponentName(), true, ItemPropertyDescriptor.GENERIC_VALUE_IMAGE));
- }
-
- /**
- * This adds a property descriptor for the Service Endpoint Interface feature. <!--
- * begin-user-doc --> <!-- end-user-doc -->
- *
- * @generated
- */
- protected void addServiceEndpointInterfacePropertyDescriptor(Object object) {
- itemPropertyDescriptors.add(new ItemPropertyDescriptor(((ComposeableAdapterFactory) adapterFactory).getRootAdapterFactory(), getString("_UI_PortComponent_serviceEndpointInterface_feature"), //$NON-NLS-1$
- getString("_UI_PropertyDescriptor_description", "_UI_PortComponent_serviceEndpointInterface_feature", "_UI_PortComponent_type"), //$NON-NLS-1$ //$NON-NLS-2$ //$NON-NLS-3$
- WsddPackage.eINSTANCE.getPortComponent_ServiceEndpointInterface(), true, ItemPropertyDescriptor.GENERIC_VALUE_IMAGE));
- }
-
- /**
- * This adds a property descriptor for the Small Icon feature. <!-- begin-user-doc --> <!--
- * end-user-doc -->
- *
- * @generated
- */
- protected void addSmallIconPropertyDescriptor(Object object) {
- itemPropertyDescriptors.add(new ItemPropertyDescriptor(((ComposeableAdapterFactory) adapterFactory).getRootAdapterFactory(), getString("_UI_PortComponent_smallIcon_feature"), //$NON-NLS-1$
- getString("_UI_PropertyDescriptor_description", "_UI_PortComponent_smallIcon_feature", "_UI_PortComponent_type"), //$NON-NLS-1$ //$NON-NLS-2$ //$NON-NLS-3$
- WsddPackage.eINSTANCE.getPortComponent_SmallIcon(), true, ItemPropertyDescriptor.GENERIC_VALUE_IMAGE));
- }
-
- /**
- * This adds a property descriptor for the Large Icon feature. <!-- begin-user-doc --> <!--
- * end-user-doc -->
- *
- * @generated
- */
- protected void addLargeIconPropertyDescriptor(Object object) {
- itemPropertyDescriptors.add(new ItemPropertyDescriptor(((ComposeableAdapterFactory) adapterFactory).getRootAdapterFactory(), getString("_UI_PortComponent_largeIcon_feature"), //$NON-NLS-1$
- getString("_UI_PropertyDescriptor_description", "_UI_PortComponent_largeIcon_feature", "_UI_PortComponent_type"), //$NON-NLS-1$ //$NON-NLS-2$ //$NON-NLS-3$
- WsddPackage.eINSTANCE.getPortComponent_LargeIcon(), true, ItemPropertyDescriptor.GENERIC_VALUE_IMAGE));
- }
-
- /**
- * This adds a property descriptor for the Description feature. <!-- begin-user-doc --> <!--
- * end-user-doc -->
- *
- * @generated
- */
- protected void addDescriptionPropertyDescriptor(Object object) {
- itemPropertyDescriptors.add(new ItemPropertyDescriptor(((ComposeableAdapterFactory) adapterFactory).getRootAdapterFactory(), getString("_UI_PortComponent_description_feature"), //$NON-NLS-1$
- getString("_UI_PropertyDescriptor_description", "_UI_PortComponent_description_feature", "_UI_PortComponent_type"), //$NON-NLS-1$ //$NON-NLS-2$ //$NON-NLS-3$
- WsddPackage.eINSTANCE.getPortComponent_Description(), true, ItemPropertyDescriptor.GENERIC_VALUE_IMAGE));
- }
-
- /**
- * This adds a property descriptor for the Display Name feature. <!-- begin-user-doc --> <!--
- * end-user-doc -->
- *
- * @generated
- */
- protected void addDisplayNamePropertyDescriptor(Object object) {
- itemPropertyDescriptors.add(new ItemPropertyDescriptor(((ComposeableAdapterFactory) adapterFactory).getRootAdapterFactory(), getString("_UI_PortComponent_displayName_feature"), //$NON-NLS-1$
- getString("_UI_PropertyDescriptor_description", "_UI_PortComponent_displayName_feature", "_UI_PortComponent_type"), //$NON-NLS-1$ //$NON-NLS-2$ //$NON-NLS-3$
- WsddPackage.eINSTANCE.getPortComponent_DisplayName(), true, ItemPropertyDescriptor.GENERIC_VALUE_IMAGE));
- }
-
- /**
- * This specifies how to implement {@link #getChildren}and
- * {@link org.eclipse.emf.edit.command.AddCommand}and
- * {@link org.eclipse.emf.edit.command.RemoveCommand}support in {@link #createCommand}. <!--
- * begin-user-doc --> <!-- end-user-doc -->
- *
- * @generated
- */
- @Override
- public Collection getChildrenReferences(Object object) {
- if (childrenReferences == null) {
- super.getChildrenReferences(object);
- childrenReferences.add(WsddPackage.eINSTANCE.getPortComponent_WsdlPort());
- childrenReferences.add(WsddPackage.eINSTANCE.getPortComponent_ServiceImplBean());
- childrenReferences.add(WsddPackage.eINSTANCE.getPortComponent_Handlers());
- childrenReferences.add(WsddPackage.eINSTANCE.getPortComponent_DescriptionType());
- childrenReferences.add(WsddPackage.eINSTANCE.getPortComponent_DisplayNameType());
- childrenReferences.add(WsddPackage.eINSTANCE.getPortComponent_IconType());
- }
- return childrenReferences;
- }
-
- /**
- * <!-- begin-user-doc --> <!-- end-user-doc -->
- *
- * @generated
- */
- @Override
- protected EReference getChildReference(Object object, Object child) {
- // Check the type of the specified child object and return the proper feature to use for
- // adding (see {@link AddCommand}) it as a child.
-
- return super.getChildReference(object, child);
- }
-
-
- /**
- * This returns PortComponent.gif. <!-- begin-user-doc --> <!-- end-user-doc -->
- *
- * @generated
- */
- /*
- * public Object getImage(Object object) { return
- * getResourceLocator().getImage("full/obj16/PortComponent"); }
- */
- /**
- * This returns the label text for the adapted class. <!-- begin-user-doc --> <!-- end-user-doc
- * -->
- *
- * @generated
- */
- /*
- * public String getText(Object object) { String label =
- * ((PortComponent)object).getPortComponentName(); return label == null || label.length() == 0 ?
- * getString("_UI_PortComponent_type") : getString("_UI_PortComponent_type") + " " + label; }
- */
-
- /**
- * This returns PortComponent.gif. <!-- begin-user-doc --> <!-- end-user-doc -->
- *
- * @non-generated
- */
- @Override
- public Object getImage(Object object) {
- return getResourceLocator().getImage("icons/obj16/portcomponent.gif"); //$NON-NLS-1$
- }
-
- /**
- * This returns the label text for the adapted class. <!-- begin-user-doc --> <!-- end-user-doc
- * -->
- *
- * @non-generated
- */
- @Override
- public String getText(Object object) {
- String label = ((PortComponent) object).getPortComponentName();
- return label == null || label.length() == 0 ? getString("%_UI_PortComponent_type") : label; //$NON-NLS-1$
- }
-
- /**
- * This handles notification by calling {@link #fireNotifyChanged fireNotifyChanged}. <!--
- * begin-user-doc --> <!-- end-user-doc -->
- *
- * @generated
- */
- @Override
- public void notifyChanged(Notification notification) {
- switch (notification.getFeatureID(PortComponent.class)) {
- case WsddPackage.PORT_COMPONENT__PORT_COMPONENT_NAME :
- case WsddPackage.PORT_COMPONENT__SERVICE_ENDPOINT_INTERFACE :
- case WsddPackage.PORT_COMPONENT__SMALL_ICON :
- case WsddPackage.PORT_COMPONENT__LARGE_ICON :
- case WsddPackage.PORT_COMPONENT__DESCRIPTION :
- case WsddPackage.PORT_COMPONENT__DISPLAY_NAME :
- case WsddPackage.PORT_COMPONENT__WSDL_PORT :
- case WsddPackage.PORT_COMPONENT__SERVICE_IMPL_BEAN :
- case WsddPackage.PORT_COMPONENT__HANDLERS :
- case WsddPackage.PORT_COMPONENT__DESCRIPTION_TYPE :
- case WsddPackage.PORT_COMPONENT__DISPLAY_NAME_TYPE :
- case WsddPackage.PORT_COMPONENT__ICON_TYPE : {
- fireNotifyChanged(notification);
- return;
- }
- }
- super.notifyChanged(notification);
- }
-
- /**
- * This adds to the collection of {@link org.eclipse.emf.edit.command.CommandParameter}s
- * describing all of the children that can be created under this object. <!-- begin-user-doc -->
- * <!-- end-user-doc -->
- *
- * @generated
- */
- @Override
- protected void collectNewChildDescriptors(Collection newChildDescriptors, Object object) {
- super.collectNewChildDescriptors(newChildDescriptors, object);
-
- newChildDescriptors.add(createChildParameter(WsddPackage.eINSTANCE.getPortComponent_WsdlPort(), WsddFactory.eINSTANCE.createWSDLPort()));
-
- newChildDescriptors.add(createChildParameter(WsddPackage.eINSTANCE.getPortComponent_ServiceImplBean(), WsddFactory.eINSTANCE.createServiceImplBean()));
-
- newChildDescriptors.add(createChildParameter(WsddPackage.eINSTANCE.getPortComponent_Handlers(), WsddFactory.eINSTANCE.createHandler()));
-
- newChildDescriptors.add(createChildParameter(WsddPackage.eINSTANCE.getPortComponent_DescriptionType(), WscommonFactory.eINSTANCE.createDescriptionType()));
-
- newChildDescriptors.add(createChildParameter(WsddPackage.eINSTANCE.getPortComponent_DisplayNameType(), WscommonFactory.eINSTANCE.createDisplayNameType()));
-
- newChildDescriptors.add(createChildParameter(WsddPackage.eINSTANCE.getPortComponent_IconType(), CommonFactory.eINSTANCE.createIconType()));
- }
-
- /**
- * Return the resource locator for this item provider's resources. <!-- begin-user-doc --> <!--
- * end-user-doc -->
- */
- @Override
- public ResourceLocator getResourceLocator() {
- return WebServicePlugin.getInstance();
- }
-
- /**
- * This implements
- * {@link ITreeItemContentProvider#getChildren ITreeItemContentProvider.getChildren}by calling
- * {@link #getChildrenReferences getChildrenReferences}and using those to collect the children.
- */
- @Override
- public Collection getChildren(Object object) {
- if (object instanceof EList)
- return getChildrenFromEList((EList) object);
- else if (object instanceof AdapterViewerItem)
- return getChildrenFromAdapterViewerItem((AdapterViewerItem) object);
- else
- return super.getChildren(object);
- }
-
- protected Collection getChildrenFromEList(EList eList) {
- Collection result = new ArrayList();
- for (Iterator it = eList.iterator(); it.hasNext();)
- result.addAll(super.getChildren(it.next()));
- return result;
- }
-
- protected Collection getChildrenFromAdapterViewerItem(AdapterViewerItem adapterViewerItem) {
- Collection result = new ArrayList();
- EList eObjectList = adapterViewerItem.getEObjectList();
- EStructuralFeature feature = adapterViewerItem.getEStructuralFeature();
- for (Iterator it = eObjectList.iterator(); it.hasNext();) {
- EObject eObject = (EObject) it.next();
- Object object = eObject.eGet(feature);
- if (object != null) {
- if (object instanceof List)
- result.addAll((List) object);
- else
- result.add(object);
- }
- }
- return result;
- }
-}
diff --git a/plugins/org.eclipse.jst.j2ee.webservice/webservice/org/eclipse/jst/j2ee/internal/webservice/provider/PortComponentRefItemProvider.java b/plugins/org.eclipse.jst.j2ee.webservice/webservice/org/eclipse/jst/j2ee/internal/webservice/provider/PortComponentRefItemProvider.java
deleted file mode 100644
index 5979bc6..0000000
--- a/plugins/org.eclipse.jst.j2ee.webservice/webservice/org/eclipse/jst/j2ee/internal/webservice/provider/PortComponentRefItemProvider.java
+++ /dev/null
@@ -1,159 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2003, 2005 IBM Corporation and others.
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
- *
- * Contributors:
- * IBM Corporation - initial API and implementation
- *******************************************************************************/
-package org.eclipse.jst.j2ee.internal.webservice.provider;
-
-
-import java.util.Collection;
-import java.util.List;
-
-import org.eclipse.emf.common.notify.AdapterFactory;
-import org.eclipse.emf.common.notify.Notification;
-import org.eclipse.emf.common.util.ResourceLocator;
-import org.eclipse.emf.edit.provider.ComposeableAdapterFactory;
-import org.eclipse.emf.edit.provider.IEditingDomainItemProvider;
-import org.eclipse.emf.edit.provider.IItemLabelProvider;
-import org.eclipse.emf.edit.provider.IItemPropertySource;
-import org.eclipse.emf.edit.provider.ITreeItemContentProvider;
-import org.eclipse.emf.edit.provider.ItemPropertyDescriptor;
-import org.eclipse.emf.edit.provider.ItemProviderAdapter;
-import org.eclipse.jst.j2ee.internal.webservice.plugin.WebServicePlugin;
-import org.eclipse.jst.j2ee.webservice.wsclient.PortComponentRef;
-import org.eclipse.jst.j2ee.webservice.wsclient.Webservice_clientPackage;
-
-
-/**
- * This is the item provider adpater for a {@link com.ibm.etools.wsclient.PortComponentRef}object.
- * <!-- begin-user-doc --> <!-- end-user-doc -->
- *
- * @generated
- */
-public class PortComponentRefItemProvider extends ItemProviderAdapter implements IEditingDomainItemProvider, ITreeItemContentProvider, IItemLabelProvider, IItemPropertySource {
- /**
- * This constructs an instance from a factory and a notifier. <!-- begin-user-doc --> <!--
- * end-user-doc -->
- *
- * @generated
- */
- public PortComponentRefItemProvider(AdapterFactory adapterFactory) {
- super(adapterFactory);
- }
-
- /**
- * This returns the property descriptors for the adapted class. <!-- begin-user-doc --> <!--
- * end-user-doc -->
- *
- * @generated
- */
- @Override
- public List getPropertyDescriptors(Object object) {
- if (itemPropertyDescriptors == null) {
- super.getPropertyDescriptors(object);
-
- addPortComponentLinkPropertyDescriptor(object);
- addServiceEndpointInterfacePropertyDescriptor(object);
- }
- return itemPropertyDescriptors;
- }
-
- /**
- * This adds a property descriptor for the Port Component Link feature. <!-- begin-user-doc -->
- * <!-- end-user-doc -->
- *
- */
- protected void addPortComponentLinkPropertyDescriptor(Object object) {
- itemPropertyDescriptors.add(new ItemPropertyDescriptor(((ComposeableAdapterFactory) adapterFactory).getRootAdapterFactory(), getString("%_UI_PortComponentRef_portComponentLink_feature"), //$NON-NLS-1$
- getString("%_UI_PortComponentRef_portComponentLink_feature_desc"), //$NON-NLS-1$
- Webservice_clientPackage.eINSTANCE.getPortComponentRef_PortComponentLink(), false, ItemPropertyDescriptor.GENERIC_VALUE_IMAGE));
- }
-
- /**
- * This adds a property descriptor for the Service Endpoint Interface feature. <!--
- * begin-user-doc --> <!-- end-user-doc -->
- *
- */
- protected void addServiceEndpointInterfacePropertyDescriptor(Object object) {
- itemPropertyDescriptors.add(new ItemPropertyDescriptor(((ComposeableAdapterFactory) adapterFactory).getRootAdapterFactory(), getString("%_UI_PortComponentRef_serviceEndpointInterface_feature"), //$NON-NLS-1$
- getString("%_UI_PortComponentRef_serviceEndpointInterface_feature_desc"), //$NON-NLS-1$
- Webservice_clientPackage.eINSTANCE.getPortComponentRef_ServiceEndpointInterface(), false));
- }
-
-
- /**
- * This returns PortComponentRef.gif. <!-- begin-user-doc --> <!-- end-user-doc -->
- */
- @Override
- public Object getImage(Object object) {
- return getResourceLocator().getImage("icons/obj16/portcomponent.gif"); //$NON-NLS-1$
- }
-
- /**
- * This returns the label text for the adapted class. <!-- begin-user-doc --> <!-- end-user-doc
- * -->
- *
- * @generated
- */
- /*
- * public String getText(Object object) { String label =
- * ((PortComponentRef)object).getPortComponentLink(); return label == null || label.length() ==
- * 0 ? getString("_UI_PortComponentRef_type") : getString("_UI_PortComponentRef_type") + " " +
- * label; }
- */
-
- /**
- * This returns the label text for the adapted class. <!-- begin-user-doc --> <!-- end-user-doc
- * -->
- *
- * @non-generated
- */
- @Override
- public String getText(Object object) {
- String label = ((PortComponentRef) object).getPortComponentLink();
- return label == null || label.length() == 0 ? getString("%_UI_PortComponentRef_type") : label; //$NON-NLS-1$
- }
-
- /**
- * This handles notification by calling {@link #fireNotifyChanged fireNotifyChanged}. <!--
- * begin-user-doc --> <!-- end-user-doc -->
- *
- * @generated
- */
- @Override
- public void notifyChanged(Notification notification) {
- switch (notification.getFeatureID(PortComponentRef.class)) {
- case Webservice_clientPackage.PORT_COMPONENT_REF__PORT_COMPONENT_LINK : {
- fireNotifyChanged(notification);
- return;
- }
- }
- super.notifyChanged(notification);
- }
-
- /**
- * This adds to the collection of {@link org.eclipse.emf.edit.command.CommandParameter}s
- * describing all of the children that can be created under this object. <!-- begin-user-doc -->
- * <!-- end-user-doc -->
- *
- * @generated
- */
- @Override
- protected void collectNewChildDescriptors(Collection newChildDescriptors, Object object) {
- super.collectNewChildDescriptors(newChildDescriptors, object);
- }
-
- /**
- * Return the resource locator for this item provider's resources. <!-- begin-user-doc --> <!--
- * end-user-doc -->
- */
- @Override
- public ResourceLocator getResourceLocator() {
- return WebServicePlugin.getInstance();
- }
-}
diff --git a/plugins/org.eclipse.jst.j2ee.webservice/webservice/org/eclipse/jst/j2ee/internal/webservice/provider/PortMappingItemProvider.java b/plugins/org.eclipse.jst.j2ee.webservice/webservice/org/eclipse/jst/j2ee/internal/webservice/provider/PortMappingItemProvider.java
deleted file mode 100644
index 1abd29c..0000000
--- a/plugins/org.eclipse.jst.j2ee.webservice/webservice/org/eclipse/jst/j2ee/internal/webservice/provider/PortMappingItemProvider.java
+++ /dev/null
@@ -1,167 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2003, 2005 IBM Corporation and others.
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
- *
- * Contributors:
- * IBM Corporation - initial API and implementation
- *******************************************************************************/
-package org.eclipse.jst.j2ee.internal.webservice.provider;
-
-
-import java.util.Collection;
-import java.util.List;
-
-import org.eclipse.emf.common.notify.AdapterFactory;
-import org.eclipse.emf.common.notify.Notification;
-import org.eclipse.emf.common.util.ResourceLocator;
-import org.eclipse.emf.edit.provider.ComposeableAdapterFactory;
-import org.eclipse.emf.edit.provider.IEditingDomainItemProvider;
-import org.eclipse.emf.edit.provider.IItemLabelProvider;
-import org.eclipse.emf.edit.provider.IItemPropertySource;
-import org.eclipse.emf.edit.provider.ITreeItemContentProvider;
-import org.eclipse.emf.edit.provider.ItemPropertyDescriptor;
-import org.eclipse.emf.edit.provider.ItemProviderAdapter;
-import org.eclipse.jst.j2ee.webservice.jaxrpcmap.JaxrpcmapPackage;
-import org.eclipse.jst.j2ee.webservice.jaxrpcmap.PortMapping;
-
-
-/**
- * This is the item provider adpater for a {@link org.eclipse.jst.j2ee.internal.internal.webservice.jaxrpcmap.PortMapping}
- * object. <!-- begin-user-doc --> <!-- end-user-doc -->
- *
- * @generated
- */
-public class PortMappingItemProvider extends ItemProviderAdapter implements IEditingDomainItemProvider, ITreeItemContentProvider, IItemLabelProvider, IItemPropertySource {
- /**
- * This constructs an instance from a factory and a notifier. <!-- begin-user-doc --> <!--
- * end-user-doc -->
- *
- * @generated
- */
- public PortMappingItemProvider(AdapterFactory adapterFactory) {
- super(adapterFactory);
- }
-
- /**
- * This returns the property descriptors for the adapted class. <!-- begin-user-doc --> <!--
- * end-user-doc -->
- *
- * @generated
- */
- @Override
- public List getPropertyDescriptors(Object object) {
- if (itemPropertyDescriptors == null) {
- super.getPropertyDescriptors(object);
-
- addIdPropertyDescriptor(object);
- addPortNamePropertyDescriptor(object);
- addJavaPortNamePropertyDescriptor(object);
- }
- return itemPropertyDescriptors;
- }
-
- /**
- * This adds a property descriptor for the Id feature. <!-- begin-user-doc --> <!-- end-user-doc
- * -->
- *
- * @generated
- */
- protected void addIdPropertyDescriptor(Object object) {
- itemPropertyDescriptors.add(new ItemPropertyDescriptor(((ComposeableAdapterFactory) adapterFactory).getRootAdapterFactory(), getString("_UI_PortMapping_id_feature"), //$NON-NLS-1$
- getString("_UI_PropertyDescriptor_description", "_UI_PortMapping_id_feature", "_UI_PortMapping_type"), //$NON-NLS-1$ //$NON-NLS-2$ //$NON-NLS-3$
- JaxrpcmapPackage.eINSTANCE.getPortMapping_Id(), true, ItemPropertyDescriptor.GENERIC_VALUE_IMAGE));
- }
-
- /**
- * This adds a property descriptor for the Port Name feature. <!-- begin-user-doc --> <!--
- * end-user-doc -->
- *
- * @generated
- */
- protected void addPortNamePropertyDescriptor(Object object) {
- itemPropertyDescriptors.add(new ItemPropertyDescriptor(((ComposeableAdapterFactory) adapterFactory).getRootAdapterFactory(), getString("_UI_PortMapping_portName_feature"), //$NON-NLS-1$
- getString("_UI_PropertyDescriptor_description", "_UI_PortMapping_portName_feature", "_UI_PortMapping_type"), //$NON-NLS-1$ //$NON-NLS-2$ //$NON-NLS-3$
- JaxrpcmapPackage.eINSTANCE.getPortMapping_PortName(), true, ItemPropertyDescriptor.GENERIC_VALUE_IMAGE));
- }
-
- /**
- * This adds a property descriptor for the Java Port Name feature. <!-- begin-user-doc --> <!--
- * end-user-doc -->
- *
- * @generated
- */
- protected void addJavaPortNamePropertyDescriptor(Object object) {
- itemPropertyDescriptors.add(new ItemPropertyDescriptor(((ComposeableAdapterFactory) adapterFactory).getRootAdapterFactory(), getString("_UI_PortMapping_javaPortName_feature"), //$NON-NLS-1$
- getString("_UI_PropertyDescriptor_description", "_UI_PortMapping_javaPortName_feature", "_UI_PortMapping_type"), //$NON-NLS-1$ //$NON-NLS-2$ //$NON-NLS-3$
- JaxrpcmapPackage.eINSTANCE.getPortMapping_JavaPortName(), true, ItemPropertyDescriptor.GENERIC_VALUE_IMAGE));
- }
-
-
- /**
- * This returns PortMapping.gif. <!-- begin-user-doc --> <!-- end-user-doc -->
- *
- * @generated
- */
- @Override
- public Object getImage(Object object) {
- return getResourceLocator().getImage("full/obj16/PortMapping"); //$NON-NLS-1$
- }
-
- /**
- * This returns the label text for the adapted class. <!-- begin-user-doc --> <!-- end-user-doc
- * -->
- *
- * @generated
- */
- @Override
- public String getText(Object object) {
- String label = ((PortMapping) object).getPortName();
- return label == null || label.length() == 0 ? getString("_UI_PortMapping_type") : //$NON-NLS-1$
- getString("_UI_PortMapping_type") + " " + label; //$NON-NLS-1$ //$NON-NLS-2$
- }
-
- /**
- * This handles notification by calling {@link #fireNotifyChanged fireNotifyChanged}. <!--
- * begin-user-doc --> <!-- end-user-doc -->
- *
- * @generated
- */
- @Override
- public void notifyChanged(Notification notification) {
- switch (notification.getFeatureID(PortMapping.class)) {
- case JaxrpcmapPackage.PORT_MAPPING__ID :
- case JaxrpcmapPackage.PORT_MAPPING__PORT_NAME :
- case JaxrpcmapPackage.PORT_MAPPING__JAVA_PORT_NAME : {
- fireNotifyChanged(notification);
- return;
- }
- }
- super.notifyChanged(notification);
- }
-
- /**
- * This adds to the collection of {@link org.eclipse.emf.edit.command.CommandParameter}s
- * describing all of the children that can be created under this object. <!-- begin-user-doc -->
- * <!-- end-user-doc -->
- *
- * @generated
- */
- @Override
- protected void collectNewChildDescriptors(Collection newChildDescriptors, Object object) {
- super.collectNewChildDescriptors(newChildDescriptors, object);
- }
-
- /**
- * Return the resource locator for this item provider's resources. <!-- begin-user-doc --> <!--
- * end-user-doc -->
- *
- * @generated
- */
- @Override
- public ResourceLocator getResourceLocator() {
- return Webservicej2eeEditPlugin.INSTANCE;
- }
-}
diff --git a/plugins/org.eclipse.jst.j2ee.webservice/webservice/org/eclipse/jst/j2ee/internal/webservice/provider/PortNameItemProvider.java b/plugins/org.eclipse.jst.j2ee.webservice/webservice/org/eclipse/jst/j2ee/internal/webservice/provider/PortNameItemProvider.java
deleted file mode 100644
index 4a6bb12..0000000
--- a/plugins/org.eclipse.jst.j2ee.webservice/webservice/org/eclipse/jst/j2ee/internal/webservice/provider/PortNameItemProvider.java
+++ /dev/null
@@ -1,163 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2003, 2005 IBM Corporation and others.
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
- *
- * Contributors:
- * IBM Corporation - initial API and implementation
- *******************************************************************************/
-package org.eclipse.jst.j2ee.internal.webservice.provider;
-
-
-import java.util.Collection;
-import java.util.List;
-
-import org.eclipse.emf.common.notify.AdapterFactory;
-import org.eclipse.emf.common.notify.Notification;
-import org.eclipse.emf.edit.provider.ComposeableAdapterFactory;
-import org.eclipse.emf.edit.provider.IEditingDomainItemProvider;
-import org.eclipse.emf.edit.provider.IItemLabelProvider;
-import org.eclipse.emf.edit.provider.IItemPropertySource;
-import org.eclipse.emf.edit.provider.ITreeItemContentProvider;
-import org.eclipse.emf.edit.provider.ItemPropertyDescriptor;
-import org.eclipse.jst.j2ee.webservice.wscommon.PortName;
-import org.eclipse.jst.j2ee.webservice.wscommon.WscommonPackage;
-
-
-/**
- * This is the item provider adpater for a {@link org.eclipse.jst.j2ee.internal.internal.webservice.wscommon.PortName}
- * object. <!-- begin-user-doc --> <!-- end-user-doc -->
- *
- * @generated
- */
-public class PortNameItemProvider extends AbstractATKUIItemProvider implements IEditingDomainItemProvider, ITreeItemContentProvider, IItemLabelProvider, IItemPropertySource {
- /**
- * This constructs an instance from a factory and a notifier. <!-- begin-user-doc --> <!--
- * end-user-doc -->
- *
- * @generated
- */
- public PortNameItemProvider(AdapterFactory adapterFactory) {
- super(adapterFactory);
- }
-
- /**
- * This returns the property descriptors for the adapted class. <!-- begin-user-doc --> <!--
- * end-user-doc -->
- *
- * @generated
- */
- @Override
- public List getPropertyDescriptors(Object object) {
- if (itemPropertyDescriptors == null) {
- super.getPropertyDescriptors(object);
-
- //pgm addIdPropertyDescriptor(object);
- addPortNamePropertyDescriptor(object);
- }
- return itemPropertyDescriptors;
- }
-
- /**
- * This adds a property descriptor for the Id feature. <!-- begin-user-doc --> <!-- end-user-doc
- * -->
- *
- * @generated
- */
- /*
- * pgm protected void addIdPropertyDescriptor(Object object) { itemPropertyDescriptors.add (new
- * ItemPropertyDescriptor (((ComposeableAdapterFactory)adapterFactory).getRootAdapterFactory(),
- * getString("_UI_PortName_id_feature"), getString("_UI_PropertyDescriptor_description",
- * "_UI_PortName_id_feature", "_UI_PortName_type"), WscommonPackage.eINSTANCE.getPortName_Id(),
- * true, ItemPropertyDescriptor.GENERIC_VALUE_IMAGE)); }
- */
-
- /**
- * This adds a property descriptor for the Port Name feature. <!-- begin-user-doc --> <!--
- * end-user-doc -->
- *
- * @generated
- */
- protected void addPortNamePropertyDescriptor(Object object) {
- itemPropertyDescriptors.add(new ItemPropertyDescriptor(((ComposeableAdapterFactory) adapterFactory).getRootAdapterFactory(), getString("_UI_PortName_portName_feature"), //$NON-NLS-1$
- getString("_UI_PropertyDescriptor_description", "_UI_PortName_portName_feature", "_UI_PortName_type"), //$NON-NLS-1$ //$NON-NLS-2$ //$NON-NLS-3$
- WscommonPackage.eINSTANCE.getPortName_PortName(), true, ItemPropertyDescriptor.GENERIC_VALUE_IMAGE));
- }
-
-
- /**
- * This returns PortName.gif. <!-- begin-user-doc --> <!-- end-user-doc -->
- *
- * @generated
- */
- @Override
- public Object getImage(Object object) {
- return getResourceLocator().getImage("full/obj16/PortName"); //$NON-NLS-1$
- }
-
- /**
- * This returns the label text for the adapted class. <!-- begin-user-doc --> <!-- end-user-doc
- * -->
- *
- * @generated
- */
- /*
- * public String getText(Object object) { String label = ((PortName)object).getPortName();
- * return label == null || label.length() == 0 ? getString("_UI_PortName_type") :
- * getString("_UI_PortName_type") + " " + label; }
- */
- /**
- * This returns the label text for the adapted class. <!-- begin-user-doc --> <!-- end-user-doc
- * -->
- *
- * @non-generated
- */
- @Override
- public String getText(Object object) {
- String label = ((PortName) object).getPortName();
- return label == null || label.length() == 0 ? getString("%_UI_PortName_type") : label; //$NON-NLS-1$
- }
-
-
- /**
- * This handles notification by calling {@link #fireNotifyChanged fireNotifyChanged}. <!--
- * begin-user-doc --> <!-- end-user-doc -->
- *
- * @generated
- */
- @Override
- public void notifyChanged(Notification notification) {
- switch (notification.getFeatureID(PortName.class)) {
- //pgm case WscommonPackage.PORT_NAME__ID:
- case WscommonPackage.PORT_NAME__PORT_NAME : {
- fireNotifyChanged(notification);
- return;
- }
- }
- super.notifyChanged(notification);
- }
-
- /**
- * This adds to the collection of {@link org.eclipse.emf.edit.command.CommandParameter}s
- * describing all of the children that can be created under this object. <!-- begin-user-doc -->
- * <!-- end-user-doc -->
- *
- * @generated
- */
- @Override
- protected void collectNewChildDescriptors(Collection newChildDescriptors, Object object) {
- super.collectNewChildDescriptors(newChildDescriptors, object);
- }
-
- /**
- * Return the resource locator for this item provider's resources. <!-- begin-user-doc --> <!--
- * end-user-doc -->
- *
- * @generated
- */
- /*
- * public ResourceLocator getResourceLocator() { return Webservicej2eeEditPlugin.INSTANCE; }
- */
-}
diff --git a/plugins/org.eclipse.jst.j2ee.webservice/webservice/org/eclipse/jst/j2ee/internal/webservice/provider/RootTypeQnameItemProvider.java b/plugins/org.eclipse.jst.j2ee.webservice/webservice/org/eclipse/jst/j2ee/internal/webservice/provider/RootTypeQnameItemProvider.java
deleted file mode 100644
index 1af13d2..0000000
--- a/plugins/org.eclipse.jst.j2ee.webservice/webservice/org/eclipse/jst/j2ee/internal/webservice/provider/RootTypeQnameItemProvider.java
+++ /dev/null
@@ -1,113 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2003, 2004 IBM Corporation and others.
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
- *
- * Contributors:
- * IBM Corporation - initial API and implementation
- *******************************************************************************/
-package org.eclipse.jst.j2ee.internal.webservice.provider;
-
-
-import java.util.Collection;
-import java.util.List;
-
-import org.eclipse.emf.common.notify.AdapterFactory;
-import org.eclipse.emf.common.notify.Notification;
-import org.eclipse.emf.common.util.ResourceLocator;
-import org.eclipse.jst.j2ee.common.internal.provider.QNameItemProvider;
-import org.eclipse.jst.j2ee.webservice.jaxrpcmap.RootTypeQname;
-
-
-/**
- * This is the item provider adpater for a {@link org.eclipse.jst.j2ee.internal.internal.webservice.jaxrpcmap.RootTypeQname}
- * object. <!-- begin-user-doc --> <!-- end-user-doc -->
- *
- * @generated
- */
-public class RootTypeQnameItemProvider extends QNameItemProvider{
- /**
- * This constructs an instance from a factory and a notifier. <!-- begin-user-doc --> <!--
- * end-user-doc -->
- *
- * @generated
- */
- public RootTypeQnameItemProvider(AdapterFactory adapterFactory) {
- super(adapterFactory);
- }
-
- /**
- * This returns the property descriptors for the adapted class. <!-- begin-user-doc --> <!--
- * end-user-doc -->
- *
- * @generated
- */
- @Override
- public List getPropertyDescriptors(Object object) {
- if (itemPropertyDescriptors == null) {
- super.getPropertyDescriptors(object);
-
- }
- return itemPropertyDescriptors;
- }
-
-
- /**
- * This returns RootTypeQname.gif. <!-- begin-user-doc --> <!-- end-user-doc -->
- *
- * @generated
- */
- @Override
- public Object getImage(Object object) {
- return getResourceLocator().getImage("full/obj16/RootTypeQname"); //$NON-NLS-1$
- }
-
- /**
- * This returns the label text for the adapted class. <!-- begin-user-doc --> <!-- end-user-doc
- * -->
- *
- * @generated
- */
- @Override
- public String getText(Object object) {
- String label = ((RootTypeQname) object).getCombinedQName();
- return label == null || label.length() == 0 ? getString("_UI_RootTypeQname_type") : //$NON-NLS-1$
- getString("_UI_RootTypeQname_type") + " " + label; //$NON-NLS-1$ //$NON-NLS-2$
- }
-
- /**
- * This handles notification by calling {@link #fireNotifyChanged fireNotifyChanged}. <!--
- * begin-user-doc --> <!-- end-user-doc -->
- *
- * @generated
- */
- @Override
- public void notifyChanged(Notification notification) {
- super.notifyChanged(notification);
- }
-
- /**
- * This adds to the collection of {@link org.eclipse.emf.edit.command.CommandParameter}s
- * describing all of the children that can be created under this object. <!-- begin-user-doc -->
- * <!-- end-user-doc -->
- *
- * @generated
- */
- @Override
- protected void collectNewChildDescriptors(Collection newChildDescriptors, Object object) {
- super.collectNewChildDescriptors(newChildDescriptors, object);
- }
-
- /**
- * Return the resource locator for this item provider's resources. <!-- begin-user-doc --> <!--
- * end-user-doc -->
- *
- * @generated
- */
- @Override
- public ResourceLocator getResourceLocator() {
- return Webservicej2eeEditPlugin.INSTANCE;
- }
-}
\ No newline at end of file
diff --git a/plugins/org.eclipse.jst.j2ee.webservice/webservice/org/eclipse/jst/j2ee/internal/webservice/provider/SOAPHeaderItemProvider.java b/plugins/org.eclipse.jst.j2ee.webservice/webservice/org/eclipse/jst/j2ee/internal/webservice/provider/SOAPHeaderItemProvider.java
deleted file mode 100644
index e0511fd..0000000
--- a/plugins/org.eclipse.jst.j2ee.webservice/webservice/org/eclipse/jst/j2ee/internal/webservice/provider/SOAPHeaderItemProvider.java
+++ /dev/null
@@ -1,127 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2003, 2004 IBM Corporation and others.
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
- *
- * Contributors:
- * IBM Corporation - initial API and implementation
- *******************************************************************************/
-package org.eclipse.jst.j2ee.internal.webservice.provider;
-
-
-import java.util.Collection;
-import java.util.List;
-
-import org.eclipse.emf.common.notify.AdapterFactory;
-import org.eclipse.emf.common.notify.Notification;
-import org.eclipse.jst.j2ee.common.internal.provider.QNameItemProvider;
-import org.eclipse.jst.j2ee.webservice.wscommon.SOAPHeader;
-
-
-/**
- * This is the item provider adpater for a {@link org.eclipse.jst.j2ee.internal.internal.webservice.wscommon.SOAPHeader}
- * object. <!-- begin-user-doc --> <!-- end-user-doc -->
- *
- * @generated
- */
-public class SOAPHeaderItemProvider extends QNameItemProvider{
- /**
- * This constructs an instance from a factory and a notifier. <!-- begin-user-doc --> <!--
- * end-user-doc -->
- *
- * @generated
- */
- public SOAPHeaderItemProvider(AdapterFactory adapterFactory) {
- super(adapterFactory);
- }
-
- /**
- * This returns the property descriptors for the adapted class. <!-- begin-user-doc --> <!--
- * end-user-doc -->
- *
- * @generated
- */
- @Override
- public List getPropertyDescriptors(Object object) {
- if (itemPropertyDescriptors == null) {
- super.getPropertyDescriptors(object);
-
- }
- return itemPropertyDescriptors;
- }
-
-
- /**
- * This returns SOAPHeader.gif. <!-- begin-user-doc --> <!-- end-user-doc -->
- *
- * @generated
- */
- @Override
- public Object getImage(Object object) {
- return getResourceLocator().getImage("full/obj16/SOAPHeader"); //$NON-NLS-1$
- }
-
-
- protected String toDisplayString(String s) {
- return (s != null) ? s : ""; //$NON-NLS-1$
- }
-
- /**
- * This returns the label text for the adapted class. <!-- begin-user-doc --> <!-- end-user-doc
- * -->
- *
- * @generated
- */
- /*
- * public String getText(Object object) { String label =
- * ((SOAPHeader)object).getCombinedQName(); return label == null || label.length() == 0 ?
- * getString("_UI_SOAPHeader_type") : getString("_UI_SOAPHeader_type") + " " + label; }
- */
-
- /**
- * This returns the label text for the adapted class. <!-- begin-user-doc --> <!-- end-user-doc
- * -->
- *
- * @non-generated
- */
- @Override
- public String getText(Object object) {
- SOAPHeader soapHeader = (SOAPHeader) object;
- String nsURI = soapHeader.getNamespaceURI();
- String localpart = soapHeader.getLocalPart();
- if (nsURI == null || nsURI.length() == 0 || localpart == null || localpart.length() == 0)
- return getString("%_UI_SOAPHeader_type"); //$NON-NLS-1$
- StringBuffer label = new StringBuffer();
- label.append(nsURI);
- label.append("#"); //$NON-NLS-1$
- label.append(localpart);
- return label.toString();
- }
-
- /**
- * This handles notification by calling {@link #fireNotifyChanged fireNotifyChanged}. <!--
- * begin-user-doc --> <!-- end-user-doc -->
- *
- * @generated
- */
- @Override
- public void notifyChanged(Notification notification) {
- super.notifyChanged(notification);
- }
-
- /**
- * This adds to the collection of {@link org.eclipse.emf.edit.command.CommandParameter}s
- * describing all of the children that can be created under this object. <!-- begin-user-doc -->
- * <!-- end-user-doc -->
- *
- * @generated
- */
- @Override
- protected void collectNewChildDescriptors(Collection newChildDescriptors, Object object) {
- super.collectNewChildDescriptors(newChildDescriptors, object);
- }
-
-
-}
\ No newline at end of file
diff --git a/plugins/org.eclipse.jst.j2ee.webservice/webservice/org/eclipse/jst/j2ee/internal/webservice/provider/SOAPRoleItemProvider.java b/plugins/org.eclipse.jst.j2ee.webservice/webservice/org/eclipse/jst/j2ee/internal/webservice/provider/SOAPRoleItemProvider.java
deleted file mode 100644
index 3145785..0000000
--- a/plugins/org.eclipse.jst.j2ee.webservice/webservice/org/eclipse/jst/j2ee/internal/webservice/provider/SOAPRoleItemProvider.java
+++ /dev/null
@@ -1,164 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2003, 2005 IBM Corporation and others.
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
- *
- * Contributors:
- * IBM Corporation - initial API and implementation
- *******************************************************************************/
-package org.eclipse.jst.j2ee.internal.webservice.provider;
-
-
-import java.util.Collection;
-import java.util.List;
-
-import org.eclipse.emf.common.notify.AdapterFactory;
-import org.eclipse.emf.common.notify.Notification;
-import org.eclipse.emf.edit.provider.ComposeableAdapterFactory;
-import org.eclipse.emf.edit.provider.IEditingDomainItemProvider;
-import org.eclipse.emf.edit.provider.IItemLabelProvider;
-import org.eclipse.emf.edit.provider.IItemPropertySource;
-import org.eclipse.emf.edit.provider.ITreeItemContentProvider;
-import org.eclipse.emf.edit.provider.ItemPropertyDescriptor;
-import org.eclipse.jst.j2ee.webservice.wscommon.SOAPRole;
-import org.eclipse.jst.j2ee.webservice.wscommon.WscommonPackage;
-
-
-/**
- * This is the item provider adpater for a {@link org.eclipse.jst.j2ee.internal.internal.webservice.wscommon.SOAPRole}
- * object. <!-- begin-user-doc --> <!-- end-user-doc -->
- *
- * @generated
- */
-public class SOAPRoleItemProvider extends AbstractATKUIItemProvider implements IEditingDomainItemProvider, ITreeItemContentProvider, IItemLabelProvider, IItemPropertySource {
- /**
- * This constructs an instance from a factory and a notifier. <!-- begin-user-doc --> <!--
- * end-user-doc -->
- *
- * @generated
- */
- public SOAPRoleItemProvider(AdapterFactory adapterFactory) {
- super(adapterFactory);
- }
-
- /**
- * This returns the property descriptors for the adapted class. <!-- begin-user-doc --> <!--
- * end-user-doc -->
- *
- * @generated
- */
- @Override
- public List getPropertyDescriptors(Object object) {
- if (itemPropertyDescriptors == null) {
- super.getPropertyDescriptors(object);
-
- //pgm addIdPropertyDescriptor(object);
- addSoapRolePropertyDescriptor(object);
- }
- return itemPropertyDescriptors;
- }
-
- /**
- * This adds a property descriptor for the Id feature. <!-- begin-user-doc --> <!-- end-user-doc
- * -->
- *
- * @generated
- */
- /*
- * pgm protected void addIdPropertyDescriptor(Object object) { itemPropertyDescriptors.add (new
- * ItemPropertyDescriptor (((ComposeableAdapterFactory)adapterFactory).getRootAdapterFactory(),
- * getString("_UI_SOAPRole_id_feature"), getString("_UI_PropertyDescriptor_description",
- * "_UI_SOAPRole_id_feature", "_UI_SOAPRole_type"), WscommonPackage.eINSTANCE.getSOAPRole_Id(),
- * true, ItemPropertyDescriptor.GENERIC_VALUE_IMAGE)); }
- */
-
- /**
- * This adds a property descriptor for the Soap Role feature. <!-- begin-user-doc --> <!--
- * end-user-doc -->
- *
- * @generated
- */
- protected void addSoapRolePropertyDescriptor(Object object) {
- itemPropertyDescriptors.add(new ItemPropertyDescriptor(((ComposeableAdapterFactory) adapterFactory).getRootAdapterFactory(), getString("_UI_SOAPRole_soapRole_feature"), //$NON-NLS-1$
- getString("_UI_PropertyDescriptor_description", "_UI_SOAPRole_soapRole_feature", "_UI_SOAPRole_type"), //$NON-NLS-1$ //$NON-NLS-2$ //$NON-NLS-3$
- WscommonPackage.eINSTANCE.getSOAPRole_SoapRole(), true, ItemPropertyDescriptor.GENERIC_VALUE_IMAGE));
- }
-
-
- /**
- * This returns SOAPRole.gif. <!-- begin-user-doc --> <!-- end-user-doc -->
- *
- * @generated
- */
- @Override
- public Object getImage(Object object) {
- return getResourceLocator().getImage("full/obj16/SOAPRole"); //$NON-NLS-1$
- }
-
- /**
- * This returns the label text for the adapted class. <!-- begin-user-doc --> <!-- end-user-doc
- * -->
- *
- * @generated
- */
- /*
- * public String getText(Object object) { String label = ((SOAPRole)object).getId(); return
- * label == null || label.length() == 0 ? getString("_UI_SOAPRole_type") :
- * getString("_UI_SOAPRole_type") + " " + label; }
- */
-
- /**
- * This returns the label text for the adapted class. <!-- begin-user-doc --> <!-- end-user-doc
- * -->
- *
- * @non-generated
- */
- @Override
- public String getText(Object object) {
- String label = ((SOAPRole) object).getSoapRole();
- return label == null || label.length() == 0 ? getString("%_UI_SOAPRole_type") : label; //$NON-NLS-1$
- }
-
-
- /**
- * This handles notification by calling {@link #fireNotifyChanged fireNotifyChanged}. <!--
- * begin-user-doc --> <!-- end-user-doc -->
- *
- * @generated
- */
- @Override
- public void notifyChanged(Notification notification) {
- switch (notification.getFeatureID(SOAPRole.class)) {
- //pgm case WscommonPackage.SOAP_ROLE__ID:
- case WscommonPackage.SOAP_ROLE__SOAP_ROLE : {
- fireNotifyChanged(notification);
- return;
- }
- }
- super.notifyChanged(notification);
- }
-
- /**
- * This adds to the collection of {@link org.eclipse.emf.edit.command.CommandParameter}s
- * describing all of the children that can be created under this object. <!-- begin-user-doc -->
- * <!-- end-user-doc -->
- *
- * @generated
- */
- @Override
- protected void collectNewChildDescriptors(Collection newChildDescriptors, Object object) {
- super.collectNewChildDescriptors(newChildDescriptors, object);
- }
-
- /**
- * Return the resource locator for this item provider's resources. <!-- begin-user-doc --> <!--
- * end-user-doc -->
- *
- * @generated
- */
- /*
- * public ResourceLocator getResourceLocator() { return Webservicej2eeEditPlugin.INSTANCE; }
- */
-}
diff --git a/plugins/org.eclipse.jst.j2ee.webservice/webservice/org/eclipse/jst/j2ee/internal/webservice/provider/SectionComponentScopedRefHelper.java b/plugins/org.eclipse.jst.j2ee.webservice/webservice/org/eclipse/jst/j2ee/internal/webservice/provider/SectionComponentScopedRefHelper.java
deleted file mode 100644
index b542c95..0000000
--- a/plugins/org.eclipse.jst.j2ee.webservice/webservice/org/eclipse/jst/j2ee/internal/webservice/provider/SectionComponentScopedRefHelper.java
+++ /dev/null
@@ -1,41 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2003, 2004 IBM Corporation and others.
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
- *
- * Contributors:
- * IBM Corporation - initial API and implementation
- *******************************************************************************/
-/*
- * Created on Jan 29, 2004
- *
- * To change the template for this generated file go to
- * Window - Preferences - Java - Code Generation - Code and Comments
- */
-package org.eclipse.jst.j2ee.internal.webservice.provider;
-
-import org.eclipse.jst.j2ee.webservice.wsclient.WebServicesClient;
-
-
-/**
- * @author jlanuti
- *
- * To change the template for this generated type comment go to Window - Preferences - Java - Code
- * Generation - Code and Comments
- */
-public class SectionComponentScopedRefHelper {
-
- private static WebServicesClient wsClient;
-
- public static void setWsClient(WebServicesClient client) {
- wsClient = client;
- }
-
- public static WebServicesClient getWsClient() {
- return wsClient;
- }
-
-
-}
\ No newline at end of file
diff --git a/plugins/org.eclipse.jst.j2ee.webservice/webservice/org/eclipse/jst/j2ee/internal/webservice/provider/ServiceEndpointInterfaceMappingItemProvider.java b/plugins/org.eclipse.jst.j2ee.webservice/webservice/org/eclipse/jst/j2ee/internal/webservice/provider/ServiceEndpointInterfaceMappingItemProvider.java
deleted file mode 100644
index 5619867..0000000
--- a/plugins/org.eclipse.jst.j2ee.webservice/webservice/org/eclipse/jst/j2ee/internal/webservice/provider/ServiceEndpointInterfaceMappingItemProvider.java
+++ /dev/null
@@ -1,193 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2003, 2005 IBM Corporation and others.
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
- *
- * Contributors:
- * IBM Corporation - initial API and implementation
- *******************************************************************************/
-package org.eclipse.jst.j2ee.internal.webservice.provider;
-
-
-import java.util.Collection;
-import java.util.List;
-
-import org.eclipse.emf.common.notify.AdapterFactory;
-import org.eclipse.emf.common.notify.Notification;
-import org.eclipse.emf.common.util.ResourceLocator;
-import org.eclipse.emf.ecore.EReference;
-import org.eclipse.emf.edit.provider.ComposeableAdapterFactory;
-import org.eclipse.emf.edit.provider.ItemPropertyDescriptor;
-import org.eclipse.jst.j2ee.webservice.jaxrpcmap.JaxrpcmapFactory;
-import org.eclipse.jst.j2ee.webservice.jaxrpcmap.JaxrpcmapPackage;
-import org.eclipse.jst.j2ee.webservice.jaxrpcmap.ServiceEndpointInterfaceMapping;
-
-
-/**
- * This is the item provider adpater for a
- * {@link org.eclipse.jst.j2ee.internal.internal.webservice.jaxrpcmap.ServiceEndpointInterfaceMapping}object. <!--
- * begin-user-doc --> <!-- end-user-doc -->
- *
- * @generated
- */
-public class ServiceEndpointInterfaceMappingItemProvider extends InterfaceMappingItemProvider{
- /**
- * This constructs an instance from a factory and a notifier. <!-- begin-user-doc --> <!--
- * end-user-doc -->
- *
- * @generated
- */
- public ServiceEndpointInterfaceMappingItemProvider(AdapterFactory adapterFactory) {
- super(adapterFactory);
- }
-
- /**
- * This returns the property descriptors for the adapted class. <!-- begin-user-doc --> <!--
- * end-user-doc -->
- *
- * @generated
- */
- @Override
- public List getPropertyDescriptors(Object object) {
- if (itemPropertyDescriptors == null) {
- super.getPropertyDescriptors(object);
-
- addIdPropertyDescriptor(object);
- addServiceEndpointInterfacePropertyDescriptor(object);
- }
- return itemPropertyDescriptors;
- }
-
- /**
- * This adds a property descriptor for the Id feature. <!-- begin-user-doc --> <!-- end-user-doc
- * -->
- *
- * @generated
- */
- protected void addIdPropertyDescriptor(Object object) {
- itemPropertyDescriptors.add(new ItemPropertyDescriptor(((ComposeableAdapterFactory) adapterFactory).getRootAdapterFactory(), getString("_UI_ServiceEndpointInterfaceMapping_id_feature"), //$NON-NLS-1$
- getString("_UI_PropertyDescriptor_description", "_UI_ServiceEndpointInterfaceMapping_id_feature", "_UI_ServiceEndpointInterfaceMapping_type"), //$NON-NLS-1$ //$NON-NLS-2$ //$NON-NLS-3$
- JaxrpcmapPackage.eINSTANCE.getServiceEndpointInterfaceMapping_Id(), true, ItemPropertyDescriptor.GENERIC_VALUE_IMAGE));
- }
-
- /**
- * This adds a property descriptor for the Service Endpoint Interface feature. <!--
- * begin-user-doc --> <!-- end-user-doc -->
- *
- * @generated
- */
- protected void addServiceEndpointInterfacePropertyDescriptor(Object object) {
- itemPropertyDescriptors.add(new ItemPropertyDescriptor(((ComposeableAdapterFactory) adapterFactory).getRootAdapterFactory(), getString("_UI_ServiceEndpointInterfaceMapping_serviceEndpointInterface_feature"), //$NON-NLS-1$
- getString("_UI_PropertyDescriptor_description", "_UI_ServiceEndpointInterfaceMapping_serviceEndpointInterface_feature", "_UI_ServiceEndpointInterfaceMapping_type"), //$NON-NLS-1$ //$NON-NLS-2$ //$NON-NLS-3$
- JaxrpcmapPackage.eINSTANCE.getServiceEndpointInterfaceMapping_ServiceEndpointInterface(), true, ItemPropertyDescriptor.GENERIC_VALUE_IMAGE));
- }
-
- /**
- * This specifies how to implement {@link #getChildren}and
- * {@link org.eclipse.emf.edit.command.AddCommand}and
- * {@link org.eclipse.emf.edit.command.RemoveCommand}support in {@link #createCommand}. <!--
- * begin-user-doc --> <!-- end-user-doc -->
- *
- * @generated
- */
- @Override
- public Collection getChildrenReferences(Object object) {
- if (childrenReferences == null) {
- super.getChildrenReferences(object);
- childrenReferences.add(JaxrpcmapPackage.eINSTANCE.getServiceEndpointInterfaceMapping_WsdlPortType());
- childrenReferences.add(JaxrpcmapPackage.eINSTANCE.getServiceEndpointInterfaceMapping_WsdlBinding());
- childrenReferences.add(JaxrpcmapPackage.eINSTANCE.getServiceEndpointInterfaceMapping_ServiceEndpointMethodMappings());
- }
- return childrenReferences;
- }
-
- /**
- * <!-- begin-user-doc --> <!-- end-user-doc -->
- *
- * @generated
- */
- @Override
- protected EReference getChildReference(Object object, Object child) {
- // Check the type of the specified child object and return the proper feature to use for
- // adding (see {@link AddCommand}) it as a child.
-
- return super.getChildReference(object, child);
- }
-
-
- /**
- * This returns ServiceEndpointInterfaceMapping.gif. <!-- begin-user-doc --> <!-- end-user-doc
- * -->
- *
- * @generated
- */
- @Override
- public Object getImage(Object object) {
- return getResourceLocator().getImage("full/obj16/ServiceEndpointInterfaceMapping"); //$NON-NLS-1$
- }
-
- /**
- * This returns the label text for the adapted class. <!-- begin-user-doc --> <!-- end-user-doc
- * -->
- *
- * @generated
- */
- @Override
- public String getText(Object object) {
- String label = ((ServiceEndpointInterfaceMapping) object).getId();
- return label == null || label.length() == 0 ? getString("_UI_ServiceEndpointInterfaceMapping_type") : //$NON-NLS-1$
- getString("_UI_ServiceEndpointInterfaceMapping_type") + " " + label; //$NON-NLS-1$ //$NON-NLS-2$
- }
-
- /**
- * This handles notification by calling {@link #fireNotifyChanged fireNotifyChanged}. <!--
- * begin-user-doc --> <!-- end-user-doc -->
- *
- * @generated
- */
- @Override
- public void notifyChanged(Notification notification) {
- switch (notification.getFeatureID(ServiceEndpointInterfaceMapping.class)) {
- case JaxrpcmapPackage.SERVICE_ENDPOINT_INTERFACE_MAPPING__ID :
- case JaxrpcmapPackage.SERVICE_ENDPOINT_INTERFACE_MAPPING__SERVICE_ENDPOINT_INTERFACE :
- case JaxrpcmapPackage.SERVICE_ENDPOINT_INTERFACE_MAPPING__WSDL_PORT_TYPE :
- case JaxrpcmapPackage.SERVICE_ENDPOINT_INTERFACE_MAPPING__WSDL_BINDING :
- case JaxrpcmapPackage.SERVICE_ENDPOINT_INTERFACE_MAPPING__SERVICE_ENDPOINT_METHOD_MAPPINGS : {
- fireNotifyChanged(notification);
- return;
- }
- }
- super.notifyChanged(notification);
- }
-
- /**
- * This adds to the collection of {@link org.eclipse.emf.edit.command.CommandParameter}s
- * describing all of the children that can be created under this object. <!-- begin-user-doc -->
- * <!-- end-user-doc -->
- *
- * @generated
- */
- @Override
- protected void collectNewChildDescriptors(Collection newChildDescriptors, Object object) {
- super.collectNewChildDescriptors(newChildDescriptors, object);
-
- newChildDescriptors.add(createChildParameter(JaxrpcmapPackage.eINSTANCE.getServiceEndpointInterfaceMapping_WsdlPortType(), JaxrpcmapFactory.eINSTANCE.createWSDLPortType()));
-
- newChildDescriptors.add(createChildParameter(JaxrpcmapPackage.eINSTANCE.getServiceEndpointInterfaceMapping_WsdlBinding(), JaxrpcmapFactory.eINSTANCE.createWSDLBinding()));
-
- newChildDescriptors.add(createChildParameter(JaxrpcmapPackage.eINSTANCE.getServiceEndpointInterfaceMapping_ServiceEndpointMethodMappings(), JaxrpcmapFactory.eINSTANCE.createServiceEndpointMethodMapping()));
- }
-
- /**
- * Return the resource locator for this item provider's resources. <!-- begin-user-doc --> <!--
- * end-user-doc -->
- *
- * @generated
- */
- @Override
- public ResourceLocator getResourceLocator() {
- return Webservicej2eeEditPlugin.INSTANCE;
- }
-}
diff --git a/plugins/org.eclipse.jst.j2ee.webservice/webservice/org/eclipse/jst/j2ee/internal/webservice/provider/ServiceEndpointMethodMappingItemProvider.java b/plugins/org.eclipse.jst.j2ee.webservice/webservice/org/eclipse/jst/j2ee/internal/webservice/provider/ServiceEndpointMethodMappingItemProvider.java
deleted file mode 100644
index 84b1e72..0000000
--- a/plugins/org.eclipse.jst.j2ee.webservice/webservice/org/eclipse/jst/j2ee/internal/webservice/provider/ServiceEndpointMethodMappingItemProvider.java
+++ /dev/null
@@ -1,221 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2003, 2005 IBM Corporation and others.
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
- *
- * Contributors:
- * IBM Corporation - initial API and implementation
- *******************************************************************************/
-package org.eclipse.jst.j2ee.internal.webservice.provider;
-
-
-import java.util.Collection;
-import java.util.List;
-
-import org.eclipse.emf.common.notify.AdapterFactory;
-import org.eclipse.emf.common.notify.Notification;
-import org.eclipse.emf.common.util.ResourceLocator;
-import org.eclipse.emf.ecore.EReference;
-import org.eclipse.emf.edit.provider.ComposeableAdapterFactory;
-import org.eclipse.emf.edit.provider.IEditingDomainItemProvider;
-import org.eclipse.emf.edit.provider.IItemLabelProvider;
-import org.eclipse.emf.edit.provider.IItemPropertySource;
-import org.eclipse.emf.edit.provider.ITreeItemContentProvider;
-import org.eclipse.emf.edit.provider.ItemPropertyDescriptor;
-import org.eclipse.emf.edit.provider.ItemProviderAdapter;
-import org.eclipse.jst.j2ee.webservice.jaxrpcmap.JaxrpcmapFactory;
-import org.eclipse.jst.j2ee.webservice.jaxrpcmap.JaxrpcmapPackage;
-import org.eclipse.jst.j2ee.webservice.jaxrpcmap.ServiceEndpointMethodMapping;
-
-
-/**
- * This is the item provider adpater for a
- * {@link org.eclipse.jst.j2ee.internal.internal.webservice.jaxrpcmap.ServiceEndpointMethodMapping}object. <!--
- * begin-user-doc --> <!-- end-user-doc -->
- *
- * @generated
- */
-public class ServiceEndpointMethodMappingItemProvider extends ItemProviderAdapter implements IEditingDomainItemProvider, ITreeItemContentProvider, IItemLabelProvider, IItemPropertySource {
- /**
- * This constructs an instance from a factory and a notifier. <!-- begin-user-doc --> <!--
- * end-user-doc -->
- *
- * @generated
- */
- public ServiceEndpointMethodMappingItemProvider(AdapterFactory adapterFactory) {
- super(adapterFactory);
- }
-
- /**
- * This returns the property descriptors for the adapted class. <!-- begin-user-doc --> <!--
- * end-user-doc -->
- *
- * @generated
- */
- @Override
- public List getPropertyDescriptors(Object object) {
- if (itemPropertyDescriptors == null) {
- super.getPropertyDescriptors(object);
-
- addIdPropertyDescriptor(object);
- addJavaMethodNamePropertyDescriptor(object);
- addWsdlOperationPropertyDescriptor(object);
- addWrappedElementPropertyDescriptor(object);
- }
- return itemPropertyDescriptors;
- }
-
- /**
- * This adds a property descriptor for the Id feature. <!-- begin-user-doc --> <!-- end-user-doc
- * -->
- *
- * @generated
- */
- protected void addIdPropertyDescriptor(Object object) {
- itemPropertyDescriptors.add(new ItemPropertyDescriptor(((ComposeableAdapterFactory) adapterFactory).getRootAdapterFactory(), getString("_UI_ServiceEndpointMethodMapping_id_feature"), //$NON-NLS-1$
- getString("_UI_PropertyDescriptor_description", "_UI_ServiceEndpointMethodMapping_id_feature", "_UI_ServiceEndpointMethodMapping_type"), //$NON-NLS-1$ //$NON-NLS-2$ //$NON-NLS-3$
- JaxrpcmapPackage.eINSTANCE.getServiceEndpointMethodMapping_Id(), true, ItemPropertyDescriptor.GENERIC_VALUE_IMAGE));
- }
-
- /**
- * This adds a property descriptor for the Java Method Name feature. <!-- begin-user-doc -->
- * <!-- end-user-doc -->
- *
- * @generated
- */
- protected void addJavaMethodNamePropertyDescriptor(Object object) {
- itemPropertyDescriptors.add(new ItemPropertyDescriptor(((ComposeableAdapterFactory) adapterFactory).getRootAdapterFactory(), getString("_UI_ServiceEndpointMethodMapping_javaMethodName_feature"), //$NON-NLS-1$
- getString("_UI_PropertyDescriptor_description", "_UI_ServiceEndpointMethodMapping_javaMethodName_feature", "_UI_ServiceEndpointMethodMapping_type"), //$NON-NLS-1$ //$NON-NLS-2$ //$NON-NLS-3$
- JaxrpcmapPackage.eINSTANCE.getServiceEndpointMethodMapping_JavaMethodName(), true, ItemPropertyDescriptor.GENERIC_VALUE_IMAGE));
- }
-
- /**
- * This adds a property descriptor for the Wsdl Operation feature. <!-- begin-user-doc --> <!--
- * end-user-doc -->
- *
- * @generated
- */
- protected void addWsdlOperationPropertyDescriptor(Object object) {
- itemPropertyDescriptors.add(new ItemPropertyDescriptor(((ComposeableAdapterFactory) adapterFactory).getRootAdapterFactory(), getString("_UI_ServiceEndpointMethodMapping_wsdlOperation_feature"), //$NON-NLS-1$
- getString("_UI_PropertyDescriptor_description", "_UI_ServiceEndpointMethodMapping_wsdlOperation_feature", "_UI_ServiceEndpointMethodMapping_type"), //$NON-NLS-1$ //$NON-NLS-2$ //$NON-NLS-3$
- JaxrpcmapPackage.eINSTANCE.getServiceEndpointMethodMapping_WsdlOperation(), true, ItemPropertyDescriptor.GENERIC_VALUE_IMAGE));
- }
-
- /**
- * This adds a property descriptor for the Wrapped Element feature. <!-- begin-user-doc --> <!--
- * end-user-doc -->
- *
- * @generated
- */
- protected void addWrappedElementPropertyDescriptor(Object object) {
- itemPropertyDescriptors.add(new ItemPropertyDescriptor(((ComposeableAdapterFactory) adapterFactory).getRootAdapterFactory(), getString("_UI_ServiceEndpointMethodMapping_wrappedElement_feature"), //$NON-NLS-1$
- getString("_UI_PropertyDescriptor_description", "_UI_ServiceEndpointMethodMapping_wrappedElement_feature", "_UI_ServiceEndpointMethodMapping_type"), //$NON-NLS-1$ //$NON-NLS-2$ //$NON-NLS-3$
- JaxrpcmapPackage.eINSTANCE.getServiceEndpointMethodMapping_WrappedElement(), true, ItemPropertyDescriptor.BOOLEAN_VALUE_IMAGE));
- }
-
- /**
- * This specifies how to implement {@link #getChildren}and
- * {@link org.eclipse.emf.edit.command.AddCommand}and
- * {@link org.eclipse.emf.edit.command.RemoveCommand}support in {@link #createCommand}. <!--
- * begin-user-doc --> <!-- end-user-doc -->
- *
- * @generated
- */
- @Override
- public Collection getChildrenReferences(Object object) {
- if (childrenReferences == null) {
- super.getChildrenReferences(object);
- childrenReferences.add(JaxrpcmapPackage.eINSTANCE.getServiceEndpointMethodMapping_MethodParamPartsMappings());
- childrenReferences.add(JaxrpcmapPackage.eINSTANCE.getServiceEndpointMethodMapping_WsdlReturnValueMapping());
- }
- return childrenReferences;
- }
-
- /**
- * <!-- begin-user-doc --> <!-- end-user-doc -->
- *
- * @generated
- */
- @Override
- protected EReference getChildReference(Object object, Object child) {
- // Check the type of the specified child object and return the proper feature to use for
- // adding (see {@link AddCommand}) it as a child.
-
- return super.getChildReference(object, child);
- }
-
-
- /**
- * This returns ServiceEndpointMethodMapping.gif. <!-- begin-user-doc --> <!-- end-user-doc -->
- *
- * @generated
- */
- @Override
- public Object getImage(Object object) {
- return getResourceLocator().getImage("full/obj16/ServiceEndpointMethodMapping"); //$NON-NLS-1$
- }
-
- /**
- * This returns the label text for the adapted class. <!-- begin-user-doc --> <!-- end-user-doc
- * -->
- *
- * @generated
- */
- @Override
- public String getText(Object object) {
- String label = ((ServiceEndpointMethodMapping) object).getJavaMethodName();
- return label == null || label.length() == 0 ? getString("_UI_ServiceEndpointMethodMapping_type") : //$NON-NLS-1$
- getString("_UI_ServiceEndpointMethodMapping_type") + " " + label; //$NON-NLS-1$ //$NON-NLS-2$
- }
-
- /**
- * This handles notification by calling {@link #fireNotifyChanged fireNotifyChanged}. <!--
- * begin-user-doc --> <!-- end-user-doc -->
- *
- * @generated
- */
- @Override
- public void notifyChanged(Notification notification) {
- switch (notification.getFeatureID(ServiceEndpointMethodMapping.class)) {
- case JaxrpcmapPackage.SERVICE_ENDPOINT_METHOD_MAPPING__ID :
- case JaxrpcmapPackage.SERVICE_ENDPOINT_METHOD_MAPPING__JAVA_METHOD_NAME :
- case JaxrpcmapPackage.SERVICE_ENDPOINT_METHOD_MAPPING__WSDL_OPERATION :
- case JaxrpcmapPackage.SERVICE_ENDPOINT_METHOD_MAPPING__WRAPPED_ELEMENT :
- case JaxrpcmapPackage.SERVICE_ENDPOINT_METHOD_MAPPING__METHOD_PARAM_PARTS_MAPPINGS :
- case JaxrpcmapPackage.SERVICE_ENDPOINT_METHOD_MAPPING__WSDL_RETURN_VALUE_MAPPING : {
- fireNotifyChanged(notification);
- return;
- }
- }
- super.notifyChanged(notification);
- }
-
- /**
- * This adds to the collection of {@link org.eclipse.emf.edit.command.CommandParameter}s
- * describing all of the children that can be created under this object. <!-- begin-user-doc -->
- * <!-- end-user-doc -->
- *
- * @generated
- */
- @Override
- protected void collectNewChildDescriptors(Collection newChildDescriptors, Object object) {
- super.collectNewChildDescriptors(newChildDescriptors, object);
-
- newChildDescriptors.add(createChildParameter(JaxrpcmapPackage.eINSTANCE.getServiceEndpointMethodMapping_MethodParamPartsMappings(), JaxrpcmapFactory.eINSTANCE.createMethodParamPartsMapping()));
-
- newChildDescriptors.add(createChildParameter(JaxrpcmapPackage.eINSTANCE.getServiceEndpointMethodMapping_WsdlReturnValueMapping(), JaxrpcmapFactory.eINSTANCE.createWSDLReturnValueMapping()));
- }
-
- /**
- * Return the resource locator for this item provider's resources. <!-- begin-user-doc --> <!--
- * end-user-doc -->
- *
- * @generated
- */
- @Override
- public ResourceLocator getResourceLocator() {
- return Webservicej2eeEditPlugin.INSTANCE;
- }
-}
diff --git a/plugins/org.eclipse.jst.j2ee.webservice/webservice/org/eclipse/jst/j2ee/internal/webservice/provider/ServiceImplBeanItemProvider.java b/plugins/org.eclipse.jst.j2ee.webservice/webservice/org/eclipse/jst/j2ee/internal/webservice/provider/ServiceImplBeanItemProvider.java
deleted file mode 100644
index 2589f8b..0000000
--- a/plugins/org.eclipse.jst.j2ee.webservice/webservice/org/eclipse/jst/j2ee/internal/webservice/provider/ServiceImplBeanItemProvider.java
+++ /dev/null
@@ -1,262 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2003, 2005 IBM Corporation and others.
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
- *
- * Contributors:
- * IBM Corporation - initial API and implementation
- *******************************************************************************/
-package org.eclipse.jst.j2ee.internal.webservice.provider;
-
-
-import java.util.ArrayList;
-import java.util.Collection;
-import java.util.Iterator;
-import java.util.List;
-
-import org.eclipse.emf.common.notify.AdapterFactory;
-import org.eclipse.emf.common.notify.Notification;
-import org.eclipse.emf.common.util.EList;
-import org.eclipse.emf.common.util.ResourceLocator;
-import org.eclipse.emf.ecore.EObject;
-import org.eclipse.emf.ecore.EReference;
-import org.eclipse.emf.ecore.EStructuralFeature;
-import org.eclipse.emf.edit.provider.IEditingDomainItemProvider;
-import org.eclipse.emf.edit.provider.IItemLabelProvider;
-import org.eclipse.emf.edit.provider.IItemPropertySource;
-import org.eclipse.emf.edit.provider.ITreeItemContentProvider;
-import org.eclipse.emf.edit.provider.ItemProviderAdapter;
-import org.eclipse.jst.j2ee.internal.webservice.adapter.AdapterViewerItem;
-import org.eclipse.jst.j2ee.internal.webservice.plugin.WebServicePlugin;
-import org.eclipse.jst.j2ee.webservice.wsdd.ServiceImplBean;
-import org.eclipse.jst.j2ee.webservice.wsdd.WsddFactory;
-import org.eclipse.jst.j2ee.webservice.wsdd.WsddPackage;
-
-
-/**
- * This is the item provider adpater for a {@link org.eclipse.jst.j2ee.internal.internal.webservice.wsdd.ServiceImplBean}
- * object. <!-- begin-user-doc --> <!-- end-user-doc -->
- *
- * @generated
- */
-public class ServiceImplBeanItemProvider extends ItemProviderAdapter implements IEditingDomainItemProvider, ITreeItemContentProvider, IItemLabelProvider, IItemPropertySource {
- /**
- * This constructs an instance from a factory and a notifier. <!-- begin-user-doc --> <!--
- * end-user-doc -->
- *
- * @generated
- */
- public ServiceImplBeanItemProvider(AdapterFactory adapterFactory) {
- super(adapterFactory);
- }
-
- /**
- * This returns the property descriptors for the adapted class. <!-- begin-user-doc --> <!--
- * end-user-doc -->
- *
- * @generated
- */
- @Override
- public List getPropertyDescriptors(Object object) {
- if (itemPropertyDescriptors == null) {
- super.getPropertyDescriptors(object);
-
- }
- return itemPropertyDescriptors;
- }
-
- /**
- * This adds a property descriptor for the Id feature. <!-- begin-user-doc --> <!-- end-user-doc
- * -->
- *
- * @generated
- */
- /*
- * pgm protected void addIdPropertyDescriptor(Object object) { itemPropertyDescriptors.add (new
- * ItemPropertyDescriptor (((ComposeableAdapterFactory)adapterFactory).getRootAdapterFactory(),
- * getString("_UI_ServiceImplBean_id_feature"), getString("_UI_PropertyDescriptor_description",
- * "_UI_ServiceImplBean_id_feature", "_UI_ServiceImplBean_type"),
- * WsddPackage.eINSTANCE.getServiceImplBean_Id(), true,
- * ItemPropertyDescriptor.GENERIC_VALUE_IMAGE)); }
- */
-
- /**
- * This specifies how to implement {@link #getChildren}and
- * {@link org.eclipse.emf.edit.command.AddCommand}and
- * {@link org.eclipse.emf.edit.command.RemoveCommand}support in {@link #createCommand}. <!--
- * begin-user-doc --> <!-- end-user-doc -->
- *
- * @generated
- */
- @Override
- public Collection getChildrenReferences(Object object) {
- if (childrenReferences == null) {
- super.getChildrenReferences(object);
- childrenReferences.add(WsddPackage.eINSTANCE.getServiceImplBean_EEJBLink());
- childrenReferences.add(WsddPackage.eINSTANCE.getServiceImplBean_EServletLink());
- childrenReferences.add(WsddPackage.eINSTANCE.getServiceImplBean_BeanLink());
- }
- return childrenReferences;
- }
-
- /**
- * <!-- begin-user-doc --> <!-- end-user-doc -->
- *
- * @generated
- */
- @Override
- protected EReference getChildReference(Object object, Object child) {
- // Check the type of the specified child object and return the proper feature to use for
- // adding (see {@link AddCommand}) it as a child.
-
- return super.getChildReference(object, child);
- }
-
-
- /**
- * This returns ServiceImplBean.gif. <!-- begin-user-doc --> <!-- end-user-doc -->
- *
- * @generated
- */
- @Override
- public Object getImage(Object object) {
- return getResourceLocator().getImage("icons/full/obj16/srvce_elem_obj.gif"); //$NON-NLS-1$
- }
-
- /**
- * This returns the label text for the adapted class. <!-- begin-user-doc --> <!-- end-user-doc
- * -->
- *
- * @generated
- */
- /*
- * public String getText(Object object) { String label = ((ServiceImplBean)object).getId();
- * return label == null || label.length() == 0 ? getString("_UI_ServiceImplBean_type") :
- * getString("_UI_ServiceImplBean_type") + " " + label; }
- */
-
- /**
- * This returns the label text for the adapted class. <!-- begin-user-doc --> <!-- end-user-doc
- * -->
- *
- * @non-generated
- */
- @Override
- public String getText(Object object) {
- ServiceImplBean serviceImplBean = (ServiceImplBean) object;
- String ejbLink = serviceImplBean.getEEJBLink().getEjbLink();
- if (ejbLink != null && ejbLink.length() > 0)
- return ejbLink;
- String beanLink = serviceImplBean.getBeanLink().toString();
- if (beanLink != null && beanLink.length() > 0)
- return beanLink;
- String servletLink = serviceImplBean.getEServletLink().getServletLink();
- if (servletLink != null && servletLink.length() > 0)
- return servletLink;
- return getString("%_UI_ServiceImplBean_type"); //$NON-NLS-1$
- }
-
- /**
- * This handles notification by calling {@link #fireNotifyChanged fireNotifyChanged}. <!--
- * begin-user-doc --> <!-- end-user-doc -->
- *
- * @generated
- */
- @Override
- public void notifyChanged(Notification notification) {
- switch (notification.getFeatureID(ServiceImplBean.class)) {
- case WsddPackage.SERVICE_IMPL_BEAN__EEJB_LINK :
- case WsddPackage.SERVICE_IMPL_BEAN__ESERVLET_LINK :
- case WsddPackage.SERVICE_IMPL_BEAN__BEAN_LINK : {
- fireNotifyChanged(notification);
- return;
- }
- }
- super.notifyChanged(notification);
- }
-
- /**
- * This adds to the collection of {@link org.eclipse.emf.edit.command.CommandParameter}s
- * describing all of the children that can be created under this object. <!-- begin-user-doc -->
- * <!-- end-user-doc -->
- *
- * @generated
- */
- @Override
- protected void collectNewChildDescriptors(Collection newChildDescriptors, Object object) {
- super.collectNewChildDescriptors(newChildDescriptors, object);
-
- newChildDescriptors.add(createChildParameter(WsddPackage.eINSTANCE.getServiceImplBean_EEJBLink(), WsddFactory.eINSTANCE.createEJBLink()));
-
- newChildDescriptors.add(createChildParameter(WsddPackage.eINSTANCE.getServiceImplBean_EServletLink(), WsddFactory.eINSTANCE.createServletLink()));
-
- newChildDescriptors.add(createChildParameter(WsddPackage.eINSTANCE.getServiceImplBean_BeanLink(), WsddFactory.eINSTANCE.createBeanLink()));
-
- newChildDescriptors.add(createChildParameter(WsddPackage.eINSTANCE.getServiceImplBean_BeanLink(), WsddFactory.eINSTANCE.createServletLink()));
-
- newChildDescriptors.add(createChildParameter(WsddPackage.eINSTANCE.getServiceImplBean_BeanLink(), WsddFactory.eINSTANCE.createEJBLink()));
- }
-
- /**
- * This returns the label text for {@link org.eclipse.emf.edit.command.CreateChildCommand}.
- * <!-- begin-user-doc --> <!-- end-user-doc -->
- *
- * @generated
- */
- @Override
- public String getCreateChildText(Object owner, Object feature, Object child, Collection selection) {
- boolean qualify = feature == WsddPackage.eINSTANCE.getServiceImplBean_EServletLink() || feature == WsddPackage.eINSTANCE.getServiceImplBean_BeanLink() || feature == WsddPackage.eINSTANCE.getServiceImplBean_EEJBLink();
- return getString(qualify ? "_UI_CreateChild_text2" : "_UI_CreateChild_text", //$NON-NLS-1$ //$NON-NLS-2$
- new Object[]{getTypeText(child), getFeatureText(feature), getTypeText(owner)});
- }
-
- /**
- * Return the resource locator for this item provider's resources. <!-- begin-user-doc --> <!--
- * end-user-doc -->
- */
- @Override
- public ResourceLocator getResourceLocator() {
- return WebServicePlugin.getInstance();
- }
-
- /**
- * This implements
- * {@link ITreeItemContentProvider#getChildren ITreeItemContentProvider.getChildren}by calling
- * {@link #getChildrenReferences getChildrenReferences}and using those to collect the children.
- */
- @Override
- public Collection getChildren(Object object) {
- if (object instanceof EList)
- return getChildrenFromEList((EList) object);
- else if (object instanceof AdapterViewerItem)
- return getChildrenFromAdapterViewerItem((AdapterViewerItem) object);
- else
- return super.getChildren(object);
- }
-
- protected Collection getChildrenFromEList(EList eList) {
- Collection result = new ArrayList();
- for (Iterator it = eList.iterator(); it.hasNext();)
- result.addAll(super.getChildren(it.next()));
- return result;
- }
-
- protected Collection getChildrenFromAdapterViewerItem(AdapterViewerItem adapterViewerItem) {
- Collection result = new ArrayList();
- EList eObjectList = adapterViewerItem.getEObjectList();
- EStructuralFeature feature = adapterViewerItem.getEStructuralFeature();
- for (Iterator it = eObjectList.iterator(); it.hasNext();) {
- EObject eObject = (EObject) it.next();
- Object object = eObject.eGet(feature);
- if (object != null) {
- if (object instanceof List)
- result.addAll((List) object);
- else
- result.add(object);
- }
- }
- return result;
- }
-}
diff --git a/plugins/org.eclipse.jst.j2ee.webservice/webservice/org/eclipse/jst/j2ee/internal/webservice/provider/ServiceInterfaceMappingItemProvider.java b/plugins/org.eclipse.jst.j2ee.webservice/webservice/org/eclipse/jst/j2ee/internal/webservice/provider/ServiceInterfaceMappingItemProvider.java
deleted file mode 100644
index bab1578..0000000
--- a/plugins/org.eclipse.jst.j2ee.webservice/webservice/org/eclipse/jst/j2ee/internal/webservice/provider/ServiceInterfaceMappingItemProvider.java
+++ /dev/null
@@ -1,188 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2003, 2005 IBM Corporation and others.
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
- *
- * Contributors:
- * IBM Corporation - initial API and implementation
- *******************************************************************************/
-package org.eclipse.jst.j2ee.internal.webservice.provider;
-
-
-import java.util.Collection;
-import java.util.List;
-
-import org.eclipse.emf.common.notify.AdapterFactory;
-import org.eclipse.emf.common.notify.Notification;
-import org.eclipse.emf.common.util.ResourceLocator;
-import org.eclipse.emf.ecore.EReference;
-import org.eclipse.emf.edit.provider.ComposeableAdapterFactory;
-import org.eclipse.emf.edit.provider.ItemPropertyDescriptor;
-import org.eclipse.jst.j2ee.webservice.jaxrpcmap.JaxrpcmapFactory;
-import org.eclipse.jst.j2ee.webservice.jaxrpcmap.JaxrpcmapPackage;
-import org.eclipse.jst.j2ee.webservice.jaxrpcmap.ServiceInterfaceMapping;
-
-
-/**
- * This is the item provider adpater for a
- * {@link org.eclipse.jst.j2ee.internal.internal.webservice.jaxrpcmap.ServiceInterfaceMapping}object. <!-- begin-user-doc
- * --> <!-- end-user-doc -->
- *
- * @generated
- */
-public class ServiceInterfaceMappingItemProvider extends InterfaceMappingItemProvider{
- /**
- * This constructs an instance from a factory and a notifier. <!-- begin-user-doc --> <!--
- * end-user-doc -->
- *
- * @generated
- */
- public ServiceInterfaceMappingItemProvider(AdapterFactory adapterFactory) {
- super(adapterFactory);
- }
-
- /**
- * This returns the property descriptors for the adapted class. <!-- begin-user-doc --> <!--
- * end-user-doc -->
- *
- * @generated
- */
- @Override
- public List getPropertyDescriptors(Object object) {
- if (itemPropertyDescriptors == null) {
- super.getPropertyDescriptors(object);
-
- addIdPropertyDescriptor(object);
- addServiceInterfacePropertyDescriptor(object);
- }
- return itemPropertyDescriptors;
- }
-
- /**
- * This adds a property descriptor for the Id feature. <!-- begin-user-doc --> <!-- end-user-doc
- * -->
- *
- * @generated
- */
- protected void addIdPropertyDescriptor(Object object) {
- itemPropertyDescriptors.add(new ItemPropertyDescriptor(((ComposeableAdapterFactory) adapterFactory).getRootAdapterFactory(), getString("_UI_ServiceInterfaceMapping_id_feature"), //$NON-NLS-1$
- getString("_UI_PropertyDescriptor_description", "_UI_ServiceInterfaceMapping_id_feature", "_UI_ServiceInterfaceMapping_type"), //$NON-NLS-1$ //$NON-NLS-2$ //$NON-NLS-3$
- JaxrpcmapPackage.eINSTANCE.getServiceInterfaceMapping_Id(), true, ItemPropertyDescriptor.GENERIC_VALUE_IMAGE));
- }
-
- /**
- * This adds a property descriptor for the Service Interface feature. <!-- begin-user-doc -->
- * <!-- end-user-doc -->
- *
- * @generated
- */
- protected void addServiceInterfacePropertyDescriptor(Object object) {
- itemPropertyDescriptors.add(new ItemPropertyDescriptor(((ComposeableAdapterFactory) adapterFactory).getRootAdapterFactory(), getString("_UI_ServiceInterfaceMapping_serviceInterface_feature"), //$NON-NLS-1$
- getString("_UI_PropertyDescriptor_description", "_UI_ServiceInterfaceMapping_serviceInterface_feature", "_UI_ServiceInterfaceMapping_type"), //$NON-NLS-1$ //$NON-NLS-2$ //$NON-NLS-3$
- JaxrpcmapPackage.eINSTANCE.getServiceInterfaceMapping_ServiceInterface(), true, ItemPropertyDescriptor.GENERIC_VALUE_IMAGE));
- }
-
- /**
- * This specifies how to implement {@link #getChildren}and
- * {@link org.eclipse.emf.edit.command.AddCommand}and
- * {@link org.eclipse.emf.edit.command.RemoveCommand}support in {@link #createCommand}. <!--
- * begin-user-doc --> <!-- end-user-doc -->
- *
- * @generated
- */
- @Override
- public Collection getChildrenReferences(Object object) {
- if (childrenReferences == null) {
- super.getChildrenReferences(object);
- childrenReferences.add(JaxrpcmapPackage.eINSTANCE.getServiceInterfaceMapping_WsdlServiceName());
- childrenReferences.add(JaxrpcmapPackage.eINSTANCE.getServiceInterfaceMapping_PortMappings());
- }
- return childrenReferences;
- }
-
- /**
- * <!-- begin-user-doc --> <!-- end-user-doc -->
- *
- * @generated
- */
- @Override
- protected EReference getChildReference(Object object, Object child) {
- // Check the type of the specified child object and return the proper feature to use for
- // adding (see {@link AddCommand}) it as a child.
-
- return super.getChildReference(object, child);
- }
-
-
- /**
- * This returns ServiceInterfaceMapping.gif. <!-- begin-user-doc --> <!-- end-user-doc -->
- *
- * @generated
- */
- @Override
- public Object getImage(Object object) {
- return getResourceLocator().getImage("full/obj16/ServiceInterfaceMapping"); //$NON-NLS-1$
- }
-
- /**
- * This returns the label text for the adapted class. <!-- begin-user-doc --> <!-- end-user-doc
- * -->
- *
- * @generated
- */
- @Override
- public String getText(Object object) {
- String label = ((ServiceInterfaceMapping) object).getId();
- return label == null || label.length() == 0 ? getString("_UI_ServiceInterfaceMapping_type") : //$NON-NLS-1$
- getString("_UI_ServiceInterfaceMapping_type") + " " + label; //$NON-NLS-1$ //$NON-NLS-2$
- }
-
- /**
- * This handles notification by calling {@link #fireNotifyChanged fireNotifyChanged}. <!--
- * begin-user-doc --> <!-- end-user-doc -->
- *
- * @generated
- */
- @Override
- public void notifyChanged(Notification notification) {
- switch (notification.getFeatureID(ServiceInterfaceMapping.class)) {
- case JaxrpcmapPackage.SERVICE_INTERFACE_MAPPING__ID :
- case JaxrpcmapPackage.SERVICE_INTERFACE_MAPPING__SERVICE_INTERFACE :
- case JaxrpcmapPackage.SERVICE_INTERFACE_MAPPING__WSDL_SERVICE_NAME :
- case JaxrpcmapPackage.SERVICE_INTERFACE_MAPPING__PORT_MAPPINGS : {
- fireNotifyChanged(notification);
- return;
- }
- }
- super.notifyChanged(notification);
- }
-
- /**
- * This adds to the collection of {@link org.eclipse.emf.edit.command.CommandParameter}s
- * describing all of the children that can be created under this object. <!-- begin-user-doc -->
- * <!-- end-user-doc -->
- *
- * @generated
- */
- @Override
- protected void collectNewChildDescriptors(Collection newChildDescriptors, Object object) {
- super.collectNewChildDescriptors(newChildDescriptors, object);
-
- newChildDescriptors.add(createChildParameter(JaxrpcmapPackage.eINSTANCE.getServiceInterfaceMapping_WsdlServiceName(), JaxrpcmapFactory.eINSTANCE.createWSDLServiceName()));
-
- newChildDescriptors.add(createChildParameter(JaxrpcmapPackage.eINSTANCE.getServiceInterfaceMapping_PortMappings(), JaxrpcmapFactory.eINSTANCE.createPortMapping()));
- }
-
- /**
- * Return the resource locator for this item provider's resources. <!-- begin-user-doc --> <!--
- * end-user-doc -->
- *
- * @generated
- */
- @Override
- public ResourceLocator getResourceLocator() {
- return Webservicej2eeEditPlugin.INSTANCE;
- }
-}
diff --git a/plugins/org.eclipse.jst.j2ee.webservice/webservice/org/eclipse/jst/j2ee/internal/webservice/provider/ServiceRefEditorItemProvider.java b/plugins/org.eclipse.jst.j2ee.webservice/webservice/org/eclipse/jst/j2ee/internal/webservice/provider/ServiceRefEditorItemProvider.java
deleted file mode 100644
index c8f8ed3..0000000
--- a/plugins/org.eclipse.jst.j2ee.webservice/webservice/org/eclipse/jst/j2ee/internal/webservice/provider/ServiceRefEditorItemProvider.java
+++ /dev/null
@@ -1,65 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2003, 2005 IBM Corporation and others.
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
- *
- * Contributors:
- * IBM Corporation - initial API and implementation
- *******************************************************************************/
-/*
- * Created on Mar 26, 2004
- *
- * To change the template for this generated file go to
- * Window - Preferences - Java - Code Generation - Code and Comments
- */
-package org.eclipse.jst.j2ee.internal.webservice.provider;
-
-import java.util.Collection;
-
-import org.eclipse.emf.common.notify.AdapterFactory;
-import org.eclipse.jst.j2ee.webservice.wsclient.Webservice_clientPackage;
-
-
-/**
- * @author cbridgha
- *
- * To change the template for this generated type comment go to Window - Preferences - Java - Code
- * Generation - Code and Comments
- */
-public class ServiceRefEditorItemProvider extends ServiceRefItemProvider {
- /**
- * @param adapterFactory
- */
- public ServiceRefEditorItemProvider(AdapterFactory adapterFactory) {
- super(adapterFactory);
- }
-
- /**
- * This specifies how to implement {@link #getChildren}and
- * {@link org.eclipse.emf.edit.command.AddCommand}and
- * {@link org.eclipse.emf.edit.command.RemoveCommand}support in {@link #createCommand}. <!--
- * begin-user-doc --> <!-- end-user-doc -->
- *
- * @generated
- */
- @Override
- public Collection getChildrenReferences(Object object) {
- if (childrenReferences == null) {
- super.getChildrenReferences(object);
- childrenReferences.add(Webservice_clientPackage.eINSTANCE.getServiceRef_Handlers());
- }
- return childrenReferences;
- }
-
- /*
- * (non-Javadoc)
- *
- * @see org.eclipse.emf.edit.provider.ItemProviderAdapter#hasChildren(java.lang.Object)
- */
- @Override
- public boolean hasChildren(Object arg0) {
- return false;
- }
-}
diff --git a/plugins/org.eclipse.jst.j2ee.webservice/webservice/org/eclipse/jst/j2ee/internal/webservice/provider/ServiceRefItemProvider.java b/plugins/org.eclipse.jst.j2ee.webservice/webservice/org/eclipse/jst/j2ee/internal/webservice/provider/ServiceRefItemProvider.java
deleted file mode 100644
index d97578d..0000000
--- a/plugins/org.eclipse.jst.j2ee.webservice/webservice/org/eclipse/jst/j2ee/internal/webservice/provider/ServiceRefItemProvider.java
+++ /dev/null
@@ -1,231 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2003, 2005 IBM Corporation and others.
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
- *
- * Contributors:
- * IBM Corporation - initial API and implementation
- *******************************************************************************/
-package org.eclipse.jst.j2ee.internal.webservice.provider;
-
-
-import java.util.Collection;
-import java.util.List;
-
-import org.eclipse.emf.common.notify.AdapterFactory;
-import org.eclipse.emf.common.notify.Notification;
-import org.eclipse.emf.common.util.ResourceLocator;
-import org.eclipse.emf.ecore.EReference;
-import org.eclipse.emf.edit.provider.ComposeableAdapterFactory;
-import org.eclipse.emf.edit.provider.ItemPropertyDescriptor;
-import org.eclipse.jst.j2ee.common.CommonFactory;
-import org.eclipse.jst.j2ee.common.internal.provider.CompatibilityDescriptionGroupItemProvider;
-import org.eclipse.jst.j2ee.internal.webservice.plugin.WebServicePlugin;
-import org.eclipse.jst.j2ee.webservice.wsclient.ServiceRef;
-import org.eclipse.jst.j2ee.webservice.wsclient.Webservice_clientFactory;
-import org.eclipse.jst.j2ee.webservice.wsclient.Webservice_clientPackage;
-import org.eclipse.jst.j2ee.webservice.wscommon.WscommonFactory;
-import org.eclipse.jst.j2ee.webservice.wsdd.WsddFactory;
-
-/**
- * This is the item provider adpater for a {@link com.ibm.etools.wsclient.ServiceRef}object. <!--
- * begin-user-doc --> <!-- end-user-doc -->
- *
- * @generated
- */
-public class ServiceRefItemProvider extends CompatibilityDescriptionGroupItemProvider {
- /**
- * This constructs an instance from a factory and a notifier. <!-- begin-user-doc --> <!--
- * end-user-doc -->
- *
- * @generated
- */
- public ServiceRefItemProvider(AdapterFactory adapterFactory) {
- super(adapterFactory);
- }
-
- /**
- * This returns the property descriptors for the adapted class. <!-- begin-user-doc --> <!--
- * end-user-doc -->
- *
- * @generated
- */
- @Override
- public List getPropertyDescriptors(Object object) {
- if (itemPropertyDescriptors == null) {
- super.getPropertyDescriptors(object);
-
- addServiceInterfacePropertyDescriptor(object);
- addServiceRefNamePropertyDescriptor(object);
- addWsdlFilePropertyDescriptor(object);
- addJaxrpcMappingFilePropertyDescriptor(object);
- }
- return itemPropertyDescriptors;
- }
-
- /**
- * This adds a property descriptor for the Service Ref Name feature. <!-- begin-user-doc -->
- * <!-- end-user-doc -->
- *
- * @generated
- */
- protected void addServiceRefNamePropertyDescriptor(Object object) {
- itemPropertyDescriptors.add(new ItemPropertyDescriptor(((ComposeableAdapterFactory) adapterFactory).getRootAdapterFactory(), getString("%_UI_ServiceRef_serviceRefName_feature"), //$NON-NLS-1$
- getString("%_UI_ServiceRef_serviceRefName_feature_desc"), //$NON-NLS-1$
- Webservice_clientPackage.eINSTANCE.getServiceRef_ServiceRefName(), true, ItemPropertyDescriptor.GENERIC_VALUE_IMAGE));
- }
-
- /**
- * This adds a property descriptor for the Wsdl File feature. <!-- begin-user-doc --> <!--
- * end-user-doc -->
- *
- */
- protected void addWsdlFilePropertyDescriptor(Object object) {
- itemPropertyDescriptors.add(new ItemPropertyDescriptor(((ComposeableAdapterFactory) adapterFactory).getRootAdapterFactory(), getString("%_UI_ServiceRef_wsdlFile_feature"), //$NON-NLS-1$
- getString("%_UI_ServiceRef_wsdlFile_feature_desc"), //$NON-NLS-1$
- Webservice_clientPackage.eINSTANCE.getServiceRef_WsdlFile(), false, ItemPropertyDescriptor.GENERIC_VALUE_IMAGE));
- }
-
- /**
- * This adds a property descriptor for the Jaxrpc Mapping File feature. <!-- begin-user-doc -->
- * <!-- end-user-doc -->
- *
- */
- protected void addJaxrpcMappingFilePropertyDescriptor(Object object) {
- itemPropertyDescriptors.add(new ItemPropertyDescriptor(((ComposeableAdapterFactory) adapterFactory).getRootAdapterFactory(), getString("%_UI_ServiceRef_jaxrpcMappingFile_feature"), //$NON-NLS-1$
- getString("%_UI_ServiceRef_jaxrpcMappingFile_feature_desc"), //$NON-NLS-1$
- Webservice_clientPackage.eINSTANCE.getServiceRef_JaxrpcMappingFile(), false, ItemPropertyDescriptor.GENERIC_VALUE_IMAGE));
- }
-
- /**
- * This adds a property descriptor for the Service Interface feature. <!-- begin-user-doc -->
- * <!-- end-user-doc -->
- *
- */
- protected void addServiceInterfacePropertyDescriptor(Object object) {
- itemPropertyDescriptors.add(new ItemPropertyDescriptor(((ComposeableAdapterFactory) adapterFactory).getRootAdapterFactory(), getString("%_UI_ServiceRef_serviceInterface_feature"), //$NON-NLS-1$
- getString("%_UI_ServiceRef_serviceInterface_feature_desc"), //$NON-NLS-1$
- Webservice_clientPackage.eINSTANCE.getServiceRef_ServiceInterface(), false));
- }
-
- /**
- * This specifies how to implement {@link #getChildren}and
- * {@link org.eclipse.emf.edit.command.AddCommand}and
- * {@link org.eclipse.emf.edit.command.RemoveCommand}support in {@link #createCommand}. <!--
- * begin-user-doc --> <!-- end-user-doc -->
- *
- * @generated
- */
- @Override
- public Collection getChildrenReferences(Object object) {
- if (childrenReferences == null) {
- super.getChildrenReferences(object);
- //childrenReferences.add(Webservice_clientPackage.eINSTANCE.getServiceRef_PortComponentRefs());
- childrenReferences.add(Webservice_clientPackage.eINSTANCE.getServiceRef_Handlers());
- //childrenReferences.add(Webservice_clientPackage.eINSTANCE.getServiceRef_ServiceQname());
- }
- return childrenReferences;
- }
-
- /**
- * <!-- begin-user-doc --> <!-- end-user-doc -->
- *
- * @generated
- */
- @Override
- protected EReference getChildReference(Object object, Object child) {
- // Check the type of the specified child object and return the proper feature to use for
- // adding (see {@link AddCommand}) it as a child.
-
- return super.getChildReference(object, child);
- }
-
-
- /**
- * This returns ServiceRef.gif. <!-- begin-user-doc --> <!-- end-user-doc -->
- */
- @Override
- public Object getImage(Object object) {
- return getResourceLocator().getImage("icons/obj16/serviceref.gif"); //$NON-NLS-1$
- }
-
- /**
- * This returns the label text for the adapted class. <!-- begin-user-doc --> <!-- end-user-doc
- * -->
- *
- * @generated
- */
- /*
- * public String getText(Object object) { String label =
- * ((ServiceRef)object).getServiceRefName(); return label == null || label.length() == 0 ?
- * getString("_UI_ServiceRef_type") : getString("_UI_ServiceRef_type") + " " + label; }
- */
-
- /**
- * This returns the label text for the adapted class. <!-- begin-user-doc --> <!-- end-user-doc
- * -->
- *
- * @non-generated
- */
- @Override
- public String getText(Object object) {
- String label = ((ServiceRef) object).getServiceRefName();
- return "ServiceRef " + label; //$NON-NLS-1$
- }
-
-
- /**
- * This handles notification by calling {@link #fireNotifyChanged fireNotifyChanged}. <!--
- * begin-user-doc --> <!-- end-user-doc -->
- *
- * @generated
- */
- @Override
- public void notifyChanged(Notification notification) {
- switch (notification.getFeatureID(ServiceRef.class)) {
- case Webservice_clientPackage.SERVICE_REF__SERVICE_REF_NAME :
- case Webservice_clientPackage.SERVICE_REF__WSDL_FILE :
- case Webservice_clientPackage.SERVICE_REF__JAXRPC_MAPPING_FILE :
- case Webservice_clientPackage.SERVICE_REF__PORT_COMPONENT_REFS :
- case Webservice_clientPackage.SERVICE_REF__HANDLERS :
- case Webservice_clientPackage.SERVICE_REF__SERVICE_QNAME : {
- fireNotifyChanged(notification);
- return;
- }
- }
- super.notifyChanged(notification);
- }
-
- /**
- * This adds to the collection of {@link org.eclipse.emf.edit.command.CommandParameter}s
- * describing all of the children that can be created under this object. <!-- begin-user-doc -->
- * <!-- end-user-doc -->
- *
- * @generated
- */
- @Override
- protected void collectNewChildDescriptors(Collection newChildDescriptors, Object object) {
- super.collectNewChildDescriptors(newChildDescriptors, object);
-
- newChildDescriptors.add(createChildParameter(Webservice_clientPackage.eINSTANCE.getServiceRef_PortComponentRefs(), Webservice_clientFactory.eINSTANCE.createPortComponentRef()));
-
- newChildDescriptors.add(createChildParameter(Webservice_clientPackage.eINSTANCE.getServiceRef_Handlers(), Webservice_clientFactory.eINSTANCE.createHandler()));
-
- newChildDescriptors.add(createChildParameter(Webservice_clientPackage.eINSTANCE.getServiceRef_ServiceQname(), CommonFactory.eINSTANCE.createQName()));
-
- newChildDescriptors.add(createChildParameter(Webservice_clientPackage.eINSTANCE.getServiceRef_ServiceQname(), WscommonFactory.eINSTANCE.createSOAPHeader()));
-
- newChildDescriptors.add(createChildParameter(Webservice_clientPackage.eINSTANCE.getServiceRef_ServiceQname(), WsddFactory.eINSTANCE.createWSDLPort()));
- }
-
- /**
- * Return the resource locator for this item provider's resources. <!-- begin-user-doc --> <!--
- * end-user-doc -->
- */
- @Override
- public ResourceLocator getResourceLocator() {
- return WebServicePlugin.getInstance();
- }
-}
diff --git a/plugins/org.eclipse.jst.j2ee.webservice/webservice/org/eclipse/jst/j2ee/internal/webservice/provider/ServletLinkItemProvider.java b/plugins/org.eclipse.jst.j2ee.webservice/webservice/org/eclipse/jst/j2ee/internal/webservice/provider/ServletLinkItemProvider.java
deleted file mode 100644
index 8e3ce61..0000000
--- a/plugins/org.eclipse.jst.j2ee.webservice/webservice/org/eclipse/jst/j2ee/internal/webservice/provider/ServletLinkItemProvider.java
+++ /dev/null
@@ -1,157 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2003, 2005 IBM Corporation and others.
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
- *
- * Contributors:
- * IBM Corporation - initial API and implementation
- *******************************************************************************/
-package org.eclipse.jst.j2ee.internal.webservice.provider;
-
-
-import java.util.Collection;
-import java.util.List;
-
-import org.eclipse.emf.common.notify.AdapterFactory;
-import org.eclipse.emf.common.notify.Notification;
-import org.eclipse.emf.common.util.ResourceLocator;
-import org.eclipse.emf.edit.provider.ComposeableAdapterFactory;
-import org.eclipse.emf.edit.provider.ItemPropertyDescriptor;
-import org.eclipse.jst.j2ee.internal.webservice.plugin.WebServicePlugin;
-import org.eclipse.jst.j2ee.webservice.wsdd.ServletLink;
-import org.eclipse.jst.j2ee.webservice.wsdd.WsddPackage;
-
-
-/**
- * This is the item provider adpater for a {@link org.eclipse.jst.j2ee.internal.internal.webservice.wsdd.ServletLink}
- * object. <!-- begin-user-doc --> <!-- end-user-doc -->
- *
- * @generated
- */
-public class ServletLinkItemProvider extends BeanLinkItemProvider{
- /**
- * This constructs an instance from a factory and a notifier. <!-- begin-user-doc --> <!--
- * end-user-doc -->
- *
- * @generated
- */
- public ServletLinkItemProvider(AdapterFactory adapterFactory) {
- super(adapterFactory);
- }
-
- /**
- * This returns the property descriptors for the adapted class. <!-- begin-user-doc --> <!--
- * end-user-doc -->
- *
- * @generated
- */
- @Override
- public List getPropertyDescriptors(Object object) {
- if (itemPropertyDescriptors == null) {
- super.getPropertyDescriptors(object);
-
- addServletLinkPropertyDescriptor(object);
- }
- return itemPropertyDescriptors;
- }
-
- /**
- * This adds a property descriptor for the Id feature. <!-- begin-user-doc --> <!-- end-user-doc
- * -->
- *
- * @generated
- */
- /*
- * pgm protected void addIdPropertyDescriptor(Object object) { itemPropertyDescriptors.add (new
- * ItemPropertyDescriptor (((ComposeableAdapterFactory)adapterFactory).getRootAdapterFactory(),
- * getString("_UI_ServletLink_id_feature"), getString("_UI_PropertyDescriptor_description",
- * "_UI_ServletLink_id_feature", "_UI_ServletLink_type"),
- * WsddPackage.eINSTANCE.getServletLink_Id(), true,
- * ItemPropertyDescriptor.GENERIC_VALUE_IMAGE)); }
- */
-
- /**
- * This adds a property descriptor for the Servlet Link feature. <!-- begin-user-doc --> <!--
- * end-user-doc -->
- *
- * @generated
- */
- protected void addServletLinkPropertyDescriptor(Object object) {
- itemPropertyDescriptors.add(new ItemPropertyDescriptor(((ComposeableAdapterFactory) adapterFactory).getRootAdapterFactory(), getString("_UI_ServletLink_servletLink_feature"), //$NON-NLS-1$
- getString("_UI_PropertyDescriptor_description", "_UI_ServletLink_servletLink_feature", "_UI_ServletLink_type"), //$NON-NLS-1$ //$NON-NLS-2$ //$NON-NLS-3$
- WsddPackage.eINSTANCE.getServletLink_ServletLink(), true, ItemPropertyDescriptor.GENERIC_VALUE_IMAGE));
- }
-
-
- /**
- * This returns ServletLink.gif. <!-- begin-user-doc --> <!-- end-user-doc -->
- */
- @Override
- public Object getImage(Object object) {
- return getResourceLocator().getImage("icons/full/obj16/servlet.gif"); //$NON-NLS-1$
- }
-
- /**
- * This returns the label text for the adapted class. <!-- begin-user-doc --> <!-- end-user-doc
- * -->
- *
- * @generated
- */
- /*
- * public String getText(Object object) { String label = ((ServletLink)object).getId(); return
- * label == null || label.length() == 0 ? getString("_UI_ServletLink_type") :
- * getString("_UI_ServletLink_type") + " " + label; }
- */
-
- /**
- * This returns the label text for the adapted class. <!-- begin-user-doc --> <!-- end-user-doc
- * -->
- *
- * @non-generated
- */
- @Override
- public String getText(Object object) {
- String label = ((ServletLink) object).getServletLink();
- return label == null || label.length() == 0 ? getString("%_UI_ServletLink_type") : label; //$NON-NLS-1$
- }
-
- /**
- * This handles notification by calling {@link #fireNotifyChanged fireNotifyChanged}. <!--
- * begin-user-doc --> <!-- end-user-doc -->
- *
- * @generated
- */
- @Override
- public void notifyChanged(Notification notification) {
- switch (notification.getFeatureID(ServletLink.class)) {
- case WsddPackage.SERVLET_LINK__SERVLET_LINK : {
- fireNotifyChanged(notification);
- return;
- }
- }
- super.notifyChanged(notification);
- }
-
- /**
- * This adds to the collection of {@link org.eclipse.emf.edit.command.CommandParameter}s
- * describing all of the children that can be created under this object. <!-- begin-user-doc -->
- * <!-- end-user-doc -->
- *
- * @generated
- */
- @Override
- protected void collectNewChildDescriptors(Collection newChildDescriptors, Object object) {
- super.collectNewChildDescriptors(newChildDescriptors, object);
- }
-
- /**
- * Return the resource locator for this item provider's resources. <!-- begin-user-doc --> <!--
- * end-user-doc -->
- */
- @Override
- public ResourceLocator getResourceLocator() {
- return WebServicePlugin.getInstance();
- }
-}
diff --git a/plugins/org.eclipse.jst.j2ee.webservice/webservice/org/eclipse/jst/j2ee/internal/webservice/provider/VariableMappingItemProvider.java b/plugins/org.eclipse.jst.j2ee.webservice/webservice/org/eclipse/jst/j2ee/internal/webservice/provider/VariableMappingItemProvider.java
deleted file mode 100644
index f0ecbe7..0000000
--- a/plugins/org.eclipse.jst.j2ee.webservice/webservice/org/eclipse/jst/j2ee/internal/webservice/provider/VariableMappingItemProvider.java
+++ /dev/null
@@ -1,210 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2003, 2005 IBM Corporation and others.
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
- *
- * Contributors:
- * IBM Corporation - initial API and implementation
- *******************************************************************************/
-package org.eclipse.jst.j2ee.internal.webservice.provider;
-
-
-import java.util.Collection;
-import java.util.List;
-
-import org.eclipse.emf.common.notify.AdapterFactory;
-import org.eclipse.emf.common.notify.Notification;
-import org.eclipse.emf.common.util.ResourceLocator;
-import org.eclipse.emf.edit.provider.ComposeableAdapterFactory;
-import org.eclipse.emf.edit.provider.IEditingDomainItemProvider;
-import org.eclipse.emf.edit.provider.IItemLabelProvider;
-import org.eclipse.emf.edit.provider.IItemPropertySource;
-import org.eclipse.emf.edit.provider.ITreeItemContentProvider;
-import org.eclipse.emf.edit.provider.ItemPropertyDescriptor;
-import org.eclipse.emf.edit.provider.ItemProviderAdapter;
-import org.eclipse.jst.j2ee.webservice.jaxrpcmap.JaxrpcmapPackage;
-import org.eclipse.jst.j2ee.webservice.jaxrpcmap.VariableMapping;
-
-
-/**
- * This is the item provider adpater for a
- * {@link org.eclipse.jst.j2ee.internal.internal.webservice.jaxrpcmap.VariableMapping}object. <!-- begin-user-doc --> <!--
- * end-user-doc -->
- *
- * @generated
- */
-public class VariableMappingItemProvider extends ItemProviderAdapter implements IEditingDomainItemProvider, ITreeItemContentProvider, IItemLabelProvider, IItemPropertySource {
- /**
- * This constructs an instance from a factory and a notifier. <!-- begin-user-doc --> <!--
- * end-user-doc -->
- *
- * @generated
- */
- public VariableMappingItemProvider(AdapterFactory adapterFactory) {
- super(adapterFactory);
- }
-
- /**
- * This returns the property descriptors for the adapted class. <!-- begin-user-doc --> <!--
- * end-user-doc -->
- *
- * @generated
- */
- @Override
- public List getPropertyDescriptors(Object object) {
- if (itemPropertyDescriptors == null) {
- super.getPropertyDescriptors(object);
-
- addIdPropertyDescriptor(object);
- addJavaVariableNamePropertyDescriptor(object);
- addXmlElementNamePropertyDescriptor(object);
- addDataMemberPropertyDescriptor(object);
- addXmlAttributeNamePropertyDescriptor(object);
- addXmlWildcardPropertyDescriptor(object);
- }
- return itemPropertyDescriptors;
- }
-
- /**
- * This adds a property descriptor for the Id feature. <!-- begin-user-doc --> <!-- end-user-doc
- * -->
- *
- * @generated
- */
- protected void addIdPropertyDescriptor(Object object) {
- itemPropertyDescriptors.add(new ItemPropertyDescriptor(((ComposeableAdapterFactory) adapterFactory).getRootAdapterFactory(), getString("_UI_VariableMapping_id_feature"), //$NON-NLS-1$
- getString("_UI_PropertyDescriptor_description", "_UI_VariableMapping_id_feature", "_UI_VariableMapping_type"), //$NON-NLS-1$ //$NON-NLS-2$ //$NON-NLS-3$
- JaxrpcmapPackage.eINSTANCE.getVariableMapping_Id(), true, ItemPropertyDescriptor.GENERIC_VALUE_IMAGE));
- }
-
- /**
- * This adds a property descriptor for the Java Variable Name feature. <!-- begin-user-doc -->
- * <!-- end-user-doc -->
- *
- * @generated
- */
- protected void addJavaVariableNamePropertyDescriptor(Object object) {
- itemPropertyDescriptors.add(new ItemPropertyDescriptor(((ComposeableAdapterFactory) adapterFactory).getRootAdapterFactory(), getString("_UI_VariableMapping_javaVariableName_feature"), //$NON-NLS-1$
- getString("_UI_PropertyDescriptor_description", "_UI_VariableMapping_javaVariableName_feature", "_UI_VariableMapping_type"), //$NON-NLS-1$ //$NON-NLS-2$ //$NON-NLS-3$
- JaxrpcmapPackage.eINSTANCE.getVariableMapping_JavaVariableName(), true, ItemPropertyDescriptor.GENERIC_VALUE_IMAGE));
- }
-
- /**
- * This adds a property descriptor for the Xml Element Name feature. <!-- begin-user-doc -->
- * <!-- end-user-doc -->
- *
- * @generated
- */
- protected void addXmlElementNamePropertyDescriptor(Object object) {
- itemPropertyDescriptors.add(new ItemPropertyDescriptor(((ComposeableAdapterFactory) adapterFactory).getRootAdapterFactory(), getString("_UI_VariableMapping_xmlElementName_feature"), //$NON-NLS-1$
- getString("_UI_PropertyDescriptor_description", "_UI_VariableMapping_xmlElementName_feature", "_UI_VariableMapping_type"), //$NON-NLS-1$ //$NON-NLS-2$ //$NON-NLS-3$
- JaxrpcmapPackage.eINSTANCE.getVariableMapping_XmlElementName(), true, ItemPropertyDescriptor.GENERIC_VALUE_IMAGE));
- }
-
- /**
- * This adds a property descriptor for the Data Member feature. <!-- begin-user-doc --> <!--
- * end-user-doc -->
- *
- * @generated
- */
- protected void addDataMemberPropertyDescriptor(Object object) {
- itemPropertyDescriptors.add(new ItemPropertyDescriptor(((ComposeableAdapterFactory) adapterFactory).getRootAdapterFactory(), getString("_UI_VariableMapping_dataMember_feature"), //$NON-NLS-1$
- getString("_UI_PropertyDescriptor_description", "_UI_VariableMapping_dataMember_feature", "_UI_VariableMapping_type"), //$NON-NLS-1$ //$NON-NLS-2$ //$NON-NLS-3$
- JaxrpcmapPackage.eINSTANCE.getVariableMapping_DataMember(), true, ItemPropertyDescriptor.BOOLEAN_VALUE_IMAGE));
- }
-
- /**
- * This adds a property descriptor for the Xml Attribute Name feature. <!-- begin-user-doc -->
- * <!-- end-user-doc -->
- *
- * @generated
- */
- protected void addXmlAttributeNamePropertyDescriptor(Object object) {
- itemPropertyDescriptors.add(new ItemPropertyDescriptor(((ComposeableAdapterFactory) adapterFactory).getRootAdapterFactory(), getString("_UI_VariableMapping_xmlAttributeName_feature"), //$NON-NLS-1$
- getString("_UI_PropertyDescriptor_description", "_UI_VariableMapping_xmlAttributeName_feature", "_UI_VariableMapping_type"), //$NON-NLS-1$ //$NON-NLS-2$ //$NON-NLS-3$
- JaxrpcmapPackage.eINSTANCE.getVariableMapping_XmlAttributeName(), true, ItemPropertyDescriptor.GENERIC_VALUE_IMAGE));
- }
-
- /**
- * This adds a property descriptor for the Xml Wildcard feature. <!-- begin-user-doc --> <!--
- * end-user-doc -->
- *
- * @generated
- */
- protected void addXmlWildcardPropertyDescriptor(Object object) {
- itemPropertyDescriptors.add(new ItemPropertyDescriptor(((ComposeableAdapterFactory) adapterFactory).getRootAdapterFactory(), getString("_UI_VariableMapping_xmlWildcard_feature"), //$NON-NLS-1$
- getString("_UI_PropertyDescriptor_description", "_UI_VariableMapping_xmlWildcard_feature", "_UI_VariableMapping_type"), //$NON-NLS-1$ //$NON-NLS-2$ //$NON-NLS-3$
- JaxrpcmapPackage.eINSTANCE.getVariableMapping_XmlWildcard(), true, ItemPropertyDescriptor.BOOLEAN_VALUE_IMAGE));
- }
-
-
- /**
- * This returns VariableMapping.gif. <!-- begin-user-doc --> <!-- end-user-doc -->
- *
- * @generated
- */
- @Override
- public Object getImage(Object object) {
- return getResourceLocator().getImage("full/obj16/VariableMapping"); //$NON-NLS-1$
- }
-
- /**
- * This returns the label text for the adapted class. <!-- begin-user-doc --> <!-- end-user-doc
- * -->
- *
- * @generated
- */
- @Override
- public String getText(Object object) {
- String label = ((VariableMapping) object).getJavaVariableName();
- return label == null || label.length() == 0 ? getString("_UI_VariableMapping_type") : //$NON-NLS-1$
- getString("_UI_VariableMapping_type") + " " + label; //$NON-NLS-1$ //$NON-NLS-2$
- }
-
- /**
- * This handles notification by calling {@link #fireNotifyChanged fireNotifyChanged}. <!--
- * begin-user-doc --> <!-- end-user-doc -->
- *
- * @generated
- */
- @Override
- public void notifyChanged(Notification notification) {
- switch (notification.getFeatureID(VariableMapping.class)) {
- case JaxrpcmapPackage.VARIABLE_MAPPING__ID :
- case JaxrpcmapPackage.VARIABLE_MAPPING__JAVA_VARIABLE_NAME :
- case JaxrpcmapPackage.VARIABLE_MAPPING__XML_ELEMENT_NAME :
- case JaxrpcmapPackage.VARIABLE_MAPPING__DATA_MEMBER :
- case JaxrpcmapPackage.VARIABLE_MAPPING__XML_ATTRIBUTE_NAME :
- case JaxrpcmapPackage.VARIABLE_MAPPING__XML_WILDCARD : {
- fireNotifyChanged(notification);
- return;
- }
- }
- super.notifyChanged(notification);
- }
-
- /**
- * This adds to the collection of {@link org.eclipse.emf.edit.command.CommandParameter}s
- * describing all of the children that can be created under this object. <!-- begin-user-doc -->
- * <!-- end-user-doc -->
- *
- * @generated
- */
- @Override
- protected void collectNewChildDescriptors(Collection newChildDescriptors, Object object) {
- super.collectNewChildDescriptors(newChildDescriptors, object);
- }
-
- /**
- * Return the resource locator for this item provider's resources. <!-- begin-user-doc --> <!--
- * end-user-doc -->
- *
- * @generated
- */
- @Override
- public ResourceLocator getResourceLocator() {
- return Webservicej2eeEditPlugin.INSTANCE;
- }
-}
diff --git a/plugins/org.eclipse.jst.j2ee.webservice/webservice/org/eclipse/jst/j2ee/internal/webservice/provider/WSDLBindingItemProvider.java b/plugins/org.eclipse.jst.j2ee.webservice/webservice/org/eclipse/jst/j2ee/internal/webservice/provider/WSDLBindingItemProvider.java
deleted file mode 100644
index 343d200..0000000
--- a/plugins/org.eclipse.jst.j2ee.webservice/webservice/org/eclipse/jst/j2ee/internal/webservice/provider/WSDLBindingItemProvider.java
+++ /dev/null
@@ -1,113 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2003, 2004 IBM Corporation and others.
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
- *
- * Contributors:
- * IBM Corporation - initial API and implementation
- *******************************************************************************/
-package org.eclipse.jst.j2ee.internal.webservice.provider;
-
-
-import java.util.Collection;
-import java.util.List;
-
-import org.eclipse.emf.common.notify.AdapterFactory;
-import org.eclipse.emf.common.notify.Notification;
-import org.eclipse.emf.common.util.ResourceLocator;
-import org.eclipse.jst.j2ee.common.internal.provider.QNameItemProvider;
-import org.eclipse.jst.j2ee.webservice.jaxrpcmap.WSDLBinding;
-
-
-/**
- * This is the item provider adpater for a {@link org.eclipse.jst.j2ee.internal.internal.webservice.jaxrpcmap.WSDLBinding}
- * object. <!-- begin-user-doc --> <!-- end-user-doc -->
- *
- * @generated
- */
-public class WSDLBindingItemProvider extends QNameItemProvider{
- /**
- * This constructs an instance from a factory and a notifier. <!-- begin-user-doc --> <!--
- * end-user-doc -->
- *
- * @generated
- */
- public WSDLBindingItemProvider(AdapterFactory adapterFactory) {
- super(adapterFactory);
- }
-
- /**
- * This returns the property descriptors for the adapted class. <!-- begin-user-doc --> <!--
- * end-user-doc -->
- *
- * @generated
- */
- @Override
- public List getPropertyDescriptors(Object object) {
- if (itemPropertyDescriptors == null) {
- super.getPropertyDescriptors(object);
-
- }
- return itemPropertyDescriptors;
- }
-
-
- /**
- * This returns WSDLBinding.gif. <!-- begin-user-doc --> <!-- end-user-doc -->
- *
- * @generated
- */
- @Override
- public Object getImage(Object object) {
- return getResourceLocator().getImage("full/obj16/WSDLBinding"); //$NON-NLS-1$
- }
-
- /**
- * This returns the label text for the adapted class. <!-- begin-user-doc --> <!-- end-user-doc
- * -->
- *
- * @generated
- */
- @Override
- public String getText(Object object) {
- String label = ((WSDLBinding) object).getCombinedQName();
- return label == null || label.length() == 0 ? getString("_UI_WSDLBinding_type") : //$NON-NLS-1$
- getString("_UI_WSDLBinding_type") + " " + label; //$NON-NLS-1$ //$NON-NLS-2$
- }
-
- /**
- * This handles notification by calling {@link #fireNotifyChanged fireNotifyChanged}. <!--
- * begin-user-doc --> <!-- end-user-doc -->
- *
- * @generated
- */
- @Override
- public void notifyChanged(Notification notification) {
- super.notifyChanged(notification);
- }
-
- /**
- * This adds to the collection of {@link org.eclipse.emf.edit.command.CommandParameter}s
- * describing all of the children that can be created under this object. <!-- begin-user-doc -->
- * <!-- end-user-doc -->
- *
- * @generated
- */
- @Override
- protected void collectNewChildDescriptors(Collection newChildDescriptors, Object object) {
- super.collectNewChildDescriptors(newChildDescriptors, object);
- }
-
- /**
- * Return the resource locator for this item provider's resources. <!-- begin-user-doc --> <!--
- * end-user-doc -->
- *
- * @generated
- */
- @Override
- public ResourceLocator getResourceLocator() {
- return Webservicej2eeEditPlugin.INSTANCE;
- }
-}
\ No newline at end of file
diff --git a/plugins/org.eclipse.jst.j2ee.webservice/webservice/org/eclipse/jst/j2ee/internal/webservice/provider/WSDLMessageItemProvider.java b/plugins/org.eclipse.jst.j2ee.webservice/webservice/org/eclipse/jst/j2ee/internal/webservice/provider/WSDLMessageItemProvider.java
deleted file mode 100644
index 2f5e08e..0000000
--- a/plugins/org.eclipse.jst.j2ee.webservice/webservice/org/eclipse/jst/j2ee/internal/webservice/provider/WSDLMessageItemProvider.java
+++ /dev/null
@@ -1,113 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2003, 2004 IBM Corporation and others.
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
- *
- * Contributors:
- * IBM Corporation - initial API and implementation
- *******************************************************************************/
-package org.eclipse.jst.j2ee.internal.webservice.provider;
-
-
-import java.util.Collection;
-import java.util.List;
-
-import org.eclipse.emf.common.notify.AdapterFactory;
-import org.eclipse.emf.common.notify.Notification;
-import org.eclipse.emf.common.util.ResourceLocator;
-import org.eclipse.jst.j2ee.common.internal.provider.QNameItemProvider;
-import org.eclipse.jst.j2ee.webservice.jaxrpcmap.WSDLMessage;
-
-
-/**
- * This is the item provider adpater for a {@link org.eclipse.jst.j2ee.internal.internal.webservice.jaxrpcmap.WSDLMessage}
- * object. <!-- begin-user-doc --> <!-- end-user-doc -->
- *
- * @generated
- */
-public class WSDLMessageItemProvider extends QNameItemProvider{
- /**
- * This constructs an instance from a factory and a notifier. <!-- begin-user-doc --> <!--
- * end-user-doc -->
- *
- * @generated
- */
- public WSDLMessageItemProvider(AdapterFactory adapterFactory) {
- super(adapterFactory);
- }
-
- /**
- * This returns the property descriptors for the adapted class. <!-- begin-user-doc --> <!--
- * end-user-doc -->
- *
- * @generated
- */
- @Override
- public List getPropertyDescriptors(Object object) {
- if (itemPropertyDescriptors == null) {
- super.getPropertyDescriptors(object);
-
- }
- return itemPropertyDescriptors;
- }
-
-
- /**
- * This returns WSDLMessage.gif. <!-- begin-user-doc --> <!-- end-user-doc -->
- *
- * @generated
- */
- @Override
- public Object getImage(Object object) {
- return getResourceLocator().getImage("full/obj16/WSDLMessage"); //$NON-NLS-1$
- }
-
- /**
- * This returns the label text for the adapted class. <!-- begin-user-doc --> <!-- end-user-doc
- * -->
- *
- * @generated
- */
- @Override
- public String getText(Object object) {
- String label = ((WSDLMessage) object).getCombinedQName();
- return label == null || label.length() == 0 ? getString("_UI_WSDLMessage_type") : //$NON-NLS-1$
- getString("_UI_WSDLMessage_type") + " " + label; //$NON-NLS-1$ //$NON-NLS-2$
- }
-
- /**
- * This handles notification by calling {@link #fireNotifyChanged fireNotifyChanged}. <!--
- * begin-user-doc --> <!-- end-user-doc -->
- *
- * @generated
- */
- @Override
- public void notifyChanged(Notification notification) {
- super.notifyChanged(notification);
- }
-
- /**
- * This adds to the collection of {@link org.eclipse.emf.edit.command.CommandParameter}s
- * describing all of the children that can be created under this object. <!-- begin-user-doc -->
- * <!-- end-user-doc -->
- *
- * @generated
- */
- @Override
- protected void collectNewChildDescriptors(Collection newChildDescriptors, Object object) {
- super.collectNewChildDescriptors(newChildDescriptors, object);
- }
-
- /**
- * Return the resource locator for this item provider's resources. <!-- begin-user-doc --> <!--
- * end-user-doc -->
- *
- * @generated
- */
- @Override
- public ResourceLocator getResourceLocator() {
- return Webservicej2eeEditPlugin.INSTANCE;
- }
-}
\ No newline at end of file
diff --git a/plugins/org.eclipse.jst.j2ee.webservice/webservice/org/eclipse/jst/j2ee/internal/webservice/provider/WSDLMessageMappingItemProvider.java b/plugins/org.eclipse.jst.j2ee.webservice/webservice/org/eclipse/jst/j2ee/internal/webservice/provider/WSDLMessageMappingItemProvider.java
deleted file mode 100644
index d2de2f0..0000000
--- a/plugins/org.eclipse.jst.j2ee.webservice/webservice/org/eclipse/jst/j2ee/internal/webservice/provider/WSDLMessageMappingItemProvider.java
+++ /dev/null
@@ -1,203 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2003, 2005 IBM Corporation and others.
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
- *
- * Contributors:
- * IBM Corporation - initial API and implementation
- *******************************************************************************/
-package org.eclipse.jst.j2ee.internal.webservice.provider;
-
-
-import java.util.Collection;
-import java.util.List;
-
-import org.eclipse.emf.common.notify.AdapterFactory;
-import org.eclipse.emf.common.notify.Notification;
-import org.eclipse.emf.common.util.ResourceLocator;
-import org.eclipse.emf.edit.provider.ComposeableAdapterFactory;
-import org.eclipse.emf.edit.provider.IEditingDomainItemProvider;
-import org.eclipse.emf.edit.provider.IItemLabelProvider;
-import org.eclipse.emf.edit.provider.IItemPropertySource;
-import org.eclipse.emf.edit.provider.ITreeItemContentProvider;
-import org.eclipse.emf.edit.provider.ItemPropertyDescriptor;
-import org.eclipse.emf.edit.provider.ItemProviderAdapter;
-import org.eclipse.jst.j2ee.webservice.jaxrpcmap.JaxrpcmapFactory;
-import org.eclipse.jst.j2ee.webservice.jaxrpcmap.JaxrpcmapPackage;
-import org.eclipse.jst.j2ee.webservice.jaxrpcmap.WSDLMessageMapping;
-
-
-/**
- * This is the item provider adpater for a
- * {@link org.eclipse.jst.j2ee.internal.internal.webservice.jaxrpcmap.WSDLMessageMapping}object. <!-- begin-user-doc -->
- * <!-- end-user-doc -->
- *
- * @generated
- */
-public class WSDLMessageMappingItemProvider extends ItemProviderAdapter implements IEditingDomainItemProvider, ITreeItemContentProvider, IItemLabelProvider, IItemPropertySource {
- /**
- * This constructs an instance from a factory and a notifier. <!-- begin-user-doc --> <!--
- * end-user-doc -->
- *
- * @generated
- */
- public WSDLMessageMappingItemProvider(AdapterFactory adapterFactory) {
- super(adapterFactory);
- }
-
- /**
- * This returns the property descriptors for the adapted class. <!-- begin-user-doc --> <!--
- * end-user-doc -->
- *
- * @generated
- */
- @Override
- public List getPropertyDescriptors(Object object) {
- if (itemPropertyDescriptors == null) {
- super.getPropertyDescriptors(object);
-
- addIdPropertyDescriptor(object);
- addWsdlMessagePartNamePropertyDescriptor(object);
- addParameterModePropertyDescriptor(object);
- addSoapHeaderPropertyDescriptor(object);
- }
- return itemPropertyDescriptors;
- }
-
- /**
- * This adds a property descriptor for the Id feature. <!-- begin-user-doc --> <!-- end-user-doc
- * -->
- *
- * @generated
- */
- protected void addIdPropertyDescriptor(Object object) {
- itemPropertyDescriptors.add(new ItemPropertyDescriptor(((ComposeableAdapterFactory) adapterFactory).getRootAdapterFactory(), getString("_UI_WSDLMessageMapping_id_feature"), //$NON-NLS-1$
- getString("_UI_PropertyDescriptor_description", "_UI_WSDLMessageMapping_id_feature", "_UI_WSDLMessageMapping_type"), //$NON-NLS-1$ //$NON-NLS-2$ //$NON-NLS-3$
- JaxrpcmapPackage.eINSTANCE.getWSDLMessageMapping_Id(), true, ItemPropertyDescriptor.GENERIC_VALUE_IMAGE));
- }
-
- /**
- * This adds a property descriptor for the Wsdl Message Part Name feature. <!-- begin-user-doc
- * --> <!-- end-user-doc -->
- *
- * @generated
- */
- protected void addWsdlMessagePartNamePropertyDescriptor(Object object) {
- itemPropertyDescriptors.add(new ItemPropertyDescriptor(((ComposeableAdapterFactory) adapterFactory).getRootAdapterFactory(), getString("_UI_WSDLMessageMapping_wsdlMessagePartName_feature"), //$NON-NLS-1$
- getString("_UI_PropertyDescriptor_description", "_UI_WSDLMessageMapping_wsdlMessagePartName_feature", "_UI_WSDLMessageMapping_type"), //$NON-NLS-1$ //$NON-NLS-2$ //$NON-NLS-3$
- JaxrpcmapPackage.eINSTANCE.getWSDLMessageMapping_WsdlMessagePartName(), true, ItemPropertyDescriptor.GENERIC_VALUE_IMAGE));
- }
-
- /**
- * This adds a property descriptor for the Parameter Mode feature. <!-- begin-user-doc --> <!--
- * end-user-doc -->
- *
- * @generated
- */
- protected void addParameterModePropertyDescriptor(Object object) {
- itemPropertyDescriptors.add(new ItemPropertyDescriptor(((ComposeableAdapterFactory) adapterFactory).getRootAdapterFactory(), getString("_UI_WSDLMessageMapping_parameterMode_feature"), //$NON-NLS-1$
- getString("_UI_PropertyDescriptor_description", "_UI_WSDLMessageMapping_parameterMode_feature", "_UI_WSDLMessageMapping_type"), //$NON-NLS-1$ //$NON-NLS-2$ //$NON-NLS-3$
- JaxrpcmapPackage.eINSTANCE.getWSDLMessageMapping_ParameterMode(), true, ItemPropertyDescriptor.GENERIC_VALUE_IMAGE));
- }
-
- /**
- * This adds a property descriptor for the Soap Header feature. <!-- begin-user-doc --> <!--
- * end-user-doc -->
- *
- * @generated
- */
- protected void addSoapHeaderPropertyDescriptor(Object object) {
- itemPropertyDescriptors.add(new ItemPropertyDescriptor(((ComposeableAdapterFactory) adapterFactory).getRootAdapterFactory(), getString("_UI_WSDLMessageMapping_soapHeader_feature"), //$NON-NLS-1$
- getString("_UI_PropertyDescriptor_description", "_UI_WSDLMessageMapping_soapHeader_feature", "_UI_WSDLMessageMapping_type"), //$NON-NLS-1$ //$NON-NLS-2$ //$NON-NLS-3$
- JaxrpcmapPackage.eINSTANCE.getWSDLMessageMapping_SoapHeader(), true, ItemPropertyDescriptor.BOOLEAN_VALUE_IMAGE));
- }
-
- /**
- * This specifies how to implement {@link #getChildren}and
- * {@link org.eclipse.emf.edit.command.AddCommand}and
- * {@link org.eclipse.emf.edit.command.RemoveCommand}support in {@link #createCommand}. <!--
- * begin-user-doc --> <!-- end-user-doc -->
- *
- * @generated
- */
- @Override
- public Collection getChildrenReferences(Object object) {
- if (childrenReferences == null) {
- super.getChildrenReferences(object);
- childrenReferences.add(JaxrpcmapPackage.eINSTANCE.getWSDLMessageMapping_WsdlMessage());
- }
- return childrenReferences;
- }
-
-
- /**
- * This returns WSDLMessageMapping.gif. <!-- begin-user-doc --> <!-- end-user-doc -->
- *
- * @generated
- */
- @Override
- public Object getImage(Object object) {
- return getResourceLocator().getImage("full/obj16/WSDLMessageMapping"); //$NON-NLS-1$
- }
-
- /**
- * This returns the label text for the adapted class. <!-- begin-user-doc --> <!-- end-user-doc
- * -->
- *
- * @generated
- */
- @Override
- public String getText(Object object) {
- String label = ((WSDLMessageMapping) object).getWsdlMessagePartName();
- return label == null || label.length() == 0 ? getString("_UI_WSDLMessageMapping_type") : //$NON-NLS-1$
- getString("_UI_WSDLMessageMapping_type") + " " + label; //$NON-NLS-1$ //$NON-NLS-2$
- }
-
- /**
- * This handles notification by calling {@link #fireNotifyChanged fireNotifyChanged}. <!--
- * begin-user-doc --> <!-- end-user-doc -->
- *
- * @generated
- */
- @Override
- public void notifyChanged(Notification notification) {
- switch (notification.getFeatureID(WSDLMessageMapping.class)) {
- case JaxrpcmapPackage.WSDL_MESSAGE_MAPPING__ID :
- case JaxrpcmapPackage.WSDL_MESSAGE_MAPPING__WSDL_MESSAGE_PART_NAME :
- case JaxrpcmapPackage.WSDL_MESSAGE_MAPPING__PARAMETER_MODE :
- case JaxrpcmapPackage.WSDL_MESSAGE_MAPPING__SOAP_HEADER :
- case JaxrpcmapPackage.WSDL_MESSAGE_MAPPING__WSDL_MESSAGE : {
- fireNotifyChanged(notification);
- return;
- }
- }
- super.notifyChanged(notification);
- }
-
- /**
- * This adds to the collection of {@link org.eclipse.emf.edit.command.CommandParameter}s
- * describing all of the children that can be created under this object. <!-- begin-user-doc -->
- * <!-- end-user-doc -->
- *
- * @generated
- */
- @Override
- protected void collectNewChildDescriptors(Collection newChildDescriptors, Object object) {
- super.collectNewChildDescriptors(newChildDescriptors, object);
-
- newChildDescriptors.add(createChildParameter(JaxrpcmapPackage.eINSTANCE.getWSDLMessageMapping_WsdlMessage(), JaxrpcmapFactory.eINSTANCE.createWSDLMessage()));
- }
-
- /**
- * Return the resource locator for this item provider's resources. <!-- begin-user-doc --> <!--
- * end-user-doc -->
- *
- * @generated
- */
- @Override
- public ResourceLocator getResourceLocator() {
- return Webservicej2eeEditPlugin.INSTANCE;
- }
-}
diff --git a/plugins/org.eclipse.jst.j2ee.webservice/webservice/org/eclipse/jst/j2ee/internal/webservice/provider/WSDLMessagePartNameItemProvider.java b/plugins/org.eclipse.jst.j2ee.webservice/webservice/org/eclipse/jst/j2ee/internal/webservice/provider/WSDLMessagePartNameItemProvider.java
deleted file mode 100644
index b4f64f3..0000000
--- a/plugins/org.eclipse.jst.j2ee.webservice/webservice/org/eclipse/jst/j2ee/internal/webservice/provider/WSDLMessagePartNameItemProvider.java
+++ /dev/null
@@ -1,154 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2003, 2005 IBM Corporation and others.
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
- *
- * Contributors:
- * IBM Corporation - initial API and implementation
- *******************************************************************************/
-package org.eclipse.jst.j2ee.internal.webservice.provider;
-
-
-import java.util.Collection;
-import java.util.List;
-
-import org.eclipse.emf.common.notify.AdapterFactory;
-import org.eclipse.emf.common.notify.Notification;
-import org.eclipse.emf.common.util.ResourceLocator;
-import org.eclipse.emf.edit.provider.ComposeableAdapterFactory;
-import org.eclipse.emf.edit.provider.IEditingDomainItemProvider;
-import org.eclipse.emf.edit.provider.IItemLabelProvider;
-import org.eclipse.emf.edit.provider.IItemPropertySource;
-import org.eclipse.emf.edit.provider.ITreeItemContentProvider;
-import org.eclipse.emf.edit.provider.ItemPropertyDescriptor;
-import org.eclipse.emf.edit.provider.ItemProviderAdapter;
-import org.eclipse.jst.j2ee.webservice.jaxrpcmap.JaxrpcmapPackage;
-import org.eclipse.jst.j2ee.webservice.jaxrpcmap.WSDLMessagePartName;
-
-
-/**
- * This is the item provider adpater for a
- * {@link org.eclipse.jst.j2ee.internal.internal.webservice.jaxrpcmap.WSDLMessagePartName}object. <!-- begin-user-doc -->
- * <!-- end-user-doc -->
- *
- * @generated
- */
-public class WSDLMessagePartNameItemProvider extends ItemProviderAdapter implements IEditingDomainItemProvider, ITreeItemContentProvider, IItemLabelProvider, IItemPropertySource {
- /**
- * This constructs an instance from a factory and a notifier. <!-- begin-user-doc --> <!--
- * end-user-doc -->
- *
- * @generated
- */
- public WSDLMessagePartNameItemProvider(AdapterFactory adapterFactory) {
- super(adapterFactory);
- }
-
- /**
- * This returns the property descriptors for the adapted class. <!-- begin-user-doc --> <!--
- * end-user-doc -->
- *
- * @generated
- */
- @Override
- public List getPropertyDescriptors(Object object) {
- if (itemPropertyDescriptors == null) {
- super.getPropertyDescriptors(object);
-
- addIdPropertyDescriptor(object);
- addWsdlMessagePartNamePropertyDescriptor(object);
- }
- return itemPropertyDescriptors;
- }
-
- /**
- * This adds a property descriptor for the Id feature. <!-- begin-user-doc --> <!-- end-user-doc
- * -->
- *
- * @generated
- */
- protected void addIdPropertyDescriptor(Object object) {
- itemPropertyDescriptors.add(new ItemPropertyDescriptor(((ComposeableAdapterFactory) adapterFactory).getRootAdapterFactory(), getString("_UI_WSDLMessagePartName_id_feature"), //$NON-NLS-1$
- getString("_UI_PropertyDescriptor_description", "_UI_WSDLMessagePartName_id_feature", "_UI_WSDLMessagePartName_type"), //$NON-NLS-1$ //$NON-NLS-2$ //$NON-NLS-3$
- JaxrpcmapPackage.eINSTANCE.getWSDLMessagePartName_Id(), true, ItemPropertyDescriptor.GENERIC_VALUE_IMAGE));
- }
-
- /**
- * This adds a property descriptor for the Wsdl Message Part Name feature. <!-- begin-user-doc
- * --> <!-- end-user-doc -->
- *
- * @generated
- */
- protected void addWsdlMessagePartNamePropertyDescriptor(Object object) {
- itemPropertyDescriptors.add(new ItemPropertyDescriptor(((ComposeableAdapterFactory) adapterFactory).getRootAdapterFactory(), getString("_UI_WSDLMessagePartName_wsdlMessagePartName_feature"), //$NON-NLS-1$
- getString("_UI_PropertyDescriptor_description", "_UI_WSDLMessagePartName_wsdlMessagePartName_feature", "_UI_WSDLMessagePartName_type"), //$NON-NLS-1$ //$NON-NLS-2$ //$NON-NLS-3$
- JaxrpcmapPackage.eINSTANCE.getWSDLMessagePartName_WsdlMessagePartName(), true, ItemPropertyDescriptor.GENERIC_VALUE_IMAGE));
- }
-
-
- /**
- * This returns WSDLMessagePartName.gif. <!-- begin-user-doc --> <!-- end-user-doc -->
- *
- * @generated
- */
- @Override
- public Object getImage(Object object) {
- return getResourceLocator().getImage("full/obj16/WSDLMessagePartName"); //$NON-NLS-1$
- }
-
- /**
- * This returns the label text for the adapted class. <!-- begin-user-doc --> <!-- end-user-doc
- * -->
- *
- * @generated
- */
- @Override
- public String getText(Object object) {
- String label = ((WSDLMessagePartName) object).getWsdlMessagePartName();
- return label == null || label.length() == 0 ? getString("_UI_WSDLMessagePartName_type") : //$NON-NLS-1$
- getString("_UI_WSDLMessagePartName_type") + " " + label; //$NON-NLS-1$ //$NON-NLS-2$
- }
-
- /**
- * This handles notification by calling {@link #fireNotifyChanged fireNotifyChanged}. <!--
- * begin-user-doc --> <!-- end-user-doc -->
- *
- * @generated
- */
- @Override
- public void notifyChanged(Notification notification) {
- switch (notification.getFeatureID(WSDLMessagePartName.class)) {
- case JaxrpcmapPackage.WSDL_MESSAGE_PART_NAME__ID :
- case JaxrpcmapPackage.WSDL_MESSAGE_PART_NAME__WSDL_MESSAGE_PART_NAME : {
- fireNotifyChanged(notification);
- return;
- }
- }
- super.notifyChanged(notification);
- }
-
- /**
- * This adds to the collection of {@link org.eclipse.emf.edit.command.CommandParameter}s
- * describing all of the children that can be created under this object. <!-- begin-user-doc -->
- * <!-- end-user-doc -->
- *
- * @generated
- */
- @Override
- protected void collectNewChildDescriptors(Collection newChildDescriptors, Object object) {
- super.collectNewChildDescriptors(newChildDescriptors, object);
- }
-
- /**
- * Return the resource locator for this item provider's resources. <!-- begin-user-doc --> <!--
- * end-user-doc -->
- *
- * @generated
- */
- @Override
- public ResourceLocator getResourceLocator() {
- return Webservicej2eeEditPlugin.INSTANCE;
- }
-}
diff --git a/plugins/org.eclipse.jst.j2ee.webservice/webservice/org/eclipse/jst/j2ee/internal/webservice/provider/WSDLOperationItemProvider.java b/plugins/org.eclipse.jst.j2ee.webservice/webservice/org/eclipse/jst/j2ee/internal/webservice/provider/WSDLOperationItemProvider.java
deleted file mode 100644
index 7bdd555..0000000
--- a/plugins/org.eclipse.jst.j2ee.webservice/webservice/org/eclipse/jst/j2ee/internal/webservice/provider/WSDLOperationItemProvider.java
+++ /dev/null
@@ -1,153 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2003, 2005 IBM Corporation and others.
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
- *
- * Contributors:
- * IBM Corporation - initial API and implementation
- *******************************************************************************/
-package org.eclipse.jst.j2ee.internal.webservice.provider;
-
-
-import java.util.Collection;
-import java.util.List;
-
-import org.eclipse.emf.common.notify.AdapterFactory;
-import org.eclipse.emf.common.notify.Notification;
-import org.eclipse.emf.common.util.ResourceLocator;
-import org.eclipse.emf.edit.provider.ComposeableAdapterFactory;
-import org.eclipse.emf.edit.provider.IEditingDomainItemProvider;
-import org.eclipse.emf.edit.provider.IItemLabelProvider;
-import org.eclipse.emf.edit.provider.IItemPropertySource;
-import org.eclipse.emf.edit.provider.ITreeItemContentProvider;
-import org.eclipse.emf.edit.provider.ItemPropertyDescriptor;
-import org.eclipse.emf.edit.provider.ItemProviderAdapter;
-import org.eclipse.jst.j2ee.webservice.jaxrpcmap.JaxrpcmapPackage;
-import org.eclipse.jst.j2ee.webservice.jaxrpcmap.WSDLOperation;
-
-
-/**
- * This is the item provider adpater for a {@link org.eclipse.jst.j2ee.internal.internal.webservice.jaxrpcmap.WSDLOperation}
- * object. <!-- begin-user-doc --> <!-- end-user-doc -->
- *
- * @generated
- */
-public class WSDLOperationItemProvider extends ItemProviderAdapter implements IEditingDomainItemProvider, ITreeItemContentProvider, IItemLabelProvider, IItemPropertySource {
- /**
- * This constructs an instance from a factory and a notifier. <!-- begin-user-doc --> <!--
- * end-user-doc -->
- *
- * @generated
- */
- public WSDLOperationItemProvider(AdapterFactory adapterFactory) {
- super(adapterFactory);
- }
-
- /**
- * This returns the property descriptors for the adapted class. <!-- begin-user-doc --> <!--
- * end-user-doc -->
- *
- * @generated
- */
- @Override
- public List getPropertyDescriptors(Object object) {
- if (itemPropertyDescriptors == null) {
- super.getPropertyDescriptors(object);
-
- addIdPropertyDescriptor(object);
- addWsdlOperationPropertyDescriptor(object);
- }
- return itemPropertyDescriptors;
- }
-
- /**
- * This adds a property descriptor for the Id feature. <!-- begin-user-doc --> <!-- end-user-doc
- * -->
- *
- * @generated
- */
- protected void addIdPropertyDescriptor(Object object) {
- itemPropertyDescriptors.add(new ItemPropertyDescriptor(((ComposeableAdapterFactory) adapterFactory).getRootAdapterFactory(), getString("_UI_WSDLOperation_id_feature"), //$NON-NLS-1$
- getString("_UI_PropertyDescriptor_description", "_UI_WSDLOperation_id_feature", "_UI_WSDLOperation_type"), //$NON-NLS-1$ //$NON-NLS-2$ //$NON-NLS-3$
- JaxrpcmapPackage.eINSTANCE.getWSDLOperation_Id(), true, ItemPropertyDescriptor.GENERIC_VALUE_IMAGE));
- }
-
- /**
- * This adds a property descriptor for the Wsdl Operation feature. <!-- begin-user-doc --> <!--
- * end-user-doc -->
- *
- * @generated
- */
- protected void addWsdlOperationPropertyDescriptor(Object object) {
- itemPropertyDescriptors.add(new ItemPropertyDescriptor(((ComposeableAdapterFactory) adapterFactory).getRootAdapterFactory(), getString("_UI_WSDLOperation_wsdlOperation_feature"), //$NON-NLS-1$
- getString("_UI_PropertyDescriptor_description", "_UI_WSDLOperation_wsdlOperation_feature", "_UI_WSDLOperation_type"), //$NON-NLS-1$ //$NON-NLS-2$ //$NON-NLS-3$
- JaxrpcmapPackage.eINSTANCE.getWSDLOperation_WsdlOperation(), true, ItemPropertyDescriptor.GENERIC_VALUE_IMAGE));
- }
-
-
- /**
- * This returns WSDLOperation.gif. <!-- begin-user-doc --> <!-- end-user-doc -->
- *
- * @generated
- */
- @Override
- public Object getImage(Object object) {
- return getResourceLocator().getImage("full/obj16/WSDLOperation"); //$NON-NLS-1$
- }
-
- /**
- * This returns the label text for the adapted class. <!-- begin-user-doc --> <!-- end-user-doc
- * -->
- *
- * @generated
- */
- @Override
- public String getText(Object object) {
- String label = ((WSDLOperation) object).getId();
- return label == null || label.length() == 0 ? getString("_UI_WSDLOperation_type") : //$NON-NLS-1$
- getString("_UI_WSDLOperation_type") + " " + label; //$NON-NLS-1$ //$NON-NLS-2$
- }
-
- /**
- * This handles notification by calling {@link #fireNotifyChanged fireNotifyChanged}. <!--
- * begin-user-doc --> <!-- end-user-doc -->
- *
- * @generated
- */
- @Override
- public void notifyChanged(Notification notification) {
- switch (notification.getFeatureID(WSDLOperation.class)) {
- case JaxrpcmapPackage.WSDL_OPERATION__ID :
- case JaxrpcmapPackage.WSDL_OPERATION__WSDL_OPERATION : {
- fireNotifyChanged(notification);
- return;
- }
- }
- super.notifyChanged(notification);
- }
-
- /**
- * This adds to the collection of {@link org.eclipse.emf.edit.command.CommandParameter}s
- * describing all of the children that can be created under this object. <!-- begin-user-doc -->
- * <!-- end-user-doc -->
- *
- * @generated
- */
- @Override
- protected void collectNewChildDescriptors(Collection newChildDescriptors, Object object) {
- super.collectNewChildDescriptors(newChildDescriptors, object);
- }
-
- /**
- * Return the resource locator for this item provider's resources. <!-- begin-user-doc --> <!--
- * end-user-doc -->
- *
- * @generated
- */
- @Override
- public ResourceLocator getResourceLocator() {
- return Webservicej2eeEditPlugin.INSTANCE;
- }
-}
diff --git a/plugins/org.eclipse.jst.j2ee.webservice/webservice/org/eclipse/jst/j2ee/internal/webservice/provider/WSDLPortItemProvider.java b/plugins/org.eclipse.jst.j2ee.webservice/webservice/org/eclipse/jst/j2ee/internal/webservice/provider/WSDLPortItemProvider.java
deleted file mode 100644
index 2ca62d1..0000000
--- a/plugins/org.eclipse.jst.j2ee.webservice/webservice/org/eclipse/jst/j2ee/internal/webservice/provider/WSDLPortItemProvider.java
+++ /dev/null
@@ -1,130 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2003, 2004 IBM Corporation and others.
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
- *
- * Contributors:
- * IBM Corporation - initial API and implementation
- *******************************************************************************/
-package org.eclipse.jst.j2ee.internal.webservice.provider;
-
-
-import java.util.Collection;
-import java.util.List;
-
-import org.eclipse.emf.common.notify.AdapterFactory;
-import org.eclipse.emf.common.notify.Notification;
-import org.eclipse.emf.common.util.ResourceLocator;
-import org.eclipse.jst.j2ee.common.internal.provider.QNameItemProvider;
-import org.eclipse.jst.j2ee.internal.webservice.plugin.WebServicePlugin;
-import org.eclipse.jst.j2ee.webservice.wsdd.WSDLPort;
-
-
-/**
- * This is the item provider adpater for a {@link org.eclipse.jst.j2ee.internal.internal.webservice.wsdd.WSDLPort}object.
- * <!-- begin-user-doc --> <!-- end-user-doc -->
- *
- * @generated
- */
-public class WSDLPortItemProvider extends QNameItemProvider{
- /**
- * This constructs an instance from a factory and a notifier. <!-- begin-user-doc --> <!--
- * end-user-doc -->
- *
- * @generated
- */
- public WSDLPortItemProvider(AdapterFactory adapterFactory) {
- super(adapterFactory);
- }
-
- /**
- * This returns the property descriptors for the adapted class. <!-- begin-user-doc --> <!--
- * end-user-doc -->
- *
- * @generated
- */
- @Override
- public List getPropertyDescriptors(Object object) {
- if (itemPropertyDescriptors == null) {
- super.getPropertyDescriptors(object);
-
- }
- return itemPropertyDescriptors;
- }
-
-
- /**
- * This returns WSDLPort.gif. <!-- begin-user-doc --> <!-- end-user-doc -->
- */
- @Override
- public Object getImage(Object object) {
- return getResourceLocator().getImage("icons/full/obj16/wsdl.gif"); //$NON-NLS-1$
- }
-
- /**
- * This returns the label text for the adapted class. <!-- begin-user-doc --> <!-- end-user-doc
- * -->
- *
- * @generated
- */
- /*
- * public String getText(Object object) { String label = ((WSDLPort)object).getCombinedQName();
- * return label == null || label.length() == 0 ? getString("_UI_WSDLPort_type") :
- * getString("_UI_WSDLPort_type") + " " + label; }
- */
-
- /**
- * This returns the label text for the adapted class. <!-- begin-user-doc --> <!-- end-user-doc
- * -->
- *
- * @non-generated
- */
- @Override
- public String getText(Object object) {
- WSDLPort wsdlport = (WSDLPort) object;
- String nsURI = wsdlport.getNamespaceURI();
- String localpart = wsdlport.getLocalPart();
- if (nsURI == null || nsURI.length() == 0 || localpart == null || localpart.length() == 0)
- return getString("%_UI_WSDLPort_type"); //$NON-NLS-1$
- StringBuffer label = new StringBuffer();
- label.append(nsURI);
- label.append("#"); //$NON-NLS-1$
- label.append(localpart);
- return label.toString();
- }
-
-
- /**
- * This handles notification by calling {@link #fireNotifyChanged fireNotifyChanged}. <!--
- * begin-user-doc --> <!-- end-user-doc -->
- *
- * @generated
- */
- @Override
- public void notifyChanged(Notification notification) {
- super.notifyChanged(notification);
- }
-
- /**
- * This adds to the collection of {@link org.eclipse.emf.edit.command.CommandParameter}s
- * describing all of the children that can be created under this object. <!-- begin-user-doc -->
- * <!-- end-user-doc -->
- *
- * @generated
- */
- @Override
- protected void collectNewChildDescriptors(Collection newChildDescriptors, Object object) {
- super.collectNewChildDescriptors(newChildDescriptors, object);
- }
-
- /**
- * Return the resource locator for this item provider's resources. <!-- begin-user-doc --> <!--
- * end-user-doc -->
- */
- @Override
- public ResourceLocator getResourceLocator() {
- return WebServicePlugin.getInstance();
- }
-}
\ No newline at end of file
diff --git a/plugins/org.eclipse.jst.j2ee.webservice/webservice/org/eclipse/jst/j2ee/internal/webservice/provider/WSDLPortTypeItemProvider.java b/plugins/org.eclipse.jst.j2ee.webservice/webservice/org/eclipse/jst/j2ee/internal/webservice/provider/WSDLPortTypeItemProvider.java
deleted file mode 100644
index 5e3805c..0000000
--- a/plugins/org.eclipse.jst.j2ee.webservice/webservice/org/eclipse/jst/j2ee/internal/webservice/provider/WSDLPortTypeItemProvider.java
+++ /dev/null
@@ -1,113 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2003, 2004 IBM Corporation and others.
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
- *
- * Contributors:
- * IBM Corporation - initial API and implementation
- *******************************************************************************/
-package org.eclipse.jst.j2ee.internal.webservice.provider;
-
-
-import java.util.Collection;
-import java.util.List;
-
-import org.eclipse.emf.common.notify.AdapterFactory;
-import org.eclipse.emf.common.notify.Notification;
-import org.eclipse.emf.common.util.ResourceLocator;
-import org.eclipse.jst.j2ee.common.internal.provider.QNameItemProvider;
-import org.eclipse.jst.j2ee.webservice.jaxrpcmap.WSDLPortType;
-
-
-/**
- * This is the item provider adpater for a {@link org.eclipse.jst.j2ee.internal.internal.webservice.jaxrpcmap.WSDLPortType}
- * object. <!-- begin-user-doc --> <!-- end-user-doc -->
- *
- * @generated
- */
-public class WSDLPortTypeItemProvider extends QNameItemProvider{
- /**
- * This constructs an instance from a factory and a notifier. <!-- begin-user-doc --> <!--
- * end-user-doc -->
- *
- * @generated
- */
- public WSDLPortTypeItemProvider(AdapterFactory adapterFactory) {
- super(adapterFactory);
- }
-
- /**
- * This returns the property descriptors for the adapted class. <!-- begin-user-doc --> <!--
- * end-user-doc -->
- *
- * @generated
- */
- @Override
- public List getPropertyDescriptors(Object object) {
- if (itemPropertyDescriptors == null) {
- super.getPropertyDescriptors(object);
-
- }
- return itemPropertyDescriptors;
- }
-
-
- /**
- * This returns WSDLPortType.gif. <!-- begin-user-doc --> <!-- end-user-doc -->
- *
- * @generated
- */
- @Override
- public Object getImage(Object object) {
- return getResourceLocator().getImage("full/obj16/WSDLPortType"); //$NON-NLS-1$
- }
-
- /**
- * This returns the label text for the adapted class. <!-- begin-user-doc --> <!-- end-user-doc
- * -->
- *
- * @generated
- */
- @Override
- public String getText(Object object) {
- String label = ((WSDLPortType) object).getCombinedQName();
- return label == null || label.length() == 0 ? getString("_UI_WSDLPortType_type") : //$NON-NLS-1$
- getString("_UI_WSDLPortType_type") + " " + label; //$NON-NLS-1$ //$NON-NLS-2$
- }
-
- /**
- * This handles notification by calling {@link #fireNotifyChanged fireNotifyChanged}. <!--
- * begin-user-doc --> <!-- end-user-doc -->
- *
- * @generated
- */
- @Override
- public void notifyChanged(Notification notification) {
- super.notifyChanged(notification);
- }
-
- /**
- * This adds to the collection of {@link org.eclipse.emf.edit.command.CommandParameter}s
- * describing all of the children that can be created under this object. <!-- begin-user-doc -->
- * <!-- end-user-doc -->
- *
- * @generated
- */
- @Override
- protected void collectNewChildDescriptors(Collection newChildDescriptors, Object object) {
- super.collectNewChildDescriptors(newChildDescriptors, object);
- }
-
- /**
- * Return the resource locator for this item provider's resources. <!-- begin-user-doc --> <!--
- * end-user-doc -->
- *
- * @generated
- */
- @Override
- public ResourceLocator getResourceLocator() {
- return Webservicej2eeEditPlugin.INSTANCE;
- }
-}
\ No newline at end of file
diff --git a/plugins/org.eclipse.jst.j2ee.webservice/webservice/org/eclipse/jst/j2ee/internal/webservice/provider/WSDLReturnValueMappingItemProvider.java b/plugins/org.eclipse.jst.j2ee.webservice/webservice/org/eclipse/jst/j2ee/internal/webservice/provider/WSDLReturnValueMappingItemProvider.java
deleted file mode 100644
index 417cae0..0000000
--- a/plugins/org.eclipse.jst.j2ee.webservice/webservice/org/eclipse/jst/j2ee/internal/webservice/provider/WSDLReturnValueMappingItemProvider.java
+++ /dev/null
@@ -1,189 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2003, 2005 IBM Corporation and others.
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
- *
- * Contributors:
- * IBM Corporation - initial API and implementation
- *******************************************************************************/
-package org.eclipse.jst.j2ee.internal.webservice.provider;
-
-
-import java.util.Collection;
-import java.util.List;
-
-import org.eclipse.emf.common.notify.AdapterFactory;
-import org.eclipse.emf.common.notify.Notification;
-import org.eclipse.emf.common.util.ResourceLocator;
-import org.eclipse.emf.edit.provider.ComposeableAdapterFactory;
-import org.eclipse.emf.edit.provider.IEditingDomainItemProvider;
-import org.eclipse.emf.edit.provider.IItemLabelProvider;
-import org.eclipse.emf.edit.provider.IItemPropertySource;
-import org.eclipse.emf.edit.provider.ITreeItemContentProvider;
-import org.eclipse.emf.edit.provider.ItemPropertyDescriptor;
-import org.eclipse.emf.edit.provider.ItemProviderAdapter;
-import org.eclipse.jst.j2ee.webservice.jaxrpcmap.JaxrpcmapFactory;
-import org.eclipse.jst.j2ee.webservice.jaxrpcmap.JaxrpcmapPackage;
-import org.eclipse.jst.j2ee.webservice.jaxrpcmap.WSDLReturnValueMapping;
-
-
-/**
- * This is the item provider adpater for a
- * {@link org.eclipse.jst.j2ee.internal.internal.webservice.jaxrpcmap.WSDLReturnValueMapping}object. <!-- begin-user-doc
- * --> <!-- end-user-doc -->
- *
- * @generated
- */
-public class WSDLReturnValueMappingItemProvider extends ItemProviderAdapter implements IEditingDomainItemProvider, ITreeItemContentProvider, IItemLabelProvider, IItemPropertySource {
- /**
- * This constructs an instance from a factory and a notifier. <!-- begin-user-doc --> <!--
- * end-user-doc -->
- *
- * @generated
- */
- public WSDLReturnValueMappingItemProvider(AdapterFactory adapterFactory) {
- super(adapterFactory);
- }
-
- /**
- * This returns the property descriptors for the adapted class. <!-- begin-user-doc --> <!--
- * end-user-doc -->
- *
- * @generated
- */
- @Override
- public List getPropertyDescriptors(Object object) {
- if (itemPropertyDescriptors == null) {
- super.getPropertyDescriptors(object);
-
- addIdPropertyDescriptor(object);
- addMethodReturnValuePropertyDescriptor(object);
- addWsdlMessagePartNamePropertyDescriptor(object);
- }
- return itemPropertyDescriptors;
- }
-
- /**
- * This adds a property descriptor for the Id feature. <!-- begin-user-doc --> <!-- end-user-doc
- * -->
- *
- * @generated
- */
- protected void addIdPropertyDescriptor(Object object) {
- itemPropertyDescriptors.add(new ItemPropertyDescriptor(((ComposeableAdapterFactory) adapterFactory).getRootAdapterFactory(), getString("_UI_WSDLReturnValueMapping_id_feature"), //$NON-NLS-1$
- getString("_UI_PropertyDescriptor_description", "_UI_WSDLReturnValueMapping_id_feature", "_UI_WSDLReturnValueMapping_type"), //$NON-NLS-1$ //$NON-NLS-2$ //$NON-NLS-3$
- JaxrpcmapPackage.eINSTANCE.getWSDLReturnValueMapping_Id(), true, ItemPropertyDescriptor.GENERIC_VALUE_IMAGE));
- }
-
- /**
- * This adds a property descriptor for the Method Return Value feature. <!-- begin-user-doc -->
- * <!-- end-user-doc -->
- *
- * @generated
- */
- protected void addMethodReturnValuePropertyDescriptor(Object object) {
- itemPropertyDescriptors.add(new ItemPropertyDescriptor(((ComposeableAdapterFactory) adapterFactory).getRootAdapterFactory(), getString("_UI_WSDLReturnValueMapping_methodReturnValue_feature"), //$NON-NLS-1$
- getString("_UI_PropertyDescriptor_description", "_UI_WSDLReturnValueMapping_methodReturnValue_feature", "_UI_WSDLReturnValueMapping_type"), //$NON-NLS-1$ //$NON-NLS-2$ //$NON-NLS-3$
- JaxrpcmapPackage.eINSTANCE.getWSDLReturnValueMapping_MethodReturnValue(), true, ItemPropertyDescriptor.GENERIC_VALUE_IMAGE));
- }
-
- /**
- * This adds a property descriptor for the Wsdl Message Part Name feature. <!-- begin-user-doc
- * --> <!-- end-user-doc -->
- *
- * @generated
- */
- protected void addWsdlMessagePartNamePropertyDescriptor(Object object) {
- itemPropertyDescriptors.add(new ItemPropertyDescriptor(((ComposeableAdapterFactory) adapterFactory).getRootAdapterFactory(), getString("_UI_WSDLReturnValueMapping_wsdlMessagePartName_feature"), //$NON-NLS-1$
- getString("_UI_PropertyDescriptor_description", "_UI_WSDLReturnValueMapping_wsdlMessagePartName_feature", "_UI_WSDLReturnValueMapping_type"), //$NON-NLS-1$ //$NON-NLS-2$ //$NON-NLS-3$
- JaxrpcmapPackage.eINSTANCE.getWSDLReturnValueMapping_WsdlMessagePartName(), true, ItemPropertyDescriptor.GENERIC_VALUE_IMAGE));
- }
-
- /**
- * This specifies how to implement {@link #getChildren}and
- * {@link org.eclipse.emf.edit.command.AddCommand}and
- * {@link org.eclipse.emf.edit.command.RemoveCommand}support in {@link #createCommand}. <!--
- * begin-user-doc --> <!-- end-user-doc -->
- *
- * @generated
- */
- @Override
- public Collection getChildrenReferences(Object object) {
- if (childrenReferences == null) {
- super.getChildrenReferences(object);
- childrenReferences.add(JaxrpcmapPackage.eINSTANCE.getWSDLReturnValueMapping_WsdlMessage());
- }
- return childrenReferences;
- }
-
-
- /**
- * This returns WSDLReturnValueMapping.gif. <!-- begin-user-doc --> <!-- end-user-doc -->
- *
- * @generated
- */
- @Override
- public Object getImage(Object object) {
- return getResourceLocator().getImage("full/obj16/WSDLReturnValueMapping"); //$NON-NLS-1$
- }
-
- /**
- * This returns the label text for the adapted class. <!-- begin-user-doc --> <!-- end-user-doc
- * -->
- *
- * @generated
- */
- @Override
- public String getText(Object object) {
- String label = ((WSDLReturnValueMapping) object).getWsdlMessagePartName();
- return label == null || label.length() == 0 ? getString("_UI_WSDLReturnValueMapping_type") : //$NON-NLS-1$
- getString("_UI_WSDLReturnValueMapping_type") + " " + label; //$NON-NLS-1$ //$NON-NLS-2$
- }
-
- /**
- * This handles notification by calling {@link #fireNotifyChanged fireNotifyChanged}. <!--
- * begin-user-doc --> <!-- end-user-doc -->
- *
- * @generated
- */
- @Override
- public void notifyChanged(Notification notification) {
- switch (notification.getFeatureID(WSDLReturnValueMapping.class)) {
- case JaxrpcmapPackage.WSDL_RETURN_VALUE_MAPPING__ID :
- case JaxrpcmapPackage.WSDL_RETURN_VALUE_MAPPING__METHOD_RETURN_VALUE :
- case JaxrpcmapPackage.WSDL_RETURN_VALUE_MAPPING__WSDL_MESSAGE_PART_NAME :
- case JaxrpcmapPackage.WSDL_RETURN_VALUE_MAPPING__WSDL_MESSAGE : {
- fireNotifyChanged(notification);
- return;
- }
- }
- super.notifyChanged(notification);
- }
-
- /**
- * This adds to the collection of {@link org.eclipse.emf.edit.command.CommandParameter}s
- * describing all of the children that can be created under this object. <!-- begin-user-doc -->
- * <!-- end-user-doc -->
- *
- * @generated
- */
- @Override
- protected void collectNewChildDescriptors(Collection newChildDescriptors, Object object) {
- super.collectNewChildDescriptors(newChildDescriptors, object);
-
- newChildDescriptors.add(createChildParameter(JaxrpcmapPackage.eINSTANCE.getWSDLReturnValueMapping_WsdlMessage(), JaxrpcmapFactory.eINSTANCE.createWSDLMessage()));
- }
-
- /**
- * Return the resource locator for this item provider's resources. <!-- begin-user-doc --> <!--
- * end-user-doc -->
- *
- * @generated
- */
- @Override
- public ResourceLocator getResourceLocator() {
- return Webservicej2eeEditPlugin.INSTANCE;
- }
-}
diff --git a/plugins/org.eclipse.jst.j2ee.webservice/webservice/org/eclipse/jst/j2ee/internal/webservice/provider/WSDLServiceNameItemProvider.java b/plugins/org.eclipse.jst.j2ee.webservice/webservice/org/eclipse/jst/j2ee/internal/webservice/provider/WSDLServiceNameItemProvider.java
deleted file mode 100644
index 1ad9743..0000000
--- a/plugins/org.eclipse.jst.j2ee.webservice/webservice/org/eclipse/jst/j2ee/internal/webservice/provider/WSDLServiceNameItemProvider.java
+++ /dev/null
@@ -1,114 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2003, 2004 IBM Corporation and others.
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
- *
- * Contributors:
- * IBM Corporation - initial API and implementation
- *******************************************************************************/
-package org.eclipse.jst.j2ee.internal.webservice.provider;
-
-
-import java.util.Collection;
-import java.util.List;
-
-import org.eclipse.emf.common.notify.AdapterFactory;
-import org.eclipse.emf.common.notify.Notification;
-import org.eclipse.emf.common.util.ResourceLocator;
-import org.eclipse.jst.j2ee.common.internal.provider.QNameItemProvider;
-import org.eclipse.jst.j2ee.webservice.jaxrpcmap.WSDLServiceName;
-
-
-/**
- * This is the item provider adpater for a
- * {@link org.eclipse.jst.j2ee.internal.internal.webservice.jaxrpcmap.WSDLServiceName}object. <!-- begin-user-doc --> <!--
- * end-user-doc -->
- *
- * @generated
- */
-public class WSDLServiceNameItemProvider extends QNameItemProvider{
- /**
- * This constructs an instance from a factory and a notifier. <!-- begin-user-doc --> <!--
- * end-user-doc -->
- *
- * @generated
- */
- public WSDLServiceNameItemProvider(AdapterFactory adapterFactory) {
- super(adapterFactory);
- }
-
- /**
- * This returns the property descriptors for the adapted class. <!-- begin-user-doc --> <!--
- * end-user-doc -->
- *
- * @generated
- */
- @Override
- public List getPropertyDescriptors(Object object) {
- if (itemPropertyDescriptors == null) {
- super.getPropertyDescriptors(object);
-
- }
- return itemPropertyDescriptors;
- }
-
-
- /**
- * This returns WSDLServiceName.gif. <!-- begin-user-doc --> <!-- end-user-doc -->
- *
- * @generated
- */
- @Override
- public Object getImage(Object object) {
- return getResourceLocator().getImage("full/obj16/WSDLServiceName"); //$NON-NLS-1$
- }
-
- /**
- * This returns the label text for the adapted class. <!-- begin-user-doc --> <!-- end-user-doc
- * -->
- *
- * @generated
- */
- @Override
- public String getText(Object object) {
- String label = ((WSDLServiceName) object).getCombinedQName();
- return label == null || label.length() == 0 ? getString("_UI_WSDLServiceName_type") : //$NON-NLS-1$
- getString("_UI_WSDLServiceName_type") + " " + label; //$NON-NLS-1$ //$NON-NLS-2$
- }
-
- /**
- * This handles notification by calling {@link #fireNotifyChanged fireNotifyChanged}. <!--
- * begin-user-doc --> <!-- end-user-doc -->
- *
- * @generated
- */
- @Override
- public void notifyChanged(Notification notification) {
- super.notifyChanged(notification);
- }
-
- /**
- * This adds to the collection of {@link org.eclipse.emf.edit.command.CommandParameter}s
- * describing all of the children that can be created under this object. <!-- begin-user-doc -->
- * <!-- end-user-doc -->
- *
- * @generated
- */
- @Override
- protected void collectNewChildDescriptors(Collection newChildDescriptors, Object object) {
- super.collectNewChildDescriptors(newChildDescriptors, object);
- }
-
- /**
- * Return the resource locator for this item provider's resources. <!-- begin-user-doc --> <!--
- * end-user-doc -->
- *
- * @generated
- */
- @Override
- public ResourceLocator getResourceLocator() {
- return Webservicej2eeEditPlugin.INSTANCE;
- }
-}
\ No newline at end of file
diff --git a/plugins/org.eclipse.jst.j2ee.webservice/webservice/org/eclipse/jst/j2ee/internal/webservice/provider/WebServiceDescriptionItemProvider.java b/plugins/org.eclipse.jst.j2ee.webservice/webservice/org/eclipse/jst/j2ee/internal/webservice/provider/WebServiceDescriptionItemProvider.java
deleted file mode 100644
index fc6cfa9..0000000
--- a/plugins/org.eclipse.jst.j2ee.webservice/webservice/org/eclipse/jst/j2ee/internal/webservice/provider/WebServiceDescriptionItemProvider.java
+++ /dev/null
@@ -1,352 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2003, 2005 IBM Corporation and others.
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
- *
- * Contributors:
- * IBM Corporation - initial API and implementation
- *******************************************************************************/
-package org.eclipse.jst.j2ee.internal.webservice.provider;
-
-
-import java.util.ArrayList;
-import java.util.Collection;
-import java.util.Iterator;
-import java.util.List;
-
-import org.eclipse.emf.common.notify.AdapterFactory;
-import org.eclipse.emf.common.notify.Notification;
-import org.eclipse.emf.common.util.EList;
-import org.eclipse.emf.common.util.ResourceLocator;
-import org.eclipse.emf.ecore.EObject;
-import org.eclipse.emf.ecore.EReference;
-import org.eclipse.emf.ecore.EStructuralFeature;
-import org.eclipse.emf.edit.provider.ComposeableAdapterFactory;
-import org.eclipse.emf.edit.provider.IEditingDomainItemProvider;
-import org.eclipse.emf.edit.provider.IItemLabelProvider;
-import org.eclipse.emf.edit.provider.IItemPropertySource;
-import org.eclipse.emf.edit.provider.ITreeItemContentProvider;
-import org.eclipse.emf.edit.provider.ItemPropertyDescriptor;
-import org.eclipse.emf.edit.provider.ItemProviderAdapter;
-import org.eclipse.jst.j2ee.common.CommonFactory;
-import org.eclipse.jst.j2ee.internal.webservice.adapter.AdapterViewerItem;
-import org.eclipse.jst.j2ee.internal.webservice.plugin.WebServicePlugin;
-import org.eclipse.jst.j2ee.webservice.wscommon.WscommonFactory;
-import org.eclipse.jst.j2ee.webservice.wsdd.WebServiceDescription;
-import org.eclipse.jst.j2ee.webservice.wsdd.WsddFactory;
-import org.eclipse.jst.j2ee.webservice.wsdd.WsddPackage;
-
-/**
- * This is the item provider adpater for a
- * {@link org.eclipse.jst.j2ee.internal.internal.webservice.wsdd.WebServiceDescription}object. <!-- begin-user-doc --> <!--
- * end-user-doc -->
- *
- * @generated
- */
-public class WebServiceDescriptionItemProvider extends ItemProviderAdapter implements IEditingDomainItemProvider, ITreeItemContentProvider, IItemLabelProvider, IItemPropertySource {
- /**
- * This constructs an instance from a factory and a notifier. <!-- begin-user-doc --> <!--
- * end-user-doc -->
- *
- * @generated
- */
- public WebServiceDescriptionItemProvider(AdapterFactory adapterFactory) {
- super(adapterFactory);
- }
-
- /**
- * This returns the property descriptors for the adapted class. <!-- begin-user-doc --> <!--
- * end-user-doc -->
- *
- * @generated
- */
- @Override
- public List getPropertyDescriptors(Object object) {
- if (itemPropertyDescriptors == null) {
- super.getPropertyDescriptors(object);
-
- addJaxrpcMappingFilePropertyDescriptor(object);
- addWebServiceDescriptionNamePropertyDescriptor(object);
- addWsdlFilePropertyDescriptor(object);
- addSmallIconPropertyDescriptor(object);
- addLargeIconPropertyDescriptor(object);
- addDescriptionPropertyDescriptor(object);
- addDisplayNamePropertyDescriptor(object);
- }
- return itemPropertyDescriptors;
- }
-
- /**
- * This adds a property descriptor for the Id feature. <!-- begin-user-doc --> <!-- end-user-doc
- * -->
- *
- * @generated
- */
- /*
- * pgm protected void addIdPropertyDescriptor(Object object) { itemPropertyDescriptors.add (new
- * ItemPropertyDescriptor (((ComposeableAdapterFactory)adapterFactory).getRootAdapterFactory(),
- * getString("_UI_WebServiceDescription_id_feature"),
- * getString("_UI_PropertyDescriptor_description", "_UI_WebServiceDescription_id_feature",
- * "_UI_WebServiceDescription_type"), WsddPackage.eINSTANCE.getWebServiceDescription_Id(), true,
- * ItemPropertyDescriptor.GENERIC_VALUE_IMAGE)); }
- */
-
- /**
- * This adds a property descriptor for the Jaxrpc Mapping File feature. <!-- begin-user-doc -->
- * <!-- end-user-doc -->
- *
- * @generated
- */
- protected void addJaxrpcMappingFilePropertyDescriptor(Object object) {
- itemPropertyDescriptors.add(new ItemPropertyDescriptor(((ComposeableAdapterFactory) adapterFactory).getRootAdapterFactory(), getString("_UI_WebServiceDescription_jaxrpcMappingFile_feature"), //$NON-NLS-1$
- getString("_UI_PropertyDescriptor_description", "_UI_WebServiceDescription_jaxrpcMappingFile_feature", "_UI_WebServiceDescription_type"), //$NON-NLS-1$ //$NON-NLS-2$ //$NON-NLS-3$
- WsddPackage.eINSTANCE.getWebServiceDescription_JaxrpcMappingFile(), true, ItemPropertyDescriptor.GENERIC_VALUE_IMAGE));
- }
-
- /**
- * This adds a property descriptor for the Web Service Description Name feature. <!--
- * begin-user-doc --> <!-- end-user-doc -->
- *
- * @generated
- */
- protected void addWebServiceDescriptionNamePropertyDescriptor(Object object) {
- itemPropertyDescriptors.add(new ItemPropertyDescriptor(((ComposeableAdapterFactory) adapterFactory).getRootAdapterFactory(), getString("_UI_WebServiceDescription_webServiceDescriptionName_feature"), //$NON-NLS-1$
- getString("_UI_PropertyDescriptor_description", "_UI_WebServiceDescription_webServiceDescriptionName_feature", "_UI_WebServiceDescription_type"), //$NON-NLS-1$ //$NON-NLS-2$ //$NON-NLS-3$
- WsddPackage.eINSTANCE.getWebServiceDescription_WebServiceDescriptionName(), true, ItemPropertyDescriptor.GENERIC_VALUE_IMAGE));
- }
-
- /**
- * This adds a property descriptor for the Wsdl File feature. <!-- begin-user-doc --> <!--
- * end-user-doc -->
- *
- * @generated
- */
- protected void addWsdlFilePropertyDescriptor(Object object) {
- itemPropertyDescriptors.add(new ItemPropertyDescriptor(((ComposeableAdapterFactory) adapterFactory).getRootAdapterFactory(), getString("_UI_WebServiceDescription_wsdlFile_feature"), //$NON-NLS-1$
- getString("_UI_PropertyDescriptor_description", "_UI_WebServiceDescription_wsdlFile_feature", "_UI_WebServiceDescription_type"), //$NON-NLS-1$ //$NON-NLS-2$ //$NON-NLS-3$
- WsddPackage.eINSTANCE.getWebServiceDescription_WsdlFile(), true, ItemPropertyDescriptor.GENERIC_VALUE_IMAGE));
- }
-
- /**
- * This adds a property descriptor for the Small Icon feature. <!-- begin-user-doc --> <!--
- * end-user-doc -->
- *
- * @generated
- */
- protected void addSmallIconPropertyDescriptor(Object object) {
- itemPropertyDescriptors.add(new ItemPropertyDescriptor(((ComposeableAdapterFactory) adapterFactory).getRootAdapterFactory(), getString("_UI_WebServiceDescription_smallIcon_feature"), //$NON-NLS-1$
- getString("_UI_PropertyDescriptor_description", "_UI_WebServiceDescription_smallIcon_feature", "_UI_WebServiceDescription_type"), //$NON-NLS-1$ //$NON-NLS-2$ //$NON-NLS-3$
- WsddPackage.eINSTANCE.getWebServiceDescription_SmallIcon(), true, ItemPropertyDescriptor.GENERIC_VALUE_IMAGE));
- }
-
- /**
- * This adds a property descriptor for the Large Icon feature. <!-- begin-user-doc --> <!--
- * end-user-doc -->
- *
- * @generated
- */
- protected void addLargeIconPropertyDescriptor(Object object) {
- itemPropertyDescriptors.add(new ItemPropertyDescriptor(((ComposeableAdapterFactory) adapterFactory).getRootAdapterFactory(), getString("_UI_WebServiceDescription_largeIcon_feature"), //$NON-NLS-1$
- getString("_UI_PropertyDescriptor_description", "_UI_WebServiceDescription_largeIcon_feature", "_UI_WebServiceDescription_type"), //$NON-NLS-1$ //$NON-NLS-2$ //$NON-NLS-3$
- WsddPackage.eINSTANCE.getWebServiceDescription_LargeIcon(), true, ItemPropertyDescriptor.GENERIC_VALUE_IMAGE));
- }
-
- /**
- * This adds a property descriptor for the Description feature. <!-- begin-user-doc --> <!--
- * end-user-doc -->
- *
- * @generated
- */
- protected void addDescriptionPropertyDescriptor(Object object) {
- itemPropertyDescriptors.add(new ItemPropertyDescriptor(((ComposeableAdapterFactory) adapterFactory).getRootAdapterFactory(), getString("_UI_WebServiceDescription_description_feature"), //$NON-NLS-1$
- getString("_UI_PropertyDescriptor_description", "_UI_WebServiceDescription_description_feature", "_UI_WebServiceDescription_type"), //$NON-NLS-1$ //$NON-NLS-2$ //$NON-NLS-3$
- WsddPackage.eINSTANCE.getWebServiceDescription_Description(), true, ItemPropertyDescriptor.GENERIC_VALUE_IMAGE));
- }
-
- /**
- * This adds a property descriptor for the Display Name feature. <!-- begin-user-doc --> <!--
- * end-user-doc -->
- *
- * @generated
- */
- protected void addDisplayNamePropertyDescriptor(Object object) {
- itemPropertyDescriptors.add(new ItemPropertyDescriptor(((ComposeableAdapterFactory) adapterFactory).getRootAdapterFactory(), getString("_UI_WebServiceDescription_displayName_feature"), //$NON-NLS-1$
- getString("_UI_PropertyDescriptor_description", "_UI_WebServiceDescription_displayName_feature", "_UI_WebServiceDescription_type"), //$NON-NLS-1$ //$NON-NLS-2$ //$NON-NLS-3$
- WsddPackage.eINSTANCE.getWebServiceDescription_DisplayName(), true, ItemPropertyDescriptor.GENERIC_VALUE_IMAGE));
- }
-
- /**
- * This specifies how to implement {@link #getChildren}and
- * {@link org.eclipse.emf.edit.command.AddCommand}and
- * {@link org.eclipse.emf.edit.command.RemoveCommand}support in {@link #createCommand}. <!--
- * begin-user-doc --> <!-- end-user-doc -->
- *
- * @generated
- */
- @Override
- public Collection getChildrenReferences(Object object) {
- if (childrenReferences == null) {
- super.getChildrenReferences(object);
- childrenReferences.add(WsddPackage.eINSTANCE.getWebServiceDescription_PortComponents());
- childrenReferences.add(WsddPackage.eINSTANCE.getWebServiceDescription_DescriptionType());
- childrenReferences.add(WsddPackage.eINSTANCE.getWebServiceDescription_DisplayNameType());
- childrenReferences.add(WsddPackage.eINSTANCE.getWebServiceDescription_IconType());
- }
- return childrenReferences;
- }
-
- /**
- * <!-- begin-user-doc --> <!-- end-user-doc -->
- *
- * @generated
- */
- @Override
- protected EReference getChildReference(Object object, Object child) {
- // Check the type of the specified child object and return the proper feature to use for
- // adding (see {@link AddCommand}) it as a child.
-
- return super.getChildReference(object, child);
- }
-
-
- /**
- * This returns WebServiceDescription.gif. <!-- begin-user-doc --> <!-- end-user-doc -->
- *
- * @generated
- */
- /*
- * public Object getImage(Object object) { return
- * getResourceLocator().getImage("full/obj16/WebServiceDescription"); }
- */
-
- /**
- * This returns the label text for the adapted class. <!-- begin-user-doc --> <!-- end-user-doc
- * -->
- *
- * @generated
- */
- /*
- * public String getText(Object object) { String label =
- * ((WebServiceDescription)object).getWebServiceDescriptionName(); return label == null ||
- * label.length() == 0 ? getString("_UI_WebServiceDescription_type") :
- * getString("_UI_WebServiceDescription_type") + " " + label; }
- */
-
- /**
- * This returns WebServiceDescription.gif. <!-- begin-user-doc --> <!-- end-user-doc -->
- *
- */
- @Override
- public Object getImage(Object object) {
- return getResourceLocator().getImage("icons/obj16/webservicedesc.gif"); //$NON-NLS-1$
- }
-
- /**
- * This returns the label text for the adapted class. <!-- begin-user-doc --> <!-- end-user-doc
- * -->
- *
- * @non-generated
- */
- @Override
- public String getText(Object object) {
- String label = ((WebServiceDescription) object).getWebServiceDescriptionName();
- return label == null || label.length() == 0 ? getString("%_UI_WebServiceDescription_type") : label; //$NON-NLS-1$
- }
-
- /**
- * This handles notification by calling {@link #fireNotifyChanged fireNotifyChanged}. <!--
- * begin-user-doc --> <!-- end-user-doc -->
- *
- * @generated
- */
- @Override
- public void notifyChanged(Notification notification) {
- switch (notification.getFeatureID(WebServiceDescription.class)) {
- case WsddPackage.WEB_SERVICE_DESCRIPTION__JAXRPC_MAPPING_FILE :
- case WsddPackage.WEB_SERVICE_DESCRIPTION__WEB_SERVICE_DESCRIPTION_NAME :
- case WsddPackage.WEB_SERVICE_DESCRIPTION__WSDL_FILE :
- case WsddPackage.WEB_SERVICE_DESCRIPTION__SMALL_ICON :
- case WsddPackage.WEB_SERVICE_DESCRIPTION__LARGE_ICON :
- case WsddPackage.WEB_SERVICE_DESCRIPTION__DESCRIPTION :
- case WsddPackage.WEB_SERVICE_DESCRIPTION__DISPLAY_NAME :
- case WsddPackage.WEB_SERVICE_DESCRIPTION__PORT_COMPONENTS :
- case WsddPackage.WEB_SERVICE_DESCRIPTION__DESCRIPTION_TYPE :
- case WsddPackage.WEB_SERVICE_DESCRIPTION__DISPLAY_NAME_TYPE :
- case WsddPackage.WEB_SERVICE_DESCRIPTION__ICON_TYPE : {
- fireNotifyChanged(notification);
- return;
- }
- }
- super.notifyChanged(notification);
- }
-
- /**
- * This adds to the collection of {@link org.eclipse.emf.edit.command.CommandParameter}s
- * describing all of the children that can be created under this object. <!-- begin-user-doc -->
- * <!-- end-user-doc -->
- *
- * @generated
- */
- @Override
- protected void collectNewChildDescriptors(Collection newChildDescriptors, Object object) {
- super.collectNewChildDescriptors(newChildDescriptors, object);
-
- newChildDescriptors.add(createChildParameter(WsddPackage.eINSTANCE.getWebServiceDescription_PortComponents(), WsddFactory.eINSTANCE.createPortComponent()));
-
- newChildDescriptors.add(createChildParameter(WsddPackage.eINSTANCE.getWebServiceDescription_DescriptionType(), WscommonFactory.eINSTANCE.createDescriptionType()));
-
- newChildDescriptors.add(createChildParameter(WsddPackage.eINSTANCE.getWebServiceDescription_DisplayNameType(), WscommonFactory.eINSTANCE.createDisplayNameType()));
-
- newChildDescriptors.add(createChildParameter(WsddPackage.eINSTANCE.getWebServiceDescription_IconType(), CommonFactory.eINSTANCE.createIconType()));
- }
-
- /**
- * Return the resource locator for this item provider's resources. <!-- begin-user-doc --> <!--
- * end-user-doc -->
- */
- @Override
- public ResourceLocator getResourceLocator() {
- return WebServicePlugin.getInstance();
- }
-
- /**
- * This implements
- * {@link ITreeItemContentProvider#getChildren ITreeItemContentProvider.getChildren}by calling
- * {@link #getChildrenReferences getChildrenReferences}and using those to collect the children.
- */
- @Override
- public Collection getChildren(Object object) {
- if (object instanceof EList)
- return getChildrenFromEList((EList) object);
- else if (object instanceof AdapterViewerItem)
- return getChildrenFromAdapterViewerItem((AdapterViewerItem) object);
- else
- return super.getChildren(object);
- }
-
- protected Collection getChildrenFromEList(EList eList) {
- Collection result = new ArrayList();
- for (Iterator it = eList.iterator(); it.hasNext();)
- result.addAll(super.getChildren(it.next()));
- return result;
- }
-
- protected Collection getChildrenFromAdapterViewerItem(AdapterViewerItem adapterViewerItem) {
- Collection result = new ArrayList();
- EList eObjectList = adapterViewerItem.getEObjectList();
- EStructuralFeature feature = adapterViewerItem.getEStructuralFeature();
- for (Iterator it = eObjectList.iterator(); it.hasNext();) {
- EObject eObject = (EObject) it.next();
- Object object = eObject.eGet(feature);
- if (object != null) {
- if (object instanceof List)
- result.addAll((List) object);
- else
- result.add(object);
- }
- }
- return result;
- }
-}
diff --git a/plugins/org.eclipse.jst.j2ee.webservice/webservice/org/eclipse/jst/j2ee/internal/webservice/provider/WebServicesClientItemProvider.java b/plugins/org.eclipse.jst.j2ee.webservice/webservice/org/eclipse/jst/j2ee/internal/webservice/provider/WebServicesClientItemProvider.java
deleted file mode 100644
index 54ec7b7..0000000
--- a/plugins/org.eclipse.jst.j2ee.webservice/webservice/org/eclipse/jst/j2ee/internal/webservice/provider/WebServicesClientItemProvider.java
+++ /dev/null
@@ -1,161 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2003, 2005 IBM Corporation and others.
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
- *
- * Contributors:
- * IBM Corporation - initial API and implementation
- *******************************************************************************/
-package org.eclipse.jst.j2ee.internal.webservice.provider;
-
-
-import java.util.Collection;
-import java.util.List;
-
-import org.eclipse.emf.common.notify.AdapterFactory;
-import org.eclipse.emf.common.notify.Notification;
-import org.eclipse.emf.common.util.ResourceLocator;
-import org.eclipse.emf.ecore.EReference;
-import org.eclipse.emf.edit.provider.IEditingDomainItemProvider;
-import org.eclipse.emf.edit.provider.IItemLabelProvider;
-import org.eclipse.emf.edit.provider.IItemPropertySource;
-import org.eclipse.emf.edit.provider.ITreeItemContentProvider;
-import org.eclipse.emf.edit.provider.ItemProviderAdapter;
-import org.eclipse.jst.j2ee.internal.webservice.plugin.WebServicePlugin;
-import org.eclipse.jst.j2ee.webservice.wsclient.WebServicesClient;
-import org.eclipse.jst.j2ee.webservice.wsclient.Webservice_clientFactory;
-import org.eclipse.jst.j2ee.webservice.wsclient.Webservice_clientPackage;
-
-
-/**
- * This is the item provider adpater for a {@link com.ibm.etools.wsclient.WebServicesClient}object.
- * <!-- begin-user-doc --> <!-- end-user-doc -->
- *
- * @generated
- */
-public class WebServicesClientItemProvider extends ItemProviderAdapter implements IEditingDomainItemProvider, ITreeItemContentProvider, IItemLabelProvider, IItemPropertySource {
- /**
- * This constructs an instance from a factory and a notifier. <!-- begin-user-doc --> <!--
- * end-user-doc -->
- *
- * @generated
- */
- public WebServicesClientItemProvider(AdapterFactory adapterFactory) {
- super(adapterFactory);
- }
-
- /**
- * This returns the property descriptors for the adapted class. <!-- begin-user-doc --> <!--
- * end-user-doc -->
- *
- * @generated
- */
- @Override
- public List getPropertyDescriptors(Object object) {
- if (itemPropertyDescriptors == null) {
- super.getPropertyDescriptors(object);
-
- }
- return itemPropertyDescriptors;
- }
-
- /**
- * This specifies how to implement {@link #getChildren}and
- * {@link org.eclipse.emf.edit.command.AddCommand}and
- * {@link org.eclipse.emf.edit.command.RemoveCommand}support in {@link #createCommand}. <!--
- * begin-user-doc --> <!-- end-user-doc -->
- *
- * @generated
- */
- @Override
- public Collection getChildrenReferences(Object object) {
- if (childrenReferences == null) {
- super.getChildrenReferences(object);
- childrenReferences.add(Webservice_clientPackage.eINSTANCE.getWebServicesClient_ComponentScopedRefs());
- childrenReferences.add(Webservice_clientPackage.eINSTANCE.getWebServicesClient_ServiceRefs());
- }
- return childrenReferences;
- }
-
- /**
- * <!-- begin-user-doc --> <!-- end-user-doc -->
- *
- * @generated
- */
- @Override
- protected EReference getChildReference(Object object, Object child) {
- // Check the type of the specified child object and return the proper feature to use for
- // adding (see {@link AddCommand}) it as a child.
-
- return super.getChildReference(object, child);
- }
-
-
- /**
- * This returns WebServicesClient.gif. <!-- begin-user-doc --> <!-- end-user-doc -->
- *
- * @generated
- */
- @Override
- public Object getImage(Object object) {
- return getResourceLocator().getImage("full/obj16/WebServicesClient"); //$NON-NLS-1$
- }
-
- /**
- * This returns the label text for the adapted class. <!-- begin-user-doc --> <!-- end-user-doc
- * -->
- *
- * @non-generated
- */
-
- @Override
- public String getText(Object object) {
- //return getString("_UI_WebServicesClient_type");
- return getString("%_UI_WebServicesClient_type"); //$NON-NLS-1$
- }
-
- /**
- * This handles notification by calling {@link #fireNotifyChanged fireNotifyChanged}. <!--
- * begin-user-doc --> <!-- end-user-doc -->
- *
- * @generated
- */
- @Override
- public void notifyChanged(Notification notification) {
- switch (notification.getFeatureID(WebServicesClient.class)) {
- case Webservice_clientPackage.WEB_SERVICES_CLIENT__COMPONENT_SCOPED_REFS :
- case Webservice_clientPackage.WEB_SERVICES_CLIENT__SERVICE_REFS : {
- fireNotifyChanged(notification);
- return;
- }
- }
- super.notifyChanged(notification);
- }
-
- /**
- * This adds to the collection of {@link org.eclipse.emf.edit.command.CommandParameter}s
- * describing all of the children that can be created under this object. <!-- begin-user-doc -->
- * <!-- end-user-doc -->
- *
- * @generated
- */
- @Override
- protected void collectNewChildDescriptors(Collection newChildDescriptors, Object object) {
- super.collectNewChildDescriptors(newChildDescriptors, object);
-
- newChildDescriptors.add(createChildParameter(Webservice_clientPackage.eINSTANCE.getWebServicesClient_ComponentScopedRefs(), Webservice_clientFactory.eINSTANCE.createComponentScopedRefs()));
-
- newChildDescriptors.add(createChildParameter(Webservice_clientPackage.eINSTANCE.getWebServicesClient_ServiceRefs(), Webservice_clientFactory.eINSTANCE.createServiceRef()));
- }
-
- /**
- * Return the resource locator for this item provider's resources. <!-- begin-user-doc --> <!--
- * end-user-doc -->
- */
- @Override
- public ResourceLocator getResourceLocator() {
- return WebServicePlugin.getInstance();
- }
-}
diff --git a/plugins/org.eclipse.jst.j2ee.webservice/webservice/org/eclipse/jst/j2ee/internal/webservice/provider/WebServicesItemProvider.java b/plugins/org.eclipse.jst.j2ee.webservice/webservice/org/eclipse/jst/j2ee/internal/webservice/provider/WebServicesItemProvider.java
deleted file mode 100644
index 43918d2..0000000
--- a/plugins/org.eclipse.jst.j2ee.webservice/webservice/org/eclipse/jst/j2ee/internal/webservice/provider/WebServicesItemProvider.java
+++ /dev/null
@@ -1,165 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2003, 2005 IBM Corporation and others.
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
- *
- * Contributors:
- * IBM Corporation - initial API and implementation
- *******************************************************************************/
-package org.eclipse.jst.j2ee.internal.webservice.provider;
-
-
-import java.util.Collection;
-import java.util.List;
-
-import org.eclipse.emf.common.notify.AdapterFactory;
-import org.eclipse.emf.common.notify.Notification;
-import org.eclipse.emf.common.util.ResourceLocator;
-import org.eclipse.jst.j2ee.common.internal.provider.CompatibilityDescriptionGroupItemProvider;
-import org.eclipse.jst.j2ee.internal.webservice.plugin.WebServicePlugin;
-import org.eclipse.jst.j2ee.webservice.wsdd.WebServices;
-import org.eclipse.jst.j2ee.webservice.wsdd.WsddFactory;
-import org.eclipse.jst.j2ee.webservice.wsdd.WsddPackage;
-
-
-/**
- * This is the item provider adpater for a {@link org.eclipse.jst.j2ee.internal.internal.webservice.wsdd.WebServices}
- * object. <!-- begin-user-doc --> <!-- end-user-doc -->
- *
- * @generated
- */
-public class WebServicesItemProvider extends CompatibilityDescriptionGroupItemProvider {
- /**
- * This constructs an instance from a factory and a notifier. <!-- begin-user-doc --> <!--
- * end-user-doc -->
- *
- * @generated
- */
- public WebServicesItemProvider(AdapterFactory adapterFactory) {
- super(adapterFactory);
- }
-
- /**
- * This returns the property descriptors for the adapted class. <!-- begin-user-doc --> <!--
- * end-user-doc -->
- *
- * @generated
- */
- @Override
- public List getPropertyDescriptors(Object object) {
- if (itemPropertyDescriptors == null) {
- super.getPropertyDescriptors(object);
-
- }
- return itemPropertyDescriptors;
- }
-
- /**
- * This adds a property descriptor for the Id feature. <!-- begin-user-doc --> <!-- end-user-doc
- * -->
- *
- * @generated
- */
- /*
- * pgm protected void addIdPropertyDescriptor(Object object) { itemPropertyDescriptors.add (new
- * ItemPropertyDescriptor (((ComposeableAdapterFactory)adapterFactory).getRootAdapterFactory(),
- * getString("_UI_WebServices_id_feature"), getString("_UI_PropertyDescriptor_description",
- * "_UI_WebServices_id_feature", "_UI_WebServices_type"),
- * WsddPackage.eINSTANCE.getWebServices_Id(), true,
- * ItemPropertyDescriptor.GENERIC_VALUE_IMAGE)); }
- */
-
- /**
- * This specifies how to implement {@link #getChildren}and
- * {@link org.eclipse.emf.edit.command.AddCommand}and
- * {@link org.eclipse.emf.edit.command.RemoveCommand}support in {@link #createCommand}. <!--
- * begin-user-doc --> <!-- end-user-doc -->
- *
- * @generated
- */
- @Override
- public Collection getChildrenReferences(Object object) {
- if (childrenReferences == null) {
- super.getChildrenReferences(object);
- childrenReferences.add(WsddPackage.eINSTANCE.getWebServices_WebServiceDescriptions());
- }
- return childrenReferences;
- }
-
-
- /**
- * This returns WebServices.gif. <!-- begin-user-doc --> <!-- end-user-doc -->
- *
- * @generated
- */
- @Override
- public Object getImage(Object object) {
- return getResourceLocator().getImage("full/obj16/WebServices"); //$NON-NLS-1$
- }
-
- /**
- * This returns the label text for the adapted class. <!-- begin-user-doc --> <!-- end-user-doc
- * -->
- *
- * @generated
- */
- /*
- * public String getText(Object object) { String label = ((WebServices)object).getDisplayName();
- * return label == null || label.length() == 0 ? getString("_UI_WebServices_type") :
- * getString("_UI_WebServices_type") + " " + label; }
- */
-
- /**
- * This returns the label text for the adapted class. <!-- begin-user-doc --> <!-- end-user-doc
- * -->
- *
- * @non-generated
- */
- @Override
- public String getText(Object object) {
- String label = ((WebServices) object).getDisplayName();
- return label == null || label.length() == 0 ? getString("%_UI_WebServices_type") : label; //$NON-NLS-1$
- }
-
- /**
- * This handles notification by calling {@link #fireNotifyChanged fireNotifyChanged}. <!--
- * begin-user-doc --> <!-- end-user-doc -->
- *
- * @generated
- */
- @Override
- public void notifyChanged(Notification notification) {
- switch (notification.getFeatureID(WebServices.class)) {
- case WsddPackage.WEB_SERVICES__WEB_SERVICE_DESCRIPTIONS : {
- fireNotifyChanged(notification);
- return;
- }
- }
- super.notifyChanged(notification);
- }
-
- /**
- * This adds to the collection of {@link org.eclipse.emf.edit.command.CommandParameter}s
- * describing all of the children that can be created under this object. <!-- begin-user-doc -->
- * <!-- end-user-doc -->
- *
- * @generated
- */
- @Override
- protected void collectNewChildDescriptors(Collection newChildDescriptors, Object object) {
- super.collectNewChildDescriptors(newChildDescriptors, object);
-
- newChildDescriptors.add(createChildParameter(WsddPackage.eINSTANCE.getWebServices_WebServiceDescriptions(), WsddFactory.eINSTANCE.createWebServiceDescription()));
- }
-
- /**
- * Return the resource locator for this item provider's resources. <!-- begin-user-doc --> <!--
- * end-user-doc -->
- */
- @Override
- public ResourceLocator getResourceLocator() {
- return WebServicePlugin.getInstance();
- }
-}
diff --git a/plugins/org.eclipse.jst.j2ee.webservice/webservice/org/eclipse/jst/j2ee/internal/webservice/provider/Webservice_clientEditorItemProviderFactory.java b/plugins/org.eclipse.jst.j2ee.webservice/webservice/org/eclipse/jst/j2ee/internal/webservice/provider/Webservice_clientEditorItemProviderFactory.java
deleted file mode 100644
index 633f5ca..0000000
--- a/plugins/org.eclipse.jst.j2ee.webservice/webservice/org/eclipse/jst/j2ee/internal/webservice/provider/Webservice_clientEditorItemProviderFactory.java
+++ /dev/null
@@ -1,48 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2003, 2004 IBM Corporation and others.
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
- *
- * Contributors:
- * IBM Corporation - initial API and implementation
- *******************************************************************************/
-/*
- * Created on Mar 26, 2004
- *
- * To change the template for this generated file go to
- * Window - Preferences - Java - Code Generation - Code and Comments
- */
-package org.eclipse.jst.j2ee.internal.webservice.provider;
-
-import org.eclipse.emf.common.notify.Adapter;
-
-/**
- * @author cbridgha
- *
- * To change the template for this generated type comment go to Window - Preferences - Java - Code
- * Generation - Code and Comments
- */
-public class Webservice_clientEditorItemProviderFactory extends Webservice_clientItemProviderAdapterFactory {
- /**
- *
- */
- public Webservice_clientEditorItemProviderFactory() {
- super();
- }
-
- /*
- * (non-Javadoc)
- *
- * @see org.eclipse.jst.j2ee.internal.internal.webservice.wsclient.util.Webservice_clientAdapterFactory#createServiceRefAdapter()
- */
- @Override
- public Adapter createServiceRefAdapter() {
- if (serviceRefItemProvider == null) {
- serviceRefItemProvider = new ServiceRefEditorItemProvider(this);
- }
-
- return serviceRefItemProvider;
- }
-}
\ No newline at end of file
diff --git a/plugins/org.eclipse.jst.j2ee.webservice/webservice/org/eclipse/jst/j2ee/internal/webservice/provider/Webservice_clientItemProviderAdapterFactory.java b/plugins/org.eclipse.jst.j2ee.webservice/webservice/org/eclipse/jst/j2ee/internal/webservice/provider/Webservice_clientItemProviderAdapterFactory.java
deleted file mode 100644
index e206045..0000000
--- a/plugins/org.eclipse.jst.j2ee.webservice/webservice/org/eclipse/jst/j2ee/internal/webservice/provider/Webservice_clientItemProviderAdapterFactory.java
+++ /dev/null
@@ -1,287 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2003, 2005 IBM Corporation and others.
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
- *
- * Contributors:
- * IBM Corporation - initial API and implementation
- *******************************************************************************/
-package org.eclipse.jst.j2ee.internal.webservice.provider;
-
-import java.util.ArrayList;
-import java.util.Collection;
-
-import org.eclipse.emf.common.notify.Adapter;
-import org.eclipse.emf.common.notify.Notification;
-import org.eclipse.emf.common.notify.Notifier;
-import org.eclipse.emf.edit.provider.ChangeNotifier;
-import org.eclipse.emf.edit.provider.ComposeableAdapterFactory;
-import org.eclipse.emf.edit.provider.ComposedAdapterFactory;
-import org.eclipse.emf.edit.provider.IChangeNotifier;
-import org.eclipse.emf.edit.provider.IEditingDomainItemProvider;
-import org.eclipse.emf.edit.provider.IItemLabelProvider;
-import org.eclipse.emf.edit.provider.IItemPropertySource;
-import org.eclipse.emf.edit.provider.INotifyChangedListener;
-import org.eclipse.emf.edit.provider.IStructuredItemContentProvider;
-import org.eclipse.emf.edit.provider.ITreeItemContentProvider;
-import org.eclipse.jst.j2ee.webservice.wsclient.internal.util.Webservice_clientAdapterFactory;
-
-
-/**
- * This is the factory that is used to provide the interfaces needed to support Viewers. The
- * adapters generated by this factory convert EMF adapter notifications into calls to
- * {@link #fireNotifyChanged fireNotifyChanged}. The adapters also support Eclipse property sheets.
- * Note that most of the adapters are shared among multiple instances. <!-- begin-user-doc --> <!--
- * end-user-doc -->
- *
- * @generated
- */
-public class Webservice_clientItemProviderAdapterFactory extends Webservice_clientAdapterFactory implements ComposeableAdapterFactory, IChangeNotifier {
- /**
- * This keeps track of the root adapter factory that delegates to this adapter factory. <!--
- * begin-user-doc --> <!-- end-user-doc -->
- *
- * @generated
- */
- protected ComposedAdapterFactory parentAdapterFactory;
-
- /**
- * This is used to implement {@link org.eclipse.emf.edit.provider.IChangeNotifier}. <!--
- * begin-user-doc --> <!-- end-user-doc -->
- *
- * @generated
- */
- protected IChangeNotifier changeNotifier = new ChangeNotifier();
-
- /**
- * This keeps track of all the supported types checked by
- * {@link #isFactoryForType isFactoryForType}. <!-- begin-user-doc --> <!-- end-user-doc -->
- *
- * @generated
- */
- protected Collection supportedTypes = new ArrayList();
-
- /**
- * This constructs an instance. <!-- begin-user-doc --> <!-- end-user-doc -->
- *
- * @generated
- */
- public Webservice_clientItemProviderAdapterFactory() {
- supportedTypes.add(IStructuredItemContentProvider.class);
- supportedTypes.add(ITreeItemContentProvider.class);
- supportedTypes.add(IItemPropertySource.class);
- supportedTypes.add(IEditingDomainItemProvider.class);
- supportedTypes.add(IItemLabelProvider.class);
- }
-
- /**
- * This keeps track of the one adapter used for all {@link com.ibm.etools.wsclient.ServiceRef}
- * instances. <!-- begin-user-doc --> <!-- end-user-doc -->
- *
- * @generated
- */
- protected ServiceRefItemProvider serviceRefItemProvider;
-
- /**
- * This creates an adapter for a {@link com.ibm.etools.wsclient.ServiceRef}. <!--
- * begin-user-doc --> <!-- end-user-doc -->
- *
- * @generated
- */
- @Override
- public Adapter createServiceRefAdapter() {
- if (serviceRefItemProvider == null) {
- serviceRefItemProvider = new ServiceRefItemProvider(this);
- }
-
- return serviceRefItemProvider;
- }
-
- /**
- * This keeps track of the one adapter used for all
- * {@link com.ibm.etools.wsclient.PortComponentRef}instances. <!-- begin-user-doc --> <!--
- * end-user-doc -->
- *
- * @generated
- */
- protected PortComponentRefItemProvider portComponentRefItemProvider;
-
- /**
- * This creates an adapter for a {@link com.ibm.etools.wsclient.PortComponentRef}. <!--
- * begin-user-doc --> <!-- end-user-doc -->
- *
- * @generated
- */
- @Override
- public Adapter createPortComponentRefAdapter() {
- if (portComponentRefItemProvider == null) {
- portComponentRefItemProvider = new PortComponentRefItemProvider(this);
- }
-
- return portComponentRefItemProvider;
- }
-
- /**
- * This keeps track of the one adapter used for all {@link com.ibm.etools.wsclient.Handler}
- * instances. <!-- begin-user-doc --> <!-- end-user-doc -->
- *
- * @generated
- */
- protected HandlerItemProvider handlerItemProvider;
-
- /**
- * This creates an adapter for a {@link com.ibm.etools.wsclient.Handler}. <!-- begin-user-doc
- * --> <!-- end-user-doc -->
- *
- * @generated
- */
- @Override
- public Adapter createHandlerAdapter() {
- if (handlerItemProvider == null) {
- handlerItemProvider = new HandlerItemProvider(this);
- }
-
- return handlerItemProvider;
- }
-
- /**
- * This keeps track of the one adapter used for all
- * {@link com.ibm.etools.wsclient.WebServicesClient}instances. <!-- begin-user-doc --> <!--
- * end-user-doc -->
- *
- * @generated
- */
- protected WebServicesClientItemProvider webServicesClientItemProvider;
-
- /**
- * This creates an adapter for a {@link com.ibm.etools.wsclient.WebServicesClient}. <!--
- * begin-user-doc --> <!-- end-user-doc -->
- *
- * @generated
- */
- @Override
- public Adapter createWebServicesClientAdapter() {
- if (webServicesClientItemProvider == null) {
- webServicesClientItemProvider = new WebServicesClientItemProvider(this);
- }
-
- return webServicesClientItemProvider;
- }
-
- /**
- * This keeps track of the one adapter used for all
- * {@link com.ibm.etools.wsclient.ComponentScopedRefs}instances. <!-- begin-user-doc --> <!--
- * end-user-doc -->
- *
- * @generated
- */
- protected ComponentScopedRefsItemProvider componentScopedRefsItemProvider;
-
- /**
- * This creates an adapter for a {@link com.ibm.etools.wsclient.ComponentScopedRefs}. <!--
- * begin-user-doc --> <!-- end-user-doc -->
- *
- * @generated
- */
- @Override
- public Adapter createComponentScopedRefsAdapter() {
- if (componentScopedRefsItemProvider == null) {
- componentScopedRefsItemProvider = new ComponentScopedRefsItemProvider(this);
- }
-
- return componentScopedRefsItemProvider;
- }
-
- /**
- * This returns the root adapter factory that contains this factory. <!-- begin-user-doc -->
- * <!-- end-user-doc -->
- *
- * @generated
- */
- public ComposeableAdapterFactory getRootAdapterFactory() {
- return parentAdapterFactory == null ? this : parentAdapterFactory.getRootAdapterFactory();
- }
-
- /**
- * This sets the composed adapter factory that contains this factory. <!-- begin-user-doc -->
- * <!-- end-user-doc -->
- *
- * @generated
- */
- public void setParentAdapterFactory(ComposedAdapterFactory parentAdapterFactory) {
- this.parentAdapterFactory = parentAdapterFactory;
- }
-
- /**
- * <!-- begin-user-doc --> <!-- end-user-doc -->
- *
- * @generated
- */
- @Override
- public boolean isFactoryForType(Object type) {
- return supportedTypes.contains(type) || super.isFactoryForType(type);
- }
-
- /**
- * This implementation substitutes the factory itself as the key for the adapter. <!--
- * begin-user-doc --> <!-- end-user-doc -->
- *
- * @generated
- */
- @Override
- public Adapter adapt(Notifier notifier, Object type) {
- return super.adapt(notifier, this);
- }
-
- /**
- * <!-- begin-user-doc --> <!-- end-user-doc -->
- *
- * @generated
- */
- @Override
- public Object adapt(Object object, Object type) {
- if (isFactoryForType(type)) {
- Object adapter = super.adapt(object, type);
- if (!(type instanceof Class) || (((Class) type).isInstance(adapter))) {
- return adapter;
- }
- }
-
- return null;
- }
-
- /**
- * This adds a listener. <!-- begin-user-doc --> <!-- end-user-doc -->
- *
- * @generated
- */
- public void addListener(INotifyChangedListener notifyChangedListener) {
- changeNotifier.addListener(notifyChangedListener);
- }
-
- /**
- * This removes a listener. <!-- begin-user-doc --> <!-- end-user-doc -->
- *
- * @generated
- */
- public void removeListener(INotifyChangedListener notifyChangedListener) {
- changeNotifier.removeListener(notifyChangedListener);
- }
-
- /**
- * This delegates to {@link #changeNotifier}and to {@link #parentAdapterFactory}. <!--
- * begin-user-doc --> <!-- end-user-doc -->
- *
- * @generated
- */
- public void fireNotifyChanged(Notification notification) {
- changeNotifier.fireNotifyChanged(notification);
-
- if (parentAdapterFactory != null) {
- parentAdapterFactory.fireNotifyChanged(notification);
- }
- }
-
-}
diff --git a/plugins/org.eclipse.jst.j2ee.webservice/webservice/org/eclipse/jst/j2ee/internal/webservice/provider/Webservicej2eeEditPlugin.java b/plugins/org.eclipse.jst.j2ee.webservice/webservice/org/eclipse/jst/j2ee/internal/webservice/provider/Webservicej2eeEditPlugin.java
deleted file mode 100644
index 795ed26..0000000
--- a/plugins/org.eclipse.jst.j2ee.webservice/webservice/org/eclipse/jst/j2ee/internal/webservice/provider/Webservicej2eeEditPlugin.java
+++ /dev/null
@@ -1,92 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2003, 2004 IBM Corporation and others.
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
- *
- * Contributors:
- * IBM Corporation - initial API and implementation
- *******************************************************************************/
-package org.eclipse.jst.j2ee.internal.webservice.provider;
-
-import org.eclipse.core.runtime.IPluginDescriptor;
-import org.eclipse.emf.common.EMFPlugin;
-import org.eclipse.emf.common.util.ResourceLocator;
-
-/**
- * This is the central singleton for the Webservice-j2ee edit plugin. <!-- begin-user-doc --> <!--
- * end-user-doc -->
- *
- * @generated
- */
-public final class Webservicej2eeEditPlugin extends EMFPlugin {
- /**
- * Keep track of the singleton. <!-- begin-user-doc --> <!-- end-user-doc -->
- *
- * @generated
- */
- public static final Webservicej2eeEditPlugin INSTANCE = new Webservicej2eeEditPlugin();
-
- /**
- * Keep track of the singleton. <!-- begin-user-doc --> <!-- end-user-doc -->
- *
- * @generated
- */
- private static Implementation plugin;
-
- /**
- * Create the instance. <!-- begin-user-doc --> <!-- end-user-doc -->
- *
- * @generated
- */
- public Webservicej2eeEditPlugin() {
- super(new ResourceLocator[]{});
- }
-
- /**
- * Returns the singleton instance of the Eclipse plugin. <!-- begin-user-doc --> <!--
- * end-user-doc -->
- *
- * @return the singleton instance.
- * @generated
- */
- @Override
- public ResourceLocator getPluginResourceLocator() {
- return plugin;
- }
-
- /**
- * Returns the singleton instance of the Eclipse plugin. <!-- begin-user-doc --> <!--
- * end-user-doc -->
- *
- * @return the singleton instance.
- * @generated
- */
- public static Implementation getPlugin() {
- return plugin;
- }
-
- /**
- * The actual implementation of the Eclipse <b>Plugin </b>. <!-- begin-user-doc --> <!--
- * end-user-doc -->
- *
- * @generated
- */
- public static class Implementation extends EclipsePlugin {
- /**
- * Creates an instance. <!-- begin-user-doc --> <!-- end-user-doc -->
- *
- * @param descriptor
- * the description of the plugin.
- * @generated
- */
- public Implementation(IPluginDescriptor descriptor) {
- super(descriptor);
-
- // Remember the static instance.
- //
- plugin = this;
- }
- }
-}
\ No newline at end of file
diff --git a/plugins/org.eclipse.jst.j2ee.webservice/webservice/org/eclipse/jst/j2ee/internal/webservice/provider/WscommonItemProviderAdapterFactory.java b/plugins/org.eclipse.jst.j2ee.webservice/webservice/org/eclipse/jst/j2ee/internal/webservice/provider/WscommonItemProviderAdapterFactory.java
deleted file mode 100644
index 6f17cb0..0000000
--- a/plugins/org.eclipse.jst.j2ee.webservice/webservice/org/eclipse/jst/j2ee/internal/webservice/provider/WscommonItemProviderAdapterFactory.java
+++ /dev/null
@@ -1,316 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2003, 2005 IBM Corporation and others.
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
- *
- * Contributors:
- * IBM Corporation - initial API and implementation
- *******************************************************************************/
-package org.eclipse.jst.j2ee.internal.webservice.provider;
-
-import java.util.ArrayList;
-import java.util.Collection;
-
-import org.eclipse.emf.common.notify.Adapter;
-import org.eclipse.emf.common.notify.Notification;
-import org.eclipse.emf.common.notify.Notifier;
-import org.eclipse.emf.edit.provider.ChangeNotifier;
-import org.eclipse.emf.edit.provider.ComposeableAdapterFactory;
-import org.eclipse.emf.edit.provider.ComposedAdapterFactory;
-import org.eclipse.emf.edit.provider.IChangeNotifier;
-import org.eclipse.emf.edit.provider.IEditingDomainItemProvider;
-import org.eclipse.emf.edit.provider.IItemLabelProvider;
-import org.eclipse.emf.edit.provider.IItemPropertySource;
-import org.eclipse.emf.edit.provider.INotifyChangedListener;
-import org.eclipse.emf.edit.provider.IStructuredItemContentProvider;
-import org.eclipse.emf.edit.provider.ITableItemLabelProvider;
-import org.eclipse.emf.edit.provider.ITreeItemContentProvider;
-import org.eclipse.jst.j2ee.webservice.wscommon.internal.util.WscommonAdapterFactory;
-
-
-
-/**
- * This is the factory that is used to provide the interfaces needed to support Viewers. The
- * adapters generated by this factory convert EMF adapter notifications into calls to
- * {@link #fireNotifyChanged fireNotifyChanged}. The adapters also support Eclipse property sheets.
- * Note that most of the adapters are shared among multiple instances. <!-- begin-user-doc --> <!--
- * end-user-doc -->
- *
- * @generated
- */
-public class WscommonItemProviderAdapterFactory extends WscommonAdapterFactory implements ComposeableAdapterFactory, IChangeNotifier {
- /**
- * This keeps track of the root adapter factory that delegates to this adapter factory. <!--
- * begin-user-doc --> <!-- end-user-doc -->
- *
- * @generated
- */
- protected ComposedAdapterFactory parentAdapterFactory;
-
- /**
- * This is used to implement {@link org.eclipse.emf.edit.provider.IChangeNotifier}. <!--
- * begin-user-doc --> <!-- end-user-doc -->
- *
- * @generated
- */
- protected IChangeNotifier changeNotifier = new ChangeNotifier();
-
- /**
- * This keeps track of all the supported types checked by
- * {@link #isFactoryForType isFactoryForType}. <!-- begin-user-doc --> <!-- end-user-doc -->
- *
- * @generated
- */
- protected Collection supportedTypes = new ArrayList();
-
- /**
- * This constructs an instance. <!-- begin-user-doc --> <!-- end-user-doc -->
- *
- * @generated
- */
- public WscommonItemProviderAdapterFactory() {
- supportedTypes.add(IStructuredItemContentProvider.class);
- supportedTypes.add(ITreeItemContentProvider.class);
- supportedTypes.add(IItemPropertySource.class);
- supportedTypes.add(IEditingDomainItemProvider.class);
- supportedTypes.add(IItemLabelProvider.class);
- supportedTypes.add(ITableItemLabelProvider.class);
- }
-
- /**
- * This keeps track of the one adapter used for all
- * {@link org.eclipse.jst.j2ee.internal.internal.webservice.wscommon.InitParam}instances. <!-- begin-user-doc --> <!--
- * end-user-doc -->
- *
- * @generated
- */
- protected InitParamItemProvider initParamItemProvider;
-
- /**
- * This creates an adapter for a {@link org.eclipse.jst.j2ee.internal.internal.webservice.wscommon.InitParam}. <!--
- * begin-user-doc --> <!-- end-user-doc -->
- *
- * @generated
- */
- @Override
- public Adapter createInitParamAdapter() {
- if (initParamItemProvider == null) {
- initParamItemProvider = new InitParamItemProvider(this);
- }
-
- return initParamItemProvider;
- }
-
- /**
- * This keeps track of the one adapter used for all
- * {@link org.eclipse.jst.j2ee.internal.internal.webservice.wscommon.SOAPHeader}instances. <!-- begin-user-doc --> <!--
- * end-user-doc -->
- *
- * @generated
- */
- protected SOAPHeaderItemProvider soapHeaderItemProvider;
-
- /**
- * This creates an adapter for a {@link org.eclipse.jst.j2ee.internal.internal.webservice.wscommon.SOAPHeader}. <!--
- * begin-user-doc --> <!-- end-user-doc -->
- *
- * @generated
- */
- @Override
- public Adapter createSOAPHeaderAdapter() {
- if (soapHeaderItemProvider == null) {
- soapHeaderItemProvider = new SOAPHeaderItemProvider(this);
- }
-
- return soapHeaderItemProvider;
- }
-
- /**
- * This keeps track of the one adapter used for all
- * {@link org.eclipse.jst.j2ee.internal.internal.webservice.wscommon.SOAPRole}instances. <!-- begin-user-doc --> <!--
- * end-user-doc -->
- *
- * @generated
- */
- protected SOAPRoleItemProvider soapRoleItemProvider;
-
- /**
- * This creates an adapter for a {@link org.eclipse.jst.j2ee.internal.internal.webservice.wscommon.SOAPRole}. <!--
- * begin-user-doc --> <!-- end-user-doc -->
- *
- * @generated
- */
- @Override
- public Adapter createSOAPRoleAdapter() {
- if (soapRoleItemProvider == null) {
- soapRoleItemProvider = new SOAPRoleItemProvider(this);
- }
-
- return soapRoleItemProvider;
- }
-
- /**
- * This keeps track of the one adapter used for all
- * {@link org.eclipse.jst.j2ee.internal.internal.webservice.wscommon.PortName}instances. <!-- begin-user-doc --> <!--
- * end-user-doc -->
- *
- * @generated
- */
- protected PortNameItemProvider portNameItemProvider;
-
- /**
- * This creates an adapter for a {@link org.eclipse.jst.j2ee.internal.internal.webservice.wscommon.PortName}. <!--
- * begin-user-doc --> <!-- end-user-doc -->
- *
- * @generated
- */
- @Override
- public Adapter createPortNameAdapter() {
- if (portNameItemProvider == null) {
- portNameItemProvider = new PortNameItemProvider(this);
- }
-
- return portNameItemProvider;
- }
-
- /**
- * This keeps track of the one adapter used for all
- * {@link org.eclipse.jst.j2ee.internal.internal.webservice.wscommon.DescriptionType}instances. <!-- begin-user-doc -->
- * <!-- end-user-doc -->
- *
- * @generated
- */
- protected DescriptionTypeItemProvider descriptionTypeItemProvider;
-
- /**
- * This creates an adapter for a {@link org.eclipse.jst.j2ee.internal.internal.webservice.wscommon.DescriptionType}.
- * <!-- begin-user-doc --> <!-- end-user-doc -->
- *
- * @generated
- */
- @Override
- public Adapter createDescriptionTypeAdapter() {
- if (descriptionTypeItemProvider == null) {
- descriptionTypeItemProvider = new DescriptionTypeItemProvider(this);
- }
-
- return descriptionTypeItemProvider;
- }
-
- /**
- * This keeps track of the one adapter used for all
- * {@link org.eclipse.jst.j2ee.internal.internal.webservice.wscommon.DisplayNameType}instances. <!-- begin-user-doc -->
- * <!-- end-user-doc -->
- *
- * @generated
- */
- protected DisplayNameTypeItemProvider displayNameTypeItemProvider;
-
- /**
- * This creates an adapter for a {@link org.eclipse.jst.j2ee.internal.internal.webservice.wscommon.DisplayNameType}.
- * <!-- begin-user-doc --> <!-- end-user-doc -->
- *
- * @generated
- */
- @Override
- public Adapter createDisplayNameTypeAdapter() {
- if (displayNameTypeItemProvider == null) {
- displayNameTypeItemProvider = new DisplayNameTypeItemProvider(this);
- }
-
- return displayNameTypeItemProvider;
- }
-
- /**
- * This returns the root adapter factory that contains this factory. <!-- begin-user-doc -->
- * <!-- end-user-doc -->
- *
- * @generated
- */
- public ComposeableAdapterFactory getRootAdapterFactory() {
- return parentAdapterFactory == null ? this : parentAdapterFactory.getRootAdapterFactory();
- }
-
- /**
- * This sets the composed adapter factory that contains this factory. <!-- begin-user-doc -->
- * <!-- end-user-doc -->
- *
- * @generated
- */
- public void setParentAdapterFactory(ComposedAdapterFactory parentAdapterFactory) {
- this.parentAdapterFactory = parentAdapterFactory;
- }
-
- /**
- * <!-- begin-user-doc --> <!-- end-user-doc -->
- *
- * @generated
- */
- @Override
- public boolean isFactoryForType(Object type) {
- return supportedTypes.contains(type) || super.isFactoryForType(type);
- }
-
- /**
- * This implementation substitutes the factory itself as the key for the adapter. <!--
- * begin-user-doc --> <!-- end-user-doc -->
- *
- * @generated
- */
- @Override
- public Adapter adapt(Notifier notifier, Object type) {
- return super.adapt(notifier, this);
- }
-
- /**
- * <!-- begin-user-doc --> <!-- end-user-doc -->
- *
- * @generated
- */
- @Override
- public Object adapt(Object object, Object type) {
- if (isFactoryForType(type)) {
- Object adapter = super.adapt(object, type);
- if (!(type instanceof Class) || (((Class) type).isInstance(adapter))) {
- return adapter;
- }
- }
-
- return null;
- }
-
- /**
- * This adds a listener. <!-- begin-user-doc --> <!-- end-user-doc -->
- *
- * @generated
- */
- public void addListener(INotifyChangedListener notifyChangedListener) {
- changeNotifier.addListener(notifyChangedListener);
- }
-
- /**
- * This removes a listener. <!-- begin-user-doc --> <!-- end-user-doc -->
- *
- * @generated
- */
- public void removeListener(INotifyChangedListener notifyChangedListener) {
- changeNotifier.removeListener(notifyChangedListener);
- }
-
- /**
- * This delegates to {@link #changeNotifier}and to {@link #parentAdapterFactory}. <!--
- * begin-user-doc --> <!-- end-user-doc -->
- *
- * @generated
- */
- public void fireNotifyChanged(Notification notification) {
- changeNotifier.fireNotifyChanged(notification);
-
- if (parentAdapterFactory != null) {
- parentAdapterFactory.fireNotifyChanged(notification);
- }
- }
-
-}
diff --git a/plugins/org.eclipse.jst.j2ee.webservice/webservice/org/eclipse/jst/j2ee/internal/webservice/provider/WsddItemProviderAdapterFactory.java b/plugins/org.eclipse.jst.j2ee.webservice/webservice/org/eclipse/jst/j2ee/internal/webservice/provider/WsddItemProviderAdapterFactory.java
deleted file mode 100644
index 0a72bc8..0000000
--- a/plugins/org.eclipse.jst.j2ee.webservice/webservice/org/eclipse/jst/j2ee/internal/webservice/provider/WsddItemProviderAdapterFactory.java
+++ /dev/null
@@ -1,386 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2003, 2005 IBM Corporation and others.
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
- *
- * Contributors:
- * IBM Corporation - initial API and implementation
- *******************************************************************************/
-package org.eclipse.jst.j2ee.internal.webservice.provider;
-
-import java.util.ArrayList;
-import java.util.Collection;
-
-import org.eclipse.emf.common.notify.Adapter;
-import org.eclipse.emf.common.notify.Notification;
-import org.eclipse.emf.common.notify.Notifier;
-import org.eclipse.emf.edit.provider.ChangeNotifier;
-import org.eclipse.emf.edit.provider.ComposeableAdapterFactory;
-import org.eclipse.emf.edit.provider.ComposedAdapterFactory;
-import org.eclipse.emf.edit.provider.IChangeNotifier;
-import org.eclipse.emf.edit.provider.IEditingDomainItemProvider;
-import org.eclipse.emf.edit.provider.IItemLabelProvider;
-import org.eclipse.emf.edit.provider.IItemPropertySource;
-import org.eclipse.emf.edit.provider.INotifyChangedListener;
-import org.eclipse.emf.edit.provider.IStructuredItemContentProvider;
-import org.eclipse.emf.edit.provider.ITreeItemContentProvider;
-import org.eclipse.jst.j2ee.internal.wsdd.provider.HandlerItemProvider;
-import org.eclipse.jst.j2ee.webservice.wsdd.internal.util.WsddAdapterFactory;
-
-
-/**
- * This is the factory that is used to provide the interfaces needed to support Viewers. The
- * adapters generated by this factory convert EMF adapter notifications into calls to
- * {@link #fireNotifyChanged fireNotifyChanged}. The adapters also support Eclipse property sheets.
- * Note that most of the adapters are shared among multiple instances. <!-- begin-user-doc --> <!--
- * end-user-doc -->
- *
- * @generated
- */
-public class WsddItemProviderAdapterFactory extends WsddAdapterFactory implements ComposeableAdapterFactory, IChangeNotifier {
- /**
- * This keeps track of the root adapter factory that delegates to this adapter factory. <!--
- * begin-user-doc --> <!-- end-user-doc -->
- *
- * @generated
- */
- protected ComposedAdapterFactory parentAdapterFactory;
-
- /**
- * This is used to implement {@link org.eclipse.emf.edit.provider.IChangeNotifier}. <!--
- * begin-user-doc --> <!-- end-user-doc -->
- *
- * @generated
- */
- protected IChangeNotifier changeNotifier = new ChangeNotifier();
-
- /**
- * This keeps track of all the supported types checked by
- * {@link #isFactoryForType isFactoryForType}. <!-- begin-user-doc --> <!-- end-user-doc -->
- *
- * @generated
- */
- protected Collection supportedTypes = new ArrayList();
-
- /**
- * This constructs an instance. <!-- begin-user-doc --> <!-- end-user-doc -->
- *
- * @generated
- */
- public WsddItemProviderAdapterFactory() {
- supportedTypes.add(IStructuredItemContentProvider.class);
- supportedTypes.add(ITreeItemContentProvider.class);
- supportedTypes.add(IItemPropertySource.class);
- supportedTypes.add(IEditingDomainItemProvider.class);
- supportedTypes.add(IItemLabelProvider.class);
- }
-
- /**
- * This keeps track of the one adapter used for all
- * {@link org.eclipse.jst.j2ee.internal.internal.webservice.wsdd.WebServices}instances. <!-- begin-user-doc --> <!--
- * end-user-doc -->
- *
- * @generated
- */
- protected WebServicesItemProvider webServicesItemProvider;
-
- /**
- * This creates an adapter for a {@link org.eclipse.jst.j2ee.internal.internal.webservice.wsdd.WebServices}. <!--
- * begin-user-doc --> <!-- end-user-doc -->
- *
- * @generated
- */
- @Override
- public Adapter createWebServicesAdapter() {
- if (webServicesItemProvider == null) {
- webServicesItemProvider = new WebServicesItemProvider(this);
- }
-
- return webServicesItemProvider;
- }
-
- /**
- * This keeps track of the one adapter used for all
- * {@link org.eclipse.jst.j2ee.internal.internal.webservice.wsdd.WebServiceDescription}instances. <!-- begin-user-doc
- * --> <!-- end-user-doc -->
- *
- * @generated
- */
- protected WebServiceDescriptionItemProvider webServiceDescriptionItemProvider;
-
- /**
- * This creates an adapter for a {@link org.eclipse.jst.j2ee.internal.internal.webservice.wsdd.WebServiceDescription}.
- * <!-- begin-user-doc --> <!-- end-user-doc -->
- *
- * @generated
- */
- @Override
- public Adapter createWebServiceDescriptionAdapter() {
- if (webServiceDescriptionItemProvider == null) {
- webServiceDescriptionItemProvider = new WebServiceDescriptionItemProvider(this);
- }
-
- return webServiceDescriptionItemProvider;
- }
-
- /**
- * This keeps track of the one adapter used for all
- * {@link org.eclipse.jst.j2ee.internal.internal.webservice.wsdd.PortComponent}instances. <!-- begin-user-doc --> <!--
- * end-user-doc -->
- *
- * @generated
- */
- protected PortComponentItemProvider portComponentItemProvider;
-
- /**
- * This creates an adapter for a {@link org.eclipse.jst.j2ee.internal.internal.webservice.wsdd.PortComponent}. <!--
- * begin-user-doc --> <!-- end-user-doc -->
- *
- * @generated
- */
- @Override
- public Adapter createPortComponentAdapter() {
- if (portComponentItemProvider == null) {
- portComponentItemProvider = new PortComponentItemProvider(this);
- }
-
- return portComponentItemProvider;
- }
-
- /**
- * This keeps track of the one adapter used for all
- * {@link org.eclipse.jst.j2ee.internal.internal.webservice.wsdd.WSDLPort}instances. <!-- begin-user-doc --> <!--
- * end-user-doc -->
- *
- * @generated
- */
- protected WSDLPortItemProvider wsdlPortItemProvider;
-
- /**
- * This creates an adapter for a {@link org.eclipse.jst.j2ee.internal.internal.webservice.wsdd.WSDLPort}. <!--
- * begin-user-doc --> <!-- end-user-doc -->
- *
- * @generated
- */
- @Override
- public Adapter createWSDLPortAdapter() {
- if (wsdlPortItemProvider == null) {
- wsdlPortItemProvider = new WSDLPortItemProvider(this);
- }
-
- return wsdlPortItemProvider;
- }
-
- /**
- * This keeps track of the one adapter used for all
- * {@link org.eclipse.jst.j2ee.internal.internal.webservice.wsdd.ServiceImplBean}instances. <!-- begin-user-doc -->
- * <!-- end-user-doc -->
- *
- * @generated
- */
- protected ServiceImplBeanItemProvider serviceImplBeanItemProvider;
-
- /**
- * This creates an adapter for a {@link org.eclipse.jst.j2ee.internal.internal.webservice.wsdd.ServiceImplBean}. <!--
- * begin-user-doc --> <!-- end-user-doc -->
- *
- * @generated
- */
- @Override
- public Adapter createServiceImplBeanAdapter() {
- if (serviceImplBeanItemProvider == null) {
- serviceImplBeanItemProvider = new ServiceImplBeanItemProvider(this);
- }
-
- return serviceImplBeanItemProvider;
- }
-
- /**
- * This keeps track of the one adapter used for all
- * {@link org.eclipse.jst.j2ee.internal.internal.webservice.wsdd.ServletLink}instances. <!-- begin-user-doc --> <!--
- * end-user-doc -->
- *
- * @generated
- */
- protected ServletLinkItemProvider servletLinkItemProvider;
-
- /**
- * This creates an adapter for a {@link org.eclipse.jst.j2ee.internal.internal.webservice.wsdd.ServletLink}. <!--
- * begin-user-doc --> <!-- end-user-doc -->
- *
- * @generated
- */
- @Override
- public Adapter createServletLinkAdapter() {
- if (servletLinkItemProvider == null) {
- servletLinkItemProvider = new ServletLinkItemProvider(this);
- }
-
- return servletLinkItemProvider;
- }
-
- /**
- * This keeps track of the one adapter used for all
- * {@link org.eclipse.jst.j2ee.internal.internal.webservice.wsdd.EJBLink}instances. <!-- begin-user-doc --> <!--
- * end-user-doc -->
- *
- * @generated
- */
- protected EJBLinkItemProvider ejbLinkItemProvider;
-
- /**
- * This creates an adapter for a {@link org.eclipse.jst.j2ee.internal.internal.webservice.wsdd.EJBLink}. <!--
- * begin-user-doc --> <!-- end-user-doc -->
- *
- * @generated
- */
- @Override
- public Adapter createEJBLinkAdapter() {
- if (ejbLinkItemProvider == null) {
- ejbLinkItemProvider = new EJBLinkItemProvider(this);
- }
-
- return ejbLinkItemProvider;
- }
-
- /**
- * This keeps track of the one adapter used for all
- * {@link org.eclipse.jst.j2ee.internal.internal.webservice.wsdd.Handler}instances. <!-- begin-user-doc --> <!--
- * end-user-doc -->
- *
- * @generated
- */
- protected HandlerItemProvider handlerItemProvider;
-
- /**
- * This creates an adapter for a {@link org.eclipse.jst.j2ee.internal.internal.webservice.wsdd.Handler}. <!--
- * begin-user-doc --> <!-- end-user-doc -->
- *
- * @generated
- */
- @Override
- public Adapter createHandlerAdapter() {
- if (handlerItemProvider == null) {
- handlerItemProvider = new HandlerItemProvider(this);
- }
-
- return handlerItemProvider;
- }
-
- /**
- * This keeps track of the one adapter used for all
- * {@link org.eclipse.jst.j2ee.internal.internal.webservice.wsdd.BeanLink}instances. <!-- begin-user-doc --> <!--
- * end-user-doc -->
- *
- * @generated
- */
- protected BeanLinkItemProvider beanLinkItemProvider;
-
- /**
- * This creates an adapter for a {@link org.eclipse.jst.j2ee.internal.internal.webservice.wsdd.BeanLink}. <!--
- * begin-user-doc --> <!-- end-user-doc -->
- *
- * @generated
- */
- @Override
- public Adapter createBeanLinkAdapter() {
- if (beanLinkItemProvider == null) {
- beanLinkItemProvider = new BeanLinkItemProvider(this);
- }
-
- return beanLinkItemProvider;
- }
-
- /**
- * This returns the root adapter factory that contains this factory. <!-- begin-user-doc -->
- * <!-- end-user-doc -->
- *
- * @generated
- */
- public ComposeableAdapterFactory getRootAdapterFactory() {
- return parentAdapterFactory == null ? this : parentAdapterFactory.getRootAdapterFactory();
- }
-
- /**
- * This sets the composed adapter factory that contains this factory. <!-- begin-user-doc -->
- * <!-- end-user-doc -->
- *
- * @generated
- */
- public void setParentAdapterFactory(ComposedAdapterFactory parentAdapterFactory) {
- this.parentAdapterFactory = parentAdapterFactory;
- }
-
- /**
- * <!-- begin-user-doc --> <!-- end-user-doc -->
- *
- * @generated
- */
- @Override
- public boolean isFactoryForType(Object type) {
- return supportedTypes.contains(type) || super.isFactoryForType(type);
- }
-
- /**
- * This implementation substitutes the factory itself as the key for the adapter. <!--
- * begin-user-doc --> <!-- end-user-doc -->
- *
- * @generated
- */
- @Override
- public Adapter adapt(Notifier notifier, Object type) {
- return super.adapt(notifier, this);
- }
-
- /**
- * <!-- begin-user-doc --> <!-- end-user-doc -->
- *
- * @generated
- */
- @Override
- public Object adapt(Object object, Object type) {
- if (isFactoryForType(type)) {
- Object adapter = super.adapt(object, type);
- if (!(type instanceof Class) || (((Class) type).isInstance(adapter))) {
- return adapter;
- }
- }
-
- return null;
- }
-
- /**
- * This adds a listener. <!-- begin-user-doc --> <!-- end-user-doc -->
- *
- * @generated
- */
- public void addListener(INotifyChangedListener notifyChangedListener) {
- changeNotifier.addListener(notifyChangedListener);
- }
-
- /**
- * This removes a listener. <!-- begin-user-doc --> <!-- end-user-doc -->
- *
- * @generated
- */
- public void removeListener(INotifyChangedListener notifyChangedListener) {
- changeNotifier.removeListener(notifyChangedListener);
- }
-
- /**
- * This delegates to {@link #changeNotifier}and to {@link #parentAdapterFactory}. <!--
- * begin-user-doc --> <!-- end-user-doc -->
- *
- * @generated
- */
- public void fireNotifyChanged(Notification notification) {
- changeNotifier.fireNotifyChanged(notification);
-
- if (parentAdapterFactory != null) {
- parentAdapterFactory.fireNotifyChanged(notification);
- }
- }
-
-}
diff --git a/plugins/org.eclipse.jst.j2ee.webservice/webservice/org/eclipse/jst/j2ee/internal/wsdd/provider/HandlerItemProvider.java b/plugins/org.eclipse.jst.j2ee.webservice/webservice/org/eclipse/jst/j2ee/internal/wsdd/provider/HandlerItemProvider.java
deleted file mode 100644
index da2e3ed..0000000
--- a/plugins/org.eclipse.jst.j2ee.webservice/webservice/org/eclipse/jst/j2ee/internal/wsdd/provider/HandlerItemProvider.java
+++ /dev/null
@@ -1,276 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2003, 2007 IBM Corporation and others.
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
- *
- * Contributors:
- * IBM Corporation - initial API and implementation
- *******************************************************************************/
-package org.eclipse.jst.j2ee.internal.wsdd.provider;
-
-
-import java.util.ArrayList;
-import java.util.Collection;
-import java.util.Iterator;
-import java.util.List;
-
-import org.eclipse.emf.common.notify.AdapterFactory;
-import org.eclipse.emf.common.notify.Notification;
-import org.eclipse.emf.common.util.EList;
-import org.eclipse.emf.common.util.ResourceLocator;
-import org.eclipse.emf.ecore.EObject;
-import org.eclipse.emf.ecore.EReference;
-import org.eclipse.emf.ecore.EStructuralFeature;
-import org.eclipse.emf.edit.provider.ComposeableAdapterFactory;
-import org.eclipse.emf.edit.provider.ITreeItemContentProvider;
-import org.eclipse.emf.edit.provider.ItemPropertyDescriptor;
-import org.eclipse.jst.j2ee.common.internal.provider.CompatibilityDescriptionGroupItemProvider;
-import org.eclipse.jst.j2ee.internal.webservice.adapter.AdapterViewerItem;
-import org.eclipse.jst.j2ee.internal.webservice.plugin.WebServicePlugin;
-import org.eclipse.jst.j2ee.webservice.wscommon.WscommonFactory;
-import org.eclipse.jst.j2ee.webservice.wsdd.Handler;
-import org.eclipse.jst.j2ee.webservice.wsdd.WsddPackage;
-
-/*
- * This class should be merged with HandlerItemProvider in org.eclipse.jst.j2ee.internal.internal.internal.webservice.provider
- * package and all references to this class need to be replaced with HandlerItemProvider in
- * org.eclipse.jst.j2ee.internal.internal.internal.webservice.provider package.
- */
-
-/**
- * This is the item provider adpater for a {@link org.eclipse.jst.j2ee.internal.internal.webservice.wsdd.Handler}object.
- * <!-- begin-user-doc --> <!-- end-user-doc -->
- *
- * @generated
- */
-public class HandlerItemProvider extends CompatibilityDescriptionGroupItemProvider {
- /**
- * This constructs an instance from a factory and a notifier. <!-- begin-user-doc --> <!--
- * end-user-doc -->
- *
- * @generated
- */
- public HandlerItemProvider(AdapterFactory adapterFactory) {
- super(adapterFactory);
- }
-
- /**
- * This returns the property descriptors for the adapted class. <!-- begin-user-doc --> <!--
- * end-user-doc -->
- *
- * @generated
- */
- @Override
- public List getPropertyDescriptors(Object object) {
- if (itemPropertyDescriptors == null) {
- super.getPropertyDescriptors(object);
-
- addHandlerNamePropertyDescriptor(object);
- addHandlerClassPropertyDescriptor(object);
- }
- return itemPropertyDescriptors;
- }
-
- /**
- * This adds a property descriptor for the Id feature. <!-- begin-user-doc --> <!-- end-user-doc
- * -->
- *
- * @generated
- */
- /*
- * pgm protected void addIdPropertyDescriptor(Object object) { itemPropertyDescriptors.add (new
- * ItemPropertyDescriptor (((ComposeableAdapterFactory)adapterFactory).getRootAdapterFactory(),
- * getString("_UI_Handler_id_feature"), getString("_UI_PropertyDescriptor_description",
- * "_UI_Handler_id_feature", "_UI_Handler_type"), WsddPackage.eINSTANCE.getHandler_Id(), true,
- * ItemPropertyDescriptor.GENERIC_VALUE_IMAGE)); }
- */
-
- /**
- * This adds a property descriptor for the Handler Name feature. <!-- begin-user-doc --> <!--
- * end-user-doc -->
- *
- * @generated
- */
- protected void addHandlerNamePropertyDescriptor(Object object) {
- itemPropertyDescriptors.add(new ItemPropertyDescriptor(((ComposeableAdapterFactory) adapterFactory).getRootAdapterFactory(), getString("_UI_Handler_handlerName_feature"), //$NON-NLS-1$
- getString("_UI_PropertyDescriptor_description", "_UI_Handler_handlerName_feature", "_UI_Handler_type"), //$NON-NLS-1$ //$NON-NLS-2$ //$NON-NLS-3$
- WsddPackage.eINSTANCE.getHandler_HandlerName(), true, ItemPropertyDescriptor.GENERIC_VALUE_IMAGE));
- }
-
- /**
- * This adds a property descriptor for the Handler Class feature. <!-- begin-user-doc --> <!--
- * end-user-doc -->
- *
- * @generated
- */
- protected void addHandlerClassPropertyDescriptor(Object object) {
- itemPropertyDescriptors.add(new ItemPropertyDescriptor(((ComposeableAdapterFactory) adapterFactory).getRootAdapterFactory(), getString("_UI_Handler_handlerClass_feature"), //$NON-NLS-1$
- getString("_UI_PropertyDescriptor_description", "_UI_Handler_handlerClass_feature", "_UI_Handler_type"), //$NON-NLS-1$ //$NON-NLS-2$ //$NON-NLS-3$
- WsddPackage.eINSTANCE.getHandler_HandlerClass(), true, ItemPropertyDescriptor.GENERIC_VALUE_IMAGE));
- }
-
- /**
- * This specifies how to implement {@link #getChildren}and
- * {@link org.eclipse.emf.edit.command.AddCommand}and
- * {@link org.eclipse.emf.edit.command.RemoveCommand}support in {@link #createCommand}. <!--
- * begin-user-doc --> <!-- end-user-doc -->
- *
- * @generated
- */
- @Override
- public Collection getChildrenReferences(Object object) {
- if (childrenReferences == null) {
- super.getChildrenReferences(object);
- childrenReferences.add(WsddPackage.eINSTANCE.getHandler_InitParams());
- childrenReferences.add(WsddPackage.eINSTANCE.getHandler_SoapHeaders());
- childrenReferences.add(WsddPackage.eINSTANCE.getHandler_SoapRoles());
- //childrenReferences.add(WsddPackage.eINSTANCE.getHandler_HandlerClass());
- }
- return childrenReferences;
- }
-
- /**
- * <!-- begin-user-doc --> <!-- end-user-doc -->
- *
- * @generated
- */
- @Override
- protected EReference getChildReference(Object object, Object child) {
- // Check the type of the specified child object and return the proper feature to use for
- // adding (see {@link AddCommand}) it as a child.
-
- return super.getChildReference(object, child);
- }
-
-
- /**
- * This returns Handler.gif. <!-- begin-user-doc --> <!-- end-user-doc -->
- *
- * @generated
- */
- /*
- * public Object getImage(Object object) { return
- * getResourceLocator().getImage("full/obj16/Handler"); }
- */
- /**
- * This returns the label text for the adapted class. <!-- begin-user-doc --> <!-- end-user-doc
- * -->
- *
- * @generated
- */
- /*
- * public String getText(Object object) { String label = ((Handler)object).getDisplayName();
- * return label == null || label.length() == 0 ? getString("_UI_Handler_type") :
- * getString("_UI_Handler_type") + " " + label; }
- */
- /**
- * This returns Handler.gif. <!-- begin-user-doc --> <!-- end-user-doc -->
- *
- * @non-generated
- */
- @Override
- public Object getImage(Object object) {
- return getResourceLocator().getImage("icons/obj16/handler.gif"); //$NON-NLS-1$
- }
-
- /**
- * This returns the label text for the adapted class. <!-- begin-user-doc --> <!-- end-user-doc
- * -->
- *
- * @non-generated
- */
- @Override
- public String getText(Object object) {
- String label = ((Handler) object).getHandlerName();
- return label == null || label.length() == 0 ? getString("%_UI_Handler_type") : label; //$NON-NLS-1$
- }
-
- /**
- * This handles notification by calling {@link #fireNotifyChanged fireNotifyChanged}. <!--
- * begin-user-doc --> <!-- end-user-doc -->
- *
- * @generated
- */
- @Override
- public void notifyChanged(Notification notification) {
- switch (notification.getFeatureID(Handler.class)) {
- case WsddPackage.HANDLER__HANDLER_NAME :
- case WsddPackage.HANDLER__HANDLER_CLASS :
- case WsddPackage.HANDLER__INIT_PARAMS :
- case WsddPackage.HANDLER__SOAP_HEADERS :
- case WsddPackage.HANDLER__SOAP_ROLES : {
- fireNotifyChanged(notification);
- return;
- }
- }
- super.notifyChanged(notification);
- }
-
- /**
- * This adds to the collection of {@link org.eclipse.emf.edit.command.CommandParameter}s
- * describing all of the children that can be created under this object. <!-- begin-user-doc -->
- * <!-- end-user-doc -->
- *
- * @generated
- */
- @Override
- protected void collectNewChildDescriptors(Collection newChildDescriptors, Object object) {
- super.collectNewChildDescriptors(newChildDescriptors, object);
-
- newChildDescriptors.add(createChildParameter(WsddPackage.eINSTANCE.getHandler_InitParams(), WscommonFactory.eINSTANCE.createInitParam()));
-
- newChildDescriptors.add(createChildParameter(WsddPackage.eINSTANCE.getHandler_SoapHeaders(), WscommonFactory.eINSTANCE.createSOAPHeader()));
-
- newChildDescriptors.add(createChildParameter(WsddPackage.eINSTANCE.getHandler_SoapRoles(), WscommonFactory.eINSTANCE.createSOAPRole()));
- }
-
- /**
- * Return the resource locator for this item provider's resources. <!-- begin-user-doc --> <!--
- * end-user-doc -->
- */
- @Override
- public ResourceLocator getResourceLocator() {
- return WebServicePlugin.getInstance();
- }
-
- /**
- * This implements
- * {@link ITreeItemContentProvider#getChildren ITreeItemContentProvider.getChildren}by calling
- * {@link #getChildrenReferences getChildrenReferences}and using those to collect the children.
- */
- @Override
- public Collection getChildren(Object object) {
- if (object instanceof EList)
- return getChildrenFromEList((EList) object);
- else if (object instanceof AdapterViewerItem)
- return getChildrenFromAdapterViewerItem((AdapterViewerItem) object);
- else
- return super.getChildren(object);
- }
-
- protected Collection getChildrenFromEList(EList eList) {
- Collection result = new ArrayList();
- for (Iterator it = eList.iterator(); it.hasNext();)
- result.addAll(super.getChildren(it.next()));
- return result;
- }
-
- protected Collection getChildrenFromAdapterViewerItem(AdapterViewerItem adapterViewerItem) {
- Collection result = new ArrayList();
- EList eObjectList = adapterViewerItem.getEObjectList();
- EStructuralFeature feature = adapterViewerItem.getEStructuralFeature();
- for (Iterator it = eObjectList.iterator(); it.hasNext();) {
- EObject eObject = (EObject) it.next();
- Object object = eObject.eGet(feature);
- if (object != null) {
- if (object instanceof List)
- result.addAll((List) object);
- else
- result.add(object);
- }
- }
- return result;
- }
-}
diff --git a/plugins/org.eclipse.jst.jee.ui/.classpath b/plugins/org.eclipse.jst.jee.ui/.classpath
deleted file mode 100644
index 304e861..0000000
--- a/plugins/org.eclipse.jst.jee.ui/.classpath
+++ /dev/null
@@ -1,7 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<classpath>
- <classpathentry kind="src" path="src"/>
- <classpathentry kind="con" path="org.eclipse.jdt.launching.JRE_CONTAINER/org.eclipse.jdt.internal.debug.ui.launcher.StandardVMType/J2SE-1.5"/>
- <classpathentry kind="con" path="org.eclipse.pde.core.requiredPlugins"/>
- <classpathentry kind="output" path="bin"/>
-</classpath>
diff --git a/plugins/org.eclipse.jst.jee.ui/.cvsignore b/plugins/org.eclipse.jst.jee.ui/.cvsignore
deleted file mode 100644
index 7722bc8..0000000
--- a/plugins/org.eclipse.jst.jee.ui/.cvsignore
+++ /dev/null
@@ -1,2 +0,0 @@
-build.xml
-javaCompiler...args
diff --git a/plugins/org.eclipse.jst.jee.ui/.project b/plugins/org.eclipse.jst.jee.ui/.project
deleted file mode 100644
index 65633e8..0000000
--- a/plugins/org.eclipse.jst.jee.ui/.project
+++ /dev/null
@@ -1,28 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<projectDescription>
- <name>org.eclipse.jst.jee.ui</name>
- <comment></comment>
- <projects>
- </projects>
- <buildSpec>
- <buildCommand>
- <name>org.eclipse.jdt.core.javabuilder</name>
- <arguments>
- </arguments>
- </buildCommand>
- <buildCommand>
- <name>org.eclipse.pde.ManifestBuilder</name>
- <arguments>
- </arguments>
- </buildCommand>
- <buildCommand>
- <name>org.eclipse.pde.SchemaBuilder</name>
- <arguments>
- </arguments>
- </buildCommand>
- </buildSpec>
- <natures>
- <nature>org.eclipse.pde.PluginNature</nature>
- <nature>org.eclipse.jdt.core.javanature</nature>
- </natures>
-</projectDescription>
diff --git a/plugins/org.eclipse.jst.jee.ui/.settings/org.eclipse.jdt.core.prefs b/plugins/org.eclipse.jst.jee.ui/.settings/org.eclipse.jdt.core.prefs
deleted file mode 100644
index 037a4e5..0000000
--- a/plugins/org.eclipse.jst.jee.ui/.settings/org.eclipse.jdt.core.prefs
+++ /dev/null
@@ -1,95 +0,0 @@
-#Mon Jun 08 15:35:45 EDT 2009
-org.eclipse.jdt.core.compiler.problem.unusedParameterWhenImplementingAbstract=disabled
-org.eclipse.jdt.core.compiler.problem.comparingIdentical=error
-org.eclipse.jdt.core.compiler.problem.unnecessaryElse=error
-org.eclipse.jdt.core.compiler.problem.redundantSuperinterface=error
-org.eclipse.jdt.core.compiler.problem.unusedLocal=error
-org.eclipse.jdt.core.compiler.problem.emptyStatement=error
-org.eclipse.jdt.core.compiler.problem.unusedLabel=error
-org.eclipse.jdt.core.compiler.problem.unusedParameter=warning
-org.eclipse.jdt.core.compiler.problem.rawTypeReference=warning
-org.eclipse.jdt.core.incompatibleJDKLevel=ignore
-org.eclipse.jdt.core.compiler.problem.incompatibleNonInheritedInterfaceMethod=error
-org.eclipse.jdt.core.compiler.debug.lineNumber=generate
-org.eclipse.jdt.core.compiler.problem.unusedDeclaredThrownException=warning
-org.eclipse.jdt.core.builder.cleanOutputFolder=clean
-org.eclipse.jdt.core.compiler.problem.unusedWarningToken=warning
-org.eclipse.jdt.core.compiler.problem.noImplicitStringConversion=error
-org.eclipse.jdt.core.compiler.problem.deprecationInDeprecatedCode=enabled
-org.eclipse.jdt.core.compiler.problem.deprecation=warning
-org.eclipse.jdt.core.compiler.problem.unusedParameterWhenOverridingConcrete=disabled
-org.eclipse.jdt.core.compiler.problem.missingSynchronizedOnInheritedMethod=error
-org.eclipse.jdt.core.compiler.problem.deprecationWhenOverridingDeprecatedMethod=enabled
-org.eclipse.jdt.core.compiler.problem.redundantNullCheck=error
-org.eclipse.jdt.core.compiler.problem.unusedImport=error
-org.eclipse.jdt.core.builder.recreateModifiedClassFileInOutputFolder=ignore
-org.eclipse.jdt.core.builder.resourceCopyExclusionFilter=*.launch
-org.eclipse.jdt.core.classpath.multipleOutputLocations=enabled
-org.eclipse.jdt.core.compiler.problem.suppressWarnings=enabled
-org.eclipse.jdt.core.compiler.problem.typeParameterHiding=error
-org.eclipse.jdt.core.builder.invalidClasspath=abort
-org.eclipse.jdt.core.compiler.problem.localVariableHiding=warning
-org.eclipse.jdt.core.compiler.problem.possibleAccidentalBooleanAssignment=error
-org.eclipse.jdt.core.compiler.problem.missingHashCodeMethod=error
-org.eclipse.jdt.core.codeComplete.argumentSuffixes=
-org.eclipse.jdt.core.codeComplete.argumentPrefixes=
-org.eclipse.jdt.core.compiler.problem.indirectStaticAccess=ignore
-org.eclipse.jdt.core.compiler.problem.potentialNullReference=error
-org.eclipse.jdt.core.compiler.codegen.inlineJsrBytecode=enabled
-org.eclipse.jdt.core.compiler.problem.finalParameterBound=warning
-org.eclipse.jdt.core.compiler.problem.missingSerialVersion=error
-org.eclipse.jdt.core.compiler.problem.nullReference=error
-org.eclipse.jdt.core.compiler.source=1.5
-org.eclipse.jdt.core.compiler.problem.enumIdentifier=error
-org.eclipse.jdt.core.compiler.problem.syntheticAccessEmulation=ignore
-org.eclipse.jdt.core.builder.duplicateResourceTask=warning
-org.eclipse.jdt.core.compiler.problem.fieldHiding=error
-org.eclipse.jdt.core.compiler.problem.unusedDeclaredThrownExceptionExemptExceptionAndThrowable=enabled
-org.eclipse.jdt.core.compiler.problem.missingOverrideAnnotation=error
-org.eclipse.jdt.core.compiler.problem.hiddenCatchBlock=error
-org.eclipse.jdt.core.compiler.problem.overridingPackageDefaultMethod=error
-org.eclipse.jdt.core.compiler.problem.finallyBlockNotCompletingNormally=error
-org.eclipse.jdt.core.compiler.problem.undocumentedEmptyBlock=warning
-org.eclipse.jdt.core.classpath.exclusionPatterns=enabled
-org.eclipse.jdt.core.compiler.problem.methodWithConstructorName=error
-org.eclipse.jdt.core.compiler.problem.discouragedReference=warning
-org.eclipse.jdt.core.compiler.problem.unqualifiedFieldAccess=ignore
-org.eclipse.jdt.core.compiler.problem.incompleteEnumSwitch=error
-eclipse.preferences.version=1
-org.eclipse.jdt.core.incompleteClasspath=error
-org.eclipse.jdt.core.compiler.problem.unnecessaryTypeCheck=error
-org.eclipse.jdt.core.compiler.problem.deadCode=error
-org.eclipse.jdt.core.compiler.problem.specialParameterHidingField=enabled
-org.eclipse.jdt.core.compiler.problem.fatalOptionalError=enabled
-org.eclipse.jdt.core.compiler.problem.noEffectAssignment=error
-org.eclipse.jdt.core.compiler.debug.sourceFile=generate
-org.eclipse.jdt.core.compiler.problem.unusedDeclaredThrownExceptionIncludeUncheckedExceptions=disabled
-org.eclipse.jdt.core.compiler.problem.missingDeprecatedAnnotation=warning
-org.eclipse.jdt.core.codeComplete.fieldPrefixes=
-org.eclipse.jdt.core.compiler.problem.fallthroughCase=error
-org.eclipse.jdt.core.compiler.codegen.targetPlatform=1.5
-org.eclipse.jdt.core.compiler.problem.unusedPrivateMember=error
-org.eclipse.jdt.core.compiler.problem.autoboxing=warning
-org.eclipse.jdt.core.circularClasspath=error
-org.eclipse.jdt.core.compiler.problem.annotationSuperInterface=warning
-org.eclipse.jdt.core.compiler.problem.nonExternalizedStringLiteral=error
-org.eclipse.jdt.core.codeComplete.fieldSuffixes=
-org.eclipse.jdt.core.codeComplete.localSuffixes=
-org.eclipse.jdt.core.compiler.problem.parameterAssignment=error
-org.eclipse.jdt.core.compiler.problem.staticAccessReceiver=error
-org.eclipse.jdt.core.codeComplete.localPrefixes=
-org.eclipse.jdt.core.compiler.problem.unusedDeclaredThrownExceptionIncludeDocCommentReference=enabled
-org.eclipse.jdt.core.compiler.maxProblemPerUnit=100
-org.eclipse.jdt.core.compiler.problem.varargsArgumentNeedCast=error
-org.eclipse.jdt.core.compiler.problem.assertIdentifier=error
-org.eclipse.jdt.core.compiler.compliance=1.5
-org.eclipse.jdt.core.compiler.problem.unusedParameterIncludeDocCommentReference=enabled
-org.eclipse.jdt.core.codeComplete.staticFieldPrefixes=
-org.eclipse.jdt.core.compiler.debug.localVariable=generate
-org.eclipse.jdt.core.compiler.problem.unhandledWarningToken=warning
-instance/org.eclipse.core.net/org.eclipse.core.net.hasMigrated=true
-org.eclipse.jdt.core.compiler.problem.forbiddenReference=error
-org.eclipse.jdt.core.compiler.codegen.unusedLocal=preserve
-org.eclipse.jdt.core.compiler.problem.uncheckedTypeOperation=warning
-org.eclipse.jdt.core.compiler.problem.unusedDeclaredThrownExceptionWhenOverriding=disabled
-org.eclipse.jdt.core.codeComplete.staticFieldSuffixes=
diff --git a/plugins/org.eclipse.jst.jee.ui/META-INF/MANIFEST.MF b/plugins/org.eclipse.jst.jee.ui/META-INF/MANIFEST.MF
deleted file mode 100644
index a9e5d0d..0000000
--- a/plugins/org.eclipse.jst.jee.ui/META-INF/MANIFEST.MF
+++ /dev/null
@@ -1,54 +0,0 @@
-Manifest-Version: 1.0
-Bundle-ManifestVersion: 2
-Bundle-Name: %Bundle-Name.0
-Bundle-SymbolicName: org.eclipse.jst.jee.ui;singleton:=true
-Bundle-Version: 1.0.304.qualifier
-Bundle-Activator: org.eclipse.jst.jee.ui.plugin.JEEUIPlugin
-Require-Bundle: org.eclipse.ui;bundle-version="[3.2.0,4.0.0)",
- org.eclipse.core.runtime;bundle-version="[3.2.0,4.0.0)",
- org.eclipse.wst.common.project.facet.ui;bundle-version="[1.3.0,2.0.0)",
- org.eclipse.jst.j2ee.ui;bundle-version="[1.1.0,1.2.0)",
- org.eclipse.wst.common.project.facet.core;bundle-version="[1.3.0,2.0.0)",
- org.eclipse.core.resources;bundle-version="[3.2.0,4.0.0)",
- org.eclipse.wst.common.modulecore;bundle-version="[1.2.0,2.0.0)",
- org.eclipse.wst.common.frameworks;bundle-version="[1.2.0,2.0.0)",
- org.eclipse.jst.jee;bundle-version="[1.0.0,1.1.0)",
- org.eclipse.jem.util;bundle-version="[2.0.0,3.0.0)",
- org.eclipse.wst.web.ui;bundle-version="[1.1.0,1.2.0)",
- org.eclipse.wst.web;bundle-version="[1.1.0,1.2.0)",
- org.eclipse.wst.common.frameworks.ui;bundle-version="[1.2.0,2.0.0)",
- org.eclipse.emf.ecore;bundle-version="[2.2.0,3.0.0)",
- org.eclipse.wst.server.core;bundle-version="[1.0.0,2.0.0)",
- org.eclipse.debug.ui;bundle-version="[3.2.0,4.0.0)",
- org.eclipse.jdt.core;bundle-version="[3.2.0,4.0.0)",
- org.eclipse.wst.common.emfworkbench.integration;bundle-version="[1.2.0,2.0.0)",
- org.eclipse.jst.j2ee;bundle-version="[1.1.0,1.2.0)",
- org.eclipse.jst.j2ee.web;bundle-version="[1.1.0,1.2.0)",
- org.eclipse.jst.j2ee.ejb;bundle-version="[1.1.103,1.2.0)",
- org.eclipse.jst.j2ee.core;bundle-version="[1.1.102,2.0.0)",
- org.eclipse.wst.common.emf;bundle-version="[1.1.103,2.0.0)",
- org.eclipse.jdt.ui;bundle-version="[3.2.0,4.0.0)",
- org.eclipse.ui.ide;bundle-version="[3.2.0,4.0.0)",
- org.eclipse.ui.navigator;bundle-version="[3.2.0,4.0.0)",
- org.eclipse.emf.edit;bundle-version="[2.2.0,3.0.0)",
- org.eclipse.jst.j2ee.navigator.ui;bundle-version="[1.1.0,2.0.0)",
- org.eclipse.emf.edit.ui;bundle-version="[2.2.0,3.0.0)",
- org.eclipse.ui.navigator.resources;bundle-version="[3.2.0,4.0.0)",
- org.eclipse.jst.server.core;bundle-version="[1.0.102,2.0.0)",
- org.eclipse.jst.common.frameworks;bundle-version="[1.1.0,2.0.0)",
- org.eclipse.jst.j2ee.jca;bundle-version="[1.1.0,2.0.0)",
- org.eclipse.core.expressions;bundle-version="[3.4.0,4.0.0)"
-Eclipse-LazyStart: true
-Bundle-Localization: plugin
-Bundle-Vendor: %Bundle-Vendor.0
-Bundle-RequiredExecutionEnvironment: J2SE-1.5
-Export-Package: org.eclipse.jst.jee.ui.internal,
- org.eclipse.jst.jee.ui.internal.deployables,
- org.eclipse.jst.jee.ui.internal.navigator,
- org.eclipse.jst.jee.ui.internal.navigator.appclient,
- org.eclipse.jst.jee.ui.internal.navigator.dnd,
- org.eclipse.jst.jee.ui.internal.navigator.ear,
- org.eclipse.jst.jee.ui.internal.navigator.ejb,
- org.eclipse.jst.jee.ui.internal.navigator.web,
- org.eclipse.jst.jee.ui.plugin,
- org.eclipse.jst.jee.ui.project.facet
diff --git a/plugins/org.eclipse.jst.jee.ui/about.html b/plugins/org.eclipse.jst.jee.ui/about.html
deleted file mode 100644
index 0799bdb..0000000
--- a/plugins/org.eclipse.jst.jee.ui/about.html
+++ /dev/null
@@ -1,34 +0,0 @@
-<!DOCTYPE HTML PUBLIC "-//W3C//DTD HTML 4.0//EN">
-<HTML>
-
-<head>
-<title>About</title>
-<meta http-equiv=Content-Type content="text/html; charset=ISO-8859-1">
-</head>
-
-<BODY lang="EN-US">
-
-<H3>About This Content</H3>
-
-<P>June, 2008</P>
-
-<H3>License</H3>
-
-<P>The Eclipse Foundation makes available all content in this plug-in
-("Content"). Unless otherwise indicated below, the Content is provided to you
-under the terms and conditions of the Eclipse Public License Version 1.0
-("EPL"). A copy of the EPL is available at
-<A href="http://www.eclipse.org/org/documents/epl-v10.php">http://www.eclipse.org/org/documents/epl-v10.php</A>.
-For purposes of the EPL, "Program" will mean the Content.</P>
-
-<P>If you did not receive this Content directly from the Eclipse Foundation, the
-Content is being redistributed by another party ("Redistributor") and different
-terms and conditions may apply to your use of any object code in the Content.
-Check the Redistributor's license that was provided with the Content. If no such
-license exists, contact the Redistributor. Unless otherwise indicated below, the
-terms and conditions of the EPL still apply to any source code in the Content
-and such source code may be obtained at
-<A href="http://www.eclipse.org/">http://www.eclipse.org/</A>.</P>
-
-</BODY>
-</HTML>
diff --git a/plugins/org.eclipse.jst.jee.ui/about.ini b/plugins/org.eclipse.jst.jee.ui/about.ini
deleted file mode 100644
index 68af291..0000000
--- a/plugins/org.eclipse.jst.jee.ui/about.ini
+++ /dev/null
@@ -1,12 +0,0 @@
-# about.ini
-# contains information about a feature
-# java.io.Properties file (ISO 8859-1 with "\" escapes)
-# "%key" are externalized strings defined in about.properties
-# This file does not need to be translated.
-
-# Property "aboutText" contains blurb for "About" dialog (translated)
-aboutText=%blurb
-
-# Property "featureImage" contains path to feature image (32x32)
-featureImage=icons/WTP_icon_x32_v2.png
-
diff --git a/plugins/org.eclipse.jst.jee.ui/about.mappings b/plugins/org.eclipse.jst.jee.ui/about.mappings
deleted file mode 100644
index bddaab4..0000000
--- a/plugins/org.eclipse.jst.jee.ui/about.mappings
+++ /dev/null
@@ -1,6 +0,0 @@
-# about.mappings
-# contains fill-ins for about.properties
-# java.io.Properties file (ISO 8859-1 with "\" escapes)
-# This file does not need to be translated.
-
-0=@build@
\ No newline at end of file
diff --git a/plugins/org.eclipse.jst.jee.ui/about.properties b/plugins/org.eclipse.jst.jee.ui/about.properties
deleted file mode 100644
index 3b900be..0000000
--- a/plugins/org.eclipse.jst.jee.ui/about.properties
+++ /dev/null
@@ -1,24 +0,0 @@
-###############################################################################
-# Copyright (c) 2005, 2009 IBM Corporation and others.
-# All rights reserved. This program and the accompanying materials
-# are made available under the terms of the Eclipse Public License v1.0
-# which accompanies this distribution, and is available at
-# http://www.eclipse.org/legal/epl-v10.html
-#
-# Contributors:
-# IBM Corporation - initial API and implementation
-###############################################################################
-
-# about.properties
-# contains externalized strings for about.ini
-# java.io.Properties file (ISO 8859-1 with "\" escapes)
-# fill-ins are supplied by about.mappings
-# This file should be translated.
-
-blurb=Eclipse Java EE Developer Tools\n\
-\n\
-Version: {featureVersion}\n\
-Build id: {0}\n\
-\n\
-(c) Copyright Eclipse contributors and others 2005, 2009. All rights reserved.\n\
-Visit http://www.eclipse.org/webtools
diff --git a/plugins/org.eclipse.jst.jee.ui/build.properties b/plugins/org.eclipse.jst.jee.ui/build.properties
deleted file mode 100644
index 1e9caaf..0000000
--- a/plugins/org.eclipse.jst.jee.ui/build.properties
+++ /dev/null
@@ -1,21 +0,0 @@
-###############################################################################
-# Copyright (c) 2005, 2007 IBM Corporation and others.
-# All rights reserved. This program and the accompanying materials
-# are made available under the terms of the Eclipse Public License v1.0
-# which accompanies this distribution, and is available at
-# http://www.eclipse.org/legal/epl-v10.html
-#
-# Contributors:
-# IBM Corporation - initial API and implementation
-###############################################################################
-source.. = src/
-output.. = bin/
-bin.includes = META-INF/,\
- .,\
- plugin.xml,\
- plugin.properties,\
- about.html,\
- icons/,\
- about.ini,\
- about.mappings,\
- about.properties
diff --git a/plugins/org.eclipse.jst.jee.ui/icons/30_ejbjar_obj.gif b/plugins/org.eclipse.jst.jee.ui/icons/30_ejbjar_obj.gif
deleted file mode 100644
index 75bf52f..0000000
--- a/plugins/org.eclipse.jst.jee.ui/icons/30_ejbjar_obj.gif
+++ /dev/null
Binary files differ
diff --git a/plugins/org.eclipse.jst.jee.ui/icons/31_ejbjar_obj.gif b/plugins/org.eclipse.jst.jee.ui/icons/31_ejbjar_obj.gif
deleted file mode 100644
index f165442..0000000
--- a/plugins/org.eclipse.jst.jee.ui/icons/31_ejbjar_obj.gif
+++ /dev/null
Binary files differ
diff --git a/plugins/org.eclipse.jst.jee.ui/icons/WTP_icon_x32_v2.png b/plugins/org.eclipse.jst.jee.ui/icons/WTP_icon_x32_v2.png
deleted file mode 100644
index 6f09c2a..0000000
--- a/plugins/org.eclipse.jst.jee.ui/icons/WTP_icon_x32_v2.png
+++ /dev/null
Binary files differ
diff --git a/plugins/org.eclipse.jst.jee.ui/icons/appclient_50.gif b/plugins/org.eclipse.jst.jee.ui/icons/appclient_50.gif
deleted file mode 100644
index 6e3ab16..0000000
--- a/plugins/org.eclipse.jst.jee.ui/icons/appclient_50.gif
+++ /dev/null
Binary files differ
diff --git a/plugins/org.eclipse.jst.jee.ui/icons/appclient_60.gif b/plugins/org.eclipse.jst.jee.ui/icons/appclient_60.gif
deleted file mode 100644
index 8442581..0000000
--- a/plugins/org.eclipse.jst.jee.ui/icons/appclient_60.gif
+++ /dev/null
Binary files differ
diff --git a/plugins/org.eclipse.jst.jee.ui/icons/appclientgroup_obj.gif b/plugins/org.eclipse.jst.jee.ui/icons/appclientgroup_obj.gif
deleted file mode 100644
index 2768428..0000000
--- a/plugins/org.eclipse.jst.jee.ui/icons/appclientgroup_obj.gif
+++ /dev/null
Binary files differ
diff --git a/plugins/org.eclipse.jst.jee.ui/icons/config_prop_obj.gif b/plugins/org.eclipse.jst.jee.ui/icons/config_prop_obj.gif
deleted file mode 100644
index bc47239..0000000
--- a/plugins/org.eclipse.jst.jee.ui/icons/config_prop_obj.gif
+++ /dev/null
Binary files differ
diff --git a/plugins/org.eclipse.jst.jee.ui/icons/connection.gif b/plugins/org.eclipse.jst.jee.ui/icons/connection.gif
deleted file mode 100755
index e8efe69..0000000
--- a/plugins/org.eclipse.jst.jee.ui/icons/connection.gif
+++ /dev/null
Binary files differ
diff --git a/plugins/org.eclipse.jst.jee.ui/icons/connectorgroup_obj.gif b/plugins/org.eclipse.jst.jee.ui/icons/connectorgroup_obj.gif
deleted file mode 100644
index ad3af3c..0000000
--- a/plugins/org.eclipse.jst.jee.ui/icons/connectorgroup_obj.gif
+++ /dev/null
Binary files differ
diff --git a/plugins/org.eclipse.jst.jee.ui/icons/ear_50.gif b/plugins/org.eclipse.jst.jee.ui/icons/ear_50.gif
deleted file mode 100644
index bb0e361..0000000
--- a/plugins/org.eclipse.jst.jee.ui/icons/ear_50.gif
+++ /dev/null
Binary files differ
diff --git a/plugins/org.eclipse.jst.jee.ui/icons/ear_60.gif b/plugins/org.eclipse.jst.jee.ui/icons/ear_60.gif
deleted file mode 100644
index a9be4b4..0000000
--- a/plugins/org.eclipse.jst.jee.ui/icons/ear_60.gif
+++ /dev/null
Binary files differ
diff --git a/plugins/org.eclipse.jst.jee.ui/icons/eargroup_obj.gif b/plugins/org.eclipse.jst.jee.ui/icons/eargroup_obj.gif
deleted file mode 100644
index 2eeb3ef..0000000
--- a/plugins/org.eclipse.jst.jee.ui/icons/eargroup_obj.gif
+++ /dev/null
Binary files differ
diff --git a/plugins/org.eclipse.jst.jee.ui/icons/ejbgroup_obj.gif b/plugins/org.eclipse.jst.jee.ui/icons/ejbgroup_obj.gif
deleted file mode 100644
index b0adb3e..0000000
--- a/plugins/org.eclipse.jst.jee.ui/icons/ejbgroup_obj.gif
+++ /dev/null
Binary files differ
diff --git a/plugins/org.eclipse.jst.jee.ui/icons/full/ctool16/dep_desc.gif b/plugins/org.eclipse.jst.jee.ui/icons/full/ctool16/dep_desc.gif
deleted file mode 100644
index 31ecb7a..0000000
--- a/plugins/org.eclipse.jst.jee.ui/icons/full/ctool16/dep_desc.gif
+++ /dev/null
Binary files differ
diff --git a/plugins/org.eclipse.jst.jee.ui/icons/license_obj.gif b/plugins/org.eclipse.jst.jee.ui/icons/license_obj.gif
deleted file mode 100644
index 50e8dbd..0000000
--- a/plugins/org.eclipse.jst.jee.ui/icons/license_obj.gif
+++ /dev/null
Binary files differ
diff --git a/plugins/org.eclipse.jst.jee.ui/icons/ovr/business_local_ovr.gif b/plugins/org.eclipse.jst.jee.ui/icons/ovr/business_local_ovr.gif
deleted file mode 100644
index 4d87826..0000000
--- a/plugins/org.eclipse.jst.jee.ui/icons/ovr/business_local_ovr.gif
+++ /dev/null
Binary files differ
diff --git a/plugins/org.eclipse.jst.jee.ui/icons/ovr/business_remote_ovr.gif b/plugins/org.eclipse.jst.jee.ui/icons/ovr/business_remote_ovr.gif
deleted file mode 100644
index 9114e38..0000000
--- a/plugins/org.eclipse.jst.jee.ui/icons/ovr/business_remote_ovr.gif
+++ /dev/null
Binary files differ
diff --git a/plugins/org.eclipse.jst.jee.ui/icons/ovr/home_ovr.gif b/plugins/org.eclipse.jst.jee.ui/icons/ovr/home_ovr.gif
deleted file mode 100644
index 3cbfe78..0000000
--- a/plugins/org.eclipse.jst.jee.ui/icons/ovr/home_ovr.gif
+++ /dev/null
Binary files differ
diff --git a/plugins/org.eclipse.jst.jee.ui/icons/ovr/local_home_ovr.gif b/plugins/org.eclipse.jst.jee.ui/icons/ovr/local_home_ovr.gif
deleted file mode 100644
index d782734..0000000
--- a/plugins/org.eclipse.jst.jee.ui/icons/ovr/local_home_ovr.gif
+++ /dev/null
Binary files differ
diff --git a/plugins/org.eclipse.jst.jee.ui/icons/ovr/local_ovr.gif b/plugins/org.eclipse.jst.jee.ui/icons/ovr/local_ovr.gif
deleted file mode 100644
index 43e1655..0000000
--- a/plugins/org.eclipse.jst.jee.ui/icons/ovr/local_ovr.gif
+++ /dev/null
Binary files differ
diff --git a/plugins/org.eclipse.jst.jee.ui/icons/ovr/remote_ovr.gif b/plugins/org.eclipse.jst.jee.ui/icons/ovr/remote_ovr.gif
deleted file mode 100644
index 19c9cae..0000000
--- a/plugins/org.eclipse.jst.jee.ui/icons/ovr/remote_ovr.gif
+++ /dev/null
Binary files differ
diff --git a/plugins/org.eclipse.jst.jee.ui/icons/resource_adapter_obj.gif b/plugins/org.eclipse.jst.jee.ui/icons/resource_adapter_obj.gif
deleted file mode 100644
index 959c660..0000000
--- a/plugins/org.eclipse.jst.jee.ui/icons/resource_adapter_obj.gif
+++ /dev/null
Binary files differ
diff --git a/plugins/org.eclipse.jst.jee.ui/icons/webapp_25.gif b/plugins/org.eclipse.jst.jee.ui/icons/webapp_25.gif
deleted file mode 100644
index efb8c1b..0000000
--- a/plugins/org.eclipse.jst.jee.ui/icons/webapp_25.gif
+++ /dev/null
Binary files differ
diff --git a/plugins/org.eclipse.jst.jee.ui/icons/webapp_30.gif b/plugins/org.eclipse.jst.jee.ui/icons/webapp_30.gif
deleted file mode 100644
index 52bd43b..0000000
--- a/plugins/org.eclipse.jst.jee.ui/icons/webapp_30.gif
+++ /dev/null
Binary files differ
diff --git a/plugins/org.eclipse.jst.jee.ui/icons/webgroup_obj.gif b/plugins/org.eclipse.jst.jee.ui/icons/webgroup_obj.gif
deleted file mode 100644
index 274d361..0000000
--- a/plugins/org.eclipse.jst.jee.ui/icons/webgroup_obj.gif
+++ /dev/null
Binary files differ
diff --git a/plugins/org.eclipse.jst.jee.ui/plugin.properties b/plugins/org.eclipse.jst.jee.ui/plugin.properties
deleted file mode 100644
index c0e95c1..0000000
--- a/plugins/org.eclipse.jst.jee.ui/plugin.properties
+++ /dev/null
@@ -1,28 +0,0 @@
-###############################################################################
-# Copyright (c) 2005, 2007 IBM Corporation and others.
-# All rights reserved. This program and the accompanying materials
-# are made available under the terms of the Eclipse Public License v1.0
-# which accompanies this distribution, and is available at
-# http://www.eclipse.org/legal/epl-v10.html
-#
-# Contributors:
-# IBM Corporation - initial API and implementation
-###############################################################################
-# properties file for org.eclipse.jst.jee.ui
-Bundle-Name.0 = Eclipse Java EE Developer Tools
-Bundle-Vendor.0 = Eclipse Web Tools Platform
-create_deploy_files=Generate Deployment Descriptor Stub
-j2ee=Java EE
-j2ee.actions.description_ui_=Actions for Java EE Development
-ENTERPRISE_BEAN_DECORATOR=Java EE 5 Enterprise Beans and Interfaces Decorator
-ENTERPRISE_BEAN_DECORATOR.DESCRIPTION=Java EE 5 Enterprise Beans are decorated according to their type Session/Message Driven/Entity. The same decorator is used to mark Business and 2.x interfaces
-JAVA_EE_5_PROBLEM_MARKER_RESOURCE_DECORATOR=Java EE 5 Project Problem Marker Resource Decorator
-JAVA_EE_5_PROBLEM_MARKER_RESOURCE_DECORATOR.DESCRIPTION=Resource Decorator enables error markers to be put on the project node.
-jeeProjectDecorator=Java EE 5 Project Decorator
-jeeProjectDecorator.description=Decorator is used to mark Java EE 5 projects
-ADD_REMOVE_MODULE_DEPENDENCIES_ACTION = Add/Remove
-EJB_NAVIGATOR_CONTENT = Java EE Navigator Content EJB
-WEB_NAVIGATOR_CONTENT = Java EE Navigator Content WEB
-EAR_NAVIGATOR_CONTENT = Java EE Navigator Content EAR
-APP_CLIENT_NAVIGATOR_CONTENT = Java EE Navigator Content Application Client
-CONNECTOR_NAVIGATOR_CONTENT = Java EE Navigator Content Connector
\ No newline at end of file
diff --git a/plugins/org.eclipse.jst.jee.ui/plugin.xml b/plugins/org.eclipse.jst.jee.ui/plugin.xml
deleted file mode 100644
index 2855f3e..0000000
--- a/plugins/org.eclipse.jst.jee.ui/plugin.xml
+++ /dev/null
@@ -1,1430 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<?eclipse version="3.2"?>
-<plugin>
- <extension point="org.eclipse.core.runtime.adapters">
- <factory
- class="org.eclipse.jst.jee.ui.internal.deployables.EnterpriseDeployableArtifactAdapterFactory"
- adaptableType="org.eclipse.core.resources.IProject">
- <adapter type= "org.eclipse.debug.ui.actions.ILaunchable"/>
- </factory>
- <factory
- class="org.eclipse.jst.jee.ui.internal.deployables.EnterpriseDeployableArtifactAdapterFactory"
- adaptableType="org.eclipse.core.resources.IFile">
- <adapter type= "org.eclipse.debug.ui.actions.ILaunchable"/>
- </factory>
-
- <factory
- class="org.eclipse.jst.jee.ui.internal.deployables.EnterpriseDeployableArtifactAdapterFactory"
- adaptableType="org.eclipse.jst.javaee.application.Application">
- <adapter type= "org.eclipse.debug.ui.actions.ILaunchable"/>
- </factory>
- <factory
- adaptableType="org.eclipse.jst.jee.ui.internal.navigator.ear.GroupEARProvider"
- class="org.eclipse.jst.jee.ui.internal.deployables.EnterpriseDeployableArtifactAdapterFactory">
- <adapter
- type="org.eclipse.debug.ui.actions.ILaunchable">
- </adapter>
- </factory>
-
- </extension>
-
- <extension point="org.eclipse.core.runtime.adapters">
- <factory
- class="org.eclipse.jst.jee.ui.internal.deployables.WebDeployableArtifactAdapterFactory"
- adaptableType="org.eclipse.core.resources.IProject">
- <adapter type= "org.eclipse.debug.ui.actions.ILaunchable"/>
- </factory>
- <factory
- class="org.eclipse.jst.jee.ui.internal.deployables.WebDeployableArtifactAdapterFactory"
- adaptableType="org.eclipse.jdt.core.ICompilationUnit">
- <adapter type= "org.eclipse.debug.ui.actions.ILaunchable"/>
- </factory>
- <factory
- class="org.eclipse.jst.jee.ui.internal.deployables.WebDeployableArtifactAdapterFactory"
- adaptableType="org.eclipse.core.resources.IFile">
- <adapter type= "org.eclipse.debug.ui.actions.ILaunchable"/>
- </factory>
- <factory
- class="org.eclipse.jst.jee.ui.internal.deployables.WebDeployableArtifactAdapterFactory"
- adaptableType="org.eclipse.jst.javaee.web.Servlet">
- <adapter type= "org.eclipse.debug.ui.actions.ILaunchable"/>
- </factory>
- <factory
- class="org.eclipse.jst.jee.ui.internal.deployables.WebDeployableArtifactAdapterFactory"
- adaptableType="org.eclipse.jst.javaee.web.WebApp">
- <adapter type= "org.eclipse.debug.ui.actions.ILaunchable"/>
- </factory>
-
- </extension>
-
- <extension point="org.eclipse.core.runtime.adapters">
- <factory
- class="org.eclipse.jst.jee.ui.internal.deployables.EJBDeployableArtifactAdapterFactory"
- adaptableType="org.eclipse.core.resources.IProject">
- <adapter type= "org.eclipse.debug.ui.actions.ILaunchable"/>
- </factory>
- <factory
- class="org.eclipse.jst.jee.ui.internal.deployables.EJBDeployableArtifactAdapterFactory"
- adaptableType="org.eclipse.jdt.core.ICompilationUnit">
- <adapter type= "org.eclipse.debug.ui.actions.ILaunchable"/>
- </factory>
- <factory
- class="org.eclipse.jst.jee.ui.internal.deployables.EJBDeployableArtifactAdapterFactory"
- adaptableType="org.eclipse.core.resources.IFile">
- <adapter type= "org.eclipse.debug.ui.actions.ILaunchable"/>
- </factory>
-
- <factory
- class="org.eclipse.jst.jee.ui.internal.deployables.EJBDeployableArtifactAdapterFactory"
- adaptableType="org.eclipse.jst.javaee.ejb.EJBJar">
- <adapter type= "org.eclipse.debug.ui.actions.ILaunchable"/>
- </factory>
-
- <factory
- class="org.eclipse.jst.jee.ui.internal.deployables.EJBDeployableArtifactAdapterFactory"
- adaptableType="org.eclipse.jst.javaee.ejb.SessionBean">
- <adapter type= "org.eclipse.debug.ui.actions.ILaunchable"/>
- </factory>
-
- <factory
- class="org.eclipse.jst.jee.ui.internal.deployables.EJBDeployableArtifactAdapterFactory"
- adaptableType="org.eclipse.jst.javaee.ejb.MessageDrivenBean">
- <adapter type= "org.eclipse.debug.ui.actions.ILaunchable"/>
- </factory>
-
- <factory
- class="org.eclipse.jst.jee.ui.internal.deployables.EJBDeployableArtifactAdapterFactory"
- adaptableType="org.eclipse.jst.javaee.ejb.EntityBean">
- <adapter type= "org.eclipse.debug.ui.actions.ILaunchable"/>
- </factory>
- </extension>
- <extension
- point="org.eclipse.core.runtime.adapters">
- <factory
- adaptableType="org.eclipse.jst.jee.ui.internal.navigator.AbstractDDNode"
- class="org.eclipse.jst.jee.ui.internal.navigator.DDAdapterFactory">
- <adapter
- type="org.eclipse.jdt.core.IJavaElement">
- </adapter>
- </factory>
- </extension>
-
- <extension
- point="org.eclipse.wst.server.core.moduleArtifactAdapters">
-
- <moduleArtifactAdapter
- id="org.eclipse.jst.jee.server.ear1"
- class="org.eclipse.jst.jee.ui.internal.deployables.EnterpriseDeployableArtifactAdapterFactory">
- <enablement>
- <with variable="selection">
- <adapt type="org.eclipse.jst.javaee.application.Application"/>
- </with>
- </enablement>
- </moduleArtifactAdapter>
-
- <moduleArtifactAdapter
- id="org.eclipse.jst.jee.server.ear2"
- class="org.eclipse.jst.jee.ui.internal.deployables.EnterpriseDeployableArtifactAdapterFactory">
- <enablement>
- <with variable="selection">
- <adapt type="org.eclipse.core.resources.IProject">
- <test forcePluginActivation="true"
- property="org.eclipse.wst.common.project.facet.core.projectFacet"
- value="jst.ear:[5.0" />
- </adapt>
-
- </with>
- </enablement>
- </moduleArtifactAdapter>
-
- <moduleArtifactAdapter
- id="org.eclipse.jst.jee.server.ear3"
- class="org.eclipse.jst.jee.ui.internal.deployables.EnterpriseDeployableArtifactAdapterFactory">
- <enablement>
- <with variable="selection">
- <adapt type="org.eclipse.core.resources.IFile">
- <test forcePluginActivation="true"
- property="org.eclipse.wst.common.project.facet.core.projectFacet"
- value="jst.ear:[5.0" />
- </adapt>
- </with>
- </enablement>
- </moduleArtifactAdapter>
- <moduleArtifactAdapter
- class="org.eclipse.jst.jee.ui.internal.deployables.EnterpriseDeployableArtifactAdapterFactory"
- id="org.eclipse.jst.jee.server.ear4">
- <enablement>
- <with
- variable="selection">
- <adapt
- type="org.eclipse.jst.jee.ui.internal.navigator.ear.GroupEARProvider">
- </adapt>
- </with>
- </enablement>
- </moduleArtifactAdapter>
- </extension>
-
-
- <!-- ==================================================================== -->
-<!-- Extension point: org.eclipse.etools.server.core.moduleObjectAdapters -->
-<!-- Purpose: Define adapters for Web resources -->
-<!-- ==================================================================== -->
- <extension point="org.eclipse.wst.server.core.moduleArtifactAdapters">
-
- <moduleArtifactAdapter
- id="org.eclipse.jst.jee.web.server.webresource"
- class="org.eclipse.jst.jee.ui.internal.deployables.WebDeployableArtifactAdapterFactory">
- <enablement>
- <with variable="selection">
- <adapt type="org.eclipse.jst.javaee.web.WebApp"/>
- </with>
- </enablement>
- </moduleArtifactAdapter>
-
- <moduleArtifactAdapter
- id="org.eclipse.jst.jee.web.server.webresource2"
- class="org.eclipse.jst.jee.ui.internal.deployables.WebDeployableArtifactAdapterFactory">
- <enablement>
- <with variable="selection">
- <adapt type="org.eclipse.jst.javaee.web.Servlet"/>
- </with>
- </enablement>
- </moduleArtifactAdapter>
-
- <moduleArtifactAdapter
- id="org.eclipse.jst.jee.web.server.webresource3"
- class="org.eclipse.jst.jee.ui.internal.deployables.WebDeployableArtifactAdapterFactory">
- <enablement>
- <with variable="selection">
- <adapt type="org.eclipse.core.resources.IProject">
- <test forcePluginActivation="true"
- property="org.eclipse.wst.common.project.facet.core.projectFacet"
- value="jst.web:[2.5" />
- </adapt>
- </with>
- </enablement>
- </moduleArtifactAdapter>
-
- <moduleArtifactAdapter
- id="org.eclipse.jst.jee.web.server.webresource4"
- class="org.eclipse.jst.jee.ui.internal.deployables.WebDeployableArtifactAdapterFactory">
- <enablement>
- <with variable="selection">
- <adapt type="org.eclipse.core.resources.IFile">
- <test forcePluginActivation="true"
- property="org.eclipse.wst.common.project.facet.core.projectFacet"
- value="jst.web:[2.5" />
- </adapt>
- </with>
- </enablement>
- </moduleArtifactAdapter>
-
- <moduleArtifactAdapter
- id="org.eclipse.jst.jee.web.server.webresource5"
- class="org.eclipse.jst.jee.ui.internal.deployables.WebDeployableArtifactAdapterFactory">
-
- <enablement>
- <with variable="selection">
- <adapt type="org.eclipse.jdt.core.ICompilationUnit">
- <test forcePluginActivation="true"
- property="org.eclipse.jst.j2ee.common.projectFacet"
- value="jst.web:[2.5" />
- </adapt>
- </with>
- </enablement>
- </moduleArtifactAdapter>
- </extension>
-
-
- <!-- ==================================================================== -->
-<!-- Extension point: org.eclipse.etools.server.core.moduleObjectAdapters -->
-<!-- Purpose: Define adapters for Web fragment resources -->
-<!-- ==================================================================== -->
- <extension point="org.eclipse.wst.server.core.moduleArtifactAdapters">
-
- <moduleArtifactAdapter
- id="org.eclipse.jst.jee.web.server.webresource"
- class="org.eclipse.jst.jee.ui.internal.deployables.WebDeployableArtifactAdapterFactory">
- <enablement>
- <with variable="selection">
- <adapt type="org.eclipse.jst.javaee.web.WebFragment"/>
- </with>
- </enablement>
- </moduleArtifactAdapter>
-
- <moduleArtifactAdapter
- id="org.eclipse.jst.jee.web.server.webresource2"
- class="org.eclipse.jst.jee.ui.internal.deployables.WebDeployableArtifactAdapterFactory">
- <enablement>
- <with variable="selection">
- <adapt type="org.eclipse.jst.javaee.web.Servlet"/>
- </with>
- </enablement>
- </moduleArtifactAdapter>
-
- <moduleArtifactAdapter
- id="org.eclipse.jst.jee.web.server.webresource3"
- class="org.eclipse.jst.jee.ui.internal.deployables.WebDeployableArtifactAdapterFactory">
- <enablement>
- <with variable="selection">
- <adapt type="org.eclipse.core.resources.IProject">
- <test forcePluginActivation="true"
- property="org.eclipse.wst.common.project.facet.core.projectFacet"
- value="jst.webfragment:[3.0" />
- </adapt>
- </with>
- </enablement>
- </moduleArtifactAdapter>
-
- <moduleArtifactAdapter
- id="org.eclipse.jst.jee.web.server.webresource4"
- class="org.eclipse.jst.jee.ui.internal.deployables.WebDeployableArtifactAdapterFactory">
- <enablement>
- <with variable="selection">
- <adapt type="org.eclipse.core.resources.IFile">
- <test forcePluginActivation="true"
- property="org.eclipse.wst.common.project.facet.core.projectFacet"
- value="jst.webfragment:[3.0" />
- </adapt>
- </with>
- </enablement>
- </moduleArtifactAdapter>
-
- <moduleArtifactAdapter
- id="org.eclipse.jst.jee.web.server.webresource5"
- class="org.eclipse.jst.jee.ui.internal.deployables.WebDeployableArtifactAdapterFactory">
-
- <enablement>
- <with variable="selection">
- <adapt type="org.eclipse.jdt.core.ICompilationUnit">
- <test forcePluginActivation="true"
- property="org.eclipse.jst.j2ee.common.projectFacet"
- value="jst.webfragment:[3.0" />
- </adapt>
- </with>
- </enablement>
- </moduleArtifactAdapter>
- </extension>
-
- <!-- ==================================================================== -->
-<!-- Purpose: Define adapters for EJB resources -->
-<!-- Extension point: org.eclipse.wst.server.core.moduleArtifactAdapters -->
-<!-- ==================================================================== -->
- <extension
- point="org.eclipse.wst.server.core.moduleArtifactAdapters">
-
- <moduleArtifactAdapter
- id="org.eclipse.jst.j2ee.server.ejb"
- class="org.eclipse.jst.jee.ui.internal.deployables.EJBDeployableArtifactAdapterFactory">
- <enablement>
- <with variable="selection">
- <adapt type="org.eclipse.jst.javaee.ejb.EJBJar"/>
- </with>
- </enablement>
- </moduleArtifactAdapter>
- <moduleArtifactAdapter
- id="org.eclipse.jst.j2ee.server.ejb2"
- class="org.eclipse.jst.jee.ui.internal.deployables.EJBDeployableArtifactAdapterFactory">
- <enablement>
- <with variable="selection">
- <adapt type="org.eclipse.jst.javaee.ejb.SessionBean"/>
- </with>
- </enablement>
- </moduleArtifactAdapter>
-
- <moduleArtifactAdapter
- id="org.eclipse.jst.jee.server.ejb3"
- class="org.eclipse.jst.jee.ui.internal.deployables.EJBDeployableArtifactAdapterFactory">
- <enablement>
- <with variable="selection">
- <adapt type="org.eclipse.jdt.core.ICompilationUnit"/>
- </with>
- </enablement>
- </moduleArtifactAdapter>
- <moduleArtifactAdapter
- id="org.eclipse.jst.jee.server.ejb4"
- class="org.eclipse.jst.jee.ui.internal.deployables.EJBDeployableArtifactAdapterFactory">
- <enablement>
- <with variable="selection">
- <adapt type="org.eclipse.core.resources.IFile">
- <test forcePluginActivation="true"
- property="org.eclipse.wst.common.project.facet.core.projectFacet"
- value="jst.ejb:[3.0" />
- </adapt>
- </with>
- </enablement>
- </moduleArtifactAdapter>
- <moduleArtifactAdapter
- id="org.eclipse.jst.jee.server.ejb5"
- class="org.eclipse.jst.jee.ui.internal.deployables.EJBDeployableArtifactAdapterFactory">
- <enablement>
- <with variable="selection">
- <adapt type="org.eclipse.core.resources.IProject">
- <test forcePluginActivation="true"
- property="org.eclipse.wst.common.project.facet.core.projectFacet"
- value="jst.ejb:[3.0" />
- </adapt>
- </with>
- </enablement>
- </moduleArtifactAdapter>
-
- <moduleArtifactAdapter
- id="org.eclipse.jst.j2ee.server.ejb6"
- class="org.eclipse.jst.jee.ui.internal.deployables.EJBDeployableArtifactAdapterFactory">
- <enablement>
- <with variable="selection">
- <adapt type="org.eclipse.jst.javaee.ejb.MessageDrivenBean"/>
- </with>
- </enablement>
- </moduleArtifactAdapter>
-
- <moduleArtifactAdapter
- id="org.eclipse.jst.j2ee.server.ejb7"
- class="org.eclipse.jst.jee.ui.internal.deployables.EJBDeployableArtifactAdapterFactory">
- <enablement>
- <with variable="selection">
- <adapt type="org.eclipse.jst.javaee.ejb.EntityBean"/>
- </with>
- </enablement>
- </moduleArtifactAdapter>
- </extension>
- <extension
- point="org.eclipse.wst.server.core.moduleArtifactAdapters">
- <moduleArtifactAdapter
- class="org.eclipse.jst.jee.ui.internal.deployables.EJBDeployableArtifactAdapterFactory"
- id="org.eclipse.jst.jee.server.ejb">
- <enablement>
- <with
- variable="selection">
- <adapt
- type="org.eclipse.core.resources.IProject">
- <test
- forcePluginActivation="true"
- property="org.eclipse.wst.common.project.facet.core.projectFacet"
- value="jst.ejb:[3.0">
- </test>
- </adapt>
- </with>
- </enablement>
- </moduleArtifactAdapter>
- <moduleArtifactAdapter
- class="org.eclipse.jst.jee.ui.internal.deployables.EJBDeployableArtifactAdapterFactory"
- id="org.eclipse.jst.jee.server.ejb77">
- <enablement>
- <with
- variable="selection">
- <instanceof
- value="org.eclipse.jst.jee.ui.internal.navigator.ejb.GroupEJBProvider">
- </instanceof>
- </with>
- </enablement>
- </moduleArtifactAdapter>
- </extension>
-
- <extension
- point="org.eclipse.ui.popupMenus">
- <objectContribution
- objectClass="org.eclipse.core.resources.IProject"
- adaptable="true"
- id="org.eclipse.jst.jee.ui.CreateDeploymentFilesAction">
- <action
- class="org.eclipse.jst.jee.ui.internal.CreateDeploymentFilesActionDelegate"
- enablesFor="1"
- icon="icons/full/ctool16/dep_desc.gif"
- id="createDeploymentFiles"
- label="%create_deploy_files"
- menubarPath="javeeUIPopupMenuCategory/slot2">
- </action>
- <enablement>
- <or>
- <adapt type="org.eclipse.core.resources.IProject">
- <test forcePluginActivation="true"
- property="org.eclipse.wst.common.project.facet.core.projectFacet"
- value="jst.ejb:[3.0" />
- </adapt>
- <adapt type="org.eclipse.core.resources.IProject">
- <test forcePluginActivation="true"
- property="org.eclipse.wst.common.project.facet.core.projectFacet"
- value="jst.web:[2.5" />
- </adapt>
- <adapt type="org.eclipse.core.resources.IProject">
- <test forcePluginActivation="true"
- property="org.eclipse.wst.common.project.facet.core.projectFacet"
- value="jst.ear:[5.0" />
- </adapt>
- <adapt type="org.eclipse.core.resources.IProject">
- <test forcePluginActivation="true"
- property="org.eclipse.wst.common.project.facet.core.projectFacet"
- value="jst.appclient:[5.0" />
- </adapt>
- <adapt type="org.eclipse.core.resources.IProject">
- <test forcePluginActivation="true"
- property="org.eclipse.wst.common.project.facet.core.projectFacet"
- value="jst.connector:[1.6" />
- </adapt>
- </or>
- </enablement>
-
-
- </objectContribution>
- <objectContribution
- id="show_dep_prop_page"
- nameFilter="*"
- objectClass="org.eclipse.jst.jee.ui.internal.navigator.ear.ModulesNode">
- <action
- class="org.eclipse.jst.jee.ui.internal.navigator.ear.ShowDepPropPageAction"
- enablesFor="1"
- id="show_dep_prop_page"
- label="%ADD_REMOVE_MODULE_DEPENDENCIES_ACTION"
- menubarPath="additions">
- </action>
- </objectContribution>
- </extension>
-
-
- <extension
- point="org.eclipse.ui.popupMenus">
- <objectContribution
- adaptable="true"
- id="org.eclipse.jst.jee.ui.CreateDeploymentFilesAction2"
- objectClass="java.lang.Object">
- <action
- class="org.eclipse.jst.jee.ui.internal.CreateDeploymentFilesActionDelegate"
- enablesFor="1"
- icon="icons/full/ctool16/dep_desc.gif"
- id="createDeploymentFiles"
- label="%create_deploy_files">
- </action>
- <enablement>
- <or>
- <instanceof
- value="org.eclipse.jst.jee.ui.internal.navigator.ear.GroupEARProvider">
- </instanceof>
- <instanceof
- value="org.eclipse.jst.jee.ui.internal.navigator.ejb.GroupEJBProvider">
- </instanceof>
- <instanceof
- value="org.eclipse.jst.jee.ui.internal.navigator.web.WebAppProvider">
- </instanceof>
- <instanceof
- value="org.eclipse.jst.jee.ui.internal.navigator.appclient.GroupAppClientProvider">
- </instanceof>
- </or>
- </enablement>
- </objectContribution>
- </extension>
-
-
-
- <!--
- <extension
- point="org.eclipse.wst.common.frameworks.OperationExtension"
- id="org.eclipse.wst.common.frameworks.datamodel.tests.extended">
- <operationExtension
- id="org.eclipse.jst.jee.ui.internal.CreateDeploymentFilesDataModelOperation"
- postOperationClass="org.eclipse.wst.common.frameworks.datamodel.tests.extended.B"
- preOperationClass="org.eclipse.wst.common.frameworks.datamodel.tests.extended.A"/>
-
- </extension>
- -->
- <extension
- point="org.eclipse.ui.navigator.navigatorContent">
- <navigatorContent
- activeByDefault="true"
- contentProvider="org.eclipse.jst.jee.ui.internal.navigator.Ejb3ContentProvider"
- icon="icons/ejbgroup_obj.gif"
- id="org.eclipse.jst.jee.ui.ejb"
- labelProvider="org.eclipse.jst.jee.ui.internal.navigator.Ejb3LabelProvider"
- name="%EJB_NAVIGATOR_CONTENT"
- priority="highest">
- <triggerPoints>
- <or>
- <adapt type="org.eclipse.core.resources.IProject">
- <or>
- <test
- forcePluginActivation="true"
- property="org.eclipse.wst.common.project.facet.core.projectFacet"
- value="jst.ejb:3.0"/>
- <test
- forcePluginActivation="true"
- property="org.eclipse.wst.common.project.facet.core.projectFacet"
- value="jst.ejb:3.1">
- </test>
- </or>
- </adapt>
- <instanceof value="org.eclipse.jst.jee.ui.internal.navigator.AbstractDDNode" />
- <instanceof value="org.eclipse.jst.jee.ui.internal.navigator.ejb.BeanNode" />
- <instanceof value="org.eclipse.jst.javaee.core.JavaEEObject" />
- <instanceof
- value="org.eclipse.jst.jee.ui.internal.navigator.ejb.AbstractEjbGroupProvider">
- </instanceof>
- </or>
- </triggerPoints>
- <possibleChildren>
- <or>
- <instanceof value="org.eclipse.jst.jee.ui.internal.navigator.AbstractDDNode" />
- <instanceof value="org.eclipse.jst.jee.ui.internal.navigator.ejb.BeanNode" />
- <instanceof value="org.eclipse.jst.javaee.core.JavaEEObject" />
- <instanceof
- value="org.eclipse.jst.jee.ui.internal.navigator.ejb.AbstractEjbGroupProvider">
- </instanceof>
- </or>
- </possibleChildren>
-
-
- <commonWizard
- menuGroupId="org.eclipse.jst.ejb.ui"
- type="new"
- wizardId="org.eclipse.jst.ejb.ui.internal.wizard.AddSessionBeanWizard">
- <enablement>
- <or>
- <instanceof
- value="org.eclipse.jst.jee.ui.internal.navigator.ejb.GroupEJBProvider">
- </instanceof>
- <instanceof
- value="org.eclipse.jst.jee.ui.internal.navigator.ejb.GroupEjbSession">
- </instanceof>
- <instanceof
- value="org.eclipse.jst.javaee.ejb.SessionBean">
- </instanceof>
- <instanceof
- value="org.eclipse.jst.jee.ui.internal.navigator.ejb.BeanInterfaceNode">
- </instanceof>
- <adapt
- type="org.eclipse.jst.jee.ui.internal.navigator.ejb.BeanNode">
- <or>
- <test
- forcePluginActivation="true"
- property="org.eclipse.jst.jee.ui.beanType"
- value="isSessionBean">
- </test>
- </or>
- </adapt>
- </or>
- </enablement>
- </commonWizard>
- <commonWizard
- menuGroupId="org.eclipse.jst.ejb.ui"
- type="new"
- wizardId="org.eclipse.jst.ejb.ui.internal.wizard.AddMessageDrivenBeanWizard">
- <enablement>
- <or>
- <instanceof
- value="org.eclipse.jst.jee.ui.internal.navigator.ejb.GroupEJBProvider">
- </instanceof>
- <instanceof
- value="org.eclipse.jst.jee.ui.internal.navigator.ejb.GroupEjbMessageDriven">
- </instanceof>
- <instanceof
- value="org.eclipse.jst.javaee.ejb.MessageDrivenBean">
- </instanceof>
- <instanceof
- value="org.eclipse.jst.jee.ui.internal.navigator.ejb.ActivationConfigProperties">
- </instanceof>
- <instanceof
- value="org.eclipse.jst.javaee.ejb.ActivationConfigProperty">
- </instanceof>
- <adapt
- type="org.eclipse.jst.jee.ui.internal.navigator.ejb.BeanNode">
- <or>
- <test
- forcePluginActivation="true"
- property="org.eclipse.jst.jee.ui.beanType"
- value="isMessageDrivenBean">
- </test>
- </or>
- </adapt>
- </or></enablement>
- </commonWizard>
-
-
- <actionProvider
- class="org.eclipse.jst.jee.ui.internal.navigator.JEEActionProvider"
- id="org.eclipse.jst.javaee.ui.JEEActionProvider">
- <enablement>
- <or>
- <instanceof value="org.eclipse.jst.jee.ui.internal.navigator.AbstractDDNode"/>
- <instanceof value="org.eclipse.jst.jee.ui.internal.navigator.ejb.BeanNode"/>
- <instanceof value="org.eclipse.jst.jee.ui.internal.navigator.ejb.BeanInterfaceNode"/>
- <instanceof value="org.eclipse.jst.javaee.core.JavaEEObject" />
- <instanceof
- value="org.eclipse.jst.jee.ui.internal.navigator.AbstractGroupProvider">
- </instanceof>
- <instanceof
- value="org.eclipse.jst.jee.ui.internal.navigator.web.WebAppProvider">
- </instanceof>
- <instanceof
- value="org.eclipse.jst.jee.ui.internal.navigator.ear.GroupEARProvider">
- </instanceof>
- <instanceof
- value="org.eclipse.jst.jee.ui.internal.navigator.appclient.GroupAppClientProvider">
- </instanceof>
- </or>
- </enablement>
- </actionProvider>
-
-
- <actionProvider
- class="org.eclipse.ui.internal.navigator.resources.actions.NewActionProvider"
- id="org.eclipse.ui.navigator.resources.JEENewActions">
- <enablement>
- <or>
- <instanceof
- value="org.eclipse.jst.jee.ui.internal.navigator.AbstractDDNode">
- </instanceof>
- <instanceof
- value="org.eclipse.jst.jee.ui.internal.navigator.AbstractGroupProvider">
- </instanceof>
-
- <instanceof
- value="org.eclipse.jst.jee.ui.internal.navigator.web.WebAppProvider">
- </instanceof>
- <instanceof
- value="org.eclipse.jst.jee.ui.internal.navigator.web.AbstractSubWebProviders">
- </instanceof>
- <instanceof
- value="org.eclipse.jst.jee.ui.internal.navigator.ear.GroupEARProvider">
- </instanceof></or>
- </enablement>
- </actionProvider>
-
- <actionProvider
- class="org.eclipse.ui.internal.navigator.resources.actions.ResourceMgmtActionProvider"
- id="org.eclipse.ui.navigator.resources.actions.JEEResourceMgmtAction">
- <enablement>
- <or>
- <instanceof
- value="org.eclipse.jst.jee.ui.internal.navigator.AbstractDDNode">
- </instanceof>
- <instanceof
- value="org.eclipse.jst.jee.ui.internal.navigator.AbstractGroupProvider">
- </instanceof>
- <adapt
- type="org.eclipse.jst.jee.ui.internal.navigator.ear.GroupEARProvider">
- </adapt>
-
- </or>
- </enablement>
- </actionProvider>
- <actionProvider
- class="org.eclipse.ui.internal.navigator.resources.actions.WorkManagementActionProvider"
- id="org.eclipse.ui.internal.navigator.resources.actions.JEEWorkMgmtAction">
- <enablement>
- <or>
- <instanceof
- value="org.eclipse.jst.jee.ui.internal.navigator.AbstractDDNode">
- </instanceof>
- <instanceof
- value="org.eclipse.jst.jee.ui.internal.navigator.AbstractGroupProvider">
- </instanceof>
-
- <instanceof
- value="org.eclipse.jst.javaee.core.JavaEEObject">
- </instanceof>
- <adapt
- type="org.eclipse.jst.jee.ui.internal.navigator.ear.GroupEARProvider">
- </adapt>
-
- </or>
- </enablement>
- </actionProvider>
- <actionProvider
- class="org.eclipse.ui.internal.navigator.resources.actions.PortingActionProvider"
- id="org.eclipse.ui.internal.navigator.resources.actions.JEEPortingAction">
- <enablement>
- <or>
- <instanceof
- value="org.eclipse.jst.jee.ui.internal.navigator.AbstractGroupProvider">
- </instanceof>
- <instanceof
- value="org.eclipse.jst.jee.ui.internal.navigator.AbstractDDNode">
- </instanceof>
- <adapt
- type="org.eclipse.jst.jee.ui.internal.navigator.ear.GroupEARProvider">
- </adapt>
-
- </or>
- </enablement>
- </actionProvider>
- <commonWizard
- menuGroupId="org.eclipse.jst.ejb.export1"
- type="export"
- wizardId="org.eclipse.jst.ejb.ui.internal.wizard.EJBComponentExportWizard">
- <enablement>
- <or>
- <instanceof
- value="org.eclipse.jst.jee.ui.internal.navigator.ejb.GroupEJBProvider">
- </instanceof>
- </or>
- </enablement>
- </commonWizard>
-
-
- </navigatorContent>
-
- <navigatorContent
- contentProvider="org.eclipse.jst.jee.ui.internal.navigator.Web25ContentProvider"
- icon="icons/webgroup_obj.gif"
- id="org.eclipse.jst.jee.ui.web"
- labelProvider="org.eclipse.jst.jee.ui.internal.navigator.Web25LabelProvider"
- name="%WEB_NAVIGATOR_CONTENT"
- priority="highest">
- <triggerPoints>
- <or>
- <adapt type="org.eclipse.core.resources.IProject">
- <or>
- <test
- forcePluginActivation="true"
- property="org.eclipse.wst.common.project.facet.core.projectFacet"
- value="jst.web:2.5"/>
- <test
- forcePluginActivation="true"
- property="org.eclipse.wst.common.project.facet.core.projectFacet"
- value="jst.web:3.0">
- </test>
- </or>
- </adapt>
- <instanceof
- value="org.eclipse.jst.jee.ui.internal.navigator.web.AbstractWebGroupProvider">
- </instanceof>
- <instanceof
- value="org.eclipse.jst.jee.ui.internal.navigator.web.WebAppProvider">
- </instanceof>
- <instanceof
- value="org.eclipse.jst.jee.ui.internal.navigator.web.WebArtifactNode">
- </instanceof>
- <instanceof
- value="org.eclipse.jst.javaee.core.JavaEEObject">
- </instanceof>
- </or>
- </triggerPoints>
- <possibleChildren>
- <or>
- <instanceof
- value="org.eclipse.jst.jee.ui.internal.navigator.web.AbstractWebGroupProvider">
- </instanceof>
- <instanceof
- value="org.eclipse.jst.jee.ui.internal.navigator.web.WebAppProvider">
- </instanceof>
- <instanceof
- value="org.eclipse.jst.jee.ui.internal.navigator.web.WebArtifactNode">
- </instanceof>
- <instanceof
- value="org.eclipse.jst.javaee.core.JavaEEObject">
- </instanceof>
- </or>
- </possibleChildren>
-
-
- <actionProvider
- class="org.eclipse.ui.internal.navigator.resources.actions.ResourceMgmtActionProvider"
- id="org.eclipse.ui.internal.navigator.resources.actions.JEEWebResourceMgmtAction">
- <enablement>
- <or>
- <instanceof
- value="org.eclipse.jst.jee.ui.internal.navigator.web.AbstractSubWebProviders">
- </instanceof>
- <!--<instanceof
- value="org.eclipse.jst.jee.ui.internal.navigator.web.WebAppProvider">
- </instanceof>-->
- </or>
- </enablement>
- </actionProvider>
- <actionProvider
- class="org.eclipse.ui.internal.navigator.resources.actions.WorkManagementActionProvider"
- id="org.eclipse.ui.internal.navigator.resources.actions.JEEWebWrkMngmntAction">
- <enablement>
- <or>
- <instanceof
- value="org.eclipse.jst.jee.ui.internal.navigator.web.AbstractSubWebProviders">
- </instanceof>
- <instanceof
- value="org.eclipse.jst.jee.ui.internal.navigator.web.WebAppProvider">
- </instanceof>
-
- <instanceof
- value="org.eclipse.jst.javaee.core.JavaEEObject">
- </instanceof>
-
- </or>
- </enablement>
- </actionProvider>
- <actionProvider
- class="org.eclipse.ui.internal.navigator.resources.actions.PortingActionProvider"
- id="org.eclipse.ui.internal.navigator.resources.actions.JEEWebPortingAction">
- <enablement>
- <or>
- <instanceof
- value="org.eclipse.jst.jee.ui.internal.navigator.web.AbstractSubWebProviders">
- </instanceof>
- <!--
- <instanceof
- value="org.eclipse.jst.jee.ui.internal.navigator.web.WebAppProvider">
- </instanceof>-->
- </or>
- </enablement>
- </actionProvider>
-
- <commonWizard
- menuGroupId="org.eclipse.wst.web.ui.webclass"
- type="new"
- wizardId="org.eclipse.jst.servlet.ui.internal.wizard.AddServletWizard">
- <enablement>
- <or>
- <instanceof
- value="org.eclipse.jst.jee.ui.internal.navigator.web.WebAppProvider">
- </instanceof>
- <instanceof
- value="org.eclipse.jst.jee.ui.internal.navigator.web.GroupServletItemProvider">
- </instanceof>
- <instanceof
- value="org.eclipse.jst.javaee.web.Servlet">
- </instanceof>
- <instanceof
- value="org.eclipse.jst.jee.ui.internal.navigator.web.GroupServletMappingItemProvider">
- </instanceof>
- <instanceof
- value="org.eclipse.jst.javaee.web.ServletMapping">
- </instanceof>
- </or></enablement>
- </commonWizard>
- <commonWizard
- menuGroupId="org.eclipse.wst.web.ui.webclass"
- type="new"
- wizardId="org.eclipse.jst.servlet.ui.internal.wizard.AddFilterWizard">
- <enablement>
- <or>
- <instanceof
- value="org.eclipse.jst.jee.ui.internal.navigator.web.WebAppProvider">
- </instanceof>
- <instanceof
- value="org.eclipse.jst.jee.ui.internal.navigator.web.GroupFiltersItemProvider">
- </instanceof>
- <instanceof
- value="org.eclipse.jst.javaee.web.Filter">
- </instanceof>
- <instanceof
- value="org.eclipse.jst.jee.ui.internal.navigator.web.GroupFilterMappingItemProvider">
- </instanceof>
- <instanceof
- value="org.eclipse.jst.javaee.web.FilterMapping">
- </instanceof>
- <instanceof
- value="org.eclipse.jst.javaee.web.Servlet">
- </instanceof>
- </or></enablement>
- </commonWizard>
- <commonWizard
- menuGroupId="org.eclipse.wst.web.ui.webclass"
- type="new"
- wizardId="org.eclipse.jst.servlet.ui.internal.wizard.AddListenerWizard">
- <enablement>
- <or>
- <instanceof
- value="org.eclipse.jst.jee.ui.internal.navigator.web.WebAppProvider">
- </instanceof>
- <instanceof
- value="org.eclipse.jst.jee.ui.internal.navigator.web.GroupListenerItemProvider">
- </instanceof>
- <instanceof
- value="org.eclipse.jst.javaee.core.Listener">
- </instanceof>
- </or></enablement>
- </commonWizard>
- <commonWizard
- menuGroupId="org.eclipse.wst.web.export"
- type="export"
- wizardId="org.eclipse.jst.servlet.ui.internal.wizard.WebComponentExportWizard">
- <enablement>
- <or>
- <instanceof
- value="org.eclipse.jst.jee.ui.internal.navigator.web.WebAppProvider">
- </instanceof>
- </or>
- </enablement>
- </commonWizard>
- </navigatorContent>
- <navigatorContent
- activeByDefault="true"
- contentProvider="org.eclipse.jst.jee.ui.internal.navigator.Ear5ContentProvider"
- icon="icons/eargroup_obj.gif"
- id="org.eclipse.jst.jee.ui.ear"
- labelProvider="org.eclipse.jst.jee.ui.internal.navigator.Ear5LabelProvider"
- name="%EAR_NAVIGATOR_CONTENT"
- priority="highest">
- <triggerPoints>
- <or>
- <instanceof
- value="org.eclipse.jst.jee.ui.internal.navigator.ear..BundledNode">
- </instanceof>
- <instanceof
- value="org.eclipse.jst.jee.ui.internal.navigator.ear.GroupEARProvider">
- </instanceof>
- <adapt
- type="org.eclipse.core.resources.IProject">
- <or>
- <test
- forcePluginActivation="true"
- property="org.eclipse.wst.common.project.facet.core.projectFacet"
- value="jst.ear:5.0">
- </test>
- <test
- forcePluginActivation="true"
- property="org.eclipse.wst.common.project.facet.core.projectFacet"
- value="jst.ear:6.0">
- </test>
- </or>
- </adapt>
- <instanceof
- value="org.eclipse.jst.jee.ui.internal.navigator.ear.ModulesNode">
- </instanceof>
- <instanceof
- value="org.eclipse.jst.jee.ui.internal.navigator.ear.BundledLibsNode">
- </instanceof>
- <instanceof
- value="org.eclipse.wst.common.componentcore.resources.IVirtualReference">
- </instanceof>
- </or>
- </triggerPoints>
- <possibleChildren>
- <or>
- <instanceof
- value="java.io.File">
- </instanceof>
- <adapt
- type="org.eclipse.core.resources.IProject">
- <or>
- <test
- forcePluginActivation="true"
- property="org.eclipse.wst.common.project.facet.core.projectFacet"
- value="jst.web">
- </test>
- <test
- forcePluginActivation="true"
- property="org.eclipse.wst.common.project.facet.core.projectFacet"
- value="jst.ejb">
- </test>
- <test
- forcePluginActivation="true"
- property="org.eclipse.wst.common.project.facet.core.projectFacet"
- value="jst.utility">
- </test>
- <test
- forcePluginActivation="true"
- property="org.eclipse.wst.common.project.facet.core.projectFacet"
- value="jst.ear">
- </test>
- <test
- forcePluginActivation="true"
- property="org.eclipse.wst.common.project.facet.core.projectFacet"
- value="jst.appclient">
- </test>
- <test
- forcePluginActivation="true"
- property="org.eclipse.wst.common.project.facet.core.projectFacet"
- value="jst.connector">
- </test>
- </or>
- </adapt>
- <instanceof
- value="org.eclipse.jst.jee.ui.internal.navigator.ear.ModulesNode"/>
- <instanceof
- value="org.eclipse.jst.jee.ui.internal.navigator.ear.BundledNode"/>
- <instanceof
- value="org.eclipse.core.internal.resources.File">
- </instanceof>
- <instanceof
- value="org.eclipse.jdt.internal.core.JarPackageFragmentRoot">
- </instanceof>
- <instanceof
- value="org.eclipse.jst.jee.ui.internal.navigator.ear.GroupEARProvider">
- </instanceof>
- <instanceof
- value="org.eclipse.core.internal.resources.Project">
- </instanceof>
- <instanceof
- value="org.eclipse.wst.common.componentcore.resources.IVirtualReference">
- </instanceof>
- </or>
- </possibleChildren>
- <commonSorter
- class="org.eclipse.jst.jee.ui.internal.navigator.ear.Application5ViewerSorter"
- id="org.eclipse.jst.jee.navigator.internal.ApplicationViewerSorter">
- </commonSorter>
- <dropAssistant
- class="org.eclipse.jst.jee.ui.internal.navigator.dnd.AddProjectToEARDropAssistant"
- id="org.eclipse.jst.jee.navigator.ui.AddModulesToEAR">
- <possibleDropTargets>
- <or>
- <adapt
- type="org.eclipse.core.resources.IProject">
- <test
- forcePluginActivation="true"
- property="org.eclipse.wst.common.project.facet.core.projectFacet"
- value="jst.ear">
- </test>
- </adapt>
- <instanceof
- value="org.eclipse.jst.javaee.application.Application">
- </instanceof>
- <instanceof
- value="org.eclipse.jst.jee.ui.internal.navigator.ear.AbstractEarNode">
- </instanceof>
- <instanceof
- value="org.eclipse.jst.jee.ui.internal.navigator.ear.GroupEARProvider">
- </instanceof>
- </or>
- </possibleDropTargets>
- </dropAssistant>
- <commonWizard
- menuGroupId="org.eclipse.jst.ear.ui"
- type="new"
- wizardId="org.eclipse.jst.ejb.ui.project.facet.EjbProjectWizard">
- <enablement>
- <or>
- <adapt
- type="org.eclipse.jst.jee.ui.internal.navigator.ear.GroupEARProvider">
- </adapt>
- </or></enablement>
- </commonWizard>
- <commonWizard
- menuGroupId="org.eclipse.jst.ear.ui"
- type="new"
- wizardId="org.eclipse.jst.servlet.ui.project.facet.WebProjectWizard">
- <enablement>
- <or>
- <adapt
- type="org.eclipse.jst.jee.ui.internal.navigator.ear.GroupEARProvider">
- </adapt>
- </or>
- </enablement>
- </commonWizard>
- <commonWizard
- menuGroupId="org.eclipse.jst.ear.ui"
- type="new"
- wizardId="org.eclipse.jst.j2ee.ui.project.facet.EarProjectWizard">
- <enablement>
- <or>
- <adapt
- type="org.eclipse.jst.jee.ui.internal.navigator.ear.GroupEARProvider">
- </adapt>
- </or>
- </enablement>
- </commonWizard>
- <commonWizard
- menuGroupId="org.eclipse.jst.ear.ui"
- type="new"
- wizardId="org.eclipse.jst.j2ee.ui.project.facet.appclient.AppClientProjectWizard">
- <enablement>
- <or>
- <adapt
- type="org.eclipse.jst.jee.ui.internal.navigator.ear.GroupEARProvider">
- </adapt>
- </or>
- </enablement>
- </commonWizard>
- <commonWizard
- menuGroupId="org.eclipse.jst.ear.ui"
- type="new"
- wizardId="org.eclipse.jst.j2ee.jca.ui.internal.wizard.ConnectorProjectWizard">
- <enablement>
- <or>
- <adapt
- type="org.eclipse.jst.jee.ui.internal.navigator.ear.GroupEARProvider">
- </adapt>
- </or>
- </enablement>
- </commonWizard>
- <commonWizard
- menuGroupId="org.eclipse.jst.ear.ui.export"
- type="export"
- wizardId="org.eclipse.jst.j2ee.internal.wizard.EARComponentExportWizard">
- <enablement>
- <or>
- <adapt
- type="org.eclipse.jst.jee.ui.internal.navigator.ear.GroupEARProvider">
- </adapt>
- </or>
- </enablement>
- </commonWizard>
- <commonWizard
- menuGroupId="org.eclipse.jst.ear.ui.import"
- type="import"
- wizardId="org.eclipse.jst.j2ee.internal.wizard.AppClientComponentImportWizard">
- <enablement>
- <or>
- <adapt
- type="org.eclipse.jst.jee.ui.internal.navigator.ear.GroupEARProvider">
- </adapt>
- </or>
- </enablement>
- </commonWizard>
- <commonWizard
- menuGroupId="org.eclipse.jst.ear.ui.import"
- type="import"
- wizardId="org.eclipse.jst.j2ee.internal.wizard.EARComponentImportWizard">
- <enablement>
- <or>
- <adapt
- type="org.eclipse.jst.jee.ui.internal.navigator.ear.GroupEARProvider">
- </adapt>
- </or>
- </enablement>
- </commonWizard>
- <commonWizard
- menuGroupId="org.eclipse.jst.ear.ui.import"
- type="import"
- wizardId="org.eclipse.jst.j2ee.internal.wizard.J2EEUtilityJarImportWizardNew">
- <enablement>
- <or>
- <adapt
- type="org.eclipse.jst.jee.ui.internal.navigator.ear.GroupEARProvider">
- </adapt>
- </or>
- </enablement>
- </commonWizard>
- <commonWizard
- menuGroupId="org.eclipse.jst.ear.ui.import"
- type="import"
- wizardId="org.eclipse.jst.ejb.ui.internal.wizard.EJBComponentImportWizard">
- <enablement>
- <or>
- <adapt
- type="org.eclipse.jst.jee.ui.internal.navigator.ear.GroupEARProvider">
- </adapt>
- </or>
- </enablement>
- </commonWizard>
- <commonWizard
- menuGroupId="org.eclipse.jst.ear.ui.import"
- type="import"
- wizardId="org.eclipse.jst.servlet.ui.internal.wizard.WebComponentImportWizard">
- <enablement>
- <or>
- <adapt
- type="org.eclipse.jst.jee.ui.internal.navigator.ear.GroupEARProvider">
- </adapt>
- </or>
- </enablement>
- </commonWizard>
- <commonWizard
- menuGroupId="org.eclipse.jst.ear.ui.import"
- type="import"
- wizardId="org.eclipse.jst.j2ee.jca.ui.internal.wizard.ConnectorComponentImportWizard">
- <enablement>
- <or>
- <adapt
- type="org.eclipse.jst.jee.ui.internal.navigator.ear.GroupEARProvider">
- </adapt>
- </or>
- </enablement>
- </commonWizard>
- </navigatorContent>
- <navigatorContent
- activeByDefault="true"
- contentProvider="org.eclipse.jst.jee.ui.internal.navigator.AppClient5ContentProvider"
- icon="icons/appclientgroup_obj.gif"
- id="org.eclipse.jst.jee.ui.appclient"
- labelProvider="org.eclipse.jst.jee.ui.internal.navigator.AppClient5LabelProvider"
- name="%APP_CLIENT_NAVIGATOR_CONTENT"
- priority="highest">
- <triggerPoints>
- <or>
- <instanceof
- value="org.eclipse.core.resources.IProject">
- </instanceof>
- <adapt
- type="org.eclipse.core.resources.IProject">
- <or>
- <test
- forcePluginActivation="true"
- property="org.eclipse.wst.common.project.facet.core.projectFacet"
- value="jst.appclient:5.0">
- </test>
- <test
- forcePluginActivation="true"
- property="org.eclipse.wst.common.project.facet.core.projectFacet"
- value="jst.appclient:6.0">
- </test>
- </or>
- </adapt>
- <instanceof
- value="org.eclipse.jst.javaee.core.JavaEEObject">
- </instanceof>
- </or>
- </triggerPoints>
- <possibleChildren>
- <or>
- <instanceof
- value="org.eclipse.jst.javaee.core.JavaEEObject">
- </instanceof>
- <adapt
- type="org.eclipse.core.resources.IProject">
- <or>
- <test
- forcePluginActivation="true"
- property="org.eclipse.wst.common.project.facet.core.projectFacet"
- value="jst.appclient:5.0">
- </test>
- </or>
- </adapt>
- </or>
- </possibleChildren>
- </navigatorContent>
- <navigatorContent
- activeByDefault="true"
- contentProvider="org.eclipse.jst.jee.ui.internal.navigator.ConnectorContentProvider"
- icon="icons/connectorgroup_obj.gif"
- id="org.eclipse.jst.jee.ui.ra"
- labelProvider="org.eclipse.jst.jee.ui.internal.navigator.ConnectorLabelProvider"
- name="%CONNECTOR_NAVIGATOR_CONTENT"
- priority="highest">
- <possibleChildren>
- <or>
- <instanceof
- value="org.eclipse.jst.javaee.core.JavaEEObject">
- </instanceof>
- <instanceof
- value="org.eclipse.jst.jee.ui.internal.navigator.ra.AbstractConnectorGroupProvider">
- </instanceof>
- </or>
- </possibleChildren>
- <triggerPoints>
- <or>
- <adapt
- type="org.eclipse.core.resources.IProject">
- <or>
- <test
- forcePluginActivation="true"
- property="org.eclipse.wst.common.project.facet.core.projectFacet"
- value="jst.connector:1.6">
- </test>
- </or>
- </adapt>
- <instanceof
- value="org.eclipse.jst.jee.ui.internal.navigator.ra.AbstractConnectorGroupProvider">
- </instanceof>
- </or>
- </triggerPoints>
-
- </navigatorContent>
- </extension>
- <extension
- point="org.eclipse.core.runtime.adapters">
- <factory
- adaptableType="org.eclipse.jst.jee.ui.internal.navigator.ejb.GroupEJBProvider"
- class="org.eclipse.jst.jee.ui.internal.deployables.EnterpriseDeployableArtifactAdapterFactory">
- <adapter
- type="org.eclipse.debug.ui.actions.ILaunchable">
- </adapter>
- </factory>
- <factory
- adaptableType="org.eclipse.jst.javaee.core.JavaEEObject"
- class="org.eclipse.jst.jee.ui.internal.deployables.EnterpriseDeployableArtifactAdapterFactory">
- <adapter
- type="org.eclipse.debug.ui.actions.ILaunchable">
- </adapter>
- </factory>
- <factory
- adaptableType="org.eclipse.jst.jee.ui.internal.navigator.web.WebAppProvider"
- class="org.eclipse.jst.jee.ui.internal.deployables.EnterpriseDeployableArtifactAdapterFactory">
- <adapter
- type="org.eclipse.debug.ui.actions.ILaunchable">
- </adapter>
- </factory>
-
-
- <factory
- adaptableType="org.eclipse.jst.javaee.core.JavaEEObject"
- class="org.eclipse.jst.j2ee.navigator.internal.J2EEEMFAdapterFactory">
- <adapter type="org.eclipse.core.resources.IResource"/>
- </factory>
-
- </extension>
- <extension
- point="org.eclipse.ui.navigator.viewer">
- <viewerActionBinding viewerId="org.eclipse.ui.navigator.ProjectExplorer">
- <includes>
- <actionExtension pattern="org.eclipse.jst.javaee.ui.JEEActionProvider"/>
- </includes>
- </viewerActionBinding>
- </extension>
- <extension
- point="org.eclipse.ui.decorators">
- <decorator
- adaptable="true"
- location="TOP_RIGHT"
- lightweight="true"
- label="%ENTERPRISE_BEAN_DECORATOR"
- state="true"
- class="org.eclipse.jst.jee.ui.internal.navigator.ejb.BeanDecorator"
- id="org.eclipse.jst.jee.ui.internal.navigator.ejb.BeanDecorator">
- <enablement>
- <or>
- <objectClass
- name="org.eclipse.jst.jee.ui.internal.navigator.ejb.BeanInterfaceNode">
- </objectClass>
- <objectClass
- name="org.eclipse.jst.jee.ui.internal.navigator.ejb.BeanNode">
- </objectClass>
- </or>
- </enablement>
- <description>
- %ENTERPRISE_BEAN_DECORATOR.DESCRIPTION
- </description>
- </decorator>
- </extension>
- <extension
- point="org.eclipse.ui.navigator.viewer">
- <viewerContentBinding
- viewerId="org.eclipse.ui.navigator.ProjectExplorer">
- <includes>
- <contentExtension pattern="org.eclipse.jst.jee.ui.*"/>
- <contentExtension pattern="org.eclipse.jst.jee.ui.filters.*"/>
- <contentExtension
- pattern="org.eclipse.jst.jee.ui.internal.navigator.*">
- </contentExtension>
- </includes>
- </viewerContentBinding>
- </extension>
-
-
-<!-- ====================================================== -->
-<!-- Label Decorators -->
-<!-- ====================================================== -->
- <extension
- point="org.eclipse.ui.decorators">
- <decorator
- adaptable="true"
- location="TOP_LEFT"
- lightweight="true"
- label="%jeeProjectDecorator"
- state="true"
- class="org.eclipse.jst.j2ee.navigator.internal.J2EEProjectDecorator"
- id="org.eclipse.jst.jee.navigator.internal.JEEProjectDecorator">
- <enablement>
- <or>
- <objectClass name="org.eclipse.core.resources.IProject"/>
- <objectClass name="org.eclipse.jdt.core.IJavaProject"/>
- </or>
- </enablement>
- <description>
- %jeeProjectDecorator.description
- </description>
- </decorator>
- </extension>
-
- <extension
- point="org.eclipse.core.expressions.propertyTesters">
- <propertyTester
- class="org.eclipse.jst.jee.ui.internal.navigator.ejb.BeanNodePropertyTester"
- id="org.eclipse.jst.jee.ui.BeanNodePropertyTester"
- namespace="org.eclipse.jst.jee.ui"
- properties="beanType"
- type="org.eclipse.jst.jee.ui.internal.navigator.ejb.BeanNode">
- </propertyTester>
- </extension>
-
-
-
- </plugin>
diff --git a/plugins/org.eclipse.jst.jee.ui/src/org/eclipse/jst/jee/ui/internal/CreateDeploymentFilesActionDelegate.java b/plugins/org.eclipse.jst.jee.ui/src/org/eclipse/jst/jee/ui/internal/CreateDeploymentFilesActionDelegate.java
deleted file mode 100644
index ec04fd22..0000000
--- a/plugins/org.eclipse.jst.jee.ui/src/org/eclipse/jst/jee/ui/internal/CreateDeploymentFilesActionDelegate.java
+++ /dev/null
@@ -1,147 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2005, 2007 IBM Corporation and others.
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
- *
- * Contributors:
- * IBM Corporation - initial API and implementation
- *******************************************************************************/
-package org.eclipse.jst.jee.ui.internal;
-
-import org.eclipse.core.commands.ExecutionException;
-import org.eclipse.core.resources.IFile;
-import org.eclipse.core.resources.IProject;
-import org.eclipse.core.runtime.IAdaptable;
-import org.eclipse.core.runtime.IPath;
-import org.eclipse.core.runtime.NullProgressMonitor;
-import org.eclipse.core.runtime.Path;
-import org.eclipse.jem.util.emf.workbench.ProjectUtilities;
-import org.eclipse.jface.dialogs.MessageDialog;
-import org.eclipse.jface.viewers.IStructuredSelection;
-import org.eclipse.jst.j2ee.internal.J2EEConstants;
-import org.eclipse.jst.j2ee.internal.actions.BaseAction;
-import org.eclipse.jst.j2ee.internal.project.J2EEProjectUtilities;
-import org.eclipse.jst.j2ee.project.JavaEEProjectUtilities;
-import org.eclipse.jst.jee.project.facet.IAppClientCreateDeploymentFilesDataModelProperties;
-import org.eclipse.jst.jee.project.facet.IConnectorCreateDeploymentFilesDataModelProperties;
-import org.eclipse.jst.jee.project.facet.ICreateDeploymentFilesDataModelProperties;
-import org.eclipse.jst.jee.project.facet.IEJBCreateDeploymentFilesDataModelProperties;
-import org.eclipse.jst.jee.project.facet.IEarCreateDeploymentFilesDataModelProperties;
-import org.eclipse.jst.jee.project.facet.IWebCreateDeploymentFilesDataModelProperties;
-import org.eclipse.jst.jee.ui.plugin.JEEUIPlugin;
-import org.eclipse.swt.widgets.Shell;
-import org.eclipse.wst.common.componentcore.ComponentCore;
-import org.eclipse.wst.common.componentcore.resources.IVirtualComponent;
-import org.eclipse.wst.common.frameworks.datamodel.DataModelFactory;
-import org.eclipse.wst.common.frameworks.datamodel.IDataModel;
-
-/**
- * @author ramanday
- */
-public class CreateDeploymentFilesActionDelegate extends BaseAction {
-
- @Override
- public void selectionChanged(org.eclipse.jface.action.IAction action, org.eclipse.jface.viewers.ISelection aSelection) {
- super.selectionChanged(action, aSelection);
- boolean isEnabled = false;
- if (aSelection != null) {
- IStructuredSelection structuredSelection = (IStructuredSelection) aSelection;
- isEnabled = isValidSelection(getProjectFromSelection(structuredSelection), null);
- }
- setEnabled(isEnabled);
- action.setEnabled(isEnabled);
- }
-
- private IProject getProjectFromSelection(IStructuredSelection structuredSelection){
- IProject project = ProjectUtilities.getProject(structuredSelection.getFirstElement());
- if (project == null){
- Object firstElement = structuredSelection.getFirstElement();
- if (IAdaptable.class.isInstance(firstElement)){
- return (IProject) ((IAdaptable) firstElement).getAdapter(IProject.class);
- }
- }
- return project;
- }
-
- private boolean isValidSelection(IProject project, Shell shell) {
- return (project != null
- && J2EEProjectUtilities.isJEEProject(project)
- && !hasDeploymentDescriptor(project, shell));
- }
-
- /**
- * Method informInvalidSelection.
- */
- private void informInvalidSelection(Shell shell) {
- MessageDialog.openInformation(shell, Messages.INVALID_DEP_DESC_SELECTION_TITLE,
- Messages.INFORM_INVALID_DEP_DESC_SELECTION);
- }
-
- private boolean hasDeploymentDescriptor(IProject project, Shell shell) {
- boolean ret = true;
- IPath ddFilePath = null;
- if(JavaEEProjectUtilities.isEARProject(project)){
- ddFilePath = new Path(J2EEConstants.APPLICATION_DD_URI);
- } else if(JavaEEProjectUtilities.isEJBProject(project)){
- ddFilePath = new Path(J2EEConstants.EJBJAR_DD_URI);
- } else if(JavaEEProjectUtilities.isDynamicWebProject(project)){
- ddFilePath = new Path(J2EEConstants.WEBAPP_DD_URI);
- } else if(JavaEEProjectUtilities.isApplicationClientProject(project)){
- ddFilePath = new Path(J2EEConstants.APP_CLIENT_DD_URI);
- }else if(JavaEEProjectUtilities.isJCAProject(project)){
- ddFilePath = new Path(J2EEConstants.RAR_DD_URI);
- }
- IVirtualComponent component = ComponentCore.createComponent(project);
- if(component.getRootFolder() != null
- && component.getRootFolder().getUnderlyingFolder() != null){
- IFile ddXmlFile = component.getRootFolder().getUnderlyingFolder().getFile(ddFilePath);
- ret = ddXmlFile.exists();
- if(shell != null && ret)
- informInvalidSelection(shell);
- }
- return ret;
- }
-
-
- /*
- */
- @Override
- protected void primRun(Shell shell) {
- IProject project = getProjectFromSelection(selection);
- if (!validateSelection(project, shell))
- return;
- try {
- getDataModel(project).getDefaultOperation().execute( new NullProgressMonitor(), null);
- } catch (ExecutionException e) {
- JEEUIPlugin.logError(e);
- }
- }
-
- private IDataModel getDataModel(IProject project) {
- Class dataModelClass = null;
- if(JavaEEProjectUtilities.isEARProject(project)){
- dataModelClass = IEarCreateDeploymentFilesDataModelProperties.class;
- } else if(JavaEEProjectUtilities.isEJBProject(project)){
- dataModelClass = IEJBCreateDeploymentFilesDataModelProperties.class;
- } else if(JavaEEProjectUtilities.isDynamicWebProject(project)){
- dataModelClass = IWebCreateDeploymentFilesDataModelProperties.class;
- } else if(JavaEEProjectUtilities.isApplicationClientProject(project)){
- dataModelClass = IAppClientCreateDeploymentFilesDataModelProperties.class;
- }else if(JavaEEProjectUtilities.isJCAProject(project)){
- dataModelClass = IConnectorCreateDeploymentFilesDataModelProperties.class;
- }
- IDataModel dataModel = DataModelFactory.createDataModel(dataModelClass);
- dataModel.setProperty(ICreateDeploymentFilesDataModelProperties.TARGET_PROJECT, project);
- return dataModel;
- }
-
- private boolean validateSelection(IProject project, Shell shell) {
- boolean validSelection = true;
- if (!isValidSelection(project, shell)) {
- validSelection = false;
- }
- return validSelection;
- }
-}
diff --git a/plugins/org.eclipse.jst.jee.ui/src/org/eclipse/jst/jee/ui/internal/Messages.java b/plugins/org.eclipse.jst.jee.ui/src/org/eclipse/jst/jee/ui/internal/Messages.java
deleted file mode 100644
index aa593a4..0000000
--- a/plugins/org.eclipse.jst.jee.ui/src/org/eclipse/jst/jee/ui/internal/Messages.java
+++ /dev/null
@@ -1,78 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2003, 2006 IBM Corporation and others.
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
- *
- * Contributors:
- * IBM Corporation - initial API and implementation
- *******************************************************************************/
-package org.eclipse.jst.jee.ui.internal;
-
-import org.eclipse.osgi.util.NLS;
-
-
-public class Messages extends NLS {
-
- private static final String BUNDLE_NAME = "org.eclipse.jst.jee.ui.internal.messages"; //$NON-NLS-1$
-
-
- private Messages() {
- // Do not instantiate
- }
-
- public static String INVALID_DEP_DESC_SELECTION_TITLE;
- public static String INFORM_INVALID_DEP_DESC_SELECTION;
- public static String DEPLOYMENT_DESCRIPTOR;
- public static String SESSION_BEANS;
- public static String ENTITY_BEANS;
- public static String MESSAGE_DRIVEN_BEANS;
- public static String MessageAdapterNode_MESSAGE_ADAPTER;
- public static String MessageListenerNode_MessageListener;
- public static String ActicationSpecNode_ActivationSpec;
- public static String ACTIVATION_CONFIG_PROPERTIES;
- public static String ENTERPRISE_BEAN_CLASS_DESCRIPTION;
-
- public static String SERVLET_ITEM_PROVIDER;
- public static String LISTENER_ITEM_PROVIDER;
- public static String FILTERS_ITEM_PROVIDER;
- public static String FILTER_MAPPING_ITEM_PROVIDER;
- public static String SERVLET_MAPPING_ITEM_PROVIDER;
- public static String ERROR_PAGES_ITEM_PROVIDER;
- public static String WELCOME_PAGES_ITEM_PROVIDER;
- public static String CONTEXT_PARAMS_ITEM_PROVIDER;
-
-
-
-
- public static String REFERENCES;
- public static String BUNDLED_LIBRARIES_NODE;
- public static String LIBRARY_DIRECTORY;
- public static String EAR_MODULES_NODE;
- public static String EJBLOCAL_REFERENCES;
- public static String EJB_REFERENCES;
- public static String ENVIROMENT_ENTRIES;
- public static String RESOURCE_ENVIROMENT_ENTRIES;
- public static String RESOURCE_REFERENCES;
- public static String SERVICE_REFERENCES;
- public static String AddProjectToEARDropAssistant_The_dragged_project_cannot_be_added_;
- public static String AddProjectToEARDropAssistant_The_project_0_cannot_be_accesse_;
- public static String AddProjectToEARDropAssistant_Could_not_add_module_to_Enterprise_;
- public static String AddModuleToEarDropAssistant_Adding_module_to_ea_;
- public static String ImportJEEModuleDropAssistant_Importing_Java_Enterprise_Edition_artifacts;
- public static String ImportJEEModuleDropAssistant_Could_not_recognize_extension_0_;
- public static String InboundRaNode_Inbound_Resource_adapter;
-
- public static String ConnectorLabelProvider_ADMIN_OBJECT;
- public static String ConnectorLabelProvider_CONFIG_PROPERTY;
- public static String ConnectorLabelProvider_ConnectionDefinition;
- public static String ConnectorLabelProvider_LICENSE_ARTIFACT;
- public static String ConnectorLabelProvider_RequiredConfigProperty;
- public static String GroupRaContentProvider_RESOURCE_ADAPTER;
- public static String OutboundRaNode_OutboundResourceAdapter;
-
- static {
- NLS.initializeMessages(BUNDLE_NAME, Messages.class);
- }
-}
diff --git a/plugins/org.eclipse.jst.jee.ui/src/org/eclipse/jst/jee/ui/internal/deployables/EJBDeployableArtifactAdapterFactory.java b/plugins/org.eclipse.jst.jee.ui/src/org/eclipse/jst/jee/ui/internal/deployables/EJBDeployableArtifactAdapterFactory.java
deleted file mode 100644
index f58efe0..0000000
--- a/plugins/org.eclipse.jst.jee.ui/src/org/eclipse/jst/jee/ui/internal/deployables/EJBDeployableArtifactAdapterFactory.java
+++ /dev/null
@@ -1,48 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2005, 2007 IBM Corporation and others.
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
- *
- * Contributors:
- * IBM Corporation - initial API and implementation
- *******************************************************************************/
-
-/*
- * Created on Jan 18, 2005
- */
-package org.eclipse.jst.jee.ui.internal.deployables;
-
-import org.eclipse.core.runtime.IAdapterFactory;
-import org.eclipse.debug.ui.actions.ILaunchable;
-import org.eclipse.jst.javaee.ejb.SessionBean;
-import org.eclipse.wst.server.core.IModuleArtifact;
-import org.eclipse.wst.server.core.model.ModuleArtifactAdapterDelegate;
-
-public class EJBDeployableArtifactAdapterFactory extends ModuleArtifactAdapterDelegate implements IAdapterFactory {
-
- public Object getAdapter(Object adaptableObject, Class adapterType) {
- return null;
- }
-
- public Class[] getAdapterList() {
- return new Class[]{ILaunchable.class};
- }
-
- @Override
- public IModuleArtifact getModuleArtifact(Object obj) {
- return EJBDeployableArtifactAdapterUtil.getModuleObject(obj);
- }
- @Override
- public IModuleArtifact[] getModuleArtifacts(Object obj) {
-
- if (obj instanceof SessionBean)
- return EJBDeployableArtifactAdapterUtil.getModuleObjects((SessionBean) obj);
- IModuleArtifact artifact = getModuleArtifact(obj);
- if (artifact != null)
- return new IModuleArtifact[] { artifact };
- return null;
- }
-
-}
diff --git a/plugins/org.eclipse.jst.jee.ui/src/org/eclipse/jst/jee/ui/internal/deployables/EJBDeployableArtifactAdapterUtil.java b/plugins/org.eclipse.jst.jee.ui/src/org/eclipse/jst/jee/ui/internal/deployables/EJBDeployableArtifactAdapterUtil.java
deleted file mode 100644
index 0958cde..0000000
--- a/plugins/org.eclipse.jst.jee.ui/src/org/eclipse/jst/jee/ui/internal/deployables/EJBDeployableArtifactAdapterUtil.java
+++ /dev/null
@@ -1,249 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2003, 2007 IBM Corporation and others.
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
- *
- * Contributors:
- * IBM Corporation - initial API and implementation
- *******************************************************************************/
-package org.eclipse.jst.jee.ui.internal.deployables;
-
-import java.util.ArrayList;
-import java.util.Arrays;
-import java.util.Iterator;
-import java.util.List;
-
-import org.eclipse.core.resources.IFile;
-import org.eclipse.core.resources.IProject;
-import org.eclipse.core.resources.IResource;
-import org.eclipse.core.runtime.NullProgressMonitor;
-import org.eclipse.emf.ecore.EObject;
-import org.eclipse.emf.ecore.resource.Resource;
-import org.eclipse.jdt.core.ICompilationUnit;
-import org.eclipse.jdt.core.IJavaProject;
-import org.eclipse.jdt.core.JavaModelException;
-import org.eclipse.jem.util.emf.workbench.ProjectUtilities;
-import org.eclipse.jst.j2ee.internal.J2EEConstants;
-import org.eclipse.jst.j2ee.internal.project.J2EEProjectUtilities;
-import org.eclipse.jst.j2ee.project.JavaEEProjectUtilities;
-import org.eclipse.jst.javaee.ejb.EJBJar;
-import org.eclipse.jst.javaee.ejb.EntityBean;
-import org.eclipse.jst.javaee.ejb.MessageDrivenBean;
-import org.eclipse.jst.javaee.ejb.SessionBean;
-import org.eclipse.jst.jee.internal.deployables.JEEFlexProjDeployable;
-import org.eclipse.jst.jee.ui.plugin.JEEUIPlugin;
-import org.eclipse.jst.server.core.EJBBean;
-import org.eclipse.wst.common.componentcore.ComponentCore;
-import org.eclipse.wst.common.componentcore.resources.IVirtualComponent;
-import org.eclipse.wst.common.componentcore.resources.IVirtualResource;
-import org.eclipse.wst.common.internal.emfworkbench.WorkbenchResourceHelper;
-import org.eclipse.wst.server.core.IModule;
-import org.eclipse.wst.server.core.IModuleArtifact;
-import org.eclipse.wst.server.core.ServerUtil;
-import org.eclipse.wst.server.core.model.ModuleDelegate;
-import org.eclipse.wst.server.core.util.NullModuleArtifact;
-
-/**
- * @version 1.0
- * @author
- */
-public class EJBDeployableArtifactAdapterUtil {
- /**
- * Constructor for EJBDeployableObjectAdapter.
- */
- public EJBDeployableArtifactAdapterUtil() {
- super();
- }
-
- public static IModuleArtifact getModuleObject(Object obj) {
- if (obj == null)
- return null;
- else if (obj instanceof EJBJar)
- return getModuleObject((EJBJar) obj);
- else if (obj instanceof SessionBean)
- return getModuleObject((SessionBean) obj);
- else if (obj instanceof MessageDrivenBean)
- return getModuleObject((MessageDrivenBean) obj);
- else if (obj instanceof EntityBean)
- return getModuleObject((EntityBean) obj);
- else if (obj instanceof IProject)
- return getModuleObject((IProject) obj);
- else if (obj instanceof IJavaProject)
- return getModuleObject(((IJavaProject) obj).getProject());
- else if (obj instanceof IFile)
- return getModuleObject((IFile) obj);
- else if (obj instanceof ICompilationUnit)
- return getModuleObject((ICompilationUnit) obj);
- return null;
- }
-
- protected static boolean hasInterestedComponents(IProject project) {
- return JavaEEProjectUtilities.isEJBProject(project);
- }
-
- protected static IModuleArtifact getModuleObject(ICompilationUnit cu) {
-
- try {
- IFile file = (IFile) cu.getCorrespondingResource();
- IProject project = file.getProject();
- if (hasInterestedComponents(project)) {
- return getModuleJavaObject(file);
- }
-
- } catch (JavaModelException e) {
- JEEUIPlugin.logError(e);
- }
- return null;
- }
-
- protected static IModuleArtifact getModuleObject(EJBJar ejbJar) {
- IModule dep = getModule((EObject)ejbJar);
- return createModuleObject(dep, null, false, false);
- }
-
- protected static IModuleArtifact getModuleObject(SessionBean ejb) {
- IModule dep = getModule((EObject)ejb);
- return createModuleObject(dep, ejb.getEjbName(), false, false);
- }
- protected static IModuleArtifact getModuleObject(EntityBean ejb) {
- IModule dep = getModule((EObject)ejb);
- return createModuleObject(dep, ejb.getEjbName(), false, false);
- }
- protected static IModuleArtifact getModuleObject(MessageDrivenBean ejb) {
- IModule dep = getModule((EObject)ejb);
- return createModuleObject(dep, ejb.getEjbName(), false, false);
- }
- protected static IModuleArtifact[] getModuleObjects(SessionBean ejb) {
- List modArtifacts = new ArrayList();
- IModule dep = getModule((EObject)ejb);
- List busLocals = ejb.getBusinessLocals();
- List busRemotes = ejb.getBusinessRemotes();
- for (Iterator iterator = busLocals.iterator(); iterator.hasNext();) {
- String localName = (String) iterator.next();
- modArtifacts.add(createModuleObjectForSessionBean(dep, ejb.getEjbName(), localName, false,true));
-
- }
- for (Iterator iterator = busRemotes.iterator(); iterator.hasNext();) {
- String remoteName = (String) iterator.next();
- modArtifacts.add(createModuleObjectForSessionBean(dep, ejb.getEjbName(), remoteName, true, false));
- }
-
- // for EJB 3.1 no-interface
- if (ejb.getLocalBean() != null){
- modArtifacts.add(createModuleObjectForSessionBean(dep, ejb.getEjbName(), null, false,false));
- }
-
- return (IModuleArtifact[])modArtifacts.toArray(new IModuleArtifact[modArtifacts.size()]);
- }
-
- protected static IModuleArtifact getModuleObject(IProject project) {
- if (hasInterestedComponents(project)) {
- IModule dep = getModule(project, null);
- return createModuleObject(dep, null, false, false);
- }
- return null;
- }
-
- protected static IModuleArtifact getModuleObject(IFile file) {
- IVirtualResource[] resources = ComponentCore.createResources(file);
- IVirtualComponent component = null;
- if (resources[0] != null || resources.length <= 0)
- component = resources[0].getComponent();
- if (hasInterestedComponents(file.getProject())) {
- String ext = file.getFileExtension();
- if ("java".equals(ext) || "class".equals(ext)) //$NON-NLS-1$ //$NON-NLS-2$
- return getModuleJavaObject(file);
- if (file.getProjectRelativePath().toString().endsWith(J2EEConstants.EJBJAR_DD_URI))
- return createModuleObject(getModule(file.getProject(), component), null, false, false);
- }
- return null;
- }
-
- protected static IModule getModule(EObject refObject) {
- IProject proj = ProjectUtilities.getProject(refObject);
- if (proj == null)
- return null;
- Resource refResource = refObject.eResource();
- IVirtualResource[] resources = null;
- IVirtualComponent component = null;
- try {
- IResource eclipeServResoruce = WorkbenchResourceHelper.getFile(refResource);
- resources = ComponentCore.createResources(eclipeServResoruce);
- if (resources[0] != null)
- component = resources[0].getComponent();
- } catch (Exception e) {
- JEEUIPlugin.logError(e);
- }
- return getModule(proj, component);
- }
-
- protected static IModule getModule(IProject project, IVirtualComponent component) {
- IModule deployable = null;
- Iterator iterator = Arrays.asList(ServerUtil.getModules(J2EEProjectUtilities.EJB)).iterator();
- String componentName = null;
- if (component != null)
- componentName = component.getName();
- else
- return getModuleProject(project, iterator);
- while (iterator.hasNext()) {
- Object next = iterator.next();
- if (next instanceof IModule) {
- deployable = (IModule) next;
- if (deployable.getName().equals(componentName)) {
- return deployable;
- }
- }
- }
- return null;
- }
-
- protected static IModule getModuleProject(IProject project, Iterator iterator) {
- IModule deployable = null;
- while (iterator.hasNext()) {
- Object next = iterator.next();
- if (next instanceof IModule) {
- deployable = (IModule) next;
- if (deployable.getProject().equals(project))
- return deployable;
- }
- }
- return null;
- }
-
-
- protected static IModuleArtifact getModuleJavaObject(IFile file) {
- return null;
- }
-
- protected static IModuleArtifact createModuleObject(IModule module, String ejbName, boolean remote, boolean local) {
- if (module != null) {
- String jndiName = null;
- if (ejbName != null) {
- module.loadAdapter(ModuleDelegate.class, new NullProgressMonitor());
- JEEFlexProjDeployable moduleDelegate = (JEEFlexProjDeployable)module.getAdapter(ModuleDelegate.class);
- jndiName = moduleDelegate.getJNDIName(ejbName);
- return new EJBBean(module, jndiName, remote, local,EJBBean.EJB_30);
- }
- return new NullModuleArtifact(module);
- }
- return null;
- }
-
- protected static IModuleArtifact createModuleObjectForSessionBean(IModule module, String ejbName, String interfaceName, boolean remote, boolean local) {
- if (module != null) {
- String jndiName = null;
- if (ejbName != null) {
- module.loadAdapter(ModuleDelegate.class, new NullProgressMonitor());
- JEEFlexProjDeployable moduleDelegate = (JEEFlexProjDeployable)module.getAdapter(ModuleDelegate.class);
- jndiName = moduleDelegate.getJNDIName(ejbName, interfaceName);
- return new EJBBean(module, jndiName, remote, local,EJBBean.EJB_30, interfaceName);
- }
- return new NullModuleArtifact(module);
- }
- return null;
- }
-
-
-}
diff --git a/plugins/org.eclipse.jst.jee.ui/src/org/eclipse/jst/jee/ui/internal/deployables/EnterpriseApplicationDeployableAdapterUtil.java b/plugins/org.eclipse.jst.jee.ui/src/org/eclipse/jst/jee/ui/internal/deployables/EnterpriseApplicationDeployableAdapterUtil.java
deleted file mode 100644
index 32bc317..0000000
--- a/plugins/org.eclipse.jst.jee.ui/src/org/eclipse/jst/jee/ui/internal/deployables/EnterpriseApplicationDeployableAdapterUtil.java
+++ /dev/null
@@ -1,207 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2003, 2007 IBM Corporation and others.
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
- *
- * Contributors:
- * IBM Corporation - initial API and implementation
- *******************************************************************************/
-package org.eclipse.jst.jee.ui.internal.deployables;
-
-import java.util.Arrays;
-import java.util.Iterator;
-
-import org.eclipse.core.resources.IFile;
-import org.eclipse.core.resources.IProject;
-import org.eclipse.core.resources.IResource;
-import org.eclipse.emf.ecore.EObject;
-import org.eclipse.emf.ecore.resource.Resource;
-import org.eclipse.jem.util.emf.workbench.ProjectUtilities;
-import org.eclipse.jst.j2ee.internal.J2EEConstants;
-import org.eclipse.jst.j2ee.internal.project.J2EEProjectUtilities;
-import org.eclipse.jst.javaee.application.Application;
-import org.eclipse.jst.jee.ui.plugin.JEEUIPlugin;
-import org.eclipse.wst.common.componentcore.ComponentCore;
-import org.eclipse.wst.common.componentcore.resources.IVirtualComponent;
-import org.eclipse.wst.common.componentcore.resources.IVirtualResource;
-import org.eclipse.wst.common.internal.emfworkbench.WorkbenchResourceHelper;
-import org.eclipse.wst.server.core.IModule;
-import org.eclipse.wst.server.core.IModuleArtifact;
-import org.eclipse.wst.server.core.ServerUtil;
-import org.eclipse.wst.server.core.util.NullModuleArtifact;
-
-/**
- * Creates the Object adapter for ear projects.
- */
-public class EnterpriseApplicationDeployableAdapterUtil {
-
- /**
- * Constructor for EnterpriseApplicationDeployableObjectAdapter.
- */
- public EnterpriseApplicationDeployableAdapterUtil() {
- super();
- }// EnterpriseApplicationDeployableObjectAdapter
-
- /**
- * Gets the object for a type of object.
- *
- * @param Object
- * obj - Object to adapt.
- */
- public static IModuleArtifact getModuleObject(Object obj) {
- if (obj instanceof Application)
- return getModuleObject((Application) obj);
- if (obj instanceof IProject)
- return getModuleObject((IProject) obj);
- if (obj instanceof IFile)
- return getModuleObject((IFile) obj);
- return null;
- }// getDeployableObject
-
- /**
- * Gets the deployable object for ear instance.
- *
- * @param Application
- * application - EAR instance.
- */
- protected static IModuleArtifact getModuleObject(Application application) {
- IModule dep = getModule((EObject)application);
- return createModuleObject(dep);
- }
-
- /**
- * Gets the deployable object for project instances.
- *
- * @param IProject
- * project - Project instance.
- * @return IModuleObject
- */
- protected static IModuleArtifact getModuleObject(IProject project) {
- IModule dep = getModule(project,null);
- return createModuleObject(dep);
- }// getModuleObject
-
- /**
- * Gets the deployable object for file instances.
- *
- * @param IFile
- * file - File instance.
- * @return IModuleObject
- */
- protected static IModuleArtifact getModuleObject(IFile file) {
- if (file.getProjectRelativePath().toString().endsWith(J2EEConstants.APPLICATION_DD_URI)) {
- {
- IVirtualResource[] resources = ComponentCore.createResources(file);
- IVirtualComponent component = null;
- if (resources[0] != null || resources.length <= 0)
- component = resources[0].getComponent();
- return createModuleObject(getModule(file.getProject(), component));
- }
- }// if
- return null;
- }// getModuleObject
-
- /**
- * Gets the deployable object.
- *
- * @param EObject
- * refObject - The current refObject.
- * @return IModule
- */
- protected static IModule getModule(EObject refObject) {
- IProject proj = ProjectUtilities.getProject(refObject);
- Resource servResource = refObject.eResource();
- IVirtualResource[] resources = null;
- try {
- IResource eclipeServResoruce = WorkbenchResourceHelper.getFile(servResource);
- resources = ComponentCore.createResources(eclipeServResoruce);
- } catch (Exception e) {
- JEEUIPlugin.logError(e);
- }
- IVirtualComponent component = null;
- if (resources != null && resources[0] != null){
- component = resources[0].getComponent();
- }
- return getModule(proj,component);
- }
-
-
-
- protected static IModule getModuleProject(IProject project, Iterator iterator) {
- IModule deployable = null;
- while (iterator.hasNext()) {
- Object next = iterator.next();
- if (next instanceof IModule) {
- deployable = (IModule) next;
- if (deployable.getProject().equals(project))
- return deployable;
- }
- }
- return null;
- }
-
- protected static IModule getModule(IProject project, IVirtualComponent component) {
- IModule deployable = null;
- Iterator iterator = Arrays.asList(ServerUtil.getModules(J2EEProjectUtilities.ENTERPRISE_APPLICATION)).iterator();
- String componentName = null;
- if (component != null)
- componentName = component.getName();
- else
- return getModuleProject(project, iterator);
- while (iterator.hasNext()) {
- Object next = iterator.next();
- if (next instanceof IModule) {
- deployable = (IModule) next;
- if (deployable.getName().equals(componentName)) {
- return deployable;
- }
- }
- }
- return null;
- }
-
- /**
- * Creates the deployable object.
- *
- * @param IModuleObject
- * deployable - The current module object.
- */
- protected static IModuleArtifact createModuleObject(IModule module) {
-
- if (module != null) {
- return new NullModuleArtifact(module);
- }
-
- return null;
- }// createDeployableObject
-
- /*
- * (non-Javadoc)
- *
- * @see org.eclipse.wst.server.core.IModuleArtifactAdapter#getId()
- */
- public String getId() {
- return null;
- }
-
- /*
- * (non-Javadoc)
- *
- * @see org.eclipse.wst.server.core.IModuleArtifactAdapter#getObjectClassName()
- */
- public String getObjectClassName() {
- return null;
- }
-
- /*
- * (non-Javadoc)
- *
- * @see org.eclipse.wst.server.core.IModuleArtifactAdapter#isPluginActivated()
- */
- public boolean isPluginActivated() {
- return false;
- }
-
-}// EnterpriseApplicationDeployableObjectAdapter
diff --git a/plugins/org.eclipse.jst.jee.ui/src/org/eclipse/jst/jee/ui/internal/deployables/EnterpriseDeployableArtifactAdapterFactory.java b/plugins/org.eclipse.jst.jee.ui/src/org/eclipse/jst/jee/ui/internal/deployables/EnterpriseDeployableArtifactAdapterFactory.java
deleted file mode 100644
index 6f05877..0000000
--- a/plugins/org.eclipse.jst.jee.ui/src/org/eclipse/jst/jee/ui/internal/deployables/EnterpriseDeployableArtifactAdapterFactory.java
+++ /dev/null
@@ -1,36 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2005, 2007 IBM Corporation and others.
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
- *
- * Contributors:
- * IBM Corporation - initial API and implementation
- *******************************************************************************/
-/*
- * Created on Jan 18, 2005
- */
-package org.eclipse.jst.jee.ui.internal.deployables;
-
-import org.eclipse.core.runtime.IAdapterFactory;
-import org.eclipse.debug.ui.actions.ILaunchable;
-import org.eclipse.wst.server.core.IModuleArtifact;
-import org.eclipse.wst.server.core.model.ModuleArtifactAdapterDelegate;
-
-public class EnterpriseDeployableArtifactAdapterFactory extends ModuleArtifactAdapterDelegate implements IAdapterFactory {
-
- public Object getAdapter(Object adaptableObject, Class adapterType) {
- return null;
- }
-
- public Class[] getAdapterList() {
- return new Class[] {ILaunchable.class };
- }
-
- @Override
- public IModuleArtifact getModuleArtifact(Object obj) {
- return EnterpriseApplicationDeployableAdapterUtil.getModuleObject(obj);
- }
-
-}
diff --git a/plugins/org.eclipse.jst.jee.ui/src/org/eclipse/jst/jee/ui/internal/deployables/WebDeployableArtifactAdapterFactory.java b/plugins/org.eclipse.jst.jee.ui/src/org/eclipse/jst/jee/ui/internal/deployables/WebDeployableArtifactAdapterFactory.java
deleted file mode 100644
index 39b17cc..0000000
--- a/plugins/org.eclipse.jst.jee.ui/src/org/eclipse/jst/jee/ui/internal/deployables/WebDeployableArtifactAdapterFactory.java
+++ /dev/null
@@ -1,34 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2003, 2007 IBM Corporation and others.
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
- *
- * Contributors:
- * IBM Corporation - initial API and implementation
- *******************************************************************************/
-package org.eclipse.jst.jee.ui.internal.deployables;
-
-import org.eclipse.core.runtime.IAdapterFactory;
-import org.eclipse.debug.ui.actions.ILaunchable;
-import org.eclipse.wst.server.core.IModuleArtifact;
-import org.eclipse.wst.server.core.model.ModuleArtifactAdapterDelegate;
-
-public class WebDeployableArtifactAdapterFactory extends ModuleArtifactAdapterDelegate implements IAdapterFactory {
-
- public Object getAdapter(Object adaptableObject, Class adapterType) {
- return null;
- }
-
- public Class[] getAdapterList() {
- return new Class[]{ILaunchable.class};
- }
-
-
- @Override
- public IModuleArtifact getModuleArtifact(Object obj) {
- return WebDeployableArtifactUtil.getModuleObject(obj);
- }
-
-}
diff --git a/plugins/org.eclipse.jst.jee.ui/src/org/eclipse/jst/jee/ui/internal/deployables/WebDeployableArtifactUtil.java b/plugins/org.eclipse.jst.jee.ui/src/org/eclipse/jst/jee/ui/internal/deployables/WebDeployableArtifactUtil.java
deleted file mode 100644
index f9bfe71..0000000
--- a/plugins/org.eclipse.jst.jee.ui/src/org/eclipse/jst/jee/ui/internal/deployables/WebDeployableArtifactUtil.java
+++ /dev/null
@@ -1,398 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2003, 2007 IBM Corporation and others.
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
- *
- * Contributors:
- * IBM Corporation - initial API and implementation
- *******************************************************************************/
-package org.eclipse.jst.jee.ui.internal.deployables;
-
-import java.util.ArrayList;
-import java.util.Iterator;
-import java.util.List;
-
-import org.eclipse.core.resources.IProject;
-import org.eclipse.core.resources.IResource;
-import org.eclipse.core.runtime.IAdaptable;
-import org.eclipse.core.runtime.IPath;
-import org.eclipse.core.runtime.NullProgressMonitor;
-import org.eclipse.core.runtime.Path;
-import org.eclipse.emf.ecore.EObject;
-import org.eclipse.emf.ecore.resource.Resource;
-import org.eclipse.jdt.core.IClasspathEntry;
-import org.eclipse.jdt.core.ICompilationUnit;
-import org.eclipse.jdt.core.IJavaElement;
-import org.eclipse.jdt.core.IJavaProject;
-import org.eclipse.jdt.core.IType;
-import org.eclipse.jdt.core.ITypeHierarchy;
-import org.eclipse.jdt.core.JavaCore;
-import org.eclipse.jem.util.emf.workbench.ProjectUtilities;
-import org.eclipse.jst.j2ee.internal.project.J2EEProjectUtilities;
-import org.eclipse.jst.j2ee.internal.web.jfaces.extension.FileURL;
-import org.eclipse.jst.j2ee.internal.web.jfaces.extension.FileURLExtensionReader;
-import org.eclipse.jst.j2ee.model.IModelProvider;
-import org.eclipse.jst.j2ee.model.ModelProviderManager;
-import org.eclipse.jst.j2ee.project.JavaEEProjectUtilities;
-import org.eclipse.jst.javaee.core.UrlPatternType;
-import org.eclipse.jst.javaee.web.IWebCommon;
-import org.eclipse.jst.javaee.web.Servlet;
-import org.eclipse.jst.javaee.web.ServletMapping;
-import org.eclipse.jst.javaee.web.WebApp;
-import org.eclipse.jst.javaee.web.internal.impl.ServletImpl;
-import org.eclipse.jst.jee.ui.plugin.JEEUIPlugin;
-import org.eclipse.wst.common.componentcore.ComponentCore;
-import org.eclipse.wst.common.componentcore.resources.IVirtualComponent;
-import org.eclipse.wst.common.componentcore.resources.IVirtualResource;
-import org.eclipse.wst.common.internal.emfworkbench.WorkbenchResourceHelper;
-import org.eclipse.wst.server.core.IModule;
-import org.eclipse.wst.server.core.IModuleArtifact;
-import org.eclipse.wst.server.core.ServerUtil;
-import org.eclipse.wst.server.core.internal.ModuleType;
-import org.eclipse.wst.server.core.util.WebResource;
-
-/**
- * @version 1.0
- * @author
- */
-public class WebDeployableArtifactUtil {
-
- private final static String GENERIC_SERVLET_CLASS_TYPE = "javax.servlet.GenericServlet"; //$NON-NLS-1$
- private final static String CACTUS_SERVLET_CLASS_TYPE = "org.apache.cactus.server.ServletTestRedirector"; //$NON-NLS-1$
-
- public WebDeployableArtifactUtil() {
- super();
- }
-
- public static IModuleArtifact getModuleObject(Object obj) {
- IResource resource = null;
- if (obj instanceof IResource)
- resource = (IResource) obj;
- if (obj instanceof IModuleArtifact)
- resource = ((IModuleArtifact) obj).getModule().getProject();
- else if (obj instanceof IAdaptable)
- resource = (IResource) ((IAdaptable) obj).getAdapter(IResource.class);
- else if (obj instanceof EObject) {
- resource = ProjectUtilities.getProject((EObject) obj);
- if (obj instanceof Servlet) {
- ServletImpl servlet = ((ServletImpl) obj);
- Resource servResource = servlet.eResource();
- IVirtualResource[] resources = null;
- try {
- IResource eclipeServResoruce = WorkbenchResourceHelper.getFile(servResource);
- resources = ComponentCore.createResources(eclipeServResoruce);
- } catch (Exception e) {
- JEEUIPlugin.logError(e);
- }
- IVirtualComponent component = null;
- if (resources != null && resources[0] != null){
- component = resources[0].getComponent();
- }
- String mapping = null;
- if (servlet.getServletClass() != null) {
- List<ServletMapping> mappings = getServletMappings(resource, servlet.getServletClass());
-
- if (mappings != null && !mappings.isEmpty()) {
- ServletMapping map = mappings.get(0);
- UrlPatternType urlPattern = map.getUrlPatterns().get(0);
- mapping = urlPattern.getValue();
- }
- if (mapping != null) {
- return new WebResource(getModule(resource.getProject(), component), new Path(mapping));
- }
- return new WebResource(getModule(resource.getProject(), component), new Path("servlet/" + servlet.getServletClass())); //$NON-NLS-1$
-
- } else if (servlet.getJspFile() != null) {
- if (component != null) {
- IPath jspFilePath = new Path(servlet.getJspFile());
- resource = component.getRootFolder().getUnderlyingFolder().getFile(jspFilePath);
- }
- }
- }
- }
- if (resource == null)
- return null;
-
- if (resource instanceof IProject) {
- IProject project = (IProject) resource;
- if (hasInterestedComponents(project))
- return new WebResource(getModule(project, null), project.getProjectRelativePath());
- }
-
- if (!hasInterestedComponents(resource.getProject()))
- return null;
- if (isCactusJunitTest(resource))
- return null;
-
- IPath resourcePath = resource.getFullPath();
- IVirtualResource[] resources = ComponentCore.createResources(resource);
- IVirtualComponent component = null;
- if (resources.length <= 0 || resources[0] == null )
- return null;
- component = resources[0].getComponent();
- String className = getServletClassName(resource);
- if (className != null && component != null) {
- String mapping = getServletMapping(resource, true, className, component.getName());
- if (mapping != null) {
- return new WebResource(getModule(resource.getProject(), component), new Path(mapping));
- }
- // if there is no servlet mapping, provide direct access to the servlet
- // through the fully qualified class name
- return new WebResource(getModule(resource.getProject(), component), new Path("servlet/" + className)); //$NON-NLS-1$
-
- }
- if (className == null && component != null) {
- IPath rootPath = component.getRootFolder().getProjectRelativePath();
- IPath jspPath = resource.getProjectRelativePath().removeFirstSegments(rootPath.segmentCount());
- String mapping = getJSPServletMapping(resource, jspPath.makeAbsolute().toString());
- if (mapping != null) {
- return new WebResource(getModule(resource.getProject(), component), new Path(mapping));
- }
- }
- resourcePath = resources[0].getRuntimePath();
-
- try {//adding try/catch to avoid future issues that would require commenting this out.
- // Extension read to get the correct URL for Java Server Faces file if
- // the jsp is of type jsfaces.
- FileURL jspURL = FileURLExtensionReader.getInstance().getFilesURL();
- if (jspURL != null) {
- IPath correctJSPPath = jspURL.getFileURL(resource, resourcePath);
- if (correctJSPPath != null && correctJSPPath.toString().length() > 0)
- return new WebResource(getModule(resource.getProject(), component), correctJSPPath);
- }
- }catch (Exception e) {}
-
- return new WebResource(getModule(resource.getProject(), component), resourcePath);
- }
-
- protected static IModule getModule(IProject project, IVirtualComponent component) {
- String componentName = null;
- if (component != null)
- componentName = component.getName();
- ModuleType[] moduleTypeArray = new ModuleType[]{
- ModuleType.getModuleType(J2EEProjectUtilities.DYNAMIC_WEB, null),
- ModuleType.getModuleType(J2EEProjectUtilities.WEBFRAGMENT, null)
- };
- IModule[] modules = ServerUtil.getModules(moduleTypeArray);
- for (IModule module : modules) {
- if ((project == null || project.equals(module.getProject()))
- && (componentName == null || componentName.equals(module.getName())))
- return module;
- }
-
- // otherwise fall back to other types of web modules on the project
- if (project != null) {
- modules = ServerUtil.getModules(project);
- for (IModule module : modules) {
- if (componentName == null || componentName.equals(module.getName()))
- return module;
- }
- }
- return null;
- }
-
- /**
- * @deprecated - see getModule() for better logic for finding a project's IModule
- */
- protected static IModule getModuleProject(IProject project, Iterator iterator) {
- IModule deployable = null;
- while (iterator.hasNext()) {
- Object next = iterator.next();
- if (next instanceof IModule) {
- deployable = (IModule) next;
- if (deployable.getProject().equals(project))
- return deployable;
- }
- }
- return null;
- }
-
- /**
- *
- * Very temporary api - TODO - rip this out by 1.0
- */
- private static boolean isCactusJunitTest(IResource resource) {
- return getClassNameForType(resource, CACTUS_SERVLET_CLASS_TYPE) != null;
- }
-
-
-
- private static IType[] getTypes(IJavaElement element) {
- try {
- if (element.getElementType() != IJavaElement.COMPILATION_UNIT)
- return null;
-
- return ((ICompilationUnit) element).getAllTypes();
- } catch (Exception e) {
- return null;
- }
- }
-
- public static String getServletClassName(IResource resource) {
- return getClassNameForType(resource, GENERIC_SERVLET_CLASS_TYPE);
- }
-
- public static String getClassNameForType(IResource resource, String superType) {
- if (resource == null)
- return null;
-
- try {
- IProject project = resource.getProject();
- IPath path = resource.getFullPath();
- if (!project.hasNature(JavaCore.NATURE_ID) || path == null)
- return null;
-
- IJavaProject javaProject = (IJavaProject) project.getNature(JavaCore.NATURE_ID);
- if (!javaProject.isOpen())
- javaProject.open(new NullProgressMonitor());
-
- // output location may not be on classpath
- IPath outputPath = javaProject.getOutputLocation();
- if (outputPath != null && "class".equals(path.getFileExtension()) && outputPath.isPrefixOf(path)) { //$NON-NLS-1$
- int count = outputPath.segmentCount();
- path = path.removeFirstSegments(count);
- }
-
- // remove initial part of classpath
- IClasspathEntry[] classPathEntry = javaProject.getResolvedClasspath(true);
- if (classPathEntry != null) {
- int size = classPathEntry.length;
- for (int i = 0; i < size; i++) {
- IPath classPath = classPathEntry[i].getPath();
- if (classPath.isPrefixOf(path)) {
- int count = classPath.segmentCount();
- path = path.removeFirstSegments(count);
- i += size;
- }
- }
- }
-
- // get java element
- IJavaElement javaElement = javaProject.findElement(path);
-
- IType[] types = getTypes(javaElement);
- if (types != null) {
- int size2 = types.length;
- for (int i = 0; i < size2; i++) {
- if (hasSuperclass(types[i], superType))
- return types[i].getFullyQualifiedName();
- }
- }
- return null;
- } catch (Exception e) {
- return null;
- }
- }
-
- public static boolean hasSuperclass(IType type, String superClassName) {
- try {
- ITypeHierarchy hierarchy = type.newSupertypeHierarchy(null);
- IType[] superClasses = hierarchy.getAllSuperclasses(type);
-
- int size = superClasses.length;
- for (int i = 0; i < size; i++) {
- if (superClassName.equals(superClasses[i].getFullyQualifiedName()))
- return true;
- }
- return false;
- } catch (Exception e) {
- return false;
- }
- }
-
- public static String getServletMapping(IResource resource, boolean isServlet, String typeName, String componentName) {
- if (typeName == null || typeName.equals("")) //$NON-NLS-1$
- return null;
-
- IModelProvider provider = ModelProviderManager.getModelProvider( resource.getProject() );
- Object mObj = provider.getModelObject();
-
- if (mObj instanceof WebApp) {
- WebApp webApp= (WebApp) mObj;
- List<Servlet> servlets = webApp.getServlets();
- // Ensure the display does not already exist in the web application
- if (servlets != null && !servlets.isEmpty()) {
- for (int i = 0; i < servlets.size(); i++) {
- Servlet servlet = servlets.get(i);
- if (servlet.getServletClass() != null && servlet.getServletClass().equals(typeName)) {
- List<ServletMapping> mappings = webApp.getServletMappings();
- if (mappings != null && !mappings.isEmpty()) {
- Iterator<ServletMapping> it = mappings.iterator();
- while( it.hasNext() ){
- ServletMapping map = it.next();
- if (map.getServletName().equals(servlet.getServletName())) {
- UrlPatternType urlPattern = map.getUrlPatterns().get(0);
- return urlPattern.getValue();
- }
- }
- }
- }
- }
- }
- }
- return null;
- }
-
- protected static boolean hasInterestedComponents(IProject project) {
- return (JavaEEProjectUtilities.isDynamicWebProject(project) ||
- JavaEEProjectUtilities.isWebFragmentProject(project));
- }
-
- private static String getJSPServletMapping(IResource resource, String jspPath) {
- IModelProvider provider = ModelProviderManager.getModelProvider(resource.getProject());
- Object mObj = provider.getModelObject();
-
- if (mObj instanceof WebApp) {
- WebApp webApp= (WebApp) mObj;
- List<Servlet> servlets = webApp.getServlets();
- if (servlets != null && !servlets.isEmpty()) {
- for (int i = 0; i < servlets.size(); i++) {
- Servlet servlet = servlets.get(i);
- if (servlet.getJspFile() != null && servlet.getJspFile().equals(jspPath)) {
- List<ServletMapping> mappings = webApp.getServletMappings();
- if (mappings != null && !mappings.isEmpty()) {
- Iterator<ServletMapping> it = mappings.iterator();
- while (it.hasNext()) {
- ServletMapping map = it.next();
- if (map.getServletName().equals(servlet.getServletName())) {
- UrlPatternType urlPattern = map.getUrlPatterns().get(0);
- return urlPattern.getValue();
- }
- }
- }
- }
- }
- }
- }
- return null;
- }
-
- private static List<ServletMapping> getServletMappings(IResource resource, String typeName){
- IModelProvider provider = ModelProviderManager.getModelProvider(resource.getProject());
- IWebCommon webApp = (IWebCommon)provider.getModelObject();
-
- List<Servlet> servlets = webApp.getServlets();
- List<ServletMapping> list = new ArrayList<ServletMapping>();
-
- if (servlets != null && !servlets.isEmpty()) {
- for (int i = 0; i < servlets.size(); i++) {
- Servlet servlet = servlets.get(i);
- if (servlet.getServletClass() != null && servlet.getServletClass().equals(typeName)) {
- List<ServletMapping> mappings = webApp.getServletMappings();
- if (mappings != null && !mappings.isEmpty()) {
- Iterator<ServletMapping> it = mappings.iterator();
- while (it.hasNext()) {
- ServletMapping map = it.next();
- if (map.getServletName().equals(servlet.getServletName())) {
- list.add(map);
- }
- }
- }
- }
- }
- }
- return list;
- }
-}
diff --git a/plugins/org.eclipse.jst.jee.ui/src/org/eclipse/jst/jee/ui/internal/messages.properties b/plugins/org.eclipse.jst.jee.ui/src/org/eclipse/jst/jee/ui/internal/messages.properties
deleted file mode 100644
index b9c07b3..0000000
--- a/plugins/org.eclipse.jst.jee.ui/src/org/eclipse/jst/jee/ui/internal/messages.properties
+++ /dev/null
@@ -1,46 +0,0 @@
-INVALID_DEP_DESC_SELECTION_TITLE=Invalid Selection
-INFORM_INVALID_DEP_DESC_SELECTION=One or more Java EE projects selected already has a Deployment Descriptor.
-DEPLOYMENT_DESCRIPTOR=Deployment Descriptor: {0}
-SESSION_BEANS=Session Beans
-ENTITY_BEANS=Entity Beans (1.x-2.x)
-MESSAGE_DRIVEN_BEANS=Message-Driven Beans
-MessageAdapterNode_MESSAGE_ADAPTER=Message Adapter
-MessageListenerNode_MessageListener=Message Listener
-ActicationSpecNode_ActivationSpec=Activation Spec
-ACTIVATION_CONFIG_PROPERTIES=Activation Config Properties
-ENTERPRISE_BEAN_CLASS_DESCRIPTION=Enterprise Bean Class -
-
-SERVLET_ITEM_PROVIDER=Servlets
-LISTENER_ITEM_PROVIDER=Listeners
-FILTERS_ITEM_PROVIDER=Filters
-FILTER_MAPPING_ITEM_PROVIDER=Filter Mappings
-SERVLET_MAPPING_ITEM_PROVIDER=Servlet Mappings
-ERROR_PAGES_ITEM_PROVIDER=Error Pages
-WELCOME_PAGES_ITEM_PROVIDER=Welcome Pages
-CONTEXT_PARAMS_ITEM_PROVIDER=Context Parameters
-BUNDLED_LIBRARIES_NODE=Bundled Libraries
-LIBRARY_DIRECTORY=Library Directory
-EAR_MODULES_NODE=Modules
-EJBLOCAL_REFERENCES=Ejb Local References
-EJB_REFERENCES=Ejb References
-ENVIROMENT_ENTRIES=Environment Entries
-RESOURCE_ENVIROMENT_ENTRIES=Resource Environment Entries
-RESOURCE_REFERENCES=Resource References
-SERVICE_REFERENCES=Service References
-REFERENCES=References
-
-AddProjectToEARDropAssistant_The_dragged_project_cannot_be_added_=The dragged project cannot be added
-AddProjectToEARDropAssistant_The_project_0_cannot_be_accesse_=The project cannot be accessed
-AddProjectToEARDropAssistant_Could_not_add_module_to_Enterprise_=Could not add module to Enterprise
-AddModuleToEarDropAssistant_Adding_module_to_ea_=Adding module to ear
-ImportJEEModuleDropAssistant_Importing_Java_Enterprise_Edition_artifacts=Importing Java Enterprise Edition artifacts
-ImportJEEModuleDropAssistant_Could_not_recognize_extension_0_=Could not recognize extension
-InboundRaNode_Inbound_Resource_adapter=Inbound Resource Adapter
-
-ConnectorLabelProvider_ADMIN_OBJECT=Admin Object
-ConnectorLabelProvider_CONFIG_PROPERTY=Config Property
-ConnectorLabelProvider_ConnectionDefinition=Connection Definition
-ConnectorLabelProvider_LICENSE_ARTIFACT=License
-ConnectorLabelProvider_RequiredConfigProperty=Required Config Property
-GroupRaContentProvider_RESOURCE_ADAPTER=Resource Adapter
-OutboundRaNode_OutboundResourceAdapter=Outbound Resource Adapter
diff --git a/plugins/org.eclipse.jst.jee.ui/src/org/eclipse/jst/jee/ui/internal/navigator/AbstractDDNode.java b/plugins/org.eclipse.jst.jee.ui/src/org/eclipse/jst/jee/ui/internal/navigator/AbstractDDNode.java
deleted file mode 100644
index 9340240..0000000
--- a/plugins/org.eclipse.jst.jee.ui/src/org/eclipse/jst/jee/ui/internal/navigator/AbstractDDNode.java
+++ /dev/null
@@ -1,74 +0,0 @@
-/***********************************************************************
- * Copyright (c) 2008 by SAP AG, Walldorf.
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
- *
- * Contributors:
- * SAP AG - initial API and implementation
- ***********************************************************************/
-package org.eclipse.jst.jee.ui.internal.navigator;
-
-import java.util.List;
-
-import org.eclipse.jface.viewers.IDecoration;
-import org.eclipse.jst.javaee.core.JavaEEObject;
-import org.eclipse.swt.graphics.Image;
-
-/**
- * Abstract Deployment Descriptor Node is an abstract wrapper class for the nodes in the Deployment
- * Descriptor it can contain information for the label provider some description for tool tip, an image
- * and the object that it is wrapping.
- *
- * @author Dimitar Giormov
- */
-public abstract class AbstractDDNode {
-
- protected Object adapterNode;
- protected Image image;
- protected String text;
- protected String description;
-
-
- /**
- * Constructor for the class
- *
- * @param adapterNode - the wrapped object
- */
- public AbstractDDNode(Object adapterNode){
- this.adapterNode = adapterNode;
- image = null;
- text = null;
- description = null;
- }
-
- public abstract List getChildren();
-
- public abstract boolean hasChildren();
-
- public void decorate(IDecoration decoration) {
- // do nothing, subclasses should override
- }
-
- public Image getImage() {
- return image;
- }
-
- public String getText() {
- return text;
- }
-
- public String getDescription() {
- return description;
- }
-
- public Object getAdapterNode() {
- return adapterNode;
- }
-
- public void reinit(JavaEEObject modelObject) {
- adapterNode = modelObject;
- }
-
-}
diff --git a/plugins/org.eclipse.jst.jee.ui/src/org/eclipse/jst/jee/ui/internal/navigator/AbstractGroupProvider.java b/plugins/org.eclipse.jst.jee.ui/src/org/eclipse/jst/jee/ui/internal/navigator/AbstractGroupProvider.java
deleted file mode 100644
index 7a8168b..0000000
--- a/plugins/org.eclipse.jst.jee.ui/src/org/eclipse/jst/jee/ui/internal/navigator/AbstractGroupProvider.java
+++ /dev/null
@@ -1,70 +0,0 @@
-/***********************************************************************
- * Copyright (c) 2008 by SAP AG, Walldorf.
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
- *
- * Contributors:
- * SAP AG - initial API and implementation
- ***********************************************************************/
-package org.eclipse.jst.jee.ui.internal.navigator;
-
-import java.util.ArrayList;
-import java.util.List;
-
-import org.eclipse.jst.javaee.core.JavaEEObject;
-import org.eclipse.jst.jee.ui.internal.Messages;
-import org.eclipse.osgi.util.NLS;
-import org.eclipse.swt.graphics.Image;
-
-/**
- * Abstract group Deployment Descriptor node that has a number of sub nodes
- * (like Entity Beans, Session Beans, Message Driven Beans).
- *
- *
- * @author Dimitar Giormov
- *
- */
-public abstract class AbstractGroupProvider {
-
- protected List children = new ArrayList<Object>();
- protected JavaEEObject javaee;
- protected String text;
- protected boolean isValid = true;
-
- public void setValid(boolean isValid) {
- this.isValid = isValid;
- }
-
- public AbstractGroupProvider(JavaEEObject javaee) {
- this.javaee = javaee;
- text = NLS.bind(Messages.DEPLOYMENT_DESCRIPTOR, javaee.toString());
- }
-
- public abstract List getChildren();
-
- public abstract Image getImage();
-
- public String getText() {
- return text ;
- }
-
- public boolean hasChildren() {
- List children2 = getChildren();
- return children2 != null && !children2.isEmpty();
- }
-
- public JavaEEObject getJavaEEObject() {
- return javaee;
- }
-
- public void reinit(JavaEEObject modelObject) {
- this.javaee = modelObject;
- }
-
- public boolean isValid(){
- return isValid;
- }
-
-}
diff --git a/plugins/org.eclipse.jst.jee.ui/src/org/eclipse/jst/jee/ui/internal/navigator/AppClient5ContentProvider.java b/plugins/org.eclipse.jst.jee.ui/src/org/eclipse/jst/jee/ui/internal/navigator/AppClient5ContentProvider.java
deleted file mode 100644
index 28ee5ee..0000000
--- a/plugins/org.eclipse.jst.jee.ui/src/org/eclipse/jst/jee/ui/internal/navigator/AppClient5ContentProvider.java
+++ /dev/null
@@ -1,81 +0,0 @@
-/***********************************************************************
- * Copyright (c) 2008 by SAP AG, Walldorf.
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
- *
- * Contributors:
- * SAP AG - initial API and implementation
- ***********************************************************************/
-package org.eclipse.jst.jee.ui.internal.navigator;
-
-import java.util.ArrayList;
-import java.util.List;
-
-import org.eclipse.core.resources.IProject;
-import org.eclipse.core.runtime.IAdaptable;
-import org.eclipse.jst.j2ee.internal.project.J2EEProjectUtilities;
-import org.eclipse.jst.j2ee.project.JavaEEProjectUtilities;
-import org.eclipse.jst.javaee.applicationclient.ApplicationClient;
-import org.eclipse.jst.jee.ui.internal.navigator.appclient.GroupAppClientProvider;
-import org.eclipse.jst.jee.ui.internal.navigator.ear.ModulesNode;
-
-/**
- * Ear 5.0 Content provider is Deployment Descriptor content provider,
- * used for constructing of the descriptor tree in project explorer.
- *
- * @author Dimitar Giormov
- */
-public class AppClient5ContentProvider extends JEE5ContentProvider {
-
-
- public Object[] getChildren(Object aParentElement) {
- IProject project = null;
- List children = new ArrayList();
- if (aParentElement instanceof GroupAppClientProvider) {
- children.addAll(((GroupAppClientProvider) aParentElement).getChildren());
- } else if (aParentElement instanceof IAdaptable) {
- project = (IProject) ((IAdaptable) aParentElement).getAdapter(IPROJECT_CLASS);
- if (project != null && JavaEEProjectUtilities.isApplicationClientProject(project) &&
- J2EEProjectUtilities.isJEEProject(project)) {
- AbstractGroupProvider cachedContentProvider = getCachedContentProvider(project);
- if (cachedContentProvider != null){
- children.add(cachedContentProvider);
- }
- }
- }
- return children.toArray();
- }
-
-
-
- public boolean hasChildren(Object element) {
- if (element instanceof GroupAppClientProvider) {
- return !((GroupAppClientProvider) element).getChildren().isEmpty();
- }
- return false;
- }
-
- public Object getParent(Object object) {
- if (object instanceof ModulesNode){
- return ((ModulesNode) object).getEarProject();
- }
- return null;
- }
-
- public Object[] getElements(Object inputElement) {
- return getChildren(inputElement);
- }
-
-
-
- @Override
- protected AbstractGroupProvider getNewContentProviderInstance(IProject project) {
- return new GroupAppClientProvider((ApplicationClient) getCachedModelProvider(project).getModelObject(), project);
- }
-
-
-
-
-}
diff --git a/plugins/org.eclipse.jst.jee.ui/src/org/eclipse/jst/jee/ui/internal/navigator/AppClient5LabelProvider.java b/plugins/org.eclipse.jst.jee.ui/src/org/eclipse/jst/jee/ui/internal/navigator/AppClient5LabelProvider.java
deleted file mode 100644
index d6f5b25..0000000
--- a/plugins/org.eclipse.jst.jee.ui/src/org/eclipse/jst/jee/ui/internal/navigator/AppClient5LabelProvider.java
+++ /dev/null
@@ -1,43 +0,0 @@
-/***********************************************************************
- * Copyright (c) 2008 by SAP AG, Walldorf.
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
- *
- * Contributors:
- * SAP AG - initial API and implementation
- ***********************************************************************/
-package org.eclipse.jst.jee.ui.internal.navigator;
-
-import org.eclipse.jst.j2ee.navigator.internal.J2EELabelProvider;
-import org.eclipse.jst.jee.ui.internal.navigator.appclient.GroupAppClientProvider;
-import org.eclipse.swt.graphics.Image;
-
-/**
- * Application Clent 5.0 Label provider is Deployment Descriptor label provider,
- * used for decorating of the descriptor tree in project explorer.
- *
- * @author Dimitar Giormov
- */
-public class AppClient5LabelProvider extends J2EELabelProvider {
-
- @Override
- public Image getImage(Object element) {
- Image ret = null;
- if (element instanceof GroupAppClientProvider) {
- ret = ((GroupAppClientProvider)element).getImage();
- }
- return ret;
- }
-
- @Override
- public String getText(Object element) {
- String ret = null;
- if (element instanceof GroupAppClientProvider) {
- ret = ((GroupAppClientProvider) element).getText();
- }
- return ret;
- }
-
-}
diff --git a/plugins/org.eclipse.jst.jee.ui/src/org/eclipse/jst/jee/ui/internal/navigator/ConnectorContentProvider.java b/plugins/org.eclipse.jst.jee.ui/src/org/eclipse/jst/jee/ui/internal/navigator/ConnectorContentProvider.java
deleted file mode 100644
index f5b332f..0000000
--- a/plugins/org.eclipse.jst.jee.ui/src/org/eclipse/jst/jee/ui/internal/navigator/ConnectorContentProvider.java
+++ /dev/null
@@ -1,47 +0,0 @@
-package org.eclipse.jst.jee.ui.internal.navigator;
-
-import java.util.ArrayList;
-import java.util.List;
-
-import org.eclipse.core.resources.IProject;
-import org.eclipse.jst.javaee.jca.Connector;
-import org.eclipse.jst.jee.ui.internal.navigator.ra.RaGroupContentProvider;
-
-public class ConnectorContentProvider extends JEE5ContentProvider {
-
- public Object[] getChildren(Object aParentElement) {
- List<Object> children = new ArrayList<Object>();
- IProject project = null;
- if (IProject.class.isInstance(aParentElement)) {
- project = (IProject) aParentElement;
- AbstractGroupProvider cachedContentProvider = getCachedContentProvider(project);
- if (cachedContentProvider!= null && cachedContentProvider.isValid()){
- children.add(cachedContentProvider);
- }
- } else if (AbstractGroupProvider.class.isInstance(aParentElement)){
- AbstractGroupProvider abstractGroupProvider = (AbstractGroupProvider) aParentElement;
- if (abstractGroupProvider.hasChildren()){
- children.addAll(abstractGroupProvider.getChildren());
- }
- }
- return children.toArray();
- }
-
- public Object getParent(Object element) {
- return null;
- }
-
- public boolean hasChildren(Object element) {
- return true;
- }
-
- public Object[] getElements(Object inputElement) {
- return getChildren(inputElement);
- }
-
- @Override
- protected AbstractGroupProvider getNewContentProviderInstance(IProject project) {
- return new RaGroupContentProvider((Connector)getCachedModelProvider(project).getModelObject(), project);
- }
-
-}
diff --git a/plugins/org.eclipse.jst.jee.ui/src/org/eclipse/jst/jee/ui/internal/navigator/ConnectorLabelProvider.java b/plugins/org.eclipse.jst.jee.ui/src/org/eclipse/jst/jee/ui/internal/navigator/ConnectorLabelProvider.java
deleted file mode 100644
index 0397c66..0000000
--- a/plugins/org.eclipse.jst.jee.ui/src/org/eclipse/jst/jee/ui/internal/navigator/ConnectorLabelProvider.java
+++ /dev/null
@@ -1,54 +0,0 @@
-package org.eclipse.jst.jee.ui.internal.navigator;
-
-import org.eclipse.jst.j2ee.navigator.internal.J2EELabelProvider;
-import org.eclipse.jst.javaee.jca.ConfigProperty;
-import org.eclipse.jst.javaee.jca.ConnectionDefinition;
-import org.eclipse.jst.javaee.jca.RequiredConfigProperty;
-import org.eclipse.jst.jee.ui.internal.Messages;
-import org.eclipse.jst.jee.ui.plugin.JEEUIPlugin;
-import org.eclipse.jst.jee.ui.plugin.JEEUIPluginIcons;
-import org.eclipse.swt.graphics.Image;
-
-public class ConnectorLabelProvider extends J2EELabelProvider {
-
- private Image CONFIG_PROP_IMAGE;
- private Image LICENSE_IMAGE;
-
- @Override
- public String getText(Object element) {
- if (AbstractGroupProvider.class.isInstance(element)){
- return ((AbstractGroupProvider) element).getText();
- } else if (element instanceof org.eclipse.jst.javaee.jca.License){
- return Messages.ConnectorLabelProvider_LICENSE_ARTIFACT;
- } else if (element instanceof ConfigProperty){
- return Messages.ConnectorLabelProvider_CONFIG_PROPERTY + ((ConfigProperty)element).getConfigPropertyName() != null ? ((ConfigProperty)element).getConfigPropertyName() : ""; //$NON-NLS-1$
- } else if (element instanceof RequiredConfigProperty){
- return Messages.ConnectorLabelProvider_RequiredConfigProperty + ((RequiredConfigProperty)element).getConfigPropertyName() != null ? ((RequiredConfigProperty)element).getConfigPropertyName() : ""; //$NON-NLS-1$
- } else if (element instanceof ConnectionDefinition){
- return Messages.ConnectorLabelProvider_ConnectionDefinition + ((ConnectionDefinition)element).getManagedconnectionfactoryClass() != null ?((ConnectionDefinition)element).getManagedconnectionfactoryClass() : ""; //$NON-NLS-1$
- }
-
- return super.getText(element);
- }
-
- @Override
- public Image getImage(Object element) {
- if (AbstractGroupProvider.class.isInstance(element)){
- return ((AbstractGroupProvider) element).getImage();
- } else if (element instanceof ConfigProperty){
- if (CONFIG_PROP_IMAGE == null) {
- CONFIG_PROP_IMAGE = JEEUIPlugin.getDefault().getImage(JEEUIPluginIcons.IMG_CONFIG_PROP);
- }
- return CONFIG_PROP_IMAGE;
- } else if (element instanceof org.eclipse.jst.javaee.jca.License){
- if (LICENSE_IMAGE == null) {
- LICENSE_IMAGE = JEEUIPlugin.getDefault().getImage(JEEUIPluginIcons.IMG_LICENSE);
- }
- return LICENSE_IMAGE;
- }
- return super.getImage(element);
- }
-
-
-
-}
diff --git a/plugins/org.eclipse.jst.jee.ui/src/org/eclipse/jst/jee/ui/internal/navigator/DDAdapterFactory.java b/plugins/org.eclipse.jst.jee.ui/src/org/eclipse/jst/jee/ui/internal/navigator/DDAdapterFactory.java
deleted file mode 100644
index 01ae46d..0000000
--- a/plugins/org.eclipse.jst.jee.ui/src/org/eclipse/jst/jee/ui/internal/navigator/DDAdapterFactory.java
+++ /dev/null
@@ -1,30 +0,0 @@
-package org.eclipse.jst.jee.ui.internal.navigator;
-
-import org.eclipse.core.runtime.IAdaptable;
-import org.eclipse.core.runtime.IAdapterFactory;
-import org.eclipse.core.runtime.Platform;
-import org.eclipse.jdt.core.IJavaElement;
-
-public class DDAdapterFactory implements IAdapterFactory {
-
- public Object getAdapter(Object adaptableObject, Class adapterType) {
- if (adapterType == IJavaElement.class) {
- if (adaptableObject instanceof AbstractDDNode) {
- AbstractDDNode ddNode = (AbstractDDNode) adaptableObject;
- Object node = ddNode.getAdapterNode();
- if (node instanceof IJavaElement)
- return node;
- if (node instanceof IAdaptable)
- return ((IAdaptable) node).getAdapter(IJavaElement.class);
-
- return Platform.getAdapterManager().getAdapter(node, IJavaElement.class);
- }
- }
- return null;
- }
-
- public Class[] getAdapterList() {
- return new Class[] { IJavaElement.class };
- }
-
-}
diff --git a/plugins/org.eclipse.jst.jee.ui/src/org/eclipse/jst/jee/ui/internal/navigator/Ear5ContentProvider.java b/plugins/org.eclipse.jst.jee.ui/src/org/eclipse/jst/jee/ui/internal/navigator/Ear5ContentProvider.java
deleted file mode 100644
index 60ed717..0000000
--- a/plugins/org.eclipse.jst.jee.ui/src/org/eclipse/jst/jee/ui/internal/navigator/Ear5ContentProvider.java
+++ /dev/null
@@ -1,204 +0,0 @@
-/***********************************************************************
- * Copyright (c) 2008 by SAP AG, Walldorf.
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
- *
- * Contributors:
- * SAP AG - initial API and implementation
- ***********************************************************************/
-package org.eclipse.jst.jee.ui.internal.navigator;
-
-import java.util.ArrayList;
-import java.util.Arrays;
-import java.util.Collections;
-import java.util.HashSet;
-import java.util.List;
-import java.util.Set;
-
-import org.eclipse.core.resources.IProject;
-import org.eclipse.core.resources.IResourceChangeEvent;
-import org.eclipse.core.resources.IResourceDelta;
-import org.eclipse.core.resources.IResourceDeltaVisitor;
-import org.eclipse.core.runtime.CoreException;
-import org.eclipse.core.runtime.IAdaptable;
-import org.eclipse.core.runtime.IPath;
-import org.eclipse.jst.j2ee.componentcore.util.EARVirtualComponent;
-import org.eclipse.jst.j2ee.internal.J2EEVersionConstants;
-import org.eclipse.jst.j2ee.internal.plugin.IJ2EEModuleConstants;
-import org.eclipse.jst.j2ee.internal.project.J2EEProjectUtilities;
-import org.eclipse.jst.j2ee.project.JavaEEProjectUtilities;
-import org.eclipse.jst.javaee.application.Application;
-import org.eclipse.jst.jee.ui.internal.navigator.ear.AbstractEarNode;
-import org.eclipse.jst.jee.ui.internal.navigator.ear.GroupEARProvider;
-import org.eclipse.jst.jee.ui.plugin.JEEUIPlugin;
-import org.eclipse.wst.common.componentcore.ComponentCore;
-import org.eclipse.wst.common.componentcore.internal.util.IModuleConstants;
-import org.eclipse.wst.common.componentcore.resources.IVirtualComponent;
-import org.eclipse.wst.common.componentcore.resources.IVirtualReference;
-import org.eclipse.wst.common.project.facet.core.IFacetedProject;
-import org.eclipse.wst.common.project.facet.core.ProjectFacetsManager;
-
-/**
- * Application Client 5.0 Content provider is Deployment Descriptor content provider,
- * used for constructing of the descriptor tree in project explorer.
- *
- * @author Dimitar Giormov
- */
-public class Ear5ContentProvider extends JEE5ContentProvider {
-
- private List getComponentReferencesAsList(List componentTypes, IVirtualComponent virtualComponent, IPath runtimePath) {
- List components = new ArrayList();
- IVirtualComponent earComponent = virtualComponent;
- if (earComponent != null ) {
- IVirtualReference[] refComponents = earComponent.getReferences();
- for (int i = 0; i < refComponents.length; i++) {
- IVirtualComponent module = refComponents[i].getReferencedComponent();
- if (module == null) continue;
- // if component types passed in is null then return all components
- if (componentTypes == null || componentTypes.size() == 0) {
- components.add(refComponents[i]);
- } else {
- if (componentTypes.contains(JavaEEProjectUtilities.getJ2EEComponentType(module))) {
- components.add(refComponents[i]);
- }
- }
- }
- }
- return components;
- }
-
- public IVirtualReference[] getUtilityModuleReferences(IVirtualComponent component) {
- List explicitUtilityReferences =
- getComponentReferencesAsList(Collections.singletonList(J2EEProjectUtilities.UTILITY), component, null);
-
- // fetch other Utility Jars attached to the EAR project
- List implicitUtilityReferenceTypes =
- Arrays.asList(new String[] {
- IModuleConstants.JST_APPCLIENT_MODULE,
- IModuleConstants.JST_WEB_MODULE,
- IModuleConstants.JST_EJB_MODULE
- });
-
- List implicitUtilityReferences =
- getComponentReferencesAsList(implicitUtilityReferenceTypes, component, null);
-
- List allUtilityModuleReferences = new ArrayList();
- allUtilityModuleReferences.addAll(explicitUtilityReferences);
- allUtilityModuleReferences.addAll(implicitUtilityReferences);
-
- if(allUtilityModuleReferences.size() > 0)
- return (IVirtualReference[]) allUtilityModuleReferences.toArray(new IVirtualReference[allUtilityModuleReferences.size()]);
- return new IVirtualReference[0];
-
- }
-
- public Object[] getChildren(Object aParentElement) {
- IProject project = null;
- List children = new ArrayList();
- if (aParentElement instanceof GroupEARProvider) {
- children.addAll(((GroupEARProvider)aParentElement).getChildren());
- } else if (aParentElement instanceof AbstractEarNode) {
- return ((AbstractEarNode) aParentElement).getModules().toArray();
- } else if (aParentElement instanceof IAdaptable) {
- project = (IProject) ((IAdaptable) aParentElement).getAdapter(IPROJECT_CLASS);
- if (project != null && JavaEEProjectUtilities.isEARProject(project)) {
- IFacetedProject facetedProject;
- try {
- facetedProject = ProjectFacetsManager.create(project);
- if (facetedProject != null &&
- (facetedProject.hasProjectFacet(
- ProjectFacetsManager.getProjectFacet(IModuleConstants.JST_EAR_MODULE).getVersion(
- J2EEVersionConstants.VERSION_5_0_TEXT)) || facetedProject.hasProjectFacet(
- ProjectFacetsManager.getProjectFacet(IModuleConstants.JST_EAR_MODULE).getVersion(
- J2EEVersionConstants.VERSION_6_0_TEXT)))) {
- GroupEARProvider element = (GroupEARProvider) getCachedContentProvider(project);
- if (element != null){
- children.add(element);
- }
-
- }
- } catch (CoreException e) {
- String msg = "Error in the JEEContentProvider.getChildren() for parent:" + aParentElement; //$NON-NLS-1$
- JEEUIPlugin.logError(msg, e);
- }
- }
- }
- return children.toArray();
- }
-
- public boolean hasChildren(Object element) {
- if (element instanceof AbstractEarNode) {
- return ((AbstractEarNode) element).getModules().size() > 0;
- } else if (element instanceof GroupEARProvider){
- return true;
- } else return false;
- }
-
- public Object getParent(Object object) {
- if (object instanceof AbstractEarNode){
- return ((AbstractEarNode) object).getEarProject();
- }
- return null;
- }
-
- public Object[] getElements(Object inputElement) {
- return getChildren(inputElement);
- }
-
- @Override
- protected AbstractGroupProvider getNewContentProviderInstance(IProject project) {
- return new GroupEARProvider((Application) getCachedModelProvider(project).getModelObject(), (EARVirtualComponent)ComponentCore.createComponent(project));
- }
-
- public EarLibVisitor getVisitor() {
- return new EarLibVisitor();
- }
-
- protected class EarLibVisitor implements IResourceDeltaVisitor {
-
- private Set<IProject> projects = new HashSet<IProject>();
-
- public boolean visit(IResourceDelta delta) throws CoreException {
- IResourceDelta[] affectedChildren = delta.getAffectedChildren(IResourceDelta.ADDED | IResourceDelta.REMOVED | IResourceDelta.REPLACED | IResourceDelta.CHANGED);
- if (affectedChildren != null){
- for (int i = 0; i < affectedChildren.length; i++) {
- if (affectedChildren[i].getResource() != null && affectedChildren[i].getResource().getName() != null
- && (affectedChildren[i].getResource().getName().toLowerCase().endsWith(IJ2EEModuleConstants.JAR_EXT)
- || (affectedChildren[i].getResource().getName().equals(IJ2EEModuleConstants.JST_COMPONENT_FILE) && affectedChildren[i].getKind()==IResourceDelta.CHANGED))){
- projects.add(affectedChildren[i].getResource().getProject());
- }
- }
- }
- return true;
- }
-
- protected Set<IProject> getChangedProject() {
- return projects;
- }
-
- }
-
- @Override
- public void resourceChanged(IResourceChangeEvent event) {
- super.resourceChanged(event);
- if (event.getType() == IResourceChangeEvent.POST_CHANGE){
- EarLibVisitor visitor = getVisitor();
- if (visitor == null){
- return;
- }
- try {
- event.getDelta().accept(visitor);
- Set<IProject> changedProject = visitor.getChangedProject();
- for (IProject project : changedProject) {
- projectChanged(project);
- }
-
- } catch (CoreException e) {
- JEEUIPlugin.logError("Could not refresh changed project.", e); //$NON-NLS-1$
- }
- }
- }
-
-}
diff --git a/plugins/org.eclipse.jst.jee.ui/src/org/eclipse/jst/jee/ui/internal/navigator/Ear5LabelProvider.java b/plugins/org.eclipse.jst.jee.ui/src/org/eclipse/jst/jee/ui/internal/navigator/Ear5LabelProvider.java
deleted file mode 100644
index 58ac507..0000000
--- a/plugins/org.eclipse.jst.jee.ui/src/org/eclipse/jst/jee/ui/internal/navigator/Ear5LabelProvider.java
+++ /dev/null
@@ -1,126 +0,0 @@
-/***********************************************************************
- * Copyright (c) 2008 by SAP AG, Walldorf.
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
- *
- * Contributors:
- * SAP AG - initial API and implementation
- * IBM - bug 281382 clean up
- ***********************************************************************/
-package org.eclipse.jst.jee.ui.internal.navigator;
-
-import java.net.URL;
-import java.util.HashMap;
-
-import org.eclipse.core.runtime.Path;
-import org.eclipse.jface.resource.ImageDescriptor;
-import org.eclipse.jst.j2ee.internal.plugin.J2EEPlugin;
-import org.eclipse.jst.j2ee.navigator.internal.J2EELabelProvider;
-import org.eclipse.jst.j2ee.navigator.internal.plugin.J2EENavigatorPlugin;
-import org.eclipse.jst.j2ee.project.JavaEEProjectUtilities;
-import org.eclipse.jst.j2ee.project.facet.IJ2EEFacetConstants;
-import org.eclipse.jst.jee.ui.internal.navigator.ear.AbstractEarNode;
-import org.eclipse.jst.jee.ui.internal.navigator.ear.GroupEARProvider;
-import org.eclipse.jst.jee.ui.plugin.JEEUIPlugin;
-import org.eclipse.swt.graphics.Image;
-import org.eclipse.wst.common.componentcore.internal.util.VirtualReferenceUtilities;
-import org.eclipse.wst.common.componentcore.resources.IVirtualComponent;
-import org.eclipse.wst.common.componentcore.resources.IVirtualReference;
-
-/**
- * EAR 5.0 Label provider is Deployment Descriptor label provider,
- * used for decorating of the descriptor tree in project explorer.
- *
- * @author Dimitar Giormov
- */
-public class Ear5LabelProvider extends J2EELabelProvider {
-
- private static ImageDescriptor IMG_MODULES_NODE;
- private static ImageDescriptor IMG_MODULE_UTIL;
- private static ImageDescriptor IMG_MODULE_WEB;
- private static ImageDescriptor IMG_MODULE_EJB;
- private static ImageDescriptor IMG_MODULE_CLIENT;
- private static ImageDescriptor IMG_MODULE_CONNECTOR;
- private static HashMap<String, ImageDescriptor> typeToDescriptor;
- static {
- try {
- IMG_MODULES_NODE = J2EENavigatorPlugin.getDefault().getImageDescriptor("folder.gif"); //$NON-NLS-1$
- IMG_MODULE_UTIL = ImageDescriptor.createFromURL((URL) J2EEPlugin.getPlugin().getImage("utiljar_obj")); //$NON-NLS-1$
- IMG_MODULE_WEB = ImageDescriptor.createFromURL((URL) J2EEPlugin.getPlugin().getImage("full/obj16/module_web_obj")); //$NON-NLS-1$
- IMG_MODULE_EJB = ImageDescriptor.createFromURL((URL) J2EEPlugin.getPlugin().getImage("full/obj16/module_ejb_obj")); //$NON-NLS-1$
- IMG_MODULE_CLIENT = ImageDescriptor.createFromURL((URL) J2EEPlugin.getPlugin().getImage("module_clientapp_obj")); //$NON-NLS-1$
- IMG_MODULE_CONNECTOR = ImageDescriptor.createFromURL((URL) J2EEPlugin.getPlugin().getImage("full/obj16/connector_module")); //$NON-NLS-1$
- } catch (RuntimeException e) {
- String msg = e.getMessage() != null ? e.getMessage() : e.toString();
- JEEUIPlugin.logError(msg, e);
- IMG_MODULES_NODE = ImageDescriptor.getMissingImageDescriptor();
- IMG_MODULE_UTIL = ImageDescriptor.getMissingImageDescriptor();
- IMG_MODULE_WEB = ImageDescriptor.getMissingImageDescriptor();
- IMG_MODULE_EJB = ImageDescriptor.getMissingImageDescriptor();
- IMG_MODULE_CLIENT = ImageDescriptor.getMissingImageDescriptor();
- IMG_MODULE_CONNECTOR = ImageDescriptor.getMissingImageDescriptor();
- }
- typeToDescriptor = new HashMap<String, ImageDescriptor>();
- typeToDescriptor.put(IJ2EEFacetConstants.APPLICATION_CLIENT, IMG_MODULE_CLIENT);
- typeToDescriptor.put(IJ2EEFacetConstants.DYNAMIC_WEB, IMG_MODULE_WEB);
- typeToDescriptor.put(IJ2EEFacetConstants.EJB, IMG_MODULE_EJB);
- typeToDescriptor.put(IJ2EEFacetConstants.JCA, IMG_MODULE_CONNECTOR);
- typeToDescriptor.put(IJ2EEFacetConstants.UTILITY, IMG_MODULE_UTIL);
- }
-
- @Override
- public Image getImage(Object element) {
- Image ret = null;
- if (element instanceof AbstractEarNode) {
- ret = J2EENavigatorPlugin.getDefault().getImage(IMG_MODULES_NODE);
- } else if (element instanceof IVirtualReference) {
- IVirtualComponent component = ((IVirtualReference) element).getReferencedComponent();
- if (component.isBinary()) {
- ret = J2EENavigatorPlugin.getDefault().getImage(IMG_MODULE_UTIL);
- } else {
- String type = JavaEEProjectUtilities.getJ2EEComponentType(component);
- ImageDescriptor desc = typeToDescriptor.get(type);
- ret = J2EENavigatorPlugin.getDefault().getImage(desc == null ? IMG_MODULE_UTIL : desc);
- }
- } else if (element instanceof GroupEARProvider){
- ret = ((GroupEARProvider) element).getImage();
- }
- return ret;
- }
-
- @Override
- public String getText(Object element) {
- String ret = null;
- if (element instanceof AbstractEarNode) {
- ret = ((AbstractEarNode) element).getText();
- } else if (element instanceof IVirtualReference) {
- IVirtualComponent component = ((IVirtualReference) element).getReferencedComponent();
- String archiveName = ((IVirtualReference)element).getArchiveName();
- if( component.isBinary()) {
- ret = archiveName != null ? archiveName : (new Path(component.getDeployedName()).lastSegment());
- } else {
- // more efficient to get type once
- String type = JavaEEProjectUtilities.getJ2EEComponentType(component);
- if( archiveName == null )
- archiveName = VirtualReferenceUtilities.INSTANCE.getDefaultArchiveName((IVirtualReference)element);
-
- if( type.equals(IJ2EEFacetConstants.DYNAMIC_WEB))
- ret = "Web " + archiveName; //$NON-NLS-1$
- else if( type.equals(IJ2EEFacetConstants.EJB))
- ret = "EJB " + archiveName;//$NON-NLS-1$
- else if( type.equals(IJ2EEFacetConstants.APPLICATION_CLIENT))
- ret = "APP Client " + archiveName;//$NON-NLS-1$
- else if( type.equals(IJ2EEFacetConstants.JCA))
- ret = "Connector " + archiveName;//$NON-NLS-1$
- else if( type.equals(IJ2EEFacetConstants.UTILITY))
- ret = archiveName;
- }
- } else if (element instanceof GroupEARProvider){
- ret = ((GroupEARProvider) element).getText();
- }
- return ret;
- }
-
-}
diff --git a/plugins/org.eclipse.jst.jee.ui/src/org/eclipse/jst/jee/ui/internal/navigator/Ejb3ContentProvider.java b/plugins/org.eclipse.jst.jee.ui/src/org/eclipse/jst/jee/ui/internal/navigator/Ejb3ContentProvider.java
deleted file mode 100644
index 2cf5088..0000000
--- a/plugins/org.eclipse.jst.jee.ui/src/org/eclipse/jst/jee/ui/internal/navigator/Ejb3ContentProvider.java
+++ /dev/null
@@ -1,218 +0,0 @@
-/***********************************************************************
- * Copyright (c) 2008 by SAP AG, Walldorf.
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
- *
- * Contributors:
- * SAP AG - initial API and implementation
- ***********************************************************************/
-package org.eclipse.jst.jee.ui.internal.navigator;
-
-import java.util.ArrayList;
-import java.util.List;
-
-import org.eclipse.core.resources.IProject;
-import org.eclipse.core.runtime.CoreException;
-import org.eclipse.core.runtime.IAdaptable;
-import org.eclipse.jst.j2ee.model.IModelProvider;
-import org.eclipse.jst.j2ee.project.facet.IJ2EEFacetConstants;
-import org.eclipse.jst.javaee.ejb.EJBJar;
-import org.eclipse.jst.javaee.ejb.EntityBean;
-import org.eclipse.jst.javaee.ejb.MessageDrivenBean;
-import org.eclipse.jst.javaee.ejb.SessionBean;
-import org.eclipse.jst.jee.ui.internal.navigator.JndiRefNode.KINDS;
-import org.eclipse.jst.jee.ui.internal.navigator.ejb.ActivationConfigProperties;
-import org.eclipse.jst.jee.ui.internal.navigator.ejb.BeanInterfaceNode;
-import org.eclipse.jst.jee.ui.internal.navigator.ejb.BeanNode;
-import org.eclipse.jst.jee.ui.internal.navigator.ejb.GroupEJBProvider;
-import org.eclipse.jst.jee.ui.plugin.JEEUIPlugin;
-import org.eclipse.wst.common.project.facet.core.IFacetedProject;
-import org.eclipse.wst.common.project.facet.core.IProjectFacetVersion;
-import org.eclipse.wst.common.project.facet.core.ProjectFacetsManager;
-
-/**
- * Ejb 3.0 Content provider is Deployment Descriptor content provider,
- * used for constructing of the descriptor tree in project explorer.
- *
- * @author Dimitar Giormov
- */
-public class Ejb3ContentProvider extends JEE5ContentProvider {
-
-
- public Object[] getChildren(Object aParentElement) {
- List<Object> children = new ArrayList<Object>();
- IProject project = null;
-
- if (aParentElement instanceof AbstractGroupProvider) {
- List lst = ((AbstractGroupProvider) aParentElement).getChildren();
- children.addAll(lst);
- } else if (aParentElement instanceof AbstractDDNode) {
- List lst = ((AbstractDDNode) aParentElement).getChildren();
- children.addAll(lst);
- } else if (aParentElement instanceof SessionBean) {
- SessionBean sb = ((SessionBean)aParentElement);
- addSessionBeanSubNodes(sb, children);
-
- } else if (aParentElement instanceof EntityBean) {
- EntityBean eb = ((EntityBean)aParentElement);
-
- addEntityBeanSubNodes(eb, children);
-
- } else if (aParentElement instanceof MessageDrivenBean) {
- Object msgBean = new BeanNode((MessageDrivenBean) aParentElement);
- addActivationConfigProperties((MessageDrivenBean) aParentElement, children);
- if(((MessageDrivenBean) aParentElement).getEjbClass()!=null){
- children.add(msgBean);
- }
- } else
- if (aParentElement instanceof IAdaptable) {
- project = (IProject) ((IAdaptable) aParentElement)
- .getAdapter(IPROJECT_CLASS);
- if (project != null) {
- if (isEjbModuleProject(project)) {
- GroupEJBProvider root = (GroupEJBProvider) getCachedContentProvider(project);
- if (root != null) {
- children.add(root);
- }
- }
- }
- }
- return children.toArray();
- }
-
- private void addActivationConfigProperties(MessageDrivenBean parentElement,
- List<Object> children) {
- if (parentElement.getActivationConfig() != null && parentElement.getActivationConfig().getActivationConfigProperties() != null && !parentElement.getActivationConfig().getActivationConfigProperties().isEmpty()){
- children.add(new ActivationConfigProperties(parentElement.getActivationConfig().getActivationConfigProperties()));
- }
- }
-
- private void addEntityBeanSubNodes(EntityBean eb, List<Object> children) {
- if (eb.getLocal() != null) {
- children.add(new BeanInterfaceNode(eb, eb.getLocal(), BeanInterfaceNode.KINDS.LOCAL));
- }
- if (eb.getLocalHome() != null) {
- children.add(new BeanInterfaceNode(eb, eb.getLocalHome(), BeanInterfaceNode.KINDS.LOCAL_HOME));
- }
-
- if (eb.getRemote() != null) {
- children.add(new BeanInterfaceNode(eb, eb.getRemote(), BeanInterfaceNode.KINDS.REMOTE));
- }
- if (eb.getHome() != null) {
- children.add(new BeanInterfaceNode(eb, eb.getHome(), BeanInterfaceNode.KINDS.REMOTE_HOME));
- }
-
- if (eb.getEjbClass() != null) {
- children.add(new BeanNode(eb));
- }
-
- }
-
- private void addSessionBeanSubNodes(SessionBean sb, List children) {
- addClassRelatedInfo(sb, children);
- addSessionJNDIRefInfo(sb, children);
- }
-
- private void addSessionJNDIRefInfo(SessionBean sb, List children) {
- if (sb.getEjbLocalRefs() != null && !sb.getEjbLocalRefs().isEmpty()){
- children.add(new JndiRefNode(sb.getEjbLocalRefs(), KINDS.EJBLOCALREF));
- }
-
- if (sb.getEjbRefs() != null && !sb.getEjbRefs().isEmpty()){
- children.add(new JndiRefNode(sb.getEjbRefs(), KINDS.EJBREF));
- }
-
- if (sb.getResourceEnvRefs() != null && !sb.getResourceEnvRefs().isEmpty()){
- children.add(new JndiRefNode(sb.getResourceEnvRefs(), KINDS.RESENVENTY));
- }
- if (sb.getEnvEntries() != null && !sb.getEnvEntries().isEmpty()){
- children.add(new JndiRefNode(sb.getEnvEntries(), KINDS.ENVENTRY));
- }
-
- if (sb.getResourceRefs() != null && !sb.getResourceRefs().isEmpty()){
- children.add(new JndiRefNode(sb.getResourceRefs(), KINDS.RESREF));
- }
-
- if (sb.getServiceRefs() != null && !sb.getServiceRefs().isEmpty()){
- children.add(new JndiRefNode(sb.getServiceRefs(), KINDS.SERVICEREF));
- }
- }
-
- private void addClassRelatedInfo(SessionBean sb, List children) {
- if (sb.getLocal() != null) {
- children.add(new BeanInterfaceNode(sb, sb.getLocal(), BeanInterfaceNode.KINDS.LOCAL));
- }
-
- if (sb.getLocalHome() != null) {
- children.add(new BeanInterfaceNode(sb, sb.getLocalHome(), BeanInterfaceNode.KINDS.LOCAL_HOME));
- }
-
- if (sb.getRemote() != null) {
- children.add(new BeanInterfaceNode(sb, sb.getRemote(), BeanInterfaceNode.KINDS.REMOTE));
- }
-
- if (sb.getHome() != null) {
- children.add(new BeanInterfaceNode(sb, sb.getHome(), BeanInterfaceNode.KINDS.REMOTE_HOME));
- }
-
- if (sb.getEjbClass() != null) {
- children.add(new BeanNode(sb));
- }
-
- List r = sb.getBusinessLocals();
- for (Object locals : r) {
- children.add(new BeanInterfaceNode(sb, (String)locals, BeanInterfaceNode.KINDS.BUSSINESS_LOCAL));
- }
-
- r = sb.getBusinessRemotes();
- for (Object locals : r) {
- children.add(new BeanInterfaceNode(sb, (String)locals, BeanInterfaceNode.KINDS.BUSSINESS_REMOTE));
- }
- }
-
- private boolean isEjbModuleProject(IProject project) {
- try {
- IFacetedProject facetedProject = ProjectFacetsManager.create(project);
- //EE6TODO
- IProjectFacetVersion installedVersion = facetedProject.getInstalledVersion(ProjectFacetsManager.getProjectFacet(IJ2EEFacetConstants.EJB).getVersion(IJ2EEFacetConstants.EJB_30.getVersionString()).getProjectFacet());
- return installedVersion != null;
- } catch (CoreException e) {
- JEEUIPlugin.logError("Can not acces project", e); //$NON-NLS-1$
- }
- return false;
- }
-
- public boolean hasChildren(Object element) {
- if (element instanceof AbstractGroupProvider) {
- return ((AbstractGroupProvider) element).hasChildren();
- } else if (element instanceof AbstractDDNode) {
- return ((AbstractDDNode) element).hasChildren();
- } else if (element instanceof SessionBean) {
- return true;
- } else if (element instanceof EntityBean) {
- return true;
- }else if (element instanceof MessageDrivenBean) {
- return true;
- } else
- return false;
- }
-
- public Object getParent(Object element) {
- return null;
- }
-
- public Object[] getElements(Object inputElement) {
- return getChildren(inputElement);
- }
-
- @Override
- protected AbstractGroupProvider getNewContentProviderInstance(IProject project) {
- IModelProvider cachedModelProvider = getCachedModelProvider(project);
- GroupEJBProvider root = new GroupEJBProvider((EJBJar) cachedModelProvider.getModelObject());
- root.setProjectName(project.getName());
- return root;
- }
-
-}
\ No newline at end of file
diff --git a/plugins/org.eclipse.jst.jee.ui/src/org/eclipse/jst/jee/ui/internal/navigator/Ejb3LabelProvider.java b/plugins/org.eclipse.jst.jee.ui/src/org/eclipse/jst/jee/ui/internal/navigator/Ejb3LabelProvider.java
deleted file mode 100644
index a5a5d5e..0000000
--- a/plugins/org.eclipse.jst.jee.ui/src/org/eclipse/jst/jee/ui/internal/navigator/Ejb3LabelProvider.java
+++ /dev/null
@@ -1,214 +0,0 @@
-/***********************************************************************
- * Copyright (c) 2008, 2010 by SAP AG, Walldorf.
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
- *
- * Contributors:
- * SAP AG - initial API and implementation
- ***********************************************************************/
-package org.eclipse.jst.jee.ui.internal.navigator;
-
-import java.net.URL;
-
-import org.eclipse.core.resources.IProject;
-import org.eclipse.jdt.core.IJavaProject;
-import org.eclipse.jface.resource.ImageDescriptor;
-import org.eclipse.jst.j2ee.internal.J2EEVersionConstants;
-import org.eclipse.jst.j2ee.internal.plugin.J2EEPlugin;
-import org.eclipse.jst.j2ee.internal.provider.J2EEAdapterFactoryLabelProvider;
-import org.eclipse.jst.j2ee.navigator.internal.IJ2EENavigatorConstants;
-import org.eclipse.jst.j2ee.navigator.internal.J2EELabelProvider;
-import org.eclipse.jst.j2ee.navigator.internal.LoadingDDNode;
-import org.eclipse.jst.javaee.core.EjbLocalRef;
-import org.eclipse.jst.javaee.core.EjbRef;
-import org.eclipse.jst.javaee.core.EnvEntry;
-import org.eclipse.jst.javaee.core.ResourceEnvRef;
-import org.eclipse.jst.javaee.core.ResourceRef;
-import org.eclipse.jst.javaee.core.ServiceRef;
-import org.eclipse.jst.javaee.ejb.ActivationConfigProperty;
-import org.eclipse.jst.javaee.ejb.EntityBean;
-import org.eclipse.jst.javaee.ejb.MessageDrivenBean;
-import org.eclipse.jst.javaee.ejb.SessionBean;
-import org.eclipse.jst.jee.ui.internal.navigator.ejb.GroupEJBProvider;
-import org.eclipse.jst.jee.ui.plugin.JEEUIPlugin;
-import org.eclipse.jst.jee.ui.plugin.JEEUIPluginIcons;
-import org.eclipse.swt.graphics.Image;
-import org.eclipse.wst.common.internal.emfworkbench.integration.DynamicAdapterFactory;
-
-/**
- * Ejb 3.0 Label provider is Deployment Descriptor label provider,
- * used for decorating of the descriptor tree in project explorer.
- *
- * @author Dimitar Giormov
- * @author Kaloyan Raev
- */
-public class Ejb3LabelProvider extends J2EELabelProvider {
-
- private Image ejb30Image;
- private Image ejb31Image;
- private Image sessionBeanImage;
- private Image mdbImage;
- private Image cmpImage;
- private Image ejbRefImage;
- private Image resourceRefImage;
- private Image serviceRefImage;
- private Image activationConfigImage;
-
- public Ejb3LabelProvider() {
- new J2EEAdapterFactoryLabelProvider(new DynamicAdapterFactory(IJ2EENavigatorConstants.VIEWER_ID));
- }
-
- @Override
- public Image getImage(Object element) {
- if(element instanceof LoadingDDNode) {
- return ((LoadingDDNode)element).getImage();
- } else if (element instanceof IProject || element instanceof IJavaProject) {
- return null;
- } else if (element instanceof GroupEJBProvider) {
- String version = ((GroupEJBProvider) element).getEjbJar().getVersion();
- if (J2EEVersionConstants.VERSION_3_0_TEXT.equals(version)) {
- return getEjb30Image();
- } else if (J2EEVersionConstants.VERSION_3_1_TEXT.equals(version)) {
- return getEjb31Image();
- }
- return getEjb30Image();
- } else if(element instanceof AbstractDDNode) {
- return ((AbstractDDNode) element).getImage();
- } else if (element instanceof SessionBean) {
- return getSessionBeanImage();
- } else if (element instanceof MessageDrivenBean) {
- return getMDBImage();
- } else if (element instanceof EntityBean){
- return getCMPImage();
- } else if (element instanceof EjbLocalRef || element instanceof EjbRef) {
- return getEjbRefImage();
- } else if (element instanceof EnvEntry) {
- return getResourceRefImage();
- } else if (element instanceof ResourceEnvRef) {
- return getResourceRefImage();
- } else if (element instanceof ResourceRef) {
- return getResourceRefImage();
- } else if (element instanceof ServiceRef) {
- return getServiceRefImage();
- } else if(element instanceof ActivationConfigProperty) {
- return getActivationConfigImage();
- }
-
- return null;
- }
-
- @Override
- public String getText(Object element) {
- String ret = null;
- if (element instanceof SessionBean || element instanceof MessageDrivenBean || element instanceof EntityBean) {
- ret = (element instanceof SessionBean) ? ((SessionBean) element).getEjbName() :
- (element instanceof MessageDrivenBean) ? ((MessageDrivenBean) element).getEjbName() :
- (element instanceof EntityBean) ? ((EntityBean) element).getEjbName() : null;
- } else if (element instanceof AbstractDDNode) {
- ret = ((AbstractDDNode) element).getText();
- } else if (element instanceof AbstractGroupProvider) {
- ret = ((AbstractGroupProvider) element).getText();
- } else if (element instanceof EjbLocalRef || element instanceof EjbRef){
- ret = element instanceof EjbLocalRef ? ((EjbLocalRef)element).getEjbRefName() : element instanceof EjbRef ? ((EjbRef)element).getEjbRefName() : null;
- } else if (element instanceof EnvEntry){
- ret = ((EnvEntry) element).getEnvEntryName();
- } else if (element instanceof ResourceEnvRef){
- ret = ((ResourceEnvRef) element).getResourceEnvRefName();
- } else if (element instanceof ResourceRef){
- ret = ((ResourceRef) element).getResRefName();
- } else if (element instanceof ServiceRef){
- ret = ((ServiceRef) element).getServiceRefName();
- } else if(element instanceof ActivationConfigProperty){
- ret = ((ActivationConfigProperty)element).getActivationConfigPropertyName() + ":" +((ActivationConfigProperty)element).getActivationConfigPropertyValue(); //$NON-NLS-1$
- }
-
- return ret;
- }
-
- @Override
- public String getDescription(Object anElement) {
- String description = super.getDescription(anElement);
-
- if (anElement instanceof AbstractDDNode) {
- String desc = ((AbstractDDNode) anElement).getDescription();
- if (desc != null) {
- description = desc;
- }
- }
-
- return description;
- }
-
- private Image getEjb30Image() {
- if (ejb30Image == null) {
- ejb30Image = JEEUIPlugin.getDefault().getImageDescriptor(JEEUIPluginIcons.IMG_EJBEEMODEL).createImage();
- }
- return ejb30Image;
- }
-
- private Image getEjb31Image() {
- if (ejb31Image == null) {
- ejb31Image = JEEUIPlugin.getDefault().getImageDescriptor(JEEUIPluginIcons.IMG_EJBEE6MODEL).createImage();
- }
- return ejb31Image;
- }
-
- private Image getSessionBeanImage() {
- if (sessionBeanImage == null) {
- URL url = (URL) J2EEPlugin.getPlugin().getImage("sessionBean_obj"); //$NON-NLS-1$
- sessionBeanImage = ImageDescriptor.createFromURL(url).createImage();
- }
- return sessionBeanImage;
- }
-
- private Image getMDBImage() {
- if (mdbImage == null) {
- URL url = (URL) J2EEPlugin.getPlugin().getImage("message_bean_obj"); //$NON-NLS-1$
- mdbImage = ImageDescriptor.createFromURL(url).createImage();
- }
- return mdbImage;
- }
-
- private Image getCMPImage() {
- if (cmpImage == null) {
- URL url = (URL) J2EEPlugin.getPlugin().getImage("cmpEntity_obj"); //$NON-NLS-1$
- cmpImage = ImageDescriptor.createFromURL(url).createImage();
- }
- return cmpImage;
- }
-
- private Image getEjbRefImage() {
- if (ejbRefImage == null) {
- URL url = (URL) J2EEPlugin.getPlugin().getImage("ejbRef_obj"); //$NON-NLS-1$
- ejbRefImage = ImageDescriptor.createFromURL(url).createImage();
- }
- return ejbRefImage;
- }
-
- private Image getResourceRefImage() {
- if (resourceRefImage == null) {
- URL url = (URL) J2EEPlugin.getPlugin().getImage("resourceRef_obj"); //$NON-NLS-1$
- resourceRefImage = ImageDescriptor.createFromURL(url).createImage();
- }
- return resourceRefImage;
- }
-
- private Image getServiceRefImage() {
- if (serviceRefImage == null) {
- URL url = (URL) J2EEPlugin.getPlugin().getImage("attribute_obj"); //$NON-NLS-1$
- serviceRefImage = ImageDescriptor.createFromURL(url).createImage();
- }
- return serviceRefImage;
- }
-
- private Image getActivationConfigImage() {
- if (activationConfigImage == null) {
- URL url = (URL) J2EEPlugin.getPlugin().getImage("access_intent_obj"); //$NON-NLS-1$
- activationConfigImage = ImageDescriptor.createFromURL(url).createImage();
- }
- return activationConfigImage;
- }
-
-}
diff --git a/plugins/org.eclipse.jst.jee.ui/src/org/eclipse/jst/jee/ui/internal/navigator/JEE5ContentProvider.java b/plugins/org.eclipse.jst.jee.ui/src/org/eclipse/jst/jee/ui/internal/navigator/JEE5ContentProvider.java
deleted file mode 100644
index 9da9bf8..0000000
--- a/plugins/org.eclipse.jst.jee.ui/src/org/eclipse/jst/jee/ui/internal/navigator/JEE5ContentProvider.java
+++ /dev/null
@@ -1,262 +0,0 @@
-/***********************************************************************
- * Copyright (c) 2008 by SAP AG, Walldorf.
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
- *
- * Contributors:
- * SAP AG - initial API and implementation
- ***********************************************************************/
-package org.eclipse.jst.jee.ui.internal.navigator;
-
-import java.util.ArrayList;
-import java.util.Arrays;
-import java.util.HashMap;
-import java.util.List;
-import java.util.Map;
-
-import org.eclipse.core.resources.IProject;
-import org.eclipse.core.resources.IResource;
-import org.eclipse.core.resources.IResourceChangeEvent;
-import org.eclipse.core.resources.IResourceChangeListener;
-import org.eclipse.core.resources.ResourcesPlugin;
-import org.eclipse.core.runtime.IProgressMonitor;
-import org.eclipse.core.runtime.IStatus;
-import org.eclipse.core.runtime.Status;
-import org.eclipse.core.runtime.jobs.ISchedulingRule;
-import org.eclipse.core.runtime.jobs.Job;
-import org.eclipse.jface.viewers.AbstractTreeViewer;
-import org.eclipse.jface.viewers.ISelection;
-import org.eclipse.jface.viewers.ITreeContentProvider;
-import org.eclipse.jface.viewers.StructuredViewer;
-import org.eclipse.jface.viewers.TreeViewer;
-import org.eclipse.jface.viewers.Viewer;
-import org.eclipse.jst.j2ee.model.IModelProvider;
-import org.eclipse.jst.j2ee.model.IModelProviderEvent;
-import org.eclipse.jst.j2ee.model.IModelProviderListener;
-import org.eclipse.jst.j2ee.model.ModelProviderManager;
-import org.eclipse.jst.j2ee.navigator.internal.EMFRootObjectProvider.IRefreshHandlerListener;
-import org.eclipse.jst.javaee.core.JavaEEObject;
-import org.eclipse.jst.javaee.ejb.EntityBean;
-import org.eclipse.jst.javaee.ejb.MessageDrivenBean;
-import org.eclipse.jst.javaee.ejb.SessionBean;
-import org.eclipse.jst.jee.ui.plugin.JEEUIPlugin;
-import org.eclipse.swt.widgets.Display;
-import org.eclipse.swt.widgets.Item;
-import org.eclipse.swt.widgets.Tree;
-import org.eclipse.swt.widgets.TreeItem;
-import org.eclipse.swt.widgets.Widget;
-import org.eclipse.ui.progress.UIJob;
-import org.eclipse.wst.common.componentcore.ModuleCoreNature;
-
-public abstract class JEE5ContentProvider implements ITreeContentProvider, IRefreshHandlerListener, IModelProviderListener, IResourceChangeListener {
-
- protected Viewer viewer;
- protected static final Class IPROJECT_CLASS = IProject.class;
-
- protected static Map<IProject, IModelProvider> groupProvidersMap = new HashMap<IProject, IModelProvider>();
-
- protected static Map<IProject, AbstractGroupProvider> groupContentProviders = new HashMap<IProject, AbstractGroupProvider>();
-
-
- public JEE5ContentProvider() {
- ResourcesPlugin.getWorkspace().addResourceChangeListener(this);
- }
-
- public void inputChanged(Viewer aViewer, Object anOldInput, Object aNewInput) {
- viewer = aViewer;
- }
-
-
- protected IModelProvider getCachedModelProvider(IProject project) {
- IModelProvider provider = groupProvidersMap.get(project);
- if (provider == null){
- provider = ModelProviderManager.getModelProvider(project);
- provider.addListener(this);
- groupProvidersMap.put(project,provider);
- }
- return provider;
- }
-
- protected AbstractGroupProvider getCachedContentProvider(IProject project) {
- AbstractGroupProvider provider = groupContentProviders.get(project);
- if (provider == null){
- if (project == null || !project.isAccessible()){
- return null;
- }
- // if the project is no longer a valid flexible project (due to deletion of critical files)
- if (!ModuleCoreNature.isFlexibleProject(project)){
- return null;
- }
- provider = getNewContentProviderInstance(project);
- groupContentProviders.put(project, provider);
- } else {
- if (!project.isAccessible()){
- return null;
- }
- Object modelObject = ModelProviderManager.getModelProvider(project).getModelObject();
- if (provider.getJavaEEObject() != modelObject){
- if (modelObject == null){
- provider.setValid(false);
- return provider;
- }
-
- provider.reinit((JavaEEObject)modelObject);
- }
- }
- return provider;
- }
-
- protected abstract AbstractGroupProvider getNewContentProviderInstance(IProject project);
-
-
- public void projectChanged(final IProject project) {
- try {
- Runnable refreshThread = new Runnable() {
- public void run() {
- if (viewer != null) {
- try{
-
- if( viewer.getControl() != null && !viewer.getControl().isDisposed() ){
- viewer.getControl().setRedraw(false);
- ISelection sel = ((TreeViewer) viewer).getSelection();
- ITreeContentProvider contentProvider = ((ITreeContentProvider) ((TreeViewer) viewer)
- .getContentProvider());
- contentProvider.getChildren(project);
- Object[] expandedElements = ((TreeViewer) viewer).getExpandedElements();
-
- ((StructuredViewer) viewer).refresh(project);
- ((TreeViewer) viewer).setSelection(sel);
-
- expandElements(expandedElements);
- }
-
- }finally{
- if( viewer.getControl() != null && !viewer.getControl().isDisposed() ){
- viewer.getControl().setRedraw(true);
- }
- }
- }
- }
-
- private void expandElements(Object[] expandedElements) {
- ArrayList<Object> newExpandedElements = new ArrayList<Object>();
-
- ArrayList<Object> allElements = new ArrayList<Object>();
- getViewerElements(allElements, ((TreeViewer) viewer).getControl());
-
- Object[] expandedElementsAfterRefresh = ((TreeViewer) viewer).getExpandedElements();
- newExpandedElements.addAll(Arrays.asList(expandedElementsAfterRefresh));
- for(int i=0;i < expandedElements.length;i++){
- boolean expanded = false;
- for(int j=0;j < expandedElementsAfterRefresh.length; j++){
- if(expandedElements[i].equals(expandedElementsAfterRefresh[j])){
- expanded = true;
- break;
- }
- }
- if(expanded){
- for(Object ob : allElements){
- if(ob instanceof SessionBean
- && expandedElements[i] instanceof SessionBean){
- SessionBean bean = (SessionBean) ob;
- SessionBean bean2 = (SessionBean) expandedElements[i];
- if(bean.getEjbName().equals(bean2.getEjbName())){
- newExpandedElements.add(ob);
- }
- }
- if(ob instanceof MessageDrivenBean
- && expandedElements[i] instanceof MessageDrivenBean){
- MessageDrivenBean bean = (MessageDrivenBean) ob;
- MessageDrivenBean bean2 = (MessageDrivenBean) expandedElements[i];
- if(bean.getEjbName().equals(bean2.getEjbName())){
- newExpandedElements.add(ob);
- }
- }
- if(ob instanceof EntityBean
- && expandedElements[i] instanceof EntityBean){
- EntityBean bean = (EntityBean) ob;
- EntityBean bean2 = (EntityBean) expandedElements[i];
- if(bean.getEjbName().equals(bean2.getEjbName())){
- newExpandedElements.add(ob);
- }
- }
- }
- }
- }
- ((TreeViewer) viewer).setExpandedElements(newExpandedElements.toArray());
- }
- };
- Display.getDefault().asyncExec(refreshThread);
- } catch (Exception e)
- {
- JEEUIPlugin.logError("Error during refresh", e); //$NON-NLS-1$
- }
- }
-
- private void getViewerElements(List result, Widget widget) {
- Item[] items = getChildren(widget);
- for (int i = 0; i < items.length; i++) {
- Item item = items[i];
- result.add(item.getData());
- getViewerElements(result, item);
- }
- }
-
- protected Item[] getChildren(Widget o) {
- if (o instanceof TreeItem) {
- return ((TreeItem) o).getItems();
- }
- if (o instanceof Tree) {
- return ((Tree) o).getItems();
- }
- return null;
- }
-
- public void modelsChanged(IModelProviderEvent event) {
- projectChanged(event.getProject());
-
- }
-
- public void onRefresh(final Object element) {
- if (viewer instanceof AbstractTreeViewer) {
- if (Display.getCurrent() != null) {
- ((AbstractTreeViewer) viewer).refresh(element, true);
- } else {
- /* Create and schedule a UI Job to update the Navigator Content Viewer */
- Job job = new UIJob("Update the Navigator Content Viewer Job") { //$NON-NLS-1$
- @Override
- public IStatus runInUIThread(IProgressMonitor monitor) {
- ((AbstractTreeViewer) viewer).refresh(element, true);
- return Status.OK_STATUS;
- }
- };
- ISchedulingRule rule = new ISchedulingRule() {
- public boolean contains(ISchedulingRule rule) {
- return rule == this;
- }
- public boolean isConflicting(ISchedulingRule rule) {
- return rule == this;
- }
- };
- job.setRule(rule);
- job.schedule();
- }
- }
- }
-
- public void dispose() {
- groupProvidersMap.clear();
- groupContentProviders.clear();
- }
-
- public void resourceChanged(IResourceChangeEvent event) {
- if (event.getType() == IResourceChangeEvent.PRE_DELETE && event.getResource() != null && event.getResource().getType() == IResource.PROJECT){
- groupContentProviders.remove(event.getResource());
- groupProvidersMap.remove(event.getResource());
- }
-
- }
-
-}
diff --git a/plugins/org.eclipse.jst.jee.ui/src/org/eclipse/jst/jee/ui/internal/navigator/JEEActionProvider.java b/plugins/org.eclipse.jst.jee.ui/src/org/eclipse/jst/jee/ui/internal/navigator/JEEActionProvider.java
deleted file mode 100644
index 7c0c02b..0000000
--- a/plugins/org.eclipse.jst.jee.ui/src/org/eclipse/jst/jee/ui/internal/navigator/JEEActionProvider.java
+++ /dev/null
@@ -1,243 +0,0 @@
-/***********************************************************************
- * Copyright (c) 2008 by SAP AG, Walldorf.
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
- *
- * Contributors:
- * SAP AG - initial API and implementation
- ***********************************************************************/
-package org.eclipse.jst.jee.ui.internal.navigator;
-
-import java.util.ArrayList;
-import java.util.List;
-
-import org.eclipse.core.resources.IFile;
-import org.eclipse.core.resources.IResource;
-import org.eclipse.core.runtime.IAdaptable;
-import org.eclipse.emf.ecore.EObject;
-import org.eclipse.jface.action.IMenuManager;
-import org.eclipse.jface.action.MenuManager;
-import org.eclipse.jface.viewers.ISelection;
-import org.eclipse.jface.viewers.IStructuredSelection;
-import org.eclipse.jface.viewers.StructuredSelection;
-import org.eclipse.jst.j2ee.internal.provider.J2EEUtilityJarItemProvider;
-import org.eclipse.jst.jee.ui.internal.navigator.appclient.GroupAppClientProvider;
-import org.eclipse.jst.jee.ui.internal.navigator.ear.GroupEARProvider;
-import org.eclipse.jst.jee.ui.internal.navigator.ejb.BeanInterfaceNode;
-import org.eclipse.jst.jee.ui.internal.navigator.ejb.BeanNode;
-import org.eclipse.jst.jee.ui.internal.navigator.ejb.GroupEJBProvider;
-import org.eclipse.jst.jee.ui.internal.navigator.ra.RaGroupContentProvider;
-import org.eclipse.jst.jee.ui.internal.navigator.web.WebAppProvider;
-import org.eclipse.ui.IActionBars;
-import org.eclipse.ui.IWorkbenchPage;
-import org.eclipse.ui.PlatformUI;
-import org.eclipse.ui.actions.ActionContext;
-import org.eclipse.ui.actions.OpenWithMenu;
-import org.eclipse.ui.internal.navigator.resources.plugin.WorkbenchNavigatorMessages;
-import org.eclipse.ui.navigator.CommonActionProvider;
-import org.eclipse.ui.navigator.ICommonActionConstants;
-import org.eclipse.ui.navigator.ICommonActionExtensionSite;
-import org.eclipse.ui.navigator.ICommonMenuConstants;
-import org.eclipse.wst.common.internal.emfworkbench.WorkbenchResourceHelper;
-
-/**
- * Standard operations Java EE Action Provider.
- * Introduces standard operations for Deployment descriptor tree nodes. (like open)
- *
- * @author Dimitar Giormov
- *
- */
-public class JEEActionProvider extends CommonActionProvider {
-
-private static final Class IRESOURCE_CLASS = IResource.class;
-
- private OpenJEEResourceAction openAction;
-
- /**
- *
- */
- public JEEActionProvider() {
- }
- /*
- * (non-Javadoc)
- *
- * @see org.eclipse.wst.common.navigator.internal.views.actions.ICommonActionProvider#init(org.eclipse.ui.IViewPart,
- * org.eclipse.jface.viewers.StructuredViewer,
- * org.eclipse.wst.common.navigator.internal.views.extensions.NavigatorContentService)
- */
- @Override
- public void init(ICommonActionExtensionSite aConfig) {
- openAction = new OpenJEEResourceAction();
- }
-
- /*
- * (non-Javadoc)
- *
- * @see org.eclipse.wst.common.navigator.internal.views.actions.ICommonActionProvider#setActionContext(org.eclipse.ui.actions.ActionContext)
- */
- @Override
- public void setContext(ActionContext aContext) {
-
- if (aContext != null && aContext.getSelection() instanceof IStructuredSelection) {
- IStructuredSelection selection = (IStructuredSelection) aContext.getSelection();
-
- openAction.selectionChanged(selection);
-
- Object[] array = selection.toArray();
- if (isUtilityJars(array)) {
- J2EEUtilityJarItemProvider utilityJarItemProvider = null;
- List newSelection = new ArrayList();
- for (int i = 0; i < array.length; i++) {
- utilityJarItemProvider = (J2EEUtilityJarItemProvider) array[i];
- newSelection.addAll(utilityJarItemProvider.getChildren(null));
- }
- selection = new StructuredSelection(newSelection);
- }
- }
- super.setContext(aContext);
- }
-
- /*
- * (non-Javadoc)
- *
- * @see org.eclipse.wst.common.navigator.internal.views.actions.ICommonActionProvider#fillActionBars(org.eclipse.ui.IActionBars)
- */
- @Override
- public void fillActionBars(IActionBars theActionBars) {
- if(openAction.isEnabled())
- theActionBars.setGlobalActionHandler(ICommonActionConstants.OPEN, openAction);
- return;
- }
-
- /*
- * (non-Javadoc)
- *
- * @see org.eclipse.wst.common.navigator.internal.views.actions.ICommonActionProvider#fillContextMenu(org.eclipse.jface.action.IMenuManager)
- */
- @Override
- public void fillContextMenu(IMenuManager aMenu) {
- if (getContext()==null || getContext().getSelection().isEmpty())
- return;
- IStructuredSelection selection = (IStructuredSelection) getContext().getSelection();
- if(!adaptsToResource(selection.toArray())) {
- openAction.selectionChanged(selection);
-// createAction.selectionChanged(selection);
- if (openAction.isEnabled())
- aMenu.insertAfter(ICommonMenuConstants.GROUP_OPEN, openAction);
-// if (createAction.isEnabled())
-// aMenu.insertAfter(ICommonMenuConstants.GROUP_OPEN, createAction);
- addOpenWithMenu(aMenu);
-
- }
- }
-
- private boolean adaptsToResource(Object[] objects) {
- for (int i = 0; i < objects.length; i++) {
- if(objects[i] instanceof IResource) {
- return true;
- } else if (objects[i] instanceof IAdaptable && (((IAdaptable)objects[i]).getAdapter(IRESOURCE_CLASS) != null)) {
- return true;
- }
- }
- return false;
- }
- private boolean isUtilityJars(Object[] items) {
- if (items != null) {
- for (int i = 0; i < items.length; i++) {
- if (items[i] == null || items[i].getClass() != J2EEUtilityJarItemProvider.class)
- return false;
- }
- return true;
- }
- return false;
- }
-
- private void addOpenWithMenu(IMenuManager menu) {
- ISelection selection= getContext().getSelection();
- if (selection.isEmpty() || !(selection instanceof IStructuredSelection))
- return;
- IStructuredSelection ss= (IStructuredSelection)selection;
- if (ss.size() != 1)
- return;
-
- Object srcObject = ss.getFirstElement();
- Object resource = null;
-
- if (srcObject instanceof EObject) {
- resource = openEObject((EObject) srcObject);
- } else if (srcObject instanceof BeanInterfaceNode) {
- resource = ((BeanInterfaceNode) srcObject).get_fqn();
- } else if (srcObject instanceof BeanNode) {
- resource = ((BeanNode) srcObject).getEjbClassQualifiedName();
-
- } else if (srcObject instanceof WebAppProvider) {
- IFile file = ((WebAppProvider) srcObject).getDDFile();
- if (file.isAccessible()){
- resource = file;
- }
- } else if (srcObject instanceof RaGroupContentProvider) {
- IFile file = WorkbenchResourceHelper.getFile((EObject) ((AbstractGroupProvider)srcObject).getJavaEEObject());
- if (file.isAccessible()){
- resource = file;
- }
- } else if (srcObject instanceof GroupAppClientProvider) {
- IFile file = ((GroupAppClientProvider) srcObject).getDDFile();
- if (file.isAccessible()){
- resource = file;
- }
- } else if (srcObject instanceof GroupEJBProvider) {
- IFile file = WorkbenchResourceHelper.getFile((EObject)((GroupEJBProvider)srcObject).getEjbJar());
- if (file.isAccessible()){
- resource = file;
- }
- } else if (srcObject instanceof GroupEARProvider) {
- IFile file = ((GroupEARProvider) srcObject).getDDFile();
- if (file.isAccessible()){
- resource = file;
- }
- }
-
- if (!(resource instanceof IFile))
- return;
-
- // Create a menu.
- IWorkbenchPage page = PlatformUI.getWorkbench().getActiveWorkbenchWindow()
- .getActivePage();
- IMenuManager submenu= new MenuManager(WorkbenchNavigatorMessages.OpenActionProvider_OpenWithMenu_label,
- ICommonMenuConstants.GROUP_OPEN_WITH);
- submenu.add(new OpenWithMenu(page, (IFile) resource));
-
- // Add the submenu.
- menu.appendToGroup(ICommonMenuConstants.GROUP_OPEN, submenu);
- }
-
- private IResource openEObject(EObject _srcObject) {
-// EObject ro = _srcObject;
-// IResource resource = WorkbenchResourceHelper
-// .getFile(_srcObject);
-// if (resource != null) {
-// return resource;
-// }
-// ModuleFile moduleFile = ArchiveUtil.getModuleFile(ro);
-// if (moduleFile != null) {
-// ArchiveOptions options = moduleFile.getOptions();
-// if (options instanceof ComponentArchiveOptions) {
-// IVirtualComponent component = ((ComponentArchiveOptions) options)
-// .getComponent();
-//// openAppropriateEditor(component);
-// }
-// } else {
-// IArchive archive = JavaEEArchiveUtilities.findArchive(ro);
-// if(archive != null){
-// IVirtualComponent component = JavaEEArchiveUtilities.findComponent(archive);
-// if(component != null){
-//// openAppropriateEditor(component);
-// }
-// }
-// }
-
- return null;
- }
-}
diff --git a/plugins/org.eclipse.jst.jee.ui/src/org/eclipse/jst/jee/ui/internal/navigator/JndiRefNode.java b/plugins/org.eclipse.jst.jee.ui/src/org/eclipse/jst/jee/ui/internal/navigator/JndiRefNode.java
deleted file mode 100644
index b19a53a..0000000
--- a/plugins/org.eclipse.jst.jee.ui/src/org/eclipse/jst/jee/ui/internal/navigator/JndiRefNode.java
+++ /dev/null
@@ -1,126 +0,0 @@
-/***********************************************************************
- * Copyright (c) 2008 by SAP AG, Walldorf.
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
- *
- * Contributors:
- * SAP AG - initial API and implementation
- ***********************************************************************/
-package org.eclipse.jst.jee.ui.internal.navigator;
-
-import java.net.URL;
-import java.util.List;
-
-import org.eclipse.jface.resource.ImageDescriptor;
-import org.eclipse.jst.j2ee.internal.plugin.J2EEPlugin;
-import org.eclipse.jst.jee.ui.internal.Messages;
-import org.eclipse.swt.graphics.Image;
-
-/**
- * Deployment Descriptor node that contains information about JNDI references.
- * Like: Ejb reference, Ejb Local Reference, Resource Reference, Resource Environment Reference,
- * Environment Entry, Service Reference
- *
- * @author Dimitar Giormov
- *
- */
-public class JndiRefNode extends AbstractDDNode {
-
- private final int kind;
-
- public class KINDS {
- public static final int EJBLOCALREF = 0;
- public static final int EJBREF = 1;
- public static final int ENVENTRY = 2;
- public static final int RESENVENTY = 3;
- public static final int RESREF = 4;
- public static final int SERVICEREF = 5;
- }
-
- public JndiRefNode(Object adapterNode, int kind) {
- super(adapterNode);
- this.kind = kind;
-
- }
-
- public int getKind() {
- return kind;
- }
-
- @Override
- public List getChildren() {
- return (List) adapterNode;
- }
-
- @Override
- public String getText() {
- switch (kind) {
- case KINDS.EJBLOCALREF:
- return Messages.EJBLOCAL_REFERENCES;
-
- case KINDS.EJBREF:
- return Messages.EJB_REFERENCES;
- case KINDS.ENVENTRY:
- return Messages.ENVIROMENT_ENTRIES;
- case KINDS.RESENVENTY:
- return Messages.RESOURCE_ENVIROMENT_ENTRIES;
- case KINDS.RESREF:
- return Messages.RESOURCE_REFERENCES;
- case KINDS.SERVICEREF:
- return Messages.SERVICE_REFERENCES;
-
- default:
- break;
- }
- return super.getText();
- }
-
- @Override
- public Image getImage() {
- switch (kind) {
- case KINDS.EJBLOCALREF:{
- URL url = (URL) J2EEPlugin.getPlugin().getImage("ejbRef_obj"); //$NON-NLS-1$
- return ImageDescriptor.createFromURL(url).createImage();
- }
- case KINDS.EJBREF:{
- URL url = (URL) J2EEPlugin.getPlugin().getImage("ejbRef_obj"); //$NON-NLS-1$
- return ImageDescriptor.createFromURL(url).createImage();
- }
-
- case KINDS.ENVENTRY:
- {
- URL url = (URL) J2EEPlugin.getPlugin().getImage("resourceRef_obj"); //$NON-NLS-1$
- return ImageDescriptor.createFromURL(url).createImage();
- }
- case KINDS.RESENVENTY:
- {
- URL url = (URL) J2EEPlugin.getPlugin().getImage("resourceRef_obj"); //$NON-NLS-1$
- return ImageDescriptor.createFromURL(url).createImage();
- }
- case KINDS.RESREF:
- {
- URL url = (URL) J2EEPlugin.getPlugin().getImage("resourceRef_obj"); //$NON-NLS-1$
- return ImageDescriptor.createFromURL(url).createImage();
- }
- case KINDS.SERVICEREF:
- {
- URL url = (URL) J2EEPlugin.getPlugin().getImage("resourceRef_obj"); //$NON-NLS-1$
- return ImageDescriptor.createFromURL(url).createImage();
- }
-
- default:
- break;
- }
- return super.getImage();
- }
-
-
- @Override
- public boolean hasChildren() {
-
- return true;
- }
-
-}
diff --git a/plugins/org.eclipse.jst.jee.ui/src/org/eclipse/jst/jee/ui/internal/navigator/OpenJEEResourceAction.java b/plugins/org.eclipse.jst.jee.ui/src/org/eclipse/jst/jee/ui/internal/navigator/OpenJEEResourceAction.java
deleted file mode 100644
index bd59e01..0000000
--- a/plugins/org.eclipse.jst.jee.ui/src/org/eclipse/jst/jee/ui/internal/navigator/OpenJEEResourceAction.java
+++ /dev/null
@@ -1,703 +0,0 @@
-/***********************************************************************
- * Copyright (c) 2008 by SAP AG, Walldorf.
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
- *
- * Contributors:
- * SAP AG - initial API and implementation
- ***********************************************************************/
-package org.eclipse.jst.jee.ui.internal.navigator;
-
-import java.util.List;
-
-import org.eclipse.core.resources.IFile;
-import org.eclipse.core.resources.IProject;
-import org.eclipse.core.resources.IResource;
-import org.eclipse.core.runtime.Path;
-import org.eclipse.core.runtime.content.IContentType;
-import org.eclipse.emf.ecore.EObject;
-import org.eclipse.emf.ecore.resource.Resource;
-import org.eclipse.jdt.core.ICompilationUnit;
-import org.eclipse.jdt.core.IJavaElement;
-import org.eclipse.jdt.core.IJavaProject;
-import org.eclipse.jdt.core.IType;
-import org.eclipse.jdt.core.JavaCore;
-import org.eclipse.jdt.core.JavaModelException;
-import org.eclipse.jdt.internal.ui.javaeditor.EditorUtility;
-import org.eclipse.jdt.ui.JavaUI;
-import org.eclipse.jface.dialogs.MessageDialog;
-import org.eclipse.jface.viewers.IStructuredSelection;
-import org.eclipse.jface.viewers.TreePath;
-import org.eclipse.jface.viewers.TreeSelection;
-import org.eclipse.jst.j2ee.commonarchivecore.internal.ModuleFile;
-import org.eclipse.jst.j2ee.commonarchivecore.internal.helpers.ArchiveOptions;
-import org.eclipse.jst.j2ee.commonarchivecore.internal.util.ArchiveUtil;
-import org.eclipse.jst.j2ee.internal.J2EEConstants;
-import org.eclipse.jst.j2ee.internal.actions.AbstractOpenAction;
-import org.eclipse.jst.j2ee.internal.actions.ComponentEditorInput;
-import org.eclipse.jst.j2ee.internal.archive.JavaEEArchiveUtilities;
-import org.eclipse.jst.j2ee.internal.componentcore.ComponentArchiveOptions;
-import org.eclipse.jst.j2ee.internal.ejb.provider.J2EEJavaClassProviderHelper;
-import org.eclipse.jst.j2ee.internal.plugin.J2EEUIMessages;
-import org.eclipse.jst.j2ee.model.ModelProviderManager;
-import org.eclipse.jst.j2ee.project.JavaEEProjectUtilities;
-import org.eclipse.jst.j2ee.webservice.wsdd.BeanLink;
-import org.eclipse.jst.javaee.core.EjbLocalRef;
-import org.eclipse.jst.javaee.core.InjectionTarget;
-import org.eclipse.jst.javaee.core.JavaEEObject;
-import org.eclipse.jst.javaee.core.Listener;
-import org.eclipse.jst.javaee.core.ResourceRef;
-import org.eclipse.jst.javaee.core.internal.impl.EjbLocalRefImpl;
-import org.eclipse.jst.javaee.core.internal.impl.ResourceRefImpl;
-import org.eclipse.jst.javaee.ejb.EJBJar;
-import org.eclipse.jst.javaee.ejb.EntityBean;
-import org.eclipse.jst.javaee.ejb.MessageDrivenBean;
-import org.eclipse.jst.javaee.ejb.SessionBean;
-import org.eclipse.jst.javaee.web.Filter;
-import org.eclipse.jst.javaee.web.Servlet;
-import org.eclipse.jst.javaee.web.WebApp;
-import org.eclipse.jst.jee.archive.IArchive;
-import org.eclipse.jst.jee.ui.internal.navigator.appclient.GroupAppClientProvider;
-import org.eclipse.jst.jee.ui.internal.navigator.ear.GroupEARProvider;
-import org.eclipse.jst.jee.ui.internal.navigator.ejb.BeanInterfaceNode;
-import org.eclipse.jst.jee.ui.internal.navigator.ejb.BeanNode;
-import org.eclipse.jst.jee.ui.internal.navigator.ejb.GroupEJBProvider;
-import org.eclipse.jst.jee.ui.internal.navigator.ra.RaGroupContentProvider;
-import org.eclipse.jst.jee.ui.internal.navigator.web.WebAppProvider;
-import org.eclipse.jst.jee.ui.internal.navigator.web.WebArtifactNode;
-import org.eclipse.jst.jee.ui.plugin.JEEUIPlugin;
-import org.eclipse.ui.IEditorDescriptor;
-import org.eclipse.ui.IEditorPart;
-import org.eclipse.ui.IEditorRegistry;
-import org.eclipse.ui.IWorkbenchPage;
-import org.eclipse.ui.PartInitException;
-import org.eclipse.ui.PlatformUI;
-import org.eclipse.ui.ide.IDE;
-import org.eclipse.ui.part.FileEditorInput;
-import org.eclipse.ui.part.ISetSelectionTarget;
-import org.eclipse.wst.common.componentcore.resources.IVirtualComponent;
-import org.eclipse.wst.common.internal.emfworkbench.WorkbenchResourceHelper;
-
-/**
- * Open Action for Deployment descriptor tree nodes.
- *
- * @author Dimitar Giormov
- *
- */
-public class OpenJEEResourceAction extends AbstractOpenAction {
-
- public static final String ID = "com.sap.ide.j2ee.ui.actions.OpenJEEResourceAction"; //$NON-NLS-1$
- public static final String JAVA_EDITOR_ID = "org.eclipse.jst.j2ee.internal.internal.ejb.ui.java.EnterpriseBeanJavaEditor"; //$NON-NLS-1$
- public static final String BASE_JAVA_EDITOR_ID = "org.eclipse.jdt.ui.CompilationUnitEditor"; //$NON-NLS-1$
-
- protected static IEditorDescriptor javaEditorDescriptor;
- protected static IEditorDescriptor baseJavaEditorDescriptor;
-
- /**
- * Create an instance of this class
- */
- public OpenJEEResourceAction() {
- super("Open"); //$NON-NLS-1$
- }
-
- /**
- * Returns the action ID.
- */
- public String getID() {
- return ID;
- }
-
- public static IEditorDescriptor getJavaEditorDescriptor() {
- if (javaEditorDescriptor == null)
- javaEditorDescriptor = findEditorDescriptor(JAVA_EDITOR_ID);
- return javaEditorDescriptor;
- }
-
- public static IEditorDescriptor getBaseJavaEditorDescriptor() {
- if (baseJavaEditorDescriptor == null)
- baseJavaEditorDescriptor = findEditorDescriptor(BASE_JAVA_EDITOR_ID);
- return baseJavaEditorDescriptor;
- }
-
- protected void openAppropriateEditor(String c) {
- if(getStructuredSelection() instanceof TreeSelection){
- TreePath path = ((TreeSelection) getStructuredSelection()).getPaths()[0];
- IProject project = null;
-
- while (path != null) {
- Object segment = path.getLastSegment();
- if (segment instanceof IProject) {
- project = (IProject) segment;
- break;
- }
- path = path.getParentPath();
- }
-
- if (project != null) {
- try {
- IType findType = JavaCore.create(project).findType(c);
- if(findType == null){
- return;
- }
- openAppropriateEditor(findType.getResource());
- } catch (JavaModelException e) {
- JEEUIPlugin.logError("Error during open editor", e); //$NON-NLS-1$
- }
- }
- }
- }
-
- protected void openAppropriateEditor(IVirtualComponent c) {
- if (c == null) {
- return;
- }
- IWorkbenchPage page = null;
- IEditorPart editor = null;
- try {
- page = PlatformUI.getWorkbench().getActiveWorkbenchWindow()
- .getActivePage();
- editor = page.openEditor(new ComponentEditorInput(c),
- currentDescriptor.getId());
- if (editor instanceof ISetSelectionTarget)
- ((ISetSelectionTarget) editor)
- .selectReveal(getStructuredSelection());
- } catch (Exception e) {
- MessageDialog
- .openError(
- PlatformUI.getWorkbench().getActiveWorkbenchWindow().getShell(),
- J2EEUIMessages
- .getResourceString("Problems_Opening_Editor_ERROR_"), e.getMessage()); //$NON-NLS-1$ = "Problems Opening Editor"
- }
- }
-
- protected void openAppropriateEditor(IJavaElement element) {
- if (element == null) {
- return;
- }
- try {
- JavaUI.openInEditor(element);
- } catch (Exception e) {
- MessageDialog
- .openError(
- PlatformUI.getWorkbench().getActiveWorkbenchWindow().getShell(),
- J2EEUIMessages
- .getResourceString("Problems_Opening_Editor_ERROR_"), e.getMessage()); //$NON-NLS-1$ = "Problems Opening Editor"
- }
- }
-
- /**
- * open the appropriate editor
- */
- protected void openAppropriateEditor(IResource r) {
- if (r == null)
- return;
- IWorkbenchPage page = null;
- IEditorPart editor = null;
- try {
- page = PlatformUI.getWorkbench().getActiveWorkbenchWindow()
- .getActivePage();
- String ID = PlatformUI.getWorkbench().getEditorRegistry().getDefaultEditor(r.getLocation()
- .toPortableString()).getId();
- editor = page.openEditor(new FileEditorInput((IFile) r), ID);
- if (editor instanceof ISetSelectionTarget)
- ((ISetSelectionTarget) editor)
- .selectReveal(getStructuredSelection());
- } catch (Exception e) {
- MessageDialog
- .openError(
- PlatformUI.getWorkbench().getActiveWorkbenchWindow().getShell(),
- J2EEUIMessages
- .getResourceString("Problems_Opening_Editor_ERROR_"), e.getMessage()); //$NON-NLS-1$ = "Problems Opening Editor"
- }
- }
-
- /**
- * The user has invoked this action
- */
- @Override
- public void run() {
- if (!isEnabled())
- return;
-
- if (srcObject instanceof J2EEJavaClassProviderHelper) {
- ((J2EEJavaClassProviderHelper) srcObject).openInEditor();
- return;
- }
-
- //[Bug 240512] deal with if any of these node types ndo not have an associated class
- if (srcObject instanceof SessionBean ||
- srcObject instanceof MessageDrivenBean ||
- srcObject instanceof EntityBean ||
- srcObject instanceof Servlet ||
- srcObject instanceof Filter ||
- srcObject instanceof Listener){
-
- String name = ""; //$NON-NLS-1$
- if( srcObject instanceof SessionBean ){
- SessionBean bean = (SessionBean)srcObject;
- name = bean.getEjbClass();
- } else if(srcObject instanceof MessageDrivenBean){
- MessageDrivenBean bean = (MessageDrivenBean)srcObject;
- name = bean.getEjbClass();
- } else if(srcObject instanceof EntityBean){
- EntityBean bean = (EntityBean)srcObject;
- name = bean.getEjbClass();
- } else if(srcObject instanceof Servlet){
- Servlet servlet = (Servlet)srcObject;
- name = servlet.getServletClass();
- } else if(srcObject instanceof Filter) {
- Filter filter = (Filter)srcObject;
- name = filter.getFilterClass();
- } else if(srcObject instanceof Listener){
- Listener listener = (Listener)srcObject;
- name = listener.getListenerClass();
- }
-
- IResource resource = WorkbenchResourceHelper.getFile((EObject)srcObject);
- if (resource == null)
- return;
- IProject project = resource.getProject();
- IJavaProject javaProject = JavaCore.create(project);
- if(javaProject.exists()){
- IType type = null;
- try {
- //if name is null then can't get type
- if(name != null) {
- type = javaProject.findType( name );
- }
-
- //if type is null then can't open its editor, so open editor for the resource
- if(type != null) {
- ICompilationUnit cu = type.getCompilationUnit();
- EditorUtility.openInEditor(cu);
- } else{
- openAppropriateEditor(resource);
- }
- } catch (JavaModelException e) {
- JEEUIPlugin.logError(e.getMessage(), e);
- } catch (PartInitException e) {
- JEEUIPlugin.logError(e.getMessage(), e);
- }
- }
- return;
- }
-
-
- if (srcObject instanceof EObject) {
- if(srcObject instanceof EjbLocalRefImpl || srcObject instanceof ResourceRefImpl){
- IResource resource = WorkbenchResourceHelper.getFile((EObject)srcObject);
- if (resource == null)
- {
- openEObject((EObject) srcObject);
- return;
- }
- IProject project = resource.getProject();
-
- if (JavaEEProjectUtilities.isEJBProject(project)) {
- EJBJar ejbJar = (EJBJar)ModelProviderManager.getModelProvider(project).getModelObject(new Path(J2EEConstants.EJBJAR_DD_URI));
-
- if(srcObject instanceof EjbLocalRefImpl){
- openEjbLocalRefNode(resource, ejbJar);
- } else if(srcObject instanceof ResourceRefImpl){
- openResourceRefNode(resource, ejbJar);
- }
- } else if (JavaEEProjectUtilities.isDynamicWebProject(project)) {
- //check reference type and open via appropriate logic
- if (srcObject instanceof EjbLocalRef) {
- openEjbLocalReferenceNodeInWebProject((EjbLocalRef)srcObject, resource);
- } else if (srcObject instanceof ResourceRef) {
- openResourceReferenceNodeInWebProject((ResourceRef)srcObject, resource);
- }
- } else {
- openEObject((EObject) srcObject);
- }
- } else {
- openEObject((EObject) srcObject);
- }
- } else if (srcObject instanceof BeanInterfaceNode) {
- openAppropriateEditor(((BeanInterfaceNode) srcObject).get_fqn());
- return;
- } else if (srcObject instanceof BeanNode) {
- openAppropriateEditor(((BeanNode) srcObject).getEjbClassQualifiedName());
- return;
- } else if (srcObject instanceof WebAppProvider) {
- IFile file = ((WebAppProvider) srcObject).getDDFile();
- if (file.isAccessible()){
- openAppropriateEditor(file);
- return;
- }
- } else if(srcObject instanceof WebArtifactNode){
- openEObject((EObject) ((WebArtifactNode)srcObject).getJavaEEObject());
-
- } else if (srcObject instanceof GroupEJBProvider) {
- openEObject((EObject) ((GroupEJBProvider)srcObject).getEjbJar());
- } else if (srcObject instanceof GroupEARProvider) {
- IFile file = ((GroupEARProvider) srcObject).getDDFile();
- if (file.isAccessible()){
- openAppropriateEditor(file);
- return;
- }
- } else if (srcObject instanceof GroupAppClientProvider) {
- IFile file = ((GroupAppClientProvider) srcObject).getDDFile();
- if (file.isAccessible()){
- openAppropriateEditor(file);
- return;
- }
- } else if (srcObject instanceof AbstractGroupProvider){
- openEObject((EObject) ((AbstractGroupProvider)srcObject).getJavaEEObject());
- } else if (srcObject instanceof Resource)
- openAppropriateEditor(WorkbenchResourceHelper
- .getFile((Resource) srcObject));
- }
-
-
- private void openResourceReferenceNodeInWebProject(ResourceRef resourceReference,
- IResource resource) {
- String referenceName = resourceReference.getResRefName();
- List<InjectionTarget> injTargets = resourceReference.getInjectionTargets();
-
- //check where this reference is declared:
- //1. From web.xml - the web.xml should be opened
- //2. From injection in source code - the appropriate source code should be opened
- //3. Both - the web.xml should be opened, as it takes precedence (overwrites) the injection
- if (isTheReferencePartOfWebXmlResourceReferences(referenceName, resource.getProject())) {
- openAppropriateEditor(resource);
- } else {
- if (injTargets != null && injTargets.size() > 0) {
- for (InjectionTarget injection : injTargets) {
- openAppropriateEditor(injection.getInjectionTargetClass());
- }
- }
- }
-
- }
-
- private void openEjbLocalReferenceNodeInWebProject(EjbLocalRef ejbLocalReference,
- IResource resource) {
-
-
- String referenceName = ejbLocalReference.getEjbRefName();
- List<InjectionTarget> injTargets = ejbLocalReference.getInjectionTargets();
-
- //check where this reference is declared:
- //1. From web.xml - the web.xml should be opened
- //2. From injection in source code - the appropriate source code should be opened
- //3. Both - the web.xml should be opened, as it takes precedence (overwrites) the injection
- if (isTheReferencePartOfWebXmlEJBReferences(referenceName, resource.getProject())) {
- openAppropriateEditor(resource);
- } else {
- if (injTargets != null && injTargets.size() > 0) {
- for (InjectionTarget injection : injTargets) {
- openAppropriateEditor(injection.getInjectionTargetClass());
- }
- }
- }
-
- }
-
- /**
- * Searches for an ejb reference within <ejb-local-ref> tag<br/>
- * in web.xml for a given web project
- * @param referenceName reference to be searched for
- * @param project web project
- * @return <i>true</i> if a reference has been found , <i>false</i> - if not, or value of null is provided as a reference
- */
- private boolean isTheReferencePartOfWebXmlEJBReferences(
- String referenceName, IProject project) {
- return (findReferenceInWebXmlEJBReferences(referenceName, project) != null);
- }
-
-
- /**
- * Searches for an ejb reference within <ejb-local-ref> tag<br/>
- * in web.xml for a given web project
- * @param referenceName reference to be searched for
- * @param web web project
- * @return Reference itself if found, null if not
- */
- private Object findReferenceInWebXmlEJBReferences(String referenceName,
- IProject webProject) {
-
- if (referenceName == null) return null;
-
- WebApp web = getWebAppModelFromProject(webProject);
-
- //iterating over local ejb references
- for (EjbLocalRef localRef : web.getEjbLocalRefs()) {
- if (referenceName.equals(localRef.getEjbRefName())) {
- return localRef;
- }
- }
-
- //no references found
- return null;
- }
-
- /**
- * Searches for a reference within <resource-ref> tag<br/>
- * in web.xml for a given web project
- * @param referenceName reference to be searched for
- * @param project web project
- * @return <i>true</i> if a reference has been found , <i>false</i> - if not, or value of null is provided as a reference
- */
- private boolean isTheReferencePartOfWebXmlResourceReferences(
- String referenceName, IProject project) {
- return (findReferenceInWebXmlResourceReferences(referenceName, project) != null);
- }
- /**
- * Searches for a reference within <resource-ref> tag<br/>
- * in web.xml for a given web project
- * @param referenceName reference to be searched for
- * @param web web project
- * @return Reference itself if found, null if not
- */
- private Object findReferenceInWebXmlResourceReferences(String referenceName,
- IProject webProject) {
-
- if (referenceName == null) return null;
-
- WebApp web = getWebAppModelFromProject(webProject);
-
- //iterating over <resource-ref> references
- for (ResourceRef resourceRef : web.getResourceRefs()) {
- if (referenceName.equals(resourceRef.getResRefName())) {
- return resourceRef;
- }
- }
-
- //no references found
- return null;
- }
-
- /**
- * Gets WebApp model from a project
- * @param project
- * @return instance of {@link org.eclipse.jst.javaee.web.WebApp} model
- * @throws IllegalArgumentException
- */
- private WebApp getWebAppModelFromProject(IProject webProject) {
- if (!JavaEEProjectUtilities.isDynamicWebProject(webProject)) {
- throw new IllegalArgumentException("Provided project is not a web project"); //$NON-NLS-1$
- }
- return (WebApp) ModelProviderManager.getModelProvider(webProject).getModelObject(new Path(J2EEConstants.WEBAPP_DD_URI));
- }
-
- private void openResourceRefNode(IResource resource, EJBJar ejbJar) {
- if (ejbJar.getEnterpriseBeans() != null) {
- List<SessionBean> beans = ejbJar.getEnterpriseBeans().getSessionBeans();
- for (SessionBean bean : beans) {
- for (ResourceRef localref : bean.getResourceRefs()) {
- if (localref.getResRefName().equals(((ResourceRef) srcObject).getResRefName())) {
- openAppropriateEditor(resource);
- return;
- }
- }
- }
- }
- if (((ResourceRefImpl) srcObject).eContainer() instanceof SessionBean) {
- openAppropriateEditor(((SessionBean) (((ResourceRefImpl) srcObject).eContainer())).getEjbClass());
- return;
- }
- }
-
- private void openEjbLocalRefNode(IResource resource, EJBJar ejbJar) {
- if (ejbJar.getEnterpriseBeans() != null) {
- List<SessionBean> beans = ejbJar.getEnterpriseBeans().getSessionBeans();
- for (SessionBean bean : beans) {
- for (EjbLocalRef localref : bean.getEjbLocalRefs()) {
- if (localref.getEjbRefName().equals(((EjbLocalRef) srcObject).getEjbRefName())) {
- openAppropriateEditor(resource);
- return;
- }
- }
- }
- }
- if (((EjbLocalRefImpl) srcObject).eContainer() instanceof SessionBean) {
- openAppropriateEditor(((SessionBean) (((EjbLocalRefImpl) srcObject).eContainer())).getEjbClass());
- return;
- }
- }
-
- private void openEObject(EObject _srcObject) {
- EObject ro = _srcObject;
- IResource resource = WorkbenchResourceHelper
- .getFile(_srcObject);
- if (resource != null) {
- openAppropriateEditor(resource);
- } else {
- ModuleFile moduleFile = ArchiveUtil.getModuleFile(ro);
- if (moduleFile != null) {
- ArchiveOptions options = moduleFile.getOptions();
- if (options instanceof ComponentArchiveOptions) {
- IVirtualComponent component = ((ComponentArchiveOptions) options)
- .getComponent();
- openAppropriateEditor(component);
- }
- } else {
- IArchive archive = JavaEEArchiveUtilities.findArchive(ro);
- if(archive != null){
- IVirtualComponent component = JavaEEArchiveUtilities.findComponent(archive);
- if(component != null){
- openAppropriateEditor(component);
- }
- }
- }
- }
-
- }
-
- /**
- * The structured selection has changed in the workbench. Subclasses should
- * override this method to react to the change. Returns true if the action
- * should be enabled for this selection, and false otherwise.
- *
- * When this method is overridden, the super method must always be invoked.
- * If the super method returns false, this method must also return false.
- *
- * @param sel
- * the new structured selection
- */
- @Override
- public boolean updateSelection(IStructuredSelection s) {
- if (!super.updateSelection(s))
- return false;
-
- // Make sure this is one of the selections we can handle,
- // then set the source object as is. The run() will do the hard stuff.
- Object obj = s.getFirstElement();
- setText("Open"); //$NON-NLS-1$
-
- if (obj instanceof J2EEJavaClassProviderHelper)
- currentDescriptor = getJavaEditorDescriptor();
- else if (obj instanceof BeanLink)
- currentDescriptor = getBaseJavaEditorDescriptor();
- else if (obj instanceof EObject) {
- IEditorRegistry registry = PlatformUI.getWorkbench()
- .getEditorRegistry();
- IFile file = WorkbenchResourceHelper.getFile((EObject) obj);
- if (file != null) {
- IContentType contentType = IDE.getContentType(file);
- currentDescriptor = registry.getDefaultEditor(file.getName(),
- contentType);
- } else {
- if(((EObject) obj).eResource() != null){
- String name = (new Path(((EObject) obj).eResource().getURI()
- .toString())).lastSegment();
- currentDescriptor = registry.getDefaultEditor(name, null);
- }
- }
- } else if (obj instanceof Resource) {
- IEditorRegistry registry = PlatformUI.getWorkbench()
- .getEditorRegistry();
- IFile file = WorkbenchResourceHelper.getFile((Resource) obj);
- IContentType contentType = IDE.getContentType(file);
- currentDescriptor = registry.getDefaultEditor(file.getName(),
- contentType);
- } else if (obj instanceof GroupEARProvider) {
- IFile file = ((GroupEARProvider) obj).getDDFile();
- if (file.isAccessible()){
- IEditorRegistry registry = PlatformUI.getWorkbench()
- .getEditorRegistry();
- IContentType contentType = IDE.getContentType(file);
- currentDescriptor = registry.getDefaultEditor(file.getName(),
- contentType);
- }else{
- currentDescriptor = null;
- return false;
- }
- } else if (obj instanceof GroupEJBProvider) {
- IFile file = WorkbenchResourceHelper.getFile((EObject)((GroupEJBProvider)obj).getEjbJar());
- if (file.isAccessible()){
- IEditorRegistry registry = PlatformUI.getWorkbench().getEditorRegistry();
- IContentType contentType = IDE.getContentType(file);
- currentDescriptor = registry.getDefaultEditor(file.getName(),
- contentType);
- }else{
- currentDescriptor = null;
- return false;
- }
- } else if (obj instanceof GroupAppClientProvider) {
- IFile file = ((GroupAppClientProvider) obj).getDDFile();
- if (file.isAccessible()){
- IEditorRegistry registry = PlatformUI.getWorkbench()
- .getEditorRegistry();
- IContentType contentType = IDE.getContentType(file);
- currentDescriptor = registry.getDefaultEditor(file.getName(),
- contentType);
- }else{
- currentDescriptor = null;
- return false;
- }
- } else if (obj instanceof WebAppProvider) {
- IFile file = ((WebAppProvider) obj).getDDFile();
- if (file.isAccessible()){
- IEditorRegistry registry = PlatformUI.getWorkbench()
- .getEditorRegistry();
- IContentType contentType = IDE.getContentType(file);
- currentDescriptor = registry.getDefaultEditor(file.getName(),
- contentType);
- } else{
- currentDescriptor = null;
- return false;
- }
- } else if (obj instanceof RaGroupContentProvider) {
- IFile file = WorkbenchResourceHelper.getFile((EObject) ((AbstractGroupProvider)obj).getJavaEEObject());
- if (file.isAccessible()){
- IEditorRegistry registry = PlatformUI.getWorkbench().getEditorRegistry();
- IContentType contentType = IDE.getContentType(file);
- currentDescriptor = registry.getDefaultEditor(file.getName(),
- contentType);
- }else{
- currentDescriptor = null;
- return false;
- }
- } else if (obj instanceof BeanNode) {
-
- IEditorRegistry registry = PlatformUI.getWorkbench()
- .getEditorRegistry();
- JavaEEObject enterpriseBean = ((BeanNode) obj).getEnterpriseBean();
- IFile file = WorkbenchResourceHelper.getFile((EObject)enterpriseBean);
- if (file != null) {
- IContentType contentType = IDE.getContentType(file);
- currentDescriptor = registry.getDefaultEditor(file.getName(),
- contentType);
- } else {
- if(((EObject) enterpriseBean).eResource() != null){
- String name = (new Path(((EObject) enterpriseBean).eResource().getURI()
- .toString())).lastSegment();
- currentDescriptor = registry.getDefaultEditor(name, null);
- }
- }
- } else if (obj instanceof BeanInterfaceNode) {
-
- IEditorRegistry registry = PlatformUI.getWorkbench()
- .getEditorRegistry();
- JavaEEObject beanInterface = (JavaEEObject) ((BeanInterfaceNode) obj).getAdapterNode();
- IFile file = WorkbenchResourceHelper.getFile((EObject)beanInterface);
- if (file != null) {
- IContentType contentType = IDE.getContentType(file);
- currentDescriptor = registry.getDefaultEditor(file.getName(),
- contentType);
- } else {
- if(((EObject) beanInterface).eResource() != null){
- String name = (new Path(((EObject) beanInterface).eResource().getURI().toString())).lastSegment();
- currentDescriptor = registry.getDefaultEditor(name, null);
- } else {
- String fqn = ((BeanInterfaceNode) obj).get_fqn();
- if (fqn != null){
- currentDescriptor = registry.getDefaultEditor(((BeanInterfaceNode) obj).getText(), null);
-// return true;
- } else {
- return false;
- }
-
- }
- }
- }
- setAttributesFromDescriptor();
- srcObject = obj;
- return true;
- }
-}
diff --git a/plugins/org.eclipse.jst.jee.ui/src/org/eclipse/jst/jee/ui/internal/navigator/Web25ContentProvider.java b/plugins/org.eclipse.jst.jee.ui/src/org/eclipse/jst/jee/ui/internal/navigator/Web25ContentProvider.java
deleted file mode 100644
index 75bdb28..0000000
--- a/plugins/org.eclipse.jst.jee.ui/src/org/eclipse/jst/jee/ui/internal/navigator/Web25ContentProvider.java
+++ /dev/null
@@ -1,71 +0,0 @@
-/***********************************************************************
- * Copyright (c) 2008 by SAP AG, Walldorf.
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
- *
- * Contributors:
- * SAP AG - initial API and implementation
- ***********************************************************************/
-package org.eclipse.jst.jee.ui.internal.navigator;
-
-
-import java.util.ArrayList;
-import java.util.List;
-
-import org.eclipse.core.resources.IProject;
-import org.eclipse.jst.javaee.web.WebApp;
-import org.eclipse.jst.jee.ui.internal.navigator.web.WebAppProvider;
-
-/**
- * Web 2.5 Content provider is Deployment Descriptor content provider,
- * used for constructing of the descriptor tree in project explorer.
- *
- * @author Dimitar Giormov
- */
-public class Web25ContentProvider extends JEE5ContentProvider {
-
- public Object[] getChildren(Object aParentElement) {
-
- List<Object> children = new ArrayList<Object>();
- IProject project = null;
- if (IProject.class.isInstance(aParentElement)) {
- project = (IProject) aParentElement;
- AbstractGroupProvider cachedContentProvider = getCachedContentProvider(project);
- if (cachedContentProvider != null && cachedContentProvider.isValid()){
- children.add(cachedContentProvider);
- }
- } else if (AbstractGroupProvider.class.isInstance(aParentElement)){
- AbstractGroupProvider abstractGroupProvider = (AbstractGroupProvider) aParentElement;
- if (abstractGroupProvider.hasChildren()){
- children.addAll(abstractGroupProvider.getChildren());
- }
- }
- return children.toArray();
- }
-
-
- public boolean hasChildren(Object element) {
- if (element instanceof WebAppProvider) {
- return ((WebAppProvider)element).isValid();
- } else if (element instanceof AbstractGroupProvider) {
- return ((AbstractGroupProvider) element).hasChildren();
- } else
- return false;
- }
-
- public Object getParent(Object element) {
- return null;
- }
-
- public Object[] getElements(Object inputElement) {
- return getChildren(inputElement);
- }
-
-
- @Override
- protected AbstractGroupProvider getNewContentProviderInstance(IProject project) {
- return new WebAppProvider((WebApp) getCachedModelProvider(project).getModelObject(), project);
- }
-}
diff --git a/plugins/org.eclipse.jst.jee.ui/src/org/eclipse/jst/jee/ui/internal/navigator/Web25LabelProvider.java b/plugins/org.eclipse.jst.jee.ui/src/org/eclipse/jst/jee/ui/internal/navigator/Web25LabelProvider.java
deleted file mode 100644
index 40f49d8..0000000
--- a/plugins/org.eclipse.jst.jee.ui/src/org/eclipse/jst/jee/ui/internal/navigator/Web25LabelProvider.java
+++ /dev/null
@@ -1,106 +0,0 @@
-/***********************************************************************
- * Copyright (c) 2008 by SAP AG, Walldorf.
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
- *
- * Contributors:
- * SAP AG - initial API and implementation
- ***********************************************************************/
-package org.eclipse.jst.jee.ui.internal.navigator;
-
-import org.eclipse.jst.j2ee.navigator.internal.J2EELabelProvider;
-import org.eclipse.jst.javaee.core.Listener;
-import org.eclipse.jst.javaee.core.ParamValue;
-import org.eclipse.jst.javaee.web.ErrorPage;
-import org.eclipse.jst.javaee.web.Filter;
-import org.eclipse.jst.javaee.web.Servlet;
-import org.eclipse.jst.jee.ui.internal.navigator.web.GroupContextParamsItemProvider;
-import org.eclipse.jst.jee.ui.internal.navigator.web.GroupErrorPagesItemProvider;
-import org.eclipse.jst.jee.ui.internal.navigator.web.GroupFilterMappingItemProvider;
-import org.eclipse.jst.jee.ui.internal.navigator.web.GroupFilterMappingItemProvider.FilterMappingUIWrapper;
-import org.eclipse.jst.jee.ui.internal.navigator.web.GroupFiltersItemProvider;
-import org.eclipse.jst.jee.ui.internal.navigator.web.GroupListenerItemProvider;
-import org.eclipse.jst.jee.ui.internal.navigator.web.GroupServletItemProvider;
-import org.eclipse.jst.jee.ui.internal.navigator.web.GroupServletMappingItemProvider;
-import org.eclipse.jst.jee.ui.internal.navigator.web.GroupServletMappingItemProvider.ServletMappingUIWrapper;
-import org.eclipse.jst.jee.ui.internal.navigator.web.WebAppProvider;
-import org.eclipse.jst.jee.ui.internal.navigator.web.WebArtifactNode;
-import org.eclipse.swt.graphics.Image;
-
-
-/**
- * Web 2.5 Label provider is Deployment Descriptor label provider,
- * used for decorating of the descriptor tree in project explorer.
- *
- * @author Dimitar Giormov
- */
-public class Web25LabelProvider extends J2EELabelProvider {
-
-
-
- @Override
- public Image getImage(Object element) {
- Image ret = null;
- if (element instanceof WebAppProvider) {
- ret = ((WebAppProvider) element).getImage();
- } else if (element instanceof AbstractGroupProvider){
- ret = ((AbstractGroupProvider) element).getImage();
- } else if (element instanceof Servlet){
- ret = GroupServletItemProvider.getServletImage();
- } else if (element instanceof ServletMappingUIWrapper){
- ret = GroupServletMappingItemProvider.getServletMappingImage();
- } else if (element instanceof Filter){
- ret = GroupFiltersItemProvider.getFiltersImage();
- } else if (element instanceof Listener){
- ret = GroupListenerItemProvider.getListenersImage();
- } else if (element instanceof FilterMappingUIWrapper){
- ret = GroupFilterMappingItemProvider.getFilterMappingImage();
- } else if (element instanceof WebArtifactNode){
- ret = ((WebArtifactNode)element).getImage();
- } else if (element instanceof ErrorPage) {
- ret = GroupErrorPagesItemProvider.getErrorPagesImage((ErrorPage)element);
- } else if (element instanceof ParamValue){
- ret = GroupContextParamsItemProvider.getContextParamsImage();
- } else {
- ret = super.getImage(element);
- }
- return ret;
- }
-
- @Override
- public String getText(Object element) {
- String ret = null;
- if (element instanceof WebAppProvider) {
- ret = ((WebAppProvider) element).getText();
- } else if (element instanceof AbstractGroupProvider){
- ret = ((AbstractGroupProvider) element).getText();
- } else if (element instanceof Servlet){
- ret = ((Servlet) element).getServletName();
- } else if (element instanceof ServletMappingUIWrapper) {
- ret = ((ServletMappingUIWrapper) element).getValue();
- } else if (element instanceof Filter){
- ret = ((Filter) element).getFilterName();
- } else if (element instanceof Listener){
- ret = ((Listener) element).getListenerClass();
- } else if (element instanceof FilterMappingUIWrapper) {
- ret = ((FilterMappingUIWrapper) element).getValue();
- } else if (element instanceof WebArtifactNode) {
- ret = ((WebArtifactNode) element).getText();
- } else if (element instanceof ErrorPage ){
- ErrorPage page = ((ErrorPage) element);
- if (page.getErrorCode() == null) {
- ret = page.getExceptionType() + " -> " + page.getLocation(); //$NON-NLS-1$
- } else {
- ret = page.getErrorCode() + " -> " + page.getLocation(); //$NON-NLS-1$
- }
- } else if (element instanceof ParamValue){
- ret = ((ParamValue)element).getParamName() + " = " + ((ParamValue)element).getParamValue();//$NON-NLS-1$
- } else {
- ret = super.getText(element);
- }
- return ret;
- }
-
-}
diff --git a/plugins/org.eclipse.jst.jee.ui/src/org/eclipse/jst/jee/ui/internal/navigator/appclient/AbstractAppClientGroupProvider.java b/plugins/org.eclipse.jst.jee.ui/src/org/eclipse/jst/jee/ui/internal/navigator/appclient/AbstractAppClientGroupProvider.java
deleted file mode 100644
index 5910232..0000000
--- a/plugins/org.eclipse.jst.jee.ui/src/org/eclipse/jst/jee/ui/internal/navigator/appclient/AbstractAppClientGroupProvider.java
+++ /dev/null
@@ -1,13 +0,0 @@
-package org.eclipse.jst.jee.ui.internal.navigator.appclient;
-
-import org.eclipse.jst.javaee.core.JavaEEObject;
-import org.eclipse.jst.jee.ui.internal.navigator.AbstractGroupProvider;
-
-public abstract class AbstractAppClientGroupProvider extends
- AbstractGroupProvider {
-
- public AbstractAppClientGroupProvider(JavaEEObject javaee) {
- super(javaee);
- }
-
-}
diff --git a/plugins/org.eclipse.jst.jee.ui/src/org/eclipse/jst/jee/ui/internal/navigator/appclient/GroupAppClientProvider.java b/plugins/org.eclipse.jst.jee.ui/src/org/eclipse/jst/jee/ui/internal/navigator/appclient/GroupAppClientProvider.java
deleted file mode 100644
index abe0183..0000000
--- a/plugins/org.eclipse.jst.jee.ui/src/org/eclipse/jst/jee/ui/internal/navigator/appclient/GroupAppClientProvider.java
+++ /dev/null
@@ -1,126 +0,0 @@
-/***********************************************************************
- * Copyright (c) 2008, 2010 by SAP AG, Walldorf.
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
- *
- * Contributors:
- * SAP AG - initial API and implementation
- ***********************************************************************/
-package org.eclipse.jst.jee.ui.internal.navigator.appclient;
-
-import java.util.ArrayList;
-import java.util.List;
-
-import org.eclipse.core.resources.IFile;
-import org.eclipse.core.resources.IProject;
-import org.eclipse.core.runtime.IAdaptable;
-import org.eclipse.jst.j2ee.internal.J2EEVersionConstants;
-import org.eclipse.jst.javaee.applicationclient.ApplicationClient;
-import org.eclipse.jst.jee.ui.internal.Messages;
-import org.eclipse.jst.jee.ui.plugin.JEEUIPlugin;
-import org.eclipse.jst.jee.ui.plugin.JEEUIPluginIcons;
-import org.eclipse.osgi.util.NLS;
-import org.eclipse.swt.graphics.Image;
-import org.eclipse.wst.common.componentcore.ComponentCore;
-import org.eclipse.wst.common.componentcore.resources.IVirtualFolder;
-
-/**
- * Application Client 5.0 Deployment Descriptor node.
- *
- * @author Dimitar Giormov
- * @author Kaloyan Raev
- */
-public class GroupAppClientProvider extends AbstractAppClientGroupProvider implements IAdaptable {
-
-
- private final IProject project;
-
-
- public GroupAppClientProvider(ApplicationClient javaee, IProject project) {
- super(javaee);
- this.project = project;
- }
-
- private static final String PROJECT_RELATIVE_PATH = "META-INF/application-client.xml"; //$NON-NLS-1$
-
- private Image appClient50Image;
- private Image appClient60Image;
-
- private IFile ddFile;
-
- @Override
- public String getText() {
- String result = null;
- if (this.project == null) {
- result = NLS.bind(Messages.DEPLOYMENT_DESCRIPTOR, new Object[] {""}); //$NON-NLS-1$
- } else {
- result = NLS.bind(Messages.DEPLOYMENT_DESCRIPTOR, this.project.getName());
- }
- return result;
- }
-
- @Override
- public List getChildren() {
- List result = new ArrayList();
- if (javaee != null){
- result.addAll(((ApplicationClient) javaee).getEjbRefs());
- //result.addAll(((ApplicationClient) javaee).getEjbLocalRefs());
- result.addAll(((ApplicationClient) javaee).getResourceRefs());
- result.addAll(((ApplicationClient) javaee).getResourceEnvRefs());
- result.addAll(((ApplicationClient) javaee).getEnvEntries());
- result.addAll(((ApplicationClient) javaee).getMessageDestinationRefs());
- //result.addAll(((ApplicationClient) javaee).getPersistenceContextRefs());
- result.addAll(((ApplicationClient) javaee).getPersistenceUnitRefs());
- result.addAll(((ApplicationClient) javaee).getServiceRefs());
- }
- return result;
- }
-
- @Override
- public Image getImage() {
- String version = ((ApplicationClient) javaee).getVersion();
- if (J2EEVersionConstants.VERSION_5_TEXT.equals(version)) {
- return getAppClient50Image();
- } else if (J2EEVersionConstants.VERSION_6_TEXT.equals(version)) {
- return getAppClient60Image();
- }
- return getAppClient50Image();
- }
-
- public IFile getDDFile() {
- if (ddFile != null){
- return ddFile;
- }
- IVirtualFolder virtualFolder = ComponentCore.createComponent(project).getRootFolder();
- ddFile = virtualFolder.getFile(PROJECT_RELATIVE_PATH).getUnderlyingFile();
- return ddFile;
- }
-
- public IProject getProject() {
- return project;
- }
-
- public Object getAdapter(Class adapter) {
- if (IProject.class == adapter){
- return getProject();
- }
- return null;
- }
-
- private Image getAppClient50Image() {
- if (appClient50Image == null) {
- appClient50Image = JEEUIPlugin.getDefault().getImageDescriptor(JEEUIPluginIcons.APP_CLIENT50).createImage();
- }
- return appClient50Image;
- }
-
- private Image getAppClient60Image() {
- if (appClient60Image == null) {
- appClient60Image = JEEUIPlugin.getDefault().getImageDescriptor(JEEUIPluginIcons.APP_CLIENT60).createImage();
- }
- return appClient60Image;
- }
-
-}
diff --git a/plugins/org.eclipse.jst.jee.ui/src/org/eclipse/jst/jee/ui/internal/navigator/dnd/AddProjectToEARDropAssistant.java b/plugins/org.eclipse.jst.jee.ui/src/org/eclipse/jst/jee/ui/internal/navigator/dnd/AddProjectToEARDropAssistant.java
deleted file mode 100644
index 890922b..0000000
--- a/plugins/org.eclipse.jst.jee.ui/src/org/eclipse/jst/jee/ui/internal/navigator/dnd/AddProjectToEARDropAssistant.java
+++ /dev/null
@@ -1,619 +0,0 @@
-/***********************************************************************
- * Copyright (c) 2008 by SAP AG, Walldorf.
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
- *
- * Contributors:
- * SAP AG - initial API and implementation
- * IBM - bug 281382 clean up
- ***********************************************************************/
-package org.eclipse.jst.jee.ui.internal.navigator.dnd;
-
-import java.util.ArrayList;
-import java.util.HashMap;
-import java.util.Iterator;
-import java.util.List;
-import java.util.Map;
-
-import org.eclipse.core.commands.ExecutionException;
-import org.eclipse.core.resources.IFile;
-import org.eclipse.core.resources.IProject;
-import org.eclipse.core.resources.IWorkspaceRoot;
-import org.eclipse.core.resources.ResourcesPlugin;
-import org.eclipse.core.runtime.CoreException;
-import org.eclipse.core.runtime.IAdaptable;
-import org.eclipse.core.runtime.IPath;
-import org.eclipse.core.runtime.IProgressMonitor;
-import org.eclipse.core.runtime.IStatus;
-import org.eclipse.core.runtime.NullProgressMonitor;
-import org.eclipse.core.runtime.Path;
-import org.eclipse.core.runtime.Platform;
-import org.eclipse.core.runtime.Status;
-import org.eclipse.core.runtime.jobs.Job;
-import org.eclipse.emf.ecore.EObject;
-import org.eclipse.jdt.internal.core.JarPackageFragmentRoot;
-import org.eclipse.jem.util.emf.workbench.ProjectUtilities;
-import org.eclipse.jface.util.LocalSelectionTransfer;
-import org.eclipse.jface.viewers.ISelection;
-import org.eclipse.jface.viewers.IStructuredSelection;
-import org.eclipse.jst.j2ee.application.internal.operations.AddComponentToEnterpriseApplicationDataModelProvider;
-import org.eclipse.jst.j2ee.application.internal.operations.IAddComponentToEnterpriseApplicationDataModelProperties;
-import org.eclipse.jst.j2ee.application.internal.operations.RemoveComponentFromEnterpriseApplicationDataModelProvider;
-import org.eclipse.jst.j2ee.application.internal.operations.UpdateManifestDataModelProperties;
-import org.eclipse.jst.j2ee.application.internal.operations.UpdateManifestDataModelProvider;
-import org.eclipse.jst.j2ee.commonarchivecore.internal.helpers.ArchiveManifest;
-import org.eclipse.jst.j2ee.componentcore.J2EEModuleVirtualArchiveComponent;
-import org.eclipse.jst.j2ee.internal.common.J2EEVersionUtil;
-import org.eclipse.jst.j2ee.internal.dialogs.DependencyConflictResolveDialog;
-import org.eclipse.jst.j2ee.internal.plugin.IJ2EEModuleConstants;
-import org.eclipse.jst.j2ee.internal.project.J2EEProjectUtilities;
-import org.eclipse.jst.j2ee.internal.provider.J2EEItemProvider;
-import org.eclipse.jst.j2ee.navigator.internal.plugin.J2EENavigatorPlugin;
-import org.eclipse.jst.j2ee.project.EarUtilities;
-import org.eclipse.jst.j2ee.project.JavaEEProjectUtilities;
-import org.eclipse.jst.j2ee.project.facet.EARFacetUtils;
-import org.eclipse.jst.jee.ui.internal.Messages;
-import org.eclipse.jst.jee.ui.internal.navigator.ear.AbstractEarNode;
-import org.eclipse.jst.jee.ui.internal.navigator.ear.BundledNode;
-import org.eclipse.jst.jee.ui.internal.navigator.ear.GroupEARProvider;
-import org.eclipse.jst.jee.ui.plugin.JEEUIPlugin;
-import org.eclipse.osgi.util.NLS;
-import org.eclipse.swt.dnd.DropTargetEvent;
-import org.eclipse.swt.dnd.TransferData;
-import org.eclipse.ui.PlatformUI;
-import org.eclipse.ui.navigator.CommonDropAdapter;
-import org.eclipse.ui.navigator.CommonDropAdapterAssistant;
-import org.eclipse.ui.part.PluginTransfer;
-import org.eclipse.ui.progress.IProgressService;
-import org.eclipse.wst.common.componentcore.ComponentCore;
-import org.eclipse.wst.common.componentcore.datamodel.properties.ICreateReferenceComponentsDataModelProperties;
-import org.eclipse.wst.common.componentcore.internal.operation.RemoveReferenceComponentsDataModelProvider;
-import org.eclipse.wst.common.componentcore.internal.resources.VirtualArchiveComponent;
-import org.eclipse.wst.common.componentcore.internal.util.IModuleConstants;
-import org.eclipse.wst.common.componentcore.resources.IVirtualComponent;
-import org.eclipse.wst.common.componentcore.resources.IVirtualReference;
-import org.eclipse.wst.common.frameworks.datamodel.DataModelFactory;
-import org.eclipse.wst.common.frameworks.datamodel.IDataModel;
-import org.eclipse.wst.common.project.facet.core.IFacetedProject;
-import org.eclipse.wst.common.project.facet.core.IProjectFacetVersion;
-import org.eclipse.wst.common.project.facet.core.ProjectFacetsManager;
-
-/**
- * Handles drop of JEE resources on EAR project thus adding them as modules.
- *
- * @author Dimitar Giormov
- *
- */
-public class AddProjectToEARDropAssistant extends CommonDropAdapterAssistant {
-
- private static final Class IPROJECT_CLASS = IProject.class;
- private IVirtualComponent earComponent = null;
- private IProject earProject = null;
- private String libDir = null;
- private boolean resolveConflicts = false;
-
- public AddProjectToEARDropAssistant() {
- super();
- }
-
- @Override
- public boolean isSupportedType(TransferData aTransferType) {
- return LocalSelectionTransfer.getTransfer().isSupportedType(aTransferType);
- }
-
- @Override
- public IStatus handleDrop(CommonDropAdapter aDropAdapter, DropTargetEvent aDropTargetEvent, final Object aTarget) {
- if (LocalSelectionTransfer.getTransfer().isSupportedType(aDropAdapter.getCurrentTransfer())) {
- final IStructuredSelection selection = (IStructuredSelection) LocalSelectionTransfer.getTransfer().getSelection();
- IProgressService service = PlatformUI.getWorkbench().getProgressService();
- resolveConflicts = false;
- for (Iterator selectionIterator = selection.iterator(); selectionIterator.hasNext();) {
- Object sourceObject = selectionIterator.next();
- if (sourceObject instanceof IVirtualReference) {
- IVirtualReference reference = (IVirtualReference) sourceObject;
- /*
- * If a reference is moved from the root to the lib
- * directory check for conflicts with projects referenced by
- * the ear referencing the same lib
- */
- IPath libDirPath = null;
- if(libDir != null)
- libDirPath = new Path(libDir).makeRelative();
- if (libDir.length() > 0 && libDirPath != null && !libDirPath.equals(reference.getRuntimePath().makeRelative())) {
- if (hasConflictingProjectInMetaInf(reference)) {
- DependencyConflictResolveDialog dlg = new DependencyConflictResolveDialog(getShell(), DependencyConflictResolveDialog.DLG_TYPE_2);
- if (dlg.open() == DependencyConflictResolveDialog.BTN_ID_CANCEL) {
- return Status.CANCEL_STATUS;
- }
- resolveConflicts = true;
- }
- }
- } else {
- if (libDir.length() > 0){
- IProject projectToAdd = getProject(sourceObject);
- if (hasConflictingProjectInMetaInf(projectToAdd)) {
- DependencyConflictResolveDialog dlg = new DependencyConflictResolveDialog(getShell(), DependencyConflictResolveDialog.DLG_TYPE_2);
- if (dlg.open() == DependencyConflictResolveDialog.BTN_ID_CANCEL) {
- return Status.CANCEL_STATUS;
- }
- resolveConflicts = true;
- }
- }
- }
- }
- Job addProjectToEarJob = new Job(getJobTitle(earComponent)) {
- @Override
- protected IStatus run(IProgressMonitor monitor) {
-
- IStatus status = null;
-
- List<IVirtualComponent> componentsToAdd = new ArrayList<IVirtualComponent>();
- List<IVirtualComponent> componentsToRemove = new ArrayList<IVirtualComponent>();
-
- for (Iterator selectionIterator = selection.iterator(); selectionIterator.hasNext();) {
- Object sourceObject = selectionIterator.next();
-
- if (sourceObject instanceof JarPackageFragmentRoot) {
- JarPackageFragmentRoot jarPackageFragment = (JarPackageFragmentRoot) sourceObject;
-
- String type = VirtualArchiveComponent.LIBARCHIVETYPE + IPath.SEPARATOR;
- IVirtualComponent archive = ComponentCore.createArchiveComponent(earComponent.getProject(), type + jarPackageFragment.getPath().toString());
- componentsToAdd.add(archive);
- } else if (sourceObject instanceof IVirtualReference) {
- IVirtualReference reference = (IVirtualReference) sourceObject;
- if (resolveConflicts) {
- status = resolveConflicts(reference.getReferencedComponent());
- if (!status.isOK()) {
- return status;
- }
- }
- IVirtualComponent archive = reference.getReferencedComponent();
- componentsToRemove.add(archive);
- status = removeComponentsFromEar(componentsToRemove, reference.getRuntimePath().toString());
- if (!status.isOK())
- return status;
- componentsToAdd.add(archive);
- } else {
- IProject projectToAdd = getProject(sourceObject);
- if (resolveConflicts) {
- status = resolveConflicts(ComponentCore.createComponent(projectToAdd));
- if (!status.isOK()) {
- return status;
- }
- }
- componentsToAdd.add(ComponentCore.createComponent(projectToAdd));
- }
- }
-
- if (!componentsToAdd.isEmpty()) {
- status = addComponentsToEar(componentsToAdd, libDir);
- if (!status.isOK())
- return status;
- }
-
- return status;
- }
-
- };
- service.showInDialog(PlatformUI.getWorkbench().getActiveWorkbenchWindow().getShell(), addProjectToEarJob);
- addProjectToEarJob.setRule(ResourcesPlugin.getWorkspace().getRoot());
- addProjectToEarJob.schedule();
- }
- return Status.OK_STATUS;
- }
-
- @Override
- public IStatus validateDrop(Object target, int operation, TransferData transferType) {
- libDir = ""; //$NON-NLS-1$
- if (LocalSelectionTransfer.getTransfer().isSupportedType(transferType) || PluginTransfer.getInstance().isSupportedType(transferType)) {
- ISelection selection = LocalSelectionTransfer.getTransfer().getSelection();
- if (selection != null && !selection.isEmpty() && (selection instanceof IStructuredSelection)) {
- IStructuredSelection structuredSelection = (IStructuredSelection) selection;
- earProject = getProject(target);
- if (earProject == null) {
- return Status.CANCEL_STATUS;
- }
- earComponent = ComponentCore.createComponent(earProject);
- int earVersion = getEarVersion(earProject);
- if (target instanceof BundledNode && ((BundledNode) target).getBundledLibsDirectoryNode() == null) {
- libDir = EarUtilities.getEARLibDir(earComponent);
- }
-
- IStatus status = null;
- for (Iterator iterator = structuredSelection.iterator(); iterator.hasNext();) {
- Object next = iterator.next();
-
- //check if library is physically present in the Ear path
- if (IVirtualReference.class.isInstance(next)){
- IVirtualComponent referencedComponent = ((IVirtualReference)next).getReferencedComponent();
- if (referencedComponent.isBinary() && isPhysicallyAdded(referencedComponent)) {
- return Status.CANCEL_STATUS;
- }
- }
-
- if (next instanceof IVirtualReference) {
- return Status.OK_STATUS;
- }
-
- /*
- * Check if we try to add a JarPackageFragment that is
- * already referenced
- */
- if (next instanceof JarPackageFragmentRoot) {
- JarPackageFragmentRoot jar = (JarPackageFragmentRoot) next;
- for (IVirtualReference reference : earComponent.getReferences()) {
- if (reference.getArchiveName().equals(jar.getElementName())) {
- return Status.CANCEL_STATUS;
- }
- }
- return Status.OK_STATUS;
- }
-
- /*
- * Check if we try to add a module that is already
- * referenced by the ear but at the same time allow to
- * change its location from the root to the lib directory
- * and the opposite.
- */
- IProject projectToAdd = getProject(next);
- hasConflictingProjectInMetaInf(ComponentCore.createComponent(projectToAdd));
- try {
- for (IProject referencedProject : earProject.getReferencedProjects()) {
- if (referencedProject == projectToAdd) {
- return Status.CANCEL_STATUS;
- }
- }
- } catch (CoreException e) {
- String msg = e.getMessage() != null ? e.getMessage() : e.toString();
- status = J2EENavigatorPlugin.createErrorStatus(0, msg, e);
- }
-
- if ((status = validateProjectMayBeAdded(earProject, projectToAdd, earVersion)).isOK())
- return status;
- }
- }
-
- }
- return Status.CANCEL_STATUS;
- }
-
- private boolean isPhysicallyAdded(IVirtualComponent component) {
- IFile f = (IFile)component.getAdapter(IFile.class);
- return f == null ? false : true;
- }
-
- /**
- * @param target
- */
- private IStatus validateProjectMayBeAdded(IProject earProject, IProject projectToAdd, int earVersion) {
- if (earProject == null || projectToAdd == null || earVersion < 0)
- return J2EENavigatorPlugin.createErrorStatus(0, Messages.AddProjectToEARDropAssistant_Could_not_add_module_to_Enterprise_, null);
- else if (!earProject.isAccessible()) {
- return J2EENavigatorPlugin.createErrorStatus(0, NLS.bind(Messages.AddProjectToEARDropAssistant_The_project_0_cannot_be_accesse_, earProject.getName()), null);
- } else if (!projectToAdd.isAccessible()) {
- return J2EENavigatorPlugin.createErrorStatus(0, Messages.AddProjectToEARDropAssistant_The_dragged_project_cannot_be_added_, null);
- }
-
- IStatus isValid = validateProjectToAdd(projectToAdd, earVersion);
- if (!isValid.isOK()) {
- return isValid;
- }
-
- return Status.OK_STATUS;
- }
-
- /**
- *
- * @return -1 on error
- */
- protected final int getEarVersion(IProject earProject) {
- int earVersion = -1;
- IFacetedProject facetedProject = null;
- try {
- facetedProject = ProjectFacetsManager.create(earProject);
-
- if (facetedProject != null) {
- double double1 = Double.parseDouble(facetedProject.getProjectFacetVersion(EARFacetUtils.EAR_FACET).getVersionString());
- earVersion = (int) (double1 * 10);
- } else {
- JEEUIPlugin.logError("Could not acquire model elements for project \"" + earProject.getName() + "\".", null); //$NON-NLS-1$ //$NON-NLS-2$
- }
- } catch (CoreException e1) {
- String msg = e1.getMessage() != null ? e1.getMessage() : e1.toString();
- JEEUIPlugin.logError(msg, e1);
- }
-
- return earVersion;
- }
-
- /**
- * @param facetedProject
- * @return
- */
- protected final boolean hasEarFacet(IProject project) {
- IFacetedProject facetedProject = null;
- try {
- facetedProject = ProjectFacetsManager.create(project);
- } catch (CoreException e1) {
- String msg = e1.getMessage() != null ? e1.getMessage() : e1.toString();
- JEEUIPlugin.logError(msg, e1);
- }
- return facetedProject != null && facetedProject.hasProjectFacet(EARFacetUtils.EAR_FACET);
- }
-
- protected final String calculateValidProjectName(final String originalName) {
- IWorkspaceRoot root = ResourcesPlugin.getWorkspace().getRoot();
- String validName = originalName;
- int count = 1;
- while (root.getProject(validName).exists()) {
- validName = originalName + count++;
- }
- return validName;
- }
-
- protected String getJobTitle(IVirtualComponent earComponent) {
- return NLS.bind(Messages.AddModuleToEarDropAssistant_Adding_module_to_ea_, earComponent.getName());
- }
-
- protected IStatus validateProjectToAdd(IProject projectToAdd, int earVersion) {
- try {
- // check if the project to add is not an EAR itself
- IFacetedProject facetedProject = ProjectFacetsManager.create(projectToAdd);
- if (facetedProject == null) {
- facetedProject = ProjectFacetsManager.create(projectToAdd, true, new NullProgressMonitor());
- IProjectFacetVersion javafacetversion = ProjectFacetsManager.getProjectFacet(IModuleConstants.JST_JAVA).getDefaultVersion();
- facetedProject.installProjectFacet(javafacetversion, null, null);
- IProjectFacetVersion utilityfacetversion = ProjectFacetsManager.getProjectFacet(IModuleConstants.JST_UTILITY_MODULE).getDefaultVersion();
- facetedProject.installProjectFacet(utilityfacetversion, null, null);
- }
- if (facetedProject.hasProjectFacet(EARFacetUtils.EAR_FACET))
- return Status.CANCEL_STATUS;
-
- // check if the project to add is with Java EE version equal or
- // lesser than that of the EAR
- String verStr = J2EEProjectUtilities.getJ2EEProjectVersion(projectToAdd);
- if (verStr != null) {
- int version;
- if (JavaEEProjectUtilities.isApplicationClientProject(projectToAdd))
- version = J2EEVersionUtil.convertAppClientVersionStringToJ2EEVersionID(verStr);
- else if (JavaEEProjectUtilities.isEJBProject(projectToAdd))
- version = J2EEVersionUtil.convertEJBVersionStringToJ2EEVersionID(verStr);
- else if (JavaEEProjectUtilities.isDynamicWebProject(projectToAdd))
- version = J2EEVersionUtil.convertWebVersionStringToJ2EEVersionID(verStr);
- else if (JavaEEProjectUtilities.isJCAProject(projectToAdd))
- version = J2EEVersionUtil.convertConnectorVersionStringToJ2EEVersionID(verStr);
- else
- version = J2EEVersionUtil.convertVersionStringToInt(verStr);
-
- if (version > earVersion)
- return Status.CANCEL_STATUS;
- }
- } catch (CoreException e) {
- String msg = e.getMessage() != null ? e.getMessage() : e.toString();
- return J2EENavigatorPlugin.createErrorStatus(0, msg, e);
- }
- return Status.OK_STATUS;
-
- }
-
- protected static IProject getProject(Object element) {
- if (element == null)
- return null;
- IProject project = null;
- if (element instanceof IAdaptable)
- project = (IProject) ((IAdaptable) element).getAdapter(IPROJECT_CLASS);
- else
- project = (IProject) Platform.getAdapterManager().getAdapter(element, IPROJECT_CLASS);
-
- if (element instanceof AbstractEarNode) {
- project = ((AbstractEarNode) element).getEarProject();
- }
-
- if (element instanceof GroupEARProvider) {
- project = ((GroupEARProvider) element).getProject();
- }
-
- if (element instanceof IVirtualReference) {
- project = ((IVirtualReference) element).getReferencedComponent().getProject();
- }
-
- if (project == null) {
- if (element instanceof EObject) {
- project = ProjectUtilities.getProject((EObject) element);
- } else if (element instanceof J2EEItemProvider) {
- IFile associatedFile = ((J2EEItemProvider) element).getAssociatedFile();
- if (associatedFile != null)
- project = associatedFile.getProject();
- }
- }
- return project;
- }
-
- protected static String getDefaultURI(IVirtualComponent component) {
- IProject project = component.getProject();
- String name = component.getName();
-
- if (JavaEEProjectUtilities.isDynamicWebProject(project)) {
- name += IJ2EEModuleConstants.WAR_EXT;
- } else if (JavaEEProjectUtilities.isEARProject(project)) {
- name += IJ2EEModuleConstants.EAR_EXT;
- } else if (JavaEEProjectUtilities.isJCAProject(project)) {
- name += IJ2EEModuleConstants.RAR_EXT;
- } else {
- name += IJ2EEModuleConstants.JAR_EXT;
- }
- return name;
- }
-
- private boolean hasConflictingProjectInMetaInf(Object lib) {
- IProject libProj = null;
- if (lib instanceof IProject) {
- libProj = (IProject) lib;
- } else if (lib instanceof IVirtualComponent) {
- libProj = ((IVirtualComponent) lib).getProject();
- } else if (lib instanceof IVirtualReference){
- libProj = ((IVirtualReference) lib).getReferencedComponent().getProject();
- }
- if(libProj == null){
- return false;
- }
- IProject earProject = earComponent.getProject();
- try {
- IProject[] earRefProjects = earProject.getReferencedProjects();
- for (int i = 0; i < earRefProjects.length; i++) {
- if (!JavaEEProjectUtilities.isEARProject(earRefProjects[i]) && !earRefProjects[i].equals(libProj)) {
- IVirtualComponent cmp1 = ComponentCore.createComponent(earRefProjects[i]);
- if (cmp1 == null){
- continue;
- }
- IVirtualReference[] refs = cmp1.getReferences();
- for (int j = 0; j < refs.length; j++) {
- if (refs[j].getReferencedComponent().getProject().equals(libProj))
- return true;
- }
- }
- }
- return false;
- } catch (CoreException ce) {
- }
- return false;
- }
-
- protected IStatus addComponentsToEar(List<IVirtualComponent> components, String libDir) {
- IStatus status = null;
- IDataModel datamodel = DataModelFactory.createDataModel(new AddComponentToEnterpriseApplicationDataModelProvider());
-
- Map componentToURIMap = new HashMap();
- IVirtualComponent moduleComponent = null;
- for (Iterator itr = components.iterator(); itr.hasNext();) {
- moduleComponent = (IVirtualComponent) itr.next();
- componentToURIMap.put(moduleComponent, getDefaultURI(moduleComponent));
- }
- datamodel.setProperty(ICreateReferenceComponentsDataModelProperties.SOURCE_COMPONENT, earComponent);
- datamodel.setProperty(ICreateReferenceComponentsDataModelProperties.TARGET_COMPONENT_LIST, components);
- datamodel.setProperty(IAddComponentToEnterpriseApplicationDataModelProperties.TARGET_COMPONENTS_TO_URI_MAP, componentToURIMap);
- String libDirPath = libDir;
- if(libDir != null && libDir.length() > 0)
- libDirPath = new Path(libDir).makeAbsolute().toString();
- datamodel.setProperty(IAddComponentToEnterpriseApplicationDataModelProperties.TARGET_COMPONENTS_DEPLOY_PATH, libDirPath);
- try {
- return datamodel.getDefaultOperation().execute(new NullProgressMonitor(), null);
- } catch (ExecutionException e) {
- String msg = e.getMessage() != null ? e.getMessage() : e.toString();
- JEEUIPlugin.logError(msg, e);
- }
- return status;
- }
-
- protected IStatus removeComponentsFromEar(List<IVirtualComponent> components, String libDir) {
- IStatus status = null;
- IDataModel datamodel = DataModelFactory.createDataModel(new RemoveComponentFromEnterpriseApplicationDataModelProvider());
- datamodel.setProperty(ICreateReferenceComponentsDataModelProperties.SOURCE_COMPONENT, earComponent);
- datamodel.setProperty(ICreateReferenceComponentsDataModelProperties.TARGET_COMPONENT_LIST, components);
- try {
- status = datamodel.getDefaultOperation().execute(new NullProgressMonitor(), null);
- if (!status.isOK()) {
- return status;
- }
- } catch (ExecutionException e) {
- String msg = e.getMessage() != null ? e.getMessage() : e.toString();
- JEEUIPlugin.logError(msg, e);
- }
- return removeReferences(components, libDir, earComponent);
- }
-
- protected IStatus removeReferences(List<IVirtualComponent> components, String libDir, IVirtualComponent sourceComponent) {
- IVirtualReference[] refs = sourceComponent.getReferences();
- for (IVirtualReference ref : refs) {
- ref.getRuntimePath();
- }
- Map componentToURIMap = new HashMap();
- for (Iterator itr = components.iterator(); itr.hasNext();) {
- IVirtualComponent moduleComponent = (IVirtualComponent) itr.next();
- componentToURIMap.put(moduleComponent, getDefaultURI(moduleComponent));
- }
- final IDataModel model = DataModelFactory.createDataModel(new RemoveReferenceComponentsDataModelProvider());
- model.setProperty(IAddComponentToEnterpriseApplicationDataModelProperties.TARGET_COMPONENTS_TO_URI_MAP, componentToURIMap);
- model.setProperty(ICreateReferenceComponentsDataModelProperties.SOURCE_COMPONENT, sourceComponent);
- model.setProperty(ICreateReferenceComponentsDataModelProperties.TARGET_COMPONENT_LIST, components);
- if (libDir.length() > 0) {
- model.setProperty(ICreateReferenceComponentsDataModelProperties.TARGET_COMPONENTS_DEPLOY_PATH, new Path(libDir).makeAbsolute().toString());
- }
- try {
- return model.getDefaultOperation().execute(null, null);
- } catch (ExecutionException e) {
- String msg = e.getMessage() != null ? e.getMessage() : e.toString();
- JEEUIPlugin.logError(msg, e);
- }
- return Status.CANCEL_STATUS;
- }
-
- protected IStatus resolveConflicts(IVirtualComponent component) {
- IProject earProject = earComponent.getProject();
- try {
- IProject[] earRefProjects = earProject.getReferencedProjects();
- for (int i = 0; i < earRefProjects.length; i++) {
- if (!JavaEEProjectUtilities.isEARProject(earRefProjects[i])) {
- IVirtualComponent cmp1 = ComponentCore.createComponent(earRefProjects[i]);
- if(cmp1 == null){
- continue;
- }
- IVirtualReference[] refs = cmp1.getReferences();
- for (int j = 0; j < refs.length; j++) {
- if (refs[j].getReferencedComponent().equals(component)) {
- List<IVirtualComponent> components = new ArrayList<IVirtualComponent>();
- components.add(refs[j].getReferencedComponent());
- IStatus status = removeReferences(components, refs[j].getRuntimePath().toString(), refs[j].getEnclosingComponent());
- if (!status.isOK()) {
- return status;
- }
- try {
- removeManifestDependency(refs[j].getEnclosingComponent(), refs[j].getReferencedComponent());
- } catch (ExecutionException e) {
- String msg = e.getMessage() != null ? e.getMessage() : e.toString();
- JEEUIPlugin.logError(msg, e);
- }
- }
- }
- }
- }
- } catch (CoreException ce) {
- }
- // return false;
- return Status.OK_STATUS;
- }
-
- private void removeManifestDependency(final IVirtualComponent source, final IVirtualComponent target) throws ExecutionException {
- final String sourceProjName = source.getProject().getName();
- String targetProjName;
- if (target instanceof J2EEModuleVirtualArchiveComponent) {
- targetProjName = ((J2EEModuleVirtualArchiveComponent) target).getName();
- String[] pathSegments = targetProjName.split("" + IPath.SEPARATOR); //$NON-NLS-1$
- targetProjName = pathSegments[pathSegments.length - 1];
- } else {
- targetProjName = target.getProject().getName();
- }
- final IProgressMonitor monitor = new NullProgressMonitor();
- final IFile manifestmf = J2EEProjectUtilities.getManifestFile(source.getProject());
- final ArchiveManifest mf = J2EEProjectUtilities.readManifest(source.getProject());
- if (mf == null)
- return;
- final IDataModel updateManifestDataModel = DataModelFactory.createDataModel(new UpdateManifestDataModelProvider());
- updateManifestDataModel.setProperty(UpdateManifestDataModelProperties.PROJECT_NAME, sourceProjName);
- updateManifestDataModel.setBooleanProperty(UpdateManifestDataModelProperties.MERGE, false);
- updateManifestDataModel.setProperty(UpdateManifestDataModelProperties.MANIFEST_FILE, manifestmf);
- String[] cp = mf.getClassPathTokenized();
- List cpList = new ArrayList();
- String cpToRemove = (targetProjName.endsWith(IJ2EEModuleConstants.JAR_EXT)) ?
- targetProjName : targetProjName + IJ2EEModuleConstants.JAR_EXT;
- for (int i = 0; i < cp.length; i++) {
- if (!cp[i].equals(cpToRemove)) {
- cpList.add(cp[i]);
- }
- }
- updateManifestDataModel.setProperty(UpdateManifestDataModelProperties.JAR_LIST, cpList);
- updateManifestDataModel.getDefaultOperation().execute(monitor, null);
- }
-}
diff --git a/plugins/org.eclipse.jst.jee.ui/src/org/eclipse/jst/jee/ui/internal/navigator/dnd/IModuleExtensions.java b/plugins/org.eclipse.jst.jee.ui/src/org/eclipse/jst/jee/ui/internal/navigator/dnd/IModuleExtensions.java
deleted file mode 100644
index cd9558a..0000000
--- a/plugins/org.eclipse.jst.jee.ui/src/org/eclipse/jst/jee/ui/internal/navigator/dnd/IModuleExtensions.java
+++ /dev/null
@@ -1,24 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2003, 2006 IBM Corporation and others.
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
- *
- * Contributors:
- * IBM Corporation - initial API and implementation
- *******************************************************************************/
-package org.eclipse.jst.jee.ui.internal.navigator.dnd;
-
-import org.eclipse.jst.j2ee.internal.plugin.IJ2EEModuleConstants;
-
-//@deprecated @see org.eclipse.jst.j2ee.internal.plugin.IJ2EEModuleConstants
-
-public interface IModuleExtensions {
-
- public String DOT_WAR = IJ2EEModuleConstants.WAR_EXT;
- public String DOT_JAR = IJ2EEModuleConstants.JAR_EXT;
- public String DOT_RAR = IJ2EEModuleConstants.RAR_EXT;
- public String DOT_EAR = IJ2EEModuleConstants.EAR_EXT;
-
-}
diff --git a/plugins/org.eclipse.jst.jee.ui/src/org/eclipse/jst/jee/ui/internal/navigator/ear/AbstractEarGroupProvider.java b/plugins/org.eclipse.jst.jee.ui/src/org/eclipse/jst/jee/ui/internal/navigator/ear/AbstractEarGroupProvider.java
deleted file mode 100644
index fd2e1db..0000000
--- a/plugins/org.eclipse.jst.jee.ui/src/org/eclipse/jst/jee/ui/internal/navigator/ear/AbstractEarGroupProvider.java
+++ /dev/null
@@ -1,11 +0,0 @@
-package org.eclipse.jst.jee.ui.internal.navigator.ear;
-
-import org.eclipse.jst.javaee.core.JavaEEObject;
-import org.eclipse.jst.jee.ui.internal.navigator.AbstractGroupProvider;
-
-public abstract class AbstractEarGroupProvider extends AbstractGroupProvider {
-
- public AbstractEarGroupProvider(JavaEEObject javaee) {
- super(javaee);
- }
-}
diff --git a/plugins/org.eclipse.jst.jee.ui/src/org/eclipse/jst/jee/ui/internal/navigator/ear/AbstractEarNode.java b/plugins/org.eclipse.jst.jee.ui/src/org/eclipse/jst/jee/ui/internal/navigator/ear/AbstractEarNode.java
deleted file mode 100644
index cab9b5d..0000000
--- a/plugins/org.eclipse.jst.jee.ui/src/org/eclipse/jst/jee/ui/internal/navigator/ear/AbstractEarNode.java
+++ /dev/null
@@ -1,158 +0,0 @@
-/***********************************************************************
- * Copyright (c) 2008 by SAP AG, Walldorf.
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
- *
- * Contributors:
- * SAP AG - initial API and implementation
- ***********************************************************************/
-package org.eclipse.jst.jee.ui.internal.navigator.ear;
-
-import java.util.ArrayList;
-import java.util.Arrays;
-import java.util.List;
-
-import org.eclipse.core.resources.IProject;
-import org.eclipse.core.runtime.IPath;
-import org.eclipse.core.runtime.Path;
-import org.eclipse.jst.j2ee.project.JavaEEProjectUtilities;
-import org.eclipse.wst.common.componentcore.internal.util.IModuleConstants;
-import org.eclipse.wst.common.componentcore.resources.IVirtualComponent;
-import org.eclipse.wst.common.componentcore.resources.IVirtualReference;
-
-/**
- * @author gormov
- *
- */
-public abstract class AbstractEarNode {
-
- public static int MODULES_TYPE = 0;
- public static int LIBS_TYPE = 1;
-
- protected int type;
-
- protected static List implicitUtilityReferenceTypes =
- Arrays.asList(new String[] {
- IModuleConstants.JST_APPCLIENT_MODULE,
- IModuleConstants.JST_WEB_MODULE,
- IModuleConstants.JST_EJB_MODULE,
- IModuleConstants.JST_CONNECTOR_MODULE});
-
- private IProject earProject;
-
- public AbstractEarNode(IProject earProject) {
- this.earProject = earProject;
- }
-
- public IProject getEarProject() {
- return earProject;
- }
-
- public abstract List getModules();
-
-
- public int getType() {
- return type;
- }
-
- public abstract String getText();
-
- protected List getComponentReferencesAsList(List componentTypes, IVirtualComponent virtualComponent, IPath runtimePath) {
- List components = new ArrayList();
- IVirtualComponent earComponent = virtualComponent;
- if (earComponent != null ) {
- IPath relativeRuntimePath = null;
- if (runtimePath != null){
- relativeRuntimePath = runtimePath.makeRelative();
- }
- IVirtualReference[] refComponents = earComponent.getReferences();
- for (int i = 0; i < refComponents.length; i++) {
- IVirtualComponent module = refComponents[i].getReferencedComponent();
- if (module == null) continue;
- // if component types passed in is null then return all components
- if (componentTypes == null || componentTypes.size() == 0) {
- components.add(refComponents[i]);
- } else {
- if (componentTypes.contains(JavaEEProjectUtilities.getJ2EEComponentType(module))) {
- if (relativeRuntimePath != null){
- IPath runtimePath2 = getRealRuntimePath(refComponents[i]);
- if (runtimePath2.makeRelative().equals(relativeRuntimePath)) {
- components.add(refComponents[i]);
- }
- } else {
- components.add(refComponents[i]);
- }
- }
- }
- }
- }
- return components;
- }
-
- /**
- * This method will return complete list of the binaries contained in the lib dir.
- *
- * @param virtualComponent
- * @param runtimePath
- * @return
- */
- protected List getBinariesInLibDir(IVirtualComponent virtualComponent, IPath runtimePath, List componentTypes) {
- List components = new ArrayList();
- IVirtualComponent earComponent = virtualComponent;
- if (earComponent != null ) {
- IPath relativeRuntimePath = null;
- if (runtimePath != null){
- relativeRuntimePath = runtimePath.makeRelative();
- }
- IVirtualReference[] refComponents = earComponent.getReferences();
- for (int i = 0; i < refComponents.length; i++) {
- IVirtualComponent module = refComponents[i].getReferencedComponent();
- if (module == null) continue;
- // if component types passed in is null then return all components
- if (module.isBinary() && relativeRuntimePath != null && !relativeRuntimePath.isEmpty() && getRealRuntimePath(refComponents[i]).makeRelative().equals(relativeRuntimePath)) {
- if (componentTypes != null && !componentTypes.contains(JavaEEProjectUtilities.getJ2EEComponentType(module)) ) {
- if (runtimePath != null && !runtimePath.makeAbsolute().equals(new Path("/"))){//$NON-NLS-1$
- components.add(refComponents[i]);
- }
- } else {
- components.add(refComponents[i]);
- }
-
-
- }
- }
- }
- return components;
- }
-
-
- /**
- * This method will return all the binaries contained in the lib dir.
- * It will not consider modules in lib dir as libraries for that use
- * getBinariesInLibDir(IVirtualComponent virtualComponent, IPath runtimePath, List componentTypes)
- *
- * @param virtualComponent
- * @param runtimePath
- * @return
- * @deprecated since it is not returning the complete list of libraries
- * use: getBinariesInLibDir(IVirtualComponent virtualComponent, IPath runtimePath, List componentTypes)
- */
- protected List getBinariesInLibDir(IVirtualComponent virtualComponent, IPath runtimePath) {
- return getBinariesInLibDir(virtualComponent, runtimePath, null);
- }
-
- protected IPath getRealRuntimePath(IVirtualReference vr){
- IPath runtimePath2 = vr.getRuntimePath();
- if(vr.getArchiveName() != null){
- IPath namePath = new Path (vr.getArchiveName());
- if (namePath.segmentCount()>1 && runtimePath2.segmentCount()==0){
- runtimePath2 = new Path("/"+namePath.removeLastSegments(1).toPortableString()); //$NON-NLS-1$
- }
- }
- return runtimePath2;
- }
-
-
-}
diff --git a/plugins/org.eclipse.jst.jee.ui/src/org/eclipse/jst/jee/ui/internal/navigator/ear/Application5ViewerSorter.java b/plugins/org.eclipse.jst.jee.ui/src/org/eclipse/jst/jee/ui/internal/navigator/ear/Application5ViewerSorter.java
deleted file mode 100644
index 4e1d247..0000000
--- a/plugins/org.eclipse.jst.jee.ui/src/org/eclipse/jst/jee/ui/internal/navigator/ear/Application5ViewerSorter.java
+++ /dev/null
@@ -1,18 +0,0 @@
-package org.eclipse.jst.jee.ui.internal.navigator.ear;
-
-import org.eclipse.jface.viewers.Viewer;
-import org.eclipse.jst.j2ee.navigator.internal.ApplicationViewerSorter;
-
-public class Application5ViewerSorter extends ApplicationViewerSorter {
-
- @Override
-public int compare(Viewer viewer, Object e1, Object e2) {
- if(e1 instanceof BundledNode){
- return -1;
- } else if(e2 instanceof BundledNode){
- return 1;
- }
- return super.compare(viewer, e1, e2);
-}
-
-}
diff --git a/plugins/org.eclipse.jst.jee.ui/src/org/eclipse/jst/jee/ui/internal/navigator/ear/BundledNode.java b/plugins/org.eclipse.jst.jee.ui/src/org/eclipse/jst/jee/ui/internal/navigator/ear/BundledNode.java
deleted file mode 100644
index ef9ecdb..0000000
--- a/plugins/org.eclipse.jst.jee.ui/src/org/eclipse/jst/jee/ui/internal/navigator/ear/BundledNode.java
+++ /dev/null
@@ -1,108 +0,0 @@
-/***********************************************************************
- * Copyright (c) 2008 by SAP AG, Walldorf.
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
- *
- * Contributors:
- * SAP AG - initial API and implementation
- ***********************************************************************/
-package org.eclipse.jst.jee.ui.internal.navigator.ear;
-
-import java.util.ArrayList;
-import java.util.Collections;
-import java.util.List;
-
-import org.eclipse.core.resources.IProject;
-import org.eclipse.core.runtime.IPath;
-import org.eclipse.core.runtime.Path;
-import org.eclipse.jst.j2ee.internal.project.J2EEProjectUtilities;
-import org.eclipse.jst.j2ee.project.EarUtilities;
-import org.eclipse.wst.common.componentcore.ComponentCore;
-import org.eclipse.wst.common.componentcore.resources.IVirtualComponent;
-import org.eclipse.wst.common.componentcore.resources.IVirtualReference;
-
-/**
- *
- * Bundled Libraries node. Sub-node of EAR 5 Deployment Descriptor node.
- *
- * @author Dimitar Giormov
- *
- */
-public class BundledNode extends AbstractEarNode {
-
- private static final List<String> UTILITY = Collections.singletonList(J2EEProjectUtilities.UTILITY);
- private String nodeName;
- private final BundledNode bundledLibsDirectoryNode;
-
- public BundledNode(IProject earProject, String nodeName, BundledNode bundledLibsDirectoryNode) {
- super(earProject);
- this.nodeName = nodeName;
- this.bundledLibsDirectoryNode = bundledLibsDirectoryNode;
- type = LIBS_TYPE;
- }
-
- @Override
- public String toString() {
- return nodeName;
- }
-
- @Override
- public String getText() {
- return nodeName;
- }
-
- public void setText(String label) {
- nodeName = label;
- }
-
- public BundledNode getBundledLibsDirectoryNode() {
- return bundledLibsDirectoryNode;
- }
-
- @Override
- public List getModules() {
- IVirtualComponent projectComponent = ComponentCore.createComponent(getEarProject());
-
- Path libPath = new Path("/"); //$NON-NLS-1$
- if (bundledLibsDirectoryNode == null){
- String modelLibPath = EarUtilities.getEARLibDir(projectComponent);
- String prefix = "/"; //$NON-NLS-1$
- if (modelLibPath.startsWith(prefix)){
- prefix = ""; //$NON-NLS-1$
- }
- libPath = new Path(prefix + modelLibPath);
- }
-
- List libs = getComponentReferencesAsList(UTILITY, projectComponent,
- libPath);
- libs.addAll(getBinariesInLibDir(projectComponent,libPath, UTILITY));
- if(bundledLibsDirectoryNode == null)
- libs.addAll(getComponentReferencesAsList(implicitUtilityReferenceTypes, projectComponent, libPath));
-
- List modules = new ArrayList();
- for (int i = 0; i < libs.size(); i++) {
- IVirtualReference reference = (IVirtualReference) libs.get(i);
-
- IPath runtimePath = getRealRuntimePath(reference);
-
- if (runtimePath != null && runtimePath.segment(0) != null && !libPath.makeRelative().isEmpty() &&
- runtimePath.makeRelative().equals(libPath.makeRelative())) {
- if (bundledLibsDirectoryNode == null){
- modules.add(libs.get(i));
- }
-
- } else {
- if (bundledLibsDirectoryNode != null){
- modules.add(libs.get(i));
- }
- }
- }
- if (bundledLibsDirectoryNode != null){
- modules.add(bundledLibsDirectoryNode);
- }
- return modules;
- }
-
-}
diff --git a/plugins/org.eclipse.jst.jee.ui/src/org/eclipse/jst/jee/ui/internal/navigator/ear/GroupEARProvider.java b/plugins/org.eclipse.jst.jee.ui/src/org/eclipse/jst/jee/ui/internal/navigator/ear/GroupEARProvider.java
deleted file mode 100644
index 307b045..0000000
--- a/plugins/org.eclipse.jst.jee.ui/src/org/eclipse/jst/jee/ui/internal/navigator/ear/GroupEARProvider.java
+++ /dev/null
@@ -1,154 +0,0 @@
-/***********************************************************************
- * Copyright (c) 2008, 2010 by SAP AG, Walldorf.
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
- *
- * Contributors:
- * SAP AG - initial API and implementation
- ***********************************************************************/
-package org.eclipse.jst.jee.ui.internal.navigator.ear;
-
-import java.util.ArrayList;
-import java.util.List;
-
-import org.eclipse.core.resources.IFile;
-import org.eclipse.core.resources.IProject;
-import org.eclipse.core.runtime.CoreException;
-import org.eclipse.core.runtime.IAdaptable;
-import org.eclipse.jst.j2ee.componentcore.util.EARVirtualComponent;
-import org.eclipse.jst.j2ee.internal.J2EEVersionConstants;
-import org.eclipse.jst.j2ee.project.EarUtilities;
-import org.eclipse.jst.javaee.application.Application;
-import org.eclipse.jst.jee.ui.internal.Messages;
-import org.eclipse.jst.jee.ui.plugin.JEEUIPlugin;
-import org.eclipse.jst.jee.ui.plugin.JEEUIPluginIcons;
-import org.eclipse.osgi.util.NLS;
-import org.eclipse.swt.graphics.Image;
-import org.eclipse.wst.common.componentcore.ComponentCore;
-import org.eclipse.wst.common.componentcore.internal.util.IModuleConstants;
-import org.eclipse.wst.common.componentcore.resources.IVirtualFolder;
-import org.eclipse.wst.common.project.facet.core.IFacetedProject;
-import org.eclipse.wst.common.project.facet.core.ProjectFacetsManager;
-
-/**
- * Ear 5 Deployment descriptor node.
- *
- * @author Dimitar Giormov
- * @author Kaloyan Raev
- */
-public class GroupEARProvider extends AbstractEarGroupProvider implements IAdaptable {
-
- private static final String PROJECT_RELATIVE_PATH = "META-INF/application.xml"; //$NON-NLS-1$
- public final static String EAR_DEFAULT_LIB = "lib"; //$NON-NLS-1$
- private static Image ear50Image;
- private static Image ear60Image;
- private EARVirtualComponent earComponent;
- private IFile ddFile;
-
- private BundledNode bundledLibsNode;
- private ModulesNode modulesNode;
-
- public GroupEARProvider(Application application, EARVirtualComponent wtpComponent) {
- super(application);
- earComponent = wtpComponent;
- }
-
- public IProject getProject() {
- return earComponent.getProject();
- }
-
- @Override
- public String getText() {
- return NLS.bind(Messages.DEPLOYMENT_DESCRIPTOR, earComponent.getName());
- }
-
- public EARVirtualComponent getEARVirtualComponent() {
- return this.earComponent;
- }
-
- @Override
- public List getChildren() {
- List children = new ArrayList();
- IProject project = getProject();
-
- try {
- IFacetedProject facetedProject = ProjectFacetsManager.create(project);
- //EE6TODO
- if (facetedProject != null &&
- (facetedProject.hasProjectFacet(
- ProjectFacetsManager.getProjectFacet(IModuleConstants.JST_EAR_MODULE).getVersion(
- J2EEVersionConstants.VERSION_5_0_TEXT)) || facetedProject.hasProjectFacet(
- ProjectFacetsManager.getProjectFacet(IModuleConstants.JST_EAR_MODULE).getVersion(
- J2EEVersionConstants.VERSION_6_0_TEXT)))) {
-
- if (bundledLibsNode == null) {
- BundledNode bundledLibsDirectoryNode = new BundledNode(project, Messages.LIBRARY_DIRECTORY + ": " + EarUtilities.getEARLibDir(earComponent), null);//$NON-NLS-1$
- bundledLibsNode = new BundledNode(project, Messages.BUNDLED_LIBRARIES_NODE, bundledLibsDirectoryNode);
- } else {
- bundledLibsNode.getBundledLibsDirectoryNode().setText(Messages.LIBRARY_DIRECTORY + ": " + EarUtilities.getEARLibDir(earComponent));//$NON-NLS-1$
- }
-
- if(modulesNode == null){
- modulesNode = new ModulesNode(project);
- }
-
-
- children.add(modulesNode);
- children.add(bundledLibsNode);
- }
- } catch (CoreException e) {
- String msg = "Error in the JEEContentProvider.getChildren() for parent:" + this; //$NON-NLS-1$
- JEEUIPlugin.logError(msg, e);
- }
- return children;
- }
-
- @Override
- public Image getImage() {
- String version = ((Application) javaee).getVersion();
- if (J2EEVersionConstants.VERSION_5_TEXT.equals(version)) {
- return getEar50Image();
- } else if (J2EEVersionConstants.VERSION_6_TEXT.equals(version)) {
- return getEar60Image();
- }
- return getEar50Image();
- }
-
- @Override
- public boolean hasChildren() {
- return !getChildren().isEmpty();
- }
-
- public IFile getDDFile() {
- if (ddFile != null){
- return ddFile;
- }
- IVirtualFolder virtualFolder = ComponentCore.createComponent(getProject()).getRootFolder();
- ddFile = virtualFolder.getFile(PROJECT_RELATIVE_PATH).getUnderlyingFile();
- return ddFile;
- }
-
- public Object getAdapter(Class adapter) {
- if (IProject.class == adapter){
- return getProject();
- }
- return null;
- }
-
- private Image getEar50Image() {
- if (ear50Image == null) {
- ear50Image = JEEUIPlugin.getDefault().getImageDescriptor(JEEUIPluginIcons.EAR_IMAGE).createImage();
- }
- return ear50Image;
- }
-
- private Image getEar60Image() {
- if (ear60Image == null) {
- ear60Image = JEEUIPlugin.getDefault().getImageDescriptor(JEEUIPluginIcons.EAR6_IMAGE).createImage();
- }
- return ear60Image;
- }
-
-}
diff --git a/plugins/org.eclipse.jst.jee.ui/src/org/eclipse/jst/jee/ui/internal/navigator/ear/ModulesNode.java b/plugins/org.eclipse.jst.jee.ui/src/org/eclipse/jst/jee/ui/internal/navigator/ear/ModulesNode.java
deleted file mode 100644
index ef417a2..0000000
--- a/plugins/org.eclipse.jst.jee.ui/src/org/eclipse/jst/jee/ui/internal/navigator/ear/ModulesNode.java
+++ /dev/null
@@ -1,51 +0,0 @@
-/***********************************************************************
- * Copyright (c) 2008 by SAP AG, Walldorf.
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
- *
- * Contributors:
- * SAP AG - initial API and implementation
- ***********************************************************************/
-package org.eclipse.jst.jee.ui.internal.navigator.ear;
-
-import java.util.Arrays;
-import java.util.List;
-
-import org.eclipse.core.resources.IProject;
-import org.eclipse.jst.j2ee.project.EarUtilities;
-import org.eclipse.jst.jee.ui.internal.Messages;
-import org.eclipse.wst.common.componentcore.ComponentCore;
-import org.eclipse.wst.common.componentcore.resources.IVirtualComponent;
-
-/**
- *
- * Modules sub-node of EAR Deployment descriptor node Java EE 5
- *
- * @author Dimitar Giormov
- *
- */
-public class ModulesNode extends AbstractEarNode {
-
- public ModulesNode(IProject earProject) {
- super(earProject);
- type = MODULES_TYPE;
- }
-
- @Override
- public String toString() {
- return Messages.EAR_MODULES_NODE;
- }
-
- @Override
- public String getText() {
- return Messages.EAR_MODULES_NODE;
- }
-
- @Override
- public List getModules() {
- IVirtualComponent projectComponent = ComponentCore.createComponent(getEarProject());
- return Arrays.asList(EarUtilities.getJ2EEModuleReferences(projectComponent));
- }
-}
diff --git a/plugins/org.eclipse.jst.jee.ui/src/org/eclipse/jst/jee/ui/internal/navigator/ear/ShowDepPropPageAction.java b/plugins/org.eclipse.jst.jee.ui/src/org/eclipse/jst/jee/ui/internal/navigator/ear/ShowDepPropPageAction.java
deleted file mode 100644
index 8760010..0000000
--- a/plugins/org.eclipse.jst.jee.ui/src/org/eclipse/jst/jee/ui/internal/navigator/ear/ShowDepPropPageAction.java
+++ /dev/null
@@ -1,50 +0,0 @@
-/***********************************************************************
- * Copyright (c) 2008 by SAP AG, Walldorf.
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
- *
- * Contributors:
- * SAP AG - initial API and implementation
- ***********************************************************************/
-package org.eclipse.jst.jee.ui.internal.navigator.ear;
-
-import org.eclipse.core.resources.IProject;
-import org.eclipse.jface.action.IAction;
-import org.eclipse.jface.preference.PreferenceDialog;
-import org.eclipse.jface.viewers.ISelection;
-import org.eclipse.jface.viewers.IStructuredSelection;
-import org.eclipse.ui.IObjectActionDelegate;
-import org.eclipse.ui.IWorkbenchPart;
-import org.eclipse.ui.PlatformUI;
-import org.eclipse.ui.internal.dialogs.PropertyDialog;
-
-public class ShowDepPropPageAction implements IObjectActionDelegate
-{
-
- private ISelection sel;
-
- public void selectionChanged(IAction action, ISelection selection) {
- sel = selection;
- }
-
- public void setActivePart(IAction action, IWorkbenchPart targetPart) {
- }
-
- public void run(IAction action) {
- if (sel == null){
- return;
- }
- Object selectedObject = ((IStructuredSelection) sel).getFirstElement();
- if (selectedObject instanceof ModulesNode) {
- IProject earProject = ((ModulesNode)selectedObject).getEarProject();
- PreferenceDialog dialog = PropertyDialog.createDialogOn(PlatformUI.getWorkbench().getActiveWorkbenchWindow().
- getShell(), "org.eclipse.wst.common.componentcore.ui.DeploymentAssemblyPage", earProject); //$NON-NLS-1$
- if (dialog != null) {
- dialog.open();
- }
- }
- }
-
-}
diff --git a/plugins/org.eclipse.jst.jee.ui/src/org/eclipse/jst/jee/ui/internal/navigator/ejb/AbstractEjbGroupProvider.java b/plugins/org.eclipse.jst.jee.ui/src/org/eclipse/jst/jee/ui/internal/navigator/ejb/AbstractEjbGroupProvider.java
deleted file mode 100644
index ac62cf0..0000000
--- a/plugins/org.eclipse.jst.jee.ui/src/org/eclipse/jst/jee/ui/internal/navigator/ejb/AbstractEjbGroupProvider.java
+++ /dev/null
@@ -1,12 +0,0 @@
-package org.eclipse.jst.jee.ui.internal.navigator.ejb;
-
-import org.eclipse.jst.javaee.core.JavaEEObject;
-import org.eclipse.jst.jee.ui.internal.navigator.AbstractGroupProvider;
-
-public abstract class AbstractEjbGroupProvider extends AbstractGroupProvider{
-
- public AbstractEjbGroupProvider(JavaEEObject javaee) {
- super(javaee);
- }
-
-}
diff --git a/plugins/org.eclipse.jst.jee.ui/src/org/eclipse/jst/jee/ui/internal/navigator/ejb/ActivationConfigProperties.java b/plugins/org.eclipse.jst.jee.ui/src/org/eclipse/jst/jee/ui/internal/navigator/ejb/ActivationConfigProperties.java
deleted file mode 100644
index d471c9b..0000000
--- a/plugins/org.eclipse.jst.jee.ui/src/org/eclipse/jst/jee/ui/internal/navigator/ejb/ActivationConfigProperties.java
+++ /dev/null
@@ -1,55 +0,0 @@
-/***********************************************************************
- * Copyright (c) 2008 by SAP AG, Walldorf.
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
- *
- * Contributors:
- * SAP AG - initial API and implementation
- ***********************************************************************/
-package org.eclipse.jst.jee.ui.internal.navigator.ejb;
-
-import java.net.URL;
-import java.util.List;
-
-import org.eclipse.jface.resource.ImageDescriptor;
-import org.eclipse.jst.j2ee.internal.plugin.J2EEPlugin;
-import org.eclipse.jst.jee.ui.internal.Messages;
-import org.eclipse.jst.jee.ui.internal.navigator.AbstractDDNode;
-import org.eclipse.swt.graphics.Image;
-
-/**
- * Deployment Descriptor node that contains information about ActivationConfigProperties.
- *
- * @author Dimitar Giormov
- *
- */
-public class ActivationConfigProperties extends AbstractDDNode {
-
- public ActivationConfigProperties(Object adapterNode) {
- super(adapterNode);
- }
-
- @Override
- public List getChildren() {
- return (List) adapterNode;
- }
-
- @Override
- public boolean hasChildren() {
- return true;
- }
-
- @Override
- public String getText() {
- return Messages.ACTIVATION_CONFIG_PROPERTIES;
- }
-
- @Override
- public Image getImage() {
- URL url = (URL) J2EEPlugin.getPlugin().getImage("access_intent_obj"); //$NON-NLS-1$
- return ImageDescriptor.createFromURL(url).createImage();
- }
-
-}
diff --git a/plugins/org.eclipse.jst.jee.ui/src/org/eclipse/jst/jee/ui/internal/navigator/ejb/BeanDecorator.java b/plugins/org.eclipse.jst.jee.ui/src/org/eclipse/jst/jee/ui/internal/navigator/ejb/BeanDecorator.java
deleted file mode 100644
index b2ed576..0000000
--- a/plugins/org.eclipse.jst.jee.ui/src/org/eclipse/jst/jee/ui/internal/navigator/ejb/BeanDecorator.java
+++ /dev/null
@@ -1,47 +0,0 @@
-package org.eclipse.jst.jee.ui.internal.navigator.ejb;
-
-import org.eclipse.jface.resource.ImageDescriptor;
-import org.eclipse.jface.viewers.IDecoration;
-import org.eclipse.jface.viewers.ILightweightLabelDecorator;
-import org.eclipse.jface.viewers.LabelProvider;
-import org.eclipse.jst.j2ee.internal.plugin.J2EEUIPlugin;
-import org.eclipse.jst.jee.ui.plugin.JEEUIPlugin;
-import org.eclipse.jst.jee.ui.plugin.JEEUIPluginIcons;
-
-public class BeanDecorator extends LabelProvider implements ILightweightLabelDecorator {
-
- public void decorate(Object element, IDecoration decoration) {
- if (element instanceof BeanInterfaceNode){
- BeanInterfaceNode beanInteraceNode = (BeanInterfaceNode) element;
- switch (beanInteraceNode.getKind()) {
- case BeanInterfaceNode.KINDS.BUSSINESS_LOCAL:
- applyDecorator(JEEUIPluginIcons.BUSSINESS_LOCAL, decoration);
- break;
- case BeanInterfaceNode.KINDS.BUSSINESS_REMOTE:
- applyDecorator(JEEUIPluginIcons.BUSSINESS_REMOTE, decoration);
- break;
- case BeanInterfaceNode.KINDS.REMOTE:
- applyDecorator(JEEUIPluginIcons.REMOTE, decoration);
- break;
- case BeanInterfaceNode.KINDS.REMOTE_HOME:
- applyDecorator(JEEUIPluginIcons.REMOTE_HOME, decoration);
- break;
- case BeanInterfaceNode.KINDS.LOCAL:
- applyDecorator(JEEUIPluginIcons.LOCAL, decoration);
- break;
- case BeanInterfaceNode.KINDS.LOCAL_HOME:
- applyDecorator(JEEUIPluginIcons.LOCAL_HOME, decoration);
- break;
- }
- } else if (element instanceof BeanNode){
- decoration.addOverlay(J2EEUIPlugin.getDefault().getImageDescriptor("ejb_module_ovr")); //$NON-NLS-1$
- }
- }
-
- private void applyDecorator(String id, IDecoration decoration) {
- ImageDescriptor imageDescriptor = JEEUIPlugin.getDefault().getImageDescriptor(id);
- decoration.addOverlay(imageDescriptor);
-
- }
-
-}
diff --git a/plugins/org.eclipse.jst.jee.ui/src/org/eclipse/jst/jee/ui/internal/navigator/ejb/BeanInterfaceNode.java b/plugins/org.eclipse.jst.jee.ui/src/org/eclipse/jst/jee/ui/internal/navigator/ejb/BeanInterfaceNode.java
deleted file mode 100644
index d3ea465..0000000
--- a/plugins/org.eclipse.jst.jee.ui/src/org/eclipse/jst/jee/ui/internal/navigator/ejb/BeanInterfaceNode.java
+++ /dev/null
@@ -1,75 +0,0 @@
-/***********************************************************************
- * Copyright (c) 2008 by SAP AG, Walldorf.
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
- *
- * Contributors:
- * SAP AG - initial API and implementation
- ***********************************************************************/
-package org.eclipse.jst.jee.ui.internal.navigator.ejb;
-
-import java.util.ArrayList;
-import java.util.List;
-
-import org.eclipse.jdt.core.Signature;
-import org.eclipse.jdt.internal.ui.JavaPluginImages;
-import org.eclipse.jst.jee.ui.internal.navigator.AbstractDDNode;
-import org.eclipse.swt.graphics.Image;
-
-/**
- * Deployment Descriptor node that contains information about Session or Entity
- * beans interfaces (Business, Component and Local interfaces).
- *
- * @author Dimitar Giormov
- */
-public class BeanInterfaceNode extends AbstractDDNode {
-
- private final int kind;
- private final String _fqn;
-
- public class KINDS {
- public static final int BUSSINESS_LOCAL = 0;
- public static final int BUSSINESS_REMOTE = 1;
- public static final int LOCAL = 2;
- public static final int LOCAL_HOME = 3;
- public static final int REMOTE = 4;
- public static final int REMOTE_HOME = 5;
- }
-
- public BeanInterfaceNode(Object adapterNode, String _fqn, int kind) {
- super(adapterNode);
- this._fqn = _fqn;
- this.kind = kind;
- }
-
- @Override
- public String getText() {
- return Signature.getSimpleName(_fqn);
- }
-
- @Override
- public List getChildren() {
- return new ArrayList();
- }
-
- @Override
- public boolean hasChildren() {
- return false;
- }
-
- @Override
- public Image getImage() {
- return JavaPluginImages.get(JavaPluginImages.IMG_OBJS_CUNIT);
- }
-
- public String get_fqn() {
- return _fqn;
- }
-
- public int getKind() {
- return kind;
- }
-
-}
diff --git a/plugins/org.eclipse.jst.jee.ui/src/org/eclipse/jst/jee/ui/internal/navigator/ejb/BeanNode.java b/plugins/org.eclipse.jst.jee.ui/src/org/eclipse/jst/jee/ui/internal/navigator/ejb/BeanNode.java
deleted file mode 100644
index ea3aaf7..0000000
--- a/plugins/org.eclipse.jst.jee.ui/src/org/eclipse/jst/jee/ui/internal/navigator/ejb/BeanNode.java
+++ /dev/null
@@ -1,74 +0,0 @@
-/***********************************************************************
- * Copyright (c) 2008 by SAP AG, Walldorf.
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
- *
- * Contributors:
- * SAP AG - initial API and implementation
- ***********************************************************************/
-package org.eclipse.jst.jee.ui.internal.navigator.ejb;
-
-import java.util.List;
-
-import org.eclipse.jdt.core.Signature;
-import org.eclipse.jdt.internal.ui.JavaPluginImages;
-import org.eclipse.jst.javaee.core.JavaEEObject;
-import org.eclipse.jst.javaee.ejb.EntityBean;
-import org.eclipse.jst.javaee.ejb.MessageDrivenBean;
-import org.eclipse.jst.javaee.ejb.SessionBean;
-import org.eclipse.jst.jee.ui.internal.Messages;
-import org.eclipse.jst.jee.ui.internal.navigator.AbstractDDNode;
-import org.eclipse.swt.graphics.Image;
-
-/**
- * Deployment Descriptor node that contains information about Enterprise beans.
- *
- *
- * @author Dimitar Giormov
- *
- */
-public class BeanNode extends AbstractDDNode {
-
- public BeanNode(JavaEEObject bean) {
- super(bean);
- image = null;
- String qualified = getEjbClassQualifiedName();
- if (qualified != null) {
- text = Signature.getSimpleName(qualified);
- description = Messages.ENTERPRISE_BEAN_CLASS_DESCRIPTION + qualified;
- }
- }
-
- public String getEjbClassQualifiedName() {
- if (adapterNode instanceof SessionBean){
- return ((SessionBean)adapterNode).getEjbClass();
- } else if (adapterNode instanceof MessageDrivenBean){
- return ((MessageDrivenBean)adapterNode).getEjbClass();
- }else if (adapterNode instanceof EntityBean){
- return ((EntityBean)adapterNode).getEjbClass();
- }
- return null;
- }
-
- public JavaEEObject getEnterpriseBean(){
- return (JavaEEObject) adapterNode;
- }
-
- @Override
- public List getChildren() {
- return null;
- }
-
- @Override
- public boolean hasChildren() {
- return false;
- }
-
- @Override
- public Image getImage() {
- return JavaPluginImages.get(JavaPluginImages.IMG_OBJS_CUNIT);
- }
-
-}
diff --git a/plugins/org.eclipse.jst.jee.ui/src/org/eclipse/jst/jee/ui/internal/navigator/ejb/BeanNodePropertyTester.java b/plugins/org.eclipse.jst.jee.ui/src/org/eclipse/jst/jee/ui/internal/navigator/ejb/BeanNodePropertyTester.java
deleted file mode 100644
index 68355cc..0000000
--- a/plugins/org.eclipse.jst.jee.ui/src/org/eclipse/jst/jee/ui/internal/navigator/ejb/BeanNodePropertyTester.java
+++ /dev/null
@@ -1,57 +0,0 @@
-/***********************************************************************
- * Copyright (c) 2008 by SAP AG, Walldorf.
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
- *
- * Contributors:
- * SAP AG - initial API and implementation
- ***********************************************************************/
-package org.eclipse.jst.jee.ui.internal.navigator.ejb;
-
-import org.eclipse.core.expressions.PropertyTester;
-import org.eclipse.jst.javaee.ejb.MessageDrivenBean;
-import org.eclipse.jst.javaee.ejb.SessionBean;
-
-public class BeanNodePropertyTester extends PropertyTester {
-
- public static final String BEAN_TYPE = "beanType"; //$NON-NLS-1$
- public static final String IS_SESSION_BEAN = "isSessionBean"; //$NON-NLS-1$
- public static final String IS_MESSAGE_DRIVEN = "isMessageDrivenBean"; //$NON-NLS-1$
-
- public boolean test(Object receiver, String property, Object[] args,
- Object expectedValue) {
-
- if (!(receiver instanceof BeanNode)) {
- return false;
- }
-
- Object adapterNode = ((BeanNode) receiver).getAdapterNode();
-
- String val = (String) expectedValue;
- if (BEAN_TYPE.equals(property)) {
- if (IS_SESSION_BEAN.equals(val)) {
- return isSessionBean(adapterNode);
- } else if (IS_MESSAGE_DRIVEN.equals(val)) {
- return isMessageDrivenBean(adapterNode);
- }
- return false;
- }
- return false;
- }
-
- private boolean isMessageDrivenBean(Object obj) {
- if (obj instanceof MessageDrivenBean) {
- return true;
- }
- return false;
- }
-
- private boolean isSessionBean(Object obj) {
- if (obj instanceof SessionBean)
- return true;
- return false;
- }
-
-}
diff --git a/plugins/org.eclipse.jst.jee.ui/src/org/eclipse/jst/jee/ui/internal/navigator/ejb/GroupEJBProvider.java b/plugins/org.eclipse.jst.jee.ui/src/org/eclipse/jst/jee/ui/internal/navigator/ejb/GroupEJBProvider.java
deleted file mode 100644
index 1870fe6..0000000
--- a/plugins/org.eclipse.jst.jee.ui/src/org/eclipse/jst/jee/ui/internal/navigator/ejb/GroupEJBProvider.java
+++ /dev/null
@@ -1,90 +0,0 @@
-/***********************************************************************
- * Copyright (c) 2008 by SAP AG, Walldorf.
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
- *
- * Contributors:
- * SAP AG - initial API and implementation
- ***********************************************************************/
-package org.eclipse.jst.jee.ui.internal.navigator.ejb;
-
-import java.util.List;
-
-import org.eclipse.core.resources.IProject;
-import org.eclipse.core.resources.ResourcesPlugin;
-import org.eclipse.core.runtime.IAdaptable;
-import org.eclipse.jst.javaee.core.JavaEEObject;
-import org.eclipse.jst.javaee.ejb.EJBJar;
-import org.eclipse.jst.jee.ui.internal.Messages;
-import org.eclipse.osgi.util.NLS;
-import org.eclipse.swt.graphics.Image;
-/**
- * Deployment Descriptor root node.
- *
- * @author Dimitar Giormov
- *
- */
-public class GroupEJBProvider extends AbstractEjbGroupProvider implements IAdaptable {
-
- private GroupEjbSession groupEjbSession;
- private GroupEjbMessageDriven groupEjbMessageDriven;
- private GroupEjbEntity groupEjbEntity;
- private String projectName = null;
-
-
- public GroupEJBProvider(EJBJar ejbJar) {
- super(ejbJar);
-
- groupEjbSession = new GroupEjbSession(ejbJar);
- groupEjbMessageDriven = new GroupEjbMessageDriven(ejbJar);
- groupEjbEntity = new GroupEjbEntity(ejbJar);
-
- children.add(groupEjbSession);
- children.add(groupEjbMessageDriven);
- children.add(groupEjbEntity);
- }
-
- @Override
- public List getChildren() {
- return children;
- }
-
- public EJBJar getEjbJar() {
- return (EJBJar) javaee;
- }
-
- @Override
- public String getText() {
- return NLS.bind(Messages.DEPLOYMENT_DESCRIPTOR, projectName);
- }
-
- public String getProjectName() {
- return projectName;
- }
-
- public void setProjectName(String projectName) {
- this.projectName = projectName;
- }
-
- @Override
- public Image getImage() {
- return null;
- }
-
- @Override
- public void reinit(JavaEEObject modelObject) {
- super.reinit(modelObject);
- groupEjbSession.reinit(modelObject);
- groupEjbMessageDriven.reinit(modelObject);
- groupEjbEntity.reinit(modelObject);
- }
-
- public Object getAdapter(Class adapter) {
- if (IProject.class == adapter){
- return ResourcesPlugin.getWorkspace().getRoot().getProject(getProjectName());
- }
- return null;
- }
-}
diff --git a/plugins/org.eclipse.jst.jee.ui/src/org/eclipse/jst/jee/ui/internal/navigator/ejb/GroupEjbEntity.java b/plugins/org.eclipse.jst.jee.ui/src/org/eclipse/jst/jee/ui/internal/navigator/ejb/GroupEjbEntity.java
deleted file mode 100644
index 598c93a..0000000
--- a/plugins/org.eclipse.jst.jee.ui/src/org/eclipse/jst/jee/ui/internal/navigator/ejb/GroupEjbEntity.java
+++ /dev/null
@@ -1,62 +0,0 @@
-/***********************************************************************
- * Copyright (c) 2008 by SAP AG, Walldorf.
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
- *
- * Contributors:
- * SAP AG - initial API and implementation
- ***********************************************************************/
-package org.eclipse.jst.jee.ui.internal.navigator.ejb;
-
-import java.net.URL;
-import java.util.ArrayList;
-import java.util.List;
-
-import org.eclipse.jface.resource.ImageDescriptor;
-import org.eclipse.jst.j2ee.internal.plugin.J2EEPlugin;
-import org.eclipse.jst.javaee.ejb.EJBJar;
-import org.eclipse.jst.javaee.ejb.EnterpriseBeans;
-import org.eclipse.jst.jee.ui.internal.Messages;
-import org.eclipse.jst.jee.ui.internal.navigator.AbstractDDNode;
-import org.eclipse.swt.graphics.Image;
-
-/**
- * Entity Beans group Deployment Descriptor node that has a number of sub nodes
- *
- * @author Dimitar Giormov
- *
- */
-public class GroupEjbEntity extends AbstractDDNode {
-
- public GroupEjbEntity(EJBJar parent) {
- super(parent);
- image = null;
- text = Messages.ENTITY_BEANS;
- }
-
- @Override
- public List getChildren() {
- List children = new ArrayList();
- List entities = null;
- EnterpriseBeans enterpriseBeans = ((EJBJar) adapterNode).getEnterpriseBeans();
- if (enterpriseBeans != null)
- entities = enterpriseBeans.getEntityBeans();
- if (entities != null && entities.size() >0){
- children.addAll(entities);
- }
- return children;
- }
-
- @Override
- public boolean hasChildren() {
- return !getChildren().isEmpty();
- }
-
- @Override
- public Image getImage() {
- URL url = (URL) J2EEPlugin.getPlugin().getImage("cmpEntity_obj"); //$NON-NLS-1$
- return ImageDescriptor.createFromURL(url).createImage();
- }
-}
diff --git a/plugins/org.eclipse.jst.jee.ui/src/org/eclipse/jst/jee/ui/internal/navigator/ejb/GroupEjbMessageDriven.java b/plugins/org.eclipse.jst.jee.ui/src/org/eclipse/jst/jee/ui/internal/navigator/ejb/GroupEjbMessageDriven.java
deleted file mode 100644
index d0f8846..0000000
--- a/plugins/org.eclipse.jst.jee.ui/src/org/eclipse/jst/jee/ui/internal/navigator/ejb/GroupEjbMessageDriven.java
+++ /dev/null
@@ -1,61 +0,0 @@
-/***********************************************************************
- * Copyright (c) 2008 by SAP AG, Walldorf.
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
- *
- * Contributors:
- * SAP AG - initial API and implementation
- ***********************************************************************/
-package org.eclipse.jst.jee.ui.internal.navigator.ejb;
-
-import java.net.URL;
-import java.util.ArrayList;
-import java.util.List;
-
-import org.eclipse.jface.resource.ImageDescriptor;
-import org.eclipse.jst.j2ee.internal.plugin.J2EEPlugin;
-import org.eclipse.jst.javaee.ejb.EJBJar;
-import org.eclipse.jst.javaee.ejb.EnterpriseBeans;
-import org.eclipse.jst.jee.ui.internal.Messages;
-import org.eclipse.jst.jee.ui.internal.navigator.AbstractDDNode;
-import org.eclipse.swt.graphics.Image;
-/**
- * Message Driven Beans group Deployment Descriptor node that has a number of sub nodes
- *
- * @author Dimitar Giormov
- *
- */
-public class GroupEjbMessageDriven extends AbstractDDNode {
-
- public GroupEjbMessageDriven(EJBJar parent) {
- super(parent);
- image = null;
- text = Messages.MESSAGE_DRIVEN_BEANS;
- }
-
- @Override
- public List getChildren() {
- List children = new ArrayList();
- List msgBeans = null;
- EnterpriseBeans enterpriseBeans = ((EJBJar) adapterNode).getEnterpriseBeans();
- if (enterpriseBeans != null)
- msgBeans = enterpriseBeans.getMessageDrivenBeans();
- if (msgBeans != null && msgBeans.size()>0){
- children.addAll(msgBeans);
- }
- return children;
- }
-
- @Override
- public boolean hasChildren() {
- return !getChildren().isEmpty();
- }
-
- @Override
- public Image getImage() {
- URL url = (URL) J2EEPlugin.getPlugin().getImage("message_bean_obj"); //$NON-NLS-1$
- return ImageDescriptor.createFromURL(url).createImage();
- }
-}
diff --git a/plugins/org.eclipse.jst.jee.ui/src/org/eclipse/jst/jee/ui/internal/navigator/ejb/GroupEjbSession.java b/plugins/org.eclipse.jst.jee.ui/src/org/eclipse/jst/jee/ui/internal/navigator/ejb/GroupEjbSession.java
deleted file mode 100644
index de7d7fa..0000000
--- a/plugins/org.eclipse.jst.jee.ui/src/org/eclipse/jst/jee/ui/internal/navigator/ejb/GroupEjbSession.java
+++ /dev/null
@@ -1,63 +0,0 @@
-/***********************************************************************
- * Copyright (c) 2008 by SAP AG, Walldorf.
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
- *
- * Contributors:
- * SAP AG - initial API and implementation
- ***********************************************************************/
-package org.eclipse.jst.jee.ui.internal.navigator.ejb;
-
-import java.net.URL;
-import java.util.ArrayList;
-import java.util.List;
-
-import org.eclipse.jface.resource.ImageDescriptor;
-import org.eclipse.jst.j2ee.internal.plugin.J2EEPlugin;
-import org.eclipse.jst.javaee.ejb.EJBJar;
-import org.eclipse.jst.javaee.ejb.EnterpriseBeans;
-import org.eclipse.jst.jee.ui.internal.Messages;
-import org.eclipse.jst.jee.ui.internal.navigator.AbstractDDNode;
-import org.eclipse.swt.graphics.Image;
-
-
-/**
- * Session Beans group Deployment Descriptor node that has a number of sub nodes
- *
- * @author Dimitar Giormov
- */
-public class GroupEjbSession extends AbstractDDNode {
-
- public GroupEjbSession(EJBJar parent) {
- super(parent);
- image = null;
- text = Messages.SESSION_BEANS;
- }
-
- @Override
- public List getChildren() {
- List children = new ArrayList();
- List sessionBeans = null;
- EnterpriseBeans enterpriseBeans = ((EJBJar) adapterNode).getEnterpriseBeans();
- if (enterpriseBeans != null)
- sessionBeans = enterpriseBeans.getSessionBeans();
-
- if (sessionBeans != null && sessionBeans.size()>0){
- children.addAll(sessionBeans);
- }
- return children;
- }
-
- @Override
- public boolean hasChildren() {
- return !this.getChildren().isEmpty();
- }
-
- @Override
- public Image getImage() {
- URL url = (URL) J2EEPlugin.getPlugin().getImage("sessionBean_obj"); //$NON-NLS-1$
- return ImageDescriptor.createFromURL(url).createImage();
- }
-}
diff --git a/plugins/org.eclipse.jst.jee.ui/src/org/eclipse/jst/jee/ui/internal/navigator/ra/AbstractConnectorGroupProvider.java b/plugins/org.eclipse.jst.jee.ui/src/org/eclipse/jst/jee/ui/internal/navigator/ra/AbstractConnectorGroupProvider.java
deleted file mode 100644
index f2e1add..0000000
--- a/plugins/org.eclipse.jst.jee.ui/src/org/eclipse/jst/jee/ui/internal/navigator/ra/AbstractConnectorGroupProvider.java
+++ /dev/null
@@ -1,12 +0,0 @@
-package org.eclipse.jst.jee.ui.internal.navigator.ra;
-
-import org.eclipse.jst.javaee.core.JavaEEObject;
-import org.eclipse.jst.jee.ui.internal.navigator.AbstractGroupProvider;
-
-public abstract class AbstractConnectorGroupProvider extends AbstractGroupProvider {
-
- public AbstractConnectorGroupProvider(JavaEEObject javaee) {
- super(javaee);
- }
-
-}
diff --git a/plugins/org.eclipse.jst.jee.ui/src/org/eclipse/jst/jee/ui/internal/navigator/ra/ActicationSpecNode.java b/plugins/org.eclipse.jst.jee.ui/src/org/eclipse/jst/jee/ui/internal/navigator/ra/ActicationSpecNode.java
deleted file mode 100644
index b8b6c87..0000000
--- a/plugins/org.eclipse.jst.jee.ui/src/org/eclipse/jst/jee/ui/internal/navigator/ra/ActicationSpecNode.java
+++ /dev/null
@@ -1,39 +0,0 @@
-package org.eclipse.jst.jee.ui.internal.navigator.ra;
-
-import java.util.ArrayList;
-import java.util.List;
-
-import org.eclipse.jst.javaee.core.JavaEEObject;
-import org.eclipse.jst.javaee.jca.ActivationSpec;
-import org.eclipse.jst.jee.ui.internal.Messages;
-import org.eclipse.swt.graphics.Image;
-
-public class ActicationSpecNode extends AbstractConnectorGroupProvider {
-
- public ActicationSpecNode(JavaEEObject javaee) {
- super(javaee);
- }
-
- @Override
- public String getText() {
- return Messages.ActicationSpecNode_ActivationSpec + (((ActivationSpec)javaee).getActivationspecClass() != null ? ((ActivationSpec)javaee).getActivationspecClass() :""); //$NON-NLS-1$
- }
-
- @Override
- public boolean hasChildren() {
- return ((ActivationSpec)javaee).getRequiredConfigProperty() != null && ((ActivationSpec)javaee).getRequiredConfigProperty().size() > 0;
- }
-
- @Override
- public List getChildren() {
- List children = new ArrayList();
- children.addAll(((ActivationSpec)javaee).getRequiredConfigProperty());
- return children;
- }
-
- @Override
- public Image getImage() {
- return null;
- }
-
-}
diff --git a/plugins/org.eclipse.jst.jee.ui/src/org/eclipse/jst/jee/ui/internal/navigator/ra/AdminObjectNode.java b/plugins/org.eclipse.jst.jee.ui/src/org/eclipse/jst/jee/ui/internal/navigator/ra/AdminObjectNode.java
deleted file mode 100644
index 24d6e29..0000000
--- a/plugins/org.eclipse.jst.jee.ui/src/org/eclipse/jst/jee/ui/internal/navigator/ra/AdminObjectNode.java
+++ /dev/null
@@ -1,43 +0,0 @@
-package org.eclipse.jst.jee.ui.internal.navigator.ra;
-
-import java.util.ArrayList;
-import java.util.List;
-
-import org.eclipse.jst.javaee.core.JavaEEObject;
-import org.eclipse.jst.javaee.jca.AdminObject;
-import org.eclipse.jst.jee.ui.internal.Messages;
-import org.eclipse.swt.graphics.Image;
-
-public class AdminObjectNode extends AbstractConnectorGroupProvider {
-
- public AdminObjectNode(JavaEEObject javaee) {
- super(javaee);
- }
-
- @Override
- public List getChildren() {
- List children = new ArrayList();
-// children.addAll(((AdminObject)javaee).getConfigProperty());
- return children;
- }
-
-
-
- @Override
- public boolean hasChildren() {
- return false;
- }
-
- @Override
- public Image getImage() {
- return null;
- }
-
- @Override
- public String getText() {
- return Messages.ConnectorLabelProvider_ADMIN_OBJECT + (((AdminObject)javaee).getAdminobjectInterface() != null ? ((AdminObject)javaee).getAdminobjectInterface() :""); //$NON-NLS-1$
- }
-
-
-
-}
diff --git a/plugins/org.eclipse.jst.jee.ui/src/org/eclipse/jst/jee/ui/internal/navigator/ra/GroupRaContentProvider.java b/plugins/org.eclipse.jst.jee.ui/src/org/eclipse/jst/jee/ui/internal/navigator/ra/GroupRaContentProvider.java
deleted file mode 100644
index b5ee3aa..0000000
--- a/plugins/org.eclipse.jst.jee.ui/src/org/eclipse/jst/jee/ui/internal/navigator/ra/GroupRaContentProvider.java
+++ /dev/null
@@ -1,66 +0,0 @@
-package org.eclipse.jst.jee.ui.internal.navigator.ra;
-
-import java.util.ArrayList;
-import java.util.List;
-
-import org.eclipse.jst.javaee.core.JavaEEObject;
-import org.eclipse.jst.javaee.jca.Connector;
-import org.eclipse.jst.javaee.jca.ResourceAdapter;
-import org.eclipse.jst.jee.ui.internal.Messages;
-import org.eclipse.jst.jee.ui.plugin.JEEUIPlugin;
-import org.eclipse.jst.jee.ui.plugin.JEEUIPluginIcons;
-import org.eclipse.swt.graphics.Image;
-
-public class GroupRaContentProvider extends AbstractConnectorGroupProvider {
-
-
- private Image RA_IMAGE;
-
- public GroupRaContentProvider(JavaEEObject javaee1) {
- super(javaee1);
- }
-
- @Override
- public List getChildren() {
- List children = new ArrayList();
- Connector connector = (Connector) javaee;
- ResourceAdapter ra = connector.getResourceadapter();
- if (ra == null){
- return children;
- }
- if (ra.getAdminobject() != null){
- for (Object object : ra.getAdminobject() ) {
- children.add(new AdminObjectNode((JavaEEObject) object));
- }
- }
- if (ra.getConfigProperty() != null){
- children.addAll(ra.getConfigProperty());
- }
-
- if (ra.getSecurityPermission() != null){
- children.addAll(ra.getSecurityPermission());
- }
- if (ra.getInboundResourceadapter() != null){
- children.add(new InboundRaNode(ra.getInboundResourceadapter()));
- }
- if (ra.getOutboundResourceadapter()!= null){
- children.add(new OutboundRaNode(ra.getOutboundResourceadapter()));
-
- }
- return children;
- }
-
- @Override
- public Image getImage() {
- if (RA_IMAGE == null) {
- RA_IMAGE = JEEUIPlugin.getDefault().getImage(JEEUIPluginIcons.IMG_RESOURCE_ADAPTER);
- }
- return RA_IMAGE;
- }
-
- @Override
- public String getText() {
- return Messages.GroupRaContentProvider_RESOURCE_ADAPTER;
- }
-
-}
diff --git a/plugins/org.eclipse.jst.jee.ui/src/org/eclipse/jst/jee/ui/internal/navigator/ra/InboundRaNode.java b/plugins/org.eclipse.jst.jee.ui/src/org/eclipse/jst/jee/ui/internal/navigator/ra/InboundRaNode.java
deleted file mode 100644
index 7007967..0000000
--- a/plugins/org.eclipse.jst.jee.ui/src/org/eclipse/jst/jee/ui/internal/navigator/ra/InboundRaNode.java
+++ /dev/null
@@ -1,41 +0,0 @@
-package org.eclipse.jst.jee.ui.internal.navigator.ra;
-
-import java.util.ArrayList;
-import java.util.List;
-
-import org.eclipse.jst.javaee.core.JavaEEObject;
-import org.eclipse.jst.javaee.jca.InboundResourceAdapter;
-import org.eclipse.jst.jee.ui.internal.Messages;
-import org.eclipse.swt.graphics.Image;
-
-public class InboundRaNode extends AbstractConnectorGroupProvider {
-
- public InboundRaNode(JavaEEObject javaee) {
- super(javaee);
- }
-
- @Override
- public List getChildren() {
- List children = new ArrayList();
- children.add(new MessageAdapterNode(((InboundResourceAdapter)javaee).getMessageadapter()));
- return children;
- }
-
- @Override
- public Image getImage() {
- return null;
- }
-
- @Override
- public String getText() {
- return Messages.InboundRaNode_Inbound_Resource_adapter;
- }
-
- @Override
- public boolean hasChildren() {
- return ((InboundResourceAdapter)javaee).getMessageadapter() != null;
- }
-
-
-
-}
diff --git a/plugins/org.eclipse.jst.jee.ui/src/org/eclipse/jst/jee/ui/internal/navigator/ra/MessageAdapterNode.java b/plugins/org.eclipse.jst.jee.ui/src/org/eclipse/jst/jee/ui/internal/navigator/ra/MessageAdapterNode.java
deleted file mode 100644
index 9398db4..0000000
--- a/plugins/org.eclipse.jst.jee.ui/src/org/eclipse/jst/jee/ui/internal/navigator/ra/MessageAdapterNode.java
+++ /dev/null
@@ -1,46 +0,0 @@
-package org.eclipse.jst.jee.ui.internal.navigator.ra;
-
-import java.util.ArrayList;
-import java.util.List;
-
-import org.eclipse.jst.javaee.core.JavaEEObject;
-import org.eclipse.jst.javaee.jca.MessageAdapter;
-import org.eclipse.jst.javaee.jca.MessageListener;
-import org.eclipse.jst.jee.ui.internal.Messages;
-import org.eclipse.swt.graphics.Image;
-
-public class MessageAdapterNode extends AbstractConnectorGroupProvider {
-
- public MessageAdapterNode(JavaEEObject javaee) {
- super(javaee);
- }
-
- @Override
- public List getChildren() {
- List children = new ArrayList();
- List<MessageListener> messagelistener = ((MessageAdapter)javaee).getMessagelistener();
- for (MessageListener messageListener2 : messagelistener) {
- children.add(new MessageListenerNode(messageListener2));
- }
- return children;
- }
-
- @Override
- public Image getImage() {
- return null;
- }
-
- @Override
- public String getText() {
- return Messages.MessageAdapterNode_MESSAGE_ADAPTER;
- }
-
- @Override
- public boolean hasChildren() {
- List<MessageListener> messagelistener = ((MessageAdapter)javaee).getMessagelistener();
- return messagelistener != null && messagelistener.size()>0;
- }
-
-
-
-}
diff --git a/plugins/org.eclipse.jst.jee.ui/src/org/eclipse/jst/jee/ui/internal/navigator/ra/MessageListenerNode.java b/plugins/org.eclipse.jst.jee.ui/src/org/eclipse/jst/jee/ui/internal/navigator/ra/MessageListenerNode.java
deleted file mode 100644
index dc6b2ec..0000000
--- a/plugins/org.eclipse.jst.jee.ui/src/org/eclipse/jst/jee/ui/internal/navigator/ra/MessageListenerNode.java
+++ /dev/null
@@ -1,43 +0,0 @@
-package org.eclipse.jst.jee.ui.internal.navigator.ra;
-
-import java.util.ArrayList;
-import java.util.List;
-
-import org.eclipse.jst.javaee.core.JavaEEObject;
-import org.eclipse.jst.javaee.jca.MessageListener;
-import org.eclipse.jst.jee.ui.internal.Messages;
-import org.eclipse.swt.graphics.Image;
-
-public class MessageListenerNode extends AbstractConnectorGroupProvider {
-
- public MessageListenerNode(JavaEEObject javaee) {
- super(javaee);
- }
-
-
-
- @Override
- public List getChildren() {
- List children = new ArrayList();
- children.add(new ActicationSpecNode(((MessageListener)javaee).getActivationspec()));
- return children;
- }
-
-
-
- @Override
- public boolean hasChildren() {
- return ((MessageListener)javaee).getActivationspec() != null;
- }
-
- @Override
- public Image getImage() {
- return null;
- }
-
- @Override
- public String getText() {
- return Messages.MessageListenerNode_MessageListener + (((MessageListener)javaee).getMessagelistenerType() != null ? ((MessageListener)javaee).getMessagelistenerType() :""); //$NON-NLS-1$
- }
-
-}
diff --git a/plugins/org.eclipse.jst.jee.ui/src/org/eclipse/jst/jee/ui/internal/navigator/ra/OutboundRaNode.java b/plugins/org.eclipse.jst.jee.ui/src/org/eclipse/jst/jee/ui/internal/navigator/ra/OutboundRaNode.java
deleted file mode 100644
index e65d4db..0000000
--- a/plugins/org.eclipse.jst.jee.ui/src/org/eclipse/jst/jee/ui/internal/navigator/ra/OutboundRaNode.java
+++ /dev/null
@@ -1,40 +0,0 @@
-package org.eclipse.jst.jee.ui.internal.navigator.ra;
-
-import java.util.ArrayList;
-import java.util.List;
-
-import org.eclipse.jst.javaee.core.JavaEEObject;
-import org.eclipse.jst.javaee.jca.OutboundResourceAdapter;
-import org.eclipse.jst.jee.ui.internal.Messages;
-import org.eclipse.swt.graphics.Image;
-
-public class OutboundRaNode extends AbstractConnectorGroupProvider {
-
- public OutboundRaNode(JavaEEObject javaee) {
- super(javaee);
- }
-
- @Override
- public List getChildren() {
- List children = new ArrayList();
- children.addAll(((OutboundResourceAdapter)javaee).getConnectionDefinition());
- return children;
- }
- @Override
- public Image getImage() {
- return null;
- }
-
- @Override
- public boolean hasChildren() {
- return ((OutboundResourceAdapter)javaee).getConnectionDefinition() != null && ((OutboundResourceAdapter)javaee).getConnectionDefinition().size() >0;
- }
-
- @Override
- public String getText() {
- return Messages.OutboundRaNode_OutboundResourceAdapter;
- }
-
-
-
-}
diff --git a/plugins/org.eclipse.jst.jee.ui/src/org/eclipse/jst/jee/ui/internal/navigator/ra/RaGroupContentProvider.java b/plugins/org.eclipse.jst.jee.ui/src/org/eclipse/jst/jee/ui/internal/navigator/ra/RaGroupContentProvider.java
deleted file mode 100644
index 56172ad..0000000
--- a/plugins/org.eclipse.jst.jee.ui/src/org/eclipse/jst/jee/ui/internal/navigator/ra/RaGroupContentProvider.java
+++ /dev/null
@@ -1,49 +0,0 @@
-package org.eclipse.jst.jee.ui.internal.navigator.ra;
-
-import java.util.ArrayList;
-import java.util.List;
-
-import org.eclipse.core.resources.IProject;
-import org.eclipse.jst.javaee.core.JavaEEObject;
-import org.eclipse.jst.javaee.jca.Connector;
-import org.eclipse.jst.jee.ui.internal.Messages;
-import org.eclipse.jst.jee.ui.plugin.JEEUIPlugin;
-import org.eclipse.jst.jee.ui.plugin.JEEUIPluginIcons;
-import org.eclipse.osgi.util.NLS;
-import org.eclipse.swt.graphics.Image;
-
-public class RaGroupContentProvider extends AbstractConnectorGroupProvider {
-
- private IProject project;
- private Image CONNECTOR_IMAGE;
-
- public RaGroupContentProvider(JavaEEObject javaee, IProject project) {
- super(javaee);
- this.project = project;
- }
-
- @Override
- public List getChildren() {
- List children = new ArrayList();
- children.add(new GroupRaContentProvider(javaee));
- if(((Connector)javaee).getLicense() != null){
- children.add(((Connector)javaee).getLicense());
- }
- return children;
- }
-
- @Override
- public Image getImage() {
- if (CONNECTOR_IMAGE == null) {
- CONNECTOR_IMAGE = JEEUIPlugin.getDefault().getImage(JEEUIPluginIcons.IMG_CONNECTOR);
- }
- return CONNECTOR_IMAGE;
- }
-
-
- @Override
- public String getText() {
- return NLS.bind(Messages.DEPLOYMENT_DESCRIPTOR, project.getName());
- }
-
-}
diff --git a/plugins/org.eclipse.jst.jee.ui/src/org/eclipse/jst/jee/ui/internal/navigator/web/AbstractWebGroupProvider.java b/plugins/org.eclipse.jst.jee.ui/src/org/eclipse/jst/jee/ui/internal/navigator/web/AbstractWebGroupProvider.java
deleted file mode 100644
index 16f020b..0000000
--- a/plugins/org.eclipse.jst.jee.ui/src/org/eclipse/jst/jee/ui/internal/navigator/web/AbstractWebGroupProvider.java
+++ /dev/null
@@ -1,12 +0,0 @@
-package org.eclipse.jst.jee.ui.internal.navigator.web;
-
-import org.eclipse.jst.javaee.core.JavaEEObject;
-import org.eclipse.jst.jee.ui.internal.navigator.AbstractGroupProvider;
-
-public abstract class AbstractWebGroupProvider extends AbstractGroupProvider {
-
- public AbstractWebGroupProvider(JavaEEObject javaee) {
- super(javaee);
- }
-
-}
diff --git a/plugins/org.eclipse.jst.jee.ui/src/org/eclipse/jst/jee/ui/internal/navigator/web/GroupContextParamsItemProvider.java b/plugins/org.eclipse.jst.jee.ui/src/org/eclipse/jst/jee/ui/internal/navigator/web/GroupContextParamsItemProvider.java
deleted file mode 100644
index 6a8aa77..0000000
--- a/plugins/org.eclipse.jst.jee.ui/src/org/eclipse/jst/jee/ui/internal/navigator/web/GroupContextParamsItemProvider.java
+++ /dev/null
@@ -1,65 +0,0 @@
-/***********************************************************************
- * Copyright (c) 2008 by SAP AG, Walldorf.
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
- *
- * Contributors:
- * SAP AG - initial API and implementation
- ***********************************************************************/
-package org.eclipse.jst.jee.ui.internal.navigator.web;
-
-import java.net.URL;
-import java.util.List;
-
-import org.eclipse.jface.resource.ImageDescriptor;
-import org.eclipse.jst.j2ee.internal.plugin.J2EEPlugin;
-import org.eclipse.jst.javaee.web.WebApp;
-import org.eclipse.jst.jee.ui.internal.Messages;
-import org.eclipse.jst.jee.ui.plugin.JEEUIPluginIcons;
-import org.eclipse.swt.graphics.Image;
-
-/**
- * Context Parameters group in Deployment Descriptor node.
- *
- * @author Dimitar Giormov
- *
- */
-public class GroupContextParamsItemProvider extends AbstractWebGroupProvider{
-
- private static Image CONTEXT_PARAM_IMAGE;
-
- public GroupContextParamsItemProvider(WebApp webApp) {
- super(webApp);
- text = Messages.CONTEXT_PARAMS_ITEM_PROVIDER;
- }
-
- @Override
- public List getChildren() {
- if (javaee != null){
- return ((WebApp) javaee).getContextParams();
- }
- return null;
- }
-
- @Override
- public Image getImage() {
- return getContextParamsImage();
- }
-
- @Override
- public boolean hasChildren() {
- return !getChildren().isEmpty();
- }
-
- public static Image getContextParamsImage() {
- if (CONTEXT_PARAM_IMAGE == null) {
- URL url = (URL) J2EEPlugin.getPlugin().getImage(JEEUIPluginIcons.GROUP_CONTEXT_PARAM);
- ImageDescriptor imageDescriptor = ImageDescriptor.createFromURL(url);
- CONTEXT_PARAM_IMAGE = imageDescriptor.createImage();
- }
- return CONTEXT_PARAM_IMAGE;
- }
-
-}
diff --git a/plugins/org.eclipse.jst.jee.ui/src/org/eclipse/jst/jee/ui/internal/navigator/web/GroupErrorPagesItemProvider.java b/plugins/org.eclipse.jst.jee.ui/src/org/eclipse/jst/jee/ui/internal/navigator/web/GroupErrorPagesItemProvider.java
deleted file mode 100644
index fd504a5..0000000
--- a/plugins/org.eclipse.jst.jee.ui/src/org/eclipse/jst/jee/ui/internal/navigator/web/GroupErrorPagesItemProvider.java
+++ /dev/null
@@ -1,79 +0,0 @@
-/***********************************************************************
- * Copyright (c) 2008 by SAP AG, Walldorf.
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
- *
- * Contributors:
- * SAP AG - initial API and implementation
- ***********************************************************************/
-package org.eclipse.jst.jee.ui.internal.navigator.web;
-
-import java.net.URL;
-import java.util.List;
-
-import org.eclipse.jface.resource.ImageDescriptor;
-import org.eclipse.jst.j2ee.internal.plugin.J2EEPlugin;
-import org.eclipse.jst.javaee.web.ErrorPage;
-import org.eclipse.jst.javaee.web.WebApp;
-import org.eclipse.jst.jee.ui.internal.Messages;
-import org.eclipse.jst.jee.ui.plugin.JEEUIPluginIcons;
-import org.eclipse.swt.graphics.Image;
-
-/**
- * Error pages group in Deployment Descriptor node.
- *
- * @author Dimitar Giormov
- *
- */
-public class GroupErrorPagesItemProvider extends AbstractWebGroupProvider{
-
- private static Image ERROR_PAGES;
- private static Image EXCEPTION_ERROR_PAGES;
-
- public GroupErrorPagesItemProvider(WebApp webApp) {
- super(webApp);
- text = Messages.ERROR_PAGES_ITEM_PROVIDER;
- }
-
- @Override
- public List getChildren() {
- if (javaee != null){
- return ((WebApp) javaee).getErrorPages();
- }
- return null;
- }
-
- @Override
- public Image getImage() {
- return getErrorPagesImage();
- }
-
- @Override
- public boolean hasChildren() {
- return !getChildren().isEmpty();
- }
-
- public static Image getErrorPagesImage() {
- if (ERROR_PAGES == null) {
- URL url = (URL) J2EEPlugin.getPlugin().getImage(JEEUIPluginIcons.GROUP_ERROR_PAGE);
- ImageDescriptor imageDescriptor = ImageDescriptor.createFromURL(url);
- ERROR_PAGES = imageDescriptor.createImage();
- }
- return ERROR_PAGES;
- }
-
- public static Image getErrorPagesImage(ErrorPage element) {
- if (element.getErrorCode() != null){
-
- }
- if (EXCEPTION_ERROR_PAGES == null) {
- URL url = (URL) J2EEPlugin.getPlugin().getImage(JEEUIPluginIcons.GROUP_ERROR_PAGE);
- ImageDescriptor imageDescriptor = ImageDescriptor.createFromURL(url);
- EXCEPTION_ERROR_PAGES = imageDescriptor.createImage();
- }
- return EXCEPTION_ERROR_PAGES;
- }
-
-}
diff --git a/plugins/org.eclipse.jst.jee.ui/src/org/eclipse/jst/jee/ui/internal/navigator/web/GroupFilterMappingItemProvider.java b/plugins/org.eclipse.jst.jee.ui/src/org/eclipse/jst/jee/ui/internal/navigator/web/GroupFilterMappingItemProvider.java
deleted file mode 100644
index 7354f10..0000000
--- a/plugins/org.eclipse.jst.jee.ui/src/org/eclipse/jst/jee/ui/internal/navigator/web/GroupFilterMappingItemProvider.java
+++ /dev/null
@@ -1,112 +0,0 @@
-/***********************************************************************
- * Copyright (c) 2008 by SAP AG, Walldorf.
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
- *
- * Contributors:
- * SAP AG - initial API and implementation
- ***********************************************************************/
-package org.eclipse.jst.jee.ui.internal.navigator.web;
-
-import java.net.URL;
-import java.util.ArrayList;
-import java.util.List;
-
-import org.eclipse.jface.resource.ImageDescriptor;
-import org.eclipse.jst.j2ee.internal.plugin.J2EEPlugin;
-import org.eclipse.jst.javaee.core.UrlPatternType;
-import org.eclipse.jst.javaee.web.FilterMapping;
-import org.eclipse.jst.javaee.web.WebApp;
-import org.eclipse.jst.jee.ui.internal.Messages;
-import org.eclipse.jst.jee.ui.plugin.JEEUIPluginIcons;
-import org.eclipse.swt.graphics.Image;
-
-/**
- * Filter mappings group in Deployment Descriptor node.
- *
- * @author Dimitar Giormov
- *
- */
-public class GroupFilterMappingItemProvider extends AbstractWebGroupProvider {
-
- private static Image FILTER_MAPPING;
-
- public GroupFilterMappingItemProvider(WebApp webApp) {
- super(webApp);
- text = Messages.FILTER_MAPPING_ITEM_PROVIDER;
- }
-
- @Override
- public List<?> getChildren() {
- if (javaee != null){
- return flattenMapping(((WebApp) javaee).getFilterMappings());
- }
- return null;
- }
-
- private List<?> flattenMapping(List<FilterMapping> filterMappings) {
- List<FilterMappingUIWrapper> result = new ArrayList<FilterMappingUIWrapper>();
- if (filterMappings != null && filterMappings.size() > 0){
- for (FilterMapping filterMapping : filterMappings) {
- result.addAll(getFilterMappingDisplay(filterMapping));
- }
- }
- return result;
- }
-
- @Override
- public Image getImage() {
- return getFilterMappingImage();
- }
-
- @Override
- public boolean hasChildren() {
- return !getChildren().isEmpty();
- }
-
- public static Image getFilterMappingImage() {
- if (FILTER_MAPPING == null) {
- URL url = (URL) J2EEPlugin.getPlugin().getImage(JEEUIPluginIcons.GROUP_FILTER_MAPPING);
- ImageDescriptor imageDescriptor = ImageDescriptor.createFromURL(url);
- FILTER_MAPPING = imageDescriptor.createImage();
- }
- return FILTER_MAPPING;
- }
-
- private List<FilterMappingUIWrapper> getFilterMappingDisplay(FilterMapping element) {
- List<FilterMappingUIWrapper> result = new ArrayList<FilterMappingUIWrapper>();
- String value = null;
- if (element.getUrlPatterns().size() > 0){
- for (UrlPatternType pattern : element.getUrlPatterns()) {
- value = pattern.getValue();
- result.add(new FilterMappingUIWrapper(value + " -> " + element.getFilterName())); //$NON-NLS-1$
- }
-
- }
- if (element.getServletNames() != null && element.getServletNames().size() > 0){
- for (String pattern : element.getServletNames()) {
- value = pattern;
- result.add(new FilterMappingUIWrapper(value + " -> " + element.getFilterName())); //$NON-NLS-1$
- }
-
- }
- return result;
- }
-
- public class FilterMappingUIWrapper {
- private String value;
-
- public String getValue() {
- return value;
- }
-
- public FilterMappingUIWrapper(String value) {
- super();
- this.value = value;
- }
- }
-
-
-}
diff --git a/plugins/org.eclipse.jst.jee.ui/src/org/eclipse/jst/jee/ui/internal/navigator/web/GroupFiltersItemProvider.java b/plugins/org.eclipse.jst.jee.ui/src/org/eclipse/jst/jee/ui/internal/navigator/web/GroupFiltersItemProvider.java
deleted file mode 100644
index 20f107c..0000000
--- a/plugins/org.eclipse.jst.jee.ui/src/org/eclipse/jst/jee/ui/internal/navigator/web/GroupFiltersItemProvider.java
+++ /dev/null
@@ -1,66 +0,0 @@
-/***********************************************************************
- * Copyright (c) 2008 by SAP AG, Walldorf.
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
- *
- * Contributors:
- * SAP AG - initial API and implementation
- ***********************************************************************/
-package org.eclipse.jst.jee.ui.internal.navigator.web;
-
-import java.net.URL;
-import java.util.List;
-
-import org.eclipse.jface.resource.ImageDescriptor;
-import org.eclipse.jst.j2ee.internal.plugin.J2EEPlugin;
-import org.eclipse.jst.javaee.web.WebApp;
-import org.eclipse.jst.jee.ui.internal.Messages;
-import org.eclipse.jst.jee.ui.plugin.JEEUIPluginIcons;
-import org.eclipse.swt.graphics.Image;
-
-/**
- * Filters group in Deployment Descriptor node.
- *
- * @author Dimitar Giormov
- *
- */
-public class GroupFiltersItemProvider extends AbstractWebGroupProvider{
-
- private static Image FILTER;
-
- public GroupFiltersItemProvider(WebApp webApp) {
- super(webApp);
- text = Messages.FILTERS_ITEM_PROVIDER;
- }
-
- @Override
- public List getChildren() {
- if (javaee != null){
- return ((WebApp) javaee).getFilters();
- }
- return null;
- }
-
- @Override
- public Image getImage() {
- return getFiltersImage();
- }
-
- @Override
- public boolean hasChildren() {
- return !getChildren().isEmpty();
- }
-
- public static Image getFiltersImage() {
- if (FILTER == null) {
- URL url = (URL) J2EEPlugin.getPlugin().getImage(JEEUIPluginIcons.FILTER_MAPPING);
- ImageDescriptor imageDescriptor = ImageDescriptor.createFromURL(url);
- FILTER = imageDescriptor.createImage();
- }
- return FILTER;
- }
-
-
-}
diff --git a/plugins/org.eclipse.jst.jee.ui/src/org/eclipse/jst/jee/ui/internal/navigator/web/GroupListenerItemProvider.java b/plugins/org.eclipse.jst.jee.ui/src/org/eclipse/jst/jee/ui/internal/navigator/web/GroupListenerItemProvider.java
deleted file mode 100644
index d99360e..0000000
--- a/plugins/org.eclipse.jst.jee.ui/src/org/eclipse/jst/jee/ui/internal/navigator/web/GroupListenerItemProvider.java
+++ /dev/null
@@ -1,66 +0,0 @@
-/***********************************************************************
- * Copyright (c) 2008 by SAP AG, Walldorf.
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
- *
- * Contributors:
- * SAP AG - initial API and implementation
- ***********************************************************************/
-package org.eclipse.jst.jee.ui.internal.navigator.web;
-
-import java.net.URL;
-import java.util.List;
-
-import org.eclipse.jface.resource.ImageDescriptor;
-import org.eclipse.jst.j2ee.internal.plugin.J2EEPlugin;
-import org.eclipse.jst.javaee.web.WebApp;
-import org.eclipse.jst.jee.ui.internal.Messages;
-import org.eclipse.jst.jee.ui.plugin.JEEUIPluginIcons;
-import org.eclipse.swt.graphics.Image;
-
-/**
- * Listener group in Deployment Descriptor node.
- *
- * @author Dimitar Giormov
- *
- */
-public class GroupListenerItemProvider extends AbstractWebGroupProvider{
-
- private static Image LISTENER;
-
- public GroupListenerItemProvider(WebApp webApp) {
- super(webApp);
- text = Messages.LISTENER_ITEM_PROVIDER;
- }
-
- @Override
- public List getChildren() {
- if (javaee != null){
- return ((WebApp) javaee).getListeners();
- }
- return null;
- }
-
- @Override
- public Image getImage() {
- return getListenersImage();
- }
-
- @Override
- public boolean hasChildren() {
- return !getChildren().isEmpty();
- }
-
- public static Image getListenersImage() {
- if (LISTENER == null) {
- URL url = (URL) J2EEPlugin.getPlugin().getImage(JEEUIPluginIcons.GROUP_LISTENER);
- ImageDescriptor imageDescriptor = ImageDescriptor.createFromURL(url);
- LISTENER = imageDescriptor.createImage();
- }
- return LISTENER;
- }
-
-
-}
diff --git a/plugins/org.eclipse.jst.jee.ui/src/org/eclipse/jst/jee/ui/internal/navigator/web/GroupReferenceItemProvider.java b/plugins/org.eclipse.jst.jee.ui/src/org/eclipse/jst/jee/ui/internal/navigator/web/GroupReferenceItemProvider.java
deleted file mode 100644
index 103add5..0000000
--- a/plugins/org.eclipse.jst.jee.ui/src/org/eclipse/jst/jee/ui/internal/navigator/web/GroupReferenceItemProvider.java
+++ /dev/null
@@ -1,79 +0,0 @@
-/***********************************************************************
- * Copyright (c) 2008 by SAP AG, Walldorf.
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
- *
- * Contributors:
- * SAP AG - initial API and implementation
- ***********************************************************************/
-package org.eclipse.jst.jee.ui.internal.navigator.web;
-
-import java.net.URL;
-import java.util.ArrayList;
-import java.util.List;
-
-import org.eclipse.jface.resource.ImageDescriptor;
-import org.eclipse.jst.j2ee.internal.plugin.J2EEPlugin;
-import org.eclipse.jst.javaee.web.WebApp;
-import org.eclipse.jst.jee.ui.internal.Messages;
-import org.eclipse.jst.jee.ui.plugin.JEEUIPluginIcons;
-import org.eclipse.swt.graphics.Image;
-
-/**
- * JNDI References group in Deployment Descriptor node.
- *
- * @author Dimitar Giormov
- *
- */
-public class GroupReferenceItemProvider extends AbstractWebGroupProvider{
-
- private static Image REFERENCES;
-
- public GroupReferenceItemProvider(WebApp webApp) {
- super(webApp);
- text = Messages.REFERENCES;
- }
-
-
- @Override
- public List getChildren() {
- List result = new ArrayList();
- if (javaee != null){
- result.addAll(((WebApp) javaee).getEjbRefs());
- result.addAll(((WebApp) javaee).getEjbLocalRefs());
- result.addAll(((WebApp) javaee).getResourceRefs());
- result.addAll(((WebApp) javaee).getResourceEnvRefs());
- result.addAll(((WebApp) javaee).getEnvEntries());
- result.addAll(((WebApp) javaee).getMessageDestinationRefs());
- result.addAll(((WebApp) javaee).getPersistenceContextRefs());
- result.addAll(((WebApp) javaee).getPersistenceUnitRefs());
- result.addAll(((WebApp) javaee).getServiceRefs());
- return result;
- }
- return null;
- }
-
- @Override
- public boolean hasChildren() {
- return !getChildren().isEmpty();
- }
-
-
- @Override
- public Image getImage() {
- return getReferencesImage();
- }
-
-
- public static Image getReferencesImage() {
- if (REFERENCES == null) {
- URL url = (URL) J2EEPlugin.getPlugin().getImage(JEEUIPluginIcons.RESOURCE_REFERENCE_OBJ);
- ImageDescriptor imageDescriptor = ImageDescriptor.createFromURL(url);
- REFERENCES = imageDescriptor.createImage();
- }
- return REFERENCES;
- }
-
-}
diff --git a/plugins/org.eclipse.jst.jee.ui/src/org/eclipse/jst/jee/ui/internal/navigator/web/GroupServletItemProvider.java b/plugins/org.eclipse.jst.jee.ui/src/org/eclipse/jst/jee/ui/internal/navigator/web/GroupServletItemProvider.java
deleted file mode 100644
index b737d31..0000000
--- a/plugins/org.eclipse.jst.jee.ui/src/org/eclipse/jst/jee/ui/internal/navigator/web/GroupServletItemProvider.java
+++ /dev/null
@@ -1,68 +0,0 @@
-/***********************************************************************
- * Copyright (c) 2008 by SAP AG, Walldorf.
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
- *
- * Contributors:
- * SAP AG - initial API and implementation
- ***********************************************************************/
-package org.eclipse.jst.jee.ui.internal.navigator.web;
-
-import java.net.URL;
-import java.util.List;
-
-import org.eclipse.jface.resource.ImageDescriptor;
-import org.eclipse.jst.j2ee.internal.plugin.J2EEPlugin;
-import org.eclipse.jst.javaee.web.WebApp;
-import org.eclipse.jst.jee.ui.internal.Messages;
-import org.eclipse.jst.jee.ui.plugin.JEEUIPluginIcons;
-import org.eclipse.swt.graphics.Image;
-
-/**
- * Servlets group in Deployment Descriptor node.
- *
- * @author Dimitar Giormov
- *
- */
-public class GroupServletItemProvider extends AbstractWebGroupProvider{
-
- private static Image SERVLET;
-
- public GroupServletItemProvider(WebApp webApp) {
- super(webApp);
- text = Messages.SERVLET_ITEM_PROVIDER;
- }
-
-
- @Override
- public List getChildren() {
- if (javaee != null){
- return ((WebApp) javaee).getServlets();
- }
- return null;
- }
-
- @Override
- public boolean hasChildren() {
- return !getChildren().isEmpty();
- }
-
-
- @Override
- public Image getImage() {
- return getServletImage();
- }
-
-
- public static Image getServletImage() {
- if (SERVLET == null) {
- URL url = (URL) J2EEPlugin.getPlugin().getImage(JEEUIPluginIcons.GROUP_SERVLET);
- ImageDescriptor imageDescriptor = ImageDescriptor.createFromURL(url);
- SERVLET = imageDescriptor.createImage();
- }
- return SERVLET;
- }
-
-}
diff --git a/plugins/org.eclipse.jst.jee.ui/src/org/eclipse/jst/jee/ui/internal/navigator/web/GroupServletMappingItemProvider.java b/plugins/org.eclipse.jst.jee.ui/src/org/eclipse/jst/jee/ui/internal/navigator/web/GroupServletMappingItemProvider.java
deleted file mode 100644
index 66d5af5..0000000
--- a/plugins/org.eclipse.jst.jee.ui/src/org/eclipse/jst/jee/ui/internal/navigator/web/GroupServletMappingItemProvider.java
+++ /dev/null
@@ -1,106 +0,0 @@
-/***********************************************************************
- * Copyright (c) 2008 by SAP AG, Walldorf.
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
- *
- * Contributors:
- * SAP AG - initial API and implementation
- ***********************************************************************/
-package org.eclipse.jst.jee.ui.internal.navigator.web;
-
-import java.net.URL;
-import java.util.ArrayList;
-import java.util.List;
-
-import org.eclipse.jface.resource.ImageDescriptor;
-import org.eclipse.jst.j2ee.internal.plugin.J2EEPlugin;
-import org.eclipse.jst.javaee.core.UrlPatternType;
-import org.eclipse.jst.javaee.web.ServletMapping;
-import org.eclipse.jst.javaee.web.WebApp;
-import org.eclipse.jst.jee.ui.internal.Messages;
-import org.eclipse.jst.jee.ui.plugin.JEEUIPluginIcons;
-import org.eclipse.swt.graphics.Image;
-
-/**
- * Servlet Mappings group in Deployment Descriptor node.
- *
- * @author Dimitar Giormov
- *
- */
-public class GroupServletMappingItemProvider extends AbstractWebGroupProvider{
-
- private static Image SERVLETMAPPING;
-
- public GroupServletMappingItemProvider(WebApp webApp) {
- super(webApp);
- text = Messages.SERVLET_MAPPING_ITEM_PROVIDER;
- }
-
- @Override
- public List getChildren() {
- if (javaee != null){
- return flattenMapping(((WebApp) javaee).getServletMappings());
- }
- return null;
- }
-
- @Override
- public Image getImage() {
- return getServletMappingImage();
- }
-
- @Override
- public boolean hasChildren() {
- return !getChildren().isEmpty();
- }
-
- public static Image getServletMappingImage() {
- if (SERVLETMAPPING == null) {
- URL url = (URL) J2EEPlugin.getPlugin().getImage(JEEUIPluginIcons.SERVLET_MAPPING);
- ImageDescriptor imageDescriptor = ImageDescriptor.createFromURL(url);
- SERVLETMAPPING = imageDescriptor.createImage();
- }
- return SERVLETMAPPING;
- }
-
- private List<?> flattenMapping(List<ServletMapping> servletMappings) {
- List<ServletMappingUIWrapper> result = new ArrayList<ServletMappingUIWrapper>();
- if (servletMappings != null && servletMappings.size() > 0){
- for (ServletMapping filterMapping : servletMappings) {
- result.addAll(getServletMappingDisplay(filterMapping));
- }
- }
- return result;
- }
-
-
- private List<ServletMappingUIWrapper> getServletMappingDisplay(ServletMapping element) {
- List<ServletMappingUIWrapper> result = new ArrayList<ServletMappingUIWrapper>();
- String value = null;
- if (element.getUrlPatterns().size() > 0){
- for (UrlPatternType pattern : element.getUrlPatterns()) {
- value = pattern.getValue();
- result.add(new ServletMappingUIWrapper(value + " -> " + element.getServletName())); //$NON-NLS-1$
- }
-
- }
- return result;
- }
-
- public class ServletMappingUIWrapper{
- private String value;
-
- public String getValue() {
- return value;
- }
-
- public ServletMappingUIWrapper(String value) {
- super();
- this.value = value;
- }
- }
-
-
-}
diff --git a/plugins/org.eclipse.jst.jee.ui/src/org/eclipse/jst/jee/ui/internal/navigator/web/GroupWelcomePagesItemProvider.java b/plugins/org.eclipse.jst.jee.ui/src/org/eclipse/jst/jee/ui/internal/navigator/web/GroupWelcomePagesItemProvider.java
deleted file mode 100644
index da8bfac..0000000
--- a/plugins/org.eclipse.jst.jee.ui/src/org/eclipse/jst/jee/ui/internal/navigator/web/GroupWelcomePagesItemProvider.java
+++ /dev/null
@@ -1,95 +0,0 @@
-/***********************************************************************
- * Copyright (c) 2008 by SAP AG, Walldorf.
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
- *
- * Contributors:
- * SAP AG - initial API and implementation
- ***********************************************************************/
-package org.eclipse.jst.jee.ui.internal.navigator.web;
-
-import java.net.URL;
-import java.util.ArrayList;
-import java.util.List;
-
-import org.eclipse.jface.resource.ImageDescriptor;
-import org.eclipse.jst.j2ee.internal.plugin.J2EEPlugin;
-import org.eclipse.jst.javaee.web.WebApp;
-import org.eclipse.jst.javaee.web.WelcomeFileList;
-import org.eclipse.jst.jee.ui.internal.Messages;
-import org.eclipse.jst.jee.ui.plugin.JEEUIPluginIcons;
-import org.eclipse.swt.graphics.Image;
-
-/**
- * Welcome pages group in Deployment Descriptor node.
- *
- * @author Dimitar Giormov
- *
- */
-public class GroupWelcomePagesItemProvider extends AbstractWebGroupProvider{
-
- private static Image WELCOME_PAGES;
-
- private static Image WELCOME_PAGE;
-
- public GroupWelcomePagesItemProvider(WebApp webApp) {
- super(webApp);
- text = Messages.WELCOME_PAGES_ITEM_PROVIDER;
- }
-
- @Override
- public List getChildren() {
-// if (children != null){
-// return children;
-// }
- children.clear();
- if (javaee != null){
- List welcomeFileLists = ((WebApp) javaee).getWelcomeFileLists();
- if (welcomeFileLists.size()>0){
- children = new ArrayList();
- for (Object object : welcomeFileLists) {
- List welcomeFiles = ((WelcomeFileList)object).getWelcomeFiles();
- for (Object object2 : welcomeFiles) {
- if(object2 != null && !"".equals( ((String)object2).trim())){ //$NON-NLS-1$
- children.add(new WebArtifactNode((WebApp)javaee, (String) object2, getWelcomePageImage()));
- }
- }
- }
- return children;
- }
- return null;
- }
- return null;
- }
-
- @Override
- public Image getImage() {
- return getWelcomePagesImage();
- }
-
- @Override
- public boolean hasChildren() {
- List children2 = getChildren();
- return children2 != null && !children2.isEmpty();
- }
-
- public static Image getWelcomePagesImage() {
- if (WELCOME_PAGES == null) {
- URL url = (URL) J2EEPlugin.getPlugin().getImage(JEEUIPluginIcons.GROUP_WELCOME_PAGES);
- ImageDescriptor imageDescriptor = ImageDescriptor.createFromURL(url);
- WELCOME_PAGES = imageDescriptor.createImage();
- }
- return WELCOME_PAGES;
- }
-
- public static Image getWelcomePageImage() {
- if (WELCOME_PAGE == null) {
- URL url = (URL) J2EEPlugin.getPlugin().getImage(JEEUIPluginIcons.GROUP_WELCOME_PAGE);
- ImageDescriptor imageDescriptor = ImageDescriptor.createFromURL(url);
- WELCOME_PAGE = imageDescriptor.createImage();
- }
- return WELCOME_PAGE;
- }
-}
diff --git a/plugins/org.eclipse.jst.jee.ui/src/org/eclipse/jst/jee/ui/internal/navigator/web/WebAppProvider.java b/plugins/org.eclipse.jst.jee.ui/src/org/eclipse/jst/jee/ui/internal/navigator/web/WebAppProvider.java
deleted file mode 100644
index 72af775..0000000
--- a/plugins/org.eclipse.jst.jee.ui/src/org/eclipse/jst/jee/ui/internal/navigator/web/WebAppProvider.java
+++ /dev/null
@@ -1,147 +0,0 @@
-/***********************************************************************
- * Copyright (c) 2008, 2010 by SAP AG, Walldorf.
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
- *
- * Contributors:
- * SAP AG - initial API and implementation
- ***********************************************************************/
-package org.eclipse.jst.jee.ui.internal.navigator.web;
-
-import java.util.ArrayList;
-import java.util.List;
-
-import org.eclipse.core.resources.IFile;
-import org.eclipse.core.resources.IProject;
-import org.eclipse.core.runtime.IAdaptable;
-import org.eclipse.jst.j2ee.internal.J2EEVersionConstants;
-import org.eclipse.jst.javaee.core.JavaEEObject;
-import org.eclipse.jst.javaee.web.WebApp;
-import org.eclipse.jst.jee.ui.internal.Messages;
-import org.eclipse.jst.jee.ui.internal.navigator.AbstractGroupProvider;
-import org.eclipse.jst.jee.ui.plugin.JEEUIPlugin;
-import org.eclipse.jst.jee.ui.plugin.JEEUIPluginIcons;
-import org.eclipse.osgi.util.NLS;
-import org.eclipse.swt.graphics.Image;
-import org.eclipse.wst.common.componentcore.ComponentCore;
-import org.eclipse.wst.common.componentcore.resources.IVirtualFolder;
-
-/**
- * Content and Label Provider helper class for WebApp element.
- *
- * @author Dimitar Giormov
- * @author Kaloyan Raev
- */
-public class WebAppProvider extends AbstractWebGroupProvider implements IAdaptable {
-
- private static final String PROJECT_RELATIVE_PATH = "WEB-INF/web.xml"; //$NON-NLS-1$
-
- private GroupErrorPagesItemProvider errors;
- private GroupServletItemProvider servlets;
- private GroupFiltersItemProvider filters;
- private GroupListenerItemProvider listeners;
- private GroupServletMappingItemProvider servletMapping;
- private GroupFilterMappingItemProvider filterMapping;
- private GroupReferenceItemProvider references;
- private GroupWelcomePagesItemProvider welcome;
- private GroupContextParamsItemProvider contextParams;
-
- private List<Object> children = new ArrayList<Object>();
-
- private String text;
-
- private Image web25Image;
- private Image web30Image;
-
- private IProject prjct = null;
- private IFile ddFile = null;
-
- public WebAppProvider(WebApp webApp, IProject project) {
- super(webApp);
- text = NLS.bind(Messages.DEPLOYMENT_DESCRIPTOR, project.getName());
- contextParams = new GroupContextParamsItemProvider(webApp);
- errors = new GroupErrorPagesItemProvider(webApp);
- servlets = new GroupServletItemProvider(webApp);
- servletMapping = new GroupServletMappingItemProvider(webApp);
- filters = new GroupFiltersItemProvider(webApp);
- filterMapping = new GroupFilterMappingItemProvider(webApp);
- listeners = new GroupListenerItemProvider(webApp);
- references = new GroupReferenceItemProvider(webApp);
- welcome = new GroupWelcomePagesItemProvider(webApp);
- children.add(contextParams);
- children.add(errors);
- children.add(servlets);
- children.add(filters);
- children.add(listeners);
- children.add(servletMapping);
- children.add(filterMapping);
- children.add(references);
- children.add(welcome);
- prjct = project;
- }
-
- @Override
- public List getChildren(){
- return children;
- }
-
- @Override
- public String getText(){
- return text;
- }
-
- @Override
- public Image getImage() {
- String version = ((WebApp) javaee).getVersion().getLiteral();
- if (J2EEVersionConstants.VERSION_2_5_TEXT.equals(version)) {
- return getWeb25Image();
- } else if (J2EEVersionConstants.VERSION_3_0_TEXT.equals(version)) {
- return getWeb30Image();
- }
- return getWeb25Image();
- }
-
- public IProject getProject(){
- return prjct;
- }
-
- public IFile getDDFile() {
- if (ddFile != null){
- return ddFile;
- }
-
- IVirtualFolder virtualFolder = ComponentCore.createComponent(getProject()).getRootFolder();
- return virtualFolder.getFile(PROJECT_RELATIVE_PATH).getUnderlyingFile();
- }
-
- @Override
- public void reinit(JavaEEObject modelObject) {
- super.reinit(modelObject);
- for (Object child : children) {
- ((AbstractGroupProvider)child).reinit(modelObject);
- }
- }
-
- public Object getAdapter(Class adapter) {
- if (IProject.class == adapter){
- return getProject();
- }
- return null;
- }
-
- private Image getWeb25Image() {
- if (web25Image == null) {
- web25Image = JEEUIPlugin.getDefault().getImageDescriptor(JEEUIPluginIcons.IMG_WEBEEMODEL).createImage();
- }
- return web25Image;
- }
-
- private Image getWeb30Image() {
- if (web30Image == null) {
- web30Image = JEEUIPlugin.getDefault().getImageDescriptor(JEEUIPluginIcons.IMG_WEBEE6MODEL).createImage();
- }
- return web30Image;
- }
-}
diff --git a/plugins/org.eclipse.jst.jee.ui/src/org/eclipse/jst/jee/ui/internal/navigator/web/WebArtifactNode.java b/plugins/org.eclipse.jst.jee.ui/src/org/eclipse/jst/jee/ui/internal/navigator/web/WebArtifactNode.java
deleted file mode 100644
index c95c779..0000000
--- a/plugins/org.eclipse.jst.jee.ui/src/org/eclipse/jst/jee/ui/internal/navigator/web/WebArtifactNode.java
+++ /dev/null
@@ -1,50 +0,0 @@
-/***********************************************************************
- * Copyright (c) 2008 by SAP AG, Walldorf.
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
- *
- * Contributors:
- * SAP AG - initial API and implementation
- ***********************************************************************/
-package org.eclipse.jst.jee.ui.internal.navigator.web;
-
-import org.eclipse.jst.javaee.core.JavaEEObject;
-import org.eclipse.swt.graphics.Image;
-
-/**
- *
- * Wrapper node for representing string values of the model in Deployment descriptor tree.
- * (e.g. Welcome Files)
- *
- * @author Dimitar Giormov
- *
- */
-public class WebArtifactNode implements JavaEEObject{
-
- private Image image;
- private String text;
- private JavaEEObject javaee;
-
- public WebArtifactNode(JavaEEObject javaee, String text, Image image) {
- super();
- this.javaee = javaee;
- this.text = text;
- this.image = image;
- }
-
-
- public Image getImage() {
- return image;
- }
-
- public String getText() {
- return text;
- }
-
- public JavaEEObject getJavaEEObject() {
- return javaee;
- }
-
-}
diff --git a/plugins/org.eclipse.jst.jee.ui/src/org/eclipse/jst/jee/ui/plugin/JEEUIPlugin.java b/plugins/org.eclipse.jst.jee.ui/src/org/eclipse/jst/jee/ui/plugin/JEEUIPlugin.java
deleted file mode 100644
index 91d30e2..0000000
--- a/plugins/org.eclipse.jst.jee.ui/src/org/eclipse/jst/jee/ui/plugin/JEEUIPlugin.java
+++ /dev/null
@@ -1,152 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2005, 2007 IBM Corporation and others.
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
- *
- * Contributors:
- * IBM Corporation - initial API and implementation
- *******************************************************************************/
-package org.eclipse.jst.jee.ui.plugin;
-
-import java.net.URL;
-
-import org.eclipse.core.runtime.CoreException;
-import org.eclipse.core.runtime.IStatus;
-import org.eclipse.core.runtime.Platform;
-import org.eclipse.core.runtime.Status;
-import org.eclipse.jface.resource.ImageDescriptor;
-import org.eclipse.jst.j2ee.internal.plugin.J2EEPlugin;
-import org.eclipse.swt.graphics.Image;
-import org.eclipse.ui.plugin.AbstractUIPlugin;
-import org.osgi.framework.BundleContext;
-
-/**
- * The activator class controls the plug-in life cycle
- */
-public class JEEUIPlugin extends AbstractUIPlugin {
-
- // The plug-in ID
- public static final String PLUGIN_ID = "org.eclipse.jst.jee.ui"; //$NON-NLS-1$
-
- // The shared instance
- private static JEEUIPlugin plugin;
-
- /**
- * The constructor
- */
- public JEEUIPlugin() {
- }
-
- /*
- * (non-Javadoc)
- * @see org.eclipse.ui.plugin.AbstractUIPlugin#start(org.osgi.framework.BundleContext)
- */
- @Override
- public void start(BundleContext context) throws Exception {
- super.start(context);
- plugin = this;
- }
-
- /*
- * (non-Javadoc)
- * @see org.eclipse.ui.plugin.AbstractUIPlugin#stop(org.osgi.framework.BundleContext)
- */
- @Override
- public void stop(BundleContext context) throws Exception {
- plugin = null;
- super.stop(context);
- }
-
- /**
- * Returns the shared instance
- *
- * @return the shared instance
- */
- public static JEEUIPlugin getDefault() {
- return plugin;
- }
-
- /**
- * This gets a .gif from the icons folder.
- */
- public ImageDescriptor getImageDescriptor(String key) {
- ImageDescriptor imageDescriptor = null;
- URL gifImageURL = getImageURL(key);
- if (gifImageURL != null)
- imageDescriptor = ImageDescriptor.createFromURL(gifImageURL);
- return imageDescriptor;
- }
-
- /**
- * @param key
- * @return
- */
- private URL getImageURL(String key) {
- return J2EEPlugin.getImageURL(key, getBundle());
- }
-
- /**
- *
- * Record a message against this plugin's log.
- *
- * @param severity
- * @param aCode
- * @param aMessage
- * @param exception
- */
- public static void log(int severity, int aCode, String aMessage,
- Throwable exception) {
- log(createStatus(severity, aCode, aMessage, exception));
- }
-
- /**
- * Create a status associated with this plugin.
- *
- * @param severity
- * @param aCode
- * @param aMessage
- * @param exception
- * @return A status configured with this plugin's id and the given parameters.
- */
- public static IStatus createStatus(int severity, int aCode,
- String aMessage, Throwable exception) {
- return new Status(severity, PLUGIN_ID, aCode,
- aMessage != null ? aMessage : "No message.", exception); //$NON-NLS-1$
- }
-
- /**
- *
- * Record a status against this plugin's log.
- *
- * @param aStatus
- */
- public static void log(IStatus aStatus) {
- getDefault().getLog().log(aStatus);
- }
-
- public static void logError(String message, Exception e) {
- log(IStatus.ERROR, IStatus.ERROR,message,e);
- }
-
- public static IStatus createStatus(int severity, String message, Throwable exception) {
- return new Status(severity, PLUGIN_ID, message, exception);
- }
-
- public static IStatus createStatus(int severity, String message) {
- return createStatus(severity, message, null);
- }
-
- public static void logError(Throwable exception) {
- Platform.getLog(Platform.getBundle(PLUGIN_ID)).log( createStatus(IStatus.ERROR, exception.getMessage(), exception));
- }
-
- public static void logError(CoreException exception) {
- Platform.getLog(Platform.getBundle(PLUGIN_ID)).log( exception.getStatus() );
- }
-
- public Image getImage(String key){
- return getImageDescriptor(key).createImage();
- }
-}
diff --git a/plugins/org.eclipse.jst.jee.ui/src/org/eclipse/jst/jee/ui/plugin/JEEUIPluginIcons.java b/plugins/org.eclipse.jst.jee.ui/src/org/eclipse/jst/jee/ui/plugin/JEEUIPluginIcons.java
deleted file mode 100644
index 40cbac1..0000000
--- a/plugins/org.eclipse.jst.jee.ui/src/org/eclipse/jst/jee/ui/plugin/JEEUIPluginIcons.java
+++ /dev/null
@@ -1,46 +0,0 @@
-/***********************************************************************
- * Copyright (c) 2008, 2010 by SAP AG, Walldorf.
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
- *
- * Contributors:
- * SAP AG - initial API and implementation
- ***********************************************************************/
-package org.eclipse.jst.jee.ui.plugin;
-
-public class JEEUIPluginIcons {
-
- public static String IMG_EJBEEMODEL = "30_ejbjar_obj"; //$NON-NLS-1$
- public static String IMG_EJBEE6MODEL = "31_ejbjar_obj"; //$NON-NLS-1$
- public static String IMG_WEBEEMODEL = "webapp_25"; //$NON-NLS-1$
- public static String IMG_WEBEE6MODEL = "webapp_30"; //$NON-NLS-1$
- public static String IMG_CONNECTOR = "connection"; //$NON-NLS-1$
- public static String IMG_CONFIG_PROP = "config_prop_obj"; //$NON-NLS-1$
- public static String IMG_LICENSE = "license_obj"; //$NON-NLS-1$
- public static String IMG_RESOURCE_ADAPTER = "resource_adapter_obj"; //$NON-NLS-1$
-
- public static String SERVLET_MAPPING = "webuiIcons/servlet_mapping"; //$NON-NLS-1$
- public static String FILTER_MAPPING = "webuiIcons/filter"; //$NON-NLS-1$
- public static String GROUP_FILTER_MAPPING = "webuiIcons/filter_mapping"; //$NON-NLS-1$
- public static String GROUP_LISTENER = "webuiIcons/listener"; //$NON-NLS-1$
- public static String GROUP_SERVLET = "webuiIcons/servlet"; //$NON-NLS-1$
- public static String GROUP_ERROR_PAGE = "webuiIcons/error_page"; //$NON-NLS-1$
- public static String GROUP_CONTEXT_PARAM = "webuiIcons/initializ_parameter_context"; //$NON-NLS-1$
- public static String GROUP_WELCOME_PAGES = "webuiIcons/welcome_list"; //$NON-NLS-1$
- public static String GROUP_WELCOME_PAGE = "webuiIcons/welcome_file"; //$NON-NLS-1$
- public static String RESOURCE_REFERENCE_OBJ = "resourceRef_obj"; //$NON-NLS-1$
-
- public static String BUSSINESS_LOCAL = "ovr/business_local_ovr"; //$NON-NLS-1$
- public static String BUSSINESS_REMOTE = "ovr/business_remote_ovr"; //$NON-NLS-1$
- public static String REMOTE = "ovr/remote_ovr"; //$NON-NLS-1$
- public static String REMOTE_HOME = "ovr/home_ovr"; //$NON-NLS-1$
- public static String LOCAL = "ovr/local_ovr"; //$NON-NLS-1$
- public static String LOCAL_HOME = "ovr/local_home_ovr"; //$NON-NLS-1$
- public static String EAR_IMAGE = "ear_50"; //$NON-NLS-1$
- public static String EAR6_IMAGE = "ear_60"; //$NON-NLS-1$
- public static String APP_CLIENT50 = "appclient_50"; //$NON-NLS-1$
- public static String APP_CLIENT60 = "appclient_60"; //$NON-NLS-1$
-
-}
diff --git a/plugins/org.eclipse.jst.jee.ui/src/org/eclipse/jst/jee/ui/project/facet/EarJavaEEFacetInstallPage.java b/plugins/org.eclipse.jst.jee.ui/src/org/eclipse/jst/jee/ui/project/facet/EarJavaEEFacetInstallPage.java
deleted file mode 100644
index a5249bb..0000000
--- a/plugins/org.eclipse.jst.jee.ui/src/org/eclipse/jst/jee/ui/project/facet/EarJavaEEFacetInstallPage.java
+++ /dev/null
@@ -1,22 +0,0 @@
-package org.eclipse.jst.jee.ui.project.facet;
-
-/***************************************************************************************************
- /***************************************************************************************************
- * Copyright (c) 2007 IBM Corporation and others. All rights reserved. This program and the
- * accompanying materials are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
- *
- * Contributors: IBM Corporation - initial API and implementation
- **************************************************************************************************/
-
-/**
- * @deprecated - For consistency with other FacetInstallPage classes this class should be removed. Please use {@link org.eclipse.jst.j2ee.ui.project.facet.EarFacetInstallPage}
- */
-public class EarJavaEEFacetInstallPage extends
- org.eclipse.jst.j2ee.ui.project.facet.EarFacetInstallPage {
-
- public EarJavaEEFacetInstallPage() {
- super();
- }
-}
diff --git a/plugins/org.eclipse.jst.jee.ui/src/org/eclipse/jst/jee/ui/project/facet/Messages.java b/plugins/org.eclipse.jst.jee.ui/src/org/eclipse/jst/jee/ui/project/facet/Messages.java
deleted file mode 100644
index 61ee08d..0000000
--- a/plugins/org.eclipse.jst.jee.ui/src/org/eclipse/jst/jee/ui/project/facet/Messages.java
+++ /dev/null
@@ -1,25 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2005, 2007 IBM Corporation and others.
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
- *
- * Contributors:
- * IBM Corporation - initial API and implementation
- *******************************************************************************/
-package org.eclipse.jst.jee.ui.project.facet;
-
-import org.eclipse.osgi.util.NLS;
-
-public class Messages extends NLS {
- private static final String BUNDLE_NAME = "org.eclipse.jst.jee.ui.project.facet.messages"; //$NON-NLS-1$
- public static String EarJavaEEFacetInstallPage_0;
- static {
- // initialize resource bundle
- NLS.initializeMessages(BUNDLE_NAME, Messages.class);
- }
-
- private Messages() {
- }
-}
diff --git a/plugins/org.eclipse.jst.jee.ui/src/org/eclipse/jst/jee/ui/project/facet/messages.properties b/plugins/org.eclipse.jst.jee.ui/src/org/eclipse/jst/jee/ui/project/facet/messages.properties
deleted file mode 100644
index 2383078..0000000
--- a/plugins/org.eclipse.jst.jee.ui/src/org/eclipse/jst/jee/ui/project/facet/messages.properties
+++ /dev/null
@@ -1,11 +0,0 @@
-###############################################################################
-# Copyright (c) 2005, 2007 IBM Corporation and others.
-# All rights reserved. This program and the accompanying materials
-# are made available under the terms of the Eclipse Public License v1.0
-# which accompanies this distribution, and is available at
-# http://www.eclipse.org/legal/epl-v10.html
-#
-# Contributors:
-# IBM Corporation - initial API and implementation
-###############################################################################
-EarJavaEEFacetInstallPage_0=Generate Deployment Descriptor
diff --git a/plugins/org.eclipse.jst.jee.web/.classpath b/plugins/org.eclipse.jst.jee.web/.classpath
deleted file mode 100644
index bdeb824..0000000
--- a/plugins/org.eclipse.jst.jee.web/.classpath
+++ /dev/null
@@ -1,7 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<classpath>
- <classpathentry kind="src" path="web"/>
- <classpathentry kind="con" path="org.eclipse.jdt.launching.JRE_CONTAINER/org.eclipse.jdt.internal.debug.ui.launcher.StandardVMType/J2SE-1.5"/>
- <classpathentry kind="con" path="org.eclipse.pde.core.requiredPlugins"/>
- <classpathentry kind="output" path="bin"/>
-</classpath>
diff --git a/plugins/org.eclipse.jst.jee.web/.cvsignore b/plugins/org.eclipse.jst.jee.web/.cvsignore
deleted file mode 100644
index ce1b279..0000000
--- a/plugins/org.eclipse.jst.jee.web/.cvsignore
+++ /dev/null
@@ -1,4 +0,0 @@
-javaCompiler...args
-build.xml
-temp.folder
-@dot
diff --git a/plugins/org.eclipse.jst.jee.web/.project b/plugins/org.eclipse.jst.jee.web/.project
deleted file mode 100644
index 58301af..0000000
--- a/plugins/org.eclipse.jst.jee.web/.project
+++ /dev/null
@@ -1,28 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<projectDescription>
- <name>org.eclipse.jst.jee.web</name>
- <comment></comment>
- <projects>
- </projects>
- <buildSpec>
- <buildCommand>
- <name>org.eclipse.jdt.core.javabuilder</name>
- <arguments>
- </arguments>
- </buildCommand>
- <buildCommand>
- <name>org.eclipse.pde.ManifestBuilder</name>
- <arguments>
- </arguments>
- </buildCommand>
- <buildCommand>
- <name>org.eclipse.pde.SchemaBuilder</name>
- <arguments>
- </arguments>
- </buildCommand>
- </buildSpec>
- <natures>
- <nature>org.eclipse.pde.PluginNature</nature>
- <nature>org.eclipse.jdt.core.javanature</nature>
- </natures>
-</projectDescription>
diff --git a/plugins/org.eclipse.jst.jee.web/.settings/org.eclipse.jdt.core.prefs b/plugins/org.eclipse.jst.jee.web/.settings/org.eclipse.jdt.core.prefs
deleted file mode 100644
index 037a4e5..0000000
--- a/plugins/org.eclipse.jst.jee.web/.settings/org.eclipse.jdt.core.prefs
+++ /dev/null
@@ -1,95 +0,0 @@
-#Mon Jun 08 15:35:45 EDT 2009
-org.eclipse.jdt.core.compiler.problem.unusedParameterWhenImplementingAbstract=disabled
-org.eclipse.jdt.core.compiler.problem.comparingIdentical=error
-org.eclipse.jdt.core.compiler.problem.unnecessaryElse=error
-org.eclipse.jdt.core.compiler.problem.redundantSuperinterface=error
-org.eclipse.jdt.core.compiler.problem.unusedLocal=error
-org.eclipse.jdt.core.compiler.problem.emptyStatement=error
-org.eclipse.jdt.core.compiler.problem.unusedLabel=error
-org.eclipse.jdt.core.compiler.problem.unusedParameter=warning
-org.eclipse.jdt.core.compiler.problem.rawTypeReference=warning
-org.eclipse.jdt.core.incompatibleJDKLevel=ignore
-org.eclipse.jdt.core.compiler.problem.incompatibleNonInheritedInterfaceMethod=error
-org.eclipse.jdt.core.compiler.debug.lineNumber=generate
-org.eclipse.jdt.core.compiler.problem.unusedDeclaredThrownException=warning
-org.eclipse.jdt.core.builder.cleanOutputFolder=clean
-org.eclipse.jdt.core.compiler.problem.unusedWarningToken=warning
-org.eclipse.jdt.core.compiler.problem.noImplicitStringConversion=error
-org.eclipse.jdt.core.compiler.problem.deprecationInDeprecatedCode=enabled
-org.eclipse.jdt.core.compiler.problem.deprecation=warning
-org.eclipse.jdt.core.compiler.problem.unusedParameterWhenOverridingConcrete=disabled
-org.eclipse.jdt.core.compiler.problem.missingSynchronizedOnInheritedMethod=error
-org.eclipse.jdt.core.compiler.problem.deprecationWhenOverridingDeprecatedMethod=enabled
-org.eclipse.jdt.core.compiler.problem.redundantNullCheck=error
-org.eclipse.jdt.core.compiler.problem.unusedImport=error
-org.eclipse.jdt.core.builder.recreateModifiedClassFileInOutputFolder=ignore
-org.eclipse.jdt.core.builder.resourceCopyExclusionFilter=*.launch
-org.eclipse.jdt.core.classpath.multipleOutputLocations=enabled
-org.eclipse.jdt.core.compiler.problem.suppressWarnings=enabled
-org.eclipse.jdt.core.compiler.problem.typeParameterHiding=error
-org.eclipse.jdt.core.builder.invalidClasspath=abort
-org.eclipse.jdt.core.compiler.problem.localVariableHiding=warning
-org.eclipse.jdt.core.compiler.problem.possibleAccidentalBooleanAssignment=error
-org.eclipse.jdt.core.compiler.problem.missingHashCodeMethod=error
-org.eclipse.jdt.core.codeComplete.argumentSuffixes=
-org.eclipse.jdt.core.codeComplete.argumentPrefixes=
-org.eclipse.jdt.core.compiler.problem.indirectStaticAccess=ignore
-org.eclipse.jdt.core.compiler.problem.potentialNullReference=error
-org.eclipse.jdt.core.compiler.codegen.inlineJsrBytecode=enabled
-org.eclipse.jdt.core.compiler.problem.finalParameterBound=warning
-org.eclipse.jdt.core.compiler.problem.missingSerialVersion=error
-org.eclipse.jdt.core.compiler.problem.nullReference=error
-org.eclipse.jdt.core.compiler.source=1.5
-org.eclipse.jdt.core.compiler.problem.enumIdentifier=error
-org.eclipse.jdt.core.compiler.problem.syntheticAccessEmulation=ignore
-org.eclipse.jdt.core.builder.duplicateResourceTask=warning
-org.eclipse.jdt.core.compiler.problem.fieldHiding=error
-org.eclipse.jdt.core.compiler.problem.unusedDeclaredThrownExceptionExemptExceptionAndThrowable=enabled
-org.eclipse.jdt.core.compiler.problem.missingOverrideAnnotation=error
-org.eclipse.jdt.core.compiler.problem.hiddenCatchBlock=error
-org.eclipse.jdt.core.compiler.problem.overridingPackageDefaultMethod=error
-org.eclipse.jdt.core.compiler.problem.finallyBlockNotCompletingNormally=error
-org.eclipse.jdt.core.compiler.problem.undocumentedEmptyBlock=warning
-org.eclipse.jdt.core.classpath.exclusionPatterns=enabled
-org.eclipse.jdt.core.compiler.problem.methodWithConstructorName=error
-org.eclipse.jdt.core.compiler.problem.discouragedReference=warning
-org.eclipse.jdt.core.compiler.problem.unqualifiedFieldAccess=ignore
-org.eclipse.jdt.core.compiler.problem.incompleteEnumSwitch=error
-eclipse.preferences.version=1
-org.eclipse.jdt.core.incompleteClasspath=error
-org.eclipse.jdt.core.compiler.problem.unnecessaryTypeCheck=error
-org.eclipse.jdt.core.compiler.problem.deadCode=error
-org.eclipse.jdt.core.compiler.problem.specialParameterHidingField=enabled
-org.eclipse.jdt.core.compiler.problem.fatalOptionalError=enabled
-org.eclipse.jdt.core.compiler.problem.noEffectAssignment=error
-org.eclipse.jdt.core.compiler.debug.sourceFile=generate
-org.eclipse.jdt.core.compiler.problem.unusedDeclaredThrownExceptionIncludeUncheckedExceptions=disabled
-org.eclipse.jdt.core.compiler.problem.missingDeprecatedAnnotation=warning
-org.eclipse.jdt.core.codeComplete.fieldPrefixes=
-org.eclipse.jdt.core.compiler.problem.fallthroughCase=error
-org.eclipse.jdt.core.compiler.codegen.targetPlatform=1.5
-org.eclipse.jdt.core.compiler.problem.unusedPrivateMember=error
-org.eclipse.jdt.core.compiler.problem.autoboxing=warning
-org.eclipse.jdt.core.circularClasspath=error
-org.eclipse.jdt.core.compiler.problem.annotationSuperInterface=warning
-org.eclipse.jdt.core.compiler.problem.nonExternalizedStringLiteral=error
-org.eclipse.jdt.core.codeComplete.fieldSuffixes=
-org.eclipse.jdt.core.codeComplete.localSuffixes=
-org.eclipse.jdt.core.compiler.problem.parameterAssignment=error
-org.eclipse.jdt.core.compiler.problem.staticAccessReceiver=error
-org.eclipse.jdt.core.codeComplete.localPrefixes=
-org.eclipse.jdt.core.compiler.problem.unusedDeclaredThrownExceptionIncludeDocCommentReference=enabled
-org.eclipse.jdt.core.compiler.maxProblemPerUnit=100
-org.eclipse.jdt.core.compiler.problem.varargsArgumentNeedCast=error
-org.eclipse.jdt.core.compiler.problem.assertIdentifier=error
-org.eclipse.jdt.core.compiler.compliance=1.5
-org.eclipse.jdt.core.compiler.problem.unusedParameterIncludeDocCommentReference=enabled
-org.eclipse.jdt.core.codeComplete.staticFieldPrefixes=
-org.eclipse.jdt.core.compiler.debug.localVariable=generate
-org.eclipse.jdt.core.compiler.problem.unhandledWarningToken=warning
-instance/org.eclipse.core.net/org.eclipse.core.net.hasMigrated=true
-org.eclipse.jdt.core.compiler.problem.forbiddenReference=error
-org.eclipse.jdt.core.compiler.codegen.unusedLocal=preserve
-org.eclipse.jdt.core.compiler.problem.uncheckedTypeOperation=warning
-org.eclipse.jdt.core.compiler.problem.unusedDeclaredThrownExceptionWhenOverriding=disabled
-org.eclipse.jdt.core.codeComplete.staticFieldSuffixes=
diff --git a/plugins/org.eclipse.jst.jee.web/META-INF/MANIFEST.MF b/plugins/org.eclipse.jst.jee.web/META-INF/MANIFEST.MF
deleted file mode 100644
index 3c6abbe..0000000
--- a/plugins/org.eclipse.jst.jee.web/META-INF/MANIFEST.MF
+++ /dev/null
@@ -1,32 +0,0 @@
-Manifest-Version: 1.0
-Bundle-ManifestVersion: 2
-Bundle-Name: %Bundle-Name.0
-Bundle-SymbolicName: org.eclipse.jst.jee.web;singleton:=true
-Bundle-Version: 1.0.301.qualifier
-Bundle-Activator: org.eclipse.jst.jee.web.Activator
-Require-Bundle: org.eclipse.core.runtime;bundle-version="[3.2.0,4.0.0)",
- org.eclipse.wst.common.project.facet.core;bundle-version="[1.3.0,2.0.0)",
- org.eclipse.jst.j2ee;bundle-version="[1.1.0,1.2.0)",
- org.eclipse.wst.common.frameworks;bundle-version="[1.2.0,2.0.0)",
- org.eclipse.jdt.core;bundle-version="[3.2.0,4.0.0)",
- org.eclipse.core.resources;bundle-version="[3.2.0,4.0.0)",
- org.eclipse.wst.web;bundle-version="[1.1.0,1.2.0)",
- org.eclipse.jem.util;bundle-version="[2.0.0,3.0.0)",
- org.eclipse.jst.common.frameworks;bundle-version="[1.1.0,1.2.0)",
- org.eclipse.jst.common.project.facet.core;bundle-version="[1.3.0,2.0.0)",
- org.eclipse.jst.jee;bundle-version="[1.0.0,1.1.0)",
- org.eclipse.core.commands;bundle-version="[3.2.0,4.0.0)",
- org.eclipse.emf.common;bundle-version="[2.2.0,3.0.0)",
- org.eclipse.emf.ecore;bundle-version="[2.2.0,3.0.0)",
- org.eclipse.emf.ecore.xmi;bundle-version="[2.2.0,3.0.0)",
- org.eclipse.jst.j2ee.web;bundle-version="[1.1.0,1.2.0)",
- org.eclipse.jst.j2ee.core;bundle-version="[1.1.102,2.0.0)",
- org.eclipse.wst.common.emf,
- org.eclipse.wst.common.emfworkbench.integration
-Eclipse-LazyStart: true
-Export-Package: org.eclipse.jst.jee.model.internal,
- org.eclipse.jst.jee.model.internal.mergers,
- org.eclipse.jst.jee.web
-Bundle-Localization: plugin
-Bundle-Vendor: %Bundle-Vendor.0
-Bundle-RequiredExecutionEnvironment: J2SE-1.5
diff --git a/plugins/org.eclipse.jst.jee.web/about.html b/plugins/org.eclipse.jst.jee.web/about.html
deleted file mode 100644
index 0799bdb..0000000
--- a/plugins/org.eclipse.jst.jee.web/about.html
+++ /dev/null
@@ -1,34 +0,0 @@
-<!DOCTYPE HTML PUBLIC "-//W3C//DTD HTML 4.0//EN">
-<HTML>
-
-<head>
-<title>About</title>
-<meta http-equiv=Content-Type content="text/html; charset=ISO-8859-1">
-</head>
-
-<BODY lang="EN-US">
-
-<H3>About This Content</H3>
-
-<P>June, 2008</P>
-
-<H3>License</H3>
-
-<P>The Eclipse Foundation makes available all content in this plug-in
-("Content"). Unless otherwise indicated below, the Content is provided to you
-under the terms and conditions of the Eclipse Public License Version 1.0
-("EPL"). A copy of the EPL is available at
-<A href="http://www.eclipse.org/org/documents/epl-v10.php">http://www.eclipse.org/org/documents/epl-v10.php</A>.
-For purposes of the EPL, "Program" will mean the Content.</P>
-
-<P>If you did not receive this Content directly from the Eclipse Foundation, the
-Content is being redistributed by another party ("Redistributor") and different
-terms and conditions may apply to your use of any object code in the Content.
-Check the Redistributor's license that was provided with the Content. If no such
-license exists, contact the Redistributor. Unless otherwise indicated below, the
-terms and conditions of the EPL still apply to any source code in the Content
-and such source code may be obtained at
-<A href="http://www.eclipse.org/">http://www.eclipse.org/</A>.</P>
-
-</BODY>
-</HTML>
diff --git a/plugins/org.eclipse.jst.jee.web/build.properties b/plugins/org.eclipse.jst.jee.web/build.properties
deleted file mode 100644
index 03f7221..0000000
--- a/plugins/org.eclipse.jst.jee.web/build.properties
+++ /dev/null
@@ -1,17 +0,0 @@
-###############################################################################
-# Copyright (c) 2005, 2007 IBM Corporation and others.
-# All rights reserved. This program and the accompanying materials
-# are made available under the terms of the Eclipse Public License v1.0
-# which accompanies this distribution, and is available at
-# http://www.eclipse.org/legal/epl-v10.html
-#
-# Contributors:
-# IBM Corporation - initial API and implementation
-###############################################################################
-source.. = web/
-output.. = bin/
-bin.includes = META-INF/,\
- .,\
- plugin.xml,\
- plugin.properties,\
- about.html
diff --git a/plugins/org.eclipse.jst.jee.web/plugin.properties b/plugins/org.eclipse.jst.jee.web/plugin.properties
deleted file mode 100644
index 0804c70..0000000
--- a/plugins/org.eclipse.jst.jee.web/plugin.properties
+++ /dev/null
@@ -1,13 +0,0 @@
-###############################################################################
-# Copyright (c) 2005, 2007 IBM Corporation and others.
-# All rights reserved. This program and the accompanying materials
-# are made available under the terms of the Eclipse Public License v1.0
-# which accompanies this distribution, and is available at
-# http://www.eclipse.org/legal/epl-v10.html
-#
-# Contributors:
-# IBM Corporation - initial API and implementation
-###############################################################################
-# properties file for org.eclipse.jst.jee.web
-Bundle-Name.0 = Java EE Web Plug-in
-Bundle-Vendor.0 = Eclipse Web Tools Platform
\ No newline at end of file
diff --git a/plugins/org.eclipse.jst.jee.web/plugin.xml b/plugins/org.eclipse.jst.jee.web/plugin.xml
deleted file mode 100644
index 4f8275b..0000000
--- a/plugins/org.eclipse.jst.jee.web/plugin.xml
+++ /dev/null
@@ -1,21 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<?eclipse version="3.2"?>
-<plugin>
- <extension
- point="org.eclipse.jst.j2ee.J2EEModelProvider">
- <provider>
-
- <modelProvider factoryClass="org.eclipse.jst.jee.model.internal.Web25MergedModelProviderFactory"/>
- <!--<modelProvider factoryClass="org.eclipse.jst.jee.model.internal.Web25ModelProviderFactory"/>-->
- <facet id="jst.web" versions="2.5,3.0"/>
- </provider>
- </extension>
- <extension
- point="org.eclipse.jst.j2ee.J2EEModelProvider">
- <provider>
-
- <modelProvider factoryClass="org.eclipse.jst.jee.model.internal.WebFragment30ModelProviderFactory"/>
- <facet id="jst.webfragment" versions="3.0"/>
- </provider>
- </extension>
- </plugin>
diff --git a/plugins/org.eclipse.jst.jee.web/web/org/eclipse/jst/jee/model/internal/Messages.java b/plugins/org.eclipse.jst.jee.web/web/org/eclipse/jst/jee/model/internal/Messages.java
deleted file mode 100644
index 36bac76..0000000
--- a/plugins/org.eclipse.jst.jee.web/web/org/eclipse/jst/jee/model/internal/Messages.java
+++ /dev/null
@@ -1,31 +0,0 @@
-/***********************************************************************
- * Copyright (c) 2008 by SAP AG, Walldorf.
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
- *
- * Contributors:
- * SAP AG - initial API and implementation
- ***********************************************************************/
-package org.eclipse.jst.jee.model.internal;
-
-import java.util.MissingResourceException;
-import java.util.ResourceBundle;
-
-public class Messages {
- private static final String BUNDLE_NAME = "org.eclipse.jst.jee.model.internal.messages"; //$NON-NLS-1$
-
- private static final ResourceBundle RESOURCE_BUNDLE = ResourceBundle.getBundle(BUNDLE_NAME);
-
- private Messages() {
- }
-
- public static String getString(String key) {
- try {
- return RESOURCE_BUNDLE.getString(key);
- } catch (MissingResourceException e) {
- return '!' + key + '!';
- }
- }
-}
diff --git a/plugins/org.eclipse.jst.jee.web/web/org/eclipse/jst/jee/model/internal/Web25MergedModelProvider.java b/plugins/org.eclipse.jst.jee.web/web/org/eclipse/jst/jee/model/internal/Web25MergedModelProvider.java
deleted file mode 100644
index ea76c2b..0000000
--- a/plugins/org.eclipse.jst.jee.web/web/org/eclipse/jst/jee/model/internal/Web25MergedModelProvider.java
+++ /dev/null
@@ -1,202 +0,0 @@
-/***********************************************************************
- * Copyright (c) 2008, 2010 by SAP AG, Walldorf.
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
- *
- * Contributors:
- * SAP AG - initial API and implementation
- ***********************************************************************/
-package org.eclipse.jst.jee.model.internal;
-
-import org.eclipse.core.resources.IProject;
-import org.eclipse.core.runtime.CoreException;
-import org.eclipse.core.runtime.IPath;
-import org.eclipse.core.runtime.Path;
-import org.eclipse.jst.j2ee.internal.J2EEConstants;
-import org.eclipse.jst.j2ee.model.IModelProvider;
-import org.eclipse.jst.j2ee.model.IModelProviderEvent;
-import org.eclipse.jst.j2ee.web.project.facet.WebFacetUtils;
-import org.eclipse.jst.javaee.web.WebApp;
-import org.eclipse.jst.javaee.web.WebFactory;
-import org.eclipse.jst.jee.model.internal.common.AbstractMergedModelProvider;
-import org.eclipse.jst.jee.model.internal.mergers.ModelElementMerger;
-import org.eclipse.jst.jee.model.internal.mergers.ModelException;
-import org.eclipse.jst.jee.model.internal.mergers.WebApp3Merger;
-import org.eclipse.jst.jee.model.internal.mergers.WebAppMerger;
-import org.eclipse.jst.jee.web.Activator;
-import org.eclipse.wst.common.project.facet.core.IFacetedProject;
-import org.eclipse.wst.common.project.facet.core.ProjectFacetsManager;
-
-/**
- * @author Kiril Mitov k.mitov@sap.com
- *
- */
-public class Web25MergedModelProvider extends AbstractMergedModelProvider<WebApp> {
-
- protected Path WEB_APP_XML_PATH = new Path(J2EEConstants.WEBAPP_DD_URI);
-
- public Web25MergedModelProvider(IProject project) {
- super(project);
- }
-
- @Override
- protected IModelProvider loadAnnotationModel(WebApp ddModel) throws CoreException {
- return new WebAnnotationReader(ProjectFacetsManager.create(project), ddModel);
- }
-
- @Override
- protected IModelProvider loadDeploymentDescriptorModel() throws CoreException {
- return new Web25ModelProvider(project);
- }
-
- private WebApp getAnnotationWebApp() {
- return annotationModelProvider != null ? (WebApp) annotationModelProvider.getModelObject() : null;
- }
-
- private WebApp getXmlWebApp() {
- return ddProvider != null ? (WebApp) ddProvider.getModelObject() : null;
- }
-
- public Object getModelObject(IPath modelPath) {
- if (modelPath == null){
- return getModelObject();
- } else if (WEB_APP_XML_PATH.equals(modelPath)){
- return getXmlWebApp();
- } else if ("java".equals(modelPath.getFileExtension()) || "class".equals(modelPath.getFileExtension())) { //$NON-NLS-1$ //$NON-NLS-2$
- return getAnnotationWebApp();
- }
- return getModelObject();
- }
-
- @Override
- public void modify(Runnable runnable, IPath modelPath) {
- /*
- * Someone has called modify before loading the model. Try to load the
- * model.
- */
- if (mergedModel == null)
- getMergedModel();
- if (isDisposed()) {
- return;
- }
- /*
- * Still not supporting modifications of the merged model. During modify
- * the model is becoming the ddModel. After modifying the model is
- * unloaded.
- */
- WebApp backup = mergedModel;
- try {
- mergedModel = (WebApp) ddProvider.getModelObject();
- ddProvider.modify(runnable, modelPath);
- } finally {
- mergedModel = backup;
- }
- if (mergedModel == null)
- mergedModel = getMergedModel();
- else
- merge(getXmlWebApp(), getAnnotationWebApp());
- }
-
- private void clearModel(WebApp app) {
- if (app == null) {
- return;
- }
- app.getContextParams().clear();
- app.getDescriptions().clear();
- app.getDisplayNames().clear();
- app.getDistributables().clear();
- app.getEjbLocalRefs().clear();
- app.getEjbRefs().clear();
- app.getEnvEntries().clear();
- app.getErrorPages().clear();
- app.getFilterMappings().clear();
- app.getFilters().clear();
- app.getIcons().clear();
- app.getJspConfigs().clear();
- app.getListeners().clear();
- app.getLocalEncodingMappingsLists().clear();
- app.getLoginConfigs().clear();
- app.getMessageDestinationRefs().clear();
- app.getMessageDestinations().clear();
- app.getMimeMappings().clear();
- app.getPersistenceContextRefs().clear();
- app.getPersistenceUnitRefs().clear();
- app.getPostConstructs().clear();
- app.getPreDestroys().clear();
- app.getResourceEnvRefs().clear();
- app.getResourceRefs().clear();
- app.getSecurityConstraints().clear();
- app.getSecurityRoles().clear();
- app.getServiceRefs().clear();
- app.getServletMappings().clear();
- app.getServlets().clear();
- app.getSessionConfigs().clear();
- app.getWelcomeFileLists().clear();
- }
-
- @Override
- protected void annotationModelChanged(IModelProviderEvent event) {
- internalModelChanged(event);
- }
-
- @Override
- protected void xmlModelChanged(IModelProviderEvent event) {
- internalModelChanged(event);
- }
-
- /*
- * Notifications from xml and annotation may come in different threads. This
- * depends on the implementation of the model providers, but to make sure
- * that no race conditions occurs I am synchronizing this method.
- */
- private synchronized void internalModelChanged(IModelProviderEvent event) {
- merge(getXmlWebApp(), getAnnotationWebApp());
- notifyListeners(event);
- }
-
- @Override
- protected WebApp merge(WebApp ddModel, WebApp annotationsModel) {
- try {
- if (mergedModel != ddModel) {
- clearModel(mergedModel);
- mergeWithModel(ddModel, ModelElementMerger.COPY);
- mergeWithModel(annotationsModel, ModelElementMerger.ADD);
- }
- } catch (ModelException e) {
- Activator.logError(e);
- }
- return mergedModel;
- }
-
- private void mergeWithModel(WebApp model, int type) throws ModelException {
- if (model == null)
- return;
- WebAppMerger merger;
- try {
- merger = createWebMerger(model, type);
- } catch (CoreException e) {
- throw new ModelException(e);
- }
- merger.process();
- }
-
- private WebAppMerger createWebMerger(WebApp model, int type) throws CoreException{
- IFacetedProject facetedProject = ProjectFacetsManager.create(project);
- if (facetedProject.getProjectFacetVersion(WebFacetUtils.WEB_FACET) != null){
- if(Float.parseFloat(facetedProject.getProjectFacetVersion(WebFacetUtils.WEB_FACET).getVersionString()) > 2.5){
- return new WebApp3Merger(mergedModel, model, type);
- }
- }
-
-
- return new WebAppMerger(mergedModel, model, type);
- }
-
- @Override
- protected WebApp createNewModelInstance() {
- return WebFactory.eINSTANCE.createWebApp();
- }
-
-}
diff --git a/plugins/org.eclipse.jst.jee.web/web/org/eclipse/jst/jee/model/internal/Web25MergedModelProviderFactory.java b/plugins/org.eclipse.jst.jee.web/web/org/eclipse/jst/jee/model/internal/Web25MergedModelProviderFactory.java
deleted file mode 100644
index 2cfae2e..0000000
--- a/plugins/org.eclipse.jst.jee.web/web/org/eclipse/jst/jee/model/internal/Web25MergedModelProviderFactory.java
+++ /dev/null
@@ -1,67 +0,0 @@
-/***********************************************************************
- * Copyright (c) 2008 by SAP AG, Walldorf.
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
- *
- * Contributors:
- * SAP AG - initial API and implementation
- ***********************************************************************/
-package org.eclipse.jst.jee.model.internal;
-
-import java.util.ArrayList;
-import java.util.Collection;
-import java.util.HashMap;
-
-import org.eclipse.core.resources.IProject;
-import org.eclipse.jst.j2ee.model.IModelProvider;
-import org.eclipse.jst.j2ee.model.IModelProviderFactory;
-import org.eclipse.jst.j2ee.model.IModelProviderListener;
-import org.eclipse.wst.common.componentcore.resources.IVirtualComponent;
-
-/**
- * @author Kiril Mitov k.mitov@sap.com
- *
- */
-public class Web25MergedModelProviderFactory implements IModelProviderFactory {
-
- private HashMap<IProject, IModelProvider> xmlResources = new HashMap<IProject, IModelProvider>();
-
- public IModelProvider create(IProject project) {
- IModelProvider result = getResource(project);
- if(result == null || ((Web25MergedModelProvider)result).isDisposed()){
- //Transport listeners so they are not lost.
- Collection<IModelProviderListener> listeners = new ArrayList<IModelProviderListener>();
- if (result != null){
- listeners = ( (Web25MergedModelProvider)result).getListeners();
- }
- result = new Web25MergedModelProvider(project);
-
- addListeners(result, listeners);
- addResource(project, result);
- }
- return result;
- }
-
- private void addListeners(IModelProvider modelProvider,
- Collection<IModelProviderListener> listeners) {
- for (IModelProviderListener iModelProviderListener : listeners) {
- if (iModelProviderListener != null)
- modelProvider.addListener(iModelProviderListener);
- }
- }
-
- public IModelProvider create(IVirtualComponent component) {
- return create(component.getProject());
- }
-
- private void addResource(IProject project, IModelProvider modelProvider){
- xmlResources.put(project, modelProvider);
- }
-
- private IModelProvider getResource(IProject project){
- return xmlResources.get(project);
- }
-
-}
diff --git a/plugins/org.eclipse.jst.jee.web/web/org/eclipse/jst/jee/model/internal/Web25ModelProvider.java b/plugins/org.eclipse.jst.jee.web/web/org/eclipse/jst/jee/model/internal/Web25ModelProvider.java
deleted file mode 100644
index e0cf417..0000000
--- a/plugins/org.eclipse.jst.jee.web/web/org/eclipse/jst/jee/model/internal/Web25ModelProvider.java
+++ /dev/null
@@ -1,78 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2005, 2007 IBM Corporation and others.
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
- *
- * Contributors:
- * IBM Corporation - initial API and implementation
- *******************************************************************************/
-package org.eclipse.jst.jee.model.internal;
-
-
-import org.eclipse.core.resources.IProject;
-import org.eclipse.core.runtime.IPath;
-import org.eclipse.core.runtime.Path;
-import org.eclipse.emf.ecore.EObject;
-import org.eclipse.emf.ecore.xmi.impl.XMLResourceImpl;
-import org.eclipse.jst.j2ee.internal.J2EEConstants;
-import org.eclipse.jst.j2ee.internal.J2EEVersionConstants;
-import org.eclipse.jst.j2ee.internal.project.J2EEProjectUtilities;
-import org.eclipse.jst.javaee.core.DisplayName;
-import org.eclipse.jst.javaee.core.JavaeeFactory;
-import org.eclipse.jst.javaee.web.IWebResource;
-import org.eclipse.jst.javaee.web.WebApp;
-import org.eclipse.jst.javaee.web.WebAppDeploymentDescriptor;
-import org.eclipse.jst.javaee.web.WebAppVersionType;
-import org.eclipse.jst.javaee.web.WebFactory;
-
-public class Web25ModelProvider extends JEE5ModelProvider {
-
- private static final String WAR25_CONTENT_TYPE = "org.eclipse.jst.jee.ee5webDD"; //$NON-NLS-1$
- public Web25ModelProvider(IProject proj) {
- super();
- this.proj = proj;
- setDefaultResourcePath(new Path(J2EEConstants.WEBAPP_DD_URI));
- }
-
- /* (non-Javadoc)
- * @see org.eclipse.jst.j2ee.model.IModelProvider#getModelObject(org.eclipse.core.runtime.IPath)
- */
- @Override
- public Object getModelObject(IPath modelPath) {
- IWebResource webRes = (IWebResource)getModelResource(modelPath);
- if (webRes != null && webRes.getRootObject() != null)
- return webRes.getWebApp();
- return null;
- }
- @Override
- protected String getContentTypeDescriber() {
- return WAR25_CONTENT_TYPE;
- }
- @Override
- public void populateRoot(XMLResourceImpl res, String name) {
- WebAppDeploymentDescriptor dd = WebFactory.eINSTANCE.createWebAppDeploymentDescriptor();
- dd.getXMLNSPrefixMap().put("", J2EEConstants.JAVAEE_NS_URL); //$NON-NLS-1$
- dd.getXMLNSPrefixMap().put("xsi", J2EEConstants.XSI_NS_URL); //$NON-NLS-1$
-
- WebApp war = WebFactory.eINSTANCE.createWebApp();
- DisplayName dn = JavaeeFactory.eINSTANCE.createDisplayName();
- dn.setValue(name);
- war.getDisplayNames().add(dn);
-
- String version = J2EEProjectUtilities.getJ2EEProjectVersion(proj);
- if(version != null && version.equals(J2EEVersionConstants.VERSION_2_5_TEXT)) {
- dd.getXSISchemaLocation().put(J2EEConstants.JAVAEE_NS_URL, J2EEConstants.WEB_APP_SCHEMA_LOC_2_5);
- war.setVersion(WebAppVersionType._25_LITERAL);
- }
- else
- {
- dd.getXSISchemaLocation().put(J2EEConstants.JAVAEE_NS_URL, J2EEConstants.WEB_APP_SCHEMA_LOC_3_0);
- war.setVersion(WebAppVersionType._30_LITERAL);
- }
- dd.setWebApp(war);
- res.getContents().add((EObject) dd);
- }
-
-}
diff --git a/plugins/org.eclipse.jst.jee.web/web/org/eclipse/jst/jee/model/internal/Web25ModelProviderFactory.java b/plugins/org.eclipse.jst.jee.web/web/org/eclipse/jst/jee/model/internal/Web25ModelProviderFactory.java
deleted file mode 100644
index e5c2d8e..0000000
--- a/plugins/org.eclipse.jst.jee.web/web/org/eclipse/jst/jee/model/internal/Web25ModelProviderFactory.java
+++ /dev/null
@@ -1,28 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2005, 2007 IBM Corporation and others.
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
- *
- * Contributors:
- * IBM Corporation - initial API and implementation
- *******************************************************************************/
-package org.eclipse.jst.jee.model.internal;
-
-import org.eclipse.core.resources.IProject;
-import org.eclipse.jst.j2ee.model.IModelProvider;
-import org.eclipse.jst.j2ee.model.IModelProviderFactory;
-import org.eclipse.wst.common.componentcore.resources.IVirtualComponent;
-
-public class Web25ModelProviderFactory implements IModelProviderFactory {
-
- public IModelProvider create(IProject project) {
- return new Web25ModelProvider(project);
- }
-
- public IModelProvider create(IVirtualComponent component) {
- return new Web25ModelProvider(component.getProject());
- }
-
-}
diff --git a/plugins/org.eclipse.jst.jee.web/web/org/eclipse/jst/jee/model/internal/WebAnnotationFactory.java b/plugins/org.eclipse.jst.jee.web/web/org/eclipse/jst/jee/model/internal/WebAnnotationFactory.java
deleted file mode 100644
index 102d044..0000000
--- a/plugins/org.eclipse.jst.jee.web/web/org/eclipse/jst/jee/model/internal/WebAnnotationFactory.java
+++ /dev/null
@@ -1,276 +0,0 @@
-/***********************************************************************
- * Copyright (c) 2008 by SAP AG, Walldorf.
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
- *
- * Contributors:
- * SAP AG - initial API and implementation
- ***********************************************************************/
-package org.eclipse.jst.jee.model.internal;
-
-import java.util.ArrayList;
-import java.util.List;
-
-import org.eclipse.jdt.core.IAnnotation;
-import org.eclipse.jdt.core.IField;
-import org.eclipse.jdt.core.IMember;
-import org.eclipse.jdt.core.IMemberValuePair;
-import org.eclipse.jdt.core.IMethod;
-import org.eclipse.jdt.core.IType;
-import org.eclipse.jdt.core.JavaModelException;
-import org.eclipse.jst.javaee.core.Description;
-import org.eclipse.jst.javaee.core.EjbLocalRef;
-import org.eclipse.jst.javaee.core.JavaEEObject;
-import org.eclipse.jst.javaee.core.JavaeeFactory;
-import org.eclipse.jst.javaee.core.Listener;
-import org.eclipse.jst.javaee.core.ResourceRef;
-import org.eclipse.jst.javaee.core.RunAs;
-import org.eclipse.jst.javaee.core.SecurityRoleRef;
-import org.eclipse.jst.javaee.core.UrlPatternType;
-import org.eclipse.jst.javaee.web.Filter;
-import org.eclipse.jst.javaee.web.FilterMapping;
-import org.eclipse.jst.javaee.web.Servlet;
-import org.eclipse.jst.javaee.web.ServletMapping;
-import org.eclipse.jst.javaee.web.WebFactory;
-import org.eclipse.jst.jee.model.internal.common.AbstractAnnotationFactory;
-import org.eclipse.jst.jee.model.internal.common.Result;
-
-/**
- * @author Kiril Mitov k.mitov@sap.com
- *
- */
-public class WebAnnotationFactory extends AbstractAnnotationFactory {
-
- private static final String NAME = "name"; //$NON-NLS-1$
- private static final String FILTER_NAME = "filterName"; //$NON-NLS-1$
- private static final String DESCRIPTION = "description"; //$NON-NLS-1$
- private static final String EJB = "EJB"; //$NON-NLS-1$
- private static final String RUN_AS = "RunAs"; //$NON-NLS-1$
- private static final String RESOURCE = "Resource"; //$NON-NLS-1$
- private static final String RESOURCES = "Resources"; //$NON-NLS-1$
- private static final String DECLARE_ROLES = "DeclareRoles"; //$NON-NLS-1$
-
-// private static final String INIT_PARAM = "InitParam"; //$NON-NLS-1$
-// private static final String INIT_PARAM_FQ = "javax.servlet.annotation.InitParam"; //$NON-NLS-1$
-//
-// private static final String INIT_PARAM_NAME = "initParams"; //$NON-NLS-1$
- private static final String URL_PATTERNS_NAME = "urlPatterns"; //$NON-NLS-1$
-
-
- private static final String WEB_SERVLET = "WebServlet"; //$NON-NLS-1$
- private static final String WEB_SERVLET_FQ = "javax.servlet.annotation.WebServlet"; //$NON-NLS-1$
-
- private static final String WEB_LISTENER = "WebListener"; //$NON-NLS-1$
- private static final String WEB_LISTENER_FQ = "javax.servlet.annotation.WebListener"; //$NON-NLS-1$
-
- private static final String WEB_FILTER = "WebFilter"; //$NON-NLS-1$
- private static final String WEB_FILTER_FQ = "javax.servlet.annotation.WebFilter"; //$NON-NLS-1$
-
-
-
-
-
-
-
- private WebAnnotationFactory() {
- super();
- }
-
- public static WebAnnotationFactory createFactory() {
- return new WebAnnotationFactory();
- }
-
- public Result createServlet(IType rootType, String servletName) throws JavaModelException {
- Result result = new Result();
- Servlet servlet = WebFactory.eINSTANCE.createServlet();
- servlet.setServletName(servletName);
- servlet.setServletClass(rootType.getFullyQualifiedName());
- result.setMainObject(servlet);
- processCommonAnnotation(result, servlet, rootType);
- processTypeAnnotations(result, rootType);
- processMethodAnnotations(result, rootType);
- processFieldAnnotations(result, rootType);
- return result;
- }
-
- public Result createListener(IType rootType) throws JavaModelException {
- Result result = new Result();
- Listener listener = JavaeeFactory.eINSTANCE.createListener();
- listener.setListenerClass(rootType.getFullyQualifiedName());
- result.setMainObject(listener);
- processCommonAnnotation(result, listener, rootType);
- processTypeAnnotations(result, rootType);
- processMethodAnnotations(result, rootType);
- processFieldAnnotations(result, rootType);
- return result;
- }
-
- public Result createFilter(IType rootType, String filterName) throws JavaModelException {
- Result result = new Result();
- Filter filter = WebFactory.eINSTANCE.createFilter();
- filter.setFilterName(filterName);
- filter.setFilterClass(rootType.getFullyQualifiedName());
- result.setMainObject(filter);
- processCommonAnnotation(result, filter, rootType);
- processTypeAnnotations(result, rootType);
- processMethodAnnotations(result, rootType);
- processFieldAnnotations(result, rootType);
- return result;
- }
-
- private void processCommonAnnotation(Result result, JavaEEObject artifact, IType rootType) throws JavaModelException {
- for (IAnnotation annotation : rootType.getAnnotations()) {
- String annotationName = annotation.getElementName();
- IMemberValuePair[] memberValuePairs = annotation.getMemberValuePairs();
- String name = (String) getAnnotatedValue(NAME, memberValuePairs);
- String filterName = (String) getAnnotatedValue(FILTER_NAME, memberValuePairs);
- String descr = (String) getAnnotatedValue(DESCRIPTION, memberValuePairs);
- if(WEB_SERVLET.equals(annotationName) || WEB_SERVLET_FQ.equals(annotationName)){
- Servlet servlet = (Servlet)artifact;
- if (name != null) {
- servlet.setServletName(name);
- } else if(servlet.getServletName() == null){
- servlet.setServletName(rootType.getElementName());
- }
- if (descr != null) {
- Description description = JavaeeFactory.eINSTANCE.createDescription();
- description.setValue(descr);
- servlet.getDescriptions().add(description);
- }
- processUrlMapping(result, annotation, servlet);
- } else if(WEB_FILTER.equals(annotationName) || WEB_FILTER_FQ.equals(annotationName)){
- Filter filter = (Filter)artifact;
- if (filterName != null) {
- filter.setFilterName(filterName);
- } else if(filter.getFilterName() == null){
- filter.setFilterName(rootType.getElementName());
- }
- if (descr != null) {
- Description description = JavaeeFactory.eINSTANCE.createDescription();
- description.setValue(descr);
- filter.getDescriptions().add(description);
- }
- processUrlMapping(result, annotation, filter);
-
- } else if(WEB_LISTENER.equals(annotationName) || WEB_LISTENER_FQ.equals(annotationName)){
- Listener listener = (Listener)artifact;
- Description description = JavaeeFactory.eINSTANCE.createDescription();
- if(listener.getListenerClass() == null){
- listener.setListenerClass(rootType.getFullyQualifiedName());
- }
- if (descr != null) {
- description.setValue(descr);
- listener.getDescriptions().add(description);
- }
-
- }
- }
-
- }
-
- private void processTypeAnnotations(Result result, IType type) throws JavaModelException {
- JavaEEObject mainObject = result.getMainObject();
- boolean isServlet = Servlet.class.isInstance(mainObject);
- for (IAnnotation annotation : type.getAnnotations()) {
- String annotationName = annotation.getElementName();
- if (isServlet && DECLARE_ROLES.equals(annotationName)) {
- List<SecurityRoleRef> refs = new ArrayList<SecurityRoleRef>();
- processDeclareRoles(result, refs, annotation, type);
- ((Servlet) mainObject).getSecurityRoleRefs().addAll(refs);
- } else if (RESOURCES.equals(annotationName)) {
- List<ResourceRef> resourceRefs = new ArrayList<ResourceRef>(2);
- processResourcesAnnotation(annotation, resourceRefs, type, result.getDependedTypes());
- result.getAdditional().addAll(resourceRefs);
- } else if (RESOURCE.equals(annotationName)) {
- List<ResourceRef> resourceRefs = new ArrayList<ResourceRef>(2);
- processResourceRefAnnotation(annotation, resourceRefs, type, result.getDependedTypes());
- result.getAdditional().addAll(resourceRefs);
- } else if (isServlet && RUN_AS.equals(annotationName)) {
- RunAs runAs = JavaeeFactory.eINSTANCE.createRunAs();
- processRunAs(annotation, runAs);
- ((Servlet) mainObject).setRunAs(runAs);
- }
- }
- }
-
- private void processFieldAnnotations(Result result, IType type) throws JavaModelException {
- for (IField field : type.getFields()) {
- for (IAnnotation annotation : field.getAnnotations()) {
- processMemberAnnotations(result, field, annotation);
- }
- }
- }
-
- private void processMethodAnnotations(Result result, IType type) throws JavaModelException {
- for (IMethod method : type.getMethods()) {
- for (IAnnotation annotation : method.getAnnotations()) {
- processMemberAnnotations(result, method, annotation);
- }
- }
- }
-
- private void processMemberAnnotations(Result result, IMember member, IAnnotation annotation)
- throws JavaModelException {
- String annotationName = annotation.getElementName();
- if (EJB.equals(annotationName)) {
- List<EjbLocalRef> refs = new ArrayList<EjbLocalRef>(1);
- processEjbAnnotation(annotation, refs, member, result.getDependedTypes());
- result.getAdditional().addAll(refs);
- } else if (RESOURCE.equals(annotationName)) {
- List<ResourceRef> refs = new ArrayList<ResourceRef>(1);
- processResourceRefAnnotation(annotation, refs, member, result.getDependedTypes());
- result.getAdditional().addAll(refs);
- }
- }
-
- private void processUrlMapping(Result result, IAnnotation annotation, JavaEEObject artifact) throws JavaModelException {
- IMemberValuePair[] pairs = annotation.getMemberValuePairs();
- Object values = getAnnotatedValue(URL_PATTERNS_NAME, pairs);
- if (values == null){
- values = getAnnotatedValue("value", pairs); //$NON-NLS-1$
- }
- if (values == null){
- return;
- }
- if(Servlet.class.isInstance(artifact)){
- String servletName = ((Servlet)artifact).getServletName();
- ServletMapping mapping = WebFactory.eINSTANCE.createServletMapping();
- mapping.setServletName(servletName);
- if (!isArrayOfObject(values)){
- transformToMapping(mapping, values);
- } else {
- for (Object urlPattern : (Object[]) values) {
- transformToMapping(mapping, urlPattern);
- }
- }
- result.getAdditional().add(mapping);
- } else if(Filter.class.isInstance(artifact)){
- String filterName = ((Filter)artifact).getFilterName();
- FilterMapping mapping = WebFactory.eINSTANCE.createFilterMapping();
- mapping.setFilterName(filterName);
- if (!isArrayOfObject(values)){
- UrlPatternType urlPatternType = JavaeeFactory.eINSTANCE.createUrlPatternType();
- urlPatternType.setValue((String) values);
- mapping.getUrlPatterns().add(urlPatternType);
- } else {
- for (Object urlPattern : (Object[]) values) {
- UrlPatternType urlPatternType = JavaeeFactory.eINSTANCE.createUrlPatternType();
- urlPatternType.setValue((String) urlPattern);
- mapping.getUrlPatterns().add(urlPatternType);
- }
- }
-
- result.getAdditional().add(mapping);
- }
-
- }
-
- private void transformToMapping(ServletMapping mapping, Object urlPattern) {
- UrlPatternType urlPatternType = JavaeeFactory.eINSTANCE.createUrlPatternType();
- urlPatternType.setValue((String) urlPattern);
- mapping.getUrlPatterns().add(urlPatternType);
- }
-
-}
diff --git a/plugins/org.eclipse.jst.jee.web/web/org/eclipse/jst/jee/model/internal/WebAnnotationReader.java b/plugins/org.eclipse.jst.jee.web/web/org/eclipse/jst/jee/model/internal/WebAnnotationReader.java
deleted file mode 100644
index 75908ad..0000000
--- a/plugins/org.eclipse.jst.jee.web/web/org/eclipse/jst/jee/model/internal/WebAnnotationReader.java
+++ /dev/null
@@ -1,339 +0,0 @@
-/***********************************************************************
- * Copyright (c) 2008 by SAP AG, Walldorf.
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
- *
- * Contributors:
- * SAP AG - initial API and implementation
- ***********************************************************************/
-package org.eclipse.jst.jee.model.internal;
-
-import java.util.ArrayList;
-import java.util.Collection;
-import java.util.HashSet;
-import java.util.Iterator;
-
-import org.eclipse.core.runtime.CoreException;
-import org.eclipse.core.runtime.IPath;
-import org.eclipse.core.runtime.IStatus;
-import org.eclipse.emf.ecore.EObject;
-import org.eclipse.emf.ecore.util.EcoreUtil;
-import org.eclipse.jdt.core.IAnnotation;
-import org.eclipse.jdt.core.ICompilationUnit;
-import org.eclipse.jdt.core.IJavaElementDelta;
-import org.eclipse.jdt.core.IJavaProject;
-import org.eclipse.jdt.core.IPackageFragmentRoot;
-import org.eclipse.jdt.core.IType;
-import org.eclipse.jdt.core.JavaCore;
-import org.eclipse.jdt.core.JavaModelException;
-import org.eclipse.jst.j2ee.model.IModelProviderEvent;
-import org.eclipse.jst.j2ee.web.project.facet.WebFacetUtils;
-import org.eclipse.jst.javaee.core.EjbLocalRef;
-import org.eclipse.jst.javaee.core.JavaEEObject;
-import org.eclipse.jst.javaee.core.Listener;
-import org.eclipse.jst.javaee.core.ResourceRef;
-import org.eclipse.jst.javaee.core.SecurityRole;
-import org.eclipse.jst.javaee.core.SecurityRoleRef;
-import org.eclipse.jst.javaee.ejb.SecurityIdentityType;
-import org.eclipse.jst.javaee.web.Filter;
-import org.eclipse.jst.javaee.web.FilterMapping;
-import org.eclipse.jst.javaee.web.Servlet;
-import org.eclipse.jst.javaee.web.ServletMapping;
-import org.eclipse.jst.javaee.web.WebApp;
-import org.eclipse.jst.javaee.web.WebFactory;
-import org.eclipse.jst.jee.model.internal.common.AbstractAnnotationModelProvider;
-import org.eclipse.jst.jee.model.internal.common.ManyToOneRelation;
-import org.eclipse.jst.jee.model.internal.common.Result;
-import org.eclipse.wst.common.project.facet.core.IFacetedProject;
-
-/**
- * @author Kiril Mitov k.mitov@sap.com
- *
- */
-public class WebAnnotationReader extends AbstractAnnotationModelProvider<WebApp> {
-
- private static final String WEB_SERVLET = "WebServlet"; //$NON-NLS-1$
- private static final String WEB_SERVLET_FQ = "javax.servlet.annotation.WebServlet"; //$NON-NLS-1$
-
- private static final String WEB_LISTENER = "WebListener"; //$NON-NLS-1$
- private static final String WEB_LISTENER_FQ = "javax.servlet.annotation.WebListener"; //$NON-NLS-1$
-
- private static final String WEB_FILTER = "WebFilter"; //$NON-NLS-1$
- private static final String WEB_FILTER_FQ = "javax.servlet.annotation.WebFilter"; //$NON-NLS-1$
-
- private ManyToOneRelation<JavaEEObject, ICompilationUnit> modelToUnit;
-
- private ManyToOneRelation<JavaEEObject, ICompilationUnit> modelToInterfaceUnit;
-
- private WebAnnotationFactory annotationFactory;
-
- private WebApp ddApp;
-
- public WebAnnotationReader(IFacetedProject facetedProject, WebApp ddApp) {
- super(facetedProject);
- if (ddApp == null)
- throw new IllegalArgumentException("The deployment descriptor model can not be null!"); //$NON-NLS-1$
- this.ddApp = ddApp;
- }
-
- @Override
- protected void preLoad() {
- modelObject = WebFactory.eINSTANCE.createWebApp();
- annotationFactory = WebAnnotationFactory.createFactory();
- }
-
- @Override
- protected void loadModel() throws CoreException {
- IJavaProject javaProject = JavaCore.create(facetedProject.getProject());
- final Collection<ICompilationUnit> javaUnits = new HashSet<ICompilationUnit>();
- for (final IPackageFragmentRoot root : javaProject.getAllPackageFragmentRoots()) {
- visitJavaFiles(javaUnits, root);
- }
- annotationFactory = WebAnnotationFactory.createFactory();
-
- modelToInterfaceUnit = new ManyToOneRelation<JavaEEObject, ICompilationUnit>();
- modelToUnit = new ManyToOneRelation<JavaEEObject, ICompilationUnit>();
- for (ICompilationUnit unit : javaUnits) {
- Result result = analyzeCompilationUnit(unit);
- if (result == null)
- continue;
- processResult(unit, result);
- }
- }
-
- /**
- * Analyze this unit for a web artifact. If the file is not a valid java
- * compilation unit or it does not contain a class the method returns
- * <code>null</code>
- *
- * Only the primary type of the compilation unit is processed.
- *
- * @param unit
- * the unit to be processed.
- * @return result from processing the file
- * @throws JavaModelException
- */
- private Result analyzeCompilationUnit(ICompilationUnit unit) throws JavaModelException {
- IType rootType = unit.findPrimaryType();
- /*
- * If the compilation unit is not valid and can not be compiled the
- * rootType may be null. This can happen if a class is define as follows
- * <code> @Stateless public SomeClass implements SomeInterface{}</code>.
- * Here the "class" word is missed and the type is not valid.
- */
- if (rootType == null || !rootType.isClass())
- return null;
- for (Iterator iter = ddApp.getServlets().iterator(); iter.hasNext();) {
- Servlet servlet = (Servlet) iter.next();
- if (rootType.getFullyQualifiedName().equals(servlet.getServletClass()))
- return annotationFactory.createServlet(rootType, servlet.getServletName());
- }
- for (Iterator iter = ddApp.getListeners().iterator(); iter.hasNext();) {
- Listener listener = (Listener) iter.next();
- if (rootType.getFullyQualifiedName().equals(listener.getListenerClass()))
- return annotationFactory.createListener(rootType);
- }
- for (Iterator iter = ddApp.getFilters().iterator(); iter.hasNext();) {
- Filter filter = (Filter) iter.next();
- if (rootType.getFullyQualifiedName().equals(filter.getFilterClass())) {
- return annotationFactory.createFilter(rootType, filter.getFilterName());
- }
- }
- if(Float.parseFloat(facetedProject.getProjectFacetVersion(WebFacetUtils.WEB_FACET).getVersionString()) > 2.5){
- return createJavaeeObject(rootType);
- }
- return null;
- }
-
- public Result createJavaeeObject(IType type) throws JavaModelException {
- Result result = null;
- for (IAnnotation annotation : type.getAnnotations()) {
- String annotationName = annotation.getElementName();
- if (WEB_SERVLET.equals(annotationName) || WEB_SERVLET_FQ.equals(annotationName)) {
- result = annotationFactory.createServlet(type, null);
- break;
- } else if (WEB_FILTER.equals(annotationName) || WEB_FILTER_FQ.equals(annotationName)) {
- result = annotationFactory.createFilter(type, null);
- break;
- } else if (WEB_LISTENER.equals(annotationName) || WEB_LISTENER_FQ.equals(annotationName)) {
- result = annotationFactory.createListener(type);
- break;
- }
- }
- return result;
- }
-
- /**
- * Process the result from parsing the unit. Depending on the result this
- * might include adding a session bean, message driven bean, securityRole
- * etc.
- *
- * @param unit
- * @param result
- * @throws JavaModelException
- */
- private void processResult(ICompilationUnit unit, Result result) throws JavaModelException {
- JavaEEObject mainObject = result.getMainObject();
- if (Servlet.class.isInstance(mainObject))
- servletFound(unit, (Servlet) result.getMainObject(), result.getDependedTypes());
- if (Listener.class.isInstance(mainObject))
- listenerFound(unit, (Listener) result.getMainObject(), result.getDependedTypes());
- if (Filter.class.isInstance(mainObject))
- filterFound(unit, (Filter) result.getMainObject(), result.getDependedTypes());
- for (JavaEEObject additional : result.getAdditional()) {
- if (EjbLocalRef.class.isInstance(additional)) {
- ejbLocalRefFound(unit, (EjbLocalRef) additional, result.getDependedTypes());
- } else if (ResourceRef.class.isInstance(additional)) {
- resourceRefFound(unit, (ResourceRef) additional, result.getDependedTypes());
- } else if (SecurityRole.class.isInstance(additional)) {
- securityRoleFound(result.getMainObject(), (SecurityRole) additional);
- } else if (SecurityIdentityType.class.isInstance(additional)) {
- securityIdentityTypeFound(unit, (SecurityIdentityType) additional);
- } else if (ServletMapping.class.isInstance(additional)) {
- servletMappingFound(unit, (ServletMapping)additional, result.getDependedTypes());
- } else if (FilterMapping.class.isInstance(additional)) {
- filterMappingFound(unit, (FilterMapping)additional, result.getDependedTypes());
- }
- }
- }
-
- private void filterMappingFound(ICompilationUnit unit,
- FilterMapping additional, Collection<IType> dependedTypes) throws JavaModelException {
- modelObject.getFilterMappings().add(additional);
- connectObjectWithFile(unit, additional, dependedTypes);
- }
-
- private void servletMappingFound(ICompilationUnit unit,
- ServletMapping additional, Collection<IType> dependedTypes) throws JavaModelException {
- modelObject.getServletMappings().add(additional);
- connectObjectWithFile(unit, additional, dependedTypes);
- }
-
- private void servletFound(ICompilationUnit unit, Servlet servlet, Collection<IType> dependedTypes) throws JavaModelException {
- modelObject.getServlets().add(servlet);
- connectObjectWithFile(unit, servlet, dependedTypes);
- }
-
- private void listenerFound(ICompilationUnit unit, Listener listener, Collection<IType> dependedTypes) throws JavaModelException {
- modelObject.getListeners().add(listener);
- connectObjectWithFile(unit, listener, dependedTypes);
- }
-
- private void filterFound(ICompilationUnit unit, Filter filter, Collection<IType> dependedTypes) throws JavaModelException {
- modelObject.getFilters().add(filter);
- connectObjectWithFile(unit, filter, dependedTypes);
- }
-
- private void securityIdentityTypeFound(ICompilationUnit file, SecurityIdentityType additional) {
- }
-
- private void resourceRefFound(ICompilationUnit unit, ResourceRef resourceRef, Collection<IType> dependedTypes)
- throws JavaModelException {
- modelObject.getResourceRefs().add(resourceRef);
- connectObjectWithFile(unit, resourceRef, dependedTypes);
- }
-
- private void ejbLocalRefFound(ICompilationUnit unit, EjbLocalRef localRef, Collection<IType> dependedTypes)
- throws JavaModelException {
- modelObject.getEjbLocalRefs().add(localRef);
- connectObjectWithFile(unit, localRef, dependedTypes);
- }
-
- private void connectObjectWithFile(ICompilationUnit unit, JavaEEObject localRef, Collection<IType> dependedTypes)
- throws JavaModelException {
- modelToUnit.connect(localRef, unit);
- for (IType type : dependedTypes) {
- if (type.isBinary() || type.isInterface() == false)
- continue;
- modelToInterfaceUnit.connect(localRef, type.getCompilationUnit());
- }
- }
-
- @Override
- protected void processAddedCompilationUnit(IModelProviderEvent modelEvent, ICompilationUnit unit)
- throws CoreException {
- Result result = analyzeCompilationUnit(unit);
- if (result == null || result.isEmpty())
- return;
- processResult(unit, result);
- modelEvent.addResource(unit);
- }
-
- @Override
- protected void processChangedCompilationUnit(IModelProviderEvent modelEvent, ICompilationUnit unit)
- throws CoreException {
- if (modelToUnit.containsTarget(unit))
- processChangedModelUnit(modelEvent, unit);
- else
- processAddedCompilationUnit(modelEvent, unit);
- }
-
- private void processChangedModelUnit(IModelProviderEvent modelEvent, ICompilationUnit unit) throws CoreException {
- processRemovedCompilationUnit(modelEvent, unit);
- processAddedCompilationUnit(modelEvent, unit);
- }
-
- @Override
- protected void processRemovedCompilationUnit(IModelProviderEvent modelEvent, ICompilationUnit unit)
- throws CoreException {
- if (modelToUnit.containsTarget(unit))
- processRemovedModelResource(modelEvent, unit);
- else if (modelToInterfaceUnit.containsTarget(unit))
- processRemoveInterface(modelEvent, unit);
- }
-
- private void processRemoveInterface(IModelProviderEvent event, ICompilationUnit unit) {
- }
-
- @Override
- protected void processRemovedPackage(IModelProviderEvent modelEvent, IJavaElementDelta delta) throws CoreException {
- Collection<ICompilationUnit> clonedCollection = cloneCollection(modelToUnit.getTargets());
- for (ICompilationUnit unit : clonedCollection) {
- if (unit.getParent().getElementName().equals(delta.getElement().getElementName())) {
- processRemovedCompilationUnit(modelEvent, unit);
- }
- }
- }
-
- private Collection<ICompilationUnit> cloneCollection(Collection<ICompilationUnit> targets) {
- Collection<ICompilationUnit> result = new ArrayList<ICompilationUnit>();
- for (ICompilationUnit iCompilationUnit : targets) {
- result.add(iCompilationUnit);
- }
- return result;
- }
-
- private void processRemovedModelResource(IModelProviderEvent event, ICompilationUnit file) {
- Collection<JavaEEObject> modelObjects = modelToUnit.getSources(file);
- for (JavaEEObject o : modelObjects) {
- if (Servlet.class.isInstance(o))
- disconnectFromRoles(o);
- EcoreUtil.remove((EObject) o);
- }
- modelToUnit.disconnect(file);
- event.setEventCode(event.getEventCode() | IModelProviderEvent.REMOVED_RESOURCE);
- event.addResource(file);
- }
-
- public void modify(Runnable runnable, IPath modelPath) {
- }
-
- public IStatus validateEdit(IPath modelPath, Object context) {
- return null;
- }
-
- @Override
- protected Collection<SecurityRoleRef> getSecurityRoleRefs(JavaEEObject target) {
- if (Servlet.class.isInstance(target))
- return ((Servlet) target).getSecurityRoleRefs();
- return null;
- }
-
- @Override
- protected Collection<SecurityRole> getSecurityRoles() {
- return modelObject.getSecurityRoles();
- }
-
-}
diff --git a/plugins/org.eclipse.jst.jee.web/web/org/eclipse/jst/jee/model/internal/WebFragment30ModelProvider.java b/plugins/org.eclipse.jst.jee.web/web/org/eclipse/jst/jee/model/internal/WebFragment30ModelProvider.java
deleted file mode 100644
index c97570b..0000000
--- a/plugins/org.eclipse.jst.jee.web/web/org/eclipse/jst/jee/model/internal/WebFragment30ModelProvider.java
+++ /dev/null
@@ -1,74 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2010 IBM Corporation and others.
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
- *
- * Contributors:
- * IBM Corporation - initial API and implementation
- *******************************************************************************/
-package org.eclipse.jst.jee.model.internal;
-
-
-import org.eclipse.core.resources.IProject;
-import org.eclipse.core.runtime.IPath;
-import org.eclipse.core.runtime.Path;
-import org.eclipse.emf.ecore.EObject;
-import org.eclipse.emf.ecore.xmi.impl.XMLResourceImpl;
-import org.eclipse.jst.j2ee.internal.J2EEConstants;
-import org.eclipse.jst.j2ee.internal.J2EEVersionConstants;
-import org.eclipse.jst.j2ee.internal.project.J2EEProjectUtilities;
-import org.eclipse.jst.javaee.core.DisplayName;
-import org.eclipse.jst.javaee.core.JavaeeFactory;
-import org.eclipse.jst.javaee.web.IWebFragmentResource;
-import org.eclipse.jst.javaee.web.WebAppVersionType;
-import org.eclipse.jst.javaee.web.WebFactory;
-import org.eclipse.jst.javaee.web.WebFragment;
-import org.eclipse.jst.javaee.webfragment.WebAppDeploymentDescriptor;
-import org.eclipse.jst.javaee.webfragment.WebfragmentFactory;
-
-public class WebFragment30ModelProvider extends JEE5ModelProvider {
-
- private static final String WEBFRAGMENT_CONTENT_TYPE = "org.eclipse.jst.jee.ee6webfragmentDD"; //$NON-NLS-1$
- public WebFragment30ModelProvider(IProject proj) {
- super();
- this.proj = proj;
- setDefaultResourcePath(new Path(J2EEConstants.WEBFRAGMENT_DD_URI));
- }
-
- /* (non-Javadoc)
- * @see org.eclipse.jst.j2ee.model.IModelProvider#getModelObject(org.eclipse.core.runtime.IPath)
- */
- @Override
- public Object getModelObject(IPath modelPath) {
- IWebFragmentResource webFragmentRes = (IWebFragmentResource)getModelResource(modelPath);
- if (webFragmentRes != null && webFragmentRes.getRootObject() != null)
- return webFragmentRes.getWebFragment();
- return null;
- }
- @Override
- protected String getContentTypeDescriber() {
- return WEBFRAGMENT_CONTENT_TYPE;
- }
- @Override
- public void populateRoot(XMLResourceImpl res, String name) {
- WebAppDeploymentDescriptor dd = WebfragmentFactory.eINSTANCE.createWebAppDeploymentDescriptor();
- dd.getXMLNSPrefixMap().put("", J2EEConstants.JAVAEE_NS_URL); //$NON-NLS-1$
- dd.getXMLNSPrefixMap().put("xsi", J2EEConstants.XSI_NS_URL); //$NON-NLS-1$
-
- WebFragment webFragment = WebFactory.eINSTANCE.createWebFragment();
- DisplayName dn = JavaeeFactory.eINSTANCE.createDisplayName();
- dn.setValue(name);
- webFragment.getDisplayNames().add(dn);
-
- String version = J2EEProjectUtilities.getJ2EEProjectVersion(proj);
- if(version != null && version.equals(J2EEVersionConstants.VERSION_3_0_TEXT)) {
- dd.getXSISchemaLocation().put(J2EEConstants.JAVAEE_NS_URL, J2EEConstants.WEBFRAGMENT_SCHEMA_LOC_3_0);
- webFragment.setVersion(WebAppVersionType._30_LITERAL);
- }
- dd.setWebFragment(webFragment);
- res.getContents().add((EObject) dd);
- }
-
-}
diff --git a/plugins/org.eclipse.jst.jee.web/web/org/eclipse/jst/jee/model/internal/WebFragment30ModelProviderFactory.java b/plugins/org.eclipse.jst.jee.web/web/org/eclipse/jst/jee/model/internal/WebFragment30ModelProviderFactory.java
deleted file mode 100644
index 401c38a..0000000
--- a/plugins/org.eclipse.jst.jee.web/web/org/eclipse/jst/jee/model/internal/WebFragment30ModelProviderFactory.java
+++ /dev/null
@@ -1,28 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2010 IBM Corporation and others.
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
- *
- * Contributors:
- * IBM Corporation - initial API and implementation
- *******************************************************************************/
-package org.eclipse.jst.jee.model.internal;
-
-import org.eclipse.core.resources.IProject;
-import org.eclipse.jst.j2ee.model.IModelProvider;
-import org.eclipse.jst.j2ee.model.IModelProviderFactory;
-import org.eclipse.wst.common.componentcore.resources.IVirtualComponent;
-
-public class WebFragment30ModelProviderFactory implements IModelProviderFactory {
-
- public IModelProvider create(IProject project) {
- return new WebFragment30ModelProvider(project);
- }
-
- public IModelProvider create(IVirtualComponent component) {
- return new WebFragment30ModelProvider(component.getProject());
- }
-
-}
diff --git a/plugins/org.eclipse.jst.jee.web/web/org/eclipse/jst/jee/model/internal/mergers/WebApp3Merger.java b/plugins/org.eclipse.jst.jee.web/web/org/eclipse/jst/jee/model/internal/mergers/WebApp3Merger.java
deleted file mode 100644
index 414f578..0000000
--- a/plugins/org.eclipse.jst.jee.web/web/org/eclipse/jst/jee/model/internal/mergers/WebApp3Merger.java
+++ /dev/null
@@ -1,105 +0,0 @@
-package org.eclipse.jst.jee.model.internal.mergers;
-
-import java.util.List;
-
-import org.eclipse.jst.javaee.core.JavaEEObject;
-import org.eclipse.jst.javaee.core.ParamValue;
-import org.eclipse.jst.javaee.web.Filter;
-import org.eclipse.jst.javaee.web.FilterMapping;
-import org.eclipse.jst.javaee.web.Servlet;
-import org.eclipse.jst.javaee.web.ServletMapping;
-
-public class WebApp3Merger extends WebAppMerger {
-
- public WebApp3Merger(JavaEEObject _base, JavaEEObject merge, int kind) {
- super(_base, merge, kind);
- }
-
- @Override
- protected void mergeServlets(List warnings) {
- List<Servlet> baseservlets = getBaseWebApp().getServlets();
- List<Servlet> toMergeServlets = getToMergeWebApp().getServlets();
- if (baseservlets != null && toMergeServlets != null && baseservlets.size() > 0 && toMergeServlets.size() > 0){
- for (Servlet servlet : baseservlets) {
- Servlet toMergeArtifact = (Servlet) getArtifactFromList(servlet, toMergeServlets);
- if (artifactIsValid(servlet) && toMergeArtifact != null){
- mergeServlet(servlet, toMergeArtifact);
- }
- }
- }
- if (getToMergeWebApp().getServlets() != null){
- copyMissingContentInBase(getToMergeWebApp().getServlets(), getBaseWebApp().getServlets());
- }
- if (getToMergeWebApp().getFilterMappings() != null){
- copyMissingContentInBase(getToMergeWebApp().getServletMappings(), getBaseWebApp().getServletMappings());
- }
- mergeServletMappings(getBaseWebApp().getServletMappings(), getToMergeWebApp().getServletMappings());
- }
-
- private void mergeServlet(Servlet servlet, Servlet toMergeArtifact) {
- mergeInitParams(servlet.getInitParams(), toMergeArtifact.getInitParams());
- }
-
- private void mergeServletMappings(List<ServletMapping> servletMappingsBase,
- List<ServletMapping> servletMappingsToMerge) {
-
- if (servletMappingsBase != null && servletMappingsToMerge != null && servletMappingsToMerge.size() >0){
- for(ServletMapping toMergeMapping : servletMappingsToMerge){
- ServletMapping baseMapping = (ServletMapping) getArtifactFromList(toMergeMapping, servletMappingsBase);
- if (baseMapping != null && baseMapping.getServletName().equals(toMergeMapping.getServletName())){
- copyMissingContentInBase(toMergeMapping.getUrlPatterns(), baseMapping.getUrlPatterns());
- }
- }
- }
- }
-
- @Override
- protected void mergeFilters(List warnings) {
- List<Filter> basefilters = getBaseWebApp().getFilters();
- List<Filter> toMergeFilters = getToMergeWebApp().getFilters();
- if (basefilters != null && toMergeFilters != null && basefilters.size() > 0 && toMergeFilters.size() > 0){
- for (Filter filter : basefilters) {
- Filter toMergeArtifact = (Filter) getArtifactFromList(filter, toMergeFilters);
- if (artifactIsValid(filter) && toMergeArtifact != null){
- mergeFilter(filter, toMergeArtifact);
- }
- }
- }
- if (getToMergeWebApp().getFilters() != null){
- copyMissingContentInBase(getToMergeWebApp().getFilters(), getBaseWebApp().getFilters());
- }
- if (getToMergeWebApp().getFilterMappings() != null){
- copyMissingContentInBase(getToMergeWebApp().getFilterMappings(), getBaseWebApp().getFilterMappings());
- }
- mergeFilterMappings(getBaseWebApp().getFilterMappings(), getToMergeWebApp().getFilterMappings());
- }
-
- private void mergeFilterMappings(List<FilterMapping> filterMappingsBase,
- List<FilterMapping> filterMappingsToMerge) {
- if (filterMappingsBase != null && filterMappingsToMerge != null && filterMappingsToMerge.size() >0){
- for(FilterMapping toMergeMapping : filterMappingsToMerge){
- FilterMapping baseMapping = (FilterMapping) getArtifactFromList(toMergeMapping, filterMappingsBase);
- if (baseMapping != null && baseMapping.getFilterName().equals(toMergeMapping.getFilterName())){
- copyMissingContentInBase(toMergeMapping.getUrlPatterns(), baseMapping.getUrlPatterns());
- }
- }
- }
- }
-
- private void mergeFilter(Filter filter, Filter toMergeArtifact) {
- mergeInitParams(filter.getInitParams(), toMergeArtifact.getInitParams());
- }
-
- private void mergeInitParams(List<ParamValue> initParams,
- List<ParamValue> initParams2) {
- if (initParams != null && initParams2 != null && initParams.size() > 0 && initParams2.size() >0){
- for(ParamValue value : initParams){
- ParamValue artifactFromList = (ParamValue) getArtifactFromList(value, initParams2);
- if(artifactFromList != null && value.getParamName().equals(artifactFromList.getParamName())){
- value.setParamValue(artifactFromList.getParamValue());
- }
- }
- }
- copyMissingContentInBase(initParams2, initParams);
- }
-}
diff --git a/plugins/org.eclipse.jst.jee.web/web/org/eclipse/jst/jee/model/internal/mergers/WebAppMerger.java b/plugins/org.eclipse.jst.jee.web/web/org/eclipse/jst/jee/model/internal/mergers/WebAppMerger.java
deleted file mode 100644
index 15ab6f1..0000000
--- a/plugins/org.eclipse.jst.jee.web/web/org/eclipse/jst/jee/model/internal/mergers/WebAppMerger.java
+++ /dev/null
@@ -1,347 +0,0 @@
-/***********************************************************************
- * Copyright (c) 2008, 2010 by SAP AG, Walldorf.
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
- *
- * Contributors:
- * SAP AG - initial API and implementation
- ***********************************************************************/
-package org.eclipse.jst.jee.model.internal.mergers;
-
-import java.util.ArrayList;
-import java.util.List;
-
-import org.eclipse.emf.ecore.EObject;
-import org.eclipse.emf.ecore.util.EcoreUtil;
-import org.eclipse.jst.j2ee.webapplication.WelcomeFile;
-import org.eclipse.jst.javaee.core.Description;
-import org.eclipse.jst.javaee.core.JavaEEObject;
-import org.eclipse.jst.javaee.core.Listener;
-import org.eclipse.jst.javaee.core.ParamValue;
-import org.eclipse.jst.javaee.core.RunAs;
-import org.eclipse.jst.javaee.core.SecurityRole;
-import org.eclipse.jst.javaee.core.UrlPatternType;
-import org.eclipse.jst.javaee.web.Filter;
-import org.eclipse.jst.javaee.web.FilterMapping;
-import org.eclipse.jst.javaee.web.Servlet;
-import org.eclipse.jst.javaee.web.ServletMapping;
-import org.eclipse.jst.javaee.web.WebApp;
-
-/**
- * WebApp merger merges the WebApp artifact.
- *
- * @author Dimitar Giormov
- */
-public class WebAppMerger extends ModelElementMerger {
-
- /**
- * Constructor which gets the base and to merge WebApp element.
- *
- * @param _base - is the base element, into which the values will be merged.
- * @param merge - is the conflicting element, which will be merged into base.
- * @param kind
- */
- public WebAppMerger(JavaEEObject _base, JavaEEObject merge, int kind) {
- super(_base, merge, kind);
- }
-
- /**
- * Returns the base element, into which the values will be merged.
- *
- * @return base element, into which the values will be merged.
- */
- WebApp getBaseWebApp(){
- return (WebApp) getBase();
- }
-
- /**
- * Returns the conflicting element, which will be merged into base.
- *
- * @return the conflicting element, which will be merged into base.
- */
- WebApp getToMergeWebApp(){
- return (WebApp) getToMerge();
- }
-
-
- /* (non-Javadoc)
- * @see org.eclipse.jst.javaee.ejb.model.mergers.ModelElementMerger#process()
- */
- @Override
- public List process() throws ModelException {
- List warnings = new ArrayList();
- if(getToMergeWebApp() == null || getBaseWebApp() == null){
- return warnings;
- }
- try {
- mergeServlets(warnings);
- mergeFilters(warnings);
- mergeListeners(warnings);
-
- copyGeneralData(warnings);
-
- mergeRunAs(warnings);
- mergeJNDIRefs(warnings);
- mergeSecurityRoles(warnings);
- mergeSecurityConstraints(warnings);
- } catch (Exception e) {
- throw new ModelException(e);
- }
- return warnings;
- }
-
- protected void mergeFilters(List warnings) {
- if (getToMergeWebApp().getFilters() != null){
- copyMissingContentInBase(getToMergeWebApp().getFilters(), getBaseWebApp().getFilters());
- }
- if (getToMergeWebApp().getFilterMappings() != null){
- if (getKind() == COPY){
- copyAllContentInBase(getToMergeWebApp().getFilterMappings(), getBaseWebApp().getFilterMappings());
- } else {
- copyMissingContentInBase(getToMergeWebApp().getFilterMappings(), getBaseWebApp().getFilterMappings());
- }
- }
- }
-
- protected void mergeListeners(List warnings) {
- if (getToMergeWebApp().getListeners() != null){
- copyMissingContentInBase(getToMergeWebApp().getListeners(), getBaseWebApp().getListeners());
- }
- }
-
- protected void mergeServlets(List warnings) {
-
- if (getToMergeWebApp().getServlets() != null){
- copyMissingContentInBase(getToMergeWebApp().getServlets(), getBaseWebApp().getServlets());
- }
-
- if (getToMergeWebApp().getServletMappings() != null){
- if (getKind() == COPY){
- copyAllContentInBase(getToMergeWebApp().getServletMappings(), getBaseWebApp().getServletMappings());
- } else {
- copyMissingContentInBase(getToMergeWebApp().getServletMappings(), getBaseWebApp().getServletMappings());
- }
- }
-
- }
-
-
- private void mergeJNDIRefs(List warnings) throws ModelException {
- JNDIRefsMerger jndiRefsMerger = new JNDIRefsMerger(getBaseWebApp(), getToMergeWebApp(), getKind());
- warnings.addAll(jndiRefsMerger.process());
- }
-
-
- private void mergeRunAs(List warnings) throws ModelException {
- List baseServlets = getBaseWebApp().getServlets();
- List toMergeServlets = getToMergeWebApp().getServlets();
- for (Object object : toMergeServlets) {
- Servlet servlet = (Servlet) object;
- Servlet servletInBase = findServletInBase(servlet.getServletName(), baseServlets);
- if(servletInBase != null){
- RunAs baseSecId = servletInBase.getRunAs();
- RunAs toMergeSecId = servlet.getRunAs();
- if(baseSecId == null && toMergeSecId != null){
- servletInBase.setRunAs((RunAs) EcoreUtil.copy((EObject)toMergeSecId));
- }
- }
- }
-
- }
-
- private Servlet findServletInBase(String servletName, List baseServlets) {
- for (Object object : baseServlets) {
- Servlet servlet = (Servlet) object;
- if(servlet.getServletName() != null && servlet.getServletName().equals(servletName)){
- return servlet;
- }
- }
- return null;
- }
-
- private void mergeSecurityRoles(List warnings) {
- List securityRolesBase = getBaseWebApp().getSecurityRoles();
- List securityRolesToMerge = getToMergeWebApp().getSecurityRoles();
- if (securityRolesToMerge == null){
- return;
- }
- for (Object sRoles : securityRolesToMerge) {
- if(!containsSecRole((SecurityRole) sRoles, securityRolesBase)){
- securityRolesBase.add(EcoreUtil.copy((EObject) sRoles));
- }
- }
- }
-
- private void mergeSecurityConstraints(List warnings) {
- List securityConstraints = getBaseWebApp().getSecurityConstraints();
- List securityConstraintsToMerge = getToMergeWebApp().getSecurityConstraints();
- if (securityConstraintsToMerge == null){
- return;
- }
- copyMissingContentInBase(securityConstraintsToMerge, securityConstraints);
- }
-
- private boolean containsSecRole(SecurityRole secRole, List secRoles){
- for (Object sRoles : secRoles) {
- if(((SecurityRole)sRoles).getRoleName() == null || secRole.getRoleName() == null){
- return ((SecurityRole)sRoles).getRoleName() == secRole.getRoleName();
- }
- if (((SecurityRole)sRoles).getRoleName().equals(secRole.getRoleName())){
- return true;
- }
- }
- return false;
- }
-
- private void copyGeneralData(List warnings){
- copyJavaEEGroup();
-
- if (getToMergeWebApp().getContextParams() != null && getToMergeWebApp().getContextParams().size() > 0){
- copyMissingContentInBase(getToMergeWebApp().getContextParams(), getBaseWebApp().getContextParams());
- }
-
- if (getToMergeWebApp().getDistributables() != null){
- copyMissingContentInBase(getToMergeWebApp().getDistributables(), getBaseWebApp().getDistributables());
- }
-
- if (getToMergeWebApp().getErrorPages() != null){
- copyMissingContentInBase(getToMergeWebApp().getErrorPages(), getBaseWebApp().getErrorPages());
- }
-
- if (getToMergeWebApp().getJspConfigs() != null){
- copyMissingContentInBase(getToMergeWebApp().getJspConfigs(), getBaseWebApp().getJspConfigs());
- }
-
- if (getToMergeWebApp().getLocalEncodingMappingsLists() != null){
- copyMissingContentInBase(getToMergeWebApp().getLocalEncodingMappingsLists(), getBaseWebApp().getLocalEncodingMappingsLists());
- }
-
-
- if (getToMergeWebApp().getLoginConfigs() != null){
- copyMissingContentInBase(getToMergeWebApp().getLoginConfigs(), getBaseWebApp().getLoginConfigs());
- }
-
-
- if (getToMergeWebApp().getMessageDestinations() != null){
- copyMissingContentInBase(getToMergeWebApp().getMessageDestinations(), getBaseWebApp().getMessageDestinations());
- }
-
-
- if (getToMergeWebApp().getMimeMappings() != null){
- copyMissingContentInBase(getToMergeWebApp().getMimeMappings(), getBaseWebApp().getMimeMappings());
- }
-
- if (getToMergeWebApp().getSessionConfigs() != null){
- copyMissingContentInBase(getToMergeWebApp().getSessionConfigs(), getBaseWebApp().getSessionConfigs());
- }
-
- if (getToMergeWebApp().getWelcomeFileLists() != null){
- copyMissingContentInBase(getToMergeWebApp().getWelcomeFileLists(), getBaseWebApp().getWelcomeFileLists());
- }
-
-
- }
-
- private void copyAllContentInBase(List listSource, List target) {
- for (Object object : listSource) {
- if (artifactIsValid(object)){
- target.add(EcoreUtil.copy((EObject) object));
- }
- }
-
- }
-
- protected void copyMissingContentInBase(List listSource, List target) {
- for (Object object : listSource) {
- if(artifactIsValid(object) && !artifactExists(object, target)){
- target.add(EcoreUtil.copy((EObject) object));
- }
- }
-
- }
-
- protected boolean artifactIsValid(Object javaEEObject) {
- if (javaEEObject instanceof Servlet){
- return ( (Servlet)javaEEObject).getServletName() != null;
- } else if (javaEEObject instanceof Listener){
- return ((Listener)javaEEObject).getListenerClass() != null;
- } else if (javaEEObject instanceof Filter){
- return ((Filter)javaEEObject).getFilterName() != null;
- }
- return true;
- }
-
- protected boolean artifactExists(Object javaEEObject, List target) {
- return getArtifactFromList(javaEEObject, target) != null;
- }
-
- protected JavaEEObject getArtifactFromList(Object javaEEObject, List target){
- for (Object targetArtifact : target) {
- if( !artifactIsValid(targetArtifact) ){
- continue;
- }
- if (javaEEObject instanceof Servlet){
-
- if(((Servlet) targetArtifact).getServletName().equals(((Servlet)javaEEObject).getServletName())){
- return (JavaEEObject) targetArtifact;
- }
- } else if (javaEEObject instanceof Listener){
- if(((Listener) targetArtifact).getListenerClass().equals(((Listener)javaEEObject).getListenerClass())){
- return (JavaEEObject) targetArtifact;
- }
- } else if (javaEEObject instanceof Filter){
- if(((Filter) targetArtifact).getFilterName().equals(((Filter)javaEEObject).getFilterName())){
- return (JavaEEObject) targetArtifact;
- }
- } else if (javaEEObject instanceof Description){
- if(((Description) targetArtifact).getValue().equals(((Description)javaEEObject).getValue())){
- return (JavaEEObject) targetArtifact;
- }
- } else if (javaEEObject instanceof WelcomeFile){
- if(((WelcomeFile) targetArtifact).getWelcomeFile().equals(((WelcomeFile)javaEEObject).getWelcomeFile())){
- return (JavaEEObject) targetArtifact;
- }
- } else if (javaEEObject instanceof ServletMapping){
- if(((ServletMapping) targetArtifact).getServletName().equals(((ServletMapping)javaEEObject).getServletName())){
- return (JavaEEObject) targetArtifact;
- }
- } else if (javaEEObject instanceof FilterMapping){
- if(((FilterMapping) targetArtifact).getFilterName().equals(((FilterMapping)javaEEObject).getFilterName())){
- return (JavaEEObject) targetArtifact;
- }
- } else if (javaEEObject instanceof UrlPatternType){
- if(((UrlPatternType) targetArtifact).getValue().equals(((UrlPatternType)javaEEObject).getValue())){
- return (JavaEEObject) targetArtifact;
- }
- } else if (javaEEObject instanceof ParamValue){
- if(((ParamValue) targetArtifact).getParamName().equals(((ParamValue)javaEEObject).getParamName())){
- return (JavaEEObject) targetArtifact;
- }
- }
-
- }
- return null;
- }
-
- private void copyJavaEEGroup(){
- if (getToMergeWebApp().getDescriptions() != null){
- copyAllContentInBase(getToMergeWebApp().getDescriptions(), getBaseWebApp().getDescriptions());
- }
-
- if (getToMergeWebApp().getDisplayNames() != null){
- copyAllContentInBase(getToMergeWebApp().getDisplayNames(), getBaseWebApp().getDisplayNames());
- }
-
- if (getToMergeWebApp().getIcons() != null){
- copyAllContentInBase(getToMergeWebApp().getIcons(), getBaseWebApp().getIcons());
- }
-
- if (getToMergeWebApp().isSetVersion()){
- getBaseWebApp().setVersion(getToMergeWebApp().getVersion());
- }
- }
-
-
-}
diff --git a/plugins/org.eclipse.jst.jee.web/web/org/eclipse/jst/jee/model/internal/messages.properties b/plugins/org.eclipse.jst.jee.web/web/org/eclipse/jst/jee/model/internal/messages.properties
deleted file mode 100644
index 03155a9..0000000
--- a/plugins/org.eclipse.jst.jee.web/web/org/eclipse/jst/jee/model/internal/messages.properties
+++ /dev/null
@@ -1 +0,0 @@
-WebAnnotationReader.DisposeWebAnnotationReader=Dispose web annotation reader
diff --git a/plugins/org.eclipse.jst.jee.web/web/org/eclipse/jst/jee/web/Activator.java b/plugins/org.eclipse.jst.jee.web/web/org/eclipse/jst/jee/web/Activator.java
deleted file mode 100644
index 416d344..0000000
--- a/plugins/org.eclipse.jst.jee.web/web/org/eclipse/jst/jee/web/Activator.java
+++ /dev/null
@@ -1,101 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2005, 2007 IBM Corporation and others.
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
- *
- * Contributors:
- * IBM Corporation - initial API and implementation
- *******************************************************************************/
-package org.eclipse.jst.jee.web;
-
-import org.eclipse.core.runtime.ILog;
-import org.eclipse.core.runtime.IStatus;
-import org.eclipse.core.runtime.Status;
-import org.eclipse.wst.common.frameworks.internal.WTPPlugin;
-import org.osgi.framework.BundleContext;
-import org.eclipse.core.runtime.Platform;
-import java.lang.Throwable;
-import org.eclipse.core.runtime.CoreException;
-
-/**
- * The activator class controls the plug-in life cycle
- */
-public class Activator extends WTPPlugin {
-
- // The plug-in ID
- public static final String PLUGIN_ID = "org.eclipse.jst.jee.web"; //$NON-NLS-1$
-
- // The shared instance
- private static Activator plugin;
-
- /**
- * The constructor
- */
- public Activator() {
- }
-
- /*
- * (non-Javadoc)
- * @see org.eclipse.ui.plugin.AbstractUIPlugin#start(org.osgi.framework.BundleContext)
- */
- @Override
- public void start(BundleContext context) throws Exception {
- super.start(context);
- plugin = this;
- }
-
- /*
- * (non-Javadoc)
- * @see org.eclipse.ui.plugin.AbstractUIPlugin#stop(org.osgi.framework.BundleContext)
- */
- @Override
- public void stop(BundleContext context) throws Exception {
- plugin = null;
- super.stop(context);
- }
-
- /**
- * Returns the shared instance
- *
- * @return the shared instance
- */
- public static Activator getDefault() {
- return plugin;
- }
-
- /*
- * (non-Javadoc)
- *
- * @see org.eclipse.wst.common.frameworks.internal.WTPPlugin#getPluginID()
- */
- @Override
- public String getPluginID() {
- return PLUGIN_ID;
- }
-
- public static void log( final Exception e )
- {
- final ILog log = getDefault().getLog();
- final String msg = "Encountered an unexpected exception."; //$NON-NLS-1$
-
- log.log( new Status( IStatus.ERROR, PLUGIN_ID, IStatus.OK, msg, e ) );
- }
-
- public static IStatus createStatus(int severity, String message, Throwable exception) {
- return new Status(severity, PLUGIN_ID, message, exception);
- }
-
- public static IStatus createStatus(int severity, String message) {
- return createStatus(severity, message, null);
- }
-
- public static void logError(Throwable exception) {
- Platform.getLog(Platform.getBundle(PLUGIN_ID)).log( createStatus(IStatus.ERROR, exception.getMessage(), exception));
- }
-
- public static void logError(CoreException exception) {
- Platform.getLog(Platform.getBundle(PLUGIN_ID)).log( exception.getStatus() );
- }
-}
diff --git a/plugins/org.eclipse.jst.jee/.classpath b/plugins/org.eclipse.jst.jee/.classpath
deleted file mode 100644
index 5696f49..0000000
--- a/plugins/org.eclipse.jst.jee/.classpath
+++ /dev/null
@@ -1,9 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<classpath>
- <classpathentry kind="src" path="earproject"/>
- <classpathentry kind="src" path="common"/>
- <classpathentry kind="src" path="jeecreation"/>
- <classpathentry kind="con" path="org.eclipse.jdt.launching.JRE_CONTAINER/org.eclipse.jdt.internal.debug.ui.launcher.StandardVMType/J2SE-1.5"/>
- <classpathentry kind="con" path="org.eclipse.pde.core.requiredPlugins"/>
- <classpathentry kind="output" path="bin"/>
-</classpath>
diff --git a/plugins/org.eclipse.jst.jee/.cvsignore b/plugins/org.eclipse.jst.jee/.cvsignore
deleted file mode 100644
index ce1b279..0000000
--- a/plugins/org.eclipse.jst.jee/.cvsignore
+++ /dev/null
@@ -1,4 +0,0 @@
-javaCompiler...args
-build.xml
-temp.folder
-@dot
diff --git a/plugins/org.eclipse.jst.jee/.project b/plugins/org.eclipse.jst.jee/.project
deleted file mode 100644
index 92ef5e3..0000000
--- a/plugins/org.eclipse.jst.jee/.project
+++ /dev/null
@@ -1,28 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<projectDescription>
- <name>org.eclipse.jst.jee</name>
- <comment></comment>
- <projects>
- </projects>
- <buildSpec>
- <buildCommand>
- <name>org.eclipse.jdt.core.javabuilder</name>
- <arguments>
- </arguments>
- </buildCommand>
- <buildCommand>
- <name>org.eclipse.pde.ManifestBuilder</name>
- <arguments>
- </arguments>
- </buildCommand>
- <buildCommand>
- <name>org.eclipse.pde.SchemaBuilder</name>
- <arguments>
- </arguments>
- </buildCommand>
- </buildSpec>
- <natures>
- <nature>org.eclipse.pde.PluginNature</nature>
- <nature>org.eclipse.jdt.core.javanature</nature>
- </natures>
-</projectDescription>
diff --git a/plugins/org.eclipse.jst.jee/.settings/org.eclipse.jdt.core.prefs b/plugins/org.eclipse.jst.jee/.settings/org.eclipse.jdt.core.prefs
deleted file mode 100644
index e30ee73..0000000
--- a/plugins/org.eclipse.jst.jee/.settings/org.eclipse.jdt.core.prefs
+++ /dev/null
@@ -1,95 +0,0 @@
-#Mon Jun 08 16:58:21 EDT 2009
-org.eclipse.jdt.core.compiler.problem.unusedParameterWhenImplementingAbstract=disabled
-org.eclipse.jdt.core.compiler.problem.comparingIdentical=error
-org.eclipse.jdt.core.compiler.problem.unnecessaryElse=error
-org.eclipse.jdt.core.compiler.problem.redundantSuperinterface=error
-org.eclipse.jdt.core.compiler.problem.unusedLocal=error
-org.eclipse.jdt.core.compiler.problem.emptyStatement=error
-org.eclipse.jdt.core.compiler.problem.unusedLabel=error
-org.eclipse.jdt.core.compiler.problem.unusedParameter=warning
-org.eclipse.jdt.core.compiler.problem.rawTypeReference=warning
-org.eclipse.jdt.core.incompatibleJDKLevel=ignore
-org.eclipse.jdt.core.compiler.problem.incompatibleNonInheritedInterfaceMethod=error
-org.eclipse.jdt.core.compiler.debug.lineNumber=generate
-org.eclipse.jdt.core.compiler.problem.unusedDeclaredThrownException=warning
-org.eclipse.jdt.core.builder.cleanOutputFolder=clean
-org.eclipse.jdt.core.compiler.problem.unusedWarningToken=warning
-org.eclipse.jdt.core.compiler.problem.noImplicitStringConversion=error
-org.eclipse.jdt.core.compiler.problem.deprecationInDeprecatedCode=enabled
-org.eclipse.jdt.core.compiler.problem.deprecation=warning
-org.eclipse.jdt.core.compiler.problem.unusedParameterWhenOverridingConcrete=disabled
-org.eclipse.jdt.core.compiler.problem.missingSynchronizedOnInheritedMethod=error
-org.eclipse.jdt.core.compiler.problem.deprecationWhenOverridingDeprecatedMethod=enabled
-org.eclipse.jdt.core.compiler.problem.redundantNullCheck=error
-org.eclipse.jdt.core.compiler.problem.unusedImport=error
-org.eclipse.jdt.core.builder.recreateModifiedClassFileInOutputFolder=ignore
-org.eclipse.jdt.core.builder.resourceCopyExclusionFilter=*.launch
-org.eclipse.jdt.core.classpath.multipleOutputLocations=enabled
-org.eclipse.jdt.core.compiler.problem.suppressWarnings=enabled
-org.eclipse.jdt.core.compiler.problem.typeParameterHiding=error
-org.eclipse.jdt.core.builder.invalidClasspath=abort
-org.eclipse.jdt.core.compiler.problem.localVariableHiding=warning
-org.eclipse.jdt.core.compiler.problem.possibleAccidentalBooleanAssignment=error
-org.eclipse.jdt.core.compiler.problem.missingHashCodeMethod=error
-org.eclipse.jdt.core.codeComplete.argumentSuffixes=
-org.eclipse.jdt.core.codeComplete.argumentPrefixes=
-org.eclipse.jdt.core.compiler.problem.indirectStaticAccess=ignore
-org.eclipse.jdt.core.compiler.problem.potentialNullReference=error
-org.eclipse.jdt.core.compiler.codegen.inlineJsrBytecode=enabled
-org.eclipse.jdt.core.compiler.problem.finalParameterBound=warning
-org.eclipse.jdt.core.compiler.problem.missingSerialVersion=error
-org.eclipse.jdt.core.compiler.problem.nullReference=error
-org.eclipse.jdt.core.compiler.source=1.5
-org.eclipse.jdt.core.compiler.problem.enumIdentifier=error
-org.eclipse.jdt.core.compiler.problem.syntheticAccessEmulation=ignore
-org.eclipse.jdt.core.builder.duplicateResourceTask=warning
-org.eclipse.jdt.core.compiler.problem.fieldHiding=error
-org.eclipse.jdt.core.compiler.problem.unusedDeclaredThrownExceptionExemptExceptionAndThrowable=enabled
-org.eclipse.jdt.core.compiler.problem.missingOverrideAnnotation=error
-org.eclipse.jdt.core.compiler.problem.hiddenCatchBlock=error
-org.eclipse.jdt.core.compiler.problem.overridingPackageDefaultMethod=error
-org.eclipse.jdt.core.compiler.problem.finallyBlockNotCompletingNormally=error
-org.eclipse.jdt.core.compiler.problem.undocumentedEmptyBlock=warning
-org.eclipse.jdt.core.classpath.exclusionPatterns=enabled
-org.eclipse.jdt.core.compiler.problem.methodWithConstructorName=error
-org.eclipse.jdt.core.compiler.problem.discouragedReference=warning
-org.eclipse.jdt.core.compiler.problem.unqualifiedFieldAccess=ignore
-org.eclipse.jdt.core.compiler.problem.incompleteEnumSwitch=error
-eclipse.preferences.version=1
-org.eclipse.jdt.core.incompleteClasspath=error
-org.eclipse.jdt.core.compiler.problem.unnecessaryTypeCheck=error
-org.eclipse.jdt.core.compiler.problem.deadCode=error
-org.eclipse.jdt.core.compiler.problem.specialParameterHidingField=enabled
-org.eclipse.jdt.core.compiler.problem.fatalOptionalError=enabled
-org.eclipse.jdt.core.compiler.problem.noEffectAssignment=error
-org.eclipse.jdt.core.compiler.debug.sourceFile=generate
-org.eclipse.jdt.core.compiler.problem.unusedDeclaredThrownExceptionIncludeUncheckedExceptions=disabled
-org.eclipse.jdt.core.compiler.problem.missingDeprecatedAnnotation=warning
-org.eclipse.jdt.core.codeComplete.fieldPrefixes=
-org.eclipse.jdt.core.compiler.problem.fallthroughCase=error
-org.eclipse.jdt.core.compiler.codegen.targetPlatform=1.5
-org.eclipse.jdt.core.compiler.problem.unusedPrivateMember=error
-org.eclipse.jdt.core.compiler.problem.autoboxing=warning
-org.eclipse.jdt.core.circularClasspath=error
-org.eclipse.jdt.core.compiler.problem.annotationSuperInterface=warning
-org.eclipse.jdt.core.compiler.problem.nonExternalizedStringLiteral=error
-org.eclipse.jdt.core.codeComplete.fieldSuffixes=
-org.eclipse.jdt.core.codeComplete.localSuffixes=
-org.eclipse.jdt.core.compiler.problem.parameterAssignment=error
-org.eclipse.jdt.core.compiler.problem.staticAccessReceiver=error
-org.eclipse.jdt.core.codeComplete.localPrefixes=
-org.eclipse.jdt.core.compiler.problem.unusedDeclaredThrownExceptionIncludeDocCommentReference=enabled
-org.eclipse.jdt.core.compiler.maxProblemPerUnit=100
-org.eclipse.jdt.core.compiler.problem.varargsArgumentNeedCast=error
-org.eclipse.jdt.core.compiler.problem.assertIdentifier=error
-org.eclipse.jdt.core.compiler.compliance=1.5
-org.eclipse.jdt.core.compiler.problem.unusedParameterIncludeDocCommentReference=enabled
-org.eclipse.jdt.core.codeComplete.staticFieldPrefixes=
-org.eclipse.jdt.core.compiler.debug.localVariable=generate
-org.eclipse.jdt.core.compiler.problem.unhandledWarningToken=warning
-instance/org.eclipse.core.net/org.eclipse.core.net.hasMigrated=true
-org.eclipse.jdt.core.compiler.problem.forbiddenReference=error
-org.eclipse.jdt.core.compiler.codegen.unusedLocal=preserve
-org.eclipse.jdt.core.compiler.problem.uncheckedTypeOperation=warning
-org.eclipse.jdt.core.compiler.problem.unusedDeclaredThrownExceptionWhenOverriding=disabled
-org.eclipse.jdt.core.codeComplete.staticFieldSuffixes=
diff --git a/plugins/org.eclipse.jst.jee/.settings/org.eclipse.pde.prefs b/plugins/org.eclipse.jst.jee/.settings/org.eclipse.pde.prefs
deleted file mode 100644
index c8197c5..0000000
--- a/plugins/org.eclipse.jst.jee/.settings/org.eclipse.pde.prefs
+++ /dev/null
@@ -1,15 +0,0 @@
-#Sat Nov 10 03:28:42 EST 2007
-compilers.incompatible-environment=1
-compilers.p.build=0
-compilers.p.deprecated=1
-compilers.p.missing-packages=2
-compilers.p.no-required-att=0
-compilers.p.not-externalized-att=2
-compilers.p.unknown-attribute=1
-compilers.p.unknown-class=1
-compilers.p.unknown-element=1
-compilers.p.unknown-resource=1
-compilers.p.unresolved-ex-points=0
-compilers.p.unresolved-import=0
-compilers.use-project=true
-eclipse.preferences.version=1
diff --git a/plugins/org.eclipse.jst.jee/META-INF/MANIFEST.MF b/plugins/org.eclipse.jst.jee/META-INF/MANIFEST.MF
deleted file mode 100644
index 1f441d7..0000000
--- a/plugins/org.eclipse.jst.jee/META-INF/MANIFEST.MF
+++ /dev/null
@@ -1,37 +0,0 @@
-Manifest-Version: 1.0
-Bundle-ManifestVersion: 2
-Bundle-Name: %Bundle-Name.0
-Bundle-SymbolicName: org.eclipse.jst.jee;singleton:=true
-Bundle-Version: 1.0.302.qualifier
-Bundle-Activator: org.eclipse.jst.jee.JEEPlugin
-Require-Bundle: org.eclipse.core.runtime;bundle-version="[3.2.0,4.0.0)",
- org.eclipse.wst.common.project.facet.core;bundle-version="[1.3.0,2.0.0)",
- org.eclipse.core.resources;bundle-version="[3.2.0,4.0.0)",
- org.eclipse.jem.util;bundle-version="[2.0.0,3.0.0)",
- org.eclipse.jst.j2ee;bundle-version="[1.1.0,1.2.0)",
- org.eclipse.wst.common.frameworks;bundle-version="[1.2.0,2.0.0)",
- org.eclipse.jst.common.frameworks;bundle-version="[1.1.0,1.2.0)",
- org.eclipse.jdt.core;bundle-version="[3.2.0,4.0.0)",
- org.eclipse.jst.common.project.facet.core;bundle-version="[1.3.0,2.0.0)",
- org.eclipse.emf.common;bundle-version="[2.2.0,3.0.0)",
- org.eclipse.wst.web;bundle-version="[1.1.0,1.2.0)",
- org.eclipse.jst.j2ee.core;bundle-version="[1.1.0,2.0.0)",
- org.eclipse.core.commands;bundle-version="[3.2.0,4.0.0)",
- org.eclipse.wst.server.core;bundle-version="[1.0.0,2.0.0)",
- org.eclipse.wst.common.emfworkbench.integration;bundle-version="[1.2.0,2.0.0)",
- org.eclipse.emf.ecore;bundle-version="[2.2.0,3.0.0)",
- org.eclipse.jst.server.core;bundle-version="[1.0.0,2.0.0)",
- org.eclipse.emf.ecore.xmi;bundle-version="[2.2.0,3.0.0)",
- org.eclipse.wst.common.emf;bundle-version="[1.1.103,2.0.0)",
- org.eclipse.jst.j2ee.jca;bundle-version="[1.1.0,2.0.0)"
-Eclipse-LazyStart: true
-Export-Package: org.eclipse.jst.jee,
- org.eclipse.jst.jee.contenttype,
- org.eclipse.jst.jee.internal.deployables,
- org.eclipse.jst.jee.model.internal,
- org.eclipse.jst.jee.model.internal.common,
- org.eclipse.jst.jee.model.internal.mergers,
- org.eclipse.jst.jee.project.facet
-Bundle-Vendor: %Bundle-Vendor.0
-Bundle-Localization: plugin
-Bundle-RequiredExecutionEnvironment: J2SE-1.5
diff --git a/plugins/org.eclipse.jst.jee/about.html b/plugins/org.eclipse.jst.jee/about.html
deleted file mode 100644
index 0799bdb..0000000
--- a/plugins/org.eclipse.jst.jee/about.html
+++ /dev/null
@@ -1,34 +0,0 @@
-<!DOCTYPE HTML PUBLIC "-//W3C//DTD HTML 4.0//EN">
-<HTML>
-
-<head>
-<title>About</title>
-<meta http-equiv=Content-Type content="text/html; charset=ISO-8859-1">
-</head>
-
-<BODY lang="EN-US">
-
-<H3>About This Content</H3>
-
-<P>June, 2008</P>
-
-<H3>License</H3>
-
-<P>The Eclipse Foundation makes available all content in this plug-in
-("Content"). Unless otherwise indicated below, the Content is provided to you
-under the terms and conditions of the Eclipse Public License Version 1.0
-("EPL"). A copy of the EPL is available at
-<A href="http://www.eclipse.org/org/documents/epl-v10.php">http://www.eclipse.org/org/documents/epl-v10.php</A>.
-For purposes of the EPL, "Program" will mean the Content.</P>
-
-<P>If you did not receive this Content directly from the Eclipse Foundation, the
-Content is being redistributed by another party ("Redistributor") and different
-terms and conditions may apply to your use of any object code in the Content.
-Check the Redistributor's license that was provided with the Content. If no such
-license exists, contact the Redistributor. Unless otherwise indicated below, the
-terms and conditions of the EPL still apply to any source code in the Content
-and such source code may be obtained at
-<A href="http://www.eclipse.org/">http://www.eclipse.org/</A>.</P>
-
-</BODY>
-</HTML>
diff --git a/plugins/org.eclipse.jst.jee/build.properties b/plugins/org.eclipse.jst.jee/build.properties
deleted file mode 100644
index 7b78de3..0000000
--- a/plugins/org.eclipse.jst.jee/build.properties
+++ /dev/null
@@ -1,22 +0,0 @@
-###############################################################################
-# Copyright (c) 2005, 2007 IBM Corporation and others.
-# All rights reserved. This program and the accompanying materials
-# are made available under the terms of the Eclipse Public License v1.0
-# which accompanies this distribution, and is available at
-# http://www.eclipse.org/legal/epl-v10.html
-#
-# Contributors:
-# IBM Corporation - initial API and implementation
-###############################################################################
-source.. = earproject/,\
- jeecreation/,\
- common/
-output.. = bin/
-bin.includes = plugin.xml,\
- .,\
- META-INF/,\
- plugin.properties,\
- license/,\
- about.html
-src.includes = schema/,\
- component.xml
diff --git a/plugins/org.eclipse.jst.jee/common/org/eclipse/jst/jee/model/internal/common/AbstractAnnotationFactory.java b/plugins/org.eclipse.jst.jee/common/org/eclipse/jst/jee/model/internal/common/AbstractAnnotationFactory.java
deleted file mode 100644
index 0cf699e..0000000
--- a/plugins/org.eclipse.jst.jee/common/org/eclipse/jst/jee/model/internal/common/AbstractAnnotationFactory.java
+++ /dev/null
@@ -1,421 +0,0 @@
-/***********************************************************************
- * Copyright (c) 2008 by SAP AG, Walldorf.
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
- *
- * Contributors:
- * SAP AG - initial API and implementation
- ***********************************************************************/
-package org.eclipse.jst.jee.model.internal.common;
-
-import java.util.Collection;
-import java.util.List;
-
-import org.eclipse.jdt.core.IAnnotation;
-import org.eclipse.jdt.core.ICompilationUnit;
-import org.eclipse.jdt.core.IField;
-import org.eclipse.jdt.core.IImportDeclaration;
-import org.eclipse.jdt.core.IJavaElement;
-import org.eclipse.jdt.core.IMember;
-import org.eclipse.jdt.core.IMemberValuePair;
-import org.eclipse.jdt.core.IMethod;
-import org.eclipse.jdt.core.IType;
-import org.eclipse.jdt.core.JavaModelException;
-import org.eclipse.jdt.core.Signature;
-import org.eclipse.jst.javaee.core.Description;
-import org.eclipse.jst.javaee.core.EjbLocalRef;
-import org.eclipse.jst.javaee.core.InjectionTarget;
-import org.eclipse.jst.javaee.core.JavaeeFactory;
-import org.eclipse.jst.javaee.core.ResAuthType;
-import org.eclipse.jst.javaee.core.ResSharingScopeType;
-import org.eclipse.jst.javaee.core.ResourceRef;
-import org.eclipse.jst.javaee.core.RunAs;
-import org.eclipse.jst.javaee.core.SecurityRole;
-import org.eclipse.jst.javaee.core.SecurityRoleRef;
-import org.eclipse.jst.javaee.ejb.SessionBean;
-
-/**
- * @author Kiril Mitov k.mitov@sap.com
- *
- */
-public abstract class AbstractAnnotationFactory {
-
- /**
- * @param value
- * @return true if "value" is an array of objects.
- */
- protected static boolean isArrayOfObject(Object value) {
- return Object[].class.isInstance(value);
- }
-
- protected Object getAnnotatedValue(String name, IMemberValuePair[] memberValuePairs) throws JavaModelException {
- for (IMemberValuePair pair : memberValuePairs) {
- if (name.equals(pair.getMemberName())) {
- return pair.getValue();
- }
- }
- return null;
- }
-
- protected boolean containsImport(ICompilationUnit unit, String importt) throws JavaModelException {
- for (IImportDeclaration declaration : unit.getImports()) {
- if (declaration.getElementName().equals(importt))
- return true;
- }
- return false;
- }
-
- /**
- * Resolve the given <code>toResolve</code> string to an IType in the
- * context of <code>declaringType</code>
- *
- * @param declaringType
- * @param toResolve
- * the type that should be resolved.
- * @return the resolved type or <code>null</code> if such type can not be
- * resolved. Returns <code>null</code> if toResolve is
- * <code>null</code>
- * @throws JavaModelException
- */
- protected IType resolveType(IType declaringType, String toResolve) throws JavaModelException {
- if (toResolve == null)
- return null;
- String[][] fullTypeName = declaringType.resolveType(toResolve);
- if (fullTypeName != null)
- return declaringType.getJavaProject().findType(fullTypeName[0][0], fullTypeName[0][1]);
- return null;
- }
-
- protected void processEjbAnnotation(IAnnotation annotation, List<EjbLocalRef> localRefs, IMember member,
- Collection<IType> dependedTypes) throws JavaModelException {
- int memberType = member.getElementType();
- IMemberValuePair[] pairs = annotation.getMemberValuePairs();
-
- String beanInterfaceValue = (String) getAnnotatedValue("beanInterface", pairs); //$NON-NLS-1$
- beanInterfaceValue = internalProcessInjection(beanInterfaceValue, member, dependedTypes);
- if (beanInterfaceValue == null)
- return;
-
- /*
- * The name of the reference should be the value of the "name"
- * attribute. If there is no "name" attribute then the name of the
- * reference is the qualified name of the member. Check this at
- * Enterprise Java Beans, 3.0, Section 14.1.5.3
- */
- String refName = (String) getAnnotatedValue("name", pairs); //$NON-NLS-1$
- if (refName == null) {
- refName = getMemberQualifiedName(member);
- }
- EjbLocalRef ref = JavaeeFactory.eINSTANCE.createEjbLocalRef();
- ref.setEjbRefName(refName);
- localRefs.add(ref);
- ref.setLocal(beanInterfaceValue);
- ref.setLocalHome(beanInterfaceValue);
- ref.setEjbLink((String) getAnnotatedValue("beanName", pairs)); //$NON-NLS-1$
- ref.setMappedName((String) getAnnotatedValue("mappedName", pairs)); //$NON-NLS-1$
- if (memberType == IJavaElement.METHOD || memberType == IJavaElement.FIELD) {
- createInjectionTarget(refName, ref.getInjectionTargets(), annotation);
- }
- }
-
- private void createInjectionTarget(String refName, List<InjectionTarget> injectionTargets, IAnnotation annotation) {
- InjectionTarget injectionTarget = JavaeeFactory.eINSTANCE.createInjectionTarget();
- int index = refName.indexOf('/');
- if (index != -1) {
- injectionTarget.setInjectionTargetClass(refName.substring(0, index));
- injectionTarget.setInjectionTargetName(refName.substring(index + 1));
- } else {
- injectionTarget.setInjectionTargetName(refName);
- injectionTarget.setInjectionTargetClass("");//$NON-NLS-1$
- }
- injectionTargets.add(injectionTarget);
- }
-
- /**
- * Resource annotation can be placed on class, method, field.
- *
- * Checks are made if the resource annotation is valid.
- * <p>
- * If on class there should be a "type" attribute. If on method the method
- * must have one param with type that is an interface. If on field the field
- * type must be an interface.
- *
- * If the type of the method/field can not be resolved the result will
- * contain the unresolved value.
- *
- * In case the type of method/field is array, wildcard, simple type this is
- * not a place for the annotation.
- * </p>
- *
- * <p>
- * In case of method/field the type specified using the "type" attribute has
- * a higher priority that the method/field type.
- * </p>
- *
- * <p>
- * Only resolved types are added to dependedTypes
- * </p>
- *
- * @param sessionBean
- * @param member
- * @param annotation
- * @param dependedTypes
- * @throws JavaModelException
- */
- protected void processResourceRefAnnotation(IAnnotation annotation, List<ResourceRef> resourceRefs, IMember member,
- Collection<IType> dependedTypes) throws JavaModelException {
-
- IMemberValuePair[] pairs = annotation.getMemberValuePairs();
- String specifiedType = (String) getAnnotatedValue("type", pairs); //$NON-NLS-1$
- specifiedType = internalProcessInjection(specifiedType, member, dependedTypes);
- if (specifiedType == null)
- return;
- String refName = (String) getAnnotatedValue("name", pairs); //$NON-NLS-1$
- if (refName == null)
- refName = getMemberQualifiedName(member);
- ResourceRef ref = JavaeeFactory.eINSTANCE.createResourceRef();
- ref.setResRefName(refName);
- ref.setResType(specifiedType);
- ref.setMappedName((String) getAnnotatedValue("mappedName", pairs)); //$NON-NLS-1$
- String description = (String) getAnnotatedValue("description", pairs); //$NON-NLS-1$
- if (description != null) {
- Description desc = JavaeeFactory.eINSTANCE.createDescription();
- desc.setValue(description);
- ref.getDescriptions().clear();
- ref.getDescriptions().add(desc);
- }
- if (member.getElementType() == IJavaElement.METHOD || member.getElementType() == IJavaElement.FIELD) {
- createInjectionTarget(refName, ref.getInjectionTargets(), annotation);
- }
- String value = (String) getAnnotatedValue("authenticationType", pairs); //$NON-NLS-1$
- /*
- * the default value is AuthenticationType.APPLICATION which is handled
- * by the EMF. no need to check for this value
- */
- if ("AuthenticationType.CONTAINER".equals(value)) { //$NON-NLS-1$
- ref.setResAuth(ResAuthType.CONTAINER_LITERAL);
- } else if ("CONTAINER".equals(value) //$NON-NLS-1$
- && containsImport(member.getCompilationUnit(), "AuthenticationType.CONTAINER")) { //$NON-NLS-1$
- ref.setResAuth(ResAuthType.CONTAINER_LITERAL);
- }
- Boolean shareable = (Boolean) getAnnotatedValue("shareable", pairs); //$NON-NLS-1$
- /*
- * The default value for sharable is true. Check and process only
- * unsharable
- */
- if (Boolean.FALSE.equals(shareable))
- ref.setResSharingScope(ResSharingScopeType.UNSHAREABLE_LITERAL);
-
- resourceRefs.add(ref);
- }
-
- /**
- * The method has the task of processing the member along with the specified
- * member and return a String. The result is to be used as a reference value
- * for the injection on this member. Usage are the
- *
- * @EJB and
- * @Resource annotations.
- *
- * <p>
- * If the specifiedType is <code>null</code> and member is of type
- * IJavaElement.TYPE the method returns <code>null</code>
- * </p>
- *
- * <p>
- * If the type of the member can be resolved and is an interface the method
- * returns <code>null</code>. Here the "type" of the member is the result
- * from {@link #getUnresolvedType(IMember)}
- * </p>
- *
- *
- * Only if the specifiedType can be calculated and is resolved it is added
- * to the dependedTypes. If the specifiedType can not be resolved nothing is
- * added to dependedTypes.
- *
- * @see {@link #processEjbAnnotation(IAnnotation, SessionBean, IMember, Collection)}
- * @see #processResourceRefAnnotation(SessionBean, IMember, IAnnotation,
- * Collection)
- *
- * @param specifiedType
- * @param member
- * @param dependedTypes
- * @return
- * @throws JavaModelException
- */
- private String internalProcessInjection(final String specifiedType, IMember member, Collection<IType> dependedTypes)
- throws JavaModelException {
- boolean methodOrField = member.getElementType() == IJavaElement.METHOD
- || member.getElementType() == IJavaElement.FIELD;
- IType declaringType = (IType) (member.getElementType() == IJavaElement.TYPE ? member : member
- .getDeclaringType());
- String memberType = getUnresolvedType(member);
- // not type for this member can be retrieved. If member is a method or
- // field this means there is an error.
- if (getClassTypeSignature(memberType) == null && methodOrField)
- return null;
-
- // both type are null. This is not a valid case. This will hapen for a
- // type without specified type.
- if (specifiedType == null && memberType == null)
- return null;
-
- String innerSpecifiedType = specifiedType;
-
- IType resolvedType = resolveType(declaringType, memberType);
- // we were able to get a type for the param of a method or type of
- // a field.
- // check if it is an interface. It might not be resolved, but we have a
- // value
- // for unresolved.
- if (methodOrField) {
- // if the resolved type is not null and it is not an interface this
- // annotation is not valid
- if (resolvedType != null) {
- if (resolvedType.isInterface())
- memberType = resolvedType.getFullyQualifiedName();
- else
- // invalid - if the method is with param that is not an
- // interface. Or the type of the field is not an interface.
- return null;
- }
- }
- // from now one use only the specified type for type resolving. If there
- // is no specified type use the member type. The check for whether they
- // were both null is previously made
- IType resolvedSpecifiedType = null;
- if (innerSpecifiedType == null) {
- innerSpecifiedType = memberType;
- resolvedSpecifiedType = resolvedType;
- } else
- resolvedSpecifiedType = resolveType(declaringType, innerSpecifiedType);
- if (resolvedSpecifiedType != null) {
- if (resolvedSpecifiedType.isInterface()) {
- innerSpecifiedType = resolvedSpecifiedType.getFullyQualifiedName();
- dependedTypes.add(resolvedSpecifiedType);
- } else
- // we have resolved the specified type and it is not an
- // interface. Not a valid annotation.
- return null;
- }
- return innerSpecifiedType;
- }
-
- /**
- * This method returns a qualified name for this member. The name is to be
- * used as ejb-ref-name.
- *
- * If the member is a type then fullyQualifiedName of the type is returned.
- *
- * If the member is a <code>field</code> declared in a <code>type</code>
- * then the result is
- * <code>type.getFullyQualifiedName() +"/" + field.elementName</code>
- *
- * If the member is a <code>method</code> declared in a <code>type</code>
- * and method name begins with "set" then: for type name =
- * "org.eclipse.Bean" and method name = "setMethodOne()" the result is
- * "org.eclipse.Bean/methodOne"
- *
- * Check this at Enterprise Java Beans, 3.0, Section 14.1.5.3
- *
- * @param member
- * @return
- */
- private String getMemberQualifiedName(IMember member) {
- String memberName = member.getElementName();
- int elementType = member.getElementType();
- if (elementType == IJavaElement.METHOD && memberName.startsWith("set")) { //$NON-NLS-1$
- char ch = Character.toLowerCase(memberName.charAt(3));
- memberName = ch + memberName.substring(4);
- }
- return elementType == IJavaElement.TYPE ? ((IType) member).getFullyQualifiedName() : member.getDeclaringType()
- .getFullyQualifiedName()
- + "/" + memberName; //$NON-NLS-1$
- }
-
- /**
- * Return the javaee type of this member. For types return <code>null</code>.
- * For methods with one param return the java type of this param. For fields
- * return the return the java type of the field.
- *
- * If the result is <code>null</code> then this member is not valid and a
- * javaee type can not be returned. This may happen for a method with more
- * then one param or for a field with a class type or primitive type
- *
- * @param member
- * @param memberType
- *
- * @return
- * @throws JavaModelException
- */
- private String getUnresolvedType(IMember member) throws JavaModelException {
- int memberType = member.getElementType();
- String unresolvedTypeName = null;
- if (memberType == IJavaElement.FIELD) {
- unresolvedTypeName = Signature.toString(((IField) member).getTypeSignature());
- } else if (memberType == IJavaElement.METHOD) {
- IMethod method = (IMethod) member;
- if (method.getNumberOfParameters() != 1)
- return null;
- unresolvedTypeName = Signature.toString(method.getParameterTypes()[0]);
- } else if (memberType == IJavaElement.TYPE)
- return null;
- return unresolvedTypeName;
- }
-
- /**
- * Returns the type signature for toResolve only if toResolve is a class or
- * interface.
- *
- * @param toResolve
- * @return <code>null</code> if toResolve is <code>null</code> or simple
- * type, array type, wildcard type
- *
- */
- private String getClassTypeSignature(String toResolve) {
- if (toResolve == null)
- return null;
-
- String innerToResolve = Signature.createTypeSignature(toResolve, false);
- if (Signature.getTypeSignatureKind(innerToResolve) != Signature.CLASS_TYPE_SIGNATURE)
- return null;
- return innerToResolve;
- }
-
- protected void processDeclareRoles(Result result, List<SecurityRoleRef> securityRoleRefs, IAnnotation annotation,
- IType type) throws JavaModelException {
- IMemberValuePair[] pairs = annotation.getMemberValuePairs();
- Object values = getAnnotatedValue("value", pairs); //$NON-NLS-1$
- if (!isArrayOfObject(values))
- return;
- for (Object roleName : (Object[]) values) {
- SecurityRole role = JavaeeFactory.eINSTANCE.createSecurityRole();
- role.setRoleName((String) roleName);
- result.getAdditional().add(role);
- SecurityRoleRef ref = JavaeeFactory.eINSTANCE.createSecurityRoleRef();
- ref.setRoleName((String) roleName);
- securityRoleRefs.add(ref);
- }
- }
-
- protected void processResourcesAnnotation(IAnnotation annotation, List<ResourceRef> resourceRefs, IType type,
- Collection<IType> dependedTypes) throws JavaModelException {
- IMemberValuePair[] pairs = annotation.getMemberValuePairs();
- if (!isArrayOfObject(pairs[0].getValue()))
- return;
- Object[] values = (Object[]) pairs[0].getValue();
- for (Object resourceAnnotation : values) {
- processResourceRefAnnotation((IAnnotation) resourceAnnotation, resourceRefs, type, dependedTypes);
- }
- }
-
- protected void processRunAs(IAnnotation annotation,RunAs runAs) throws JavaModelException {
- IMemberValuePair[] pairs = annotation.getMemberValuePairs();
- if (pairs.length == 1) {
- String value = (String) getAnnotatedValue("value", pairs); //$NON-NLS-1$
- runAs.setRoleName(value);
- }
- }
-}
diff --git a/plugins/org.eclipse.jst.jee/common/org/eclipse/jst/jee/model/internal/common/AbstractAnnotationModelProvider.java b/plugins/org.eclipse.jst.jee/common/org/eclipse/jst/jee/model/internal/common/AbstractAnnotationModelProvider.java
deleted file mode 100644
index e2a2ac9..0000000
--- a/plugins/org.eclipse.jst.jee/common/org/eclipse/jst/jee/model/internal/common/AbstractAnnotationModelProvider.java
+++ /dev/null
@@ -1,571 +0,0 @@
-/***********************************************************************
- * Copyright (c) 2008 by SAP AG, Walldorf.
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
- *
- * Contributors:
- * SAP AG - initial API and implementation
- ***********************************************************************/
-package org.eclipse.jst.jee.model.internal.common;
-
-import java.util.ArrayList;
-import java.util.Collection;
-import java.util.concurrent.locks.Lock;
-import java.util.concurrent.locks.ReentrantLock;
-
-import org.eclipse.core.resources.IContainer;
-import org.eclipse.core.resources.IFile;
-import org.eclipse.core.resources.IResource;
-import org.eclipse.core.resources.IResourceProxy;
-import org.eclipse.core.resources.IResourceProxyVisitor;
-import org.eclipse.core.runtime.Assert;
-import org.eclipse.core.runtime.CoreException;
-import org.eclipse.core.runtime.IPath;
-import org.eclipse.core.runtime.ISafeRunnable;
-import org.eclipse.core.runtime.IStatus;
-import org.eclipse.core.runtime.SafeRunner;
-import org.eclipse.core.runtime.Status;
-import org.eclipse.jdt.core.ElementChangedEvent;
-import org.eclipse.jdt.core.ICompilationUnit;
-import org.eclipse.jdt.core.IElementChangedListener;
-import org.eclipse.jdt.core.IJavaElementDelta;
-import org.eclipse.jdt.core.IJavaProject;
-import org.eclipse.jdt.core.IPackageFragment;
-import org.eclipse.jdt.core.IPackageFragmentRoot;
-import org.eclipse.jdt.core.JavaCore;
-import org.eclipse.jst.j2ee.model.IModelProvider;
-import org.eclipse.jst.j2ee.model.IModelProviderEvent;
-import org.eclipse.jst.j2ee.model.IModelProviderListener;
-import org.eclipse.jst.javaee.core.JavaEEObject;
-import org.eclipse.jst.javaee.core.SecurityRole;
-import org.eclipse.jst.javaee.core.SecurityRoleRef;
-import org.eclipse.jst.javaee.ejb.SessionBean;
-import org.eclipse.jst.jee.JEEPlugin;
-import org.eclipse.wst.common.project.facet.core.IFacetedProject;
-
-/**
- * Base implementation for model providers based on annotations in java files.
- *
- * Listeners can be registered with {@link #addListener(IModelProviderListener)}
- *
- * @author Kiril Mitov k.mitov@sap.com
- *
- */
-public abstract class AbstractAnnotationModelProvider<T> implements IElementChangedListener, IModelProvider {
-
- private static final String JAVA_EXTENSION = "java"; //$NON-NLS-1$
-
- /**
- * Find the security role with the given name in the given assembly
- * descriptor.
- *
- * @param assembly
- * @param name
- * @return <code>null</code> if a security role with this name can not be
- * found
- */
- private static SecurityRole findRole(Collection<SecurityRole> securityRoles, String name) {
- for (SecurityRole role : securityRoles) {
- if (role.getRoleName().equals(name))
- return role;
- }
- return null;
- }
-
- protected T modelObject;
-
- private Collection<IModelProviderListener> listeners;
-
- private Lock listenersLock = new ReentrantLock();
-
- protected IFacetedProject facetedProject;
-
- private ManyToOneRelation<SecurityRoleRef, SecurityRole> rolesToRolesRef = new ManyToOneRelation<SecurityRoleRef, SecurityRole>();
-
- /**
- * Constructs a new AnnotationReader for this faceted project. An illegal
- * argument if a project with value <code>null</code> is passed. No loading
- * is done in this constructor. Loading the model is made on demand when
- * calling {@link #getModelObject()}.
- *
- * @param project
- * the ejb project. Can not be <code>null</code>
- */
- public AbstractAnnotationModelProvider(IFacetedProject project) {
- if (project == null)
- throw new IllegalArgumentException("The project argument can not be null"); //$NON-NLS-1$
- this.facetedProject = project;
- }
-
- public T getConcreteModel() {
- if (modelObject == null) {
- preLoad();
- try {
- loadModel();
- /*
- * Adding the resource change listener after loading the model.
- * No resource change event are acceptable while loading the
- * model.
- */
- postLoad();
- } catch (CoreException e) {
- log(e.getStatus());
- return null;
- }
- }
- return modelObject;
- }
-
- public Object getModelObject() {
- return getConcreteModel();
- }
-
- public Object getModelObject(IPath modelPath) {
- return getConcreteModel();
- }
-
- protected abstract void loadModel() throws CoreException;
-
- protected void preLoad() {
- }
-
- protected void postLoad() {
- JavaCore.addElementChangedListener(this);
- }
-
- /**
- * Notifies the currently registered listeners with this model event. If the
- * {@link IModelProviderEvent#getChangedResources()} is empty or
- * <code>null</code> the method returns immediately.
- *
- * @param event
- * the event that should be send to the listeners
- */
- protected void notifyListeners(final IModelProviderEvent event) {
- if (listeners == null)
- return;
- listenersLock.lock();
- try {
- IModelProviderListener[] backup = listeners.toArray(new IModelProviderListener[listeners.size()]);
- notifyListeners(backup, event);
- backup = null;
- } finally {
- listenersLock.unlock();
- }
- }
-
- /**
- * Clears the list of listeners. No notifications can occur while clearing
- * the listeners.
- */
- protected void clearListeners() {
- if (listeners == null)
- return;
- try {
- listenersLock.lock();
- listeners.clear();
- listeners = null;
- } finally {
- listenersLock.unlock();
- }
- }
-
- private void notifyListeners(final IModelProviderListener[] aListeners, final IModelProviderEvent event) {
- if (event.getChangedResources() == null || event.getChangedResources().isEmpty())
- return;
- for (final IModelProviderListener listener : aListeners) {
- SafeRunner.run(new ISafeRunnable() {
- public void handleException(Throwable exception) {
- }
-
- public void run() throws Exception {
- listener.modelsChanged(event);
- }
- });
- }
- }
-
- /**
- * @return the currently registered listeners.
- */
- protected Collection<IModelProviderListener> getListeners() {
- if (listeners == null) {
- listeners = new ArrayList<IModelProviderListener>();
- }
- return listeners;
- }
-
- /**
- * Adds a listener to this instance. No listeners can be added during
- * notifying the current listeners.
- *
- * @param listener
- */
- public void addListener(IModelProviderListener listener) {
- listenersLock.lock();
- try {
- getModelObject();
- getListeners().add(listener);
- } finally {
- listenersLock.unlock();
- }
- }
-
- /**
- * Removes the listener from this instance. Has no effect if an identical
- * listener is not registered.
- *
- * @param listener
- * the listener to be removed.
- */
- public void removeListener(IModelProviderListener listener) {
- listenersLock.lock();
- try {
- getListeners().remove(listener);
- } finally {
- listenersLock.unlock();
- }
-
- }
-
- /**
- * @param javaProject
- * @return true if the given project contains resources that are relative to
- * the model. This method returns <code>true</code> for the
- * ejbProject on which this instance is working a <code>true</code>
- * for its client project.
- */
- protected boolean isProjectRelative(IJavaProject javaProject) {
- if (javaProject == null || facetedProject == null)
- return false;
- else if (javaProject.getProject().equals(facetedProject.getProject()))
- return true;
- return false;
- }
-
- /**
- * Dispose the current instance. The actual dispose may occur in another
- * thread. Use {@link #addListener(IModelProviderListener)} to register a
- * listener that will be notified when the instance is disposed. After all
- * the listeners are notified the list of listeners is cleared.
- */
- public void dispose() {
- IModelProviderEvent modelEvent = createModelProviderEvent();
- modelEvent.addResource(facetedProject.getProject());
- modelEvent.setEventCode(IModelProviderEvent.UNLOADED_RESOURCE);
- JavaCore.removeElementChangedListener(this);
- modelObject = null;
- notifyListeners(modelEvent);
- clearListeners();
- }
-
- /**
- * Process a unit as "removed". The method is allowed not to make checks
- * whether the unit was added/removed/change. It is processing the unit as
- * "removed".
- *
- * If no model object depends on the given file "modelEvent" is not changed.
- *
- * @see #processAddedCompilationUnit(IModelProviderEvent, ICompilationUnit)
- * @param modelEvent
- * subclasses should "fill" modelEvent with information about the
- * change that has happened. This event will be propagated to
- * model provided listeners.
- * @param file
- * the file to be removed.
- * @throws CoreException
- * if there was an error during parsing the file
- */
- protected abstract void processRemovedCompilationUnit(IModelProviderEvent modelEvent, ICompilationUnit unit)
- throws CoreException;
-
- /**
- * Process a unit as "added". The method is allowed not to make checks
- * whether the unit was added/removed/change. It is processing the file as
- * "added". It is the responsibility of the caller to make sure the
- * processing of the file as added will not leave the model in a wrong
- * state.
- *
- * modelEvent is changed to contain information about the added modelObject.
- *
- * @see #processRemovedCompilationUnit(IModelProviderEvent,
- * ICompilationUnit)
- * @param modelEvent
- * subclasses should "fill" modelEvent with information about the
- * change that has happened. This event will be propagated to
- * model provided listeners.
- * @param file
- * the file that was added
- * @throws CoreException
- */
- protected abstract void processAddedCompilationUnit(IModelProviderEvent modelEvent, ICompilationUnit file)
- throws CoreException;
-
- /**
- * Process a unit as "changed". The method is allowed not to make checks
- * whether the unit was added/removed/change. It is processing the unit as
- * "changed". It is the responsibility of the caller to make sure the
- * processing of the file as "changed" will not leave the model in a wrong
- * state.
- *
- * @see #processAddedCompilationUnit(IModelProviderEvent, ICompilationUnit)
- * @see #processRemovedCompilationUnit(IModelProviderEvent,
- * ICompilationUnit)
- * @param modelEvent
- * subclasses should "fill" modelEvent with information about the
- * change that has happened. This event will be propagated to
- * model provided listeners.
- * @param unit
- * the unti that was changed
- * @throws CoreException
- */
- protected abstract void processChangedCompilationUnit(IModelProviderEvent modelEvent, ICompilationUnit file)
- throws CoreException;
-
- protected void log(IStatus status) {
- }
-
- protected MyModelProviderEvent createModelProviderEvent() {
- return new MyModelProviderEvent(0, null, facetedProject.getProject());
- }
-
- // ---------------SECURITY ROLES ---------------------------//
- protected abstract Collection<SecurityRole> getSecurityRoles();
-
- protected abstract Collection<SecurityRoleRef> getSecurityRoleRefs(JavaEEObject target);
-
- /**
- * Deletes the connection maintained by the given bean and the security
- * roles defined in the bean. If this is the only bean in which the role is
- * defined, the role will also be deleted. Calling this method makes sense
- * only if the bean and the security role and the bean were connected with
- * {@link #connectWithRole(SecurityRole, SessionBean)}
- *
- * <p>
- * If the bean is not of type org.eclipse.jst.javaee.ejb.SessionBean the
- * method returns immediately.
- * </p>
- *
- * @see #connectWithRole(SecurityRole, SessionBean)
- * @see #rolesToRolesRef
- * @param bean
- */
- protected void disconnectFromRoles(JavaEEObject target) {
- Collection<SecurityRole> roles = getSecurityRoles();
- if (roles == null)
- return;
- Collection<SecurityRoleRef> refs = getSecurityRoleRefs(target);
- if (refs == null)
- return;
- for (SecurityRoleRef ref : refs) {
- SecurityRole role = rolesToRolesRef.getTarget(ref);
- rolesToRolesRef.disconnectSource(ref);
- if (!rolesToRolesRef.containsTarget(role)) {
- getSecurityRoles().remove(role);
- }
- }
- }
-
- /**
- * A security role was found in the given file. Add this security role to
- * the assembly descriptor. If the ejbJar does not have an assembly
- * descriptor a new one is created.
- *
- * @see #connectRoleWithBean(SecurityRole, SessionBean)s
- * @param file
- * @param securityRole
- */
- protected void securityRoleFound(JavaEEObject object, SecurityRole securityRole) {
- connectWithRole(securityRole, object);
- }
-
- /**
- * A security role can be defined in more the one bean. A bean can define
- * more then one security role. This means we have a many-to-many relation
- * between sessionBeans and securityRoles.
- *
- * <p>
- * Luckily a sessionBean contains a list of securityRoleRefs. This method
- * creates a connection between the securityRole contained in the assembly
- * descriptor and the security role ref contained in the bean.
- *
- * If a security role is define only in one bean, deleting the bean means
- * deleting the security role. But if the security role is defined in two
- * beans only deleting both beans will result in deleting the security role.
- * </p>
- *
- * @see #disconnectFromRoles(JavaEEObject)
- * @see #rolesToRolesRef
- * @param securityRole
- * @param target
- */
- private void connectWithRole(SecurityRole securityRole, JavaEEObject target) {
- Collection<SecurityRole> roles = getSecurityRoles();
- if (roles == null)
- return;
- Collection<SecurityRoleRef> refs = getSecurityRoleRefs(target);
- if (refs == null)
- return;
- /*
- * If there is a security role with this name use the existing security
- * role.
- */
- SecurityRole role = findRole(roles, securityRole.getRoleName());
- if (role == null) {
- roles.add(securityRole);
- role = securityRole;
- }
- for (SecurityRoleRef ref : refs) {
- if (ref.getRoleName().equals(role.getRoleName()))
- rolesToRolesRef.connect(ref, role);
- }
- }
-
- public void elementChanged(final ElementChangedEvent javaEvent) {
- if (javaEvent.getType() == ElementChangedEvent.POST_RECONCILE)
- internalPostReconcile(javaEvent);
- else if (javaEvent.getType() == ElementChangedEvent.POST_CHANGE)
- internalPostChange(javaEvent);
- }
-
- private void internalPostChange(ElementChangedEvent javaEvent) {
- IModelProviderEvent modelEvent = createModelProviderEvent();
- // handles ElementChangedEvent.POST_CHANGE - the case when the
- // compilation unit has been changed
- for (IJavaElementDelta child : javaEvent.getDelta().getAffectedChildren()) {
- if (child.getElement() instanceof IJavaProject) {
- processChangedProject(modelEvent, child);
- notifyListeners(modelEvent);
- }
- }
- }
-
- private void internalPostReconcile(final ElementChangedEvent javaEvent) {
- IModelProviderEvent modelEvent = createModelProviderEvent();
- if (javaEvent.getDelta().getElement() instanceof ICompilationUnit) {
- recursevilyProcessCompilationUnits(modelEvent, javaEvent.getDelta());
- notifyListeners(modelEvent);
- }
- }
-
- protected void processChangedProject(IModelProviderEvent event, IJavaElementDelta projectDelta) {
- if (!isProjectRelative(projectDelta.getElement().getJavaProject())) {
- return;
- }
- Assert.isTrue(projectDelta.getElement() instanceof IJavaProject,
- "An invalid change notification has occured. Element is <" + projectDelta.getElement() + ">"); //$NON-NLS-1$//$NON-NLS-2$
- if (((projectDelta.getFlags() & IJavaElementDelta.F_OPENED) != 0)
- || projectDelta.getKind() == IJavaElementDelta.ADDED) {
- try {
- loadModel();
- } catch (CoreException e) {
- JEEPlugin.getDefault().getLog().log(
- new Status(IStatus.ERROR, JEEPlugin.getDefault().getPluginID(), e.getMessage(), e));
- }
- }
-
- if (((projectDelta.getFlags() & IJavaElementDelta.F_CLOSED) != 0)
- || projectDelta.getKind() == IJavaElementDelta.REMOVED) {
- dispose();
- }
-
- processChangedProjectChildren(event, projectDelta);
- }
-
- protected void processChangedProjectChildren(IModelProviderEvent event, IJavaElementDelta projectDelta) {
- for (IJavaElementDelta childDelta : projectDelta.getAffectedChildren()) {
- if (!(childDelta.getElement() instanceof IPackageFragmentRoot)) {
- continue;
- }
- if ((childDelta.getFlags() & IJavaElementDelta.F_CHILDREN) != 0) {
- recursevilyProcessPackages(event, childDelta);
- }
- }
- }
-
- public void recursevilyProcessPackages(IModelProviderEvent modelEvent, IJavaElementDelta delta) {
- if (delta.getElement() instanceof IPackageFragment) {
- try {
- IPackageFragment fragment = (IPackageFragment) delta.getElement();
- if (delta.getKind() == IJavaElementDelta.ADDED) {
- for (ICompilationUnit unit : fragment.getCompilationUnits()) {
- processAddedCompilationUnit(modelEvent, unit);
- }
- } else if (delta.getKind() == IJavaElementDelta.REMOVED) {
- if (delta.getKind() == IJavaElementDelta.REMOVED) {
- processRemovedPackage(modelEvent, delta);
- }
- } else if (delta.getKind() == IJavaElementDelta.CHANGED) {
- recursevilyProcessCompilationUnits(modelEvent, delta);
- }
- } catch (CoreException e) {
- JEEPlugin.getDefault().getLog().log(
- new Status(IStatus.ERROR, JEEPlugin.getDefault().getPluginID(), e.getMessage(), e));
- }
- } else {
- for (IJavaElementDelta childDelta : delta.getAffectedChildren()) {
- recursevilyProcessPackages(modelEvent, childDelta);
- }
- }
- }
-
- protected abstract void processRemovedPackage(IModelProviderEvent modelEvent, IJavaElementDelta delta)
- throws CoreException;
-
- public void recursevilyProcessCompilationUnits(IModelProviderEvent modelEvent, IJavaElementDelta delta) {
- if (delta.getElement() instanceof ICompilationUnit) {
- if (!isProjectRelative(delta.getElement().getJavaProject()))
- return;
- try {
- final ICompilationUnit unit = (ICompilationUnit) delta.getElement();
-
- if (delta.getKind() == IJavaElementDelta.ADDED) {
- processAddedCompilationUnit(modelEvent, unit);
- }
- if (delta.getKind() == IJavaElementDelta.REMOVED) {
- processRemovedCompilationUnit(modelEvent, unit);
- }
- if (delta.getKind() == IJavaElementDelta.CHANGED) {
- if (((delta.getFlags() & IJavaElementDelta.F_PRIMARY_RESOURCE) == 0)
- || ((delta.getFlags() & IJavaElementDelta.F_PRIMARY_WORKING_COPY) == 0)) {
- modelEvent
- .setEventCode(IModelProviderEvent.KNOWN_RESOURCES_CHANGED | modelEvent.getEventCode());
- processChangedCompilationUnit(modelEvent, unit);
- }
- }
- } catch (CoreException e) {
- JEEPlugin.getDefault().getLog().log(
- new Status(IStatus.ERROR, JEEPlugin.getDefault().getPluginID(), e.getMessage(), e));
- }
- } else {
- for (IJavaElementDelta childDelta : delta.getAffectedChildren()) {
- recursevilyProcessCompilationUnits(modelEvent, childDelta);
- }
- }
- }
-
- protected void visitJavaFiles(final Collection<ICompilationUnit> javaFiles, final IPackageFragmentRoot root)
- throws CoreException {
- if (root.getKind() != IPackageFragmentRoot.K_SOURCE)
- return;
- root.getCorrespondingResource().accept(new IResourceProxyVisitor() {
- public boolean visit(IResourceProxy proxy) throws CoreException {
- if (proxy.getType() == IResource.FILE) {
- if (proxy.getName().endsWith("." + JAVA_EXTENSION)) { //$NON-NLS-1$
- IFile file = (IFile) proxy.requestResource();
- if (!root.getJavaProject().isOnClasspath(file))
- return false;
- if (!file.isSynchronized(IResource.DEPTH_ONE))
- return false;
- javaFiles.add(JavaCore.createCompilationUnitFrom(file));
- }
- return false;
- }
- return true;
- }
- }, IContainer.NONE);
-
- }
-}
diff --git a/plugins/org.eclipse.jst.jee/common/org/eclipse/jst/jee/model/internal/common/AbstractMergedModelProvider.java b/plugins/org.eclipse.jst.jee/common/org/eclipse/jst/jee/model/internal/common/AbstractMergedModelProvider.java
deleted file mode 100644
index c3328ec..0000000
--- a/plugins/org.eclipse.jst.jee/common/org/eclipse/jst/jee/model/internal/common/AbstractMergedModelProvider.java
+++ /dev/null
@@ -1,376 +0,0 @@
-/***********************************************************************
- * Copyright (c) 2008 by SAP AG, Walldorf.
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
- *
- * Contributors:
- * SAP AG - initial API and implementation
- ***********************************************************************/
-package org.eclipse.jst.jee.model.internal.common;
-
-import java.util.ArrayList;
-import java.util.Collection;
-
-import org.eclipse.core.resources.IProject;
-import org.eclipse.core.resources.IWorkspace;
-import org.eclipse.core.resources.IWorkspaceRunnable;
-import org.eclipse.core.runtime.CoreException;
-import org.eclipse.core.runtime.IPath;
-import org.eclipse.core.runtime.IProgressMonitor;
-import org.eclipse.core.runtime.ISafeRunnable;
-import org.eclipse.core.runtime.IStatus;
-import org.eclipse.core.runtime.NullProgressMonitor;
-import org.eclipse.core.runtime.SafeRunner;
-import org.eclipse.emf.ecore.EObject;
-import org.eclipse.emf.ecore.resource.Resource;
-import org.eclipse.emf.ecore.resource.impl.ResourceImpl;
-import org.eclipse.jst.j2ee.model.IModelProvider;
-import org.eclipse.jst.j2ee.model.IModelProviderEvent;
-import org.eclipse.jst.j2ee.model.IModelProviderListener;
-import org.eclipse.jst.jee.JEEPlugin;
-import org.eclipse.wst.common.internal.emfworkbench.WorkbenchResourceHelper;
-
-/**
- * A base class for model providers providing a merged view between two
- * different model providers. The instance will be called "mergedModelProvider"
- * where the two composed providers will be called "internalProviders"
- *
- * This class introduces the notation of a disposed state. {@link #dispose()} is
- * used to dispose the model provider. {@link #isDisposed()} is used to get the
- * state of the provider. If the method {@link #getModelObject()} is called for
- * a model provider in a disposed state, the provider should try to move to a
- * non disposed state and return a correct model object.
- * {@link #getModelObject()} is loading the model. Specific implementations may
- * throw exceptions so calling {@link #getModelObject()} on a disposed provider
- * does not guarantee that calling {@link #isDisposed()} after that will return
- * <code>false</code>.
- *
- * <p>
- * Subclasses may enable/disable notifications from internalProviders with the
- * methods {@link #enableInternalNotifications()} and
- * {@link #disableInternalNotifications()}.
- * </p>
- *
- * <p>
- * internalProviders are loaded with {@link #loadDeploymentDescriptorModel()}
- * and {@link #loadAnnotationModel(Object)}. This methods should be overridden to
- * provide specific model providers. Loading the model providers is wrapped in a
- * workspace runnable to assure proper access to the workspace.
- * </p>
- *
- * <p>
- * The mergedModelProvider is a listener to the internalProviders. After
- * disposing the instance of a mergedModelProvider it should no longer accept
- * notifications from the internalProviders. It should also properly "dispose"
- * the internalProviders if needed.
- * </p>
- *
- * @author Kiril Mitov k.mitov@sap.com
- *
- */
-public abstract class AbstractMergedModelProvider<T> implements IModelProvider {
-
- protected IModelProvider ddProvider;
-
- protected IModelProvider annotationModelProvider;
-
- private class AnnotationModelListener implements IModelProviderListener {
- public void modelsChanged(IModelProviderEvent event) {
- if (disposeIfNeeded(event))
- return;
- AbstractMergedModelProvider.this.annotationModelChanged(event);
- }
- }
-
- private class XmlModelListener implements IModelProviderListener {
- public void modelsChanged(IModelProviderEvent event) {
- if (disposeIfNeeded(event))
- return;
- AbstractMergedModelProvider.this.xmlModelChanged(event);
- if (ddProvider != null){
- cache_last_change = getLastModificationTimeOfDDFile();
- }
- }
- }
-
- /**
- * @param event
- * @return true if the model provider is disposed.
- */
- private boolean disposeIfNeeded(IModelProviderEvent event) {
- if (isDisposed() || mergedModel == null)
- return true;
- if (shouldDispose(event)) {
- dispose();
- notifyListeners(event);
- return true;
- }
- return false;
- }
-
- private Collection<IModelProviderListener> listeners;
-
- protected IProject project;
-
- private AnnotationModelListener annotationModelListener;
- private XmlModelListener xmlModelListener;
-
- protected T mergedModel;
-
- protected long cache_last_change;
-
- public AbstractMergedModelProvider(IProject project) {
- this.project = project;
- }
-
- public void addListener(IModelProviderListener listener) {
- getListeners().add(listener);
- }
-
- /**
- * Returns the model merged from annotation and xml model. If the project is
- * closed or does not exist the returns <code>null</code>
- *
- * @see org.eclipse.jst.j2ee.model.IModelProvider#getModelObject()
- */
- public Object getModelObject() {
- return getMergedModel();
- }
-
- /*
- * (non-Javadoc)
- *
- * @see org.eclipse.jst.j2ee.model.IModelProvider#modify(java.lang.Runnable,
- * org.eclipse.core.runtime.IPath)
- */
- public void modify(Runnable runnable, IPath modelPath) {
- }
-
- public void removeListener(IModelProviderListener listener) {
- getListeners().remove(listener);
- }
-
- /*
- * (non-Javadoc)
- *
- * @see
- * org.eclipse.jst.j2ee.model.IModelProvider#validateEdit(org.eclipse.core
- * .runtime.IPath, java.lang.Object)
- */
- public IStatus validateEdit(IPath modelPath, Object context) {
- if (ddProvider == null)
- getModelObject();
- return ddProvider.validateEdit(modelPath, context);
- }
-
- /**
- * Called when the annotationModel has changed. See also
- * {@link #enableInternalNotifications()} and
- * {@link #disableInternalNotifications()}
- *
- * @param event
- */
- protected abstract void annotationModelChanged(IModelProviderEvent event);
-
- /**
- * Called when the xmlModel has changed. See also
- * {@link #enableInternalNotifications()} and
- * {@link #disableInternalNotifications()}
- *
- * @param event
- */
- protected abstract void xmlModelChanged(IModelProviderEvent event);
-
- /**
- * Return a merged view of the two passed models.
- *
- * @param ddModel
- * @param annotationsModel
- * @return
- */
- protected abstract T merge(T ddModel, T annotationsModel);
-
- /**
- * Load the annotation model in the context of the ddModel.
- *
- * @param ddModel
- * @return
- * @throws CoreException
- */
- protected abstract IModelProvider loadAnnotationModel(T ddModel) throws CoreException;
-
- /**
- * @return
- * @throws CoreException
- */
- protected abstract IModelProvider loadDeploymentDescriptorModel() throws CoreException;
-
- public Collection<IModelProviderListener> getListeners() {
- if (listeners == null)
- listeners = new ArrayList<IModelProviderListener>();
- return listeners;
- }
-
- protected T getMergedModel() {
- try {
- if (mergedModel == null || hasToReloadModel()){
- mergedModel = loadModel();
- }
- } catch (CoreException e) {
- JEEPlugin.getDefault().getLog().log(e.getStatus());
- return null;
- }
- return mergedModel;
- }
-
- private boolean hasToReloadModel() {
- long lastModificationTimeOfDDFile = getLastModificationTimeOfDDFile();
- return lastModificationTimeOfDDFile == -1 ? false : lastModificationTimeOfDDFile != cache_last_change;
-// return false;
- }
-
- private long getLastModificationTimeOfDDFile() {
- if (ddProvider == null || ((EObject)ddProvider.getModelObject()).eResource() == null){
- return -1;
- }
- return WorkbenchResourceHelper.getFile(((EObject)ddProvider.getModelObject()).eResource()).getLocalTimeStamp();
- }
-
- /**
- * @return a merged view of the models from the internalProviders. This may
- * include loading the internalProviders.
- * @throws CoreException
- */
- protected T loadModel() throws CoreException {
- if (!project.isAccessible())
- throw new IllegalStateException("The project <" + project + "> is not accessible."); //$NON-NLS-1$//$NON-NLS-2$
- project.getWorkspace().run(new LoadModelsWorkspaceRunnable(), project, IWorkspace.AVOID_UPDATE,
- new NullProgressMonitor());
- return mergedModel;
- }
-
- @SuppressWarnings("unchecked")
- private void loadProviders() throws CoreException {
- if (ddProvider == null || hasToReloadModel()) {
- if (hasToReloadModel())
- ((EObject)ddProvider.getModelObject()).eResource().unload();
- ddProvider = loadDeploymentDescriptorModel();
- }
- if (ddProvider == null || ddProvider.getModelObject() == null)
- return;
- if (annotationModelProvider == null)
- annotationModelProvider = loadAnnotationModel((T) ddProvider.getModelObject());
- if (annotationModelProvider == null || annotationModelProvider.getModelObject() == null)
- return;
- T ddModel = (T) ddProvider.getModelObject();
- T annotationModel = (T) annotationModelProvider.getModelObject();
- mergedModel = createNewModelInstance();
- initMergedModelResource((EObject) ddModel);
-
- enableInternalNotifications();
- merge(ddModel, annotationModel);
- }
-
- private class LoadModelsWorkspaceRunnable implements IWorkspaceRunnable {
- public void run(IProgressMonitor monitor) throws CoreException {
- loadProviders();
- }
- }
-
- /**
- * Creates a new instance of the model that will be used for mergedModel
- *
- * @return
- */
- protected abstract T createNewModelInstance();
-
- protected void initMergedModelResource(EObject ddModel) {
- Resource resourceDD = ddModel.eResource();
- if (ddProvider != null){
- cache_last_change = getLastModificationTimeOfDDFile();
- }
-
- Resource resourceMM = ((EObject) mergedModel).eResource();
- if (resourceDD != null && resourceMM == null) {
- ResourceImpl resRes = new ResourceImpl(resourceDD.getURI());
- resRes.getContents().add((EObject) mergedModel);
- }
-
- }
-
- /**
- * The method is used for enabling notifications from the internalProviders.
- * This will add the appropriate listener to the internalProviders so that
- * {@link #annotationModelChanged(IModelProviderEvent)} and
- * {@link #xmlModelChanged(IModelProviderEvent)} are called when needed.
- */
- protected final void enableInternalNotifications() {
- xmlModelListener = new XmlModelListener();
- ddProvider.addListener(xmlModelListener);
- annotationModelListener = new AnnotationModelListener();
- annotationModelProvider.addListener(annotationModelListener);
- }
-
- /**
- * Disable notifications from internalProviders. See also
- * {@link #enableInternalNotifications()}
- */
- protected final void disableInternalNotifications() {
- ddProvider.removeListener(xmlModelListener);
- annotationModelProvider.removeListener(annotationModelListener);
- }
-
- protected void notifyListeners(final IModelProviderEvent event) {
- event.setModel(this);
- event.setProject(project);
- final Collection<IModelProviderListener> listeners = getListeners();
- IModelProviderListener[] backup = listeners.toArray(new IModelProviderListener[listeners.size()]);
- for (final IModelProviderListener listener : backup) {
- SafeRunner.run(new ISafeRunnable() {
- public void handleException(Throwable exception) {
- }
-
- public void run() throws Exception {
- listener.modelsChanged(event);
- }
- });
- }
- backup = null;
- }
-
- protected boolean shouldDispose(IModelProviderEvent event) {
- return (event.getEventCode() == IModelProviderEvent.UNLOADED_RESOURCE);
- }
-
- /**
- * Returns the dispose state of this model provider. When the provider is
- * disposed it can not be used until getModelObject is called again.
- *
- * Subclasses may override this method.
- *
- * @return true if the model provider is to be treated as disposed
- */
- public boolean isDisposed() {
- return (ddProvider == null && annotationModelProvider == null);
- }
-
- /**
- * Dispose the model provider. If the provider is already disposed the
- * method has no effect.
- *
- * Subclasses may override this method.
- *
- * @see #isDisposed()
- */
- public void dispose() {
- if (isDisposed())
- return;
- disableInternalNotifications();
- ddProvider = null;
- annotationModelProvider = null;
- mergedModel = null;
- }
-
-}
diff --git a/plugins/org.eclipse.jst.jee/common/org/eclipse/jst/jee/model/internal/common/ManyToOneRelation.java b/plugins/org.eclipse.jst.jee/common/org/eclipse/jst/jee/model/internal/common/ManyToOneRelation.java
deleted file mode 100644
index 67111da..0000000
--- a/plugins/org.eclipse.jst.jee/common/org/eclipse/jst/jee/model/internal/common/ManyToOneRelation.java
+++ /dev/null
@@ -1,127 +0,0 @@
-/***********************************************************************
- * Copyright (c) 2008 by SAP AG, Walldorf.
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
- *
- * Contributors:
- * SAP AG - initial API and implementation
- ***********************************************************************/
-package org.eclipse.jst.jee.model.internal.common;
-
-import java.util.Collection;
-import java.util.HashMap;
-import java.util.Iterator;
-import java.util.LinkedList;
-import java.util.Map;
-
-/**
- * Introduces the notation of many-to-one relation. This is where the M and O of
- * the type signature comes from.
- *
- * Many unique "source" objects refer to one and only "target" object.
- *
- * The class maintains a connection between the target and all the sources that
- * are referring to it.
- *
- * @author Kiril Mitov k.mitov@sap.com
- *
- * @param <M>
- * the type of the "source" objects.
- * @param <O>
- * the type of the "target" objects.
- */
-public class ManyToOneRelation<M, O> {
-
- private Map<M, O> manyToOne = new HashMap<M, O>();
-
- /**
- * Connects the given source with the given target. If this source was
- * previously connected with another target the old connection is lost.
- *
- * @param source
- * @param target
- * @return
- */
- public boolean connect(M source, O target) {
- manyToOne.put(source, target);
- return false;
- }
-
- /**
- * @param source
- * @return <code>true</code> if the relation contains the given source
- */
- public boolean containsSource(M source) {
- return manyToOne.containsKey(source);
- }
-
- /**
- * @param target
- * @return <code>true</code> if the relation contains the given target
- */
- public boolean containsTarget(O target) {
- return manyToOne.containsValue(target);
- }
-
- /**
- * @param source
- * @return the target with which this source is connected
- */
- public O getTarget(M source) {
- return manyToOne.get(source);
- }
-
- /**
- * @param target
- * @return all the targets that are connected with this source or empty
- * collection if there are no sources connected with this target.
- */
- public Collection<M> getSources(O target) {
- Collection<M> files = new LinkedList<M>();
- for (Map.Entry<M, O> entry : manyToOne.entrySet()) {
- if (entry.getValue().equals(target))
- files.add(entry.getKey());
- }
- return files;
- }
-
- /**
- * Removes the connection between this source and the corresponding target.
- * Other sources will still point to the same target.
- *
- * The target is removed if this was the only source pointing to it and
- * {@link #containsTarget(Object)} will return false.
- *
- * @param source
- */
- public void disconnectSource(M source) {
- manyToOne.remove(source);
- }
-
- /**
- * Removes the given target from the relation. All the sources that are
- * pointing to this target are also removed.
- *
- * If you take the "result" of {@link #getSources(target)} and after that
- * call this method then {@link #containsSource(Object)} will return
- * <code>false</code> for every object in "result".
- *
- * @param target
- */
- public void disconnect(O target) {
- for (Iterator<O> iter = manyToOne.values().iterator(); iter.hasNext();) {
- if (iter.next().equals(target))
- iter.remove();
- }
- }
-
- /**
- * @return a collection of the targets.
- */
- public Collection<O> getTargets() {
- return manyToOne.values();
- }
-
-}
diff --git a/plugins/org.eclipse.jst.jee/common/org/eclipse/jst/jee/model/internal/common/MyModelProviderEvent.java b/plugins/org.eclipse.jst.jee/common/org/eclipse/jst/jee/model/internal/common/MyModelProviderEvent.java
deleted file mode 100644
index bf5ef79..0000000
--- a/plugins/org.eclipse.jst.jee/common/org/eclipse/jst/jee/model/internal/common/MyModelProviderEvent.java
+++ /dev/null
@@ -1,82 +0,0 @@
-/***********************************************************************
- * Copyright (c) 2008 by SAP AG, Walldorf.
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
- *
- * Contributors:
- * SAP AG - initial API and implementation
- ***********************************************************************/
-package org.eclipse.jst.jee.model.internal.common;
-
-import java.util.ArrayList;
-import java.util.Collection;
-import java.util.List;
-
-import org.eclipse.core.resources.IProject;
-import org.eclipse.jst.j2ee.model.IModelProvider;
-import org.eclipse.jst.j2ee.model.IModelProviderEvent;
-
-/**
- * @author Kiril Mitov k.mitov@sap.com
- *
- */
-class MyModelProviderEvent implements IModelProviderEvent {
- private IModelProvider model;
- private IProject proj;
- private int event;
-
- private List resources;
-
- public MyModelProviderEvent(int anEventCode, IModelProvider model, IProject proj) {
- setEventCode(anEventCode);
- setModel(model);
- setProject(proj);
- resources = new ArrayList();
- }
-
- public void setProject(IProject project) {
- proj = project;
-
- }
-
- public void addResource(Object resource) {
- resources.add(resource);
- }
-
- public void addResources(Collection<Object> someResources) {
- resources.addAll(someResources);
-
- }
-
- public List<Object> getChangedResources() {
- return resources;
- }
-
- public int getEventCode() {
- return event;
- }
-
- public IModelProvider getModel() {
- return model;
- }
-
- public void setChangedResources(List<Object> newChangedResources) {
- throw new UnsupportedOperationException();
- }
-
- public void setEventCode(int newEventCode) {
- event = newEventCode;
- }
-
- public void setModel(IModelProvider newModel) {
- model = newModel;
-
- }
-
- public IProject getProject() {
- return proj;
- }
-
-}
diff --git a/plugins/org.eclipse.jst.jee/common/org/eclipse/jst/jee/model/internal/common/Result.java b/plugins/org.eclipse.jst.jee/common/org/eclipse/jst/jee/model/internal/common/Result.java
deleted file mode 100644
index ef519af..0000000
--- a/plugins/org.eclipse.jst.jee/common/org/eclipse/jst/jee/model/internal/common/Result.java
+++ /dev/null
@@ -1,61 +0,0 @@
-/***********************************************************************
- * Copyright (c) 2008 by SAP AG, Walldorf.
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
- *
- * Contributors:
- * SAP AG - initial API and implementation
- ***********************************************************************/
-package org.eclipse.jst.jee.model.internal.common;
-
-import java.util.ArrayList;
-import java.util.Collection;
-import java.util.HashSet;
-
-import org.eclipse.jdt.core.IType;
-import org.eclipse.jst.javaee.core.JavaEEObject;
-
-/**
- * @author Kiril Mitov k.mitov@sap.com
- *
- */
-public class Result {
-
- private Collection<IType> dependedTypes;
-
- private Collection<JavaEEObject> modelObjects;
-
- private JavaEEObject mainObject;
-
- public Result() {
- dependedTypes = new HashSet<IType>();
- // most of the time there will be only one object in the model objects
- // list. Exceptions are made for results that will contain security
- // roles for example. This is way here the modelObjects collection is
- // ArrayList with size 1
- modelObjects = new ArrayList<JavaEEObject>(1);
- }
-
- public JavaEEObject getMainObject() {
- return mainObject;
- }
-
- public void setMainObject(JavaEEObject mainObject) {
- this.mainObject = mainObject;
- modelObjects.add(mainObject);
- }
-
- public Collection<JavaEEObject> getAdditional() {
- return modelObjects;
- }
-
- public Collection<IType> getDependedTypes() {
- return dependedTypes;
- }
-
- public boolean isEmpty() {
- return mainObject == null && getAdditional().isEmpty();
- }
-}
diff --git a/plugins/org.eclipse.jst.jee/common/org/eclipse/jst/jee/model/internal/mergers/BaseRefsMerger.java b/plugins/org.eclipse.jst.jee/common/org/eclipse/jst/jee/model/internal/mergers/BaseRefsMerger.java
deleted file mode 100644
index 79e45f6..0000000
--- a/plugins/org.eclipse.jst.jee/common/org/eclipse/jst/jee/model/internal/mergers/BaseRefsMerger.java
+++ /dev/null
@@ -1,68 +0,0 @@
-/***********************************************************************
- * Copyright (c) 2008 by SAP AG, Walldorf.
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
- *
- * Contributors:
- * SAP AG - initial API and implementation
- ***********************************************************************/
-package org.eclipse.jst.jee.model.internal.mergers;
-
-import java.util.ArrayList;
-import java.util.List;
-
-/**
- * Base abstract class for JNDI mergers
- *
- * @author Dimitar Giormov
- */
-public abstract class BaseRefsMerger extends ModelElementsMerger {
-
- /**
- * Constructor for the class
- *
- * @param baseList -
- * base list of references that have higher priority and are
- * result of the merge.
- * @param toMergeList -
- * toMerge list of references
- */
- public BaseRefsMerger(List baseList, List toMergeList) {
- super(baseList, toMergeList);
- }
-
- /**
- * When an entry with the same name is present in both lists, missing valuse
- * in base are filled by toMerge element.
- *
- * @param baseList -
- * base list of references
- * @param toMergeList -
- * toMerge list of references
- */
- protected abstract void copyMissingPropertesInBase(Object base, Object toMerge);
-
- /**
- * @param itListBase
- * @param itListToMerge
- * @return
- */
- protected List mergeIngectionTargets(List itListBase, List itListToMerge) {
- // TODO
- List result = new ArrayList();
- return result;
- }
-
- /**
- * @param descrListBase
- * @param descrListToMerge
- * @return
- */
- protected List mergeDescriptions(List descrListBase, List descrListToMerge) {
- List result = new ArrayList();
- return result;
- }
-
-}
diff --git a/plugins/org.eclipse.jst.jee/common/org/eclipse/jst/jee/model/internal/mergers/EJBRefsMerger.java b/plugins/org.eclipse.jst.jee/common/org/eclipse/jst/jee/model/internal/mergers/EJBRefsMerger.java
deleted file mode 100644
index 6394266..0000000
--- a/plugins/org.eclipse.jst.jee/common/org/eclipse/jst/jee/model/internal/mergers/EJBRefsMerger.java
+++ /dev/null
@@ -1,163 +0,0 @@
-/***********************************************************************
- * Copyright (c) 2008 by SAP AG, Walldorf.
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
- *
- * Contributors:
- * SAP AG - initial API and implementation
- ***********************************************************************/
-package org.eclipse.jst.jee.model.internal.mergers;
-
-import java.util.ArrayList;
-import java.util.List;
-
-import org.eclipse.emf.ecore.EObject;
-import org.eclipse.emf.ecore.util.EcoreUtil;
-import org.eclipse.jst.javaee.core.EjbLocalRef;
-import org.eclipse.jst.javaee.core.EjbRef;
-
-/**
- * EjbRef and EjbLocalRef merger.
- *
- * @author Dimitar Giormov
- */
-public class EJBRefsMerger extends BaseRefsMerger {
-
- /**
- * Constructor for the EjbRefs merger.
- *
- * @param _baseEjbRefs - base list of references that have higher priority and are result of the merge.
- * @param _toMergeEjbRefs - toMerge list of references
- */
- public EJBRefsMerger(List _baseEjbRefs, List _toMergeEjbRefs) {
- super(_baseEjbRefs, _toMergeEjbRefs);
-
- }
-
- /* (non-Javadoc)
- * @see org.eclipse.jst.javaee.ejb.model.mergers.common.ModelElementsMerger#process()
- */
- @Override
- public List process() throws ModelException {
- List warnings = new ArrayList();
- if (getToMergeElemets() == null || getToMergeElemets().isEmpty()){
- return warnings;
- }
-
- for (Object object : getToMergeElemets()) {
- Object findMatchingRef = null;
- if(object instanceof EjbLocalRef){
- findMatchingRef = findMatchingLocalRef(getBaseElements(), object);
- } else {
- findMatchingRef = findMatchingRef(getBaseElements(), object);
- }
- if (findMatchingRef != null){
- copyMissingPropertesInBase(findMatchingRef, object);
- } else{
- getBaseElements().add(EcoreUtil.copy((EObject) object));
- }
-
-
- }
-
-
- return warnings;
- }
-
- private static EjbRef findMatchingRef(List xmlRefs,
- Object ref) throws ModelException {
- EjbRef result = null;
- for (Object currentXMLRef: xmlRefs) {
- if (isMatchingRef(currentXMLRef, ref)) {
- result = (EjbRef) currentXMLRef;
- break;
- }
- }
- return result;
- }
-
- private static EjbLocalRef findMatchingLocalRef(List xmlRefs,
- Object ref) throws ModelException {
- EjbLocalRef result = null;
- for (Object currentXMLRef: xmlRefs) {
- if (isMatchingRef(currentXMLRef, ref)) {
- result = (EjbLocalRef) currentXMLRef;
- break;
- }
- }
- return result;
-}
-
- private static boolean isMatchingRef(Object xmlRef,
- Object annotatedRef) throws ModelException {
- boolean result = false;
- String xmlRefName = (xmlRef instanceof EjbRef) ? ((EjbRef)xmlRef).getEjbRefName() : ((EjbLocalRef)xmlRef).getEjbRefName();
- String annotatedRefName = (annotatedRef instanceof EjbRef) ? ((EjbRef)annotatedRef).getEjbRefName() : ((EjbLocalRef)annotatedRef).getEjbRefName();
- if (xmlRefName.equals(annotatedRefName)) {
-// if(!isMatchingTargetBean(xmlRef, annotatedRef)){
-// //TODO check if correct
-// return false;
-// }
- result = true;
- }
-
- return result;
- }
-
- @Override
- protected void copyMissingPropertesInBase(Object base, Object toMerge) {
- if(base instanceof EjbRef){
- copyEjbRefPropsInBase((EjbRef)base, (EjbRef)toMerge);
- } else if (base instanceof EjbLocalRef){
- copyEjbLocalRefPropsInBase((EjbLocalRef)base, (EjbLocalRef)toMerge);
- }
- }
-
- private void copyEjbLocalRefPropsInBase(EjbLocalRef base, EjbLocalRef toMerge) {
- if (base.getEjbLink() == null){
- base.setEjbLink(toMerge.getEjbLink());
- }
-
- if (base.getMappedName() == null){
- base.setMappedName(toMerge.getMappedName());
- }
-
- if (!base.isSetEjbRefType()){
- base.setEjbRefType(toMerge.getEjbRefType());
- }
-
- if (base.getLocal() == null){
- base.setLocal(toMerge.getLocal());
- }
-
- if (base.getLocalHome() == null){
- base.setLocalHome(toMerge.getLocalHome());
- }
-
- }
-
- private void copyEjbRefPropsInBase(EjbRef base, EjbRef toMerge) {
- if (base.getEjbLink() == null){
- base.setEjbLink(toMerge.getEjbLink());
- }
-
- if (base.getMappedName() == null){
- base.setMappedName(toMerge.getMappedName());
- }
-
- if (!base.isSetEjbRefType()){
- base.setEjbRefType(toMerge.getEjbRefType());
- }
-
- if (base.getRemote() == null){
- base.setRemote(toMerge.getRemote());
- }
-
- if (base.getHome() == null){
- base.setHome(toMerge.getHome());
- }
-
- }
-}
diff --git a/plugins/org.eclipse.jst.jee/common/org/eclipse/jst/jee/model/internal/mergers/EnvEntriesMerger.java b/plugins/org.eclipse.jst.jee/common/org/eclipse/jst/jee/model/internal/mergers/EnvEntriesMerger.java
deleted file mode 100644
index c064783..0000000
--- a/plugins/org.eclipse.jst.jee/common/org/eclipse/jst/jee/model/internal/mergers/EnvEntriesMerger.java
+++ /dev/null
@@ -1,85 +0,0 @@
-/***********************************************************************
- * Copyright (c) 2008 by SAP AG, Walldorf.
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
- *
- * Contributors:
- * SAP AG - initial API and implementation
- ***********************************************************************/
-package org.eclipse.jst.jee.model.internal.mergers;
-
-import java.util.ArrayList;
-import java.util.List;
-
-import org.eclipse.emf.ecore.EObject;
-import org.eclipse.emf.ecore.util.EcoreUtil;
-import org.eclipse.jst.javaee.core.EnvEntry;
-
-/**
- * Merges Environment Entries.
- *
- * @author Dimitar Giormov
- */
-public class EnvEntriesMerger extends BaseRefsMerger {
-
- /**
- * Constructor for the class.
- *
- * @param baseList - base list with environment entries
- * @param toMergeList - toMerge list with environment entries
- */
- public EnvEntriesMerger(List baseList, List toMergeList) {
- super(baseList, toMergeList);
- }
-
- /* (non-Javadoc)
- * @see org.eclipse.jst.javaee.ejb.model.mergers.common.ModelElementsMerger#process()
- */
- @Override
- public List process() throws ModelException {
- List warnings = new ArrayList();
- for (Object oToMerge : getToMergeElemets()) {
- EnvEntry envEntry = (EnvEntry) oToMerge;
- boolean found = false;
- for (Object oBase : getBaseElements()) {
- EnvEntry envEntryBase = (EnvEntry) oBase;
- if (envEntryBase.getEnvEntryName().equals(envEntry.getEnvEntryName())){
- copyMissingPropertesInBase(envEntryBase, envEntry);
- found = true;
- break;
- }
- }
- if (found){
- continue;
- }
- getBaseElements().add(EcoreUtil.copy((EObject) oToMerge));
- }
- return warnings;
- }
-
-
- protected void copyMissingPropertesInBase(EnvEntry baseElement, EnvEntry toMergeElement) {
- if(baseElement.getEnvEntryValue() == null){
- baseElement.setEnvEntryValue(toMergeElement.getEnvEntryValue());
- }
-
- if(baseElement.getMappedName() == null){
- baseElement.setMappedName(toMergeElement.getMappedName());
- }
-
- if(!baseElement.isSetEnvEntryType()){
- baseElement.setEnvEntryType(toMergeElement.getEnvEntryType());
- }
-
- mergeIngectionTargets(baseElement.getInjectionTargets(), toMergeElement.getInjectionTargets());
- mergeDescriptions(baseElement.getDescriptions(), toMergeElement.getDescriptions());
- }
-
-
- @Override
- protected void copyMissingPropertesInBase(Object base, Object toMerge){
- copyMissingPropertesInBase((EnvEntry) base, (EnvEntry) toMerge);
- }
-}
diff --git a/plugins/org.eclipse.jst.jee/common/org/eclipse/jst/jee/model/internal/mergers/IMerger.java b/plugins/org.eclipse.jst.jee/common/org/eclipse/jst/jee/model/internal/mergers/IMerger.java
deleted file mode 100644
index 1af4622..0000000
--- a/plugins/org.eclipse.jst.jee/common/org/eclipse/jst/jee/model/internal/mergers/IMerger.java
+++ /dev/null
@@ -1,29 +0,0 @@
-/***********************************************************************
- * Copyright (c) 2008 by SAP AG, Walldorf.
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
- *
- * Contributors:
- * SAP AG - initial API and implementation
- ***********************************************************************/
-package org.eclipse.jst.jee.model.internal.mergers;
-
-import java.util.List;
-
-/**
- * Base interface for all merger classes.
- *
- * @author Dimitar Giormov
- */
-public interface IMerger {
-
- /**
- * Process method is the actual merge process. It will generate list of warnngs or throw exception.
- *
- * @return list of warnings gathered during execution.
- * @throws Exception
- */
- public abstract List process() throws Exception;
-}
diff --git a/plugins/org.eclipse.jst.jee/common/org/eclipse/jst/jee/model/internal/mergers/JNDIRefsMerger.java b/plugins/org.eclipse.jst.jee/common/org/eclipse/jst/jee/model/internal/mergers/JNDIRefsMerger.java
deleted file mode 100644
index f8cbf1d..0000000
--- a/plugins/org.eclipse.jst.jee/common/org/eclipse/jst/jee/model/internal/mergers/JNDIRefsMerger.java
+++ /dev/null
@@ -1,119 +0,0 @@
-/***********************************************************************
- * Copyright (c) 2008 by SAP AG, Walldorf.
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
- *
- * Contributors:
- * SAP AG - initial API and implementation
- ***********************************************************************/
-package org.eclipse.jst.jee.model.internal.mergers;
-
-import java.util.ArrayList;
-import java.util.List;
-
-import org.eclipse.jst.javaee.core.JavaEEObject;
-import org.eclipse.jst.javaee.ejb.MessageDrivenBean;
-import org.eclipse.jst.javaee.ejb.SessionBean;
-import org.eclipse.jst.javaee.web.WebApp;
-
-/**
- *
- * JNDI References merger. It can be applied on Enterprise beans or Web resource artifacts.
- *
- * @author Dimitar Giormov
- */
-public class JNDIRefsMerger extends ModelElementMerger {
-
- /**
- *
- * @param base - base list of references that have higher priority and are result of the merge.
- * @param toMerge - toMerge list of references
- * @param kind
- */
- public JNDIRefsMerger(JavaEEObject base,
- JavaEEObject toMerge, int kind) {
- super(base, toMerge, kind);
-
- }
-
- /**
- * @return
- */
- SessionBean getBaseSessionBean() {
- return (SessionBean) getBase();
- }
-
- /**
- * @return
- */
- SessionBean getToMergeSessionBean () {
- return (SessionBean) getToMerge();
- }
-
- /**
- * @return
- */
- MessageDrivenBean getBaseMdbBean() {
- return (MessageDrivenBean) getBase();
- }
-
- /**
- * @return
- */
- MessageDrivenBean getToMergeMdbBean () {
- return (MessageDrivenBean) getToMerge();
- }
-
- /**
- * @return
- */
- WebApp getBaseWebApp() {
- return (WebApp) getBase();
- }
-
- /**
- * @return
- */
- WebApp getToMergeWebApp() {
- return (WebApp) getToMerge();
- }
-
- @Override
- public List process() throws ModelException {
- List warnings = new ArrayList();
- if(getBase() instanceof SessionBean){
- warnings.addAll(new EnvEntriesMerger(getBaseSessionBean().getEnvEntries(), getToMergeSessionBean().getEnvEntries()).process());
- warnings.addAll(new ResourceEnvRefsMerger(getBaseSessionBean().getResourceEnvRefs(), getToMergeSessionBean().getResourceEnvRefs()).process());
- warnings.addAll(new ResourceRefsMerger(getBaseSessionBean().getResourceRefs(), getToMergeSessionBean().getResourceRefs()).process());
- warnings.addAll(new MessageDestinationRefsMerger(getBaseSessionBean().getMessageDestinationRefs(), getToMergeSessionBean().getMessageDestinationRefs()).process());
- warnings.addAll(new ServiceRefsMerger(getBaseSessionBean().getServiceRefs(), getToMergeSessionBean().getServiceRefs()).process());
- warnings.addAll(new PersistenceContextRefsMerger(getBaseSessionBean().getPersistenceContextRefs(), getToMergeSessionBean().getPersistenceContextRefs()).process());
- warnings.addAll(new PersistenceUnitRefsMerger(getBaseSessionBean().getPersistenceUnitRefs(), getToMergeSessionBean().getPersistenceUnitRefs()).process());
- warnings.addAll(new EJBRefsMerger(getBaseSessionBean().getEjbLocalRefs(), getToMergeSessionBean().getEjbLocalRefs()).process());
- warnings.addAll(new EJBRefsMerger(getBaseSessionBean().getEjbRefs(), getToMergeSessionBean().getEjbRefs()).process());
- } else if(getBase() instanceof MessageDrivenBean) {
- warnings.addAll(new EnvEntriesMerger(getBaseMdbBean().getEnvEntries(), getToMergeMdbBean().getEnvEntries()).process());
- warnings.addAll(new ResourceEnvRefsMerger(getBaseMdbBean().getResourceEnvRefs(), getToMergeMdbBean().getResourceEnvRefs()).process());
- warnings.addAll(new ResourceRefsMerger(getBaseMdbBean().getResourceRefs(), getToMergeMdbBean().getResourceRefs()).process());
- warnings.addAll(new MessageDestinationRefsMerger(getBaseMdbBean().getMessageDestinationRefs(), getToMergeMdbBean().getMessageDestinationRefs()).process());
- warnings.addAll(new ServiceRefsMerger(getBaseMdbBean().getServiceRefs(), getToMergeMdbBean().getServiceRefs()).process());
- warnings.addAll(new PersistenceContextRefsMerger(getBaseMdbBean().getPersistenceContextRefs(), getToMergeMdbBean().getPersistenceContextRefs()).process());
- warnings.addAll(new PersistenceUnitRefsMerger(getBaseMdbBean().getPersistenceUnitRefs(), getToMergeMdbBean().getPersistenceUnitRefs()).process());
- warnings.addAll(new EJBRefsMerger(getBaseMdbBean().getEjbLocalRefs(), getToMergeMdbBean().getEjbLocalRefs()).process());
- warnings.addAll(new EJBRefsMerger(getBaseMdbBean().getEjbRefs(), getToMergeMdbBean().getEjbRefs()).process());
- } else if(getBase() instanceof WebApp) {
- warnings.addAll(new EnvEntriesMerger(getBaseWebApp().getEnvEntries(), getToMergeWebApp().getEnvEntries()).process());
- warnings.addAll(new ResourceEnvRefsMerger(getBaseWebApp().getResourceEnvRefs(), getToMergeWebApp().getResourceEnvRefs()).process());
- warnings.addAll(new ResourceRefsMerger(getBaseWebApp().getResourceRefs(), getToMergeWebApp().getResourceRefs()).process());
- warnings.addAll(new MessageDestinationRefsMerger(getBaseWebApp().getMessageDestinationRefs(), getToMergeWebApp().getMessageDestinationRefs()).process());
- warnings.addAll(new ServiceRefsMerger(getBaseWebApp().getServiceRefs(), getToMergeWebApp().getServiceRefs()).process());
- warnings.addAll(new PersistenceContextRefsMerger(getBaseWebApp().getPersistenceContextRefs(), getToMergeWebApp().getPersistenceContextRefs()).process());
- warnings.addAll(new PersistenceUnitRefsMerger(getBaseWebApp().getPersistenceUnitRefs(), getToMergeWebApp().getPersistenceUnitRefs()).process());
- warnings.addAll(new EJBRefsMerger(getBaseWebApp().getEjbLocalRefs(), getToMergeWebApp().getEjbLocalRefs()).process());
- warnings.addAll(new EJBRefsMerger(getBaseWebApp().getEjbRefs(), getToMergeWebApp().getEjbRefs()).process());
- }
- return warnings;
- }
- }
diff --git a/plugins/org.eclipse.jst.jee/common/org/eclipse/jst/jee/model/internal/mergers/MessageDestinationRefsMerger.java b/plugins/org.eclipse.jst.jee/common/org/eclipse/jst/jee/model/internal/mergers/MessageDestinationRefsMerger.java
deleted file mode 100644
index 0dd6969..0000000
--- a/plugins/org.eclipse.jst.jee/common/org/eclipse/jst/jee/model/internal/mergers/MessageDestinationRefsMerger.java
+++ /dev/null
@@ -1,89 +0,0 @@
-/***********************************************************************
- * Copyright (c) 2008 by SAP AG, Walldorf.
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
- *
- * Contributors:
- * SAP AG - initial API and implementation
- ***********************************************************************/
-package org.eclipse.jst.jee.model.internal.mergers;
-
-import java.util.ArrayList;
-import java.util.List;
-
-import org.eclipse.emf.ecore.EObject;
-import org.eclipse.emf.ecore.util.EcoreUtil;
-import org.eclipse.jst.javaee.core.MessageDestinationRef;
-
-/**
- * MessageDestinationRefsMerger merges MessageDestinationRef objects.
- *
- * @author Dimitar Giormov
- *
- */
-public class MessageDestinationRefsMerger extends BaseRefsMerger {
-
-
- /**
- * Constructor for the class.
- *
- * @param base - base list with message destination references.
- * that have higher priority and are result of the merge.
- * @param toMerge - toMerge list to be imported in base list.
- */
- public MessageDestinationRefsMerger(List base, List toMerge) {
- super(base, toMerge);
- }
-
- @Override
- public List<String> process() throws ModelException {
- List<String> warnings = new ArrayList<String>();
- for (Object oToMerge : getToMergeElemets()) {
- MessageDestinationRef envEntry = (MessageDestinationRef) oToMerge;
- boolean found = false;
- for (Object oBase : getBaseElements()) {
- MessageDestinationRef envEntryBase = (MessageDestinationRef) oBase;
- if (envEntryBase.getMessageDestinationRefName().equals(envEntry.getMessageDestinationRefName())){
- copyMissingPropertesInBase(envEntryBase, envEntry);
- found = true;
- break;
- }
- }
- if (found){
- continue;
- }
- getBaseElements().add(EcoreUtil.copy((EObject) oToMerge));
- }
- return warnings;
- }
-
- protected void copyMissingPropertesInBase(MessageDestinationRef baseElement, MessageDestinationRef toMergeElement) {
-
- if(baseElement.getMappedName() == null){
- baseElement.setMappedName(toMergeElement.getMappedName());
- }
-
- if(baseElement.getMessageDestinationLink() == null){
- baseElement.setMessageDestinationLink(toMergeElement.getMessageDestinationLink());
- }
-
- if(baseElement.getMessageDestinationType() == null){
- baseElement.setMessageDestinationType(toMergeElement.getMessageDestinationType());
- }
-
- if(!baseElement.isSetMessageDestinationUsage()){
- baseElement.setMessageDestinationUsage(toMergeElement.getMessageDestinationUsage());
- }
-
- mergeIngectionTargets(baseElement.getInjectionTargets(), toMergeElement.getInjectionTargets());
- mergeDescriptions(baseElement.getDescriptions(), toMergeElement.getDescriptions());
- }
-
-
- @Override
- protected void copyMissingPropertesInBase(Object base, Object toMerge){
- copyMissingPropertesInBase((MessageDestinationRef) base, (MessageDestinationRef) toMerge);
- }
-}
diff --git a/plugins/org.eclipse.jst.jee/common/org/eclipse/jst/jee/model/internal/mergers/ModelElementMerger.java b/plugins/org.eclipse.jst.jee/common/org/eclipse/jst/jee/model/internal/mergers/ModelElementMerger.java
deleted file mode 100644
index 1a77f58..0000000
--- a/plugins/org.eclipse.jst.jee/common/org/eclipse/jst/jee/model/internal/mergers/ModelElementMerger.java
+++ /dev/null
@@ -1,81 +0,0 @@
-/***********************************************************************
- * Copyright (c) 2008, 2010 by SAP AG, Walldorf.
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
- *
- * Contributors:
- * SAP AG - initial API and implementation
- ***********************************************************************/
-package org.eclipse.jst.jee.model.internal.mergers;
-
-import java.util.List;
-
-import org.eclipse.jst.javaee.core.JavaEEObject;
-
-/**
- * Model element merger is bease class for Java EE mergers.
- * It contains the base and toMerge elements.
- *
- * Base element is the main element that values will be taken with highest priority.
- * toMerge element will give all of his extra values to base.
- *
- * @author Dimitar Giormov
- */
-public abstract class ModelElementMerger implements IMerger {
-
- public static int ADD = 0x1;
-
- public static int CHANGE = 0x2;
-
- public static int REMOVE = 0x4;
-
- public static int COPY = 0x8;
-
- JavaEEObject base;
- JavaEEObject toMerger;
-
- private int kind;
-
-
- /**
- * Constructor of the class.
- *
- * @param _base element is the main element that values will be taken with highest priority.
- * @param _toMerge element will give all of his extra values to base.
- * @param _kind
- */
- public ModelElementMerger(JavaEEObject _base, JavaEEObject _toMerge, int _kind) {
- base = _base;
- toMerger = _toMerge;
- kind = _kind;
- }
-
- /**
- * Returns the base element, which is also the merged result.
- *
- * @return base element.
- */
- protected JavaEEObject getBase() {
- return base;
- }
-
- /**
- *
- * @return toMerge element, which will be merged in base.
- */
- protected JavaEEObject getToMerge() {
- return toMerger;
- }
-
- /* (non-Javadoc)
- * @see org.eclipse.jst.javaee.ejb.model.mergers.Merger#process()
- */
- public abstract List process() throws ModelException;
-
- public int getKind() {
- return kind;
- }
-
-}
diff --git a/plugins/org.eclipse.jst.jee/common/org/eclipse/jst/jee/model/internal/mergers/ModelElementsMerger.java b/plugins/org.eclipse.jst.jee/common/org/eclipse/jst/jee/model/internal/mergers/ModelElementsMerger.java
deleted file mode 100644
index 4031ab5..0000000
--- a/plugins/org.eclipse.jst.jee/common/org/eclipse/jst/jee/model/internal/mergers/ModelElementsMerger.java
+++ /dev/null
@@ -1,58 +0,0 @@
-/***********************************************************************
- * Copyright (c) 2008 by SAP AG, Walldorf.
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
- *
- * Contributors:
- * SAP AG - initial API and implementation
- ***********************************************************************/
-package org.eclipse.jst.jee.model.internal.mergers;
-
-import java.util.ArrayList;
-import java.util.List;
-
-/**
- * Base merger adapted to deal with Lists.
- *
- * @author Dimitar Giormov
- *
- */
-public class ModelElementsMerger implements IMerger {
-
- private List baseElements;
- private List toMergeList;
-
- /**
- * @param _baseList
- * @param _toMergeList
- */
- public ModelElementsMerger(List _baseList, List _toMergeList) {
- baseElements = _baseList;
- toMergeList = _toMergeList;
- }
-
-
- /**
- * @return
- */
- protected List getBaseElements() {
- return baseElements;
- }
-
- /**
- * @return
- */
- protected List getToMergeElemets() {
- return toMergeList;
- }
-
- /* (non-Javadoc)
- * @see org.eclipse.jst.javaee.ejb.model.mergers.Merger#process()
- */
- public List process() throws ModelException {
- List warnings = new ArrayList();
- return warnings;
- }
-}
diff --git a/plugins/org.eclipse.jst.jee/common/org/eclipse/jst/jee/model/internal/mergers/ModelException.java b/plugins/org.eclipse.jst.jee/common/org/eclipse/jst/jee/model/internal/mergers/ModelException.java
deleted file mode 100644
index 7958d0f..0000000
--- a/plugins/org.eclipse.jst.jee/common/org/eclipse/jst/jee/model/internal/mergers/ModelException.java
+++ /dev/null
@@ -1,35 +0,0 @@
-/***********************************************************************
- * Copyright (c) 2008 by SAP AG, Walldorf.
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
- *
- * Contributors:
- * SAP AG - initial API and implementation
- ***********************************************************************/
-package org.eclipse.jst.jee.model.internal.mergers;
-
-/**
- * ModelException is thrown when invalid values or inconsistencies are detected in the model.
- *
- * @author Dimitar Giormov
- */
-public class ModelException extends Exception {
-
- /**
- *
- */
- private static final long serialVersionUID = -1239223181526060738L;
-
-
- public ModelException(Exception e) {
- super(e);
- }
-
-
- public ModelException() {
- super();
- }
-
-}
diff --git a/plugins/org.eclipse.jst.jee/common/org/eclipse/jst/jee/model/internal/mergers/PersistenceContextRefsMerger.java b/plugins/org.eclipse.jst.jee/common/org/eclipse/jst/jee/model/internal/mergers/PersistenceContextRefsMerger.java
deleted file mode 100644
index 1537de5..0000000
--- a/plugins/org.eclipse.jst.jee/common/org/eclipse/jst/jee/model/internal/mergers/PersistenceContextRefsMerger.java
+++ /dev/null
@@ -1,111 +0,0 @@
-/***********************************************************************
- * Copyright (c) 2008 by SAP AG, Walldorf.
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
- *
- * Contributors:
- * SAP AG - initial API and implementation
- ***********************************************************************/
-package org.eclipse.jst.jee.model.internal.mergers;
-
-import java.util.ArrayList;
-import java.util.List;
-
-import org.eclipse.emf.ecore.EObject;
-import org.eclipse.emf.ecore.util.EcoreUtil;
-import org.eclipse.jst.javaee.core.PersistenceContextRef;
-import org.eclipse.jst.javaee.core.PropertyType;
-
-/**
- * Merges persistence context references artifacts.
- *
- * @author Dimitar Giormov
- *
- */
-public class PersistenceContextRefsMerger extends BaseRefsMerger {
-
- /**
- * Constructor for the class.
- *
- * @param base - base list with persistence context references.
- * that have higher priority and are result of the merge.
- * @param toMerge - toMerge list to be imported in base list.
- */
- public PersistenceContextRefsMerger(List _base, List _toMerge) {
- super(_base, _toMerge);
- }
-
-
- /* (non-Javadoc)
- * @see org.eclipse.jst.javaee.ejb.model.mergers.common.ModelElementsMerger#process()
- */
- @Override
- public List process() throws ModelException {
- List warnings = new ArrayList();
- for (Object oToMerge : getToMergeElemets()) {
- PersistenceContextRef envEntry = (PersistenceContextRef) oToMerge;
- boolean found = false;
- for (Object oBase : getBaseElements()) {
- PersistenceContextRef envEntryBase = (PersistenceContextRef) oBase;
- if (envEntryBase.getPersistenceContextRefName().equals(envEntry.getPersistenceContextRefName())){
- copyMissingPropertesInBase(envEntryBase, envEntry);
- found = true;
- break;
- }
- }
- if (found){
- continue;
- }
- getBaseElements().add(EcoreUtil.copy((EObject) oToMerge));
- }
- return warnings;
- }
-
-
- protected void copyMissingPropertesInBase(PersistenceContextRef baseElement, PersistenceContextRef toMergeElement) {
- if(baseElement.getPersistenceUnitName() == null){
- baseElement.setPersistenceUnitName(toMergeElement.getPersistenceUnitName());
- }
-
- if(baseElement.getPersistenceContextType() == null){
- baseElement.setPersistenceContextType(toMergeElement.getPersistenceContextType());
- }
-
- if(baseElement.getMappedName() == null){
- baseElement.setMappedName(toMergeElement.getMappedName());
- }
-
- copyMissingPersistentPropertiesInBase(baseElement.getPersistenceProperties(), toMergeElement.getPersistenceProperties());
- }
-
-
- private void copyMissingPersistentPropertiesInBase(
- List persistenceProperties, List persistenceProperties2) {
- for (Object mergeProps : persistenceProperties2) {
- PropertyType mProp = (PropertyType) mergeProps;
- if(!containsProperty(persistenceProperties , mProp)){
- persistenceProperties.add( mProp);
- }
-
- }
- }
-
- private boolean containsProperty(List list, PropertyType p){
- for (Object baseProps : list) {
- PropertyType bProp = (PropertyType) baseProps;
- if(p.getName().equals(bProp.getName())){
- return true;
- }
- }
- return false;
- }
-
-
- @Override
- protected void copyMissingPropertesInBase(Object base, Object toMerge){
- copyMissingPropertesInBase((PersistenceContextRef) base, (PersistenceContextRef) toMerge);
- }
-
-}
diff --git a/plugins/org.eclipse.jst.jee/common/org/eclipse/jst/jee/model/internal/mergers/PersistenceUnitRefsMerger.java b/plugins/org.eclipse.jst.jee/common/org/eclipse/jst/jee/model/internal/mergers/PersistenceUnitRefsMerger.java
deleted file mode 100644
index 1a0ad73..0000000
--- a/plugins/org.eclipse.jst.jee/common/org/eclipse/jst/jee/model/internal/mergers/PersistenceUnitRefsMerger.java
+++ /dev/null
@@ -1,81 +0,0 @@
-/***********************************************************************
- * Copyright (c) 2008 by SAP AG, Walldorf.
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
- *
- * Contributors:
- * SAP AG - initial API and implementation
- ***********************************************************************/
-package org.eclipse.jst.jee.model.internal.mergers;
-
-import java.util.ArrayList;
-import java.util.List;
-
-import org.eclipse.emf.ecore.EObject;
-import org.eclipse.emf.ecore.util.EcoreUtil;
-import org.eclipse.jst.javaee.core.PersistenceUnitRef;
-
-/**
- *
- * Merges persistence unit references artifacts.
- *
- * @author Dimitar Giormov
- */
-
-public class PersistenceUnitRefsMerger extends BaseRefsMerger {
-
- /**
- * Constructor for the class.
- *
- * @param base - base list with persistence unit references.
- * that have higher priority and are result of the merge.
- * @param toMerge - toMerge list to be imported in base list.
- */
- public PersistenceUnitRefsMerger(List base, List toMerge) {
- super(base, toMerge);
- }
-
- /* (non-Javadoc)
- * @see org.eclipse.jst.javaee.ejb.model.mergers.common.ModelElementsMerger#process()
- */
- @Override
- public List process() throws ModelException {
- List warnings = new ArrayList();
- for (Object oToMerge : getToMergeElemets()) {
- PersistenceUnitRef resRef = (PersistenceUnitRef) oToMerge;
- boolean found = false;
- for (Object oBase : getBaseElements()) {
- PersistenceUnitRef resRefBase = (PersistenceUnitRef) oBase;
- if (resRefBase.getPersistenceUnitRefName().equals(resRef.getPersistenceUnitRefName())){
- copyMissingPropertesInBase(resRefBase, resRef);
- found = true;
- break;
- }
- }
- if (found){
- continue;
- }
- getBaseElements().add(EcoreUtil.copy((EObject) oToMerge));
- }
- return warnings;
- }
-
-
- protected void copyMissingPropertesInBase(PersistenceUnitRef baseElement, PersistenceUnitRef toMergeElement) {
- if(baseElement.getPersistenceUnitName() == null){
- baseElement.setPersistenceUnitName(toMergeElement.getPersistenceUnitName());
- }
- if(baseElement.getMappedName() == null){
- baseElement.setMappedName(toMergeElement.getMappedName());
- }
- }
-
-
- @Override
- protected void copyMissingPropertesInBase(Object base, Object toMerge){
- copyMissingPropertesInBase((PersistenceUnitRef) base, (PersistenceUnitRef) toMerge);
- }
-
-}
diff --git a/plugins/org.eclipse.jst.jee/common/org/eclipse/jst/jee/model/internal/mergers/ResourceEnvRefsMerger.java b/plugins/org.eclipse.jst.jee/common/org/eclipse/jst/jee/model/internal/mergers/ResourceEnvRefsMerger.java
deleted file mode 100644
index ca70efa..0000000
--- a/plugins/org.eclipse.jst.jee/common/org/eclipse/jst/jee/model/internal/mergers/ResourceEnvRefsMerger.java
+++ /dev/null
@@ -1,82 +0,0 @@
-/***********************************************************************
- * Copyright (c) 2008 by SAP AG, Walldorf.
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
- *
- * Contributors:
- * SAP AG - initial API and implementation
- ***********************************************************************/
-package org.eclipse.jst.jee.model.internal.mergers;
-
-import java.util.ArrayList;
-import java.util.List;
-
-import org.eclipse.emf.ecore.EObject;
-import org.eclipse.emf.ecore.util.EcoreUtil;
-import org.eclipse.jst.javaee.core.ResourceEnvRef;
-
-/**
- * Merges Resource Environment References artifacts.
- *
- * @author Dimitar Giormov
- *
- */
-public class ResourceEnvRefsMerger extends BaseRefsMerger {
-
- /**
- * Constructor for the class.
- *
- * @param base - base list with resource environment references.
- * that have higher priority and are result of the merge.
- * @param toMerge - toMerge list to be imported in base list.
- */
- public ResourceEnvRefsMerger(List base, List toMerge) {
- super(base, toMerge);
- }
-
- /* (non-Javadoc)
- * @see org.eclipse.jst.javaee.ejb.model.mergers.common.ModelElementsMerger#process()
- */
- @Override
- public List process() throws ModelException {
- List warnings = new ArrayList();
- for (Object oToMerge : getToMergeElemets()) {
- ResourceEnvRef resEnvRef = (ResourceEnvRef) oToMerge;
- boolean found = false;
- for (Object oBase : getBaseElements()) {
- ResourceEnvRef resourceEnvRefBase = (ResourceEnvRef) oBase;
- if (resourceEnvRefBase.getResourceEnvRefName().equals(resEnvRef.getResourceEnvRefName())){
- copyMissingPropertesInBase(resourceEnvRefBase, resEnvRef);
- found = true;
- break;
- }
- }
- if (found){
- continue;
- }
- getBaseElements().add(EcoreUtil.copy((EObject) oToMerge));
- }
- return warnings;
- }
-
- protected void copyMissingPropertesInBase(ResourceEnvRef baseRef, ResourceEnvRef toMergeRef) {
- if(baseRef.getResourceEnvRefType() == null){
- baseRef.setResourceEnvRefType(toMergeRef.getResourceEnvRefType());
- }
-
- if(baseRef.getMappedName() == null){
- baseRef.setMappedName(toMergeRef.getMappedName());
- }
-
- mergeIngectionTargets(baseRef.getInjectionTargets(), toMergeRef.getInjectionTargets());
- mergeDescriptions(baseRef.getDescriptions(), toMergeRef.getDescriptions());
- }
-
- @Override
- protected void copyMissingPropertesInBase(Object base, Object toMerge) {
- copyMissingPropertesInBase((ResourceEnvRef) base, (ResourceEnvRef)toMerge);
-
- }
-}
diff --git a/plugins/org.eclipse.jst.jee/common/org/eclipse/jst/jee/model/internal/mergers/ResourceRefsMerger.java b/plugins/org.eclipse.jst.jee/common/org/eclipse/jst/jee/model/internal/mergers/ResourceRefsMerger.java
deleted file mode 100644
index 1fff46b..0000000
--- a/plugins/org.eclipse.jst.jee/common/org/eclipse/jst/jee/model/internal/mergers/ResourceRefsMerger.java
+++ /dev/null
@@ -1,89 +0,0 @@
-/***********************************************************************
- * Copyright (c) 2008 by SAP AG, Walldorf.
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
- *
- * Contributors:
- * SAP AG - initial API and implementation
- ***********************************************************************/
-package org.eclipse.jst.jee.model.internal.mergers;
-
-import java.util.ArrayList;
-import java.util.List;
-
-import org.eclipse.emf.ecore.EObject;
-import org.eclipse.emf.ecore.util.EcoreUtil;
-import org.eclipse.jst.javaee.core.ResourceRef;
-
-/**
- * Merges Resource References artifacts.
- *
- * @author Dimitar Giormov
- *
- */
-public class ResourceRefsMerger extends BaseRefsMerger {
-
- /**
- * Constructor for the class.
- *
- * @param base - base list with resource references.
- * that have higher priority and are result of the merge.
- * @param toMerge - toMerge list to be imported in base list.
- */
- public ResourceRefsMerger(List base, List toMerge) {
- super(base, toMerge);
- }
-
- /* (non-Javadoc)
- * @see org.eclipse.jst.javaee.ejb.model.mergers.common.ModelElementsMerger#process()
- */
- @Override
- public List process() throws ModelException {
- List warnings = new ArrayList();
- for (Object oToMerge : getToMergeElemets()) {
- ResourceRef resRef = (ResourceRef) oToMerge;
- boolean found = false;
- for (Object oBase : getBaseElements()) {
- ResourceRef resRefBase = (ResourceRef) oBase;
- if (resRefBase.getResRefName().equals(resRef.getResRefName())){
- copyMissingPropertesInBase(resRefBase, resRef);
- found = true;
- break;
- }
- }
- if (found){
- continue;
- }
- getBaseElements().add(EcoreUtil.copy((EObject) oToMerge));
- }
- return warnings;
- }
-
- protected void copyMissingPropertesInBase(ResourceRef baseElement, ResourceRef toMergeElement) {
- if(baseElement.getResType() == null){
- baseElement.setResType(toMergeElement.getResType());
- }
-
- if(!baseElement.isSetResAuth()){
- baseElement.setResAuth(toMergeElement.getResAuth());
- }
-
- if(!baseElement.isSetResSharingScope()){
- baseElement.setResSharingScope(toMergeElement.getResSharingScope());
- }
-
- if(baseElement.getMappedName() == null){
- baseElement.setMappedName(toMergeElement.getMappedName());
- }
-
-
- }
-
- @Override
- protected void copyMissingPropertesInBase(Object base, Object toMerge) {
- copyMissingPropertesInBase((ResourceRef) base, (ResourceRef )toMerge);
-
- }
-}
diff --git a/plugins/org.eclipse.jst.jee/common/org/eclipse/jst/jee/model/internal/mergers/ServiceRefsMerger.java b/plugins/org.eclipse.jst.jee/common/org/eclipse/jst/jee/model/internal/mergers/ServiceRefsMerger.java
deleted file mode 100644
index 38f7bba..0000000
--- a/plugins/org.eclipse.jst.jee/common/org/eclipse/jst/jee/model/internal/mergers/ServiceRefsMerger.java
+++ /dev/null
@@ -1,83 +0,0 @@
-/***********************************************************************
- * Copyright (c) 2008 by SAP AG, Walldorf.
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
- *
- * Contributors:
- * SAP AG - initial API and implementation
- ***********************************************************************/
-package org.eclipse.jst.jee.model.internal.mergers;
-
-import java.util.ArrayList;
-import java.util.List;
-
-import org.eclipse.emf.ecore.EObject;
-import org.eclipse.emf.ecore.util.EcoreUtil;
-import org.eclipse.jst.javaee.core.ServiceRef;
-
-/**
- * @author Dimitar Giormov
- *
- */
-public class ServiceRefsMerger extends BaseRefsMerger {
-
-
- /**
- * Constructor for the class.
- *
- * @param base - base list with service references.
- * that have higher priority and are result of the merge.
- * @param toMerge - toMerge list to be imported in base list.
- */
- public ServiceRefsMerger(List _baseRefs, List _toMergeRefs) {
- super(_baseRefs, _toMergeRefs);
- }
-
- /* (non-Javadoc)
- * @see org.eclipse.jst.javaee.ejb.model.mergers.common.ModelElementsMerger#process()
- */
- @Override
-public List process() throws ModelException {
- List warnings = new ArrayList();
- for (Object oToMerge : getToMergeElemets()) {
- ServiceRef servivceRef = (ServiceRef) oToMerge;
- boolean found = false;
- for (Object oBase : getBaseElements()) {
- ServiceRef ServiceRefBase = (ServiceRef) oBase;
- if (ServiceRefBase.getServiceRefName().equals(servivceRef.getServiceRefName())){
- copyMissingPropertesInBase(ServiceRefBase, servivceRef);
- found = true;
- break;
- }
- }
- if (found){
- continue;
- }
- getBaseElements().add(EcoreUtil.copy((EObject) oToMerge));
- }
- return warnings;
- }
-
-
- @Override
- protected void copyMissingPropertesInBase(Object base, Object toMerge) {
- copyMissingPropertesInBase((ServiceRef) base, (ServiceRef) toMerge);
- }
- protected void copyMissingPropertesInBase(ServiceRef base, ServiceRef toMerge) {
- if (base.getMappedName() == null){
- base.setMappedName(toMerge.getMappedName());
- }
-
- if (base.getWsdlFile() == null){
- base.setWsdlFile(toMerge.getWsdlFile());
- }
- // if (base.getServiceInterface().equals("javax.xml.ws.Service")) {
- if (base.getServiceInterface() == null) {
- base.setServiceInterface(toMerge.getServiceInterface());
- }
- // }
- }
-
-}
diff --git a/plugins/org.eclipse.jst.jee/component.xml b/plugins/org.eclipse.jst.jee/component.xml
deleted file mode 100644
index 22b7b14..0000000
--- a/plugins/org.eclipse.jst.jee/component.xml
+++ /dev/null
@@ -1 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?><component xmlns="http://eclipse.org/wtp/releng/tools/component-model" name="org.eclipse.jst.jee"><description url=""></description><component-depends unrestricted="true"></component-depends><plugin id="org.eclipse.jst.jee" fragment="false"/><plugin id="org.eclipse.jst.jee.ejb" fragment="false"/><plugin id="org.eclipse.jst.jee.ui" fragment="false"/><plugin id="org.eclipse.jst.jee.web" fragment="false"/></component>
diff --git a/plugins/org.eclipse.jst.jee/earproject/org/eclipse/jst/jee/JEEPlugin.java b/plugins/org.eclipse.jst.jee/earproject/org/eclipse/jst/jee/JEEPlugin.java
deleted file mode 100644
index 31d4b9f..0000000
--- a/plugins/org.eclipse.jst.jee/earproject/org/eclipse/jst/jee/JEEPlugin.java
+++ /dev/null
@@ -1,109 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2005, 2007 IBM Corporation and others.
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
- *
- * Contributors:
- * IBM Corporation - initial API and implementation
- *******************************************************************************/
-package org.eclipse.jst.jee;
-
-import org.eclipse.wst.common.frameworks.internal.WTPPlugin;
-import org.osgi.framework.BundleContext;
-import org.eclipse.core.runtime.Status;
-import org.eclipse.core.runtime.IStatus;
-import org.eclipse.core.runtime.Platform;
-import java.lang.Throwable;
-import org.eclipse.core.runtime.CoreException;
-
-/**
- * The activator class controls the plug-in life cycle
- */
-public class JEEPlugin extends WTPPlugin {
-
- // The plug-in ID
- public static final String PLUGIN_ID = "org.eclipse.jst.jee"; //$NON-NLS-1$
-
- // The shared instance
- private static JEEPlugin plugin;
-
- private JEEPreferences preferences = null;
-
- /**
- * The constructor
- */
- public JEEPlugin() {
- }
-
- /*
- * (non-Javadoc)
- * @see org.eclipse.ui.plugin.AbstractUIPlugin#start(org.osgi.framework.BundleContext)
- */
- @Override
- public void start(BundleContext context) throws Exception {
- super.start(context);
- plugin = this;
- }
-
- /*
- * (non-Javadoc)
- * @see org.eclipse.ui.plugin.AbstractUIPlugin#stop(org.osgi.framework.BundleContext)
- */
- @Override
- public void stop(BundleContext context) throws Exception {
- plugin = null;
- super.stop(context);
- }
-
- /**
- * Returns the shared instance
- *
- * @return the shared instance
- */
- public static JEEPlugin getDefault() {
- return plugin;
- }
-
- /*
- * (non-Javadoc)
- *
- * @see org.eclipse.wst.common.frameworks.internal.WTPPlugin#getPluginID()
- */
- @Override
- public String getPluginID() {
- return PLUGIN_ID;
- }
-
- /**
- * @return Returns the preferences.
- */
- public JEEPreferences getJEEPreferences() {
- if (this.preferences == null)
- this.preferences = new JEEPreferences(this);
- return this.preferences;
- }
-
- @Override
- protected void initializeDefaultPluginPreferences() {
- getJEEPreferences().initializeDefaultPreferences();
- }
-
- public static IStatus createStatus(int severity, String message, Throwable exception) {
- return new Status(severity, PLUGIN_ID, message, exception);
- }
-
- public static IStatus createStatus(int severity, String message) {
- return createStatus(severity, message, null);
- }
-
- public static void logError(Throwable exception) {
- Platform.getLog(Platform.getBundle(PLUGIN_ID)).log( createStatus(IStatus.ERROR, exception.getMessage(), exception));
- }
-
- public static void logError(CoreException exception) {
- Platform.getLog(Platform.getBundle(PLUGIN_ID)).log( exception.getStatus() );
- }
-
-}
diff --git a/plugins/org.eclipse.jst.jee/earproject/org/eclipse/jst/jee/JEEPreferences.java b/plugins/org.eclipse.jst.jee/earproject/org/eclipse/jst/jee/JEEPreferences.java
deleted file mode 100644
index 345480e..0000000
--- a/plugins/org.eclipse.jst.jee/earproject/org/eclipse/jst/jee/JEEPreferences.java
+++ /dev/null
@@ -1,117 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2003, 2007 IBM Corporation and others.
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
- *
- * Contributors:
- * IBM Corporation - initial API and implementation
- *******************************************************************************/
-/*
- * Created on Jan 26, 2004
- *
- * To change the template for this generated file go to Window - Preferences - Java - Code
- * Generation - Code and Comments
- */
-package org.eclipse.jst.jee;
-
-import org.eclipse.core.runtime.Plugin;
-import org.eclipse.core.runtime.Preferences;
-
-
-/**
- * @author mdelder
- */
-public class JEEPreferences {
-
- public interface Keys {
-
-
-
- }
-
-
-
-
-
- private Plugin owner = null;
- private Preferences preferences = null;
- private boolean persistOnChange = false;
-
- public JEEPreferences(Plugin owner) {
- this.owner = owner;
- }
-
- protected void initializeDefaultPreferences() {
-
- // placeholder
- // we had to move generate_dd to jst.j2ee as jst.jee is not in the pre-req of many plug-ins
- }
-
-
-
-
-
-
- public void firePreferenceChanged() {
- if (isPersistOnChange())
- persist();
- }
-
- public void persist() {
- getOwner().savePluginPreferences();
- }
-
- /**
- * @return Returns the persistOnChange.
- */
- public boolean isPersistOnChange() {
- return this.persistOnChange;
- }
-
- /**
- * @param persistOnChange
- * The persistOnChange to set.
- */
- public void setPersistOnChange(boolean persistOnChange) {
- this.persistOnChange = persistOnChange;
- }
-
- public Preferences getPreferences() {
- if (this.preferences == null)
- this.preferences = getOwner().getPluginPreferences();
- return this.preferences;
- }
-
- /**
- * @return Returns the owner.
- */
- private Plugin getOwner() {
- return this.owner;
- }
-
- /**
- * Returns the current value of the boolean-valued property with the
- * given name.
- * The given name must not be <code>null</code>.
- *
- * @param name the name of the property
- * @return the boolean-valued property
- */
- public boolean getBoolean(String name) {
- return getPreferences().getBoolean(name);
- }
-
- /**
- * Sets the current value of the boolean-valued property with the
- * given name. The given name must not be <code>null</code>.
- * @param name the name of the property
- * @param value the new current value of the property
- */
- public void setValue(String name, boolean value) {
- getPreferences().setValue(name, value);
- firePreferenceChanged();
- }
-
-}
diff --git a/plugins/org.eclipse.jst.jee/earproject/org/eclipse/jst/jee/internal/deployables/JEEDeployableFactory.java b/plugins/org.eclipse.jst.jee/earproject/org/eclipse/jst/jee/internal/deployables/JEEDeployableFactory.java
deleted file mode 100644
index 067b479..0000000
--- a/plugins/org.eclipse.jst.jee/earproject/org/eclipse/jst/jee/internal/deployables/JEEDeployableFactory.java
+++ /dev/null
@@ -1,70 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2003, 2007 IBM Corporation and others.
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
- *
- * Contributors:
- * IBM Corporation - initial API and implementation
- *******************************************************************************/
-package org.eclipse.jst.jee.internal.deployables;
-
-import java.util.HashMap;
-import java.util.Map;
-
-import org.eclipse.core.resources.IProject;
-import org.eclipse.jst.j2ee.internal.deployables.J2EEDeployableFactory;
-import org.eclipse.jst.j2ee.internal.project.J2EEProjectUtilities;
-import org.eclipse.jst.j2ee.project.JavaEEProjectUtilities;
-import org.eclipse.wst.common.componentcore.ComponentCore;
-import org.eclipse.wst.common.componentcore.resources.IVirtualComponent;
-import org.eclipse.wst.server.core.IModule;
-import org.eclipse.wst.server.core.model.ModuleDelegate;
-import org.eclipse.wst.web.internal.deployables.FlatComponentDeployable;
-
-/**
- * J2EE module factory.
- */
-public class JEEDeployableFactory extends J2EEDeployableFactory {
- protected Map <IModule, ModuleDelegate> moduleDelegates = new HashMap<IModule, ModuleDelegate>(5);
-
- public static final String JEE_ID = "org.eclipse.jst.jee.server"; //$NON-NLS-1$
- public static JEEDeployableFactory JEE_INSTANCE;
- public static JEEDeployableFactory jeeInstance() {
- if( JEE_INSTANCE == null ) {
- ensureFactoryLoaded(JEE_ID);
- }
- return JEE_INSTANCE;
- }
-
- public JEEDeployableFactory() {
- super();
- }
-
- @Override
- public void initialize() {
- super.initialize();
- if( getId().equals(JEE_ID))
- JEE_INSTANCE = this;
- }
-
-
- @Override
- protected FlatComponentDeployable createModuleDelegate(IProject project, IVirtualComponent component) {
- return new JEEFlexProjDeployable(project, component);
- }
-
- @Override
- protected boolean canHandleProject(IProject p) {
- // First check the component is of type Java EE, then check J2EE version
- IVirtualComponent comp = ComponentCore.createComponent(p);
- return (JavaEEProjectUtilities.usesJavaEEComponent(comp) && J2EEProjectUtilities.isJEEProject(p));
- }
-
- @Override
- protected FlatComponentDeployable getNestedDelegate(IVirtualComponent component) {
- return new JEEFlexProjDeployable(component.getProject(), component);
- }
-
-}
diff --git a/plugins/org.eclipse.jst.jee/earproject/org/eclipse/jst/jee/internal/deployables/JEEFlexProjDeployable.java b/plugins/org.eclipse.jst.jee/earproject/org/eclipse/jst/jee/internal/deployables/JEEFlexProjDeployable.java
deleted file mode 100644
index 14a9b03..0000000
--- a/plugins/org.eclipse.jst.jee/earproject/org/eclipse/jst/jee/internal/deployables/JEEFlexProjDeployable.java
+++ /dev/null
@@ -1,98 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2003, 2007 IBM Corporation and others.
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
- *
- * Contributors:
- * IBM Corporation - initial API and implementation
- *******************************************************************************/
-package org.eclipse.jst.jee.internal.deployables;
-
-import java.util.Iterator;
-
-import org.eclipse.core.resources.IProject;
-import org.eclipse.jst.j2ee.internal.EjbModuleExtensionHelper;
-import org.eclipse.jst.j2ee.internal.IEJBModelExtenderManager;
-import org.eclipse.jst.j2ee.internal.deployables.J2EEFlexProjDeployable;
-import org.eclipse.jst.j2ee.model.IModelProvider;
-import org.eclipse.jst.j2ee.model.ModelProviderManager;
-import org.eclipse.jst.j2ee.project.JavaEEProjectUtilities;
-import org.eclipse.jst.javaee.ejb.EJBJar;
-import org.eclipse.jst.javaee.ejb.EnterpriseBeans;
-import org.eclipse.jst.javaee.ejb.SessionBean;
-import org.eclipse.wst.common.componentcore.internal.flat.IChildModuleReference;
-import org.eclipse.wst.common.componentcore.resources.IVirtualComponent;
-import org.eclipse.wst.server.core.IModule;
-
-/**
- * JEE module superclass.
- */
-public class JEEFlexProjDeployable extends J2EEFlexProjDeployable {
-
- /**
- * Constructor for JEEFlexProjDeployable.
- *
- * @param project
- * @param aComponent
- */
- public JEEFlexProjDeployable(IProject project, IVirtualComponent aComponent) {
- super(project, aComponent);
- }
-
- /**
- * Constructor for JEEFlexProjDeployable.
- *
- * @param project
- */
- public JEEFlexProjDeployable(IProject project) {
- super(project);
- }
-
- @Override
- protected IModule gatherModuleReference(IVirtualComponent component, IChildModuleReference child ) {
- if (!child.isBinary())
- return super.gatherModuleReference(component, child);
- return JEEDeployableFactory.jeeInstance().createChildModule(this, child);
- }
-
-
- /*_________________________________
- *
- * Methods for specific J2EE / JEE Interfaces are below
- *_________________________________
- */
- public String getJNDIName(String ejbName, String interfaceName) {
- if (!JavaEEProjectUtilities.isEJBProject(component.getProject()))
- return null;
-
- EjbModuleExtensionHelper modHelper = null;
- EJBJar jar = null;
-
- IModelProvider model = ModelProviderManager.getModelProvider(component.getProject());
- if (model != null) {
- jar = (EJBJar) model.getModelObject();
- SessionBean bean = getSessionBeanNamed(jar, ejbName);
- modHelper = IEJBModelExtenderManager.INSTANCE.getEJBModuleExtension(null);
- return modHelper == null ? null : modHelper.getJavaEEJNDIName(jar, bean, interfaceName);
- }
-
- return null;
- }
- /**
- * Return List of Session beans in this jar.
- * @return java.util.List
- */
- public SessionBean getSessionBeanNamed(EJBJar jar, String beanName) {
-
- EnterpriseBeans allBeans = jar.getEnterpriseBeans();
- for (Iterator iterator = allBeans.getSessionBeans().iterator(); iterator.hasNext();) {
- SessionBean bean = (SessionBean) iterator.next();
- if (bean.getEjbName().equals(beanName))
- return bean;
- }
- return null;
- }
-
-}
diff --git a/plugins/org.eclipse.jst.jee/earproject/org/eclipse/jst/jee/project/facet/EarFacetInstallDelegate.java b/plugins/org.eclipse.jst.jee/earproject/org/eclipse/jst/jee/project/facet/EarFacetInstallDelegate.java
deleted file mode 100644
index 04c2096..0000000
--- a/plugins/org.eclipse.jst.jee/earproject/org/eclipse/jst/jee/project/facet/EarFacetInstallDelegate.java
+++ /dev/null
@@ -1,115 +0,0 @@
-/******************************************************************************
- * Copyright (c) 2005 BEA Systems, Inc.
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
- *
- * Contributors:
- * Konstantin Komissarchik - initial API and implementation
- ******************************************************************************/
-
-package org.eclipse.jst.jee.project.facet;
-
-import java.io.ByteArrayInputStream;
-import java.io.UnsupportedEncodingException;
-
-import org.eclipse.core.commands.ExecutionException;
-import org.eclipse.core.resources.IFile;
-import org.eclipse.core.resources.IFolder;
-import org.eclipse.core.resources.IProject;
-import org.eclipse.core.resources.IResource;
-import org.eclipse.core.runtime.CoreException;
-import org.eclipse.core.runtime.IProgressMonitor;
-import org.eclipse.core.runtime.Path;
-import org.eclipse.jst.common.project.facet.WtpUtils;
-import org.eclipse.jst.j2ee.componentcore.util.EARArtifactEdit;
-import org.eclipse.jst.j2ee.earcreation.IEarFacetInstallDataModelProperties;
-import org.eclipse.jst.j2ee.internal.J2EEConstants;
-import org.eclipse.jst.j2ee.internal.common.J2EEVersionUtil;
-import org.eclipse.jst.j2ee.project.facet.IJ2EEFacetConstants;
-import org.eclipse.jst.j2ee.project.facet.IJ2EEFacetInstallDataModelProperties;
-import org.eclipse.jst.jee.JEEPlugin;
-import org.eclipse.wst.common.componentcore.ComponentCore;
-import org.eclipse.wst.common.componentcore.datamodel.FacetDataModelProvider;
-import org.eclipse.wst.common.componentcore.datamodel.properties.IFacetDataModelProperties;
-import org.eclipse.wst.common.componentcore.resources.IVirtualComponent;
-import org.eclipse.wst.common.componentcore.resources.IVirtualFolder;
-import org.eclipse.wst.common.frameworks.datamodel.IDataModel;
-import org.eclipse.wst.common.frameworks.datamodel.IDataModelOperation;
-import org.eclipse.wst.common.project.facet.core.IDelegate;
-import org.eclipse.wst.common.project.facet.core.IProjectFacetVersion;
-
-/**
- * @deprecated - This class had duplicated functionality. Please use {@link org.eclipse.jst.j2ee.project.facet.EarFacetInstallDelegate}
- */
-public final class EarFacetInstallDelegate implements IDelegate {
-
- public void execute(final IProject project, final IProjectFacetVersion fv, final Object cfg, final IProgressMonitor monitor) throws CoreException {
- if (monitor != null) {
- monitor.beginTask("", 1); //$NON-NLS-1$
- }
-
- try {
- IDataModel model = (IDataModel) cfg;
-
- if (monitor != null) {
- monitor.worked(1);
- }
- // Add WTP natures.
-
- WtpUtils.addNaturestoEAR(project);
-
- final IVirtualComponent c = ComponentCore.createComponent(project, false);
- c.create(0, null);
-
- final IVirtualFolder earroot = c.getRootFolder();
- earroot.createLink(new Path("/" + model.getStringProperty(IEarFacetInstallDataModelProperties.CONTENT_DIR)), 0, null); //$NON-NLS-1$
-
- try {
- ((IDataModelOperation) model.getProperty(FacetDataModelProvider.NOTIFICATION_OPERATION)).execute(monitor, null);
- } catch (ExecutionException e) {
- JEEPlugin.logError(e);
- }
-
- if( fv == IJ2EEFacetConstants.ENTERPRISE_APPLICATION_60 || fv == IJ2EEFacetConstants.ENTERPRISE_APPLICATION_50) {
- if(model.getBooleanProperty(IJ2EEFacetInstallDataModelProperties.GENERATE_DD)){
- // Create the deployment descriptor (web.xml) if one doesn't exist
- IFile appXmlFile = earroot.getUnderlyingFolder().getFile(new Path(J2EEConstants.APPLICATION_DD_URI));
- if (!appXmlFile.exists()) {
- try {
- if(!appXmlFile.getParent().exists()
- && (appXmlFile.getParent().getType() == IResource.FOLDER)){
- ((IFolder)appXmlFile.getParent()).create(true, true, monitor);
- }
- String appXmlContents = null;
- if(fv == IJ2EEFacetConstants.ENTERPRISE_APPLICATION_60) {
- appXmlContents = "<?xml version=\"1.0\" encoding=\"UTF-8\"?>\n<application id=\"Application_ID\" version=\"6\" xmlns=\"http://java.sun.com/xml/ns/javaee\" xmlns:xsi=\"http://www.w3.org/2001/XMLSchema-instance\" xsi:schemaLocation=\"http://java.sun.com/xml/ns/javaee http://java.sun.com/xml/ns/javaee/application_6.xsd\">\n <display-name> \n" + project.getName() + "</display-name> \n </application> "; //$NON-NLS-1$ //$NON-NLS-2$
- }
- else {
- appXmlContents = "<?xml version=\"1.0\" encoding=\"UTF-8\"?>\n<application id=\"Application_ID\" version=\"5\" xmlns=\"http://java.sun.com/xml/ns/javaee\" xmlns:xsi=\"http://www.w3.org/2001/XMLSchema-instance\" xsi:schemaLocation=\"http://java.sun.com/xml/ns/javaee http://java.sun.com/xml/ns/javaee/application_5.xsd\">\n <display-name> \n" + project.getName() + "</display-name> \n </application> "; //$NON-NLS-1$ //$NON-NLS-2$
- }
- appXmlFile.create(new ByteArrayInputStream(appXmlContents.getBytes("UTF-8")), true, monitor); //$NON-NLS-1$
- } catch (UnsupportedEncodingException e) {
- JEEPlugin.logError(e);
- }
- }
- }
- }
- else {
- if (!earroot.getUnderlyingFolder().getFile(new Path(J2EEConstants.APPLICATION_DD_URI)).exists()) {
- String ver = model.getStringProperty(IFacetDataModelProperties.FACET_VERSION_STR);
- int nVer = J2EEVersionUtil.convertVersionStringToInt(ver);
- EARArtifactEdit.createDeploymentDescriptor(project, nVer);
- }
- }
- }
-
- finally {
- if (monitor != null) {
- monitor.done();
- }
- }
- }
-
-}
diff --git a/plugins/org.eclipse.jst.jee/earproject/org/eclipse/jst/jee/project/facet/EarFacetPostInstallDelegate.java b/plugins/org.eclipse.jst.jee/earproject/org/eclipse/jst/jee/project/facet/EarFacetPostInstallDelegate.java
deleted file mode 100644
index bc14bdb..0000000
--- a/plugins/org.eclipse.jst.jee/earproject/org/eclipse/jst/jee/project/facet/EarFacetPostInstallDelegate.java
+++ /dev/null
@@ -1,94 +0,0 @@
-/******************************************************************************
- * Copyright (c) 2005 BEA Systems, Inc.
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
- *
- * Contributors:
- * Konstantin Komissarchik - initial API and implementation
- ******************************************************************************/
-
-package org.eclipse.jst.jee.project.facet;
-
-import java.util.ArrayList;
-import java.util.HashSet;
-import java.util.Iterator;
-import java.util.List;
-import java.util.Set;
-
-import org.eclipse.core.commands.ExecutionException;
-import org.eclipse.core.resources.IProject;
-import org.eclipse.core.runtime.CoreException;
-import org.eclipse.core.runtime.IProgressMonitor;
-import org.eclipse.jst.j2ee.application.internal.operations.AddComponentToEnterpriseApplicationDataModelProvider;
-import org.eclipse.jst.j2ee.earcreation.IEarFacetInstallDataModelProperties;
-import org.eclipse.jst.j2ee.internal.project.J2EEProjectUtilities;
-import org.eclipse.jst.j2ee.project.facet.JavaProjectMigrationOperation;
-import org.eclipse.jst.jee.JEEPlugin;
-import org.eclipse.wst.common.componentcore.ComponentCore;
-import org.eclipse.wst.common.componentcore.datamodel.properties.ICreateReferenceComponentsDataModelProperties;
-import org.eclipse.wst.common.componentcore.resources.IVirtualComponent;
-import org.eclipse.wst.common.frameworks.datamodel.DataModelFactory;
-import org.eclipse.wst.common.frameworks.datamodel.IDataModel;
-import org.eclipse.wst.common.project.facet.core.IDelegate;
-import org.eclipse.wst.common.project.facet.core.IProjectFacetVersion;
-
-/**
- * @deprecated - This class had duplicated functionality. Please use {@link org.eclipse.jst.j2ee.project.facet.EarFacetPostInstallDelegate}
- */
-public final class EarFacetPostInstallDelegate implements IDelegate {
-
- public void execute(final IProject project, final IProjectFacetVersion fv, final Object cfg, final IProgressMonitor monitor) throws CoreException {
- if (monitor != null) {
- monitor.beginTask("", 1); //$NON-NLS-1$
- }
-
- try {
- IDataModel model = (IDataModel) cfg;
-
- if (monitor != null) {
- monitor.worked(1);
- }
-
- final IVirtualComponent c = ComponentCore.createComponent(project);
-
- Set dependentProjects = new HashSet();
- dependentProjects.addAll((List) model.getProperty(IEarFacetInstallDataModelProperties.J2EE_PROJECTS_LIST));
- dependentProjects.addAll((List) model.getProperty(IEarFacetInstallDataModelProperties.JAVA_PROJECT_LIST));
- if (!dependentProjects.isEmpty()) {
- List dependentComponents = new ArrayList(dependentProjects.size());
- for (Iterator iterator = dependentProjects.iterator(); iterator.hasNext();) {
- IProject depProject = (IProject) iterator.next();
- IVirtualComponent depComp = ComponentCore.createComponent(depProject);
- if (depComp == null) {
- JavaProjectMigrationOperation utilOp = J2EEProjectUtilities.createFlexJavaProjectForProjectOperation(depProject);
- utilOp.execute(null, null);
- depComp = ComponentCore.createComponent(depProject);
- }
-
- dependentComponents.add(depComp);
- }
-
- final IDataModel dataModel = DataModelFactory.createDataModel(new AddComponentToEnterpriseApplicationDataModelProvider());
- dataModel.setProperty(ICreateReferenceComponentsDataModelProperties.SOURCE_COMPONENT, c);
- List modList = (List) dataModel.getProperty(ICreateReferenceComponentsDataModelProperties.TARGET_COMPONENT_LIST);
- modList.addAll(dependentComponents);
- dataModel.setProperty(ICreateReferenceComponentsDataModelProperties.TARGET_COMPONENT_LIST, modList);
- try {
- dataModel.getDefaultOperation().execute(null, null);
- } catch (ExecutionException e) {
- JEEPlugin.logError(e);
- }
- }
-
- }
-
- finally {
- if (monitor != null) {
- monitor.done();
- }
- }
- }
-
-}
diff --git a/plugins/org.eclipse.jst.jee/jeecreation/org/eclipse/jst/jee/contenttype/JEE6ContentDescriber.java b/plugins/org.eclipse.jst.jee/jeecreation/org/eclipse/jst/jee/contenttype/JEE6ContentDescriber.java
deleted file mode 100644
index 0338b6c..0000000
--- a/plugins/org.eclipse.jst.jee/jeecreation/org/eclipse/jst/jee/contenttype/JEE6ContentDescriber.java
+++ /dev/null
@@ -1,76 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2001, 2009 IBM Corporation and others.
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
- *
- * Contributors:
- * IBM Corporation - initial API and implementation
- *******************************************************************************/
-package org.eclipse.jst.jee.contenttype;
-
-import java.io.IOException;
-import java.io.InputStream;
-
-import org.eclipse.core.runtime.QualifiedName;
-import org.eclipse.core.runtime.content.IContentDescriber;
-import org.eclipse.core.runtime.content.IContentDescription;
-import org.eclipse.jst.jee.util.internal.JavaEEQuickPeek;
-
-/**
- * A content describer for detecting a j2ee module
- */
-public final class JEE6ContentDescriber implements IContentDescriber {
- public JEE6ContentDescriber() {
- super();
- }
-
- public final static QualifiedName JEEVERSION = new QualifiedName("jee-version", "5.0"); //$NON-NLS-1$ //$NON-NLS-2$
-
- public int describe(InputStream contents, IContentDescription description) throws IOException {
-
- JavaEEQuickPeek quickPeek = new JavaEEQuickPeek(contents);
- switch (quickPeek.getType()) {
- case JavaEEQuickPeek.APPLICATION_CLIENT_TYPE:
- case JavaEEQuickPeek.APPLICATION_TYPE:
- switch (quickPeek.getVersion()) {
- case JavaEEQuickPeek.JEE_6_0_ID:
- return VALID;
- }
- return INVALID;
- case JavaEEQuickPeek.EJB_TYPE:
- switch (quickPeek.getVersion()) {
- case JavaEEQuickPeek.EJB_3_1_ID:
- return VALID;
- }
- return INVALID;
- case JavaEEQuickPeek.WEB_TYPE:
- switch (quickPeek.getVersion()) {
- case JavaEEQuickPeek.WEB_3_0_ID:
- return VALID;
- }
- return INVALID;
- case JavaEEQuickPeek.WEBFRAGMENT_TYPE:
- switch (quickPeek.getVersion()) {
- case JavaEEQuickPeek.WEBFRAGMENT_3_0_ID:
- return VALID;
- }
- return INVALID;
- case JavaEEQuickPeek.CONNECTOR_TYPE:
- switch (quickPeek.getVersion()) {
- case JavaEEQuickPeek.JCA_1_6_ID:
- return VALID;
- }
- return INVALID;
- }
-
- return INVALID;
- }
-
- public QualifiedName[] getSupportedOptions() {
-
- return new QualifiedName[] { JEEVERSION };
- }
-
-}
diff --git a/plugins/org.eclipse.jst.jee/jeecreation/org/eclipse/jst/jee/contenttype/JEEContentDescriber.java b/plugins/org.eclipse.jst.jee/jeecreation/org/eclipse/jst/jee/contenttype/JEEContentDescriber.java
deleted file mode 100644
index dd4e85a..0000000
--- a/plugins/org.eclipse.jst.jee/jeecreation/org/eclipse/jst/jee/contenttype/JEEContentDescriber.java
+++ /dev/null
@@ -1,64 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2001, 2007 IBM Corporation and others.
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
- *
- * Contributors:
- * IBM Corporation - initial API and implementation
- *******************************************************************************/
-package org.eclipse.jst.jee.contenttype;
-
-import java.io.IOException;
-import java.io.InputStream;
-
-import org.eclipse.core.runtime.QualifiedName;
-import org.eclipse.core.runtime.content.IContentDescriber;
-import org.eclipse.core.runtime.content.IContentDescription;
-import org.eclipse.jst.jee.util.internal.JavaEEQuickPeek;
-
-/**
- * A content describer for detecting a j2ee module
- */
-public final class JEEContentDescriber implements IContentDescriber {
- public JEEContentDescriber() {
- super();
- }
-
- public final static QualifiedName JEEVERSION = new QualifiedName("jee-version", "5.0"); //$NON-NLS-1$ //$NON-NLS-2$
-
- public int describe(InputStream contents, IContentDescription description) throws IOException {
-
- JavaEEQuickPeek quickPeek = new JavaEEQuickPeek(contents);
- switch (quickPeek.getType()) {
- case JavaEEQuickPeek.APPLICATION_CLIENT_TYPE:
- case JavaEEQuickPeek.APPLICATION_TYPE:
- switch (quickPeek.getVersion()) {
- case JavaEEQuickPeek.JEE_5_0_ID:
- return VALID;
- }
- return INVALID;
- case JavaEEQuickPeek.EJB_TYPE:
- switch (quickPeek.getVersion()) {
- case JavaEEQuickPeek.EJB_3_0_ID:
- return VALID;
- }
- return INVALID;
- case JavaEEQuickPeek.WEB_TYPE:
- switch (quickPeek.getVersion()) {
- case JavaEEQuickPeek.WEB_2_5_ID:
- return VALID;
- }
- return INVALID;
- }
-
- return INVALID;
- }
-
- public QualifiedName[] getSupportedOptions() {
-
- return new QualifiedName[] { JEEVERSION };
- }
-
-}
diff --git a/plugins/org.eclipse.jst.jee/jeecreation/org/eclipse/jst/jee/model/internal/AppClient5ModelProvider.java b/plugins/org.eclipse.jst.jee/jeecreation/org/eclipse/jst/jee/model/internal/AppClient5ModelProvider.java
deleted file mode 100644
index 135cb45..0000000
--- a/plugins/org.eclipse.jst.jee/jeecreation/org/eclipse/jst/jee/model/internal/AppClient5ModelProvider.java
+++ /dev/null
@@ -1,77 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2005, 2007 IBM Corporation and others.
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
- *
- * Contributors:
- * IBM Corporation - initial API and implementation
- *******************************************************************************/
-package org.eclipse.jst.jee.model.internal;
-
-import org.eclipse.core.resources.IProject;
-import org.eclipse.core.runtime.IPath;
-import org.eclipse.core.runtime.Path;
-import org.eclipse.emf.ecore.EObject;
-import org.eclipse.emf.ecore.xmi.impl.XMLResourceImpl;
-import org.eclipse.jst.j2ee.internal.J2EEConstants;
-import org.eclipse.jst.j2ee.internal.J2EEVersionConstants;
-import org.eclipse.jst.j2ee.internal.project.J2EEProjectUtilities;
-import org.eclipse.jst.javaee.applicationclient.ApplicationClient;
-import org.eclipse.jst.javaee.applicationclient.ApplicationClientDeploymentDescriptor;
-import org.eclipse.jst.javaee.applicationclient.ApplicationclientFactory;
-import org.eclipse.jst.javaee.applicationclient.IApplicationClientResource;
-import org.eclipse.jst.javaee.core.DisplayName;
-import org.eclipse.jst.javaee.core.JavaeeFactory;
-
-public class AppClient5ModelProvider extends JEE5ModelProvider {
-
- private static final String APPCLIENT5_CONTENT_TYPE = "org.eclipse.jst.jee.ee5appclientDD"; //$NON-NLS-1$
- public AppClient5ModelProvider(IProject proj) {
- super();
- this.proj = proj;
- setDefaultResourcePath(new Path(J2EEConstants.APP_CLIENT_DD_URI));
- }
-
- /* (non-Javadoc)
- * @see org.eclipse.jst.j2ee.model.IModelProvider#getModelObject(org.eclipse.core.runtime.IPath)
- */
- @Override
- public Object getModelObject(IPath modelPath) {
- IApplicationClientResource appRes = (IApplicationClientResource)getModelResource(modelPath);
- if (appRes != null && appRes.getRootObject() != null)
- return appRes.getApplicationClient();
- return null;
- }
- @Override
- protected String getContentTypeDescriber() {
- return APPCLIENT5_CONTENT_TYPE;
- }
- @Override
- public void populateRoot(XMLResourceImpl res, String name) {
- ApplicationClientDeploymentDescriptor dd = ApplicationclientFactory.eINSTANCE.createApplicationClientDeploymentDescriptor();
- dd.getXMLNSPrefixMap().put("", J2EEConstants.JAVAEE_NS_URL); //$NON-NLS-1$
- dd.getXMLNSPrefixMap().put("xsi", J2EEConstants.XSI_NS_URL); //$NON-NLS-1$
-
- ApplicationClient client = ApplicationclientFactory.eINSTANCE.createApplicationClient();
- DisplayName dn = JavaeeFactory.eINSTANCE.createDisplayName();
- dn.setValue(name);
- client.getDisplayNames().add(dn);
-
- String version = J2EEProjectUtilities.getJ2EEProjectVersion(proj);
- if(version != null && version.equals(J2EEVersionConstants.VERSION_5_0_TEXT)) {
- dd.getXSISchemaLocation().put(J2EEConstants.JAVAEE_NS_URL, J2EEConstants.APP_CLIENT_SCHEMA_LOC_5);
- client.setVersion(J2EEVersionConstants.VERSION_5_TEXT);
- }
- else {
- dd.getXSISchemaLocation().put(J2EEConstants.JAVAEE_NS_URL, J2EEConstants.APP_CLIENT_SCHEMA_LOC_6);
- client.setVersion(J2EEVersionConstants.VERSION_6_TEXT);
- }
-
- dd.setApplicationClient(client);
- res.getContents().add((EObject) dd);
- }
-
-
-}
diff --git a/plugins/org.eclipse.jst.jee/jeecreation/org/eclipse/jst/jee/model/internal/AppClient5ModelProviderFactory.java b/plugins/org.eclipse.jst.jee/jeecreation/org/eclipse/jst/jee/model/internal/AppClient5ModelProviderFactory.java
deleted file mode 100644
index 3e57587..0000000
--- a/plugins/org.eclipse.jst.jee/jeecreation/org/eclipse/jst/jee/model/internal/AppClient5ModelProviderFactory.java
+++ /dev/null
@@ -1,28 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2005, 2007 IBM Corporation and others.
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
- *
- * Contributors:
- * IBM Corporation - initial API and implementation
- *******************************************************************************/
-package org.eclipse.jst.jee.model.internal;
-
-import org.eclipse.core.resources.IProject;
-import org.eclipse.jst.j2ee.model.IModelProvider;
-import org.eclipse.jst.j2ee.model.IModelProviderFactory;
-import org.eclipse.wst.common.componentcore.resources.IVirtualComponent;
-
-public class AppClient5ModelProviderFactory implements IModelProviderFactory {
-
- public IModelProvider create(IProject project) {
- return new AppClient5ModelProvider(project);
- }
-
- public IModelProvider create(IVirtualComponent component) {
- return new AppClient5ModelProvider(component.getProject());
- }
-
-}
diff --git a/plugins/org.eclipse.jst.jee/jeecreation/org/eclipse/jst/jee/model/internal/Connector16ModelProvider.java b/plugins/org.eclipse.jst.jee/jeecreation/org/eclipse/jst/jee/model/internal/Connector16ModelProvider.java
deleted file mode 100644
index 2546b4d..0000000
--- a/plugins/org.eclipse.jst.jee/jeecreation/org/eclipse/jst/jee/model/internal/Connector16ModelProvider.java
+++ /dev/null
@@ -1,78 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2009 IBM Corporation and others.
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
- *
- * Contributors:
- * IBM Corporation - initial API and implementation
- *******************************************************************************/
-package org.eclipse.jst.jee.model.internal;
-
-
-import org.eclipse.core.resources.IProject;
-import org.eclipse.core.runtime.IPath;
-import org.eclipse.core.runtime.Path;
-import org.eclipse.emf.ecore.EObject;
-import org.eclipse.emf.ecore.xmi.impl.XMLResourceImpl;
-import org.eclipse.jst.j2ee.internal.J2EEConstants;
-import org.eclipse.jst.j2ee.internal.J2EEVersionConstants;
-import org.eclipse.jst.j2ee.internal.project.J2EEProjectUtilities;
-import org.eclipse.jst.javaee.core.DisplayName;
-import org.eclipse.jst.javaee.core.JavaeeFactory;
-import org.eclipse.jst.javaee.jca.Connector;
-import org.eclipse.jst.javaee.jca.ConnectorDeploymentDescriptor;
-import org.eclipse.jst.javaee.jca.IConnectorResource;
-import org.eclipse.jst.javaee.jca.JcaFactory;
-
-public class Connector16ModelProvider extends JEE5ModelProvider {
-
- private static final String CONNECTOR16_CONTENT_TYPE = "org.eclipse.jst.jee.ee6connectorDD"; //$NON-NLS-1$
- public Connector16ModelProvider(IProject proj) {
- super();
- this.proj = proj;
- setDefaultResourcePath(new Path(J2EEConstants.RAR_DD_URI));
- }
-
- /* (non-Javadoc)
- * @see org.eclipse.jst.j2ee.model.IModelProvider#getModelObject(org.eclipse.core.runtime.IPath)
- */
- @Override
- public Object getModelObject(IPath modelPath) {
- IConnectorResource connectorRes = (IConnectorResource)getModelResource(modelPath);
- if (connectorRes != null && connectorRes.getRootObject() != null)
- return connectorRes.getConnector();
- return null;
- }
- @Override
- protected String getContentTypeDescriber() {
- return CONNECTOR16_CONTENT_TYPE;
- }
- @Override
- public void populateRoot(XMLResourceImpl res, String name) {
- ConnectorDeploymentDescriptor dd = JcaFactory.eINSTANCE.createConnectorDeploymentDescriptor();
- dd.getXMLNSPrefixMap().put("", J2EEConstants.JAVAEE_NS_URL); //$NON-NLS-1$
- dd.getXMLNSPrefixMap().put("xsi", J2EEConstants.XSI_NS_URL); //$NON-NLS-1$
-
- Connector connector = JcaFactory.eINSTANCE.createConnector();
- DisplayName dn = JavaeeFactory.eINSTANCE.createDisplayName();
- dn.setValue(name);
- connector.getDisplayNames().add(dn);
-
- String version = J2EEProjectUtilities.getJ2EEProjectVersion(proj);
- if(version != null && version.equals(J2EEVersionConstants.VERSION_1_6_TEXT)) {
- dd.getXSISchemaLocation().put(J2EEConstants.JAVAEE_NS_URL, J2EEConstants.CONNECTOR_SCHEMA_LOC_1_6);
- connector.setVersion(J2EEVersionConstants.VERSION_1_6_TEXT);
- }
- else
- {
- // default to 1.6 for now
- dd.getXSISchemaLocation().put(J2EEConstants.JAVAEE_NS_URL, J2EEConstants.CONNECTOR_SCHEMA_LOC_1_6);
- connector.setVersion(J2EEVersionConstants.VERSION_1_6_TEXT);
- }
- dd.setConnector(connector);
- res.getContents().add((EObject) dd);
- }
-
-}
diff --git a/plugins/org.eclipse.jst.jee/jeecreation/org/eclipse/jst/jee/model/internal/Connector16ModelProviderFactory.java b/plugins/org.eclipse.jst.jee/jeecreation/org/eclipse/jst/jee/model/internal/Connector16ModelProviderFactory.java
deleted file mode 100644
index 84f38ce..0000000
--- a/plugins/org.eclipse.jst.jee/jeecreation/org/eclipse/jst/jee/model/internal/Connector16ModelProviderFactory.java
+++ /dev/null
@@ -1,28 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2009 IBM Corporation and others.
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
- *
- * Contributors:
- * IBM Corporation - initial API and implementation
- *******************************************************************************/
-package org.eclipse.jst.jee.model.internal;
-
-import org.eclipse.core.resources.IProject;
-import org.eclipse.jst.j2ee.model.IModelProvider;
-import org.eclipse.jst.j2ee.model.IModelProviderFactory;
-import org.eclipse.wst.common.componentcore.resources.IVirtualComponent;
-
-public class Connector16ModelProviderFactory implements IModelProviderFactory {
-
- public IModelProvider create(IProject project) {
- return new Connector16ModelProvider(project);
- }
-
- public IModelProvider create(IVirtualComponent component) {
- return new Connector16ModelProvider(component.getProject());
- }
-
-}
diff --git a/plugins/org.eclipse.jst.jee/jeecreation/org/eclipse/jst/jee/model/internal/EAR5ModelProvider.java b/plugins/org.eclipse.jst.jee/jeecreation/org/eclipse/jst/jee/model/internal/EAR5ModelProvider.java
deleted file mode 100644
index 46f938b..0000000
--- a/plugins/org.eclipse.jst.jee/jeecreation/org/eclipse/jst/jee/model/internal/EAR5ModelProvider.java
+++ /dev/null
@@ -1,132 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2005, 2007 IBM Corporation and others.
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
- *
- * Contributors:
- * IBM Corporation - initial API and implementation
- *******************************************************************************/
-package org.eclipse.jst.jee.model.internal;
-
-import org.eclipse.core.resources.IProject;
-import org.eclipse.core.runtime.IPath;
-import org.eclipse.core.runtime.Path;
-import org.eclipse.emf.ecore.EObject;
-import org.eclipse.emf.ecore.xmi.impl.XMLResourceImpl;
-import org.eclipse.jst.j2ee.application.WebModule;
-import org.eclipse.jst.j2ee.internal.J2EEConstants;
-import org.eclipse.jst.j2ee.internal.J2EEVersionConstants;
-import org.eclipse.jst.j2ee.internal.project.J2EEProjectUtilities;
-import org.eclipse.jst.j2ee.model.IEARModelProvider;
-import org.eclipse.jst.j2ee.project.JavaEEProjectUtilities;
-import org.eclipse.jst.javaee.application.Application;
-import org.eclipse.jst.javaee.application.ApplicationDeploymentDescriptor;
-import org.eclipse.jst.javaee.application.ApplicationFactory;
-import org.eclipse.jst.javaee.application.IApplicationResource;
-import org.eclipse.jst.javaee.application.Module;
-import org.eclipse.jst.javaee.core.DisplayName;
-import org.eclipse.jst.javaee.core.JavaeeFactory;
-import org.eclipse.wst.common.componentcore.ComponentCore;
-import org.eclipse.wst.common.componentcore.resources.IVirtualComponent;
-import org.eclipse.wst.common.componentcore.resources.IVirtualReference;
-
-public class EAR5ModelProvider extends JEE5ModelProvider implements IEARModelProvider {
-
- private static final String EAR5_CONTENT_TYPE = "org.eclipse.jst.jee.ee5earDD"; //$NON-NLS-1$
- public EAR5ModelProvider(IProject proj) {
- super();
- this.proj = proj;
- setDefaultResourcePath(new Path(J2EEConstants.APPLICATION_DD_URI));
- }
- @Override
- protected String getContentTypeDescriber() {
- return EAR5_CONTENT_TYPE;
- }
-
- /* (non-Javadoc)
- * @see org.eclipse.jst.j2ee.model.IModelProvider#getModelObject(org.eclipse.core.runtime.IPath)
- */
- @Override
- public Object getModelObject(IPath modelPath) {
- IApplicationResource earRes = (IApplicationResource)getModelResource(modelPath);
- if (earRes != null && earRes.getRootObject() != null)
- return earRes.getApplication();
- return null;
- }
-
- public String getModuleURI(IVirtualComponent moduleComp) {
- IVirtualComponent comp = ComponentCore.createComponent(proj);
- IVirtualReference [] refs = comp.getReferences();
- for(int i=0; i<refs.length; i++){
- if(refs[i].getDependencyType() == IVirtualReference.DEPENDENCY_TYPE_USES){
- if(refs[i].getReferencedComponent().equals(moduleComp)){
- return refs[i].getArchiveName();
- }
- }
- }
- return null;
- }
- /**
- * This method will return the context root in this application for the passed in web project.
- *
- * @param webProject
- * @return contextRoot String
- */
- public String getWebContextRoot(IProject webProject) {
- if (webProject == null || !JavaEEProjectUtilities.isDynamicWebProject(webProject))
- return null;
- IVirtualComponent webComp = ComponentCore.createComponent(webProject);
- String webModuleURI = getModuleURI(webComp);
- if (webModuleURI != null) {
- Module webModule = ((Application)getModelObject()).getModule(webModuleURI, null);
- if (webModule != null)
- return webModule.getWeb().getContextRoot();
- }
- return null;
- }
- @Override
- public void populateRoot(XMLResourceImpl res, String name) {
- ApplicationDeploymentDescriptor dd = ApplicationFactory.eINSTANCE.createApplicationDeploymentDescriptor();
- dd.getXMLNSPrefixMap().put("", J2EEConstants.JAVAEE_NS_URL); //$NON-NLS-1$
- dd.getXMLNSPrefixMap().put("xsi", J2EEConstants.XSI_NS_URL); //$NON-NLS-1$
-
- Application ear = ApplicationFactory.eINSTANCE.createApplication();
- DisplayName dn = JavaeeFactory.eINSTANCE.createDisplayName();
- dn.setValue(name);
- ear.getDisplayNames().add(dn);
-
- String version = J2EEProjectUtilities.getJ2EEProjectVersion(proj);
- if(version != null && version.equals(J2EEVersionConstants.VERSION_5_0_TEXT)) {
- dd.getXSISchemaLocation().put(J2EEConstants.JAVAEE_NS_URL, J2EEConstants.APPLICATION_SCHEMA_LOC_5);
- ear.setVersion(J2EEVersionConstants.VERSION_5_TEXT);
- }
- else {
- dd.getXSISchemaLocation().put(J2EEConstants.JAVAEE_NS_URL, J2EEConstants.APPLICATION_SCHEMA_LOC_6);
- ear.setVersion(J2EEVersionConstants.VERSION_6_TEXT);
- }
-
- dd.setApplication(ear);
- res.getContents().add((EObject) dd);
- }
-
- /**
- * This method will set the context root on the application for the passed in contextRoot.
- *
- * @param webProject
- * @param aContextRoot
- */
- public void setWebContextRoot(IProject webProject, String aContextRoot) {
- if (webProject == null || !JavaEEProjectUtilities.isDynamicWebProject(webProject))
- return;
- IVirtualComponent webComp = ComponentCore.createComponent(webProject);
- String webModuleURI = getModuleURI(webComp);
- if (webModuleURI != null) {
- WebModule webModule = (WebModule) ((Application)getModelObject()).getModule(webModuleURI, null);
- if (webModule != null)
- webModule.setContextRoot(aContextRoot);
- // TODO - should this method save? Or should the caller be required to save?
- }
- }
-}
diff --git a/plugins/org.eclipse.jst.jee/jeecreation/org/eclipse/jst/jee/model/internal/EAR5ModelProviderFactory.java b/plugins/org.eclipse.jst.jee/jeecreation/org/eclipse/jst/jee/model/internal/EAR5ModelProviderFactory.java
deleted file mode 100644
index c364830..0000000
--- a/plugins/org.eclipse.jst.jee/jeecreation/org/eclipse/jst/jee/model/internal/EAR5ModelProviderFactory.java
+++ /dev/null
@@ -1,28 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2005, 2007 IBM Corporation and others.
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
- *
- * Contributors:
- * IBM Corporation - initial API and implementation
- *******************************************************************************/
-package org.eclipse.jst.jee.model.internal;
-
-import org.eclipse.core.resources.IProject;
-import org.eclipse.jst.j2ee.model.IModelProvider;
-import org.eclipse.jst.j2ee.model.IModelProviderFactory;
-import org.eclipse.wst.common.componentcore.resources.IVirtualComponent;
-
-public class EAR5ModelProviderFactory implements IModelProviderFactory {
-
- public IModelProvider create(IProject project) {
- return new EAR5ModelProvider(project);
- }
-
- public IModelProvider create(IVirtualComponent component) {
- return new EAR5ModelProvider(component.getProject());
- }
-
-}
diff --git a/plugins/org.eclipse.jst.jee/jeecreation/org/eclipse/jst/jee/model/internal/JEE5ModelProvider.java b/plugins/org.eclipse.jst.jee/jeecreation/org/eclipse/jst/jee/model/internal/JEE5ModelProvider.java
deleted file mode 100644
index 3273f84..0000000
--- a/plugins/org.eclipse.jst.jee/jeecreation/org/eclipse/jst/jee/model/internal/JEE5ModelProvider.java
+++ /dev/null
@@ -1,527 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2005, 2007 IBM Corporation and others.
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
- *
- * Contributors:
- * IBM Corporation - initial API and implementation
- *******************************************************************************/
-package org.eclipse.jst.jee.model.internal;
-
-import java.io.FileNotFoundException;
-import java.io.IOException;
-import java.util.ArrayList;
-import java.util.Collections;
-import java.util.List;
-
-import org.eclipse.core.resources.IFile;
-import org.eclipse.core.resources.IProject;
-import org.eclipse.core.resources.IWorkspace;
-import org.eclipse.core.resources.ResourcesPlugin;
-import org.eclipse.core.runtime.Assert;
-import org.eclipse.core.runtime.CoreException;
-import org.eclipse.core.runtime.IPath;
-import org.eclipse.core.runtime.ISafeRunnable;
-import org.eclipse.core.runtime.IStatus;
-import org.eclipse.core.runtime.ListenerList;
-import org.eclipse.core.runtime.Path;
-import org.eclipse.core.runtime.Platform;
-import org.eclipse.core.runtime.SafeRunner;
-import org.eclipse.core.runtime.Status;
-import org.eclipse.core.runtime.content.IContentDescription;
-import org.eclipse.emf.common.notify.Notification;
-import org.eclipse.emf.common.notify.impl.AdapterImpl;
-import org.eclipse.emf.common.util.URI;
-import org.eclipse.emf.common.util.WrappedException;
-import org.eclipse.emf.ecore.resource.Resource;
-import org.eclipse.emf.ecore.xmi.impl.XMLResourceImpl;
-import org.eclipse.jem.util.emf.workbench.FlexibleProjectResourceSet;
-import org.eclipse.jem.util.emf.workbench.ProjectResourceSet;
-import org.eclipse.jem.util.emf.workbench.WorkbenchResourceHelperBase;
-import org.eclipse.jst.j2ee.componentcore.EnterpriseArtifactEdit;
-import org.eclipse.jst.j2ee.model.IModelProvider;
-import org.eclipse.jst.j2ee.model.IModelProviderEvent;
-import org.eclipse.jst.j2ee.model.IModelProviderListener;
-import org.eclipse.jst.j2ee.model.ModelProviderEvent;
-import org.eclipse.jst.javaee.core.internal.util.JavaeeResourceImpl;
-import org.eclipse.jst.jee.JEEPlugin;
-import org.eclipse.wst.common.componentcore.ComponentCore;
-import org.eclipse.wst.common.componentcore.internal.impl.ModuleURIUtil;
-import org.eclipse.wst.common.componentcore.internal.impl.PlatformURLModuleConnection;
-import org.eclipse.wst.common.componentcore.internal.impl.WTPResourceFactoryRegistry;
-import org.eclipse.wst.common.componentcore.resources.IVirtualFolder;
-import org.eclipse.wst.common.internal.emfworkbench.WorkbenchResourceHelper;
-import org.eclipse.wst.common.internal.emfworkbench.validateedit.ResourceStateInputProvider;
-import org.eclipse.wst.common.internal.emfworkbench.validateedit.ResourceStateValidator;
-import org.eclipse.wst.common.internal.emfworkbench.validateedit.ResourceStateValidatorImpl;
-import org.eclipse.wst.common.internal.emfworkbench.validateedit.ResourceStateValidatorPresenter;
-
-public class JEE5ModelProvider implements IModelProvider, ResourceStateInputProvider, ResourceStateValidator, IModelProviderListener{
-
- protected XMLResourceImpl writableResource;
- protected IProject proj;
- protected IPath defaultResourcePath;
- protected ResourceStateValidator stateValidator;
- protected ResourceAdapter resourceAdapter = new ResourceAdapter();
- protected final ListenerList listeners = new ListenerList();
- //private static boolean resourceChangeListenerEnabled = false;
-
- private List modelResources = new ArrayList();
- protected class ResourceAdapter extends AdapterImpl {
- @Override
- public void notifyChanged(Notification notification) {
- if (notification.getEventType() == Notification.SET
- && notification.getFeatureID(null) == Resource.RESOURCE__IS_LOADED) {
- resourceIsLoadedChanged((Resource) notification.getNotifier(), notification.getOldBooleanValue(), notification.getNewBooleanValue());
- } else if (notification.getFeatureID(null) == Resource.RESOURCE__IS_MODIFIED)
- resourceChanged((Resource) notification.getNotifier());
- }
- @Override
- public boolean equals(Object arg0) {
-
- return this.getClass().equals(arg0.getClass());
- }
-
- @Override
- public int hashCode() {
-
- return getClass().hashCode();
- }
- }
-
- public JEE5ModelProvider() {
- super();
- }
-
- protected ProjectResourceSet getResourceSet(IProject proj2) {
- return (ProjectResourceSet)WorkbenchResourceHelperBase.getResourceSet(proj);
- }
-
- public XMLResourceImpl getWritableResource() {
- return writableResource;
- }
-
- public void setWritableResource(XMLResourceImpl writableResource) {
- this.writableResource = writableResource;
- }
-
- protected void resourceChanged(Resource aResource) {
- if (hasListeners()) {
- int eventCode = ModelProviderEvent.KNOWN_RESOURCES_CHANGED;
- ModelProviderEvent evt = new ModelProviderEvent(eventCode, this, proj);
- evt.addResource(aResource);
- notifyListeners(evt);
- }
- }
-
- protected void resourceIsLoadedChanged(Resource aResource, boolean oldValue, boolean newValue) {
- if (hasListeners()) {
- int eventCode = newValue ? ModelProviderEvent.LOADED_RESOURCE : ModelProviderEvent.UNLOADED_RESOURCE;
- ModelProviderEvent evt = new ModelProviderEvent(eventCode, this, proj);
- evt.addResource(aResource);
- notifyListeners(evt);
- }
- }
- private void addManagedResource(XMLResourceImpl res) {
- modelResources.add(res);
- if (!res.eAdapters().contains(resourceAdapter))
- res.eAdapters().add(resourceAdapter);
- }
- /**
- * Returns true if there are any listeners
- */
- public boolean hasListeners() {
- return !listeners.isEmpty();
- }
-
- private URI getModuleURI(URI uri) {
- URI moduleuri = ModuleURIUtil.fullyQualifyURI(proj,getContentTypeDescriber());
- IPath requestPath = new Path(moduleuri.path()).append(new Path(uri.path()));
- URI resourceURI = URI.createURI(PlatformURLModuleConnection.MODULE_PROTOCOL + requestPath.toString());
- return resourceURI;
- }
-
- protected XMLResourceImpl getModelResource(final IPath modelPath) {
- if(proj == null || !proj.isAccessible()){
- throw new IllegalStateException("The project <" + proj + "> is not accessible."); //$NON-NLS-1$//$NON-NLS-2$
- }
- if (writableResource != null) {
- addManagedResource(writableResource);
- return writableResource;
- }
- IPath innerModelPath = modelPath;
- if ((innerModelPath == null) || innerModelPath.equals(IModelProvider.FORCESAVE))
- innerModelPath = getDefaultResourcePath();
- ProjectResourceSet resSet = getResourceSet(proj);
- IVirtualFolder container = ComponentCore.createComponent(proj).getRootFolder();
- String modelPathURI = innerModelPath.toString();
- URI uri = URI.createURI(modelPathURI);
-
- IPath projURIPath = new Path("");//$NON-NLS-1$
- projURIPath = projURIPath.append(container.getProjectRelativePath());
- projURIPath = projURIPath.addTrailingSeparator();
- projURIPath = projURIPath.append(innerModelPath);
- URI projURI = URI.createURI(projURIPath.toString());
- XMLResourceImpl res = null;
- try {
- if (proj.getFile(projURI.toString()).exists())
- {
- res = (XMLResourceImpl) resSet.getResource(getModuleURI(uri),true);
- addManagedResource(res);
- } else {//First find in resource set, then create if not found new Empty Resource.
- XMLResourceImpl newRes = createModelResource(innerModelPath, resSet, projURI);
- addManagedResource(newRes);
- return newRes;
- }
- } catch (WrappedException ex) {
- if (ex.getCause() instanceof FileNotFoundException)
- return null;
- throw ex;
- }
- return res;
- }
-
-
- protected XMLResourceImpl createModelResource(IPath modelPath, ProjectResourceSet resourceSet, URI uri) {
- // First try to find existing cached resource.
- XMLResourceImpl res = (XMLResourceImpl)resourceSet.getResource(getModuleURI(uri), false);
- if (res == null || !res.isLoaded()) {
- // Create temp resource if no file exists
- res= (XMLResourceImpl)((FlexibleProjectResourceSet)resourceSet).createResource(getModuleURI(uri),WTPResourceFactoryRegistry.INSTANCE.getFactory(uri, getContentType(getContentTypeDescriber())));
- res.setEncoding("UTF-8"); //$NON-NLS-1$
- populateRoot(res, resourceSet.getProject().getName());
- }
- return res;
- }
-
- public void populateRoot(XMLResourceImpl res, String string) {
- }
-
- private IContentDescription getContentType(String contentTypeDescriber) {
- if (contentTypeDescriber != null)
- return Platform.getContentTypeManager().getContentType(contentTypeDescriber).getDefaultDescription();
- return null;
- }
-
- public IPath getDefaultResourcePath() {
- return defaultResourcePath;
- }
-
- public void setDefaultResourcePath(IPath defaultResourcePath) {
- this.defaultResourcePath = defaultResourcePath;
- }
-
- public Object getModelObject() {
- return getModelObject(getDefaultResourcePath());
- }
-
- public Object getModelObject(IPath modelPath) {
- return null;
- }
-
- /**
- * Used to optionally define an associated content type for XML file creation
- * @return
- */
- protected String getContentTypeDescriber() {
-
- return null;
- }
-
-
-
- public IStatus validateEdit(final IPath modelPath, final Object context) {
- IPath innaerModelPath = modelPath;
- Object innerContext = context;
- if (innaerModelPath == null)
- innaerModelPath = getDefaultResourcePath();
- IWorkspace work = ResourcesPlugin.getWorkspace();
- IFile file = WorkbenchResourceHelper.getFile(getModelResource(innaerModelPath));
- if (file != null && file.exists()) {
- IFile[] files = { file };
- if (innerContext == null)
- innerContext = IWorkspace.VALIDATE_PROMPT;
- return work.validateEdit(files, innerContext);
- }
- return Status.OK_STATUS;
- }
-
- public void modify(Runnable runnable, IPath modelPath) {
- //About to modify and save this model
- try {
- JavaeeResourceImpl res = (JavaeeResourceImpl)getModelResource(modelPath);
- if (res != null)
- setWritableResource(res);
- runnable.run();
- try {
- if (res != null) {
- if (modelPath != null && modelPath.equals(IModelProvider.FORCESAVE))
- res.save(Collections.EMPTY_MAP,true);
- else
- res.save(Collections.EMPTY_MAP);
- }
- } catch (IOException e) {
- JEEPlugin.logError(e);
- }
- } catch (Exception ex) {
- JEEPlugin.logError(ex);
- } finally {
- setWritableResource(null);
- }
-
- }
-
-// private class ResourceChangeListener implements IResourceChangeListener {
-// public void resourceChanged(IResourceChangeEvent event) {
-// IResourceDelta delta= event.getDelta();
-// // make sure that there is a delta (since some events don't have one)
-// if (delta != null)
-// {
-// IResourceDelta[] affectedChildren= delta.getAffectedChildren(IResourceDelta.CHANGED | IResourceDelta.REMOVED , IResource.FILE);
-// IResourceDelta projectDelta = null;
-// IResource changedResource = null;
-// IProject changedProject = null;
-// IPath resourcePath = null;
-//
-// for (int i= 0; i < affectedChildren.length; i++) {
-// projectDelta = affectedChildren[i];
-// changedResource = projectDelta.getResource();
-// changedProject = changedResource.getProject();
-// HashSet<IPath> currentResources = modelResources.get(changedProject);
-// // only deal with the projects that have resources that have been loaded
-// if (currentResources != null)
-// {
-// // if this is a project deletion, remove the project from the HashMap.
-// if (changedResource == changedProject && projectDelta.getKind() == IResourceDelta.REMOVED)
-// {
-// modelResources.remove(changedProject);
-// // if modelResources is empty, we should self-destruct
-// if (modelResources.isEmpty())
-// {
-// resourceChangeListenerEnabled = false;
-// ResourcesPlugin.getWorkspace().removeResourceChangeListener(this);
-// }
-// }
-// else
-// {
-// Iterator<IPath> iter = currentResources.iterator();
-// ArrayList<IPath> toUnload = new ArrayList<IPath>();
-// // check each resource that was loaded from the project to see if it is part of the change
-// while (iter.hasNext())
-// {
-// resourcePath = iter.next();
-// if (projectDelta.findMember(resourcePath) != null)
-// {
-// // limit the list of resources that need to be unloaded to those that have changed
-// toUnload.add(resourcePath);
-// }
-// }
-// if (toUnload.size() > 0)
-// {
-// Resource current = null;
-// ProjectResourceSet resourceSet = getResourceSet(changedProject);
-// URIConverter uriConverter = resourceSet.getURIConverter();
-// HashSet<URI> resourceURIs = new HashSet<URI>();
-// iter = toUnload.iterator();
-// while (iter.hasNext())
-// {
-// // convert all of the resources to URIs - this is a faster match during the compare
-// resourceURIs.add(uriConverter.normalize(URI.createURI(iter.next().toString())));
-// }
-// Iterator<Resource> iter2 = resourceSet.getResources().iterator();
-// while (iter2.hasNext())
-// {
-// current = iter2.next();
-// if (resourceURIs.contains(current.getURI()))
-// {
-// current.unload();
-// }
-// }
-// }
-// }
-// }
-// }
-// }
-// }
-// }
-
- public void addListener(IModelProviderListener listener) {
-
- listeners.add(listener);
- }
-
- public void removeListener(IModelProviderListener listener)
- {
- listeners.remove(listener);
- }
- /**
- * Save only resources that need to be saved (i.e., no other references).
- */
- public void modelsChanged(IModelProviderEvent anEvent) {
- int code = anEvent.getEventCode();
- switch (code) {
- case IModelProviderEvent.REMOVED_RESOURCE : {
- if (hasResourceReference(anEvent.getChangedResources()))
- removeResources(anEvent.getChangedResources());
- else
- return;
- break;
- }
- }
- if (hasListeners()) {
- anEvent.setModel(this);
- notifyListeners(anEvent);
- }
- }
- protected void removeResources(List aList) {
- Resource res;
- for (int i = 0; i < aList.size(); i++) {
- res = (Resource) aList.get(i);
- removeResource(res) ;
- }
- }
- /**
- * Remove reference to the aResource.
- */
- protected boolean removeResource(Resource aResource) {
- if (aResource != null) {
- aResource.eAdapters().remove(resourceAdapter);
- return getResources().remove(aResource);
- }
- return false;
- }
-
- /**
- * Return true if any Resource in the list of
- *
- * @resources is referenced by me.
- */
- protected boolean hasResourceReference(List tResources) {
- for (int i = 0; i < tResources.size(); i++) {
- if (hasResourceReference((Resource) tResources.get(i)))
- return true;
- }
- return false;
- }
- /**
- * Return true if aResource is referenced by me.
- */
- protected boolean hasResourceReference(Resource aResource) {
- if (aResource != null)
- return getResources().contains(aResource);
- return false;
- }
-
- /**
- * Notify listeners of
- *
- * @anEvent.
- */
- protected void notifyListeners(IModelProviderEvent anEvent) {
-
- NotifyRunner notifier = new NotifyRunner(anEvent);
-
- Object[] notifyList = listeners.getListeners();
- for (int i = 0; i < notifyList.length; i++) {
- notifier.setListener( (IModelProviderListener) notifyList[i] );
- SafeRunner.run(notifier);
- }
- }
- public class NotifyRunner implements ISafeRunnable {
-
- private final IModelProviderEvent event;
- private IModelProviderListener listener;
-
- public NotifyRunner(IModelProviderEvent event) {
- Assert.isNotNull(event);
- this.event = event;
- }
-
-
- public void setListener(IModelProviderListener listener) {
- this.listener = listener;
- }
-
- public void handleException(Throwable exception) {
- JEEPlugin.getDefault().getLog().log(new Status(IStatus.ERROR, JEEPlugin.PLUGIN_ID, 0, exception.getMessage(), exception));
-
- }
-
- public void run() throws Exception {
- if(listener != null)
- listener.modelsChanged(event);
- }
-
- }
- public ResourceStateValidator getStateValidator() {
- if (stateValidator == null)
- stateValidator = createStateValidator();
- return stateValidator;
- }
-
- /**
- * Method createStateValidator.
- *
- * @return ResourceStateValidator
- */
- private ResourceStateValidator createStateValidator() {
- return new ResourceStateValidatorImpl(this);
- }
-
- protected EnterpriseArtifactEdit createArtifactEdit() {
- return null;
- }
-
- public void checkActivation(ResourceStateValidatorPresenter presenter) throws CoreException {
- getStateValidator().checkActivation(presenter);
-
- }
-
- public boolean checkReadOnly() {
- return getStateValidator().checkReadOnly();
- }
-
- public boolean checkSave(ResourceStateValidatorPresenter presenter) throws CoreException {
- return getStateValidator().checkSave(presenter);
- }
-
- public void lostActivation(ResourceStateValidatorPresenter presenter) throws CoreException {
- getStateValidator().lostActivation(presenter);
-
- }
-
- public IStatus validateState(ResourceStateValidatorPresenter presenter) throws CoreException {
- if (presenter == null)
- return Status.OK_STATUS;
- return getStateValidator().validateState(presenter);
- }
-
- public void cacheNonResourceValidateState(List roNonResourceFiles) {
- // do nothing
- }
-
- public List getNonResourceFiles() {
- return null;
- }
-
- public List getNonResourceInconsistentFiles() {
- return null;
- }
-
- public List getResources() {
- return modelResources;
- }
-
-
- public boolean isDirty() {
-
- List list = getResources();
- for (int i = 0; i < list.size(); i++) {
- if (((Resource) list.get(i)).isModified())
- return true;
- }
- return false;
- }
-}
\ No newline at end of file
diff --git a/plugins/org.eclipse.jst.jee/jeecreation/org/eclipse/jst/jee/project/facet/AppClientCreateDeploymentFilesDataModelProvider.java b/plugins/org.eclipse.jst.jee/jeecreation/org/eclipse/jst/jee/project/facet/AppClientCreateDeploymentFilesDataModelProvider.java
deleted file mode 100644
index c398d89..0000000
--- a/plugins/org.eclipse.jst.jee/jeecreation/org/eclipse/jst/jee/project/facet/AppClientCreateDeploymentFilesDataModelProvider.java
+++ /dev/null
@@ -1,13 +0,0 @@
-package org.eclipse.jst.jee.project.facet;
-
-import org.eclipse.wst.common.frameworks.datamodel.IDataModelOperation;
-
-public class AppClientCreateDeploymentFilesDataModelProvider extends
- CreateDeploymentFilesDataModelProvider implements
- IWebCreateDeploymentFilesDataModelProperties {
- @Override
- public IDataModelOperation getDefaultOperation() {
- return new AppClientCreateDeploymentFilesOperation(model);
- }
-
-}
diff --git a/plugins/org.eclipse.jst.jee/jeecreation/org/eclipse/jst/jee/project/facet/AppClientCreateDeploymentFilesOperation.java b/plugins/org.eclipse.jst.jee/jeecreation/org/eclipse/jst/jee/project/facet/AppClientCreateDeploymentFilesOperation.java
deleted file mode 100644
index 373d4ad..0000000
--- a/plugins/org.eclipse.jst.jee/jeecreation/org/eclipse/jst/jee/project/facet/AppClientCreateDeploymentFilesOperation.java
+++ /dev/null
@@ -1,26 +0,0 @@
-package org.eclipse.jst.jee.project.facet;
-
-import org.eclipse.core.resources.IProject;
-import org.eclipse.core.runtime.IProgressMonitor;
-import org.eclipse.jst.j2ee.model.IModelProvider;
-import org.eclipse.jst.j2ee.model.ModelProviderManager;
-import org.eclipse.wst.common.frameworks.datamodel.IDataModel;
-
-public class AppClientCreateDeploymentFilesOperation extends
- CreateDeploymentFilesDataModelOperation {
-
-
- public AppClientCreateDeploymentFilesOperation(IDataModel model) {
- super(model);
- }
-
- @Override
- protected void createDeploymentFiles(IProject project, IProgressMonitor monitor) {
- final IModelProvider provider = ModelProviderManager.getModelProvider(project);
- provider.modify(new Runnable(){
- public void run() {
- }
- }, IModelProvider.FORCESAVE);
- }
-
-}
diff --git a/plugins/org.eclipse.jst.jee/jeecreation/org/eclipse/jst/jee/project/facet/ConnectorCreateDeploymentFilesDataModelProvider.java b/plugins/org.eclipse.jst.jee/jeecreation/org/eclipse/jst/jee/project/facet/ConnectorCreateDeploymentFilesDataModelProvider.java
deleted file mode 100644
index b1e68e1..0000000
--- a/plugins/org.eclipse.jst.jee/jeecreation/org/eclipse/jst/jee/project/facet/ConnectorCreateDeploymentFilesDataModelProvider.java
+++ /dev/null
@@ -1,22 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2009 IBM Corporation and others.
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
- *
- * Contributors:
- * IBM Corporation - initial API and implementation
- *******************************************************************************/
-package org.eclipse.jst.jee.project.facet;
-
-import org.eclipse.wst.common.frameworks.datamodel.IDataModelOperation;
-
-public class ConnectorCreateDeploymentFilesDataModelProvider extends
- CreateDeploymentFilesDataModelProvider {
- @Override
- public IDataModelOperation getDefaultOperation() {
- return new ConnectorCreateDeploymentFilesFilesOperation(model);
- }
-
-}
diff --git a/plugins/org.eclipse.jst.jee/jeecreation/org/eclipse/jst/jee/project/facet/ConnectorCreateDeploymentFilesFilesOperation.java b/plugins/org.eclipse.jst.jee/jeecreation/org/eclipse/jst/jee/project/facet/ConnectorCreateDeploymentFilesFilesOperation.java
deleted file mode 100644
index 9745d05..0000000
--- a/plugins/org.eclipse.jst.jee/jeecreation/org/eclipse/jst/jee/project/facet/ConnectorCreateDeploymentFilesFilesOperation.java
+++ /dev/null
@@ -1,36 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2009 IBM Corporation and others.
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
- *
- * Contributors:
- * IBM Corporation - initial API and implementation
- *******************************************************************************/
-package org.eclipse.jst.jee.project.facet;
-
-import org.eclipse.core.resources.IProject;
-import org.eclipse.core.runtime.IProgressMonitor;
-import org.eclipse.jst.j2ee.model.IModelProvider;
-import org.eclipse.jst.j2ee.model.ModelProviderManager;
-import org.eclipse.wst.common.frameworks.datamodel.IDataModel;
-
-public class ConnectorCreateDeploymentFilesFilesOperation extends
- CreateDeploymentFilesDataModelOperation {
-
-
- public ConnectorCreateDeploymentFilesFilesOperation(IDataModel model) {
- super(model);
- }
-
- @Override
- protected void createDeploymentFiles(IProject project, IProgressMonitor monitor) {
- final IModelProvider provider = ModelProviderManager.getModelProvider(project);
- provider.modify(new Runnable(){
- public void run() {
- }
- }, IModelProvider.FORCESAVE);
- }
-
-}
diff --git a/plugins/org.eclipse.jst.jee/jeecreation/org/eclipse/jst/jee/project/facet/CreateDeploymentFilesDataModelOperation.java b/plugins/org.eclipse.jst.jee/jeecreation/org/eclipse/jst/jee/project/facet/CreateDeploymentFilesDataModelOperation.java
deleted file mode 100644
index 60e2b17..0000000
--- a/plugins/org.eclipse.jst.jee/jeecreation/org/eclipse/jst/jee/project/facet/CreateDeploymentFilesDataModelOperation.java
+++ /dev/null
@@ -1,30 +0,0 @@
-package org.eclipse.jst.jee.project.facet;
-
-import org.eclipse.core.commands.ExecutionException;
-import org.eclipse.core.resources.IProject;
-import org.eclipse.core.runtime.IAdaptable;
-import org.eclipse.core.runtime.IProgressMonitor;
-import org.eclipse.core.runtime.IStatus;
-import org.eclipse.wst.common.frameworks.datamodel.AbstractDataModelOperation;
-import org.eclipse.wst.common.frameworks.datamodel.IDataModel;
-
-public class CreateDeploymentFilesDataModelOperation extends
- AbstractDataModelOperation {
-
- public CreateDeploymentFilesDataModelOperation(IDataModel model) {
- super(model);
- }
-
- @Override
- public IStatus execute(IProgressMonitor monitor, IAdaptable info)
- throws ExecutionException {
- IProject targetProject = (IProject) model.getProperty(ICreateDeploymentFilesDataModelProperties.TARGET_PROJECT);
- createDeploymentFiles(targetProject, monitor);
- return OK_STATUS;
- }
-
- protected void createDeploymentFiles(IProject project, IProgressMonitor monitor) {
- // do nothing
- }
-
-}
diff --git a/plugins/org.eclipse.jst.jee/jeecreation/org/eclipse/jst/jee/project/facet/CreateDeploymentFilesDataModelProvider.java b/plugins/org.eclipse.jst.jee/jeecreation/org/eclipse/jst/jee/project/facet/CreateDeploymentFilesDataModelProvider.java
deleted file mode 100644
index 225deaa..0000000
--- a/plugins/org.eclipse.jst.jee/jeecreation/org/eclipse/jst/jee/project/facet/CreateDeploymentFilesDataModelProvider.java
+++ /dev/null
@@ -1,31 +0,0 @@
-package org.eclipse.jst.jee.project.facet;
-
-import java.util.Set;
-
-import org.eclipse.wst.common.frameworks.datamodel.AbstractDataModelProvider;
-import org.eclipse.wst.common.frameworks.datamodel.IDataModelOperation;
-
-public class CreateDeploymentFilesDataModelProvider extends
- AbstractDataModelProvider implements ICreateDeploymentFilesDataModelProperties {
-
- @Override
- public Object getDefaultProperty(String propertyName) {
- if(ICreateDeploymentFilesDataModelProperties.GENERATE_DD.equals(propertyName)){
- return true;
- }
- return super.getDefaultProperty(propertyName);
- }
-
- @Override
- public Set getPropertyNames() {
- Set propertyNames = super.getPropertyNames();
- propertyNames.add(GENERATE_DD);
- propertyNames.add(TARGET_PROJECT);
- return propertyNames;
- }
- @Override
- public IDataModelOperation getDefaultOperation() {
- return new CreateDeploymentFilesDataModelOperation(model);
- }
-
-}
diff --git a/plugins/org.eclipse.jst.jee/jeecreation/org/eclipse/jst/jee/project/facet/EJBCreateDeploymentFilesDataModelProvider.java b/plugins/org.eclipse.jst.jee/jeecreation/org/eclipse/jst/jee/project/facet/EJBCreateDeploymentFilesDataModelProvider.java
deleted file mode 100644
index 9c7e8f7..0000000
--- a/plugins/org.eclipse.jst.jee/jeecreation/org/eclipse/jst/jee/project/facet/EJBCreateDeploymentFilesDataModelProvider.java
+++ /dev/null
@@ -1,13 +0,0 @@
-package org.eclipse.jst.jee.project.facet;
-
-import org.eclipse.wst.common.frameworks.datamodel.IDataModelOperation;
-
-public class EJBCreateDeploymentFilesDataModelProvider extends
- CreateDeploymentFilesDataModelProvider implements
- IEJBCreateDeploymentFilesDataModelProperties {
- @Override
- public IDataModelOperation getDefaultOperation() {
- return new EJBCreateDeploymentFilesOperation(model);
- }
-
-}
diff --git a/plugins/org.eclipse.jst.jee/jeecreation/org/eclipse/jst/jee/project/facet/EJBCreateDeploymentFilesOperation.java b/plugins/org.eclipse.jst.jee/jeecreation/org/eclipse/jst/jee/project/facet/EJBCreateDeploymentFilesOperation.java
deleted file mode 100644
index bc8e1c2..0000000
--- a/plugins/org.eclipse.jst.jee/jeecreation/org/eclipse/jst/jee/project/facet/EJBCreateDeploymentFilesOperation.java
+++ /dev/null
@@ -1,26 +0,0 @@
-package org.eclipse.jst.jee.project.facet;
-
-import org.eclipse.core.resources.IProject;
-import org.eclipse.core.runtime.IProgressMonitor;
-import org.eclipse.jst.j2ee.model.IModelProvider;
-import org.eclipse.jst.j2ee.model.ModelProviderManager;
-import org.eclipse.wst.common.frameworks.datamodel.IDataModel;
-
-public class EJBCreateDeploymentFilesOperation extends
- CreateDeploymentFilesDataModelOperation {
-
-
- public EJBCreateDeploymentFilesOperation(IDataModel model) {
- super(model);
- }
-
- @Override
- protected void createDeploymentFiles(IProject project, IProgressMonitor monitor) {
- final IModelProvider provider = ModelProviderManager.getModelProvider(project);
- provider.modify(new Runnable(){
- public void run() {
- }
- }, IModelProvider.FORCESAVE);
- }
-
-}
diff --git a/plugins/org.eclipse.jst.jee/jeecreation/org/eclipse/jst/jee/project/facet/EarCreateDeploymentFilesDataModelProvider.java b/plugins/org.eclipse.jst.jee/jeecreation/org/eclipse/jst/jee/project/facet/EarCreateDeploymentFilesDataModelProvider.java
deleted file mode 100644
index 9ec8683..0000000
--- a/plugins/org.eclipse.jst.jee/jeecreation/org/eclipse/jst/jee/project/facet/EarCreateDeploymentFilesDataModelProvider.java
+++ /dev/null
@@ -1,13 +0,0 @@
-package org.eclipse.jst.jee.project.facet;
-
-import org.eclipse.wst.common.frameworks.datamodel.IDataModelOperation;
-
-public class EarCreateDeploymentFilesDataModelProvider extends
- CreateDeploymentFilesDataModelProvider implements
- IEarCreateDeploymentFilesDataModelProperties {
- @Override
- public IDataModelOperation getDefaultOperation() {
- return new EarCreateDeploymentFilesOperation(model);
- }
-
-}
diff --git a/plugins/org.eclipse.jst.jee/jeecreation/org/eclipse/jst/jee/project/facet/EarCreateDeploymentFilesOperation.java b/plugins/org.eclipse.jst.jee/jeecreation/org/eclipse/jst/jee/project/facet/EarCreateDeploymentFilesOperation.java
deleted file mode 100644
index 18ac269..0000000
--- a/plugins/org.eclipse.jst.jee/jeecreation/org/eclipse/jst/jee/project/facet/EarCreateDeploymentFilesOperation.java
+++ /dev/null
@@ -1,62 +0,0 @@
-package org.eclipse.jst.jee.project.facet;
-
-import java.util.HashMap;
-import java.util.Map;
-
-import org.eclipse.core.commands.ExecutionException;
-import org.eclipse.core.resources.IProject;
-import org.eclipse.core.runtime.IProgressMonitor;
-import org.eclipse.core.runtime.Path;
-import org.eclipse.jst.j2ee.application.internal.operations.AddComponentToEnterpriseApplicationDataModelProvider;
-import org.eclipse.jst.j2ee.internal.project.J2EEProjectUtilities;
-import org.eclipse.jst.j2ee.model.IModelProvider;
-import org.eclipse.jst.j2ee.model.ModelProviderManager;
-import org.eclipse.jst.jee.JEEPlugin;
-import org.eclipse.wst.common.componentcore.ComponentCore;
-import org.eclipse.wst.common.componentcore.datamodel.properties.ICreateReferenceComponentsDataModelProperties;
-import org.eclipse.wst.common.componentcore.resources.IVirtualComponent;
-import org.eclipse.wst.common.componentcore.resources.IVirtualReference;
-import org.eclipse.wst.common.frameworks.datamodel.DataModelFactory;
-import org.eclipse.wst.common.frameworks.datamodel.IDataModel;
-
-public class EarCreateDeploymentFilesOperation extends
- CreateDeploymentFilesDataModelOperation {
-
-
- public EarCreateDeploymentFilesOperation(IDataModel model) {
- super(model);
- }
-
- @Override
- protected void createDeploymentFiles(IProject project, final IProgressMonitor monitor) {
- final IVirtualComponent component = ComponentCore.createComponent(project);
- final IModelProvider provider = ModelProviderManager.getModelProvider(project);
- provider.modify(new Runnable(){
- public void run() {
- IVirtualReference[] componentReferences = J2EEProjectUtilities.getJ2EEModuleReferences(component);
- if(componentReferences != null && componentReferences.length > 0){
- final IDataModel dataModel = DataModelFactory.createDataModel(new AddComponentToEnterpriseApplicationDataModelProvider());
- dataModel.setProperty(ICreateReferenceComponentsDataModelProperties.SOURCE_COMPONENT, component);
- Map<IVirtualComponent, String> uriMap = new HashMap<IVirtualComponent, String>();
- for(int i = 0; i < componentReferences.length; i++) {
- IVirtualComponent referencedComponent = componentReferences[i].getReferencedComponent();
- if (componentReferences[i].getRuntimePath().toString().equals("/")){ //$NON-NLS-1$
- uriMap.put(referencedComponent, componentReferences[i].getArchiveName());
- } else {
- uriMap.put(referencedComponent, componentReferences[i].getRuntimePath().append((new Path(componentReferences[i].getArchiveName())).lastSegment()).toString());
- }
- }
- dataModel.setProperty(ICreateReferenceComponentsDataModelProperties.TARGET_COMPONENTS_TO_URI_MAP, uriMap);
- try {
- dataModel.getDefaultOperation().execute(monitor, null);
- } catch (ExecutionException e) {
- JEEPlugin.logError(e);
- }
- }
- }
- }, IModelProvider.FORCESAVE);
-
-
- }
-
-}
diff --git a/plugins/org.eclipse.jst.jee/jeecreation/org/eclipse/jst/jee/project/facet/IAppClientCreateDeploymentFilesDataModelProperties.java b/plugins/org.eclipse.jst.jee/jeecreation/org/eclipse/jst/jee/project/facet/IAppClientCreateDeploymentFilesDataModelProperties.java
deleted file mode 100644
index 6ed3be6..0000000
--- a/plugins/org.eclipse.jst.jee/jeecreation/org/eclipse/jst/jee/project/facet/IAppClientCreateDeploymentFilesDataModelProperties.java
+++ /dev/null
@@ -1,10 +0,0 @@
-package org.eclipse.jst.jee.project.facet;
-
-public interface IAppClientCreateDeploymentFilesDataModelProperties extends
- ICreateDeploymentFilesDataModelProperties {
- /**
- * This field should not be used. It is not part of the API and may be modified in the future.
- */
- public static Class _provider_class = AppClientCreateDeploymentFilesDataModelProvider.class;
-
-}
diff --git a/plugins/org.eclipse.jst.jee/jeecreation/org/eclipse/jst/jee/project/facet/IConnectorCreateDeploymentFilesDataModelProperties.java b/plugins/org.eclipse.jst.jee/jeecreation/org/eclipse/jst/jee/project/facet/IConnectorCreateDeploymentFilesDataModelProperties.java
deleted file mode 100644
index 0fae477..0000000
--- a/plugins/org.eclipse.jst.jee/jeecreation/org/eclipse/jst/jee/project/facet/IConnectorCreateDeploymentFilesDataModelProperties.java
+++ /dev/null
@@ -1,20 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2009 IBM Corporation and others.
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
- *
- * Contributors:
- * IBM Corporation - initial API and implementation
- *******************************************************************************/
-
-package org.eclipse.jst.jee.project.facet;
-
-public interface IConnectorCreateDeploymentFilesDataModelProperties {
- /**
- * This field should not be used. It is not part of the API and may be modified in the future.
- */
- public static Class _provider_class = ConnectorCreateDeploymentFilesDataModelProvider.class;
-
-}
diff --git a/plugins/org.eclipse.jst.jee/jeecreation/org/eclipse/jst/jee/project/facet/ICreateDeploymentFilesDataModelProperties.java b/plugins/org.eclipse.jst.jee/jeecreation/org/eclipse/jst/jee/project/facet/ICreateDeploymentFilesDataModelProperties.java
deleted file mode 100644
index dd3ab5f..0000000
--- a/plugins/org.eclipse.jst.jee/jeecreation/org/eclipse/jst/jee/project/facet/ICreateDeploymentFilesDataModelProperties.java
+++ /dev/null
@@ -1,15 +0,0 @@
-package org.eclipse.jst.jee.project.facet;
-
-import org.eclipse.wst.common.frameworks.datamodel.IDataModelProperties;
-
-public interface ICreateDeploymentFilesDataModelProperties extends
- IDataModelProperties {
-
- public static final String TARGET_PROJECT = "ICreateDeploymentFilesDataModelProperties.TARGET_PROJECT"; //$NON-NLS-1$
- /**
- * boolean property for Java EE 5 projects, to create/not create a deployment descriptor,
- * The default value is false
- */
- public static final String GENERATE_DD = "ICreateDeploymentFilesDataModelProperties.GENERATE_DD"; //$NON-NLS-1$
-
-}
diff --git a/plugins/org.eclipse.jst.jee/jeecreation/org/eclipse/jst/jee/project/facet/IEJBCreateDeploymentFilesDataModelProperties.java b/plugins/org.eclipse.jst.jee/jeecreation/org/eclipse/jst/jee/project/facet/IEJBCreateDeploymentFilesDataModelProperties.java
deleted file mode 100644
index 72d50e2..0000000
--- a/plugins/org.eclipse.jst.jee/jeecreation/org/eclipse/jst/jee/project/facet/IEJBCreateDeploymentFilesDataModelProperties.java
+++ /dev/null
@@ -1,10 +0,0 @@
-package org.eclipse.jst.jee.project.facet;
-
-public interface IEJBCreateDeploymentFilesDataModelProperties extends
- ICreateDeploymentFilesDataModelProperties {
- /**
- * This field should not be used. It is not part of the API and may be modified in the future.
- */
- public static Class _provider_class = EJBCreateDeploymentFilesDataModelProvider.class;
-
-}
diff --git a/plugins/org.eclipse.jst.jee/jeecreation/org/eclipse/jst/jee/project/facet/IEarCreateDeploymentFilesDataModelProperties.java b/plugins/org.eclipse.jst.jee/jeecreation/org/eclipse/jst/jee/project/facet/IEarCreateDeploymentFilesDataModelProperties.java
deleted file mode 100644
index 5f1d59b..0000000
--- a/plugins/org.eclipse.jst.jee/jeecreation/org/eclipse/jst/jee/project/facet/IEarCreateDeploymentFilesDataModelProperties.java
+++ /dev/null
@@ -1,10 +0,0 @@
-package org.eclipse.jst.jee.project.facet;
-
-public interface IEarCreateDeploymentFilesDataModelProperties extends
- ICreateDeploymentFilesDataModelProperties {
- /**
- * This field should not be used. It is not part of the API and may be modified in the future.
- */
- public static Class _provider_class = EarCreateDeploymentFilesDataModelProvider.class;
-
-}
diff --git a/plugins/org.eclipse.jst.jee/jeecreation/org/eclipse/jst/jee/project/facet/IWebCreateDeploymentFilesDataModelProperties.java b/plugins/org.eclipse.jst.jee/jeecreation/org/eclipse/jst/jee/project/facet/IWebCreateDeploymentFilesDataModelProperties.java
deleted file mode 100644
index 2433376..0000000
--- a/plugins/org.eclipse.jst.jee/jeecreation/org/eclipse/jst/jee/project/facet/IWebCreateDeploymentFilesDataModelProperties.java
+++ /dev/null
@@ -1,10 +0,0 @@
-package org.eclipse.jst.jee.project.facet;
-
-public interface IWebCreateDeploymentFilesDataModelProperties extends
- ICreateDeploymentFilesDataModelProperties {
- /**
- * This field should not be used. It is not part of the API and may be modified in the future.
- */
- public static Class _provider_class = WebCreateDeploymentFilesDataModelProvider.class;
-
-}
diff --git a/plugins/org.eclipse.jst.jee/jeecreation/org/eclipse/jst/jee/project/facet/JEEFacetInstallDelegate.java b/plugins/org.eclipse.jst.jee/jeecreation/org/eclipse/jst/jee/project/facet/JEEFacetInstallDelegate.java
deleted file mode 100644
index 54cc129..0000000
--- a/plugins/org.eclipse.jst.jee/jeecreation/org/eclipse/jst/jee/project/facet/JEEFacetInstallDelegate.java
+++ /dev/null
@@ -1,17 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2003, 2007 IBM Corporation and others.
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
- *
- * Contributors:
- * IBM Corporation - initial API and implementation
- *******************************************************************************/
-package org.eclipse.jst.jee.project.facet;
-
-import org.eclipse.jst.j2ee.project.facet.J2EEFacetInstallDelegate;
-
-public abstract class JEEFacetInstallDelegate extends J2EEFacetInstallDelegate {
- // this class used to have methods but now due to refactoring/model support it does not.
-}
diff --git a/plugins/org.eclipse.jst.jee/jeecreation/org/eclipse/jst/jee/project/facet/WebCreateDeploymentFilesDataModelProvider.java b/plugins/org.eclipse.jst.jee/jeecreation/org/eclipse/jst/jee/project/facet/WebCreateDeploymentFilesDataModelProvider.java
deleted file mode 100644
index 15c93e4..0000000
--- a/plugins/org.eclipse.jst.jee/jeecreation/org/eclipse/jst/jee/project/facet/WebCreateDeploymentFilesDataModelProvider.java
+++ /dev/null
@@ -1,13 +0,0 @@
-package org.eclipse.jst.jee.project.facet;
-
-import org.eclipse.wst.common.frameworks.datamodel.IDataModelOperation;
-
-public class WebCreateDeploymentFilesDataModelProvider extends
- CreateDeploymentFilesDataModelProvider implements
- IWebCreateDeploymentFilesDataModelProperties {
- @Override
- public IDataModelOperation getDefaultOperation() {
- return new WebCreateDeploymentFilesOperation(model);
- }
-
-}
diff --git a/plugins/org.eclipse.jst.jee/jeecreation/org/eclipse/jst/jee/project/facet/WebCreateDeploymentFilesOperation.java b/plugins/org.eclipse.jst.jee/jeecreation/org/eclipse/jst/jee/project/facet/WebCreateDeploymentFilesOperation.java
deleted file mode 100644
index 08e6747..0000000
--- a/plugins/org.eclipse.jst.jee/jeecreation/org/eclipse/jst/jee/project/facet/WebCreateDeploymentFilesOperation.java
+++ /dev/null
@@ -1,50 +0,0 @@
-package org.eclipse.jst.jee.project.facet;
-
-import java.util.Arrays;
-import java.util.List;
-
-import org.eclipse.core.resources.IProject;
-import org.eclipse.core.runtime.IProgressMonitor;
-import org.eclipse.jst.j2ee.model.IModelProvider;
-import org.eclipse.jst.j2ee.model.ModelProviderManager;
-import org.eclipse.jst.javaee.web.WebApp;
-import org.eclipse.jst.javaee.web.WebFactory;
-import org.eclipse.jst.javaee.web.WelcomeFileList;
-import org.eclipse.wst.common.frameworks.datamodel.IDataModel;
-
-public class WebCreateDeploymentFilesOperation extends
- CreateDeploymentFilesDataModelOperation {
-
-
- public WebCreateDeploymentFilesOperation(IDataModel model) {
- super(model);
- }
-
- @Override
- protected void createDeploymentFiles(IProject project, IProgressMonitor monitor) {
- final IModelProvider provider = ModelProviderManager.getModelProvider(project);
-
- provider.modify(new Runnable(){
- public void run() {
- WebApp webApp = (WebApp) provider.getModelObject();
-
- // welcome file list
- List<String> welcomeFiles = Arrays.asList(
- "index.html", //$NON-NLS-1$
- "index.htm", //$NON-NLS-1$
- "index.jsp", //$NON-NLS-1$
- "default.html", //$NON-NLS-1$
- "default.htm", //$NON-NLS-1$
- "default.jsp" //$NON-NLS-1$
- );
-
- // Add the welcome-file-list tag
- WelcomeFileList welcomeFileList = WebFactory.eINSTANCE.createWelcomeFileList();
- welcomeFileList.getWelcomeFiles().addAll(welcomeFiles);
- webApp.getWelcomeFileLists().add(welcomeFileList);
- }
- }, IModelProvider.FORCESAVE);
-
- }
-
-}
diff --git a/plugins/org.eclipse.jst.jee/license/berkeley_license.html b/plugins/org.eclipse.jst.jee/license/berkeley_license.html
deleted file mode 100644
index 5f2e66f..0000000
--- a/plugins/org.eclipse.jst.jee/license/berkeley_license.html
+++ /dev/null
@@ -1,45 +0,0 @@
-<html>
-<head>
-<meta http-equiv="Content-Type" content="text/html; charset=utf-8"/>
-<title>License</title>
-</head>
-
-<body>
-<p>
-<b>Copyright 1994-2006 Sun Microsystems, Inc. All Rights Reserved.</b>
-</p>
-<p>Redistribution and use in source and binary forms, with or without modification,
-are permitted provided that the following conditions are met:
-</p>
-<ul>
-<li>Redistribution of source code must retain the above copyright notice, this
-list of conditions and the following disclaimer.<br><br></li>
-<li>Redistribution in binary form must reproduce the above copyright notice,
-this list of conditions and the following disclaimer in the documentation and/or
-other materials provided with the distribution.</li>
-</ul>
-<p>Neither the name of Sun Microsystems, Inc. or the names of contributors may
-be used to endorse or promote products derived from this software without
-specific prior written permission.
-</p>
-<p>This software is provided "AS IS," without a warranty of any kind.
-ALL EXPRESS OR IMPLIED CONDITIONS, REPRESENTATIONS AND WARRANTIES, INCLUDING
-ANY IMPLIED WARRANTY OF MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE OR
-NON-INFRINGEMENT, ARE HEREBY EXCLUDED. SUN MICROSYSTEMS, INC. ("SUN")
-AND ITS LICENSORS SHALL NOT BE LIABLE FOR ANY DAMAGES SUFFERED BY LICENSEE
-AS A RESULT OF USING, MODIFYING OR DISTRIBUTING THIS SOFTWARE OR ITS
-DERIVATIVES. IN NO EVENT WILL SUN OR ITS LICENSORS BE LIABLE FOR ANY
-LOST REVENUE, PROFIT OR DATA, OR FOR DIRECT, INDIRECT, SPECIAL,
-CONSEQUENTIAL, INCIDENTAL OR PUNITIVE DAMAGES, HOWEVER CAUSED AND
-REGARDLESS OF THE THEORY OF LIABILITY, ARISING OUT OF THE USE OF OR
-INABILITY TO USE THIS SOFTWARE, EVEN IF SUN HAS BEEN ADVISED OF THE
-POSSIBILITY OF SUCH DAMAGES.
-</p>
-<p>You acknowledge that this software is not designed, licensed or intended
-for use in the design, construction, operation or maintenance of any nuclear facility.
-</p>
-</body>
-</html>
-
-
-
diff --git a/plugins/org.eclipse.jst.jee/plugin.properties b/plugins/org.eclipse.jst.jee/plugin.properties
deleted file mode 100644
index ad17edf..0000000
--- a/plugins/org.eclipse.jst.jee/plugin.properties
+++ /dev/null
@@ -1,23 +0,0 @@
-###############################################################################
-# Copyright (c) 2005, 2007 IBM Corporation and others.
-# All rights reserved. This program and the accompanying materials
-# are made available under the terms of the Eclipse Public License v1.0
-# which accompanies this distribution, and is available at
-# http://www.eclipse.org/legal/epl-v10.html
-#
-# Contributors:
-# IBM Corporation - initial API and implementation
-###############################################################################
-# properties file for org.eclipse.jst.jee
-Bundle-Name.0 = Java EE common Plug-in
-Bundle-Vendor.0 = Eclipse Web Tools Platform
-ee5ejbContentType=Java EE 5 EJB Content
-ee5webContentType=Java EE 5 Web Content
-ee5earContentType=Java EE 5 EAR Content
-ee5appclientContentType=Java EE 5 Application Client Content
-ee6connectorContentType=Java EE 6 Connector Content
-ee6ejbContentType=Java EE 6 EJB Content
-ee6webContentType=Java EE 6 Web Content
-ee6webfragmentContentType=Java EE 6 Web Fragment Content
-ee6earContentType=Java EE 6 EAR Content
-ee6appclientContentType=Java EE 6 Application Client Content
\ No newline at end of file
diff --git a/plugins/org.eclipse.jst.jee/plugin.xml b/plugins/org.eclipse.jst.jee/plugin.xml
deleted file mode 100644
index f6ad999..0000000
--- a/plugins/org.eclipse.jst.jee/plugin.xml
+++ /dev/null
@@ -1,349 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<?eclipse version="3.2"?>
-<plugin>
- <extension-point id="jeeModelExtension" name="JEE Model Extension" schema="schema/jeeModelExtension.exsd"/>
-
- <!--J EE5 -->
- <extension
- point="org.eclipse.wst.common.modulecore.resourceFactories">
- <resourceFactory
- class="org.eclipse.jst.javaee.web.internal.util.WebResourceFactoryImpl"
- isDefault="false"
- shortSegment="web.xml">
- <contentTypeBinding
- contentTypeId="org.eclipse.jst.jee.ee5webDD">
- </contentTypeBinding>
- </resourceFactory>
- <resourceFactory
- class="org.eclipse.jst.javaee.ejb.internal.util.EjbResourceFactoryImpl"
- isDefault="false"
- shortSegment="ejb-jar.xml">
- <contentTypeBinding
- contentTypeId="org.eclipse.jst.jee.ee5ejbDD">
- </contentTypeBinding>
- </resourceFactory>
- <resourceFactory
- class="org.eclipse.jst.javaee.applicationclient.internal.util.ApplicationclientResourceFactoryImpl"
- isDefault="false"
- shortSegment="application-client.xml">
- <contentTypeBinding
- contentTypeId="org.eclipse.jst.jee.ee5appclientDD">
- </contentTypeBinding>
- </resourceFactory>
- <resourceFactory
- class="org.eclipse.jst.javaee.application.internal.util.ApplicationResourceFactoryImpl"
- isDefault="false"
- shortSegment="application.xml">
- <contentTypeBinding
- contentTypeId="org.eclipse.jst.jee.ee5earDD">
- </contentTypeBinding>
- </resourceFactory>
- <resourceFactory
- class="org.eclipse.jst.javaee.jca.internal.util.JcaResourceFactoryImpl"
- isDefault="false"
- shortSegment="ra.xml">
- <contentTypeBinding
- contentTypeId="org.eclipse.jst.jee.ee6connectorDD">
- </contentTypeBinding>
- </resourceFactory>
- <resourceFactory
- class="org.eclipse.jst.javaee.web.internal.util.WebResourceFactoryImpl"
- isDefault="false"
- shortSegment="web.xml">
- <contentTypeBinding
- contentTypeId="org.eclipse.jst.jee.ee6webDD">
- </contentTypeBinding>
- </resourceFactory>
- <resourceFactory
- class="org.eclipse.jst.javaee.ejb.internal.util.EjbResourceFactoryImpl"
- isDefault="false"
- shortSegment="ejb-jar.xml">
- <contentTypeBinding
- contentTypeId="org.eclipse.jst.jee.ee6ejbDD">
- </contentTypeBinding>
- </resourceFactory>
- <resourceFactory
- class="org.eclipse.jst.javaee.applicationclient.internal.util.ApplicationclientResourceFactoryImpl"
- isDefault="false"
- shortSegment="application-client.xml">
- <contentTypeBinding
- contentTypeId="org.eclipse.jst.jee.ee6appclientDD">
- </contentTypeBinding>
- </resourceFactory>
- <resourceFactory
- class="org.eclipse.jst.javaee.application.internal.util.ApplicationResourceFactoryImpl"
- isDefault="false"
- shortSegment="application.xml">
- <contentTypeBinding
- contentTypeId="org.eclipse.jst.jee.ee6earDD">
- </contentTypeBinding>
- </resourceFactory>
- <resourceFactory
- class="org.eclipse.jst.javaee.webfragment.internal.util.WebfragmentResourceFactoryImpl"
- isDefault="false"
- shortSegment="web-fragment.xml">
- <contentTypeBinding
- contentTypeId="org.eclipse.jst.jee.ee6webfragmentDD">
- </contentTypeBinding>
- </resourceFactory>
- </extension>
-
- <extension
- point="org.eclipse.emf.ecore.generated_package">
- <package
- uri="http://java.sun.com/xml/ns/javaee"
- class="org.eclipse.jst.javaee.core.internal.metadata.JavaeePackage">
- </package>
- </extension>
- <extension
- point="org.eclipse.emf.ecore.generated_package">
- <package
- uri="http://java.sun.com/xml/ns/javaee/ejb-jar_3_0.xsd"
- class="org.eclipse.jst.javaee.ejb.internal.metadata.EjbPackage">
- </package>
- </extension>
- <extension
- point="org.eclipse.emf.ecore.generated_package">
- <package
- uri="http://java.sun.com/xml/ns/javaee/application-client_5.xsd"
- class="org.eclipse.jst.javaee.applicationclient.internal.metadata.ApplicationclientPackage">
- </package>
- </extension>
- <extension
- point="org.eclipse.emf.ecore.generated_package">
- <package
- uri="http://java.sun.com/xml/ns/javaee/application_5.xsd"
- class="org.eclipse.jst.javaee.application.internal.metadata.ApplicationPackage">
- </package>
- </extension>
- <extension
- point="org.eclipse.emf.ecore.generated_package">
- <package
- uri="http://java.sun.com/xml/ns/javaee/web-app_2_5.xsd"
- class="org.eclipse.jst.javaee.web.internal.metadata.WebPackage">
- </package>
- </extension>
- <extension
- point="org.eclipse.emf.ecore.generated_package">
- <package
- uri="http://java.sun.com/xml/ns/javaee/web-fragment_3_0.xsd"
- class="org.eclipse.jst.javaee.webfragment.internal.metadata.WebfragmentPackage">
- </package>
- </extension>
- <extension
- point="org.eclipse.emf.ecore.generated_package">
- <package
- uri="http://java.sun.com/xml/ns/javaee/connector_1_6.xsd"
- class="org.eclipse.jst.javaee.jca.internal.metadata.JcaPackage">
- </package>
- </extension>
- <extension
- point="org.eclipse.emf.ecore.generated_package">
- <package
- uri="http://java.sun.com/xml/ns/javaee/jsp"
- class="org.eclipse.jst.javaee.jsp.internal.metadata.JspPackage">
- </package>
- </extension>
-
- <extension
- point="org.eclipse.wst.server.core.moduleFactories">
- <moduleFactory
- projects="true"
- class="org.eclipse.jst.jee.internal.deployables.JEEDeployableFactory"
- id="org.eclipse.jst.jee.server">
- <moduleType
- types="jst.ear"
- versions="6.0,5.0">
- </moduleType>
- <moduleType
- types="jst.appclient"
- versions="6.0,5.0,1.2,1.3,1.4">
- </moduleType>
- <moduleType
- types="jst.web"
- versions="3.0,2.5,2.2,2.3,2.4">
- </moduleType>
- <moduleType
- types="jst.ejb"
- versions="3.1,3.0,1.1,2.0,2.1">
- </moduleType>
- <moduleType
- types="jst.connector"
- versions="1.0,1.5,1.6">
- </moduleType>
- <moduleType
- types="jst.utility"
- versions="1.0">
- </moduleType>
- <moduleType
- types="jst.webfragment"
- versions="3.0">
- </moduleType>
- </moduleFactory>
- </extension>
- <extension
- point="org.eclipse.core.contenttype.contentTypes">
- <content-type
- file-names="ejb-jar.xml"
- id="ee5ejbDD"
- base-type="org.eclipse.core.runtime.xml"
- name="%ee5ejbContentType"
- priority="high">
- <describer
- class="org.eclipse.jst.jee.contenttype.JEEContentDescriber">
- </describer>
- </content-type>
- </extension>
-
- <extension
- point="org.eclipse.core.contenttype.contentTypes">
- <content-type
- file-names="ejb-jar.xml"
- id="ee6ejbDD"
- base-type="org.eclipse.core.runtime.xml"
- name="%ee6ejbContentType"
- priority="high">
- <describer
- class="org.eclipse.jst.jee.contenttype.JEE6ContentDescriber">
- </describer>
- </content-type>
- </extension>
-
- <extension
- point="org.eclipse.core.contenttype.contentTypes">
- <content-type
- file-names="web.xml"
- id="ee5webDD"
- base-type="org.eclipse.core.runtime.xml"
- name="%ee5webContentType"
- priority="high">
- <describer
- class="org.eclipse.jst.jee.contenttype.JEEContentDescriber">
- </describer>
- </content-type>
- </extension>
-
- <extension
- point="org.eclipse.core.contenttype.contentTypes">
- <content-type
- file-names="web.xml"
- id="ee6webDD"
- base-type="org.eclipse.core.runtime.xml"
- name="%ee6webContentType"
- priority="high">
- <describer
- class="org.eclipse.jst.jee.contenttype.JEE6ContentDescriber">
- </describer>
- </content-type>
- </extension>
-
- <extension
- point="org.eclipse.core.contenttype.contentTypes">
- <content-type
- file-names="web-fragment.xml"
- id="ee6webfragmentDD"
- base-type="org.eclipse.core.runtime.xml"
- name="%ee6webfragmentContentType"
- priority="high">
- <describer
- class="org.eclipse.jst.jee.contenttype.JEE6ContentDescriber">
- </describer>
- </content-type>
- </extension>
-
-
- <extension
- point="org.eclipse.core.contenttype.contentTypes">
- <content-type
- file-names="application.xml"
- id="ee5earDD"
- base-type="org.eclipse.core.runtime.xml"
- name="%ee5earContentType"
- priority="high">
- <describer
- class="org.eclipse.jst.jee.contenttype.JEEContentDescriber">
- </describer>
- </content-type>
- </extension>
-
- <extension
- point="org.eclipse.core.contenttype.contentTypes">
- <content-type
- file-names="application.xml"
- id="ee6earDD"
- base-type="org.eclipse.core.runtime.xml"
- name="%ee6earContentType"
- priority="high">
- <describer
- class="org.eclipse.jst.jee.contenttype.JEE6ContentDescriber">
- </describer>
- </content-type>
- </extension>
-
- <extension
- point="org.eclipse.core.contenttype.contentTypes">
- <content-type
- file-names="application-client.xml"
- id="ee5appclientDD"
- base-type="org.eclipse.core.runtime.xml"
- name="%ee5appclientContentType"
- priority="high">
- <describer
- class="org.eclipse.jst.jee.contenttype.JEEContentDescriber">
- </describer>
- </content-type>
- </extension>
-
- <extension
- point="org.eclipse.core.contenttype.contentTypes">
- <content-type
- file-names="application-client.xml"
- id="ee6appclientDD"
- base-type="org.eclipse.core.runtime.xml"
- name="%ee6appclientContentType"
- priority="high">
- <describer
- class="org.eclipse.jst.jee.contenttype.JEE6ContentDescriber">
- </describer>
- </content-type>
- </extension>
-
- <extension
- point="org.eclipse.core.contenttype.contentTypes">
- <content-type
- file-names="ra.xml"
- id="ee6connectorDD"
- base-type="org.eclipse.core.runtime.xml"
- name="%ee6connectorContentType"
- priority="high">
- <describer
- class="org.eclipse.jst.jee.contenttype.JEE6ContentDescriber">
- </describer>
- </content-type>
- </extension>
-
- <extension
- point="org.eclipse.jst.j2ee.J2EEModelProvider">
- <provider>
- <modelProvider factoryClass="org.eclipse.jst.jee.model.internal.EAR5ModelProviderFactory"/>
- <facet id="jst.ear" versions="5.0,6.0"/>
- </provider>
- </extension>
-
- <extension
- point="org.eclipse.jst.j2ee.J2EEModelProvider">
- <provider>
- <modelProvider factoryClass="org.eclipse.jst.jee.model.internal.AppClient5ModelProviderFactory"/>
- <facet id="jst.appclient" versions="5.0,6.0"/>
- </provider>
- </extension>
-
- <extension
- point="org.eclipse.jst.j2ee.J2EEModelProvider">
- <provider>
- <modelProvider factoryClass="org.eclipse.jst.jee.model.internal.Connector16ModelProviderFactory"/>
- <facet id="jst.connector" versions="1.6"/>
- </provider>
- </extension>
-
-</plugin>
diff --git a/plugins/org.eclipse.jst.jee/schema/jeeModelExtension.exsd b/plugins/org.eclipse.jst.jee/schema/jeeModelExtension.exsd
deleted file mode 100644
index 0a6da60..0000000
--- a/plugins/org.eclipse.jst.jee/schema/jeeModelExtension.exsd
+++ /dev/null
@@ -1,106 +0,0 @@
-<?xml version='1.0' encoding='UTF-8'?>
-<!-- Schema file written by PDE -->
-<schema targetNamespace="org.eclipse.jst.jee">
-<annotation>
- <appInfo>
- <meta.schema plugin="org.eclipse.jst.jee" id="jeeModelExtension" name="JEE Model Extension"/>
- </appInfo>
- <documentation>
- [Enter description of this extension point.]
- </documentation>
- </annotation>
-
- <element name="extension">
- <complexType>
- <attribute name="point" type="string" use="required">
- <annotation>
- <documentation>
-
- </documentation>
- </annotation>
- </attribute>
- <attribute name="id" type="string">
- <annotation>
- <documentation>
-
- </documentation>
- </annotation>
- </attribute>
- <attribute name="name" type="string">
- <annotation>
- <documentation>
-
- </documentation>
- <appInfo>
- <meta.attribute translatable="true"/>
- </appInfo>
- </annotation>
- </attribute>
- </complexType>
- </element>
-
- <element name="jeeModelExtension">
- <complexType>
- <attribute name="id" type="string" use="required">
- <annotation>
- <documentation>
- ID used to identify a model implementation of the IJEEModel interface
- </documentation>
- </annotation>
- </attribute>
- <attribute name="priority" type="string" use="required">
- <annotation>
- <documentation>
- Priority used to determine which implementation is active
- </documentation>
- </annotation>
- </attribute>
- </complexType>
- </element>
-
- <annotation>
- <appInfo>
- <meta.section type="since"/>
- </appInfo>
- <documentation>
- [Enter the first release in which this extension point appears.]
- </documentation>
- </annotation>
-
- <annotation>
- <appInfo>
- <meta.section type="examples"/>
- </appInfo>
- <documentation>
- [Enter extension point usage example here.]
- </documentation>
- </annotation>
-
- <annotation>
- <appInfo>
- <meta.section type="apiInfo"/>
- </appInfo>
- <documentation>
- [Enter API information here.]
- </documentation>
- </annotation>
-
- <annotation>
- <appInfo>
- <meta.section type="implementation"/>
- </appInfo>
- <documentation>
- [Enter information about supplied implementation of this extension point.]
- </documentation>
- </annotation>
-
- <annotation>
- <appInfo>
- <meta.section type="copyright"/>
- </appInfo>
- <documentation>
-
- </documentation>
- </annotation>
-
-</schema>
diff --git a/plugins/org.eclipse.jst.servlet.ui/.classpath b/plugins/org.eclipse.jst.servlet.ui/.classpath
deleted file mode 100644
index 8ceb3f1..0000000
--- a/plugins/org.eclipse.jst.servlet.ui/.classpath
+++ /dev/null
@@ -1,8 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<classpath>
- <classpathentry kind="src" path="servlet_ui"/>
- <classpathentry kind="src" path="property_files"/>
- <classpathentry kind="con" path="org.eclipse.jdt.launching.JRE_CONTAINER/org.eclipse.jdt.internal.debug.ui.launcher.StandardVMType/J2SE-1.5"/>
- <classpathentry kind="con" path="org.eclipse.pde.core.requiredPlugins"/>
- <classpathentry kind="output" path="bin"/>
-</classpath>
diff --git a/plugins/org.eclipse.jst.servlet.ui/.cvsignore b/plugins/org.eclipse.jst.servlet.ui/.cvsignore
deleted file mode 100644
index a19913c..0000000
--- a/plugins/org.eclipse.jst.servlet.ui/.cvsignore
+++ /dev/null
@@ -1,7 +0,0 @@
-bin
-temp.folder
-build.xml
-servletui.jar
-@dot
-src.zip
-javaCompiler...args
diff --git a/plugins/org.eclipse.jst.servlet.ui/.project b/plugins/org.eclipse.jst.servlet.ui/.project
deleted file mode 100644
index c209be8..0000000
--- a/plugins/org.eclipse.jst.servlet.ui/.project
+++ /dev/null
@@ -1,29 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<projectDescription>
- <name>org.eclipse.jst.servlet.ui</name>
- <comment></comment>
- <projects>
- </projects>
- <buildSpec>
- <buildCommand>
- <name>org.eclipse.jdt.core.javabuilder</name>
- <arguments>
- </arguments>
- </buildCommand>
- <buildCommand>
- <name>org.eclipse.pde.ManifestBuilder</name>
- <arguments>
- </arguments>
- </buildCommand>
- <buildCommand>
- <name>org.eclipse.pde.SchemaBuilder</name>
- <arguments>
- </arguments>
- </buildCommand>
- </buildSpec>
- <natures>
- <nature>org.eclipse.pde.PluginNature</nature>
- <nature>org.eclipse.jdt.core.javanature</nature>
- <nature>com.ibm.etools.ctc.javaprojectnature</nature>
- </natures>
-</projectDescription>
diff --git a/plugins/org.eclipse.jst.servlet.ui/.settings/org.eclipse.jdt.core.prefs b/plugins/org.eclipse.jst.servlet.ui/.settings/org.eclipse.jdt.core.prefs
deleted file mode 100644
index 037a4e5..0000000
--- a/plugins/org.eclipse.jst.servlet.ui/.settings/org.eclipse.jdt.core.prefs
+++ /dev/null
@@ -1,95 +0,0 @@
-#Mon Jun 08 15:35:45 EDT 2009
-org.eclipse.jdt.core.compiler.problem.unusedParameterWhenImplementingAbstract=disabled
-org.eclipse.jdt.core.compiler.problem.comparingIdentical=error
-org.eclipse.jdt.core.compiler.problem.unnecessaryElse=error
-org.eclipse.jdt.core.compiler.problem.redundantSuperinterface=error
-org.eclipse.jdt.core.compiler.problem.unusedLocal=error
-org.eclipse.jdt.core.compiler.problem.emptyStatement=error
-org.eclipse.jdt.core.compiler.problem.unusedLabel=error
-org.eclipse.jdt.core.compiler.problem.unusedParameter=warning
-org.eclipse.jdt.core.compiler.problem.rawTypeReference=warning
-org.eclipse.jdt.core.incompatibleJDKLevel=ignore
-org.eclipse.jdt.core.compiler.problem.incompatibleNonInheritedInterfaceMethod=error
-org.eclipse.jdt.core.compiler.debug.lineNumber=generate
-org.eclipse.jdt.core.compiler.problem.unusedDeclaredThrownException=warning
-org.eclipse.jdt.core.builder.cleanOutputFolder=clean
-org.eclipse.jdt.core.compiler.problem.unusedWarningToken=warning
-org.eclipse.jdt.core.compiler.problem.noImplicitStringConversion=error
-org.eclipse.jdt.core.compiler.problem.deprecationInDeprecatedCode=enabled
-org.eclipse.jdt.core.compiler.problem.deprecation=warning
-org.eclipse.jdt.core.compiler.problem.unusedParameterWhenOverridingConcrete=disabled
-org.eclipse.jdt.core.compiler.problem.missingSynchronizedOnInheritedMethod=error
-org.eclipse.jdt.core.compiler.problem.deprecationWhenOverridingDeprecatedMethod=enabled
-org.eclipse.jdt.core.compiler.problem.redundantNullCheck=error
-org.eclipse.jdt.core.compiler.problem.unusedImport=error
-org.eclipse.jdt.core.builder.recreateModifiedClassFileInOutputFolder=ignore
-org.eclipse.jdt.core.builder.resourceCopyExclusionFilter=*.launch
-org.eclipse.jdt.core.classpath.multipleOutputLocations=enabled
-org.eclipse.jdt.core.compiler.problem.suppressWarnings=enabled
-org.eclipse.jdt.core.compiler.problem.typeParameterHiding=error
-org.eclipse.jdt.core.builder.invalidClasspath=abort
-org.eclipse.jdt.core.compiler.problem.localVariableHiding=warning
-org.eclipse.jdt.core.compiler.problem.possibleAccidentalBooleanAssignment=error
-org.eclipse.jdt.core.compiler.problem.missingHashCodeMethod=error
-org.eclipse.jdt.core.codeComplete.argumentSuffixes=
-org.eclipse.jdt.core.codeComplete.argumentPrefixes=
-org.eclipse.jdt.core.compiler.problem.indirectStaticAccess=ignore
-org.eclipse.jdt.core.compiler.problem.potentialNullReference=error
-org.eclipse.jdt.core.compiler.codegen.inlineJsrBytecode=enabled
-org.eclipse.jdt.core.compiler.problem.finalParameterBound=warning
-org.eclipse.jdt.core.compiler.problem.missingSerialVersion=error
-org.eclipse.jdt.core.compiler.problem.nullReference=error
-org.eclipse.jdt.core.compiler.source=1.5
-org.eclipse.jdt.core.compiler.problem.enumIdentifier=error
-org.eclipse.jdt.core.compiler.problem.syntheticAccessEmulation=ignore
-org.eclipse.jdt.core.builder.duplicateResourceTask=warning
-org.eclipse.jdt.core.compiler.problem.fieldHiding=error
-org.eclipse.jdt.core.compiler.problem.unusedDeclaredThrownExceptionExemptExceptionAndThrowable=enabled
-org.eclipse.jdt.core.compiler.problem.missingOverrideAnnotation=error
-org.eclipse.jdt.core.compiler.problem.hiddenCatchBlock=error
-org.eclipse.jdt.core.compiler.problem.overridingPackageDefaultMethod=error
-org.eclipse.jdt.core.compiler.problem.finallyBlockNotCompletingNormally=error
-org.eclipse.jdt.core.compiler.problem.undocumentedEmptyBlock=warning
-org.eclipse.jdt.core.classpath.exclusionPatterns=enabled
-org.eclipse.jdt.core.compiler.problem.methodWithConstructorName=error
-org.eclipse.jdt.core.compiler.problem.discouragedReference=warning
-org.eclipse.jdt.core.compiler.problem.unqualifiedFieldAccess=ignore
-org.eclipse.jdt.core.compiler.problem.incompleteEnumSwitch=error
-eclipse.preferences.version=1
-org.eclipse.jdt.core.incompleteClasspath=error
-org.eclipse.jdt.core.compiler.problem.unnecessaryTypeCheck=error
-org.eclipse.jdt.core.compiler.problem.deadCode=error
-org.eclipse.jdt.core.compiler.problem.specialParameterHidingField=enabled
-org.eclipse.jdt.core.compiler.problem.fatalOptionalError=enabled
-org.eclipse.jdt.core.compiler.problem.noEffectAssignment=error
-org.eclipse.jdt.core.compiler.debug.sourceFile=generate
-org.eclipse.jdt.core.compiler.problem.unusedDeclaredThrownExceptionIncludeUncheckedExceptions=disabled
-org.eclipse.jdt.core.compiler.problem.missingDeprecatedAnnotation=warning
-org.eclipse.jdt.core.codeComplete.fieldPrefixes=
-org.eclipse.jdt.core.compiler.problem.fallthroughCase=error
-org.eclipse.jdt.core.compiler.codegen.targetPlatform=1.5
-org.eclipse.jdt.core.compiler.problem.unusedPrivateMember=error
-org.eclipse.jdt.core.compiler.problem.autoboxing=warning
-org.eclipse.jdt.core.circularClasspath=error
-org.eclipse.jdt.core.compiler.problem.annotationSuperInterface=warning
-org.eclipse.jdt.core.compiler.problem.nonExternalizedStringLiteral=error
-org.eclipse.jdt.core.codeComplete.fieldSuffixes=
-org.eclipse.jdt.core.codeComplete.localSuffixes=
-org.eclipse.jdt.core.compiler.problem.parameterAssignment=error
-org.eclipse.jdt.core.compiler.problem.staticAccessReceiver=error
-org.eclipse.jdt.core.codeComplete.localPrefixes=
-org.eclipse.jdt.core.compiler.problem.unusedDeclaredThrownExceptionIncludeDocCommentReference=enabled
-org.eclipse.jdt.core.compiler.maxProblemPerUnit=100
-org.eclipse.jdt.core.compiler.problem.varargsArgumentNeedCast=error
-org.eclipse.jdt.core.compiler.problem.assertIdentifier=error
-org.eclipse.jdt.core.compiler.compliance=1.5
-org.eclipse.jdt.core.compiler.problem.unusedParameterIncludeDocCommentReference=enabled
-org.eclipse.jdt.core.codeComplete.staticFieldPrefixes=
-org.eclipse.jdt.core.compiler.debug.localVariable=generate
-org.eclipse.jdt.core.compiler.problem.unhandledWarningToken=warning
-instance/org.eclipse.core.net/org.eclipse.core.net.hasMigrated=true
-org.eclipse.jdt.core.compiler.problem.forbiddenReference=error
-org.eclipse.jdt.core.compiler.codegen.unusedLocal=preserve
-org.eclipse.jdt.core.compiler.problem.uncheckedTypeOperation=warning
-org.eclipse.jdt.core.compiler.problem.unusedDeclaredThrownExceptionWhenOverriding=disabled
-org.eclipse.jdt.core.codeComplete.staticFieldSuffixes=
diff --git a/plugins/org.eclipse.jst.servlet.ui/META-INF/MANIFEST.MF b/plugins/org.eclipse.jst.servlet.ui/META-INF/MANIFEST.MF
deleted file mode 100644
index d2173ff..0000000
--- a/plugins/org.eclipse.jst.servlet.ui/META-INF/MANIFEST.MF
+++ /dev/null
@@ -1,48 +0,0 @@
-Manifest-Version: 1.0
-Bundle-ManifestVersion: 2
-Bundle-Name: %pluginName
-Bundle-SymbolicName: org.eclipse.jst.servlet.ui; singleton:=true
-Bundle-Version: 1.1.404.qualifier
-Bundle-Activator: org.eclipse.jst.servlet.ui.internal.plugin.ServletUIPlugin
-Bundle-Vendor: %pluginVendor
-Bundle-Localization: plugin
-Export-Package: org.eclipse.jst.servlet.ui,
- org.eclipse.jst.servlet.ui.internal.actions;x-internal:=true,
- org.eclipse.jst.servlet.ui.internal.deployables;x-internal:=true,
- org.eclipse.jst.servlet.ui.internal.plugin;x-internal:=true,
- org.eclipse.jst.servlet.ui.internal.wizard;x-internal:=true,
- org.eclipse.jst.servlet.ui.project.facet
-Require-Bundle: org.eclipse.core.expressions;bundle-version="[3.2.0,4.0.0)",
- org.eclipse.core.resources;bundle-version="[3.2.0,4.0.0)",
- org.eclipse.core.runtime;bundle-version="[3.2.0,4.0.0)",
- org.eclipse.ui.workbench;bundle-version="[3.2.0,4.0.0)",
- org.eclipse.jface;bundle-version="[3.2.0,4.0.0)",
- org.eclipse.jst.j2ee.ui;bundle-version="[1.1.0,1.2.0)",
- org.eclipse.wst.common.frameworks.ui;bundle-version="[1.2.0,2.0.0)",
- org.eclipse.wst.common.frameworks;bundle-version="[1.2.0,2.0.0)",
- org.eclipse.jst.j2ee;bundle-version="[1.1.0,1.2.0)",
- org.eclipse.jst.j2ee.core;bundle-version="[1.1.0,2.0.0)",
- org.eclipse.jst.j2ee.web;bundle-version="[1.1.0,1.2.0)",
- org.eclipse.wst.web;bundle-version="[1.1.0,1.2.0)",
- org.eclipse.jdt.core;bundle-version="[3.2.0,4.0.0)",
- org.eclipse.jdt.ui;bundle-version="[3.2.0,4.0.0)",
- org.eclipse.wst.common.modulecore;bundle-version="[1.2.0,2.0.0)",
- org.eclipse.jem.util;bundle-version="[2.0.0,3.0.0)",
- org.eclipse.jem;bundle-version="[2.0.0,3.0.0)",
- org.eclipse.emf.ecore;bundle-version="[2.2.0,3.0.0)",
- org.eclipse.jst.common.frameworks;bundle-version="[1.1.0,1.2.0)",
- org.eclipse.debug.ui;bundle-version="[3.2.0,4.0.0)",
- org.eclipse.wst.server.core;bundle-version="[1.0.102,2.0.0)",
- org.eclipse.jst.server.core;bundle-version="[1.0.102,2.0.0)",
- org.eclipse.wst.common.project.facet.core;bundle-version="[1.3.0,2.0.0)",
- org.eclipse.wst.common.project.facet.ui;bundle-version="[1.3.0,2.0.0)",
- org.eclipse.wst.web.ui;bundle-version="[1.1.0,1.2.0)",
- org.eclipse.ui.navigator.resources;bundle-version="[3.2.0,4.0.0)",
- org.eclipse.ui.navigator;bundle-version="[3.2.0,4.0.0)",
- org.eclipse.ui.ide;bundle-version="[3.2.0,4.0.0)",
- org.eclipse.emf.edit;bundle-version="[2.2.0,3.0.0)",
- org.eclipse.jst.jee.ui;bundle-version="[1.0.100,1.1.0)",
- org.eclipse.wst.common.modulecore.ui;bundle-version="[1.0.0,1.1.0)",
- org.eclipse.jst.common.ui;bundle-version="[1.0.0,1.1.0)"
-Eclipse-LazyStart: true
-Bundle-RequiredExecutionEnvironment: J2SE-1.5
diff --git a/plugins/org.eclipse.jst.servlet.ui/about.html b/plugins/org.eclipse.jst.servlet.ui/about.html
deleted file mode 100644
index 2199df3..0000000
--- a/plugins/org.eclipse.jst.servlet.ui/about.html
+++ /dev/null
@@ -1,34 +0,0 @@
-<!DOCTYPE HTML PUBLIC "-//W3C//DTD HTML 4.0//EN">
-<HTML>
-
-<head>
-<title>About</title>
-<meta http-equiv=Content-Type content="text/html; charset=ISO-8859-1">
-</head>
-
-<BODY lang="EN-US">
-
-<H3>About This Content</H3>
-
-<P>June, 2008</P>
-
-<H3>License</H3>
-
-<P>The Eclipse Foundation makes available all content in this plug-in
-("Content"). Unless otherwise indicated below, the Content is provided to you
-under the terms and conditions of the Eclipse Public License Version 1.0
-("EPL"). A copy of the EPL is available at
-<A href="http://www.eclipse.org/org/documents/epl-v10.php">http://www.eclipse.org/org/documents/epl-v10.php</A>.
-For purposes of the EPL, "Program" will mean the Content.</P>
-
-<P>If you did not receive this Content directly from the Eclipse Foundation, the
-Content is being redistributed by another party ("Redistributor") and different
-terms and conditions may apply to your use of any object code in the Content.
-Check the Redistributors license that was provided with the Content. If no such
-license exists, contact the Redistributor. Unless otherwise indicated below, the
-terms and conditions of the EPL still apply to any source code in the Content
-and such source code may be obtained at
-<A href="http://www.eclipse.org/">http://www.eclipse.org/</A>.</P>
-
-</BODY>
-</HTML>
diff --git a/plugins/org.eclipse.jst.servlet.ui/build.properties b/plugins/org.eclipse.jst.servlet.ui/build.properties
deleted file mode 100644
index 0d63d85..0000000
--- a/plugins/org.eclipse.jst.servlet.ui/build.properties
+++ /dev/null
@@ -1,9 +0,0 @@
-source.. = servlet_ui/,\
- property_files/
-output.. = bin/
-bin.includes = plugin.xml,\
- .,\
- plugin.properties,\
- icons/,\
- META-INF/,\
- about.html
diff --git a/plugins/org.eclipse.jst.servlet.ui/icons/folder.gif b/plugins/org.eclipse.jst.servlet.ui/icons/folder.gif
deleted file mode 100644
index c91b267..0000000
--- a/plugins/org.eclipse.jst.servlet.ui/icons/folder.gif
+++ /dev/null
Binary files differ
diff --git a/plugins/org.eclipse.jst.servlet.ui/icons/full/ctool16/exportwar_wiz.gif b/plugins/org.eclipse.jst.servlet.ui/icons/full/ctool16/exportwar_wiz.gif
deleted file mode 100644
index ced859d..0000000
--- a/plugins/org.eclipse.jst.servlet.ui/icons/full/ctool16/exportwar_wiz.gif
+++ /dev/null
Binary files differ
diff --git a/plugins/org.eclipse.jst.servlet.ui/icons/full/ctool16/importwar_wiz.gif b/plugins/org.eclipse.jst.servlet.ui/icons/full/ctool16/importwar_wiz.gif
deleted file mode 100644
index 432c066..0000000
--- a/plugins/org.eclipse.jst.servlet.ui/icons/full/ctool16/importwar_wiz.gif
+++ /dev/null
Binary files differ
diff --git a/plugins/org.eclipse.jst.servlet.ui/icons/full/ctool16/newWebFragmentProject.gif b/plugins/org.eclipse.jst.servlet.ui/icons/full/ctool16/newWebFragmentProject.gif
deleted file mode 100644
index 9bebd32..0000000
--- a/plugins/org.eclipse.jst.servlet.ui/icons/full/ctool16/newWebFragmentProject.gif
+++ /dev/null
Binary files differ
diff --git a/plugins/org.eclipse.jst.servlet.ui/icons/full/ctool16/newfilter_wiz.gif b/plugins/org.eclipse.jst.servlet.ui/icons/full/ctool16/newfilter_wiz.gif
deleted file mode 100644
index 06cafc3..0000000
--- a/plugins/org.eclipse.jst.servlet.ui/icons/full/ctool16/newfilter_wiz.gif
+++ /dev/null
Binary files differ
diff --git a/plugins/org.eclipse.jst.servlet.ui/icons/full/ctool16/newlistener_wiz.gif b/plugins/org.eclipse.jst.servlet.ui/icons/full/ctool16/newlistener_wiz.gif
deleted file mode 100644
index 09f2a89..0000000
--- a/plugins/org.eclipse.jst.servlet.ui/icons/full/ctool16/newlistener_wiz.gif
+++ /dev/null
Binary files differ
diff --git a/plugins/org.eclipse.jst.servlet.ui/icons/full/ctool16/newservlet_wiz.gif b/plugins/org.eclipse.jst.servlet.ui/icons/full/ctool16/newservlet_wiz.gif
deleted file mode 100644
index f45eadc..0000000
--- a/plugins/org.eclipse.jst.servlet.ui/icons/full/ctool16/newservlet_wiz.gif
+++ /dev/null
Binary files differ
diff --git a/plugins/org.eclipse.jst.servlet.ui/icons/full/ctool16/newwar_wiz.gif b/plugins/org.eclipse.jst.servlet.ui/icons/full/ctool16/newwar_wiz.gif
deleted file mode 100644
index b9ac6be..0000000
--- a/plugins/org.eclipse.jst.servlet.ui/icons/full/ctool16/newwar_wiz.gif
+++ /dev/null
Binary files differ
diff --git a/plugins/org.eclipse.jst.servlet.ui/icons/full/ctool16/web-wiz-banner.gif b/plugins/org.eclipse.jst.servlet.ui/icons/full/ctool16/web-wiz-banner.gif
deleted file mode 100644
index 72944e9..0000000
--- a/plugins/org.eclipse.jst.servlet.ui/icons/full/ctool16/web-wiz-banner.gif
+++ /dev/null
Binary files differ
diff --git a/plugins/org.eclipse.jst.servlet.ui/icons/full/ctool16/web-wiz-icon.gif b/plugins/org.eclipse.jst.servlet.ui/icons/full/ctool16/web-wiz-icon.gif
deleted file mode 100644
index b9ac6be..0000000
--- a/plugins/org.eclipse.jst.servlet.ui/icons/full/ctool16/web-wiz-icon.gif
+++ /dev/null
Binary files differ
diff --git a/plugins/org.eclipse.jst.servlet.ui/icons/full/ctool16/webfragment_wizban.gif b/plugins/org.eclipse.jst.servlet.ui/icons/full/ctool16/webfragment_wizban.gif
deleted file mode 100644
index 27f1d1f..0000000
--- a/plugins/org.eclipse.jst.servlet.ui/icons/full/ctool16/webfragment_wizban.gif
+++ /dev/null
Binary files differ
diff --git a/plugins/org.eclipse.jst.servlet.ui/icons/full/ctool16/webjava-icon.gif b/plugins/org.eclipse.jst.servlet.ui/icons/full/ctool16/webjava-icon.gif
deleted file mode 100644
index 37cb4e7..0000000
--- a/plugins/org.eclipse.jst.servlet.ui/icons/full/ctool16/webjava-icon.gif
+++ /dev/null
Binary files differ
diff --git a/plugins/org.eclipse.jst.servlet.ui/icons/prj_obj.gif b/plugins/org.eclipse.jst.servlet.ui/icons/prj_obj.gif
deleted file mode 100644
index a4ea580..0000000
--- a/plugins/org.eclipse.jst.servlet.ui/icons/prj_obj.gif
+++ /dev/null
Binary files differ
diff --git a/plugins/org.eclipse.jst.servlet.ui/icons/war.gif b/plugins/org.eclipse.jst.servlet.ui/icons/war.gif
deleted file mode 100644
index 31ecb7a..0000000
--- a/plugins/org.eclipse.jst.servlet.ui/icons/war.gif
+++ /dev/null
Binary files differ
diff --git a/plugins/org.eclipse.jst.servlet.ui/plugin.properties b/plugins/org.eclipse.jst.servlet.ui/plugin.properties
deleted file mode 100644
index dfc2d82..0000000
--- a/plugins/org.eclipse.jst.servlet.ui/plugin.properties
+++ /dev/null
@@ -1,54 +0,0 @@
-###############################################################################
-# Copyright (c) 2003, 2006 IBM Corporation and others.
-# All rights reserved. This program and the accompanying materials
-# are made available under the terms of the Eclipse Public License v1.0
-# which accompanies this distribution, and is available at
-# http://www.eclipse.org/legal/epl-v10.html
-#
-# Contributors:
-# IBM Corporation - initial API and implementation
-###############################################################################
-
-pluginName=WTP Servlet UI Plug-in
-pluginVendor=Eclipse Web Tools Platform
-create.web.module_ui_=Create a J2EE Web Module
-create.web.project_ui_=Create a J2EE Web module
-web.actions.description_ui_=Actions for J2EE Web Development
-create_servlet_ui_=Create Java Servlet file
-war.import.description_ui_=Import an external WAR file into an Web project
-war.import.action.description_ui_=Import WAR File...
-war.export.description_ui_=Export a Web project into a WAR file
-war.export.action.description_ui_=Export WAR File...
-WarexportWizard.name=WAR file
-WarexportWizard.description=Export a Web Module into an external WAR file
-WarImportWizard.name=WAR file
-WarImportWizard.description=Import an external WAR file into a Web Project
-web.category_ui_=Web
-web.project_ui_=Dynamic Web Project
-static.web.project_ui_=Static Web Project
-new.web.project.description_ui_=Create a Dynamic Web project
-ConvertWebProjectType=Convert Web Project
-convertWebProjectTypeAction.label=Convert to a Dynamic Web project...
-ConvertWebProjectTypeAction.tooltip=Web Module Conversion Wizard
-convertToDynamic=Convert to Web Module...
-ServletWebRegionWizard.name=Servlet
-ServletWebRegionWizard.description=Create a new Servlet
-ServletWebRegionWizard.title=New Servlet
-Servlet_UI_=Servlet...
-FilterWebRegionWizard.name=Filter
-FilterWebRegionWizard.description=Create a new Filter
-servletAnnotationDecorator=Servlet Annotation Decorator
-servletAnnotationDecorator.description=Adds a decorator to an annotated servlet.
-web-project-wizard-name = Web Project
-web-project-wizard-description = Create a Web project
-webAppLibrariesContainerName = Web App Libraries
-
-ListenerWebRegionWizard.name=Listener
-ListenerWebRegionWizard.description=Create a new Application Lifecycle Listener
-
-enhanced.java.for.web.name=Enhanced Java Rendering for Web
-j2ee=Java EE
-j2ee.actions.description_ui_=Actions for J2EE Development
-webFragmentProjectUI=Web Fragment Project
-webFragmentProjectUI_desc=Create a new Web Fragment Project
-Project=Project
\ No newline at end of file
diff --git a/plugins/org.eclipse.jst.servlet.ui/plugin.xml b/plugins/org.eclipse.jst.servlet.ui/plugin.xml
deleted file mode 100644
index cd8ef39..0000000
--- a/plugins/org.eclipse.jst.servlet.ui/plugin.xml
+++ /dev/null
@@ -1,494 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<?eclipse version="3.0"?>
-<plugin>
- <!-- Create Java EE Projects drop down toolbar button -->
- <extension
- point="org.eclipse.ui.actionSets">
- <actionSet
- label="%j2ee"
- description="%j2ee.actions.description_ui_"
- visible="false"
- id="org.eclipse.jst.j2ee.J2eeMainActionSet">
- <action
- id="org.eclipse.jst.j2ee.internal.actions.NewJavaEEArtifact"
- toolbarPath="J2EEMain"
- class="org.eclipse.jst.j2ee.internal.actions.NewJavaEEArtifactDropDownAction"
- icon="icons/full/ctool16/newservlet_wiz.gif"
- label="%ServletWebRegionWizard.name"
- style="pulldown"
- tooltip="%ServletWebRegionWizard.description" />
- <action
- id="org.eclipse.jst.j2ee.internal.actions.NewJavaEEProject"
- toolbarPath="J2EEMain"
- class="org.eclipse.jst.j2ee.internal.actions.NewJavaEEProjectDropDownAction"
- icon="icons/full/ctool16/newwar_wiz.gif"
- label="%web.project_ui_"
- style="pulldown"
- tooltip="%new.web.project.description_ui_" />
- </actionSet>
- </extension>
-
- <extension
- id="J2EEUIProjectWizards"
- point="org.eclipse.ui.newWizards">
- <category
- name="%web.category_ui_"
- id="org.eclipse.wst.web.ui">
- </category>
- <wizard
- name="%webFragmentProjectUI"
- icon="icons/full/ctool16/newWebFragmentProject.gif"
- category="org.eclipse.wst.web.ui"
- project="true"
- finalPerspective="org.eclipse.jst.j2ee.J2EEPerspective"
- id="org.eclipse.jst.servlet.ui.project.facet.WebFragmentProjectWizard">
- <class class="org.eclipse.jst.servlet.ui.project.facet.WebFragmentProjectWizard">
- <parameter name="javaeeproject" value="true"/>
- <parameter name="menuIndex" value="15" />
- </class>
- <description>
- %webFragmentProjectUI_desc
- </description>
- <selection
- class="org.eclipse.core.resources.IResource" />
- </wizard>
- </extension>
-
- <!-- Web Module Wizard -->
- <extension
- id="J2EEUIProjectWizards"
- point="org.eclipse.ui.newWizards">
- <category
- name="%web.category_ui_"
- id="org.eclipse.wst.web.ui">
- </category>
- <wizard
- name="%web.project_ui_"
- icon="icons/full/ctool16/newwar_wiz.gif"
- category="org.eclipse.wst.web.ui"
- project="true"
- finalPerspective="org.eclipse.jst.j2ee.J2EEPerspective"
- id="org.eclipse.jst.servlet.ui.project.facet.WebProjectWizard">
- <class class="org.eclipse.jst.servlet.ui.project.facet.WebProjectWizard">
- <parameter name="javaeeproject" value="true"/>
- <parameter name="menuIndex" value="10" />
- </class>
- <description>
- %new.web.project.description_ui_
- </description>
- <selection
- class="org.eclipse.core.resources.IResource" />
- </wizard>
-
- <!--new servlet contribution-->
- <wizard
- name="%ServletWebRegionWizard.name"
- icon="icons/full/ctool16/newservlet_wiz.gif"
- category="org.eclipse.wst.web.ui"
- id="org.eclipse.jst.servlet.ui.internal.wizard.AddServletWizard">
- <class class="org.eclipse.jst.servlet.ui.internal.wizard.AddServletWizard">
- <parameter name="javaeeartifact" value="true"/>
- <parameter name="menuIndex" value="10" />
- </class>
- <description>
- %ServletWebRegionWizard.description
- </description>
- </wizard>
-
- <!--new filter contribution-->
- <wizard
- category="org.eclipse.wst.web.ui"
- icon="icons/full/ctool16/newfilter_wiz.gif"
- id="org.eclipse.jst.servlet.ui.internal.wizard.AddFilterWizard"
- name="%FilterWebRegionWizard.name">
- <class class="org.eclipse.jst.servlet.ui.internal.wizard.AddFilterWizard">
- <parameter name="javaeeartifact" value="true"/>
- <parameter name="menuIndex" value="20" />
- </class>
- <description>
- %FilterWebRegionWizard.description
- </description>
- </wizard>
-
- <!--new listener contribution-->
- <wizard
- name="%ListenerWebRegionWizard.name"
- icon="icons/full/ctool16/newlistener_wiz.gif"
- category="org.eclipse.wst.web.ui"
- id="org.eclipse.jst.servlet.ui.internal.wizard.AddListenerWizard">
- <class class="org.eclipse.jst.servlet.ui.internal.wizard.AddListenerWizard">
- <parameter name="javaeeartifact" value="true"/>
- <parameter name="menuIndex" value="30" />
- </class>
- <description>
- %ListenerWebRegionWizard.description
- </description>
- </wizard>
- </extension>
-
- <extension
- point="org.eclipse.ui.importWizards">
- <category
- name="%web.category_ui_"
- id="org.eclipse.wst.web.ui">
- </category>
- <wizard
- name="%WarImportWizard.name"
- icon="icons/full/ctool16/importwar_wiz.gif"
- class="org.eclipse.jst.servlet.ui.internal.wizard.WebComponentImportWizard"
- category="org.eclipse.wst.web.ui"
- id="org.eclipse.jst.servlet.ui.internal.wizard.WebComponentImportWizard">
- <description>
- %WarImportWizard.description
- </description>
- <selection
- class="org.eclipse.core.resources.IResource">
- </selection>
- </wizard>
-
- </extension>
-
- <extension
- point="org.eclipse.ui.exportWizards">
- <category
- name="%web.category_ui_"
- id="org.eclipse.wst.web.ui">
- </category>
- <wizard
- name="%WarexportWizard.name"
- icon="icons/full/ctool16/exportwar_wiz.gif"
- class="org.eclipse.jst.servlet.ui.internal.wizard.WebComponentExportWizard"
- category="org.eclipse.wst.web.ui"
- id="org.eclipse.jst.servlet.ui.internal.wizard.WebComponentExportWizard">
- <description>
- %WarexportWizard.description
- </description>
- <selection
- class="org.eclipse.core.resources.IResource">
- </selection>
- </wizard>
- </extension>
-
- <extension
- point="org.eclipse.wst.common.frameworks.ui.extendableWizard">
- <extendableWizard
- id="org.eclipse.jst.servlet.ui.WebModuleCreationWizard">
- </extendableWizard>
- </extension>
-
-
- <extension
- point="org.eclipse.ui.popupMenus">
- <objectContribution
- objectClass="org.eclipse.core.resources.IProject"
- adaptable="true"
- id = "convertToWebModuleTypeAction">
- <menu
- label="%static.web.project_ui_"
- path="additions"
- id="ConvertWebProjectType">
- <separator
- name="ConvertWebProjectType">
- </separator>
- </menu>
- <action
- label="%convertWebProjectTypeAction.label"
- tooltip="%ConvertWebProjectTypeAction.tooltip"
- menubarPath="org.eclipse.ui.projectConfigure/additions"
- class="org.eclipse.jst.servlet.ui.internal.actions.ConvertToWebModuleTypeAction"
- enablesFor="1"
- id="convertToWebModuleTypeAction">
- </action>
- <enablement>
- <adapt type="org.eclipse.core.resources.IProject">
- <test forcePluginActivation="true"
- property="org.eclipse.wst.common.project.facet.core.projectFacet"
- value="wst.web" />
- </adapt>
- </enablement>
- </objectContribution>
- </extension>
-
- <!-- ==================================================================== -->
-<!-- Extension point: org.eclipse.etools.server.core.moduleObjectAdapters -->
-<!-- Purpose: Define adapters for Web resources -->
-<!-- ==================================================================== -->
- <extension point="org.eclipse.wst.server.core.moduleArtifactAdapters">
-
- <moduleArtifactAdapter
- id="org.eclipse.jst.web.server.webresource"
- class="org.eclipse.jst.servlet.ui.internal.deployables.WebDeployableArtifactAdapterFactory">
- <enablement>
- <with variable="selection">
- <adapt type="org.eclipse.jst.j2ee.webapplication.WebApp"/>
- </with>
- </enablement>
- </moduleArtifactAdapter>
-
- <moduleArtifactAdapter
- id="org.eclipse.jst.web.server.webresource2"
- class="org.eclipse.jst.servlet.ui.internal.deployables.WebDeployableArtifactAdapterFactory">
- <enablement>
- <with variable="selection">
- <adapt type="org.eclipse.jst.server.core.Servlet"/>
- </with>
- </enablement>
- </moduleArtifactAdapter>
-
- <moduleArtifactAdapter
- id="org.eclipse.jst.web.server.webresource3"
- class="org.eclipse.jst.servlet.ui.internal.deployables.WebDeployableArtifactAdapterFactory">
- <enablement>
- <with variable="selection">
- <adapt type="org.eclipse.core.resources.IProject">
- <test forcePluginActivation="true"
- property="org.eclipse.wst.common.project.facet.core.projectFacet"
- value="jst.web:2.4]" />
- </adapt>
- </with>
- </enablement>
- </moduleArtifactAdapter>
-
- <moduleArtifactAdapter
- id="org.eclipse.jst.web.server.webresource4"
- class="org.eclipse.jst.servlet.ui.internal.deployables.WebDeployableArtifactAdapterFactory">
- <enablement>
- <with variable="selection">
- <adapt type="org.eclipse.core.resources.IFile">
- <test forcePluginActivation="true"
- property="org.eclipse.wst.common.project.facet.core.projectFacet"
- value="jst.web:2.4]" />
- </adapt>
- </with>
- </enablement>
- </moduleArtifactAdapter>
-
- <moduleArtifactAdapter
- id="org.eclipse.jst.web.server.webresource5"
- class="org.eclipse.jst.servlet.ui.internal.deployables.WebDeployableArtifactAdapterFactory">
-
- <enablement>
- <with variable="selection">
- <adapt type="org.eclipse.jdt.core.ICompilationUnit">
- <test forcePluginActivation="true"
- property="org.eclipse.jst.j2ee.common.projectFacet"
- value="jst.web:2.4]" />
- </adapt>
- </with>
- </enablement>
- </moduleArtifactAdapter>
- </extension>
-
- <extension point="org.eclipse.core.runtime.adapters">
- <factory
- class="org.eclipse.jst.servlet.ui.internal.deployables.WebDeployableArtifactAdapterFactory"
- adaptableType="org.eclipse.core.resources.IProject">
- <adapter type= "org.eclipse.debug.ui.actions.ILaunchable"/>
- </factory>
- <factory
- class="org.eclipse.jst.servlet.ui.internal.deployables.WebDeployableArtifactAdapterFactory"
- adaptableType="org.eclipse.jdt.core.ICompilationUnit">
- <adapter type= "org.eclipse.debug.ui.actions.ILaunchable"/>
- </factory>
- <factory
- class="org.eclipse.jst.servlet.ui.internal.deployables.WebDeployableArtifactAdapterFactory"
- adaptableType="org.eclipse.core.resources.IFile">
- <adapter type= "org.eclipse.debug.ui.actions.ILaunchable"/>
- </factory>
- <factory
- class="org.eclipse.jst.servlet.ui.internal.deployables.WebDeployableArtifactAdapterFactory"
- adaptableType="org.eclipse.jst.j2ee.webapplication.Servlet">
- <adapter type= "org.eclipse.debug.ui.actions.ILaunchable"/>
- </factory>
- <factory
- class="org.eclipse.jst.servlet.ui.internal.deployables.WebDeployableArtifactAdapterFactory"
- adaptableType="org.eclipse.jst.j2ee.webapplication.WebApp">
- <adapter type= "org.eclipse.debug.ui.actions.ILaunchable"/>
- </factory>
- <factory
- class="org.eclipse.jst.servlet.ui.internal.deployables.WebDeployableArtifactAdapterFactory"
- adaptableType="org.eclipse.jst.server.core.Servlet">
- <adapter type= "org.eclipse.debug.ui.actions.ILaunchable"/>
- </factory>
-
- </extension>
-
-<!-- ====================================================== -->
-<!-- Label Decorators -->
-<!-- ====================================================== -->
-
- <extension
- point="org.eclipse.ui.decorators">
- <decorator
- lightweight="true"
- adaptable="true"
- label="%servletAnnotationDecorator"
- class="org.eclipse.jst.j2ee.internal.ui.util.AnnotationIconDecorator"
- state="true"
- location="TOP_LEFT"
- id="org.eclipse.jst.j2ee.internal.ui.util.AnnotationIconDecorator_servlet">
- <description>
- %servletAnnotationDecorator.description
- </description>
- <enablement>
- <objectClass
- name="org.eclipse.jst.j2ee.webapplication.Servlet">
- </objectClass>
- </enablement>
- </decorator>
- </extension>
-
- <extension point="org.eclipse.wst.common.project.facet.ui.wizardPages">
- <wizard-pages action="jst.web.install">
- <page class="org.eclipse.jst.servlet.ui.project.facet.WebFacetInstallPage"/>
- </wizard-pages>
- </extension>
-
- <extension point="org.eclipse.wst.common.project.facet.ui.images">
- <image facet="jst.web" path="icons/war.gif"/>
- </extension>
-
- <extension
- point="org.eclipse.jdt.ui.classpathContainerPage">
- <classpathContainerPage
- name="%webAppLibrariesContainerName"
- class="org.eclipse.jst.servlet.ui.internal.wizard.WebAppLibrariesContainerPage"
- id="org.eclipse.jst.j2ee.internal.web.container">
- </classpathContainerPage>
- </extension>
- <extension
- point="org.eclipse.ui.navigator.navigatorContent">
- <navigatorContent
- activeByDefault="true"
- contentProvider="org.eclipse.jst.servlet.ui.internal.navigator.WebJavaContentProvider"
- icon="icons/full/ctool16/webjava-icon.gif"
- id="org.eclipse.jst.servlet.ui.EnhancedJavaRendering"
- labelProvider="org.eclipse.jst.servlet.ui.internal.navigator.WebJavaLabelProvider"
- name="%enhanced.java.for.web.name"
- priority="higher">
- <override
- policy="InvokeOnlyIfSuppressedExtAlsoVisibleAndActive"
- suppressedExtensionId="org.eclipse.jdt.java.ui.javaContent"/>
- <triggerPoints>
- <or>
- <and>
- <adapt
- type="org.eclipse.core.resources.IProject">
- <or>
- <test forcePluginActivation="true"
- property="org.eclipse.wst.common.project.facet.core.projectFacet"
- value="jst.web" />
- </or>
- </adapt>
- </and>
- <instanceof value="org.eclipse.jst.servlet.ui.internal.navigator.ICompressedNode" />
- </or>
- </triggerPoints>
- <possibleChildren>
- <or>
- <instanceof value="org.eclipse.jst.servlet.ui.internal.navigator.CompressedJavaProject"/>
- <instanceof value="org.eclipse.jdt.core.IPackageFragmentRoot"/>
- <instanceof value="org.eclipse.jdt.core.IPackageFragment"/>
- <instanceof value="org.eclipse.core.resources.IFolder"/>
- <instanceof value="org.eclipse.jdt.internal.ui.packageview.ClassPathContainer"/>
- <instanceof value="org.eclipse.jst.servlet.ui.internal.navigator.CompressedJavaLibraries"/>
- </or>
- </possibleChildren>
- <actionProvider
- class="org.eclipse.ui.internal.navigator.resources.actions.NewActionProvider"
- id="org.eclipse.jst.servlet.ui.EnhancedJavaRendering.actions.NewActionProvider">
- <enablement>
- <instanceof
- value="org.eclipse.jst.servlet.ui.internal.navigator.ICompressedNode" />
- </enablement>
- </actionProvider>
- <commonSorter
- class="org.eclipse.jst.servlet.ui.internal.navigator.CompressedJavaSorter"
- id="org.eclipse.jst.servlet.ui.EnhancedJavaRendering.sorter">
- <parentExpression>
- <instanceof value="org.eclipse.jst.servlet.ui.internal.navigator.CompressedJavaProject"/>
- </parentExpression>
- </commonSorter>
-
- <commonWizard
- type="new"
- wizardId="org.eclipse.jdt.ui.wizards.NewPackageCreationWizard">
- <enablement>
- <instanceof
- value="org.eclipse.jst.servlet.ui.internal.navigator.ICompressedNode" />
- </enablement>
- </commonWizard>
- <commonWizard
- type="new"
- wizardId="org.eclipse.jdt.ui.wizards.NewClassCreationWizard">
- <enablement>
- <instanceof
- value="org.eclipse.jst.servlet.ui.internal.navigator.ICompressedNode" />
- </enablement>
- </commonWizard>
-
- <commonWizard
- type="new"
- wizardId="org.eclipse.jdt.ui.wizards.NewInterfaceCreationWizard">
- <enablement>
- <instanceof
- value="org.eclipse.jst.servlet.ui.internal.navigator.ICompressedNode" />
- </enablement>
- </commonWizard>
- <commonWizard
- type="new"
- wizardId="org.eclipse.jdt.ui.wizards.NewSourceFolderCreationWizard">
- <enablement>
- <instanceof
- value="org.eclipse.jst.servlet.ui.internal.navigator.ICompressedNode" />
- </enablement>
- </commonWizard>
- </navigatorContent>
- </extension>
- <extension
- point="org.eclipse.ui.navigator.viewer">
- <viewerContentBinding viewerId="org.eclipse.ui.navigator.ProjectExplorer">
- <includes>
- <contentExtension pattern="org.eclipse.jst.servlet.ui.EnhancedJavaRendering"/>
- </includes>
- </viewerContentBinding>
- </extension>
- <extension
- point="org.eclipse.core.runtime.adapters">
- <factory
- adaptableType="org.eclipse.jst.servlet.ui.internal.navigator.CompressedJavaProject"
- class="org.eclipse.jst.servlet.ui.internal.navigator.CompressedNodeAdapterFactory">
- <adapter type="org.eclipse.jdt.core.IJavaProject"/>
- <adapter type="org.eclipse.jdt.core.IJavaElement"/>
- </factory>
- </extension>
-
- <extension
- point="org.eclipse.wst.common.modulecore.ui.moduleDependencyPropertyPage">
- <dependencyPage
- class="org.eclipse.jst.servlet.ui.internal.WebModuleDependencyPageProvider"
- id="org.eclipse.jst.servlet.ui.internal.WebModuleDependencyPageProvider">
- </dependencyPage>
- </extension>
- <extension
- point="org.eclipse.wst.common.modulecore.ui.referenceWizardFragment">
- <referenceFragment
- class="org.eclipse.jst.servlet.ui.internal.CustomWebProjectReferenceWizardFragment"
- hidden="true"
- icon="icons/prj_obj.gif"
- id="org.eclipse.jst.servlet.ui.internal.CustomWebProjectReferenceWizardFragment"
- name="%Project">
- </referenceFragment>
- </extension>
-
- <extension point="org.eclipse.core.expressions.propertyTesters">
- <propertyTester
- id="org.eclipse.jst.servlet.ui.internal.navigator.FacetedProjectPropertyTester"
- type="org.eclipse.jst.servlet.ui.internal.navigator.ICompressedNode"
- namespace="org.eclipse.jst.servlet.ui.navigator"
- properties="projectFacet"
- class="org.eclipse.jst.servlet.ui.internal.navigator.FacetedProjectPropertyTester">
- </propertyTester>
- </extension>
-
-</plugin>
diff --git a/plugins/org.eclipse.jst.servlet.ui/property_files/web_ui.properties b/plugins/org.eclipse.jst.servlet.ui/property_files/web_ui.properties
deleted file mode 100644
index 9939c53..0000000
--- a/plugins/org.eclipse.jst.servlet.ui/property_files/web_ui.properties
+++ /dev/null
@@ -1,159 +0,0 @@
-###############################################################################
-# Copyright (c) 2003, 2006 IBM Corporation and others.
-# All rights reserved. This program and the accompanying materials
-# are made available under the terms of the Eclipse Public License v1.0
-# which accompanies this distribution, and is available at
-# http://www.eclipse.org/legal/epl-v10.html
-#
-# Contributors:
-# IBM Corporation - initial API and implementation
-###############################################################################
-_0=Failed to find the image "{0}".
-_1=New Dynamic Web Project
-_2=Servlet version:
-_3=Dynamic Web Project
-_4=Create a standalone Dynamic Web project or add it to a new or existing Enterprise Application.
-_5=Web &project:
-_6=WAR file:
-_7=Import a WAR file from the file system
-_8=WAR Import
-_9=WAR Export
-_10=Export Web project to the local file system.
-_11=Context root:
-_12=Convert Simple Web to Web Module
-_13=Convert Simple Web to Web Module.
-_14=WAR Import: Web libraries
-_15=Select the web library jars from the list below to be imported as web library projects. Unselected web libraries will be imported as jars in the WEB-INF/lib directory.
-_16=Select All
-_17=Deselect All
-_18=New Web Fragment Project
-ADD_SERVLET_WIZARD_WINDOW_TITLE=Create Servlet
-ADD_SERVLET_WIZARD_PAGE_TITLE=Create Servlet
-ADD_SERVLET_WIZARD_PAGE_DESC=Enter servlet deployment descriptor specific information.
-
-ADD_FILTER_WIZARD_WINDOW_TITLE=Create Filter
-ADD_FILTER_WIZARD_PAGE_TITLE=Create Filter
-ADD_FILTER_WIZARD_PAGE_DESC=Enter servlet filter deployment descriptor specific information.
-
-ADD_LISTENER_WIZARD_WINDOW_TITLE=Create Listener
-ADD_LISTENER_WIZARD_PAGE_TITLE=Create Listener
-ADD_LISTENER_WIZARD_PAGE_DESC=Select the application lifecycle events to listen to.
-
-DISPATCHER_REQUEST=&REQUEST
-DISPATCHER_FORWARD=&FORWARD
-DISPATCHER_INCLUDE=&INCLUDE
-DISPATCHER_ERROR=&ERROR
-
-DEFAULT_PACKAGE=(default package)
-SELECT_CLASS_TITLE=Select Class
-MAP_CLASS_NAME_TO_CLASS_ERROR_MSG=IWAE0060E Could not uniquely map the class name to a class.
-EMPTY_LIST_MSG=Empty List
-ADD_LABEL=Add
-USE_EXISTING_SERVLET_CLASS=&Use an existing Servlet class or JSP
-USE_EXISTING_FILTER_CLASS=&Use existing Filter class
-USE_EXISTING_LISTENER_CLASS=&Use existing Listener class
-INIT_PARAM_TITLE=Initialization Parameters
-INIT_PARAM_LABEL=Initialization ¶meters:
-URL_MAPPINGS_TITLE=URL Mappings
-URL_MAPPINGS_LABEL=&URL mappings:
-CHOOSE_SERVLET_CLASS=&Choose a JSP file:
-
-NEW_SERVLET_WIZARD_WINDOW_TITLE=New Servlet
-NEW_SERVLET_WIZARD_PAGE_TITLE=Servlet
-NEW_SERVLET_WIZARD_PAGE_DESC=Create a new servlet.
-SERVLET_PACKAGE_LABEL=Java package:
-SERVLET_NAME_LABEL=Servlet name:
-
-NEW_FILTER_WIZARD_WINDOW_TITLE=New Filter
-CHOOSE_FILTER_CLASS=Choose a filter class
-SERVLET_MAPPINGS_LABEL=Servlet mappings:
-FILTER_MAPPINGS_LABEL=Fi<er mappings:
-
-ADD_LISTENER_WIZARD_SERVLET_CONTEXT_EVENTS=Servlet context events
-ADD_LISTENER_WIZARD_HTTP_SESSION_EVENTS=HTTP session events
-ADD_LISTENER_WIZARD_SERVLET_REQUEST_EVENTS=Servlet request events
-ADD_LISTENER_WIZARD_LIFECYCLE=Lifecycle
-ADD_LISTENER_WIZARD_LIFECYCLE_L=&Lifecycle
-ADD_LISTENER_WIZARD_LIFECYCLE_I=L&ifecycle
-ADD_LISTENER_WIZARD_LIFECYCLE_Y=Lifec&ycle
-ADD_LISTENER_WIZARD_CHANGES_TO_ATTRIBUTES=Changes to attributes
-ADD_LISTENER_WIZARD_CHANGES_TO_ATTRIBUTES_C=&Changes to attributes
-ADD_LISTENER_WIZARD_CHANGES_TO_ATTRIBUTES_H=C&hanges to attributes
-ADD_LISTENER_WIZARD_CHANGES_TO_ATTRIBUTES_G=Chan&ges to attributes
-ADD_LISTENER_WIZARD_SESSION_MIGRATION=Session &migration
-ADD_LISTENER_WIZARD_OBJECT_BINDING=&Object binding
-
-ADD_BUTTON_LABEL=Add...
-ADD_BUTTON_LABEL_A=&Add...
-ADD_BUTTON_LABEL_D=A&dd...
-EDIT_BUTTON_LABEL=Edit...
-EDIT_BUTTON_LABEL_E=&Edit...
-EDIT_BUTTON_LABEL_T=Edi&t...
-REMOVE_BUTTON_LABEL=Remove
-REMOVE_BUTTON_LABEL_R=&Remove
-REMOVE_BUTTON_LABEL_V=Remo&ve
-URL_PATTERN_TITLE=URL Patterns
-URL_PATTERN_LABEL=&Pattern:
-FOLDER_LABEL=Folder:
-JAVA_PACKAGE_LABEL=Java package:
-CLASS_NAME_LABEL=Class na&me:
-SUPERCLASS_LABEL=&Superclass:
-CONTAINER_SELECTION_DIALOG_TITLE=Container Selection
-CONTAINER_SELECTION_DIALOG_DESC=Choose a Container:
-CONTAINER_SELECTION_DIALOG_VALIDATOR_MESG=Choose the Web Content Folder or its subfolder
-PACKAGE_SELECTION_DIALOG_TITLE=Package Selection
-PACKAGE_SELECTION_DIALOG_DESC=Choose a package:
-PACKAGE_SELECTION_DIALOG_MSG_NONE=No packages to choose from
-SUPERCLASS_SELECTION_DIALOG_TITLE=Superclass Selection
-SUPERCLASS_SELECTION_DIALOG_DESC=Choose a superclass:
-INTERFACE_SELECTION_DIALOG_TITLE=Interface Selection
-INTERFACE_SELECTION_DIALOG_DESC=Choose interfaces:
-INTERFACE_SELECTION_DIALOG_MSG_NONE=''{0}'' added.
-JAVA_CLASS_MODIFIERS_LABEL=Modifiers:
-JAVA_CLASS_PUBLIC_CHECKBOX_LABEL=&Public
-JAVA_CLASS_ABSTRACT_CHECKBOX_LABEL=Abs&tract
-JAVA_CLASS_FINAL_CHECKBOX_LABEL=fina&l
-JAVA_CLASS_INTERFACES_LABEL=&Interfaces:
-JAVA_CLASS_METHOD_STUBS_LABEL=Which method stubs would you like to create?
-JAVA_CLASS_MAIN_CHECKBOX_LABEL=public static void main(String[] args)
-JAVA_CLASS_CONSTRUCTOR_CHECKBOX_LABEL=&Constructors from superclass
-JAVA_CLASS_INHERIT_CHECKBOX_LABEL=In&herited abstract methods
-JAVA_CLASS_BROWER_DIALOG_TITLE=Java Class Browser
-JAVA_CLASS_BROWER_DIALOG_MESSAGE=Browse for a Java class
-
-NAME_TITLE=Name
-NAME_LABEL=Na&me:
-DESCRIPTION_TITLE=Description
-DESCRIPTION_LABEL=De&scription:
-VALUE_TITLE=Value
-VALUE_LABEL=&Value:
-URL_SERVLET_LABEL=URL Pattern / Servlet Name
-DISPATCHERS_LABEL=Dispatchers
-
-BROWSE_BUTTON_LABEL=Bro&wse...
-REMOVE_BUTTON=Remove
-SELECT_ALL_BUTTON=&Select All
-CLEAR_BUTTON=&Deselect All
-
-NEW_JAVA_CLASS_DESTINATION_WIZARD_PAGE_DESC=Specify class file destination.
-NEW_JAVA_CLASS_OPTIONS_WIZARD_PAGE_DESC=Specify modifiers, interfaces to implement, and method stubs to generate.
-
-ImportWARAction_UI_=Import Web Module...
-ExportWARAction_UI_=Export WAR file...
-
-NO_WEB_PROJECTS=No Web Projects
-
-SERVLETS =Servlets
-
-WEB_CONT_NAME = WebAppContainerPage
-WEB_CONT_PAGE_TITLE = Web App Libraries Container
-WEB_CONT_PAGE_DESCRIPTION = This container dynamically populates classpath entries from the WEB-INF/lib and WEB-INF/classes directories of a web app.
-WEB_CONT_PAGE_COMP_LABEL = Component:
-WEBCONTENT=Web Content folder:
-
-
-Compressed_Libraries= Libraries
-Compressed_JavaResources= Java Resources{0}
-
-ConvertToWebTitle=Convert to Dynamic Web Project
-SelectWebVersion=Select a Dynamic Web module version:
diff --git a/plugins/org.eclipse.jst.servlet.ui/servlet_ui/org/eclipse/jst/servlet/ui/IWebUIContextIds.java b/plugins/org.eclipse.jst.servlet.ui/servlet_ui/org/eclipse/jst/servlet/ui/IWebUIContextIds.java
deleted file mode 100644
index caba816..0000000
--- a/plugins/org.eclipse.jst.servlet.ui/servlet_ui/org/eclipse/jst/servlet/ui/IWebUIContextIds.java
+++ /dev/null
@@ -1,37 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2003, 2006 IBM Corporation and others.
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
- *
- * Contributors:
- * IBM Corporation - initial API and implementation
- *******************************************************************************/
-package org.eclipse.jst.servlet.ui;
-
-public interface IWebUIContextIds {
-
-public static final String PLUGIN_SERVLET_UI = "org.eclipse.jst.servlet.ui."; //$NON-NLS-1$
-
- public static final String NEW_DYNAMIC_WEB_PROJECT_PAGE1 = PLUGIN_SERVLET_UI + "webw1000"; //$NON-NLS-1$
- public static final String NEW_DYNAMIC_WEB_PROJECT_PAGE2 = PLUGIN_SERVLET_UI + "webw1100"; //$NON-NLS-1$
- public static final String NEW_DYNAMIC_WEB_PROJECT_PAGE3 = PLUGIN_SERVLET_UI + "webw1200"; //$NON-NLS-1$
-
- public static final String WAR_IMPORT_PAGE1 = PLUGIN_SERVLET_UI + "webi1000"; //$NON-NLS-1$
- public static final String WAR_IMPORT_PAGE2 = PLUGIN_SERVLET_UI + "webi1100"; //$NON-NLS-1$
-
- public static final String WAR_EXPORT_PAGE1 = PLUGIN_SERVLET_UI + "webe1000"; //$NON-NLS-1$
-
- public static final String WEBEDITOR_SERVLET_PAGE_ADD_SERVLET_WIZARD_1 = PLUGIN_SERVLET_UI + "srvw1050"; //$NON-NLS-1$
- public static final String WEBEDITOR_SERVLET_PAGE_ADD_SERVLET_WIZARD_2 = PLUGIN_SERVLET_UI + "srvw1100"; //$NON-NLS-1$
- public static final String WEBEDITOR_SERVLET_PAGE_ADD_SERVLET_WIZARD_3 = PLUGIN_SERVLET_UI + "srvw1200"; //$NON-NLS-1$
-
- public static final String WEBEDITOR_LISTENER_PAGE_ADD_LISTENER_WIZARD_1 = PLUGIN_SERVLET_UI + "lstw1050"; //$NON-NLS-1$
- public static final String WEBEDITOR_LISTENER_PAGE_ADD_LISTENER_WIZARD_2 = PLUGIN_SERVLET_UI + "lstw1100"; //$NON-NLS-1$
- public static final String WEBEDITOR_LISTENER_PAGE_ADD_LISTENER_WIZARD_3 = PLUGIN_SERVLET_UI + "lstw1200"; //$NON-NLS-1$
-
- public static final String WEBEDITOR_FILTER_PAGE_ADD_FILTER_WIZARD_1 = PLUGIN_SERVLET_UI + "fltw1050"; //$NON-NLS-1$
- public static final String WEBEDITOR_FILTER_PAGE_ADD_FILTER_WIZARD_2 = PLUGIN_SERVLET_UI + "fltw1100"; //$NON-NLS-1$
- public static final String WEBEDITOR_FILTER_PAGE_ADD_FILTER_WIZARD_3 = PLUGIN_SERVLET_UI + "fltw1200"; //$NON-NLS-1$
-}
diff --git a/plugins/org.eclipse.jst.servlet.ui/servlet_ui/org/eclipse/jst/servlet/ui/internal/CustomWebProjectReferenceWizardFragment.java b/plugins/org.eclipse.jst.servlet.ui/servlet_ui/org/eclipse/jst/servlet/ui/internal/CustomWebProjectReferenceWizardFragment.java
deleted file mode 100644
index 347ec9b..0000000
--- a/plugins/org.eclipse.jst.servlet.ui/servlet_ui/org/eclipse/jst/servlet/ui/internal/CustomWebProjectReferenceWizardFragment.java
+++ /dev/null
@@ -1,113 +0,0 @@
-/******************************************************************************
- * Copyright (c) 2009 Red Hat and Others
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
- *
- * Contributors:
- * Rob Stryker - initial implementation and ongoing maintenance
- * Chuck Bridgham - Ongoing improvements
- * Konstantin Komissarchik - misc. UI cleanup
- ******************************************************************************/
-package org.eclipse.jst.servlet.ui.internal;
-
-import org.eclipse.core.resources.IProject;
-import org.eclipse.core.runtime.CoreException;
-import org.eclipse.core.runtime.IProgressMonitor;
-import org.eclipse.jst.j2ee.internal.J2EEConstants;
-import org.eclipse.jst.j2ee.internal.project.J2EEProjectUtilities;
-import org.eclipse.jst.j2ee.project.JavaEEProjectUtilities;
-import org.eclipse.swt.SWT;
-import org.eclipse.swt.events.SelectionEvent;
-import org.eclipse.swt.events.SelectionListener;
-import org.eclipse.swt.layout.GridData;
-import org.eclipse.swt.layout.GridLayout;
-import org.eclipse.swt.widgets.Button;
-import org.eclipse.swt.widgets.Composite;
-import org.eclipse.wst.common.componentcore.resources.IVirtualComponent;
-import org.eclipse.wst.common.componentcore.ui.internal.propertypage.ProjectReferenceWizardFragment;
-import org.eclipse.wst.common.componentcore.ui.internal.taskwizard.IWizardHandle;
-import org.eclipse.wst.common.componentcore.ui.propertypage.IReferenceWizardConstants;
-
-public class CustomWebProjectReferenceWizardFragment extends ProjectReferenceWizardFragment {
-
- public CustomWebProjectReferenceWizardFragment() {
- super();
- }
-
- private boolean isWebLib = true;
- private Button button;
-
- @Override
- public Composite createComposite(Composite parent, IWizardHandle handle) {
-
- Composite c = new Composite(parent, SWT.NONE);
-
- final GridLayout gl = new GridLayout();
- gl.marginWidth = 0;
- gl.marginHeight = 0;
-
- c.setLayout(gl);
-
- Composite tableComp = super.createComposite(c, handle);
- tableComp.setLayoutData(new GridData(GridData.FILL_BOTH));
-
- // make button
- button = new Button(c, SWT.CHECK);
- button.setText(Messages.CustomWebProjectReferenceWizardFragment);
-
- final GridData gd = new GridData();
- gd.horizontalIndent = 5;
- button.setLayoutData(gd);
-
- button.addSelectionListener(new SelectionListener() {
- public void widgetDefaultSelected(SelectionEvent e) {
- }
- public void widgetSelected(SelectionEvent e) {
- handleEdit();
- }
- });
- button.setSelection(true);
-
- return c;
- }
-
- public Composite createTableColumnComposite(Composite parent) {
- Composite aButtonColumn = new Composite(parent, SWT.NONE);
-
- GridLayout layout = new GridLayout();
- layout.numColumns = 1;
- layout.marginHeight = 0;
- layout.marginWidth = 0;
- aButtonColumn.setLayout(layout);
- GridData data = new GridData(GridData.FILL_BOTH);
- //data.minimumHeight = 500;
- //data.minimumWidth = 400;
- aButtonColumn.setLayoutData(data);
- return aButtonColumn;
- }
-
- protected void handleEdit() {
- isWebLib = button.getSelection();
- }
-
- @Override
- protected String getArchiveName(IProject proj, IVirtualComponent comp) {
- return super.getArchiveName(proj, comp);
- }
-
- @Override
- public void performFinish(IProgressMonitor monitor) throws CoreException {
- for (int i = 0; i < selected.length; i++) {
- IProject proj = selected[i];
- if(JavaEEProjectUtilities.getJ2EEProjectType(proj).equals("")) //$NON-NLS-1$
- J2EEProjectUtilities.createFlexJavaProjectForProjectOperation(proj).execute(monitor, null);
- }
- String location = "/"; //$NON-NLS-1$
- if(isWebLib) location += J2EEConstants.WEB_INF_LIB;
- getTaskModel().putObject(IReferenceWizardConstants.DEFAULT_LIBRARY_LOCATION, location);
- super.performFinish(monitor);
- }
-
-}
diff --git a/plugins/org.eclipse.jst.servlet.ui/servlet_ui/org/eclipse/jst/servlet/ui/internal/Messages.java b/plugins/org.eclipse.jst.servlet.ui/servlet_ui/org/eclipse/jst/servlet/ui/internal/Messages.java
deleted file mode 100644
index 4add98c..0000000
--- a/plugins/org.eclipse.jst.servlet.ui/servlet_ui/org/eclipse/jst/servlet/ui/internal/Messages.java
+++ /dev/null
@@ -1,32 +0,0 @@
-package org.eclipse.jst.servlet.ui.internal;
-
-import java.util.MissingResourceException;
-import java.util.ResourceBundle;
-
-import org.eclipse.osgi.util.NLS;
-
-public class Messages extends NLS {
- private static final String BUNDLE_NAME = "org.eclipse.jst.servlet.ui.internal.messages"; //$NON-NLS-1$
- public static String DeploymentAssembly;
- public static String WebDeploymentAssembly;
- public static String ManifestEntries;
- public static String CustomWebProjectReferenceWizardFragment;
-
- static {
- // initialize resource bundle
- NLS.initializeMessages(BUNDLE_NAME, Messages.class);
- }
-
- private static final ResourceBundle RESOURCE_BUNDLE = ResourceBundle.getBundle(BUNDLE_NAME);
-
- private Messages() {
- }
-
- public static String getString(String key) {
- try {
- return RESOURCE_BUNDLE.getString(key);
- } catch (MissingResourceException e) {
- return '!' + key + '!';
- }
- }
-}
diff --git a/plugins/org.eclipse.jst.servlet.ui/servlet_ui/org/eclipse/jst/servlet/ui/internal/WebDependencyPropertyPage.java b/plugins/org.eclipse.jst.servlet.ui/servlet_ui/org/eclipse/jst/servlet/ui/internal/WebDependencyPropertyPage.java
deleted file mode 100644
index c53e02f..0000000
--- a/plugins/org.eclipse.jst.servlet.ui/servlet_ui/org/eclipse/jst/servlet/ui/internal/WebDependencyPropertyPage.java
+++ /dev/null
@@ -1,65 +0,0 @@
-/******************************************************************************
- * Copyright (c) 2010 Red Hat and Others
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
- *
- * Contributors:
- * Rob Stryker - initial implementation and ongoing maintenance
- * Konstantin Komissarchik - misc. UI cleanup
- ******************************************************************************/
-package org.eclipse.jst.servlet.ui.internal;
-
-import java.util.List;
-
-import org.eclipse.core.resources.IProject;
-import org.eclipse.jst.j2ee.internal.J2EEConstants;
-import org.eclipse.jst.j2ee.internal.ui.J2EEModuleDependenciesPropertyPage;
-import org.eclipse.jst.j2ee.internal.ui.preferences.Messages;
-import org.eclipse.wst.common.componentcore.internal.impl.TaskModel;
-import org.eclipse.wst.common.componentcore.ui.internal.propertypage.DependencyPageExtensionManager;
-import org.eclipse.wst.common.componentcore.ui.internal.propertypage.DependencyPageExtensionManager.ReferenceExtension;
-import org.eclipse.wst.common.componentcore.ui.propertypage.IReferenceWizardConstants;
-import org.eclipse.wst.common.componentcore.ui.propertypage.ModuleAssemblyRootPage;
-
-public class WebDependencyPropertyPage extends J2EEModuleDependenciesPropertyPage {
-
- public WebDependencyPropertyPage(IProject project,
- ModuleAssemblyRootPage page) {
- super(project, page);
- }
-
-
- @Override
- protected void createPushButtons() {
- super.createPushButtons();
- }
-
- @Override
- protected void setCustomReferenceWizardProperties(TaskModel model) {
- model.putObject(IReferenceWizardConstants.DEFAULT_LIBRARY_LOCATION, J2EEConstants.WEB_INF_LIB);
- }
-
- @Override
- protected String getModuleAssemblyRootPageDescription() {
- return Messages.WebDependencyPropertyPage_1;
- }
-
- @Override
- protected void filterReferenceTypes( final List<ReferenceExtension> extensions )
- {
- // Replace the default one with our own custom one, in class CustomWebProjectReferenceWizardFragment
-
- for( int i = 0, n = extensions.size(); i < n; i++ )
- {
- final ReferenceExtension ext = extensions.get( i );
-
- if( ext.getId().equals( "org.eclipse.wst.common.componentcore.ui.newProjectReference" ) ) //$NON-NLS-1$
- {
- extensions.set( i, DependencyPageExtensionManager.getManager().findReferenceExtension( "org.eclipse.jst.servlet.ui.internal.CustomWebProjectReferenceWizardFragment" ) ); //$NON-NLS-1$
- }
- }
- }
-
-}
diff --git a/plugins/org.eclipse.jst.servlet.ui/servlet_ui/org/eclipse/jst/servlet/ui/internal/WebModuleDependencyPageProvider.java b/plugins/org.eclipse.jst.servlet.ui/servlet_ui/org/eclipse/jst/servlet/ui/internal/WebModuleDependencyPageProvider.java
deleted file mode 100644
index 05e08da..0000000
--- a/plugins/org.eclipse.jst.servlet.ui/servlet_ui/org/eclipse/jst/servlet/ui/internal/WebModuleDependencyPageProvider.java
+++ /dev/null
@@ -1,101 +0,0 @@
-/******************************************************************************
- * Copyright (c) 2010 Red Hat and Others
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
- *
- * Contributors:
- * Rob Stryker - initial implementation and ongoing maintenance
- * Chuck Bridgham - Additional support
- * Konstantin Komissarchik - misc. UI cleanup
- ******************************************************************************/
-package org.eclipse.jst.servlet.ui.internal;
-
-import org.eclipse.core.resources.IProject;
-import org.eclipse.jst.common.internal.modulecore.util.JavaModuleComponentUtility;
-import org.eclipse.jst.common.ui.internal.assembly.wizard.ManifestModuleDependencyControl;
-import org.eclipse.swt.SWT;
-import org.eclipse.swt.layout.GridData;
-import org.eclipse.swt.layout.GridLayout;
-import org.eclipse.swt.widgets.Composite;
-import org.eclipse.swt.widgets.Control;
-import org.eclipse.swt.widgets.TabFolder;
-import org.eclipse.swt.widgets.TabItem;
-import org.eclipse.wst.common.componentcore.internal.util.IModuleConstants;
-import org.eclipse.wst.common.componentcore.ui.propertypage.IDependencyPageProvider;
-import org.eclipse.wst.common.componentcore.ui.propertypage.IModuleDependenciesControl;
-import org.eclipse.wst.common.componentcore.ui.propertypage.ModuleAssemblyRootPage;
-import org.eclipse.wst.common.project.facet.core.IFacetedProject;
-import org.eclipse.wst.common.project.facet.core.ProjectFacetsManager;
-
-public class WebModuleDependencyPageProvider implements IDependencyPageProvider {
-
- private IModuleDependenciesControl[] controls;
-
- public boolean canHandle(IFacetedProject project) {
- boolean isWeb = project.hasProjectFacet(ProjectFacetsManager.getProjectFacet(IModuleConstants.JST_WEB_MODULE));
- return isWeb;
- }
-
- /*
- * This now allows extenders to say whether this project is standalone or not
- */
- protected boolean isStandalone(IProject project) {
- return JavaModuleComponentUtility.findParentProjects(project).length == 0;
- }
-
- public IModuleDependenciesControl[] createPages(IFacetedProject project,
- ModuleAssemblyRootPage parent) {
-
- if( isStandalone(project.getProject()))
- return new IModuleDependenciesControl[] {
- new WebDependencyPropertyPage(project.getProject(), parent)};
-
- return new IModuleDependenciesControl[] {
- new WebDependencyPropertyPage(project.getProject(), parent),
- new ManifestModuleDependencyControl(project.getProject(), parent)
- };
- }
-
- public Composite createRootControl(IFacetedProject project,IModuleDependenciesControl[] pages,
- Composite parent) {
-
- if( isStandalone(project.getProject()))
- return pages[0].createContents(parent);
-
- final TabFolder folder = new TabFolder(parent, SWT.LEFT);
- folder.setLayoutData(new GridData(GridData.FILL_BOTH));
- folder.setFont(parent.getFont());
-
- // Create the two tabs
- controls = new IModuleDependenciesControl[2];
- controls[0] = pages[0];
- controls[1] = pages[1];
-
- TabItem tab = new TabItem(folder, SWT.NONE);
- tab.setControl(create(controls[0],folder));
- tab.setText(Messages.DeploymentAssembly);
- tab = new TabItem(folder, SWT.NONE);
- tab.setControl(create(controls[1],folder));
- tab.setText(Messages.ManifestEntries);
-
- folder.setSelection(0);
- return folder;
- }
-
- private static Control create( final IModuleDependenciesControl control,
- final Composite parent )
- {
- final Composite composite = new Composite( parent, SWT.NONE );
- composite.setLayout( new GridLayout() );
- final Composite inner = control.createContents( composite );
- inner.setLayoutData( new GridData( GridData.FILL_BOTH ) );
-
- return composite;
- }
-
- public String getPageTitle(IProject project) {
- return Messages.WebDeploymentAssembly;
- }
-}
diff --git a/plugins/org.eclipse.jst.servlet.ui/servlet_ui/org/eclipse/jst/servlet/ui/internal/actions/ConvertToWebModuleTypeAction.java b/plugins/org.eclipse.jst.servlet.ui/servlet_ui/org/eclipse/jst/servlet/ui/internal/actions/ConvertToWebModuleTypeAction.java
deleted file mode 100644
index fdf1f51..0000000
--- a/plugins/org.eclipse.jst.servlet.ui/servlet_ui/org/eclipse/jst/servlet/ui/internal/actions/ConvertToWebModuleTypeAction.java
+++ /dev/null
@@ -1,115 +0,0 @@
-package org.eclipse.jst.servlet.ui.internal.actions;
-
-/*******************************************************************************
- * Copyright (c) 2003, 2008 IBM Corporation and others.
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
- *
- * Contributors:
- * IBM Corporation - initial API and implementation
- *******************************************************************************/
-
-import org.eclipse.core.resources.IProject;
-import org.eclipse.core.runtime.NullProgressMonitor;
-import org.eclipse.jface.action.Action;
-import org.eclipse.jface.action.IAction;
-import org.eclipse.jface.viewers.ISelection;
-import org.eclipse.jface.viewers.IStructuredSelection;
-import org.eclipse.jface.window.Window;
-import org.eclipse.jst.j2ee.project.JavaEEProjectUtilities;
-import org.eclipse.jst.j2ee.web.datamodel.properties.IConvertStaticWebToDyamnicDataModelProperties;
-import org.eclipse.jst.servlet.ui.internal.wizard.ConvertToWebModuleTypeDialog;
-import org.eclipse.ui.IWorkbenchWindow;
-import org.eclipse.ui.IWorkbenchWindowActionDelegate;
-import org.eclipse.ui.PlatformUI;
-import org.eclipse.wst.common.frameworks.datamodel.DataModelFactory;
-import org.eclipse.wst.common.frameworks.datamodel.IDataModel;
-import org.eclipse.wst.web.ui.internal.Logger;
-
-/**
- * Convert a simple static web project to a J2EE Dynamic Web Project
- */
-public class ConvertToWebModuleTypeAction extends Action implements IWorkbenchWindowActionDelegate {
-
- IStructuredSelection fSelection = null;
- IProject project = null;
- IWorkbenchWindow fWindow;
-
- /**
- * ConvertLinksDialog constructor comment.
- */
- public ConvertToWebModuleTypeAction() {
- super();
- }
-
- /**
- * make sure a web project is selected.
- */
- protected boolean isValidProject(IProject aProject) {
- return JavaEEProjectUtilities.isStaticWebProject(aProject);
- }
-
- /**
- * selectionChanged method comment.
- */
- public void selectionChanged(IAction action, ISelection selection) {
- boolean bEnable = false;
- if (selection instanceof IStructuredSelection) {
- fSelection = (IStructuredSelection) selection;
- bEnable = validateSelected(fSelection);
- }
- ((Action) action).setEnabled(bEnable);
- }
-
- /**
- * selectionChanged method comment.
- */
- protected boolean validateSelected(ISelection selection) {
- if (!(selection instanceof IStructuredSelection))
- return false;
-
- fSelection = (IStructuredSelection) selection;
-
- Object selectedProject = fSelection.getFirstElement();
- if (!(selectedProject instanceof IProject))
- return false;
-
- project = (IProject) selectedProject;
- return isValidProject(project);
- }
-
- public void dispose() {
- // Default
- }
-
- public void init(IWorkbenchWindow window) {
- // Default
- }
-
- public void run(IAction action) {
- try {
- IWorkbenchWindow window = PlatformUI.getWorkbench().getWorkbenchWindows()[0];
- ConvertToWebModuleTypeDialog dialog = new ConvertToWebModuleTypeDialog(window.getShell());
- dialog.open();
- if (dialog.getReturnCode() == Window.CANCEL)
- return;
-
- doConvert(ConvertToWebModuleTypeDialog.getSelectedVersion());
-
- } catch (Exception e) {
- Logger.logException(e);
- }
- }
-
- protected void doConvert(String selectedVersion) throws Exception {
-
- IDataModel model = DataModelFactory.createDataModel(IConvertStaticWebToDyamnicDataModelProperties.class);
- model.setProperty(IConvertStaticWebToDyamnicDataModelProperties.PROJECT, project);
- model.setStringProperty(IConvertStaticWebToDyamnicDataModelProperties.CONVERT_TO_WEB_VERSION, ConvertToWebModuleTypeDialog.getSelectedVersion());
- model.getDefaultOperation().execute(new NullProgressMonitor(), null);
-
- }
-
-}
diff --git a/plugins/org.eclipse.jst.servlet.ui/servlet_ui/org/eclipse/jst/servlet/ui/internal/actions/NewWebComponentAction.java b/plugins/org.eclipse.jst.servlet.ui/servlet_ui/org/eclipse/jst/servlet/ui/internal/actions/NewWebComponentAction.java
deleted file mode 100644
index 61d934a..0000000
--- a/plugins/org.eclipse.jst.servlet.ui/servlet_ui/org/eclipse/jst/servlet/ui/internal/actions/NewWebComponentAction.java
+++ /dev/null
@@ -1,54 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2003, 2005 IBM Corporation and others.
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
- *
- * Contributors:
- * IBM Corporation - initial API and implementation
- *******************************************************************************/
-package org.eclipse.jst.servlet.ui.internal.actions;
-
-import org.eclipse.jface.wizard.Wizard;
-import org.eclipse.jst.j2ee.internal.actions.AbstractOpenWizardWorkbenchAction;
-import org.eclipse.jst.j2ee.internal.plugin.J2EEUIPlugin;
-import org.eclipse.jst.servlet.ui.internal.plugin.WEBUIMessages;
-import org.eclipse.jst.servlet.ui.project.facet.WebProjectWizard;
-import org.eclipse.ui.IWorkbench;
-
-public class NewWebComponentAction extends AbstractOpenWizardWorkbenchAction {
-
- public static String LABEL = WEBUIMessages.WEB_MODULE_WIZ_TITLE;
- private static final String ICON = "war_wiz"; //$NON-NLS-1$
-
- public NewWebComponentAction() {
- super();
- setText(LABEL);
- setImageDescriptor(J2EEUIPlugin.getDefault().getImageDescriptor(ICON));
- }
-
- public NewWebComponentAction(IWorkbench workbench, String label, Class[] activatedOnTypes, boolean acceptEmptySelection) {
- super(workbench, label, activatedOnTypes, acceptEmptySelection);
- setImageDescriptor(J2EEUIPlugin.getDefault().getImageDescriptor(ICON));
- }
-
- public NewWebComponentAction(IWorkbench workbench, String label, boolean acceptEmptySelection) {
- super(workbench, label, acceptEmptySelection);
- setImageDescriptor(J2EEUIPlugin.getDefault().getImageDescriptor(ICON));
- }
-
- @Override
- protected Wizard createWizard() {
- return new WebProjectWizard();
- }
-
- @Override
- protected boolean shouldAcceptElement(Object obj) {
- return true; /* NewGroup.isOnBuildPath(obj) && !NewGroup.isInArchive(obj); */
- }
- @Override
- protected String getDialogText() {
- return null;
- }
-}
diff --git a/plugins/org.eclipse.jst.servlet.ui/servlet_ui/org/eclipse/jst/servlet/ui/internal/deployables/WebDeployableArtifactAdapterFactory.java b/plugins/org.eclipse.jst.servlet.ui/servlet_ui/org/eclipse/jst/servlet/ui/internal/deployables/WebDeployableArtifactAdapterFactory.java
deleted file mode 100644
index cccad87..0000000
--- a/plugins/org.eclipse.jst.servlet.ui/servlet_ui/org/eclipse/jst/servlet/ui/internal/deployables/WebDeployableArtifactAdapterFactory.java
+++ /dev/null
@@ -1,35 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2003, 2004 IBM Corporation and others.
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
- *
- * Contributors:
- * IBM Corporation - initial API and implementation
- *******************************************************************************/
-package org.eclipse.jst.servlet.ui.internal.deployables;
-
-import org.eclipse.core.runtime.IAdapterFactory;
-import org.eclipse.debug.ui.actions.ILaunchable;
-import org.eclipse.jst.j2ee.internal.web.deployables.WebDeployableArtifactUtil;
-import org.eclipse.wst.server.core.IModuleArtifact;
-import org.eclipse.wst.server.core.model.ModuleArtifactAdapterDelegate;
-
-public class WebDeployableArtifactAdapterFactory extends ModuleArtifactAdapterDelegate implements IAdapterFactory {
-
- public Object getAdapter(Object adaptableObject, Class adapterType) {
- return null;
- }
-
- public Class[] getAdapterList() {
- return new Class[]{ILaunchable.class};
- }
-
-
- @Override
- public IModuleArtifact getModuleArtifact(Object obj) {
- return WebDeployableArtifactUtil.getModuleObject(obj);
- }
-
-}
diff --git a/plugins/org.eclipse.jst.servlet.ui/servlet_ui/org/eclipse/jst/servlet/ui/internal/messages.properties b/plugins/org.eclipse.jst.servlet.ui/servlet_ui/org/eclipse/jst/servlet/ui/internal/messages.properties
deleted file mode 100644
index 4848c4d..0000000
--- a/plugins/org.eclipse.jst.servlet.ui/servlet_ui/org/eclipse/jst/servlet/ui/internal/messages.properties
+++ /dev/null
@@ -1,4 +0,0 @@
-CustomWebProjectReferenceWizardFragment=Assemble projects into the &WEB-INF/lib folder of the web application
-DeploymentAssembly=Deplo&yment Assembly
-WebDeploymentAssembly=Web Deployment Assembly
-ManifestEntries=&Manifest Entries
diff --git a/plugins/org.eclipse.jst.servlet.ui/servlet_ui/org/eclipse/jst/servlet/ui/internal/navigator/CompressedJavaLibraries.java b/plugins/org.eclipse.jst.servlet.ui/servlet_ui/org/eclipse/jst/servlet/ui/internal/navigator/CompressedJavaLibraries.java
deleted file mode 100644
index 5363803..0000000
--- a/plugins/org.eclipse.jst.servlet.ui/servlet_ui/org/eclipse/jst/servlet/ui/internal/navigator/CompressedJavaLibraries.java
+++ /dev/null
@@ -1,79 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2003, 2006 IBM Corporation and others.
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
- *
- * Contributors:
- * IBM Corporation - initial API and implementation
- *******************************************************************************/
-package org.eclipse.jst.servlet.ui.internal.navigator;
-
-import java.util.ArrayList;
-import java.util.List;
-
-import org.eclipse.core.resources.IResource;
-import org.eclipse.jdt.core.IClasspathEntry;
-import org.eclipse.jdt.core.IJavaElement;
-import org.eclipse.jdt.core.IPackageFragmentRoot;
-import org.eclipse.jdt.core.JavaModelException;
-import org.eclipse.jdt.ui.ISharedImages;
-import org.eclipse.jdt.ui.JavaUI;
-import org.eclipse.jface.viewers.ITreeContentProvider;
-import org.eclipse.jst.servlet.ui.internal.plugin.WEBUIMessages;
-import org.eclipse.swt.graphics.Image;
-
-public class CompressedJavaLibraries implements ICompressedNode {
-
-
- private CompressedJavaProject compressedProject;
- private Image image;
-
- public CompressedJavaLibraries(CompressedJavaProject compressedProject) {
- this.compressedProject = compressedProject;
- }
-
- public Image getImage() {
- if(image == null) {
- image = JavaUI.getSharedImages().getImage(ISharedImages.IMG_OBJS_LIBRARY);
- }
- return image;
- }
-
- public String getLabel() {
- return WEBUIMessages.Compressed_Libraries;
- }
-
- public Object[] getChildren(ITreeContentProvider delegateContentProvider) {
-
- List classpathContainers = new ArrayList();
- Object[] delegateChildren = delegateContentProvider.getChildren(compressedProject.getProject());
- for (int i = 0; i < delegateChildren.length; i++) {
- if (delegateChildren[i] instanceof IPackageFragmentRoot) {
- try {
- IClasspathEntry rawClasspathEntry = ((IPackageFragmentRoot) delegateChildren[i]).getRawClasspathEntry();
- if (rawClasspathEntry.getEntryKind() != IClasspathEntry.CPE_CONTAINER &&
- rawClasspathEntry.getEntryKind() != IClasspathEntry.CPE_SOURCE)
- classpathContainers.add(delegateChildren[i]);
- } catch (JavaModelException e) {
-
- }
- } else if (!(delegateChildren[i] instanceof IJavaElement) && !(delegateChildren[i] instanceof IResource)) {
- classpathContainers.add(delegateChildren[i]);
- }
- }
- return classpathContainers.toArray();
- }
-
- public CompressedJavaProject getCompressedProject() {
- return compressedProject;
- }
-
- public IJavaElement getJavaElement() {
- return null;
- }
-
-
-
-}
diff --git a/plugins/org.eclipse.jst.servlet.ui/servlet_ui/org/eclipse/jst/servlet/ui/internal/navigator/CompressedJavaProject.java b/plugins/org.eclipse.jst.servlet.ui/servlet_ui/org/eclipse/jst/servlet/ui/internal/navigator/CompressedJavaProject.java
deleted file mode 100644
index 9c317c2..0000000
--- a/plugins/org.eclipse.jst.servlet.ui/servlet_ui/org/eclipse/jst/servlet/ui/internal/navigator/CompressedJavaProject.java
+++ /dev/null
@@ -1,114 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2003, 2006 IBM Corporation and others.
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
- *
- * Contributors:
- * IBM Corporation - initial API and implementation
- *******************************************************************************/
-package org.eclipse.jst.servlet.ui.internal.navigator;
-
-import java.util.ArrayList;
-import java.util.Arrays;
-import java.util.Collections;
-import java.util.Iterator;
-import java.util.List;
-
-import org.eclipse.core.resources.IProject;
-import org.eclipse.core.runtime.IAdaptable;
-import org.eclipse.core.runtime.Platform;
-import org.eclipse.jdt.core.IJavaElement;
-import org.eclipse.jdt.core.IJavaProject;
-import org.eclipse.jdt.core.IPackageFragmentRoot;
-import org.eclipse.jdt.core.JavaCore;
-import org.eclipse.jdt.core.JavaModelException;
-import org.eclipse.jdt.ui.ISharedImages;
-import org.eclipse.jdt.ui.JavaUI;
-import org.eclipse.jface.viewers.ITreeContentProvider;
-import org.eclipse.jface.viewers.StructuredViewer;
-import org.eclipse.jst.servlet.ui.internal.plugin.ServletUIPlugin;
-import org.eclipse.jst.servlet.ui.internal.plugin.WEBUIMessages;
-import org.eclipse.osgi.util.NLS;
-import org.eclipse.swt.graphics.Image;
-
-public class CompressedJavaProject implements ICompressedNode, IAdaptable {
-
- private IProject project;
- private CompressedJavaLibraries compressedLibraries;
- private Image image;
-
- public CompressedJavaProject(StructuredViewer viewer, IProject project) {
- this.project = project;
-
- }
-
- public Image getImage() {
- if(image == null)
- image = JavaUI.getSharedImages().getImage(ISharedImages.IMG_OBJS_PACKFRAG_ROOT);
- return image;
- }
-
- public String getLabel() {
- return determineLabel();
-
- }
-
- public boolean isFlatteningSourceFolder() {
- return getNonExternalSourceFolders().size() == 1;
- }
-
- private String determineLabel() {
- return NLS.bind(WEBUIMessages.Compressed_JavaResources, ""); //$NON-NLS-1$
- }
-
- public IProject getProject() {
- return project;
- }
-
- public Object[] getChildren(ITreeContentProvider delegateContentProvider) {
-
- List nonExternalSourceFolders = getNonExternalSourceFolders();
- nonExternalSourceFolders.add(getCompressedJavaLibraries());
- return nonExternalSourceFolders.toArray();
- }
-
- public List getNonExternalSourceFolders() {
- List nonExternalSourceFolders = null;
- IPackageFragmentRoot[] sourceFolders;
- try {
- IJavaProject jProject = JavaCore.create(project);
- sourceFolders = jProject.getPackageFragmentRoots();
- nonExternalSourceFolders = new ArrayList(Arrays.asList(sourceFolders));
- for (Iterator iter = nonExternalSourceFolders.iterator(); iter.hasNext();) {
- IPackageFragmentRoot root = (IPackageFragmentRoot) iter.next();
- if (root.isExternal() || root.isArchive() || root.getKind()==IPackageFragmentRoot.K_BINARY)
- iter.remove();
- }
- } catch (JavaModelException e) {
- ServletUIPlugin.log(e);
- }
- return nonExternalSourceFolders != null ? nonExternalSourceFolders : Collections.EMPTY_LIST;
- }
-
- public CompressedJavaLibraries getCompressedJavaLibraries() {
- if(compressedLibraries == null)
- compressedLibraries = new CompressedJavaLibraries(this);
- return compressedLibraries;
-
- }
-
- public Object getAdapter(Class adapter) {
- return Platform.getAdapterManager().getAdapter(this, adapter);
- }
-
- public IJavaElement getJavaElement() {
- List nonExternalSourceFolders = getNonExternalSourceFolders();
- if (nonExternalSourceFolders.size() == 1) {
- return (IJavaElement) nonExternalSourceFolders.get(0);
- }
- return JavaCore.create(project);
- }
-
-}
diff --git a/plugins/org.eclipse.jst.servlet.ui/servlet_ui/org/eclipse/jst/servlet/ui/internal/navigator/CompressedJavaSorter.java b/plugins/org.eclipse.jst.servlet.ui/servlet_ui/org/eclipse/jst/servlet/ui/internal/navigator/CompressedJavaSorter.java
deleted file mode 100644
index 4ee9c12..0000000
--- a/plugins/org.eclipse.jst.servlet.ui/servlet_ui/org/eclipse/jst/servlet/ui/internal/navigator/CompressedJavaSorter.java
+++ /dev/null
@@ -1,38 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2003, 2006 IBM Corporation and others.
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
- *
- * Contributors:
- * IBM Corporation - initial API and implementation
- *******************************************************************************/
-package org.eclipse.jst.servlet.ui.internal.navigator;
-
-import org.eclipse.jdt.ui.JavaElementSorter;
-import org.eclipse.jface.viewers.Viewer;
-import org.eclipse.jface.viewers.ViewerSorter;
-
-public class CompressedJavaSorter extends ViewerSorter {
-
- private JavaElementSorter sorter = new JavaElementSorter();
-
- @Override
- public int category(Object element) {
- if(element instanceof CompressedJavaLibraries)
- return 1;
- return 0;
- }
-
- @Override
- public int compare(Viewer viewer, Object e1, Object e2) {
- if(e1 instanceof CompressedJavaLibraries)
- return 1;
- else if(e2 instanceof CompressedJavaLibraries)
- return -1;
-
- return sorter.compare(viewer, e1, e2);
- }
-
-}
diff --git a/plugins/org.eclipse.jst.servlet.ui/servlet_ui/org/eclipse/jst/servlet/ui/internal/navigator/CompressedNodeAdapterFactory.java b/plugins/org.eclipse.jst.servlet.ui/servlet_ui/org/eclipse/jst/servlet/ui/internal/navigator/CompressedNodeAdapterFactory.java
deleted file mode 100644
index a73b085..0000000
--- a/plugins/org.eclipse.jst.servlet.ui/servlet_ui/org/eclipse/jst/servlet/ui/internal/navigator/CompressedNodeAdapterFactory.java
+++ /dev/null
@@ -1,40 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2003, 2006 IBM Corporation and others.
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
- *
- * Contributors:
- * IBM Corporation - initial API and implementation
- *******************************************************************************/
-package org.eclipse.jst.servlet.ui.internal.navigator;
-
-import org.eclipse.core.runtime.IAdapterFactory;
-import org.eclipse.jdt.core.IJavaElement;
-import org.eclipse.jdt.core.IJavaProject;
-
-//
-public class CompressedNodeAdapterFactory implements IAdapterFactory {
-
- private static final Class IJAVA_PROJECT_CLASS = IJavaProject.class;
- private static final Class IJAVA_ELEMENT_CLASS = IJavaElement.class;
-
- private static final Class[] ADAPTER_LIST = new Class[] { IJAVA_PROJECT_CLASS };
-
- public Object getAdapter(Object adaptableObject, Class adapterType) {
- if(adaptableObject instanceof CompressedJavaProject) {
- if(adapterType == IJAVA_PROJECT_CLASS) {
- return ((CompressedJavaProject)adaptableObject).getProject();
- } else if (adapterType == IJAVA_ELEMENT_CLASS) {
- return ((CompressedJavaProject)adaptableObject).getJavaElement();
- }
- }
- return null;
- }
-
- public Class[] getAdapterList() {
- return ADAPTER_LIST;
- }
-
-}
diff --git a/plugins/org.eclipse.jst.servlet.ui/servlet_ui/org/eclipse/jst/servlet/ui/internal/navigator/FacetedProjectPropertyTester.java b/plugins/org.eclipse.jst.servlet.ui/servlet_ui/org/eclipse/jst/servlet/ui/internal/navigator/FacetedProjectPropertyTester.java
deleted file mode 100644
index 7acbd73..0000000
--- a/plugins/org.eclipse.jst.servlet.ui/servlet_ui/org/eclipse/jst/servlet/ui/internal/navigator/FacetedProjectPropertyTester.java
+++ /dev/null
@@ -1,71 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2010 SAP AG and others.
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
- *
- * Contributors:
- * Kaloyan Raev, kaloyan.raev@sap.com - initial API and implementation
- *******************************************************************************/
-package org.eclipse.jst.servlet.ui.internal.navigator;
-
-import org.eclipse.core.expressions.PropertyTester;
-import org.eclipse.core.resources.IProject;
-import org.eclipse.core.runtime.CoreException;
-import org.eclipse.wst.common.project.facet.core.FacetedProjectFramework;
-
-public class FacetedProjectPropertyTester extends PropertyTester
-
-{
- public boolean test( final Object receiver,
- final String property,
- final Object[] args,
- final Object value )
- {
- try
- {
- if( ! ( receiver instanceof ICompressedNode ) )
- {
- return false;
- }
-
- IProject pj = null;
- if (receiver instanceof CompressedJavaProject) {
- pj = ((CompressedJavaProject) receiver).getProject();
- } else if (receiver instanceof CompressedJavaLibraries) {
- pj = ((CompressedJavaLibraries) receiver).getCompressedProject().getProject();
- }
-
- if( pj == null )
- {
- return false;
- }
-
- final String val = (String) value;
- final int colon = val.indexOf( ':' );
-
- final String fid;
- final String vexpr;
-
- if( colon == -1 || colon == val.length() - 1 )
- {
- fid = val;
- vexpr = null;
- }
- else
- {
- fid = val.substring( 0, colon );
- vexpr = val.substring( colon + 1 );
- }
-
- return FacetedProjectFramework.hasProjectFacet( pj, fid, vexpr );
- }
- catch( CoreException e )
- {
- //
- }
-
- return false;
- }
-}
diff --git a/plugins/org.eclipse.jst.servlet.ui/servlet_ui/org/eclipse/jst/servlet/ui/internal/navigator/ICompressedNode.java b/plugins/org.eclipse.jst.servlet.ui/servlet_ui/org/eclipse/jst/servlet/ui/internal/navigator/ICompressedNode.java
deleted file mode 100644
index 7d1bb73..0000000
--- a/plugins/org.eclipse.jst.servlet.ui/servlet_ui/org/eclipse/jst/servlet/ui/internal/navigator/ICompressedNode.java
+++ /dev/null
@@ -1,50 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2003, 2006 IBM Corporation and others.
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
- *
- * Contributors:
- * IBM Corporation - initial API and implementation
- *******************************************************************************/
-package org.eclipse.jst.servlet.ui.internal.navigator;
-
-import org.eclipse.jdt.core.IJavaElement;
-import org.eclipse.jface.viewers.ITreeContentProvider;
-import org.eclipse.swt.graphics.Image;
-
-/**
- *
- * Provides a simple interface that is used to manipulate the rendering of Java elements to a format
- * that is friendlier for Web Projects.
- *
- */
-public interface ICompressedNode {
- /**
- *
- * @return The image to display for this node.
- */
- public Image getImage();
-
- /**
- *
- * @return The text label to display for this node.
- */
- public String getLabel();
-
- /**
- *
- * @param delegateContentProvider
- * The content provider that should used for any children that I cannot provide
- * children for.
- * @return The children either from me or the delegateContentProvider.
- */
- public Object[] getChildren(ITreeContentProvider delegateContentProvider);
-
- /**
- *
- * @return The Java element associated with this node, if any.
- */
- public IJavaElement getJavaElement();
-}
diff --git a/plugins/org.eclipse.jst.servlet.ui/servlet_ui/org/eclipse/jst/servlet/ui/internal/navigator/WebJavaContentProvider.java b/plugins/org.eclipse.jst.servlet.ui/servlet_ui/org/eclipse/jst/servlet/ui/internal/navigator/WebJavaContentProvider.java
deleted file mode 100644
index 5a76c85..0000000
--- a/plugins/org.eclipse.jst.servlet.ui/servlet_ui/org/eclipse/jst/servlet/ui/internal/navigator/WebJavaContentProvider.java
+++ /dev/null
@@ -1,299 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2003, 2007 IBM Corporation and others.
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
- *
- * Contributors:
- * IBM Corporation - initial API and implementation
- *******************************************************************************/
-package org.eclipse.jst.servlet.ui.internal.navigator;
-
-import java.util.HashMap;
-import java.util.Iterator;
-import java.util.Map;
-import java.util.Set;
-
-import org.eclipse.core.resources.IFolder;
-import org.eclipse.core.resources.IProject;
-import org.eclipse.core.resources.IResource;
-import org.eclipse.core.runtime.CoreException;
-import org.eclipse.jdt.core.IJavaElement;
-import org.eclipse.jdt.core.IJavaProject;
-import org.eclipse.jdt.core.IPackageFragment;
-import org.eclipse.jdt.core.IPackageFragmentRoot;
-import org.eclipse.jdt.core.JavaCore;
-import org.eclipse.jdt.core.JavaModelException;
-import org.eclipse.jface.viewers.ITreeContentProvider;
-import org.eclipse.jface.viewers.Viewer;
-import org.eclipse.jst.j2ee.project.JavaEEProjectUtilities;
-import org.eclipse.jst.servlet.ui.internal.plugin.ServletUIPlugin;
-import org.eclipse.ui.IMemento;
-import org.eclipse.ui.navigator.CommonViewer;
-import org.eclipse.ui.navigator.ICommonContentExtensionSite;
-import org.eclipse.ui.navigator.INavigatorContentExtension;
-import org.eclipse.ui.navigator.INavigatorContentService;
-import org.eclipse.ui.navigator.IPipelinedTreeContentProvider;
-import org.eclipse.ui.navigator.PipelinedShapeModification;
-import org.eclipse.ui.navigator.PipelinedViewerUpdate;
-
-public class WebJavaContentProvider implements IPipelinedTreeContentProvider {
-
- private static final Object[] NO_CHILDREN = new Object[0];
- private static final String JAVA_EXTENSION_ID = "org.eclipse.jdt.java.ui.javaContent"; //$NON-NLS-1$
-
- /*
- * JDT likes to make it interesting so just one of their viewer types is made internal To avoid
- * the dependency, we use some reflection here to filter the type.
- */
-
- private static Class INTERNAL_CONTAINER_CLASS;
- static {
- try {
- INTERNAL_CONTAINER_CLASS = Class.forName("org.eclipse.jdt.internal.ui.packageview.ClassPathContainer"); //$NON-NLS-1$
- } catch (Throwable t) {
- // ignore if the class has been removed or renamed.
- INTERNAL_CONTAINER_CLASS = null;
- }
- }
-
-
- private CommonViewer commonViewer;
- private ITreeContentProvider delegateContentProvider;
- private final Map compressedNodes = new HashMap();
-
- public void getPipelinedChildren(Object aParent, Set theCurrentChildren) {
- try {
- if (aParent instanceof IProject && ((IProject)aParent).hasNature(JavaCore.NATURE_ID) && JavaEEProjectUtilities.isDynamicWebProject((IProject)aParent)) {
- cleanJavaContribution(theCurrentChildren);
- theCurrentChildren.add(getCompressedNode((IProject)aParent));
- }
- } catch (CoreException e) {
- ServletUIPlugin.log(e);
- }
- }
-
- private void cleanJavaContribution(Set theCurrentChildren) {
- IJavaElement element = null;
- for (Iterator iter = theCurrentChildren.iterator(); iter.hasNext();) {
- Object child = iter.next();
- if (child instanceof IResource && ((element = JavaCore.create((IResource) child)) != null) && element.exists())
- iter.remove();
- else if (child instanceof IJavaElement)
- iter.remove();
- else if (INTERNAL_CONTAINER_CLASS != null && INTERNAL_CONTAINER_CLASS.isInstance(child))
- iter.remove();
- }
- }
-
- private CompressedJavaProject getCompressedNode(IProject project) {
- if (!JavaEEProjectUtilities.isDynamicWebProject(project))
- return null;
- CompressedJavaProject result = (CompressedJavaProject) compressedNodes.get(project);
- if (result == null) {
- compressedNodes.put(project, result = new CompressedJavaProject(commonViewer, project));
- }
- return result;
- }
-
- public void getPipelinedElements(Object anInput, Set theCurrentElements) {
-
- }
-
- public Object getPipelinedParent(Object anObject, Object aSuggestedParent) {
-
- try {
- if (anObject instanceof IPackageFragmentRoot) {
- IPackageFragmentRoot root = (IPackageFragmentRoot) anObject;
- if (!root.isExternal()) {
- if( aSuggestedParent instanceof IJavaProject ) {
- return getCompressedNode( ((IJavaProject) aSuggestedParent).getProject() );
- } else if ( aSuggestedParent instanceof IProject && ((IProject)aSuggestedParent).hasNature(JavaCore.NATURE_ID) && JavaEEProjectUtilities.isDynamicWebProject((IProject)aSuggestedParent) ){
- return getCompressedNode( ((IProject) aSuggestedParent) );
- }
- }
- } else if(INTERNAL_CONTAINER_CLASS.isInstance(anObject)) {
- if( aSuggestedParent instanceof IJavaProject ) {
- return getCompressedNode( ((IJavaProject) aSuggestedParent).getProject() ).getCompressedJavaLibraries();
- } else if ( aSuggestedParent instanceof IProject && ((IProject)aSuggestedParent).hasNature(JavaCore.NATURE_ID) && JavaEEProjectUtilities.isDynamicWebProject((IProject)aSuggestedParent)){
- return getCompressedNode( ((IProject) aSuggestedParent) ).getCompressedJavaLibraries();
- }
- }
- } catch (CoreException e) {
- ServletUIPlugin.log(e);
- }
-
- return null;
- }
-
- public PipelinedShapeModification interceptAdd(PipelinedShapeModification anAddModification) {
- Object parent = anAddModification.getParent();
-
- if (parent instanceof IPackageFragmentRoot) {
- IPackageFragmentRoot sourceFolder = (IPackageFragmentRoot) parent;
- if (JavaEEProjectUtilities.isDynamicWebProject(sourceFolder.getJavaProject().getProject())) {
- CompressedJavaProject compressedNode = getCompressedNode(sourceFolder.getJavaProject().getProject());
- if(compressedNode.isFlatteningSourceFolder()) {
- anAddModification.setParent(compressedNode);
- }
- }
- }
-
- return anAddModification;
- }
-
-
- public PipelinedShapeModification interceptRemove(PipelinedShapeModification aRemoveModification) {
-
- Object parent = aRemoveModification.getParent();
-
- Set children = aRemoveModification.getChildren();
-
- for (Object child : children) {
- if (child instanceof IFolder){
- try {
- IPackageFragment locatePackageFragment = locatePackageFragment((IFolder)child);
- if(locatePackageFragment != null){
- aRemoveModification.getChildren().remove(child);
- aRemoveModification.getChildren().add(locatePackageFragment);
-
- return aRemoveModification;
- }
- } catch (JavaModelException e) {
- }
- }
- }
-
- if (parent instanceof IPackageFragmentRoot) {
- IPackageFragmentRoot sourceFolder = (IPackageFragmentRoot) parent;
- if (JavaEEProjectUtilities.isDynamicWebProject(sourceFolder.getJavaProject().getProject())) {
- CompressedJavaProject compressedNode = getCompressedNode(sourceFolder.getJavaProject().getProject());
- if(compressedNode.isFlatteningSourceFolder()) {
- aRemoveModification.setParent(compressedNode);
- }
- }
-
- }
-
- return aRemoveModification;
- }
-
- private IPackageFragment locatePackageFragment(IFolder child) throws JavaModelException {
- IJavaElement elem = JavaCore.create(child);
- if (elem instanceof IPackageFragment) {
- IPackageFragment packageFragment = (IPackageFragment)elem;
- for (IJavaElement javaElem = packageFragment ; javaElem != null ; javaElem = javaElem.getParent()) {
- if (javaElem instanceof IPackageFragmentRoot) {
- IPackageFragmentRoot fragmentRoot = (IPackageFragmentRoot)javaElem;
- if (!fragmentRoot.isReadOnly() && !fragmentRoot.isExternal()) {
- return packageFragment;
- }
- }
- }
- }
- return null;
- }
-
- public boolean interceptRefresh(PipelinedViewerUpdate aRefreshSynchronization) {
-
- Set refreshTargets = aRefreshSynchronization.getRefreshTargets();
- for (Iterator iter = refreshTargets.iterator(); iter.hasNext();) {
- Object refreshTarget = iter.next();
- if (refreshTarget instanceof IPackageFragmentRoot) {
- IPackageFragmentRoot sourceFolder = (IPackageFragmentRoot) refreshTarget;
- if (JavaEEProjectUtilities.isDynamicWebProject(sourceFolder.getJavaProject().getProject())) {
- CompressedJavaProject compressedNode = getCompressedNode(sourceFolder.getJavaProject().getProject());
- if(compressedNode.isFlatteningSourceFolder()) {
- iter.remove(); // voids the iter but is okay because we're done with it
- refreshTargets.add(compressedNode);
- return true;
- }
- }
-
- }
- }
-
- return false;
- }
-
-
- public boolean interceptUpdate(PipelinedViewerUpdate anUpdateSynchronization) {
- Set refreshTargets = anUpdateSynchronization.getRefreshTargets();
- for (Iterator iter = refreshTargets.iterator(); iter.hasNext();) {
- Object refreshTarget = iter.next();
- if (refreshTarget instanceof IPackageFragmentRoot) {
- IPackageFragmentRoot sourceFolder = (IPackageFragmentRoot) refreshTarget;
- if (sourceFolder.getJavaProject()!=null && sourceFolder.getJavaProject().exists() && sourceFolder.getJavaProject().isOpen() && JavaEEProjectUtilities.isDynamicWebProject(sourceFolder.getJavaProject().getProject())) {
- CompressedJavaProject compressedNode = getCompressedNode(sourceFolder.getJavaProject().getProject());
- if(compressedNode.isFlatteningSourceFolder()) {
- iter.remove(); // voids the iterator; but is okay because we're done with it
- refreshTargets.add(compressedNode);
- return true;
- }
- }
- }
- }
-
- return false;
- }
-
- public void init(ICommonContentExtensionSite aSite) {
- }
-
- public Object[] getChildren(Object parentElement) {
- if (delegateContentProvider != null) {
- if (parentElement instanceof CompressedJavaProject) {
- return ((CompressedJavaProject)parentElement).getChildren(delegateContentProvider);
- } else if (parentElement instanceof CompressedJavaLibraries) {
- return ((CompressedJavaLibraries)parentElement).getChildren(delegateContentProvider);
- }
- }
- return NO_CHILDREN;
- }
-
- public Object getParent(Object element) {
- if (element instanceof CompressedJavaProject)
- return ((CompressedJavaProject) element).getProject();
- if (element instanceof CompressedJavaLibraries)
- return ((CompressedJavaLibraries) element).getCompressedProject();
- return null;
- }
-
- public boolean hasChildren(Object element) {
- return (element instanceof CompressedJavaProject || element instanceof CompressedJavaLibraries);
- }
-
- public Object[] getElements(Object inputElement) {
- return NO_CHILDREN;
- }
-
- public void dispose() {
- compressedNodes.clear();
- }
-
- public void inputChanged(Viewer viewer, Object oldInput, Object newInput) {
- if (viewer instanceof CommonViewer) {
- commonViewer = (CommonViewer) viewer;
- INavigatorContentService service = commonViewer.getNavigatorContentService();
- INavigatorContentExtension javaext = service.getContentExtensionById(JAVA_EXTENSION_ID);
- if (javaext != null)
- delegateContentProvider = javaext.getContentProvider();
- compressedNodes.clear();
- }
-
- }
-
- public void restoreState(IMemento aMemento) {
-
- }
-
- public void saveState(IMemento aMemento) {
-
- }
-
- public boolean isClasspathContainer(Object o) {
- return INTERNAL_CONTAINER_CLASS != null && INTERNAL_CONTAINER_CLASS.isInstance(o);
- }
-
-}
diff --git a/plugins/org.eclipse.jst.servlet.ui/servlet_ui/org/eclipse/jst/servlet/ui/internal/navigator/WebJavaLabelProvider.java b/plugins/org.eclipse.jst.servlet.ui/servlet_ui/org/eclipse/jst/servlet/ui/internal/navigator/WebJavaLabelProvider.java
deleted file mode 100644
index f87ed5d..0000000
--- a/plugins/org.eclipse.jst.servlet.ui/servlet_ui/org/eclipse/jst/servlet/ui/internal/navigator/WebJavaLabelProvider.java
+++ /dev/null
@@ -1,64 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2003, 2006 IBM Corporation and others.
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
- *
- * Contributors:
- * IBM Corporation - initial API and implementation
- *******************************************************************************/
-package org.eclipse.jst.servlet.ui.internal.navigator;
-
-import org.eclipse.jdt.core.IJavaElement;
-import org.eclipse.jdt.ui.ProblemsLabelDecorator;
-import org.eclipse.jface.viewers.ILabelDecorator;
-import org.eclipse.jface.viewers.ILabelProvider;
-import org.eclipse.jface.viewers.ILabelProviderListener;
-import org.eclipse.swt.graphics.Image;
-
-public class WebJavaLabelProvider implements ILabelProvider {
-
- private ILabelDecorator decorator = new ProblemsLabelDecorator();
-
- public Image getImage(Object element) {
- Image image = null;
- if(element instanceof ICompressedNode)
- image = ((ICompressedNode)element).getImage();
-
- IJavaElement javaElement = null;
- if(image != null && ( javaElement = ((ICompressedNode)element).getJavaElement()) != null ) {
- image = decorator.decorateImage(image, javaElement);
- }
- return image;
- }
-
- public String getText(Object element) {
- String text = null;
- if(element instanceof ICompressedNode)
- text = ((ICompressedNode)element).getLabel();
-
- IJavaElement javaElement = null;
- if(text != null && ( javaElement = ((ICompressedNode)element).getJavaElement()) != null ) {
- text = decorator.decorateText(text, javaElement);
- }
- return text;
- }
-
- public void addListener(ILabelProviderListener listener) {
-
- }
-
- public void dispose() {
- decorator.dispose();
- }
-
- public boolean isLabelProperty(Object element, String property) {
- return false;
- }
-
- public void removeListener(ILabelProviderListener listener) {
-
- }
-
-}
diff --git a/plugins/org.eclipse.jst.servlet.ui/servlet_ui/org/eclipse/jst/servlet/ui/internal/plugin/ServletUIPlugin.java b/plugins/org.eclipse.jst.servlet.ui/servlet_ui/org/eclipse/jst/servlet/ui/internal/plugin/ServletUIPlugin.java
deleted file mode 100644
index bae2970..0000000
--- a/plugins/org.eclipse.jst.servlet.ui/servlet_ui/org/eclipse/jst/servlet/ui/internal/plugin/ServletUIPlugin.java
+++ /dev/null
@@ -1,86 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2003, 2006 IBM Corporation and others.
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
- *
- * Contributors:
- * IBM Corporation - initial API and implementation
- *******************************************************************************/
-package org.eclipse.jst.servlet.ui.internal.plugin;
-
-import org.eclipse.core.resources.IWorkspace;
-import org.eclipse.core.resources.ResourcesPlugin;
-import org.eclipse.core.runtime.IStatus;
-import org.eclipse.core.runtime.Status;
-import org.eclipse.ui.plugin.AbstractUIPlugin;
-import org.eclipse.core.runtime.Platform;
-import java.lang.Throwable;
-import org.eclipse.core.runtime.CoreException;
-
-/**
- * @author jlanuti
- *
- */
-public class ServletUIPlugin extends AbstractUIPlugin {
-
- public static final String PLUGIN_ID = "org.eclipse.jst.servlet.ui"; //$NON-NLS-1$
- // The shared instance.
- private static ServletUIPlugin plugin;
-
- /**
- * The constructor.
- */
- public ServletUIPlugin() {
- super();
- plugin = this;
- }
-
-
- /**
- * Returns the shared instance.
- */
- public static ServletUIPlugin getDefault() {
- return plugin;
- }
-
- /**
- * Returns the workspace instance.
- */
- public static IWorkspace getWorkspace() {
- return ResourcesPlugin.getWorkspace();
- }
-
- public static void log( final Exception e )
- {
- final String msg = e.getMessage() + ""; //$NON-NLS-1$
- log( new Status( IStatus.ERROR, PLUGIN_ID, IStatus.OK, msg, e ) );
- }
-
- public static void log( final IStatus status )
- {
- getDefault().getLog().log( status );
- }
-
-
- public static IStatus createStatus(int severity, String message, Throwable exception) {
- return new Status(severity, PLUGIN_ID, message, exception);
- }
-
-
- public static IStatus createStatus(int severity, String message) {
- return createStatus(severity, message, null);
- }
-
-
- public static void logError(Throwable exception) {
- Platform.getLog(Platform.getBundle(PLUGIN_ID)).log( createStatus(IStatus.ERROR, exception.getMessage(), exception));
- }
-
-
- public static void logError(CoreException exception) {
- Platform.getLog(Platform.getBundle(PLUGIN_ID)).log( exception.getStatus() );
- }
-
-}
diff --git a/plugins/org.eclipse.jst.servlet.ui/servlet_ui/org/eclipse/jst/servlet/ui/internal/plugin/WEBUIMessages.java b/plugins/org.eclipse.jst.servlet.ui/servlet_ui/org/eclipse/jst/servlet/ui/internal/plugin/WEBUIMessages.java
deleted file mode 100644
index 11626e3..0000000
--- a/plugins/org.eclipse.jst.servlet.ui/servlet_ui/org/eclipse/jst/servlet/ui/internal/plugin/WEBUIMessages.java
+++ /dev/null
@@ -1,184 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2003, 2006 IBM Corporation and others.
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
- *
- * Contributors:
- * IBM Corporation - initial API and implementation
- *******************************************************************************/
-package org.eclipse.jst.servlet.ui.internal.plugin;
-
-import org.eclipse.osgi.util.NLS;
-
-
-public class WEBUIMessages extends NLS {
-
- private static final String BUNDLE_NAME = "web_ui";//$NON-NLS-1$
-
- private WEBUIMessages() {
- // Do not instantiate
- }
-
- public static String NEW_SERVLET_WIZARD_PAGE_TITLE;
- public static String FOLDER_LABEL;
- public static String URL_MAPPINGS_TITLE;
- public static String URL_MAPPINGS_LABEL;
- public static String SERVLET_MAPPINGS_LABEL;
- public static String FILTER_MAPPINGS_LABEL;
- public static String URL_SERVLET_LABEL;
- public static String DISPATCHERS_LABEL;
- public static String JAVA_CLASS_MODIFIERS_LABEL;
- public static String SUPERCLASS_LABEL;
- public static String WEB_CONT_PAGE_TITLE;
- public static String SERVLET_PACKAGE_LABEL;
- public static String PACKAGE_SELECTION_DIALOG_MSG_NONE;
- public static String JAVA_CLASS_ABSTRACT_CHECKBOX_LABEL;
- public static String ADD_SERVLET_WIZARD_WINDOW_TITLE;
- public static String ADD_SERVLET_WIZARD_PAGE_TITLE;
- public static String ADD_FILTER_WIZARD_WINDOW_TITLE;
- public static String ADD_FILTER_WIZARD_PAGE_TITLE;
- public static String JAVA_CLASS_MAIN_CHECKBOX_LABEL;
- public static String EMPTY_LIST_MSG;
- public static String ExportWARAction_UI_;
- public static String NO_WEB_PROJECTS;
- public static String INTERFACE_SELECTION_DIALOG_MSG_NONE;
- public static String SUPERCLASS_SELECTION_DIALOG_TITLE;
- public static String PACKAGE_SELECTION_DIALOG_DESC;
- public static String JAVA_CLASS_BROWER_DIALOG_TITLE;
- public static String CONTAINER_SELECTION_DIALOG_DESC;
- public static String NEW_JAVA_CLASS_DESTINATION_WIZARD_PAGE_DESC;
- public static String JAVA_CLASS_PUBLIC_CHECKBOX_LABEL;
- public static String URL_PATTERN_LABEL;
- public static String CONTAINER_SELECTION_DIALOG_TITLE;
- public static String WEB_CONT_NAME;
- public static String URL_PATTERN_TITLE;
- public static String CONTAINER_SELECTION_DIALOG_VALIDATOR_MESG;
- public static String DESCRIPTION_TITLE;
- public static String DESCRIPTION_LABEL;
- public static String USE_EXISTING_SERVLET_CLASS;
- public static String USE_EXISTING_FILTER_CLASS;
- public static String USE_EXISTING_LISTENER_CLASS;
- public static String JAVA_CLASS_FINAL_CHECKBOX_LABEL;
- public static String INTERFACE_SELECTION_DIALOG_DESC;
- public static String ADD_LABEL;
- public static String ADD_SERVLET_WIZARD_PAGE_DESC;
- public static String ADD_FILTER_WIZARD_PAGE_DESC;
- public static String SELECT_CLASS_TITLE;
- public static String JAVA_CLASS_BROWER_DIALOG_MESSAGE;
- public static String ImportWARAction_UI_;
- public static String _9;
- public static String JAVA_CLASS_METHOD_STUBS_LABEL;
- public static String _8;
- public static String JAVA_CLASS_CONSTRUCTOR_CHECKBOX_LABEL;
- public static String _7;
- public static String SERVLETS;
- public static String _6;
- public static String DEFAULT_PACKAGE;
- public static String _5;
- public static String MAP_CLASS_NAME_TO_CLASS_ERROR_MSG;
- public static String BROWSE_BUTTON_LABEL;
- public static String _4;
- public static String REMOVE_BUTTON;
- public static String _3;
- public static String _2;
- public static String _1;
- public static String INIT_PARAM_TITLE;
- public static String INIT_PARAM_LABEL;
- public static String SERVLET_NAME_LABEL;
- public static String _0;
- public static String CLASS_NAME_LABEL;
- public static String _17;
- public static String _16;
- public static String JAVA_PACKAGE_LABEL;
- public static String _15;
- public static String _14;
- public static String _13;
- public static String PACKAGE_SELECTION_DIALOG_TITLE;
- public static String _12;
- public static String ADD_BUTTON_LABEL;
- public static String ADD_BUTTON_LABEL_A;
- public static String ADD_BUTTON_LABEL_D;
- public static String EDIT_BUTTON_LABEL;
- public static String EDIT_BUTTON_LABEL_E;
- public static String EDIT_BUTTON_LABEL_T;
- public static String _11;
- public static String _10;
- public static String SUPERCLASS_SELECTION_DIALOG_DESC;
- public static String NEW_JAVA_CLASS_OPTIONS_WIZARD_PAGE_DESC;
- public static String REMOVE_BUTTON_LABEL;
- public static String REMOVE_BUTTON_LABEL_R;
- public static String REMOVE_BUTTON_LABEL_V;
- public static String NEW_SERVLET_WIZARD_WINDOW_TITLE;
- public static String NEW_FILTER_WIZARD_WINDOW_TITLE;
- public static String INTERFACE_SELECTION_DIALOG_TITLE;
- public static String NAME_TITLE;
- public static String NAME_LABEL;
- public static String VALUE_TITLE;
- public static String VALUE_LABEL;
- public static String WEB_CONT_PAGE_COMP_LABEL;
- public static String CHOOSE_SERVLET_CLASS;
- public static String CHOOSE_FILTER_CLASS;
- public static String NEW_SERVLET_WIZARD_PAGE_DESC;
- public static String JAVA_CLASS_INHERIT_CHECKBOX_LABEL;
- public static String WEB_CONT_PAGE_DESCRIPTION;
- public static String JAVA_CLASS_INTERFACES_LABEL;
- public static String WEBCONTENT;
- public static String SELECT_ALL_BUTTON;
- public static String CLEAR_BUTTON;
-
- public static String Compressed_Libraries;
- public static String Compressed_JavaResources;
-
- public static String ConvertToWebTitle;
- public static String SelectWebVersion;
-
- public static String ADD_LISTENER_WIZARD_WINDOW_TITLE;
- public static String ADD_LISTENER_WIZARD_PAGE_TITLE;
- public static String ADD_LISTENER_WIZARD_PAGE_DESC;
- public static String ADD_LISTENER_WIZARD_SERVLET_CONTEXT_EVENTS;
- public static String ADD_LISTENER_WIZARD_HTTP_SESSION_EVENTS;
- public static String ADD_LISTENER_WIZARD_SERVLET_REQUEST_EVENTS;
- public static String ADD_LISTENER_WIZARD_LIFECYCLE;
- public static String ADD_LISTENER_WIZARD_LIFECYCLE_L;
- public static String ADD_LISTENER_WIZARD_LIFECYCLE_I;
- public static String ADD_LISTENER_WIZARD_LIFECYCLE_Y;
- public static String ADD_LISTENER_WIZARD_CHANGES_TO_ATTRIBUTES;
- public static String ADD_LISTENER_WIZARD_CHANGES_TO_ATTRIBUTES_C;
- public static String ADD_LISTENER_WIZARD_CHANGES_TO_ATTRIBUTES_H;
- public static String ADD_LISTENER_WIZARD_CHANGES_TO_ATTRIBUTES_G;
- public static String ADD_LISTENER_WIZARD_SESSION_MIGRATION;
- public static String ADD_LISTENER_WIZARD_OBJECT_BINDING;
-
- public static String DISPATCHER_REQUEST;
- public static String DISPATCHER_FORWARD;
- public static String DISPATCHER_INCLUDE;
- public static String DISPATCHER_ERROR;
- public static String _18;
-
- static {
- NLS.initializeMessages(BUNDLE_NAME, WEBUIMessages.class);
- }
-
- public static final String IMAGE_LOAD_ERROR = _0;
- public static final String WEB_MODULE_WIZ_TITLE = _1;
- public static final String WEB_VERSION_LBL = _2;
- public static final String WEB_PROJECT_MAIN_PG_TITLE = _3;
- public static final String WEB_PROJECT_MAIN_PG_DESC = _4;
- public static final String WEB_PROJECT_LBL = _5;
- public static final String WEB_FILE_LBL = _6;
- public static final String WEB_IMPORT_MAIN_PG_DESC = _7;
- public static final String WEB_IMPORT_MAIN_PG_TITLE = _8;
- public static final String WEB_EXPORT_MAIN_PG_TITLE = _9;
- public static final String WEB_EXPORT_MAIN_PG_DESC = _10;
- public static final String WEB_IMPORT_CONTEXT_ROOT = _11;
- public static final String WEB_CONVERT_MAIN_PG_DESC = _12;
- public static final String WEB_CONVERT_MAIN_PG_TITLE = _13;
- public static final String WEB_IMPORT_WEB_LIB_PG_TITLE = _14;
- public static final String WEB_IMPORT_WEB_LIB_PG_DESC = _15;
- public static final String WAR_IMPORT_SELECT_ALL_LIBS_BUTTON = _16;
- public static final String WAR_IMPORT_DESELECT_ALL_LIBS_BUTTON = _17;
- public static final String WEBFRAGMENT_MODULE_WIZ_TITLE = _18;
-
-}
diff --git a/plugins/org.eclipse.jst.servlet.ui/servlet_ui/org/eclipse/jst/servlet/ui/internal/wizard/AddEditFilterMappingDialog.java b/plugins/org.eclipse.jst.servlet.ui/servlet_ui/org/eclipse/jst/servlet/ui/internal/wizard/AddEditFilterMappingDialog.java
deleted file mode 100644
index 8ff4e39..0000000
--- a/plugins/org.eclipse.jst.servlet.ui/servlet_ui/org/eclipse/jst/servlet/ui/internal/wizard/AddEditFilterMappingDialog.java
+++ /dev/null
@@ -1,617 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2007, 2008 SAP AG and others.
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
- *
- * Contributors:
- * Kaloyan Raev, kaloyan.raev@sap.com - initial API and implementation
- *******************************************************************************/
-package org.eclipse.jst.servlet.ui.internal.wizard;
-
-import static org.eclipse.jst.servlet.ui.internal.wizard.IWebWizardConstants.ERROR;
-import static org.eclipse.jst.servlet.ui.internal.wizard.IWebWizardConstants.FORWARD;
-import static org.eclipse.jst.servlet.ui.internal.wizard.IWebWizardConstants.INCLUDE;
-import static org.eclipse.jst.servlet.ui.internal.wizard.IWebWizardConstants.REQUEST;
-import static org.eclipse.jst.servlet.ui.internal.wizard.IWebWizardConstants.URL_PATTERN_LABEL;
-
-import java.net.URL;
-import java.util.ArrayList;
-import java.util.Iterator;
-import java.util.List;
-
-import org.eclipse.core.resources.IProject;
-import org.eclipse.core.runtime.Status;
-import org.eclipse.jface.dialogs.IDialogConstants;
-import org.eclipse.jface.operation.IRunnableContext;
-import org.eclipse.jface.resource.ImageDescriptor;
-import org.eclipse.jface.viewers.ILabelProvider;
-import org.eclipse.jface.viewers.LabelProvider;
-import org.eclipse.jst.j2ee.internal.dialogs.TwoArrayQuickSorter;
-import org.eclipse.jst.j2ee.internal.web.operations.FilterMappingItem;
-import org.eclipse.jst.j2ee.internal.web.operations.IFilterMappingItem;
-import org.eclipse.jst.j2ee.internal.web.plugin.WebPlugin;
-import org.eclipse.jst.j2ee.internal.web.providers.WebAppEditResourceHandler;
-import org.eclipse.jst.j2ee.model.IModelProvider;
-import org.eclipse.jst.j2ee.model.ModelProviderManager;
-import org.eclipse.jst.j2ee.webapplication.Servlet;
-import org.eclipse.jst.servlet.ui.internal.plugin.ServletUIPlugin;
-import org.eclipse.swt.SWT;
-import org.eclipse.swt.events.DisposeEvent;
-import org.eclipse.swt.events.DisposeListener;
-import org.eclipse.swt.events.SelectionEvent;
-import org.eclipse.swt.events.SelectionListener;
-import org.eclipse.swt.graphics.Image;
-import org.eclipse.swt.layout.GridData;
-import org.eclipse.swt.layout.GridLayout;
-import org.eclipse.swt.widgets.Button;
-import org.eclipse.swt.widgets.Composite;
-import org.eclipse.swt.widgets.Control;
-import org.eclipse.swt.widgets.Event;
-import org.eclipse.swt.widgets.Group;
-import org.eclipse.swt.widgets.Label;
-import org.eclipse.swt.widgets.Listener;
-import org.eclipse.swt.widgets.Shell;
-import org.eclipse.swt.widgets.Table;
-import org.eclipse.swt.widgets.TableItem;
-import org.eclipse.swt.widgets.Text;
-import org.eclipse.ui.PlatformUI;
-import org.eclipse.ui.dialogs.SelectionStatusDialog;
-import org.eclipse.ui.internal.layout.CellLayout;
-import org.eclipse.ui.part.PageBook;
-
-/**
- * Insert the type's description here.
- * Creation date: (7/30/2001 11:16:36 AM)
- */
-public class AddEditFilterMappingDialog extends SelectionStatusDialog implements SelectionListener {
-
- private static class TypeRenderer extends LabelProvider {
- private final Image SERVLET_ICON =
- ImageDescriptor.createFromURL((URL) WebPlugin.getDefault().getImage("servlet")).createImage(); //$NON-NLS-1$
-
- @Override
- public String getText(Object element) {
- return ((String) element);
- }
-
- @Override
- public Image getImage(Object element) {
- return SERVLET_ICON;
- }
-
- }
-
- public final static int SERVLET = 0;
- public final static int URL_PATTERN = 1;
- protected Button fServletButton;
- protected Button fURLPatternButton;
- protected int fSelection = -1;
- protected PageBook fPageBook = null;
- protected Control fURLPatternControl = null;
- protected Control fServletControl = null;
- protected Composite fChild = null;
- // construction parameters
- protected IRunnableContext fRunnableContext;
- protected ILabelProvider fElementRenderer;
- private Object[] fElements;
- private boolean fIgnoreCase = true;
- private String fUpperListLabel;
-
- // SWT widgets
- private Table fUpperList;
- protected Text fURLText;
- private String[] fServletNames;
- private String[] fRenderedStrings;
- private int dispatchers;
- private Button fRequest;
- private Button fForward;
- private Button fInclude;
- private Button fErorr;
- private IFilterMappingItem selectedItem;
-
- /**
- * MultiSelectFilteredFileSelectionDialog constructor comment.
- * @param parent Shell
- * @param title String
- * @param message String
- * @parent extensions String[]
- * @param allowMultiple boolean
- */
- public AddEditFilterMappingDialog(Shell parent, String title, IProject project,
- List<IFilterMappingItem> elements, IFilterMappingItem item) {
- super(parent);
- selectedItem = item;
- setShellStyle(SWT.DIALOG_TRIM | SWT.APPLICATION_MODAL | SWT.RESIZE);
-
- if (title == null)
- setTitle(WebAppEditResourceHandler.getString("File_Selection_UI_")); //$NON-NLS-1$
- else setTitle(title);
-
- Status currStatus = new Status(Status.OK, ServletUIPlugin.PLUGIN_ID, Status.OK, "", null); //$NON-NLS-1$
-
- updateStatus(currStatus);
- fElementRenderer = new TypeRenderer();
- fRunnableContext = ServletUIPlugin.getDefault().getWorkbench().getActiveWorkbenchWindow();
- try {
- IModelProvider provider = ModelProviderManager.getModelProvider(project);
- Object mObj = provider.getModelObject();
- ArrayList<String> servletsList = new ArrayList<String>();
- if (mObj instanceof org.eclipse.jst.j2ee.webapplication.WebApp) {
- org.eclipse.jst.j2ee.webapplication.WebApp webApp = (org.eclipse.jst.j2ee.webapplication.WebApp) mObj;
- List<Servlet> servlets = webApp.getServlets();
- for (Servlet servlet : servlets) {
- String servletName = servlet.getServletName();
- if (!servletName.equals(item != null ? item.getName() : null) &&
- isAlreadyAdded(servletName, elements)) continue;
- servletsList.add(servletName);
- }
- } else if (mObj instanceof org.eclipse.jst.javaee.web.WebApp) {
- org.eclipse.jst.javaee.web.WebApp webApp= (org.eclipse.jst.javaee.web.WebApp) mObj;
- List<org.eclipse.jst.javaee.web.Servlet> servlets = webApp.getServlets();
- for (org.eclipse.jst.javaee.web.Servlet servlet : servlets) {
- String servletName = servlet.getServletName();
- if (!servletName.equals(item != null ? item.getName() : null) &&
- isAlreadyAdded(servletName, elements)) continue;
- servletsList.add(servletName);
- }
- }
-
- fServletNames = servletsList.toArray(new String[servletsList.size()]);
- servletsList = null;
- } catch (Exception e) {
- ServletUIPlugin.log(e);
- }
- }
-
- private boolean isAlreadyAdded(String servlet, List<IFilterMappingItem> elements) {
- for (Iterator iterator = elements.iterator(); iterator.hasNext();) {
- IFilterMappingItem item = (IFilterMappingItem) iterator.next();
- if (item.isServletNameType() && item.getName().equals(servlet))
- return true;
- }
- return false;
- }
-
- /**
- * @private
- */
- @Override
- protected void computeResult() {
- if (fSelection == URL_PATTERN) {
- java.util.List result = new ArrayList(1);
- dispatchers = getDispatchers();
- FilterMappingItem mappingItem =
- new FilterMappingItem(FilterMappingItem.URL_PATTERN, fURLText.getText().trim(),
- dispatchers);
- result.add(mappingItem);
- setResult(result);
- } else {
- String servletName = (String) getWidgetSelection();
- if (servletName == null) {
-// String title = WebAppEditResourceHandler.getString("Select_Class_UI_"); //$NON-NLS-1$ = "Select Class"
-// String message = WebAppEditResourceHandler.getString("Could_not_uniquely_map_the_ERROR_"); //$NON-NLS-1$ = "Could not uniquely map the class name to a class."
-// MessageDialog.openError(getShell(), title, message);
- setResult(null);
- } else {
- dispatchers = getDispatchers();
- java.util.List result = new ArrayList(1);
- FilterMappingItem mappingItem =
- new FilterMappingItem(FilterMappingItem.SERVLET_NAME, servletName, dispatchers);
- result.add(mappingItem);
- setResult(result);
- }
- }
- }
-
- private int getDispatchers() {
- int dispatchers = 0;
- if (fRequest.getSelection()) {
- dispatchers |= IFilterMappingItem.REQUEST;
- }
- if (fForward.getSelection()) {
- dispatchers |= IFilterMappingItem.FORWARD;
- }
- if (fInclude.getSelection()) {
- dispatchers |= IFilterMappingItem.INCLUDE;
- }
- if (fErorr.getSelection()) {
- dispatchers |= IFilterMappingItem.ERROR;
- }
- return dispatchers;
- }
-
- @Override
- public void create() {
- super.create();
- if (selectedItem == null && (fServletNames != null && fServletNames.length > 0)) fSelection = SERVLET;
- updateOkState();
- }
-
- /**
- * Creates and returns the contents of this dialog's
- * button bar.
- * <p>
- * The <code>Dialog</code> implementation of this framework method
- * lays out a button bar and calls the <code>createButtonsForButtonBar</code>
- * framework method to populate it. Subclasses may override.
- * </p>
- *
- * @param parent the parent composite to contain the button bar
- * @return the button bar control
- */
- @Override
- protected Control createButtonBar(Composite parent) {
- Composite composite = new Composite(parent, SWT.NULL);
- GridLayout layout = new GridLayout();
-
- layout.numColumns = 2;
-
- layout.marginHeight = 0;
- layout.marginWidth = 0;
- composite.setLayout(layout);
- composite.setLayoutData(new GridData(GridData.FILL_HORIZONTAL));
-
- Composite composite2 = new Composite(composite, SWT.NONE);
-
- // create a layout with spacing and margins appropriate for the font size.
- layout = new GridLayout();
- layout.numColumns = 0; // this is incremented by createButton
- layout.makeColumnsEqualWidth = true;
- layout.marginWidth = convertHorizontalDLUsToPixels(org.eclipse.jface.dialogs.IDialogConstants.HORIZONTAL_MARGIN);
- layout.marginHeight = convertVerticalDLUsToPixels(org.eclipse.jface.dialogs.IDialogConstants.VERTICAL_MARGIN);
- layout.horizontalSpacing = convertHorizontalDLUsToPixels(org.eclipse.jface.dialogs.IDialogConstants.HORIZONTAL_SPACING);
- layout.verticalSpacing = convertVerticalDLUsToPixels(org.eclipse.jface.dialogs.IDialogConstants.VERTICAL_SPACING);
-
- composite2.setLayout(layout);
-
- GridData data = new GridData(GridData.HORIZONTAL_ALIGN_END | GridData.VERTICAL_ALIGN_CENTER);
- composite2.setLayoutData(data);
-
- composite2.setFont(parent.getFont());
-
- // Add the buttons to the button bar.
- super.createButtonsForButtonBar(composite2);
-
- return composite;
- }
-
- /*
- * @private
- */
- @Override
- protected Control createDialogArea(Composite parent) {
- GridData gd = new GridData();
-
- fChild = new Composite(parent, SWT.NONE);
- PlatformUI.getWorkbench().getHelpSystem().setHelp(fChild, "com.ibm.etools.webapplicationedit.webx2010"); //$NON-NLS-1$
- GridLayout gl = new GridLayout();
- gl.numColumns = 2;
- gl.marginHeight = 0;
- fChild.setLayout(gl);
-
- gd.verticalAlignment = GridData.FILL;
- gd.grabExcessVerticalSpace = true;
- fChild.setLayoutData(gd);
-
- // Create the Web Type radio buttons and text fields.
- fServletButton = new Button(fChild, SWT.RADIO);
- fServletButton.setText(WebAppEditResourceHandler.getString("Servlet_UI_")); //$NON-NLS-1$ = Servlet
- gd = new GridData();
- fServletButton.setLayoutData(gd);
- fServletButton.addSelectionListener(this);
-
- fURLPatternButton = new Button(fChild, SWT.RADIO);
- fURLPatternButton.setText(WebAppEditResourceHandler.getString("URL_pattern_UI_")); //$NON-NLS-1$
- gd = new GridData();
- fURLPatternButton.setLayoutData(gd);
- fURLPatternButton.addSelectionListener(this);
-
- //Create URL Pattern page
- fPageBook = new PageBook(fChild, SWT.NONE);
- gd = new GridData();
- gd.horizontalAlignment = GridData.FILL;
- gd.verticalAlignment = GridData.FILL;
- gd.grabExcessHorizontalSpace = true;
- gd.grabExcessVerticalSpace = true;
- gd.horizontalSpan = 2;
- fPageBook.setLayoutData(gd);
-
- Composite composite = new Composite(fPageBook, SWT.NONE);
- GridLayout layout = new GridLayout();
- layout.marginHeight = convertVerticalDLUsToPixels(IDialogConstants.VERTICAL_MARGIN);
- layout.marginWidth = convertHorizontalDLUsToPixels(IDialogConstants.HORIZONTAL_MARGIN);
- layout.verticalSpacing = convertVerticalDLUsToPixels(IDialogConstants.VERTICAL_SPACING);
- layout.horizontalSpacing = convertHorizontalDLUsToPixels(IDialogConstants.HORIZONTAL_SPACING);
- composite.setLayout(layout);
- composite.setLayoutData(new GridData(GridData.FILL_BOTH));
- composite.setFont(parent.getFont());
-
- Label messageLabel = new Label(composite, SWT.NONE);
- gd = new GridData();
- messageLabel.setLayoutData(gd);
- messageLabel.setText(URL_PATTERN_LABEL);
-
- fURLText = new Text(composite, SWT.BORDER);
- GridData spec = new GridData();
- spec.grabExcessVerticalSpace = false;
- spec.grabExcessHorizontalSpace = true;
- spec.horizontalAlignment = GridData.FILL;
- spec.verticalAlignment = GridData.BEGINNING;
- fURLText.setLayoutData(spec);
- Listener l = new Listener() {
- public void handleEvent(Event evt) {
- updateOkState();
- }
- };
- fURLText.addListener(SWT.Modify, l);
- fURLPatternControl = composite;
-
- //Create Servlet page
- composite = new Composite(fPageBook, SWT.NONE);
- layout = new GridLayout();
- layout.marginHeight = convertVerticalDLUsToPixels(IDialogConstants.VERTICAL_MARGIN);
- layout.marginWidth = convertHorizontalDLUsToPixels(IDialogConstants.HORIZONTAL_MARGIN);
- layout.verticalSpacing = convertVerticalDLUsToPixels(IDialogConstants.VERTICAL_SPACING);
- layout.horizontalSpacing = convertHorizontalDLUsToPixels(IDialogConstants.HORIZONTAL_SPACING);
- composite.setLayout(layout);
- composite.setLayoutData(new GridData(GridData.FILL_BOTH));
- composite.setFont(parent.getFont());
-
- messageLabel = new Label(composite, SWT.NONE);
- gd = new GridData();
- messageLabel.setLayoutData(gd);
- messageLabel.setText(WebAppEditResourceHandler.getString("Choose_a_servlet__1")); //$NON-NLS-1$
-
- fUpperList = createUpperList(composite);
-
- fServletControl = composite;
-
- //Create Dispatchers control
- Group dispatchers = new Group(fChild, SWT.SHADOW_IN);
- dispatchers.setText(WebAppEditResourceHandler.getString("Select_Dispatchers_UI_")); //$NON-NLS-1$
- dispatchers.setLayout(new CellLayout(2).setMargins(10,10).setSpacing(5,5));
- GridData gridData = new GridData(GridData.FILL_HORIZONTAL | GridData.GRAB_HORIZONTAL);
- gridData.horizontalSpan = 2;
- dispatchers.setLayoutData(gridData);
- fRequest = new Button(dispatchers, SWT.CHECK);
- fRequest.setText(REQUEST);
- fForward = new Button(dispatchers, SWT.CHECK);
- fForward.setText(FORWARD);
- fInclude = new Button(dispatchers, SWT.CHECK);
- fInclude.setText(INCLUDE);
- fErorr = new Button(dispatchers, SWT.CHECK);
- fErorr.setText(ERROR);
-
- if (selectedItem != null) {
- if (selectedItem.isUrlPatternType()) {
- fSelection = URL_PATTERN;
- } else {
- fSelection = SERVLET;
- }
- } else {
- if (fServletNames == null || fServletNames.length == 0) {
- fSelection = URL_PATTERN;
- }
- }
- updateUpperListWidget();
-
- fServletButton.setEnabled(true);
- if (fSelection == URL_PATTERN) {
- fURLPatternButton.setSelection(true);
- fPageBook.showPage(fURLPatternControl);
- fServletButton.setSelection(false);
- if (fServletNames == null || fServletNames.length == 0) {
- fServletButton.setEnabled(false);
- }
- if (selectedItem != null) {
- fURLText.setText(selectedItem.getName());
- setDispatchers(selectedItem.getDispatchers());
- }
- } else {
- fServletButton.setSelection(true);
- fPageBook.showPage(fServletControl);
- if (selectedItem != null) {
- fUpperList.setSelection(getServletIndex(fUpperList, selectedItem.getName()));
- setDispatchers(selectedItem.getDispatchers());
- }
- }
- updateOkState();
- return parent;
- }
-
- private int getServletIndex(Table list, String name) {
- TableItem[] items = list.getItems();
- for (int i = 0; i < items.length; i++) {
- TableItem tableItem = items[i];
- if (tableItem.getText().equals(name)) return i;
- }
- return -1;
- }
-
- private void setDispatchers(int dispatchers) {
- if ((dispatchers & IFilterMappingItem.REQUEST) > 0) {
- fRequest.setSelection(true);
- }
- if ((dispatchers & IFilterMappingItem.FORWARD) > 0) {
- fForward.setSelection(true);
- }
- if ((dispatchers & IFilterMappingItem.INCLUDE) > 0) {
- fInclude.setSelection(true);
- }
- if ((dispatchers & IFilterMappingItem.ERROR) > 0) {
- fErorr.setSelection(true);
- }
- }
-
- /**
- * Creates the list widget and sets layout data.
- * @return org.eclipse.swt.widgets.List
- */
- private Table createUpperList(Composite parent) {
- if (fUpperListLabel != null)
- (new Label(parent, SWT.NONE)).setText(fUpperListLabel);
-
- Table list = new Table(parent, SWT.BORDER | SWT.V_SCROLL | SWT.H_SCROLL);
-// list.addListener(SWT.Selection, new Listener() {
-// public void handleEvent(Event evt) {
-// handleUpperSelectionChanged();
-// }
-// });
- list.addListener(SWT.MouseDoubleClick, new Listener() {
- public void handleEvent(Event evt) {
- handleUpperDoubleClick();
- }
- });
- list.addDisposeListener(new DisposeListener() {
- public void widgetDisposed(DisposeEvent e) {
- fElementRenderer.dispose();
- }
- });
- GridData spec = new GridData();
- spec.widthHint = convertWidthInCharsToPixels(50);
- spec.heightHint = convertHeightInCharsToPixels(4);
- spec.grabExcessVerticalSpace = true;
- spec.grabExcessHorizontalSpace = true;
- spec.horizontalAlignment = GridData.FILL;
- spec.verticalAlignment = GridData.FILL;
- list.setLayoutData(spec);
- return list;
- }
-
- /**
- * @return the ID of the button that is 'pressed' on doubleClick in the lists.
- * By default it is the OK button.
- * Override to change this setting.
- */
- protected int getDefaultButtonID() {
- return IDialogConstants.OK_ID;
- }
-
- public int getSelectedItem() {
- return fSelection;
- }
-
- protected Object getWidgetSelection() {
- int index = fUpperList.getSelectionIndex();
- return index >= 0 ? fElements[index] : null;
- }
-
- protected final void handleLowerDoubleClick() {
- if (getWidgetSelection() != null)
- buttonPressed(getDefaultButtonID());
- }
-
- protected final void handleLowerSelectionChanged() {
- updateOkState();
- }
-
- protected final void handleUpperDoubleClick() {
- if (getWidgetSelection() != null)
- buttonPressed(getDefaultButtonID());
- }
-
- @Override
- public int open() {
- if (fServletNames == null || fServletNames.length == 0) {
- fSelection = URL_PATTERN;
- }
-
- setElements(fServletNames);
- setInitialSelections(new Object[] { "" }); //$NON-NLS-1$
- return super.open();
- }
-
- /**
- *
- * @return java.lang.String[]
- * @param p org.eclipse.jface.elements.IIndexedProperty
- */
- private String[] renderStrings(Object[] p) {
- String[] strings = new String[p.length];
- int size = strings.length;
- for (int i = 0; i < size; i++) {
- strings[i] = fElementRenderer.getText(p[i]);
- }
- new TwoArrayQuickSorter(fIgnoreCase).sort(strings, p);
- return strings;
- }
-
- public void setElements(Object[] elements) {
- Object [] innerElements = elements;
- if (innerElements == null){
- innerElements = new Object[0];
- }
- fElements = innerElements;
- fRenderedStrings = renderStrings(fElements);
- }
-
- public void setSelectedItem(int newSelection) {
- fSelection = newSelection;
- }
-
- private void updateOkState() {
- Button okButton = getOkButton();
- if (okButton != null)
- if (fSelection == SERVLET) {
- okButton.setEnabled(getWidgetSelection() != null);
- } else {
- String result = fURLText.getText().trim();
- okButton.setEnabled(result.length() > 0);
- }
- }
-
- private void updateUpperListWidget() {
- fUpperList.setRedraw(false);
- fUpperList.clearAll();
- for (int i = 0; i < fRenderedStrings.length; i++) {
- TableItem ti = new TableItem(fUpperList, SWT.NONE);
- ti.setText(fRenderedStrings[i]);
- // XXX: 1G65LDG: JFUIF:WIN2000 - ILabelProvider used outside a viewer
- Image img = fElementRenderer.getImage(fRenderedStrings[i]);
- ti.setImage(img);
- }
- if (fUpperList.getItemCount() > 0) {
- fUpperList.setSelection(0);
- }
- fUpperList.setRedraw(true);
- }
-
- /**
- * Sent when default selection occurs in the control.
- * <p>
- * For example, on some platforms default selection occurs
- * in a List when the user double-clicks an item or types
- * return in a Text.
- * </p>
- *
- * @param e an event containing information about the default selection
- */
- public void widgetDefaultSelected(SelectionEvent e) {
- // Do nothing
- }
-
- /**
- * Sent when selection occurs in the control.
- * <p>
- * For example, on some platforms selection occurs in
- * a List when the user selects an item or items.
- * </p>
- *
- * @param e an event containing information about the selection
- */
- public void widgetSelected(SelectionEvent e) {
- if (e.widget == fURLPatternButton) {
- fSelection = URL_PATTERN;
- fPageBook.showPage(fURLPatternControl);
- updateOkState();
- } else if (e.widget == fServletButton) {
- fSelection = SERVLET;
- fPageBook.showPage(fServletControl);
- getShell().pack();
- updateOkState();
- } else
- fSelection = -1;
- }
-}
diff --git a/plugins/org.eclipse.jst.servlet.ui/servlet_ui/org/eclipse/jst/servlet/ui/internal/wizard/AddFilterWizard.java b/plugins/org.eclipse.jst.servlet.ui/servlet_ui/org/eclipse/jst/servlet/ui/internal/wizard/AddFilterWizard.java
deleted file mode 100644
index d87fed9..0000000
--- a/plugins/org.eclipse.jst.servlet.ui/servlet_ui/org/eclipse/jst/servlet/ui/internal/wizard/AddFilterWizard.java
+++ /dev/null
@@ -1,85 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2007, 2008 SAP AG and others.
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
- *
- * Contributors:
- * Kaloyan Raev, kaloyan.raev@sap.com - initial API and implementation
- *******************************************************************************/
-package org.eclipse.jst.servlet.ui.internal.wizard;
-
-import static org.eclipse.jst.servlet.ui.internal.wizard.IWebWizardConstants.ADD_FILTER_WIZARD_PAGE_TITLE;
-import static org.eclipse.jst.servlet.ui.internal.wizard.IWebWizardConstants.ADD_FILTER_WIZARD_WINDOW_TITLE;
-import static org.eclipse.jst.servlet.ui.internal.wizard.IWebWizardConstants.NEW_JAVA_CLASS_DESTINATION_WIZARD_PAGE_DESC;
-import static org.eclipse.jst.servlet.ui.internal.wizard.IWebWizardConstants.NEW_JAVA_CLASS_OPTIONS_WIZARD_PAGE_DESC;
-
-import java.lang.reflect.InvocationTargetException;
-
-import org.eclipse.jface.resource.ImageDescriptor;
-import org.eclipse.jst.j2ee.internal.project.J2EEProjectUtilities;
-import org.eclipse.jst.j2ee.internal.web.operations.NewFilterClassDataModelProvider;
-import org.eclipse.jst.servlet.ui.IWebUIContextIds;
-import org.eclipse.wst.common.frameworks.datamodel.IDataModel;
-import org.eclipse.wst.common.frameworks.datamodel.IDataModelProvider;
-
-/**
- * New servlet filter wizard
- */
-public class AddFilterWizard extends NewWebArtifactWizard {
-
- public AddFilterWizard() {
- this(null);
- }
-
- public AddFilterWizard(IDataModel model) {
- super(model);
- }
-
- @Override
- protected String getTitle() {
- return ADD_FILTER_WIZARD_WINDOW_TITLE;
- }
-
- @Override
- protected ImageDescriptor getImage() {
- return getImageFromJ2EEPlugin("newfilter_wiz"); //$NON-NLS-1$
- }
-
- @Override
- public void doAddPages() {
- NewFilterClassWizardPage page1 = new NewFilterClassWizardPage(
- getDataModel(),
- PAGE_ONE,
- NEW_JAVA_CLASS_DESTINATION_WIZARD_PAGE_DESC,
- ADD_FILTER_WIZARD_PAGE_TITLE,
- J2EEProjectUtilities.DYNAMIC_WEB);
- page1.setInfopopID(IWebUIContextIds.WEBEDITOR_FILTER_PAGE_ADD_FILTER_WIZARD_1);
- addPage(page1);
-
- AddFilterWizardPage page2 = new AddFilterWizardPage(getDataModel(), PAGE_TWO);
- page2.setInfopopID(IWebUIContextIds.WEBEDITOR_FILTER_PAGE_ADD_FILTER_WIZARD_2);
- addPage(page2);
-
- NewFilterClassOptionsWizardPage page3 = new NewFilterClassOptionsWizardPage(
- getDataModel(),
- PAGE_THREE,
- NEW_JAVA_CLASS_OPTIONS_WIZARD_PAGE_DESC,
- ADD_FILTER_WIZARD_PAGE_TITLE);
- page3.setInfopopID(IWebUIContextIds.WEBEDITOR_FILTER_PAGE_ADD_FILTER_WIZARD_3);
- addPage(page3);
- }
-
- @Override
- protected IDataModelProvider getDefaultProvider() {
- return new NewFilterClassDataModelProvider();
- }
-
- @Override
- protected void postPerformFinish() throws InvocationTargetException {
- //open new filter class in java editor
- openJavaClass();
- }
-
-}
diff --git a/plugins/org.eclipse.jst.servlet.ui/servlet_ui/org/eclipse/jst/servlet/ui/internal/wizard/AddFilterWizardPage.java b/plugins/org.eclipse.jst.servlet.ui/servlet_ui/org/eclipse/jst/servlet/ui/internal/wizard/AddFilterWizardPage.java
deleted file mode 100644
index 79ca1ae..0000000
--- a/plugins/org.eclipse.jst.servlet.ui/servlet_ui/org/eclipse/jst/servlet/ui/internal/wizard/AddFilterWizardPage.java
+++ /dev/null
@@ -1,160 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2007, 2008 SAP AG and others.
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
- *
- * Contributors:
- * Kaloyan Raev, kaloyan.raev@sap.com - initial API and implementation
- *******************************************************************************/
-package org.eclipse.jst.servlet.ui.internal.wizard;
-
-import static org.eclipse.jst.j2ee.internal.web.operations.INewFilterClassDataModelProperties.FILTER_MAPPINGS;
-import static org.eclipse.jst.j2ee.internal.web.operations.INewFilterClassDataModelProperties.INIT_PARAM;
-import static org.eclipse.jst.j2ee.internal.web.operations.INewWebClassDataModelProperties.DESCRIPTION;
-import static org.eclipse.jst.j2ee.internal.web.operations.INewWebClassDataModelProperties.DISPLAY_NAME;
-import static org.eclipse.jst.j2ee.internal.web.operations.INewWebClassDataModelProperties.USE_EXISTING_CLASS;
-import static org.eclipse.jst.servlet.ui.internal.wizard.IWebWizardConstants.ADD_BUTTON_LABEL_A;
-import static org.eclipse.jst.servlet.ui.internal.wizard.IWebWizardConstants.ADD_FILTER_WIZARD_PAGE_DESC;
-import static org.eclipse.jst.servlet.ui.internal.wizard.IWebWizardConstants.ADD_FILTER_WIZARD_PAGE_TITLE;
-import static org.eclipse.jst.servlet.ui.internal.wizard.IWebWizardConstants.DESCRIPTION_LABEL;
-import static org.eclipse.jst.servlet.ui.internal.wizard.IWebWizardConstants.DESCRIPTION_TITLE;
-import static org.eclipse.jst.servlet.ui.internal.wizard.IWebWizardConstants.EDIT_BUTTON_LABEL_E;
-import static org.eclipse.jst.servlet.ui.internal.wizard.IWebWizardConstants.INIT_PARAM_LABEL;
-import static org.eclipse.jst.servlet.ui.internal.wizard.IWebWizardConstants.INIT_PARAM_TITLE;
-import static org.eclipse.jst.servlet.ui.internal.wizard.IWebWizardConstants.NAME_LABEL;
-import static org.eclipse.jst.servlet.ui.internal.wizard.IWebWizardConstants.NAME_TITLE;
-import static org.eclipse.jst.servlet.ui.internal.wizard.IWebWizardConstants.NO_WEB_PROJECTS;
-import static org.eclipse.jst.servlet.ui.internal.wizard.IWebWizardConstants.REMOVE_BUTTON_LABEL_R;
-import static org.eclipse.jst.servlet.ui.internal.wizard.IWebWizardConstants.VALUE_LABEL;
-import static org.eclipse.jst.servlet.ui.internal.wizard.IWebWizardConstants.VALUE_TITLE;
-import static org.eclipse.wst.common.componentcore.internal.operation.IArtifactEditOperationDataModelProperties.PROJECT_NAME;
-
-import org.eclipse.core.runtime.IStatus;
-import org.eclipse.jface.dialogs.Dialog;
-import org.eclipse.jst.j2ee.internal.wizard.StringArrayTableWizardSection;
-import org.eclipse.swt.SWT;
-import org.eclipse.swt.layout.GridData;
-import org.eclipse.swt.layout.GridLayout;
-import org.eclipse.swt.widgets.Composite;
-import org.eclipse.swt.widgets.Label;
-import org.eclipse.swt.widgets.Text;
-import org.eclipse.wst.common.frameworks.datamodel.IDataModel;
-import org.eclipse.wst.common.frameworks.internal.datamodel.ui.DataModelWizardPage;
-import org.eclipse.wst.common.frameworks.internal.plugin.WTPCommonPlugin;
-
-/**
- * Filter Wizard Setting Page
- */
-public class AddFilterWizardPage extends DataModelWizardPage {
-
- final static String[] FILTEREXTENSIONS = {"java"}; //$NON-NLS-1$
-
- private Text displayNameText;
-
- FilterMappingsArrayTableWizardSection mappingSection;
-
- public AddFilterWizardPage(IDataModel model, String pageName) {
- super(model, pageName);
- setDescription(ADD_FILTER_WIZARD_PAGE_DESC);
- setTitle(ADD_FILTER_WIZARD_PAGE_TITLE);
- }
-
- /*
- * (non-Javadoc)
- *
- * @see org.eclipse.jem.util.ui.wizard.WTPWizardPage#getValidationPropertyNames()
- */
- @Override
- protected String[] getValidationPropertyNames() {
- return new String[] { DISPLAY_NAME,
- INIT_PARAM,
- FILTER_MAPPINGS };
- }
-
- @Override
- protected Composite createTopLevelComposite(Composite parent) {
- Composite composite = new Composite(parent, SWT.NULL);
- composite.setLayout(new GridLayout());
- GridData data = new GridData(GridData.FILL_BOTH);
- data.widthHint = 300;
- composite.setLayoutData(data);
-
- createNameDescription(composite);
-
- StringArrayTableWizardSectionCallback callback = new StringArrayTableWizardSectionCallback();
- StringArrayTableWizardSection initSection = new StringArrayTableWizardSection(
- composite,
- INIT_PARAM_LABEL,
- INIT_PARAM_TITLE,
- ADD_BUTTON_LABEL_A,
- EDIT_BUTTON_LABEL_E,
- REMOVE_BUTTON_LABEL_R,
- new String[] { NAME_TITLE, VALUE_TITLE, DESCRIPTION_TITLE },
- new String[] { NAME_LABEL, VALUE_LABEL, DESCRIPTION_LABEL },
- null,// WebPlugin.getDefault().getImage("initializ_parameter"),
- model,
- INIT_PARAM);
- initSection.setCallback(callback);
-
- mappingSection = new FilterMappingsArrayTableWizardSection(composite,
- model, FILTER_MAPPINGS);
-
- displayNameText.setFocus();
-
- IStatus projectStatus = validateProjectName();
- if (!projectStatus.isOK()) {
- setErrorMessage(projectStatus.getMessage());
- composite.setEnabled(false);
- }
- Dialog.applyDialogFont(parent);
- return composite;
- }
-
- protected IStatus validateProjectName() {
- // check for empty
- if (model.getStringProperty(PROJECT_NAME) == null || model.getStringProperty(PROJECT_NAME).trim().length() == 0) {
- return WTPCommonPlugin.createErrorStatus(NO_WEB_PROJECTS);
- }
- return WTPCommonPlugin.OK_STATUS;
- }
-
- protected void createNameDescription(Composite parent) {
- Composite composite = new Composite(parent, SWT.NULL);
- composite.setLayout(new GridLayout(2, false));
- composite.setLayoutData(new GridData(GridData.FILL_BOTH));
- // display name
- Label displayNameLabel = new Label(composite, SWT.LEFT);
- displayNameLabel.setText(NAME_LABEL);
- displayNameLabel.setLayoutData(new GridData(GridData.HORIZONTAL_ALIGN_BEGINNING));
- displayNameText = new Text(composite, SWT.SINGLE | SWT.BORDER);
- displayNameText.setLayoutData(new GridData(GridData.FILL_HORIZONTAL));
- synchHelper.synchText(displayNameText, DISPLAY_NAME, null);
-
- // description
- Label descLabel = new Label(composite, SWT.LEFT);
- descLabel.setText(DESCRIPTION_LABEL);
- descLabel.setLayoutData(new GridData(GridData.HORIZONTAL_ALIGN_BEGINNING));
- Text descText = new Text(composite, SWT.SINGLE | SWT.BORDER);
- descText.setLayoutData(new GridData(GridData.FILL_HORIZONTAL));
- synchHelper.synchText(descText, DESCRIPTION, null);
- }
-
- public String getDisplayName() {
- return displayNameText.getText();
- }
-
- @Override
- public boolean canFlipToNextPage() {
- if (model.getBooleanProperty(USE_EXISTING_CLASS))
- return false;
- return super.canFlipToNextPage();
- }
-
- @Override
- protected boolean showValidationErrorsOnEnter() {
- return true;
- }
-
-}
diff --git a/plugins/org.eclipse.jst.servlet.ui/servlet_ui/org/eclipse/jst/servlet/ui/internal/wizard/AddListenerWizard.java b/plugins/org.eclipse.jst.servlet.ui/servlet_ui/org/eclipse/jst/servlet/ui/internal/wizard/AddListenerWizard.java
deleted file mode 100644
index 1b90021..0000000
--- a/plugins/org.eclipse.jst.servlet.ui/servlet_ui/org/eclipse/jst/servlet/ui/internal/wizard/AddListenerWizard.java
+++ /dev/null
@@ -1,82 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2007, 2008 SAP AG and others.
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
- *
- * Contributors:
- * Kaloyan Raev, kaloyan.raev@sap.com - initial API and implementation
- *******************************************************************************/
-package org.eclipse.jst.servlet.ui.internal.wizard;
-
-import static org.eclipse.jst.servlet.ui.internal.wizard.IWebWizardConstants.ADD_LISTENER_WIZARD_PAGE_TITLE;
-import static org.eclipse.jst.servlet.ui.internal.wizard.IWebWizardConstants.ADD_LISTENER_WIZARD_WINDOW_TITLE;
-import static org.eclipse.jst.servlet.ui.internal.wizard.IWebWizardConstants.NEW_JAVA_CLASS_DESTINATION_WIZARD_PAGE_DESC;
-import static org.eclipse.jst.servlet.ui.internal.wizard.IWebWizardConstants.NEW_JAVA_CLASS_OPTIONS_WIZARD_PAGE_DESC;
-
-import java.lang.reflect.InvocationTargetException;
-
-import org.eclipse.jface.resource.ImageDescriptor;
-import org.eclipse.jst.j2ee.internal.project.J2EEProjectUtilities;
-import org.eclipse.jst.j2ee.internal.web.operations.NewListenerClassDataModelProvider;
-import org.eclipse.jst.servlet.ui.IWebUIContextIds;
-import org.eclipse.wst.common.frameworks.datamodel.IDataModel;
-import org.eclipse.wst.common.frameworks.datamodel.IDataModelProvider;
-
-/**
- * New application lifecycle listener wizard
- */
-public class AddListenerWizard extends NewWebArtifactWizard {
-
- public AddListenerWizard() {
- this(null);
- }
-
- public AddListenerWizard(IDataModel model) {
- super(model);
- }
-
- @Override
- protected String getTitle() {
- return ADD_LISTENER_WIZARD_WINDOW_TITLE;
- }
-
- @Override
- protected ImageDescriptor getImage() {
- return getImageFromJ2EEPlugin("newlistener_wiz"); //$NON-NLS-1$
- }
-
- @Override
- public void doAddPages() {
- NewListenerClassWizardPage page1 = new NewListenerClassWizardPage(
- getDataModel(),
- PAGE_ONE,
- NEW_JAVA_CLASS_DESTINATION_WIZARD_PAGE_DESC,
- ADD_LISTENER_WIZARD_PAGE_TITLE, J2EEProjectUtilities.DYNAMIC_WEB);
- page1.setInfopopID(IWebUIContextIds.WEBEDITOR_LISTENER_PAGE_ADD_LISTENER_WIZARD_1);
- addPage(page1);
- AddListenerWizardPage page2 = new AddListenerWizardPage(getDataModel(), PAGE_TWO);
- page2.setInfopopID(IWebUIContextIds.WEBEDITOR_LISTENER_PAGE_ADD_LISTENER_WIZARD_2);
- addPage(page2);
- NewListenerClassOptionsWizardPage page3 = new NewListenerClassOptionsWizardPage(
- getDataModel(),
- PAGE_THREE,
- NEW_JAVA_CLASS_OPTIONS_WIZARD_PAGE_DESC,
- ADD_LISTENER_WIZARD_PAGE_TITLE);
- page3.setInfopopID(IWebUIContextIds.WEBEDITOR_LISTENER_PAGE_ADD_LISTENER_WIZARD_3);
- addPage(page3);
- }
-
- @Override
- protected void postPerformFinish() throws InvocationTargetException {
- // open new listener class in java editor
- openJavaClass();
- }
-
- @Override
- protected IDataModelProvider getDefaultProvider() {
- return new NewListenerClassDataModelProvider();
- }
-
-}
diff --git a/plugins/org.eclipse.jst.servlet.ui/servlet_ui/org/eclipse/jst/servlet/ui/internal/wizard/AddListenerWizardPage.java b/plugins/org.eclipse.jst.servlet.ui/servlet_ui/org/eclipse/jst/servlet/ui/internal/wizard/AddListenerWizardPage.java
deleted file mode 100644
index 8b1d3c3..0000000
--- a/plugins/org.eclipse.jst.servlet.ui/servlet_ui/org/eclipse/jst/servlet/ui/internal/wizard/AddListenerWizardPage.java
+++ /dev/null
@@ -1,245 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2008 SAP AG and others.
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
- *
- * Contributors:
- * Kaloyan Raev, kaloyan.raev@sap.com - initial API and implementation
- *******************************************************************************/
-package org.eclipse.jst.servlet.ui.internal.wizard;
-
-import static org.eclipse.jst.j2ee.internal.common.operations.INewJavaClassDataModelProperties.INTERFACES;
-import static org.eclipse.jst.j2ee.internal.web.operations.NewListenerClassDataModelProvider.LISTENER_INTERFACES;
-import static org.eclipse.jst.j2ee.web.IServletConstants.QUALIFIED_HTTP_SESSION_ACTIVATION_LISTENER;
-import static org.eclipse.jst.j2ee.web.IServletConstants.QUALIFIED_HTTP_SESSION_ATTRIBUTE_LISTENER;
-import static org.eclipse.jst.j2ee.web.IServletConstants.QUALIFIED_HTTP_SESSION_BINDING_LISTENER;
-import static org.eclipse.jst.j2ee.web.IServletConstants.QUALIFIED_HTTP_SESSION_LISTENER;
-import static org.eclipse.jst.j2ee.web.IServletConstants.QUALIFIED_SERVLET_CONTEXT_ATTRIBUTE_LISTENER;
-import static org.eclipse.jst.j2ee.web.IServletConstants.QUALIFIED_SERVLET_CONTEXT_LISTENER;
-import static org.eclipse.jst.j2ee.web.IServletConstants.QUALIFIED_SERVLET_REQUEST_ATTRIBUTE_LISTENER;
-import static org.eclipse.jst.j2ee.web.IServletConstants.QUALIFIED_SERVLET_REQUEST_LISTENER;
-import static org.eclipse.jst.servlet.ui.internal.wizard.IWebWizardConstants.*;
-
-import java.util.ArrayList;
-import java.util.Arrays;
-import java.util.List;
-
-import org.eclipse.jdt.internal.ui.JavaPluginImages;
-import org.eclipse.jface.dialogs.Dialog;
-import org.eclipse.swt.SWT;
-import org.eclipse.swt.events.SelectionAdapter;
-import org.eclipse.swt.events.SelectionEvent;
-import org.eclipse.swt.graphics.Image;
-import org.eclipse.swt.layout.GridData;
-import org.eclipse.swt.layout.GridLayout;
-import org.eclipse.swt.widgets.Button;
-import org.eclipse.swt.widgets.Composite;
-import org.eclipse.swt.widgets.Group;
-import org.eclipse.swt.widgets.Label;
-import org.eclipse.wst.common.frameworks.datamodel.DataModelEvent;
-import org.eclipse.wst.common.frameworks.datamodel.IDataModel;
-import org.eclipse.wst.common.frameworks.internal.datamodel.ui.DataModelWizardPage;
-
-public class AddListenerWizardPage extends DataModelWizardPage {
-
- private static final Image IMG_INTERFACE = JavaPluginImages.get(JavaPluginImages.IMG_OBJS_INTERFACE);
-
- protected ServletDataModelSyncHelper synchHelper;
-
- public AddListenerWizardPage(IDataModel model, String pageName) {
- super(model, pageName);
- setDescription(ADD_LISTENER_WIZARD_PAGE_DESC);
- setTitle(ADD_LISTENER_WIZARD_PAGE_TITLE);
- synchHelper = initializeSynchHelper(model);
- }
-
- @Override
- public ServletDataModelSyncHelper initializeSynchHelper(IDataModel dm) {
- return new ServletDataModelSyncHelper(dm);
- }
-
- @Override
- protected Composite createTopLevelComposite(Composite parent) {
- Composite composite = new Composite(parent, SWT.NONE);
- composite.setLayout(new GridLayout(1, false));
- GridData data = new GridData(GridData.FILL_BOTH);
- data.widthHint = 300;
- composite.setLayoutData(data);
-
- createServletContextEvents(composite);
- createHttpSessionEvents(composite);
- createServletRequestEvents(composite);
- createSelectAllGroup(composite);
-
- Dialog.applyDialogFont(composite);
-
- return composite;
- }
-
- @Override
- protected String[] getValidationPropertyNames() {
- return new String[] {
- INTERFACES
- };
- }
-
- @Override
- protected void enter() {
- super.enter();
- synchHelper.synchUIWithModel(INTERFACES, DataModelEvent.VALUE_CHG);
- }
-
- private void createServletContextEvents(Composite parent) {
- Group group = createGroup(parent, ADD_LISTENER_WIZARD_SERVLET_CONTEXT_EVENTS);
-
- createEventListenerRow(group,
- ADD_LISTENER_WIZARD_LIFECYCLE_L,
- QUALIFIED_SERVLET_CONTEXT_LISTENER,
- INTERFACES);
-
- createEventListenerRow(group,
- ADD_LISTENER_WIZARD_CHANGES_TO_ATTRIBUTES_C,
- QUALIFIED_SERVLET_CONTEXT_ATTRIBUTE_LISTENER,
- INTERFACES);
- }
-
- private void createHttpSessionEvents(Composite parent) {
- Group group = createGroup(parent, ADD_LISTENER_WIZARD_HTTP_SESSION_EVENTS);
-
- createEventListenerRow(group,
- ADD_LISTENER_WIZARD_LIFECYCLE_I,
- QUALIFIED_HTTP_SESSION_LISTENER,
- INTERFACES);
-
- createEventListenerRow(group,
- ADD_LISTENER_WIZARD_CHANGES_TO_ATTRIBUTES_H,
- QUALIFIED_HTTP_SESSION_ATTRIBUTE_LISTENER,
- INTERFACES);
-
- createEventListenerRow(group,
- ADD_LISTENER_WIZARD_SESSION_MIGRATION,
- QUALIFIED_HTTP_SESSION_ACTIVATION_LISTENER,
- INTERFACES);
-
- createEventListenerRow(group,
- ADD_LISTENER_WIZARD_OBJECT_BINDING,
- QUALIFIED_HTTP_SESSION_BINDING_LISTENER,
- INTERFACES);
- }
-
- private void createServletRequestEvents(Composite parent) {
- Group group = createGroup(parent, ADD_LISTENER_WIZARD_SERVLET_REQUEST_EVENTS);
-
- createEventListenerRow(group,
- ADD_LISTENER_WIZARD_LIFECYCLE_Y,
- QUALIFIED_SERVLET_REQUEST_LISTENER,
- INTERFACES);
-
- createEventListenerRow(group,
- ADD_LISTENER_WIZARD_CHANGES_TO_ATTRIBUTES_G,
- QUALIFIED_SERVLET_REQUEST_ATTRIBUTE_LISTENER,
- INTERFACES);
- }
-
- private Group createGroup(Composite parent, String text) {
- Group group = new Group(parent, SWT.NONE);
-
- group.setLayout(new GridLayout(3, false));
- group.setLayoutData(new GridData(SWT.FILL, SWT.FILL, true, true));
- group.setText(text);
-
- return group;
- }
-
- private void createEventListenerRow(Composite parent, String event, String listener, String property) {
- createCheckbox(parent, event, listener, property);
- createInterfaceIcon(parent);
- createInterfaceLabel(parent, listener);
- }
-
- private Button createCheckbox(Composite parent, String text, String value, String property) {
- Button button = new Button(parent, SWT.CHECK);
-
- button.setText(text);
- button.setLayoutData(new GridData(SWT.FILL, SWT.FILL, false, true));
- synchHelper.synchCheckbox(button, value, property, null);
-
- return button;
- }
-
- private Label createInterfaceIcon(Composite parent) {
- GridData data = new GridData();
- data.horizontalIndent = 50;
-
- Label label = new Label(parent, SWT.RIGHT);
- label.setImage(IMG_INTERFACE);
- label.setLayoutData(data);
-
- return label;
- }
-
- private Label createInterfaceLabel(Composite parent, String text) {
- Label label = new Label(parent, SWT.LEFT);
-
- label.setText(text);
-
- return label;
- }
-
- private void createSelectAllGroup(Composite parent) {
- Composite composite = new Composite(parent, SWT.NONE);
- composite.setLayout(new GridLayout(2, false));
- composite.setLayoutData(new GridData(SWT.FILL, SWT.FILL, true, true));
-
- Button selectAll = new Button(composite, SWT.PUSH);
- selectAll.setText(SELECT_ALL_BUTTON);
- selectAll.addSelectionListener(new SelectionAdapter() {
- @Override
- public void widgetSelected(SelectionEvent e) {
- handleSelectAll();
- }
- });
-
- Button clear = new Button(composite, SWT.PUSH);
- clear.setText(CLEAR_BUTTON);
- clear.addSelectionListener(new SelectionAdapter() {
- @Override
- public void widgetSelected(SelectionEvent e) {
- handleSelectNone();
- }
- });
- }
-
- private void handleSelectAll() {
- List interfaces = (List) model.getProperty(INTERFACES);
- if (interfaces == null) {
- interfaces = new ArrayList();
- model.setProperty(INTERFACES, interfaces);
- }
-
- for (String iface : LISTENER_INTERFACES) {
- if (!interfaces.contains(iface)) {
- interfaces.add(iface);
- }
- }
-
- synchHelper.synchUIWithModel(INTERFACES, DataModelEvent.VALUE_CHG);
- model.notifyPropertyChange(INTERFACES, DataModelEvent.VALUE_CHG);
- }
-
- private void handleSelectNone() {
- List interfaces = (List) model.getProperty(INTERFACES);
- if (interfaces == null) {
- interfaces = new ArrayList();
- model.setProperty(INTERFACES, interfaces);
- }
-
- interfaces.removeAll(Arrays.asList(LISTENER_INTERFACES));
-
- synchHelper.synchUIWithModel(INTERFACES, DataModelEvent.VALUE_CHG);
- model.notifyPropertyChange(INTERFACES, DataModelEvent.VALUE_CHG);
- }
-
-}
diff --git a/plugins/org.eclipse.jst.servlet.ui/servlet_ui/org/eclipse/jst/servlet/ui/internal/wizard/AddServletWizard.java b/plugins/org.eclipse.jst.servlet.ui/servlet_ui/org/eclipse/jst/servlet/ui/internal/wizard/AddServletWizard.java
deleted file mode 100644
index b3a35d6..0000000
--- a/plugins/org.eclipse.jst.servlet.ui/servlet_ui/org/eclipse/jst/servlet/ui/internal/wizard/AddServletWizard.java
+++ /dev/null
@@ -1,91 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2003, 2008 IBM Corporation and others.
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
- *
- * Contributors:
- * IBM Corporation - initial API and implementation
- * Kaloyan Raev, kaloyan.raev@sap.com
- *******************************************************************************/
-package org.eclipse.jst.servlet.ui.internal.wizard;
-
-import static org.eclipse.jst.j2ee.internal.web.operations.INewServletClassDataModelProperties.IS_SERVLET_TYPE;
-import static org.eclipse.jst.servlet.ui.internal.wizard.IWebWizardConstants.ADD_SERVLET_WIZARD_PAGE_TITLE;
-import static org.eclipse.jst.servlet.ui.internal.wizard.IWebWizardConstants.ADD_SERVLET_WIZARD_WINDOW_TITLE;
-import static org.eclipse.jst.servlet.ui.internal.wizard.IWebWizardConstants.NEW_JAVA_CLASS_DESTINATION_WIZARD_PAGE_DESC;
-import static org.eclipse.jst.servlet.ui.internal.wizard.IWebWizardConstants.NEW_JAVA_CLASS_OPTIONS_WIZARD_PAGE_DESC;
-
-import java.lang.reflect.InvocationTargetException;
-
-import org.eclipse.jface.resource.ImageDescriptor;
-import org.eclipse.jst.j2ee.internal.plugin.J2EEUIPlugin;
-import org.eclipse.jst.j2ee.internal.project.J2EEProjectUtilities;
-import org.eclipse.jst.j2ee.internal.web.operations.NewServletClassDataModelProvider;
-import org.eclipse.jst.servlet.ui.IWebUIContextIds;
-import org.eclipse.wst.common.frameworks.datamodel.IDataModel;
-import org.eclipse.wst.common.frameworks.datamodel.IDataModelProvider;
-
-/**
- * New servlet wizard
- */
-public class AddServletWizard extends NewWebArtifactWizard {
-
- public AddServletWizard() {
- this(null);
- }
-
- public AddServletWizard(IDataModel model) {
- super(model);
- }
-
- @Override
- protected String getTitle() {
- return ADD_SERVLET_WIZARD_WINDOW_TITLE;
- }
-
- @Override
- protected ImageDescriptor getImage() {
- return J2EEUIPlugin.getDefault().getImageDescriptor("newservlet_wiz"); //$NON-NLS-1$
- }
-
- @Override
- public void doAddPages() {
- NewServletClassWizardPage page1 = new NewServletClassWizardPage(
- getDataModel(),
- PAGE_ONE,
- NEW_JAVA_CLASS_DESTINATION_WIZARD_PAGE_DESC,
- ADD_SERVLET_WIZARD_PAGE_TITLE, J2EEProjectUtilities.DYNAMIC_WEB);
- page1.setInfopopID(IWebUIContextIds.WEBEDITOR_SERVLET_PAGE_ADD_SERVLET_WIZARD_1);
- addPage(page1);
- AddServletWizardPage page2 = new AddServletWizardPage(getDataModel(), PAGE_TWO);
- page2.setInfopopID(IWebUIContextIds.WEBEDITOR_SERVLET_PAGE_ADD_SERVLET_WIZARD_2);
- addPage(page2);
- NewServletClassOptionsWizardPage page3 = new NewServletClassOptionsWizardPage(
- getDataModel(),
- PAGE_THREE,
- NEW_JAVA_CLASS_OPTIONS_WIZARD_PAGE_DESC,
- ADD_SERVLET_WIZARD_PAGE_TITLE);
- page3.setInfopopID(IWebUIContextIds.WEBEDITOR_SERVLET_PAGE_ADD_SERVLET_WIZARD_3);
- addPage(page3);
- }
-
- @Override
- protected void postPerformFinish() throws InvocationTargetException {
- boolean isServlet = getDataModel().getBooleanProperty(IS_SERVLET_TYPE);
- if (isServlet) {
- // open new servlet class in java editor
- openJavaClass();
- } else {
- // open new jsp file in jsp editor
- openWebFile();
- }
- }
-
- @Override
- protected IDataModelProvider getDefaultProvider() {
- return new NewServletClassDataModelProvider();
- }
-
-}
diff --git a/plugins/org.eclipse.jst.servlet.ui/servlet_ui/org/eclipse/jst/servlet/ui/internal/wizard/AddServletWizardPage.java b/plugins/org.eclipse.jst.servlet.ui/servlet_ui/org/eclipse/jst/servlet/ui/internal/wizard/AddServletWizardPage.java
deleted file mode 100644
index 83fdc45..0000000
--- a/plugins/org.eclipse.jst.servlet.ui/servlet_ui/org/eclipse/jst/servlet/ui/internal/wizard/AddServletWizardPage.java
+++ /dev/null
@@ -1,198 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2003, 2008 IBM Corporation and others.
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
- *
- * Contributors:
- * IBM Corporation - initial API and implementation
- * David Schneider, david.schneider@unisys.com - [142500] WTP properties pages fonts don't follow Eclipse preferences
- * Kaloyan Raev, kaloyan.raev@sap.com
- *******************************************************************************/
-package org.eclipse.jst.servlet.ui.internal.wizard;
-
-import static org.eclipse.jst.j2ee.internal.web.operations.INewServletClassDataModelProperties.INIT_PARAM;
-import static org.eclipse.jst.j2ee.internal.web.operations.INewServletClassDataModelProperties.URL_MAPPINGS;
-import static org.eclipse.jst.j2ee.internal.web.operations.INewWebClassDataModelProperties.DESCRIPTION;
-import static org.eclipse.jst.j2ee.internal.web.operations.INewWebClassDataModelProperties.DISPLAY_NAME;
-import static org.eclipse.jst.j2ee.internal.web.operations.INewWebClassDataModelProperties.USE_EXISTING_CLASS;
-import static org.eclipse.jst.servlet.ui.internal.wizard.IWebWizardConstants.ADD_BUTTON_LABEL_A;
-import static org.eclipse.jst.servlet.ui.internal.wizard.IWebWizardConstants.ADD_BUTTON_LABEL_D;
-import static org.eclipse.jst.servlet.ui.internal.wizard.IWebWizardConstants.ADD_SERVLET_WIZARD_PAGE_DESC;
-import static org.eclipse.jst.servlet.ui.internal.wizard.IWebWizardConstants.ADD_SERVLET_WIZARD_PAGE_TITLE;
-import static org.eclipse.jst.servlet.ui.internal.wizard.IWebWizardConstants.DESCRIPTION_LABEL;
-import static org.eclipse.jst.servlet.ui.internal.wizard.IWebWizardConstants.DESCRIPTION_TITLE;
-import static org.eclipse.jst.servlet.ui.internal.wizard.IWebWizardConstants.EDIT_BUTTON_LABEL_E;
-import static org.eclipse.jst.servlet.ui.internal.wizard.IWebWizardConstants.EDIT_BUTTON_LABEL_T;
-import static org.eclipse.jst.servlet.ui.internal.wizard.IWebWizardConstants.INIT_PARAM_LABEL;
-import static org.eclipse.jst.servlet.ui.internal.wizard.IWebWizardConstants.INIT_PARAM_TITLE;
-import static org.eclipse.jst.servlet.ui.internal.wizard.IWebWizardConstants.NAME_LABEL;
-import static org.eclipse.jst.servlet.ui.internal.wizard.IWebWizardConstants.NAME_TITLE;
-import static org.eclipse.jst.servlet.ui.internal.wizard.IWebWizardConstants.NO_WEB_PROJECTS;
-import static org.eclipse.jst.servlet.ui.internal.wizard.IWebWizardConstants.REMOVE_BUTTON_LABEL_R;
-import static org.eclipse.jst.servlet.ui.internal.wizard.IWebWizardConstants.REMOVE_BUTTON_LABEL_V;
-import static org.eclipse.jst.servlet.ui.internal.wizard.IWebWizardConstants.URL_MAPPINGS_LABEL;
-import static org.eclipse.jst.servlet.ui.internal.wizard.IWebWizardConstants.URL_MAPPINGS_TITLE;
-import static org.eclipse.jst.servlet.ui.internal.wizard.IWebWizardConstants.URL_PATTERN_LABEL;
-import static org.eclipse.jst.servlet.ui.internal.wizard.IWebWizardConstants.URL_PATTERN_TITLE;
-import static org.eclipse.jst.servlet.ui.internal.wizard.IWebWizardConstants.VALUE_LABEL;
-import static org.eclipse.jst.servlet.ui.internal.wizard.IWebWizardConstants.VALUE_TITLE;
-import static org.eclipse.wst.common.componentcore.internal.operation.IArtifactEditOperationDataModelProperties.PROJECT_NAME;
-
-import java.util.ArrayList;
-import java.util.List;
-
-import org.eclipse.core.runtime.IStatus;
-import org.eclipse.jface.dialogs.Dialog;
-import org.eclipse.jst.j2ee.internal.wizard.StringArrayTableWizardSection;
-import org.eclipse.swt.SWT;
-import org.eclipse.swt.events.ModifyEvent;
-import org.eclipse.swt.events.ModifyListener;
-import org.eclipse.swt.layout.GridData;
-import org.eclipse.swt.layout.GridLayout;
-import org.eclipse.swt.widgets.Composite;
-import org.eclipse.swt.widgets.Label;
-import org.eclipse.swt.widgets.Text;
-import org.eclipse.wst.common.frameworks.datamodel.IDataModel;
-import org.eclipse.wst.common.frameworks.internal.datamodel.ui.DataModelWizardPage;
-import org.eclipse.wst.common.frameworks.internal.plugin.WTPCommonPlugin;
-
-/**
- * Servlet Wizard Setting Page
- */
-public class AddServletWizardPage extends DataModelWizardPage {
- final static String[] JSPEXTENSIONS = {"jsp"}; //$NON-NLS-1$
-
- private Text displayNameText;
-
- private StringArrayTableWizardSection urlSection;
-
- public AddServletWizardPage(IDataModel model, String pageName) {
- super(model, pageName);
- setDescription(ADD_SERVLET_WIZARD_PAGE_DESC);
- this.setTitle(ADD_SERVLET_WIZARD_PAGE_TITLE);
- }
-
- /*
- * (non-Javadoc)
- *
- * @see org.eclipse.jem.util.ui.wizard.WTPWizardPage#getValidationPropertyNames()
- */
- @Override
- protected String[] getValidationPropertyNames() {
- return new String[] { DISPLAY_NAME, INIT_PARAM, URL_MAPPINGS };
- }
-
- @Override
- protected Composite createTopLevelComposite(Composite parent) {
- Composite composite = new Composite(parent, SWT.NULL);
- composite.setLayout(new GridLayout());
- GridData data = new GridData(GridData.FILL_BOTH);
- data.widthHint = 300;
- composite.setLayoutData(data);
-
- createNameDescription(composite);
-
- StringArrayTableWizardSectionCallback callback = new StringArrayTableWizardSectionCallback();
- StringArrayTableWizardSection initSection = new StringArrayTableWizardSection(
- composite,
- INIT_PARAM_LABEL,
- INIT_PARAM_TITLE,
- ADD_BUTTON_LABEL_A,
- EDIT_BUTTON_LABEL_E,
- REMOVE_BUTTON_LABEL_R,
- new String[] { NAME_TITLE, VALUE_TITLE, DESCRIPTION_TITLE },
- new String[] { NAME_LABEL, VALUE_LABEL, DESCRIPTION_LABEL },
- null,// WebPlugin.getDefault().getImage("initializ_parameter"),
- model,
- INIT_PARAM);
- initSection.setCallback(callback);
- urlSection = new StringArrayTableWizardSection(
- composite,
- URL_MAPPINGS_LABEL,
- URL_MAPPINGS_TITLE,
- ADD_BUTTON_LABEL_D,
- EDIT_BUTTON_LABEL_T,
- REMOVE_BUTTON_LABEL_V,
- new String[] { URL_PATTERN_TITLE },
- new String[] { URL_PATTERN_LABEL },
- null,// WebPlugin.getDefault().getImage("url_type"),
- model,
- URL_MAPPINGS);
- urlSection.setCallback(callback);
-
- String text = displayNameText.getText();
- // Set default URL Pattern
- List input = new ArrayList();
- input.add(new String[]{"/" + text}); //$NON-NLS-1$
- if (urlSection != null)
- urlSection.setInput(input);
- displayNameText.setFocus();
-
- IStatus projectStatus = validateProjectName();
- if (!projectStatus.isOK()) {
- setErrorMessage(projectStatus.getMessage());
- composite.setEnabled(false);
- }
- Dialog.applyDialogFont(parent);
- return composite;
- }
-
- protected IStatus validateProjectName() {
- // check for empty
- if (model.getStringProperty(PROJECT_NAME) == null || model.getStringProperty(PROJECT_NAME).trim().length() == 0) {
- return WTPCommonPlugin.createErrorStatus(NO_WEB_PROJECTS);
- }
- return WTPCommonPlugin.OK_STATUS;
- }
-
- protected void createNameDescription(Composite parent) {
- Composite composite = new Composite(parent, SWT.NULL);
- composite.setLayout(new GridLayout(2, false));
- composite.setLayoutData(new GridData(GridData.FILL_BOTH));
- // display name
- Label displayNameLabel = new Label(composite, SWT.LEFT);
- displayNameLabel.setText(NAME_LABEL);
- displayNameLabel.setLayoutData(new GridData(GridData.HORIZONTAL_ALIGN_BEGINNING));
- displayNameText = new Text(composite, SWT.SINGLE | SWT.BORDER);
- displayNameText.setLayoutData(new GridData(GridData.FILL_HORIZONTAL));
- displayNameText.addModifyListener(new ModifyListener() {
- public void modifyText(ModifyEvent e) {
- String text = displayNameText.getText();
- // Set default URL Pattern
- List input = new ArrayList();
- input.add(new String[]{"/" + text}); //$NON-NLS-1$
- if (urlSection != null)
- urlSection.setInput(input);
- }
-
- });
- synchHelper.synchText(displayNameText, DISPLAY_NAME, null);
-
- // description
- Label descLabel = new Label(composite, SWT.LEFT);
- descLabel.setText(DESCRIPTION_LABEL);
- descLabel.setLayoutData(new GridData(GridData.HORIZONTAL_ALIGN_BEGINNING));
- Text descText = new Text(composite, SWT.SINGLE | SWT.BORDER);
- descText.setLayoutData(new GridData(GridData.FILL_HORIZONTAL));
- synchHelper.synchText(descText, DESCRIPTION, null);
- }
-
- public String getDisplayName() {
- return displayNameText.getText();
- }
-
- @Override
- public boolean canFlipToNextPage() {
- if (model.getBooleanProperty(USE_EXISTING_CLASS))
- return false;
- return super.canFlipToNextPage();
- }
-
- @Override
- protected boolean showValidationErrorsOnEnter() {
- return true;
- }
-
-}
diff --git a/plugins/org.eclipse.jst.servlet.ui/servlet_ui/org/eclipse/jst/servlet/ui/internal/wizard/AvailableWebLibProvider.java b/plugins/org.eclipse.jst.servlet.ui/servlet_ui/org/eclipse/jst/servlet/ui/internal/wizard/AvailableWebLibProvider.java
deleted file mode 100644
index 8ce5e4a..0000000
--- a/plugins/org.eclipse.jst.servlet.ui/servlet_ui/org/eclipse/jst/servlet/ui/internal/wizard/AvailableWebLibProvider.java
+++ /dev/null
@@ -1,67 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2003, 2007 IBM Corporation and others.
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
- *
- * Contributors:
- * IBM Corporation - initial API and implementation
- *******************************************************************************/
-package org.eclipse.jst.servlet.ui.internal.wizard;
-
-import java.util.Arrays;
-import java.util.Comparator;
-
-import org.eclipse.jface.viewers.ILabelProviderListener;
-import org.eclipse.jface.viewers.IStructuredContentProvider;
-import org.eclipse.jface.viewers.ITableLabelProvider;
-import org.eclipse.jface.viewers.Viewer;
-import org.eclipse.jst.j2ee.internal.archive.ArchiveWrapper;
-import org.eclipse.jst.j2ee.internal.wizard.AvailableJarsProvider;
-import org.eclipse.swt.graphics.Image;
-
-public class AvailableWebLibProvider implements IStructuredContentProvider, ITableLabelProvider {
-
- public AvailableWebLibProvider() {
- }
-
- public Object[] getElements(Object inputElement) {
- if (inputElement instanceof ArchiveWrapper) {
- Object[] array = ((ArchiveWrapper) inputElement).getWebLibs().toArray();
- Arrays.sort(array, new Comparator() {
- public int compare(Object o1, Object o2) {
- return getColumnText(o1, 0).compareTo(getColumnText(o2, 0));
- }
-
- });
- return array;
- }
- return new Object[0];
- }
-
- public Image getColumnImage(Object element, int columnIndex) {
- return AvailableJarsProvider.getUtilImage();
- }
-
- public String getColumnText(Object element, int columnIndex) {
- ArchiveWrapper wrapper = (ArchiveWrapper)element;
- return wrapper.getName();
- }
-
- public void dispose() {
- }
-
- public void inputChanged(Viewer viewer, Object oldInput, Object newInput) {
- }
-
- public void addListener(ILabelProviderListener listener) {
- }
-
- public boolean isLabelProperty(Object element, String property) {
- return false;
- }
-
- public void removeListener(ILabelProviderListener listener) {
- }
-}
diff --git a/plugins/org.eclipse.jst.servlet.ui/servlet_ui/org/eclipse/jst/servlet/ui/internal/wizard/ConvertToWebModuleTypeDialog.java b/plugins/org.eclipse.jst.servlet.ui/servlet_ui/org/eclipse/jst/servlet/ui/internal/wizard/ConvertToWebModuleTypeDialog.java
deleted file mode 100644
index a6409d0..0000000
--- a/plugins/org.eclipse.jst.servlet.ui/servlet_ui/org/eclipse/jst/servlet/ui/internal/wizard/ConvertToWebModuleTypeDialog.java
+++ /dev/null
@@ -1,80 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2003, 2006 IBM Corporation and others.
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
- *
- * Contributors:
- * IBM Corporation - initial API and implementation
- *******************************************************************************/
-
-package org.eclipse.jst.servlet.ui.internal.wizard;
-
-import org.eclipse.jface.dialogs.Dialog;
-import org.eclipse.jface.window.IShellProvider;
-import org.eclipse.jst.j2ee.internal.J2EEVersionConstants;
-import org.eclipse.swt.SWT;
-import org.eclipse.swt.events.SelectionAdapter;
-import org.eclipse.swt.events.SelectionEvent;
-import org.eclipse.swt.layout.GridData;
-import org.eclipse.swt.layout.GridLayout;
-import org.eclipse.swt.widgets.Combo;
-import org.eclipse.swt.widgets.Composite;
-import org.eclipse.swt.widgets.Control;
-import org.eclipse.swt.widgets.Label;
-import org.eclipse.swt.widgets.Shell;
-
-public class ConvertToWebModuleTypeDialog extends Dialog {
-
- private String fShellTitle = IWebWizardConstants.CONVERT_TO_WEB_TITLE;
- private String fLabelText = IWebWizardConstants.SELECT_WEB_VERSION;
- private static String fSelection= null;
- private String[] fAllowedStrings = new String[] {J2EEVersionConstants.VERSION_2_2_TEXT, J2EEVersionConstants.VERSION_2_3_TEXT, J2EEVersionConstants.VERSION_2_4_TEXT, J2EEVersionConstants.VERSION_2_5_TEXT, J2EEVersionConstants.VERSION_3_0_TEXT};
- private int fInitialSelectionIndex = fAllowedStrings.length-1;
-
- public static String getSelectedVersion() {
- return fSelection;
- }
-
- public ConvertToWebModuleTypeDialog(IShellProvider parentShell) {
- super(parentShell);
- }
-
- public ConvertToWebModuleTypeDialog(Shell parentShell) {
- super(parentShell);
- }
-
- @Override
- protected Control createDialogArea(Composite parent) {
- getShell().setText(fShellTitle);
-
- Composite composite = (Composite)super.createDialogArea(parent);
- Composite innerComposite = new Composite(composite, SWT.NONE);
- innerComposite.setLayoutData(new GridData());
- GridLayout gl= new GridLayout();
- gl.numColumns= 2;
- innerComposite.setLayout(gl);
-
- Label label= new Label(innerComposite, SWT.NONE);
- label.setText(fLabelText);
- label.setLayoutData(new GridData());
-
- final Combo combo= new Combo(innerComposite, SWT.READ_ONLY);
- for (int i = 0; i < fAllowedStrings.length; i++) {
- combo.add(fAllowedStrings[i]);
- }
- combo.select(fInitialSelectionIndex);
- fSelection= combo.getItem(combo.getSelectionIndex());
- GridData gd= new GridData();
- combo.setLayoutData(gd);
- combo.addSelectionListener(new SelectionAdapter(){
- @Override
- public void widgetSelected(SelectionEvent e) {
- fSelection= combo.getItem(combo.getSelectionIndex());
- }
- });
- return composite;
- }
-
-}
diff --git a/plugins/org.eclipse.jst.servlet.ui/servlet_ui/org/eclipse/jst/servlet/ui/internal/wizard/FilterMappingsArrayTableWizardSection.java b/plugins/org.eclipse.jst.servlet.ui/servlet_ui/org/eclipse/jst/servlet/ui/internal/wizard/FilterMappingsArrayTableWizardSection.java
deleted file mode 100644
index 261d093..0000000
--- a/plugins/org.eclipse.jst.servlet.ui/servlet_ui/org/eclipse/jst/servlet/ui/internal/wizard/FilterMappingsArrayTableWizardSection.java
+++ /dev/null
@@ -1,356 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2008 SAP AG and others.
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
- *
- * Contributors:
- * Kaloyan Raev, kaloyan.raev@sap.com - initial API and implementation
- *******************************************************************************/
-package org.eclipse.jst.servlet.ui.internal.wizard;
-
-import static org.eclipse.jst.j2ee.internal.common.operations.INewJavaClassDataModelProperties.PROJECT;
-import static org.eclipse.jst.servlet.ui.internal.wizard.IWebWizardConstants.*;
-
-import java.net.URL;
-import java.util.ArrayList;
-import java.util.Collection;
-import java.util.List;
-
-import org.eclipse.core.resources.IProject;
-import org.eclipse.jface.resource.ImageDescriptor;
-import org.eclipse.jface.viewers.DoubleClickEvent;
-import org.eclipse.jface.viewers.IDoubleClickListener;
-import org.eclipse.jface.viewers.ISelection;
-import org.eclipse.jface.viewers.ISelectionChangedListener;
-import org.eclipse.jface.viewers.IStructuredContentProvider;
-import org.eclipse.jface.viewers.IStructuredSelection;
-import org.eclipse.jface.viewers.ITableLabelProvider;
-import org.eclipse.jface.viewers.LabelProvider;
-import org.eclipse.jface.viewers.SelectionChangedEvent;
-import org.eclipse.jface.viewers.TableViewer;
-import org.eclipse.jface.viewers.Viewer;
-import org.eclipse.jst.j2ee.internal.web.operations.FilterMappingItem;
-import org.eclipse.jst.j2ee.internal.web.operations.IFilterMappingItem;
-import org.eclipse.jst.j2ee.internal.web.plugin.WebPlugin;
-import org.eclipse.jst.j2ee.internal.web.providers.WebAppEditResourceHandler;
-import org.eclipse.swt.SWT;
-import org.eclipse.swt.events.ControlAdapter;
-import org.eclipse.swt.events.ControlEvent;
-import org.eclipse.swt.events.SelectionEvent;
-import org.eclipse.swt.events.SelectionListener;
-import org.eclipse.swt.graphics.Image;
-import org.eclipse.swt.graphics.Point;
-import org.eclipse.swt.graphics.Rectangle;
-import org.eclipse.swt.layout.GridData;
-import org.eclipse.swt.layout.GridLayout;
-import org.eclipse.swt.widgets.Button;
-import org.eclipse.swt.widgets.Composite;
-import org.eclipse.swt.widgets.Label;
-import org.eclipse.swt.widgets.Table;
-import org.eclipse.swt.widgets.TableColumn;
-import org.eclipse.wst.common.frameworks.datamodel.DataModelEvent;
-import org.eclipse.wst.common.frameworks.datamodel.IDataModel;
-import org.eclipse.wst.common.frameworks.datamodel.IDataModelListener;
-
-public class FilterMappingsArrayTableWizardSection extends Composite implements IDataModelListener {
-
- protected class StringArrayListContentProvider implements IStructuredContentProvider {
- public boolean isDeleted(Object element) {
- return false;
- }
- public Object[] getElements(Object element) {
- if (element instanceof List) {
- return ((List<FilterMappingItem>) element).toArray();
- }
- return new Object[0];
- }
- public void inputChanged(Viewer aViewer, Object oldInput, Object newInput) {
- //Default nothing
- }
- public void dispose() {
- //Default nothing
- }
- }
- protected class StringArrayListLabelProvider extends LabelProvider implements ITableLabelProvider {
- private final Image URL_PATTERN_ICON =
- ImageDescriptor.createFromURL((URL) WebPlugin.getDefault().getImage("url_mapping")).createImage(); //$NON-NLS-1$
- private final Image SERVLET_ICON =
- ImageDescriptor.createFromURL((URL) WebPlugin.getDefault().getImage("servlet")).createImage(); //$NON-NLS-1$
-
- public Image getColumnImage(Object element, int columnIndex) {
- if (columnIndex == 0) {
- FilterMappingItem item = (FilterMappingItem) element;
- if (item.isServletNameType()) {
- return SERVLET_ICON;
- } else if (item.isUrlPatternType()) {
- return URL_PATTERN_ICON;
- }
-
- }
- return null;
- }
-
- public String getColumnText(Object element, int columnIndex) {
- if (columnIndex == 1) {
- return ((FilterMappingItem) element).getName();
- } else if (columnIndex == 2) {
- return ((FilterMappingItem) element).getDispatchersAsString();
- }
- return null;
- }
-
- }
-
- final static int ICON_WIDTH = 25;
- final static int DISPATCHERS_WIDTH = 100;
- private final static String ICON_PROP = "ICON_PROP"; //$NON-NLS-1$
- private final static String NAME_PROP = "NAME_PROP"; //$NON-NLS-1$
- private final static String DISPATCHERS_PROP = "DISPATCHERS_PROP"; //$NON-NLS-1$
-
- private TableViewer viewer;
- private Button addButton;
- private Button editButton;
- private Button removeButton;
- private IDataModel model;
- private String propertyName;
-
- public FilterMappingsArrayTableWizardSection(Composite parent, IDataModel model, String propertyName) {
- super(parent, SWT.NONE);
-
- this.model = model;
- this.propertyName = propertyName;
- model.addListener(this);
-
- GridLayout layout = new GridLayout(2, false);
- layout.marginHeight = 4;
- layout.marginWidth = 0;
- this.setLayout(layout);
- this.setLayoutData(new GridData(GridData.FILL_BOTH));
-
- Label titleLabel = new Label(this, SWT.LEFT);
- titleLabel.setText(FILTER_MAPPINGS_LABEL);
- GridData data = new GridData();
- data.horizontalSpan = 2;
- titleLabel.setLayoutData(data);
-
- Table table = new Table(this, SWT.FULL_SELECTION | SWT.BORDER);
- viewer = new TableViewer(table);
- table.setLayoutData(new GridData(GridData.FILL_BOTH));
- viewer.setContentProvider(new StringArrayListContentProvider());
- viewer.setLabelProvider(new StringArrayListLabelProvider());
-
- final Composite buttonCompo = new Composite(this, SWT.NULL);
- layout = new GridLayout();
- layout.marginHeight = 0;
- buttonCompo.setLayout(layout);
- buttonCompo.setLayoutData(new GridData(GridData.FILL_VERTICAL | GridData.VERTICAL_ALIGN_BEGINNING));
-
- addButton = new Button(buttonCompo, SWT.PUSH);
- addButton.setText(ADD_BUTTON_LABEL_D);
- addButton.setLayoutData(new GridData(GridData.VERTICAL_ALIGN_BEGINNING | GridData.HORIZONTAL_ALIGN_FILL));
- addButton.addSelectionListener(new SelectionListener() {
- public void widgetSelected(SelectionEvent event) {
- handleAddButtonSelected();
- }
- public void widgetDefaultSelected(SelectionEvent event) {
- //Do nothing
- }
- });
-
- editButton = new Button(buttonCompo, SWT.PUSH);
- editButton.setText(EDIT_BUTTON_LABEL_T);
- editButton.setLayoutData(new GridData(GridData.VERTICAL_ALIGN_BEGINNING | GridData.HORIZONTAL_ALIGN_FILL));
- editButton.addSelectionListener(new SelectionListener() {
- public void widgetSelected(SelectionEvent event) {
- handleEditButtonSelected();
- }
- public void widgetDefaultSelected(SelectionEvent event) {
- //Do nothing
- }
- });
- editButton.setEnabled(false);
-
- removeButton = new Button(buttonCompo, SWT.PUSH);
- removeButton.setText(REMOVE_BUTTON_LABEL_V);
- removeButton.setLayoutData(new GridData(GridData.VERTICAL_ALIGN_BEGINNING | GridData.HORIZONTAL_ALIGN_FILL));
- removeButton.addSelectionListener(new SelectionListener() {
- public void widgetSelected(SelectionEvent event) {
- handleRemoveButtonSelected();
- }
- public void widgetDefaultSelected(SelectionEvent event) {
- //Do nothing
- }
- });
- removeButton.setEnabled(false);
-
- viewer.addSelectionChangedListener(new ISelectionChangedListener() {
- public void selectionChanged(SelectionChangedEvent event) {
- ISelection selection = event.getSelection();
- if (editButton != null) {
- boolean enabled = ((IStructuredSelection) selection).size() == 1;
- editButton.setEnabled(enabled);
- }
- removeButton.setEnabled(!selection.isEmpty());
- }
- });
-
- if (editButton != null) {
- viewer.addDoubleClickListener(new IDoubleClickListener() {
- public void doubleClick(DoubleClickEvent event) {
- handleEditButtonSelected();
- }
- });
- }
-
- TableColumn tableColumn = new TableColumn(table, SWT.NONE);
- tableColumn.setWidth(ICON_WIDTH);
- tableColumn.setResizable(false);
- tableColumn = new TableColumn(table, SWT.NONE);
- tableColumn.setText(URL_SERVLET_LABEL);
- tableColumn.setResizable(true);
- tableColumn = new TableColumn(table, SWT.NONE);
- tableColumn.setText(DISPATCHERS_LABEL);
- tableColumn.setWidth(DISPATCHERS_WIDTH);
- tableColumn.setResizable(false);
- viewer.setColumnProperties(new String[] {ICON_PROP, NAME_PROP, DISPATCHERS_PROP});
- table.setHeaderVisible(true);
- this.addControlListener(new ControlAdapter() {
- @Override
- public void controlResized(ControlEvent e) {
- Table table = viewer.getTable();
- TableColumn[] columns = table.getColumns();
- Point buttonArea = buttonCompo.computeSize(SWT.DEFAULT, SWT.DEFAULT);
- Rectangle area = table.getParent().getClientArea();
- Point preferredSize = viewer.getTable().computeSize(SWT.DEFAULT, SWT.DEFAULT);
- int width = area.width - 2*table.getBorderWidth() - buttonArea.x - columns.length*2;
- if (preferredSize.y > area.height + table.getHeaderHeight()) {
- // Subtract the scrollbar width from the total column width
- // if a vertical scrollbar will be required
- Point vBarSize = table.getVerticalBar().getSize();
- width -= vBarSize.x;
- }
- Point oldSize = table.getSize();
- for (int i=0; i < columns.length; i++) {
- if (oldSize.x > area.width) {
- // table is getting smaller so make the columns
- // smaller first and then resize the table to
- // match the client area width
- if (i == 1) columns[i].setWidth(width - ICON_WIDTH - DISPATCHERS_WIDTH);
- table.setSize(area.width - buttonArea.x - columns.length*2, area.height);
- } else {
- // table is getting bigger so make the table
- // bigger first and then make the columns wider
- // to match the client area width
- table.setSize(area.width - buttonArea.x - columns.length*2, area.height);
- if (i == 1) columns[i].setWidth(width - ICON_WIDTH - DISPATCHERS_WIDTH);
- }
- }
- }
- });
-
- viewer.setInput(model.getProperty(propertyName));
- }
-
- private void handleAddButtonSelected() {
- String title = WebAppEditResourceHandler.getString("Add_Filter_Mapping_Title_UI_"); //$NON-NLS-1$
- IProject p = (IProject) model.getProperty(PROJECT);
- List valueList = (List) viewer.getInput();
- AddEditFilterMappingDialog dialog =
- new AddEditFilterMappingDialog(getShell(), title, p, valueList, null);
- dialog.open();
- Object[] result = dialog.getResult();
-
- addFilterMapping((result != null && result.length > 0) ? (IFilterMappingItem) result[0] : null);
- }
-
- private void handleEditButtonSelected() {
- String title = WebAppEditResourceHandler.getString("Edit_Filter_Mapping_Title_UI_"); //$NON-NLS-1$
- ISelection s = viewer.getSelection();
- if (!(s instanceof IStructuredSelection))
- return;
- IStructuredSelection selection = (IStructuredSelection) s;
- if (selection.size() != 1)
- return;
- List valueList = (List) viewer.getInput();
- Object selectedObj = selection.getFirstElement();
- FilterMappingItem value = (FilterMappingItem) selectedObj;
- IProject p = (IProject) model.getProperty(PROJECT);
- AddEditFilterMappingDialog dialog =
- new AddEditFilterMappingDialog(getShell(), title, p, valueList, value);
- dialog.open();
- Object[] result = dialog.getResult();
- if (result == null || result.length == 0) return;
- editFilterMapping(value, (IFilterMappingItem) result[0]);
- }
-
- private void handleRemoveButtonSelected() {
- ISelection selection = viewer.getSelection();
- if (selection.isEmpty() || !(selection instanceof IStructuredSelection))
- return;
- List selectedObj = ((IStructuredSelection) selection).toList();
- removeFilterMappings(selectedObj);
- }
-
- private void addFilterMapping(IFilterMappingItem filterMapping) {
- if (filterMapping == null) return;
- List valueList = (List) viewer.getInput();
- if (valueList == null) {
- valueList = new ArrayList();
- }
- valueList.add(filterMapping);
- setInput(valueList);
- }
-
- private void editFilterMapping(IFilterMappingItem oldFilterMapping, IFilterMappingItem newFilterMapping) {
- if (newFilterMapping == null) return;
- List valueList = (List) viewer.getInput();
- if (valueList == null) {
- valueList = new ArrayList();
- }
- int index = valueList.indexOf(oldFilterMapping);
- if (index == -1) {
- valueList.add(newFilterMapping);
- } else {
- valueList.set(index, newFilterMapping);
- }
-
- setInput(valueList);
- }
-
- private void removeFilterMappings(Collection selectedFilterMappings) {
- List valueList = (List) viewer.getInput();
- valueList.removeAll(selectedFilterMappings);
- setInput(valueList);
- }
-
- public void setInput(List input) {
- viewer.setInput(input);
- // Create a new list to trigger property change
- List newInput = new ArrayList();
- newInput.addAll(input);
- model.setProperty(propertyName, newInput);
- }
-
- public List getInput() {
- List valueList = (List) viewer.getInput();
- if (valueList == null) {
- valueList = new ArrayList();
- }
- return valueList;
- }
-
- public void propertyChanged(DataModelEvent event) {
- if (this.propertyName.equals(event.getPropertyName())) {
- viewer.setInput(event.getProperty());
- }
- }
-
- @Override
- public void dispose() {
- model.removeListener(this);
- super.dispose();
- }
-
-}
diff --git a/plugins/org.eclipse.jst.servlet.ui/servlet_ui/org/eclipse/jst/servlet/ui/internal/wizard/IWebWizardConstants.java b/plugins/org.eclipse.jst.servlet.ui/servlet_ui/org/eclipse/jst/servlet/ui/internal/wizard/IWebWizardConstants.java
deleted file mode 100644
index 8b052af..0000000
--- a/plugins/org.eclipse.jst.servlet.ui/servlet_ui/org/eclipse/jst/servlet/ui/internal/wizard/IWebWizardConstants.java
+++ /dev/null
@@ -1,145 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2003, 2006 IBM Corporation and others.
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
- *
- * Contributors:
- * IBM Corporation - initial API and implementation
- *******************************************************************************/
-package org.eclipse.jst.servlet.ui.internal.wizard;
-
-import org.eclipse.jst.servlet.ui.internal.plugin.WEBUIMessages;
-
-public interface IWebWizardConstants {
-
- // AddServletWizard
- public final static String ADD_SERVLET_WIZARD_WINDOW_TITLE = WEBUIMessages.ADD_SERVLET_WIZARD_WINDOW_TITLE;
- public final static String ADD_SERVLET_WIZARD_PAGE_TITLE = WEBUIMessages.ADD_SERVLET_WIZARD_PAGE_TITLE;
- public final static String ADD_SERVLET_WIZARD_PAGE_DESC = WEBUIMessages.ADD_SERVLET_WIZARD_PAGE_DESC;
-
- public final static String DEFAULT_PACKAGE = WEBUIMessages.DEFAULT_PACKAGE;
- public final static String SELECT_CLASS_TITLE = WEBUIMessages.SELECT_CLASS_TITLE;
- public final static String MAP_CLASS_NAME_TO_CLASS_ERROR_MSG = WEBUIMessages.MAP_CLASS_NAME_TO_CLASS_ERROR_MSG;
- public final static String EMPTY_LIST_MSG = WEBUIMessages.EMPTY_LIST_MSG;
- public final static String ADD_LABEL = WEBUIMessages.ADD_LABEL;
- public final static String USE_EXISTING_SERVLET_CLASS = WEBUIMessages.USE_EXISTING_SERVLET_CLASS;
- public final static String INIT_PARAM_TITLE = WEBUIMessages.INIT_PARAM_TITLE;
- public final static String INIT_PARAM_LABEL = WEBUIMessages.INIT_PARAM_LABEL;
- public final static String URL_MAPPINGS_TITLE = WEBUIMessages.URL_MAPPINGS_TITLE;
- public final static String URL_MAPPINGS_LABEL = WEBUIMessages.URL_MAPPINGS_LABEL;
- public final static String CHOOSE_SERVLET_CLASS = WEBUIMessages.CHOOSE_SERVLET_CLASS;
-
- // NewServletWizard
- public final static String NEW_SERVLET_WIZARD_WINDOW_TITLE = WEBUIMessages.NEW_SERVLET_WIZARD_WINDOW_TITLE;
- public final static String NEW_SERVLET_WIZARD_PAGE_TITLE = WEBUIMessages.NEW_SERVLET_WIZARD_PAGE_TITLE;
- public final static String NEW_SERVLET_WIZARD_PAGE_DESC = WEBUIMessages.NEW_SERVLET_WIZARD_PAGE_DESC;
- public final static String SERVLET_PACKAGE_LABEL = WEBUIMessages.SERVLET_PACKAGE_LABEL;
- public final static String SERVLET_NAME_LABEL = WEBUIMessages.SERVLET_NAME_LABEL;
-
- // AddFilterWizard
- public final static String ADD_FILTER_WIZARD_WINDOW_TITLE = WEBUIMessages.ADD_FILTER_WIZARD_WINDOW_TITLE;
- public final static String ADD_FILTER_WIZARD_PAGE_TITLE = WEBUIMessages.ADD_FILTER_WIZARD_PAGE_TITLE;
- public final static String ADD_FILTER_WIZARD_PAGE_DESC = WEBUIMessages.ADD_FILTER_WIZARD_PAGE_DESC;
-
- public final static String USE_EXISTING_FILTER_CLASS = WEBUIMessages.USE_EXISTING_FILTER_CLASS;
- public final static String CHOOSE_FILTER_CLASS = WEBUIMessages.CHOOSE_FILTER_CLASS;
- public final static String SERVLET_MAPPINGS_LABEL = WEBUIMessages.SERVLET_MAPPINGS_LABEL;
- public final static String FILTER_MAPPINGS_LABEL = WEBUIMessages.FILTER_MAPPINGS_LABEL;
- public final static String URL_SERVLET_LABEL = WEBUIMessages.URL_SERVLET_LABEL;
- public final static String DISPATCHERS_LABEL = WEBUIMessages.DISPATCHERS_LABEL;
-
- public static String REQUEST = WEBUIMessages.DISPATCHER_REQUEST;
- public static String FORWARD = WEBUIMessages.DISPATCHER_FORWARD;
- public static String INCLUDE = WEBUIMessages.DISPATCHER_INCLUDE;
- public static String ERROR = WEBUIMessages.DISPATCHER_ERROR;
-
- // NewFilterWizard
- public final static String NEW_FILTER_WIZARD_WINDOW_TITLE = WEBUIMessages.NEW_FILTER_WIZARD_WINDOW_TITLE;
-
- // AddListenerWizard
- public final static String ADD_LISTENER_WIZARD_WINDOW_TITLE = WEBUIMessages.ADD_LISTENER_WIZARD_WINDOW_TITLE;
- public final static String ADD_LISTENER_WIZARD_PAGE_TITLE = WEBUIMessages.ADD_LISTENER_WIZARD_PAGE_TITLE;
- public final static String ADD_LISTENER_WIZARD_PAGE_DESC = WEBUIMessages.ADD_LISTENER_WIZARD_PAGE_DESC;
-
- public final static String USE_EXISTING_LISTENER_CLASS = WEBUIMessages.USE_EXISTING_LISTENER_CLASS;
- public final static String ADD_LISTENER_WIZARD_SERVLET_CONTEXT_EVENTS = WEBUIMessages.ADD_LISTENER_WIZARD_SERVLET_CONTEXT_EVENTS;
- public final static String ADD_LISTENER_WIZARD_HTTP_SESSION_EVENTS = WEBUIMessages.ADD_LISTENER_WIZARD_HTTP_SESSION_EVENTS;
- public final static String ADD_LISTENER_WIZARD_SERVLET_REQUEST_EVENTS = WEBUIMessages.ADD_LISTENER_WIZARD_SERVLET_REQUEST_EVENTS;
- public final static String ADD_LISTENER_WIZARD_LIFECYCLE = WEBUIMessages.ADD_LISTENER_WIZARD_LIFECYCLE;
- public final static String ADD_LISTENER_WIZARD_LIFECYCLE_L = WEBUIMessages.ADD_LISTENER_WIZARD_LIFECYCLE_L;
- public final static String ADD_LISTENER_WIZARD_LIFECYCLE_I = WEBUIMessages.ADD_LISTENER_WIZARD_LIFECYCLE_I;
- public final static String ADD_LISTENER_WIZARD_LIFECYCLE_Y = WEBUIMessages.ADD_LISTENER_WIZARD_LIFECYCLE_Y;
- public final static String ADD_LISTENER_WIZARD_CHANGES_TO_ATTRIBUTES = WEBUIMessages.ADD_LISTENER_WIZARD_CHANGES_TO_ATTRIBUTES;
- public final static String ADD_LISTENER_WIZARD_CHANGES_TO_ATTRIBUTES_C = WEBUIMessages.ADD_LISTENER_WIZARD_CHANGES_TO_ATTRIBUTES_C;
- public final static String ADD_LISTENER_WIZARD_CHANGES_TO_ATTRIBUTES_H = WEBUIMessages.ADD_LISTENER_WIZARD_CHANGES_TO_ATTRIBUTES_H;
- public final static String ADD_LISTENER_WIZARD_CHANGES_TO_ATTRIBUTES_G = WEBUIMessages.ADD_LISTENER_WIZARD_CHANGES_TO_ATTRIBUTES_G;
- public final static String ADD_LISTENER_WIZARD_SESSION_MIGRATION = WEBUIMessages.ADD_LISTENER_WIZARD_SESSION_MIGRATION;
- public final static String ADD_LISTENER_WIZARD_OBJECT_BINDING = WEBUIMessages.ADD_LISTENER_WIZARD_OBJECT_BINDING;
-
- // common
- public final static String ADD_BUTTON_LABEL = WEBUIMessages.ADD_BUTTON_LABEL;
- public final static String ADD_BUTTON_LABEL_A = WEBUIMessages.ADD_BUTTON_LABEL_A;
- public final static String ADD_BUTTON_LABEL_D = WEBUIMessages.ADD_BUTTON_LABEL_D;
- public final static String EDIT_BUTTON_LABEL = WEBUIMessages.EDIT_BUTTON_LABEL;
- public final static String EDIT_BUTTON_LABEL_E = WEBUIMessages.EDIT_BUTTON_LABEL_E;
- public final static String EDIT_BUTTON_LABEL_T = WEBUIMessages.EDIT_BUTTON_LABEL_T;
- public final static String REMOVE_BUTTON_LABEL = WEBUIMessages.REMOVE_BUTTON_LABEL;
- public final static String REMOVE_BUTTON_LABEL_R = WEBUIMessages.REMOVE_BUTTON_LABEL_R;
- public final static String REMOVE_BUTTON_LABEL_V = WEBUIMessages.REMOVE_BUTTON_LABEL_V;
- public final static String URL_PATTERN_TITLE = WEBUIMessages.URL_PATTERN_TITLE;
- public final static String URL_PATTERN_LABEL = WEBUIMessages.URL_PATTERN_LABEL;
- public final static String FOLDER_LABEL = WEBUIMessages.FOLDER_LABEL;
- public final static String JAVA_PACKAGE_LABEL = WEBUIMessages.JAVA_PACKAGE_LABEL;
- public final static String CLASS_NAME_LABEL = WEBUIMessages.CLASS_NAME_LABEL;
- public final static String SUPERCLASS_LABEL = WEBUIMessages.SUPERCLASS_LABEL;
- public final static String CONTAINER_SELECTION_DIALOG_TITLE = WEBUIMessages.CONTAINER_SELECTION_DIALOG_TITLE;
- public final static String CONTAINER_SELECTION_DIALOG_DESC = WEBUIMessages.CONTAINER_SELECTION_DIALOG_DESC;
- public final static String CONTAINER_SELECTION_DIALOG_VALIDATOR_MESG = WEBUIMessages.CONTAINER_SELECTION_DIALOG_VALIDATOR_MESG;
- public final static String PACKAGE_SELECTION_DIALOG_TITLE = WEBUIMessages.PACKAGE_SELECTION_DIALOG_TITLE;
- public final static String PACKAGE_SELECTION_DIALOG_DESC = WEBUIMessages.PACKAGE_SELECTION_DIALOG_DESC;
- public final static String PACKAGE_SELECTION_DIALOG_MSG_NONE = WEBUIMessages.PACKAGE_SELECTION_DIALOG_MSG_NONE;
- public final static String SUPERCLASS_SELECTION_DIALOG_TITLE = WEBUIMessages.SUPERCLASS_SELECTION_DIALOG_TITLE;
- public final static String SUPERCLASS_SELECTION_DIALOG_DESC = WEBUIMessages.SUPERCLASS_SELECTION_DIALOG_DESC;
- public final static String INTERFACE_SELECTION_DIALOG_TITLE = WEBUIMessages.INTERFACE_SELECTION_DIALOG_TITLE;
- public final static String INTERFACE_SELECTION_DIALOG_DESC = WEBUIMessages.INTERFACE_SELECTION_DIALOG_DESC;
- public final static String INTERFACE_SELECTION_DIALOG_MSG_NONE = WEBUIMessages.INTERFACE_SELECTION_DIALOG_MSG_NONE;
- public final static String JAVA_CLASS_MODIFIERS_LABEL = WEBUIMessages.JAVA_CLASS_MODIFIERS_LABEL;
- public final static String JAVA_CLASS_INTERFACES_LABEL = WEBUIMessages.JAVA_CLASS_INTERFACES_LABEL;
- public final static String JAVA_CLASS_METHOD_STUBS_LABEL = WEBUIMessages.JAVA_CLASS_METHOD_STUBS_LABEL;
- public final static String JAVA_CLASS_PUBLIC_CHECKBOX_LABEL = WEBUIMessages.JAVA_CLASS_PUBLIC_CHECKBOX_LABEL;
- public final static String JAVA_CLASS_ABSTRACT_CHECKBOX_LABEL = WEBUIMessages.JAVA_CLASS_ABSTRACT_CHECKBOX_LABEL;
- public final static String JAVA_CLASS_FINAL_CHECKBOX_LABEL = WEBUIMessages.JAVA_CLASS_FINAL_CHECKBOX_LABEL;
- public final static String JAVA_CLASS_CONSTRUCTOR_CHECKBOX_LABEL = WEBUIMessages.JAVA_CLASS_CONSTRUCTOR_CHECKBOX_LABEL;
- public final static String JAVA_CLASS_MAIN_CHECKBOX_LABEL = WEBUIMessages.JAVA_CLASS_MAIN_CHECKBOX_LABEL;
- public final static String JAVA_CLASS_INHERIT_CHECKBOX_LABEL = WEBUIMessages.JAVA_CLASS_INHERIT_CHECKBOX_LABEL;
- public final static String JAVA_CLASS_BROWER_DIALOG_TITLE = WEBUIMessages.JAVA_CLASS_BROWER_DIALOG_TITLE;
- public final static String JAVA_CLASS_BROWER_DIALOG_MESSAGE = WEBUIMessages.JAVA_CLASS_BROWER_DIALOG_MESSAGE;
-
- public final static String NAME_TITLE = WEBUIMessages.NAME_TITLE;
- public final static String NAME_LABEL = WEBUIMessages.NAME_LABEL;
- public final static String DESCRIPTION_TITLE = WEBUIMessages.DESCRIPTION_TITLE;
- public final static String DESCRIPTION_LABEL = WEBUIMessages.DESCRIPTION_LABEL;
- public final static String VALUE_TITLE = WEBUIMessages.VALUE_TITLE;
- public final static String VALUE_LABEL = WEBUIMessages.VALUE_LABEL;
- public final static String EMPTY_STRING = ""; //$NON-NLS-1$
- public final static String BROWSE_BUTTON_LABEL = WEBUIMessages.BROWSE_BUTTON_LABEL;
- public static final String REMOVE_BUTTON = WEBUIMessages.REMOVE_BUTTON;
- public final static String SELECT_ALL_BUTTON = WEBUIMessages.SELECT_ALL_BUTTON;
- public final static String CLEAR_BUTTON = WEBUIMessages.CLEAR_BUTTON;
-
-
- public final static String NEW_JAVA_CLASS_DESTINATION_WIZARD_PAGE_DESC = WEBUIMessages.NEW_JAVA_CLASS_DESTINATION_WIZARD_PAGE_DESC;
- public final static String NEW_JAVA_CLASS_OPTIONS_WIZARD_PAGE_DESC = WEBUIMessages.NEW_JAVA_CLASS_OPTIONS_WIZARD_PAGE_DESC;
-
- public final static String ImportWARAction_UI_ = WEBUIMessages.ImportWARAction_UI_;
- public final static String ExportWARAction_UI_ = WEBUIMessages.ExportWARAction_UI_;
-
- public final static String NO_WEB_PROJECTS = WEBUIMessages.NO_WEB_PROJECTS;
-
- public static final String SERVLETS = WEBUIMessages.SERVLETS;
-
- public static final String CONVERT_TO_WEB_TITLE = WEBUIMessages.ConvertToWebTitle;
- public static final String SELECT_WEB_VERSION = WEBUIMessages.SelectWebVersion;
-}
diff --git a/plugins/org.eclipse.jst.servlet.ui/servlet_ui/org/eclipse/jst/servlet/ui/internal/wizard/MultiSelectFilteredFileSelectionDialog.java b/plugins/org.eclipse.jst.servlet.ui/servlet_ui/org/eclipse/jst/servlet/ui/internal/wizard/MultiSelectFilteredFileSelectionDialog.java
deleted file mode 100644
index 4565ebe..0000000
--- a/plugins/org.eclipse.jst.servlet.ui/servlet_ui/org/eclipse/jst/servlet/ui/internal/wizard/MultiSelectFilteredFileSelectionDialog.java
+++ /dev/null
@@ -1,691 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2003, 2008 IBM Corporation and others.
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
- *
- * Contributors:
- * IBM Corporation - initial API and implementation
- * Kaloyan Raev, kaloyan.raev@sap.com
- *******************************************************************************/
-package org.eclipse.jst.servlet.ui.internal.wizard;
-
-import static org.eclipse.jst.j2ee.web.IServletConstants.QUALIFIED_SERVLET;
-import static org.eclipse.jst.servlet.ui.internal.wizard.IWebWizardConstants.DEFAULT_PACKAGE;
-
-import java.util.ArrayList;
-
-import org.eclipse.core.resources.IFile;
-import org.eclipse.core.resources.IProject;
-import org.eclipse.core.resources.IResource;
-import org.eclipse.core.runtime.Status;
-import org.eclipse.jdt.core.IJavaElement;
-import org.eclipse.jdt.core.IJavaProject;
-import org.eclipse.jdt.core.IType;
-import org.eclipse.jdt.core.ITypeHierarchy;
-import org.eclipse.jdt.ui.ISharedImages;
-import org.eclipse.jdt.ui.JavaUI;
-import org.eclipse.jface.dialogs.IDialogConstants;
-import org.eclipse.jface.dialogs.MessageDialog;
-import org.eclipse.jface.operation.IRunnableContext;
-import org.eclipse.jface.viewers.ILabelProvider;
-import org.eclipse.jface.viewers.LabelProvider;
-import org.eclipse.jst.j2ee.internal.dialogs.FilteredFileSelectionDialog;
-import org.eclipse.jst.j2ee.internal.dialogs.TwoArrayQuickSorter;
-import org.eclipse.jst.j2ee.internal.dialogs.TypedFileViewerFilter;
-import org.eclipse.jst.j2ee.internal.web.providers.WebAppEditResourceHandler;
-import org.eclipse.jst.servlet.ui.internal.plugin.ServletUIPlugin;
-import org.eclipse.swt.SWT;
-import org.eclipse.swt.events.DisposeEvent;
-import org.eclipse.swt.events.DisposeListener;
-import org.eclipse.swt.events.SelectionEvent;
-import org.eclipse.swt.events.SelectionListener;
-import org.eclipse.swt.graphics.Image;
-import org.eclipse.swt.layout.GridData;
-import org.eclipse.swt.layout.GridLayout;
-import org.eclipse.swt.widgets.Button;
-import org.eclipse.swt.widgets.Composite;
-import org.eclipse.swt.widgets.Control;
-import org.eclipse.swt.widgets.Event;
-import org.eclipse.swt.widgets.Label;
-import org.eclipse.swt.widgets.Listener;
-import org.eclipse.swt.widgets.Shell;
-import org.eclipse.swt.widgets.Table;
-import org.eclipse.swt.widgets.TableItem;
-import org.eclipse.swt.widgets.Text;
-import org.eclipse.ui.PlatformUI;
-import org.eclipse.ui.dialogs.ElementTreeSelectionDialog;
-import org.eclipse.ui.dialogs.ISelectionStatusValidator;
-import org.eclipse.ui.model.WorkbenchContentProvider;
-import org.eclipse.ui.part.PageBook;
-
-/**
- * Insert the type's description here.
- * Creation date: (7/30/2001 11:16:36 AM)
- */
-public class MultiSelectFilteredFileSelectionDialog extends
- FilteredFileSelectionDialog implements SelectionListener {
-
-
- private static class PackageRenderer extends LabelProvider {
- private final Image PACKAGE_ICON = JavaUI.getSharedImages().getImage(ISharedImages.IMG_OBJS_PACKAGE);
-
- @Override
- public String getText(Object element) {
- IType type = (IType) element;
- String p = type.getPackageFragment().getElementName();
- if ("".equals(p)) //$NON-NLS-1$
- p = DEFAULT_PACKAGE;
- return (p + " - " + type.getPackageFragment().getParent().getPath().toString()); //$NON-NLS-1$
- }
- @Override
- public Image getImage(Object element) {
- return PACKAGE_ICON;
- }
- }
-
- private static class TypeRenderer extends LabelProvider {
- private final Image CLASS_ICON = JavaUI.getSharedImages().getImage(ISharedImages.IMG_OBJS_CLASS);
-
- @Override
- public String getText(Object element) {
- IType e = ((IType) element);
- return e.getElementName();
- }
-
- @Override
- public Image getImage(Object element) {
- return CLASS_ICON;
- }
-
- }
- public final static int JSP = 0;
- public final static int SERVLET = 1;
- protected Button fServletButton;
- protected Button fJSPButton;
- protected int fSelection = -1;
- protected PageBook fPageBook = null;
- protected Control fJspControl = null;
- protected Control fServletControl = null;
- protected Composite fChild = null;
- // construction parameters
- protected IRunnableContext fRunnableContext;
- protected ILabelProvider fElementRenderer;
- protected ILabelProvider fQualifierRenderer;
- private Object[] fElements;
- private boolean fIgnoreCase = true;
- private String fUpperListLabel;
- private String fLowerListLabel;
- // SWT widgets
- private Table fUpperList;
- private Table fLowerList;
- protected Text fText;
- private IType[] fIT;
- private String[] fRenderedStrings;
- private int[] fElementMap;
- private Integer[] fQualifierMap;
- private Object fInput;
-
- private ISelectionStatusValidator fLocalValidator = null;
- /**
- * MultiSelectFilteredFileSelectionDialog constructor comment.
- * @param parent Shell
- * @param title String
- * @param message String
- * @parent extensions String[]
- * @param allowMultiple boolean
- */
- public MultiSelectFilteredFileSelectionDialog(Shell parent, String title, String message, String[] extensions, boolean allowMultiple, IProject project) {
- super(parent, title, message, extensions, allowMultiple);
- setShellStyle(SWT.DIALOG_TRIM | SWT.APPLICATION_MODAL | SWT.RESIZE);
-
- if (title == null)
- setTitle(WebAppEditResourceHandler.getString("File_Selection_UI_")); //$NON-NLS-1$
- if (message == null)
- {
- setMessage(WebAppEditResourceHandler.getString("Select_a_file__UI_")); //$NON-NLS-1$
- }
- fLocalValidator = new SimpleTypedElementSelectionValidator(new Class[] { IFile.class }, allowMultiple);
- setValidator(fLocalValidator);
-
- //StatusInfo currStatus = new StatusInfo();
- //currStatus.setOK();
- Status currStatus = new Status(Status.OK, ServletUIPlugin.PLUGIN_ID, Status.OK, "", null);//$NON-NLS-1$
-
- updateStatus(currStatus);
- fElementRenderer = new TypeRenderer();
- fQualifierRenderer = new PackageRenderer();
- fRunnableContext = ServletUIPlugin.getDefault().getWorkbench().getActiveWorkbenchWindow();
- try {
- IJavaElement jelem = null;
- IProject proj = null;
- jelem = (IJavaElement) project.getAdapter(IJavaElement.class);
- if (jelem == null) {
- IResource resource = (IResource) project.getAdapter(IResource.class);
- if (resource != null) {
- proj = resource.getProject();
- if (proj != null) {
- jelem = org.eclipse.jdt.core.JavaCore.create(proj);
- }
- }
- }
- if(jelem != null){
- IJavaProject jp = jelem.getJavaProject();
-
- IType servletType = jp.findType(QUALIFIED_SERVLET);
- ArrayList servletClasses = new ArrayList();
- if (servletType != null)
- {
- ITypeHierarchy tH = servletType.newTypeHierarchy(jp, null);
- IType[] types = tH.getAllSubtypes(servletType);
- for (int i = 0; i < types.length; i++) {
- if (types[i].isClass() && !servletClasses.contains(types[i]))
- servletClasses.add(types[i]);
- }
- }
- fIT = (IType[]) servletClasses.toArray(new IType[servletClasses.size()]);
- servletClasses = null;
- }
- } catch (Exception e) {
- ServletUIPlugin.log(e);
- }
- }
-
- /**
- * @private
- */
- @Override
- protected void computeResult() {
- if (fSelection == JSP) {
- super.computeResult();
- } else {
- IType type = (IType) getWidgetSelection();
- if (type != null) {
- java.util.List result = new ArrayList(1);
- result.add(type);
- setResult(result);
- }
- }
- }
-
- @Override
- public void create() {
- super.create();
- fText.setFocus();
- rematch(""); //$NON-NLS-1$
- updateOkState();
- }
-
- /**
- * Creates and returns the contents of this dialog's
- * button bar.
- * <p>
- * The <code>Dialog</code> implementation of this framework method
- * lays out a button bar and calls the <code>createButtonsForButtonBar</code>
- * framework method to populate it. Subclasses may override.
- * </p>
- *
- * @param parent the parent composite to contain the button bar
- * @return the button bar control
- */
- @Override
- protected Control createButtonBar(Composite parent) {
-
- Composite composite = new Composite(parent, SWT.NULL);
- GridLayout layout = new GridLayout();
-
- layout.numColumns = 2;
-
- layout.marginHeight = 0;
- layout.marginWidth = 0;
- composite.setLayout(layout);
- composite.setLayoutData(new GridData(GridData.FILL_HORIZONTAL));
-
- Composite composite2 = new Composite(composite, SWT.NONE);
-
- // create a layout with spacing and margins appropriate for the font size.
- layout = new GridLayout();
- layout.numColumns = 0; // this is incremented by createButton
- layout.makeColumnsEqualWidth = true;
- layout.marginWidth = convertHorizontalDLUsToPixels(org.eclipse.jface.dialogs.IDialogConstants.HORIZONTAL_MARGIN);
- layout.marginHeight = convertVerticalDLUsToPixels(org.eclipse.jface.dialogs.IDialogConstants.VERTICAL_MARGIN);
- layout.horizontalSpacing = convertHorizontalDLUsToPixels(org.eclipse.jface.dialogs.IDialogConstants.HORIZONTAL_SPACING);
- layout.verticalSpacing = convertVerticalDLUsToPixels(org.eclipse.jface.dialogs.IDialogConstants.VERTICAL_SPACING);
-
- composite2.setLayout(layout);
-
- GridData data = new GridData(GridData.HORIZONTAL_ALIGN_END | GridData.VERTICAL_ALIGN_CENTER);
- composite2.setLayoutData(data);
-
- composite2.setFont(parent.getFont());
-
- // Add the buttons to the button bar.
- super.createButtonsForButtonBar(composite2);
-
- return composite;
- }
-
- /*
- * @private
- */
- @Override
- protected Control createDialogArea(Composite parent) {
- GridData gd = new GridData();
-
- fChild = new Composite(parent, SWT.NONE);
- PlatformUI.getWorkbench().getHelpSystem().setHelp(fChild, "com.ibm.etools.webapplicationedit.webx2010"); //$NON-NLS-1$
- GridLayout gl = new GridLayout();
- gl.numColumns = 2;
- gl.marginHeight = 0;
- fChild.setLayout(gl);
-
- gd.verticalAlignment = GridData.FILL;
- gd.grabExcessVerticalSpace = true;
- fChild.setLayoutData(gd);
-
- // Create the Web Type radio buttons and text fields.
- fServletButton = new Button(fChild, SWT.RADIO);
- fServletButton.setText(WebAppEditResourceHandler.getString("Servlet_UI_")); //$NON-NLS-1$ = Servlet
- gd = new GridData();
- fServletButton.setLayoutData(gd);
- fServletButton.addSelectionListener(this);
-
- fJSPButton = new Button(fChild, SWT.RADIO);
- fJSPButton.setText(WebAppEditResourceHandler.getString("JSP_UI_")); //$NON-NLS-1$ = JSP
- gd = new GridData();
- fJSPButton.setLayoutData(gd);
- fJSPButton.addSelectionListener(this);
-
- if (fSelection == JSP)
- fJSPButton.setSelection(true);
- else {
- fServletButton.setSelection(true);
- fSelection = SERVLET;
- }
-
- fPageBook = new PageBook(fChild, SWT.NONE);
- gd = new GridData();
- gd.horizontalAlignment = GridData.FILL;
- gd.verticalAlignment = GridData.FILL;
- gd.grabExcessHorizontalSpace = true;
- gd.grabExcessVerticalSpace = true;
- gd.horizontalSpan = 2;
- fPageBook.setLayoutData(gd);
- fJspControl = super.createDialogArea(fPageBook);
-
- Composite composite = new Composite(fPageBook, SWT.NONE);
- GridLayout layout = new GridLayout();
- layout.marginHeight = convertVerticalDLUsToPixels(IDialogConstants.VERTICAL_MARGIN);
- layout.marginWidth = convertHorizontalDLUsToPixels(IDialogConstants.HORIZONTAL_MARGIN);
- layout.verticalSpacing = convertVerticalDLUsToPixels(IDialogConstants.VERTICAL_SPACING);
- layout.horizontalSpacing = convertHorizontalDLUsToPixels(IDialogConstants.HORIZONTAL_SPACING);
- composite.setLayout(layout);
- composite.setLayoutData(new GridData(GridData.FILL_BOTH));
- composite.setFont(parent.getFont());
-
- Label messageLabel = new Label(composite, SWT.NONE);
- gd = new GridData();
- messageLabel.setLayoutData(gd);
- messageLabel.setText(WebAppEditResourceHandler.getString("Choose_a_servlet__1")); //$NON-NLS-1$
-
- fText = createText(composite);
-
- messageLabel = new Label(composite, SWT.NONE);
- gd = new GridData();
- messageLabel.setLayoutData(gd);
- messageLabel.setText(WebAppEditResourceHandler.getString("Matching_servlets__2")); //$NON-NLS-1$
-
- fUpperList = createUpperList(composite);
-
- messageLabel = new Label(composite, SWT.NONE);
- gd = new GridData();
- messageLabel.setLayoutData(gd);
- messageLabel.setText(WebAppEditResourceHandler.getString("Qualifier__3")); //$NON-NLS-1$
-
- fLowerList = createLowerList(composite);
-
- fServletControl = composite;
-
- if (fSelection == JSP)
- fPageBook.showPage(fJspControl);
- else
- fPageBook.showPage(fServletControl);
- return parent;
- }
-
- /**
- * Creates the list widget and sets layout data.
- * @return org.eclipse.swt.widgets.List
- */
- private Table createLowerList(Composite parent) {
- if (fLowerListLabel != null)
- (new Label(parent, SWT.NONE)).setText(fLowerListLabel);
-
- Table list = new Table(parent, SWT.BORDER | SWT.V_SCROLL | SWT.H_SCROLL);
- list.addListener(SWT.Selection, new Listener() {
- public void handleEvent(Event evt) {
- handleLowerSelectionChanged();
- }
- });
- list.addListener(SWT.MouseDoubleClick, new Listener() {
- public void handleEvent(Event evt) {
- handleLowerDoubleClick();
- }
- });
- list.addDisposeListener(new DisposeListener() {
- public void widgetDisposed(DisposeEvent e) {
- fQualifierRenderer.dispose();
- }
- });
- GridData spec = new GridData();
- spec.widthHint = convertWidthInCharsToPixels(50);
- spec.heightHint = convertHeightInCharsToPixels(5);
- spec.grabExcessVerticalSpace = true;
- spec.grabExcessHorizontalSpace = true;
- spec.horizontalAlignment = GridData.FILL;
- spec.verticalAlignment = GridData.FILL;
- list.setLayoutData(spec);
- return list;
- }
-
- /**
- * Creates the text widget and sets layout data.
- * @return org.eclipse.swt.widgets.Text
- */
- private Text createText(Composite parent) {
- Text text = new Text(parent, SWT.BORDER);
- GridData spec = new GridData();
- spec.grabExcessVerticalSpace = false;
- spec.grabExcessHorizontalSpace = true;
- spec.horizontalAlignment = GridData.FILL;
- spec.verticalAlignment = GridData.BEGINNING;
- text.setLayoutData(spec);
- Listener l = new Listener() {
- public void handleEvent(Event evt) {
- rematch(fText.getText());
- }
- };
- text.addListener(SWT.Modify, l);
- return text;
- }
-
- /**
- * Creates the list widget and sets layout data.
- * @return org.eclipse.swt.widgets.List
- */
- private Table createUpperList(Composite parent) {
- if (fUpperListLabel != null)
- (new Label(parent, SWT.NONE)).setText(fUpperListLabel);
-
- Table list = new Table(parent, SWT.BORDER | SWT.V_SCROLL | SWT.H_SCROLL);
- list.addListener(SWT.Selection, new Listener() {
- public void handleEvent(Event evt) {
- handleUpperSelectionChanged();
- }
- });
- list.addListener(SWT.MouseDoubleClick, new Listener() {
- public void handleEvent(Event evt) {
- handleUpperDoubleClick();
- }
- });
- list.addDisposeListener(new DisposeListener() {
- public void widgetDisposed(DisposeEvent e) {
- fElementRenderer.dispose();
- }
- });
- GridData spec = new GridData();
- spec.widthHint = convertWidthInCharsToPixels(50);
- spec.heightHint = convertHeightInCharsToPixels(15);
- spec.grabExcessVerticalSpace = true;
- spec.grabExcessHorizontalSpace = true;
- spec.horizontalAlignment = GridData.FILL;
- spec.verticalAlignment = GridData.FILL;
- list.setLayoutData(spec);
- return list;
- }
-
- /**
- * @return the ID of the button that is 'pressed' on doubleClick in the lists.
- * By default it is the OK button.
- * Override to change this setting.
- */
- protected int getDefaultButtonID() {
- return IDialogConstants.OK_ID;
- }
-
- public int getSelectedItem() {
- return fSelection;
- }
-
- protected Object getWidgetSelection() {
- int i = fLowerList.getSelectionIndex();
- if (fQualifierMap != null) {
- if (fQualifierMap.length == 1)
- i = 0;
- if (i < 0) {
- return null;
- }
- Integer index = fQualifierMap[i];
- return fElements[index.intValue()];
- }
- return null;
- }
-
- protected final void handleLowerDoubleClick() {
- if (getWidgetSelection() != null)
- buttonPressed(getDefaultButtonID());
- }
-
- protected final void handleLowerSelectionChanged() {
- updateOkState();
- }
-
- protected final void handleUpperDoubleClick() {
- if (getWidgetSelection() != null)
- buttonPressed(getDefaultButtonID());
- }
-
- protected final void handleUpperSelectionChanged() {
- int selection = fUpperList.getSelectionIndex();
- if (selection >= 0) {
- int i = fElementMap[selection];
- int k = i;
- int length = fRenderedStrings.length;
- while (k < length && fRenderedStrings[k].equals(fRenderedStrings[i])) {
- k++;
- }
- updateLowerListWidget(i, k);
- } else
- updateLowerListWidget(0, 0);
- }
-
- @Override
- public int open() {
-
- if (fIT == null || fIT.length == 0) {
- if (!hasJSPs())
- {
- MessageDialog.openInformation(getShell(), WebAppEditResourceHandler.getString("Empty_List_1"), WebAppEditResourceHandler.getString("_INFO_No_servlets_exist_to_add._1")); //$NON-NLS-2$ //$NON-NLS-1$
- return CANCEL;
- }
- fSelection = JSP;
- }
- setElements(fIT);
- setInitialSelection(""); //$NON-NLS-1$
- return super.open();
- }
-
- /**
- * update the list to reflect a new match string.
- * @param matchString java.lang.String
- */
- protected final void rematch(String matchString) {
- int k = 0;
- String text = fText.getText();
- StringMatcher matcher = new StringMatcher(text + "*", fIgnoreCase, false); //$NON-NLS-1$
- String lastString = null;
- int length = fElements.length;
- for (int i = 0; i < length; i++) {
- while (i < length && fRenderedStrings[i].equals(lastString))
- i++;
- if (i < length) {
- lastString = fRenderedStrings[i];
- if (matcher.match(fRenderedStrings[i])) {
- fElementMap[k] = i;
- k++;
- }
- }
- }
- fElementMap[k] = -1;
-
- updateUpperListWidget(fElementMap, k);
- }
-
- /**
- *
- * @return java.lang.String[]
- * @param p org.eclipse.jface.elements.IIndexedProperty
- */
- private String[] renderStrings(Object[] p) {
- String[] strings = new String[p.length];
- int size = strings.length;
- for (int i = 0; i < size; i++) {
- strings[i] = fElementRenderer.getText(p[i]);
- }
- new TwoArrayQuickSorter(fIgnoreCase).sort(strings, p);
- return strings;
- }
-
- public void setElements(Object[] elements) {
- fElements = elements;
- fElementMap = new int[fElements.length + 1];
- fRenderedStrings = renderStrings(fElements);
- }
-
- public void setSelectedItem(int newSelection) {
- fSelection = newSelection;
- }
-
- private void updateLowerListWidget(int from, int to) {
- fLowerList.removeAll();
- fQualifierMap = new Integer[to - from];
- String[] qualifiers = new String[to - from];
- for (int i = from; i < to; i++) {
- // XXX: 1G65LDG: JFUIF:WIN2000 - ILabelProvider used outside a viewer
- qualifiers[i - from] = fQualifierRenderer.getText(fElements[i]);
- fQualifierMap[i - from] = new Integer(i);
- }
-
- new TwoArrayQuickSorter(fIgnoreCase).sort(qualifiers, fQualifierMap);
-
- for (int i = 0; i < to - from; i++) {
- TableItem ti = new TableItem(fLowerList, i);
- ti.setText(qualifiers[i]);
- // XXX: 1G65LDG: JFUIF:WIN2000 - ILabelProvider used outside a viewer
- Image img = fQualifierRenderer.getImage(fElements[from + i]);
- if (img != null)
- ti.setImage(img);
- }
-
- if (fLowerList.getItemCount() > 0)
- fLowerList.setSelection(0);
- updateOkState();
- }
-
- private void updateOkState() {
- Button okButton = getOkButton();
- if (okButton != null)
- okButton.setEnabled(getWidgetSelection() != null);
- }
-
- private void updateUpperListWidget(int[] indices, int size) {
- fUpperList.setRedraw(false);
- int itemCount = fUpperList.getItemCount();
- if (size < itemCount)
- fUpperList.remove(0, itemCount - size - 1);
- TableItem[] items = fUpperList.getItems();
- for (int i = 0; i < size; i++) {
- TableItem ti = null;
- if (i < itemCount)
- ti = items[i];
- else
- ti = new TableItem(fUpperList, i);
- ti.setText(fRenderedStrings[indices[i]]);
- // XXX: 1G65LDG: JFUIF:WIN2000 - ILabelProvider used outside a viewer
- Image img = fElementRenderer.getImage(fElements[indices[i]]);
- if (img != null)
- ti.setImage(img);
- }
- if (fUpperList.getItemCount() > 0)
- fUpperList.setSelection(0);
- fUpperList.setRedraw(true);
- handleUpperSelectionChanged();
- }
-
- /**
- * Sent when default selection occurs in the control.
- * <p>
- * For example, on some platforms default selection occurs
- * in a List when the user double-clicks an item or types
- * return in a Text.
- * </p>
- *
- * @param e an event containing information about the default selection
- */
- public void widgetDefaultSelected(SelectionEvent e) {
- // Do nothing
- }
-
- /**
- * Sent when selection occurs in the control.
- * <p>
- * For example, on some platforms selection occurs in
- * a List when the user selects an item or items.
- * </p>
- *
- * @param e an event containing information about the selection
- */
- public void widgetSelected(SelectionEvent e) {
- if (e.widget == fJSPButton) {
- fSelection = JSP;
- fPageBook.showPage(fJspControl);
- updateOKStatus();
- } else if (e.widget == fServletButton) {
- fSelection = SERVLET;
- fPageBook.showPage(fServletControl);
- } else
- fSelection = -1;
- }
-
- /**
- * @see ElementTreeSelectionDialog#updateOKStatus()
- */
- @Override
- protected void updateOKStatus() {
- super.updateOKStatus();
- Button okButton = getOkButton();
- if (okButton != null)
- okButton.setEnabled(fLocalValidator.validate(getResult()).isOK());
- }
-
- private boolean hasJSPs() {
- WorkbenchContentProvider workbenchContentProvider = new WorkbenchContentProvider();
- Object[] elements = workbenchContentProvider.getElements(fInput);
- if (elements.length > 0) {
- TypedFileViewerFilter viewerFilter = new TypedFileViewerFilter(getExtensions());
- elements = viewerFilter.filter(getTreeViewer(), fInput, elements);
- }
- return elements.length != 0;
- }
-
- /**
- * Sets the tree input.
- * @param input the tree input.
- */
- @Override
- public void setInput(Object input) {
- fInput = input;
- super.setInput(input);
- }
-}
diff --git a/plugins/org.eclipse.jst.servlet.ui/servlet_ui/org/eclipse/jst/servlet/ui/internal/wizard/MultiSelectFilteredFilterFileSelectionDialog.java b/plugins/org.eclipse.jst.servlet.ui/servlet_ui/org/eclipse/jst/servlet/ui/internal/wizard/MultiSelectFilteredFilterFileSelectionDialog.java
deleted file mode 100644
index 4b84465..0000000
--- a/plugins/org.eclipse.jst.servlet.ui/servlet_ui/org/eclipse/jst/servlet/ui/internal/wizard/MultiSelectFilteredFilterFileSelectionDialog.java
+++ /dev/null
@@ -1,606 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2007, 2008 SAP AG and others.
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
- *
- * Contributors:
- * Kaloyan Raev, kaloyan.raev@sap.com - initial API and implementation
- *******************************************************************************/
-package org.eclipse.jst.servlet.ui.internal.wizard;
-
-import static org.eclipse.jst.j2ee.web.IServletConstants.QUALIFIED_FILTER;
-import static org.eclipse.jst.servlet.ui.internal.wizard.IWebWizardConstants.DEFAULT_PACKAGE;
-
-import java.util.ArrayList;
-
-import org.eclipse.core.resources.IFile;
-import org.eclipse.core.resources.IProject;
-import org.eclipse.core.resources.IResource;
-import org.eclipse.core.runtime.Status;
-import org.eclipse.jdt.core.IJavaElement;
-import org.eclipse.jdt.core.IJavaProject;
-import org.eclipse.jdt.core.IType;
-import org.eclipse.jdt.core.ITypeHierarchy;
-import org.eclipse.jdt.ui.ISharedImages;
-import org.eclipse.jdt.ui.JavaUI;
-import org.eclipse.jface.dialogs.IDialogConstants;
-import org.eclipse.jface.dialogs.MessageDialog;
-import org.eclipse.jface.operation.IRunnableContext;
-import org.eclipse.jface.viewers.ILabelProvider;
-import org.eclipse.jface.viewers.LabelProvider;
-import org.eclipse.jst.j2ee.internal.dialogs.FilteredFileSelectionDialog;
-import org.eclipse.jst.j2ee.internal.dialogs.TwoArrayQuickSorter;
-import org.eclipse.jst.j2ee.internal.dialogs.TypedFileViewerFilter;
-import org.eclipse.jst.j2ee.internal.web.providers.WebAppEditResourceHandler;
-import org.eclipse.jst.servlet.ui.internal.plugin.ServletUIPlugin;
-import org.eclipse.swt.SWT;
-import org.eclipse.swt.events.DisposeEvent;
-import org.eclipse.swt.events.DisposeListener;
-import org.eclipse.swt.events.SelectionEvent;
-import org.eclipse.swt.graphics.Image;
-import org.eclipse.swt.layout.GridData;
-import org.eclipse.swt.layout.GridLayout;
-import org.eclipse.swt.widgets.Button;
-import org.eclipse.swt.widgets.Composite;
-import org.eclipse.swt.widgets.Control;
-import org.eclipse.swt.widgets.Event;
-import org.eclipse.swt.widgets.Label;
-import org.eclipse.swt.widgets.Listener;
-import org.eclipse.swt.widgets.Shell;
-import org.eclipse.swt.widgets.Table;
-import org.eclipse.swt.widgets.TableItem;
-import org.eclipse.swt.widgets.Text;
-import org.eclipse.ui.PlatformUI;
-import org.eclipse.ui.dialogs.ElementTreeSelectionDialog;
-import org.eclipse.ui.dialogs.ISelectionStatusValidator;
-import org.eclipse.ui.part.PageBook;
-
-/**
- * Insert the type's description here.
- * Creation date: (7/30/2001 11:16:36 AM)
- */
-public class MultiSelectFilteredFilterFileSelectionDialog extends
- FilteredFileSelectionDialog {
-
-
- private static class PackageRenderer extends LabelProvider {
- private final Image PACKAGE_ICON = JavaUI.getSharedImages().getImage(ISharedImages.IMG_OBJS_PACKAGE);
-
- @Override
- public String getText(Object element) {
- IType type = (IType) element;
- String p = type.getPackageFragment().getElementName();
- if ("".equals(p)) //$NON-NLS-1$
- p = DEFAULT_PACKAGE;
- return (p + " - " + type.getPackageFragment().getParent().getPath().toString()); //$NON-NLS-1$
- }
- @Override
- public Image getImage(Object element) {
- return PACKAGE_ICON;
- }
- }
-
- private static class TypeRenderer extends LabelProvider {
- private final Image CLASS_ICON = JavaUI.getSharedImages().getImage(ISharedImages.IMG_OBJS_CLASS);
-
- @Override
- public String getText(Object element) {
- IType e = ((IType) element);
- return e.getElementName();
- }
-
- @Override
- public Image getImage(Object element) {
- return CLASS_ICON;
- }
-
- }
- protected PageBook fPageBook = null;
- protected Control fServletControl = null;
- protected Composite fChild = null;
- // construction parameters
- protected IRunnableContext fRunnableContext;
- protected ILabelProvider fElementRenderer;
- protected ILabelProvider fQualifierRenderer;
- private Object[] fElements;
- private boolean fIgnoreCase = true;
- private String fUpperListLabel;
- private String fLowerListLabel;
- // SWT widgets
- private Table fUpperList;
- private Table fLowerList;
- protected Text fText;
- private IType[] fIT;
- private String[] fRenderedStrings;
- private int[] fElementMap;
- private Integer[] fQualifierMap;
-
- private ISelectionStatusValidator fLocalValidator = null;
- /**
- * This is a selection dialog for available servlet.
- * @param parent Shell
- * @param title String
- * @param message String
- * @parent extensions String[]
- * @param allowMultiple boolean
- */
- public MultiSelectFilteredFilterFileSelectionDialog(Shell parent, String title, String message, String[] extensions, boolean allowMultiple, IProject project) {
- super(parent, title, message, extensions, allowMultiple);
- setShellStyle(SWT.DIALOG_TRIM | SWT.APPLICATION_MODAL | SWT.RESIZE);
-
- if (title == null)
- setTitle(WebAppEditResourceHandler.getString("File_Selection_UI_")); //$NON-NLS-1$
- String innerMessage = message;
- if (innerMessage == null)
- innerMessage = WebAppEditResourceHandler.getString("Select_a_file__UI_"); //$NON-NLS-1$
- setMessage(innerMessage);
- setExtensions(extensions);
- addFilter(new TypedFileViewerFilter(extensions));
- fLocalValidator = new SimpleTypedElementSelectionValidator(new Class[] { IFile.class }, allowMultiple);
- setValidator(fLocalValidator);
-
- //StatusInfo currStatus = new StatusInfo();
- //currStatus.setOK();
- Status currStatus = new Status(Status.OK, ServletUIPlugin.PLUGIN_ID, Status.OK, "", null);//$NON-NLS-1$
-
- updateStatus(currStatus);
- fElementRenderer = new TypeRenderer();
- fQualifierRenderer = new PackageRenderer();
- fRunnableContext = ServletUIPlugin.getDefault().getWorkbench().getActiveWorkbenchWindow();
- try {
- IJavaElement jelem = null;
- IProject proj = null;
- jelem = (IJavaElement) project.getAdapter(IJavaElement.class);
- if (jelem == null) {
- IResource resource = (IResource) project.getAdapter(IResource.class);
- if (resource != null) {
- proj = resource.getProject();
- if (proj != null) {
- jelem = org.eclipse.jdt.core.JavaCore.create(proj);
- }
- }
- }
- if(jelem != null){
- IJavaProject jp = jelem.getJavaProject();
- IType filterType = jp.findType(QUALIFIED_FILTER);
- // next 3 lines fix defect 177686
- if (filterType == null) {
- return;
- }
- ArrayList filterClasses = new ArrayList();
- ITypeHierarchy tH = filterType.newTypeHierarchy(jp, null);
- IType[] types = tH.getAllSubtypes(filterType);
- for (int i = 0; i < types.length; i++) {
- if (types[i].isClass() && !filterClasses.contains(types[i]))
- filterClasses.add(types[i]);
- }
- fIT = (IType[]) filterClasses.toArray(new IType[filterClasses.size()]);
- filterClasses = null;
- }
- } catch (Exception e) {
- ServletUIPlugin.log(e);
- }
- }
-
- /**
- * @private
- */
- @Override
- protected void computeResult() {
- IType type = (IType) getWidgetSelection();
- if (type != null) {
- java.util.List result = new ArrayList(1);
- result.add(type);
- setResult(result);
- }
- }
-
- @Override
- public void create() {
- super.create();
- fText.setFocus();
- rematch(""); //$NON-NLS-1$
- updateOkState();
- }
-
- /**
- * Creates and returns the contents of this dialog's
- * button bar.
- * <p>
- * The <code>Dialog</code> implementation of this framework method
- * lays out a button bar and calls the <code>createButtonsForButtonBar</code>
- * framework method to populate it. Subclasses may override.
- * </p>
- *
- * @param parent the parent composite to contain the button bar
- * @return the button bar control
- */
- @Override
- protected Control createButtonBar(Composite parent) {
- Composite composite = new Composite(parent, SWT.NULL);
- GridLayout layout = new GridLayout();
-
- layout.numColumns = 2;
-
- layout.marginHeight = 0;
- layout.marginWidth = 0;
- composite.setLayout(layout);
- composite.setLayoutData(new GridData(GridData.FILL_HORIZONTAL));
-
- Composite composite2 = new Composite(composite, SWT.NONE);
-
- // create a layout with spacing and margins appropriate for the font size.
- layout = new GridLayout();
- layout.numColumns = 0; // this is incremented by createButton
- layout.makeColumnsEqualWidth = true;
- layout.marginWidth = convertHorizontalDLUsToPixels(org.eclipse.jface.dialogs.IDialogConstants.HORIZONTAL_MARGIN);
- layout.marginHeight = convertVerticalDLUsToPixels(org.eclipse.jface.dialogs.IDialogConstants.VERTICAL_MARGIN);
- layout.horizontalSpacing = convertHorizontalDLUsToPixels(org.eclipse.jface.dialogs.IDialogConstants.HORIZONTAL_SPACING);
- layout.verticalSpacing = convertVerticalDLUsToPixels(org.eclipse.jface.dialogs.IDialogConstants.VERTICAL_SPACING);
-
- composite2.setLayout(layout);
-
- GridData data = new GridData(GridData.HORIZONTAL_ALIGN_END | GridData.VERTICAL_ALIGN_CENTER);
- composite2.setLayoutData(data);
-
- composite2.setFont(parent.getFont());
-
- // Add the buttons to the button bar.
- super.createButtonsForButtonBar(composite2);
-
- return composite;
- }
-
- /*
- * @private
- */
- @Override
- protected Control createDialogArea(Composite parent) {
- GridData gd = new GridData();
-
- fChild = new Composite(parent, SWT.NONE);
- PlatformUI.getWorkbench().getHelpSystem().setHelp(fChild, "com.ibm.etools.webapplicationedit.webx2010"); //$NON-NLS-1$
- GridLayout gl = new GridLayout();
- gl.numColumns = 2;
- gl.marginHeight = 5;
- fChild.setLayout(gl);
-
- gd.verticalAlignment = GridData.FILL;
- gd.horizontalAlignment = GridData.FILL;
- gd.grabExcessVerticalSpace = true;
- fChild.setLayoutData(gd);
-
- fPageBook = new PageBook(fChild, SWT.NONE);
- gd = new GridData();
- gd.horizontalAlignment = GridData.FILL;
- gd.verticalAlignment = GridData.FILL;
- gd.grabExcessHorizontalSpace = true;
- gd.grabExcessVerticalSpace = true;
- gd.horizontalSpan = 2;
- fPageBook.setLayoutData(gd);
- super.createDialogArea(fPageBook);
-
- Composite composite = new Composite(fPageBook, SWT.NONE);
- GridLayout layout = new GridLayout();
- layout.marginHeight = convertVerticalDLUsToPixels(IDialogConstants.VERTICAL_MARGIN);
- layout.marginWidth = convertHorizontalDLUsToPixels(IDialogConstants.HORIZONTAL_MARGIN);
- layout.verticalSpacing = convertVerticalDLUsToPixels(IDialogConstants.VERTICAL_SPACING);
- layout.horizontalSpacing = convertHorizontalDLUsToPixels(IDialogConstants.HORIZONTAL_SPACING);
- composite.setLayout(layout);
- composite.setLayoutData(new GridData(GridData.FILL_BOTH));
- composite.setFont(parent.getFont());
-
- Label messageLabel = new Label(composite, SWT.NONE);
- gd = new GridData();
- messageLabel.setLayoutData(gd);
- messageLabel.setText(WebAppEditResourceHandler.getString("Choose_a_filter__1")); //$NON-NLS-1$
-
- fText = createText(composite);
-
- messageLabel = new Label(composite, SWT.NONE);
- gd = new GridData();
- messageLabel.setLayoutData(gd);
- messageLabel.setText(WebAppEditResourceHandler.getString("Matching_filters__2")); //$NON-NLS-1$
-
- fUpperList = createUpperList(composite);
-
- messageLabel = new Label(composite, SWT.NONE);
- gd = new GridData();
- messageLabel.setLayoutData(gd);
- messageLabel.setText(WebAppEditResourceHandler.getString("Qualifier__3")); //$NON-NLS-1$
-
- fLowerList = createLowerList(composite);
-
- fServletControl = composite;
-
- fPageBook.showPage(fServletControl);
- return parent;
- }
-
- /**
- * Creates the list widget and sets layout data.
- * @return org.eclipse.swt.widgets.List
- */
- private Table createLowerList(Composite parent) {
- if (fLowerListLabel != null)
- (new Label(parent, SWT.NONE)).setText(fLowerListLabel);
-
- Table list = new Table(parent, SWT.BORDER | SWT.V_SCROLL | SWT.H_SCROLL);
- list.addListener(SWT.Selection, new Listener() {
- public void handleEvent(Event evt) {
- handleLowerSelectionChanged();
- }
- });
- list.addListener(SWT.MouseDoubleClick, new Listener() {
- public void handleEvent(Event evt) {
- handleLowerDoubleClick();
- }
- });
- list.addDisposeListener(new DisposeListener() {
- public void widgetDisposed(DisposeEvent e) {
- fQualifierRenderer.dispose();
- }
- });
- GridData spec = new GridData();
- spec.widthHint = convertWidthInCharsToPixels(50);
- spec.heightHint = convertHeightInCharsToPixels(5);
- spec.grabExcessVerticalSpace = true;
- spec.grabExcessHorizontalSpace = true;
- spec.horizontalAlignment = GridData.FILL;
- spec.verticalAlignment = GridData.FILL;
- list.setLayoutData(spec);
- return list;
- }
-
- /**
- * Creates the text widget and sets layout data.
- * @return org.eclipse.swt.widgets.Text
- */
- private Text createText(Composite parent) {
- Text text = new Text(parent, SWT.BORDER);
- GridData spec = new GridData();
- spec.grabExcessVerticalSpace = false;
- spec.grabExcessHorizontalSpace = true;
- spec.horizontalAlignment = GridData.FILL;
- spec.verticalAlignment = GridData.BEGINNING;
- text.setLayoutData(spec);
- Listener l = new Listener() {
- public void handleEvent(Event evt) {
- rematch(fText.getText());
- }
- };
- text.addListener(SWT.Modify, l);
- return text;
- }
-
- /**
- * Creates the list widget and sets layout data.
- * @return org.eclipse.swt.widgets.List
- */
- private Table createUpperList(Composite parent) {
- if (fUpperListLabel != null)
- (new Label(parent, SWT.NONE)).setText(fUpperListLabel);
-
- Table list = new Table(parent, SWT.BORDER | SWT.V_SCROLL | SWT.H_SCROLL);
- list.addListener(SWT.Selection, new Listener() {
- public void handleEvent(Event evt) {
- handleUpperSelectionChanged();
- }
- });
- list.addListener(SWT.MouseDoubleClick, new Listener() {
- public void handleEvent(Event evt) {
- handleUpperDoubleClick();
- }
- });
- list.addDisposeListener(new DisposeListener() {
- public void widgetDisposed(DisposeEvent e) {
- fElementRenderer.dispose();
- }
- });
- GridData spec = new GridData();
- spec.widthHint = convertWidthInCharsToPixels(50);
- spec.heightHint = convertHeightInCharsToPixels(15);
- spec.grabExcessVerticalSpace = true;
- spec.grabExcessHorizontalSpace = true;
- spec.horizontalAlignment = GridData.FILL;
- spec.verticalAlignment = GridData.FILL;
- list.setLayoutData(spec);
- return list;
- }
-
- /**
- * @return the ID of the button that is 'pressed' on doubleClick in the lists.
- * By default it is the OK button.
- * Override to change this setting.
- */
- protected int getDefaultButtonID() {
- return IDialogConstants.OK_ID;
- }
-
- protected Object getWidgetSelection() {
- int i = fLowerList.getSelectionIndex();
- if (fQualifierMap != null) {
- if (fQualifierMap.length == 1)
- i = 0;
- if (i < 0) {
- return null;
- }
- Integer index = fQualifierMap[i];
- return fElements[index.intValue()];
- }
- return null;
- }
-
- protected final void handleLowerDoubleClick() {
- if (getWidgetSelection() != null)
- buttonPressed(getDefaultButtonID());
- }
-
- protected final void handleLowerSelectionChanged() {
- updateOkState();
- }
-
- protected final void handleUpperDoubleClick() {
- if (getWidgetSelection() != null)
- buttonPressed(getDefaultButtonID());
- }
-
- protected final void handleUpperSelectionChanged() {
- int selection = fUpperList.getSelectionIndex();
- if (selection >= 0) {
- int i = fElementMap[selection];
- int k = i;
- int length = fRenderedStrings.length;
- while (k < length && fRenderedStrings[k].equals(fRenderedStrings[i])) {
- k++;
- }
- updateLowerListWidget(i, k);
- } else
- updateLowerListWidget(0, 0);
- }
-
- @Override
- public int open() {
- if (fIT == null || fIT.length == 0) {
- MessageDialog.openInformation(getShell(),
- WebAppEditResourceHandler.getString("Empty_List_1"), //$NON-NLS-1$
- WebAppEditResourceHandler.getString("_INFO_No_filters_exist_to_add._1")); //$NON-NLS-1$
- return CANCEL;
- }
-
- setElements(fIT);
- setInitialSelection(""); //$NON-NLS-1$
- return super.open();
- }
-
- /**
- * update the list to reflect a new match string.
- * @param matchString java.lang.String
- */
- protected final void rematch(String matchString) {
- int k = 0;
- String text = fText.getText();
- StringMatcher matcher = new StringMatcher(text + "*", fIgnoreCase, false); //$NON-NLS-1$
- String lastString = null;
- int length = fElements.length;
- for (int i = 0; i < length; i++) {
- while (i < length && fRenderedStrings[i].equals(lastString))
- i++;
- if (i < length) {
- lastString = fRenderedStrings[i];
- if (matcher.match(fRenderedStrings[i])) {
- fElementMap[k] = i;
- k++;
- }
- }
- }
- fElementMap[k] = -1;
-
- updateUpperListWidget(fElementMap, k);
- }
-
- /**
- *
- * @return java.lang.String[]
- * @param p org.eclipse.jface.elements.IIndexedProperty
- */
- private String[] renderStrings(Object[] p) {
- String[] strings = new String[p.length];
- int size = strings.length;
- for (int i = 0; i < size; i++) {
- strings[i] = fElementRenderer.getText(p[i]);
- }
- new TwoArrayQuickSorter(fIgnoreCase).sort(strings, p);
- return strings;
- }
-
- public void setElements(Object[] elements) {
- fElements = elements;
- fElementMap = new int[fElements.length + 1];
- fRenderedStrings = renderStrings(fElements);
- }
-
- private void updateLowerListWidget(int from, int to) {
- fLowerList.removeAll();
- fQualifierMap = new Integer[to - from];
- String[] qualifiers = new String[to - from];
- for (int i = from; i < to; i++) {
- // XXX: 1G65LDG: JFUIF:WIN2000 - ILabelProvider used outside a viewer
- qualifiers[i - from] = fQualifierRenderer.getText(fElements[i]);
- fQualifierMap[i - from] = new Integer(i);
- }
-
- new TwoArrayQuickSorter(fIgnoreCase).sort(qualifiers, fQualifierMap);
-
- for (int i = 0; i < to - from; i++) {
- TableItem ti = new TableItem(fLowerList, i);
- ti.setText(qualifiers[i]);
- // XXX: 1G65LDG: JFUIF:WIN2000 - ILabelProvider used outside a viewer
- Image img = fQualifierRenderer.getImage(fElements[from + i]);
- if (img != null)
- ti.setImage(img);
- }
-
- if (fLowerList.getItemCount() > 0)
- fLowerList.setSelection(0);
- updateOkState();
- }
-
- private void updateOkState() {
- Button okButton = getOkButton();
- if (okButton != null)
- okButton.setEnabled(getWidgetSelection() != null);
- }
-
- private void updateUpperListWidget(int[] indices, int size) {
- fUpperList.setRedraw(false);
- int itemCount = fUpperList.getItemCount();
- if (size < itemCount)
- fUpperList.remove(0, itemCount - size - 1);
- TableItem[] items = fUpperList.getItems();
- for (int i = 0; i < size; i++) {
- TableItem ti = null;
- if (i < itemCount)
- ti = items[i];
- else
- ti = new TableItem(fUpperList, i);
- ti.setText(fRenderedStrings[indices[i]]);
- // XXX: 1G65LDG: JFUIF:WIN2000 - ILabelProvider used outside a viewer
- Image img = fElementRenderer.getImage(fElements[indices[i]]);
- if (img != null)
- ti.setImage(img);
- }
- if (fUpperList.getItemCount() > 0)
- fUpperList.setSelection(0);
- fUpperList.setRedraw(true);
- handleUpperSelectionChanged();
- }
-
- /**
- * Sent when default selection occurs in the control.
- * <p>
- * For example, on some platforms default selection occurs
- * in a List when the user double-clicks an item or types
- * return in a Text.
- * </p>
- *
- * @param e an event containing information about the default selection
- */
- public void widgetDefaultSelected(SelectionEvent e) {
- // Do nothing
- }
-
- /**
- * @see ElementTreeSelectionDialog#updateOKStatus()
- */
- @Override
- protected void updateOKStatus() {
- super.updateOKStatus();
- Button okButton = getOkButton();
- if (okButton != null)
- okButton.setEnabled(fLocalValidator.validate(getResult()).isOK());
- }
-
-}
diff --git a/plugins/org.eclipse.jst.servlet.ui/servlet_ui/org/eclipse/jst/servlet/ui/internal/wizard/NewFilterClassOptionsWizardPage.java b/plugins/org.eclipse.jst.servlet.ui/servlet_ui/org/eclipse/jst/servlet/ui/internal/wizard/NewFilterClassOptionsWizardPage.java
deleted file mode 100644
index 94124e0..0000000
--- a/plugins/org.eclipse.jst.servlet.ui/servlet_ui/org/eclipse/jst/servlet/ui/internal/wizard/NewFilterClassOptionsWizardPage.java
+++ /dev/null
@@ -1,104 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2007, 2008 SAP AG and others.
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
- *
- * Contributors:
- * Kaloyan Raev, kaloyan.raev@sap.com - initial API and implementation
- *******************************************************************************/
-package org.eclipse.jst.servlet.ui.internal.wizard;
-
-import static org.eclipse.jst.j2ee.internal.web.operations.INewFilterClassDataModelProperties.DESTROY;
-import static org.eclipse.jst.j2ee.internal.web.operations.INewFilterClassDataModelProperties.DO_FILTER;
-import static org.eclipse.jst.j2ee.internal.web.operations.INewFilterClassDataModelProperties.INIT;
-import static org.eclipse.jst.j2ee.web.IServletConstants.QUALIFIED_FILTER;
-
-import java.util.Iterator;
-
-import org.eclipse.jface.dialogs.Dialog;
-import org.eclipse.jface.viewers.ISelectionChangedListener;
-import org.eclipse.jface.viewers.SelectionChangedEvent;
-import org.eclipse.jface.viewers.StructuredSelection;
-import org.eclipse.jst.j2ee.internal.web.operations.FilterSupertypesValidator;
-import org.eclipse.swt.SWT;
-import org.eclipse.swt.layout.GridData;
-import org.eclipse.swt.layout.GridLayout;
-import org.eclipse.swt.widgets.Button;
-import org.eclipse.swt.widgets.Composite;
-import org.eclipse.wst.common.frameworks.datamodel.IDataModel;
-
-public class NewFilterClassOptionsWizardPage extends
- NewWebClassOptionsWizardPage implements ISelectionChangedListener {
-
- protected Button initButton;
- protected Button destroyButton;
- protected Button doFilterButton;
-
- public NewFilterClassOptionsWizardPage(IDataModel model, String pageName, String pageDesc, String pageTitle) {
- super(model, pageName, pageDesc, pageTitle);
- }
-
- /**
- * Create the composite with all the stubs
- */
- @Override
- protected void createStubsComposite(Composite parent) {
- super.createStubsComposite(parent);
-
- Composite comp = new Composite(methodStubs, SWT.NULL);
- GridLayout layout = new GridLayout(3, false);
- layout.marginWidth = 0;
- layout.makeColumnsEqualWidth = true;
- comp.setLayout(layout);
- GridData data = new GridData(GridData.FILL_BOTH);
- comp.setLayoutData(data);
-
- initButton = new Button(comp, SWT.CHECK);
- initButton.setText("init"); //$NON-NLS-1$
- synchHelper.synchCheckbox(initButton, INIT, null);
-
- destroyButton = new Button(comp, SWT.CHECK);
- destroyButton.setText("destroy"); //$NON-NLS-1$
- synchHelper.synchCheckbox(destroyButton, DESTROY, null);
-
- doFilterButton = new Button(comp, SWT.CHECK);
- doFilterButton.setText("doFilter"); //$NON-NLS-1$
- synchHelper.synchCheckbox(doFilterButton, DO_FILTER, null);
-
- interfaceViewer.addSelectionChangedListener(this);
-
- Dialog.applyDialogFont(parent);
- }
-
- public void selectionChanged(SelectionChangedEvent event) {
- StructuredSelection selection = (StructuredSelection) event.getSelection();
-
- // if the selection is empty, then the remove button is disabled
- if (selection.isEmpty()) {
- removeButton.setEnabled(false);
- return;
- }
-
- // if the selection is non-empty and the filter extends a class which
- // implements javax.servlet.Filter, then the remove button is enabled
- if (FilterSupertypesValidator.isFilterSuperclass(model)) {
- removeButton.setEnabled(true);
- return;
- }
-
- // if the selection is non-empty and the filter does not extend a class
- // which implements javax.servlet.Filter, then the remove button is
- // disabled only if the Filter interface is in the selection
- Iterator iter = selection.iterator();
- while (iter.hasNext()) {
- if (QUALIFIED_FILTER.equals(iter.next()))
- removeButton.setEnabled(false);
- return;
- }
-
- // in all other cases the remove button is enabled
- removeButton.setEnabled(true);
- }
-}
diff --git a/plugins/org.eclipse.jst.servlet.ui/servlet_ui/org/eclipse/jst/servlet/ui/internal/wizard/NewFilterClassWizardPage.java b/plugins/org.eclipse.jst.servlet.ui/servlet_ui/org/eclipse/jst/servlet/ui/internal/wizard/NewFilterClassWizardPage.java
deleted file mode 100644
index 2ad1bd1..0000000
--- a/plugins/org.eclipse.jst.servlet.ui/servlet_ui/org/eclipse/jst/servlet/ui/internal/wizard/NewFilterClassWizardPage.java
+++ /dev/null
@@ -1,175 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2007, 2008 SAP AG and others.
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
- *
- * Contributors:
- * Kaloyan Raev, kaloyan.raev@sap.com - initial API and implementation
- *******************************************************************************/
-package org.eclipse.jst.servlet.ui.internal.wizard;
-
-import static org.eclipse.jst.j2ee.internal.common.operations.INewJavaClassDataModelProperties.PROJECT;
-import static org.eclipse.jst.j2ee.internal.web.operations.INewFilterClassDataModelProperties.FILTER_MAPPINGS;
-import static org.eclipse.jst.j2ee.internal.web.operations.INewWebClassDataModelProperties.USE_EXISTING_CLASS;
-import static org.eclipse.jst.servlet.ui.internal.wizard.IWebWizardConstants.CHOOSE_FILTER_CLASS;
-import static org.eclipse.jst.servlet.ui.internal.wizard.IWebWizardConstants.NEW_FILTER_WIZARD_WINDOW_TITLE;
-import static org.eclipse.jst.servlet.ui.internal.wizard.IWebWizardConstants.USE_EXISTING_FILTER_CLASS;
-
-import java.util.ArrayList;
-import java.util.List;
-
-import org.eclipse.core.resources.IContainer;
-import org.eclipse.core.resources.IFile;
-import org.eclipse.core.resources.IFolder;
-import org.eclipse.core.resources.IProject;
-import org.eclipse.jdt.core.IType;
-import org.eclipse.jem.util.emf.workbench.ProjectUtilities;
-import org.eclipse.jface.window.Window;
-import org.eclipse.jst.j2ee.internal.J2EEVersionConstants;
-import org.eclipse.jst.j2ee.internal.common.J2EEVersionUtil;
-import org.eclipse.jst.j2ee.internal.war.ui.util.WebFiltersGroupItemProvider;
-import org.eclipse.jst.j2ee.internal.web.operations.FilterMappingItem;
-import org.eclipse.jst.j2ee.internal.web.operations.IFilterMappingItem;
-import org.eclipse.jst.j2ee.project.JavaEEProjectUtilities;
-import org.eclipse.jst.j2ee.project.WebUtilities;
-import org.eclipse.jst.j2ee.project.facet.IJ2EEFacetConstants;
-import org.eclipse.jst.j2ee.webapplication.WebApp;
-import org.eclipse.jst.jee.ui.internal.navigator.web.GroupFiltersItemProvider;
-import org.eclipse.jst.jee.ui.internal.navigator.web.WebAppProvider;
-import org.eclipse.swt.SWT;
-import org.eclipse.swt.graphics.Cursor;
-import org.eclipse.swt.widgets.Composite;
-import org.eclipse.wst.common.componentcore.ComponentCore;
-import org.eclipse.wst.common.componentcore.resources.IVirtualComponent;
-import org.eclipse.wst.common.frameworks.datamodel.IDataModel;
-import org.eclipse.wst.common.project.facet.core.IProjectFacetVersion;
-
-public class NewFilterClassWizardPage extends NewWebClassWizardPage {
-
- private final static String[] FILTEREXTENSIONS = { "java" }; //$NON-NLS-1$
-
- public NewFilterClassWizardPage(IDataModel model, String pageName, String pageDesc, String pageTitle, String moduleType) {
- super(model, pageName, pageDesc, pageTitle, moduleType);
- }
-
- @Override
- protected String getUseExistingCheckboxText() {
- return USE_EXISTING_FILTER_CLASS;
- }
-
- @Override
- protected String getUseExistingProperty() {
- return USE_EXISTING_CLASS;
- }
-
- @Override
- protected IProject getExtendedSelectedProject(Object selection) {
- if (selection instanceof WebFiltersGroupItemProvider) {
- WebApp webApp = (WebApp)((WebFiltersGroupItemProvider) selection).getParent();
- return ProjectUtilities.getProject(webApp);
- }else if(selection instanceof WebAppProvider){
- return ((WebAppProvider) selection).getProject();
- } if(selection instanceof GroupFiltersItemProvider){
- org.eclipse.jst.javaee.web.WebApp webApp = (org.eclipse.jst.javaee.web.WebApp) ((GroupFiltersItemProvider) selection).getJavaEEObject();
- return ProjectUtilities.getProject(webApp);
- }
-
- return super.getExtendedSelectedProject(selection);
- }
-
- @Override
- protected void handleClassButtonSelected() {
- getControl().setCursor(new Cursor(getShell().getDisplay(), SWT.CURSOR_WAIT));
- IProject project = (IProject) model.getProperty(PROJECT);
- IVirtualComponent component = ComponentCore.createComponent(project);
- MultiSelectFilteredFilterFileSelectionDialog ms = new MultiSelectFilteredFilterFileSelectionDialog(
- getShell(),
- NEW_FILTER_WIZARD_WINDOW_TITLE,
- CHOOSE_FILTER_CLASS,
- FILTEREXTENSIONS,
- false,
- project);
- IContainer root = component.getRootFolder().getUnderlyingFolder();
- ms.setInput(root);
- ms.open();
- if (ms.getReturnCode() == Window.OK) {
- String qualifiedClassName = ""; //$NON-NLS-1$
- IType type = (IType) ms.getFirstResult();
- if (type != null) {
- qualifiedClassName = type.getFullyQualifiedName();
- }
- existingClassText.setText(qualifiedClassName);
- }
- getControl().setCursor(null);
- }
-
- /* (non-Javadoc)
- * @see org.eclipse.jst.servlet.ui.internal.wizard.NewWebClassWizardPage#createTopLevelComposite(org.eclipse.swt.widgets.Composite)
- */
- @Override
- protected Composite createTopLevelComposite(Composite parent) {
- Composite composite = super.createTopLevelComposite(parent);
-
- Object obj = getSelectedObject();
- if (isFilter(obj)) {
- checkExistingButton(true);
- existingClassText.setText(getFilterClass(obj));
- } else if (isServlet(obj)) {
- String servletName = getServletName(obj);
- // set the class name
- classText.setText(makeFirstCharUppercase(servletName) + "Filter"); //$NON-NLS-1$
- // set the filter mapping
- if (servletName != null) {
- List<IFilterMappingItem> mappings = new ArrayList<IFilterMappingItem>();
- mappings.add(new FilterMappingItem(IFilterMappingItem.SERVLET_NAME, servletName));
- model.setProperty(FILTER_MAPPINGS, mappings);
- }
- } else if (isWebFolder(obj)) {
- IFolder folder = (IFolder) obj;
- // set the class name
- String webFolderName = makeFirstCharUppercase(folder.getName());
- classText.setText(webFolderName + "Filter"); //$NON-NLS-1$
- // set the filter mapping
- String webFolderPath = getWebResourcePath(folder);
- List<IFilterMappingItem> mappings = new ArrayList<IFilterMappingItem>();
- mappings.add(new FilterMappingItem(IFilterMappingItem.URL_PATTERN, webFolderPath + "/*")); //$NON-NLS-1$
- model.setProperty(FILTER_MAPPINGS, mappings);
- } else if (WebUtilities.isWebResource(obj)) {
- IFile file = (IFile) obj;
- // set the class name
- String webResourceName = makeFirstCharUppercase(getFileNameWithouFileExtension(file));
- classText.setText(webResourceName + "Filter"); //$NON-NLS-1$
- // set the filter mapping
- String webResourcePath = getWebResourcePath(file);
- List<IFilterMappingItem> mappings = new ArrayList<IFilterMappingItem>();
- mappings.add(new FilterMappingItem(IFilterMappingItem.URL_PATTERN, webResourcePath));
- model.setProperty(FILTER_MAPPINGS, mappings);
- }
-
- return composite;
- }
-
- @Override
- protected boolean isProjectValid(IProject project) {
- boolean result = super.isProjectValid(project);
- if (!result)
- return false;
-
- if (JavaEEProjectUtilities.isWebFragmentProject(project))
- return true;
-
- // get the version of the web facet
- IProjectFacetVersion facetVersion = JavaEEProjectUtilities.getProjectFacetVersion(project, IJ2EEFacetConstants.DYNAMIC_WEB);
- if (facetVersion == null)
- return false;
-
- // convert the version to an integer
- int version = J2EEVersionUtil.convertVersionStringToInt(facetVersion.getVersionString());
-
- // only web 2.3 and greater projects are valid
- return version > J2EEVersionConstants.SERVLET_2_2;
- }
-
-}
diff --git a/plugins/org.eclipse.jst.servlet.ui/servlet_ui/org/eclipse/jst/servlet/ui/internal/wizard/NewListenerClassOptionsWizardPage.java b/plugins/org.eclipse.jst.servlet.ui/servlet_ui/org/eclipse/jst/servlet/ui/internal/wizard/NewListenerClassOptionsWizardPage.java
deleted file mode 100644
index 6d4d265..0000000
--- a/plugins/org.eclipse.jst.servlet.ui/servlet_ui/org/eclipse/jst/servlet/ui/internal/wizard/NewListenerClassOptionsWizardPage.java
+++ /dev/null
@@ -1,21 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2007, 2008 SAP AG and others.
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
- *
- * Contributors:
- * Kaloyan Raev, kaloyan.raev@sap.com - initial API and implementation
- *******************************************************************************/
-package org.eclipse.jst.servlet.ui.internal.wizard;
-
-import org.eclipse.wst.common.frameworks.datamodel.IDataModel;
-
-public class NewListenerClassOptionsWizardPage extends NewWebClassOptionsWizardPage {
-
- public NewListenerClassOptionsWizardPage(IDataModel model, String pageName, String pageDesc, String pageTitle) {
- super(model, pageName, pageDesc, pageTitle);
- }
-
-}
diff --git a/plugins/org.eclipse.jst.servlet.ui/servlet_ui/org/eclipse/jst/servlet/ui/internal/wizard/NewListenerClassWizardPage.java b/plugins/org.eclipse.jst.servlet.ui/servlet_ui/org/eclipse/jst/servlet/ui/internal/wizard/NewListenerClassWizardPage.java
deleted file mode 100644
index 031ed18..0000000
--- a/plugins/org.eclipse.jst.servlet.ui/servlet_ui/org/eclipse/jst/servlet/ui/internal/wizard/NewListenerClassWizardPage.java
+++ /dev/null
@@ -1,95 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2007, 2008 SAP AG and others.
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
- *
- * Contributors:
- * Kaloyan Raev, kaloyan.raev@sap.com - initial API and implementation
- *******************************************************************************/
-package org.eclipse.jst.servlet.ui.internal.wizard;
-
-import static org.eclipse.jst.j2ee.internal.web.operations.INewWebClassDataModelProperties.USE_EXISTING_CLASS;
-import static org.eclipse.jst.servlet.ui.internal.wizard.IWebWizardConstants.USE_EXISTING_LISTENER_CLASS;
-
-import org.eclipse.core.resources.IProject;
-import org.eclipse.jem.util.emf.workbench.ProjectUtilities;
-import org.eclipse.jst.j2ee.internal.J2EEVersionConstants;
-import org.eclipse.jst.j2ee.internal.common.J2EEVersionUtil;
-import org.eclipse.jst.j2ee.internal.war.ui.util.WebListenerGroupItemProvider;
-import org.eclipse.jst.j2ee.project.JavaEEProjectUtilities;
-import org.eclipse.jst.j2ee.project.facet.IJ2EEFacetConstants;
-import org.eclipse.jst.j2ee.webapplication.WebApp;
-import org.eclipse.jst.jee.ui.internal.navigator.web.GroupListenerItemProvider;
-import org.eclipse.jst.jee.ui.internal.navigator.web.WebAppProvider;
-import org.eclipse.swt.widgets.Composite;
-import org.eclipse.wst.common.frameworks.datamodel.IDataModel;
-import org.eclipse.wst.common.project.facet.core.IProjectFacetVersion;
-
-public class NewListenerClassWizardPage extends NewWebClassWizardPage {
-
- public NewListenerClassWizardPage(IDataModel model, String pageName, String pageDesc, String pageTitle, String moduleType) {
- super(model, pageName, pageDesc, pageTitle, moduleType);
- }
-
- @Override
- protected String getUseExistingCheckboxText() {
- return USE_EXISTING_LISTENER_CLASS;
- }
-
- @Override
- protected String getUseExistingProperty() {
- return USE_EXISTING_CLASS;
- }
-
- @Override
- protected Composite createTopLevelComposite(Composite parent) {
- Composite composite = super.createTopLevelComposite(parent);
-
- existingButton.setEnabled(false);
-
- return composite;
- }
-
- @Override
- protected IProject getExtendedSelectedProject(Object selection) {
- if (selection instanceof WebListenerGroupItemProvider) {
- WebApp webApp = (WebApp)((WebListenerGroupItemProvider) selection).getParent();
- return ProjectUtilities.getProject(webApp);
- }else if(selection instanceof WebAppProvider){
- return ((WebAppProvider) selection).getProject();
- } else if(selection instanceof GroupListenerItemProvider){
- org.eclipse.jst.javaee.web.WebApp webApp = (org.eclipse.jst.javaee.web.WebApp) ((GroupListenerItemProvider) selection).getJavaEEObject();
- return ProjectUtilities.getProject(webApp);
- }
-
- return super.getExtendedSelectedProject(selection);
- }
-
- @Override
- protected void handleClassButtonSelected() {
- }
-
- @Override
- protected boolean isProjectValid(IProject project) {
- boolean result = super.isProjectValid(project);
- if (!result)
- return false;
-
- if (JavaEEProjectUtilities.isWebFragmentProject(project))
- return true;
-
- // get the version of the web facet
- IProjectFacetVersion facetVersion = JavaEEProjectUtilities.getProjectFacetVersion(project, IJ2EEFacetConstants.DYNAMIC_WEB);
- if (facetVersion == null)
- return false;
-
- // convert the version to an integer
- int version = J2EEVersionUtil.convertVersionStringToInt(facetVersion.getVersionString());
-
- // only web 2.3 and greater projects are valid
- return version > J2EEVersionConstants.SERVLET_2_2;
- }
-
-}
diff --git a/plugins/org.eclipse.jst.servlet.ui/servlet_ui/org/eclipse/jst/servlet/ui/internal/wizard/NewServletClassOptionsWizardPage.java b/plugins/org.eclipse.jst.servlet.ui/servlet_ui/org/eclipse/jst/servlet/ui/internal/wizard/NewServletClassOptionsWizardPage.java
deleted file mode 100644
index d7d3779..0000000
--- a/plugins/org.eclipse.jst.servlet.ui/servlet_ui/org/eclipse/jst/servlet/ui/internal/wizard/NewServletClassOptionsWizardPage.java
+++ /dev/null
@@ -1,219 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2003, 2008 IBM Corporation and others.
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
- *
- * Contributors:
- * IBM Corporation - initial API and implementation
- * David Schneider, david.schneider@unisys.com - bug 142500
- * Kiril Mitov, k.mitov@sap.com - bug 204160
- * Kaloyan Raev, kaloyan.raev@sap.com
- *******************************************************************************/
-package org.eclipse.jst.servlet.ui.internal.wizard;
-
-import static org.eclipse.jst.j2ee.web.IServletConstants.QUALIFIED_SERVLET;
-
-import java.util.Iterator;
-
-import org.eclipse.jface.dialogs.Dialog;
-import org.eclipse.jface.viewers.ISelectionChangedListener;
-import org.eclipse.jface.viewers.IStructuredSelection;
-import org.eclipse.jface.viewers.SelectionChangedEvent;
-import org.eclipse.jst.j2ee.internal.web.operations.INewServletClassDataModelProperties;
-import org.eclipse.jst.j2ee.internal.web.operations.ServletSupertypesValidator;
-import org.eclipse.swt.SWT;
-import org.eclipse.swt.events.KeyEvent;
-import org.eclipse.swt.events.KeyListener;
-import org.eclipse.swt.events.SelectionEvent;
-import org.eclipse.swt.events.SelectionListener;
-import org.eclipse.swt.layout.GridData;
-import org.eclipse.swt.layout.GridLayout;
-import org.eclipse.swt.widgets.Button;
-import org.eclipse.swt.widgets.Composite;
-import org.eclipse.wst.common.frameworks.datamodel.IDataModel;
-
-public class NewServletClassOptionsWizardPage extends
- NewWebClassOptionsWizardPage implements ISelectionChangedListener {
-
- protected Button initButton;
- protected Button destroyButton;
- protected Button getConfigButton;
- protected Button getInfoButton;
- protected Button serviceButton;
- protected Button doGetButton;
- protected Button doPostButton;
- protected Button doPutButton;
- protected Button doDeleteButton;
- protected Button doHeadButton;
- protected Button doOptionsButton;
- protected Button doTraceButton;
-
- public NewServletClassOptionsWizardPage(IDataModel model, String pageName, String pageDesc, String pageTitle) {
- super(model, pageName, pageDesc, pageTitle);
- }
-
- @Override
- protected void enter() {
- super.enter();
-
- boolean httpServlet = ServletSupertypesValidator.isHttpServletSuperclass(model);
- doGetButton.setVisible(httpServlet);
- doPostButton.setVisible(httpServlet);
- doPutButton.setVisible(httpServlet);
- doDeleteButton.setVisible(httpServlet);
- doHeadButton.setVisible(httpServlet);
- doOptionsButton.setVisible(httpServlet);
- doTraceButton.setVisible(httpServlet);
- }
-
- /**
- * Create the composite with all the stubs
- */
- @Override
- protected void createStubsComposite(Composite parent) {
- super.createStubsComposite(parent);
-
- inheritButton.addSelectionListener(new SelectionListener() {
- public void widgetSelected(SelectionEvent e) {
- boolean enable = inheritButton.getSelection();
- enableGenericServletButtons(enable);
- enableHttpServletButtons(enable);
- }
-
- public void widgetDefaultSelected(SelectionEvent e) {
- //Do nothing
- }
-
- private void enableGenericServletButtons(boolean enable) {
- if (ServletSupertypesValidator.isGenericServletSuperclass(model)) {
- initButton.setEnabled(enable);
- destroyButton.setEnabled(enable);
- getConfigButton.setEnabled(enable);
- getInfoButton.setEnabled(enable);
- serviceButton.setEnabled(enable);
- }
- }
-
- private void enableHttpServletButtons(boolean enable) {
- doGetButton.setEnabled(enable);
- doPostButton.setEnabled(enable);
- doPutButton.setEnabled(enable);
- doDeleteButton.setEnabled(enable);
- doHeadButton.setEnabled(enable);
- doOptionsButton.setEnabled(enable);
- doTraceButton.setEnabled(enable);
- }
- });
-
- Composite comp = new Composite(methodStubs, SWT.NULL);
- GridLayout layout = new GridLayout(3, false);
- layout.marginWidth = 0;
- layout.makeColumnsEqualWidth = true;
- comp.setLayout(layout);
- GridData data = new GridData(GridData.FILL_BOTH);
- comp.setLayoutData(data);
-
- initButton = new Button(comp, SWT.CHECK);
- initButton.setText("init"); //$NON-NLS-1$
- synchHelper.synchCheckbox(initButton, INewServletClassDataModelProperties.INIT, null);
-
- destroyButton = new Button(comp, SWT.CHECK);
- destroyButton.setText("destroy"); //$NON-NLS-1$
- synchHelper.synchCheckbox(destroyButton, INewServletClassDataModelProperties.DESTROY, null);
-
- getConfigButton = new Button(comp, SWT.CHECK);
- getConfigButton.setText("getServletConfig"); //$NON-NLS-1$
- synchHelper.synchCheckbox(getConfigButton, INewServletClassDataModelProperties.GET_SERVLET_CONFIG, null);
-
- getInfoButton = new Button(comp, SWT.CHECK);
- getInfoButton.setText("getServletInfo"); //$NON-NLS-1$
- synchHelper.synchCheckbox(getInfoButton, INewServletClassDataModelProperties.GET_SERVLET_INFO, null);
-
- serviceButton = new Button(comp, SWT.CHECK);
- serviceButton.setText("service"); //$NON-NLS-1$
- synchHelper.synchCheckbox(serviceButton, INewServletClassDataModelProperties.SERVICE, null);
-
- doGetButton = new Button(comp, SWT.CHECK);
- doGetButton.setText("do&Get"); //$NON-NLS-1$
- synchHelper.synchCheckbox(doGetButton, INewServletClassDataModelProperties.DO_GET, null);
-
- doPostButton = new Button(comp, SWT.CHECK);
- doPostButton.setText("do&Post"); //$NON-NLS-1$
- synchHelper.synchCheckbox(doPostButton, INewServletClassDataModelProperties.DO_POST, null);
-
- doPutButton = new Button(comp, SWT.CHECK);
- doPutButton.setText("doP&ut"); //$NON-NLS-1$
- synchHelper.synchCheckbox(doPutButton, INewServletClassDataModelProperties.DO_PUT, null);
-
- doDeleteButton = new Button(comp, SWT.CHECK);
- doDeleteButton.setText("do&Delete"); //$NON-NLS-1$
- synchHelper.synchCheckbox(doDeleteButton, INewServletClassDataModelProperties.DO_DELETE, null);
-
- doHeadButton = new Button(comp, SWT.CHECK);
- doHeadButton.setText("doH&ead"); //$NON-NLS-1$
- synchHelper.synchCheckbox(doHeadButton, INewServletClassDataModelProperties.DO_HEAD, null);
-
- doOptionsButton = new Button(comp, SWT.CHECK);
- doOptionsButton.setText("do&Options"); //$NON-NLS-1$
- synchHelper.synchCheckbox(doOptionsButton, INewServletClassDataModelProperties.DO_OPTIONS, null);
-
- doTraceButton = new Button(comp, SWT.CHECK);
- doTraceButton.setText("do&Trace"); //$NON-NLS-1$
- synchHelper.synchCheckbox(doTraceButton, INewServletClassDataModelProperties.DO_TRACE, null);
-
- interfaceViewer.addSelectionChangedListener(this);
-
- Dialog.applyDialogFont(parent);
- }
-
- public void selectionChanged(SelectionChangedEvent event) {
- IStructuredSelection selection = (IStructuredSelection) event.getSelection();
- removeButton.setEnabled(canRemoveSelectedInterfaces(selection));
- }
-
- @Override
- protected KeyListener getInterfaceKeyListener() {
- return new KeyListener() {
-
- public void keyPressed(KeyEvent e) {
- }
-
- public void keyReleased(KeyEvent e) {
- if (e.keyCode == SWT.DEL) {
- IStructuredSelection selection = (IStructuredSelection) interfaceViewer.getSelection();
- if (canRemoveSelectedInterfaces(selection)) {
- handleInterfaceRemoveButtonSelected();
- }
- }
- }
-
- };
- }
-
- private boolean canRemoveSelectedInterfaces(IStructuredSelection selection) {
- // if the selection is empty, then remove is not possible
- if (selection.isEmpty()) {
- return false;
- }
-
- // if the selection is non-empty and the servlet extends GenericServlet, then
- // remove is possible
- if (ServletSupertypesValidator.isGenericServletSuperclass(model)) {
- return true;
- }
-
- // if the selection is non-empty and the servlet does not extend GenericServlet,
- // then remove is not possible only if the Servlet interface is in the selection
- Iterator iter = selection.iterator();
- while (iter.hasNext()) {
- if (QUALIFIED_SERVLET.equals(iter.next())) {
- return false;
- }
- }
-
- // in all other cases remove is possible
- return true;
- }
-}
diff --git a/plugins/org.eclipse.jst.servlet.ui/servlet_ui/org/eclipse/jst/servlet/ui/internal/wizard/NewServletClassWizardPage.java b/plugins/org.eclipse.jst.servlet.ui/servlet_ui/org/eclipse/jst/servlet/ui/internal/wizard/NewServletClassWizardPage.java
deleted file mode 100644
index d6b3809..0000000
--- a/plugins/org.eclipse.jst.servlet.ui/servlet_ui/org/eclipse/jst/servlet/ui/internal/wizard/NewServletClassWizardPage.java
+++ /dev/null
@@ -1,147 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2003, 2008 IBM Corporation and others.
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
- *
- * Contributors:
- * IBM Corporation - initial API and implementation
- * Kaloyan Raev, kaloyan.raev@sap.com
- *******************************************************************************/
-package org.eclipse.jst.servlet.ui.internal.wizard;
-
-import static org.eclipse.jst.j2ee.internal.common.operations.INewJavaClassDataModelProperties.PROJECT;
-import static org.eclipse.jst.j2ee.internal.web.operations.INewServletClassDataModelProperties.IS_SERVLET_TYPE;
-import static org.eclipse.jst.j2ee.internal.web.operations.INewWebClassDataModelProperties.USE_EXISTING_CLASS;
-import static org.eclipse.jst.servlet.ui.internal.wizard.IWebWizardConstants.CHOOSE_SERVLET_CLASS;
-import static org.eclipse.jst.servlet.ui.internal.wizard.IWebWizardConstants.NEW_SERVLET_WIZARD_WINDOW_TITLE;
-import static org.eclipse.jst.servlet.ui.internal.wizard.IWebWizardConstants.USE_EXISTING_SERVLET_CLASS;
-
-import org.eclipse.core.resources.IContainer;
-import org.eclipse.core.resources.IFile;
-import org.eclipse.core.resources.IProject;
-import org.eclipse.core.resources.IResource;
-import org.eclipse.core.runtime.IPath;
-import org.eclipse.jdt.core.IType;
-import org.eclipse.jem.util.emf.workbench.ProjectUtilities;
-import org.eclipse.jface.window.Window;
-import org.eclipse.jst.j2ee.internal.war.ui.util.WebServletGroupItemProvider;
-import org.eclipse.jst.j2ee.webapplication.WebApp;
-import org.eclipse.jst.jee.ui.internal.navigator.web.GroupServletItemProvider;
-import org.eclipse.jst.jee.ui.internal.navigator.web.WebAppProvider;
-import org.eclipse.swt.SWT;
-import org.eclipse.swt.graphics.Cursor;
-import org.eclipse.swt.widgets.Composite;
-import org.eclipse.wst.common.componentcore.ComponentCore;
-import org.eclipse.wst.common.componentcore.resources.IVirtualComponent;
-import org.eclipse.wst.common.frameworks.datamodel.IDataModel;
-
-public class NewServletClassWizardPage extends NewWebClassWizardPage {
-
- private final static String[] JSPEXTENSIONS = { "jsp" }; //$NON-NLS-1$
-
- public NewServletClassWizardPage(IDataModel model, String pageName, String pageDesc, String pageTitle, String moduleType) {
- super(model, pageName, pageDesc, pageTitle, moduleType);
- }
-
- @Override
- protected String getUseExistingCheckboxText() {
- return USE_EXISTING_SERVLET_CLASS;
- }
-
- @Override
- protected String getUseExistingProperty() {
- return USE_EXISTING_CLASS;
- }
-
- @Override
- protected IProject getExtendedSelectedProject(Object selection) {
- if (selection instanceof WebServletGroupItemProvider) {
- WebApp webApp = (WebApp) ((WebServletGroupItemProvider) selection).getParent();
- return ProjectUtilities.getProject(webApp);
- } else if(selection instanceof WebAppProvider){
- return ((WebAppProvider) selection).getProject();
- } else if(selection instanceof GroupServletItemProvider){
- org.eclipse.jst.javaee.web.WebApp webApp = (org.eclipse.jst.javaee.web.WebApp) ((GroupServletItemProvider) selection).getJavaEEObject();
- return ProjectUtilities.getProject(webApp);
- }
-
- return super.getExtendedSelectedProject(selection);
- }
-
- @Override
- protected void handleClassButtonSelected() {
- getControl().setCursor(new Cursor(getShell().getDisplay(), SWT.CURSOR_WAIT));
- try {
- IProject project = (IProject) model.getProperty(PROJECT);
-
- if (project == null) {
- // show info message
- return;
- }
-
- IVirtualComponent component = ComponentCore.createComponent(project);
- MultiSelectFilteredFileSelectionDialog ms = new MultiSelectFilteredFileSelectionDialog(
- getShell(),
- NEW_SERVLET_WIZARD_WINDOW_TITLE,
- CHOOSE_SERVLET_CLASS,
- JSPEXTENSIONS,
- false,
- project);
- IContainer root = component.getRootFolder().getUnderlyingFolder();
- ms.setInput(root);
- ms.open();
- if (ms.getReturnCode() == Window.OK) {
- String qualifiedClassName = ""; //$NON-NLS-1$
- if (ms.getSelectedItem() == MultiSelectFilteredFileSelectionDialog.JSP) {
- Object obj = ms.getFirstResult();
- if (obj != null) {
- if (obj instanceof IFile) {
- IFile file = (IFile) obj;
- IPath pFull = file.getFullPath();
- IPath pBase = root.getFullPath();
- IPath path = pFull.removeFirstSegments(pBase.segmentCount());
- qualifiedClassName = path.makeAbsolute().toString();
- model.setProperty(IS_SERVLET_TYPE, new Boolean(false));
- }
- }
- }
- else {
- IType type = (IType) ms.getFirstResult();
- if (type != null) {
- qualifiedClassName = type.getFullyQualifiedName();
- model.setProperty(IS_SERVLET_TYPE, new Boolean(true));
- }
- }
- existingClassText.setText(qualifiedClassName);
- }
- } finally {
- getControl().setCursor(null);
- }
- }
-
- @Override
- protected Composite createTopLevelComposite(Composite parent) {
- Composite composite = super.createTopLevelComposite(parent);
-
- Object obj = getSelectedObject();
- if (isServlet(obj)) {
- checkExistingButton(true);
- if (isServletJSP(obj)) {
- existingClassText.setText(getServletJSPFile(obj));
- model.setBooleanProperty(IS_SERVLET_TYPE, false);
- } else {
- existingClassText.setText(getServletClass(obj));
- model.setBooleanProperty(IS_SERVLET_TYPE, true);
- }
- } else if (isJSP(obj)) {
- checkExistingButton(true);
- existingClassText.setText(getWebResourcePath((IResource) obj));
- model.setBooleanProperty(IS_SERVLET_TYPE, false);
- }
-
- return composite;
- }
-
-}
diff --git a/plugins/org.eclipse.jst.servlet.ui/servlet_ui/org/eclipse/jst/servlet/ui/internal/wizard/NewWebArtifactWizard.java b/plugins/org.eclipse.jst.servlet.ui/servlet_ui/org/eclipse/jst/servlet/ui/internal/wizard/NewWebArtifactWizard.java
deleted file mode 100644
index d1fe456..0000000
--- a/plugins/org.eclipse.jst.servlet.ui/servlet_ui/org/eclipse/jst/servlet/ui/internal/wizard/NewWebArtifactWizard.java
+++ /dev/null
@@ -1,117 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2008 SAP AG and others.
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
- *
- * Contributors:
- * Kaloyan Raev, kaloyan.raev@sap.com - initial API and implementation
- *******************************************************************************/
-package org.eclipse.jst.servlet.ui.internal.wizard;
-
-import static org.eclipse.jst.j2ee.internal.common.operations.INewJavaClassDataModelProperties.CLASS_NAME;
-import static org.eclipse.jst.j2ee.internal.common.operations.INewJavaClassDataModelProperties.OPEN_IN_EDITOR;
-import static org.eclipse.jst.j2ee.internal.common.operations.INewJavaClassDataModelProperties.PROJECT;
-import static org.eclipse.jst.j2ee.internal.common.operations.INewJavaClassDataModelProperties.QUALIFIED_CLASS_NAME;
-import static org.eclipse.jst.j2ee.internal.web.operations.INewWebClassDataModelProperties.USE_EXISTING_CLASS;
-
-import java.net.URL;
-
-import org.eclipse.core.resources.IContainer;
-import org.eclipse.core.resources.IFile;
-import org.eclipse.core.resources.IProject;
-import org.eclipse.core.runtime.Path;
-import org.eclipse.jdt.core.IJavaProject;
-import org.eclipse.jface.resource.ImageDescriptor;
-import org.eclipse.jst.j2ee.internal.plugin.J2EEEditorUtility;
-import org.eclipse.jst.j2ee.internal.plugin.J2EEPlugin;
-import org.eclipse.jst.servlet.ui.internal.plugin.ServletUIPlugin;
-import org.eclipse.ui.IWorkbenchPage;
-import org.eclipse.ui.PartInitException;
-import org.eclipse.ui.PlatformUI;
-import org.eclipse.ui.ide.IDE;
-import org.eclipse.wst.common.componentcore.ComponentCore;
-import org.eclipse.wst.common.componentcore.resources.IVirtualComponent;
-import org.eclipse.wst.common.frameworks.datamodel.IDataModel;
-
-public abstract class NewWebArtifactWizard extends NewWebWizard {
-
- protected static final String PAGE_ONE = "pageOne"; //$NON-NLS-1$
- protected static final String PAGE_TWO = "pageTwo"; //$NON-NLS-1$
- protected static final String PAGE_THREE = "pageThree"; //$NON-NLS-1$
-
- public NewWebArtifactWizard(IDataModel model) {
- super(model);
- setWindowTitle(getTitle());
- setDefaultPageImageDescriptor(getImage());
- }
-
- @Override
- protected boolean runForked() {
- return false;
- }
-
- @Override
- public boolean canFinish() {
- return getDataModel().isValid();
- }
-
- protected abstract String getTitle();
-
- protected abstract ImageDescriptor getImage();
-
- protected ImageDescriptor getImageFromJ2EEPlugin(String key) {
- URL url = (URL) J2EEPlugin.getDefault().getImage(key);
- return ImageDescriptor.createFromURL(url);
- }
-
- protected void openJavaClass() {
- try {
- String className;
- if (getDataModel().getBooleanProperty(USE_EXISTING_CLASS)) {
- className = getDataModel().getStringProperty(CLASS_NAME);
- } else {
- className = getDataModel().getStringProperty(QUALIFIED_CLASS_NAME);
- }
- IProject p = (IProject) getDataModel().getProperty(PROJECT);
- IJavaProject javaProject = J2EEEditorUtility.getJavaProject(p);
- IFile file = (IFile) javaProject.findType(className).getResource();
- openEditor(file);
- } catch (Exception cantOpen) {
- ServletUIPlugin.log(cantOpen);
- }
- }
-
- protected void openWebFile() {
- try {
- String className = getDataModel().getStringProperty(CLASS_NAME);
- IProject p = (IProject) getDataModel().getProperty(PROJECT);
- IVirtualComponent component = ComponentCore.createComponent(p);
- IContainer webContent = component.getRootFolder().getUnderlyingFolder();
- IFile file = webContent.getFile(new Path(className));
- openEditor(file);
- } catch (Exception cantOpen) {
- ServletUIPlugin.log(cantOpen);
- }
- }
-
- protected void openEditor(final IFile file) {
- if (getDataModel().getBooleanProperty(OPEN_IN_EDITOR)) {
- if (file != null) {
- getShell().getDisplay().asyncExec(new Runnable() {
- public void run() {
- try {
- IWorkbenchPage page = PlatformUI.getWorkbench().getActiveWorkbenchWindow().getActivePage();
- IDE.openEditor(page, file, true);
- }
- catch (PartInitException e) {
- ServletUIPlugin.log(e);
- }
- }
- });
- }
- }
- }
-
-}
diff --git a/plugins/org.eclipse.jst.servlet.ui/servlet_ui/org/eclipse/jst/servlet/ui/internal/wizard/NewWebClassOptionsWizardPage.java b/plugins/org.eclipse.jst.servlet.ui/servlet_ui/org/eclipse/jst/servlet/ui/internal/wizard/NewWebClassOptionsWizardPage.java
deleted file mode 100644
index 5a55cca..0000000
--- a/plugins/org.eclipse.jst.servlet.ui/servlet_ui/org/eclipse/jst/servlet/ui/internal/wizard/NewWebClassOptionsWizardPage.java
+++ /dev/null
@@ -1,69 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2007, 2008 SAP AG and others.
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
- *
- * Contributors:
- * Kaloyan Raev, kaloyan.raev@sap.com - initial API and implementation
- *******************************************************************************/
-package org.eclipse.jst.servlet.ui.internal.wizard;
-
-import static org.eclipse.jst.j2ee.internal.common.operations.INewJavaClassDataModelProperties.ABSTRACT_METHODS;
-import static org.eclipse.jst.j2ee.internal.common.operations.INewJavaClassDataModelProperties.CONSTRUCTOR;
-import static org.eclipse.jst.j2ee.internal.common.operations.INewJavaClassDataModelProperties.INTERFACES;
-import static org.eclipse.jst.servlet.ui.internal.wizard.IWebWizardConstants.JAVA_CLASS_CONSTRUCTOR_CHECKBOX_LABEL;
-import static org.eclipse.jst.servlet.ui.internal.wizard.IWebWizardConstants.JAVA_CLASS_INHERIT_CHECKBOX_LABEL;
-import static org.eclipse.jst.servlet.ui.internal.wizard.IWebWizardConstants.JAVA_CLASS_METHOD_STUBS_LABEL;
-
-import org.eclipse.jface.dialogs.Dialog;
-import org.eclipse.jst.j2ee.internal.wizard.NewJavaClassOptionsWizardPage;
-import org.eclipse.swt.SWT;
-import org.eclipse.swt.layout.GridData;
-import org.eclipse.swt.layout.GridLayout;
-import org.eclipse.swt.widgets.Button;
-import org.eclipse.swt.widgets.Composite;
-import org.eclipse.swt.widgets.Label;
-import org.eclipse.wst.common.frameworks.datamodel.IDataModel;
-
-public class NewWebClassOptionsWizardPage extends NewJavaClassOptionsWizardPage {
-
- protected Composite methodStubs;
-
- public NewWebClassOptionsWizardPage(IDataModel model, String pageName, String pageDesc, String pageTitle) {
- super(model, pageName, pageDesc, pageTitle);
- }
-
- @Override
- protected String[] getValidationPropertyNames() {
- return new String[] { INTERFACES };
- }
-
- @Override
- protected void createStubsComposite(Composite parent) {
- Label stubLabel = new Label(parent, SWT.NONE);
- stubLabel.setText(JAVA_CLASS_METHOD_STUBS_LABEL);
- GridData data = new GridData(GridData.HORIZONTAL_ALIGN_FILL);
- data.horizontalSpan = 2;
- stubLabel.setLayoutData(data);
-
- methodStubs = new Composite(parent, SWT.NULL);
- methodStubs.setLayout(new GridLayout());
- data = new GridData(GridData.FILL_HORIZONTAL);
- data.horizontalSpan = 2;
- data.horizontalIndent = 15;
- methodStubs.setLayoutData(data);
-
- constructorButton = new Button(methodStubs, SWT.CHECK);
- constructorButton.setText(JAVA_CLASS_CONSTRUCTOR_CHECKBOX_LABEL);
- synchHelper.synchCheckbox(constructorButton, CONSTRUCTOR, null);
-
- inheritButton = new Button(methodStubs, SWT.CHECK);
- inheritButton.setText(JAVA_CLASS_INHERIT_CHECKBOX_LABEL);
- synchHelper.synchCheckbox(inheritButton, ABSTRACT_METHODS, null);
-
- Dialog.applyDialogFont(parent);
- }
-
-}
diff --git a/plugins/org.eclipse.jst.servlet.ui/servlet_ui/org/eclipse/jst/servlet/ui/internal/wizard/NewWebClassWizardPage.java b/plugins/org.eclipse.jst.servlet.ui/servlet_ui/org/eclipse/jst/servlet/ui/internal/wizard/NewWebClassWizardPage.java
deleted file mode 100644
index 07d9961..0000000
--- a/plugins/org.eclipse.jst.servlet.ui/servlet_ui/org/eclipse/jst/servlet/ui/internal/wizard/NewWebClassWizardPage.java
+++ /dev/null
@@ -1,450 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2007, 2008 SAP AG and others.
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
- *
- * Contributors:
- * Kaloyan Raev, kaloyan.raev@sap.com - initial API and implementation
- *******************************************************************************/
-package org.eclipse.jst.servlet.ui.internal.wizard;
-
-import static org.eclipse.jst.j2ee.application.internal.operations.IAnnotationsDataModel.USE_ANNOTATIONS;
-import static org.eclipse.jst.j2ee.internal.common.operations.INewJavaClassDataModelProperties.CLASS_NAME;
-import static org.eclipse.jst.j2ee.internal.common.operations.INewJavaClassDataModelProperties.GENERATE_DD;
-import static org.eclipse.jst.servlet.ui.internal.wizard.IWebWizardConstants.BROWSE_BUTTON_LABEL;
-import static org.eclipse.jst.servlet.ui.internal.wizard.IWebWizardConstants.CLASS_NAME_LABEL;
-import static org.eclipse.wst.common.componentcore.internal.operation.IArtifactEditOperationDataModelProperties.PROJECT_NAME;
-
-import java.util.Iterator;
-
-import org.eclipse.core.resources.IFile;
-import org.eclipse.core.resources.IFolder;
-import org.eclipse.core.resources.IProject;
-import org.eclipse.core.resources.IResource;
-import org.eclipse.core.runtime.CoreException;
-import org.eclipse.core.runtime.IPath;
-import org.eclipse.core.runtime.Path;
-import org.eclipse.jdt.core.ICompilationUnit;
-import org.eclipse.jdt.core.IJavaElement;
-import org.eclipse.jdt.core.IType;
-import org.eclipse.jdt.core.ITypeHierarchy;
-import org.eclipse.jdt.core.JavaModelException;
-import org.eclipse.jem.util.emf.workbench.ProjectUtilities;
-import org.eclipse.jface.dialogs.Dialog;
-import org.eclipse.jface.viewers.ISelection;
-import org.eclipse.jface.viewers.IStructuredSelection;
-import org.eclipse.jst.j2ee.commonarchivecore.internal.util.J2EEFileUtil;
-import org.eclipse.jst.j2ee.internal.J2EEConstants;
-import org.eclipse.jst.j2ee.internal.project.J2EEProjectUtilities;
-import org.eclipse.jst.j2ee.internal.wizard.AnnotationsStandaloneGroup;
-import org.eclipse.jst.j2ee.internal.wizard.NewJavaClassWizardPage;
-import org.eclipse.jst.j2ee.model.IModelProvider;
-import org.eclipse.jst.j2ee.model.ModelProviderManager;
-import org.eclipse.jst.j2ee.project.JavaEEProjectUtilities;
-import org.eclipse.jst.j2ee.project.WebUtilities;
-import org.eclipse.jst.j2ee.web.IServletConstants;
-import org.eclipse.jst.j2ee.web.project.facet.WebFacetUtils;
-import org.eclipse.jst.servlet.ui.internal.navigator.CompressedJavaProject;
-import org.eclipse.jst.servlet.ui.internal.plugin.ServletUIPlugin;
-import org.eclipse.swt.SWT;
-import org.eclipse.swt.events.SelectionAdapter;
-import org.eclipse.swt.events.SelectionEvent;
-import org.eclipse.swt.layout.GridData;
-import org.eclipse.swt.widgets.Button;
-import org.eclipse.swt.widgets.Composite;
-import org.eclipse.swt.widgets.Event;
-import org.eclipse.swt.widgets.Label;
-import org.eclipse.swt.widgets.Text;
-import org.eclipse.ui.IWorkbenchWindow;
-import org.eclipse.ui.PlatformUI;
-import org.eclipse.wst.common.componentcore.ComponentCore;
-import org.eclipse.wst.common.componentcore.internal.util.IModuleConstants;
-import org.eclipse.wst.common.componentcore.resources.IVirtualComponent;
-import org.eclipse.wst.common.frameworks.datamodel.IDataModel;
-import org.eclipse.wst.common.project.facet.core.IFacetedProject;
-import org.eclipse.wst.common.project.facet.core.ProjectFacetsManager;
-
-public abstract class NewWebClassWizardPage extends NewJavaClassWizardPage {
-
- protected AnnotationsStandaloneGroup annotationsGroup;
-
- protected Button existingClassButton;
- protected Label existingClassLabel;
- protected Text existingClassText;
- protected Button existingButton;
-
- public NewWebClassWizardPage(IDataModel model, String pageName, String pageDesc, String pageTitle, String moduleType) {
- super(model, pageName, pageDesc, pageTitle, moduleType);
- }
-
- @Override
- protected Composite createTopLevelComposite(Composite parent) {
- Composite composite = super.createTopLevelComposite(parent);
-
- //bug 303931
- // projectNameLabel.setText(WEBUIMessages.WEB_PROJECT_LBL);
-
- addSeperator(composite, 3);
- createUseExistingGroup(composite);
- createAnnotationsGroup(composite);
-
- Dialog.applyDialogFont(composite);
-
- return composite;
- }
-
- @Override
- protected IProject getExtendedSelectedProject(Object selection) {
- if (selection instanceof CompressedJavaProject) {
- return ((CompressedJavaProject) selection).getProject().getProject();
- }
-
- return super.getExtendedSelectedProject(selection);
- }
-
- protected abstract String getUseExistingCheckboxText();
-
- protected abstract String getUseExistingProperty();
-
- protected abstract void handleClassButtonSelected();
-
- /**
- * Create annotations group and set default enablement
- */
- private void createAnnotationsGroup(Composite parent) {
- if (isWebDocletProject()) {
- annotationsGroup = new AnnotationsStandaloneGroup(parent, model, J2EEProjectUtilities.EJB.equals(projectType),
- J2EEProjectUtilities.DYNAMIC_WEB.equals(projectType));
- if (!model.isPropertySet(PROJECT_NAME))
- return;
- IProject project = ProjectUtilities.getProject(model.getStringProperty(PROJECT_NAME));
- annotationsGroup.setEnablement(project);
- // annotationsGroup.setUseAnnotations(true);
- } else {
- // not a Web Doclet project - make sure that the USE_ANNOTATIONS property is off
- model.setProperty(USE_ANNOTATIONS, false);
- }
- }
-
- private void createUseExistingGroup(Composite composite) {
- existingButton = new Button(composite, SWT.CHECK);
- existingButton.setText(getUseExistingCheckboxText());
- GridData data = new GridData(GridData.HORIZONTAL_ALIGN_FILL);
- data.horizontalSpan = 3;
- existingButton.setLayoutData(data);
- synchHelper.synchCheckbox(existingButton, getUseExistingProperty(), null);
- existingButton.addSelectionListener(new SelectionAdapter() {
- @Override
- public void widgetSelected(SelectionEvent e) {
- handleExistingButtonSelected();
- }
- });
-
- existingClassLabel = new Label(composite, SWT.LEFT);
- existingClassLabel.setText(CLASS_NAME_LABEL);
- existingClassLabel.setLayoutData(new GridData(GridData.HORIZONTAL_ALIGN_BEGINNING));
- existingClassLabel.setEnabled(false);
-
- existingClassText = new Text(composite, SWT.SINGLE | SWT.BORDER | SWT.READ_ONLY);
- existingClassText.setLayoutData(new GridData(GridData.FILL_HORIZONTAL));
- existingClassText.setEnabled(false);
- synchHelper.synchText(existingClassText, CLASS_NAME, null);
-
- existingClassButton = new Button(composite, SWT.PUSH);
- existingClassButton.setText(BROWSE_BUTTON_LABEL);
- existingClassButton.setLayoutData(new GridData(GridData.HORIZONTAL_ALIGN_FILL));
- existingClassButton.setEnabled(false);
- existingClassButton.addSelectionListener(new SelectionAdapter() {
- @Override
- public void widgetSelected(SelectionEvent e) {
- handleClassButtonSelected();
- }
- });
- }
-
- private void handleExistingButtonSelected() {
- boolean enable = existingButton.getSelection();
- existingClassLabel.setEnabled(enable);
- existingClassButton.setEnabled(enable);
- packageText.setEnabled(!enable);
- packageButton.setEnabled(!enable);
- packageLabel.setEnabled(!enable);
- classText.setEnabled(!enable);
- classLabel.setEnabled(!enable);
- superText.setEnabled(!enable);
- superButton.setEnabled(!enable);
- superLabel.setEnabled(!enable);
- }
-
- private boolean isWebDocletProject() {
- String projectName = model.getStringProperty(PROJECT_NAME);
- if(projectName != null && !"".equals(projectName.trim())){ //$NON-NLS-1$
- IProject project = ProjectUtilities.getProject(projectName);
- try {
- IFacetedProject facetedProject = ProjectFacetsManager.create(project);
- return facetedProject.hasProjectFacet(WebFacetUtils.WEB_XDOCLET_FACET);
- } catch (CoreException e) {
- ServletUIPlugin.log(e);
- }
- }
- return false;
- }
-
- @Override
- protected void validateProjectRequirements(IProject project)
- {
- if(JavaEEProjectUtilities.isWebFragmentProject(project)){
- // don't create a web DD, since web fragment project is created with one.
- model.setBooleanProperty(GENERATE_DD, Boolean.FALSE);
- return;
- }
- IVirtualComponent component = ComponentCore.createComponent(project);
- if(component.getRootFolder() != null
- && component.getRootFolder().getUnderlyingFolder() != null){
- IFile ddXmlFile = component.getRootFolder().getUnderlyingFolder().getFile(new Path(J2EEConstants.WEBAPP_DD_URI));
- if (!ddXmlFile.exists())
- {
- // add a flag into the model to create the DD at the beginning of the operation
- model.setBooleanProperty(GENERATE_DD, Boolean.TRUE);
- }
- else
- {
- // don't create a DD, since one already exists.
- model.setBooleanProperty(GENERATE_DD, Boolean.FALSE);
- }
- }
- }
-
- protected Object getSelectedObject() {
- IWorkbenchWindow window = PlatformUI.getWorkbench().getActiveWorkbenchWindow();
- if (window == null)
- return null;
- ISelection selection = window.getSelectionService().getSelection();
- if (selection == null)
- return null;
- if (!(selection instanceof IStructuredSelection))
- return null;
- IStructuredSelection ssel = (IStructuredSelection) selection;
- if (ssel.size() != 1)
- return null;
- return ssel.getFirstElement();
- }
-
- private IType getPrimaryType(ICompilationUnit cu) {
- return cu.getType(new Path(cu.getElementName()).removeFileExtension().toString());
- }
-
- private boolean isObjectSubclassOf(Object obj, String base) {
- IJavaElement jelem = getJavaElement(obj);
-
- try {
- if (jelem != null) {
- if (jelem instanceof ICompilationUnit) {
- ICompilationUnit cu = (ICompilationUnit) jelem;
- jelem = getPrimaryType(cu);
- }
-
- if (jelem instanceof IType && ((IType) jelem).isClass()) {
- IType type = (IType) jelem;
- ITypeHierarchy typeHierarchy = type.newTypeHierarchy(null);
- for (IType superType : typeHierarchy.getAllSuperInterfaces(type)) {
- if (base.equals(superType.getFullyQualifiedName()))
- return true;
- }
- }
- }
- } catch (JavaModelException e) {
- ServletUIPlugin.log(e);
- }
-
- return false;
- }
-
- protected boolean isServlet(Object obj) {
- if (obj instanceof org.eclipse.jst.javaee.web.Servlet)
- return true;
-
- if (obj instanceof org.eclipse.jst.j2ee.webapplication.Servlet)
- return true;
-
- return isObjectSubclassOf(obj, IServletConstants.QUALIFIED_SERVLET);
- }
-
- protected boolean isFilter(Object obj) {
- if (obj instanceof org.eclipse.jst.javaee.web.Filter)
- return true;
-
- if (obj instanceof org.eclipse.jst.j2ee.webapplication.Filter)
- return true;
-
- return isObjectSubclassOf(obj, IServletConstants.QUALIFIED_FILTER);
- }
-
- private String getJavaClass(Object obj) {
- IJavaElement jelem = getJavaElement(obj);
-
- if (jelem == null) {
- throw new IllegalArgumentException("the object parameter must be instance of IJavaElement"); //$NON-NLS-1$
- }
-
- if (jelem instanceof ICompilationUnit) {
- ICompilationUnit cu = (ICompilationUnit) jelem;
- jelem = getPrimaryType(cu);
- }
- return ((IType) jelem).getFullyQualifiedName();
- }
-
- protected String getServletClass(Object obj) {
- if (obj instanceof org.eclipse.jst.javaee.web.Servlet) {
- org.eclipse.jst.javaee.web.Servlet servlet = (org.eclipse.jst.javaee.web.Servlet) obj;
- return servlet.getServletClass();
- }
-
- if (obj instanceof org.eclipse.jst.j2ee.webapplication.Servlet) {
- org.eclipse.jst.j2ee.webapplication.Servlet servlet = (org.eclipse.jst.j2ee.webapplication.Servlet) obj;
- return servlet.getServletClass().getQualifiedName();
- }
-
- return getJavaClass(obj);
- }
-
- protected String getFilterClass(Object obj) {
- if (obj instanceof org.eclipse.jst.javaee.web.Filter) {
- org.eclipse.jst.javaee.web.Filter filter = (org.eclipse.jst.javaee.web.Filter) obj;
- return filter.getFilterClass();
- }
-
- if (obj instanceof org.eclipse.jst.j2ee.webapplication.Filter) {
- org.eclipse.jst.j2ee.webapplication.Filter filter = (org.eclipse.jst.j2ee.webapplication.Filter) obj;
- return filter.getFilterClass().getQualifiedName();
- }
-
- return getJavaClass(obj);
- }
-
- protected String getServletName(Object obj) {
- if (obj instanceof org.eclipse.jst.javaee.web.Servlet) {
- org.eclipse.jst.javaee.web.Servlet servlet = (org.eclipse.jst.javaee.web.Servlet) obj;
- return servlet.getServletName();
- }
-
- if (obj instanceof org.eclipse.jst.j2ee.webapplication.Servlet) {
- org.eclipse.jst.j2ee.webapplication.Servlet servlet = (org.eclipse.jst.j2ee.webapplication.Servlet) obj;
- return servlet.getServletName();
- }
-
- String servletClass = getServletClass(obj);
- IProject project = getJavaElement(obj).getJavaProject().getProject();
- IModelProvider provider = ModelProviderManager.getModelProvider(project);
- Object modelObject = provider.getModelObject();
- if (modelObject instanceof org.eclipse.jst.javaee.web.WebApp) {
- org.eclipse.jst.javaee.web.WebApp webApp = (org.eclipse.jst.javaee.web.WebApp) modelObject;
- Iterator servlets = webApp.getServlets().iterator();
- while (servlets.hasNext()) {
- org.eclipse.jst.javaee.web.Servlet servlet = (org.eclipse.jst.javaee.web.Servlet) servlets.next();
- String qualified = servlet.getServletClass();
- if (qualified.equals(servletClass)) {
- return servlet.getServletName();
- }
- }
- } else if (modelObject instanceof org.eclipse.jst.j2ee.webapplication.WebApp) {
- org.eclipse.jst.j2ee.webapplication.WebApp webApp = (org.eclipse.jst.j2ee.webapplication.WebApp) modelObject;
- Iterator servlets = webApp.getServlets().iterator();
- while (servlets.hasNext()) {
- org.eclipse.jst.j2ee.webapplication.Servlet servlet = (org.eclipse.jst.j2ee.webapplication.Servlet) servlets.next();
- String qualified = servlet.getServletClass().getQualifiedName();
- if (qualified.equals(servletClass)) {
- return servlet.getServletName();
- }
- }
- }
-
- return null;
- }
-
- protected boolean isServletJSP(Object obj) {
- return getServletJSPFile(obj) != null;
- }
-
- protected String getServletJSPFile(Object obj) {
- if (obj instanceof org.eclipse.jst.javaee.web.Servlet) {
- org.eclipse.jst.javaee.web.Servlet servlet = (org.eclipse.jst.javaee.web.Servlet) obj;
- return servlet.getJspFile();
- }
-
- if (obj instanceof org.eclipse.jst.j2ee.webapplication.Servlet) {
- org.eclipse.jst.j2ee.webapplication.Servlet servlet = (org.eclipse.jst.j2ee.webapplication.Servlet) obj;
- org.eclipse.jst.j2ee.webapplication.WebType webType = servlet.getWebType();
- if (webType.isJspType()) {
- org.eclipse.jst.j2ee.webapplication.JSPType jspType = (org.eclipse.jst.j2ee.webapplication.JSPType) webType;
- return jspType.getJspFile();
- }
- }
-
- return null;
- }
-
- protected boolean isWebFolder(Object obj) {
- if (obj instanceof IFolder) {
- return WebUtilities.isWebResource(obj);
- }
- return false;
- }
-
- protected boolean isJSP(Object obj) {
- if (obj instanceof IFile) {
- IFile file = (IFile) obj;
- return WebUtilities.isWebResource(file) && file.getName().endsWith(J2EEFileUtil.DOT_JSP);
- }
- return false;
- }
-
- protected String getWebResourcePath(IResource resource) {
- IVirtualComponent comp = ComponentCore.createComponent(resource.getProject());
- if (comp != null) {
- IPath rootPath = comp.getRootFolder().getWorkspaceRelativePath();
- return "/" + resource.getFullPath().makeRelativeTo(rootPath).toString(); //$NON-NLS-1$
- }
- return null;
- }
-
- protected String makeFirstCharUppercase(String str) {
- if (str == null || str.length() == 0)
- return str;
-
- StringBuilder builder = new StringBuilder(str);
- builder.setCharAt(0, Character.toUpperCase(builder.charAt(0)));
- return builder.toString();
- }
-
- protected String getFileNameWithouFileExtension(IFile file) {
- String name = file.getName();
- String ext = file.getFileExtension();
-
- if (ext == null)
- return name;
-
- return name.substring(0, name.length() - (ext.length() + 1));
- }
-
- protected void checkExistingButton(boolean state) {
- existingButton.setSelection(state);
- existingButton.notifyListeners(SWT.Selection, new Event());
- }
-
- @Override
- protected boolean isProjectValid(IProject project) {
- boolean result;
- try {
- result = project.isAccessible() &&
- project.hasNature(IModuleConstants.MODULE_NATURE_ID) &&
- (JavaEEProjectUtilities.isDynamicWebProject(project) || JavaEEProjectUtilities.isWebFragmentProject(project));
- } catch (CoreException ce) {
- result = false;
- }
- return result;
- }
-
-}
diff --git a/plugins/org.eclipse.jst.servlet.ui/servlet_ui/org/eclipse/jst/servlet/ui/internal/wizard/NewWebWizard.java b/plugins/org.eclipse.jst.servlet.ui/servlet_ui/org/eclipse/jst/servlet/ui/internal/wizard/NewWebWizard.java
deleted file mode 100644
index d1f6fb9..0000000
--- a/plugins/org.eclipse.jst.servlet.ui/servlet_ui/org/eclipse/jst/servlet/ui/internal/wizard/NewWebWizard.java
+++ /dev/null
@@ -1,57 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2003, 2008 IBM Corporation and others.
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
- *
- * Contributors:
- * IBM Corporation - initial API and implementation
- * Kaloyan Raev, kaloyan.raev@sap.com
- *******************************************************************************/
-package org.eclipse.jst.servlet.ui.internal.wizard;
-
-import org.eclipse.jface.viewers.ISelection;
-import org.eclipse.jface.viewers.IStructuredSelection;
-import org.eclipse.jst.servlet.ui.internal.plugin.ServletUIPlugin;
-import org.eclipse.ui.INewWizard;
-import org.eclipse.ui.IWorkbench;
-import org.eclipse.ui.IWorkbenchWindow;
-import org.eclipse.wst.common.frameworks.datamodel.IDataModel;
-import org.eclipse.wst.common.frameworks.internal.datamodel.ui.DataModelWizard;
-
-/**
- * @author jlanuti
- */
-public abstract class NewWebWizard extends DataModelWizard implements INewWizard {
-
- /**
- * @param model
- */
- public NewWebWizard(IDataModel model) {
- super(model);
- }
-
- /**
- * Default constructor
- */
- public NewWebWizard() {
- super();
- }
-
- public void init(IWorkbench workbench, IStructuredSelection selection) {
- getDataModel();
- }
-
- protected IStructuredSelection getCurrentSelection() {
- IWorkbenchWindow window = ServletUIPlugin.getDefault().getWorkbench().getActiveWorkbenchWindow();
- if (window != null) {
- ISelection selection = window.getSelectionService().getSelection();
- if (selection instanceof IStructuredSelection) {
- return (IStructuredSelection) selection;
- }
- }
- return null;
- }
-
-}
diff --git a/plugins/org.eclipse.jst.servlet.ui/servlet_ui/org/eclipse/jst/servlet/ui/internal/wizard/ServletDataModelSyncHelper.java b/plugins/org.eclipse.jst.servlet.ui/servlet_ui/org/eclipse/jst/servlet/ui/internal/wizard/ServletDataModelSyncHelper.java
deleted file mode 100644
index ce69dac..0000000
--- a/plugins/org.eclipse.jst.servlet.ui/servlet_ui/org/eclipse/jst/servlet/ui/internal/wizard/ServletDataModelSyncHelper.java
+++ /dev/null
@@ -1,186 +0,0 @@
-package org.eclipse.jst.servlet.ui.internal.wizard;
-
-import java.util.ArrayList;
-import java.util.HashMap;
-import java.util.List;
-import java.util.Map;
-
-import org.eclipse.swt.SWT;
-import org.eclipse.swt.events.SelectionEvent;
-import org.eclipse.swt.events.SelectionListener;
-import org.eclipse.swt.widgets.Button;
-import org.eclipse.swt.widgets.Combo;
-import org.eclipse.swt.widgets.Control;
-import org.eclipse.swt.widgets.Display;
-import org.eclipse.swt.widgets.Label;
-import org.eclipse.swt.widgets.Table;
-import org.eclipse.swt.widgets.Text;
-import org.eclipse.swt.widgets.Tree;
-import org.eclipse.swt.widgets.Widget;
-import org.eclipse.wst.common.frameworks.datamodel.DataModelEvent;
-import org.eclipse.wst.common.frameworks.datamodel.IDataModel;
-import org.eclipse.wst.common.frameworks.internal.datamodel.ui.DataModelSynchHelper;
-
-public class ServletDataModelSyncHelper extends DataModelSynchHelper {
- protected Map widgetToValueHash;
- protected MultipleCheckboxSelectionListener multipleCheckboxSelectionListener;
-
- public ServletDataModelSyncHelper(IDataModel model) {
- super(model);
- }
-
- /**
- * Sets the UI to have the property value defined in the model
- *
- * @param propertyName
- * @link IDataModelListener for the flag values.
- */
- @Override
- public void synchUIWithModel(final String propertyName, final int flag) {
- if (null != propertyToWidgetHash && propertyToWidgetHash.containsKey(propertyName)) {
- Display.getDefault().syncExec(new Runnable() {
- public void run() {
- try {
- Object obj = propertyToWidgetHash.get(propertyName);
- if (obj != null) {
- if (obj instanceof List) {
- List widgets = (List) obj;
- for (int i = 0; i < widgets.size(); i++) {
- currentWidget = (Widget) widgets.get(i);
- synchUIWithModel(propertyName, flag, currentWidget);
- }
- } else {
- currentWidget = (Widget) obj;
- synchUIWithModel(propertyName, flag, currentWidget);
- }
- }
- } finally {
- currentWidget = null;
- }
- }
- });
- }
- }
-
- protected void synchUIWithModel(final String propertyName, final int flag, Widget currentWidget) {
- if (currentWidget != null && currentWidget != currentWidgetFromEvent) {
- //We must hold a copy in a temp variable because setting the widget value
- //may trigger an event that will cause this method to be called again.
- Widget widget = currentWidget;
- try {
- ignoreModifyEvent = true;
- if (currentWidget instanceof Text)
- setWidgetValue(propertyName, flag, (Text) currentWidget);
- else if (currentWidget instanceof Combo) {
- setWidgetValue(propertyName, flag, (Combo) currentWidget);
- } else if (currentWidget instanceof Button)
- setWidgetValue(propertyName, flag, (Button) currentWidget);
- else if (currentWidget instanceof Label)
- setWidgetValue(propertyName, flag, (Label) currentWidget);
- else if (currentWidget instanceof List)
- setWidgetValue(propertyName, flag, (org.eclipse.swt.widgets.List) currentWidget);
- else if (currentWidget instanceof Table)
- setWidgetValue(propertyName, flag, (Table) currentWidget);
- else if (currentWidget instanceof Tree)
- setWidgetValue(propertyName, flag, (Tree) currentWidget);
- } finally {
- ignoreModifyEvent = false;
- }
- //Pass the copy of the currentWidget
- setEnablement((Control) widget, dataModel.isPropertyEnabled(propertyName));
- }
- }
-
- @Override
- protected void setWidgetValue(String propertyName, int flag, Button button) {
- if ((button.getStyle() & SWT.CHECK) == SWT.CHECK) {
- Object propertyValue = dataModel.getProperty(propertyName);
- if (propertyValue instanceof java.util.List) {
- List value = (List) propertyValue;
- Object buttonValue = widgetToValueHash.get(button);
- boolean exists = value.contains(buttonValue);
- if (button.getSelection() != exists) {
- button.setSelection(exists);
- }
- return;
- }
- }
- }
-
- private class MultipleCheckboxSelectionListener implements SelectionListener {
- public void widgetSelected(SelectionEvent e) {
- Button button = (Button) e.getSource();
- if (currentWidget == button)
- return;
- try {
- currentWidgetFromEvent = button;
- String propertyName = (String) widgetToPropertyHash.get(button);
- Object propertyValue = widgetToValueHash.get(button);
-
- Object contents = dataModel.getProperty(propertyName);
-
- if (contents == null) {
- contents = new ArrayList();
- }
- if (contents instanceof java.util.List) {
- List list = (List) contents;
- if (button.getSelection()) {
- if (!list.contains(propertyValue))
- list.add(propertyValue);
- } else {
- list.remove(propertyValue);
- }
- setProperty(propertyName, list);
- dataModel.notifyPropertyChange(propertyName, DataModelEvent.VALUE_CHG);
- }
- } finally {
- currentWidgetFromEvent = null;
- }
- }
-
-
-
- public void widgetDefaultSelected(SelectionEvent e) {
- }
- }
-
- public void synchCheckbox(Button checkbox, String textValue, String propertyName, Control[] dependentControls) {
- setCompositeValue(checkbox, textValue);
- synchComposite(checkbox, propertyName, dependentControls);
- if (multipleCheckboxSelectionListener == null) {
- multipleCheckboxSelectionListener = new MultipleCheckboxSelectionListener();
- }
- checkbox.addSelectionListener(multipleCheckboxSelectionListener);
- }
-
- protected void setCompositeValue(Widget widget, Object value) {
- if (widgetToValueHash == null)
- widgetToValueHash = new HashMap();
- widgetToValueHash.put(widget, value);
- }
-
- @Override
- protected void synchComposite(Widget widget, String propertyName, Control[] depControls) {
- if (null == widgetToPropertyHash)
- widgetToPropertyHash = new HashMap();
- if (propertyToWidgetHash == null)
- propertyToWidgetHash = new HashMap();
- widgetToPropertyHash.put(widget, propertyName);
- Object value = propertyToWidgetHash.get(propertyName);
- List widgets;
- if (value == null || !(value instanceof List)) {
- widgets = new ArrayList();
- } else {
- widgets = (List) value;
- }
- widgets.add(widget);
- propertyToWidgetHash.put(propertyName, widgets);
-
- if (depControls != null) {
- if (widgetToDepControls == null)
- widgetToDepControls = new HashMap();
- widgetToDepControls.put(widget, depControls);
- }
- synchUIWithModel(propertyName, DataModelEvent.VALUE_CHG);
- }
-}
diff --git a/plugins/org.eclipse.jst.servlet.ui/servlet_ui/org/eclipse/jst/servlet/ui/internal/wizard/SimpleTypedElementSelectionValidator.java b/plugins/org.eclipse.jst.servlet.ui/servlet_ui/org/eclipse/jst/servlet/ui/internal/wizard/SimpleTypedElementSelectionValidator.java
deleted file mode 100644
index a05cca4..0000000
--- a/plugins/org.eclipse.jst.servlet.ui/servlet_ui/org/eclipse/jst/servlet/ui/internal/wizard/SimpleTypedElementSelectionValidator.java
+++ /dev/null
@@ -1,79 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2006 IBM Corporation and others.
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
- *
- * Contributors:
- * IBM Corporation - initial API and implementation
- *******************************************************************************/
-package org.eclipse.jst.servlet.ui.internal.wizard;
-
-import org.eclipse.core.runtime.IStatus;
-import org.eclipse.core.runtime.Status;
-import org.eclipse.jst.servlet.ui.internal.plugin.ServletUIPlugin;
-import org.eclipse.ui.dialogs.ISelectionStatusValidator;
-
-/**
- * Implementation of a <code>ISelectionValidator</code> to validate the type
- * of an element. Empty selections are not accepted.
- */
-public class SimpleTypedElementSelectionValidator implements ISelectionStatusValidator {
-
- private IStatus fgErrorStatus = new Status(IStatus.ERROR, ServletUIPlugin.PLUGIN_ID, 0, "", null); //$NON-NLS-1$
- private IStatus fgOKStatus = new Status(IStatus.OK, ServletUIPlugin.PLUGIN_ID, 0, "", null); //$NON-NLS-1$
-
- private Class[] fAcceptedTypes;
- private boolean fAllowMultipleSelection;
-
- /**
- * @param acceptedTypes
- * The types accepted by the validator
- * @param allowMultipleSelection
- * If set to <code>true</code>, the validator allows
- * multiple selection.
- */
- public SimpleTypedElementSelectionValidator(Class[] acceptedTypes, boolean allowMultipleSelection) {
- org.eclipse.core.runtime.Assert.isNotNull(acceptedTypes);
- fAcceptedTypes = acceptedTypes;
- fAllowMultipleSelection = allowMultipleSelection;
- }
-
- /*
- * @see org.eclipse.ui.dialogs.ISelectionValidator#isValid(java.lang.Object)
- */
- public IStatus validate(Object[] elements) {
- if (isValid(elements)) {
- return fgOKStatus;
- }
- return fgErrorStatus;
- }
-
- private boolean isOfAcceptedType(Object o) {
- for (int i = 0; i < fAcceptedTypes.length; i++) {
- if (fAcceptedTypes[i].isInstance(o)) {
- return true;
- }
- }
- return false;
- }
-
- private boolean isValid(Object[] selection) {
- if (selection.length == 0) {
- return false;
- }
-
- if (!fAllowMultipleSelection && selection.length != 1) {
- return false;
- }
-
- for (int i = 0; i < selection.length; i++) {
- Object o = selection[i];
- if (!isOfAcceptedType(o)) {
- return false;
- }
- }
- return true;
- }
-}
diff --git a/plugins/org.eclipse.jst.servlet.ui/servlet_ui/org/eclipse/jst/servlet/ui/internal/wizard/StringArrayTableWizardSectionCallback.java b/plugins/org.eclipse.jst.servlet.ui/servlet_ui/org/eclipse/jst/servlet/ui/internal/wizard/StringArrayTableWizardSectionCallback.java
deleted file mode 100644
index e75f6c1..0000000
--- a/plugins/org.eclipse.jst.servlet.ui/servlet_ui/org/eclipse/jst/servlet/ui/internal/wizard/StringArrayTableWizardSectionCallback.java
+++ /dev/null
@@ -1,35 +0,0 @@
-package org.eclipse.jst.servlet.ui.internal.wizard;
-
-import org.eclipse.jst.j2ee.internal.wizard.StringArrayTableWizardSection.StringArrayDialogCallback;
-import org.eclipse.swt.widgets.Text;
-
-/**
- * Implementation of the <code>StringArrayDialogCallback</code> interface for
- * both "Initialization Parameters" and "URL Mappings" table views.
- */
-public class StringArrayTableWizardSectionCallback implements
- StringArrayDialogCallback {
-
- /**
- * The first text field should not be empty.
- */
- public boolean validate(Text[] texts) {
- if (texts.length > 0) {
- return texts[0].getText().trim().length() > 0;
- }
- return true;
- }
-
- /**
- * Trims the text values.
- */
- public String[] retrieveResultStrings(Text[] texts) {
- int n = texts.length;
- String[] result = new String[n];
- for (int i = 0; i < n; i++) {
- result[i] = texts[i].getText().trim();
- }
- return result;
- }
-
-}
diff --git a/plugins/org.eclipse.jst.servlet.ui/servlet_ui/org/eclipse/jst/servlet/ui/internal/wizard/StringMatcher.java b/plugins/org.eclipse.jst.servlet.ui/servlet_ui/org/eclipse/jst/servlet/ui/internal/wizard/StringMatcher.java
deleted file mode 100644
index d148b9c..0000000
--- a/plugins/org.eclipse.jst.servlet.ui/servlet_ui/org/eclipse/jst/servlet/ui/internal/wizard/StringMatcher.java
+++ /dev/null
@@ -1,399 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2000, 2006 IBM Corporation and others.
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
- *
- * Contributors:
- * IBM Corporation - initial API and implementation
- *
- *
- * Note: this class was copied from org.eclipse.jst.internal.ui.util
- * It has much requested as an API since there are a dozen such copies throughout
- * Eclipse and related projects. (Such as, see https://bugs.eclipse.org/bugs/show_bug.cgi?id=12214)
- * These requests have been rejected since, all users should eventually migrate to use javax.regx
- * counterparts instead.
- *
- *******************************************************************************/
-package org.eclipse.jst.servlet.ui.internal.wizard;
-
-import java.util.*;
-
-/**
- * A string pattern matcher. Supports '*' and '?' wildcards.
- */
-public class StringMatcher {
- protected String fPattern;
- protected int fLength; // pattern length
- protected boolean fIgnoreWildCards;
- protected boolean fIgnoreCase;
- protected boolean fHasLeadingStar;
- protected boolean fHasTrailingStar;
- protected String fSegments[]; //the given pattern is split into * separated segments
-
- /* boundary value beyond which we don't need to search in the text */
- protected int fBound= 0;
-
-
- protected static final char fSingleWildCard= '\u0000';
-
- public static class Position {
- int start; //inclusive
- int end; //exclusive
- public Position(int start, int end) {
- this.start= start;
- this.end= end;
- }
- public int getStart() {
- return start;
- }
- public int getEnd() {
- return end;
- }
- }
- /**
- * StringMatcher constructor takes in a String object that is a simple
- * pattern. The pattern may contain '*' for 0 and many characters and
- * '?' for exactly one character.
- *
- * Literal '*' and '?' characters must be escaped in the pattern
- * e.g., "\*" means literal "*", etc.
- *
- * Escaping any other character (including the escape character itself),
- * just results in that character in the pattern.
- * e.g., "\a" means "a" and "\\" means "\"
- *
- * If invoking the StringMatcher with string literals in Java, don't forget
- * escape characters are represented by "\\".
- *
- * @param pattern the pattern to match text against
- * @param ignoreCase if true, case is ignored
- * @param ignoreWildCards if true, wild cards and their escape sequences are ignored
- * (everything is taken literally).
- */
- public StringMatcher(String pattern, boolean ignoreCase, boolean ignoreWildCards) {
- if (pattern == null)
- throw new IllegalArgumentException();
- fIgnoreCase= ignoreCase;
- fIgnoreWildCards= ignoreWildCards;
- fPattern= pattern;
- fLength= pattern.length();
-
- if (fIgnoreWildCards) {
- parseNoWildCards();
- } else {
- parseWildCards();
- }
- }
- /**
- * Find the first occurrence of the pattern between <code>start</code)(inclusive)
- * and <code>end</code>(exclusive).
- * @param text the String object to search in
- * @param start the starting index of the search range, inclusive
- * @param end the ending index of the search range, exclusive
- * @return an <code>StringMatcher.Position</code> object that keeps the starting
- * (inclusive) and ending positions (exclusive) of the first occurrence of the
- * pattern in the specified range of the text; return null if not found or subtext
- * is empty (start==end). A pair of zeros is returned if pattern is empty string
- * Note that for pattern like "*abc*" with leading and trailing stars, position of "abc"
- * is returned. For a pattern like"*??*" in text "abcdf", (1,3) is returned
- */
- public StringMatcher.Position find(String text, int start, int end) {
- if (text == null)
- throw new IllegalArgumentException();
-
- int tlen= text.length();
- int innerStart = start;
- int innerEnd = end;
- if (innerStart < 0)
- innerStart= 0;
- if (innerEnd > tlen)
- innerEnd= tlen;
- if (innerEnd < 0 ||innerStart >= innerEnd )
- return null;
- if (fLength == 0)
- return new Position(innerStart, innerStart);
- if (fIgnoreWildCards) {
- int x= posIn(text, innerStart, innerEnd);
- if (x < 0)
- return null;
- return new Position(x, x+fLength);
- }
-
- int segCount= fSegments.length;
- if (segCount == 0)//pattern contains only '*'(s)
- return new Position (innerStart, innerEnd);
-
- int curPos= innerStart;
- int matchStart= -1;
- int i;
- for (i= 0; i < segCount && curPos < innerEnd; ++i) {
- String current= fSegments[i];
- int nextMatch= regExpPosIn(text, curPos, innerEnd, current);
- if (nextMatch < 0 )
- return null;
- if(i == 0)
- matchStart= nextMatch;
- curPos= nextMatch + current.length();
- }
- if (i < segCount)
- return null;
- return new Position(matchStart, curPos);
- }
- /**
- * match the given <code>text</code> with the pattern
- * @return true if matched eitherwise false
- * @param text a String object
- */
- public boolean match(String text) {
- return match(text, 0, text.length());
- }
- /**
- * Given the starting (inclusive) and the ending (exclusive) positions in the
- * <code>text</code>, determine if the given substring matches with aPattern
- * @return true if the specified portion of the text matches the pattern
- * @param text a String object that contains the substring to match
- * @param start marks the starting position (inclusive) of the substring
- * @param end marks the ending index (exclusive) of the substring
- */
- public boolean match(String text, int start, int end) {
- if (null == text)
- throw new IllegalArgumentException();
-
- int innerStart = start;
- int innerEnd = end;
-
- if (innerStart > innerEnd)
- return false;
-
- if (fIgnoreWildCards)
- return (innerEnd - innerStart == fLength) && fPattern.regionMatches(fIgnoreCase, 0, text, innerStart, fLength);
- int segCount= fSegments.length;
- if (segCount == 0 && (fHasLeadingStar || fHasTrailingStar)) // pattern contains only '*'(s)
- return true;
- if (innerStart == innerEnd)
- return fLength == 0;
- if (fLength == 0)
- return innerStart == innerEnd;
-
- int tlen= text.length();
- if (innerStart < 0)
- innerStart= 0;
- if (innerEnd > tlen)
- innerEnd= tlen;
-
- int tCurPos= innerStart;
- int bound= innerEnd - fBound;
- if ( bound < 0)
- return false;
- int i=0;
- String current= fSegments[i];
- int segLength= current.length();
-
- /* process first segment */
- if (!fHasLeadingStar){
- if(!regExpRegionMatches(text, innerStart, current, 0, segLength)) {
- return false;
- }
- ++i;
- tCurPos= tCurPos + segLength;
- }
- if ((fSegments.length == 1) && (!fHasLeadingStar) && (!fHasTrailingStar)) {
- // only one segment to match, no wildcards specified
- return tCurPos == innerEnd;
- }
- /* process middle segments */
- while (i < segCount) {
- current= fSegments[i];
- int currentMatch;
- int k= current.indexOf(fSingleWildCard);
- if (k < 0) {
- currentMatch= textPosIn(text, tCurPos, innerEnd, current);
- if (currentMatch < 0)
- return false;
- } else {
- currentMatch= regExpPosIn(text, tCurPos, innerEnd, current);
- if (currentMatch < 0)
- return false;
- }
- tCurPos= currentMatch + current.length();
- i++;
- }
-
- /* process final segment */
- if (!fHasTrailingStar && tCurPos != innerEnd) {
- int clen= current.length();
- return regExpRegionMatches(text, innerEnd - clen, current, 0, clen);
- }
- return i == segCount ;
- }
-
- /**
- * This method parses the given pattern into segments seperated by wildcard '*' characters.
- * Since wildcards are not being used in this case, the pattern consists of a single segment.
- */
- private void parseNoWildCards() {
- fSegments= new String[1];
- fSegments[0]= fPattern;
- fBound= fLength;
- }
- /**
- * Parses the given pattern into segments seperated by wildcard '*' characters.
- */
- private void parseWildCards() {
- if(fPattern.startsWith("*"))//$NON-NLS-1$
- fHasLeadingStar= true;
- if(fPattern.endsWith("*")) {//$NON-NLS-1$
- /* make sure it's not an escaped wildcard */
- if (fLength > 1 && fPattern.charAt(fLength - 2) != '\\') {
- fHasTrailingStar= true;
- }
- }
-
- Vector temp= new Vector();
-
- int pos= 0;
- StringBuffer buf= new StringBuffer();
- while (pos < fLength) {
- char c= fPattern.charAt(pos++);
- switch (c) {
- case '\\':
- if (pos >= fLength) {
- buf.append(c);
- } else {
- char next= fPattern.charAt(pos++);
- /* if it's an escape sequence */
- if (next == '*' || next == '?' || next == '\\') {
- buf.append(next);
- } else {
- /* not an escape sequence, just insert literally */
- buf.append(c);
- buf.append(next);
- }
- }
- break;
- case '*':
- if (buf.length() > 0) {
- /* new segment */
- temp.addElement(buf.toString());
- fBound += buf.length();
- buf.setLength(0);
- }
- break;
- case '?':
- /* append special character representing single match wildcard */
- buf.append(fSingleWildCard);
- break;
- default:
- buf.append(c);
- }
- }
-
- /* add last buffer to segment list */
- if (buf.length() > 0) {
- temp.addElement(buf.toString());
- fBound += buf.length();
- }
-
- fSegments= new String[temp.size()];
- temp.copyInto(fSegments);
- }
- /**
- * @param text a string which contains no wildcard
- * @param start the starting index in the text for search, inclusive
- * @param end the stopping point of search, exclusive
- * @return the starting index in the text of the pattern , or -1 if not found
- */
- protected int posIn(String text, int start, int end) {//no wild card in pattern
- int max= end - fLength;
-
- if (!fIgnoreCase) {
- int i= text.indexOf(fPattern, start);
- if (i == -1 || i > max)
- return -1;
- return i;
- }
-
- for (int i= start; i <= max; ++i) {
- if (text.regionMatches(true, i, fPattern, 0, fLength))
- return i;
- }
-
- return -1;
- }
- /**
- * @param text a simple regular expression that may only contain '?'(s)
- * @param start the starting index in the text for search, inclusive
- * @param end the stopping point of search, exclusive
- * @param p a simple regular expression that may contains '?'
- * @return the starting index in the text of the pattern , or -1 if not found
- */
- protected int regExpPosIn(String text, int start, int end, String p) {
- int plen= p.length();
-
- int max= end - plen;
- for (int i= start; i <= max; ++i) {
- if (regExpRegionMatches(text, i, p, 0, plen))
- return i;
- }
- return -1;
- }
-
-
- protected boolean regExpRegionMatches(String text, int tStart, String p, int pStart, int plen) {
- int innerPlen = plen;
- int innerTStart = tStart;
- int innerPStart = pStart;
- while (innerPlen-- > 0) {
- char tchar= text.charAt(innerTStart++);
- char pchar= p.charAt(innerPStart++);
-
- /* process wild cards */
- if (!fIgnoreWildCards) {
- /* skip single wild cards */
- if (pchar == fSingleWildCard) {
- continue;
- }
- }
- if (pchar == tchar)
- continue;
- if (fIgnoreCase) {
- if (Character.toUpperCase(tchar) == Character.toUpperCase(pchar))
- continue;
- // comparing after converting to upper case doesn't handle all cases;
- // also compare after converting to lower case
- if (Character.toLowerCase(tchar) == Character.toLowerCase(pchar))
- continue;
- }
- return false;
- }
- return true;
- }
- /**
- * @param text the string to match
- * @param start the starting index in the text for search, inclusive
- * @param end the stopping point of search, exclusive
- * @param p a string that has no wildcard
- * @return the starting index in the text of the pattern , or -1 if not found
- */
- protected int textPosIn(String text, int start, int end, String p) {
-
- int plen= p.length();
- int max= end - plen;
-
- if (!fIgnoreCase) {
- int i= text.indexOf(p, start);
- if (i == -1 || i > max)
- return -1;
- return i;
- }
-
- for (int i= start; i <= max; ++i) {
- if (text.regionMatches(true, i, p, 0, plen))
- return i;
- }
-
- return -1;
- }
-}
diff --git a/plugins/org.eclipse.jst.servlet.ui/servlet_ui/org/eclipse/jst/servlet/ui/internal/wizard/WebAppLibrariesContainerPage.java b/plugins/org.eclipse.jst.servlet.ui/servlet_ui/org/eclipse/jst/servlet/ui/internal/wizard/WebAppLibrariesContainerPage.java
deleted file mode 100644
index a498a9b..0000000
--- a/plugins/org.eclipse.jst.servlet.ui/servlet_ui/org/eclipse/jst/servlet/ui/internal/wizard/WebAppLibrariesContainerPage.java
+++ /dev/null
@@ -1,211 +0,0 @@
-/******************************************************************************
- * Copyright (c) 2006 BEA Systems, Inc.
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
- *
- * Contributors:
- * Konstantin Komissarchik - initial API and implementation
- ******************************************************************************/
-
-package org.eclipse.jst.servlet.ui.internal.wizard;
-
-import java.util.Arrays;
-import java.util.Iterator;
-import java.util.Set;
-
-import org.eclipse.core.resources.IProject;
-import org.eclipse.core.runtime.CoreException;
-import org.eclipse.core.runtime.IPath;
-import org.eclipse.core.runtime.Path;
-import org.eclipse.jdt.core.IClasspathEntry;
-import org.eclipse.jdt.core.IJavaProject;
-import org.eclipse.jdt.core.JavaCore;
-import org.eclipse.jdt.ui.wizards.IClasspathContainerPage;
-import org.eclipse.jdt.ui.wizards.IClasspathContainerPageExtension;
-import org.eclipse.jdt.ui.wizards.NewElementWizardPage;
-import org.eclipse.jst.j2ee.internal.web.classpath.WebAppLibrariesContainer;
-import org.eclipse.jst.j2ee.web.project.facet.WebFacetUtils;
-import org.eclipse.jst.servlet.ui.internal.plugin.ServletUIPlugin;
-import org.eclipse.osgi.util.NLS;
-import org.eclipse.swt.SWT;
-import org.eclipse.swt.layout.GridData;
-import org.eclipse.swt.layout.GridLayout;
-import org.eclipse.swt.widgets.Combo;
-import org.eclipse.swt.widgets.Composite;
-import org.eclipse.swt.widgets.Label;
-import org.eclipse.wst.common.project.facet.core.IFacetedProject;
-import org.eclipse.wst.common.project.facet.core.ProjectFacetsManager;
-
-/**
- * @author <a href="mailto:kosta@bea.com">Konstantin Komissarchik</a>
- */
-
-public class WebAppLibrariesContainerPage
-
- extends NewElementWizardPage
- implements IClasspathContainerPage, IClasspathContainerPageExtension
-
-{
- private IProject ownerProject;
- private String libsProjectName;
- private Combo projectsCombo;
-
- public WebAppLibrariesContainerPage()
- {
- super( "WebAppLibrariesContainerPage" ); //$NON-NLS-1$
-
- setTitle( Resources.pageTitle );
- setDescription( Resources.pageDescription );
- }
-
- public IClasspathEntry getSelection()
- {
- IPath path = new Path( WebAppLibrariesContainer.CONTAINER_ID );
-
- final int index = this.projectsCombo.getSelectionIndex();
- if(index != -1){
- final String selectedProjectName = this.projectsCombo.getItem( index );
-
- if( this.ownerProject == null ||
- ! selectedProjectName.equals( this.ownerProject.getName() ) )
- {
- path = path.append( selectedProjectName );
- }
- }
-
- return JavaCore.newContainerEntry( path );
- }
-
- public void setSelection( final IClasspathEntry cpentry )
- {
- final IPath path = cpentry == null ? null : cpentry.getPath();
-
- if( path == null || path.segmentCount() == 1 )
- {
- if( this.ownerProject != null )
- {
- this.libsProjectName = this.ownerProject.getName();
- }
- }
- else
- {
- this.libsProjectName = path.segment( 1 );
- }
- }
-
- public void createControl( final Composite parent )
- {
- final Composite composite = new Composite( parent, SWT.NONE );
- composite.setLayout( new GridLayout( 2, false ) );
-
- final Label label = new Label( composite, SWT.NONE );
- label.setText( Resources.projectsLabel );
-
- final String[] webProjects = getWebProjects();
-
- this.projectsCombo = new Combo( composite, SWT.READ_ONLY );
- this.projectsCombo.setItems( webProjects );
-
- final int index;
-
- if( this.ownerProject != null )
- {
- index = indexOf( webProjects, this.libsProjectName );
- }
- else
- {
- if( this.projectsCombo.getItemCount() > 0 )
- {
- index = 0;
- }
- else
- {
- index = -1;
- }
- }
-
- if( index != -1 )
- {
- this.projectsCombo.select( index );
- }
-
- final GridData gd = new GridData();
- gd.grabExcessHorizontalSpace = true;
- gd.minimumWidth = 100;
-
- this.projectsCombo.setLayoutData( gd );
-
- setControl( composite );
- }
-
- public boolean finish()
- {
- return true;
- }
-
- public void initialize( final IJavaProject project,
- final IClasspathEntry[] currentEntries )
- {
- this.ownerProject = ( project == null ? null : project.getProject() );
- }
-
- private static String[] getWebProjects()
- {
- try
- {
- final Set projects
- = ProjectFacetsManager.getFacetedProjects( WebFacetUtils.WEB_FACET );
-
- final String[] names = new String[ projects.size() ];
- int i = 0;
-
- for( Iterator itr = projects.iterator(); itr.hasNext(); i++ )
- {
- final IFacetedProject fproj = (IFacetedProject) itr.next();
- names[ i ] = fproj.getProject().getName();
- }
-
- Arrays.sort( names );
-
- return names;
- }
- catch( CoreException e )
- {
- ServletUIPlugin.log( e.getStatus() );
- return new String[ 0 ];
- }
- }
-
- private static int indexOf( final String[] array,
- final String str )
- {
- for( int i = 0; i < array.length; i++ )
- {
- if( array[ i ].equals( str ) )
- {
- return i;
- }
- }
-
- return -1;
- }
-
- private static final class Resources
-
- extends NLS
-
- {
- public static String pageTitle;
- public static String pageDescription;
- public static String projectsLabel;
-
- static
- {
- initializeMessages( WebAppLibrariesContainerPage.class.getName(),
- Resources.class );
- }
- }
-
-}
diff --git a/plugins/org.eclipse.jst.servlet.ui/servlet_ui/org/eclipse/jst/servlet/ui/internal/wizard/WebAppLibrariesContainerPage.properties b/plugins/org.eclipse.jst.servlet.ui/servlet_ui/org/eclipse/jst/servlet/ui/internal/wizard/WebAppLibrariesContainerPage.properties
deleted file mode 100644
index 85621ab..0000000
--- a/plugins/org.eclipse.jst.servlet.ui/servlet_ui/org/eclipse/jst/servlet/ui/internal/wizard/WebAppLibrariesContainerPage.properties
+++ /dev/null
@@ -1,13 +0,0 @@
-###############################################################################
-# Copyright (c) 2005, 2006 IBM Corporation and others.
-# All rights reserved. This program and the accompanying materials
-# are made available under the terms of the Eclipse Public License v1.0
-# which accompanies this distribution, and is available at
-# http://www.eclipse.org/legal/epl-v10.html
-#
-# Contributors:
-# IBM Corporation - initial API and implementation
-###############################################################################
-pageTitle = Web App Libraries
-pageDescription = This container dynamically manages classpath entries for types in the WEB-INF/lib and WEB-INF/classes directories.
-projectsLabel = Project:\
diff --git a/plugins/org.eclipse.jst.servlet.ui/servlet_ui/org/eclipse/jst/servlet/ui/internal/wizard/WebComponentExportPage.java b/plugins/org.eclipse.jst.servlet.ui/servlet_ui/org/eclipse/jst/servlet/ui/internal/wizard/WebComponentExportPage.java
deleted file mode 100644
index 66b7631..0000000
--- a/plugins/org.eclipse.jst.servlet.ui/servlet_ui/org/eclipse/jst/servlet/ui/internal/wizard/WebComponentExportPage.java
+++ /dev/null
@@ -1,69 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2003, 2006 IBM Corporation and others.
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
- *
- * Contributors:
- * IBM Corporation - initial API and implementation
- *******************************************************************************/
-package org.eclipse.jst.servlet.ui.internal.wizard;
-
-import org.eclipse.jface.viewers.IStructuredSelection;
-import org.eclipse.jst.j2ee.internal.plugin.J2EEUIPlugin;
-import org.eclipse.jst.j2ee.internal.plugin.J2EEUIPluginIcons;
-import org.eclipse.jst.j2ee.internal.wizard.J2EEModuleExportPage;
-import org.eclipse.jst.servlet.ui.IWebUIContextIds;
-import org.eclipse.jst.servlet.ui.internal.plugin.WEBUIMessages;
-import org.eclipse.wst.common.frameworks.datamodel.IDataModel;
-
-public class WebComponentExportPage extends J2EEModuleExportPage {
- /**
- * @param model
- * @param pageName
- */
- public WebComponentExportPage(IDataModel model, String pageName, IStructuredSelection selection) {
- super(model, pageName, selection);
- setTitle(WEBUIMessages.WEB_EXPORT_MAIN_PG_TITLE);
- setDescription(WEBUIMessages.WEB_EXPORT_MAIN_PG_DESC);
- setImageDescriptor(J2EEUIPlugin.getDefault().getImageDescriptor(J2EEUIPluginIcons.WEB_EXPORT_WIZARD_BANNER));
- setInfopopID(IWebUIContextIds.WAR_EXPORT_PAGE1);
- }
-
- /*
- * (non-Javadoc)
- *
- * @see org.eclipse.jst.j2ee.internal.internal.internal.ui.wizard.J2EEImportPage#getProjectImportLabel()
- */
- @Override
- protected String getComponentLabel() {
- return WEBUIMessages.WEB_PROJECT_LBL;
- }
-
- /*
- * (non-Javadoc)
- *
- * @see org.eclipse.jst.j2ee.internal.internal.internal.ui.wizard.J2EEImportPage#getFilterExpression()
- */
- @Override
- protected String[] getFilterExpression() {
- return new String[]{"*.war"}; //$NON-NLS-1$
- }
-
- /*
- * (non-Javadoc)
- *
- * @see org.eclipse.jst.j2ee.internal.internal.internal.ui.wizard.J2EEExportPage#isMetaTypeSupported(java.lang.Object)
- */
- @Override
- protected boolean isMetaTypeSupported(Object o) {
- return o instanceof org.eclipse.jst.j2ee.webapplication.WebApp;
- }
-
- @Override
- protected String getComponentID() {
- return "JST_WEB"; //$NON-NLS-1$
- }
-
-}
diff --git a/plugins/org.eclipse.jst.servlet.ui/servlet_ui/org/eclipse/jst/servlet/ui/internal/wizard/WebComponentExportWizard.java b/plugins/org.eclipse.jst.servlet.ui/servlet_ui/org/eclipse/jst/servlet/ui/internal/wizard/WebComponentExportWizard.java
deleted file mode 100644
index ccc4021..0000000
--- a/plugins/org.eclipse.jst.servlet.ui/servlet_ui/org/eclipse/jst/servlet/ui/internal/wizard/WebComponentExportWizard.java
+++ /dev/null
@@ -1,80 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2003, 2005 IBM Corporation and others.
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
- *
- * Contributors:
- * IBM Corporation - initial API and implementation
- *******************************************************************************/
-package org.eclipse.jst.servlet.ui.internal.wizard;
-
-import org.eclipse.jst.j2ee.internal.plugin.J2EEUIPlugin;
-import org.eclipse.jst.j2ee.internal.plugin.J2EEUIPluginIcons;
-import org.eclipse.jst.j2ee.internal.web.archive.operations.WebComponentExportDataModelProvider;
-import org.eclipse.jst.j2ee.internal.wizard.J2EEArtifactExportWizard;
-import org.eclipse.ui.IExportWizard;
-import org.eclipse.wst.common.frameworks.datamodel.IDataModel;
-import org.eclipse.wst.common.frameworks.datamodel.IDataModelProvider;
-
-/**
- * <p>
- * Wizard used to export J2EE Web Application module structures
- * from the Eclipse Workbench to a deployable Web Application
- * Archive *.war file.
- * </p>
- */
-public final class WebComponentExportWizard extends J2EEArtifactExportWizard implements IExportWizard {
-
- /**
- * <p>
- * The default constructor. Creates a wizard with no selection,
- * no model instance, and no operation instance. The model and
- * operation will be created as needed.
- * </p>
- */
- public WebComponentExportWizard() {
- super();
- }
-
- /**
- * <p>
- * The model is used to prepopulate the wizard controls
- * and interface with the operation.
- * </p>
- * @param model The model parameter is used to pre-populate wizard controls and interface with the operation
- */
- public WebComponentExportWizard(IDataModel model) {
- super(model);
- }
-
- @Override
- protected IDataModelProvider getDefaultProvider() {
- return new WebComponentExportDataModelProvider();
- }
- /**
- * <p>
- * Adds the following pages:
- * <ul>
- * <li> {@link WebComponentExportPage} as the main wizard page ({@link #MAIN_PG})
- * </ul>
- * </p>
- */
- @Override
- public void doAddPages() {
- addPage(new WebComponentExportPage(getDataModel(), MAIN_PG, getSelection()));
- }
-
- /**
- * {@inheritDoc}
- *
- * <p>
- * Sets up the default wizard page image.
- * </p>
- */
- @Override
- protected void doInit() {
- setDefaultPageImageDescriptor(J2EEUIPlugin.getDefault().getImageDescriptor(J2EEUIPluginIcons.WEB_EXPORT_WIZARD_BANNER));
- }
-}
diff --git a/plugins/org.eclipse.jst.servlet.ui/servlet_ui/org/eclipse/jst/servlet/ui/internal/wizard/WebComponentImportPage.java b/plugins/org.eclipse.jst.servlet.ui/servlet_ui/org/eclipse/jst/servlet/ui/internal/wizard/WebComponentImportPage.java
deleted file mode 100644
index 12ed5a9..0000000
--- a/plugins/org.eclipse.jst.servlet.ui/servlet_ui/org/eclipse/jst/servlet/ui/internal/wizard/WebComponentImportPage.java
+++ /dev/null
@@ -1,73 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2003, 2006 IBM Corporation and others.
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
- *
- * Contributors:
- * IBM Corporation - initial API and implementation
- *******************************************************************************/
-/*
- * Created on Dec 3, 2003
- *
- * To change the template for this generated file go to
- * Window>Preferences>Java>Code Generation>Code and Comments
- */
-package org.eclipse.jst.servlet.ui.internal.wizard;
-
-import org.eclipse.jst.j2ee.internal.plugin.J2EEUIPlugin;
-import org.eclipse.jst.j2ee.internal.plugin.J2EEUIPluginIcons;
-import org.eclipse.jst.j2ee.internal.project.J2EEProjectUtilities;
-import org.eclipse.jst.j2ee.internal.wizard.J2EEModuleImportPage;
-import org.eclipse.jst.servlet.ui.IWebUIContextIds;
-import org.eclipse.jst.servlet.ui.internal.plugin.WEBUIMessages;
-import org.eclipse.swt.widgets.Composite;
-import org.eclipse.wst.common.frameworks.datamodel.IDataModel;
-
-
-/**
- * @author cbridgha
- *
- * To change the template for this generated type comment go to Window>Preferences>Java>Code
- * Generation>Code and Comments
- */
-public class WebComponentImportPage extends J2EEModuleImportPage {
- /**
- * @param model
- * @param pageName
- */
- public WebComponentImportPage(IDataModel model, String pageName) {
- super(model, pageName);
- setTitle(WEBUIMessages.WEB_IMPORT_MAIN_PG_TITLE);
- setDescription(WEBUIMessages.WEB_IMPORT_MAIN_PG_DESC);
- setImageDescriptor(J2EEUIPlugin.getDefault().getImageDescriptor(J2EEUIPluginIcons.WEB_IMPORT_WIZARD_BANNER));
- setInfopopID(IWebUIContextIds.WAR_IMPORT_PAGE1);
- }
-
- @Override
- protected String getFileImportLabel() {
- return WEBUIMessages.WEB_FILE_LBL;
- }
-
- @Override
- protected String[] getFilterExpression() {
- return new String[]{"*.war"}; //$NON-NLS-1$
- }
-
- @Override
- protected String getProjectImportLabel() {
- return WEBUIMessages.WEB_PROJECT_LBL;
- }
-
- @Override
- protected void createAnnotationsStandaloneGroup(Composite composite) {
- // TODO: implement with new import wizards
- // new AnnotationsStandaloneGroup(composite, getWebDataModel(), false);
- }
-
- @Override
- protected String getModuleFacetID(){
- return J2EEProjectUtilities.DYNAMIC_WEB;
- }
-}
diff --git a/plugins/org.eclipse.jst.servlet.ui/servlet_ui/org/eclipse/jst/servlet/ui/internal/wizard/WebComponentImportWebLibsPage.java b/plugins/org.eclipse.jst.servlet.ui/servlet_ui/org/eclipse/jst/servlet/ui/internal/wizard/WebComponentImportWebLibsPage.java
deleted file mode 100644
index 55d8e3e..0000000
--- a/plugins/org.eclipse.jst.servlet.ui/servlet_ui/org/eclipse/jst/servlet/ui/internal/wizard/WebComponentImportWebLibsPage.java
+++ /dev/null
@@ -1,236 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2003, 2007 IBM Corporation and others.
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
- *
- * Contributors:
- * IBM Corporation - initial API and implementation
- *******************************************************************************/
-package org.eclipse.jst.servlet.ui.internal.wizard;
-
-import java.util.ArrayList;
-import java.util.Arrays;
-import java.util.List;
-
-import org.eclipse.jface.viewers.CheckStateChangedEvent;
-import org.eclipse.jface.viewers.CheckboxTableViewer;
-import org.eclipse.jface.viewers.ICheckStateListener;
-import org.eclipse.jface.viewers.ISelectionChangedListener;
-import org.eclipse.jface.viewers.SelectionChangedEvent;
-import org.eclipse.jface.viewers.TableLayout;
-import org.eclipse.jst.j2ee.datamodel.properties.IJ2EEComponentImportDataModelProperties;
-import org.eclipse.jst.j2ee.internal.archive.ArchiveWrapper;
-import org.eclipse.jst.j2ee.internal.plugin.J2EEUIPlugin;
-import org.eclipse.jst.j2ee.internal.plugin.J2EEUIPluginIcons;
-import org.eclipse.jst.j2ee.internal.wizard.J2EEImportPage;
-import org.eclipse.jst.j2ee.web.datamodel.properties.IWebComponentImportDataModelProperties;
-import org.eclipse.jst.servlet.ui.IWebUIContextIds;
-import org.eclipse.jst.servlet.ui.internal.plugin.WEBUIMessages;
-import org.eclipse.swt.SWT;
-import org.eclipse.swt.events.SelectionAdapter;
-import org.eclipse.swt.events.SelectionEvent;
-import org.eclipse.swt.layout.GridData;
-import org.eclipse.swt.layout.GridLayout;
-import org.eclipse.swt.widgets.Button;
-import org.eclipse.swt.widgets.Composite;
-import org.eclipse.wst.common.frameworks.datamodel.DataModelEvent;
-import org.eclipse.wst.common.frameworks.datamodel.IDataModel;
-import org.eclipse.wst.common.frameworks.datamodel.IDataModelListener;
-
-/**
- * @author cbridgha
- *
- * To change the template for this generated type comment go to Window>Preferences>Java>Code
- * Generation>Code and Comments
- */
-public class WebComponentImportWebLibsPage extends J2EEImportPage {
- private Button deselectAllButton;
- private Button selectAllButton;
- protected ArchiveWrapper archiveWrapper;
- public CheckboxTableViewer availableJARsViewer;
- public boolean utilJarSelectionChanged = false;
-
- /**
- * @param model
- * @param pageName
- */
- public WebComponentImportWebLibsPage(IDataModel model, String pageName) {
- super(model, pageName);
- setTitle(WEBUIMessages.WEB_IMPORT_WEB_LIB_PG_TITLE);
- setDescription(WEBUIMessages.WEB_IMPORT_WEB_LIB_PG_DESC);
- setImageDescriptor(J2EEUIPlugin.getDefault().getImageDescriptor(J2EEUIPluginIcons.WEB_IMPORT_WIZARD_BANNER));
- }
-
- /*
- * (non-Javadoc)
- *
- * @see org.eclipse.wst.common.frameworks.internal.ui.wizard.WTPWizardPage#createTopLevelComposite(org.eclipse.swt.widgets.Composite)
- */
- @Override
- protected Composite createTopLevelComposite(Composite parent) {
- setInfopopID(IWebUIContextIds.WAR_IMPORT_PAGE2);
- Composite composite = new Composite(parent, SWT.NONE);
- GridLayout layout = new GridLayout();
- layout.numColumns = 1;
- composite.setLayout(layout);
- composite.setLayoutData(new GridData(GridData.FILL_HORIZONTAL));
- createAvailableJarsList(composite);
- createButtonsGroup(composite);
- return composite;
- }
-
- /*
- * Updates the enable state of the all buttons
- */
- protected void updateButtonEnablements() {
- utilJarSelectionChanged = true;
- }
-
- protected void createAvailableJarsList(Composite listGroup) {
- availableJARsViewer = CheckboxTableViewer.newCheckList(listGroup, SWT.BORDER | SWT.H_SCROLL | SWT.V_SCROLL);
- GridData gData = new GridData(GridData.FILL_BOTH | GridData.GRAB_HORIZONTAL | GridData.GRAB_VERTICAL);
- gData.widthHint = 200;
- gData.heightHint = 80;
- availableJARsViewer.getControl().setLayoutData(gData);
- AvailableWebLibProvider libsProvider = new AvailableWebLibProvider();
- availableJARsViewer.setContentProvider(libsProvider);
- availableJARsViewer.setLabelProvider(libsProvider);
- availableJARsViewer.addCheckStateListener(new ICheckStateListener() {
- public void checkStateChanged(CheckStateChangedEvent event) {
- availableJARCheckStateChanged(event);
- }
- });
- availableJARsViewer.addSelectionChangedListener(new ISelectionChangedListener() {
- public void selectionChanged(SelectionChangedEvent event) {
- updateButtonEnablements();
- }
- });
- TableLayout tableLayout = new TableLayout();
- availableJARsViewer.getTable().setLayout(tableLayout);
- availableJARsViewer.getTable().setHeaderVisible(false);
- availableJARsViewer.getTable().setLinesVisible(false);
-
- model.addListener(new IDataModelListener() {
- public void propertyChanged(DataModelEvent event) {
- if (event.getPropertyName().equals(IWebComponentImportDataModelProperties.WEB_LIB_ARCHIVES_SELECTED)) {
- availableJARsViewer.setCheckedElements(((List) model.getProperty(IWebComponentImportDataModelProperties.WEB_LIB_ARCHIVES_SELECTED)).toArray());
- }
- }
- });
- }
-
- private void handleDeselectAllButtonPressed() {
- ArrayList emptySelection = new ArrayList(2);
- model.setProperty(IWebComponentImportDataModelProperties.WEB_LIB_ARCHIVES_SELECTED, emptySelection);
- }
-
- private void handleSelectAllButtonPressed() {
- ArrayList allSelection = new ArrayList(2);
- Object selection = null;
- for (int i = 0; (null != (selection = availableJARsViewer.getElementAt(i))); i++) {
- allSelection.add(selection);
- }
- model.setProperty(IWebComponentImportDataModelProperties.WEB_LIB_ARCHIVES_SELECTED, allSelection);
- }
-
- protected void createButtonsGroup(org.eclipse.swt.widgets.Composite parent) {
- Composite buttonGroup = new Composite(parent, SWT.NONE);
- GridLayout layout = new GridLayout();
- layout.numColumns = 4;
- buttonGroup.setLayout(layout);
- buttonGroup.setLayoutData(new GridData(GridData.FILL_BOTH));
-
- selectAllButton = new Button(buttonGroup, SWT.PUSH);
- selectAllButton.setText(WEBUIMessages.WAR_IMPORT_SELECT_ALL_LIBS_BUTTON);
- GridData gd = new GridData(GridData.HORIZONTAL_ALIGN_FILL);
- gd.horizontalSpan = 1;
- gd.heightHint = SWT.DEFAULT;
- gd.widthHint = SWT.DEFAULT;
- selectAllButton.setLayoutData(gd);
- selectAllButton.addSelectionListener(new SelectionAdapter() {
- @Override
- public void widgetSelected(SelectionEvent e) {
- handleSelectAllButtonPressed();
- }
- });
-
- deselectAllButton = new Button(buttonGroup, SWT.PUSH);
- deselectAllButton.setText(WEBUIMessages.WAR_IMPORT_DESELECT_ALL_LIBS_BUTTON);
- gd = new GridData(GridData.HORIZONTAL_ALIGN_FILL);
- gd.horizontalSpan = 2;
- gd.heightHint = SWT.DEFAULT;
- gd.widthHint = SWT.DEFAULT;
- deselectAllButton.setLayoutData(gd);
- deselectAllButton.addSelectionListener(new SelectionAdapter() {
- @Override
- public void widgetSelected(SelectionEvent e) {
- handleDeselectAllButtonPressed();
- }
- });
- }
-
- private void refreshEARFileIfNecessary() {
- if (isEARFileChanged()) {
- archiveWrapper = (ArchiveWrapper) model.getProperty(IJ2EEComponentImportDataModelProperties.ARCHIVE_WRAPPER);
- refresh();
- }
- }
-
- protected void setJARsCompositeEnabled(boolean enabled) {
- availableJARsViewer.getTable().setEnabled(enabled);
- availableJARsViewer.setAllChecked(false);
- availableJARsViewer.setAllGrayed(!enabled);
- selectAllButton.setEnabled(enabled);
- deselectAllButton.setEnabled(enabled);
- }
-
- private void refresh() {
- availableJARsViewer.setInput(archiveWrapper);
- }
-
- public boolean isEARFileChanged() {
- return archiveWrapper != model.getProperty(IJ2EEComponentImportDataModelProperties.ARCHIVE_WRAPPER);
- }
-
- @Override
- protected void enter() {
- super.enter();
- refreshEARFileIfNecessary();
- }
-
- public void availableJARCheckStateChanged(CheckStateChangedEvent event) {
- model.setProperty(IWebComponentImportDataModelProperties.WEB_LIB_ARCHIVES_SELECTED, getJARsForProjects());
- validatePage();
- }
-
- public List getJARsForProjects() {
- refreshEARFileIfNecessary();
- List result = new ArrayList();
- result.addAll(Arrays.asList(availableJARsViewer.getCheckedElements()));
- return result;
- }
-
- protected boolean isNullOrEmpty(String aString) {
- return aString == null || aString.length() == 0;
- }
-
- @Override
- protected String[] getValidationPropertyNames() {
- return new String[]{};
- }
-
- @Override
- protected void restoreWidgetValues() {
- // This page doesn't implement...
- }
-
- @Override
- public void storeDefaultSettings() {
- // This page doesn't implement...
- }
-
-
-
-}
diff --git a/plugins/org.eclipse.jst.servlet.ui/servlet_ui/org/eclipse/jst/servlet/ui/internal/wizard/WebComponentImportWizard.java b/plugins/org.eclipse.jst.servlet.ui/servlet_ui/org/eclipse/jst/servlet/ui/internal/wizard/WebComponentImportWizard.java
deleted file mode 100644
index c840ec2..0000000
--- a/plugins/org.eclipse.jst.servlet.ui/servlet_ui/org/eclipse/jst/servlet/ui/internal/wizard/WebComponentImportWizard.java
+++ /dev/null
@@ -1,103 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2003, 2006 IBM Corporation and others.
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
- *
- * Contributors:
- * IBM Corporation - initial API and implementation
- *******************************************************************************/
-package org.eclipse.jst.servlet.ui.internal.wizard;
-
-import org.eclipse.jst.j2ee.internal.plugin.J2EEUIMessages;
-import org.eclipse.jst.j2ee.internal.plugin.J2EEUIPlugin;
-import org.eclipse.jst.j2ee.internal.plugin.J2EEUIPluginIcons;
-import org.eclipse.jst.j2ee.internal.web.archive.operations.WebComponentImportDataModelProvider;
-import org.eclipse.jst.j2ee.internal.wizard.J2EEComponentImportWizard;
-import org.eclipse.wst.common.frameworks.datamodel.IDataModel;
-import org.eclipse.wst.common.frameworks.datamodel.IDataModelProvider;
-import org.eclipse.wst.project.facet.IProductConstants;
-import org.eclipse.wst.project.facet.ProductManager;
-
-/**
- * <p>
- * Wizard used to import J2EE Web Application module structures into the Eclipse Workbench from an
- * existing Web Application *.war file.
- * </p>
- */
-public final class WebComponentImportWizard extends J2EEComponentImportWizard {
-
- protected static final String WEB_LIBS_PG = "WEB_LIBS_PG"; //$NON-NLS-1$
-
- /**
- * <p>
- * The default constructor. Creates a wizard with no selection, no model instance, and no
- * operation instance. The model and operation will be created as needed.
- * </p>
- */
- public WebComponentImportWizard() {
- super();
- }
-
- /**
- * <p>
- * The model is used to prepopulate the wizard controls and interface with the operation.
- * </p>
- *
- * @param model
- * The model parameter is used to pre-populate wizard controls and interface with the
- * operation
- */
- public WebComponentImportWizard(IDataModel model) {
- super(model);
- }
-
- /**
- * <p>
- * Adds an {@link WARImportPage} as the main wizard page ({@link #MAIN_PG}).
- * </p>
- */
- @Override
- public void doAddPages() {
- addPage(new WebComponentImportPage(getDataModel(), MAIN_PG));
- addPage(new WebComponentImportWebLibsPage(getDataModel(), WEB_LIBS_PG));
- }
-
- /**
- * {@inheritDoc}
- *
- * <p>
- * Sets up the dialog window title and default wizard page image.
- * </p>
- */
- @Override
- public final void doInit() {
- setWindowTitle(J2EEUIMessages.getResourceString(J2EEUIMessages.IMPORT_WIZ_TITLE));
- setDefaultPageImageDescriptor(J2EEUIPlugin.getDefault().getImageDescriptor(J2EEUIPluginIcons.WEB_IMPORT_WIZARD_BANNER));
- // updateEARToModelFromSelection(getSpecificDataModel());
- }
-
- @Override
- protected String[] getModuleValidatorStrings() {
- return new String[]{"org.eclipse.jst.j2ee.internal.web.validation.UIWarValidator"}; //$NON-NLS-1$
- }
-
-
- // protected String getFinalPerspectiveID() {
- // // J2EEComponentCreationDataModel projCreationModel =
- // // getSpecificDataModel().getJ2EEModuleCreationDataModel();
- // // return projCreationModel.getStringProperty(ComponentCreationDataModel.FINAL_PERSPECTIVE);
- // return getDataModel().getStringProperty(ComponentCreationDataModel.FINAL_PERSPECTIVE);
- // }
-
- @Override
- protected IDataModelProvider getDefaultProvider() {
- return new WebComponentImportDataModelProvider();
- }
-
- @Override
- protected String getFinalPerspectiveID() {
- return ProductManager.getProperty(IProductConstants.FINAL_PERSPECTIVE_WEB);
- }
-}
diff --git a/plugins/org.eclipse.jst.servlet.ui/servlet_ui/org/eclipse/jst/servlet/ui/project/facet/WebAppSelectionPanel.java b/plugins/org.eclipse.jst.servlet.ui/servlet_ui/org/eclipse/jst/servlet/ui/project/facet/WebAppSelectionPanel.java
deleted file mode 100644
index 0e8e405..0000000
--- a/plugins/org.eclipse.jst.servlet.ui/servlet_ui/org/eclipse/jst/servlet/ui/project/facet/WebAppSelectionPanel.java
+++ /dev/null
@@ -1,141 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2010 IBM Corporation and others.
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
- *
- * Contributors:
- * IBM Corporation - initial API and implementation
- *******************************************************************************/
-
-
-package org.eclipse.jst.servlet.ui.project.facet;
-
-import org.eclipse.jface.dialogs.Dialog;
-import org.eclipse.jface.layout.GridDataFactory;
-import org.eclipse.jface.window.Window;
-import org.eclipse.jface.wizard.WizardDialog;
-import org.eclipse.jst.j2ee.web.project.facet.IWebFragmentFacetInstallDataModelProperties;
-import org.eclipse.osgi.util.NLS;
-import org.eclipse.swt.SWT;
-import org.eclipse.swt.events.SelectionAdapter;
-import org.eclipse.swt.events.SelectionEvent;
-import org.eclipse.swt.layout.GridData;
-import org.eclipse.swt.layout.GridLayout;
-import org.eclipse.swt.widgets.Button;
-import org.eclipse.swt.widgets.Combo;
-import org.eclipse.swt.widgets.Composite;
-import org.eclipse.swt.widgets.Control;
-import org.eclipse.swt.widgets.Group;
-import org.eclipse.swt.widgets.Label;
-import org.eclipse.wst.common.frameworks.datamodel.IDataModel;
-import org.eclipse.wst.common.frameworks.internal.datamodel.ui.DataModelSynchHelper;
-
-
-public final class WebAppSelectionPanel implements IWebFragmentFacetInstallDataModelProperties
-
-{
- private final Button addToWar;
- private final Combo combo;
- private final Button newButton;
- private final Label label;
-
- private final IDataModel model;
- private DataModelSynchHelper synchhelper;
-
- public WebAppSelectionPanel( final IDataModel model, final Composite parent)
- {
- this.model = model;
- this.synchhelper = new DataModelSynchHelper(model);
-
- final Group group = new Group( parent, SWT.NONE );
- group.setLayoutData( gdhfill() );
- group.setLayout( new GridLayout( 3, false ) );
- group.setText( Resources.warMemberShip );
-
- this.addToWar = new Button( group, SWT.CHECK );
- this.addToWar.setText( Resources.addToWarLabel );
- GridDataFactory.defaultsFor(this.addToWar).span(3, 1).applyTo(this.addToWar);
- synchhelper.synchCheckbox(addToWar, ADD_TO_WAR, null);
-
- label = new Label(group, SWT.NULL);
- label.setText(Resources.warProjectLabel);
- this.combo = new Combo(group, SWT.NONE);
- this.combo.setLayoutData( gdhfill() );
-
- this.newButton = new Button( group, SWT.PUSH );
- this.newButton.setText( Resources.newButtonLabel );
- GridDataFactory.defaultsFor(this.newButton).applyTo(this.newButton);
-
- this.newButton.addSelectionListener( new SelectionAdapter()
- {
- @Override
- public void widgetSelected( final SelectionEvent event )
- {
- handleAddButton();
- }
- } );
-
- synchhelper.synchCombo(combo, WAR_PROJECT_NAME, new Control[]{label, newButton});
- Dialog.applyDialogFont(parent);
- }
-
- private void handleAddButton()
- {
- final WebProjectWizard wizard = new WebProjectWizard();
-
- final WizardDialog dialog
- = new WizardDialog( newButton.getShell(), wizard );
-
-/* IRuntime runtime = (IRuntime)model.getProperty(FACET_RUNTIME);
- wizard.ssetRuntimeInDataModel(runtime);
-*/
- if( dialog.open() != Window.CANCEL )
- {
- model.notifyPropertyChange(WAR_PROJECT_NAME, IDataModel.VALID_VALUES_CHG);
- final String warproj = wizard.getProjectName();
- model.setProperty(WAR_PROJECT_NAME, warproj);
- }
- }
-
- private static GridData gdhfill()
- {
- return new GridData( GridData.FILL_HORIZONTAL );
- }
-
- public static final GridData gdhspan( final GridData gd,
- final int span )
- {
- gd.horizontalSpan = span;
- return gd;
- }
-
- private static final class Resources
-
- extends NLS
-
- {
- public static String addToWarLabel;
- public static String newButtonLabel;
- public static String warProjectLabel;
- public static String warMemberShip;
-
- static
- {
- initializeMessages( WebAppSelectionPanel.class.getName(),
- Resources.class );
- }
- }
-
- public void dispose() {
- if(synchhelper != null){
- synchhelper.dispose();
- synchhelper = null;
- }
- }
-
- public String getComboText(){
- return combo.getText();
- }
-}
diff --git a/plugins/org.eclipse.jst.servlet.ui/servlet_ui/org/eclipse/jst/servlet/ui/project/facet/WebAppSelectionPanel.properties b/plugins/org.eclipse.jst.servlet.ui/servlet_ui/org/eclipse/jst/servlet/ui/project/facet/WebAppSelectionPanel.properties
deleted file mode 100644
index bbf6b0b..0000000
--- a/plugins/org.eclipse.jst.servlet.ui/servlet_ui/org/eclipse/jst/servlet/ui/project/facet/WebAppSelectionPanel.properties
+++ /dev/null
@@ -1,14 +0,0 @@
-###############################################################################
-# Copyright (c) 2010 IBM Corporation and others.
-# All rights reserved. This program and the accompanying materials
-# are made available under the terms of the Eclipse Public License v1.0
-# which accompanies this distribution, and is available at
-# http://www.eclipse.org/legal/epl-v10.html
-#
-# Contributors:
-# IBM Corporation - initial API and implementation
-###############################################################################
-addToWarLabel = Add &project to a Dynamic Web project
-newButtonLabel = Ne&w...
-warProjectLabel=Dynamic Web pro&ject name:
-warMemberShip=Dynamic Web project membership
diff --git a/plugins/org.eclipse.jst.servlet.ui/servlet_ui/org/eclipse/jst/servlet/ui/project/facet/WebFacetInstallPage.java b/plugins/org.eclipse.jst.servlet.ui/servlet_ui/org/eclipse/jst/servlet/ui/project/facet/WebFacetInstallPage.java
deleted file mode 100644
index e9b6aa0..0000000
--- a/plugins/org.eclipse.jst.servlet.ui/servlet_ui/org/eclipse/jst/servlet/ui/project/facet/WebFacetInstallPage.java
+++ /dev/null
@@ -1,105 +0,0 @@
-/******************************************************************************
- * Copyright (c) 2005, 2006 BEA Systems, Inc. and others.
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
- *
- * Contributors:
- * Konstantin Komissarchik - initial API and implementation
- * David Schneider, david.schneider@unisys.com - [142500] WTP properties pages fonts don't follow Eclipse preferences
- ******************************************************************************/
-
-package org.eclipse.jst.servlet.ui.project.facet;
-
-import org.eclipse.jface.dialogs.Dialog;
-import org.eclipse.jst.j2ee.internal.J2EEConstants;
-import org.eclipse.jst.j2ee.internal.J2EEVersionConstants;
-import org.eclipse.jst.j2ee.internal.common.J2EEVersionUtil;
-import org.eclipse.jst.j2ee.internal.wizard.J2EEModuleFacetInstallPage;
-import org.eclipse.jst.j2ee.web.project.facet.IWebFacetInstallDataModelProperties;
-import org.eclipse.jst.servlet.ui.IWebUIContextIds;
-import org.eclipse.osgi.util.NLS;
-import org.eclipse.swt.SWT;
-import org.eclipse.swt.layout.GridData;
-import org.eclipse.swt.layout.GridLayout;
-import org.eclipse.swt.widgets.Composite;
-import org.eclipse.swt.widgets.Control;
-import org.eclipse.swt.widgets.Label;
-import org.eclipse.swt.widgets.Text;
-
-/**
- * @author <a href="mailto:kosta@bea.com">Konstantin Komissarchik</a>
- */
-public class WebFacetInstallPage extends J2EEModuleFacetInstallPage implements IWebFacetInstallDataModelProperties {
- private Label contextRootLabel;
- private Text contextRoot;
- private Label contentDirLabel;
- private Text contentDir;
-
- public WebFacetInstallPage() {
- super("web.facet.install.page"); //$NON-NLS-1$
- setTitle(Resources.pageTitle);
- setDescription(Resources.pageDescription);
- }
-
- @Override
- protected Composite createTopLevelComposite(final Composite parent) {
- setInfopopID(IWebUIContextIds.NEW_DYNAMIC_WEB_PROJECT_PAGE3);
- final Composite composite = new Composite(parent, SWT.NONE);
- composite.setLayout(new GridLayout(2, false));
-
- this.contextRootLabel = new Label(composite, SWT.NONE);
- this.contextRootLabel.setText(Resources.contextRootLabel);
- this.contextRootLabel.setLayoutData(new GridData());
-
- this.contextRoot = new Text(composite, SWT.BORDER);
- this.contextRoot.setLayoutData(gdhfill());
- this.contextRoot.setData("label", this.contextRootLabel); //$NON-NLS-1$
- synchHelper.synchText(contextRoot, CONTEXT_ROOT, new Control[]{contextRootLabel});
-
- this.contentDirLabel = new Label(composite, SWT.NONE);
- this.contentDirLabel.setText(Resources.contentDirLabel);
- this.contentDirLabel.setLayoutData(new GridData());
-
- this.contentDir = new Text(composite, SWT.BORDER);
- this.contentDir.setLayoutData(gdhfill());
- this.contentDir.setData("label", this.contentDirLabel); //$NON-NLS-1$
- synchHelper.synchText(contentDir, CONFIG_FOLDER, null);
-
- new Label(composite, SWT.NONE); // pad
-
- createGenerateDescriptorControl(composite, J2EEConstants.WEBAPP_DD_SHORT_NAME);
- registerFacetVersionChangeListener();
-
- Dialog.applyDialogFont(parent);
-
- return composite;
- }
-
- @Override
- protected void handleFacetVersionChangedEvent()
- {
- String fv = model.getStringProperty(FACET_VERSION_STR);
- boolean isWeb25OrGreater = J2EEVersionUtil.convertVersionStringToInt(fv) >= J2EEVersionConstants.WEB_2_5_ID;
- this.addDD.setVisible(isWeb25OrGreater);
- }
-
- @Override
- protected String[] getValidationPropertyNames() {
- return new String[]{EAR_PROJECT_NAME, CONTEXT_ROOT, CONFIG_FOLDER, SOURCE_FOLDER};
- }
-
- private static final class Resources extends NLS {
- public static String pageTitle;
- public static String pageDescription;
- public static String contextRootLabel;
- public static String contentDirLabel;
-
- static {
- initializeMessages(WebFacetInstallPage.class.getName(), Resources.class);
- }
- }
-
-
-}
\ No newline at end of file
diff --git a/plugins/org.eclipse.jst.servlet.ui/servlet_ui/org/eclipse/jst/servlet/ui/project/facet/WebFacetInstallPage.properties b/plugins/org.eclipse.jst.servlet.ui/servlet_ui/org/eclipse/jst/servlet/ui/project/facet/WebFacetInstallPage.properties
deleted file mode 100644
index c408577..0000000
--- a/plugins/org.eclipse.jst.servlet.ui/servlet_ui/org/eclipse/jst/servlet/ui/project/facet/WebFacetInstallPage.properties
+++ /dev/null
@@ -1,4 +0,0 @@
-pageTitle = Web Module
-pageDescription = Configure web module settings.
-contextRootLabel = Context &root:
-contentDirLabel = Content &directory:
diff --git a/plugins/org.eclipse.jst.servlet.ui/servlet_ui/org/eclipse/jst/servlet/ui/project/facet/WebFragmentProjectContentProvider.java b/plugins/org.eclipse.jst.servlet.ui/servlet_ui/org/eclipse/jst/servlet/ui/project/facet/WebFragmentProjectContentProvider.java
deleted file mode 100644
index 0b0748b..0000000
--- a/plugins/org.eclipse.jst.servlet.ui/servlet_ui/org/eclipse/jst/servlet/ui/project/facet/WebFragmentProjectContentProvider.java
+++ /dev/null
@@ -1,57 +0,0 @@
-/*******************************************************************************
-
- * Copyright (c) 2010 IBM Corporation and others.
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
- *
- * Contributors:
- * IBM Corporation - initial API and implementation
- *******************************************************************************/
-
-package org.eclipse.jst.servlet.ui.project.facet;
-
-import java.util.ArrayList;
-import java.util.List;
-
-import org.eclipse.core.resources.IProject;
-import org.eclipse.core.resources.IWorkspaceRoot;
-import org.eclipse.core.runtime.CoreException;
-import org.eclipse.jface.viewers.IStructuredContentProvider;
-import org.eclipse.jface.viewers.Viewer;
-import org.eclipse.jst.servlet.ui.internal.plugin.ServletUIPlugin;
-import org.eclipse.wst.common.componentcore.internal.util.IModuleConstants;
-import org.eclipse.wst.common.project.facet.core.FacetedProjectFramework;
-
-public class WebFragmentProjectContentProvider implements IStructuredContentProvider {
-
- public void dispose() {
- // Do nothing
- }
-
- public void inputChanged(Viewer arg0, Object arg1, Object arg2) {
- // Do nothing
- }
-
- public Object[] getElements(Object arg0) {
- if (arg0 instanceof IWorkspaceRoot) {
- IProject[] projects = ((IWorkspaceRoot) arg0).getProjects();
- if (projects != null && projects.length != 0) {
- List<IProject> theProjects = new ArrayList<IProject>(0);
- for (int i = 0; i < projects.length; i++) {
- IProject project = projects[i];
- try {
- if (FacetedProjectFramework.hasProjectFacet(project, IModuleConstants.JST_WEBFRAGMENT_MODULE)) {
- theProjects.add(project);
- }
- } catch (CoreException e) {
- ServletUIPlugin.log(e);
- }
- }
- return theProjects.toArray();
- }
- }
- return new Object[0];
- }
-}
\ No newline at end of file
diff --git a/plugins/org.eclipse.jst.servlet.ui/servlet_ui/org/eclipse/jst/servlet/ui/project/facet/WebFragmentProjectFirstPage.java b/plugins/org.eclipse.jst.servlet.ui/servlet_ui/org/eclipse/jst/servlet/ui/project/facet/WebFragmentProjectFirstPage.java
deleted file mode 100644
index 1b86aa5..0000000
--- a/plugins/org.eclipse.jst.servlet.ui/servlet_ui/org/eclipse/jst/servlet/ui/project/facet/WebFragmentProjectFirstPage.java
+++ /dev/null
@@ -1,111 +0,0 @@
-/*******************************************************************************
-
- * Copyright (c) 2010 IBM Corporation and others.
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
- *
- * Contributors:
- * IBM Corporation - initial API and implementation
- *******************************************************************************/
-package org.eclipse.jst.servlet.ui.project.facet;
-
-import java.util.ArrayList;
-import java.util.Arrays;
-import java.util.Collections;
-import java.util.HashSet;
-import java.util.List;
-import java.util.Set;
-
-import org.eclipse.jst.common.project.facet.JavaFacetUtils;
-import org.eclipse.jst.j2ee.internal.wizard.J2EEComponentFacetCreationWizardPage;
-import org.eclipse.jst.j2ee.web.project.facet.IWebFragmentProjectCreationDataModelProperties;
-import org.eclipse.jst.j2ee.web.project.facet.WebFacetUtils;
-import org.eclipse.osgi.util.NLS;
-import org.eclipse.swt.widgets.Composite;
-import org.eclipse.wst.common.componentcore.datamodel.properties.IFacetProjectCreationDataModelProperties;
-import org.eclipse.wst.common.componentcore.internal.util.IModuleConstants;
-import org.eclipse.wst.common.frameworks.datamodel.IDataModel;
-import org.eclipse.wst.common.project.facet.core.IFacetedProject;
-import org.eclipse.wst.common.project.facet.core.IFacetedProjectWorkingCopy;
-import org.eclipse.wst.common.project.facet.core.IProjectFacet;
-import org.eclipse.wst.common.project.facet.core.IProjectFacetVersion;
-import org.eclipse.wst.common.project.facet.core.ProjectFacetsManager;
-import org.eclipse.wst.common.project.facet.core.runtime.IRuntime;
-
-public class WebFragmentProjectFirstPage extends J2EEComponentFacetCreationWizardPage {
-
- protected WebAppSelectionPanel warPanel;
- public WebFragmentProjectFirstPage(IDataModel dataModel, String pageName) {
- super(dataModel, pageName);
- setTitle(Resources.pageTitle);
- setDescription(Resources.pageDescription);
- }
-
- private static final class Resources extends NLS {
- public static String pageTitle;
- public static String pageDescription;
- static {
- initializeMessages(WebFragmentProjectFirstPage.class.getName(), Resources.class);
- }
- }
-
- @Override
- protected Composite createTopLevelComposite(Composite parent) {
- setShouldAddEARComposite(false);
- final Composite top = super.createTopLevelComposite(parent);
- createWarComposite(top);
- createWorkingSetGroupPanel(top, new String[] { RESOURCE_WORKING_SET, JAVA_WORKING_SET });
- return top;
- }
-
- private void createWarComposite(Composite top)
- {
- final IFacetedProjectWorkingCopy fpjwc
- = (IFacetedProjectWorkingCopy) this.model.getProperty( FACETED_PROJECT_WORKING_COPY );
-
- final String moduleFacetId = getModuleTypeID();
- final IProjectFacet moduleFacet = ProjectFacetsManager.getProjectFacet( moduleFacetId );
- final IFacetedProject.Action action = fpjwc.getProjectFacetAction( moduleFacet );
-
- warPanel = new WebAppSelectionPanel( (IDataModel) action.getConfig(), top );
- }
-
- @Override
- protected String[] getValidationPropertyNames()
- {
- String[] superProperties = super.getValidationPropertyNames();
- List list = Arrays.asList(superProperties);
- ArrayList arrayList = new ArrayList();
- arrayList.addAll( list );
- arrayList.add( IWebFragmentProjectCreationDataModelProperties.WAR_PROJECT_NAME );
- arrayList.add( IWebFragmentProjectCreationDataModelProperties.ADD_TO_WAR );
- return (String[])arrayList.toArray( new String[0] );
- }
-
- @Override
- protected String getModuleFacetID() {
- return IModuleConstants.JST_WEBFRAGMENT_MODULE;
- }
-
- @Override
- protected Set<IProjectFacetVersion> getFacetConfiguration( final IProjectFacetVersion primaryFacetVersion )
- {
- IRuntime runtime = (IRuntime)model.getProperty(IFacetProjectCreationDataModelProperties.FACET_RUNTIME);
- final Set<IProjectFacetVersion> facets = new HashSet<IProjectFacetVersion>( 2 );
-
- if(runtime != null) {
- facets.addAll(super.getFacetConfiguration(primaryFacetVersion));
- }
- else {
- facets.add(primaryFacetVersion);
-
- if(primaryFacetVersion == WebFacetUtils.WEBFRAGMENT_30)
- {
- facets.add(JavaFacetUtils.JAVA_60);
- }
- }
- return Collections.unmodifiableSet( facets );
- }
-}
diff --git a/plugins/org.eclipse.jst.servlet.ui/servlet_ui/org/eclipse/jst/servlet/ui/project/facet/WebFragmentProjectFirstPage.properties b/plugins/org.eclipse.jst.servlet.ui/servlet_ui/org/eclipse/jst/servlet/ui/project/facet/WebFragmentProjectFirstPage.properties
deleted file mode 100644
index 5233684..0000000
--- a/plugins/org.eclipse.jst.servlet.ui/servlet_ui/org/eclipse/jst/servlet/ui/project/facet/WebFragmentProjectFirstPage.properties
+++ /dev/null
@@ -1,12 +0,0 @@
-###############################################################################
-# Copyright (c) 2010 IBM Corporation and others.
-# All rights reserved. This program and the accompanying materials
-# are made available under the terms of the Eclipse Public License v1.0
-# which accompanies this distribution, and is available at
-# http://www.eclipse.org/legal/epl-v10.html
-#
-# Contributors:
-# IBM Corporation - initial API and implementation
-###############################################################################
-pageTitle = Web Fragment
-pageDescription = Configure web fragment module settings.
\ No newline at end of file
diff --git a/plugins/org.eclipse.jst.servlet.ui/servlet_ui/org/eclipse/jst/servlet/ui/project/facet/WebFragmentProjectLabelProvider.java b/plugins/org.eclipse.jst.servlet.ui/servlet_ui/org/eclipse/jst/servlet/ui/project/facet/WebFragmentProjectLabelProvider.java
deleted file mode 100644
index 0b4c74f..0000000
--- a/plugins/org.eclipse.jst.servlet.ui/servlet_ui/org/eclipse/jst/servlet/ui/project/facet/WebFragmentProjectLabelProvider.java
+++ /dev/null
@@ -1,47 +0,0 @@
-/*******************************************************************************
-
- * Copyright (c) 2010 IBM Corporation and others.
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
- *
- * Contributors:
- * IBM Corporation - initial API and implementation
- *******************************************************************************/
-
-package org.eclipse.jst.servlet.ui.project.facet;
-
-import org.eclipse.core.resources.IProject;
-import org.eclipse.jface.viewers.ILabelDecorator;
-import org.eclipse.jface.viewers.ILabelProvider;
-import org.eclipse.jface.viewers.LabelProvider;
-import org.eclipse.swt.graphics.Image;
-import org.eclipse.ui.PlatformUI;
-import org.eclipse.ui.model.WorkbenchLabelProvider;
-
-public class WebFragmentProjectLabelProvider extends LabelProvider {
- private ILabelProvider workbenchLabelProvider = new WorkbenchLabelProvider();
- private ILabelDecorator decorator = PlatformUI.getWorkbench().getDecoratorManager().getLabelDecorator();
-
- @Override
- public Image getImage(Object o) {
- Image image = workbenchLabelProvider.getImage(o);
-
- if (o instanceof IProject) {
- Image decorated = decorator.decorateImage(image, o);
-
- if (decorated != null) {
- return decorated;
- }}
- return image;
- }
-
- @Override
- public String getText(Object o) {
- if (o instanceof IProject) {
- return ((IProject) o).getName();
- }
- return ""; //$NON-NLS-1$
- }
-}
\ No newline at end of file
diff --git a/plugins/org.eclipse.jst.servlet.ui/servlet_ui/org/eclipse/jst/servlet/ui/project/facet/WebFragmentProjectWizard.java b/plugins/org.eclipse.jst.servlet.ui/servlet_ui/org/eclipse/jst/servlet/ui/project/facet/WebFragmentProjectWizard.java
deleted file mode 100644
index 5f6843f..0000000
--- a/plugins/org.eclipse.jst.servlet.ui/servlet_ui/org/eclipse/jst/servlet/ui/project/facet/WebFragmentProjectWizard.java
+++ /dev/null
@@ -1,64 +0,0 @@
-/*******************************************************************************
-
- * Copyright (c) 2010 IBM Corporation and others.
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
- *
- * Contributors:
- * IBM Corporation - initial API and implementation
- *******************************************************************************/
-
-package org.eclipse.jst.servlet.ui.project.facet;
-
-import java.net.URL;
-
-import org.eclipse.core.runtime.Platform;
-import org.eclipse.jface.resource.ImageDescriptor;
-import org.eclipse.jface.wizard.IWizardPage;
-import org.eclipse.jst.j2ee.web.project.facet.WebFragmentFacetProjectCreationDataModelProvider;
-import org.eclipse.jst.servlet.ui.internal.plugin.WEBUIMessages;
-import org.eclipse.wst.common.frameworks.datamodel.DataModelFactory;
-import org.eclipse.wst.common.frameworks.datamodel.IDataModel;
-import org.eclipse.wst.common.project.facet.core.IFacetedProjectTemplate;
-import org.eclipse.wst.common.project.facet.core.ProjectFacetsManager;
-import org.eclipse.wst.web.ui.internal.wizards.NewProjectDataModelFacetWizard;
-import org.osgi.framework.Bundle;
-
-
-public class WebFragmentProjectWizard extends NewProjectDataModelFacetWizard {
-
- public WebFragmentProjectWizard(IDataModel modelid) {
- super(modelid);
- setWindowTitle(WEBUIMessages.WEBFRAGMENT_MODULE_WIZ_TITLE);
- }
-
- public WebFragmentProjectWizard(){
- super();
- setWindowTitle(WEBUIMessages.WEBFRAGMENT_MODULE_WIZ_TITLE);
- }
-
- @Override
- protected IDataModel createDataModel() {
- return DataModelFactory.createDataModel(new WebFragmentFacetProjectCreationDataModelProvider());
- }
-
- @Override
- protected ImageDescriptor getDefaultPageImageDescriptor() {
- final Bundle bundle = Platform.getBundle("org.eclipse.jst.servlet.ui"); //$NON-NLS-1$
- final URL url = bundle.getEntry("icons/full/ctool16/webfragment_wizban.gif"); //$NON-NLS-1$
- return ImageDescriptor.createFromURL(url);
- }
-
- @Override
- protected IFacetedProjectTemplate getTemplate() {
- return ProjectFacetsManager.getTemplate("template.jst.webfragment"); //$NON-NLS-1$
- }
-
- @Override
- protected IWizardPage createFirstPage() {
- return new WebFragmentProjectFirstPage(model, "first.page"); //$NON-NLS-1$
- }
-
-}
diff --git a/plugins/org.eclipse.jst.servlet.ui/servlet_ui/org/eclipse/jst/servlet/ui/project/facet/WebProjectFirstPage.java b/plugins/org.eclipse.jst.servlet.ui/servlet_ui/org/eclipse/jst/servlet/ui/project/facet/WebProjectFirstPage.java
deleted file mode 100644
index fe4506f..0000000
--- a/plugins/org.eclipse.jst.servlet.ui/servlet_ui/org/eclipse/jst/servlet/ui/project/facet/WebProjectFirstPage.java
+++ /dev/null
@@ -1,79 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2003, 2006 IBM Corporation and others.
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
- *
- * Contributors:
- * IBM Corporation - initial API and implementation
- *******************************************************************************/
-
-package org.eclipse.jst.servlet.ui.project.facet;
-
-import java.util.Collections;
-import java.util.HashSet;
-import java.util.Set;
-
-import org.eclipse.jst.common.project.facet.JavaFacetUtils;
-import org.eclipse.jst.j2ee.internal.plugin.J2EEUIPlugin;
-import org.eclipse.jst.j2ee.internal.plugin.J2EEUIPluginIcons;
-import org.eclipse.jst.j2ee.internal.project.J2EEProjectUtilities;
-import org.eclipse.jst.j2ee.internal.wizard.J2EEComponentFacetCreationWizardPage;
-import org.eclipse.jst.j2ee.web.project.facet.WebFacetUtils;
-import org.eclipse.jst.servlet.ui.IWebUIContextIds;
-import org.eclipse.jst.servlet.ui.internal.plugin.WEBUIMessages;
-import org.eclipse.wst.common.componentcore.datamodel.properties.IFacetProjectCreationDataModelProperties;
-import org.eclipse.wst.common.frameworks.datamodel.IDataModel;
-import org.eclipse.wst.common.project.facet.core.IProjectFacetVersion;
-import org.eclipse.wst.common.project.facet.core.runtime.IRuntime;
-
-public class WebProjectFirstPage extends J2EEComponentFacetCreationWizardPage {
-
- public WebProjectFirstPage(IDataModel model, String pageName) {
- super(model, pageName);
- setTitle(WEBUIMessages.WEB_PROJECT_MAIN_PG_TITLE);
- setDescription(WEBUIMessages.WEB_PROJECT_MAIN_PG_DESC);
- setImageDescriptor(J2EEUIPlugin.getDefault().getImageDescriptor(J2EEUIPluginIcons.WEB_PROJECT_WIZARD_BANNER));
- setInfopopID(IWebUIContextIds.NEW_DYNAMIC_WEB_PROJECT_PAGE1);
- }
-
- @Override
- protected String getModuleFacetID() {
- return J2EEProjectUtilities.DYNAMIC_WEB;
- }
-
- @Override
- protected Set<IProjectFacetVersion> getFacetConfiguration( final IProjectFacetVersion primaryFacetVersion )
- {
- IRuntime runtime = (IRuntime)model.getProperty(IFacetProjectCreationDataModelProperties.FACET_RUNTIME);
- final Set<IProjectFacetVersion> facets = new HashSet<IProjectFacetVersion>( 2 );
-
- if(runtime != null) {
- facets.addAll(super.getFacetConfiguration(primaryFacetVersion));
- }
- else {
- facets.add( primaryFacetVersion );
-
- if( primaryFacetVersion == WebFacetUtils.WEB_30)
- {
- facets.add( JavaFacetUtils.JAVA_60 );
- }
- else if(primaryFacetVersion == WebFacetUtils.WEB_25 )
- {
- facets.add( JavaFacetUtils.JAVA_50 );
- }
- else if( primaryFacetVersion == WebFacetUtils.WEB_24 )
- {
- facets.add( JavaFacetUtils.JAVA_14 );
- }
- else if( primaryFacetVersion == WebFacetUtils.WEB_23 ||
- primaryFacetVersion == WebFacetUtils.WEB_22 )
- {
- facets.add( JavaFacetUtils.JAVA_13 );
- }
- }
- return Collections.unmodifiableSet( facets );
- }
-
-}
diff --git a/plugins/org.eclipse.jst.servlet.ui/servlet_ui/org/eclipse/jst/servlet/ui/project/facet/WebProjectWizard.java b/plugins/org.eclipse.jst.servlet.ui/servlet_ui/org/eclipse/jst/servlet/ui/project/facet/WebProjectWizard.java
deleted file mode 100644
index 86ce7f8..0000000
--- a/plugins/org.eclipse.jst.servlet.ui/servlet_ui/org/eclipse/jst/servlet/ui/project/facet/WebProjectWizard.java
+++ /dev/null
@@ -1,76 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2003, 2006 IBM Corporation and others.
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
- *
- * Contributors:
- * IBM Corporation - initial API and implementation
- *******************************************************************************/
-package org.eclipse.jst.servlet.ui.project.facet;
-
-import java.net.URL;
-
-import org.eclipse.core.runtime.Platform;
-import org.eclipse.jface.resource.ImageDescriptor;
-import org.eclipse.jface.wizard.IWizardPage;
-import org.eclipse.jst.j2ee.internal.web.archive.operations.WebFacetProjectCreationDataModelProvider;
-import org.eclipse.jst.servlet.ui.internal.plugin.WEBUIMessages;
-import org.eclipse.wst.common.frameworks.datamodel.DataModelFactory;
-import org.eclipse.wst.common.frameworks.datamodel.IDataModel;
-import org.eclipse.wst.common.project.facet.core.IFacetedProjectTemplate;
-import org.eclipse.wst.common.project.facet.core.ProjectFacetsManager;
-import org.eclipse.wst.project.facet.IProductConstants;
-import org.eclipse.wst.project.facet.ProductManager;
-import org.eclipse.wst.web.ui.internal.wizards.NewProjectDataModelFacetWizard;
-import org.osgi.framework.Bundle;
-import org.eclipse.jst.servlet.ui.internal.plugin.ServletUIPlugin;
-
-public class WebProjectWizard extends NewProjectDataModelFacetWizard {
-
- public WebProjectWizard(IDataModel model) {
- super(model);
- setWindowTitle(WEBUIMessages.WEB_MODULE_WIZ_TITLE);
- }
-
- public WebProjectWizard() {
- super();
- setWindowTitle(WEBUIMessages.WEB_MODULE_WIZ_TITLE);
- }
-
- @Override
- protected IDataModel createDataModel() {
- try
- {
- return DataModelFactory.createDataModel(new WebFacetProjectCreationDataModelProvider());
- }
- catch( Exception e )
- {
- ServletUIPlugin.logError(e);
- return null;
- }
- }
-
- @Override
- protected IFacetedProjectTemplate getTemplate() {
- return ProjectFacetsManager.getTemplate("template.jst.web"); //$NON-NLS-1$
- }
-
- @Override
- protected IWizardPage createFirstPage() {
- return new WebProjectFirstPage(model, "first.page"); //$NON-NLS-1$
- }
-
- @Override
- protected ImageDescriptor getDefaultPageImageDescriptor() {
- final Bundle bundle = Platform.getBundle("org.eclipse.jst.servlet.ui"); //$NON-NLS-1$
- final URL url = bundle.getEntry("icons/full/ctool16/web-wiz-banner.gif"); //$NON-NLS-1$
- return ImageDescriptor.createFromURL(url);
- }
-
- @Override
- protected String getFinalPerspectiveID() {
- return ProductManager.getProperty(IProductConstants.FINAL_PERSPECTIVE_WEB);
- }
-}
diff --git a/plugins/org.eclipse.wst.web.ui/.classpath b/plugins/org.eclipse.wst.web.ui/.classpath
deleted file mode 100644
index b0b3094..0000000
--- a/plugins/org.eclipse.wst.web.ui/.classpath
+++ /dev/null
@@ -1,7 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<classpath>
- <classpathentry kind="src" path="static_web_ui"/>
- <classpathentry kind="con" path="org.eclipse.jdt.launching.JRE_CONTAINER/org.eclipse.jdt.internal.debug.ui.launcher.StandardVMType/J2SE-1.5"/>
- <classpathentry kind="con" path="org.eclipse.pde.core.requiredPlugins"/>
- <classpathentry kind="output" path="bin"/>
-</classpath>
diff --git a/plugins/org.eclipse.wst.web.ui/.cvsignore b/plugins/org.eclipse.wst.web.ui/.cvsignore
deleted file mode 100644
index 389089e..0000000
--- a/plugins/org.eclipse.wst.web.ui/.cvsignore
+++ /dev/null
@@ -1,8 +0,0 @@
-bin
-temp.folder
-build.xml
-ui.jar
-uisrc.zip
-@dot
-src.zip
-javaCompiler...args
diff --git a/plugins/org.eclipse.wst.web.ui/.project b/plugins/org.eclipse.wst.web.ui/.project
deleted file mode 100644
index 3858f90..0000000
--- a/plugins/org.eclipse.wst.web.ui/.project
+++ /dev/null
@@ -1,28 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<projectDescription>
- <name>org.eclipse.wst.web.ui</name>
- <comment></comment>
- <projects>
- </projects>
- <buildSpec>
- <buildCommand>
- <name>org.eclipse.jdt.core.javabuilder</name>
- <arguments>
- </arguments>
- </buildCommand>
- <buildCommand>
- <name>org.eclipse.pde.ManifestBuilder</name>
- <arguments>
- </arguments>
- </buildCommand>
- <buildCommand>
- <name>org.eclipse.pde.SchemaBuilder</name>
- <arguments>
- </arguments>
- </buildCommand>
- </buildSpec>
- <natures>
- <nature>org.eclipse.pde.PluginNature</nature>
- <nature>org.eclipse.jdt.core.javanature</nature>
- </natures>
-</projectDescription>
diff --git a/plugins/org.eclipse.wst.web.ui/.settings/org.eclipse.jdt.core.prefs b/plugins/org.eclipse.wst.web.ui/.settings/org.eclipse.jdt.core.prefs
deleted file mode 100644
index 037a4e5..0000000
--- a/plugins/org.eclipse.wst.web.ui/.settings/org.eclipse.jdt.core.prefs
+++ /dev/null
@@ -1,95 +0,0 @@
-#Mon Jun 08 15:35:45 EDT 2009
-org.eclipse.jdt.core.compiler.problem.unusedParameterWhenImplementingAbstract=disabled
-org.eclipse.jdt.core.compiler.problem.comparingIdentical=error
-org.eclipse.jdt.core.compiler.problem.unnecessaryElse=error
-org.eclipse.jdt.core.compiler.problem.redundantSuperinterface=error
-org.eclipse.jdt.core.compiler.problem.unusedLocal=error
-org.eclipse.jdt.core.compiler.problem.emptyStatement=error
-org.eclipse.jdt.core.compiler.problem.unusedLabel=error
-org.eclipse.jdt.core.compiler.problem.unusedParameter=warning
-org.eclipse.jdt.core.compiler.problem.rawTypeReference=warning
-org.eclipse.jdt.core.incompatibleJDKLevel=ignore
-org.eclipse.jdt.core.compiler.problem.incompatibleNonInheritedInterfaceMethod=error
-org.eclipse.jdt.core.compiler.debug.lineNumber=generate
-org.eclipse.jdt.core.compiler.problem.unusedDeclaredThrownException=warning
-org.eclipse.jdt.core.builder.cleanOutputFolder=clean
-org.eclipse.jdt.core.compiler.problem.unusedWarningToken=warning
-org.eclipse.jdt.core.compiler.problem.noImplicitStringConversion=error
-org.eclipse.jdt.core.compiler.problem.deprecationInDeprecatedCode=enabled
-org.eclipse.jdt.core.compiler.problem.deprecation=warning
-org.eclipse.jdt.core.compiler.problem.unusedParameterWhenOverridingConcrete=disabled
-org.eclipse.jdt.core.compiler.problem.missingSynchronizedOnInheritedMethod=error
-org.eclipse.jdt.core.compiler.problem.deprecationWhenOverridingDeprecatedMethod=enabled
-org.eclipse.jdt.core.compiler.problem.redundantNullCheck=error
-org.eclipse.jdt.core.compiler.problem.unusedImport=error
-org.eclipse.jdt.core.builder.recreateModifiedClassFileInOutputFolder=ignore
-org.eclipse.jdt.core.builder.resourceCopyExclusionFilter=*.launch
-org.eclipse.jdt.core.classpath.multipleOutputLocations=enabled
-org.eclipse.jdt.core.compiler.problem.suppressWarnings=enabled
-org.eclipse.jdt.core.compiler.problem.typeParameterHiding=error
-org.eclipse.jdt.core.builder.invalidClasspath=abort
-org.eclipse.jdt.core.compiler.problem.localVariableHiding=warning
-org.eclipse.jdt.core.compiler.problem.possibleAccidentalBooleanAssignment=error
-org.eclipse.jdt.core.compiler.problem.missingHashCodeMethod=error
-org.eclipse.jdt.core.codeComplete.argumentSuffixes=
-org.eclipse.jdt.core.codeComplete.argumentPrefixes=
-org.eclipse.jdt.core.compiler.problem.indirectStaticAccess=ignore
-org.eclipse.jdt.core.compiler.problem.potentialNullReference=error
-org.eclipse.jdt.core.compiler.codegen.inlineJsrBytecode=enabled
-org.eclipse.jdt.core.compiler.problem.finalParameterBound=warning
-org.eclipse.jdt.core.compiler.problem.missingSerialVersion=error
-org.eclipse.jdt.core.compiler.problem.nullReference=error
-org.eclipse.jdt.core.compiler.source=1.5
-org.eclipse.jdt.core.compiler.problem.enumIdentifier=error
-org.eclipse.jdt.core.compiler.problem.syntheticAccessEmulation=ignore
-org.eclipse.jdt.core.builder.duplicateResourceTask=warning
-org.eclipse.jdt.core.compiler.problem.fieldHiding=error
-org.eclipse.jdt.core.compiler.problem.unusedDeclaredThrownExceptionExemptExceptionAndThrowable=enabled
-org.eclipse.jdt.core.compiler.problem.missingOverrideAnnotation=error
-org.eclipse.jdt.core.compiler.problem.hiddenCatchBlock=error
-org.eclipse.jdt.core.compiler.problem.overridingPackageDefaultMethod=error
-org.eclipse.jdt.core.compiler.problem.finallyBlockNotCompletingNormally=error
-org.eclipse.jdt.core.compiler.problem.undocumentedEmptyBlock=warning
-org.eclipse.jdt.core.classpath.exclusionPatterns=enabled
-org.eclipse.jdt.core.compiler.problem.methodWithConstructorName=error
-org.eclipse.jdt.core.compiler.problem.discouragedReference=warning
-org.eclipse.jdt.core.compiler.problem.unqualifiedFieldAccess=ignore
-org.eclipse.jdt.core.compiler.problem.incompleteEnumSwitch=error
-eclipse.preferences.version=1
-org.eclipse.jdt.core.incompleteClasspath=error
-org.eclipse.jdt.core.compiler.problem.unnecessaryTypeCheck=error
-org.eclipse.jdt.core.compiler.problem.deadCode=error
-org.eclipse.jdt.core.compiler.problem.specialParameterHidingField=enabled
-org.eclipse.jdt.core.compiler.problem.fatalOptionalError=enabled
-org.eclipse.jdt.core.compiler.problem.noEffectAssignment=error
-org.eclipse.jdt.core.compiler.debug.sourceFile=generate
-org.eclipse.jdt.core.compiler.problem.unusedDeclaredThrownExceptionIncludeUncheckedExceptions=disabled
-org.eclipse.jdt.core.compiler.problem.missingDeprecatedAnnotation=warning
-org.eclipse.jdt.core.codeComplete.fieldPrefixes=
-org.eclipse.jdt.core.compiler.problem.fallthroughCase=error
-org.eclipse.jdt.core.compiler.codegen.targetPlatform=1.5
-org.eclipse.jdt.core.compiler.problem.unusedPrivateMember=error
-org.eclipse.jdt.core.compiler.problem.autoboxing=warning
-org.eclipse.jdt.core.circularClasspath=error
-org.eclipse.jdt.core.compiler.problem.annotationSuperInterface=warning
-org.eclipse.jdt.core.compiler.problem.nonExternalizedStringLiteral=error
-org.eclipse.jdt.core.codeComplete.fieldSuffixes=
-org.eclipse.jdt.core.codeComplete.localSuffixes=
-org.eclipse.jdt.core.compiler.problem.parameterAssignment=error
-org.eclipse.jdt.core.compiler.problem.staticAccessReceiver=error
-org.eclipse.jdt.core.codeComplete.localPrefixes=
-org.eclipse.jdt.core.compiler.problem.unusedDeclaredThrownExceptionIncludeDocCommentReference=enabled
-org.eclipse.jdt.core.compiler.maxProblemPerUnit=100
-org.eclipse.jdt.core.compiler.problem.varargsArgumentNeedCast=error
-org.eclipse.jdt.core.compiler.problem.assertIdentifier=error
-org.eclipse.jdt.core.compiler.compliance=1.5
-org.eclipse.jdt.core.compiler.problem.unusedParameterIncludeDocCommentReference=enabled
-org.eclipse.jdt.core.codeComplete.staticFieldPrefixes=
-org.eclipse.jdt.core.compiler.debug.localVariable=generate
-org.eclipse.jdt.core.compiler.problem.unhandledWarningToken=warning
-instance/org.eclipse.core.net/org.eclipse.core.net.hasMigrated=true
-org.eclipse.jdt.core.compiler.problem.forbiddenReference=error
-org.eclipse.jdt.core.compiler.codegen.unusedLocal=preserve
-org.eclipse.jdt.core.compiler.problem.uncheckedTypeOperation=warning
-org.eclipse.jdt.core.compiler.problem.unusedDeclaredThrownExceptionWhenOverriding=disabled
-org.eclipse.jdt.core.codeComplete.staticFieldSuffixes=
diff --git a/plugins/org.eclipse.wst.web.ui/META-INF/MANIFEST.MF b/plugins/org.eclipse.wst.web.ui/META-INF/MANIFEST.MF
deleted file mode 100644
index a8b572f..0000000
--- a/plugins/org.eclipse.wst.web.ui/META-INF/MANIFEST.MF
+++ /dev/null
@@ -1,31 +0,0 @@
-Manifest-Version: 1.0
-Bundle-ManifestVersion: 2
-Bundle-Name: %Bundle-Name.0
-Bundle-SymbolicName: org.eclipse.wst.web.ui; singleton:=true
-Bundle-Version: 1.1.400.qualifier
-Bundle-Activator: org.eclipse.wst.web.ui.internal.WSTWebUIPlugin
-Bundle-Vendor: %Bundle-Vendor.0
-Bundle-Localization: plugin
-Export-Package: org.eclipse.wst.web.ui.internal,
- org.eclipse.wst.web.ui.internal.wizards
-Require-Bundle: org.eclipse.core.resources;bundle-version="[3.2.0,4.0.0)",
- org.eclipse.core.runtime;bundle-version="[3.2.0,4.0.0)",
- org.eclipse.ui;bundle-version="[3.2.0,4.0.0)",
- org.eclipse.ui.ide;bundle-version="[3.2.0,4.0.0)",
- org.eclipse.wst.common.frameworks;bundle-version="[1.2.0,2.0.0)",
- org.eclipse.wst.common.frameworks.ui;bundle-version="[1.2.0,2.0.0)",
- org.eclipse.wst.web;bundle-version="[1.1.0,1.2.0)",
- org.eclipse.wst.common.modulecore;bundle-version="[1.2.0,2.0.0)",
- org.eclipse.wst.common.project.facet.ui;bundle-version="[1.3.0,2.0.0)",
- org.eclipse.wst.common.project.facet.core;bundle-version="[1.1.0,2.0.0)",
- org.eclipse.wst.server.ui;bundle-version="[1.0.102,2.0.0)",
- org.eclipse.wst.common.environment;bundle-version="[1.0.100,1.1.0)",
- org.eclipse.emf.ecore;bundle-version="[2.2.0,3.0.0)",
- org.eclipse.search;bundle-version="[3.2.0,4.0.0)",
- org.eclipse.ui.console;bundle-version="[3.2.0,4.0.0)",
- org.eclipse.wst.css.ui;bundle-version="[1.0.0,1.1.0)",
- org.eclipse.wst.html.ui;bundle-version="[1.0.0,1.1.0)",
- org.eclipse.wst.jsdt.ui;bundle-version="[1.0.0,2.0.0)",
- org.eclipse.ui.navigator;bundle-version="[3.2.0,4.0.0)
-Eclipse-LazyStart: true
-Bundle-RequiredExecutionEnvironment: J2SE-1.5
diff --git a/plugins/org.eclipse.wst.web.ui/about.html b/plugins/org.eclipse.wst.web.ui/about.html
deleted file mode 100644
index 2199df3..0000000
--- a/plugins/org.eclipse.wst.web.ui/about.html
+++ /dev/null
@@ -1,34 +0,0 @@
-<!DOCTYPE HTML PUBLIC "-//W3C//DTD HTML 4.0//EN">
-<HTML>
-
-<head>
-<title>About</title>
-<meta http-equiv=Content-Type content="text/html; charset=ISO-8859-1">
-</head>
-
-<BODY lang="EN-US">
-
-<H3>About This Content</H3>
-
-<P>June, 2008</P>
-
-<H3>License</H3>
-
-<P>The Eclipse Foundation makes available all content in this plug-in
-("Content"). Unless otherwise indicated below, the Content is provided to you
-under the terms and conditions of the Eclipse Public License Version 1.0
-("EPL"). A copy of the EPL is available at
-<A href="http://www.eclipse.org/org/documents/epl-v10.php">http://www.eclipse.org/org/documents/epl-v10.php</A>.
-For purposes of the EPL, "Program" will mean the Content.</P>
-
-<P>If you did not receive this Content directly from the Eclipse Foundation, the
-Content is being redistributed by another party ("Redistributor") and different
-terms and conditions may apply to your use of any object code in the Content.
-Check the Redistributors license that was provided with the Content. If no such
-license exists, contact the Redistributor. Unless otherwise indicated below, the
-terms and conditions of the EPL still apply to any source code in the Content
-and such source code may be obtained at
-<A href="http://www.eclipse.org/">http://www.eclipse.org/</A>.</P>
-
-</BODY>
-</HTML>
diff --git a/plugins/org.eclipse.wst.web.ui/about.ini b/plugins/org.eclipse.wst.web.ui/about.ini
deleted file mode 100644
index 68af291..0000000
--- a/plugins/org.eclipse.wst.web.ui/about.ini
+++ /dev/null
@@ -1,12 +0,0 @@
-# about.ini
-# contains information about a feature
-# java.io.Properties file (ISO 8859-1 with "\" escapes)
-# "%key" are externalized strings defined in about.properties
-# This file does not need to be translated.
-
-# Property "aboutText" contains blurb for "About" dialog (translated)
-aboutText=%blurb
-
-# Property "featureImage" contains path to feature image (32x32)
-featureImage=icons/WTP_icon_x32_v2.png
-
diff --git a/plugins/org.eclipse.wst.web.ui/about.mappings b/plugins/org.eclipse.wst.web.ui/about.mappings
deleted file mode 100644
index bddaab4..0000000
--- a/plugins/org.eclipse.wst.web.ui/about.mappings
+++ /dev/null
@@ -1,6 +0,0 @@
-# about.mappings
-# contains fill-ins for about.properties
-# java.io.Properties file (ISO 8859-1 with "\" escapes)
-# This file does not need to be translated.
-
-0=@build@
\ No newline at end of file
diff --git a/plugins/org.eclipse.wst.web.ui/about.properties b/plugins/org.eclipse.wst.web.ui/about.properties
deleted file mode 100644
index 839c201..0000000
--- a/plugins/org.eclipse.wst.web.ui/about.properties
+++ /dev/null
@@ -1,24 +0,0 @@
-###############################################################################
-# Copyright (c) 2000, 2009 IBM Corporation and others.
-# All rights reserved. This program and the accompanying materials
-# are made available under the terms of the Eclipse Public License v1.0
-# which accompanies this distribution, and is available at
-# http://www.eclipse.org/legal/epl-v10.html
-#
-# Contributors:
-# IBM Corporation - initial API and implementation
-###############################################################################
-
-# about.properties
-# contains externalized strings for about.ini
-# java.io.Properties file (ISO 8859-1 with "\" escapes)
-# fill-ins are supplied by about.mappings
-# This file should be translated.
-
-blurb=Eclipse Web Developer Tools\n\
-\n\
-Version: {featureVersion}\n\
-Build id: {0}\n\
-\n\
-(c) Copyright Eclipse contributors and others 2000, 2009. All rights reserved.\n\
-Visit http://www.eclipse.org/webtools
diff --git a/plugins/org.eclipse.wst.web.ui/build.properties b/plugins/org.eclipse.wst.web.ui/build.properties
deleted file mode 100644
index 3bc606f..0000000
--- a/plugins/org.eclipse.wst.web.ui/build.properties
+++ /dev/null
@@ -1,12 +0,0 @@
-bin.includes = plugin.xml,\
- icons/,\
- plugin.properties,\
- META-INF/,\
- about.html,\
- .,\
- about.properties,\
- about.mappings,\
- about.ini
-jars.compile.order = .
-source.. = static_web_ui/
-output.. = bin/
diff --git a/plugins/org.eclipse.wst.web.ui/icons/WTP_icon_x32_v2.png b/plugins/org.eclipse.wst.web.ui/icons/WTP_icon_x32_v2.png
deleted file mode 100644
index 6f09c2a..0000000
--- a/plugins/org.eclipse.wst.web.ui/icons/WTP_icon_x32_v2.png
+++ /dev/null
Binary files differ
diff --git a/plugins/org.eclipse.wst.web.ui/icons/full/ctool16/newwebprj_wiz.gif b/plugins/org.eclipse.wst.web.ui/icons/full/ctool16/newwebprj_wiz.gif
deleted file mode 100644
index 8956b3d..0000000
--- a/plugins/org.eclipse.wst.web.ui/icons/full/ctool16/newwebprj_wiz.gif
+++ /dev/null
Binary files differ
diff --git a/plugins/org.eclipse.wst.web.ui/icons/full/cview16/web_perspective.gif b/plugins/org.eclipse.wst.web.ui/icons/full/cview16/web_perspective.gif
deleted file mode 100644
index c7b3278..0000000
--- a/plugins/org.eclipse.wst.web.ui/icons/full/cview16/web_perspective.gif
+++ /dev/null
Binary files differ
diff --git a/plugins/org.eclipse.wst.web.ui/icons/full/obj16/web_application.gif b/plugins/org.eclipse.wst.web.ui/icons/full/obj16/web_application.gif
deleted file mode 100644
index 09f609d..0000000
--- a/plugins/org.eclipse.wst.web.ui/icons/full/obj16/web_application.gif
+++ /dev/null
Binary files differ
diff --git a/plugins/org.eclipse.wst.web.ui/icons/full/ovr16/web_module_ovr.gif b/plugins/org.eclipse.wst.web.ui/icons/full/ovr16/web_module_ovr.gif
deleted file mode 100644
index c1e9617..0000000
--- a/plugins/org.eclipse.wst.web.ui/icons/full/ovr16/web_module_ovr.gif
+++ /dev/null
Binary files differ
diff --git a/plugins/org.eclipse.wst.web.ui/icons/full/wizban/newwprj_wiz.png b/plugins/org.eclipse.wst.web.ui/icons/full/wizban/newwprj_wiz.png
deleted file mode 100644
index 1edd090..0000000
--- a/plugins/org.eclipse.wst.web.ui/icons/full/wizban/newwprj_wiz.png
+++ /dev/null
Binary files differ
diff --git a/plugins/org.eclipse.wst.web.ui/plugin.properties b/plugins/org.eclipse.wst.web.ui/plugin.properties
deleted file mode 100644
index 7ae3b12..0000000
--- a/plugins/org.eclipse.wst.web.ui/plugin.properties
+++ /dev/null
@@ -1,24 +0,0 @@
-#########################################
-# (c) Copyright IBM Corp. 2000, 2009.
-# All Rights Reserved.
-#########################################
-
-Bundle-Vendor.0 = Eclipse Web Tools Platform
-Bundle-Name.0 = Eclipse Web Developer Tools
-
-
-StaticWebProject.name=Static Web Project
-StaticWebProject.description=Create a Web project for static content (HTML files) only
-
-StaticWebSettings=Simple Web
-WebProjectFeatures.name=Web Project Features
-web.category_ui_=Web
-StaticWebModule.name=Simple Web Module
-perspective.name = Web
-webActionSet.label = Web Project Wizards Action Set
-action.label.CSS = CSS
-action.tooltip.CSS = Create a new Cascading Style Sheet
-action.label.JS = JavaScript
-action.tooltip.JS = Create a new JavaScript file
-action.label.HTML = HTML
-action.tooltip.HTML = Create a new HTML page
\ No newline at end of file
diff --git a/plugins/org.eclipse.wst.web.ui/plugin.xml b/plugins/org.eclipse.wst.web.ui/plugin.xml
deleted file mode 100644
index 634c030..0000000
--- a/plugins/org.eclipse.wst.web.ui/plugin.xml
+++ /dev/null
@@ -1,165 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<?eclipse version="3.0"?>
-<plugin>
-
- <!-- static web project wizard -->
- <extension
- point="org.eclipse.ui.newWizards">
- <category
- name="%web.category_ui_"
- id="org.eclipse.wst.web.ui">
- </category>
- <wizard
- name="%StaticWebProject.name"
- icon="icons/full/ctool16/newwebprj_wiz.gif"
- category="org.eclipse.wst.web.ui"
- class="org.eclipse.wst.web.ui.internal.wizards.SimpleWebProjectWizard"
- project="true"
- finalPerspective="org.eclipse.wst.web.ui.webDevPerspective"
- id="org.eclipse.wst.web.ui.internal.wizards.SimpleWebProjectWizard">
- <description>
- %StaticWebProject.description
- </description>
- <selection
- class="org.eclipse.core.resources.IResource">
- </selection>
- </wizard>
- </extension> -->
-
- <!-- the following 2 are needed to add an image for SWPs into the "Add/Remove Project" dialog -->
- <extension point="org.eclipse.wst.server.core.moduleTypes">
- <moduleType
- id="web.static"
- name="%StaticWebModule.name"/>
- </extension>
- <extension point="org.eclipse.wst.server.ui.serverImages">
- <image
- id="org.eclipse.wst.web.static"
- typeIds="web.static"
- icon="icons/full/obj16/web_application.gif"/>
- </extension>
-
-
-<!-- ====================================================== -->
-<!-- Extension point: org.eclipse.ui.projectNatureImages -->
-<!-- Purpose: Attach icon overlays for J2EE project natures -->
-<!-- ====================================================== -->
- <extension
- point="org.eclipse.ui.ide.projectNatureImages">
- <image
- icon="icons/full/ovr16/web_module_ovr.gif"
- natureId="org.eclipse.wst.web.StaticWebNature"
- id="org.eclipse.ui.simpleWebProjectNatureImage">
- </image>
- </extension>
-
- <extension point="org.eclipse.wst.common.project.facet.ui.wizardPages">
- <wizard-pages action="wst.web.install">
- <page class="org.eclipse.wst.web.ui.internal.wizards.SimpleWebFacetInstallPage"/>
- </wizard-pages>
- </extension>
-
- <extension
- point="org.eclipse.ui.ide.markerResolution">
- <markerResolutionGenerator
- markerType="org.eclipse.wst.common.modulecore.ModuleCoreValidatorMarker"
- class="org.eclipse.wst.web.ui.internal.ModuleCoreValidatorMarkerResolutions">
- </markerResolutionGenerator>
- </extension>
-
- <extension
- point="org.eclipse.ui.perspectives">
- <perspective
- name="%perspective.name"
- icon="icons/full/cview16/web_perspective.gif"
- class="org.eclipse.wst.web.ui.internal.WebDevelopmentPerspective"
- id="org.eclipse.wst.web.ui.webDevPerspective">
- </perspective>
- </extension>
- <extension point="org.eclipse.ui.perspectiveExtensions">
- <perspectiveExtension targetID="org.eclipse.wst.web.ui.webDevPerspective">
-
- <actionSet id="org.eclipse.debug.ui.launchActionSet"/>
- <actionSet id="org.eclipse.wst.web.ui.wizardsActionSet" />
- <actionSet id="org.eclipse.wst.server.ui.internal.webbrowser.actionSet"/>
- <actionSet id="org.eclipse.debug.ui.breakpointActionSet"/>
-
- <newWizardShortcut id="org.eclipse.wst.web.ui.internal.wizards.SimpleWebProjectWizard"/>
- <newWizardShortcut id="org.eclipse.jst.servlet.ui.project.facet.WebProjectWizard"/>
- <newWizardShortcut id="org.eclipse.wst.css.ui.internal.wizard.NewCSSWizard"/>
- <newWizardShortcut id="org.eclipse.wst.html.ui.internal.wizard.NewHTMLWizard"/>
- <newWizardShortcut id="org.eclipse.wst.jsdt.ui.NewJSWizard"/>
- <newWizardShortcut id="org.eclipse.ui.wizards.new.folder"/>
- <newWizardShortcut id="org.eclipse.ui.wizards.new.file"/>
-
- <viewShortcut id="org.eclipse.ui.navigator.ProjectExplorer"/>
- <viewShortcut id="org.eclipse.ui.views.ContentOutline"/>
- <viewShortcut id="org.eclipse.ui.views.PropertySheet"/>
- <viewShortcut id="org.eclipse.ui.views.ProblemView"/>
- <viewShortcut id="org.eclipse.wst.server.ui.ServersView"/>
-
- <perspectiveShortcut id="org.eclipse.jdt.ui.JavaPerspective"/>
- </perspectiveExtension>
- </extension>
-
- <!-- Toolbar action set for web project and HTML, JS and CSS files -->
- <extension point="org.eclipse.ui.actionSets">
- <actionSet
- id="org.eclipse.wst.web.ui.wizardsActionSet"
- label="%webActionSet.label">
- <action
- class="org.eclipse.wst.web.ui.internal.actions.OpenCSSWizardAction"
- icon="platform:/plugin/org.eclipse.wst.css.ui/icons/full/etool16/newcss_wiz.gif"
- id="org.eclipse.wst.web.ui.actions.newCSSFile"
- label="%action.label.CSS"
- style="push"
- toolbarPath="Normal/webActions"
- tooltip="%action.tooltip.CSS" />
- <action
- class="org.eclipse.wst.web.ui.internal.actions.OpenJSWizardAction"
- icon="platform:/plugin/org.eclipse.wst.jsdt.ui/icons/full/etool16/newjscript_wiz.gif"
- id="org.eclipse.wst.web.ui.actions.newJSFile"
- label="%action.label.JS"
- style="push"
- toolbarPath="Normal/webActions"
- tooltip="%action.tooltip.JS" />
- <action
- class="org.eclipse.wst.web.ui.internal.actions.OpenHTMLWizardAction"
- icon="platform:/plugin/org.eclipse.wst.html.ui/icons/full/etool16/newhtml_wiz.gif"
- id="org.eclipse.wst.web.ui.actions.newHTMLFile"
- label="%action.label.HTML"
- style="push"
- toolbarPath="Normal/webActions"
- tooltip="%action.tooltip.HTML" />
- </actionSet>
- </extension>
- <extension
- point="org.eclipse.ui.navigator.navigatorContent">
- <commonWizard
- menuGroupId="org.eclipse.jst.j2ee.ui.newProjects"
- type="new"
- wizardId="org.eclipse.wst.web.ui.internal.wizards.SimpleWebProjectWizard">
- <enablement>
- <or>
- <instanceof
- value="org.eclipse.core.resources.IWorkspaceRoot" />
- <and>
- <adapt
- type="org.eclipse.core.resources.IProject">
- <or>
- <test forcePluginActivation="true"
- property="org.eclipse.wst.common.project.facet.core.projectFacet"
- value="jst.ear" />
- </or>
- </adapt>
- </and>
- <and>
- <instanceof value="java.util.Collection"/>
- <count value="0" />
- </and>
- </or>
- </enablement>
- </commonWizard>
- </extension>
-
-</plugin>
diff --git a/plugins/org.eclipse.wst.web.ui/static_web_ui/org/eclipse/wst/web/ui/internal/Logger.java b/plugins/org.eclipse.wst.web.ui/static_web_ui/org/eclipse/wst/web/ui/internal/Logger.java
deleted file mode 100644
index e3357cc..0000000
--- a/plugins/org.eclipse.wst.web.ui/static_web_ui/org/eclipse/wst/web/ui/internal/Logger.java
+++ /dev/null
@@ -1,107 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2006 IBM Corporation and others.
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
- *
- * Contributors:
- * IBM Corporation - initial API and implementation
- * Jens Lukowski/Innoopract - initial renaming/restructuring
- *
- *******************************************************************************/
-package org.eclipse.wst.web.ui.internal;
-
-
-
-import org.eclipse.core.runtime.IStatus;
-import org.eclipse.core.runtime.Platform;
-import org.eclipse.core.runtime.Status;
-import org.osgi.framework.Bundle;
-
-/**
- * Small convenience class to log messages to plugin's log file and also, if
- * desired, the console. This class should only be used by classes in this
- * plugin. Other plugins should make their own copy, with appropriate ID.
- */
-public class Logger {
- private static final String PLUGIN_ID = "org.eclipse.wst.web.ui"; //$NON-NLS-1$
- /**
- * true if both platform and this plugin are in debug mode
- */
- public static final boolean DEBUG = Platform.inDebugMode() && "true".equalsIgnoreCase(Platform.getDebugOption("org.eclipse.wst.web.ui/debug")); //$NON-NLS-1$ //$NON-NLS-2$
-
- /*
- * Keep our own copy in case we want to add other severity levels
- */
- public static final int OK = IStatus.OK;
- public static final int INFO = IStatus.INFO;
- public static final int WARNING = IStatus.WARNING;
- public static final int ERROR = IStatus.ERROR;
-
- /**
- * Adds message to log.
- *
- * @param level
- * severity level of the message (OK, INFO, WARNING, ERROR,
- * @param message
- * text to add to the log
- * @param exception
- * exception thrown
- */
- private static void _log(int level, String message, Throwable exception) {
- Status statusObj = new Status(level, PLUGIN_ID, level, message, exception);
- Bundle bundle = Platform.getBundle(PLUGIN_ID);
- if (bundle != null)
- Platform.getLog(bundle).log(statusObj);
- }
-
- /**
- * Write a message to the log with the given severity level
- *
- * @param level
- * ERROR, WARNING, INFO, OK
- * @param message
- * message to add to the log
- */
- public static void log(int level, String message) {
- _log(level, message, null);
- }
-
- /**
- * Writes a message and exception to the log with the given severity level
- *
- * @param level
- * ERROR, WARNING, INFO, OK
- * @param message
- * message to add to the log
- * @param exception
- * exception to add to the log
- */
- public static void log(int level, String message, Throwable exception) {
- _log(level, message, exception);
- }
-
- /**
- * Writes the exception as an error in the log along with an accompanying
- * message
- *
- * @param message
- * message to add to the log
- * @param exception
- * exception to add to the log
- */
- public static void logException(String message, Throwable exception) {
- _log(IStatus.ERROR, message, exception);
- }
-
- /**
- * Writes the exception as an error in the log
- *
- * @param exception
- * exception to add to the log
- */
- public static void logException(Throwable exception) {
- _log(IStatus.ERROR, exception.getMessage(), exception);
- }
-}
diff --git a/plugins/org.eclipse.wst.web.ui/static_web_ui/org/eclipse/wst/web/ui/internal/ModuleCoreValidatorMarkerResolutions.java b/plugins/org.eclipse.wst.web.ui/static_web_ui/org/eclipse/wst/web/ui/internal/ModuleCoreValidatorMarkerResolutions.java
deleted file mode 100644
index 7a59260..0000000
--- a/plugins/org.eclipse.wst.web.ui/static_web_ui/org/eclipse/wst/web/ui/internal/ModuleCoreValidatorMarkerResolutions.java
+++ /dev/null
@@ -1,123 +0,0 @@
-/******************************************************************************
- * Copyright (c) 2005 BEA Systems, Inc.
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
- *
- * Contributors:
- * Konstantin Komissarchik - initial API and implementation
- ******************************************************************************/
-
-package org.eclipse.wst.web.ui.internal;
-
-import java.util.ArrayList;
-import java.util.List;
-
-import org.eclipse.core.resources.IMarker;
-import org.eclipse.core.resources.IProject;
-import org.eclipse.core.resources.ResourcesPlugin;
-import org.eclipse.core.runtime.CoreException;
-import org.eclipse.osgi.util.NLS;
-import org.eclipse.swt.graphics.Image;
-import org.eclipse.ui.IMarkerResolution;
-import org.eclipse.ui.IMarkerResolutionGenerator;
-import org.eclipse.ui.views.markers.WorkbenchMarkerResolution;
-import org.eclipse.wst.common.componentcore.internal.ModuleMigratorManager;
-import org.eclipse.wst.web.ui.internal.WSTWebUIPlugin;
-
-/**
- * This has been deprecated since WTP 3.1.2 and will be deleted post WTP 3.2.
- * See https://bugs.eclipse.org/bugs/show_bug.cgi?id=292934
- * @deprecated
- * @author <a href="mailto:kosta@bea.com">Konstantin Komissarchik</a>
- */
-public final class ModuleCoreValidatorMarkerResolutions
-
- implements IMarkerResolutionGenerator
-
-{
- public IMarkerResolution[] getResolutions( IMarker marker )
- {
- return new IMarkerResolution[]
- {
- new ModuleCoreMigrationResolution( marker )
- };
- }
-
- private class ModuleCoreMigrationResolution extends WorkbenchMarkerResolution
-
- {
- private final IMarker theMarker;
- private final String MARKERTYPE = "org.eclipse.wst.common.modulecore.ModuleCoreValidatorMarker"; //$NON-NLS-1$
-
- public ModuleCoreMigrationResolution( IMarker marker )
- {
- this.theMarker = marker;
- }
-
- public String getLabel()
- {
- return Resources.migrateMetaData;
- }
-
-
-
- public void run( IMarker marker )
- {
-
- IProject proj = marker.getResource().getProject();
-
- try
- {
- ModuleMigratorManager manager = ModuleMigratorManager.getManager(proj);
- if (!manager.isMigrating() && !ResourcesPlugin.getWorkspace().isTreeLocked())
- manager.migrateOldMetaData(proj,true);
- }
- catch( Exception e )
- {
- WSTWebUIPlugin.logError(e);
- }
- }
-
- public String getDescription() {
- return Resources.migrateMetaData;
- }
-
- public Image getImage() {
- return null;
- }
-
- @Override
- public IMarker[] findOtherMarkers(IMarker[] markers) {
- List marks = new ArrayList();
- for (int i = 0; i < markers.length; i++) {
- IMarker marker = markers[i];
- try {
- if (marker.getType().equals(MARKERTYPE) && !(marker.equals(theMarker)))
- marks.add(marker);
- } catch (CoreException e) {
- WSTWebUIPlugin.logError(e);
- }
- }
- return (IMarker[])marks.toArray(new IMarker[marks.size()]);
- }
-
- }
-
- private static final class Resources
-
- extends NLS
-
- {
- public static String migrateMetaData;
-
- static
- {
- initializeMessages( ModuleCoreValidatorMarkerResolutions.class.getName(),
- Resources.class );
- }
- }
-
-
-}
diff --git a/plugins/org.eclipse.wst.web.ui/static_web_ui/org/eclipse/wst/web/ui/internal/ModuleCoreValidatorMarkerResolutions.properties b/plugins/org.eclipse.wst.web.ui/static_web_ui/org/eclipse/wst/web/ui/internal/ModuleCoreValidatorMarkerResolutions.properties
deleted file mode 100644
index 4491dfe..0000000
--- a/plugins/org.eclipse.wst.web.ui/static_web_ui/org/eclipse/wst/web/ui/internal/ModuleCoreValidatorMarkerResolutions.properties
+++ /dev/null
@@ -1,11 +0,0 @@
-###############################################################################
-# Copyright (c) 2005, 2006 IBM Corporation and others.
-# All rights reserved. This program and the accompanying materials
-# are made available under the terms of the Eclipse Public License v1.0
-# which accompanies this distribution, and is available at
-# http://www.eclipse.org/legal/epl-v10.html
-#
-# Contributors:
-# IBM Corporation - initial API and implementation
-###############################################################################
-migrateMetaData=Migrate metadata
diff --git a/plugins/org.eclipse.wst.web.ui/static_web_ui/org/eclipse/wst/web/ui/internal/WSTWebPreferences.java b/plugins/org.eclipse.wst.web.ui/static_web_ui/org/eclipse/wst/web/ui/internal/WSTWebPreferences.java
deleted file mode 100644
index 931f9ef..0000000
--- a/plugins/org.eclipse.wst.web.ui/static_web_ui/org/eclipse/wst/web/ui/internal/WSTWebPreferences.java
+++ /dev/null
@@ -1,83 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2003, 2005 IBM Corporation and others.
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
- *
- * Contributors:
- * IBM Corporation - initial API and implementation
- *******************************************************************************/
-
-package org.eclipse.wst.web.ui.internal;
-
-import org.eclipse.core.runtime.Plugin;
-import org.eclipse.core.runtime.Preferences;
-
-public class WSTWebPreferences {
- public interface Keys {
- final static String STATIC_WEB_CONTENT = "org.eclipse.jst.j2ee.preference.staticWebContentName"; //$NON-NLS-1$
- }
- public interface Values {
- final static String STATIC_WEB_CONTENT = "WebContent"; //$NON-NLS-1$
- }
- public interface Defaults {
- final static String STATIC_WEB_CONTENT = Values.STATIC_WEB_CONTENT;
- }
- private Plugin owner = null;
- private Preferences preferences = null;
- private boolean persistOnChange = false;
-
- public WSTWebPreferences(Plugin owner) {
- this.owner = owner;
- }
- protected void initializeDefaultPreferences() {
- getPreferences().setDefault(Keys.STATIC_WEB_CONTENT, Defaults.STATIC_WEB_CONTENT);
- }
-
- public String getStaticWebContentFolderName() {
- return getPreferences().getString(Keys.STATIC_WEB_CONTENT);
- }
-
- public void setStaticWebContentFolderName(String value) {
- getPreferences().setValue(Keys.STATIC_WEB_CONTENT, value);
- firePreferenceChanged();
- }
-
- public void firePreferenceChanged() {
- if (isPersistOnChange())
- persist();
- }
-
- public void persist() {
- getOwner().savePluginPreferences();
- }
-
- /**
- * @return Returns the persistOnChange.
- */
- public boolean isPersistOnChange() {
- return this.persistOnChange;
- }
-
- /**
- * @param persistOnChange
- * The persistOnChange to set.
- */
- public void setPersistOnChange(boolean persistOnChange) {
- this.persistOnChange = persistOnChange;
- }
-
- private Preferences getPreferences() {
- if (this.preferences == null)
- this.preferences = getOwner().getPluginPreferences();
- return this.preferences;
- }
-
- /**
- * @return Returns the owner.
- */
- private Plugin getOwner() {
- return this.owner;
- }
-}
diff --git a/plugins/org.eclipse.wst.web.ui/static_web_ui/org/eclipse/wst/web/ui/internal/WSTWebUIPlugin.java b/plugins/org.eclipse.wst.web.ui/static_web_ui/org/eclipse/wst/web/ui/internal/WSTWebUIPlugin.java
deleted file mode 100644
index 5e37665..0000000
--- a/plugins/org.eclipse.wst.web.ui/static_web_ui/org/eclipse/wst/web/ui/internal/WSTWebUIPlugin.java
+++ /dev/null
@@ -1,138 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2003, 2006 IBM Corporation and others.
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
- *
- * Contributors:
- * IBM Corporation - initial API and implementation
- *******************************************************************************/
-package org.eclipse.wst.web.ui.internal;
-
-import java.net.MalformedURLException;
-import java.net.URL;
-
-import org.eclipse.core.runtime.IPath;
-import org.eclipse.core.runtime.Path;
-import org.eclipse.jface.resource.ImageDescriptor;
-import org.eclipse.ui.plugin.AbstractUIPlugin;
-import org.osgi.framework.Bundle;
-import org.osgi.framework.BundleContext;
-import org.eclipse.core.runtime.Status;
-import org.eclipse.core.runtime.IStatus;
-import org.eclipse.core.runtime.Platform;
-import java.lang.Throwable;
-import org.eclipse.core.runtime.CoreException;
-
-/**
- * The main plugin class to be used in the desktop.
- */
-public class WSTWebUIPlugin extends AbstractUIPlugin {
-
- public static final String PLUGIN_ID = "org.eclipse.wst.web.ui"; //$NON-NLS-1$
-
- // The shared instance.
- private static WSTWebUIPlugin plugin;
- public static final String[] ICON_DIRS = new String[]{"icons/full/obj16", //$NON-NLS-1$
- "icons/full/ctool16", //$NON-NLS-1$
- "icons/full/wizban", //$NON-NLS-1$
- "icons", //$NON-NLS-1$
- ""}; //$NON-NLS-1$
-
- /**
- * The constructor.
- */
- public WSTWebUIPlugin() {
- super();
- plugin = this;
- }
- /**
- * This method is called upon plug-in activation
- */
- @Override
- public void start(BundleContext context) throws Exception {
- super.start(context);
- }
-
- /**
- * This method is called when the plug-in is stopped
- */
- @Override
- public void stop(BundleContext context) throws Exception {
- super.stop(context);
- plugin = null;
- }
-
- /**
- * This gets a .gif from the icons folder.
- */
- public ImageDescriptor getImageDescriptor(String key) {
- ImageDescriptor imageDescriptor = null;
- URL imageURL = getImageURL(key, getBundle());
- if (imageURL==null)
- imageURL = getPNGImageURL(key, getBundle());
- if (imageURL != null)
- imageDescriptor = ImageDescriptor.createFromURL(imageURL);
- return imageDescriptor;
- }
- /**
- * This gets a .gif from the icons folder.
- */
- public static URL getImageURL(String key, Bundle bundle) {
- String gif = "/" + key + ".gif"; //$NON-NLS-1$ //$NON-NLS-2$
- IPath path = null;
- for (int i = 0; i < ICON_DIRS.length; i++) {
- path = new Path(ICON_DIRS[i]).append(gif);
- if (bundle.getEntry(path.toString()) == null)
- continue;
- try {
- return new URL(bundle.getEntry("/"), path.toString()); //$NON-NLS-1$
- } catch (MalformedURLException exception) {
- Logger.log(Logger.WARNING, "Load_Image_Error_", exception); //$NON-NLS-1$
- continue;
- }
- }
- return null;
- }
-
- /**
- * This gets a .png from the icons folder.
- */
- public static URL getPNGImageURL(String key, Bundle bundle) {
- String gif = "/" + key + ".png"; //$NON-NLS-1$ //$NON-NLS-2$
- IPath path = null;
- for (int i = 0; i < ICON_DIRS.length; i++) {
- path = new Path(ICON_DIRS[i]).append(gif);
- if (bundle.getEntry(path.toString()) == null)
- continue;
- try {
- return new URL(bundle.getEntry("/"), path.toString()); //$NON-NLS-1$
- } catch (MalformedURLException exception) {
- Logger.log(Logger.WARNING, "Load_Image_Error_", exception); //$NON-NLS-1$
- continue;
- }
- }
- return null;
- }
-
- /**
- * Returns the shared instance.
- */
- public static WSTWebUIPlugin getDefault() {
- return plugin;
- }
- public static IStatus createStatus(int severity, String message, Throwable exception) {
- return new Status(severity, PLUGIN_ID, message, exception);
- }
- public static IStatus createStatus(int severity, String message) {
- return createStatus(severity, message, null);
- }
- public static void logError(Throwable exception) {
- Platform.getLog(Platform.getBundle(PLUGIN_ID)).log( createStatus(IStatus.ERROR, exception.getMessage(), exception));
- }
- public static void logError(CoreException exception) {
- Platform.getLog(Platform.getBundle(PLUGIN_ID)).log( exception.getStatus() );
- }
-
-}
diff --git a/plugins/org.eclipse.wst.web.ui/static_web_ui/org/eclipse/wst/web/ui/internal/WebDevelopmentPerspective.java b/plugins/org.eclipse.wst.web.ui/static_web_ui/org/eclipse/wst/web/ui/internal/WebDevelopmentPerspective.java
deleted file mode 100644
index 2445ff1..0000000
--- a/plugins/org.eclipse.wst.web.ui/static_web_ui/org/eclipse/wst/web/ui/internal/WebDevelopmentPerspective.java
+++ /dev/null
@@ -1,92 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2006, 2007 IBM Corporation and others.
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
- *
- * Contributors:
- * IBM Corporation - initial API and implementation
- *******************************************************************************/
-package org.eclipse.wst.web.ui.internal;
-
-import org.eclipse.search.ui.NewSearchUI;
-import org.eclipse.ui.IFolderLayout;
-import org.eclipse.ui.IPageLayout;
-import org.eclipse.ui.IPerspectiveFactory;
-import org.eclipse.ui.PlatformUI;
-import org.eclipse.ui.console.IConsoleConstants;
-import org.eclipse.ui.progress.IProgressConstants;
-import org.eclipse.wst.project.facet.IProductConstants;
-import org.eclipse.wst.project.facet.ProductManager;
-
-public class WebDevelopmentPerspective implements IPerspectiveFactory {
-
- public static final String ID = "org.eclipse.wst.web.ui.webDevPerspective"; //$NON-NLS-1$
-
- protected static final String TOP_LEFT_LOCATION = "topLeft"; //$NON-NLS-1$
- protected static final String BOTTOM_LEFT_LOCATION = "bottomLeft"; //$NON-NLS-1$
- protected static final String BOTTOM_RIGHT_LOCATION = "bottomRight"; //$NON-NLS-1$
- protected static final String TOP_RIGHT_LOCATION = "topRight"; //$NON-NLS-1$
- protected static final String BOTTOM_LOCATION = "bottom"; //$NON-NLS-1$
-
- // view id's
- protected static String ID_PROJECT_EXPLORER = "org.eclipse.ui.navigator.ProjectExplorer"; //$NON-NLS-1$
- protected static final String ID_SERVER = "org.eclipse.wst.server.ui.ServersView"; //$NON-NLS-1$
- protected static String ID_WST_SNIPPETS_VIEW = "org.eclipse.wst.common.snippets.internal.ui.SnippetsView"; //$NON-NLS-1$
-
- public WebDevelopmentPerspective() {
- super();
- //If preference exists for alternate view, replace.
- String viewerID = ProductManager.getProperty(IProductConstants.ID_PERSPECTIVE_HIERARCHY_VIEW);
- if (viewerID != null) {
- // verify that the view actually exists
- if (PlatformUI.getWorkbench().getViewRegistry().find(viewerID) != null){
- ID_PROJECT_EXPLORER = viewerID;
- }
- }
- }
-
- /*
- *____ ________________ _____
- *| | | |
- *| P | | O |
- *| R | ED | u |
- *| o | | t |
- *| j | | l |
- *| |________________| i |
- *| E | | n |
- *| X | PROB/SERV/PROP | e |
- *|_P__|________________|_____|
- *
- */
- public void createInitialLayout(IPageLayout layout) {
- // everything is based off the editor area
- String editorArea = layout.getEditorArea();
-
- // LEFT Area (Project Explorer)
- IFolderLayout topLeft = layout.createFolder(TOP_LEFT_LOCATION,
- IPageLayout.LEFT, 0.25f, editorArea);
- topLeft.addView(ID_PROJECT_EXPLORER);
- topLeft.addPlaceholder(IPageLayout.ID_RES_NAV);
-
- // TOP RIGHT Area (Outline)
- IFolderLayout topRight = layout.createFolder(TOP_RIGHT_LOCATION,
- IPageLayout.RIGHT, 0.80f, editorArea);
- topRight.addView(IPageLayout.ID_OUTLINE);
- topRight.addView(ID_WST_SNIPPETS_VIEW);
-
- // BOTTOM Area (Problems, Server, Properties)
- IFolderLayout bottom = layout.createFolder(BOTTOM_LOCATION,
- IPageLayout.BOTTOM, 0.70f, editorArea);
- bottom.addView(IPageLayout.ID_PROBLEM_VIEW);
- bottom.addView(ID_SERVER);
- bottom.addView(IPageLayout.ID_PROP_SHEET);
- bottom.addPlaceholder(NewSearchUI.SEARCH_VIEW_ID);
- bottom.addPlaceholder(IConsoleConstants.ID_CONSOLE_VIEW);
- bottom.addPlaceholder(IPageLayout.ID_BOOKMARKS);
- bottom.addPlaceholder(IProgressConstants.PROGRESS_VIEW_ID);
- bottom.addPlaceholder(IPageLayout.ID_TASK_LIST);
- }
-
-}
diff --git a/plugins/org.eclipse.wst.web.ui/static_web_ui/org/eclipse/wst/web/ui/internal/actions/AbstractOpenWizardAction.java b/plugins/org.eclipse.wst.web.ui/static_web_ui/org/eclipse/wst/web/ui/internal/actions/AbstractOpenWizardAction.java
deleted file mode 100644
index 809dfe2..0000000
--- a/plugins/org.eclipse.wst.web.ui/static_web_ui/org/eclipse/wst/web/ui/internal/actions/AbstractOpenWizardAction.java
+++ /dev/null
@@ -1,68 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2006, 2007 IBM Corporation and others.
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
- *
- * Contributors:
- * IBM Corporation - initial API and implementation
- *******************************************************************************/
-package org.eclipse.wst.web.ui.internal.actions;
-
-import org.eclipse.jface.action.IAction;
-import org.eclipse.jface.viewers.ISelection;
-import org.eclipse.jface.viewers.IStructuredSelection;
-import org.eclipse.jface.viewers.StructuredSelection;
-import org.eclipse.jface.wizard.WizardDialog;
-import org.eclipse.swt.widgets.Shell;
-import org.eclipse.ui.IWorkbenchWindow;
-import org.eclipse.ui.IWorkbenchWindowActionDelegate;
-import org.eclipse.ui.IWorkbenchWizard;
-
-public abstract class AbstractOpenWizardAction implements IWorkbenchWindowActionDelegate
-{
-
- private IWorkbenchWindow window;
-
- public AbstractOpenWizardAction()
- {
- super();
- }
-
- public void dispose()
- {
- }
-
- public void init( IWorkbenchWindow window )
- {
- this.window = window;
- }
-
- abstract public void run( IAction action );
-
- public void selectionChanged( IAction action, ISelection selection )
- {
- }
-
- protected void openWizardDialog( IWorkbenchWizard wizard )
- {
- ISelection selection = window.getSelectionService().getSelection();
-
- if ( selection instanceof IStructuredSelection )
- {
- wizard.init( window.getWorkbench(), (IStructuredSelection) selection );
- }
- else
- {
- wizard.init( window.getWorkbench(), StructuredSelection.EMPTY );
- }
-
- Shell parent = window.getShell();
- WizardDialog dialog = new WizardDialog( parent, wizard );
-
- dialog.create();
- dialog.open();
- }
-
-}
diff --git a/plugins/org.eclipse.wst.web.ui/static_web_ui/org/eclipse/wst/web/ui/internal/actions/OpenCSSWizardAction.java b/plugins/org.eclipse.wst.web.ui/static_web_ui/org/eclipse/wst/web/ui/internal/actions/OpenCSSWizardAction.java
deleted file mode 100644
index 2527044..0000000
--- a/plugins/org.eclipse.wst.web.ui/static_web_ui/org/eclipse/wst/web/ui/internal/actions/OpenCSSWizardAction.java
+++ /dev/null
@@ -1,25 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2006, 2007 IBM Corporation and others.
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
- *
- * Contributors:
- * IBM Corporation - initial API and implementation
- *******************************************************************************/
-package org.eclipse.wst.web.ui.internal.actions;
-
-import org.eclipse.jface.action.IAction;
-import org.eclipse.wst.css.ui.internal.wizard.NewCSSWizard;
-
-public class OpenCSSWizardAction extends AbstractOpenWizardAction
-{
-
- @Override
- public void run( IAction action )
- {
- openWizardDialog( new NewCSSWizard() );
- }
-
-}
diff --git a/plugins/org.eclipse.wst.web.ui/static_web_ui/org/eclipse/wst/web/ui/internal/actions/OpenHTMLWizardAction.java b/plugins/org.eclipse.wst.web.ui/static_web_ui/org/eclipse/wst/web/ui/internal/actions/OpenHTMLWizardAction.java
deleted file mode 100644
index b009c15..0000000
--- a/plugins/org.eclipse.wst.web.ui/static_web_ui/org/eclipse/wst/web/ui/internal/actions/OpenHTMLWizardAction.java
+++ /dev/null
@@ -1,25 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2006, 2007 IBM Corporation and others.
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
- *
- * Contributors:
- * IBM Corporation - initial API and implementation
- *******************************************************************************/
-package org.eclipse.wst.web.ui.internal.actions;
-
-import org.eclipse.jface.action.IAction;
-import org.eclipse.wst.html.ui.internal.wizard.NewHTMLWizard;
-
-public class OpenHTMLWizardAction extends AbstractOpenWizardAction
-{
-
- @Override
- public void run( IAction action )
- {
- openWizardDialog( new NewHTMLWizard() );
- }
-
-}
diff --git a/plugins/org.eclipse.wst.web.ui/static_web_ui/org/eclipse/wst/web/ui/internal/actions/OpenJSWizardAction.java b/plugins/org.eclipse.wst.web.ui/static_web_ui/org/eclipse/wst/web/ui/internal/actions/OpenJSWizardAction.java
deleted file mode 100644
index 0e4bb24..0000000
--- a/plugins/org.eclipse.wst.web.ui/static_web_ui/org/eclipse/wst/web/ui/internal/actions/OpenJSWizardAction.java
+++ /dev/null
@@ -1,24 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2006, 2007 IBM Corporation and others.
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
- *
- * Contributors:
- * IBM Corporation - initial API and implementation
- *******************************************************************************/
-package org.eclipse.wst.web.ui.internal.actions;
-
-import org.eclipse.jface.action.IAction;
-
-public class OpenJSWizardAction extends AbstractOpenWizardAction
-{
-
- @Override
- public void run( IAction action )
- {
- openWizardDialog( new org.eclipse.wst.jsdt.internal.ui.wizards.NewJSWizard() );
- }
-
-}
diff --git a/plugins/org.eclipse.wst.web.ui/static_web_ui/org/eclipse/wst/web/ui/internal/wizards/DataModelFacetCreationWizardPage.java b/plugins/org.eclipse.wst.web.ui/static_web_ui/org/eclipse/wst/web/ui/internal/wizards/DataModelFacetCreationWizardPage.java
deleted file mode 100644
index 4289878..0000000
--- a/plugins/org.eclipse.wst.web.ui/static_web_ui/org/eclipse/wst/web/ui/internal/wizards/DataModelFacetCreationWizardPage.java
+++ /dev/null
@@ -1,691 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2003, 2009 IBM Corporation and others.
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
- *
- * Contributors:
- * IBM Corporation - initial API and implementation
- *******************************************************************************/
-package org.eclipse.wst.web.ui.internal.wizards;
-
-import java.util.ArrayList;
-import java.util.Arrays;
-import java.util.HashSet;
-import java.util.Iterator;
-import java.util.List;
-import java.util.Set;
-import java.util.SortedSet;
-
-import org.eclipse.jface.dialogs.IDialogSettings;
-import org.eclipse.jface.layout.GridDataFactory;
-import org.eclipse.jface.viewers.ISelection;
-import org.eclipse.jface.viewers.IStructuredSelection;
-import org.eclipse.osgi.util.NLS;
-import org.eclipse.swt.SWT;
-import org.eclipse.swt.events.SelectionAdapter;
-import org.eclipse.swt.events.SelectionEvent;
-import org.eclipse.swt.layout.GridData;
-import org.eclipse.swt.layout.GridLayout;
-import org.eclipse.swt.widgets.Button;
-import org.eclipse.swt.widgets.Combo;
-import org.eclipse.swt.widgets.Composite;
-import org.eclipse.swt.widgets.Control;
-import org.eclipse.swt.widgets.Display;
-import org.eclipse.swt.widgets.Group;
-import org.eclipse.swt.widgets.Shell;
-import org.eclipse.ui.IWorkingSet;
-import org.eclipse.ui.PlatformUI;
-import org.eclipse.ui.dialogs.WorkingSetGroup;
-import org.eclipse.wst.common.componentcore.datamodel.properties.IFacetProjectCreationDataModelProperties;
-import org.eclipse.wst.common.frameworks.datamodel.DataModelEvent;
-import org.eclipse.wst.common.frameworks.datamodel.DataModelPropertyDescriptor;
-import org.eclipse.wst.common.frameworks.datamodel.IDataModel;
-import org.eclipse.wst.common.frameworks.datamodel.IDataModelListener;
-import org.eclipse.wst.common.frameworks.internal.datamodel.ui.DataModelWizardPage;
-import org.eclipse.wst.common.frameworks.internal.operations.IProjectCreationPropertiesNew;
-import org.eclipse.wst.common.frameworks.internal.ui.NewProjectGroup;
-import org.eclipse.wst.common.project.facet.core.IFacetedProjectWorkingCopy;
-import org.eclipse.wst.common.project.facet.core.IPreset;
-import org.eclipse.wst.common.project.facet.core.IProjectFacet;
-import org.eclipse.wst.common.project.facet.core.IProjectFacetVersion;
-import org.eclipse.wst.common.project.facet.core.ProjectFacetsManager;
-import org.eclipse.wst.common.project.facet.core.events.IFacetedProjectEvent;
-import org.eclipse.wst.common.project.facet.core.events.IFacetedProjectListener;
-import org.eclipse.wst.common.project.facet.core.events.IProjectFacetsChangedEvent;
-import org.eclipse.wst.common.project.facet.core.runtime.IRuntime;
-import org.eclipse.wst.common.project.facet.core.runtime.IRuntimeComponent;
-import org.eclipse.wst.common.project.facet.core.runtime.RuntimeManager;
-import org.eclipse.wst.common.project.facet.core.util.AbstractFilter;
-import org.eclipse.wst.common.project.facet.core.util.FilterEvent;
-import org.eclipse.wst.common.project.facet.core.util.IFilter;
-import org.eclipse.wst.common.project.facet.ui.ModifyFacetedProjectWizard;
-import org.eclipse.wst.common.project.facet.ui.PresetSelectionPanel;
-import org.eclipse.wst.project.facet.ProductManager;
-import org.eclipse.wst.server.ui.ServerUIUtil;
-import org.eclipse.wst.web.internal.ResourceHandler;
-import org.eclipse.wst.web.internal.facet.RuntimePresetMappingRegistry;
-
-public class DataModelFacetCreationWizardPage extends DataModelWizardPage implements IFacetProjectCreationDataModelProperties {
-
- private static final String NULL_RUNTIME = "NULL_RUNTIME"; //$NON-NLS-1$
- private static final String MRU_RUNTIME_STORE = "MRU_RUNTIME_STORE"; //$NON-NLS-1$
-
- protected static final String RESOURCE_WORKING_SET = "org.eclipse.ui.resourceWorkingSetPage"; //$NON-NLS-1$
- protected static final String JAVA_WORKING_SET = "org.eclipse.jdt.ui.JavaWorkingSetPage"; //$NON-NLS-1$
-
- protected IProjectFacet primaryProjectFacet = null;
- protected Combo primaryVersionCombo = null;
-
- protected WorkingSetGroup workingSetGroup;
-
- protected Set<IProjectFacetVersion> getFacetConfiguration( final IProjectFacetVersion primaryFacetVersion )
- {
- final Set<IProjectFacetVersion> config = new HashSet<IProjectFacetVersion>();
-
- for( IProjectFacet fixedFacet : this.fpjwc.getFixedProjectFacets() )
- {
- if( fixedFacet == primaryFacetVersion.getProjectFacet() )
- {
- config.add( primaryFacetVersion );
- }
- else
- {
- config.add( this.fpjwc.getHighestAvailableVersion( fixedFacet ) );
- }
- }
-
- return config;
- }
-
- private static final String[] VALIDATION_PROPERTIES =
- {
- IProjectCreationPropertiesNew.PROJECT_NAME,
- IProjectCreationPropertiesNew.PROJECT_LOCATION,
- FACET_RUNTIME,
- FACETED_PROJECT_WORKING_COPY
- };
-
- protected static GridData gdhfill() {
- return new GridData(GridData.FILL_HORIZONTAL);
- }
-
- protected static GridData hspan( final GridData gd,
- final int span )
- {
- gd.horizontalSpan = span;
- return gd;
- }
-
- @Override
- protected Composite createTopLevelComposite(Composite parent) {
- Composite top = new Composite(parent, SWT.NONE);
- PlatformUI.getWorkbench().getHelpSystem().setHelp(top, getInfopopID());
- top.setLayout(new GridLayout());
- top.setLayoutData(new GridData(GridData.FILL_BOTH));
- createProjectGroup(top);
- createServerTargetComposite(top);
- createPrimaryFacetComposite(top);
- createPresetPanel(top);
- return top;
- }
-
- private String getPrimaryFacetCompositeLabel()
- {
- final StringBuilder buf = new StringBuilder();
- boolean firstWord = true;
-
- for( String word : primaryProjectFacet.getLabel().split( " " ) ) //$NON-NLS-1$
- {
- if( firstWord )
- {
- buf.append( word );
- firstWord = false;
- }
- else
- {
- buf.append( ' ' );
-
- if( word.length() == 1 || ! Character.isUpperCase( word.charAt( 1 ) ) )
- {
- buf.append( Character.toLowerCase( word.charAt( 0 ) ) );
- buf.append( word.substring( 1 ) );
- }
- else
- {
- buf.append( word );
- }
- }
- }
-
- buf.append( ' ' );
- buf.append( Messages.FACET_VERSION );
-
- return buf.toString();
- }
-
- protected void createPrimaryFacetComposite(Composite top) {
- primaryProjectFacet = ProjectFacetsManager.getProjectFacet( getModuleTypeID() );
- if (primaryProjectFacet.getVersions().size() <= 1){
- //there is no need to create this section if there is only one
- //facet version to choose from (e.g. utility and static web)
- return;
- }
-
- final Group group = new Group( top, SWT.NONE );
- group.setLayoutData( gdhfill() );
- group.setLayout( new GridLayout( 1, false ) );
- group.setText( getPrimaryFacetCompositeLabel() );
-
- primaryVersionCombo = new Combo( group, SWT.BORDER | SWT.READ_ONLY );
- primaryVersionCombo.setLayoutData( gdhfill() );
- updatePrimaryVersions();
-
- primaryVersionCombo.addSelectionListener
- (
- new SelectionAdapter()
- {
- @Override
- public void widgetSelected( final SelectionEvent e )
- {
- handlePrimaryFacetVersionSelectedEvent();
- }
- }
- );
-
- fpjwc.addListener(new IFacetedProjectListener() {
- public void handleEvent(IFacetedProjectEvent event) {
- if(event.getType() == IFacetedProjectEvent.Type.PROJECT_FACETS_CHANGED){
- //this block is to update the combo when the underlying facet version changes
- IProjectFacetsChangedEvent actionEvent = (IProjectFacetsChangedEvent)event;
- Set<IProjectFacetVersion> changedVersions = actionEvent.getFacetsWithChangedVersions();
-
- boolean foundComboVersion = false;
- for(Iterator <IProjectFacetVersion> iterator = changedVersions.iterator(); iterator.hasNext() && !foundComboVersion;){
- IProjectFacetVersion next = iterator.next();
- if(next.getProjectFacet().equals(primaryProjectFacet)){
- foundComboVersion = true;
- final IProjectFacetVersion selectedVersion = next;
- Display.getDefault().asyncExec(new Runnable(){
- public void run() {
- String selectedText = primaryVersionCombo.getItem(primaryVersionCombo.getSelectionIndex());
- if(!selectedText.equals(selectedVersion.getVersionString())){
- String [] items = primaryVersionCombo.getItems();
- int selectedVersionIndex = -1;
- for(int i=0;i<items.length && selectedVersionIndex == -1; i++){
- if(items[i].equals(selectedVersion.getVersionString())){
- selectedVersionIndex = i;
- primaryVersionCombo.select(selectedVersionIndex);
- }
- }
- }
- }
- });
- }
- }
- } else if(event.getType() == IFacetedProjectEvent.Type.PRIMARY_RUNTIME_CHANGED){
- //this block updates the items in the combo when the runtime changes
- Display.getDefault().asyncExec(new Runnable(){
- public void run() {
- updatePrimaryVersions();
- }
- });
- }
- }
-
- }, IFacetedProjectEvent.Type.PROJECT_FACETS_CHANGED, IFacetedProjectEvent.Type.PRIMARY_RUNTIME_CHANGED);
- }
-
- protected IProjectFacet getPrimaryFacet()
- {
- return this.primaryProjectFacet;
- }
-
- public IProjectFacetVersion getPrimaryFacetVersion()
- {
- IProjectFacetVersion fv = null;
-
- if( this.primaryProjectFacet.getVersions().size() > 1 )
- {
- final int selectedIndex = this.primaryVersionCombo.getSelectionIndex();
-
- if( selectedIndex != -1 )
- {
- final String fvstr = this.primaryVersionCombo.getItem( selectedIndex );
- fv = this.primaryProjectFacet.getVersion( fvstr );
- }
- }
- else
- {
- fv = this.primaryProjectFacet.getDefaultVersion();
- }
-
- return fv;
- }
-
- protected void handlePrimaryFacetVersionSelectedEvent()
- {
- final IProjectFacetVersion fv = getPrimaryFacetVersion();
- if( fv != null )
- {
- String presetID = null;
- IRuntime runtime = (IRuntime)model.getProperty(IFacetProjectCreationDataModelProperties.FACET_RUNTIME);
- if(runtime != null){
- if(runtime.getRuntimeComponents().size() > 0){
- IRuntimeComponent runtimeComponent = runtime.getRuntimeComponents().get(0);
- String facetRuntimeTypeID = runtimeComponent.getRuntimeComponentType().getId();
- String facetRuntimeVersion = runtimeComponent.getRuntimeComponentVersion().getVersionString();
- String facetID = fv.getProjectFacet().getId();
- String facetVersion = fv.getVersionString();
- presetID = RuntimePresetMappingRegistry.INSTANCE.getPresetID(facetRuntimeTypeID, facetRuntimeVersion, facetID, facetVersion);
- }
- }
-
- if( presetID == null )
- {
- final Set<IProjectFacetVersion> facets = getFacetConfiguration( fv );
- this.fpjwc.setProjectFacets( facets );
- }
- else
- { // setting the facets prior to setting the preset is to let the dynamic presets adjust
- final Set<IProjectFacetVersion> facets = getFacetConfiguration( fv );
- this.fpjwc.setProjectFacets( facets );
- this.fpjwc.setSelectedPreset(presetID);
-
- }
- }
- }
-
- protected void updatePrimaryVersions(){
- IProjectFacetVersion selectedVersion = fpjwc.getProjectFacetVersion(primaryProjectFacet);
- SortedSet<IProjectFacetVersion> initialVersions = fpjwc.getAvailableVersions(primaryProjectFacet);
- String [] items = new String[initialVersions.size()];
- int i=0;
- int selectedVersionIndex = -1;
- for(Iterator <IProjectFacetVersion> iterator = initialVersions.iterator(); iterator.hasNext(); i++){
- items[i] = iterator.next().getVersionString();
- if(selectedVersionIndex == -1 && items[i].equals(selectedVersion.getVersionString())){
- selectedVersionIndex = i;
- }
- }
- primaryVersionCombo.clearSelection();
- primaryVersionCombo.setItems(items);
- primaryVersionCombo.select(selectedVersionIndex);
- }
-
- public static class Messages extends NLS {
- private static final String BUNDLE_NAME = "org.eclipse.wst.web.ui.internal.wizards.facetcreationpagemessages"; //$NON-NLS-1$
-
- public static String FACET_VERSION;
-
- static {
- // initialize resource bundle
- NLS.initializeMessages(BUNDLE_NAME, Messages.class);
- }
-
- private Messages() {
- }
- }
-
- protected void createPresetPanel(Composite top) {
- final IFacetedProjectWorkingCopy fpjwc
- = ( (ModifyFacetedProjectWizard) getWizard() ).getFacetedProjectWorkingCopy();
-
- final IFilter<IPreset> filter = new AbstractFilter<IPreset>()
- {
- {
- fpjwc.addListener
- (
- new IFacetedProjectListener()
- {
- public void handleEvent( final IFacetedProjectEvent event )
- {
- handleProjectFacetsChangedEvent( (IProjectFacetsChangedEvent) event );
- }
- },
- IFacetedProjectEvent.Type.PROJECT_FACETS_CHANGED
- );
- }
-
- public boolean check( final IPreset preset )
- {
- final IProjectFacetVersion primaryFacetVersion = getPrimaryFacetVersion();
- return preset.getProjectFacets().contains( primaryFacetVersion );
- }
-
- private void handleProjectFacetsChangedEvent( final IProjectFacetsChangedEvent event )
- {
- for( IProjectFacetVersion fv : event.getFacetsWithChangedVersions() )
- {
- if( fv.getProjectFacet() == getPrimaryFacet() )
- {
- final IFilterEvent<IPreset> filterEvent
- = new FilterEvent<IPreset>( this, IFilterEvent.Type.FILTER_CHANGED );
-
- notifyListeners( filterEvent );
- }
- }
- }
- };
-
- final PresetSelectionPanel ppanel = new PresetSelectionPanel( top, fpjwc, filter );
-
- ppanel.setLayoutData( gdhfill() );
- }
-
- public static boolean launchNewRuntimeWizard(Shell shell, IDataModel model) {
- return launchNewRuntimeWizard(shell, model, null);
- }
-
- public static boolean launchNewRuntimeWizard(Shell shell, final IDataModel model, String serverTypeID)
- {
- if( model == null )
- {
- return false;
- }
-
- final DataModelPropertyDescriptor[] preAdditionDescriptors = model.getValidPropertyDescriptors(FACET_RUNTIME);
-
- final boolean[] keepWaiting = { true };
-
- final IDataModelListener listener = new IDataModelListener()
- {
- public void propertyChanged( final DataModelEvent event )
- {
- if( event.getPropertyName().equals( FACET_RUNTIME ) &&
- event.getFlag() == DataModelEvent.VALID_VALUES_CHG )
- {
- synchronized( keepWaiting )
- {
- keepWaiting[ 0 ] = false;
- keepWaiting.notify();
- }
-
- model.removeListener( this );
- }
- }
- };
-
- model.addListener( listener );
-
- boolean isOK = ServerUIUtil.showNewRuntimeWizard(shell, serverTypeID, null);
-
- if( isOK )
- {
- // Do the rest of the processing in a separate thread. Since we are going to block
- // and wait, doing this on the UI thread can cause hangs.
-
- final Thread newRuntimeSelectionThread = new Thread()
- {
- @Override
- public void run()
- {
- // Causes the list of runtimes held by the RuntimeManager to be refreshed and
- // triggers events to listeners on that list.
-
- RuntimeManager.getRuntimes();
-
- // Wait until the list of valid values has updated to include the new runtime.
-
- synchronized( keepWaiting )
- {
- while( keepWaiting[ 0 ] == true )
- {
- try
- {
- keepWaiting.wait();
- }
- catch( InterruptedException e ) {}
- }
- }
-
- // Select the new runtime.
-
- DataModelPropertyDescriptor[] postAdditionDescriptors = model.getValidPropertyDescriptors(FACET_RUNTIME);
- Object[] preAddition = new Object[preAdditionDescriptors.length];
- for (int i = 0; i < preAddition.length; i++) {
- preAddition[i] = preAdditionDescriptors[i].getPropertyValue();
- }
- Object[] postAddition = new Object[postAdditionDescriptors.length];
- for (int i = 0; i < postAddition.length; i++) {
- postAddition[i] = postAdditionDescriptors[i].getPropertyValue();
- }
- Object newAddition = getNewObject(preAddition, postAddition);
-
- if (newAddition != null) // can this ever be null?
- model.setProperty(FACET_RUNTIME, newAddition);
- }
- };
-
- newRuntimeSelectionThread.start();
-
- return true;
- }
- model.removeListener( listener );
- return false;
- }
-
- public boolean internalLaunchNewRuntimeWizard(Shell shell, IDataModel model) {
- return launchNewRuntimeWizard(shell, model, getModuleTypeID());
- }
-
- protected String getModuleTypeID() {
- return null;
- }
-
- protected Combo serverTargetCombo;
- protected NewProjectGroup projectNameGroup;
- private final IFacetedProjectWorkingCopy fpjwc;
- private final IFacetedProjectListener fpjwcListener;
-
- public DataModelFacetCreationWizardPage(IDataModel dataModel, String pageName)
- {
- super(dataModel, pageName);
-
- this.fpjwc = (IFacetedProjectWorkingCopy) this.model.getProperty( FACETED_PROJECT_WORKING_COPY );
-
- this.fpjwcListener = new IFacetedProjectListener()
- {
- public void handleEvent( final IFacetedProjectEvent event )
- {
- final Runnable runnable = new Runnable()
- {
- public void run()
- {
- validatePage();
- }
- };
-
- getContainer().getShell().getDisplay().asyncExec( runnable );
- }
- };
-
- this.fpjwc.addListener( this.fpjwcListener, IFacetedProjectEvent.Type.VALIDATION_PROBLEMS_CHANGED );
- }
-
- protected void createServerTargetComposite(Composite parent) {
- Group group = new Group(parent, SWT.NONE);
- group.setText(ResourceHandler.TargetRuntime);
- group.setLayoutData(gdhfill());
- group.setLayout(new GridLayout(2, false));
- serverTargetCombo = new Combo(group, SWT.BORDER | SWT.READ_ONLY);
- serverTargetCombo.setLayoutData(gdhfill());
- Button newServerTargetButton = new Button(group, SWT.NONE);
- newServerTargetButton.setText(Resources.newRuntimeButton);
- GridDataFactory.defaultsFor(newServerTargetButton).applyTo(newServerTargetButton);
- newServerTargetButton.addSelectionListener(new SelectionAdapter() {
- @Override
- public void widgetSelected(SelectionEvent e) {
- if (!internalLaunchNewRuntimeWizard(getShell(), model)) {
- //Bugzilla 135288
- //setErrorMessage(ResourceHandler.InvalidServerTarget);
- }
- }
- });
- Control[] deps = new Control[]{newServerTargetButton};
- synchHelper.synchCombo(serverTargetCombo, FACET_RUNTIME, deps);
- if (serverTargetCombo.getSelectionIndex() == -1 && serverTargetCombo.getVisibleItemCount() != 0)
- serverTargetCombo.select(0);
- }
-
- protected void createProjectGroup(Composite parent) {
- IDataModel nestedProjectDM = model.getNestedModel(NESTED_PROJECT_DM);
- nestedProjectDM.addListener(this);
- projectNameGroup = new NewProjectGroup(parent, nestedProjectDM);
- }
-
- @Override
- protected String[] getValidationPropertyNames()
- {
- return VALIDATION_PROPERTIES;
- }
-
- @Override
- public void dispose() {
- super.dispose();
- if (projectNameGroup != null)
- projectNameGroup.dispose();
-
- this.fpjwc.removeListener( this.fpjwcListener );
- }
-
- @Override
- public void storeDefaultSettings() {
- IDialogSettings settings = getDialogSettings();
- DataModelFacetCreationWizardPage.saveRuntimeSettings(settings, model);
- }
-
- @Override
- public void restoreDefaultSettings() {
- IDialogSettings settings = getDialogSettings();
- DataModelFacetCreationWizardPage.restoreRuntimeSettings(settings, model);
- }
-
- public static void saveRuntimeSettings(IDialogSettings settings, IDataModel model){
- if (settings != null) {
- String[] mruRuntimeArray = settings.getArray(MRU_RUNTIME_STORE);
- List mruRuntimes = new ArrayList();
- if(mruRuntimeArray != null)
- mruRuntimes.addAll(Arrays.asList(mruRuntimeArray));
-
- IRuntime runtime = (IRuntime) model.getProperty(IFacetProjectCreationDataModelProperties.FACET_RUNTIME);
- String runtimeName = runtime == null ? NULL_RUNTIME : runtime.getName();
-
- if (mruRuntimes.contains(runtimeName)) {
- mruRuntimes.remove(runtimeName);
- }
- mruRuntimes.add(0, runtimeName);
- while (mruRuntimes.size() > 5) {
- mruRuntimes.remove(5);
- }
- mruRuntimeArray = new String[mruRuntimes.size()];
- for (int i = 0; i < mruRuntimeArray.length; i++) {
- mruRuntimeArray[i] = (String) mruRuntimes.get(i);
- }
- settings.put(MRU_RUNTIME_STORE, mruRuntimeArray);
- }
- }
-
- public static void restoreRuntimeSettings(IDialogSettings settings, IDataModel model){
- if (settings != null) {
- if (!model.isPropertySet(IFacetProjectCreationDataModelProperties.FACET_RUNTIME)) {
- boolean runtimeSet = false;
- String[] mruRuntimeArray = settings.getArray(MRU_RUNTIME_STORE);
- DataModelPropertyDescriptor[] descriptors = model.getValidPropertyDescriptors(IFacetProjectCreationDataModelProperties.FACET_RUNTIME);
- List mruRuntimes = new ArrayList();
- if (mruRuntimeArray == null) {
- List defRuntimes = ProductManager.getDefaultRuntimes();
- for (Iterator iter = defRuntimes.iterator(); iter.hasNext();)
- mruRuntimes.add(((IRuntime) iter.next()).getName());
- } else {
- mruRuntimes.addAll(Arrays.asList(mruRuntimeArray));
- }
- if (!mruRuntimes.isEmpty()) {
- for (int i = 0; i < mruRuntimes.size() && !runtimeSet; i++) {
- for (int j = 0; j < descriptors.length-1 && !runtimeSet; j++) {
- if (mruRuntimes.get(i).equals(((IRuntime)descriptors[j].getPropertyValue()).getName())) {
- model.setProperty(IFacetProjectCreationDataModelProperties.FACET_RUNTIME, descriptors[j].getPropertyValue());
- runtimeSet = true;
- }
- }
- if(!runtimeSet && mruRuntimes.get(i).equals(NULL_RUNTIME)){
- model.setProperty(IFacetProjectCreationDataModelProperties.FACET_RUNTIME, descriptors[descriptors.length -1].getPropertyValue());
- runtimeSet = true;
- }
- }
- }
- if (!runtimeSet && descriptors.length > 0) {
- model.setProperty(IFacetProjectCreationDataModelProperties.FACET_RUNTIME, descriptors[0].getPropertyValue());
- }
- }
- }
- }
-
-
- /**
- * Find first newObject that is not in the oldObjects array (using "==").
- *
- * @param oldObjects
- * @param newObjects
- * @return first newObject not found in oldObjects, or <code>null</code> if all found.
- *
- * @since 1.0.0
- */
- private static Object getNewObject(Object[] oldObjects, Object[] newObjects) {
- if (oldObjects != null && newObjects != null && oldObjects.length < newObjects.length) {
- for (int i = 0; i < newObjects.length; i++) {
- boolean found = false;
- Object object = newObjects[i];
- for (int j = 0; j < oldObjects.length; j++) {
- if (oldObjects[j] == object) {
- found = true;
- break;
- }
- }
- if (!found)
- return object;
- }
- }
- if (oldObjects == null && newObjects != null && newObjects.length == 1)
- return newObjects[0];
- return null;
- }
-
- protected WorkingSetGroup createWorkingSetGroup(Composite composite,
- IStructuredSelection selection, String[] supportedWorkingSetTypes) {
- if (workingSetGroup != null)
- return workingSetGroup;
- workingSetGroup = new WorkingSetGroup(composite, selection,
- supportedWorkingSetTypes);
- return workingSetGroup;
- }
-
- protected WorkingSetGroup createWorkingSetGroupPanel(Composite composite, String[] workingSetTypes) {
- IStructuredSelection structuredSelection = null;
- ISelection currentSelection = PlatformUI.getWorkbench()
- .getActiveWorkbenchWindow().getSelectionService()
- .getSelection();
- if (currentSelection instanceof IStructuredSelection) {
- structuredSelection = (IStructuredSelection) currentSelection;
- }
- WorkingSetGroup group = createWorkingSetGroup(composite, structuredSelection, workingSetTypes);
- return group;
- }
-
- public IWorkingSet[] getSelectedWorkingSets() {
- return workingSetGroup == null ? new IWorkingSet[0] : workingSetGroup
- .getSelectedWorkingSets();
- }
-
- private static final class Resources extends NLS
- {
- public static String newRuntimeButton;
-
- static
- {
- initializeMessages( DataModelFacetCreationWizardPage.class.getName(), Resources.class );
- }
- }
-
-}
diff --git a/plugins/org.eclipse.wst.web.ui/static_web_ui/org/eclipse/wst/web/ui/internal/wizards/DataModelFacetCreationWizardPage.properties b/plugins/org.eclipse.wst.web.ui/static_web_ui/org/eclipse/wst/web/ui/internal/wizards/DataModelFacetCreationWizardPage.properties
deleted file mode 100644
index 8f54320..0000000
--- a/plugins/org.eclipse.wst.web.ui/static_web_ui/org/eclipse/wst/web/ui/internal/wizards/DataModelFacetCreationWizardPage.properties
+++ /dev/null
@@ -1 +0,0 @@
-newRuntimeButton = New &Runtime...
diff --git a/plugins/org.eclipse.wst.web.ui/static_web_ui/org/eclipse/wst/web/ui/internal/wizards/DataModelFacetInstallPage.java b/plugins/org.eclipse.wst.web.ui/static_web_ui/org/eclipse/wst/web/ui/internal/wizards/DataModelFacetInstallPage.java
deleted file mode 100644
index da031f5..0000000
--- a/plugins/org.eclipse.wst.web.ui/static_web_ui/org/eclipse/wst/web/ui/internal/wizards/DataModelFacetInstallPage.java
+++ /dev/null
@@ -1,52 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2003, 2005 IBM Corporation and others.
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
- *
- * Contributors:
- * IBM Corporation - initial API and implementation
- *******************************************************************************/
-package org.eclipse.wst.web.ui.internal.wizards;
-
-import org.eclipse.swt.layout.GridData;
-import org.eclipse.wst.common.componentcore.datamodel.properties.IFacetInstallDataModelProperties;
-import org.eclipse.wst.common.frameworks.datamodel.AbstractDataModelProvider;
-import org.eclipse.wst.common.frameworks.datamodel.DataModelFactory;
-import org.eclipse.wst.common.frameworks.datamodel.IDataModel;
-import org.eclipse.wst.common.frameworks.internal.datamodel.ui.DataModelWizardPage;
-import org.eclipse.wst.common.project.facet.ui.IFacetWizardPage;
-import org.eclipse.wst.common.project.facet.ui.IWizardContext;
-
-public abstract class DataModelFacetInstallPage extends DataModelWizardPage implements IFacetWizardPage, IFacetInstallDataModelProperties {
-
- public DataModelFacetInstallPage(String pageName) {
- // TODO figure out a better way to do this without compromising the IDataModelWizard
- // framework.
- super(DataModelFactory.createDataModel(new AbstractDataModelProvider() {
- }), pageName);
- }
-
- protected static GridData gdhfill() {
- return new GridData(GridData.FILL_HORIZONTAL);
- }
-
- public void setWizardContext(IWizardContext context) {
- // Intentionally empty
- }
-
- public void transferStateToConfig() {
- // Intentionally empty
- }
-
- public void setConfig(final Object config) {
- model.removeListener(this);
- synchHelper.dispose();
-
- model = (IDataModel) config;
- model.addListener(this);
- synchHelper = initializeSynchHelper(model);
- }
-
-}
diff --git a/plugins/org.eclipse.wst.web.ui/static_web_ui/org/eclipse/wst/web/ui/internal/wizards/IWstWebUIContextIds.java b/plugins/org.eclipse.wst.web.ui/static_web_ui/org/eclipse/wst/web/ui/internal/wizards/IWstWebUIContextIds.java
deleted file mode 100644
index 565a9f3..0000000
--- a/plugins/org.eclipse.wst.web.ui/static_web_ui/org/eclipse/wst/web/ui/internal/wizards/IWstWebUIContextIds.java
+++ /dev/null
@@ -1,21 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2005, 2006 IBM Corporation and others.
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
- *
- * Contributors:
- * IBM Corporation - initial API and implementation
- *******************************************************************************/
-package org.eclipse.wst.web.ui.internal.wizards;
-
-public interface IWstWebUIContextIds {
-
- public static final String PLUGIN_WST_WEB_UI = "org.eclipse.wst.web.ui."; //$NON-NLS-1$
-
- public static final String NEW_STATIC_WEB_PROJECT_PAGE1 = PLUGIN_WST_WEB_UI + "webw2000"; //$NON-NLS-1$
- public static final String NEW_STATIC_WEB_PROJECT_PAGE2 = PLUGIN_WST_WEB_UI + "webw2100"; //$NON-NLS-1$
- public static final String NEW_STATIC_WEB_PROJECT_PAGE3 = PLUGIN_WST_WEB_UI + "webw2200"; //$NON-NLS-1$
-
-}
diff --git a/plugins/org.eclipse.wst.web.ui/static_web_ui/org/eclipse/wst/web/ui/internal/wizards/NewProjectDataModelFacetWizard.java b/plugins/org.eclipse.wst.web.ui/static_web_ui/org/eclipse/wst/web/ui/internal/wizards/NewProjectDataModelFacetWizard.java
deleted file mode 100644
index 6b33585..0000000
--- a/plugins/org.eclipse.wst.web.ui/static_web_ui/org/eclipse/wst/web/ui/internal/wizards/NewProjectDataModelFacetWizard.java
+++ /dev/null
@@ -1,505 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2003, 2007 IBM Corporation and others.
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
- *
- * Contributors:
- * IBM Corporation - initial API and implementation
- *******************************************************************************/
-package org.eclipse.wst.web.ui.internal.wizards;
-
-import java.lang.reflect.InvocationTargetException;
-import java.util.Collections;
-import java.util.HashSet;
-import java.util.Iterator;
-import java.util.Set;
-
-import org.eclipse.core.commands.ExecutionException;
-import org.eclipse.core.resources.IProject;
-import org.eclipse.core.resources.ResourcesPlugin;
-import org.eclipse.core.runtime.CoreException;
-import org.eclipse.core.runtime.IAdaptable;
-import org.eclipse.core.runtime.IConfigurationElement;
-import org.eclipse.core.runtime.IProgressMonitor;
-import org.eclipse.core.runtime.IStatus;
-import org.eclipse.core.runtime.NullProgressMonitor;
-import org.eclipse.core.runtime.Status;
-import org.eclipse.core.runtime.SubProgressMonitor;
-import org.eclipse.jface.resource.ImageDescriptor;
-import org.eclipse.jface.viewers.IStructuredSelection;
-import org.eclipse.jface.wizard.IWizardPage;
-import org.eclipse.swt.widgets.Composite;
-import org.eclipse.ui.INewWizard;
-import org.eclipse.ui.IWorkbench;
-import org.eclipse.ui.IWorkingSet;
-import org.eclipse.ui.wizards.newresource.BasicNewProjectResourceWizard;
-import org.eclipse.ui.wizards.newresource.BasicNewResourceWizard;
-import org.eclipse.wst.common.componentcore.datamodel.properties.IFacetDataModelProperties;
-import org.eclipse.wst.common.componentcore.datamodel.properties.IFacetProjectCreationDataModelProperties;
-import org.eclipse.wst.common.frameworks.datamodel.AbstractDataModelOperation;
-import org.eclipse.wst.common.frameworks.datamodel.AbstractDataModelProvider;
-import org.eclipse.wst.common.frameworks.datamodel.DataModelEvent;
-import org.eclipse.wst.common.frameworks.datamodel.IDataModel;
-import org.eclipse.wst.common.frameworks.datamodel.IDataModelListener;
-import org.eclipse.wst.common.frameworks.datamodel.IDataModelOperation;
-import org.eclipse.wst.common.frameworks.internal.datamodel.DataModelPausibleOperationImpl;
-import org.eclipse.wst.common.frameworks.internal.datamodel.ui.DataModelWizardPage;
-import org.eclipse.wst.common.project.facet.core.FacetedProjectFramework;
-import org.eclipse.wst.common.project.facet.core.IFacetedProject;
-import org.eclipse.wst.common.project.facet.core.IFacetedProjectTemplate;
-import org.eclipse.wst.common.project.facet.core.IFacetedProjectWorkingCopy;
-import org.eclipse.wst.common.project.facet.core.IPreset;
-import org.eclipse.wst.common.project.facet.core.IProjectFacet;
-import org.eclipse.wst.common.project.facet.core.IProjectFacetVersion;
-import org.eclipse.wst.common.project.facet.core.events.IFacetedProjectEvent;
-import org.eclipse.wst.common.project.facet.core.events.IFacetedProjectListener;
-import org.eclipse.wst.common.project.facet.core.runtime.IRuntime;
-import org.eclipse.wst.common.project.facet.ui.ModifyFacetedProjectWizard;
-import org.eclipse.wst.web.internal.DelegateConfigurationElement;
-import org.eclipse.wst.web.ui.internal.Logger;
-import org.eclipse.wst.web.ui.internal.WSTWebUIPlugin;
-
-public abstract class NewProjectDataModelFacetWizard extends ModifyFacetedProjectWizard implements INewWizard, IFacetProjectCreationDataModelProperties {
-
- protected IDataModel model = null;
- protected IFacetedProjectTemplate template;
- private IWizardPage[] beginingPages;
- private IConfigurationElement configurationElement;
-
- public NewProjectDataModelFacetWizard(IDataModel model)
- {
- this.model = ( model == null ? createDataModel() : model );
- this.template = getTemplate();
-
- setFacetedProjectWorkingCopy((IFacetedProjectWorkingCopy)this.model.getProperty(FACETED_PROJECT_WORKING_COPY));
- getFacetedProjectWorkingCopy().setFixedProjectFacets( this.template.getFixedProjectFacets() );
- setDefaultPageImageDescriptor(getDefaultPageImageDescriptor());
- setShowFacetsSelectionPage( false );
- }
-
- public NewProjectDataModelFacetWizard()
- {
- this( null );
- }
-
- public IDataModel getDataModel() {
- return model;
- }
-
- protected abstract IDataModel createDataModel();
-
- protected abstract ImageDescriptor getDefaultPageImageDescriptor();
-
- protected abstract IFacetedProjectTemplate getTemplate();
-
- /**
- * Returns the first page that shows up before the facets page. If multiple pages are required,
- * also override {@link #createBeginingPages()}.
- *
- * @return
- */
- protected abstract IWizardPage createFirstPage();
-
- /**
- * Subclasses should override to add more than one page before the facets page. If only one page
- * is required, then use {@link #createFirstPage()}. The default implementation will return the
- * result of {@link #createFirstPage()}.
- *
- * @return
- */
- protected IWizardPage[] createBeginingPages() {
- return new IWizardPage[]{createFirstPage()};
- }
-
- @Override
- public void addPages() {
- beginingPages = createBeginingPages();
- for (int i = 0; i < beginingPages.length; i++) {
- addPage(beginingPages[i]);
- }
-
- super.addPages();
-
- getFacetedProjectWorkingCopy().addListener
- (
- new IFacetedProjectListener()
- {
- public void handleEvent( final IFacetedProjectEvent event )
- {
- facetSelectionChangedEvent();
- }
- },
- IFacetedProjectEvent.Type.PROJECT_FACETS_CHANGED
- );
- }
-
- @Override
- public void createPageControls(Composite container) {
- super.createPageControls(container);
-
- final IPreset preset = this.template.getInitialPreset();
- final IRuntime runtime = (IRuntime) model.getProperty( FACET_RUNTIME );
-
- if( preset == null )
- {
- // If no preset is specified, select the runtime and it's default
- // facets.
-
- setRuntimeAndDefaultFacets( runtime );
- }
- else
- {
- // If preset is specified, select the runtime only if supports all
- // of the facets included in the preset.
-
- getFacetedProjectWorkingCopy().setSelectedPreset( preset.getId() );
-
- boolean supports = false;
-
- if( runtime != null )
- {
- supports = true;
-
- for( Iterator itr = preset.getProjectFacets().iterator(); itr.hasNext(); )
- {
- final IProjectFacetVersion fv = (IProjectFacetVersion) itr.next();
-
- if( ! runtime.supports( fv ) )
- {
- supports = false;
- break;
- }
- }
- }
-
- if( supports )
- {
- getFacetedProjectWorkingCopy().setTargetedRuntimes( Collections.singleton( runtime ) );
- }
- else
- {
- model.setProperty( FACET_RUNTIME, null );
- }
- }
-
- synchRuntimes();
- }
-
- @Override
- public IWizardPage[] getPages() {
- final IWizardPage[] base = super.getPages();
- final IWizardPage[] pages = new IWizardPage[base.length + beginingPages.length];
-
- for (int i = 0; i < beginingPages.length; i++) {
- pages[i] = beginingPages[i];
- }
-
- System.arraycopy(base, 0, pages, beginingPages.length, base.length);
-
- return pages;
- }
-
- public void init(IWorkbench workbench, IStructuredSelection selection) {
- }
-
- protected void synchRuntimes()
- {
- final Boolean[] suppressBackEvents = { Boolean.FALSE };
-
- model.addListener(new IDataModelListener() {
- public void propertyChanged(DataModelEvent event) {
- if (IDataModel.VALUE_CHG == event.getFlag() || IDataModel.DEFAULT_CHG == event.getFlag()) {
- if (FACET_RUNTIME.equals(event.getPropertyName())) {
- if( ! suppressBackEvents[ 0 ].booleanValue() ) {
- IRuntime runtime = (IRuntime) event.getProperty();
- setRuntimeAndDefaultFacets( runtime );
- }
- }
- }
- }
- });
-
- getFacetedProjectWorkingCopy().addListener
- (
- new IFacetedProjectListener()
- {
- public void handleEvent( final IFacetedProjectEvent event )
- {
- suppressBackEvents[ 0 ] = Boolean.TRUE;
- model.setProperty(FACET_RUNTIME, getFacetedProjectWorkingCopy().getPrimaryRuntime());
- suppressBackEvents[ 0 ] = Boolean.FALSE;
- }
- },
- IFacetedProjectEvent.Type.PRIMARY_RUNTIME_CHANGED
- );
- }
-
- protected void setRuntimeAndDefaultFacets( final IRuntime runtime )
- {
- final IFacetedProjectWorkingCopy dm = getFacetedProjectWorkingCopy();
-
- dm.setTargetedRuntimes( Collections.<IRuntime>emptySet() );
-
- if( runtime != null )
- {
- final Set<IProjectFacetVersion> minFacets = new HashSet<IProjectFacetVersion>();
-
- try
- {
- for( IProjectFacet f : dm.getFixedProjectFacets() )
- {
- minFacets.add( f.getLatestSupportedVersion( runtime ) );
- }
- }
- catch( CoreException e )
- {
- throw new RuntimeException( e );
- }
-
- dm.setProjectFacets( minFacets );
-
- dm.setTargetedRuntimes( Collections.singleton( runtime ) );
- }
-
- dm.setSelectedPreset( FacetedProjectFramework.DEFAULT_CONFIGURATION_PRESET_ID );
- }
-
- public String getProjectName() {
- return model.getStringProperty(IFacetProjectCreationDataModelProperties.FACET_PROJECT_NAME);
- }
-
- @Override
- protected void performFinish(final IProgressMonitor monitor)
-
- throws CoreException
-
- {
- monitor.beginTask("", 10); //$NON-NLS-1$
- storeDefaultSettings();
- try {
- super.performFinish(new SubProgressMonitor(monitor, 8));
-
- try {
- getFacetProjectNotificationOperation().execute(new NullProgressMonitor(), null);
- } catch (ExecutionException e) {
- String msg = e.getMessage();
- if( msg == null ) msg = ""; //$NON-NLS-1$
- final IStatus st = new Status( IStatus.ERROR, WSTWebUIPlugin.PLUGIN_ID, 0, msg, e );
- throw new CoreException( st );
- }
- } finally {
- monitor.done();
- }
- }
-
- @Override
- public boolean performFinish() {
- if (super.performFinish() == false) {
- return false;
- }
-
- try {
- postPerformFinish();
- } catch (InvocationTargetException e) {
- Logger.logException(e);
- }
-
- return true;
- }
-
- /**
- * <p>
- * Override to return the final perspective ID (if any). The final perspective ID can be
- * hardcoded by the subclass or determined programmatically (possibly using the value of a field
- * on the Wizard's WTP Operation Data Model).
- * </p>
- * <p>
- * The default implementation returns no perspective id unless overriden by product definition
- * via the "wtp.project.final.perspective" property.
- * </p>
- *
- * @return Returns the ID of the Perspective which is preferred by this wizard upon completion.
- */
-
- protected String getFinalPerspectiveID() {
- return null;
- }
-
- /**
- * {@inheritDoc}
- *
- * <p>
- * The configuration element is saved to use when the wizard completes in order to change the
- * current perspective using either (1) the value specified by {@link #getFinalPerspectiveID()}
- * or (2) the value specified by the finalPerspective attribute in the Wizard's configuration
- * element.
- * </p>
- *
- * @see org.eclipse.core.runtime.IExecutableExtension#setInitializationData(org.eclipse.core.runtime.IConfigurationElement,
- * java.lang.String, java.lang.Object)
- */
- public final void setInitializationData(IConfigurationElement aConfigurationElement, String aPropertyName, Object theData) throws CoreException {
- configurationElement = aConfigurationElement;
- doSetInitializeData(aConfigurationElement, aPropertyName, theData);
-
- }
-
- /**
- * <p>
- * Override method for clients that wish to take advantage of the information provided by
- * {@see #setInitializationData(IConfigurationElement, String, Object)}.
- * </p>
- *
- * @param aConfigurationElement
- * The configuration element provided from the templated method.
- * @param aPropertyName
- * The property name provided from the templated method.
- * @param theData
- * The data provided from the templated method.
- */
- protected void doSetInitializeData(IConfigurationElement aConfigurationElement, String aPropertyName, Object theData) {
- // Default do nothing
- }
-
- /**
- * <p>
- * Returns the an id component used for Activity filtering.
- * </p>
- *
- * <p>
- * The Plugin ID is determined from the configuration element specified in
- * {@see #setInitializationData(IConfigurationElement, String, Object)}.
- * </p>
- *
- * @return Returns the plugin id associated with this wizard
- */
- public final String getPluginId() {
- return (configurationElement != null) ? configurationElement.getDeclaringExtension().getNamespace() : ""; //$NON-NLS-1$
- }
-
- /**
- *
- * <p>
- * Invoked after the user has clicked the "Finish" button of the wizard. The default
- * implementation will attempt to update the final perspective to the value specified by
- * {@link #getFinalPerspectiveID() }
- * </p>
- *
- * @throws InvocationTargetException
- *
- * @see org.eclipse.wst.common.frameworks.internal.ui.wizard.WTPWizard#postPerformFinish()
- */
- protected void postPerformFinish() throws InvocationTargetException {
- String projName = getProjectName();
- IProject newProject = ResourcesPlugin.getWorkspace().getRoot().getProject(projName);
- IWorkbench workbench = WSTWebUIPlugin.getDefault().getWorkbench();
-
- // add to the selected working sets
- if (newProject != null &&
- beginingPages != null &&
- beginingPages.length > 0 &&
- beginingPages[0] instanceof DataModelFacetCreationWizardPage) {
- DataModelFacetCreationWizardPage mainPage = (DataModelFacetCreationWizardPage) beginingPages[0];
- IWorkingSet[] workingSets = mainPage.getSelectedWorkingSets();
- workbench.getWorkingSetManager().addToWorkingSets(newProject, workingSets);
- }
-
- // open the "final" perspective
- if (getFinalPerspectiveID() != null && getFinalPerspectiveID().length() > 0) {
- final IConfigurationElement element = new DelegateConfigurationElement(configurationElement) {
- @Override
- public String getAttribute(String aName) {
- if (aName.equals("finalPerspective")) { //$NON-NLS-1$
- return getFinalPerspectiveID();
- }
- return super.getAttribute(aName);
- }
- };
- BasicNewProjectResourceWizard.updatePerspective(element);
- } else
- BasicNewProjectResourceWizard.updatePerspective(configurationElement);
-
- // select and reveal
- BasicNewResourceWizard.selectAndReveal(newProject, workbench.getActiveWorkbenchWindow());
- }
-
- protected IDataModelOperation getFacetProjectNotificationOperation() {
- return new DataModelPausibleOperationImpl(new AbstractDataModelOperation(this.model) {
- @Override
- public String getID() {
- return NewProjectDataModelFacetWizard.class.getName();
- }
-
- @Override
- public IStatus execute(IProgressMonitor monitor, IAdaptable info) throws ExecutionException {
- return AbstractDataModelProvider.OK_STATUS;
- }
- });
- }
-
- /**
- * Need to keep the model in sync with the UI. This method will pickup changes coming from the
- * UI and push them into the model
- */
- protected void facetSelectionChangedEvent() {
- Set actions = getFacetedProjectWorkingCopy().getProjectFacetActions();
- Iterator iterator = actions.iterator();
- Set activeIds = new HashSet();
- while (iterator.hasNext()) {
- IFacetedProject.Action action = (IFacetedProject.Action) iterator.next();
- String id = action.getProjectFacetVersion().getProjectFacet().getId();
- activeIds.add(id);
- }
- // First handle all the actions tracked by IDataModels
- FacetDataModelMap dataModelMap = (FacetDataModelMap) model.getProperty(FACET_DM_MAP);
- iterator = dataModelMap.keySet().iterator();
- while (iterator.hasNext()) {
- String id = (String) iterator.next();
- IDataModel configDM = (IDataModel) dataModelMap.get(id);
- boolean active = activeIds.contains(id);
- configDM.setBooleanProperty(IFacetDataModelProperties.SHOULD_EXECUTE, active);
- activeIds.remove(id);
- }
- // Now handle the actions not tracked by IDataModels
- FacetActionMap actionMap = (FacetActionMap) model.getProperty(FACET_ACTION_MAP);
- actionMap.clear();
- iterator = actions.iterator();
- while (iterator.hasNext()) {
- IFacetedProject.Action action = (IFacetedProject.Action) iterator.next();
- String id = action.getProjectFacetVersion().getProjectFacet().getId();
- if (activeIds.contains(id)) {
- actionMap.add(action);
- }
- }
- model.notifyPropertyChange(FACET_RUNTIME, IDataModel.VALID_VALUES_CHG);
- }
-
- protected void storeDefaultSettings() {
- IWizardPage[] pages = getPages();
- for (int i = 0; i < pages.length; i++)
- storeDefaultSettings(pages[i], i);
- }
-
- /**
- * Subclasses may override if they need to do something special when storing the default
- * settings for a particular page.
- *
- * @param page
- * @param pageIndex
- */
- protected void storeDefaultSettings(IWizardPage page, int pageIndex) {
- if (page instanceof DataModelWizardPage)
- ((DataModelWizardPage) page).storeDefaultSettings();
- }
-
- @Override
- public void dispose() {
- if(this.model != null){
- this.model.dispose();
- }
- super.dispose();
- }
-
-}
diff --git a/plugins/org.eclipse.wst.web.ui/static_web_ui/org/eclipse/wst/web/ui/internal/wizards/SimpleWebFacetInstallPage.java b/plugins/org.eclipse.wst.web.ui/static_web_ui/org/eclipse/wst/web/ui/internal/wizards/SimpleWebFacetInstallPage.java
deleted file mode 100644
index f4e9286..0000000
--- a/plugins/org.eclipse.wst.web.ui/static_web_ui/org/eclipse/wst/web/ui/internal/wizards/SimpleWebFacetInstallPage.java
+++ /dev/null
@@ -1,69 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2005, 2006 IBM Corporation and others.
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
- *
- * Contributors:
- * IBM Corporation - initial API and implementation
- *******************************************************************************/
-package org.eclipse.wst.web.ui.internal.wizards;
-
-import org.eclipse.jface.dialogs.Dialog;
-import org.eclipse.swt.SWT;
-import org.eclipse.swt.layout.GridLayout;
-import org.eclipse.swt.widgets.Composite;
-import org.eclipse.swt.widgets.Control;
-import org.eclipse.swt.widgets.Label;
-import org.eclipse.swt.widgets.Text;
-import org.eclipse.wst.project.facet.ISimpleWebFacetInstallDataModelProperties;
-import org.eclipse.wst.web.internal.ResourceHandler;
-
-public class SimpleWebFacetInstallPage extends DataModelFacetInstallPage implements ISimpleWebFacetInstallDataModelProperties {
-
- private Label configFolderLabel;
- private Text configFolder;
- private Label contextRootLabel;
- private Text contextRoot;
-
- public SimpleWebFacetInstallPage() {
- super("simpleweb.facet.install.page"); //$NON-NLS-1$
- setTitle(ResourceHandler.StaticWebProjectWizardBasePage_Page_Title);
- setDescription(ResourceHandler.ConfigureSettings);
- }
-
- @Override
- protected String[] getValidationPropertyNames() {
- return new String[]{CONTEXT_ROOT, CONTENT_DIR};
- }
-
- @Override
- protected Composite createTopLevelComposite(Composite parent) {
- setInfopopID(IWstWebUIContextIds.NEW_STATIC_WEB_PROJECT_PAGE3);
- final Composite composite = new Composite(parent, SWT.NONE);
- composite.setLayout(new GridLayout(1, false));
-
- this.contextRootLabel = new Label(composite, SWT.NONE);
- this.contextRootLabel.setText(ResourceHandler.StaticContextRootComposite_Context_Root_Label);
- this.contextRootLabel.setLayoutData(gdhfill());
-
- this.contextRoot = new Text(composite, SWT.BORDER);
- this.contextRoot.setLayoutData(gdhfill());
- this.contextRoot.setData("label", this.contextRootLabel); //$NON-NLS-1$
- synchHelper.synchText(contextRoot, CONTEXT_ROOT, new Control[]{contextRootLabel});
-
- configFolderLabel = new Label(composite, SWT.NONE);
- configFolderLabel.setText(ResourceHandler.StaticWebSettingsPropertiesPage_Web_Content_Label);
- configFolderLabel.setLayoutData(gdhfill());
-
- configFolder = new Text(composite, SWT.BORDER);
- configFolder.setLayoutData(gdhfill());
- configFolder.setData("label", configFolderLabel); //$NON-NLS-1$
- synchHelper.synchText(configFolder, CONTENT_DIR, null);
- Dialog.applyDialogFont(parent);
-
- return composite;
- }
-
-}
diff --git a/plugins/org.eclipse.wst.web.ui/static_web_ui/org/eclipse/wst/web/ui/internal/wizards/SimpleWebProjectFirstPage.java b/plugins/org.eclipse.wst.web.ui/static_web_ui/org/eclipse/wst/web/ui/internal/wizards/SimpleWebProjectFirstPage.java
deleted file mode 100644
index ec05607..0000000
--- a/plugins/org.eclipse.wst.web.ui/static_web_ui/org/eclipse/wst/web/ui/internal/wizards/SimpleWebProjectFirstPage.java
+++ /dev/null
@@ -1,41 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2005, 2006 IBM Corporation and others.
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
- *
- * Contributors:
- * IBM Corporation - initial API and implementation
- *******************************************************************************/
-package org.eclipse.wst.web.ui.internal.wizards;
-
-import org.eclipse.swt.widgets.Composite;
-import org.eclipse.wst.common.componentcore.internal.util.IModuleConstants;
-import org.eclipse.wst.common.frameworks.datamodel.IDataModel;
-import org.eclipse.wst.web.internal.ResourceHandler;
-import org.eclipse.wst.web.ui.internal.WSTWebUIPlugin;
-
-public class SimpleWebProjectFirstPage extends DataModelFacetCreationWizardPage {
-
- public SimpleWebProjectFirstPage(IDataModel dataModel, String pageName) {
- super(dataModel, pageName);
- setDescription(ResourceHandler.StaticWebProjectWizardBasePage_Page_Description);
- setTitle(ResourceHandler.StaticWebProjectWizardBasePage_Page_Title);
- setImageDescriptor(WSTWebUIPlugin.getDefault().getImageDescriptor("newwprj_wiz")); //$NON-NLS-1$
- setInfopopID(IWstWebUIContextIds.NEW_STATIC_WEB_PROJECT_PAGE1);
- }
-
- @Override
- protected String getModuleTypeID() {
- return IModuleConstants.WST_WEB_MODULE;
- }
-
- @Override
- protected Composite createTopLevelComposite(Composite parent) {
- final Composite top = super.createTopLevelComposite(parent);
- createWorkingSetGroupPanel(top, new String[] { RESOURCE_WORKING_SET });
- return top;
- }
-
-}
diff --git a/plugins/org.eclipse.wst.web.ui/static_web_ui/org/eclipse/wst/web/ui/internal/wizards/SimpleWebProjectWizard.java b/plugins/org.eclipse.wst.web.ui/static_web_ui/org/eclipse/wst/web/ui/internal/wizards/SimpleWebProjectWizard.java
deleted file mode 100644
index 8749672..0000000
--- a/plugins/org.eclipse.wst.web.ui/static_web_ui/org/eclipse/wst/web/ui/internal/wizards/SimpleWebProjectWizard.java
+++ /dev/null
@@ -1,62 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2005, 2006 IBM Corporation and others.
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
- *
- * Contributors:
- * IBM Corporation - initial API and implementation
- *******************************************************************************/
-package org.eclipse.wst.web.ui.internal.wizards;
-
-import org.eclipse.jface.resource.ImageDescriptor;
-import org.eclipse.jface.wizard.IWizardPage;
-import org.eclipse.wst.common.frameworks.datamodel.DataModelFactory;
-import org.eclipse.wst.common.frameworks.datamodel.IDataModel;
-import org.eclipse.wst.common.project.facet.core.IFacetedProjectTemplate;
-import org.eclipse.wst.common.project.facet.core.ProjectFacetsManager;
-import org.eclipse.wst.project.facet.IProductConstants;
-import org.eclipse.wst.project.facet.ProductManager;
-import org.eclipse.wst.project.facet.SimpleWebFacetProjectCreationDataModelProvider;
-import org.eclipse.wst.web.internal.ResourceHandler;
-import org.eclipse.wst.web.ui.internal.WSTWebUIPlugin;
-
-public class SimpleWebProjectWizard extends NewProjectDataModelFacetWizard {
-
- public SimpleWebProjectWizard(IDataModel model) {
- super(model);
- setWindowTitle(ResourceHandler.StaticWebProjectCreationWizard_Wizard_Title);
- }
-
- public SimpleWebProjectWizard() {
- super();
- setWindowTitle(ResourceHandler.StaticWebProjectCreationWizard_Wizard_Title);
- }
-
- @Override
- protected IDataModel createDataModel() {
- return DataModelFactory.createDataModel(new SimpleWebFacetProjectCreationDataModelProvider());
- }
-
- @Override
- protected ImageDescriptor getDefaultPageImageDescriptor() {
- return WSTWebUIPlugin.getDefault().getImageDescriptor("newwprj_wiz"); //$NON-NLS-1$
- }
-
- @Override
- protected IFacetedProjectTemplate getTemplate() {
- return ProjectFacetsManager.getTemplate("template.wst.web"); //$NON-NLS-1$
- }
-
- @Override
- protected IWizardPage createFirstPage() {
- return new SimpleWebProjectFirstPage(model, "first.page"); //$NON-NLS-1$
- }
-
- @Override
- protected String getFinalPerspectiveID() {
- return ProductManager.getProperty(IProductConstants.FINAL_PERSPECTIVE_STATICWEB);
- }
-
-}
diff --git a/plugins/org.eclipse.wst.web.ui/static_web_ui/org/eclipse/wst/web/ui/internal/wizards/facetcreationpagemessages.properties b/plugins/org.eclipse.wst.web.ui/static_web_ui/org/eclipse/wst/web/ui/internal/wizards/facetcreationpagemessages.properties
deleted file mode 100644
index 08afb68..0000000
--- a/plugins/org.eclipse.wst.web.ui/static_web_ui/org/eclipse/wst/web/ui/internal/wizards/facetcreationpagemessages.properties
+++ /dev/null
@@ -1 +0,0 @@
-FACET_VERSION= &version
\ No newline at end of file
diff --git a/plugins/org.eclipse.wst.web/.classpath b/plugins/org.eclipse.wst.web/.classpath
deleted file mode 100644
index 15a90f8..0000000
--- a/plugins/org.eclipse.wst.web/.classpath
+++ /dev/null
@@ -1,8 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<classpath>
- <classpathentry kind="src" path="static_web_project"/>
- <classpathentry kind="src" path="property_files"/>
- <classpathentry kind="con" path="org.eclipse.jdt.launching.JRE_CONTAINER/org.eclipse.jdt.internal.debug.ui.launcher.StandardVMType/J2SE-1.5"/>
- <classpathentry kind="con" path="org.eclipse.pde.core.requiredPlugins"/>
- <classpathentry kind="output" path="bin"/>
-</classpath>
diff --git a/plugins/org.eclipse.wst.web/.cvsignore b/plugins/org.eclipse.wst.web/.cvsignore
deleted file mode 100644
index 590084f..0000000
--- a/plugins/org.eclipse.wst.web/.cvsignore
+++ /dev/null
@@ -1,7 +0,0 @@
-bin
-runtime
-temp.folder
-build.xml
-@dot
-src.zip
-javaCompiler...args
diff --git a/plugins/org.eclipse.wst.web/.project b/plugins/org.eclipse.wst.web/.project
deleted file mode 100644
index fb86548..0000000
--- a/plugins/org.eclipse.wst.web/.project
+++ /dev/null
@@ -1,28 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<projectDescription>
- <name>org.eclipse.wst.web</name>
- <comment></comment>
- <projects>
- </projects>
- <buildSpec>
- <buildCommand>
- <name>org.eclipse.jdt.core.javabuilder</name>
- <arguments>
- </arguments>
- </buildCommand>
- <buildCommand>
- <name>org.eclipse.pde.ManifestBuilder</name>
- <arguments>
- </arguments>
- </buildCommand>
- <buildCommand>
- <name>org.eclipse.pde.SchemaBuilder</name>
- <arguments>
- </arguments>
- </buildCommand>
- </buildSpec>
- <natures>
- <nature>org.eclipse.pde.PluginNature</nature>
- <nature>org.eclipse.jdt.core.javanature</nature>
- </natures>
-</projectDescription>
diff --git a/plugins/org.eclipse.wst.web/.settings/org.eclipse.jdt.core.prefs b/plugins/org.eclipse.wst.web/.settings/org.eclipse.jdt.core.prefs
deleted file mode 100644
index 51c2889..0000000
--- a/plugins/org.eclipse.wst.web/.settings/org.eclipse.jdt.core.prefs
+++ /dev/null
@@ -1,97 +0,0 @@
-#Tue Sep 29 10:42:06 EDT 2009
-org.eclipse.jdt.core.compiler.problem.unusedParameterWhenImplementingAbstract=disabled
-org.eclipse.jdt.core.compiler.problem.comparingIdentical=error
-org.eclipse.jdt.core.compiler.problem.unnecessaryElse=error
-org.eclipse.jdt.core.compiler.problem.redundantSuperinterface=error
-org.eclipse.jdt.core.compiler.problem.unusedLocal=error
-org.eclipse.jdt.core.compiler.problem.emptyStatement=error
-org.eclipse.jdt.core.compiler.problem.unusedLabel=error
-org.eclipse.jdt.core.compiler.problem.unusedParameter=warning
-org.eclipse.jdt.core.compiler.problem.rawTypeReference=warning
-org.eclipse.jdt.core.incompatibleJDKLevel=ignore
-org.eclipse.jdt.core.compiler.problem.incompatibleNonInheritedInterfaceMethod=error
-org.eclipse.jdt.core.compiler.debug.lineNumber=generate
-org.eclipse.jdt.core.compiler.problem.unusedDeclaredThrownException=warning
-org.eclipse.jdt.core.builder.cleanOutputFolder=clean
-org.eclipse.jdt.core.compiler.problem.unusedWarningToken=warning
-org.eclipse.jdt.core.compiler.problem.noImplicitStringConversion=error
-org.eclipse.jdt.core.compiler.problem.deprecationInDeprecatedCode=enabled
-org.eclipse.jdt.core.compiler.problem.deprecation=warning
-org.eclipse.jdt.core.compiler.problem.unusedParameterWhenOverridingConcrete=disabled
-org.eclipse.jdt.core.compiler.problem.missingSynchronizedOnInheritedMethod=error
-org.eclipse.jdt.core.compiler.problem.deprecationWhenOverridingDeprecatedMethod=enabled
-org.eclipse.jdt.core.codeComplete.staticFinalFieldPrefixes=
-org.eclipse.jdt.core.compiler.problem.redundantNullCheck=error
-org.eclipse.jdt.core.compiler.problem.unusedImport=error
-org.eclipse.jdt.core.builder.recreateModifiedClassFileInOutputFolder=ignore
-org.eclipse.jdt.core.builder.resourceCopyExclusionFilter=*.launch
-org.eclipse.jdt.core.classpath.multipleOutputLocations=enabled
-org.eclipse.jdt.core.compiler.problem.suppressWarnings=enabled
-org.eclipse.jdt.core.compiler.problem.typeParameterHiding=error
-org.eclipse.jdt.core.builder.invalidClasspath=abort
-org.eclipse.jdt.core.compiler.problem.localVariableHiding=warning
-org.eclipse.jdt.core.compiler.problem.possibleAccidentalBooleanAssignment=error
-org.eclipse.jdt.core.compiler.problem.missingHashCodeMethod=error
-org.eclipse.jdt.core.codeComplete.staticFinalFieldSuffixes=
-org.eclipse.jdt.core.codeComplete.argumentSuffixes=
-org.eclipse.jdt.core.codeComplete.argumentPrefixes=
-org.eclipse.jdt.core.compiler.problem.indirectStaticAccess=ignore
-org.eclipse.jdt.core.compiler.problem.potentialNullReference=error
-org.eclipse.jdt.core.compiler.codegen.inlineJsrBytecode=enabled
-org.eclipse.jdt.core.compiler.problem.finalParameterBound=warning
-org.eclipse.jdt.core.compiler.problem.missingSerialVersion=error
-org.eclipse.jdt.core.compiler.problem.nullReference=error
-org.eclipse.jdt.core.compiler.source=1.5
-org.eclipse.jdt.core.compiler.problem.enumIdentifier=error
-org.eclipse.jdt.core.compiler.problem.syntheticAccessEmulation=ignore
-org.eclipse.jdt.core.builder.duplicateResourceTask=warning
-org.eclipse.jdt.core.compiler.problem.fieldHiding=error
-org.eclipse.jdt.core.compiler.problem.unusedDeclaredThrownExceptionExemptExceptionAndThrowable=enabled
-org.eclipse.jdt.core.compiler.problem.missingOverrideAnnotation=error
-org.eclipse.jdt.core.compiler.problem.hiddenCatchBlock=error
-org.eclipse.jdt.core.compiler.problem.overridingPackageDefaultMethod=error
-org.eclipse.jdt.core.compiler.problem.finallyBlockNotCompletingNormally=error
-org.eclipse.jdt.core.compiler.problem.undocumentedEmptyBlock=warning
-org.eclipse.jdt.core.classpath.exclusionPatterns=enabled
-org.eclipse.jdt.core.compiler.problem.methodWithConstructorName=error
-org.eclipse.jdt.core.compiler.problem.discouragedReference=warning
-org.eclipse.jdt.core.compiler.problem.unqualifiedFieldAccess=ignore
-org.eclipse.jdt.core.compiler.problem.incompleteEnumSwitch=error
-eclipse.preferences.version=1
-org.eclipse.jdt.core.incompleteClasspath=error
-org.eclipse.jdt.core.compiler.problem.unnecessaryTypeCheck=error
-org.eclipse.jdt.core.compiler.problem.deadCode=error
-org.eclipse.jdt.core.compiler.problem.specialParameterHidingField=enabled
-org.eclipse.jdt.core.compiler.problem.fatalOptionalError=enabled
-org.eclipse.jdt.core.compiler.problem.noEffectAssignment=error
-org.eclipse.jdt.core.compiler.debug.sourceFile=generate
-org.eclipse.jdt.core.compiler.problem.unusedDeclaredThrownExceptionIncludeUncheckedExceptions=disabled
-org.eclipse.jdt.core.compiler.problem.missingDeprecatedAnnotation=warning
-org.eclipse.jdt.core.codeComplete.fieldPrefixes=
-org.eclipse.jdt.core.compiler.problem.fallthroughCase=error
-org.eclipse.jdt.core.compiler.codegen.targetPlatform=1.5
-org.eclipse.jdt.core.compiler.problem.unusedPrivateMember=error
-org.eclipse.jdt.core.compiler.problem.autoboxing=warning
-org.eclipse.jdt.core.circularClasspath=error
-org.eclipse.jdt.core.compiler.problem.annotationSuperInterface=warning
-org.eclipse.jdt.core.compiler.problem.nonExternalizedStringLiteral=error
-org.eclipse.jdt.core.codeComplete.fieldSuffixes=
-org.eclipse.jdt.core.codeComplete.localSuffixes=
-org.eclipse.jdt.core.compiler.problem.parameterAssignment=error
-org.eclipse.jdt.core.compiler.problem.staticAccessReceiver=error
-org.eclipse.jdt.core.codeComplete.localPrefixes=
-org.eclipse.jdt.core.compiler.problem.unusedDeclaredThrownExceptionIncludeDocCommentReference=enabled
-org.eclipse.jdt.core.compiler.maxProblemPerUnit=100
-org.eclipse.jdt.core.compiler.problem.varargsArgumentNeedCast=error
-org.eclipse.jdt.core.compiler.problem.assertIdentifier=error
-org.eclipse.jdt.core.compiler.compliance=1.5
-org.eclipse.jdt.core.compiler.problem.unusedParameterIncludeDocCommentReference=enabled
-org.eclipse.jdt.core.codeComplete.staticFieldPrefixes=
-org.eclipse.jdt.core.compiler.debug.localVariable=generate
-org.eclipse.jdt.core.compiler.problem.unhandledWarningToken=warning
-instance/org.eclipse.core.net/org.eclipse.core.net.hasMigrated=true
-org.eclipse.jdt.core.compiler.problem.forbiddenReference=error
-org.eclipse.jdt.core.compiler.codegen.unusedLocal=preserve
-org.eclipse.jdt.core.compiler.problem.uncheckedTypeOperation=warning
-org.eclipse.jdt.core.compiler.problem.unusedDeclaredThrownExceptionWhenOverriding=disabled
-org.eclipse.jdt.core.codeComplete.staticFieldSuffixes=
diff --git a/plugins/org.eclipse.wst.web/.settings/org.eclipse.jdt.ui.prefs b/plugins/org.eclipse.wst.web/.settings/org.eclipse.jdt.ui.prefs
deleted file mode 100644
index 9602203..0000000
--- a/plugins/org.eclipse.wst.web/.settings/org.eclipse.jdt.ui.prefs
+++ /dev/null
@@ -1,6 +0,0 @@
-#Tue Sep 29 10:42:06 EDT 2009
-org.eclipse.jdt.ui.exception.name=e
-eclipse.preferences.version=1
-org.eclipse.jdt.ui.keywordthis=false
-org.eclipse.jdt.ui.overrideannotation=true
-org.eclipse.jdt.ui.gettersetter.use.is=true
diff --git a/plugins/org.eclipse.wst.web/META-INF/MANIFEST.MF b/plugins/org.eclipse.wst.web/META-INF/MANIFEST.MF
deleted file mode 100644
index f36558a..0000000
--- a/plugins/org.eclipse.wst.web/META-INF/MANIFEST.MF
+++ /dev/null
@@ -1,29 +0,0 @@
-Manifest-Version: 1.0
-Bundle-ManifestVersion: 2
-Bundle-Name: %Bundle-Name.0
-Bundle-SymbolicName: org.eclipse.wst.web; singleton:=true
-Bundle-Version: 1.1.402.qualifier
-Bundle-Activator: org.eclipse.wst.web.internal.WSTWebPlugin
-Bundle-Vendor: %Bundle-Vendor.0
-Bundle-Localization: plugin
-Export-Package: org.eclipse.wst.project.facet,
- org.eclipse.wst.web.internal;x-internal:=true,
- org.eclipse.wst.web.internal.deployables;x-internal:=true,
- org.eclipse.wst.web.internal.facet,
- org.eclipse.wst.web.internal.operation;x-internal:=true
-Require-Bundle: org.eclipse.core.resources;bundle-version="[3.2.0,4.0.0)",
- org.eclipse.core.runtime;bundle-version="[3.2.0,4.0.0)",
- org.eclipse.wst.common.frameworks;bundle-version="[1.2.0,2.0.0)",
- org.eclipse.core.runtime;bundle-version="[3.2.0,4.0.0)",
- org.eclipse.core.commands;bundle-version="[3.2.0,4.0.0)",
- org.eclipse.wst.validation;bundle-version="[1.2.0,2.0.0)",
- org.eclipse.wst.common.emfworkbench.integration;bundle-version="[1.2.0,2.0.0)",
- org.eclipse.wst.server.core;bundle-version="[1.0.102,2.0.0)",
- org.eclipse.jem.util;bundle-version="[2.0.0,3.0.0)",
- org.eclipse.wst.common.modulecore;bundle-version="[1.2.0,2.0.0)",
- org.eclipse.emf.ecore;bundle-version="[2.2.0,3.0.0)",
- org.eclipse.wst.common.project.facet.core;bundle-version="[1.1.0,2.0.0)",
- com.ibm.icu;bundle-version="3.8.1",
- org.eclipse.wst.common.environment;bundle-version="[1.0.100,1.1.0)"
-Eclipse-LazyStart: true
-Bundle-RequiredExecutionEnvironment: J2SE-1.5
diff --git a/plugins/org.eclipse.wst.web/about.html b/plugins/org.eclipse.wst.web/about.html
deleted file mode 100644
index 2199df3..0000000
--- a/plugins/org.eclipse.wst.web/about.html
+++ /dev/null
@@ -1,34 +0,0 @@
-<!DOCTYPE HTML PUBLIC "-//W3C//DTD HTML 4.0//EN">
-<HTML>
-
-<head>
-<title>About</title>
-<meta http-equiv=Content-Type content="text/html; charset=ISO-8859-1">
-</head>
-
-<BODY lang="EN-US">
-
-<H3>About This Content</H3>
-
-<P>June, 2008</P>
-
-<H3>License</H3>
-
-<P>The Eclipse Foundation makes available all content in this plug-in
-("Content"). Unless otherwise indicated below, the Content is provided to you
-under the terms and conditions of the Eclipse Public License Version 1.0
-("EPL"). A copy of the EPL is available at
-<A href="http://www.eclipse.org/org/documents/epl-v10.php">http://www.eclipse.org/org/documents/epl-v10.php</A>.
-For purposes of the EPL, "Program" will mean the Content.</P>
-
-<P>If you did not receive this Content directly from the Eclipse Foundation, the
-Content is being redistributed by another party ("Redistributor") and different
-terms and conditions may apply to your use of any object code in the Content.
-Check the Redistributors license that was provided with the Content. If no such
-license exists, contact the Redistributor. Unless otherwise indicated below, the
-terms and conditions of the EPL still apply to any source code in the Content
-and such source code may be obtained at
-<A href="http://www.eclipse.org/">http://www.eclipse.org/</A>.</P>
-
-</BODY>
-</HTML>
diff --git a/plugins/org.eclipse.wst.web/build.properties b/plugins/org.eclipse.wst.web/build.properties
deleted file mode 100644
index 182b94a..0000000
--- a/plugins/org.eclipse.wst.web/build.properties
+++ /dev/null
@@ -1,11 +0,0 @@
-bin.includes = plugin.xml,\
- plugin.properties,\
- icons/,\
- META-INF/,\
- about.html,\
- .
-jars.compile.order = .
-src.includes = component.xml
-output.. = bin/
-source.. = static_web_project/,\
- property_files/
diff --git a/plugins/org.eclipse.wst.web/component.xml b/plugins/org.eclipse.wst.web/component.xml
deleted file mode 100644
index 89207cb..0000000
--- a/plugins/org.eclipse.wst.web/component.xml
+++ /dev/null
@@ -1 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?><component xmlns="http://eclipse.org/wtp/releng/tools/component-model" name="org.eclipse.wst.web"><component-depends unrestricted="true"></component-depends><plugin id="org.eclipse.wst.web" fragment="false"/><plugin id="org.eclipse.wst.web.ui" fragment="false"/></component>
\ No newline at end of file
diff --git a/plugins/org.eclipse.wst.web/icons/full/obj16/web_application.gif b/plugins/org.eclipse.wst.web/icons/full/obj16/web_application.gif
deleted file mode 100644
index 09f609d..0000000
--- a/plugins/org.eclipse.wst.web/icons/full/obj16/web_application.gif
+++ /dev/null
Binary files differ
diff --git a/plugins/org.eclipse.wst.web/icons/full/obj16/webstatic_deploy.gif b/plugins/org.eclipse.wst.web/icons/full/obj16/webstatic_deploy.gif
deleted file mode 100644
index 80531e3..0000000
--- a/plugins/org.eclipse.wst.web/icons/full/obj16/webstatic_deploy.gif
+++ /dev/null
Binary files differ
diff --git a/plugins/org.eclipse.wst.web/icons/full/wizban/newwprj_wiz.png b/plugins/org.eclipse.wst.web/icons/full/wizban/newwprj_wiz.png
deleted file mode 100644
index 1edd090..0000000
--- a/plugins/org.eclipse.wst.web/icons/full/wizban/newwprj_wiz.png
+++ /dev/null
Binary files differ
diff --git a/plugins/org.eclipse.wst.web/plugin.properties b/plugins/org.eclipse.wst.web/plugin.properties
deleted file mode 100644
index d686a74..0000000
--- a/plugins/org.eclipse.wst.web/plugin.properties
+++ /dev/null
@@ -1,11 +0,0 @@
-#########################################
-# (c) Copyright IBM Corp. 2000, 2001.
-# All Rights Reserved.
-#########################################
-
-Bundle-Vendor.0 = Eclipse Web Tools Platform
-Bundle-Name.0 = Simple Web Plug-in
-
-SIMPLE_WEB_LABEL=Static Web Module
-SIMPLE_WEB_DESCRIPTION=Enables the project to be deployed as a static web module.
-SIMPLE_WEB_TEMPLATE=Static Web Project
\ No newline at end of file
diff --git a/plugins/org.eclipse.wst.web/plugin.xml b/plugins/org.eclipse.wst.web/plugin.xml
deleted file mode 100644
index 0fd8b4d..0000000
--- a/plugins/org.eclipse.wst.web/plugin.xml
+++ /dev/null
@@ -1,98 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<?eclipse version="3.0"?>
-<plugin>
- <extension-point id="runtimePresetMappings" name="Runtime Preset Mappings Extension" schema="schema/runtimePresetMappings.exsd"/>
- <extension
- point="org.eclipse.wst.server.core.moduleFactories">
- <moduleFactory
- projects="true"
- class="org.eclipse.wst.web.internal.deployables.StaticWebDeployableFactory"
- id="org.eclipse.wst.web.internal.deployables.static">
- <moduleType
- versions="1.0, 1.2, 1.3, 1.4"
- types="wst.web">
- </moduleType>
- </moduleFactory>
- </extension>
-
- <extension
- point="org.eclipse.wst.server.core.moduleArtifactAdapters">
- <moduleArtifactAdapter
- id="org.eclipse.jst.web.server.webstatic1"
- class="org.eclipse.wst.web.internal.deployables.StaticWebDeployableObjectAdapter">
- <enablement>
- <with variable="selection">
- <adapt type="org.eclipse.core.resources.IProject">
- <test forcePluginActivation="true"
- property="org.eclipse.wst.common.project.facet.core.projectFacet"
- value="wst.web" />
- </adapt>
- </with>
- </enablement>
- </moduleArtifactAdapter>
- <moduleArtifactAdapter
- id="org.eclipse.jst.web.server.webstatic2"
- class="org.eclipse.wst.web.internal.deployables.StaticWebDeployableObjectAdapter">
- <enablement>
- <with variable="selection">
- <adapt type="org.eclipse.core.resources.IFile">
- <test forcePluginActivation="true"
- property="org.eclipse.wst.common.project.facet.core.projectFacet"
- value="wst.web" />
- </adapt>
- </with>
- </enablement>
- </moduleArtifactAdapter>
- </extension>
- <extension point="org.eclipse.core.runtime.adapters">
- <factory
- class="org.eclipse.wst.web.internal.deployables.StaticWebDeployableObjectAdapter"
- adaptableType="org.eclipse.core.resources.IProject">
- <adapter type="org.eclipse.wst.web.internal.deployables.IStaticWebModuleArtifact"/>
- </factory>
- </extension>
-
- <!--============================-->
- <!-- Builder Provider registrations-->
- <!--============================-->
- <extension
- point="org.eclipse.wst.common.frameworks.DataModelProviderExtension">
- <ProviderDefinesType
- providerType="wst.web.builder"
- providerID="org.eclipse.wst.common.componentcore.internal.builder.WorkbenchComponentBuilderDataModelProvider"/>
- <DataModelProvider
- class="org.eclipse.wst.web.internal.operation.SimpleWebModuleCreationDataModelProvider"
- id="org.eclipse.wst.web.internal.operation.SimpleWebModuleCreationDataModelProvider"/>
- </extension>
-
- <!-- Project Facets -->
- <extension point="org.eclipse.wst.common.project.facet.core.facets">
-
- <project-facet id="wst.web">
- <label>%SIMPLE_WEB_LABEL</label>
- <description>%SIMPLE_WEB_DESCRIPTION</description>
- <property name="hide.version" value="true"/>
- </project-facet>
-
- <project-facet-version facet="wst.web" version="1.0">
- <action type="install" id="wst.web.install">
- <delegate class="org.eclipse.wst.project.facet.SimpleWebFacetInstallDelegate"/>
- <config-factory class="org.eclipse.wst.project.facet.SimpleWebFacetInstallDataModelProvider"/>
- </action>
- <action type="uninstall" id="wst.web.uninstall">
- <delegate class="org.eclipse.wst.project.facet.SimpleWebFacetUninstallDelegate"/>
- <config-factory class="org.eclipse.wst.project.facet.SimpleWebFacetInstallDataModelProvider"/>
- </action>
- <constraint>
- <conflicts group="modules"/>
- </constraint>
- <group-member id="modules"/>
- </project-facet-version>
-
- <template id="template.wst.web">
- <label>%SIMPLE_WEB_TEMPLATE</label>
- <fixed facet="wst.web"/>
- </template>
-
- </extension>
-</plugin>
diff --git a/plugins/org.eclipse.wst.web/property_files/staticwebproject.properties b/plugins/org.eclipse.wst.web/property_files/staticwebproject.properties
deleted file mode 100644
index c3c3687..0000000
--- a/plugins/org.eclipse.wst.web/property_files/staticwebproject.properties
+++ /dev/null
@@ -1,23 +0,0 @@
-###############################################################################
-# Copyright (c) 2005, 2006 IBM Corporation and others.
-# All rights reserved. This program and the accompanying materials
-# are made available under the terms of the Eclipse Public License v1.0
-# which accompanies this distribution, and is available at
-# http://www.eclipse.org/legal/epl-v10.html
-#
-# Contributors:
-# IBM Corporation - initial API and implementation
-###############################################################################
-StaticWebProjectCreationWizard_Wizard_Title=New Static Web Project
-StaticWebProjectWizardBasePage_Page_Description=Create a Web project for simple content (HTML files) only.
-StaticWebSettingsPropertiesPage_Web_Content_Label=&Web content folder name:
-StaticContextRootComposite_Context_Root_Label=&Context root:
-StaticWebProjectWizardBasePage_Page_Title=Static Web Project
-StaticWebSettingsPropertiesPage_Not_available_for_closed_projects=Web settings are not available for a closed project.
-TargetRuntime=Target r&untime
-NewDotDotDot=N&ew...
-InvalidServerTarget=Invalid target server selected.
-ConfigureSettings=Configure Static Web module settings.
-Context_Root_cannot_be_empty_2=Context root cannot be empty
-Names_cannot_contain_whitespace=Context root cannot contain whitespace
-The_character_is_invalid_in_a_context_root=The character ''{0}'' is invalid in a context root.
\ No newline at end of file
diff --git a/plugins/org.eclipse.wst.web/schema/runtimePresetMappings.exsd b/plugins/org.eclipse.wst.web/schema/runtimePresetMappings.exsd
deleted file mode 100644
index 3d27116..0000000
--- a/plugins/org.eclipse.wst.web/schema/runtimePresetMappings.exsd
+++ /dev/null
@@ -1,141 +0,0 @@
-<?xml version='1.0' encoding='UTF-8'?>
-<!-- Schema file written by PDE -->
-<schema targetNamespace="org.eclipse.wst.web" xmlns="http://www.w3.org/2001/XMLSchema">
-<annotation>
- <appinfo>
- <meta.schema plugin="org.eclipse.wst.web" id="RuntimePresetMappings" name="Runtime Preset Mappings Extension"/>
- </appinfo>
- <documentation>
- This extension point allows the configuration of a default facet preset for any Runtime Type ID, Facet ID & Fact Version combination. For example, given runtime type X, facet jst.web, and version 2.4, the preset Y should be selected by default where as given runtime type X, facet jst.web, and version 2.5, the preset Z should be selected by default.
-
-For each of the four facetRuntimeTypeID, facetRuntimeVersion, facetID, facetVersion the following pattern is used to ease the definition process. The pattern specified allows a comma deliminated list of possible values. For example to match only "1.0" the pattern should be "1.0". To match multiple values, say 1.0, 2.0, and 3.0, use "1.0,2.0,3.0". Asterests may be used to specify multiple values. For example, "1.*" will match any values starting with '1.' including 1., 1.0, 1.1, 1.2, but not 1 Likewise, "*.0" will match any values ending with '.0' including 1.0, 2.0, 3.0, but not 1 or 0 Asterists may be added both at the begining and end of a string, so "*00*" will match any string that contains '00' such as 00, 100, 1001.
- </documentation>
- </annotation>
-
- <element name="extension">
- <annotation>
- <appinfo>
- <meta.element />
- </appinfo>
- </annotation>
- <complexType>
- <sequence minOccurs="1" maxOccurs="unbounded">
- <element ref="mapping" minOccurs="1" maxOccurs="unbounded"/>
- </sequence>
- <attribute name="point" type="string" use="required">
- <annotation>
- <documentation>
-
- </documentation>
- </annotation>
- </attribute>
- <attribute name="id" type="string">
- <annotation>
- <documentation>
-
- </documentation>
- </annotation>
- </attribute>
- <attribute name="name" type="string">
- <annotation>
- <documentation>
-
- </documentation>
- <appinfo>
- <meta.attribute translatable="true"/>
- </appinfo>
- </annotation>
- </attribute>
- </complexType>
- </element>
-
- <element name="mapping">
- <annotation>
- <documentation>
- Each mapping element defineds a mapping from (runtimeid, facetid, facetversion) to presetid.
- </documentation>
- </annotation>
- <complexType>
- <attribute name="id" type="string" use="required">
- <annotation>
- <documentation>
-
- </documentation>
- </annotation>
- </attribute>
- <attribute name="facetRuntimeTypeID" type="string" use="required">
- <annotation>
- <documentation>
- Follows the pattern outlined in the overview
- </documentation>
- </annotation>
- </attribute>
- <attribute name="facetRuntimeVersion" type="string" use="required">
- <annotation>
- <documentation>
- Follows the pattern outlined in the overview
- </documentation>
- </annotation>
- </attribute>
- <attribute name="facetID" type="string" use="required">
- <annotation>
- <documentation>
- Follows the pattern outlined in the overview
- </documentation>
- </annotation>
- </attribute>
- <attribute name="facetVersion" type="string" use="required">
- <annotation>
- <documentation>
- Follows the pattern outlined in the overview
- </documentation>
- </annotation>
- </attribute>
- <attribute name="presetID" type="string" use="required">
- <annotation>
- <documentation>
-
- </documentation>
- </annotation>
- </attribute>
- </complexType>
- </element>
-
- <annotation>
- <appinfo>
- <meta.section type="since"/>
- </appinfo>
- <documentation>
- [Enter the first release in which this extension point appears.]
- </documentation>
- </annotation>
-
- <annotation>
- <appinfo>
- <meta.section type="examples"/>
- </appinfo>
- <documentation>
- [Enter extension point usage example here.]
- </documentation>
- </annotation>
-
- <annotation>
- <appinfo>
- <meta.section type="apiinfo"/>
- </appinfo>
- <documentation>
- [Enter API information here.]
- </documentation>
- </annotation>
-
- <annotation>
- <appinfo>
- <meta.section type="implementation"/>
- </appinfo>
- <documentation>
- [Enter information about supplied implementation of this extension point.]
- </documentation>
- </annotation>
-
-
-</schema>
diff --git a/plugins/org.eclipse.wst.web/static_web_project/org/eclipse/wst/project/facet/IProductConstants.java b/plugins/org.eclipse.wst.web/static_web_project/org/eclipse/wst/project/facet/IProductConstants.java
deleted file mode 100644
index ce8ed4c..0000000
--- a/plugins/org.eclipse.wst.web/static_web_project/org/eclipse/wst/project/facet/IProductConstants.java
+++ /dev/null
@@ -1,71 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2005, 2006 IBM Corporation and others.
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
- *
- * Contributors:
- * IBM Corporation - initial API and implementation
- *******************************************************************************/
-package org.eclipse.wst.project.facet;
-
-/**
- * These constants define the set of properties that this pluging expects to
- * be available via <code>IProduct.getProperty(String)</code>. The status of
- * this interface and the facilities offered is highly provisional.
- * Productization support will be reviewed and possibly modified in future
- * releases.
- *
- * @see org.eclipse.core.runtime.IProduct#getProperty(String)
- */
-
-public interface IProductConstants {
-
- public static final String APPLICATION_CONTENT_FOLDER = "earContent"; //$NON-NLS-1$
- public static final String WEB_CONTENT_FOLDER = "webContent"; //$NON-NLS-1$
- public static final String EJB_CONTENT_FOLDER = "ejbContent"; //$NON-NLS-1$
- public static final String APP_CLIENT_CONTENT_FOLDER = "appClientContent"; //$NON-NLS-1$
- public static final String JCA_CONTENT_FOLDER = "jcaContent"; //$NON-NLS-1$
- public static final String DEFAULT_SOURCE_FOLDER = "defaultSource"; //$NON-NLS-1$
- public static final String ADD_TO_EAR_BY_DEFAULT = "addToEarByDefault"; //$NON-NLS-1$
- public static final String OUTPUT_FOLDER = "outputFolder"; //$NON-NLS-1$
- public static final String USE_SINGLE_ROOT_STRUCTURE = "useSingleRootStructure"; //$NON-NLS-1$
- public static final String ID_PERSPECTIVE_HIERARCHY_VIEW = "idPerspectiveHierarchyView"; //$NON-NLS-1$
- public static final String SHOW_JAVA_EE_MODULE_DEPENDENCY_PAGE = "showJavaEEModuleDependencyPage"; //$NON-NLS-1$
- public static final String DYNAMIC_WEB_GENERATE_DD = "dynamic_web_generate_dd"; //$NON-NLS-1$
- public static final String EE6_CONNECTOR_GENERATE_DD = "ee6_connector_generate_dd"; //$NON-NLS-1$
-
- /**
- * @deprecated Do not use. The ALLOW_CLASSPATH_DEP preference has been deprecated and its ability to disable dynamic manifest updates will soon be removed.
- */
- public static final String ALLOW_CLASSPATH_DEP = "allowClasspathDep"; //$NON-NLS-1$
- public static final String VALIDATE_DUPLICATE_CLASSPATH_COMPONENT_URI = "validateDupClasspathCompURI"; //$NON-NLS-1$
-
- public static final String DYN_WEB_OUTPUT_FOLDER = "dynWebOutput"; //$NON-NLS-1$
- public static final String EJB_OUTPUT_FOLDER = "ejbOutput"; //$NON-NLS-1$
- public static final String APP_CLIENT_OUTPUT_FOLDER = "appClientOutput"; //$NON-NLS-1$
- public static final String JCA_OUTPUT_FOLDER = "jcaOutput"; //$NON-NLS-1$
- public static final String UTILITY_OUTPUT_FOLDER ="utilOutput"; //$NON-NLS-1$
-
- /**
- * Alters the final perspective used by the following new project wizards
- */
- public static final String FINAL_PERSPECTIVE_WEB = "finalPerspectiveWeb"; //$NON-NLS-1$
- public static final String FINAL_PERSPECTIVE_EJB = "finalPerspectiveEjb"; //$NON-NLS-1$
- public static final String FINAL_PERSPECTIVE_EAR = "finalPerspectiveEar"; //$NON-NLS-1$
- public static final String FINAL_PERSPECTIVE_APPCLIENT = "finalPerspectiveAppClient"; //$NON-NLS-1$
- public static final String FINAL_PERSPECTIVE_JCA = "finalPerspectiveJca"; //$NON-NLS-1$
- public static final String FINAL_PERSPECTIVE_UTILITY = "finalPerspectiveUtility"; //$NON-NLS-1$
- public static final String FINAL_PERSPECTIVE_STATICWEB = "finalPerspectiveStaticWeb"; //$NON-NLS-1$
- public static final String FINAL_PERSPECTIVE_WEBFRAGMENT = "finalPerspectiveWebFragment"; //$NON-NLS-1$
-
- /**
- * Ability to default initial runtimes chosen in wizards
- */
- public static final String DEFAULT_RUNTIME_1 = "defaultRuntime1"; //$NON-NLS-1$
- public static final String DEFAULT_RUNTIME_2 = "defaultRuntime2"; //$NON-NLS-1$
- public static final String DEFAULT_RUNTIME_3 = "defaultRuntime3"; //$NON-NLS-1$
- public static final String VIEWER_SYNC_FOR_WEBSERVICES = "viewerSyncForWebservices"; //$NON-NLS-1$
-
-}
diff --git a/plugins/org.eclipse.wst.web/static_web_project/org/eclipse/wst/project/facet/ISimpleWebFacetInstallDataModelProperties.java b/plugins/org.eclipse.wst.web/static_web_project/org/eclipse/wst/project/facet/ISimpleWebFacetInstallDataModelProperties.java
deleted file mode 100644
index 2f3263e..0000000
--- a/plugins/org.eclipse.wst.web/static_web_project/org/eclipse/wst/project/facet/ISimpleWebFacetInstallDataModelProperties.java
+++ /dev/null
@@ -1,24 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2005, 2007 IBM Corporation and others.
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
- *
- * Contributors:
- * IBM Corporation - initial API and implementation
- *******************************************************************************/
-package org.eclipse.wst.project.facet;
-
-import org.eclipse.wst.common.frameworks.datamodel.IDataModelProperties;
-
-public interface ISimpleWebFacetInstallDataModelProperties extends IDataModelProperties {
- /**
- * This field should not be used. It is not part of the API and may be modified in the future.
- */
- public static Class _provider_class = SimpleWebFacetProjectCreationDataModelProvider.class;
-
- public static final String CONTENT_DIR = "IStaticWebFacetInstallDataModelProperties.CONTENT_DIR"; //$NON-NLS-1$
-
- public static final String CONTEXT_ROOT = "IStaticWebFacetInstallDataModelProperties.CONTEXT_ROOT"; //$NON-NLS-1$
-}
diff --git a/plugins/org.eclipse.wst.web/static_web_project/org/eclipse/wst/project/facet/ProductManager.java b/plugins/org.eclipse.wst.web/static_web_project/org/eclipse/wst/project/facet/ProductManager.java
deleted file mode 100644
index ec33c77..0000000
--- a/plugins/org.eclipse.wst.web/static_web_project/org/eclipse/wst/project/facet/ProductManager.java
+++ /dev/null
@@ -1,181 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2005, 2006 IBM Corporation and others.
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
- *
- * Contributors:
- * IBM Corporation - initial API and implementation
- *******************************************************************************/
-package org.eclipse.wst.project.facet;
-
-import java.util.ArrayList;
-import java.util.Collections;
-import java.util.Iterator;
-import java.util.List;
-import java.util.Set;
-
-import org.eclipse.core.runtime.Platform;
-import org.eclipse.wst.common.project.facet.core.runtime.IRuntime;
-import org.eclipse.wst.common.project.facet.core.runtime.IRuntimeComponent;
-import org.eclipse.wst.common.project.facet.core.runtime.RuntimeManager;
-import org.eclipse.wst.web.internal.WSTWebPlugin;
-
-public class ProductManager {
-
- /**
- * Default values for WTP level product
- */
- private static final String APPLICATION_CONTENT_FOLDER = "EarContent"; //$NON-NLS-1$
- private static final String WEB_CONTENT_FOLDER = "WebContent"; //$NON-NLS-1$
- private static final String EJB_CONTENT_FOLDER = "ejbModule"; //$NON-NLS-1$
- private static final String APP_CLIENT_CONTENT_FOLDER = "appClientModule"; //$NON-NLS-1$
- private static final String JCA_CONTENT_FOLDER = "connectorModule"; //$NON-NLS-1$
- private static final String DEFAULT_SOURCE_FOLDER = "src"; //$NON-NLS-1$
- private static final String ADD_TO_EAR_BY_DEFAULT = "false"; //$NON-NLS-1$
- private static final String OUTPUT_FOLDER = "build/classes"; //$NON-NLS-1$
- private static final String USE_SINGLE_ROOT_STRUCTURE = "false"; //$NON-NLS-1$
- private static final String VIEWER_SYNC_FOR_WEBSERVICES = "true"; //$NON-NLS-1$
- private static final String ID_PERSPECTIVE_HIERARCHY_VIEW = "org.eclipse.ui.navigator.ProjectExplorer"; //$NON-NLS-1$
- private static final String SHOW_JAVA_EE_MODULE_DEPENDENCY_PAGE = "true"; //$NON-NLS-1$
- private static final String FINAL_PERSPECTIVE = "org.eclipse.jst.j2ee.J2EEPerspective"; //$NON-NLS-1$
- private static final String FINAL_WEB_PERSPECTIVE = "org.eclipse.wst.web.ui.webDevPerspective"; //$NON-NLS-1$
- private static final String DYNAMIC_WEB_GENERATE_DD = "true"; //$NON-NLS-1$
- private static final char RUNTIME_SEPARATOR = ':';
- private static final String[] DEFAULT_RUNTIME_KEYS =
- new String[]{IProductConstants.DEFAULT_RUNTIME_1,
- IProductConstants.DEFAULT_RUNTIME_2,
- IProductConstants.DEFAULT_RUNTIME_3};
-
- /**
- * Return the value for the associated key from the Platform Product registry or return the
- * WTP default for the J2EE cases.
- *
- * @param key
- * @return String value of product's property
- */
- public static String getProperty(String key) {
- if (key == null)
- return null;
- String value = null;
- if (Platform.getProduct()!=null)
- value = Platform.getProduct().getProperty(key);
- if (value == null)
- {
- value = Platform.getPreferencesService().getString(WSTWebPlugin.PLUGIN_ID, key, null, null);
- }
- if (value == null) {
- if (key.equals(IProductConstants.APPLICATION_CONTENT_FOLDER))
- return APPLICATION_CONTENT_FOLDER;
- else if (key.equals(IProductConstants.WEB_CONTENT_FOLDER))
- return WEB_CONTENT_FOLDER;
- else if (key.equals(IProductConstants.EJB_CONTENT_FOLDER))
- return EJB_CONTENT_FOLDER;
- else if (key.equals(IProductConstants.APP_CLIENT_CONTENT_FOLDER))
- return APP_CLIENT_CONTENT_FOLDER;
- else if (key.equals(IProductConstants.JCA_CONTENT_FOLDER))
- return JCA_CONTENT_FOLDER;
- else if (key.equals(IProductConstants.DEFAULT_SOURCE_FOLDER))
- return DEFAULT_SOURCE_FOLDER;
- else if (key.equals(IProductConstants.ADD_TO_EAR_BY_DEFAULT))
- return ADD_TO_EAR_BY_DEFAULT;
- else if (key.equals(IProductConstants.USE_SINGLE_ROOT_STRUCTURE))
- return USE_SINGLE_ROOT_STRUCTURE;
- else if (key.equals(IProductConstants.VIEWER_SYNC_FOR_WEBSERVICES))
- return VIEWER_SYNC_FOR_WEBSERVICES;
- else if (key.equals(IProductConstants.OUTPUT_FOLDER))
- return OUTPUT_FOLDER;
- else if (key.equals(IProductConstants.ID_PERSPECTIVE_HIERARCHY_VIEW))
- return ID_PERSPECTIVE_HIERARCHY_VIEW;
- else if (key.equals(IProductConstants.FINAL_PERSPECTIVE_APPCLIENT))
- return FINAL_PERSPECTIVE;
- else if (key.equals(IProductConstants.FINAL_PERSPECTIVE_EAR))
- return FINAL_PERSPECTIVE;
- else if (key.equals(IProductConstants.FINAL_PERSPECTIVE_EJB))
- return FINAL_PERSPECTIVE;
- else if (key.equals(IProductConstants.FINAL_PERSPECTIVE_JCA))
- return FINAL_PERSPECTIVE;
- else if (key.equals(IProductConstants.FINAL_PERSPECTIVE_STATICWEB))
- return FINAL_WEB_PERSPECTIVE;
- else if (key.equals(IProductConstants.FINAL_PERSPECTIVE_UTILITY))
- return FINAL_PERSPECTIVE;
- else if (key.equals(IProductConstants.FINAL_PERSPECTIVE_WEB))
- return FINAL_PERSPECTIVE;
- else if (key.equals(IProductConstants.SHOW_JAVA_EE_MODULE_DEPENDENCY_PAGE))
- return SHOW_JAVA_EE_MODULE_DEPENDENCY_PAGE;
- else if (key.equals(IProductConstants.DYNAMIC_WEB_GENERATE_DD))
- return DYNAMIC_WEB_GENERATE_DD;
- }
- return value;
- }
-
- public static boolean shouldAddToEARByDefault() {
- String value = getProperty(IProductConstants.ADD_TO_EAR_BY_DEFAULT);
- return Boolean.valueOf(value).booleanValue();
- }
-
- public static boolean shouldUseSingleRootStructure() {
- String value = getProperty(IProductConstants.USE_SINGLE_ROOT_STRUCTURE);
- return Boolean.valueOf(value).booleanValue();
- }
-
- public static boolean shouldUseViewerSyncForWebservices() {
- String value = getProperty(IProductConstants.VIEWER_SYNC_FOR_WEBSERVICES);
- return Boolean.valueOf(value).booleanValue();
- }
-
- public static List/*<IRuntime>*/ getDefaultRuntimes() {
- List theRuntimes = null;
- Set runtimes = RuntimeManager.getRuntimes();
- if (!runtimes.isEmpty()) {
- IRuntime defaultRuntime = null;
- // First check if defaults are defined
- for (int i = 0; i < DEFAULT_RUNTIME_KEYS.length; i++) {
- defaultRuntime = getMatchingRuntime(DEFAULT_RUNTIME_KEYS[i], runtimes);
- if (defaultRuntime != null) {
- if (theRuntimes == null) {
- theRuntimes = new ArrayList(3);
- }
- theRuntimes.add(defaultRuntime);
- }
- }
- }
- if (theRuntimes == null) {
- theRuntimes = Collections.EMPTY_LIST;
- }
- return theRuntimes;
- }
-
- private static IRuntime getMatchingRuntime(String defaultProductRuntimeProperty, Set runtimes) {
- String defaultProductRuntimeKey = getProperty(defaultProductRuntimeProperty);
- if (defaultProductRuntimeKey == null || defaultProductRuntimeKey.length() == 0) {
- return null;
- }
- //The defaultProductRuntimeKey needs to be in the following format
- //<facet runtime id>:<facet version>.
- int seperatorIndex = defaultProductRuntimeKey.indexOf(RUNTIME_SEPARATOR);
- if (seperatorIndex < 0 && seperatorIndex < defaultProductRuntimeKey.length()) {
- //Consider throwing an exception here.
- WSTWebPlugin.logError("Invalid default product runtime id. It should follow the format <facet runtime id>:<facet version>. Id processed: " + defaultProductRuntimeKey); //$NON-NLS-1$
- return null;
- }
- String defaultRuntimeID = defaultProductRuntimeKey.substring(0, seperatorIndex);
- String defaultFacetVersion = defaultProductRuntimeKey.substring(seperatorIndex + 1);
- for (Iterator runtimeIt = runtimes.iterator(); runtimeIt.hasNext();) {
- IRuntime runtime = (IRuntime) runtimeIt.next();
- List runtimeComps = runtime.getRuntimeComponents();
- if (!runtimeComps.isEmpty()) {
- for (Iterator compsIter = runtimeComps.iterator(); compsIter.hasNext();) {
- IRuntimeComponent runtimeComp = (IRuntimeComponent) compsIter.next();
- if (defaultRuntimeID.equals(runtimeComp.getRuntimeComponentType().getId()) &&
- (defaultFacetVersion.equals(runtimeComp.getRuntimeComponentVersion().getVersionString()))) {
- return runtime;
- }
- }
- }
- }
- //No matches found.
- return null;
- }
-}
diff --git a/plugins/org.eclipse.wst.web/static_web_project/org/eclipse/wst/project/facet/SimpleWebFacetInstallDataModelProvider.java b/plugins/org.eclipse.wst.web/static_web_project/org/eclipse/wst/project/facet/SimpleWebFacetInstallDataModelProvider.java
deleted file mode 100644
index c551407..0000000
--- a/plugins/org.eclipse.wst.web/static_web_project/org/eclipse/wst/project/facet/SimpleWebFacetInstallDataModelProvider.java
+++ /dev/null
@@ -1,149 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2005, 2006 IBM Corporation and others.
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
- *
- * Contributors:
- * IBM Corporation - initial API and implementation
- *******************************************************************************/
-package org.eclipse.wst.project.facet;
-
-import java.util.Set;
-
-import org.eclipse.core.internal.resources.ResourceStatus;
-import org.eclipse.core.internal.utils.Messages;
-import org.eclipse.core.resources.IResource;
-import org.eclipse.core.resources.IResourceStatus;
-import org.eclipse.core.resources.IWorkspace;
-import org.eclipse.core.resources.ResourcesPlugin;
-import org.eclipse.core.runtime.IPath;
-import org.eclipse.core.runtime.IStatus;
-import org.eclipse.core.runtime.Path;
-import org.eclipse.osgi.util.NLS;
-import org.eclipse.wst.common.componentcore.datamodel.FacetInstallDataModelProvider;
-import org.eclipse.wst.common.componentcore.internal.util.IModuleConstants;
-import org.eclipse.wst.common.frameworks.datamodel.IDataModel;
-import org.eclipse.wst.common.frameworks.internal.plugin.WTPCommonMessages;
-import org.eclipse.wst.common.frameworks.internal.plugin.WTPCommonPlugin;
-import org.eclipse.wst.web.internal.ResourceHandler;
-
-import com.ibm.icu.text.UTF16;
-import com.ibm.icu.util.StringTokenizer;
-
-public class SimpleWebFacetInstallDataModelProvider extends FacetInstallDataModelProvider implements ISimpleWebFacetInstallDataModelProperties {
-
- public SimpleWebFacetInstallDataModelProvider() {
- super();
- }
-
- @Override
- public Set getPropertyNames() {
- Set names = super.getPropertyNames();
- names.add(CONTENT_DIR);
- names.add(CONTEXT_ROOT);
- return names;
- }
-
- @Override
- public Object getDefaultProperty(String propertyName) {
- if (propertyName.equals(CONTENT_DIR)) {
- return "WebContent"; //$NON-NLS-1$
- } else if (propertyName.equals(CONTEXT_ROOT)) {
- return getStringProperty(FACET_PROJECT_NAME).replace(' ', '_');
- } else if (propertyName.equals(FACET_ID)) {
- return IModuleConstants.WST_WEB_MODULE;
- }
- return super.getDefaultProperty(propertyName);
- }
-
- @Override
- public boolean propertySet(String propertyName, Object propertyValue) {
- if (FACET_PROJECT_NAME.equals(propertyName)) {
- model.notifyPropertyChange(CONTEXT_ROOT, IDataModel.VALID_VALUES_CHG);
- }
- return super.propertySet(propertyName, propertyValue);
- }
-
- @Override
- public IStatus validate(String name) {
- if (name.equals(CONTEXT_ROOT)) {
- return validateContextRoot(getStringProperty(CONTEXT_ROOT));
- }
- else if (name.equals(CONTENT_DIR)) {
- String folderName = model.getStringProperty(CONTENT_DIR);
- if (folderName == null || folderName.length() == 0 || folderName.equals("/") || folderName.equals("\\")) { //$NON-NLS-1$ //$NON-NLS-2$
- // all folders which meet the criteria of "CONFIG_FOLDER" are required
- String errorMessage = WTPCommonPlugin.getResourceString(WTPCommonMessages.WEBCONTENTFOLDER_EMPTY);
- return WTPCommonPlugin.createErrorStatus(errorMessage);
- }
- IStatus status = validateFolderName(folderName);
- if (status.isOK())
- {
- if (folderName.indexOf('#') != -1) {
- String message = NLS.bind(Messages.resources_invalidCharInName, "#", folderName); //$NON-NLS-1$
- status = new ResourceStatus(IResourceStatus.INVALID_VALUE, null, message);
- }
- }
- return status;
- }
-
- return super.validate(name);
- }
-
- protected IStatus validateContextRoot(String contextRoot) {
- if (contextRoot == null || contextRoot.length() == 0) {
- return new ResourceStatus(IResourceStatus.INVALID_VALUE, null, ResourceHandler.Context_Root_cannot_be_empty_2);
- } else if (contextRoot.trim().equals(contextRoot)) {
- StringTokenizer stok = new StringTokenizer(contextRoot, "."); //$NON-NLS-1$
- while (stok.hasMoreTokens()) {
- String token = stok.nextToken();
- int cp;
- for (int i = 0; i < token.length(); i += UTF16.getCharCount(cp)) {
- cp = UTF16.charAt(token, i);
- if(token.charAt(i) == ' ')
- {
- return new ResourceStatus(IResourceStatus.INVALID_VALUE, null, ResourceHandler.Names_cannot_contain_whitespace);
- }
- else if (!(token.charAt(i) == '_') && !(token.charAt(i) == '-') && !(token.charAt(i) == '/') && Character.isLetterOrDigit(token.charAt(i)) == false) {
- String invalidCharString = null;
- if (UTF16.getCharCount(cp)>1)
- {
- invalidCharString = UTF16.valueOf(cp);
- }
- else
- {
- invalidCharString = (new Character(token.charAt(i))).toString();
- }
- Object[] invalidChar = new Object[]{invalidCharString};
- String errorStatus = ResourceHandler.getString(ResourceHandler.The_character_is_invalid_in_a_context_root, invalidChar);
- return new ResourceStatus(IResourceStatus.INVALID_VALUE, null, errorStatus);
- }
- }
- }
- } else
- {
- return new ResourceStatus(IResourceStatus.INVALID_VALUE, null, ResourceHandler.Names_cannot_contain_whitespace);
- }
- return OK_STATUS;
- }
-
- protected IStatus validateFolderName(String folderName) {
- // the directory is not required, but if the name is entered ensure that it
- // contains only valid characters.
- if (folderName == null || folderName.length() == 0) {
- return OK_STATUS;
- }
- IWorkspace workspace = ResourcesPlugin.getWorkspace();
- IPath path = new Path(folderName);
- for (int i = 0, max = path.segmentCount(); i < max; i++) {
- IStatus status = workspace.validateName(path.segment(i), IResource.FOLDER);
- if (! status.isOK())
- return status;
- }
-
- // all of the potential segments of the folder have been verified
- return OK_STATUS;
- }
-}
diff --git a/plugins/org.eclipse.wst.web/static_web_project/org/eclipse/wst/project/facet/SimpleWebFacetInstallDelegate.java b/plugins/org.eclipse.wst.web/static_web_project/org/eclipse/wst/project/facet/SimpleWebFacetInstallDelegate.java
deleted file mode 100644
index 15276d6..0000000
--- a/plugins/org.eclipse.wst.web/static_web_project/org/eclipse/wst/project/facet/SimpleWebFacetInstallDelegate.java
+++ /dev/null
@@ -1,98 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2003, 2006 IBM Corporation and others.
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
- *
- * Contributors:
- * IBM Corporation - initial API and implementation
- *******************************************************************************/
-package org.eclipse.wst.project.facet;
-
-import org.eclipse.core.commands.ExecutionException;
-import org.eclipse.core.resources.IFolder;
-import org.eclipse.core.resources.IProject;
-import org.eclipse.core.resources.IProjectDescription;
-import org.eclipse.core.resources.IWorkspace;
-import org.eclipse.core.resources.ResourcesPlugin;
-import org.eclipse.core.runtime.CoreException;
-import org.eclipse.core.runtime.IPath;
-import org.eclipse.core.runtime.IProgressMonitor;
-import org.eclipse.core.runtime.Path;
-import org.eclipse.wst.common.componentcore.ComponentCore;
-import org.eclipse.wst.common.componentcore.datamodel.FacetDataModelProvider;
-import org.eclipse.wst.common.componentcore.internal.util.ComponentUtilities;
-import org.eclipse.wst.common.componentcore.internal.util.IModuleConstants;
-import org.eclipse.wst.common.componentcore.resources.IVirtualComponent;
-import org.eclipse.wst.common.componentcore.resources.IVirtualFolder;
-import org.eclipse.wst.common.frameworks.datamodel.IDataModel;
-import org.eclipse.wst.common.frameworks.datamodel.IDataModelOperation;
-import org.eclipse.wst.common.project.facet.core.IDelegate;
-import org.eclipse.wst.common.project.facet.core.IProjectFacetVersion;
-import org.eclipse.wst.web.internal.WSTWebPlugin;
-
-public class SimpleWebFacetInstallDelegate implements IDelegate {
-
- public void execute(IProject project, IProjectFacetVersion fv, Object config, IProgressMonitor monitor) throws CoreException {
- if (monitor != null)
- monitor.beginTask("", 1); //$NON-NLS-1$
- try {
- IDataModel model = (IDataModel) config;
- addNatures(project);
- final IVirtualComponent c = ComponentCore.createComponent(project, false);
- c.create(0, null);
-
- final IWorkspace ws = ResourcesPlugin.getWorkspace();
- final IPath pjpath = project.getFullPath();
- final IPath contentdir = setContentPropertyIfNeeded(model, pjpath, project);
- mkdirs(ws.getRoot().getFolder(contentdir));
-
- final IVirtualFolder webroot = c.getRootFolder();
- if (webroot.getProjectRelativePath().equals(new Path("/"))) { //$NON-NLS-1$
- webroot.createLink(new Path("/" + model.getStringProperty(ISimpleWebFacetInstallDataModelProperties.CONTENT_DIR)), 0, null); //$NON-NLS-1$
- }
-
- ComponentUtilities.setServerContextRoot(project,model.getStringProperty(ISimpleWebFacetInstallDataModelProperties.CONTEXT_ROOT));
-
- try {
- ((IDataModelOperation) model.getProperty(FacetDataModelProvider.NOTIFICATION_OPERATION)).execute(monitor, null);
- } catch (ExecutionException e) {
- WSTWebPlugin.logError(e);
- }
- } finally {
- if (monitor != null)
- monitor.done();
- }
- }
-
- private IPath setContentPropertyIfNeeded(final IDataModel model, final IPath pjpath, IProject project) {
- IVirtualComponent c = ComponentCore.createComponent(project);
- if (c.exists()) {
- if( !c.getRootFolder().getProjectRelativePath().isRoot() ){
- return c.getRootFolder().getUnderlyingResource().getFullPath();
- }
- }
- return pjpath.append(model.getStringProperty(ISimpleWebFacetInstallDataModelProperties.CONTENT_DIR));
- }
-
- private void addNatures(final IProject project) throws CoreException {
- final IProjectDescription desc = project.getDescription();
- final String[] current = desc.getNatureIds();
- final String[] replacement = new String[current.length + 1];
- System.arraycopy(current, 0, replacement, 0, current.length);
- replacement[current.length] = IModuleConstants.MODULE_NATURE_ID;
- desc.setNatureIds(replacement);
- project.setDescription(desc, null);
- }
-
- private static void mkdirs(final IFolder folder) throws CoreException {
- if (!folder.exists()) {
- if (folder.getParent() instanceof IFolder) {
- mkdirs((IFolder) folder.getParent());
- }
- folder.create(true, true, null);
- }
- }
-
-}
diff --git a/plugins/org.eclipse.wst.web/static_web_project/org/eclipse/wst/project/facet/SimpleWebFacetProjectCreationDataModelProvider.java b/plugins/org.eclipse.wst.web/static_web_project/org/eclipse/wst/project/facet/SimpleWebFacetProjectCreationDataModelProvider.java
deleted file mode 100644
index 90020ff..0000000
--- a/plugins/org.eclipse.wst.web/static_web_project/org/eclipse/wst/project/facet/SimpleWebFacetProjectCreationDataModelProvider.java
+++ /dev/null
@@ -1,36 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2005, 2006 IBM Corporation and others.
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
- *
- * Contributors:
- * IBM Corporation - initial API and implementation
- *******************************************************************************/
-package org.eclipse.wst.project.facet;
-
-import java.util.ArrayList;
-import java.util.Collection;
-
-import org.eclipse.wst.common.componentcore.datamodel.FacetProjectCreationDataModelProvider;
-import org.eclipse.wst.common.componentcore.internal.util.IModuleConstants;
-import org.eclipse.wst.common.project.facet.core.IProjectFacet;
-import org.eclipse.wst.common.project.facet.core.ProjectFacetsManager;
-
-public class SimpleWebFacetProjectCreationDataModelProvider extends FacetProjectCreationDataModelProvider {
-
- public SimpleWebFacetProjectCreationDataModelProvider() {
- super();
- }
-
- @Override
- public void init() {
- super.init();
-
- Collection<IProjectFacet> requiredFacets = new ArrayList<IProjectFacet>();
- requiredFacets.add(ProjectFacetsManager.getProjectFacet(IModuleConstants.WST_WEB_MODULE));
- setProperty(REQUIRED_FACETS_COLLECTION, requiredFacets);
- }
-
-}
diff --git a/plugins/org.eclipse.wst.web/static_web_project/org/eclipse/wst/project/facet/SimpleWebFacetUninstallDelegate.java b/plugins/org.eclipse.wst.web/static_web_project/org/eclipse/wst/project/facet/SimpleWebFacetUninstallDelegate.java
deleted file mode 100644
index 2445796..0000000
--- a/plugins/org.eclipse.wst.web/static_web_project/org/eclipse/wst/project/facet/SimpleWebFacetUninstallDelegate.java
+++ /dev/null
@@ -1,44 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2003, 2006 IBM Corporation and others.
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
- *
- * Contributors:
- * IBM Corporation - initial API and implementation
- *******************************************************************************/
-package org.eclipse.wst.project.facet;
-
-import org.eclipse.core.resources.IFile;
-import org.eclipse.core.resources.IProject;
-import org.eclipse.core.runtime.CoreException;
-import org.eclipse.core.runtime.IProgressMonitor;
-import org.eclipse.jem.util.emf.workbench.ProjectUtilities;
-import org.eclipse.wst.common.componentcore.internal.StructureEdit;
-import org.eclipse.wst.common.componentcore.internal.util.IModuleConstants;
-import org.eclipse.wst.common.project.facet.core.IDelegate;
-import org.eclipse.wst.common.project.facet.core.IProjectFacetVersion;
-
-public class SimpleWebFacetUninstallDelegate implements IDelegate {
-
- public SimpleWebFacetUninstallDelegate() {
- super();
- }
-
- public void execute(IProject project, IProjectFacetVersion fv, Object config, IProgressMonitor monitor) throws CoreException {
- if (monitor != null)
- monitor.beginTask("", 1); //$NON-NLS-1$
- try {
- // Remove the .component file
- IFile file = project.getFile(StructureEdit.MODULE_META_FILE_NAME);
- file.delete(true, monitor);
-
- // Remove the module core nature
- ProjectUtilities.removeNatureFromProject(project, IModuleConstants.MODULE_NATURE_ID);
- } finally {
- if (monitor != null)
- monitor.done();
- }
- }
-}
diff --git a/plugins/org.eclipse.wst.web/static_web_project/org/eclipse/wst/web/internal/DelegateConfigurationElement.java b/plugins/org.eclipse.wst.web/static_web_project/org/eclipse/wst/web/internal/DelegateConfigurationElement.java
deleted file mode 100644
index 7add548..0000000
--- a/plugins/org.eclipse.wst.web/static_web_project/org/eclipse/wst/web/internal/DelegateConfigurationElement.java
+++ /dev/null
@@ -1,234 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2005, 2006 IBM Corporation and others.
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
- *
- * Contributors:
- * IBM Corporation - initial API and implementation
- *******************************************************************************/
-/*
- * Created on December 14, 2004
- */
-package org.eclipse.wst.web.internal;
-
-import org.eclipse.core.runtime.CoreException;
-import org.eclipse.core.runtime.IConfigurationElement;
-import org.eclipse.core.runtime.IContributor;
-import org.eclipse.core.runtime.IExtension;
-import org.eclipse.core.runtime.InvalidRegistryObjectException;
-
-/**
- * An object which represents the user-defined contents of an extension in a plug-in manifest.
- */
-public class DelegateConfigurationElement implements IConfigurationElement {
-
- private final IConfigurationElement delegateElement;
- private static final String DELEGATE_NAME = "delegateConfigurationElement"; //$NON-NLS-1$
- private static final String DELEGATE_NAMESPACE = "delegateConfigurationElementNamespace"; //$NON-NLS-1$
- private static final String DELEGATE_NULL_STRING = "delegateConfigurationElement: NULL"; //$NON-NLS-1$
-
- public DelegateConfigurationElement(IConfigurationElement aDelegate) {
- delegateElement = aDelegate;
- }
-
- /**
- * @param propertyName
- * @return
- * @throws org.eclipse.core.runtime.CoreException
- */
- public Object createExecutableExtension(String propertyName) throws CoreException {
- if (delegateElement == null)
- return null;
- return delegateElement.createExecutableExtension(propertyName);
- }
-
- /*
- * (non-Javadoc)
- *
- * @see java.lang.Object#equals(java.lang.Object)
- */
- @Override
- public boolean equals(Object obj) {
- if (delegateElement == null)
- return false;
- return delegateElement.equals(obj);
- }
-
- /**
- * @param name
- * @return
- * @throws org.eclipse.core.runtime.InvalidRegistryObjectException
- */
- public String getAttribute(String name) throws InvalidRegistryObjectException {
- if (delegateElement == null)
- return null;
- return delegateElement.getAttribute(name);
- }
-
- /**
- * @param name
- * @return
- * @throws org.eclipse.core.runtime.InvalidRegistryObjectException
- */
- public String getAttributeAsIs(String name) throws InvalidRegistryObjectException {
- if (delegateElement == null)
- return null;
- return delegateElement.getAttributeAsIs(name);
- }
-
- /**
- * @return
- * @throws org.eclipse.core.runtime.InvalidRegistryObjectException
- */
- public String[] getAttributeNames() throws InvalidRegistryObjectException {
- if (delegateElement == null)
- return new String[0];
- return delegateElement.getAttributeNames();
- }
-
- /**
- * @return
- * @throws org.eclipse.core.runtime.InvalidRegistryObjectException
- */
- public IConfigurationElement[] getChildren() throws InvalidRegistryObjectException {
- if (delegateElement == null)
- return new IConfigurationElement[0];
- return delegateElement.getChildren();
- }
-
- /**
- * @param name
- * @return
- * @throws org.eclipse.core.runtime.InvalidRegistryObjectException
- */
- public IConfigurationElement[] getChildren(String name) throws InvalidRegistryObjectException {
- if (delegateElement == null)
- return new IConfigurationElement[0];
- return delegateElement.getChildren(name);
- }
-
- /**
- * @return
- * @throws org.eclipse.core.runtime.InvalidRegistryObjectException
- */
- public IExtension getDeclaringExtension() throws InvalidRegistryObjectException {
- if (delegateElement == null)
- throw new InvalidRegistryObjectException();
- return delegateElement.getDeclaringExtension();
- }
-
- /**
- * @return
- * @throws org.eclipse.core.runtime.InvalidRegistryObjectException
- */
- public String getName() throws InvalidRegistryObjectException {
- if (delegateElement == null)
- return DELEGATE_NAME;
- return delegateElement.getName();
- }
-
- /**
- * @return
- * @throws org.eclipse.core.runtime.InvalidRegistryObjectException
- */
- public String getNamespace() throws InvalidRegistryObjectException {
- if (delegateElement == null)
- return DELEGATE_NAMESPACE;
- return delegateElement.getNamespace();
- }
-
- /**
- * @return
- * @throws org.eclipse.core.runtime.InvalidRegistryObjectException
- */
- public Object getParent() throws InvalidRegistryObjectException {
- if (delegateElement == null)
- return null;
- return delegateElement.getParent();
- }
-
- /**
- * @return
- * @throws org.eclipse.core.runtime.InvalidRegistryObjectException
- */
- public String getValue() throws InvalidRegistryObjectException {
- if (delegateElement == null)
- return null;
- return delegateElement.getValue();
- }
-
- /**
- * @return
- * @throws org.eclipse.core.runtime.InvalidRegistryObjectException
- */
- public String getValueAsIs() throws InvalidRegistryObjectException {
- if (delegateElement == null)
- return null;
- return delegateElement.getValueAsIs();
- }
-
- /*
- * (non-Javadoc)
- *
- * @see java.lang.Object#hashCode()
- */
- @Override
- public int hashCode() {
- if (delegateElement == null)
- return -1;
- return delegateElement.hashCode();
- }
-
- /**
- * @return
- */
- public boolean isValid() {
-
- if (delegateElement == null)
- return false;
- return delegateElement.isValid();
- }
-
- /*
- * (non-Javadoc)
- *
- * @see java.lang.Object#toString()
- */
- @Override
- public String toString() {
- if (delegateElement == null)
- return DELEGATE_NULL_STRING;
- return delegateElement.toString();
- }
-
- public IConfigurationElement toEquinox() {
- return null;
- }
-
- public IContributor getContributor() throws InvalidRegistryObjectException {
- if (delegateElement == null)
- throw new InvalidRegistryObjectException();
- return delegateElement.getContributor();
- }
-
- public String getNamespaceIdentifier() throws InvalidRegistryObjectException {
- if (delegateElement == null)
- return DELEGATE_NAMESPACE;
- return delegateElement.getNamespaceIdentifier();
- }
-
- // https://bugs.eclipse.org/bugs/show_bug.cgi?id=296122
- public String getAttribute(String attrName, String locale) throws InvalidRegistryObjectException {
- if (delegateElement == null) return null;
- return delegateElement.getAttribute(attrName, locale);
- }
-
- // https://bugs.eclipse.org/bugs/show_bug.cgi?id=296122
- public String getValue(String locale) throws InvalidRegistryObjectException {
- if (delegateElement == null) return null;
- return delegateElement.getValue(locale);
- }
-
-}
\ No newline at end of file
diff --git a/plugins/org.eclipse.wst.web/static_web_project/org/eclipse/wst/web/internal/ISimpleWebModuleConstants.java b/plugins/org.eclipse.wst.web/static_web_project/org/eclipse/wst/web/internal/ISimpleWebModuleConstants.java
deleted file mode 100644
index e58e260..0000000
--- a/plugins/org.eclipse.wst.web/static_web_project/org/eclipse/wst/web/internal/ISimpleWebModuleConstants.java
+++ /dev/null
@@ -1,23 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2003, 2005 IBM Corporation and others.
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
- *
- * Contributors:
- * IBM Corporation - initial API and implementation
- *******************************************************************************/
-
-package org.eclipse.wst.web.internal;
-
-
-public interface ISimpleWebModuleConstants
-{
- public static final String PLUG_IN_ID = "org.eclipse.wst.web"; //$NON-NLS-1$
- public static final String STATIC_PROJECT_TYPE = "STATIC"; //$NON-NLS-1$
- public static final String CSS_DIRECTORY = "theme"; //$NON-NLS-1$
- public static final String INFO_DIRECTORY = "WEB-INF"; //$NON-NLS-1$
- public static final String LIBRARY_DIRECTORY = "lib"; //$NON-NLS-1$
- public static final String CLASSES_DIRECTORY = "classes"; //$NON-NLS-1$
-}
diff --git a/plugins/org.eclipse.wst.web/static_web_project/org/eclipse/wst/web/internal/IWSTWebPreferences.java b/plugins/org.eclipse.wst.web/static_web_project/org/eclipse/wst/web/internal/IWSTWebPreferences.java
deleted file mode 100644
index 0f4e7aa..0000000
--- a/plugins/org.eclipse.wst.web/static_web_project/org/eclipse/wst/web/internal/IWSTWebPreferences.java
+++ /dev/null
@@ -1,13 +0,0 @@
-/***************************************************************************************************
- * Copyright (c) 2003, 2004 IBM Corporation and others. All rights reserved. This program and the
- * accompanying materials are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
- *
- * Contributors: IBM Corporation - initial API and implementation
- **************************************************************************************************/
-package org.eclipse.wst.web.internal;
-
-public interface IWSTWebPreferences {
- String PREF_STATICWEBCONTENT = "org.eclipse.jst.j2ee.preference.staticWebContentName"; //$NON-NLS-1$
-}
diff --git a/plugins/org.eclipse.wst.web/static_web_project/org/eclipse/wst/web/internal/ResourceHandler.java b/plugins/org.eclipse.wst.web/static_web_project/org/eclipse/wst/web/internal/ResourceHandler.java
deleted file mode 100644
index 7167724..0000000
--- a/plugins/org.eclipse.wst.web/static_web_project/org/eclipse/wst/web/internal/ResourceHandler.java
+++ /dev/null
@@ -1,44 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2000, 2005 IBM Corporation and others.
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
- *
- * Contributors:
- * IBM Corporation - initial API and implementation
- *******************************************************************************/
-package org.eclipse.wst.web.internal;
-
-import org.eclipse.osgi.util.NLS;
-
-public final class ResourceHandler extends NLS {
-
- private static final String BUNDLE_NAME = "staticwebproject";//$NON-NLS-1$
-
- private ResourceHandler() {
- // Do not instantiate
- }
-
- public static String StaticWebProjectCreationWizard_Wizard_Title;
- public static String StaticWebProjectWizardBasePage_Page_Description;
- public static String StaticWebSettingsPropertiesPage_Web_Content_Label;
- public static String StaticContextRootComposite_Context_Root_Label;
- public static String StaticWebProjectWizardBasePage_Page_Title;
- public static String StaticWebSettingsPropertiesPage_Not_available_for_closed_projects;
- public static String TargetRuntime;
- public static String NewDotDotDot;
- public static String InvalidServerTarget;
- public static String ConfigureSettings;
- public static String Context_Root_cannot_be_empty_2;
- public static String Names_cannot_contain_whitespace;
- public static String The_character_is_invalid_in_a_context_root;
-
- static {
- NLS.initializeMessages(BUNDLE_NAME, ResourceHandler.class);
- }
-
- public static String getString(String key, Object[] args) {
- return NLS.bind(key, args);
- }
-}
\ No newline at end of file
diff --git a/plugins/org.eclipse.wst.web/static_web_project/org/eclipse/wst/web/internal/WSTWebPlugin.java b/plugins/org.eclipse.wst.web/static_web_project/org/eclipse/wst/web/internal/WSTWebPlugin.java
deleted file mode 100644
index d14b6c8..0000000
--- a/plugins/org.eclipse.wst.web/static_web_project/org/eclipse/wst/web/internal/WSTWebPlugin.java
+++ /dev/null
@@ -1,106 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2003, 2005 IBM Corporation and others.
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
- *
- * Contributors:
- * IBM Corporation - initial API and implementation
- *******************************************************************************/
-
-package org.eclipse.wst.web.internal;
-
-import org.eclipse.core.resources.IWorkspace;
-import org.eclipse.core.resources.ResourcesPlugin;
-import org.eclipse.core.runtime.Plugin;
-import org.eclipse.wst.validation.internal.plugin.ValidationPlugin;
-import org.eclipse.core.runtime.Status;
-import org.eclipse.core.runtime.IStatus;
-import org.eclipse.core.runtime.Platform;
-import java.lang.Throwable;
-import org.eclipse.core.runtime.CoreException;
-import org.eclipse.core.runtime.MultiStatus;
-
-/**
- * The main plugin class to be used in the desktop.
- */
-public class WSTWebPlugin extends Plugin
-{
- //The shared instance.
- private static WSTWebPlugin plugin;
-
- private WSTWebPreferences preferences;
-
- public static final String VALIDATION_BUILDER_ID = ValidationPlugin.VALIDATION_BUILDER_ID; // plugin
-
- public static final String[] ICON_DIRS = new String[]{"icons/full/obj16", //$NON-NLS-1$
- "icons/full/ctool16", //$NON-NLS-1$
- "icons/full/wizban", //$NON-NLS-1$
- "icons", //$NON-NLS-1$
- ""}; //$NON-NLS-1$
-
- //the ID for this plugin (added automatically by logging quickfix)
- public static final String PLUGIN_ID = "org.eclipse.wst.web"; //$NON-NLS-1$
- /**
- * The constructor.
- */
- public WSTWebPlugin() {
- super();
- plugin = this;
- }
-
- /**
- * Returns the shared instance.
- */
- public static WSTWebPlugin getDefault()
- {
- return plugin;
- }
-
- public static IWorkspace getWorkspace() {
- return ResourcesPlugin.getWorkspace();
- }
-
- @Override
- protected void initializeDefaultPluginPreferences() {
- getWSTWebPreferences().initializeDefaultPreferences();
- }
- /**
- * @return Returns the preferences.
- */
- public WSTWebPreferences getWSTWebPreferences() {
- if (this.preferences == null)
- this.preferences = new WSTWebPreferences(this);
- return this.preferences;
- }
-
- public static IStatus createStatus(int severity, String message, Throwable exception) {
- return new Status(severity, PLUGIN_ID, message, exception);
- }
-
- public static IStatus createStatus(int severity, String message) {
- return createStatus(severity, message, null);
- }
-
- public static void logError(String message) {
- Platform.getLog(Platform.getBundle(PLUGIN_ID)).log( createStatus(IStatus.ERROR, message));
- }
-
- public static void logError(String message, Throwable exception) {
- Platform.getLog(Platform.getBundle(PLUGIN_ID)).log( createStatus(IStatus.ERROR, message, exception));
- }
-
- public static void logError(String message, CoreException exception) {
- MultiStatus status = new MultiStatus(PLUGIN_ID,IStatus.ERROR,new IStatus[]{exception.getStatus()},message,exception);
- Platform.getLog(Platform.getBundle(PLUGIN_ID)).log( status );
- }
-
- public static void logError(Throwable exception) {
- Platform.getLog(Platform.getBundle(PLUGIN_ID)).log( createStatus(IStatus.ERROR, exception.getMessage(), exception));
- }
-
- public static void logError(CoreException exception) {
- Platform.getLog(Platform.getBundle(PLUGIN_ID)).log( exception.getStatus() );
- }
-}
diff --git a/plugins/org.eclipse.wst.web/static_web_project/org/eclipse/wst/web/internal/WSTWebPreferences.java b/plugins/org.eclipse.wst.web/static_web_project/org/eclipse/wst/web/internal/WSTWebPreferences.java
deleted file mode 100644
index fd5256a..0000000
--- a/plugins/org.eclipse.wst.web/static_web_project/org/eclipse/wst/web/internal/WSTWebPreferences.java
+++ /dev/null
@@ -1,81 +0,0 @@
-/***************************************************************************************************
- * Copyright (c) 2003, 2004 IBM Corporation and others. All rights reserved. This program and the
- * accompanying materials are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
- *
- * Contributors: IBM Corporation - initial API and implementation
- **************************************************************************************************/
-
-package org.eclipse.wst.web.internal;
-
-import org.eclipse.core.runtime.Plugin;
-import org.eclipse.core.runtime.Preferences;
-
-public class WSTWebPreferences {
- public interface Keys {
- final static String STATIC_WEB_CONTENT = "org.eclipse.jst.j2ee.preference.staticWebContentName"; //$NON-NLS-1$
- }
- public interface Values {
- final static String STATIC_WEB_CONTENT = "WebContent"; //$NON-NLS-1$
- }
- public interface Defaults {
- final static String STATIC_WEB_CONTENT = Values.STATIC_WEB_CONTENT;
- }
- private Plugin owner = null;
- private Preferences preferences = null;
- private boolean persistOnChange = false;
-
- public WSTWebPreferences(Plugin owner) {
- this.owner = owner;
- }
- protected void initializeDefaultPreferences() {
- getPreferences().setDefault(Keys.STATIC_WEB_CONTENT, Defaults.STATIC_WEB_CONTENT);
- }
-
- public String getStaticWebContentFolderName() {
- return getPreferences().getString(Keys.STATIC_WEB_CONTENT);
- }
-
- public void setStaticWebContentFolderName(String value) {
- getPreferences().setValue(Keys.STATIC_WEB_CONTENT, value);
- firePreferenceChanged();
- }
-
- public void firePreferenceChanged() {
- if (isPersistOnChange())
- persist();
- }
-
- public void persist() {
- getOwner().savePluginPreferences();
- }
-
- /**
- * @return Returns the persistOnChange.
- */
- public boolean isPersistOnChange() {
- return this.persistOnChange;
- }
-
- /**
- * @param persistOnChange
- * The persistOnChange to set.
- */
- public void setPersistOnChange(boolean persistOnChange) {
- this.persistOnChange = persistOnChange;
- }
-
- private Preferences getPreferences() {
- if (this.preferences == null)
- this.preferences = getOwner().getPluginPreferences();
- return this.preferences;
- }
-
- /**
- * @return Returns the owner.
- */
- private Plugin getOwner() {
- return this.owner;
- }
-}
diff --git a/plugins/org.eclipse.wst.web/static_web_project/org/eclipse/wst/web/internal/WebPropertiesUtil.java b/plugins/org.eclipse.wst.web/static_web_project/org/eclipse/wst/web/internal/WebPropertiesUtil.java
deleted file mode 100644
index efa92d0..0000000
--- a/plugins/org.eclipse.wst.web/static_web_project/org/eclipse/wst/web/internal/WebPropertiesUtil.java
+++ /dev/null
@@ -1,108 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2003, 2006 IBM Corporation and others.
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
- *
- * Contributors:
- * IBM Corporation - initial API and implementation
- *******************************************************************************/
-package org.eclipse.wst.web.internal;
-
-import com.ibm.icu.util.StringTokenizer;
-
-public class WebPropertiesUtil {
- private static final char[] BAD_CHARS = {'/', '\\', ':'};
- /**
- * @param project
- * org.eclipse.core.resources.IProject
- */
- /**
- * Returns a error message that states whether a context root is valid or not returns null if
- * context root is fine
- *
- * @return java.lang.String
- * @param contextRoot
- * java.lang.String
- */
- public static String validateContextRoot(String contextRoot) {
-
- if (contextRoot == null)
- return null;
-
- String errorMessage = null;
-
- String name = contextRoot;
- if (name.equals("")) { //$NON-NLS-1$
- // this was added because the error message shouldnt be shown initially. It should be
- // shown only if context root field is edited to
- errorMessage = ResourceHandler.StaticWebProjectWizardBasePage_Page_Title;
-
- //errorMessage = ProjectSupportResourceHandler.getString("Context_Root_cannot_be_empty_2"); //$NON-NLS-1$
- return errorMessage;
- }
-
- /*******************************************************************************************
- * // JZ - fix to defect 204264, "/" is valid in context root if (name.indexOf("//") != -1) {
- * //$NON-NLS-1$ errorMessage = "// are invalid characters in a resource name"; return
- * errorMessage;
- * }
- ******************************************************************************************/
-
- if (name.trim().equals(name)) {
- StringTokenizer stok = new StringTokenizer(name, "."); //$NON-NLS-1$
- outer : while (stok.hasMoreTokens()) {
- String token = stok.nextToken();
- for (int i = 0; i < token.length(); i++) {
- if (!(token.charAt(i) == '_') && !(token.charAt(i) == '-') && !(token.charAt(i) == '/') && Character.isLetterOrDigit(token.charAt(i)) == false) {
- if (Character.isWhitespace(token.charAt(i))) {
- //Removed because context roots can contain white space
- //errorMessage =
- // ResourceHandler.getString("_Context_root_cannot_conta_UI_");//$NON-NLS-1$
- // = " Context root cannot contain whitespaces."
- } else {
- errorMessage = ResourceHandler.StaticWebProjectWizardBasePage_Page_Title;
-
- //errorMessage = ProjectSupportResourceHandler.getString("The_character_is_invalid_in_a_context_root", new Object[]{(new Character(token.charAt(i))).toString()}); //$NON-NLS-1$
- break outer;
- }
- }
- }
- }
- } // en/ end of if(name.trim
- else
- errorMessage = ResourceHandler.StaticWebProjectWizardBasePage_Page_Title;
- //errorMessage = ProjectSupportResourceHandler.getString("Names_cannot_begin_or_end_with_whitespace_5"); //$NON-NLS-1$
-
- return errorMessage;
- }
-
-
- /**
- * Return true if the string contains any of the characters in the array.
- */
- private static boolean contains(String str, char[] chars) {
- for (int i = 0; i < chars.length; i++) {
- if (str.indexOf(chars[i]) != -1)
- return true;
- }
- return false;
- }
-
-
- public static String validateFolderName(String folderName) {
- if (folderName.length() == 0)
- return ResourceHandler.StaticWebProjectWizardBasePage_Page_Title;
-
- //return ProjectSupportResourceHandler.getString("Folder_name_cannot_be_empty_2"); //$NON-NLS-1$
-
- if (contains(folderName, BAD_CHARS))
- return ResourceHandler.StaticWebProjectWizardBasePage_Page_Title;
-
- //return ProjectSupportResourceHandler.getString("Folder_name_is_not_valid", new Object[]{folderName}); //$NON-NLS-1$
-
- return null;
- }
-
-}
diff --git a/plugins/org.eclipse.wst.web/static_web_project/org/eclipse/wst/web/internal/deployables/ComponentDeployable.java b/plugins/org.eclipse.wst.web/static_web_project/org/eclipse/wst/web/internal/deployables/ComponentDeployable.java
deleted file mode 100644
index 251db89..0000000
--- a/plugins/org.eclipse.wst.web/static_web_project/org/eclipse/wst/web/internal/deployables/ComponentDeployable.java
+++ /dev/null
@@ -1,429 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2003, 2007 IBM Corporation and others.
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
- *
- * Contributors:
- * IBM Corporation - initial API and implementation
- *******************************************************************************/
-package org.eclipse.wst.web.internal.deployables;
-
-import java.io.File;
-import java.util.ArrayList;
-import java.util.Arrays;
-import java.util.Iterator;
-import java.util.List;
-
-import org.eclipse.core.resources.IContainer;
-import org.eclipse.core.resources.IFile;
-import org.eclipse.core.resources.IProject;
-import org.eclipse.core.resources.IResource;
-import org.eclipse.core.runtime.CoreException;
-import org.eclipse.core.runtime.IPath;
-import org.eclipse.core.runtime.Path;
-import org.eclipse.wst.common.componentcore.ArtifactEdit;
-import org.eclipse.wst.common.componentcore.ComponentCore;
-import org.eclipse.wst.common.componentcore.resources.IVirtualComponent;
-import org.eclipse.wst.common.componentcore.resources.IVirtualContainer;
-import org.eclipse.wst.common.componentcore.resources.IVirtualFolder;
-import org.eclipse.wst.common.componentcore.resources.IVirtualReference;
-import org.eclipse.wst.common.componentcore.resources.IVirtualResource;
-import org.eclipse.wst.common.project.facet.core.IFacetedProject;
-import org.eclipse.wst.common.project.facet.core.IProjectFacet;
-import org.eclipse.wst.common.project.facet.core.ProjectFacetsManager;
-import org.eclipse.wst.server.core.IModule;
-import org.eclipse.wst.server.core.ServerUtil;
-import org.eclipse.wst.server.core.model.IModuleFile;
-import org.eclipse.wst.server.core.model.IModuleFolder;
-import org.eclipse.wst.server.core.model.IModuleResource;
-import org.eclipse.wst.server.core.util.ModuleFile;
-import org.eclipse.wst.server.core.util.ModuleFolder;
-import org.eclipse.wst.server.core.util.ProjectModule;
-
-/**
- * @deprecated as of WTP 3.2
- */
-public abstract class ComponentDeployable extends ProjectModule {
-
- protected IVirtualComponent component = null;
- protected List<IModuleResource> members = new ArrayList<IModuleResource>();
-
- public ComponentDeployable(IProject project) {
- this(project,ComponentCore.createComponent(project));
- }
-
- public ComponentDeployable(IProject project, IVirtualComponent aComponent) {
- super(project);
- this.component = aComponent;
- }
-
- /**
- * @see org.eclipse.jst.server.core.IJ2EEModule#isBinary()
- */
- public boolean isBinary() {
- if (component==null)
- return false;
- return component.isBinary();
- }
-
- /**
- * Add the resources from mr to the existing resources in Module Folder mf
- * @param ModuleFolder mf
- * @param IModuleResource[] mr
- */
- protected void addMembersToModuleFolder(ModuleFolder mf, IModuleResource[] mr) {
- // If the folder is null or the resources to add are null or empty, bail and return
- if (mf == null || mr == null || mr.length==0)
- return;
- // Get the existing members in the module folder
- IModuleResource[] mf_members = mf.members();
- int mf_size = 0;
- // Get the length of the existing members in the module folder
- if (mf_members != null)
- mf_size = mf_members.length;
- // Create a new array to set on the module folder which will combine the existing and
- // new module resources
- IModuleResource[] res = new IModuleResource[mf_size + mr.length];
- // Copy the existing members into the array if there are any
- if (mf_members != null && mf_size > 0)
- System.arraycopy(mf_members, 0, res, 0, mf_size);
- // Copy the new members into the array
- System.arraycopy(mr, 0, res, mf_size, mr.length);
- // Set the new members array on the module folder
- mf.setMembers(res);
- }
-
- /**
- * Returns the child modules of this module.
- *
- * @return org.eclipse.wst.server.core.model.IModule[]
- */
- @Override
- public IModule[] getChildModules() {
- return getModules();
- }
-
- public IModule[] getModules() {
- List<IModule> modules = new ArrayList<IModule>();
- if (component != null) {
- IVirtualReference[] components = getReferences(component);
- for (int i = 0; i < components.length; i++) {
- IVirtualReference reference = components[i];
- if (reference != null && reference.getDependencyType()==IVirtualReference.DEPENDENCY_TYPE_USES) {
- IVirtualComponent virtualComp = reference.getReferencedComponent();
- IModule module = gatherModuleReference(component, virtualComp);
- if (module != null && !modules.contains(module))
- modules.add(module);
- }
- }
- }
- return modules.toArray(new IModule[modules.size()]);
- }
-
- protected IVirtualReference[] getReferences(IVirtualComponent aComponent) {
- return aComponent.getReferences();
- }
-
- protected IModule gatherModuleReference(IVirtualComponent component, IVirtualComponent targetComponent ) {
- // Handle workspace project module components
- if (targetComponent != null && targetComponent.getProject()!=component.getProject()) {
- if (!targetComponent.isBinary())
- return ServerUtil.getModule(targetComponent.getProject());
- }
- return null;
- }
-
- /**
- * Find the module resources for a given container and path. Inserts in the java containers
- * at a given path if not null.
- *
- * @param cont a container
- * @param path the current module relative path
- * @param javaPath the path where Java resources fit in the root
- * @param javaCont
- * @return a possibly-empty array of module resources
- * @throws CoreException
- */
- protected IModuleResource[] getMembers(IContainer cont, IPath path, IPath javaPath, IContainer[] javaCont) throws CoreException {
- IResource[] res = cont.members();
- int size2 = res.length;
- List<IModuleFile> list = new ArrayList<IModuleFile>(size2);
- for (int j = 0; j < size2; j++) {
- if (res[j] instanceof IContainer) {
- IContainer cc = (IContainer) res[j];
-
- IPath newPath = path.append(cc.getName()).makeRelative();
- // Retrieve already existing module folder if applicable
- ModuleFolder mf = (ModuleFolder) getExistingModuleResource(members,newPath);
- if (mf == null) {
- mf = new ModuleFolder(cc, cc.getName(), path);
- ModuleFolder parent = (ModuleFolder) getExistingModuleResource(members, path);
- if (path.isEmpty())
- members.add(mf);
- else {
- if (parent == null)
- parent = ensureParentExists(path, cc);
- addMembersToModuleFolder(parent, new IModuleResource[] {mf});
- }
- }
- IModuleResource[] mr = getMembers(cc, newPath, javaPath, javaCont);
-
- if (javaPath != null && newPath.isPrefixOf(javaPath))
- mr = handleJavaPath(path, javaPath, newPath, javaCont, mr, cc);
-
- addMembersToModuleFolder(mf, mr);
-
- } else {
- IFile f = (IFile) res[j];
- // Handle the default package case
- if (path.equals(javaPath)) {
- ModuleFolder mFolder = (ModuleFolder) getExistingModuleResource(members,javaPath);
- IModuleFile mFile = createModuleFile(f, javaPath);
- if (mFolder != null)
- addMembersToModuleFolder(mFolder,new IModuleResource[]{mFile});
- else
- list.add(mFile);
- } else {
- IModuleFile mf = createModuleFile(f, path);
- list.add(mf);
- }
- }
- }
- IModuleResource[] mr = new IModuleResource[list.size()];
- list.toArray(mr);
- return mr;
- }
-
- protected IModuleFile createModuleFile(final IFile file, final IPath path) {
- return new ModuleFile(file, file.getName(), path);
- }
-
- protected IModuleResource[] getMembers(IVirtualContainer cont, IPath path) throws CoreException {
- IVirtualResource[] res = cont.members();
- int size2 = res.length;
- List<IModuleFile> list = new ArrayList<IModuleFile>(size2);
- for (int j = 0; j < size2; j++) {
- if (res[j] instanceof IVirtualContainer) {
- IVirtualContainer cc = (IVirtualContainer) res[j];
- // Retrieve already existing module folder if applicable
- ModuleFolder mf = (ModuleFolder) getExistingModuleResource(members,path.append(new Path(cc.getName()).makeRelative()));
- if (mf == null) {
- mf = new ModuleFolder((IContainer)cc.getUnderlyingResource(), cc.getName(), path);
- ModuleFolder parent = (ModuleFolder) getExistingModuleResource(members, path);
- if (path.isEmpty())
- members.add(mf);
- else {
- if (parent == null)
- parent = ensureParentExists(path, (IContainer)cc.getUnderlyingResource());
- addMembersToModuleFolder(parent, new IModuleResource[] {mf});
- }
- }
- IModuleResource[] mr = getMembers(cc, path.append(cc.getName()));
- addMembersToModuleFolder(mf, mr);
- } else {
- IFile f = (IFile) res[j].getUnderlyingResource();
- IModuleFile mf = null;
- if (shouldAddComponentFile(f)) {
- mf = createModuleFile(f, path);
- list.add(mf);
- }
- }
- }
- IModuleResource[] mr = new IModuleResource[list.size()];
- list.toArray(mr);
- return mr;
- }
-
- protected ModuleFolder ensureParentExists(IPath path, IContainer cc) {
- ModuleFolder parent = (ModuleFolder) getExistingModuleResource(members, path);
- if (parent == null) {
- String folderName = path.lastSegment();
- IPath folderPath = Path.EMPTY;
- if (path.segmentCount()>1)
- folderPath = path.removeLastSegments(1);
- parent = new ModuleFolder(cc, folderName, folderPath);
- if (path.segmentCount()>1)
- addMembersToModuleFolder(ensureParentExists(path.removeLastSegments(1),cc), new IModuleResource[] {parent});
- else
- members.add(parent);
- }
- return parent;
- }
-
- /**
- * This method is meant to be overridden by subclasses. Return whether or not to add this file
- * to the members list.
- *
- * @param file
- * @return boolean should add file?
- */
- protected boolean shouldAddComponentFile(IFile file) {
- return true;
- }
-
- /**
- * Check the current cache to see if we already have an existing module resource for
- * the given path.
- * @param aList
- * @param path
- * @return an existing moduleResource from the cached result
- */
-
- protected IModuleResource getExistingModuleResource(List aList, IPath path) {
- // If the list is empty, return null
- if (aList==null || aList.isEmpty() || path == null)
- return null;
- // Otherwise recursively check to see if given resource matches current resource or if it is a child
- String[] pathSegments = path.segments();
- IModuleResource moduleResource = null;
-
- if(pathSegments.length == 0)
- return null;
- for (Iterator iter = aList.iterator(); iter.hasNext();) {
- moduleResource = (IModuleResource) iter.next();
- String[] moduleSegments = moduleResource.getModuleRelativePath().segments();
- // If the last segment in passed in path equals the module resource name
- // and segment count is the same and the path segments start with the module path segments
- // then we have a match and we return the existing moduleResource
- if (pathSegments[pathSegments.length - 1].equals(moduleResource.getName()) &&
- (moduleSegments.length + 1) == pathSegments.length &&
- startsWith(moduleSegments, pathSegments))
- return moduleResource;
-
- // Otherwise, if it is a folder, check its children for the existing resource path
- // but only check if the beginning segments are a match
- if(moduleResource instanceof IModuleFolder &&
- startsWith(moduleSegments, pathSegments) && pathSegments.length > moduleSegments.length &&
- moduleResource.getName().equals(pathSegments[moduleSegments.length > 0 ? moduleSegments.length : 0]))
- if (((IModuleFolder)moduleResource).members()!=null)
- return getExistingModuleResource(Arrays.asList(((IModuleFolder)moduleResource).members()),path);
- }
- return null;
- }
-
- /**
- *
- * @param beginningSegments
- * @param testSegments
- * @return True if beginningSegments[i] == testSegments[i] for all 0<=i<beginningSegments[i]
- */
- private boolean startsWith(String[] beginningSegments, String[] testSegments) {
- for(int i=0; i < beginningSegments.length; i++) {
- if(!beginningSegments[i].equals(testSegments[i]))
- return false;
- }
- return true;
- }
-
- protected IModuleResource[] handleJavaPath(IPath path, IPath javaPath, IPath curPath, IContainer[] javaCont, IModuleResource[] mr, IContainer cc) throws CoreException {
- //subclasses may override
- return new IModuleResource[]{};
- }
-
- @Override
- public IModuleResource[] members() throws CoreException {
- members.clear();
- IVirtualComponent vc = ComponentCore.createComponent(getProject());
- if (vc != null) {
- IVirtualFolder vFolder = vc.getRootFolder();
- IModuleResource[] mr = getMembers(vFolder, Path.EMPTY);
- int size = mr.length;
- for (int j = 0; j < size; j++) {
- members.add(mr[j]);
- }
- addUtilMembers(vc);
- }
-
- IModuleResource[] mr = new IModuleResource[members.size()];
- members.toArray(mr);
- return mr;
- }
-
- protected boolean shouldIncludeUtilityComponent(IVirtualComponent virtualComp, IVirtualReference[] components, ArtifactEdit edit) {
- return virtualComp != null && virtualComp.isBinary() && virtualComp.getProject()==component.getProject();
- }
-
- protected void addUtilMembers(IVirtualComponent vc) {
- ArtifactEdit edit = null;
- try {
- edit = getComponentArtifactEditForRead();
- IVirtualReference[] components = vc.getReferences();
- for (int i = 0; i < components.length; i++) {
- IVirtualReference reference = components[i];
- IVirtualComponent virtualComp = reference.getReferencedComponent();
- if (shouldIncludeUtilityComponent(virtualComp,components,edit)) {
- addUtilMember(vc, reference, reference.getRuntimePath());
- }
- }
- } finally {
- if (edit!=null)
- edit.dispose();
- }
- }
-
- protected void addUtilMember(IVirtualComponent parent, IVirtualReference reference, IPath runtimePath) {
- IModuleFile mf = null;
- final String archiveName2 = reference.getArchiveName();
- final String archiveName = new Path(archiveName2).lastSegment();
- final IVirtualComponent virtualComp = reference.getReferencedComponent();
- IFile ifile = (IFile)virtualComp.getAdapter(IFile.class);
- if (ifile != null) { //In Workspace
- String name = null != archiveName ? archiveName : ifile.getName();
- mf = new ModuleFile(ifile, name, runtimePath.makeRelative());
- } else {
- File extFile = (File)virtualComp.getAdapter(File.class);
- String name = null != archiveName ? archiveName : extFile.getName();
- mf = new ModuleFile(extFile, name, runtimePath.makeRelative());
- }
- IModuleResource moduleParent = getExistingModuleResource(members, mf.getModuleRelativePath());
- if (moduleParent != null && moduleParent instanceof ModuleFolder) {
- addMembersToModuleFolder((ModuleFolder)moduleParent, new IModuleResource[]{mf});
- } else {
- if (mf.getModuleRelativePath().isEmpty()) {
- members.add(mf);
- } else {
- if (moduleParent == null) {
- moduleParent = ensureParentExists(mf.getModuleRelativePath(), (IContainer)parent.getRootFolder().getUnderlyingResource());
- }
- addMembersToModuleFolder((ModuleFolder)moduleParent, new IModuleResource[] {mf});
- }
- }
- }
-
- protected ArtifactEdit getComponentArtifactEditForRead() {
- return null;
- }
-
- protected static boolean isProjectOfType(IProject project, String typeID) {
- IFacetedProject facetedProject = null;
- try {
- facetedProject = ProjectFacetsManager.create(project);
- } catch (CoreException e) {
- return false;
- }
-
- if (facetedProject !=null && ProjectFacetsManager.isProjectFacetDefined(typeID)) {
- IProjectFacet projectFacet = ProjectFacetsManager.getProjectFacet(typeID);
- return projectFacet!=null && facetedProject.hasProjectFacet(projectFacet);
- }
- return false;
- }
-
- /**
- * Returns the root folders for the resources in this module.
- *
- * @return a possibly-empty array of resource folders
- */
- public IContainer[] getResourceFolders() {
- IVirtualComponent vc = ComponentCore.createComponent(getProject());
- if (vc != null) {
- IVirtualFolder vFolder = vc.getRootFolder();
- if (vFolder != null)
- return vFolder.getUnderlyingFolders();
- }
- return new IContainer[]{};
- }
-
-}
diff --git a/plugins/org.eclipse.wst.web/static_web_project/org/eclipse/wst/web/internal/deployables/FlatComponentDeployable.java b/plugins/org.eclipse.wst.web/static_web_project/org/eclipse/wst/web/internal/deployables/FlatComponentDeployable.java
deleted file mode 100644
index fb8689b..0000000
--- a/plugins/org.eclipse.wst.web/static_web_project/org/eclipse/wst/web/internal/deployables/FlatComponentDeployable.java
+++ /dev/null
@@ -1,379 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2009 Red Hat and others.
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
- *
- * Contributors:
- * Red Hat - Initial API and implementation
- *******************************************************************************/
-package org.eclipse.wst.web.internal.deployables;
-
-import java.io.File;
-import java.util.ArrayList;
-import java.util.Arrays;
-import java.util.List;
-
-import org.eclipse.core.resources.IFile;
-import org.eclipse.core.resources.IProject;
-import org.eclipse.core.runtime.CoreException;
-import org.eclipse.core.runtime.IAdapterFactory;
-import org.eclipse.core.runtime.IPath;
-import org.eclipse.core.runtime.NullProgressMonitor;
-import org.eclipse.core.runtime.Path;
-import org.eclipse.core.runtime.Platform;
-import org.eclipse.wst.common.componentcore.ComponentCore;
-import org.eclipse.wst.common.componentcore.internal.flat.FlatVirtualComponent;
-import org.eclipse.wst.common.componentcore.internal.flat.FlatVirtualComponent.FlatComponentTaskModel;
-import org.eclipse.wst.common.componentcore.internal.flat.IChildModuleReference;
-import org.eclipse.wst.common.componentcore.internal.flat.IFlatFile;
-import org.eclipse.wst.common.componentcore.internal.flat.IFlatFolder;
-import org.eclipse.wst.common.componentcore.internal.flat.IFlatResource;
-import org.eclipse.wst.common.componentcore.internal.flat.IFlatVirtualComponent;
-import org.eclipse.wst.common.componentcore.internal.flat.IFlattenParticipant;
-import org.eclipse.wst.common.componentcore.internal.util.VirtualReferenceUtilities;
-import org.eclipse.wst.common.componentcore.resources.IVirtualComponent;
-import org.eclipse.wst.common.project.facet.core.IFacetedProject;
-import org.eclipse.wst.common.project.facet.core.IProjectFacet;
-import org.eclipse.wst.common.project.facet.core.ProjectFacetsManager;
-import org.eclipse.wst.server.core.IModule;
-import org.eclipse.wst.server.core.ServerUtil;
-import org.eclipse.wst.server.core.model.IModuleFile;
-import org.eclipse.wst.server.core.model.IModuleFolder;
-import org.eclipse.wst.server.core.model.IModuleResource;
-import org.eclipse.wst.server.core.model.ModuleDelegate;
-import org.eclipse.wst.server.core.util.ModuleFile;
-import org.eclipse.wst.server.core.util.ProjectModule;
-
-public abstract class FlatComponentDeployable extends ProjectModule {
-
- /*
- * Register an adapt IModule to IVirtualComponent
- */
- static {
- Platform.getAdapterManager().registerAdapters(new IAdapterFactory() {
- public Class[] getAdapterList() {
- return new Class[] { IVirtualComponent.class };
- }
-
- public Object getAdapter(Object adaptableObject, Class adapterType) {
- if (adaptableObject instanceof IModule) {
- IModule module = (IModule) adaptableObject;
- FlatComponentDeployable deployable = (FlatComponentDeployable) module.loadAdapter(FlatComponentDeployable.class, null);
- if(deployable != null){
- IVirtualComponent virtualComponent = deployable.getComponent();
- return virtualComponent;
- }
- }
- return null;
- }
- }, IModule.class);
- }
-
- protected IVirtualComponent component = null;
- protected List<IModuleResource> members = new ArrayList<IModuleResource>();
-
- public FlatComponentDeployable(IProject project) {
- this(project,ComponentCore.createComponent(project));
- }
-
- public FlatComponentDeployable(IProject project, IVirtualComponent aComponent) {
- super(project);
- this.component = aComponent;
- }
-
- public IVirtualComponent getComponent() {
- return component;
- }
-
- /**
- * We will cache the flattened piece here, and instead redirect
- * the module factories to recreate the modules *whenever* there is
- * a workspace change. This will still be much more efficient than
- * traversing the tree each time a call to getResources() or getChildModules().
- */
- private FlatVirtualComponent cacheFlattened = null;
-
-
- public boolean shouldCache() {
- return false;
- }
-
- public void clearCache() {
- cacheFlattened = null;
- }
-
- /**
- * The export model is what does the grunt of the work
- * @return
- */
- protected IFlatVirtualComponent getFlatComponent() {
- if( !shouldCache() || cacheFlattened == null ) {
- FlatComponentTaskModel options = new FlatComponentTaskModel();
- options.put(FlatVirtualComponent.PARTICIPANT_LIST, Arrays.asList(getParticipants()));
- FlatVirtualComponent tmp = new FlatVirtualComponent(component, options);
- if( shouldCache())
- cacheFlattened = tmp;
- return tmp;
- }
- return cacheFlattened;
- }
-
- /**
- * Subclasses can provide a list of participants who may
- * be involved in forming the export model
- *
- * A deployable with no participant should still properly
- * consume consumed references and traverse the model appropriately
- *
- * @return
- */
- protected IFlattenParticipant[] getParticipants() {
- return new IFlattenParticipant[]{
- };
- }
-
- public boolean isBinary() {
- return component == null ? false : component.isBinary();
- }
-
- @Override
- public IModuleResource[] members() throws CoreException {
- if( component.isBinary() )
- return LEGACY_binaryMembers();
-
- IFlatVirtualComponent em = getFlatComponent();
- IFlatResource[] resources = em.fetchResources();
- return convert(resources);
-
- }
-
- protected IModuleResource[] LEGACY_binaryMembers() {
- IFile ifile = (IFile)component.getAdapter(IFile.class);
- File file = (File)component.getAdapter(File.class);
- ModuleFile mf = ifile != null ? new ModuleFile(ifile, ifile.getName(), new Path("")) //$NON-NLS-1$
- : new ModuleFile(file, file.getName(), new Path("")); //$NON-NLS-1$
- return new IModuleResource[]{mf};
- }
-
- /**
- * Returns the child modules of this module.
- *
- * @return org.eclipse.wst.server.core.model.IModule[]
- */
- @Override
- public IModule[] getChildModules() {
- return getModules();
- }
-
- public /* non api */ IChildModuleReference[] getExportModelChildren() throws CoreException {
- IFlatVirtualComponent em = getFlatComponent();
- IChildModuleReference[] children = em.getChildModules();
- return children;
- }
-
- public IModule[] getModules() {
- // Legacy, here in case the old modules are used
- if( component.isBinary() )
- return new IModule[]{};
-
- try {
- List<IModule> modules = new ArrayList<IModule>();
- IChildModuleReference[] children = getExportModelChildren();
- for( int i = 0; i < children.length; i++ ) {
- IModule child = gatherModuleReference(component, children[i]);
- if( child != null )
- modules.add(child);
- }
- return modules.toArray(new IModule[modules.size()]);
- } catch( CoreException ce ) {
- }
- return new IModule[]{};
- }
-
- @Override
- public String getPath(IModule m) {
- return getURI(m);
- }
-
- /**
- * Returns the URI of the given contained CHILD module.
- *
- * SOFT requirements (NOT API!!) in use by some adopters
- * If the passed in module is equal to this module, return our own deployed name
- *
- * @param module a module
- * @return the URI of the given module, or <code>null</code> if the URI could
- * not be found
- */
- public String getURI(IModule module) {
- ProjectModule md = (ProjectModule)module.loadAdapter(ProjectModule.class, new NullProgressMonitor());
- if( md == this ) {
- // guess my own name
- return VirtualReferenceUtilities.INSTANCE.getDefaultProjectArchiveName(this.component);
- }
- try {
- FlatComponentDeployable cd = (FlatComponentDeployable)module.loadAdapter(FlatComponentDeployable.class, new NullProgressMonitor());
- if( cd != null ) {
- IFlatVirtualComponent em = getFlatComponent();
- IChildModuleReference[] children = em.getChildModules();
- for( int i = 0; i < children.length; i++ ) {
- IModule child = gatherModuleReference(component, children[i]);
- if( child != null && child.getId().equals(module.getId()))
- return children[i].getRelativeURI().toString();
- }
- }
- } catch( CoreException ce ) {
- }
- return null;
- }
-
- /**
- * If I know how to find an IModule for this child, do so now
- *
- * I would love to see this replaced with some API to locate a
- * possible child module based on a virtual component.
- *
- * @param component
- * @param targetComponent
- * @return
- */
- protected IModule gatherModuleReference(IVirtualComponent component, IChildModuleReference child) {
- // Handle workspace project module components
- // Subclasses should extend
- IVirtualComponent targetComponent = child.getComponent();
- if (targetComponent != null && targetComponent.getProject()!= component.getProject()) {
- if (!targetComponent.isBinary()) {
- return filterModuleDelegates(ServerUtil.getModules(targetComponent.getProject()));
- }
- }
- return null;
- }
-
- /**
- * An extender may wish to override this method in order to control which
- * delegate is returned in the scenario where more than one exist. By default
- * the first one found is returned.
- *
- * @param IModule[] modules
- * @return IModule[]
- */
- protected IModule filterModuleDelegates(IModule[] modules) {
- for (int i = 0; i < modules.length; i++) {
- ModuleDelegate md = (ModuleDelegate)modules[i].loadAdapter(ModuleDelegate.class, new NullProgressMonitor());
- if (md instanceof ProjectModule) {
- return modules[i];
- }
- }
- return modules.length > 0 ? modules[0] : null;
- }
-
- /*
- * Below are STATIC utility classes and methods
- */
- protected static IModuleResource[] convert(IFlatResource[] resources) {
- ArrayList<IModuleResource> list = new ArrayList<IModuleResource>();
- for( int i = 0; i < resources.length; i++ ) {
- if( resources[i] instanceof IFlatFile)
- list.add(new ComponentModuleFile(resources[i]));
- else if( resources[i] instanceof IFlatFolder)
- list.add(new ComponentModuleFolder(resources[i]));
- }
- return list.toArray(new IModuleResource[list.size()]);
- }
-
- public static class ComponentModuleResource {
- protected IFlatResource delegate;
- public ComponentModuleResource(IFlatResource resource) {
- this.delegate = resource;
- }
- public long getModificationStamp() {
- return ((IFlatFile)delegate).getModificationStamp();
- }
-
- public IPath getModuleRelativePath() {
- return delegate.getModuleRelativePath();
- }
- public String getName() {
- return delegate.getName();
- }
- public Object getAdapter(Class adapter) {
- return delegate.getAdapter(adapter);
- }
- public IModuleResource[] members() {
- IFlatResource[] children = ((IFlatFolder)delegate).members();
- return convert(children);
- }
- }
-
- public static class ComponentModuleFile extends ComponentModuleResource implements IModuleFile{
- public ComponentModuleFile(IFlatResource resource) {
- super(resource);
- }
-
- @Override
- public boolean equals(Object obj) {
- if (obj == this)
- return true;
-
- if (!(obj instanceof IModuleFile))
- return false;
-
- IModuleFile mf = (IModuleFile) obj;
- if (!getName().equals(mf.getName()))
- return false;
- if (!getModuleRelativePath().equals(mf.getModuleRelativePath()))
- return false;
- return true;
- }
-
- @Override
- public int hashCode() {
- return getName().hashCode() * 37 + getModuleRelativePath().hashCode();
- }
- }
-
- public static class ComponentModuleFolder extends ComponentModuleResource implements IModuleFolder {
- public ComponentModuleFolder(IFlatResource resource) {
- super(resource);
- }
-
- @Override
- public boolean equals(Object obj) {
- if (obj == this)
- return true;
-
- if (!(obj instanceof IModuleFolder))
- return false;
-
- IModuleFolder mf = (IModuleFolder) obj;
- if (!getName().equals(mf.getName()))
- return false;
- if (!getModuleRelativePath().equals(mf.getModuleRelativePath()))
- return false;
- return true;
- }
-
- @Override
- public int hashCode() {
- return getName().hashCode() * 37 + getModuleRelativePath().hashCode();
- }
-
- }
-
- protected static boolean isProjectOfType(IProject project, String typeID) {
- IFacetedProject facetedProject = null;
- try {
- facetedProject = ProjectFacetsManager.create(project);
- } catch (CoreException e) {
- return false;
- }
-
- if (facetedProject !=null && ProjectFacetsManager.isProjectFacetDefined(typeID)) {
- IProjectFacet projectFacet = ProjectFacetsManager.getProjectFacet(typeID);
- return projectFacet!=null && facetedProject.hasProjectFacet(projectFacet);
- }
- return false;
- }
-}
diff --git a/plugins/org.eclipse.wst.web/static_web_project/org/eclipse/wst/web/internal/deployables/IStaticWebModuleArtifact.java b/plugins/org.eclipse.wst.web/static_web_project/org/eclipse/wst/web/internal/deployables/IStaticWebModuleArtifact.java
deleted file mode 100644
index 7fd5bfb..0000000
--- a/plugins/org.eclipse.wst.web/static_web_project/org/eclipse/wst/web/internal/deployables/IStaticWebModuleArtifact.java
+++ /dev/null
@@ -1,14 +0,0 @@
-/***************************************************************************************************
- * Copyright (c) 2003, 2004 IBM Corporation and others. All rights reserved. This program and the
- * accompanying materials are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
- *
- * Contributors: IBM Corporation - initial API and implementation
- **************************************************************************************************/
-
-package org.eclipse.wst.web.internal.deployables;
-
-public interface IStaticWebModuleArtifact {
-
-}
diff --git a/plugins/org.eclipse.wst.web/static_web_project/org/eclipse/wst/web/internal/deployables/StaticWebDeployable.java b/plugins/org.eclipse.wst.web/static_web_project/org/eclipse/wst/web/internal/deployables/StaticWebDeployable.java
deleted file mode 100644
index a8e0b9a..0000000
--- a/plugins/org.eclipse.wst.web/static_web_project/org/eclipse/wst/web/internal/deployables/StaticWebDeployable.java
+++ /dev/null
@@ -1,66 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2003, 2006 IBM Corporation and others.
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
- *
- * Contributors:
- * IBM Corporation - initial API and implementation
- *******************************************************************************/
-package org.eclipse.wst.web.internal.deployables;
-
-import java.util.Properties;
-
-import org.eclipse.core.resources.IProject;
-import org.eclipse.wst.common.componentcore.internal.util.IModuleConstants;
-import org.eclipse.wst.common.componentcore.resources.IVirtualComponent;
-import org.eclipse.wst.common.project.facet.core.IFacetedProject;
-import org.eclipse.wst.common.project.facet.core.IProjectFacet;
-import org.eclipse.wst.common.project.facet.core.ProjectFacetsManager;
-import org.eclipse.wst.server.core.util.IStaticWeb;
-
-public class StaticWebDeployable extends FlatComponentDeployable implements IStaticWeb {
-
- public StaticWebDeployable(IProject project, IVirtualComponent component) {
- super(project);
- }
-
- public String getContextRoot() {
- Properties props = component.getMetaProperties();
- if(props.containsKey("context-root")) //$NON-NLS-1$
- return props.getProperty("context-root"); //$NON-NLS-1$
- return component.getName();
- }
-
- /* TODO This is never called ?? */
-// public String getURI(IModule module) {
-// IVirtualComponent comp = ComponentCore.createComponent(module.getProject());
-// String aURI = null;
-// if (comp !=null) {
-// if (!comp.isBinary() && isProjectOfType(module.getProject(),IModuleConstants.WST_WEB_MODULE)) {
-// IVirtualReference ref = component.getReference(comp.getName());
-// aURI = ref.getRuntimePath().append(comp.getName()+".war").toString(); //$NON-NLS-1$
-// }
-// }
-//
-// if (aURI !=null && aURI.length()>1 && aURI.startsWith("/")) //$NON-NLS-1$
-// aURI = aURI.substring(1);
-// return aURI;
-// }
-
- public String getVersion() {
- IFacetedProject facetedProject = null;
- try {
- facetedProject = ProjectFacetsManager.create(component.getProject());
- if (facetedProject !=null && ProjectFacetsManager.isProjectFacetDefined(IModuleConstants.WST_WEB_MODULE)) {
- IProjectFacet projectFacet = ProjectFacetsManager.getProjectFacet(IModuleConstants.WST_WEB_MODULE);
- return facetedProject.getInstalledVersion(projectFacet).getVersionString();
- }
- } catch (Exception e) {
- //Ignore
- }
- return "1.0"; //$NON-NLS-1$
- }
-
-}
diff --git a/plugins/org.eclipse.wst.web/static_web_project/org/eclipse/wst/web/internal/deployables/StaticWebDeployableFactory.java b/plugins/org.eclipse.wst.web/static_web_project/org/eclipse/wst/web/internal/deployables/StaticWebDeployableFactory.java
deleted file mode 100644
index 4c4c6f0..0000000
--- a/plugins/org.eclipse.wst.web/static_web_project/org/eclipse/wst/web/internal/deployables/StaticWebDeployableFactory.java
+++ /dev/null
@@ -1,144 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2003, 2006 IBM Corporation and others.
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
- *
- * Contributors:
- * IBM Corporation - initial API and implementation
- *******************************************************************************/
-package org.eclipse.wst.web.internal.deployables;
-
-import java.util.ArrayList;
-import java.util.Iterator;
-
-import org.eclipse.core.resources.IProject;
-import org.eclipse.core.runtime.CoreException;
-import org.eclipse.core.runtime.IPath;
-import org.eclipse.core.runtime.Path;
-import org.eclipse.wst.common.componentcore.ComponentCore;
-import org.eclipse.wst.common.componentcore.ModuleCoreNature;
-import org.eclipse.wst.common.componentcore.internal.StructureEdit;
-import org.eclipse.wst.common.componentcore.internal.util.IModuleConstants;
-import org.eclipse.wst.common.componentcore.resources.IVirtualComponent;
-import org.eclipse.wst.common.project.facet.core.IFacetedProject;
-import org.eclipse.wst.common.project.facet.core.IProjectFacet;
-import org.eclipse.wst.common.project.facet.core.ProjectFacetsManager;
-import org.eclipse.wst.server.core.IModule;
-import org.eclipse.wst.server.core.model.ModuleDelegate;
-import org.eclipse.wst.server.core.util.ProjectModuleFactoryDelegate;
-import org.eclipse.wst.web.internal.WSTWebPlugin;
-
-public class StaticWebDeployableFactory extends ProjectModuleFactoryDelegate {
- private static final String ID = "org.eclipse.wst.web.internal.deployables.static"; //$NON-NLS-1$
- protected ArrayList moduleDelegates = new ArrayList();
-
- /*
- * @see DeployableProjectFactoryDelegate#getFactoryID()
- */
- public static String getFactoryId() {
- return ID;
- }
-
- /**
- * Use {@link #createModules(IProject)} instead.
- * @deprecated
- * @param nature
- * @return
- */
- protected IModule[] createModules(ModuleCoreNature nature) {
- if(nature != null){
- return createModules(nature.getProject());
- }
- return null;
- }
- /**
- * Returns true if the project represents a deployable project of this type.
- *
- * @param project
- * org.eclipse.core.resources.IProject
- * @return boolean
- */
- protected boolean isValidModule(IProject project) {
- try {
- IFacetedProject facetedProject = ProjectFacetsManager.create(project);
- if (facetedProject == null)
- return false;
- IProjectFacet webFacet = ProjectFacetsManager.getProjectFacet(IModuleConstants.WST_WEB_MODULE);
- return facetedProject.hasProjectFacet(webFacet);
- } catch (Exception e) {
- return false;
- }
- }
-
- /*
- * (non-Javadoc)
- *
- * @see org.eclipse.wst.server.core.model.ModuleFactoryDelegate#getModuleDelegate(org.eclipse.wst.server.core.IModule)
- */
- @Override
- public ModuleDelegate getModuleDelegate(IModule module) {
- for (Iterator iter = moduleDelegates.iterator(); iter.hasNext();) {
- ModuleDelegate element = (ModuleDelegate) iter.next();
- if (module == element.getModule())
- return element;
- }
- return null;
-
- }
-
- @Override
- protected IModule[] createModules(IProject project) {
- IVirtualComponent component = ComponentCore.createComponent(project);
- if(component != null){
- try {
- return createModuleDelegates(component);
- } catch (CoreException e) {
- WSTWebPlugin.logError(e);
- }
- }
- return null;
- }
-
- protected IModule[] createModuleDelegates(IVirtualComponent component) throws CoreException {
- if(component == null){
- return null;
- }
- StaticWebDeployable moduleDelegate = null;
- IModule module = null;
- try {
- if(isValidModule(component.getProject())) {
- moduleDelegate = new StaticWebDeployable(component.getProject(),component);
- module = createModule(component.getName(), component.getName(), IModuleConstants.WST_WEB_MODULE, moduleDelegate.getVersion(), moduleDelegate.getProject());
- moduleDelegate.initialize(module);
- }
- } catch (Exception e) {
- WSTWebPlugin.logError(e);
- } finally {
- if (module != null) {
- if (getModuleDelegate(module) == null)
- moduleDelegates.add(moduleDelegate);
- }
- }
- if (module == null)
- return null;
- return new IModule[] {module};
- }
-
- /**
- * Returns the list of resources that the module should listen to
- * for state changes. The paths should be project relative paths.
- * Subclasses can override this method to provide the paths.
- *
- * @return a possibly empty array of paths
- */
- @Override
- protected IPath[] getListenerPaths() {
- return new IPath[] {
- new Path(".project"), // nature //$NON-NLS-1$
- new Path(StructureEdit.MODULE_META_FILE_NAME), // component
- new Path(".settings/org.eclipse.wst.common.project.facet.core.xml") // facets //$NON-NLS-1$
- };
- }
-}
diff --git a/plugins/org.eclipse.wst.web/static_web_project/org/eclipse/wst/web/internal/deployables/StaticWebDeployableObjectAdapter.java b/plugins/org.eclipse.wst.web/static_web_project/org/eclipse/wst/web/internal/deployables/StaticWebDeployableObjectAdapter.java
deleted file mode 100644
index b4ed6ad..0000000
--- a/plugins/org.eclipse.wst.web/static_web_project/org/eclipse/wst/web/internal/deployables/StaticWebDeployableObjectAdapter.java
+++ /dev/null
@@ -1,36 +0,0 @@
-/***************************************************************************************************
- * Copyright (c) 2003, 2004 IBM Corporation and others. All rights reserved. This program and the
- * accompanying materials are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
- *
- * Contributors: IBM Corporation - initial API and implementation
- **************************************************************************************************/
-
-package org.eclipse.wst.web.internal.deployables;
-
-import org.eclipse.core.runtime.IAdapterFactory;
-import org.eclipse.wst.server.core.IModuleArtifact;
-import org.eclipse.wst.server.core.model.ModuleArtifactAdapterDelegate;
-
-public class StaticWebDeployableObjectAdapter extends ModuleArtifactAdapterDelegate implements IAdapterFactory
-
-{
-
- public StaticWebDeployableObjectAdapter() {
- super();
- }
-
- public Object getAdapter(Object adaptableObject, Class adapterType) {
- return null;
- }
-
- public Class[] getAdapterList() {
- return new Class[]{IStaticWebModuleArtifact.class};
- }
-
- @Override
- public IModuleArtifact getModuleArtifact(Object obj) {
- return StaticWebDeployableObjectAdapterUtil.getModuleObject(obj);
- }
-}
\ No newline at end of file
diff --git a/plugins/org.eclipse.wst.web/static_web_project/org/eclipse/wst/web/internal/deployables/StaticWebDeployableObjectAdapterUtil.java b/plugins/org.eclipse.wst.web/static_web_project/org/eclipse/wst/web/internal/deployables/StaticWebDeployableObjectAdapterUtil.java
deleted file mode 100644
index f179163..0000000
--- a/plugins/org.eclipse.wst.web/static_web_project/org/eclipse/wst/web/internal/deployables/StaticWebDeployableObjectAdapterUtil.java
+++ /dev/null
@@ -1,122 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2003, 2007 IBM Corporation and others.
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
- *
- * Contributors:
- * IBM Corporation - initial API and implementation
- *******************************************************************************/
-
-package org.eclipse.wst.web.internal.deployables;
-
-import org.eclipse.core.resources.IProject;
-import org.eclipse.core.resources.IResource;
-import org.eclipse.core.runtime.CoreException;
-import org.eclipse.core.runtime.IAdaptable;
-import org.eclipse.core.runtime.IPath;
-import org.eclipse.core.runtime.Path;
-import org.eclipse.jem.util.emf.workbench.ProjectUtilities;
-import org.eclipse.wst.common.componentcore.ComponentCore;
-import org.eclipse.wst.common.componentcore.internal.util.IModuleConstants;
-import org.eclipse.wst.common.componentcore.resources.IVirtualComponent;
-import org.eclipse.wst.common.project.facet.core.IFacetedProject;
-import org.eclipse.wst.common.project.facet.core.IProjectFacet;
-import org.eclipse.wst.common.project.facet.core.ProjectFacetsManager;
-import org.eclipse.wst.server.core.IModule;
-import org.eclipse.wst.server.core.IModuleArtifact;
-import org.eclipse.wst.server.core.ServerUtil;
-import org.eclipse.wst.server.core.util.WebResource;
-
-public class StaticWebDeployableObjectAdapterUtil {
-
- private final static String[] extensionsToExclude = new String[]{"sql", "xmi"}; //$NON-NLS-1$ //$NON-NLS-2$
- static String INFO_DIRECTORY = "WEB-INF"; //$NON-NLS-1$
-
- public static IModuleArtifact getModuleObject(Object obj) {
- IResource resource = null;
- if (obj instanceof IResource)
- resource = (IResource) obj;
- else if (obj instanceof IAdaptable)
- resource = (IResource) ((IAdaptable) obj).getAdapter(IResource.class);
-
- if (resource == null)
- return null;
-
- if (resource instanceof IProject) {
- IProject project = (IProject) resource;
- if (hasInterestedComponents(project))
- return new WebResource(getModule(project), new Path("")); //$NON-NLS-1$
- return null;
- }
-
- IProject project = ProjectUtilities.getProject(resource);
- if (project != null && !hasInterestedComponents(project))
- return null;
-
- IVirtualComponent comp = ComponentCore.createComponent(project);
- // determine path
- IPath rootPath = comp.getRootFolder().getProjectRelativePath();
- IPath resourcePath = resource.getProjectRelativePath();
-
- // Check to make sure the resource is under the webApplication directory
- if (resourcePath.matchingFirstSegments(rootPath) != rootPath.segmentCount())
- return null;
-
- // Do not allow resource under the web-inf directory
- resourcePath = resourcePath.removeFirstSegments(rootPath.segmentCount());
- if (resourcePath.segmentCount() > 1 && resourcePath.segment(0).equals(INFO_DIRECTORY))
- return null;
-
- if (shouldExclude(resource))
- return null;
-
- // return Web resource type
- return new WebResource(getModule(project), resourcePath);
-
- }
-
- /**
- * Method shouldExclude.
- *
- * @param resource
- * @return boolean
- */
- private static boolean shouldExclude(IResource resource) {
- String fileExt = resource.getFileExtension();
-
- // Exclude files of certain extensions
- for (int i = 0; i < extensionsToExclude.length; i++) {
- String extension = extensionsToExclude[i];
- if (extension.equalsIgnoreCase(fileExt))
- return true;
- }
- return false;
- }
-
- protected static IModule getModule(IProject project) {
- if (hasInterestedComponents(project))
- return ServerUtil.getModule(project);
- return null;
- }
-
- protected static boolean hasInterestedComponents(IProject project) {
- return isProjectOfType(project, IModuleConstants.WST_WEB_MODULE);
- }
-
- protected static boolean isProjectOfType(IProject project, String typeID) {
- IFacetedProject facetedProject = null;
- try {
- facetedProject = ProjectFacetsManager.create(project);
- } catch (CoreException e) {
- return false;
- }
-
- if (facetedProject != null && ProjectFacetsManager.isProjectFacetDefined(typeID)) {
- IProjectFacet projectFacet = ProjectFacetsManager.getProjectFacet(typeID);
- return projectFacet != null && facetedProject.hasProjectFacet(projectFacet);
- }
- return false;
- }
-}
diff --git a/plugins/org.eclipse.wst.web/static_web_project/org/eclipse/wst/web/internal/facet/MappingDescriptor.java b/plugins/org.eclipse.wst.web/static_web_project/org/eclipse/wst/web/internal/facet/MappingDescriptor.java
deleted file mode 100644
index 8b5f3c5..0000000
--- a/plugins/org.eclipse.wst.web/static_web_project/org/eclipse/wst/web/internal/facet/MappingDescriptor.java
+++ /dev/null
@@ -1,59 +0,0 @@
-package org.eclipse.wst.web.internal.facet;
-
-import org.eclipse.core.runtime.IConfigurationElement;
-
-public class MappingDescriptor {
-
- protected IConfigurationElement element = null;
-
- public MappingDescriptor(IConfigurationElement configurationElement) {
- this.element = configurationElement;
- }
-
- public IConfigurationElement getElement() {
- return element;
- }
-
- public String getID() {
- return element.getAttribute(RuntimePresetMappingRegistry.ATTRIBUTE_ID);
- }
-
- public String getFacetRuntimeTypeID() {
- return element.getAttribute(RuntimePresetMappingRegistry.ATTRIBUTE_FACET_RUNTIME_TYPE_ID);
- }
-
- public String getFacetRuntimeVersion() {
- return element.getAttribute(RuntimePresetMappingRegistry.ATTRIBUTE_FACET_RUNTIME_VERSION);
- }
-
- public String getFacetID() {
- return element.getAttribute(RuntimePresetMappingRegistry.ATTRIBUTE_FACET_ID);
- }
-
- public String getFacetVersion() {
- return element.getAttribute(RuntimePresetMappingRegistry.ATTRIBUTE_FACET_VERSION);
- }
-
- public String getPresetID() {
- return element.getAttribute(RuntimePresetMappingRegistry.ATTRIBUTE_PRESET_ID);
- }
-
- @Override
- public String toString() {
- StringBuffer buff = new StringBuffer();
- buff.append("id:"); //$NON-NLS-1$
- buff.append(getID());
- buff.append(" facetRuntimeTypeID:"); //$NON-NLS-1$
- buff.append(getFacetRuntimeTypeID());
- buff.append(" facetRuntimeVersion:"); //$NON-NLS-1$
- buff.append(getFacetRuntimeVersion());
- buff.append(" facetID:"); //$NON-NLS-1$
- buff.append(getFacetID());
- buff.append(" facetVersion:"); //$NON-NLS-1$
- buff.append(getFacetVersion());
- buff.append(" presetID:"); //$NON-NLS-1$
- buff.append(getPresetID());
- return buff.toString();
- }
-
-}
diff --git a/plugins/org.eclipse.wst.web/static_web_project/org/eclipse/wst/web/internal/facet/RuntimePresetMappingRegistry.java b/plugins/org.eclipse.wst.web/static_web_project/org/eclipse/wst/web/internal/facet/RuntimePresetMappingRegistry.java
deleted file mode 100644
index b2bcd0b..0000000
--- a/plugins/org.eclipse.wst.web/static_web_project/org/eclipse/wst/web/internal/facet/RuntimePresetMappingRegistry.java
+++ /dev/null
@@ -1,261 +0,0 @@
-package org.eclipse.wst.web.internal.facet;
-
-import java.util.ArrayList;
-import java.util.Iterator;
-import java.util.List;
-import java.util.StringTokenizer;
-
-import org.eclipse.core.runtime.IConfigurationElement;
-import org.eclipse.core.runtime.IExtensionPoint;
-import org.eclipse.core.runtime.Platform;
-import org.eclipse.wst.common.project.facet.core.IProjectFacet;
-import org.eclipse.wst.common.project.facet.core.IProjectFacetVersion;
-import org.eclipse.wst.common.project.facet.core.ProjectFacetsManager;
-import org.eclipse.wst.common.project.facet.core.runtime.IRuntimeComponentType;
-import org.eclipse.wst.common.project.facet.core.runtime.IRuntimeComponentVersion;
-import org.eclipse.wst.common.project.facet.core.runtime.RuntimeManager;
-import org.eclipse.wst.web.internal.WSTWebPlugin;
-
-public class RuntimePresetMappingRegistry {
-
- static final String EXTENSION_POINT = "runtimePresetMappings"; //$NON-NLS-1$
-
- static final String ELEMENT_MAPPING = "mapping"; //$NON-NLS-1$
-
- static final String ATTRIBUTE_ID = "id"; //$NON-NLS-1$
-
- static final String ATTRIBUTE_FACET_RUNTIME_TYPE_ID = "facetRuntimeTypeID"; //$NON-NLS-1$
-
- static final String ATTRIBUTE_FACET_RUNTIME_VERSION = "facetRuntimeVersion"; //$NON-NLS-1$
-
- static final String ATTRIBUTE_FACET_ID = "facetID"; //$NON-NLS-1$
-
- static final String ATTRIBUTE_FACET_VERSION = "facetVersion"; //$NON-NLS-1$
-
- static final String ATTRIBUTE_PRESET_ID = "presetID"; //$NON-NLS-1$
-
- public static RuntimePresetMappingRegistry INSTANCE = new RuntimePresetMappingRegistry();
-
- private List<MappingDescriptor> descriptors = null;
-
- public String getPresetID(String facetRuntimeTypeID,
- String facetRuntimeVersion, String facetID, String facetVersion) {
- if (descriptors == null) {
- readDescriptors();
- }
- for (MappingDescriptor descriptor : descriptors) {
- if(matches(facetRuntimeTypeID, descriptor.getFacetRuntimeTypeID()) &&
- matches(facetRuntimeVersion, descriptor.getFacetRuntimeVersion()) &&
- matches(facetID, descriptor.getFacetID()) &&
- matches(facetVersion, descriptor.getFacetVersion())){
- return descriptor.getPresetID();
- }
- }
- return null;
- }
-
- /**
- * Returns true if the value is matched by the pattern The pattern consists
- * of a common deliminated list of simple patterns Each simple pattern has
- * an optional starting or ending * so a String.startsWith() or
- * String.endsWith(). Both may be combined to compute a String.indexOf() !=
- * -1
- *
- * @param value
- * @param pattern
- * @return
- */
- private static boolean matches(String value, String pattern){
- StringTokenizer strTok = new StringTokenizer(pattern, ","); //$NON-NLS-1$
- while(strTok.hasMoreTokens()){
- String simplePattern = strTok.nextToken().trim();
- if(simplePattern.startsWith("*")){ //$NON-NLS-1$
- if(simplePattern.length() < 2){
- return true; // i.e. *
- }
- if(simplePattern.endsWith("*")){ //$NON-NLS-1$
- if(simplePattern.length() < 3){
- return true; // i.e. **
- }
- if(value.indexOf(simplePattern.substring(1, simplePattern.length()-2)) != -1){
- return true;
- }
- } else {
- if(value.endsWith(simplePattern.substring(1))){
- return true;
- }
- }
- } else if(simplePattern.endsWith("*")){ //$NON-NLS-1$
- if(value.startsWith(simplePattern.substring(0, simplePattern.length()-2))){
- return true;
- }
- } else if(value.equals(simplePattern)){
- return true;
- }
- }
- return false;
- }
-
- private static List <String> getStaticTokens(String pattern){
- List <String> staticTokens = new ArrayList <String> ();
- StringTokenizer strTok = new StringTokenizer(pattern, ","); //$NON-NLS-1$
- while(strTok.hasMoreTokens()){
- String simplePattern = strTok.nextToken().trim();
- if(!simplePattern.startsWith("*") && !simplePattern.endsWith("*")){ //$NON-NLS-1$ //$NON-NLS-2$
- staticTokens.add(simplePattern);
- }
- }
- return staticTokens;
- }
-
-
- private void readDescriptors() {
- descriptors = new ArrayList<MappingDescriptor>();
- IExtensionPoint point = Platform.getExtensionRegistry().getExtensionPoint(WSTWebPlugin.PLUGIN_ID, EXTENSION_POINT);
- if (point == null)
- return;
- IConfigurationElement[] elements = point.getConfigurationElements();
- for (int i = 0; i < elements.length; i++) {
- IConfigurationElement element = elements[i];
- if (ELEMENT_MAPPING.equals(element.getName())) {
- String id = element.getAttribute(ATTRIBUTE_ID);
- if (null == id || id.trim().length() == 0) {
- WSTWebPlugin.logError("Extension: " + EXTENSION_POINT + " Element: " + ELEMENT_MAPPING + " is missing attribute " + ATTRIBUTE_ID); //$NON-NLS-1$ //$NON-NLS-2$ //$NON-NLS-3$
- continue;
- }
-
- String runtimeID = element.getAttribute(ATTRIBUTE_FACET_RUNTIME_TYPE_ID);
- if (null == runtimeID || runtimeID.trim().length() == 0) {
- WSTWebPlugin.logError("Extension: " + EXTENSION_POINT + " Element: " + ELEMENT_MAPPING + " is missing attribute " + ATTRIBUTE_FACET_RUNTIME_TYPE_ID); //$NON-NLS-1$ //$NON-NLS-2$ //$NON-NLS-3$
- continue;
- }
-
- List <String> staticRuntimeIDs = getStaticTokens(runtimeID);
- List <IRuntimeComponentType> staticRuntimeTypes = new ArrayList<IRuntimeComponentType>();
- for(String staticRuntimeID : staticRuntimeIDs){
- try {
- IRuntimeComponentType runtimeType = RuntimeManager.getRuntimeComponentType(staticRuntimeID);
- if(runtimeType != null){
- staticRuntimeTypes.add(runtimeType);
- }
- } catch (IllegalArgumentException e) {
- WSTWebPlugin.logError("Extension: " + EXTENSION_POINT + " Element: " + ELEMENT_MAPPING + " defined invalid attribute " + ATTRIBUTE_FACET_RUNTIME_TYPE_ID + ": " + runtimeID +" unable to resolve runtime: "+staticRuntimeID, e); //$NON-NLS-1$ //$NON-NLS-2$ //$NON-NLS-3$ //$NON-NLS-4$ //$NON-NLS-5$
- }
- }
-
- String runtimeVersionStr = element.getAttribute(ATTRIBUTE_FACET_RUNTIME_VERSION);
- if (null == runtimeVersionStr || runtimeVersionStr.trim().length() == 0) {
- WSTWebPlugin.logError("Extension: " + EXTENSION_POINT + " Element: " + ELEMENT_MAPPING + " is missing attribute " + ATTRIBUTE_FACET_RUNTIME_VERSION); //$NON-NLS-1$ //$NON-NLS-2$ //$NON-NLS-3$
- continue;
- }
- if(!staticRuntimeTypes.isEmpty()){
- List <String> staticRuntimeVersions = getStaticTokens(runtimeVersionStr);
- for(String staticVersion : staticRuntimeVersions){
- boolean foundVersion = false;
- for(int k=0;k<staticRuntimeTypes.size() && !foundVersion;k++){
- IRuntimeComponentType runtimeType = staticRuntimeTypes.get(k);
- try {
- runtimeType.getVersion(staticVersion);
- foundVersion = true;
- } catch (IllegalArgumentException e) {
- //eat it
- }
- }
- if(!foundVersion){
- StringBuffer validVersions = new StringBuffer(" valid versions include: "); //$NON-NLS-1$
- for(IRuntimeComponentType runtimeType : staticRuntimeTypes) {
- validVersions.append("\n"); //$NON-NLS-1$
- validVersions.append(runtimeType.getId());
- validVersions.append(": "); //$NON-NLS-1$
- for (Iterator<IRuntimeComponentVersion> iterator = runtimeType.getVersions().iterator(); iterator.hasNext();) {
- validVersions.append(iterator.next().getVersionString());
- if (iterator.hasNext()) {
- validVersions.append(" "); //$NON-NLS-1$
- }
- }
- }
- WSTWebPlugin.logError("Extension: " + EXTENSION_POINT + " Element: " + ELEMENT_MAPPING + " defined invalid attribute " + ATTRIBUTE_FACET_RUNTIME_VERSION + ": " + staticVersion //$NON-NLS-1$ //$NON-NLS-2$ //$NON-NLS-3$ //$NON-NLS-4$
- + validVersions);
- }
- }
- }
-
- String facetID = element.getAttribute(ATTRIBUTE_FACET_ID);
- if (null == facetID || facetID.trim().length() == 0) {
- WSTWebPlugin.logError("Extension: " + EXTENSION_POINT + " Element: " + ELEMENT_MAPPING + " is missing attribute " + ATTRIBUTE_FACET_ID); //$NON-NLS-1$ //$NON-NLS-2$ //$NON-NLS-3$
- continue;
- }
-
- List <String> staticFacetIDs = getStaticTokens(facetID);
- List <IProjectFacet> staticFacets = new ArrayList <IProjectFacet>();
- for(String staticFacetID:staticFacetIDs){
- try {
- IProjectFacet facet = ProjectFacetsManager.getProjectFacet(staticFacetID);
- if(null != facet){
- staticFacets.add(facet);
- }
- } catch (IllegalArgumentException e) {
- WSTWebPlugin.logError("Extension: " + EXTENSION_POINT + " Element: " + ELEMENT_MAPPING + " defined invalid attribute " + ATTRIBUTE_FACET_ID + ": " + staticFacetID, e); //$NON-NLS-1$ //$NON-NLS-2$ //$NON-NLS-3$ //$NON-NLS-4$
- }
- }
-
- String facetVersionStr = element.getAttribute(ATTRIBUTE_FACET_VERSION);
- if (null == facetVersionStr || facetVersionStr.trim().length() == 0) {
- WSTWebPlugin.logError("Extension: " + EXTENSION_POINT + " Element: " + ELEMENT_MAPPING + " is missing attribute " + ATTRIBUTE_FACET_VERSION); //$NON-NLS-1$ //$NON-NLS-2$ //$NON-NLS-3$
- continue;
- }
- List <String>staticFacetVersionStrs = getStaticTokens(facetVersionStr);
- if(!staticFacets.isEmpty() && !staticFacetVersionStrs.isEmpty()){
- for(String staticFacetVersion:staticFacetVersionStrs){
- boolean foundFacetVersion = false;
- for(int k=0;k< staticFacets.size() && !foundFacetVersion; k++) {
- IProjectFacet staticFacet = staticFacets.get(k);
- try {
- IProjectFacetVersion staticVersion = staticFacet.getVersion(staticFacetVersion);
- if(staticVersion != null){
- foundFacetVersion = true;
- }
- } catch (IllegalArgumentException e) {
- //eat it
- }
- }
- if(!foundFacetVersion){
- StringBuffer validVersions = new StringBuffer(" valid versions include: "); //$NON-NLS-1$
- for(IProjectFacet staticFacet:staticFacets){
- validVersions.append("\n"); //$NON-NLS-1$
- validVersions.append(staticFacet.getId());
- validVersions.append(": "); //$NON-NLS-1$
- for (Iterator<IProjectFacetVersion> iterator = staticFacet.getVersions().iterator(); iterator.hasNext();) {
- validVersions.append(iterator.next().getVersionString());
- if (iterator.hasNext()) {
- validVersions.append(" "); //$NON-NLS-1$
- }
- }
- }
- WSTWebPlugin.logError("Extension: " + EXTENSION_POINT + " Element: " + ELEMENT_MAPPING + " defined invalid attribute " + ATTRIBUTE_FACET_VERSION + ": " + staticFacetVersion //$NON-NLS-1$ //$NON-NLS-2$ //$NON-NLS-3$ //$NON-NLS-4$
- + validVersions);
- continue;
- }
- }
- }
- String presetID = element.getAttribute(ATTRIBUTE_PRESET_ID);
- if (null == presetID || presetID.trim().length() == 0) {
- WSTWebPlugin.logError("Extension: " + EXTENSION_POINT + " Element: " + ELEMENT_MAPPING + " is missing attribute " + ATTRIBUTE_PRESET_ID); //$NON-NLS-1$ //$NON-NLS-2$ //$NON-NLS-3$
- continue;
- }
- try {
- ProjectFacetsManager.getPreset(presetID);
- } catch (IllegalArgumentException e) {
- WSTWebPlugin.logError("Extension: " + EXTENSION_POINT + " Element: " + ELEMENT_MAPPING + " defined invalid attribute " + ATTRIBUTE_PRESET_ID + ": " + presetID, e); //$NON-NLS-1$ //$NON-NLS-2$ //$NON-NLS-3$ //$NON-NLS-4$
- continue;
- }
- MappingDescriptor descriptor = new MappingDescriptor(element);
- descriptors.add(descriptor);
- } else {
- WSTWebPlugin.logError("Elements must be named: " + ELEMENT_MAPPING + " within the extension: " + EXTENSION_POINT); //$NON-NLS-1$ //$NON-NLS-2$
- WSTWebPlugin.logError("Element: " + element.getName() + " is invalid within the extension: " + EXTENSION_POINT); //$NON-NLS-1$ //$NON-NLS-2$
- }
- }
- }
-
-}
\ No newline at end of file
diff --git a/plugins/org.eclipse.wst.web/static_web_project/org/eclipse/wst/web/internal/operation/IWebProjectPropertiesUpdateDataModelProperties.java b/plugins/org.eclipse.wst.web/static_web_project/org/eclipse/wst/web/internal/operation/IWebProjectPropertiesUpdateDataModelProperties.java
deleted file mode 100644
index 5d7622b..0000000
--- a/plugins/org.eclipse.wst.web/static_web_project/org/eclipse/wst/web/internal/operation/IWebProjectPropertiesUpdateDataModelProperties.java
+++ /dev/null
@@ -1,24 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2005, 2006 IBM Corporation and others.
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
- *
- * Contributors:
- * IBM Corporation - initial API and implementation
- *******************************************************************************/
-package org.eclipse.wst.web.internal.operation;
-
-import org.eclipse.wst.common.componentcore.datamodel.properties.IServerContextRootDataModelProperties;
-
-/**
- * @deprecated Replaced by {@link IServerContextRootDataModelProperties}
- *
- */
-public interface IWebProjectPropertiesUpdateDataModelProperties {
-
- public static final String PROJECT = "IWebProjectPropertiesUpdateDataModelProperties.PROJECT"; //$NON-NLS-1$
- public static final String CONTEXT_ROOT = "IWebProjectPropertiesUpdateDataModelProperties.CONTEXT_ROOT"; //$NON-NLS-1$
-
-}
diff --git a/plugins/org.eclipse.wst.web/static_web_project/org/eclipse/wst/web/internal/operation/WebProjectPropertiesUpdateDataModelProvider.java b/plugins/org.eclipse.wst.web/static_web_project/org/eclipse/wst/web/internal/operation/WebProjectPropertiesUpdateDataModelProvider.java
deleted file mode 100644
index b602f5a..0000000
--- a/plugins/org.eclipse.wst.web/static_web_project/org/eclipse/wst/web/internal/operation/WebProjectPropertiesUpdateDataModelProvider.java
+++ /dev/null
@@ -1,45 +0,0 @@
-package org.eclipse.wst.web.internal.operation;
-
-/*******************************************************************************
- * Copyright (c) 2003, 2004, 2005 IBM Corporation and others.
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
- *
- * Contributors:
- * IBM Corporation - initial API and implementation
- *******************************************************************************/
-
-import java.util.Set;
-
-import org.eclipse.wst.common.componentcore.internal.operation.ServerContextRootDataModelProvider;
-import org.eclipse.wst.common.frameworks.datamodel.AbstractDataModelProvider;
-import org.eclipse.wst.common.frameworks.datamodel.IDataModelOperation;
-
-/**
- * @deprecated Replaced by {@link ServerContextRootDataModelProvider}
- *
- */
-public class WebProjectPropertiesUpdateDataModelProvider
- extends AbstractDataModelProvider
- implements IWebProjectPropertiesUpdateDataModelProperties{
-
- public WebProjectPropertiesUpdateDataModelProvider(){
- super();
- }
-
- @Override
- public Set getPropertyNames() {
- Set names = super.getPropertyNames();
- names.add(PROJECT);
- names.add(CONTEXT_ROOT);
- return names;
- }
-
- @Override
- public IDataModelOperation getDefaultOperation() {
- return new WebProjectPropertiesUpdateOperation(model);
- }
-
-}
diff --git a/plugins/org.eclipse.wst.web/static_web_project/org/eclipse/wst/web/internal/operation/WebProjectPropertiesUpdateOperation.java b/plugins/org.eclipse.wst.web/static_web_project/org/eclipse/wst/web/internal/operation/WebProjectPropertiesUpdateOperation.java
deleted file mode 100644
index 71ab6e9..0000000
--- a/plugins/org.eclipse.wst.web/static_web_project/org/eclipse/wst/web/internal/operation/WebProjectPropertiesUpdateOperation.java
+++ /dev/null
@@ -1,52 +0,0 @@
-package org.eclipse.wst.web.internal.operation;
-
-/*******************************************************************************
- * Copyright (c) 2003, 2004, 2005 IBM Corporation and others.
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
- *
- * Contributors:
- * IBM Corporation - initial API and implementation
- *******************************************************************************/
-
-import org.eclipse.core.commands.ExecutionException;
-import org.eclipse.core.resources.IProject;
-import org.eclipse.core.runtime.IAdaptable;
-import org.eclipse.core.runtime.IProgressMonitor;
-import org.eclipse.core.runtime.IStatus;
-import org.eclipse.wst.common.componentcore.internal.operation.ServerContextRootUpdateOperation;
-import org.eclipse.wst.common.componentcore.internal.util.ComponentUtilities;
-import org.eclipse.wst.common.frameworks.datamodel.AbstractDataModelOperation;
-import org.eclipse.wst.common.frameworks.datamodel.IDataModel;
-
-
-
-
-/**
- * @deprecated
- * Replaced by {@link ServerContextRootUpdateOperation}
- * @version 1.0
- * @author
- */
-public class WebProjectPropertiesUpdateOperation
- extends AbstractDataModelOperation
- implements IWebProjectPropertiesUpdateDataModelProperties{
-
-
- public WebProjectPropertiesUpdateOperation(IDataModel model) {
- super(model);
- }
-
- @Override
- public IStatus execute(IProgressMonitor monitor, IAdaptable info) throws ExecutionException {
- IProject project = (IProject)model.getProperty( IWebProjectPropertiesUpdateDataModelProperties.PROJECT );
- String contextRoot = model.getStringProperty( IWebProjectPropertiesUpdateDataModelProperties.CONTEXT_ROOT );
- if (contextRoot != null) {
- ComponentUtilities.setServerContextRoot(project, contextRoot);
- }
- return OK_STATUS;
- }
-
-}
